Fix erros and minor party tweaks

Fixed a dozen typos so the game builds moved gfx/trade.asm out of battle engine 7 bank, as suggested by vimescarrot to make all the custom movesets work againg revised the parties to fix an confusion with later rival teams, and revised a couple trainers (ducks are birds too)
wrulfy · Feb 4, 2023 · 5325132 · 5325132
1 parent 81f2a31
commit 5325132
Show file tree

Hide file tree

Showing 13 changed files with 57 additions and 59 deletions.
diff --git a/data/maps/objects/Route21.asm b/data/maps/objects/Route21.asm
@@ -13,7 +13,7 @@ Route21_Object:
  object_event 16, 63, SPRITE_SWIMMER, STAY, DOWN, 5, OPP_SWIMMER, 13
  object_event 5, 71, SPRITE_COOLTRAINER_M, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 5
  object_event 15, 71, SPRITE_SWIMMER, STAY, LEFT, 7, OPP_GENTLEMAN, 4
- object_event 14, 56, SPRITE_YONGSTER, STAY, LEFT, 8, OPP_YOUNGSTER, 8
+ object_event 14, 56, SPRITE_YOUNGSTER, STAY, LEFT, 8, OPP_YOUNGSTER, 8
  object_event 17, 57, SPRITE_COOLTRAINER_M, STAY, UP, 9, OPP_BIRD_KEEPER, 11
  object_event 17, 58, SPRITE_YOUNGSTER, STAY, UP, 9, OPP_PSYCHIC_TR, 3
 

diff --git a/data/pokemon/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm
@@ -18,7 +18,7 @@
  HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, LIGHT_SCREEN, \
  SMOKESCREEN, EARTHQUAKE, FISSURE, DIG, MIMIC, \
  DOUBLE_TEAM, REFLECT, BIDE, METRONOME, SELFDESTRUCT, \
- EGG_BOMB, FLAMETHROWER, REST, EXPLOSION, SUBSTITUTE, 
+ EGG_BOMB, FLAMETHROWER, REST, EXPLOSION, SUBSTITUTE, \
  STRENGTH 
  ; end
 

diff --git a/data/pokemon/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm
@@ -14,11 +14,11 @@
  db GROWTH_SPECIAL ; growth rate
 
  ; tm/hm learnset
- tmhm MEGA_PUNCH, SLUDGE, POISON_GAS, BODY_SLAM,  TAKE_DOWN, \
- DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER,  SEISMIC_TOSS, \
- SOLARBEAM, SMOKESCREEN, PSYCHIC_M, TELEPORT, MIMIC,  \
- DOUBLE_TEAM, BIDE, METRONOME, FLAMETHROWER, SOFTBOILED,  \
- REST, CONFUSE_RAY, SUBSTITUTE, STRENGTH 
+ tmhm MEGA_PUNCH, RAZOR_WIND, SLUDGE, POISON_GAS, BODY_SLAM, \
+ TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, \
+ SEISMIC_TOSS, SOLARBEAM, SMOKESCREEN, PSYCHIC_M, TELEPORT, \
+ MIMIC, DOUBLE_TEAM, BIDE, METRONOME, FLAMETHROWER, \
+ SOFTBOILED, REST, CONFUSE_RAY, SUBSTITUTE, STRENGTH 
  ; end
 
  db 0 ; padding
diff --git a/data/pokemon/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm
@@ -16,7 +16,7 @@
  ; tm/hm learnset
  tmhm RAZOR_WIND, WHIRLWIND, POISON_GAS, TAKE_DOWN, DOUBLE_EDGE, \
  BUBBLEBEAM, HYDRO_PUMP, HYPER_BEAM, LIGHT_SCREEN, DRAGON_RAGE, \
- MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FLAMETRHOWER, \
+ MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FLAMETHROWER, \
  SWIFT, SOFTBOILED, SKY_ATTACK, REST, SUBSTITUTE, \
  FLY 
  ; end

diff --git a/data/pokemon/base_stats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm
@@ -16,7 +16,7 @@
  ; tm/hm learnset
  tmhm RAZOR_WIND, WHIRLWIND, POISON_GAS, TAKE_DOWN, DOUBLE_EDGE, \
  LIGHT_SCREEN, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \
