Game-Decompilation/pokeyellow
1
0
Fork 0
mirror of https://github.com/pret/pokeyellow.git synced 2024-11-27 04:10:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokered

Browse Source
This commit is contained in:
dannye 2021-05-31 16:43:31 -05:00
commit 7a23e2a635
89 changed files with 1519 additions and 2060 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

498
data/wild/grass_water.asm
View File

@ -1,254 +1,254 @@
WildDataPointers:
table_width 2, WildDataPointers
dw NoMons ; PALLET_TOWN
dw NoMons ; VIRIDIAN_CITY
dw NoMons ; PEWTER_CITY
dw NoMons ; CERULEAN_CITY
dw NoMons ; LAVENDER_TOWN
dw NoMons ; VERMILION_CITY
dw NoMons ; CELADON_CITY
dw NoMons ; FUCHSIA_CITY
dw NoMons ; CINNABAR_ISLAND
dw NoMons ; INDIGO_PLATEAU
dw NoMons ; SAFFRON_CITY
dw NoMons ; unused
dw Route1Mons ; ROUTE_1
dw Route2Mons ; ROUTE_2
dw Route3Mons ; ROUTE_3
dw Route4Mons ; ROUTE_4
dw Route5Mons ; ROUTE_5
dw Route6Mons ; ROUTE_6
dw Route7Mons ; ROUTE_7
dw Route8Mons ; ROUTE_8
dw Route9Mons ; ROUTE_9
dw Route10Mons ; ROUTE_10
dw Route11Mons ; ROUTE_11
dw Route12Mons ; ROUTE_12
dw Route13Mons ; ROUTE_13
dw Route14Mons ; ROUTE_14
dw Route15Mons ; ROUTE_15
dw Route16Mons ; ROUTE_16
dw Route17Mons ; ROUTE_17
dw Route18Mons ; ROUTE_18
dw Route19Mons ; ROUTE_19
dw Route20Mons ; ROUTE_20
dw Route21Mons ; ROUTE_21
dw Route22Mons ; ROUTE_22
dw Route23Mons ; ROUTE_23
dw Route24Mons ; ROUTE_24
dw Route25Mons ; ROUTE_25
dw NoMons ; REDS_HOUSE_1F
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw ForestMons ; ViridianForest
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw MoonMons1
dw MoonMonsB1
dw MoonMonsB2
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw TunnelMonsB1
dw PowerPlantMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw PlateauMons1
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw TowerMons1
dw TowerMons2
dw TowerMons3
dw TowerMons4
dw TowerMons5
dw TowerMons6
dw TowerMons7
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw IslandMonsB1
dw IslandMonsB2
dw IslandMonsB3
dw IslandMonsB4
dw NoMons
dw NoMons
dw MansionMons1
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw IslandMons1
dw NoMons
dw PlateauMons2
dw NoMons
dw NoMons
dw CaveMons
dw PlateauMons3
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw MansionMons2
dw MansionMons3
dw MansionMonsB1
dw ZoneMons1
dw ZoneMons2
dw ZoneMons3
dw ZoneMonsCenter
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw DungeonMons2
dw DungeonMonsB1
dw DungeonMons1
dw NoMons
dw NoMons
dw NoMons
dw TunnelMonsB2
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NoMons
dw NothingWildMons ; PALLET_TOWN
dw NothingWildMons ; VIRIDIAN_CITY
dw NothingWildMons ; PEWTER_CITY
dw NothingWildMons ; CERULEAN_CITY
dw NothingWildMons ; LAVENDER_TOWN
dw NothingWildMons ; VERMILION_CITY
dw NothingWildMons ; CELADON_CITY
dw NothingWildMons ; FUCHSIA_CITY
dw NothingWildMons ; CINNABAR_ISLAND
dw NothingWildMons ; INDIGO_PLATEAU
dw NothingWildMons ; SAFFRON_CITY
dw NothingWildMons ; unused
dw Route1WildMons ; ROUTE_1
dw Route2WildMons ; ROUTE_2
dw Route3WildMons ; ROUTE_3
dw Route4WildMons ; ROUTE_4
dw Route5WildMons ; ROUTE_5
dw Route6WildMons ; ROUTE_6
dw Route7WildMons ; ROUTE_7
dw Route8WildMons ; ROUTE_8
dw Route9WildMons ; ROUTE_9
dw Route10WildMons ; ROUTE_10
dw Route11WildMons ; ROUTE_11
dw Route12WildMons ; ROUTE_12
dw Route13WildMons ; ROUTE_13
dw Route14WildMons ; ROUTE_14
dw Route15WildMons ; ROUTE_15
dw Route16WildMons ; ROUTE_16
dw Route17WildMons ; ROUTE_17
dw Route18WildMons ; ROUTE_18
dw Route19WildMons ; ROUTE_19
dw Route20WildMons ; ROUTE_20
dw Route21WildMons ; ROUTE_21
dw Route22WildMons ; ROUTE_22
dw Route23WildMons ; ROUTE_23
dw Route24WildMons ; ROUTE_24
dw Route25WildMons ; ROUTE_25
dw NothingWildMons ; REDS_HOUSE_1F
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw ViridianForestWildMons ; ViridianForest
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw MtMoon1FWildMons
dw MtMoonB1FWildMons
dw MtMoonB2FWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw RockTunnel1FWildMons
dw PowerPlantWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw VictoryRoad1FWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw PokemonTower1FWildMons
dw PokemonTower2FWildMons
dw PokemonTower3FWildMons
dw PokemonTower4FWildMons
dw PokemonTower5FWildMons
dw PokemonTower6FWildMons
dw PokemonTower7FWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw SeafoamIslandsB1FWildMons
dw SeafoamIslandsB2FWildMons
dw SeafoamIslandsB3FWildMons
dw SeafoamIslandsB4FWildMons
dw NothingWildMons
dw NothingWildMons
dw PokemonMansion1FWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw SeafoamIslands1FWildMons
dw NothingWildMons
dw VictoryRoad2FWildMons
dw NothingWildMons
dw NothingWildMons
dw DiglettsCaveWildMons
dw VictoryRoad3FWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw PokemonMansion2FWildMons
dw PokemonMansion3FWildMons
dw PokemonMansionB1FWildMons
dw SafariZoneEastWildMons
dw SafariZoneNorthWildMons
dw SafariZoneWestWildMons
dw SafariZoneCenterWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw CeruleanCave2FWildMons
dw CeruleanCaveB1FWildMons
dw CeruleanCave1FWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw RockTunnelB1FWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
assert_table_length NUM_MAPS
dw -1 ; end

2
data/wild/maps/CeruleanCave1F.asm
View File

@ -1,4 +1,4 @@
DungeonMons1:
CeruleanCave1FWildMons:
def_grass_wildmons 10 ; encounter rate
db 50, GOLBAT
db 55, GOLBAT

2
data/wild/maps/CeruleanCave2F.asm
View File

@ -1,4 +1,4 @@
DungeonMons2:
CeruleanCave2FWildMons:
def_grass_wildmons 15 ; encounter rate
db 52, GOLBAT
db 57, GOLBAT

2
data/wild/maps/CeruleanCaveB1F.asm
View File

@ -1,4 +1,4 @@
DungeonMonsB1:
CeruleanCaveB1FWildMons:
def_grass_wildmons 25 ; encounter rate
db 54, GOLBAT
db 59, GOLBAT

2
data/wild/maps/DiglettsCave.asm
View File

@ -1,4 +1,4 @@
CaveMons:
DiglettsCaveWildMons:
def_grass_wildmons 20 ; encounter rate
db 18, DIGLETT
db 19, DIGLETT

2
data/wild/maps/MtMoon1F.asm
View File

@ -1,4 +1,4 @@
MoonMons1:
MtMoon1FWildMons:
def_grass_wildmons 10 ; encounter rate
db 8, ZUBAT
db 9, ZUBAT

2
data/wild/maps/MtMoonB1F.asm
View File

@ -1,4 +1,4 @@
MoonMonsB1:
MtMoonB1FWildMons:
def_grass_wildmons 10 ; encounter rate
db 8, ZUBAT
db 9, ZUBAT

2
data/wild/maps/MtMoonB2F.asm
View File

@ -1,4 +1,4 @@
MoonMonsB2:
MtMoonB2FWildMons:
def_grass_wildmons 10 ; encounter rate
db 10, ZUBAT
db 11, GEODUDE

2
data/wild/maps/PokemonMansion1F.asm
View File

@ -1,4 +1,4 @@
MansionMons1:
PokemonMansion1FWildMons:
def_grass_wildmons 10 ; encounter rate
db 34, RATTATA
db 34, RATICATE

2
data/wild/maps/PokemonMansion2F.asm
View File

@ -1,4 +1,4 @@
MansionMons2:
PokemonMansion2FWildMons:
def_grass_wildmons 10 ; encounter rate
db 37, RATTATA
db 37, RATICATE

2
data/wild/maps/PokemonMansion3F.asm
View File

@ -1,4 +1,4 @@
MansionMons3:
PokemonMansion3FWildMons:
def_grass_wildmons 10 ; encounter rate
db 40, RATTATA
db 40, RATICATE

2
data/wild/maps/PokemonMansionB1F.asm
View File

@ -1,4 +1,4 @@
MansionMonsB1:
PokemonMansionB1FWildMons:
def_grass_wildmons 10 ; encounter rate
db 35, GRIMER
db 38, GRIMER

2
data/wild/maps/PokemonTower1F.asm
View File

@ -1,4 +1,4 @@
TowerMons1:
PokemonTower1FWildMons:
def_grass_wildmons 0 ; encounter rate
end_grass_wildmons

2
data/wild/maps/PokemonTower2F.asm
View File

@ -1,4 +1,4 @@
TowerMons2:
PokemonTower2FWildMons:
def_grass_wildmons 0 ; encounter rate
end_grass_wildmons

2
data/wild/maps/PokemonTower3F.asm
View File

@ -1,4 +1,4 @@
TowerMons3:
PokemonTower3FWildMons:
def_grass_wildmons 10 ; encounter rate
db 20, GASTLY
db 21, GASTLY

2
data/wild/maps/PokemonTower4F.asm
View File

@ -1,4 +1,4 @@
TowerMons4:
PokemonTower4FWildMons:
def_grass_wildmons 10 ; encounter rate
db 20, GASTLY
db 21, GASTLY

2
data/wild/maps/PokemonTower5F.asm
View File

@ -1,4 +1,4 @@
TowerMons5:
PokemonTower5FWildMons:
def_grass_wildmons 15 ; encounter rate
db 22, GASTLY
db 23, GASTLY

2
data/wild/maps/PokemonTower6F.asm
View File

@ -1,4 +1,4 @@
TowerMons6:
PokemonTower6FWildMons:
def_grass_wildmons 15 ; encounter rate
db 22, GASTLY
db 23, GASTLY

2
data/wild/maps/PokemonTower7F.asm
View File

@ -1,4 +1,4 @@
TowerMons7:
PokemonTower7FWildMons:
def_grass_wildmons 20 ; encounter rate
db 24, GASTLY
db 25, GASTLY

2
data/wild/maps/PowerPlant.asm
View File

@ -1,4 +1,4 @@
PowerPlantMons:
PowerPlantWildMons:
def_grass_wildmons 10 ; encounter rate
db 30, MAGNEMITE
db 35, MAGNEMITE

2
data/wild/maps/RockTunnel1F.asm
View File

@ -1,4 +1,4 @@
TunnelMonsB1:
RockTunnel1FWildMons:
def_grass_wildmons 15 ; encounter rate
db 15, ZUBAT
db 16, GEODUDE

2
data/wild/maps/RockTunnelB1F.asm
View File

@ -1,4 +1,4 @@
TunnelMonsB2:
RockTunnelB1FWildMons:
def_grass_wildmons 15 ; encounter rate
db 20, ZUBAT
db 17, GEODUDE

2
data/wild/maps/Route1.asm
View File

@ -1,4 +1,4 @@
Route1Mons:
Route1WildMons:
def_grass_wildmons 25 ; encounter rate
db 3, PIDGEY
db 4, PIDGEY

2
data/wild/maps/Route10.asm
View File

@ -1,4 +1,4 @@
Route10Mons:
Route10WildMons:
def_grass_wildmons 15 ; encounter rate
db 16, MAGNEMITE
db 18, RATTATA

2
data/wild/maps/Route11.asm
View File

@ -1,4 +1,4 @@
Route11Mons:
Route11WildMons:
def_grass_wildmons 15 ; encounter rate
db 16, PIDGEY
db 15, RATTATA

2
data/wild/maps/Route12.asm
View File

@ -1,4 +1,4 @@
Route12Mons:
Route12WildMons:
def_grass_wildmons 15 ; encounter rate
db 25, ODDISH
db 25, BELLSPROUT

2
data/wild/maps/Route13.asm
View File

@ -1,4 +1,4 @@
Route13Mons:
Route13WildMons:
def_grass_wildmons 15 ; encounter rate
db 25, ODDISH
db 25, BELLSPROUT

2
data/wild/maps/Route14.asm
View File

@ -1,4 +1,4 @@
Route14Mons:
Route14WildMons:
def_grass_wildmons 15 ; encounter rate
db 26, ODDISH
db 26, BELLSPROUT

2
data/wild/maps/Route15.asm
View File

@ -1,4 +1,4 @@
Route15Mons:
Route15WildMons:
def_grass_wildmons 15 ; encounter rate
db 26, ODDISH
db 26, BELLSPROUT

2
data/wild/maps/Route16.asm
View File

@ -1,4 +1,4 @@
Route16Mons:
Route16WildMons:
def_grass_wildmons 25 ; encounter rate
db 22, SPEAROW
db 22, DODUO

2
data/wild/maps/Route17.asm
View File

@ -1,4 +1,4 @@
Route17Mons:
Route17WildMons:
def_grass_wildmons 25 ; encounter rate
db 26, DODUO
db 27, FEAROW

2
data/wild/maps/Route18.asm
View File

@ -1,4 +1,4 @@
Route18Mons:
Route18WildMons:
def_grass_wildmons 25 ; encounter rate
db 22, SPEAROW
db 22, DODUO

2
data/wild/maps/Route19.asm
View File

