thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-14 17:16:42 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup: rival team selection code, for all appearances.

Browse source 
hg-commit-id: f3ab1f798a62
This commit is contained in:
IIMarckus 2012-01-20 20:49:15 -07:00
parent 380aaa82c5
commit 4a98e21dc3
1 changed files with 56 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
common.asm
View file

@ -10568,20 +10568,23 @@ CeruleanCityScript1: ; 0x19567
call $3354 call $3354
ld a, $e1 ld a, $e1
ld [$d059], a ld [$d059], a
ld a, [$d715]
cp $b1 ; select which team to use during the encounter
jr nz, .asm_19598 ; 0x19592 $4 ld a, [W_RIVALSTARTER]
cp SQUIRTLE
jr nz, .NotSquirtle\@ ; 0x19592 $4
ld a, $7 ld a, $7
jr .asm_195a2 ; 0x19596 $a jr .done\@
.asm_19598 .NotSquirtle\@
cp $99 cp BULBASAUR
jr nz, .asm_195a0 ; 0x1959a $4 jr nz, .Charmander\@ ; 0x1959a $4
ld a, $8 ld a, $8
jr .asm_195a2 ; 0x1959e $2 jr .done\@
.asm_195a0 .Charmander\@
ld a, $9 ld a, $9
.asm_195a2 .done\@
ld [$d05d], a ld [W_TRAINERNO], a
xor a xor a
ld [$ff00+$b4], a ld [$ff00+$b4], a
call $555d call $555d
@ -41773,20 +41776,23 @@ PokemonTower2Text1: ; 0x605df
call $3354 call $3354
ld a, $f2 ld a, $f2
ld [$d059], a ld [$d059], a
ld a, [$d715]
cp $b1 ; select which team to use during the encounter
jr nz, .asm_0860c ; 0x6060f ld a, [W_RIVALSTARTER]
cp SQUIRTLE
jr nz, .NotSquirtle\@ ; 0x6060f
ld a, $4 ld a, $4
jr .asm_99cea ; 0x60613 jr .done\@
.asm_0860c ; 0x60615 .NotSquirtle\@ ; 0x60615
cp $99 cp BULBASAUR
jr nz, .asm_b3e6e ; 0x60617 jr nz, .Charmander\@ ; 0x60617
ld a, $5 ld a, $5
jr .asm_99cea ; 0x6061b jr .done\@
.asm_b3e6e ; 0x6061d .Charmander\@ ; 0x6061d
ld a, $6 ld a, $6
.asm_99cea ; 0x6061f .done\@
ld [$d05d], a ld [W_TRAINERNO], a
ld a, $1 ld a, $1
ld [$d62b], a ld [$d62b], a
ld [$da39], a ld [$da39], a
@ -42846,20 +42852,23 @@ SSAnne2Script1: ; 0x61430
call Delay3 call Delay3
ld a, $f2 ld a, $f2
ld [$d059], a ld [$d059], a
ld a, [$d715]
cp $b1 ; select which team to use during the encounter
jr nz, .asm_61457 ; 0x61451 $4 ld a, [W_RIVALSTARTER]
cp SQUIRTLE
jr nz, .NotSquirtle\@ ; 0x61451 $4
ld a, $1 ld a, $1
jr .asm_61461 ; 0x61455 $a jr .done\@
.asm_61457 .NotSquirtle\@
cp $99 cp BULBASAUR
jr nz, .asm_6145f ; 0x61459 $4 jr nz, .Charmander\@ ; 0x61459 $4
ld a, $2 ld a, $2
jr .asm_61461 ; 0x6145d $2 jr .done\@
.asm_6145f .Charmander\@
ld a, $3 ld a, $3
.asm_61461 .done\@
ld [$d05d], a ld [W_TRAINERNO], a
call $5416 call $5416
ld a, $2 ld a, $2
ld [$d665], a ld [$d665], a
@ -48227,20 +48236,23 @@ GaryScript2: ; 0x75f6a 5F6A
call $3354 call $3354
ld a, $f3 ld a, $f3
ld [$d059], a ld [$d059], a
ld a, [$d715]
cp $b1 ; select which team to use during the encounter
jr nz, .asm_75fa5 ; 0x75f9f $4 ld a, [W_RIVALSTARTER]
cp SQUIRTLE
jr nz, .NotSquirtle\@ ; 0x75f9f $4
ld a, $1 ld a, $1
jr .asm_75faf ; 0x75fa3 $a jr .done\@
.asm_75fa5 .NotSquirtle\@
cp $99 cp BULBASAUR
jr nz, .asm_75fad ; 0x75fa7 $4 jr nz, .Charmander\@ ; 0x75fa7 $4
ld a, $2 ld a, $2
jr .asm_75faf ; 0x75fab $2 jr .done\@
.asm_75fad .Charmander\@
ld a, $3 ld a, $3
.asm_75faf .done\@
ld [$d05d], a ld [W_TRAINERNO], a
xor a xor a
ld [$ff00+$b4], a ld [$ff00+$b4], a
ld a, $3 ld a, $3