- FLAMETRHOWER, SWIFT, SOFTBOILED, SKY_ATTACK, REST, \
+ FLAMETHROWER, SWIFT, SOFTBOILED, SKY_ATTACK, REST, \
  SUBSTITUTE, FLY 
  ; end
 

diff --git a/data/pokemon/base_stats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm
@@ -10,7 +10,7 @@
  INCBIN "gfx/pokemon/front/sandslash.pic", 0, 1 ; sprite dimensions
  dw SandslashPicFront, SandslashPicBack
 
- db DIG, POISON_STING, SWIFT, VICE_GRIP ; level 1 learnset
+ db DIG, POISON_STING, SWIFT, VICEGRIP ; level 1 learnset
  db GROWTH_NORMAL ; growth rate
 
  ; tm/hm learnset

diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm
@@ -254,10 +254,10 @@ SpearowEvosMoves:
  db 0
 ; Learnset
  db 6, SCRATCH
- db 11, LEER
- db 15, MIRROR_MOVE
- db 20, FURY_ATTACK
- db 24, HEADBUTT
+ db 10, LEER
+ db 14, MIRROR_MOVE
+ db 19, FURY_ATTACK
+ db 23, HEADBUTT
  db 0
 
 VoltorbEvosMoves:
@@ -588,7 +588,7 @@ TangelaEvosMoves:
  db 34, MEGA_DRAIN
  db 38, EGG_BOMB
  db 42, SLEEP_POWDER
- db 46, SOLAR_BEAM
+ db 46, SOLARBEAM
  db 50, GROWTH
  db 0
 
@@ -1967,10 +1967,10 @@ GoldeenEvosMoves:
  db 0
 ; Learnset
  db 6, SUPERSONIC
- db 11, WATER_GUN
- db 15, HORN_ATTACK
- db 20, PSYBEAM
- db 24, AGILITY
+ db 10, WATER_GUN
+ db 14, HORN_ATTACK
+ db 19, PSYBEAM
+ db 23, AGILITY
  db 0
 
 SeakingEvosMoves:

diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
@@ -190,7 +190,7 @@ JrTrainerFData:
 ; Route 15
  db 34, GLOOM, WEEPINBELL, VENUSAUR, 0
  db 33, JIGGLYPUFF, WIGGLYTUFF, PIKACHU, RAICHU, 0
- db 35, WIGGLYTUFF, RAICHU, CHANSEY, 0
+ db 35, WIGGLYTUFF, ELECTABUZZ, CHANSEY, 0
  db 34, PONYTA, SEADRA, TANGELA, 0
 
 PokemaniacData:
@@ -267,7 +267,7 @@ BikerData:
 ; Route 16
  db 31, GRIMER, KOFFING, 0
  db 34, FLAREON, 0
- db 27, GRIMER, GRIMER, GRIMER, GRIMER, GRIMER, GRIMER,0
+ db 27, GRIMER, GRIMER, GRIMER, GRIMER, GRIMER, GRIMER, 0
 ; Route 17
  ; From https://www.smogon.com/smog/issue27/glitch:
  ; 0E:5FC2 is offset of the ending 0 for this first Biker on Route 17.
@@ -381,7 +381,7 @@ GamblerData:
 
 BeautyData:
 ; REPRUPOSED FOR FUCHSIA GYM
- db 36, NIDORINA, NIDORINO, VICTREEBEL, 0 
+ db 36, NIDORINA, NIDORINO, VICTREEBEL, 0
 ; Route 20
  db 40, GOLDUCK, SEAKING, SEADRA, 0
 ; Celadon Gym
@@ -408,8 +408,8 @@ PsychicData:
 ; Saffron Gym
  db 42, NINETALES, HYPNO, 0
  db 45, GENGAR, 0
-; REPRUPOSED FOR R21
- db 47, SLOWBRO, ALAKAZAM, PORYGON, HYPNO, 0
+; REPRUPOSED FOR ROUTE 21
+ db 47, SLOWBRO, JYNX, PORYGON, HYPNO, 0
 ; REPRUPOSED FOR SS ANNE
  db 22, MR_MIME, 0
 
