atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Follower pokemon now disappears when teleporting.

Browse source 
Fixed GF's incorrect GFX id on Route 123.
This commit is contained in:
Ariel A 2022-08-14 14:36:49 -04:00
parent 37ca4a6ceb
commit 16babe87fc
4 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/maps/Route123/map.json
View file

@ -559,7 +559,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
"graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
"x": 14,
"y": 12,
"elevation": 3,

1
include/party_menu.h
View file

@ -44,6 +44,7 @@ u8 GetAilmentFromStatus(u32 status);
u8 GetMonAilment(struct Pokemon *mon);
void DisplayPartyMenuStdMessage(u32 stringId);
bool8 FieldCallback_PrepareFadeInFromMenu(void);
bool8 FieldCallback_PrepareFadeInForTeleport(void);
void CB2_ReturnToPartyMenuFromFlyMap(void);
void LoadHeldItemIcons(void);
void DrawHeldItemIconsForTrade(u8 *partyCounts, u8 *partySpriteIds, u8 whichParty);

2
src/fldeff_teleport.c
View file

@ -14,7 +14,7 @@ bool8 SetUpFieldMove_Teleport(void)
{
if (Overworld_MapTypeAllowsTeleportAndFly(gMapHeader.mapType) == TRUE)
{
gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
gFieldCallback2 = FieldCallback_PrepareFadeInForTeleport;
gPostMenuFieldCallback = FieldCallback_Teleport;
return TRUE;
}

6
src/party_menu.c
View file

@ -14,6 +14,7 @@
#include "decompress.h"
#include "easy_chat.h"
#include "event_data.h"
#include "event_object_movement.h"
#include "evolution_scene.h"
#include "field_control_avatar.h"
#include "field_effect.h"
@ -3742,6 +3743,11 @@ bool8 FieldCallback_PrepareFadeInFromMenu(void)
return TRUE;
}
bool8 FieldCallback_PrepareFadeInForTeleport(void) { // same as above, but removes follower pokemon
RemoveFollowingPokemon();
return FieldCallback_PrepareFadeInFromMenu();
}
static void Task_FieldMoveWaitForFade(u8 taskId)
{
if (IsWeatherNotFadingIn() == TRUE)