From 1d0e601d983e5d5955f6359f81df0ceb7e802890 Mon Sep 17 00:00:00 2001 From: Misty Date: Sun, 31 Dec 2023 15:38:39 -0500 Subject: [PATCH 01/14] Brunswick Grotto Encounter Update --- data/wild/maps/BrunswickGrotto.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/wild/maps/BrunswickGrotto.asm b/data/wild/maps/BrunswickGrotto.asm index 92233d41..fd2de2a1 100644 --- a/data/wild/maps/BrunswickGrotto.asm +++ b/data/wild/maps/BrunswickGrotto.asm @@ -4,7 +4,7 @@ BrunswickGrottoWildMons: db 51, BEEDRILL db 52, BUTTERFREE db 52, CARAPTHOR - db 51, VENOMOTH + db 51, MINISTARE db 53, PARASECT db 53, PARASECT db 53, GORILLAIMO @@ -14,4 +14,4 @@ BrunswickGrottoWildMons: end_grass_wildmons def_water_wildmons 0 ; encounter rate - end_water_wildmons \ No newline at end of file + end_water_wildmons From 795a3e9adc9a623997ff38a7bcfd564654ef8e30 Mon Sep 17 00:00:00 2001 From: Misty Date: Sun, 31 Dec 2023 15:42:50 -0500 Subject: [PATCH 02/14] Garnet Cavern Encounter Update (1F) --- data/wild/maps/GarnetCavern1F.asm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/data/wild/maps/GarnetCavern1F.asm b/data/wild/maps/GarnetCavern1F.asm index 8cde7809..613851e6 100644 --- a/data/wild/maps/GarnetCavern1F.asm +++ b/data/wild/maps/GarnetCavern1F.asm @@ -1,14 +1,13 @@ -; Garnet Cavern will contain a mix of Rock, Ground, Steel, and Psychic-type Pokemon. GarnetCavern1FWildMons: def_grass_wildmons 10 ; encounter rate - db 52, RHYDON + db 52, MR_MIME db 52, GRAVELER - db 53, CROBAT + db 53, MAGNETON db 51, HYPNO - db 50, VENOMOTH + db 50, CROAKOZUNA db 55, SLOWBRO db 54, SLOWBRO - db 55, GUARDIA + db 55, HAUNTER db 54, GAVILLAIN db 55, GAVILLAIN end_grass_wildmons From 79fae412c1b7d3626004869560afd73f95adbb23 Mon Sep 17 00:00:00 2001 From: Misty Date: Sun, 31 Dec 2023 15:44:42 -0500 Subject: [PATCH 03/14] Garnet Cave Encounter Update (2F) --- data/wild/maps/GarnetCavern2F.asm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/data/wild/maps/GarnetCavern2F.asm b/data/wild/maps/GarnetCavern2F.asm index ef694f1b..45d23619 100644 --- a/data/wild/maps/GarnetCavern2F.asm +++ b/data/wild/maps/GarnetCavern2F.asm @@ -1,14 +1,13 @@ -; currently unfinished GarnetCavern2FWildMons: def_grass_wildmons 10 ; encounter rate - db 52, RHYDON + db 52, MR_MIME db 52, GRAVELER - db 53, CROBAT + db 53, MAGNETON db 51, HYPNO - db 50, VENOMOTH + db 50, CROAKOZUNA db 55, SLOWBRO db 54, SLOWBRO - db 55, GUARDIA + db 55, HAUNTER db 54, GAVILLAIN db 55, GAVILLAIN end_grass_wildmons From 84555faa599fc86b499dab6f2f5170d9f77a4f51 Mon Sep 17 00:00:00 2001 From: Misty Date: Sun, 31 Dec 2023 15:45:15 -0500 Subject: [PATCH 04/14] Garnet Cave Encounter Update (B1F) --- data/wild/maps/GarnetCavernB1F.asm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/data/wild/maps/GarnetCavernB1F.asm b/data/wild/maps/GarnetCavernB1F.asm index ae75d80a..991470b9 100644 --- a/data/wild/maps/GarnetCavernB1F.asm +++ b/data/wild/maps/GarnetCavernB1F.asm @@ -1,14 +1,13 @@ -; currently unfinished GarnetCavernB1FWildMons: def_grass_wildmons 5 ; encounter rate - db 52, RHYDON + db 52, MR_MIME db 52, GRAVELER - db 53, CROBAT + db 53, MAGNETON db 51, HYPNO - db 50, VENOMOTH + db 50, CROAKOZUNA db 55, SLOWBRO db 54, SLOWBRO - db 55, GUARDIA + db 55, HAUNTER db 54, GAVILLAIN db 55, GAVILLAIN end_grass_wildmons From 5dcd67b717c42168acd953d10f5fc1f2406a139a Mon Sep 17 00:00:00 2001 From: Misty Date: Sun, 31 Dec 2023 15:46:20 -0500 Subject: [PATCH 05/14] Celeste Hill Encounter Update --- data/wild/maps/CelesteHill.asm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data/wild/maps/CelesteHill.asm b/data/wild/maps/CelesteHill.asm index 05622838..112ce57c 100644 --- a/data/wild/maps/CelesteHill.asm +++ b/data/wild/maps/CelesteHill.asm @@ -1,15 +1,15 @@ -CelesteHillWildMons: ; unfinished +CelesteHillWildMons: def_grass_wildmons 10 ; encounter rate db 55, FARFETCHD - db 55, PIDGEOT + db 55, NIDORINO db 56, FARFETCHD - db 56, FEAROW - db 57, FEAROW + db 56, NIDORINA + db 57, NIDORINA db 57, LUXWAN - db 57, SIRFETCHD - db 57, DODRIO - db 56, GYARADOS - db 59, DRAGONITE + db 57, BUU + db 57, WIGGLYTUFF + db 56, BALUMBA + db 59, DRAGONAIR end_grass_wildmons def_water_wildmons 0 ; encounter rate From 8829d994e7a8ad2892b4b72ca109fe27b3196a55 Mon Sep 17 00:00:00 2001 From: Misty Date: Sun, 31 Dec 2023 15:47:37 -0500 Subject: [PATCH 06/14] Celeste Hill Cave Encounter Update --- data/wild/maps/CelesteHillCave.asm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/data/wild/maps/CelesteHillCave.asm b/data/wild/maps/CelesteHillCave.asm index b2165ee3..df6abbd0 100644 --- a/data/wild/maps/CelesteHillCave.asm +++ b/data/wild/maps/CelesteHillCave.asm @@ -1,18 +1,16 @@ -; Pretty generic cave, only it contains the Ground-type tradables. -; Vague reference to the iconic wild Steelix. CelesteHillCaveWildMons: def_grass_wildmons 10 ; encounter rate db 51, GRAVELER - db 52, MAROWAK + db 52, BUU db 52, GRAVELER - db 51, MAROWAK + db 51, BUU db 53, CROBAT - db 53, RHYDON + db 53, JYNX db 53, STEELIX - db 54, GOLEM - db 54, RHYPERIOR - db 55, RHYPERIOR + db 54, NIDOREIGN + db 54, CLEFABLE + db 55, CLEFABLE end_grass_wildmons def_water_wildmons 0 ; encounter rate - end_water_wildmons \ No newline at end of file + end_water_wildmons From 98c2b1b7e64dbcf72d90c595f2b4e174abe70222 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Mon, 1 Jan 2024 13:51:18 +0000 Subject: [PATCH 07/14] Update mewtwo01.asm --- crysaudio/music/RBY/mewtwo01.asm | 783 ++++++++++++++++++------------- 1 file changed, 456 insertions(+), 327 deletions(-) diff --git a/crysaudio/music/RBY/mewtwo01.asm b/crysaudio/music/RBY/mewtwo01.asm index 97e242d8..07f7d82e 100644 --- a/crysaudio/music/RBY/mewtwo01.asm +++ b/crysaudio/music/RBY/mewtwo01.asm @@ -1,5 +1,3 @@ -; Demake of Stadium Mewtwo's theme by LuciShrimp -; Features space-like sparkles, making use of the Game Boy's sound library. Music_Mewtwo01: channel_count 4 channel 1, Music_Mewtwo01_Ch1 @@ -174,365 +172,497 @@ Music_Mewtwo01_Ch1: octave 8 .mainLoop: duty_cycle 0 + volume_envelope 12, 8 octave 1 note A_, 1 note_type 6, 15, 8 + volume_envelope 12, 8 note A_, 1 note_type 12, 15, 8 + volume_envelope 12, 8 note A_, 1 note_type 6, 15, 8 + volume_envelope 12, 8 note A_, 1 note A_, 1 note_type 12, 15, 8 + volume_envelope 12, 8 note A_, 1 note_type 6, 15, 8 + volume_envelope 12, 8 note A_, 1 note_type 12, 15, 8 octave 2 + volume_envelope 12, 8 note E_, 1 octave 1 note_type 6, 15, 8 + volume_envelope 12, 8 note B_, 1 note_type 12, 15, 8 + volume_envelope 12, 8 note A_, 1 note_type 6, 15, 8 rest 1 note_type 12, 15, 8 + volume_envelope 12, 8 note A_, 1 note_type 6, 15, 8 + volume_envelope 12, 8 note A_, 1 note_type 12, 15, 8 + volume_envelope 12, 8 note A_, 1 note_type 6, 15, 8 + volume_envelope 12, 8 note A_, 1 note A_, 1 note_type 12, 15, 8 + volume_envelope 12, 8 note A_, 1 note_type 6, 15, 8 + volume_envelope 12, 8 note A_, 1 note_type 12, 15, 8 octave 2 - note E_, 1 - note_type 6, 15, 8 - note A_, 1 - note G_, 1 - note F_, 1 - note E_, 1 - note_type 12, 15, 8 - note F_, 1 - note_type 6, 15, 8 - note F_, 1 - note_type 12, 15, 8 - note F_, 1 - note_type 6, 15, 8 - note F_, 1 - note F_, 1 - note_type 12, 15, 8 - note F_, 1 - note_type 6, 15, 8 - octave 1 - note F_, 1 - note F_, 1 - note F_, 1 - octave 2 - note C_, 1 - note_type 12, 15, 8 - note C_, 1 - note_type 6, 15, 8 - note C_, 1 - note_type 12, 15, 8 - note F_, 1 - note_type 6, 15, 8 - note F_, 1 - note_type 12, 15, 8 - note F_, 1 - note_type 6, 15, 8 - note F_, 1 - note F_, 1 - note_type 12, 15, 8 - note F_, 1 - octave 1 - note_type 6, 15, 8 - note F_, 1 - note F_, 1 - octave 2 - note C_, 1 - note F_, 1 - note E_, 1 - note D_, 1 - note C_, 1 - note_type 12, 15, 8 - octave 1 - note A#, 1 - note_type 6, 15, 8 - note A#, 1 - note_type 12, 15, 8 - note A#, 1 - note_type 6, 15, 8 - note A#, 1 - note A#, 1 - note_type 12, 15, 8 - note A#, 1 - note_type 6, 15, 8 - note A#, 1 - note A_, 1 - note A#, 1 - octave 2 - note D_, 1 - note_type 12, 15, 8 - note C_, 1 - note_type 6, 15, 8 - octave 1 - note G_, 1 - note_type 12, 15, 8 - note A#, 1 - note_type 6, 15, 8 - note A#, 1 - note_type 12, 15, 8 - note A#, 1 - note_type 6, 15, 8 - note A#, 1 - note A#, 1 - note_type 12, 15, 8 - note A#, 1 - note_type 6, 15, 8 - note A#, 1 - note A_, 1 - note A#, 1 - octave 2 - note D_, 1 - note C_, 1 - octave 1 - note A#, 1 - note G_, 1 - note_type 12, 15, 8 - note A_, 1 - note_type 6, 15, 8 - note A_, 1 - note_type 12, 15, 8 - note A_, 1 - note_type 6, 15, 8 - note A_, 1 - note A_, 1 - note_type 12, 15, 8 - note A_, 1 - note_type 6, 15, 8 - note A_, 1 - note_type 12, 15, 8 - octave 2 - note E_, 1 - note_type 6, 15, 8 - octave 1 - note A_, 1 - note_type 12, 15, 8 - note E_, 1 - note_type 6, 15, 8 - note G_, 1 - note_type 12, 15, 8 - note A_, 1 - note_type 6, 15, 8 - note A_, 1 - note_type 12, 15, 8 - note A_, 1 - note_type 6, 15, 8 - note A_, 1 - note A_, 1 - note_type 12, 15, 8 - note A_, 1 - note_type 6, 15, 8 - note A_, 1 - note_type 12, 15, 8 - octave 2 - note E_, 1 - octave 1 - note_type 6, 15, 8 - note A_, 1 - note_type 12, 15, 8 - note E_, 1 - note_type 6, 15, 8 - note G_, 1 - note_type 12, 15, 8 - note F_, 1 - note_type 6, 15, 8 - note F_, 1 - note_type 12, 15, 8 - note F_, 1 - note_type 6, 15, 8 - note F_, 1 - note F_, 1 - note_type 12, 15, 8 - note F_, 1 - note_type 6, 15, 8 - note F_, 1 - note F_, 1 - note F_, 1 - octave 2 - note C_, 1 - note_type 12, 15, 8 - note C_, 1 - note_type 6, 15, 8 - note C_, 1 - note_type 12, 15, 8 - octave 1 - note F_, 1 - note_type 6, 15, 8 - note F_, 1 - note_type 12, 15, 8 - note F_, 1 - note_type 6, 15, 8 - note F_, 1 - note F_, 1 - note_type 12, 15, 8 - note F_, 1 - octave 2 - note_type 6, 15, 8 - note C_, 1 - octave 1 - note A_, 1 - octave 2 - note C_, 1 - note F_, 1 - note E_, 1 - note D_, 1 - note C_, 1 - note_type 12, 15, 8 - octave 1 - note A#, 1 - note_type 6, 15, 8 - note A#, 1 - note_type 12, 15, 8 - note A#, 1 - note_type 6, 15, 8 - note A#, 1 - note A#, 1 - note_type 12, 15, 8 - note A#, 1 - note_type 6, 15, 8 - note A#, 1 - note A#, 1 - note A#, 1 - octave 2 - note F_, 1 - octave 1 - note_type 12, 15, 8 - note A#, 1 - note_type 6, 15, 8 - note A_, 1 - note_type 12, 15, 8 - note A#, 1 - note_type 6, 15, 8 - note A#, 1 - note_type 12, 15, 8 - note A#, 1 - note_type 6, 15, 8 - note A#, 1 - note A#, 1 - note_type 12, 15, 8 - note A#, 1 - note_type 6, 15, 8 - note A#, 1 - note A#, 1 - note A#, 1 - octave 2 - note D_, 1 - note C_, 1 - octave 1 - note A#, 1 - note G_, 1 - note_type 12, 15, 8 - note A_, 1 - note_type 6, 15, 8 - note A_, 1 - note_type 12, 15, 8 - note A_, 1 - note_type 6, 15, 8 - note A_, 1 - note A_, 1 - note_type 12, 15, 8 - note A_, 1 - note_type 6, 15, 8 - note A_, 1 - note_type 12, 15, 8 - octave 2 - note E_, 1 - note_type 6, 15, 8 - octave 1 - note A_, 1 - note_type 12, 15, 8 - note G_, 1 - note_type 6, 15, 8 - note E_, 1 - note_type 12, 15, 8 - note A_, 1 - note_type 6, 15, 8 - note A_, 1 - note_type 12, 15, 8 - note A_, 1 - note_type 6, 15, 8 - note A_, 1 - note A_, 1 - note_type 12, 15, 8 - note A_, 1 - note_type 6, 15, 8 - note A_, 1 - note_type 12, 15, 8 - octave 2 - note E_, 1 - octave 1 - note_type 6, 15, 8 - note A_, 1 - note_type 12, 15, 8 - note G_, 1 - note_type 6, 15, 8 - note E_, 1 - note_type 12, 15, 8 - note A_, 1 - note_type 6, 15, 8 - note A_, 1 - note_type 12, 15, 8 - note A_, 1 - note_type 6, 15, 8 - note A_, 1 - note A_, 1 - note_type 12, 15, 8 - note A_, 1 - note_type 6, 15, 8 - note A_, 1 - note_type 12, 15, 8 - octave 2 - note E_, 1 - note_type 6, 15, 8 - octave 1 - note A_, 1 - note_type 12, 15, 8 - note G_, 1 - note_type 6, 15, 8 - note F_, 1 - note_type 12, 15, 8 - note A_, 1 - note_type 6, 15, 8 - note A_, 1 - note_type 12, 15, 8 - note A_, 1 - note_type 6, 15, 8 - note A_, 1 - note_type 12, 15, 8 - note A_, 1 - note_type 6, 15, 8 - note A#, 1 - note A#, 1 - note_type 12, 15, 8 - note A#, 1 - note_type 6, 15, 8 - note A#, 1 - note_type 12, 15, 8 - note A#, 1 - note_type 6, 15, 8 - note A#, 1 - note_type 12, 15, 8 - duty_cycle 1 volume_envelope 12, 8 note E_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note G_, 1 + note F_, 1 + note E_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note F_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note F_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note F_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note F_, 1 + note F_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note F_, 1 + note_type 6, 15, 8 + octave 1 + volume_envelope 12, 8 + note F_, 1 + note F_, 1 + note F_, 1 + octave 2 + note C_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note C_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note C_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note F_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note F_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note F_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note F_, 1 + note F_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note F_, 1 + octave 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note F_, 1 + note F_, 1 + octave 2 + note C_, 1 + note F_, 1 + note E_, 1 + note D_, 1 + note C_, 1 + note_type 12, 15, 8 + octave 1 + volume_envelope 12, 8 + note A#, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note A#, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note A_, 1 + note A#, 1 + octave 2 + note D_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note C_, 1 + note_type 6, 15, 8 + octave 1 + volume_envelope 12, 8 + note G_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note A#, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note A_, 1 + note A#, 1 + octave 2 + note D_, 1 + note C_, 1 + octave 1 + note A#, 1 + note G_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note A_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 12, 15, 8 + octave 2 + volume_envelope 12, 8 + note E_, 1 + note_type 6, 15, 8 + octave 1 + volume_envelope 12, 8 + note A_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note E_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note G_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note A_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 12, 15, 8 + octave 2 + volume_envelope 12, 8 + note E_, 1 + octave 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note E_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note G_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note F_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note F_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note F_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note F_, 1 + note F_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note F_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note F_, 1 + note F_, 1 + note F_, 1 + octave 2 + note C_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note C_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note C_, 1 + note_type 12, 15, 8 + octave 1 + volume_envelope 12, 8 + note F_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note F_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note F_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note F_, 1 + note F_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note F_, 1 + octave 2 + note_type 6, 15, 8 + volume_envelope 12, 8 + note C_, 1 + octave 1 + note A_, 1 + octave 2 + note C_, 1 + note F_, 1 + note E_, 1 + note D_, 1 + note C_, 1 + note_type 12, 15, 8 + octave 1 + volume_envelope 12, 8 + note A#, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note A#, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note A#, 1 + note A#, 1 + octave 2 + note F_, 1 + octave 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note A#, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note A#, 1 + note A#, 1 + octave 2 + note D_, 1 + note C_, 1 + octave 1 + note A#, 1 + note G_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note A_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 12, 15, 8 + octave 2 + volume_envelope 12, 8 + note E_, 1 + note_type 6, 15, 8 + octave 1 + volume_envelope 12, 8 + note A_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note G_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note E_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note A_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 12, 15, 8 + octave 2 + volume_envelope 12, 8 + note E_, 1 + octave 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note G_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note E_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note A_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 12, 15, 8 + octave 2 + volume_envelope 12, 8 + note E_, 1 + note_type 6, 15, 8 + octave 1 + volume_envelope 12, 8 + note A_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note G_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note F_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A_, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note A#, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note_type 12, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note_type 6, 15, 8 + volume_envelope 12, 8 + note A#, 1 + note_type 12, 15, 8 + volume_envelope 9, 8 + note E_, 1 note A_, 1 note G_, 1 note E_, 1 @@ -739,10 +869,10 @@ Music_Mewtwo01_Ch1: note F_, 1 note A_, 1 note A#, 1 - duty_cycle 2 octave 2 note C_, 1 duty_cycle 3 + volume_envelope 12, 8 note D_, 1 note_type 6, 12, 8 note D_, 1 @@ -1542,7 +1672,7 @@ Music_Mewtwo01_Ch2: rest 1 volume_envelope 15, 7 octave 3 - vibrato 0, 1, 1 + vibrato 0, 1, 5 note A#, 1 rest 1 note A#, 1 @@ -1739,7 +1869,7 @@ Music_Mewtwo01_Ch2: octave 8 .mainLoop: octave 3 - vibrato 0, 2, 2 + vibrato 0, 1, 4 note B_, 10 note A_, 2 octave 4 @@ -1927,7 +2057,6 @@ Music_Mewtwo01_Ch2: rest 2 volume_envelope 12, 7 note G_, 3 - vibrato 0, 2, 3 duty_cycle 3 note D_, 7 note G_, 2 @@ -2542,9 +2671,8 @@ Music_Mewtwo01_Ch3: note D#, 1 octave 3 note A#, 1 - note D#, 1 - rest 1 note_type 12, 3, 4 + note D#, 1 note E_, 1 note A_, 1 note G_, 1 @@ -3192,6 +3320,7 @@ Music_Mewtwo01_Ch3: note_type 12, 1, 2 volume_envelope 2, 4 octave 5 + vibrato 0, 1, 5 note A_, 16 note A_, 14 note_type 4, 1, 4 From 884045d1e08a75075ba31d98dbc7527e6c576a3b Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Mon, 1 Jan 2024 13:52:51 +0000 Subject: [PATCH 08/14] Update CeladonMansionRoofHouse.asm oops, slight text error --- text/CeladonMansionRoofHouse.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/text/CeladonMansionRoofHouse.asm b/text/CeladonMansionRoofHouse.asm index 31d4a561..305ff589 100644 --- a/text/CeladonMansionRoofHouse.asm +++ b/text/CeladonMansionRoofHouse.asm @@ -63,7 +63,7 @@ _JackyAfterBattle:: done _JackyGift:: - line "I look forward to" + text "I look forward to" line "our next bout!" done From 2f6be78ac18aa20d78b4b26cf9e068002cf79924 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Mon, 1 Jan 2024 14:34:34 +0000 Subject: [PATCH 09/14] Update lickilicky.png and sylveonb.png These two were causing build errors for some people so I reduced the colour depth of both images so that hopefully doesn't happen again --- gfx/pokemon/back/sylveonb.png | Bin 649 -> 641 bytes gfx/pokemon/front/lickilicky.png | Bin 963 -> 916 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gfx/pokemon/back/sylveonb.png b/gfx/pokemon/back/sylveonb.png index 4d7dc48d6eb94b32927503625296b1671c5acbb8..974decb817e3c695d0131c37c7c1d848b9428b9f 100644 GIT binary patch delta 399 zcmeBVZDgGw!O6q`1TqV4J0~idvN9XD6m?9Dmg9QC$jGP2cWGHh$;4(ADHB}-Lm&z< zG_f)^wlXx)HZZU|{~Wy+K$A5}Tq8G}13%#H$VA0~b+kZQ~fE7B-B*|lpKCsWG&1wtQ| zFgYK!b(%fzg<(f^NA~5E;h3I#pasF#S<#iDxWWSZWC7cM4((W+QG&8YFn}Ej@92^PkukE zwwwFlbiQca8?T=%P!jzUa%-If*F4W|VU1^hq)Mum{n)yTap}@WDw{QW5@dNCXO>Sj zdC8oylcne{XVmWl4r~jw+AHsWap*mAzBcuJ#*Fp1r`pv0jQ_)A#&&RH&JM$KprH43 L^>bP0l+XkKA#$9) delta 407 zcmZob#T8`^Er?41@+@g?TjH?_DV zF}Hxh$iN6y56r~w2%Ch-YK)onPd!~6Lo7~jy&TDRSb>KnAiVgPVEL0tSJ-aPPzm~c z*<{WXI=B~J(AJ0*4VdjBCepGaS2*@F?}LeJ7%wj4I>lOGHmhNY$FpCq($%Rf z28pc|d~e!4-lcR|-f#HbcYI>~9*5rz>>D~uAK9Kr|F)yiw>@XWJf=lQs(RO4-N6!d zfz{CFT9aUvIG4$0f0+-3>m8z1iXTUuJ18`B_J+@$d#+e~wq%Zcr{;C)rhd}o_wjq{ aoAm#zXG%;w_i_^`3Orr?T-G@yGywqA_?~0{ diff --git a/gfx/pokemon/front/lickilicky.png b/gfx/pokemon/front/lickilicky.png index 5599c345c01a1ffedc11c146226eaa5c9861c891..a92abd12c66f513cc6accdfc638df1824d5f6451 100644 GIT binary patch delta 678 zcmX@iK81aP1Sb;%5FC%KNuH=^%F1lqQq(aqT8`@lBO{-*@%r>%G83Csq)c=T41p-b z(8S8f+{)BY+rYrez(7Im#O8?y#r?3$238mF15MT_ag8WRNi0dVD#^@EEiOsSEnqM* zFv6~fEidrGWHrW&dd3f)E{-7@=R+^;&A;p*!tfz`)s~=X92cc`E$&KdkkyhgOc=-P_-C(p-lOv8PTo27=L=KXvaBB; zP^dd`W2WM_V88wk!mp-mT=izLmu1*ohKoCswsh`TX)G5a+9p~3km+6Oode6hZR$0- z*WUBkS$E;oqJn$O=G}I6pH6Ap?TX5(vZ;>a_;V}co{`VlM+D;u+P{SMxq`KQCuqq8&qL2b>3U2TjGy%ML}e|PL&u_XH08b7WT*E5%9ZA_fp zvqAoLYxMMx)|BXpALi;QmK|)}^z^dpt?TV-$2<9!UsSECiK|KW^1SkCub7C>;(u1} z*46*WU2(Wn?{1OKw*94zC$wivANx~#lWoESgV)>j^;8<%-IL;0*WP7pSmv|iNuVG@ zSB#ZX{pSh1(PduK(!?6qX&Sd!7Cb*tJb770gmCJrnQPl5Z=ajLXnM&9l{FuG7c@uQ vi+*&?t<^isGUL(x-Y<5aYX$$Dw_o~RdGjw8kt7BNE(QiqS3j3^P6if{GRTo#u#pyS@yIQNu?&P>sXkKJ3q@Cj6XE=hSJ2U8lWn zJ(HB19O$$5NS~~;(Dn&2>nE|4cWS;2dQdM{!JzoaeFocaSC8#ic+vvo?j{92(@bAb zcG}$h6xW=R7NISvzbDjOOgy$rEWm2z%SpT)cN|u6E-eUQFuk)O&tl7-We$-RN4-N- zpOv0%4NRL*UDI>BK;gMybc4)Z|Ggg?(kE!7XFSTh`ccYvftj;w|B28|`I9-1$W(pV zk>OKZf75l(cZ;UnBL+u)wjbZ6R`q#~l*JR7-V)0R#~lJ!-i>9u>@+zruBb|Lz5CB~ z53P=!S~}V6w}6%j-(rKp8_g|NY|2Y#d7jQ<@aKQ@YR1l1;}Qd%CoASuJ^c8>XM6LO ziEJmY>ddRCufD;cSQW=-^z*^V-RsZyKmWd3ZNsmAxi&^iu~%OnURQ~jwxGr!OUOQz u>FhJME4O6t#id%M38(VTlUe=t!zXb^wdQKCW0$vp60oPMpUXO@geCyJYdYHi From 60beb4fb975c4f8de15414fbe227f362eed48c92 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Mon, 1 Jan 2024 20:44:50 +0000 Subject: [PATCH 10/14] we're so back it's no longer jojover jojobear you legend thank you for figuring this out --- main.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.asm b/main.asm index cfa53daa..005c056e 100644 --- a/main.asm +++ b/main.asm @@ -64,16 +64,16 @@ INCLUDE "engine/math/bcd.asm" INCLUDE "engine/movie/oak_speech/init_player_data.asm" INCLUDE "engine/items/get_bag_item_quantity.asm" INCLUDE "engine/overworld/pathfinding.asm" -INCLUDE "engine/gfx/hp_bar.asm" INCLUDE "engine/events/hidden_objects/bookshelves.asm" INCLUDE "engine/events/hidden_objects/indigo_plateau_statues.asm" INCLUDE "engine/events/hidden_objects/book_or_sculpture.asm" INCLUDE "engine/events/hidden_objects/elevator.asm" INCLUDE "engine/events/hidden_objects/town_map.asm" INCLUDE "engine/events/hidden_objects/pokemon_stuff.asm" +INCLUDE "engine/overworld/wild_mons.asm" SECTION "bank3 Spillover", ROMX -INCLUDE "engine/overworld/wild_mons.asm" +INCLUDE "engine/gfx/hp_bar.asm" SECTION "Font Graphics", ROMX From 443277ffc8c51c7210509044e65ef58eb31adb94 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Mon, 1 Jan 2024 21:15:44 +0000 Subject: [PATCH 11/14] WE ARE SO BACK!!!!! --- README.md | 4 +--- scripts/FightingDojo.asm | 7 +++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6f8073e9..9900105e 100644 --- a/README.md +++ b/README.md @@ -259,12 +259,10 @@ and more! Known Bugs ==== -- If you defeat the Elite Four before the Fighing Dojo Karate Master, the Hitmon gift is permanently locked off. -- Occasionally, menu text sets itself to scroll. (hasn't happened for a while, either uncommon or fixed) +- Oak gives you the Citrine Pass even if you lost, after the screen fades to white. - The Tradeback Tutor doesn't work properly with Rhydon for reasons likely related to its index number of 1. - Fake Tears and Nasty Plot don't quite look right when done from the opponent's side. - The Gym Leaders on Floor 6 of Silph Gauntlet don't play the correct music in battle. -- Silph Co. Worker doesn't give Lapras as a gift on occasion (this happened like one time, more testing needed) Evolution Methods for new Pokemon ==== diff --git a/scripts/FightingDojo.asm b/scripts/FightingDojo.asm index 44cf5aef..b0b6e6b5 100644 --- a/scripts/FightingDojo.asm +++ b/scripts/FightingDojo.asm @@ -21,10 +21,6 @@ FightingDojo_ScriptPointers: dw FightingDojoScript3 FightingDojoScript1: - CheckEvent EVENT_POST_GAME_ATTAINED ; Required in the case you have cleared the game, but not cleared the dojo. It's an optional deal. - ret nz - CheckEvent EVENT_DEFEATED_FIGHTING_DOJO - ret nz call CheckFightingMapTrainers ld a, [wTrainerHeaderFlagBit] and a @@ -109,11 +105,14 @@ FightingDojoText1: ; gym scaling can be removed to make space text_asm CheckEvent EVENT_POST_GAME_ATTAINED ; No need to view previous stuff, technically you can skip Bide this way but I think that's hilarious jp z, .normalProcessing + CheckEvent EVENT_DEFEATED_FIGHTING_DOJO + jp z, .normalProcessing ld hl, KoichiRematchPreBattleText ; Rematch functionality. Just loads pre-battle text and his trainer. call PrintText ld c, BANK(Music_MeetMaleTrainer) ld a, MUSIC_MEET_MALE_TRAINER call PlayMusic + ld hl, wd72d set 6, [hl] set 7, [hl] ldh a, [hSpriteIndex] From fe651a76682785ad0117075051d9dd0368c50290 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Tue, 2 Jan 2024 11:17:58 +0000 Subject: [PATCH 12/14] jojobear, our saviour took out 4 bugs in one go, absolute legend --- README.md | 3 -- audio/play_battle_music.asm | 60 ++++++++++++++++++----------- data/maps/objects/RedsHouse2F.asm | 11 +----- engine/debug/debug_menu.asm | 18 ++++----- engine/debug/debug_party.asm | 29 +++----------- engine/pokemon/evos_moves.asm | 9 ++--- scripts/CeladonMansionRoofHouse.asm | 23 ++++++++++- scripts/Route1.asm | 9 +++++ 8 files changed, 88 insertions(+), 74 deletions(-) diff --git a/README.md b/README.md index 9900105e..a9f3f5fa 100644 --- a/README.md +++ b/README.md @@ -259,10 +259,7 @@ and more! Known Bugs ==== -- Oak gives you the Citrine Pass even if you lost, after the screen fades to white. -- The Tradeback Tutor doesn't work properly with Rhydon for reasons likely related to its index number of 1. - Fake Tears and Nasty Plot don't quite look right when done from the opponent's side. -- The Gym Leaders on Floor 6 of Silph Gauntlet don't play the correct music in battle. Evolution Methods for new Pokemon ==== diff --git a/audio/play_battle_music.asm b/audio/play_battle_music.asm index d0500f6f..cbe0526a 100644 --- a/audio/play_battle_music.asm +++ b/audio/play_battle_music.asm @@ -11,57 +11,71 @@ PlayBattleMusic:: and a jr z, .notGymLeaderBattle ld a, MUSIC_GYM_LEADER_BATTLE - jr .playSong + jp .playSong .notGymLeaderBattle ld a, [wCurOpponent] ; This can probably be made better with a list thing but uhhh idk how to do it. seethe. cp MEWTWO ; Needs to be before OPP_ID_OFFSET to skip the wild check. - jr z, .mewtwoBattle + jp z, .mewtwoBattle cp ARTICUNO - jr z, .legendaryBattle + jp z, .legendaryBattle cp ZAPDOS - jr z, .legendaryBattle + jp z, .legendaryBattle cp MOLTRES - jr z, .legendaryBattle + jp z, .legendaryBattle cp MEW - jr z, .legendaryBattle + jp z, .legendaryBattle cp OMEGADGE - jr z, .legendaryBattle + jp z, .legendaryBattle cp SNORLAX ; Just like LGPE. Snorlax is basically a legendary in RBY, so I love this. - jr z, .legendaryBattle + jp z, .legendaryBattle cp DRATINI ; In the Tajiri lore, the Dratini family is considered legendary. Also, we have a static Dragonite. I think the appearance of Dratini in the Safari Zone with this theme could also add some reeeeeal nice hype to the whole ordeal. - jr z, .legendaryBattle + jp z, .legendaryBattle cp DRAGONAIR - jr z, .legendaryBattle + jp z, .legendaryBattle cp DRAGONITE - jr z, .legendaryBattle + jp z, .legendaryBattle cp ARTICUNO_G - jr z, .legendaryBattle + jp z, .legendaryBattle cp ZAPDOS_G - jr z, .legendaryBattle + jp z, .legendaryBattle cp MOLTRES_G - jr z, .legendaryBattle + jp z, .legendaryBattle cp OPP_ID_OFFSET - jr c, .wildBattle + jp c, .wildBattle cp OPP_YUJIROU - jr z, .Elite4Battle + jp z, .GymOrElite4Battle cp OPP_KOICHI - jr z, .Elite4Battle + jp z, .GymOrElite4Battle + cp OPP_BROCK ; there's probably a much better way of doing this, but this allows the Gym leader rematches in SIlph to play the Gym Battle music + jp z, .GymOrElite4Battle + cp OPP_MISTY + jp z, .GymOrElite4Battle + cp OPP_LT_SURGE + jp z, .GymOrElite4Battle + cp OPP_ERIKA + jp z, .GymOrElite4Battle + cp OPP_KOGA + jp z, .GymOrElite4Battle + cp OPP_SABRINA + jp z, .GymOrElite4Battle + cp OPP_BLAINE + jp z, .GymOrElite4Battle cp OPP_LORELEI ; elite four now play the gym leader battle theme - jr z, .Elite4Battle + jr z, .GymOrElite4Battle cp OPP_BRUNO - jr z, .Elite4Battle + jr z, .GymOrElite4Battle cp OPP_AGATHA - jr z, .Elite4Battle + jr z, .GymOrElite4Battle cp OPP_LANCE - jr z, .Elite4Battle + jr z, .GymOrElite4Battle cp OPP_PROF_OAK ; could also use the final battle theme, but I think the gym leader/elite 4 theme fits better instead. I'm happy to change this if it isn't well-liked. - jr z, .Elite4Battle + jr z, .GymOrElite4Battle cp OPP_RIVAL3 jr z, .finalBattle cp OPP_CHIEF jr z, .finalBattle jr nz, .normalTrainerBattle -.Elite4Battle +.GymOrElite4Battle ld a, MUSIC_GYM_LEADER_BATTLE jr .playSong .normalTrainerBattle diff --git a/data/maps/objects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm index e891303c..8863d16b 100644 --- a/data/maps/objects/RedsHouse2F.asm +++ b/data/maps/objects/RedsHouse2F.asm @@ -5,16 +5,9 @@ RedsHouse2F_Object: warp_event 7, 1, REDS_HOUSE_1F, 3 ;warp_event 5, 1, SILPH_GAUNTLET_7F, 1 ; - Test Chief ;warp_event 5, 1, SILPH_CO_1F, 1 ; - Go through Gauntlet - ;warp_event 5, 1, SILPH_CO_11F, 2 ; - Test J&J, Omega, & Giovanni. To test the Omega refight, change to SHOW in hide/show data, and set warp ID to 1. - ;warp_event 5, 1, ROCKET_HIDEOUT_B4F, 2 ; - Test Giovanni 1 ;warp_event 5, 1, MT_MOON_SQUARE, 1 ; - Test Shop, NPCs, and Crater - ;warp_event 5, 1, CELESTE_HILL, 1 ; - Test GMolt - ;warp_event 5, 1, HALL_OF_FAME, 1 ; Test post-game setup - ;warp_event 5, 1, GARNET_CAVERN_B1F, 1 ; Test GCuno - ;warp_event 5, 1, FARAWAY_ISLAND_INSIDE, 1 ; Test Mew - ;warp_event 5, 1, GIOVANNIS_ROOM, 1 ; Test spinner tiles - ;warp_event 5, 1, CINNABAR_LAB_FOSSIL_ROOM, 1 ; Test new tileset and fossils - warp_event 5, 1, CERULEAN_CAVE_B1F, 1 ; Test Mewtwo theme + warp_event 5, 1, HALL_OF_FAME, 1 ; Test post-game setup + ;warp_event 5, 1, CERULEAN_CAVE_B1F, 1 ; Test Mewtwo theme def_bg_events diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm index e7f71967..a5c1f9a2 100644 --- a/engine/debug/debug_menu.asm +++ b/engine/debug/debug_menu.asm @@ -108,9 +108,9 @@ TestBattle: ld [hl], a ; Player's Pokemon. - ld a, GLACEON + ld a, GENGAR ld [wcf91], a - ld a, 16 + ld a, 50 ld [wCurEnemyLVL], a xor a ld [wMonDataLocation], a @@ -120,19 +120,19 @@ TestBattle: ; This function gives you a way to waste a turn, never know when you'll need it. ; Alternatively, add a move to test. ld hl, wPartyMon1Moves - ld a, UPPERCUT ; Something super weak + ld a, UPPERCUT ; New move animation test ld [hli], a - ld a, POWDER_SNOW ; Test new failure text + ld a, POWDER_SNOW ; New move animation test ld [hli], a - ld a, LOW_KICK ; Something that'll miss easily + ld a, FAKE_TEARS ; New move animation test ld [hli], a - ld a, LEER ; Skip turn + ld a, NASTY_PLOT ; Skip turn, New move animation test ld [hli], a ; Opponent's Pokemon. - ld a, BUU ; Test new theme + ld a, NIDORINO ld [wCurOpponent], a - ld a, 10 ; Set the level you want here. + ld a, 50 ; Set the level you want here. ld [wCurEnemyLVL], a predef InitOpponent @@ -145,7 +145,7 @@ TestBattle: jr .loop BattleDebugItemsList: - db X_ACCURACY, 99 ; Test Guillotine animation + db X_ACCURACY, 99 db FULL_RESTORE, 99 db MAX_ELIXER, 99 db FULL_HEAL, 99 diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm index a9a78e64..d0c5b30d 100644 --- a/engine/debug/debug_party.asm +++ b/engine/debug/debug_party.asm @@ -21,12 +21,12 @@ SetIshiharaTeam: jr .loop IshiharaTeam: - db EEVEE, 90 db EXEGGUTOR_A, 90 - db TRAMPEL, 90 + db SCREAM_TAIL, 90 + db TOTARTLE, 90 db MEWTWO, 90 - db ELECTRODE, 50 - db FARFETCHD, 50 + db RHYDON, 50 + db EEVEE, 50 db -1 ; end DebugStart: @@ -79,15 +79,6 @@ IF DEF(_DEBUG) ld a, 15 ld [hli], a ld [hl], a - - ; Jolteon (Pokemon 3) gets Thunderbolt. - ; Adjusted for Trampel - ld hl, wPartyMon3Moves + 3 - ld a, EARTHQUAKE - ld [hl], a - ld hl, wPartyMon3PP + 3 - ld a, 15 - ld [hl], a ; Mewtwo (Pokemon 4) has a full moveset ; Use for sweeping the 4. @@ -108,24 +99,14 @@ IF DEF(_DEBUG) ld a, 99 ld [hli], a ld [hl], a - - ; Articuno (Pokemon 5) gets Fly. - ld hl, wPartyMon5Moves - ld a, FLY - ld [hl], a - ld hl, wPartyMon5PP - ld a, 15 - ld [hl], a - ; Kadabra (Pokemon 6) gets Flash and Teleport + ; Eevee (Pokemon 6) gets Flash ld hl, wPartyMon6Moves + 2 ld a, FLASH ld [hl], a ld hl, wPartyMon6PP + 2 ld a, 15 ld [hl], a - ld a, TELEPORT - ld [hl], a ; Get some debug items. ld hl, wNumBagItems diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm index 22461859..c6cbc0d0 100644 --- a/engine/pokemon/evos_moves.asm +++ b/engine/pokemon/evos_moves.asm @@ -713,7 +713,6 @@ PrepareTradebackMoveList:: ; I still don't know how the fuck you're a single col ld hl, wPartySpecies add hl, bc ld a, [hl] ; a = mon id - dec a ld [wd0b5], a ;joenote - put mon id into wram for potential later usage of GetMonHeader ; Get pointer to evos moves data. dec a @@ -743,10 +742,10 @@ PrepareTradebackMoveList:: ; I still don't know how the fuck you're a single col ld e, l pop hl ; Skip over evolution data. -.skipEvoEntriesLoop - ld a, [hli] - and a - jr nz, .skipEvoEntriesLoop +;.skipEvoEntriesLoop +; ld a, [hli] +; and a +; jr nz, .skipEvoEntriesLoop ; Write list of relearnable moves, while keeping count along the way. ; de = pointer to mon's currently-known moves ; hl = pointer to moves data for our mon diff --git a/scripts/CeladonMansionRoofHouse.asm b/scripts/CeladonMansionRoofHouse.asm index dc7f45b3..af10d123 100644 --- a/scripts/CeladonMansionRoofHouse.asm +++ b/scripts/CeladonMansionRoofHouse.asm @@ -18,20 +18,38 @@ CeladonMansionRoofHouse_ScriptPointers: dw JackyBeat JackyBeat: +;joenote - This script will always run after the battle with Jacky. +;Notice how there is no check to see if the player actually lost. +;Let's go ahead and add that real quick. + ld a, [wIsInBattle] ;if wIsInBattle is -1, then the battle was lost + inc a ;if A holds -1, it will increment to 0 and set the z flag (but not the c flag, dec and inc cannot affect it). + jr z, .resetMapScript ;Kick out if the player lost. + + CheckEvent EVENT_BEAT_JACKY + jr nz, .resetMapScript ;Kick out if the player already beat Jacky before and got the prize. + SetEvent EVENT_BEAT_JACKY - ld a, EEVEE ; Getting the Pokemon the player needs before printing the text +; ld a, EEVEE ; Getting the Pokemon the player needs before printing the text +;joenote - the above line is overwritten by the very next line. ld a, [wPlayerStarter] ; Load the player's starter after Eevee loads. cp EEVEE ; Was your starter Eevee? + ld a, EEVEE ; joenote - you can load EEVEE into A at this line, + ; because the LD instruction does not alter the flag bits jr nz, .skip ; If not, skip this. ld a, PIKACHU ; Load in Pikachu if true .skip +;joenote - If the player's starter was EEVEE, then PIKACHU goes into wd11e. +; But if it wasn't EEVEE, then the player's starter would have gone into wd11e. +; With the above alteration, EEVEE is goes into wd11e instead of the starter. ld [wd11e], a call GetMonName ld a, $1 ; Load Jacky's NPC ID ldh [hSpriteIndex], a ; Slap it in the index call DisplayTextID +.resetMapScript ;joenote - adding this label so we can jump to it ld a, $0 ld [wCeladonMansionRoofHouseCurScript], a ; kick the player back downstairs + ld [wCurMapScript], a ;joenote - really, really need to also reset the current map script TheRetONator: ; fallthrough ret @@ -84,6 +102,9 @@ CeladonMansion5Text1: ld a, $1 ld [wCeladonMansionRoofHouseCurScript], a + ld [wCurMapScript], a ;joenote - really, really need to also set the current map script +;joenote - remember that, win or lose, the next map update after the battle +; will run index number 1 in the map script list which is JackyBeat jr .done .gotGift ld hl, JackyGift diff --git a/scripts/Route1.asm b/scripts/Route1.asm index ee38853d..a5c977de 100644 --- a/scripts/Route1.asm +++ b/scripts/Route1.asm @@ -12,6 +12,12 @@ Route1Script0: ret ; yeah it's just a switch-off. shush. OakVibeCheck: +;joenote - Notice how there is no check to see if the player actually lost. +;Let's go ahead and add that real quick. + ld a, [wIsInBattle] ;if wIsInBattle is -1, then the battle was lost + inc a ;if A holds -1, it will increment to 0 and set the z flag (but not the c flag, dec and inc cannot affect it). + jr z, .skip ;Kick out if the player lost. + SetEvent EVENT_BEAT_OAK_ONCE ; This is set every time, but it doesn't matter, it sticks at 1 anyway. CheckEvent EVENT_RECEIVED_CITRINE_PASS ; Before we do, has the player got the pass? jr nz, .skip ; Yes? Now we go to auto-ret. @@ -19,6 +25,7 @@ OakVibeCheck: .skip ld a, $0 ld [wRoute1CurScript], a + ld [wCurMapScript], a ;joenote - also set the value for current map script or you will have a bad time ret OakFirstWin: @@ -30,6 +37,7 @@ OakFirstWin: .skip ld a, $0 ld [wRoute1CurScript], a + ld [wCurMapScript], a ;joenote - also set the value for current map script or you will have a bad time ret Route1_TextPointers: @@ -157,6 +165,7 @@ Route1OakText: ld a, $1 ld [wRoute1CurScript], a + ld [wCurMapScript], a ;joenote - also set the value for current map script or you will have a bad time .done jp TextScriptEnd From 0da7a93ca6381b7eca74e0fa4441f733dad427f7 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Tue, 2 Jan 2024 15:19:56 +0000 Subject: [PATCH 13/14] Solving Mew's identity crisis --- scripts/FarawayIslandInside.asm | 2 +- text/CeruleanCaveB1F.asm | 4 ++++ text/SilphGauntlet7F.asm | 2 -- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/FarawayIslandInside.asm b/scripts/FarawayIslandInside.asm index a1d2d2c7..5e375d59 100644 --- a/scripts/FarawayIslandInside.asm +++ b/scripts/FarawayIslandInside.asm @@ -28,7 +28,7 @@ FarawayIslandInsideText2: jp TextScriptEnd MewBattleText: - text_far _MewtwoBattleText ; Mew! + text_far _MewBattleText text_asm ld a, MEW call PlayCry diff --git a/text/CeruleanCaveB1F.asm b/text/CeruleanCaveB1F.asm index 9d048c26..063f2584 100644 --- a/text/CeruleanCaveB1F.asm +++ b/text/CeruleanCaveB1F.asm @@ -5,3 +5,7 @@ _MewtwoBattleText:: para "...Mew!!!@" text_end + +_MewBattleText:: + text "Myuu...@" + text_end \ No newline at end of file diff --git a/text/SilphGauntlet7F.asm b/text/SilphGauntlet7F.asm index 5967a8e2..29f74095 100644 --- a/text/SilphGauntlet7F.asm +++ b/text/SilphGauntlet7F.asm @@ -149,8 +149,6 @@ _ChiefAltAfterBattleText:: para "I still have much" line "yet to learn..." - - para "Go." done From 640464ff1b6d000a77a1d5e8e866441069a7f237 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Tue, 2 Jan 2024 23:15:06 +0000 Subject: [PATCH 14/14] More superb Albatross sprites,,, LOOK at Golem. oh my god --- data/maps/objects/BrunswickGlade.asm | 10 +++++----- gfx/pokemon/front/carapthor.png | Bin 1024 -> 1044 bytes gfx/pokemon/front/electrodeh.png | Bin 455 -> 761 bytes gfx/pokemon/front/gavillain.png | Bin 886 -> 921 bytes gfx/pokemon/front/golema.png | Bin 877 -> 993 bytes gfx/pokemon/front/kingdra.png | Bin 880 -> 943 bytes gfx/pokemon/front/perrserker.png | Bin 879 -> 931 bytes gfx/pokemon/front/persiana.png | Bin 916 -> 981 bytes gfx/pokemon/front/raticatea.png | Bin 705 -> 959 bytes gfx/pokemon/front/screamtail.png | Bin 720 -> 866 bytes gfx/pokemon/front/wugtrio.png | Bin 807 -> 898 bytes maps/BrunswickGlade.blk | 4 ++-- maps/CelesteHill.blk | 2 +- maps/CelesteHillOutside.blk | 2 +- 14 files changed, 9 insertions(+), 9 deletions(-) diff --git a/data/maps/objects/BrunswickGlade.asm b/data/maps/objects/BrunswickGlade.asm index b1efe04a..ab9a6c16 100644 --- a/data/maps/objects/BrunswickGlade.asm +++ b/data/maps/objects/BrunswickGlade.asm @@ -12,12 +12,12 @@ BrunswickGlade_Object: def_object_events object_event 16, 8, SPRITE_COOLTRAINER_F, STAY, DOWN, 1, OPP_COOLTRAINER_F, 6 ; Leaf reference Trainer - object_event 7, 28, SPRITE_GENTLEMAN, STAY, UP, 2, OPP_GENTLEMAN, 6 ; Fuji reference Trainer - object_event 15, 30, SPRITE_BEAUTY, STAY, RIGHT, 3, OPP_BEAUTY, 19 ; Ariana reference Trainer + object_event 7, 30, SPRITE_GENTLEMAN, STAY, UP, 2, OPP_GENTLEMAN, 6 ; Fuji reference Trainer + object_event 15, 31, SPRITE_BEAUTY, STAY, RIGHT, 3, OPP_BEAUTY, 19 ; Ariana reference Trainer object_event 31, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, 4, OPP_COOLTRAINER_M, 13 ; Trace reference Trainer - object_event 32, 25, SPRITE_BIRD, STAY, DOWN, 5 - object_event 20, 18, SPRITE_BIRD, STAY, RIGHT, 6 - object_event 9, 3, SPRITE_BIRD, STAY, UP, 7 + object_event 32, 28, SPRITE_BIRD, STAY, DOWN, 5 + object_event 32, 14, SPRITE_BIRD, STAY, RIGHT, 6 + object_event 9, 2, SPRITE_BIRD, STAY, UP, 7 object_event 33, 11, SPRITE_POKE_BALL, STAY, NONE, 8, TM_THUNDER ; itemball1 object_event 5, 21, SPRITE_POKE_BALL, STAY, NONE, 9, LEAF_STONE ; itemball2 object_event 22, 15, SPRITE_POKE_BALL, STAY, NONE, 10, REVIVE ; itemball3 diff --git a/gfx/pokemon/front/carapthor.png b/gfx/pokemon/front/carapthor.png index c69a5a225e4a81cf3bc68462019432f3f3c3b89c..cea6b725d3666715c735a3a9bb856b354ac38085 100644 GIT binary patch delta 784 zcmZqRn8GoklIsN{lQ=Usi_P0p6Ps0}Omqzlbq$O{jEt=ejI9g}v<(cb3=FE>oXsa5 z6!*g}%O(B0n}LBrqr^3$BqgyV)v6>jH?_DVF}Hxh$iN6qk0Hdw-<201OjcvetS|6% zaSYKoKXvj!|0@n6$Ko|vU6aKxODVT!DWtt@JyP*uLm_tr-;o`A&E<^D5!Jon}A zW3(}SQ2#N*WYwO1`*%+g@^gA7v07yNae?l7w_Vj1F0U4)Yq&P@Gc6I=^Ld4ScGJQw zw_Z3|XYA4tU|zAk#cYRrlC&u|!`*#{MGNLHn;pUWV8XQ<&K~tQfAxhgydnSK)+%1- zr@c-EpK}g-=1#NX3Yfk6OMS)FHB*D$q`ETp_ujD9zJH_Gb??Dx4Ao-k+ui3|?k#(3 zySO1v%dq}};enU@7RyCEf9yD0E$YD)3GUt2}_rcul(z9kvR{tzkx_!Yj?NHA-*A(af^@+{M**i_~@eHPv znmerZi`hgXQ7cl9f_^f^4Q*IhMfjc~0% z`Q?J@iDy?qE#A<$7#m#->#g=K3{J(Wf4=$4vTz&b~$(s$c>^E^KMDGn-EMe98 zb+>Y`i*jeqf=e9d+t;?#Pu{dcxbkV|bxzLeqZZP=XZRQdY-Jzc^SY~IWiI2+THL4K zYObDiCtY-n(4p#@mV-YQ%IY=zOZdX2yDiS*-28lNk%zBUP9NEEZkmAI#N#g|iqG^- zIMOlw-o5?{R-Ef)!UEJ6t4riI@T;d^RK6LU$^KEk{vrS8`j>kYR>XKRFmN$2c)I$z JtaD0e0svp=ROA2v delta 763 zcmbQj(ZDgGlIuASE5E$O?ftn^CN`@`8S5Gv=^B`Z7@Arc8(Nu~X&V?=85lIj`HN3H zDDHRY_)UYH>+oZUKXlff1S>sEJF(u9ZwyW6Z3N z@pN$v(KtW#^1M&H@y7bc4ze{->3 zVRpm?MUg#kw_Nr8?UQI*@j)rt+I)iCnVYdnyH{8*JsXj@=hNqkMK^=MIQdrssHvCwGs$CK(8JY5t%!QVlyU`v97P50`F8I5y( zy>ODR6<<7ssVekM^K0u`n*|Inj$L4%E-ZhWb;8A0ChwSL-u-IGXfMoMv;8CIiMY!T zjVIeqySK8pw(Xp@+qZi^=0@G>Gi2S9+4&}4?xz0oNqgJ4E9R%(zL{FK^xn@)TaG-B z`135n>6C4wn|XbPW8Ud|hANA#d|G9XPQCxFtM1-|1l8R~9$oxXxj*{)DRY&zCQF)@ z=dXUcBurCL{lM>g#e1WsiLunO*VtX{((q;r@d;tM*qQd}Ou)e}0W!zlPpFA7{^F!^ zUhvnF?@B*+qy?N1a-9C*>XoZrea}Q532s=GzFIR>SZBfG1ACv{d|e;Xnsr4(sW4$% zVa>^V46_91ygPhd`I~N9cS7%@b93zz46k`Hx;#I-$b&s-c2UjEe*qIhCRg(C>4!gF zxz#kwlHz8}1!bk%h06GQC>ODd+M zT@mVIe^_x!SL@myp|q>P-xwR7m3o{we0H5Z)VjEdN$kYEi%EoKA~8cbVOjZF~C)9Oh4)kh)uLLfeto@8wxd+z+qr(u6{1-oD!M<|FUJS diff --git a/gfx/pokemon/front/electrodeh.png b/gfx/pokemon/front/electrodeh.png index 600c7318d8e0798bba293e9769f7af3c6f497d57..55bd22bbbc797b82b9a9e97abf9384e078aaa36b 100644 GIT binary patch literal 761 zcmeAS@N?(olHy`uVBq!ia0vp^8X(LBBp4p6{ucmJ3dtTpz6=aiY77hwEes65fInC}Q!>*kackg`{@o4KpaHj`Br`X)xFj*R z0E-?&h$X)(FFpY3iAs&|O!M_+&;qhK7+4vF7?^=9Mj&Khlwx27vl$q?7^UItAVv+S z8em{D2_w`4)q;Qr5Ce5XX!)S;CO~eer;B5V#AVxyhTew*1lT`J7GjRw6(QhSV%qdh zZzTtx=#pb|?jO{vYv~YRS*}&GEs*=Pz0=|W;)>|^?O~3NZ ze$V&Ey!`L#6^=K)Fi>}^Q4VUC$#7XG`gy6?w-*{|c0A6Xl=!lOIF!0?iYh&l+^pL2 zUij+F%KP7cyM#Uy(%!Q~o3r^;j{O_UsH05>?((Qw-t6LwP517~xAuO2p^)dN^EOBS z3meN_`Y#DaZ+khpo9*h%9bV_&Y2J1C{3qpba9W>o+!UVcS7v?T;(zBpdD-`^r>sme zTo)hCUZwUxul~Sim6a13eyg~CbZGrnc7|!mg5Jp!m(AGk%EI6>qy2&K;|9Kia`9YA zZtN=)`@DR(pA;EtM`xb-Fr)t|>x|8Y2jA3a?znbL#Q1}N@6juZe_cxbr!8)Nb4Thb p!)DhynK0e?7em~$Pxf5@G~d2no}tJj85jjX;OXk;vd$@?2>_n`_L~3z delta 441 zcmV;q0Y?7$1;+!B7=H)=0001~mFKYl00E9kL_t(Ijg6IAjsr0WM4^={7KemGdcVz5lr>BSk(kLFX%86Vuylq6Z8N1|kDl?NPsO*Q_A4 zJ(AQT^fZ^46Y;5i~+j2AFTOLCv_6@N#3NqMyma$J}2fKm}b z+LD<<#*ni*c#>iEM8wIp&vOoH$!ELSj$H19awPXXqEEf^C%5jCp3B_B_;Ty+`#GLt zt1%Zui`sUr<{88(SAjWp3eTf%K?~>pAh4N+3?_6m?h%zc%S#29pm^aj(t&sv^cyc? zCfyhZ67y>to!JW)3_USXpm@*xms5wZztPXf#HyES2E95nr jX}wm(jrTtP`uFh%hXvH&kx^g900000NkvXXu0mjff7#P& diff --git a/gfx/pokemon/front/gavillain.png b/gfx/pokemon/front/gavillain.png index 10aae678e6b97159ddf4fc6c2b140c02754668af..703b8a87d01eb341ef288b1a8d4fbdc9dd5b084d 100644 GIT binary patch delta 682 zcmeyyHj{mV%0v?<*~1JBe1{p2=dVa%U|?V`@$_|Nf5FHk&ZMw$w(9ALlU1ZlbPWu3 z4U9sJjI9ietc(q{4GgRd3<|EP9GG}f+z-1fWA~gIpm7={t`Q|Ei6yC4C7HRY#U+Wk z1q?<8MreABASR}lEw`J@#F$zC)zif>MB}{cMc)izM-hexok3listQ^{tlc3?sxLf} zTNN~81>@cm+YBu$t~EcKw0k;h_5~Nks7tda)xQT^=2 zj2{Z5!!~SQ=KY01E14r=@`WC2)#dT7dJlfGwtgxQ{cR=mEV#AmsaBbn$B#9$!pwC) z^!BXS66f@6H|I6GiL- zF^6aNVP*Q+KFw=dzU||w>tDO_{Ete-!@h&RWwak-8s{(M%N)f z<^Pq1$1cgmHoaXD?zj6iA8%jm9EZNcY5)w>;;H%yf;JUZ(a`x})t-pl43R$l+X>)wXW zHCy)OeE(e^V8ZRYasK0ib+4Sa?b)IA?Xsup#M`@zP8v2z@7$?U_j|$$6*G=~cUR_y z&a0gpf9v;*gtx{=pUJPb=wJ0>XWNaxJ0toQs1=B8G@P_g_RW=0!OLutIlsS4yQt1S za&Vig#>yW8>x0=})R&xms(9n;uMZKk^>{uiEj#^1e0T25;Ezgtg3-XF!{F)a=d#Wz Gp$PzopD6?Y delta 645 zcmV;00($+K2lfV#Bn<>-K}|sb0I`n?{9y%=Aw?a;000ie0hKEb8vpiJbCCrd-3kU#bVGzVWlKD!A;oe?nLm=gCG_4AgN0wY7wMhi>RPE zNZc1G zukqSX8=YY}vw_bsUoPMiwP&S-XeHA4GA`kvEH{QvxkL-?2u|e@1GOiWf&`w9*+UXs z8;8iFN&k$x_IKaJ2n-%>f4-2913_OR7e@8ZjZ@(#1X;*w-r404&4EK>N4?^H^`gXg zuawTWNPH4$fK}0y= zkcj#QsDJ%O*q1-L9t**vzfwtOY#UThJ6CMAN5sF;^}OYR>a2bLe<0deu+5sx=LGJG zb}(CBSd#hFFBM6+dvlq7pv_!nimIQ|i|I|EcYAalZv2=o9(V>+{mQ8J&nZlkCTDID zHGVIYZXq-lgYeY#(Vo9o1NoHc&t&WA;uxZFKJ>CiJ!vpg|b4wkQ*jam@1o4Mn z@&4C1^T>@L{hPNcoAz?{w#yvZJYD0t?|F$nrsy~rC>z!+a%|nr;?^^34 zd@U>%f1R&!;ARW^5q@pc5Ki+>@!5>CQZ78*B)24Ac~*)8CKUjqB&c*EjpMEb&Ie2TrpeYBlrK#){3`2jXU(BvM=wM9QyE1ndSY?8A($X$5u?^uVq-(RQ!FR z9J?Kd>QSBeHKyW$tVwJYoA2=KK-)R73;4AiOD-}kB)EIb2EnNy31{S zv7E}q%MLse`f|L&$%DUEB<-K}|sb0I`n?{9y%=Aw?a;000ie0hKEb8vp zRplrn@xk8dYl;yUqM_#Tx+Q4}9EuT$KFXufXaw z$A`VDWb|PgKD=2E^OjsTf0;Cgsmx z%PScp-@3MGfmrm@cNt@2>ut|xv_$T=WQ_5%%8((519lX}-!Qb%f7F{Z=A64O(m6-O z2uLyG8Ko92YkuRryIlnsrbov4LCyDbGwyf0Pn{B;ro;pEl1nvMipb>M)%=PmHaupB zo^Dh_IVGjg(QKofu#5UH&4HTJSnp&Kjo9LNM_j!;WBdXZnK;wdB5(gKF#%_Z^ZF02 XgynD@$Q>g90000<2SrXqu0mjfp)DY~ diff --git a/gfx/pokemon/front/kingdra.png b/gfx/pokemon/front/kingdra.png index da030d55585faffe05c269bfe1b86e4687ddba06..177af1e28885a2ea50eb83602da24e1d568f5583 100644 GIT binary patch delta 705 zcmeysww`^0%0v?<*~1JBe1{p2=dVa%U|?V`@$_|Nf5FHk&Z0Qs*rwYPC#y)A=o%R6 z8W@Eb8Cw~cSQ#5@8yHv_7`zI1T{rQfxF2@e*<62xfW~Q*xJHzuB$lLFm1O3o7MCRE z7BCnY7-83QM*hy($xMtH^-SEJE{-7@=VLEBW(YfqFkF}_G<8u&``#x(0$pYri(G9v z<}O$u!0&nD+|lj;S1$)a8;y*c-qj~l7fN$KQfxDw@OOF~i(_Z>1O?I8j{IILd6krw zEV#L*>~>1oe&gA9O$zml`xD##|35RmAj4zt$^C7&vyKQ=>Fw(6_%7hDU|lc%>AA`y z>!2v!pI@8ncdor_Dfj8`s^e~#r8O@-{$0N2N;B%7i zQSEu=hIk3* zs=JHNz0Ncc^?T22_GhZU{WFHHM{jCRzO|e0P^ljha<0GN!!-?+OffB&J35lP_^0+v zs-MDVbjv=qaZ2CO%yrZMJ$rUpE%Rgu=Zy_DxzZc=wF@1*eZ%tP&7`8J4?JPkeHC+l zb*ymvT)(Q(^58YQz+SbC4315Pe&+no_b!pL-M*V6So~wI%kepmkFG0iTX<>%^AdmO z=U1F=RX(;hdsyYMEki`W$974&pSVKlXSXlwh0X`1{oE*I7^mYf^;_g}_qNK!31*=S z_ISH(?)(|MNXGk=$@S+(XD>0{GI7h?-K}|sb0I`n?{9y%=Aw?a;000ie0hKEb8vpB`WUg z5d*x8E(1I$L}Z*k$}Pu?_zyp0&~iboMfBe8=y)@nGqi}i!HA&yZm}`pla;7Y=b%upjyYh6g}WS{kPrbGT;xKnL!`WE+-&(5xkFt{NcUyPM3F`f}NBJg+1?RX4z@r@J|!x-YYNp;ZqpT-;gIGiEu~~-N-0T+{IHxEepjLS>|fZHX1@j= a%KuyxT|uP}>{$Q+3IG5}MNUMnLSTZE?jUsl diff --git a/gfx/pokemon/front/perrserker.png b/gfx/pokemon/front/perrserker.png index 3b79cd3e31a56b71b327c5cbd366d0fa06761f03..794d9d2a3151a203604b73da324d08bf8935eb07 100644 GIT binary patch delta 692 zcmaFQwwQf_%0v?<*~1JBe1{p2=dVa%U|?V`@$_|Nf5FHk&TOt7JkfXJWECkBT?0d1 z1EUZlV=Dt=D^p`_0|P4qgL6;9114S+_d}I6v4qH8Pu^eyG)|+$HKHUXu_V>1Br`X) zxFj*RfWgSX2vv`%DMU|q&2P@hOpKZJ|2u}9a)1QG2mS0g>thQzPcP_k zG@mg&F64uS$Dv1jySHSN^^B&)$w-Aopy8ZH0iAvxHK| zA->nH)<-tZ{Q7h6@mnuW&bF-iaC-Xpz54g75B#rsQ2*(INMh-Metv^1^LT$49|3t^jGb;XvlhZze%{kgvtl`oH3;<%v~q$2vaw(^4@#L%7}5I z>+$K^yeB8KJ__oaV_^L{&wHau(4z~%L4Q`W$ud0RT$Oo`t)t*d+`Pl(GAFYGe#oh6 z@jYk1*L3eIOTKVL^JR;p#db4vKi$5X_4Lt~+ijHK=;ZxOmdKI;Vst0E>h%7ytkO delta 638 zcmV-^0)hRb2k!=uBn<>-K}|sb0I`n?{9y%=Aw?a;000ie0hKEb8vp3l;ri8cwzYhEhDNXq$1|-;v7(qgD5ki84`PT*im0aDt^AG7+G&E;?HIPy~o=rZ`16^F6@#V?)fA_MWVC6$# z>ND=ux!Ear5GAFkpcrtCTLt@x7WxGrcFfB4BFjV5F4mmIn#~kOIVWxfV3$IU;?Jw5 z-Ge2X#d5xF9ebnIr5x*uA_D;P!Vzibl*>f-+(57?Prq*MT*9OUmf}~T@%eRZ8&mFI zGvg|za29;UUFpWh@eVMSe^bckttQ5xR!00LdnLsC+&rIi|Ho%U?1U6m{PIW=w*aO) z5~W|?KVr(@4EXBN(l(X1!uE|}psE+2d_vrq>tWXdDVA5ZDckdKy+K(~Et7E5OS>^u zrCS;j8>?+MrmQgLYKZ;Ls<#o-n=_^z#RrMAl5TR!j%|3>NcyZce_T^l+kn0D-K1IT zMwAs515Vsp>tO9l#4X4)`;>R{Hcz=*txFigf_xeU<(|XbfM{6q1=Ht4gFY)^Wc$(q zm~b#-I-HR@651<(Lw^x=s0$`w2>_iM07f*7nJyrN!xmk%ExB0zb5=AgSSs)TV|)Jw YBtHw5%<>iU000002uVdwM6N<$g3baSwg3PC diff --git a/gfx/pokemon/front/persiana.png b/gfx/pokemon/front/persiana.png index 4ca635a9b6fa4aec680510b8f0e37ca82f213d9c..a7f0830b561ac94ba71eb26cab16437c3a4e276e 100644 GIT binary patch delta 742 zcmbQjewBTK%0v?<*~1JBe1{p2=dVa%U|?V`@$_|Nf5FHk&cbIc-rqEFvWk?6u7RPh zfl-K&v6X>|m7$5Yfq|8QLGIO>*oha#{jkf*bR2mIG)|+$HKHUXu_V>1Br`X)xFj*R zfWgSX2)iEdxlipTGcjh?8+y7phG?7*y}UPDI8lcE1Gl2=tAG_OE-j0KYtq!?J-WDF z>T+hzYq~o{>XHS=KSnjBg+lFOrV~;;KVN$NxrVj0=*5MS%!7VM9hW+Xn>KF|jFx)$ z>qm9bdCq%9-*;ButJ6%Wc+|i3=;i0NyDtB^V^DwU_BZqAp>f2rKn zcK?~;^SNOK&lX#*IeT(tea{2m6FsVOc89&>&g!@A|NbFKc&Y3B<;}u1GG#X>S$>}D zyXU>RSDLc_0+uym{b%p&ej|Ee!#hd7b@f(!VVVx_%|7NVn>6QmQIc0}X}8JsoopSa zO*WXvEIR0!s+{8g-G)|PH^5oyIj!pk& zMI4;m_sp<}`^zS!e6O>NDvwTOZ_ndAdwz-**9#|=dDm+kL|nJd4K+Ng?c((&amI^Q z8!pEBI?<$%P2QV)r`UbJC?urz-Y{GI1b6+WXMW6g1y`oc+fc@}<`mbzsC66IHoBgZ zn0TuG(#AU<%;qOntf^e!Z1E`B=i9HK%IniR=UrXZ5f{JW=DuZGTXL6gS9D76$Tmu} ze*bIB>l#cWo~M34AlZkx3=>r%a1)?EM5a{u0%S%N$7{B3#p zP2)UAod0p&?TaK`e&&48->|9oWRX_Fr2eaA$sZfEuf-K}|sb0I`n?{9y%=Aw?a;000ie0hKEb8vp^k!bJ$cF{!4N1piF)e6yL%|xMN$Z} zKHuzaQiRT7*^hbqc<;?D!~YgLmn=JF*+TUBO2QBaKUt=FA>p{EOyET)e_?PC^t_xY z5}xeagULM12)FM~*3VeGbMqKxR4?`iU4YJ%PvF=)BVK*nZPtv&l*0^^7aVI!{|yxE z*MDL&|J66R;Rz#Qu>J+^!K_Gi1!z@g4fdf3G94ztsKACjXD*>inc%J&RAiXel#BM; z4?eyAP!C_|u&?$))2u;s zEK0CoE5}VU=4pqi^pG!^@KPV?FWrLAFPgIF2@D@lzo=Nt7Md%b<`~)~x7QWyuO1Et zAWH6mCm)^mS!_!N?@e!tW!nUj!(`m|x@2~UGB_5`_a|MU;lAUsxk^=xi?}(z9$@uYG*@kL)|Gn~Z(8aG=_xNu z>^iY*`LVUDmAK| zmvruZ=@W;Hc84vSI@6GAg6BNd>ne|**fAwMn`OOXsnY+Xjt;31&)=piefGP>{nBSt zjOb~ex^3p!ecMd^5|z0mP>3Z|r?ycJ`wIIhgYDwEMj|rEQmb)g& zxV0!xn{iE5&*l6BRYu`2M{o15GYzWU_hv#nGjni=`|}&0Gy`KV`&b&RRo=|Lrh3{p z&l4{V7sXU7W+zpMna|$4KFWEmb)w}B$CK-$!fxtZD{4wBn)~F8LiRO%_UT>w`fIiEO+i!c-)EjJa-*2hsP@f; ztOwJ!1*bI4@4qI_H}krCZoiQ0Hr=YDSEo#VaA9_85bIXC*u%{3vo!ZkzR$mBt*YW| z*D1l=)@7Bcna?+W|8&f4+Cv^USAA{14r>mdKI;Vst07ds)wEzGB delta 682 zcmV;b0#*IL2f+o9BYy&jNklR4vhy=iO@6(X#vnSbXH6W@7An-4c z_nGyOvz0|tAIagef7PMO6T&C683h6u;B0NvpwO*2*iHGH->Xwj3Re1FR5 z^)OcHc*>BK4(%4JW1MzMt0%*x16q=E=4qwi!Ox0jORj;TR#`YRImhQ^0ug`&fXQVl zLA#Ydk$g@)P=825J0=7HHug0|N~Ask#Z#d+;X2tsLrF?mt}7qDCbEDpFkVxEfHH&R zJ@BDG%|RW9XBCqQm3<$rO{SJer^T5tK2ak3Rb9*C*PNH76RbpYmeEpquc%Vl1T2<8 zsON(ama9_1bGoAoH=4+pT$b+85DY0x&S9pwW&u^HVt*NgTcpFha0J~-8>fYXE?z~N zIu(mmi(zgw>C?kirnz33z>%$XN*$k^M0hTLnf=b<##K9!wBTp2uZv!f_7|JFP%Fm> zv8Mf;z>KG=oG&9?YHajf>o!i?A``IIWS{FtWQy&p@5i3=18;lJMR7Uc1ibTfRgkXa z{6Ok+oPPvfd1iS=5WanUG;7B~Mic_M2EN5@i%7AP+fTx@0c1a9tf}Y&&Z2fqR~6I} z*DK@3g)*yJbvn{qMA`D0(2Mo^G*vrQVH4_!vA4jkuk&YD+|i!KmQl-2Y6SdCIR_O Q`v3p{07*qoM6N<$f}gTW2LJ#7 diff --git a/gfx/pokemon/front/screamtail.png b/gfx/pokemon/front/screamtail.png index c921b1edeab2c38a95b3bd3aeb3d46346f3cdc62..01274c14cb80c2977070ac32f7a2f730cdc56f1b 100644 GIT binary patch literal 866 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7Tdg=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&U^Z?k>HzXM3p^r=85sBugD~Uq{1quc zLG}_)Usv`Qj7;K8^6Y;(z5#_8^NajK7|$;%p9SQombgZgq$HN4S|t~y0x1R~10xe% z14CT{qYxuwD+41dV?%8N11kfAf@>-VP&DM`r(~v8;?}^}J*Nh!K?80>NoHWNB?@J#ddWzYh$IT%>x%Bs2X5k zG6^Hp1J#0n2M_~wLumP+?U& z5`XQzZ{MD*}PR2TSI!<9zdb&8OQRGppLy8*eW; zBE40qg4N6Mf=l28H|eQjH-o%o&0dL5H98sV>21$qcxL6aUysh)7|C2N;p=oz(9Y1S zjXLkZbtI(!+zB171AZTND*a;H%bvxYJy)W3k$tt7Q&Xp3RJHGvL!Rx|9yMtK2y0bjuUZ>3p6iPQE*ya68h?Y!`E?!J2LU?DZ?7KOA3sL)83r@xMJU vr0nW1C2K$4EV-2ZyI5!V>&VUjH=Q^4yfP)`M0MSEQ1p7b`njxgN@xNAx63&> delta 607 zcmV-l0-*ik2G9kNBn<>-K}|sb0I`n?{9y%=Aw_@0000ie0hKEb8vpR}sVJa|>{1LPp6Wl5wL!KP4pDTRW@b~6fsUtpu6K}}pCA3)Jd*^8Uq zpk;rV+2>@oX46{_&S7}JISg;+{Q>`3@YDq8rh}+-QIRK)lqKoVY8Un1M-p9Z4NsC2 z#?dx83CXJLp406{D;1LE7Vl_j0tT9rc$mARN(-##@+#t~*9Kld#Rz$08Jk#vPhTV_ zzoV_718bV(L9yKui;ab7D ze?F*`fVE#hyi&~|Ul^epxW870f_PC666OA~25jK1#`45Bzn)a%@5K|WjXgn1_R&!U-O^4BDJ}jT3RB)uO1~95GkTSzMl#~k zXXvLtIwS_$rO`miZ-#b6-Jd{PkH#IO(1^lNb93GFR8QTE$YL$GJ4jLZo;<++$p_fg zg+%Yfbmss703~!qSaf7zbY(hYa%GXA2O2UhF)}SMF;p=(Ix;spF*hqPFgh?W&bD~c tk---xGA%JOEif@uF*iCgH##vlD=;uRFfhOCz-|Bl002ovPDHLkV1gPo2^#|q85zQc^i^H-!WFfg!}c>21szhGn%XHlGRY}4(DlU1ZlbPWu3 z4U9sJjI9hztc;Dd4GgRd3|@u1uA6vK+z-3#Y_7jTK;tw@Tq8~-c#yt*i<0+A24_hL0ntw{8aXE_ z%v{Rt_BDEjfRfxF<{1-YjJ60d%?it1I(fpS6NQhe4L(W>2+b5oe$LU!yJ%HXNA|s& z>DN8JCj7p0E=xnvZ=vQL6jbFP(1}#eBB@ij-cT zaCZ3To)=dQIMrsUyU2H}c=AP~PMf#Or1|^B-6typF1?cV&-=eAtLL4QXihG_@;a|+ zDqYK5Jg2QQ3VyX-EGq<6P1=f+Vynr%jZiT zv@kEd`y!L?huH1cw?&@aIeSunZIet*#`pT`-bGsH`Rb?534U{v|C?#~GoicF@3uXA zt>2Irwe;1jlB2OP7ZxS%c3X7uF!#5Ln@cx$<#!Z#*M@p_-rMrXPFCsDyrZo1g%_PZ zKk=6Kq-vps2Wb8OK}9;rFR+NIzz3kXEqS>JP(q ez2CwA7^Um}#{4+=N)wnw7(8A5T-G@yGywp=79=$Q delta 565 zcmV-50?Pe@2d4&*Bn<>-K}|sb0I`n?{9y%=Aw?a;000ie0hKEb8vpS( zIxsUjGB_(RFgh?WBh++|lO_Raf2T=AK~yNuZPPzX!$1@O@K<9Ux@bWhT&18HGdKx} z;^bn)yv5xmAHcPxq97Do!3y1~v2E_@f@!D?ZOp@9)fR!Kpb+hM{6iv~eB!LBUs|e-06qjIKr< z0gC>4(3zxWNwYnitbFSXR)2%d)9Zk%3QKa_7t@e~gk54IJnrEDdm%`7}NR zUJz6f`4rNR0YYUDn65ms4=$;?%^&vUk);WjR9|4ie8xq9Z7y=QKOjIwj@H2_IGc?+ zh8pFW9Fg5gISN^q-`Mv`mbhL}#)H9~`WFE7>#f=kJ1FKwwE-†€jV€/@ABƒg…DFg<>_DdF†€‡g„‚DF%0ƒgg…AAA†‚g„/sV,„‡AAABsV/‹‹‹‹‹‹sV‡@AAABAAAAB@CD?ACFEEE?B@BDdFggg@B@Bgggggg@B@Bggg@BD?>ggg†€jV€/@ABƒg…DFg<>g~DdF†€‡g„‚DFg~0ƒgg…AAA†‚g„/sV,„‡AAABsV/‹‹‹‹‹‹sV‡@AAABAAAAB@CD?ACFEEE?B@BDdFggg@B@Bgggggg@B@Bggg@BD?>ggg