thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-09-17 02:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

ROM builds, assign music, update Tanobi/Trustan/Foxfire

Browse source 
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.
This commit is contained in:
Llinos Evans 2024-08-18 15:23:29 +01:00
parent 81dd4d64d0
commit 0f7ce337f5
40 changed files with 72 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
audio.asm
View file

@ -23,8 +23,6 @@ INCLUDE "audio/music/goldenrodcity.asm"
INCLUDE "audio/music/vermilioncity.asm" INCLUDE "audio/music/vermilioncity.asm"
INCLUDE "audio/music/titlescreen.asm" INCLUDE "audio/music/titlescreen.asm"
INCLUDE "audio/music/ruinsofalphinterior.asm" INCLUDE "audio/music/ruinsofalphinterior.asm"
INCLUDE "audio/music/lookpokemaniac.asm"
INCLUDE "audio/music/trainervictory.asm"
SECTION "Songs 2", ROMX SECTION "Songs 2", ROMX
@ -72,6 +70,8 @@ INCLUDE "audio/music/healpokemon.asm"
INCLUDE "audio/music/evolution.asm" INCLUDE "audio/music/evolution.asm"
INCLUDE "audio/music/printer.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 SECTION "Songs 4", ROMX

2
constants/pokemon_constants.asm
View file

@ -378,7 +378,7 @@ DEF JOHTO_POKEMON EQU const_value
const CACAWPHONY const CACAWPHONY
const TREBIR const TREBIR
const SAKURAZE const SAKURAZE
const AMANOBI const TANOBI
const TRUSTAN const TRUSTAN
const KUWAGUARD const KUWAGUARD
const TONQUITO const TONQUITO

24
data/maps/maps.asm
View file

@ -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 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 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 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 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_LAVENDER_TOWN, 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_LAVENDER_TOWN, 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_LAVENDER_TOWN, 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_LAVENDER_TOWN, 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 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 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 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 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 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 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 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 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 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_ROUTE_30, 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_ROUTE_30, 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 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 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 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 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 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 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 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_ROUTE_30, 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 map BlueLab, TILESET_BLUE_LAB, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_POKEMON_TALK, FALSE, PALETTE_DAY, FISHGROUP_NONE
assert_table_length NUM_SILENT_HILLS_MAPS 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 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 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 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 map JackysHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_50, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
assert_table_length NUM_OLD_CITY_MAPS assert_table_length NUM_OLD_CITY_MAPS

2
data/pokemon/base_stats.asm
View file

@ -383,7 +383,7 @@ INCLUDE "data/pokemon/base_stats/sonegg.asm"
INCLUDE "data/pokemon/base_stats/cacawphony.asm" INCLUDE "data/pokemon/base_stats/cacawphony.asm"
INCLUDE "data/pokemon/base_stats/trebir.asm" INCLUDE "data/pokemon/base_stats/trebir.asm"
INCLUDE "data/pokemon/base_stats/sakuraze.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/trustan.asm"
INCLUDE "data/pokemon/base_stats/kuwaguard.asm" INCLUDE "data/pokemon/base_stats/kuwaguard.asm"
INCLUDE "data/pokemon/base_stats/tonquito.asm" INCLUDE "data/pokemon/base_stats/tonquito.asm"

6
data/pokemon/base_stats/foxfire.asm
View file

@ -1,9 +1,9 @@
db FOXFIRE ; species ID placeholder 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 ; hp atk def spd sat sdf
db FIRE, FIRE ; type db FIRE, ELECTRIC ; type
db 130 ; catch rate db 130 ; catch rate
db 110 ; base exp db 110 ; base exp
db BURNT_BERRY, BURNT_BERRY ; items db BURNT_BERRY, BURNT_BERRY ; items
@ -17,5 +17,5 @@
dn EGG_GROUND, EGG_GROUND ; egg groups dn EGG_GROUND, EGG_GROUND ; egg groups
; tm/hm learnset ; 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 ; end

4
data/pokemon/base_stats/amanobi.asm → data/pokemon/base_stats/tanobi.asm
View file

