From b7c28c4be76f19d3515ede426ae874390523457f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Feb 2020 15:00:56 -0500 Subject: Remove redundant include lines --- src/dynamic_placeholder_text_util.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/dynamic_placeholder_text_util.c') diff --git a/src/dynamic_placeholder_text_util.c b/src/dynamic_placeholder_text_util.c index a2622bf02..678feb8c6 100644 --- a/src/dynamic_placeholder_text_util.c +++ b/src/dynamic_placeholder_text_util.c @@ -1,6 +1,5 @@ #include "global.h" #include "text.h" -#include "dynamic_placeholder_text_util.h" #include "string_util.h" #include "constants/object_events.h" -- cgit v1.2.3 From 7624b5e5c0d4d8290356dc897c2ea179c842d2b8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Feb 2020 16:44:36 -0500 Subject: Fix typo; use constants in some data/field_player_avatar arrays --- src/dynamic_placeholder_text_util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/dynamic_placeholder_text_util.c') diff --git a/src/dynamic_placeholder_text_util.c b/src/dynamic_placeholder_text_util.c index 678feb8c6..20e7258d3 100644 --- a/src/dynamic_placeholder_text_util.c +++ b/src/dynamic_placeholder_text_util.c @@ -9,10 +9,10 @@ static const u8 sTextColorTable[] = { // [LOW_NYBBLE / 2] = 0xXY, // HIGH_NYBBLE [OBJECT_EVENT_GFX_RED_NORMAL / 2] = 0x00, // OBJECT_EVENT_GFX_RED_BIKE - [OBJECT_EVENT_GFX_RED_RUN / 2] = 0x00, // OBJECT_EVENT_GFX_RED_ITEM + [OBJECT_EVENT_GFX_RED_SURF / 2] = 0x00, // OBJECT_EVENT_GFX_RED_ITEM [OBJECT_EVENT_GFX_RED_FISH / 2] = 0x00, // OBJECT_EVENT_GFX_RED_ITEM_COPY [OBJECT_EVENT_GFX_RED_VS_SEEKER / 2] = 0x10, // OBJECT_EVENT_GFX_GREEN_NORMAL - [OBJECT_EVENT_GFX_GREEN_BIKE / 2] = 0x11, // OBJECT_EVENT_GFX_GREEN_RUN + [OBJECT_EVENT_GFX_GREEN_BIKE / 2] = 0x11, // OBJECT_EVENT_GFX_GREEN_SURF [OBJECT_EVENT_GFX_GREEN_ITEM / 2] = 0x11, // OBJECT_EVENT_GFX_GREEN_FISH [OBJECT_EVENT_GFX_GREEN_ITEM_COPY / 2] = 0x11, // OBJECT_EVENT_GFX_GREEN_VS_SEEKER [OBJECT_EVENT_GFX_RS_BRENDAN / 2] = 0x10, // OBJECT_EVENT_GFX_RS_MAY -- cgit v1.2.3