0.9.4 update

Fixed several minor bugs and updated a few other stuff.

more info in the changelog.md

changelog.md

@@ -1,4 +1,21 @@
-v0.9.3 Quickfix
+**v0.9.4 UPDATE**
+
+Updated the Acid Armor animation
+Fixed a debugging trainer
+Fixed a misplaced warp in Seafoam
+Fixed warps in Power plant
+Fixed the birds initial moveset
+Fixed a dev hole in the mansion
+Fixed a few text errors, including the badge guy
+Swapped a few trainers for added variety
+Fixed an issue if you reset and continue in the r18 garden
+Fixed Acid armor animation
+Tangela now can learn Thunderbolt though TM (never realized it got shockwave in gen4+)
+Updated the Fuchsia City and nearby route's maps
+
+______________________
+
+**v0.9.3 Quickfix**
 
 Fixed trainer ranges in SilphCo.
 Fixed trainer dialogues in SilphCo.
@@ -7,12 +24,12 @@ KNOWN BUG: going into the seafoam islands though cinnabar side (unintended) puts
 
 ______________________
 
-v0.9.2 Quickfix
+**v0.9.2 Quickfix**
 
 Fixed a bug in MtMoon B2F.
 ______________________
 
-v0.9.1 Quickfix
+**v0.9.1 Quickfix**
 
 Fixed kakuna knowing tackle instead of poison sting
 Rebalanced viridian forest encounters to have more worm and less cocoon
@@ -21,4 +38,4 @@ Fixed abra not knowing just teleport at lv1
 Fialogue fixes
 ______________________
 
-v0.9.0 Initial (pre)Release
+**v0.9.0 Initial (pre)Release**

data/maps/objects/PowerPlant.asm

@@ -2,9 +2,9 @@ PowerPlant_Object:
 	db $2e ; border block
 
 	def_warp_events
-	warp_event  4, 35, LAST_MAP, 4
-	warp_event  5, 35, LAST_MAP, 4
-	warp_event  0, 11, LAST_MAP, 4
+	warp_event  4, 35, LAST_MAP, 1
+	warp_event  5, 35, LAST_MAP, 1
+	warp_event  0, 11, LAST_MAP, 1
 
 	def_bg_events
 

data/maps/objects/RockTunnel1F.asm

@@ -20,9 +20,9 @@ RockTunnel1F_Object:
 	object_event 15, 12, SPRITE_HIKER, STAY, DOWN, 2, OPP_HIKER, 13
 	object_event 23, 19, SPRITE_HIKER, STAY, LEFT, 3, OPP_HIKER, 14
 	object_event 23,  8, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_POKEMANIAC, 7
-	object_event 25, 25, SPRITE_COOLTRAINER_F, STAY, LEFT, 5, OPP_JR_TRAINER_F, 16
-	object_event 19, 28, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_JR_TRAINER_F, 17
-	object_event 32, 23, SPRITE_COOLTRAINER_F, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 18
+	object_event 25, 25, SPRITE_COOLTRAINER_F, STAY, LEFT, 5, OPP_JR_TRAINER_F, 15
+	object_event 19, 28, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_JR_TRAINER_F, 16
+	object_event 32, 23, SPRITE_COOLTRAINER_F, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 17
 	object_event 27, 17, SPRITE_POKE_BALL, STAY, NONE, 8, REVIVE
 	object_event 14, 22, SPRITE_POKE_BALL, STAY, NONE, 9, ULTRA_BALL
 

data/maps/objects/Route13.asm

@@ -13,10 +13,10 @@ Route13_Object:
 	object_event 48, 10, SPRITE_COOLTRAINER_F, STAY, DOWN, 2, OPP_JR_TRAINER_F, 12
 	object_event 27,  9, SPRITE_COOLTRAINER_F, STAY, DOWN, 3, OPP_JR_TRAINER_F, 13
 	object_event 23, 10, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_JR_TRAINER_F, 14
