diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-24 14:23:52 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-24 14:23:52 -0600 |
| commit | e3078400bbdb3e8416806127290b9a2d68cfb3b8 (patch) | |
| tree | 7ef9993608fc9c6e426ce908957ac07f72b8f650 /src/field/player_pc.c | |
| parent | b827bd9a5a44e17fa9fced591465fc64a619a134 (diff) | |
| parent | e5c216e5066dac26fad64cb2e7bb6a5f0d40bf3f (diff) | |
Merge pull request #492 from PikalaxALT/decompile_data
Decompile data and abstract away some explicit memcpy calls
Diffstat (limited to 'src/field/player_pc.c')
| -rw-r--r-- | src/field/player_pc.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/field/player_pc.c b/src/field/player_pc.c index dd6b4c0c5..4fef09386 100644 --- a/src/field/player_pc.c +++ b/src/field/player_pc.c @@ -171,15 +171,6 @@ static const u8 gNonSelectedItemQuantityFormatText[] = _("{STR_VAR_1}"); static const u8 gSelectedItemQuantityFormatText[] = _("{COLOR RED}{STR_VAR_1}"); static const u8 gUnknown_08406330[] = _("{CLEAR_TO 32}"); -static const u16 gUnknown_08406334[3] = -{ - 0x5294, - 0x6B5A, - 0x7FFF -}; - -static const u8 gHighlightedMoveToBagFormatText[] = _("{COLOR RED}{STR_VAR_1}"); - extern u8 *gUnknown_02039314; extern struct MenuAction gUnknown_08406298[]; @@ -1007,9 +998,12 @@ static void ItemStorage_GoBackToItemPCMenu(u8 taskId, u8 var) static void ItemStorage_LoadPalette(void) { - u16 arr[3]; + u16 arr[] = { + 0x5294, + 0x6B5A, + 0x7FFF + }; - memcpy(arr, gUnknown_08406334, sizeof(arr)); LoadPalette(&arr[2], 0xDF, 2); LoadPalette(&arr[1], 0xD1, 2); LoadPalette(&arr[0], 0xD8, 2); @@ -1261,6 +1255,8 @@ static void Mailbox_ReturnToFieldFromReadMail(void) SetMainCallback2(c2_exit_to_overworld_2_switch); } +static const u8 gHighlightedMoveToBagFormatText[] = _("{COLOR RED}{STR_VAR_1}"); + static void Mailbox_MoveToBag(u8 taskId) { HandleDestroyMenuCursors(); |