@@ -451,18 +451,18 @@ BirdKeeperData:
  db 33, PIDGEOTTO, DODUO, FEAROW, FARFETCHD, 0
  db 34, PIDGEOTTO, FEAROW, DODRIO, 0
 ; Route 18
- db 31, DODUO, PIDGEOTTO, FEAROW, FARFETCHD, 0
+ db 31, DODUO, PSYDUCK, FEAROW, FARFETCHD, 0
  db 33, DODRIO, GYARADOS, 0
  db 29, ZUBAT, ZUBAT, ZUBAT, ZUBAT, ZUBAT, GOLBAT, 0
 ; Route 21
  db 52, DRAGONITE, 0
 ; NOW ON ROUTE 25
  db 17, PIDGEY, SPEAROW, DODUO, 0
 ; Route 14
- db 35, DODRIO, FEAROW, PIDGEOTTO, 0
- db 36, PIDGEOTTO, FARFETCHD, 0
- db 35, FEAROW, FEAROW, FEAROW, 0
- db 34, DODUO, SPEAROW, DODRIO, FEAROW, 0
+ db 35, PIDGEOTTO, FEAROW, PORYGON, 0
+ db 36, PIDGEOTTO, GOLDUCK, 0
+ db 35, FEAROW, FARFETCHD, MAGMAR, 0
+ db 34, DODUO, PIDGEOTTO, FEAROW, DODRIO, 0
 
 BlackbeltData:
 ; Fighting Dojo
@@ -609,7 +609,7 @@ CooltrainerMData:
 ; Victory Road 3F
  db 56, GENGAR, MR_MIME, AERODACTYL, TAUROS, 0
 ; MANSION 3F
- db 44, EXEGGUTOR, CHANSEY, STARMIE, SNORLAX, RHYDON, TAUROS,  0
+ db 44, EXEGGUTOR, CHANSEY, STARMIE, SNORLAX, RHYDON, TAUROS, 0
 ; Victory Road 1F
  db 54, RAPIDASH, HITMONLEE, CHARIZARD, OMASTAR, 0
 ; ROUTE 21
@@ -680,14 +680,14 @@ Green2Data:
  db $FF, 42, PIDGEOT, 41, MACHOKE, 39, LAPRAS, 41, NINETALES, 41, POLIWHIRL, 45, VENUSAUR, 0
  db $FF, 42, PIDGEOT, 41, MACHOKE, 39, LAPRAS, 41, POLIWHIRL, 41, WEEPINBELL, 45, CHARIZARD, 0
 ; Route 22
- db $FF, 56, PIDGEOT, 55, MACHAMP, 54, LAPRAS, 56, NINETALES, 56, VICTREEBEL, 59, BLASTOISE, 0
- db $FF, 56, PIDGEOT, 55, MACHAMP, 54, LAPRAS, 56, POLIWRATH, 56, NINETALES, 59, VENUSAUR, 0
- db $FF, 56, PIDGEOT, 55, MACHAMP, 54, LAPRAS, 56, VICTREEBEL, 56, POLIWRATH, 59, CHARIZARD, 0
+ db $FF, 56, PIDGEOT, 55, MACHAMP, 54, LAPRAS, 56, VICTREEBEL, 56, NINETALES, 59, BLASTOISE, 0
+ db $FF, 56, PIDGEOT, 55, MACHAMP, 54, LAPRAS, 56, NINETALES, 56, POLIWRATH, 59, VENUSAUR, 0
+ db $FF, 56, PIDGEOT, 55, MACHAMP, 54, LAPRAS, 56, POLIWRATH, 56, VICTREEBEL, 59, CHARIZARD, 0
 
 Green3Data:
