Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some text color labels, add creeping back

Browse Source
This commit is contained in:
ghoulslash 2021-06-11 12:44:12 -06:00
parent 5fd40d90ef
commit c01ad82008
4 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/battle_main.c
View File

@ -16,6 +16,7 @@
#include "bg.h"
#include "data.h"
#include "decompress.h"
#include "dexnav.h"
#include "dma3.h"
#include "event_data.h"
#include "evolution_scene.h"

4
src/dexnav.c
View File

@ -219,8 +219,8 @@ static const struct WindowTemplate sDexNavGuiWindowTemplates[] =
};
//gui font
static const u8 sFontColor_Black[3] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY};
static const u8 sFontColor_White[3] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY};
static const u8 sFontColor_Black[3] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY};
static const u8 sFontColor_White[3] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY};
//search window font
static const u8 sSearchFontColor[3] = {0, 15, 13};

28
src/field_player_avatar.c
View File

@ -140,6 +140,8 @@ static void AlignFishingAnimationFrames(void);
static u8 TrySpinPlayerForWarp(struct ObjectEvent *object, s16 *a1);
static void PlayerGoSlow(u8 direction);
// .rodata
static bool8 (*const sForcedMovementTestFuncs[])(u8) =
@ -628,11 +630,20 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys)
return;
}
}
gPlayerAvatar.creeping = FALSE;
if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
{
// speed 2 is fast, same speed as running
PlayerGoSpeed2(direction);
if (FlagGet(FLAG_SYS_DEXNAV_SEARCH) && (heldKeys & A_BUTTON))
{
gPlayerAvatar.creeping = TRUE;
PlayerGoSpeed1(direction);
}
else
{
// speed 2 is fast, same speed as running
PlayerGoSpeed2(direction);
}
return;
}
@ -643,6 +654,11 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys)
gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_DASH;
return;
}
else if (FlagGet(FLAG_SYS_DEXNAV_SEARCH) && (heldKeys & A_BUTTON))
{
gPlayerAvatar.creeping = TRUE;
PlayerGoSlow(direction);
}
else
{
PlayerGoSpeed1(direction);
@ -953,6 +969,12 @@ void PlayerSetAnimId(u8 movementActionId, u8 copyableMovement)
}
}
// slow
static void PlayerGoSlow(u8 direction)
{
PlayerSetAnimId(GetWalkSlowMovementAction(direction), 2);
}
// normal speed (1 speed)
void PlayerGoSpeed1(u8 a)
{

1
src/pokemon.c
View File

@ -10,6 +10,7 @@
#include "battle_setup.h"
#include "battle_tower.h"
#include "data.h"
#include "dexnav.h"
#include "event_data.h"
#include "evolution_scene.h"
#include "field_specials.h"