From 1ba6cb22450b729cc2ac1b7fd72b2b27e5ec38c7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 30 Oct 2019 16:51:43 -0400 Subject: Some renaming; resolve trade bss --- include/pokemon_storage_system.h | 2 +- include/strings.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 2d881878f..81f50e1e9 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -16,6 +16,6 @@ u8 * GetBoxNamePtr(u8 boxId); void sub_808CE60(void); void ResetPokemonStorageSystem(void); u8 StorageGetCurrentBox(void); -void sub_808BEB4(const u8 *name, u8 *a1, u8 a2, u8 a3, u8 *buffer, u8 a5); +void PSS_RenderTextToVramViaBuffer(const u8 *name, u8 *a1, u8 a2, u8 a3, u8 *buffer, u8 a5); #endif // GUARD_POKEMON_STORAGE_SYSTEM_H diff --git a/include/strings.h b/include/strings.h index 301bfb9c6..7231755c5 100644 --- a/include/strings.h +++ b/include/strings.h @@ -667,12 +667,12 @@ extern const u8 gText_ByeByeVar1[]; extern const u8 gText_XSentOverY[]; extern const u8 gText_TakeGoodCareOfX[]; extern const u8 gUnknown_841E325[]; -extern const u8 gUnknown_841E0B9[]; -extern const u8 gUnknown_841E0C0[]; -extern const u8 gUnknown_841E0D2[]; -extern const u8 gUnknown_841E0DA[]; -extern const u8 gUnknown_841E0E0[]; -extern const u8 gUnknown_841E0EE[]; +extern const u8 gTradeText_Cancel[]; +extern const u8 gTradeText_ChooseAPokemon[]; +extern const u8 gTradeText_Summary[]; +extern const u8 gTradeText_Trade[]; +extern const u8 gTradeText_CancelTrade[]; +extern const u8 gTradeText_PressBButtonToExit[]; extern const u8 gUnknown_841E10A[]; extern const u8 gUnknown_841E112[]; extern const u8 gUnknown_841E118[]; -- cgit v1.2.3