@ -1,4 +1,4 @@
Route19Mons:
Route19WildMons:
def_grass_wildmons 0 ; encounter rate
end_grass_wildmons

2
data/wild/maps/Route2.asm
View File

@ -1,4 +1,4 @@
Route2Mons:
Route2WildMons:
def_grass_wildmons 25 ; encounter rate
db 3, RATTATA
db 3, PIDGEY

2
data/wild/maps/Route20.asm
View File

@ -1,4 +1,4 @@
Route20Mons:
Route20WildMons:
def_grass_wildmons 0 ; encounter rate
end_grass_wildmons

2
data/wild/maps/Route21.asm
View File

@ -1,4 +1,4 @@
Route21Mons:
Route21WildMons:
def_grass_wildmons 25 ; encounter rate
db 15, PIDGEY
db 13, RATTATA

2
data/wild/maps/Route22.asm
View File

@ -1,4 +1,4 @@
Route22Mons:
Route22WildMons:
def_grass_wildmons 25 ; encounter rate
db 2, NIDORAN_M
db 2, NIDORAN_F

2
data/wild/maps/Route23.asm
View File

@ -1,4 +1,4 @@
Route23Mons:
Route23WildMons:
def_grass_wildmons 10 ; encounter rate
db 41, NIDORINO
db 41, NIDORINA

2
data/wild/maps/Route24.asm
View File

@ -1,4 +1,4 @@
Route24Mons:
Route24WildMons:
def_grass_wildmons 25 ; encounter rate
db 12, ODDISH
db 12, BELLSPROUT

2
data/wild/maps/Route25.asm
View File

@ -1,4 +1,4 @@
Route25Mons:
Route25WildMons:
def_grass_wildmons 15 ; encounter rate
db 12, ODDISH
db 12, BELLSPROUT

2
data/wild/maps/Route3.asm
View File

@ -1,4 +1,4 @@
Route3Mons:
Route3WildMons:
def_grass_wildmons 20 ; encounter rate
db 8, SPEAROW
db 9, SPEAROW

2
data/wild/maps/Route4.asm
View File

@ -1,4 +1,4 @@
Route4Mons:
Route4WildMons:
def_grass_wildmons 20 ; encounter rate
db 8, SPEAROW
db 9, SPEAROW

2
data/wild/maps/Route5.asm
View File

@ -1,4 +1,4 @@
Route5Mons:
Route5WildMons:
def_grass_wildmons 15 ; encounter rate
db 15, PIDGEY
db 14, RATTATA

2
data/wild/maps/Route6.asm
View File

@ -1,4 +1,4 @@
Route6Mons:
Route6WildMons:
def_grass_wildmons 15 ; encounter rate
db 15, PIDGEY
db 14, RATTATA

2
data/wild/maps/Route7.asm
View File

@ -1,4 +1,4 @@
Route7Mons:
Route7WildMons:
def_grass_wildmons 15 ; encounter rate
db 20, PIDGEY
db 22, PIDGEY

2
data/wild/maps/Route8.asm
View File

@ -1,4 +1,4 @@
Route8Mons:
Route8WildMons:
def_grass_wildmons 15 ; encounter rate
db 20, PIDGEY
db 22, PIDGEY

2
data/wild/maps/Route9.asm
View File

@ -1,4 +1,4 @@
Route9Mons:
Route9WildMons:
def_grass_wildmons 15 ; encounter rate
db 16, NIDORAN_M
db 16, NIDORAN_F

2
data/wild/maps/SafariZoneCenter.asm
View File

@ -1,4 +1,4 @@
ZoneMonsCenter:
SafariZoneCenterWildMons:
def_grass_wildmons 30 ; encounter rate
db 14, NIDORAN_M
db 36, NIDORAN_F

2
data/wild/maps/SafariZoneEast.asm
View File

@ -1,4 +1,4 @@
ZoneMons1:
SafariZoneEastWildMons:
def_grass_wildmons 30 ; encounter rate
db 21, NIDORAN_M
db 29, NIDORAN_F

2
data/wild/maps/SafariZoneNorth.asm
View File

@ -1,4 +1,4 @@
ZoneMons2:
SafariZoneNorthWildMons:
def_grass_wildmons 30 ; encounter rate
db 36, NIDORAN_M
db 14, NIDORAN_F

2
data/wild/maps/SafariZoneWest.asm
View File

@ -1,4 +1,4 @@
ZoneMons3:
SafariZoneWestWildMons:
def_grass_wildmons 30 ; encounter rate
db 29, NIDORAN_M
db 21, NIDORAN_F

2
data/wild/maps/SeafoamIslands1F.asm
View File

@ -1,4 +1,4 @@
IslandMons1:
SeafoamIslands1FWildMons:
def_grass_wildmons 15 ; encounter rate
db 18, ZUBAT
db 25, KRABBY

2
data/wild/maps/SeafoamIslandsB1F.asm
View File

@ -1,4 +1,4 @@
IslandMonsB1:
SeafoamIslandsB1FWildMons:
def_grass_wildmons 10 ; encounter rate
db 27, ZUBAT
db 26, KRABBY

2
data/wild/maps/SeafoamIslandsB2F.asm
View File

@ -1,4 +1,4 @@
IslandMonsB2:
SeafoamIslandsB2FWildMons:
def_grass_wildmons 10 ; encounter rate
db 27, ZUBAT
db 27, KRABBY

2
data/wild/maps/SeafoamIslandsB3F.asm
View File

@ -1,4 +1,4 @@
IslandMonsB3:
SeafoamIslandsB3FWildMons:
def_grass_wildmons 10 ; encounter rate
db 27, GOLBAT
db 36, ZUBAT

2
data/wild/maps/SeafoamIslandsB4F.asm
View File

@ -1,4 +1,4 @@
IslandMonsB4:
SeafoamIslandsB4FWildMons:
def_grass_wildmons 10 ; encounter rate
db 36, GOLBAT
db 36, ZUBAT

2
data/wild/maps/VictoryRoad1F.asm
View File

@ -1,4 +1,4 @@
PlateauMons1:
VictoryRoad1FWildMons:
def_grass_wildmons 15 ; encounter rate
db 26, GEODUDE
db 31, GEODUDE

2
data/wild/maps/VictoryRoad2F.asm
View File

@ -1,4 +1,4 @@
PlateauMons2:
VictoryRoad2FWildMons:
def_grass_wildmons 10 ; encounter rate
db 31, GEODUDE
db 36, GEODUDE

2
data/wild/maps/VictoryRoad3F.asm
View File

@ -1,4 +1,4 @@
PlateauMons3:
VictoryRoad3FWildMons:
def_grass_wildmons 15 ; encounter rate
db 36, GEODUDE
db 44, GOLBAT

2
data/wild/maps/ViridianForest.asm
View File

@ -1,4 +1,4 @@
ForestMons:
ViridianForestWildMons:
def_grass_wildmons 25 ; encounter rate
db 3, CATERPIE
db 4, METAPOD

2
data/wild/maps/nothing.asm
View File

@ -1,4 +1,4 @@
NoMons:
NothingWildMons:
def_grass_wildmons 0 ; encounter rate
end_grass_wildmons

69
engine/battle/init_battle.asm
View File

@ -188,95 +188,96 @@ LoadMonBackPic:
ld b, a
jp CopyVideoData
; animates the mon "growing" out of the pokeball
AnimateSendingOutMon:
ld a, [wPredefRegisters]
ld a, [wPredefHL]
ld h, a
ld a, [wPredefRegisters + 1]
ld a, [wPredefHL + 1]
ld l, a
ldh a, [hStartTileID]
ldh [hDownArrowBlinkCount1], a
ldh [hBaseTileID], a
ld b, $4c
ld a, [wIsInBattle]
and a
jr z, .asm_f61ef
jr z, .notInBattle
add b
ld [hl], a
call Delay3
ld bc, -41
ld bc, -(SCREEN_WIDTH * 2 + 1)
add hl, bc
ld a, $1
ld [wNumMovesMinusOne], a
ld bc, $303
ld a, 1
ld [wDownscaledMonSize], a
lb bc, 3, 3
predef CopyDownscaledMonTiles
ld c, $4
ld c, 4
call DelayFrames
ld bc, -41
ld bc, -(SCREEN_WIDTH * 2 + 1)
add hl, bc
xor a
ld [wNumMovesMinusOne], a
ld bc, $505
ld [wDownscaledMonSize], a
lb bc, 5, 5
predef CopyDownscaledMonTiles
ld c, $5
ld c, 5
call DelayFrames
ld bc, -41
jr .asm_f61f2
.asm_f61ef
ld bc, -123
.asm_f61f2
ld bc, -(SCREEN_WIDTH * 2 + 1)
jr .next
.notInBattle
ld bc, -(SCREEN_WIDTH * 6 + 3)
.next
add hl, bc
ldh a, [hDownArrowBlinkCount1]
ldh a, [hBaseTileID]
add $31
jr CopyUncompressedPicToHL
CopyUncompressedPicToTilemap:
ld a, [wPredefRegisters]
ld a, [wPredefHL]
ld h, a
ld a, [wPredefRegisters + 1]
ld a, [wPredefHL + 1]
ld l, a
ldh a, [hStartTileID]
CopyUncompressedPicToHL::
ld bc, $707
ld de, $14
lb bc, 7, 7
ld de, SCREEN_WIDTH
push af
ld a, [wSpriteFlipped]
and a
jr nz, .asm_f6220
jr nz, .flipped
pop af
.asm_f6211
.loop
push bc
push hl
.asm_f6213
.innerLoop
ld [hl], a
add hl, de
inc a
dec c
jr nz, .asm_f6213
jr nz, .innerLoop
pop hl
inc hl
pop bc
dec b
jr nz, .asm_f6211
jr nz, .loop
ret
.asm_f6220
.flipped
push bc
ld b, $0
ld b, 0
dec c
add hl, bc
pop bc
pop af
.asm_f6227
.flippedLoop
push bc
push hl
.asm_f6229
.flippedInnerLoop
ld [hl], a
add hl, de
inc a
dec c
jr nz, .asm_f6229
jr nz, .flippedInnerLoop
pop hl
dec hl
pop bc
dec b
jr nz, .asm_f6227
jr nz, .flippedLoop
ret

2
engine/items/town_map.asm
View File

@ -260,7 +260,7 @@ ToText:
db "To@"
BuildFlyLocationsList:
ld hl, wFlyLocationsList - 1
ld hl, wFlyAnimUsingCoordList
ld [hl], $ff
inc hl
ld a, [wTownVisitedFlag]

2
engine/menus/party_menu.asm
View File

@ -139,7 +139,7 @@ RedrawPartyMenu_::
ld l, a
ld de, wEvosMoves
ld a, BANK(EvosMovesPointerTable)
ld bc, wEvosMoves.end - wEvosMoves
ld bc, wEvosMovesEnd - wEvosMoves
call FarCopyData
ld hl, wEvosMoves
ld de, .notAbleToEvolveText

24
engine/overworld/dust_smoke.asm
View File

@ -53,22 +53,16 @@ GetMoveBoulderDustFunctionPointer:
pop hl
ret
boulder_dust_adjust: MACRO
db \1, \2 ; coords
dw \3 ; function
ENDM
MoveBoulderDustFunctionPointerTable:
; facing down
db $FF,$00
dw AdjustOAMBlockYPos
; facing up
db $01,$00
dw AdjustOAMBlockYPos
; facing left
db $01,$01
dw AdjustOAMBlockXPos
; facing right
db $FF,$01
dw AdjustOAMBlockXPos
boulder_dust_adjust -1, 0, AdjustOAMBlockYPos ; down
boulder_dust_adjust 1, 0, AdjustOAMBlockYPos ; up
boulder_dust_adjust 1, 1, AdjustOAMBlockXPos ; left
boulder_dust_adjust -1, 1, AdjustOAMBlockXPos ; right
LoadSmokeTileFourTimes::
ld hl, vChars1 tile $7c

10
engine/predefs.asm
View File

@ -1,20 +1,20 @@
GetPredefPointer::
; Store the contents of the register
; pairs (hl, de, bc) at wPredefRegisters.
; Back up the contents of the registers (hl, de, bc).
; Then put the bank and address of predef
; wPredefID in [wPredefBank] and hl.
ld a, h
ld [wPredefRegisters], a
ld [wPredefHL], a
ld a, l
ld [wPredefRegisters + 1], a
ld [wPredefHL + 1], a
ld hl, wPredefRegisters + 2
ld hl, wPredefDE
ld a, d
ld [hli], a
ld a, e
ld [hli], a
ASSERT wPredefDE + 2 == wPredefBC
ld a, b
ld [hli], a
ld [hl], c

42
home/overworld.asm
View File

