diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-08 16:03:53 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-08 16:03:53 -0500 |
| commit | de95a703b0350996ca26f245392c3a1dae34ea63 (patch) | |
| tree | b9737d91ea96c51c1d09ad3a071092acdd76ddf5 /src/battle_script_commands.c | |
| parent | caf5d136b97c17c614d7186a5524d6ea7a1b142b (diff) | |
| parent | 387dbf48d0bbb22dc16158a1ee0d373c166c8438 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu
Diffstat (limited to 'src/battle_script_commands.c')
| -rw-r--r-- | src/battle_script_commands.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index c6314082c..fab1c18bb 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -950,11 +950,11 @@ static const u16 sRarePickupItems[] = ITEM_FULL_RESTORE, ITEM_ETHER, ITEM_WHITE_HERB, - ITEM_TM44, + ITEM_TM44_REST, ITEM_ELIXIR, - ITEM_TM01, + ITEM_TM01_FOCUS_PUNCH, ITEM_LEFTOVERS, - ITEM_TM26, + ITEM_TM26_EARTHQUAKE, }; static const u8 sPickupProbabilities[] = @@ -6724,7 +6724,7 @@ static void PutLevelAndGenderOnLvlUpBox(void) subPrinter.letterSpacing = 0; subPrinter.lineSpacing = 0; subPrinter.fontColor_l = TEXT_COLOR_TRANSPARENT; - subPrinter.fontColor_h = TEXT_COLOR_WHITE; + subPrinter.fgColor = TEXT_COLOR_WHITE; subPrinter.bgColor = TEXT_COLOR_TRANSPARENT; subPrinter.shadowColor = TEXT_COLOR_DARK_GREY; |