-	object_event 50,  5, SPRITE_COOLTRAINER_F, STAY, DOWN, 5, OPP_JR_TRAINER_F, 15
+	object_event 22,  5, SPRITE_COOLTRAINER_F, STAY, RIGHT, 5, OPP_COOLTRAINER_F, 6
 	object_event 12,  4, SPRITE_COOLTRAINER_M, STAY, RIGHT, 6, OPP_BIRD_KEEPER, 2
-	object_event 33,  6, SPRITE_BEAUTY, STAY, ANY_DIR, 7, OPP_BEAUTY, 4
-	object_event 32,  6, SPRITE_BEAUTY, STAY, DOWN, 8, OPP_BEAUTY, 5
+	object_event 33,  7, SPRITE_BEAUTY, STAY, ANY_DIR, 7, OPP_BEAUTY, 4
+	object_event 35,  9, SPRITE_BEAUTY, STAY, DOWN, 8, OPP_BEAUTY, 5
 	object_event 10,  7, SPRITE_BIKER, STAY, UP, 9, OPP_BIKER, 1
 	object_event  7, 13, SPRITE_COOLTRAINER_M, STAY, UP, 10, OPP_BIRD_KEEPER, 3
 

data/maps/objects/Route15.asm

@@ -11,16 +11,16 @@ Route15_Object:
 	bg_event 39,  9, 12 ; Route15Text12
 
 	def_object_events
-	object_event 41, 11, SPRITE_COOLTRAINER_F, STAY, DOWN, 1, OPP_JR_TRAINER_F, 19
-	object_event 53, 10, SPRITE_COOLTRAINER_F, STAY, LEFT, 2, OPP_JR_TRAINER_F, 20
+	object_event 41, 11, SPRITE_COOLTRAINER_F, STAY, DOWN, 1, OPP_JR_TRAINER_F, 18
+	object_event 53, 10, SPRITE_COOLTRAINER_F, STAY, LEFT, 2, OPP_JR_TRAINER_F, 19
 	object_event 31, 13, SPRITE_COOLTRAINER_M, STAY, UP, 3, OPP_BIRD_KEEPER, 6
 	object_event 35, 13, SPRITE_COOLTRAINER_M, STAY, UP, 4, OPP_BIRD_KEEPER, 7
 	object_event 53, 11, SPRITE_BEAUTY, STAY, DOWN, 5, OPP_BEAUTY, 9
 	object_event 41, 10, SPRITE_BEAUTY, STAY, RIGHT, 6, OPP_BEAUTY, 10
 	object_event 48, 10, SPRITE_BIKER, STAY, DOWN, 7, OPP_BIKER, 3
 	object_event 46, 10, SPRITE_BIKER, STAY, DOWN, 8, OPP_BIKER, 4
-	object_event 37,  6, SPRITE_COOLTRAINER_F, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 21
-	object_event 18, 13, SPRITE_COOLTRAINER_F, STAY, UP, 10, OPP_JR_TRAINER_F, 22
+	object_event 37,  6, SPRITE_COOLTRAINER_F, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 20
+	object_event 18, 13, SPRITE_COOLTRAINER_F, STAY, UP, 10, OPP_JR_TRAINER_F, 21
 	object_event 18,  5, SPRITE_POKE_BALL, STAY, NONE, 11, TM_GROWTH
 
 	def_warps_to ROUTE_15

data/maps/objects/Route18.asm

@@ -2,18 +2,18 @@ Route18_Object:
 	db $F ; border block
 
 	def_warp_events
-	warp_event 33,  8, ROUTE_18_GATE_1F, 1
-	warp_event 33,  9, ROUTE_18_GATE_1F, 2
-	warp_event 40,  8, ROUTE_18_GATE_1F, 3
-	warp_event 40,  9, ROUTE_18_GATE_1F, 4
+	warp_event 25,  8, ROUTE_18_GATE_1F, 1
+	warp_event 25,  9, ROUTE_18_GATE_1F, 2
+	warp_event 32,  8, ROUTE_18_GATE_1F, 3
+	warp_event 32,  9, ROUTE_18_GATE_1F, 4
 
 	def_bg_events
