Function2f17 -> IsInJohto

This commit is contained in:
yenatch 2013-09-08 00:46:25 -04:00
parent 705e682468
commit d05adc4f98

View File

@ -768,32 +768,37 @@ Function2ee4: ; 2ee4
INCLUDE "common/string.asm" INCLUDE "common/string.asm"
Function2f17: ; 2f17 IsInJohto: ; 2f17
; Return 0 if the player is in Johto, and 1 in Kanto.
ld a, [MapGroup] ld a, [MapGroup]
ld b, a ld b, a
ld a, [MapNumber] ld a, [MapNumber]
ld c, a ld c, a
call GetWorldMapLocation call GetWorldMapLocation
cp $5f
jr z, .asm_2f39 cp $5f ; SS Aqua
cp $0 jr z, .Johto
jr nz, .asm_2f35
cp $0 ; Poke Center 2F
jr nz, .CheckRegion
ld a, [BackupMapGroup] ld a, [BackupMapGroup]
ld b, a ld b, a
ld a, [BackupMapNumber] ld a, [BackupMapNumber]
ld c, a ld c, a
call GetWorldMapLocation call GetWorldMapLocation
.asm_2f35 .CheckRegion
cp $2f cp $2f ; Pallet Town
jr nc, .asm_2f3b jr nc, .Kanto
.asm_2f39 .Johto
xor a xor a
ret ret
.asm_2f3b .Kanto
ld a, $1 ld a, 1
ret ret
; 2f3e ; 2f3e
@ -36055,7 +36060,7 @@ Function2a200: ; 2a200
jr .asm_2a27a jr .asm_2a27a
.asm_2a235 .asm_2a235
call Function2f17 call IsInJohto
and a and a
ret z ret z
ld h, d ld h, d