@ -522,7 +522,7 @@ CheckMapConnections::
ld a, [wXCoord]
cp $ff
jr nz, .checkEastMap
ld a, [wMapConn3Ptr]
ld a, [wWestConnectedMap]
ld [wCurMap], a
ld a, [wWestConnectedMapXAlignment] ; new X coordinate upon entering west map
ld [wXCoord], a
@ -559,7 +559,7 @@ CheckMapConnections::
ld a, [wCurrentMapWidth2] ; map width
cp b
jr nz, .checkNorthMap
ld a, [wMapConn4Ptr]
ld a, [wEastConnectedMap]
ld [wCurMap], a
ld a, [wEastConnectedMapXAlignment] ; new X coordinate upon entering east map
ld [wXCoord], a
@ -595,7 +595,7 @@ CheckMapConnections::
ld a, [wYCoord]
cp $ff
jr nz, .checkSouthMap
ld a, [wMapConn1Ptr]
ld a, [wNorthConnectedMap]
ld [wCurMap], a
ld a, [wNorthConnectedMapYAlignment] ; new Y coordinate upon entering north map
ld [wYCoord], a
@ -623,7 +623,7 @@ CheckMapConnections::
ld a, [wCurrentMapHeight2]
cp b
jr nz, .didNotEnterConnectedMap
ld a, [wMapConn2Ptr]
ld a, [wSouthConnectedMap]
ld [wCurMap], a
ld a, [wSouthConnectedMapYAlignment] ; new Y coordinate upon entering south map
ld [wYCoord], a
@ -919,7 +919,7 @@ LoadTileBlockMap::
dec b
jr nz, .rowLoop
.northConnection
ld a, [wMapConn1Ptr]
ld a, [wNorthConnectedMap]
cp $ff
jr z, .southConnection
call SwitchToMapRomBank
@ -931,13 +931,13 @@ LoadTileBlockMap::
ld e, a
ld a, [wNorthConnectionStripDest + 1]
ld d, a
ld a, [wNorthConnectionStripWidth]
ld a, [wNorthConnectionStripLength]
ldh [hNorthSouthConnectionStripWidth], a
ld a, [wNorthConnectedMapWidth]
ldh [hNorthSouthConnectedMapWidth], a
call LoadNorthSouthConnectionsTileMap
.southConnection
ld a, [wMapConn2Ptr]
ld a, [wSouthConnectedMap]
cp $ff
jr z, .westConnection
call SwitchToMapRomBank
@ -949,13 +949,13 @@ LoadTileBlockMap::
ld e, a
ld a, [wSouthConnectionStripDest + 1]
ld d, a
ld a, [wSouthConnectionStripWidth]
ld a, [wSouthConnectionStripLength]
ldh [hNorthSouthConnectionStripWidth], a
ld a, [wSouthConnectedMapWidth]
ldh [hNorthSouthConnectedMapWidth], a
call LoadNorthSouthConnectionsTileMap
.westConnection
ld a, [wMapConn3Ptr]
ld a, [wWestConnectedMap]
cp $ff
jr z, .eastConnection
call SwitchToMapRomBank
@ -967,13 +967,13 @@ LoadTileBlockMap::
ld e, a
ld a, [wWestConnectionStripDest + 1]
ld d, a
ld a, [wWestConnectionStripHeight]
ld a, [wWestConnectionStripLength]
ld b, a
ld a, [wWestConnectedMapWidth]
ldh [hEastWestConnectedMapWidth], a
call LoadEastWestConnectionsTileMap
.eastConnection
ld a, [wMapConn4Ptr]
ld a, [wEastConnectedMap]
cp $ff
jr z, .done
call SwitchToMapRomBank
@ -985,7 +985,7 @@ LoadTileBlockMap::
ld e, a
ld a, [wEastConnectionStripDest + 1]
ld d, a
ld a, [wEastConnectionStripHeight]
ld a, [wEastConnectionStripLength]
ld b, a
ld a, [wEastConnectedMapWidth]
ldh [hEastWestConnectedMapWidth], a
@ -1827,32 +1827,32 @@ asm_0dbd:
jr nz, .copyFixedHeaderLoop
; initialize all the connected maps to disabled at first, before loading the actual values
ld a, $ff
ld [wMapConn1Ptr], a
ld [wMapConn2Ptr], a
ld [wMapConn3Ptr], a
ld [wMapConn4Ptr], a
ld [wNorthConnectedMap], a
ld [wSouthConnectedMap], a
ld [wWestConnectedMap], a
ld [wEastConnectedMap], a
; copy connection data (if any) to WRAM
ld a, [wMapConnections]
ld b, a
.checkNorth
bit 3, b
jr z, .checkSouth
ld de, wMapConn1Ptr
ld de, wNorthConnectionHeader
call CopyMapConnectionHeader
.checkSouth
bit 2, b
jr z, .checkWest
ld de, wMapConn2Ptr
ld de, wSouthConnectionHeader
call CopyMapConnectionHeader
.checkWest
bit 1, b
jr z, .checkEast
ld de, wMapConn3Ptr
ld de, wWestConnectionHeader
call CopyMapConnectionHeader
.checkEast
bit 0, b
jr z, .getObjectDataPointer
ld de, wMapConn4Ptr
ld de, wEastConnectionHeader
call CopyMapConnectionHeader
.getObjectDataPointer
ld a, [hli]
@ -1875,7 +1875,7 @@ asm_0dbd:
ld c, a
ld de, wWarpEntries
.warpLoop ; one warp per loop iteration
ld b, $04
ld b, 4
.warpInnerLoop
ld a, [hli]
ld [de], a

12
home/predef.asm
View File

@ -33,16 +33,16 @@ Predef::
GetPredefRegisters::
; Restore the contents of register pairs
; when GetPredefPointer was called.
ld a, [wPredefRegisters + 0]
ld a, [wPredefHL]
ld h, a
ld a, [wPredefRegisters + 1]
ld a, [wPredefHL + 1]
ld l, a
ld a, [wPredefRegisters + 2]
ld a, [wPredefDE]
ld d, a
ld a, [wPredefRegisters + 3]
ld a, [wPredefDE + 1]
ld e, a
ld a, [wPredefRegisters + 4]
ld a, [wPredefBC]
ld b, a
ld a, [wPredefRegisters + 5]
ld a, [wPredefBC + 1]
ld c, a
ret

11
macros/wram.asm
View File

@ -103,6 +103,17 @@ sprite_oam_struct: MACRO
\1Attributes:: db
ENDM
map_connection_struct: MACRO
\1ConnectedMap:: db
\1ConnectionStripSrc:: dw
\1ConnectionStripDest:: dw
\1ConnectionStripLength:: db
\1ConnectedMapWidth:: db
\1ConnectedMapYAlignment:: db
\1ConnectedMapXAlignment:: db
\1ConnectedMapViewPointer:: dw
ENDM
animated_object: MACRO
\1Index:: db
\1FramesetID:: db

84
scripts/CeladonGym.asm
View File

@ -22,7 +22,7 @@ CeladonGym_Script:
.LeaderName:
db "ERIKA@"
CeladonGymText_48943:
CeladonGymResetScripts:
xor a
ld [wJoyIgnore], a
ld [wCeladonGymCurScript], a
@ -33,16 +33,16 @@ CeladonGym_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
dw CeladonGymScript3
dw CeladonGymErikaPostBattle
CeladonGymScript3:
CeladonGymErikaPostBattle:
ld a, [wIsInBattle]
cp $ff
jp z, CeladonGymText_48943
jp z, CeladonGymResetScripts
ld a, $f0
ld [wJoyIgnore], a
CeladonGymText_48963:
CeladonGymReceiveTM21:
ld a, $9
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
@ -68,19 +68,19 @@ CeladonGymText_48963:
; deactivate gym trainers
SetEventRange EVENT_BEAT_CELADON_GYM_TRAINER_0, EVENT_BEAT_CELADON_GYM_TRAINER_6
jp CeladonGymText_48943
jp CeladonGymResetScripts
CeladonGym_TextPointers:
dw CeladonGymText1
dw CeladonGymText2
dw CeladonGymText3
dw CeladonGymText4
dw CeladonGymText5
dw CeladonGymText6
dw CeladonGymText7
dw CeladonGymText8
dw CeladonGymText9
dw TM21Text
dw ErikaText
dw CeladonGymTrainerText1
dw CeladonGymTrainerText2
dw CeladonGymTrainerText3
dw CeladonGymTrainerText4
dw CeladonGymTrainerText5
dw CeladonGymTrainerText6
dw CeladonGymTrainerText7
dw ErikaRainbowBadgeInfoText
dw ReceivedTM21Text
dw TM21NoRoomText
CeladonGymTrainerHeaders:
@ -101,27 +101,27 @@ CeladonGymTrainerHeader6:
trainer EVENT_BEAT_CELADON_GYM_TRAINER_6, 3, CeladonGymBattleText8, CeladonGymEndBattleText8, CeladonGymAfterBattleText8
db -1 ; end
CeladonGymText1:
ErikaText:
text_asm
CheckEvent EVENT_BEAT_ERIKA
jr z, .beginBattle
jr z, .beforeBeat
CheckEventReuseA EVENT_GOT_TM21
jr nz, .afterVictory
call z, CeladonGymText_48963
jr nz, .afterBeat
call z, CeladonGymReceiveTM21
call DisableWaitingAfterTextDisplay
jr .done
.afterVictory
ld hl, CeladonGymText_48a68
.afterBeat
ld hl, ErikaPostBattleAdviceText
call PrintText
jr .done
.beginBattle
ld hl, CeladonGymText_48a5e
.beforeBeat
ld hl, ErikaPreBattleText
call PrintText
ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, CeladonGymText_48a63
ld de, CeladonGymText_48a63
ld hl, ReceivedRainbowBadgeText
ld de, ReceivedRainbowBadgeText
call SaveEndBattleTextPointers
ldh a, [hSpriteIndex]
ld [wSpriteIndex], a
@ -135,23 +135,23 @@ CeladonGymText1:
.done
jp TextScriptEnd
CeladonGymText_48a5e:
text_far _CeladonGymText_48a5e
ErikaPreBattleText:
text_far _ErikaPreBattleText
text_end
CeladonGymText_48a63:
text_far _CeladonGymText_48a63
ReceivedRainbowBadgeText:
text_far _ReceivedRainbowBadgeText
text_end
CeladonGymText_48a68:
text_far _CeladonGymText_48a68
ErikaPostBattleAdviceText:
text_far _ErikaPostBattleAdviceText
text_end
CeladonGymText9:
text_far _CeladonGymText9
ErikaRainbowBadgeInfoText:
text_far _ErikaRainbowBadgeInfoText
text_end
TM21Text:
ReceivedTM21Text:
text_far _ReceivedTM21Text
sound_get_item_1
text_far _TM21ExplanationText
@ -161,7 +161,7 @@ TM21NoRoomText:
text_far _TM21NoRoomText
text_end
CeladonGymText2:
CeladonGymTrainerText1:
text_asm
ld hl, CeladonGymTrainerHeader0
call TalkToTrainer
@ -179,7 +179,7 @@ CeladonGymAfterBattleText2:
text_far _CeladonGymAfterBattleText2
text_end
CeladonGymText3:
CeladonGymTrainerText2:
text_asm
ld hl, CeladonGymTrainerHeader1
call TalkToTrainer
@ -197,7 +197,7 @@ CeladonGymAfterBattleText3:
text_far _CeladonGymAfterBattleText3
text_end
CeladonGymText4:
CeladonGymTrainerText3:
text_asm
ld hl, CeladonGymTrainerHeader2
call TalkToTrainer
@ -215,7 +215,7 @@ CeladonGymAfterBattleText4:
text_far _CeladonGymAfterBattleText4
text_end
CeladonGymText5:
CeladonGymTrainerText4:
text_asm
ld hl, CeladonGymTrainerHeader3
call TalkToTrainer
@ -233,7 +233,7 @@ CeladonGymAfterBattleText5:
text_far _CeladonGymAfterBattleText5
text_end
CeladonGymText6:
CeladonGymTrainerText5:
text_asm
ld hl, CeladonGymTrainerHeader4
call TalkToTrainer
@ -251,7 +251,7 @@ CeladonGymAfterBattleText6:
text_far _CeladonGymAfterBattleText6
text_end
CeladonGymText7:
CeladonGymTrainerText6:
text_asm
ld hl, CeladonGymTrainerHeader5
call TalkToTrainer
@ -269,7 +269,7 @@ CeladonGymAfterBattleText7:
text_far _CeladonGymAfterBattleText7
text_end
CeladonGymText8:
CeladonGymTrainerText7:
text_asm
ld hl, CeladonGymTrainerHeader6
call TalkToTrainer

80
scripts/CeruleanCity.asm
View File

