diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-08-30 16:23:19 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-08-30 16:23:19 -0400 |
| commit | 1ca1651cdcdfc2ca2f8c9214c88fd23b5196f85e (patch) | |
| tree | a6c9f2edfb0f5c380cc35175024d18bd77ea243a /src/intro_credits_graphics.c | |
| parent | 7c32f9d05f06303f5350eb079960e0d4fab40dcd (diff) | |
| parent | d7a6ff0e4dab0c96ac49975a0695014bff2b9654 (diff) | |
attempting to resolve conflict
Diffstat (limited to 'src/intro_credits_graphics.c')
| -rwxr-xr-x | src/intro_credits_graphics.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c index 58e40da91..cd0589af8 100755 --- a/src/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c @@ -374,8 +374,9 @@ void sub_8149020(u8 mode) case 0: default: /* stuff */ - if(gMain.vblankCounter1 & 3 || gPaletteFade.active) break; - if(gMain.vblankCounter1 & 4) + if (gMain.vblankCounter1 & 3 || gPaletteFade.active) + break; + if (gMain.vblankCounter1 & 4) { var1 = gPlttBufferUnfaded[9]; var2 = gPlttBufferUnfaded[10]; @@ -389,9 +390,9 @@ void sub_8149020(u8 mode) LoadPalette(&var2, 10, 2); break; case 2: - /* stuff */ - if(gMain.vblankCounter1 & 3 || gPaletteFade.active) break; - if(gMain.vblankCounter1 & 4) + if (gMain.vblankCounter1 & 3 || gPaletteFade.active) + break; + if (gMain.vblankCounter1 & 4) { var1 = 0x3D27; var2 = 0x295; @@ -411,7 +412,7 @@ void sub_8149020(u8 mode) void sub_814910C(struct Sprite *sprite) { - if(gUnknown_0203935C) + if (gUnknown_0203935C) { DestroySprite(sprite); } @@ -528,4 +529,4 @@ u8 intro_create_latias_sprite(s16 a, s16 b) StartSpriteAnim(&gSprites[latios], 1); gSprites[latios].callback = &sub_81493C4; return sprite; -}
\ No newline at end of file +} |