-	bg_event 43,  7, 4 ; Route18Text4
-	bg_event 33,  7, 5 ; Route18Text5
+	bg_event 41, 11, 4 ; Route18Text4
+	bg_event 25,  7, 5 ; Route18Text5
 
 	def_object_events
-	object_event 29, 11, SPRITE_COOLTRAINER_M, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 8
-	object_event 36, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, 2, OPP_BIRD_KEEPER, 9
-	object_event 42, 13, SPRITE_COOLTRAINER_M, STAY, LEFT, 3, OPP_BIRD_KEEPER, 10
+	object_event 31, 11, SPRITE_COOLTRAINER_M, WALK, LEFT_RIGHT, 1, OPP_BIRD_KEEPER, 8
+	object_event 33, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, 2, OPP_BIRD_KEEPER, 9
+	object_event 42, 13, SPRITE_COOLTRAINER_M, STAY, ANY_DIR, 3, OPP_BIRD_KEEPER, 10
 
 	def_warps_to ROUTE_18

data/maps/objects/Route9.asm

@@ -15,7 +15,7 @@ Route9_Object:
 	object_event 43,  3, SPRITE_HIKER, STAY, LEFT, 6, OPP_HIKER, 6
 	object_event 22,  2, SPRITE_YOUNGSTER, STAY, DOWN, 7, OPP_BUG_CATCHER, 13
 	object_event 45, 15, SPRITE_HIKER, STAY, RIGHT, 8, OPP_HIKER, 5
-	object_event 40,  8, SPRITE_YOUNGSTER, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14
+	object_event 40,  8, SPRITE_COOLTRAINER_M, STAY, RIGHT, 9, OPP_COOLTRAINER_M, 9
 	object_event 10, 15, SPRITE_POKE_BALL, STAY, NONE, 10, TM_WHIRLWIND
 
 	def_warps_to ROUTE_9

data/maps/objects/SeafoamIslands1F.asm

@@ -6,7 +6,7 @@ SeafoamIslands1F_Object:
 	warp_event  5, 13, LAST_MAP, 1
 	warp_event 26, 27, LAST_MAP, 2
 	warp_event 27, 27, LAST_MAP, 2
-	warp_event  7,  5, SEAFOAM_ISLANDS_B1F, 2
+	warp_event  9,  6, SEAFOAM_ISLANDS_B1F, 2
 	warp_event 25,  3, SEAFOAM_ISLANDS_B1F, 7
 	warp_event 25, 23, SEAFOAM_ISLANDS_B1F, 5
 	warp_event 12, 27, LAST_MAP, 3

data/maps/objects/VictoryRoad3F.asm

@@ -12,7 +12,7 @@ VictoryRoad3F_Object:
 	def_object_events
 	object_event 12,  4, SPRITE_COOLTRAINER_M, STAY, RIGHT, 1, OPP_COOLTRAINER_M, 2
 	object_event  7, 12, SPRITE_COOLTRAINER_F, STAY, DOWN, 2, OPP_COOLTRAINER_F, 2
-	object_event 28, 11, SPRITE_YOUNGSTER, STAY, LEFT, 3, OPP_BUG_CATCHER, 15
+	object_event 28, 11, SPRITE_YOUNGSTER, STAY, LEFT, 3, OPP_BUG_CATCHER, 14
 	object_event 28,  4, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_COOLTRAINER_F, 3
 	object_event  7,  7, SPRITE_POKE_BALL, STAY, NONE, 5, MAX_REVIVE
 	object_event 26,  4, SPRITE_POKE_BALL, STAY, NONE, 6, TM_EXPLOSION

data/maps/sprite_sets.asm

@@ -1,42 +1,42 @@
 MapSpriteSets:
 	table_width 1, MapSpriteSets
