diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/event_object_movement.h | 1 | ||||
| -rw-r--r-- | include/field_effect.h | 1 | ||||
| -rw-r--r-- | include/field_player_avatar.h | 1 | ||||
| -rw-r--r-- | include/field_specials.h | 1 | ||||
| -rw-r--r-- | include/graphics.h | 22 | ||||
| -rw-r--r-- | include/keyboard_text.h (renamed from include/data_8479668.h) | 19 | ||||
| -rw-r--r-- | include/naming_screen.h | 6 | ||||
| -rw-r--r-- | include/pokemon_storage_system.h | 3 | ||||
| -rw-r--r-- | include/strings.h | 8 |
9 files changed, 54 insertions, 8 deletions
diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 7828d0bcb..50d9935fc 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -128,6 +128,7 @@ void SetSpritePosToMapCoords(s16 x, s16 y, s16 *x2, s16 *y2); void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible); u8 ZCoordToPriority(u8 z); void SetObjectSubpriorityByZCoord(u8 z, struct Sprite * sprite, u8 offset); +void MakeObjectTemplateFromObjectEventGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables); // Exported data declarations diff --git a/include/field_effect.h b/include/field_effect.h index 3c92afb6a..59de741be 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -24,5 +24,6 @@ void sub_8083598(u8 a0); void FreeResourcesAndDestroySprite(struct Sprite * sprite, u8 spriteId); u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, bool8 unused); void ReturnToFieldFromFlyMapSelect(void); +void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b); #endif //GUARD_FIELD_EFFECTS_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 5565fb64b..3233c2d70 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -37,5 +37,6 @@ bool8 PartyHasMonWithSurf(void); bool8 IsPlayerSurfingNorth(void); void player_get_pos_including_state_based_drift(s16 *x, s16 *y); void sub_805CBE8(void); +u8 sub_805C7C8(u8 state, u8 gender); #endif //GUARD_FIELD_PLAYER_AVATAR_H diff --git a/include/field_specials.h b/include/field_specials.h index 811bfef93..b3291bf54 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -21,6 +21,7 @@ void nullsub_61(void); u8 ContextNpcGetTextColor(void); void SetPCBoxToSendMon(u8); u16 GetPCBoxToSendMon(void); +bool8 IsDestinationBoxFull(void); bool8 ShouldShowBoxWasFullMessage(void); u16 GetHiddenItemAttr(u32 hiddenItem, u8 attr); u8 GetUnlockedSeviiAreas(void); diff --git a/include/graphics.h b/include/graphics.h index a61d5f62f..d84371e3a 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4895,4 +4895,26 @@ extern const u32 gEasyChatRedRectangularCursor_Tiles[]; extern const u32 gEasyChatSelectGroupHelp_Tiles[]; extern const u32 gEasyChatModeIcons_Tiles[]; +// naming_screen +extern const u32 gUnknown_8E982BC[]; +extern const u32 gUnknown_8E98458[]; +extern const u32 gUnknown_8E98398[]; +extern const u32 gUnknown_8E98518[]; +extern const u32 gNamingScreenMenu_Gfx[]; +extern const u16 gUnknown_8E98004[]; +extern const u16 gUnknown_8E97FE4[]; +extern const u16 gNamingScreenMenu_Pal[]; +extern const u16 gUnknown_8E98858[]; +extern const u16 gUnknown_8E98A38[]; +extern const u16 gUnknown_8E985D8[]; +extern const u16 gUnknown_8E98FD8[]; +extern const u16 gUnknown_8E98C18[]; +extern const u16 gUnknown_8E98CB8[]; +extern const u16 gUnknown_8E98D58[]; +extern const u16 gUnknown_8E98DF8[]; +extern const u16 gUnknown_8E98E98[]; +extern const u16 gUnknown_8E98F38[]; +extern const u16 gUnknown_8E990D8[]; +extern const u16 gUnknown_8E990F8[]; + #endif //GUARD_GRAPHICS_H diff --git a/include/data_8479668.h b/include/keyboard_text.h index aba3721c8..cc436c2d3 100644 --- a/include/data_8479668.h +++ b/include/keyboard_text.h @@ -1,5 +1,5 @@ -#ifndef GUARD_DATA_8479668_H -#define GUARD_DATA_8479668_H +#ifndef GUARD_KEYBOARD_TEXT_H +#define GUARD_KEYBOARD_TEXT_H extern const u8 gText_UnionRoomChatKeyboard_ABCDE[]; extern const u8 gText_UnionRoomChatKeyboard_FGHIJ[]; @@ -37,4 +37,17 @@ extern const u8 gUnknown_847A8FA[]; extern const u8 gUnknown_847A913[]; extern const u8 gUnknown_847A934[]; -#endif //GUARD_DATA_8479668_H +extern const u8 gText_NamingScreenKeyboard_abcdef[]; +extern const u8 gText_NamingScreenKeyboard_ghijkl[]; +extern const u8 gText_NamingScreenKeyboard_mnopqrs[]; +extern const u8 gText_NamingScreenKeyboard_tuvwxyz[]; +extern const u8 gText_NamingScreenKeyboard_ABCDEF[]; +extern const u8 gText_NamingScreenKeyboard_GHIJKL[]; +extern const u8 gText_NamingScreenKeyboard_MNOPQRS[]; +extern const u8 gText_NamingScreenKeyboard_TUVWXYZ[]; +extern const u8 gText_NamingScreenKeyboard_01234[]; +extern const u8 gText_NamingScreenKeyboard_56789[]; +extern const u8 gText_NamingScreenKeyboard_Symbols1[]; +extern const u8 gText_NamingScreenKeyboard_Symbols2[]; + +#endif //GUARD_KEYBOARD_TEXT_H diff --git a/include/naming_screen.h b/include/naming_screen.h index be2cf34f8..1e8d11b3a 100644 --- a/include/naming_screen.h +++ b/include/naming_screen.h @@ -6,9 +6,9 @@ #define NAMING_SCREEN_PLAYER 0 #define NAMING_SCREEN_BOX 1 #define NAMING_SCREEN_CAUGHT_MON 2 -#define NAMING_SCREEN_3 3 -#define NAMING_SCREEN_WALDA 4 +#define NAMING_SCREEN_NAME_RATER 3 +#define NAMING_SCREEN_RIVAL 4 -void DoNamingScreen(u8 caseId, u8* dst, u16 monSpecies, u8 monGender, u32 monPersonality, void (*callback)(void)); +void DoNamingScreen(u8 templateNum, u8 *destBuffer, u16 monSpecies, u16 monGender, u32 monPersonality, MainCallback returnCallback); #endif // GUARD_NAMING_SCREEN_H diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 81f50e1e9..c636651f3 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -6,13 +6,12 @@ #define TOTAL_BOXES_COUNT 14 #define IN_BOX_COUNT 30 -u8* GetBoxNamePtr(u8 boxNumber); +u8 *GetBoxNamePtr(u8 boxNumber); struct BoxPokemon *GetBoxedMonPtr(u8 boxId, u8 monPosition); void SetBoxMonNickFromAnyBox(u8 boxId, u8 monPosition, u8 * newNick); void CompactPartySlots(void); u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request); void sub_808BCB4(u8 boxId, u8 monPosition); -u8 * GetBoxNamePtr(u8 boxId); void sub_808CE60(void); void ResetPokemonStorageSystem(void); u8 StorageGetCurrentBox(void); diff --git a/include/strings.h b/include/strings.h index 443d84de2..be3555780 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1350,4 +1350,12 @@ extern const u8 gUnknown_8418AA1[]; extern const u8 gUnknown_8418AB2[]; extern const u8 gUnknown_841EE2B[]; +// naming_screen +extern const u8 gText_MoveOkBack[]; +extern const u8 gText_AlphabetUpperLower[]; +extern const u8 gText_YourName[]; +extern const u8 gText_BoxName[]; +extern const u8 gText_PkmnsNickname[]; +extern const u8 gText_RivalsName[]; + #endif //GUARD_STRINGS_H |