thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-10-17 04:26:28 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into mistress

Browse source
This commit is contained in:
Thorn Avery 2023-12-26 11:47:55 +11:00
parent 85bbe08815 5ea0fc5de9
commit f1bee1c621
47 changed files with 544 additions and 452 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -97,7 +97,7 @@ New Areas
- This is a reference to a Magikarp event from July 1998, and includes the lore from it and other areas of Pokemon's early worldbuilding.
- There are features new infinitely re-battleable trainers for grinding money.
- There's a Move Deleter and Move Relearner, allowing for HM deletion and getting back lost moves.
- Citrine City is a new island city that can be accessed in the postgame through a new port in Vermillion.
- Citrine City is a new island city that can be accessed in the postgame through a new port in Vermillion. Name derived from the Helix Chamber PokeThon ROM Hack.
- There's a house with a Move Tutor that can teach Tradeback moves without the need for GSC's Time Capsule!
- It features a Team Rocket house where they will sell you TMs and Evolution Items, as well as provide a Hyper Training feature to get Max DVs!
- The Battle Tent from the TwitchPlaysPokemon Anniversary hack makes a return, featuring new trainers and Pokemon!
@ -130,6 +130,7 @@ Improved Areas
- In effect, you get two stages: Pewter/Cerulean/Vermilion, then Celadon/Fuchsia/Saffron/Cinnabar. Some limits were placed due to the power spike introduced by Celadon City.
- Giovanni now uses his unused theme song from Yellow, plus has his LGPE monologue in the Rocket Hideout.
- Jessie and James have been backported from Yellow, appearing in Mt. Moon, Rocket Hideout, Pokemon Tower, and Silph Co. Additionally, they have a closure role in the post-game.
- Viridian City features a Pre-Gym, building on what was seen in the Helix Chamber PokeThon ROM Hack, featuring Yujirou. In the KEP team's opinion, this was the best interpretation of the prototype materials!
- Diglett's Cave has a more detailed map with Onix, Wiglett, and Wugtrio also appearing! It also has its prototype music!
- The Day Care now contains a PC, is generally more detailed, and houses Melanie from Yellow. If you pick Pikachu or Eevee and beat Misty, Melanie will give you a Bulbasaur.
- Route 24 now features two things;

2
audio/play_battle_music.asm
View file

@ -44,6 +44,8 @@ PlayBattleMusic::
jr c, .wildBattle
cp OPP_YUJIROU
jr z, .Elite4Battle
cp OPP_KOICHI
jr z, .Elite4Battle
cp OPP_LORELEI ; elite four now play the gym leader battle theme
jr z, .Elite4Battle
cp OPP_BRUNO

3
constants/event_constants.asm
View file

@ -817,6 +817,7 @@ DEF INDIGO_PLATEAU_EVENTS_END EQU const_value - 1
const EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1
const_skip 4
const EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH
const EVENT_BEAT_CHIEF ; moved out of the below union to prevent bugs
; Silph Gauntlet events
const_next $930
@ -872,7 +873,7 @@ DEF SILPH_GAUNTLET_EVENTS_START EQU const_value
const EVENT_BEAT_GAUNTLET_SABRINA
const EVENT_BEAT_GAUNTLET_BLAINE
const_skip
const EVENT_BEAT_CHIEF
const_skip
const_skip 5
const_skip
DEF SILPH_GAUNTLET_EVENTS_END EQU const_value - 1

2
constants/trainer_constants.asm
View file

@ -64,7 +64,7 @@ ENDM
trainer_const YUJIROU ; $0D, was unused juggler, also not 0D but I can't be bothered to change everything
trainer_const STUDENT
trainer_const FIREFIGHTER
trainer_const JUNIOR
trainer_const KOICHI
trainer_const JACK
trainer_const JESSIE_JAMES
DEF NUM_TRAINERS EQU const_value - 1

531
crysaudio/music/RBY/areazero.asm
View file