@ -40,18 +40,18 @@ IF DEF(_DEBUG)
ret nz
ENDC
CheckEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF
jr nz, .asm_194f7
jr nz, .skipRocketThiefEncounter
ld hl, CeruleanCityCoords1
call ArePlayerCoordsInArray
jr nc, .asm_194f7
jr nc, .skipRocketThiefEncounter
ld a, [wCoordIndex]
cp $1
ld a, PLAYER_DIR_UP
ld b, SPRITE_FACING_DOWN
jr nz, .asm_194e6
jr nz, .playerBelowRocketThief
ld a, PLAYER_DIR_DOWN
ld b, SPRITE_FACING_UP
.asm_194e6
.playerBelowRocketThief
ld [wPlayerMovingDirection], a
ld a, b
ld [wSprite02StateData1FacingDirection], a
@ -59,7 +59,7 @@ ENDC
ld a, $2
ldh [hSpriteIndexOrTextID], a
jp DisplayTextID
.asm_194f7
.skipRocketThiefEncounter
CheckEvent EVENT_BEAT_CERULEAN_RIVAL
ret nz
ld hl, CeruleanCityCoords2
@ -67,9 +67,9 @@ ENDC
ret nc
ld a, [wWalkBikeSurfState]
and a
jr z, .asm_19512
jr z, .walking
call StopAllMusic
.asm_19512
.walking
ld c, BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
@ -78,15 +78,15 @@ ENDC
ld a, $f0
ld [wJoyIgnore], a
ld a, [wXCoord]
cp 20
jr z, .asm_19535
cp 20 ; is the player standing on the right side of the bridge?
jr z, .playerOnRightSideOfBridge
ld a, $1
ldh [hSpriteIndex], a
ld a, SPRITESTATEDATA2_MAPX
ldh [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData2
ld [hl], 25
.asm_19535
.playerOnRightSideOfBridge
ld a, HS_CERULEAN_RIVAL
ld [wMissableObjectIndex], a
predef ShowObject
@ -164,13 +164,13 @@ CeruleanCityScript2:
ldh [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld a, [wXCoord]
cp 20
jr nz, .asm_195f0
cp 20 ; is the player standing on the right side of the bridge?
jr nz, .playerOnRightSideOfBridge
ld de, CeruleanCityMovement4
jr .asm_195f3
.asm_195f0
jr .skip
.playerOnRightSideOfBridge
ld de, CeruleanCityMovement3
.asm_195f3
.skip
ld a, $1
ldh [hSpriteIndex], a
call MoveSprite
@ -265,7 +265,7 @@ CeruleanCityText_19677:
CeruleanCityText2:
text_asm
CheckEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF
jr nz, .asm_4ca20
jr nz, .beatRocketThief
ld hl, CeruleanCityText_196d9
call PrintText
ld hl, wd72d
@ -281,7 +281,7 @@ CeruleanCityText2:
ld a, $4
ld [wCeruleanCityCurScript], a
jp TextScriptEnd
.asm_4ca20
.beatRocketThief
ld hl, CeruleanCityText_196f3
call PrintText
lb bc, TM_DIG, 1
@ -342,21 +342,22 @@ CeruleanCityText6:
CeruleanCityText7:
text_asm
ldh a, [hRandomAdd]
cp 180
jr c, .asm_e9fc9
cp 180 ; 76/256 chance of 1st dialogue
jr c, .notFirstText
ld hl, CeruleanCityText_19730
call PrintText
jr .asm_d486e
.asm_e9fc9
cp 100
jr c, .asm_df99b
jr .end
.notFirstText
cp 100 ; 80/256 chance of 2nd dialogue
jr c, .notSecondText
ld hl, CeruleanCityText_19735
call PrintText
jr .asm_d486e
.asm_df99b
jr .end
.notSecondText
; 100/256 chance of 3rd dialogue
ld hl, CeruleanCityText_1973a
call PrintText
.asm_d486e
.end
jp TextScriptEnd
CeruleanCityText_19730:
@ -374,27 +375,28 @@ CeruleanCityText_1973a:
CeruleanCityText8:
text_asm
ldh a, [hRandomAdd]
cp 180
jr c, .asm_e28da
cp 180 ; 76/256 chance of 1st dialogue
jr c, .notFirstText
ld hl, CeruleanCityText_1976f
call PrintText
jr .asm_f2f38
.asm_e28da
cp 120
jr c, .asm_15d08
jr .end
.notFirstText
cp 120 ; 60/256 chance of 2nd dialogue
jr c, .notSecondText
ld hl, CeruleanCityText_19774
call PrintText
jr .asm_f2f38
.asm_15d08
cp 60
jr c, .asm_d7fea
jr .end
.notSecondText
cp 60 ; 60/256 chance of 3rd dialogue
jr c, .notThirdText
ld hl, CeruleanCityText_19779
call PrintText
jr .asm_f2f38
.asm_d7fea
jr .end
.notThirdText
; 60/256 chance of 4th dialogue
ld hl, CeruleanCityText_1977e
call PrintText
.asm_f2f38
.end
jp TextScriptEnd
CeruleanCityText_1976f:

94
scripts/CeruleanGym.asm
View File

@ -22,7 +22,7 @@ CeruleanGym_Script:
.LeaderName:
db "MISTY@"
CeruleanGymScript_5c6ed:
CeruleanGymResetScripts:
xor a
ld [wJoyIgnore], a
ld [wCeruleanGymCurScript], a
@ -33,16 +33,16 @@ CeruleanGym_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
dw CeruleanGymScript3
dw CeruleanGymMistyPostBattle
CeruleanGymScript3:
CeruleanGymMistyPostBattle:
ld a, [wIsInBattle]
cp $ff
jp z, CeruleanGymScript_5c6ed
jp z, CeruleanGymResetScripts
ld a, $f0
ld [wJoyIgnore], a
CeruleanGymScript_5c70d:
CeruleanGymReceiveTM11:
ld a, $5
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
@ -68,16 +68,16 @@ CeruleanGymScript_5c70d:
; deactivate gym trainers
SetEvents EVENT_BEAT_CERULEAN_GYM_TRAINER_0, EVENT_BEAT_CERULEAN_GYM_TRAINER_1
jp CeruleanGymScript_5c6ed
jp CeruleanGymResetScripts
CeruleanGym_TextPointers:
dw CeruleanGymText1
dw CeruleanGymText2
dw CeruleanGymText3
dw CeruleanGymText4
dw CeruleanGymText5
dw CeruleanGymText6
dw CeruleanGymText7
dw MistyText
dw CeruleanGymTrainerText1
dw CeruleanGymTrainerText2
dw CeruleanGymGuideText
dw MistyCascadeBadgeInfoText
dw ReceivedTM11Text
dw TM11NoRoomText
CeruleanGymTrainerHeaders:
def_trainers 2
@ -87,27 +87,27 @@ CeruleanGymTrainerHeader1:
trainer EVENT_BEAT_CERULEAN_GYM_TRAINER_1, 3, CeruleanGymBattleText2, CeruleanGymEndBattleText2, CeruleanGymAfterBattleText2
db -1 ; end
CeruleanGymText1:
MistyText:
text_asm
CheckEvent EVENT_BEAT_MISTY
jr z, .beginBattle
jr z, .beforeBeat
CheckEventReuseA EVENT_GOT_TM11
jr nz, .afterVictory
call z, CeruleanGymScript_5c70d
jr nz, .afterBeat
call z, CeruleanGymReceiveTM11
call DisableWaitingAfterTextDisplay
jr .done
.afterVictory
ld hl, CeruleanGymText_5c7c3
.afterBeat
ld hl, TM11ExplanationText
call PrintText
jr .done
.beginBattle
ld hl, CeruleanGymText_5c7be
.beforeBeat
ld hl, MistyPreBattleText
call PrintText
ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, CeruleanGymText_5c7d8
ld de, CeruleanGymText_5c7d8
ld hl, ReceivedCascadeBadgeText
ld de, ReceivedCascadeBadgeText
call SaveEndBattleTextPointers
ldh a, [hSpriteIndex]
ld [wSpriteIndex], a
@ -122,32 +122,32 @@ CeruleanGymText1:
.done
jp TextScriptEnd
CeruleanGymText_5c7be:
text_far _CeruleanGymText_5c7be
MistyPreBattleText:
text_far _MistyPreBattleText
text_end
CeruleanGymText_5c7c3:
text_far _CeruleanGymText_5c7c3
TM11ExplanationText:
text_far _TM11ExplanationText
text_end
CeruleanGymText5:
text_far _CeruleanGymText_5c7c8
MistyCascadeBadgeInfoText:
text_far _MistyCascadeBadgeInfoText
text_end
CeruleanGymText6:
ReceivedTM11Text:
text_far _ReceivedTM11Text
sound_get_item_1
text_end
CeruleanGymText7:
text_far _CeruleanGymText_5c7d3
TM11NoRoomText:
text_far _TM11NoRoomText
text_end
CeruleanGymText_5c7d8:
text_far _CeruleanGymText_5c7d8
ReceivedCascadeBadgeText:
text_far _ReceivedCascadeBadgeText
text_end
CeruleanGymText2:
CeruleanGymTrainerText1:
text_asm
ld hl, CeruleanGymTrainerHeader0
call TalkToTrainer
@ -165,7 +165,7 @@ CeruleanGymAfterBattleText1:
text_far _CeruleanGymAfterBattleText1
text_end
CeruleanGymText3:
CeruleanGymTrainerText2:
text_asm
ld hl, CeruleanGymTrainerHeader1
call TalkToTrainer
@ -183,23 +183,23 @@ CeruleanGymAfterBattleText2:
text_far _CeruleanGymAfterBattleText2
text_end
CeruleanGymText4:
CeruleanGymGuideText:
text_asm
CheckEvent EVENT_BEAT_MISTY
jr nz, .asm_5c821
ld hl, CeruleanGymText_5c82a
jr nz, .afterBeat
ld hl, CeruleanGymGuidePreBattleText
call PrintText
jr .asm_5c827
.asm_5c821
ld hl, CeruleanGymText_5c82f
jr .done
.afterBeat
ld hl, CeruleanGymGuidePostBattleText
call PrintText
.asm_5c827
.done
jp TextScriptEnd
CeruleanGymText_5c82a:
text_far _CeruleanGymText_5c82a
CeruleanGymGuidePreBattleText:
text_far _CeruleanGymGuidePreBattleText
text_end
CeruleanGymText_5c82f:
text_far _CeruleanGymText_5c82f
CeruleanGymGuidePostBattleText:
text_far _CeruleanGymGuidePostBattleText
text_end

279
scripts/CinnabarGym.asm
View File

@ -1,11 +1,11 @@
CinnabarGym_Script:
call CinnabarGymScript_75759
call CinnabarGymSetMapAndTiles
call EnableAutoTextBoxDrawing
ld hl, CinnabarGym_ScriptPointers
ld a, [wCinnabarGymCurScript]
jp CallFunctionInTable
CinnabarGymScript_75759:
CinnabarGymSetMapAndTiles:
ld hl, wCurrentMapScriptFlags
bit 6, [hl]
res 6, [hl]
@ -29,7 +29,7 @@ CinnabarGymScript_75759:
.LeaderName:
db "BLAINE@"
CinnabarGymScript_75792:
CinnabarGymResetScripts:
xor a
ld [wJoyIgnore], a
ld [wCinnabarGymCurScript], a
@ -37,7 +37,7 @@ CinnabarGymScript_75792:
ld [wOpponentAfterWrongAnswer], a
ret
CinnabarGymScript_74f48:
CinnabarGymSetTrainerHeader:
ldh a, [hSpriteIndexOrTextID]
ld [wTrainerHeaderFlagBit], a
ret
@ -49,7 +49,7 @@ CinnabarGym_ScriptPointers:
dw CinnabarGymScript0
dw CinnabarGymScript1
dw CinnabarGymScript2
dw CinnabarGymScript3
dw CinnabarGymBlainePostBattle
CinnabarGymScript0:
ld a, [wOpponentAfterWrongAnswer]
@ -63,23 +63,23 @@ CinnabarGymScript0:
ld hl, PikachuMovementData_74f97
ld b, SPRITE_FACING_DOWN
call CinnabarGymScript_74fa3
ld de, MovementData_757d7
jr .asm_757cb
ld de, MovementNpcToLeftAndUp
jr .MoveSprite
.asm_757c3
ld a, PLAYER_DIR_RIGHT
ld [wPlayerMovingDirection], a
ld hl, PikachuMovementData_74f9e
ld b, SPRITE_FACING_RIGHT
call CinnabarGymScript_74fa3
ld de, MovementData_757da
.asm_757cb
ld de, MovementNpcToLeft
.MoveSprite
call MoveSprite
ld a, $1
ld [wCinnabarGymCurScript], a
ld [wCurMapScript], a
ret
MovementData_757d7:
MovementNpcToLeftAndUp:
db NPC_MOVEMENT_LEFT
db NPC_MOVEMENT_UP
db -1 ; end
@ -91,7 +91,7 @@ PikachuMovementData_74f97:
db $35
db $3f
MovementData_757da:
MovementNpcToLeft:
db NPC_MOVEMENT_LEFT
db -1 ; end
@ -132,7 +132,7 @@ CinnabarGymScript2:
call CinnabarGymScript_753e9
ld a, [wIsInBattle]
cp $ff
jp z, CinnabarGymScript_75792
jp z, CinnabarGymResetScripts
ld a, [wTrainerHeaderFlagBit]
sub $2
ld c, a
@ -194,14 +194,15 @@ CinnabarGymScript_75041:
call UpdateCinnabarGymGateTileBlocks
ret
CinnabarGymScript3:
CinnabarGymBlainePostBattle:
call CinnabarGymScript_753e9
ld a, [wIsInBattle]
cp $ff
jp z, CinnabarGymScript_75792
jp z, CinnabarGymResetScripts
ld a, $f0
ld [wJoyIgnore], a
CinnabarGymScript3_75857:
; fallthrough
CinnabarGymReceiveTM38:
ld a, $a
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
@ -230,19 +231,19 @@ CinnabarGymScript3_75857:
ld hl, wCurrentMapScriptFlags
set 5, [hl]
jp CinnabarGymScript_75792
jp CinnabarGymResetScripts
CinnabarGym_TextPointers:
dw CinnabarGymText1
dw CinnabarGymText2
dw CinnabarGymText3
dw CinnabarGymText4
dw CinnabarGymText5
dw CinnabarGymText6
dw CinnabarGymText7
dw CinnabarGymText8
dw CinnabarGymText9
dw BlaineBadgeText
dw BlaineText
dw CinnabarGymTrainerText1
dw CinnabarGymTrainerText2
dw CinnabarGymTrainerText3
dw CinnabarGymTrainerText4
dw CinnabarGymTrainerText5
dw CinnabarGymTrainerText6
dw CinnabarGymTrainerText7
dw CinnabarGymGuideText
dw BlaineVolcanoBadgeInfoText
dw ReceivedTM38Text
dw TM38NoRoomText
@ -266,45 +267,45 @@ CinnabarGymScript_750c3:
ld [wCurMapScript], a
jp TextScriptEnd
CinnabarGymText1:
BlaineText:
text_asm
CheckEvent EVENT_BEAT_BLAINE
jr z, .beginBattle
jr z, .beforeBeat
CheckEventReuseA EVENT_GOT_TM38
jr nz, .afterVictory
call z, CinnabarGymScript3_75857
jr nz, .afterBeat
call z, CinnabarGymReceiveTM38
call DisableWaitingAfterTextDisplay
jp TextScriptEnd
.afterVictory
ld hl, BlaineFireBlastText
.afterBeat
ld hl, BlainePostBattleAdviceText
call PrintText
jp TextScriptEnd
.beginBattle
ld hl, BlaineBattleText
.beforeBeat
ld hl, BlainePreBattleText
call PrintText
ld hl, BlaineEndBattleText
ld de, BlaineEndBattleText
ld hl, ReceivedVolcanoBadgeText
ld de, ReceivedVolcanoBadgeText
call SaveEndBattleTextPointers
ld a, $7
ld [wGymLeaderNo], a
jp CinnabarGymScript_750c3
BlaineBattleText:
text_far _BlaineBattleText
BlainePreBattleText:
text_far _BlainePreBattleText
text_end
BlaineEndBattleText:
text_far _BlaineEndBattleText
ReceivedVolcanoBadgeText:
text_far _ReceivedVolcanoBadgeText
sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded
text_waitbutton
text_end
BlaineFireBlastText:
text_far _BlaineFireBlastText
BlainePostBattleAdviceText:
text_far _BlainePostBattleAdviceText
text_end
BlaineBadgeText:
text_far _BlaineBadgeText
BlaineVolcanoBadgeInfoText:
text_far _BlaineVolcanoBadgeInfoText
text_end
ReceivedTM38Text:
@ -317,37 +318,37 @@ TM38NoRoomText:
text_far _TM38NoRoomText
text_end
CinnabarGymText2:
CinnabarGymTrainerText1:
text_asm
call CinnabarGymScript_74f48
call CinnabarGymSetTrainerHeader
CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_0
jr nz, .asm_46bb4
ld hl, CinnabarGymText_7595f
ld hl, CinnabarGymBattleText2
call PrintText
ld hl, CinnabarGymText_75964
ld de, CinnabarGymText_75964
ld hl, CinnabarGymEndBattleText2
ld de, CinnabarGymEndBattleText2
call SaveEndBattleTextPointers
jp CinnabarGymScript_750c3
.asm_46bb4
ld hl, CinnabarGymText_75969
ld hl, CinnabarGymAfterBattleText2
call PrintText
jp TextScriptEnd
CinnabarGymText_7595f:
text_far _CinnabarGymText_7595f
CinnabarGymBattleText2:
text_far _CinnabarGymBattleText2
text_end
CinnabarGymText_75964:
text_far _CinnabarGymText_75964
CinnabarGymEndBattleText2:
text_far _CinnabarGymEndBattleText2
text_end
CinnabarGymText_75969:
text_far _CinnabarGymText_75969
CinnabarGymAfterBattleText2:
text_far _CinnabarGymAfterBattleText2
text_end
CinnabarGymText3:
CinnabarGymTrainerText2:
text_asm
call CinnabarGymScript_74f48
call CinnabarGymSetTrainerHeader
CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_1
jr nz, .asm_751a8
call CinnabarGymScript_753f3
@ -358,35 +359,35 @@ CinnabarGymText3:
jp CinnabarGymScript_753de
.asm_75196
ld hl, CinnabarGymText_75994
ld hl, CinnabarGymBattleText1
call PrintText
ld hl, CinnabarGymText_75999
ld de, CinnabarGymText_75999
ld hl, CinnabarGymEndBattleText1
ld de, CinnabarGymEndBattleText1
call SaveEndBattleTextPointers
jp CinnabarGymScript_750c3
.asm_751a8
ld hl, CinnabarGymText_7599e
ld hl, CinnabarGymAfterBattleText1
call PrintText
jp TextScriptEnd
CinnabarGymText_75994:
text_far _CinnabarGymText_75994
CinnabarGymBattleText1:
text_far _CinnabarGymBattleText1
text_end
CinnabarGymText_75999:
text_far _CinnabarGymText_75999
CinnabarGymEndBattleText1:
text_far _CinnabarGymEndBattleText1
text_end
CinnabarGymText_7599e:
text_far _CinnabarGymText_7599e
CinnabarGymAfterBattleText1:
text_far _CinnabarGymAfterBattleText1
text_end
CinnabarGymText4:
CinnabarGymTrainerText3:
text_asm
call CinnabarGymScript_74f48
call CinnabarGymSetTrainerHeader
CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_2
jr nz, .asm_751ee
jr nz, .afterBeat
call CinnabarGymScript_753f3
jr nz, .asm_751dc
CheckEvent EVENT_CINNABAR_GYM_GATE2_UNLOCKED
@ -395,34 +396,34 @@ CinnabarGymText4:
jp CinnabarGymScript_753de
.asm_751dc
ld hl, CinnabarGymText_759c9
ld hl, CinnabarGymBattleText3
call PrintText
ld hl, CinnabarGymText_759ce
ld de, CinnabarGymText_759ce
ld hl, CinnabarGymEndBattleText3
ld de, CinnabarGymEndBattleText3
call SaveEndBattleTextPointers
jp CinnabarGymScript_750c3
.asm_751ee
ld hl, CinnabarGymText_759d3
.afterBeat
ld hl, CinnabarGymAfterBattleText3
call PrintText
jp TextScriptEnd
CinnabarGymText_759c9:
text_far _CinnabarGymText_759c9
CinnabarGymBattleText3:
text_far _CinnabarGymBattleText3
text_end
CinnabarGymText_759ce:
text_far _CinnabarGymText_759ce
CinnabarGymEndBattleText3:
text_far _CinnabarGymEndBattleText3
text_end
CinnabarGymText_759d3:
text_far _CinnabarGymText_759d3
CinnabarGymAfterBattleText3:
text_far _CinnabarGymAfterBattleText3
text_end
CinnabarGymText5:
CinnabarGymTrainerText4:
text_asm
call CinnabarGymScript_74f48
call CinnabarGymSetTrainerHeader
CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_3
jr nz, .asm_75234
jr nz, .afterBeat
call CinnabarGymScript_753f3
jr nz, .asm_75222
CheckEvent EVENT_CINNABAR_GYM_GATE3_UNLOCKED
@ -431,34 +432,34 @@ CinnabarGymText5:
jp CinnabarGymScript_753de
.asm_75222
ld hl, CinnabarGymText_759fe
ld hl, CinnabarGymBattleText4
call PrintText
ld hl, CinnabarGymText_75a03
ld de, CinnabarGymText_75a03
ld hl, CinnabarGymEndBattleText4
ld de, CinnabarGymEndBattleText4
call SaveEndBattleTextPointers
jp CinnabarGymScript_750c3
.asm_75234
ld hl, CinnabarGymText_75a08
.afterBeat
ld hl, CinnabarGymAfterBattleText4
call PrintText
jp TextScriptEnd
CinnabarGymText_759fe:
text_far _CinnabarGymText_759fe
CinnabarGymBattleText4:
text_far _CinnabarGymBattleText4
text_end
CinnabarGymText_75a03:
text_far _CinnabarGymText_75a03
CinnabarGymEndBattleText4:
text_far _CinnabarGymEndBattleText4
text_end
CinnabarGymText_75a08:
text_far _CinnabarGymText_75a08
CinnabarGymAfterBattleText4:
text_far _CinnabarGymAfterBattleText4
text_end
CinnabarGymText6:
CinnabarGymTrainerText5:
text_asm
call CinnabarGymScript_74f48
call CinnabarGymSetTrainerHeader
CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_4
jr nz, .asm_776b4
jr nz, .afterBeat
call CinnabarGymScript_753f3
jr nz, .asm_75222
CheckEvent EVENT_CINNABAR_GYM_GATE4_UNLOCKED
@ -467,34 +468,34 @@ CinnabarGymText6:
jp CinnabarGymScript_753de
.asm_75222
ld hl, CinnabarGymText_75a33
ld hl, CinnabarGymBattleText5
call PrintText
ld hl, CinnabarGymText_75a38
ld de, CinnabarGymText_75a38
ld hl, CinnabarGymEndBattleText5
ld de, CinnabarGymEndBattleText5
call SaveEndBattleTextPointers
jp CinnabarGymScript_750c3
.asm_776b4
ld hl, CinnabarGymText_75a3d
.afterBeat
ld hl, CinnabarGymAfterBattleText5
call PrintText
jp TextScriptEnd
CinnabarGymText_75a33:
text_far _CinnabarGymText_75a33
CinnabarGymBattleText5:
text_far _CinnabarGymBattleText5
text_end
CinnabarGymText_75a38:
text_far _CinnabarGymText_75a38
CinnabarGymEndBattleText5:
text_far _CinnabarGymEndBattleText5
text_end
CinnabarGymText_75a3d:
text_far _CinnabarGymText_75a3d
CinnabarGymAfterBattleText5:
text_far _CinnabarGymAfterBattleText5
text_end
CinnabarGymText7:
CinnabarGymTrainerText6:
text_asm
call CinnabarGymScript_74f48
call CinnabarGymSetTrainerHeader
CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_5
jr nz, .asm_2f755
jr nz, .afterBeat
call CinnabarGymScript_753f3
jr nz, .asm_75222
CheckEvent EVENT_CINNABAR_GYM_GATE5_UNLOCKED
@ -503,34 +504,34 @@ CinnabarGymText7:
jp CinnabarGymScript_753de
.asm_75222
ld hl, CinnabarGymText_75a68
ld hl, CinnabarGymBattleText6
call PrintText
ld hl, CinnabarGymText_75a6d
ld de, CinnabarGymText_75a6d
ld hl, CinnabarGymEndBattleText6
ld de, CinnabarGymEndBattleText6
call SaveEndBattleTextPointers
jp CinnabarGymScript_750c3
.asm_2f755
ld hl, CinnabarGymText_75a72
.afterBeat
ld hl, CinnabarGymAfterBattleText6
call PrintText
jp TextScriptEnd
CinnabarGymText_75a68:
text_far _CinnabarGymText_75a68
CinnabarGymBattleText6:
text_far _CinnabarGymBattleText6
text_end
CinnabarGymText_75a6d:
text_far _CinnabarGymText_75a6d
CinnabarGymEndBattleText6:
text_far _CinnabarGymEndBattleText6
text_end
CinnabarGymText_75a72:
text_far _CinnabarGymText_75a72
CinnabarGymAfterBattleText6:
text_far _CinnabarGymAfterBattleText6
text_end
CinnabarGymText8:
CinnabarGymTrainerText7:
text_asm
call CinnabarGymScript_74f48
call CinnabarGymSetTrainerHeader
CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_6
jr nz, .asm_d87be
jr nz, .afterBeat
call CinnabarGymScript_753f3
jr nz, .asm_75222
CheckEvent EVENT_CINNABAR_GYM_GATE6_UNLOCKED
@ -539,30 +540,30 @@ CinnabarGymText8:
jp CinnabarGymScript_753de
.asm_75222
ld hl, CinnabarGymText_75a9d
ld hl, CinnabarGymBattleText7
call PrintText
ld hl, CinnabarGymText_75aa2
ld de, CinnabarGymText_75aa2
ld hl, CinnabarGymEndBattleText7
ld de, CinnabarGymEndBattleText7
call SaveEndBattleTextPointers
jp CinnabarGymScript_750c3
.asm_d87be
ld hl, CinnabarGymText_75aa7
.afterBeat
ld hl, CinnabarGymAfterBattleText7
call PrintText
jp TextScriptEnd
CinnabarGymText_75a9d:
text_far _CinnabarGymText_75a9d
CinnabarGymBattleText7:
text_far _CinnabarGymBattleText7
text_end
CinnabarGymText_75aa2:
text_far _CinnabarGymText_75aa2
CinnabarGymEndBattleText7:
text_far _CinnabarGymEndBattleText7
text_end
CinnabarGymText_75aa7:
text_far _CinnabarGymText_75aa7
CinnabarGymAfterBattleText7:
text_far _CinnabarGymAfterBattleText7
text_end
CinnabarGymText9:
CinnabarGymGuideText:
text_asm
callfar Func_f2133
jp TextScriptEnd

20
scripts/CinnabarGym3.asm
View File

@ -1,20 +1,20 @@
Func_f2133::
CheckEvent EVENT_BEAT_BLAINE
jr nz, .asm_627d9
ld hl, CinnabarGymText_75ac2
jr .asm_0b11d
.asm_627d9
ld hl, CinnabarGymText_75ac7
.asm_0b11d
jr nz, .afterBeat
ld hl, CinnabarGymGuidePreBattleText
jr .done
.afterBeat
ld hl, CinnabarGymGuidePostBattleText
.done
call PrintText
ret
CinnabarGymText_75ac2:
text_far _CinnabarGymText_75ac2
CinnabarGymGuidePreBattleText:
text_far _CinnabarGymGuidePreBattleText
text_end
CinnabarGymText_75ac7:
text_far _CinnabarGymText_75ac7
CinnabarGymGuidePostBattleText:
text_far _CinnabarGymGuidePostBattleText
text_end
Func_f2150::

99
scripts/FuchsiaGym.asm
View File

@ -24,7 +24,7 @@ FuchsiaGym_Script:
.LeaderName:
db "KOGA@"
FuchsiaGymScript_75477:
FuchsiaGymResetScripts:
xor a
ld [wJoyIgnore], a
ld [wFuchsiaGymCurScript], a
@ -35,15 +35,16 @@ FuchsiaGym_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
dw FuchsiaGymScript3
dw FuchsiaGymKogaPostBattle
FuchsiaGymScript3:
FuchsiaGymKogaPostBattle:
ld a, [wIsInBattle]
cp $ff
jp z, FuchsiaGymScript_75477
jp z, FuchsiaGymResetScripts
ld a, $f0
ld [wJoyIgnore], a
FuchsiaGymScript3_75497:
; fallthrough
FuchsiaGymReceiveTM06:
ld a, $9
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
@ -69,20 +70,20 @@ FuchsiaGymScript3_75497:
; deactivate gym trainers
SetEventRange EVENT_BEAT_FUCHSIA_GYM_TRAINER_0, EVENT_BEAT_FUCHSIA_GYM_TRAINER_5
jp FuchsiaGymScript_75477
jp FuchsiaGymResetScripts
FuchsiaGym_TextPointers:
dw FuchsiaGymText1
dw FuchsiaGymText2
dw FuchsiaGymText3
dw FuchsiaGymText4
dw FuchsiaGymText5
dw FuchsiaGymText6
dw FuchsiaGymText7
dw FuchsiaGymText8
dw FuchsiaGymText9
dw FuchsiaGymText10
dw FuchsiaGymText11
dw KogaText
dw FuchsiaGymTrainerText1
dw FuchsiaGymTrainerText2
dw FuchsiaGymTrainerText3
dw FuchsiaGymTrainerText4
dw FuchsiaGymTrainerText5
dw FuchsiaGymTrainerText6
dw FuchsiaGymGuideText
dw KogaSoulBadgeInfoText
dw ReceivedTM06Text
dw TM06NoRoomText
FuchsiaGymTrainerHeaders:
def_trainers 2
@ -100,27 +101,27 @@ FuchsiaGymTrainerHeader5:
trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_5, 2, FuchsiaGymBattleText6, FuchsiaGymEndBattleText6, FuchsiaGymAfterBattleText6
db -1 ; end
FuchsiaGymText1:
KogaText:
text_asm
CheckEvent EVENT_BEAT_KOGA
jr z, .beginBattle
jr z, .beforeBeat
CheckEventReuseA EVENT_GOT_TM06
jr nz, .afterVictory
call z, FuchsiaGymScript3_75497
jr nz, .afterBeat
call z, FuchsiaGymReceiveTM06
call DisableWaitingAfterTextDisplay
jr .done
.afterVictory
ld hl, KogaExplainToxicText
.afterBeat
ld hl, KogaPostBattleAdviceText
call PrintText
jr .done
.beginBattle
.beforeBeat
ld hl, KogaBeforeBattleText
call PrintText
ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, KogaAfterBattleText
ld de, KogaAfterBattleText
ld hl, ReceivedSoulBadgeText
ld de, ReceivedSoulBadgeText
call SaveEndBattleTextPointers
ldh a, [hSpriteIndex]
ld [wSpriteIndex], a
@ -139,19 +140,19 @@ KogaBeforeBattleText:
text_far _KogaBeforeBattleText
text_end
KogaAfterBattleText:
text_far _KogaAfterBattleText
ReceivedSoulBadgeText:
text_far _ReceivedSoulBadgeText
text_end
KogaExplainToxicText:
text_far _KogaExplainToxicText
KogaPostBattleAdviceText:
text_far _KogaPostBattleAdviceText
text_end
FuchsiaGymText9:
text_far _FuchsiaGymText9
KogaSoulBadgeInfoText:
text_far _KogaSoulBadgeInfoText
text_end
FuchsiaGymText10:
ReceivedTM06Text:
text_far _ReceivedTM06Text
sound_get_key_item
@ -159,11 +160,11 @@ TM06ExplanationText:
text_far _TM06ExplanationText
text_end
FuchsiaGymText11:
TM06NoRoomText:
text_far _TM06NoRoomText
text_end
FuchsiaGymText2:
FuchsiaGymTrainerText1:
text_asm
ld hl, FuchsiaGymTrainerHeader0
call TalkToTrainer
@ -181,7 +182,7 @@ FuchsiaGymAfterBattleText1:
text_far _FuchsiaGymAfterBattleText1
text_end
FuchsiaGymText3:
FuchsiaGymTrainerText2:
text_asm
ld hl, FuchsiaGymTrainerHeader1
call TalkToTrainer
@ -199,7 +200,7 @@ FuchsiaGymAfterBattleText2:
text_far _FuchsiaGymAfterBattleText2
text_end
FuchsiaGymText4:
FuchsiaGymTrainerText3:
text_asm
ld hl, FuchsiaGymTrainerHeader2
call TalkToTrainer
@ -217,7 +218,7 @@ FuchsiaGymAfterBattleText3:
text_far _FuchsiaGymAfterBattleText3
text_end
FuchsiaGymText5:
FuchsiaGymTrainerText4:
text_asm
ld hl, FuchsiaGymTrainerHeader3
call TalkToTrainer
@ -235,7 +236,7 @@ FuchsiaGymAfterBattleText4:
text_far _FuchsiaGymAfterBattleText4
text_end
FuchsiaGymText6:
FuchsiaGymTrainerText5:
text_asm
ld hl, FuchsiaGymTrainerHeader4
call TalkToTrainer
@ -253,7 +254,7 @@ FuchsiaGymAfterBattleText5:
text_far _FuchsiaGymAfterBattleText5
text_end
FuchsiaGymText7:
FuchsiaGymTrainerText6:
text_asm
ld hl, FuchsiaGymTrainerHeader5
call TalkToTrainer
@ -271,20 +272,20 @@ FuchsiaGymAfterBattleText6:
text_far _FuchsiaGymAfterBattleText6
text_end
FuchsiaGymText8:
FuchsiaGymGuideText:
text_asm
CheckEvent EVENT_BEAT_KOGA
ld hl, FuchsiaGymText_75653
jr nz, .asm_50671
ld hl, FuchsiaGymText_7564e
.asm_50671
ld hl, FuchsiaGymGuidePostBattleText
jr nz, .afterBeat
ld hl, FuchsiaGymGuidePreBattleText
.afterBeat
call PrintText
jp TextScriptEnd
FuchsiaGymText_7564e:
text_far _FuchsiaGymText_7564e
FuchsiaGymGuidePreBattleText:
text_far _FuchsiaGymGuidePreBattleText
text_end
FuchsiaGymText_75653:
text_far _FuchsiaGymText_75653
FuchsiaGymGuidePostBattleText:
text_far _FuchsiaGymGuidePostBattleText
text_end

111
scripts/PewterGym.asm
View File

@ -23,7 +23,7 @@ PewterGym_Script:
.LeaderName:
db "BROCK@"
PewterGymScript_5c3bf:
PewterGymResetScripts:
xor a
ld [wJoyIgnore], a
ld [wPewterGymCurScript], a
@ -34,15 +34,16 @@ PewterGym_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
dw PewterGymScript3
dw PewterGymBrockPostBattle
PewterGymScript3:
PewterGymBrockPostBattle:
ld a, [wIsInBattle]
cp $ff
jp z, PewterGymScript_5c3bf
jp z, PewterGymResetScripts
ld a, $f0
ld [wJoyIgnore], a
PewterGymScript_5c3df:
; fallthrough
PewterGymScriptReceiveTM34:
ld a, $4
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
@ -77,15 +78,15 @@ PewterGymScript_5c3df:
; deactivate gym trainers
SetEvent EVENT_BEAT_PEWTER_GYM_TRAINER_0
jp PewterGymScript_5c3bf
jp PewterGymResetScripts
PewterGym_TextPointers:
dw PewterGymText1
dw PewterGymText2
dw PewterGymText3
dw PewterGymText4
dw PewterGymText5
dw PewterGymText6
dw BrockText
dw PewterGymTrainerText1
dw PewterGymGuideText
dw BeforeReceivedTM34Text
dw ReceivedTM34Text
dw TM34NoRoomText
PewterGymTrainerHeaders:
def_trainers 2
@ -93,27 +94,27 @@ PewterGymTrainerHeader0:
trainer EVENT_BEAT_PEWTER_GYM_TRAINER_0, 5, PewterGymBattleText1, PewterGymEndBattleText1, PewterGymAfterBattleText1
db -1 ; end
PewterGymText1:
BrockText:
text_asm
CheckEvent EVENT_BEAT_BROCK
jr z, .beginBattle
jr z, .beforeBeat
CheckEventReuseA EVENT_GOT_TM34
jr nz, .gymVictory
call z, PewterGymScript_5c3df
jr nz, .afterBeat
call z, PewterGymScriptReceiveTM34
call DisableWaitingAfterTextDisplay
jr .done
.gymVictory
ld hl, PewterGymText_5c4a3
.afterBeat
ld hl, BrockPostBattleAdviceText
call PrintText
jr .done
.beginBattle
ld hl, PewterGymText_5c49e
.beforeBeat
ld hl, BrockPreBattleText
call PrintText
ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, PewterGymText_5c4bc
ld de, PewterGymText_5c4bc
ld hl, ReceivedBoulderBadgeText
ld de, ReceivedBoulderBadgeText
call SaveEndBattleTextPointers
ldh a, [hSpriteIndex]
ld [wSpriteIndex], a
@ -129,35 +130,35 @@ PewterGymText1:
.done
jp TextScriptEnd
PewterGymText_5c49e:
text_far _PewterGymText_5c49e
BrockPreBattleText:
text_far _BrockPreBattleText
text_end
PewterGymText_5c4a3:
text_far _PewterGymText_5c4a3
BrockPostBattleAdviceText:
text_far _BrockPostBattleAdviceText
text_end
PewterGymText4:
text_far _TM34PreReceiveText
BeforeReceivedTM34Text:
text_far _BeforeReceivedTM34Text
text_end
PewterGymText5:
ReceivedTM34Text:
text_far _ReceivedTM34Text
sound_get_item_1
text_far _TM34ExplanationText
text_end
PewterGymText6:
TM34NoRoomText:
text_far _TM34NoRoomText
text_end
PewterGymText_5c4bc:
text_far _PewterGymText_5c4bc
ReceivedBoulderBadgeText:
text_far _ReceivedBoulderBadgeText
sound_get_item_1
text_far _PewterGymText_5c4c1
text_far _BrockBoulerBadgeInfoText ; Text to tell that the flash technique can be used
text_end
PewterGymText2:
PewterGymTrainerText1:
text_asm
ld hl, PewterGymTrainerHeader0
call TalkToTrainer
@ -175,58 +176,58 @@ PewterGymAfterBattleText1:
text_far _PewterGymAfterBattleText1
text_end
PewterGymText3:
PewterGymGuideText:
text_asm
ld a, [wBeatGymFlags]
bit BIT_BOULDERBADGE, a
jr nz, .asm_5c50c
ld hl, PewterGymText_5c515
jr nz, .afterBeat
ld hl, PewterGymGuidePreAdviceText
call PrintText
call YesNoChoice
ld a, [wCurrentMenuItem]
and a
jr nz, .asm_5c4fe
jr nz, .PewterGymGuideBeginAdviceText
ld a, [wd472]
bit 7, a
jp nz, .asm_5c3fa
ld hl, PewterGymText_5c51a
ld hl, PewterGymGuideBeginAdviceText
call PrintText
jr .asm_5c504
.asm_5c4fe
jr .PewterGymGuideAdviceText
.PewterGymGuideBeginAdviceText
ld hl, PewterGymText_5c524
call PrintText
.asm_5c504
ld hl, PewterGymText_5c51f
.PewterGymGuideAdviceText
ld hl, PewterGymGuideAdviceText
call PrintText
jr .asm_5c512
.asm_5c50c
ld hl, PewterGymText_5c529
jr .done
.afterBeat
ld hl, PewterGymGuidePostBattleText
call PrintText
.asm_5c512
.done
jp TextScriptEnd
.asm_5c3fa
ld hl, PewterGymText_5c41c
call PrintText
jp TextScriptEnd
PewterGymText_5c515:
text_far _PewterGymText_5c515
PewterGymGuidePreAdviceText:
text_far _PewterGymGuidePreAdviceText
text_end
PewterGymText_5c51a:
text_far _PewterGymText_5c51a
PewterGymGuideBeginAdviceText:
text_far _PewterGymGuideBeginAdviceText
text_end
PewterGymText_5c51f:
text_far _PewterGymText_5c51f
PewterGymGuideAdviceText:
text_far _PewterGymGuideAdviceText
text_end
PewterGymText_5c524:
text_far _PewterGymText_5c524
text_end
PewterGymText_5c529:
text_far _PewterGymText_5c529
PewterGymGuidePostBattleText:
text_far _PewterGymGuidePostBattleText
text_end
PewterGymText_5c41c:

114
scripts/SaffronGym.asm
View File

@ -22,7 +22,7 @@ SaffronGym_Script:
.LeaderName:
db "SABRINA@"
SaffronGymText_5d048:
SaffronGymResetScripts:
xor a
ld [wJoyIgnore], a
ld [wSaffronGymCurScript], a
@ -33,16 +33,16 @@ SaffronGym_ScriptPointers:
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
dw SaffronGymScript3
dw SaffronGymSabrinaPostBattle
SaffronGymScript3:
SaffronGymSabrinaPostBattle:
ld a, [wIsInBattle]
cp $ff
jp z, SaffronGymText_5d048
jp z, SaffronGymResetScripts
ld a, $f0
ld [wJoyIgnore], a
SaffronGymText_5d068:
SaffronGymReceiveTM46:
ld a, $a
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
@ -68,21 +68,21 @@ SaffronGymText_5d068:
; deactivate gym trainers
SetEventRange EVENT_BEAT_SAFFRON_GYM_TRAINER_0, EVENT_BEAT_SAFFRON_GYM_TRAINER_6
jp SaffronGymText_5d048
jp SaffronGymResetScripts
SaffronGym_TextPointers:
dw SaffronGymText1
dw SaffronGymText2
dw SaffronGymText3
dw SaffronGymText4
dw SaffronGymText5
dw SaffronGymText6
dw SaffronGymText7
dw SaffronGymText8
dw SaffronGymText9
dw SaffronGymText10
dw SaffronGymText11
dw SaffronGymText12
dw SabrinaText
dw SaffronGymTrainerText1
dw SaffronGymTrainerText2
dw SaffronGymTrainerText3
dw SaffronGymTrainerText4
dw SaffronGymTrainerText5
dw SaffronGymTrainerText6
dw SaffronGymTrainerText7
dw SaffronGymGuideText
dw KogaMarshBadgeInfoText
dw ReceivedTM46Text
dw TM46NoRoomText
SaffronGymTrainerHeaders:
def_trainers 2
@ -102,27 +102,27 @@ SaffronGymTrainerHeader6:
trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 3, SaffronGymBattleText7, SaffronGymEndBattleText7, SaffronGymAfterBattleText7
db -1 ; end
SaffronGymText1:
SabrinaText:
text_asm
CheckEvent EVENT_BEAT_SABRINA
jr z, .beginBattle
jr z, .beforeBeat
CheckEventReuseA EVENT_GOT_TM46
jr nz, .afterVictory
call z, SaffronGymText_5d068
jr nz, .afterBeat
call z, SaffronGymReceiveTM46
call DisableWaitingAfterTextDisplay
jr .done
.afterVictory
ld hl, SaffronGymText_5d16e
.afterBeat
ld hl, SabrinaPostBattleAdviceText
call PrintText
jr .done
.beginBattle
ld hl, SaffronGymText_5d162
.beforeBeat
ld hl, SabrinaPreBattleText
call PrintText
ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, SaffronGymText_5d167
ld de, SaffronGymText_5d167
ld hl, ReceivedMarshBadgeText
ld de, ReceivedMarshBadgeText
call SaveEndBattleTextPointers
ldh a, [hSpriteIndex]
ld [wSpriteIndex], a
@ -135,95 +135,95 @@ SaffronGymText1:
.done
jp TextScriptEnd
SaffronGymText_5d162:
text_far _SaffronGymText_5d162
SabrinaPreBattleText:
text_far _SabrinaPreBattleText
text_end
SaffronGymText_5d167:
text_far _SaffronGymText_5d167
ReceivedMarshBadgeText:
text_far _ReceivedMarshBadgeText
sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded
text_promptbutton
text_end
SaffronGymText_5d16e:
text_far _SaffronGymText_5d16e
SabrinaPostBattleAdviceText:
text_far _SabrinaPostBattleAdviceText
text_end
SaffronGymText10:
text_far _SaffronGymText_5d173
KogaMarshBadgeInfoText:
text_far _KogaMarshBadgeInfoText
text_end
SaffronGymText11:
text_far ReceivedTM46Text
ReceivedTM46Text:
text_far _ReceivedTM46Text
sound_get_item_1
text_far _TM46ExplanationText
text_end
SaffronGymText12:
TM46NoRoomText:
text_far _TM46NoRoomText
text_end
SaffronGymText2:
SaffronGymTrainerText1:
text_asm
ld hl, SaffronGymTrainerHeader0
call TalkToTrainer
jp TextScriptEnd
SaffronGymText3:
SaffronGymTrainerText2:
text_asm
ld hl, SaffronGymTrainerHeader1
call TalkToTrainer
jp TextScriptEnd
SaffronGymText4:
SaffronGymTrainerText3:
text_asm
ld hl, SaffronGymTrainerHeader2
call TalkToTrainer
jp TextScriptEnd
SaffronGymText5:
SaffronGymTrainerText4:
text_asm
ld hl, SaffronGymTrainerHeader3
call TalkToTrainer
jp TextScriptEnd
SaffronGymText6:
SaffronGymTrainerText5:
text_asm
ld hl, SaffronGymTrainerHeader4
call TalkToTrainer
jp TextScriptEnd
SaffronGymText7:
SaffronGymTrainerText6:
text_asm
ld hl, SaffronGymTrainerHeader5
call TalkToTrainer
jp TextScriptEnd
SaffronGymText8:
SaffronGymTrainerText7:
text_asm
ld hl, SaffronGymTrainerHeader6
call TalkToTrainer
jp TextScriptEnd
SaffronGymText9:
SaffronGymGuideText:
text_asm
CheckEvent EVENT_BEAT_SABRINA
jr nz, .asm_5d1dd
ld hl, SaffronGymText_5d1e6
jr nz, .afterBeat
ld hl, SaffronGymGuidePreBattleText
call PrintText
jr .asm_5d1e3
.asm_5d1dd
ld hl, SaffronGymText_5d1eb
jr .done
.afterBeat
ld hl, SaffronGymGuidePostBattleText
call PrintText
.asm_5d1e3
.done
jp TextScriptEnd
SaffronGymText_5d1e6:
text_far _SaffronGymText_5d1e6
SaffronGymGuidePreBattleText:
text_far _SaffronGymGuidePreBattleText
text_end
SaffronGymText_5d1eb:
text_far _SaffronGymText_5d1eb
SaffronGymGuidePostBattleText:
text_far _SaffronGymGuidePostBattleText
text_end
SaffronGymBattleText1:

4
scripts/VermilionDock.asm
View File

@ -182,12 +182,12 @@ VermilionDock_1dc7c:
VermilionDock_EraseSSAnne:
; Fill the area the S.S. Anne occupies in BG map 0 with water tiles.
ld hl, wVermilionDockTileMapBuffer
ld bc, (5 * BG_MAP_WIDTH) + SCREEN_WIDTH
ld bc, wVermilionDockTileMapBufferEnd - wVermilionDockTileMapBuffer
ld a, $14 ; water tile
call FillMemory
hlbgcoord 0, 10
ld de, wVermilionDockTileMapBuffer
ld bc, (6 * BG_MAP_WIDTH) / 16
lb bc, BANK(wVermilionDockTileMapBuffer), 12
call CopyVideoData
; Replace the blocks of the lower half of the ship with water blocks. This

30
scripts/VermilionGym.asm
View File

@ -94,8 +94,8 @@ VermilionGym_TextPointers:
dw VermilionGymTrainerText1
dw VermilionGymTrainerText2
dw VermilionGymTrainerText3
dw VermilionGymFanText
dw LTSurgeThunderbadgeInfoText
dw VermilionGymGuideText
dw LTSurgeThunderBadgeInfoText
dw ReceivedTM24Text
dw TM24NoRoomText
@ -128,8 +128,8 @@ LTSurgeText:
ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, ReceivedThunderbadgeText
ld de, ReceivedThunderbadgeText
ld hl, ReceivedThunderBadgeText
ld de, ReceivedThunderBadgeText
call SaveEndBattleTextPointers
ldh a, [hSpriteIndex]
ld [wSpriteIndex], a
@ -153,8 +153,8 @@ LTSurgePostBattleAdviceText:
text_far _LTSurgePostBattleAdviceText
text_end
LTSurgeThunderbadgeInfoText:
text_far _LTSurgeThunderbadgeInfoText
LTSurgeThunderBadgeInfoText:
text_far _LTSurgeThunderBadgeInfoText
text_end
ReceivedTM24Text:
@ -167,8 +167,8 @@ TM24NoRoomText:
text_far _TM24NoRoomText
text_end
ReceivedThunderbadgeText:
text_far _ReceivedThunderbadgeText
ReceivedThunderBadgeText:
text_far _ReceivedThunderBadgeText
text_end
VermilionGymTrainerText1:
@ -225,24 +225,24 @@ VermilionGymAfterBattleText3:
text_far _VermilionGymAfterBattleText3
text_end
VermilionGymFanText:
VermilionGymGuideText:
text_asm
ld a, [wBeatGymFlags]
bit BIT_THUNDERBADGE, a
jr nz, .afterBeat
ld hl, VermilionGymFanPreBattleText
ld hl, VermilionGymGuidePreBattleText
call PrintText
jr .done
.afterBeat
ld hl, VermilionGymFanPostBattleText
ld hl, VermilionGymGuidePostBattleText
call PrintText
.done
jp TextScriptEnd
VermilionGymFanPreBattleText:
text_far _VermilionGymFanPreBattleText
VermilionGymGuidePreBattleText:
text_far _VermilionGymGuidePreBattleText
text_end
VermilionGymFanPostBattleText:
text_far _VermilionGymFanPostBattleText
VermilionGymGuidePostBattleText:
text_far _VermilionGymGuidePostBattleText
text_end

121
scripts/ViridianGym.asm
View File

@ -16,7 +16,7 @@ ViridianGym_Script:
.LeaderName:
db "GIOVANNI@"
ViridianGymScript_748d6:
ViridianGymResetScripts:
xor a
ld [wJoyIgnore], a
ld [wViridianGymCurScript], a
@ -27,7 +27,7 @@ ViridianGym_ScriptPointers:
dw ViridianGymScript0
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
dw ViridianGymScript3
dw ViridianGymGiovanniPostBattle
dw ViridianGymScript4
ViridianGymScript0:
@ -116,7 +116,7 @@ ViridianGymArrowMovement12:
ViridianGymScript4:
ld a, [wSimulatedJoypadStatesIndex]
and a
jr nz, .asm_74980
jr nz, .ViridianGymLoadSpinnerArrow
xor a
ld [wJoyIgnore], a
ld hl, wd736
@ -124,16 +124,17 @@ ViridianGymScript4:
ld a, $0
ld [wCurMapScript], a
ret
.asm_74980
.ViridianGymLoadSpinnerArrow
farjp LoadSpinnerArrowTiles
ViridianGymScript3:
ViridianGymGiovanniPostBattle:
ld a, [wIsInBattle]
cp $ff
jp z, ViridianGymScript_748d6
jp z, ViridianGymResetScripts
ld a, $f0
ld [wJoyIgnore], a
ViridianGymScript3_74995:
; fallthrough
ViridianGymReceiveTM27:
ld a, $c
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
@ -163,23 +164,23 @@ ViridianGymScript3_74995:
ld [wMissableObjectIndex], a
predef ShowObject
SetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE
jp ViridianGymScript_748d6
jp ViridianGymResetScripts
ViridianGym_TextPointers:
dw ViridianGymText1
dw ViridianGymText2
dw ViridianGymText3
dw ViridianGymText4
dw ViridianGymText5
dw ViridianGymText6
dw ViridianGymText7
dw ViridianGymText8
dw ViridianGymText9
dw ViridianGymText10
dw GiovanniText
dw ViridianGymTrainerText1
dw ViridianGymTrainerText2
dw ViridianGymTrainerText3
dw ViridianGymTrainerText4
dw ViridianGymTrainerText5
dw ViridianGymTrainerText6
dw ViridianGymTrainerText7
dw ViridianGymTrainerText8
dw ViridianGymGuideText
dw PickUpItemText
dw ViridianGymText12
dw ViridianGymText13
dw ViridianGymText14
dw GiovanniEarthBadgeInfoText
dw ReceivedTM27Text
dw TM27NoRoomText
ViridianGymTrainerHeaders:
def_trainers 2
@ -201,19 +202,19 @@ ViridianGymTrainerHeader7:
trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 4, ViridianGymBattleText8, ViridianGymEndBattleText8, ViridianGymAfterBattleText8
db -1 ; end
ViridianGymText1:
GiovanniText:
text_asm
CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
jr z, .beginBattle
jr z, .beforeBeat
CheckEventReuseA EVENT_GOT_TM27
jr nz, .afterVictory
call z, ViridianGymScript3_74995
jr nz, .afterBeat
call z, ViridianGymReceiveTM27
call DisableWaitingAfterTextDisplay
jr .done
.afterVictory
.afterBeat
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, ViridianGymText_74ad9
ld hl, GiovanniPostBattleAdviceText
call PrintText
call GBFadeOutToBlack
ld a, HS_VIRIDIAN_GYM_GIOVANNI
@ -223,14 +224,14 @@ ViridianGymText1:
call Delay3
call GBFadeInFromBlack
jr .done
.beginBattle
ld hl, ViridianGymText_74ace
.beforeBeat
ld hl, GiovanniPreBattleText
call PrintText
ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, ViridianGymText_74ad3
ld de, ViridianGymText_74ad3
ld hl, ReceivedEarthBadgeText
ld de, ReceivedEarthBadgeText
call SaveEndBattleTextPointers
ldh a, [hSpriteIndex]
ld [wSpriteIndex], a
@ -243,25 +244,25 @@ ViridianGymText1:
.done
jp TextScriptEnd
ViridianGymText_74ace:
text_far _ViridianGymText_74ace
GiovanniPreBattleText:
text_far _GiovanniPreBattleText
text_end
ViridianGymText_74ad3:
text_far _ViridianGymText_74ad3
ReceivedEarthBadgeText:
text_far _ReceivedEarthBadgeText
sound_level_up ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded
text_end
ViridianGymText_74ad9:
text_far _ViridianGymText_74ad9
GiovanniPostBattleAdviceText:
text_far _GiovanniPostBattleAdviceText
text_waitbutton
text_end
ViridianGymText12:
text_far _ViridianGymText12
GiovanniEarthBadgeInfoText:
text_far _GiovanniEarthBadgeInfoText
text_end
ViridianGymText13:
ReceivedTM27Text:
text_far _ReceivedTM27Text
sound_get_item_1
@ -269,11 +270,11 @@ TM27ExplanationText:
text_far _TM27ExplanationText
text_end
ViridianGymText14:
TM27NoRoomText:
text_far _TM27NoRoomText
text_end
ViridianGymText2:
ViridianGymTrainerText1:
text_asm
ld hl, ViridianGymTrainerHeader0
call TalkToTrainer
@ -291,7 +292,7 @@ ViridianGymAfterBattleText1:
text_far _ViridianGymAfterBattleText1
text_end
ViridianGymText3:
ViridianGymTrainerText2:
text_asm
ld hl, ViridianGymTrainerHeader1
call TalkToTrainer
@ -309,7 +310,7 @@ ViridianGymAfterBattleText2:
text_far _ViridianGymAfterBattleText2
text_end
ViridianGymText4:
ViridianGymTrainerText3:
text_asm
ld hl, ViridianGymTrainerHeader2
call TalkToTrainer
@ -327,7 +328,7 @@ ViridianGymAfterBattleText3:
text_far _ViridianGymAfterBattleText3
text_end
ViridianGymText5:
ViridianGymTrainerText4:
text_asm
ld hl, ViridianGymTrainerHeader3
call TalkToTrainer
@ -345,7 +346,7 @@ ViridianGymAfterBattleText4:
text_far _ViridianGymAfterBattleText4
text_end
ViridianGymText6:
ViridianGymTrainerText5:
text_asm
ld hl, ViridianGymTrainerHeader4
call TalkToTrainer
@ -363,7 +364,7 @@ ViridianGymAfterBattleText5:
text_far _ViridianGymAfterBattleText5
text_end
ViridianGymText7:
ViridianGymTrainerText6:
text_asm
ld hl, ViridianGymTrainerHeader5
call TalkToTrainer
@ -381,7 +382,7 @@ ViridianGymAfterBattleText6:
text_far _ViridianGymAfterBattleText6
text_end
ViridianGymText8:
ViridianGymTrainerText7:
text_asm
ld hl, ViridianGymTrainerHeader6
call TalkToTrainer
@ -399,7 +400,7 @@ ViridianGymAfterBattleText7:
text_far _ViridianGymAfterBattleText7
text_end
ViridianGymText9:
ViridianGymTrainerText8:
text_asm
ld hl, ViridianGymTrainerHeader7
call TalkToTrainer
@ -417,23 +418,23 @@ ViridianGymAfterBattleText8:
text_far _ViridianGymAfterBattleText8
text_end
ViridianGymText10:
ViridianGymGuideText:
text_asm
CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
jr nz, .asm_1abd1
ld hl, ViridianGymText_74bd4
jr nz, .afterBeat
ld hl, ViridianGymGuidePreBattleText
call PrintText
jr .asm_6064d
.asm_1abd1
ld hl, ViridianGymText_74bd9
jr .done
.afterBeat
ld hl, ViridianGymGuidePostBattleText
call PrintText
.asm_6064d
.done
jp TextScriptEnd
ViridianGymText_74bd4:
text_far _ViridianGymText_74bd4
ViridianGymGuidePreBattleText:
text_far _ViridianGymGuidePreBattleText
text_end
ViridianGymText_74bd9:
text_far _ViridianGymText_74bd9
ViridianGymGuidePostBattleText:
text_far _ViridianGymGuidePostBattleText
text_end

8
text/CeladonGym.asm
View File

@ -1,4 +1,4 @@
_CeladonGymText_48a5e::
_ErikaPreBattleText::
text "Hello. Lovely"
line "weather isn't it?"
cont "It's so pleasant."
@ -25,7 +25,7 @@ _CeladonGymText_48a5e::
line "shall not lose."
done
_CeladonGymText_48a63::
_ReceivedRainbowBadgeText::
text "Oh!"
line "I concede defeat."
@ -36,7 +36,7 @@ _CeladonGymText_48a63::
line "the RAINBOWBADGE."
prompt
_CeladonGymText_48a68::
_ErikaPostBattleAdviceText::
text "You are cataloging"
line "#MON? I must"
cont "say I'm impressed."
@ -47,7 +47,7 @@ _CeladonGymText_48a68::
cont "unattractive."
done
_CeladonGymText9::
_ErikaRainbowBadgeInfoText::
text "The RAINBOWBADGE"
line "will make #MON"
cont "up to L50 obey."

14
text/CeruleanGym.asm
View File

@ -1,4 +1,4 @@
_CeruleanGymText_5c7be::
_MistyPreBattleText::
text "Hi, you're a new"
line "face!"
@ -19,7 +19,7 @@ _CeruleanGymText_5c7be::
line "sweetie?"
done
_CeruleanGymText_5c7c3::
_TM11ExplanationText::
text "TM11 teaches"
line "BUBBLEBEAM!"
@ -27,7 +27,7 @@ _CeruleanGymText_5c7c3::
line "aquatic #MON!"
done
_CeruleanGymText_5c7c8::
_MistyCascadeBadgeInfoText::
text "The CASCADEBADGE"
line "makes all #MON"
cont "up to L30 obey!"
@ -52,12 +52,12 @@ _ReceivedTM11Text::
line "TM11!@"
text_end
_CeruleanGymText_5c7d3::
_TM11NoRoomText::
text "You better make"
line "room for this!"
done
_CeruleanGymText_5c7d8::
_ReceivedCascadeBadgeText::
text "I can't"
line "believe I lost!"
@ -107,7 +107,7 @@ _CeruleanGymAfterBattleText2::
line "someone like you!"
done
_CeruleanGymText_5c82a::
_CeruleanGymGuidePreBattleText::
text "Yo! Champ in"
line "making!"
@ -125,7 +125,7 @@ _CeruleanGymText_5c82a::
line "electricity!"
done
_CeruleanGymText_5c82f::
_CeruleanGymGuidePostBattleText::
text "You beat MISTY!"
line "What'd I tell ya?"

54
text/CinnabarGym.asm
View File

@ -1,4 +1,4 @@
_BlaineBattleText::
_BlainePreBattleText::
text "Hah!"
para "I am BLAINE! I"
@ -13,7 +13,7 @@ _BlaineBattleText::
line "have BURN HEAL!"
done
_BlaineEndBattleText::
_ReceivedVolcanoBadgeText::
text "I have"
line "burnt out!"
@ -21,7 +21,7 @@ _BlaineEndBattleText::
line "the VOLCANOBADGE!@"
text_end
_BlaineFireBlastText::
_BlainePostBattleAdviceText::
text "FIRE BLAST is the"
line "ultimate fire"
cont "technique!"
@ -30,7 +30,7 @@ _BlaineFireBlastText::
line "water #MON!"
done
_BlaineBadgeText::
_BlaineVolcanoBadgeInfoText::
text "Hah!"
para "The VOLCANOBADGE"
@ -68,18 +68,18 @@ _TM38NoRoomText::
line "gift!"
done
_CinnabarGymText_7595f::
_CinnabarGymBattleText2::
text "Do you know how"
line "hot #MON fire"
cont "breath can get?"
done
_CinnabarGymText_75964::
_CinnabarGymEndBattleText2::
text "Yow!"
line "Hot, hot, hot!"
prompt
_CinnabarGymText_75969::
_CinnabarGymAfterBattleText2::
text "Fire, or to be"
line "more precise,"
cont "combustion..."
@ -88,66 +88,66 @@ _CinnabarGymText_75969::
line "blah..."
done
_CinnabarGymText_75994::
_CinnabarGymBattleText1::
text "I was a thief, but"
line "I became straight"
cont "as a trainer!"
done
_CinnabarGymText_75999::
_CinnabarGymEndBattleText1::
text "I"
line "surrender!"
prompt
_CinnabarGymText_7599e::
_CinnabarGymAfterBattleText1::
text "I can't help"
line "stealing other"
cont "people's #MON!"
done
_CinnabarGymText_759c9::
_CinnabarGymBattleText3::
text "You can't win!"
line "I have studied"
cont "#MON totally!"
done
_CinnabarGymText_759ce::
_CinnabarGymEndBattleText3::
text "Waah!"
line "My studies!"
prompt
_CinnabarGymText_759d3::
_CinnabarGymAfterBattleText3::
text "My theories are"
line "too complicated"
cont "for you!"
done
_CinnabarGymText_759fe::
_CinnabarGymBattleText4::
text "I just like using"
line "fire #MON!"
done
_CinnabarGymText_75a03::
_CinnabarGymEndBattleText4::
text "Too hot"
line "to handle!"
prompt
_CinnabarGymText_75a08::
_CinnabarGymAfterBattleText4::
text "I wish there was"
line "a thief #MON!"
cont "I'd use that!"
done
_CinnabarGymText_75a33::
_CinnabarGymBattleText5::
text "I know why BLAINE"
line "became a trainer!"
done
_CinnabarGymText_75a38::
_CinnabarGymEndBattleText5::
text "Ow!"
prompt
_CinnabarGymText_75a3d::
_CinnabarGymAfterBattleText5::
text "BLAINE was lost"
line "in the mountains"
cont "when a fiery bird"
@ -158,40 +158,40 @@ _CinnabarGymText_75a3d::
cont "his way down!"
done
_CinnabarGymText_75a68::
_CinnabarGymBattleText6::
text "I've been to many"
line "GYMs, but this is"
cont "my favorite!"
done
_CinnabarGymText_75a6d::
_CinnabarGymEndBattleText6::
text "Yowza!"
line "Too hot!"
prompt
_CinnabarGymText_75a72::
_CinnabarGymAfterBattleText6::
text "Us fire #MON"
line "fans like PONYTA"
cont "and NINETALES!"
done
_CinnabarGymText_75a9d::
_CinnabarGymBattleText7::
text "Fire is weak"
line "against H2O!"
done
_CinnabarGymText_75aa2::
_CinnabarGymEndBattleText7::
text "Oh!"
line "Snuffed out!"
prompt
_CinnabarGymText_75aa7::
_CinnabarGymAfterBattleText7::
text "Water beats fire!"
line "But, fire melts"
cont "ice #MON!"
done
_CinnabarGymText_75ac2::
_CinnabarGymGuidePreBattleText::
text "Yo! Champ in"
line "making!"
@ -206,7 +206,7 @@ _CinnabarGymText_75ac2::
line "some BURN HEALs!"
done
_CinnabarGymText_75ac7::
_CinnabarGymGuidePostBattleText::
text "<PLAYER>! You beat"
line "that fire brand!"
done

10
text/FuchsiaGym.asm
View File

@ -16,7 +16,7 @@ _KogaBeforeBattleText::
cont "techniques!"
done
_KogaAfterBattleText::
_ReceivedSoulBadgeText::
text "Humph!"
line "You have proven"
cont "your worth!"
@ -25,7 +25,7 @@ _KogaAfterBattleText::
line "SOULBADGE!"
prompt
_KogaExplainToxicText::
_KogaPostBattleAdviceText::
text "When afflicted by"
line "TOXIC, #MON"
cont "suffer more and"
@ -36,7 +36,7 @@ _KogaExplainToxicText::
line "terrorize foes!"
done
_FuchsiaGymText9::
_KogaSoulBadgeInfoText::
text "Now that you have"
line "the SOULBADGE,"
cont "the DEFENSE of"
@ -197,7 +197,7 @@ _FuchsiaGymAfterBattleText6::
cont "choose?"
done
_FuchsiaGymText_7564e::
_FuchsiaGymGuidePreBattleText::
text "Yo! Champ in"
line "making!"
@ -214,7 +214,7 @@ _FuchsiaGymText_7564e::
cont "to reach him!"
done
_FuchsiaGymText_75653::
_FuchsiaGymGuidePostBattleText::
text "It's amazing how"
line "ninja can terrify"
cont "even now!"

18
text/PewterGym.asm
View File

@ -1,4 +1,4 @@
_PewterGymText_5c49e::
_BrockPreBattleText::
text "I'm BROCK!"
line "I'm PEWTER's GYM"
cont "LEADER!"
@ -17,7 +17,7 @@ _PewterGymText_5c49e::
cont "me your best!"
done
_PewterGymText_5c4a3::
_BrockPostBattleAdviceText::
text "There are all"
line "kinds of trainers"
cont "in the world!"
@ -38,7 +38,7 @@ _PewterGymText_5c4a3::
cont "your abilities!"
done
_TM34PreReceiveText::
_BeforeReceivedTM34Text::
text "Wait! Take this"
line "with you!"
done
@ -77,7 +77,7 @@ _TM34NoRoomText::
line "room for this!"
done
_PewterGymText_5c4bc::
_ReceivedBoulderBadgeText::
text "I took"
line "you for granted."
@ -89,7 +89,7 @@ _PewterGymText_5c4bc::
line "the BOULDERBADGE!@"
text_end
_PewterGymText_5c4c1::
_BrockBoulerBadgeInfoText::
text_start
para "That's an official"
@ -128,7 +128,7 @@ _PewterGymAfterBattleText1::
cont "as BROCK!"
done
_PewterGymText_5c515::
_PewterGymGuidePreAdviceText::
text "Hiya! I can tell"
line "you have what it"
cont "takes to become a"
@ -142,12 +142,12 @@ _PewterGymText_5c515::
line "to the top!"
done
_PewterGymText_5c51a::
_PewterGymGuideBeginAdviceText::
text "All right! Let's"
line "get happening!"
prompt
_PewterGymText_5c51f::
_PewterGymGuideAdviceText::
text "The 1st #MON"
line "out in a match is"
cont "at the top of the"
@ -165,7 +165,7 @@ _PewterGymText_5c524::
cont "get happening!"
prompt
_PewterGymText_5c529::
_PewterGymGuidePostBattleText::
text "Just as I thought!"
line "You're #MON"
cont "champ material!"

14
text/SaffronGym.asm
View File

@ -1,4 +1,4 @@
_SaffronGymText_5d162::
_SabrinaPreBattleText::
text "I had a vision of"
line "your arrival!"
@ -16,7 +16,7 @@ _SaffronGymText_5d162::
cont "you my powers!"
done
_SaffronGymText_5d167::
_ReceivedMarshBadgeText::
text "I'm"
line "shocked!"
cont "But, a loss is a"
@ -30,14 +30,14 @@ _SaffronGymText_5d167::
line "MARSHBADGE!@"
text_end
_SaffronGymText_5d16e::
_SabrinaPostBattleAdviceText::
text "Everyone has"
line "psychic power!"
cont "People just don't"
cont "realize it!"
done
_SaffronGymText_5d173::
_KogaMarshBadgeInfoText::
text "The MARSHBADGE"
line "makes #MON up"
cont "to L70 obey you!"
@ -55,7 +55,7 @@ _SaffronGymText_5d173::
line "this TM with you!"
done
ReceivedTM46Text::
_ReceivedTM46Text::
text "<PLAYER> received"
line "TM46!@"
text_end
@ -74,7 +74,7 @@ _TM46NoRoomText::
line "of other items!"
done
_SaffronGymText_5d1e6::
_SaffronGymGuidePreBattleText::
text "Yo! Champ in"
line "making!"
@ -91,7 +91,7 @@ _SaffronGymText_5d1e6::
cont "even aim a punch!"
done
_SaffronGymText_5d1eb::
_SaffronGymGuidePostBattleText::
text "Psychic power,"
line "huh?"

8
text/VermilionGym.asm
View File

@ -32,7 +32,7 @@ _LTSurgePostBattleAdviceText::
cont "type #MON!"
done
_LTSurgeThunderbadgeInfoText::
_LTSurgeThunderBadgeInfoText::
text "The THUNDERBADGE"
line "cranks up your"
cont "#MON's SPEED!"
@ -67,7 +67,7 @@ _TM24NoRoomText::
line "in your pack!"
done
_ReceivedThunderbadgeText::
_ReceivedThunderBadgeText::
text "Whoa!"
para "You're the real"
@ -135,7 +135,7 @@ _VermilionGymAfterBattleText3::
cont "next to it!"
done
_VermilionGymFanPreBattleText::
_VermilionGymGuidePreBattleText::
text "Yo! Champ in"
line "making!"
@ -161,7 +161,7 @@ _VermilionGymFanPreBattleText::
cont "get to him!"
done
_VermilionGymFanPostBattleText::
_VermilionGymGuidePostBattleText::
text "Whew! That match"
line "was electric!"
done

12
text/ViridianGym.asm
View File

@ -1,4 +1,4 @@
_ViridianGymText_74ace::
_GiovanniPreBattleText::
text "Fwahahaha! This is"
line "my hideout!"
@ -18,7 +18,7 @@ _ViridianGymText_74ace::
cont "greatest trainer!"
done
_ViridianGymText_74ad3::
_ReceivedEarthBadgeText::
text "Ha!"
line "That was a truly"
cont "intense fight!"
@ -27,7 +27,7 @@ _ViridianGymText_74ad3::
cont "the EARTHBADGE!@"
text_end
_ViridianGymText_74ad9::
_GiovanniPostBattleAdviceText::
text "Having lost, I"
line "cannot face my"
cont "underlings!"
@ -43,7 +43,7 @@ _ViridianGymText_74ad9::
cont "Farewell!@"
text_end
_ViridianGymText12::
_GiovanniEarthBadgeInfoText::
text "The EARTHBADGE"
line "makes #MON of"
cont "any level obey!"
@ -215,7 +215,7 @@ _ViridianGymAfterBattleText8::
cont "our GYM LEADER!"
done
_ViridianGymText_74bd4::
_ViridianGymGuidePreBattleText::
text "Yo! Champ in"
line "making!"
@ -233,7 +233,7 @@ _ViridianGymText_74bd4::
cont "#MON!"
done
_ViridianGymText_74bd9::
_ViridianGymGuidePostBattleText::
text "Blow me away!"
line "GIOVANNI was the"
cont "GYM LEADER here?"

1615
wram.asm
View File

File diff suppressed because it is too large Load Diff