From 12ef8862362aeadb451142e5fdc7f51baadaf657 Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Sun, 3 Aug 2025 13:31:35 -0400 Subject: [PATCH 01/15] SGBMode Party and Stats --- engine/gfx/cgb_layouts.asm | 51 ++++++++++++++++++++++++++++++++++++++ engine/gfx/color.asm | 6 +++-- 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index 2c53957..eda537b 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -135,10 +135,25 @@ _CGB_FinishBattleScreenLayout: lb bc, 5, 10 ld a, PAL_BATTLE_BG_PLAYER_HP call FillBoxCGB +; Zetacode, SGB mode should use hp color instead of XP + ld a, [wOptions2] + and 1 << MENU_ACCOUNT + jr z, .SGBxp +; End Zetacode 1 hlcoord 10, 11, wAttrmap lb bc, 1, 9 ld a, PAL_BATTLE_BG_EXP call FillBoxCGB +; Zetacode 2 + jr .please_continue + +.SGBxp + hlcoord 10, 11, wAttrmap + lb bc, 1, 9 + ld a, PAL_BATTLE_BG_PLAYER_HP + call FillBoxCGB +.please_continue +; End Zetacode 2 hlcoord 0, 12, wAttrmap ld bc, 6 * SCREEN_WIDTH ld a, PAL_BATTLE_BG_TEXT @@ -237,6 +252,9 @@ _CGB_PokegearPals: ret _CGB_StatsScreenHPPals: + ld a, [wOptions2] + and 1 << MENU_ACCOUNT + jr z, .SGBStats ld de, wBGPals1 ld a, [wCurHPPal] ld l, a @@ -258,7 +276,28 @@ _CGB_StatsScreenHPPals: ld a, BANK(wBGPals1) call FarCopyWRAM call WipeAttrmap + jr .contattrmap + +.SGBStats + ld de, wBGPals1 + ld a, [wCurHPPal] + ld l, a + ld h, 0 + add hl, hl + add hl, hl + ld bc, HPBarPals + add hl, bc + call LoadPalette_White_Col1_Col2_Black ; hp palette + ld a, [wCurPartySpecies] + ld bc, wTempMonDVs + call GetPlayerOrMonPalettePointer + call LoadPalette_White_Col1_Col2_Black ; mon palette + ;ld a, BANK(wBGPals1) + ;call FarCopyWRAM + call WipeAttrmap + jr .contattrmapSGB +.contattrmap hlcoord 0, 0, wAttrmap lb bc, 8, SCREEN_WIDTH ld a, $1 ; mon palette @@ -295,6 +334,18 @@ _CGB_StatsScreenHPPals: ldh [hCGBPalUpdate], a ret +.contattrmapSGB + hlcoord 0, 0, wAttrmap + lb bc, 8, 9 + ld a, $1 ; mon palette + call FillBoxCGB + + call ApplyAttrmap + call ApplyPals + ld a, TRUE + ldh [hCGBPalUpdate], a + ret + StatsScreenPagePals: INCLUDE "gfx/stats/pages.pal" diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index 1104825..75820d5 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -370,8 +370,10 @@ ApplyHPBarPals: call FillBoxCGB ret -LoadStatsScreenPals: - call CheckCGB +LoadStatsScreenPals: ; This bit of code colorizes the stats screen with the page colors. + ;call CheckCGB ; This was a check for if this is running on GBC, and fortunately I can very easily replace it with the SGB Color Mode check for similar results + ld a, [wOptions2] + and 1 << MENU_ACCOUNT ret z ld hl, StatsScreenPals ld b, 0 From a47913cd980ceb466443f792495a2d118ddb1772 Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Thu, 7 Aug 2025 18:21:27 -0400 Subject: [PATCH 02/15] Gen 1 style music for the Sevii islands (more needs to be added later but i'll get to it :V) --- README.md | 1 + audio.asm | 2 + audio/music/FourIsland.asm | 343 ++++++++++++++++++++++++++++++++++ audio/music/sevii.asm | 318 +++++++++++++++++++++++++++++++ audio/music_pointers.asm | 2 + constants/music_constants.asm | 2 + data/maps/maps.asm | 50 ++--- 7 files changed, 693 insertions(+), 25 deletions(-) create mode 100644 audio/music/FourIsland.asm create mode 100644 audio/music/sevii.asm diff --git a/README.md b/README.md index f4d3ccd..2748e57 100644 --- a/README.md +++ b/README.md @@ -174,6 +174,7 @@ JEP-affiliated musicians require music to be used with direct credit for non-com ### Unaffiliated - FroggestSpirit: HGSS Poke Mart Demix +- TempoQuill: Gen 1 Style Remixes of Lake of Rage and Azalea Town (used in the Sevii Islands) ## Other Sources - Nob Ogasawara (Many prototype Pokemon names) diff --git a/audio.asm b/audio.asm index 89d21f3..a516f29 100644 --- a/audio.asm +++ b/audio.asm @@ -176,6 +176,8 @@ INCLUDE "audio/music/FloodedShrine.asm" INCLUDE "audio/music/AlphalithBattle.asm" INCLUDE "audio/music/FortunaSF.asm" INCLUDE "audio/music/JasperForest.asm" +INCLUDE "audio/music/sevii.asm" +INCLUDE "audio/music/FourIsland.asm" SECTION "Sound Effects", ROMX diff --git a/audio/music/FourIsland.asm b/audio/music/FourIsland.asm new file mode 100644 index 0000000..6aa185f --- /dev/null +++ b/audio/music/FourIsland.asm @@ -0,0 +1,343 @@ +; By TempoQuill, From https://github.com/TempoQuill/PokeGoldG1/blob/main/audio/music/azalea.asm +Music_FourIsland: + channel_count 4 + channel 1, Music_FourIsland_Ch1 + channel 2, Music_FourIsland_Ch2 + channel 3, Music_FourIsland_Ch3 + channel 4, Music_FourIsland_Ch4 + +Music_FourIsland_Ch1: + tempo 149 + volume 7, 7 + pitch_offset 1 + duty_cycle 3 +.mainloop: + note_type 12, 11, 3 + sound_call .sub1 + note A_, 8 + note B_, 8 + sound_call .sub1 + note F#, 8 + note D#, 8 + octave 2 + note B_, 4 + octave 3 + note D#, 4 + note F#, 4 + note B_, 4 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 10 + octave 2 + note B_, 4 + octave 3 + note C#, 4 + note D#, 4 + note F#, 4 + note F#, 2 + note G#, 2 + note F#, 2 + note E_, 10 + volume_envelope 10, 6 + note A_, 8 + note G#, 8 + note F#, 8 + note E_, 8 + volume_envelope 10, 3 + note D#, 6 + note C#, 6 + note F#, 4 + note B_, 6 + octave 4 + note C#, 6 + note D#, 4 + sound_jump .mainloop + +.sub1: + rest 4 + octave 3 + note E_, 4 + note G#, 12 + note C#, 4 + note E_, 4 + note C#, 4 + note A_, 8 + note G#, 8 + note A_, 8 + octave 4 + note C#, 8 + octave 3 + note E_, 8 + note G#, 4 + note E_, 2 + note D#, 2 + note C#, 8 + note B_, 4 + note A_, 2 + note G#, 2 + note A_, 8 + note G#, 8 + sound_ret + +Music_FourIsland_Ch2: + duty_cycle 3 +.mainloop: + sound_call .sub1 + note E_, 2 + rest 2 + note F#, 10 + sound_call .sub1 + octave 2 + note B_, 2 + rest 2 + octave 3 + note B_, 10 + duty_cycle 2 + vibrato 0, 0, 0 + volume_envelope 10, 5 + note F#, 2 + note E_, 2 + note D#, 2 + note B_, 4 + note A_, 4 + note G#, 2 + note F#, 2 + note G#, 2 + note F#, 2 + note E_, 10 + note F#, 2 + note E_, 2 + note D#, 2 + note F#, 4 + note B_, 4 + octave 4 + note D#, 2 + note D#, 2 + note E_, 2 + note D#, 2 + octave 3 + note G#, 10 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 4 + note F#, 4 + note E_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 4 + octave 4 + note C#, 4 + note D#, 2 + octave 3 + note B_, 16 + duty_cycle 3 + volume_envelope 10, 3 + note D#, 6 + note E_, 6 + note F#, 4 + sound_jump .mainloop + +.sub1: + vibrato 7, 2, 2 + note_type 12, 12, 5 + octave 4 + note E_, 2 + octave 3 + note B_, 2 + octave 4 + note D#, 2 + note E_, 4 + note F#, 4 + note G#, 2 + note B_, 6 + note G#, 4 + note F#, 4 + note G#, 2 + note E_, 12 + vibrato 0, 0, 0 + volume_envelope 11, 4 + octave 3 + note E_, 4 + note C#, 8 + note E_, 8 + vibrato 7, 2, 2 + volume_envelope 12, 5 + octave 4 + note A_, 8 + vibrato 0, 0, 0 + volume_envelope 11, 4 + octave 3 + note C#, 4 + vibrato 7, 2, 2 + volume_envelope 12, 5 + octave 4 + note G#, 2 + note F#, 2 + note E_, 8 + vibrato 0, 0, 0 + volume_envelope 11, 4 + octave 3 + note E_, 4 + vibrato 7, 2, 2 + volume_envelope 12, 5 + octave 4 + note D#, 2 + note E_, 2 + note F#, 16 + volume_envelope 11, 4 + octave 3 + note D#, 2 + sound_ret + +Music_FourIsland_Ch3: + note_type 12, 1, 0 +.mainloop: + sound_call .sub1 + sound_call .sub1 + sound_call .sub3 +.loop1: + note G#, 1 + rest 1 + note B_, 1 + rest 1 + sound_loop 4, .loop1 + sound_call .sub3 +.loop2: + octave 4 + note G#, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + sound_loop 4, .loop2 +.loop3: + octave 4 + note A_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + sound_loop 7, .loop3 + octave 4 + note A#, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + sound_call .sub2 + sound_jump .mainloop + +.sub1: + octave 4 + note G#, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + sound_loop 4, .sub1 + octave 4 +.sub1loop1: + note G#, 1 + rest 1 + note B_, 1 + rest 1 + sound_loop 3, .sub1loop1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 +.sub1loop2: + note A_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note B_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + note A_, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + sound_loop 2, .sub1loop2 +.sub2: + octave 4 + note B_, 1 + rest 1 + octave 5 + note D#, 1 + rest 1 + sound_loop 5, .sub2 + note F#, 1 + rest 1 + note D#, 1 + rest 1 + note A_, 1 + rest 1 + note D#, 1 + rest 1 + octave 4 + note B_, 1 + rest 1 + octave 5 + note D#, 1 + rest 1 + sound_ret + +.sub3: + octave 4 + note A_, 1 + rest 1 + octave 5 + note D#, 1 + rest 1 + sound_loop 4, .sub3 + octave 4 + sound_ret + +Music_FourIsland_Ch4: + toggle_noise 0 + drum_speed 12 +.mainloop: + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 + drum_note 6, 6 + drum_note 6, 4 + drum_note 6, 2 + drum_note 7, 2 + drum_note 6, 2 + sound_jump .mainloop diff --git a/audio/music/sevii.asm b/audio/music/sevii.asm new file mode 100644 index 0000000..6fcad8d --- /dev/null +++ b/audio/music/sevii.asm @@ -0,0 +1,318 @@ +; By TempoQuill, From https://github.com/TempoQuill/PokeGoldG1/blob/main/audio/music/lakeofrage.asm +Music_Sevii: + channel_count 4 + channel 1, Music_Sevii_Ch1 + channel 2, Music_Sevii_Ch2 + channel 3, Music_Sevii_Ch3 + channel 4, Music_Sevii_Ch4 + +Music_Sevii_Ch1: + tempo 154 + volume 7, 7 + duty_cycle 2 + pitch_offset 1 + vibrato 8, 3, 2 + note_type 12, 10, 7 + octave 3 +.mainloop: + sound_call .sub1 + note F_, 8 + note F_, 4 + note E_, 4 + note D_, 8 + note A#, 4 + octave 4 + note D_, 4 + sound_call .sub1 + note A_, 8 + note F_, 4 + note E_, 4 + note D_, 8 + note A#, 4 + octave 4 + note D_, 4 + octave 3 + note A#, 4 + note A_, 4 + note G_, 4 + note F_, 4 + note E_, 4 + note F_, 4 + note E_, 2 + note F_, 2 + note E_, 2 + note C_, 2 + octave 2 + note A#, 8 + octave 3 + note D_, 8 + note F_, 8 + note A#, 4 + note F_, 4 + note G_, 6 + note A_, 6 + note G_, 4 + note E_, 6 + octave 4 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + octave 3 + note A#, 2 + sound_jump .mainloop + +.sub1: + octave 3 + note A_, 6 + note A_, 1 + note A#, 1 + octave 4 + note C_, 8 + note C_, 6 + note D_, 1 + note E_, 1 + note C_, 4 + octave 3 + note A#, 4 + sound_ret + +Music_Sevii_Ch2: + duty_cycle 3 + vibrato 20, 2, 4 +.mainloop: + note_type 12, 13, 0 + octave 3 + note F_, 8 + volume_envelope 13, 7 + note F_, 8 + volume_envelope 13, 0 + note G_, 8 + volume_envelope 13, 7 + note G_, 8 + volume_envelope 13, 0 + octave 4 + note C_, 8 + note_type 8, 13, 7 + note C_, 4 + octave 3 + note G_, 4 + octave 4 + note C_, 4 + volume_envelope 13, 0 + note G_, 12 + volume_envelope 13, 7 + note G_, 4 + note A#, 4 + note A_, 4 + note_type 12, 13, 0 + note F_, 8 + volume_envelope 13, 7 + note F_, 4 + note A_, 4 + note G_, 3 + note F_, 1 + note E_, 12 + note_type 8, 13, 7 + octave 3 + note F_, 4 + note E_, 4 + note D_, 4 + note_type 12, 13, 7 + note D_, 8 + note F_, 2 + note A#, 1 + octave 4 + note D_, 1 + note F_, 1 + rest 1 + note D_, 1 + note F_, 1 + note A#, 8 + octave 3 + note C_, 2 + octave 4 + note G_, 4 + note F_, 4 + note E_, 4 + note D_, 2 + note_type 8, 13, 7 + note C_, 4 + note D_, 4 + note E_, 4 + note G_, 12 + octave 3 + note F_, 4 + note E_, 4 + note D_, 4 + note A#, 4 + note A_, 4 + note G_, 4 + octave 4 + note D_, 4 + note C_, 4 + octave 3 + note A#, 4 + octave 4 + note F_, 4 + note E_, 4 + note D_, 4 + note_type 12, 13, 0 + note E_, 8 + volume_envelope 13, 7 + note E_, 6 + note E_, 1 + note F_, 1 + volume_envelope 13, 0 + note G_, 8 + volume_envelope 13, 7 + note G_, 8 + sound_jump .mainloop + +Music_Sevii_Ch3: + note_type 12, 1, 4 +.mainloop: + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 +.loop1: + octave 3 + note A#, 1 + rest 1 + octave 4 + note D_, 1 + rest 1 + note F_, 1 + rest 1 + octave 3 + note A#, 1 + rest 1 + octave 4 + note F_, 1 + rest 1 + note A#, 1 + rest 1 + note F_, 1 + rest 1 + note D_, 1 + rest 1 + sound_loop 2, .loop1 + sound_call .sub2 + sound_jump .mainloop + +.sub1: + octave 3 + note F_, 1 + rest 1 + octave 4 + note C_, 1 + rest 1 + note F_, 1 + rest 1 + sound_loop 2, .sub1 + rest 2 + note F_, 1 + note C_, 1 +.sub1loop1: + octave 3 + note E_, 1 + rest 1 + octave 4 + note C_, 1 + rest 1 + note G_, 1 + rest 1 + sound_loop 2, .sub1loop1 + octave 3 + note E_, 1 + rest 1 + octave 4 + note C_, 1 + rest 1 + octave 3 + note D_, 1 + rest 1 + octave 4 + note D_, 1 + rest 1 + note A_, 1 + rest 1 + octave 3 + note F_, 1 + rest 1 + octave 4 + note D_, 1 + rest 1 + note A_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note F_, 1 + rest 1 +.sub1loop2: + octave 3 + note A#, 1 + rest 1 + octave 4 + note F_, 1 + rest 1 + note A#, 1 + rest 1 + sound_loop 2, .sub1loop2 + note A_, 1 + rest 1 + note G_, 1 + rest 1 + sound_ret + +.sub2: + octave 4 + note C_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 1 + rest 1 + note C_, 1 + rest 1 + note G_, 1 + rest 1 + octave 5 + note C_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + note G_, 1 + rest 1 + sound_loop 2, .sub2 + sound_ret + +Music_Sevii_Ch4: + toggle_noise 0 + drum_speed 6 +.mainloop: + sound_call .sub1 + drum_note 6, 4 + drum_note 4, 4 + sound_call .sub1 + drum_note 7, 4 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 2, 1 + sound_jump .mainloop + +.sub1: + drum_note 2, 4 + drum_note 4, 2 + drum_note 4, 2 + drum_note 2, 4 + drum_note 4, 2 + drum_note 4, 2 + drum_note 2, 2 + drum_note 4, 2 + drum_note 2, 4 + sound_ret diff --git a/audio/music_pointers.asm b/audio/music_pointers.asm index ea69d68..26debff 100644 --- a/audio/music_pointers.asm +++ b/audio/music_pointers.asm @@ -128,4 +128,6 @@ Music: dba Music_AlphalithBattle dba Music_FortunaSF dba Music_JasperForest + dba Music_Sevii + dba Music_FourIsland assert_table_length NUM_MUSIC_SONGS diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 82c300e..013969b 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -126,6 +126,8 @@ const MUSIC_ALPHALITHBATTLE ; 79 const MUSIC_FORTUNASF ; 7a const MUSIC_JASPERFOREST ; 7b + const MUSIC_SEVII ; 7c + const MUSIC_FOURISLAND ; 7d (We're coming up on $80, there's a fix in the pokecrystal design flaws section but that and above may be buggy) DEF NUM_MUSIC_SONGS EQU const_value ; GetMapMusic picks music for this value (see home/map.asm) diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 7ba75c9..72290d6 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -624,48 +624,48 @@ MapGroup_Citrine: ; 27 MapGroup_OneIsland: ; 28 table_width MAP_LENGTH, MapGroup_OneIsland - map FarawayIslandOutside, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map FarawayIslandInside, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, TRUE, PALETTE_AUTO, FISHGROUP_SHORE - map OneIsland, TILESET_SEVII, TOWN, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map TreasureBeach, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map KindleRoad, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map MtEmberExterior, TILESET_SEVII, TOWN, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, TRUE, PALETTE_AUTO, FISHGROUP_SHORE - map MtEmberInterior, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map MtEmberSummit, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, TRUE, PALETTE_AUTO, FISHGROUP_SHORE - map MtEmberHiddenPath, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_LAKE_OF_RAGE, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map FarawayIslandOutside, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map FarawayIslandInside, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, TRUE, PALETTE_AUTO, FISHGROUP_SHORE + map OneIsland, TILESET_SEVII, TOWN, LANDMARK_ONE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map TreasureBeach, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map KindleRoad, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map MtEmberExterior, TILESET_SEVII, TOWN, LANDMARK_ONE_ISLAND, MUSIC_SEVII, TRUE, PALETTE_AUTO, FISHGROUP_SHORE + map MtEmberInterior, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map MtEmberSummit, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, TRUE, PALETTE_AUTO, FISHGROUP_SHORE + map MtEmberHiddenPath, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_SEVII, TRUE, PALETTE_DAY, FISHGROUP_SHORE assert_table_length NUM_ONE_ISLAND_MAPS MapGroup_TwoIsland: ; 29 table_width MAP_LENGTH, MapGroup_TwoIsland - map TwoIsland, TILESET_SEVII, TOWN, LANDMARK_TWO_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map CapeBrink, TILESET_SEVII, ROUTE, LANDMARK_TWO_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map TwoIsland, TILESET_SEVII, TOWN, LANDMARK_TWO_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map CapeBrink, TILESET_SEVII, ROUTE, LANDMARK_TWO_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE assert_table_length NUM_TWO_ISLAND_MAPS MapGroup_ThreeIsland: ; 30 table_width MAP_LENGTH, MapGroup_ThreeIsland - map ThreeIslandPort, TILESET_SEVII, TOWN, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map ThreeIsland, TILESET_SEVII, TOWN, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map BondBridge, TILESET_SEVII, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map ThreeIslandPort, TILESET_SEVII, TOWN, LANDMARK_THREE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map ThreeIsland, TILESET_SEVII, TOWN, LANDMARK_THREE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map BondBridge, TILESET_SEVII, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map BerryForest, TILESET_FOREST_KANTO, FOREST, LANDMARK_THREE_ISLAND, MUSIC_ROUTE_3, TRUE, PALETTE_AUTO, FISHGROUP_POND assert_table_length NUM_THREE_ISLAND_MAPS MapGroup_FourIsland: ; 31 table_width MAP_LENGTH, MapGroup_FourIsland - map FourIsland, TILESET_SEVII, TOWN, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map IcefallCaveEntrance, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map IcefallCave1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map IcefallCaveB1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map IcefallCaveBack, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map FourIsland, TILESET_SEVII, TOWN, LANDMARK_FOUR_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map IcefallCaveEntrance, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_FOURISLAND, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map IcefallCave1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_FOURISLAND, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map IcefallCaveB1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_FOURISLAND, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map IcefallCaveBack, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_FOURISLAND, TRUE, PALETTE_DAY, FISHGROUP_SHORE assert_table_length NUM_FOUR_ISLAND_MAPS MapGroup_FiveIsland: ; 32 table_width MAP_LENGTH, MapGroup_FiveIsland - map FiveIsland, TILESET_CAVE, TOWN, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map FiveIslandMeadow, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map MemorialPillar, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map WaterLabyrinth, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map ResortGorgeous, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map LostCave, TILESET_CAVE, CAVE, LANDMARK_FIVE_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map FiveIsland, TILESET_CAVE, TOWN, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map FiveIslandMeadow, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map MemorialPillar, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map WaterLabyrinth, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map ResortGorgeous, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map LostCave, TILESET_CAVE, CAVE, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, TRUE, PALETTE_DAY, FISHGROUP_SHORE assert_table_length NUM_FIVE_ISLAND_MAPS MapGroup_SixIsland: ; 33 From 5e81a6ce3a803e9a675f1eeb3469c101a7b25ee7 Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Thu, 7 Aug 2025 21:09:10 -0400 Subject: [PATCH 03/15] Music Bugfix from the Pokecrystal docs --- constants/music_constants.asm | 9 ++++----- data/maps/maps.asm | 10 +++++----- home/map.asm | 10 +++------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 013969b..5163956 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -130,13 +130,12 @@ const MUSIC_FOURISLAND ; 7d (We're coming up on $80, there's a fix in the pokecrystal design flaws section but that and above may be buggy) DEF NUM_MUSIC_SONGS EQU const_value -; GetMapMusic picks music for this value (see home/map.asm) -DEF MUSIC_MAHOGANY_MART EQU $64 +; GetMapMusic picks music for these values (see home/map.asm) +DEF MUSIC_MAHOGANY_MART EQU $fc +DEF MUSIC_RADIO_TOWER EQU $fd ; ExitPokegearRadio_HandleMusic uses these values DEF RESTART_MAP_MUSIC EQU $fe DEF ENTER_MAP_MUSIC EQU $ff -; GetMapMusic picks music for this bit flag -DEF RADIO_TOWER_MUSIC_F EQU 7 -DEF RADIO_TOWER_MUSIC EQU 1 << RADIO_TOWER_MUSIC_F +assert NUM_MUSIC_SONGS <= MUSIC_MAHOGANY_MART, "song IDs overlap special values" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 72290d6..b0ac3f2 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -110,11 +110,11 @@ MapGroup_Dungeons: map BurnedTowerB1F, TILESET_CAVE, CAVE, LANDMARK_BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE map NationalPark, TILESET_PARK, ROUTE, LANDMARK_NATIONAL_PARK, MUSIC_NATIONAL_PARK, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map NationalParkBugContest, TILESET_PARK, ROUTE, LANDMARK_NATIONAL_PARK, MUSIC_BUG_CATCHING_CONTEST, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map RadioTower1F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map RadioTower2F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map RadioTower3F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map RadioTower4F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map RadioTower5F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map RadioTower1F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, MUSIC_RADIO_TOWER, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map RadioTower2F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, MUSIC_RADIO_TOWER, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map RadioTower3F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, MUSIC_RADIO_TOWER, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map RadioTower4F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, MUSIC_RADIO_TOWER, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map RadioTower5F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_RADIO_TOWER, MUSIC_RADIO_TOWER, TRUE, PALETTE_DAY, FISHGROUP_SHORE map RuinsOfAlphOutside, TILESET_JOHTO, ROUTE, LANDMARK_RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_POND map RuinsOfAlphHoOhChamber, TILESET_RUINS_OF_ALPH, DUNGEON, LANDMARK_RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE map RuinsOfAlphKabutoChamber, TILESET_RUINS_OF_ALPH, DUNGEON, LANDMARK_RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE diff --git a/home/map.asm b/home/map.asm index 08a9767..83d0f41 100644 --- a/home/map.asm +++ b/home/map.asm @@ -2192,8 +2192,8 @@ GetMapMusic:: ld a, c cp MUSIC_MAHOGANY_MART jr z, .mahoganymart - bit RADIO_TOWER_MUSIC_F, c - jr nz, .radiotower + cp MUSIC_RADIO_TOWER + jr z, .radiotower farcall Function8b342 ld e, c ld d, 0 @@ -2210,11 +2210,7 @@ GetMapMusic:: jr .done .clearedradiotower - ; the rest of the byte - ld a, c - and RADIO_TOWER_MUSIC - 1 - ld e, a - ld d, 0 + ld de, MUSIC_GOLDENROD_CITY jr .done .mahoganymart From 5b4eb17c1e80161930ead7956ccdfe6f506d423c Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Thu, 7 Aug 2025 23:13:20 -0400 Subject: [PATCH 04/15] Five + Six island maps with another RBY style remix --- README.md | 2 +- audio.asm | 1 + audio/music/SixIsland.asm | 577 ++++++++++++++++++++++++++++++++++ audio/music_pointers.asm | 1 + constants/map_constants.asm | 4 +- constants/music_constants.asm | 3 +- data/maps/maps.asm | 14 +- maps/DebugRoom.asm | 2 +- maps/FiveIsland.ablk | Bin 100 -> 90 bytes maps/FiveIsland.asm | 3 +- maps/SixIsland.ablk | Bin 100 -> 180 bytes maps/SixIsland.asm | 4 +- 12 files changed, 597 insertions(+), 14 deletions(-) create mode 100644 audio/music/SixIsland.asm diff --git a/README.md b/README.md index 2748e57..5941dd2 100644 --- a/README.md +++ b/README.md @@ -174,7 +174,7 @@ JEP-affiliated musicians require music to be used with direct credit for non-com ### Unaffiliated - FroggestSpirit: HGSS Poke Mart Demix -- TempoQuill: Gen 1 Style Remixes of Lake of Rage and Azalea Town (used in the Sevii Islands) +- TempoQuill: Gen 1 Style Remixes of Lake of Rage Azalea Town, and Violet City (used in the Sevii Islands) ## Other Sources - Nob Ogasawara (Many prototype Pokemon names) diff --git a/audio.asm b/audio.asm index a516f29..d7c950e 100644 --- a/audio.asm +++ b/audio.asm @@ -178,6 +178,7 @@ INCLUDE "audio/music/FortunaSF.asm" INCLUDE "audio/music/JasperForest.asm" INCLUDE "audio/music/sevii.asm" INCLUDE "audio/music/FourIsland.asm" +INCLUDE "audio/music/SixIsland.asm" SECTION "Sound Effects", ROMX diff --git a/audio/music/SixIsland.asm b/audio/music/SixIsland.asm new file mode 100644 index 0000000..bfe881f --- /dev/null +++ b/audio/music/SixIsland.asm @@ -0,0 +1,577 @@ +; By TempoQuill, from https://github.com/TempoQuill/PokeGoldG1/blob/main/audio/music/violet.asm +; Minor tweaks by Zeta_Null to fix desync and one wrong note +Music_SixIsland: + channel_count 4 + channel 1, Music_SixIsland_Ch1 + channel 2, Music_SixIsland_Ch2 + channel 3, Music_SixIsland_Ch3 + channel 4, Music_SixIsland_Ch4 + +Music_SixIsland_Ch1: + tempo 156 + volume 7, 7 + vibrato 4, 3, 1 + pitch_offset 1 + duty_cycle 1 + note_type 12, 6, 4 + octave 2 + note B_, 2 + octave 3 + note G#, 4 + volume_envelope 10, 3 + note B_, 10 + volume_envelope 6, 4 + octave 2 + note B_, 2 + octave 3 + note F#, 4 + volume_envelope 10, 3 + note F#, 4 + note E_, 2 + note F#, 2 + note D#, 2 + volume_envelope 6, 4 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note D#, 2 + volume_envelope 10, 3 + note B_, 10 + volume_envelope 6, 4 + note B_, 4 + note B_, 2 + volume_envelope 10, 5 + note B_, 6 + note A#, 4 +.mainloop: + note B_, 2 + octave 2 + note B_, 4 + octave 3 + note D#, 4 + octave 2 + note B_, 2 + octave 3 + note F#, 4 + note C#, 2 + note G#, 4 + note B_, 4 + note G#, 4 + note E_, 1 + note F#, 1 + octave 2 + note A#, 2 + octave 3 + note G#, 4 + note A#, 2 + note G#, 2 + note F#, 4 + note G#, 1 + note A#, 1 + octave 2 + note B_, 2 + octave 3 + note D#, 4 + note F#, 4 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 1 + note E_, 1 + note F#, 2 + octave 2 + note B_, 4 + octave 3 + note C#, 4 + note D#, 4 + note F#, 2 + note B_, 4 + note A#, 4 + note G#, 4 + note E_, 2 + note F#, 2 + octave 2 + note B_, 4 + octave 3 + note G#, 4 + note F#, 4 + note E_, 4 + note D#, 6 + note E_, 6 + note F#, 4 + sound_call .sub1 + note E_, 4 + sound_call .sub1 + note E_, 2 + note B_, 1 + octave 4 + note C#, 1 + note D_, 2 + octave 3 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note A_, 2 + octave 4 + note D#, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note E_, 2 + note B_, 4 + note G#, 4 + note F#, 2 + note E_, 2 + note F#, 2 + note C#, 4 + note D#, 4 + note E_, 4 + note F#, 4 + sound_jump .mainloop + +.sub1: + note G_, 2 + note D_, 4 + octave 4 + note D_, 2 + note C#, 2 + octave 3 + note E_, 6 + note F#, 6 + note A_, 6 + sound_ret + +Music_SixIsland_Ch2: + duty_cycle 3 + vibrato 11, 2, 2 + note_type 12, 10, 2 + octave 3 + note G#, 2 + note A#, 2 + note B_, 2 + volume_envelope 13, 3 + octave 4 + note D#, 4 + volume_envelope 10, 2 + note C#, 2 + octave 3 + note A#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A#, 2 + volume_envelope 13, 3 + octave 4 + note C#, 4 + volume_envelope 10, 2 + octave 3 + note B_, 2 + note A#, 2 + note B_, 2 + note G#, 2 + note A#, 2 + note B_, 2 + volume_envelope 13, 3 + note G#, 4 + volume_envelope 10, 2 + note A#, 2 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + octave 3 + note F#, 2 + octave 4 + note D#, 2 + volume_envelope 13, 6 + note C#, 8 +.mainloop: + volume_envelope 13, 4 + octave 4 + note D#, 1 + note E_, 1 + note F#, 6 + note F#, 1 + note G#, 1 + note F#, 2 + note E_, 2 + note D#, 2 + note F#, 2 + volume_envelope 13, 5 + note E_, 14 + volume_envelope 13, 4 + note C#, 1 + note D#, 1 + note E_, 6 + note E_, 1 + note F#, 1 + note E_, 2 + note D#, 2 + note C#, 2 + note E_, 2 + volume_envelope 13, 5 + note D#, 14 + volume_envelope 13, 4 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + note D#, 6 + note D#, 1 + note E_, 1 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 4 + note G#, 4 + note B_, 6 + note C#, 1 + note D#, 1 + note E_, 2 + octave 3 + note G#, 2 + note B_, 2 + octave 4 + note E_, 2 + note D#, 4 + note C#, 4 + volume_envelope 13, 7 + octave 3 + note B_, 16 + duty_cycle 2 + sound_call .sub1 + note D_, 6 + duty_cycle 1 + sound_call .sub1 + note F#, 4 + note D_, 1 + note E_, 1 + note F#, 14 + note D_, 1 + note E_, 1 + note F#, 12 + octave 3 + note D#, 4 + octave 4 + note C#, 12 + octave 3 + note B_, 4 + note A#, 14 + duty_cycle 3 + sound_jump .mainloop + +.sub1: + rest 2 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + note D_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note F#, 2 + note A_, 2 + octave 4 + note E_, 4 + sound_ret + +Music_SixIsland_Ch3: + note_type 12, 1, 1 + rest 6 + octave 4 + note E_, 4 + rest 12 + note D#, 4 + rest 10 + octave 3 + note G#, 2 + octave 4 + note D#, 4 + note F#, 2 + rest 2 + note G#, 2 + note F#, 2 + note D#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + rest 2 +.mainloop: + octave 3 + note F#, 1 + rest 1 + note A#, 1 + rest 1 + octave 4 + note C#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 3 + note B_, 1 + rest 3 + octave 5 + note D#, 1 + rest 1 + octave 4 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + note E_, 1 + rest 1 + note C#, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + octave 3 + note F#, 1 + rest 1 + octave 4 + note C#, 1 + rest 3 + note F#, 1 + rest 3 + note A#, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note A#, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + note A#, 1 + rest 1 + note F#, 1 + rest 1 + note D#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 3 + note A#, 1 + rest 3 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note D#, 1 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + note E_, 1 + octave 5 + note E_, 1 + rest 3 + octave 3 + note B_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note A#, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 3 + note G#, 1 + rest 3 + note A#, 1 + rest 1 + note B_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 +.loop1: + octave 4 + note D_, 1 + rest 1 + note G_, 1 + rest 3 + note G_, 1 + rest 1 + note A_, 1 + rest 3 + note E_, 1 + rest 1 + note A_, 1 + rest 1 + octave 5 + note D_, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + note F#, 1 + rest 1 + note D_, 1 + rest 1 + note B_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 1 + rest 1 + note F#, 1 + rest 1 + sound_loop 2, .loop1 + note A_, 1 + rest 1 + octave 5 + note D_, 1 + rest 3 + note D_, 1 + rest 3 + octave 4 + note A_, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + rest 1 + octave 5 + note D#, 1 + rest 3 + note D#, 1 + rest 3 + octave 4 + note A_, 1 + rest 1 + note B_, 1 + rest 1 + note D#, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note G#, 1 + rest 1 + note F#, 1 + rest 1 + note A#, 1 + rest 1 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note C#, 1 + rest 1 + sound_jump .mainloop + +Music_SixIsland_Ch4: + toggle_noise 1 + drum_speed 12 +.loop1: + drum_note 5, 2 + drum_note 5, 4 + drum_note 6, 10 + drum_note 5, 2 + drum_note 5, 4 + drum_note 6, 6 + drum_note 5, 4 + sound_loop 2, .loop1 +.mainloop: + drum_note 10, 6 + drum_note 12, 4 + drum_note 12, 2 + drum_note 6, 4 + drum_note 10, 2 + drum_note 12, 4 + drum_note 12, 4 + drum_note 6, 2 + drum_note 12, 4 + sound_loop 7, .mainloop + drum_note 10, 6 + drum_note 12, 4 + drum_note 12, 2 + drum_note 6, 4 + drum_note 12, 2 + drum_note 10, 4 + drum_note 6, 6 + drum_note 12, 4 + sound_jump .mainloop diff --git a/audio/music_pointers.asm b/audio/music_pointers.asm index 26debff..5dc3f66 100644 --- a/audio/music_pointers.asm +++ b/audio/music_pointers.asm @@ -130,4 +130,5 @@ Music: dba Music_JasperForest dba Music_Sevii dba Music_FourIsland + dba Music_SixIsland assert_table_length NUM_MUSIC_SONGS diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 6d32821..185b5f9 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -598,7 +598,7 @@ ENDM endgroup newgroup FIVE_ISLAND ; 32 - map_const FIVE_ISLAND, 10, 10 ; 1 + map_const FIVE_ISLAND, 10, 9 ; 1 map_const FIVE_ISLAND_MEADOW, 10, 10 ; 2 map_const MEMORIAL_PILLAR, 10, 10 ; 3 map_const WATER_LABYRINTH, 10, 10 ; 4 @@ -607,7 +607,7 @@ ENDM endgroup newgroup SIX_ISLAND ; 33 - map_const SIX_ISLAND, 10, 10 ; 1 + map_const SIX_ISLAND, 10, 18 ; 1 map_const WATER_PATH, 10, 10 ; 2 map_const RUIN_VALLEY, 10, 10 ; 3 map_const DOTTED_HOLE, 10, 10 ; 4 diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 5163956..7c46e46 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -127,7 +127,8 @@ const MUSIC_FORTUNASF ; 7a const MUSIC_JASPERFOREST ; 7b const MUSIC_SEVII ; 7c - const MUSIC_FOURISLAND ; 7d (We're coming up on $80, there's a fix in the pokecrystal design flaws section but that and above may be buggy) + const MUSIC_FOURISLAND ; 7d + const MUSIC_SIXISLAND ; 7e DEF NUM_MUSIC_SONGS EQU const_value ; GetMapMusic picks music for these values (see home/map.asm) diff --git a/data/maps/maps.asm b/data/maps/maps.asm index b0ac3f2..04f1c1e 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -660,17 +660,17 @@ MapGroup_FourIsland: ; 31 MapGroup_FiveIsland: ; 32 table_width MAP_LENGTH, MapGroup_FiveIsland - map FiveIsland, TILESET_CAVE, TOWN, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map FiveIslandMeadow, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map MemorialPillar, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map WaterLabyrinth, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map ResortGorgeous, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map FiveIsland, TILESET_SEVII, TOWN, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map FiveIslandMeadow, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map MemorialPillar, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map WaterLabyrinth, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map ResortGorgeous, TILESET_CAVE, ROUTE, LANDMARK_FIVE_ISLAND, MUSIC_SEVII, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map LostCave, TILESET_CAVE, CAVE, LANDMARK_FIVE_ISLAND, MUSIC_FOURISLAND, TRUE, PALETTE_DAY, FISHGROUP_SHORE assert_table_length NUM_FIVE_ISLAND_MAPS MapGroup_SixIsland: ; 33 table_width MAP_LENGTH, MapGroup_SixIsland - map SixIsland, TILESET_CAVE, TOWN, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map SixIsland, TILESET_SEVII, TOWN, LANDMARK_SIX_ISLAND, MUSIC_SIXISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map WaterPath, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map RuinValley, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map DottedHole, TILESET_CAVE, CAVE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE @@ -682,7 +682,7 @@ MapGroup_SixIsland: ; 33 MapGroup_SevenIsland: ; 34 table_width MAP_LENGTH, MapGroup_SevenIsland - map SevenIsland, TILESET_CAVE, TOWN, LANDMARK_SEVEN_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map SevenIsland, TILESET_CAVE, TOWN, LANDMARK_SEVEN_ISLAND, MUSIC_SIXISLAND, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map CanyonEntrance, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map SevaultCanyon, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map TanobyRuins, TILESET_CAVE, ROUTE, LANDMARK_SIX_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index 7f8daa2..ba1371f 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -418,7 +418,7 @@ DebugRoom_MapEvents: warp_event 35, 17, SUNGLOW_CITY, 1 ; east warp warp_event 5, 35, LAVENDER_TOWN, 1 ; southwest warp warp_event 19, 34, KANTO_SAFARI_ZONE_CENTER, 1 ; southern warp - warp_event 33, 33, FOUR_ISLAND, 1 ; southeast warp + warp_event 33, 33, SIX_ISLAND, 1 ; southeast warp warp_event 5, 3, HAUNTED_HOUSE_FOYER, 1 warp_event 34, 11, WINNERS_PATH, 3 diff --git a/maps/FiveIsland.ablk b/maps/FiveIsland.ablk index eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7..5b99785ca8209c4e8b1a360919acda0854ce7e96 100644 GIT binary patch literal 90 zcmY#pVp3#c%8>_BmKt%zB?X1d%*vJ;G2zjS=EWsIF%69vAt51gMPmaX69kl*j9E-r fKtNfMiHDbuiAhI8NtuV2uhfAnM3PlcQ%k$l){#q8M_)%r-xw$@%A}~QsLW&ulm-Ao<{Oa! literal 100 LcmZQzpgjNp0Av6G diff --git a/maps/SixIsland.asm b/maps/SixIsland.asm index ed8eed0..fa9061b 100644 --- a/maps/SixIsland.asm +++ b/maps/SixIsland.asm @@ -14,7 +14,9 @@ SixIsland_MapEvents: db 0, 0 ; filler def_warp_events - + warp_event 6, 27, DEBUG_ROOM, 1 + warp_event 7, 27, DEBUG_ROOM, 1 + def_coord_events def_bg_events From 9141282b6b22a1047f63cb097ee2a9f91d653ce8 Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Thu, 7 Aug 2025 23:20:14 -0400 Subject: [PATCH 05/15] grammar fix because i forgot a comma lol --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5941dd2..1bb9a57 100644 --- a/README.md +++ b/README.md @@ -174,7 +174,7 @@ JEP-affiliated musicians require music to be used with direct credit for non-com ### Unaffiliated - FroggestSpirit: HGSS Poke Mart Demix -- TempoQuill: Gen 1 Style Remixes of Lake of Rage Azalea Town, and Violet City (used in the Sevii Islands) +- TempoQuill: Gen 1 Style Remixes of Lake of Rage, Azalea Town, and Violet City (used in the Sevii Islands) ## Other Sources - Nob Ogasawara (Many prototype Pokemon names) From ced3fb276d43e3ac0c6c8f78014b79a3f6001941 Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Fri, 8 Aug 2025 13:47:26 -0400 Subject: [PATCH 06/15] Soldier graphics update --- gfx/trainers/soldier.png | Bin 590 -> 1852 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gfx/trainers/soldier.png b/gfx/trainers/soldier.png index 13475f49909112bc490f0c48beb33456bb7637da..0f3f6eee91604710fc3c61dd3d784ffee9b2b45f 100644 GIT binary patch literal 1852 zcmY+Fdpwl+7srRlHf~dGEzuaXgEHpkHe-eu_xrkamofJ+GtAV8$Y^pYQAyNLtn2Q& zZkxi260tO-XorNj-yi4se$M%x=bZDrpYQASP51Y8(**ATgFqln z4|nGPV6|1)HyeRxMT#91Sd@4HZcdhlSG^EH=?(zNy6o z#-b8U_F4I$e7GbUljR;4Lko=a4Wh(FP;gWe2YXF0Ar=o*h@$byu-K?bHV+?5H2SA7 z9?*&~(#W0=L#5*boL#?W03OkZ$>($NNTfg@un=G^I57+)8i&InQ5Yl!g8(uRypwD` zITpd@8GkL{Oyf~vSX@4f!-gpelEXR2`9!1R$5~W7olLh1r&6sD;bbfofksow2r?Cm zMo_U>s*M%e7DGpe8+~ohXVL%LpUwM<0RVzj>>$w=D8RlS%td{NR(hxk)xjJ{yry!J*6SNmsO%^w517T%o!HsriC@fLe8sk~D(%~*Tr~EYz6>oRj-eFGxle<^40W z&vxrIW*=)I4H1$v_qJm-7~_y=L(!n5`>=K0o%LpoE#G7{58hlsCwRk zDjd|;HF%m^S%fQ-QDiwn)5LYHbIKnN>nEqct&M&Agy%?2Zt-=dkTbsuOBaFw4u@vo ztP#xaOc(phm93EEg3*@WY|qElX#45cxFpUQ?&({C-WB+drMDf-SZwrq1lNY{86>KG z*W~f;2G}`mdiB|T&SDuGmFcl5Bk<>^MtE-Y?W6V3Qw;jl_=%;cw52F!Ld{M2lY0Q^ z1l5Xe$|RTA`ErraDQMRzMx4kFNxR<$3U6L?Dm<+9>|)ZodSVOva(r(vA* zFlRGZugq@ukYm{Gqi~AlZIbR5wWL1RKjW-TkEu<7U&~8u)YdDNADdT=wzK;eFF#0# zwTou|c;Ov+%)Lup^qtN&HOhX-?Z^@%v~5!7d%S0>9y{ahSo3h?2Qv3avj->wUR^X-cyQJp+&3}k>r&rFt zWeSsA>d0`}hE`r^-sHn*(E`0pek~}mrgaP66#FcG$LGdFl!ihB`CoUyDvcc=XXR}S z)p;e(<&4$O*1{c)`t^9(hkSJ#Swq3zT}Fii_N61*qNaf!gZYms!uLa0#~WA2?5fXL zAGtZ|esNfEQAO!XG@m}W2zJ`Kj;iabur0aZq$3T5#_;#1|pWohMPN z$D{)lExLX%ErA66xPh)zl}j3qpE5E)_n2z`Y?~B$laY6!yEKsUVSUMMGGkfidz72Y z7jXRBjnUc;Up~8?n`w*~z`{GUFN=Lu04=JJYdC^*;#<%}!v5 zS)P;M-a{rxh^IQFpd~jBX6@7YGXK(LPmT)d$pZA)3R4Kj8TXy--KPhg4iRRo1c$Gg z`odpDOCL&RavzeDmvbEJv7$Bi4XtC4)(+Un^`}w#wB0(e7jijt4*Y{F;|d3yKeeHX z4t@>sgz7)|a8(NhmH86; zQ*D&Y=e!+!wB8g&T*PWg>`v}H_?O0nv6_5Ax^+N&-;xkiSWRrbVXj&J63dvV(|ag2 mRz29USGIW|_4y=XeO(*gS&%fIBH$~oFb@}B=W3_0Ayd4$cIS8Gi!+005s@%Par@01Qw}R7L;)|K6NhQiK2i007?OFb@C#0sTot zK~#9!)t1|q!ypJnk@NrmT&`ZC(fC-~Nmeu2f^a~I{%rtxx#XxoE_6+z6u>Umo`RSK zy#|>CWVLz8i8b7t6h>TCckdSI@ic3_tI%-_soaX(8Yo_ne1G<+P3>HQvS8&jU^phE z=j6{hMNj^+d@*wek`?O>Hf~R%@Png|AdM>=EN)0p180ukQ_2ovwZgEtWS#Sxv{%;F zW)v0F|GDOKXpV|}mZ*is)~I@yHzC=PII}+%I>|?q&`Q)dr96B|`kNzSUU1ba9)fd& z36j}TizTSDr|7w^o~aYFM`y0w_W0NVCss3 z`;8W-lQ~3dE;+#`U!xIbN#L8st}C}5^5p=6XS!SC_;6U7L~=gbeH=dsmJ1o?giqoC O0000 Date: Sun, 10 Aug 2025 16:24:59 -0400 Subject: [PATCH 07/15] Fix attribute map applications and soldier colors --- engine/gfx/cgb_layouts.asm | 9 +++++++++ gfx/trainers/soldier.png | Bin 1852 -> 622 bytes 2 files changed, 9 insertions(+) diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index eda537b..5b80ae3 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -1011,6 +1011,9 @@ INCLUDE "gfx/trainer_card/badges.pal" call LoadHLOBPaletteIntoDE dec b jr nz, .ob_loop + ; Fix Attribute map + call WipeAttrmap + call ApplyAttrmap ret _CGB_TrainerCardKanto: @@ -1170,6 +1173,9 @@ INCLUDE "gfx/trainer_card/kanto_badges.pal" call LoadHLOBPaletteIntoDE dec b jr nz, .ob_loop + ; Fix Attribute map + call WipeAttrmap + call ApplyAttrmap ret _CGB_MoveList: @@ -1303,6 +1309,9 @@ INCLUDE "gfx/pack/pack_nb.pal" call LoadHLOBPaletteIntoDE dec b jr nz, .ob_loop + ; Fix Attribute map + call WipeAttrmap + call ApplyAttrmap ret _CGB_Pokepic: diff --git a/gfx/trainers/soldier.png b/gfx/trainers/soldier.png index 0f3f6eee91604710fc3c61dd3d784ffee9b2b45f..70de71a0281627a9635ccd6c134fcf82cfa4948d 100644 GIT binary patch delta 608 zcmV-m0-yc74(>vn)fqwsYUTHv0G-h)C98;B@nevlcgDdjC7ErH`oG9Y;4m|Vj`vo<}bmd-2SI)$#Xi)yVsZ}SCJ|u@TH$ZpvV(~=U)nJeB&DXoZJNZ~r3*le^ zhp$`KQgM`xkJVo!Empjf9YH- zt+1s;N6PL|dLn|OuP#-BQ5|BHBPo})(i8vWBKrS*@;=#SE_6suzQ7C3L0_+&sU`t z$m4Ur@L72y*+HT1ROjH%cPvVyeLhi!zufDWp3A@QzGhpXcGUqt`5F_Vz{;=48Klx| u-2HjX(B!d{X7hcT84|qzceaS+{@Wj_xeC6hyRaDm0000j-yi4se$M%x=bZDrpYQASP51Y8(**ATgFqln z4|nGPV6|1)HyeRxMT#91Sd@4HZcdhlSG^EH=?(zNy6o z#-b8U_F4I$e7GbUljR;4Lko=a4Wh(FP;gWe2YXF0Ar=o*h@$byu-K?bHV+?5H2SA7 z9?*&~(#W0=L#5*boL#?W03OkZ$>($NNTfg@un=G^I57+)8i&InQ5Yl!g8(uRypwD` zITpd@8GkL{Oyf~vSX@4f!-gpelEXR2`9!1R$5~W7olLh1r&6sD;bbfofksow2r?Cm zMo_U>s*M%e7DGpe8+~ohXVL%LpUwM<0RVzj>>$w=D8RlS%td{NR(hxk)xjJ{yry!J*6SNmsO%^w517T%o!HsriC@fLe8sk~D(%~*Tr~EYz6>oRj-eFGxle<^40W z&vxrIW*=)I4H1$v_qJm-7~_y=L(!n5`>=K0o%LpoE#G7{58hlsCwRk zDjd|;HF%m^S%fQ-QDiwn)5LYHbIKnN>nEqct&M&Agy%?2Zt-=dkTbsuOBaFw4u@vo ztP#xaOc(phm93EEg3*@WY|qElX#45cxFpUQ?&({C-WB+drMDf-SZwrq1lNY{86>KG z*W~f;2G}`mdiB|T&SDuGmFcl5Bk<>^MtE-Y?W6V3Qw;jl_=%;cw52F!Ld{M2lY0Q^ z1l5Xe$|RTA`ErraDQMRzMx4kFNxR<$3U6L?Dm<+9>|)ZodSVOva(r(vA* zFlRGZugq@ukYm{Gqi~AlZIbR5wWL1RKjW-TkEu<7U&~8u)YdDNADdT=wzK;eFF#0# zwTou|c;Ov+%)Lup^qtN&HOhX-?Z^@%v~5!7d%S0>9y{ahSo3h?2Qv3avj->wUR^X-cyQJp+&3}k>r&rFt zWeSsA>d0`}hE`r^-sHn*(E`0pek~}mrgaP66#FcG$LGdFl!ihB`CoUyDvcc=XXR}S z)p;e(<&4$O*1{c)`t^9(hkSJ#Swq3zT}Fii_N61*qNaf!gZYms!uLa0#~WA2?5fXL zAGtZ|esNfEQAO!XG@m}W2zJ`Kj;iabur0aZq$3T5#_;#1|pWohMPN z$D{)lExLX%ErA66xPh)zl}j3qpE5E)_n2z`Y?~B$laY6!yEKsUVSUMMGGkfidz72Y z7jXRBjnUc;Up~8?n`w*~z`{GUFN=Lu04=JJYdC^*;#<%}!v5 zS)P;M-a{rxh^IQFpd~jBX6@7YGXK(LPmT)d$pZA)3R4Kj8TXy--KPhg4iRRo1c$Gg z`odpDOCL&RavzeDmvbEJv7$Bi4XtC4)(+Un^`}w#wB0(e7jijt4*Y{F;|d3yKeeHX z4t@>sgz7)|a8(NhmH86; zQ*D&Y=e!+!wB8g&T*PWg>`v}H_?O0nv6_5Ax^+N&-;xkiSWRrbVXj&J63dvV(|ag2 mRz29USGIW|_4y=XeO(*gS&%fIBH$~oFb@}B=W3_0 Date: Sun, 10 Aug 2025 18:18:28 -0600 Subject: [PATCH 08/15] The Great Trainer Overhaul (Part 1) It begins. Up to Jasmine. --- constants/pokemon_constants.asm | 2 +- data/pokemon/base_stats.asm | 2 +- .../base_stats/{foxfire.asm => zorriego.asm} | 2 +- data/pokemon/cries.asm | 2 +- data/pokemon/dex_entries.asm | 2 +- .../dex_entries/{foxfire.asm => zorriego.asm} | 0 data/pokemon/dex_entry_pointers.asm | 2 +- data/pokemon/dex_order_alpha.asm | 2 +- data/pokemon/dex_order_new.asm | 2 +- data/pokemon/egg_moves_johto.asm | 4 +- data/pokemon/evolution_moves.asm | 2 +- data/pokemon/evos_attacks_johto.asm | 4 +- data/pokemon/first_stages.asm | 2 +- data/pokemon/menu_icons.asm | 2 +- data/pokemon/names.asm | 2 +- data/pokemon/palettes.asm | 4 +- data/pokemon/pic_pointers.asm | 4 +- data/trainers/parties.asm | 774 ++++++++++-------- data/trainers/parties_new_classes.asm | 38 +- data/wild/johto_water.asm | 6 +- data/wild/nihon_grass.asm | 4 +- gfx/footprints/{foxfire.png => zorriego.png} | Bin gfx/footprints_johto.asm | 2 +- gfx/pics.asm | 4 +- gfx/pokemon/anim_pointers.asm | 2 +- gfx/pokemon/anims.asm | 2 +- gfx/pokemon/bitmask_pointers.asm | 2 +- gfx/pokemon/bitmasks.asm | 2 +- gfx/pokemon/frame_pointers.asm | 2 +- gfx/pokemon/idle_pointers.asm | 2 +- gfx/pokemon/idles.asm | 2 +- gfx/pokemon/johto_frames.asm | 2 +- gfx/pokemon/{foxfire => zorriego}/anim.asm | 0 .../{foxfire => zorriego}/anim_idle.asm | 0 gfx/pokemon/{foxfire => zorriego}/back.png | Bin gfx/pokemon/{foxfire => zorriego}/front.png | Bin gfx/pokemon/{foxfire => zorriego}/shiny.pal | 0 37 files changed, 503 insertions(+), 381 deletions(-) rename data/pokemon/base_stats/{foxfire.asm => zorriego.asm} (93%) rename data/pokemon/dex_entries/{foxfire.asm => zorriego.asm} (100%) rename gfx/footprints/{foxfire.png => zorriego.png} (100%) rename gfx/pokemon/{foxfire => zorriego}/anim.asm (100%) rename gfx/pokemon/{foxfire => zorriego}/anim_idle.asm (100%) rename gfx/pokemon/{foxfire => zorriego}/back.png (100%) rename gfx/pokemon/{foxfire => zorriego}/front.png (100%) rename gfx/pokemon/{foxfire => zorriego}/shiny.pal (100%) diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index a3fd2ec..8e26943 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -292,7 +292,7 @@ DEF JOHTO_POKEMON EQU const_value const SUNFLORA ; c0 const HIPPUNK const AERCROW - const FOXFIRE + const ZORRIEGO const YANMA ; c1 const YANMEGA const ONIYANMA diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index cfc0c6c..c3b9e99 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -299,7 +299,7 @@ INCLUDE "data/pokemon/base_stats/sunbud.asm" INCLUDE "data/pokemon/base_stats/sunflora.asm" INCLUDE "data/pokemon/base_stats/hippunk.asm" INCLUDE "data/pokemon/base_stats/aercrow.asm" -INCLUDE "data/pokemon/base_stats/foxfire.asm" +INCLUDE "data/pokemon/base_stats/zorriego.asm" INCLUDE "data/pokemon/base_stats/yanma.asm" INCLUDE "data/pokemon/base_stats/yanmega.asm" INCLUDE "data/pokemon/base_stats/oniyanma.asm" diff --git a/data/pokemon/base_stats/foxfire.asm b/data/pokemon/base_stats/zorriego.asm similarity index 93% rename from data/pokemon/base_stats/foxfire.asm rename to data/pokemon/base_stats/zorriego.asm index 99461a3..072774a 100644 --- a/data/pokemon/base_stats/foxfire.asm +++ b/data/pokemon/base_stats/zorriego.asm @@ -11,7 +11,7 @@ db 100 ; unknown 1 db 20 ; step cycles to hatch db 5 ; unknown 2 - INCBIN "gfx/pokemon/foxfire/front.dimensions" + INCBIN "gfx/pokemon/zorriego/front.dimensions" dw NULL, NULL ; unused (beta front/back pics) db GROWTH_MEDIUM_FAST ; growth rate dn EGG_GROUND, EGG_GROUND ; egg groups diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index 8cca0ed..84c434a 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -278,7 +278,7 @@ PokemonCries:: mon_cry CRY_SUNFLORA, -32, 384 ; SUNFLORA mon_cry CRY_NIDORAN_M, 0, 0 ; HIPPUNK (incomplete) mon_cry CRY_NIDORAN_M, 0, 0 ; AERCROW (incomplete) - mon_cry CRY_NIDORAN_M, 0, 0 ; FOXFIRE (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; ZORRIEGO (incomplete) mon_cry CRY_TOTODILE, 49, 200 ; YANMA mon_cry CRY_NIDORAN_M, 0, 0 ; YANMEGA (incomplete) mon_cry CRY_NIDORAN_M, 0, 0 ; ONIYANMA (incomplete) diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 341c084..6bd9cb4 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -268,7 +268,7 @@ SunbudPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sunbud.asm" SunfloraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sunflora.asm" HippunkPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hippunk.asm" AercrowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/aercrow.asm" -FoxfirePokedexEntry:: INCLUDE "data/pokemon/dex_entries/foxfire.asm" +ZorriegoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/zorriego.asm" SECTION "Pokedex Entries 193-251", ROMX diff --git a/data/pokemon/dex_entries/foxfire.asm b/data/pokemon/dex_entries/zorriego.asm similarity index 100% rename from data/pokemon/dex_entries/foxfire.asm rename to data/pokemon/dex_entries/zorriego.asm diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index 0b8c94e..74b13d5 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -273,7 +273,7 @@ PokedexDataPointerTable: dba SunfloraPokedexEntry dba HippunkPokedexEntry dba AercrowPokedexEntry - dba FoxfirePokedexEntry + dba ZorriegoPokedexEntry dba YanmaPokedexEntry dba YanmegaPokedexEntry dba OniyanmaPokedexEntry diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 231ee5e..90ee386 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -107,7 +107,6 @@ AlphabeticalPokedexOrder: dw FLUTTER_MANE dw FOLAGE dw FORRETRESS - dw FOXFIRE dw FURRET dw GASTLY dw GAOTORA @@ -399,5 +398,6 @@ AlphabeticalPokedexOrder: dw YANMA dw YANMEGA dw ZAPDOS + dw ZORRIEGO dw ZUBAT assert_table_length NUM_POKEMON diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index 4654523..90886e4 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -225,7 +225,7 @@ NewPokedexOrder: dw QATU dw XATU dw AERCROW - dw FOXFIRE + dw ZORRIEGO dw QWILFISH dw KAZAPPELIN dw QWILFATHER diff --git a/data/pokemon/egg_moves_johto.asm b/data/pokemon/egg_moves_johto.asm index 528bb31..f4f18e1 100644 --- a/data/pokemon/egg_moves_johto.asm +++ b/data/pokemon/egg_moves_johto.asm @@ -61,7 +61,7 @@ EggMovePointers2:: dw NoEggMoves2 dw HippunkEggMoves dw AercrowEggMoves - dw FoxfireEggMoves + dw ZorriegoEggMoves dw YanmaEggMoves dw NoEggMoves2 ; Yanmega dw NoEggMoves2 ; Oniyanma @@ -388,7 +388,7 @@ AercrowEggMoves: dw WHIRLWIND dw -1 ; end -FoxfireEggMoves: +ZorriegoEggMoves: dw CONFUSE_RAY dw DISABLE dw FAINT_ATTACK diff --git a/data/pokemon/evolution_moves.asm b/data/pokemon/evolution_moves.asm index 804ef37..dea440b 100644 --- a/data/pokemon/evolution_moves.asm +++ b/data/pokemon/evolution_moves.asm @@ -271,7 +271,7 @@ EvolutionMoves:: dw NO_MOVE ;SUNFLORA ; c0 dw NO_MOVE ;HIPPUNK dw NO_MOVE ;AERCROW - dw NO_MOVE ;FOXFIRE + dw NO_MOVE ;ZORRIEGO dw NO_MOVE ;YANMA ; c1 dw NO_MOVE ;YANMEGA dw NO_MOVE ;ONIYANMA diff --git a/data/pokemon/evos_attacks_johto.asm b/data/pokemon/evos_attacks_johto.asm index e990355..e595e6d 100644 --- a/data/pokemon/evos_attacks_johto.asm +++ b/data/pokemon/evos_attacks_johto.asm @@ -61,7 +61,7 @@ EvosAttacksPointers2:: dw SunfloraEvosAttacks dw HippunkEvosAttacks dw AercrowEvosAttacks - dw FoxfireEvosAttacks + dw ZorriegoEvosAttacks dw YanmaEvosAttacks dw YanmegaEvosAttacks dw OniyanmaEvosAttacks @@ -1165,7 +1165,7 @@ AercrowEvosAttacks: dbw 50, RAZOR_WIND db 0 ; no more level-up moves -FoxfireEvosAttacks: +ZorriegoEvosAttacks: db 0; no more evolutions dbw 1, EMBER dbw 1, LEER diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index a1aabb9..deae0d7 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -273,7 +273,7 @@ FirstEvoStages:: dw SUNKERN ;c0 dw HIPPUNK dw AERCROW - dw FOXFIRE + dw ZORRIEGO dw YANMA dw YANMA dw YANMA diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 2df5884..1e07cf9 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -274,7 +274,7 @@ MonMenuIcons: db ICON_ODDISH ; SUNFLORA db ICON_SLOWPOKE ; HIPPUNK db ICON_BIRD ; AERCROW - db ICON_FOX ; FOXFIRE + db ICON_FOX ; ZORRIEGO db ICON_BUG ; YANMA db ICON_BUG ; YANMEGA db ICON_BUG ; ONIYANMA diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index cfe86e2..f35fb2a 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -276,7 +276,7 @@ PokemonNames:: db "SUNFLORA@@" db "TORPIR@@@@" db "AERCROW@@@" - db "FOXFIRE@@@" + db "ZORRIEGO@@" db "YANMA@@@@@" db "YANMEGA@@@" db "ONIYANMA@@" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index e4af3ac..ee92abf 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -577,8 +577,8 @@ INCBIN "gfx/pokemon/hippunk/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/hippunk/shiny.pal" INCBIN "gfx/pokemon/aercrow/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/aercrow/shiny.pal" -INCBIN "gfx/pokemon/foxfire/front.gbcpal", middle_colors -INCLUDE "gfx/pokemon/foxfire/shiny.pal" +INCBIN "gfx/pokemon/zorriego/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/zorriego/shiny.pal" INCBIN "gfx/pokemon/yanma/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/yanma/shiny.pal" INCBIN "gfx/pokemon/yanmega/front.gbcpal", middle_colors diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index 688a4ae..df14cbc 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -557,8 +557,8 @@ PokemonPicPointers:: dba HippunkBackpic dba AercrowFrontpic dba AercrowBackpic - dba FoxfireFrontpic - dba FoxfireBackpic + dba ZorriegoFrontpic + dba ZorriegoBackpic dba YanmaFrontpic dba YanmaBackpic dba YanmegaFrontpic diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 088871d..1bfa3b1 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -12,10 +12,10 @@ SECTION "Enemy Trainer Parties 1", ROMX FalknerGroup: next_list_item ; FALKNER (1) db "FALKNER@", TRAINERTYPE_MOVES - db 7 + db 10 dw HOOTHOOT dw TACKLE, MUD_SLAP, GROWL, FORESIGHT - db 9 + db 12 dw PIDGEOTTO dw TACKLE, MUD_SLAP, GUST, NO_MOVE db -1 ; end @@ -25,12 +25,12 @@ FalknerGroup: WhitneyGroup: next_list_item ; WHITNEY (1) db "WHITNEY@", TRAINERTYPE_MOVES - db 16 - dw IGGLYBUFF ; This adds Johto to Whitney's team without really increasing the difficulty. Her team is basically perfect already. - dw POUND, SING, CHARM, SWEET_KISS db 18 dw CLEFAIRY dw DOUBLESLAP, MIMIC, ENCORE, METRONOME + db 18 + dw AIPOM + dw FURY_SWIPES, TAIL_WHIP, MUD_SLAP, ATTRACT db 20 dw MILTANK dw ROLLOUT, ATTRACT, STOMP, MILK_DRINK @@ -60,18 +60,18 @@ BugsyGroup: MortyGroup: next_list_item ; MORTY (1) db "MORTY@", TRAINERTYPE_MOVES - db 21 + db 24 dw PHANDARIN ; Not Stromen - Morty is looking for Ho-Oh, keep in mind! dw LEECH_LIFE, DISABLE, SPITE, RETURN ; Not Curse, goes against lore. - db 21 - dw BIPULLA - dw TACKLE, CONFUSION, LICK, AGILITY db 25 - dw MISMAGIUS - dw HYPNOSIS, SHADOW_BALL, MEAN_LOOK, DREAM_EATER - db 23 + dw WISPIRIT + dw EMBER, SAFEGUARD, SPITE, NIGHT_SHADE + db 25 dw HAUNTER dw SPITE, MEAN_LOOK, MIMIC, NIGHT_SHADE + db 27 + dw MISMAGIUS + dw HYPNOSIS, SHADOW_BALL, MEAN_LOOK, DREAM_EATER db -1 ; end end_list_items @@ -99,18 +99,21 @@ PryceGroup: JasmineGroup: ; Jasmine is going to use Egg Moves! next_list_item ; JASMINE (1) db "JASMINE@", TRAINERTYPE_MOVES - db 30 + db 35 dw MAGNETON dw THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE - db 30 + db 34 dw FORRETRESS dw TAKE_DOWN, SELFDESTRUCT, PIN_MISSILE, PROTECT ; EM Pin Missile is very very apt - db 32 + db 34 dw SKARMORY - dw DRILL_PECK, SAND_ATTACK, STEEL_WING, LEER ; EM Drill Peck for a power boost, Skarmory isn't normally threatening. - db 35 ; Steel Wing TM too as it's obtainable around this point. + dw DRILL_PECK, SAND_ATTACK, STEEL_WING, LEER + db 35 + dw SHARPOON + dw IRON_TAIL, BUBBLEBEAM, CRUNCH, SWORDS_DANCE + db 35 dw STEELIX - dw SCREECH, SANDSTORM, ROCK_HEAD, IRON_TAIL ; Changed Sunny Day because it just kind of doesn't work...it makes Typhlosion kill it, in exchange for hindering a Feraligatr speedrun? Sandstorm seems more interesting... + dw SCREECH, SANDSTORM, ROCK_HEAD, IRON_TAIL db -1 ; end end_list_items @@ -118,16 +121,19 @@ JasmineGroup: ; Jasmine is going to use Egg Moves! ChuckGroup: next_list_item ; CHUCK (1) db "CHUCK@", TRAINERTYPE_MOVES - db 25 - dw MACHOKE - dw KARATE_CHOP, LOW_KICK, FOCUS_ENERGY, HEADBUTT - db 25 - dw HITMONTOP - dw ROLLING_KICK, RAPID_SPIN, PURSUIT, FOCUS_ENERGY - db 27 - dw HERACROSS ; Look, stag beetles can fling all kinds of things. Just like Chuck throws a boulder! - dw HORN_ATTACK, ROCK_SMASH, ENDURE, LEER ; Also it gets like no moves - db 30 + db 31 + dw PRIMEAPE + dw LOW_KICK, FURY_SWIPES, ROCK_HEAD, LEER + db 32 + dw HERACROSS + dw HORN_ATTACK, KARATE_CHOP, ENDURE, LEER + ; db 31 + ; dw ALOLAN SNORLAX + ; dw ??? + db 32 + dw HITMONTOP ; maybe Pixytop? + dw ROLLING_KICK, RAPID_SPIN, PURSUIT, COUNTER + db 34 dw POLIWRATH dw HYPNOSIS, MIND_READER, SURF, DYNAMICPUNCH db -1 ; end @@ -182,78 +188,78 @@ PasserbyGroup: Rival1Group: next_list_item ; RIVAL1 (4) db "?@", TRAINERTYPE_NORMAL - db 12 - dw GASTLY - db 14 + db 15 dw ZUBAT - db 16 + db 14 + dw TEDDIURSA + db 17 dw BAYLEEF db -1 ; end next_list_item ; RIVAL1 (5) db "?@", TRAINERTYPE_NORMAL - db 12 - dw GASTLY - db 14 + db 15 dw ZUBAT - db 16 + db 14 + dw TEDDIURSA + db 17 dw QUILAVA db -1 ; end next_list_item ; RIVAL1 (6) db "?@", TRAINERTYPE_NORMAL - db 12 - dw GASTLY - db 14 + db 15 dw ZUBAT - db 16 + db 14 + dw TEDDIURSA + db 17 dw CROCONAW db -1 ; end next_list_item ; RIVAL1 (7) db "?@", TRAINERTYPE_MOVES - db 20 - dw HAUNTER - dw LICK, SPITE, MEAN_LOOK, CURSE - db 18 - dw MAGNEMITE - dw TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM - db 20 - dw ZUBAT - dw LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY + db 24 + dw GOLBAT + dw LEECH_LIFE, WING_ATTACK, BITE, CONFUSE_RAY db 22 + dw TEDDIURSA + dw FURY_SWIPES, FAINT_ATTACK, LICK, LEER + db 22 + dw STROMEN + dw LEECH_LIFE, DISABLE, DESTINY_BOND, SPITE + db 25 dw BAYLEEF dw GROWL, REFLECT, RAZOR_LEAF, POISONPOWDER db -1 ; end next_list_item ; RIVAL1 (8) db "?@", TRAINERTYPE_MOVES - db 20 - dw HAUNTER - dw LICK, SPITE, MEAN_LOOK, CURSE - db 18 - dw MAGNEMITE - dw TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM - db 20 - dw ZUBAT - dw LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY + db 24 + dw GOLBAT + dw LEECH_LIFE, WING_ATTACK, BITE, CONFUSE_RAY db 22 + dw TEDDIURSA + dw FURY_SWIPES, FAINT_ATTACK, LICK, LEER + db 22 + dw STROMEN + dw LEECH_LIFE, DISABLE, DESTINY_BOND, SPITE + db 25 dw QUILAVA dw LEER, SMOKESCREEN, EMBER, QUICK_ATTACK db -1 ; end next_list_item ; RIVAL1 (9) db "?@", TRAINERTYPE_MOVES - db 20 - dw HAUNTER - dw LICK, SPITE, MEAN_LOOK, CURSE - db 18 - dw MAGNEMITE - dw TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM - db 20 - dw ZUBAT - dw LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY + db 24 + dw GOLBAT + dw LEECH_LIFE, WING_ATTACK, BITE, CONFUSE_RAY db 22 + dw TEDDIURSA + dw FURY_SWIPES, FAINT_ATTACK, LICK, LEER + db 22 + dw STROMEN + dw LEECH_LIFE, DISABLE, DESTINY_BOND, SPITE + db 25 dw CROCONAW dw LEER, RAGE, WATER_GUN, BITE db -1 ; end @@ -847,7 +853,7 @@ YoungsterGroup: db 2 dw LEDYBA db 4 - dw RATTATA + dw SENTRET db -1 ; end next_list_item ; YOUNGSTER (3) @@ -855,25 +861,29 @@ YoungsterGroup: db 6 dw SENTRET db 8 - dw ZUBAT + dw BITTYBAT db -1 ; end next_list_item ; YOUNGSTER (4) db "GORDON@", TRAINERTYPE_NORMAL - db 10 + db 9 dw WOOPER + db 8 + dw EKANS + db 9 + dw MAREEP db -1 ; end next_list_item ; YOUNGSTER (5) db "SAMUEL@", TRAINERTYPE_NORMAL db 7 - dw RATTATA - db 10 + dw WOOPER + db 8 dw SANDSHREW db 8 - dw SPEAROW - db 8 - dw SPEAROW + dw PHANPY + db 10 + dw GLIGAR db -1 ; end next_list_item ; YOUNGSTER (6) @@ -881,7 +891,7 @@ YoungsterGroup: db 10 dw MANKEY db 12 - dw DIGLETT + dw TEDDIURSA db -1 ; end next_list_item ; YOUNGSTER (7) @@ -966,10 +976,12 @@ SECTION "Enemy Trainer Parties 2", ROMX SchoolboyGroup: next_list_item ; SCHOOLBOY (1) db "JACK@", TRAINERTYPE_NORMAL - db 12 + db 13 dw ODDISH db 15 dw VOLTORB + db 15 + dw HOUNDOUR db -1 ; end next_list_item ; SCHOOLBOY (2) @@ -987,7 +999,11 @@ SchoolboyGroup: next_list_item ; SCHOOLBOY (3) db "ALAN@", TRAINERTYPE_NORMAL db 16 - dw TANGELA + dw BURGELA + db 16 + dw YANMA + db 16 + dw AIPOM db -1 ; end next_list_item ; SCHOOLBOY (4) @@ -1046,8 +1062,10 @@ SchoolboyGroup: next_list_item ; SCHOOLBOY (10) db "CHAD@", TRAINERTYPE_NORMAL - db 19 - dw MR__MIME + db 24 + dw MIME_JR_ + db 24 + dw SMOOCHUM db -1 ; end next_list_item ; SCHOOLBOY (11) @@ -1201,57 +1219,60 @@ BirdKeeperGroup: next_list_item ; BIRD_KEEPER (1) db "ROD@", TRAINERTYPE_NORMAL db 7 - dw PIDGEY + dw SPEAROW db 7 - dw PIDGEY + dw NATU db -1 ; end next_list_item ; BIRD_KEEPER (2) db "ABE@", TRAINERTYPE_NORMAL - db 9 - dw SPEAROW + db 10 + dw FARFETCH_D db -1 ; end next_list_item ; BIRD_KEEPER (3) db "BRYAN@", TRAINERTYPE_NORMAL - db 12 - dw PIDGEY db 14 - dw PIDGEOTTO + dw AERCROW + db 14 + dw DELIBIRD db -1 ; end next_list_item ; BIRD_KEEPER (4) db "THEO@", TRAINERTYPE_NORMAL db 17 dw PIDGEY - db 15 - dw PIDGEY - db 19 - dw PIDGEY - db 15 - dw PIDGEY - db 15 - dw PIDGEY + db 17 + dw SPEAROW + db 17 + dw HOOTHOOT + db 17 + dw NATU + db 24 + dw LUXWAN db -1 ; end next_list_item ; BIRD_KEEPER (5) db "TOBY@", TRAINERTYPE_NORMAL - db 15 - dw DODUO - db 16 - dw DODUO - db 17 + db 24 dw DODUO + db 25 + dw CARETORKER + db 25 + dw NOCTOWL db -1 ; end next_list_item ; BIRD_KEEPER (6) - db "DENIS@", TRAINERTYPE_NORMAL - db 18 - dw SPEAROW - db 20 + db "DENIS@", TRAINERTYPE_MOVES + db 26 dw FEAROW - db 18 - dw SPEAROW + dw FURY_ATTACK, PURSUIT, LEER, FLY + db 26 + dw PIDGEOTTO + dw QUICK_ATTACK, WHIRLWIND, MUD_SLAP, FLY + db 27 + dw AERCROW + dw WING_ATTACK, FLAIL, MEGAPHONE, FLY db -1 ; end next_list_item ; BIRD_KEEPER (7) @@ -1305,9 +1326,9 @@ BirdKeeperGroup: db 6 dw PIDGEY db 6 - dw PIDGEY + dw HOOTHOOT db 8 - dw SPEAROW + dw SONEGG db -1 ; end next_list_item ; BIRD_KEEPER (14) @@ -1437,6 +1458,10 @@ CooltrainerMGroup: dw SQUIRTLE db 26 dw BULBASAUR + db 26 + dw PIKACHU + db 26 + dw EEVEE db -1 ; end next_list_item ; COOLTRAINERM (2) @@ -1659,12 +1684,12 @@ CooltrainerFGroup: db "GWEN@", TRAINERTYPE_NORMAL db 26 dw EEVEE - db 22 - dw FLAREON - db 22 - dw VAPOREON - db 22 - dw JOLTEON + db 25 + dw ESPEON + db 25 + dw UMBREON + db 25 + dw LEAFEON db -1 ; end next_list_item ; COOLTRAINERF (2) @@ -1784,8 +1809,8 @@ CooltrainerFGroup: next_list_item ; COOLTRAINERF (15) db "EMMA@", TRAINERTYPE_NORMAL - db 28 - dw POLIWHIRL + db 29 + dw POLITOED db -1 ; end next_list_item ; COOLTRAINERF (16) @@ -1858,18 +1883,18 @@ CooltrainerFGroup: BeautyGroup: next_list_item ; BEAUTY (1) db "VICTORIA@", TRAINERTYPE_NORMAL - db 9 - dw SENTRET db 13 dw SENTRET - db 17 - dw SENTRET + db 14 + dw IGGLYBUFF + db 16 + dw TEDDIURSA db -1 ; end next_list_item ; BEAUTY (2) db "SAMANTHA@", TRAINERTYPE_MOVES db 16 - dw MEOWTH + dw COINPUR dw SCRATCH, GROWL, BITE, PAY_DAY db 16 dw MEOWTH @@ -1974,17 +1999,20 @@ BeautyGroup: next_list_item ; BEAUTY (16) db "VALERIE@", TRAINERTYPE_MOVES - db 17 - dw HOPPIP - dw SYNTHESIS, TAIL_WHIP, TACKLE, POISONPOWDER - db 17 - dw SKIPLOOM - dw SYNTHESIS, TAIL_WHIP, TACKLE, STUN_SPORE + db 24 + dw MR__MIME + dw CONFUSION, BARRIER, MIMIC, DOUBLESLAP + db 24 + dw PHANDARIN + dw LEECH_LIFE, SPITE, CONFUSION, RETURN + db 25 + dw SYLVEON + dw QUICK_ATTACK, CHARM, DISARMING_VOICE, SAND_ATTACK db -1 ; end next_list_item ; BEAUTY (17) db "OLIVIA@", TRAINERTYPE_NORMAL - db 19 + db 27 dw CORSOLA db -1 ; end @@ -1994,7 +2022,7 @@ PokemaniacGroup: next_list_item ; POKEMANIAC (1) db "LARRY@", TRAINERTYPE_NORMAL db 10 - dw SLOWPOKE + dw HIPPUNK db -1 ; end next_list_item ; POKEMANIAC (2) @@ -2002,12 +2030,16 @@ PokemaniacGroup: db 24 dw MAROWAK db 24 - dw MAROWAK + dw FLAAFFY + db 24 + dw NIDOQUEEN db -1 ; end next_list_item ; POKEMANIAC (3) db "CALVIN@", TRAINERTYPE_NORMAL - db 26 + db 25 + dw BLASTYKE + db 27 dw KANGASKHAN db -1 ; end @@ -2063,6 +2095,8 @@ PokemaniacGroup: db 12 dw LICKITUNG dw LICK, SUPERSONIC, CUT, NO_MOVE + ; dw 12 + ; dw WARFURS db -1 ; end next_list_item ; POKEMANIAC (12) @@ -2070,7 +2104,7 @@ PokemaniacGroup: db 10 dw SLOWPOKE db 10 - dw SLOWPOKE + dw MAREEP db -1 ; end next_list_item ; POKEMANIAC (13) @@ -2099,8 +2133,12 @@ PokemaniacGroup: GruntMGroup: next_list_item ; GRUNTM (1) db "GRUNT@", TRAINERTYPE_NORMAL ; Proton, he's a grunt here. - db 14 + db 12 dw KOFFING + db 12 + dw SHELLDER + db 14 + dw ZUBAT db -1 ; end next_list_item ; GRUNTM (2) @@ -2108,9 +2146,9 @@ GruntMGroup: db 7 dw RATTATA db 9 - dw ZUBAT + dw SPINARAK db 9 - dw ZUBAT + dw VOLTORB db -1 ; end next_list_item ; GRUNTM (3) @@ -2334,7 +2372,7 @@ GruntMGroup: db 9 dw RATTATA db 9 - dw RATTATA + dw SMUJJ db -1 ; end next_list_item ; GRUNTM (30) @@ -2358,10 +2396,10 @@ GruntMGroup: GentlemanGroup: next_list_item ; GENTLEMAN (1) db "PRESTON@", TRAINERTYPE_NORMAL - db 18 - dw GROWLITHE - db 18 + db 26 dw GROWLITHE + db 26 + dw HOUNDOOM db -1 ; end next_list_item ; GENTLEMAN (2) @@ -2386,8 +2424,12 @@ GentlemanGroup: next_list_item ; GENTLEMAN (5) db "ALFRED@", TRAINERTYPE_NORMAL - db 20 + db 25 + dw PIDGEOTTO + db 25 dw NOCTOWL + db 27 + dw CROBAT db -1 ; end end_list_items @@ -2507,21 +2549,21 @@ BugCatcherGroup: next_list_item ; BUG_CATCHER (6) db "AL@", TRAINERTYPE_NORMAL db 12 - dw CATERPIE + dw PINECO db 12 dw BUTTERFREE db -1 ; end next_list_item ; BUG_CATCHER (7) db "JOSH@", TRAINERTYPE_NORMAL - db 18 + db 16 dw LEDIAN ; It'll look scary in Azalea Gym but it's also Ledian db -1 ; end next_list_item ; BUG_CATCHER (8) db "ARNIE@", TRAINERTYPE_NORMAL - db 15 - dw YANMA ; To show Yanma is on Route 35 + db 18 + dw HERACROSS ; Bug Catching Contest! db -1 ; end next_list_item ; BUG_CATCHER (9) @@ -2623,10 +2665,13 @@ BugCatcherGroup: next_list_item ; BUG_CATCHER (19) db "WAYNE@", TRAINERTYPE_NORMAL - db 8 + db 9 dw LEDYBA + dw TACKLE, SUPERSONIC, HEADBUTT, NO_MOVE db 10 - dw PARAS + dw FOLAGE + db 10 + dw PINECO db -1 ; end next_list_item ; BUG_CATCHER (20) @@ -2713,8 +2758,8 @@ FisherGroup: next_list_item ; FISHER (2) db "RALPH@", TRAINERTYPE_NORMAL db 10 - dw ORFRY - db 12 ; Could be a little strong, but Orfry evolves here... + dw CHINCHOU + db 11 ; Could be a little strong, but Orfry evolves here... dw POLIWAG db -1 ; end @@ -2957,66 +3002,66 @@ SwimmerMGroup: next_list_item ; SWIMMERM (2) db "SIMON@", TRAINERTYPE_NORMAL - db 20 - dw TENTACOOL - db 20 + db 27 dw TENTACOOL + db 27 + dw REMORAID db -1 ; end next_list_item ; SWIMMERM (3) db "RANDALL@", TRAINERTYPE_NORMAL - db 18 - dw SHELLDER - db 20 + db 25 + dw SQUIRTLE + db 25 + dw BLASTYKE + db 27 dw WARTORTLE - db 18 - dw SHELLDER db -1 ; end next_list_item ; SWIMMERM (4) db "CHARLIE@", TRAINERTYPE_NORMAL - db 21 + db 25 dw SHELLDER - db 19 - dw TENTACOOL - db 19 - dw TENTACRUEL + db 25 + dw SLOWPOKE + db 27 + dw SLOWKING db -1 ; end next_list_item ; SWIMMERM (5) db "GEORGE@", TRAINERTYPE_NORMAL - db 16 - dw TENTACOOL - db 17 - dw TENTACOOL - db 16 - dw TENTACOOL - db 19 - dw STARYU - db 17 - dw TENTACOOL - db 19 + db 21 dw REMORAID + db 21 + dw MANTYKE + ; db 22 + ; dw SAILWING + db 22 + dw STRICHEEL + db 23 + dw CHINCHOU + db 23 + dw WEIRDUCK db -1 ; end next_list_item ; SWIMMERM (6) db "BERKE@", TRAINERTYPE_NORMAL - db 23 - dw QWILFISH + db 28 + dw KAZAPPELIN db -1 ; end next_list_item ; SWIMMERM (7) db "KIRK@", TRAINERTYPE_NORMAL - db 20 - dw GYARADOS - db 20 + db 26 dw GYARADOS + db 26 + dw QWILFATHER db -1 ; end next_list_item ; SWIMMERM (8) db "MATHEW@", TRAINERTYPE_NORMAL - db 23 - dw KRABBY + db 29 + dw LURREEL db -1 ; end next_list_item ; SWIMMERM (9) @@ -3148,36 +3193,36 @@ SwimmerMGroup: SwimmerFGroup: next_list_item ; SWIMMERF (1) db "ELAINE@", TRAINERTYPE_NORMAL - db 21 - dw STARYU + db 28 + dw STARMIE db -1 ; end next_list_item ; SWIMMERF (2) db "PAULA@", TRAINERTYPE_NORMAL - db 19 - dw STARYU - db 19 + db 26 dw SHELLDER + db 26 + dw DISTURBAN + db 26 + dw CLOYSTER db -1 ; end next_list_item ; SWIMMERF (3) db "KAYLEE@", TRAINERTYPE_NORMAL - db 18 + db 26 dw GOLDEEN - db 20 - dw GOLDEEN - db 20 - dw SEAKING + db 26 + dw CHEEP + db 26 + dw STRICHEEL db -1 ; end next_list_item ; SWIMMERF (4) - db "SUSIE@", TRAINERTYPE_MOVES - db 20 - dw PSYDUCK - dw SCRATCH, TAIL_WHIP, DISABLE, CONFUSION - db 22 - dw GOLDEEN - dw PECK, TAIL_WHIP, SUPERSONIC, HORN_ATTACK + db "SUSIE@", TRAINERTYPE_NORMAL + db 26 + dw REROAD + db 27 + dw MANTINE db -1 ; end next_list_item ; SWIMMERF (5) @@ -3190,20 +3235,22 @@ SwimmerFGroup: next_list_item ; SWIMMERF (6) db "KARA@", TRAINERTYPE_NORMAL - db 20 - dw STARYU - db 20 - dw STARMIE + db 24 + dw REMORAID + db 24 + dw MANTYKE + db 26 + dw OCTILLERY db -1 ; end next_list_item ; SWIMMERF (7) - db "WENDY@", TRAINERTYPE_MOVES - db 21 + db "WENDY@", TRAINERTYPE_NORMAL + db 25 dw HORSEA - dw BUBBLE, SMOKESCREEN, LEER, WATER_GUN - db 21 - dw HORSEA - dw DRAGON_RAGE, SMOKESCREEN, LEER, WATER_GUN + db 25 + dw STARYU + db 25 + dw AZUMARILL db -1 ; end next_list_item ; SWIMMERF (8) @@ -3297,46 +3344,52 @@ SwimmerFGroup: SailorGroup: next_list_item ; SAILOR (1) db "EUGENE@", TRAINERTYPE_NORMAL - db 17 + db 24 dw POLIWHIRL - db 17 + db 24 + dw STARYU + db 24 + dw BLOTTLE + db 24 dw RATICATE - db 19 - dw KRABBY + db 25 + dw KINGLER db -1 ; end next_list_item ; SAILOR (2) db "HUEY@", TRAINERTYPE_NORMAL - db 18 - dw POLIWAG - db 18 + db 26 + dw CHINCHOU + db 26 + dw STRICHEEL + db 26 dw POLIWHIRL db -1 ; end next_list_item ; SAILOR (3) db "TERRELL@", TRAINERTYPE_NORMAL - db 20 - dw POLIWHIRL + db 28 + dw POLITOED db -1 ; end next_list_item ; SAILOR (4) - db "KENT@", TRAINERTYPE_MOVES - db 18 - dw KRABBY - dw BUBBLE, LEER, VICEGRIP, HARDEN - db 20 - dw KRABBY - dw BUBBLEBEAM, LEER, VICEGRIP, HARDEN + db "KENT@", TRAINERTYPE_NORMAL + db 26 + dw CHEEP + db 26 + dw RIBBITO + db 27 + dw LANTURN db -1 ; end next_list_item ; SAILOR (5) db "ERNEST@", TRAINERTYPE_NORMAL - db 18 + db 26 dw MACHOP - db 18 - dw MACHOP - db 18 - dw POLIWHIRL + db 26 + dw TYROGUE + db 27 + dw PRIMEAPE db -1 ; end next_list_item ; SAILOR (6) @@ -3377,8 +3430,12 @@ SailorGroup: next_list_item ; SAILOR (10) db "HARRY@", TRAINERTYPE_NORMAL - db 19 - dw WOOPER + db 25 + dw POLIWHIRL + db 24 + dw QUAGSIRE + ; db 26 + ; db CLODSIRE db -1 ; end next_list_item ; SAILOR (11) @@ -3421,6 +3478,8 @@ SuperNerdGroup: db 11 dw GRIMER db 11 + dw MAGNEMITE + db 11 dw MOIBELLE ; Nerds like cats, right? Maybe this could be fun. db -1 ; end @@ -3485,13 +3544,13 @@ SuperNerdGroup: next_list_item ; SUPER_NERD (10) db "TERU@", TRAINERTYPE_NORMAL ; Goldenrod Tunnel db 10 + dw ELEBEBI + db 9 dw MAGNEMITE - db 13 + db 9 dw VOLTORB - db 9 - dw MAGNEMITE - db 9 - dw KOLTA ; In RBY they have these in Cinnabar, could restore it universally? + db 13 + dw KOTORA db -1 ; end next_list_item ; SUPER_NERD (11) @@ -3686,38 +3745,38 @@ GuitaristGroup: HikerGroup: next_list_item ; HIKER (1) db "ANTHONY@", TRAINERTYPE_NORMAL ; This guy is notorious! - db 16 + db 12 dw GEODUDE - db 18 - dw PHANPY ; But he still must have Johto! + db 12 + dw DUNSPARCE ; But he still must have Johto! db -1 ; end next_list_item ; HIKER (2) db "RUSSELL@", TRAINERTYPE_NORMAL db 5 - dw PHANPY + dw GEODUDE db 6 dw WOOPER db 8 - dw GEODUDE + dw PHANPY db -1 ; end next_list_item ; HIKER (3) db "PHILLIP@", TRAINERTYPE_NORMAL ; Lower floor of Union Cave - anything we can do? - db 23 - dw GEODUDE - db 23 - dw GEODUDE - db 23 + db 25 dw GRAVELER + db 25 + dw ONIX + db 26 + dw QUAGSIRE db -1 ; end next_list_item ; HIKER (4) db "LEONARD@", TRAINERTYPE_NORMAL ; same here - db 23 - dw GEODUDE - db 25 - dw MACHOP + db 28 + dw MACHOKE + db 28 + dw RIBBITO db -1 ; end next_list_item ; HIKER (5) @@ -4078,16 +4137,20 @@ FirebreatherGroup: db "BILL@", TRAINERTYPE_NORMAL db 7 dw KOFFING - db 10 + db 7 + dw PUPPERON + db 9 dw SLUGMA db -1 ; end next_list_item ; FIREBREATHER (6) db "WALT@", TRAINERTYPE_NORMAL - db 11 - dw MAGBY db 13 - dw HOUNDOUR + dw KOLTA + db 13 + dw MAGBY + db 14 + dw ZORRIEGO db -1 ; end next_list_item ; FIREBREATHER (7) @@ -4113,14 +4176,14 @@ FirebreatherGroup: JugglerGroup: next_list_item ; JUGGLER (1) db "IRWIN@", TRAINERTYPE_NORMAL ; I get his gimmick, but I do not like it. - db 7 + db 12 + dw IGGLYBUFF + db 12 dw VOLTORB - db 7 - dw VOLTORB - db 10 - dw PINECO - db 15 - dw AIPOM + db 13 + dw POLIWAG + db 13 + dw KOTORA db -1 ; end next_list_item ; JUGGLER (2) @@ -4198,12 +4261,12 @@ BlackbeltGroup: next_list_item ; BLACKBELT_T (2) db "YOSHI@", TRAINERTYPE_MOVES ; cianwood gym - db 26 - dw TYROGUE - dw TACKLE, MACH_PUNCH, NO_MOVE, NO_MOVE + db 29 + dw TANOBI + dw JUMP_KICK, WING_ATTACK, AGILITY, LEER db 30 dw HITMONLEE - dw DOUBLE_KICK, MEDITATE, JUMP_KICK, FOCUS_ENERGY + dw JUMP_KICK, MEDITATE, DOUBLE_KICK, MIND_READER db -1 ; end next_list_item ; BLACKBELT_T (3) @@ -4224,22 +4287,19 @@ BlackbeltGroup: next_list_item ; BLACKBELT_T (4) db "LAO@", TRAINERTYPE_MOVES ; cianwood gym - db 26 - dw TYROGUE - dw TACKLE, MACH_PUNCH, NO_MOVE, NO_MOVE + db 29 + dw CARAPTHOR + dw COMET_PUNCH, UPPERCUT, PIN_MISSILE, DEFENSE_CURL db 30 dw HITMONCHAN - dw UPPERCUT, THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH + dw MACH_PUNCH, THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH db -1 ; end next_list_item ; BLACKBELT_T (5) db "NOB@", TRAINERTYPE_MOVES ; cianwood gym - db 28 ; This represents Ogasawara - anything we can do? - dw MACHOP - dw LEER, FOCUS_ENERGY, KARATE_CHOP, SEISMIC_TOSS - db 32 - dw MACHOKE - dw LEER, KARATE_CHOP, SEISMIC_TOSS, ROCK_SLIDE + db 34 + dw MACHAMP + dw BODY_SLAM, KARATE_CHOP, SEISMIC_TOSS, ROCK_SLIDE db -1 ; end next_list_item ; BLACKBELT_T (6) @@ -4253,11 +4313,13 @@ BlackbeltGroup: db -1 ; end next_list_item ; BLACKBELT_T (7) - db "LUNG@", TRAINERTYPE_NORMAL ; Cianwood gym - db 26 - dw MANKEY ; JABETTA - is that in the game yet? lol - db 27 + db "LANG@", TRAINERTYPE_NORMAL ; Cianwood gym - name changed due to spelling error + db 31 + dw JABETTA ; JABETTA - is that in the game yet? lol + db 31 dw PRIMEAPE + ; db 32 + ; dw WEARLYCAN db -1 ; end next_list_item ; BLACKBELT_T (8) @@ -4325,6 +4387,8 @@ PsychicGroup: db "NATHAN@", TRAINERTYPE_NORMAL ; Ruins of Alph db 26 dw GIRAFARIG + db 26 + dw QATU db 30 dw UNOWN ; I think it's a little neat, don't you? db -1 ; end @@ -4354,21 +4418,27 @@ PsychicGroup: next_list_item ; PSYCHIC_T (5) db "GREG@", TRAINERTYPE_MOVES ; Just south of Ecruteak. db 17 + dw EXEGGCUTE + dw BARRAGE, HYPNOSIS, REFLECT, LEECH_SEED + db 17 dw DROWZEE dw HYPNOSIS, DISABLE, DREAM_EATER, NO_MOVE ; jesus ok - db 22 + db 18 dw STANTLER - dw HYPNOSIS, TACKLE, LEER, NO_MOVE + dw HYPNOSIS, TACKLE, LEER, DREAM_EATER db -1 ; end next_list_item ; PSYCHIC_T (6) db "NORMAN@", TRAINERTYPE_MOVES ; omg from hoenn? hi!!! - db 25 ; Route 39 - dw QATU - dw PECK, NIGHT_SHADE, LEER, FUTURE_SIGHT - db 26 + db 24 dw SLOWPOKE ; deranged moveset i love it dw CURSE, BODY_SLAM, WATER_GUN, CONFUSION + db 24 ; Route 39 + dw QATU + dw PECK, NIGHT_SHADE, LEER, FUTURE_SIGHT + db 25 + dw GIRAFARIG + dw CONFUSION, SHADOW_BALL, SAND_ATTACK, STOMP db -1 ; end next_list_item ; PSYCHIC_T (7) @@ -4376,6 +4446,9 @@ PsychicGroup: db 13 dw ABRA dw TELEPORT, FLASH, NO_MOVE, NO_MOVE + db 13 + dw WYNAUT + dw SPLASH, CHARM, ENCORE, NO_MOVE db 15 dw NATU dw PECK, LEER, NIGHT_SHADE, NO_MOVE @@ -4435,7 +4508,7 @@ PicnickerGroup: db "LIZ@", TRAINERTYPE_NORMAL db 9 dw NIDORAN_F - db 10 + db 11 dw MOIBELLE db -1 ; end @@ -4451,18 +4524,24 @@ PicnickerGroup: next_list_item ; PICNICKER (3) db "BROOKE@", TRAINERTYPE_NORMAL ; unnecessary - db 13 - dw PICHU db 16 dw PIKACHU + db 14 + dw SNUBBULL + db 14 + dw NIDORINA + db 15 + dw GAOTORA db -1 ; end next_list_item ; PICNICKER (4) db "KIM@", TRAINERTYPE_NORMAL - db 13 - dw VULPIII db 15 dw VULPIX + db 15 + dw MACHOP + db 15 + dw MISDREAVUS db -1 ; end next_list_item ; PICNICKER (5) @@ -4665,23 +4744,25 @@ CamperGroup: db 9 dw NIDORAN_M db 11 - dw PHANPY + dw COINPUR db -1 ; end next_list_item ; CAMPER (2) db "TODD@", TRAINERTYPE_NORMAL - db 14 - dw WOOPER + db 13 + dw MEOWTH + db 13 + dw MOIBELLE db -1 ; end next_list_item ; CAMPER (3) db "IVAN@", TRAINERTYPE_NORMAL db 10 - dw SNUBBULL + dw DUNSPARCE db 10 - dw BITTYBAT + dw YANMA db 14 - dw DIGLETT + dw QWILFISH db -1 ; end next_list_item ; CAMPER (4) @@ -4923,28 +5004,26 @@ ArianaGroup: ; Ariana SageGroup: next_list_item ; SAGE (1) db "CHOW@", TRAINERTYPE_NORMAL - db 3 - dw BELLSPROUT - db 3 - dw BELLSPROUT - db 3 - dw BELLSPROUT + db 4 + dw GASTLY + db 5 + dw RATTATA db -1 ; end next_list_item ; SAGE (2) db "NICO@", TRAINERTYPE_NORMAL db 3 dw BELLSPROUT - db 3 + db 4 + dw BELLSPROUT + db 4 dw BELLSPROUT - db 3 - dw HOOTHOOT db -1 ; end next_list_item ; SAGE (3) db "JIN@", TRAINERTYPE_NORMAL db 6 - dw HOOTHOOT + dw NATU db -1 ; end next_list_item ; SAGE (4) @@ -4957,8 +5036,8 @@ SageGroup: next_list_item ; SAGE (5) db "JEFFREY@", TRAINERTYPE_NORMAL - db 22 - dw HAUNTER + db 23 + dw KITSEN db -1 ; end next_list_item ; SAGE (6) @@ -4966,29 +5045,33 @@ SageGroup: db 16 dw GASTLY db 16 - dw GASTLY + dw BIPULLA db 16 dw GASTLY db 16 - dw GASTLY - db 16 - dw GASTLY + dw BIPULLA + db 18 + dw STROMEN db -1 ; end next_list_item ; SAGE (7) db "EDMOND@", TRAINERTYPE_NORMAL db 3 - dw BELLSPROUT - db 3 - dw BELLSPROUT - db 3 + dw ODDISH + db 4 + dw VULPIII + db 4 dw BELLSPROUT db -1 ; end next_list_item ; SAGE (8) db "NEAL@", TRAINERTYPE_NORMAL + db 5 + dw KOTORA + dw THUNDERSHOCK, TACKLE, FLASH, NO_MOVE db 6 dw BELLSPROUT + dw VINE_WHIP, GROWTH, FLASH, NO_MOVE db -1 ; end ; So these sages are in the Dragon's Den but end up being the Kimono Girls but again. @@ -5080,15 +5163,17 @@ MediumGroup: next_list_item ; MEDIUM (1) db "MARTHA@", TRAINERTYPE_NORMAL db 18 - dw MISDREAVUS + dw GASTLY db 20 dw HAUNTER + db 23 + dw GENGAR db -1 ; end next_list_item ; MEDIUM (2) db "GRACE@", TRAINERTYPE_NORMAL db 20 - dw BIPULLA + dw WISPIRIT db 20 dw MISDREAVUS db -1 ; end @@ -5171,16 +5256,25 @@ BoarderGroup: ; All in Pryce's Gym. Could expand to Ice Path and Seafoam. PokefanMGroup: next_list_item ; POKEFANM (1) db "WILLIAM@", TRAINERTYPE_ITEM - db 14 - dw RAICHU + db 16 + dw GAOTORA + db BERRY + db 16 + dw RAITORA db BERRY db -1 ; end next_list_item ; POKEFANM (2) db "DEREK@", TRAINERTYPE_ITEM - db 17 + db 23 + dw PICHU + db BERRY + db 24 dw PIKACHU db BERRY + db 25 + dw RAICHU + db BERRY db -1 ; end next_list_item ; POKEFANM (3) @@ -5373,15 +5467,27 @@ PokefanFGroup: next_list_item ; POKEFANF (1) db "BEVERLY@", TRAINERTYPE_ITEM db 14 + dw CUBONE + db BERRY + db 14 dw SNUBBULL db BERRY + db 15 + dw RAICHU + db BERRY db -1 ; end next_list_item ; POKEFANF (2) db "RUTH@", TRAINERTYPE_ITEM - db 17 - dw PIKACHU + db 23 + dw TANGELA db BERRY + db 23 + dw MARILL + db BERRY + db 24 + dw WOBUFFET + db GOLD_BERRY db -1 ; end next_list_item ; POKEFANF (3) @@ -5419,8 +5525,8 @@ PokefanFGroup: next_list_item ; POKEFANF (6) db "JAIME@", TRAINERTYPE_ITEM - db 16 - dw MEOWTH + db 28 + dw BELLEDAM db BERRY db -1 ; end @@ -5490,7 +5596,7 @@ OfficerGroup: db 14 dw SPINARAK db 14 - dw GROWLITHE + dw HOUNDOUR db -1 ; end end_list_items @@ -5499,9 +5605,9 @@ GruntFGroup: next_list_item ; GRUNTF (1) db "GRUNT@", TRAINERTYPE_NORMAL db 9 - dw ZUBAT + dw BITTYBAT db 11 - dw EKANS + dw MOIBELLE db -1 ; end next_list_item ; GRUNTF (2) @@ -5545,15 +5651,21 @@ GruntFGroup: MysticalmanGroup: next_list_item ; MYSTICALMAN (1) db "EUSINE@", TRAINERTYPE_MOVES - db 23 - dw DROWZEE - dw DREAM_EATER, HYPNOSIS, DISABLE, CONFUSION - db 23 + db 29 dw HAUNTER dw LICK, HYPNOSIS, MEAN_LOOK, CURSE - db 25 + db 30 + dw JUMPLUFF + dw MEGA_DRAIN, SLEEP_POWDER, LEECH_SEED, FAIRY_WIND + db 31 dw ELECTRODE dw SCREECH, SONICBOOM, THUNDER, ROLLOUT + db 30 + dw KADABRA + dw PSYBEAM, KINESIS, DISABLE, FLASH + db 32 + dw HYPNO + dw DREAM_EATER, HYPNOSIS, DISABLE, CONFUSION db -1 ; end end_list_items diff --git a/data/trainers/parties_new_classes.asm b/data/trainers/parties_new_classes.asm index 9d902a8..85ab1ae 100644 --- a/data/trainers/parties_new_classes.asm +++ b/data/trainers/parties_new_classes.asm @@ -199,6 +199,8 @@ KabufossilGroup: LassGroup: next_list_item ; LASS (1) db "CARRIE@", TRAINERTYPE_NORMAL + db 16 + dw CLEFFA db 18 dw SNUBBULL db -1 ; end @@ -206,11 +208,11 @@ LassGroup: next_list_item ; LASS (2) db "BRIDGET@", TRAINERTYPE_NORMAL db 15 - dw JIGGLYPUFF + dw AZURILL db 15 - dw JIGGLYPUFF - db 15 - dw JIGGLYPUFF + dw HAPPINY + db 17 + dw WIGGLYTUFF db -1 ; end next_list_item ; LASS (3) @@ -225,10 +227,10 @@ LassGroup: next_list_item ; LASS (4) db "KRISE@", TRAINERTYPE_NORMAL - db 12 - dw ODDISH db 15 - dw CUBONE + dw SUNBUD + db 15 + dw PHANPY db -1 ; end next_list_item ; LASS (5) @@ -279,12 +281,16 @@ LassGroup: next_list_item ; LASS (10) db "DANA@", TRAINERTYPE_MOVES - db 18 + db 25 dw FLAAFFY dw TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE - db 18 - dw PSYDUCK + db 24 + dw WEIRDUCK dw SCRATCH, TAIL_WHIP, DISABLE, CONFUSION + db 25 + dw RAITORA + dw QUICK_ATTACK, LEER, THUNDERSHOCK, ROAR + db -1 ; end next_list_item ; LASS (11) @@ -297,8 +303,12 @@ LassGroup: next_list_item ; LASS (12) db "CONNIE@", TRAINERTYPE_NORMAL - db 21 - dw MARILL + db 25 + dw MAGNETITE + db 25 + dw ANGORE + db 26 + dw FORRETRESS db -1 ; end next_list_item ; LASS (13) - originally Connie 3 @@ -789,8 +799,8 @@ TwinsGroup: next_list_item ; TWINS (2) db "ANN & ANNE@", TRAINERTYPE_MOVES db 16 - dw CLEFAIRY - dw GROWL, ENCORE, DOUBLESLAP, METRONOME + dw TOGEPI + dw CHARM, POISON_STING, METRONOME, SWEET_KISS db 16 dw JIGGLYPUFF dw SING, DEFENSE_CURL, POUND, DISABLE diff --git a/data/wild/johto_water.asm b/data/wild/johto_water.asm index e74e17b..ccaa1b1 100644 --- a/data/wild/johto_water.asm +++ b/data/wild/johto_water.asm @@ -228,9 +228,9 @@ JohtoWaterWildMons: def_water_wildmons CIANWOOD_CITY db 6 percent ; encounter rate - dbw 30, TENTACOOL - dbw 35, CHINCHOU - dbw 30, TENTACRUEL + dbw 25, TENTACOOL + dbw 20, CHINCHOU + dbw 25, TENTACRUEL end_water_wildmons def_water_wildmons OLIVINE_CITY diff --git a/data/wild/nihon_grass.asm b/data/wild/nihon_grass.asm index b3f32c5..64181d4 100644 --- a/data/wild/nihon_grass.asm +++ b/data/wild/nihon_grass.asm @@ -220,7 +220,7 @@ NihonGrassWildMons: dbw 35, WARUCHU ; nite dbw 30, MURKROW - dbw 31, FOXFIRE + dbw 31, ZORRIEGO dbw 30, MURKROW dbw 31, SNEASEL dbw 32, ARBOK @@ -250,7 +250,7 @@ NihonGrassWildMons: dbw 35, WARUCHU ; nite dbw 30, MURKROW - dbw 31, FOXFIRE + dbw 31, ZORRIEGO dbw 30, MURKROW dbw 31, SNEASEL dbw 32, ARBOK diff --git a/gfx/footprints/foxfire.png b/gfx/footprints/zorriego.png similarity index 100% rename from gfx/footprints/foxfire.png rename to gfx/footprints/zorriego.png diff --git a/gfx/footprints_johto.asm b/gfx/footprints_johto.asm index e10d3c4..04f7da1 100644 --- a/gfx/footprints_johto.asm +++ b/gfx/footprints_johto.asm @@ -61,7 +61,7 @@ INCBIN "gfx/footprints/sunbud.1bpp" INCBIN "gfx/footprints/sunflora.1bpp" INCBIN "gfx/footprints/hippunk.1bpp" INCBIN "gfx/footprints/aercrow.1bpp" -INCBIN "gfx/footprints/foxfire.1bpp" +INCBIN "gfx/footprints/zorriego.1bpp" INCBIN "gfx/footprints/yanma.1bpp" INCBIN "gfx/footprints/yanmega.1bpp" INCBIN "gfx/footprints/oniyanma.1bpp" diff --git a/gfx/pics.asm b/gfx/pics.asm index c3c8002..92f6d8d 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -850,8 +850,8 @@ SunbudFrontpic: INCBIN "gfx/pokemon/sunbud/front.animated.2bpp.lz" SunbudBackpic: INCBIN "gfx/pokemon/sunbud/back.2bpp.lz" HippunkFrontpic: INCBIN "gfx/pokemon/hippunk/front.animated.2bpp.lz" HippunkBackpic: INCBIN "gfx/pokemon/hippunk/back.2bpp.lz" -FoxfireFrontpic: INCBIN "gfx/pokemon/foxfire/front.animated.2bpp.lz" -FoxfireBackpic: INCBIN "gfx/pokemon/foxfire/back.2bpp.lz" +ZorriegoFrontpic: INCBIN "gfx/pokemon/zorriego/front.animated.2bpp.lz" +ZorriegoBackpic: INCBIN "gfx/pokemon/zorriego/back.2bpp.lz" YanmegaFrontpic: INCBIN "gfx/pokemon/yanmega/front.animated.2bpp.lz" YanmegaBackpic: INCBIN "gfx/pokemon/yanmega/back.2bpp.lz" OniyanmaFrontpic: INCBIN "gfx/pokemon/oniyanma/front.animated.2bpp.lz" diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index 8ea6157..60d065a 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -272,7 +272,7 @@ AnimationPointers: dw SunfloraAnimation dw HippunkAnimation dw AercrowAnimation - dw FoxfireAnimation + dw ZorriegoAnimation dw YanmaAnimation dw YanmegaAnimation dw OniyanmaAnimation diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index eac249b..e83873d 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -270,7 +270,7 @@ SunbudAnimation: INCLUDE "gfx/pokemon/sunbud/anim.asm" SunfloraAnimation: INCLUDE "gfx/pokemon/sunflora/anim.asm" HippunkAnimation: INCLUDE "gfx/pokemon/hippunk/anim.asm" AercrowAnimation: INCLUDE "gfx/pokemon/aercrow/anim.asm" -FoxfireAnimation: INCLUDE "gfx/pokemon/magneton/anim.asm" +ZorriegoAnimation: INCLUDE "gfx/pokemon/zorriego/anim.asm" YanmaAnimation: INCLUDE "gfx/pokemon/yanma/anim.asm" YanmegaAnimation: INCLUDE "gfx/pokemon/yanmega/anim.asm" OniyanmaAnimation: INCLUDE "gfx/pokemon/oniyanma/anim.asm" diff --git a/gfx/pokemon/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm index 5e7c6bd..60ad177 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -272,7 +272,7 @@ BitmasksPointers: dw SunfloraBitmasks dw HippunkBitmasks dw AercrowBitmasks - dw FoxfireBitmasks + dw ZorriegoBitmasks dw YanmaBitmasks dw YanmegaBitmasks dw OniyanmaBitmasks diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index 32af507..dc009bb 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -270,7 +270,7 @@ SunbudBitmasks: INCLUDE "gfx/pokemon/sunbud/bitmask.asm" SunfloraBitmasks: INCLUDE "gfx/pokemon/sunflora/bitmask.asm" HippunkBitmasks: INCLUDE "gfx/pokemon/hippunk/bitmask.asm" AercrowBitmasks: INCLUDE "gfx/pokemon/aercrow/bitmask.asm" -FoxfireBitmasks: INCLUDE "gfx/pokemon/foxfire/bitmask.asm" +ZorriegoBitmasks: INCLUDE "gfx/pokemon/zorriego/bitmask.asm" YanmaBitmasks: INCLUDE "gfx/pokemon/yanma/bitmask.asm" YanmegaBitmasks: INCLUDE "gfx/pokemon/yanmega/bitmask.asm" OniyanmaBitmasks: INCLUDE "gfx/pokemon/oniyanma/bitmask.asm" diff --git a/gfx/pokemon/frame_pointers.asm b/gfx/pokemon/frame_pointers.asm index da60595..f3828de 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -272,7 +272,7 @@ FramesPointers: dba SunfloraFrames dba HippunkFrames dba AercrowFrames - dba FoxfireFrames + dba ZorriegoFrames dba YanmaFrames dba YanmegaFrames dba OniyanmaFrames diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index e1a8eb5..937d7d8 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -272,7 +272,7 @@ AnimationIdlePointers: dw SunfloraAnimationIdle dw HippunkAnimationIdle dw AercrowAnimationIdle - dw FoxfireAnimationIdle + dw ZorriegoAnimationIdle dw YanmaAnimationIdle dw YanmegaAnimationIdle dw OniyanmaAnimationIdle diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index 24379c3..8e83b56 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -270,7 +270,7 @@ SunbudAnimationIdle: INCLUDE "gfx/pokemon/sunbud/anim_idle.asm" SunfloraAnimationIdle: INCLUDE "gfx/pokemon/sunflora/anim_idle.asm" HippunkAnimationIdle: INCLUDE "gfx/pokemon/hippunk/anim_idle.asm" AercrowAnimationIdle: INCLUDE "gfx/pokemon/aercrow/anim_idle.asm" -FoxfireAnimationIdle: INCLUDE "gfx/pokemon/foxfire/anim_idle.asm" +ZorriegoAnimationIdle: INCLUDE "gfx/pokemon/zorriego/anim_idle.asm" YanmaAnimationIdle: INCLUDE "gfx/pokemon/yanma/anim_idle.asm" YanmegaAnimationIdle: INCLUDE "gfx/pokemon/yanmega/anim_idle.asm" OniyanmaAnimationIdle: INCLUDE "gfx/pokemon/oniyanma/anim_idle.asm" diff --git a/gfx/pokemon/johto_frames.asm b/gfx/pokemon/johto_frames.asm index 4ba9be7..e899e49 100644 --- a/gfx/pokemon/johto_frames.asm +++ b/gfx/pokemon/johto_frames.asm @@ -60,7 +60,7 @@ SunbudFrames: INCLUDE "gfx/pokemon/sunbud/frames.asm" SunfloraFrames: INCLUDE "gfx/pokemon/sunflora/frames.asm" HippunkFrames: INCLUDE "gfx/pokemon/hippunk/frames.asm" AercrowFrames: INCLUDE "gfx/pokemon/aercrow/frames.asm" -FoxfireFrames: INCLUDE "gfx/pokemon/foxfire/frames.asm" +ZorriegoFrames: INCLUDE "gfx/pokemon/zorriego/frames.asm" YanmaFrames: INCLUDE "gfx/pokemon/yanma/frames.asm" YanmegaFrames: INCLUDE "gfx/pokemon/yanmega/frames.asm" OniyanmaFrames: INCLUDE "gfx/pokemon/oniyanma/frames.asm" diff --git a/gfx/pokemon/foxfire/anim.asm b/gfx/pokemon/zorriego/anim.asm similarity index 100% rename from gfx/pokemon/foxfire/anim.asm rename to gfx/pokemon/zorriego/anim.asm diff --git a/gfx/pokemon/foxfire/anim_idle.asm b/gfx/pokemon/zorriego/anim_idle.asm similarity index 100% rename from gfx/pokemon/foxfire/anim_idle.asm rename to gfx/pokemon/zorriego/anim_idle.asm diff --git a/gfx/pokemon/foxfire/back.png b/gfx/pokemon/zorriego/back.png similarity index 100% rename from gfx/pokemon/foxfire/back.png rename to gfx/pokemon/zorriego/back.png diff --git a/gfx/pokemon/foxfire/front.png b/gfx/pokemon/zorriego/front.png similarity index 100% rename from gfx/pokemon/foxfire/front.png rename to gfx/pokemon/zorriego/front.png diff --git a/gfx/pokemon/foxfire/shiny.pal b/gfx/pokemon/zorriego/shiny.pal similarity index 100% rename from gfx/pokemon/foxfire/shiny.pal rename to gfx/pokemon/zorriego/shiny.pal From a284fc5780a404027506ce1489f876f0a58a4481 Mon Sep 17 00:00:00 2001 From: Misty Date: Sun, 10 Aug 2025 18:21:19 -0600 Subject: [PATCH 09/15] oops Sharpoon isn't real it CAN'T hurt you. yet --- data/trainers/parties.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 1bfa3b1..6699a35 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -109,8 +109,8 @@ JasmineGroup: ; Jasmine is going to use Egg Moves! dw SKARMORY dw DRILL_PECK, SAND_ATTACK, STEEL_WING, LEER db 35 - dw SHARPOON - dw IRON_TAIL, BUBBLEBEAM, CRUNCH, SWORDS_DANCE + ; dw SHARPOON + ; dw IRON_TAIL, BUBBLEBEAM, CRUNCH, SWORDS_DANCE db 35 dw STEELIX dw SCREECH, SANDSTORM, ROCK_HEAD, IRON_TAIL @@ -5486,7 +5486,7 @@ PokefanFGroup: dw MARILL db BERRY db 24 - dw WOBUFFET + dw WOBBUFFET db GOLD_BERRY db -1 ; end From 39f72a817dd0114d4c254a9a3d37c7d96cb81172 Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Tue, 12 Aug 2025 01:58:21 -0400 Subject: [PATCH 10/15] Yijurou sprite --- gfx/trainers/yujirou.png | Bin 802 -> 468 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gfx/trainers/yujirou.png b/gfx/trainers/yujirou.png index 02a8cc231de97ed2c43df8f6488a0685225742ca..1af95126f939a8dd637b2411474fb0e97ac9e02a 100644 GIT binary patch delta 453 zcmV;$0XqJo2Gj$P8Gi!+005s@%Par@01Qw}R7L;)|M#tPYf6*=005+cU3UNg0fR|I zK~#9!&6bOf#UKboVdnq;c?I!NlP%a}lWp#!HJpM2q9Xt0BF~#TN%-$A2P2IGZk!$0 zSMsktlHbTM#rTv-3{g$A37u<_^_jYgCh{b1=0~ zaLOL2X=@YgU}2VKU|DF^qUvFGQJHh163J-aNg&I9Cy5YM=Jc34l;+Avk9x_19JJ|K zv=(|<`T*(jrl4-1*D5VJ?{h?~2iZt_ zq*VgaNKX?l-+y;m`(%y<-?Hh&$1GG|5RV?zs}HF-x(ACjm~{=e!2uSQviHRacCOfV z_D%t*HI4w6u$KHA5YhYX4$2GeaVf7r4Tt4empQ+A0_jOaK~!jg?O9ur+#n1Tsaz2b35QfZw9}>G z;gQ;|-AX0;a@l|yJz4@6Rh7R%e*H9nsQd@|wESa0ODUz4?5C7G1JtO)Ftyg~B_KXS zEc%3qNUarX`e#+Gwboj1swm2Cmvbnsj(0twl13?afD#tHlYdntP+BEDkpa3@h6Gw4 zBGW$$k${%M+tqsSy>~$Dz28@7!dP@wZ*TD4_-H#AESnXcp5)z$D|!=;OjS!EH9k<8 zP7om;*$?n&DFqOF?^~a?)__b^X}=2%bW%CSSaBFi|8k5$VY>a`Itu>!dV~mOOx0#+z|Aa;T(v#~w?&;Gh2GVxT79@yO zAS*?N&mR1E107uOTB7zpxz9V@VgS}PDww`Tmfgzl$RKf^x>(mx8ql>L@Zlk^suo0< z01B*Aq?&U9Vr#P%5ObD_M~S{z$z%FB9uElO;M{qs6n{!pMfQB$r@Wu+-~?MilgX4O ze6Ww^+Y5bXw<&5rPmYM+y*P(nO!5Bpy5yb0f&ik)oNn)|+k6Ow?MhgA7Hr zwT6H;h<_=RlB!G|E>gsrx{IvBPHL@pF89czh&o1GgTbV=X0{w-phj>gg+4A%r;%*{ zY%d}`=$yt!fO-{OHb=a)WOWNGQAuMnbBp5*Rr9)ND+Z+|-d(cC0=Tn`W*n>}&dM62V0dIYBq zLzfHD@4g=mUUIC%zVDJuoYPxtXxL8b^>xUmZTY2?m>j?KdgOY{gp5&33#9OcZvW|9 zlWC$PxxB+iNZ3e}2EwR}MJGPG)@oSeM0S$&&OEGm$3BfDEJ`MmJrJAZCW^=(rINVH UMGq^}>Hq)$07*qoM6N<$g5%z>% From 0111ae8d1d849ef52da25bdc9e5ffe9a35d98310 Mon Sep 17 00:00:00 2001 From: Misty Date: Sun, 17 Aug 2025 10:57:45 -0600 Subject: [PATCH 11/15] Fix Sage Neal I'm Silly --- data/trainers/parties.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 6699a35..1f557a2 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -5065,7 +5065,7 @@ SageGroup: db -1 ; end next_list_item ; SAGE (8) - db "NEAL@", TRAINERTYPE_NORMAL + db "NEAL@", TRAINERTYPE_MOVES db 5 dw KOTORA dw THUNDERSHOCK, TACKLE, FLASH, NO_MOVE From c01fef279f65b2939ed019be5ebbb8e56c59d041 Mon Sep 17 00:00:00 2001 From: Misty Date: Fri, 22 Aug 2025 12:39:16 -0600 Subject: [PATCH 12/15] Update parties.asm --- data/trainers/parties.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 1f557a2..c6ed50f 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -2664,7 +2664,7 @@ BugCatcherGroup: db -1 ; end next_list_item ; BUG_CATCHER (19) - db "WAYNE@", TRAINERTYPE_NORMAL + db "WAYNE@", TRAINERTYPE_MOVES db 9 dw LEDYBA dw TACKLE, SUPERSONIC, HEADBUTT, NO_MOVE From af631e25e359498d481370038493dfe83c5370d3 Mon Sep 17 00:00:00 2001 From: Shawesomest <179829952+Shawesomest@users.noreply.github.com> Date: Wed, 27 Aug 2025 13:06:16 -0400 Subject: [PATCH 13/15] Revoked Wayne's Crashing Privileges Updated parties.asm so that Bug Catcher Wayne's Folage and Pineco had movesets. --- data/trainers/parties.asm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index c6ed50f..e55e704 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -2670,8 +2670,10 @@ BugCatcherGroup: dw TACKLE, SUPERSONIC, HEADBUTT, NO_MOVE db 10 dw FOLAGE + dw TACKLE, STRING_SHOT, PROTECT, SAFEGUARD db 10 dw PINECO + dw TACKLE, PROTECT, SELFDESTRUCT, PIN_MISSILE db -1 ; end next_list_item ; BUG_CATCHER (20) From ebaeaa8ca77bd3550d88d7227a1b92335215df9d Mon Sep 17 00:00:00 2001 From: thornAvery <145814585+thornAvery@users.noreply.github.com> Date: Mon, 1 Sep 2025 12:56:04 +1000 Subject: [PATCH 14/15] Tossing balls lag back to Crystal levels (#73) Co-authored-by: Thorn Avery --- .gitignore | 4 ++++ engine/items/item_effects.asm | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 586d447..c63e2dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +# BGB + +bgb + # compiled objects *.o diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index cd4d2d2..51c3b0f 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -239,10 +239,12 @@ PokeBallEffect: ld [wWildMon], a ld a, [wBattleType] cp BATTLETYPE_CONTEST ; Fixes the Park Ball corrupting graphics when used outside of a Contest - call nz, ReturnToBattle_UseBall + jp z, .skip_return_to_battle cp BATTLETYPE_SAFARI - call nz, ReturnToBattle_UseBall + jp z, .skip_return_to_battle + call ReturnToBattle_UseBall +.skip_return_to_battle ld hl, wOptions res NO_TEXT_SCROLL, [hl] ld hl, ItemUsedText From b632b469c215b30b133108b4f247d3b8d7d436c6 Mon Sep 17 00:00:00 2001 From: thornAvery <145814585+thornAvery@users.noreply.github.com> Date: Thu, 4 Sep 2025 19:48:15 +1000 Subject: [PATCH 15/15] Shiny Pokedex Fix + Personal Gripe (#79) * Tossing balls lag back to Crystal levels * reversed order of text speed options * fixed shiny palette on pokedex new entry * fixed shiny palette on pokedex new entry + gamecorner * added fix to celadon too --------- Co-authored-by: Thorn Avery --- data/events/special_pointers.asm | 1 + engine/events/specials.asm | 15 ++++++++++++--- engine/items/item_effects.asm | 9 +++++++++ engine/menus/options_menu.asm | 6 +++--- engine/pokemon/move_mon.asm | 18 +++++++++++++++++- maps/CeladonGameCornerPrizeRoom.asm | 6 ++++++ maps/GoldenrodGameCorner.asm | 6 ++++++ ram/wram.asm | 1 + 8 files changed, 55 insertions(+), 7 deletions(-) diff --git a/data/events/special_pointers.asm b/data/events/special_pointers.asm index 1f1a1ae..1f9c8d8 100644 --- a/data/events/special_pointers.asm +++ b/data/events/special_pointers.asm @@ -69,6 +69,7 @@ SpecialsPointers:: add_special UpdateSprites ; bank 0 add_special UpdatePlayerSprite ; bank 0 add_special GameCornerPrizeMonCheckDex + add_special GameCornerPrizeMonShowDex add_special UnusedSetSeenMon ; unused add_special WaitSFX ; bank 0 add_special PlayMapMusic ; bank 0 diff --git a/engine/events/specials.asm b/engine/events/specials.asm index 10cf094..645eabb 100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -236,17 +236,26 @@ SetPlayerPalette: ret GameCornerPrizeMonCheckDex: + xor a + ld [wPokedexShinyToggle], a + ld [wWasMonCaught], a ld a, [wScriptVar] call CheckCaughtMon ret nz - ld a, [wScriptVar] - call SetSeenAndCaughtMon + ld a, 1 + ld [wWasMonCaught], a + ret + +GameCornerPrizeMonShowDex: + ld a, [wWasMonCaught] + cp 0 + ret z call FadeToMenu ld a, [wScriptVar] ld [wNamedObjectIndex], a farcall NewPokedexEntry call ExitAllMenus - ret + ret UnusedSetSeenMon: ld a, [wScriptVar] diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 51c3b0f..1cd551a 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -532,6 +532,15 @@ PokeBallEffect: ld a, [wEnemyMonSpecies] ld [wTempSpecies], a + farcall BattleCheckEnemyShininess + jp c, .shiny + xor a + jp .shinycont +.shiny + xor a + inc a +.shinycont + ld [wPokedexShinyToggle], a predef NewPokedexEntry .skip_pokedex diff --git a/engine/menus/options_menu.asm b/engine/menus/options_menu.asm index 6bb630f..8d1626c 100644 --- a/engine/menus/options_menu.asm +++ b/engine/menus/options_menu.asm @@ -114,9 +114,9 @@ GetOptionPointer: Options_TextSpeed: call GetTextSpeed ldh a, [hJoyPressed] - bit D_LEFT_F, a - jr nz, .LeftPressed bit D_RIGHT_F, a + jr nz, .RightPressed + bit D_LEFT_F, a jr z, .NonePressed ld a, c ; right pressed cp OPT_TEXT_SPEED_NONE @@ -128,7 +128,7 @@ Options_TextSpeed: ld a, e jr .Save -.LeftPressed: +.RightPressed: ld a, c and a jr nz, .Decrease diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index de10b57..c9a4f89 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -210,8 +210,24 @@ endr inc de ld a, c ld [de], a - inc de + ; Set Shininess for New Dex Entry + dec de + ld b, d + ld c, e + farcall CheckShininess + jp c, .shiny + xor a + jp .shinycont +.shiny + xor a + inc a +.shinycont + ld [wPokedexShinyToggle], a + ; Unclobber de + inc de + inc de + ; Initialize PP. push hl push de diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 55ab9aa..65cc864 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -154,6 +154,8 @@ CeladonGameCornerPrizeRoomPokemonVendor: loadmonindex 1, PIKACHU special GameCornerPrizeMonCheckDex givepoke PIKACHU, 25 + loadmonindex 1, PIKACHU + special GameCornerPrizeMonShowDex takecoins CELADONGAMECORNERPRIZEROOM_PIKACHU_COINS sjump .loop @@ -172,6 +174,8 @@ CeladonGameCornerPrizeRoomPokemonVendor: loadmonindex 2, PORYGON special GameCornerPrizeMonCheckDex givepoke PORYGON, 15 + loadmonindex 2, PORYGON + special GameCornerPrizeMonShowDex takecoins CELADONGAMECORNERPRIZEROOM_PORYGON_COINS sjump .loop @@ -190,6 +194,8 @@ CeladonGameCornerPrizeRoomPokemonVendor: loadmonindex 3, LARVITAR special GameCornerPrizeMonCheckDex givepoke LARVITAR, 40 + loadmonindex 3, LARVITAR + special GameCornerPrizeMonShowDex takecoins CELADONGAMECORNERPRIZEROOM_LARVITAR_COINS sjump .loop diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 4d5ae20..c298696 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -190,6 +190,8 @@ GoldenrodGameCornerPrizeMonVendorScript: loadmonindex 1, ABRA special GameCornerPrizeMonCheckDex givepoke ABRA, 5 + loadmonindex 1, ABRA + special GameCornerPrizeMonShowDex takecoins GOLDENRODGAMECORNER_ABRA_COINS sjump .loop @@ -208,6 +210,8 @@ GoldenrodGameCornerPrizeMonVendorScript: loadmonindex 2, CUBONE special GameCornerPrizeMonCheckDex givepoke CUBONE, 15 + loadmonindex 2, CUBONE + special GameCornerPrizeMonShowDex takecoins GOLDENRODGAMECORNER_CUBONE_COINS sjump .loop @@ -226,6 +230,8 @@ GoldenrodGameCornerPrizeMonVendorScript: loadmonindex 3, WOBBUFFET special GameCornerPrizeMonCheckDex givepoke WOBBUFFET, 15 + loadmonindex 3, WOBBUFFET + special GameCornerPrizeMonShowDex takecoins GOLDENRODGAMECORNER_WOBBUFFET_COINS sjump .loop diff --git a/ram/wram.asm b/ram/wram.asm index 5d4b7a0..018c963 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -739,6 +739,7 @@ wPokedexDisplayNumber:: dw wDexLastSeenIndex:: db ; index into wPokedexSeen containing the last non-zero value wDexLastSeenValue:: db ; value at index wDexTempCounter:: dw +wWasMonCaught:: db ; for use with givepoke wPokedexDataEnd:: wPrevDexEntry:: dw