@ -1,6 +1,6 @@
db 0 ; species ID placeholder 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 ; hp atk def spd sat sdf
db FIGHTING, STEEL ; type db FIGHTING, STEEL ; type
@ -11,7 +11,7 @@
db 100 ; unknown 1 db 100 ; unknown 1
db 120 ; step cycles to hatch db 120 ; step cycles to hatch
db 5 ; unknown 2 db 5 ; unknown 2
INCBIN "gfx/pokemon/amanobi/front.dimensions" INCBIN "gfx/pokemon/tanobi/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics) dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_SLOW ; growth rate ; PLACEHOLDER db GROWTH_MEDIUM_SLOW ; growth rate ; PLACEHOLDER
dn EGG_NONE, EGG_NONE ; egg groups dn EGG_NONE, EGG_NONE ; egg groups

2
data/pokemon/base_stats/trustan.asm
View file

@ -1,6 +1,6 @@
db 0 ; species ID placeholder 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 ; hp atk def spd sat sdf
db NORMAL, FIRE ; type db NORMAL, FIRE ; type

2
data/pokemon/cries.asm
View file

@ -362,7 +362,7 @@ PokemonCries::
mon_cry CRY_NIDORAN_M, 0, 128 ; CACAWPHONY mon_cry CRY_NIDORAN_M, 0, 128 ; CACAWPHONY
mon_cry CRY_NIDORAN_M, 0, 128 ; TREBIR mon_cry CRY_NIDORAN_M, 0, 128 ; TREBIR
mon_cry CRY_NIDORAN_M, 0, 128 ; SAKURAZE 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 ; TRUSTAN
mon_cry CRY_NIDORAN_M, 0, 128 ; KUWAGUARD mon_cry CRY_NIDORAN_M, 0, 128 ; KUWAGUARD
mon_cry CRY_NIDORAN_M, 0, 128 ; TONQUITO mon_cry CRY_NIDORAN_M, 0, 128 ; TONQUITO

2
data/pokemon/dex_entries.asm
View file

@ -355,7 +355,7 @@ SoneggPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sonegg.asm"
CacawphonyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/cacawphony.asm" CacawphonyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/cacawphony.asm"
TrebirPokedexEntry:: INCLUDE "data/pokemon/dex_entries/trebir.asm" TrebirPokedexEntry:: INCLUDE "data/pokemon/dex_entries/trebir.asm"
SakurazePokedexEntry:: INCLUDE "data/pokemon/dex_entries/sakuraze.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" TrustanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/trustan.asm"
KuwaguardPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kuwaguard.asm" KuwaguardPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kuwaguard.asm"
TonquitoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tonquito.asm" TonquitoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tonquito.asm"

2
data/pokemon/dex_entries/amanobi.asm
View file

@ -1,7 +1,7 @@
db "SHINOBI@" ; species name db "SHINOBI@" ; species name
dw 311, 191 ; height, weight - placeholder dw 311, 191 ; height, weight - placeholder
db "AMANOBI assisted" db "TANOBI assisted"
next "ninja warriors in" next "ninja warriors in"
next "the distant past." next "the distant past."

2
data/pokemon/dex_entry_pointers.asm
View file

@ -357,7 +357,7 @@ PokedexDataPointerTable:
dba CacawphonyPokedexEntry dba CacawphonyPokedexEntry
dba TrebirPokedexEntry dba TrebirPokedexEntry
dba SakurazePokedexEntry dba SakurazePokedexEntry
dba AmanobiPokedexEntry dba TanobiPokedexEntry
dba TrustanPokedexEntry dba TrustanPokedexEntry
dba KuwaguardPokedexEntry dba KuwaguardPokedexEntry
dba TonquitoPokedexEntry dba TonquitoPokedexEntry

2
data/pokemon/dex_order_alpha.asm
View file