@ -80,13 +80,8 @@ Music_AreaZero_Ch1:
note C#, 2
note D#, 2
note G#, 2
volume_envelope 6, 8
note_type 10, 6, 8
note F_, 2
note_type 1, 6, 8
rest 4
note_type 12, 6, 8
volume_envelope 9, 8
note F_, 2
note F#, 2
note C#, 2
note D#, 2
@ -1082,7 +1077,6 @@ Music_AreaZero_Ch1:
note C#, 2
volume_envelope 2, 8
note D#, 2
volume_envelope 1, 8
note G#, 2
octave 8
sound_loop 0, .mainLoop
@ -1094,9 +1088,9 @@ Music_AreaZero_Ch2:
volume_envelope 10, 8
note_type 12, 10, 8
duty_cycle 1
rest 2
volume_envelope 1, 8
octave 4
volume_envelope 1, 8
note G#, 2
note F_, 2
note F#, 2
note C#, 2
@ -1630,7 +1624,6 @@ Music_AreaZero_Ch2:
Music_AreaZero_Ch3:
note_type 12, 1, 0
.mainLoop:
vibrato 0, 2, 4
volume_envelope 3, 1
octave 2
note_type 12, 3, 1
@ -1682,6 +1675,7 @@ Music_AreaZero_Ch3:
rest 2
note_type 12, 2, 2
volume_envelope 3, 1
vibrato 0, 3, 5
note D#, 2
note_type 12, 2, 2
volume_envelope 3, 1
@ -3344,51 +3338,64 @@ Music_AreaZero_Ch4:
rest 16
rest 16
rest 16
octave 7
rest 16
rest 16
rest 16
rest 16
rest 16
rest 16
octave 6
drum_note 12, 1
rest 7
drum_note 12, 1
rest 7
drum_note 12, 1
rest 3
drum_note 12, 1
rest 3
drum_note 12, 1
rest 3
drum_note 12, 1
rest 1
drum_note 12, 1
drum_note 12, 1
drum_speed 6
octave 5
drum_note 12, 1
drum_note 12, 1
octave 8
drum_speed 12
octave 6
drum_note 4, 1
drum_note 4, 1
rest 1
drum_note 4, 1
rest 3
drum_speed 6
octave 7
octave 5
drum_note 12, 1
drum_note 12, 1
octave 8
drum_speed 12
octave 6
drum_note 4, 1
drum_note 4, 1
rest 1
drum_note 4, 1
rest 3
drum_speed 6
octave 7
octave 5
drum_note 12, 1
drum_note 12, 1
octave 8
drum_speed 12
octave 6
drum_note 4, 1
drum_note 4, 1
rest 1
drum_note 4, 1
rest 3
drum_speed 6
octave 7
octave 5
drum_note 12, 1
drum_note 12, 1
octave 8
drum_speed 12
octave 6
drum_note 4, 1
drum_note 4, 1
rest 1
@ -3399,45 +3406,45 @@ Music_AreaZero_Ch4:
drum_note 4, 1
drum_speed 12
drum_note 4, 1
octave 7
drum_speed 6
octave 5
drum_note 12, 1
drum_note 12, 1
drum_speed 12
octave 8
octave 6
drum_note 4, 1
drum_note 4, 1
rest 1
drum_note 4, 1
octave 7
rest 3
drum_speed 6
octave 5
drum_note 12, 1
drum_note 12, 1
drum_speed 12
octave 8
octave 6
drum_note 4, 1
drum_note 4, 1
rest 1
drum_note 4, 1
octave 7
rest 3
drum_speed 6
octave 5
drum_note 12, 1
drum_note 12, 1
drum_speed 12
octave 8
octave 6
drum_note 4, 1
drum_note 4, 1
rest 1
drum_note 4, 1
octave 7
rest 3
drum_speed 6
octave 5
drum_note 12, 1
drum_note 12, 1
drum_speed 12
octave 8
octave 6
drum_note 4, 1
drum_note 4, 1
rest 1
@ -3448,30 +3455,30 @@ Music_AreaZero_Ch4:
drum_note 4, 1
drum_speed 12
drum_note 4, 1
octave 7
octave 5
drum_note 12, 1
rest 3
octave 8
octave 6
drum_note 4, 1
rest 3
octave 7
octave 5
drum_note 11, 1
rest 3
octave 8
octave 6
drum_note 3, 1
rest 2
drum_note 3, 1
octave 7
octave 5
drum_note 12, 1
rest 3
octave 8
octave 6
drum_note 3, 1
rest 3
octave 7
octave 5
drum_note 11, 1
rest 3
octave 8
drum_speed 6
octave 6
drum_note 3, 1
drum_note 3, 1
drum_speed 12
@ -3482,40 +3489,41 @@ Music_AreaZero_Ch4:
drum_note 3, 1
drum_note 3, 1
drum_speed 12
octave 7
drum_note 12, 1
octave 8
rest 3
drum_note 3, 1
rest 3
octave 7
drum_note 11, 1
rest 3
octave 8
drum_note 3, 1
rest 3
octave 7
octave 5
drum_note 12, 1
rest 3
octave 8
octave 6
drum_note 3, 1
rest 3
octave 7
octave 5
drum_note 11, 1
rest 3
octave 8
octave 6
drum_note 3, 1
rest 3
octave 7
octave 5
drum_note 12, 1
rest 3
octave 6
drum_note 3, 1
rest 3
octave 5
drum_note 11, 1
rest 3
octave 6
drum_note 3, 1
rest 2
drum_note 3, 1
drum_speed 6
octave 5
drum_note 11, 1
drum_note 11, 1
drum_speed 12
rest 1
octave 8
octave 6
drum_note 3, 1
rest 1
octave 7
octave 5
drum_note 12, 1
rest 2
drum_speed 6
@ -3524,42 +3532,45 @@ Music_AreaZero_Ch4:
drum_note 11, 1
drum_speed 12
rest 1
octave 8
octave 6
drum_note 3, 1
rest 1
octave 7
octave 5
drum_note 12, 1
rest 1
octave 8
drum_note 5, 1
octave 6
drum_note 6, 1
drum_speed 6
rest 2
drum_speed 12
octave 7
octave 5
drum_note 11, 1
rest 3
octave 8
drum_note 11, 1
drum_speed 12
rest 1
octave 6
drum_note 3, 1
rest 1
drum_note 6, 1
rest 1
drum_note 1, 1
drum_speed 6
rest 2
octave 7
octave 5
drum_note 12, 1
drum_note 12, 1
drum_speed 12
octave 8
octave 6
drum_note 4, 1
drum_note 4, 1
rest 3
drum_note 4, 1
drum_speed 6
rest 2
octave 7
octave 5
drum_note 12, 1
drum_note 12, 1
octave 8
drum_speed 12
octave 6
drum_note 4, 1
drum_note 4, 1
rest 3
@ -3567,11 +3578,11 @@ Music_AreaZero_Ch4:
drum_speed 6
drum_note 3, 1
drum_note 3, 1
octave 7
octave 5
drum_note 12, 1
drum_note 12, 1
drum_speed 12
octave 8
octave 6
drum_note 4, 1
drum_note 4, 1
rest 1
@ -3582,11 +3593,11 @@ Music_AreaZero_Ch4:
drum_note 4, 1
drum_note 3, 1
drum_note 4, 1
octave 7
octave 5
drum_note 12, 1
drum_note 12, 1
drum_speed 12
octave 8
octave 6
drum_note 4, 1
drum_note 4, 1
rest 3
@ -3594,60 +3605,75 @@ Music_AreaZero_Ch4:
drum_speed 6
drum_note 3, 1
drum_note 3, 1
octave 7
octave 5
drum_note 12, 1
drum_note 12, 1
drum_speed 12
octave 8
octave 6
drum_note 4, 1
drum_note 4, 1
drum_note 3, 1
octave 5
drum_note 12, 1
octave 6
drum_note 4, 1
drum_speed 6
drum_note 3, 1
drum_note 3, 1
drum_note 3, 1
drum_note 3, 1
drum_speed 12
drum_note 8, 1
drum_speed 6
rest 2
drum_speed 12
rest 2
drum_note 8, 1
rest 3
drum_note 8, 1
drum_speed 6
rest 2
drum_speed 12
rest 2
drum_note 8, 1
rest 1
drum_note 4, 1
drum_note 4, 1
drum_speed 6
drum_note 4, 1
drum_note 4, 1
drum_note 4, 1
drum_note 4, 1
drum_speed 12
drum_note 8, 1
drum_speed 6
rest 2
drum_speed 12
rest 1
drum_note 8, 1
rest 3
drum_note 8, 1
rest 3
drum_note 8, 1
rest 1
drum_note 8, 1
rest 1
drum_note 8, 1
drum_note 8, 1
drum_note 8, 1
drum_note 8, 1
drum_note 8, 1
rest 3
drum_note 8, 1
rest 3
drum_note 8, 1
rest 3
drum_note 8, 1
rest 1
drum_note 8, 1
rest 1
drum_note 8, 1
rest 3
drum_note 8, 1
rest 2
drum_note 12, 1
drum_note 8, 1
rest 3
drum_note 12, 1
drum_note 8, 1
drum_speed 6
rest 2
drum_speed 12
rest 2
drum_note 12, 1
drum_note 8, 1
rest 3
drum_note 12, 1
drum_note 8, 1
rest 3
drum_note 8, 1
rest 3
drum_note 8, 1
rest 3
drum_note 8, 1
rest 3
drum_note 8, 1
rest 3
drum_note 8, 1
rest 3
drum_note 8, 1
rest 3
drum_note 8, 1
rest 3
drum_note 8, 1
rest 3
drum_note 8, 1
rest 3
drum_note 8, 1
rest 3
drum_note 8, 1
rest 3
drum_note 12, 1
drum_note 8, 1
rest 3
drum_note 8, 1
@ -3748,37 +3774,37 @@ Music_AreaZero_Ch4:
drum_speed 6
drum_note 4, 1
drum_note 4, 1
octave 7
drum_speed 12
octave 5
drum_note 12, 1
rest 1
octave 8
octave 6
drum_note 4, 1
drum_speed 6
drum_note 4, 1
drum_note 4, 1
octave 7
drum_speed 12
octave 5
drum_note 12, 1
rest 1
octave 8
octave 6
drum_note 4, 1
drum_speed 6
drum_note 4, 1
drum_note 4, 1
octave 7
drum_speed 12
octave 5
drum_note 12, 1
rest 1
octave 8
octave 6
drum_note 4, 1
drum_speed 6
drum_note 4, 1
drum_note 4, 1
octave 7
drum_speed 12
octave 5
drum_note 12, 1
octave 8
octave 6
drum_note 6, 1
drum_speed 6
drum_note 4, 1
@ -3786,303 +3812,303 @@ Music_AreaZero_Ch4:
drum_note 4, 1
drum_note 4, 1
drum_speed 12
octave 7
octave 5
drum_note 12, 1
rest 1
octave 8
octave 6
drum_note 4, 1
drum_note 4, 1
octave 7
octave 5
drum_note 12, 1
rest 1
octave 8
octave 6
drum_note 4, 1
drum_note 4, 1
octave 7
octave 5
drum_note 12, 1
rest 1
octave 8
octave 6
drum_note 4, 1
drum_note 4, 1
octave 7
octave 5
drum_note 12, 1
octave 8
octave 6
drum_note 6, 1
drum_note 4, 1
drum_note 4, 1
octave 7
octave 5
drum_note 12, 1
rest 1
octave 8
octave 6
drum_note 4, 1
drum_note 4, 1
octave 7
octave 5
drum_note 12, 1
rest 1
octave 8
octave 6
drum_note 4, 1
drum_note 4, 1
octave 7
octave 5
drum_note 12, 1
octave 8
octave 6
drum_note 6, 1
drum_note 4, 1
drum_note 4, 1
octave 7
octave 5
drum_note 12, 1
rest 1
octave 8
octave 6
drum_note 4, 1
drum_note 4, 1
octave 7
octave 5
drum_note 12, 1
rest 1
octave 8
octave 6
drum_note 4, 1
drum_note 4, 1
octave 7
octave 5
drum_note 12, 1
rest 1
octave 8
octave 6
drum_note 4, 1
drum_note 4, 1
octave 7
octave 5
drum_note 12, 1
octave 8
octave 6
drum_note 6, 1
drum_note 4, 1
drum_note 4, 1
octave 7
octave 5
drum_note 12, 1
rest 1
octave 8
octave 6
drum_note 4, 1
drum_note 4, 1
octave 7
octave 5
drum_note 12, 1
rest 1
octave 8
octave 6
drum_note 4, 1
drum_note 4, 1
octave 7
octave 5
drum_note 12, 1
rest 1
octave 8
octave 6
drum_note 4, 1
drum_note 4, 1
octave 7
octave 5
drum_note 12, 1
octave 8
octave 6
drum_note 6, 1
drum_note 4, 1
drum_note 4, 1
octave 7
octave 5
drum_note 12, 1
octave 8
octave 6
drum_note 6, 1
drum_note 4, 1
drum_note 4, 1
octave 7
octave 5
drum_note 12, 1
octave 8
rest 1
octave 6
drum_note 10, 1
rest 1
octave 7
octave 5
drum_note 12, 1
octave 8
rest 1
octave 6
drum_note 10, 1
rest 1
octave 7
octave 5
drum_note 12, 1
octave 8
rest 1
octave 6
drum_note 10, 1
rest 1
octave 7
octave 5
drum_note 12, 1
octave 8
rest 1
octave 6
drum_note 10, 1
drum_note 10, 1
octave 7
octave 5
drum_note 12, 1
octave 8
rest 1
octave 6
drum_note 10, 1
rest 1
octave 7
octave 5
drum_note 12, 1
octave 8
rest 1
octave 6
drum_note 10, 1
rest 1
octave 7
octave 5
drum_note 12, 1
octave 8
rest 1
octave 6
drum_note 10, 1
octave 7
octave 5
drum_note 12, 1
drum_note 12, 1
octave 8
octave 6
drum_note 10, 1
drum_note 10, 1
drum_speed 6
drum_note 10, 1
drum_note 10, 1
drum_speed 12
octave 7
octave 5
drum_note 12, 1
octave 8
rest 1
octave 6
drum_note 10, 1
rest 1
octave 7
octave 5
drum_note 12, 1
octave 8
rest 1
octave 6
drum_note 10, 1
rest 1
octave 7
octave 5
drum_note 12, 1
octave 8
rest 1
octave 6
drum_note 10, 1
rest 1
octave 7
octave 5
drum_note 12, 1
octave 8
rest 1
octave 6
drum_note 10, 1
drum_note 10, 1
octave 7
octave 5
drum_note 12, 1
octave 8
rest 1
octave 6
drum_note 10, 1
rest 1
octave 7
octave 5
drum_note 12, 1
octave 8
rest 1
octave 6
drum_note 10, 1
rest 1
octave 7
octave 5
drum_note 12, 1
octave 8
rest 1
octave 6
drum_note 10, 1
octave 7
octave 5
drum_note 12, 1
drum_note 12, 1
rest 1
drum_note 12, 1
drum_speed 6
drum_note 12, 1
drum_note 12, 1
drum_speed 12
drum_note 12, 1
octave 8
rest 1
drum_note 10, 1
rest 1
octave 7
drum_note 12, 1
octave 8
rest 1
drum_note 10, 1
rest 1
octave 7
drum_note 12, 1
octave 8
rest 1
drum_note 10, 1
rest 1
octave 7
drum_note 12, 1
octave 8
rest 1
drum_note 10, 1
drum_note 10, 1
octave 7
drum_note 12, 1
octave 8
rest 1
drum_note 10, 1
rest 1
octave 7
drum_note 12, 1
octave 8
rest 1
drum_note 10, 1
rest 1
octave 7
drum_note 12, 1
octave 8
rest 1
drum_note 10, 1
octave 7
drum_note 12, 1
drum_note 12, 1
octave 8
rest 1
octave 6
drum_note 10, 1
drum_speed 6
drum_note 10, 1
drum_note 10, 1
drum_speed 12
octave 7
drum_note 12, 1
octave 8
drum_note 10, 1
rest 1
drum_note 10, 1
rest 1
octave 7
octave 5
drum_note 12, 1
octave 8
rest 1
octave 6
drum_note 10, 1
rest 1
octave 7
octave 5
drum_note 12, 1
octave 8
rest 1
octave 6
drum_note 10, 1
rest 1
octave 7
octave 5
drum_note 12, 1
octave 8
rest 1
octave 6
drum_note 10, 1
drum_note 10, 1
octave 7
octave 5
drum_note 12, 1
octave 8
rest 1
octave 6
drum_note 10, 1
rest 1
octave 7
octave 5
drum_note 12, 1
octave 8
rest 1
octave 6
drum_note 10, 1
rest 1
octave 7
octave 5
drum_note 12, 1
octave 8
rest 1
octave 6
drum_note 10, 1
octave 7
octave 5
drum_note 12, 1
drum_note 12, 1
rest 1
drum_note 12, 1
octave 6
drum_note 10, 1
drum_speed 6
drum_note 10, 1
drum_note 10, 1
drum_speed 12
octave 5
drum_note 12, 1
rest 1
octave 6
drum_note 10, 1
rest 1
octave 5
drum_note 12, 1
rest 1
octave 6
drum_note 10, 1
rest 1
octave 5
drum_note 12, 1
rest 1
octave 6
drum_note 10, 1
rest 1
octave 5
drum_note 12, 1
rest 1
octave 6
drum_note 10, 1
drum_note 10, 1
octave 5
drum_note 12, 1
rest 1
octave 6
drum_note 10, 1
rest 1
octave 5
drum_note 12, 1
rest 1
octave 6
drum_note 10, 1
rest 1
octave 5
drum_note 12, 1
rest 1
octave 6
drum_note 10, 1
octave 5
drum_note 12, 1
drum_note 12, 1
octave 8
rest 1
octave 6
drum_note 10, 1
drum_speed 6
drum_note 10, 1
drum_note 10, 1
drum_speed 12
drum_note 1, 1
rest 1
@ -4370,5 +4396,6 @@ Music_AreaZero_Ch4:
drum_note 1, 1
drum_speed 12
drum_note 1, 1
octave 8
rest 15
sound_loop 0, .mainLoop

