Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'pret/master' into pret-merge

Browse Source 
Conflicts:
	src/clock.c
	src/field_message_box.c
This commit is contained in:
Hedara 2025-09-30 17:34:57 +02:00
commit 3e5caf64d9
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/clock.c
View File

@ -1,16 +1,16 @@
#include "global.h"
#include "berry.h"
#include "clock.h"
#include "dewford_trend.h"
#include "event_data.h"
#include "field_specials.h"
#include "field_weather.h"
#include "main.h"
#include "lottery_corner.h"
#include "overworld.h"
#include "rtc.h"
#include "time_events.h"
#include "field_specials.h"
#include "lottery_corner.h"
#include "dewford_trend.h"
#include "tv.h"
#include "field_weather.h"
#include "berry.h"
#include "main.h"
#include "overworld.h"
#include "wallclock.h"
#include "constants/form_change_types.h"

6
src/field_message_box.c
View File

@ -39,9 +39,9 @@ static void Task_DrawFieldMessage(u8 taskId)
task->tState++;
break;
case 1:
DrawDialogueFrame(0, TRUE);
task->tState++;
break;
DrawDialogueFrame(0, TRUE);
task->tState++;
break;
case 2:
if (RunTextPrintersAndIsPrinter0Active() != TRUE)
{