From f67137ddb23fc5fb5aea18ae3665dc0e9a68b409 Mon Sep 17 00:00:00 2001 From: kiliwily <69381603+kiliwily@users.noreply.github.com> Date: Thu, 6 Jan 2022 19:29:58 +0100 Subject: [PATCH 1/3] Update field_specials.c --- src/field_specials.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/field_specials.c b/src/field_specials.c index bd6d53caf1df..fd8a69ecad6e 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -352,7 +352,9 @@ bool32 ShouldDoWallyCall(void) case MAP_TYPE_ROUTE: case MAP_TYPE_OCEAN_ROUTE: if (++(*GetVarPointer(VAR_WALLY_CALL_STEP_COUNTER)) < 250) + { return FALSE; + } break; default: return FALSE; From ba9b533845c08c58739784027a122cf178bc4d2e Mon Sep 17 00:00:00 2001 From: kiliwily <69381603+kiliwily@users.noreply.github.com> Date: Thu, 6 Jan 2022 19:45:38 +0100 Subject: [PATCH 2/3] Revert "Update field_specials.c" This reverts commit f67137ddb23fc5fb5aea18ae3665dc0e9a68b409. --- src/field_specials.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/field_specials.c b/src/field_specials.c index fd8a69ecad6e..bd6d53caf1df 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -352,9 +352,7 @@ bool32 ShouldDoWallyCall(void) case MAP_TYPE_ROUTE: case MAP_TYPE_OCEAN_ROUTE: if (++(*GetVarPointer(VAR_WALLY_CALL_STEP_COUNTER)) < 250) - { return FALSE; - } break; default: return FALSE; From 8a9740b819907b63da542518fc777bc2d5f636cf Mon Sep 17 00:00:00 2001 From: kiliwily <69381603+kiliwily@users.noreply.github.com> Date: Thu, 6 Jan 2022 19:47:56 +0100 Subject: [PATCH 3/3] Update field_specials.c --- src/field_specials.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/field_specials.c b/src/field_specials.c index bd6d53caf1df..d97a17a7d364 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -377,9 +377,7 @@ bool32 ShouldDoScottFortreeCall(void) case MAP_TYPE_ROUTE: case MAP_TYPE_OCEAN_ROUTE: if (++(*GetVarPointer(VAR_SCOTT_FORTREE_CALL_STEP_COUNTER)) < 10) - { return FALSE; - } break; default: return FALSE; @@ -404,9 +402,7 @@ bool32 ShouldDoScottBattleFrontierCall(void) case MAP_TYPE_ROUTE: case MAP_TYPE_OCEAN_ROUTE: if (++(*GetVarPointer(VAR_SCOTT_BF_CALL_STEP_COUNTER)) < 10) - { return FALSE; - } break; default: return FALSE; @@ -431,9 +427,7 @@ bool32 ShouldDoRoxanneCall(void) case MAP_TYPE_ROUTE: case MAP_TYPE_OCEAN_ROUTE: if (++(*GetVarPointer(VAR_ROXANNE_CALL_STEP_COUNTER)) < 250) - { return FALSE; - } break; default: return FALSE; @@ -458,9 +452,7 @@ bool32 ShouldDoRivalRayquazaCall(void) case MAP_TYPE_ROUTE: case MAP_TYPE_OCEAN_ROUTE: if (++(*GetVarPointer(VAR_RIVAL_RAYQUAZA_CALL_STEP_COUNTER)) < 250) - { return FALSE; - } break; default: return FALSE;