diff options
| -rw-r--r-- | asm/rom_806936C.s | 8 | ||||
| -rw-r--r-- | src/new_game.c | 4 | ||||
| -rw-r--r-- | src/rom4.c | 6 | ||||
| -rw-r--r-- | src/scrcmd.c | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/asm/rom_806936C.s b/asm/rom_806936C.s index 209bc5d07..b12ec60d5 100644 --- a/asm/rom_806936C.s +++ b/asm/rom_806936C.s @@ -198,7 +198,7 @@ _0806947A: ands r0, r1 cmp r0, 0 beq _080694AC - bl InTrainerHill + bl DoDailyEvents ldrh r0, [r4] adds r0, 0x1 b _080694AA @@ -2143,8 +2143,8 @@ _0806A358: .4byte gLocalTime _0806A35C: .4byte 0x00004040 thumb_func_end sub_806A328 - thumb_func_start InTrainerHill -InTrainerHill: @ 806A360 + thumb_func_start DoDailyEvents +DoDailyEvents: @ 806A360 push {r4,lr} ldr r0, _0806A388 bl FlagGet @@ -2164,7 +2164,7 @@ _0806A380: .align 2, 0 _0806A388: .4byte 0x00000835 _0806A38C: .4byte gLocalTime - thumb_func_end InTrainerHill + thumb_func_end DoDailyEvents thumb_func_start sub_806A390 sub_806A390: @ 806A390 diff --git a/src/new_game.c b/src/new_game.c index 3d7722505..0dab6116c 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -34,7 +34,7 @@ void set_player_trainer_id(void) write_word_to_mem((Random() << 16) | Random(), gSaveBlock2.playerTrainerId); } -void sub_8052D54(void) +void SetDefaultOptions(void) { gSaveBlock2.optionsTextSpeed = OPTIONS_TEXT_SPEED_MID; gSaveBlock2.optionsWindowFrameType = 0; @@ -73,7 +73,7 @@ void sub_8052E04(void) void ClearSav2(void) { CpuFill16(0, &gSaveBlock2, sizeof(gSaveBlock2)); - sub_8052D54(); + SetDefaultOptions(); } void sub_8052E4C(void) diff --git a/src/rom4.c b/src/rom4.c index 7abb15460..75786eb33 100644 --- a/src/rom4.c +++ b/src/rom4.c @@ -551,7 +551,7 @@ void sub_80538F0(u8 mapGroup, u8 mapNum) wild_pokemon_reroll(); prev_quest_postbuffer_cursor_backup_reset(); sub_8082BD0(mapGroup, mapNum); - InTrainerHill(); + DoDailyEvents(); sub_80806E4(); sub_8054164(); sub_8053C98(); @@ -585,7 +585,7 @@ void sub_8053994(u32 a1) prev_quest_postbuffer_cursor_backup_reset(); sub_8082BD0(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum); if (a1 != 1) - InTrainerHill(); + DoDailyEvents(); sub_80806E4(); sub_8054164(); if (v2) @@ -1287,7 +1287,7 @@ void CB2_ContinueSavedGame(void) sub_805338C(); sub_8053198(); sub_806451C(); - InTrainerHill(); + DoDailyEvents(); sub_805308C(); sub_8055FC0(); PlayTimeCounter_Start(); diff --git a/src/scrcmd.c b/src/scrcmd.c index 53262d183..9acca98dc 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -32,7 +32,7 @@ extern void sav12_xor_increment(u8); extern void sub_8081594(u8); extern void sub_8053CE4(u32); extern void fade_screen(u8, u8); -extern void InTrainerHill(void); +extern void DoDailyEvents(void); extern void sub_80806B4(u32); extern void sub_80806E4(void); extern void sub_808073C(void); @@ -708,7 +708,7 @@ bool8 ScrCmd_compareflags(struct ScriptContext *ctx) bool8 ScrCmd_checkdailyflags(struct ScriptContext *ctx) { - InTrainerHill(); + DoDailyEvents(); return FALSE; } |