From 578056000725b370e57bee22de8967ed658ec66d Mon Sep 17 00:00:00 2001
From: TheXaman <48356183+TheXaman@users.noreply.github.com>
Date: Sun, 28 Nov 2021 20:28:54 +0100
Subject: [PATCH] fixed some bugs, thanks to cbt

---
 include/pokemon.h           | 1 +
 src/debug.c                 | 8 ++++----
 src/event_object_movement.c | 1 +
 src/item_use.c              | 2 +-
 src/pokemon.c               | 3 +--
 src/trainer_see.c           | 1 +
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/pokemon.h b/include/pokemon.h
index 315416c38..f3f758688 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -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);
diff --git a/src/debug.c b/src/debug.c
index ae3ff02e0..ec8c1251f 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -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;
     }
 
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index a782872d6..054f1d233 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -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"
diff --git a/src/item_use.c b/src/item_use.c
index b875b1910..de14e3ab9 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -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?
     {
diff --git a/src/pokemon.c b/src/pokemon.c
index 1607e1a40..0cbb127a6 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -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;
 
diff --git a/src/trainer_see.c b/src/trainer_see.c
index b3f4a77bd..dfc898cf7 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -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"