diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/graphics.h | 4 | ||||
| -rw-r--r-- | include/mon_markings.h | 24 | ||||
| -rw-r--r-- | include/text_window.h | 4 |
3 files changed, 30 insertions, 2 deletions
diff --git a/include/graphics.h b/include/graphics.h index 9afcb75ad..1313ddc3a 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2864,4 +2864,8 @@ extern const u8 gBerryPalette_Enigma[]; //credits extern const u8 gCreditsCopyrightEnd_Gfx[]; +//pokenav condition marker +extern const u8 gPokenavConditionMarker_Gfx[]; +extern const u16 gPokenavConditionMarker_Pal[]; + #endif //GUARD_GRAPHICS_H diff --git a/include/mon_markings.h b/include/mon_markings.h new file mode 100644 index 000000000..852e8b4eb --- /dev/null +++ b/include/mon_markings.h @@ -0,0 +1,24 @@ +#ifndef POKEEMERALD_MON_MARKINGS_H +#define POKEEMERALD_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 filler1030[0x80]; + /*0x10B4*/ u8 tileLoadState; +}; // 10b8 + +#endif //POKEEMERALD_MON_MARKINGS_H diff --git a/include/text_window.h b/include/text_window.h index e6a753fcb..2ac13fab7 100644 --- a/include/text_window.h +++ b/include/text_window.h @@ -5,11 +5,11 @@ struct TilesPal { - const u32 *tiles; + const u8 *tiles; const u16 *pal; }; -extern const u32 gTextWindowFrame1_Gfx[]; +extern const u8 gTextWindowFrame1_Gfx[]; extern const u16 gTextWindowFrame1_Pal[]; const struct TilesPal* GetWindowFrameTilesPal(u8 id); |