@ -7,7 +7,7 @@ AlphabeticalPokedexOrder:
dw AERODACTYL dw AERODACTYL
dw AIPOM dw AIPOM
dw ALAKAZAM dw ALAKAZAM
dw AMANOBI dw TANOBI
dw AMBIPOM dw AMBIPOM
dw AMPHAROS dw AMPHAROS
dw ANGORE dw ANGORE

2
data/pokemon/dex_order_new.asm
View file

@ -326,7 +326,7 @@ NewPokedexOrder:
dw CACAWPHONY dw CACAWPHONY
dw TREBIR dw TREBIR
dw SAKURAZE dw SAKURAZE
dw AMANOBI dw TANOBI
dw TRUSTAN dw TRUSTAN
dw KUWAGUARD dw KUWAGUARD
dw TONQUITO dw TONQUITO

4
data/pokemon/egg_moves_johto.asm
View file

@ -146,7 +146,7 @@ EggMovePointers2::
dw NoEggMoves2 dw NoEggMoves2
dw NoEggMoves2 dw NoEggMoves2
dw SakurazeEggMoves dw SakurazeEggMoves
dw AmanobiEggMoves dw TanobiEggMoves
dw TrustanEggMoves dw TrustanEggMoves
dw KuwaguardEggMoves dw KuwaguardEggMoves
dw TonquitoEggMoves dw TonquitoEggMoves
@ -652,7 +652,7 @@ SakurazeEggMoves:
dw MORNING_SUN dw MORNING_SUN
dw -1 ;end dw -1 ;end
AmanobiEggMoves: TanobiEggMoves:
dw EXTREMESPEED dw EXTREMESPEED
dw FAINT_ATTACK dw FAINT_ATTACK
dw FURY_SWIPES dw FURY_SWIPES

2
data/pokemon/evolution_moves.asm
View file

@ -355,7 +355,7 @@ EvolutionMoves::
dw NO_MOVE ;CACAWPHONY dw NO_MOVE ;CACAWPHONY
dw NO_MOVE ;TREBIR dw NO_MOVE ;TREBIR
dw NO_MOVE ;SAKURAZE dw NO_MOVE ;SAKURAZE
dw NO_MOVE ;AMANOBI dw NO_MOVE ;TANOBI
dw NO_MOVE ;TRUSTAN dw NO_MOVE ;TRUSTAN
dw NO_MOVE ;KUWAGUARD dw NO_MOVE ;KUWAGUARD
dw NO_MOVE ;TONQUITO dw NO_MOVE ;TONQUITO

4
data/pokemon/evos_attacks_johto.asm
View file

@ -145,7 +145,7 @@ EvosAttacksPointers2::
dw CacawphonyEvosAttacks dw CacawphonyEvosAttacks
dw TrebirEvosAttacks dw TrebirEvosAttacks
dw SakurazeEvosAttacks dw SakurazeEvosAttacks
dw AmanobiEvosAttacks dw TanobiEvosAttacks
dw TrustanEvosAttacks dw TrustanEvosAttacks
dw KuwaguardEvosAttacks dw KuwaguardEvosAttacks
dw TonquitoEvosAttacks dw TonquitoEvosAttacks
@ -2171,7 +2171,7 @@ SakurazeEvosAttacks:
dbw 44, SOLARBEAM dbw 44, SOLARBEAM
db 0 ; no more level-up moves 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 db 0 ; no more evolutions
dbw 1, EMBER dbw 1, EMBER
dbw 1, LEER dbw 1, LEER

2
data/pokemon/first_stages.asm
View file

@ -357,7 +357,7 @@ FirstEvoStages::
dw SONEGG dw SONEGG
dw SONEGG dw SONEGG
dw SAKURAZE dw SAKURAZE
dw AMANOBI dw TANOBI
dw TRUSTAN dw TRUSTAN
dw KUWAGUARD dw KUWAGUARD
dw TONQUITO dw TONQUITO

2
data/pokemon/menu_icons.asm
View file

