diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-09-01 14:26:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-01 14:26:11 -0400 |
| commit | 5fc49bfd9f4dc2f04448dfcb2a296d3964677742 (patch) | |
| tree | 8601fc6870c5f6c108f60ca89b2d5d9447a2e554 /src/field_specials.c | |
| parent | 7c8bc0fbe3606f9dac1f84a9f3a25879cb984782 (diff) | |
| parent | 9d7a11d9c0c8cc299fd4c7ce3a038934584db8dd (diff) | |
Merge pull request #1165 from GriffinRichards/fix-underwatermaps
Give proper names to underwater maps
Diffstat (limited to 'src/field_specials.c')
| -rw-r--r-- | src/field_specials.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/field_specials.c b/src/field_specials.c index c1fc92dbe..1e7634174 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -3649,14 +3649,14 @@ bool8 AbnormalWeatherHasExpired(void) } } - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(UNDERWATER3)) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(UNDERWATER_ROUTE127)) { switch (gSaveBlock1Ptr->location.mapNum) { - case MAP_NUM(UNDERWATER3): - case MAP_NUM(UNDERWATER5): - case MAP_NUM(UNDERWATER6): - case MAP_NUM(UNDERWATER7): + case MAP_NUM(UNDERWATER_ROUTE127): + case MAP_NUM(UNDERWATER_ROUTE129): + case MAP_NUM(UNDERWATER_ROUTE105): + case MAP_NUM(UNDERWATER_ROUTE125): VarSet(VAR_SHOULD_END_ABNORMAL_WEATHER, 1); return FALSE; default: |