From f980188b82f3a00348a5a78caf33cc0eb8812aa2 Mon Sep 17 00:00:00 2001 From: PokeCodec <67983839+PokeCodec@users.noreply.github.com> Date: Tue, 8 Sep 2020 20:51:50 -0400 Subject: Fix battle transition fakematch --- src/battle_transition.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/battle_transition.c') diff --git a/src/battle_transition.c b/src/battle_transition.c index 559279e74..4a9d26303 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -3973,11 +3973,8 @@ static bool8 Phase2_FrontierLogoWave_Func4(struct Task *task) for (i = 0; i < 160; i++, var6 += var8) { - s16 index = var6 / 256; - #ifndef NONMATCHING - asm(""); - #endif - gScanlineEffectRegBuffers[0][i] = sTransitionStructPtr->field_16 + Sin(index, amplitude); + const u16 index = var6 >> 8; + gScanlineEffectRegBuffers[0][i] = sTransitionStructPtr->field_16 + Sin(index & 0xff, amplitude); } if (++task->tData3 == 101) -- cgit v1.2.3 From 7dc95a0103af08c95c9093b6efa6c77af77a2538 Mon Sep 17 00:00:00 2001 From: aaaaaa123456789 Date: Sun, 13 Sep 2020 04:22:50 -0300 Subject: Undo PokeCodec's PRs This commit undoes most of PokeCodec's PRs after the debate in chat. Some harmless or completely superseded PRs have been left alone, as there is not much benefit in attempting to undo them. Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136, #1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179, #1180, #1181, #1182 and #1183. --- src/battle_transition.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/battle_transition.c') diff --git a/src/battle_transition.c b/src/battle_transition.c index 4a9d26303..559279e74 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -3973,8 +3973,11 @@ static bool8 Phase2_FrontierLogoWave_Func4(struct Task *task) for (i = 0; i < 160; i++, var6 += var8) { - const u16 index = var6 >> 8; - gScanlineEffectRegBuffers[0][i] = sTransitionStructPtr->field_16 + Sin(index & 0xff, amplitude); + s16 index = var6 / 256; + #ifndef NONMATCHING + asm(""); + #endif + gScanlineEffectRegBuffers[0][i] = sTransitionStructPtr->field_16 + Sin(index, amplitude); } if (++task->tData3 == 101) -- cgit v1.2.3 From 847878eae9a9f0ac4a722c27c1cdf1a2d3ff1d67 Mon Sep 17 00:00:00 2001 From: Kaz Date: Sat, 19 Sep 2020 13:37:24 -0400 Subject: battle_gfx_sfx_util.c: Very annoying fakematch fix. daycare.c: -g eliminates the need for the brace hack. battle_transition.c: Fix Phase2_Ripple_Func2...? --- src/battle_transition.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/battle_transition.c') diff --git a/src/battle_transition.c b/src/battle_transition.c index 4a9d26303..43a90ac98 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -1956,10 +1956,7 @@ static bool8 Phase2_Ripple_Func2(struct Task *task) for (i = 0; i < 160; i++, r4 += r8) { s16 var = r4 >> 8; - - var++; - var--; - gScanlineEffectRegBuffers[0][i] = sTransitionStructPtr->field_16 + Sin(var, r3); + gScanlineEffectRegBuffers[0][i] = sTransitionStructPtr->field_16 + Sin(var & 0xffff, r3); } if (++task->tData3 == 81) -- cgit v1.2.3 From 193e601c2c14b7230f73a4d1c28b85bbc88810cb Mon Sep 17 00:00:00 2001 From: Kurausukun Date: Sun, 25 Oct 2020 23:42:50 -0400 Subject: port Phase2_FrontierLogoWave_Func4 fix --- src/battle_transition.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/battle_transition.c') diff --git a/src/battle_transition.c b/src/battle_transition.c index 559279e74..496cc9e09 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -3974,10 +3974,7 @@ static bool8 Phase2_FrontierLogoWave_Func4(struct Task *task) for (i = 0; i < 160; i++, var6 += var8) { s16 index = var6 / 256; - #ifndef NONMATCHING - asm(""); - #endif - gScanlineEffectRegBuffers[0][i] = sTransitionStructPtr->field_16 + Sin(index, amplitude); + gScanlineEffectRegBuffers[0][i] = sTransitionStructPtr->field_16 + Sin(index & 0xff, amplitude); } if (++task->tData3 == 101) -- cgit v1.2.3