@ -358,7 +358,7 @@ MonMenuIcons:
db ICON_BIRD ; CACAWPHONY db ICON_BIRD ; CACAWPHONY
db ICON_BIRD ; TREBIR db ICON_BIRD ; TREBIR
db ICON_ODDISH ; SAKURAZE - Want this to be the old Flower icon 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_FOX ; TRUSTAN
db ICON_BUG ; KUWAGUARD db ICON_BUG ; KUWAGUARD
db ICON_BUG ; TONQUITO db ICON_BUG ; TONQUITO

2
data/pokemon/names.asm
View file

@ -361,7 +361,7 @@ PokemonNames::
db "CACAWPHONY" db "CACAWPHONY"
db "TREBIR@@@@" db "TREBIR@@@@"
db "SAKURAZE@@" db "SAKURAZE@@"
db "AMANOBI@@@" db "TANOBI@@@"
db "TRUSTAN@@@" db "TRUSTAN@@@"
db "KUWAGUARD@" db "KUWAGUARD@"
db "TONQUITO@@" db "TONQUITO@@"

4
data/pokemon/palettes.asm
View file

@ -746,8 +746,8 @@ INCBIN "gfx/pokemon/trebir/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/trebir/shiny.pal" INCLUDE "gfx/pokemon/trebir/shiny.pal"
INCBIN "gfx/pokemon/sakuraze/front.gbcpal", middle_colors INCBIN "gfx/pokemon/sakuraze/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/sakuraze/shiny.pal" INCLUDE "gfx/pokemon/sakuraze/shiny.pal"
INCBIN "gfx/pokemon/amanobi/front.gbcpal", middle_colors INCBIN "gfx/pokemon/tanobi/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/amanobi/shiny.pal" INCLUDE "gfx/pokemon/tanobi/shiny.pal"
INCBIN "gfx/pokemon/trustan/front.gbcpal", middle_colors INCBIN "gfx/pokemon/trustan/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/trustan/shiny.pal" INCLUDE "gfx/pokemon/trustan/shiny.pal"
INCBIN "gfx/pokemon/kuwaguard/front.gbcpal", middle_colors INCBIN "gfx/pokemon/kuwaguard/front.gbcpal", middle_colors

4
data/pokemon/pic_pointers.asm
View file

@ -728,8 +728,8 @@ PokemonPicPointers::
dba TrebirBackpic dba TrebirBackpic
dba SakurazeFrontpic dba SakurazeFrontpic
dba SakurazeBackpic dba SakurazeBackpic
dba AmanobiFrontpic dba TanobiFrontpic
dba AmanobiBackpic dba TanobiBackpic
dba TrustanFrontpic dba TrustanFrontpic
dba TrustanBackpic dba TrustanBackpic
dba KuwaguardFrontpic dba KuwaguardFrontpic

2
data/trainers/parties_new_classes.asm
View file

@ -733,7 +733,7 @@ JackGroup:
next_list_item next_list_item
db "JACKY@", TRAINERTYPE_MOVES db "JACKY@", TRAINERTYPE_MOVES
db 50 db 50
dw AMANOBI ; Kage-Maru dw TANOBI ; Kage-Maru
dw METAL_CLAW, SPIKES, FIRE_SPIN, PETAL_DANCE dw METAL_CLAW, SPIKES, FIRE_SPIN, PETAL_DANCE
db 50 db 50
dw ANNIHILAPE dw ANNIHILAPE

0
gfx/footprints/amanobi.png → gfx/footprints/tanobi.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 69 B

After

Width:  |  Height:  |  Size: 69 B

2
gfx/footprints_johto.asm
View file

@ -145,7 +145,7 @@ INCBIN "gfx/footprints/sonegg.1bpp"
INCBIN "gfx/footprints/cacawphony.1bpp" INCBIN "gfx/footprints/cacawphony.1bpp"
INCBIN "gfx/footprints/trebir.1bpp" INCBIN "gfx/footprints/trebir.1bpp"
INCBIN "gfx/footprints/sakuraze.1bpp" INCBIN "gfx/footprints/sakuraze.1bpp"
INCBIN "gfx/footprints/amanobi.1bpp" INCBIN "gfx/footprints/tanobi.1bpp"
INCBIN "gfx/footprints/trustan.1bpp" INCBIN "gfx/footprints/trustan.1bpp"
INCBIN "gfx/footprints/kuwaguard.1bpp" INCBIN "gfx/footprints/kuwaguard.1bpp"
INCBIN "gfx/footprints/tonquito.1bpp" INCBIN "gfx/footprints/tonquito.1bpp"