4
data/events/hidden_objects.asm
View file

@ -575,8 +575,8 @@ CeladonMansion5HiddenObjects:
FightingDojoHiddenObjects:
hidden_object 3, 9, SPRITE_FACING_UP, PrintFightingDojoText
hidden_object 6, 9, SPRITE_FACING_UP, PrintFightingDojoText
hidden_object 4, 0, SPRITE_FACING_UP, PrintFightingDojoText2
hidden_object 5, 0, SPRITE_FACING_UP, PrintFightingDojoText3
hidden_object 1, 0, SPRITE_FACING_UP, PrintFightingDojoText2
hidden_object 2, 0, SPRITE_FACING_UP, PrintFightingDojoText3
db -1 ; end
IndigoPlateauLobbyHiddenObjects:

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

@ -1,2 +1,2 @@
map_header OaksLab, OAKS_LAB, GYM, 0
map_header OaksLab, OAKS_LAB, FOSSILLAB, 0
end_map_header

10
data/maps/objects/FightingDojo.asm
View file

@ -8,11 +8,11 @@ FightingDojo_Object:
def_bg_events
def_object_events
object_event 4, 1, SPRITE_HIKER, STAY, DOWN, 1, OPP_BLACKBELT, 1 ; koichi
object_event 3, 3, SPRITE_HIKER, STAY, RIGHT, 2, OPP_BLACKBELT, 11
object_event 3, 5, SPRITE_HIKER, STAY, RIGHT, 3, OPP_BLACKBELT, 12
object_event 6, 4, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, 13
object_event 6, 6, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 14
object_event 4, 1, SPRITE_HIKER, STAY, DOWN, 1, OPP_KOICHI, 1
object_event 3, 3, SPRITE_HIKER, STAY, RIGHT, 2, OPP_BLACKBELT, 3
object_event 3, 5, SPRITE_HIKER, STAY, RIGHT, 3, OPP_BLACKBELT, 4
object_event 6, 4, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, 2
object_event 6, 6, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 1
object_event 5, 1, SPRITE_POKE_BALL, STAY, NONE, 6 ; Hitmonlee
object_event 7, 1, SPRITE_POKE_BALL, STAY, NONE, 7 ; Hitmonchan
object_event 6, 1, SPRITE_POKE_BALL, STAY, NONE, 8 ; Hitmontop

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

