diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/graphics.h | 4 | ||||
| -rw-r--r-- | include/mon_markings.h | 33 | ||||
| -rw-r--r-- | include/strings.h | 6 |
3 files changed, 40 insertions, 3 deletions
diff --git a/include/graphics.h b/include/graphics.h index 56a51e67c..0e804e17c 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4222,4 +4222,8 @@ extern const u16 gUnknown_8E9E9FC[]; extern const u16 gTradeButtons_Gfx[]; extern const u16 gTradeMenuMonBox_Tilemap[]; +// mon_markings +extern const u16 gUnknown_8E9CBBC[]; +extern const u16 gUnknown_8E9CB9C[]; + #endif //GUARD_GRAPHICS_H diff --git a/include/mon_markings.h b/include/mon_markings.h new file mode 100644 index 000000000..2547a7322 --- /dev/null +++ b/include/mon_markings.h @@ -0,0 +1,33 @@ +#ifndef GUARD_MON_MARKINGS_H +#define GUARD_MON_MARKINGS_H + +struct PokemonMarkMenu +{ + /*0x0000*/ u16 baseTileTag; + /*0x0002*/ u16 basePaletteTag; + /*0x0004*/ u8 markings; // bit flags + /*0x0005*/ s8 cursorPos; + /*0x0006*/ bool8 markingsArray[4]; + /*0x000A*/ u8 cursorBaseY; + /*0x000B*/ bool8 spriteSheetLoadRequired; + /*0x000C*/ struct Sprite * menuWindowSprites[2]; // upper and lower halves of menu window + /*0x0014*/ struct Sprite * menuMarkingSprites[4]; + /*0x0024*/ struct Sprite * unkSprite; + /*0x0028*/ struct Sprite * menuTextSprite; + /*0x002C*/ const u8 *frameTiles; + /*0x0030*/ const u16 *framePalette; + /*0x0034*/ u8 menuWindowSpriteTiles[0x1000]; + /*0x1034*/ u8 filler1034[0x80]; + /*0x10B4*/ u8 tileLoadState; +}; // 10b8 + +void SetMonMarkingsMenuPointer(struct PokemonMarkMenu * markMenu); +void LoadMonMarkingsFrameGfx(void); +void DrawMonMarkingsMenu(u8 markings, s16 x, s16 y); +void TeardownMonMarkingsMenu(void); +bool8 MonMarkingsHandleInput(void); +struct Sprite * CreateMonMarkingSprite_SelectCombo(u16 tileTag, u16 paletteTag, const u16 *palette); +struct Sprite * CreateMonMarkingSprite_AllOff(u16 tileTag, u16 paletteTag, const u16 *palette); +void sub_80BEBD0(u8 markings, void * dest); + +#endif //GUARD_MON_MARKINGS_H diff --git a/include/strings.h b/include/strings.h index 45f228e19..32f4dcf43 100644 --- a/include/strings.h +++ b/include/strings.h @@ -117,9 +117,9 @@ extern const u8 gFameCheckerText_Cancel[]; extern const u8 gFameCheckerText_ListMenuCursor[]; extern const u8 gFameCheckerText_FameCheckerWillBeClosed[]; extern const u8 gFameCheckerText_ClearTextbox[]; -extern const u8 gFameCheckerText_MainScreenUI[]; // "{KEYGFX_DPAD_ANY}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_A_BUTTON}OK$" -extern const u8 gFameCheckerText_PickScreenUI[]; // "{KEYGFX_DPAD_ANY}PICK {KEYGFX_DPAD_UP_DOWN}SELECT {KEYGFX_B_BUTTON}CANCEL$" -extern const u8 gFameCheckerText_FlavorTextUI[]; // "{KEYGFX_START_BUTTON}PICK {KEYGFX_A_BUTTON}READ {KEYGFX_B_BUTTON}CANCEL$" +extern const u8 gFameCheckerText_MainScreenUI[]; // "{DPAD_ANY}PICK {DPAD_UPDOWN}SELECT {A_BUTTON}OK$" +extern const u8 gFameCheckerText_PickScreenUI[]; // "{DPAD_ANY}PICK {DPAD_UPDOWN}SELECT {B_BUTTON}CANCEL$" +extern const u8 gFameCheckerText_FlavorTextUI[]; // "{START_BUTTON}PICK {A_BUTTON}READ {B_BUTTON}CANCEL$" extern const u8 gFameCheckerOakName[]; // "OAK$" extern const u8 gFameCheckerDaisyName[]; // "DAISY$" extern const u8 gFameCheckerBillName[]; // "BILL$" |