4
gfx/pics.asm
View file

@ -800,8 +800,8 @@ TrebirFrontpic: INCBIN "gfx/pokemon/trebir/front.animated.2bpp.lz"
TrebirBackpic: INCBIN "gfx/pokemon/trebir/back.2bpp.lz" TrebirBackpic: INCBIN "gfx/pokemon/trebir/back.2bpp.lz"
SakurazeFrontpic: INCBIN "gfx/pokemon/sakuraze/front.animated.2bpp.lz" SakurazeFrontpic: INCBIN "gfx/pokemon/sakuraze/front.animated.2bpp.lz"
SakurazeBackpic: INCBIN "gfx/pokemon/sakuraze/back.2bpp.lz" SakurazeBackpic: INCBIN "gfx/pokemon/sakuraze/back.2bpp.lz"
AmanobiFrontpic: INCBIN "gfx/pokemon/amanobi/front.animated.2bpp.lz" TanobiFrontpic: INCBIN "gfx/pokemon/tanobi/front.animated.2bpp.lz"
AmanobiBackpic: INCBIN "gfx/pokemon/amanobi/back.2bpp.lz" TanobiBackpic: INCBIN "gfx/pokemon/tanobi/back.2bpp.lz"
TrustanFrontpic: INCBIN "gfx/pokemon/trustan/front.animated.2bpp.lz" TrustanFrontpic: INCBIN "gfx/pokemon/trustan/front.animated.2bpp.lz"
TrustanBackpic: INCBIN "gfx/pokemon/trustan/back.2bpp.lz" TrustanBackpic: INCBIN "gfx/pokemon/trustan/back.2bpp.lz"
KuwaguardFrontpic: INCBIN "gfx/pokemon/kuwaguard/front.animated.2bpp.lz" KuwaguardFrontpic: INCBIN "gfx/pokemon/kuwaguard/front.animated.2bpp.lz"

2
gfx/pokemon/anim_pointers.asm
View file

@ -357,7 +357,7 @@ AnimationPointers:
dw CacawphonyAnimation dw CacawphonyAnimation
dw TrebirAnimation dw TrebirAnimation
dw SakurazeAnimation dw SakurazeAnimation
dw AmanobiAnimation dw TanobiAnimation
dw TrustanAnimation dw TrustanAnimation
dw KuwaguardAnimation dw KuwaguardAnimation
dw TonquitoAnimation dw TonquitoAnimation

2
gfx/pokemon/anims.asm
View file

@ -355,7 +355,7 @@ SoneggAnimation: INCLUDE "gfx/pokemon/sonegg/anim.asm"
CacawphonyAnimation: INCLUDE "gfx/pokemon/cacawphony/anim.asm" CacawphonyAnimation: INCLUDE "gfx/pokemon/cacawphony/anim.asm"
TrebirAnimation: INCLUDE "gfx/pokemon/trebir/anim.asm" TrebirAnimation: INCLUDE "gfx/pokemon/trebir/anim.asm"
SakurazeAnimation: INCLUDE "gfx/pokemon/sakuraze/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" TrustanAnimation: INCLUDE "gfx/pokemon/trustan/anim.asm"
KuwaguardAnimation: INCLUDE "gfx/pokemon/kuwaguard/anim.asm" KuwaguardAnimation: INCLUDE "gfx/pokemon/kuwaguard/anim.asm"
TonquitoAnimation: INCLUDE "gfx/pokemon/tonquito/anim.asm" TonquitoAnimation: INCLUDE "gfx/pokemon/tonquito/anim.asm"

2
gfx/pokemon/bitmask_pointers.asm
View file