@ -1,11 +1,13 @@
OaksLab_Object:
db $3 ; border block
db $17 ; border block
def_warp_events
warp_event 6, 11, LAST_MAP, 3
warp_event 7, 11, LAST_MAP, 3
def_bg_events
bg_event 10, 6, 30 ; PC because it keeps breaking
bg_event 11, 6, 30 ; PC because it keeps breaking
def_object_events
object_event 6, 4, SPRITE_BLUE, STAY, NONE, 1, OPP_RIVAL1, 1
@ -19,7 +21,7 @@ OaksLab_Object:
;object_event 2, 11, SPRITE_GIRL, WALK, UP_DOWN, 9 ; person
;object_event 4, 11, SPRITE_SCIENTIST, STAY, NONE, 10 ; person
;object_event 11, 11, SPRITE_SCIENTIST, STAY, NONE, 11 ; person
object_event 4, 3, SPRITE_POKE_BALL, STAY, NONE, 28 ; person, Pikachu
object_event 5, 3, SPRITE_POKE_BALL, STAY, NONE, 29 ; person, Eevee
object_event 8, 6, SPRITE_POKE_BALL, STAY, NONE, 28 ; person, Pikachu
object_event 9, 6, SPRITE_POKE_BALL, STAY, NONE, 29 ; person, Eevee
def_warps_to OAKS_LAB

3
data/maps/objects/RedsHouse2F.asm
View file

@ -4,11 +4,12 @@ RedsHouse2F_Object:
def_warp_events
warp_event 7, 1, REDS_HOUSE_1F, 3
;warp_event 5, 1, SILPH_GAUNTLET_7F, 1 ; - Test Chief
warp_event 5, 1, SILPH_CO_1F, 1 ; - Go through Gauntlet
;warp_event 5, 1, SILPH_CO_11F, 2 ; - Test J&J, Omega, & Giovanni. To test the Omega refight, change to SHOW in hide/show data, and set warp ID to 1.
;warp_event 5, 1, ROCKET_HIDEOUT_B4F, 2 ; - Test Giovanni 1
;warp_event 5, 1, MT_MOON_SQUARE, 1 ; - Test Shop, NPCs, and Crater
;warp_event 5, 1, CELESTE_HILL, 1 ; - Test GMolt
warp_event 5, 1, HALL_OF_FAME, 1 ; Test post-game setup
;warp_event 5, 1, HALL_OF_FAME, 1 ; Test post-game setup
;warp_event 5, 1, GARNET_CAVERN_B1F, 1 ; Test GCuno
;warp_event 5, 1, FARAWAY_ISLAND_INSIDE, 1 ; Test Mew
;warp_event 5, 1, GIOVANNIS_ROOM, 1 ; Test spinner tiles

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

@ -13,6 +13,6 @@ SilphGauntlet2F_Object:
object_event 24, 13, SPRITE_SUPER_NERD, STAY, RIGHT, 3, OPP_SUPER_NERD, 8
object_event 23, 19, SPRITE_SUPER_NERD, STAY, UP, 4, OPP_POKEMANIAC, 8
object_event 11, 16, SPRITE_BEAUTY, STAY, DOWN, 5, OPP_BEAUTY, 11
object_event 2, 16, SPRITE_HIKER, STAY, RIGHT, 6, OPP_BLACKBELT, 19
object_event 2, 16, SPRITE_HIKER, STAY, RIGHT, 6, OPP_BLACKBELT, 9
def_warps_to SILPH_GAUNTLET_2F

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

@ -13,7 +13,7 @@ VictoryRoad2F_Object:
def_bg_events
def_object_events
object_event 12, 9, SPRITE_HIKER, STAY, LEFT, 1, OPP_BLACKBELT, 16
object_event 12, 9, SPRITE_HIKER, STAY, LEFT, 1, OPP_BLACKBELT, 8
object_event 21, 13, SPRITE_SUPER_NERD, STAY, LEFT, 2, OPP_JUGGLER, 2
object_event 19, 8, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_TAMER, 5
object_event 4, 2, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_POKEMANIAC, 6

6
data/maps/objects/ViridianGym.asm
View file

@ -13,11 +13,11 @@ ViridianGym_Object:
def_object_events
object_event 2, 2, SPRITE_GIOVANNI, STAY, DOWN, 1, OPP_GIOVANNI, 3
object_event 12, 7, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9
object_event 11, 11, SPRITE_HIKER, STAY, UP, 3, OPP_BLACKBELT, 13
object_event 11, 11, SPRITE_HIKER, STAY, UP, 3, OPP_BLACKBELT, 5
object_event 10, 7, SPRITE_ROCKER, STAY, DOWN, 4, OPP_TAMER, 3
object_event 7, 10, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 14
object_event 7, 10, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 6
object_event 13, 5, SPRITE_COOLTRAINER_M, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10
object_event 9, 1, SPRITE_HIKER, STAY, DOWN, 7, OPP_BLACKBELT, 15
object_event 9, 1, SPRITE_HIKER, STAY, DOWN, 7, OPP_BLACKBELT, 7
object_event 2, 16, SPRITE_ROCKER, STAY, RIGHT, 8, OPP_TAMER, 4
object_event 4, 8, SPRITE_COOLTRAINER_M, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1
object_event 16, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 10 ; person

48
data/pokemon/evos_moves.asm
View file

