ref: 118c387d73c0d3cb82a53e4666499da6a143d0b9
parent: 71f51955c9b50a5e03739e2bd1d927ea55ee6d5a
author: Rangi <[email protected]>
date: Mon Feb 5 17:03:40 EST 2018
Remove commented G/S roaming Suicune code
--- a/engine/wildmons.asm
+++ b/engine/wildmons.asm
@@ -516,14 +516,11 @@
ld [wRoamMon1Species], a
ld a, ENTEI
ld [wRoamMon2Species], a
-; ld a, SUICUNE
-; ld [wRoamMon3Species], a
; level
ld a, 40
ld [wRoamMon1Level], a
ld [wRoamMon2Level], a
-; ld [wRoamMon3Level], a
; raikou starting map
ld a, GROUP_ROUTE_42
@@ -537,17 +534,10 @@
ld a, MAP_ROUTE_37
ld [wRoamMon2MapNumber], a
-; suicune starting map
-; ld a, GROUP_ROUTE_38
-; ld [wRoamMon3MapGroup], a
-; ld a, MAP_ROUTE_38
-; ld [wRoamMon3MapNumber], a
-
; hp
xor a ; generate new stats
ld [wRoamMon1HP], a
ld [wRoamMon2HP], a
-; ld [wRoamMon3HP], a
ret
; 2a2ce
@@ -631,7 +621,7 @@
.SkipEntei:
ld a, [wRoamMon3MapGroup]
cp GROUP_N_A
- jr z, .SkipSuicune
+ jr z, .Finished
ld b, a
ld a, [wRoamMon3MapNumber]
ld c, a
@@ -641,7 +631,7 @@
ld a, c
ld [wRoamMon3MapNumber], a
-.SkipSuicune:
+.Finished:
jp _BackUpMapIndices
; 2a355
@@ -712,8 +702,8 @@
ld [wRoamMon1MapGroup], a
ld a, c
ld [wRoamMon1MapNumber], a
-.SkipRaikou:
+.SkipRaikou:
ld a, [wRoamMon2MapGroup]
cp GROUP_N_A
jr z, .SkipEntei
@@ -722,18 +712,18 @@
ld [wRoamMon2MapGroup], a
ld a, c
ld [wRoamMon2MapNumber], a
-.SkipEntei:
+.SkipEntei:
ld a, [wRoamMon3MapGroup]
cp GROUP_N_A
- jr z, .SkipSuicune
+ jr z, .Finished
call JumpRoamMon
ld a, b
ld [wRoamMon3MapGroup], a
ld a, c
ld [wRoamMon3MapNumber], a
-.SkipSuicune:
+.Finished:
jp _BackUpMapIndices
JumpRoamMon: ; 2a3cd