thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

SONY -> RIVAL

Browse source
This commit is contained in:
Rangi 2020-07-17 13:27:27 -04:00
parent 2454296d32
commit 30ecbf6ea3
19 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/maps/objects/OaksLab.asm
View file

@ -8,7 +8,7 @@ OaksLab_Object:
db 0 ; signs
db 11 ; objects
object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_SONY1, 1
object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_RIVAL1, 1
object SPRITE_POKE_BALL, 6, 3, STAY, NONE, 2 ; person
object SPRITE_POKE_BALL, 7, 3, STAY, NONE, 3 ; person
object SPRITE_POKE_BALL, 8, 3, STAY, NONE, 4 ; person

2
data/maps/objects/SSAnne2F.asm
View file

@ -16,7 +16,7 @@ SSAnne2F_Object:
db 2 ; objects
object SPRITE_WAITER, 3, 7, WALK, 1, 1 ; person
object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_SONY1, 1
object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_RIVAL1, 1
; warp-to
warp_to 9, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS

6
data/trainers/move_choices.asm
View file

@ -32,7 +32,7 @@ TrainerClassMoveChoiceModifications:
move_choices 1 ; TAMER
move_choices 1 ; BIRD_KEEPER
move_choices 1 ; BLACKBELT
move_choices 1 ; SONY1
move_choices 1 ; RIVAL1
move_choices 1, 3 ; PROF_OAK
move_choices 1, 2 ; CHIEF
move_choices 1, 2 ; SCIENTIST
@ -49,8 +49,8 @@ TrainerClassMoveChoiceModifications:
move_choices 1, 3 ; BLAINE
move_choices 1, 3 ; SABRINA
move_choices 1, 2 ; GENTLEMAN
move_choices 1, 3 ; SONY2
move_choices 1, 3 ; SONY3
move_choices 1, 3 ; RIVAL2
move_choices 1, 3 ; RIVAL3
move_choices 1, 2, 3 ; LORELEI
move_choices 1 ; CHANNELER
move_choices 1 ; AGATHA