@ -357,7 +357,7 @@ BitmasksPointers:
dw CacawphonyBitmasks dw CacawphonyBitmasks
dw TrebirBitmasks dw TrebirBitmasks
dw SakurazeBitmasks dw SakurazeBitmasks
dw AmanobiBitmasks dw TanobiBitmasks
dw TrustanBitmasks dw TrustanBitmasks
dw KuwaguardBitmasks dw KuwaguardBitmasks
dw TonquitoBitmasks dw TonquitoBitmasks

2
gfx/pokemon/bitmasks.asm
View file

@ -355,7 +355,7 @@ SoneggBitmasks: INCLUDE "gfx/pokemon/sonegg/bitmask.asm"
CacawphonyBitmasks: INCLUDE "gfx/pokemon/cacawphony/bitmask.asm" CacawphonyBitmasks: INCLUDE "gfx/pokemon/cacawphony/bitmask.asm"
TrebirBitmasks: INCLUDE "gfx/pokemon/trebir/bitmask.asm" TrebirBitmasks: INCLUDE "gfx/pokemon/trebir/bitmask.asm"
SakurazeBitmasks: INCLUDE "gfx/pokemon/sakuraze/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" TrustanBitmasks: INCLUDE "gfx/pokemon/trustan/bitmask.asm"
KuwaguardBitmasks: INCLUDE "gfx/pokemon/kuwaguard/bitmask.asm" KuwaguardBitmasks: INCLUDE "gfx/pokemon/kuwaguard/bitmask.asm"
TonquitoBitmasks: INCLUDE "gfx/pokemon/tonquito/bitmask.asm" TonquitoBitmasks: INCLUDE "gfx/pokemon/tonquito/bitmask.asm"

2
gfx/pokemon/frame_pointers.asm
View file

@ -357,7 +357,7 @@ FramesPointers:
dba CacawphonyFrames dba CacawphonyFrames
dba TrebirFrames dba TrebirFrames
dba SakurazeFrames dba SakurazeFrames
dba AmanobiFrames dba TanobiFrames
dba TrustanFrames dba TrustanFrames
dba KuwaguardFrames dba KuwaguardFrames
dba TonquitoFrames dba TonquitoFrames

2
gfx/pokemon/idle_pointers.asm
View file

@ -357,7 +357,7 @@ AnimationIdlePointers:
dw CacawphonyAnimationIdle dw CacawphonyAnimationIdle
dw TrebirAnimationIdle dw TrebirAnimationIdle
dw SakurazeAnimationIdle dw SakurazeAnimationIdle
dw AmanobiAnimationIdle dw TanobiAnimationIdle
dw TrustanAnimationIdle dw TrustanAnimationIdle
dw KuwaguardAnimationIdle dw KuwaguardAnimationIdle
dw TonquitoAnimationIdle dw TonquitoAnimationIdle

2
gfx/pokemon/idles.asm
View file

@ -355,7 +355,7 @@ SoneggAnimationIdle: INCLUDE "gfx/pokemon/sonegg/anim_idle.asm"
CacawphonyAnimationIdle: INCLUDE "gfx/pokemon/cacawphony/anim_idle.asm" CacawphonyAnimationIdle: INCLUDE "gfx/pokemon/cacawphony/anim_idle.asm"
TrebirAnimationIdle: INCLUDE "gfx/pokemon/trebir/anim_idle.asm" TrebirAnimationIdle: INCLUDE "gfx/pokemon/trebir/anim_idle.asm"
SakurazeAnimationIdle: INCLUDE "gfx/pokemon/sakuraze/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" TrustanAnimationIdle: INCLUDE "gfx/pokemon/trustan/anim_idle.asm"
KuwaguardAnimationIdle: INCLUDE "gfx/pokemon/kuwaguard/anim_idle.asm" KuwaguardAnimationIdle: INCLUDE "gfx/pokemon/kuwaguard/anim_idle.asm"
TonquitoAnimationIdle: INCLUDE "gfx/pokemon/tonquito/anim_idle.asm" TonquitoAnimationIdle: INCLUDE "gfx/pokemon/tonquito/anim_idle.asm"

