diff --git a/data/tilesets/lavendercrypt_collision.asm b/data/tilesets/lavendercrypt_collision.asm index 73f39be..952bebe 100644 --- a/data/tilesets/lavendercrypt_collision.asm +++ b/data/tilesets/lavendercrypt_collision.asm @@ -17,7 +17,7 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 tilecoll WALL, WALL, DOOR, DOOR ; 11 tilecoll WALL, WALL, WALL, WALL ; 12 - tilecoll WALL, WALL, FLOOR, FLOOR ; 13 + tilecoll WALL, WALL, WALL, WALL ; 13 tilecoll WALL, WALL, WALL, FLOOR ; 14 tilecoll WALL, WALL, FLOOR, WALL ; 15 tilecoll FLOOR, PIT, FLOOR, PIT ; 16 diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 512e277..ba4beee 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -3974,13 +3974,13 @@ BlaineGroup: dw NINETALES dw HYPNOSIS, CONFUSE_RAY, FIRE_BLAST, DIG db 55 - db ARCANINE + dw ARCANINE dw FIRE_BLAST, ROAR, BODY_SLAM, EXTREMESPEED db 56 dw MAGCARGO ; I am giving it a chance!!! dw CURSE, BODY_SLAM, FLAMETHROWER, ROCK_SLIDE db 57 - dw MAGMAR ; MAGMORTAR + dw MAGMORTAR dw THUNDERPUNCH, FIRE_PUNCH, SUNNY_DAY, CONFUSE_RAY db 57 dw RAPIDASH diff --git a/gfx/trainers/blaine.png b/gfx/trainers/blaine.png index 6303a7c..f9bf76a 100644 Binary files a/gfx/trainers/blaine.png and b/gfx/trainers/blaine.png differ diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index 42760b9..a38ea29 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -213,7 +213,7 @@ TrainerTestScript: yesorno iffalse .end winlosstext TrainerTestScript_BeatenText, 0 - loadtrainer KAREN, KAREN1 + loadtrainer BLAINE, BLAINE1 startbattle reloadmapafterbattle .end diff --git a/maps/LavenderCrypt.asm b/maps/LavenderCrypt.asm index 490683b..b2351e3 100644 --- a/maps/LavenderCrypt.asm +++ b/maps/LavenderCrypt.asm @@ -34,7 +34,7 @@ ChannelerReimuAfterBattleText: done TrainerChannelerSanae: - trainer CHANNELER, SANAE, EVENT_BEAT_CHANNELER_SANAE, ChannelerSanaeSeenText, ChannelerReimuBeatenText, 0, .AfterScript + trainer CHANNELER, SANAE, EVENT_BEAT_CHANNELER_SANAE, ChannelerSanaeSeenText, ChannelerSanaeBeatenText, 0, .AfterScript .AfterScript: endifjustbattled @@ -50,11 +50,11 @@ ChannelerSanaeSeenText: done ChannelerSanaeBeatenText: - text "Grr…" + text "Weh!" done ChannelerSanaeAfterBattleText: - text "Tch! I wanted" + text "Aww! I wanted" line "to seal that" cont "beast myself!" done @@ -75,5 +75,5 @@ LavenderCrypt_MapEvents: def_bg_events def_object_events - object_event 6, 6, SPRITE_CHANNELER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerChannelerReimu, -1 - object_event 3, 6, SPRITE_CHANNELER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerChannelerSanae, -1 \ No newline at end of file + object_event 13, 11, SPRITE_CHANNELER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerChannelerReimu, -1 + object_event 4, 11, SPRITE_CHANNELER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerChannelerSanae, -1 diff --git a/maps/LavenderCryptSet1.asm b/maps/LavenderCryptSet1.asm index 79fcb40..1eba9d4 100644 --- a/maps/LavenderCryptSet1.asm +++ b/maps/LavenderCryptSet1.asm @@ -6,7 +6,7 @@ LavenderCryptSet1_MapScripts: def_callbacks TrainerChannelerGenmei: ; top left - trainer CHANNELER, GENMEI, EVENT_BEAT_CHANNELER_GENMEI, ChannelerGenmeiSeenText, ChannelerReimuBeatenText, 0, .AfterScript + trainer CHANNELER, GENMEI, EVENT_BEAT_CHANNELER_GENMEI, ChannelerGenmeiSeenText, ChannelerGenmeiBeatenText, 0, .AfterScript .AfterScript: endifjustbattled @@ -130,36 +130,32 @@ LavenderCryptSet1_MapEvents: def_warp_events warp_event 3, 6, LAVENDER_CRYPT, 2 ; Entrance - ; Within-Map Warps - warp_event 4, 3, LAVENDER_CRYPT_SET_1, 3 - warp_event 6, 13, LAVENDER_CRYPT_SET_1, 2 - warp_event 7, 4, LAVENDER_CRYPT_SET_1, 5 - warp_event 22, 4, LAVENDER_CRYPT_SET_1, 4 - warp_event 20, 2, LAVENDER_CRYPT_SET_1, 7 - warp_event 1, 5, LAVENDER_CRYPT_SET_1, 6 - warp_event 17, 4, LAVENDER_CRYPT_SET_1, 10 - warp_event 17, 5, LAVENDER_CRYPT_SET_1, 11 - warp_event 1, 12, LAVENDER_CRYPT_SET_1, 8 - warp_event 1, 13, LAVENDER_CRYPT_SET_1, 9 - warp_event 19, 6, LAVENDER_CRYPT_SET_1, 13 - warp_event 17, 14, LAVENDER_CRYPT_SET_1, 12 - warp_event 3, 14, LAVENDER_CRYPT_SET_1, 15 - warp_event 16, 1, LAVENDER_CRYPT_SET_1, 14 - warp_event 4, 17, LAVENDER_CRYPT_SET_1, 17 - warp_event 22, 16, LAVENDER_CRYPT_SET_1, 16 + ; Correct Path + warp_event 4, 3, LAVENDER_CRYPT_SET_2, 2 ; Right Route + warp_event 18, 2, LAVENDER_CRYPT_SET_2, 6 ; Middle Route + warp_event 19, 6, LAVENDER_CRYPT_SET_1, 5 ; Middle Route + warp_event 22, 14, LAVENDER_CRYPT_SET_1, 4 ; Middle Route + warp_event 16, 16, LAVENDER_CRYPT_SET_2, 7 ; Middle Route + warp_event 16, 17, LAVENDER_CRYPT_SET_2, 8 ; Middle Route + warp_event 8, 15, LAVENDER_CRYPT_SET_2, 10 ; Left Route + warp_event 4, 17, LAVENDER_CRYPT_SET_2, 11 ; Left Route + + ; Incorrect Path + warp_event 7, 4, LAVENDER_CRYPT_SET_3, 7 + warp_event 1, 3, LAVENDER_CRYPT_SET_2, 14 + warp_event 20, 2, LAVENDER_CRYPT_SET_2, 15 + warp_event 17, 4, LAVENDER_CRYPT_SET_3, 9 + warp_event 17, 5, LAVENDER_CRYPT_SET_3, 10 + warp_event 22, 6, LAVENDER_CRYPT_SET_2, 22 + warp_event 8, 1, LAVENDER_CRYPT_SET_2, 23 + warp_event 16, 12, LAVENDER_CRYPT_SET_3, 12 warp_event 20, 13, LAVENDER_CRYPT_SET_1, 19 - warp_event 8, 16, LAVENDER_CRYPT_SET_1, 18 - ;Outside of Map Warps - warp_event 8, 1, LAVENDER_CRYPT_SET_2, 15 - warp_event 5, 15, LAVENDER_CRYPT_SET_2, 16 - warp_event 5, 16, LAVENDER_CRYPT_SET_2, 17 - warp_event 19, 15, LAVENDER_CRYPT_SET_3, 7 - warp_event 21, 5, LAVENDER_CRYPT_SET_3, 8 - warp_event 21, 6, LAVENDER_CRYPT_SET_3, 9 - warp_event 18, 18, LAVENDER_CRYPT_SET_3, 18 - warp_event 16, 12, LAVENDER_CRYPT_SET_2, 26 - warp_event 16, 16, LAVENDER_CRYPT_SET_3, 19 - warp_event 16, 17, LAVENDER_CRYPT_SET_3, 20 + warp_event 1, 12, LAVENDER_CRYPT_SET_1, 18 + warp_event 3, 14, LAVENDER_CRYPT_SET_3, 13 + warp_event 1, 18, LAVENDER_CRYPT_SET_3, 14 + warp_event 22, 17, LAVENDER_CRYPT_SET_3, 18 + warp_event 22, 18, LAVENDER_CRYPT_SET_3, 19 + warp_event 8, 18, LAVENDER_CRYPT_SET_3, 20 def_coord_events diff --git a/maps/LavenderCryptSet2.asm b/maps/LavenderCryptSet2.asm index ccdcf8e..11d1d56 100644 --- a/maps/LavenderCryptSet2.asm +++ b/maps/LavenderCryptSet2.asm @@ -98,34 +98,37 @@ LavenderCryptSet2_MapEvents: def_warp_events warp_event 3, 2, LAVENDER_CRYPT, 3 ; Entrance - ; Within-Map Warps - warp_event 2, 9, LAVENDER_CRYPT_SET_2, 3 - warp_event 22, 5, LAVENDER_CRYPT_SET_2, 2 - warp_event 18, 3, LAVENDER_CRYPT_SET_2, 5 - warp_event 8, 6, LAVENDER_CRYPT_SET_2, 4 - warp_event 19, 5, LAVENDER_CRYPT_SET_2, 7 - warp_event 10, 16, LAVENDER_CRYPT_SET_2, 6 - warp_event 4, 17, LAVENDER_CRYPT_SET_2, 9 - warp_event 3, 9, LAVENDER_CRYPT_SET_2, 8 - warp_event 17, 17, LAVENDER_CRYPT_SET_2, 12 - warp_event 17, 18, LAVENDER_CRYPT_SET_2, 13 - warp_event 22, 9, LAVENDER_CRYPT_SET_2, 10 - warp_event 22, 10, LAVENDER_CRYPT_SET_2, 11 - ; Outside of Map Warps - warp_event 20, 16, LAVENDER_CRYPT, 5 ; Takes you back to the start. Tee hee. - warp_event 21, 1, LAVENDER_CRYPT_SET_1, 20 - warp_event 17, 9, LAVENDER_CRYPT_SET_1, 21 - warp_event 17, 10, LAVENDER_CRYPT_SET_1, 22 - warp_event 8, 10, LAVENDER_CRYPT_SET_3, 10 - warp_event 17, 2, LAVENDER_CRYPT_SET_3, 11 - warp_event 16, 4, LAVENDER_CRYPT_SET_3, 12 - warp_event 8, 16, LAVENDER_CRYPT_SET_3, 13 - warp_event 22, 18, LAVENDER_CRYPT_SET_3, 14 ; THIS pit is your target. - warp_event 20, 7, LAVENDER_CRYPT_SET_3, 15 - warp_event 12, 18, LAVENDER_CRYPT_SET_3, 16 - warp_event 1, 5, LAVENDER_CRYPT_SET_3, 17 - warp_event 14, 16, LAVENDER_CRYPT_SET_1, 27 + ; Correct Path + warp_event 22, 5, LAVENDER_CRYPT_SET_1, 2 ; Right Route + warp_event 21, 1, LAVENDER_CRYPT_SET_3, 3 ; Right Route + warp_event 18, 18, LAVENDER_CRYPT_SET_3, 4 ; Right Route + warp_event 22, 18, LAVENDER_CRYPT_SET_3, 5 ; END + warp_event 2, 9, LAVENDER_CRYPT_SET_1, 3 ; Middle Route + warp_event 14, 16, LAVENDER_CRYPT_SET_1, 6 ; Middle Route + warp_event 14, 17, LAVENDER_CRYPT_SET_1, 7 ; Middle Route + warp_event 10, 18, LAVENDER_CRYPT_SET_3, 6 ; Left Route + warp_event 4, 17, LAVENDER_CRYPT_SET_1, 8 ; Left Route + warp_event 20, 18, LAVENDER_CRYPT_SET_1, 9 ; Left Route + ; Incorrect Path + warp_event 20, 16, LAVENDER_CRYPT, 5 ; Takes you back to the start. Tee hee. + warp_event 6, 5, LAVENDER_CRYPT_SET_3, 8 + warp_event 8, 10, LAVENDER_CRYPT_SET_1, 11 + warp_event 22, 3, LAVENDER_CRYPT_SET_1, 12 + warp_event 17, 9, LAVENDER_CRYPT_SET_2, 18 + warp_event 17, 10, LAVENDER_CRYPT_SET_2, 19 + warp_event 1, 5, LAVENDER_CRYPT_SET_2, 16 + warp_event 1, 6, LAVENDER_CRYPT_SET_2, 17 + warp_event 18, 3, LAVENDER_CRYPT_SET_2, 21 + warp_event 1, 16, LAVENDER_CRYPT_SET_2, 20 + warp_event 16, 4, LAVENDER_CRYPT_SET_1, 14 + warp_event 19, 5, LAVENDER_CRYPT_SET_2, 16 + warp_event 17, 2, LAVENDER_CRYPT_SET_3, 11 + warp_event 8, 16, LAVENDER_CRYPT_SET_2, 26 + warp_event 22, 10, LAVENDER_CRYPT_SET_2, 25 + warp_event 2, 18, LAVENDER_CRYPT_SET_3, 15 + warp_event 17, 17, LAVENDER_CRYPT_SET_3, 21 + warp_event 17, 18, LAVENDER_CRYPT_SET_3, 22 def_coord_events diff --git a/maps/LavenderCryptSet3.asm b/maps/LavenderCryptSet3.asm index 36d74b1..69149a2 100644 --- a/maps/LavenderCryptSet3.asm +++ b/maps/LavenderCryptSet3.asm @@ -128,26 +128,29 @@ LavenderCryptSet3_MapEvents: def_warp_events warp_event 3, 8, LAVENDER_CRYPT, 4 ; Entrance warp_event 7, 13, LAVENDER_CRYPT_DOKUROARS_ROOM, 1 ; To Dokuroar - ; Within-Map Warps - warp_event 8, 4, LAVENDER_CRYPT_SET_3, 4 - warp_event 22, 3, LAVENDER_CRYPT_SET_3, 3 - warp_event 18, 2, LAVENDER_CRYPT_SET_3, 6 - warp_event 5, 2, LAVENDER_CRYPT_SET_3, 5 - ; Outside of Map Warps - warp_event 22, 6, LAVENDER_CRYPT_SET_1, 23 - warp_event 19, 14, LAVENDER_CRYPT_SET_1, 24 - warp_event 19, 15, LAVENDER_CRYPT_SET_1, 25 - warp_event 20, 18, LAVENDER_CRYPT_SET_2, 18 - warp_event 7, 6, LAVENDER_CRYPT_SET_2, 19 - warp_event 18, 7, LAVENDER_CRYPT_SET_2, 20 - warp_event 22, 11, LAVENDER_CRYPT_SET_2, 21 - warp_event 7, 16, LAVENDER_CRYPT_SET_2, 22 - warp_event 2, 4, LAVENDER_CRYPT_SET_2, 23 - warp_event 19, 10, LAVENDER_CRYPT_SET_2, 24 - warp_event 21, 14, LAVENDER_CRYPT_SET_2, 25 - warp_event 22, 16, LAVENDER_CRYPT_SET_1, 26 - warp_event 20, 6, LAVENDER_CRYPT_SET_1, 28 - warp_event 20, 7, LAVENDER_CRYPT_SET_1, 29 + ; Correct Path + warp_event 22, 3, LAVENDER_CRYPT_SET_2, 3 ; Right Route + warp_event 19, 10, LAVENDER_CRYPT_SET_2, 4 ; Right Route + warp_event 7, 17, LAVENDER_CRYPT_SET_2, 5 ; END + warp_event 8, 4, LAVENDER_CRYPT_SET_2, 9 ; Left Route + + ; Incorrect Path + warp_event 7, 6, LAVENDER_CRYPT_SET_1, 10 + warp_event 2, 4, LAVENDER_CRYPT_SET_2, 13 + warp_event 8, 7, LAVENDER_CRYPT_SET_1, 13 + warp_event 8, 8, LAVENDER_CRYPT_SET_1, 14 + warp_event 5, 2, LAVENDER_CRYPT_SET_2, 24 + warp_event 18, 7, LAVENDER_CRYPT_SET_1, 17 + warp_event 18, 16, LAVENDER_CRYPT_SET_1, 20 + warp_event 18, 2, LAVENDER_CRYPT_SET_1, 21 + warp_event 21, 14, LAVENDER_CRYPT_SET_2, 27 + warp_event 22, 6, LAVENDER_CRYPT_SET_3, 17 + warp_event 1, 8, LAVENDER_CRYPT_SET_3, 16 + warp_event 19, 14, LAVENDER_CRYPT_SET_1, 22 + warp_event 19, 15, LAVENDER_CRYPT_SET_1, 23 + warp_event 22, 16, LAVENDER_CRYPT_SET_1, 24 + warp_event 21, 11, LAVENDER_CRYPT_SET_2, 28 + warp_event 21, 12, LAVENDER_CRYPT_SET_2, 29 def_coord_events