From 5a262eec73614998a87f3466a0c0924c7317be36 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Nov 2018 13:08:18 -0500 Subject: sub_812C3F8 --- include/bg.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/bg.h b/include/bg.h index 55927a5a4..003ffc916 100644 --- a/include/bg.h +++ b/include/bg.h @@ -77,9 +77,9 @@ void UnsetBgTilemapBuffer(u8 bg); void* GetBgTilemapBuffer(u8 bg); void CopyToBgTilemapBuffer(u8 bg, const void *src, u16 mode, u16 destOffset); void CopyBgTilemapBufferToVram(u8 bg); -void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u8 height); -void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette); -void CopyRectToBgTilemapBufferRect(u8 bg, void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2); +void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 width, u8 height); +void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, const void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette); +void CopyRectToBgTilemapBufferRect(u8 bg, const void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2); void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height); void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette); void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 width, u8 height, u8 paletteSlot, s16 tileNumDelta); -- cgit v1.2.3 From 2571ba516cb0f21c19405e943c53eebf5d19ab7a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Nov 2018 15:51:55 -0500 Subject: through sub_812C694 --- include/graphics.h | 7 +++++++ include/item_menu.h | 1 + 2 files changed, 8 insertions(+) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index 9888d2f7c..c5544428e 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -143,4 +143,11 @@ extern const u8 gUnknown_08DDB020[]; extern const u8 gUnknown_08DDB2C4[]; extern const u16 gUnknown_08DDAFE0[]; +// fame_checker + +extern const u16 gUnknown_8E9F220[0x30]; +extern const u16 gUnknown_8E9F260[0xa50]; +extern const u16 gUnknown_8EA0700[0x400]; +extern const u16 gUnknown_8EA0F00[0x400]; + #endif //GUARD_GRAPHICS_H diff --git a/include/item_menu.h b/include/item_menu.h index 731c7cf2b..64cb2d762 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -12,5 +12,6 @@ extern u16 gUnknown_203AD30; // Exported ROM declarations void sub_81AAC50(void); void sub_81AAC70(void); +void sub_8107EB8(void); #endif //GUARD_ITEM_MENU_H -- cgit v1.2.3 From 93f67f9557109d85e191283b171f7f5e8028b7bf Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Nov 2018 20:04:50 -0500 Subject: sub_812CAD8 New macro `PRESSED(x)` tests `gMain.newKeys & (x)`. The macro itself is inoptimal. However, its use is required to match this function. We suspect this macro may have been implemented globally, hence we put it in `global.h`. Propagating its use through the remainder of this project, as well as [Ruby](/pret/pokeruby) and [Emerald](/pret/pokeemerald), has been left as a to-do item. --- include/global.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'include') diff --git a/include/global.h b/include/global.h index 050e200f9..3dc11bfbd 100644 --- a/include/global.h +++ b/include/global.h @@ -62,6 +62,13 @@ #define T2_READ_32(ptr) ((ptr)[0] + ((ptr)[1] << 8) + ((ptr)[2] << 16) + ((ptr)[3] << 24)) #define T2_READ_PTR(ptr) (void*) T2_READ_32(ptr) +// This macro is required to prevent the compiler from optimizing +// a dpad up/down check in sub_812CAD8 (fame_checker.c). +// We suspect it was used globally. +// GameFreak never ceases to amaze. +// TODO: Propagate use of this macro +#define PRESSED(button) ({gMain.newKeys & (button);}) + extern u8 gStringVar1[]; extern u8 gStringVar2[]; extern u8 gStringVar3[]; -- cgit v1.2.3 From c60b28011871abaf987a46a6da6823ce451fa66d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Nov 2018 21:41:18 -0500 Subject: through sub_812CD3C --- include/global.h | 8 +++++++- include/new_menu_helpers.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index 3dc11bfbd..568ece2be 100644 --- a/include/global.h +++ b/include/global.h @@ -570,6 +570,11 @@ struct QuestLog /*0x0668*/ u16 end[0]; }; +struct FameCheckerSaveData +{ + /*3a54*/ u8 unk_0_0:2; +}; + #define MAP_OBJECTS_COUNT 16 #define BERRY_TREES_COUNT 128 #define FLAGS_COUNT 288 // 300 @@ -634,7 +639,8 @@ struct SaveBlock1 /*0x3A14*/ u8 seen2[DEX_FLAGS_NO]; /*0x3A48*/ u8 filler_3a48[4]; /*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH]; - /*0x3A54*/ u8 filler3A54[0x2E4]; + /*0x3A54*/ struct FameCheckerSaveData fameChecker[17]; + /*0x3A98*/ u8 filler3A94[0x2A0]; u32 unkArray[4][3]; }; diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index 639395941..432d06c81 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -16,5 +16,6 @@ void SetStandardWindowBorderStyle(u8 a0, u8 a1); void sub_8197930(void); u8 GetPlayerTextSpeed(void); void sub_80F6F54(u8, u8); +u8 sub_80F78A8(void); #endif // GUARD_NEW_MENU_HELPERS_H -- cgit v1.2.3 From 8f9ec933264a3ecfe204b653c508feacde3c976d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Nov 2018 23:02:38 -0500 Subject: through sub_812D094 --- include/list_menu.h | 1 + include/new_menu_helpers.h | 2 ++ 2 files changed, 3 insertions(+) (limited to 'include') diff --git a/include/list_menu.h b/include/list_menu.h index f547801bd..89adeaba0 100644 --- a/include/list_menu.h +++ b/include/list_menu.h @@ -54,5 +54,6 @@ u8 ListMenuInit(struct ListMenuTemplate *template, u16 a1, u16 a2); s32 ListMenuHandleInput(u8 id); void get_coro_args_x18_x1A(u8 a0, u16 *a1, u16 *a2); void sub_81AE6C8(u8 a0, u16 *a1, u16 *a2); +void sub_810713C(u8, u8, u8); #endif //GUARD_LIST_MENU_H diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index 432d06c81..2ff20eb39 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -17,5 +17,7 @@ void sub_8197930(void); u8 GetPlayerTextSpeed(void); void sub_80F6F54(u8, u8); u8 sub_80F78A8(void); +void sub_80F6E9C(void); +void sub_80F6EE4(u8, u8); #endif // GUARD_NEW_MENU_HELPERS_H -- cgit v1.2.3 From 5b30b664bebb2ba890b86cd09f40c7c53da05659 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 25 Nov 2018 08:21:08 -0500 Subject: sub_812D1A8 --- include/field_map_obj.h | 1 + include/global.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/field_map_obj.h b/include/field_map_obj.h index ded970a83..685701e89 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -86,6 +86,7 @@ void npc_set_running_behaviour_etc(struct MapObject *, u8); u8 sub_80634F0(u8 direction); u8 sub_8063500(u8 a0); void sub_805F060(struct MapObject *mapObject, u8 a1); +u8 sub_805EB44(u8, u8, s16, s16); // Exported data declarations diff --git a/include/global.h b/include/global.h index 568ece2be..31bb77f9f 100644 --- a/include/global.h +++ b/include/global.h @@ -572,7 +572,8 @@ struct QuestLog struct FameCheckerSaveData { - /*3a54*/ u8 unk_0_0:2; + /*3a54*/ u16 unk_0_0:2; + u16 unk_0_2:12; }; #define MAP_OBJECTS_COUNT 16 -- cgit v1.2.3 From 83dc744b85346386dea95ba70323917ca1e2a3ed Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 25 Nov 2018 18:32:21 -0500 Subject: through sub_812D388 --- include/global.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index 31bb77f9f..9fb7703cd 100644 --- a/include/global.h +++ b/include/global.h @@ -574,6 +574,7 @@ struct FameCheckerSaveData { /*3a54*/ u16 unk_0_0:2; u16 unk_0_2:12; + u16 unk_0_E:2; }; #define MAP_OBJECTS_COUNT 16 @@ -640,8 +641,8 @@ struct SaveBlock1 /*0x3A14*/ u8 seen2[DEX_FLAGS_NO]; /*0x3A48*/ u8 filler_3a48[4]; /*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH]; - /*0x3A54*/ struct FameCheckerSaveData fameChecker[17]; - /*0x3A98*/ u8 filler3A94[0x2A0]; + /*0x3A54*/ struct FameCheckerSaveData fameChecker[16]; + /*0x3A94*/ u8 filler3A94[0x2A4]; u32 unkArray[4][3]; }; -- cgit v1.2.3 From 5090c3fab25806fd972fd47360fef30ab095317d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 25 Nov 2018 18:46:32 -0500 Subject: sub_812D420 --- include/gba/macro.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/gba/macro.h b/include/gba/macro.h index 462d3589d..c0a4e481b 100644 --- a/include/gba/macro.h +++ b/include/gba/macro.h @@ -125,6 +125,9 @@ #define DmaCopyLarge32(dmaNum, src, dest, size, block) DmaCopyLarge(dmaNum, src, dest, size, block, 32) +#define DmaClearLarge16(dmaNum, dest, size, block) DmaClearLarge(dmaNum, dest, size, block, 16) +#define DmaClearLarge32(dmaNum, dest, size, block) DmaClearLarge(dmaNum, dest, size, block, 32) + #define DmaCopyDefvars(dmaNum, src, dest, size, bit) \ { \ const void *_src = src; \ -- cgit v1.2.3 From f05f41b89a0de0e0c32a06d6477de0d5e2fad243 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 25 Nov 2018 19:21:05 -0500 Subject: through sub_812D5EC --- include/field_map_obj.h | 1 + include/scanline_effect.h | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 include/scanline_effect.h (limited to 'include') diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 685701e89..d2ec58979 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -87,6 +87,7 @@ u8 sub_80634F0(u8 direction); u8 sub_8063500(u8 a0); void sub_805F060(struct MapObject *mapObject, u8 a1); u8 sub_805EB44(u8, u8, s16, s16); +void npc_paltag_set_load(u8 mode); // Exported data declarations diff --git a/include/scanline_effect.h b/include/scanline_effect.h new file mode 100644 index 000000000..d49f5b4d6 --- /dev/null +++ b/include/scanline_effect.h @@ -0,0 +1,6 @@ +#ifndef GUARD_SCANLINE_EFFECT_H +#define GUARD_SCANLINE_EFFECT_H + +void remove_some_task(void); + +#endif //GUARD_SCANLINE_EFFECT_H -- cgit v1.2.3 From 5c013a089798efa1819986528de4af8470a9c329 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 25 Nov 2018 21:12:07 -0500 Subject: through sub_812DA14 --- include/battle_dome_cards.h | 2 ++ include/text.h | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) (limited to 'include') diff --git a/include/battle_dome_cards.h b/include/battle_dome_cards.h index 48d165e9c..94c9876f3 100644 --- a/include/battle_dome_cards.h +++ b/include/battle_dome_cards.h @@ -11,5 +11,7 @@ u16 sub_818D8AC(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 u16 sub_818D8F0(u16 spriteId); u16 sub_818D938(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId); u8 sub_818D97C(u8 a0, u8 a1); +u8 sub_810C2A4(u16, u8, s16, s16, u8, u16); +void sub_810C2E8(u16); #endif //GUARD_BATTLE_DOME_CARDS_H diff --git a/include/text.h b/include/text.h index 2bda590c1..e127f103a 100644 --- a/include/text.h +++ b/include/text.h @@ -161,7 +161,7 @@ extern const struct FontInfo *gFonts; struct GlyphWidthFunc { u32 font_id; - u32 (*func)(u16 glyphId, bool32 isJapanese); + s32 (*func)(u16 glyphId, bool32 isJapanese); }; struct KeypadIcon @@ -224,9 +224,9 @@ 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); -u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing); -u32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32); -u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing); +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); u8 DrawKeypadIcon(u8 windowId, u8 keypadIconId, u16 x, u16 y); u8 GetKeypadIconTileOffset(u8 keypadIconId); @@ -236,19 +236,19 @@ void SetDefaultFontsPointer(void); u8 GetFontAttribute(u8 fontId, u8 attributeId); u8 GetMenuCursorDimensionByFont(u8 fontId, u8 whichDimension); void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese); -u32 GetGlyphWidthFont0(u16 glyphId, bool32 isJapanese); +s32 GetGlyphWidthFont0(u16 glyphId, bool32 isJapanese); void DecompressGlyphFont7(u16 glyphId, bool32 isJapanese); -u32 GetGlyphWidthFont7(u16 glyphId, bool32 isJapanese); +s32 GetGlyphWidthFont7(u16 glyphId, bool32 isJapanese); void DecompressGlyphFont8(u16 glyphId, bool32 isJapanese); -u32 GetGlyphWidthFont8(u16 glyphId, bool32 isJapanese); +s32 GetGlyphWidthFont8(u16 glyphId, bool32 isJapanese); void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese); -u32 GetGlyphWidthFont2(u16 glyphId, bool32 isJapanese); +s32 GetGlyphWidthFont2(u16 glyphId, bool32 isJapanese); void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese); -u32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese); +s32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese); void DecompressGlyphFont9(u16 glyphId); -u32 GetGlyphWidthFont3(u16 glyphId, bool32 isJapanese); -u32 GetGlyphWidthFont4(u16 glyphId, bool32 isJapanese); -u32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese); +s32 GetGlyphWidthFont3(u16 glyphId, bool32 isJapanese); +s32 GetGlyphWidthFont4(u16 glyphId, bool32 isJapanese); +s32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese); void sub_80062B0(struct Sprite *sprite); #endif // GUARD_TEXT_H -- cgit v1.2.3 From 82c7bd49aa07293c840254bccc144836057f2c65 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 25 Nov 2018 21:58:52 -0500 Subject: through sub_812DB64 --- include/list_menu.h | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'include') diff --git a/include/list_menu.h b/include/list_menu.h index 89adeaba0..fc829940e 100644 --- a/include/list_menu.h +++ b/include/list_menu.h @@ -18,22 +18,23 @@ struct ListMenu; struct ListMenuTemplate { const struct ListMenuItem *items; - void (* unk_04)(u32, bool8, struct ListMenu *); - void (* unk_08)(u8, s32, u8); + void (* moveCursorFunc)(s32 itemIndex, bool8 onInit, struct ListMenu *list); + void (* itemPrintFunc)(u8 windowId, s32 itemId, u8 y); u16 totalItems; u16 maxShowed; - u8 unk_10; - u8 unk_11; - u8 unk_12; - u8 cursor_Y; - u32 upText_Y:4; // x1, x2, x4, x8 = xF - u32 cursorColor:4; // x10, x20, x40, x80 = xF0 - u32 fillColor:4; // x100, x200, x400, x800 = xF00 - u32 cursorShadowColor:4; // x1000, x2000, x4000, x8000 = xF000 - u32 unk_16_0:1; // x10000 - u32 spaceBetweenItems:6; // x20000, x40000, x80000, x100000, x200000, x400000 = x7E0000 - u32 unk_16_7:1; // x800000 - u32 unk_17_0:6; // x1000000, x2000000, x4000000, x8000000, x10000000, x20000000 = x3F000000 + u8 windowId; + u8 header_X; + u8 item_X; + u8 cursor_X; + u8 upText_Y:4; // x1, x2, x4, x8 = xF + u8 cursorPal:4; // x10, x20, x40, x80 = xF0 + u8 fillValue:4; // x1, x2, x4, x8 = xF + u8 cursorShadowPal:4; // x10, x20, x40, x80 = xF0 + u8 lettersSpacing:3; + u8 itemVerticalPadding:3; + u8 scrollMultiple:2; // x40, x80 = xC0 + u8 fontId:6; // x1, x2, x4, x8, x10, x20 = x3F + u8 cursorKind:2; // x40, x80 }; struct ListMenu { -- cgit v1.2.3 From eb8dface178fed90656ea7a7726b6835ee5a1229 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 10:26:12 -0500 Subject: through sub_812E064 --- include/menu_indicators.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'include') diff --git a/include/menu_indicators.h b/include/menu_indicators.h index 2350e2502..f88fd5549 100644 --- a/include/menu_indicators.h +++ b/include/menu_indicators.h @@ -7,8 +7,17 @@ // Exported RAM declarations +struct ScrollIndicatorArrowPairTemplate +{ + u8 filler_00[6]; + u16 unk_06; + u16 unk_08; + u8 filler_0a[6]; +}; + // Exported ROM declarations u8 AddScrollIndicatorArrowPairParametrized(u8, u8, u8, u8, s32, u16, u16, u16 *); +u8 AddScrollIndicatorArrowPair(const struct ScrollIndicatorArrowPairTemplate * template, u16 * a1); void RemoveScrollIndicatorArrowPair(u8); #endif //GUARD_MENU_INDICATORS_H -- cgit v1.2.3 From f75453388c6f9e1123915707f6d69c3373f761f6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 10:54:41 -0500 Subject: Finish decomp of fame_checker(.text) --- include/list_menu.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/list_menu.h b/include/list_menu.h index fc829940e..8834e5215 100644 --- a/include/list_menu.h +++ b/include/list_menu.h @@ -56,5 +56,6 @@ s32 ListMenuHandleInput(u8 id); void get_coro_args_x18_x1A(u8 a0, u16 *a1, u16 *a2); void sub_81AE6C8(u8 a0, u16 *a1, u16 *a2); void sub_810713C(u8, u8, u8); +u16 ListMenuGetYCoordForPrintingArrowCursor(u8); #endif //GUARD_LIST_MENU_H -- cgit v1.2.3 From ae8b4043c1690d6b3cb62f89372c7f7e6d45348b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 12:34:22 -0500 Subject: More data decomp --- include/event_scripts.h | 132 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) (limited to 'include') diff --git a/include/event_scripts.h b/include/event_scripts.h index ebfdb4fe3..28106d9d4 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -381,4 +381,136 @@ extern const u8 gUnknown_84178DA[]; extern const u8 gUnknown_81C137C[]; extern const u8 gUnknown_81C13D6[]; extern const u8 gUnknown_81C1429[]; + +// fame_checker + +extern const u8 gUnknown_81AD106[]; +extern const u8 gUnknown_81AD145[]; +extern const u8 gUnknown_81AD1BB[]; +extern const u8 gUnknown_81AD258[]; +extern const u8 gUnknown_81AD2B9[]; +extern const u8 gUnknown_81AD377[]; +extern const u8 gUnknown_81AD40C[]; +extern const u8 gUnknown_81AD4AE[]; +extern const u8 gUnknown_81AD516[]; +extern const u8 gUnknown_81AD5A7[]; +extern const u8 gUnknown_81AD608[]; +extern const u8 gUnknown_81AD69F[]; +extern const u8 gUnknown_81AD705[]; +extern const u8 gUnknown_81AD771[]; +extern const u8 gUnknown_81AD840[]; +extern const u8 gUnknown_81AD908[]; +extern const u8 gUnknown_81AD99A[]; +extern const u8 gUnknown_81ADA27[]; +extern const u8 gUnknown_81ADA91[]; +extern const u8 gUnknown_81ADAF6[]; +extern const u8 gUnknown_81ADB5A[]; +extern const u8 gUnknown_81ADBD9[]; +extern const u8 gUnknown_81ADC72[]; +extern const u8 gUnknown_81ADCEB[]; +extern const u8 gUnknown_81ADD3C[]; +extern const u8 gUnknown_81ADDA7[]; +extern const u8 gUnknown_81ADE0B[]; +extern const u8 gUnknown_81ADE82[]; +extern const u8 gUnknown_81ADEEC[]; +extern const u8 gUnknown_81ADF6A[]; +extern const u8 gUnknown_81AE009[]; +extern const u8 gUnknown_81AE072[]; +extern const u8 gUnknown_81AE0F3[]; +extern const u8 gUnknown_81AE15B[]; +extern const u8 gUnknown_81AE1E5[]; +extern const u8 gUnknown_81AE247[]; +extern const u8 gUnknown_81AE2B6[]; +extern const u8 gUnknown_81AE31D[]; +extern const u8 gUnknown_81AE37D[]; +extern const u8 gUnknown_81AE407[]; +extern const u8 gUnknown_81AE48D[]; +extern const u8 gUnknown_81AE51B[]; +extern const u8 gUnknown_81AE5E8[]; +extern const u8 gUnknown_81AE656[]; +extern const u8 gUnknown_81AE6D7[]; +extern const u8 gUnknown_81AE762[]; +extern const u8 gUnknown_81AE7CB[]; +extern const u8 gUnknown_81AE841[]; +extern const u8 gUnknown_81AE89E[]; +extern const u8 gUnknown_81AE90A[]; +extern const u8 gUnknown_81AE990[]; +extern const u8 gUnknown_81AEA59[]; +extern const u8 gUnknown_81AEAEE[]; +extern const u8 gUnknown_81AEB69[]; +extern const u8 gUnknown_81AEBDF[]; +extern const u8 gUnknown_81AEC28[]; +extern const u8 gUnknown_81AEC82[]; +extern const u8 gUnknown_81AED27[]; +extern const u8 gUnknown_81AEDAA[]; +extern const u8 gUnknown_81AEE51[]; +extern const u8 gUnknown_81AEF25[]; +extern const u8 gUnknown_81AEF6C[]; +extern const u8 gUnknown_81AEFC6[]; +extern const u8 gUnknown_81AF04C[]; +extern const u8 gUnknown_81AF0F0[]; +extern const u8 gUnknown_81AF19A[]; +extern const u8 gUnknown_81AF200[]; +extern const u8 gUnknown_81AF248[]; +extern const u8 gUnknown_81AF2B7[]; +extern const u8 gUnknown_81AF34E[]; +extern const u8 gUnknown_81AF3BE[]; +extern const u8 gUnknown_81AF47C[]; +extern const u8 gUnknown_81AF4FD[]; +extern const u8 gUnknown_81AF567[]; +extern const u8 gUnknown_81AF641[]; +extern const u8 gUnknown_81AF6BA[]; +extern const u8 gUnknown_81AF758[]; +extern const u8 gUnknown_81AF7CB[]; +extern const u8 gUnknown_81AF83E[]; +extern const u8 gUnknown_81AF8CA[]; +extern const u8 gUnknown_81AF929[]; +extern const u8 gUnknown_81AF998[]; +extern const u8 gUnknown_81AFA20[]; +extern const u8 gUnknown_81AFAB9[]; +extern const u8 gUnknown_81AFB0C[]; +extern const u8 gUnknown_81AFB76[]; +extern const u8 gUnknown_81AFC38[]; +extern const u8 gUnknown_81AFCE9[]; +extern const u8 gUnknown_81AFD49[]; +extern const u8 gUnknown_81AFDC4[]; +extern const u8 gUnknown_81AFE68[]; +extern const u8 gUnknown_81AFF23[]; +extern const u8 gUnknown_81AFFA8[]; +extern const u8 gUnknown_81B0022[]; +extern const u8 gUnknown_81B00A6[]; +extern const u8 gUnknown_81B0106[]; +extern const u8 gUnknown_81B0188[]; +extern const u8 gUnknown_81B0198[]; +extern const u8 gUnknown_81B0251[]; +extern const u8 gUnknown_81B025D[]; +extern const u8 gUnknown_81B030F[]; +extern const u8 gUnknown_81B031B[]; +extern const u8 gUnknown_81B03B3[]; +extern const u8 gUnknown_81B03BF[]; +extern const u8 gUnknown_81B0446[]; +extern const u8 gUnknown_81B0456[]; +extern const u8 gUnknown_81B0504[]; +extern const u8 gUnknown_81B0510[]; +extern const u8 gUnknown_81B05C2[]; +extern const u8 gUnknown_81B05CD[]; +extern const u8 gUnknown_81B0667[]; +extern const u8 gUnknown_81B0675[]; +extern const u8 gUnknown_81B06FB[]; +extern const u8 gUnknown_81B0708[]; +extern const u8 gUnknown_81B079F[]; +extern const u8 gUnknown_81B07AD[]; +extern const u8 gUnknown_81B0845[]; +extern const u8 gUnknown_81B0851[]; +extern const u8 gUnknown_81B08EE[]; +extern const u8 gUnknown_81B08FB[]; +extern const u8 gUnknown_81B097F[]; +extern const u8 gUnknown_81B098B[]; +extern const u8 gUnknown_81B0A45[]; +extern const u8 gUnknown_81B0A50[]; +extern const u8 gUnknown_81B0AFF[]; +extern const u8 gUnknown_81B0B0E[]; +extern const u8 gUnknown_81B0BA6[]; +extern const u8 gUnknown_81B0BB5[]; + #endif //GUARD_EVENT_SCRIPTS_H -- cgit v1.2.3 From 6fb78b0885d4dacf83df09eb48bb97d3c75b6680 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 12:51:56 -0500 Subject: more text dism --- include/event_scripts.h | 96 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) (limited to 'include') diff --git a/include/event_scripts.h b/include/event_scripts.h index 28106d9d4..2aec4a406 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -512,5 +512,101 @@ extern const u8 gUnknown_81B0AFF[]; extern const u8 gUnknown_81B0B0E[]; extern const u8 gUnknown_81B0BA6[]; extern const u8 gUnknown_81B0BB5[]; +extern const u8 gUnknown_81B0C45[]; +extern const u8 gUnknown_81B0C51[]; +extern const u8 gUnknown_81B0C5E[]; +extern const u8 gUnknown_81B0C6B[]; +extern const u8 gUnknown_81B0C79[]; +extern const u8 gUnknown_81B0C88[]; +extern const u8 gUnknown_81B0C95[]; +extern const u8 gUnknown_81B0CA2[]; +extern const u8 gUnknown_81B0CB1[]; +extern const u8 gUnknown_81B0CC1[]; +extern const u8 gUnknown_81B0CCF[]; +extern const u8 gUnknown_81B0CDF[]; +extern const u8 gUnknown_81B0CEB[]; +extern const u8 gUnknown_81B0CF7[]; +extern const u8 gUnknown_81B0D02[]; +extern const u8 gUnknown_81B0D0E[]; +extern const u8 gUnknown_81B0D16[]; +extern const u8 gUnknown_81B0D1F[]; +extern const u8 gUnknown_81B0D2D[]; +extern const u8 gUnknown_81B0D3B[]; +extern const u8 gUnknown_81B0D48[]; +extern const u8 gUnknown_81B0D55[]; +extern const u8 gUnknown_81B0D65[]; +extern const u8 gUnknown_81B0D73[]; +extern const u8 gUnknown_81B0D81[]; +extern const u8 gUnknown_81B0D90[]; +extern const u8 gUnknown_81B0D9E[]; +extern const u8 gUnknown_81B0DAC[]; +extern const u8 gUnknown_81B0DBA[]; +extern const u8 gUnknown_81B0DC8[]; +extern const u8 gUnknown_81B0DD7[]; +extern const u8 gUnknown_81B0DE4[]; +extern const u8 gUnknown_81B0DF0[]; +extern const u8 gUnknown_81B0DFC[]; +extern const u8 gUnknown_81B0E08[]; +extern const u8 gUnknown_81B0E14[]; +extern const u8 gUnknown_81B0E24[]; +extern const u8 gUnknown_81B0E31[]; +extern const u8 gUnknown_81B0E3D[]; +extern const u8 gUnknown_81B0E49[]; +extern const u8 gUnknown_81B0E56[]; +extern const u8 gUnknown_81B0E63[]; +extern const u8 gUnknown_81B0E6F[]; +extern const u8 gUnknown_81B0E7C[]; +extern const u8 gUnknown_81B0E89[]; +extern const u8 gUnknown_81B0E95[]; +extern const u8 gUnknown_81B0EA1[]; +extern const u8 gUnknown_81B0EAE[]; +extern const u8 gUnknown_81B0EBA[]; +extern const u8 gUnknown_81B0ECA[]; +extern const u8 gUnknown_81B0ED7[]; +extern const u8 gUnknown_81B0EE4[]; +extern const u8 gUnknown_81B0EF4[]; +extern const u8 gUnknown_81B0F01[]; +extern const u8 gUnknown_81B0F11[]; +extern const u8 gUnknown_81B0F20[]; +extern const u8 gUnknown_81B0F2F[]; +extern const u8 gUnknown_81B0F3B[]; +extern const u8 gUnknown_81B0F47[]; +extern const u8 gUnknown_81B0F53[]; +extern const u8 gUnknown_81B0F5F[]; +extern const u8 gUnknown_81B0F6E[]; +extern const u8 gUnknown_81B0F7D[]; +extern const u8 gUnknown_81B0F8A[]; +extern const u8 gUnknown_81B0F94[]; +extern const u8 gUnknown_81B0F9F[]; +extern const u8 gUnknown_81B0FAE[]; +extern const u8 gUnknown_81B0FBD[]; +extern const u8 gUnknown_81B0FCC[]; +extern const u8 gUnknown_81B0FDB[]; +extern const u8 gUnknown_81B0FE8[]; +extern const u8 gUnknown_81B0FF7[]; +extern const u8 gUnknown_81B1002[]; +extern const u8 gUnknown_81B1011[]; +extern const u8 gUnknown_81B1020[]; +extern const u8 gUnknown_81B102D[]; +extern const u8 gUnknown_81B103B[]; +extern const u8 gUnknown_81B104A[]; +extern const u8 gUnknown_81B1059[]; +extern const u8 gUnknown_81B1067[]; +extern const u8 gUnknown_81B1075[]; +extern const u8 gUnknown_81B1082[]; +extern const u8 gUnknown_81B108D[]; +extern const u8 gUnknown_81B1098[]; +extern const u8 gUnknown_81B10A3[]; +extern const u8 gUnknown_81B10B1[]; +extern const u8 gUnknown_81B10BF[]; +extern const u8 gUnknown_81B10CD[]; +extern const u8 gUnknown_81B10DB[]; +extern const u8 gUnknown_81B10E8[]; +extern const u8 gUnknown_81B10F8[]; +extern const u8 gUnknown_81B1107[]; +extern const u8 gUnknown_81B1111[]; +extern const u8 gUnknown_81B111B[]; +extern const u8 gUnknown_81B1128[]; +extern const u8 gUnknown_81B1135[]; #endif //GUARD_EVENT_SCRIPTS_H -- cgit v1.2.3 From e85ce728372d4c03deef73e41d883b04062a415a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 12:57:24 -0500 Subject: Another text pointer table decomped --- include/event_scripts.h | 96 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) (limited to 'include') diff --git a/include/event_scripts.h b/include/event_scripts.h index 2aec4a406..4405b831d 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -608,5 +608,101 @@ extern const u8 gUnknown_81B1111[]; extern const u8 gUnknown_81B111B[]; extern const u8 gUnknown_81B1128[]; extern const u8 gUnknown_81B1135[]; +extern const u8 gUnknown_81B1146[]; +extern const u8 gUnknown_81B114B[]; +extern const u8 gUnknown_81B1155[]; +extern const u8 gUnknown_81B115A[]; +extern const u8 gUnknown_81B116A[]; +extern const u8 gUnknown_81B1171[]; +extern const u8 gUnknown_81B1176[]; +extern const u8 gUnknown_81B117B[]; +extern const u8 gUnknown_81B1181[]; +extern const u8 gUnknown_81B1185[]; +extern const u8 gUnknown_81B1195[]; +extern const u8 gUnknown_81B119E[]; +extern const u8 gUnknown_81B11AE[]; +extern const u8 gUnknown_81B11B3[]; +extern const u8 gUnknown_81B11B9[]; +extern const u8 gUnknown_81B11C3[]; +extern const u8 gUnknown_81B11C7[]; +extern const u8 gUnknown_81B11CB[]; +extern const u8 gUnknown_81B11DB[]; +extern const u8 gUnknown_81B11E0[]; +extern const u8 gUnknown_81B11E6[]; +extern const u8 gUnknown_81B11EB[]; +extern const u8 gUnknown_81B11F5[]; +extern const u8 gUnknown_81B11FA[]; +extern const u8 gUnknown_81B120A[]; +extern const u8 gUnknown_81B120F[]; +extern const u8 gUnknown_81B1219[]; +extern const u8 gUnknown_81B1220[]; +extern const u8 gUnknown_81B1227[]; +extern const u8 gUnknown_81B122E[]; +extern const u8 gUnknown_81B123E[]; +extern const u8 gUnknown_81B1243[]; +extern const u8 gUnknown_81B1249[]; +extern const u8 gUnknown_81B124E[]; +extern const u8 gUnknown_81B1254[]; +extern const u8 gUnknown_81B125A[]; +extern const u8 gUnknown_81B126A[]; +extern const u8 gUnknown_81B126F[]; +extern const u8 gUnknown_81B1274[]; +extern const u8 gUnknown_81B1279[]; +extern const u8 gUnknown_81B1281[]; +extern const u8 gUnknown_81B1291[]; +extern const u8 gUnknown_81B1295[]; +extern const u8 gUnknown_81B129A[]; +extern const u8 gUnknown_81B12A4[]; +extern const u8 gUnknown_81B12AC[]; +extern const u8 gUnknown_81B12B4[]; +extern const u8 gUnknown_81B12C4[]; +extern const u8 gUnknown_81B12CA[]; +extern const u8 gUnknown_81B12CF[]; +extern const u8 gUnknown_81B12D6[]; +extern const u8 gUnknown_81B12DC[]; +extern const u8 gUnknown_81B12E2[]; +extern const u8 gUnknown_81B12E8[]; +extern const u8 gUnknown_81B12F8[]; +extern const u8 gUnknown_81B1300[]; +extern const u8 gUnknown_81B1308[]; +extern const u8 gUnknown_81B1310[]; +extern const u8 gUnknown_81B1320[]; +extern const u8 gUnknown_81B132C[]; +extern const u8 gUnknown_81B1335[]; +extern const u8 gUnknown_81B133B[]; +extern const u8 gUnknown_81B1341[]; +extern const u8 gUnknown_81B1351[]; +extern const u8 gUnknown_81B1359[]; +extern const u8 gUnknown_81B135F[]; +extern const u8 gUnknown_81B1367[]; +extern const u8 gUnknown_81B136E[]; +extern const u8 gUnknown_81B1376[]; +extern const u8 gUnknown_81B137E[]; +extern const u8 gUnknown_81B138E[]; +extern const u8 gUnknown_81B1395[]; +extern const u8 gUnknown_81B139E[]; +extern const u8 gUnknown_81B13A4[]; +extern const u8 gUnknown_81B13AA[]; +extern const u8 gUnknown_81B13B0[]; +extern const u8 gUnknown_81B13BC[]; +extern const u8 gUnknown_81B13CC[]; +extern const u8 gUnknown_81B13D6[]; +extern const u8 gUnknown_81B13D9[]; +extern const u8 gUnknown_81B13E4[]; +extern const u8 gUnknown_81B13EC[]; +extern const u8 gUnknown_81B13F2[]; +extern const u8 gUnknown_81B13F8[]; +extern const u8 gUnknown_81B13FE[]; +extern const u8 gUnknown_81B140A[]; +extern const u8 gUnknown_81B1416[]; +extern const u8 gUnknown_81B141F[]; +extern const u8 gUnknown_81B1423[]; +extern const u8 gUnknown_81B1429[]; +extern const u8 gUnknown_81B1439[]; +extern const u8 gUnknown_81B1442[]; +extern const u8 gUnknown_81B144C[]; +extern const u8 gUnknown_81B1456[]; +extern const u8 gUnknown_81B145F[]; +extern const u8 gUnknown_81B1463[]; #endif //GUARD_EVENT_SCRIPTS_H -- cgit v1.2.3 From a2b7b3ebf2f5460c4f5ab076e5dcb06935f61d25 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 15:47:50 -0500 Subject: Finish data decomp --- include/menu_indicators.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/menu_indicators.h b/include/menu_indicators.h index f88fd5549..f195ceb6d 100644 --- a/include/menu_indicators.h +++ b/include/menu_indicators.h @@ -9,10 +9,18 @@ struct ScrollIndicatorArrowPairTemplate { - u8 filler_00[6]; + u8 unk_00; + u8 unk_01; + u8 unk_02; + u8 unk_03; + u8 unk_04; + u8 unk_05; u16 unk_06; u16 unk_08; - u8 filler_0a[6]; + u16 unk_0a; + u16 unk_0c; + u16 unk_0e_0:4; + u16 unk_0e_4:12; }; // Exported ROM declarations -- cgit v1.2.3 From 9750849c69899b0faaa156f397ff63dd086ab40c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 16:47:19 -0500 Subject: Genericize PRESSED macro --- include/global.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index 9fb7703cd..2b9b00d5c 100644 --- a/include/global.h +++ b/include/global.h @@ -67,7 +67,9 @@ // We suspect it was used globally. // GameFreak never ceases to amaze. // TODO: Propagate use of this macro -#define PRESSED(button) ({gMain.newKeys & (button);}) +#define TEST_BUTTON(field, button) ({(field) & (button);}) +#define PRESSED(button) TEST_BUTTON(gMain.newKeys, button) +#define PUSHED(button) TEST_BUTTON(gMain.heldKeys, button) extern u8 gStringVar1[]; extern u8 gStringVar2[]; -- cgit v1.2.3 From 69106536eb68653a47f31c7bd9f8755087ce7b43 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 18:12:17 -0500 Subject: Start documenting stuff; make objects static where possible --- include/fame_checker.h | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 include/fame_checker.h (limited to 'include') diff --git a/include/fame_checker.h b/include/fame_checker.h new file mode 100644 index 000000000..7e95a7224 --- /dev/null +++ b/include/fame_checker.h @@ -0,0 +1,9 @@ +#ifndef GUARD_FAME_CHECKER_H +#define GUARD_FAME_CHECKER_H + +#include "main.h" + +void ResetFameChecker(void); +void UseFameChecker(MainCallback savedCallback); + +#endif //GUARD_FAME_CHECKER_H -- cgit v1.2.3 From b21c50675b8b143608b39b26b53788e4807bbc9e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 18:24:17 -0500 Subject: PRESSED-->JOY_NEW, PUSHED-->JOY_HELD --- include/global.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index 2b9b00d5c..84597dba0 100644 --- a/include/global.h +++ b/include/global.h @@ -68,8 +68,8 @@ // GameFreak never ceases to amaze. // TODO: Propagate use of this macro #define TEST_BUTTON(field, button) ({(field) & (button);}) -#define PRESSED(button) TEST_BUTTON(gMain.newKeys, button) -#define PUSHED(button) TEST_BUTTON(gMain.heldKeys, button) +#define JOY_NEW(button) TEST_BUTTON(gMain.newKeys, button) +#define JOY_HELD(button) TEST_BUTTON(gMain.heldKeys, button) extern u8 gStringVar1[]; extern u8 gStringVar2[]; -- cgit v1.2.3 From 7e684b32f108bc484f3f8ba66b209d3f633e8acd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Nov 2018 22:27:19 -0500 Subject: More documentation of fame checker --- include/fame_checker.h | 19 +++++++++++++++++++ include/item_menu.h | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/fame_checker.h b/include/fame_checker.h index 7e95a7224..bc653740e 100644 --- a/include/fame_checker.h +++ b/include/fame_checker.h @@ -3,6 +3,25 @@ #include "main.h" +enum { + FAMECHECKER_OAK, + FAMECHECKER_DAISY, + FAMECHECKER_BROCK, + FAMECHECKER_MISTY, + FAMECHECKER_LTSURGE, + FAMECHECKER_ERIKA, + FAMECHECKER_KOGA, + FAMECHECKER_SABRINA, + FAMECHECKER_BLAINE, + FAMECHECKER_LORELEI, + FAMECHECKER_BRUNO, + FAMECHECKER_AGATHA, + FAMECHECKER_LANCE, + FAMECHECKER_BILL, + FAMECHECKER_MRFUJI, + FAMECHECKER_GIOVANNI +}; + void ResetFameChecker(void); void UseFameChecker(MainCallback savedCallback); diff --git a/include/item_menu.h b/include/item_menu.h index 64cb2d762..2482aa51f 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -12,6 +12,6 @@ extern u16 gUnknown_203AD30; // Exported ROM declarations void sub_81AAC50(void); void sub_81AAC70(void); -void sub_8107EB8(void); +void UseFameCheckerFromMenu(void); #endif //GUARD_ITEM_MENU_H -- cgit v1.2.3 From a738e3dca5563355df0b31323a95e017ce9205d6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 27 Nov 2018 08:44:24 -0500 Subject: More documentation and enums --- include/fame_checker.h | 6 ++++++ include/global.berry.h | 2 -- include/global.fieldmap.h | 2 -- include/global.h | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/fame_checker.h b/include/fame_checker.h index bc653740e..fad629108 100644 --- a/include/fame_checker.h +++ b/include/fame_checker.h @@ -22,6 +22,12 @@ enum { FAMECHECKER_GIOVANNI }; +enum { + FCPICKSTATE_NO_DRAW, + FCPICKSTATE_SILHOUETTE, + FCPICKSTATE_COLORED +}; + void ResetFameChecker(void); void UseFameChecker(MainCallback savedCallback); diff --git a/include/global.berry.h b/include/global.berry.h index f9e27b186..5c8a43a02 100644 --- a/include/global.berry.h +++ b/include/global.berry.h @@ -1,8 +1,6 @@ #ifndef GUARD_GLOBAL_BERRY_H #define GUARD_GLOBAL_BERRY_H -#include "global.h" - #define BERRY_NAME_COUNT 7 #define BERRY_ITEM_EFFECT_COUNT 18 diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 98077d8d4..ed5054b7d 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -1,8 +1,6 @@ #ifndef GUARD_GLOBAL_FIELDMAP_H #define GUARD_GLOBAL_FIELDMAP_H -#include "global.h" - #define NUM_FIELD_OBJECTS 16 enum diff --git a/include/global.h b/include/global.h index 84597dba0..d99f912ae 100644 --- a/include/global.h +++ b/include/global.h @@ -574,8 +574,8 @@ struct QuestLog struct FameCheckerSaveData { - /*3a54*/ u16 unk_0_0:2; - u16 unk_0_2:12; + /*3a54*/ u16 pickState:2; + u16 flavorTextFlags:12; u16 unk_0_E:2; }; -- cgit v1.2.3 From d2bd51c49f0654a7cb37a6aeb0f50b8b2d2470b1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 27 Nov 2018 16:50:10 -0500 Subject: Rename most assets and functions in fame_checker --- include/event_scripts.h | 640 ++++++++++++++++++++++----------------------- include/fame_checker.h | 13 +- include/global.h | 4 +- include/new_menu_helpers.h | 2 +- 4 files changed, 336 insertions(+), 323 deletions(-) (limited to 'include') diff --git a/include/event_scripts.h b/include/event_scripts.h index 4405b831d..b909566d0 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -384,325 +384,325 @@ extern const u8 gUnknown_81C1429[]; // fame_checker -extern const u8 gUnknown_81AD106[]; -extern const u8 gUnknown_81AD145[]; -extern const u8 gUnknown_81AD1BB[]; -extern const u8 gUnknown_81AD258[]; -extern const u8 gUnknown_81AD2B9[]; -extern const u8 gUnknown_81AD377[]; -extern const u8 gUnknown_81AD40C[]; -extern const u8 gUnknown_81AD4AE[]; -extern const u8 gUnknown_81AD516[]; -extern const u8 gUnknown_81AD5A7[]; -extern const u8 gUnknown_81AD608[]; -extern const u8 gUnknown_81AD69F[]; -extern const u8 gUnknown_81AD705[]; -extern const u8 gUnknown_81AD771[]; -extern const u8 gUnknown_81AD840[]; -extern const u8 gUnknown_81AD908[]; -extern const u8 gUnknown_81AD99A[]; -extern const u8 gUnknown_81ADA27[]; -extern const u8 gUnknown_81ADA91[]; -extern const u8 gUnknown_81ADAF6[]; -extern const u8 gUnknown_81ADB5A[]; -extern const u8 gUnknown_81ADBD9[]; -extern const u8 gUnknown_81ADC72[]; -extern const u8 gUnknown_81ADCEB[]; -extern const u8 gUnknown_81ADD3C[]; -extern const u8 gUnknown_81ADDA7[]; -extern const u8 gUnknown_81ADE0B[]; -extern const u8 gUnknown_81ADE82[]; -extern const u8 gUnknown_81ADEEC[]; -extern const u8 gUnknown_81ADF6A[]; -extern const u8 gUnknown_81AE009[]; -extern const u8 gUnknown_81AE072[]; -extern const u8 gUnknown_81AE0F3[]; -extern const u8 gUnknown_81AE15B[]; -extern const u8 gUnknown_81AE1E5[]; -extern const u8 gUnknown_81AE247[]; -extern const u8 gUnknown_81AE2B6[]; -extern const u8 gUnknown_81AE31D[]; -extern const u8 gUnknown_81AE37D[]; -extern const u8 gUnknown_81AE407[]; -extern const u8 gUnknown_81AE48D[]; -extern const u8 gUnknown_81AE51B[]; -extern const u8 gUnknown_81AE5E8[]; -extern const u8 gUnknown_81AE656[]; -extern const u8 gUnknown_81AE6D7[]; -extern const u8 gUnknown_81AE762[]; -extern const u8 gUnknown_81AE7CB[]; -extern const u8 gUnknown_81AE841[]; -extern const u8 gUnknown_81AE89E[]; -extern const u8 gUnknown_81AE90A[]; -extern const u8 gUnknown_81AE990[]; -extern const u8 gUnknown_81AEA59[]; -extern const u8 gUnknown_81AEAEE[]; -extern const u8 gUnknown_81AEB69[]; -extern const u8 gUnknown_81AEBDF[]; -extern const u8 gUnknown_81AEC28[]; -extern const u8 gUnknown_81AEC82[]; -extern const u8 gUnknown_81AED27[]; -extern const u8 gUnknown_81AEDAA[]; -extern const u8 gUnknown_81AEE51[]; -extern const u8 gUnknown_81AEF25[]; -extern const u8 gUnknown_81AEF6C[]; -extern const u8 gUnknown_81AEFC6[]; -extern const u8 gUnknown_81AF04C[]; -extern const u8 gUnknown_81AF0F0[]; -extern const u8 gUnknown_81AF19A[]; -extern const u8 gUnknown_81AF200[]; -extern const u8 gUnknown_81AF248[]; -extern const u8 gUnknown_81AF2B7[]; -extern const u8 gUnknown_81AF34E[]; -extern const u8 gUnknown_81AF3BE[]; -extern const u8 gUnknown_81AF47C[]; -extern const u8 gUnknown_81AF4FD[]; -extern const u8 gUnknown_81AF567[]; -extern const u8 gUnknown_81AF641[]; -extern const u8 gUnknown_81AF6BA[]; -extern const u8 gUnknown_81AF758[]; -extern const u8 gUnknown_81AF7CB[]; -extern const u8 gUnknown_81AF83E[]; -extern const u8 gUnknown_81AF8CA[]; -extern const u8 gUnknown_81AF929[]; -extern const u8 gUnknown_81AF998[]; -extern const u8 gUnknown_81AFA20[]; -extern const u8 gUnknown_81AFAB9[]; -extern const u8 gUnknown_81AFB0C[]; -extern const u8 gUnknown_81AFB76[]; -extern const u8 gUnknown_81AFC38[]; -extern const u8 gUnknown_81AFCE9[]; -extern const u8 gUnknown_81AFD49[]; -extern const u8 gUnknown_81AFDC4[]; -extern const u8 gUnknown_81AFE68[]; -extern const u8 gUnknown_81AFF23[]; -extern const u8 gUnknown_81AFFA8[]; -extern const u8 gUnknown_81B0022[]; -extern const u8 gUnknown_81B00A6[]; -extern const u8 gUnknown_81B0106[]; -extern const u8 gUnknown_81B0188[]; -extern const u8 gUnknown_81B0198[]; -extern const u8 gUnknown_81B0251[]; -extern const u8 gUnknown_81B025D[]; -extern const u8 gUnknown_81B030F[]; -extern const u8 gUnknown_81B031B[]; -extern const u8 gUnknown_81B03B3[]; -extern const u8 gUnknown_81B03BF[]; -extern const u8 gUnknown_81B0446[]; -extern const u8 gUnknown_81B0456[]; -extern const u8 gUnknown_81B0504[]; -extern const u8 gUnknown_81B0510[]; -extern const u8 gUnknown_81B05C2[]; -extern const u8 gUnknown_81B05CD[]; -extern const u8 gUnknown_81B0667[]; -extern const u8 gUnknown_81B0675[]; -extern const u8 gUnknown_81B06FB[]; -extern const u8 gUnknown_81B0708[]; -extern const u8 gUnknown_81B079F[]; -extern const u8 gUnknown_81B07AD[]; -extern const u8 gUnknown_81B0845[]; -extern const u8 gUnknown_81B0851[]; -extern const u8 gUnknown_81B08EE[]; -extern const u8 gUnknown_81B08FB[]; -extern const u8 gUnknown_81B097F[]; -extern const u8 gUnknown_81B098B[]; -extern const u8 gUnknown_81B0A45[]; -extern const u8 gUnknown_81B0A50[]; -extern const u8 gUnknown_81B0AFF[]; -extern const u8 gUnknown_81B0B0E[]; -extern const u8 gUnknown_81B0BA6[]; -extern const u8 gUnknown_81B0BB5[]; -extern const u8 gUnknown_81B0C45[]; -extern const u8 gUnknown_81B0C51[]; -extern const u8 gUnknown_81B0C5E[]; -extern const u8 gUnknown_81B0C6B[]; -extern const u8 gUnknown_81B0C79[]; -extern const u8 gUnknown_81B0C88[]; -extern const u8 gUnknown_81B0C95[]; -extern const u8 gUnknown_81B0CA2[]; -extern const u8 gUnknown_81B0CB1[]; -extern const u8 gUnknown_81B0CC1[]; -extern const u8 gUnknown_81B0CCF[]; -extern const u8 gUnknown_81B0CDF[]; -extern const u8 gUnknown_81B0CEB[]; -extern const u8 gUnknown_81B0CF7[]; -extern const u8 gUnknown_81B0D02[]; -extern const u8 gUnknown_81B0D0E[]; -extern const u8 gUnknown_81B0D16[]; -extern const u8 gUnknown_81B0D1F[]; -extern const u8 gUnknown_81B0D2D[]; -extern const u8 gUnknown_81B0D3B[]; -extern const u8 gUnknown_81B0D48[]; -extern const u8 gUnknown_81B0D55[]; -extern const u8 gUnknown_81B0D65[]; -extern const u8 gUnknown_81B0D73[]; -extern const u8 gUnknown_81B0D81[]; -extern const u8 gUnknown_81B0D90[]; -extern const u8 gUnknown_81B0D9E[]; -extern const u8 gUnknown_81B0DAC[]; -extern const u8 gUnknown_81B0DBA[]; -extern const u8 gUnknown_81B0DC8[]; -extern const u8 gUnknown_81B0DD7[]; -extern const u8 gUnknown_81B0DE4[]; -extern const u8 gUnknown_81B0DF0[]; -extern const u8 gUnknown_81B0DFC[]; -extern const u8 gUnknown_81B0E08[]; -extern const u8 gUnknown_81B0E14[]; -extern const u8 gUnknown_81B0E24[]; -extern const u8 gUnknown_81B0E31[]; -extern const u8 gUnknown_81B0E3D[]; -extern const u8 gUnknown_81B0E49[]; -extern const u8 gUnknown_81B0E56[]; -extern const u8 gUnknown_81B0E63[]; -extern const u8 gUnknown_81B0E6F[]; -extern const u8 gUnknown_81B0E7C[]; -extern const u8 gUnknown_81B0E89[]; -extern const u8 gUnknown_81B0E95[]; -extern const u8 gUnknown_81B0EA1[]; -extern const u8 gUnknown_81B0EAE[]; -extern const u8 gUnknown_81B0EBA[]; -extern const u8 gUnknown_81B0ECA[]; -extern const u8 gUnknown_81B0ED7[]; -extern const u8 gUnknown_81B0EE4[]; -extern const u8 gUnknown_81B0EF4[]; -extern const u8 gUnknown_81B0F01[]; -extern const u8 gUnknown_81B0F11[]; -extern const u8 gUnknown_81B0F20[]; -extern const u8 gUnknown_81B0F2F[]; -extern const u8 gUnknown_81B0F3B[]; -extern const u8 gUnknown_81B0F47[]; -extern const u8 gUnknown_81B0F53[]; -extern const u8 gUnknown_81B0F5F[]; -extern const u8 gUnknown_81B0F6E[]; -extern const u8 gUnknown_81B0F7D[]; -extern const u8 gUnknown_81B0F8A[]; -extern const u8 gUnknown_81B0F94[]; -extern const u8 gUnknown_81B0F9F[]; -extern const u8 gUnknown_81B0FAE[]; -extern const u8 gUnknown_81B0FBD[]; -extern const u8 gUnknown_81B0FCC[]; -extern const u8 gUnknown_81B0FDB[]; -extern const u8 gUnknown_81B0FE8[]; -extern const u8 gUnknown_81B0FF7[]; -extern const u8 gUnknown_81B1002[]; -extern const u8 gUnknown_81B1011[]; -extern const u8 gUnknown_81B1020[]; -extern const u8 gUnknown_81B102D[]; -extern const u8 gUnknown_81B103B[]; -extern const u8 gUnknown_81B104A[]; -extern const u8 gUnknown_81B1059[]; -extern const u8 gUnknown_81B1067[]; -extern const u8 gUnknown_81B1075[]; -extern const u8 gUnknown_81B1082[]; -extern const u8 gUnknown_81B108D[]; -extern const u8 gUnknown_81B1098[]; -extern const u8 gUnknown_81B10A3[]; -extern const u8 gUnknown_81B10B1[]; -extern const u8 gUnknown_81B10BF[]; -extern const u8 gUnknown_81B10CD[]; -extern const u8 gUnknown_81B10DB[]; -extern const u8 gUnknown_81B10E8[]; -extern const u8 gUnknown_81B10F8[]; -extern const u8 gUnknown_81B1107[]; -extern const u8 gUnknown_81B1111[]; -extern const u8 gUnknown_81B111B[]; -extern const u8 gUnknown_81B1128[]; -extern const u8 gUnknown_81B1135[]; -extern const u8 gUnknown_81B1146[]; -extern const u8 gUnknown_81B114B[]; -extern const u8 gUnknown_81B1155[]; -extern const u8 gUnknown_81B115A[]; -extern const u8 gUnknown_81B116A[]; -extern const u8 gUnknown_81B1171[]; -extern const u8 gUnknown_81B1176[]; -extern const u8 gUnknown_81B117B[]; -extern const u8 gUnknown_81B1181[]; -extern const u8 gUnknown_81B1185[]; -extern const u8 gUnknown_81B1195[]; -extern const u8 gUnknown_81B119E[]; -extern const u8 gUnknown_81B11AE[]; -extern const u8 gUnknown_81B11B3[]; -extern const u8 gUnknown_81B11B9[]; -extern const u8 gUnknown_81B11C3[]; -extern const u8 gUnknown_81B11C7[]; -extern const u8 gUnknown_81B11CB[]; -extern const u8 gUnknown_81B11DB[]; -extern const u8 gUnknown_81B11E0[]; -extern const u8 gUnknown_81B11E6[]; -extern const u8 gUnknown_81B11EB[]; -extern const u8 gUnknown_81B11F5[]; -extern const u8 gUnknown_81B11FA[]; -extern const u8 gUnknown_81B120A[]; -extern const u8 gUnknown_81B120F[]; -extern const u8 gUnknown_81B1219[]; -extern const u8 gUnknown_81B1220[]; -extern const u8 gUnknown_81B1227[]; -extern const u8 gUnknown_81B122E[]; -extern const u8 gUnknown_81B123E[]; -extern const u8 gUnknown_81B1243[]; -extern const u8 gUnknown_81B1249[]; -extern const u8 gUnknown_81B124E[]; -extern const u8 gUnknown_81B1254[]; -extern const u8 gUnknown_81B125A[]; -extern const u8 gUnknown_81B126A[]; -extern const u8 gUnknown_81B126F[]; -extern const u8 gUnknown_81B1274[]; -extern const u8 gUnknown_81B1279[]; -extern const u8 gUnknown_81B1281[]; -extern const u8 gUnknown_81B1291[]; -extern const u8 gUnknown_81B1295[]; -extern const u8 gUnknown_81B129A[]; -extern const u8 gUnknown_81B12A4[]; -extern const u8 gUnknown_81B12AC[]; -extern const u8 gUnknown_81B12B4[]; -extern const u8 gUnknown_81B12C4[]; -extern const u8 gUnknown_81B12CA[]; -extern const u8 gUnknown_81B12CF[]; -extern const u8 gUnknown_81B12D6[]; -extern const u8 gUnknown_81B12DC[]; -extern const u8 gUnknown_81B12E2[]; -extern const u8 gUnknown_81B12E8[]; -extern const u8 gUnknown_81B12F8[]; -extern const u8 gUnknown_81B1300[]; -extern const u8 gUnknown_81B1308[]; -extern const u8 gUnknown_81B1310[]; -extern const u8 gUnknown_81B1320[]; -extern const u8 gUnknown_81B132C[]; -extern const u8 gUnknown_81B1335[]; -extern const u8 gUnknown_81B133B[]; -extern const u8 gUnknown_81B1341[]; -extern const u8 gUnknown_81B1351[]; -extern const u8 gUnknown_81B1359[]; -extern const u8 gUnknown_81B135F[]; -extern const u8 gUnknown_81B1367[]; -extern const u8 gUnknown_81B136E[]; -extern const u8 gUnknown_81B1376[]; -extern const u8 gUnknown_81B137E[]; -extern const u8 gUnknown_81B138E[]; -extern const u8 gUnknown_81B1395[]; -extern const u8 gUnknown_81B139E[]; -extern const u8 gUnknown_81B13A4[]; -extern const u8 gUnknown_81B13AA[]; -extern const u8 gUnknown_81B13B0[]; -extern const u8 gUnknown_81B13BC[]; -extern const u8 gUnknown_81B13CC[]; -extern const u8 gUnknown_81B13D6[]; -extern const u8 gUnknown_81B13D9[]; -extern const u8 gUnknown_81B13E4[]; -extern const u8 gUnknown_81B13EC[]; -extern const u8 gUnknown_81B13F2[]; -extern const u8 gUnknown_81B13F8[]; -extern const u8 gUnknown_81B13FE[]; -extern const u8 gUnknown_81B140A[]; -extern const u8 gUnknown_81B1416[]; -extern const u8 gUnknown_81B141F[]; -extern const u8 gUnknown_81B1423[]; -extern const u8 gUnknown_81B1429[]; -extern const u8 gUnknown_81B1439[]; -extern const u8 gUnknown_81B1442[]; -extern const u8 gUnknown_81B144C[]; -extern const u8 gUnknown_81B1456[]; -extern const u8 gUnknown_81B145F[]; -extern const u8 gUnknown_81B1463[]; +extern const u8 gFameCheckerFlavorText_ProfOak0[]; +extern const u8 gFameCheckerFlavorText_ProfOak1[]; +extern const u8 gFameCheckerFlavorText_ProfOak2[]; +extern const u8 gFameCheckerFlavorText_ProfOak3[]; +extern const u8 gFameCheckerFlavorText_ProfOak4[]; +extern const u8 gFameCheckerFlavorText_ProfOak5[]; +extern const u8 gFameCheckerFlavorText_Daisy0[]; +extern const u8 gFameCheckerFlavorText_Daisy1[]; +extern const u8 gFameCheckerFlavorText_Daisy2[]; +extern const u8 gFameCheckerFlavorText_Daisy3[]; +extern const u8 gFameCheckerFlavorText_Daisy4[]; +extern const u8 gFameCheckerFlavorText_Daisy5[]; +extern const u8 gFameCheckerFlavorText_Brock0[]; +extern const u8 gFameCheckerFlavorText_Brock1[]; +extern const u8 gFameCheckerFlavorText_Brock2[]; +extern const u8 gFameCheckerFlavorText_Brock3[]; +extern const u8 gFameCheckerFlavorText_Brock4[]; +extern const u8 gFameCheckerFlavorText_Brock5[]; +extern const u8 gFameCheckerFlavorText_Misty0[]; +extern const u8 gFameCheckerFlavorText_Misty1[]; +extern const u8 gFameCheckerFlavorText_Misty2[]; +extern const u8 gFameCheckerFlavorText_Misty3[]; +extern const u8 gFameCheckerFlavorText_Misty4[]; +extern const u8 gFameCheckerFlavorText_Misty5[]; +extern const u8 gFameCheckerFlavorText_LtSurge0[]; +extern const u8 gFameCheckerFlavorText_LtSurge1[]; +extern const u8 gFameCheckerFlavorText_LtSurge2[]; +extern const u8 gFameCheckerFlavorText_LtSurge3[]; +extern const u8 gFameCheckerFlavorText_LtSurge4[]; +extern const u8 gFameCheckerFlavorText_LtSurge5[]; +extern const u8 gFameCheckerFlavorText_Erika0[]; +extern const u8 gFameCheckerFlavorText_Erika1[]; +extern const u8 gFameCheckerFlavorText_Erika2[]; +extern const u8 gFameCheckerFlavorText_Erika3[]; +extern const u8 gFameCheckerFlavorText_Erika4[]; +extern const u8 gFameCheckerFlavorText_Erika5[]; +extern const u8 gFameCheckerFlavorText_Koga0[]; +extern const u8 gFameCheckerFlavorText_Koga1[]; +extern const u8 gFameCheckerFlavorText_Koga2[]; +extern const u8 gFameCheckerFlavorText_Koga3[]; +extern const u8 gFameCheckerFlavorText_Koga4[]; +extern const u8 gFameCheckerFlavorText_Koga5[]; +extern const u8 gFameCheckerFlavorText_Sabrina0[]; +extern const u8 gFameCheckerFlavorText_Sabrina1[]; +extern const u8 gFameCheckerFlavorText_Sabrina2[]; +extern const u8 gFameCheckerFlavorText_Sabrina3[]; +extern const u8 gFameCheckerFlavorText_Sabrina4[]; +extern const u8 gFameCheckerFlavorText_Sabrina5[]; +extern const u8 gFameCheckerFlavorText_Blaine0[]; +extern const u8 gFameCheckerFlavorText_Blaine1[]; +extern const u8 gFameCheckerFlavorText_Blaine2[]; +extern const u8 gFameCheckerFlavorText_Blaine3[]; +extern const u8 gFameCheckerFlavorText_Blaine4[]; +extern const u8 gFameCheckerFlavorText_Blaine5[]; +extern const u8 gFameCheckerFlavorText_Lorelei0[]; +extern const u8 gFameCheckerFlavorText_Lorelei1[]; +extern const u8 gFameCheckerFlavorText_Lorelei2[]; +extern const u8 gFameCheckerFlavorText_Lorelei3[]; +extern const u8 gFameCheckerFlavorText_Lorelei4[]; +extern const u8 gFameCheckerFlavorText_Lorelei5[]; +extern const u8 gFameCheckerFlavorText_Bruno0[]; +extern const u8 gFameCheckerFlavorText_Bruno1[]; +extern const u8 gFameCheckerFlavorText_Bruno2[]; +extern const u8 gFameCheckerFlavorText_Bruno3[]; +extern const u8 gFameCheckerFlavorText_Bruno4[]; +extern const u8 gFameCheckerFlavorText_Bruno5[]; +extern const u8 gFameCheckerFlavorText_Agatha0[]; +extern const u8 gFameCheckerFlavorText_Agatha1[]; +extern const u8 gFameCheckerFlavorText_Agatha2[]; +extern const u8 gFameCheckerFlavorText_Agatha3[]; +extern const u8 gFameCheckerFlavorText_Agatha4[]; +extern const u8 gFameCheckerFlavorText_Agatha5[]; +extern const u8 gFameCheckerFlavorText_Lance0[]; +extern const u8 gFameCheckerFlavorText_Lance1[]; +extern const u8 gFameCheckerFlavorText_Lance2[]; +extern const u8 gFameCheckerFlavorText_Lance3[]; +extern const u8 gFameCheckerFlavorText_Lance4[]; +extern const u8 gFameCheckerFlavorText_Lance5[]; +extern const u8 gFameCheckerFlavorText_Bill0[]; +extern const u8 gFameCheckerFlavorText_Bill1[]; +extern const u8 gFameCheckerFlavorText_Bill2[]; +extern const u8 gFameCheckerFlavorText_Bill3[]; +extern const u8 gFameCheckerFlavorText_Bill4[]; +extern const u8 gFameCheckerFlavorText_Bill5[]; +extern const u8 gFameCheckerFlavorText_MrFuji0[]; +extern const u8 gFameCheckerFlavorText_MrFuji1[]; +extern const u8 gFameCheckerFlavorText_MrFuji2[]; +extern const u8 gFameCheckerFlavorText_MrFuji3[]; +extern const u8 gFameCheckerFlavorText_MrFuji4[]; +extern const u8 gFameCheckerFlavorText_MrFuji5[]; +extern const u8 gFameCheckerFlavorText_Giovanni0[]; +extern const u8 gFameCheckerFlavorText_Giovanni1[]; +extern const u8 gFameCheckerFlavorText_Giovanni2[]; +extern const u8 gFameCheckerFlavorText_Giovanni3[]; +extern const u8 gFameCheckerFlavorText_Giovanni4[]; +extern const u8 gFameCheckerFlavorText_Giovanni5[]; +extern const u8 gFameCheckerPersonName_ProfOak[]; +extern const u8 gFameCheckerPersonQuote_ProfOak[]; +extern const u8 gFameCheckerPersonName_Daisy[]; +extern const u8 gFameCheckerPersonQuote_Daisy[]; +extern const u8 gFameCheckerPersonName_Brock[]; +extern const u8 gFameCheckerPersonQuote_Brock[]; +extern const u8 gFameCheckerPersonName_Misty[]; +extern const u8 gFameCheckerPersonQuote_Misty[]; +extern const u8 gFameCheckerPersonName_LtSurge[]; +extern const u8 gFameCheckerPersonQuote_LtSurge[]; +extern const u8 gFameCheckerPersonName_Erika[]; +extern const u8 gFameCheckerPersonQuote_Erika[]; +extern const u8 gFameCheckerPersonName_Koga[]; +extern const u8 gFameCheckerPersonQuote_Koga[]; +extern const u8 gFameCheckerPersonName_Sabrina[]; +extern const u8 gFameCheckerPersonQuote_Sabrina[]; +extern const u8 gFameCheckerPersonName_Blaine[]; +extern const u8 gFameCheckerPersonQuote_Blaine[]; +extern const u8 gFameCheckerPersonName_Lorelei[]; +extern const u8 gFameCheckerPersonQuote_Lorelei[]; +extern const u8 gFameCheckerPersonName_Bruno[]; +extern const u8 gFameCheckerPersonQuote_Bruno[]; +extern const u8 gFameCheckerPersonName_Agatha[]; +extern const u8 gFameCheckerPersonQuote_Agatha[]; +extern const u8 gFameCheckerPersonName_Lance[]; +extern const u8 gFameCheckerPersonQuote_Lance[]; +extern const u8 gFameCheckerPersonName_Bill[]; +extern const u8 gFameCheckerPersonQuote_Bill[]; +extern const u8 gFameCheckerPersonName_MrFuji[]; +extern const u8 gFameCheckerPersonQuote_MrFuji[]; +extern const u8 gFameCheckerPersonName_Giovanni[]; +extern const u8 gFameCheckerPersonQuote_Giovanni[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_ProfOak0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_ProfOak1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_ProfOak2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_ProfOak3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_ProfOak4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_ProfOak5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Daisy0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Daisy1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Daisy2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Daisy3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Daisy4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Daisy5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Brock0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Brock1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Brock2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Brock3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Brock4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Brock5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Misty0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Misty1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Misty2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Misty3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Misty4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Misty5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_LtSurge0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_LtSurge1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_LtSurge2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_LtSurge3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_LtSurge4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_LtSurge5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Erika0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Erika1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Erika2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Erika3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Erika4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Erika5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Koga0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Koga1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Koga2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Koga3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Koga4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Koga5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Sabrina0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Sabrina1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Sabrina2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Sabrina3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Sabrina4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Sabrina5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Blaine0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Blaine1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Blaine2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Blaine3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Blaine4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Blaine5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lorelei0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lorelei1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lorelei2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lorelei3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lorelei4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lorelei5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bruno0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bruno1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bruno2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bruno3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bruno4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bruno5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Agatha0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Agatha1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Agatha2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Agatha3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Agatha4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Agatha5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lance0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lance1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lance2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lance3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lance4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Lance5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bill0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bill1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bill2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bill3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bill4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Bill5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_MrFuji0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_MrFuji1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_MrFuji2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_MrFuji3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_MrFuji4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_MrFuji5[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Giovanni0[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Giovanni1[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Giovanni2[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Giovanni3[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Giovanni4[]; +extern const u8 gFameCheckerFlavorTextOriginLocation_Giovanni5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_ProfOak0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_ProfOak1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_ProfOak2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_ProfOak3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_ProfOak4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_ProfOak5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Daisy0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Daisy1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Daisy2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Daisy3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Daisy4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Daisy5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Brock0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Brock1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Brock2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Brock3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Brock4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Brock5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Misty0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Misty1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Misty2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Misty3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Misty4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Misty5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_LtSurge0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_LtSurge1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_LtSurge2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_LtSurge3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_LtSurge4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_LtSurge5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Erika0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Erika1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Erika2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Erika3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Erika4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Erika5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Koga0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Koga1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Koga2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Koga3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Koga4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Koga5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Sabrina0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Sabrina1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Sabrina2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Sabrina3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Sabrina4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Sabrina5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Blaine0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Blaine1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Blaine2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Blaine3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Blaine4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Blaine5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lorelei0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lorelei1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lorelei2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lorelei3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lorelei4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lorelei5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bruno0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bruno1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bruno2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bruno3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bruno4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bruno5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Agatha0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Agatha1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Agatha2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Agatha3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Agatha4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Agatha5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lance0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lance1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lance2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lance3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lance4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Lance5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bill0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bill1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bill2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bill3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bill4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Bill5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_MrFuji0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_MrFuji1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_MrFuji2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_MrFuji3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_MrFuji4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_MrFuji5[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni0[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni1[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni2[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni3[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni4[]; +extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni5[]; #endif //GUARD_EVENT_SCRIPTS_H diff --git a/include/fame_checker.h b/include/fame_checker.h index fad629108..2849eef09 100644 --- a/include/fame_checker.h +++ b/include/fame_checker.h @@ -19,7 +19,8 @@ enum { FAMECHECKER_LANCE, FAMECHECKER_BILL, FAMECHECKER_MRFUJI, - FAMECHECKER_GIOVANNI + FAMECHECKER_GIOVANNI, + NUM_FAMECHECKER_PERSONS }; enum { @@ -28,7 +29,17 @@ enum { FCPICKSTATE_COLORED }; +enum { + FCWINDOWID_LIST, + FCWINDOWID_UIHELP, + FCWINDOWID_MSGBOX, + FCWINDOWID_ICONDESC +}; + void ResetFameChecker(void); +void FullyUnlockFameChecker(void); void UseFameChecker(MainCallback savedCallback); +void SetFlavorTextFlagFromSpecialVars(void); +void UpdatePickStateFromSpecialVar8005(void); #endif //GUARD_FAME_CHECKER_H diff --git a/include/global.h b/include/global.h index d99f912ae..b81b29381 100644 --- a/include/global.h +++ b/include/global.h @@ -572,6 +572,8 @@ struct QuestLog /*0x0668*/ u16 end[0]; }; +#include "fame_checker.h" + struct FameCheckerSaveData { /*3a54*/ u16 pickState:2; @@ -643,7 +645,7 @@ struct SaveBlock1 /*0x3A14*/ u8 seen2[DEX_FLAGS_NO]; /*0x3A48*/ u8 filler_3a48[4]; /*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH]; - /*0x3A54*/ struct FameCheckerSaveData fameChecker[16]; + /*0x3A54*/ struct FameCheckerSaveData fameChecker[NUM_FAMECHECKER_PERSONS]; /*0x3A94*/ u8 filler3A94[0x2A4]; u32 unkArray[4][3]; }; diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index 2ff20eb39..2a68a35e6 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -18,6 +18,6 @@ u8 GetPlayerTextSpeed(void); void sub_80F6F54(u8, u8); u8 sub_80F78A8(void); void sub_80F6E9C(void); -void sub_80F6EE4(u8, u8); +void sub_80F6EE4(u8 windowId, bool8 transfer); #endif // GUARD_NEW_MENU_HELPERS_H -- cgit v1.2.3 From 66c7fc0d701ef5211114fdbdaa9588007beed3f2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 28 Nov 2018 08:42:21 -0500 Subject: All functions and assets in fame_checker are named --- include/fame_checker.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/fame_checker.h b/include/fame_checker.h index 2849eef09..257431d8b 100644 --- a/include/fame_checker.h +++ b/include/fame_checker.h @@ -36,6 +36,9 @@ enum { FCWINDOWID_ICONDESC }; +extern struct ListMenuTemplate gFameChecker_ListMenuTemplate; +extern u8 gIconDescriptionBoxIsOpen; + void ResetFameChecker(void); void FullyUnlockFameChecker(void); void UseFameChecker(MainCallback savedCallback); -- cgit v1.2.3 From 144027e4fad045d41afea0dfc8bd2bed27a64e6d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 28 Nov 2018 10:50:41 -0500 Subject: Dump another fame checker tilemap --- include/graphics.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index c5544428e..d249ece10 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -145,9 +145,9 @@ extern const u16 gUnknown_08DDAFE0[]; // fame_checker -extern const u16 gUnknown_8E9F220[0x30]; -extern const u16 gUnknown_8E9F260[0xa50]; -extern const u16 gUnknown_8EA0700[0x400]; -extern const u16 gUnknown_8EA0F00[0x400]; +extern const u16 gFameCheckerBgPals[0x30]; +extern const u16 gFameCheckerBgTiles[0xa50]; +extern const u16 gFameCheckerBg3Tilemap[0x400]; +extern const u16 gFameCheckerBg2Tilemap[0x400]; #endif //GUARD_GRAPHICS_H -- cgit v1.2.3 From 013fcf86fbeccf8d527e43a4f5aaf44402daba48 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 28 Nov 2018 13:49:46 -0500 Subject: Fix spacing in globah.h --- include/global.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index b81b29381..30be4fd9f 100644 --- a/include/global.h +++ b/include/global.h @@ -616,8 +616,8 @@ struct SaveBlock1 /*0x0638*/ u8 trainerRematchStepCounter; u8 filler_639; /*0x063A*/ u8 trainerRematches[100]; - /*0x06A0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT]; - /*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64]; + /*0x06A0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT]; + /*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64]; /*0x0EE0*/ u8 flags[FLAGS_COUNT]; /*0x1000*/ u16 vars[VARS_COUNT]; /*0x1200*/ u8 filler1200[0x100]; @@ -626,15 +626,15 @@ struct SaveBlock1 /*0x2CD0*/ struct MailStruct mail[MAIL_COUNT]; /*0x2F10*/ u8 filler2F10[0x184]; struct { - /*0x3094*/ u8 unknown1[8]; - /*0x309C*/ u8 giftRibbons[11]; - /*0x30A7*/ u8 unknown2[8]; - /*0x30AF*/ u32 currentPokeCoupons; - /*0x30B3*/ u32 totalEarnedPokeCoupons; - /*0x30B7*/ u8 unknown3[6]; - /*0x30BD*/ u8 receivedWishmakerJirachi; - /*0x30BE*/ u8 unknown4[18]; - } __attribute__((packed)) externalReservedData; + /*0x3094*/ u8 unknown1[8]; + /*0x309C*/ u8 giftRibbons[11]; + /*0x30A7*/ u8 unknown2[8]; + /*0x30AF*/ u32 currentPokeCoupons; + /*0x30B3*/ u32 totalEarnedPokeCoupons; + /*0x30B7*/ u8 unknown3[6]; + /*0x30BD*/ u8 receivedWishmakerJirachi; + /*0x30BE*/ u8 unknown4[18]; + } __attribute__((packed)) externalReservedData; /*0x30D0*/ struct Roamer roamer; /*0x30EC*/ struct EnigmaBerry enigmaBerry; /*0x3120*/ u8 filler3120[0x340]; -- cgit v1.2.3 From ff55777ac8d0ee55fbe629381a781f0519cb2d29 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 28 Nov 2018 14:15:29 -0500 Subject: Define the PC items allocation in SaveBlock1 --- include/global.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index 30be4fd9f..97b179410 100644 --- a/include/global.h +++ b/include/global.h @@ -97,6 +97,7 @@ enum LanguageId { #define GAME_LANGUAGE (LANGUAGE_ENGLISH) +#define PC_ITEMS_COUNT 30 #define BAG_ITEMS_COUNT 42 #define BAG_KEYITEMS_COUNT 30 #define BAG_POKEBALLS_COUNT 13 @@ -605,7 +606,7 @@ struct SaveBlock1 /*0x0290*/ u32 money; /*0x0294*/ u16 coins; /*0x0296*/ u16 registeredItem; // registered for use with SELECT button - /*0x0298*/ u8 filler298[0x78]; + /*0x0298*/ struct ItemSlot pcItems[PC_ITEMS_COUNT]; /*0x0310*/ struct ItemSlot bagPocket_Items[BAG_ITEMS_COUNT]; /*0x03b8*/ struct ItemSlot bagPocket_KeyItems[BAG_KEYITEMS_COUNT]; /*0x0430*/ struct ItemSlot bagPocket_PokeBalls[BAG_POKEBALLS_COUNT]; -- cgit v1.2.3 From 592a0f03e8196e2851e00b4d891daef752e6edf0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 28 Nov 2018 18:10:28 -0500 Subject: Name the game stats array --- include/global.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index 97b179410..3ff57357e 100644 --- a/include/global.h +++ b/include/global.h @@ -621,7 +621,7 @@ struct SaveBlock1 /*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64]; /*0x0EE0*/ u8 flags[FLAGS_COUNT]; /*0x1000*/ u16 vars[VARS_COUNT]; - /*0x1200*/ u8 filler1200[0x100]; + /*0x1200*/ u32 gameStats[NUM_GAME_STATS]; /*0x1300*/ struct QuestLog questLog[4]; /*0x2CA0*/ u8 filler2CA0[0x30]; /*0x2CD0*/ struct MailStruct mail[MAIL_COUNT]; -- cgit v1.2.3 From c79a939d3d03d861769a5f54ec52c7b976c14a3b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 28 Nov 2018 18:18:10 -0500 Subject: Identify easy chat arrays in save block 1 --- include/global.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index 3ff57357e..5ad4e4f9d 100644 --- a/include/global.h +++ b/include/global.h @@ -623,7 +623,10 @@ struct SaveBlock1 /*0x1000*/ u16 vars[VARS_COUNT]; /*0x1200*/ u32 gameStats[NUM_GAME_STATS]; /*0x1300*/ struct QuestLog questLog[4]; - /*0x2CA0*/ u8 filler2CA0[0x30]; + /*0x2CA0*/ u16 unk2CA0[6]; + /*0x2CAC*/ u16 unk2CAC[6]; + /*0x2CB8*/ u16 unk2CB8[6]; + /*0x2CC4*/ u16 unk2CC4[6]; /*0x2CD0*/ struct MailStruct mail[MAIL_COUNT]; /*0x2F10*/ u8 filler2F10[0x184]; struct { -- cgit v1.2.3 From c6778caf1e36c2847314c5751e8181089c8c66ab Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 28 Nov 2018 18:55:55 -0500 Subject: Identify most of SaveBlock1 --- include/global.h | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index 5ad4e4f9d..d5bfc5241 100644 --- a/include/global.h +++ b/include/global.h @@ -489,8 +489,8 @@ struct DaycareMon struct DayCare { struct DaycareMon mons[DAYCARE_MON_COUNT]; - u32 offspringPersonality; - u8 stepCounter; + u16 unk_118; + u8 unk_11A; }; struct DayCareMail @@ -588,6 +588,9 @@ struct FameCheckerSaveData #define VARS_COUNT 256 #define MAIL_COUNT 16 +#define NUM_EASY_CHAT_EXTRA_PHRASES 33 +#define EASY_CHAT_EXTRA_PHRASES_SIZE ((NUM_EASY_CHAT_EXTRA_PHRASES >> 3) + (NUM_EASY_CHAT_EXTRA_PHRASES % 8 ? 1 : 0)) + struct SaveBlock1 { /*0x0000*/ struct Coords16 pos; @@ -613,10 +616,10 @@ struct SaveBlock1 /*0x0464*/ struct ItemSlot bagPocket_TMHM[BAG_TMHM_COUNT]; /*0x054c*/ struct ItemSlot bagPocket_Berries[BAG_BERRIES_COUNT]; /*0x05F8*/ u8 seen1[DEX_FLAGS_NO]; - /*0x062C*/ u8 filler_062c[12]; + /*0x062C*/ u16 berryBlenderRecords[3]; // unused + /*0x0632*/ u8 field_632[6]; // unused? /*0x0638*/ u8 trainerRematchStepCounter; - u8 filler_639; - /*0x063A*/ u8 trainerRematches[100]; + /*0x063A*/ u8 ALIGNED(2) trainerRematches[100]; /*0x06A0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT]; /*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64]; /*0x0EE0*/ u8 flags[FLAGS_COUNT]; @@ -628,17 +631,11 @@ struct SaveBlock1 /*0x2CB8*/ u16 unk2CB8[6]; /*0x2CC4*/ u16 unk2CC4[6]; /*0x2CD0*/ struct MailStruct mail[MAIL_COUNT]; - /*0x2F10*/ u8 filler2F10[0x184]; - struct { - /*0x3094*/ u8 unknown1[8]; - /*0x309C*/ u8 giftRibbons[11]; - /*0x30A7*/ u8 unknown2[8]; - /*0x30AF*/ u32 currentPokeCoupons; - /*0x30B3*/ u32 totalEarnedPokeCoupons; - /*0x30B7*/ u8 unknown3[6]; - /*0x30BD*/ u8 receivedWishmakerJirachi; - /*0x30BE*/ u8 unknown4[18]; - } __attribute__((packed)) externalReservedData; + /*0x2F10*/ u8 additionalPhrases[EASY_CHAT_EXTRA_PHRASES_SIZE]; + /*0x2F18*/ OldMan oldMan; // unused + /*0x2F54*/ struct EasyChatPair easyChatPairs[5]; // unused + /*0x2F80*/ struct DayCare daycare; + /*0x309C*/ u8 giftRibbons[52]; /*0x30D0*/ struct Roamer roamer; /*0x30EC*/ struct EnigmaBerry enigmaBerry; /*0x3120*/ u8 filler3120[0x340]; -- cgit v1.2.3