Fix errors caused by merging

pret · May 29, 2023 · c3ae6df · c3ae6df
1 parent 3328899
commit c3ae6df
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/include/encounter.h b/include/encounter.h
@@ -30,7 +30,7 @@ void SetupAndStartTutorialBattle(TaskManager *taskManager);
 void SetupAndStartTrainerBattle(TaskManager *taskManager, u32 opponentTrainer1, u32 opponentTrainer2, u32 followerTrainerNum, u32 a4, u32 a5, HeapID heapId, u32 *winFlag);
 void sub_02050B90(FieldSystem *fsys, TaskManager *taskManager, BATTLE_SETUP *setup);
 void sub_0205239C(BATTLE_SETUP *setup, FieldSystem *fsys);
-void sub_02050AAC(TaskManager *man, BATTLE_SETUP *setup, int effect, int bgm, int *winFlag);
+void sub_02050AAC(TaskManager *man, BATTLE_SETUP *setup, int effect, int bgm, u32 *winFlag);
 void sub_020511F8(FieldSystem *fsys, BATTLE_SETUP *setup);
 void sub_020515FC(FieldSystem *fsys, PARTY *party, int battleFlags);
 void sub_02051598(FieldSystem *fsys, void *a1, int battleFlags);

diff --git a/include/get_egg.h b/include/get_egg.h
@@ -4,7 +4,7 @@
 #include "daycare.h"
 #include "script.h"
 
-BOXMON *Daycare_GetBoxMonI(DAYCARE *daycare, int idx);
+BoxPokemon *Daycare_GetBoxMonI(DAYCARE *daycare, int idx);
 void Sav2_DayCare_PutMonIn(PARTY *party, u8 partyIdx, DAYCARE *dayCare, SAVEDATA *saveData);
 u16 Sav2_DayCare_RetrieveMon(PARTY *party, MessageFormat *msgFmt, DAYCARE *daycare, u8 whomst);
 int DayCareMon_CalcLevelGrowth(DAYCAREMON *daycareMon);

diff --git a/include/pokedex.h b/include/pokedex.h
@@ -75,6 +75,6 @@ BOOL Pokedex_IsEnabled(const POKEDEX *pokedex);
 void Pokedex_Enable(POKEDEX *pokedex);
 int Pokedex_GetSeenFormeByIdx(POKEDEX *pokedex, int species, int idx);
 int Pokedex_GetSeenFormeNum(POKEDEX *pokedex, int species);
-void UpdatePokedexWithReceivedSpecies(SAVEDATA *saveData, POKEMON *pokemon);
+void UpdatePokedexWithReceivedSpecies(SAVEDATA *saveData, Pokemon *pokemon);
 
 #endif //POKEHEARTGOLD_POKEDEX_H
diff --git a/include/text_0205B4EC.h b/include/text_0205B4EC.h
@@ -10,5 +10,6 @@ void sub_0205B564(WINDOW *window, OPTIONS *options);
 u8 sub_0205B5B4(WINDOW *window, STRING *string, OPTIONS *options, BOOL speedupFlag);
 BOOL IsPrintFinished(u8 printerId);
 void sub_0205B5A8(WINDOW *window);
+u32 sub_0205B5EC(WINDOW *window, STRING *message, FontID fontId, u32 textFrame, u8 speedUpEnabled, u32 a4);
 
 #endif //POKEHEARTGOLD_TEXT_0205B4EC_H
diff --git a/src/scrcmd_message.c b/src/scrcmd_message.c
@@ -9,6 +9,8 @@
 #include "pm_string.h"
 #include "scrcmd.h"
 #include "script.h"
+#include "text.h"
+#include "text_0205B4EC.h"
 #include "window.h"
 
 typedef struct MessageBox {
@@ -297,7 +299,7 @@ static void ovFieldMain_GetFormattedECMessage(MessageBox *messageBox, u16 messag
 }
 
 static void ov01_021EF758(MessageBox *messageBox, FontID fontId, u32 textFrameDelay, BOOL canABSpeedUp, u32 a4) {
-    *(messageBox->textPrinterNumPtr) = sub_0205B5EC(messageBox->window, messageBox->message, fontId, textFrameDelay, (u8)canABSpeedUp, a4);
+    *(messageBox->textPrinterNumPtr) = sub_0205B5EC(messageBox->window, messageBox->message, fontId, textFrameDelay, canABSpeedUp, a4);
 }
 
 static void ovFieldMain_AddTextPrinterParameterized(MessageBox *messageBox, FontID fontId) {