@ -672,6 +672,7 @@ NidoreignEvosMoves:
; Evolutions
db 0
; Learnset
db 23, SPIKE_CANNON
db 36, ROCK_SLIDE
db 43, BODY_SLAM
db 50, THRASH
@ -768,10 +769,14 @@ GravelerEvosMoves:
db 11, DEFENSE_CURL
db 16, ROCK_THROW
db 21, SELFDESTRUCT
db 29, HARDEN
db 36, EARTHQUAKE
db 43, EXPLOSION
db 50, ROCK_SLIDE
db 25, MEGA_PUNCH
db 30, HARDEN
db 35, EARTHQUAKE
db 40, BODY_SLAM
db 45, ROCK_SLIDE
db 50, EXPLOSION
db 55, DOUBLE_EDGE
db 60, FISSURE
db 0
ChanseyEvosMoves:
@ -894,10 +899,14 @@ GolemEvosMoves:
db 11, DEFENSE_CURL
db 16, ROCK_THROW
db 21, SELFDESTRUCT
db 29, HARDEN
db 36, EARTHQUAKE
db 43, EXPLOSION
db 50, ROCK_SLIDE
db 25, MEGA_PUNCH
db 30, HARDEN
db 35, EARTHQUAKE
db 40, BODY_SLAM
db 45, ROCK_SLIDE
db 50, EXPLOSION
db 55, DOUBLE_EDGE
db 60, FISSURE
db 0
BalumbaEvosMoves:
@ -2390,7 +2399,6 @@ NidorinaEvosMoves:
db 55, TAKE_DOWN ; Prototype
db 0
; Needs Body Slam, Mega Punch, Double-Edge, and Fissure distributed
GeodudeEvosMoves:
; Evolutions
db EV_LEVEL, 25, GRAVELER
@ -2399,10 +2407,14 @@ GeodudeEvosMoves:
db 11, DEFENSE_CURL
db 16, ROCK_THROW
db 21, SELFDESTRUCT
db 26, HARDEN
db 31, EARTHQUAKE
db 36, EXPLOSION
db 25, MEGA_PUNCH
db 29, HARDEN
db 33, EARTHQUAKE
db 37, BODY_SLAM
db 41, ROCK_SLIDE
db 45, EXPLOSION
db 49, DOUBLE_EDGE
db 53, FISSURE
db 0
PorygonEvosMoves:
@ -3320,10 +3332,14 @@ GolemAEvosMoves:
db 11, DEFENSE_CURL
db 16, ROCK_THROW
db 21, SELFDESTRUCT
db 29, THUNDERPUNCH
db 36, DOUBLE_EDGE
db 43, EXPLOSION
db 50, ROCK_SLIDE
db 25, MEGA_PUNCH
db 30, THUNDERPUNCH
db 35, THUNDER_WAVE
db 40, BODY_SLAM
db 45, ROCK_SLIDE
db 50, EXPLOSION
db 55, DOUBLE_EDGE
db 60, THUNDER
db 0
RapidashGEvosMoves:

2
data/text_predef_pointers.asm
View file

@ -11,7 +11,7 @@ TextPredefs::
add_tx_pre PushStartText ; 05
add_tx_pre SaveOptionText ; 06
add_tx_pre StrengthsAndWeaknessesText ; 07
add_tx_pre OakLabEmailText ; 08
; add_tx_pre OakLabEmailText ; 08
add_tx_pre AerodactylFossilText ; 09
add_tx_pre Route15UpstairsBinocularsText ; 0A
add_tx_pre KabutopsFossilText ; 0B

4
data/tilesets/collision_tile_ids.asm
View file

@ -55,10 +55,12 @@ Lobby_Coll::
Mansion_Coll::
coll_tiles $01, $05, $11, $12, $14, $1a, $1c, $2c, $53
FossilLab_Coll:: ; It has the same tileset except the trees are the fossil machine, so...
Lab_Coll::
coll_tiles $0c, $26, $16, $1e, $34, $37
FossilLab_Coll:: ; Originally just the Lab collision, but now that Oak uses it, it's using separate collision. Added plenty just to be sure.
coll_tiles $0c, $26, $16, $1e, $34, $37, $17, $4C, $47, $58, $57, $59, $27, $4D
Club_Coll::
coll_tiles $0f, $1a, $1f, $26, $28, $29, $2c, $2d, $2e, $2f, $41

2
data/trainers/ai_pointers.asm
View file

@ -53,7 +53,7 @@ TrainerAIPointers:
dbw 3, GenericAI ; Yujirou
dbw 3, GenericAI ; Student
dbw 3, GenericAI ; Firefighter
dbw 3, GenericAI ; Junior
dbw 2, BlackbeltAI ; Koichi
dbw 2, BlackbeltAI ; Jack
dbw 2, GenericAI ; Jessie & James
assert_table_length NUM_TRAINERS

6
data/trainers/encounter_types.asm
View file

@ -3,6 +3,8 @@ FemaleTrainerList::
db OPP_JR_TRAINER_F
db OPP_BEAUTY
db OPP_COOLTRAINER_F
db OPP_MISTY
db OPP_ERIKA
db OPP_STUDENT
db -1 ; end
@ -14,5 +16,9 @@ EvilTrainerList::
db OPP_SCIENTIST
db OPP_GIOVANNI
db OPP_ROCKET
db OPP_KOGA
db OPP_SABRINA
db OPP_CHANNELER
db OPP_AGATHA
db OPP_JESSIE_JAMES
db -1 ; end

2
data/trainers/move_choices.asm
View file

@ -58,7 +58,7 @@ TrainerClassMoveChoiceModifications:
move_choices 1, 3, ; YUJIROU, was UNUSED_JUGGLER
move_choices 1, 3, ; STUDENT
move_choices 1, 3, ; FIREFIGHTER
move_choices 1, 3, ; JUNIOR
move_choices 1, 3, ; KOICHI
move_choices 1, 3, ; JACK
move_choices 1, 3, ; JESSIE_JAMES
assert_list_length NUM_TRAINERS

2
data/trainers/names.asm
View file

@ -49,7 +49,7 @@ TrainerNames::
li "YUJIROU"
li "STUDENT"
li "FIREFIGHTER"
li "JUNIOR"
li "KOICHI"
li "JACKY" ; Often called Jack, but the only source for that is the file names themselves, which are oft shortened or literal japanese translations; all other context is "Shinjuku Jacky".
li "JESSIE&JAMES"
assert_list_length NUM_TRAINERS

19
data/trainers/parties.asm
View file

@ -49,7 +49,7 @@ TrainerDataPointers:
dw YujirouData ; was unused juggler
dw StudentData
dw FirefighterData
dw JuniorData
dw KoichiData
dw JackData
dw JessieJamesData
assert_table_length NUM_TRAINERS
@ -542,6 +542,23 @@ BirdKeeperData:
db 29, PIDGEOTTO, FEAROW, 0
db 28, SPEAROW, DODUO, FEAROW, 0
; Fighting specialist, even the ones in Giovanni's gym!
; These have been changed to bulky, 'intimidating' Ground types to fit the theme
BlackbeltData:
; Fighting Dojo Trainers
db 31, MANKEY, MACHOKE, JABETTA, 0
db 32, PRIMEAPE, CARAPTHOR, 0
db 35, GORILLAIMO, 0
db 33, MACHOP, POLIWRATH, 0
; Viridian Gym - changed to fit the Ground-type gym theme
db 40, MAROWAK, GOLEM, 0
db 43, GUARDIA, 0
db 38, CACTORMUS, DUGTRIO, STEELIX, 0
; Victory Road 2F
db 43, MACHOKE, MACHOP, MACHOKE, 0
; Silph Gauntlet 2F (Mt. Moon)
db 63, HITMONTOP, JABETTA, GORILLAIMO, POLIWRATH, CARAPTHOR, MACHAMP, 0
; Uses Silph products and Steel-types
ChiefData:
; Silph Gauntlet 7F

8
data/trainers/pic_pointers_money.asm
View file

@ -53,10 +53,10 @@ TrainerPicAndMoneyPointers::
pic_money ChannelerPic, 3000
pic_money AgathaPic, 9900
pic_money LancePic, 9900
pic_money YujirouPic, 9900 ; was unused juggler
pic_money YujirouPic, 3500 ; was unused juggler
pic_money StudentPic, 1000
pic_money FirefighterPic, 1500
pic_money JuniorPic, 1000
pic_money FirefighterPic, 2500
pic_money KoichiPic, 9900
pic_money JackPic, 5000
pic_money JessieJamesPic, 9900
pic_money JessieJamesPic, 5000
assert_table_length NUM_TRAINERS

16
data/trainers/scaled_parties.asm
View file