- db $FF, 69, PIDGEOT, 69, MACHAMP, 68, LAPRAS, 70, NINETALES, 70, VICTREEBEL, 72, BLASTOISE, 0
- db $FF, 69, PIDGEOT, 69, MACHAMP, 68, LAPRAS, 70, POLIWRATH, 70, NINETALES, 72, VENUSAUR, 0
- db $FF, 69, PIDGEOT, 69, MACHAMP, 68, LAPRAS, 70, VICTREEBEL, 70, POLIWRATH, 72, CHARIZARD, 0
+ db $FF, 69, PIDGEOT, 69, MACHAMP, 68, LAPRAS, 70, VICTREEBEL, 70, NINETALES, 72, BLASTOISE, 0
+ db $FF, 69, PIDGEOT, 69, MACHAMP, 68, LAPRAS, 70, NINETALES, 70, POLIWRATH, 72, VENUSAUR, 0
+ db $FF, 69, PIDGEOT, 69, MACHAMP, 68, LAPRAS, 70, POLIWRATH, 70, VICTREEBEL, 72, CHARIZARD, 0
 
 LoreleiData:
  db $FF, 60, GOLDUCK, 61, SEADRA, 61, SLOWBRO, 62, VAPOREON, 62, POLIWRATH, 63, CLOYSTER, 0

diff --git a/data/trainers/special_moves.asm b/data/trainers/special_moves.asm
@@ -40,19 +40,19 @@ SpecialTrainerMoves:
  db 6, 1, SUBMISSION
  db 0
 
- db BIRDKEEPER, 14
- db 3, 2, RAZOR_WIND
+ db BIRD_KEEPER, 14
+ db 3, 4, RAZOR_WIND
  db 0
 
- db BIRDKEEPER, 15
- db 2, 2, RAZOR_WIND
+ db BIRD_KEEPER, 15
+ db 2, 1, RAZOR_WIND
  db 0
 
- db BIRDKEEPER, 16
- db 3, 1, RAZOR_WIND
+ db BIRD_KEEPER, 16
+ db 3, 2, RAZOR_WIND
  db 0
 
- db BIRDKEEPER, 17
+ db BIRD_KEEPER, 17
  db 4, 3, FLY
  db 0
 
@@ -308,7 +308,7 @@ SpecialTrainerMoves:
  db 6, 2, SURF
  db 0
 
- db RIVAL2, 11 ; db $FF, 56, PIDGEOT, 55, MACHAMP, 54, LAPRAS, 56, POLIWRATH, 56, NINETALES, 59, VENUSAUR, 0
+ db RIVAL2, 11 ; db $FF, 56, PIDGEOT, 55, MACHAMP, 54, LAPRAS, 56, VICTREEBEL, 56, NINETALES, 59, BLASTOISE, 0
  db 1, 4, POISON_GAS
  db 2, 4, EARTHQUAKE
  db 3, 4, THUNDER_WAVE
@@ -318,7 +318,7 @@ SpecialTrainerMoves:
  db 6, 2, CONSTRICT
  db 0
 
- db RIVAL2, 12 ; db $FF, 56, PIDGEOT, 55, MACHAMP, 54, LAPRAS, 56, VICTREEBEL, 56, POLIWRATH, 59, CHARIZARD, 0
+ db RIVAL2, 12 ; db $FF, 56, PIDGEOT, 55, MACHAMP, 54, LAPRAS, 56, POLIWRATH, 56, VICTREEBEL, 59, CHARIZARD, 0
  db 1, 4, POISON_GAS
  db 2, 4, EARTHQUAKE
  db 3, 2, THUNDER_WAVE
@@ -328,7 +328,7 @@ SpecialTrainerMoves:
  db 6, 2, SLASH
  db 0
 
- db RIVAL3, 1 ; db $FF, 69, PIDGEOT, 69, MACHAMP, 68, LAPRAS, 70, NINETALES, 70, VICTREEBEL, 72, BLASTOISE, 0
+ db RIVAL3, 1 ; db $FF, 69, PIDGEOT, 69, MACHAMP, 68, LAPRAS, 70, VICTREEBEL, 70, NINETALES, 72, BLASTOISE, 0
  db 1, 3, HYDRO_PUMP
  db 2, 1, EARTHQUAKE
  db 2, 2, HYPER_BEAM
@@ -340,7 +340,7 @@ SpecialTrainerMoves:
  db 6, 1, ICE_BEAM
  db 0
 
- db RIVAL3, 2 ; db $FF, 69, PIDGEOT, 69, MACHAMP, 68, LAPRAS, 70, POLIWRATH, 70, NINETALES, 72, VENUSAUR, 0
+ db RIVAL3, 2 ; db $FF, 69, PIDGEOT, 69, MACHAMP, 68, LAPRAS, 70, NINETALES, 70, POLIWRATH, 72, VENUSAUR, 0
  db 1, 3, HYDRO_PUMP
  db 2, 1, EARTHQUAKE
  db 2, 2, HYPER_BEAM
