diff options
| -rw-r--r-- | src/battle_anim_rock.c | 6 | ||||
| -rw-r--r-- | src/play_time.c | 50 |
2 files changed, 26 insertions, 30 deletions
diff --git a/src/battle_anim_rock.c b/src/battle_anim_rock.c index 1f22d2976..436ac60a3 100644 --- a/src/battle_anim_rock.c +++ b/src/battle_anim_rock.c @@ -182,10 +182,6 @@ static const union AnimCmd *const sAnims_BasicRock[] = { sAnim_BasicRock_0, sAnim_BasicRock_1, -}; - -static const union AnimCmd *const sAnims_WeatherBallRockDown[] = -{ sAnim_WeatherBallRockDown_0, sAnim_WeatherBallRockDown_1, }; @@ -296,7 +292,7 @@ const struct SpriteTemplate gWeatherBallRockDownSpriteTemplate = .tileTag = ANIM_TAG_ROCKS, .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_AffineNormal_ObjNormal_32x32, - .anims = sAnims_WeatherBallRockDown, + .anims = &sAnims_BasicRock[2], .images = NULL, .affineAnims = sAffineAnims_BasicRock, .callback = AnimWeatherBallDown, diff --git a/src/play_time.c b/src/play_time.c index 27a57f28b..97f4ac22f 100644 --- a/src/play_time.c +++ b/src/play_time.c @@ -35,31 +35,31 @@ void PlayTimeCounter_Stop(void) void PlayTimeCounter_Update(void) { - if (sPlayTimeCounterState == RUNNING) - { - gSaveBlock2Ptr->playTimeVBlanks++; - - if (gSaveBlock2Ptr->playTimeVBlanks > 59) - { - gSaveBlock2Ptr->playTimeVBlanks = 0; - gSaveBlock2Ptr->playTimeSeconds++; - - if (gSaveBlock2Ptr->playTimeSeconds > 59) - { - gSaveBlock2Ptr->playTimeSeconds = 0; - gSaveBlock2Ptr->playTimeMinutes++; - - if (gSaveBlock2Ptr->playTimeMinutes > 59) - { - gSaveBlock2Ptr->playTimeMinutes = 0; - gSaveBlock2Ptr->playTimeHours++; - - if (gSaveBlock2Ptr->playTimeHours > 999) - PlayTimeCounter_SetToMax(); - } - } - } - } + if (sPlayTimeCounterState != RUNNING) + return; + + gSaveBlock2Ptr->playTimeVBlanks++; + + if (gSaveBlock2Ptr->playTimeVBlanks < 60) + return; + + gSaveBlock2Ptr->playTimeVBlanks = 0; + gSaveBlock2Ptr->playTimeSeconds++; + + if (gSaveBlock2Ptr->playTimeSeconds < 60) + return; + + gSaveBlock2Ptr->playTimeSeconds = 0; + gSaveBlock2Ptr->playTimeMinutes++; + + if (gSaveBlock2Ptr->playTimeMinutes < 60) + return; + + gSaveBlock2Ptr->playTimeMinutes = 0; + gSaveBlock2Ptr->playTimeHours++; + + if (gSaveBlock2Ptr->playTimeHours > 999) + PlayTimeCounter_SetToMax(); } void PlayTimeCounter_SetToMax(void) |