diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-09-04 23:31:37 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-09-04 23:31:37 +0100 |
| commit | 4c54212b1f559a110fc7f6fffebe3a54748f3fec (patch) | |
| tree | 9a15ec95345fdc22fd5d48580f0492695b8c036f /src/field_specials.c | |
| parent | 5c66b8a7eff886b72bb98e22b5b34421d1a601d2 (diff) | |
Bring labels for overworld.c over from pokeruby
Diffstat (limited to 'src/field_specials.c')
| -rw-r--r-- | src/field_specials.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_specials.c b/src/field_specials.c index 84852e6b5..14f99b426 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -269,7 +269,7 @@ u16 GetRecordedCyclingRoadResults(void) { } void UpdateCyclingRoadState(void) { - if (gUnknown_020322DC.mapNum == MAP_NUM(ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE) && gUnknown_020322DC.mapGroup == MAP_GROUP(ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE)) + if (gLastUsedWarp.mapNum == MAP_NUM(ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE) && gLastUsedWarp.mapGroup == MAP_GROUP(ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE)) { return; } @@ -2094,7 +2094,7 @@ bool32 warp0_in_pokecenter(void) static const u16 gUnknown_085B2C2A[] = { 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a, 0x1a35, 0x193c, 0xffff }; int i; - u16 map = (gUnknown_020322DC.mapGroup << 8) + gUnknown_020322DC.mapNum; + u16 map = (gLastUsedWarp.mapGroup << 8) + gLastUsedWarp.mapNum; for (i = 0; gUnknown_085B2C2A[i] != 0xFFFF; i++) { |