ref: fa7261a8eea2676746c130a517479e2a82a7d352
parent: 083d51fd588d9752b8f7c5d104cffc3896d51b5b
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Tue Dec 3 04:17:21 EST 2019
Update some labels
--- a/engine/overworld/map_setup.asm
+++ b/engine/overworld/map_setup.asm
@@ -178,13 +178,13 @@
jr z, .surfing
call GetMapEnvironment
cp INDOOR
- jr z, .checkbiking
+ jr z, .no_biking
cp ENVIRONMENT_5
- jr z, .checkbiking
+ jr z, .no_biking
cp DUNGEON
- jr z, .checkbiking
+ jr z, .no_biking
jr .nope
-.checkbiking
+.no_biking
ld a, [wPlayerState]
cp PLAYER_BIKE
jr nz, .nope
@@ -200,18 +200,19 @@
.CheckSurfing:
call CheckOnWater
- jr nz, .ret_nc
+ jr nz, .nope2
ld a, [wPlayerState]
cp PLAYER_SURF
- jr z, ._surfing
+ jr z, .is_surfing
cp PLAYER_SURF_PIKA
- jr z, ._surfing
+ jr z, .is_surfing
ld a, PLAYER_SURF
ld [wPlayerState], a
-._surfing
+.is_surfing
scf
ret
-.ret_nc
+
+.nope2
and a
ret
--- a/home/map.asm
+++ b/home/map.asm
@@ -369,6 +369,7 @@
ret
; unused
+UnreferencedCheckEnvironment::
cp INDOOR
ret z
cp GATE