From 0f7ce337f5eb6b58753b2f6c7a14d2e1d4d861f0 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sun, 18 Aug 2024 15:23:29 +0100 Subject: [PATCH] ROM builds, assign music, update Tanobi/Trustan/Foxfire This updates the file structure so the ROM builds properly. It also updates the base stat files of Trustan, Tanobi, and Foxfire (name tbc), and updates Tanobi's name as was meant to be done a while ago. I've also assigned Luci's music as she describes in her track files. --- audio.asm | 4 +-- constants/pokemon_constants.asm | 2 +- data/maps/maps.asm | 24 ++++++------- data/pokemon/base_stats.asm | 2 +- data/pokemon/base_stats/foxfire.asm | 6 ++-- .../base_stats/{amanobi.asm => tanobi.asm} | 4 +-- data/pokemon/base_stats/trustan.asm | 2 +- data/pokemon/cries.asm | 2 +- data/pokemon/dex_entries.asm | 2 +- data/pokemon/dex_entries/amanobi.asm | 2 +- 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_new_classes.asm | 2 +- gfx/footprints/{amanobi.png => tanobi.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/{amanobi => tanobi}/anim.asm | 0 gfx/pokemon/{amanobi => tanobi}/anim_idle.asm | 0 gfx/pokemon/{amanobi => tanobi}/back.png | Bin gfx/pokemon/{amanobi => tanobi}/front.png | Bin gfx/pokemon/{amanobi => tanobi}/shiny.pal | 0 gfx/tilesets.asm | 33 ++++++++++-------- maps/LavenderCrypt.asm | 4 +-- 40 files changed, 72 insertions(+), 69 deletions(-) rename data/pokemon/base_stats/{amanobi.asm => tanobi.asm} (91%) rename gfx/footprints/{amanobi.png => tanobi.png} (100%) rename gfx/pokemon/{amanobi => tanobi}/anim.asm (100%) rename gfx/pokemon/{amanobi => tanobi}/anim_idle.asm (100%) rename gfx/pokemon/{amanobi => tanobi}/back.png (100%) rename gfx/pokemon/{amanobi => tanobi}/front.png (100%) rename gfx/pokemon/{amanobi => tanobi}/shiny.pal (100%) diff --git a/audio.asm b/audio.asm index b21ad8e..2bcdba3 100644 --- a/audio.asm +++ b/audio.asm @@ -23,8 +23,6 @@ INCLUDE "audio/music/goldenrodcity.asm" INCLUDE "audio/music/vermilioncity.asm" INCLUDE "audio/music/titlescreen.asm" INCLUDE "audio/music/ruinsofalphinterior.asm" -INCLUDE "audio/music/lookpokemaniac.asm" -INCLUDE "audio/music/trainervictory.asm" SECTION "Songs 2", ROMX @@ -72,6 +70,8 @@ INCLUDE "audio/music/healpokemon.asm" INCLUDE "audio/music/evolution.asm" INCLUDE "audio/music/printer.asm" +INCLUDE "audio/music/lookpokemaniac.asm" ; had to be moved because of the changes to the music pointers, for some reason we had free space here. +INCLUDE "audio/music/trainervictory.asm" SECTION "Songs 4", ROMX diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 53ef84d..b89eda3 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -378,7 +378,7 @@ DEF JOHTO_POKEMON EQU const_value const CACAWPHONY const TREBIR const SAKURAZE - const AMANOBI + const TANOBI const TRUSTAN const KUWAGUARD const TONQUITO diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 81fe8d2..21e9f29 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -431,11 +431,11 @@ MapGroup_Lavender: map LavRadioTower1F, TILESET_RADIO_TOWER, INDOOR, LANDMARK_LAV_RADIO_TOWER, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route8SaffronGate, TILESET_GATE, GATE, LANDMARK_ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route12SuperRodHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_12, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map LavenderCrypt, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE - map LavenderCryptSet1, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE - map LavenderCryptSet2, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE - map LavenderCryptSet3, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE - map LavenderCryptDokuroarsRoom, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE + map LavenderCrypt, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDERCRYPT, TRUE, PALETTE_NITE, FISHGROUP_NONE + map LavenderCryptSet1, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDERCRYPT, TRUE, PALETTE_NITE, FISHGROUP_NONE + map LavenderCryptSet2, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDERCRYPT, TRUE, PALETTE_NITE, FISHGROUP_NONE + map LavenderCryptSet3, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDERCRYPT, TRUE, PALETTE_NITE, FISHGROUP_NONE + map LavenderCryptDokuroarsRoom, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDERCRYPT, TRUE, PALETTE_NITE, FISHGROUP_NONE map HauntedHouseFoyer, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_HAUNTED_HOUSE, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE map HauntedHouse1F, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_HAUNTED_HOUSE, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE map HauntedHouse2F, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_HAUNTED_HOUSE, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE @@ -685,20 +685,20 @@ MapGroup_SilentHills: table_width MAP_LENGTH, MapGroup_SilentHills map WinnersPath, TILESET_CAVE, CAVE, LANDMARK_WINNERS_PATH, MUSIC_VICTORY_ROAD, FALSE, PALETTE_NITE, FISHGROUP_DRATINI ; Sounds like a funny fishgroup map WinnersPathOutside, TILESET_NIHON_01, ROUTE, LANDMARK_WINNERS_PATH, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_NONE - map Route66, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_66, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN + map Route66, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_66, MUSIC_NIHONTIME, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, TRUE, PALETTE_AUTO, FISHGROUP_NONE map DebugRoom, TILESET_NIHON_01, TOWN, LANDMARK_DEBUG_ROOM, MUSIC_SINJOH_RUINS, TRUE, PALETTE_AUTO, FISHGROUP_SHORE - map Route49, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND - map QuietCave, TILESET_NIHON_01, ROUTE, LANDMARK_QUIET_CAVE, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND - map Route49_2, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND + map Route49, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_NIHONTIME, TRUE, PALETTE_AUTO, FISHGROUP_POND + map QuietCave, TILESET_NIHON_01, ROUTE, LANDMARK_QUIET_CAVE, MUSIC_NIHONTIME, TRUE, PALETTE_AUTO, FISHGROUP_POND + map Route49_2, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_NIHONTIME, TRUE, PALETTE_AUTO, FISHGROUP_POND map SilentHillsPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE map SilversHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE map CalsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE map CalsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE map SinjohRuinsExterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_NONE map SinjohRuinsInterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_NONE - map Route49OldCityGate1F, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_NONE - map Route49OldCityGate2F, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_NONE + map Route49OldCityGate1F, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_49, MUSIC_NIHONTIME, FALSE, PALETTE_DAY, FISHGROUP_NONE + map Route49OldCityGate2F, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_49, MUSIC_NIHONTIME, FALSE, PALETTE_DAY, FISHGROUP_NONE map BlueLab, TILESET_BLUE_LAB, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_POKEMON_TALK, FALSE, PALETTE_DAY, FISHGROUP_NONE assert_table_length NUM_SILENT_HILLS_MAPS @@ -718,7 +718,7 @@ MapGroup_OldCity: map PokemonPagoda3F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE map PokemonPagoda4F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE map PokemonPagoda5F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE - map Route50, TILESET_NIHON_OLD, ROUTE, LANDMARK_ROUTE_50, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_NONE + map Route50, TILESET_NIHON_OLD, ROUTE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, TRUE, PALETTE_AUTO, FISHGROUP_NONE map JackysHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_50, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE assert_table_length NUM_OLD_CITY_MAPS diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index a536a64..36304d0 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -383,7 +383,7 @@ INCLUDE "data/pokemon/base_stats/sonegg.asm" INCLUDE "data/pokemon/base_stats/cacawphony.asm" INCLUDE "data/pokemon/base_stats/trebir.asm" INCLUDE "data/pokemon/base_stats/sakuraze.asm" -INCLUDE "data/pokemon/base_stats/amanobi.asm" +INCLUDE "data/pokemon/base_stats/tanobi.asm" INCLUDE "data/pokemon/base_stats/trustan.asm" INCLUDE "data/pokemon/base_stats/kuwaguard.asm" INCLUDE "data/pokemon/base_stats/tonquito.asm" diff --git a/data/pokemon/base_stats/foxfire.asm b/data/pokemon/base_stats/foxfire.asm index da09880..db3374b 100644 --- a/data/pokemon/base_stats/foxfire.asm +++ b/data/pokemon/base_stats/foxfire.asm @@ -1,9 +1,9 @@ db FOXFIRE ; species ID placeholder - db 70, 65, 60, 85, 85, 80 + db 55, 85, 50, 115, 100, 70 ; hp atk def spd sat sdf - db FIRE, FIRE ; type + db FIRE, ELECTRIC ; type db 130 ; catch rate db 110 ; base exp db BURNT_BERRY, BURNT_BERRY ; items @@ -17,5 +17,5 @@ dn EGG_GROUND, EGG_GROUND ; egg groups ; tm/hm learnset - tmhm HEADBUTT, CURSE, ROAR, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, STRENGTH, FLAMETHROWER + tmhm HEADBUTT, CURSE, ROAR, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, STRENGTH, FLAMETHROWER, THUNDERBOLT, THUNDER ; end diff --git a/data/pokemon/base_stats/amanobi.asm b/data/pokemon/base_stats/tanobi.asm similarity index 91% rename from data/pokemon/base_stats/amanobi.asm rename to data/pokemon/base_stats/tanobi.asm index e951c44..5d0c56e 100644 --- a/data/pokemon/base_stats/amanobi.asm +++ b/data/pokemon/base_stats/tanobi.asm @@ -1,6 +1,6 @@ db 0 ; species ID placeholder - db 50, 90, 65, 105, 75, 50 + db 80, 90, 85, 105, 75, 50 ; hp atk def spd sat sdf db FIGHTING, STEEL ; type @@ -11,7 +11,7 @@ db 100 ; unknown 1 db 120 ; step cycles to hatch db 5 ; unknown 2 - INCBIN "gfx/pokemon/amanobi/front.dimensions" + INCBIN "gfx/pokemon/tanobi/front.dimensions" dw NULL, NULL ; unused (beta front/back pics) db GROWTH_MEDIUM_SLOW ; growth rate ; PLACEHOLDER dn EGG_NONE, EGG_NONE ; egg groups diff --git a/data/pokemon/base_stats/trustan.asm b/data/pokemon/base_stats/trustan.asm index a7cf768..6bc0892 100644 --- a/data/pokemon/base_stats/trustan.asm +++ b/data/pokemon/base_stats/trustan.asm @@ -1,6 +1,6 @@ db 0 ; species ID placeholder - db 50, 75, 40, 115, 95, 50 + db 100, 75, 65, 105, 90, 50 ; hp atk def spd sat sdf db NORMAL, FIRE ; type diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index db1d794..2d87592 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -362,7 +362,7 @@ PokemonCries:: mon_cry CRY_NIDORAN_M, 0, 128 ; CACAWPHONY mon_cry CRY_NIDORAN_M, 0, 128 ; TREBIR mon_cry CRY_NIDORAN_M, 0, 128 ; SAKURAZE - mon_cry CRY_NIDORAN_M, 0, 128 ; AMANOBI + mon_cry CRY_NIDORAN_M, 0, 128 ; TANOBI mon_cry CRY_NIDORAN_M, 0, 128 ; TRUSTAN mon_cry CRY_NIDORAN_M, 0, 128 ; KUWAGUARD mon_cry CRY_NIDORAN_M, 0, 128 ; TONQUITO diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 405303e..c144b5c 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -355,7 +355,7 @@ SoneggPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sonegg.asm" CacawphonyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/cacawphony.asm" TrebirPokedexEntry:: INCLUDE "data/pokemon/dex_entries/trebir.asm" SakurazePokedexEntry:: INCLUDE "data/pokemon/dex_entries/sakuraze.asm" -AmanobiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/amanobi.asm" +TanobiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tanobi.asm" TrustanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/trustan.asm" KuwaguardPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kuwaguard.asm" TonquitoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tonquito.asm" diff --git a/data/pokemon/dex_entries/amanobi.asm b/data/pokemon/dex_entries/amanobi.asm index c656082..356bcd7 100644 --- a/data/pokemon/dex_entries/amanobi.asm +++ b/data/pokemon/dex_entries/amanobi.asm @@ -1,7 +1,7 @@ db "SHINOBI@" ; species name dw 311, 191 ; height, weight - placeholder - db "AMANOBI assisted" + db "TANOBI assisted" next "ninja warriors in" next "the distant past." diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index 888ef86..601f7a2 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -357,7 +357,7 @@ PokedexDataPointerTable: dba CacawphonyPokedexEntry dba TrebirPokedexEntry dba SakurazePokedexEntry - dba AmanobiPokedexEntry + dba TanobiPokedexEntry dba TrustanPokedexEntry dba KuwaguardPokedexEntry dba TonquitoPokedexEntry diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index f193148..744b76a 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -7,7 +7,7 @@ AlphabeticalPokedexOrder: dw AERODACTYL dw AIPOM dw ALAKAZAM - dw AMANOBI + dw TANOBI dw AMBIPOM dw AMPHAROS dw ANGORE diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index d3c4d78..8e919db 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -326,7 +326,7 @@ NewPokedexOrder: dw CACAWPHONY dw TREBIR dw SAKURAZE - dw AMANOBI + dw TANOBI dw TRUSTAN dw KUWAGUARD dw TONQUITO diff --git a/data/pokemon/egg_moves_johto.asm b/data/pokemon/egg_moves_johto.asm index 0bda154..b64f953 100644 --- a/data/pokemon/egg_moves_johto.asm +++ b/data/pokemon/egg_moves_johto.asm @@ -146,7 +146,7 @@ EggMovePointers2:: dw NoEggMoves2 dw NoEggMoves2 dw SakurazeEggMoves - dw AmanobiEggMoves + dw TanobiEggMoves dw TrustanEggMoves dw KuwaguardEggMoves dw TonquitoEggMoves @@ -652,7 +652,7 @@ SakurazeEggMoves: dw MORNING_SUN dw -1 ;end -AmanobiEggMoves: +TanobiEggMoves: dw EXTREMESPEED dw FAINT_ATTACK dw FURY_SWIPES diff --git a/data/pokemon/evolution_moves.asm b/data/pokemon/evolution_moves.asm index a5ad4b0..2e5dac1 100644 --- a/data/pokemon/evolution_moves.asm +++ b/data/pokemon/evolution_moves.asm @@ -355,7 +355,7 @@ EvolutionMoves:: dw NO_MOVE ;CACAWPHONY dw NO_MOVE ;TREBIR dw NO_MOVE ;SAKURAZE - dw NO_MOVE ;AMANOBI + dw NO_MOVE ;TANOBI dw NO_MOVE ;TRUSTAN dw NO_MOVE ;KUWAGUARD dw NO_MOVE ;TONQUITO diff --git a/data/pokemon/evos_attacks_johto.asm b/data/pokemon/evos_attacks_johto.asm index b2d16c0..f8da0c8 100644 --- a/data/pokemon/evos_attacks_johto.asm +++ b/data/pokemon/evos_attacks_johto.asm @@ -145,7 +145,7 @@ EvosAttacksPointers2:: dw CacawphonyEvosAttacks dw TrebirEvosAttacks dw SakurazeEvosAttacks - dw AmanobiEvosAttacks + dw TanobiEvosAttacks dw TrustanEvosAttacks dw KuwaguardEvosAttacks dw TonquitoEvosAttacks @@ -2171,7 +2171,7 @@ SakurazeEvosAttacks: dbw 44, SOLARBEAM db 0 ; no more level-up moves -AmanobiEvosAttacks: ; TODO: review moveset, it's fighting/steel +TanobiEvosAttacks: ; TODO: review moveset, it's fighting/steel 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 4f3900d..6f8d32d 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -357,7 +357,7 @@ FirstEvoStages:: dw SONEGG dw SONEGG dw SAKURAZE - dw AMANOBI + dw TANOBI dw TRUSTAN dw KUWAGUARD dw TONQUITO diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 1c9d9d9..5cf3932 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -358,7 +358,7 @@ MonMenuIcons: db ICON_BIRD ; CACAWPHONY db ICON_BIRD ; TREBIR db ICON_ODDISH ; SAKURAZE - Want this to be the old Flower icon - db ICON_FOX ; AMANOBI + db ICON_FOX ; TANOBI db ICON_FOX ; TRUSTAN db ICON_BUG ; KUWAGUARD db ICON_BUG ; TONQUITO diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 4d7de2e..9345f5c 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -361,7 +361,7 @@ PokemonNames:: db "CACAWPHONY" db "TREBIR@@@@" db "SAKURAZE@@" - db "AMANOBI@@@" + db "TANOBI@@@" db "TRUSTAN@@@" db "KUWAGUARD@" db "TONQUITO@@" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index ac2c73f..a171c12 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -746,8 +746,8 @@ INCBIN "gfx/pokemon/trebir/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/trebir/shiny.pal" INCBIN "gfx/pokemon/sakuraze/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/sakuraze/shiny.pal" -INCBIN "gfx/pokemon/amanobi/front.gbcpal", middle_colors -INCLUDE "gfx/pokemon/amanobi/shiny.pal" +INCBIN "gfx/pokemon/tanobi/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/tanobi/shiny.pal" INCBIN "gfx/pokemon/trustan/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/trustan/shiny.pal" INCBIN "gfx/pokemon/kuwaguard/front.gbcpal", middle_colors diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index f8bf2f3..5d44322 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -728,8 +728,8 @@ PokemonPicPointers:: dba TrebirBackpic dba SakurazeFrontpic dba SakurazeBackpic - dba AmanobiFrontpic - dba AmanobiBackpic + dba TanobiFrontpic + dba TanobiBackpic dba TrustanFrontpic dba TrustanBackpic dba KuwaguardFrontpic diff --git a/data/trainers/parties_new_classes.asm b/data/trainers/parties_new_classes.asm index 351d6da..fd1ce48 100644 --- a/data/trainers/parties_new_classes.asm +++ b/data/trainers/parties_new_classes.asm @@ -733,7 +733,7 @@ JackGroup: next_list_item db "JACKY@", TRAINERTYPE_MOVES db 50 - dw AMANOBI ; Kage-Maru + dw TANOBI ; Kage-Maru dw METAL_CLAW, SPIKES, FIRE_SPIN, PETAL_DANCE db 50 dw ANNIHILAPE diff --git a/gfx/footprints/amanobi.png b/gfx/footprints/tanobi.png similarity index 100% rename from gfx/footprints/amanobi.png rename to gfx/footprints/tanobi.png diff --git a/gfx/footprints_johto.asm b/gfx/footprints_johto.asm index 4a58650..50cc9c9 100644 --- a/gfx/footprints_johto.asm +++ b/gfx/footprints_johto.asm @@ -145,7 +145,7 @@ INCBIN "gfx/footprints/sonegg.1bpp" INCBIN "gfx/footprints/cacawphony.1bpp" INCBIN "gfx/footprints/trebir.1bpp" INCBIN "gfx/footprints/sakuraze.1bpp" -INCBIN "gfx/footprints/amanobi.1bpp" +INCBIN "gfx/footprints/tanobi.1bpp" INCBIN "gfx/footprints/trustan.1bpp" INCBIN "gfx/footprints/kuwaguard.1bpp" INCBIN "gfx/footprints/tonquito.1bpp" diff --git a/gfx/pics.asm b/gfx/pics.asm index 96f2532..0c6f334 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -800,8 +800,8 @@ TrebirFrontpic: INCBIN "gfx/pokemon/trebir/front.animated.2bpp.lz" TrebirBackpic: INCBIN "gfx/pokemon/trebir/back.2bpp.lz" SakurazeFrontpic: INCBIN "gfx/pokemon/sakuraze/front.animated.2bpp.lz" SakurazeBackpic: INCBIN "gfx/pokemon/sakuraze/back.2bpp.lz" -AmanobiFrontpic: INCBIN "gfx/pokemon/amanobi/front.animated.2bpp.lz" -AmanobiBackpic: INCBIN "gfx/pokemon/amanobi/back.2bpp.lz" +TanobiFrontpic: INCBIN "gfx/pokemon/tanobi/front.animated.2bpp.lz" +TanobiBackpic: INCBIN "gfx/pokemon/tanobi/back.2bpp.lz" TrustanFrontpic: INCBIN "gfx/pokemon/trustan/front.animated.2bpp.lz" TrustanBackpic: INCBIN "gfx/pokemon/trustan/back.2bpp.lz" KuwaguardFrontpic: INCBIN "gfx/pokemon/kuwaguard/front.animated.2bpp.lz" diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index 1a30e47..9c1a8c4 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -357,7 +357,7 @@ AnimationPointers: dw CacawphonyAnimation dw TrebirAnimation dw SakurazeAnimation - dw AmanobiAnimation + dw TanobiAnimation dw TrustanAnimation dw KuwaguardAnimation dw TonquitoAnimation diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index e179273..0d199cd 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -355,7 +355,7 @@ SoneggAnimation: INCLUDE "gfx/pokemon/sonegg/anim.asm" CacawphonyAnimation: INCLUDE "gfx/pokemon/cacawphony/anim.asm" TrebirAnimation: INCLUDE "gfx/pokemon/trebir/anim.asm" SakurazeAnimation: INCLUDE "gfx/pokemon/sakuraze/anim.asm" -AmanobiAnimation: INCLUDE "gfx/pokemon/amanobi/anim.asm" +TanobiAnimation: INCLUDE "gfx/pokemon/tanobi/anim.asm" TrustanAnimation: INCLUDE "gfx/pokemon/trustan/anim.asm" KuwaguardAnimation: INCLUDE "gfx/pokemon/kuwaguard/anim.asm" TonquitoAnimation: INCLUDE "gfx/pokemon/tonquito/anim.asm" diff --git a/gfx/pokemon/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm index ef0c135..13bfd58 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -357,7 +357,7 @@ BitmasksPointers: dw CacawphonyBitmasks dw TrebirBitmasks dw SakurazeBitmasks - dw AmanobiBitmasks + dw TanobiBitmasks dw TrustanBitmasks dw KuwaguardBitmasks dw TonquitoBitmasks diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index b97eb44..3cc4dc0 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -355,7 +355,7 @@ SoneggBitmasks: INCLUDE "gfx/pokemon/sonegg/bitmask.asm" CacawphonyBitmasks: INCLUDE "gfx/pokemon/cacawphony/bitmask.asm" TrebirBitmasks: INCLUDE "gfx/pokemon/trebir/bitmask.asm" SakurazeBitmasks: INCLUDE "gfx/pokemon/sakuraze/bitmask.asm" -AmanobiBitmasks: INCLUDE "gfx/pokemon/amanobi/bitmask.asm" +TanobiBitmasks: INCLUDE "gfx/pokemon/tanobi/bitmask.asm" TrustanBitmasks: INCLUDE "gfx/pokemon/trustan/bitmask.asm" KuwaguardBitmasks: INCLUDE "gfx/pokemon/kuwaguard/bitmask.asm" TonquitoBitmasks: INCLUDE "gfx/pokemon/tonquito/bitmask.asm" diff --git a/gfx/pokemon/frame_pointers.asm b/gfx/pokemon/frame_pointers.asm index 42a0d94..86dac5c 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -357,7 +357,7 @@ FramesPointers: dba CacawphonyFrames dba TrebirFrames dba SakurazeFrames - dba AmanobiFrames + dba TanobiFrames dba TrustanFrames dba KuwaguardFrames dba TonquitoFrames diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index b745087..868ae00 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -357,7 +357,7 @@ AnimationIdlePointers: dw CacawphonyAnimationIdle dw TrebirAnimationIdle dw SakurazeAnimationIdle - dw AmanobiAnimationIdle + dw TanobiAnimationIdle dw TrustanAnimationIdle dw KuwaguardAnimationIdle dw TonquitoAnimationIdle diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index 8bc281a..3f1091e 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -355,7 +355,7 @@ SoneggAnimationIdle: INCLUDE "gfx/pokemon/sonegg/anim_idle.asm" CacawphonyAnimationIdle: INCLUDE "gfx/pokemon/cacawphony/anim_idle.asm" TrebirAnimationIdle: INCLUDE "gfx/pokemon/trebir/anim_idle.asm" SakurazeAnimationIdle: INCLUDE "gfx/pokemon/sakuraze/anim_idle.asm" -AmanobiAnimationIdle: INCLUDE "gfx/pokemon/amanobi/anim_idle.asm" +TanobiAnimationIdle: INCLUDE "gfx/pokemon/tanobi/anim_idle.asm" TrustanAnimationIdle: INCLUDE "gfx/pokemon/trustan/anim_idle.asm" KuwaguardAnimationIdle: INCLUDE "gfx/pokemon/kuwaguard/anim_idle.asm" TonquitoAnimationIdle: INCLUDE "gfx/pokemon/tonquito/anim_idle.asm" diff --git a/gfx/pokemon/johto_frames.asm b/gfx/pokemon/johto_frames.asm index 684478d..54fdf9b 100644 --- a/gfx/pokemon/johto_frames.asm +++ b/gfx/pokemon/johto_frames.asm @@ -145,7 +145,7 @@ SoneggFrames: INCLUDE "gfx/pokemon/sonegg/frames.asm" CacawphonyFrames: INCLUDE "gfx/pokemon/cacawphony/frames.asm" TrebirFrames: INCLUDE "gfx/pokemon/trebir/frames.asm" SakurazeFrames: INCLUDE "gfx/pokemon/sakuraze/frames.asm" -AmanobiFrames: INCLUDE "gfx/pokemon/amanobi/frames.asm" +TanobiFrames: INCLUDE "gfx/pokemon/tanobi/frames.asm" TrustanFrames: INCLUDE "gfx/pokemon/trustan/frames.asm" KuwaguardFrames: INCLUDE "gfx/pokemon/kuwaguard/frames.asm" TonquitoFrames: INCLUDE "gfx/pokemon/tonquito/frames.asm" diff --git a/gfx/pokemon/amanobi/anim.asm b/gfx/pokemon/tanobi/anim.asm similarity index 100% rename from gfx/pokemon/amanobi/anim.asm rename to gfx/pokemon/tanobi/anim.asm diff --git a/gfx/pokemon/amanobi/anim_idle.asm b/gfx/pokemon/tanobi/anim_idle.asm similarity index 100% rename from gfx/pokemon/amanobi/anim_idle.asm rename to gfx/pokemon/tanobi/anim_idle.asm diff --git a/gfx/pokemon/amanobi/back.png b/gfx/pokemon/tanobi/back.png similarity index 100% rename from gfx/pokemon/amanobi/back.png rename to gfx/pokemon/tanobi/back.png diff --git a/gfx/pokemon/amanobi/front.png b/gfx/pokemon/tanobi/front.png similarity index 100% rename from gfx/pokemon/amanobi/front.png rename to gfx/pokemon/tanobi/front.png diff --git a/gfx/pokemon/amanobi/shiny.pal b/gfx/pokemon/tanobi/shiny.pal similarity index 100% rename from gfx/pokemon/amanobi/shiny.pal rename to gfx/pokemon/tanobi/shiny.pal diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index 712685f..bca40cf 100644 --- a/gfx/tilesets.asm +++ b/gfx/tilesets.asm @@ -565,18 +565,6 @@ INCBIN "data/tilesets/pokecenter_metatiles.bin" TilesetPokecenterColl:: INCLUDE "data/tilesets/pokecenter_collision.asm" -TilesetLavenderCryptAttr:: -INCBIN "data/tilesets/lavendercrypt_attributes.bin" - -TilesetLavenderCryptGFX:: -INCBIN "gfx/tilesets/lavendercrypt.2bpp.lz" - -TilesetLavenderCryptMeta:: -INCBIN "data/tilesets/lavendercrypt_metatiles.bin" - -TilesetLavenderCryptColl:: -INCLUDE "data/tilesets/lavendercrypt_collision.asm" - TilesetBlueLabAttr:: INCBIN "data/tilesets/bluelab_attributes.bin" @@ -613,8 +601,6 @@ INCBIN "data/tilesets/nihonmart_metatiles.bin" TilesetNihonMartColl:: INCLUDE "data/tilesets/nihonmart_collision.asm" -SECTION "Tileset Data 15", ROMX - TilesetNihonWhiteCityAttr:: INCBIN "data/tilesets/nihon_whitecity_attributes.bin" @@ -627,7 +613,8 @@ INCBIN "data/tilesets/nihon_whitecity_metatiles.bin" TilesetNihonWhiteCityColl:: INCLUDE "data/tilesets/nihon_whitecity_collision.asm" -; Inclusion of NEW things made it so I had to move it. THE DOMAIN EXPANSION, WAHOO! +SECTION "Tileset Data 15", ROMX + TilesetTowerGFX:: INCBIN "gfx/tilesets/tower.2bpp.lz" @@ -651,3 +638,19 @@ INCLUDE "data/tilesets/sevii_collision.asm" TilesetSeviiAttr:: INCBIN "data/tilesets/sevii_attributes.bin" + +; there should be space here, lavender crypt's set is just big + +SECTION "Tileset Data 16", ROMX +; This tileset is very big and detailed. +TilesetLavenderCryptAttr:: +INCBIN "data/tilesets/lavendercrypt_attributes.bin" + +TilesetLavenderCryptGFX:: +INCBIN "gfx/tilesets/lavendercrypt.2bpp.lz" + +TilesetLavenderCryptMeta:: +INCBIN "data/tilesets/lavendercrypt_metatiles.bin" + +TilesetLavenderCryptColl:: +INCLUDE "data/tilesets/lavendercrypt_collision.asm" diff --git a/maps/LavenderCrypt.asm b/maps/LavenderCrypt.asm index b2351e3..0b36672 100644 --- a/maps/LavenderCrypt.asm +++ b/maps/LavenderCrypt.asm @@ -75,5 +75,5 @@ LavenderCrypt_MapEvents: def_bg_events def_object_events - object_event 13, 11, SPRITE_CHANNELER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerChannelerReimu, -1 - object_event 4, 11, SPRITE_CHANNELER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerChannelerSanae, -1 + object_event 13, 11, SPRITE_CHANNELER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_EMOTE, OBJECTTYPE_TRAINER, 4, TrainerChannelerReimu, -1 + object_event 4, 11, SPRITE_CHANNELER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_EMOTE, OBJECTTYPE_TRAINER, 4, TrainerChannelerSanae, -1