thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use constants for the starter mons

Browse source
This commit is contained in:
U-Fish-PC\Daniel 2014-05-21 08:48:30 -04:00
parent 02e6e3765e
commit d693721f97
10 changed files with 35 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constants.asm
View file

@ -28,4 +28,4 @@ INCLUDE "constants/connection_constants.asm"
INCLUDE "constants/credits_constants.asm" INCLUDE "constants/credits_constants.asm"
INCLUDE "constants/music_constants.asm" INCLUDE "constants/music_constants.asm"
INCLUDE "constants/tilesets.asm" INCLUDE "constants/tilesets.asm"
INCLUDE "constants/starter_mons.asm"

3
constants/starter_mons.asm Executable file
View file

@ -0,0 +1,3 @@
STARTER1 EQU CHARMANDER
STARTER2 EQU SQUIRTLE
STARTER3 EQU BULBASAUR

10
main.asm
View file

@ -30086,11 +30086,11 @@ TitleBallYTable: ; 372a0 (d:72a0)
Func_372ac: ; 372ac (d:72ac) Func_372ac: ; 372ac (d:72ac)
; Animate the TitleBall if a starter just got scrolled out. ; Animate the TitleBall if a starter just got scrolled out.
ld a, [wWhichTrade] ; $cd3d ld a, [wWhichTrade] ; $cd3d
cp CHARMANDER cp STARTER1
jr z, .ok jr z, .ok
cp SQUIRTLE cp STARTER2
jr z, .ok jr z, .ok
cp BULBASAUR cp STARTER3
ret nz ret nz
.ok .ok
ld e, 1 ; animate titleball ld e, 1 ; animate titleball
@ -32157,10 +32157,10 @@ ReadTrainer: ; 39c53 (e:5c53)
; starter ; starter
ld a,[W_RIVALSTARTER] ld a,[W_RIVALSTARTER]
cp BULBASAUR cp STARTER3
ld b,MEGA_DRAIN ld b,MEGA_DRAIN
jr z,.GiveStarterMove jr z,.GiveStarterMove
cp CHARMANDER cp STARTER1
ld b,FIRE_BLAST ld b,FIRE_BLAST
jr z,.GiveStarterMove jr z,.GiveStarterMove
ld b,BLIZZARD ; must be squirtle ld b,BLIZZARD ; must be squirtle

4
scripts/ceruleancity.asm
View file

@ -141,12 +141,12 @@ CeruleanCityScript1: ; 19567 (6:5567)
; select which team to use during the encounter ; select which team to use during the encounter
ld a, [W_RIVALSTARTER] ld a, [W_RIVALSTARTER]
cp SQUIRTLE cp STARTER2
jr nz, .NotSquirtle ; 0x19592 $4 jr nz, .NotSquirtle ; 0x19592 $4
ld a, $7 ld a, $7
jr .done jr .done
.NotSquirtle .NotSquirtle
cp BULBASAUR cp STARTER3
jr nz, .Charmander ; 0x1959a $4 jr nz, .Charmander ; 0x1959a $4
ld a, $8 ld a, $8
jr .done jr .done

4
scripts/gary.asm
View file

@ -69,12 +69,12 @@ GaryScript2: ; 75f6a (1d:5f6a)
; select which team to use during the encounter ; select which team to use during the encounter
ld a, [W_RIVALSTARTER] ld a, [W_RIVALSTARTER]
cp SQUIRTLE cp STARTER2
jr nz, .NotSquirtle ; 0x75f9f $4 jr nz, .NotSquirtle ; 0x75f9f $4
ld a, $1 ld a, $1
jr .done jr .done
.NotSquirtle .NotSquirtle
cp BULBASAUR cp STARTER3
jr nz, .Charmander ; 0x75fa7 $4 jr nz, .Charmander ; 0x75fa7 $4
ld a, $2 ld a, $2
jr .done jr .done

20
scripts/oakslab.asm
View file