-	db $01 ; PALLET_TOWN
-	db $01 ; VIRIDIAN_CITY
-	db $02 ; PEWTER_CITY
-	db $02 ; CERULEAN_CITY
-	db $03 ; LAVENDER_TOWN
-	db $04 ; VERMILION_CITY
-	db $05 ; CELADON_CITY
-	db $0a ; FUCHSIA_CITY
-	db $01 ; CINNABAR_ISLAND
-	db $06 ; INDIGO_PLATEAU
-	db $07 ; SAFFRON_CITY
+	db $01 ; PALLET_TOWN; RED
+	db $01 ; VIRIDIAN_CITY; RED
+	db $02 ; PEWTER_CITY; ORANGE
+	db $02 ; CERULEAN_CITY; ORANGE
+	db $03 ; LAVENDER_TOWN; YELLOW
+	db $04 ; VERMILION_CITY; GREEN
+	db $05 ; CELADON_CITY; LIGHT BLUE
+	db $0a ; FUCHSIA_CITY; PURPLE
+	db $01 ; CINNABAR_ISLAND; RED
+	db $06 ; INDIGO_PLATEAU; GREY
+	db $07 ; SAFFRON_CITY; PINK
 	db $03 ; ROUTE_0 previusly unused map
-	db $01 ; ROUTE_1
+	db $01 ; ROUTE_1; RED
 	db $f1 ; ROUTE_2
-	db $02 ; ROUTE_3
-	db $02 ; ROUTE_4
+	db $02 ; ROUTE_3; ORANGE
+	db $02 ; ROUTE_4; ORANGE
 	db $f9 ; ROUTE_5
 	db $fa ; ROUTE_6
 	db $fb ; ROUTE_7
 	db $fc ; ROUTE_8
-	db $02 ; ROUTE_9
+	db $02 ; ROUTE_9; ORANGE
 	db $f2 ; ROUTE_10
 	db $f3 ; ROUTE_11
 	db $f4 ; ROUTE_12
-	db $08 ; ROUTE_13
-	db $08 ; ROUTE_14
+	db $08 ; ROUTE_13; FUCHSIA
+	db $08 ; ROUTE_14; FUCHSIA
 	db $f5 ; ROUTE_15
 	db $f6 ; ROUTE_16
-	db $09 ; ROUTE_17
+	db $09 ; ROUTE_17; BLUE
 	db $f7 ; ROUTE_18
-	db $0a ; ROUTE_19
+	db $0a ; ROUTE_19; PURPLE
 	db $f8 ; ROUTE_20
-	db $01 ; ROUTE_21
-	db $01 ; ROUTE_22
-	db $06 ; ROUTE_23
-	db $02 ; ROUTE_24
-	db $02 ; ROUTE_25
+	db $01 ; ROUTE_21; RED
+	db $01 ; ROUTE_22; RED
+	db $06 ; ROUTE_23; GREY
+	db $02 ; ROUTE_24; ORANGE
+	db $02 ; ROUTE_25; ORANGE
 	assert_table_length FIRST_INDOOR_MAP
 
 EAST_WEST   EQU 1
@@ -54,8 +54,8 @@ SplitMapSpriteSets:
 	db NORTH_SOUTH, 21, $03, $08 ; $f4
 	db EAST_WEST,    8, $0A, $08 ; $f5
 	db EAST_WEST,   24, $09, $05 ; $f6
-	db EAST_WEST,   34, $09, $0A ; $f7
-	db EAST_WEST,   53, $01, $0A ; $f8
+	db EAST_WEST,   26, $09, $0A ; $f7
+	db EAST_WEST,   61, $01, $0A ; $f8
 	db NORTH_SOUTH, 33, $02, $07 ; $f9
 	db NORTH_SOUTH,  2, $07, $04 ; $fa
 	db EAST_WEST,   17, $05, $07 ; $fb

data/moves/animations.asm

@@ -1150,8 +1150,12 @@ SplashAnim:;very done
 	db -1 ; end
 
 AcidArmorAnim:;done
-	battle_anim ACID_ARMOR, SE_SLIDE_MON_DOWN_AND_HIDE
-	battle_anim HARDEN, SE_SHOW_MON_PIC
+	battle_anim ACID_ARMOR, SE_SLIDE_MON_DOWN
+	battle_anim NO_MOVE, SE_DELAY_ANIMATION_10
+	battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE
+	battle_anim HARDEN, SUBANIM_33, 1, 4
+	battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE
+	battle_anim NO_MOVE, SE_SHOW_MON_PIC
 	db -1 ; end
 
 CrabHammerAnim:;done

