mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-01-31 04:40:13 +13:00
Merge branch 'PlagueVonKarma:master' into master
This commit is contained in:
Misty
GitHub
commit
0613b7bb82
|
|
@ -259,12 +259,12 @@ and more!
|
|||
|
||||
Known Bugs
|
||||
====
|
||||
Comprehensive list can be found on Discord.
|
||||
- Occasionally, menu text sets itself to scroll.
|
||||
- If you defeat the Elite Four before the Fighing Dojo Karate Master, the Hitmon gift is permanently locked off.
|
||||
- Occasionally, menu text sets itself to scroll. (hasn't happened for a while, either uncommon or fixed)
|
||||
- The Tradeback Tutor doesn't work properly with Rhydon for reasons likely related to its index number of 1.
|
||||
- Fake Tears and Nasty Plot don't quite look right when done from the opponent's side.
|
||||
- After reloading the game after beating the Elite Four, Pallet Town's correct palette isn't loaded in until after leaving the house.
|
||||
- The Gym Leaders on Floor 6 of Silph Gauntlet don't play the correct music in battle
|
||||
- The Gym Leaders on Floor 6 of Silph Gauntlet don't play the correct music in battle.
|
||||
- Silph Co. Worker doesn't give Lapras as a gift on occasion (this happened like one time, more testing needed)
|
||||
|
||||
Evolution Methods for new Pokemon
|
||||
====
|
||||
|
|
|
|||
|
|
@ -380,6 +380,7 @@ INCLUDE "crysaudio/music/RBY/victory4.asm"
|
|||
INCLUDE "crysaudio/music/RBY/kinchou01.asm"
|
||||
INCLUDE "crysaudio/music/RBY/mewtwo01.asm"
|
||||
INCLUDE "crysaudio/music/RBY/legendarybattle.asm"
|
||||
INCLUDE "crysaudio/music/RBY/giovannisroom.asm"
|
||||
|
||||
SECTION "TCG Songs 1", ROMX
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -36,8 +36,9 @@
|
|||
const EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_0
|
||||
const EVENT_BEAT_VIRIDIAN_PREGYM_TRAINER_1
|
||||
const EVENT_GOT_TM42
|
||||
const EVENT_GOT_YUJIROU_BOTTLE_CAP
|
||||
const EVENT_BEAT_YUJIROU
|
||||
const_skip 11
|
||||
const_skip 10
|
||||
const EVENT_OAK_GOT_PARCEL
|
||||
const EVENT_GOT_OAKS_PARCEL
|
||||
const_skip 22
|
||||
|
|
@ -818,6 +819,7 @@ DEF INDIGO_PLATEAU_EVENTS_END EQU const_value - 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
|
||||
const EVENT_MEWTWO_UNLOCKED
|
||||
|
||||
; Silph Gauntlet events
|
||||
const_next $930
|
||||
|
|
|
|||
|
|
@ -180,82 +180,77 @@ DEF SHOW EQU $15
|
|||
const HS_SILPH_CO_7F_RIVAL ; A5
|
||||
const HS_SILPH_CO_7F_ITEM_1 ; A6 X
|
||||
const HS_SILPH_CO_7F_ITEM_2 ; A7 X
|
||||
const HS_SILPH_CO_10F_1 ; A8
|
||||
const HS_SILPH_CO_10F_2 ; A9
|
||||
const HS_SILPH_CO_10F_ITEM_1 ; AA X
|
||||
const HS_SILPH_CO_10F_ITEM_2 ; AB X
|
||||
const HS_SILPH_CO_10F_ITEM_3 ; AC X
|
||||
const HS_SILPH_CO_11F_1 ; AD
|
||||
const HS_SILPH_CO_11F_JAMES ; AE
|
||||
const HS_SILPH_CO_11F_3 ; AF
|
||||
const HS_SILPH_CO_11F_JESSIE ; B0
|
||||
const HS_OMEGA ; B1
|
||||
const HS_OMEGA_2 ; B2
|
||||
const HS_DRAGONITE ; B3
|
||||
const HS_MOLTRES ; B4
|
||||
const HS_POKEMON_MANSION_2F_ITEM ; B5 X
|
||||
const HS_POKEMON_MANSION_3F_ITEM_1 ; B6 X
|
||||
const HS_POKEMON_MANSION_3F_ITEM_2 ; B7 X
|
||||
const HS_POKEMON_MANSION_B1F_ITEM_1 ; B8 X
|
||||
const HS_POKEMON_MANSION_B1F_ITEM_2 ; B9 X
|
||||
const HS_POKEMON_MANSION_B1F_ITEM_3 ; BA X
|
||||
const HS_POKEMON_MANSION_B1F_ITEM_4 ; BB X
|
||||
const HS_POKEMON_MANSION_B1F_ITEM_5 ; BC X
|
||||
const HS_MANSION_GUARD ; BD
|
||||
const HS_SAFARI_ZONE_EAST_ITEM_1 ; BE X
|
||||
const HS_SAFARI_ZONE_EAST_ITEM_2 ; BF X
|
||||
const HS_SAFARI_ZONE_EAST_ITEM_3 ; C0 X
|
||||
const HS_SAFARI_ZONE_EAST_ITEM_4 ; C1 X
|
||||
const HS_SAFARI_ZONE_NORTH_ITEM_1 ; C2 X
|
||||
const HS_SAFARI_ZONE_NORTH_ITEM_2 ; C3 X
|
||||
const HS_SAFARI_ZONE_WEST_ITEM_1 ; C4 X
|
||||
const HS_SAFARI_ZONE_WEST_ITEM_2 ; C5 X
|
||||
const HS_SAFARI_ZONE_WEST_ITEM_3 ; C6 X
|
||||
const HS_SAFARI_ZONE_WEST_ITEM_4 ; C7 X
|
||||
const HS_SAFARI_ZONE_CENTER_ITEM ; C8 X
|
||||
const HS_CERULEAN_CAVE_2F_ITEM_1 ; C9 X
|
||||
const HS_CERULEAN_CAVE_2F_ITEM_2 ; CA X
|
||||
const HS_CERULEAN_CAVE_2F_ITEM_3 ; CB X
|
||||
const HS_MEWTWO ; CC X
|
||||
const HS_CERULEAN_CAVE_B1F_ITEM_1 ; CD X
|
||||
const HS_CERULEAN_CAVE_B1F_ITEM_2 ; CE X
|
||||
const HS_VICTORY_ROAD_1F_ITEM_1 ; CF X
|
||||
const HS_VICTORY_ROAD_1F_ITEM_2 ; D0 X
|
||||
const HS_CHAMPIONS_ROOM_OAK ; D1
|
||||
const HS_SEAFOAM_ISLANDS_1F_BOULDER_1 ; D2
|
||||
const HS_SEAFOAM_ISLANDS_1F_BOULDER_2 ; D3
|
||||
const HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ; D4
|
||||
const HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ; D5
|
||||
const HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ; D6
|
||||
const HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ; D7
|
||||
const HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 ; D8
|
||||
const HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 ; D9
|
||||
const HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 ; DA
|
||||
const HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 ; DB
|
||||
const HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ; DC
|
||||
const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; DD
|
||||
const HS_ARTICUNO ; DE
|
||||
const HS_MEW ; DF
|
||||
const HS_POKEMON_MANSION_B2F_ITEM_1 ; E0
|
||||
const HS_POKEMON_MANSION_B2F_ITEM_2 ; E1
|
||||
const HS_MT_MOON_CRATER_ITEM_1 ; E2
|
||||
const HS_MT_MOON_CRATER_ITEM_2 ; E3
|
||||
const HS_MT_MOON_CRATER_ITEM_3 ; E4
|
||||
const HS_MT_MOON_CRATER_ITEM_4 ; E5
|
||||
const HS_GIOVANNIS_ROOM_ITEM_1 ; E6
|
||||
const HS_GIOVANNIS_ROOM_ITEM_2 ; E7
|
||||
const HS_ROCK_TUNNEL_B1F_DOME ; E8
|
||||
const HS_ROCK_TUNNEL_B1F_HELIX ; E9
|
||||
const HS_ROCK_TUNNEL_B1F_AMBER ; EA sports. to the game.
|
||||
const HS_ROCK_TUNNEL_B1F_WING ; EB
|
||||
const HS_MT_MOON_CRATER_GUARD ; EC
|
||||
const HS_DAYCARE_BULBASAUR ; ED
|
||||
const HS_GLADE_GZAP_1 ; EE
|
||||
const HS_GLADE_GZAP_2 ; EF
|
||||
const HS_GLADE_GZAP_3 ; F0
|
||||
const HS_GLADE_ITEM1
|
||||
const HS_GLADE_ITEM2
|
||||
const HS_GLADE_ITEM3
|
||||
const HS_GLADE_ITEM4
|
||||
const HS_CINNABAR_VOLCANO_FLOORS_ITEM ; F1
|
||||
const HS_SILPH_CO_11F_1 ; A8
|
||||
const HS_SILPH_CO_11F_JAMES ; A9
|
||||
const HS_SILPH_CO_11F_3 ; AA
|
||||
const HS_SILPH_CO_11F_JESSIE ; AB
|
||||
const HS_OMEGA ; AC
|
||||
const HS_OMEGA_2 ; AD
|
||||
const HS_DRAGONITE ; AE
|
||||
const HS_MOLTRES ; AF
|
||||
const HS_POKEMON_MANSION_2F_ITEM ; B0 X
|
||||
const HS_POKEMON_MANSION_3F_ITEM_1 ; B1 X
|
||||
const HS_POKEMON_MANSION_3F_ITEM_2 ; B2 X
|
||||
const HS_POKEMON_MANSION_B1F_ITEM_1 ; B3 X
|
||||
const HS_POKEMON_MANSION_B1F_ITEM_2 ; B4 X
|
||||
const HS_POKEMON_MANSION_B1F_ITEM_3 ; B5 X
|
||||
const HS_POKEMON_MANSION_B1F_ITEM_4 ; B6 X
|
||||
const HS_POKEMON_MANSION_B1F_ITEM_5 ; B7 X
|
||||
const HS_MANSION_GUARD ; B8
|
||||
const HS_SAFARI_ZONE_EAST_ITEM_1 ; B9 X
|
||||
const HS_SAFARI_ZONE_EAST_ITEM_2 ; BA X
|
||||
const HS_SAFARI_ZONE_EAST_ITEM_3 ; BB X
|
||||
const HS_SAFARI_ZONE_EAST_ITEM_4 ; BC X
|
||||
const HS_SAFARI_ZONE_NORTH_ITEM_1 ; BD X
|
||||
const HS_SAFARI_ZONE_NORTH_ITEM_2 ; BE X
|
||||
const HS_SAFARI_ZONE_WEST_ITEM_1 ; BF X
|
||||
const HS_SAFARI_ZONE_WEST_ITEM_2 ; C0 X
|
||||
const HS_SAFARI_ZONE_WEST_ITEM_3 ; C1 X
|
||||
const HS_SAFARI_ZONE_WEST_ITEM_4 ; C2 X
|
||||
const HS_SAFARI_ZONE_CENTER_ITEM ; C3 X
|
||||
const HS_CERULEAN_CAVE_2F_ITEM_1 ; C4 X
|
||||
const HS_CERULEAN_CAVE_2F_ITEM_2 ; C5 X
|
||||
const HS_CERULEAN_CAVE_2F_ITEM_3 ; C6 X
|
||||
const HS_MEWTWO ; C7 X
|
||||
const HS_CERULEAN_CAVE_B1F_ITEM_1 ; C8 X
|
||||
const HS_CERULEAN_CAVE_B1F_ITEM_2 ; C9 X
|
||||
const HS_VICTORY_ROAD_1F_ITEM_1 ; CA X
|
||||
const HS_VICTORY_ROAD_1F_ITEM_2 ; CB X
|
||||
const HS_CHAMPIONS_ROOM_OAK ; CC
|
||||
const HS_SEAFOAM_ISLANDS_1F_BOULDER_1 ; CD
|
||||
const HS_SEAFOAM_ISLANDS_1F_BOULDER_2 ; CE
|
||||
const HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ; CF
|
||||
const HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ; D0
|
||||
const HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ; D1
|
||||
const HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ; D2
|
||||
const HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 ; D3
|
||||
const HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 ; D4
|
||||
const HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 ; D5
|
||||
const HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 ; D6
|
||||
const HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ; D7
|
||||
const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; D8
|
||||
const HS_ARTICUNO ; D9
|
||||
const HS_MEW ; DA
|
||||
const HS_POKEMON_MANSION_B2F_ITEM_1 ; DB
|
||||
const HS_POKEMON_MANSION_B2F_ITEM_2 ; DC
|
||||
const HS_MT_MOON_CRATER_ITEM_1 ; DD
|
||||
const HS_MT_MOON_CRATER_ITEM_2 ; DE
|
||||
const HS_MT_MOON_CRATER_ITEM_3 ; DF
|
||||
const HS_MT_MOON_CRATER_ITEM_4 ; E0
|
||||
const HS_GIOVANNIS_ROOM_ITEM_1 ; E1
|
||||
const HS_GIOVANNIS_ROOM_ITEM_2 ; E2
|
||||
const HS_ROCK_TUNNEL_B1F_DOME ; E3
|
||||
const HS_ROCK_TUNNEL_B1F_HELIX ; E4
|
||||
const HS_ROCK_TUNNEL_B1F_AMBER ; E5
|
||||
const HS_ROCK_TUNNEL_B1F_WING ; E6
|
||||
const HS_MT_MOON_CRATER_GUARD ; E7
|
||||
const HS_DAYCARE_BULBASAUR ; E8
|
||||
const HS_GLADE_GZAP_1 ; E9
|
||||
const HS_GLADE_GZAP_2 ; EA sports. to the game.
|
||||
const HS_GLADE_GZAP_3 ; EB
|
||||
const HS_GLADE_ITEM1 ; EC
|
||||
const HS_GLADE_ITEM2 ; ED
|
||||
const HS_GLADE_ITEM3 ; EE
|
||||
const HS_GLADE_ITEM4 ; EF
|
||||
const HS_CINNABAR_VOLCANO_FLOORS_ITEM ; F0
|
||||
DEF NUM_HS_OBJECTS EQU const_value ; F2 - FE all go unused.
|
||||
|
|
|
|||
|
|
@ -253,27 +253,26 @@ DEF FIRST_INDOOR_MAP EQU const_value
|
|||
map_const CERULEAN_BADGE_HOUSE, 4, 4 ; $E7
|
||||
map_const CINNABAR_VOLCANO, 14, 12 ; $E8 - Was UNUSED_MAP_E7
|
||||
map_const CINNABAR_VOLCANO_FLOORS, 20, 20 ; $E9 - Switched with ROCK_TUNNEL_B1F
|
||||
map_const SILPH_CO_9F, 13, 9 ; $EA (now goes unused)
|
||||
map_const SILPH_CO_10F, 8, 9 ; $EB (now goes unused)
|
||||
map_const SILPH_CO_11F, 9, 9 ; $EC
|
||||
map_const FARAWAY_FERRY_DOCK, 14, 6 ; $ED - was SILPH_CO_ELEVATOR
|
||||
map_const GARNET_CAVERN_2F, 15, 9 ; $EE - was UNUSED_MAP_ED
|
||||
map_const UNDERWATER_TUNNEL, 15, 9 ; $EF - Was UNUSED_MAP_EE
|
||||
map_const TRADE_CENTER, 5, 4 ; $F0
|
||||
map_const COLOSSEUM, 5, 4 ; $F1
|
||||
map_const CELADON_UNIVERSITY_INSIDE, 11, 10 ; $F2 - Was UNUSED_MAP_F1
|
||||
map_const CELADON_UNIVERSITY_POKECENTER, 7, 4 ; $F3 - Was UNUSED_MAP_F2
|
||||
map_const LORELEIS_ROOM, 5, 6 ; $F4
|
||||
map_const BRUNOS_ROOM, 5, 6 ; $F5
|
||||
map_const AGATHAS_ROOM, 5, 6 ; $F6
|
||||
map_const ROCK_TUNNEL_B1F, 20, 18 ; $F7 - Switched with CINNABAR_VOLCANO_FLOORS
|
||||
map_const GIOVANNIS_ROOM, 11, 14 ; $F8
|
||||
map_const BATTLE_TENT, 5, 10 ; $F9
|
||||
map_const MT_MOON_SQUARE, 13, 7 ; $FA
|
||||
map_const MT_MOON_SQUARE_HOUSE, 4, 4 ; $FB
|
||||
map_const CELESTE_HILL_CAVE, 20, 18 ; $FC
|
||||
map_const CELESTE_HILL_OUTSIDE, 20, 20 ; $FD
|
||||
map_const BRUNSWICK_GLADE, 19, 20 ; $FE
|
||||
map_const ROUTE_10_GATE, 5, 4 ; $EA
|
||||
map_const SILPH_CO_11F, 9, 9 ; $EB
|
||||
map_const FARAWAY_FERRY_DOCK, 14, 6 ; $EC - was SILPH_CO_ELEVATOR
|
||||
map_const GARNET_CAVERN_2F, 15, 9 ; $ED - was UNUSED_MAP_ED
|
||||
map_const UNDERWATER_TUNNEL, 15, 9 ; $EE - Was UNUSED_MAP_EE
|
||||
map_const TRADE_CENTER, 5, 4 ; $EF
|
||||
map_const COLOSSEUM, 5, 4 ; $F0
|
||||
map_const CELADON_UNIVERSITY_INSIDE, 11, 10 ; $F1 - Was UNUSED_MAP_F1
|
||||
map_const CELADON_UNIVERSITY_POKECENTER, 7, 4 ; $F2 - Was UNUSED_MAP_F2
|
||||
map_const LORELEIS_ROOM, 5, 6 ; $F3
|
||||
map_const BRUNOS_ROOM, 5, 6 ; $F4
|
||||
map_const AGATHAS_ROOM, 5, 6 ; $F5
|
||||
map_const ROCK_TUNNEL_B1F, 20, 18 ; $F6 - Switched with CINNABAR_VOLCANO_FLOORS
|
||||
map_const GIOVANNIS_ROOM, 11, 14 ; $F7
|
||||
map_const BATTLE_TENT, 5, 10 ; $F8
|
||||
map_const MT_MOON_SQUARE, 13, 7 ; $F9
|
||||
map_const MT_MOON_SQUARE_HOUSE, 4, 4 ; $FA
|
||||
map_const CELESTE_HILL_CAVE, 20, 18 ; $FB
|
||||
map_const CELESTE_HILL_OUTSIDE, 20, 20 ; $FC
|
||||
map_const BRUNSWICK_GLADE, 19, 20 ; $FD
|
||||
DEF NUM_MAPS EQU const_value
|
||||
|
||||
; Indoor maps, such as houses, use this as the Map ID in their exit warps
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@
|
|||
const MUSIC_KINCHOU01
|
||||
const MUSIC_MEWTWO01
|
||||
const MUSIC_LEGENDARYBATTLE
|
||||
const MUSIC_GIOVANNIS_ROOM
|
||||
|
||||
const NUM_SONGS
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ PokemonCries::
|
|||
mon_cry CRY_VENONAT, -233, 240 ; UMBREON
|
||||
mon_cry CRY_CHIKORITA, -1, 512 ; LEAFEON
|
||||
mon_cry CRY_AMPHAROS, 63, 592 ; GLACEON
|
||||
mon_cry CRY_NIDORAN_M, 0, 0 ; SYLVEON (incomplete)
|
||||
mon_cry CRY_NIDOQUEEN, 253, 367 ; SYLVEON
|
||||
mon_cry CRY_RATTATA, 0, 256 ; RATTATA
|
||||
mon_cry CRY_RATTATA, 32, 383 ; RATICATE
|
||||
mon_cry CRY_RATTATA, 32, 383 ; RATICATE_A
|
||||
|
|
@ -45,7 +45,7 @@ PokemonCries::
|
|||
mon_cry CRY_BLASTOISE, 255, 129 ; KAKUNA
|
||||
mon_cry CRY_BLASTOISE, 96, 256 ; BEEDRILL
|
||||
mon_cry CRY_MUK, 163, 187 ; GENTLARVA
|
||||
mon_cry CRY_KRABBY, 144, 151 ; PUPAL (needs revising)
|
||||
mon_cry CRY_KRABBY, 144, 151 ; PUPAL
|
||||
mon_cry CRY_KRABBY, 245, 288 ; CARAPTHOR
|
||||
mon_cry CRY_KANGASKHAN, 163, 129 ; KOTORA
|
||||
mon_cry CRY_KANGASKHAN, 45, 129 ; GAOTORA
|
||||
|
|
@ -113,7 +113,7 @@ PokemonCries::
|
|||
mon_cry CRY_RATTATA, 255, 192 ; CHEEP
|
||||
mon_cry CRY_RATTATA, 50, 383 ; JABETTA
|
||||
mon_cry CRY_SEEL, 0, 256 ; LICKITUNG
|
||||
mon_cry CRY_TYPHLOSION, 576, 234 ; LICKILICKY (sounds really similar to electivire, consider revising)
|
||||
mon_cry CRY_SEEL, 169, 639 ; LICKILICKY
|
||||
mon_cry CRY_GROWLITHE, 32, 192 ; GROWLITHE
|
||||
mon_cry CRY_WEEDLE, 0, 256 ; ARCANINE
|
||||
mon_cry CRY_WEEDLE, 0, 256 ; ARCANINE_H
|
||||
|
|
@ -129,8 +129,8 @@ PokemonCries::
|
|||
mon_cry CRY_DIGLETT, 170, 129 ; DIGLETT
|
||||
mon_cry CRY_DIGLETT, 42, 144 ; DUGTRIO
|
||||
mon_cry CRY_DIGLETT, 42, 144 ; DUGTRIO_A
|
||||
mon_cry CRY_NIDORAN_M, 0, 0 ; WIGLETT (incomplete)
|
||||
mon_cry CRY_NIDORAN_M, 0, 0 ; WUGTRIO (incomplete)
|
||||
mon_cry CRY_PSYDUCK, 640, 480 ; WIGLETT
|
||||
mon_cry CRY_DIGLETT, 36, 480 ; WUGTRIO
|
||||
mon_cry CRY_EKANS, 255, 320 ; ONIX
|
||||
mon_cry CRY_TYPHLOSION, 239, 247 ; STEELIX
|
||||
mon_cry CRY_VOLTORB, 237, 256 ; VOLTORB
|
||||
|
|
|
|||
368
crysaudio/music/RBY/giovannisroom.asm
Normal file
368
crysaudio/music/RBY/giovannisroom.asm
Normal file
|
|
@ -0,0 +1,368 @@
|
|||
Music_GiovannisRoom:
|
||||
channel_count 2
|
||||
channel 2, Music_GiovannisRoom_Ch2
|
||||
channel 3, Music_GiovannisRoom_Ch3
|
||||
|
||||
Music_GiovannisRoom_Ch2:
|
||||
vibrato 11, 1, 5
|
||||
duty_cycle 3
|
||||
note_type 12, 0, -7
|
||||
stereo_panning TRUE, FALSE
|
||||
note_type 12, 4, -5
|
||||
octave 5
|
||||
rest 4
|
||||
stereo_panning TRUE, TRUE
|
||||
Music_GiovannisRoom_branch_7dfeb:
|
||||
note_type 12, 12, 2
|
||||
Music_GiovannisRoom_branch_7dfed:
|
||||
sound_call Music_GiovannisRoom_branch_7e097
|
||||
sound_loop 3, Music_GiovannisRoom_branch_7dfed
|
||||
octave 2
|
||||
note E_, 1
|
||||
note E_, 1
|
||||
note B_, 1
|
||||
octave 3
|
||||
note C_, 1
|
||||
rest 2
|
||||
note C_, 1
|
||||
octave 2
|
||||
note B_, 1
|
||||
note E_, 1
|
||||
note E_, 1
|
||||
note A_, 1
|
||||
note G_, 1
|
||||
note F_, 1
|
||||
note F#, 1
|
||||
note G_, 1
|
||||
note D#, 1
|
||||
Music_GiovannisRoom_branch_7e006:
|
||||
sound_call Music_GiovannisRoom_branch_7e097
|
||||
sound_loop 4, Music_GiovannisRoom_branch_7e006
|
||||
rest 2
|
||||
sound_call Music_GiovannisRoom_branch_7e0ab
|
||||
octave 3
|
||||
note C_, 4
|
||||
sound_call Music_GiovannisRoom_branch_7e0ab
|
||||
octave 3
|
||||
note C#, 4
|
||||
sound_call Music_GiovannisRoom_branch_7e0ab
|
||||
octave 3
|
||||
note D#, 4
|
||||
note_type 12, 13, 3
|
||||
octave 4
|
||||
note E_, 4
|
||||
note D#, 4
|
||||
note C_, 4
|
||||
octave 3
|
||||
note B_, 4
|
||||
note_type 12, 13, 2
|
||||
sound_call Music_GiovannisRoom_branch_7e0b5
|
||||
octave 3
|
||||
note F#, 4
|
||||
sound_call Music_GiovannisRoom_branch_7e0b5
|
||||
octave 3
|
||||
note G_, 4
|
||||
sound_call Music_GiovannisRoom_branch_7e0b5
|
||||
octave 3
|
||||
note A#, 4
|
||||
note_type 12, 13, 3
|
||||
octave 4
|
||||
note E_, 4
|
||||
note D#, 4
|
||||
note C_, 4
|
||||
octave 3
|
||||
note B_, 4
|
||||
octave 4
|
||||
note C_, 4
|
||||
octave 3
|
||||
note B_, 4
|
||||
note G_, 4
|
||||
note F#, 2
|
||||
note_type 12, 13, 6
|
||||
note E_, 8
|
||||
note F_, 8
|
||||
note F#, 8
|
||||
note G_, 8
|
||||
note_type 12, 13, 2
|
||||
sound_call Music_GiovannisRoom_branch_7e0ba
|
||||
rest 10
|
||||
note E_, 1
|
||||
rest 1
|
||||
sound_call Music_GiovannisRoom_branch_7e0ba
|
||||
rest 12
|
||||
sound_call Music_GiovannisRoom_branch_7e0ba
|
||||
rest 12
|
||||
sound_call Music_GiovannisRoom_branch_7e0ba
|
||||
rest 14
|
||||
note_type 12, 13, 3
|
||||
sound_call Music_GiovannisRoom_branch_7e0cd
|
||||
note D#, 4
|
||||
sound_call Music_GiovannisRoom_branch_7e0cd
|
||||
note D#, 2
|
||||
rest 2
|
||||
note_type 12, 13, 2
|
||||
sound_call Music_GiovannisRoom_branch_7e0c0
|
||||
rest 2
|
||||
octave 3
|
||||
note F#, 4
|
||||
octave 2
|
||||
note E_, 1
|
||||
note E_, 1
|
||||
octave 3
|
||||
note B_, 1
|
||||
rest 1
|
||||
octave 4
|
||||
note C_, 1
|
||||
rest 1
|
||||
note C#, 1
|
||||
rest 1
|
||||
note D_, 1
|
||||
note C#, 1
|
||||
rest 2
|
||||
octave 3
|
||||
note G_, 4
|
||||
sound_call Music_GiovannisRoom_branch_7e0c0
|
||||
octave 3
|
||||
note A#, 4
|
||||
note_type 12, 13, 6
|
||||
note B_, 8
|
||||
octave 4
|
||||
note D#, 8
|
||||
note_type 12, 13, 2
|
||||
sound_call Music_GiovannisRoom_branch_7e097
|
||||
sound_call Music_GiovannisRoom_branch_7e097
|
||||
sound_loop 0, Music_GiovannisRoom_branch_7dfeb
|
||||
|
||||
Music_GiovannisRoom_branch_7e097:
|
||||
octave 2
|
||||
note E_, 1
|
||||
note E_, 1
|
||||
note B_, 1
|
||||
octave 3
|
||||
note C_, 1
|
||||
rest 2
|
||||
note C_, 1
|
||||
octave 2
|
||||
note B_, 1
|
||||
note E_, 1
|
||||
note E_, 1
|
||||
note B_, 1
|
||||
octave 3
|
||||
note C_, 1
|
||||
rest 2
|
||||
note C_, 1
|
||||
octave 2
|
||||
note B_, 1
|
||||
sound_ret
|
||||
|
||||
Music_GiovannisRoom_branch_7e0ab:
|
||||
octave 2
|
||||
note E_, 1
|
||||
note E_, 1
|
||||
rest 2
|
||||
octave 1
|
||||
note E_, 1
|
||||
rest 3
|
||||
note E_, 1
|
||||
rest 3
|
||||
sound_ret
|
||||
|
||||
Music_GiovannisRoom_branch_7e0b5:
|
||||
octave 2
|
||||
note E_, 1
|
||||
note E_, 1
|
||||
rest 10
|
||||
sound_ret
|
||||
|
||||
Music_GiovannisRoom_branch_7e0ba:
|
||||
octave 1
|
||||
note E_, 1
|
||||
note G_, 1
|
||||
note E_, 1
|
||||
note D#, 1
|
||||
sound_ret
|
||||
|
||||
Music_GiovannisRoom_branch_7e0c0:
|
||||
octave 2
|
||||
note E_, 1
|
||||
note E_, 1
|
||||
octave 4
|
||||
note E_, 1
|
||||
rest 1
|
||||
note D#, 1
|
||||
rest 1
|
||||
note D_, 1
|
||||
rest 1
|
||||
note C#, 1
|
||||
note C_, 1
|
||||
sound_ret
|
||||
|
||||
Music_GiovannisRoom_branch_7e0cd:
|
||||
octave 3
|
||||
note E_, 6
|
||||
note G_, 6
|
||||
note E_, 4
|
||||
note A_, 6
|
||||
octave 4
|
||||
note C_, 6
|
||||
octave 3
|
||||
note B_, 4
|
||||
note G_, 6
|
||||
note A#, 6
|
||||
note F#, 4
|
||||
note E_, 6
|
||||
note F#, 6
|
||||
sound_ret
|
||||
|
||||
Music_GiovannisRoom_Ch3:
|
||||
note_type 12, 1, 1
|
||||
vibrato 8, 2, 6
|
||||
rest 2
|
||||
octave 4
|
||||
note D_, 1
|
||||
note D#, 1
|
||||
Music_GiovannisRoom_branch_7e0e5:
|
||||
sound_call Music_GiovannisRoom_branch_7e140
|
||||
sound_call Music_GiovannisRoom_branch_7e140
|
||||
octave 5
|
||||
note E_, 2
|
||||
rest 4
|
||||
octave 3
|
||||
note E_, 1
|
||||
rest 3
|
||||
note E_, 1
|
||||
rest 1
|
||||
octave 4
|
||||
note F#, 4
|
||||
sound_call Music_GiovannisRoom_branch_7e154
|
||||
octave 4
|
||||
note G_, 4
|
||||
sound_call Music_GiovannisRoom_branch_7e154
|
||||
octave 4
|
||||
note A_, 4
|
||||
note B_, 4
|
||||
note A#, 4
|
||||
note G_, 4
|
||||
note F#, 4
|
||||
rest 6
|
||||
sound_call Music_GiovannisRoom_branch_7e177
|
||||
note B_, 4
|
||||
note A#, 4
|
||||
note G_, 4
|
||||
note F#, 4
|
||||
note G_, 4
|
||||
note F#, 4
|
||||
note E_, 4
|
||||
note D#, 4
|
||||
sound_call Music_GiovannisRoom_branch_7e15e
|
||||
rest 12
|
||||
sound_call Music_GiovannisRoom_branch_7e15e
|
||||
rest 12
|
||||
sound_call Music_GiovannisRoom_branch_7e15e
|
||||
rest 10
|
||||
note E_, 1
|
||||
rest 1
|
||||
sound_call Music_GiovannisRoom_branch_7e15e
|
||||
rest 12
|
||||
sound_call Music_GiovannisRoom_branch_7e15e
|
||||
rest 12
|
||||
sound_call Music_GiovannisRoom_branch_7e15e
|
||||
rest 10
|
||||
note D_, 1
|
||||
note D#, 1
|
||||
sound_call Music_GiovannisRoom_branch_7e164
|
||||
sound_call Music_GiovannisRoom_branch_7e164
|
||||
note E_, 2
|
||||
rest 4
|
||||
sound_call Music_GiovannisRoom_branch_7e177
|
||||
note B_, 8
|
||||
note F#, 6
|
||||
note D_, 1
|
||||
note D#, 1
|
||||
rest 16
|
||||
rest 16
|
||||
sound_loop 0, Music_GiovannisRoom_branch_7e0e5
|
||||
|
||||
Music_GiovannisRoom_branch_7e140:
|
||||
octave 5
|
||||
note E_, 4
|
||||
note B_, 4
|
||||
note A#, 4
|
||||
octave 6
|
||||
note D_, 4
|
||||
note C#, 4
|
||||
octave 5
|
||||
note G#, 4
|
||||
note G_, 4
|
||||
note B_, 4
|
||||
note A#, 4
|
||||
note E_, 4
|
||||
note D#, 4
|
||||
note A_, 4
|
||||
note G#, 4
|
||||
note E_, 4
|
||||
note F#, 4
|
||||
note D#, 4
|
||||
sound_ret
|
||||
|
||||
Music_GiovannisRoom_branch_7e154:
|
||||
octave 6
|
||||
note E_, 1
|
||||
note E_, 1
|
||||
rest 4
|
||||
octave 3
|
||||
note E_, 1
|
||||
rest 3
|
||||
note E_, 1
|
||||
rest 1
|
||||
sound_ret
|
||||
|
||||
Music_GiovannisRoom_branch_7e15e:
|
||||
octave 3
|
||||
note E_, 1
|
||||
note G_, 1
|
||||
note E_, 1
|
||||
note D#, 1
|
||||
sound_ret
|
||||
|
||||
Music_GiovannisRoom_branch_7e164:
|
||||
note E_, 4
|
||||
note B_, 4
|
||||
note A#, 4
|
||||
octave 4
|
||||
note D_, 4
|
||||
note C#, 4
|
||||
octave 3
|
||||
note G#, 4
|
||||
note G_, 4
|
||||
note B_, 4
|
||||
note A#, 4
|
||||
note E_, 4
|
||||
note D#, 4
|
||||
note A_, 4
|
||||
note G#, 4
|
||||
note E_, 4
|
||||
note F#, 4
|
||||
note D#, 4
|
||||
sound_ret
|
||||
|
||||
Music_GiovannisRoom_branch_7e177:
|
||||
octave 4
|
||||
note E_, 1
|
||||
rest 3
|
||||
note E_, 1
|
||||
rest 1
|
||||
note F#, 4
|
||||
rest 6
|
||||
note E_, 1
|
||||
rest 3
|
||||
note E_, 1
|
||||
rest 1
|
||||
note G_, 4
|
||||
rest 6
|
||||
note E_, 1
|
||||
rest 3
|
||||
note E_, 1
|
||||
note E_, 1
|
||||
note A#, 4
|
||||
sound_ret
|
||||
|
|
@ -58,3 +58,4 @@ Music:
|
|||
dba Music_Kinchou01
|
||||
dba Music_Mewtwo01
|
||||
dba Music_LegendaryBattle
|
||||
dba Music_GiovannisRoom
|
||||
|
|
|
|||
|
|
@ -7,10 +7,6 @@
|
|||
CardKeyTable1:
|
||||
db SILPH_CO_7F, $06, $0A, 4
|
||||
db SILPH_CO_7F, $06, $0B, 5
|
||||
db SILPH_CO_9F, $04, $12, 6
|
||||
db SILPH_CO_9F, $04, $13, 7
|
||||
db SILPH_CO_10F, $08, $0A, 8
|
||||
db SILPH_CO_10F, $08, $0B, 9
|
||||
db -1 ; end
|
||||
|
||||
CardKeyTable2:
|
||||
|
|
@ -18,8 +14,6 @@ CardKeyTable2:
|
|||
db SILPH_CO_3F, $09, $09, 11
|
||||
db SILPH_CO_5F, $04, $07, 12
|
||||
db SILPH_CO_5F, $05, $07, 13
|
||||
db SILPH_CO_9F, $08, $03, 18
|
||||
db SILPH_CO_9F, $09, $03, 19
|
||||
db -1 ; end
|
||||
|
||||
CardKeyTable3:
|
||||
|
|
|
|||
|
|
@ -2,7 +2,5 @@ SilphCoMapList:
|
|||
db SILPH_CO_3F
|
||||
db SILPH_CO_5F
|
||||
db SILPH_CO_7F
|
||||
db SILPH_CO_9F
|
||||
db SILPH_CO_10F
|
||||
db SILPH_CO_11F
|
||||
db -1 ; end
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ HiddenItemCoords:
|
|||
hidden_item ROUTE_9, 14, 7
|
||||
hidden_item SS_ANNE_KITCHEN, 13, 9
|
||||
hidden_item SS_ANNE_B1F_ROOMS, 3, 1
|
||||
hidden_item ROUTE_10, 9, 17
|
||||
hidden_item ROUTE_10, 16, 53
|
||||
hidden_item ROUTE_10, 9, 25
|
||||
hidden_item ROUTE_10, 12, 71
|
||||
hidden_item ROCKET_HIDEOUT_B1F, 21, 15
|
||||
hidden_item ROCKET_HIDEOUT_B3F, 27, 17
|
||||
hidden_item ROCKET_HIDEOUT_B4F, 25, 1
|
||||
|
|
@ -23,7 +23,6 @@ HiddenItemCoords:
|
|||
hidden_item SAFARI_ZONE_GATE, 10, 1 ; inaccessible
|
||||
hidden_item SAFARI_ZONE_WEST, 6, 5
|
||||
hidden_item SILPH_CO_5F, 12, 3
|
||||
hidden_item SILPH_CO_9F, 2, 15
|
||||
hidden_item COPYCATS_HOUSE_2F, 1, 1
|
||||
hidden_item CERULEAN_CAVE_1F, 14, 11
|
||||
hidden_item CERULEAN_CAVE_B1F, 27, 3
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@ HiddenObjectMaps:
|
|||
db SAFARI_ZONE_GATE
|
||||
db SAFARI_ZONE_WEST
|
||||
db SILPH_CO_5F
|
||||
db SILPH_CO_9F
|
||||
db COPYCATS_HOUSE_2F
|
||||
db CERULEAN_CAVE_1F
|
||||
db CERULEAN_CAVE_B1F
|
||||
|
|
@ -142,7 +141,6 @@ HiddenObjectPointers:
|
|||
dw SafariZoneEntranceHiddenObjects
|
||||
dw SafariZoneWestHiddenObjects
|
||||
dw SilphCo5FHiddenObjects
|
||||
dw SilphCo9FHiddenObjects
|
||||
dw CopycatsHouse2FHiddenObjects
|
||||
dw CeruleanCave1HiddenObjects
|
||||
dw CeruleanCave3HiddenObjects
|
||||
|
|
@ -431,8 +429,8 @@ SSAnne10HiddenObjects:
|
|||
db -1 ; end
|
||||
|
||||
Route10HiddenObjects:
|
||||
hidden_object 9, 17, SUPER_POTION, HiddenItems
|
||||
hidden_object 16, 53, MAX_ETHER, HiddenItems
|
||||
hidden_object 9, 25, SUPER_POTION, HiddenItems
|
||||
hidden_object 12, 71, MAX_ETHER, HiddenItems
|
||||
db -1 ; end
|
||||
|
||||
RocketHideout1HiddenObjects:
|
||||
|
|
@ -473,10 +471,6 @@ SilphCo5FHiddenObjects:
|
|||
hidden_object 12, 3, ELIXER, HiddenItems
|
||||
db -1 ; end
|
||||
|
||||
SilphCo9FHiddenObjects:
|
||||
hidden_object 2, 15, MAX_POTION, HiddenItems
|
||||
db -1 ; end
|
||||
|
||||
CopycatsHouse2FHiddenObjects:
|
||||
hidden_object 1, 1, NUGGET, HiddenItems
|
||||
db -1 ; end
|
||||
|
|
@ -575,8 +569,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:
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ DungeonMaps1:
|
|||
db DIGLETTS_CAVE
|
||||
db UNDERWATER_TUNNEL
|
||||
db CINNABAR_VOLCANO_FLOORS
|
||||
db SILPH_CO_11F
|
||||
db CELESTE_HILL
|
||||
db CELESTE_HILL_OUTSIDE
|
||||
db CELESTE_HILL_CAVE
|
||||
|
|
@ -34,8 +35,6 @@ DungeonMaps2:
|
|||
; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and
|
||||
; CERULEAN_CAVE maps, except for SILPH_CO_1F
|
||||
db SILPH_CO_3F, CERULEAN_CAVE_1F
|
||||
; SILPH_CO_[9-11]F
|
||||
db SILPH_CO_9F, SILPH_CO_11F
|
||||
; SEAFOAM_ISLANDS_[B1F-B4F]
|
||||
db SEAFOAM_ISLANDS_B1F, SEAFOAM_ISLANDS_B4F
|
||||
; all ROCKET_HIDEOUT maps
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
map_header OaksLab, OAKS_LAB, GYM, 0
|
||||
map_header OaksLab, OAKS_LAB, FOSSILLAB, 0
|
||||
end_map_header
|
||||
|
|
|
|||
2
data/maps/headers/Route10Gate.asm
Normal file
2
data/maps/headers/Route10Gate.asm
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
map_header Route10Gate, ROUTE_10_GATE, FOREST_GATE, 0
|
||||
end_map_header
|
||||
|
|
@ -238,7 +238,6 @@ MapHSPointers:
|
|||
dw CinnabarVolcanoHS
|
||||
dw CinnabarVolcanoFloorsHS
|
||||
dw NoHS
|
||||
dw SilphCo10FHS
|
||||
dw SilphCo11FHS
|
||||
dw NoHS
|
||||
dw NoHS
|
||||
|
|
@ -493,12 +492,6 @@ SilphCo7FHS:
|
|||
db SILPH_CO_7F, $09, SHOW ; HS_SILPH_CO_7F_RIVAL
|
||||
db SILPH_CO_7F, $0A, SHOW ; HS_SILPH_CO_7F_ITEM_1
|
||||
db SILPH_CO_7F, $0B, SHOW ; HS_SILPH_CO_7F_ITEM_2
|
||||
SilphCo10FHS:
|
||||
db SILPH_CO_10F, $01, SHOW ; HS_SILPH_CO_10F_1
|
||||
db SILPH_CO_10F, $02, SHOW ; HS_SILPH_CO_10F_2
|
||||
db SILPH_CO_10F, $03, SHOW ; HS_SILPH_CO_10F_ITEM_1
|
||||
db SILPH_CO_10F, $04, SHOW ; HS_SILPH_CO_10F_ITEM_2
|
||||
db SILPH_CO_10F, $05, SHOW ; HS_SILPH_CO_10F_ITEM_3
|
||||
SilphCo11FHS:
|
||||
db SILPH_CO_11F, $03, SHOW ; Giovanni
|
||||
db SILPH_CO_11F, $04, SHOW ; James
|
||||
|
|
@ -591,13 +584,13 @@ MtMoonSquareHS:
|
|||
DaycareHS:
|
||||
db DAYCARE, $03, SHOW ; HS_DAYCARE_BULBASAUR
|
||||
BrunswickGladeHS:
|
||||
db BRUNSWICK_GLADE, $01, HIDE ; HS_GLADE_GZAP_1
|
||||
db BRUNSWICK_GLADE, $02, HIDE ; HS_GLADE_GZAP_2
|
||||
db BRUNSWICK_GLADE, $03, HIDE ; HS_GLADE_GZAP_3
|
||||
db BRUNSWICK_GLADE, $04, HIDE ; HS_GLADE_ITEM1
|
||||
db BRUNSWICK_GLADE, $05, HIDE ; HS_GLADE_ITEM2
|
||||
db BRUNSWICK_GLADE, $06, HIDE ; HS_GLADE_ITEM3
|
||||
db BRUNSWICK_GLADE, $07, HIDE ; HS_GLADE_ITEM4
|
||||
db BRUNSWICK_GLADE, $05, HIDE ; HS_GLADE_GZAP_1
|
||||
db BRUNSWICK_GLADE, $06, HIDE ; HS_GLADE_GZAP_2
|
||||
db BRUNSWICK_GLADE, $07, HIDE ; HS_GLADE_GZAP_3
|
||||
db BRUNSWICK_GLADE, $08, SHOW ; HS_GLADE_ITEM1
|
||||
db BRUNSWICK_GLADE, $09, SHOW ; HS_GLADE_ITEM2
|
||||
db BRUNSWICK_GLADE, $0A, SHOW ; HS_GLADE_ITEM3
|
||||
db BRUNSWICK_GLADE, $0B, SHOW ; HS_GLADE_ITEM4
|
||||
CinnabarVolcanoFloorsHS:
|
||||
db CINNABAR_VOLCANO_FLOORS, $05, SHOW
|
||||
assert_table_length NUM_HS_OBJECTS
|
||||
|
|
|
|||
|
|
@ -235,8 +235,7 @@ MapHeaderBanks::
|
|||
db BANK(CeruleanBadgeHouse_h)
|
||||
db BANK(CinnabarVolcano_h) ; $01 UNUSED_MAP_E7
|
||||
db BANK(CinnabarVolcanoFloors_h)
|
||||
db BANK(SilphCo9F_h)
|
||||
db BANK(SilphCo10F_h)
|
||||
db BANK(Route10Gate_h)
|
||||
db BANK(SilphCo11F_h)
|
||||
db BANK(FarawayFerryDock_h)
|
||||
db BANK(GarnetCavern2F_h) ; was UNUSED_MAP_ED
|
||||
|
|
|
|||
|
|
@ -235,8 +235,7 @@ MapHeaderPointers::
|
|||
dw CeruleanBadgeHouse_h
|
||||
dw CinnabarVolcano_h ; UNUSED_MAP_E7
|
||||
dw CinnabarVolcanoFloors_h
|
||||
dw SilphCo9F_h
|
||||
dw SilphCo10F_h
|
||||
dw Route10Gate_h
|
||||
dw SilphCo11F_h
|
||||
dw FarawayFerryDock_h
|
||||
dw GarnetCavern2F_h ; UNUSED_MAP_ED, used silph 2f
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@ BrunswickGlade_Object:
|
|||
bg_event 14, 24, 12 ; Sign
|
||||
|
||||
def_object_events
|
||||
object_event 32, 25, SPRITE_BIRD, STAY, DOWN, 1
|
||||
object_event 20, 18, SPRITE_BIRD, STAY, RIGHT, 2
|
||||
object_event 9, 3, SPRITE_BIRD, STAY, UP, 3
|
||||
object_event 33, 11, SPRITE_POKE_BALL, STAY, NONE, 4, TM_THUNDER ; itemball1
|
||||
object_event 5, 21, SPRITE_POKE_BALL, STAY, NONE, 5, LEAF_STONE ; itemball2
|
||||
object_event 22, 15, SPRITE_POKE_BALL, STAY, NONE, 6, REVIVE ; itemball3
|
||||
object_event 9, 33, SPRITE_POKE_BALL, STAY, NONE, 7, HYPER_POTION ; itemball4
|
||||
object_event 16, 8, SPRITE_COOLTRAINER_F, STAY, DOWN, 8, OPP_COOLTRAINER_F, 6 ; Leaf reference Trainer
|
||||
object_event 7, 28, SPRITE_GENTLEMAN, STAY, UP, 9, OPP_GENTLEMAN, 6 ; Fuji reference Trainer
|
||||
object_event 15, 30, SPRITE_BEAUTY, STAY, RIGHT, 10, OPP_BEAUTY, 19 ; Ariana reference Trainer
|
||||
object_event 31, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, 11, OPP_COOLTRAINER_M, 13 ; Trace reference Trainer
|
||||
object_event 16, 8, SPRITE_COOLTRAINER_F, STAY, DOWN, 1, OPP_COOLTRAINER_F, 6 ; Leaf reference Trainer
|
||||
object_event 7, 28, SPRITE_GENTLEMAN, STAY, UP, 2, OPP_GENTLEMAN, 6 ; Fuji reference Trainer
|
||||
object_event 15, 30, SPRITE_BEAUTY, STAY, RIGHT, 3, OPP_BEAUTY, 19 ; Ariana reference Trainer
|
||||
object_event 31, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, 4, OPP_COOLTRAINER_M, 13 ; Trace reference Trainer
|
||||
object_event 32, 25, SPRITE_BIRD, STAY, DOWN, 5
|
||||
object_event 20, 18, SPRITE_BIRD, STAY, RIGHT, 6
|
||||
object_event 9, 3, SPRITE_BIRD, STAY, UP, 7
|
||||
object_event 33, 11, SPRITE_POKE_BALL, STAY, NONE, 8, TM_THUNDER ; itemball1
|
||||
object_event 5, 21, SPRITE_POKE_BALL, STAY, NONE, 9, LEAF_STONE ; itemball2
|
||||
object_event 22, 15, SPRITE_POKE_BALL, STAY, NONE, 10, REVIVE ; itemball3
|
||||
object_event 9, 33, SPRITE_POKE_BALL, STAY, NONE, 11, HYPER_POTION ; itemball4
|
||||
|
||||
def_warps_to BRUNSWICK_GLADE
|
||||
|
|
@ -13,7 +13,7 @@ CelesteHillCave_Object:
|
|||
def_bg_events
|
||||
|
||||
def_object_events
|
||||
object_event 22, 14, SPRITE_BEAUTY, STAY, DOWN, 1, OPP_BEAUTY, 17 ; Mina reference Trainer
|
||||
object_event 21, 5, SPRITE_COOLTRAINER_M, STAY, UP, 2, OPP_COOLTRAINER_M, 12 ; Primo reference Trainer
|
||||
object_event 22, 15, SPRITE_BEAUTY, STAY, DOWN, 1, OPP_BEAUTY, 17 ; Mina reference Trainer
|
||||
object_event 23, 4, SPRITE_COOLTRAINER_M, STAY, UP, 2, OPP_COOLTRAINER_M, 12 ; Primo reference Trainer
|
||||
|
||||
def_warps_to CELESTE_HILL_CAVE
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ CelesteHillOutside_Object:
|
|||
|
||||
def_object_events
|
||||
object_event 30, 16, SPRITE_BEAUTY, STAY, LEFT, 1, OPP_BEAUTY, 18 ; Selphy reference Trainer
|
||||
object_event 19, 31, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2, OPP_COOLTRAINER_M, 14 ; Will reference Trainer
|
||||
object_event 1, 16, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2, OPP_COOLTRAINER_M, 14 ; Will reference Trainer
|
||||
object_event 11, 16, SPRITE_GENTLEMAN, STAY, DOWN, 3, OPP_GENTLEMAN, 7; Fan Club Chairman reference Trainer
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -9,8 +9,6 @@ CinnabarLabTradeRoom_Object:
|
|||
|
||||
def_object_events
|
||||
object_event 3, 2, SPRITE_SUPER_NERD, STAY, DOWN, 1 ; person
|
||||
object_event 1, 4, SPRITE_GRAMPS, STAY, NONE, 2 ; person
|
||||
; object_event 5, 5, SPRITE_BEAUTY, STAY, UP, 3 ; person
|
||||
object_event 3, 5, SPRITE_GAMEBOY_KID, STAY, DOWN, 3 ; Trader
|
||||
object_event 3, 5, SPRITE_GAMEBOY_KID, STAY, DOWN, 2 ; Trader
|
||||
|
||||
def_warps_to CINNABAR_LAB_TRADE_ROOM
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ 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_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
|
||||
|
|
@ -14,6 +14,7 @@ RedsHouse2F_Object:
|
|||
;warp_event 5, 1, FARAWAY_ISLAND_INSIDE, 1 ; Test Mew
|
||||
;warp_event 5, 1, GIOVANNIS_ROOM, 1 ; Test spinner tiles
|
||||
;warp_event 5, 1, CINNABAR_LAB_FOSSIL_ROOM, 1 ; Test new tileset and fossils
|
||||
warp_event 5, 1, CERULEAN_CAVE_B1F, 1 ; Test Mewtwo theme
|
||||
|
||||
def_bg_events
|
||||
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@ RockTunnelB1F_Object:
|
|||
object_event 33, 5, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 11
|
||||
object_event 26, 30, SPRITE_SUPER_NERD, STAY, DOWN, 8, OPP_POKEMANIAC, 5
|
||||
object_event 22, 5, SPRITE_YOUNGSTER, STAY, DOWN, 9
|
||||
object_event 7, 23, SPRITE_FOSSIL, STAY, NONE, 10, HELIX_FOSSIL
|
||||
object_event 6, 23, SPRITE_FOSSIL, STAY, NONE, 11, DOME_FOSSIL
|
||||
object_event 8, 24, SPRITE_OLD_AMBER, STAY, NONE, 12, OLD_AMBER
|
||||
object_event 5, 24, SPRITE_FOSSIL, STAY, NONE, 13, WING_FOSSIL
|
||||
object_event 7, 25, SPRITE_FOSSIL, STAY, NONE, 10, HELIX_FOSSIL
|
||||
object_event 6, 25, SPRITE_FOSSIL, STAY, NONE, 11, DOME_FOSSIL
|
||||
object_event 4, 15, SPRITE_POKE_BALL, STAY, NONE, 12, BLK_AUGURITE
|
||||
object_event 5, 23, SPRITE_FOSSIL, STAY, NONE, 13, WING_FOSSIL
|
||||
|
||||
def_warps_to ROCK_TUNNEL_B1F
|
||||
|
|
|
|||
|
|
@ -7,6 +7,9 @@ Route10_Object:
|
|||
warp_event 8, 61, ROCK_TUNNEL_1F, 3
|
||||
warp_event 6, 47, POWER_PLANT, 1
|
||||
warp_event 6, 3, UNDERWATER_TUNNEL, 2
|
||||
warp_event 14, 61, ROUTE_10_GATE, 2
|
||||
warp_event 14, 57, ROUTE_10_GATE, 1
|
||||
warp_event 15, 57, ROUTE_10_GATE, 1
|
||||
|
||||
def_bg_events
|
||||
bg_event 7, 27, 7 ; Route10Text7
|
||||
|
|
@ -15,7 +18,7 @@ Route10_Object:
|
|||
bg_event 5, 49, 10 ; Route10Text10
|
||||
|
||||
def_object_events
|
||||
object_event 10, 52, SPRITE_SUPER_NERD, STAY, LEFT, 1, OPP_POKEMANIAC, 1
|
||||
object_event 10, 50, SPRITE_SUPER_NERD, STAY, LEFT, 1, OPP_POKEMANIAC, 1
|
||||
object_event 3, 65, SPRITE_HIKER, STAY, UP, 2, OPP_HIKER, 7
|
||||
object_event 14, 72, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_POKEMANIAC, 2
|
||||
object_event 7, 33, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7
|
||||
|
|
|
|||
14
data/maps/objects/Route10Gate.asm
Normal file
14
data/maps/objects/Route10Gate.asm
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
Route10Gate_Object:
|
||||
db $a ; border block
|
||||
|
||||
def_warp_events
|
||||
warp_event 5, 0, ROUTE_10, 7
|
||||
warp_event 4, 7, ROUTE_10, 6
|
||||
warp_event 5, 7, ROUTE_10, 6
|
||||
|
||||
def_bg_events
|
||||
|
||||
def_object_events
|
||||
object_event 3, 4, SPRITE_GRAMPS, STAY, LEFT, 1 ; person
|
||||
|
||||
def_warps_to ROUTE_10_GATE
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -234,8 +234,7 @@ MapSongBanks::
|
|||
db MUSIC_CITIES2, 0 ; CERULEAN_BADGE_HOUSE
|
||||
db MUSIC_DUNGEON3, 0 ; CINNABAR_VOLCANO
|
||||
db MUSIC_DUNGEON3, 0 ; CINNABAR_VOLCANO_FLOORS
|
||||
db MUSIC_SILPH_CO, 0 ; SILPH_CO_9F
|
||||
db MUSIC_SILPH_CO, 0 ; SILPH_CO_10F
|
||||
db MUSIC_CITIES1, 0 ; ROUTE_10_GATE
|
||||
db MUSIC_SILPH_CO, 0 ; SILPH_CO_11F
|
||||
db MUSIC_DUNGEON2, 0 ; FARAWAY_FERRY_DOCK
|
||||
db MUSIC_DUNGEON1, 0 ; GARNET_CAVERN_2F
|
||||
|
|
@ -248,7 +247,7 @@ MapSongBanks::
|
|||
db MUSIC_DUNGEON1, 0 ; BRUNOS_ROOM
|
||||
db MUSIC_POKEMON_TOWER, 0 ; AGATHAS_ROOM
|
||||
db MUSIC_DUNGEON3, 0 ; ROCK_TUNNEL_B1F
|
||||
db MUSIC_DUNGEON1, 0 ; GIOVANNIS_ROOM
|
||||
db MUSIC_GIOVANNIS_ROOM, 0 ; GIOVANNIS_ROOM
|
||||
db MUSIC_GYM, 0 ; BATTLE_TENT
|
||||
db MUSIC_VICTORY4, 0 ; MT_MOON_SQUARE
|
||||
db MUSIC_VICTORY4, 0 ; MT_MOON_SQUARE_HOUSE
|
||||
|
|
|
|||
|
|
@ -135,6 +135,7 @@ InternalMapEntries:
|
|||
internal_map NAME_RATERS_HOUSE, 14, 5, LavenderTownName
|
||||
internal_map CERULEAN_BADGE_HOUSE, 10, 2, CeruleanCityName
|
||||
internal_map CINNABAR_VOLCANO_FLOORS, 3, 14, CinnabarVolcanoName
|
||||
internal_map ROUTE_10_GATE, 14, 4, Route10Name
|
||||
internal_map SILPH_CO_11F, 10, 5, SilphCoName
|
||||
internal_map FARAWAY_FERRY_DOCK, 15, 15, FarawayIslandName
|
||||
internal_map GARNET_CAVERN_2F, 6, 10, GarnetCavernName
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ DefaultNamesGirl:
|
|||
db "NEW NAME"
|
||||
next "GREEN"
|
||||
next "LEAF"
|
||||
next "SEREN"
|
||||
next "ELAINE"
|
||||
db "@"
|
||||
|
||||
DefaultNamesRival:
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ DefaultNamesGirlList:
|
|||
db "NEW NAME@"
|
||||
db "GREEN@"
|
||||
db "LEAF@"
|
||||
db "SEREN@"
|
||||
db "ELAINE@"
|
||||
|
||||
DefaultNamesRivalList:
|
||||
db "NEW NAME@"
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
@ -1605,6 +1614,7 @@ VaporeonEvosMoves:
|
|||
db 44, MIST
|
||||
db 47, ACID_ARMOR
|
||||
db 52, HYDRO_PUMP
|
||||
db 0
|
||||
|
||||
MachopEvosMoves:
|
||||
; Evolutions
|
||||
|
|
@ -2390,7 +2400,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 +2408,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 +3333,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:
|
||||
|
|
|
|||
|
|
@ -524,7 +524,7 @@ _TM26Description::
|
|||
prompt
|
||||
|
||||
_TM27Description::
|
||||
text "A ground-type,"
|
||||
text "A GROUND-type,"
|
||||
next "one-hit KO attack."
|
||||
prompt
|
||||
|
||||
|
|
|
|||
|
|
@ -142,8 +142,7 @@ _AfterTrade2Text::
|
|||
text_ram wInGameTradeGiveMonName
|
||||
text " you"
|
||||
line "traded to me"
|
||||
|
||||
para "went and evolved!"
|
||||
cont "went and evolved!"
|
||||
done
|
||||
|
||||
_WannaTrade3Text::
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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, $4F
|
||||
|
||||
Club_Coll::
|
||||
coll_tiles $0f, $1a, $1f, $26, $28, $29, $2c, $2d, $2e, $2f, $41
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -75,7 +75,7 @@ YoungsterData:
|
|||
db 14, RATTATA, EKANS, ZUBAT, 0
|
||||
; Route 25
|
||||
db 15, RATTATA, SPEAROW, 0
|
||||
db 17, SLOWPOKE, 0 ; The famous "Slowpoke Kid" who was used for the Mew glitch. Our changes make em not work anymore, but keep em for the iconography.
|
||||
db 15, SHELLDER, SLOWPOKE, 0 ; The famous "Slowpoke Kid" who was used for the Mew glitch.
|
||||
db 14, EKANS, SANDSHREW, 0
|
||||
; SS Anne 1F Rooms
|
||||
db 21, NIDORINO, 0
|
||||
|
|
@ -542,10 +542,28 @@ 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
|
||||
db $FF, 66, ELECTRODE, 65, LAPRAS, 66, SCIZOR, 65, GENGAR, 68, PORYGONZ, 70, OMEGADGE, 0
|
||||
db $FF, 73, ELECTRODE, 72, LAPRAS, 73, SCIZOR, 72, GENGAR, 75, PORYGONZ, 78, OMEGADGE, 0
|
||||
; Lapras and Gengar are used here since Lapras is given by a Silph worker, and Gengar represents the Silph Scope.
|
||||
|
||||
; Poison- and Electric-type Pokemon
|
||||
|
|
@ -682,7 +700,7 @@ CooltrainerFData:
|
|||
; db 45, NIDORINA, NIDOQUEEN, 0
|
||||
; db 43, PERSIAN, NINETALES, RAICHU, 0
|
||||
; Brunswick Glade/grotto etc, whatever desired
|
||||
db 60, PIDGEOT, BLASTOISE, VENUSAUR, CLEFABLE, ESPEON, 0 ; Leaf
|
||||
db 60, BLASTOISE, VENUSAUR, CLEFABLE, ESPEON, 0 ; Leaf
|
||||
|
||||
; "Dignified" Pokemon associated with the privileged class.
|
||||
GentlemanData:
|
||||
|
|
@ -696,7 +714,7 @@ GentlemanData:
|
|||
; SS Anne 2F Rooms
|
||||
db 17, KOLTA, GROWLITHE, 0
|
||||
; Celeste Hill?
|
||||
db 56, NIDOKING, GOLDUCK, GUARDIA, PIDGEOT, DODRIO, BEEDRILL, 0 ; Fuji
|
||||
db 56, NIDOKING, GOLDUCK, GUARDIA, DODRIO, BEEDRILL, 0 ; Fuji
|
||||
db 57, FEAROW, RAPIDASH, GOROCHU, ALAKAZAM, SYLVEON, 0 ; Fan Club chairman
|
||||
|
||||
ChannelerData:
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -60,8 +60,8 @@ ProfOakData:
|
|||
db $FF, 61, TAUROS, 62, GYARADOS, 63, ARCANINE, 63, EXEGGUTOR, 64, NIDOKING, 65, TOTARTLE, 0
|
||||
db $FF, 61, TAUROS, 62, EXEGGUTOR, 63, GYARADOS, 63, ARCANINE, 64, NIDOKING, 65, VENUSAUR, 0
|
||||
db $FF, 61, TAUROS, 62, ARCANINE, 63, EXEGGUTOR, 63, GYARADOS, 64, NIDOKING, 65, CHARIZARD, 0
|
||||
db $FF, 61, TAUROS, 62, MAGNEZONE, 62, NIDOKING, 65, TOTARTLE, 65, CHARIZARD, 65, VENUSAUR, 0
|
||||
db $FF, 61, TAUROS, 62, MAGNEZONE, 62, NIDOKING, 65, CHARIZARD, 65, VENUSAUR, 65, TOTARTLE, 0
|
||||
db $FF, 61, TAUROS, 62, MAGNEZONE, 62, NIDOKING, 65, VENUSAUR, 65, CHARIZARD, 65, TOTARTLE, 0
|
||||
db $FF, 61, TAUROS, 62, MAGNEZONE, 62, NIDOKING, 65, VENUSAUR, 65, CHARIZARD, 65, TOTARTLE, 0
|
||||
; with Oak's teams, he uses his original unused team with Nidoking added on.
|
||||
; his teams weren't changed in Yellow, so what I've decided to do is give him all 3 starters that weren't chosen.
|
||||
; he should also use a Magnezone here, since his other team mirrors Blue's in many ways, and Magnezone avoids type overlap.
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
BrockData:
|
||||
db $FF, 11, GEODUDE, 12, DECILLA, 14, ONIX, 0 ; 0 badges
|
||||
db $FF, 19, GEODUDE, 18, KABUTO, 19, DECILLA, 21, ONIX, 0 ; 1
|
||||
db $FF, 22, GRAVELER, 21, OMANYTE, 21, KABUTO, 23, DECILLA, 24, ONIX, 0 ; 2
|
||||
db $FF, 22, GRAVELER, 21, OMANYTE, 21, KABUTO, 23, DECILLA, 25, ONIX, 0 ; 2
|
||||
db $FF, 29, GRAVELER, 28, OMANYTE, 28, KABUTO, 29, DECILLA, 31, ONIX, 0 ; 3
|
||||
db $FF, 38, GOLEM, 37, OMANYTE, 37, KABUTO, 38, DECILLA, 40, STEELIX, 0, ; 4
|
||||
db $FF, 41, GOLEM, 40, OMASTAR, 40, KABUTOPS, 41, GAWARHED, 43, STEELIX, 0 ; 5
|
||||
|
|
@ -27,7 +27,7 @@ LtSurgeData:
|
|||
db $FF, 11, VOLTORB, 12, PIKACHU, 14, GAOTORA, 0 ; 0 badges
|
||||
db $FF, 19, VOLTORB, 18, PIKACHU, 19, GAOTORA, 21, ELECTABUZZ, 0 ; 1
|
||||
db $FF, 22, VOLTORB, 21, GAOTORA, 21, MAGNETITE, 23, ELECTABUZZ, 25, RAICHU, 0 ; 2
|
||||
db $FF, 29, ELECTRODE, 28, GAOTORA, 28, MAGNETITE, 29, ELECTABUZZ, 31, RAICHU, 0 ; 3
|
||||
db $FF, 29, VOLTORB, 28, GAOTORA, 28, MAGNETITE, 29, ELECTABUZZ, 31, RAICHU, 0 ; 3
|
||||
db $FF, 38, ELECTRODE, 37, GOROTORA, 37, MAGNETON, 38, ELECTABUZZ, 40, GOROCHU, 0 ; 4
|
||||
db $FF, 41, ELECTRODE, 40, GOROTORA, 40, MAGNETON, 41, ELECTABUZZ, 43, GOROCHU, 0 ; 5
|
||||
db $FF, 45, ELECTRODE, 44, GOROTORA, 44, MAGNEZONE, 45, ELECTIVIRE, 47, GOROCHU, 0 ; 6
|
||||
|
|
@ -41,7 +41,7 @@ ErikaData:
|
|||
db $FF, 29, WEEPINBELL, 28, PARASECT, 28, CACTORMUS, 29, TANGELA, 31, BELLOSSOM, 0 ; 3
|
||||
db $FF, 38, VICTREEBEL, 37, PARASECT, 37, CACTORMUS, 38, TANGELA, 40, BELLOSSOM, 0 ; 4
|
||||
db $FF, 41, VICTREEBEL, 40, PARASECT, 40, CACTORMUS, 41, BELLOSSOM, 43, TANGROWTH, 0 ; 5
|
||||
db $FF, 45, VICTREEBEL, 44, PARASECT, 45, CACTORMUS, 45, BELLOSSOM, 47, TANGROWTH, 0 ; 6
|
||||
db $FF, 45, VICTREEBEL, 44, PARASECT, 44, CACTORMUS, 45, BELLOSSOM, 47, TANGROWTH, 0 ; 6
|
||||
db $FF, 47, VICTREEBEL, 46, PARASECT, 46, CACTORMUS, 48, BELLOSSOM, 48, LEAFEON, 50, TANGROWTH, 0 ; 7 (unused)
|
||||
db $FF, 62, BELLOSSOM, 62, TOEDSCRUEL, 61, ELECTRODE_H, 61, LEAFEON, 62, VENUSAUR, 65, TANGROWTH, 0 ; 8 (postgame)
|
||||
|
||||
|
|
@ -64,8 +64,8 @@ SabrinaData:
|
|||
db $FF, 38, ESPEON, 37, MR_MIME, 37, SLOWKING, 38, HYPNO, 40, ALAKAZAM, 0 ; 4
|
||||
db $FF, 41, ESPEON, 40, MR_MIME, 40, SLOWKING, 41, HYPNO, 43, ALAKAZAM, 0 ; 5
|
||||
db $FF, 45, ESPEON, 44, MR_MIME, 44, SLOWKING, 45, HYPNO, 47, ALAKAZAM, 0 ; 6
|
||||
db $FF, 47, ESPEON, 46, MR_MIME, 46, SLOWKING, 48, EXEGGUTOR, 48, HYPNO, 50, ALAKAZAM, 0 ; 7 (unused)
|
||||
db $FF, 62, EXEGGUTOR, 62, SLOWKING, 61, RAPIDASH_G, 62, HYPNO, 61, ESPEON, 65, ALAKAZAM, 0 ; 8 (postgame)
|
||||
db $FF, 47, ESPEON, 46, MR_MIME, 46, SLOWKING, 48, JYNX, 48, HYPNO, 50, ALAKAZAM, 0 ; 7 (unused)
|
||||
db $FF, 62, JYNX, 62, SLOWKING, 61, RAPIDASH_G, 62, HYPNO, 61, ESPEON, 65, ALAKAZAM, 0 ; 8 (postgame)
|
||||
|
||||
BlaineData:
|
||||
db $FF, 11, VULPIX, 12, GROWLITHE, 14, PONYTA, 0 ; 0 badges (unused)
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ SpecialTrainerMoves:
|
|||
|
||||
db YUJIROU, 4 ; Yujirou 3 badges
|
||||
db 2, 1, DIG
|
||||
db 3, 4, THUNDER_WAVE
|
||||
db 3, 4, SING
|
||||
db 4, 2, PECK
|
||||
db 4, 3, CUT
|
||||
db 5, 3, WRAP
|
||||
|
|
@ -33,8 +33,7 @@ SpecialTrainerMoves:
|
|||
db 1, 3, SCREECH
|
||||
db 1, 4, BODY_SLAM
|
||||
db 2, 4, DIG
|
||||
db 3, 1, SING
|
||||
db 3, 3, THUNDER_WAVE
|
||||
db 3, 3, SING
|
||||
db 4, 2, PECK
|
||||
db 4, 3, CUT
|
||||
db 5, 2, SWORDS_DANCE
|
||||
|
|
@ -136,7 +135,7 @@ SpecialTrainerMoves:
|
|||
db 0
|
||||
|
||||
db BROCK, 5 ; Brock 4 badges
|
||||
db 1, 3, MEGA_PUNCH
|
||||
db 1, 3, ROCK_SLIDE
|
||||
db 2, 1, SURF
|
||||
db 2, 4, HORN_ATTACK
|
||||
db 3, 2, BUBBLEBEAM
|
||||
|
|
@ -148,11 +147,12 @@ SpecialTrainerMoves:
|
|||
db 0
|
||||
|
||||
db BROCK, 6 ; Brock 5 badges
|
||||
db 1, 1, MEGA_PUNCH
|
||||
db 1, 3, ROCK_SLIDE
|
||||
db 1, 1, SELFDESTRUCT
|
||||
db 1, 2, ROCK_SLIDE
|
||||
db 2, 3, SURF
|
||||
db 2, 4, ICE_BEAM
|
||||
db 3, 1, SURF
|
||||
db 3, 2, ROCK_THROW
|
||||
db 3, 3, SWORDS_DANCE
|
||||
db 4, 1, SUBSTITUTE
|
||||
db 4, 4, DOUBLE_EDGE
|
||||
|
|
@ -162,11 +162,11 @@ SpecialTrainerMoves:
|
|||
db 0
|
||||
|
||||
db BROCK, 7 ; Brock 6 badges
|
||||
db 1, 1, MEGA_PUNCH
|
||||
db 1, 2, ROCK_SLIDE
|
||||
db 1, 1, SELFDESTRUCT
|
||||
db 2, 2, SURF
|
||||
db 2, 3, ICE_BEAM
|
||||
db 3, 1, SURF
|
||||
db 3, 2, ROCK_THROW
|
||||
db 3, 3, SWORDS_DANCE
|
||||
db 4, 1, ROCK_SLIDE
|
||||
db 4, 3, DOUBLE_EDGE
|
||||
|
|
@ -192,7 +192,12 @@ SpecialTrainerMoves:
|
|||
db 2, 2, THUNDER_WAVE
|
||||
db 0
|
||||
|
||||
db RIVAL1, 14 ; Cerulean City Rival w/Eevee
|
||||
db 1, 1, PECK
|
||||
db 0
|
||||
|
||||
db RIVAL1, 15 ; Cerulean City Rival w/Pikachu
|
||||
db 1, 1, PECK
|
||||
db 4, 1, THUNDERSHOCK
|
||||
db 0
|
||||
|
||||
|
|
@ -227,13 +232,19 @@ SpecialTrainerMoves:
|
|||
|
||||
db RIVAL2, 2 ; SS Anne Rival w/Ivysaur
|
||||
db 3, 1, THUNDER_WAVE
|
||||
db 4, 1, TACKLE
|
||||
db 0
|
||||
|
||||
db RIVAL2, 3 ; SS Anne Rival w/Charmeleon
|
||||
db 3, 1, THUNDER_WAVE
|
||||
db 0
|
||||
|
||||
db RIVAL2, 4 ; SS Anne Rival w/Eevee
|
||||
db 1, 1, PECK
|
||||
db 0
|
||||
|
||||
db RIVAL2, 5 ; SS Anne Rival w/Pikachu
|
||||
db 1, 1, PECK
|
||||
db 4, 2, THUNDERSHOCK
|
||||
db 0
|
||||
|
||||
|
|
@ -248,7 +259,7 @@ SpecialTrainerMoves:
|
|||
db 2, 1, THUNDERSHOCK
|
||||
db 3, 4, THUNDER_WAVE
|
||||
db 4, 3, THUNDERBOLT
|
||||
db 5, 4, THUNDER_WAVE
|
||||
db 4, 4, THUNDER_WAVE
|
||||
db 0
|
||||
|
||||
db LT_SURGE, 3 ; Surge 2 badges
|
||||
|
|
@ -316,6 +327,7 @@ SpecialTrainerMoves:
|
|||
|
||||
db RIVAL2, 6 ; Pokemon Tower Rival w/Wartortle
|
||||
db 1, 4, MIMIC
|
||||
db 2, 1, BITE
|
||||
db 3, 3, LEECH_SEED
|
||||
db 3, 4, CONFUSION
|
||||
db 4, 1, THUNDER_WAVE
|
||||
|
|
@ -325,8 +337,9 @@ SpecialTrainerMoves:
|
|||
db 1, 4, MIMIC
|
||||
db 2, 3, BUBBLEBEAM
|
||||
db 2, 4, BIDE
|
||||
db 3, 1, BITE
|
||||
db 4, 1, THUNDER_WAVE
|
||||
db 5, 1, CUT
|
||||
db 5, 3, CUT
|
||||
db 0
|
||||
|
||||
db RIVAL2, 8 ; Pokemon Tower Rival w/Charmeleon
|
||||
|
|
@ -336,7 +349,7 @@ SpecialTrainerMoves:
|
|||
db 3, 3, BUBBLEBEAM
|
||||
db 3, 4, BIDE
|
||||
db 4, 1, THUNDER_WAVE
|
||||
db 5, 4, CUT
|
||||
db 5, 3, CUT
|
||||
db 0
|
||||
|
||||
db RIVAL2, 9 ; Pokemon Tower Rival w/Eevee
|
||||
|
|
@ -386,7 +399,7 @@ SpecialTrainerMoves:
|
|||
db ERIKA, 3 ; Erika 2 badges
|
||||
db 1, 2, GROWTH
|
||||
db 1, 4, VINE_WHIP
|
||||
db 1, 1, CUT
|
||||
db 2, 1, CUT
|
||||
db 4, 2, CUT
|
||||
db 5, 3, MEGA_DRAIN
|
||||
db 0
|
||||
|
|
@ -430,8 +443,8 @@ SpecialTrainerMoves:
|
|||
db ERIKA, 7 ; Erika 6 badges
|
||||
db 1, 3, ACID
|
||||
db 2, 2, MEGA_DRAIN
|
||||
db 3, 1, EARTHQUAKE
|
||||
db 3, 3, VINE_WHIP
|
||||
db 3, 2, EARTHQUAKE
|
||||
db 3, 4, VINE_WHIP
|
||||
db 4, 2, MEGA_DRAIN
|
||||
db 4, 4, ACID
|
||||
db 5, 1, BIND
|
||||
|
|
@ -455,7 +468,7 @@ SpecialTrainerMoves:
|
|||
db KOGA, 3 ; Koga 2 badges
|
||||
db 2, 4, WATER_GUN
|
||||
db 3, 2, POUND
|
||||
db 4, 1, TOXIC
|
||||
db 4, 2, TOXIC
|
||||
db 5, 2, TOXIC
|
||||
db 5, 3, SCREECH
|
||||
db 0
|
||||
|
|
@ -467,7 +480,7 @@ SpecialTrainerMoves:
|
|||
db 2, 4, ACID
|
||||
db 3, 1, BODY_SLAM
|
||||
db 3, 2, DISABLE
|
||||
db 4, 4, TOXIC
|
||||
db 4, 1, TOXIC
|
||||
db 5, 1, WING_ATTACK
|
||||
db 5, 2, TOXIC
|
||||
db 5, 4, SCREECH
|
||||
|
|
@ -492,27 +505,27 @@ SpecialTrainerMoves:
|
|||
db 1, 3, MEGA_DRAIN
|
||||
db 2, 1, TOXIC
|
||||
db 2, 2, SURF
|
||||
db 2, 4, WRAP
|
||||
db 2, 3, WRAP
|
||||
db 3, 3, BODY_SLAM
|
||||
db 3, 4, TOXIC
|
||||
db 4, 1, TOXIC
|
||||
db 4, 4, TOXIC
|
||||
db 5, 1, TOXIC
|
||||
db 5, 2, FLY
|
||||
db 0
|
||||
|
||||
db BLACKBELT, 2 ; Koichi 1 badge
|
||||
db KOICHI, 2 ; Koichi 1 badge
|
||||
db 2, 3, TACKLE
|
||||
db 3, 4, TACKLE
|
||||
db 4, 3, TACKLE
|
||||
db 0
|
||||
|
||||
db BLACKBELT, 3 ; Koichi 2 badges
|
||||
db KOICHI, 3 ; Koichi 2 badges
|
||||
db 3, 3, TACKLE
|
||||
db 4, 4, TACKLE
|
||||
db 5, 3, TACKLE
|
||||
db 0
|
||||
|
||||
db BLACKBELT, 4 ; Koichi 3 badges
|
||||
db KOICHI, 4 ; Koichi 3 badges
|
||||
db 2, 3, LEER
|
||||
db 2, 4, UPPERCUT
|
||||
db 3, 3, MEGA_KICK
|
||||
|
|
@ -522,7 +535,7 @@ SpecialTrainerMoves:
|
|||
db 5, 4, DIG
|
||||
db 0
|
||||
|
||||
db BLACKBELT, 5 ; Koichi 4 badges
|
||||
db KOICHI, 5 ; Koichi 4 badges
|
||||
db 1, 4, ROCK_SLIDE
|
||||
db 2, 2, LEER
|
||||
db 2, 3, DIG
|
||||
|
|
@ -532,7 +545,7 @@ SpecialTrainerMoves:
|
|||
db 5, 2, DIG
|
||||
db 0
|
||||
|
||||
db BLACKBELT, 6 ; Koichi 5 badges
|
||||
db KOICHI, 6 ; Koichi 5 badges
|
||||
db 1, 4, ROCK_SLIDE
|
||||
db 2, 1, LOW_KICK
|
||||
db 2, 2, LEER
|
||||
|
|
@ -542,7 +555,7 @@ SpecialTrainerMoves:
|
|||
db 5, 2, DIG
|
||||
db 0
|
||||
|
||||
db BLACKBELT, 7 ; Koichi 6 badges
|
||||
db KOICHI, 7 ; Koichi 6 badges
|
||||
db 1, 3, ROCK_SLIDE
|
||||
db 1, 4, EARTHQUAKE
|
||||
db 2, 1, LOW_KICK
|
||||
|
|
@ -554,15 +567,15 @@ SpecialTrainerMoves:
|
|||
db 5, 2, DIG
|
||||
db 0
|
||||
|
||||
db BLACKBELT, 8 ; Koichi 7 badges
|
||||
db KOICHI, 8 ; Koichi 7 badges
|
||||
db 1, 1, ROCK_SLIDE
|
||||
db 1, 2, LOW_KICK
|
||||
db 1, 3, EARTHQUAKE
|
||||
db 2, 1, PIN_MISSILE
|
||||
db 2, 2, UPPERCUT
|
||||
db 2, 3, PIN_MISSILE
|
||||
db 2, 4, UPPERCUT
|
||||
db 3, 1, LOW_KICK
|
||||
db 3, 2, ROCK_SLIDE
|
||||
db 3, 3, DIG
|
||||
db 3, 4, DIG
|
||||
db 4, 1, MIMIC
|
||||
db 4, 2, MEGA_KICK
|
||||
db 4, 3, MEDITATE
|
||||
|
|
@ -571,12 +584,12 @@ SpecialTrainerMoves:
|
|||
db 6, 1, DIG
|
||||
db 0
|
||||
|
||||
db BLACKBELT, 9 ; Koichi 8 badges
|
||||
db KOICHI, 9 ; Koichi 8 badges
|
||||
db 1, 1, ROCK_SLIDE
|
||||
db 1, 2, EARTHQUAKE
|
||||
db 1, 3, SUBMISSION
|
||||
db 2, 1, PIN_MISSILE
|
||||
db 2, 2, UPPERCUT
|
||||
db 2, 2, PIN_MISSILE
|
||||
db 2, 3, MEGA_PUNCH
|
||||
db 3, 1, LOW_KICK
|
||||
db 3, 3, ROCK_SLIDE
|
||||
db 3, 4, DIG
|
||||
|
|
@ -593,7 +606,6 @@ SpecialTrainerMoves:
|
|||
db 4, 2, BARRAGE
|
||||
db 4, 4, CONFUSION
|
||||
db 5, 2, THUNDER_WAVE
|
||||
db 6, 1, BODY_SLAM
|
||||
db 6, 2, MEGA_DRAIN
|
||||
db 6, 3, SURF
|
||||
db 0
|
||||
|
|
@ -604,8 +616,7 @@ SpecialTrainerMoves:
|
|||
db 3, 1, SURF
|
||||
db 4, 1, DIG
|
||||
db 5, 2, THUNDER_WAVE
|
||||
db 6, 2, BODY_SLAM
|
||||
db 6, 3, GROWTH
|
||||
db 6, 3, LEECH_SEED
|
||||
db 0
|
||||
|
||||
db RIVAL2, 13 ; Silph Co. Rival w/Charizard
|
||||
|
|
@ -615,9 +626,8 @@ SpecialTrainerMoves:
|
|||
db 3, 4, CONFUSION
|
||||
db 4, 1, SURF
|
||||
db 5, 2, THUNDER_WAVE
|
||||
db 6, 1, FLY
|
||||
db 6, 2, BODY_SLAM
|
||||
db 6, 3, FLAMETHROWER
|
||||
db 6, 3, SEISMIC_TOSS
|
||||
db 6, 4, FLY
|
||||
db 0
|
||||
|
||||
db RIVAL2, 14 ; Silph Co. Rival w/Umbreon
|
||||
|
|
@ -635,7 +645,7 @@ SpecialTrainerMoves:
|
|||
db RIVAL2, 15 ; Silph Co. Rival w/Raichu
|
||||
db 1, 3, DIG
|
||||
db 1, 4, SWORDS_DANCE
|
||||
db 2, 1, BARRAGE
|
||||
db 2, 2, BARRAGE
|
||||
db 2, 4, CONFUSION
|
||||
db 3, 1, CONFUSE_RAY
|
||||
db 3, 4, FLAMETHROWER
|
||||
|
|
@ -666,14 +676,14 @@ SpecialTrainerMoves:
|
|||
db 0
|
||||
|
||||
db SABRINA, 2 ; Sabrina 1 badge
|
||||
db 1, 3, WATER_GUN
|
||||
db 1, 4, WATER_GUN
|
||||
db 3, 1, PSYWAVE
|
||||
db 4, 3, PSYWAVE
|
||||
db 4, 4, REFLECT
|
||||
db 0
|
||||
|
||||
db SABRINA, 3 ; Sabrina 2 badges
|
||||
db 1, 4, WATER_GUN
|
||||
db 1, 2, WATER_GUN
|
||||
db 3, 3, LEECH_SEED
|
||||
db 3, 4, CONFUSION
|
||||
db 4, 1, PSYWAVE
|
||||
|
|
@ -682,6 +692,7 @@ SpecialTrainerMoves:
|
|||
db 0
|
||||
|
||||
db SABRINA, 4 ; Sabrina 3 badges
|
||||
db 1, 1, CONFUSION
|
||||
db 1, 4, WATER_GUN
|
||||
db 2, 3, PSYWAVE
|
||||
db 2, 4, REFLECT
|
||||
|
|
@ -725,7 +736,7 @@ SpecialTrainerMoves:
|
|||
|
||||
db BLAINE, 3 ; Blaine 2 badges
|
||||
db 2, 3, EMBER
|
||||
db 3, 4, DIG
|
||||
db 3, 2, DIG
|
||||
db 4, 1, CUT
|
||||
db 5, 2, LEER
|
||||
db 5, 3, SMOG
|
||||
|
|
@ -735,9 +746,9 @@ SpecialTrainerMoves:
|
|||
db BLAINE, 4 ; Blaine 3 badges
|
||||
db 1, 1, EMBER
|
||||
db 2, 2, EMBER
|
||||
db 3, 1, BITE
|
||||
db 3, 2, DIG
|
||||
db 4, 1, CUT
|
||||
db 4, 4, GROWL
|
||||
db 4, 2, EMBER
|
||||
db 5, 2, LEER
|
||||
db 5, 3, SMOG
|
||||
db 5, 4, FIRE_PUNCH
|
||||
|
|
@ -794,8 +805,10 @@ SpecialTrainerMoves:
|
|||
db 3, 3, SKULL_BASH
|
||||
db 3, 4, BONEMERANG
|
||||
db 4, 1, ROCK_SLIDE
|
||||
db 4, 2, BODY_SLAM
|
||||
db 4, 3, DOUBLE_KICK
|
||||
db 5, 1, THUNDERBOLT
|
||||
db 5, 2, THRASH
|
||||
db 5, 3, DOUBLE_KICK
|
||||
db 6, 1, FISSURE
|
||||
db 6, 3, STOMP
|
||||
|
|
@ -828,9 +841,9 @@ SpecialTrainerMoves:
|
|||
db 4, 1, FIRE_BLAST
|
||||
db 4, 2, DIG
|
||||
db 4, 3, AGILITY
|
||||
db 4, 4, DOUBLE_EDGE
|
||||
db 5, 1, THUNDER_WAVE
|
||||
db 6, 1, BODY_SLAM
|
||||
db 6, 2, LEECH_SEED
|
||||
db 6, 3, LEECH_SEED
|
||||
db 0
|
||||
|
||||
db RIVAL2, 18 ; Route 22 Rival w/Charizard
|
||||
|
|
@ -844,7 +857,7 @@ SpecialTrainerMoves:
|
|||
db 4, 3, SURF
|
||||
db 5, 1, THUNDER_WAVE
|
||||
db 6, 1, FLY
|
||||
db 6, 2, BODY_SLAM
|
||||
db 6, 3, FIRE_SPIN
|
||||
db 0
|
||||
|
||||
db RIVAL2, 19 ; Route 22 Rival w/Umbreon
|
||||
|
|
@ -854,7 +867,7 @@ SpecialTrainerMoves:
|
|||
db 2, 2, HYPNOSIS
|
||||
db 2, 3, PSYCHIC_M
|
||||
db 3, 1, THUNDERBOLT
|
||||
db 3, 2, DOUBLE_TEAM
|
||||
db 3, 4, DOUBLE_TEAM
|
||||
db 4, 1, CONFUSE_RAY
|
||||
db 4, 2, REFLECT
|
||||
db 4, 4, FIRE_BLAST
|
||||
|
|
@ -863,7 +876,7 @@ SpecialTrainerMoves:
|
|||
db 6, 3, QUICK_ATTACK
|
||||
db 0
|
||||
|
||||
db RIVAL2, 20 ; Route 22 Rival w/Raichu
|
||||
db RIVAL2, 20 ; Route 22 Rival w/Gorochu
|
||||
db 1, 1, SAND_ATTACK
|
||||
db 1, 2, SLASH
|
||||
db 1, 4, SWORDS_DANCE
|
||||
|
|
@ -902,7 +915,7 @@ SpecialTrainerMoves:
|
|||
db BRUNO, 1
|
||||
db 1, 3, MEDITATE
|
||||
db 2, 1, EARTHQUAKE
|
||||
db 2, 2, ROCK_SLIDE
|
||||
db 2, 3, ROCK_SLIDE
|
||||
db 2, 4, EXPLOSION
|
||||
db 3, 1, THUNDERBOLT
|
||||
db 4, 1, SUBMISSION
|
||||
|
|
@ -914,15 +927,14 @@ SpecialTrainerMoves:
|
|||
db 0
|
||||
|
||||
db AGATHA, 1
|
||||
db 1, 1, LOW_KICK
|
||||
db 1, 1, MEGA_PUNCH
|
||||
db 1, 2, ROCK_SLIDE
|
||||
db 1, 3, MEGA_PUNCH
|
||||
db 2, 1, MEGA_DRAIN
|
||||
db 2, 3, CONFUSE_RAY
|
||||
db 2, 4, FLY
|
||||
db 3, 1, THUNDERBOLT
|
||||
db 3, 2, EXPLOSION
|
||||
db 4, 1, WRAP
|
||||
db 4, 3, WRAP
|
||||
db 4, 4, EARTHQUAKE
|
||||
db 5, 1, REST
|
||||
db 5, 3, TOXIC
|
||||
|
|
@ -962,8 +974,9 @@ SpecialTrainerMoves:
|
|||
db 5, 1, PSYCHIC_M
|
||||
db 5, 2, SLEEP_POWDER
|
||||
db 5, 4, SOLARBEAM
|
||||
db 6, 2, BLIZZARD
|
||||
db 6, 1, BLIZZARD
|
||||
db 6, 3, BODY_SLAM
|
||||
db 6, 4, PETAL_DANCE
|
||||
db 0
|
||||
|
||||
db RIVAL3, 2 ; Champion Rival w/Venusaur
|
||||
|
|
@ -980,6 +993,7 @@ SpecialTrainerMoves:
|
|||
db 5, 4, DOUBLE_EDGE
|
||||
db 6, 1, SOLARBEAM
|
||||
db 6, 3, BODY_SLAM
|
||||
db 6, 4, SLEEP_POWDER
|
||||
db 0
|
||||
|
||||
db RIVAL3, 3 ; Champion Rival w/Charizard
|
||||
|
|
@ -1015,7 +1029,7 @@ SpecialTrainerMoves:
|
|||
db 6, 3, QUICK_ATTACK
|
||||
db 0
|
||||
|
||||
db RIVAL3, 5 ; Champion Rival w/Raichu
|
||||
db RIVAL3, 5 ; Champion Rival w/Gorochu
|
||||
db 1, 1, SAND_ATTACK
|
||||
db 1, 2, SLASH
|
||||
db 1, 4, SWORDS_DANCE
|
||||
|
|
@ -1035,4 +1049,526 @@ SpecialTrainerMoves:
|
|||
db 6, 4, SURF
|
||||
db 0
|
||||
|
||||
db PROF_OAK, 1 ; Totartle Team
|
||||
db 1, 1, HYPER_BEAM
|
||||
db 1, 3, EARTHQUAKE
|
||||
db 1, 4, BLIZZARD
|
||||
db 2, 1, BLIZZARD
|
||||
db 2, 2, THUNDERBOLT
|
||||
db 3, 1, FIRE_BLAST
|
||||
db 3, 2, DIG
|
||||
db 3, 3, AGILITY
|
||||
db 3, 4, BODY_SLAM
|
||||
db 4, 1, PSYCHIC_M
|
||||
db 4, 2, SLEEP_POWDER
|
||||
db 4, 3, EXPLOSION
|
||||
db 4, 4, MEGA_DRAIN
|
||||
db 5, 1, BLIZZARD
|
||||
db 5, 3, THUNDERBOLT
|
||||
db 5, 4, THRASH
|
||||
db 6, 1, BLIZZARD
|
||||
db 6, 3, BODY_SLAM
|
||||
db 6, 4, SOLARBEAM
|
||||
db 0
|
||||
|
||||
db PROF_OAK, 2 ; Venusaur Team
|
||||
db 1, 1, HYPER_BEAM
|
||||
db 1, 3, EARTHQUAKE
|
||||
db 1, 4, BLIZZARD
|
||||
db 2, 1, PSYCHIC_M
|
||||
db 2, 2, SLEEP_POWDER
|
||||
db 2, 3, EXPLOSION
|
||||
db 2, 4, MEGA_DRAIN
|
||||
db 3, 1, BLIZZARD
|
||||
db 3, 2, THUNDERBOLT
|
||||
db 4, 1, FIRE_BLAST
|
||||
db 4, 2, DIG
|
||||
db 4, 3, AGILITY
|
||||
db 4, 4, BODY_SLAM
|
||||
db 5, 1, BLIZZARD
|
||||
db 5, 3, THUNDERBOLT
|
||||
db 5, 4, THRASH
|
||||
db 6, 1, SWORDS_DANCE
|
||||
db 6, 2, RAZOR_LEAF
|
||||
db 6, 3, HYPER_BEAM
|
||||
db 6, 4, SLEEP_POWDER
|
||||
db 0
|
||||
|
||||
db PROF_OAK, 3 ; Charizard Team
|
||||
db 1, 1, HYPER_BEAM
|
||||
db 1, 3, EARTHQUAKE
|
||||
db 1, 4, BLIZZARD
|
||||
db 2, 1, FIRE_BLAST
|
||||
db 2, 2, DIG
|
||||
db 2, 3, AGILITY
|
||||
db 2, 4, BODY_SLAM
|
||||
db 3, 1, PSYCHIC_M
|
||||
db 3, 2, SLEEP_POWDER
|
||||
db 3, 3, EXPLOSION
|
||||
db 3, 4, MEGA_DRAIN
|
||||
db 4, 1, BLIZZARD
|
||||
db 4, 2, THUNDERBOLT
|
||||
db 5, 1, BLIZZARD
|
||||
db 5, 3, THUNDERBOLT
|
||||
db 5, 4, THRASH
|
||||
db 6, 1, SWORDS_DANCE
|
||||
db 6, 3, FIRE_BLAST
|
||||
db 6, 4, EARTHQUAKE
|
||||
db 0
|
||||
|
||||
db PROF_OAK, 4 ; Pika/Vee Team 1
|
||||
db 1, 1, HYPER_BEAM
|
||||
db 1, 3, EARTHQUAKE
|
||||
db 1, 4, BLIZZARD
|
||||
db 2, 1, THUNDER_WAVE
|
||||
db 2, 3, THUNDERBOLT
|
||||
db 3, 1, BLIZZARD
|
||||
db 3, 3, THUNDERBOLT
|
||||
db 3, 4, THRASH
|
||||
db 4, 1, SWORDS_DANCE
|
||||
db 4, 2, RAZOR_LEAF
|
||||
db 4, 3, HYPER_BEAM
|
||||
db 4, 4, SLEEP_POWDER
|
||||
db 5, 1, SWORDS_DANCE
|
||||
db 5, 3, FIRE_BLAST
|
||||
db 5, 4, EARTHQUAKE
|
||||
db 6, 1, BLIZZARD
|
||||
db 6, 3, BODY_SLAM
|
||||
db 6, 4, SOLARBEAM
|
||||
db 0
|
||||
|
||||
db PROF_OAK, 5 ; Pika/Vee Team 2
|
||||
db 1, 1, HYPER_BEAM
|
||||
db 1, 3, EARTHQUAKE
|
||||
db 1, 4, BLIZZARD
|
||||
db 2, 1, THUNDER_WAVE
|
||||
db 2, 3, THUNDERBOLT
|
||||
db 3, 1, BLIZZARD
|
||||
db 3, 3, THUNDERBOLT
|
||||
db 3, 4, THRASH
|
||||
db 4, 1, SWORDS_DANCE
|
||||
db 4, 2, RAZOR_LEAF
|
||||
db 4, 3, HYPER_BEAM
|
||||
db 4, 4, SLEEP_POWDER
|
||||
db 5, 1, SWORDS_DANCE
|
||||
db 5, 3, FIRE_BLAST
|
||||
db 5, 4, EARTHQUAKE
|
||||
db 6, 1, BLIZZARD
|
||||
db 6, 3, BODY_SLAM
|
||||
db 6, 4, SOLARBEAM
|
||||
db 0
|
||||
|
||||
db YUJIROU, 10 ; Yujirou postgame
|
||||
db 1, 1, BUBBLEBEAM
|
||||
db 1, 2, THUNDERBOLT
|
||||
db 1, 4, HYPNOSIS
|
||||
db 2, 1, FIRE_BLAST
|
||||
db 2, 3, HYPER_BEAM
|
||||
db 2, 4, FISSURE
|
||||
db 3, 1, REFLECT
|
||||
db 3, 2, ICE_BEAM
|
||||
db 3, 3, PSYCHIC_M
|
||||
db 3, 4, SOFTBOILED
|
||||
db 5, 2, LOVELY_KISS
|
||||
db 5, 3, BLIZZARD
|
||||
db 5, 4, AMNESIA
|
||||
db 6, 1, WRAP
|
||||
db 6, 2, SWORDS_DANCE
|
||||
db 6, 3, HYPER_BEAM
|
||||
db 6, 4, EARTHQUAKE
|
||||
db 0
|
||||
|
||||
db KOICHI, 10 ; Koichi postgame
|
||||
db 1, 1, ROCK_SLIDE
|
||||
db 1, 2, EARTHQUAKE
|
||||
db 1, 4, BODY_SLAM
|
||||
db 2, 2, ROCK_SLIDE
|
||||
db 2, 3, SEISMIC_TOSS
|
||||
db 3, 1, EARTHQUAKE
|
||||
db 3, 2, HYPER_BEAM
|
||||
db 3, 3, BODY_SLAM
|
||||
db 4, 1, COUNTER
|
||||
db 4, 2, SEISMIC_TOSS
|
||||
db 4, 4, BODY_SLAM
|
||||
db 5, 2, AGILITY
|
||||
db 5, 3, HI_JUMP_KICK
|
||||
db 6, 3, HI_JUMP_KICK
|
||||
db 6, 4, DIG
|
||||
db 0
|
||||
|
||||
db BROCK, 9 ; Brock postgame
|
||||
db 1, 3, EARTHQUAKE
|
||||
db 1, 4, BODY_SLAM
|
||||
db 2, 1, SURF
|
||||
db 2, 2, SUBSTITUTE
|
||||
db 2, 3, FIRE_BLAST
|
||||
db 3, 3, FIRE_BLAST
|
||||
db 3, 4, FIRE_SPIN
|
||||
db 4, 1, BODY_SLAM
|
||||
db 4, 2, REST
|
||||
db 4, 3, SURF
|
||||
db 4, 4, ICE_BEAM
|
||||
db 5, 1, SURF
|
||||
db 5, 2, SWORDS_DANCE
|
||||
db 5, 3, HYPER_BEAM
|
||||
db 5, 4, DIG
|
||||
db 6, 1, ROCK_SLIDE
|
||||
db 6, 3, BIND
|
||||
db 6, 4, EARTHQUAKE
|
||||
db 0
|
||||
|
||||
db MISTY, 9 ; Misty postgame
|
||||
db 1, 1, REST
|
||||
db 1, 2, ICE_BEAM
|
||||
db 2, 1, AMNESIA
|
||||
db 2, 2, GLARE
|
||||
db 2, 3, PSYCHIC_M
|
||||
db 2, 4, SURF
|
||||
db 3, 1, BODY_SLAM
|
||||
db 3, 2, EARTHQUAKE
|
||||
db 3, 3, SUBMISSION
|
||||
db 4, 1, SURF
|
||||
db 4, 2, GROWTH
|
||||
db 4, 4, BLIZZARD
|
||||
db 5, 1, COUNTER
|
||||
db 5, 2, BLIZZARD
|
||||
db 5, 3, MEGA_DRAIN
|
||||
db 5, 4, SURF
|
||||
db 6, 1, RECOVER
|
||||
db 6, 2, SURF
|
||||
db 6, 3, PSYCHIC_M
|
||||
db 6, 4, THUNDERBOLT
|
||||
db 0
|
||||
|
||||
db LT_SURGE, 9 ; Surge postgame
|
||||
db 1, 1, THUNDER_WAVE
|
||||
db 1, 2, EARTHQUAKE
|
||||
db 1, 4, HYPER_BEAM
|
||||
db 2, 1, THUNDER_WAVE
|
||||
db 2, 3, THUNDERBOLT
|
||||
db 3, 3, EARTHQUAKE
|
||||
db 3, 4, THUNDER_WAVE
|
||||
db 4, 1, THUNDERBOLT
|
||||
db 4, 2, ROLLING_KICK
|
||||
db 4, 3, ICE_PUNCH
|
||||
db 4, 4, PSYCHIC_M
|
||||
db 5, 3, THUNDERBOLT
|
||||
db 5, 4, GROWTH
|
||||
db 6, 1, THUNDERBOLT
|
||||
db 6, 2, BODY_SLAM
|
||||
db 6, 3, FLY
|
||||
db 6, 4, SURF
|
||||
db 0
|
||||
|
||||
db ERIKA, 9 ; Erika postgame
|
||||
db 1, 1, REST
|
||||
db 1, 2, RAZOR_LEAF
|
||||
db 1, 3, ACID
|
||||
db 2, 1, SWORDS_DANCE
|
||||
db 2, 2, EARTHQUAKE
|
||||
db 2, 3, WRAP
|
||||
db 3, 1, MEGA_DRAIN
|
||||
db 3, 2, THUNDERBOLT
|
||||
db 3, 3, THUNDER_WAVE
|
||||
db 4, 1, HYPER_BEAM
|
||||
db 4, 3, BODY_SLAM
|
||||
db 4, 4, SWORDS_DANCE
|
||||
db 5, 1, SOLARBEAM
|
||||
db 5, 3, BODY_SLAM
|
||||
db 5, 4, SLEEP_POWDER
|
||||
db 6, 2, MEGA_DRAIN
|
||||
db 6, 3, ROCK_SLIDE
|
||||
db 6, 4, AMNESIA
|
||||
db 0
|
||||
|
||||
db KOGA, 9 ; Koga postgame
|
||||
db 1, 2, MEGA_DRAIN
|
||||
db 2, 1, RAZOR_LEAF
|
||||
db 2, 2, ACID
|
||||
db 2, 4, WRAP
|
||||
db 3, 1, SURF
|
||||
db 4, 1, THUNDERBOLT
|
||||
db 4, 2, ICE_PUNCH
|
||||
db 4, 3, SLUDGE
|
||||
db 4, 4, EXPLOSION
|
||||
db 5, 1, THUNDERBOLT
|
||||
db 5, 2, FIRE_BLAST
|
||||
db 5, 3, SLUDGE
|
||||
db 6, 1, MEGA_DRAIN
|
||||
db 6, 3, CONFUSE_RAY
|
||||
db 6, 4, FLY
|
||||
db 0
|
||||
|
||||
db SABRINA, 9 ; Sabrina postgame
|
||||
db 1, 1, LOVELY_KISS
|
||||
db 1, 2, BODY_SLAM
|
||||
db 1, 3, PSYCHIC_M
|
||||
db 2, 1, EARTHQUAKE
|
||||
db 2, 2, SURF
|
||||
db 3, 1, HYPNOSIS
|
||||
db 3, 3, DOUBLE_KICK
|
||||
db 4, 1, THUNDERPUNCH
|
||||
db 4, 2, ICE_PUNCH
|
||||
db 4, 4, AMNESIA
|
||||
db 5, 1, HYPER_BEAM
|
||||
db 5, 2, REFLECT
|
||||
db 5, 3, GROWTH
|
||||
db 6, 1, FIRE_PUNCH
|
||||
db 6, 4, THUNDERPUNCH
|
||||
db 0
|
||||
|
||||
db BLAINE, 9 ; Blaine postgame
|
||||
db 1, 1, HYPNOSIS
|
||||
db 1, 2, FIRE_SPIN
|
||||
db 1, 3, DOUBLE_KICK
|
||||
db 1, 4, FIRE_BLAST
|
||||
db 2, 1, FIRE_BLAST
|
||||
db 2, 2, DIG
|
||||
db 2, 3, AGILITY
|
||||
db 2, 4, BODY_SLAM
|
||||
db 3, 1, BODY_SLAM
|
||||
db 3, 2, EARTHQUAKE
|
||||
db 3, 3, SUBMISSION
|
||||
db 3, 4, FIRE_BLAST
|
||||
db 4, 1, GROWTH
|
||||
db 4, 2, HYPER_BEAM
|
||||
db 4, 3, FIRE_BLAST
|
||||
db 5, 1, FLY
|
||||
db 5, 3, FIRE_BLAST
|
||||
db 5, 4, EARTHQUAKE
|
||||
db 6, 1, FIRE_BLAST
|
||||
db 6, 2, THUNDERBOLT
|
||||
db 6, 3, EARTHQUAKE
|
||||
db 6, 4, CONFUSE_RAY
|
||||
db 0
|
||||
|
||||
db CHIEF, 1
|
||||
db 1, 1, THUNDERBOLT
|
||||
db 1, 2, THUNDER_WAVE
|
||||
db 1, 3, HEADBUTT
|
||||
db 2, 1, BLIZZARD
|
||||
db 2, 2, THUNDERBOLT
|
||||
db 2, 3, SING
|
||||
db 2, 4, HYPER_BEAM
|
||||
db 3, 1, IRON_HEAD
|
||||
db 3, 3, HYPER_BEAM
|
||||
db 4, 1, EXPLOSION
|
||||
db 4, 2, THUNDERBOLT
|
||||
db 4, 4, ICE_PUNCH
|
||||
db 5, 1, THUNDERBOLT
|
||||
db 5, 2, ICE_BEAM
|
||||
db 5, 3, RECOVER
|
||||
db 6, 1, THUNDERBOLT
|
||||
db 6, 2, THUNDER_WAVE
|
||||
db 6, 4, ICE_BEAM
|
||||
db 0
|
||||
|
||||
db CHIEF, 2
|
||||
db 1, 1, THUNDERBOLT
|
||||
db 1, 2, THUNDER_WAVE
|
||||
db 1, 3, HEADBUTT
|
||||
db 2, 1, BLIZZARD
|
||||
db 2, 2, THUNDERBOLT
|
||||
db 2, 3, SING
|
||||
db 2, 4, HYPER_BEAM
|
||||
db 3, 1, IRON_HEAD
|
||||
db 3, 3, HYPER_BEAM
|
||||
db 4, 1, EXPLOSION
|
||||
db 4, 2, THUNDERBOLT
|
||||
db 4, 4, ICE_PUNCH
|
||||
db 5, 1, THUNDERBOLT
|
||||
db 5, 2, ICE_BEAM
|
||||
db 5, 3, RECOVER
|
||||
db 6, 1, THUNDERBOLT
|
||||
db 6, 2, THUNDER_WAVE
|
||||
db 6, 4, ICE_BEAM
|
||||
db 0
|
||||
|
||||
db JESSIE_JAMES, 5 ; J&J postgame
|
||||
db 1, 1, BUBBLEBEAM
|
||||
db 1, 2, THUNDERBOLT
|
||||
db 1, 4, HYPNOSIS
|
||||
db 2, 3, WRAP
|
||||
db 2, 4, EARTHQUAKE
|
||||
db 3, 1, WRAP
|
||||
db 3, 2, BODY_SLAM
|
||||
db 3, 3, EXPLOSION
|
||||
db 3, 4, EARTHQUAKE
|
||||
db 4, 1, SLUDGE
|
||||
db 4, 2, THUNDERBOLT
|
||||
db 4, 3, FIRE_BLAST
|
||||
db 5, 3, BODY_SLAM
|
||||
db 6, 1, FIRE_BLAST
|
||||
db 6, 2, THUNDERBOLT
|
||||
db 0
|
||||
|
||||
db LORELEI, 2 ; Lorelei rematch
|
||||
db 1, 1, SURF
|
||||
db 1, 3, BODY_SLAM
|
||||
db 1, 4, BLIZZARD
|
||||
db 2, 1, EXPLOSION
|
||||
db 2, 3, ICE_BEAM
|
||||
db 3, 1, HYPNOSIS
|
||||
db 3, 4, SUBSTITUTE
|
||||
db 4, 1, LOVELY_KISS
|
||||
db 4, 2, COUNTER
|
||||
db 4, 3, PSYCHIC_M
|
||||
db 5, 1, BODY_SLAM
|
||||
db 5, 2, REST
|
||||
db 5, 4, GROWTH
|
||||
db 6, 1, HYPER_BEAM
|
||||
db 6, 2, THUNDERBOLT
|
||||
db 6, 3, BLIZZARD
|
||||
db 0
|
||||
|
||||
db BRUNO, 2 ; Bruno rematch
|
||||
db 1, 3, MEDITATE
|
||||
db 2, 1, EARTHQUAKE
|
||||
db 2, 3, ROCK_SLIDE
|
||||
db 2, 4, EXPLOSION
|
||||
db 3, 1, BODY_SLAM
|
||||
db 3, 2, BRUTAL_SWING
|
||||
db 3, 3, SWORDS_DANCE
|
||||
db 4, 1, THUNDERBOLT
|
||||
db 5, 2, BODY_SLAM
|
||||
db 5, 3, HI_JUMP_KICK
|
||||
db 5, 4, DIG
|
||||
db 6, 1, BODY_SLAM
|
||||
db 6, 3, EARTHQUAKE
|
||||
db 6, 4, ROCK_SLIDE
|
||||
db 0
|
||||
|
||||
db AGATHA, 2 ; Agatha rematch
|
||||
db 1, 1, MEGA_PUNCH
|
||||
db 1, 4, ROCK_SLIDE
|
||||
db 2, 1, MEGA_DRAIN
|
||||
db 2, 3, CONFUSE_RAY
|
||||
db 2, 4, FLY
|
||||
db 3, 1, SWORDS_DANCE
|
||||
db 3, 2, FIRE_BLAST
|
||||
db 3, 3, EARTHQUAKE
|
||||
db 3, 4, BLIZZARD
|
||||
db 4, 3, WRAP
|
||||
db 4, 4, EARTHQUAKE
|
||||
db 5, 1, GROWTH
|
||||
db 5, 3, TOXIC
|
||||
db 6, 1, THUNDERBOLT
|
||||
db 6, 2, ICE_PUNCH
|
||||
db 6, 4, PSYCHIC_M
|
||||
db 0
|
||||
|
||||
db LANCE, 2 ; Lance rematch
|
||||
db 1, 1, SWORDS_DANCE
|
||||
db 1, 2, THUNDERBOLT
|
||||
db 1, 4, EARTHQUAKE
|
||||
db 2, 1, BLIZZARD
|
||||
db 2, 2, THUNDERBOLT
|
||||
db 3, 1, PSYCHIC_M
|
||||
db 3, 2, EARTHQUAKE
|
||||
db 3, 3, EXPLOSION
|
||||
db 4, 1, REST
|
||||
db 4, 2, ICE_BEAM
|
||||
db 5, 1, SURF
|
||||
db 5, 3, THUNDERBOLT
|
||||
db 6, 1, BLIZZARD
|
||||
db 6, 2, FIRE_BLAST
|
||||
db 6, 4, AGILITY
|
||||
db 0
|
||||
|
||||
db RIVAL3, 6 ; Champion Rival rematch w/Totartle
|
||||
db 1, 1, SMART_STRIKE
|
||||
db 1, 2, EARTHQUAKE
|
||||
db 2, 1, THUNDERPUNCH
|
||||
db 2, 4, ICE_PUNCH
|
||||
db 3, 1, SURF
|
||||
db 3, 3, THUNDERBOLT
|
||||
db 4, 1, FIRE_BLAST
|
||||
db 4, 2, DIG
|
||||
db 4, 3, AGILITY
|
||||
db 4, 4, BODY_SLAM
|
||||
db 5, 1, PSYCHIC_M
|
||||
db 5, 2, SLEEP_POWDER
|
||||
db 5, 4, SOLARBEAM
|
||||
db 6, 1, BODY_SLAM
|
||||
db 6, 2, HYDRO_PUMP
|
||||
db 0
|
||||
|
||||
db RIVAL3, 7 ; Champion Rival rematch w/Venusaur
|
||||
db 1, 1, SMART_STRIKE
|
||||
db 1, 2, EARTHQUAKE
|
||||
db 2, 1, FIRE_PUNCH
|
||||
db 2, 4, THUNDERPUNCH
|
||||
db 3, 1, SURF
|
||||
db 3, 3, THUNDERBOLT
|
||||
db 4, 1, BLIZZARD
|
||||
db 4, 2, THUNDERBOLT
|
||||
db 5, 1, FIRE_BLAST
|
||||
db 5, 2, DIG
|
||||
db 5, 3, AGILITY
|
||||
db 5, 4, BODY_SLAM
|
||||
db 6, 2, RAZOR_LEAF
|
||||
db 6, 3, BODY_SLAM
|
||||
db 6, 4, SLEEP_POWDER
|
||||
db 0
|
||||
|
||||
db RIVAL3, 8 ; Champion Rival rematch w/Charizard
|
||||
db 1, 1, SMART_STRIKE
|
||||
db 1, 2, EARTHQUAKE
|
||||
db 2, 1, ICE_PUNCH
|
||||
db 2, 4, FIRE_PUNCH
|
||||
db 3, 1, SURF
|
||||
db 3, 3, THUNDERBOLT
|
||||
db 4, 1, PSYCHIC_M
|
||||
db 4, 2, SLEEP_POWDER
|
||||
db 4, 4, SOLARBEAM
|
||||
db 5, 1, BLIZZARD
|
||||
db 5, 2, THUNDERBOLT
|
||||
db 6, 1, FLY
|
||||
db 6, 2, SLASH
|
||||
db 6, 4, EARTHQUAKE
|
||||
db 0
|
||||
|
||||
db RIVAL3, 9 ; Champion Rival rematch w/Umbreon
|
||||
db 1, 1, BODY_SLAM
|
||||
db 1, 2, EARTHQUAKE
|
||||
db 1, 3, BLIZZARD
|
||||
db 1, 4, FIRE_BLAST
|
||||
db 2, 1, FIRE_PUNCH
|
||||
db 2, 4, ICE_PUNCH
|
||||
db 3, 2, SOLARBEAM
|
||||
db 3, 3, MEGA_DRAIN
|
||||
db 3, 4, AMNESIA
|
||||
db 4, 1, THUNDER_WAVE
|
||||
db 4, 3, THUNDERBOLT
|
||||
db 5, 1, HYPNOSIS
|
||||
db 5, 2, REFLECT
|
||||
db 5, 3, BODY_SLAM
|
||||
db 5, 4, FIRE_BLAST
|
||||
db 6, 1, BODY_SLAM
|
||||
db 6, 3, GROWTH
|
||||
db 0
|
||||
|
||||
db RIVAL3, 10 ; Champion Rival rematch w/Gorochu
|
||||
db 1, 1, BODY_SLAM
|
||||
db 1, 2, EARTHQUAKE
|
||||
db 1, 3, BLIZZARD
|
||||
db 1, 4, FIRE_BLAST
|
||||
db 2, 1, ICE_PUNCH
|
||||
db 2, 4, THUNDERPUNCH
|
||||
db 3, 2, SOLARBEAM
|
||||
db 3, 3, MEGA_DRAIN
|
||||
db 3, 4, AMNESIA
|
||||
db 4, 1, HYPNOSIS
|
||||
db 4, 2, REFLECT
|
||||
db 4, 3, BODY_SLAM
|
||||
db 4, 4, FIRE_BLAST
|
||||
db 5, 1, EXPLOSION
|
||||
db 5, 3, SURF
|
||||
db 5, 4, BLIZZARD
|
||||
db 6, 1, THUNDERBOLT
|
||||
db 6, 2, BODY_SLAM
|
||||
db 6, 3, THUNDER_WAVE
|
||||
db 6, 4, SURF
|
||||
db 0
|
||||
|
||||
db -1 ; end
|
||||
|
|
|
|||
|
|
@ -237,7 +237,6 @@ WildDataPointers:
|
|||
dw NothingWildMons
|
||||
dw NothingWildMons
|
||||
dw NothingWildMons
|
||||
dw NothingWildMons
|
||||
dw GarnetCavern2FWildMons
|
||||
dw UnderwaterTunnelWildMons
|
||||
dw NothingWildMons
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
FarawayIslandInsideMons: ; DEFINITELY needs reworking
|
||||
FarawayIslandInsideMons:
|
||||
def_grass_wildmons 10 ; encounter rate
|
||||
db 30, EEVEE
|
||||
db 30, MANKEY
|
||||
db 30, MANKEY
|
||||
db 30, PRIMEAPE
|
||||
db 30, BUTTERFREE
|
||||
db 30, EEVEE
|
||||
db 30, EEVEE
|
||||
db 30, EEVEE
|
||||
db 30, EEVEE
|
||||
db 30, EEVEE
|
||||
db 25, MANKEY
|
||||
db 28, GLOOM
|
||||
db 26, BUTTERFREE
|
||||
db 29, PRIMEAPE
|
||||
db 24, MANKEY
|
||||
db 30, DECILLA
|
||||
db 26, MANKEY
|
||||
db 30, GORILLAIMO
|
||||
db 27, BUTTERFREE
|
||||
db 30, AERODACTYL
|
||||
end_grass_wildmons
|
||||
|
||||
def_water_wildmons 0 ; encounter rate
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ SafariZoneNorthWildMons:
|
|||
db 23, EXEGGCUTE
|
||||
db 25, TANGELA
|
||||
db 30, VENOMOTH
|
||||
db 27, EXEGGCUTE
|
||||
db 27, CUBONE
|
||||
db 28, DODRIO
|
||||
db 27, TAUROS
|
||||
db 26, TRAMPEL
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@ SafariZoneWestWildMons:
|
|||
db 23, EXEGGCUTE
|
||||
db 24, EXEGGCUTE
|
||||
db 33, VENOMOTH
|
||||
db 26, EXEGGCUTE
|
||||
db 26, CUBONE
|
||||
db 25, MAROWAK
|
||||
db 25, SCYTHER
|
||||
db 26, TAUROS
|
||||
db 25, CHANSEY
|
||||
db 7, CHANSEY
|
||||
end_grass_wildmons
|
||||
|
||||
def_water_wildmons 0 ; encounter rate
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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,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
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
|
@ -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"
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 576 B After Width: | Height: | Size: 628 B |
Binary file not shown.
|
Before Width: | Height: | Size: 908 B After Width: | Height: | Size: 1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 943 B After Width: | Height: | Size: 999 B |
Binary file not shown.
|
Before Width: | Height: | Size: 614 B After Width: | Height: | Size: 989 B |
Binary file not shown.
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 645 B |
BIN
gfx/trainers/koichi.png
Normal file
BIN
gfx/trainers/koichi.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 594 B |
|
|
@ -141,7 +141,6 @@ ROMX $1D
|
|||
"Itemfinder 1"
|
||||
"Maps 20"
|
||||
"Maps 21"
|
||||
"Itemfinder 2"
|
||||
ROMX $1E
|
||||
"bank1E"
|
||||
ROMX $1F
|
||||
|
|
@ -151,6 +150,7 @@ ROMX $1F
|
|||
"Sound Effects 3"
|
||||
; "Audio Engine 3"
|
||||
; "Music 3"
|
||||
"Itemfinder 2"
|
||||
ROMX $20
|
||||
"Text 1"
|
||||
ROMX $21
|
||||
|
|
|
|||
13
maps.asm
13
maps.asm
|
|
@ -789,10 +789,10 @@ INCLUDE "scripts/SilphCo3F.asm"
|
|||
INCLUDE "data/maps/objects/SilphCo3F.asm"
|
||||
SilphCo3F_Blocks: INCBIN "maps/SilphCo3F.blk"
|
||||
|
||||
INCLUDE "data/maps/headers/SilphCo10F.asm"
|
||||
INCLUDE "scripts/SilphCo10F.asm"
|
||||
INCLUDE "data/maps/objects/SilphCo10F.asm"
|
||||
SilphCo10F_Blocks: INCBIN "maps/SilphCo10F.blk"
|
||||
INCLUDE "data/maps/headers/Route10Gate.asm"
|
||||
INCLUDE "scripts/Route10Gate.asm"
|
||||
INCLUDE "data/maps/objects/Route10Gate.asm"
|
||||
Route10Gate_Blocks: INCBIN "maps/Route10Gate.blk"
|
||||
|
||||
INCLUDE "data/maps/headers/LancesRoom.asm"
|
||||
INCLUDE "scripts/LancesRoom.asm"
|
||||
|
|
@ -947,11 +947,6 @@ INCLUDE "data/maps/objects/UndergroundPathRoute7.asm"
|
|||
;INCLUDE "scripts/UndergroundPathRoute7Copy.asm"
|
||||
;INCLUDE "data/maps/objects/UndergroundPathRoute7Copy.asm"
|
||||
|
||||
INCLUDE "data/maps/headers/SilphCo9F.asm"
|
||||
INCLUDE "scripts/SilphCo9F.asm"
|
||||
INCLUDE "data/maps/objects/SilphCo9F.asm"
|
||||
SilphCo9F_Blocks: INCBIN "maps/SilphCo9F.blk"
|
||||
|
||||
INCLUDE "data/maps/headers/VictoryRoad1F.asm"
|
||||
INCLUDE "scripts/VictoryRoad1F.asm"
|
||||
INCLUDE "data/maps/objects/VictoryRoad1F.asm"
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
3+, )54
%*'
&*%#
|
||||
-3+, )54
%*'
67*%#
|
||||
|
|
@ -1 +1,2 @@
|
|||
hhhghhhijijmnmnhhhhhh
|
||||
# (
|
||||
6 :
|
||||
|
|
@ -24,8 +24,7 @@ Me()
|
|||
|
||||
|
||||
|
||||
Oe(,?????;{e(+WWWW*){e()
!(){e()hi(){e()7}:~(){e(){y{{(){e(){{{{$%{e(){{{{{{{e() .(,?????;CC(,,,,,,)CC(+WWWW%
|
||||
L()11111
|
||||
Oe(,?????;{e(+WWWW*){e()
!(){e()hi(){e()7}:~(){e(){y{{$%{e(){{{{{{{e() .()CCCCCCCC(,????;CTC(,,,,,)
!(+WWW%7:~()11111
|
||||
|
||||
()1111>;/()>??,)
|
||||
|
||||
|
|
|
|||
BIN
maps/Route10Gate.blk
Normal file
BIN
maps/Route10Gate.blk
Normal file
Binary file not shown.
|
|
@ -615,6 +615,7 @@ BattleTentGuy_After:
|
|||
call PrintText
|
||||
ld a, [wBTRewards]
|
||||
ld b, RARE_CANDY
|
||||
ld c, a
|
||||
call GiveItem
|
||||
jr nc, .bag_full ; could use money instead here
|
||||
ld hl, ReceivedRewardText
|
||||
|
|
@ -626,6 +627,7 @@ BattleTentGuy_After:
|
|||
ld [wBTRewards], a
|
||||
;ld b, POWER_FEED
|
||||
ld b, BOTTLE_CAP
|
||||
ld c, a
|
||||
call GiveItem
|
||||
jr nc, .bag_full
|
||||
ld hl, ReceivedRewardText
|
||||
|
|
@ -889,7 +891,7 @@ BattleTentGuy2_Heal:
|
|||
done
|
||||
|
||||
ReceivedRewardPreamble:
|
||||
text "Take these"
|
||||
text "Take these,"
|
||||
line "on the house!"
|
||||
prompt
|
||||
text_end
|
||||
|
|
|
|||
|
|
@ -13,6 +13,10 @@ BrunswickGlade_ScriptPointers:
|
|||
dw EndTrainerBattle
|
||||
|
||||
BrunswickGlade_TextPointers:
|
||||
dw BrunswickGladeTrainer1
|
||||
dw BrunswickGladeTrainer2
|
||||
dw BrunswickGladeTrainer3
|
||||
dw BrunswickGladeTrainer4
|
||||
dw GZapRun1
|
||||
dw GZapRun2
|
||||
dw GZapRun3
|
||||
|
|
@ -20,20 +24,16 @@ BrunswickGlade_TextPointers:
|
|||
dw PickUpItemText
|
||||
dw PickUpItemText
|
||||
dw PickUpItemText
|
||||
dw BrunswickGladeTrainer1
|
||||
dw BrunswickGladeTrainer2
|
||||
dw BrunswickGladeTrainer3
|
||||
dw BrunswickGladeTrainer4
|
||||
dw BrunswickGladeSign1
|
||||
|
||||
BrunswickGladeTrainerHeaders:
|
||||
def_trainers
|
||||
BrunswickGladeTrainerHeader0:
|
||||
trainer EVENT_BEAT_BRUNSWICK_GLADE_COOLTRAINER_F, 1, BrunswickGladeBattleText1, BrunswickGladeEndBattleText1, BrunswickGladeAfterBattleText1
|
||||
BrunswickGladeTrainerHeader2: ; don't ask
|
||||
trainer EVENT_BEAT_BRUNSWICK_GLADE_GENTLEMAN, 4, BrunswickGladeBattleText3, BrunswickGladeEndBattleText3, BrunswickGladeAfterBattleText3
|
||||
BrunswickGladeTrainerHeader1:
|
||||
trainer EVENT_BEAT_BRUNSWICK_GLADE_BEAUTY, 4, BrunswickGladeBattleText2, BrunswickGladeEndBattleText2, BrunswickGladeAfterBattleText2
|
||||
trainer EVENT_BEAT_BRUNSWICK_GLADE_GENTLEMAN, 4, BrunswickGladeBattleText2, BrunswickGladeEndBattleText2, BrunswickGladeAfterBattleText2
|
||||
BrunswickGladeTrainerHeader2:
|
||||
trainer EVENT_BEAT_BRUNSWICK_GLADE_BEAUTY, 4, BrunswickGladeBattleText3, BrunswickGladeEndBattleText3, BrunswickGladeAfterBattleText3
|
||||
BrunswickGladeTrainerHeader3:
|
||||
trainer EVENT_BEAT_BRUNSWICK_GLADE_COOLTRAINER_M, 3, BrunswickGladeBattleText4, BrunswickGladeEndBattleText4, BrunswickGladeAfterBattleText4
|
||||
db -1 ; end
|
||||
|
|
|
|||
|
|
@ -25,8 +25,21 @@ MewtwoTrainerHeader:
|
|||
|
||||
MewtwoText:
|
||||
text_asm
|
||||
ld a, 5
|
||||
ld [wMusicFade], a
|
||||
xor a
|
||||
ld [wMusicFadeID], a
|
||||
.waitloop
|
||||
ld a, [wMusicFade]
|
||||
and a
|
||||
jr nz, .waitloop
|
||||
|
||||
ld a, SFX_STOP_ALL_MUSIC
|
||||
call PlaySound
|
||||
ld hl, MewtwoTrainerHeader
|
||||
call TalkToTrainer
|
||||
ld a, SFX_STOP_ALL_MUSIC
|
||||
call PlaySound
|
||||
jp TextScriptEnd
|
||||
|
||||
MewtwoBattleText:
|
||||
|
|
|
|||
|
|
@ -80,8 +80,8 @@ GaryScript2:
|
|||
jr .saveTrainerId
|
||||
.Charmander
|
||||
cp STARTER1 ; changes start here
|
||||
ld a, $3
|
||||
jr nz, .Pikachu
|
||||
ld a, $3
|
||||
jr .saveTrainerId
|
||||
.Pikachu ;
|
||||
cp STARTER4
|
||||
|
|
|
|||
|
|
@ -3,28 +3,12 @@ CinnabarLabTradeRoom_Script:
|
|||
|
||||
CinnabarLabTradeRoom_TextPointers:
|
||||
dw Lab2Text1
|
||||
dw Lab2Text2
|
||||
; dw Lab2Text3
|
||||
dw CinnabarLabTrader
|
||||
|
||||
Lab2Text1:
|
||||
text_far _Lab2Text1
|
||||
text_end
|
||||
|
||||
Lab2Text2:
|
||||
text_asm
|
||||
ld a, TRADE_FOR_JENNY
|
||||
ld [wWhichTrade], a
|
||||
jr Lab2DoTrade
|
||||
|
||||
;Lab2Text3:
|
||||
; text_asm
|
||||
; ld a, TRADE_FOR_CRINKLES
|
||||
; ld [wWhichTrade], a
|
||||
Lab2DoTrade:
|
||||
predef DoInGameTradeDialogue
|
||||
jp TextScriptEnd
|
||||
|
||||
CinnabarLabTrader:
|
||||
text_asm
|
||||
ld a, TRADE_WITH_SELF
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ PoryZSalesmanText:
|
|||
jp nz, .choseNo
|
||||
ldh [hMoney], a
|
||||
ldh [hMoney + 2], a
|
||||
ld a, $21
|
||||
ld a, $30
|
||||
ldh [hMoney + 1], a
|
||||
call HasEnoughMoney
|
||||
jr nc, .enoughMoney
|
||||
|
|
@ -49,11 +49,13 @@ PoryZSalesmanText:
|
|||
.enoughMoney
|
||||
lb bc, DUBIOUS_DISC, 1
|
||||
call GiveItem
|
||||
jr nc, .done
|
||||
jr nc, .BagFull
|
||||
ld hl, ReceivedDubiousDiscText
|
||||
call PrintText
|
||||
xor a
|
||||
ld [wPriceTemp], a
|
||||
ld [wPriceTemp + 2], a
|
||||
ld a, $21
|
||||
ld a, $30
|
||||
ld [wPriceTemp + 1], a
|
||||
ld hl, wPriceTemp + 2
|
||||
ld de, wPlayerMoney + 2
|
||||
|
|
@ -65,10 +67,17 @@ PoryZSalesmanText:
|
|||
SetEvent EVENT_BOUGHT_DUBIOUS_DISC
|
||||
jr .done
|
||||
.choseNo
|
||||
ld hl, .RefuseText
|
||||
jr .printText
|
||||
ld hl, RefuseText2
|
||||
call PrintText
|
||||
jr .done
|
||||
.alreadyBoughtPoryZ
|
||||
ld hl, .Text2
|
||||
call PrintText
|
||||
jr .done
|
||||
.BagFull
|
||||
ld hl, PoryZBagFull
|
||||
call PrintText
|
||||
jr .done
|
||||
.printText
|
||||
call PrintText
|
||||
.done
|
||||
|
|
@ -78,16 +87,21 @@ PoryZSalesmanText:
|
|||
text_far _PoryZSalesmanText1
|
||||
text_end
|
||||
|
||||
.RefuseText
|
||||
text_far _PoryZSalesmanNoText
|
||||
.Text2
|
||||
text_far _PoryZSalesmanText2
|
||||
text_end
|
||||
|
||||
.NoMoneyText
|
||||
text_far _PoryZSalesmanNoMoneyText
|
||||
text_end
|
||||
|
||||
.Text2
|
||||
text_far _PoryZSalesmanText2
|
||||
RefuseText2:
|
||||
text_far _PoryZSalesmanNoText
|
||||
text_end
|
||||
|
||||
ReceivedDubiousDiscText:
|
||||
text_far _ReceivedDubiousDiscText
|
||||
sound_get_item_1
|
||||
text_end
|
||||
|
||||
PoryZBagFull:
|
||||
|
|
|
|||
|
|
@ -122,14 +122,12 @@ 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
|
||||
ld a, 1
|
||||
ld [wIsTrainerBattle], a
|
||||
ld a, $1
|
||||
ld [wGymLeaderNo], a
|
||||
jr .asm_9dba4
|
||||
.normalProcessing
|
||||
CheckEvent EVENT_DEFEATED_FIGHTING_DOJO
|
||||
|
|
@ -152,7 +150,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.
|
||||
|
|
@ -164,15 +162,12 @@ FightingDojoText1: ; gym scaling can be removed to make space
|
|||
ld [wTrainerNo], a
|
||||
ld a, 1
|
||||
ld [wIsTrainerBattle], a
|
||||
ld a, $1
|
||||
ld [wGymLeaderNo], a ; play gym music
|
||||
|
||||
;ends here
|
||||
|
||||
ld a, $3
|
||||
ld [wFightingDojoCurScript], a
|
||||
ld [wCurMapScript], a
|
||||
SetEvent EVENT_DEFEATED_FIGHTING_DOJO
|
||||
jr .asm_9dba4
|
||||
.continue1
|
||||
ld hl, FightingDojoText_5ce9d
|
||||
|
|
@ -181,6 +176,7 @@ FightingDojoText1: ; gym scaling can be removed to make space
|
|||
.continue2
|
||||
ld hl, FightingDojoText8
|
||||
call PrintText
|
||||
SetEvent EVENT_DEFEATED_FIGHTING_DOJO
|
||||
.asm_9dba4
|
||||
jp TextScriptEnd
|
||||
|
||||
|
|
|
|||
|
|
@ -190,7 +190,9 @@ SafariBallSalesman:
|
|||
.enoughMoney
|
||||
lb bc, SAFARI_BALL, 3
|
||||
call GiveItem
|
||||
jr nc, .done
|
||||
jr nc, .BagFull
|
||||
ld hl, ReceivedSafariBallsText
|
||||
call PrintText
|
||||
xor a
|
||||
ld [wPriceTemp], a
|
||||
ld [wPriceTemp + 2], a
|
||||
|
|
@ -205,7 +207,13 @@ SafariBallSalesman:
|
|||
call DisplayTextBoxID
|
||||
jr .done
|
||||
.choseNo
|
||||
ld hl, .RefuseText
|
||||
ld hl, RefuseText
|
||||
call PrintText
|
||||
jr .done
|
||||
.BagFull
|
||||
ld hl, SafariBallBagFull
|
||||
call PrintText
|
||||
jr .done
|
||||
.printText
|
||||
call PrintText
|
||||
.done
|
||||
|
|
@ -215,12 +223,17 @@ SafariBallSalesman:
|
|||
text_far _SafariBallSalesmanText1
|
||||
text_end
|
||||
|
||||
.RefuseText
|
||||
.NoMoneyText
|
||||
text_far _SafariBallSalesmanNoMoneyText
|
||||
text_end
|
||||
|
||||
RefuseText:
|
||||
text_far _SafariBallSalesmanNoText
|
||||
text_end
|
||||
|
||||
.NoMoneyText
|
||||
text_far _SafariBallSalesmanNoMoneyText
|
||||
ReceivedSafariBallsText:
|
||||
text_far _ReceivedSafariBallsText
|
||||
sound_get_item_1
|
||||
text_end
|
||||
|
||||
SafariBallBagFull:
|
||||
|
|
|
|||
|
|
@ -180,7 +180,7 @@ ResetLegendaryPokemon:
|
|||
call ShowThis
|
||||
.skipMew
|
||||
CheckEvent EVENT_POST_GAME_ATTAINED
|
||||
jp z, .skipGalarianBirdsAndMewtwo ; If you haven't cleared the game yet, you've not met the Galarian Birds. So we may as well skip processing all this.
|
||||
jp z, .skipGalarianBirdsAndMewtwo
|
||||
ld a, DEX_ARTICUNO_G
|
||||
call HoFIsPokemonBitSet
|
||||
jr nz, .skipArticunoG
|
||||
|
|
@ -257,7 +257,6 @@ ObjectsToHide:
|
|||
db HS_BILLS_NIDORINO ; Bill's Garden access
|
||||
db HS_MANSION_GUARD ; Pokemon Mansion basement access
|
||||
db HS_MT_MOON_CRATER_GUARD ; Mt. Moon Crater access
|
||||
db HS_CERULEAN_CAVE_GUY ; Cerulean Cave access
|
||||
db -1 ; end
|
||||
|
||||
; Farcalling this caused weird issues so I'm just using a clone
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
15
scripts/Route10Gate.asm
Normal file
15
scripts/Route10Gate.asm
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
Route10Gate_Script:
|
||||
jp EnableAutoTextBoxDrawing
|
||||
|
||||
Route10Gate_TextPointers:
|
||||
dw Route10GateText1
|
||||
|
||||
Route10GateText1:
|
||||
text_asm
|
||||
ld a, TRADE_FOR_JENNY
|
||||
ld [wWhichTrade], a
|
||||
jr Route10GateDoTrade
|
||||
|
||||
Route10GateDoTrade:
|
||||
predef DoInGameTradeDialogue
|
||||
jp TextScriptEnd
|
||||
|
|
@ -173,10 +173,6 @@ MissableObjectIDs_6219b:
|
|||
db HS_SILPH_CO_7F_2
|
||||
db HS_SILPH_CO_7F_3
|
||||
db HS_SILPH_CO_7F_4
|
||||
db HS_SILPH_CO_10F_1
|
||||
db HS_SILPH_CO_10F_2
|
||||
db HS_SILPH_CO_11F_1
|
||||
db HS_SILPH_CO_11F_3
|
||||
db -1 ; end
|
||||
|
||||
SilphCo11Script_62185:
|
||||
|
|
@ -633,8 +629,6 @@ SaffronCityRockets:
|
|||
db HS_SILPH_CO_7F_2
|
||||
db HS_SILPH_CO_7F_3
|
||||
db HS_SILPH_CO_7F_4
|
||||
db HS_SILPH_CO_10F_1
|
||||
db HS_SILPH_CO_10F_2
|
||||
db HS_SILPH_CO_11F_1
|
||||
db HS_SILPH_CO_11F_3
|
||||
db -1 ; end
|
||||
|
|
|
|||
|
|
@ -21,6 +21,17 @@ SilphGauntlet7F_ScriptPointers:
|
|||
ChiefScript1:
|
||||
CheckEvent EVENT_BEAT_CHIEF
|
||||
jr nz, .skip
|
||||
ld a, 5
|
||||
ld [wMusicFade], a
|
||||
xor a
|
||||
ld [wMusicFadeID], a
|
||||
.waitloop
|
||||
ld a, [wMusicFade]
|
||||
and a
|
||||
jr nz, .waitloop
|
||||
|
||||
ld a, SFX_STOP_ALL_MUSIC
|
||||
call PlaySound
|
||||
ld a, PLAYER_DIR_UP
|
||||
ld [wPlayerMovingDirection], a
|
||||
call UpdateSprites
|
||||
|
|
@ -95,6 +106,7 @@ ChiefScript4:
|
|||
ld a, HS_CERULEAN_CAVE_GUY
|
||||
ld [wMissableObjectIndex], a
|
||||
predef HideObject
|
||||
SetEvent EVENT_MEWTWO_UNLOCKED
|
||||
ResetEventRange SILPH_GAUNTLET_EVENTS_START, SILPH_GAUNTLET_EVENTS_END, 1
|
||||
|
||||
ld a, $0
|
||||
|
|
@ -117,8 +129,10 @@ SilphGauntlet7F_TextPointers:
|
|||
|
||||
ChiefText1:
|
||||
text_asm
|
||||
CheckEvent EVENT_MEWTWO_UNLOCKED
|
||||
jr nz, .chiefSecondFight
|
||||
CheckEvent EVENT_BEAT_CHIEF ; Check if Chief was beaten
|
||||
jr nz, .chiefBeaten ; If Chief has been beaten, skip the trainer loading
|
||||
jr nz, .chiefBeaten1 ; If Chief has been beaten, skip the trainer loading
|
||||
; standard processing
|
||||
ld hl, ChiefMonologue
|
||||
call PrintText
|
||||
|
|
@ -127,6 +141,9 @@ ChiefText1:
|
|||
call z, WaitForTextScrollButtonPress ; and here.
|
||||
call EnableAutoTextBoxDrawing ; and here.
|
||||
|
||||
CheckEvent EVENT_GOT_MASTER_BALL ; Check if Master Ball was collected.
|
||||
ld hl, ChiefMonologueMasterBallNotCollected ; If no, load this text...
|
||||
jr z, .masterBallSkip ; ...then skip.
|
||||
CheckEvent EVENT_USED_MASTER_BALL ; Check if the Master Ball has been used.
|
||||
ld hl, ChiefMonologueMasterBallNotUsed ; Load not used by default.
|
||||
jr z, .masterBallSkip ; In which case, we can skip.
|
||||
|
|
@ -153,12 +170,48 @@ ChiefText1:
|
|||
ld de, ChiefVictoryText
|
||||
call SaveEndBattleTextPointers
|
||||
jr .done
|
||||
.chiefBeaten
|
||||
ld hl, ChiefAfterBattleText
|
||||
.chiefBeaten1
|
||||
CheckEvent EVENT_GOT_MASTER_BALL ; Check if Master Ball was collected.
|
||||
ld hl, ChiefAltAfterBattleText ; If no, load this text...
|
||||
jr z, .noMBallskip ; ...then skip.
|
||||
ld hl, ChiefAfterBattleText ; otherwise, load this.
|
||||
.noMBallskip
|
||||
call PrintText
|
||||
; fallthrough
|
||||
.done
|
||||
jp TextScriptEnd
|
||||
.chiefSecondFight
|
||||
CheckEvent EVENT_BEAT_CHIEF ; Check if Chief was beaten
|
||||
jr nz, .chiefBeaten2 ; If Chief has been beaten, skip the trainer loading
|
||||
ld hl, ChiefMonologueRematch
|
||||
call PrintText
|
||||
ld a, [wSimulatedJoypadStatesEnd] ; ensuring that the text doesn't autoskip.
|
||||
and a ; yep, here too.
|
||||
call z, WaitForTextScrollButtonPress ; and here.
|
||||
call EnableAutoTextBoxDrawing ; and here.
|
||||
ld c, BANK(Music_MeetEvilTrainer)
|
||||
ld a, MUSIC_MEET_EVIL_TRAINER
|
||||
call PlayMusic
|
||||
|
||||
call Delay3
|
||||
ld hl, wd72d
|
||||
set 6, [hl]
|
||||
set 7, [hl]
|
||||
ld a, OPP_CHIEF
|
||||
ld [wCurOpponent], a
|
||||
ld a, 2
|
||||
ld [wTrainerNo], a
|
||||
ld [wIsTrainerBattle], a
|
||||
ld a, $1
|
||||
ld [wSilphGauntlet7FCurScript], a
|
||||
ld hl, ChiefDefeatedText2
|
||||
ld de, ChiefVictoryText2
|
||||
call SaveEndBattleTextPointers
|
||||
jr .done
|
||||
.chiefBeaten2
|
||||
ld hl, ChiefAfterBattleText2
|
||||
call PrintText
|
||||
jr .done
|
||||
|
||||
ChiefMonologue:
|
||||
text_far _ChiefMonologue
|
||||
|
|
@ -172,6 +225,10 @@ ChiefMonologueMasterBallNotUsed:
|
|||
text_far _ChiefMonologueMasterBallNotUsed
|
||||
text_end
|
||||
|
||||
ChiefMonologueMasterBallNotCollected:
|
||||
text_far _ChiefMonologueMasterBallNotCollected
|
||||
text_end
|
||||
|
||||
ChiefDefeatedText:
|
||||
text_far _ChiefDefeatedText
|
||||
text_end
|
||||
|
|
@ -184,6 +241,26 @@ ChiefAfterBattleText:
|
|||
text_far _ChiefAfterBattleText
|
||||
text_end
|
||||
|
||||
ChiefAltAfterBattleText:
|
||||
text_far _ChiefAltAfterBattleText
|
||||
text_end
|
||||
|
||||
ChiefMonologueRematch:
|
||||
text_far _ChiefMonologueRematch
|
||||
text_end
|
||||
|
||||
ChiefDefeatedText2:
|
||||
text_far _ChiefDefeatedText2
|
||||
text_end
|
||||
|
||||
ChiefVictoryText2:
|
||||
text_far _ChiefVictoryText2
|
||||
text_end
|
||||
|
||||
ChiefAfterBattleText2:
|
||||
text_far _ChiefAfterBattleText2
|
||||
text_end
|
||||
|
||||
ChiefPC:
|
||||
text_far _ChiefPCText
|
||||
text_end
|
||||
|
|
|
|||
|
|
@ -23,15 +23,27 @@ ViridianPreGym_ScriptPointers:
|
|||
ViridianGymYujirouPostBattle:
|
||||
ld a, [wIsInBattle]
|
||||
cp $ff
|
||||
jp z, ViridianGymResetScripts
|
||||
jp z, ViridianPreGymResetScripts
|
||||
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
|
||||
; xor a
|
||||
; ld [wViridianPreGymCurScript], a
|
||||
ViridianPreGymScriptReceiveBottleCap:
|
||||
ld a, $b
|
||||
ldh [hSpriteIndexOrTextID], a
|
||||
call DisplayTextID
|
||||
SetEvent EVENT_BEAT_YUJIROU
|
||||
lb bc, BOTTLE_CAP, 1
|
||||
call GiveItem
|
||||
jr nc, .BagFull
|
||||
ld a, $c
|
||||
ldh [hSpriteIndexOrTextID], a
|
||||
call DisplayTextID
|
||||
SetEvent EVENT_GOT_YUJIROU_BOTTLE_CAP
|
||||
jp ViridianPreGymResetScripts
|
||||
.BagFull
|
||||
ld a, $d
|
||||
ldh [hSpriteIndexOrTextID], a
|
||||
call DisplayTextID
|
||||
jp ViridianPreGymResetScripts
|
||||
|
||||
ViridianPreGym_TextPointers:
|
||||
dw ViridianPreGymText1
|
||||
|
|
@ -44,6 +56,9 @@ ViridianPreGym_TextPointers:
|
|||
dw ViridianPreGymSign4
|
||||
dw ViridianPreGymStatue1
|
||||
dw ViridianPreGymStatue2
|
||||
dw BeforeReceivedBottleCapText
|
||||
dw ReceivedBottleCapText
|
||||
dw BottleCapNoRoomText
|
||||
|
||||
ViridianPreGymTrainerHeaders:
|
||||
def_trainers
|
||||
|
|
@ -55,44 +70,15 @@ ViridianPreGymTrainerHeader1:
|
|||
|
||||
YujirouText:
|
||||
text_asm
|
||||
CheckEvent EVENT_BEAT_YUJIROU
|
||||
jp z, .yujirouNotBeaten
|
||||
CheckEvent EVENT_POST_GAME_ATTAINED ; No need to view previous stuff
|
||||
jr nz, .rematchMode
|
||||
CheckEvent EVENT_BEAT_YUJIROU
|
||||
jp nz, .YujirouBeaten
|
||||
ld hl, YujirouIntro
|
||||
call PrintText
|
||||
|
||||
ld c, BANK(Music_MeetMaleTrainer)
|
||||
ld a, MUSIC_MEET_MALE_TRAINER
|
||||
call PlayMusic
|
||||
|
||||
ld hl, wd72d
|
||||
set 6, [hl]
|
||||
set 7, [hl]
|
||||
ld hl, YujirouLoseText
|
||||
ld de, YujirouWinText
|
||||
call SaveEndBattleTextPointers
|
||||
ldh a, [hSpriteIndex]
|
||||
ld [wSpriteIndex], a
|
||||
call EngageMapTrainer
|
||||
|
||||
; gym scaling spaghetti code begins here - remove initial parameters as we're making our own
|
||||
ld a, OPP_YUJIROU
|
||||
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.
|
||||
ld b, 1
|
||||
call CountSetBits
|
||||
ld a, [wNumSetBits]
|
||||
inc a
|
||||
ld [wTrainerNo], a
|
||||
|
||||
ld a, 1
|
||||
ld [wIsTrainerBattle], a
|
||||
ld a, $3
|
||||
ld [wViridianPreGymCurScript], a
|
||||
ld [wCurMapScript], a
|
||||
jr .done
|
||||
CheckEventReuseA EVENT_GOT_YUJIROU_BOTTLE_CAP
|
||||
jr nz, .yujirouBeaten
|
||||
call z, ViridianPreGymScriptReceiveBottleCap
|
||||
call DisableWaitingAfterTextDisplay
|
||||
jp .done ; needed due to the rematch script length.
|
||||
.rematchMode ; Rematch functionality. Just loads pre-battle text and his trainer.
|
||||
ld hl, YujirouIntro2
|
||||
call PrintText
|
||||
|
|
@ -105,7 +91,7 @@ YujirouText:
|
|||
ldh a, [hSpriteIndex]
|
||||
ld [wSpriteIndex], a
|
||||
ld hl, YujirouLoseText2
|
||||
ld de, YujirouWinText
|
||||
ld de, YujirouLoseText2
|
||||
call SaveEndBattleTextPointers
|
||||
call EngageMapTrainer
|
||||
ld a, OPP_YUJIROU
|
||||
|
|
@ -114,12 +100,46 @@ YujirouText:
|
|||
ld [wTrainerNo], a
|
||||
ld a, 1
|
||||
ld [wIsTrainerBattle], a
|
||||
ld a, $1
|
||||
ld [wGymLeaderNo], a
|
||||
jr .done
|
||||
.YujirouBeaten
|
||||
.yujirouBeaten
|
||||
ld hl, YujirouAfterBattleText
|
||||
call PrintText
|
||||
jr .done
|
||||
.yujirouNotBeaten
|
||||
ld hl, YujirouIntro
|
||||
call PrintText
|
||||
ld hl, wd72d
|
||||
set 6, [hl]
|
||||
set 7, [hl]
|
||||
ld hl, YujirouLoseText
|
||||
ld de, YujirouLoseText
|
||||
call SaveEndBattleTextPointers
|
||||
ldh a, [hSpriteIndex]
|
||||
ld [wSpriteIndex], a
|
||||
call EngageMapTrainer
|
||||
|
||||
|
||||
; gym scaling spaghetti code begins here - remove initial parameters as we're making our own
|
||||
ld a, OPP_YUJIROU
|
||||
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.
|
||||
ld b, 1
|
||||
call CountSetBits
|
||||
ld a, [wNumSetBits]
|
||||
inc a
|
||||
|
||||
ld [wTrainerNo], a
|
||||
ld a, 1
|
||||
ld [wIsTrainerBattle], a
|
||||
|
||||
;ends here
|
||||
|
||||
xor a
|
||||
ldh [hJoyHeld], a
|
||||
ld a, $3
|
||||
ld [wViridianPreGymCurScript], a
|
||||
ld [wCurMapScript], a
|
||||
.done
|
||||
jp TextScriptEnd
|
||||
|
||||
|
|
@ -131,14 +151,24 @@ YujirouLoseText::
|
|||
text_far _YujirouLoseText
|
||||
text_end
|
||||
|
||||
YujirouWinText::
|
||||
text_far _YujirouWinText
|
||||
text_end
|
||||
|
||||
YujirouAfterBattleText::
|
||||
text_far _YujirouAfterBattleText
|
||||
text_end
|
||||
|
||||
BeforeReceivedBottleCapText:
|
||||
text_far _BeforeReceivedBottleCapText
|
||||
text_end
|
||||
|
||||
ReceivedBottleCapText:
|
||||
text_far _ReceivedBottleCapText
|
||||
sound_get_item_1
|
||||
text_far _BottleCapExplanationText
|
||||
text_end
|
||||
|
||||
BottleCapNoRoomText:
|
||||
text_far _BottleCapNoRoomText
|
||||
text_end
|
||||
|
||||
YujirouIntro2::
|
||||
text_far _YujirouIntro2
|
||||
text_end
|
||||
|
|
|
|||
|
|
@ -20,7 +20,8 @@ _BrunswickGladeBattleText1:: ; Leaf
|
|||
done
|
||||
|
||||
_BrunswickGladeEndBattleText1::
|
||||
text "Dang it!" ; Taken from Smash Ultimate when a Pokemon faints. Cryptid moment.
|
||||
text "Dang"
|
||||
line "it!" ; Taken from Smash Ultimate when a Pokemon faints. Cryptid moment.
|
||||
prompt
|
||||
|
||||
_BrunswickGladeAfterBattleText1::
|
||||
|
|
@ -34,30 +35,7 @@ _BrunswickGladeAfterBattleText1::
|
|||
cont "everywhere!"
|
||||
done
|
||||
|
||||
_BrunswickGladeBattleText2:: ; Ariana - uses stad2 quotes
|
||||
text "That sharp gaze..."
|
||||
|
||||
para "You seem rather"
|
||||
line "competent."
|
||||
done
|
||||
|
||||
_BrunswickGladeEndBattleText2::
|
||||
text "I can't"
|
||||
line "look them in"
|
||||
cont "the face after"
|
||||
cont "this!"
|
||||
prompt
|
||||
|
||||
_BrunswickGladeAfterBattleText2::
|
||||
text "Have you thought"
|
||||
line "about working"
|
||||
cont "for TEAM ROCKET?"
|
||||
|
||||
para "No? Forget I"
|
||||
line "said anything."
|
||||
done
|
||||
|
||||
_BrunswickGladeBattleText3:: ; Fuji
|
||||
_BrunswickGladeBattleText2:: ; Fuji
|
||||
text "You seem to have"
|
||||
line "raised your #-"
|
||||
cont "MON with love"
|
||||
|
|
@ -67,11 +45,11 @@ _BrunswickGladeBattleText3:: ; Fuji
|
|||
line "they battle!"
|
||||
done
|
||||
|
||||
_BrunswickGladeEndBattleText3::
|
||||
_BrunswickGladeEndBattleText2::
|
||||
text "Hm..."
|
||||
prompt
|
||||
|
||||
_BrunswickGladeAfterBattleText3::
|
||||
_BrunswickGladeAfterBattleText2::
|
||||
text "I've made many"
|
||||
line "mistakes in my"
|
||||
cont "life."
|
||||
|
|
@ -83,6 +61,29 @@ _BrunswickGladeAfterBattleText3::
|
|||
cont "matters."
|
||||
done
|
||||
|
||||
_BrunswickGladeBattleText3:: ; Ariana - uses stad2 quotes
|
||||
text "That sharp gaze..."
|
||||
|
||||
para "You seem rather"
|
||||
line "competent."
|
||||
done
|
||||
|
||||
_BrunswickGladeEndBattleText3::
|
||||
text "I can't"
|
||||
line "look them in"
|
||||
cont "the face after"
|
||||
cont "this!"
|
||||
prompt
|
||||
|
||||
_BrunswickGladeAfterBattleText3::
|
||||
text "Have you thought"
|
||||
line "about working"
|
||||
cont "for TEAM ROCKET?"
|
||||
|
||||
para "No? Forget I"
|
||||
line "said anything."
|
||||
done
|
||||
|
||||
_BrunswickGladeBattleText4:: ; Trace
|
||||
text "Whoa!"
|
||||
|
||||
|
|
@ -92,7 +93,7 @@ _BrunswickGladeBattleText4:: ; Trace
|
|||
done
|
||||
|
||||
_BrunswickGladeEndBattleText4::
|
||||
text "Whoa!"
|
||||
text "Wow!"
|
||||
line "Seriously?"
|
||||
prompt
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ _Lover2::
|
|||
|
||||
_BrunswickBattleText1::
|
||||
text "I'm searching"
|
||||
line "for rare BIRD"
|
||||
line "for rare bird"
|
||||
cont "#MON!"
|
||||
done
|
||||
|
||||
|
|
@ -69,7 +69,7 @@ _BrunswickEndBattleText2::
|
|||
prompt
|
||||
|
||||
_BrunswickAfterBattleText2::
|
||||
text "I saw a BIRD"
|
||||
text "I saw a bird"
|
||||
line "#MON with huge"
|
||||
cont "legs sprint past"
|
||||
cont "me!"
|
||||
|
|
|
|||
|
|
@ -67,7 +67,8 @@ _CeladonCityText6::
|
|||
|
||||
para "It evolved from"
|
||||
line "POLIWHIRL when I"
|
||||
cont "used WATER STONE!"
|
||||
cont "gave it a WATER"
|
||||
cont "STONE!"
|
||||
done
|
||||
|
||||
_CeladonCityText7::
|
||||
|
|
@ -138,7 +139,8 @@ _CeladonCityText16::
|
|||
line "protects #MON"
|
||||
cont "against SPECIAL"
|
||||
cont "attacks such as"
|
||||
cont "fire and water!"
|
||||
cont "FIRE- and WATER-"
|
||||
cont "type techniques!"
|
||||
|
||||
para "It even improves"
|
||||
line "their own!"
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ _ErikaPreBattleText::
|
|||
para "I teach the art of"
|
||||
line "flower arranging."
|
||||
cont "My #MON are of"
|
||||
cont "the grass-type."
|
||||
cont "the GRASS-type."
|
||||
|
||||
para "Oh, I'm sorry, I"
|
||||
line "had no idea that"
|
||||
|
|
@ -110,13 +110,14 @@ _CeladonGymEndBattleText3::
|
|||
prompt
|
||||
|
||||
_CeladonGymAfterBattleText3::
|
||||
text "Grass-type #MON"
|
||||
text "GRASS-type #MON"
|
||||
line "are tough against"
|
||||
cont "the water-type!"
|
||||
cont "the WATER-type!"
|
||||
|
||||
para "They also have an"
|
||||
line "edge on rock and"
|
||||
cont "ground #MON!"
|
||||
line "advantage against"
|
||||
cont "ROCK- and GROUND-"
|
||||
cont "type #MON!"
|
||||
done
|
||||
|
||||
_CeladonGymBattleText4::
|
||||
|
|
@ -137,8 +138,8 @@ _CeladonGymAfterBattleText4::
|
|||
done
|
||||
|
||||
_CeladonGymBattleText5::
|
||||
text "Look at my grass"
|
||||
line "#MON!"
|
||||
text "Look at my GRASS-"
|
||||
line "type #MON!"
|
||||
|
||||
para "They're so easy"
|
||||
line "to raise!"
|
||||
|
|
@ -149,7 +150,7 @@ _CeladonGymEndBattleText5::
|
|||
prompt
|
||||
|
||||
_CeladonGymAfterBattleText5::
|
||||
text "We only use grass-"
|
||||
text "We only use GRASS-"
|
||||
line "type #MON at"
|
||||
cont "our GYM!"
|
||||
|
||||
|
|
@ -160,8 +161,8 @@ _CeladonGymAfterBattleText5::
|
|||
|
||||
_CeladonGymBattleText6::
|
||||
text "Don't bring any"
|
||||
line "bugs or fire"
|
||||
cont "#MON in here!"
|
||||
line "BUG- or FIRE-"
|
||||
cont "type #MON!"
|
||||
done
|
||||
|
||||
_CeladonGymEndBattleText6::
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ _CeladonMansionMorimotoNo:: ; USUM
|
|||
_CeladonMansionMorimotoDefeated:: ; LGPE, compressed
|
||||
text "When"
|
||||
line "it comes down"
|
||||
line "to it, you are"
|
||||
cont "to it, you are"
|
||||
cont "still the best!"
|
||||
prompt
|
||||
|
||||
|
|
|
|||
|
|
@ -51,31 +51,20 @@ _JackyAfterBattle::
|
|||
cont "slow motion..."
|
||||
|
||||
para "Ok! I will give"
|
||||
line "you a #MON"
|
||||
cont "to help you on"
|
||||
cont "your quest!"
|
||||
line "you a gift to"
|
||||
cont "help you on your"
|
||||
cont "quest!"
|
||||
|
||||
para "Over there is a"
|
||||
line "@"
|
||||
text_ram wcd6d
|
||||
text "!"
|
||||
line "rare #MON!"
|
||||
|
||||
para "Go, go, take it!"
|
||||
|
||||
; para "I look forward"
|
||||
; line "to our next bout!"
|
||||
done
|
||||
|
||||
_JackyGift::
|
||||
text_ram wcd6d
|
||||
text " has"
|
||||
line "incredibly good"
|
||||
cont "evolutionary"
|
||||
cont "potential!"
|
||||
|
||||
para "It will help"
|
||||
line "you greatly in"
|
||||
cont "your next bout!"
|
||||
line "I look forward to"
|
||||
line "our next bout!"
|
||||
done
|
||||
|
||||
_JackyN64::
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ _CelesteHillCaveBattleText2::
|
|||
_CelesteHillCaveEndBattleText2::
|
||||
text "...!"
|
||||
line "You are not an"
|
||||
cont "ordinary TRAINER!"
|
||||
cont "ordinary trainer!"
|
||||
prompt
|
||||
|
||||
_CelesteHillCaveAfterBattleText2:: ; Allusion to the lack of a Teachy TV
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
_MewtwoBattleText::
|
||||
text "Mew!@"
|
||||
text "MEWTWO: ..."
|
||||
|
||||
para "..."
|
||||
|
||||
para "...Mew!!!@"
|
||||
text_end
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ _MistyPreBattleText::
|
|||
|
||||
para "My policy is an"
|
||||
line "all-out offensive"
|
||||
cont "with water-type"
|
||||
cont "with WATER-type"
|
||||
cont "#MON!"
|
||||
done
|
||||
|
||||
|
|
@ -111,8 +111,8 @@ _CeruleanGymEndBattleText3::
|
|||
_CeruleanGymAfterBattleText3::
|
||||
text "Why is a FIRE-"
|
||||
line "FIGHTER in a"
|
||||
cont "GYM for water"
|
||||
cont "#MON?"
|
||||
cont "GYM for WATER-"
|
||||
cont "type #MON?"
|
||||
|
||||
para "Haha! You have to" ; Actually happens in real life!
|
||||
line "check for short"
|
||||
|
|
@ -121,13 +121,13 @@ _CeruleanGymAfterBattleText3::
|
|||
|
||||
_CeruleanGymGuidePreBattleText::
|
||||
text "Yo! Champ in"
|
||||
line "making!"
|
||||
line "the making!"
|
||||
|
||||
para "Here's my advice!"
|
||||
|
||||
para "The LEADER, MISTY,"
|
||||
line "is a pro who uses"
|
||||
cont "water #MON!"
|
||||
cont "WATER-types!"
|
||||
|
||||
para "You can drain all"
|
||||
line "their water with"
|
||||
|
|
@ -141,7 +141,7 @@ _CeruleanGymGuidePostBattleText::
|
|||
text "You beat MISTY!"
|
||||
line "What'd I tell ya?"
|
||||
|
||||
para "You and me kid,"
|
||||
para "You and me, kid,"
|
||||
line "we make a pretty"
|
||||
cont "darn good team!"
|
||||
done
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@ _ReceivedVolcanoBadgeText::
|
|||
|
||||
_BlainePostBattleAdviceText::
|
||||
text "FIRE BLAST is the"
|
||||
line "ultimate fire"
|
||||
line "ultimate fiery"
|
||||
cont "technique!"
|
||||
|
||||
para "Don't waste it on"
|
||||
line "water #MON!"
|
||||
line "WATER-types!"
|
||||
done
|
||||
|
||||
_BlaineVolcanoBadgeInfoText::
|
||||
|
|
@ -55,7 +55,7 @@ _TM38ExplanationText::
|
|||
para "TM38 contains"
|
||||
line "FIRE BLAST!"
|
||||
|
||||
para "Teach it to fire-"
|
||||
para "Teach it to FIRE-"
|
||||
line "type #MON!"
|
||||
|
||||
para "CHARMELEON or"
|
||||
|
|
@ -124,7 +124,7 @@ _CinnabarGymAfterBattleText3::
|
|||
|
||||
_CinnabarGymBattleText4::
|
||||
text "I just like using"
|
||||
line "fire #MON!"
|
||||
line "the FIRE-type!"
|
||||
done
|
||||
|
||||
_CinnabarGymEndBattleText4::
|
||||
|
|
@ -133,9 +133,9 @@ _CinnabarGymEndBattleText4::
|
|||
prompt
|
||||
|
||||
_CinnabarGymAfterBattleText4::
|
||||
text "I wish there was"
|
||||
line "a thief #MON!"
|
||||
cont "I'd use that!"
|
||||
text "I wonder...does a"
|
||||
line "FIRE-type thief"
|
||||
cont "#MON exist?"
|
||||
done
|
||||
|
||||
_CinnabarGymBattleText5::
|
||||
|
|
@ -170,9 +170,9 @@ _CinnabarGymEndBattleText6::
|
|||
prompt
|
||||
|
||||
_CinnabarGymAfterBattleText6::
|
||||
text "Us fire #MON"
|
||||
line "fans like PONYTA"
|
||||
cont "and NINETALES!"
|
||||
text "Us FIRE-type fans"
|
||||
line "like PONYTA and"
|
||||
cont "NINETALES a lot!"
|
||||
done
|
||||
|
||||
_CinnabarGymBattleText7::
|
||||
|
|
@ -186,21 +186,27 @@ _CinnabarGymEndBattleText7::
|
|||
prompt
|
||||
|
||||
_CinnabarGymAfterBattleText7::
|
||||
text "Water beats fire!"
|
||||
line "But, fire melts"
|
||||
cont "ice #MON!"
|
||||
text "Water beats fire,"
|
||||
line "but fire easily"
|
||||
cont "melts ice!"
|
||||
|
||||
para "WATER- and ICE-"
|
||||
line "type #MON like"
|
||||
cont "DEWGONG can be"
|
||||
cont "tricky..."
|
||||
done
|
||||
|
||||
_CinnabarGymGuidePreBattleText::
|
||||
text "Yo! Champ in"
|
||||
line "making!"
|
||||
line "the making!"
|
||||
|
||||
para "The hot-headed"
|
||||
line "BLAINE is a fire"
|
||||
cont "#MON pro!"
|
||||
line "BLAINE is a FIRE-"
|
||||
cont "type #MON pro!"
|
||||
|
||||
para "Douse his spirits"
|
||||
line "with water!"
|
||||
line "with WATER-type"
|
||||
cont "techniques!"
|
||||
|
||||
para "You better take"
|
||||
line "some BURN HEALs!"
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ _PoryZSalesmanText1::
|
|||
|
||||
para "Tell you what."
|
||||
line "You can get a"
|
||||
cont "copy for ¥2100."
|
||||
cont "copy for ¥3000."
|
||||
cont "What do you say?"
|
||||
|
||||
done
|
||||
|
|
@ -44,6 +44,11 @@ _PoryZSalesmanNoText::
|
|||
cont "chance!"
|
||||
done
|
||||
|
||||
_ReceivedDubiousDiscText::
|
||||
text "<PLAYER> received"
|
||||
line "DUBIOUS DISC!@"
|
||||
text_end
|
||||
|
||||
_PoryZSalesmanNoMoneyText::
|
||||
text "You'll need more"
|
||||
line "money than that!"
|
||||
|
|
@ -60,3 +65,5 @@ _PoryZBagFull::
|
|||
line "full! Can't sell"
|
||||
cont "you anything like"
|
||||
cont "that!"
|
||||
done
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue