ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 19:54:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed some bugs, thanks to cbt

Browse Source
This commit is contained in:
TheXaman 2021-11-28 20:28:54 +01:00
parent 2f8896f2f0
commit 5780560007
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/pokemon.h
View File

@ -348,6 +348,7 @@ void SetMonData(struct Pokemon *mon, s32 field, const void *dataArg);
void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg);
void CopyMon(void *dest, void *src, size_t size);
u8 GiveMonToPlayer(struct Pokemon *mon);
u8 SendMonToPC(struct Pokemon* mon);
u8 CalculatePlayerPartyCount(void);
u8 CalculateEnemyPartyCount(void);
u8 GetMonsStateToDoubles(void);

8
src/debug.c
View File

@ -1683,8 +1683,8 @@ static void DebugAction_Give_Item(u8 taskId)
gTasks[taskId].data[3] = 1; //Current ID
gTasks[taskId].data[4] = 0; //Digit Selected
gTasks[taskId].data[6] = AddItemIconSprite(ITEM_TAG, ITEM_TAG, gTasks[taskId].data[3]);
gSprites[gTasks[taskId].data[6]].pos2.x = DEBUG_NUMBER_ICON_X+10;
gSprites[gTasks[taskId].data[6]].pos2.y = DEBUG_NUMBER_ICON_Y+10;
gSprites[gTasks[taskId].data[6]].x2 = DEBUG_NUMBER_ICON_X+10;
gSprites[gTasks[taskId].data[6]].y2 = DEBUG_NUMBER_ICON_Y+10;
gSprites[gTasks[taskId].data[6]].oam.priority = 0;
}
static void DebugAction_Give_Item_SelectId(u8 taskId)
@ -1728,8 +1728,8 @@ static void DebugAction_Give_Item_SelectId(u8 taskId)
FreeSpriteOamMatrix(&gSprites[gTasks[taskId].data[6]]); //Destroy item icon
DestroySprite(&gSprites[gTasks[taskId].data[6]]); //Destroy item icon
gTasks[taskId].data[6] = AddItemIconSprite(ITEM_TAG, ITEM_TAG, gTasks[taskId].data[3]);
gSprites[gTasks[taskId].data[6]].pos2.x = DEBUG_NUMBER_ICON_X+10;
gSprites[gTasks[taskId].data[6]].pos2.y = DEBUG_NUMBER_ICON_Y+10;
gSprites[gTasks[taskId].data[6]].x2 = DEBUG_NUMBER_ICON_X+10;
gSprites[gTasks[taskId].data[6]].y2 = DEBUG_NUMBER_ICON_Y+10;
gSprites[gTasks[taskId].data[6]].oam.priority = 0;
}

1
src/event_object_movement.c
View File

@ -2,6 +2,7 @@
#include "malloc.h"
#include "battle_pyramid.h"
#include "berry.h"
#include "debug.h"
#include "decoration.h"
#include "event_data.h"
#include "event_object_movement.h"

2
src/item_use.c
View File

@ -943,7 +943,7 @@ void ItemUseInBattle_PokeBall(u8 taskId)
{
if (FlagGet(FLAG_SYS_NO_CATCHING)){ //DEBUG
static const u8 sText_BallsCannotBeUsed[] = _("Poké Balls cannot be used\nright now!\p");
DisplayItemMessage(taskId, 1, sText_BallsCannotBeUsed, BagMenu_InitListsMenu);
DisplayItemMessage(taskId, 1, sText_BallsCannotBeUsed, CloseItemMessage);
} //
else if (IsPlayerPartyAndPokemonStorageFull() == FALSE) // have room for mon?
{

3
src/pokemon.c
View File

@ -61,7 +61,6 @@ static void Task_PlayMapChosenOrBattleBGM(u8 taskId);
static bool8 ShouldGetStatBadgeBoost(u16 flagId, u8 battlerId);
static u16 GiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move);
static bool8 ShouldSkipFriendshipChange(void);
static u8 SendMonToPC(struct Pokemon* mon);
EWRAM_DATA static u8 sLearningMoveTableID = 0;
EWRAM_DATA u8 gPlayerPartyCount = 0;
@ -4385,7 +4384,7 @@ u8 GiveMonToPlayer(struct Pokemon *mon)
return MON_GIVEN_TO_PARTY;
}
static u8 SendMonToPC(struct Pokemon* mon)
u8 SendMonToPC(struct Pokemon* mon)
{
s32 boxNo, boxPos;

1
src/trainer_see.c
View File

@ -1,5 +1,6 @@
#include "global.h"
#include "battle_setup.h"
#include "debug.h"
#include "event_data.h"
#include "event_object_movement.h"
#include "field_effect.h"