data/pokemon/base_stats/moltres.asm

@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/moltres.pic", 0, 1 ; sprite dimensions
 	dw MoltresPicFront, MoltresPicBack
 
-	db EMBER, PECK, AGILITY, FLAMETHROWER ; level 1 learnset
+	db SMOKESCREEN, WING_ATTACK, AGILITY, TRI_ATTACK ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset

data/pokemon/base_stats/tangela.asm

@@ -16,8 +16,9 @@
 	; tm/hm learnset
 	tmhm SWORDS_DANCE, SLUDGE,       POISON_GAS,   BODY_SLAM,    TAKE_DOWN,    \
 	     DOUBLE_EDGE,  GROWTH,       HYPER_BEAM,   MEGA_DRAIN,   SOLARBEAM,    \
-	     TELEPORT,     MIMIC,        DOUBLE_TEAM,  REFLECT,      BIDE,         \
-	     REST,         CONSTRICT,    SUBSTITUTE,   CUT,          FLASH         
+	     THUNDERBOLT,  TELEPORT,     MIMIC,        DOUBLE_TEAM,  REFLECT,      \
+	     BIDE,         REST,         CONSTRICT,    SUBSTITUTE,   CUT,          \
+		 FLASH         
 	; end
 
 	db 0 ; padding

data/pokemon/base_stats/zapdos.asm

@@ -10,7 +10,7 @@
 	INCBIN "gfx/pokemon/front/zapdos.pic", 0, 1 ; sprite dimensions
 	dw ZapdosPicFront, ZapdosPicBack
 
-	db THUNDERSHOCK, PECK, AGILITY, THUNDERBOLT ; level 1 learnset
+	db SONICBOOM, WING_ATTACK, AGILITY, TRI_ATTACK ; level 1 learnset
 	db GROWTH_SLOW ; growth rate
 
 	; tm/hm learnset

data/trainers/parties.asm

@@ -97,7 +97,6 @@ BugCatcherData:
 	db 28, BUTTERFREE, BEEDRILL, BUTTERFREE, BEEDRILL, 0
 ; Route 9
 	db 23, BUTTERFREE, BEEDRILL, 0
-	db 24, VENONAT, KRABBY, PARAS, 0
 ; EXTRA FOR VICTORY ROAD 3F
 	db 55, BEEDRILL, BUTTERFREE, SCYTHER, KINGLER, VENOMOTH, PARASECT, 0
 
@@ -107,7 +106,7 @@ LassData:
 	db 11, RATTATA, NIDORAN_M, MAGIKARP, 0
 	db 14, JIGGLYPUFF, 0
 ; Route 4
-	db 40, PARASECT, PARASECT, PARASECT, PARASECT, 0
+	db 40, PARAS, PARAS, PARAS, PARASECT, 0
 ; Mt. Moon 1F
 	db 13, ODDISH, BELLSPROUT, 0
 	db 15, CLEFAIRY, 0
@@ -129,7 +128,7 @@ LassData:
 ; Celadon Gym
 	db 30, METAPOD, KAKUNA, BEEDRILL, 0
 ; Route 2 test
-	db 6, POLIWAG, ODDISH, 0	
+	db 6, ODDISH, POLIWAG, 0	
 
 SailorData:
 ; SS Anne Stern
@@ -157,7 +156,7 @@ JrTrainerMData:
 	db 30, CUBONE, CLEFAIRY, NIDORINO, 0
 ; Route 9
 	db 24, GROWLITHE, CHARMANDER, DROWZEE, 0
-	db 22, EKANS, SANDSHREW, DIGLETT, CUBONE, 0
+	db 23, EKANS, SANDSHREW, DIGLETT, KRABBY, 0
 
 JrTrainerFData:
 ; Cerulean Gym