@ -119,8 +119,7 @@ YujirouData: ; was unused juggler
; post-game rematch team
db $FF, 61, PERSIAN, 60, TAUROS, 60, BLISSEY, 61, LUXWAN, 61, SNORLAX, 64, LICKILICKY, 0
BlackbeltData:
; Koichi parties
KoichiData:
db 13, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; 0 badges (unused)
db $FF, 17, MACHOP, 20, HITMONLEE, 20, HITMONCHAN, 20, HITMONTOP, 0 ; 1
db $FF, 20, MACHOP, 20, MANKEY, 24, HITMONLEE, 24, HITMONCHAN, 24, HITMONTOP, 0 ; 2
@ -131,16 +130,3 @@ BlackbeltData:
db $FF, 46, MACHAMP, 46, CARAPTHOR, 46, ANNIHILAPE, 49, HITMONLEE, 49, HITMONCHAN, 49, HITMONTOP, 0 ; 7
db $FF, 50, MACHAMP, 50, CARAPTHOR, 50, ANNIHILAPE, 53, HITMONLEE, 53, HITMONCHAN, 53, HITMONTOP, 0 ; 8
db $FF, 60, MACHAMP, 60, ANNIHILAPE, 60, TAUROS_P, 65, HITMONLEE, 65, HITMONCHAN, 65, HITMONTOP, 0 ; Postgame
; Fighting Dojo Trainers
db 31, CHEEP, CHEEP, JABETTA, 0
db 32, MACHOKE, MACHAMP, 0
db 35, GORILLAIMO, 0
db 31, MACHOP, MANKEY, PRIMEAPE, 0
; Viridian Gym - changed to fit the Ground-type gym theme
db 40, SANDSLASH, GOLEM, 0
db 43, GUARDIA, 0
db 38, CACTORMUS, DUGTRIO, STEELIX, 0
; Victory Road 2F
db 43, MACHOKE, MACHOP, MACHOKE, 0
; Silph Gauntlet 2F (Mt. Moon)
db 63, HITMONLEE, JABETTA, HITMONCHAN, POLIWRATH, CARAPTHOR, MACHAMP, 0

2
data/wild/maps/MtMoonCrater.asm
View file

@ -16,7 +16,7 @@ MtMoonCraterMons:
db 52, GOLDUCK
db 54, GOLDUCK
db 50, GOLDUCK
db 56, JABETTA
db 52, JABETTA
db 50, JABETTA
db 52, CROAKOZUNA
db 54, CROAKOZUNA

2
data/wild/maps/SeaRoutes.asm
View file

@ -12,5 +12,5 @@ SeaRoutesWildMons:
db 30, TENTACRUEL
db 35, TENTACRUEL
db 35, PENDRAKEN
db 40, PENDRAKEN
db 35, SHARPOON
end_water_wildmons

170
data/wild/super_rod.asm
View file

@ -4,52 +4,51 @@ SuperRodData:
dbw PALLET_TOWN, .Group1
dbw VIRIDIAN_CITY, .Group1
dbw CERULEAN_CITY, .Group2
dbw VERMILION_CITY, .Group3
dbw CELADON_CITY, .Group11
dbw FUCHSIA_CITY, .Group5
dbw CINNABAR_ISLAND, .Group8
dbw CITRINE_CITY, .Group9
dbw VERMILION_CITY, .Group4
dbw CELADON_CITY, .Group13
dbw FUCHSIA_CITY, .Group6
dbw CINNABAR_ISLAND, .Group9
dbw CITRINE_CITY, .Group11
dbw ROUTE_4, .Group2
dbw ROUTE_6, .Group2
dbw ROUTE_10, .Group4
dbw ROUTE_11, .Group3
dbw ROUTE_12, .Group4
dbw ROUTE_13, .Group5
dbw ROUTE_17, .Group5
dbw ROUTE_18, .Group5
dbw ROUTE_19, .Group8
dbw ROUTE_20, .Group8
dbw ROUTE_21, .Group8
dbw ROUTE_10, .Group5
dbw ROUTE_11, .Group4
dbw ROUTE_12, .Group5
dbw ROUTE_13, .Group6
dbw ROUTE_17, .Group6
dbw ROUTE_18, .Group6
dbw ROUTE_19, .Group9
dbw ROUTE_20, .Group9
dbw ROUTE_21, .Group9
dbw ROUTE_22, .Group1
dbw ROUTE_23, .Group8
dbw ROUTE_23, .Group6
dbw ROUTE_24, .Group2
dbw ROUTE_25, .Group2
dbw BRUNSWICK_TRAIL, .Group9
dbw CERULEAN_GYM, .Group2
dbw VERMILION_DOCK, .Group3
dbw SEAFOAM_ISLANDS_B3F, .Group8
dbw SEAFOAM_ISLANDS_B4F, .Group8
dbw SAFARI_ZONE_EAST, .Group6
dbw SAFARI_ZONE_NORTH, .Group6
dbw SAFARI_ZONE_WEST, .Group6
dbw SAFARI_ZONE_CENTER, .Group6
dbw CERULEAN_CAVE_2F, .Group10
dbw CERULEAN_CAVE_B1F, .Group10
dbw CERULEAN_CAVE_1F, .Group10
dbw SILPH_GAUNTLET_5F, .Group6
dbw ROCK_TUNNEL_1F, .Group4
dbw CELADON_UNIVERSITY_OUTSIDE, .Group11
dbw FARAWAY_ISLAND_INSIDE, .Group5
dbw MT_MOON_CRATER, .Group10
dbw DIGLETTS_CAVE, .Group12
dbw BILLS_GARDEN, .Group7
dbw UNDERWATER_TUNNEL, .Group8
dbw LORELEIS_ROOM, .Group8
dbw GARNET_CAVERN_1F, .Group9
dbw GARNET_CAVERN_2F, .Group9
dbw GARNET_CAVERN_B1F, .Group9
dbw CINNABAR_VOLCANO_FLOORS, .Group13
dbw CINNABAR_VOLCANO, .Group13
dbw ROUTE_25, .Group3
dbw BRUNSWICK_TRAIL, .Group11
dbw VERMILION_DOCK, .Group4
dbw VERMILION_FERRY_DOCK, .Group4
dbw CITRINE_FERRY_DOCK, .Group11
dbw SEAFOAM_ISLANDS_B3F, .Group9
dbw SEAFOAM_ISLANDS_B4F, .Group9
dbw SAFARI_ZONE_EAST, .Group7
dbw SAFARI_ZONE_NORTH, .Group7
dbw SAFARI_ZONE_WEST, .Group7
dbw SAFARI_ZONE_CENTER, .Group7
dbw CERULEAN_CAVE_2F, .Group12
dbw CERULEAN_CAVE_B1F, .Group12
dbw CERULEAN_CAVE_1F, .Group12
dbw SILPH_GAUNTLET_5F, .Group7
dbw ROCK_TUNNEL_1F, .Group5
dbw CELADON_UNIVERSITY_OUTSIDE, .Group13
dbw MT_MOON_CRATER, .Group12
dbw DIGLETTS_CAVE, .Group14
dbw BILLS_GARDEN, .Group8
dbw UNDERWATER_TUNNEL, .Group10
dbw GARNET_CAVERN_1F, .Group11
dbw GARNET_CAVERN_2F, .Group11
dbw GARNET_CAVERN_B1F, .Group11
dbw CINNABAR_VOLCANO_FLOORS, .Group15
dbw CINNABAR_VOLCANO, .Group15
db -1 ; end
; fishing groups
@ -62,107 +61,98 @@ SuperRodData:
db 5, ORFRY
db 7, ORFRY
.Group2: ; Route 4, Cerulean, Route 24, Route 25, Route 6
db 5
.Group2: ; Route 4, Cerulean, Route 24, Route 6
db 4
db 12, MAGIKARP
db 12, POLIWAG
db 12, ORFRY
db 12, PSYDUCK
.Group3: ; Route 25
db 4
db 12, MAGIKARP
db 12, POLIWAG
db 12, ORFRY
db 12, CHEEP
.Group3: ; Route 11, Vermilion
db 5
.Group4: ; Route 11, Vermilion
db 4
db 15, BLOTTLE
db 15, MAGIKARP
db 15, GOLDEEN
db 15, TENTACOOL
db 15, CHEEP
.Group4: ; Route 10, Route 12, Rock Tunnel
db 5
.Group5: ; Route 10, Route 12, Rock Tunnel
db 4
db 20, RIBBITO
db 20, POLIWAG
db 20, SLOWPOKE
db 20, PSYDUCK
db 20, TENTACOOL
db 20, BLOTTLE
db 20, KRABBY
.Group5: ; Route 13, Route 17, Route 18, Fuchsia
db 5
.Group6: ; Route 13, Route 17, Route 18, Fuchsia, Route 23
db 4
db 25, HORSEA
db 25, POLIWHIRL
db 25, KRABBY
db 25, CHEEP
db 25, BLOTTLE
.Group6: ; Safari Zone
db 6
.Group7: ; Safari Zone
db 4
db 15, DRATINI
db 20, SLOWPOKE
db 25, KRABBY
db 25, WEIRDUCK
db 25, POLIWHIRL
db 30, DRAGONAIR
.Group7: ; Bill's Garden
db 6
.Group8: ; Bill's Garden
db 4
db 50, SQUIRTLE
db 50, SQUIRTLE
db 50, DRATINI
db 50, DRATINI
db 50, DRAGONAIR
db 55, DRAGONITE
.Group8: ; Sea Routes, Route 23, Seafoam Islands, Underwater Tunnel
db 6
.Group9: ; Cinnabar, Route 19-21, Seafoam Islands
db 4
db 30, STARYU
db 30, HORSEA
db 30, SHELLDER
db 30, SHARPOON
db 30, BLASTYKE
db 30, GOLDEEN
.Group9: ; Citrine, Brunswick, Garnet
db 8
db 50, SHARPOON
db 50, SEAKING
.Group10: ; Underwater Tunnel
db 4
db 35, SHELLDER
db 35, STARYU
db 35, CROAKOZUNA
db 35, GOLDUCK
.Group11: ; Citrine, Brunswick, Garnet
db 4
db 50, KINGLER
db 50, SEADRA
db 50, PENDRAKEN
db 50, GYARADOS
db 50, JABETTA
db 50, CROAKOZUNA
.Group10: ; Cerulean Cave
db 8
.Group12: ; Cerulean Cave, Mt Moon Crater
db 4
db 50, SLOWBRO
db 50, SEAKING
db 50, KINGLER
db 50, SHELLDER
db 50, GYARADOS
db 50, JABETTA
db 50, CROAKOZUNA
db 50, GOLDUCK
.Group11: ; Celadon
db 7
db 5, MAGIKARP
.Group13: ; Celadon
db 4
db 10, MAGIKARP
db 15, MAGIKARP
db 20, MAGIKARP
db 25, MAGIKARP
db 20, GYARADOS
db 20, GRIMER
.Group12: ; Diglett's Cave
db 6
db 16, WIGLETT
.Group14: ; Diglett's Cave
db 4
db 17, WIGLETT
db 18, WIGLETT
db 19, WIGLETT
db 21, WIGLETT
db 20, WIGLETT
db 28, WUGTRIO
.Group13: ; Cinnabar Volcano
.Group15: ; Cinnabar Volcano
db 3
db 35, MAGMAR
db 37, MAGMAR