@ -196,9 +196,9 @@ OaksLabScript7: ; 1cc72 (7:4c72)
OaksLabScript8: ; 1cc80 (7:4c80) OaksLabScript8: ; 1cc80 (7:4c80)
ld a, [W_PLAYERSTARTER] ld a, [W_PLAYERSTARTER]
cp CHARMANDER cp STARTER1
jr z, .Charmander ; 0x1cc85 $6 jr z, .Charmander ; 0x1cc85 $6
cp SQUIRTLE cp STARTER2
jr z, .Squirtle ; 0x1cc89 $1d jr z, .Squirtle ; 0x1cc89 $1d
jr .Bulbasaur ; 0x1cc8b $38 jr .Bulbasaur ; 0x1cc8b $38
.Charmander .Charmander
@ -366,12 +366,12 @@ OaksLabScript11: ; 1cdb9 (7:4db9)
ld a, SONY1 + $C8 ld a, SONY1 + $C8
ld [W_CUROPPONENT], a ld [W_CUROPPONENT], a
ld a, [W_RIVALSTARTER] ld a, [W_RIVALSTARTER]
cp SQUIRTLE cp STARTER2
jr nz, .NotSquirtle ; 0x1cdc9 $4 jr nz, .NotSquirtle ; 0x1cdc9 $4
ld a, $1 ld a, $1
jr .done ; 0x1cdcd $a jr .done ; 0x1cdcd $a
.NotSquirtle .NotSquirtle
cp BULBASAUR cp STARTER3
jr nz, .Charmander ; 0x1cdd1 $4 jr nz, .Charmander ; 0x1cdd1 $4
ld a, $2 ld a, $2
jr .done ; 0x1cdd5 $2 jr .done ; 0x1cdd5 $2
@ -783,33 +783,33 @@ OaksLabText41: ; 1d0fd (7:50fd)
OaksLabText29: ; 1d102 (7:5102) OaksLabText29: ; 1d102 (7:5102)
OaksLabText2: ; 1d102 (7:5102) OaksLabText2: ; 1d102 (7:5102)
db $8 db $8
ld a, SQUIRTLE ld a, STARTER2
ld [$cd3d], a ld [$cd3d], a
ld a, $3 ld a, $3
ld [$cd3e], a ld [$cd3e], a
ld a, CHARMANDER ld a, STARTER1
ld b, $2 ld b, $2
jr OaksLabScript_1d133 ; 0x1d111 $20 jr OaksLabScript_1d133 ; 0x1d111 $20
OaksLabText30: ; 1d113 (7:5113) OaksLabText30: ; 1d113 (7:5113)
OaksLabText3: ; 1d113 (7:5113) OaksLabText3: ; 1d113 (7:5113)
db $8 db $8
ld a, BULBASAUR ld a, STARTER3
ld [$cd3d], a ld [$cd3d], a
ld a, $4 ld a, $4
ld [$cd3e], a ld [$cd3e], a
ld a, SQUIRTLE ld a, STARTER2
ld b, $3 ld b, $3
jr OaksLabScript_1d133 ; 0x1d122 $f jr OaksLabScript_1d133 ; 0x1d122 $f
OaksLabText31: ; 1d124 (7:5124) OaksLabText31: ; 1d124 (7:5124)
OaksLabText4: ; 1d124 (7:5124) OaksLabText4: ; 1d124 (7:5124)
db $8 db $8
ld a, CHARMANDER ld a, STARTER1
ld [$cd3d], a ld [$cd3d], a
ld a, $2 ld a, $2
ld [$cd3e], a ld [$cd3e], a
ld a, BULBASAUR ld a, STARTER3
ld b, $4 ld b, $4
OaksLabScript_1d133: ; 1d133 (7:5133) OaksLabScript_1d133: ; 1d133 (7:5133)

4
scripts/pokemontower2.asm
View file

@ -137,12 +137,12 @@ PokemonTower2Text1: ; 605df (18:45df)
; select which team to use during the encounter ; select which team to use during the encounter
ld a, [W_RIVALSTARTER] ld a, [W_RIVALSTARTER]
cp SQUIRTLE cp STARTER2
jr nz, .NotSquirtle ; 0x6060f jr nz, .NotSquirtle ; 0x6060f
ld a, $4 ld a, $4
jr .done jr .done
.NotSquirtle ; 0x60615 .NotSquirtle ; 0x60615
cp BULBASAUR cp STARTER3
jr nz, .Charmander ; 0x60617 jr nz, .Charmander ; 0x60617
ld a, $5 ld a, $5
jr .done jr .done

12
scripts/route22.asm
View file

@ -140,9 +140,9 @@ Route22Script1: ; 50f62 (14:4f62)
StarterMons_50faf: ; 50faf (14:4faf) StarterMons_50faf: ; 50faf (14:4faf)
; starter the rival picked, rival trainer number ; starter the rival picked, rival trainer number
db SQUIRTLE,$04 db STARTER2,$04
db BULBASAUR,$05 db STARTER3,$05
db CHARMANDER,$06 db STARTER1,$06
Route22Script2: ; 50fb5 (14:4fb5) Route22Script2: ; 50fb5 (14:4fb5)
ld a, [$d057] ld a, [$d057]
@ -283,9 +283,9 @@ Route22Script4: ; 51087 (14:5087)
ret ret
StarterMons_510d9: ; 510d9 (14:50d9) StarterMons_510d9: ; 510d9 (14:50d9)
db SQUIRTLE,$0a db STARTER2,$0a
db BULBASAUR,$0b db STARTER3,$0b
db CHARMANDER,$0c db STARTER1,$0c
Route22Script5: ; 510df (14:50df) Route22Script5: ; 510df (14:50df)
ld a, [W_ISINBATTLE] ; $d057 ld a, [W_ISINBATTLE] ; $d057

4
scripts/silphco7.asm
View file

@ -184,12 +184,12 @@ SilphCo7Script3: ; 51c82 (14:5c82)
ld a, SONY2 + $c8 ld a, SONY2 + $c8
ld [W_CUROPPONENT], a ; $d059 ld [W_CUROPPONENT], a ; $d059
ld a, [W_RIVALSTARTER] ; $d715 ld a, [W_RIVALSTARTER] ; $d715
cp SQUIRTLE cp STARTER2
jr nz, .asm_51cb6 jr nz, .asm_51cb6
ld a, $7 ld a, $7
jr .asm_51cc0 jr .asm_51cc0
.asm_51cb6 .asm_51cb6
cp BULBASAUR cp STARTER3
jr nz, .asm_51cbe jr nz, .asm_51cbe
ld a, $8 ld a, $8
jr .asm_51cc0 jr .asm_51cc0

4
scripts/ssanne2.asm
View file

@ -98,12 +98,12 @@ SSAnne2Script1: ; 61430 (18:5430)
; select which team to use during the encounter ; select which team to use during the encounter
ld a, [W_RIVALSTARTER] ld a, [W_RIVALSTARTER]
cp SQUIRTLE cp STARTER2
jr nz, .NotSquirtle ; 0x61451 $4 jr nz, .NotSquirtle ; 0x61451 $4
ld a, $1 ld a, $1
jr .done jr .done
.NotSquirtle .NotSquirtle
cp BULBASAUR cp STARTER3
jr nz, .Charmander ; 0x61459 $4 jr nz, .Charmander ; 0x61459 $4
ld a, $2 ld a, $2
jr .done jr .done