@@ -352,15 +352,15 @@ SpecialTrainerMoves:
  db 6, 1, CONSTRICT
  db 0
 
- db RIVAL3, 3 ; db $FF, 69, PIDGEOT, 69, MACHAMP, 68, LAPRAS, 70, VICTREEBEL, 70, POLIWRATH, 72, CHARIZARD, 0
+ db RIVAL3, 3 ; db $FF, 69, PIDGEOT, 69, MACHAMP, 68, LAPRAS, 70, POLIWRATH, 70, VICTREEBEL, 72, CHARIZARD, 0
  db 1, 3, HYDRO_PUMP
  db 2, 1, EARTHQUAKE
  db 2, 2, HYPER_BEAM
  db 2, 3, EGG_BOMB
  db 3, 1, THUNDERBOLT
  db 4, 1, ICE_BEAM
- db 4, 2, PSYCHIC
- db 5, 2, SOLAR_BEAM
+ db 4, 2, PSYCHIC_M
+ db 5, 2, SOLARBEAM
  db 5, 4, BODY_SLAM
  db 6, 1, FISSURE
  db 0
@@ -376,7 +376,7 @@ SpecialTrainerMoves:
 
  db AGATHA, 1
  db 1, 1, CONFUSE_RAY
- db 1, 3, THUNDERWAVE
+ db 1, 3, THUNDER_WAVE
  db 2, 1, SOLARBEAM
  db 3, 1, SLUDGE
  db 5, 1, DREAM_EATER

diff --git a/main.asm b/main.asm
@@ -194,7 +194,6 @@ INCLUDE "engine/battle/unused_stats_functions.asm"
 INCLUDE "engine/battle/scroll_draw_trainer_pic.asm"
 INCLUDE "engine/battle/trainer_ai.asm"
 INCLUDE "engine/battle/draw_hud_pokeball_gfx.asm"
-INCLUDE "gfx/trade.asm"
 INCLUDE "engine/pokemon/evos_moves.asm"
 INCLUDE "engine/battle/move_effects/heal.asm"
 INCLUDE "engine/battle/move_effects/transform.asm"
@@ -205,7 +204,7 @@ SECTION "Battle Core", ROMX
 
 INCLUDE "engine/battle/core.asm"
 INCLUDE "engine/battle/effects.asm"
-
+INCLUDE "gfx/trade.asm"
 
 SECTION "bank10", ROMX
 

diff --git a/maps/PewterCity.blk b/maps/PewterCity.blk
@@ -1,6 +1,6 @@
 
 
-RRRRRRRRRRRRRRRooo?;ttt  !ttn,)tttuqqv|}~eCdttn,)/7}:~oeCdo`,)
+RRRRRRRRRRRRRRRooo?;ttt  !ttn,)tttuqqv|}~eCdttn,)/7}:~4eCdo/B,)
 lllll
 n,)tttttt>??,)
 

diff --git a/text/Route15Gate2F.asm b/text/Route15Gate2F.asm
@@ -23,12 +23,11 @@ _Route15GateUpstairsText_49698::
  line "small island!"
  done
 
-
 ; para "It gives half of"
 ; line "the EXP to each"
 ; cont "of your #MON."
 ;
 ; para "If it feels too"
 ; line "easy, you can"
 ; cont "store it via PC."
-; done
+; done
diff --git a/text/Route21.asm b/text/Route21.asm
@@ -138,18 +138,18 @@ _Route21AfterBattleText9::
  line "very fancy bird!"
  done
 
-_Route21BattleText9::
+_Route21BattleText10::
  text "Hello! I'm walking"
  line "on water by using"
  cont "my telekinesis!"
  done
 
-_Route21EndBattleText9::
+_Route21EndBattleText10::
  text "That"
  line "was impressive."
  prompt
 
-_Route21AfterBattleText9::
+_Route21AfterBattleText10::
  text "My next goal is to"
  line "walk on thin air!"
  done