2
engine/battle/wild_encounters.asm
View file

@ -57,6 +57,8 @@ TryDoWildEncounter:
ld a, [wCurMapTileset]
cp FOREST ; Viridian Forest/Safari Zone
jp z, .CantEncounter2
cp CELESTE
jp z, .CantEncounter2
ld a, [wGrassRate]
.CanEncounter
; compare encounter chance with a random number to determine if there will be an encounter

2
engine/battletentdata.asm
View file

@ -217,7 +217,7 @@ BTTrainerClassList::
db BLACKBELT, SPRITE_HIKER, 2
db SCIENTIST, SPRITE_SCIENTIST, 8
db FIREFIGHTER, SPRITE_FISHER, 0
db JUNIOR, SPRITE_YOUNGSTER, 8
db STUDENT, SPRITE_GIRL, 8
db CHANNELER, SPRITE_CHANNELER, 8
BTMonList::

1
engine/debug/debug_party.asm
View file

@ -206,6 +206,7 @@ DebugItemsList:
db BICYCLE, 1
db EXP_ALL, 1
db FULL_RESTORE, 99
db MAX_ELIXER, 99
db MAX_REPEL, 99
db RARE_CANDY, 99
db ESCAPE_ROPE, 99

16
engine/events/hidden_objects/oaks_lab_email.asm
View file

@ -1,10 +1,6 @@
DisplayOakLabEmailText:
ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
ret nz
call EnableAutoTextBoxDrawing
tx_pre_jump OakLabEmailText
OakLabEmailText::
text_far _OakLabEmailText
text_end
;DisplayOakLabEmailText:
; ld a, [wSpritePlayerStateData1FacingDirection]
; cp SPRITE_FACING_UP
; ret nz
; call EnableAutoTextBoxDrawing
; tx_pre_jump OakLabEmailText

1
engine/events/starter_dex.asm
View file

@ -8,4 +8,5 @@ StarterDex:
predef ShowPokedexData
xor a
ld [wPokedexOwned], a
ld [wPokedexOwned + 1], a
ret

BIN
gfx/blocksets/fossillab.bst
View file

Binary file not shown.

BIN
gfx/blocksets/pregym.bst
View file

Binary file not shown.

2
gfx/pics.asm
View file

@ -591,6 +591,6 @@ LancePic:: INCBIN "gfx/trainers/lance.pic"
YujirouPic:: INCBIN "gfx/trainers/yujirou.pic"
StudentPic:: INCBIN "gfx/trainers/student.pic"
FirefighterPic:: INCBIN "gfx/trainers/firefighter.pic"
JuniorPic:: INCBIN "gfx/trainers/junior.pic"
KoichiPic:: INCBIN "gfx/trainers/koichi.pic"
JackPic:: INCBIN "gfx/trainers/jack.pic"
JessieJamesPic:: INCBIN "gfx/trainers/jessiejames.pic"

BIN
gfx/pokemon/back/electivireb.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 576 B

After

Width:  |  Height:  |  Size: 628 B

BIN
gfx/tilesets/fossillab.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
gfx/trainers/junior.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 645 B

BIN
gfx/trainers/koichi.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 594 B

2
maps/FightingDojo.blk
View file

@ -1 +1 @@
3+, )54 %*'  &*%#
-3+, )54 %*'  67*%#

3
maps/OaksLab.blk
View file

@ -1 +1,2 @@
hhhghhhijijmnmnhhhhhh
  # (  
 6

19
scripts/FightingDojo.asm
View file

