From bb0ae40761f4616b3d7af639448056cffd04ed3a Mon Sep 17 00:00:00 2001 From: Zane Kaminski Date: Wed, 31 Mar 2021 07:17:53 -0400 Subject: [PATCH] Add bypass in spin(...) in case VBL not working --- bin/GWRAM.dbg.po | Bin 143360 -> 143360 bytes bin/GWRAM.po | Bin 143360 -> 143360 bytes util.c | 5 +++-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/GWRAM.dbg.po b/bin/GWRAM.dbg.po index 4b8027cc24d2667f4a0b628963b39d5d724b496f..88c6d68256b568fb403a59db9e585bd688c33483 100644 GIT binary patch delta 3922 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 delta 3853 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 diff --git a/bin/GWRAM.po b/bin/GWRAM.po index ea530066f1ca7db514664775cf55a5fd0c6a8977..338020c3d2f996f0ede9bc0985a2758874599faf 100644 GIT binary patch delta 3953 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 aKokteAJWcv;@!UEKldGHW3z%uWBVV~X1Uq` diff --git a/util.c b/util.c index 4584d13..4058569 100644 --- a/util.c +++ b/util.c @@ -40,8 +40,9 @@ void spin(uint8_t x, uint8_t y) { // Wait specificed number of frames for (k = 0; k < SPIN_FRAMESPERCHAR; k++) { - while (*VBL < 0); - while (*VBL >= 0); + unsigned char l; + for (l = 0; *VBL < 0 && l < 255; l++); + for (l = 0; *VBL >= 0 && l < 255; l++); } } }