Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make battle dome compile

This commit is contained in:
DizzyEggg 2018-08-25 20:14:10 +02:00
parent 447e65860c
commit 0d8c5b613e
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/field_message_box.c
View File

@ -4,7 +4,9 @@
#include "string_util.h" #include "string_util.h"
#include "task.h" #include "task.h"
#include "text.h" #include "text.h"
#include "battle_frontier_1.h"
extern bool32 sub_8196094(void);
extern void sub_8196080(u8*);
EWRAM_DATA u8 gUnknown_020375BC = 0; EWRAM_DATA u8 gUnknown_020375BC = 0;
@ -23,7 +25,7 @@ void sub_8098128(void)
void sub_8098154(u8 taskId) void sub_8098154(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
switch (task->data[0]) switch (task->data[0])
{ {
case 0: case 0:
@ -61,12 +63,12 @@ bool8 ShowFieldMessage(u8 *str)
return FALSE; return FALSE;
textbox_fdecode_auto_and_task_add(str, 1); textbox_fdecode_auto_and_task_add(str, 1);
gUnknown_020375BC = 2; gUnknown_020375BC = 2;
return TRUE; return TRUE;
} }
void sub_8098214(u8 taskId) void sub_8098214(u8 taskId)
{ {
if (sub_8196094() == 0) if (!sub_8196094())
{ {
gUnknown_020375BC = 0; gUnknown_020375BC = 0;
DestroyTask(taskId); DestroyTask(taskId);

2
src/match_call.c
View File

@ -5,9 +5,9 @@
#include "event_data.h" #include "event_data.h"
#include "string_util.h" #include "string_util.h"
#include "battle.h" #include "battle.h"
#include "battle_frontier_1.h"
#include "gym_leader_rematch.h" #include "gym_leader_rematch.h"
extern void sub_8197080(u8 *dest);
extern const u8 gTrainerClassNames[][13]; extern const u8 gTrainerClassNames[][13];
// Static type declarations // Static type declarations