@ -109,14 +109,7 @@ FightingDojoText1: ; gym scaling can be removed to make space
text_asm
CheckEvent EVENT_POST_GAME_ATTAINED ; No need to view previous stuff, technically you can skip Bide this way but I think that's hilarious
jp z, .normalProcessing
CheckEvent EVENT_GOT_HITMON ; failsafe
jp nz, .continue2
CheckEvent EVENT_DEFEATED_FIGHTING_DOJO
jp nz, .continue1
CheckEventReuseA EVENT_BEAT_KARATE_MASTER
jp nz, .continue2
.rematchMode ; Rematch functionality. Just loads pre-battle text and his trainer.
ld hl, KoichiRematchPreBattleText
ld hl, KoichiRematchPreBattleText ; Rematch functionality. Just loads pre-battle text and his trainer.
call PrintText
ld c, BANK(Music_MeetMaleTrainer)
ld a, MUSIC_MEET_MALE_TRAINER
@ -129,7 +122,7 @@ FightingDojoText1: ; gym scaling can be removed to make space
ld de, KoichiRematchDefeatedText
call SaveEndBattleTextPointers
call EngageMapTrainer
ld a, OPP_BLACKBELT
ld a, OPP_KOICHI
ld [wCurOpponent], a
ld a, 10 ; Silph Gauntlet lineup.
ld [wTrainerNo], a
@ -139,6 +132,12 @@ FightingDojoText1: ; gym scaling can be removed to make space
ld [wGymLeaderNo], a
jr .asm_9dba4
.normalProcessing
CheckEvent EVENT_DEFEATED_FIGHTING_DOJO
jp nz, .continue1
CheckEventReuseA EVENT_BEAT_KARATE_MASTER
jp nz, .continue2
CheckEvent EVENT_GOT_HITMON ; failsafe
jp nz, .continue2
ld hl, FightingDojoText_5ce8e
call PrintText
ld hl, wd72d
@ -153,7 +152,7 @@ FightingDojoText1: ; gym scaling can be removed to make space
; call InitBattleEnemyParameters ; put this back if you mess up
; gym scaling spaghetti code begins here - remove initial parameters as we're making our own
ld a, OPP_BLACKBELT
ld a, OPP_KOICHI
ld [wCurOpponent], a
ld hl, wObtainedBadges ; Picking the team based on badge count. Need +1 so it loads the right team: remember, you're fighting for the badge! Thanks to Chatot4444 for the help.

62
scripts/OaksLab.asm
View file

@ -285,25 +285,31 @@ OaksLabScript8:
ld de, .PikachuMovement1
jr z, .moveBlue
.PikachuMovement1
db NPC_MOVEMENT_LEFT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_DOWN
db -1 ; end
.Eevee
ld de, .EeveeMovement1
ld a, [wYCoord]
cp 4 ; is the player standing below the table?
jr z, .moveBlue
ld de, .EeveeMovement2
; ld a, [wYCoord]
; cp 4 ; is the player standing below the table?
; jr z, .moveBlue
; ld de, .EeveeMovement2
jp .moveBlue
.EeveeMovement1
; db NPC_MOVEMENT_DOWN
; db NPC_MOVEMENT_LEFT
; db NPC_MOVEMENT_LEFT
; db NPC_MOVEMENT_UP
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_RIGHT
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_LEFT
db NPC_MOVEMENT_LEFT
db NPC_MOVEMENT_UP
db -1 ; end
.EeveeMovement2
db NPC_MOVEMENT_LEFT
db NPC_MOVEMENT_LEFT
;.EeveeMovement2
; db NPC_MOVEMENT_LEFT
; db NPC_MOVEMENT_LEFT
db -1 ; end
.moveBlue
@ -323,9 +329,20 @@ OaksLabScript9: ; This is where Blue picks up the ball and removes the sprite.
ld [wJoyIgnore], a
ld a, $1
ldh [hSpriteIndex], a
; So when using this new table system, we actually need to add cases for when you have the new starters...
ld a, [wPlayerStarter]
cp STARTER4
jr z, .skip
cp STARTER5
jr z, .skip
; Since he's just moved down, we just need to skip this process. It's actually harder for him to pick up the regular starters!
ld a, SPRITE_FACING_UP
ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
.skip
ld a, $d
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
@ -361,11 +378,21 @@ OaksLabScript9: ; This is where Blue picks up the ball and removes the sprite.
ld [wcf91], a
ld [wd11e], a
call GetMonName
; why does he do this twice why does he do this twice why does he do this twice
ld a, [wPlayerStarter]
cp STARTER4
jr z, .skip2
cp STARTER5
jr z, .skip2
ld a, $1
ldh [hSpriteIndex], a
ld a, SPRITE_FACING_UP
ldh [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
.skip2
ld a, $e
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
@ -803,6 +830,7 @@ OaksLab_TextPointers:
dw OaksLabText27
dw OaksLabTextPikachu
dw OaksLabTextEevee
dw OakLabEmailText
OaksLab_TextPointers2:
dw OaksLabText1
@ -1368,3 +1396,15 @@ PikachuEeveeShows:
db HS_DAMIEN ; Charmander guy
db HS_VERMILION_JENNY ; Squirtle
db -1 ; end
; Moved here to turn into a new bg event
OakLabEmailText:
text_asm
call EnableAutoTextBoxDrawing
ld hl, OakLabEmailTextGet
call PrintText
jp TextScriptEnd
OakLabEmailTextGet:
text_far _OakLabEmailText
text_end

1
scripts/SilphCo1F.asm
View file

@ -9,6 +9,7 @@ SilphCo1F_ScriptPointers:
dw SilphCo1FScript1
SilphCo1FScript0:
ResetEvent EVENT_BEAT_CHIEF ; Used so you can rematch Chief and later the gauntlet, without him being reset alongside everything else. An absolutely tragic way to fix a bug, but it works. If you enter his room, you have to fight him, so this all works under the hood without infringing on design.
ld b, SILPHLETTER
call IsItemInBag
ret nz

4
scripts/SilphGauntlet7F.asm
View file

@ -71,7 +71,7 @@ ChiefScript3:
xor a
ld [wIsTrainerBattle], a
call UpdateSprites
SetEvent EVENT_BEAT_CHIEF
SetEvent EVENT_BEAT_CHIEF ; Ensures Chief cannot be rematched in the room.
ld a, $f0
ld [wJoyIgnore], a
ld a, $1
@ -95,7 +95,7 @@ ChiefScript4:
ld a, HS_CERULEAN_CAVE_GUY
ld [wMissableObjectIndex], a
predef HideObject
; ResetEventRange SILPH_GAUNTLET_EVENTS_START, SILPH_GAUNTLET_EVENTS_END, 1 ; I want this to reset the trainers so you can refight them, but I'm very unsure how this works...
ResetEventRange SILPH_GAUNTLET_EVENTS_START, SILPH_GAUNTLET_EVENTS_END, 1
ld a, $0
ld [wSilphGauntlet7FCurScript], a

13
scripts/ViridianPreGym.asm
View file

@ -26,13 +26,12 @@ ViridianGymYujirouPostBattle:
jp z, ViridianGymResetScripts
ld a, $f0
ld [wJoyIgnore], a
SetEvents EVENT_BEAT_YUJIROU, EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_0, EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_1 ; Needs to be set here for the correct text to pop up.
ld a, $3
ld [hSpriteIndex], a
call DisplayTextID
jp ViridianPreGymResetScripts
; SetEvents EVENT_BEAT_YUJIROU, EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_0, EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_1 ; Needs to be set here for the correct text to pop up.
; ld a, $3
; ld [hSpriteIndex], a
; call DisplayTextID
; xor a
; ld [wViridianPreGymCurScript], a
ViridianPreGym_TextPointers:
dw ViridianPreGymText1

5
text/SilphGauntlet2F.asm
View file

@ -58,8 +58,9 @@ _SilphGauntlet2FAfterBattleText3::
_SilphGauntlet2FBattleText4::
text "Hahaha! This is"
line "great! So many"
cont "rare #MON! Show"
cont "me yours, now!"
cont "rare #MON!"
para "Show me yours,"
line "now!"
done
_SilphGauntlet2FEndBattleText4::

2
text/SilphGauntlet3F.asm
View file

@ -22,7 +22,7 @@ _SilphGauntlet3FBattleText2::
done
_SilphGauntlet3FEndBattleText2::
text "Sploosh!"
text "Agh!"
prompt
_SilphGauntlet3FAfterBattleText2::