2
gfx/pokemon/johto_frames.asm
View file

@ -145,7 +145,7 @@ SoneggFrames: INCLUDE "gfx/pokemon/sonegg/frames.asm"
CacawphonyFrames: INCLUDE "gfx/pokemon/cacawphony/frames.asm" CacawphonyFrames: INCLUDE "gfx/pokemon/cacawphony/frames.asm"
TrebirFrames: INCLUDE "gfx/pokemon/trebir/frames.asm" TrebirFrames: INCLUDE "gfx/pokemon/trebir/frames.asm"
SakurazeFrames: INCLUDE "gfx/pokemon/sakuraze/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" TrustanFrames: INCLUDE "gfx/pokemon/trustan/frames.asm"
KuwaguardFrames: INCLUDE "gfx/pokemon/kuwaguard/frames.asm" KuwaguardFrames: INCLUDE "gfx/pokemon/kuwaguard/frames.asm"
TonquitoFrames: INCLUDE "gfx/pokemon/tonquito/frames.asm" TonquitoFrames: INCLUDE "gfx/pokemon/tonquito/frames.asm"

0
gfx/pokemon/amanobi/anim.asm → gfx/pokemon/tanobi/anim.asm
View file

0
gfx/pokemon/amanobi/anim_idle.asm → gfx/pokemon/tanobi/anim_idle.asm
View file

0
gfx/pokemon/amanobi/back.png → gfx/pokemon/tanobi/back.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 304 B

After

Width:  |  Height:  |  Size: 304 B

0
gfx/pokemon/amanobi/front.png → gfx/pokemon/tanobi/front.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 315 B

0
gfx/pokemon/amanobi/shiny.pal → gfx/pokemon/tanobi/shiny.pal
View file

33
gfx/tilesets.asm
View file

@ -565,18 +565,6 @@ INCBIN "data/tilesets/pokecenter_metatiles.bin"
TilesetPokecenterColl:: TilesetPokecenterColl::
INCLUDE "data/tilesets/pokecenter_collision.asm" 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:: TilesetBlueLabAttr::
INCBIN "data/tilesets/bluelab_attributes.bin" INCBIN "data/tilesets/bluelab_attributes.bin"
@ -613,8 +601,6 @@ INCBIN "data/tilesets/nihonmart_metatiles.bin"
TilesetNihonMartColl:: TilesetNihonMartColl::
INCLUDE "data/tilesets/nihonmart_collision.asm" INCLUDE "data/tilesets/nihonmart_collision.asm"
SECTION "Tileset Data 15", ROMX
TilesetNihonWhiteCityAttr:: TilesetNihonWhiteCityAttr::
INCBIN "data/tilesets/nihon_whitecity_attributes.bin" INCBIN "data/tilesets/nihon_whitecity_attributes.bin"
@ -627,7 +613,8 @@ INCBIN "data/tilesets/nihon_whitecity_metatiles.bin"
TilesetNihonWhiteCityColl:: TilesetNihonWhiteCityColl::
INCLUDE "data/tilesets/nihon_whitecity_collision.asm" 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:: TilesetTowerGFX::
INCBIN "gfx/tilesets/tower.2bpp.lz" INCBIN "gfx/tilesets/tower.2bpp.lz"
@ -651,3 +638,19 @@ INCLUDE "data/tilesets/sevii_collision.asm"
TilesetSeviiAttr:: TilesetSeviiAttr::
INCBIN "data/tilesets/sevii_attributes.bin" 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"

4
maps/LavenderCrypt.asm
View file

@ -75,5 +75,5 @@ LavenderCrypt_MapEvents:
def_bg_events def_bg_events
def_object_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 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_BROWN, OBJECTTYPE_TRAINER, 4, TrainerChannelerSanae, -1 object_event 4, 11, SPRITE_CHANNELER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_EMOTE, OBJECTTYPE_TRAINER, 4, TrainerChannelerSanae, -1