@@ -168,7 +167,7 @@ JrTrainerFData:
 ; ROUTE 2
 	db 9, NIDORAN_F, VULPIX, MANKEY, 0
 ; Route 9
-	db 22, ODDISH, BELLSPROUT, BULBASAUR, 0
+	db 23, ODDISH, BELLSPROUT, BULBASAUR, 0
 	db 27, MEOWTH, 0
 ; Route 10
 	db 24, GOLDEEN, CLEFAIRY, POLIWAG, 0
@@ -180,9 +179,8 @@ JrTrainerFData:
 	db 29, CATERPIE, WEEDLE, SCYTHER, 0
 ; Route 13
 	db 40, DITTO, 0
-	db 36, DUGTRIO, SANDSLASH, PERSIAN, 0
+	db 36, EXEGGCUTE, WEEPINBELL, EXEGGUTOR, 0
 	db 37, DEWGONG, JYNX, 0
-	db 28, EXEGGCUTE, WEEPINBELL, EXEGGUTOR, 0
 ; Rock Tunnel 1F
 	db 25, WEEPINBELL, CLEFAIRY, 0
 	db 24, MEOWTH, GLOOM, PIDGEOTTO, 0
@@ -237,8 +235,8 @@ HikerData:
 	db 15, GEODUDE, DIGLETT, MACHOP, GEODUDE, 0
 	db 19, RHYHORN, 0
 ; Route 9
-	db 25, ONIX, 0
-	db 23, GEODUDE, MACHOP, RHYHORN, 0
+	db 27, DIGLETT, 0
+	db 20, GEODUDE, MACHOP, GEODUDE, ONIX, 0
 ; Route 10
 	db 26, MAGNEMITE, RHYHORN, 0
 	db 28, GRAVELER, 0
@@ -329,8 +327,6 @@ FisherData:
 	db 43, SEAKING, SLOWBRO, 0
 ; Route 12
 	db 34, VAPOREON, 0
-; EXTRA FOR SEAFOAM ONLY IF I MANAGE TO PUT MULTIPLE TRAINERS
-	db 40, DRAGONAIR, DEWGONG, STARMIE, LAPRAS, 0	
 
 SwimmerData:
 ; Cerulean Gym
@@ -444,7 +440,7 @@ TamerData:
 BirdKeeperData:
 ; Route 13
 	db 36, FARFETCHD, FEAROW, PIDGEOTTO, 0
-	db 35, PIDGEOTTO, CLEFAIRY, FEAROW, AERODACTYL, 0
+	db 35, DODUO, PIDGEOTTO, DODUO, AERODACTYL, 0
 	db 37, BUTTERFREE, DODRIO, 0
 ; Route 14
 	db 39, PIDGEOT, 0
@@ -621,6 +617,8 @@ CooltrainerMData:
 ; Viridian Gym
 	db 50, FEAROW, SANDSLASH, DUGTRIO, PARASECT, 0
 	db 51, PERSIAN, FARFETCHD, RHYDON, 0
+; Route 9 new
+	db 23, KADABRA, POLIWHIRL, DRATINI, 0
 
 CooltrainerFData:
 ; Celadon Gym
@@ -632,6 +630,8 @@ CooltrainerFData:
 	db 41, MR_MIME, SEADRA, VENOMOTH, VILEPLUME, 0
 ; Victory Road 1F
 	db 54, GOLEM, CLEFABLE, CLOYSTER, PERSIAN, 0
+; ROUTE 13 NEW
+	db 34, DUGTRIO, VENOMOTH, GRAVELER, TANGELA, DRAGONAIR, 0
 
 BrunoData:
 	db $FF, 62, OMASTAR, 63, KABUTOPS, 63, ONIX, 64, BLASTOISE, 64, AERODACTYL, 65, GOLEM, 0

data/trainers/special_moves.asm

@@ -8,7 +8,7 @@ SpecialTrainerMoves:
 	db 3, 4, PSYBEAM
 	db 0
 
-	db BUG_CATCHER, 15
+	db BUG_CATCHER, 14
 	db 6, 4, BODY_SLAM
 	db 0