From 8251c6138efdbe30a4af015bb9ee693c9c214f82 Mon Sep 17 00:00:00 2001 From: bitman44 Date: Tue, 20 Mar 2018 20:27:28 -0500 Subject: [PATCH 01/23] Replaced instances of Mon### with the Pokemon's name --- data/evos_moves.asm | 953 +++++++++++++++---------------------- engine/menu/party_menu.asm | 2 +- 2 files changed, 382 insertions(+), 573 deletions(-) diff --git a/data/evos_moves.asm b/data/evos_moves.asm index 2371fb83..f6281b3d 100755 --- a/data/evos_moves.asm +++ b/data/evos_moves.asm @@ -1,197 +1,196 @@ EvosMovesPointerTable: - dw Mon112_EvosMoves - dw Mon115_EvosMoves - dw Mon032_EvosMoves - dw Mon035_EvosMoves - dw Mon021_EvosMoves - dw Mon100_EvosMoves - dw Mon034_EvosMoves - dw Mon080_EvosMoves - dw Mon002_EvosMoves - dw Mon103_EvosMoves - dw Mon108_EvosMoves - dw Mon102_EvosMoves - dw Mon088_EvosMoves - dw Mon094_EvosMoves - dw Mon029_EvosMoves - dw Mon031_EvosMoves - dw Mon104_EvosMoves - dw Mon111_EvosMoves - dw Mon131_EvosMoves - dw Mon059_EvosMoves - dw Mon151_EvosMoves - dw Mon130_EvosMoves - dw Mon090_EvosMoves - dw Mon072_EvosMoves - dw Mon092_EvosMoves - dw Mon123_EvosMoves - dw Mon120_EvosMoves - dw Mon009_EvosMoves - dw Mon127_EvosMoves - dw Mon114_EvosMoves - dw Mon152_EvosMoves ;MissingNo - dw Mon153_EvosMoves ;MissingNo - dw Mon058_EvosMoves - dw Mon095_EvosMoves - dw Mon022_EvosMoves - dw Mon016_EvosMoves - dw Mon079_EvosMoves - dw Mon064_EvosMoves - dw Mon075_EvosMoves - dw Mon113_EvosMoves - dw Mon067_EvosMoves - dw Mon122_EvosMoves - dw Mon106_EvosMoves - dw Mon107_EvosMoves - dw Mon024_EvosMoves - dw Mon047_EvosMoves - dw Mon054_EvosMoves - dw Mon096_EvosMoves - dw Mon076_EvosMoves - dw Mon154_EvosMoves ;MissingNo - dw Mon126_EvosMoves - dw Mon155_EvosMoves ;MissingNo - dw Mon125_EvosMoves - dw Mon082_EvosMoves - dw Mon109_EvosMoves - dw Mon156_EvosMoves ;MissingNo - dw Mon056_EvosMoves - dw Mon086_EvosMoves - dw Mon050_EvosMoves - dw Mon128_EvosMoves - dw Mon157_EvosMoves ;MissingNo - dw Mon158_EvosMoves ;MissingNo - dw Mon159_EvosMoves ;MissingNo - dw Mon083_EvosMoves - dw Mon048_EvosMoves - dw Mon149_EvosMoves - dw Mon160_EvosMoves ;MissingNo - dw Mon161_EvosMoves ;MissingNo - dw Mon162_EvosMoves ;MissingNo - dw Mon084_EvosMoves - dw Mon060_EvosMoves - dw Mon124_EvosMoves - dw Mon146_EvosMoves - dw Mon144_EvosMoves - dw Mon145_EvosMoves - dw Mon132_EvosMoves - dw Mon052_EvosMoves - dw Mon098_EvosMoves - dw Mon163_EvosMoves ;MissingNo - dw Mon164_EvosMoves ;MissingNo - dw Mon165_EvosMoves ;MissingNo - dw Mon037_EvosMoves - dw Mon038_EvosMoves - dw Mon025_EvosMoves - dw Mon026_EvosMoves - dw Mon166_EvosMoves ;MissingNo - dw Mon167_EvosMoves ;MissingNo - dw Mon147_EvosMoves - dw Mon148_EvosMoves - dw Mon140_EvosMoves - dw Mon141_EvosMoves - dw Mon116_EvosMoves - dw Mon117_EvosMoves - dw Mon168_EvosMoves ;MissingNo - dw Mon169_EvosMoves ;MissingNo - dw Mon027_EvosMoves - dw Mon028_EvosMoves - dw Mon138_EvosMoves - dw Mon139_EvosMoves - dw Mon039_EvosMoves - dw Mon040_EvosMoves - dw Mon133_EvosMoves - dw Mon136_EvosMoves - dw Mon135_EvosMoves - dw Mon134_EvosMoves - dw Mon066_EvosMoves - dw Mon041_EvosMoves - dw Mon023_EvosMoves - dw Mon046_EvosMoves - dw Mon061_EvosMoves - dw Mon062_EvosMoves - dw Mon013_EvosMoves - dw Mon014_EvosMoves - dw Mon015_EvosMoves - dw Mon170_EvosMoves ;MissingNo - dw Mon085_EvosMoves - dw Mon057_EvosMoves - dw Mon051_EvosMoves - dw Mon049_EvosMoves - dw Mon087_EvosMoves - dw Mon171_EvosMoves ;MissingNo - dw Mon172_EvosMoves ;MissingNo - dw Mon010_EvosMoves - dw Mon011_EvosMoves - dw Mon012_EvosMoves - dw Mon068_EvosMoves - dw Mon173_EvosMoves ;MissingNo - dw Mon055_EvosMoves - dw Mon097_EvosMoves - dw Mon042_EvosMoves - dw Mon150_EvosMoves - dw Mon143_EvosMoves - dw Mon129_EvosMoves - dw Mon174_EvosMoves ;MissingNo - dw Mon175_EvosMoves ;MissingNo - dw Mon089_EvosMoves - dw Mon176_EvosMoves ;MissingNo - dw Mon099_EvosMoves - dw Mon091_EvosMoves - dw Mon177_EvosMoves ;MissingNo - dw Mon101_EvosMoves - dw Mon036_EvosMoves - dw Mon110_EvosMoves - dw Mon053_EvosMoves - dw Mon105_EvosMoves - dw Mon178_EvosMoves ;MissingNo - dw Mon093_EvosMoves - dw Mon063_EvosMoves - dw Mon065_EvosMoves - dw Mon017_EvosMoves - dw Mon018_EvosMoves - dw Mon121_EvosMoves - dw Mon001_EvosMoves - dw Mon003_EvosMoves - dw Mon073_EvosMoves - dw Mon179_EvosMoves ;MissingNo - dw Mon118_EvosMoves - dw Mon119_EvosMoves - dw Mon180_EvosMoves ;MissingNo - dw Mon181_EvosMoves ;MissingNo - dw Mon182_EvosMoves ;MissingNo - dw Mon183_EvosMoves ;MissingNo - dw Mon077_EvosMoves - dw Mon078_EvosMoves - dw Mon019_EvosMoves - dw Mon020_EvosMoves - dw Mon033_EvosMoves - dw Mon030_EvosMoves - dw Mon074_EvosMoves - dw Mon137_EvosMoves - dw Mon142_EvosMoves - dw Mon184_EvosMoves ;MissingNo - dw Mon081_EvosMoves - dw Mon185_EvosMoves ;MissingNo - dw Mon186_EvosMoves ;MissingNo - dw Mon004_EvosMoves - dw Mon007_EvosMoves - dw Mon005_EvosMoves - dw Mon008_EvosMoves - dw Mon006_EvosMoves - dw Mon187_EvosMoves ;MissingNo - dw Mon188_EvosMoves ;MissingNo - dw Mon189_EvosMoves ;MissingNo - dw Mon190_EvosMoves ;MissingNo - dw Mon043_EvosMoves - dw Mon044_EvosMoves - dw Mon045_EvosMoves - dw Mon069_EvosMoves - dw Mon070_EvosMoves - dw Mon071_EvosMoves + dw RHYDON_EvosMoves + dw KANGASKHAN_EvosMoves + dw NIDORAN_M_EvosMoves + dw CLEFAIRY_EvosMoves + dw SPEAROW_EvosMoves + dw VOLTORB_EvosMoves + dw NIDOKING_EvosMoves + dw SLOWBRO_EvosMoves + dw IVYSAUR_EvosMoves + dw EXEGGUTOR_EvosMoves + dw LICKITUNG_EvosMoves + dw EXEGGCUTE_EvosMoves + dw GRIMER_EvosMoves + dw GENGAR_EvosMoves + dw NIDORAN_F_EvosMoves + dw NIDOQUEEN_EvosMoves + dw CUBONE_EvosMoves + dw RHYHORN_EvosMoves + dw LAPRAS_EvosMoves + dw ARCANINE_EvosMoves + dw MEW_EvosMoves + dw GYARADOS_EvosMoves + dw SHELLDER_EvosMoves + dw TENTACOOL_EvosMoves + dw GASTLY_EvosMoves + dw SCYTHER_EvosMoves + dw STARYU_EvosMoves + dw BLASTOISE_EvosMoves + dw PINSIR_EvosMoves + dw TANGELA_EvosMoves + dw MISSINGNO_1F_EvosMoves + dw MISSINGNO_20_EvosMoves + dw GROWLITHE_EvosMoves + dw ONIX_EvosMoves + dw FEAROW_EvosMoves + dw PIDGEY_EvosMoves + dw SLOWPOKE_EvosMoves + dw KADABRA_EvosMoves + dw GRAVELER_EvosMoves + dw CHANSEY_EvosMoves + dw MACHOKE_EvosMoves + dw MR_MIME_EvosMoves + dw HITMONLEE_EvosMoves + dw HITMONCHAN_EvosMoves + dw ARBOK_EvosMoves + dw PARASECT_EvosMoves + dw PSYDUCK_EvosMoves + dw DROWZEE_EvosMoves + dw GOLEM_EvosMoves + dw MISSINGNO_32_EvosMoves + dw MAGMAR_EvosMoves + dw MISSINGNO_34_EvosMoves + dw ELECTABUZZ_EvosMoves + dw MAGNETON_EvosMoves + dw KOFFING_EvosMoves + dw MISSINGNO_38_EvosMoves + dw MANKEY_EvosMoves + dw SEEL_EvosMoves + dw DIGLETT_EvosMoves + dw TAUROS_EvosMoves + dw MISSINGNO_3D_EvosMoves + dw MISSINGNO_3E_EvosMoves + dw MISSINGNO_3F_EvosMoves + dw FARFETCHD_EvosMoves + dw VENONAT_EvosMoves + dw DRAGONITE_EvosMoves + dw MISSINGNO_43_EvosMoves + dw MISSINGNO_44_EvosMoves + dw MISSINGNO_45_EvosMoves + dw DODUO_EvosMoves + dw POLIWAG_EvosMoves + dw JYNX_EvosMoves + dw MOLTRES_EvosMoves + dw ARTICUNO_EvosMoves + dw ZAPDOS_EvosMoves + dw DITTO_EvosMoves + dw MEOWTH_EvosMoves + dw KRABBY_EvosMoves + dw MISSINGNO_4F_EvosMoves + dw MISSINGNO_50_EvosMoves + dw MISSINGNO_51_EvosMoves + dw VULPIX_EvosMoves + dw NINETALES_EvosMoves + dw PIKACHU_EvosMoves + dw RAICHU_EvosMoves + dw MISSINGNO_56_EvosMoves + dw MISSINGNO_57_EvosMoves + dw DRATINI_EvosMoves + dw DRAGONAIR_EvosMoves + dw KABUTO_EvosMoves + dw KABUTOPS_EvosMoves + dw HORSEA_EvosMoves + dw SEADRA_EvosMoves + dw MISSINGNO_5E_EvosMoves + dw MISSINGNO_5F_EvosMoves + dw SANDSHREW_EvosMoves + dw SANDSLASH_EvosMoves + dw OMANYTE_EvosMoves + dw OMASTAR_EvosMoves + dw JIGGLYPUFF_EvosMoves + dw WIGGLYTUFF_EvosMoves + dw EEVEE_EvosMoves + dw FLAREON_EvosMoves + dw JOLTEON_EvosMoves + dw VAPOREON_EvosMoves + dw MACHOP_EvosMoves + dw ZUBAT_EvosMoves + dw EKANS_EvosMoves + dw PARAS_EvosMoves + dw POLIWHIRL_EvosMoves + dw POLIWRATH_EvosMoves + dw WEEDLE_EvosMoves + dw KAKUNA_EvosMoves + dw BEEDRILL_EvosMoves + dw MISSINGNO_73_EvosMoves + dw DODRIO_EvosMoves + dw PRIMEAPE_EvosMoves + dw DUGTRIO_EvosMoves + dw VENOMOTH_EvosMoves + dw DEWGONG_EvosMoves + dw MISSINGNO_79_EvosMoves + dw MISSINGNO_7A_EvosMoves + dw CATERPIE_EvosMoves + dw METAPOD_EvosMoves + dw BUTTERFREE_EvosMoves + dw MACHAMP_EvosMoves + dw MISSINGNO_7F_EvosMoves + dw GOLDUCK_EvosMoves + dw HYPNO_EvosMoves + dw GOLBAT_EvosMoves + dw MEWTWO_EvosMoves + dw SNORLAX_EvosMoves + dw MAGIKARP_EvosMoves + dw MISSINGNO_86_EvosMoves + dw MISSINGNO_87_EvosMoves + dw MUK_EvosMoves + dw MISSINGNO_8A_EvosMoves + dw KINGLER_EvosMoves + dw CLOYSTER_EvosMoves + dw MISSINGNO_8C_EvosMoves + dw ELECTRODE_EvosMoves + dw CLEFABLE_EvosMoves + dw WEEZING_EvosMoves + dw PERSIAN_EvosMoves + dw MAROWAK_EvosMoves + dw MISSINGNO_92_EvosMoves + dw HAUNTER_EvosMoves + dw ABRA_EvosMoves + dw ALAKAZAM_EvosMoves + dw PIDGEOTTO_EvosMoves + dw PIDGEOT_EvosMoves + dw STARMIE_EvosMoves + dw BULBASAUR_EvosMoves + dw VENUSAUR_EvosMoves + dw TENTACRUEL_EvosMoves + dw MISSINGNO_9C_EvosMoves + dw GOLDEEN_EvosMoves + dw SEAKING_EvosMoves + dw MISSINGNO_9F_EvosMoves + dw MISSINGNO_A0_EvosMoves + dw MISSINGNO_A1_EvosMoves + dw MISSINGNO_A2_EvosMoves + dw PONYTA_EvosMoves + dw RAPIDASH_EvosMoves + dw RATTATA_EvosMoves + dw RATICATE_EvosMoves + dw NIDORINO_EvosMoves + dw NIDORINA_EvosMoves + dw GEODUDE_EvosMoves + dw PORYGON_EvosMoves + dw AERODACTYL_EvosMoves + dw MISSINGNO_AC_EvosMoves + dw MAGNEMITE_EvosMoves + dw MISSINGNO_AE_EvosMoves + dw MISSINGNO_AF_EvosMoves + dw CHARMANDER_EvosMoves + dw SQUIRTLE_EvosMoves + dw CHARMELEON_EvosMoves + dw WARTORTLE_EvosMoves + dw CHARIZARD_EvosMoves + dw MISSINGNO_B5_EvosMoves + dw FOSSIL_KABUTOPS_EvosMoves + dw FOSSIL_AERODACTYL_EvosMoves + dw MON_GHOST_EvosMoves + dw ODDISH_EvosMoves + dw GLOOM_EvosMoves + dw VILEPLUME_EvosMoves + dw BELLSPROUT_EvosMoves + dw WEEPINBELL_EvosMoves + dw VICTREEBEL_EvosMoves -Mon112_EvosMoves: -;RHYDON +RHYDON_EvosMoves ;Evolutions db 0 ;Learnset @@ -203,8 +202,7 @@ Mon112_EvosMoves: db 64,TAKE_DOWN db 0 -Mon115_EvosMoves: -;KANGASKHAN +KANGASKHAN_EvosMoves ;Evolutions db 0 ;Learnset @@ -215,8 +213,7 @@ Mon115_EvosMoves: db 46,DIZZY_PUNCH db 0 -Mon032_EvosMoves: -;NIDORAN_M +NIDORAN_M_EvosMoves ;Evolutions db EV_LEVEL,16,NIDORINO db 0 @@ -229,8 +226,7 @@ Mon032_EvosMoves: db 43,DOUBLE_KICK db 0 -Mon035_EvosMoves: -;CLEFAIRY +CLEFAIRY_EvosMoves ;Evolutions db EV_ITEM,MOON_STONE,1,CLEFABLE db 0 @@ -243,8 +239,7 @@ Mon035_EvosMoves: db 48,LIGHT_SCREEN db 0 -Mon021_EvosMoves: -;SPEAROW +SPEAROW_EvosMoves ;Evolutions db EV_LEVEL,20,FEAROW db 0 @@ -256,8 +251,7 @@ Mon021_EvosMoves: db 36,AGILITY db 0 -Mon100_EvosMoves: -;VOLTORB +VOLTORB_EvosMoves ;Evolutions db EV_LEVEL,30,ELECTRODE db 0 @@ -269,8 +263,7 @@ Mon100_EvosMoves: db 43,EXPLOSION db 0 -Mon034_EvosMoves: -;NIDOKING +NIDOKING_EvosMoves ;Evolutions db 0 ;Learnset @@ -279,8 +272,7 @@ Mon034_EvosMoves: db 23,THRASH db 0 -Mon080_EvosMoves: -;SLOWBRO +SLOWBRO_EvosMoves ;Evolutions db 0 ;Learnset @@ -293,8 +285,7 @@ Mon080_EvosMoves: db 55,PSYCHIC_M db 0 -Mon002_EvosMoves: -;IVYSAUR +IVYSAUR_EvosMoves ;Evolutions db EV_LEVEL,32,VENUSAUR db 0 @@ -308,16 +299,14 @@ Mon002_EvosMoves: db 54,SOLARBEAM db 0 -Mon103_EvosMoves: -;EXEGGUTOR +EXEGGUTOR_EvosMoves ;Evolutions db 0 ;Learnset db 28,STOMP db 0 -Mon108_EvosMoves: -;LICKITUNG +LICKITUNG_EvosMoves ;Evolutions db 0 ;Learnset @@ -328,8 +317,7 @@ Mon108_EvosMoves: db 39,SCREECH db 0 -Mon102_EvosMoves: -;EXEGGCUTE +EXEGGCUTE_EvosMoves ;Evolutions db EV_ITEM,LEAF_STONE,1,EXEGGUTOR db 0 @@ -342,8 +330,7 @@ Mon102_EvosMoves: db 48,SLEEP_POWDER db 0 -Mon088_EvosMoves: -;GRIMER +GRIMER_EvosMoves ;Evolutions db EV_LEVEL,38,MUK db 0 @@ -356,8 +343,7 @@ Mon088_EvosMoves: db 55,ACID_ARMOR db 0 -Mon094_EvosMoves: -;GENGAR +GENGAR_EvosMoves ;Evolutions db 0 ;Learnset @@ -365,8 +351,7 @@ Mon094_EvosMoves: db 38,DREAM_EATER db 0 -Mon029_EvosMoves: -;NIDORAN_F +NIDORAN_F_EvosMoves ;Evolutions db EV_LEVEL,16,NIDORINA db 0 @@ -379,8 +364,7 @@ Mon029_EvosMoves: db 43,DOUBLE_KICK db 0 -Mon031_EvosMoves: -;NIDOQUEEN +NIDOQUEEN_EvosMoves ;Evolutions db 0 ;Learnset @@ -389,8 +373,7 @@ Mon031_EvosMoves: db 23,BODY_SLAM db 0 -Mon104_EvosMoves: -;CUBONE +CUBONE_EvosMoves ;Evolutions db EV_LEVEL,28,MAROWAK db 0 @@ -402,8 +385,7 @@ Mon104_EvosMoves: db 46,RAGE db 0 -Mon111_EvosMoves: -;RHYHORN +RHYHORN_EvosMoves ;Evolutions db EV_LEVEL,42,RHYDON db 0 @@ -416,8 +398,7 @@ Mon111_EvosMoves: db 55,TAKE_DOWN db 0 -Mon131_EvosMoves: -;LAPRAS +LAPRAS_EvosMoves ;Evolutions db 0 ;Learnset @@ -429,15 +410,13 @@ Mon131_EvosMoves: db 46,HYDRO_PUMP db 0 -Mon059_EvosMoves: -;ARCANINE +ARCANINE_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon151_EvosMoves: -;MEW +MEW_EvosMoves ;Evolutions db 0 ;Learnset @@ -447,8 +426,7 @@ Mon151_EvosMoves: db 40,PSYCHIC_M db 0 -Mon130_EvosMoves: -;GYARADOS +GYARADOS_EvosMoves ;Evolutions db 0 ;Learnset @@ -459,8 +437,7 @@ Mon130_EvosMoves: db 52,HYPER_BEAM db 0 -Mon090_EvosMoves: -;SHELLDER +SHELLDER_EvosMoves ;Evolutions db EV_ITEM,WATER_STONE,1,CLOYSTER db 0 @@ -472,8 +449,7 @@ Mon090_EvosMoves: db 50,ICE_BEAM db 0 -Mon072_EvosMoves: -;TENTACOOL +TENTACOOL_EvosMoves ;Evolutions db EV_LEVEL,30,TENTACRUEL db 0 @@ -488,8 +464,7 @@ Mon072_EvosMoves: db 48,HYDRO_PUMP db 0 -Mon092_EvosMoves: -;GASTLY +GASTLY_EvosMoves ;Evolutions db EV_LEVEL,25,HAUNTER db 0 @@ -498,8 +473,7 @@ Mon092_EvosMoves: db 35,DREAM_EATER db 0 -Mon123_EvosMoves: -;SCYTHER +SCYTHER_EvosMoves ;Evolutions db 0 ;Learnset @@ -511,8 +485,7 @@ Mon123_EvosMoves: db 42,AGILITY db 0 -Mon120_EvosMoves: -;STARYU +STARYU_EvosMoves ;Evolutions db EV_ITEM,WATER_STONE,1,STARMIE db 0 @@ -526,8 +499,7 @@ Mon120_EvosMoves: db 47,HYDRO_PUMP db 0 -Mon009_EvosMoves: -;BLASTOISE +BLASTOISE_EvosMoves ;Evolutions db 0 ;Learnset @@ -539,8 +511,7 @@ Mon009_EvosMoves: db 52,HYDRO_PUMP db 0 -Mon127_EvosMoves: -;PINSIR +PINSIR_EvosMoves ;Evolutions db 0 ;Learnset @@ -552,8 +523,7 @@ Mon127_EvosMoves: db 54,SWORDS_DANCE db 0 -Mon114_EvosMoves: -;TANGELA +TANGELA_EvosMoves ;Evolutions db 0 ;Learnset @@ -565,22 +535,19 @@ Mon114_EvosMoves: db 49,GROWTH db 0 -Mon152_EvosMoves: -;MISSINGNO +MISSINGNO_1F_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon153_EvosMoves: -;MISSINGNO +MISSINGNO_20_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon058_EvosMoves: -;GROWLITHE +GROWLITHE_EvosMoves ;Evolutions db EV_ITEM,FIRE_STONE,1,ARCANINE db 0 @@ -592,8 +559,7 @@ Mon058_EvosMoves: db 50,FLAMETHROWER db 0 -Mon095_EvosMoves: -;ONIX +ONIX_EvosMoves ;Evolutions db 0 ;Learnset @@ -604,8 +570,7 @@ Mon095_EvosMoves: db 43,HARDEN db 0 -Mon022_EvosMoves: -;FEAROW +FEAROW_EvosMoves ;Evolutions db 0 ;Learnset @@ -616,8 +581,7 @@ Mon022_EvosMoves: db 43,AGILITY db 0 -Mon016_EvosMoves: -;PIDGEY +PIDGEY_EvosMoves ;Evolutions db EV_LEVEL,18,PIDGEOTTO db 0 @@ -630,8 +594,7 @@ Mon016_EvosMoves: db 44,MIRROR_MOVE db 0 -Mon079_EvosMoves: -;SLOWPOKE +SLOWPOKE_EvosMoves ;Evolutions db EV_LEVEL,37,SLOWBRO db 0 @@ -644,8 +607,7 @@ Mon079_EvosMoves: db 48,PSYCHIC_M db 0 -Mon064_EvosMoves: -;KADABRA +KADABRA_EvosMoves ;Evolutions db EV_TRADE,1,ALAKAZAM db 0 @@ -658,8 +620,7 @@ Mon064_EvosMoves: db 42,REFLECT db 0 -Mon075_EvosMoves: -;GRAVELER +GRAVELER_EvosMoves ;Evolutions db EV_TRADE,1,GOLEM db 0 @@ -672,8 +633,7 @@ Mon075_EvosMoves: db 43,EXPLOSION db 0 -Mon113_EvosMoves: -;CHANSEY +CHANSEY_EvosMoves ;Evolutions db 0 ;Learnset @@ -685,8 +645,7 @@ Mon113_EvosMoves: db 54,DOUBLE_EDGE db 0 -Mon067_EvosMoves: -;MACHOKE +MACHOKE_EvosMoves ;Evolutions db EV_TRADE,1,MACHAMP db 0 @@ -698,8 +657,7 @@ Mon067_EvosMoves: db 52,SUBMISSION db 0 -Mon122_EvosMoves: -;MR_MIME +MR_MIME_EvosMoves ;Evolutions db 0 ;Learnset @@ -710,8 +668,7 @@ Mon122_EvosMoves: db 47,SUBSTITUTE db 0 -Mon106_EvosMoves: -;HITMONLEE +HITMONLEE_EvosMoves ;Evolutions db 0 ;Learnset @@ -722,8 +679,7 @@ Mon106_EvosMoves: db 53,MEGA_KICK db 0 -Mon107_EvosMoves: -;HITMONCHAN +HITMONCHAN_EvosMoves ;Evolutions db 0 ;Learnset @@ -734,8 +690,7 @@ Mon107_EvosMoves: db 53,COUNTER db 0 -Mon024_EvosMoves: -;ARBOK +ARBOK_EvosMoves ;Evolutions db 0 ;Learnset @@ -746,8 +701,7 @@ Mon024_EvosMoves: db 47,ACID db 0 -Mon047_EvosMoves: -;PARASECT +PARASECT_EvosMoves ;Evolutions db 0 ;Learnset @@ -758,8 +712,7 @@ Mon047_EvosMoves: db 48,GROWTH db 0 -Mon054_EvosMoves: -;PSYDUCK +PSYDUCK_EvosMoves ;Evolutions db EV_LEVEL,33,GOLDUCK db 0 @@ -771,8 +724,7 @@ Mon054_EvosMoves: db 52,HYDRO_PUMP db 0 -Mon096_EvosMoves: -;DROWZEE +DROWZEE_EvosMoves ;Evolutions db EV_LEVEL,26,HYPNO db 0 @@ -785,8 +737,7 @@ Mon096_EvosMoves: db 37,MEDITATE db 0 -Mon076_EvosMoves: -;GOLEM +GOLEM_EvosMoves ;Evolutions db 0 ;Learnset @@ -798,15 +749,13 @@ Mon076_EvosMoves: db 43,EXPLOSION db 0 -Mon154_EvosMoves: -;MISSINGNO +MISSINGNO_32_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon126_EvosMoves: -;MAGMAR +MAGMAR_EvosMoves ;Evolutions db 0 ;Learnset @@ -818,15 +767,13 @@ Mon126_EvosMoves: db 55,FLAMETHROWER db 0 -Mon155_EvosMoves: -;MISSINGNO +MISSINGNO_34_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon125_EvosMoves: -;ELECTABUZZ +ELECTABUZZ_EvosMoves ;Evolutions db 0 ;Learnset @@ -837,8 +784,7 @@ Mon125_EvosMoves: db 54,THUNDER db 0 -Mon082_EvosMoves: -;MAGNETON +MAGNETON_EvosMoves ;Evolutions db 0 ;Learnset @@ -850,8 +796,7 @@ Mon082_EvosMoves: db 54,SCREECH db 0 -Mon109_EvosMoves: -;KOFFING +KOFFING_EvosMoves ;Evolutions db EV_LEVEL,35,WEEZING db 0 @@ -863,15 +808,13 @@ Mon109_EvosMoves: db 48,EXPLOSION db 0 -Mon156_EvosMoves: -;MISSINGNO +MISSINGNO_38_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon056_EvosMoves: -;MANKEY +MANKEY_EvosMoves ;Evolutions db EV_LEVEL,28,PRIMEAPE db 0 @@ -883,8 +826,7 @@ Mon056_EvosMoves: db 39,THRASH db 0 -Mon086_EvosMoves: -;SEEL +SEEL_EvosMoves ;Evolutions db EV_LEVEL,34,DEWGONG db 0 @@ -896,8 +838,7 @@ Mon086_EvosMoves: db 50,ICE_BEAM db 0 -Mon050_EvosMoves: -;DIGLETT +DIGLETT_EvosMoves ;Evolutions db EV_LEVEL,26,DUGTRIO db 0 @@ -909,8 +850,7 @@ Mon050_EvosMoves: db 40,EARTHQUAKE db 0 -Mon128_EvosMoves: -;TAUROS +TAUROS_EvosMoves ;Evolutions db 0 ;Learnset @@ -921,29 +861,25 @@ Mon128_EvosMoves: db 51,TAKE_DOWN db 0 -Mon157_EvosMoves: -;MISSINGNO +MISSINGNO_3D_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon158_EvosMoves: -;MISSINGNO +MISSINGNO_3E_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon159_EvosMoves: -;MISSINGNO +MISSINGNO_3F_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon083_EvosMoves: -;FARFETCHD +FARFETCHD_EvosMoves ;Evolutions db 0 ;Learnset @@ -954,8 +890,7 @@ Mon083_EvosMoves: db 39,SLASH db 0 -Mon048_EvosMoves: -;VENONAT +VENONAT_EvosMoves ;Evolutions db EV_LEVEL,31,VENOMOTH db 0 @@ -968,8 +903,7 @@ Mon048_EvosMoves: db 43,PSYCHIC_M db 0 -Mon149_EvosMoves: -;DRAGONITE +DRAGONITE_EvosMoves ;Evolutions db 0 ;Learnset @@ -980,29 +914,25 @@ Mon149_EvosMoves: db 60,HYPER_BEAM db 0 -Mon160_EvosMoves: -;MISSINGNO +MISSINGNO_43_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon161_EvosMoves: -;MISSINGNO +MISSINGNO_44_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon162_EvosMoves: -;MISSINGNO +MISSINGNO_45_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon084_EvosMoves: -;DODUO +DODUO_EvosMoves ;Evolutions db EV_LEVEL,31,DODRIO db 0 @@ -1015,8 +945,7 @@ Mon084_EvosMoves: db 44,AGILITY db 0 -Mon060_EvosMoves: -;POLIWAG +POLIWAG_EvosMoves ;Evolutions db EV_LEVEL,25,POLIWHIRL db 0 @@ -1029,8 +958,7 @@ Mon060_EvosMoves: db 45,HYDRO_PUMP db 0 -Mon124_EvosMoves: -;JYNX +JYNX_EvosMoves ;Evolutions db 0 ;Learnset @@ -1042,8 +970,7 @@ Mon124_EvosMoves: db 58,BLIZZARD db 0 -Mon146_EvosMoves: -;MOLTRES +MOLTRES_EvosMoves ;Evolutions db 0 ;Learnset @@ -1052,8 +979,7 @@ Mon146_EvosMoves: db 60,SKY_ATTACK db 0 -Mon144_EvosMoves: -;ARTICUNO +ARTICUNO_EvosMoves ;Evolutions db 0 ;Learnset @@ -1062,8 +988,7 @@ Mon144_EvosMoves: db 60,MIST db 0 -Mon145_EvosMoves: -;ZAPDOS +ZAPDOS_EvosMoves ;Evolutions db 0 ;Learnset @@ -1072,15 +997,13 @@ Mon145_EvosMoves: db 60,LIGHT_SCREEN db 0 -Mon132_EvosMoves: -;DITTO +DITTO_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon052_EvosMoves: -;MEOWTH +MEOWTH_EvosMoves ;Evolutions db EV_LEVEL,28,PERSIAN db 0 @@ -1092,8 +1015,7 @@ Mon052_EvosMoves: db 44,SLASH db 0 -Mon098_EvosMoves: -;KRABBY +KRABBY_EvosMoves ;Evolutions db EV_LEVEL,28,KINGLER db 0 @@ -1105,29 +1027,25 @@ Mon098_EvosMoves: db 40,HARDEN db 0 -Mon163_EvosMoves: -;MISSINGNO +MISSINGNO_4F_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon164_EvosMoves: -;MISSINGNO +MISSINGNO_50_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon165_EvosMoves: -;MISSINGNO +MISSINGNO_51_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon037_EvosMoves: -;VULPIX +VULPIX_EvosMoves ;Evolutions db EV_ITEM,FIRE_STONE,1,NINETALES db 0 @@ -1139,15 +1057,13 @@ Mon037_EvosMoves: db 42,FIRE_SPIN db 0 -Mon038_EvosMoves: -;NINETALES +NINETALES_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon025_EvosMoves: -;PIKACHU +PIKACHU_EvosMoves ;Evolutions db EV_ITEM,THUNDER_STONE,1,RAICHU db 0 @@ -1159,29 +1075,25 @@ Mon025_EvosMoves: db 43,THUNDER db 0 -Mon026_EvosMoves: -;RAICHU +RAICHU_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon166_EvosMoves: -;MISSINGNO +MISSINGNO_56_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon167_EvosMoves: -;MISSINGNO +MISSINGNO_57_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon147_EvosMoves: -;DRATINI +DRATINI_EvosMoves ;Evolutions db EV_LEVEL,30,DRAGONAIR db 0 @@ -1193,8 +1105,7 @@ Mon147_EvosMoves: db 50,HYPER_BEAM db 0 -Mon148_EvosMoves: -;DRAGONAIR +DRAGONAIR_EvosMoves ;Evolutions db EV_LEVEL,55,DRAGONITE db 0 @@ -1206,8 +1117,7 @@ Mon148_EvosMoves: db 55,HYPER_BEAM db 0 -Mon140_EvosMoves: -;KABUTO +KABUTO_EvosMoves ;Evolutions db EV_LEVEL,40,KABUTOPS db 0 @@ -1218,8 +1128,7 @@ Mon140_EvosMoves: db 49,HYDRO_PUMP db 0 -Mon141_EvosMoves: -;KABUTOPS +KABUTOPS_EvosMoves ;Evolutions db 0 ;Learnset @@ -1229,8 +1138,7 @@ Mon141_EvosMoves: db 53,HYDRO_PUMP db 0 -Mon116_EvosMoves: -;HORSEA +HORSEA_EvosMoves ;Evolutions db EV_LEVEL,32,SEADRA db 0 @@ -1242,8 +1150,7 @@ Mon116_EvosMoves: db 45,HYDRO_PUMP db 0 -Mon117_EvosMoves: -;SEADRA +SEADRA_EvosMoves ;Evolutions db 0 ;Learnset @@ -1254,22 +1161,19 @@ Mon117_EvosMoves: db 52,HYDRO_PUMP db 0 -Mon168_EvosMoves: -;MISSINGNO +MISSINGNO_5E_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon169_EvosMoves: -;MISSINGNO +MISSINGNO_5F_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon027_EvosMoves: -;SANDSHREW +SANDSHREW_EvosMoves ;Evolutions db EV_LEVEL,22,SANDSLASH db 0 @@ -1281,8 +1185,7 @@ Mon027_EvosMoves: db 38,FURY_SWIPES db 0 -Mon028_EvosMoves: -;SANDSLASH +SANDSLASH_EvosMoves ;Evolutions db 0 ;Learnset @@ -1293,8 +1196,7 @@ Mon028_EvosMoves: db 47,FURY_SWIPES db 0 -Mon138_EvosMoves: -;OMANYTE +OMANYTE_EvosMoves ;Evolutions db EV_LEVEL,40,OMASTAR db 0 @@ -1305,8 +1207,7 @@ Mon138_EvosMoves: db 53,HYDRO_PUMP db 0 -Mon139_EvosMoves: -;OMASTAR +OMASTAR_EvosMoves ;Evolutions db 0 ;Learnset @@ -1316,8 +1217,7 @@ Mon139_EvosMoves: db 49,HYDRO_PUMP db 0 -Mon039_EvosMoves: -;JIGGLYPUFF +JIGGLYPUFF_EvosMoves ;Evolutions db EV_ITEM,MOON_STONE,1,WIGGLYTUFF db 0 @@ -1331,30 +1231,26 @@ Mon039_EvosMoves: db 39,DOUBLE_EDGE db 0 -Mon040_EvosMoves: -;WIGGLYTUFF +WIGGLYTUFF_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon133_EvosMoves: -;EEVEE +EEVEE_EvosMoves ;Evolutions db EV_ITEM,FIRE_STONE,1,FLAREON db EV_ITEM,THUNDER_STONE,1,JOLTEON db EV_ITEM,WATER_STONE,1,VAPOREON db 0 -Mon133_EvosEnd: -;Learnset +EEVEE_EvosEnd db 27,QUICK_ATTACK db 31,TAIL_WHIP db 37,BITE db 45,TAKE_DOWN db 0 -Mon136_EvosMoves: -;FLAREON +FLAREON_EvosMoves ;Evolutions db 0 ;Learnset @@ -1368,8 +1264,7 @@ Mon136_EvosMoves: db 54,FLAMETHROWER db 0 -Mon135_EvosMoves: -;JOLTEON +JOLTEON_EvosMoves ;Evolutions db 0 ;Learnset @@ -1383,8 +1278,7 @@ Mon135_EvosMoves: db 54,THUNDER db 0 -Mon134_EvosMoves: -;VAPOREON +VAPOREON_EvosMoves ;Evolutions db 0 ;Learnset @@ -1398,8 +1292,7 @@ Mon134_EvosMoves: db 54,HYDRO_PUMP db 0 -Mon066_EvosMoves: -;MACHOP +MACHOP_EvosMoves ;Evolutions db EV_LEVEL,28,MACHOKE db 0 @@ -1411,8 +1304,7 @@ Mon066_EvosMoves: db 46,SUBMISSION db 0 -Mon041_EvosMoves: -;ZUBAT +ZUBAT_EvosMoves ;Evolutions db EV_LEVEL,22,GOLBAT db 0 @@ -1424,8 +1316,7 @@ Mon041_EvosMoves: db 36,HAZE db 0 -Mon023_EvosMoves: -;EKANS +EKANS_EvosMoves ;Evolutions db EV_LEVEL,22,ARBOK db 0 @@ -1437,8 +1328,7 @@ Mon023_EvosMoves: db 38,ACID db 0 -Mon046_EvosMoves: -;PARAS +PARAS_EvosMoves ;Evolutions db EV_LEVEL,24,PARASECT db 0 @@ -1450,8 +1340,7 @@ Mon046_EvosMoves: db 41,GROWTH db 0 -Mon061_EvosMoves: -;POLIWHIRL +POLIWHIRL_EvosMoves ;Evolutions db EV_ITEM,WATER_STONE,1,POLIWRATH db 0 @@ -1464,8 +1353,7 @@ Mon061_EvosMoves: db 49,HYDRO_PUMP db 0 -Mon062_EvosMoves: -;POLIWRATH +POLIWRATH_EvosMoves ;Evolutions db 0 ;Learnset @@ -1473,24 +1361,21 @@ Mon062_EvosMoves: db 19,WATER_GUN db 0 -Mon013_EvosMoves: -;WEEDLE +WEEDLE_EvosMoves ;Evolutions db EV_LEVEL,7,KAKUNA db 0 ;Learnset db 0 -Mon014_EvosMoves: -;KAKUNA +KAKUNA_EvosMoves ;Evolutions db EV_LEVEL,10,BEEDRILL db 0 ;Learnset db 0 -Mon015_EvosMoves: -;BEEDRILL +BEEDRILL_EvosMoves ;Evolutions db 0 ;Learnset @@ -1502,15 +1387,13 @@ Mon015_EvosMoves: db 35,AGILITY db 0 -Mon170_EvosMoves: -;MISSINGNO +MISSINGNO_73_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon085_EvosMoves: -;DODRIO +DODRIO_EvosMoves ;Evolutions db 0 ;Learnset @@ -1522,8 +1405,7 @@ Mon085_EvosMoves: db 51,AGILITY db 0 -Mon057_EvosMoves: -;PRIMEAPE +PRIMEAPE_EvosMoves ;Evolutions db 0 ;Learnset @@ -1534,8 +1416,7 @@ Mon057_EvosMoves: db 46,THRASH db 0 -Mon051_EvosMoves: -;DUGTRIO +DUGTRIO_EvosMoves ;Evolutions db 0 ;Learnset @@ -1546,8 +1427,7 @@ Mon051_EvosMoves: db 47,EARTHQUAKE db 0 -Mon049_EvosMoves: -;VENOMOTH +VENOMOTH_EvosMoves ;Evolutions db 0 ;Learnset @@ -1559,8 +1439,7 @@ Mon049_EvosMoves: db 50,PSYCHIC_M db 0 -Mon087_EvosMoves: -;DEWGONG +DEWGONG_EvosMoves ;Evolutions db 0 ;Learnset @@ -1571,38 +1450,33 @@ Mon087_EvosMoves: db 56,ICE_BEAM db 0 -Mon171_EvosMoves: -;MISSINGNO +MISSINGNO_79_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon172_EvosMoves: -;MISSINGNO +MISSINGNO_7A_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon010_EvosMoves: -;CATERPIE +CATERPIE_EvosMoves ;Evolutions db EV_LEVEL,7,METAPOD db 0 ;Learnset db 0 -Mon011_EvosMoves: -;METAPOD +METAPOD_EvosMoves ;Evolutions db EV_LEVEL,10,BUTTERFREE db 0 ;Learnset db 0 -Mon012_EvosMoves: -;BUTTERFREE +BUTTERFREE_EvosMoves ;Evolutions db 0 ;Learnset @@ -1615,8 +1489,7 @@ Mon012_EvosMoves: db 32,PSYBEAM db 0 -Mon068_EvosMoves: -;MACHAMP +MACHAMP_EvosMoves ;Evolutions db 0 ;Learnset @@ -1627,15 +1500,13 @@ Mon068_EvosMoves: db 52,SUBMISSION db 0 -Mon173_EvosMoves: -;MISSINGNO +MISSINGNO_7F_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon055_EvosMoves: -;GOLDUCK +GOLDUCK_EvosMoves ;Evolutions db 0 ;Learnset @@ -1646,8 +1517,7 @@ Mon055_EvosMoves: db 59,HYDRO_PUMP db 0 -Mon097_EvosMoves: -;HYPNO +HYPNO_EvosMoves ;Evolutions db 0 ;Learnset @@ -1659,8 +1529,7 @@ Mon097_EvosMoves: db 43,MEDITATE db 0 -Mon042_EvosMoves: -;GOLBAT +GOLBAT_EvosMoves ;Evolutions db 0 ;Learnset @@ -1671,8 +1540,7 @@ Mon042_EvosMoves: db 43,HAZE db 0 -Mon150_EvosMoves: -;MEWTWO +MEWTWO_EvosMoves ;Evolutions db 0 ;Learnset @@ -1683,8 +1551,7 @@ Mon150_EvosMoves: db 81,AMNESIA db 0 -Mon143_EvosMoves: -;SNORLAX +SNORLAX_EvosMoves ;Evolutions db 0 ;Learnset @@ -1694,8 +1561,7 @@ Mon143_EvosMoves: db 56,HYPER_BEAM db 0 -Mon129_EvosMoves: -;MAGIKARP +MAGIKARP_EvosMoves ;Evolutions db EV_LEVEL,20,GYARADOS db 0 @@ -1703,22 +1569,19 @@ Mon129_EvosMoves: db 15,TACKLE db 0 -Mon174_EvosMoves: -;MISSINGNO +MISSINGNO_86_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon175_EvosMoves: -;MISSINGNO +MISSINGNO_87_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon089_EvosMoves: -;MUK +MUK_EvosMoves ;Evolutions db 0 ;Learnset @@ -1730,15 +1593,13 @@ Mon089_EvosMoves: db 60,ACID_ARMOR db 0 -Mon176_EvosMoves: -;MISSINGNO +MISSINGNO_8A_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon099_EvosMoves: -;KINGLER +KINGLER_EvosMoves ;Evolutions db 0 ;Learnset @@ -1749,23 +1610,20 @@ Mon099_EvosMoves: db 49,HARDEN db 0 -Mon091_EvosMoves: -;CLOYSTER +CLOYSTER_EvosMoves ;Evolutions db 0 ;Learnset db 50,SPIKE_CANNON db 0 -Mon177_EvosMoves: -;MISSINGNO +MISSINGNO_8C_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon101_EvosMoves: -;ELECTRODE +ELECTRODE_EvosMoves ;Evolutions db 0 ;Learnset @@ -1776,15 +1634,13 @@ Mon101_EvosMoves: db 50,EXPLOSION db 0 -Mon036_EvosMoves: -;CLEFABLE +CLEFABLE_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon110_EvosMoves: -;WEEZING +WEEZING_EvosMoves ;Evolutions db 0 ;Learnset @@ -1795,8 +1651,7 @@ Mon110_EvosMoves: db 53,EXPLOSION db 0 -Mon053_EvosMoves: -;PERSIAN +PERSIAN_EvosMoves ;Evolutions db 0 ;Learnset @@ -1807,8 +1662,7 @@ Mon053_EvosMoves: db 51,SLASH db 0 -Mon105_EvosMoves: -;MAROWAK +MAROWAK_EvosMoves ;Evolutions db 0 ;Learnset @@ -1819,15 +1673,13 @@ Mon105_EvosMoves: db 55,RAGE db 0 -Mon178_EvosMoves: -;MISSINGNO +MISSINGNO_92_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon093_EvosMoves: -;HAUNTER +HAUNTER_EvosMoves ;Evolutions db EV_TRADE,1,GENGAR db 0 @@ -1836,16 +1688,14 @@ Mon093_EvosMoves: db 38,DREAM_EATER db 0 -Mon063_EvosMoves: -;ABRA +ABRA_EvosMoves ;Evolutions db EV_LEVEL,16,KADABRA db 0 ;Learnset db 0 -Mon065_EvosMoves: -;ALAKAZAM +ALAKAZAM_EvosMoves ;Evolutions db 0 ;Learnset @@ -1857,8 +1707,7 @@ Mon065_EvosMoves: db 42,REFLECT db 0 -Mon017_EvosMoves: -;PIDGEOTTO +PIDGEOTTO_EvosMoves ;Evolutions db EV_LEVEL,36,PIDGEOT db 0 @@ -1871,8 +1720,7 @@ Mon017_EvosMoves: db 49,MIRROR_MOVE db 0 -Mon018_EvosMoves: -;PIDGEOT +PIDGEOT_EvosMoves ;Evolutions db 0 ;Learnset @@ -1884,15 +1732,13 @@ Mon018_EvosMoves: db 54,MIRROR_MOVE db 0 -Mon121_EvosMoves: -;STARMIE +STARMIE_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon001_EvosMoves: -;BULBASAUR +BULBASAUR_EvosMoves ;Evolutions db EV_LEVEL,16,IVYSAUR db 0 @@ -1906,8 +1752,7 @@ Mon001_EvosMoves: db 48,SOLARBEAM db 0 -Mon003_EvosMoves: -;VENUSAUR +VENUSAUR_EvosMoves ;Evolutions db 0 ;Learnset @@ -1920,8 +1765,7 @@ Mon003_EvosMoves: db 65,SOLARBEAM db 0 -Mon073_EvosMoves: -;TENTACRUEL +TENTACRUEL_EvosMoves ;Evolutions db 0 ;Learnset @@ -1935,15 +1779,13 @@ Mon073_EvosMoves: db 50,HYDRO_PUMP db 0 -Mon179_EvosMoves: -;MISSINGNO +MISSINGNO_9C_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon118_EvosMoves: -;GOLDEEN +GOLDEEN_EvosMoves ;Evolutions db EV_LEVEL,33,SEAKING db 0 @@ -1956,8 +1798,7 @@ Mon118_EvosMoves: db 54,AGILITY db 0 -Mon119_EvosMoves: -;SEAKING +SEAKING_EvosMoves ;Evolutions db 0 ;Learnset @@ -1969,36 +1810,31 @@ Mon119_EvosMoves: db 54,AGILITY db 0 -Mon180_EvosMoves: -;MISSINGNO +MISSINGNO_9F_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon181_EvosMoves: -;MISSINGNO +MISSINGNO_A0_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon182_EvosMoves: -;MISSINGNO +MISSINGNO_A1_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon183_EvosMoves: -;MISSINGNO +MISSINGNO_A2_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon077_EvosMoves: -;PONYTA +PONYTA_EvosMoves ;Evolutions db EV_LEVEL,40,RAPIDASH db 0 @@ -2011,8 +1847,7 @@ Mon077_EvosMoves: db 48,AGILITY db 0 -Mon078_EvosMoves: -;RAPIDASH +RAPIDASH_EvosMoves ;Evolutions db 0 ;Learnset @@ -2024,8 +1859,7 @@ Mon078_EvosMoves: db 55,AGILITY db 0 -Mon019_EvosMoves: -;RATTATA +RATTATA_EvosMoves ;Evolutions db EV_LEVEL,20,RATICATE db 0 @@ -2036,8 +1870,7 @@ Mon019_EvosMoves: db 34,SUPER_FANG db 0 -Mon020_EvosMoves: -;RATICATE +RATICATE_EvosMoves ;Evolutions db 0 ;Learnset @@ -2047,8 +1880,7 @@ Mon020_EvosMoves: db 41,SUPER_FANG db 0 -Mon033_EvosMoves: -;NIDORINO +NIDORINO_EvosMoves ;Evolutions db EV_ITEM,MOON_STONE,1,NIDOKING db 0 @@ -2061,8 +1893,7 @@ Mon033_EvosMoves: db 50,DOUBLE_KICK db 0 -Mon030_EvosMoves: -;NIDORINA +NIDORINA_EvosMoves ;Evolutions db EV_ITEM,MOON_STONE,1,NIDOQUEEN db 0 @@ -2075,8 +1906,7 @@ Mon030_EvosMoves: db 50,DOUBLE_KICK db 0 -Mon074_EvosMoves: -;GEODUDE +GEODUDE_EvosMoves ;Evolutions db EV_LEVEL,25,GRAVELER db 0 @@ -2089,8 +1919,7 @@ Mon074_EvosMoves: db 36,EXPLOSION db 0 -Mon137_EvosMoves: -;PORYGON +PORYGON_EvosMoves ;Evolutions db 0 ;Learnset @@ -2100,8 +1929,7 @@ Mon137_EvosMoves: db 42,TRI_ATTACK db 0 -Mon142_EvosMoves: -;AERODACTYL +AERODACTYL_EvosMoves ;Evolutions db 0 ;Learnset @@ -2111,15 +1939,13 @@ Mon142_EvosMoves: db 54,HYPER_BEAM db 0 -Mon184_EvosMoves: -;MISSINGNO +MISSINGNO_AC_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon081_EvosMoves: -;MAGNEMITE +MAGNEMITE_EvosMoves ;Evolutions db EV_LEVEL,30,MAGNETON db 0 @@ -2132,22 +1958,19 @@ Mon081_EvosMoves: db 47,SCREECH db 0 -Mon185_EvosMoves: -;MISSINGNO +MISSINGNO_AE_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon186_EvosMoves: -;MISSINGNO +MISSINGNO_AF_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon004_EvosMoves: -;CHARMANDER +CHARMANDER_EvosMoves ;Evolutions db EV_LEVEL,16,CHARMELEON db 0 @@ -2160,8 +1983,7 @@ Mon004_EvosMoves: db 46,FIRE_SPIN db 0 -Mon007_EvosMoves: -;SQUIRTLE +SQUIRTLE_EvosMoves ;Evolutions db EV_LEVEL,16,WARTORTLE db 0 @@ -2174,8 +1996,7 @@ Mon007_EvosMoves: db 42,HYDRO_PUMP db 0 -Mon005_EvosMoves: -;CHARMELEON +CHARMELEON_EvosMoves ;Evolutions db EV_LEVEL,36,CHARIZARD db 0 @@ -2188,8 +2009,7 @@ Mon005_EvosMoves: db 56,FIRE_SPIN db 0 -Mon008_EvosMoves: -;WARTORTLE +WARTORTLE_EvosMoves ;Evolutions db EV_LEVEL,36,BLASTOISE db 0 @@ -2202,8 +2022,7 @@ Mon008_EvosMoves: db 47,HYDRO_PUMP db 0 -Mon006_EvosMoves: -;CHARIZARD +CHARIZARD_EvosMoves ;Evolutions db 0 ;Learnset @@ -2215,36 +2034,31 @@ Mon006_EvosMoves: db 55,FIRE_SPIN db 0 -Mon187_EvosMoves: -;MISSINGNO +MISSINGNO_B5_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon188_EvosMoves: -;MISSINGNO +FOSSIL_KABUTOPS_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon189_EvosMoves: -;MISSINGNO +FOSSIL_AERODACTYL_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon190_EvosMoves: -;MISSINGNO +MON_GHOST_EvosMoves ;Evolutions db 0 ;Learnset db 0 -Mon043_EvosMoves: -;ODDISH +ODDISH_EvosMoves ;Evolutions db EV_LEVEL,21,GLOOM db 0 @@ -2257,8 +2071,7 @@ Mon043_EvosMoves: db 46,SOLARBEAM db 0 -Mon044_EvosMoves: -;GLOOM +GLOOM_EvosMoves ;Evolutions db EV_ITEM,LEAF_STONE,1,VILEPLUME db 0 @@ -2271,8 +2084,7 @@ Mon044_EvosMoves: db 52,SOLARBEAM db 0 -Mon045_EvosMoves: -;VILEPLUME +VILEPLUME_EvosMoves ;Evolutions db 0 ;Learnset @@ -2281,8 +2093,7 @@ Mon045_EvosMoves: db 19,SLEEP_POWDER db 0 -Mon069_EvosMoves: -;BELLSPROUT +BELLSPROUT_EvosMoves ;Evolutions db EV_LEVEL,21,WEEPINBELL db 0 @@ -2296,8 +2107,7 @@ Mon069_EvosMoves: db 42,SLAM db 0 -Mon070_EvosMoves: -;WEEPINBELL +WEEPINBELL_EvosMoves ;Evolutions db EV_ITEM,LEAF_STONE,1,VICTREEBEL db 0 @@ -2311,8 +2121,7 @@ Mon070_EvosMoves: db 49,SLAM db 0 -Mon071_EvosMoves: -;VICTREEBEL +VICTREEBEL_EvosMoves ;Evolutions db 0 ;Learnset diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index 5149e5ab..cf185fa8 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -150,7 +150,7 @@ RedrawPartyMenu_: ld l, a ld de, wcd6d ld a, BANK(EvosMovesPointerTable) - ld bc, Mon133_EvosEnd - Mon133_EvosMoves + ld bc, EEVEE_EvosEnd - EEVEE_EvosMoves call FarCopyData ld hl, wcd6d ld de, .notAbleToEvolveText From 2056bdda525b9f5d340cc1c13fa38fb6d6d42a96 Mon Sep 17 00:00:00 2001 From: bitman44 Date: Wed, 21 Mar 2018 06:51:03 -0500 Subject: [PATCH 02/23] Cleaned up name formatting --- data/evos_moves.asm | 763 +++++++++++++++++++------------------ engine/menu/party_menu.asm | 2 +- 2 files changed, 383 insertions(+), 382 deletions(-) diff --git a/data/evos_moves.asm b/data/evos_moves.asm index f6281b3d..4c14e4bb 100755 --- a/data/evos_moves.asm +++ b/data/evos_moves.asm @@ -1,196 +1,196 @@ EvosMovesPointerTable: - dw RHYDON_EvosMoves - dw KANGASKHAN_EvosMoves - dw NIDORAN_M_EvosMoves - dw CLEFAIRY_EvosMoves - dw SPEAROW_EvosMoves - dw VOLTORB_EvosMoves - dw NIDOKING_EvosMoves - dw SLOWBRO_EvosMoves - dw IVYSAUR_EvosMoves - dw EXEGGUTOR_EvosMoves - dw LICKITUNG_EvosMoves - dw EXEGGCUTE_EvosMoves - dw GRIMER_EvosMoves - dw GENGAR_EvosMoves - dw NIDORAN_F_EvosMoves - dw NIDOQUEEN_EvosMoves - dw CUBONE_EvosMoves - dw RHYHORN_EvosMoves - dw LAPRAS_EvosMoves - dw ARCANINE_EvosMoves - dw MEW_EvosMoves - dw GYARADOS_EvosMoves - dw SHELLDER_EvosMoves - dw TENTACOOL_EvosMoves - dw GASTLY_EvosMoves - dw SCYTHER_EvosMoves - dw STARYU_EvosMoves - dw BLASTOISE_EvosMoves - dw PINSIR_EvosMoves - dw TANGELA_EvosMoves - dw MISSINGNO_1F_EvosMoves - dw MISSINGNO_20_EvosMoves - dw GROWLITHE_EvosMoves - dw ONIX_EvosMoves - dw FEAROW_EvosMoves - dw PIDGEY_EvosMoves - dw SLOWPOKE_EvosMoves - dw KADABRA_EvosMoves - dw GRAVELER_EvosMoves - dw CHANSEY_EvosMoves - dw MACHOKE_EvosMoves - dw MR_MIME_EvosMoves - dw HITMONLEE_EvosMoves - dw HITMONCHAN_EvosMoves - dw ARBOK_EvosMoves - dw PARASECT_EvosMoves - dw PSYDUCK_EvosMoves - dw DROWZEE_EvosMoves - dw GOLEM_EvosMoves - dw MISSINGNO_32_EvosMoves - dw MAGMAR_EvosMoves - dw MISSINGNO_34_EvosMoves - dw ELECTABUZZ_EvosMoves - dw MAGNETON_EvosMoves - dw KOFFING_EvosMoves - dw MISSINGNO_38_EvosMoves - dw MANKEY_EvosMoves - dw SEEL_EvosMoves - dw DIGLETT_EvosMoves - dw TAUROS_EvosMoves - dw MISSINGNO_3D_EvosMoves - dw MISSINGNO_3E_EvosMoves - dw MISSINGNO_3F_EvosMoves - dw FARFETCHD_EvosMoves - dw VENONAT_EvosMoves - dw DRAGONITE_EvosMoves - dw MISSINGNO_43_EvosMoves - dw MISSINGNO_44_EvosMoves - dw MISSINGNO_45_EvosMoves - dw DODUO_EvosMoves - dw POLIWAG_EvosMoves - dw JYNX_EvosMoves - dw MOLTRES_EvosMoves - dw ARTICUNO_EvosMoves - dw ZAPDOS_EvosMoves - dw DITTO_EvosMoves - dw MEOWTH_EvosMoves - dw KRABBY_EvosMoves - dw MISSINGNO_4F_EvosMoves - dw MISSINGNO_50_EvosMoves - dw MISSINGNO_51_EvosMoves - dw VULPIX_EvosMoves - dw NINETALES_EvosMoves - dw PIKACHU_EvosMoves - dw RAICHU_EvosMoves - dw MISSINGNO_56_EvosMoves - dw MISSINGNO_57_EvosMoves - dw DRATINI_EvosMoves - dw DRAGONAIR_EvosMoves - dw KABUTO_EvosMoves - dw KABUTOPS_EvosMoves - dw HORSEA_EvosMoves - dw SEADRA_EvosMoves - dw MISSINGNO_5E_EvosMoves - dw MISSINGNO_5F_EvosMoves - dw SANDSHREW_EvosMoves - dw SANDSLASH_EvosMoves - dw OMANYTE_EvosMoves - dw OMASTAR_EvosMoves - dw JIGGLYPUFF_EvosMoves - dw WIGGLYTUFF_EvosMoves - dw EEVEE_EvosMoves - dw FLAREON_EvosMoves - dw JOLTEON_EvosMoves - dw VAPOREON_EvosMoves - dw MACHOP_EvosMoves - dw ZUBAT_EvosMoves - dw EKANS_EvosMoves - dw PARAS_EvosMoves - dw POLIWHIRL_EvosMoves - dw POLIWRATH_EvosMoves - dw WEEDLE_EvosMoves - dw KAKUNA_EvosMoves - dw BEEDRILL_EvosMoves - dw MISSINGNO_73_EvosMoves - dw DODRIO_EvosMoves - dw PRIMEAPE_EvosMoves - dw DUGTRIO_EvosMoves - dw VENOMOTH_EvosMoves - dw DEWGONG_EvosMoves - dw MISSINGNO_79_EvosMoves - dw MISSINGNO_7A_EvosMoves - dw CATERPIE_EvosMoves - dw METAPOD_EvosMoves - dw BUTTERFREE_EvosMoves - dw MACHAMP_EvosMoves - dw MISSINGNO_7F_EvosMoves - dw GOLDUCK_EvosMoves - dw HYPNO_EvosMoves - dw GOLBAT_EvosMoves - dw MEWTWO_EvosMoves - dw SNORLAX_EvosMoves - dw MAGIKARP_EvosMoves - dw MISSINGNO_86_EvosMoves - dw MISSINGNO_87_EvosMoves - dw MUK_EvosMoves - dw MISSINGNO_8A_EvosMoves - dw KINGLER_EvosMoves - dw CLOYSTER_EvosMoves - dw MISSINGNO_8C_EvosMoves - dw ELECTRODE_EvosMoves - dw CLEFABLE_EvosMoves - dw WEEZING_EvosMoves - dw PERSIAN_EvosMoves - dw MAROWAK_EvosMoves - dw MISSINGNO_92_EvosMoves - dw HAUNTER_EvosMoves - dw ABRA_EvosMoves - dw ALAKAZAM_EvosMoves - dw PIDGEOTTO_EvosMoves - dw PIDGEOT_EvosMoves - dw STARMIE_EvosMoves - dw BULBASAUR_EvosMoves - dw VENUSAUR_EvosMoves - dw TENTACRUEL_EvosMoves - dw MISSINGNO_9C_EvosMoves - dw GOLDEEN_EvosMoves - dw SEAKING_EvosMoves - dw MISSINGNO_9F_EvosMoves - dw MISSINGNO_A0_EvosMoves - dw MISSINGNO_A1_EvosMoves - dw MISSINGNO_A2_EvosMoves - dw PONYTA_EvosMoves - dw RAPIDASH_EvosMoves - dw RATTATA_EvosMoves - dw RATICATE_EvosMoves - dw NIDORINO_EvosMoves - dw NIDORINA_EvosMoves - dw GEODUDE_EvosMoves - dw PORYGON_EvosMoves - dw AERODACTYL_EvosMoves - dw MISSINGNO_AC_EvosMoves - dw MAGNEMITE_EvosMoves - dw MISSINGNO_AE_EvosMoves - dw MISSINGNO_AF_EvosMoves - dw CHARMANDER_EvosMoves - dw SQUIRTLE_EvosMoves - dw CHARMELEON_EvosMoves - dw WARTORTLE_EvosMoves - dw CHARIZARD_EvosMoves - dw MISSINGNO_B5_EvosMoves - dw FOSSIL_KABUTOPS_EvosMoves - dw FOSSIL_AERODACTYL_EvosMoves - dw MON_GHOST_EvosMoves - dw ODDISH_EvosMoves - dw GLOOM_EvosMoves - dw VILEPLUME_EvosMoves - dw BELLSPROUT_EvosMoves - dw WEEPINBELL_EvosMoves - dw VICTREEBEL_EvosMoves + dw RhydonEvosMoves + dw KangaskhanEvosMoves + dw NidoranMEvosMoves + dw ClefairyEvosMoves + dw SpearowEvosMoves + dw VoltorbEvosMoves + dw NidokingEvosMoves + dw SlowbroEvosMoves + dw IvysaurEvosMoves + dw ExeggutorEvosMoves + dw LickitungEvosMoves + dw ExeggcuteEvosMoves + dw GrimerEvosMoves + dw GengarEvosMoves + dw NidoranFEvosMoves + dw NidoqueenEvosMoves + dw CuboneEvosMoves + dw RhyhornEvosMoves + dw LaprasEvosMoves + dw ArcanineEvosMoves + dw MewEvosMoves + dw GyaradosEvosMoves + dw ShellderEvosMoves + dw TentacoolEvosMoves + dw GastlyEvosMoves + dw ScytherEvosMoves + dw StaryuEvosMoves + dw BlastoiseEvosMoves + dw PinsirEvosMoves + dw TangelaEvosMoves + dw MissingNo1FEvosMoves + dw MissingNo20EvosMoves + dw GrowlitheEvosMoves + dw OnixEvosMoves + dw FearowEvosMoves + dw PidgeyEvosMoves + dw SlowpokeEvosMoves + dw KadabraEvosMoves + dw GravelerEvosMoves + dw ChanseyEvosMoves + dw MachokeEvosMoves + dw MrMimeEvosMoves + dw HitmonleeEvosMoves + dw HitmonchanEvosMoves + dw ArbokEvosMoves + dw ParasectEvosMoves + dw PsyduckEvosMoves + dw DrowzeeEvosMoves + dw GolemEvosMoves + dw MissingNo32EvosMoves + dw MagmarEvosMoves + dw MissingNo34EvosMoves + dw ElectabuzzEvosMoves + dw MagnetonEvosMoves + dw KoffingEvosMoves + dw MissingNo38EvosMoves + dw MankeyEvosMoves + dw SeelEvosMoves + dw DiglettEvosMoves + dw TaurosEvosMoves + dw MissingNo3DEvosMoves + dw MissingNo3EEvosMoves + dw MissingNo3FEvosMoves + dw FarfetchdEvosMoves + dw VenonatEvosMoves + dw DragoniteEvosMoves + dw MissingNo43EvosMoves + dw MissingNo44EvosMoves + dw MissingNo45EvosMoves + dw DoduoEvosMoves + dw PoliwagEvosMoves + dw JynxEvosMoves + dw MoltresEvosMoves + dw ArticunoEvosMoves + dw ZapdosEvosMoves + dw DittoEvosMoves + dw MeowthEvosMoves + dw KrabbyEvosMoves + dw MissingNo4FEvosMoves + dw MissingNo50EvosMoves + dw MissingNo51EvosMoves + dw VulpixEvosMoves + dw NinetalesEvosMoves + dw PikachuEvosMoves + dw RaichuEvosMoves + dw MissingNo56EvosMoves + dw MissingNo57EvosMoves + dw DratiniEvosMoves + dw DragonairEvosMoves + dw KabutoEvosMoves + dw KabutopsEvosMoves + dw HorseaEvosMoves + dw SeadraEvosMoves + dw MissingNo5EEvosMoves + dw MissingNo5FEvosMoves + dw SandshrewEvosMoves + dw SandslashEvosMoves + dw OmanyteEvosMoves + dw OmastarEvosMoves + dw JigglypuffEvosMoves + dw WigglytuffEvosMoves + dw EeveeEvosMoves + dw FlareonEvosMoves + dw JolteonEvosMoves + dw VaporeonEvosMoves + dw MachopEvosMoves + dw ZubatEvosMoves + dw EkansEvosMoves + dw ParasEvosMoves + dw PoliwhirlEvosMoves + dw PoliwrathEvosMoves + dw WeedleEvosMoves + dw KakunaEvosMoves + dw BeedrillEvosMoves + dw MissingNo73EvosMoves + dw DodrioEvosMoves + dw PrimeapeEvosMoves + dw DugtrioEvosMoves + dw VenomothEvosMoves + dw DewgongEvosMoves + dw MissingNo79EvosMoves + dw MissingNo7AEvosMoves + dw CaterpieEvosMoves + dw MetapodEvosMoves + dw ButterfreeEvosMoves + dw MachampEvosMoves + dw MissingNo7FEvosMoves + dw GolduckEvosMoves + dw HypnoEvosMoves + dw GolbatEvosMoves + dw MewtwoEvosMoves + dw SnorlaxEvosMoves + dw MagikarpEvosMoves + dw MissingNo86EvosMoves + dw MissingNo87EvosMoves + dw MukEvosMoves + dw MissingNo8AEvosMoves + dw KinglerEvosMoves + dw CloysterEvosMoves + dw MissingNo8CEvosMoves + dw ElectrodeEvosMoves + dw ClefableEvosMoves + dw WeezingEvosMoves + dw PersianEvosMoves + dw MarowakEvosMoves + dw MissingNo92EvosMoves + dw HaunterEvosMoves + dw AbraEvosMoves + dw AlakazamEvosMoves + dw PidgeottoEvosMoves + dw PidgeotEvosMoves + dw StarmieEvosMoves + dw BulbasaurEvosMoves + dw VenusaurEvosMoves + dw TentacruelEvosMoves + dw MissingNo9CEvosMoves + dw GoldeenEvosMoves + dw SeakingEvosMoves + dw MissingNo9FEvosMoves + dw MissingNoA0EvosMoves + dw MissingNoA1EvosMoves + dw MissingNoA2EvosMoves + dw PonytaEvosMoves + dw RapidashEvosMoves + dw RattataEvosMoves + dw RaticateEvosMoves + dw NidorinoEvosMoves + dw NidorinaEvosMoves + dw GeodudeEvosMoves + dw PorygonEvosMoves + dw AerodactylEvosMoves + dw MissingNoACEvosMoves + dw MagnemiteEvosMoves + dw MissingNoAEEvosMoves + dw MissingNoAFEvosMoves + dw CharmanderEvosMoves + dw SquirtleEvosMoves + dw CharmeleonEvosMoves + dw WartortleEvosMoves + dw CharizardEvosMoves + dw MissingNoB5EvosMoves + dw FossilKabutopsEvosMoves + dw FossilAerodactylEvosMoves + dw MonGhostEvosMoves + dw OddishEvosMoves + dw GloomEvosMoves + dw VileplumeEvosMoves + dw BellsproutEvosMoves + dw WeepinbellEvosMoves + dw VictreebelEvosMoves -RHYDON_EvosMoves +RhydonEvosMoves: ;Evolutions db 0 ;Learnset @@ -202,7 +202,7 @@ RHYDON_EvosMoves db 64,TAKE_DOWN db 0 -KANGASKHAN_EvosMoves +KangaskhanEvosMoves: ;Evolutions db 0 ;Learnset @@ -213,7 +213,7 @@ KANGASKHAN_EvosMoves db 46,DIZZY_PUNCH db 0 -NIDORAN_M_EvosMoves +NidoranMEvosMoves: ;Evolutions db EV_LEVEL,16,NIDORINO db 0 @@ -226,7 +226,7 @@ NIDORAN_M_EvosMoves db 43,DOUBLE_KICK db 0 -CLEFAIRY_EvosMoves +ClefairyEvosMoves: ;Evolutions db EV_ITEM,MOON_STONE,1,CLEFABLE db 0 @@ -239,7 +239,7 @@ CLEFAIRY_EvosMoves db 48,LIGHT_SCREEN db 0 -SPEAROW_EvosMoves +SpearowEvosMoves: ;Evolutions db EV_LEVEL,20,FEAROW db 0 @@ -251,7 +251,7 @@ SPEAROW_EvosMoves db 36,AGILITY db 0 -VOLTORB_EvosMoves +VoltorbEvosMoves: ;Evolutions db EV_LEVEL,30,ELECTRODE db 0 @@ -263,7 +263,7 @@ VOLTORB_EvosMoves db 43,EXPLOSION db 0 -NIDOKING_EvosMoves +NidokingEvosMoves: ;Evolutions db 0 ;Learnset @@ -272,7 +272,7 @@ NIDOKING_EvosMoves db 23,THRASH db 0 -SLOWBRO_EvosMoves +SlowbroEvosMoves: ;Evolutions db 0 ;Learnset @@ -285,7 +285,7 @@ SLOWBRO_EvosMoves db 55,PSYCHIC_M db 0 -IVYSAUR_EvosMoves +IvysaurEvosMoves: ;Evolutions db EV_LEVEL,32,VENUSAUR db 0 @@ -299,14 +299,14 @@ IVYSAUR_EvosMoves db 54,SOLARBEAM db 0 -EXEGGUTOR_EvosMoves +ExeggutorEvosMoves: ;Evolutions db 0 ;Learnset db 28,STOMP db 0 -LICKITUNG_EvosMoves +LickitungEvosMoves: ;Evolutions db 0 ;Learnset @@ -317,7 +317,7 @@ LICKITUNG_EvosMoves db 39,SCREECH db 0 -EXEGGCUTE_EvosMoves +ExeggcuteEvosMoves: ;Evolutions db EV_ITEM,LEAF_STONE,1,EXEGGUTOR db 0 @@ -330,7 +330,7 @@ EXEGGCUTE_EvosMoves db 48,SLEEP_POWDER db 0 -GRIMER_EvosMoves +GrimerEvosMoves: ;Evolutions db EV_LEVEL,38,MUK db 0 @@ -343,7 +343,7 @@ GRIMER_EvosMoves db 55,ACID_ARMOR db 0 -GENGAR_EvosMoves +GengarEvosMoves: ;Evolutions db 0 ;Learnset @@ -351,7 +351,7 @@ GENGAR_EvosMoves db 38,DREAM_EATER db 0 -NIDORAN_F_EvosMoves +NidoranFEvosMoves: ;Evolutions db EV_LEVEL,16,NIDORINA db 0 @@ -364,7 +364,7 @@ NIDORAN_F_EvosMoves db 43,DOUBLE_KICK db 0 -NIDOQUEEN_EvosMoves +NidoqueenEvosMoves: ;Evolutions db 0 ;Learnset @@ -373,7 +373,7 @@ NIDOQUEEN_EvosMoves db 23,BODY_SLAM db 0 -CUBONE_EvosMoves +CuboneEvosMoves: ;Evolutions db EV_LEVEL,28,MAROWAK db 0 @@ -385,7 +385,7 @@ CUBONE_EvosMoves db 46,RAGE db 0 -RHYHORN_EvosMoves +RhyhornEvosMoves: ;Evolutions db EV_LEVEL,42,RHYDON db 0 @@ -398,7 +398,7 @@ RHYHORN_EvosMoves db 55,TAKE_DOWN db 0 -LAPRAS_EvosMoves +LaprasEvosMoves: ;Evolutions db 0 ;Learnset @@ -410,13 +410,13 @@ LAPRAS_EvosMoves db 46,HYDRO_PUMP db 0 -ARCANINE_EvosMoves +ArcanineEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MEW_EvosMoves +MewEvosMoves: ;Evolutions db 0 ;Learnset @@ -426,7 +426,7 @@ MEW_EvosMoves db 40,PSYCHIC_M db 0 -GYARADOS_EvosMoves +GyaradosEvosMoves: ;Evolutions db 0 ;Learnset @@ -437,7 +437,7 @@ GYARADOS_EvosMoves db 52,HYPER_BEAM db 0 -SHELLDER_EvosMoves +ShellderEvosMoves: ;Evolutions db EV_ITEM,WATER_STONE,1,CLOYSTER db 0 @@ -449,7 +449,7 @@ SHELLDER_EvosMoves db 50,ICE_BEAM db 0 -TENTACOOL_EvosMoves +TentacoolEvosMoves: ;Evolutions db EV_LEVEL,30,TENTACRUEL db 0 @@ -464,7 +464,7 @@ TENTACOOL_EvosMoves db 48,HYDRO_PUMP db 0 -GASTLY_EvosMoves +GastlyEvosMoves: ;Evolutions db EV_LEVEL,25,HAUNTER db 0 @@ -473,7 +473,7 @@ GASTLY_EvosMoves db 35,DREAM_EATER db 0 -SCYTHER_EvosMoves +ScytherEvosMoves: ;Evolutions db 0 ;Learnset @@ -485,7 +485,7 @@ SCYTHER_EvosMoves db 42,AGILITY db 0 -STARYU_EvosMoves +StaryuEvosMoves: ;Evolutions db EV_ITEM,WATER_STONE,1,STARMIE db 0 @@ -499,7 +499,7 @@ STARYU_EvosMoves db 47,HYDRO_PUMP db 0 -BLASTOISE_EvosMoves +BlastoiseEvosMoves: ;Evolutions db 0 ;Learnset @@ -511,7 +511,7 @@ BLASTOISE_EvosMoves db 52,HYDRO_PUMP db 0 -PINSIR_EvosMoves +PinsirEvosMoves: ;Evolutions db 0 ;Learnset @@ -523,7 +523,7 @@ PINSIR_EvosMoves db 54,SWORDS_DANCE db 0 -TANGELA_EvosMoves +TangelaEvosMoves: ;Evolutions db 0 ;Learnset @@ -535,19 +535,19 @@ TANGELA_EvosMoves db 49,GROWTH db 0 -MISSINGNO_1F_EvosMoves +MissingNo1FEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_20_EvosMoves +MissingNo20EvosMoves: ;Evolutions db 0 ;Learnset db 0 -GROWLITHE_EvosMoves +GrowlitheEvosMoves: ;Evolutions db EV_ITEM,FIRE_STONE,1,ARCANINE db 0 @@ -559,7 +559,7 @@ GROWLITHE_EvosMoves db 50,FLAMETHROWER db 0 -ONIX_EvosMoves +OnixEvosMoves: ;Evolutions db 0 ;Learnset @@ -570,7 +570,7 @@ ONIX_EvosMoves db 43,HARDEN db 0 -FEAROW_EvosMoves +FearowEvosMoves: ;Evolutions db 0 ;Learnset @@ -581,7 +581,7 @@ FEAROW_EvosMoves db 43,AGILITY db 0 -PIDGEY_EvosMoves +PidgeyEvosMoves: ;Evolutions db EV_LEVEL,18,PIDGEOTTO db 0 @@ -594,7 +594,7 @@ PIDGEY_EvosMoves db 44,MIRROR_MOVE db 0 -SLOWPOKE_EvosMoves +SlowpokeEvosMoves: ;Evolutions db EV_LEVEL,37,SLOWBRO db 0 @@ -607,7 +607,7 @@ SLOWPOKE_EvosMoves db 48,PSYCHIC_M db 0 -KADABRA_EvosMoves +KadabraEvosMoves: ;Evolutions db EV_TRADE,1,ALAKAZAM db 0 @@ -620,7 +620,7 @@ KADABRA_EvosMoves db 42,REFLECT db 0 -GRAVELER_EvosMoves +GravelerEvosMoves: ;Evolutions db EV_TRADE,1,GOLEM db 0 @@ -633,7 +633,7 @@ GRAVELER_EvosMoves db 43,EXPLOSION db 0 -CHANSEY_EvosMoves +ChanseyEvosMoves: ;Evolutions db 0 ;Learnset @@ -645,7 +645,7 @@ CHANSEY_EvosMoves db 54,DOUBLE_EDGE db 0 -MACHOKE_EvosMoves +MachokeEvosMoves: ;Evolutions db EV_TRADE,1,MACHAMP db 0 @@ -657,7 +657,7 @@ MACHOKE_EvosMoves db 52,SUBMISSION db 0 -MR_MIME_EvosMoves +MrMimeEvosMoves: ;Evolutions db 0 ;Learnset @@ -668,7 +668,7 @@ MR_MIME_EvosMoves db 47,SUBSTITUTE db 0 -HITMONLEE_EvosMoves +HitmonleeEvosMoves: ;Evolutions db 0 ;Learnset @@ -679,7 +679,7 @@ HITMONLEE_EvosMoves db 53,MEGA_KICK db 0 -HITMONCHAN_EvosMoves +HitmonchanEvosMoves: ;Evolutions db 0 ;Learnset @@ -690,7 +690,7 @@ HITMONCHAN_EvosMoves db 53,COUNTER db 0 -ARBOK_EvosMoves +ArbokEvosMoves: ;Evolutions db 0 ;Learnset @@ -701,7 +701,7 @@ ARBOK_EvosMoves db 47,ACID db 0 -PARASECT_EvosMoves +ParasectEvosMoves: ;Evolutions db 0 ;Learnset @@ -712,7 +712,7 @@ PARASECT_EvosMoves db 48,GROWTH db 0 -PSYDUCK_EvosMoves +PsyduckEvosMoves: ;Evolutions db EV_LEVEL,33,GOLDUCK db 0 @@ -724,7 +724,7 @@ PSYDUCK_EvosMoves db 52,HYDRO_PUMP db 0 -DROWZEE_EvosMoves +DrowzeeEvosMoves: ;Evolutions db EV_LEVEL,26,HYPNO db 0 @@ -737,7 +737,7 @@ DROWZEE_EvosMoves db 37,MEDITATE db 0 -GOLEM_EvosMoves +GolemEvosMoves: ;Evolutions db 0 ;Learnset @@ -749,13 +749,13 @@ GOLEM_EvosMoves db 43,EXPLOSION db 0 -MISSINGNO_32_EvosMoves +MissingNo32EvosMoves: ;Evolutions db 0 ;Learnset db 0 -MAGMAR_EvosMoves +MagmarEvosMoves: ;Evolutions db 0 ;Learnset @@ -767,13 +767,13 @@ MAGMAR_EvosMoves db 55,FLAMETHROWER db 0 -MISSINGNO_34_EvosMoves +MissingNo34EvosMoves: ;Evolutions db 0 ;Learnset db 0 -ELECTABUZZ_EvosMoves +ElectabuzzEvosMoves: ;Evolutions db 0 ;Learnset @@ -784,7 +784,7 @@ ELECTABUZZ_EvosMoves db 54,THUNDER db 0 -MAGNETON_EvosMoves +MagnetonEvosMoves: ;Evolutions db 0 ;Learnset @@ -796,7 +796,7 @@ MAGNETON_EvosMoves db 54,SCREECH db 0 -KOFFING_EvosMoves +KoffingEvosMoves: ;Evolutions db EV_LEVEL,35,WEEZING db 0 @@ -808,13 +808,13 @@ KOFFING_EvosMoves db 48,EXPLOSION db 0 -MISSINGNO_38_EvosMoves +MissingNo38EvosMoves: ;Evolutions db 0 ;Learnset db 0 -MANKEY_EvosMoves +MankeyEvosMoves: ;Evolutions db EV_LEVEL,28,PRIMEAPE db 0 @@ -826,7 +826,7 @@ MANKEY_EvosMoves db 39,THRASH db 0 -SEEL_EvosMoves +SeelEvosMoves: ;Evolutions db EV_LEVEL,34,DEWGONG db 0 @@ -838,7 +838,7 @@ SEEL_EvosMoves db 50,ICE_BEAM db 0 -DIGLETT_EvosMoves +DiglettEvosMoves: ;Evolutions db EV_LEVEL,26,DUGTRIO db 0 @@ -850,7 +850,7 @@ DIGLETT_EvosMoves db 40,EARTHQUAKE db 0 -TAUROS_EvosMoves +TaurosEvosMoves: ;Evolutions db 0 ;Learnset @@ -861,25 +861,25 @@ TAUROS_EvosMoves db 51,TAKE_DOWN db 0 -MISSINGNO_3D_EvosMoves +MissingNo3DEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_3E_EvosMoves +MissingNo3EEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_3F_EvosMoves +MissingNo3FEvosMoves: ;Evolutions db 0 ;Learnset db 0 -FARFETCHD_EvosMoves +FarfetchdEvosMoves: ;Evolutions db 0 ;Learnset @@ -890,7 +890,7 @@ FARFETCHD_EvosMoves db 39,SLASH db 0 -VENONAT_EvosMoves +VenonatEvosMoves: ;Evolutions db EV_LEVEL,31,VENOMOTH db 0 @@ -903,7 +903,7 @@ VENONAT_EvosMoves db 43,PSYCHIC_M db 0 -DRAGONITE_EvosMoves +DragoniteEvosMoves: ;Evolutions db 0 ;Learnset @@ -914,25 +914,25 @@ DRAGONITE_EvosMoves db 60,HYPER_BEAM db 0 -MISSINGNO_43_EvosMoves +MissingNo43EvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_44_EvosMoves +MissingNo44EvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_45_EvosMoves +MissingNo45EvosMoves: ;Evolutions db 0 ;Learnset db 0 -DODUO_EvosMoves +DoduoEvosMoves: ;Evolutions db EV_LEVEL,31,DODRIO db 0 @@ -945,7 +945,7 @@ DODUO_EvosMoves db 44,AGILITY db 0 -POLIWAG_EvosMoves +PoliwagEvosMoves: ;Evolutions db EV_LEVEL,25,POLIWHIRL db 0 @@ -958,7 +958,7 @@ POLIWAG_EvosMoves db 45,HYDRO_PUMP db 0 -JYNX_EvosMoves +JynxEvosMoves: ;Evolutions db 0 ;Learnset @@ -970,7 +970,7 @@ JYNX_EvosMoves db 58,BLIZZARD db 0 -MOLTRES_EvosMoves +MoltresEvosMoves: ;Evolutions db 0 ;Learnset @@ -979,7 +979,7 @@ MOLTRES_EvosMoves db 60,SKY_ATTACK db 0 -ARTICUNO_EvosMoves +ArticunoEvosMoves: ;Evolutions db 0 ;Learnset @@ -988,7 +988,7 @@ ARTICUNO_EvosMoves db 60,MIST db 0 -ZAPDOS_EvosMoves +ZapdosEvosMoves: ;Evolutions db 0 ;Learnset @@ -997,13 +997,13 @@ ZAPDOS_EvosMoves db 60,LIGHT_SCREEN db 0 -DITTO_EvosMoves +DittoEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MEOWTH_EvosMoves +MeowthEvosMoves: ;Evolutions db EV_LEVEL,28,PERSIAN db 0 @@ -1015,7 +1015,7 @@ MEOWTH_EvosMoves db 44,SLASH db 0 -KRABBY_EvosMoves +KrabbyEvosMoves: ;Evolutions db EV_LEVEL,28,KINGLER db 0 @@ -1027,25 +1027,25 @@ KRABBY_EvosMoves db 40,HARDEN db 0 -MISSINGNO_4F_EvosMoves +MissingNo4FEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_50_EvosMoves +MissingNo50EvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_51_EvosMoves +MissingNo51EvosMoves: ;Evolutions db 0 ;Learnset db 0 -VULPIX_EvosMoves +VulpixEvosMoves: ;Evolutions db EV_ITEM,FIRE_STONE,1,NINETALES db 0 @@ -1057,13 +1057,13 @@ VULPIX_EvosMoves db 42,FIRE_SPIN db 0 -NINETALES_EvosMoves +NinetalesEvosMoves: ;Evolutions db 0 ;Learnset db 0 -PIKACHU_EvosMoves +PikachuEvosMoves: ;Evolutions db EV_ITEM,THUNDER_STONE,1,RAICHU db 0 @@ -1075,25 +1075,25 @@ PIKACHU_EvosMoves db 43,THUNDER db 0 -RAICHU_EvosMoves +RaichuEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_56_EvosMoves +MissingNo56EvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_57_EvosMoves +MissingNo57EvosMoves: ;Evolutions db 0 ;Learnset db 0 -DRATINI_EvosMoves +DratiniEvosMoves: ;Evolutions db EV_LEVEL,30,DRAGONAIR db 0 @@ -1105,7 +1105,7 @@ DRATINI_EvosMoves db 50,HYPER_BEAM db 0 -DRAGONAIR_EvosMoves +DragonairEvosMoves: ;Evolutions db EV_LEVEL,55,DRAGONITE db 0 @@ -1117,7 +1117,7 @@ DRAGONAIR_EvosMoves db 55,HYPER_BEAM db 0 -KABUTO_EvosMoves +KabutoEvosMoves: ;Evolutions db EV_LEVEL,40,KABUTOPS db 0 @@ -1128,7 +1128,7 @@ KABUTO_EvosMoves db 49,HYDRO_PUMP db 0 -KABUTOPS_EvosMoves +KabutopsEvosMoves: ;Evolutions db 0 ;Learnset @@ -1138,7 +1138,7 @@ KABUTOPS_EvosMoves db 53,HYDRO_PUMP db 0 -HORSEA_EvosMoves +HorseaEvosMoves: ;Evolutions db EV_LEVEL,32,SEADRA db 0 @@ -1150,7 +1150,7 @@ HORSEA_EvosMoves db 45,HYDRO_PUMP db 0 -SEADRA_EvosMoves +SeadraEvosMoves: ;Evolutions db 0 ;Learnset @@ -1161,19 +1161,19 @@ SEADRA_EvosMoves db 52,HYDRO_PUMP db 0 -MISSINGNO_5E_EvosMoves +MissingNo5EEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_5F_EvosMoves +MissingNo5FEvosMoves: ;Evolutions db 0 ;Learnset db 0 -SANDSHREW_EvosMoves +SandshrewEvosMoves: ;Evolutions db EV_LEVEL,22,SANDSLASH db 0 @@ -1185,7 +1185,7 @@ SANDSHREW_EvosMoves db 38,FURY_SWIPES db 0 -SANDSLASH_EvosMoves +SandslashEvosMoves: ;Evolutions db 0 ;Learnset @@ -1196,7 +1196,7 @@ SANDSLASH_EvosMoves db 47,FURY_SWIPES db 0 -OMANYTE_EvosMoves +OmanyteEvosMoves: ;Evolutions db EV_LEVEL,40,OMASTAR db 0 @@ -1207,7 +1207,7 @@ OMANYTE_EvosMoves db 53,HYDRO_PUMP db 0 -OMASTAR_EvosMoves +OmastarEvosMoves: ;Evolutions db 0 ;Learnset @@ -1217,7 +1217,7 @@ OMASTAR_EvosMoves db 49,HYDRO_PUMP db 0 -JIGGLYPUFF_EvosMoves +JigglypuffEvosMoves: ;Evolutions db EV_ITEM,MOON_STONE,1,WIGGLYTUFF db 0 @@ -1231,26 +1231,27 @@ JIGGLYPUFF_EvosMoves db 39,DOUBLE_EDGE db 0 -WIGGLYTUFF_EvosMoves +WigglytuffEvosMoves: ;Evolutions db 0 ;Learnset db 0 -EEVEE_EvosMoves +EeveeEvosMoves: ;Evolutions db EV_ITEM,FIRE_STONE,1,FLAREON db EV_ITEM,THUNDER_STONE,1,JOLTEON db EV_ITEM,WATER_STONE,1,VAPOREON db 0 -EEVEE_EvosEnd +EeveeEvosEnd: +;Learnset db 27,QUICK_ATTACK db 31,TAIL_WHIP db 37,BITE db 45,TAKE_DOWN db 0 -FLAREON_EvosMoves +FlareonEvosMoves: ;Evolutions db 0 ;Learnset @@ -1264,7 +1265,7 @@ FLAREON_EvosMoves db 54,FLAMETHROWER db 0 -JOLTEON_EvosMoves +JolteonEvosMoves: ;Evolutions db 0 ;Learnset @@ -1278,7 +1279,7 @@ JOLTEON_EvosMoves db 54,THUNDER db 0 -VAPOREON_EvosMoves +VaporeonEvosMoves: ;Evolutions db 0 ;Learnset @@ -1292,7 +1293,7 @@ VAPOREON_EvosMoves db 54,HYDRO_PUMP db 0 -MACHOP_EvosMoves +MachopEvosMoves: ;Evolutions db EV_LEVEL,28,MACHOKE db 0 @@ -1304,7 +1305,7 @@ MACHOP_EvosMoves db 46,SUBMISSION db 0 -ZUBAT_EvosMoves +ZubatEvosMoves: ;Evolutions db EV_LEVEL,22,GOLBAT db 0 @@ -1316,7 +1317,7 @@ ZUBAT_EvosMoves db 36,HAZE db 0 -EKANS_EvosMoves +EkansEvosMoves: ;Evolutions db EV_LEVEL,22,ARBOK db 0 @@ -1328,7 +1329,7 @@ EKANS_EvosMoves db 38,ACID db 0 -PARAS_EvosMoves +ParasEvosMoves: ;Evolutions db EV_LEVEL,24,PARASECT db 0 @@ -1340,7 +1341,7 @@ PARAS_EvosMoves db 41,GROWTH db 0 -POLIWHIRL_EvosMoves +PoliwhirlEvosMoves: ;Evolutions db EV_ITEM,WATER_STONE,1,POLIWRATH db 0 @@ -1353,7 +1354,7 @@ POLIWHIRL_EvosMoves db 49,HYDRO_PUMP db 0 -POLIWRATH_EvosMoves +PoliwrathEvosMoves: ;Evolutions db 0 ;Learnset @@ -1361,21 +1362,21 @@ POLIWRATH_EvosMoves db 19,WATER_GUN db 0 -WEEDLE_EvosMoves +WeedleEvosMoves: ;Evolutions db EV_LEVEL,7,KAKUNA db 0 ;Learnset db 0 -KAKUNA_EvosMoves +KakunaEvosMoves: ;Evolutions db EV_LEVEL,10,BEEDRILL db 0 ;Learnset db 0 -BEEDRILL_EvosMoves +BeedrillEvosMoves: ;Evolutions db 0 ;Learnset @@ -1387,13 +1388,13 @@ BEEDRILL_EvosMoves db 35,AGILITY db 0 -MISSINGNO_73_EvosMoves +MissingNo73EvosMoves: ;Evolutions db 0 ;Learnset db 0 -DODRIO_EvosMoves +DodrioEvosMoves: ;Evolutions db 0 ;Learnset @@ -1405,7 +1406,7 @@ DODRIO_EvosMoves db 51,AGILITY db 0 -PRIMEAPE_EvosMoves +PrimeapeEvosMoves: ;Evolutions db 0 ;Learnset @@ -1416,7 +1417,7 @@ PRIMEAPE_EvosMoves db 46,THRASH db 0 -DUGTRIO_EvosMoves +DugtrioEvosMoves: ;Evolutions db 0 ;Learnset @@ -1427,7 +1428,7 @@ DUGTRIO_EvosMoves db 47,EARTHQUAKE db 0 -VENOMOTH_EvosMoves +VenomothEvosMoves: ;Evolutions db 0 ;Learnset @@ -1439,7 +1440,7 @@ VENOMOTH_EvosMoves db 50,PSYCHIC_M db 0 -DEWGONG_EvosMoves +DewgongEvosMoves: ;Evolutions db 0 ;Learnset @@ -1450,33 +1451,33 @@ DEWGONG_EvosMoves db 56,ICE_BEAM db 0 -MISSINGNO_79_EvosMoves +MissingNo79EvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_7A_EvosMoves +MissingNo7AEvosMoves: ;Evolutions db 0 ;Learnset db 0 -CATERPIE_EvosMoves +CaterpieEvosMoves: ;Evolutions db EV_LEVEL,7,METAPOD db 0 ;Learnset db 0 -METAPOD_EvosMoves +MetapodEvosMoves: ;Evolutions db EV_LEVEL,10,BUTTERFREE db 0 ;Learnset db 0 -BUTTERFREE_EvosMoves +ButterfreeEvosMoves: ;Evolutions db 0 ;Learnset @@ -1489,7 +1490,7 @@ BUTTERFREE_EvosMoves db 32,PSYBEAM db 0 -MACHAMP_EvosMoves +MachampEvosMoves: ;Evolutions db 0 ;Learnset @@ -1500,13 +1501,13 @@ MACHAMP_EvosMoves db 52,SUBMISSION db 0 -MISSINGNO_7F_EvosMoves +MissingNo7FEvosMoves: ;Evolutions db 0 ;Learnset db 0 -GOLDUCK_EvosMoves +GolduckEvosMoves: ;Evolutions db 0 ;Learnset @@ -1517,7 +1518,7 @@ GOLDUCK_EvosMoves db 59,HYDRO_PUMP db 0 -HYPNO_EvosMoves +HypnoEvosMoves: ;Evolutions db 0 ;Learnset @@ -1529,7 +1530,7 @@ HYPNO_EvosMoves db 43,MEDITATE db 0 -GOLBAT_EvosMoves +GolbatEvosMoves: ;Evolutions db 0 ;Learnset @@ -1540,7 +1541,7 @@ GOLBAT_EvosMoves db 43,HAZE db 0 -MEWTWO_EvosMoves +MewtwoEvosMoves: ;Evolutions db 0 ;Learnset @@ -1551,7 +1552,7 @@ MEWTWO_EvosMoves db 81,AMNESIA db 0 -SNORLAX_EvosMoves +SnorlaxEvosMoves: ;Evolutions db 0 ;Learnset @@ -1561,7 +1562,7 @@ SNORLAX_EvosMoves db 56,HYPER_BEAM db 0 -MAGIKARP_EvosMoves +MagikarpEvosMoves: ;Evolutions db EV_LEVEL,20,GYARADOS db 0 @@ -1569,19 +1570,19 @@ MAGIKARP_EvosMoves db 15,TACKLE db 0 -MISSINGNO_86_EvosMoves +MissingNo86EvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_87_EvosMoves +MissingNo87EvosMoves: ;Evolutions db 0 ;Learnset db 0 -MUK_EvosMoves +MukEvosMoves: ;Evolutions db 0 ;Learnset @@ -1593,13 +1594,13 @@ MUK_EvosMoves db 60,ACID_ARMOR db 0 -MISSINGNO_8A_EvosMoves +MissingNo8AEvosMoves: ;Evolutions db 0 ;Learnset db 0 -KINGLER_EvosMoves +KinglerEvosMoves: ;Evolutions db 0 ;Learnset @@ -1610,20 +1611,20 @@ KINGLER_EvosMoves db 49,HARDEN db 0 -CLOYSTER_EvosMoves +CloysterEvosMoves: ;Evolutions db 0 ;Learnset db 50,SPIKE_CANNON db 0 -MISSINGNO_8C_EvosMoves +MissingNo8CEvosMoves: ;Evolutions db 0 ;Learnset db 0 -ELECTRODE_EvosMoves +ElectrodeEvosMoves: ;Evolutions db 0 ;Learnset @@ -1634,13 +1635,13 @@ ELECTRODE_EvosMoves db 50,EXPLOSION db 0 -CLEFABLE_EvosMoves +ClefableEvosMoves: ;Evolutions db 0 ;Learnset db 0 -WEEZING_EvosMoves +WeezingEvosMoves: ;Evolutions db 0 ;Learnset @@ -1651,7 +1652,7 @@ WEEZING_EvosMoves db 53,EXPLOSION db 0 -PERSIAN_EvosMoves +PersianEvosMoves: ;Evolutions db 0 ;Learnset @@ -1662,7 +1663,7 @@ PERSIAN_EvosMoves db 51,SLASH db 0 -MAROWAK_EvosMoves +MarowakEvosMoves: ;Evolutions db 0 ;Learnset @@ -1673,13 +1674,13 @@ MAROWAK_EvosMoves db 55,RAGE db 0 -MISSINGNO_92_EvosMoves +MissingNo92EvosMoves: ;Evolutions db 0 ;Learnset db 0 -HAUNTER_EvosMoves +HaunterEvosMoves: ;Evolutions db EV_TRADE,1,GENGAR db 0 @@ -1688,14 +1689,14 @@ HAUNTER_EvosMoves db 38,DREAM_EATER db 0 -ABRA_EvosMoves +AbraEvosMoves: ;Evolutions db EV_LEVEL,16,KADABRA db 0 ;Learnset db 0 -ALAKAZAM_EvosMoves +AlakazamEvosMoves: ;Evolutions db 0 ;Learnset @@ -1707,7 +1708,7 @@ ALAKAZAM_EvosMoves db 42,REFLECT db 0 -PIDGEOTTO_EvosMoves +PidgeottoEvosMoves: ;Evolutions db EV_LEVEL,36,PIDGEOT db 0 @@ -1720,7 +1721,7 @@ PIDGEOTTO_EvosMoves db 49,MIRROR_MOVE db 0 -PIDGEOT_EvosMoves +PidgeotEvosMoves: ;Evolutions db 0 ;Learnset @@ -1732,13 +1733,13 @@ PIDGEOT_EvosMoves db 54,MIRROR_MOVE db 0 -STARMIE_EvosMoves +StarmieEvosMoves: ;Evolutions db 0 ;Learnset db 0 -BULBASAUR_EvosMoves +BulbasaurEvosMoves: ;Evolutions db EV_LEVEL,16,IVYSAUR db 0 @@ -1752,7 +1753,7 @@ BULBASAUR_EvosMoves db 48,SOLARBEAM db 0 -VENUSAUR_EvosMoves +VenusaurEvosMoves: ;Evolutions db 0 ;Learnset @@ -1765,7 +1766,7 @@ VENUSAUR_EvosMoves db 65,SOLARBEAM db 0 -TENTACRUEL_EvosMoves +TentacruelEvosMoves: ;Evolutions db 0 ;Learnset @@ -1779,13 +1780,13 @@ TENTACRUEL_EvosMoves db 50,HYDRO_PUMP db 0 -MISSINGNO_9C_EvosMoves +MissingNo9CEvosMoves: ;Evolutions db 0 ;Learnset db 0 -GOLDEEN_EvosMoves +GoldeenEvosMoves: ;Evolutions db EV_LEVEL,33,SEAKING db 0 @@ -1798,7 +1799,7 @@ GOLDEEN_EvosMoves db 54,AGILITY db 0 -SEAKING_EvosMoves +SeakingEvosMoves: ;Evolutions db 0 ;Learnset @@ -1810,31 +1811,31 @@ SEAKING_EvosMoves db 54,AGILITY db 0 -MISSINGNO_9F_EvosMoves +MissingNo9FEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_A0_EvosMoves +MissingNoA0EvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_A1_EvosMoves +MissingNoA1EvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_A2_EvosMoves +MissingNoA2EvosMoves: ;Evolutions db 0 ;Learnset db 0 -PONYTA_EvosMoves +PonytaEvosMoves: ;Evolutions db EV_LEVEL,40,RAPIDASH db 0 @@ -1847,7 +1848,7 @@ PONYTA_EvosMoves db 48,AGILITY db 0 -RAPIDASH_EvosMoves +RapidashEvosMoves: ;Evolutions db 0 ;Learnset @@ -1859,7 +1860,7 @@ RAPIDASH_EvosMoves db 55,AGILITY db 0 -RATTATA_EvosMoves +RattataEvosMoves: ;Evolutions db EV_LEVEL,20,RATICATE db 0 @@ -1870,7 +1871,7 @@ RATTATA_EvosMoves db 34,SUPER_FANG db 0 -RATICATE_EvosMoves +RaticateEvosMoves: ;Evolutions db 0 ;Learnset @@ -1880,7 +1881,7 @@ RATICATE_EvosMoves db 41,SUPER_FANG db 0 -NIDORINO_EvosMoves +NidorinoEvosMoves: ;Evolutions db EV_ITEM,MOON_STONE,1,NIDOKING db 0 @@ -1893,7 +1894,7 @@ NIDORINO_EvosMoves db 50,DOUBLE_KICK db 0 -NIDORINA_EvosMoves +NidorinaEvosMoves: ;Evolutions db EV_ITEM,MOON_STONE,1,NIDOQUEEN db 0 @@ -1906,7 +1907,7 @@ NIDORINA_EvosMoves db 50,DOUBLE_KICK db 0 -GEODUDE_EvosMoves +GeodudeEvosMoves: ;Evolutions db EV_LEVEL,25,GRAVELER db 0 @@ -1919,7 +1920,7 @@ GEODUDE_EvosMoves db 36,EXPLOSION db 0 -PORYGON_EvosMoves +PorygonEvosMoves: ;Evolutions db 0 ;Learnset @@ -1929,7 +1930,7 @@ PORYGON_EvosMoves db 42,TRI_ATTACK db 0 -AERODACTYL_EvosMoves +AerodactylEvosMoves: ;Evolutions db 0 ;Learnset @@ -1939,13 +1940,13 @@ AERODACTYL_EvosMoves db 54,HYPER_BEAM db 0 -MISSINGNO_AC_EvosMoves +MissingNoACEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MAGNEMITE_EvosMoves +MagnemiteEvosMoves: ;Evolutions db EV_LEVEL,30,MAGNETON db 0 @@ -1958,19 +1959,19 @@ MAGNEMITE_EvosMoves db 47,SCREECH db 0 -MISSINGNO_AE_EvosMoves +MissingNoAEEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MISSINGNO_AF_EvosMoves +MissingNoAFEvosMoves: ;Evolutions db 0 ;Learnset db 0 -CHARMANDER_EvosMoves +CharmanderEvosMoves: ;Evolutions db EV_LEVEL,16,CHARMELEON db 0 @@ -1983,7 +1984,7 @@ CHARMANDER_EvosMoves db 46,FIRE_SPIN db 0 -SQUIRTLE_EvosMoves +SquirtleEvosMoves: ;Evolutions db EV_LEVEL,16,WARTORTLE db 0 @@ -1996,7 +1997,7 @@ SQUIRTLE_EvosMoves db 42,HYDRO_PUMP db 0 -CHARMELEON_EvosMoves +CharmeleonEvosMoves: ;Evolutions db EV_LEVEL,36,CHARIZARD db 0 @@ -2009,7 +2010,7 @@ CHARMELEON_EvosMoves db 56,FIRE_SPIN db 0 -WARTORTLE_EvosMoves +WartortleEvosMoves: ;Evolutions db EV_LEVEL,36,BLASTOISE db 0 @@ -2022,7 +2023,7 @@ WARTORTLE_EvosMoves db 47,HYDRO_PUMP db 0 -CHARIZARD_EvosMoves +CharizardEvosMoves: ;Evolutions db 0 ;Learnset @@ -2034,31 +2035,31 @@ CHARIZARD_EvosMoves db 55,FIRE_SPIN db 0 -MISSINGNO_B5_EvosMoves +MissingNoB5EvosMoves: ;Evolutions db 0 ;Learnset db 0 -FOSSIL_KABUTOPS_EvosMoves +FossilKabutopsEvosMoves: ;Evolutions db 0 ;Learnset db 0 -FOSSIL_AERODACTYL_EvosMoves +FossilAerodactylEvosMoves: ;Evolutions db 0 ;Learnset db 0 -MON_GHOST_EvosMoves +MonGhostEvosMoves: ;Evolutions db 0 ;Learnset db 0 -ODDISH_EvosMoves +OddishEvosMoves: ;Evolutions db EV_LEVEL,21,GLOOM db 0 @@ -2071,7 +2072,7 @@ ODDISH_EvosMoves db 46,SOLARBEAM db 0 -GLOOM_EvosMoves +GloomEvosMoves: ;Evolutions db EV_ITEM,LEAF_STONE,1,VILEPLUME db 0 @@ -2084,7 +2085,7 @@ GLOOM_EvosMoves db 52,SOLARBEAM db 0 -VILEPLUME_EvosMoves +VileplumeEvosMoves: ;Evolutions db 0 ;Learnset @@ -2093,7 +2094,7 @@ VILEPLUME_EvosMoves db 19,SLEEP_POWDER db 0 -BELLSPROUT_EvosMoves +BellsproutEvosMoves: ;Evolutions db EV_LEVEL,21,WEEPINBELL db 0 @@ -2107,7 +2108,7 @@ BELLSPROUT_EvosMoves db 42,SLAM db 0 -WEEPINBELL_EvosMoves +WeepinbellEvosMoves: ;Evolutions db EV_ITEM,LEAF_STONE,1,VICTREEBEL db 0 @@ -2121,7 +2122,7 @@ WEEPINBELL_EvosMoves db 49,SLAM db 0 -VICTREEBEL_EvosMoves +VictreebelEvosMoves: ;Evolutions db 0 ;Learnset diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index cf185fa8..9b07ebb7 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -150,7 +150,7 @@ RedrawPartyMenu_: ld l, a ld de, wcd6d ld a, BANK(EvosMovesPointerTable) - ld bc, EEVEE_EvosEnd - EEVEE_EvosMoves + ld bc, EeveeEvosEnd - EeveeEvosMoves call FarCopyData ld hl, wcd6d ld de, .notAbleToEvolveText From c80eddf988523b81c2e26b57a648ee6069c8955c Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 21 Mar 2018 18:55:09 -0400 Subject: [PATCH 03/23] add wEvosMoves instead of using eevee --- engine/menu/party_menu.asm | 10 +++++----- wram.asm | 9 +++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index 9b07ebb7..8323d0eb 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -140,19 +140,19 @@ RedrawPartyMenu_: rl b ld c, a add hl, bc - ld de, wcd6d + ld de, wEvosMoves ld a, BANK(EvosMovesPointerTable) ld bc, 2 call FarCopyData - ld hl, wcd6d + ld hl, wEvosMoves ld a, [hli] ld h, [hl] ld l, a - ld de, wcd6d + ld de, wEvosMoves ld a, BANK(EvosMovesPointerTable) - ld bc, EeveeEvosEnd - EeveeEvosMoves + ld bc, wEvosMoves.end - wEvosMoves call FarCopyData - ld hl, wcd6d + ld hl, wEvosMoves ld de, .notAbleToEvolveText ; loop through the pokemon's evolution entries .checkEvolutionsLoop diff --git a/wram.asm b/wram.asm index ccd6f06e..824b13d4 100755 --- a/wram.asm +++ b/wram.asm @@ -1237,6 +1237,8 @@ wNumMovesMinusOne:: ; cd6c ; FormatMovesString stores the number of moves minus one here ds 1 +UNION + wcd6d:: ds 4 ; buffer for various data wStatusScreenCurrentPP:: ; cd71 @@ -1249,6 +1251,13 @@ wNormalMaxPPList:: ; cd78 ; list of normal max PP (without PP up) values ds 9 +NEXTU + +wEvosMoves:: ds 13 +.end:: + +ENDU + wSerialOtherGameboyRandomNumberListBlock:: ; cd81 ; buffer for transferring the random number list generated by the other gameboy From bd35b37262fd80b355f6b1d942e5e936871be1ec Mon Sep 17 00:00:00 2001 From: yenatch Date: Thu, 22 Mar 2018 23:09:49 -0400 Subject: [PATCH 04/23] use constants for wEvosMoves size --- constants/evolution_constants.asm | 5 +++++ data/evos_moves.asm | 4 +++- wram.asm | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/constants/evolution_constants.asm b/constants/evolution_constants.asm index 2e3f3613..86c466d8 100755 --- a/constants/evolution_constants.asm +++ b/constants/evolution_constants.asm @@ -1,4 +1,9 @@ +; See data/evos_moves.asm + ; Evolution types EV_LEVEL EQU 1 EV_ITEM EQU 2 EV_TRADE EQU 3 + +MAX_EVOLUTIONS EQU 3 +EVOLUTION_SIZE EQU 4 diff --git a/data/evos_moves.asm b/data/evos_moves.asm index 4c14e4bb..c8e4b6f4 100755 --- a/data/evos_moves.asm +++ b/data/evos_moves.asm @@ -1,3 +1,6 @@ +; See constants/evolution_constants.asm +; The max number of evolutions per monster is MAX_EVOLUTIONS + EvosMovesPointerTable: dw RhydonEvosMoves dw KangaskhanEvosMoves @@ -1243,7 +1246,6 @@ EeveeEvosMoves: db EV_ITEM,THUNDER_STONE,1,JOLTEON db EV_ITEM,WATER_STONE,1,VAPOREON db 0 -EeveeEvosEnd: ;Learnset db 27,QUICK_ATTACK db 31,TAIL_WHIP diff --git a/wram.asm b/wram.asm index 824b13d4..baab1cf7 100755 --- a/wram.asm +++ b/wram.asm @@ -1253,7 +1253,7 @@ wNormalMaxPPList:: ; cd78 NEXTU -wEvosMoves:: ds 13 +wEvosMoves:: ds MAX_EVOLUTIONS * EVOLUTION_SIZE + 1 .end:: ENDU From 5c4397c899f5b80d5b142ec68603bef31cf92c75 Mon Sep 17 00:00:00 2001 From: yenatch Date: Thu, 22 Mar 2018 23:20:55 -0400 Subject: [PATCH 05/23] spaces in EvosMoves --- data/evos_moves.asm | 2360 +++++++++++++++++++++---------------------- 1 file changed, 1180 insertions(+), 1180 deletions(-) diff --git a/data/evos_moves.asm b/data/evos_moves.asm index c8e4b6f4..26f09b87 100755 --- a/data/evos_moves.asm +++ b/data/evos_moves.asm @@ -194,1941 +194,1941 @@ EvosMovesPointerTable: dw VictreebelEvosMoves RhydonEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 30,STOMP - db 35,TAIL_WHIP - db 40,FURY_ATTACK - db 48,HORN_DRILL - db 55,LEER - db 64,TAKE_DOWN +; Learnset + db 30, STOMP + db 35, TAIL_WHIP + db 40, FURY_ATTACK + db 48, HORN_DRILL + db 55, LEER + db 64, TAKE_DOWN db 0 KangaskhanEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 26,BITE - db 31,TAIL_WHIP - db 36,MEGA_PUNCH - db 41,LEER - db 46,DIZZY_PUNCH +; Learnset + db 26, BITE + db 31, TAIL_WHIP + db 36, MEGA_PUNCH + db 41, LEER + db 46, DIZZY_PUNCH db 0 NidoranMEvosMoves: -;Evolutions - db EV_LEVEL,16,NIDORINO +; Evolutions + db EV_LEVEL, 16, NIDORINO db 0 -;Learnset - db 8,HORN_ATTACK - db 14,POISON_STING - db 21,FOCUS_ENERGY - db 29,FURY_ATTACK - db 36,HORN_DRILL - db 43,DOUBLE_KICK +; Learnset + db 8, HORN_ATTACK + db 14, POISON_STING + db 21, FOCUS_ENERGY + db 29, FURY_ATTACK + db 36, HORN_DRILL + db 43, DOUBLE_KICK db 0 ClefairyEvosMoves: -;Evolutions - db EV_ITEM,MOON_STONE,1,CLEFABLE +; Evolutions + db EV_ITEM, MOON_STONE, 1, CLEFABLE db 0 -;Learnset - db 13,SING - db 18,DOUBLESLAP - db 24,MINIMIZE - db 31,METRONOME - db 39,DEFENSE_CURL - db 48,LIGHT_SCREEN +; Learnset + db 13, SING + db 18, DOUBLESLAP + db 24, MINIMIZE + db 31, METRONOME + db 39, DEFENSE_CURL + db 48, LIGHT_SCREEN db 0 SpearowEvosMoves: -;Evolutions - db EV_LEVEL,20,FEAROW +; Evolutions + db EV_LEVEL, 20, FEAROW db 0 -;Learnset - db 9,LEER - db 15,FURY_ATTACK - db 22,MIRROR_MOVE - db 29,DRILL_PECK - db 36,AGILITY +; Learnset + db 9, LEER + db 15, FURY_ATTACK + db 22, MIRROR_MOVE + db 29, DRILL_PECK + db 36, AGILITY db 0 VoltorbEvosMoves: -;Evolutions - db EV_LEVEL,30,ELECTRODE +; Evolutions + db EV_LEVEL, 30, ELECTRODE db 0 -;Learnset - db 17,SONICBOOM - db 22,SELFDESTRUCT - db 29,LIGHT_SCREEN - db 36,SWIFT - db 43,EXPLOSION +; Learnset + db 17, SONICBOOM + db 22, SELFDESTRUCT + db 29, LIGHT_SCREEN + db 36, SWIFT + db 43, EXPLOSION db 0 NidokingEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 8,HORN_ATTACK - db 14,POISON_STING - db 23,THRASH +; Learnset + db 8, HORN_ATTACK + db 14, POISON_STING + db 23, THRASH db 0 SlowbroEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 18,DISABLE - db 22,HEADBUTT - db 27,GROWL - db 33,WATER_GUN - db 37,WITHDRAW - db 44,AMNESIA - db 55,PSYCHIC_M +; Learnset + db 18, DISABLE + db 22, HEADBUTT + db 27, GROWL + db 33, WATER_GUN + db 37, WITHDRAW + db 44, AMNESIA + db 55, PSYCHIC_M db 0 IvysaurEvosMoves: -;Evolutions - db EV_LEVEL,32,VENUSAUR +; Evolutions + db EV_LEVEL, 32, VENUSAUR db 0 -;Learnset - db 7,LEECH_SEED - db 13,VINE_WHIP - db 22,POISONPOWDER - db 30,RAZOR_LEAF - db 38,GROWTH - db 46,SLEEP_POWDER - db 54,SOLARBEAM +; Learnset + db 7, LEECH_SEED + db 13, VINE_WHIP + db 22, POISONPOWDER + db 30, RAZOR_LEAF + db 38, GROWTH + db 46, SLEEP_POWDER + db 54, SOLARBEAM db 0 ExeggutorEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 28,STOMP +; Learnset + db 28, STOMP db 0 LickitungEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 7,STOMP - db 15,DISABLE - db 23,DEFENSE_CURL - db 31,SLAM - db 39,SCREECH +; Learnset + db 7, STOMP + db 15, DISABLE + db 23, DEFENSE_CURL + db 31, SLAM + db 39, SCREECH db 0 ExeggcuteEvosMoves: -;Evolutions - db EV_ITEM,LEAF_STONE,1,EXEGGUTOR +; Evolutions + db EV_ITEM, LEAF_STONE, 1, EXEGGUTOR db 0 -;Learnset - db 25,REFLECT - db 28,LEECH_SEED - db 32,STUN_SPORE - db 37,POISONPOWDER - db 42,SOLARBEAM - db 48,SLEEP_POWDER +; Learnset + db 25, REFLECT + db 28, LEECH_SEED + db 32, STUN_SPORE + db 37, POISONPOWDER + db 42, SOLARBEAM + db 48, SLEEP_POWDER db 0 GrimerEvosMoves: -;Evolutions - db EV_LEVEL,38,MUK +; Evolutions + db EV_LEVEL, 38, MUK db 0 -;Learnset - db 30,POISON_GAS - db 33,MINIMIZE - db 37,SLUDGE - db 42,HARDEN - db 48,SCREECH - db 55,ACID_ARMOR +; Learnset + db 30, POISON_GAS + db 33, MINIMIZE + db 37, SLUDGE + db 42, HARDEN + db 48, SCREECH + db 55, ACID_ARMOR db 0 GengarEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 29,HYPNOSIS - db 38,DREAM_EATER +; Learnset + db 29, HYPNOSIS + db 38, DREAM_EATER db 0 NidoranFEvosMoves: -;Evolutions - db EV_LEVEL,16,NIDORINA +; Evolutions + db EV_LEVEL, 16, NIDORINA db 0 -;Learnset - db 8,SCRATCH - db 14,POISON_STING - db 21,TAIL_WHIP - db 29,BITE - db 36,FURY_SWIPES - db 43,DOUBLE_KICK +; Learnset + db 8, SCRATCH + db 14, POISON_STING + db 21, TAIL_WHIP + db 29, BITE + db 36, FURY_SWIPES + db 43, DOUBLE_KICK db 0 NidoqueenEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 8,SCRATCH - db 14,POISON_STING - db 23,BODY_SLAM +; Learnset + db 8, SCRATCH + db 14, POISON_STING + db 23, BODY_SLAM db 0 CuboneEvosMoves: -;Evolutions - db EV_LEVEL,28,MAROWAK +; Evolutions + db EV_LEVEL, 28, MAROWAK db 0 -;Learnset - db 25,LEER - db 31,FOCUS_ENERGY - db 38,THRASH - db 43,BONEMERANG - db 46,RAGE +; Learnset + db 25, LEER + db 31, FOCUS_ENERGY + db 38, THRASH + db 43, BONEMERANG + db 46, RAGE db 0 RhyhornEvosMoves: -;Evolutions - db EV_LEVEL,42,RHYDON +; Evolutions + db EV_LEVEL, 42, RHYDON db 0 -;Learnset - db 30,STOMP - db 35,TAIL_WHIP - db 40,FURY_ATTACK - db 45,HORN_DRILL - db 50,LEER - db 55,TAKE_DOWN +; Learnset + db 30, STOMP + db 35, TAIL_WHIP + db 40, FURY_ATTACK + db 45, HORN_DRILL + db 50, LEER + db 55, TAKE_DOWN db 0 LaprasEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 16,SING - db 20,MIST - db 25,BODY_SLAM - db 31,CONFUSE_RAY - db 38,ICE_BEAM - db 46,HYDRO_PUMP +; Learnset + db 16, SING + db 20, MIST + db 25, BODY_SLAM + db 31, CONFUSE_RAY + db 38, ICE_BEAM + db 46, HYDRO_PUMP db 0 ArcanineEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MewEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 10,TRANSFORM - db 20,MEGA_PUNCH - db 30,METRONOME - db 40,PSYCHIC_M +; Learnset + db 10, TRANSFORM + db 20, MEGA_PUNCH + db 30, METRONOME + db 40, PSYCHIC_M db 0 GyaradosEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 20,BITE - db 25,DRAGON_RAGE - db 32,LEER - db 41,HYDRO_PUMP - db 52,HYPER_BEAM +; Learnset + db 20, BITE + db 25, DRAGON_RAGE + db 32, LEER + db 41, HYDRO_PUMP + db 52, HYPER_BEAM db 0 ShellderEvosMoves: -;Evolutions - db EV_ITEM,WATER_STONE,1,CLOYSTER +; Evolutions + db EV_ITEM, WATER_STONE, 1, CLOYSTER db 0 -;Learnset - db 18,SUPERSONIC - db 23,CLAMP - db 30,AURORA_BEAM - db 39,LEER - db 50,ICE_BEAM +; Learnset + db 18, SUPERSONIC + db 23, CLAMP + db 30, AURORA_BEAM + db 39, LEER + db 50, ICE_BEAM db 0 TentacoolEvosMoves: -;Evolutions - db EV_LEVEL,30,TENTACRUEL +; Evolutions + db EV_LEVEL, 30, TENTACRUEL db 0 -;Learnset - db 7,SUPERSONIC - db 13,WRAP - db 18,POISON_STING - db 22,WATER_GUN - db 27,CONSTRICT - db 33,BARRIER - db 40,SCREECH - db 48,HYDRO_PUMP +; Learnset + db 7, SUPERSONIC + db 13, WRAP + db 18, POISON_STING + db 22, WATER_GUN + db 27, CONSTRICT + db 33, BARRIER + db 40, SCREECH + db 48, HYDRO_PUMP db 0 GastlyEvosMoves: -;Evolutions - db EV_LEVEL,25,HAUNTER +; Evolutions + db EV_LEVEL, 25, HAUNTER db 0 -;Learnset - db 27,HYPNOSIS - db 35,DREAM_EATER +; Learnset + db 27, HYPNOSIS + db 35, DREAM_EATER db 0 ScytherEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 17,LEER - db 20,FOCUS_ENERGY - db 24,DOUBLE_TEAM - db 29,SLASH - db 35,SWORDS_DANCE - db 42,AGILITY +; Learnset + db 17, LEER + db 20, FOCUS_ENERGY + db 24, DOUBLE_TEAM + db 29, SLASH + db 35, SWORDS_DANCE + db 42, AGILITY db 0 StaryuEvosMoves: -;Evolutions - db EV_ITEM,WATER_STONE,1,STARMIE +; Evolutions + db EV_ITEM, WATER_STONE, 1, STARMIE db 0 -;Learnset - db 17,WATER_GUN - db 22,HARDEN - db 27,RECOVER - db 32,SWIFT - db 37,MINIMIZE - db 42,LIGHT_SCREEN - db 47,HYDRO_PUMP +; Learnset + db 17, WATER_GUN + db 22, HARDEN + db 27, RECOVER + db 32, SWIFT + db 37, MINIMIZE + db 42, LIGHT_SCREEN + db 47, HYDRO_PUMP db 0 BlastoiseEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 8,BUBBLE - db 15,WATER_GUN - db 24,BITE - db 31,WITHDRAW - db 42,SKULL_BASH - db 52,HYDRO_PUMP +; Learnset + db 8, BUBBLE + db 15, WATER_GUN + db 24, BITE + db 31, WITHDRAW + db 42, SKULL_BASH + db 52, HYDRO_PUMP db 0 PinsirEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 25,SEISMIC_TOSS - db 30,GUILLOTINE - db 36,FOCUS_ENERGY - db 43,HARDEN - db 49,SLASH - db 54,SWORDS_DANCE +; Learnset + db 25, SEISMIC_TOSS + db 30, GUILLOTINE + db 36, FOCUS_ENERGY + db 43, HARDEN + db 49, SLASH + db 54, SWORDS_DANCE db 0 TangelaEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 29,ABSORB - db 32,POISONPOWDER - db 36,STUN_SPORE - db 39,SLEEP_POWDER - db 45,SLAM - db 49,GROWTH +; Learnset + db 29, ABSORB + db 32, POISONPOWDER + db 36, STUN_SPORE + db 39, SLEEP_POWDER + db 45, SLAM + db 49, GROWTH db 0 MissingNo1FEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo20EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 GrowlitheEvosMoves: -;Evolutions - db EV_ITEM,FIRE_STONE,1,ARCANINE +; Evolutions + db EV_ITEM, FIRE_STONE, 1, ARCANINE db 0 -;Learnset - db 18,EMBER - db 23,LEER - db 30,TAKE_DOWN - db 39,AGILITY - db 50,FLAMETHROWER +; Learnset + db 18, EMBER + db 23, LEER + db 30, TAKE_DOWN + db 39, AGILITY + db 50, FLAMETHROWER db 0 OnixEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 15,BIND - db 19,ROCK_THROW - db 25,RAGE - db 33,SLAM - db 43,HARDEN +; Learnset + db 15, BIND + db 19, ROCK_THROW + db 25, RAGE + db 33, SLAM + db 43, HARDEN db 0 FearowEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 9,LEER - db 15,FURY_ATTACK - db 25,MIRROR_MOVE - db 34,DRILL_PECK - db 43,AGILITY +; Learnset + db 9, LEER + db 15, FURY_ATTACK + db 25, MIRROR_MOVE + db 34, DRILL_PECK + db 43, AGILITY db 0 PidgeyEvosMoves: -;Evolutions - db EV_LEVEL,18,PIDGEOTTO +; Evolutions + db EV_LEVEL, 18, PIDGEOTTO db 0 -;Learnset - db 5,SAND_ATTACK - db 12,QUICK_ATTACK - db 19,WHIRLWIND - db 28,WING_ATTACK - db 36,AGILITY - db 44,MIRROR_MOVE +; Learnset + db 5, SAND_ATTACK + db 12, QUICK_ATTACK + db 19, WHIRLWIND + db 28, WING_ATTACK + db 36, AGILITY + db 44, MIRROR_MOVE db 0 SlowpokeEvosMoves: -;Evolutions - db EV_LEVEL,37,SLOWBRO +; Evolutions + db EV_LEVEL, 37, SLOWBRO db 0 -;Learnset - db 18,DISABLE - db 22,HEADBUTT - db 27,GROWL - db 33,WATER_GUN - db 40,AMNESIA - db 48,PSYCHIC_M +; Learnset + db 18, DISABLE + db 22, HEADBUTT + db 27, GROWL + db 33, WATER_GUN + db 40, AMNESIA + db 48, PSYCHIC_M db 0 KadabraEvosMoves: -;Evolutions - db EV_TRADE,1,ALAKAZAM +; Evolutions + db EV_TRADE, 1, ALAKAZAM db 0 -;Learnset - db 16,CONFUSION - db 20,DISABLE - db 27,PSYBEAM - db 31,RECOVER - db 38,PSYCHIC_M - db 42,REFLECT +; Learnset + db 16, CONFUSION + db 20, DISABLE + db 27, PSYBEAM + db 31, RECOVER + db 38, PSYCHIC_M + db 42, REFLECT db 0 GravelerEvosMoves: -;Evolutions - db EV_TRADE,1,GOLEM +; Evolutions + db EV_TRADE, 1, GOLEM db 0 -;Learnset - db 11,DEFENSE_CURL - db 16,ROCK_THROW - db 21,SELFDESTRUCT - db 29,HARDEN - db 36,EARTHQUAKE - db 43,EXPLOSION +; Learnset + db 11, DEFENSE_CURL + db 16, ROCK_THROW + db 21, SELFDESTRUCT + db 29, HARDEN + db 36, EARTHQUAKE + db 43, EXPLOSION db 0 ChanseyEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 24,SING - db 30,GROWL - db 38,MINIMIZE - db 44,DEFENSE_CURL - db 48,LIGHT_SCREEN - db 54,DOUBLE_EDGE +; Learnset + db 24, SING + db 30, GROWL + db 38, MINIMIZE + db 44, DEFENSE_CURL + db 48, LIGHT_SCREEN + db 54, DOUBLE_EDGE db 0 MachokeEvosMoves: -;Evolutions - db EV_TRADE,1,MACHAMP +; Evolutions + db EV_TRADE, 1, MACHAMP db 0 -;Learnset - db 20,LOW_KICK - db 25,LEER - db 36,FOCUS_ENERGY - db 44,SEISMIC_TOSS - db 52,SUBMISSION +; Learnset + db 20, LOW_KICK + db 25, LEER + db 36, FOCUS_ENERGY + db 44, SEISMIC_TOSS + db 52, SUBMISSION db 0 MrMimeEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 15,CONFUSION - db 23,LIGHT_SCREEN - db 31,DOUBLESLAP - db 39,MEDITATE - db 47,SUBSTITUTE +; Learnset + db 15, CONFUSION + db 23, LIGHT_SCREEN + db 31, DOUBLESLAP + db 39, MEDITATE + db 47, SUBSTITUTE db 0 HitmonleeEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 33,ROLLING_KICK - db 38,JUMP_KICK - db 43,FOCUS_ENERGY - db 48,HI_JUMP_KICK - db 53,MEGA_KICK +; Learnset + db 33, ROLLING_KICK + db 38, JUMP_KICK + db 43, FOCUS_ENERGY + db 48, HI_JUMP_KICK + db 53, MEGA_KICK db 0 HitmonchanEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 33,FIRE_PUNCH - db 38,ICE_PUNCH - db 43,THUNDERPUNCH - db 48,MEGA_PUNCH - db 53,COUNTER +; Learnset + db 33, FIRE_PUNCH + db 38, ICE_PUNCH + db 43, THUNDERPUNCH + db 48, MEGA_PUNCH + db 53, COUNTER db 0 ArbokEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 10,POISON_STING - db 17,BITE - db 27,GLARE - db 36,SCREECH - db 47,ACID +; Learnset + db 10, POISON_STING + db 17, BITE + db 27, GLARE + db 36, SCREECH + db 47, ACID db 0 ParasectEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 13,STUN_SPORE - db 20,LEECH_LIFE - db 30,SPORE - db 39,SLASH - db 48,GROWTH +; Learnset + db 13, STUN_SPORE + db 20, LEECH_LIFE + db 30, SPORE + db 39, SLASH + db 48, GROWTH db 0 PsyduckEvosMoves: -;Evolutions - db EV_LEVEL,33,GOLDUCK +; Evolutions + db EV_LEVEL, 33, GOLDUCK db 0 -;Learnset - db 28,TAIL_WHIP - db 31,DISABLE - db 36,CONFUSION - db 43,FURY_SWIPES - db 52,HYDRO_PUMP +; Learnset + db 28, TAIL_WHIP + db 31, DISABLE + db 36, CONFUSION + db 43, FURY_SWIPES + db 52, HYDRO_PUMP db 0 DrowzeeEvosMoves: -;Evolutions - db EV_LEVEL,26,HYPNO +; Evolutions + db EV_LEVEL, 26, HYPNO db 0 -;Learnset - db 12,DISABLE - db 17,CONFUSION - db 24,HEADBUTT - db 29,POISON_GAS - db 32,PSYCHIC_M - db 37,MEDITATE +; Learnset + db 12, DISABLE + db 17, CONFUSION + db 24, HEADBUTT + db 29, POISON_GAS + db 32, PSYCHIC_M + db 37, MEDITATE db 0 GolemEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 11,DEFENSE_CURL - db 16,ROCK_THROW - db 21,SELFDESTRUCT - db 29,HARDEN - db 36,EARTHQUAKE - db 43,EXPLOSION +; Learnset + db 11, DEFENSE_CURL + db 16, ROCK_THROW + db 21, SELFDESTRUCT + db 29, HARDEN + db 36, EARTHQUAKE + db 43, EXPLOSION db 0 MissingNo32EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MagmarEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 36,LEER - db 39,CONFUSE_RAY - db 43,FIRE_PUNCH - db 48,SMOKESCREEN - db 52,SMOG - db 55,FLAMETHROWER +; Learnset + db 36, LEER + db 39, CONFUSE_RAY + db 43, FIRE_PUNCH + db 48, SMOKESCREEN + db 52, SMOG + db 55, FLAMETHROWER db 0 MissingNo34EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 ElectabuzzEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 34,THUNDERSHOCK - db 37,SCREECH - db 42,THUNDERPUNCH - db 49,LIGHT_SCREEN - db 54,THUNDER +; Learnset + db 34, THUNDERSHOCK + db 37, SCREECH + db 42, THUNDERPUNCH + db 49, LIGHT_SCREEN + db 54, THUNDER db 0 MagnetonEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 21,SONICBOOM - db 25,THUNDERSHOCK - db 29,SUPERSONIC - db 38,THUNDER_WAVE - db 46,SWIFT - db 54,SCREECH +; Learnset + db 21, SONICBOOM + db 25, THUNDERSHOCK + db 29, SUPERSONIC + db 38, THUNDER_WAVE + db 46, SWIFT + db 54, SCREECH db 0 KoffingEvosMoves: -;Evolutions - db EV_LEVEL,35,WEEZING +; Evolutions + db EV_LEVEL, 35, WEEZING db 0 -;Learnset - db 32,SLUDGE - db 37,SMOKESCREEN - db 40,SELFDESTRUCT - db 45,HAZE - db 48,EXPLOSION +; Learnset + db 32, SLUDGE + db 37, SMOKESCREEN + db 40, SELFDESTRUCT + db 45, HAZE + db 48, EXPLOSION db 0 MissingNo38EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MankeyEvosMoves: -;Evolutions - db EV_LEVEL,28,PRIMEAPE +; Evolutions + db EV_LEVEL, 28, PRIMEAPE db 0 -;Learnset - db 15,KARATE_CHOP - db 21,FURY_SWIPES - db 27,FOCUS_ENERGY - db 33,SEISMIC_TOSS - db 39,THRASH +; Learnset + db 15, KARATE_CHOP + db 21, FURY_SWIPES + db 27, FOCUS_ENERGY + db 33, SEISMIC_TOSS + db 39, THRASH db 0 SeelEvosMoves: -;Evolutions - db EV_LEVEL,34,DEWGONG +; Evolutions + db EV_LEVEL, 34, DEWGONG db 0 -;Learnset - db 30,GROWL - db 35,AURORA_BEAM - db 40,REST - db 45,TAKE_DOWN - db 50,ICE_BEAM +; Learnset + db 30, GROWL + db 35, AURORA_BEAM + db 40, REST + db 45, TAKE_DOWN + db 50, ICE_BEAM db 0 DiglettEvosMoves: -;Evolutions - db EV_LEVEL,26,DUGTRIO +; Evolutions + db EV_LEVEL, 26, DUGTRIO db 0 -;Learnset - db 15,GROWL - db 19,DIG - db 24,SAND_ATTACK - db 31,SLASH - db 40,EARTHQUAKE +; Learnset + db 15, GROWL + db 19, DIG + db 24, SAND_ATTACK + db 31, SLASH + db 40, EARTHQUAKE db 0 TaurosEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 21,STOMP - db 28,TAIL_WHIP - db 35,LEER - db 44,RAGE - db 51,TAKE_DOWN +; Learnset + db 21, STOMP + db 28, TAIL_WHIP + db 35, LEER + db 44, RAGE + db 51, TAKE_DOWN db 0 MissingNo3DEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo3EEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo3FEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 FarfetchdEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 7,LEER - db 15,FURY_ATTACK - db 23,SWORDS_DANCE - db 31,AGILITY - db 39,SLASH +; Learnset + db 7, LEER + db 15, FURY_ATTACK + db 23, SWORDS_DANCE + db 31, AGILITY + db 39, SLASH db 0 VenonatEvosMoves: -;Evolutions - db EV_LEVEL,31,VENOMOTH +; Evolutions + db EV_LEVEL, 31, VENOMOTH db 0 -;Learnset - db 24,POISONPOWDER - db 27,LEECH_LIFE - db 30,STUN_SPORE - db 35,PSYBEAM - db 38,SLEEP_POWDER - db 43,PSYCHIC_M +; Learnset + db 24, POISONPOWDER + db 27, LEECH_LIFE + db 30, STUN_SPORE + db 35, PSYBEAM + db 38, SLEEP_POWDER + db 43, PSYCHIC_M db 0 DragoniteEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 10,THUNDER_WAVE - db 20,AGILITY - db 35,SLAM - db 45,DRAGON_RAGE - db 60,HYPER_BEAM +; Learnset + db 10, THUNDER_WAVE + db 20, AGILITY + db 35, SLAM + db 45, DRAGON_RAGE + db 60, HYPER_BEAM db 0 MissingNo43EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo44EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo45EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 DoduoEvosMoves: -;Evolutions - db EV_LEVEL,31,DODRIO +; Evolutions + db EV_LEVEL, 31, DODRIO db 0 -;Learnset - db 20,GROWL - db 24,FURY_ATTACK - db 30,DRILL_PECK - db 36,RAGE - db 40,TRI_ATTACK - db 44,AGILITY +; Learnset + db 20, GROWL + db 24, FURY_ATTACK + db 30, DRILL_PECK + db 36, RAGE + db 40, TRI_ATTACK + db 44, AGILITY db 0 PoliwagEvosMoves: -;Evolutions - db EV_LEVEL,25,POLIWHIRL +; Evolutions + db EV_LEVEL, 25, POLIWHIRL db 0 -;Learnset - db 16,HYPNOSIS - db 19,WATER_GUN - db 25,DOUBLESLAP - db 31,BODY_SLAM - db 38,AMNESIA - db 45,HYDRO_PUMP +; Learnset + db 16, HYPNOSIS + db 19, WATER_GUN + db 25, DOUBLESLAP + db 31, BODY_SLAM + db 38, AMNESIA + db 45, HYDRO_PUMP db 0 JynxEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 18,LICK - db 23,DOUBLESLAP - db 31,ICE_PUNCH - db 39,BODY_SLAM - db 47,THRASH - db 58,BLIZZARD +; Learnset + db 18, LICK + db 23, DOUBLESLAP + db 31, ICE_PUNCH + db 39, BODY_SLAM + db 47, THRASH + db 58, BLIZZARD db 0 MoltresEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 51,LEER - db 55,AGILITY - db 60,SKY_ATTACK +; Learnset + db 51, LEER + db 55, AGILITY + db 60, SKY_ATTACK db 0 ArticunoEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 51,BLIZZARD - db 55,AGILITY - db 60,MIST +; Learnset + db 51, BLIZZARD + db 55, AGILITY + db 60, MIST db 0 ZapdosEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 51,THUNDER - db 55,AGILITY - db 60,LIGHT_SCREEN +; Learnset + db 51, THUNDER + db 55, AGILITY + db 60, LIGHT_SCREEN db 0 DittoEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MeowthEvosMoves: -;Evolutions - db EV_LEVEL,28,PERSIAN +; Evolutions + db EV_LEVEL, 28, PERSIAN db 0 -;Learnset - db 12,BITE - db 17,PAY_DAY - db 24,SCREECH - db 33,FURY_SWIPES - db 44,SLASH +; Learnset + db 12, BITE + db 17, PAY_DAY + db 24, SCREECH + db 33, FURY_SWIPES + db 44, SLASH db 0 KrabbyEvosMoves: -;Evolutions - db EV_LEVEL,28,KINGLER +; Evolutions + db EV_LEVEL, 28, KINGLER db 0 -;Learnset - db 20,VICEGRIP - db 25,GUILLOTINE - db 30,STOMP - db 35,CRABHAMMER - db 40,HARDEN +; Learnset + db 20, VICEGRIP + db 25, GUILLOTINE + db 30, STOMP + db 35, CRABHAMMER + db 40, HARDEN db 0 MissingNo4FEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo50EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo51EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 VulpixEvosMoves: -;Evolutions - db EV_ITEM,FIRE_STONE,1,NINETALES +; Evolutions + db EV_ITEM, FIRE_STONE, 1, NINETALES db 0 -;Learnset - db 16,QUICK_ATTACK - db 21,ROAR - db 28,CONFUSE_RAY - db 35,FLAMETHROWER - db 42,FIRE_SPIN +; Learnset + db 16, QUICK_ATTACK + db 21, ROAR + db 28, CONFUSE_RAY + db 35, FLAMETHROWER + db 42, FIRE_SPIN db 0 NinetalesEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 PikachuEvosMoves: -;Evolutions - db EV_ITEM,THUNDER_STONE,1,RAICHU +; Evolutions + db EV_ITEM, THUNDER_STONE, 1, RAICHU db 0 -;Learnset - db 9,THUNDER_WAVE - db 16,QUICK_ATTACK - db 26,SWIFT - db 33,AGILITY - db 43,THUNDER +; Learnset + db 9, THUNDER_WAVE + db 16, QUICK_ATTACK + db 26, SWIFT + db 33, AGILITY + db 43, THUNDER db 0 RaichuEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo56EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo57EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 DratiniEvosMoves: -;Evolutions - db EV_LEVEL,30,DRAGONAIR +; Evolutions + db EV_LEVEL, 30, DRAGONAIR db 0 -;Learnset - db 10,THUNDER_WAVE - db 20,AGILITY - db 30,SLAM - db 40,DRAGON_RAGE - db 50,HYPER_BEAM +; Learnset + db 10, THUNDER_WAVE + db 20, AGILITY + db 30, SLAM + db 40, DRAGON_RAGE + db 50, HYPER_BEAM db 0 DragonairEvosMoves: -;Evolutions - db EV_LEVEL,55,DRAGONITE +; Evolutions + db EV_LEVEL, 55, DRAGONITE db 0 -;Learnset - db 10,THUNDER_WAVE - db 20,AGILITY - db 35,SLAM - db 45,DRAGON_RAGE - db 55,HYPER_BEAM +; Learnset + db 10, THUNDER_WAVE + db 20, AGILITY + db 35, SLAM + db 45, DRAGON_RAGE + db 55, HYPER_BEAM db 0 KabutoEvosMoves: -;Evolutions - db EV_LEVEL,40,KABUTOPS +; Evolutions + db EV_LEVEL, 40, KABUTOPS db 0 -;Learnset - db 34,ABSORB - db 39,SLASH - db 44,LEER - db 49,HYDRO_PUMP +; Learnset + db 34, ABSORB + db 39, SLASH + db 44, LEER + db 49, HYDRO_PUMP db 0 KabutopsEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 34,ABSORB - db 39,SLASH - db 46,LEER - db 53,HYDRO_PUMP +; Learnset + db 34, ABSORB + db 39, SLASH + db 46, LEER + db 53, HYDRO_PUMP db 0 HorseaEvosMoves: -;Evolutions - db EV_LEVEL,32,SEADRA +; Evolutions + db EV_LEVEL, 32, SEADRA db 0 -;Learnset - db 19,SMOKESCREEN - db 24,LEER - db 30,WATER_GUN - db 37,AGILITY - db 45,HYDRO_PUMP +; Learnset + db 19, SMOKESCREEN + db 24, LEER + db 30, WATER_GUN + db 37, AGILITY + db 45, HYDRO_PUMP db 0 SeadraEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 19,SMOKESCREEN - db 24,LEER - db 30,WATER_GUN - db 41,AGILITY - db 52,HYDRO_PUMP +; Learnset + db 19, SMOKESCREEN + db 24, LEER + db 30, WATER_GUN + db 41, AGILITY + db 52, HYDRO_PUMP db 0 MissingNo5EEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo5FEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 SandshrewEvosMoves: -;Evolutions - db EV_LEVEL,22,SANDSLASH +; Evolutions + db EV_LEVEL, 22, SANDSLASH db 0 -;Learnset - db 10,SAND_ATTACK - db 17,SLASH - db 24,POISON_STING - db 31,SWIFT - db 38,FURY_SWIPES +; Learnset + db 10, SAND_ATTACK + db 17, SLASH + db 24, POISON_STING + db 31, SWIFT + db 38, FURY_SWIPES db 0 SandslashEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 10,SAND_ATTACK - db 17,SLASH - db 27,POISON_STING - db 36,SWIFT - db 47,FURY_SWIPES +; Learnset + db 10, SAND_ATTACK + db 17, SLASH + db 27, POISON_STING + db 36, SWIFT + db 47, FURY_SWIPES db 0 OmanyteEvosMoves: -;Evolutions - db EV_LEVEL,40,OMASTAR +; Evolutions + db EV_LEVEL, 40, OMASTAR db 0 -;Learnset - db 34,HORN_ATTACK - db 39,LEER - db 46,SPIKE_CANNON - db 53,HYDRO_PUMP +; Learnset + db 34, HORN_ATTACK + db 39, LEER + db 46, SPIKE_CANNON + db 53, HYDRO_PUMP db 0 OmastarEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 34,HORN_ATTACK - db 39,LEER - db 44,SPIKE_CANNON - db 49,HYDRO_PUMP +; Learnset + db 34, HORN_ATTACK + db 39, LEER + db 44, SPIKE_CANNON + db 49, HYDRO_PUMP db 0 JigglypuffEvosMoves: -;Evolutions - db EV_ITEM,MOON_STONE,1,WIGGLYTUFF +; Evolutions + db EV_ITEM, MOON_STONE, 1, WIGGLYTUFF db 0 -;Learnset - db 9,POUND - db 14,DISABLE - db 19,DEFENSE_CURL - db 24,DOUBLESLAP - db 29,REST - db 34,BODY_SLAM - db 39,DOUBLE_EDGE +; Learnset + db 9, POUND + db 14, DISABLE + db 19, DEFENSE_CURL + db 24, DOUBLESLAP + db 29, REST + db 34, BODY_SLAM + db 39, DOUBLE_EDGE db 0 WigglytuffEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 EeveeEvosMoves: -;Evolutions - db EV_ITEM,FIRE_STONE,1,FLAREON - db EV_ITEM,THUNDER_STONE,1,JOLTEON - db EV_ITEM,WATER_STONE,1,VAPOREON +; Evolutions + db EV_ITEM, FIRE_STONE, 1, FLAREON + db EV_ITEM, THUNDER_STONE, 1, JOLTEON + db EV_ITEM, WATER_STONE, 1, VAPOREON db 0 -;Learnset - db 27,QUICK_ATTACK - db 31,TAIL_WHIP - db 37,BITE - db 45,TAKE_DOWN +; Learnset + db 27, QUICK_ATTACK + db 31, TAIL_WHIP + db 37, BITE + db 45, TAKE_DOWN db 0 FlareonEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 27,QUICK_ATTACK - db 31,EMBER - db 37,TAIL_WHIP - db 40,BITE - db 42,LEER - db 44,FIRE_SPIN - db 48,RAGE - db 54,FLAMETHROWER +; Learnset + db 27, QUICK_ATTACK + db 31, EMBER + db 37, TAIL_WHIP + db 40, BITE + db 42, LEER + db 44, FIRE_SPIN + db 48, RAGE + db 54, FLAMETHROWER db 0 JolteonEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 27,QUICK_ATTACK - db 31,THUNDERSHOCK - db 37,TAIL_WHIP - db 40,THUNDER_WAVE - db 42,DOUBLE_KICK - db 44,AGILITY - db 48,PIN_MISSILE - db 54,THUNDER +; Learnset + db 27, QUICK_ATTACK + db 31, THUNDERSHOCK + db 37, TAIL_WHIP + db 40, THUNDER_WAVE + db 42, DOUBLE_KICK + db 44, AGILITY + db 48, PIN_MISSILE + db 54, THUNDER db 0 VaporeonEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 27,QUICK_ATTACK - db 31,WATER_GUN - db 37,TAIL_WHIP - db 40,BITE - db 42,ACID_ARMOR - db 44,HAZE - db 48,MIST - db 54,HYDRO_PUMP +; Learnset + db 27, QUICK_ATTACK + db 31, WATER_GUN + db 37, TAIL_WHIP + db 40, BITE + db 42, ACID_ARMOR + db 44, HAZE + db 48, MIST + db 54, HYDRO_PUMP db 0 MachopEvosMoves: -;Evolutions - db EV_LEVEL,28,MACHOKE +; Evolutions + db EV_LEVEL, 28, MACHOKE db 0 -;Learnset - db 20,LOW_KICK - db 25,LEER - db 32,FOCUS_ENERGY - db 39,SEISMIC_TOSS - db 46,SUBMISSION +; Learnset + db 20, LOW_KICK + db 25, LEER + db 32, FOCUS_ENERGY + db 39, SEISMIC_TOSS + db 46, SUBMISSION db 0 ZubatEvosMoves: -;Evolutions - db EV_LEVEL,22,GOLBAT +; Evolutions + db EV_LEVEL, 22, GOLBAT db 0 -;Learnset - db 10,SUPERSONIC - db 15,BITE - db 21,CONFUSE_RAY - db 28,WING_ATTACK - db 36,HAZE +; Learnset + db 10, SUPERSONIC + db 15, BITE + db 21, CONFUSE_RAY + db 28, WING_ATTACK + db 36, HAZE db 0 EkansEvosMoves: -;Evolutions - db EV_LEVEL,22,ARBOK +; Evolutions + db EV_LEVEL, 22, ARBOK db 0 -;Learnset - db 10,POISON_STING - db 17,BITE - db 24,GLARE - db 31,SCREECH - db 38,ACID +; Learnset + db 10, POISON_STING + db 17, BITE + db 24, GLARE + db 31, SCREECH + db 38, ACID db 0 ParasEvosMoves: -;Evolutions - db EV_LEVEL,24,PARASECT +; Evolutions + db EV_LEVEL, 24, PARASECT db 0 -;Learnset - db 13,STUN_SPORE - db 20,LEECH_LIFE - db 27,SPORE - db 34,SLASH - db 41,GROWTH +; Learnset + db 13, STUN_SPORE + db 20, LEECH_LIFE + db 27, SPORE + db 34, SLASH + db 41, GROWTH db 0 PoliwhirlEvosMoves: -;Evolutions - db EV_ITEM,WATER_STONE,1,POLIWRATH +; Evolutions + db EV_ITEM, WATER_STONE, 1, POLIWRATH db 0 -;Learnset - db 16,HYPNOSIS - db 19,WATER_GUN - db 26,DOUBLESLAP - db 33,BODY_SLAM - db 41,AMNESIA - db 49,HYDRO_PUMP +; Learnset + db 16, HYPNOSIS + db 19, WATER_GUN + db 26, DOUBLESLAP + db 33, BODY_SLAM + db 41, AMNESIA + db 49, HYDRO_PUMP db 0 PoliwrathEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 16,HYPNOSIS - db 19,WATER_GUN +; Learnset + db 16, HYPNOSIS + db 19, WATER_GUN db 0 WeedleEvosMoves: -;Evolutions - db EV_LEVEL,7,KAKUNA +; Evolutions + db EV_LEVEL, 7, KAKUNA db 0 -;Learnset +; Learnset db 0 KakunaEvosMoves: -;Evolutions - db EV_LEVEL,10,BEEDRILL +; Evolutions + db EV_LEVEL, 10, BEEDRILL db 0 -;Learnset +; Learnset db 0 BeedrillEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 12,FURY_ATTACK - db 16,FOCUS_ENERGY - db 20,TWINEEDLE - db 25,RAGE - db 30,PIN_MISSILE - db 35,AGILITY +; Learnset + db 12, FURY_ATTACK + db 16, FOCUS_ENERGY + db 20, TWINEEDLE + db 25, RAGE + db 30, PIN_MISSILE + db 35, AGILITY db 0 MissingNo73EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 DodrioEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 20,GROWL - db 24,FURY_ATTACK - db 30,DRILL_PECK - db 39,RAGE - db 45,TRI_ATTACK - db 51,AGILITY +; Learnset + db 20, GROWL + db 24, FURY_ATTACK + db 30, DRILL_PECK + db 39, RAGE + db 45, TRI_ATTACK + db 51, AGILITY db 0 PrimeapeEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 15,KARATE_CHOP - db 21,FURY_SWIPES - db 27,FOCUS_ENERGY - db 37,SEISMIC_TOSS - db 46,THRASH +; Learnset + db 15, KARATE_CHOP + db 21, FURY_SWIPES + db 27, FOCUS_ENERGY + db 37, SEISMIC_TOSS + db 46, THRASH db 0 DugtrioEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 15,GROWL - db 19,DIG - db 24,SAND_ATTACK - db 35,SLASH - db 47,EARTHQUAKE +; Learnset + db 15, GROWL + db 19, DIG + db 24, SAND_ATTACK + db 35, SLASH + db 47, EARTHQUAKE db 0 VenomothEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 24,POISONPOWDER - db 27,LEECH_LIFE - db 30,STUN_SPORE - db 38,PSYBEAM - db 43,SLEEP_POWDER - db 50,PSYCHIC_M +; Learnset + db 24, POISONPOWDER + db 27, LEECH_LIFE + db 30, STUN_SPORE + db 38, PSYBEAM + db 43, SLEEP_POWDER + db 50, PSYCHIC_M db 0 DewgongEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 30,GROWL - db 35,AURORA_BEAM - db 44,REST - db 50,TAKE_DOWN - db 56,ICE_BEAM +; Learnset + db 30, GROWL + db 35, AURORA_BEAM + db 44, REST + db 50, TAKE_DOWN + db 56, ICE_BEAM db 0 MissingNo79EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo7AEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 CaterpieEvosMoves: -;Evolutions - db EV_LEVEL,7,METAPOD +; Evolutions + db EV_LEVEL, 7, METAPOD db 0 -;Learnset +; Learnset db 0 MetapodEvosMoves: -;Evolutions - db EV_LEVEL,10,BUTTERFREE +; Evolutions + db EV_LEVEL, 10, BUTTERFREE db 0 -;Learnset +; Learnset db 0 ButterfreeEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 12,CONFUSION - db 15,POISONPOWDER - db 16,STUN_SPORE - db 17,SLEEP_POWDER - db 21,SUPERSONIC - db 26,WHIRLWIND - db 32,PSYBEAM +; Learnset + db 12, CONFUSION + db 15, POISONPOWDER + db 16, STUN_SPORE + db 17, SLEEP_POWDER + db 21, SUPERSONIC + db 26, WHIRLWIND + db 32, PSYBEAM db 0 MachampEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 20,LOW_KICK - db 25,LEER - db 36,FOCUS_ENERGY - db 44,SEISMIC_TOSS - db 52,SUBMISSION +; Learnset + db 20, LOW_KICK + db 25, LEER + db 36, FOCUS_ENERGY + db 44, SEISMIC_TOSS + db 52, SUBMISSION db 0 MissingNo7FEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 GolduckEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 28,TAIL_WHIP - db 31,DISABLE - db 39,CONFUSION - db 48,FURY_SWIPES - db 59,HYDRO_PUMP +; Learnset + db 28, TAIL_WHIP + db 31, DISABLE + db 39, CONFUSION + db 48, FURY_SWIPES + db 59, HYDRO_PUMP db 0 HypnoEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 12,DISABLE - db 17,CONFUSION - db 24,HEADBUTT - db 33,POISON_GAS - db 37,PSYCHIC_M - db 43,MEDITATE +; Learnset + db 12, DISABLE + db 17, CONFUSION + db 24, HEADBUTT + db 33, POISON_GAS + db 37, PSYCHIC_M + db 43, MEDITATE db 0 GolbatEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 10,SUPERSONIC - db 15,BITE - db 21,CONFUSE_RAY - db 32,WING_ATTACK - db 43,HAZE +; Learnset + db 10, SUPERSONIC + db 15, BITE + db 21, CONFUSE_RAY + db 32, WING_ATTACK + db 43, HAZE db 0 MewtwoEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 63,BARRIER - db 66,PSYCHIC_M - db 70,RECOVER - db 75,MIST - db 81,AMNESIA +; Learnset + db 63, BARRIER + db 66, PSYCHIC_M + db 70, RECOVER + db 75, MIST + db 81, AMNESIA db 0 SnorlaxEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 35,BODY_SLAM - db 41,HARDEN - db 48,DOUBLE_EDGE - db 56,HYPER_BEAM +; Learnset + db 35, BODY_SLAM + db 41, HARDEN + db 48, DOUBLE_EDGE + db 56, HYPER_BEAM db 0 MagikarpEvosMoves: -;Evolutions - db EV_LEVEL,20,GYARADOS +; Evolutions + db EV_LEVEL, 20, GYARADOS db 0 -;Learnset - db 15,TACKLE +; Learnset + db 15, TACKLE db 0 MissingNo86EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNo87EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MukEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 30,POISON_GAS - db 33,MINIMIZE - db 37,SLUDGE - db 45,HARDEN - db 53,SCREECH - db 60,ACID_ARMOR +; Learnset + db 30, POISON_GAS + db 33, MINIMIZE + db 37, SLUDGE + db 45, HARDEN + db 53, SCREECH + db 60, ACID_ARMOR db 0 MissingNo8AEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 KinglerEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 20,VICEGRIP - db 25,GUILLOTINE - db 34,STOMP - db 42,CRABHAMMER - db 49,HARDEN +; Learnset + db 20, VICEGRIP + db 25, GUILLOTINE + db 34, STOMP + db 42, CRABHAMMER + db 49, HARDEN db 0 CloysterEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 50,SPIKE_CANNON +; Learnset + db 50, SPIKE_CANNON db 0 MissingNo8CEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 ElectrodeEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 17,SONICBOOM - db 22,SELFDESTRUCT - db 29,LIGHT_SCREEN - db 40,SWIFT - db 50,EXPLOSION +; Learnset + db 17, SONICBOOM + db 22, SELFDESTRUCT + db 29, LIGHT_SCREEN + db 40, SWIFT + db 50, EXPLOSION db 0 ClefableEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 WeezingEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 32,SLUDGE - db 39,SMOKESCREEN - db 43,SELFDESTRUCT - db 49,HAZE - db 53,EXPLOSION +; Learnset + db 32, SLUDGE + db 39, SMOKESCREEN + db 43, SELFDESTRUCT + db 49, HAZE + db 53, EXPLOSION db 0 PersianEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 12,BITE - db 17,PAY_DAY - db 24,SCREECH - db 37,FURY_SWIPES - db 51,SLASH +; Learnset + db 12, BITE + db 17, PAY_DAY + db 24, SCREECH + db 37, FURY_SWIPES + db 51, SLASH db 0 MarowakEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 25,LEER - db 33,FOCUS_ENERGY - db 41,THRASH - db 48,BONEMERANG - db 55,RAGE +; Learnset + db 25, LEER + db 33, FOCUS_ENERGY + db 41, THRASH + db 48, BONEMERANG + db 55, RAGE db 0 MissingNo92EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 HaunterEvosMoves: -;Evolutions - db EV_TRADE,1,GENGAR +; Evolutions + db EV_TRADE, 1, GENGAR db 0 -;Learnset - db 29,HYPNOSIS - db 38,DREAM_EATER +; Learnset + db 29, HYPNOSIS + db 38, DREAM_EATER db 0 AbraEvosMoves: -;Evolutions - db EV_LEVEL,16,KADABRA +; Evolutions + db EV_LEVEL, 16, KADABRA db 0 -;Learnset +; Learnset db 0 AlakazamEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 16,CONFUSION - db 20,DISABLE - db 27,PSYBEAM - db 31,RECOVER - db 38,PSYCHIC_M - db 42,REFLECT +; Learnset + db 16, CONFUSION + db 20, DISABLE + db 27, PSYBEAM + db 31, RECOVER + db 38, PSYCHIC_M + db 42, REFLECT db 0 PidgeottoEvosMoves: -;Evolutions - db EV_LEVEL,36,PIDGEOT +; Evolutions + db EV_LEVEL, 36, PIDGEOT db 0 -;Learnset - db 5,SAND_ATTACK - db 12,QUICK_ATTACK - db 21,WHIRLWIND - db 31,WING_ATTACK - db 40,AGILITY - db 49,MIRROR_MOVE +; Learnset + db 5, SAND_ATTACK + db 12, QUICK_ATTACK + db 21, WHIRLWIND + db 31, WING_ATTACK + db 40, AGILITY + db 49, MIRROR_MOVE db 0 PidgeotEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 5,SAND_ATTACK - db 12,QUICK_ATTACK - db 21,WHIRLWIND - db 31,WING_ATTACK - db 44,AGILITY - db 54,MIRROR_MOVE +; Learnset + db 5, SAND_ATTACK + db 12, QUICK_ATTACK + db 21, WHIRLWIND + db 31, WING_ATTACK + db 44, AGILITY + db 54, MIRROR_MOVE db 0 StarmieEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 BulbasaurEvosMoves: -;Evolutions - db EV_LEVEL,16,IVYSAUR +; Evolutions + db EV_LEVEL, 16, IVYSAUR db 0 -;Learnset - db 7,LEECH_SEED - db 13,VINE_WHIP - db 20,POISONPOWDER - db 27,RAZOR_LEAF - db 34,GROWTH - db 41,SLEEP_POWDER - db 48,SOLARBEAM +; Learnset + db 7, LEECH_SEED + db 13, VINE_WHIP + db 20, POISONPOWDER + db 27, RAZOR_LEAF + db 34, GROWTH + db 41, SLEEP_POWDER + db 48, SOLARBEAM db 0 VenusaurEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 7,LEECH_SEED - db 13,VINE_WHIP - db 22,POISONPOWDER - db 30,RAZOR_LEAF - db 43,GROWTH - db 55,SLEEP_POWDER - db 65,SOLARBEAM +; Learnset + db 7, LEECH_SEED + db 13, VINE_WHIP + db 22, POISONPOWDER + db 30, RAZOR_LEAF + db 43, GROWTH + db 55, SLEEP_POWDER + db 65, SOLARBEAM db 0 TentacruelEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 7,SUPERSONIC - db 13,WRAP - db 18,POISON_STING - db 22,WATER_GUN - db 27,CONSTRICT - db 35,BARRIER - db 43,SCREECH - db 50,HYDRO_PUMP +; Learnset + db 7, SUPERSONIC + db 13, WRAP + db 18, POISON_STING + db 22, WATER_GUN + db 27, CONSTRICT + db 35, BARRIER + db 43, SCREECH + db 50, HYDRO_PUMP db 0 MissingNo9CEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 GoldeenEvosMoves: -;Evolutions - db EV_LEVEL,33,SEAKING +; Evolutions + db EV_LEVEL, 33, SEAKING db 0 -;Learnset - db 19,SUPERSONIC - db 24,HORN_ATTACK - db 30,FURY_ATTACK - db 37,WATERFALL - db 45,HORN_DRILL - db 54,AGILITY +; Learnset + db 19, SUPERSONIC + db 24, HORN_ATTACK + db 30, FURY_ATTACK + db 37, WATERFALL + db 45, HORN_DRILL + db 54, AGILITY db 0 SeakingEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 19,SUPERSONIC - db 24,HORN_ATTACK - db 30,FURY_ATTACK - db 39,WATERFALL - db 48,HORN_DRILL - db 54,AGILITY +; Learnset + db 19, SUPERSONIC + db 24, HORN_ATTACK + db 30, FURY_ATTACK + db 39, WATERFALL + db 48, HORN_DRILL + db 54, AGILITY db 0 MissingNo9FEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNoA0EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNoA1EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNoA2EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 PonytaEvosMoves: -;Evolutions - db EV_LEVEL,40,RAPIDASH +; Evolutions + db EV_LEVEL, 40, RAPIDASH db 0 -;Learnset - db 30,TAIL_WHIP - db 32,STOMP - db 35,GROWL - db 39,FIRE_SPIN - db 43,TAKE_DOWN - db 48,AGILITY +; Learnset + db 30, TAIL_WHIP + db 32, STOMP + db 35, GROWL + db 39, FIRE_SPIN + db 43, TAKE_DOWN + db 48, AGILITY db 0 RapidashEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 30,TAIL_WHIP - db 32,STOMP - db 35,GROWL - db 39,FIRE_SPIN - db 47,TAKE_DOWN - db 55,AGILITY +; Learnset + db 30, TAIL_WHIP + db 32, STOMP + db 35, GROWL + db 39, FIRE_SPIN + db 47, TAKE_DOWN + db 55, AGILITY db 0 RattataEvosMoves: -;Evolutions - db EV_LEVEL,20,RATICATE +; Evolutions + db EV_LEVEL, 20, RATICATE db 0 -;Learnset - db 7,QUICK_ATTACK - db 14,HYPER_FANG - db 23,FOCUS_ENERGY - db 34,SUPER_FANG +; Learnset + db 7, QUICK_ATTACK + db 14, HYPER_FANG + db 23, FOCUS_ENERGY + db 34, SUPER_FANG db 0 RaticateEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 7,QUICK_ATTACK - db 14,HYPER_FANG - db 27,FOCUS_ENERGY - db 41,SUPER_FANG +; Learnset + db 7, QUICK_ATTACK + db 14, HYPER_FANG + db 27, FOCUS_ENERGY + db 41, SUPER_FANG db 0 NidorinoEvosMoves: -;Evolutions - db EV_ITEM,MOON_STONE,1,NIDOKING +; Evolutions + db EV_ITEM, MOON_STONE, 1, NIDOKING db 0 -;Learnset - db 8,HORN_ATTACK - db 14,POISON_STING - db 23,FOCUS_ENERGY - db 32,FURY_ATTACK - db 41,HORN_DRILL - db 50,DOUBLE_KICK +; Learnset + db 8, HORN_ATTACK + db 14, POISON_STING + db 23, FOCUS_ENERGY + db 32, FURY_ATTACK + db 41, HORN_DRILL + db 50, DOUBLE_KICK db 0 NidorinaEvosMoves: -;Evolutions - db EV_ITEM,MOON_STONE,1,NIDOQUEEN +; Evolutions + db EV_ITEM, MOON_STONE, 1, NIDOQUEEN db 0 -;Learnset - db 8,SCRATCH - db 14,POISON_STING - db 23,TAIL_WHIP - db 32,BITE - db 41,FURY_SWIPES - db 50,DOUBLE_KICK +; Learnset + db 8, SCRATCH + db 14, POISON_STING + db 23, TAIL_WHIP + db 32, BITE + db 41, FURY_SWIPES + db 50, DOUBLE_KICK db 0 GeodudeEvosMoves: -;Evolutions - db EV_LEVEL,25,GRAVELER +; Evolutions + db EV_LEVEL, 25, GRAVELER db 0 -;Learnset - db 11,DEFENSE_CURL - db 16,ROCK_THROW - db 21,SELFDESTRUCT - db 26,HARDEN - db 31,EARTHQUAKE - db 36,EXPLOSION +; Learnset + db 11, DEFENSE_CURL + db 16, ROCK_THROW + db 21, SELFDESTRUCT + db 26, HARDEN + db 31, EARTHQUAKE + db 36, EXPLOSION db 0 PorygonEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 23,PSYBEAM - db 28,RECOVER - db 35,AGILITY - db 42,TRI_ATTACK +; Learnset + db 23, PSYBEAM + db 28, RECOVER + db 35, AGILITY + db 42, TRI_ATTACK db 0 AerodactylEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 33,SUPERSONIC - db 38,BITE - db 45,TAKE_DOWN - db 54,HYPER_BEAM +; Learnset + db 33, SUPERSONIC + db 38, BITE + db 45, TAKE_DOWN + db 54, HYPER_BEAM db 0 MissingNoACEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MagnemiteEvosMoves: -;Evolutions - db EV_LEVEL,30,MAGNETON +; Evolutions + db EV_LEVEL, 30, MAGNETON db 0 -;Learnset - db 21,SONICBOOM - db 25,THUNDERSHOCK - db 29,SUPERSONIC - db 35,THUNDER_WAVE - db 41,SWIFT - db 47,SCREECH +; Learnset + db 21, SONICBOOM + db 25, THUNDERSHOCK + db 29, SUPERSONIC + db 35, THUNDER_WAVE + db 41, SWIFT + db 47, SCREECH db 0 MissingNoAEEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MissingNoAFEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 CharmanderEvosMoves: -;Evolutions - db EV_LEVEL,16,CHARMELEON +; Evolutions + db EV_LEVEL, 16, CHARMELEON db 0 -;Learnset - db 9,EMBER - db 15,LEER - db 22,RAGE - db 30,SLASH - db 38,FLAMETHROWER - db 46,FIRE_SPIN +; Learnset + db 9, EMBER + db 15, LEER + db 22, RAGE + db 30, SLASH + db 38, FLAMETHROWER + db 46, FIRE_SPIN db 0 SquirtleEvosMoves: -;Evolutions - db EV_LEVEL,16,WARTORTLE +; Evolutions + db EV_LEVEL, 16, WARTORTLE db 0 -;Learnset - db 8,BUBBLE - db 15,WATER_GUN - db 22,BITE - db 28,WITHDRAW - db 35,SKULL_BASH - db 42,HYDRO_PUMP +; Learnset + db 8, BUBBLE + db 15, WATER_GUN + db 22, BITE + db 28, WITHDRAW + db 35, SKULL_BASH + db 42, HYDRO_PUMP db 0 CharmeleonEvosMoves: -;Evolutions - db EV_LEVEL,36,CHARIZARD +; Evolutions + db EV_LEVEL, 36, CHARIZARD db 0 -;Learnset - db 9,EMBER - db 15,LEER - db 24,RAGE - db 33,SLASH - db 42,FLAMETHROWER - db 56,FIRE_SPIN +; Learnset + db 9, EMBER + db 15, LEER + db 24, RAGE + db 33, SLASH + db 42, FLAMETHROWER + db 56, FIRE_SPIN db 0 WartortleEvosMoves: -;Evolutions - db EV_LEVEL,36,BLASTOISE +; Evolutions + db EV_LEVEL, 36, BLASTOISE db 0 -;Learnset - db 8,BUBBLE - db 15,WATER_GUN - db 24,BITE - db 31,WITHDRAW - db 39,SKULL_BASH - db 47,HYDRO_PUMP +; Learnset + db 8, BUBBLE + db 15, WATER_GUN + db 24, BITE + db 31, WITHDRAW + db 39, SKULL_BASH + db 47, HYDRO_PUMP db 0 CharizardEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 9,EMBER - db 15,LEER - db 24,RAGE - db 36,SLASH - db 46,FLAMETHROWER - db 55,FIRE_SPIN +; Learnset + db 9, EMBER + db 15, LEER + db 24, RAGE + db 36, SLASH + db 46, FLAMETHROWER + db 55, FIRE_SPIN db 0 MissingNoB5EvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 FossilKabutopsEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 FossilAerodactylEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 MonGhostEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset +; Learnset db 0 OddishEvosMoves: -;Evolutions - db EV_LEVEL,21,GLOOM +; Evolutions + db EV_LEVEL, 21, GLOOM db 0 -;Learnset - db 15,POISONPOWDER - db 17,STUN_SPORE - db 19,SLEEP_POWDER - db 24,ACID - db 33,PETAL_DANCE - db 46,SOLARBEAM +; Learnset + db 15, POISONPOWDER + db 17, STUN_SPORE + db 19, SLEEP_POWDER + db 24, ACID + db 33, PETAL_DANCE + db 46, SOLARBEAM db 0 GloomEvosMoves: -;Evolutions - db EV_ITEM,LEAF_STONE,1,VILEPLUME +; Evolutions + db EV_ITEM, LEAF_STONE, 1, VILEPLUME db 0 -;Learnset - db 15,POISONPOWDER - db 17,STUN_SPORE - db 19,SLEEP_POWDER - db 28,ACID - db 38,PETAL_DANCE - db 52,SOLARBEAM +; Learnset + db 15, POISONPOWDER + db 17, STUN_SPORE + db 19, SLEEP_POWDER + db 28, ACID + db 38, PETAL_DANCE + db 52, SOLARBEAM db 0 VileplumeEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 15,POISONPOWDER - db 17,STUN_SPORE - db 19,SLEEP_POWDER +; Learnset + db 15, POISONPOWDER + db 17, STUN_SPORE + db 19, SLEEP_POWDER db 0 BellsproutEvosMoves: -;Evolutions - db EV_LEVEL,21,WEEPINBELL +; Evolutions + db EV_LEVEL, 21, WEEPINBELL db 0 -;Learnset - db 13,WRAP - db 15,POISONPOWDER - db 18,SLEEP_POWDER - db 21,STUN_SPORE - db 26,ACID - db 33,RAZOR_LEAF - db 42,SLAM +; Learnset + db 13, WRAP + db 15, POISONPOWDER + db 18, SLEEP_POWDER + db 21, STUN_SPORE + db 26, ACID + db 33, RAZOR_LEAF + db 42, SLAM db 0 WeepinbellEvosMoves: -;Evolutions - db EV_ITEM,LEAF_STONE,1,VICTREEBEL +; Evolutions + db EV_ITEM, LEAF_STONE, 1, VICTREEBEL db 0 -;Learnset - db 13,WRAP - db 15,POISONPOWDER - db 18,SLEEP_POWDER - db 23,STUN_SPORE - db 29,ACID - db 38,RAZOR_LEAF - db 49,SLAM +; Learnset + db 13, WRAP + db 15, POISONPOWDER + db 18, SLEEP_POWDER + db 23, STUN_SPORE + db 29, ACID + db 38, RAZOR_LEAF + db 49, SLAM db 0 VictreebelEvosMoves: -;Evolutions +; Evolutions db 0 -;Learnset - db 13,WRAP - db 15,POISONPOWDER - db 18,SLEEP_POWDER +; Learnset + db 13, WRAP + db 15, POISONPOWDER + db 18, SLEEP_POWDER db 0 From 98f09b6d26b1f83bdf1779cfe63a73b8a4265aef Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sat, 24 Mar 2018 13:41:54 -0500 Subject: [PATCH 06/23] Use rgblink dmg mode --- Makefile | 2 +- engine/battle/safari_zone.asm | 2 +- engine/items/items.asm | 8 ++++---- pokered.link | 3 --- wram.asm | 37 ++++------------------------------- 5 files changed, 10 insertions(+), 42 deletions(-) diff --git a/Makefile b/Makefile index dd266f23..32d37f16 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ pokered_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON RED" pokeblue_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON BLUE" %.gbc: $$(%_obj) - rgblink -n $*.sym -l pokered.link -o $@ $^ + rgblink -d -n $*.sym -l pokered.link -o $@ $^ rgbfix $($*_opt) $@ sort $*.sym -o $*.sym diff --git a/engine/battle/safari_zone.asm b/engine/battle/safari_zone.asm index 1eb1a615..4672892d 100755 --- a/engine/battle/safari_zone.asm +++ b/engine/battle/safari_zone.asm @@ -19,7 +19,7 @@ PrintSafariZoneBattleText: ld [wd0b5], a call GetMonHeader ld a, [wMonHCatchRate] - ld [wEnemyMonCatchRate], a + ld [wEnemyMonActualCatchRate], a pop hl .asm_429f push hl diff --git a/engine/items/items.asm b/engine/items/items.asm index ada4d7db..3bb2ec9e 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -297,7 +297,7 @@ ItemUseBall: pop bc ; b = Rand1 - Status ; If Rand1 - Status > CatchRate, the ball fails to capture the Pokémon. - ld a, [wEnemyMonCatchRate] + ld a, [wEnemyMonActualCatchRate] cp b jr c, .failedToCapture @@ -325,7 +325,7 @@ ItemUseBall: xor a ld [H_MULTIPLICAND], a ld [H_MULTIPLICAND + 1], a - ld a, [wEnemyMonCatchRate] + ld a, [wEnemyMonActualCatchRate] ld [H_MULTIPLICAND + 2], a ld a, 100 ld [H_MULTIPLIER], a @@ -1434,7 +1434,7 @@ VitaminText: ItemUseBait: ld hl, ThrewBaitText call PrintText - ld hl, wEnemyMonCatchRate ; catch rate + ld hl, wEnemyMonActualCatchRate ; catch rate srl [hl] ; halve catch rate ld a, BAIT_ANIM ld hl, wSafariBaitFactor ; bait factor @@ -1444,7 +1444,7 @@ ItemUseBait: ItemUseRock: ld hl, ThrewRockText call PrintText - ld hl, wEnemyMonCatchRate ; catch rate + ld hl, wEnemyMonActualCatchRate ; catch rate ld a, [hl] add a ; double catch rate jr nc, .noCarry diff --git a/pokered.link b/pokered.link index ad5ac793..e070684d 100644 --- a/pokered.link +++ b/pokered.link @@ -159,9 +159,6 @@ ROMX $2C WRAM0 "WRAM Bank 0" -WRAMX 1 - "WRAM Bank 1" - SRAM 0 "Sprite Buffers" diff --git a/wram.asm b/wram.asm index baab1cf7..0091ce43 100755 --- a/wram.asm +++ b/wram.asm @@ -41,6 +41,7 @@ ENDM battle_struct: MACRO \1Species:: db \1HP:: dw +\1PartyPos:: \1BoxLevel:: db \1Status:: db \1Type:: @@ -1590,40 +1591,10 @@ wBattleMonSpecies2:: ; cfd9 wEnemyMonNick:: ds NAME_LENGTH ; cfda -wEnemyMon:: ; cfe5 -; The wEnemyMon struct reaches past 0xcfff, -; the end of wram bank 0 on cgb. -; This has no significance on dmg, where wram -; isn't banked (c000-dfff is contiguous). -; However, recent versions of rgbds have replaced -; dmg-style wram with cgb wram banks. - -; Until this is fixed, this struct will have -; to be declared manually. - -wEnemyMonSpecies:: db -wEnemyMonHP:: dw -wEnemyMonPartyPos:: -wEnemyMonBoxLevel:: db -wEnemyMonStatus:: db -wEnemyMonType:: -wEnemyMonType1:: db -wEnemyMonType2:: db -wEnemyMonCatchRate_NotReferenced:: db -wEnemyMonMoves:: ds NUM_MOVES -wEnemyMonDVs:: ds 2 -wEnemyMonLevel:: db -wEnemyMonMaxHP:: dw -wEnemyMonAttack:: dw -wEnemyMonDefense:: dw -wEnemyMonSpeed:: dw -wEnemyMonSpecial:: dw -wEnemyMonPP:: ds 2 ; NUM_MOVES - 2 -SECTION "WRAM Bank 1", WRAMX, BANK[1] - ds 2 ; NUM_MOVES - 2 +wEnemyMon:: battle_struct wEnemyMon ; cfe5 wEnemyMonBaseStats:: ds 5 -wEnemyMonCatchRate:: ds 1 +wEnemyMonActualCatchRate:: ds 1 wEnemyMonBaseExp:: ds 1 wBattleMonNick:: ds NAME_LENGTH ; d009 @@ -3233,7 +3204,7 @@ wBoxMonNicksEnd:: ; dee2 wBoxDataEnd:: -SECTION "Stack", WRAMX[$df00], BANK[1] +SECTION "Stack", WRAM0[$df00] ds $ff wStack:: ; dfff From 01fe449837bef1c289d37477745774555d22786e Mon Sep 17 00:00:00 2001 From: Pokeglitch Date: Fri, 22 Jun 2018 23:06:05 -0400 Subject: [PATCH 07/23] Updated the intro --- constants/hardware_constants.asm | 8 --- constants/misc_constants.asm | 2 + constants/oam_constants.asm | 13 ++++- constants/palette_constants.asm | 7 +++ engine/battle/animations.asm | 28 +++++----- engine/intro.asm | 89 ++++++++++++++++++-------------- macros/asm_macros.asm | 4 ++ 7 files changed, 88 insertions(+), 63 deletions(-) diff --git a/constants/hardware_constants.asm b/constants/hardware_constants.asm index d6af3584..9f2aa1b7 100644 --- a/constants/hardware_constants.asm +++ b/constants/hardware_constants.asm @@ -22,14 +22,6 @@ JOYPAD EQU 4 LY_VBLANK EQU 145 -; OAM attribute flags -OAM_PALETTE EQU %111 -OAM_TILE_BANK EQU 3 -OAM_OBP_NUM EQU 4 ; Non CGB Mode Only -OAM_X_FLIP EQU 5 -OAM_Y_FLIP EQU 6 -OAM_PRIORITY EQU 7 ; 0: OBJ above BG, 1: OBJ behind BG (colors 1-3) - ; serial START_TRANSFER_EXTERNAL_CLOCK EQU $80 START_TRANSFER_INTERNAL_CLOCK EQU $81 diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index d4f231b5..d6a935f8 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -45,6 +45,8 @@ SCREEN_HEIGHT EQU 18 SCREEN_WIDTH_PIXELS EQU SCREEN_WIDTH * 8 SCREEN_HEIGHT_PIXELS EQU SCREEN_HEIGHT * 8 +BYTES_PER_TILE EQU 16 + BG_MAP_WIDTH EQU 32 BG_MAP_HEIGHT EQU 32 diff --git a/constants/oam_constants.asm b/constants/oam_constants.asm index ddf95648..2d34048d 100755 --- a/constants/oam_constants.asm +++ b/constants/oam_constants.asm @@ -5,5 +5,14 @@ OAMFLAG_VFLIPPED EQU %00100000 ; OAM flag flips the sprite vertically. ; Used for making left facing sprites face right and to alternate between left and right foot animation when walking up or down ; OAM attribute flags -OAM_HFLIP EQU %00100000 ; horizontal flip -OAM_VFLIP EQU %01000000 ; vertical flip +OAM_PALETTE EQU %111 +OAM_TILE_BANK EQU 3 +OAM_OBP_NUM EQU 4 ; Non CGB Mode Only +OAM_X_FLIP EQU 5 +OAM_Y_FLIP EQU 6 +OAM_PRIORITY EQU 7 ; 0: OBJ above BG, 1: OBJ behind BG (colors 1-3) + +; OAM attribute masks +OAM_HFLIP EQU 1 << OAM_X_FLIP ; horizontal flip +OAM_VFLIP EQU 1 << OAM_Y_FLIP ; vertical flip +OAM_BEHIND_BG EQU 1 << OAM_PRIORITY ; behind bg (except color 0) diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm index ca2e103a..1413ad98 100755 --- a/constants/palette_constants.asm +++ b/constants/palette_constants.asm @@ -1,3 +1,10 @@ +; monochrome palette color ids + const_def + const WHITE + const LIGHT_GRAY + const DARK_GRAY + const BLACK + SET_PAL_BATTLE_BLACK EQU $00 SET_PAL_BATTLE EQU $01 SET_PAL_TOWN_MAP EQU $02 diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 76d4f464..74e48535 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -2588,21 +2588,21 @@ CopyTileIDs: TileIDListPointerTable: dw Unknown_79b24 - db $77 + dn 7, 7 dw Unknown_79b55 - db $57 + dn 5, 7 dw Unknown_79b78 - db $37 - dw Unknown_79b8d - db $77 - dw Unknown_79bbe - db $77 - dw Unknown_79bef - db $77 + dn 3, 7 + dw GengarIntroTiles1 + dn 7, 7 + dw GengarIntroTiles2 + dn 7, 7 + dw GengarIntroTiles3 + dn 7, 7 dw Unknown_79c20 - db $86 + dn 8, 6 dw Unknown_79c50 - db $3C + dn 3, 12 DownscaledMonTiles_5x5: db $31,$38,$46,$54,$5B @@ -2637,7 +2637,7 @@ Unknown_79b78: db $02,$09,$10,$17,$1E,$25,$2C db $04,$0B,$12,$19,$20,$27,$2E -Unknown_79b8d: +GengarIntroTiles1: db $00,$00,$00,$00,$00,$00,$00 db $00,$00,$00,$00,$00,$19,$00 db $02,$06,$0B,$10,$14,$1A,$00 @@ -2646,7 +2646,7 @@ Unknown_79b8d: db $04,$09,$0E,$13,$17,$1D,$1F db $05,$0A,$0F,$01,$18,$1E,$20 -Unknown_79bbe: +GengarIntroTiles2: db $00,$00,$00,$30,$00,$37,$00 db $00,$00,$2B,$31,$34,$38,$3D db $21,$26,$2C,$01,$35,$39,$3E @@ -2655,7 +2655,7 @@ Unknown_79bbe: db $24,$29,$2F,$01,$01,$3B,$00 db $25,$2A,$01,$01,$01,$3C,$00 -Unknown_79bef: +GengarIntroTiles3: db $00,$00,$00,$00,$00,$00,$00 db $00,$00,$47,$4D,$00,$00,$00 db $00,$00,$48,$4E,$52,$56,$5B diff --git a/engine/intro.asm b/engine/intro.asm index 422bcf7a..f69a0020 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -1,6 +1,12 @@ -MOVE_GENGAR_RIGHT EQU $00 -MOVE_GENGAR_LEFT EQU $01 -MOVE_NIDORINO_RIGHT EQU $ff +MOVE_GENGAR_RIGHT EQU 0 +MOVE_GENGAR_LEFT EQU 1 +MOVE_NIDORINO_RIGHT EQU -1 + +ANIMATION_END EQU 80 + +GENGAR_INTRO_TILES1 EQU 3 +GENGAR_INTRO_TILES2 EQU 4 +GENGAR_INTRO_TILES3 EQU 5 PlayIntro: xor a @@ -20,13 +26,13 @@ PlayIntro: PlayIntroScene: ld b, SET_PAL_NIDORINO_INTRO call RunPaletteCommand - ld a, %11100100 + ldPal a, BLACK, DARK_GRAY, LIGHT_GRAY, WHITE ld [rBGP], a ld [rOBP0], a ld [rOBP1], a xor a ld [hSCX], a - ld b, $3 ; Gengar tiles + ld b, GENGAR_INTRO_TILES1 call IntroCopyTiles ld a, 0 ld [wBaseCoordX], a @@ -50,7 +56,7 @@ PlayIntroScene: call PlaySound ld de, IntroNidorinoAnimation2 call AnimateIntroNidorino - ld c, $a + ld c, 10 call CheckForUserInterruption ret c @@ -64,23 +70,23 @@ PlayIntroScene: call PlaySound ld de, IntroNidorinoAnimation2 call AnimateIntroNidorino - ld c, $1e + ld c, 30 call CheckForUserInterruption ret c ; raise - ld b, $4 + ld b, GENGAR_INTRO_TILES2 call IntroCopyTiles ld a, SFX_INTRO_RAISE call PlaySound lb de, 8 / 2, MOVE_GENGAR_LEFT call IntroMoveMon - ld c, $1e + ld c, 30 call CheckForUserInterruption ret c ; slash - ld b, $5 + ld b, GENGAR_INTRO_TILES3 call IntroCopyTiles ld a, SFX_INTRO_CRASH call PlaySound @@ -89,19 +95,19 @@ PlayIntroScene: ; hip ld a, SFX_INTRO_HIP call PlaySound - ld a, $24 + ld a, (FightIntroFrontMon2 - FightIntroFrontMon) / BYTES_PER_TILE ld [wIntroNidorinoBaseTile], a ld de, IntroNidorinoAnimation3 call AnimateIntroNidorino - ld c, $1e + ld c, 30 call CheckForUserInterruption ret c lb de, 8 / 2, MOVE_GENGAR_LEFT call IntroMoveMon - ld b, $3 + ld b, GENGAR_INTRO_TILES1 call IntroCopyTiles - ld c, $3c + ld c, 60 call CheckForUserInterruption ret c @@ -117,29 +123,29 @@ PlayIntroScene: call PlaySound ld de, IntroNidorinoAnimation5 call AnimateIntroNidorino - ld c, $14 + ld c, 20 call CheckForUserInterruption ret c - ld a, $24 + ld a, (FightIntroFrontMon2 - FightIntroFrontMon) / BYTES_PER_TILE ld [wIntroNidorinoBaseTile], a ld de, IntroNidorinoAnimation6 call AnimateIntroNidorino - ld c, $1e + ld c, 30 call CheckForUserInterruption ret c ; lunge ld a, SFX_INTRO_LUNGE call PlaySound - ld a, $48 + ld a, (FightIntroFrontMon3 - FightIntroFrontMon) / BYTES_PER_TILE ld [wIntroNidorinoBaseTile], a ld de, IntroNidorinoAnimation7 jp AnimateIntroNidorino AnimateIntroNidorino: ld a, [de] - cp $50 + cp ANIMATION_END ret z ld [wBaseCoordY], a inc de @@ -189,7 +195,7 @@ InitIntroNidorinoOAM: ld [hli], a ; X ld a, d ld [hli], a ; tile - ld a, $80 + ld a, OAM_BEHIND_BG ld [hli], a ; attributes inc d dec c @@ -204,7 +210,7 @@ InitIntroNidorinoOAM: IntroClearScreen: ld hl, vBGMap1 - ld bc, $240 + ld bc, BG_MAP_WIDTH * SCREEN_HEIGHT jr IntroClearCommon IntroClearMiddleOfScreen: @@ -213,7 +219,7 @@ IntroClearMiddleOfScreen: ld bc, SCREEN_WIDTH * 10 IntroClearCommon: - ld [hl], $0 + ld [hl], 0 inc hl dec bc ld a, b @@ -222,7 +228,7 @@ IntroClearCommon: ret IntroPlaceBlackTiles: - ld a, $1 + ld a, 1 .loop ld [hli], a dec c @@ -231,11 +237,11 @@ IntroPlaceBlackTiles: IntroMoveMon: ; d = number of times to move the mon (2 pixels each time) -; e: $00 = move Gengar right, $01 = move Gengar left, $ff = move Nidorino right +; e: 0 = move Gengar right, 1 = move Gengar left, -1 = move Nidorino right ld a, e - cp $ff + cp -1 jr z, .moveNidorinoRight - cp $1 + cp 1 jr z, .moveGengarLeft ; move Gengar right ld a, [hSCX] @@ -286,7 +292,7 @@ LoadIntroGraphics: ld a, BANK(FightIntroBackMon) call FarCopyData2 ld hl, GameFreakIntro - ld de, vChars2 + $600 + ld de, vChars2 + (FightIntroBackMonEnd - FightIntroBackMon) ld bc, GameFreakIntroEnd - GameFreakIntro ld a, BANK(GameFreakIntro) call FarCopyData2 @@ -305,7 +311,7 @@ PlayShootingStar: ld b, SET_PAL_GAME_FREAK_INTRO call RunPaletteCommand callba LoadCopyrightAndTextBoxTiles - ld a, %11100100 + ldPal a, BLACK, DARK_GRAY, LIGHT_GRAY, WHITE ld [rBGP], a ld c, 180 call DelayFrames @@ -348,10 +354,10 @@ IntroDrawBlackBars: ld c, SCREEN_WIDTH * 4 call IntroPlaceBlackTiles ld hl, vBGMap1 - ld c, $80 + ld c, BG_MAP_WIDTH * 4 call IntroPlaceBlackTiles - ld hl, vBGMap1 + $1c0 - ld c, $80 + ld hl, vBGMap1 + BG_MAP_WIDTH * 14 + ld c, BG_MAP_WIDTH * 4 jp IntroPlaceBlackTiles EmptyFunc4: @@ -359,7 +365,7 @@ EmptyFunc4: IntroNidorinoAnimation0: db 0, 0 - db $50 + db ANIMATION_END IntroNidorinoAnimation1: ; This is a sequence of pixel movements for part of the Nidorino animation. This @@ -370,7 +376,7 @@ IntroNidorinoAnimation1: db -1, 2 db 1, 2 db 2, 2 - db $50 ; list terminator + db ANIMATION_END IntroNidorinoAnimation2: ; This is a sequence of pixel movements for part of the Nidorino animation. @@ -380,7 +386,7 @@ IntroNidorinoAnimation2: db -1, -2 db 1, -2 db 2, -2 - db $50 ; list terminator + db ANIMATION_END IntroNidorinoAnimation3: ; This is a sequence of pixel movements for part of the Nidorino animation. @@ -390,7 +396,7 @@ IntroNidorinoAnimation3: db -8, 6 db 8, 6 db 12, 6 - db $50 ; list terminator + db ANIMATION_END IntroNidorinoAnimation4: ; This is a sequence of pixel movements for part of the Nidorino animation. @@ -400,7 +406,7 @@ IntroNidorinoAnimation4: db -4, -4 db 4, -4 db 8, -4 - db $50 ; list terminator + db ANIMATION_END IntroNidorinoAnimation5: ; This is a sequence of pixel movements for part of the Nidorino animation. @@ -410,7 +416,7 @@ IntroNidorinoAnimation5: db -4, 4 db 4, 4 db 8, 4 - db $50 ; list terminator + db ANIMATION_END IntroNidorinoAnimation6: ; This is a sequence of pixel movements for part of the Nidorino animation. @@ -419,7 +425,7 @@ IntroNidorinoAnimation6: db 2, 0 db 2, 0 db 0, 0 - db $50 ; list terminator + db ANIMATION_END IntroNidorinoAnimation7: ; This is a sequence of pixel movements for part of the Nidorino animation. @@ -428,7 +434,7 @@ IntroNidorinoAnimation7: db -7, -14 db -6, -12 db -4, -10 - db $50 ; list terminator + db ANIMATION_END GameFreakIntro: INCBIN "gfx/gamefreak_intro.2bpp" @@ -444,12 +450,17 @@ FightIntroFrontMon: IF DEF(_RED) INCBIN "gfx/red/intro_nido_1.2bpp" +FightIntroFrontMon2: INCBIN "gfx/red/intro_nido_2.2bpp" +FightIntroFrontMon3: INCBIN "gfx/red/intro_nido_3.2bpp" ENDC + IF DEF(_BLUE) INCBIN "gfx/blue/intro_purin_1.2bpp" +FightIntroFrontMon2: INCBIN "gfx/blue/intro_purin_2.2bpp" +FightIntroFrontMon3: INCBIN "gfx/blue/intro_purin_3.2bpp" ENDC diff --git a/macros/asm_macros.asm b/macros/asm_macros.asm index 5cf5a809..28d2d95e 100755 --- a/macros/asm_macros.asm +++ b/macros/asm_macros.asm @@ -186,3 +186,7 @@ tx_pre_jump: MACRO tx_pre_id \1 jp PrintPredefTextID ENDM + +ldPal: MACRO + ld \1, \2 << 6 | \3 << 4 | \4 << 2 | \5 +ENDM From 808c2509b00903478dfdad1830bef6358d93b7dd Mon Sep 17 00:00:00 2001 From: Pokeglitch Date: Sat, 23 Jun 2018 11:37:58 -0400 Subject: [PATCH 08/23] Updated constants for intro --- engine/intro.asm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/engine/intro.asm b/engine/intro.asm index f69a0020..4acab5a6 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -1,12 +1,14 @@ -MOVE_GENGAR_RIGHT EQU 0 -MOVE_GENGAR_LEFT EQU 1 -MOVE_NIDORINO_RIGHT EQU -1 +const_value = -1 + const MOVE_NIDORINO_RIGHT + const MOVE_GENGAR_RIGHT + const MOVE_GENGAR_LEFT -ANIMATION_END EQU 80 +ANIMATION_END EQU 80 -GENGAR_INTRO_TILES1 EQU 3 -GENGAR_INTRO_TILES2 EQU 4 -GENGAR_INTRO_TILES3 EQU 5 +const_value = 3 + const GENGAR_INTRO_TILES1 + const GENGAR_INTRO_TILES2 + const GENGAR_INTRO_TILES3 PlayIntro: xor a @@ -237,11 +239,10 @@ IntroPlaceBlackTiles: IntroMoveMon: ; d = number of times to move the mon (2 pixels each time) -; e: 0 = move Gengar right, 1 = move Gengar left, -1 = move Nidorino right ld a, e - cp -1 + cp MOVE_NIDORINO_RIGHT jr z, .moveNidorinoRight - cp 1 + cp MOVE_GENGAR_LEFT jr z, .moveGengarLeft ; move Gengar right ld a, [hSCX] From b4ab6dc7016063ecdff0a33d6a34d16070834d48 Mon Sep 17 00:00:00 2001 From: Urs-Bjoern Schmidt Date: Mon, 2 Jul 2018 11:34:11 +0200 Subject: [PATCH 09/23] Fixed some inconsistencies in the usage of the if-def directive. --- data/wildPokemon/route2.asm | 8 ++++---- data/wildPokemon/route23.asm | 4 ++-- data/wildPokemon/unknowndungeon1.asm | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/wildPokemon/route2.asm b/data/wildPokemon/route2.asm index fb3a5e82..ad958ea5 100755 --- a/data/wildPokemon/route2.asm +++ b/data/wildPokemon/route2.asm @@ -5,19 +5,19 @@ Route2Mons: db 4,PIDGEY db 4,RATTATA db 5,PIDGEY - if DEF(_RED) + IF DEF(_RED) db 3,WEEDLE ENDC - if DEF(_BLUE) + IF DEF(_BLUE) db 3,CATERPIE ENDC db 2,RATTATA db 5,RATTATA - if DEF(_RED) + IF DEF(_RED) db 4,WEEDLE db 5,WEEDLE ENDC - if DEF(_BLUE) + IF DEF(_BLUE) db 4,CATERPIE db 5,CATERPIE ENDC diff --git a/data/wildPokemon/route23.asm b/data/wildPokemon/route23.asm index a96a0d3c..a057d24d 100755 --- a/data/wildPokemon/route23.asm +++ b/data/wildPokemon/route23.asm @@ -3,7 +3,7 @@ Route23Mons: IF DEF(_RED) db 26,EKANS ENDC - IF !DEF(_RED) + IF DEF(_BLUE) db 26,SANDSHREW ENDC db 33,DITTO @@ -14,7 +14,7 @@ Route23Mons: IF DEF(_RED) db 41,ARBOK ENDC - IF !DEF(_RED) + IF DEF(_BLUE) db 41,SANDSLASH ENDC db 43,DITTO diff --git a/data/wildPokemon/unknowndungeon1.asm b/data/wildPokemon/unknowndungeon1.asm index 70f680b7..20e8643a 100755 --- a/data/wildPokemon/unknowndungeon1.asm +++ b/data/wildPokemon/unknowndungeon1.asm @@ -8,7 +8,7 @@ DungeonMons1: IF DEF(_RED) db 52,ARBOK ENDC - IF !DEF(_RED) + IF DEF(_BLUE) db 52,SANDSLASH ENDC db 49,KADABRA From 462088a25c971fc8989e5bf56260c2365e258053 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 8 Jul 2018 16:25:39 -0400 Subject: [PATCH 10/23] Document the origin of MissingNo's base stats. --- constants/pokemon_constants.asm | 2 +- data/pokedex_entries.asm | 2 +- data/trainer_parties.asm | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 96d44ef5..c4189911 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -136,7 +136,7 @@ const_value = 1 const MISSINGNO_86 ; $86 const MISSINGNO_87 ; $87 const MUK ; $88 - const MISSINGNO_8A ; $8A + const MISSINGNO_89 ; $89 const KINGLER ; $8A const CLOYSTER ; $8B const MISSINGNO_8C ; $8C diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm index 3fb2d3c6..495a8e33 100755 --- a/data/pokedex_entries.asm +++ b/data/pokedex_entries.asm @@ -1256,4 +1256,4 @@ MissingNoDexEntry: db "???@" db 10 ; 1.0 m db 100 ; 10.0 kg - db 0,"コメント さくせいちゅう@" ; コメント作成中 (Comment to be written) + text "コメント さくせいちゅう@" ; コメント作成中 (Comment to be written) diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm index da4f80c9..e448d431 100755 --- a/data/trainer_parties.asm +++ b/data/trainer_parties.asm @@ -258,6 +258,14 @@ BikerData: db 33,WEEZING,0 db 26,GRIMER,GRIMER,GRIMER,GRIMER,0 ; Route 17 + ; From https://www.smogon.com/smog/issue27/glitch: + ; 0E:5FC2 is offset of the ending 0 for this first Biker on Route 17. + ; BaseStats + (MonBaseStatsEnd - MonBaseStats) * (000 - 1) = $5FC2; + ; that's the formula from GetMonHeader for the base stats of mon #000. + ; (BaseStats = $43DE and BANK(BaseStats) = $0E.) + ; Finally, PokedexOrder lists 0 as the dex ID for every MissingNo. + ; The result is that this data gets interpreted as the base stats + ; for MissingNo: 0,33,MUK,0,29,VOLTORB,VOLTORB,0,...,28,GRIMER,GRIMER. db 28,WEEZING,KOFFING,WEEZING,0 db 33,MUK,0 db 29,VOLTORB,VOLTORB,0 From eddcbba82fa07705b35f3958a4f729878f22ecc2 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 8 Jul 2018 16:30:25 -0400 Subject: [PATCH 11/23] Avoid "Warning: Left shift of negative value" from rgbds --- macros/asm_macros.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macros/asm_macros.asm b/macros/asm_macros.asm index 28d2d95e..d3f00b0c 100755 --- a/macros/asm_macros.asm +++ b/macros/asm_macros.asm @@ -1,6 +1,6 @@ lb: MACRO ; r, hi, lo - ld \1, (\2) << 8 + ((\3) & $ff) + ld \1, ((\2) & $ff) << 8 + ((\3) & $ff) ENDM homecall: MACRO From ee723161025844bf3606cd7e5c3b867db7a94160 Mon Sep 17 00:00:00 2001 From: Sam Nelson Date: Sun, 15 Jul 2018 10:50:44 -0700 Subject: [PATCH 12/23] make comments consistent throughout all mapHeader files --- data/mapHeaders/blueshouse.asm | 8 ++++---- data/mapHeaders/gary.asm | 10 +++++----- data/mapHeaders/pallettown.asm | 6 +++--- data/mapHeaders/redshouse1f.asm | 8 ++++---- data/mapHeaders/redshouse2f.asm | 8 ++++---- data/mapHeaders/route2.asm | 10 +++++----- data/mapHeaders/route4.asm | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/data/mapHeaders/blueshouse.asm b/data/mapHeaders/blueshouse.asm index 47e5c5b4..4b5c45e7 100755 --- a/data/mapHeaders/blueshouse.asm +++ b/data/mapHeaders/blueshouse.asm @@ -1,6 +1,6 @@ BluesHouse_h: db HOUSE ; tileset - db BLUES_HOUSE_HEIGHT, BLUES_HOUSE_WIDTH ; dimensions - dw BluesHouseBlocks, BluesHouseTextPointers, BluesHouseScript - db 0 - dw BluesHouseObject + db BLUES_HOUSE_HEIGHT, BLUES_HOUSE_WIDTH ; dimensions (y, x) + dw BluesHouseBlocks, BluesHouseTextPointers, BluesHouseScript ; blocks, texts, scripts + db 0 ; connections + dw BluesHouseObject ; objects diff --git a/data/mapHeaders/gary.asm b/data/mapHeaders/gary.asm index 792c4b32..a9cf381b 100755 --- a/data/mapHeaders/gary.asm +++ b/data/mapHeaders/gary.asm @@ -1,6 +1,6 @@ Gary_h: - db GYM ;tileset - db CHAMPIONS_ROOM_HEIGHT, CHAMPIONS_ROOM_WIDTH ; Height, Width - dw GaryBlocks, GaryTextPointers, GaryScript - db $0 ;No Connections - dw GaryObject + db GYM ; tileset + db CHAMPIONS_ROOM_HEIGHT, CHAMPIONS_ROOM_WIDTH ; dimensions (y, x) + dw GaryBlocks, GaryTextPointers, GaryScript ; blocks, texts, scripts + db $0 ; connections + dw GaryObject ; objects diff --git a/data/mapHeaders/pallettown.asm b/data/mapHeaders/pallettown.asm index a957314c..8b8137ce 100755 --- a/data/mapHeaders/pallettown.asm +++ b/data/mapHeaders/pallettown.asm @@ -1,8 +1,8 @@ PalletTown_h: db OVERWORLD ; tileset - db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions - dw PalletTownBlocks, PalletTownTextPointers, PalletTownScript + db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions (y, x) + dw PalletTownBlocks, PalletTownTextPointers, PalletTownScript ; blocks, texts, scripts db NORTH | SOUTH ; connections NORTH_MAP_CONNECTION PALLET_TOWN, ROUTE_1, 0, 0, Route1Blocks SOUTH_MAP_CONNECTION PALLET_TOWN, ROUTE_21, 0, 0, Route21Blocks, 1 - dw PalletTownObject + dw PalletTownObject ; objects diff --git a/data/mapHeaders/redshouse1f.asm b/data/mapHeaders/redshouse1f.asm index 82d83042..a6f5783f 100755 --- a/data/mapHeaders/redshouse1f.asm +++ b/data/mapHeaders/redshouse1f.asm @@ -1,6 +1,6 @@ RedsHouse1F_h: db REDS_HOUSE_1 ; tileset - db REDS_HOUSE_1F_HEIGHT, REDS_HOUSE_1F_WIDTH ; dimensions - dw RedsHouse1FBlocks, RedsHouse1FTextPointers, RedsHouse1FScript - db 0 ; no connections - dw RedsHouse1FObject + db REDS_HOUSE_1F_HEIGHT, REDS_HOUSE_1F_WIDTH ; dimensions (y, x) + dw RedsHouse1FBlocks, RedsHouse1FTextPointers, RedsHouse1FScript ; blocks, texts, scripts + db 0 ; connections + dw RedsHouse1FObject ; objects diff --git a/data/mapHeaders/redshouse2f.asm b/data/mapHeaders/redshouse2f.asm index c4b0969c..89193e9e 100755 --- a/data/mapHeaders/redshouse2f.asm +++ b/data/mapHeaders/redshouse2f.asm @@ -1,6 +1,6 @@ RedsHouse2F_h: db REDS_HOUSE_2 ; tileset - db REDS_HOUSE_2F_HEIGHT, REDS_HOUSE_2F_WIDTH ; dimensions - dw RedsHouse2FBlocks, RedsHouse2FTextPointers, RedsHouse2FScript - db $00 ; no connections - dw RedsHouse2FObject + db REDS_HOUSE_2F_HEIGHT, REDS_HOUSE_2F_WIDTH ; dimensions (y, x) + dw RedsHouse2FBlocks, RedsHouse2FTextPointers, RedsHouse2FScript ; blocks, texts, scripts + db $00 ; connections + dw RedsHouse2FObject ; objects diff --git a/data/mapHeaders/route2.asm b/data/mapHeaders/route2.asm index 38e80842..2476d0a5 100755 --- a/data/mapHeaders/route2.asm +++ b/data/mapHeaders/route2.asm @@ -1,8 +1,8 @@ Route2_h: - db 00 ; Tileset - db ROUTE_2_HEIGHT,ROUTE_2_WIDTH ;Height,Width blocks (1 block = 4x4 tiles) - dw Route2Blocks, Route2TextPointers, Route2Script - db NORTH | SOUTH ;Connection Byte + db 00 ; tileset + db ROUTE_2_HEIGHT, ROUTE_2_WIDTH ; dimensions (y, x) + dw Route2Blocks, Route2TextPointers, Route2Script ; blocks, texts, scripts + db NORTH | SOUTH ; connections NORTH_MAP_CONNECTION ROUTE_2, PEWTER_CITY, -3, 2, PewterCityBlocks SOUTH_MAP_CONNECTION ROUTE_2, VIRIDIAN_CITY, -3, 2, ViridianCityBlocks, 1 - dw Route2Object ;Object Data Pointer + dw Route2Object ; objects diff --git a/data/mapHeaders/route4.asm b/data/mapHeaders/route4.asm index a322f23c..26670e6d 100755 --- a/data/mapHeaders/route4.asm +++ b/data/mapHeaders/route4.asm @@ -1,7 +1,7 @@ Route4_h: db OVERWORLD ; tileset db ROUTE_4_HEIGHT, ROUTE_4_WIDTH ; dimensions (y, x) - dw Route4Blocks, Route4TextPointers, Route4Script; blocks, texts, scripts + dw Route4Blocks, Route4TextPointers, Route4Script ; blocks, texts, scripts db SOUTH | EAST ; connections SOUTH_MAP_CONNECTION ROUTE_4, ROUTE_3, -3, 22, Route3Blocks EAST_MAP_CONNECTION ROUTE_4, CERULEAN_CITY, -3, 1, CeruleanCityBlocks, 1 From ae2c1036ea1fa42d437f6291da673367b1f0ea4c Mon Sep 17 00:00:00 2001 From: Pokeglitch Date: Sat, 28 Jul 2018 15:51:17 -0400 Subject: [PATCH 13/23] Fixed some map header files --- data/mapHeaders/pewtercity.asm | 2 -- data/mapHeaders/route2.asm | 2 +- main.asm | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/data/mapHeaders/pewtercity.asm b/data/mapHeaders/pewtercity.asm index ff5bd7b9..88faaacc 100755 --- a/data/mapHeaders/pewtercity.asm +++ b/data/mapHeaders/pewtercity.asm @@ -6,5 +6,3 @@ PewterCity_h: SOUTH_MAP_CONNECTION PEWTER_CITY, ROUTE_2, 5, 0, Route2Blocks EAST_MAP_CONNECTION PEWTER_CITY, ROUTE_3, 4, 0, Route3Blocks dw PewterCityObject ; objects - - db $0 diff --git a/data/mapHeaders/route2.asm b/data/mapHeaders/route2.asm index 2476d0a5..550cd702 100755 --- a/data/mapHeaders/route2.asm +++ b/data/mapHeaders/route2.asm @@ -1,5 +1,5 @@ Route2_h: - db 00 ; tileset + db OVERWORLD ; tileset db ROUTE_2_HEIGHT, ROUTE_2_WIDTH ; dimensions (y, x) dw Route2Blocks, Route2TextPointers, Route2Script ; blocks, texts, scripts db NORTH | SOUTH ; connections diff --git a/main.asm b/main.asm index 065700da..3309bef0 100755 --- a/main.asm +++ b/main.asm @@ -275,6 +275,7 @@ INCLUDE "data/mapObjects/viridiancity.asm" ViridianCityBlocks: INCBIN "maps/viridiancity.blk" INCLUDE "data/mapHeaders/pewtercity.asm" + db $0 INCLUDE "data/mapObjects/pewtercity.asm" PewterCityBlocks: INCBIN "maps/pewtercity.blk" From 9b6f57832eac84e602d38179651027bae450b54f Mon Sep 17 00:00:00 2001 From: Pokeglitch Date: Sat, 28 Jul 2018 15:56:50 -0400 Subject: [PATCH 14/23] Another map header fix --- data/mapHeaders/viridianhouse.asm | 2 -- main.asm | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/data/mapHeaders/viridianhouse.asm b/data/mapHeaders/viridianhouse.asm index a80953f9..9b2c73de 100755 --- a/data/mapHeaders/viridianhouse.asm +++ b/data/mapHeaders/viridianhouse.asm @@ -4,5 +4,3 @@ ViridianHouse_h: dw ViridianHouseBlocks, ViridianHouseTextPointers, ViridianHouseScript ; blocks, texts, scripts db 0 ; connections dw ViridianHouseObject ; objects - - db $0 diff --git a/main.asm b/main.asm index 3309bef0..72cd7210 100755 --- a/main.asm +++ b/main.asm @@ -395,6 +395,7 @@ INCLUDE "scripts/school.asm" INCLUDE "data/mapObjects/school.asm" INCLUDE "data/mapHeaders/viridianhouse.asm" + db $0 INCLUDE "scripts/viridianhouse.asm" INCLUDE "data/mapObjects/viridianhouse.asm" From b250e788bd343d40014100bcca32299093745e98 Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Mon, 22 Oct 2018 22:17:13 -0400 Subject: [PATCH 15/23] Change Discord link. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a12514a0..af6868d1 100644 --- a/README.md +++ b/README.md @@ -31,5 +31,5 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md). [pokeruby]: https://github.com/pret/pokeruby [pokefirered]: https://github.com/pret/pokefirered [pokeemerald]: https://github.com/pret/pokeemerald -[Discord]: https://discord.gg/cJxDDVP +[Discord]: https://discord.gg/6EuWgX9 [irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret From c085aa4a2a5529f9c82e97ebe7912dfa509787f3 Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Sun, 18 Nov 2018 17:54:46 -0500 Subject: [PATCH 16/23] Fix spritestatedata macros to be prefixed with w. --- scripts/pewterpokecenter.asm | 4 +- wram.asm | 78 +++++++++++++++++------------------- 2 files changed, 38 insertions(+), 44 deletions(-) diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm index 5de1e6b7..4dd63559 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/pewterpokecenter.asm @@ -29,7 +29,7 @@ PewterJigglypuffText: ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections call CopyData - ld a, [Sprite03SpriteImageIdx] + ld a, [wSprite03StateData1ImageIndex] ld hl, wJigglypuffFacingDirections .findMatchingFacingDirectionLoop cp [hl] @@ -43,7 +43,7 @@ PewterJigglypuffText: pop hl .loop ld a, [hl] - ld [Sprite03SpriteImageIdx], a + ld [wSprite03StateData1ImageIndex], a ; rotate the array push hl diff --git a/wram.asm b/wram.asm index 0091ce43..83dfdee9 100755 --- a/wram.asm +++ b/wram.asm @@ -230,10 +230,9 @@ wSpriteStateData1:: ; c100 ; C1xE ; C1xF spritestatedata1: MACRO -\1SpriteStateData1:: \1PictureID:: db \1MovementStatus:: db -\1SpriteImageIdx:: db +\1ImageIndex:: db \1YStepVector:: db \1YPixels:: db \1XStepVector:: db @@ -242,29 +241,25 @@ spritestatedata1: MACRO \1AnimFrameCounter:: db \1FacingDirection:: db ds 6 -\1SpriteStateData1End:: +\1End:: endm - spritestatedata1 Player - spritestatedata1 Sprite01 - spritestatedata1 Sprite02 - spritestatedata1 Sprite03 - spritestatedata1 Sprite04 - spritestatedata1 Sprite05 - spritestatedata1 Sprite06 - spritestatedata1 Sprite07 - spritestatedata1 Sprite08 - spritestatedata1 Sprite09 - spritestatedata1 Sprite10 - spritestatedata1 Sprite11 - spritestatedata1 Sprite12 - spritestatedata1 Sprite13 - spritestatedata1 Sprite14 - spritestatedata1 Sprite15 - ; ds $10 * $10 - - -;SECTION "Sprite State Data 2", WRAM0[$c200] +wSpritePlayerStateData1:: spritestatedata1 wSpritePlayerStateData1 +wSprite01StateData1:: spritestatedata1 wSprite01StateData1 +wSprite02StateData1:: spritestatedata1 wSprite02StateData1 +wSprite03StateData1:: spritestatedata1 wSprite03StateData1 +wSprite04StateData1:: spritestatedata1 wSprite04StateData1 +wSprite05StateData1:: spritestatedata1 wSprite05StateData1 +wSprite06StateData1:: spritestatedata1 wSprite06StateData1 +wSprite07StateData1:: spritestatedata1 wSprite07StateData1 +wSprite08StateData1:: spritestatedata1 wSprite08StateData1 +wSprite09StateData1:: spritestatedata1 wSprite09StateData1 +wSprite10StateData1:: spritestatedata1 wSprite10StateData1 +wSprite11StateData1:: spritestatedata1 wSprite11StateData1 +wSprite12StateData1:: spritestatedata1 wSprite12StateData1 +wSprite13StateData1:: spritestatedata1 wSprite13StateData1 +wSprite14StateData1:: spritestatedata1 wSprite14StateData1 +wSprite15StateData1:: spritestatedata1 wSprite15StateData1 wSpriteStateData2:: ; c200 ; more data for all sprites on the current map @@ -287,7 +282,6 @@ wSpriteStateData2:: ; c200 ; C2xE: sprite image base offset (in video ram, player always has value 1, used to compute c1x2) ; C2xF spritestatedata2: MACRO -\1SpriteStateData2:: \1WalkAnimationCounter:: db ds 1 \1YDisplacement:: db @@ -300,26 +294,26 @@ spritestatedata2: MACRO ds 5 \1SpriteImageBaseOffset:: db ds 1 -\1SpriteStateData2End:: +\1End:: endm - spritestatedata2 Player - spritestatedata2 Sprite01 - spritestatedata2 Sprite02 - spritestatedata2 Sprite03 - spritestatedata2 Sprite04 - spritestatedata2 Sprite05 - spritestatedata2 Sprite06 - spritestatedata2 Sprite07 - spritestatedata2 Sprite08 - spritestatedata2 Sprite09 - spritestatedata2 Sprite10 - spritestatedata2 Sprite11 - spritestatedata2 Sprite12 - spritestatedata2 Sprite13 - spritestatedata2 Sprite14 - spritestatedata2 Sprite15 - ; ds $10 * $10 +wSpritePlayerStateData2:: spritestatedata2 wSpritePlayerStateData2 +wSprite01StateData2:: spritestatedata2 wSprite01StateData2 +wSprite02StateData2:: spritestatedata2 wSprite02StateData2 +wSprite03StateData2:: spritestatedata2 wSprite03StateData2 +wSprite04StateData2:: spritestatedata2 wSprite04StateData2 +wSprite05StateData2:: spritestatedata2 wSprite05StateData2 +wSprite06StateData2:: spritestatedata2 wSprite06StateData2 +wSprite07StateData2:: spritestatedata2 wSprite07StateData2 +wSprite08StateData2:: spritestatedata2 wSprite08StateData2 +wSprite09StateData2:: spritestatedata2 wSprite09StateData2 +wSprite10StateData2:: spritestatedata2 wSprite10StateData2 +wSprite11StateData2:: spritestatedata2 wSprite11StateData2 +wSprite12StateData2:: spritestatedata2 wSprite12StateData2 +wSprite13StateData2:: spritestatedata2 wSprite13StateData2 +wSprite14StateData2:: spritestatedata2 wSprite14StateData2 +wSprite15StateData2:: spritestatedata2 wSprite15StateData2 + wSpriteDataEnd:: From dcaca64f5e4ab1e39a9004585c9223173611eaf2 Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Sun, 18 Nov 2018 18:29:24 -0500 Subject: [PATCH 17/23] Clean up pre-linkerscript remnants. --- audio.asm | 34 +++---- engine/intro.asm | 4 +- home.asm | 30 +++--- main.asm | 72 +++++++------- pokered.link | 246 +++++++++++++++++++++++++++++++++-------------- sram.asm | 8 +- text.asm | 26 ++--- wram.asm | 8 +- 8 files changed, 263 insertions(+), 165 deletions(-) diff --git a/audio.asm b/audio.asm index 8bc175fa..be1e4bb9 100644 --- a/audio.asm +++ b/audio.asm @@ -1,34 +1,30 @@ -AUDIO_1 EQU $2 -AUDIO_2 EQU $8 -AUDIO_3 EQU $1f - INCLUDE "constants.asm" -SECTION "Sound Effect Headers 1", ROMX, BANK[AUDIO_1] +SECTION "Sound Effect Headers 1", ROMX ; BANK $02 INCLUDE "audio/headers/sfxheaders1.asm" -SECTION "Sound Effect Headers 2", ROMX, BANK[AUDIO_2] +SECTION "Sound Effect Headers 2", ROMX ; BANK $08 INCLUDE "audio/headers/sfxheaders2.asm" -SECTION "Sound Effect Headers 3", ROMX, BANK[AUDIO_3] +SECTION "Sound Effect Headers 3", ROMX ; BANK $1f INCLUDE "audio/headers/sfxheaders3.asm" -SECTION "Music Headers 1", ROMX, BANK[AUDIO_1] +SECTION "Music Headers 1", ROMX ; BANK $02 INCLUDE "audio/headers/musicheaders1.asm" -SECTION "Music Headers 2", ROMX, BANK[AUDIO_2] +SECTION "Music Headers 2", ROMX ; BANK $08 INCLUDE "audio/headers/musicheaders2.asm" -SECTION "Music Headers 3", ROMX, BANK[AUDIO_3] +SECTION "Music Headers 3", ROMX ; BANK $1f INCLUDE "audio/headers/musicheaders3.asm" -SECTION "Sound Effects 1", ROMX, BANK[AUDIO_1] +SECTION "Sound Effects 1", ROMX ; BANK $02 INCLUDE "audio/sfx/snare1_1.asm" INCLUDE "audio/sfx/snare2_1.asm" @@ -127,7 +123,7 @@ INCLUDE "audio/sfx/cry21_1.asm" INCLUDE "audio/sfx/cry22_1.asm" -SECTION "Sound Effects 2", ROMX, BANK[AUDIO_2] +SECTION "Sound Effects 2", ROMX ; BANK $08 INCLUDE "audio/sfx/snare1_2.asm" INCLUDE "audio/sfx/snare2_2.asm" @@ -252,7 +248,7 @@ INCLUDE "audio/sfx/cry21_2.asm" INCLUDE "audio/sfx/cry22_2.asm" -SECTION "Sound Effects 3", ROMX, BANK[AUDIO_3] +SECTION "Sound Effects 3", ROMX ; BANK $1f INCLUDE "audio/sfx/snare1_3.asm" INCLUDE "audio/sfx/snare2_3.asm" @@ -360,7 +356,7 @@ INCLUDE "audio/sfx/cry22_3.asm" -SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1] +SECTION "Audio Engine 1", ROMX ; BANK $02 PlayBattleMusic:: xor a @@ -453,7 +449,7 @@ Music_Cities1AlternateTempo:: jp Audio1_OverwriteChannelPointer -SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2] +SECTION "Audio Engine 2", ROMX ; BANK $08 Music_DoLowHealthAlarm:: ld a, [wLowHealthAlarm] @@ -557,7 +553,7 @@ Audio2_OverwriteChannelPointer: ret -SECTION "Audio Engine 3", ROMX, BANK[AUDIO_3] +SECTION "Audio Engine 3", ROMX ; BANK $1f PlayPokedexRatingSfx:: ld a, [$ffdc] @@ -601,7 +597,7 @@ INCLUDE "audio/engine_3.asm" -SECTION "Music 1", ROMX, BANK[AUDIO_1] +SECTION "Music 1", ROMX ; BANK $02 INCLUDE "audio/music/pkmnhealed.asm" INCLUDE "audio/music/routes1.asm" @@ -630,7 +626,7 @@ INCLUDE "audio/music/gym.asm" INCLUDE "audio/music/pokecenter.asm" -SECTION "Music 2", ROMX, BANK[AUDIO_2] +SECTION "Music 2", ROMX ; BANK $08 INCLUDE "audio/sfx/pokeflute_ch4_ch5.asm" INCLUDE "audio/sfx/unused2_2.asm" @@ -646,7 +642,7 @@ INCLUDE "audio/music/defeatedwildmon.asm" INCLUDE "audio/music/defeatedgymleader.asm" -SECTION "Music 3", ROMX, BANK[AUDIO_3] +SECTION "Music 3", ROMX ; BANK $1f INCLUDE "audio/music/bikeriding.asm" INCLUDE "audio/music/dungeon1.asm" diff --git a/engine/intro.asm b/engine/intro.asm index 4acab5a6..a016b365 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -440,7 +440,9 @@ IntroNidorinoAnimation7: GameFreakIntro: INCBIN "gfx/gamefreak_intro.2bpp" INCBIN "gfx/gamefreak_logo.2bpp" - ds $10 ; blank tile + rept 16 + db $00 ; blank tile + endr GameFreakIntroEnd: FightIntroBackMon: diff --git a/home.asm b/home.asm index 18580a93..5b8aaf6c 100644 --- a/home.asm +++ b/home.asm @@ -1,32 +1,32 @@ ; The rst vectors are unused. -SECTION "rst 00", ROM0 [$00] +SECTION "rst 00", ROM0 rst $38 -SECTION "rst 08", ROM0 [$08] +SECTION "rst 08", ROM0 rst $38 -SECTION "rst 10", ROM0 [$10] +SECTION "rst 10", ROM0 rst $38 -SECTION "rst 18", ROM0 [$18] +SECTION "rst 18", ROM0 rst $38 -SECTION "rst 20", ROM0 [$20] +SECTION "rst 20", ROM0 rst $38 -SECTION "rst 28", ROM0 [$28] +SECTION "rst 28", ROM0 rst $38 -SECTION "rst 30", ROM0 [$30] +SECTION "rst 30", ROM0 rst $38 -SECTION "rst 38", ROM0 [$38] +SECTION "rst 38", ROM0 rst $38 ; Hardware interrupts -SECTION "vblank", ROM0 [$40] +SECTION "vblank", ROM0 jp VBlank -SECTION "hblank", ROM0 [$48] +SECTION "hblank", ROM0 rst $38 -SECTION "timer", ROM0 [$50] +SECTION "timer", ROM0 jp Timer -SECTION "serial", ROM0 [$58] +SECTION "serial", ROM0 jp Serial -SECTION "joypad", ROM0 [$60] +SECTION "joypad", ROM0 reti @@ -84,13 +84,13 @@ INCLUDE "home/copy.asm" -SECTION "Entry", ROM0 [$100] +SECTION "Entry", ROM0 nop jp Start -SECTION "Header", ROM0 [$104] +SECTION "Header", ROM0 ; The header is generated by rgbfix. ; The space here is allocated to prevent code from being overwritten. diff --git a/main.asm b/main.asm index 72cd7210..73ab724f 100755 --- a/main.asm +++ b/main.asm @@ -14,7 +14,7 @@ PICS_5 EQU $D INCLUDE "home.asm" -SECTION "bank1",ROMX,BANK[$1] +SECTION "bank1", ROMX INCLUDE "data/facing.asm" @@ -86,7 +86,7 @@ INCLUDE "engine/remove_pokemon.asm" INCLUDE "engine/display_pokedex.asm" -SECTION "bank3",ROMX,BANK[$3] +SECTION "bank3", ROMX INCLUDE "engine/joypad.asm" @@ -127,7 +127,7 @@ INCLUDE "engine/pathfinding.asm" INCLUDE "engine/hp_bar.asm" INCLUDE "engine/hidden_object_functions3.asm" -SECTION "NPC Sprites 1", ROMX, BANK[NPC_SPRITES_1] +SECTION "NPC Sprites 1", ROMX ; BANK $04 OakAideSprite: INCBIN "gfx/sprites/oak_aide.2bpp" RockerSprite: INCBIN "gfx/sprites/rocker.2bpp" @@ -158,7 +158,7 @@ OldAmberSprite: INCBIN "gfx/sprites/old_amber.2bpp" LyingOldManSprite: INCBIN "gfx/sprites/lying_old_man.2bpp" -SECTION "Graphics", ROMX, BANK[GFX] +SECTION "Graphics (BANK 4)", ROMX PokemonLogoGraphics: INCBIN "gfx/pokemon_logo.2bpp" FontGraphics: INCBIN "gfx/font.1bpp" @@ -184,7 +184,7 @@ PlayerCharacterTitleGraphics: INCBIN "gfx/player_title.2bpp" PlayerCharacterTitleGraphicsEnd: -SECTION "Battle (bank 4)", ROMX, BANK[$4] +SECTION "Battle (BANK 4)", ROMX INCLUDE "engine/overworld/is_player_just_outside_map.asm" INCLUDE "engine/menu/status_screen.asm" @@ -206,7 +206,7 @@ INCLUDE "engine/battle/get_trainer_name.asm" INCLUDE "engine/random.asm" -SECTION "NPC Sprites 2", ROMX, BANK[NPC_SPRITES_2] +SECTION "NPC Sprites 2", ROMX ; BANK $05 RedCyclingSprite: INCBIN "gfx/sprites/cycling.2bpp" RedSprite: INCBIN "gfx/sprites/red.2bpp" @@ -250,7 +250,7 @@ LoreleiSprite: INCBIN "gfx/sprites/lorelei.2bpp" SeelSprite: INCBIN "gfx/sprites/seel.2bpp" -SECTION "Battle (bank 5)", ROMX, BANK[$5] +SECTION "Battle (BANK 5)", ROMX INCLUDE "engine/load_pokedex_tiles.asm" INCLUDE "engine/overworld/map_sprites.asm" @@ -260,7 +260,7 @@ INCLUDE "engine/battle/moveEffects/substitute_effect.asm" INCLUDE "engine/menu/pc.asm" -SECTION "bank6",ROMX,BANK[$6] +SECTION "bank6", ROMX INCLUDE "data/mapHeaders/celadoncity.asm" INCLUDE "data/mapObjects/celadoncity.asm" @@ -336,7 +336,7 @@ INCLUDE "engine/overworld/doors.asm" INCLUDE "engine/overworld/ledges.asm" -SECTION "bank7",ROMX,BANK[$7] +SECTION "bank7", ROMX INCLUDE "data/mapHeaders/cinnabarisland.asm" INCLUDE "data/mapObjects/cinnabarisland.asm" @@ -518,7 +518,7 @@ INCLUDE "engine/menu/oaks_pc.asm" INCLUDE "engine/hidden_object_functions7.asm" -SECTION "Pics 1", ROMX, BANK[PICS_1] +SECTION "Pics 1", ROMX ; BANK $09 RhydonPicFront:: INCBIN "pic/bmon/rhydon.pic" RhydonPicBack:: INCBIN "pic/monback/rhydonb.pic" @@ -580,13 +580,13 @@ TangelaPicFront:: INCBIN "pic/bmon/tangela.pic" TangelaPicBack:: INCBIN "pic/monback/tangelab.pic" -SECTION "Battle (bank 9)", ROMX, BANK[$9] +SECTION "Battle (BANK 9)", ROMX INCLUDE "engine/battle/print_type.asm" INCLUDE "engine/battle/save_trainer_name.asm" INCLUDE "engine/battle/moveEffects/focus_energy_effect.asm" -SECTION "Pics 2", ROMX, BANK[PICS_2] +SECTION "Pics 2", ROMX ; BANK $0A GrowlithePicFront:: INCBIN "pic/bmon/growlithe.pic" GrowlithePicBack:: INCBIN "pic/monback/growlitheb.pic" @@ -654,11 +654,11 @@ MoltresPicFront:: INCBIN "pic/bmon/moltres.pic" MoltresPicBack:: INCBIN "pic/monback/moltresb.pic" -SECTION "Battle (bank A)", ROMX, BANK[$A] +SECTION "Battle (BANK A)", ROMX INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm" -SECTION "Pics 3", ROMX, BANK[PICS_3] +SECTION "Pics 3", ROMX ; BANK $0B ArticunoPicFront:: INCBIN "pic/bmon/articuno.pic" ArticunoPicBack:: INCBIN "pic/monback/articunob.pic" @@ -732,7 +732,7 @@ BeedrillPicBack:: INCBIN "pic/monback/beedrillb.pic" FossilKabutopsPic:: INCBIN "pic/bmon/fossilkabutops.pic" -SECTION "Battle (bank B)", ROMX, BANK[$B] +SECTION "Battle (BANK B)", ROMX INCLUDE "engine/battle/display_effectiveness.asm" @@ -748,7 +748,7 @@ INCLUDE "engine/battle/moveEffects/pay_day_effect.asm" INCLUDE "engine/game_corner_slots2.asm" -SECTION "Pics 4", ROMX, BANK[PICS_4] +SECTION "Pics 4", ROMX ; BANK $0C DodrioPicFront:: INCBIN "pic/bmon/dodrio.pic" DodrioPicBack:: INCBIN "pic/monback/dodriob.pic" @@ -813,12 +813,12 @@ RedPicBack:: INCBIN "pic/trainer/redb.pic" OldManPic:: INCBIN "pic/trainer/oldman.pic" -SECTION "Battle (bank C)", ROMX, BANK[$C] +SECTION "Battle (BANK C)", ROMX INCLUDE "engine/battle/moveEffects/mist_effect.asm" INCLUDE "engine/battle/moveEffects/one_hit_ko_effect.asm" -SECTION "Pics 5", ROMX, BANK[PICS_5] +SECTION "Pics 5", ROMX ; BANK $0D BulbasaurPicFront:: INCBIN "pic/bmon/bulbasaur.pic" BulbasaurPicBack:: INCBIN "pic/monback/bulbasaurb.pic" @@ -876,7 +876,7 @@ VictreebelPicFront:: INCBIN "pic/bmon/victreebel.pic" VictreebelPicBack:: INCBIN "pic/monback/victreebelb.pic" -SECTION "Battle (bank D)", ROMX, BANK[$D] +SECTION "Battle (BANK D)", ROMX INCLUDE "engine/titlescreen2.asm" INCLUDE "engine/battle/link_battle_versus_text.asm" @@ -886,7 +886,7 @@ INCLUDE "engine/multiply_divide.asm" INCLUDE "engine/game_corner_slots.asm" -SECTION "bankE",ROMX,BANK[$E] +SECTION "bankE", ROMX INCLUDE "data/moves.asm" BaseStats: INCLUDE "data/base_stats.asm" @@ -911,12 +911,12 @@ INCLUDE "engine/battle/moveEffects/transform_effect.asm" INCLUDE "engine/battle/moveEffects/reflect_light_screen_effect.asm" -SECTION "bankF",ROMX,BANK[$F] +SECTION "bankF", ROMX INCLUDE "engine/battle/core.asm" -SECTION "bank10",ROMX,BANK[$10] +SECTION "bank10", ROMX INCLUDE "engine/menu/pokedex.asm" INCLUDE "engine/trade.asm" @@ -924,7 +924,7 @@ INCLUDE "engine/intro.asm" INCLUDE "engine/trade2.asm" -SECTION "bank11",ROMX,BANK[$11] +SECTION "bank11", ROMX INCLUDE "data/mapHeaders/lavendertown.asm" INCLUDE "data/mapObjects/lavendertown.asm" @@ -1069,7 +1069,7 @@ SeafoamIslands5Blocks: INCBIN "maps/seafoamislands5.blk" INCLUDE "engine/overworld/hidden_objects.asm" -SECTION "bank12",ROMX,BANK[$12] +SECTION "bank12", ROMX INCLUDE "data/mapHeaders/route7.asm" INCLUDE "data/mapObjects/route7.asm" @@ -1248,7 +1248,7 @@ INCLUDE "data/mapObjects/safarizonesecrethouse.asm" SafariZoneSecretHouseBlocks: INCBIN "maps/safarizonesecrethouse.blk" -SECTION "bank13",ROMX,BANK[$13] +SECTION "bank13", ROMX TrainerPics:: YoungsterPic:: INCBIN "pic/trainer/youngster.pic" @@ -1313,7 +1313,7 @@ INCLUDE "engine/give_pokemon.asm" INCLUDE "engine/predefs.asm" -SECTION "bank14",ROMX,BANK[$14] +SECTION "bank14", ROMX INCLUDE "data/mapHeaders/route22.asm" INCLUDE "data/mapObjects/route22.asm" @@ -1391,7 +1391,7 @@ INCLUDE "engine/menu/prize_menu.asm" INCLUDE "engine/hidden_object_functions14.asm" -SECTION "bank15",ROMX,BANK[$15] +SECTION "bank15", ROMX INCLUDE "data/mapHeaders/route2.asm" INCLUDE "data/mapObjects/route2.asm" @@ -1483,7 +1483,7 @@ INCLUDE "engine/menu/diploma.asm" INCLUDE "engine/overworld/trainers.asm" -SECTION "bank16",ROMX,BANK[$16] +SECTION "bank16", ROMX INCLUDE "data/mapHeaders/route6.asm" INCLUDE "data/mapObjects/route6.asm" @@ -1567,7 +1567,7 @@ HallofFameRoomBlocks: INCBIN "maps/halloffameroom.blk" INCLUDE "engine/overworld/saffron_guards.asm" -SECTION "bank17",ROMX,BANK[$17] +SECTION "bank17", ROMX SaffronMartBlocks: LavenderMartBlocks: @@ -1723,7 +1723,7 @@ INCLUDE "engine/predefs17_2.asm" INCLUDE "engine/hidden_object_functions17.asm" -SECTION "bank18",ROMX,BANK[$18] +SECTION "bank18", ROMX ViridianForestBlocks: INCBIN "maps/viridianforest.blk" UndergroundPathNSBlocks: INCBIN "maps/undergroundpathns.blk" @@ -1846,7 +1846,7 @@ SilphCo11Blocks: INCBIN "maps/silphco11.blk" INCLUDE "engine/hidden_object_functions18.asm" -SECTION "bank19",ROMX,BANK[$19] +SECTION "bank19", ROMX Overworld_GFX: INCBIN "gfx/tilesets/overworld.2bpp" Overworld_Block: INCBIN "gfx/blocksets/overworld.bst" @@ -1869,7 +1869,7 @@ Plateau_GFX: INCBIN "gfx/tilesets/plateau.2bpp" Plateau_Block: INCBIN "gfx/blocksets/plateau.bst" -SECTION "bank1A",ROMX,BANK[$1A] +SECTION "bank1A", ROMX INCLUDE "engine/battle/decrement_pp.asm" @@ -1905,7 +1905,7 @@ Facility_GFX: INCBIN "gfx/tilesets/facility.2bpp" Facility_Block: INCBIN "gfx/blocksets/facility.bst" -SECTION "bank1B",ROMX,BANK[$1B] +SECTION "bank1B", ROMX Cemetery_GFX: INCBIN "gfx/tilesets/cemetery.2bpp" Cemetery_Block: INCBIN "gfx/blocksets/cemetery.bst" @@ -1923,7 +1923,7 @@ Underground_GFX: INCBIN "gfx/tilesets/underground.2bpp" Underground_Block: INCBIN "gfx/blocksets/underground.bst" -SECTION "bank1C",ROMX,BANK[$1C] +SECTION "bank1C", ROMX INCLUDE "engine/gamefreak.asm" INCLUDE "engine/hall_of_fame.asm" @@ -1938,7 +1938,7 @@ INCLUDE "engine/palettes.asm" INCLUDE "engine/save.asm" -SECTION "bank1D",ROMX,BANK[$1D] +SECTION "bank1D", ROMX CopycatsHouse1FBlocks: INCBIN "maps/copycatshouse1f.blk" @@ -2070,7 +2070,7 @@ INCLUDE "engine/menu/league_pc.asm" INCLUDE "engine/overworld/hidden_items.asm" -SECTION "bank1E",ROMX,BANK[$1E] +SECTION "bank1E", ROMX INCLUDE "engine/battle/animations.asm" diff --git a/pokered.link b/pokered.link index e070684d..2c110d4c 100644 --- a/pokered.link +++ b/pokered.link @@ -1,173 +1,273 @@ ROM0 - ORG $61 - "Home" - ORG $150 - "Main" + org $0000 + "rst 00" + + org $0008 + "rst 08" + + org $0010 + "rst 10" + + org $0018 + "rst 18" + + org $0020 + "rst 20" + + org $0028 + "rst 28" + + org $0030 + "rst 30" + + org $0038 + "rst 38" + + org $0040 + "vblank" + + org $0048 + "hblank" + + org $0050 + "timer" + + org $0058 + "serial" + + org $0060 + "joypad" + ; $0061 + "Home" + + org $100 + "Entry" + ; $0104 + "Header" + + org $150 + "Main" ROMX $1 - "bank1" + org $4000 + "bank1" ROMX $2 - "Sound Effect Headers 1" ; AUDIO_1 - "Music Headers 1" - "Sound Effects 1" - "Audio Engine 1" - "Music 1" + org $4000 + "Sound Effect Headers 1" ; AUDIO_1 + "Music Headers 1" + "Sound Effects 1" + "Audio Engine 1" + "Music 1" ROMX $3 - "bank3" + org $4000 + "bank3" ROMX $4 - "NPC Sprites 1" ; NPC_SPRITES_1 - "Graphics" ; GFX - "Battle (bank 4)" + org $4000 + "NPC Sprites 1" ; NPC_SPRITES_1 + "Graphics (BANK 4)" ; GFX + "Battle (BANK 4)" ROMX $5 - "NPC Sprites 2" ; NPC_SPRITES_2 - "Battle (bank 5)" + org $4000 + "NPC Sprites 2" ; NPC_SPRITES_2 + "Battle (BANK 5)" ROMX $6 - "bank6" + org $4000 + "bank6" ROMX $7 - "bank7" + org $4000 + "bank7" ROMX $8 - "Sound Effect Headers 2" ; AUDIO_2 - "Music Headers 2" - "Sound Effects 2" - "Audio Engine 2" - "Music 2" + org $4000 + "Sound Effect Headers 2" ; AUDIO_2 + "Music Headers 2" + "Sound Effects 2" + "Audio Engine 2" + "Music 2" ROMX $9 - "Pics 1" ; PICS_1 - "Battle (bank 9)" + org $4000 + "Pics 1" ; PICS_1 + "Battle (BANK 9)" ROMX $A - "Pics 2" ; PICS_2 - "Battle (bank A)" + org $4000 + "Pics 2" ; PICS_2 + "Battle (BANK A)" ROMX $B - "Pics 3" ; PICS_3 - "Battle (bank B)" + org $4000 + "Pics 3" ; PICS_3 + "Battle (BANK B)" ROMX $C - "Pics 4" ; PICS_4 - "Battle (bank C)" + org $4000 + "Pics 4" ; PICS_4 + "Battle (BANK C)" ROMX $D - "Pics 5" ; PICS_5 - "Battle (bank D)" + org $4000 + "Pics 5" ; PICS_5 + "Battle (BANK D)" ROMX $E - "bankE" + org $4000 + "bankE" ROMX $F - "bankF" + org $4000 + "bankF" ROMX $10 - "bank10" + org $4000 + "bank10" ROMX $11 - "bank11" + org $4000 + "bank11" ROMX $12 - "bank12" + org $4000 + "bank12" ROMX $13 - "bank13" + org $4000 + "bank13" ROMX $14 - "bank14" + org $4000 + "bank14" ROMX $15 - "bank15" + org $4000 + "bank15" ROMX $16 - "bank16" + org $4000 + "bank16" ROMX $17 - "bank17" + org $4000 + "bank17" ROMX $18 - "bank18" + org $4000 + "bank18" ROMX $19 - "bank19" + org $4000 + "bank19" ROMX $1A - "bank1A" + org $4000 + "bank1A" ROMX $1B - "bank1B" + org $4000 + "bank1B" ROMX $1C - "bank1C" + org $4000 + "bank1C" ROMX $1D - "bank1D" + org $4000 + "bank1D" ROMX $1E - "bank1E" + org $4000 + "bank1E" ROMX $1F - "Sound Effect Headers 3" ; AUDIO_3 - "Music Headers 3" - "Sound Effects 3" - "Audio Engine 3" - "Music 3" + org $4000 + "Sound Effect Headers 3" ; AUDIO_3 + "Music Headers 3" + "Sound Effects 3" + "Audio Engine 3" + "Music 3" ROMX $20 - "Text 1" ; TEXT_1 + org $4000 + "Text 1" ; TEXT_1 ROMX $21 - "Text 2" ; TEXT_2 + org $4000 + "Text 2" ; TEXT_2 ROMX $22 - "Text 3" ; TEXT_3 + org $4000 + "Text 3" ; TEXT_3 ROMX $23 - "Text 4" ; TEXT_4 + org $4000 + "Text 4" ; TEXT_4 ROMX $24 - "Text 5" ; TEXT_5 + org $4000 + "Text 5" ; TEXT_5 ROMX $25 - "Text 6" ; TEXT_6 + org $4000 + "Text 6" ; TEXT_6 ROMX $26 - "Text 7" ; TEXT_7 + org $4000 + "Text 7" ; TEXT_7 ROMX $27 - "Text 8" ; TEXT_8 + org $4000 + "Text 8" ; TEXT_8 ROMX $28 - "Text 9" ; TEXT_9 + org $4000 + "Text 9" ; TEXT_9 ROMX $29 - "Text 10" ; TEXT_10 + org $4000 + "Text 10" ; TEXT_10 ROMX $2A - "Text 11" ; TEXT_11 + org $4000 + "Text 11" ; TEXT_11 ROMX $2B - "Pokedex Text" ; POKEDEX_TEXT + org $4000 + "Pokedex Text" ; POKEDEX_TEXT ROMX $2C - "Move Names" ; MOVE_NAMES + org $4000 + "Move Names" ; MOVE_NAMES WRAM0 - "WRAM Bank 0" + org $c000 + "WRAM Bank 0" + + org $c100 + "Sprite State Data" + "OAM Buffer" + + org $dfff + "Stack" SRAM 0 - "Sprite Buffers" + org $a000 + "Sprite Buffers" SRAM 1 - "Save Data" + org $a000 + "Save Data" SRAM 2 - "Saved Boxes 1" + org $a000 + "Saved Boxes 1" SRAM 3 - "Saved Boxes 2" + org $a000 + "Saved Boxes 2" diff --git a/sram.asm b/sram.asm index 3e7b3e16..966ccba3 100644 --- a/sram.asm +++ b/sram.asm @@ -1,4 +1,4 @@ -SECTION "Sprite Buffers", SRAM, BANK[0] +SECTION "Sprite Buffers", SRAM ; BANK 0 sSpriteBuffer0:: ds SPRITEBUFFERSIZE ; a000 sSpriteBuffer1:: ds SPRITEBUFFERSIZE ; a188 @@ -9,7 +9,7 @@ sSpriteBuffer2:: ds SPRITEBUFFERSIZE ; a310 sHallOfFame:: ds HOF_TEAM * HOF_TEAM_CAPACITY ; a598 -SECTION "Save Data", SRAM, BANK[1] +SECTION "Save Data", SRAM ; BANK 1 ds $598 sPlayerName:: ds NAME_LENGTH ; a598 @@ -21,7 +21,7 @@ sTilesetType:: ds 1 ; b522 sMainDataCheckSum:: ds 1 ; b523 -SECTION "Saved Boxes 1", SRAM, BANK[2] +SECTION "Saved Boxes 1", SRAM ; BANK 2 sBox1:: ds wBoxDataEnd - wBoxDataStart ; a000 sBox2:: ds wBoxDataEnd - wBoxDataStart ; a462 @@ -33,7 +33,7 @@ sBank2AllBoxesChecksum:: ds 1 ; ba4c sBank2IndividualBoxChecksums:: ds 6 ; ba4d -SECTION "Saved Boxes 2", SRAM, BANK[3] +SECTION "Saved Boxes 2", SRAM ; BANK 3 sBox7:: ds wBoxDataEnd - wBoxDataStart ; a000 sBox8:: ds wBoxDataEnd - wBoxDataStart ; a462 diff --git a/text.asm b/text.asm index fc075e19..51355e33 100644 --- a/text.asm +++ b/text.asm @@ -19,7 +19,7 @@ INCLUDE "macros.asm" INCLUDE "hram.asm" -SECTION "Text 1", ROMX, BANK[TEXT_1] +SECTION "Text 1", ROMX ; BANK $20 _CardKeySuccessText1:: text "Bingo!@@" @@ -192,7 +192,7 @@ INCLUDE "text/maps/silph_co_4f.asm" INCLUDE "text/maps/silph_co_5f_1.asm" -SECTION "Text 2", ROMX, BANK[TEXT_2] +SECTION "Text 2", ROMX ; BANK $21 INCLUDE "text/maps/silph_co_5f_2.asm" INCLUDE "text/maps/silph_co_6f.asm" @@ -224,7 +224,7 @@ INCLUDE "text/maps/agatha.asm" INCLUDE "text/maps/rock_tunnel_b2f_1.asm" -SECTION "Text 3", ROMX, BANK[TEXT_3] +SECTION "Text 3", ROMX ; BANK $22 INCLUDE "text/maps/rock_tunnel_b2f_2.asm" INCLUDE "text/maps/seafoam_islands_b4f.asm" @@ -1939,7 +1939,7 @@ INCLUDE "text/maps/saffron_gates.asm" INCLUDE "text/maps/daycare_1.asm" -SECTION "Text 4", ROMX, BANK[TEXT_4] +SECTION "Text 4", ROMX ; BANK $23 INCLUDE "text/maps/daycare_2.asm" INCLUDE "text/maps/underground_path_route_6_entrance.asm" @@ -1978,7 +1978,7 @@ INCLUDE "text/maps/route_10.asm" INCLUDE "text/maps/route_11_1.asm" -SECTION "Text 5", ROMX, BANK[TEXT_5] +SECTION "Text 5", ROMX ; BANK $24 INCLUDE "text/maps/route_11_2.asm" INCLUDE "text/maps/route_12.asm" @@ -1996,7 +1996,7 @@ INCLUDE "text/maps/route_23.asm" INCLUDE "text/maps/route_24_1.asm" -SECTION "Text 6", ROMX, BANK[TEXT_6] +SECTION "Text 6", ROMX ; BANK $25 INCLUDE "text/maps/route_24_2.asm" INCLUDE "text/maps/route_25.asm" @@ -2339,7 +2339,7 @@ INCLUDE "text/maps/museum_2f.asm" INCLUDE "text/maps/pewter_gym_1.asm" -SECTION "Text 7", ROMX, BANK[TEXT_7] +SECTION "Text 7", ROMX ; BANK $26 INCLUDE "text/maps/pewter_gym_2.asm" INCLUDE "text/maps/pewter_house_1.asm" @@ -2371,7 +2371,7 @@ INCLUDE "text/maps/vermilion_mart.asm" INCLUDE "text/maps/vermilion_gym_1.asm" -SECTION "Text 8", ROMX, BANK[TEXT_8] +SECTION "Text 8", ROMX ; BANK $27 INCLUDE "text/maps/vermilion_gym_2.asm" INCLUDE "text/maps/vermilion_house.asm" @@ -2403,7 +2403,7 @@ INCLUDE "text/maps/safari_zone_entrance.asm" INCLUDE "text/maps/fuchsia_gym_1.asm" -SECTION "Text 9", ROMX, BANK[TEXT_9] +SECTION "Text 9", ROMX ; BANK $28 INCLUDE "text/maps/fuchsia_gym_2.asm" INCLUDE "text/maps/fuchsia_meeting_room.asm" @@ -2646,7 +2646,7 @@ _CableClubNPCLinkClosedBecauseOfInactivityText:: done -SECTION "Text 10", ROMX, BANK[TEXT_10] +SECTION "Text 10", ROMX ; BANK $29 _CableClubNPCPleaseComeAgainText:: text "Please come again!" @@ -2992,7 +2992,7 @@ _BoxFullCannotThrowBallText:: prompt -SECTION "Text 11", ROMX, BANK[TEXT_11] +SECTION "Text 11", ROMX ; BANK $2a _ItemUseText001:: text " used@@" @@ -3192,11 +3192,11 @@ _UsedCutText:: prompt -SECTION "Pokedex Text", ROMX, BANK[POKEDEX_TEXT] +SECTION "Pokedex Text", ROMX ; BANK $2b INCLUDE "text/pokedex.asm" -SECTION "Move Names", ROMX, BANK[MOVE_NAMES] +SECTION "Move Names", ROMX ; BANK $2c INCLUDE "text/move_names.asm" diff --git a/wram.asm b/wram.asm index 83dfdee9..e37b36a3 100755 --- a/wram.asm +++ b/wram.asm @@ -205,7 +205,7 @@ wTempoModifier:: ; c0f2 ds 13 -SECTION "Sprite State Data", WRAM0[$c100] +SECTION "Sprite State Data", WRAM0 wSpriteDataStart:: @@ -318,7 +318,7 @@ wSprite15StateData2:: spritestatedata2 wSprite15StateData2 wSpriteDataEnd:: -SECTION "OAM Buffer", WRAM0[$c300] +SECTION "OAM Buffer", WRAM0 wOAMBuffer:: ; c300 ; buffer for OAM data. Copied to OAM by DMA @@ -3197,9 +3197,9 @@ wBoxMonNicksEnd:: ; dee2 wBoxDataEnd:: +; dee2 -SECTION "Stack", WRAM0[$df00] - ds $ff +SECTION "Stack", WRAM0 wStack:: ; dfff From c43bd68f01b794f61025ac2e63c9e043634ffdc8 Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Sun, 18 Nov 2018 19:23:56 -0500 Subject: [PATCH 18/23] SpriteImageBaseOffset -> ImageBaseOffset --- wram.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wram.asm b/wram.asm index e37b36a3..b59cfaad 100755 --- a/wram.asm +++ b/wram.asm @@ -292,7 +292,7 @@ spritestatedata2: MACRO \1GrassPriority:: db \1MovementDelay:: db ds 5 -\1SpriteImageBaseOffset:: db +\1ImageBaseOffset:: db ds 1 \1End:: endm From 729608124fa5f479a82dcc3b13fdcedc473fdafa Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 31 Dec 2018 17:37:58 -0500 Subject: [PATCH 19/23] Remove the 'extras' submodule and include a local gfx.py tool instead --- .gitmodules | 3 - extras | 1 - tools/gfx.py | 264 ++++ tools/pokemontools/__init__.py | 1 + tools/pokemontools/gfx.py | 938 +++++++++++ tools/pokemontools/lz.py | 580 +++++++ tools/pokemontools/png.py | 2650 ++++++++++++++++++++++++++++++++ 7 files changed, 4433 insertions(+), 4 deletions(-) delete mode 160000 extras create mode 100644 tools/gfx.py create mode 100644 tools/pokemontools/__init__.py create mode 100644 tools/pokemontools/gfx.py create mode 100644 tools/pokemontools/lz.py create mode 100644 tools/pokemontools/png.py diff --git a/.gitmodules b/.gitmodules index 1f76b537..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "extras"] - path = extras - url = git://github.com/kanzure/pokemon-reverse-engineering-tools.git diff --git a/extras b/extras deleted file mode 160000 index be6d6c9c..00000000 --- a/extras +++ /dev/null @@ -1 +0,0 @@ -Subproject commit be6d6c9ce9a86231482eafacd4be867285809366 diff --git a/tools/gfx.py b/tools/gfx.py new file mode 100644 index 00000000..fae7bbdc --- /dev/null +++ b/tools/gfx.py @@ -0,0 +1,264 @@ +"""Supplementary scripts for graphics conversion.""" + +import os +import argparse + +from pokemontools import gfx, lz + + +# Graphics with inverted tilemaps that aren't covered by filepath_rules. +pics = [ + 'gfx/shrink1', + 'gfx/shrink2', +] + +def recursive_read(filename): + def recurse(filename_): + lines = [] + for line in open(filename_): + if 'include "' in line.lower(): + lines += recurse(line.split('"')[1]) + else: + lines += [line] + return lines + lines = recurse(filename) + return ''.join(lines) + +base_stats = None +def get_base_stats(): + global base_stats + if not base_stats: + base_stats = recursive_read('data/base_stats.asm') + return base_stats + +def get_pokemon_dimensions(path): + try: + byte = bytearray(open(path, 'rb').read())[0] + width = byte & 0xf + height = (byte >> 8) & 0xf + return width, height + except: + return None + + +def get_animation_frames(path=None, w=7, h=7, bitmask_path=None, frame_path=None): + """Retrieve animation frame tilemaps from generated frame/bitmask data.""" + if not path: + path = bitmask_path + if not path: + path = frame_path + if not path: + raise Exception("need at least one of path, bitmask_path or frame_path") + + if not bitmask_path: + bitmask_path = os.path.join(os.path.split(path)[0], 'bitmask.asm') + if not frame_path: + frame_path = os.path.join(os.path.split(path)[0], 'frames.asm') + bitmask_lines = open(bitmask_path).readlines() + frame_lines = open(frame_path).readlines() + + bitmask_length = w * h + + bitmasks = [] + bitmask = [] + for line in bitmask_lines: + if '\tdb ' in line: + value = line.split('\tdb ')[1].strip().replace('%', '0b') + value = int(value, 0) + #print line.strip(), value, len(bitmasks), len(bitmask) + for bit in xrange(8): + bitmask += [(value >> bit) & 1] + if len(bitmask) >= bitmask_length: + bitmasks += [bitmask] + bitmask = [] + break + if bitmask: + bitmasks += [bitmask] + + frames = [] + frame_labels = [] + i = 0 + for line in frame_lines: + if '\tdw ' in line: + frame_labels += [line.split('\tdw ')[1].strip()] + else: + for part in line.split(): + part = part.strip() + if part in frame_labels: + frames += [(part, i)] + i += 1 + + results = [] + + for label, i in frames: + result = [] + + # get the bitmask and tile ids for each frame + # don't care if we read past bounds, so just read the rest of the file + values = [] + for line in frame_lines[i:]: + if '\tdb ' in line: + values += line.split('\tdb ')[1].split(';')[0].split(',') + + #print bitmasks + #print values[0] + #print int(values[0].replace('$', '0x'), 0) + bitmask = bitmasks[int(values[0].replace('$', '0x'), 0)] + tiles = values[1:] + k = 0 + j = 0 + for bit in bitmask: + if bit: + result += [int(tiles[k].replace('$', '0x'), 0)] + k += 1 + else: + result += [j] + j += 1 + + results += [result] + + return results + +def get_animated_graphics(path, w=7, h=7, bitmask_path=None, frame_path=None): + frames = get_animation_frames(path, w, h, bitmask_path, frame_path) + new_path = path.replace('.animated.2bpp', '.2bpp') + tiles = gfx.get_tiles(bytearray(open(path, 'rb').read())) + new_tiles = tiles[:w * h] + for frame in frames: + for tile in frame: + new_tiles += [tiles[tile]] + new_graphic = gfx.connect(new_tiles) + print new_path, list(new_graphic) + open(new_path, 'wb').write(bytearray(new_graphic)) + return new_path + +def filepath_rules(filepath): + """Infer attributes of certain graphics by their location in the filesystem.""" + args = {} + + filedir, filename = os.path.split(filepath) + if filedir.startswith('./'): + filedir = filedir[2:] + + name, ext = os.path.splitext(filename) + if ext == '.lz': + name, ext = os.path.splitext(name) + + pokemon_name = '' + + if 'gfx/pokemon/' in filedir: + pokemon_name = filedir.split('/')[-1] + if pokemon_name.startswith('unown_'): + index = filedir.find(pokemon_name) + if index != -1: + filedir = filedir[:index + len('unown')] + filedir[index + len('unown_a'):] + if name == 'front' or name == 'front.animated': + args['pal_file'] = os.path.join(filedir, 'normal.pal') + args['pic'] = True + args['animate'] = True + elif name == 'back': + args['pal_file'] = os.path.join(filedir, 'normal.pal') + args['pic'] = True + + elif 'gfx/trainers' in filedir: + args['pic'] = True + + elif os.path.join(filedir, name) in pics: + args['pic'] = True + + elif filedir == 'gfx/tilesets': + args['tileset'] = True + + if args.get('pal_file'): + if os.path.exists(args['pal_file']): + args['palout'] = args['pal_file'] + else: + del args['pal_file'] + + if args.get('pic'): + if ext == '.png': + w, h = gfx.png.Reader(filepath).asRGBA8()[:2] + w = min(w/8, h/8) + args['pic_dimensions'] = w, w + elif ext == '.2bpp': + if pokemon_name and name == 'front' or name == 'front.animated': + w, h = get_pokemon_dimensions(filepath.replace(ext, '.dimensions')) or (7, 7) + args['pic_dimensions'] = w, w + elif pokemon_name and name == 'back': + args['pic_dimensions'] = 6, 6 + else: + args['pic_dimensions'] = 7, 7 + + if args.get('tileset'): + args['width'] = 128 + return args + + +def to_1bpp(filename, **kwargs): + name, ext = os.path.splitext(filename) + if ext == '.1bpp': pass + elif ext == '.2bpp': gfx.export_2bpp_to_1bpp(filename, **kwargs) + elif ext == '.png': gfx.export_png_to_1bpp(filename, **kwargs) + elif ext == '.lz': + decompress(filename, **kwargs) + to_1bpp(name, **kwargs) + +def to_2bpp(filename, **kwargs): + name, ext = os.path.splitext(filename) + if ext == '.1bpp': gfx.export_1bpp_to_2bpp(filename, **kwargs) + elif ext == '.2bpp': pass + elif ext == '.png': gfx.export_png_to_2bpp(filename, **kwargs) + elif ext == '.lz': + decompress(filename, **kwargs) + to_2bpp(name, **kwargs) + +def to_png(filename, **kwargs): + name, ext = os.path.splitext(filename) + if ext == '.1bpp': gfx.export_1bpp_to_png(filename, **kwargs) + elif ext == '.2bpp' and name.endswith('.animated'): + w, h = kwargs.get('pic_dimensions') or (7, 7) + new_path = get_animated_graphics(filename, w=w, h=h) + return to_png(new_path, **kwargs) + elif ext == '.2bpp': gfx.export_2bpp_to_png(filename, **kwargs) + elif ext == '.png': pass + elif ext == '.lz': + decompress(filename, **kwargs) + to_png(name, **kwargs) + +def compress(filename, **kwargs): + data = open(filename, 'rb').read() + lz_data = lz.Compressed(data).output + open(filename + '.lz', 'wb').write(bytearray(lz_data)) + +def decompress(filename, **kwargs): + lz_data = open(filename, 'rb').read() + data = lz.Decompressed(lz_data).output + name, ext = os.path.splitext(filename) + open(name, 'wb').write(bytearray(data)) + + +methods = { + '2bpp': to_2bpp, + '1bpp': to_1bpp, + 'png': to_png, + 'lz': compress, + 'unlz': decompress, +} + +def main(method_name, filenames=None): + if filenames is None: filenames = [] + for filename in filenames: + args = filepath_rules(filename) + method = methods.get(method_name) + if method: + method(filename, **args) + +def get_args(): + ap = argparse.ArgumentParser() + ap.add_argument('method_name') + ap.add_argument('filenames', nargs='*') + args = ap.parse_args() + return args + +if __name__ == '__main__': + main(**get_args().__dict__) diff --git a/tools/pokemontools/__init__.py b/tools/pokemontools/__init__.py new file mode 100644 index 00000000..a3e75900 --- /dev/null +++ b/tools/pokemontools/__init__.py @@ -0,0 +1 @@ +# A subset of https://github.com/pret/pokemon-reverse-engineering-tools diff --git a/tools/pokemontools/gfx.py b/tools/pokemontools/gfx.py new file mode 100644 index 00000000..2979b5a7 --- /dev/null +++ b/tools/pokemontools/gfx.py @@ -0,0 +1,938 @@ +# -*- coding: utf-8 -*- + +import os +import sys +import png +from math import sqrt, floor, ceil +import argparse +import operator + +from lz import Compressed, Decompressed + + +def split(list_, interval): + """ + Split a list by length. + """ + for i in xrange(0, len(list_), interval): + j = min(i + interval, len(list_)) + yield list_[i:j] + + +def hex_dump(data, length=0x10): + """ + just use hexdump -C + """ + margin = len('%x' % len(data)) + output = [] + address = 0 + for line in split(data, length): + output += [ + hex(address)[2:].zfill(margin) + + ' | ' + + ' '.join('%.2x' % byte for byte in line) + ] + address += length + return '\n'.join(output) + + +def get_tiles(image): + """ + Split a 2bpp image into 8x8 tiles. + """ + return list(split(image, 0x10)) + +def connect(tiles): + """ + Combine 8x8 tiles into a 2bpp image. + """ + return [byte for tile in tiles for byte in tile] + +def transpose(tiles, width=None): + """ + Transpose a tile arrangement along line y=-x. + + 00 01 02 03 04 05 00 06 0c 12 18 1e + 06 07 08 09 0a 0b 01 07 0d 13 19 1f + 0c 0d 0e 0f 10 11 <-> 02 08 0e 14 1a 20 + 12 13 14 15 16 17 03 09 0f 15 1b 21 + 18 19 1a 1b 1c 1d 04 0a 10 16 1c 22 + 1e 1f 20 21 22 23 05 0b 11 17 1d 23 + + 00 01 02 03 00 04 08 + 04 05 06 07 <-> 01 05 09 + 08 09 0a 0b 02 06 0a + 03 07 0b + """ + if width == None: + width = int(sqrt(len(tiles))) # assume square image + tiles = sorted(enumerate(tiles), key= lambda (i, tile): i % width) + return [tile for i, tile in tiles] + +def transpose_tiles(image, width=None): + return connect(transpose(get_tiles(image), width)) + +def interleave(tiles, width): + """ + 00 01 02 03 04 05 00 02 04 06 08 0a + 06 07 08 09 0a 0b 01 03 05 07 09 0b + 0c 0d 0e 0f 10 11 --> 0c 0e 10 12 14 16 + 12 13 14 15 16 17 0d 0f 11 13 15 17 + 18 19 1a 1b 1c 1d 18 1a 1c 1e 20 22 + 1e 1f 20 21 22 23 19 1b 1d 1f 21 23 + """ + interleaved = [] + left, right = split(tiles[::2], width), split(tiles[1::2], width) + for l, r in zip(left, right): + interleaved += l + r + return interleaved + +def deinterleave(tiles, width): + """ + 00 02 04 06 08 0a 00 01 02 03 04 05 + 01 03 05 07 09 0b 06 07 08 09 0a 0b + 0c 0e 10 12 14 16 --> 0c 0d 0e 0f 10 11 + 0d 0f 11 13 15 17 12 13 14 15 16 17 + 18 1a 1c 1e 20 22 18 19 1a 1b 1c 1d + 19 1b 1d 1f 21 23 1e 1f 20 21 22 23 + """ + deinterleaved = [] + rows = list(split(tiles, width)) + for left, right in zip(rows[::2], rows[1::2]): + for l, r in zip(left, right): + deinterleaved += [l, r] + return deinterleaved + +def interleave_tiles(image, width): + return connect(interleave(get_tiles(image), width)) + +def deinterleave_tiles(image, width): + return connect(deinterleave(get_tiles(image), width)) + + +def condense_image_to_map(image, pic=0): + """ + Reduce an image of adjacent frames to an image containing a base frame and any unrepeated tiles. + Returns the new image and the corresponding tilemap used to reconstruct the input image. + + If is 0, ignore the concept of frames. This behavior might be better off as another function. + """ + tiles = get_tiles(image) + new_tiles, tilemap = condense_tiles_to_map(tiles, pic) + new_image = connect(new_tiles) + return new_image, tilemap + +def condense_tiles_to_map(tiles, pic=0): + """ + Reduce a sequence of tiles representing adjacent frames to a base frame and any unrepeated tiles. + Returns the new tiles and the corresponding tilemap used to reconstruct the input tile sequence. + + If is 0, ignore the concept of frames. This behavior might be better off as another function. + """ + + # Leave the first frame intact for pics. + new_tiles = tiles[:pic] + tilemap = range(pic) + + for i, tile in enumerate(tiles[pic:]): + if tile not in new_tiles: + new_tiles.append(tile) + + if pic: + # Match the first frame exactly where possible. + # This reduces the space needed to replace tiles in pic animations. + # For example, if a tile is repeated twice in the first frame, + # but at the same relative index as the second tile, use the second index. + # When creating a bitmask later, the second index would not require a replacement, but the first index would have. + pic_i = i % pic + if tile == new_tiles[pic_i]: + tilemap.append(pic_i) + else: + tilemap.append(new_tiles.index(tile)) + else: + tilemap.append(new_tiles.index(tile)) + return new_tiles, tilemap + +def test_condense_tiles_to_map(): + test = condense_tiles_to_map(list('abcadbae')) + if test != (list('abcde'), [0, 1, 2, 0, 3, 1, 0, 4]): + raise Exception(test) + test = condense_tiles_to_map(list('abcadbae'), 2) + if test != (list('abcde'), [0, 1, 2, 0, 3, 1, 0, 4]): + raise Exception(test) + test = condense_tiles_to_map(list('abcadbae'), 4) + if test != (list('abcade'), [0, 1, 2, 3, 4, 1, 0, 5]): + raise Exception(test) + test = condense_tiles_to_map(list('abcadbea'), 4) + if test != (list('abcade'), [0, 1, 2, 3, 4, 1, 5, 3]): + raise Exception(test) + + +def to_file(filename, data): + """ + Apparently open(filename, 'wb').write(bytearray(data)) won't work. + """ + file = open(filename, 'wb') + for byte in data: + file.write('%c' % byte) + file.close() + + +def decompress_file(filein, fileout=None): + image = bytearray(open(filein).read()) + de = Decompressed(image) + + if fileout == None: + fileout = os.path.splitext(filein)[0] + to_file(fileout, de.output) + + +def compress_file(filein, fileout=None): + image = bytearray(open(filein).read()) + lz = Compressed(image) + + if fileout == None: + fileout = filein + '.lz' + to_file(fileout, lz.output) + + +def bin_to_rgb(word): + red = word & 0b11111 + word >>= 5 + green = word & 0b11111 + word >>= 5 + blue = word & 0b11111 + return (red, green, blue) + +def convert_binary_pal_to_text_by_filename(filename): + pal = bytearray(open(filename).read()) + return convert_binary_pal_to_text(pal) + +def convert_binary_pal_to_text(pal): + output = '' + words = [hi * 0x100 + lo for lo, hi in zip(pal[::2], pal[1::2])] + for word in words: + red, green, blue = ['%.2d' % c for c in bin_to_rgb(word)] + output += '\tRGB ' + ', '.join((red, green, blue)) + output += '\n' + return output + +def read_rgb_macros(lines): + colors = [] + for line in lines: + macro = line.split(" ")[0].strip() + if macro == 'RGB': + params = ' '.join(line.split(" ")[1:]).split(',') + red, green, blue = [int(v) for v in params] + colors += [[red, green, blue]] + return colors + + +def rewrite_binary_pals_to_text(filenames): + for filename in filenames: + pal_text = convert_binary_pal_to_text_by_filename(filename) + with open(filename, 'w') as out: + out.write(pal_text) + + +def flatten(planar): + """ + Flatten planar 2bpp image data into a quaternary pixel map. + """ + strips = [] + for bottom, top in split(planar, 2): + bottom = bottom + top = top + strip = [] + for i in xrange(7,-1,-1): + color = ( + (bottom >> i & 1) + + (top *2 >> i & 2) + ) + strip += [color] + strips += strip + return strips + +def to_lines(image, width): + """ + Convert a tiled quaternary pixel map to lines of quaternary pixels. + """ + tile_width = 8 + tile_height = 8 + num_columns = width / tile_width + height = len(image) / width + + lines = [] + for cur_line in xrange(height): + tile_row = cur_line / tile_height + line = [] + for column in xrange(num_columns): + anchor = ( + num_columns * tile_row * tile_width * tile_height + + column * tile_width * tile_height + + cur_line % tile_height * tile_width + ) + line += image[anchor : anchor + tile_width] + lines += [line] + return lines + + +def dmg2rgb(word): + """ + For PNGs. + """ + def shift(value): + while True: + yield value & (2**5 - 1) + value >>= 5 + word = shift(word) + # distribution is less even w/ << 3 + red, green, blue = [int(color * 8.25) for color in [word.next() for _ in xrange(3)]] + alpha = 255 + return (red, green, blue, alpha) + + +def rgb_to_dmg(color): + """ + For PNGs. + """ + word = (color['r'] / 8) + word += (color['g'] / 8) << 5 + word += (color['b'] / 8) << 10 + return word + + +def pal_to_png(filename): + """ + Interpret a .pal file as a png palette. + """ + with open(filename) as rgbs: + colors = read_rgb_macros(rgbs.readlines()) + a = 255 + palette = [] + for color in colors: + # even distribution over 000-255 + r, g, b = [int(hue * 8.25) for hue in color] + palette += [(r, g, b, a)] + white = (255,255,255,255) + black = (000,000,000,255) + if white not in palette and len(palette) < 4: + palette = [white] + palette + if black not in palette and len(palette) < 4: + palette = palette + [black] + return palette + + +def png_to_rgb(palette): + """ + Convert a png palette to rgb macros. + """ + output = '' + for color in palette: + r, g, b = [color[c] / 8 for c in 'rgb'] + output += '\tRGB ' + ', '.join(['%.2d' % hue for hue in (r, g, b)]) + output += '\n' + return output + + +def read_filename_arguments(filename): + """ + Infer graphics conversion arguments given a filename. + + Arguments are separated with '.'. + """ + parsed_arguments = {} + + int_arguments = { + 'w': 'width', + 'h': 'height', + 't': 'tile_padding', + } + arguments = os.path.splitext(filename)[0].lstrip('.').split('.')[1:] + for argument in arguments: + + # Check for integer arguments first (i.e. "w128"). + arg = argument[0] + param = argument[1:] + if param.isdigit(): + arg = int_arguments.get(arg, False) + if arg: + parsed_arguments[arg] = int(param) + + elif argument == 'arrange': + parsed_arguments['norepeat'] = True + parsed_arguments['tilemap'] = True + + # Pic dimensions (i.e. "6x6"). + elif 'x' in argument and any(map(str.isdigit, argument)): + w, h = argument.split('x') + if w.isdigit() and h.isdigit(): + parsed_arguments['pic_dimensions'] = (int(w), int(h)) + + else: + parsed_arguments[argument] = True + + return parsed_arguments + + +def export_2bpp_to_png(filein, fileout=None, pal_file=None, height=0, width=0, tile_padding=0, pic_dimensions=None, **kwargs): + + if fileout == None: + fileout = os.path.splitext(filein)[0] + '.png' + + image = open(filein, 'rb').read() + + arguments = { + 'width': width, + 'height': height, + 'pal_file': pal_file, + 'tile_padding': tile_padding, + 'pic_dimensions': pic_dimensions, + } + arguments.update(read_filename_arguments(filein)) + + if pal_file == None: + if os.path.exists(os.path.splitext(fileout)[0]+'.pal'): + arguments['pal_file'] = os.path.splitext(fileout)[0]+'.pal' + + result = convert_2bpp_to_png(image, **arguments) + width, height, palette, greyscale, bitdepth, px_map = result + + w = png.Writer( + width, + height, + palette=palette, + compression=9, + greyscale=greyscale, + bitdepth=bitdepth + ) + with open(fileout, 'wb') as f: + w.write(f, px_map) + + +def convert_2bpp_to_png(image, **kwargs): + """ + Convert a planar 2bpp graphic to png. + """ + + image = bytearray(image) + + pad_color = bytearray([0]) + + width = kwargs.get('width', 0) + height = kwargs.get('height', 0) + tile_padding = kwargs.get('tile_padding', 0) + pic_dimensions = kwargs.get('pic_dimensions', None) + pal_file = kwargs.get('pal_file', None) + interleave = kwargs.get('interleave', False) + + # Width must be specified to interleave. + if interleave and width: + image = interleave_tiles(image, width / 8) + + # Pad the image by a given number of tiles if asked. + image += pad_color * 0x10 * tile_padding + + # Some images are transposed in blocks. + if pic_dimensions: + w, h = pic_dimensions + if not width: width = w * 8 + + pic_length = w * h * 0x10 + + trailing = len(image) % pic_length + + pic = [] + for i in xrange(0, len(image) - trailing, pic_length): + pic += transpose_tiles(image[i:i+pic_length], h) + image = bytearray(pic) + image[len(image) - trailing:] + + # Pad out trailing lines. + image += pad_color * 0x10 * ((w - (len(image) / 0x10) % h) % w) + + def px_length(img): + return len(img) * 4 + def tile_length(img): + return len(img) * 4 / (8*8) + + if width and height: + tile_width = width / 8 + more_tile_padding = (tile_width - (tile_length(image) % tile_width or tile_width)) + image += pad_color * 0x10 * more_tile_padding + + elif width and not height: + tile_width = width / 8 + more_tile_padding = (tile_width - (tile_length(image) % tile_width or tile_width)) + image += pad_color * 0x10 * more_tile_padding + height = px_length(image) / width + + elif height and not width: + tile_height = height / 8 + more_tile_padding = (tile_height - (tile_length(image) % tile_height or tile_height)) + image += pad_color * 0x10 * more_tile_padding + width = px_length(image) / height + + # at least one dimension should be given + if width * height != px_length(image): + # look for possible combos of width/height that would form a rectangle + matches = [] + # Height need not be divisible by 8, but width must. + # See pokered gfx/minimize_pic.1bpp. + for w in range(8, px_length(image) / 2 + 1, 8): + h = px_length(image) / w + if w * h == px_length(image): + matches += [(w, h)] + # go for the most square image + if len(matches): + width, height = sorted(matches, key= lambda (w, h): (h % 8 != 0, w + h))[0] # favor height + else: + raise Exception, 'Image can\'t be divided into tiles (%d px)!' % (px_length(image)) + + # convert tiles to lines + lines = to_lines(flatten(image), width) + + if pal_file == None: + palette = None + greyscale = True + bitdepth = 2 + px_map = [[3 - pixel for pixel in line] for line in lines] + + else: # gbc color + palette = pal_to_png(pal_file) + greyscale = False + bitdepth = 8 + px_map = [[pixel for pixel in line] for line in lines] + + return width, height, palette, greyscale, bitdepth, px_map + + +def get_pic_animation(tmap, w, h): + """ + Generate pic animation data from a combined tilemap of each frame. + """ + frame_text = '' + bitmask_text = '' + + frames = list(split(tmap, w * h)) + base = frames.pop(0) + bitmasks = [] + + for i in xrange(len(frames)): + frame_text += '\tdw .frame{}\n'.format(i + 1) + + for i, frame in enumerate(frames): + bitmask = map(operator.ne, frame, base) + if bitmask not in bitmasks: + bitmasks.append(bitmask) + which_bitmask = bitmasks.index(bitmask) + + mask = iter(bitmask) + masked_frame = filter(lambda _: mask.next(), frame) + + frame_text += '.frame{}\n'.format(i + 1) + frame_text += '\tdb ${:02x} ; bitmask\n'.format(which_bitmask) + if masked_frame: + frame_text += '\tdb {}\n'.format(', '.join( + map('${:02x}'.format, masked_frame) + )) + + for i, bitmask in enumerate(bitmasks): + bitmask_text += '; {}\n'.format(i) + for byte in split(bitmask, 8): + byte = int(''.join(map(int.__repr__, reversed(byte))), 2) + bitmask_text += '\tdb %{:08b}\n'.format(byte) + + return frame_text, bitmask_text + + +def export_png_to_2bpp(filein, fileout=None, palout=None, **kwargs): + + arguments = { + 'tile_padding': 0, + 'pic_dimensions': None, + 'animate': False, + 'stupid_bitmask_hack': [], + } + arguments.update(kwargs) + arguments.update(read_filename_arguments(filein)) + + image, arguments = png_to_2bpp(filein, **arguments) + + if fileout == None: + fileout = os.path.splitext(filein)[0] + '.2bpp' + to_file(fileout, image) + + tmap = arguments.get('tmap') + + if tmap != None and arguments['animate'] and arguments['pic_dimensions']: + # Generate pic animation data. + frame_text, bitmask_text = get_pic_animation(tmap, *arguments['pic_dimensions']) + + frames_path = os.path.join(os.path.split(fileout)[0], 'frames.asm') + with open(frames_path, 'w') as out: + out.write(frame_text) + + bitmask_path = os.path.join(os.path.split(fileout)[0], 'bitmask.asm') + + # The following Pokemon have a bitmask dummied out. + for exception in arguments['stupid_bitmask_hack']: + if exception in bitmask_path: + bitmasks = bitmask_text.split(';') + bitmasks[-1] = bitmasks[-1].replace('1', '0') + bitmask_text = ';'.join(bitmasks) + + with open(bitmask_path, 'w') as out: + out.write(bitmask_text) + + elif tmap != None and arguments.get('tilemap', False): + tilemap_path = os.path.splitext(fileout)[0] + '.tilemap' + to_file(tilemap_path, tmap) + + palette = arguments.get('palette') + if palout == None: + palout = os.path.splitext(fileout)[0] + '.pal' + export_palette(palette, palout) + + +def get_image_padding(width, height, wstep=8, hstep=8): + + padding = { + 'left': 0, + 'right': 0, + 'top': 0, + 'bottom': 0, + } + + if width % wstep and width >= wstep: + pad = float(width % wstep) / 2 + padding['left'] = int(ceil(pad)) + padding['right'] = int(floor(pad)) + + if height % hstep and height >= hstep: + pad = float(height % hstep) / 2 + padding['top'] = int(ceil(pad)) + padding['bottom'] = int(floor(pad)) + + return padding + + +def png_to_2bpp(filein, **kwargs): + """ + Convert a png image to planar 2bpp. + """ + + arguments = { + 'tile_padding': 0, + 'pic_dimensions': False, + 'interleave': False, + 'norepeat': False, + 'tilemap': False, + } + arguments.update(kwargs) + + if type(filein) is str: + filein = open(filein) + + assert type(filein) is file + + width, height, rgba, info = png.Reader(filein).asRGBA8() + + # png.Reader returns flat pixel data. Nested is easier to work with + len_px = len('rgba') + image = [] + palette = [] + for line in rgba: + newline = [] + for px in xrange(0, len(line), len_px): + color = dict(zip('rgba', line[px:px+len_px])) + if color not in palette: + if len(palette) < 4: + palette += [color] + else: + # TODO Find the nearest match + print 'WARNING: %s: Color %s truncated to' % (filein, color), + color = sorted(palette, key=lambda x: sum(x.values()))[0] + print color + newline += [color] + image += [newline] + + assert len(palette) <= 4, '%s: palette should be 4 colors, is really %d (%s)' % (filein, len(palette), palette) + + # Pad out smaller palettes with greyscale colors + greyscale = { + 'black': { 'r': 0x00, 'g': 0x00, 'b': 0x00, 'a': 0xff }, + 'grey': { 'r': 0x55, 'g': 0x55, 'b': 0x55, 'a': 0xff }, + 'gray': { 'r': 0xaa, 'g': 0xaa, 'b': 0xaa, 'a': 0xff }, + 'white': { 'r': 0xff, 'g': 0xff, 'b': 0xff, 'a': 0xff }, + } + preference = 'white', 'black', 'grey', 'gray' + for hue in map(greyscale.get, preference): + if len(palette) >= 4: + break + if hue not in palette: + palette += [hue] + + palette.sort(key=lambda x: sum(x.values())) + + # Game Boy palette order + palette.reverse() + + # Map pixels to quaternary color ids + padding = get_image_padding(width, height) + width += padding['left'] + padding['right'] + height += padding['top'] + padding['bottom'] + pad = bytearray([0]) + + qmap = [] + qmap += pad * width * padding['top'] + for line in image: + qmap += pad * padding['left'] + for color in line: + qmap += [palette.index(color)] + qmap += pad * padding['right'] + qmap += pad * width * padding['bottom'] + + # Graphics are stored in tiles instead of lines + tile_width = 8 + tile_height = 8 + num_columns = max(width, tile_width) / tile_width + num_rows = max(height, tile_height) / tile_height + image = [] + + for row in xrange(num_rows): + for column in xrange(num_columns): + + # Split it up into strips to convert to planar data + for strip in xrange(min(tile_height, height)): + anchor = ( + row * num_columns * tile_width * tile_height + + column * tile_width + + strip * width + ) + line = qmap[anchor : anchor + tile_width] + bottom, top = 0, 0 + for bit, quad in enumerate(line): + bottom += (quad & 1) << (7 - bit) + top += (quad /2 & 1) << (7 - bit) + image += [bottom, top] + + dim = arguments['pic_dimensions'] + if dim: + if type(dim) in (tuple, list): + w, h = dim + else: + # infer dimensions based on width. + w = width / tile_width + h = height / tile_height + if h % w == 0: + h = w + + tiles = get_tiles(image) + pic_length = w * h + tile_width = width / 8 + trailing = len(tiles) % pic_length + new_image = [] + for block in xrange(len(tiles) / pic_length): + offset = (h * tile_width) * ((block * w) / tile_width) + ((block * w) % tile_width) + pic = [] + for row in xrange(h): + index = offset + (row * tile_width) + pic += tiles[index:index + w] + new_image += transpose(pic, w) + new_image += tiles[len(tiles) - trailing:] + image = connect(new_image) + + # Remove any tile padding used to make the png rectangular. + image = image[:len(image) - arguments['tile_padding'] * 0x10] + + tmap = None + + if arguments['interleave']: + image = deinterleave_tiles(image, num_columns) + + if arguments['pic_dimensions']: + image, tmap = condense_image_to_map(image, w * h) + elif arguments['norepeat']: + image, tmap = condense_image_to_map(image) + if not arguments['tilemap']: + tmap = None + + arguments.update({ 'palette': palette, 'tmap': tmap, }) + + return image, arguments + + +def export_palette(palette, filename): + """ + Export a palette from png to rgb macros in a .pal file. + """ + + if os.path.exists(filename): + + # Pic palettes are 2 colors (black/white are added later). + with open(filename) as rgbs: + colors = read_rgb_macros(rgbs.readlines()) + + if len(colors) == 2: + palette = palette[1:3] + + text = png_to_rgb(palette) + with open(filename, 'w') as out: + out.write(text) + + +def png_to_lz(filein): + + name = os.path.splitext(filein)[0] + + export_png_to_2bpp(filein) + image = open(name+'.2bpp', 'rb').read() + to_file(name+'.2bpp'+'.lz', Compressed(image).output) + + +def convert_2bpp_to_1bpp(data): + """ + Convert planar 2bpp image data to 1bpp. Assume images are two colors. + """ + return data[::2] + +def convert_1bpp_to_2bpp(data): + """ + Convert 1bpp image data to planar 2bpp (black/white). + """ + output = [] + for i in data: + output += [i, i] + return output + + +def export_2bpp_to_1bpp(filename): + name, extension = os.path.splitext(filename) + image = open(filename, 'rb').read() + image = convert_2bpp_to_1bpp(image) + to_file(name + '.1bpp', image) + +def export_1bpp_to_2bpp(filename): + name, extension = os.path.splitext(filename) + image = open(filename, 'rb').read() + image = convert_1bpp_to_2bpp(image) + to_file(name + '.2bpp', image) + + +def export_1bpp_to_png(filename, fileout=None): + + if fileout == None: + fileout = os.path.splitext(filename)[0] + '.png' + + arguments = read_filename_arguments(filename) + + image = open(filename, 'rb').read() + image = convert_1bpp_to_2bpp(image) + + result = convert_2bpp_to_png(image, **arguments) + width, height, palette, greyscale, bitdepth, px_map = result + + w = png.Writer(width, height, palette=palette, compression=9, greyscale=greyscale, bitdepth=bitdepth) + with open(fileout, 'wb') as f: + w.write(f, px_map) + + +def export_png_to_1bpp(filename, fileout=None): + + if fileout == None: + fileout = os.path.splitext(filename)[0] + '.1bpp' + + arguments = read_filename_arguments(filename) + image = png_to_1bpp(filename, **arguments) + + to_file(fileout, image) + +def png_to_1bpp(filename, **kwargs): + image, kwargs = png_to_2bpp(filename, **kwargs) + return convert_2bpp_to_1bpp(image) + + +def convert_to_2bpp(filenames=[]): + for filename in filenames: + filename, name, extension = try_decompress(filename) + if extension == '.1bpp': + export_1bpp_to_2bpp(filename) + elif extension == '.2bpp': + pass + elif extension == '.png': + export_png_to_2bpp(filename) + else: + raise Exception, "Don't know how to convert {} to 2bpp!".format(filename) + +def convert_to_1bpp(filenames=[]): + for filename in filenames: + filename, name, extension = try_decompress(filename) + if extension == '.1bpp': + pass + elif extension == '.2bpp': + export_2bpp_to_1bpp(filename) + elif extension == '.png': + export_png_to_1bpp(filename) + else: + raise Exception, "Don't know how to convert {} to 1bpp!".format(filename) + +def convert_to_png(filenames=[]): + for filename in filenames: + filename, name, extension = try_decompress(filename) + if extension == '.1bpp': + export_1bpp_to_png(filename) + elif extension == '.2bpp': + export_2bpp_to_png(filename) + elif extension == '.png': + pass + else: + raise Exception, "Don't know how to convert {} to png!".format(filename) + +def compress(filenames=[]): + for filename in filenames: + data = open(filename, 'rb').read() + lz_data = Compressed(data).output + to_file(filename + '.lz', lz_data) + +def decompress(filenames=[]): + for filename in filenames: + name, extension = os.path.splitext(filename) + lz_data = open(filename, 'rb').read() + data = Decompressed(lz_data).output + to_file(name, data) + +def try_decompress(filename): + """ + Try to decompress a graphic when determining the filetype. + This skips the manual unlz step when attempting + to convert lz-compressed graphics to png. + """ + name, extension = os.path.splitext(filename) + if extension == '.lz': + decompress([filename]) + filename = name + name, extension = os.path.splitext(filename) + return filename, name, extension + + +def main(): + ap = argparse.ArgumentParser() + ap.add_argument('mode') + ap.add_argument('filenames', nargs='*') + args = ap.parse_args() + + method = { + '2bpp': convert_to_2bpp, + '1bpp': convert_to_1bpp, + 'png': convert_to_png, + 'lz': compress, + 'unlz': decompress, + }.get(args.mode, None) + + if method == None: + raise Exception, "Unknown conversion method!" + + method(args.filenames) + +if __name__ == "__main__": + main() diff --git a/tools/pokemontools/lz.py b/tools/pokemontools/lz.py new file mode 100644 index 00000000..aef5c641 --- /dev/null +++ b/tools/pokemontools/lz.py @@ -0,0 +1,580 @@ +# -*- coding: utf-8 -*- +""" +Pokemon Crystal data de/compression. +""" + +""" +A rundown of Pokemon Crystal's compression scheme: + +Control commands occupy bits 5-7. +Bits 0-4 serve as the first parameter for each command. +""" +lz_commands = { + 'literal': 0, # n values for n bytes + 'iterate': 1, # one value for n bytes + 'alternate': 2, # alternate two values for n bytes + 'blank': 3, # zero for n bytes +} + +""" +Repeater commands repeat any data that was just decompressed. +They take an additional signed parameter to mark a relative starting point. +These wrap around (positive from the start, negative from the current position). +""" +lz_commands.update({ + 'repeat': 4, # n bytes starting from s + 'flip': 5, # n bytes in reverse bit order starting from s + 'reverse': 6, # n bytes backwards starting from s +}) + +""" +The long command is used when 5 bits aren't enough. Bits 2-4 contain a new control code. +Bits 0-1 are appended to a new byte as 8-9, allowing a 10-bit parameter. +""" +lz_commands.update({ + 'long': 7, # n is now 10 bits for a new control code +}) +max_length = 1 << 10 # can't go higher than 10 bits +lowmax = 1 << 5 # standard 5-bit param + +""" +If 0xff is encountered instead of a command, decompression ends. +""" +lz_end = 0xff + + +bit_flipped = [ + sum(((byte >> i) & 1) << (7 - i) for i in xrange(8)) + for byte in xrange(0x100) +] + + +class Compressed: + + """ + Usage: + lz = Compressed(data).output + or + lz = Compressed().compress(data) + or + c = Compressed() + c.data = data + lz = c.compress() + + There are some issues with reproducing the target compressor. + Some notes are listed here: + - the criteria for detecting a lookback is inconsistent + - sometimes lookbacks that are mostly 0s are pruned, sometimes not + - target appears to skip ahead if it can use a lookback soon, stopping the current command short or in some cases truncating it with literals. + - this has been implemented, but the specifics are unknown + - self.min_scores: It's unknown if blank's minimum score should be 1 or 2. Most likely it's 1, with some other hack to account for edge cases. + - may be related to the above + - target does not appear to compress backwards + """ + + def __init__(self, *args, **kwargs): + + self.min_scores = { + 'blank': 1, + 'iterate': 2, + 'alternate': 3, + 'repeat': 3, + 'reverse': 3, + 'flip': 3, + } + + self.preference = [ + 'repeat', + 'blank', + 'flip', + 'reverse', + 'iterate', + 'alternate', + #'literal', + ] + + self.lookback_methods = 'repeat', 'reverse', 'flip' + + self.__dict__.update({ + 'data': None, + 'commands': lz_commands, + 'debug': False, + 'literal_only': False, + }) + + self.arg_names = 'data', 'commands', 'debug', 'literal_only' + + self.__dict__.update(kwargs) + self.__dict__.update(dict(zip(self.arg_names, args))) + + if self.data is not None: + self.compress() + + def compress(self, data=None): + if data is not None: + self.data = data + + self.data = list(bytearray(self.data)) + + self.indexes = {} + self.lookbacks = {} + for method in self.lookback_methods: + self.lookbacks[method] = {} + + self.address = 0 + self.end = len(self.data) + self.output = [] + self.literal = None + + while self.address < self.end: + + if self.score(): + self.do_literal() + self.do_winner() + + else: + if self.literal == None: + self.literal = self.address + self.address += 1 + + self.do_literal() + + self.output += [lz_end] + return self.output + + def reset_scores(self): + self.scores = {} + self.offsets = {} + self.helpers = {} + for method in self.min_scores.iterkeys(): + self.scores[method] = 0 + + def bit_flip(self, byte): + return bit_flipped[byte] + + def do_literal(self): + if self.literal != None: + length = abs(self.address - self.literal) + start = min(self.literal, self.address + 1) + self.helpers['literal'] = self.data[start:start+length] + self.do_cmd('literal', length) + self.literal = None + + def score(self): + self.reset_scores() + + map(self.score_literal, ['iterate', 'alternate', 'blank']) + + for method in self.lookback_methods: + self.scores[method], self.offsets[method] = self.find_lookback(method, self.address) + + self.stop_short() + + return any( + score + > self.min_scores[method] + int(score > lowmax) + for method, score in self.scores.iteritems() + ) + + def stop_short(self): + """ + If a lookback is close, reduce the scores of other commands. + """ + best_method, best_score = max( + self.scores.items(), + key = lambda x: ( + x[1], + -self.preference.index(x[0]) + ) + ) + for method in self.lookback_methods: + min_score = self.min_scores[method] + for address in xrange(self.address+1, self.address+best_score): + length, index = self.find_lookback(method, address) + if length > max(min_score, best_score): + # BUG: lookbacks can reduce themselves. This appears to be a bug in the target also. + for m, score in self.scores.items(): + self.scores[m] = min(score, address - self.address) + + + def read(self, address=None): + if address is None: + address = self.address + if 0 <= address < len(self.data): + return self.data[address] + return None + + def find_all_lookbacks(self): + for method in self.lookback_methods: + for address, byte in enumerate(self.data): + self.find_lookback(method, address) + + def find_lookback(self, method, address=None): + """Temporarily stubbed, because the real function doesn't run in polynomial time.""" + return 0, None + + def broken_find_lookback(self, method, address=None): + if address is None: + address = self.address + + existing = self.lookbacks.get(method, {}).get(address) + if existing != None: + return existing + + lookback = 0, None + + # Better to not carelessly optimize at the moment. + """ + if address < 2: + return lookback + """ + + byte = self.read(address) + if byte is None: + return lookback + + direction, mutate = { + 'repeat': ( 1, int), + 'reverse': (-1, int), + 'flip': ( 1, self.bit_flip), + }[method] + + # Doesn't seem to help + """ + if mutate == self.bit_flip: + if byte == 0: + self.lookbacks[method][address] = lookback + return lookback + """ + + data_len = len(self.data) + is_two_byte_index = lambda index: int(index < address - 0x7f) + + for index in self.get_indexes(mutate(byte)): + + if index >= address: + break + + old_length, old_index = lookback + if direction == 1: + if old_length > data_len - index: break + else: + if old_length > index: continue + + if self.read(index) in [None]: continue + + length = 1 # we know there's at least one match, or we wouldn't be checking this index + while 1: + this_byte = self.read(address + length) + that_byte = self.read(index + length * direction) + if that_byte == None or this_byte != mutate(that_byte): + break + length += 1 + + score = length - is_two_byte_index(index) + old_score = old_length - is_two_byte_index(old_index) + if score >= old_score or (score == old_score and length > old_length): + # XXX maybe avoid two-byte indexes when possible + if score >= lookback[0] - is_two_byte_index(lookback[1]): + lookback = length, index + + self.lookbacks[method][address] = lookback + return lookback + + def get_indexes(self, byte): + if not self.indexes.has_key(byte): + self.indexes[byte] = [] + index = -1 + while 1: + try: + index = self.data.index(byte, index + 1) + except ValueError: + break + self.indexes[byte].append(index) + return self.indexes[byte] + + def score_literal(self, method): + address = self.address + + compare = { + 'blank': [0], + 'iterate': [self.read(address)], + 'alternate': [self.read(address), self.read(address + 1)], + }[method] + + # XXX may or may not be correct + if method == 'alternate' and compare[0] == 0: + return + + length = 0 + while self.read(address + length) == compare[length % len(compare)]: + length += 1 + + self.scores[method] = length + self.helpers[method] = compare + + def do_winner(self): + winners = filter( + lambda (method, score): + score + > self.min_scores[method] + int(score > lowmax), + self.scores.iteritems() + ) + winners.sort( + key = lambda (method, score): ( + -(score - self.min_scores[method] - int(score > lowmax)), + self.preference.index(method) + ) + ) + winner, score = winners[0] + + length = min(score, max_length) + self.do_cmd(winner, length) + self.address += length + + def do_cmd(self, cmd, length): + start_address = self.address + + cmd_length = length - 1 + + output = [] + + if length > lowmax: + output.append( + (self.commands['long'] << 5) + + (self.commands[cmd] << 2) + + (cmd_length >> 8) + ) + output.append( + cmd_length & 0xff + ) + else: + output.append( + (self.commands[cmd] << 5) + + cmd_length + ) + + self.helpers['blank'] = [] # quick hack + output += self.helpers.get(cmd, []) + + if cmd in self.lookback_methods: + offset = self.offsets[cmd] + # Negative offsets are one byte. + # Positive offsets are two. + if 0 < start_address - offset - 1 <= 0x7f: + offset = (start_address - offset - 1) | 0x80 + output += [offset] + else: + output += [offset / 0x100, offset % 0x100] # big endian + + if self.debug: + print ' '.join(map(str, [ + cmd, length, '\t', + ' '.join(map('{:02x}'.format, output)), + self.data[start_address:start_address+length] if cmd in self.lookback_methods else '', + ])) + + self.output += output + + + +class Decompressed: + """ + Interpret and decompress lz-compressed data, usually 2bpp. + """ + + """ + Usage: + data = Decompressed(lz).output + or + data = Decompressed().decompress(lz) + or + d = Decompressed() + d.lz = lz + data = d.decompress() + + To decompress from offset 0x80000 in a rom: + data = Decompressed(rom, start=0x80000).output + """ + + lz = None + start = 0 + commands = lz_commands + debug = False + + arg_names = 'lz', 'start', 'commands', 'debug' + + def __init__(self, *args, **kwargs): + self.__dict__.update(dict(zip(self.arg_names, args))) + self.__dict__.update(kwargs) + + self.command_names = dict(map(reversed, self.commands.items())) + self.address = self.start + + if self.lz is not None: + self.decompress() + + if self.debug: print self.command_list() + + + def command_list(self): + """ + Print a list of commands that were used. Useful for debugging. + """ + + text = '' + + output_address = 0 + for name, attrs in self.used_commands: + length = attrs['length'] + address = attrs['address'] + offset = attrs['offset'] + direction = attrs['direction'] + + text += '{2:03x} {0}: {1}'.format(name, length, output_address) + text += '\t' + ' '.join( + '{:02x}'.format(int(byte)) + for byte in self.lz[ address : address + attrs['cmd_length'] ] + ) + + if offset is not None: + repeated_data = self.output[ offset : offset + length * direction : direction ] + if name == 'flip': + repeated_data = map(bit_flipped.__getitem__, repeated_data) + text += ' [' + ' '.join(map('{:02x}'.format, repeated_data)) + ']' + + text += '\n' + output_address += length + + return text + + + def decompress(self, lz=None): + + if lz is not None: + self.lz = lz + + self.lz = bytearray(self.lz) + + self.used_commands = [] + self.output = [] + + while 1: + + cmd_address = self.address + self.offset = None + self.direction = None + + if (self.byte == lz_end): + self.next() + break + + self.cmd = (self.byte & 0b11100000) >> 5 + + if self.cmd_name == 'long': + # 10-bit length + self.cmd = (self.byte & 0b00011100) >> 2 + self.length = (self.next() & 0b00000011) * 0x100 + self.length += self.next() + 1 + else: + # 5-bit length + self.length = (self.next() & 0b00011111) + 1 + + self.__class__.__dict__[self.cmd_name](self) + + self.used_commands += [( + self.cmd_name, + { + 'length': self.length, + 'address': cmd_address, + 'offset': self.offset, + 'cmd_length': self.address - cmd_address, + 'direction': self.direction, + } + )] + + # Keep track of the data we just decompressed. + self.compressed_data = self.lz[self.start : self.address] + + + @property + def byte(self): + return self.lz[ self.address ] + + def next(self): + byte = self.byte + self.address += 1 + return byte + + @property + def cmd_name(self): + return self.command_names.get(self.cmd) + + + def get_offset(self): + + if self.byte >= 0x80: # negative + # negative + offset = self.next() & 0x7f + offset = len(self.output) - offset - 1 + else: + # positive + offset = self.next() * 0x100 + offset += self.next() + + self.offset = offset + + + def literal(self): + """ + Copy data directly. + """ + self.output += self.lz[ self.address : self.address + self.length ] + self.address += self.length + + def iterate(self): + """ + Write one byte repeatedly. + """ + self.output += [self.next()] * self.length + + def alternate(self): + """ + Write alternating bytes. + """ + alts = [self.next(), self.next()] + self.output += [ alts[x & 1] for x in xrange(self.length) ] + + def blank(self): + """ + Write zeros. + """ + self.output += [0] * self.length + + def flip(self): + """ + Repeat flipped bytes from output. + + Example: 11100100 -> 00100111 + """ + self._repeat(table=bit_flipped) + + def reverse(self): + """ + Repeat reversed bytes from output. + """ + self._repeat(direction=-1) + + def repeat(self): + """ + Repeat bytes from output. + """ + self._repeat() + + def _repeat(self, direction=1, table=None): + self.get_offset() + self.direction = direction + # Note: appends must be one at a time (this way, repeats can draw from themselves if required) + for i in xrange(self.length): + byte = self.output[ self.offset + i * direction ] + self.output.append( table[byte] if table else byte ) diff --git a/tools/pokemontools/png.py b/tools/pokemontools/png.py new file mode 100644 index 00000000..db6da128 --- /dev/null +++ b/tools/pokemontools/png.py @@ -0,0 +1,2650 @@ +#!/usr/bin/env python + +from __future__ import print_function + +# png.py - PNG encoder/decoder in pure Python +# +# Copyright (C) 2006 Johann C. Rocholl +# Portions Copyright (C) 2009 David Jones +# And probably portions Copyright (C) 2006 Nicko van Someren +# +# Original concept by Johann C. Rocholl. +# +# LICENCE (MIT) +# +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this software and associated documentation files +# (the "Software"), to deal in the Software without restriction, +# including without limitation the rights to use, copy, modify, merge, +# publish, distribute, sublicense, and/or sell copies of the Software, +# and to permit persons to whom the Software is furnished to do so, +# subject to the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +""" +Pure Python PNG Reader/Writer + +This Python module implements support for PNG images (see PNG +specification at http://www.w3.org/TR/2003/REC-PNG-20031110/ ). It reads +and writes PNG files with all allowable bit depths +(1/2/4/8/16/24/32/48/64 bits per pixel) and colour combinations: +greyscale (1/2/4/8/16 bit); RGB, RGBA, LA (greyscale with alpha) with +8/16 bits per channel; colour mapped images (1/2/4/8 bit). +Adam7 interlacing is supported for reading and +writing. A number of optional chunks can be specified (when writing) +and understood (when reading): ``tRNS``, ``bKGD``, ``gAMA``. + +For help, type ``import png; help(png)`` in your python interpreter. + +A good place to start is the :class:`Reader` and :class:`Writer` +classes. + +Requires Python 2.3. Limited support is available for Python 2.2, but +not everything works. Best with Python 2.4 and higher. Installation is +trivial, but see the ``README.txt`` file (with the source distribution) +for details. + +This file can also be used as a command-line utility to convert +`Netpbm `_ PNM files to PNG, and the +reverse conversion from PNG to PNM. The interface is similar to that +of the ``pnmtopng`` program from Netpbm. Type ``python png.py --help`` +at the shell prompt for usage and a list of options. + +A note on spelling and terminology +---------------------------------- + +Generally British English spelling is used in the documentation. So +that's "greyscale" and "colour". This not only matches the author's +native language, it's also used by the PNG specification. + +The major colour models supported by PNG (and hence by PyPNG) are: +greyscale, RGB, greyscale--alpha, RGB--alpha. These are sometimes +referred to using the abbreviations: L, RGB, LA, RGBA. In this case +each letter abbreviates a single channel: *L* is for Luminance or Luma +or Lightness which is the channel used in greyscale images; *R*, *G*, +*B* stand for Red, Green, Blue, the components of a colour image; *A* +stands for Alpha, the opacity channel (used for transparency effects, +but higher values are more opaque, so it makes sense to call it +opacity). + +A note on formats +----------------- + +When getting pixel data out of this module (reading) and presenting +data to this module (writing) there are a number of ways the data could +be represented as a Python value. Generally this module uses one of +three formats called "flat row flat pixel", "boxed row flat pixel", and +"boxed row boxed pixel". Basically the concern is whether each pixel +and each row comes in its own little tuple (box), or not. + +Consider an image that is 3 pixels wide by 2 pixels high, and each pixel +has RGB components: + +Boxed row flat pixel:: + + list([R,G,B, R,G,B, R,G,B], + [R,G,B, R,G,B, R,G,B]) + +Each row appears as its own list, but the pixels are flattened so +that three values for one pixel simply follow the three values for +the previous pixel. This is the most common format used, because it +provides a good compromise between space and convenience. PyPNG regards +itself as at liberty to replace any sequence type with any sufficiently +compatible other sequence type; in practice each row is an array (from +the array module), and the outer list is sometimes an iterator rather +than an explicit list (so that streaming is possible). + +Flat row flat pixel:: + + [R,G,B, R,G,B, R,G,B, + R,G,B, R,G,B, R,G,B] + +The entire image is one single giant sequence of colour values. +Generally an array will be used (to save space), not a list. + +Boxed row boxed pixel:: + + list([ (R,G,B), (R,G,B), (R,G,B) ], + [ (R,G,B), (R,G,B), (R,G,B) ]) + +Each row appears in its own list, but each pixel also appears in its own +tuple. A serious memory burn in Python. + +In all cases the top row comes first, and for each row the pixels are +ordered from left-to-right. Within a pixel the values appear in the +order, R-G-B-A (or L-A for greyscale--alpha). + +There is a fourth format, mentioned because it is used internally, +is close to what lies inside a PNG file itself, and has some support +from the public API. This format is called packed. When packed, +each row is a sequence of bytes (integers from 0 to 255), just as +it is before PNG scanline filtering is applied. When the bit depth +is 8 this is essentially the same as boxed row flat pixel; when the +bit depth is less than 8, several pixels are packed into each byte; +when the bit depth is 16 (the only value more than 8 that is supported +by the PNG image format) each pixel value is decomposed into 2 bytes +(and `packed` is a misnomer). This format is used by the +:meth:`Writer.write_packed` method. It isn't usually a convenient +format, but may be just right if the source data for the PNG image +comes from something that uses a similar format (for example, 1-bit +BMPs, or another PNG file). + +And now, my famous members +-------------------------- +""" + +__version__ = "0.0.18" + +import itertools +import math +# http://www.python.org/doc/2.4.4/lib/module-operator.html +import operator +import struct +import sys +# http://www.python.org/doc/2.4.4/lib/module-warnings.html +import warnings +import zlib + +from array import array +from functools import reduce + +try: + # `cpngfilters` is a Cython module: it must be compiled by + # Cython for this import to work. + # If this import does work, then it overrides pure-python + # filtering functions defined later in this file (see `class + # pngfilters`). + import cpngfilters as pngfilters +except ImportError: + pass + + +__all__ = ['Image', 'Reader', 'Writer', 'write_chunks', 'from_array'] + + +# The PNG signature. +# http://www.w3.org/TR/PNG/#5PNG-file-signature +_signature = struct.pack('8B', 137, 80, 78, 71, 13, 10, 26, 10) + +_adam7 = ((0, 0, 8, 8), + (4, 0, 8, 8), + (0, 4, 4, 8), + (2, 0, 4, 4), + (0, 2, 2, 4), + (1, 0, 2, 2), + (0, 1, 1, 2)) + +def group(s, n): + # See http://www.python.org/doc/2.6/library/functions.html#zip + return list(zip(*[iter(s)]*n)) + +def isarray(x): + return isinstance(x, array) + +def tostring(row): + return row.tostring() + +def interleave_planes(ipixels, apixels, ipsize, apsize): + """ + Interleave (colour) planes, e.g. RGB + A = RGBA. + + Return an array of pixels consisting of the `ipsize` elements of + data from each pixel in `ipixels` followed by the `apsize` elements + of data from each pixel in `apixels`. Conventionally `ipixels` + and `apixels` are byte arrays so the sizes are bytes, but it + actually works with any arrays of the same type. The returned + array is the same type as the input arrays which should be the + same type as each other. + """ + + itotal = len(ipixels) + atotal = len(apixels) + newtotal = itotal + atotal + newpsize = ipsize + apsize + # Set up the output buffer + # See http://www.python.org/doc/2.4.4/lib/module-array.html#l2h-1356 + out = array(ipixels.typecode) + # It's annoying that there is no cheap way to set the array size :-( + out.extend(ipixels) + out.extend(apixels) + # Interleave in the pixel data + for i in range(ipsize): + out[i:newtotal:newpsize] = ipixels[i:itotal:ipsize] + for i in range(apsize): + out[i+ipsize:newtotal:newpsize] = apixels[i:atotal:apsize] + return out + +def check_palette(palette): + """Check a palette argument (to the :class:`Writer` class) + for validity. Returns the palette as a list if okay; raises an + exception otherwise. + """ + + # None is the default and is allowed. + if palette is None: + return None + + p = list(palette) + if not (0 < len(p) <= 256): + raise ValueError("a palette must have between 1 and 256 entries") + seen_triple = False + for i,t in enumerate(p): + if len(t) not in (3,4): + raise ValueError( + "palette entry %d: entries must be 3- or 4-tuples." % i) + if len(t) == 3: + seen_triple = True + if seen_triple and len(t) == 4: + raise ValueError( + "palette entry %d: all 4-tuples must precede all 3-tuples" % i) + for x in t: + if int(x) != x or not(0 <= x <= 255): + raise ValueError( + "palette entry %d: values must be integer: 0 <= x <= 255" % i) + return p + +def check_sizes(size, width, height): + """Check that these arguments, in supplied, are consistent. + Return a (width, height) pair. + """ + + if not size: + return width, height + + if len(size) != 2: + raise ValueError( + "size argument should be a pair (width, height)") + if width is not None and width != size[0]: + raise ValueError( + "size[0] (%r) and width (%r) should match when both are used." + % (size[0], width)) + if height is not None and height != size[1]: + raise ValueError( + "size[1] (%r) and height (%r) should match when both are used." + % (size[1], height)) + return size + +def check_color(c, greyscale, which): + """Checks that a colour argument for transparent or + background options is the right form. Returns the colour + (which, if it's a bar integer, is "corrected" to a 1-tuple). + """ + + if c is None: + return c + if greyscale: + try: + len(c) + except TypeError: + c = (c,) + if len(c) != 1: + raise ValueError("%s for greyscale must be 1-tuple" % + which) + if not isinteger(c[0]): + raise ValueError( + "%s colour for greyscale must be integer" % which) + else: + if not (len(c) == 3 and + isinteger(c[0]) and + isinteger(c[1]) and + isinteger(c[2])): + raise ValueError( + "%s colour must be a triple of integers" % which) + return c + +class Error(Exception): + def __str__(self): + return self.__class__.__name__ + ': ' + ' '.join(self.args) + +class FormatError(Error): + """Problem with input file format. In other words, PNG file does + not conform to the specification in some way and is invalid. + """ + +class ChunkError(FormatError): + pass + + +class Writer: + """ + PNG encoder in pure Python. + """ + + def __init__(self, width=None, height=None, + size=None, + greyscale=False, + alpha=False, + bitdepth=8, + palette=None, + transparent=None, + background=None, + gamma=None, + compression=None, + interlace=False, + bytes_per_sample=None, # deprecated + planes=None, + colormap=None, + maxval=None, + chunk_limit=2**20, + x_pixels_per_unit = None, + y_pixels_per_unit = None, + unit_is_meter = False): + """ + Create a PNG encoder object. + + Arguments: + + width, height + Image size in pixels, as two separate arguments. + size + Image size (w,h) in pixels, as single argument. + greyscale + Input data is greyscale, not RGB. + alpha + Input data has alpha channel (RGBA or LA). + bitdepth + Bit depth: from 1 to 16. + palette + Create a palette for a colour mapped image (colour type 3). + transparent + Specify a transparent colour (create a ``tRNS`` chunk). + background + Specify a default background colour (create a ``bKGD`` chunk). + gamma + Specify a gamma value (create a ``gAMA`` chunk). + compression + zlib compression level: 0 (none) to 9 (more compressed); + default: -1 or None. + interlace + Create an interlaced image. + chunk_limit + Write multiple ``IDAT`` chunks to save memory. + x_pixels_per_unit + Number of pixels a unit along the x axis (write a + `pHYs` chunk). + y_pixels_per_unit + Number of pixels a unit along the y axis (write a + `pHYs` chunk). Along with `x_pixel_unit`, this gives + the pixel size ratio. + unit_is_meter + `True` to indicate that the unit (for the `pHYs` + chunk) is metre. + + The image size (in pixels) can be specified either by using the + `width` and `height` arguments, or with the single `size` + argument. If `size` is used it should be a pair (*width*, + *height*). + + `greyscale` and `alpha` are booleans that specify whether + an image is greyscale (or colour), and whether it has an + alpha channel (or not). + + `bitdepth` specifies the bit depth of the source pixel values. + Each source pixel value must be an integer between 0 and + ``2**bitdepth-1``. For example, 8-bit images have values + between 0 and 255. PNG only stores images with bit depths of + 1,2,4,8, or 16. When `bitdepth` is not one of these values, + the next highest valid bit depth is selected, and an ``sBIT`` + (significant bits) chunk is generated that specifies the + original precision of the source image. In this case the + supplied pixel values will be rescaled to fit the range of + the selected bit depth. + + The details of which bit depth / colour model combinations the + PNG file format supports directly, are somewhat arcane + (refer to the PNG specification for full details). Briefly: + "small" bit depths (1,2,4) are only allowed with greyscale and + colour mapped images; colour mapped images cannot have bit depth + 16. + + For colour mapped images (in other words, when the `palette` + argument is specified) the `bitdepth` argument must match one of + the valid PNG bit depths: 1, 2, 4, or 8. (It is valid to have a + PNG image with a palette and an ``sBIT`` chunk, but the meaning + is slightly different; it would be awkward to press the + `bitdepth` argument into service for this.) + + The `palette` option, when specified, causes a colour + mapped image to be created: the PNG colour type is set to 3; + `greyscale` must not be set; `alpha` must not be set; + `transparent` must not be set; the bit depth must be 1,2,4, + or 8. When a colour mapped image is created, the pixel values + are palette indexes and the `bitdepth` argument specifies the + size of these indexes (not the size of the colour values in + the palette). + + The palette argument value should be a sequence of 3- or + 4-tuples. 3-tuples specify RGB palette entries; 4-tuples + specify RGBA palette entries. If both 4-tuples and 3-tuples + appear in the sequence then all the 4-tuples must come + before all the 3-tuples. A ``PLTE`` chunk is created; if there + are 4-tuples then a ``tRNS`` chunk is created as well. The + ``PLTE`` chunk will contain all the RGB triples in the same + sequence; the ``tRNS`` chunk will contain the alpha channel for + all the 4-tuples, in the same sequence. Palette entries + are always 8-bit. + + If specified, the `transparent` and `background` parameters must + be a tuple with three integer values for red, green, blue, or + a simple integer (or singleton tuple) for a greyscale image. + + If specified, the `gamma` parameter must be a positive number + (generally, a `float`). A ``gAMA`` chunk will be created. + Note that this will not change the values of the pixels as + they appear in the PNG file, they are assumed to have already + been converted appropriately for the gamma specified. + + The `compression` argument specifies the compression level to + be used by the ``zlib`` module. Values from 1 to 9 specify + compression, with 9 being "more compressed" (usually smaller + and slower, but it doesn't always work out that way). 0 means + no compression. -1 and ``None`` both mean that the default + level of compession will be picked by the ``zlib`` module + (which is generally acceptable). + + If `interlace` is true then an interlaced image is created + (using PNG's so far only interace method, *Adam7*). This does + not affect how the pixels should be presented to the encoder, + rather it changes how they are arranged into the PNG file. + On slow connexions interlaced images can be partially decoded + by the browser to give a rough view of the image that is + successively refined as more image data appears. + + .. note :: + + Enabling the `interlace` option requires the entire image + to be processed in working memory. + + `chunk_limit` is used to limit the amount of memory used whilst + compressing the image. In order to avoid using large amounts of + memory, multiple ``IDAT`` chunks may be created. + """ + + # At the moment the `planes` argument is ignored; + # its purpose is to act as a dummy so that + # ``Writer(x, y, **info)`` works, where `info` is a dictionary + # returned by Reader.read and friends. + # Ditto for `colormap`. + + width, height = check_sizes(size, width, height) + del size + + if width <= 0 or height <= 0: + raise ValueError("width and height must be greater than zero") + if not isinteger(width) or not isinteger(height): + raise ValueError("width and height must be integers") + # http://www.w3.org/TR/PNG/#7Integers-and-byte-order + if width > 2**32-1 or height > 2**32-1: + raise ValueError("width and height cannot exceed 2**32-1") + + if alpha and transparent is not None: + raise ValueError( + "transparent colour not allowed with alpha channel") + + if bytes_per_sample is not None: + warnings.warn('please use bitdepth instead of bytes_per_sample', + DeprecationWarning) + if bytes_per_sample not in (0.125, 0.25, 0.5, 1, 2): + raise ValueError( + "bytes per sample must be .125, .25, .5, 1, or 2") + bitdepth = int(8*bytes_per_sample) + del bytes_per_sample + if not isinteger(bitdepth) or bitdepth < 1 or 16 < bitdepth: + raise ValueError("bitdepth (%r) must be a positive integer <= 16" % + bitdepth) + + self.rescale = None + palette = check_palette(palette) + if palette: + if bitdepth not in (1,2,4,8): + raise ValueError("with palette, bitdepth must be 1, 2, 4, or 8") + if transparent is not None: + raise ValueError("transparent and palette not compatible") + if alpha: + raise ValueError("alpha and palette not compatible") + if greyscale: + raise ValueError("greyscale and palette not compatible") + else: + # No palette, check for sBIT chunk generation. + if alpha or not greyscale: + if bitdepth not in (8,16): + targetbitdepth = (8,16)[bitdepth > 8] + self.rescale = (bitdepth, targetbitdepth) + bitdepth = targetbitdepth + del targetbitdepth + else: + assert greyscale + assert not alpha + if bitdepth not in (1,2,4,8,16): + if bitdepth > 8: + targetbitdepth = 16 + elif bitdepth == 3: + targetbitdepth = 4 + else: + assert bitdepth in (5,6,7) + targetbitdepth = 8 + self.rescale = (bitdepth, targetbitdepth) + bitdepth = targetbitdepth + del targetbitdepth + + if bitdepth < 8 and (alpha or not greyscale and not palette): + raise ValueError( + "bitdepth < 8 only permitted with greyscale or palette") + if bitdepth > 8 and palette: + raise ValueError( + "bit depth must be 8 or less for images with palette") + + transparent = check_color(transparent, greyscale, 'transparent') + background = check_color(background, greyscale, 'background') + + # It's important that the true boolean values (greyscale, alpha, + # colormap, interlace) are converted to bool because Iverson's + # convention is relied upon later on. + self.width = width + self.height = height + self.transparent = transparent + self.background = background + self.gamma = gamma + self.greyscale = bool(greyscale) + self.alpha = bool(alpha) + self.colormap = bool(palette) + self.bitdepth = int(bitdepth) + self.compression = compression + self.chunk_limit = chunk_limit + self.interlace = bool(interlace) + self.palette = palette + self.x_pixels_per_unit = x_pixels_per_unit + self.y_pixels_per_unit = y_pixels_per_unit + self.unit_is_meter = bool(unit_is_meter) + + self.color_type = 4*self.alpha + 2*(not greyscale) + 1*self.colormap + assert self.color_type in (0,2,3,4,6) + + self.color_planes = (3,1)[self.greyscale or self.colormap] + self.planes = self.color_planes + self.alpha + # :todo: fix for bitdepth < 8 + self.psize = (self.bitdepth/8) * self.planes + + def make_palette(self): + """Create the byte sequences for a ``PLTE`` and if necessary a + ``tRNS`` chunk. Returned as a pair (*p*, *t*). *t* will be + ``None`` if no ``tRNS`` chunk is necessary. + """ + + p = array('B') + t = array('B') + + for x in self.palette: + p.extend(x[0:3]) + if len(x) > 3: + t.append(x[3]) + p = tostring(p) + t = tostring(t) + if t: + return p,t + return p,None + + def write(self, outfile, rows): + """Write a PNG image to the output file. `rows` should be + an iterable that yields each row in boxed row flat pixel + format. The rows should be the rows of the original image, + so there should be ``self.height`` rows of ``self.width * + self.planes`` values. If `interlace` is specified (when + creating the instance), then an interlaced PNG file will + be written. Supply the rows in the normal image order; + the interlacing is carried out internally. + + .. note :: + + Interlacing will require the entire image to be in working + memory. + """ + + if self.interlace: + fmt = 'BH'[self.bitdepth > 8] + a = array(fmt, itertools.chain(*rows)) + return self.write_array(outfile, a) + + nrows = self.write_passes(outfile, rows) + if nrows != self.height: + raise ValueError( + "rows supplied (%d) does not match height (%d)" % + (nrows, self.height)) + + def write_passes(self, outfile, rows, packed=False): + """ + Write a PNG image to the output file. + + Most users are expected to find the :meth:`write` or + :meth:`write_array` method more convenient. + + The rows should be given to this method in the order that + they appear in the output file. For straightlaced images, + this is the usual top to bottom ordering, but for interlaced + images the rows should have already been interlaced before + passing them to this function. + + `rows` should be an iterable that yields each row. When + `packed` is ``False`` the rows should be in boxed row flat pixel + format; when `packed` is ``True`` each row should be a packed + sequence of bytes. + """ + + # http://www.w3.org/TR/PNG/#5PNG-file-signature + outfile.write(_signature) + + # http://www.w3.org/TR/PNG/#11IHDR + write_chunk(outfile, b'IHDR', + struct.pack("!2I5B", self.width, self.height, + self.bitdepth, self.color_type, + 0, 0, self.interlace)) + + # See :chunk:order + # http://www.w3.org/TR/PNG/#11gAMA + if self.gamma is not None: + write_chunk(outfile, b'gAMA', + struct.pack("!L", int(round(self.gamma*1e5)))) + + # See :chunk:order + # http://www.w3.org/TR/PNG/#11sBIT + if self.rescale: + write_chunk(outfile, b'sBIT', + struct.pack('%dB' % self.planes, + *[self.rescale[0]]*self.planes)) + + # :chunk:order: Without a palette (PLTE chunk), ordering is + # relatively relaxed. With one, gAMA chunk must precede PLTE + # chunk which must precede tRNS and bKGD. + # See http://www.w3.org/TR/PNG/#5ChunkOrdering + if self.palette: + p,t = self.make_palette() + write_chunk(outfile, b'PLTE', p) + if t: + # tRNS chunk is optional. Only needed if palette entries + # have alpha. + write_chunk(outfile, b'tRNS', t) + + # http://www.w3.org/TR/PNG/#11tRNS + if self.transparent is not None: + if self.greyscale: + write_chunk(outfile, b'tRNS', + struct.pack("!1H", *self.transparent)) + else: + write_chunk(outfile, b'tRNS', + struct.pack("!3H", *self.transparent)) + + # http://www.w3.org/TR/PNG/#11bKGD + if self.background is not None: + if self.greyscale: + write_chunk(outfile, b'bKGD', + struct.pack("!1H", *self.background)) + else: + write_chunk(outfile, b'bKGD', + struct.pack("!3H", *self.background)) + + # http://www.w3.org/TR/PNG/#11pHYs + if self.x_pixels_per_unit is not None and self.y_pixels_per_unit is not None: + tup = (self.x_pixels_per_unit, self.y_pixels_per_unit, int(self.unit_is_meter)) + write_chunk(outfile, b'pHYs', struct.pack("!LLB",*tup)) + + # http://www.w3.org/TR/PNG/#11IDAT + if self.compression is not None: + compressor = zlib.compressobj(self.compression) + else: + compressor = zlib.compressobj() + + # Choose an extend function based on the bitdepth. The extend + # function packs/decomposes the pixel values into bytes and + # stuffs them onto the data array. + data = array('B') + if self.bitdepth == 8 or packed: + extend = data.extend + elif self.bitdepth == 16: + # Decompose into bytes + def extend(sl): + fmt = '!%dH' % len(sl) + data.extend(array('B', struct.pack(fmt, *sl))) + else: + # Pack into bytes + assert self.bitdepth < 8 + # samples per byte + spb = int(8/self.bitdepth) + def extend(sl): + a = array('B', sl) + # Adding padding bytes so we can group into a whole + # number of spb-tuples. + l = float(len(a)) + extra = math.ceil(l / float(spb))*spb - l + a.extend([0]*int(extra)) + # Pack into bytes + l = group(a, spb) + l = [reduce(lambda x,y: + (x << self.bitdepth) + y, e) for e in l] + data.extend(l) + if self.rescale: + oldextend = extend + factor = \ + float(2**self.rescale[1]-1) / float(2**self.rescale[0]-1) + def extend(sl): + oldextend([int(round(factor*x)) for x in sl]) + + # Build the first row, testing mostly to see if we need to + # changed the extend function to cope with NumPy integer types + # (they cause our ordinary definition of extend to fail, so we + # wrap it). See + # http://code.google.com/p/pypng/issues/detail?id=44 + enumrows = enumerate(rows) + del rows + + # First row's filter type. + data.append(0) + # :todo: Certain exceptions in the call to ``.next()`` or the + # following try would indicate no row data supplied. + # Should catch. + i,row = next(enumrows) + try: + # If this fails... + extend(row) + except: + # ... try a version that converts the values to int first. + # Not only does this work for the (slightly broken) NumPy + # types, there are probably lots of other, unknown, "nearly" + # int types it works for. + def wrapmapint(f): + return lambda sl: f([int(x) for x in sl]) + extend = wrapmapint(extend) + del wrapmapint + extend(row) + + for i,row in enumrows: + # Add "None" filter type. Currently, it's essential that + # this filter type be used for every scanline as we do not + # mark the first row of a reduced pass image; that means we + # could accidentally compute the wrong filtered scanline if + # we used "up", "average", or "paeth" on such a line. + data.append(0) + extend(row) + if len(data) > self.chunk_limit: + compressed = compressor.compress(tostring(data)) + if len(compressed): + write_chunk(outfile, b'IDAT', compressed) + # Because of our very witty definition of ``extend``, + # above, we must re-use the same ``data`` object. Hence + # we use ``del`` to empty this one, rather than create a + # fresh one (which would be my natural FP instinct). + del data[:] + if len(data): + compressed = compressor.compress(tostring(data)) + else: + compressed = b'' + flushed = compressor.flush() + if len(compressed) or len(flushed): + write_chunk(outfile, b'IDAT', compressed + flushed) + # http://www.w3.org/TR/PNG/#11IEND + write_chunk(outfile, b'IEND') + return i+1 + + def write_array(self, outfile, pixels): + """ + Write an array in flat row flat pixel format as a PNG file on + the output file. See also :meth:`write` method. + """ + + if self.interlace: + self.write_passes(outfile, self.array_scanlines_interlace(pixels)) + else: + self.write_passes(outfile, self.array_scanlines(pixels)) + + def write_packed(self, outfile, rows): + """ + Write PNG file to `outfile`. The pixel data comes from `rows` + which should be in boxed row packed format. Each row should be + a sequence of packed bytes. + + Technically, this method does work for interlaced images but it + is best avoided. For interlaced images, the rows should be + presented in the order that they appear in the file. + + This method should not be used when the source image bit depth + is not one naturally supported by PNG; the bit depth should be + 1, 2, 4, 8, or 16. + """ + + if self.rescale: + raise Error("write_packed method not suitable for bit depth %d" % + self.rescale[0]) + return self.write_passes(outfile, rows, packed=True) + + def convert_pnm(self, infile, outfile): + """ + Convert a PNM file containing raw pixel data into a PNG file + with the parameters set in the writer object. Works for + (binary) PGM, PPM, and PAM formats. + """ + + if self.interlace: + pixels = array('B') + pixels.fromfile(infile, + (self.bitdepth/8) * self.color_planes * + self.width * self.height) + self.write_passes(outfile, self.array_scanlines_interlace(pixels)) + else: + self.write_passes(outfile, self.file_scanlines(infile)) + + def convert_ppm_and_pgm(self, ppmfile, pgmfile, outfile): + """ + Convert a PPM and PGM file containing raw pixel data into a + PNG outfile with the parameters set in the writer object. + """ + pixels = array('B') + pixels.fromfile(ppmfile, + (self.bitdepth/8) * self.color_planes * + self.width * self.height) + apixels = array('B') + apixels.fromfile(pgmfile, + (self.bitdepth/8) * + self.width * self.height) + pixels = interleave_planes(pixels, apixels, + (self.bitdepth/8) * self.color_planes, + (self.bitdepth/8)) + if self.interlace: + self.write_passes(outfile, self.array_scanlines_interlace(pixels)) + else: + self.write_passes(outfile, self.array_scanlines(pixels)) + + def file_scanlines(self, infile): + """ + Generates boxed rows in flat pixel format, from the input file + `infile`. It assumes that the input file is in a "Netpbm-like" + binary format, and is positioned at the beginning of the first + pixel. The number of pixels to read is taken from the image + dimensions (`width`, `height`, `planes`) and the number of bytes + per value is implied by the image `bitdepth`. + """ + + # Values per row + vpr = self.width * self.planes + row_bytes = vpr + if self.bitdepth > 8: + assert self.bitdepth == 16 + row_bytes *= 2 + fmt = '>%dH' % vpr + def line(): + return array('H', struct.unpack(fmt, infile.read(row_bytes))) + else: + def line(): + scanline = array('B', infile.read(row_bytes)) + return scanline + for y in range(self.height): + yield line() + + def array_scanlines(self, pixels): + """ + Generates boxed rows (flat pixels) from flat rows (flat pixels) + in an array. + """ + + # Values per row + vpr = self.width * self.planes + stop = 0 + for y in range(self.height): + start = stop + stop = start + vpr + yield pixels[start:stop] + + def array_scanlines_interlace(self, pixels): + """ + Generator for interlaced scanlines from an array. `pixels` is + the full source image in flat row flat pixel format. The + generator yields each scanline of the reduced passes in turn, in + boxed row flat pixel format. + """ + + # http://www.w3.org/TR/PNG/#8InterlaceMethods + # Array type. + fmt = 'BH'[self.bitdepth > 8] + # Value per row + vpr = self.width * self.planes + for xstart, ystart, xstep, ystep in _adam7: + if xstart >= self.width: + continue + # Pixels per row (of reduced image) + ppr = int(math.ceil((self.width-xstart)/float(xstep))) + # number of values in reduced image row. + row_len = ppr*self.planes + for y in range(ystart, self.height, ystep): + if xstep == 1: + offset = y * vpr + yield pixels[offset:offset+vpr] + else: + row = array(fmt) + # There's no easier way to set the length of an array + row.extend(pixels[0:row_len]) + offset = y * vpr + xstart * self.planes + end_offset = (y+1) * vpr + skip = self.planes * xstep + for i in range(self.planes): + row[i::self.planes] = \ + pixels[offset+i:end_offset:skip] + yield row + +def write_chunk(outfile, tag, data=b''): + """ + Write a PNG chunk to the output file, including length and + checksum. + """ + + # http://www.w3.org/TR/PNG/#5Chunk-layout + outfile.write(struct.pack("!I", len(data))) + outfile.write(tag) + outfile.write(data) + checksum = zlib.crc32(tag) + checksum = zlib.crc32(data, checksum) + checksum &= 2**32-1 + outfile.write(struct.pack("!I", checksum)) + +def write_chunks(out, chunks): + """Create a PNG file by writing out the chunks.""" + + out.write(_signature) + for chunk in chunks: + write_chunk(out, *chunk) + +def filter_scanline(type, line, fo, prev=None): + """Apply a scanline filter to a scanline. `type` specifies the + filter type (0 to 4); `line` specifies the current (unfiltered) + scanline as a sequence of bytes; `prev` specifies the previous + (unfiltered) scanline as a sequence of bytes. `fo` specifies the + filter offset; normally this is size of a pixel in bytes (the number + of bytes per sample times the number of channels), but when this is + < 1 (for bit depths < 8) then the filter offset is 1. + """ + + assert 0 <= type < 5 + + # The output array. Which, pathetically, we extend one-byte at a + # time (fortunately this is linear). + out = array('B', [type]) + + def sub(): + ai = -fo + for x in line: + if ai >= 0: + x = (x - line[ai]) & 0xff + out.append(x) + ai += 1 + def up(): + for i,x in enumerate(line): + x = (x - prev[i]) & 0xff + out.append(x) + def average(): + ai = -fo + for i,x in enumerate(line): + if ai >= 0: + x = (x - ((line[ai] + prev[i]) >> 1)) & 0xff + else: + x = (x - (prev[i] >> 1)) & 0xff + out.append(x) + ai += 1 + def paeth(): + # http://www.w3.org/TR/PNG/#9Filter-type-4-Paeth + ai = -fo # also used for ci + for i,x in enumerate(line): + a = 0 + b = prev[i] + c = 0 + + if ai >= 0: + a = line[ai] + c = prev[ai] + p = a + b - c + pa = abs(p - a) + pb = abs(p - b) + pc = abs(p - c) + if pa <= pb and pa <= pc: + Pr = a + elif pb <= pc: + Pr = b + else: + Pr = c + + x = (x - Pr) & 0xff + out.append(x) + ai += 1 + + if not prev: + # We're on the first line. Some of the filters can be reduced + # to simpler cases which makes handling the line "off the top" + # of the image simpler. "up" becomes "none"; "paeth" becomes + # "left" (non-trivial, but true). "average" needs to be handled + # specially. + if type == 2: # "up" + type = 0 + elif type == 3: + prev = [0]*len(line) + elif type == 4: # "paeth" + type = 1 + if type == 0: + out.extend(line) + elif type == 1: + sub() + elif type == 2: + up() + elif type == 3: + average() + else: # type == 4 + paeth() + return out + + +def from_array(a, mode=None, info={}): + """Create a PNG :class:`Image` object from a 2- or 3-dimensional + array. One application of this function is easy PIL-style saving: + ``png.from_array(pixels, 'L').save('foo.png')``. + + Unless they are specified using the *info* parameter, the PNG's + height and width are taken from the array size. For a 3 dimensional + array the first axis is the height; the second axis is the width; + and the third axis is the channel number. Thus an RGB image that is + 16 pixels high and 8 wide will use an array that is 16x8x3. For 2 + dimensional arrays the first axis is the height, but the second axis + is ``width*channels``, so an RGB image that is 16 pixels high and 8 + wide will use a 2-dimensional array that is 16x24 (each row will be + 8*3 = 24 sample values). + + *mode* is a string that specifies the image colour format in a + PIL-style mode. It can be: + + ``'L'`` + greyscale (1 channel) + ``'LA'`` + greyscale with alpha (2 channel) + ``'RGB'`` + colour image (3 channel) + ``'RGBA'`` + colour image with alpha (4 channel) + + The mode string can also specify the bit depth (overriding how this + function normally derives the bit depth, see below). Appending + ``';16'`` to the mode will cause the PNG to be 16 bits per channel; + any decimal from 1 to 16 can be used to specify the bit depth. + + When a 2-dimensional array is used *mode* determines how many + channels the image has, and so allows the width to be derived from + the second array dimension. + + The array is expected to be a ``numpy`` array, but it can be any + suitable Python sequence. For example, a list of lists can be used: + ``png.from_array([[0, 255, 0], [255, 0, 255]], 'L')``. The exact + rules are: ``len(a)`` gives the first dimension, height; + ``len(a[0])`` gives the second dimension; ``len(a[0][0])`` gives the + third dimension, unless an exception is raised in which case a + 2-dimensional array is assumed. It's slightly more complicated than + that because an iterator of rows can be used, and it all still + works. Using an iterator allows data to be streamed efficiently. + + The bit depth of the PNG is normally taken from the array element's + datatype (but if *mode* specifies a bitdepth then that is used + instead). The array element's datatype is determined in a way which + is supposed to work both for ``numpy`` arrays and for Python + ``array.array`` objects. A 1 byte datatype will give a bit depth of + 8, a 2 byte datatype will give a bit depth of 16. If the datatype + does not have an implicit size, for example it is a plain Python + list of lists, as above, then a default of 8 is used. + + The *info* parameter is a dictionary that can be used to specify + metadata (in the same style as the arguments to the + :class:`png.Writer` class). For this function the keys that are + useful are: + + height + overrides the height derived from the array dimensions and allows + *a* to be an iterable. + width + overrides the width derived from the array dimensions. + bitdepth + overrides the bit depth derived from the element datatype (but + must match *mode* if that also specifies a bit depth). + + Generally anything specified in the + *info* dictionary will override any implicit choices that this + function would otherwise make, but must match any explicit ones. + For example, if the *info* dictionary has a ``greyscale`` key then + this must be true when mode is ``'L'`` or ``'LA'`` and false when + mode is ``'RGB'`` or ``'RGBA'``. + """ + + # We abuse the *info* parameter by modifying it. Take a copy here. + # (Also typechecks *info* to some extent). + info = dict(info) + + # Syntax check mode string. + bitdepth = None + try: + # Assign the 'L' or 'RGBA' part to `gotmode`. + if mode.startswith('L'): + gotmode = 'L' + mode = mode[1:] + elif mode.startswith('RGB'): + gotmode = 'RGB' + mode = mode[3:] + else: + raise Error() + if mode.startswith('A'): + gotmode += 'A' + mode = mode[1:] + + # Skip any optional ';' + while mode.startswith(';'): + mode = mode[1:] + + # Parse optional bitdepth + if mode: + try: + bitdepth = int(mode) + except (TypeError, ValueError): + raise Error() + except Error: + raise Error("mode string should be 'RGB' or 'L;16' or similar.") + mode = gotmode + + # Get bitdepth from *mode* if possible. + if bitdepth: + if info.get('bitdepth') and bitdepth != info['bitdepth']: + raise Error("mode bitdepth (%d) should match info bitdepth (%d)." % + (bitdepth, info['bitdepth'])) + info['bitdepth'] = bitdepth + + # Fill in and/or check entries in *info*. + # Dimensions. + if 'size' in info: + # Check width, height, size all match where used. + for dimension,axis in [('width', 0), ('height', 1)]: + if dimension in info: + if info[dimension] != info['size'][axis]: + raise Error( + "info[%r] should match info['size'][%r]." % + (dimension, axis)) + info['width'],info['height'] = info['size'] + if 'height' not in info: + try: + l = len(a) + except TypeError: + raise Error( + "len(a) does not work, supply info['height'] instead.") + info['height'] = l + # Colour format. + if 'greyscale' in info: + if bool(info['greyscale']) != ('L' in mode): + raise Error("info['greyscale'] should match mode.") + info['greyscale'] = 'L' in mode + if 'alpha' in info: + if bool(info['alpha']) != ('A' in mode): + raise Error("info['alpha'] should match mode.") + info['alpha'] = 'A' in mode + + planes = len(mode) + if 'planes' in info: + if info['planes'] != planes: + raise Error("info['planes'] should match mode.") + + # In order to work out whether we the array is 2D or 3D we need its + # first row, which requires that we take a copy of its iterator. + # We may also need the first row to derive width and bitdepth. + a,t = itertools.tee(a) + row = next(t) + del t + try: + row[0][0] + threed = True + testelement = row[0] + except (IndexError, TypeError): + threed = False + testelement = row + if 'width' not in info: + if threed: + width = len(row) + else: + width = len(row) // planes + info['width'] = width + + if threed: + # Flatten the threed rows + a = (itertools.chain.from_iterable(x) for x in a) + + if 'bitdepth' not in info: + try: + dtype = testelement.dtype + # goto the "else:" clause. Sorry. + except AttributeError: + try: + # Try a Python array.array. + bitdepth = 8 * testelement.itemsize + except AttributeError: + # We can't determine it from the array element's + # datatype, use a default of 8. + bitdepth = 8 + else: + # If we got here without exception, we now assume that + # the array is a numpy array. + if dtype.kind == 'b': + bitdepth = 1 + else: + bitdepth = 8 * dtype.itemsize + info['bitdepth'] = bitdepth + + for thing in 'width height bitdepth greyscale alpha'.split(): + assert thing in info + return Image(a, info) + +# So that refugee's from PIL feel more at home. Not documented. +fromarray = from_array + +class Image: + """A PNG image. You can create an :class:`Image` object from + an array of pixels by calling :meth:`png.from_array`. It can be + saved to disk with the :meth:`save` method. + """ + + def __init__(self, rows, info): + """ + .. note :: + + The constructor is not public. Please do not call it. + """ + + self.rows = rows + self.info = info + + def save(self, file): + """Save the image to *file*. If *file* looks like an open file + descriptor then it is used, otherwise it is treated as a + filename and a fresh file is opened. + + In general, you can only call this method once; after it has + been called the first time and the PNG image has been saved, the + source data will have been streamed, and cannot be streamed + again. + """ + + w = Writer(**self.info) + + try: + file.write + def close(): pass + except AttributeError: + file = open(file, 'wb') + def close(): file.close() + + try: + w.write(file, self.rows) + finally: + close() + +class _readable: + """ + A simple file-like interface for strings and arrays. + """ + + def __init__(self, buf): + self.buf = buf + self.offset = 0 + + def read(self, n): + r = self.buf[self.offset:self.offset+n] + if isarray(r): + r = r.tostring() + self.offset += n + return r + +try: + str(b'dummy', 'ascii') +except TypeError: + as_str = str +else: + def as_str(x): + return str(x, 'ascii') + +class Reader: + """ + PNG decoder in pure Python. + """ + + def __init__(self, _guess=None, **kw): + """ + Create a PNG decoder object. + + The constructor expects exactly one keyword argument. If you + supply a positional argument instead, it will guess the input + type. You can choose among the following keyword arguments: + + filename + Name of input file (a PNG file). + file + A file-like object (object with a read() method). + bytes + ``array`` or ``string`` with PNG data. + + """ + if ((_guess is not None and len(kw) != 0) or + (_guess is None and len(kw) != 1)): + raise TypeError("Reader() takes exactly 1 argument") + + # Will be the first 8 bytes, later on. See validate_signature. + self.signature = None + self.transparent = None + # A pair of (len,type) if a chunk has been read but its data and + # checksum have not (in other words the file position is just + # past the 4 bytes that specify the chunk type). See preamble + # method for how this is used. + self.atchunk = None + + if _guess is not None: + if isarray(_guess): + kw["bytes"] = _guess + elif isinstance(_guess, str): + kw["filename"] = _guess + elif hasattr(_guess, 'read'): + kw["file"] = _guess + + if "filename" in kw: + self.file = open(kw["filename"], "rb") + elif "file" in kw: + self.file = kw["file"] + elif "bytes" in kw: + self.file = _readable(kw["bytes"]) + else: + raise TypeError("expecting filename, file or bytes array") + + + def chunk(self, seek=None, lenient=False): + """ + Read the next PNG chunk from the input file; returns a + (*type*, *data*) tuple. *type* is the chunk's type as a + byte string (all PNG chunk types are 4 bytes long). + *data* is the chunk's data content, as a byte string. + + If the optional `seek` argument is + specified then it will keep reading chunks until it either runs + out of file or finds the type specified by the argument. Note + that in general the order of chunks in PNGs is unspecified, so + using `seek` can cause you to miss chunks. + + If the optional `lenient` argument evaluates to `True`, + checksum failures will raise warnings rather than exceptions. + """ + + self.validate_signature() + + while True: + # http://www.w3.org/TR/PNG/#5Chunk-layout + if not self.atchunk: + self.atchunk = self.chunklentype() + length, type = self.atchunk + self.atchunk = None + data = self.file.read(length) + if len(data) != length: + raise ChunkError('Chunk %s too short for required %i octets.' + % (type, length)) + checksum = self.file.read(4) + if len(checksum) != 4: + raise ChunkError('Chunk %s too short for checksum.' % type) + if seek and type != seek: + continue + verify = zlib.crc32(type) + verify = zlib.crc32(data, verify) + # Whether the output from zlib.crc32 is signed or not varies + # according to hideous implementation details, see + # http://bugs.python.org/issue1202 . + # We coerce it to be positive here (in a way which works on + # Python 2.3 and older). + verify &= 2**32 - 1 + verify = struct.pack('!I', verify) + if checksum != verify: + (a, ) = struct.unpack('!I', checksum) + (b, ) = struct.unpack('!I', verify) + message = "Checksum error in %s chunk: 0x%08X != 0x%08X." % (type, a, b) + if lenient: + warnings.warn(message, RuntimeWarning) + else: + raise ChunkError(message) + return type, data + + def chunks(self): + """Return an iterator that will yield each chunk as a + (*chunktype*, *content*) pair. + """ + + while True: + t,v = self.chunk() + yield t,v + if t == b'IEND': + break + + def undo_filter(self, filter_type, scanline, previous): + """Undo the filter for a scanline. `scanline` is a sequence of + bytes that does not include the initial filter type byte. + `previous` is decoded previous scanline (for straightlaced + images this is the previous pixel row, but for interlaced + images, it is the previous scanline in the reduced image, which + in general is not the previous pixel row in the final image). + When there is no previous scanline (the first row of a + straightlaced image, or the first row in one of the passes in an + interlaced image), then this argument should be ``None``. + + The scanline will have the effects of filtering removed, and the + result will be returned as a fresh sequence of bytes. + """ + + # :todo: Would it be better to update scanline in place? + # Yes, with the Cython extension making the undo_filter fast, + # updating scanline inplace makes the code 3 times faster + # (reading 50 images of 800x800 went from 40s to 16s) + result = scanline + + if filter_type == 0: + return result + + if filter_type not in (1,2,3,4): + raise FormatError('Invalid PNG Filter Type.' + ' See http://www.w3.org/TR/2003/REC-PNG-20031110/#9Filters .') + + # Filter unit. The stride from one pixel to the corresponding + # byte from the previous pixel. Normally this is the pixel + # size in bytes, but when this is smaller than 1, the previous + # byte is used instead. + fu = max(1, self.psize) + + # For the first line of a pass, synthesize a dummy previous + # line. An alternative approach would be to observe that on the + # first line 'up' is the same as 'null', 'paeth' is the same + # as 'sub', with only 'average' requiring any special case. + if not previous: + previous = array('B', [0]*len(scanline)) + + def sub(): + """Undo sub filter.""" + + ai = 0 + # Loop starts at index fu. Observe that the initial part + # of the result is already filled in correctly with + # scanline. + for i in range(fu, len(result)): + x = scanline[i] + a = result[ai] + result[i] = (x + a) & 0xff + ai += 1 + + def up(): + """Undo up filter.""" + + for i in range(len(result)): + x = scanline[i] + b = previous[i] + result[i] = (x + b) & 0xff + + def average(): + """Undo average filter.""" + + ai = -fu + for i in range(len(result)): + x = scanline[i] + if ai < 0: + a = 0 + else: + a = result[ai] + b = previous[i] + result[i] = (x + ((a + b) >> 1)) & 0xff + ai += 1 + + def paeth(): + """Undo Paeth filter.""" + + # Also used for ci. + ai = -fu + for i in range(len(result)): + x = scanline[i] + if ai < 0: + a = c = 0 + else: + a = result[ai] + c = previous[ai] + b = previous[i] + p = a + b - c + pa = abs(p - a) + pb = abs(p - b) + pc = abs(p - c) + if pa <= pb and pa <= pc: + pr = a + elif pb <= pc: + pr = b + else: + pr = c + result[i] = (x + pr) & 0xff + ai += 1 + + # Call appropriate filter algorithm. Note that 0 has already + # been dealt with. + (None, + pngfilters.undo_filter_sub, + pngfilters.undo_filter_up, + pngfilters.undo_filter_average, + pngfilters.undo_filter_paeth)[filter_type](fu, scanline, previous, result) + return result + + def deinterlace(self, raw): + """ + Read raw pixel data, undo filters, deinterlace, and flatten. + Return in flat row flat pixel format. + """ + + # Values per row (of the target image) + vpr = self.width * self.planes + + # Make a result array, and make it big enough. Interleaving + # writes to the output array randomly (well, not quite), so the + # entire output array must be in memory. + fmt = 'BH'[self.bitdepth > 8] + a = array(fmt, [0]*vpr*self.height) + source_offset = 0 + + for xstart, ystart, xstep, ystep in _adam7: + if xstart >= self.width: + continue + # The previous (reconstructed) scanline. None at the + # beginning of a pass to indicate that there is no previous + # line. + recon = None + # Pixels per row (reduced pass image) + ppr = int(math.ceil((self.width-xstart)/float(xstep))) + # Row size in bytes for this pass. + row_size = int(math.ceil(self.psize * ppr)) + for y in range(ystart, self.height, ystep): + filter_type = raw[source_offset] + source_offset += 1 + scanline = raw[source_offset:source_offset+row_size] + source_offset += row_size + recon = self.undo_filter(filter_type, scanline, recon) + # Convert so that there is one element per pixel value + flat = self.serialtoflat(recon, ppr) + if xstep == 1: + assert xstart == 0 + offset = y * vpr + a[offset:offset+vpr] = flat + else: + offset = y * vpr + xstart * self.planes + end_offset = (y+1) * vpr + skip = self.planes * xstep + for i in range(self.planes): + a[offset+i:end_offset:skip] = \ + flat[i::self.planes] + return a + + def iterboxed(self, rows): + """Iterator that yields each scanline in boxed row flat pixel + format. `rows` should be an iterator that yields the bytes of + each row in turn. + """ + + def asvalues(raw): + """Convert a row of raw bytes into a flat row. Result will + be a freshly allocated object, not shared with + argument. + """ + + if self.bitdepth == 8: + return array('B', raw) + if self.bitdepth == 16: + raw = tostring(raw) + return array('H', struct.unpack('!%dH' % (len(raw)//2), raw)) + assert self.bitdepth < 8 + width = self.width + # Samples per byte + spb = 8//self.bitdepth + out = array('B') + mask = 2**self.bitdepth - 1 + shifts = [self.bitdepth * i + for i in reversed(list(range(spb)))] + for o in raw: + out.extend([mask&(o>>i) for i in shifts]) + return out[:width] + + return map(asvalues, rows) + + def serialtoflat(self, bytes, width=None): + """Convert serial format (byte stream) pixel data to flat row + flat pixel. + """ + + if self.bitdepth == 8: + return bytes + if self.bitdepth == 16: + bytes = tostring(bytes) + return array('H', + struct.unpack('!%dH' % (len(bytes)//2), bytes)) + assert self.bitdepth < 8 + if width is None: + width = self.width + # Samples per byte + spb = 8//self.bitdepth + out = array('B') + mask = 2**self.bitdepth - 1 + shifts = list(map(self.bitdepth.__mul__, reversed(list(range(spb))))) + l = width + for o in bytes: + out.extend([(mask&(o>>s)) for s in shifts][:l]) + l -= spb + if l <= 0: + l = width + return out + + def iterstraight(self, raw): + """Iterator that undoes the effect of filtering, and yields + each row in serialised format (as a sequence of bytes). + Assumes input is straightlaced. `raw` should be an iterable + that yields the raw bytes in chunks of arbitrary size. + """ + + # length of row, in bytes + rb = self.row_bytes + a = array('B') + # The previous (reconstructed) scanline. None indicates first + # line of image. + recon = None + for some in raw: + a.extend(some) + while len(a) >= rb + 1: + filter_type = a[0] + scanline = a[1:rb+1] + del a[:rb+1] + recon = self.undo_filter(filter_type, scanline, recon) + yield recon + if len(a) != 0: + # :file:format We get here with a file format error: + # when the available bytes (after decompressing) do not + # pack into exact rows. + raise FormatError( + 'Wrong size for decompressed IDAT chunk.') + assert len(a) == 0 + + def validate_signature(self): + """If signature (header) has not been read then read and + validate it; otherwise do nothing. + """ + + if self.signature: + return + self.signature = self.file.read(8) + if self.signature != _signature: + raise FormatError("PNG file has invalid signature.") + + def preamble(self, lenient=False): + """ + Extract the image metadata by reading the initial part of + the PNG file up to the start of the ``IDAT`` chunk. All the + chunks that precede the ``IDAT`` chunk are read and either + processed for metadata or discarded. + + If the optional `lenient` argument evaluates to `True`, checksum + failures will raise warnings rather than exceptions. + """ + + self.validate_signature() + + while True: + if not self.atchunk: + self.atchunk = self.chunklentype() + if self.atchunk is None: + raise FormatError( + 'This PNG file has no IDAT chunks.') + if self.atchunk[1] == b'IDAT': + return + self.process_chunk(lenient=lenient) + + def chunklentype(self): + """Reads just enough of the input to determine the next + chunk's length and type, returned as a (*length*, *type*) pair + where *type* is a string. If there are no more chunks, ``None`` + is returned. + """ + + x = self.file.read(8) + if not x: + return None + if len(x) != 8: + raise FormatError( + 'End of file whilst reading chunk length and type.') + length,type = struct.unpack('!I4s', x) + if length > 2**31-1: + raise FormatError('Chunk %s is too large: %d.' % (type,length)) + return length,type + + def process_chunk(self, lenient=False): + """Process the next chunk and its data. This only processes the + following chunk types, all others are ignored: ``IHDR``, + ``PLTE``, ``bKGD``, ``tRNS``, ``gAMA``, ``sBIT``, ``pHYs``. + + If the optional `lenient` argument evaluates to `True`, + checksum failures will raise warnings rather than exceptions. + """ + + type, data = self.chunk(lenient=lenient) + method = '_process_' + as_str(type) + m = getattr(self, method, None) + if m: + m(data) + + def _process_IHDR(self, data): + # http://www.w3.org/TR/PNG/#11IHDR + if len(data) != 13: + raise FormatError('IHDR chunk has incorrect length.') + (self.width, self.height, self.bitdepth, self.color_type, + self.compression, self.filter, + self.interlace) = struct.unpack("!2I5B", data) + + check_bitdepth_colortype(self.bitdepth, self.color_type) + + if self.compression != 0: + raise Error("unknown compression method %d" % self.compression) + if self.filter != 0: + raise FormatError("Unknown filter method %d," + " see http://www.w3.org/TR/2003/REC-PNG-20031110/#9Filters ." + % self.filter) + if self.interlace not in (0,1): + raise FormatError("Unknown interlace method %d," + " see http://www.w3.org/TR/2003/REC-PNG-20031110/#8InterlaceMethods ." + % self.interlace) + + # Derived values + # http://www.w3.org/TR/PNG/#6Colour-values + colormap = bool(self.color_type & 1) + greyscale = not (self.color_type & 2) + alpha = bool(self.color_type & 4) + color_planes = (3,1)[greyscale or colormap] + planes = color_planes + alpha + + self.colormap = colormap + self.greyscale = greyscale + self.alpha = alpha + self.color_planes = color_planes + self.planes = planes + self.psize = float(self.bitdepth)/float(8) * planes + if int(self.psize) == self.psize: + self.psize = int(self.psize) + self.row_bytes = int(math.ceil(self.width * self.psize)) + # Stores PLTE chunk if present, and is used to check + # chunk ordering constraints. + self.plte = None + # Stores tRNS chunk if present, and is used to check chunk + # ordering constraints. + self.trns = None + # Stores sbit chunk if present. + self.sbit = None + + def _process_PLTE(self, data): + # http://www.w3.org/TR/PNG/#11PLTE + if self.plte: + warnings.warn("Multiple PLTE chunks present.") + self.plte = data + if len(data) % 3 != 0: + raise FormatError( + "PLTE chunk's length should be a multiple of 3.") + if len(data) > (2**self.bitdepth)*3: + raise FormatError("PLTE chunk is too long.") + if len(data) == 0: + raise FormatError("Empty PLTE is not allowed.") + + def _process_bKGD(self, data): + try: + if self.colormap: + if not self.plte: + warnings.warn( + "PLTE chunk is required before bKGD chunk.") + self.background = struct.unpack('B', data) + else: + self.background = struct.unpack("!%dH" % self.color_planes, + data) + except struct.error: + raise FormatError("bKGD chunk has incorrect length.") + + def _process_tRNS(self, data): + # http://www.w3.org/TR/PNG/#11tRNS + self.trns = data + if self.colormap: + if not self.plte: + warnings.warn("PLTE chunk is required before tRNS chunk.") + else: + if len(data) > len(self.plte)/3: + # Was warning, but promoted to Error as it + # would otherwise cause pain later on. + raise FormatError("tRNS chunk is too long.") + else: + if self.alpha: + raise FormatError( + "tRNS chunk is not valid with colour type %d." % + self.color_type) + try: + self.transparent = \ + struct.unpack("!%dH" % self.color_planes, data) + except struct.error: + raise FormatError("tRNS chunk has incorrect length.") + + def _process_gAMA(self, data): + try: + self.gamma = struct.unpack("!L", data)[0] / 100000.0 + except struct.error: + raise FormatError("gAMA chunk has incorrect length.") + + def _process_sBIT(self, data): + self.sbit = data + if (self.colormap and len(data) != 3 or + not self.colormap and len(data) != self.planes): + raise FormatError("sBIT chunk has incorrect length.") + + def _process_pHYs(self, data): + # http://www.w3.org/TR/PNG/#11pHYs + self.phys = data + fmt = "!LLB" + if len(data) != struct.calcsize(fmt): + raise FormatError("pHYs chunk has incorrect length.") + self.x_pixels_per_unit, self.y_pixels_per_unit, unit = struct.unpack(fmt,data) + self.unit_is_meter = bool(unit) + + def read(self, lenient=False): + """ + Read the PNG file and decode it. Returns (`width`, `height`, + `pixels`, `metadata`). + + May use excessive memory. + + `pixels` are returned in boxed row flat pixel format. + + If the optional `lenient` argument evaluates to True, + checksum failures will raise warnings rather than exceptions. + """ + + def iteridat(): + """Iterator that yields all the ``IDAT`` chunks as strings.""" + while True: + try: + type, data = self.chunk(lenient=lenient) + except ValueError as e: + raise ChunkError(e.args[0]) + if type == b'IEND': + # http://www.w3.org/TR/PNG/#11IEND + break + if type != b'IDAT': + continue + # type == b'IDAT' + # http://www.w3.org/TR/PNG/#11IDAT + if self.colormap and not self.plte: + warnings.warn("PLTE chunk is required before IDAT chunk") + yield data + + def iterdecomp(idat): + """Iterator that yields decompressed strings. `idat` should + be an iterator that yields the ``IDAT`` chunk data. + """ + + # Currently, with no max_length parameter to decompress, + # this routine will do one yield per IDAT chunk: Not very + # incremental. + d = zlib.decompressobj() + # Each IDAT chunk is passed to the decompressor, then any + # remaining state is decompressed out. + for data in idat: + # :todo: add a max_length argument here to limit output + # size. + yield array('B', d.decompress(data)) + yield array('B', d.flush()) + + self.preamble(lenient=lenient) + raw = iterdecomp(iteridat()) + + if self.interlace: + raw = array('B', itertools.chain(*raw)) + arraycode = 'BH'[self.bitdepth>8] + # Like :meth:`group` but producing an array.array object for + # each row. + pixels = map(lambda *row: array(arraycode, row), + *[iter(self.deinterlace(raw))]*self.width*self.planes) + else: + pixels = self.iterboxed(self.iterstraight(raw)) + meta = dict() + for attr in 'greyscale alpha planes bitdepth interlace'.split(): + meta[attr] = getattr(self, attr) + meta['size'] = (self.width, self.height) + for attr in 'gamma transparent background'.split(): + a = getattr(self, attr, None) + if a is not None: + meta[attr] = a + if self.plte: + meta['palette'] = self.palette() + return self.width, self.height, pixels, meta + + + def read_flat(self): + """ + Read a PNG file and decode it into flat row flat pixel format. + Returns (*width*, *height*, *pixels*, *metadata*). + + May use excessive memory. + + `pixels` are returned in flat row flat pixel format. + + See also the :meth:`read` method which returns pixels in the + more stream-friendly boxed row flat pixel format. + """ + + x, y, pixel, meta = self.read() + arraycode = 'BH'[meta['bitdepth']>8] + pixel = array(arraycode, itertools.chain(*pixel)) + return x, y, pixel, meta + + def palette(self, alpha='natural'): + """Returns a palette that is a sequence of 3-tuples or 4-tuples, + synthesizing it from the ``PLTE`` and ``tRNS`` chunks. These + chunks should have already been processed (for example, by + calling the :meth:`preamble` method). All the tuples are the + same size: 3-tuples if there is no ``tRNS`` chunk, 4-tuples when + there is a ``tRNS`` chunk. Assumes that the image is colour type + 3 and therefore a ``PLTE`` chunk is required. + + If the `alpha` argument is ``'force'`` then an alpha channel is + always added, forcing the result to be a sequence of 4-tuples. + """ + + if not self.plte: + raise FormatError( + "Required PLTE chunk is missing in colour type 3 image.") + plte = group(array('B', self.plte), 3) + if self.trns or alpha == 'force': + trns = array('B', self.trns or '') + trns.extend([255]*(len(plte)-len(trns))) + plte = list(map(operator.add, plte, group(trns, 1))) + return plte + + def asDirect(self): + """Returns the image data as a direct representation of an + ``x * y * planes`` array. This method is intended to remove the + need for callers to deal with palettes and transparency + themselves. Images with a palette (colour type 3) + are converted to RGB or RGBA; images with transparency (a + ``tRNS`` chunk) are converted to LA or RGBA as appropriate. + When returned in this format the pixel values represent the + colour value directly without needing to refer to palettes or + transparency information. + + Like the :meth:`read` method this method returns a 4-tuple: + + (*width*, *height*, *pixels*, *meta*) + + This method normally returns pixel values with the bit depth + they have in the source image, but when the source PNG has an + ``sBIT`` chunk it is inspected and can reduce the bit depth of + the result pixels; pixel values will be reduced according to + the bit depth specified in the ``sBIT`` chunk (PNG nerds should + note a single result bit depth is used for all channels; the + maximum of the ones specified in the ``sBIT`` chunk. An RGB565 + image will be rescaled to 6-bit RGB666). + + The *meta* dictionary that is returned reflects the `direct` + format and not the original source image. For example, an RGB + source image with a ``tRNS`` chunk to represent a transparent + colour, will have ``planes=3`` and ``alpha=False`` for the + source image, but the *meta* dictionary returned by this method + will have ``planes=4`` and ``alpha=True`` because an alpha + channel is synthesized and added. + + *pixels* is the pixel data in boxed row flat pixel format (just + like the :meth:`read` method). + + All the other aspects of the image data are not changed. + """ + + self.preamble() + + # Simple case, no conversion necessary. + if not self.colormap and not self.trns and not self.sbit: + return self.read() + + x,y,pixels,meta = self.read() + + if self.colormap: + meta['colormap'] = False + meta['alpha'] = bool(self.trns) + meta['bitdepth'] = 8 + meta['planes'] = 3 + bool(self.trns) + plte = self.palette() + def iterpal(pixels): + for row in pixels: + row = [plte[x] for x in row] + yield array('B', itertools.chain(*row)) + pixels = iterpal(pixels) + elif self.trns: + # It would be nice if there was some reasonable way + # of doing this without generating a whole load of + # intermediate tuples. But tuples does seem like the + # easiest way, with no other way clearly much simpler or + # much faster. (Actually, the L to LA conversion could + # perhaps go faster (all those 1-tuples!), but I still + # wonder whether the code proliferation is worth it) + it = self.transparent + maxval = 2**meta['bitdepth']-1 + planes = meta['planes'] + meta['alpha'] = True + meta['planes'] += 1 + typecode = 'BH'[meta['bitdepth']>8] + def itertrns(pixels): + for row in pixels: + # For each row we group it into pixels, then form a + # characterisation vector that says whether each + # pixel is opaque or not. Then we convert + # True/False to 0/maxval (by multiplication), + # and add it as the extra channel. + row = group(row, planes) + opa = map(it.__ne__, row) + opa = map(maxval.__mul__, opa) + opa = list(zip(opa)) # convert to 1-tuples + yield array(typecode, + itertools.chain(*map(operator.add, row, opa))) + pixels = itertrns(pixels) + targetbitdepth = None + if self.sbit: + sbit = struct.unpack('%dB' % len(self.sbit), self.sbit) + targetbitdepth = max(sbit) + if targetbitdepth > meta['bitdepth']: + raise Error('sBIT chunk %r exceeds bitdepth %d' % + (sbit,self.bitdepth)) + if min(sbit) <= 0: + raise Error('sBIT chunk %r has a 0-entry' % sbit) + if targetbitdepth == meta['bitdepth']: + targetbitdepth = None + if targetbitdepth: + shift = meta['bitdepth'] - targetbitdepth + meta['bitdepth'] = targetbitdepth + def itershift(pixels): + for row in pixels: + yield [p >> shift for p in row] + pixels = itershift(pixels) + return x,y,pixels,meta + + def asFloat(self, maxval=1.0): + """Return image pixels as per :meth:`asDirect` method, but scale + all pixel values to be floating point values between 0.0 and + *maxval*. + """ + + x,y,pixels,info = self.asDirect() + sourcemaxval = 2**info['bitdepth']-1 + del info['bitdepth'] + info['maxval'] = float(maxval) + factor = float(maxval)/float(sourcemaxval) + def iterfloat(): + for row in pixels: + yield [factor * p for p in row] + return x,y,iterfloat(),info + + def _as_rescale(self, get, targetbitdepth): + """Helper used by :meth:`asRGB8` and :meth:`asRGBA8`.""" + + width,height,pixels,meta = get() + maxval = 2**meta['bitdepth'] - 1 + targetmaxval = 2**targetbitdepth - 1 + factor = float(targetmaxval) / float(maxval) + meta['bitdepth'] = targetbitdepth + def iterscale(): + for row in pixels: + yield [int(round(x*factor)) for x in row] + if maxval == targetmaxval: + return width, height, pixels, meta + else: + return width, height, iterscale(), meta + + def asRGB8(self): + """Return the image data as an RGB pixels with 8-bits per + sample. This is like the :meth:`asRGB` method except that + this method additionally rescales the values so that they + are all between 0 and 255 (8-bit). In the case where the + source image has a bit depth < 8 the transformation preserves + all the information; where the source image has bit depth + > 8, then rescaling to 8-bit values loses precision. No + dithering is performed. Like :meth:`asRGB`, an alpha channel + in the source image will raise an exception. + + This function returns a 4-tuple: + (*width*, *height*, *pixels*, *metadata*). + *width*, *height*, *metadata* are as per the + :meth:`read` method. + + *pixels* is the pixel data in boxed row flat pixel format. + """ + + return self._as_rescale(self.asRGB, 8) + + def asRGBA8(self): + """Return the image data as RGBA pixels with 8-bits per + sample. This method is similar to :meth:`asRGB8` and + :meth:`asRGBA`: The result pixels have an alpha channel, *and* + values are rescaled to the range 0 to 255. The alpha channel is + synthesized if necessary (with a small speed penalty). + """ + + return self._as_rescale(self.asRGBA, 8) + + def asRGB(self): + """Return image as RGB pixels. RGB colour images are passed + through unchanged; greyscales are expanded into RGB + triplets (there is a small speed overhead for doing this). + + An alpha channel in the source image will raise an + exception. + + The return values are as for the :meth:`read` method + except that the *metadata* reflect the returned pixels, not the + source image. In particular, for this method + ``metadata['greyscale']`` will be ``False``. + """ + + width,height,pixels,meta = self.asDirect() + if meta['alpha']: + raise Error("will not convert image with alpha channel to RGB") + if not meta['greyscale']: + return width,height,pixels,meta + meta['greyscale'] = False + typecode = 'BH'[meta['bitdepth'] > 8] + def iterrgb(): + for row in pixels: + a = array(typecode, [0]) * 3 * width + for i in range(3): + a[i::3] = row + yield a + return width,height,iterrgb(),meta + + def asRGBA(self): + """Return image as RGBA pixels. Greyscales are expanded into + RGB triplets; an alpha channel is synthesized if necessary. + The return values are as for the :meth:`read` method + except that the *metadata* reflect the returned pixels, not the + source image. In particular, for this method + ``metadata['greyscale']`` will be ``False``, and + ``metadata['alpha']`` will be ``True``. + """ + + width,height,pixels,meta = self.asDirect() + if meta['alpha'] and not meta['greyscale']: + return width,height,pixels,meta + typecode = 'BH'[meta['bitdepth'] > 8] + maxval = 2**meta['bitdepth'] - 1 + maxbuffer = struct.pack('=' + typecode, maxval) * 4 * width + def newarray(): + return array(typecode, maxbuffer) + + if meta['alpha'] and meta['greyscale']: + # LA to RGBA + def convert(): + for row in pixels: + # Create a fresh target row, then copy L channel + # into first three target channels, and A channel + # into fourth channel. + a = newarray() + pngfilters.convert_la_to_rgba(row, a) + yield a + elif meta['greyscale']: + # L to RGBA + def convert(): + for row in pixels: + a = newarray() + pngfilters.convert_l_to_rgba(row, a) + yield a + else: + assert not meta['alpha'] and not meta['greyscale'] + # RGB to RGBA + def convert(): + for row in pixels: + a = newarray() + pngfilters.convert_rgb_to_rgba(row, a) + yield a + meta['alpha'] = True + meta['greyscale'] = False + return width,height,convert(),meta + +def check_bitdepth_colortype(bitdepth, colortype): + """Check that `bitdepth` and `colortype` are both valid, + and specified in a valid combination. Returns if valid, + raise an Exception if not valid. + """ + + if bitdepth not in (1,2,4,8,16): + raise FormatError("invalid bit depth %d" % bitdepth) + if colortype not in (0,2,3,4,6): + raise FormatError("invalid colour type %d" % colortype) + # Check indexed (palettized) images have 8 or fewer bits + # per pixel; check only indexed or greyscale images have + # fewer than 8 bits per pixel. + if colortype & 1 and bitdepth > 8: + raise FormatError( + "Indexed images (colour type %d) cannot" + " have bitdepth > 8 (bit depth %d)." + " See http://www.w3.org/TR/2003/REC-PNG-20031110/#table111 ." + % (bitdepth, colortype)) + if bitdepth < 8 and colortype not in (0,3): + raise FormatError("Illegal combination of bit depth (%d)" + " and colour type (%d)." + " See http://www.w3.org/TR/2003/REC-PNG-20031110/#table111 ." + % (bitdepth, colortype)) + +def isinteger(x): + try: + return int(x) == x + except (TypeError, ValueError): + return False + + +# === Support for users without Cython === + +try: + pngfilters +except NameError: + class pngfilters(object): + def undo_filter_sub(filter_unit, scanline, previous, result): + """Undo sub filter.""" + + ai = 0 + # Loops starts at index fu. Observe that the initial part + # of the result is already filled in correctly with + # scanline. + for i in range(filter_unit, len(result)): + x = scanline[i] + a = result[ai] + result[i] = (x + a) & 0xff + ai += 1 + undo_filter_sub = staticmethod(undo_filter_sub) + + def undo_filter_up(filter_unit, scanline, previous, result): + """Undo up filter.""" + + for i in range(len(result)): + x = scanline[i] + b = previous[i] + result[i] = (x + b) & 0xff + undo_filter_up = staticmethod(undo_filter_up) + + def undo_filter_average(filter_unit, scanline, previous, result): + """Undo up filter.""" + + ai = -filter_unit + for i in range(len(result)): + x = scanline[i] + if ai < 0: + a = 0 + else: + a = result[ai] + b = previous[i] + result[i] = (x + ((a + b) >> 1)) & 0xff + ai += 1 + undo_filter_average = staticmethod(undo_filter_average) + + def undo_filter_paeth(filter_unit, scanline, previous, result): + """Undo Paeth filter.""" + + # Also used for ci. + ai = -filter_unit + for i in range(len(result)): + x = scanline[i] + if ai < 0: + a = c = 0 + else: + a = result[ai] + c = previous[ai] + b = previous[i] + p = a + b - c + pa = abs(p - a) + pb = abs(p - b) + pc = abs(p - c) + if pa <= pb and pa <= pc: + pr = a + elif pb <= pc: + pr = b + else: + pr = c + result[i] = (x + pr) & 0xff + ai += 1 + undo_filter_paeth = staticmethod(undo_filter_paeth) + + def convert_la_to_rgba(row, result): + for i in range(3): + result[i::4] = row[0::2] + result[3::4] = row[1::2] + convert_la_to_rgba = staticmethod(convert_la_to_rgba) + + def convert_l_to_rgba(row, result): + """Convert a grayscale image to RGBA. This method assumes + the alpha channel in result is already correctly + initialized. + """ + for i in range(3): + result[i::4] = row + convert_l_to_rgba = staticmethod(convert_l_to_rgba) + + def convert_rgb_to_rgba(row, result): + """Convert an RGB image to RGBA. This method assumes the + alpha channel in result is already correctly initialized. + """ + for i in range(3): + result[i::4] = row[i::3] + convert_rgb_to_rgba = staticmethod(convert_rgb_to_rgba) + + +# === Command Line Support === + +def read_pam_header(infile): + """ + Read (the rest of a) PAM header. `infile` should be positioned + immediately after the initial 'P7' line (at the beginning of the + second line). Returns are as for `read_pnm_header`. + """ + + # Unlike PBM, PGM, and PPM, we can read the header a line at a time. + header = dict() + while True: + l = infile.readline().strip() + if l == b'ENDHDR': + break + if not l: + raise EOFError('PAM ended prematurely') + if l[0] == b'#': + continue + l = l.split(None, 1) + if l[0] not in header: + header[l[0]] = l[1] + else: + header[l[0]] += b' ' + l[1] + + required = [b'WIDTH', b'HEIGHT', b'DEPTH', b'MAXVAL'] + WIDTH,HEIGHT,DEPTH,MAXVAL = required + present = [x for x in required if x in header] + if len(present) != len(required): + raise Error('PAM file must specify WIDTH, HEIGHT, DEPTH, and MAXVAL') + width = int(header[WIDTH]) + height = int(header[HEIGHT]) + depth = int(header[DEPTH]) + maxval = int(header[MAXVAL]) + if (width <= 0 or + height <= 0 or + depth <= 0 or + maxval <= 0): + raise Error( + 'WIDTH, HEIGHT, DEPTH, MAXVAL must all be positive integers') + return 'P7', width, height, depth, maxval + +def read_pnm_header(infile, supported=(b'P5', b'P6')): + """ + Read a PNM header, returning (format,width,height,depth,maxval). + `width` and `height` are in pixels. `depth` is the number of + channels in the image; for PBM and PGM it is synthesized as 1, for + PPM as 3; for PAM images it is read from the header. `maxval` is + synthesized (as 1) for PBM images. + """ + + # Generally, see http://netpbm.sourceforge.net/doc/ppm.html + # and http://netpbm.sourceforge.net/doc/pam.html + + # Technically 'P7' must be followed by a newline, so by using + # rstrip() we are being liberal in what we accept. I think this + # is acceptable. + type = infile.read(3).rstrip() + if type not in supported: + raise NotImplementedError('file format %s not supported' % type) + if type == b'P7': + # PAM header parsing is completely different. + return read_pam_header(infile) + # Expected number of tokens in header (3 for P4, 4 for P6) + expected = 4 + pbm = (b'P1', b'P4') + if type in pbm: + expected = 3 + header = [type] + + # We have to read the rest of the header byte by byte because the + # final whitespace character (immediately following the MAXVAL in + # the case of P6) may not be a newline. Of course all PNM files in + # the wild use a newline at this point, so it's tempting to use + # readline; but it would be wrong. + def getc(): + c = infile.read(1) + if not c: + raise Error('premature EOF reading PNM header') + return c + + c = getc() + while True: + # Skip whitespace that precedes a token. + while c.isspace(): + c = getc() + # Skip comments. + while c == '#': + while c not in b'\n\r': + c = getc() + if not c.isdigit(): + raise Error('unexpected character %s found in header' % c) + # According to the specification it is legal to have comments + # that appear in the middle of a token. + # This is bonkers; I've never seen it; and it's a bit awkward to + # code good lexers in Python (no goto). So we break on such + # cases. + token = b'' + while c.isdigit(): + token += c + c = getc() + # Slight hack. All "tokens" are decimal integers, so convert + # them here. + header.append(int(token)) + if len(header) == expected: + break + # Skip comments (again) + while c == '#': + while c not in '\n\r': + c = getc() + if not c.isspace(): + raise Error('expected header to end with whitespace, not %s' % c) + + if type in pbm: + # synthesize a MAXVAL + header.append(1) + depth = (1,3)[type == b'P6'] + return header[0], header[1], header[2], depth, header[3] + +def write_pnm(file, width, height, pixels, meta): + """Write a Netpbm PNM/PAM file. + """ + + bitdepth = meta['bitdepth'] + maxval = 2**bitdepth - 1 + # Rudely, the number of image planes can be used to determine + # whether we are L (PGM), LA (PAM), RGB (PPM), or RGBA (PAM). + planes = meta['planes'] + # Can be an assert as long as we assume that pixels and meta came + # from a PNG file. + assert planes in (1,2,3,4) + if planes in (1,3): + if 1 == planes: + # PGM + # Could generate PBM if maxval is 1, but we don't (for one + # thing, we'd have to convert the data, not just blat it + # out). + fmt = 'P5' + else: + # PPM + fmt = 'P6' + header = '%s %d %d %d\n' % (fmt, width, height, maxval) + if planes in (2,4): + # PAM + # See http://netpbm.sourceforge.net/doc/pam.html + if 2 == planes: + tupltype = 'GRAYSCALE_ALPHA' + else: + tupltype = 'RGB_ALPHA' + header = ('P7\nWIDTH %d\nHEIGHT %d\nDEPTH %d\nMAXVAL %d\n' + 'TUPLTYPE %s\nENDHDR\n' % + (width, height, planes, maxval, tupltype)) + file.write(header.encode('ascii')) + # Values per row + vpr = planes * width + # struct format + fmt = '>%d' % vpr + if maxval > 0xff: + fmt = fmt + 'H' + else: + fmt = fmt + 'B' + for row in pixels: + file.write(struct.pack(fmt, *row)) + file.flush() + +def color_triple(color): + """ + Convert a command line colour value to a RGB triple of integers. + FIXME: Somewhere we need support for greyscale backgrounds etc. + """ + if color.startswith('#') and len(color) == 4: + return (int(color[1], 16), + int(color[2], 16), + int(color[3], 16)) + if color.startswith('#') and len(color) == 7: + return (int(color[1:3], 16), + int(color[3:5], 16), + int(color[5:7], 16)) + elif color.startswith('#') and len(color) == 13: + return (int(color[1:5], 16), + int(color[5:9], 16), + int(color[9:13], 16)) + +def _add_common_options(parser): + """Call *parser.add_option* for each of the options that are + common between this PNG--PNM conversion tool and the gen + tool. + """ + parser.add_option("-i", "--interlace", + default=False, action="store_true", + help="create an interlaced PNG file (Adam7)") + parser.add_option("-t", "--transparent", + action="store", type="string", metavar="#RRGGBB", + help="mark the specified colour as transparent") + parser.add_option("-b", "--background", + action="store", type="string", metavar="#RRGGBB", + help="save the specified background colour") + parser.add_option("-g", "--gamma", + action="store", type="float", metavar="value", + help="save the specified gamma value") + parser.add_option("-c", "--compression", + action="store", type="int", metavar="level", + help="zlib compression level (0-9)") + return parser + +def _main(argv): + """ + Run the PNG encoder with options from the command line. + """ + + # Parse command line arguments + from optparse import OptionParser + version = '%prog ' + __version__ + parser = OptionParser(version=version) + parser.set_usage("%prog [options] [imagefile]") + parser.add_option('-r', '--read-png', default=False, + action='store_true', + help='Read PNG, write PNM') + parser.add_option("-a", "--alpha", + action="store", type="string", metavar="pgmfile", + help="alpha channel transparency (RGBA)") + _add_common_options(parser) + + (options, args) = parser.parse_args(args=argv[1:]) + + # Convert options + if options.transparent is not None: + options.transparent = color_triple(options.transparent) + if options.background is not None: + options.background = color_triple(options.background) + + # Prepare input and output files + if len(args) == 0: + infilename = '-' + infile = sys.stdin + elif len(args) == 1: + infilename = args[0] + infile = open(infilename, 'rb') + else: + parser.error("more than one input file") + outfile = sys.stdout + if sys.platform == "win32": + import msvcrt, os + msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) + + if options.read_png: + # Encode PNG to PPM + png = Reader(file=infile) + width,height,pixels,meta = png.asDirect() + write_pnm(outfile, width, height, pixels, meta) + else: + # Encode PNM to PNG + format, width, height, depth, maxval = \ + read_pnm_header(infile, (b'P5',b'P6',b'P7')) + # When it comes to the variety of input formats, we do something + # rather rude. Observe that L, LA, RGB, RGBA are the 4 colour + # types supported by PNG and that they correspond to 1, 2, 3, 4 + # channels respectively. So we use the number of channels in + # the source image to determine which one we have. We do not + # care about TUPLTYPE. + greyscale = depth <= 2 + pamalpha = depth in (2,4) + supported = [2**x-1 for x in range(1,17)] + try: + mi = supported.index(maxval) + except ValueError: + raise NotImplementedError( + 'your maxval (%s) not in supported list %s' % + (maxval, str(supported))) + bitdepth = mi+1 + writer = Writer(width, height, + greyscale=greyscale, + bitdepth=bitdepth, + interlace=options.interlace, + transparent=options.transparent, + background=options.background, + alpha=bool(pamalpha or options.alpha), + gamma=options.gamma, + compression=options.compression) + if options.alpha: + pgmfile = open(options.alpha, 'rb') + format, awidth, aheight, adepth, amaxval = \ + read_pnm_header(pgmfile, 'P5') + if amaxval != '255': + raise NotImplementedError( + 'maxval %s not supported for alpha channel' % amaxval) + if (awidth, aheight) != (width, height): + raise ValueError("alpha channel image size mismatch" + " (%s has %sx%s but %s has %sx%s)" + % (infilename, width, height, + options.alpha, awidth, aheight)) + writer.convert_ppm_and_pgm(infile, pgmfile, outfile) + else: + writer.convert_pnm(infile, outfile) + + +if __name__ == '__main__': + try: + _main(sys.argv) + except Error as e: + print(e, file=sys.stderr) From 118c2cf268cce89536aa7cdb7e63a754c8a126e7 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 31 Dec 2018 17:39:49 -0500 Subject: [PATCH 20/23] 'make tidy' preserved compressed graphics, like pokecrystal --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 32d37f16..21d08ae0 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ pokeblue_obj := audio_blue.o main_blue.o text_blue.o wram_blue.o .SECONDEXPANSION: .PRECIOUS: .SECONDARY: -.PHONY: all clean red blue compare tools +.PHONY: all clean red blue compare tools tidy roms := pokered.gbc pokeblue.gbc @@ -24,6 +24,10 @@ clean: find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -exec rm {} + $(MAKE) clean -C tools/ +tidy: + rm -f $(roms) $(pokered_obj) $(pokeblue_obj) $(roms:.gbc=.sym) + $(MAKE) clean -C tools/ + tools: $(MAKE) -C tools/ From b8b5ab5e6628dec9e8c88020e39975157cb0a0a6 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 31 Dec 2018 18:12:25 -0500 Subject: [PATCH 21/23] Reorganize Makefile similarly to pokecrystal --- Makefile | 54 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 21d08ae0..04a08e05 100644 --- a/Makefile +++ b/Makefile @@ -1,22 +1,34 @@ -MD5 := md5sum -c +roms := pokered.gbc pokeblue.gbc pokered_obj := audio_red.o main_red.o text_red.o wram_red.o pokeblue_obj := audio_blue.o main_blue.o text_blue.o wram_blue.o + +### Build tools + +MD5 := md5sum -c + +RGBDS ?= +RGBASM ?= $(RGBDS)rgbasm +RGBFIX ?= $(RGBDS)rgbfix +RGBGFX ?= $(RGBDS)rgbgfx +RGBLINK ?= $(RGBDS)rgblink + + +### Build targets + .SUFFIXES: .SECONDEXPANSION: .PRECIOUS: .SECONDARY: -.PHONY: all clean red blue compare tools tidy - -roms := pokered.gbc pokeblue.gbc +.PHONY: all red blue clean tidy compare tools all: $(roms) red: pokered.gbc blue: pokeblue.gbc # For contributors to make sure a change didn't affect the contents of the rom. -compare: red blue +compare: $(roms) @$(MD5) roms.md5 clean: @@ -43,40 +55,48 @@ endif %_red.o: dep = $(shell tools/scan_includes $(@D)/$*.asm) $(pokered_obj): %_red.o: %.asm $$(dep) - rgbasm -D _RED -h -o $@ $*.asm + $(RGBASM) -D _RED -h -o $@ $*.asm %_blue.o: dep = $(shell tools/scan_includes $(@D)/$*.asm) $(pokeblue_obj): %_blue.o: %.asm $$(dep) - rgbasm -D _BLUE -h -o $@ $*.asm + $(RGBASM) -D _BLUE -h -o $@ $*.asm pokered_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON RED" pokeblue_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON BLUE" %.gbc: $$(%_obj) - rgblink -d -n $*.sym -l pokered.link -o $@ $^ - rgbfix $($*_opt) $@ + $(RGBLINK) -d -n $*.sym -l pokered.link -o $@ $^ + $(RGBFIX) $($*_opt) $@ sort $*.sym -o $*.sym -gfx/blue/intro_purin_1.2bpp: rgbgfx += -h -gfx/blue/intro_purin_2.2bpp: rgbgfx += -h -gfx/blue/intro_purin_3.2bpp: rgbgfx += -h -gfx/red/intro_nido_1.2bpp: rgbgfx += -h -gfx/red/intro_nido_2.2bpp: rgbgfx += -h -gfx/red/intro_nido_3.2bpp: rgbgfx += -h + +### Misc file-specific graphics rules + +gfx/blue/intro_purin_1.2bpp: $(RGBGFX) += -h +gfx/blue/intro_purin_2.2bpp: $(RGBGFX) += -h +gfx/blue/intro_purin_3.2bpp: $(RGBGFX) += -h +gfx/red/intro_nido_1.2bpp: $(RGBGFX) += -h +gfx/red/intro_nido_2.2bpp: $(RGBGFX) += -h +gfx/red/intro_nido_3.2bpp: $(RGBGFX) += -h gfx/game_boy.2bpp: tools/gfx += --remove-duplicates gfx/theend.2bpp: tools/gfx += --interleave --png=$< gfx/tilesets/%.2bpp: tools/gfx += --trim-whitespace + +### Catch-all graphics rules + %.png: ; %.2bpp: %.png - rgbgfx $(rgbgfx) -o $@ $< + $(RGBGFX) $(rgbgfx) -o $@ $< $(if $(tools/gfx),\ tools/gfx $(tools/gfx) -o $@ $@) + %.1bpp: %.png - rgbgfx -d1 $(rgbgfx) -o $@ $< + $(RGBGFX) -d1 $(rgbgfx) -o $@ $< $(if $(tools/gfx),\ tools/gfx $(tools/gfx) -d1 -o $@ $@) + %.pic: %.2bpp tools/pkmncompress $< $@ From 703224335280bf1170982113ac3d09fe198c0564 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 31 Dec 2018 18:56:07 -0500 Subject: [PATCH 22/23] Make tools/gfx.py executable --- tools/gfx.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/gfx.py b/tools/gfx.py index fae7bbdc..a3d95562 100644 --- a/tools/gfx.py +++ b/tools/gfx.py @@ -1,3 +1,6 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- + """Supplementary scripts for graphics conversion.""" import os From c7796024590fec48ac79756793c1a6e3b54daf8f Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 1 Jan 2019 15:06:23 -0500 Subject: [PATCH 23/23] Rename map files, labels, and constants to be consistent and work with Polished Map --- audio.asm | 3 - constants/hide_show_constants.asm | 456 ++--- constants/map_constants.asm | 496 ++--- data/force_bike_surf.asm | 8 +- data/hidden_item_coords.asm | 46 +- data/hidden_objects.asm | 58 +- data/hide_show_data.asm | 180 +- data/mapHeaders/AgathasRoom.asm | 8 + data/mapHeaders/BikeShop.asm | 8 + data/mapHeaders/BillsHouse.asm | 8 + data/mapHeaders/BluesHouse.asm | 8 + data/mapHeaders/BrunosRoom.asm | 8 + data/mapHeaders/CeladonChiefHouse.asm | 8 + data/mapHeaders/CeladonCity.asm | 10 + data/mapHeaders/CeladonDiner.asm | 8 + data/mapHeaders/CeladonGym.asm | 8 + data/mapHeaders/CeladonHotel.asm | 8 + data/mapHeaders/CeladonMansion1F.asm | 8 + data/mapHeaders/CeladonMansion2F.asm | 8 + data/mapHeaders/CeladonMansion3F.asm | 8 + data/mapHeaders/CeladonMansionRoof.asm | 8 + data/mapHeaders/CeladonMansionRoofHouse.asm | 8 + data/mapHeaders/CeladonMart1F.asm | 8 + data/mapHeaders/CeladonMart2F.asm | 8 + data/mapHeaders/CeladonMart3F.asm | 8 + data/mapHeaders/CeladonMart4F.asm | 8 + data/mapHeaders/CeladonMart5F.asm | 8 + data/mapHeaders/CeladonMartElevator.asm | 8 + data/mapHeaders/CeladonMartRoof.asm | 8 + data/mapHeaders/CeladonPokecenter.asm | 8 + data/mapHeaders/CeruleanBadgeHouse.asm | 8 + data/mapHeaders/CeruleanCave1F.asm | 8 + data/mapHeaders/CeruleanCave2F.asm | 8 + data/mapHeaders/CeruleanCaveB1F.asm | 8 + data/mapHeaders/CeruleanCity.asm | 12 + data/mapHeaders/CeruleanGym.asm | 8 + data/mapHeaders/CeruleanMart.asm | 8 + data/mapHeaders/CeruleanPokecenter.asm | 8 + data/mapHeaders/CeruleanTradeHouse.asm | 8 + data/mapHeaders/CeruleanTrashedHouse.asm | 8 + data/mapHeaders/ChampionsRoom.asm | 8 + data/mapHeaders/CinnabarGym.asm | 8 + data/mapHeaders/CinnabarIsland.asm | 10 + data/mapHeaders/CinnabarLab.asm | 8 + data/mapHeaders/CinnabarLabFossilRoom.asm | 8 + data/mapHeaders/CinnabarLabMetronomeRoom.asm | 8 + data/mapHeaders/CinnabarLabTradeRoom.asm | 8 + data/mapHeaders/CinnabarMart.asm | 8 + data/mapHeaders/CinnabarPokecenter.asm | 8 + data/mapHeaders/Colosseum.asm | 8 + data/mapHeaders/CopycatsHouse1F.asm | 8 + data/mapHeaders/CopycatsHouse2F.asm | 8 + data/mapHeaders/Daycare.asm | 8 + data/mapHeaders/DiglettsCave.asm | 8 + data/mapHeaders/DiglettsCaveRoute11.asm | 8 + data/mapHeaders/DiglettsCaveRoute2.asm | 8 + data/mapHeaders/FightingDojo.asm | 8 + data/mapHeaders/FuchsiaBillsGrandpasHouse.asm | 8 + data/mapHeaders/FuchsiaCity.asm | 11 + data/mapHeaders/FuchsiaGoodRodHouse.asm | 8 + data/mapHeaders/FuchsiaGym.asm | 8 + data/mapHeaders/FuchsiaMart.asm | 8 + data/mapHeaders/FuchsiaMeetingRoom.asm | 8 + data/mapHeaders/FuchsiaPokecenter.asm | 8 + data/mapHeaders/GameCorner.asm | 8 + data/mapHeaders/GameCornerPrizeRoom.asm | 8 + data/mapHeaders/HallOfFame.asm | 8 + data/mapHeaders/IndigoPlateau.asm | 9 + data/mapHeaders/IndigoPlateauLobby.asm | 8 + data/mapHeaders/LancesRoom.asm | 8 + data/mapHeaders/LavenderCuboneHouse.asm | 8 + data/mapHeaders/LavenderMart.asm | 8 + data/mapHeaders/LavenderPokecenter.asm | 8 + data/mapHeaders/LavenderTown.asm | 11 + data/mapHeaders/LoreleisRoom.asm | 8 + data/mapHeaders/MrFujisHouse.asm | 8 + data/mapHeaders/MrPsychicsHouse.asm | 8 + data/mapHeaders/MtMoon1F.asm | 8 + data/mapHeaders/MtMoonB1F.asm | 8 + data/mapHeaders/MtMoonB2F.asm | 8 + data/mapHeaders/MtMoonPokecenter.asm | 8 + data/mapHeaders/Museum1F.asm | 8 + data/mapHeaders/Museum2F.asm | 8 + data/mapHeaders/NameRatersHouse.asm | 8 + data/mapHeaders/OaksLab.asm | 8 + data/mapHeaders/PalletTown.asm | 10 + data/mapHeaders/PewterCity.asm | 10 + data/mapHeaders/PewterGym.asm | 8 + data/mapHeaders/PewterMart.asm | 8 + data/mapHeaders/PewterNidoranHouse.asm | 8 + data/mapHeaders/PewterPokecenter.asm | 8 + data/mapHeaders/PewterSpeechHouse.asm | 8 + data/mapHeaders/PokemonFanClub.asm | 8 + data/mapHeaders/PokemonMansion1F.asm | 8 + data/mapHeaders/PokemonMansion2F.asm | 8 + data/mapHeaders/PokemonMansion3F.asm | 8 + data/mapHeaders/PokemonMansionB1F.asm | 8 + data/mapHeaders/PokemonTower1F.asm | 8 + data/mapHeaders/PokemonTower2F.asm | 8 + data/mapHeaders/PokemonTower3F.asm | 8 + data/mapHeaders/PokemonTower4F.asm | 8 + data/mapHeaders/PokemonTower5F.asm | 8 + data/mapHeaders/PokemonTower6F.asm | 8 + data/mapHeaders/PokemonTower7F.asm | 8 + data/mapHeaders/PowerPlant.asm | 8 + data/mapHeaders/RedsHouse1F.asm | 8 + data/mapHeaders/RedsHouse2F.asm | 8 + data/mapHeaders/RockTunnel1F.asm | 8 + data/mapHeaders/RockTunnelB1F.asm | 8 + data/mapHeaders/RockTunnelPokecenter.asm | 8 + data/mapHeaders/RocketHideoutB1F.asm | 8 + data/mapHeaders/RocketHideoutB2F.asm | 8 + data/mapHeaders/RocketHideoutB3F.asm | 8 + data/mapHeaders/RocketHideoutB4F.asm | 8 + data/mapHeaders/RocketHideoutElevator.asm | 8 + data/mapHeaders/Route1.asm | 10 + data/mapHeaders/Route10.asm | 10 + data/mapHeaders/Route11.asm | 10 + data/mapHeaders/Route11Gate1F.asm | 8 + data/mapHeaders/Route11Gate2F.asm | 8 + data/mapHeaders/Route12.asm | 11 + data/mapHeaders/Route12Gate1F.asm | 8 + data/mapHeaders/Route12Gate2F.asm | 8 + data/mapHeaders/Route12SuperRodHouse.asm | 8 + data/mapHeaders/Route13.asm | 10 + data/mapHeaders/Route14.asm | 10 + data/mapHeaders/Route15.asm | 10 + data/mapHeaders/Route15Gate1F.asm | 8 + data/mapHeaders/Route15Gate2F.asm | 8 + data/mapHeaders/Route16.asm | 10 + data/mapHeaders/Route16FlyHouse.asm | 8 + data/mapHeaders/Route16Gate1F.asm | 8 + data/mapHeaders/Route16Gate2F.asm | 8 + data/mapHeaders/Route17.asm | 10 + data/mapHeaders/Route18.asm | 10 + data/mapHeaders/Route18Gate1F.asm | 8 + data/mapHeaders/Route18Gate2F.asm | 8 + data/mapHeaders/Route19.asm | 10 + data/mapHeaders/Route2.asm | 10 + data/mapHeaders/Route20.asm | 10 + data/mapHeaders/Route21.asm | 10 + data/mapHeaders/Route22.asm | 10 + data/mapHeaders/Route22Gate.asm | 8 + data/mapHeaders/Route23.asm | 10 + data/mapHeaders/Route24.asm | 10 + data/mapHeaders/Route25.asm | 9 + data/mapHeaders/Route2Gate.asm | 8 + data/mapHeaders/Route2TradeHouse.asm | 8 + data/mapHeaders/Route3.asm | 10 + data/mapHeaders/Route4.asm | 10 + data/mapHeaders/Route5.asm | 10 + data/mapHeaders/Route5Gate.asm | 8 + data/mapHeaders/Route6.asm | 10 + data/mapHeaders/Route6Gate.asm | 8 + data/mapHeaders/Route7.asm | 10 + data/mapHeaders/Route7Gate.asm | 8 + data/mapHeaders/Route8.asm | 10 + data/mapHeaders/Route8Gate.asm | 8 + data/mapHeaders/Route9.asm | 10 + data/mapHeaders/SSAnne1F.asm | 8 + data/mapHeaders/SSAnne1FRooms.asm | 8 + data/mapHeaders/SSAnne2F.asm | 8 + data/mapHeaders/SSAnne2FRooms.asm | 8 + data/mapHeaders/SSAnne3F.asm | 8 + data/mapHeaders/SSAnneB1F.asm | 8 + data/mapHeaders/SSAnneB1FRooms.asm | 8 + data/mapHeaders/SSAnneBow.asm | 8 + data/mapHeaders/SSAnneCaptainsRoom.asm | 8 + data/mapHeaders/SSAnneKitchen.asm | 8 + data/mapHeaders/SafariZoneCenter.asm | 8 + data/mapHeaders/SafariZoneCenterRestHouse.asm | 8 + data/mapHeaders/SafariZoneEast.asm | 8 + data/mapHeaders/SafariZoneEastRestHouse.asm | 8 + data/mapHeaders/SafariZoneGate.asm | 8 + data/mapHeaders/SafariZoneNorth.asm | 8 + data/mapHeaders/SafariZoneNorthRestHouse.asm | 8 + data/mapHeaders/SafariZoneSecretHouse.asm | 8 + data/mapHeaders/SafariZoneWest.asm | 8 + data/mapHeaders/SafariZoneWestRestHouse.asm | 8 + data/mapHeaders/SaffronCity.asm | 12 + data/mapHeaders/SaffronGym.asm | 8 + data/mapHeaders/SaffronMart.asm | 8 + data/mapHeaders/SaffronPidgeyHouse.asm | 8 + data/mapHeaders/SaffronPokecenter.asm | 8 + data/mapHeaders/SeafoamIslands1F.asm | 8 + data/mapHeaders/SeafoamIslandsB1F.asm | 8 + data/mapHeaders/SeafoamIslandsB2F.asm | 8 + data/mapHeaders/SeafoamIslandsB3F.asm | 8 + data/mapHeaders/SeafoamIslandsB4F.asm | 8 + data/mapHeaders/SilphCo10F.asm | 8 + data/mapHeaders/SilphCo11F.asm | 8 + data/mapHeaders/SilphCo1F.asm | 8 + data/mapHeaders/SilphCo2F.asm | 8 + data/mapHeaders/SilphCo3F.asm | 8 + data/mapHeaders/SilphCo4F.asm | 8 + data/mapHeaders/SilphCo5F.asm | 8 + data/mapHeaders/SilphCo6F.asm | 8 + data/mapHeaders/SilphCo7F.asm | 8 + data/mapHeaders/SilphCo8F.asm | 8 + data/mapHeaders/SilphCo9F.asm | 8 + data/mapHeaders/SilphCoElevator.asm | 8 + data/mapHeaders/TradeCenter.asm | 8 + data/mapHeaders/UndergroundPathNorthSouth.asm | 8 + data/mapHeaders/UndergroundPathRoute5.asm | 8 + data/mapHeaders/UndergroundPathRoute6.asm | 8 + data/mapHeaders/UndergroundPathRoute7.asm | 8 + data/mapHeaders/UndergroundPathRoute7Copy.asm | 8 + data/mapHeaders/UndergroundPathRoute8.asm | 8 + data/mapHeaders/UndergroundPathWestEast.asm | 8 + data/mapHeaders/VermilionCity.asm | 10 + data/mapHeaders/VermilionDock.asm | 8 + data/mapHeaders/VermilionGym.asm | 8 + data/mapHeaders/VermilionMart.asm | 8 + data/mapHeaders/VermilionOldRodHouse.asm | 8 + data/mapHeaders/VermilionPidgeyHouse.asm | 8 + data/mapHeaders/VermilionPokecenter.asm | 8 + data/mapHeaders/VermilionTradeHouse.asm | 8 + data/mapHeaders/VictoryRoad1F.asm | 8 + data/mapHeaders/VictoryRoad2F.asm | 8 + data/mapHeaders/VictoryRoad3F.asm | 8 + data/mapHeaders/ViridianCity.asm | 11 + data/mapHeaders/ViridianForest.asm | 8 + data/mapHeaders/ViridianForestNorthGate.asm | 8 + data/mapHeaders/ViridianForestSouthGate.asm | 8 + data/mapHeaders/ViridianGym.asm | 8 + data/mapHeaders/ViridianMart.asm | 8 + data/mapHeaders/ViridianNicknameHouse.asm | 8 + data/mapHeaders/ViridianPokecenter.asm | 8 + data/mapHeaders/ViridianSchoolHouse.asm | 8 + data/mapHeaders/WardensHouse.asm | 8 + data/mapHeaders/agatha.asm | 6 - data/mapHeaders/bikeshop.asm | 6 - data/mapHeaders/billshouse.asm | 6 - data/mapHeaders/blueshouse.asm | 6 - data/mapHeaders/bruno.asm | 6 - data/mapHeaders/celadoncity.asm | 8 - data/mapHeaders/celadondiner.asm | 6 - data/mapHeaders/celadongamecorner.asm | 6 - data/mapHeaders/celadongym.asm | 6 - data/mapHeaders/celadonhotel.asm | 6 - data/mapHeaders/celadonhouse.asm | 6 - data/mapHeaders/celadonmansion1.asm | 6 - data/mapHeaders/celadonmansion2.asm | 6 - data/mapHeaders/celadonmansion3.asm | 6 - data/mapHeaders/celadonmansion4.asm | 6 - data/mapHeaders/celadonmansion5.asm | 6 - data/mapHeaders/celadonmart1.asm | 6 - data/mapHeaders/celadonmart2.asm | 6 - data/mapHeaders/celadonmart3.asm | 6 - data/mapHeaders/celadonmart4.asm | 6 - data/mapHeaders/celadonmart5.asm | 6 - data/mapHeaders/celadonmartelevator.asm | 6 - data/mapHeaders/celadonmartroof.asm | 6 - data/mapHeaders/celadonpokecenter.asm | 6 - data/mapHeaders/celadonprizeroom.asm | 6 - data/mapHeaders/ceruleancity.asm | 10 - data/mapHeaders/ceruleangym.asm | 6 - data/mapHeaders/ceruleanhouse1.asm | 6 - data/mapHeaders/ceruleanhouse2.asm | 6 - data/mapHeaders/ceruleanhousetrashed.asm | 6 - data/mapHeaders/ceruleanmart.asm | 6 - data/mapHeaders/ceruleanpokecenter.asm | 6 - data/mapHeaders/cinnabargym.asm | 6 - data/mapHeaders/cinnabarisland.asm | 8 - data/mapHeaders/cinnabarmart.asm | 6 - data/mapHeaders/cinnabarpokecenter.asm | 6 - data/mapHeaders/colosseum.asm | 6 - data/mapHeaders/copycatshouse1f.asm | 6 - data/mapHeaders/copycatshouse2f.asm | 6 - data/mapHeaders/daycarem.asm | 6 - data/mapHeaders/diglettscave.asm | 6 - data/mapHeaders/diglettscaveroute11.asm | 6 - data/mapHeaders/diglettscaveroute2.asm | 6 - data/mapHeaders/fanclub.asm | 6 - data/mapHeaders/fightingdojo.asm | 6 - data/mapHeaders/fuchsiacity.asm | 9 - data/mapHeaders/fuchsiagym.asm | 6 - data/mapHeaders/fuchsiahouse1.asm | 6 - data/mapHeaders/fuchsiahouse2.asm | 6 - data/mapHeaders/fuchsiahouse3.asm | 6 - data/mapHeaders/fuchsiamart.asm | 6 - data/mapHeaders/fuchsiameetingroom.asm | 6 - data/mapHeaders/fuchsiapokecenter.asm | 6 - data/mapHeaders/gary.asm | 6 - data/mapHeaders/halloffameroom.asm | 6 - data/mapHeaders/indigoplateau.asm | 7 - data/mapHeaders/indigoplateaulobby.asm | 6 - data/mapHeaders/lab1.asm | 6 - data/mapHeaders/lab2.asm | 6 - data/mapHeaders/lab3.asm | 6 - data/mapHeaders/lab4.asm | 6 - data/mapHeaders/lance.asm | 6 - data/mapHeaders/lavenderhouse1.asm | 6 - data/mapHeaders/lavenderhouse2.asm | 6 - data/mapHeaders/lavendermart.asm | 6 - data/mapHeaders/lavenderpokecenter.asm | 6 - data/mapHeaders/lavendertown.asm | 9 - data/mapHeaders/lorelei.asm | 6 - data/mapHeaders/mansion1.asm | 6 - data/mapHeaders/mansion2.asm | 6 - data/mapHeaders/mansion3.asm | 6 - data/mapHeaders/mansion4.asm | 6 - data/mapHeaders/mtmoon1.asm | 6 - data/mapHeaders/mtmoon2.asm | 6 - data/mapHeaders/mtmoon3.asm | 6 - data/mapHeaders/mtmoonpokecenter.asm | 6 - data/mapHeaders/museum1f.asm | 6 - data/mapHeaders/museum2f.asm | 6 - data/mapHeaders/namerater.asm | 6 - data/mapHeaders/oakslab.asm | 6 - data/mapHeaders/pallettown.asm | 8 - data/mapHeaders/pewtercity.asm | 8 - data/mapHeaders/pewtergym.asm | 6 - data/mapHeaders/pewterhouse1.asm | 6 - data/mapHeaders/pewterhouse2.asm | 6 - data/mapHeaders/pewtermart.asm | 6 - data/mapHeaders/pewterpokecenter.asm | 6 - data/mapHeaders/pokemontower1.asm | 6 - data/mapHeaders/pokemontower2.asm | 6 - data/mapHeaders/pokemontower3.asm | 6 - data/mapHeaders/pokemontower4.asm | 6 - data/mapHeaders/pokemontower5.asm | 6 - data/mapHeaders/pokemontower6.asm | 6 - data/mapHeaders/pokemontower7.asm | 6 - data/mapHeaders/powerplant.asm | 6 - data/mapHeaders/redshouse1f.asm | 6 - data/mapHeaders/redshouse2f.asm | 6 - data/mapHeaders/rockethideout1.asm | 6 - data/mapHeaders/rockethideout2.asm | 6 - data/mapHeaders/rockethideout3.asm | 6 - data/mapHeaders/rockethideout4.asm | 6 - data/mapHeaders/rockethideoutelevator.asm | 6 - data/mapHeaders/rocktunnel1.asm | 6 - data/mapHeaders/rocktunnel2.asm | 6 - data/mapHeaders/rocktunnelpokecenter.asm | 6 - data/mapHeaders/route1.asm | 8 - data/mapHeaders/route10.asm | 8 - data/mapHeaders/route11.asm | 8 - data/mapHeaders/route11gate.asm | 6 - data/mapHeaders/route11gateupstairs.asm | 6 - data/mapHeaders/route12.asm | 9 - data/mapHeaders/route12gate.asm | 6 - data/mapHeaders/route12gateupstairs.asm | 6 - data/mapHeaders/route12house.asm | 6 - data/mapHeaders/route13.asm | 8 - data/mapHeaders/route14.asm | 8 - data/mapHeaders/route15.asm | 8 - data/mapHeaders/route15gate.asm | 6 - data/mapHeaders/route15gateupstairs.asm | 6 - data/mapHeaders/route16.asm | 8 - data/mapHeaders/route16gate.asm | 6 - data/mapHeaders/route16gateupstairs.asm | 6 - data/mapHeaders/route16house.asm | 6 - data/mapHeaders/route17.asm | 8 - data/mapHeaders/route18.asm | 8 - data/mapHeaders/route18gate.asm | 6 - data/mapHeaders/route18gateupstairs.asm | 6 - data/mapHeaders/route19.asm | 8 - data/mapHeaders/route2.asm | 8 - data/mapHeaders/route20.asm | 8 - data/mapHeaders/route21.asm | 8 - data/mapHeaders/route22.asm | 8 - data/mapHeaders/route22gate.asm | 6 - data/mapHeaders/route23.asm | 8 - data/mapHeaders/route24.asm | 8 - data/mapHeaders/route25.asm | 7 - data/mapHeaders/route2gate.asm | 6 - data/mapHeaders/route2house.asm | 6 - data/mapHeaders/route3.asm | 8 - data/mapHeaders/route4.asm | 8 - data/mapHeaders/route5.asm | 8 - data/mapHeaders/route5gate.asm | 6 - data/mapHeaders/route6.asm | 8 - data/mapHeaders/route6gate.asm | 6 - data/mapHeaders/route7.asm | 8 - data/mapHeaders/route7gate.asm | 6 - data/mapHeaders/route8.asm | 8 - data/mapHeaders/route8gate.asm | 6 - data/mapHeaders/route9.asm | 8 - data/mapHeaders/safarizonecenter.asm | 6 - data/mapHeaders/safarizoneeast.asm | 6 - data/mapHeaders/safarizoneentrance.asm | 6 - data/mapHeaders/safarizonenorth.asm | 6 - data/mapHeaders/safarizoneresthouse1.asm | 6 - data/mapHeaders/safarizoneresthouse2.asm | 6 - data/mapHeaders/safarizoneresthouse3.asm | 6 - data/mapHeaders/safarizoneresthouse4.asm | 6 - data/mapHeaders/safarizonesecrethouse.asm | 6 - data/mapHeaders/safarizonewest.asm | 6 - data/mapHeaders/saffroncity.asm | 10 - data/mapHeaders/saffrongym.asm | 6 - data/mapHeaders/saffronhouse1.asm | 6 - data/mapHeaders/saffronhouse2.asm | 6 - data/mapHeaders/saffronmart.asm | 6 - data/mapHeaders/saffronpokecenter.asm | 6 - data/mapHeaders/school.asm | 6 - data/mapHeaders/seafoamislands1.asm | 6 - data/mapHeaders/seafoamislands2.asm | 6 - data/mapHeaders/seafoamislands3.asm | 6 - data/mapHeaders/seafoamislands4.asm | 6 - data/mapHeaders/seafoamislands5.asm | 6 - data/mapHeaders/silphco1.asm | 6 - data/mapHeaders/silphco10.asm | 6 - data/mapHeaders/silphco11.asm | 6 - data/mapHeaders/silphco2.asm | 6 - data/mapHeaders/silphco3.asm | 6 - data/mapHeaders/silphco4.asm | 6 - data/mapHeaders/silphco5.asm | 6 - data/mapHeaders/silphco6.asm | 6 - data/mapHeaders/silphco7.asm | 6 - data/mapHeaders/silphco8.asm | 6 - data/mapHeaders/silphco9.asm | 6 - data/mapHeaders/silphcoelevator.asm | 6 - data/mapHeaders/ssanne1.asm | 6 - data/mapHeaders/ssanne10.asm | 6 - data/mapHeaders/ssanne2.asm | 6 - data/mapHeaders/ssanne3.asm | 6 - data/mapHeaders/ssanne4.asm | 6 - data/mapHeaders/ssanne5.asm | 6 - data/mapHeaders/ssanne6.asm | 6 - data/mapHeaders/ssanne7.asm | 6 - data/mapHeaders/ssanne8.asm | 6 - data/mapHeaders/ssanne9.asm | 6 - data/mapHeaders/tradecenter.asm | 6 - .../undergroundpathentranceroute5.asm | 6 - .../undergroundpathentranceroute6.asm | 6 - .../undergroundpathentranceroute7.asm | 6 - .../undergroundpathentranceroute7copy.asm | 6 - .../undergroundpathentranceroute8.asm | 6 - data/mapHeaders/undergroundpathns.asm | 6 - data/mapHeaders/undergroundpathwe.asm | 6 - data/mapHeaders/unknowndungeon1.asm | 6 - data/mapHeaders/unknowndungeon2.asm | 6 - data/mapHeaders/unknowndungeon3.asm | 6 - data/mapHeaders/vermilioncity.asm | 8 - data/mapHeaders/vermiliondock.asm | 6 - data/mapHeaders/vermiliongym.asm | 6 - data/mapHeaders/vermilionhouse1.asm | 6 - data/mapHeaders/vermilionhouse2.asm | 6 - data/mapHeaders/vermilionhouse3.asm | 6 - data/mapHeaders/vermilionmart.asm | 6 - data/mapHeaders/vermilionpokecenter.asm | 6 - data/mapHeaders/victoryroad1.asm | 6 - data/mapHeaders/victoryroad2.asm | 6 - data/mapHeaders/victoryroad3.asm | 6 - data/mapHeaders/viridiancity.asm | 9 - data/mapHeaders/viridianforest.asm | 6 - data/mapHeaders/viridianforestentrance.asm | 6 - data/mapHeaders/viridianforestexit.asm | 6 - data/mapHeaders/viridiangym.asm | 6 - data/mapHeaders/viridianhouse.asm | 6 - data/mapHeaders/viridianmart.asm | 6 - data/mapHeaders/viridianpokecenter.asm | 6 - .../{agatha.asm => AgathasRoom.asm} | 2 +- .../mapObjects/{bikeshop.asm => BikeShop.asm} | 2 +- .../{billshouse.asm => BillsHouse.asm} | 2 +- .../{blueshouse.asm => BluesHouse.asm} | 2 +- data/mapObjects/{bruno.asm => BrunosRoom.asm} | 2 +- ...celadonhouse.asm => CeladonChiefHouse.asm} | 6 +- .../{celadoncity.asm => CeladonCity.asm} | 34 +- .../{celadondiner.asm => CeladonDiner.asm} | 2 +- .../{celadongym.asm => CeladonGym.asm} | 2 +- .../{celadonhotel.asm => CeladonHotel.asm} | 2 +- ...ladonmansion1.asm => CeladonMansion1F.asm} | 16 +- data/mapObjects/CeladonMansion2F.asm | 19 + ...ladonmansion3.asm => CeladonMansion3F.asm} | 18 +- data/mapObjects/CeladonMansionRoof.asm | 17 + data/mapObjects/CeladonMansionRoofHouse.asm | 16 + .../{celadonmart1.asm => CeladonMart1F.asm} | 16 +- .../{celadonmart2.asm => CeladonMart2F.asm} | 12 +- .../{celadonmart3.asm => CeladonMart3F.asm} | 12 +- .../{celadonmart4.asm => CeladonMart4F.asm} | 12 +- .../{celadonmart5.asm => CeladonMart5F.asm} | 10 +- data/mapObjects/CeladonMartElevator.asm | 15 + ...eladonmartroof.asm => CeladonMartRoof.asm} | 6 +- ...onpokecenter.asm => CeladonPokecenter.asm} | 2 +- ...uleanhouse2.asm => CeruleanBadgeHouse.asm} | 8 +- data/mapObjects/CeruleanCave1F.asm | 31 + data/mapObjects/CeruleanCave2F.asm | 25 + ...nknowndungeon3.asm => CeruleanCaveB1F.asm} | 6 +- .../{ceruleancity.asm => CeruleanCity.asm} | 26 +- .../{ceruleangym.asm => CeruleanGym.asm} | 2 +- .../{ceruleanmart.asm => CeruleanMart.asm} | 2 +- ...npokecenter.asm => CeruleanPokecenter.asm} | 2 +- ...uleanhouse1.asm => CeruleanTradeHouse.asm} | 6 +- ...setrashed.asm => CeruleanTrashedHouse.asm} | 8 +- .../{gary.asm => ChampionsRoom.asm} | 2 +- .../{cinnabargym.asm => CinnabarGym.asm} | 2 +- ...{cinnabarisland.asm => CinnabarIsland.asm} | 10 +- data/mapObjects/CinnabarLab.asm | 25 + data/mapObjects/CinnabarLabFossilRoom.asm | 16 + ...{lab3.asm => CinnabarLabMetronomeRoom.asm} | 10 +- .../{lab2.asm => CinnabarLabTradeRoom.asm} | 10 +- .../{cinnabarmart.asm => CinnabarMart.asm} | 2 +- ...rpokecenter.asm => CinnabarPokecenter.asm} | 2 +- .../{colosseum.asm => Colosseum.asm} | 2 +- ...opycatshouse1f.asm => CopycatsHouse1F.asm} | 2 +- ...opycatshouse2f.asm => CopycatsHouse2F.asm} | 2 +- data/mapObjects/{daycarem.asm => Daycare.asm} | 6 +- data/mapObjects/DiglettsCave.asm | 14 + ...averoute11.asm => DiglettsCaveRoute11.asm} | 8 +- ...scaveroute2.asm => DiglettsCaveRoute2.asm} | 8 +- .../{fightingdojo.asm => FightingDojo.asm} | 2 +- ...use1.asm => FuchsiaBillsGrandpasHouse.asm} | 6 +- .../{fuchsiacity.asm => FuchsiaCity.asm} | 22 +- ...hsiahouse3.asm => FuchsiaGoodRodHouse.asm} | 8 +- .../{fuchsiagym.asm => FuchsiaGym.asm} | 2 +- .../{fuchsiamart.asm => FuchsiaMart.asm} | 2 +- ...meetingroom.asm => FuchsiaMeetingRoom.asm} | 2 +- ...iapokecenter.asm => FuchsiaPokecenter.asm} | 2 +- .../{celadongamecorner.asm => GameCorner.asm} | 6 +- ...nprizeroom.asm => GameCornerPrizeRoom.asm} | 6 +- .../{halloffameroom.asm => HallOfFame.asm} | 2 +- .../{indigoplateau.asm => IndigoPlateau.asm} | 2 +- ...lateaulobby.asm => IndigoPlateauLobby.asm} | 2 +- data/mapObjects/{lance.asm => LancesRoom.asm} | 2 +- ...nderhouse2.asm => LavenderCuboneHouse.asm} | 6 +- .../{lavendermart.asm => LavenderMart.asm} | 2 +- ...rpokecenter.asm => LavenderPokecenter.asm} | 2 +- .../{lavendertown.asm => LavenderTown.asm} | 14 +- .../{lorelei.asm => LoreleisRoom.asm} | 2 +- .../{lavenderhouse1.asm => MrFujisHouse.asm} | 6 +- ...{saffronhouse2.asm => MrPsychicsHouse.asm} | 6 +- data/mapObjects/{mtmoon1.asm => MtMoon1F.asm} | 18 +- data/mapObjects/MtMoonB1F.asm | 26 + .../mapObjects/{mtmoon3.asm => MtMoonB2F.asm} | 18 +- ...oonpokecenter.asm => MtMoonPokecenter.asm} | 2 +- .../mapObjects/{museum1f.asm => Museum1F.asm} | 2 +- .../mapObjects/{museum2f.asm => Museum2F.asm} | 2 +- .../{namerater.asm => NameRatersHouse.asm} | 2 +- data/mapObjects/{oakslab.asm => OaksLab.asm} | 2 +- .../{pallettown.asm => PalletTown.asm} | 2 +- .../{pewtercity.asm => PewterCity.asm} | 10 +- .../{pewtergym.asm => PewterGym.asm} | 2 +- .../{pewtermart.asm => PewterMart.asm} | 2 +- ...ewterhouse1.asm => PewterNidoranHouse.asm} | 6 +- ...terpokecenter.asm => PewterPokecenter.asm} | 2 +- ...pewterhouse2.asm => PewterSpeechHouse.asm} | 6 +- .../{fanclub.asm => PokemonFanClub.asm} | 2 +- data/mapObjects/PokemonMansion1F.asm | 29 + data/mapObjects/PokemonMansion2F.asm | 22 + .../{mansion3.asm => PokemonMansion3F.asm} | 14 +- .../{mansion4.asm => PokemonMansionB1F.asm} | 6 +- .../{pokemontower1.asm => PokemonTower1F.asm} | 10 +- data/mapObjects/PokemonTower2F.asm | 16 + .../{pokemontower3.asm => PokemonTower3F.asm} | 10 +- .../{pokemontower4.asm => PokemonTower4F.asm} | 10 +- .../{pokemontower5.asm => PokemonTower5F.asm} | 10 +- .../{pokemontower6.asm => PokemonTower6F.asm} | 10 +- .../{pokemontower7.asm => PokemonTower7F.asm} | 6 +- .../{powerplant.asm => PowerPlant.asm} | 2 +- .../{redshouse1f.asm => RedsHouse1F.asm} | 2 +- .../{redshouse2f.asm => RedsHouse2F.asm} | 2 +- .../{rocktunnel1.asm => RockTunnel1F.asm} | 26 +- .../{rocktunnel2.asm => RockTunnelB1F.asm} | 18 +- ...okecenter.asm => RockTunnelPokecenter.asm} | 2 +- ...ockethideout1.asm => RocketHideoutB1F.asm} | 16 +- data/mapObjects/RocketHideoutB2F.asm | 25 + ...ockethideout3.asm => RocketHideoutB3F.asm} | 10 +- ...ockethideout4.asm => RocketHideoutB4F.asm} | 10 +- data/mapObjects/RocketHideoutElevator.asm | 15 + data/mapObjects/{route1.asm => Route1.asm} | 2 +- data/mapObjects/{route10.asm => Route10.asm} | 10 +- data/mapObjects/{route11.asm => Route11.asm} | 6 +- .../{route11gate.asm => Route11Gate1F.asm} | 2 +- ...te11gateupstairs.asm => Route11Gate2F.asm} | 2 +- data/mapObjects/{route12.asm => Route12.asm} | 6 +- .../{route12gate.asm => Route12Gate1F.asm} | 2 +- ...te12gateupstairs.asm => Route12Gate2F.asm} | 2 +- ...te12house.asm => Route12SuperRodHouse.asm} | 6 +- data/mapObjects/{route13.asm => Route13.asm} | 2 +- data/mapObjects/{route14.asm => Route14.asm} | 2 +- data/mapObjects/{route15.asm => Route15.asm} | 2 +- .../{route15gate.asm => Route15Gate1F.asm} | 2 +- ...te15gateupstairs.asm => Route15Gate2F.asm} | 2 +- data/mapObjects/{route16.asm => Route16.asm} | 6 +- .../{route16house.asm => Route16FlyHouse.asm} | 6 +- .../{route16gate.asm => Route16Gate1F.asm} | 2 +- ...te16gateupstairs.asm => Route16Gate2F.asm} | 2 +- data/mapObjects/{route17.asm => Route17.asm} | 2 +- data/mapObjects/{route18.asm => Route18.asm} | 2 +- .../{route18gate.asm => Route18Gate1F.asm} | 2 +- ...te18gateupstairs.asm => Route18Gate2F.asm} | 2 +- data/mapObjects/{route19.asm => Route19.asm} | 2 +- data/mapObjects/{route2.asm => Route2.asm} | 18 +- data/mapObjects/{route20.asm => Route20.asm} | 10 +- data/mapObjects/{route21.asm => Route21.asm} | 2 +- data/mapObjects/{route22.asm => Route22.asm} | 2 +- .../{route22gate.asm => Route22Gate.asm} | 2 +- data/mapObjects/{route23.asm => Route23.asm} | 10 +- data/mapObjects/{route24.asm => Route24.asm} | 2 +- data/mapObjects/{route25.asm => Route25.asm} | 2 +- .../{route2gate.asm => Route2Gate.asm} | 2 +- .../{route2house.asm => Route2TradeHouse.asm} | 6 +- data/mapObjects/{route3.asm => Route3.asm} | 2 +- data/mapObjects/{route4.asm => Route4.asm} | 10 +- data/mapObjects/{route5.asm => Route5.asm} | 10 +- .../{route5gate.asm => Route5Gate.asm} | 2 +- data/mapObjects/{route6.asm => Route6.asm} | 6 +- .../{route6gate.asm => Route6Gate.asm} | 2 +- data/mapObjects/{route7.asm => Route7.asm} | 6 +- .../{route7gate.asm => Route7Gate.asm} | 2 +- data/mapObjects/{route8.asm => Route8.asm} | 6 +- .../{route8gate.asm => Route8Gate.asm} | 2 +- data/mapObjects/{route9.asm => Route9.asm} | 2 +- data/mapObjects/SSAnne1F.asm | 34 + .../{ssanne8.asm => SSAnne1FRooms.asm} | 26 +- data/mapObjects/SSAnne2F.asm | 30 + data/mapObjects/SSAnne2FRooms.asm | 47 + data/mapObjects/SSAnne3F.asm | 15 + data/mapObjects/SSAnneB1F.asm | 22 + data/mapObjects/SSAnneB1FRooms.asm | 41 + .../mapObjects/{ssanne5.asm => SSAnneBow.asm} | 10 +- .../{ssanne7.asm => SSAnneCaptainsRoom.asm} | 6 +- .../{ssanne6.asm => SSAnneKitchen.asm} | 6 +- ...arizonecenter.asm => SafariZoneCenter.asm} | 14 +- ...use1.asm => SafariZoneCenterRestHouse.asm} | 6 +- ...{safarizoneeast.asm => SafariZoneEast.asm} | 6 +- ...house3.asm => SafariZoneEastRestHouse.asm} | 6 +- ...arizoneentrance.asm => SafariZoneGate.asm} | 10 +- ...afarizonenorth.asm => SafariZoneNorth.asm} | 6 +- ...ouse4.asm => SafariZoneNorthRestHouse.asm} | 6 +- ...rethouse.asm => SafariZoneSecretHouse.asm} | 2 +- ...{safarizonewest.asm => SafariZoneWest.asm} | 6 +- ...house2.asm => SafariZoneWestRestHouse.asm} | 6 +- .../{saffroncity.asm => SaffronCity.asm} | 10 +- .../{saffrongym.asm => SaffronGym.asm} | 2 +- .../{saffronmart.asm => SaffronMart.asm} | 2 +- ...ffronhouse1.asm => SaffronPidgeyHouse.asm} | 6 +- ...onpokecenter.asm => SaffronPokecenter.asm} | 2 +- data/mapObjects/SeafoamIslands1F.asm | 30 + data/mapObjects/SeafoamIslandsB1F.asm | 26 + data/mapObjects/SeafoamIslandsB2F.asm | 26 + data/mapObjects/SeafoamIslandsB3F.asm | 30 + data/mapObjects/SeafoamIslandsB4F.asm | 23 + .../{silphco10.asm => SilphCo10F.asm} | 2 +- .../{silphco11.asm => SilphCo11F.asm} | 2 +- .../{silphco1.asm => SilphCo1F.asm} | 2 +- .../{silphco2.asm => SilphCo2F.asm} | 2 +- .../{silphco3.asm => SilphCo3F.asm} | 2 +- .../{silphco4.asm => SilphCo4F.asm} | 2 +- .../{silphco5.asm => SilphCo5F.asm} | 2 +- .../{silphco6.asm => SilphCo6F.asm} | 2 +- .../{silphco7.asm => SilphCo7F.asm} | 2 +- .../{silphco8.asm => SilphCo8F.asm} | 2 +- .../{silphco9.asm => SilphCo9F.asm} | 2 +- ...ilphcoelevator.asm => SilphCoElevator.asm} | 2 +- .../{tradecenter.asm => TradeCenter.asm} | 2 +- data/mapObjects/UndergroundPathNorthSouth.asm | 14 + data/mapObjects/UndergroundPathRoute5.asm | 17 + data/mapObjects/UndergroundPathRoute6.asm | 17 + data/mapObjects/UndergroundPathRoute7.asm | 17 + data/mapObjects/UndergroundPathRoute7Copy.asm | 18 + data/mapObjects/UndergroundPathRoute8.asm | 17 + data/mapObjects/UndergroundPathWestEast.asm | 14 + .../{vermilioncity.asm => VermilionCity.asm} | 14 +- .../{vermiliondock.asm => VermilionDock.asm} | 6 +- .../{vermiliongym.asm => VermilionGym.asm} | 2 +- .../{vermilionmart.asm => VermilionMart.asm} | 2 +- ...ionhouse2.asm => VermilionOldRodHouse.asm} | 6 +- ...ionhouse1.asm => VermilionPidgeyHouse.asm} | 6 +- ...pokecenter.asm => VermilionPokecenter.asm} | 2 +- ...lionhouse3.asm => VermilionTradeHouse.asm} | 6 +- .../{victoryroad1.asm => VictoryRoad1F.asm} | 10 +- .../{victoryroad2.asm => VictoryRoad2F.asm} | 26 +- .../{victoryroad3.asm => VictoryRoad3F.asm} | 18 +- .../{viridiancity.asm => ViridianCity.asm} | 10 +- ...{viridianforest.asm => ViridianForest.asm} | 26 +- ...stexit.asm => ViridianForestNorthGate.asm} | 10 +- ...trance.asm => ViridianForestSouthGate.asm} | 10 +- .../{viridiangym.asm => ViridianGym.asm} | 2 +- .../{viridianmart.asm => ViridianMart.asm} | 2 +- ...ianhouse.asm => ViridianNicknameHouse.asm} | 6 +- ...npokecenter.asm => ViridianPokecenter.asm} | 2 +- .../{school.asm => ViridianSchoolHouse.asm} | 6 +- .../{fuchsiahouse2.asm => WardensHouse.asm} | 6 +- data/mapObjects/celadonmansion2.asm | 19 - data/mapObjects/celadonmansion4.asm | 17 - data/mapObjects/celadonmansion5.asm | 16 - data/mapObjects/celadonmartelevator.asm | 15 - data/mapObjects/diglettscave.asm | 14 - data/mapObjects/lab1.asm | 25 - data/mapObjects/lab4.asm | 16 - data/mapObjects/mansion1.asm | 29 - data/mapObjects/mansion2.asm | 22 - data/mapObjects/mtmoon2.asm | 26 - data/mapObjects/pokemontower2.asm | 16 - data/mapObjects/rockethideout2.asm | 25 - data/mapObjects/rockethideoutelevator.asm | 15 - data/mapObjects/seafoamislands1.asm | 30 - data/mapObjects/seafoamislands2.asm | 26 - data/mapObjects/seafoamislands3.asm | 26 - data/mapObjects/seafoamislands4.asm | 30 - data/mapObjects/seafoamislands5.asm | 23 - data/mapObjects/ssanne1.asm | 34 - data/mapObjects/ssanne10.asm | 41 - data/mapObjects/ssanne2.asm | 30 - data/mapObjects/ssanne3.asm | 15 - data/mapObjects/ssanne4.asm | 22 - data/mapObjects/ssanne9.asm | 47 - .../undergroundpathentranceroute5.asm | 17 - .../undergroundpathentranceroute6.asm | 17 - .../undergroundpathentranceroute7.asm | 17 - .../undergroundpathentranceroute7copy.asm | 18 - .../undergroundpathentranceroute8.asm | 17 - data/mapObjects/undergroundpathns.asm | 14 - data/mapObjects/undergroundpathwe.asm | 14 - data/mapObjects/unknowndungeon1.asm | 31 - data/mapObjects/unknowndungeon2.asm | 25 - data/map_header_banks.asm | 366 ++-- data/map_header_pointers.asm | 306 +-- data/map_songs.asm | 426 ++-- data/special_warps.asm | 48 +- data/super_rod.asm | 10 +- data/town_map_entries.asm | 120 +- data/town_map_order.asm | 10 +- engine/battle/battle_transitions.asm | 28 +- engine/battle/common_text.asm | 4 +- engine/battle/core.asm | 4 +- engine/battle/init_battle_variables.asm | 2 +- engine/hidden_object_functions7.asm | 4 +- engine/items/items.asm | 4 +- engine/overworld/field_move_messages.asm | 2 +- engine/overworld/npc_movement.asm | 2 +- engine/overworld/player_state.asm | 12 +- engine/overworld/set_blackout_map.asm | 6 +- engine/palettes.asm | 2 +- gfx/blocksets/facility.bst | Bin 2049 -> 2048 bytes home.asm | 3 - home/overworld.asm | 12 +- main.asm | 1802 +++++++++-------- maps/{agatha.blk => AgathasRoom.blk} | 0 maps/{bikeshop.blk => BikeShop.blk} | 0 maps/{billshouse.blk => BillsHouse.blk} | 0 maps/{blueshouse.blk => BluesHouse.blk} | 0 maps/{bruno.blk => BrunosRoom.blk} | 0 ...celadonhouse.blk => CeladonChiefHouse.blk} | 0 maps/{celadoncity.blk => CeladonCity.blk} | 0 maps/{celadondiner.blk => CeladonDiner.blk} | 0 maps/{celadongym.blk => CeladonGym.blk} | 0 maps/{celadonhotel.blk => CeladonHotel.blk} | 0 ...ladonmansion1.blk => CeladonMansion1F.blk} | 0 ...ladonmansion2.blk => CeladonMansion2F.blk} | 0 ...ladonmansion3.blk => CeladonMansion3F.blk} | 0 ...donmansion4.blk => CeladonMansionRoof.blk} | 0 ...nsion5.blk => CeladonMansionRoofHouse.blk} | 0 maps/{celadonmart1.blk => CeladonMart1F.blk} | 0 maps/{celadonmart2.blk => CeladonMart2F.blk} | 0 maps/{celadonmart3.blk => CeladonMart3F.blk} | 0 maps/{celadonmart4.blk => CeladonMart4F.blk} | 0 maps/{celadonmart5.blk => CeladonMart5F.blk} | 0 ...rtelevator.blk => CeladonMartElevator.blk} | 0 ...eladonmartroof.blk => CeladonMartRoof.blk} | 0 ...onpokecenter.blk => CeladonPokecenter.blk} | 0 ...uleanhouse2.blk => CeruleanBadgeHouse.blk} | 0 ...unknowndungeon1.blk => CeruleanCave1F.blk} | 0 ...unknowndungeon2.blk => CeruleanCave2F.blk} | 0 ...nknowndungeon3.blk => CeruleanCaveB1F.blk} | 0 maps/{ceruleancity.blk => CeruleanCity.blk} | 0 maps/{ceruleangym.blk => CeruleanGym.blk} | 0 maps/{ceruleanmart.blk => CeruleanMart.blk} | 0 ...npokecenter.blk => CeruleanPokecenter.blk} | 0 ...uleanhouse1.blk => CeruleanTradeHouse.blk} | 0 ...setrashed.blk => CeruleanTrashedHouse.blk} | 0 maps/{gary.blk => ChampionsRoom.blk} | 0 maps/{cinnabargym.blk => CinnabarGym.blk} | 0 ...{cinnabarisland.blk => CinnabarIsland.blk} | 0 maps/{lab1.blk => CinnabarLab.blk} | 0 maps/{lab4.blk => CinnabarLabFossilRoom.blk} | 0 ...{lab3.blk => CinnabarLabMetronomeRoom.blk} | 0 maps/{lab2.blk => CinnabarLabTradeRoom.blk} | 0 maps/{cinnabarmart.blk => CinnabarMart.blk} | 0 ...rpokecenter.blk => CinnabarPokecenter.blk} | 0 maps/{colosseum.blk => Colosseum.blk} | 0 ...opycatshouse1f.blk => CopycatsHouse1F.blk} | 0 ...opycatshouse2f.blk => CopycatsHouse2F.blk} | 0 maps/{daycarem.blk => Daycare.blk} | 0 maps/{diglettscave.blk => DiglettsCave.blk} | 0 ...nceroute11.blk => DiglettsCaveRoute11.blk} | 0 ...scaveroute2.blk => DiglettsCaveRoute2.blk} | 0 maps/{fightingdojo.blk => FightingDojo.blk} | 0 ...use1.blk => FuchsiaBillsGrandpasHouse.blk} | 0 maps/{fuchsiacity.blk => FuchsiaCity.blk} | 0 ...hsiahouse3.blk => FuchsiaGoodRodHouse.blk} | 0 maps/{fuchsiagym.blk => FuchsiaGym.blk} | 0 maps/{fuchsiamart.blk => FuchsiaMart.blk} | 0 ...meetingroom.blk => FuchsiaMeetingRoom.blk} | 0 ...iapokecenter.blk => FuchsiaPokecenter.blk} | 0 .../{celadongamecorner.blk => GameCorner.blk} | 0 ...nprizeroom.blk => GameCornerPrizeRoom.blk} | 0 maps/{halloffameroom.blk => HallOfFame.blk} | 0 maps/{indigoplateau.blk => IndigoPlateau.blk} | 0 ...lateaulobby.blk => IndigoPlateauLobby.blk} | Bin maps/{lance.blk => LancesRoom.blk} | 0 ...nderhouse1.blk => LavenderCuboneHouse.blk} | 0 maps/{lavendermart.blk => LavenderMart.blk} | 0 ...rpokecenter.blk => LavenderPokecenter.blk} | 0 maps/{lavendertown.blk => LavenderTown.blk} | 0 maps/{lorelei.blk => LoreleisRoom.blk} | 0 maps/{lavenderhouse2.blk => MrFujisHouse.blk} | 0 maps/{namerater.blk => MrPsychicsHouse.blk} | 0 maps/{mtmoon1.blk => MtMoon1F.blk} | 0 maps/{mtmoon2.blk => MtMoonB1F.blk} | 0 maps/{mtmoon3.blk => MtMoonB2F.blk} | 0 ...oonpokecenter.blk => MtMoonPokecenter.blk} | 0 maps/{museum1f.blk => Museum1F.blk} | Bin maps/{museum2f.blk => Museum2F.blk} | Bin .../{pewterhouse1.blk => NameRatersHouse.blk} | 0 maps/{oakslab.blk => OaksLab.blk} | 0 maps/{pallettown.blk => PalletTown.blk} | Bin maps/{pewtercity.blk => PewterCity.blk} | 0 maps/{pewtergym.blk => PewterGym.blk} | 0 maps/{pewtermart.blk => PewterMart.blk} | 0 ...ewterhouse2.blk => PewterNidoranHouse.blk} | 0 ...terpokecenter.blk => PewterPokecenter.blk} | 0 ...route12house.blk => PewterSpeechHouse.blk} | 0 maps/{fanclub.blk => PokemonFanClub.blk} | 0 maps/{mansion1.blk => PokemonMansion1F.blk} | 0 maps/{mansion2.blk => PokemonMansion2F.blk} | 0 maps/{mansion3.blk => PokemonMansion3F.blk} | 0 maps/{mansion4.blk => PokemonMansionB1F.blk} | 0 .../{pokemontower1.blk => PokemonTower1F.blk} | 0 .../{pokemontower2.blk => PokemonTower2F.blk} | 0 .../{pokemontower3.blk => PokemonTower3F.blk} | 0 .../{pokemontower4.blk => PokemonTower4F.blk} | 0 .../{pokemontower5.blk => PokemonTower5F.blk} | 0 .../{pokemontower6.blk => PokemonTower6F.blk} | 0 .../{pokemontower7.blk => PokemonTower7F.blk} | 0 maps/{powerplant.blk => PowerPlant.blk} | 0 maps/{redshouse1f.blk => RedsHouse1F.blk} | 0 maps/{redshouse2f.blk => RedsHouse2F.blk} | 0 maps/{rocktunnel1.blk => RockTunnel1F.blk} | 0 maps/{rocktunnel2.blk => RockTunnelB1F.blk} | 0 ...okecenter.blk => RockTunnelPokecenter.blk} | 0 ...ockethideout1.blk => RocketHideoutB1F.blk} | 0 ...ockethideout2.blk => RocketHideoutB2F.blk} | 0 ...ockethideout3.blk => RocketHideoutB3F.blk} | 0 ...ockethideout4.blk => RocketHideoutB4F.blk} | 0 ...elevator.blk => RocketHideoutElevator.blk} | 0 maps/{route1.blk => Route1.blk} | 0 maps/{route10.blk => Route10.blk} | 0 maps/{route11.blk => Route11.blk} | 0 maps/{route11gate.blk => Route11Gate1F.blk} | Bin ...te11gateupstairs.blk => Route11Gate2F.blk} | Bin maps/{route12.blk => Route12.blk} | 0 maps/{route12gate.blk => Route12Gate1F.blk} | Bin ...te12gateupstairs.blk => Route12Gate2F.blk} | Bin ...te16house.blk => Route12SuperRodHouse.blk} | 0 maps/{route13.blk => Route13.blk} | 0 maps/{route14.blk => Route14.blk} | 0 maps/{route15.blk => Route15.blk} | 0 maps/{route15gate.blk => Route15Gate1F.blk} | Bin ...te15gateupstairs.blk => Route15Gate2F.blk} | Bin maps/{route16.blk => Route16.blk} | 0 maps/{route2house.blk => Route16FlyHouse.blk} | 0 maps/{route16gate.blk => Route16Gate1F.blk} | Bin ...te16gateupstairs.blk => Route16Gate2F.blk} | Bin maps/{route17.blk => Route17.blk} | 0 maps/{route18.blk => Route18.blk} | 0 maps/{route18gate.blk => Route18Gate1F.blk} | Bin ...te18gateupstairs.blk => Route18Gate2F.blk} | Bin maps/{route19.blk => Route19.blk} | 0 maps/{route2.blk => Route2.blk} | 0 maps/{route20.blk => Route20.blk} | 0 maps/{route21.blk => Route21.blk} | 0 maps/{route22.blk => Route22.blk} | 0 maps/{route22gate.blk => Route22Gate.blk} | Bin maps/{route23.blk => Route23.blk} | 0 maps/{route24.blk => Route24.blk} | 0 maps/{route25.blk => Route25.blk} | 0 maps/{route2gate.blk => Route2Gate.blk} | Bin ...saffronhouse1.blk => Route2TradeHouse.blk} | 0 maps/{route3.blk => Route3.blk} | 0 maps/{route4.blk => Route4.blk} | 0 maps/{route5.blk => Route5.blk} | 0 maps/{route5gate.blk => Route5Gate.blk} | 0 maps/{route6.blk => Route6.blk} | 0 maps/{route6gate.blk => Route6Gate.blk} | 0 maps/{route7.blk => Route7.blk} | 0 maps/{route7gate.blk => Route7Gate.blk} | 0 maps/{route8.blk => Route8.blk} | 0 maps/{route8gate.blk => Route8Gate.blk} | 0 maps/{route9.blk => Route9.blk} | 0 maps/{ssanne1.blk => SSAnne1F.blk} | 0 maps/{ssanne8.blk => SSAnne1FRooms.blk} | 0 maps/{ssanne2.blk => SSAnne2F.blk} | 0 maps/{ssanne10.blk => SSAnne2FRooms.blk} | 0 maps/{ssanne3.blk => SSAnne3F.blk} | 0 maps/{ssanne4.blk => SSAnneB1F.blk} | 0 maps/{ssanne9.blk => SSAnneB1FRooms.blk} | 0 maps/{ssanne5.blk => SSAnneBow.blk} | 0 maps/{ssanne7.blk => SSAnneCaptainsRoom.blk} | 0 maps/{ssanne6.blk => SSAnneKitchen.blk} | 0 ...arizonecenter.blk => SafariZoneCenter.blk} | 0 ...use1.blk => SafariZoneCenterRestHouse.blk} | Bin ...{safarizoneeast.blk => SafariZoneEast.blk} | 0 ...house2.blk => SafariZoneEastRestHouse.blk} | Bin ...arizoneentrance.blk => SafariZoneGate.blk} | 0 ...afarizonenorth.blk => SafariZoneNorth.blk} | 0 ...ouse3.blk => SafariZoneNorthRestHouse.blk} | Bin ...rethouse.blk => SafariZoneSecretHouse.blk} | 0 ...{safarizonewest.blk => SafariZoneWest.blk} | 0 ...house4.blk => SafariZoneWestRestHouse.blk} | Bin maps/{saffroncity.blk => SaffronCity.blk} | Bin maps/{saffrongym.blk => SaffronGym.blk} | 0 maps/{saffronmart.blk => SaffronMart.blk} | 0 ...ffronhouse2.blk => SaffronPidgeyHouse.blk} | 0 ...onpokecenter.blk => SaffronPokecenter.blk} | 0 ...afoamislands1.blk => SeafoamIslands1F.blk} | 0 ...foamislands2.blk => SeafoamIslandsB1F.blk} | 0 ...foamislands3.blk => SeafoamIslandsB2F.blk} | 0 ...foamislands4.blk => SeafoamIslandsB3F.blk} | 0 ...foamislands5.blk => SeafoamIslandsB4F.blk} | 0 maps/{silphco10.blk => SilphCo10F.blk} | 0 maps/{silphco11.blk => SilphCo11F.blk} | 0 maps/{silphco1.blk => SilphCo1F.blk} | 0 maps/{silphco2.blk => SilphCo2F.blk} | 0 maps/{silphco3.blk => SilphCo3F.blk} | 0 maps/{silphco4.blk => SilphCo4F.blk} | 0 maps/{silphco5.blk => SilphCo5F.blk} | 0 maps/{silphco6.blk => SilphCo6F.blk} | 0 maps/{silphco7.blk => SilphCo7F.blk} | 0 maps/{silphco8.blk => SilphCo8F.blk} | 0 maps/{silphco9.blk => SilphCo9F.blk} | 0 ...ilphcoelevator.blk => SilphCoElevator.blk} | 0 maps/{tradecenter.blk => TradeCenter.blk} | 0 ...thns.blk => UndergroundPathNorthSouth.blk} | 0 ...ceroute5.blk => UndergroundPathRoute5.blk} | Bin ...ceroute6.blk => UndergroundPathRoute6.blk} | Bin ...ceroute7.blk => UndergroundPathRoute7.blk} | Bin ...ceroute8.blk => UndergroundPathRoute8.blk} | Bin ...pathwe.blk => UndergroundPathWestEast.blk} | 0 ...ks60258.blk => UnusedDiglettsCaveCopy.blk} | 0 ...usedblocks60cef.blk => UnusedEmptyMap.blk} | 0 ...ocks58d7d.blk => UnusedPokecenterCopy.blk} | 0 maps/{vermilioncity.blk => VermilionCity.blk} | 0 maps/{vermiliondock.blk => VermilionDock.blk} | 0 maps/{vermiliongym.blk => VermilionGym.blk} | 0 maps/{vermilionmart.blk => VermilionMart.blk} | 0 ...ionhouse1.blk => VermilionOldRodHouse.blk} | 0 ...ionhouse2.blk => VermilionPidgeyHouse.blk} | 0 ...pokecenter.blk => VermilionPokecenter.blk} | 0 ...lionhouse3.blk => VermilionTradeHouse.blk} | 0 maps/{victoryroad1.blk => VictoryRoad1F.blk} | 0 maps/{victoryroad2.blk => VictoryRoad2F.blk} | 0 maps/{victoryroad3.blk => VictoryRoad3F.blk} | 0 maps/{viridiancity.blk => ViridianCity.blk} | 0 ...{viridianforest.blk => ViridianForest.blk} | 0 ...trance.blk => ViridianForestNorthGate.blk} | Bin ...stexit.blk => ViridianForestSouthGate.blk} | Bin maps/{viridiangym.blk => ViridianGym.blk} | 0 maps/{viridianmart.blk => ViridianMart.blk} | 0 ...ianhouse.blk => ViridianNicknameHouse.blk} | 0 ...npokecenter.blk => ViridianPokecenter.blk} | 0 maps/{school.blk => ViridianSchoolHouse.blk} | 0 maps/{fuchsiahouse2.blk => WardensHouse.blk} | 0 maps/route19-yellow.blk | 1 - scripts/{agatha.asm => AgathasRoom.asm} | 22 +- scripts/{bikeshop.asm => BikeShop.asm} | 4 +- scripts/{billshouse.asm => BillsHouse.asm} | 8 +- scripts/{blueshouse.asm => BluesHouse.asm} | 8 +- scripts/{bruno.asm => BrunosRoom.asm} | 20 +- ...celadonhouse.asm => CeladonChiefHouse.asm} | 4 +- scripts/{celadoncity.asm => CeladonCity.asm} | 4 +- .../{celadondiner.asm => CeladonDiner.asm} | 4 +- scripts/{celadongym.asm => CeladonGym.asm} | 8 +- .../{celadonhotel.asm => CeladonHotel.asm} | 4 +- ...ladonmansion1.asm => CeladonMansion1F.asm} | 4 +- ...ladonmansion2.asm => CeladonMansion2F.asm} | 4 +- ...ladonmansion3.asm => CeladonMansion3F.asm} | 4 +- ...donmansion4.asm => CeladonMansionRoof.asm} | 4 +- ...nsion5.asm => CeladonMansionRoofHouse.asm} | 6 +- .../{celadonmart1.asm => CeladonMart1F.asm} | 4 +- .../{celadonmart2.asm => CeladonMart2F.asm} | 4 +- .../{celadonmart3.asm => CeladonMart3F.asm} | 4 +- .../{celadonmart4.asm => CeladonMart4F.asm} | 4 +- .../{celadonmart5.asm => CeladonMart5F.asm} | 4 +- ...rtelevator.asm => CeladonMartElevator.asm} | 14 +- ...eladonmartroof.asm => CeladonMartRoof.asm} | 4 +- ...onpokecenter.asm => CeladonPokecenter.asm} | 4 +- ...uleanhouse2.asm => CeruleanBadgeHouse.asm} | 4 +- ...unknowndungeon1.asm => CeruleanCave1F.asm} | 4 +- ...unknowndungeon2.asm => CeruleanCave2F.asm} | 4 +- ...nknowndungeon3.asm => CeruleanCaveB1F.asm} | 12 +- .../{ceruleancity.asm => CeruleanCity.asm} | 8 +- .../{ceruleancity2.asm => CeruleanCity_2.asm} | 0 scripts/{ceruleangym.asm => CeruleanGym.asm} | 8 +- .../{ceruleanmart.asm => CeruleanMart.asm} | 4 +- ...npokecenter.asm => CeruleanPokecenter.asm} | 4 +- ...uleanhouse1.asm => CeruleanTradeHouse.asm} | 4 +- ...setrashed.asm => CeruleanTrashedHouse.asm} | 4 +- scripts/{gary.asm => ChampionsRoom.asm} | 32 +- scripts/{cinnabargym.asm => CinnabarGym.asm} | 8 +- ...{cinnabarisland.asm => CinnabarIsland.asm} | 8 +- scripts/{lab1.asm => CinnabarLab.asm} | 4 +- .../{lab4.asm => CinnabarLabFossilRoom.asm} | 4 +- ...{lab3.asm => CinnabarLabMetronomeRoom.asm} | 4 +- .../{lab2.asm => CinnabarLabTradeRoom.asm} | 4 +- .../{cinnabarmart.asm => CinnabarMart.asm} | 4 +- ...rpokecenter.asm => CinnabarPokecenter.asm} | 4 +- scripts/{colosseum.asm => Colosseum.asm} | 6 +- ...opycatshouse1f.asm => CopycatsHouse1F.asm} | 4 +- ...opycatshouse2f.asm => CopycatsHouse2F.asm} | 4 +- scripts/{daycarem.asm => Daycare.asm} | 4 +- scripts/DiglettsCave.asm | 5 + ...averoute11.asm => DiglettsCaveRoute11.asm} | 4 +- ...scaveroute2.asm => DiglettsCaveRoute2.asm} | 4 +- .../{fightingdojo.asm => FightingDojo.asm} | 8 +- ...use1.asm => FuchsiaBillsGrandpasHouse.asm} | 4 +- scripts/{fuchsiacity.asm => FuchsiaCity.asm} | 4 +- ...hsiahouse3.asm => FuchsiaGoodRodHouse.asm} | 4 +- scripts/{fuchsiagym.asm => FuchsiaGym.asm} | 8 +- scripts/{fuchsiamart.asm => FuchsiaMart.asm} | 4 +- ...meetingroom.asm => FuchsiaMeetingRoom.asm} | 4 +- ...iapokecenter.asm => FuchsiaPokecenter.asm} | 4 +- .../{celadongamecorner.asm => GameCorner.asm} | 18 +- ...nprizeroom.asm => GameCornerPrizeRoom.asm} | 4 +- .../{halloffameroom.asm => HallOfFame.asm} | 30 +- scripts/IndigoPlateau.asm | 4 + ...lateaulobby.asm => IndigoPlateauLobby.asm} | 4 +- scripts/{lance.asm => LancesRoom.asm} | 18 +- ...nderhouse2.asm => LavenderCuboneHouse.asm} | 4 +- .../{lavendermart.asm => LavenderMart.asm} | 4 +- ...rpokecenter.asm => LavenderPokecenter.asm} | 4 +- .../{lavendertown.asm => LavenderTown.asm} | 4 +- scripts/{lorelei.asm => LoreleisRoom.asm} | 20 +- .../{lavenderhouse1.asm => MrFujisHouse.asm} | 4 +- ...{saffronhouse2.asm => MrPsychicsHouse.asm} | 4 +- scripts/{mtmoon1.asm => MtMoon1F.asm} | 12 +- scripts/{mtmoon2.asm => MtMoonB1F.asm} | 4 +- scripts/{mtmoon3.asm => MtMoonB2F.asm} | 34 +- ...oonpokecenter.asm => MtMoonPokecenter.asm} | 4 +- scripts/{museum1f.asm => Museum1F.asm} | 12 +- scripts/{museum2f.asm => Museum2F.asm} | 4 +- .../{namerater.asm => NameRatersHouse.asm} | 4 +- scripts/{oakslab.asm => OaksLab.asm} | 12 +- scripts/{pallettown.asm => PalletTown.asm} | 8 +- scripts/{pewtercity.asm => PewterCity.asm} | 10 +- scripts/{pewtergym.asm => PewterGym.asm} | 8 +- scripts/{pewtermart.asm => PewterMart.asm} | 4 +- ...ewterhouse1.asm => PewterNidoranHouse.asm} | 4 +- ...terpokecenter.asm => PewterPokecenter.asm} | 4 +- ...pewterhouse2.asm => PewterSpeechHouse.asm} | 4 +- scripts/{fanclub.asm => PokemonFanClub.asm} | 4 +- .../{mansion1.asm => PokemonMansion1F.asm} | 12 +- .../{mansion2.asm => PokemonMansion2F.asm} | 12 +- .../{mansion3.asm => PokemonMansion3F.asm} | 12 +- .../{mansion4.asm => PokemonMansionB1F.asm} | 12 +- .../{pokemontower1.asm => PokemonTower1F.asm} | 4 +- .../{pokemontower2.asm => PokemonTower2F.asm} | 20 +- .../{pokemontower3.asm => PokemonTower3F.asm} | 12 +- .../{pokemontower4.asm => PokemonTower4F.asm} | 12 +- .../{pokemontower5.asm => PokemonTower5F.asm} | 12 +- .../{pokemontower6.asm => PokemonTower6F.asm} | 22 +- .../{pokemontower7.asm => PokemonTower7F.asm} | 28 +- scripts/{powerplant.asm => PowerPlant.asm} | 8 +- scripts/{redshouse1f.asm => RedsHouse1F.asm} | 4 +- scripts/{redshouse2f.asm => RedsHouse2F.asm} | 12 +- scripts/{rocktunnel1.asm => RockTunnel1F.asm} | 12 +- .../{rocktunnel2.asm => RockTunnelB1F.asm} | 12 +- ...okecenter.asm => RockTunnelPokecenter.asm} | 4 +- ...ockethideout1.asm => RocketHideoutB1F.asm} | 12 +- ...ockethideout2.asm => RocketHideoutB2F.asm} | 12 +- ...ockethideout3.asm => RocketHideoutB3F.asm} | 12 +- ...ockethideout4.asm => RocketHideoutB4F.asm} | 24 +- ...elevator.asm => RocketHideoutElevator.asm} | 10 +- scripts/{route1.asm => Route1.asm} | 4 +- scripts/{route10.asm => Route10.asm} | 8 +- scripts/{route11.asm => Route11.asm} | 8 +- .../{route11gate.asm => Route11Gate1F.asm} | 4 +- ...te11gateupstairs.asm => Route11Gate2F.asm} | 4 +- scripts/{route12.asm => Route12.asm} | 8 +- .../{route12gate.asm => Route12Gate1F.asm} | 4 +- ...te12gateupstairs.asm => Route12Gate2F.asm} | 4 +- ...te12house.asm => Route12SuperRodHouse.asm} | 4 +- scripts/{route13.asm => Route13.asm} | 8 +- scripts/{route14.asm => Route14.asm} | 8 +- scripts/{route15.asm => Route15.asm} | 8 +- .../{route15gate.asm => Route15Gate1F.asm} | 4 +- ...te15gateupstairs.asm => Route15Gate2F.asm} | 4 +- scripts/{route16.asm => Route16.asm} | 8 +- .../{route16house.asm => Route16FlyHouse.asm} | 4 +- .../{route16gate.asm => Route16Gate1F.asm} | 18 +- ...te16gateupstairs.asm => Route16Gate2F.asm} | 4 +- scripts/{route17.asm => Route17.asm} | 8 +- scripts/{route18.asm => Route18.asm} | 8 +- .../{route18gate.asm => Route18Gate1F.asm} | 18 +- ...te18gateupstairs.asm => Route18Gate2F.asm} | 4 +- scripts/{route19.asm => Route19.asm} | 8 +- scripts/{route2.asm => Route2.asm} | 4 +- scripts/{route20.asm => Route20.asm} | 32 +- scripts/{route21.asm => Route21.asm} | 8 +- scripts/{route22.asm => Route22.asm} | 8 +- scripts/{route22gate.asm => Route22Gate.asm} | 8 +- scripts/{route23.asm => Route23.asm} | 12 +- scripts/{route24.asm => Route24.asm} | 8 +- scripts/{route25.asm => Route25.asm} | 8 +- scripts/{route2gate.asm => Route2Gate.asm} | 4 +- .../{route2house.asm => Route2TradeHouse.asm} | 4 +- scripts/{route3.asm => Route3.asm} | 8 +- scripts/{route4.asm => Route4.asm} | 8 +- scripts/{route5.asm => Route5.asm} | 4 +- scripts/{route5gate.asm => Route5Gate.asm} | 8 +- scripts/{route6.asm => Route6.asm} | 8 +- scripts/{route6gate.asm => Route6Gate.asm} | 8 +- scripts/{route7.asm => Route7.asm} | 4 +- scripts/{route7gate.asm => Route7Gate.asm} | 8 +- scripts/{route8.asm => Route8.asm} | 8 +- scripts/{route8gate.asm => Route8Gate.asm} | 8 +- scripts/{route9.asm => Route9.asm} | 8 +- scripts/{ssanne1.asm => SSAnne1F.asm} | 4 +- scripts/{ssanne8.asm => SSAnne1FRooms.asm} | 12 +- scripts/{ssanne2.asm => SSAnne2F.asm} | 24 +- scripts/{ssanne9.asm => SSAnne2FRooms.asm} | 12 +- scripts/{ssanne3.asm => SSAnne3F.asm} | 4 +- scripts/SSAnneB1F.asm | 5 + scripts/{ssanne10.asm => SSAnneB1FRooms.asm} | 12 +- scripts/{ssanne5.asm => SSAnneBow.asm} | 12 +- .../{ssanne7.asm => SSAnneCaptainsRoom.asm} | 4 +- scripts/{ssanne6.asm => SSAnneKitchen.asm} | 4 +- ...arizonecenter.asm => SafariZoneCenter.asm} | 4 +- ...use1.asm => SafariZoneCenterRestHouse.asm} | 4 +- ...{safarizoneeast.asm => SafariZoneEast.asm} | 4 +- ...house3.asm => SafariZoneEastRestHouse.asm} | 4 +- ...arizoneentrance.asm => SafariZoneGate.asm} | 28 +- ...afarizonenorth.asm => SafariZoneNorth.asm} | 4 +- ...ouse4.asm => SafariZoneNorthRestHouse.asm} | 4 +- ...rethouse.asm => SafariZoneSecretHouse.asm} | 4 +- ...{safarizonewest.asm => SafariZoneWest.asm} | 4 +- ...house2.asm => SafariZoneWestRestHouse.asm} | 4 +- scripts/{saffroncity.asm => SaffronCity.asm} | 4 +- scripts/{saffrongym.asm => SaffronGym.asm} | 8 +- scripts/{saffronmart.asm => SaffronMart.asm} | 4 +- ...ffronhouse1.asm => SaffronPidgeyHouse.asm} | 4 +- ...onpokecenter.asm => SaffronPokecenter.asm} | 4 +- ...afoamislands1.asm => SeafoamIslands1F.asm} | 12 +- ...foamislands2.asm => SeafoamIslandsB1F.asm} | 12 +- ...foamislands3.asm => SeafoamIslandsB2F.asm} | 12 +- ...foamislands4.asm => SeafoamIslandsB3F.asm} | 26 +- ...foamislands5.asm => SeafoamIslandsB4F.asm} | 24 +- scripts/{silphco10.asm => SilphCo10F.asm} | 12 +- scripts/{silphco11.asm => SilphCo11F.asm} | 14 +- scripts/{silphco1.asm => SilphCo1F.asm} | 4 +- scripts/{silphco2.asm => SilphCo2F.asm} | 12 +- scripts/{silphco3.asm => SilphCo3F.asm} | 12 +- scripts/{silphco4.asm => SilphCo4F.asm} | 12 +- scripts/{silphco5.asm => SilphCo5F.asm} | 12 +- scripts/{silphco6.asm => SilphCo6F.asm} | 12 +- scripts/{silphco7.asm => SilphCo7F.asm} | 14 +- scripts/{silphco8.asm => SilphCo8F.asm} | 12 +- scripts/{silphco9.asm => SilphCo9F.asm} | 12 +- ...ilphcoelevator.asm => SilphCoElevator.asm} | 8 +- scripts/{tradecenter.asm => TradeCenter.asm} | 4 +- scripts/UndergroundPathNorthSouth.asm | 5 + ...ceroute5.asm => UndergroundPathRoute5.asm} | 4 +- ...ceroute6.asm => UndergroundPathRoute6.asm} | 4 +- ...ceroute7.asm => UndergroundPathRoute7.asm} | 4 +- ...copy.asm => UndergroundPathRoute7Copy.asm} | 4 +- ...ceroute8.asm => UndergroundPathRoute8.asm} | 4 +- scripts/UndergroundPathWestEast.asm | 5 + .../{vermilioncity.asm => VermilionCity.asm} | 8 +- .../{vermiliondock.asm => VermilionDock.asm} | 4 +- .../{vermiliongym.asm => VermilionGym.asm} | 8 +- .../{vermilionmart.asm => VermilionMart.asm} | 4 +- ...ionhouse2.asm => VermilionOldRodHouse.asm} | 4 +- ...ionhouse1.asm => VermilionPidgeyHouse.asm} | 4 +- ...pokecenter.asm => VermilionPokecenter.asm} | 4 +- ...lionhouse3.asm => VermilionTradeHouse.asm} | 4 +- .../{victoryroad1.asm => VictoryRoad1F.asm} | 12 +- .../{victoryroad2.asm => VictoryRoad2F.asm} | 12 +- .../{victoryroad3.asm => VictoryRoad3F.asm} | 18 +- .../{viridiancity.asm => ViridianCity.asm} | 8 +- ...{viridianforest.asm => ViridianForest.asm} | 8 +- ...stexit.asm => ViridianForestNorthGate.asm} | 4 +- ...trance.asm => ViridianForestSouthGate.asm} | 4 +- scripts/{viridiangym.asm => ViridianGym.asm} | 8 +- .../{viridianmart.asm => ViridianMart.asm} | 19 +- ...ianhouse.asm => ViridianNicknameHouse.asm} | 4 +- ...npokecenter.asm => ViridianPokecenter.asm} | 4 +- .../{school.asm => ViridianSchoolHouse.asm} | 4 +- .../{fuchsiahouse2.asm => WardensHouse.asm} | 4 +- scripts/diglettscave.asm | 5 - scripts/indigoplateau.asm | 4 - scripts/ssanne4.asm | 5 - scripts/undergroundpathns.asm | 5 - scripts/undergroundpathwe.asm | 5 - text.asm | 427 ++-- text/maps/{agatha.asm => AgathasRoom.asm} | 0 text/maps/{bike_shop.asm => BikeShop.asm} | 0 text/maps/{bills_house.asm => BillsHouse.asm} | 0 text/maps/{blues_house.asm => BluesHouse.asm} | 0 text/maps/{bruno.asm => BrunosRoom.asm} | 0 ...eladon_house.asm => CeladonChiefHouse.asm} | 0 .../{celadon_city.asm => CeladonCity.asm} | 0 .../{celadon_diner.asm => CeladonDiner.asm} | 0 text/maps/{celadon_gym.asm => CeladonGym.asm} | 3 +- .../{celadon_hotel.asm => CeladonHotel.asm} | 0 ...on_mansion_1f.asm => CeladonMansion1F.asm} | 0 ...on_mansion_2f.asm => CeladonMansion2F.asm} | 0 ...on_mansion_3f.asm => CeladonMansion3F.asm} | 0 ..._4f_outside.asm => CeladonMansionRoof.asm} | 0 ...inside.asm => CeladonMansionRoofHouse.asm} | 0 ...on_dept_store_1f.asm => CeladonMart1F.asm} | 0 ...on_dept_store_2f.asm => CeladonMart2F.asm} | 0 ...on_dept_store_3f.asm => CeladonMart3F.asm} | 0 ...on_dept_store_4f.asm => CeladonMart4F.asm} | 0 ...on_dept_store_5f.asm => CeladonMart5F.asm} | 0 ...ept_store_roof.asm => CeladonMartRoof.asm} | 11 +- ...n_pokecenter.asm => CeladonPokecenter.asm} | 0 ...badge_house.asm => CeruleanBadgeHouse.asm} | 0 ...wn_dungeon_b1f.asm => CeruleanCaveB1F.asm} | 0 .../{cerulean_city.asm => CeruleanCity.asm} | 3 +- .../{cerulean_gym.asm => CeruleanGym.asm} | 0 .../{cerulean_mart.asm => CeruleanMart.asm} | 0 ..._pokecenter.asm => CeruleanPokecenter.asm} | 0 ...trade_house.asm => CeruleanTradeHouse.asm} | 0 ...hed_house.asm => CeruleanTrashedHouse.asm} | 0 text/maps/{champion.asm => ChampionsRoom.asm} | 0 .../{cinnabar_gym.asm => CinnabarGym.asm} | 3 +- ...cinnabar_island.asm => CinnabarIsland.asm} | 0 .../{cinnabar_lab.asm => CinnabarLab.asm} | 0 ...sil_room.asm => CinnabarLabFossilRoom.asm} | 2 +- ..._room.asm => CinnabarLabMetronomeRoom.asm} | 0 ...rade_room.asm => CinnabarLabTradeRoom.asm} | 0 .../{cinnabar_mart.asm => CinnabarMart.asm} | 0 ..._pokecenter.asm => CinnabarPokecenter.asm} | 0 ...ycats_house_1f.asm => CopycatsHouse1F.asm} | 0 ...ycats_house_2f.asm => CopycatsHouse2F.asm} | 3 +- text/maps/{daycare_1.asm => Daycare.asm} | 8 +- text/maps/{daycare_2.asm => Daycare_2.asm} | 0 ...1_entrance.asm => DiglettsCaveRoute11.asm} | 0 ..._2_entrance.asm => DiglettsCaveRoute2.asm} | 0 .../{fighting_dojo.asm => FightingDojo.asm} | 0 ...ouse.asm => FuchsiaBillsGrandpasHouse.asm} | 0 .../{fuchsia_city.asm => FuchsiaCity.asm} | 0 ...hing_house.asm => FuchsiaGoodRodHouse.asm} | 0 .../{fuchsia_gym_1.asm => FuchsiaGym.asm} | 0 .../{fuchsia_gym_2.asm => FuchsiaGym_2.asm} | 2 +- .../{fuchsia_mart.asm => FuchsiaMart.asm} | 0 ...eeting_room.asm => FuchsiaMeetingRoom.asm} | 0 ...a_pokecenter.asm => FuchsiaPokecenter.asm} | 0 ...celadon_game_corner.asm => GameCorner.asm} | 0 ...prize_room.asm => GameCornerPrizeRoom.asm} | 0 .../maps/{hall_of_fame.asm => HallOfFame.asm} | 0 ...ateau_lobby.asm => IndigoPlateauLobby.asm} | 0 text/maps/{lance.asm => LancesRoom.asm} | 0 ...nder_house.asm => LavenderCuboneHouse.asm} | 0 .../{lavender_mart.asm => LavenderMart.asm} | 0 ..._pokecenter.asm => LavenderPokecenter.asm} | 0 .../{lavender_town.asm => LavenderTown.asm} | 0 text/maps/{lorelei.asm => LoreleisRoom.asm} | 0 .../{fujis_house.asm => MrFujisHouse.asm} | 3 +- ...psychics_house.asm => MrPsychicsHouse.asm} | 0 text/maps/{mt_moon_1f.asm => MtMoon1F.asm} | 0 text/maps/{mt_moon_b1f.asm => MtMoonB1F.asm} | 2 +- text/maps/{mt_moon_b2f.asm => MtMoonB2F.asm} | 0 ...on_pokecenter.asm => MtMoonPokecenter.asm} | 2 +- text/maps/{museum_1f.asm => Museum1F.asm} | 0 text/maps/{museum_2f.asm => Museum2F.asm} | 0 .../{name_rater.asm => NameRatersHouse.asm} | 0 text/maps/{oaks_lab.asm => OaksLab.asm} | 0 text/maps/{pallet_town.asm => PalletTown.asm} | 0 text/maps/{pewter_city.asm => PewterCity.asm} | 0 text/maps/{pewter_gym_1.asm => PewterGym.asm} | 0 .../{pewter_gym_2.asm => PewterGym_2.asm} | 6 +- text/maps/{pewter_mart.asm => PewterMart.asm} | 0 ...ter_house_1.asm => PewterNidoranHouse.asm} | 0 ...er_pokecenter.asm => PewterPokecenter.asm} | 0 ...wter_house_2.asm => PewterSpeechHouse.asm} | 0 .../maps/{fan_club.asm => PokemonFanClub.asm} | 0 .../{mansion_1f.asm => PokemonMansion1F.asm} | 0 .../{mansion_2f.asm => PokemonMansion2F.asm} | 0 .../{mansion_3f.asm => PokemonMansion3F.asm} | 0 ...{mansion_b1f.asm => PokemonMansionB1F.asm} | 0 ...okemon_tower_1f.asm => PokemonTower1F.asm} | 0 ...okemon_tower_2f.asm => PokemonTower2F.asm} | 0 ...okemon_tower_3f.asm => PokemonTower3F.asm} | 0 ...okemon_tower_4f.asm => PokemonTower4F.asm} | 0 ...okemon_tower_5f.asm => PokemonTower5F.asm} | 0 ...okemon_tower_6f.asm => PokemonTower6F.asm} | 0 ...okemon_tower_7f.asm => PokemonTower7F.asm} | 0 text/maps/{power_plant.asm => PowerPlant.asm} | 0 .../{reds_house_1f.asm => RedsHouse1F.asm} | 0 .../{rock_tunnel_b1f.asm => RockTunnel1F.asm} | 0 ...ock_tunnel_b2f_1.asm => RockTunnelB1F.asm} | 0 ...k_tunnel_b2f_2.asm => RockTunnelB1F_2.asm} | 0 ...okecenter.asm => RockTunnelPokecenter.asm} | 0 ...t_hideout_b1f.asm => RocketHideoutB1F.asm} | 0 ...t_hideout_b2f.asm => RocketHideoutB2F.asm} | 0 ...t_hideout_b3f.asm => RocketHideoutB3F.asm} | 0 ...t_hideout_b4f.asm => RocketHideoutB4F.asm} | 0 ...elevator.asm => RocketHideoutElevator.asm} | 0 text/maps/{route_1.asm => Route1.asm} | 0 text/maps/{route_10.asm => Route10.asm} | 0 text/maps/{route_11_1.asm => Route11.asm} | 0 .../{route_11_gate.asm => Route11Gate1F.asm} | 0 ...11_gate_upstairs.asm => Route11Gate2F.asm} | 0 text/maps/{route_11_2.asm => Route11_2.asm} | 0 text/maps/{route_12.asm => Route12.asm} | 0 .../{route_12_gate.asm => Route12Gate1F.asm} | 0 ...12_gate_upstairs.asm => Route12Gate2F.asm} | 0 ..._12_house.asm => Route12SuperRodHouse.asm} | 3 +- text/maps/{route_13.asm => Route13.asm} | 0 text/maps/{route_14.asm => Route14.asm} | 0 text/maps/{route_15.asm => Route15.asm} | 0 .../{route_15_gate.asm => Route15Gate1F.asm} | 0 ...15_gate_upstairs.asm => Route15Gate2F.asm} | 0 text/maps/{route_16.asm => Route16.asm} | 0 ...route_16_house.asm => Route16FlyHouse.asm} | 0 .../{route_16_gate.asm => Route16Gate1F.asm} | 0 ...16_gate_upstairs.asm => Route16Gate2F.asm} | 0 text/maps/{route_17.asm => Route17.asm} | 0 text/maps/{route_18.asm => Route18.asm} | 0 .../{route_18_gate.asm => Route18Gate1F.asm} | 0 ...18_gate_upstairs.asm => Route18Gate2F.asm} | 0 text/maps/{route_19.asm => Route19.asm} | 0 text/maps/{route_2.asm => Route2.asm} | 0 text/maps/{route_20.asm => Route20.asm} | 0 text/maps/{route_21.asm => Route21.asm} | 0 text/maps/{route_22.asm => Route22.asm} | 0 ...okemon_league_gate.asm => Route22Gate.asm} | 3 +- text/maps/{route_23.asm => Route23.asm} | 3 +- text/maps/{route_24_1.asm => Route24.asm} | 3 +- text/maps/{route_24_2.asm => Route24_2.asm} | 0 text/maps/{route_25.asm => Route25.asm} | 0 .../maps/{route_2_gate.asm => Route2Gate.asm} | 0 ...route_2_house.asm => Route2TradeHouse.asm} | 0 text/maps/{route_3.asm => Route3.asm} | 0 text/maps/{route_4.asm => Route4.asm} | 0 text/maps/{route_5.asm => Route5.asm} | 0 text/maps/{route_6.asm => Route6.asm} | 0 text/maps/{route_7.asm => Route7.asm} | 0 text/maps/{route_8.asm => Route8.asm} | 0 text/maps/{route_9.asm => Route9.asm} | 0 text/maps/{ss_anne_1.asm => SSAnne1F.asm} | 0 .../maps/{ss_anne_8.asm => SSAnne1FRooms.asm} | 0 text/maps/{ss_anne_2.asm => SSAnne2F.asm} | 0 .../maps/{ss_anne_9.asm => SSAnne2FRooms.asm} | 0 text/maps/{ss_anne_3.asm => SSAnne3F.asm} | 0 .../{ss_anne_10.asm => SSAnneB1FRooms.asm} | 0 text/maps/{ss_anne_5.asm => SSAnneBow.asm} | 0 .../{ss_anne_7.asm => SSAnneCaptainsRoom.asm} | 0 .../maps/{ss_anne_6.asm => SSAnneKitchen.asm} | 0 ...i_zone_center.asm => SafariZoneCenter.asm} | 0 ...se_1.asm => SafariZoneCenterRestHouse.asm} | 0 ...afari_zone_east.asm => SafariZoneEast.asm} | 0 ...ouse_3.asm => SafariZoneEastRestHouse.asm} | 0 ...i_zone_entrance.asm => SafariZoneGate.asm} | 3 +- ...ari_zone_north.asm => SafariZoneNorth.asm} | 0 ...use_4.asm => SafariZoneNorthRestHouse.asm} | 0 ...et_house.asm => SafariZoneSecretHouse.asm} | 0 ...afari_zone_west.asm => SafariZoneWest.asm} | 0 ...ouse_2.asm => SafariZoneWestRestHouse.asm} | 0 .../{saffron_city.asm => SaffronCity.asm} | 0 .../{saffron_gates.asm => SaffronGates.asm} | 3 +- text/maps/{saffron_gym.asm => SaffronGym.asm} | 3 +- .../{saffron_mart.asm => SaffronMart.asm} | 0 ...ffron_house.asm => SaffronPidgeyHouse.asm} | 0 ...n_pokecenter.asm => SaffronPokecenter.asm} | 0 ..._islands_b4f.asm => SeafoamIslandsB4F.asm} | 0 .../maps/{silph_co_10f.asm => SilphCo10F.asm} | 0 .../maps/{silph_co_11f.asm => SilphCo11F.asm} | 0 text/maps/{silph_co_1f.asm => SilphCo1F.asm} | 0 text/maps/{silph_co_2f.asm => SilphCo2F.asm} | 0 text/maps/{silph_co_3f.asm => SilphCo3F.asm} | 0 text/maps/{silph_co_4f.asm => SilphCo4F.asm} | 0 .../maps/{silph_co_5f_1.asm => SilphCo5F.asm} | 0 .../{silph_co_5f_2.asm => SilphCo5F_2.asm} | 0 text/maps/{silph_co_6f.asm => SilphCo6F.asm} | 0 text/maps/{silph_co_7f.asm => SilphCo7F.asm} | 0 text/maps/{silph_co_8f.asm => SilphCo8F.asm} | 0 text/maps/{silph_co_9f.asm => SilphCo9F.asm} | 0 ...entrance.asm => UndergroundPathRoute6.asm} | 0 ...entrance.asm => UndergroundPathRoute7.asm} | 0 ...used.asm => UndergroundPathRoute7Copy.asm} | 0 ...entrance.asm => UndergroundPathRoute8.asm} | 0 .../{vermilion_city.asm => VermilionCity.asm} | 0 .../{vermilion_dock.asm => VermilionDock.asm} | 0 .../{vermilion_gym_1.asm => VermilionGym.asm} | 0 ...vermilion_gym_2.asm => VermilionGym_2.asm} | 3 +- .../{vermilion_mart.asm => VermilionMart.asm} | 0 ...ing_house.asm => VermilionOldRodHouse.asm} | 3 +- ...ion_house.asm => VermilionPidgeyHouse.asm} | 0 ...pokecenter.asm => VermilionPokecenter.asm} | 0 ...{victory_road_1f.asm => VictoryRoad1F.asm} | 0 ...{victory_road_2f.asm => VictoryRoad2F.asm} | 0 ...{victory_road_3f.asm => VictoryRoad3F.asm} | 0 .../{viridian_city.asm => ViridianCity.asm} | 0 ...viridian_forest.asm => ViridianForest.asm} | 0 ...t_exit.asm => ViridianForestNorthGate.asm} | 0 ...trance.asm => ViridianForestSouthGate.asm} | 0 .../{viridian_gym.asm => ViridianGym.asm} | 3 +- .../{viridian_mart.asm => ViridianMart.asm} | 0 ...an_house.asm => ViridianNicknameHouse.asm} | 0 ..._pokecenter.asm => ViridianPokecenter.asm} | 0 .../{school.asm => ViridianSchoolHouse.asm} | 0 .../{wardens_house.asm => WardensHouse.asm} | 3 +- wram.asm | 109 +- 1398 files changed, 6631 insertions(+), 6166 deletions(-) create mode 100755 data/mapHeaders/AgathasRoom.asm create mode 100755 data/mapHeaders/BikeShop.asm create mode 100755 data/mapHeaders/BillsHouse.asm create mode 100755 data/mapHeaders/BluesHouse.asm create mode 100755 data/mapHeaders/BrunosRoom.asm create mode 100755 data/mapHeaders/CeladonChiefHouse.asm create mode 100755 data/mapHeaders/CeladonCity.asm create mode 100755 data/mapHeaders/CeladonDiner.asm create mode 100755 data/mapHeaders/CeladonGym.asm create mode 100755 data/mapHeaders/CeladonHotel.asm create mode 100755 data/mapHeaders/CeladonMansion1F.asm create mode 100755 data/mapHeaders/CeladonMansion2F.asm create mode 100755 data/mapHeaders/CeladonMansion3F.asm create mode 100755 data/mapHeaders/CeladonMansionRoof.asm create mode 100755 data/mapHeaders/CeladonMansionRoofHouse.asm create mode 100755 data/mapHeaders/CeladonMart1F.asm create mode 100755 data/mapHeaders/CeladonMart2F.asm create mode 100755 data/mapHeaders/CeladonMart3F.asm create mode 100755 data/mapHeaders/CeladonMart4F.asm create mode 100755 data/mapHeaders/CeladonMart5F.asm create mode 100755 data/mapHeaders/CeladonMartElevator.asm create mode 100755 data/mapHeaders/CeladonMartRoof.asm create mode 100755 data/mapHeaders/CeladonPokecenter.asm create mode 100755 data/mapHeaders/CeruleanBadgeHouse.asm create mode 100755 data/mapHeaders/CeruleanCave1F.asm create mode 100755 data/mapHeaders/CeruleanCave2F.asm create mode 100755 data/mapHeaders/CeruleanCaveB1F.asm create mode 100755 data/mapHeaders/CeruleanCity.asm create mode 100755 data/mapHeaders/CeruleanGym.asm create mode 100755 data/mapHeaders/CeruleanMart.asm create mode 100755 data/mapHeaders/CeruleanPokecenter.asm create mode 100755 data/mapHeaders/CeruleanTradeHouse.asm create mode 100755 data/mapHeaders/CeruleanTrashedHouse.asm create mode 100755 data/mapHeaders/ChampionsRoom.asm create mode 100755 data/mapHeaders/CinnabarGym.asm create mode 100755 data/mapHeaders/CinnabarIsland.asm create mode 100755 data/mapHeaders/CinnabarLab.asm create mode 100755 data/mapHeaders/CinnabarLabFossilRoom.asm create mode 100755 data/mapHeaders/CinnabarLabMetronomeRoom.asm create mode 100755 data/mapHeaders/CinnabarLabTradeRoom.asm create mode 100755 data/mapHeaders/CinnabarMart.asm create mode 100755 data/mapHeaders/CinnabarPokecenter.asm create mode 100755 data/mapHeaders/Colosseum.asm create mode 100755 data/mapHeaders/CopycatsHouse1F.asm create mode 100755 data/mapHeaders/CopycatsHouse2F.asm create mode 100755 data/mapHeaders/Daycare.asm create mode 100755 data/mapHeaders/DiglettsCave.asm create mode 100755 data/mapHeaders/DiglettsCaveRoute11.asm create mode 100755 data/mapHeaders/DiglettsCaveRoute2.asm create mode 100755 data/mapHeaders/FightingDojo.asm create mode 100755 data/mapHeaders/FuchsiaBillsGrandpasHouse.asm create mode 100755 data/mapHeaders/FuchsiaCity.asm create mode 100755 data/mapHeaders/FuchsiaGoodRodHouse.asm create mode 100755 data/mapHeaders/FuchsiaGym.asm create mode 100755 data/mapHeaders/FuchsiaMart.asm create mode 100755 data/mapHeaders/FuchsiaMeetingRoom.asm create mode 100755 data/mapHeaders/FuchsiaPokecenter.asm create mode 100755 data/mapHeaders/GameCorner.asm create mode 100755 data/mapHeaders/GameCornerPrizeRoom.asm create mode 100755 data/mapHeaders/HallOfFame.asm create mode 100755 data/mapHeaders/IndigoPlateau.asm create mode 100755 data/mapHeaders/IndigoPlateauLobby.asm create mode 100755 data/mapHeaders/LancesRoom.asm create mode 100755 data/mapHeaders/LavenderCuboneHouse.asm create mode 100755 data/mapHeaders/LavenderMart.asm create mode 100755 data/mapHeaders/LavenderPokecenter.asm create mode 100755 data/mapHeaders/LavenderTown.asm create mode 100755 data/mapHeaders/LoreleisRoom.asm create mode 100755 data/mapHeaders/MrFujisHouse.asm create mode 100755 data/mapHeaders/MrPsychicsHouse.asm create mode 100755 data/mapHeaders/MtMoon1F.asm create mode 100755 data/mapHeaders/MtMoonB1F.asm create mode 100755 data/mapHeaders/MtMoonB2F.asm create mode 100755 data/mapHeaders/MtMoonPokecenter.asm create mode 100755 data/mapHeaders/Museum1F.asm create mode 100755 data/mapHeaders/Museum2F.asm create mode 100755 data/mapHeaders/NameRatersHouse.asm create mode 100755 data/mapHeaders/OaksLab.asm create mode 100755 data/mapHeaders/PalletTown.asm create mode 100755 data/mapHeaders/PewterCity.asm create mode 100755 data/mapHeaders/PewterGym.asm create mode 100755 data/mapHeaders/PewterMart.asm create mode 100755 data/mapHeaders/PewterNidoranHouse.asm create mode 100755 data/mapHeaders/PewterPokecenter.asm create mode 100755 data/mapHeaders/PewterSpeechHouse.asm create mode 100755 data/mapHeaders/PokemonFanClub.asm create mode 100755 data/mapHeaders/PokemonMansion1F.asm create mode 100755 data/mapHeaders/PokemonMansion2F.asm create mode 100755 data/mapHeaders/PokemonMansion3F.asm create mode 100755 data/mapHeaders/PokemonMansionB1F.asm create mode 100755 data/mapHeaders/PokemonTower1F.asm create mode 100755 data/mapHeaders/PokemonTower2F.asm create mode 100755 data/mapHeaders/PokemonTower3F.asm create mode 100755 data/mapHeaders/PokemonTower4F.asm create mode 100755 data/mapHeaders/PokemonTower5F.asm create mode 100755 data/mapHeaders/PokemonTower6F.asm create mode 100755 data/mapHeaders/PokemonTower7F.asm create mode 100755 data/mapHeaders/PowerPlant.asm create mode 100755 data/mapHeaders/RedsHouse1F.asm create mode 100755 data/mapHeaders/RedsHouse2F.asm create mode 100755 data/mapHeaders/RockTunnel1F.asm create mode 100755 data/mapHeaders/RockTunnelB1F.asm create mode 100755 data/mapHeaders/RockTunnelPokecenter.asm create mode 100755 data/mapHeaders/RocketHideoutB1F.asm create mode 100755 data/mapHeaders/RocketHideoutB2F.asm create mode 100755 data/mapHeaders/RocketHideoutB3F.asm create mode 100755 data/mapHeaders/RocketHideoutB4F.asm create mode 100755 data/mapHeaders/RocketHideoutElevator.asm create mode 100755 data/mapHeaders/Route1.asm create mode 100755 data/mapHeaders/Route10.asm create mode 100755 data/mapHeaders/Route11.asm create mode 100755 data/mapHeaders/Route11Gate1F.asm create mode 100755 data/mapHeaders/Route11Gate2F.asm create mode 100755 data/mapHeaders/Route12.asm create mode 100755 data/mapHeaders/Route12Gate1F.asm create mode 100755 data/mapHeaders/Route12Gate2F.asm create mode 100755 data/mapHeaders/Route12SuperRodHouse.asm create mode 100755 data/mapHeaders/Route13.asm create mode 100755 data/mapHeaders/Route14.asm create mode 100755 data/mapHeaders/Route15.asm create mode 100755 data/mapHeaders/Route15Gate1F.asm create mode 100755 data/mapHeaders/Route15Gate2F.asm create mode 100755 data/mapHeaders/Route16.asm create mode 100755 data/mapHeaders/Route16FlyHouse.asm create mode 100755 data/mapHeaders/Route16Gate1F.asm create mode 100755 data/mapHeaders/Route16Gate2F.asm create mode 100755 data/mapHeaders/Route17.asm create mode 100755 data/mapHeaders/Route18.asm create mode 100755 data/mapHeaders/Route18Gate1F.asm create mode 100755 data/mapHeaders/Route18Gate2F.asm create mode 100755 data/mapHeaders/Route19.asm create mode 100755 data/mapHeaders/Route2.asm create mode 100755 data/mapHeaders/Route20.asm create mode 100755 data/mapHeaders/Route21.asm create mode 100755 data/mapHeaders/Route22.asm create mode 100755 data/mapHeaders/Route22Gate.asm create mode 100755 data/mapHeaders/Route23.asm create mode 100755 data/mapHeaders/Route24.asm create mode 100755 data/mapHeaders/Route25.asm create mode 100755 data/mapHeaders/Route2Gate.asm create mode 100755 data/mapHeaders/Route2TradeHouse.asm create mode 100755 data/mapHeaders/Route3.asm create mode 100755 data/mapHeaders/Route4.asm create mode 100755 data/mapHeaders/Route5.asm create mode 100755 data/mapHeaders/Route5Gate.asm create mode 100755 data/mapHeaders/Route6.asm create mode 100755 data/mapHeaders/Route6Gate.asm create mode 100755 data/mapHeaders/Route7.asm create mode 100755 data/mapHeaders/Route7Gate.asm create mode 100755 data/mapHeaders/Route8.asm create mode 100755 data/mapHeaders/Route8Gate.asm create mode 100755 data/mapHeaders/Route9.asm create mode 100755 data/mapHeaders/SSAnne1F.asm create mode 100755 data/mapHeaders/SSAnne1FRooms.asm create mode 100755 data/mapHeaders/SSAnne2F.asm create mode 100755 data/mapHeaders/SSAnne2FRooms.asm create mode 100755 data/mapHeaders/SSAnne3F.asm create mode 100755 data/mapHeaders/SSAnneB1F.asm create mode 100755 data/mapHeaders/SSAnneB1FRooms.asm create mode 100755 data/mapHeaders/SSAnneBow.asm create mode 100755 data/mapHeaders/SSAnneCaptainsRoom.asm create mode 100755 data/mapHeaders/SSAnneKitchen.asm create mode 100755 data/mapHeaders/SafariZoneCenter.asm create mode 100755 data/mapHeaders/SafariZoneCenterRestHouse.asm create mode 100755 data/mapHeaders/SafariZoneEast.asm create mode 100755 data/mapHeaders/SafariZoneEastRestHouse.asm create mode 100755 data/mapHeaders/SafariZoneGate.asm create mode 100755 data/mapHeaders/SafariZoneNorth.asm create mode 100755 data/mapHeaders/SafariZoneNorthRestHouse.asm create mode 100755 data/mapHeaders/SafariZoneSecretHouse.asm create mode 100755 data/mapHeaders/SafariZoneWest.asm create mode 100755 data/mapHeaders/SafariZoneWestRestHouse.asm create mode 100755 data/mapHeaders/SaffronCity.asm create mode 100755 data/mapHeaders/SaffronGym.asm create mode 100755 data/mapHeaders/SaffronMart.asm create mode 100755 data/mapHeaders/SaffronPidgeyHouse.asm create mode 100755 data/mapHeaders/SaffronPokecenter.asm create mode 100755 data/mapHeaders/SeafoamIslands1F.asm create mode 100755 data/mapHeaders/SeafoamIslandsB1F.asm create mode 100755 data/mapHeaders/SeafoamIslandsB2F.asm create mode 100755 data/mapHeaders/SeafoamIslandsB3F.asm create mode 100755 data/mapHeaders/SeafoamIslandsB4F.asm create mode 100755 data/mapHeaders/SilphCo10F.asm create mode 100755 data/mapHeaders/SilphCo11F.asm create mode 100755 data/mapHeaders/SilphCo1F.asm create mode 100755 data/mapHeaders/SilphCo2F.asm create mode 100755 data/mapHeaders/SilphCo3F.asm create mode 100755 data/mapHeaders/SilphCo4F.asm create mode 100755 data/mapHeaders/SilphCo5F.asm create mode 100755 data/mapHeaders/SilphCo6F.asm create mode 100755 data/mapHeaders/SilphCo7F.asm create mode 100755 data/mapHeaders/SilphCo8F.asm create mode 100755 data/mapHeaders/SilphCo9F.asm create mode 100755 data/mapHeaders/SilphCoElevator.asm create mode 100755 data/mapHeaders/TradeCenter.asm create mode 100755 data/mapHeaders/UndergroundPathNorthSouth.asm create mode 100755 data/mapHeaders/UndergroundPathRoute5.asm create mode 100755 data/mapHeaders/UndergroundPathRoute6.asm create mode 100755 data/mapHeaders/UndergroundPathRoute7.asm create mode 100755 data/mapHeaders/UndergroundPathRoute7Copy.asm create mode 100755 data/mapHeaders/UndergroundPathRoute8.asm create mode 100755 data/mapHeaders/UndergroundPathWestEast.asm create mode 100755 data/mapHeaders/VermilionCity.asm create mode 100755 data/mapHeaders/VermilionDock.asm create mode 100755 data/mapHeaders/VermilionGym.asm create mode 100755 data/mapHeaders/VermilionMart.asm create mode 100755 data/mapHeaders/VermilionOldRodHouse.asm create mode 100755 data/mapHeaders/VermilionPidgeyHouse.asm create mode 100755 data/mapHeaders/VermilionPokecenter.asm create mode 100755 data/mapHeaders/VermilionTradeHouse.asm create mode 100755 data/mapHeaders/VictoryRoad1F.asm create mode 100755 data/mapHeaders/VictoryRoad2F.asm create mode 100755 data/mapHeaders/VictoryRoad3F.asm create mode 100755 data/mapHeaders/ViridianCity.asm create mode 100755 data/mapHeaders/ViridianForest.asm create mode 100755 data/mapHeaders/ViridianForestNorthGate.asm create mode 100755 data/mapHeaders/ViridianForestSouthGate.asm create mode 100755 data/mapHeaders/ViridianGym.asm create mode 100755 data/mapHeaders/ViridianMart.asm create mode 100755 data/mapHeaders/ViridianNicknameHouse.asm create mode 100755 data/mapHeaders/ViridianPokecenter.asm create mode 100755 data/mapHeaders/ViridianSchoolHouse.asm create mode 100755 data/mapHeaders/WardensHouse.asm delete mode 100755 data/mapHeaders/agatha.asm delete mode 100755 data/mapHeaders/bikeshop.asm delete mode 100755 data/mapHeaders/billshouse.asm delete mode 100755 data/mapHeaders/blueshouse.asm delete mode 100755 data/mapHeaders/bruno.asm delete mode 100755 data/mapHeaders/celadoncity.asm delete mode 100755 data/mapHeaders/celadondiner.asm delete mode 100755 data/mapHeaders/celadongamecorner.asm delete mode 100755 data/mapHeaders/celadongym.asm delete mode 100755 data/mapHeaders/celadonhotel.asm delete mode 100755 data/mapHeaders/celadonhouse.asm delete mode 100755 data/mapHeaders/celadonmansion1.asm delete mode 100755 data/mapHeaders/celadonmansion2.asm delete mode 100755 data/mapHeaders/celadonmansion3.asm delete mode 100755 data/mapHeaders/celadonmansion4.asm delete mode 100755 data/mapHeaders/celadonmansion5.asm delete mode 100755 data/mapHeaders/celadonmart1.asm delete mode 100755 data/mapHeaders/celadonmart2.asm delete mode 100755 data/mapHeaders/celadonmart3.asm delete mode 100755 data/mapHeaders/celadonmart4.asm delete mode 100755 data/mapHeaders/celadonmart5.asm delete mode 100755 data/mapHeaders/celadonmartelevator.asm delete mode 100755 data/mapHeaders/celadonmartroof.asm delete mode 100755 data/mapHeaders/celadonpokecenter.asm delete mode 100755 data/mapHeaders/celadonprizeroom.asm delete mode 100755 data/mapHeaders/ceruleancity.asm delete mode 100755 data/mapHeaders/ceruleangym.asm delete mode 100755 data/mapHeaders/ceruleanhouse1.asm delete mode 100755 data/mapHeaders/ceruleanhouse2.asm delete mode 100755 data/mapHeaders/ceruleanhousetrashed.asm delete mode 100755 data/mapHeaders/ceruleanmart.asm delete mode 100755 data/mapHeaders/ceruleanpokecenter.asm delete mode 100755 data/mapHeaders/cinnabargym.asm delete mode 100755 data/mapHeaders/cinnabarisland.asm delete mode 100755 data/mapHeaders/cinnabarmart.asm delete mode 100755 data/mapHeaders/cinnabarpokecenter.asm delete mode 100755 data/mapHeaders/colosseum.asm delete mode 100755 data/mapHeaders/copycatshouse1f.asm delete mode 100755 data/mapHeaders/copycatshouse2f.asm delete mode 100755 data/mapHeaders/daycarem.asm delete mode 100755 data/mapHeaders/diglettscave.asm delete mode 100755 data/mapHeaders/diglettscaveroute11.asm delete mode 100755 data/mapHeaders/diglettscaveroute2.asm delete mode 100755 data/mapHeaders/fanclub.asm delete mode 100755 data/mapHeaders/fightingdojo.asm delete mode 100755 data/mapHeaders/fuchsiacity.asm delete mode 100755 data/mapHeaders/fuchsiagym.asm delete mode 100755 data/mapHeaders/fuchsiahouse1.asm delete mode 100755 data/mapHeaders/fuchsiahouse2.asm delete mode 100755 data/mapHeaders/fuchsiahouse3.asm delete mode 100755 data/mapHeaders/fuchsiamart.asm delete mode 100755 data/mapHeaders/fuchsiameetingroom.asm delete mode 100755 data/mapHeaders/fuchsiapokecenter.asm delete mode 100755 data/mapHeaders/gary.asm delete mode 100755 data/mapHeaders/halloffameroom.asm delete mode 100755 data/mapHeaders/indigoplateau.asm delete mode 100755 data/mapHeaders/indigoplateaulobby.asm delete mode 100755 data/mapHeaders/lab1.asm delete mode 100755 data/mapHeaders/lab2.asm delete mode 100755 data/mapHeaders/lab3.asm delete mode 100755 data/mapHeaders/lab4.asm delete mode 100755 data/mapHeaders/lance.asm delete mode 100755 data/mapHeaders/lavenderhouse1.asm delete mode 100755 data/mapHeaders/lavenderhouse2.asm delete mode 100755 data/mapHeaders/lavendermart.asm delete mode 100755 data/mapHeaders/lavenderpokecenter.asm delete mode 100755 data/mapHeaders/lavendertown.asm delete mode 100755 data/mapHeaders/lorelei.asm delete mode 100755 data/mapHeaders/mansion1.asm delete mode 100755 data/mapHeaders/mansion2.asm delete mode 100755 data/mapHeaders/mansion3.asm delete mode 100755 data/mapHeaders/mansion4.asm delete mode 100755 data/mapHeaders/mtmoon1.asm delete mode 100755 data/mapHeaders/mtmoon2.asm delete mode 100755 data/mapHeaders/mtmoon3.asm delete mode 100755 data/mapHeaders/mtmoonpokecenter.asm delete mode 100755 data/mapHeaders/museum1f.asm delete mode 100755 data/mapHeaders/museum2f.asm delete mode 100755 data/mapHeaders/namerater.asm delete mode 100755 data/mapHeaders/oakslab.asm delete mode 100755 data/mapHeaders/pallettown.asm delete mode 100755 data/mapHeaders/pewtercity.asm delete mode 100755 data/mapHeaders/pewtergym.asm delete mode 100755 data/mapHeaders/pewterhouse1.asm delete mode 100755 data/mapHeaders/pewterhouse2.asm delete mode 100755 data/mapHeaders/pewtermart.asm delete mode 100755 data/mapHeaders/pewterpokecenter.asm delete mode 100755 data/mapHeaders/pokemontower1.asm delete mode 100755 data/mapHeaders/pokemontower2.asm delete mode 100755 data/mapHeaders/pokemontower3.asm delete mode 100755 data/mapHeaders/pokemontower4.asm delete mode 100755 data/mapHeaders/pokemontower5.asm delete mode 100755 data/mapHeaders/pokemontower6.asm delete mode 100755 data/mapHeaders/pokemontower7.asm delete mode 100755 data/mapHeaders/powerplant.asm delete mode 100755 data/mapHeaders/redshouse1f.asm delete mode 100755 data/mapHeaders/redshouse2f.asm delete mode 100755 data/mapHeaders/rockethideout1.asm delete mode 100755 data/mapHeaders/rockethideout2.asm delete mode 100755 data/mapHeaders/rockethideout3.asm delete mode 100755 data/mapHeaders/rockethideout4.asm delete mode 100755 data/mapHeaders/rockethideoutelevator.asm delete mode 100755 data/mapHeaders/rocktunnel1.asm delete mode 100755 data/mapHeaders/rocktunnel2.asm delete mode 100755 data/mapHeaders/rocktunnelpokecenter.asm delete mode 100755 data/mapHeaders/route1.asm delete mode 100755 data/mapHeaders/route10.asm delete mode 100755 data/mapHeaders/route11.asm delete mode 100755 data/mapHeaders/route11gate.asm delete mode 100755 data/mapHeaders/route11gateupstairs.asm delete mode 100755 data/mapHeaders/route12.asm delete mode 100755 data/mapHeaders/route12gate.asm delete mode 100755 data/mapHeaders/route12gateupstairs.asm delete mode 100755 data/mapHeaders/route12house.asm delete mode 100755 data/mapHeaders/route13.asm delete mode 100755 data/mapHeaders/route14.asm delete mode 100755 data/mapHeaders/route15.asm delete mode 100755 data/mapHeaders/route15gate.asm delete mode 100755 data/mapHeaders/route15gateupstairs.asm delete mode 100755 data/mapHeaders/route16.asm delete mode 100755 data/mapHeaders/route16gate.asm delete mode 100755 data/mapHeaders/route16gateupstairs.asm delete mode 100755 data/mapHeaders/route16house.asm delete mode 100755 data/mapHeaders/route17.asm delete mode 100755 data/mapHeaders/route18.asm delete mode 100755 data/mapHeaders/route18gate.asm delete mode 100755 data/mapHeaders/route18gateupstairs.asm delete mode 100755 data/mapHeaders/route19.asm delete mode 100755 data/mapHeaders/route2.asm delete mode 100755 data/mapHeaders/route20.asm delete mode 100755 data/mapHeaders/route21.asm delete mode 100755 data/mapHeaders/route22.asm delete mode 100755 data/mapHeaders/route22gate.asm delete mode 100755 data/mapHeaders/route23.asm delete mode 100755 data/mapHeaders/route24.asm delete mode 100755 data/mapHeaders/route25.asm delete mode 100755 data/mapHeaders/route2gate.asm delete mode 100755 data/mapHeaders/route2house.asm delete mode 100755 data/mapHeaders/route3.asm delete mode 100755 data/mapHeaders/route4.asm delete mode 100755 data/mapHeaders/route5.asm delete mode 100755 data/mapHeaders/route5gate.asm delete mode 100755 data/mapHeaders/route6.asm delete mode 100755 data/mapHeaders/route6gate.asm delete mode 100755 data/mapHeaders/route7.asm delete mode 100755 data/mapHeaders/route7gate.asm delete mode 100755 data/mapHeaders/route8.asm delete mode 100755 data/mapHeaders/route8gate.asm delete mode 100755 data/mapHeaders/route9.asm delete mode 100755 data/mapHeaders/safarizonecenter.asm delete mode 100755 data/mapHeaders/safarizoneeast.asm delete mode 100755 data/mapHeaders/safarizoneentrance.asm delete mode 100755 data/mapHeaders/safarizonenorth.asm delete mode 100755 data/mapHeaders/safarizoneresthouse1.asm delete mode 100755 data/mapHeaders/safarizoneresthouse2.asm delete mode 100755 data/mapHeaders/safarizoneresthouse3.asm delete mode 100755 data/mapHeaders/safarizoneresthouse4.asm delete mode 100755 data/mapHeaders/safarizonesecrethouse.asm delete mode 100755 data/mapHeaders/safarizonewest.asm delete mode 100755 data/mapHeaders/saffroncity.asm delete mode 100755 data/mapHeaders/saffrongym.asm delete mode 100755 data/mapHeaders/saffronhouse1.asm delete mode 100755 data/mapHeaders/saffronhouse2.asm delete mode 100755 data/mapHeaders/saffronmart.asm delete mode 100755 data/mapHeaders/saffronpokecenter.asm delete mode 100755 data/mapHeaders/school.asm delete mode 100755 data/mapHeaders/seafoamislands1.asm delete mode 100755 data/mapHeaders/seafoamislands2.asm delete mode 100755 data/mapHeaders/seafoamislands3.asm delete mode 100755 data/mapHeaders/seafoamislands4.asm delete mode 100755 data/mapHeaders/seafoamislands5.asm delete mode 100755 data/mapHeaders/silphco1.asm delete mode 100755 data/mapHeaders/silphco10.asm delete mode 100755 data/mapHeaders/silphco11.asm delete mode 100755 data/mapHeaders/silphco2.asm delete mode 100755 data/mapHeaders/silphco3.asm delete mode 100755 data/mapHeaders/silphco4.asm delete mode 100755 data/mapHeaders/silphco5.asm delete mode 100755 data/mapHeaders/silphco6.asm delete mode 100755 data/mapHeaders/silphco7.asm delete mode 100755 data/mapHeaders/silphco8.asm delete mode 100755 data/mapHeaders/silphco9.asm delete mode 100755 data/mapHeaders/silphcoelevator.asm delete mode 100755 data/mapHeaders/ssanne1.asm delete mode 100755 data/mapHeaders/ssanne10.asm delete mode 100755 data/mapHeaders/ssanne2.asm delete mode 100755 data/mapHeaders/ssanne3.asm delete mode 100755 data/mapHeaders/ssanne4.asm delete mode 100755 data/mapHeaders/ssanne5.asm delete mode 100755 data/mapHeaders/ssanne6.asm delete mode 100755 data/mapHeaders/ssanne7.asm delete mode 100755 data/mapHeaders/ssanne8.asm delete mode 100755 data/mapHeaders/ssanne9.asm delete mode 100755 data/mapHeaders/tradecenter.asm delete mode 100755 data/mapHeaders/undergroundpathentranceroute5.asm delete mode 100755 data/mapHeaders/undergroundpathentranceroute6.asm delete mode 100755 data/mapHeaders/undergroundpathentranceroute7.asm delete mode 100755 data/mapHeaders/undergroundpathentranceroute7copy.asm delete mode 100755 data/mapHeaders/undergroundpathentranceroute8.asm delete mode 100755 data/mapHeaders/undergroundpathns.asm delete mode 100755 data/mapHeaders/undergroundpathwe.asm delete mode 100755 data/mapHeaders/unknowndungeon1.asm delete mode 100755 data/mapHeaders/unknowndungeon2.asm delete mode 100755 data/mapHeaders/unknowndungeon3.asm delete mode 100755 data/mapHeaders/vermilioncity.asm delete mode 100755 data/mapHeaders/vermiliondock.asm delete mode 100755 data/mapHeaders/vermiliongym.asm delete mode 100755 data/mapHeaders/vermilionhouse1.asm delete mode 100755 data/mapHeaders/vermilionhouse2.asm delete mode 100755 data/mapHeaders/vermilionhouse3.asm delete mode 100755 data/mapHeaders/vermilionmart.asm delete mode 100755 data/mapHeaders/vermilionpokecenter.asm delete mode 100755 data/mapHeaders/victoryroad1.asm delete mode 100755 data/mapHeaders/victoryroad2.asm delete mode 100755 data/mapHeaders/victoryroad3.asm delete mode 100755 data/mapHeaders/viridiancity.asm delete mode 100755 data/mapHeaders/viridianforest.asm delete mode 100755 data/mapHeaders/viridianforestentrance.asm delete mode 100755 data/mapHeaders/viridianforestexit.asm delete mode 100755 data/mapHeaders/viridiangym.asm delete mode 100755 data/mapHeaders/viridianhouse.asm delete mode 100755 data/mapHeaders/viridianmart.asm delete mode 100755 data/mapHeaders/viridianpokecenter.asm rename data/mapObjects/{agatha.asm => AgathasRoom.asm} (95%) rename data/mapObjects/{bikeshop.asm => BikeShop.asm} (95%) rename data/mapObjects/{billshouse.asm => BillsHouse.asm} (94%) rename data/mapObjects/{blueshouse.asm => BluesHouse.asm} (95%) rename data/mapObjects/{bruno.asm => BrunosRoom.asm} (95%) rename data/mapObjects/{celadonhouse.asm => CeladonChiefHouse.asm} (71%) rename data/mapObjects/{celadoncity.asm => CeladonCity.asm} (62%) rename data/mapObjects/{celadondiner.asm => CeladonDiner.asm} (95%) rename data/mapObjects/{celadongym.asm => CeladonGym.asm} (97%) rename data/mapObjects/{celadonhotel.asm => CeladonHotel.asm} (94%) rename data/mapObjects/{celadonmansion1.asm => CeladonMansion1F.asm} (53%) create mode 100755 data/mapObjects/CeladonMansion2F.asm rename data/mapObjects/{celadonmansion3.asm => CeladonMansion3F.asm} (52%) create mode 100755 data/mapObjects/CeladonMansionRoof.asm create mode 100755 data/mapObjects/CeladonMansionRoofHouse.asm rename data/mapObjects/{celadonmart1.asm => CeladonMart1F.asm} (50%) rename data/mapObjects/{celadonmart2.asm => CeladonMart2F.asm} (58%) rename data/mapObjects/{celadonmart3.asm => CeladonMart3F.asm} (76%) rename data/mapObjects/{celadonmart4.asm => CeladonMart4F.asm} (55%) rename data/mapObjects/{celadonmart5.asm => CeladonMart5F.asm} (63%) create mode 100755 data/mapObjects/CeladonMartElevator.asm rename data/mapObjects/{celadonmartroof.asm => CeladonMartRoof.asm} (75%) rename data/mapObjects/{celadonpokecenter.asm => CeladonPokecenter.asm} (94%) rename data/mapObjects/{ceruleanhouse2.asm => CeruleanBadgeHouse.asm} (55%) create mode 100755 data/mapObjects/CeruleanCave1F.asm create mode 100755 data/mapObjects/CeruleanCave2F.asm rename data/mapObjects/{unknowndungeon3.asm => CeruleanCaveB1F.asm} (68%) rename data/mapObjects/{ceruleancity.asm => CeruleanCity.asm} (67%) rename data/mapObjects/{ceruleangym.asm => CeruleanGym.asm} (95%) rename data/mapObjects/{ceruleanmart.asm => CeruleanMart.asm} (94%) rename data/mapObjects/{ceruleanpokecenter.asm => CeruleanPokecenter.asm} (94%) rename data/mapObjects/{ceruleanhouse1.asm => CeruleanTradeHouse.asm} (67%) rename data/mapObjects/{ceruleanhousetrashed.asm => CeruleanTrashedHouse.asm} (63%) rename data/mapObjects/{gary.asm => ChampionsRoom.asm} (95%) rename data/mapObjects/{cinnabargym.asm => CinnabarGym.asm} (97%) rename data/mapObjects/{cinnabarisland.asm => CinnabarIsland.asm} (76%) create mode 100755 data/mapObjects/CinnabarLab.asm create mode 100755 data/mapObjects/CinnabarLabFossilRoom.asm rename data/mapObjects/{lab3.asm => CinnabarLabMetronomeRoom.asm} (54%) rename data/mapObjects/{lab2.asm => CinnabarLabTradeRoom.asm} (55%) rename data/mapObjects/{cinnabarmart.asm => CinnabarMart.asm} (94%) rename data/mapObjects/{cinnabarpokecenter.asm => CinnabarPokecenter.asm} (93%) rename data/mapObjects/{colosseum.asm => Colosseum.asm} (86%) rename data/mapObjects/{copycatshouse1f.asm => CopycatsHouse1F.asm} (94%) rename data/mapObjects/{copycatshouse2f.asm => CopycatsHouse2F.asm} (95%) rename data/mapObjects/{daycarem.asm => Daycare.asm} (69%) create mode 100755 data/mapObjects/DiglettsCave.asm rename data/mapObjects/{diglettscaveroute11.asm => DiglettsCaveRoute11.asm} (52%) rename data/mapObjects/{diglettscaveroute2.asm => DiglettsCaveRoute2.asm} (53%) rename data/mapObjects/{fightingdojo.asm => FightingDojo.asm} (96%) rename data/mapObjects/{fuchsiahouse1.asm => FuchsiaBillsGrandpasHouse.asm} (67%) rename data/mapObjects/{fuchsiacity.asm => FuchsiaCity.asm} (74%) rename data/mapObjects/{fuchsiahouse3.asm => FuchsiaGoodRodHouse.asm} (54%) rename data/mapObjects/{fuchsiagym.asm => FuchsiaGym.asm} (97%) rename data/mapObjects/{fuchsiamart.asm => FuchsiaMart.asm} (94%) rename data/mapObjects/{fuchsiameetingroom.asm => FuchsiaMeetingRoom.asm} (93%) rename data/mapObjects/{fuchsiapokecenter.asm => FuchsiaPokecenter.asm} (94%) rename data/mapObjects/{celadongamecorner.asm => GameCorner.asm} (88%) rename data/mapObjects/{celadonprizeroom.asm => GameCornerPrizeRoom.asm} (74%) rename data/mapObjects/{halloffameroom.asm => HallOfFame.asm} (92%) rename data/mapObjects/{indigoplateau.asm => IndigoPlateau.asm} (92%) rename data/mapObjects/{indigoplateaulobby.asm => IndigoPlateauLobby.asm} (95%) rename data/mapObjects/{lance.asm => LancesRoom.asm} (95%) rename data/mapObjects/{lavenderhouse2.asm => LavenderCuboneHouse.asm} (66%) rename data/mapObjects/{lavendermart.asm => LavenderMart.asm} (94%) rename data/mapObjects/{lavenderpokecenter.asm => LavenderPokecenter.asm} (93%) rename data/mapObjects/{lavendertown.asm => LavenderTown.asm} (71%) rename data/mapObjects/{lorelei.asm => LoreleisRoom.asm} (95%) rename data/mapObjects/{lavenderhouse1.asm => MrFujisHouse.asm} (82%) rename data/mapObjects/{saffronhouse2.asm => MrPsychicsHouse.asm} (62%) rename data/mapObjects/{mtmoon1.asm => MtMoon1F.asm} (74%) create mode 100755 data/mapObjects/MtMoonB1F.asm rename data/mapObjects/{mtmoon3.asm => MtMoonB2F.asm} (64%) rename data/mapObjects/{mtmoonpokecenter.asm => MtMoonPokecenter.asm} (95%) rename data/mapObjects/{museum1f.asm => Museum1F.asm} (97%) rename data/mapObjects/{museum2f.asm => Museum2F.asm} (96%) rename data/mapObjects/{namerater.asm => NameRatersHouse.asm} (91%) rename data/mapObjects/{oakslab.asm => OaksLab.asm} (97%) rename data/mapObjects/{pallettown.asm => PalletTown.asm} (96%) rename data/mapObjects/{pewtercity.asm => PewterCity.asm} (83%) rename data/mapObjects/{pewtergym.asm => PewterGym.asm} (95%) rename data/mapObjects/{pewtermart.asm => PewterMart.asm} (94%) rename data/mapObjects/{pewterhouse1.asm => PewterNidoranHouse.asm} (71%) rename data/mapObjects/{pewterpokecenter.asm => PewterPokecenter.asm} (94%) rename data/mapObjects/{pewterhouse2.asm => PewterSpeechHouse.asm} (67%) rename data/mapObjects/{fanclub.asm => PokemonFanClub.asm} (96%) create mode 100755 data/mapObjects/PokemonMansion1F.asm create mode 100755 data/mapObjects/PokemonMansion2F.asm rename data/mapObjects/{mansion3.asm => PokemonMansion3F.asm} (54%) rename data/mapObjects/{mansion4.asm => PokemonMansionB1F.asm} (81%) rename data/mapObjects/{pokemontower1.asm => PokemonTower1F.asm} (67%) create mode 100755 data/mapObjects/PokemonTower2F.asm rename data/mapObjects/{pokemontower3.asm => PokemonTower3F.asm} (61%) rename data/mapObjects/{pokemontower4.asm => PokemonTower4F.asm} (67%) rename data/mapObjects/{pokemontower5.asm => PokemonTower5F.asm} (68%) rename data/mapObjects/{pokemontower6.asm => PokemonTower6F.asm} (64%) rename data/mapObjects/{pokemontower7.asm => PokemonTower7F.asm} (73%) rename data/mapObjects/{powerplant.asm => PowerPlant.asm} (98%) rename data/mapObjects/{redshouse1f.asm => RedsHouse1F.asm} (94%) rename data/mapObjects/{redshouse2f.asm => RedsHouse2F.asm} (87%) rename data/mapObjects/{rocktunnel1.asm => RockTunnel1F.asm} (55%) rename data/mapObjects/{rocktunnel2.asm => RockTunnelB1F.asm} (62%) rename data/mapObjects/{rocktunnelpokecenter.asm => RockTunnelPokecenter.asm} (93%) rename data/mapObjects/{rockethideout1.asm => RocketHideoutB1F.asm} (59%) create mode 100755 data/mapObjects/RocketHideoutB2F.asm rename data/mapObjects/{rockethideout3.asm => RocketHideoutB3F.asm} (58%) rename data/mapObjects/{rockethideout4.asm => RocketHideoutB4F.asm} (71%) create mode 100755 data/mapObjects/RocketHideoutElevator.asm rename data/mapObjects/{route1.asm => Route1.asm} (94%) rename data/mapObjects/{route10.asm => Route10.asm} (81%) rename data/mapObjects/{route11.asm => Route11.asm} (90%) rename data/mapObjects/{route11gate.asm => Route11Gate1F.asm} (95%) rename data/mapObjects/{route11gateupstairs.asm => Route11Gate2F.asm} (93%) rename data/mapObjects/{route12.asm => Route12.asm} (89%) rename data/mapObjects/{route12gate.asm => Route12Gate1F.asm} (95%) rename data/mapObjects/{route12gateupstairs.asm => Route12Gate2F.asm} (91%) rename data/mapObjects/{route12house.asm => Route12SuperRodHouse.asm} (58%) rename data/mapObjects/{route13.asm => Route13.asm} (98%) rename data/mapObjects/{route14.asm => Route14.asm} (98%) rename data/mapObjects/{route15.asm => Route15.asm} (98%) rename data/mapObjects/{route15gate.asm => Route15Gate1F.asm} (95%) rename data/mapObjects/{route15gateupstairs.asm => Route15Gate2F.asm} (90%) rename data/mapObjects/{route16.asm => Route16.asm} (92%) rename data/mapObjects/{route16house.asm => Route16FlyHouse.asm} (68%) rename data/mapObjects/{route16gate.asm => Route16Gate1F.asm} (97%) rename data/mapObjects/{route16gateupstairs.asm => Route16Gate2F.asm} (93%) rename data/mapObjects/{route17.asm => Route17.asm} (98%) rename data/mapObjects/{route18.asm => Route18.asm} (97%) rename data/mapObjects/{route18gate.asm => Route18Gate1F.asm} (95%) rename data/mapObjects/{route18gateupstairs.asm => Route18Gate2F.asm} (91%) rename data/mapObjects/{route19.asm => Route19.asm} (97%) rename data/mapObjects/{route2.asm => Route2.asm} (55%) rename data/mapObjects/{route20.asm => Route20.asm} (80%) rename data/mapObjects/{route21.asm => Route21.asm} (97%) rename data/mapObjects/{route22.asm => Route22.asm} (94%) rename data/mapObjects/{route22gate.asm => Route22Gate.asm} (94%) rename data/mapObjects/{route23.asm => Route23.asm} (78%) rename data/mapObjects/{route24.asm => Route24.asm} (97%) rename data/mapObjects/{route25.asm => Route25.asm} (98%) rename data/mapObjects/{route2gate.asm => Route2Gate.asm} (95%) rename data/mapObjects/{route2house.asm => Route2TradeHouse.asm} (68%) rename data/mapObjects/{route3.asm => Route3.asm} (97%) rename data/mapObjects/{route4.asm => Route4.asm} (72%) rename data/mapObjects/{route5.asm => Route5.asm} (65%) rename data/mapObjects/{route5gate.asm => Route5Gate.asm} (94%) rename data/mapObjects/{route6.asm => Route6.asm} (86%) rename data/mapObjects/{route6gate.asm => Route6Gate.asm} (94%) rename data/mapObjects/{route7.asm => Route7.asm} (78%) rename data/mapObjects/{route7gate.asm => Route7Gate.asm} (94%) rename data/mapObjects/{route8.asm => Route8.asm} (89%) rename data/mapObjects/{route8gate.asm => Route8Gate.asm} (94%) rename data/mapObjects/{route9.asm => Route9.asm} (98%) create mode 100755 data/mapObjects/SSAnne1F.asm rename data/mapObjects/{ssanne8.asm => SSAnne1FRooms.asm} (58%) create mode 100755 data/mapObjects/SSAnne2F.asm create mode 100755 data/mapObjects/SSAnne2FRooms.asm create mode 100755 data/mapObjects/SSAnne3F.asm create mode 100755 data/mapObjects/SSAnneB1F.asm create mode 100755 data/mapObjects/SSAnneB1FRooms.asm rename data/mapObjects/{ssanne5.asm => SSAnneBow.asm} (69%) rename data/mapObjects/{ssanne7.asm => SSAnneCaptainsRoom.asm} (63%) rename data/mapObjects/{ssanne6.asm => SSAnneKitchen.asm} (81%) rename data/mapObjects/{safarizonecenter.asm => SafariZoneCenter.asm} (69%) rename data/mapObjects/{safarizoneresthouse1.asm => SafariZoneCenterRestHouse.asm} (58%) rename data/mapObjects/{safarizoneeast.asm => SafariZoneEast.asm} (85%) rename data/mapObjects/{safarizoneresthouse3.asm => SafariZoneEastRestHouse.asm} (64%) rename data/mapObjects/{safarizoneentrance.asm => SafariZoneGate.asm} (56%) rename data/mapObjects/{safarizonenorth.asm => SafariZoneNorth.asm} (88%) rename data/mapObjects/{safarizoneresthouse4.asm => SafariZoneNorthRestHouse.asm} (64%) rename data/mapObjects/{safarizonesecrethouse.asm => SafariZoneSecretHouse.asm} (91%) rename data/mapObjects/{safarizonewest.asm => SafariZoneWest.asm} (88%) rename data/mapObjects/{safarizoneresthouse2.asm => SafariZoneWestRestHouse.asm} (64%) rename data/mapObjects/{saffroncity.asm => SaffronCity.asm} (89%) rename data/mapObjects/{saffrongym.asm => SaffronGym.asm} (99%) rename data/mapObjects/{saffronmart.asm => SaffronMart.asm} (94%) rename data/mapObjects/{saffronhouse1.asm => SaffronPidgeyHouse.asm} (75%) rename data/mapObjects/{saffronpokecenter.asm => SaffronPokecenter.asm} (94%) create mode 100755 data/mapObjects/SeafoamIslands1F.asm create mode 100755 data/mapObjects/SeafoamIslandsB1F.asm create mode 100755 data/mapObjects/SeafoamIslandsB2F.asm create mode 100755 data/mapObjects/SeafoamIslandsB3F.asm create mode 100755 data/mapObjects/SeafoamIslandsB4F.asm rename data/mapObjects/{silphco10.asm => SilphCo10F.asm} (97%) rename data/mapObjects/{silphco11.asm => SilphCo11F.asm} (97%) rename data/mapObjects/{silphco1.asm => SilphCo1F.asm} (96%) rename data/mapObjects/{silphco2.asm => SilphCo2F.asm} (98%) rename data/mapObjects/{silphco3.asm => SilphCo3F.asm} (98%) rename data/mapObjects/{silphco4.asm => SilphCo4F.asm} (98%) rename data/mapObjects/{silphco5.asm => SilphCo5F.asm} (98%) rename data/mapObjects/{silphco6.asm => SilphCo6F.asm} (98%) rename data/mapObjects/{silphco7.asm => SilphCo7F.asm} (98%) rename data/mapObjects/{silphco8.asm => SilphCo8F.asm} (97%) rename data/mapObjects/{silphco9.asm => SilphCo9F.asm} (97%) rename data/mapObjects/{silphcoelevator.asm => SilphCoElevator.asm} (90%) rename data/mapObjects/{tradecenter.asm => TradeCenter.asm} (85%) create mode 100755 data/mapObjects/UndergroundPathNorthSouth.asm create mode 100755 data/mapObjects/UndergroundPathRoute5.asm create mode 100755 data/mapObjects/UndergroundPathRoute6.asm create mode 100755 data/mapObjects/UndergroundPathRoute7.asm create mode 100755 data/mapObjects/UndergroundPathRoute7Copy.asm create mode 100755 data/mapObjects/UndergroundPathRoute8.asm create mode 100755 data/mapObjects/UndergroundPathWestEast.asm rename data/mapObjects/{vermilioncity.asm => VermilionCity.asm} (78%) rename data/mapObjects/{vermiliondock.asm => VermilionDock.asm} (58%) rename data/mapObjects/{vermiliongym.asm => VermilionGym.asm} (95%) rename data/mapObjects/{vermilionmart.asm => VermilionMart.asm} (94%) rename data/mapObjects/{vermilionhouse2.asm => VermilionOldRodHouse.asm} (58%) rename data/mapObjects/{vermilionhouse1.asm => VermilionPidgeyHouse.asm} (70%) rename data/mapObjects/{vermilionpokecenter.asm => VermilionPokecenter.asm} (93%) rename data/mapObjects/{vermilionhouse3.asm => VermilionTradeHouse.asm} (60%) rename data/mapObjects/{victoryroad1.asm => VictoryRoad1F.asm} (75%) rename data/mapObjects/{victoryroad2.asm => VictoryRoad2F.asm} (63%) rename data/mapObjects/{victoryroad3.asm => VictoryRoad3F.asm} (67%) rename data/mapObjects/{viridiancity.asm => ViridianCity.asm} (80%) rename data/mapObjects/{viridianforest.asm => ViridianForest.asm} (54%) rename data/mapObjects/{viridianforestexit.asm => ViridianForestNorthGate.asm} (53%) rename data/mapObjects/{viridianforestentrance.asm => ViridianForestSouthGate.asm} (52%) rename data/mapObjects/{viridiangym.asm => ViridianGym.asm} (97%) rename data/mapObjects/{viridianmart.asm => ViridianMart.asm} (94%) rename data/mapObjects/{viridianhouse.asm => ViridianNicknameHouse.asm} (73%) rename data/mapObjects/{viridianpokecenter.asm => ViridianPokecenter.asm} (94%) rename data/mapObjects/{school.asm => ViridianSchoolHouse.asm} (66%) rename data/mapObjects/{fuchsiahouse2.asm => WardensHouse.asm} (79%) delete mode 100755 data/mapObjects/celadonmansion2.asm delete mode 100755 data/mapObjects/celadonmansion4.asm delete mode 100755 data/mapObjects/celadonmansion5.asm delete mode 100755 data/mapObjects/celadonmartelevator.asm delete mode 100755 data/mapObjects/diglettscave.asm delete mode 100755 data/mapObjects/lab1.asm delete mode 100755 data/mapObjects/lab4.asm delete mode 100755 data/mapObjects/mansion1.asm delete mode 100755 data/mapObjects/mansion2.asm delete mode 100755 data/mapObjects/mtmoon2.asm delete mode 100755 data/mapObjects/pokemontower2.asm delete mode 100755 data/mapObjects/rockethideout2.asm delete mode 100755 data/mapObjects/rockethideoutelevator.asm delete mode 100755 data/mapObjects/seafoamislands1.asm delete mode 100755 data/mapObjects/seafoamislands2.asm delete mode 100755 data/mapObjects/seafoamislands3.asm delete mode 100755 data/mapObjects/seafoamislands4.asm delete mode 100755 data/mapObjects/seafoamislands5.asm delete mode 100755 data/mapObjects/ssanne1.asm delete mode 100755 data/mapObjects/ssanne10.asm delete mode 100755 data/mapObjects/ssanne2.asm delete mode 100755 data/mapObjects/ssanne3.asm delete mode 100755 data/mapObjects/ssanne4.asm delete mode 100755 data/mapObjects/ssanne9.asm delete mode 100755 data/mapObjects/undergroundpathentranceroute5.asm delete mode 100755 data/mapObjects/undergroundpathentranceroute6.asm delete mode 100755 data/mapObjects/undergroundpathentranceroute7.asm delete mode 100755 data/mapObjects/undergroundpathentranceroute7copy.asm delete mode 100755 data/mapObjects/undergroundpathentranceroute8.asm delete mode 100755 data/mapObjects/undergroundpathns.asm delete mode 100755 data/mapObjects/undergroundpathwe.asm delete mode 100755 data/mapObjects/unknowndungeon1.asm delete mode 100755 data/mapObjects/unknowndungeon2.asm rename maps/{agatha.blk => AgathasRoom.blk} (100%) rename maps/{bikeshop.blk => BikeShop.blk} (100%) rename maps/{billshouse.blk => BillsHouse.blk} (100%) rename maps/{blueshouse.blk => BluesHouse.blk} (100%) rename maps/{bruno.blk => BrunosRoom.blk} (100%) rename maps/{celadonhouse.blk => CeladonChiefHouse.blk} (100%) rename maps/{celadoncity.blk => CeladonCity.blk} (100%) rename maps/{celadondiner.blk => CeladonDiner.blk} (100%) rename maps/{celadongym.blk => CeladonGym.blk} (100%) rename maps/{celadonhotel.blk => CeladonHotel.blk} (100%) rename maps/{celadonmansion1.blk => CeladonMansion1F.blk} (100%) rename maps/{celadonmansion2.blk => CeladonMansion2F.blk} (100%) rename maps/{celadonmansion3.blk => CeladonMansion3F.blk} (100%) rename maps/{celadonmansion4.blk => CeladonMansionRoof.blk} (100%) rename maps/{celadonmansion5.blk => CeladonMansionRoofHouse.blk} (100%) rename maps/{celadonmart1.blk => CeladonMart1F.blk} (100%) rename maps/{celadonmart2.blk => CeladonMart2F.blk} (100%) rename maps/{celadonmart3.blk => CeladonMart3F.blk} (100%) rename maps/{celadonmart4.blk => CeladonMart4F.blk} (100%) rename maps/{celadonmart5.blk => CeladonMart5F.blk} (100%) rename maps/{celadonmartelevator.blk => CeladonMartElevator.blk} (100%) rename maps/{celadonmartroof.blk => CeladonMartRoof.blk} (100%) rename maps/{celadonpokecenter.blk => CeladonPokecenter.blk} (100%) rename maps/{ceruleanhouse2.blk => CeruleanBadgeHouse.blk} (100%) rename maps/{unknowndungeon1.blk => CeruleanCave1F.blk} (100%) rename maps/{unknowndungeon2.blk => CeruleanCave2F.blk} (100%) rename maps/{unknowndungeon3.blk => CeruleanCaveB1F.blk} (100%) rename maps/{ceruleancity.blk => CeruleanCity.blk} (100%) rename maps/{ceruleangym.blk => CeruleanGym.blk} (100%) rename maps/{ceruleanmart.blk => CeruleanMart.blk} (100%) rename maps/{ceruleanpokecenter.blk => CeruleanPokecenter.blk} (100%) rename maps/{ceruleanhouse1.blk => CeruleanTradeHouse.blk} (100%) rename maps/{ceruleanhousetrashed.blk => CeruleanTrashedHouse.blk} (100%) rename maps/{gary.blk => ChampionsRoom.blk} (100%) rename maps/{cinnabargym.blk => CinnabarGym.blk} (100%) rename maps/{cinnabarisland.blk => CinnabarIsland.blk} (100%) rename maps/{lab1.blk => CinnabarLab.blk} (100%) rename maps/{lab4.blk => CinnabarLabFossilRoom.blk} (100%) rename maps/{lab3.blk => CinnabarLabMetronomeRoom.blk} (100%) rename maps/{lab2.blk => CinnabarLabTradeRoom.blk} (100%) rename maps/{cinnabarmart.blk => CinnabarMart.blk} (100%) rename maps/{cinnabarpokecenter.blk => CinnabarPokecenter.blk} (100%) rename maps/{colosseum.blk => Colosseum.blk} (100%) rename maps/{copycatshouse1f.blk => CopycatsHouse1F.blk} (100%) rename maps/{copycatshouse2f.blk => CopycatsHouse2F.blk} (100%) rename maps/{daycarem.blk => Daycare.blk} (100%) rename maps/{diglettscave.blk => DiglettsCave.blk} (100%) rename maps/{diglettscaveentranceroute11.blk => DiglettsCaveRoute11.blk} (100%) rename maps/{diglettscaveroute2.blk => DiglettsCaveRoute2.blk} (100%) rename maps/{fightingdojo.blk => FightingDojo.blk} (100%) rename maps/{fuchsiahouse1.blk => FuchsiaBillsGrandpasHouse.blk} (100%) rename maps/{fuchsiacity.blk => FuchsiaCity.blk} (100%) rename maps/{fuchsiahouse3.blk => FuchsiaGoodRodHouse.blk} (100%) rename maps/{fuchsiagym.blk => FuchsiaGym.blk} (100%) rename maps/{fuchsiamart.blk => FuchsiaMart.blk} (100%) rename maps/{fuchsiameetingroom.blk => FuchsiaMeetingRoom.blk} (100%) rename maps/{fuchsiapokecenter.blk => FuchsiaPokecenter.blk} (100%) rename maps/{celadongamecorner.blk => GameCorner.blk} (100%) rename maps/{celadonprizeroom.blk => GameCornerPrizeRoom.blk} (100%) rename maps/{halloffameroom.blk => HallOfFame.blk} (100%) rename maps/{indigoplateau.blk => IndigoPlateau.blk} (100%) rename maps/{indigoplateaulobby.blk => IndigoPlateauLobby.blk} (100%) rename maps/{lance.blk => LancesRoom.blk} (100%) rename maps/{lavenderhouse1.blk => LavenderCuboneHouse.blk} (100%) rename maps/{lavendermart.blk => LavenderMart.blk} (100%) rename maps/{lavenderpokecenter.blk => LavenderPokecenter.blk} (100%) rename maps/{lavendertown.blk => LavenderTown.blk} (100%) rename maps/{lorelei.blk => LoreleisRoom.blk} (100%) rename maps/{lavenderhouse2.blk => MrFujisHouse.blk} (100%) rename maps/{namerater.blk => MrPsychicsHouse.blk} (100%) rename maps/{mtmoon1.blk => MtMoon1F.blk} (100%) rename maps/{mtmoon2.blk => MtMoonB1F.blk} (100%) rename maps/{mtmoon3.blk => MtMoonB2F.blk} (100%) rename maps/{mtmoonpokecenter.blk => MtMoonPokecenter.blk} (100%) rename maps/{museum1f.blk => Museum1F.blk} (100%) rename maps/{museum2f.blk => Museum2F.blk} (100%) rename maps/{pewterhouse1.blk => NameRatersHouse.blk} (100%) rename maps/{oakslab.blk => OaksLab.blk} (100%) rename maps/{pallettown.blk => PalletTown.blk} (100%) rename maps/{pewtercity.blk => PewterCity.blk} (100%) rename maps/{pewtergym.blk => PewterGym.blk} (100%) rename maps/{pewtermart.blk => PewterMart.blk} (100%) rename maps/{pewterhouse2.blk => PewterNidoranHouse.blk} (100%) rename maps/{pewterpokecenter.blk => PewterPokecenter.blk} (100%) rename maps/{route12house.blk => PewterSpeechHouse.blk} (100%) rename maps/{fanclub.blk => PokemonFanClub.blk} (100%) rename maps/{mansion1.blk => PokemonMansion1F.blk} (100%) rename maps/{mansion2.blk => PokemonMansion2F.blk} (100%) rename maps/{mansion3.blk => PokemonMansion3F.blk} (100%) rename maps/{mansion4.blk => PokemonMansionB1F.blk} (100%) rename maps/{pokemontower1.blk => PokemonTower1F.blk} (100%) rename maps/{pokemontower2.blk => PokemonTower2F.blk} (100%) rename maps/{pokemontower3.blk => PokemonTower3F.blk} (100%) rename maps/{pokemontower4.blk => PokemonTower4F.blk} (100%) rename maps/{pokemontower5.blk => PokemonTower5F.blk} (100%) rename maps/{pokemontower6.blk => PokemonTower6F.blk} (100%) rename maps/{pokemontower7.blk => PokemonTower7F.blk} (100%) rename maps/{powerplant.blk => PowerPlant.blk} (100%) rename maps/{redshouse1f.blk => RedsHouse1F.blk} (100%) rename maps/{redshouse2f.blk => RedsHouse2F.blk} (100%) rename maps/{rocktunnel1.blk => RockTunnel1F.blk} (100%) rename maps/{rocktunnel2.blk => RockTunnelB1F.blk} (100%) rename maps/{rocktunnelpokecenter.blk => RockTunnelPokecenter.blk} (100%) rename maps/{rockethideout1.blk => RocketHideoutB1F.blk} (100%) rename maps/{rockethideout2.blk => RocketHideoutB2F.blk} (100%) rename maps/{rockethideout3.blk => RocketHideoutB3F.blk} (100%) rename maps/{rockethideout4.blk => RocketHideoutB4F.blk} (100%) rename maps/{rockethideoutelevator.blk => RocketHideoutElevator.blk} (100%) rename maps/{route1.blk => Route1.blk} (100%) rename maps/{route10.blk => Route10.blk} (100%) rename maps/{route11.blk => Route11.blk} (100%) rename maps/{route11gate.blk => Route11Gate1F.blk} (100%) rename maps/{route11gateupstairs.blk => Route11Gate2F.blk} (100%) rename maps/{route12.blk => Route12.blk} (100%) rename maps/{route12gate.blk => Route12Gate1F.blk} (100%) rename maps/{route12gateupstairs.blk => Route12Gate2F.blk} (100%) rename maps/{route16house.blk => Route12SuperRodHouse.blk} (100%) rename maps/{route13.blk => Route13.blk} (100%) rename maps/{route14.blk => Route14.blk} (100%) rename maps/{route15.blk => Route15.blk} (100%) rename maps/{route15gate.blk => Route15Gate1F.blk} (100%) rename maps/{route15gateupstairs.blk => Route15Gate2F.blk} (100%) rename maps/{route16.blk => Route16.blk} (100%) rename maps/{route2house.blk => Route16FlyHouse.blk} (100%) rename maps/{route16gate.blk => Route16Gate1F.blk} (100%) rename maps/{route16gateupstairs.blk => Route16Gate2F.blk} (100%) rename maps/{route17.blk => Route17.blk} (100%) rename maps/{route18.blk => Route18.blk} (100%) rename maps/{route18gate.blk => Route18Gate1F.blk} (100%) rename maps/{route18gateupstairs.blk => Route18Gate2F.blk} (100%) rename maps/{route19.blk => Route19.blk} (100%) rename maps/{route2.blk => Route2.blk} (100%) rename maps/{route20.blk => Route20.blk} (100%) rename maps/{route21.blk => Route21.blk} (100%) rename maps/{route22.blk => Route22.blk} (100%) rename maps/{route22gate.blk => Route22Gate.blk} (100%) rename maps/{route23.blk => Route23.blk} (100%) rename maps/{route24.blk => Route24.blk} (100%) rename maps/{route25.blk => Route25.blk} (100%) rename maps/{route2gate.blk => Route2Gate.blk} (100%) rename maps/{saffronhouse1.blk => Route2TradeHouse.blk} (100%) rename maps/{route3.blk => Route3.blk} (100%) rename maps/{route4.blk => Route4.blk} (100%) rename maps/{route5.blk => Route5.blk} (100%) rename maps/{route5gate.blk => Route5Gate.blk} (100%) rename maps/{route6.blk => Route6.blk} (100%) rename maps/{route6gate.blk => Route6Gate.blk} (100%) rename maps/{route7.blk => Route7.blk} (100%) rename maps/{route7gate.blk => Route7Gate.blk} (100%) rename maps/{route8.blk => Route8.blk} (100%) rename maps/{route8gate.blk => Route8Gate.blk} (100%) rename maps/{route9.blk => Route9.blk} (100%) rename maps/{ssanne1.blk => SSAnne1F.blk} (100%) rename maps/{ssanne8.blk => SSAnne1FRooms.blk} (100%) rename maps/{ssanne2.blk => SSAnne2F.blk} (100%) rename maps/{ssanne10.blk => SSAnne2FRooms.blk} (100%) rename maps/{ssanne3.blk => SSAnne3F.blk} (100%) rename maps/{ssanne4.blk => SSAnneB1F.blk} (100%) rename maps/{ssanne9.blk => SSAnneB1FRooms.blk} (100%) rename maps/{ssanne5.blk => SSAnneBow.blk} (100%) rename maps/{ssanne7.blk => SSAnneCaptainsRoom.blk} (100%) rename maps/{ssanne6.blk => SSAnneKitchen.blk} (100%) rename maps/{safarizonecenter.blk => SafariZoneCenter.blk} (100%) rename maps/{safarizoneresthouse1.blk => SafariZoneCenterRestHouse.blk} (100%) rename maps/{safarizoneeast.blk => SafariZoneEast.blk} (100%) rename maps/{safarizoneresthouse2.blk => SafariZoneEastRestHouse.blk} (100%) rename maps/{safarizoneentrance.blk => SafariZoneGate.blk} (100%) rename maps/{safarizonenorth.blk => SafariZoneNorth.blk} (100%) rename maps/{safarizoneresthouse3.blk => SafariZoneNorthRestHouse.blk} (100%) rename maps/{safarizonesecrethouse.blk => SafariZoneSecretHouse.blk} (100%) rename maps/{safarizonewest.blk => SafariZoneWest.blk} (100%) rename maps/{safarizoneresthouse4.blk => SafariZoneWestRestHouse.blk} (100%) rename maps/{saffroncity.blk => SaffronCity.blk} (100%) rename maps/{saffrongym.blk => SaffronGym.blk} (100%) rename maps/{saffronmart.blk => SaffronMart.blk} (100%) rename maps/{saffronhouse2.blk => SaffronPidgeyHouse.blk} (100%) rename maps/{saffronpokecenter.blk => SaffronPokecenter.blk} (100%) rename maps/{seafoamislands1.blk => SeafoamIslands1F.blk} (100%) rename maps/{seafoamislands2.blk => SeafoamIslandsB1F.blk} (100%) rename maps/{seafoamislands3.blk => SeafoamIslandsB2F.blk} (100%) rename maps/{seafoamislands4.blk => SeafoamIslandsB3F.blk} (100%) rename maps/{seafoamislands5.blk => SeafoamIslandsB4F.blk} (100%) rename maps/{silphco10.blk => SilphCo10F.blk} (100%) rename maps/{silphco11.blk => SilphCo11F.blk} (100%) rename maps/{silphco1.blk => SilphCo1F.blk} (100%) rename maps/{silphco2.blk => SilphCo2F.blk} (100%) rename maps/{silphco3.blk => SilphCo3F.blk} (100%) rename maps/{silphco4.blk => SilphCo4F.blk} (100%) rename maps/{silphco5.blk => SilphCo5F.blk} (100%) rename maps/{silphco6.blk => SilphCo6F.blk} (100%) rename maps/{silphco7.blk => SilphCo7F.blk} (100%) rename maps/{silphco8.blk => SilphCo8F.blk} (100%) rename maps/{silphco9.blk => SilphCo9F.blk} (100%) rename maps/{silphcoelevator.blk => SilphCoElevator.blk} (100%) rename maps/{tradecenter.blk => TradeCenter.blk} (100%) rename maps/{undergroundpathns.blk => UndergroundPathNorthSouth.blk} (100%) rename maps/{undergroundpathentranceroute5.blk => UndergroundPathRoute5.blk} (100%) rename maps/{undergroundpathentranceroute6.blk => UndergroundPathRoute6.blk} (100%) rename maps/{undergroundpathentranceroute7.blk => UndergroundPathRoute7.blk} (100%) rename maps/{undergroundpathentranceroute8.blk => UndergroundPathRoute8.blk} (100%) rename maps/{undergroundpathwe.blk => UndergroundPathWestEast.blk} (100%) rename maps/{unusedblocks60258.blk => UnusedDiglettsCaveCopy.blk} (100%) rename maps/{unusedblocks60cef.blk => UnusedEmptyMap.blk} (100%) rename maps/{unusedblocks58d7d.blk => UnusedPokecenterCopy.blk} (100%) rename maps/{vermilioncity.blk => VermilionCity.blk} (100%) rename maps/{vermiliondock.blk => VermilionDock.blk} (100%) rename maps/{vermiliongym.blk => VermilionGym.blk} (100%) rename maps/{vermilionmart.blk => VermilionMart.blk} (100%) rename maps/{vermilionhouse1.blk => VermilionOldRodHouse.blk} (100%) rename maps/{vermilionhouse2.blk => VermilionPidgeyHouse.blk} (100%) rename maps/{vermilionpokecenter.blk => VermilionPokecenter.blk} (100%) rename maps/{vermilionhouse3.blk => VermilionTradeHouse.blk} (100%) rename maps/{victoryroad1.blk => VictoryRoad1F.blk} (100%) rename maps/{victoryroad2.blk => VictoryRoad2F.blk} (100%) rename maps/{victoryroad3.blk => VictoryRoad3F.blk} (100%) rename maps/{viridiancity.blk => ViridianCity.blk} (100%) rename maps/{viridianforest.blk => ViridianForest.blk} (100%) rename maps/{viridianforestentrance.blk => ViridianForestNorthGate.blk} (100%) rename maps/{viridianforestexit.blk => ViridianForestSouthGate.blk} (100%) rename maps/{viridiangym.blk => ViridianGym.blk} (100%) rename maps/{viridianmart.blk => ViridianMart.blk} (100%) rename maps/{viridianhouse.blk => ViridianNicknameHouse.blk} (100%) rename maps/{viridianpokecenter.blk => ViridianPokecenter.blk} (100%) rename maps/{school.blk => ViridianSchoolHouse.blk} (100%) rename maps/{fuchsiahouse2.blk => WardensHouse.blk} (100%) delete mode 100644 maps/route19-yellow.blk rename scripts/{agatha.asm => AgathasRoom.asm} (89%) rename scripts/{bikeshop.asm => BikeShop.asm} (98%) rename scripts/{billshouse.asm => BillsHouse.asm} (97%) rename scripts/{blueshouse.asm => BluesHouse.asm} (92%) rename scripts/{bruno.asm => BrunosRoom.asm} (90%) rename scripts/{celadonhouse.asm => CeladonChiefHouse.asm} (82%) rename scripts/{celadoncity.asm => CeladonCity.asm} (97%) rename scripts/{celadondiner.asm => CeladonDiner.asm} (95%) rename scripts/{celadongym.asm => CeladonGym.asm} (98%) rename scripts/{celadonhotel.asm => CeladonHotel.asm} (84%) rename scripts/{celadonmansion1.asm => CeladonMansion1F.asm} (91%) rename scripts/{celadonmansion2.asm => CeladonMansion2F.asm} (68%) rename scripts/{celadonmansion3.asm => CeladonMansion3F.asm} (95%) rename scripts/{celadonmansion4.asm => CeladonMansionRoof.asm} (65%) rename scripts/{celadonmansion5.asm => CeladonMansionRoofHouse.asm} (74%) rename scripts/{celadonmart1.asm => CeladonMart1F.asm} (83%) rename scripts/{celadonmart2.asm => CeladonMart2F.asm} (86%) rename scripts/{celadonmart3.asm => CeladonMart3F.asm} (97%) rename scripts/{celadonmart4.asm => CeladonMart4F.asm} (85%) rename scripts/{celadonmart5.asm => CeladonMart5F.asm} (86%) rename scripts/{celadonmartelevator.asm => CeladonMartElevator.asm} (87%) rename scripts/{celadonmartroof.asm => CeladonMartRoof.asm} (98%) rename scripts/{celadonpokecenter.asm => CeladonPokecenter.asm} (87%) rename scripts/{ceruleanhouse2.asm => CeruleanBadgeHouse.asm} (97%) rename scripts/{unknowndungeon1.asm => CeruleanCave1F.asm} (62%) rename scripts/{unknowndungeon2.asm => CeruleanCave2F.asm} (62%) rename scripts/{unknowndungeon3.asm => CeruleanCaveB1F.asm} (79%) rename scripts/{ceruleancity.asm => CeruleanCity.asm} (98%) rename scripts/{ceruleancity2.asm => CeruleanCity_2.asm} (100%) rename scripts/{ceruleangym.asm => CeruleanGym.asm} (97%) rename scripts/{ceruleanmart.asm => CeruleanMart.asm} (81%) rename scripts/{ceruleanpokecenter.asm => CeruleanPokecenter.asm} (87%) rename scripts/{ceruleanhouse1.asm => CeruleanTradeHouse.asm} (80%) rename scripts/{ceruleanhousetrashed.asm => CeruleanTrashedHouse.asm} (91%) rename scripts/{gary.asm => ChampionsRoom.asm} (89%) rename scripts/{cinnabargym.asm => CinnabarGym.asm} (98%) rename scripts/{cinnabarisland.asm => CinnabarIsland.asm} (92%) rename scripts/{lab1.asm => CinnabarLab.asm} (86%) rename scripts/{lab4.asm => CinnabarLabFossilRoom.asm} (96%) rename scripts/{lab3.asm => CinnabarLabMetronomeRoom.asm} (92%) rename scripts/{lab2.asm => CinnabarLabTradeRoom.asm} (81%) rename scripts/{cinnabarmart.asm => CinnabarMart.asm} (81%) rename scripts/{cinnabarpokecenter.asm => CinnabarPokecenter.asm} (87%) rename scripts/{colosseum.asm => Colosseum.asm} (51%) rename scripts/{copycatshouse1f.asm => CopycatsHouse1F.asm} (86%) rename scripts/{copycatshouse2f.asm => CopycatsHouse2F.asm} (97%) rename scripts/{daycarem.asm => Daycare.asm} (99%) create mode 100755 scripts/DiglettsCave.asm rename scripts/{diglettscaveroute11.asm => DiglettsCaveRoute11.asm} (71%) rename scripts/{diglettscaveroute2.asm => DiglettsCaveRoute2.asm} (72%) rename scripts/{fightingdojo.asm => FightingDojo.asm} (98%) rename scripts/{fuchsiahouse1.asm => FuchsiaBillsGrandpasHouse.asm} (78%) rename scripts/{fuchsiacity.asm => FuchsiaCity.asm} (98%) rename scripts/{fuchsiahouse3.asm => FuchsiaGoodRodHouse.asm} (94%) rename scripts/{fuchsiagym.asm => FuchsiaGym.asm} (98%) rename scripts/{fuchsiamart.asm => FuchsiaMart.asm} (81%) rename scripts/{fuchsiameetingroom.asm => FuchsiaMeetingRoom.asm} (84%) rename scripts/{fuchsiapokecenter.asm => FuchsiaPokecenter.asm} (87%) rename scripts/{celadongamecorner.asm => GameCorner.asm} (96%) rename scripts/{celadonprizeroom.asm => GameCornerPrizeRoom.asm} (84%) rename scripts/{halloffameroom.asm => HallOfFame.asm} (78%) create mode 100755 scripts/IndigoPlateau.asm rename scripts/{indigoplateaulobby.asm => IndigoPlateauLobby.asm} (92%) rename scripts/{lance.asm => LancesRoom.asm} (91%) rename scripts/{lavenderhouse2.asm => LavenderCuboneHouse.asm} (90%) rename scripts/{lavendermart.asm => LavenderMart.asm} (90%) rename scripts/{lavenderpokecenter.asm => LavenderPokecenter.asm} (87%) rename scripts/{lavendertown.asm => LavenderTown.asm} (95%) rename scripts/{lorelei.asm => LoreleisRoom.asm} (90%) rename scripts/{lavenderhouse1.asm => MrFujisHouse.asm} (97%) rename scripts/{saffronhouse2.asm => MrPsychicsHouse.asm} (92%) rename scripts/{mtmoon1.asm => MtMoon1F.asm} (96%) rename scripts/{mtmoon2.asm => MtMoonB1F.asm} (69%) rename scripts/{mtmoon3.asm => MtMoonB2F.asm} (93%) rename scripts/{mtmoonpokecenter.asm => MtMoonPokecenter.asm} (96%) rename scripts/{museum1f.asm => Museum1F.asm} (96%) rename scripts/{museum2f.asm => Museum2F.asm} (92%) rename scripts/{namerater.asm => NameRatersHouse.asm} (97%) rename scripts/{oakslab.asm => OaksLab.asm} (99%) rename scripts/{pallettown.asm => PalletTown.asm} (97%) rename scripts/{pewtercity.asm => PewterCity.asm} (97%) rename scripts/{pewtergym.asm => PewterGym.asm} (97%) rename scripts/{pewtermart.asm => PewterMart.asm} (89%) rename scripts/{pewterhouse1.asm => PewterNidoranHouse.asm} (84%) rename scripts/{pewterpokecenter.asm => PewterPokecenter.asm} (96%) rename scripts/{pewterhouse2.asm => PewterSpeechHouse.asm} (76%) rename scripts/{fanclub.asm => PokemonFanClub.asm} (97%) rename scripts/{mansion1.asm => PokemonMansion1F.asm} (92%) rename scripts/{mansion2.asm => PokemonMansion2F.asm} (92%) rename scripts/{mansion3.asm => PokemonMansion3F.asm} (93%) rename scripts/{mansion4.asm => PokemonMansionB1F.asm} (92%) rename scripts/{pokemontower1.asm => PokemonTower1F.asm} (89%) rename scripts/{pokemontower2.asm => PokemonTower2F.asm} (91%) rename scripts/{pokemontower3.asm => PokemonTower3F.asm} (92%) rename scripts/{pokemontower4.asm => PokemonTower4F.asm} (92%) rename scripts/{pokemontower5.asm => PokemonTower5F.asm} (95%) rename scripts/{pokemontower6.asm => PokemonTower6F.asm} (92%) rename scripts/{pokemontower7.asm => PokemonTower7F.asm} (93%) rename scripts/{powerplant.asm => PowerPlant.asm} (97%) rename scripts/{redshouse1f.asm => RedsHouse1F.asm} (95%) rename scripts/{redshouse2f.asm => RedsHouse2F.asm} (59%) rename scripts/{rocktunnel1.asm => RockTunnel1F.asm} (96%) rename scripts/{rocktunnel2.asm => RockTunnelB1F.asm} (96%) rename scripts/{rocktunnelpokecenter.asm => RockTunnelPokecenter.asm} (86%) rename scripts/{rockethideout1.asm => RocketHideoutB1F.asm} (95%) rename scripts/{rockethideout2.asm => RocketHideoutB2F.asm} (97%) rename scripts/{rockethideout3.asm => RocketHideoutB3F.asm} (95%) rename scripts/{rockethideout4.asm => RocketHideoutB4F.asm} (91%) rename scripts/{rockethideoutelevator.asm => RocketHideoutElevator.asm} (91%) rename scripts/{route1.asm => Route1.asm} (95%) rename scripts/{route10.asm => Route10.asm} (97%) rename scripts/{route11.asm => Route11.asm} (98%) rename scripts/{route11gate.asm => Route11Gate1F.asm} (67%) rename scripts/{route11gateupstairs.asm => Route11Gate2F.asm} (96%) rename scripts/{route12.asm => Route12.asm} (98%) rename scripts/{route12gate.asm => Route12Gate1F.asm} (67%) rename scripts/{route12gateupstairs.asm => Route12Gate2F.asm} (95%) rename scripts/{route12house.asm => Route12SuperRodHouse.asm} (93%) rename scripts/{route13.asm => Route13.asm} (98%) rename scripts/{route14.asm => Route14.asm} (98%) rename scripts/{route15.asm => Route15.asm} (98%) rename scripts/{route15gate.asm => Route15Gate1F.asm} (67%) rename scripts/{route15gateupstairs.asm => Route15Gate2F.asm} (93%) rename scripts/{route16.asm => Route16.asm} (98%) rename scripts/{route16house.asm => Route16FlyHouse.asm} (94%) rename scripts/{route16gate.asm => Route16Gate1F.asm} (86%) rename scripts/{route16gateupstairs.asm => Route16Gate2F.asm} (93%) rename scripts/{route17.asm => Route17.asm} (98%) rename scripts/{route18.asm => Route18.asm} (96%) rename scripts/{route18gate.asm => Route18Gate1F.asm} (85%) rename scripts/{route18gateupstairs.asm => Route18Gate2F.asm} (91%) rename scripts/{route19.asm => Route19.asm} (98%) rename scripts/{route2.asm => Route2.asm} (83%) rename scripts/{route20.asm => Route20.asm} (93%) rename scripts/{route21.asm => Route21.asm} (98%) rename scripts/{route22.asm => Route22.asm} (98%) rename scripts/{route22gate.asm => Route22Gate.asm} (93%) rename scripts/{route23.asm => Route23.asm} (96%) rename scripts/{route24.asm => Route24.asm} (98%) rename scripts/{route25.asm => Route25.asm} (98%) rename scripts/{route2gate.asm => Route2Gate.asm} (93%) rename scripts/{route2house.asm => Route2TradeHouse.asm} (80%) rename scripts/{route3.asm => Route3.asm} (98%) rename scripts/{route4.asm => Route4.asm} (92%) rename scripts/{route5.asm => Route5.asm} (71%) rename scripts/{route5gate.asm => Route5Gate.asm} (94%) rename scripts/{route6.asm => Route6.asm} (97%) rename scripts/{route6gate.asm => Route6Gate.asm} (91%) rename scripts/{route7.asm => Route7.asm} (71%) rename scripts/{route7gate.asm => Route7Gate.asm} (91%) rename scripts/{route8.asm => Route8.asm} (98%) rename scripts/{route8gate.asm => Route8Gate.asm} (91%) rename scripts/{route9.asm => Route9.asm} (98%) rename scripts/{ssanne1.asm => SSAnne1F.asm} (80%) rename scripts/{ssanne8.asm => SSAnne1FRooms.asm} (94%) rename scripts/{ssanne2.asm => SSAnne2F.asm} (91%) rename scripts/{ssanne9.asm => SSAnne2FRooms.asm} (95%) rename scripts/{ssanne3.asm => SSAnne3F.asm} (69%) create mode 100755 scripts/SSAnneB1F.asm rename scripts/{ssanne10.asm => SSAnneB1FRooms.asm} (95%) rename scripts/{ssanne5.asm => SSAnneBow.asm} (91%) rename scripts/{ssanne7.asm => SSAnneCaptainsRoom.asm} (96%) rename scripts/{ssanne6.asm => SSAnneKitchen.asm} (95%) rename scripts/{safarizonecenter.asm => SafariZoneCenter.asm} (80%) rename scripts/{safarizoneresthouse1.asm => SafariZoneCenterRestHouse.asm} (75%) rename scripts/{safarizoneeast.asm => SafariZoneEast.asm} (87%) rename scripts/{safarizoneresthouse3.asm => SafariZoneEastRestHouse.asm} (82%) rename scripts/{safarizoneentrance.asm => SafariZoneGate.asm} (90%) rename scripts/{safarizonenorth.asm => SafariZoneNorth.asm} (90%) rename scripts/{safarizoneresthouse4.asm => SafariZoneNorthRestHouse.asm} (82%) rename scripts/{safarizonesecrethouse.asm => SafariZoneSecretHouse.asm} (91%) rename scripts/{safarizonewest.asm => SafariZoneWest.asm} (89%) rename scripts/{safarizoneresthouse2.asm => SafariZoneWestRestHouse.asm} (82%) rename scripts/{saffroncity.asm => SaffronCity.asm} (97%) rename scripts/{saffrongym.asm => SaffronGym.asm} (98%) rename scripts/{saffronmart.asm => SaffronMart.asm} (81%) rename scripts/{saffronhouse1.asm => SaffronPidgeyHouse.asm} (86%) rename scripts/{saffronpokecenter.asm => SaffronPokecenter.asm} (87%) rename scripts/{seafoamislands1.asm => SeafoamIslands1F.asm} (81%) rename scripts/{seafoamislands2.asm => SeafoamIslandsB1F.asm} (80%) rename scripts/{seafoamislands3.asm => SeafoamIslandsB2F.asm} (80%) rename scripts/{seafoamislands4.asm => SeafoamIslandsB3F.asm} (83%) rename scripts/{seafoamislands5.asm => SeafoamIslandsB4F.asm} (86%) rename scripts/{silphco10.asm => SilphCo10F.asm} (93%) rename scripts/{silphco11.asm => SilphCo11F.asm} (97%) rename scripts/{silphco1.asm => SilphCo1F.asm} (87%) rename scripts/{silphco2.asm => SilphCo2F.asm} (96%) rename scripts/{silphco3.asm => SilphCo3F.asm} (94%) rename scripts/{silphco4.asm => SilphCo4F.asm} (95%) rename scripts/{silphco5.asm => SilphCo5F.asm} (96%) rename scripts/{silphco6.asm => SilphCo6F.asm} (96%) rename scripts/{silphco7.asm => SilphCo7F.asm} (98%) rename scripts/{silphco8.asm => SilphCo8F.asm} (95%) rename scripts/{silphco9.asm => SilphCo9F.asm} (96%) rename scripts/{silphcoelevator.asm => SilphCoElevator.asm} (93%) rename scripts/{tradecenter.asm => TradeCenter.asm} (93%) create mode 100755 scripts/UndergroundPathNorthSouth.asm rename scripts/{undergroundpathentranceroute5.asm => UndergroundPathRoute5.asm} (77%) rename scripts/{undergroundpathentranceroute6.asm => UndergroundPathRoute6.asm} (69%) rename scripts/{undergroundpathentranceroute7.asm => UndergroundPathRoute7.asm} (69%) rename scripts/{undergroundpathentranceroute7copy.asm => UndergroundPathRoute7Copy.asm} (84%) rename scripts/{undergroundpathentranceroute8.asm => UndergroundPathRoute8.asm} (69%) create mode 100755 scripts/UndergroundPathWestEast.asm rename scripts/{vermilioncity.asm => VermilionCity.asm} (97%) rename scripts/{vermiliondock.asm => VermilionDock.asm} (98%) rename scripts/{vermiliongym.asm => VermilionGym.asm} (97%) rename scripts/{vermilionmart.asm => VermilionMart.asm} (81%) rename scripts/{vermilionhouse2.asm => VermilionOldRodHouse.asm} (93%) rename scripts/{vermilionhouse1.asm => VermilionPidgeyHouse.asm} (85%) rename scripts/{vermilionpokecenter.asm => VermilionPokecenter.asm} (87%) rename scripts/{vermilionhouse3.asm => VermilionTradeHouse.asm} (72%) rename scripts/{victoryroad1.asm => VictoryRoad1F.asm} (92%) rename scripts/{victoryroad2.asm => VictoryRoad2F.asm} (96%) rename scripts/{victoryroad3.asm => VictoryRoad3F.asm} (93%) rename scripts/{viridiancity.asm => ViridianCity.asm} (98%) rename scripts/{viridianforest.asm => ViridianForest.asm} (96%) rename scripts/{viridianforestexit.asm => ViridianForestNorthGate.asm} (75%) rename scripts/{viridianforestentrance.asm => ViridianForestSouthGate.asm} (77%) rename scripts/{viridiangym.asm => ViridianGym.asm} (98%) rename scripts/{viridianmart.asm => ViridianMart.asm} (81%) rename scripts/{viridianhouse.asm => ViridianNicknameHouse.asm} (88%) rename scripts/{viridianpokecenter.asm => ViridianPokecenter.asm} (87%) rename scripts/{school.asm => ViridianSchoolHouse.asm} (70%) rename scripts/{fuchsiahouse2.asm => WardensHouse.asm} (97%) delete mode 100755 scripts/diglettscave.asm delete mode 100755 scripts/indigoplateau.asm delete mode 100755 scripts/ssanne4.asm delete mode 100755 scripts/undergroundpathns.asm delete mode 100755 scripts/undergroundpathwe.asm rename text/maps/{agatha.asm => AgathasRoom.asm} (100%) rename text/maps/{bike_shop.asm => BikeShop.asm} (100%) rename text/maps/{bills_house.asm => BillsHouse.asm} (100%) rename text/maps/{blues_house.asm => BluesHouse.asm} (100%) rename text/maps/{bruno.asm => BrunosRoom.asm} (100%) rename text/maps/{celadon_house.asm => CeladonChiefHouse.asm} (100%) rename text/maps/{celadon_city.asm => CeladonCity.asm} (100%) rename text/maps/{celadon_diner.asm => CeladonDiner.asm} (100%) rename text/maps/{celadon_gym.asm => CeladonGym.asm} (99%) rename text/maps/{celadon_hotel.asm => CeladonHotel.asm} (100%) rename text/maps/{celadon_mansion_1f.asm => CeladonMansion1F.asm} (100%) rename text/maps/{celadon_mansion_2f.asm => CeladonMansion2F.asm} (100%) rename text/maps/{celadon_mansion_3f.asm => CeladonMansion3F.asm} (100%) rename text/maps/{celadon_mansion_4f_outside.asm => CeladonMansionRoof.asm} (100%) rename text/maps/{celadon_mansion_4f_inside.asm => CeladonMansionRoofHouse.asm} (100%) rename text/maps/{celadon_dept_store_1f.asm => CeladonMart1F.asm} (100%) rename text/maps/{celadon_dept_store_2f.asm => CeladonMart2F.asm} (100%) rename text/maps/{celadon_dept_store_3f.asm => CeladonMart3F.asm} (100%) rename text/maps/{celadon_dept_store_4f.asm => CeladonMart4F.asm} (100%) rename text/maps/{celadon_dept_store_5f.asm => CeladonMart5F.asm} (100%) rename text/maps/{celadon_dept_store_roof.asm => CeladonMartRoof.asm} (98%) rename text/maps/{celadon_pokecenter.asm => CeladonPokecenter.asm} (100%) rename text/maps/{cerulean_badge_house.asm => CeruleanBadgeHouse.asm} (100%) rename text/maps/{unknown_dungeon_b1f.asm => CeruleanCaveB1F.asm} (100%) rename text/maps/{cerulean_city.asm => CeruleanCity.asm} (99%) rename text/maps/{cerulean_gym.asm => CeruleanGym.asm} (100%) rename text/maps/{cerulean_mart.asm => CeruleanMart.asm} (100%) rename text/maps/{cerulean_pokecenter.asm => CeruleanPokecenter.asm} (100%) rename text/maps/{cerulean_trade_house.asm => CeruleanTradeHouse.asm} (100%) rename text/maps/{cerulean_trashed_house.asm => CeruleanTrashedHouse.asm} (100%) rename text/maps/{champion.asm => ChampionsRoom.asm} (100%) rename text/maps/{cinnabar_gym.asm => CinnabarGym.asm} (99%) rename text/maps/{cinnabar_island.asm => CinnabarIsland.asm} (100%) rename text/maps/{cinnabar_lab.asm => CinnabarLab.asm} (100%) rename text/maps/{cinnabar_lab_fossil_room.asm => CinnabarLabFossilRoom.asm} (99%) rename text/maps/{cinnabar_lab_metronome_room.asm => CinnabarLabMetronomeRoom.asm} (100%) rename text/maps/{cinnabar_lab_trade_room.asm => CinnabarLabTradeRoom.asm} (100%) rename text/maps/{cinnabar_mart.asm => CinnabarMart.asm} (100%) rename text/maps/{cinnabar_pokecenter.asm => CinnabarPokecenter.asm} (100%) rename text/maps/{copycats_house_1f.asm => CopycatsHouse1F.asm} (100%) rename text/maps/{copycats_house_2f.asm => CopycatsHouse2F.asm} (99%) rename text/maps/{daycare_1.asm => Daycare.asm} (96%) rename text/maps/{daycare_2.asm => Daycare_2.asm} (100%) rename text/maps/{digletts_cave_route_11_entrance.asm => DiglettsCaveRoute11.asm} (100%) rename text/maps/{digletts_cave_route_2_entrance.asm => DiglettsCaveRoute2.asm} (100%) rename text/maps/{fighting_dojo.asm => FightingDojo.asm} (100%) rename text/maps/{fuchsia_house.asm => FuchsiaBillsGrandpasHouse.asm} (100%) rename text/maps/{fuchsia_city.asm => FuchsiaCity.asm} (100%) rename text/maps/{fuchsia_fishing_house.asm => FuchsiaGoodRodHouse.asm} (100%) rename text/maps/{fuchsia_gym_1.asm => FuchsiaGym.asm} (100%) rename text/maps/{fuchsia_gym_2.asm => FuchsiaGym_2.asm} (99%) rename text/maps/{fuchsia_mart.asm => FuchsiaMart.asm} (100%) rename text/maps/{fuchsia_meeting_room.asm => FuchsiaMeetingRoom.asm} (100%) rename text/maps/{fuchsia_pokecenter.asm => FuchsiaPokecenter.asm} (100%) rename text/maps/{celadon_game_corner.asm => GameCorner.asm} (100%) rename text/maps/{celadon_prize_room.asm => GameCornerPrizeRoom.asm} (100%) rename text/maps/{hall_of_fame.asm => HallOfFame.asm} (100%) rename text/maps/{indigo_plateau_lobby.asm => IndigoPlateauLobby.asm} (100%) rename text/maps/{lance.asm => LancesRoom.asm} (100%) rename text/maps/{lavender_house.asm => LavenderCuboneHouse.asm} (100%) rename text/maps/{lavender_mart.asm => LavenderMart.asm} (100%) rename text/maps/{lavender_pokecenter.asm => LavenderPokecenter.asm} (100%) rename text/maps/{lavender_town.asm => LavenderTown.asm} (100%) rename text/maps/{lorelei.asm => LoreleisRoom.asm} (100%) rename text/maps/{fujis_house.asm => MrFujisHouse.asm} (99%) rename text/maps/{mr_psychics_house.asm => MrPsychicsHouse.asm} (100%) rename text/maps/{mt_moon_1f.asm => MtMoon1F.asm} (100%) rename text/maps/{mt_moon_b1f.asm => MtMoonB1F.asm} (70%) rename text/maps/{mt_moon_b2f.asm => MtMoonB2F.asm} (100%) rename text/maps/{mt_moon_pokecenter.asm => MtMoonPokecenter.asm} (98%) rename text/maps/{museum_1f.asm => Museum1F.asm} (100%) rename text/maps/{museum_2f.asm => Museum2F.asm} (100%) rename text/maps/{name_rater.asm => NameRatersHouse.asm} (100%) rename text/maps/{oaks_lab.asm => OaksLab.asm} (100%) rename text/maps/{pallet_town.asm => PalletTown.asm} (100%) rename text/maps/{pewter_city.asm => PewterCity.asm} (100%) rename text/maps/{pewter_gym_1.asm => PewterGym.asm} (100%) rename text/maps/{pewter_gym_2.asm => PewterGym_2.asm} (99%) rename text/maps/{pewter_mart.asm => PewterMart.asm} (100%) rename text/maps/{pewter_house_1.asm => PewterNidoranHouse.asm} (100%) rename text/maps/{pewter_pokecenter.asm => PewterPokecenter.asm} (100%) rename text/maps/{pewter_house_2.asm => PewterSpeechHouse.asm} (100%) rename text/maps/{fan_club.asm => PokemonFanClub.asm} (100%) rename text/maps/{mansion_1f.asm => PokemonMansion1F.asm} (100%) rename text/maps/{mansion_2f.asm => PokemonMansion2F.asm} (100%) rename text/maps/{mansion_3f.asm => PokemonMansion3F.asm} (100%) rename text/maps/{mansion_b1f.asm => PokemonMansionB1F.asm} (100%) rename text/maps/{pokemon_tower_1f.asm => PokemonTower1F.asm} (100%) rename text/maps/{pokemon_tower_2f.asm => PokemonTower2F.asm} (100%) rename text/maps/{pokemon_tower_3f.asm => PokemonTower3F.asm} (100%) rename text/maps/{pokemon_tower_4f.asm => PokemonTower4F.asm} (100%) rename text/maps/{pokemon_tower_5f.asm => PokemonTower5F.asm} (100%) rename text/maps/{pokemon_tower_6f.asm => PokemonTower6F.asm} (100%) rename text/maps/{pokemon_tower_7f.asm => PokemonTower7F.asm} (100%) rename text/maps/{power_plant.asm => PowerPlant.asm} (100%) rename text/maps/{reds_house_1f.asm => RedsHouse1F.asm} (100%) rename text/maps/{rock_tunnel_b1f.asm => RockTunnel1F.asm} (100%) rename text/maps/{rock_tunnel_b2f_1.asm => RockTunnelB1F.asm} (100%) rename text/maps/{rock_tunnel_b2f_2.asm => RockTunnelB1F_2.asm} (100%) rename text/maps/{rock_tunnel_pokecenter.asm => RockTunnelPokecenter.asm} (100%) rename text/maps/{rocket_hideout_b1f.asm => RocketHideoutB1F.asm} (100%) rename text/maps/{rocket_hideout_b2f.asm => RocketHideoutB2F.asm} (100%) rename text/maps/{rocket_hideout_b3f.asm => RocketHideoutB3F.asm} (100%) rename text/maps/{rocket_hideout_b4f.asm => RocketHideoutB4F.asm} (100%) rename text/maps/{rocket_hideout_elevator.asm => RocketHideoutElevator.asm} (100%) rename text/maps/{route_1.asm => Route1.asm} (100%) rename text/maps/{route_10.asm => Route10.asm} (100%) rename text/maps/{route_11_1.asm => Route11.asm} (100%) rename text/maps/{route_11_gate.asm => Route11Gate1F.asm} (100%) rename text/maps/{route_11_gate_upstairs.asm => Route11Gate2F.asm} (100%) rename text/maps/{route_11_2.asm => Route11_2.asm} (100%) rename text/maps/{route_12.asm => Route12.asm} (100%) rename text/maps/{route_12_gate.asm => Route12Gate1F.asm} (100%) rename text/maps/{route_12_gate_upstairs.asm => Route12Gate2F.asm} (100%) rename text/maps/{route_12_house.asm => Route12SuperRodHouse.asm} (98%) rename text/maps/{route_13.asm => Route13.asm} (100%) rename text/maps/{route_14.asm => Route14.asm} (100%) rename text/maps/{route_15.asm => Route15.asm} (100%) rename text/maps/{route_15_gate.asm => Route15Gate1F.asm} (100%) rename text/maps/{route_15_gate_upstairs.asm => Route15Gate2F.asm} (100%) rename text/maps/{route_16.asm => Route16.asm} (100%) rename text/maps/{route_16_house.asm => Route16FlyHouse.asm} (100%) rename text/maps/{route_16_gate.asm => Route16Gate1F.asm} (100%) rename text/maps/{route_16_gate_upstairs.asm => Route16Gate2F.asm} (100%) rename text/maps/{route_17.asm => Route17.asm} (100%) rename text/maps/{route_18.asm => Route18.asm} (100%) rename text/maps/{route_18_gate.asm => Route18Gate1F.asm} (100%) rename text/maps/{route_18_gate_upstairs.asm => Route18Gate2F.asm} (100%) rename text/maps/{route_19.asm => Route19.asm} (100%) rename text/maps/{route_2.asm => Route2.asm} (100%) rename text/maps/{route_20.asm => Route20.asm} (100%) rename text/maps/{route_21.asm => Route21.asm} (100%) rename text/maps/{route_22.asm => Route22.asm} (100%) rename text/maps/{pokemon_league_gate.asm => Route22Gate.asm} (97%) rename text/maps/{route_23.asm => Route23.asm} (98%) rename text/maps/{route_24_1.asm => Route24.asm} (99%) rename text/maps/{route_24_2.asm => Route24_2.asm} (100%) rename text/maps/{route_25.asm => Route25.asm} (100%) rename text/maps/{route_2_gate.asm => Route2Gate.asm} (100%) rename text/maps/{route_2_house.asm => Route2TradeHouse.asm} (100%) rename text/maps/{route_3.asm => Route3.asm} (100%) rename text/maps/{route_4.asm => Route4.asm} (100%) rename text/maps/{route_5.asm => Route5.asm} (100%) rename text/maps/{route_6.asm => Route6.asm} (100%) rename text/maps/{route_7.asm => Route7.asm} (100%) rename text/maps/{route_8.asm => Route8.asm} (100%) rename text/maps/{route_9.asm => Route9.asm} (100%) rename text/maps/{ss_anne_1.asm => SSAnne1F.asm} (100%) rename text/maps/{ss_anne_8.asm => SSAnne1FRooms.asm} (100%) rename text/maps/{ss_anne_2.asm => SSAnne2F.asm} (100%) rename text/maps/{ss_anne_9.asm => SSAnne2FRooms.asm} (100%) rename text/maps/{ss_anne_3.asm => SSAnne3F.asm} (100%) rename text/maps/{ss_anne_10.asm => SSAnneB1FRooms.asm} (100%) rename text/maps/{ss_anne_5.asm => SSAnneBow.asm} (100%) rename text/maps/{ss_anne_7.asm => SSAnneCaptainsRoom.asm} (100%) rename text/maps/{ss_anne_6.asm => SSAnneKitchen.asm} (100%) rename text/maps/{safari_zone_center.asm => SafariZoneCenter.asm} (100%) rename text/maps/{safari_zone_rest_house_1.asm => SafariZoneCenterRestHouse.asm} (100%) rename text/maps/{safari_zone_east.asm => SafariZoneEast.asm} (100%) rename text/maps/{safari_zone_rest_house_3.asm => SafariZoneEastRestHouse.asm} (100%) rename text/maps/{safari_zone_entrance.asm => SafariZoneGate.asm} (99%) rename text/maps/{safari_zone_north.asm => SafariZoneNorth.asm} (100%) rename text/maps/{safari_zone_rest_house_4.asm => SafariZoneNorthRestHouse.asm} (100%) rename text/maps/{safari_zone_secret_house.asm => SafariZoneSecretHouse.asm} (100%) rename text/maps/{safari_zone_west.asm => SafariZoneWest.asm} (100%) rename text/maps/{safari_zone_rest_house_2.asm => SafariZoneWestRestHouse.asm} (100%) rename text/maps/{saffron_city.asm => SaffronCity.asm} (100%) rename text/maps/{saffron_gates.asm => SaffronGates.asm} (98%) rename text/maps/{saffron_gym.asm => SaffronGym.asm} (99%) rename text/maps/{saffron_mart.asm => SaffronMart.asm} (100%) rename text/maps/{saffron_house.asm => SaffronPidgeyHouse.asm} (100%) rename text/maps/{saffron_pokecenter.asm => SaffronPokecenter.asm} (100%) rename text/maps/{seafoam_islands_b4f.asm => SeafoamIslandsB4F.asm} (100%) rename text/maps/{silph_co_10f.asm => SilphCo10F.asm} (100%) rename text/maps/{silph_co_11f.asm => SilphCo11F.asm} (100%) rename text/maps/{silph_co_1f.asm => SilphCo1F.asm} (100%) rename text/maps/{silph_co_2f.asm => SilphCo2F.asm} (100%) rename text/maps/{silph_co_3f.asm => SilphCo3F.asm} (100%) rename text/maps/{silph_co_4f.asm => SilphCo4F.asm} (100%) rename text/maps/{silph_co_5f_1.asm => SilphCo5F.asm} (100%) rename text/maps/{silph_co_5f_2.asm => SilphCo5F_2.asm} (100%) rename text/maps/{silph_co_6f.asm => SilphCo6F.asm} (100%) rename text/maps/{silph_co_7f.asm => SilphCo7F.asm} (100%) rename text/maps/{silph_co_8f.asm => SilphCo8F.asm} (100%) rename text/maps/{silph_co_9f.asm => SilphCo9F.asm} (100%) rename text/maps/{underground_path_route_6_entrance.asm => UndergroundPathRoute6.asm} (100%) rename text/maps/{underground_path_route_7_entrance.asm => UndergroundPathRoute7.asm} (100%) rename text/maps/{underground_path_route_7_entrance_unused.asm => UndergroundPathRoute7Copy.asm} (100%) rename text/maps/{underground_path_route_8_entrance.asm => UndergroundPathRoute8.asm} (100%) rename text/maps/{vermilion_city.asm => VermilionCity.asm} (100%) rename text/maps/{vermilion_dock.asm => VermilionDock.asm} (100%) rename text/maps/{vermilion_gym_1.asm => VermilionGym.asm} (100%) rename text/maps/{vermilion_gym_2.asm => VermilionGym_2.asm} (99%) rename text/maps/{vermilion_mart.asm => VermilionMart.asm} (100%) rename text/maps/{vermilion_fishing_house.asm => VermilionOldRodHouse.asm} (98%) rename text/maps/{vermilion_house.asm => VermilionPidgeyHouse.asm} (100%) rename text/maps/{vermilion_pokecenter.asm => VermilionPokecenter.asm} (100%) rename text/maps/{victory_road_1f.asm => VictoryRoad1F.asm} (100%) rename text/maps/{victory_road_2f.asm => VictoryRoad2F.asm} (100%) rename text/maps/{victory_road_3f.asm => VictoryRoad3F.asm} (100%) rename text/maps/{viridian_city.asm => ViridianCity.asm} (100%) rename text/maps/{viridian_forest.asm => ViridianForest.asm} (100%) rename text/maps/{viridian_forest_exit.asm => ViridianForestNorthGate.asm} (100%) rename text/maps/{viridian_forest_entrance.asm => ViridianForestSouthGate.asm} (100%) rename text/maps/{viridian_gym.asm => ViridianGym.asm} (99%) rename text/maps/{viridian_mart.asm => ViridianMart.asm} (100%) rename text/maps/{viridian_house.asm => ViridianNicknameHouse.asm} (100%) rename text/maps/{viridian_pokecenter.asm => ViridianPokecenter.asm} (100%) rename text/maps/{school.asm => ViridianSchoolHouse.asm} (100%) rename text/maps/{wardens_house.asm => WardensHouse.asm} (99%) diff --git a/audio.asm b/audio.asm index be1e4bb9..70cf06fc 100644 --- a/audio.asm +++ b/audio.asm @@ -1,4 +1,3 @@ - INCLUDE "constants.asm" @@ -12,7 +11,6 @@ SECTION "Sound Effect Headers 3", ROMX ; BANK $1f INCLUDE "audio/headers/sfxheaders3.asm" - SECTION "Music Headers 1", ROMX ; BANK $02 INCLUDE "audio/headers/musicheaders1.asm" @@ -23,7 +21,6 @@ SECTION "Music Headers 3", ROMX ; BANK $1f INCLUDE "audio/headers/musicheaders3.asm" - SECTION "Sound Effects 1", ROMX ; BANK $02 INCLUDE "audio/sfx/snare1_1.asm" diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 1a44b1e7..d2077629 100755 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -6,231 +6,231 @@ const_value = 0 - const HS_PALLET_TOWN_OAK ; 00 - const HS_LYING_OLD_MAN ; 01 - const HS_OLD_MAN ; 02 - const HS_MUSEUM_GUY ; 03 - const HS_GYM_GUY ; 04 - const HS_CERULEAN_RIVAL ; 05 - const HS_CERULEAN_ROCKET ; 06 - const HS_CERULEAN_GUARD_1 ; 07 - const HS_UNKNOWN_DUNGEON_GUY ; 08 - const HS_CERULEAN_GUARD_2 ; 09 - const HS_SAFFRON_CITY_1 ; 0A - const HS_SAFFRON_CITY_2 ; 0B - const HS_SAFFRON_CITY_3 ; 0C - const HS_SAFFRON_CITY_4 ; 0D - const HS_SAFFRON_CITY_5 ; 0E - const HS_SAFFRON_CITY_6 ; 0F - const HS_SAFFRON_CITY_7 ; 10 - const HS_SAFFRON_CITY_8 ; 11 - const HS_SAFFRON_CITY_9 ; 12 - const HS_SAFFRON_CITY_A ; 13 - const HS_SAFFRON_CITY_B ; 14 - const HS_SAFFRON_CITY_C ; 15 - const HS_SAFFRON_CITY_D ; 16 - const HS_SAFFRON_CITY_E ; 17 - const HS_SAFFRON_CITY_F ; 18 - const HS_ROUTE_2_ITEM_1 ; 19 X - const HS_ROUTE_2_ITEM_2 ; 1A X - const HS_ROUTE_4_ITEM ; 1B X - const HS_ROUTE_9_ITEM ; 1C X - const HS_ROUTE_12_SNORLAX ; 1D - const HS_ROUTE_12_ITEM_1 ; 1E X - const HS_ROUTE_12_ITEM_2 ; 1F X - const HS_ROUTE_15_ITEM ; 20 X - const HS_ROUTE_16_SNORLAX ; 21 - const HS_ROUTE_22_RIVAL_1 ; 22 - const HS_ROUTE_22_RIVAL_2 ; 23 - const HS_NUGGET_BRIDGE_GUY ; 24 - const HS_ROUTE_24_ITEM ; 25 X - const HS_ROUTE_25_ITEM ; 26 X - const HS_DAISY_SITTING ; 27 - const HS_DAISY_WALKING ; 28 - const HS_TOWN_MAP ; 29 - const HS_OAKS_LAB_RIVAL ; 2A - const HS_STARTER_BALL_1 ; 2B - const HS_STARTER_BALL_2 ; 2C - const HS_STARTER_BALL_3 ; 2D - const HS_OAKS_LAB_OAK_1 ; 2E - const HS_POKEDEX_1 ; 2F - const HS_POKEDEX_2 ; 30 - const HS_OAKS_LAB_OAK_2 ; 31 - const HS_VIRIDIAN_GYM_GIOVANNI ; 32 - const HS_VIRIDIAN_GYM_ITEM ; 33 X - const HS_OLD_AMBER ; 34 - const HS_UNKNOWN_DUNGEON_1_ITEM_1 ; 35 X - const HS_UNKNOWN_DUNGEON_1_ITEM_2 ; 36 X - const HS_UNKNOWN_DUNGEON_1_ITEM_3 ; 37 X - const HS_POKEMONTOWER_2_RIVAL ; 38 - const HS_POKEMONTOWER_3_ITEM ; 39 X - const HS_POKEMONTOWER_4_ITEM_1 ; 3A X - const HS_POKEMONTOWER_4_ITEM_2 ; 3B X - const HS_POKEMONTOWER_4_ITEM_3 ; 3C X - const HS_POKEMONTOWER_5_ITEM ; 3D X - const HS_POKEMONTOWER_6_ITEM_1 ; 3E X - const HS_POKEMONTOWER_6_ITEM_2 ; 3F X - const HS_POKEMONTOWER_7_ROCKET_1 ; 40 X - const HS_POKEMONTOWER_7_ROCKET_2 ; 41 X - const HS_POKEMONTOWER_7_ROCKET_3 ; 42 X - const HS_POKEMONTOWER_7_MR_FUJI ; 43 - const HS_LAVENDER_HOUSE_1_MR_FUJI ; 44 - const HS_CELADON_MANSION_5_GIFT ; 45 - const HS_GAME_CORNER_ROCKET ; 46 - const HS_FUCHSIA_HOUSE_2_ITEM ; 47 X - const HS_MANSION_1_ITEM_1 ; 48 X - const HS_MANSION_1_ITEM_2 ; 49 X - const HS_FIGHTING_DOJO_GIFT_1 ; 4A - const HS_FIGHTING_DOJO_GIFT_2 ; 4B - const HS_SILPH_CO_1F_RECEPTIONIST ; 4C - const HS_VOLTORB_1 ; 4D X - const HS_VOLTORB_2 ; 4E X - const HS_VOLTORB_3 ; 4F X - const HS_ELECTRODE_1 ; 50 X - const HS_VOLTORB_4 ; 51 X - const HS_VOLTORB_5 ; 52 X - const HS_ELECTRODE_2 ; 53 X - const HS_VOLTORB_6 ; 54 X - const HS_ZAPDOS ; 55 X - const HS_POWER_PLANT_ITEM_1 ; 56 X - const HS_POWER_PLANT_ITEM_2 ; 57 X - const HS_POWER_PLANT_ITEM_3 ; 58 X - const HS_POWER_PLANT_ITEM_4 ; 59 X - const HS_POWER_PLANT_ITEM_5 ; 5A X - const HS_MOLTRES ; 5B X - const HS_VICTORY_ROAD_2_ITEM_1 ; 5C X - const HS_VICTORY_ROAD_2_ITEM_2 ; 5D X - const HS_VICTORY_ROAD_2_ITEM_3 ; 5E X - const HS_VICTORY_ROAD_2_ITEM_4 ; 5F X - const HS_VICTORY_ROAD_2_BOULDER ; 60 - const HS_BILL_POKEMON ; 61 - const HS_BILL_1 ; 62 - const HS_BILL_2 ; 63 - const HS_VIRIDIAN_FOREST_ITEM_1 ; 64 X - const HS_VIRIDIAN_FOREST_ITEM_2 ; 65 X - const HS_VIRIDIAN_FOREST_ITEM_3 ; 66 X - const HS_MT_MOON_1_ITEM_1 ; 67 X - const HS_MT_MOON_1_ITEM_2 ; 68 X - const HS_MT_MOON_1_ITEM_3 ; 69 X - const HS_MT_MOON_1_ITEM_4 ; 6A X - const HS_MT_MOON_1_ITEM_5 ; 6B X - const HS_MT_MOON_1_ITEM_6 ; 6C X - const HS_MT_MOON_3_FOSSIL_1 ; 6D - const HS_MT_MOON_3_FOSSIL_2 ; 6E - const HS_MT_MOON_3_ITEM_1 ; 6F X - const HS_MT_MOON_3_ITEM_2 ; 70 X - const HS_SS_ANNE_2_RIVAL ; 71 - const HS_SS_ANNE_8_ITEM ; 72 X - const HS_SS_ANNE_9_ITEM_1 ; 73 X - const HS_SS_ANNE_9_ITEM_2 ; 74 X - const HS_SS_ANNE_10_ITEM_1 ; 75 X - const HS_SS_ANNE_10_ITEM_2 ; 76 X - const HS_SS_ANNE_10_ITEM_3 ; 77 X - const HS_VICTORY_ROAD_3_ITEM_1 ; 78 X - const HS_VICTORY_ROAD_3_ITEM_2 ; 79 X - const HS_VICTORY_ROAD_3_BOULDER ; 7A - const HS_ROCKET_HIDEOUT_1_ITEM_1 ; 7B X - const HS_ROCKET_HIDEOUT_1_ITEM_2 ; 7C X - const HS_ROCKET_HIDEOUT_2_ITEM_1 ; 7D X - const HS_ROCKET_HIDEOUT_2_ITEM_2 ; 7E X - const HS_ROCKET_HIDEOUT_2_ITEM_3 ; 7F X - const HS_ROCKET_HIDEOUT_2_ITEM_4 ; 80 X - const HS_ROCKET_HIDEOUT_3_ITEM_1 ; 81 X - const HS_ROCKET_HIDEOUT_3_ITEM_2 ; 82 X - const HS_ROCKET_HIDEOUT_4_GIOVANNI ; 83 - const HS_ROCKET_HIDEOUT_4_ITEM_1 ; 84 X - const HS_ROCKET_HIDEOUT_4_ITEM_2 ; 85 X - const HS_ROCKET_HIDEOUT_4_ITEM_3 ; 86 X - const HS_ROCKET_HIDEOUT_4_ITEM_4 ; 87 - const HS_ROCKET_HIDEOUT_4_ITEM_5 ; 88 - const HS_SILPH_CO_2F_1 ; 89 XXX never (de)activated? - const HS_SILPH_CO_2F_2 ; 8A - const HS_SILPH_CO_2F_3 ; 8B - const HS_SILPH_CO_2F_4 ; 8C - const HS_SILPH_CO_2F_5 ; 8D - const HS_SILPH_CO_3F_1 ; 8E - const HS_SILPH_CO_3F_2 ; 8F - const HS_SILPH_CO_3F_ITEM ; 90 X - const HS_SILPH_CO_4F_1 ; 91 - const HS_SILPH_CO_4F_2 ; 92 - const HS_SILPH_CO_4F_3 ; 93 - const HS_SILPH_CO_4F_ITEM_1 ; 94 X - const HS_SILPH_CO_4F_ITEM_2 ; 95 X - const HS_SILPH_CO_4F_ITEM_3 ; 96 X - const HS_SILPH_CO_5F_1 ; 97 - const HS_SILPH_CO_5F_2 ; 98 - const HS_SILPH_CO_5F_3 ; 99 - const HS_SILPH_CO_5F_4 ; 9A - const HS_SILPH_CO_5F_ITEM_1 ; 9B X - const HS_SILPH_CO_5F_ITEM_2 ; 9C X - const HS_SILPH_CO_5F_ITEM_3 ; 9D X - const HS_SILPH_CO_6F_1 ; 9E - const HS_SILPH_CO_6F_2 ; 9F - const HS_SILPH_CO_6F_3 ; A0 - const HS_SILPH_CO_6F_ITEM_1 ; A1 X - const HS_SILPH_CO_6F_ITEM_2 ; A2 X - const HS_SILPH_CO_7F_1 ; A3 - const HS_SILPH_CO_7F_2 ; A4 - const HS_SILPH_CO_7F_3 ; A5 - const HS_SILPH_CO_7F_4 ; A6 - const HS_SILPH_CO_7F_RIVAL ; A7 - const HS_SILPH_CO_7F_ITEM_1 ; A8 X - const HS_SILPH_CO_7F_ITEM_2 ; A9 X - const HS_SILPH_CO_7F_8 ; AA XXX sprite doesn't exist - const HS_SILPH_CO_8F_1 ; AB - const HS_SILPH_CO_8F_2 ; AC - const HS_SILPH_CO_8F_3 ; AD - const HS_SILPH_CO_9F_1 ; AE - const HS_SILPH_CO_9F_2 ; AF - const HS_SILPH_CO_9F_3 ; B0 - const HS_SILPH_CO_10F_1 ; B1 - const HS_SILPH_CO_10F_2 ; B2 - const HS_SILPH_CO_10F_3 ; B3 XXX never (de)activated? - const HS_SILPH_CO_10F_ITEM_1 ; B4 X - const HS_SILPH_CO_10F_ITEM_2 ; B5 X - const HS_SILPH_CO_10F_ITEM_3 ; B6 X - const HS_SILPH_CO_11F_1 ; B7 - const HS_SILPH_CO_11F_2 ; B8 - const HS_SILPH_CO_11F_3 ; B9 - const HS_MAP_F4_1 ; BA XXX sprite doesn't exist - const HS_MANSION_2_ITEM ; BB X - const HS_MANSION_3_ITEM_1 ; BC X - const HS_MANSION_3_ITEM_2 ; BD X - const HS_MANSION_4_ITEM_1 ; BE X - const HS_MANSION_4_ITEM_2 ; BF X - const HS_MANSION_4_ITEM_3 ; C0 X - const HS_MANSION_4_ITEM_4 ; C1 X - const HS_MANSION_4_ITEM_5 ; C2 X - const HS_SAFARI_ZONE_EAST_ITEM_1 ; C3 X - const HS_SAFARI_ZONE_EAST_ITEM_2 ; C4 X - const HS_SAFARI_ZONE_EAST_ITEM_3 ; C5 X - const HS_SAFARI_ZONE_EAST_ITEM_4 ; C6 X - const HS_SAFARI_ZONE_NORTH_ITEM_1 ; C7 X - const HS_SAFARI_ZONE_NORTH_ITEM_2 ; C8 X - const HS_SAFARI_ZONE_WEST_ITEM_1 ; C9 X - const HS_SAFARI_ZONE_WEST_ITEM_2 ; CA X - const HS_SAFARI_ZONE_WEST_ITEM_3 ; CB X - const HS_SAFARI_ZONE_WEST_ITEM_4 ; CC X - const HS_SAFARI_ZONE_CENTER_ITEM ; CD X - const HS_UNKNOWN_DUNGEON_2_ITEM_1 ; CE X - const HS_UNKNOWN_DUNGEON_2_ITEM_2 ; CF X - const HS_UNKNOWN_DUNGEON_2_ITEM_3 ; D0 X - const HS_MEWTWO ; D1 X - const HS_UNKNOWN_DUNGEON_3_ITEM_1 ; D2 X - const HS_UNKNOWN_DUNGEON_3_ITEM_2 ; D3 X - const HS_VICTORY_ROAD_1_ITEM_1 ; D4 X - const HS_VICTORY_ROAD_1_ITEM_2 ; D5 X - const HS_CHAMPIONS_ROOM_OAK ; D6 - const HS_SEAFOAM_ISLANDS_1_BOULDER_1 ; D7 - const HS_SEAFOAM_ISLANDS_1_BOULDER_2 ; D8 - const HS_SEAFOAM_ISLANDS_2_BOULDER_1 ; D9 - const HS_SEAFOAM_ISLANDS_2_BOULDER_2 ; DA - const HS_SEAFOAM_ISLANDS_3_BOULDER_1 ; DB - const HS_SEAFOAM_ISLANDS_3_BOULDER_2 ; DC - const HS_SEAFOAM_ISLANDS_4_BOULDER_1 ; DD - const HS_SEAFOAM_ISLANDS_4_BOULDER_2 ; DE - const HS_SEAFOAM_ISLANDS_4_BOULDER_3 ; DF - const HS_SEAFOAM_ISLANDS_4_BOULDER_4 ; E0 - const HS_SEAFOAM_ISLANDS_5_BOULDER_1 ; E1 - const HS_SEAFOAM_ISLANDS_5_BOULDER_2 ; E2 - const HS_ARTICUNO ; E3 X + const HS_PALLET_TOWN_OAK ; 00 + const HS_LYING_OLD_MAN ; 01 + const HS_OLD_MAN ; 02 + const HS_MUSEUM_GUY ; 03 + const HS_GYM_GUY ; 04 + const HS_CERULEAN_RIVAL ; 05 + const HS_CERULEAN_ROCKET ; 06 + const HS_CERULEAN_GUARD_1 ; 07 + const HS_UNKNOWN_DUNGEON_GUY ; 08 + const HS_CERULEAN_GUARD_2 ; 09 + const HS_SAFFRON_CITY_1 ; 0A + const HS_SAFFRON_CITY_2 ; 0B + const HS_SAFFRON_CITY_3 ; 0C + const HS_SAFFRON_CITY_4 ; 0D + const HS_SAFFRON_CITY_5 ; 0E + const HS_SAFFRON_CITY_6 ; 0F + const HS_SAFFRON_CITY_7 ; 10 + const HS_SAFFRON_CITY_8 ; 11 + const HS_SAFFRON_CITY_9 ; 12 + const HS_SAFFRON_CITY_A ; 13 + const HS_SAFFRON_CITY_B ; 14 + const HS_SAFFRON_CITY_C ; 15 + const HS_SAFFRON_CITY_D ; 16 + const HS_SAFFRON_CITY_E ; 17 + const HS_SAFFRON_CITY_F ; 18 + const HS_ROUTE_2_ITEM_1 ; 19 X + const HS_ROUTE_2_ITEM_2 ; 1A X + const HS_ROUTE_4_ITEM ; 1B X + const HS_ROUTE_9_ITEM ; 1C X + const HS_ROUTE_12_SNORLAX ; 1D + const HS_ROUTE_12_ITEM_1 ; 1E X + const HS_ROUTE_12_ITEM_2 ; 1F X + const HS_ROUTE_15_ITEM ; 20 X + const HS_ROUTE_16_SNORLAX ; 21 + const HS_ROUTE_22_RIVAL_1 ; 22 + const HS_ROUTE_22_RIVAL_2 ; 23 + const HS_NUGGET_BRIDGE_GUY ; 24 + const HS_ROUTE_24_ITEM ; 25 X + const HS_ROUTE_25_ITEM ; 26 X + const HS_DAISY_SITTING ; 27 + const HS_DAISY_WALKING ; 28 + const HS_TOWN_MAP ; 29 + const HS_OAKS_LAB_RIVAL ; 2A + const HS_STARTER_BALL_1 ; 2B + const HS_STARTER_BALL_2 ; 2C + const HS_STARTER_BALL_3 ; 2D + const HS_OAKS_LAB_OAK_1 ; 2E + const HS_POKEDEX_1 ; 2F + const HS_POKEDEX_2 ; 30 + const HS_OAKS_LAB_OAK_2 ; 31 + const HS_VIRIDIAN_GYM_GIOVANNI ; 32 + const HS_VIRIDIAN_GYM_ITEM ; 33 X + const HS_OLD_AMBER ; 34 + const HS_CERULEAN_CAVE_1F_ITEM_1 ; 35 X + const HS_CERULEAN_CAVE_1F_ITEM_2 ; 36 X + const HS_CERULEAN_CAVE_1F_ITEM_3 ; 37 X + const HS_POKEMON_TOWER_2F_RIVAL ; 38 + const HS_POKEMON_TOWER_3F_ITEM ; 39 X + const HS_POKEMON_TOWER_4F_ITEM_1 ; 3A X + const HS_POKEMON_TOWER_4F_ITEM_2 ; 3B X + const HS_POKEMON_TOWER_4F_ITEM_3 ; 3C X + const HS_POKEMON_TOWER_5F_ITEM ; 3D X + const HS_POKEMON_TOWER_6F_ITEM_1 ; 3E X + const HS_POKEMON_TOWER_6F_ITEM_2 ; 3F X + const HS_POKEMON_TOWER_7F_ROCKET_1 ; 40 X + const HS_POKEMON_TOWER_7F_ROCKET_2 ; 41 X + const HS_POKEMON_TOWER_7F_ROCKET_3 ; 42 X + const HS_POKEMON_TOWER_7F_MR_FUJI ; 43 + const HS_MR_FUJIS_HOUSE_MR_FUJI ; 44 + const HS_CELADON_MANSION_EEVEE_GIFT ; 45 + const HS_GAME_CORNER_ROCKET ; 46 + const HS_WARDENS_HOUSE_ITEM ; 47 X + const HS_POKEMON_MANSION_1F_ITEM_1 ; 48 X + const HS_POKEMON_MANSION_1F_ITEM_2 ; 49 X + const HS_FIGHTING_DOJO_GIFT_1 ; 4A + const HS_FIGHTING_DOJO_GIFT_2 ; 4B + const HS_SILPH_CO_1F_RECEPTIONIST ; 4C + const HS_VOLTORB_1 ; 4D X + const HS_VOLTORB_2 ; 4E X + const HS_VOLTORB_3 ; 4F X + const HS_ELECTRODE_1 ; 50 X + const HS_VOLTORB_4 ; 51 X + const HS_VOLTORB_5 ; 52 X + const HS_ELECTRODE_2 ; 53 X + const HS_VOLTORB_6 ; 54 X + const HS_ZAPDOS ; 55 X + const HS_POWER_PLANT_ITEM_1 ; 56 X + const HS_POWER_PLANT_ITEM_2 ; 57 X + const HS_POWER_PLANT_ITEM_3 ; 58 X + const HS_POWER_PLANT_ITEM_4 ; 59 X + const HS_POWER_PLANT_ITEM_5 ; 5A X + const HS_MOLTRES ; 5B X + const HS_VICTORY_ROAD_2F_ITEM_1 ; 5C X + const HS_VICTORY_ROAD_2F_ITEM_2 ; 5D X + const HS_VICTORY_ROAD_2F_ITEM_3 ; 5E X + const HS_VICTORY_ROAD_2F_ITEM_4 ; 5F X + const HS_VICTORY_ROAD_2F_BOULDER ; 60 + const HS_BILL_POKEMON ; 61 + const HS_BILL_1 ; 62 + const HS_BILL_2 ; 63 + const HS_VIRIDIAN_FOREST_ITEM_1 ; 64 X + const HS_VIRIDIAN_FOREST_ITEM_2 ; 65 X + const HS_VIRIDIAN_FOREST_ITEM_3 ; 66 X + const HS_MT_MOON_1F_ITEM_1 ; 67 X + const HS_MT_MOON_1F_ITEM_2 ; 68 X + const HS_MT_MOON_1F_ITEM_3 ; 69 X + const HS_MT_MOON_1F_ITEM_4 ; 6A X + const HS_MT_MOON_1F_ITEM_5 ; 6B X + const HS_MT_MOON_1F_ITEM_6 ; 6C X + const HS_MT_MOON_B2F_FOSSIL_1 ; 6D + const HS_MT_MOON_B2F_FOSSIL_2 ; 6E + const HS_MT_MOON_B2F_ITEM_1 ; 6F X + const HS_MT_MOON_B2F_ITEM_2 ; 70 X + const HS_SS_ANNE_2F_RIVAL ; 71 + const HS_SS_ANNE_1F_ROOMS_ITEM ; 72 X + const HS_SS_ANNE_2F_ROOMS_ITEM_1 ; 73 X + const HS_SS_ANNE_2F_ROOMS_ITEM_2 ; 74 X + const HS_SS_ANNE_B1F_ROOMS_ITEM_1 ; 75 X + const HS_SS_ANNE_B1F_ROOMS_ITEM_2 ; 76 X + const HS_SS_ANNE_B1F_ROOMS_ITEM_3 ; 77 X + const HS_VICTORY_ROAD_3F_ITEM_1 ; 78 X + const HS_VICTORY_ROAD_3F_ITEM_2 ; 79 X + const HS_VICTORY_ROAD_3F_BOULDER ; 7A + const HS_ROCKET_HIDEOUT_B1F_ITEM_1 ; 7B X + const HS_ROCKET_HIDEOUT_B1F_ITEM_2 ; 7C X + const HS_ROCKET_HIDEOUT_B2F_ITEM_1 ; 7D X + const HS_ROCKET_HIDEOUT_B2F_ITEM_2 ; 7E X + const HS_ROCKET_HIDEOUT_B2F_ITEM_3 ; 7F X + const HS_ROCKET_HIDEOUT_B2F_ITEM_4 ; 80 X + const HS_ROCKET_HIDEOUT_B3F_ITEM_1 ; 81 X + const HS_ROCKET_HIDEOUT_B3F_ITEM_2 ; 82 X + const HS_ROCKET_HIDEOUT_B4F_GIOVANNI ; 83 + const HS_ROCKET_HIDEOUT_B4F_ITEM_1 ; 84 X + const HS_ROCKET_HIDEOUT_B4F_ITEM_2 ; 85 X + const HS_ROCKET_HIDEOUT_B4F_ITEM_3 ; 86 X + const HS_ROCKET_HIDEOUT_B4F_ITEM_4 ; 87 + const HS_ROCKET_HIDEOUT_B4F_ITEM_5 ; 88 + const HS_SILPH_CO_2F_1 ; 89 XXX never (de)activated? + const HS_SILPH_CO_2F_2 ; 8A + const HS_SILPH_CO_2F_3 ; 8B + const HS_SILPH_CO_2F_4 ; 8C + const HS_SILPH_CO_2F_5 ; 8D + const HS_SILPH_CO_3F_1 ; 8E + const HS_SILPH_CO_3F_2 ; 8F + const HS_SILPH_CO_3F_ITEM ; 90 X + const HS_SILPH_CO_4F_1 ; 91 + const HS_SILPH_CO_4F_2 ; 92 + const HS_SILPH_CO_4F_3 ; 93 + const HS_SILPH_CO_4F_ITEM_1 ; 94 X + const HS_SILPH_CO_4F_ITEM_2 ; 95 X + const HS_SILPH_CO_4F_ITEM_3 ; 96 X + const HS_SILPH_CO_5F_1 ; 97 + const HS_SILPH_CO_5F_2 ; 98 + const HS_SILPH_CO_5F_3 ; 99 + const HS_SILPH_CO_5F_4 ; 9A + const HS_SILPH_CO_5F_ITEM_1 ; 9B X + const HS_SILPH_CO_5F_ITEM_2 ; 9C X + const HS_SILPH_CO_5F_ITEM_3 ; 9D X + const HS_SILPH_CO_6F_1 ; 9E + const HS_SILPH_CO_6F_2 ; 9F + const HS_SILPH_CO_6F_3 ; A0 + const HS_SILPH_CO_6F_ITEM_1 ; A1 X + const HS_SILPH_CO_6F_ITEM_2 ; A2 X + const HS_SILPH_CO_7F_1 ; A3 + const HS_SILPH_CO_7F_2 ; A4 + const HS_SILPH_CO_7F_3 ; A5 + const HS_SILPH_CO_7F_4 ; A6 + const HS_SILPH_CO_7F_RIVAL ; A7 + const HS_SILPH_CO_7F_ITEM_1 ; A8 X + const HS_SILPH_CO_7F_ITEM_2 ; A9 X + const HS_SILPH_CO_7F_8 ; AA XXX sprite doesn't exist + const HS_SILPH_CO_8F_1 ; AB + const HS_SILPH_CO_8F_2 ; AC + const HS_SILPH_CO_8F_3 ; AD + const HS_SILPH_CO_9F_1 ; AE + const HS_SILPH_CO_9F_2 ; AF + const HS_SILPH_CO_9F_3 ; B0 + const HS_SILPH_CO_10F_1 ; B1 + const HS_SILPH_CO_10F_2 ; B2 + const HS_SILPH_CO_10F_3 ; B3 XXX never (de)activated? + const HS_SILPH_CO_10F_ITEM_1 ; B4 X + const HS_SILPH_CO_10F_ITEM_2 ; B5 X + const HS_SILPH_CO_10F_ITEM_3 ; B6 X + const HS_SILPH_CO_11F_1 ; B7 + const HS_SILPH_CO_11F_2 ; B8 + const HS_SILPH_CO_11F_3 ; B9 + const HS_UNUSED_MAP_F4_1 ; BA XXX sprite doesn't exist + const HS_POKEMON_MANSION_2F_ITEM ; BB X + const HS_POKEMON_MANSION_3F_ITEM_1 ; BC X + const HS_POKEMON_MANSION_3F_ITEM_2 ; BD X + const HS_POKEMON_MANSION_B1F_ITEM_1 ; BE X + const HS_POKEMON_MANSION_B1F_ITEM_2 ; BF X + const HS_POKEMON_MANSION_B1F_ITEM_3 ; C0 X + const HS_POKEMON_MANSION_B1F_ITEM_4 ; C1 X + const HS_POKEMON_MANSION_B1F_ITEM_5 ; C2 X + const HS_SAFARI_ZONE_EAST_ITEM_1 ; C3 X + const HS_SAFARI_ZONE_EAST_ITEM_2 ; C4 X + const HS_SAFARI_ZONE_EAST_ITEM_3 ; C5 X + const HS_SAFARI_ZONE_EAST_ITEM_4 ; C6 X + const HS_SAFARI_ZONE_NORTH_ITEM_1 ; C7 X + const HS_SAFARI_ZONE_NORTH_ITEM_2 ; C8 X + const HS_SAFARI_ZONE_WEST_ITEM_1 ; C9 X + const HS_SAFARI_ZONE_WEST_ITEM_2 ; CA X + const HS_SAFARI_ZONE_WEST_ITEM_3 ; CB X + const HS_SAFARI_ZONE_WEST_ITEM_4 ; CC X + const HS_SAFARI_ZONE_CENTER_ITEM ; CD X + const HS_CERULEAN_CAVE_2F_ITEM_1 ; CE X + const HS_CERULEAN_CAVE_2F_ITEM_2 ; CF X + const HS_CERULEAN_CAVE_2F_ITEM_3 ; D0 X + const HS_MEWTWO ; D1 X + const HS_CERULEAN_CAVE_B1F_ITEM_1 ; D2 X + const HS_CERULEAN_CAVE_B1F_ITEM_2 ; D3 X + const HS_VICTORY_ROAD_1F_ITEM_1 ; D4 X + const HS_VICTORY_ROAD_1F_ITEM_2 ; D5 X + const HS_CHAMPIONS_ROOM_OAK ; D6 + const HS_SEAFOAM_ISLANDS_1F_BOULDER_1 ; D7 + const HS_SEAFOAM_ISLANDS_1F_BOULDER_2 ; D8 + const HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ; D9 + const HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ; DA + const HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ; DB + const HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ; DC + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 ; DD + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 ; DE + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 ; DF + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 ; E0 + const HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ; E1 + const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; E2 + const HS_ARTICUNO ; E3 X diff --git a/constants/map_constants.asm b/constants/map_constants.asm index cbedef3f..3ddc5746 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -5,251 +5,251 @@ mapconst: MACRO ENDM const_def - mapconst PALLET_TOWN, 9, 10 ; $00 - mapconst VIRIDIAN_CITY, 18, 20 ; $01 - mapconst PEWTER_CITY, 18, 20 ; $02 - mapconst CERULEAN_CITY, 18, 20 ; $03 - mapconst LAVENDER_TOWN, 9, 10 ; $04 - mapconst VERMILION_CITY, 18, 20 ; $05 - mapconst CELADON_CITY, 18, 25 ; $06 - mapconst FUCHSIA_CITY, 18, 20 ; $07 - mapconst CINNABAR_ISLAND, 9, 10 ; $08 - mapconst INDIGO_PLATEAU, 9, 10 ; $09 - mapconst SAFFRON_CITY, 18, 20 ; $0A - mapconst UNUSED_MAP_0B, 0, 0 ; $0B - mapconst ROUTE_1, 18, 10 ; $0C - mapconst ROUTE_2, 36, 10 ; $0D - mapconst ROUTE_3, 9, 35 ; $0E - mapconst ROUTE_4, 9, 45 ; $0F - mapconst ROUTE_5, 18, 10 ; $10 - mapconst ROUTE_6, 18, 10 ; $11 - mapconst ROUTE_7, 9, 10 ; $12 - mapconst ROUTE_8, 9, 30 ; $13 - mapconst ROUTE_9, 9, 30 ; $14 - mapconst ROUTE_10, 36, 10 ; $15 - mapconst ROUTE_11, 9, 30 ; $16 - mapconst ROUTE_12, 54, 10 ; $17 - mapconst ROUTE_13, 9, 30 ; $18 - mapconst ROUTE_14, 27, 10 ; $19 - mapconst ROUTE_15, 9, 30 ; $1A - mapconst ROUTE_16, 9, 20 ; $1B - mapconst ROUTE_17, 72, 10 ; $1C - mapconst ROUTE_18, 9, 25 ; $1D - mapconst ROUTE_19, 27, 10 ; $1E - mapconst ROUTE_20, 9, 50 ; $1F - mapconst ROUTE_21, 45, 10 ; $20 - mapconst ROUTE_22, 9, 20 ; $21 - mapconst ROUTE_23, 72, 10 ; $22 - mapconst ROUTE_24, 18, 10 ; $23 - mapconst ROUTE_25, 9, 30 ; $24 - mapconst REDS_HOUSE_1F, 4, 4 ; $25 - mapconst REDS_HOUSE_2F, 4, 4 ; $26 - mapconst BLUES_HOUSE, 4, 4 ; $27 - mapconst OAKS_LAB, 6, 5 ; $28 - mapconst VIRIDIAN_POKECENTER, 4, 7 ; $29 - mapconst VIRIDIAN_MART, 4, 4 ; $2A - mapconst VIRIDIAN_SCHOOL, 4, 4 ; $2B - mapconst VIRIDIAN_HOUSE, 4, 4 ; $2C - mapconst VIRIDIAN_GYM, 9, 10 ; $2D - mapconst DIGLETTS_CAVE_EXIT, 4, 4 ; $2E - mapconst VIRIDIAN_FOREST_EXIT, 4, 5 ; $2F - mapconst ROUTE_2_HOUSE, 4, 4 ; $30 - mapconst ROUTE_2_GATE, 4, 5 ; $31 - mapconst VIRIDIAN_FOREST_ENTRANCE, 4, 5 ; $32 - mapconst VIRIDIAN_FOREST, 24, 17 ; $33 - mapconst MUSEUM_1F, 4, 10 ; $34 - mapconst MUSEUM_2F, 4, 7 ; $35 - mapconst PEWTER_GYM, 7, 5 ; $36 - mapconst PEWTER_HOUSE_1, 4, 4 ; $37 - mapconst PEWTER_MART, 4, 4 ; $38 - mapconst PEWTER_HOUSE_2, 4, 4 ; $39 - mapconst PEWTER_POKECENTER, 4, 7 ; $3A - mapconst MT_MOON_1, 18, 20 ; $3B - mapconst MT_MOON_2, 14, 14 ; $3C - mapconst MT_MOON_3, 18, 20 ; $3D - mapconst TRASHED_HOUSE, 4, 4 ; $3E - mapconst CERULEAN_HOUSE_1, 4, 4 ; $3F - mapconst CERULEAN_POKECENTER, 4, 7 ; $40 - mapconst CERULEAN_GYM, 7, 5 ; $41 - mapconst BIKE_SHOP, 4, 4 ; $42 - mapconst CERULEAN_MART, 4, 4 ; $43 - mapconst MT_MOON_POKECENTER, 4, 7 ; $44 - mapconst TRASHED_HOUSE_COPY, 4, 4 ; $45 - mapconst ROUTE_5_GATE, 3, 4 ; $46 - mapconst PATH_ENTRANCE_ROUTE_5, 4, 4 ; $47 - mapconst DAYCAREM, 4, 4 ; $48 - mapconst ROUTE_6_GATE, 3, 4 ; $49 - mapconst PATH_ENTRANCE_ROUTE_6, 4, 4 ; $4A - mapconst PATH_ENTRANCE_ROUTE_6_COPY, 4, 4 ; $4B - mapconst ROUTE_7_GATE, 4, 3 ; $4C - mapconst PATH_ENTRANCE_ROUTE_7, 4, 4 ; $4D - mapconst PATH_ENTRANCE_ROUTE_7_COPY, 4, 4 ; $4E - mapconst ROUTE_8_GATE, 4, 3 ; $4F - mapconst PATH_ENTRANCE_ROUTE_8, 4, 4 ; $50 - mapconst ROCK_TUNNEL_POKECENTER, 4, 7 ; $51 - mapconst ROCK_TUNNEL_1, 18, 20 ; $52 - mapconst POWER_PLANT, 18, 20 ; $53 - mapconst ROUTE_11_GATE_1F, 5, 4 ; $54 - mapconst DIGLETTS_CAVE_ENTRANCE, 4, 4 ; $55 - mapconst ROUTE_11_GATE_2F, 4, 4 ; $56 - mapconst ROUTE_12_GATE_1F, 4, 5 ; $57 - mapconst BILLS_HOUSE, 4, 4 ; $58 - mapconst VERMILION_POKECENTER, 4, 7 ; $59 - mapconst POKEMON_FAN_CLUB, 4, 4 ; $5A - mapconst VERMILION_MART, 4, 4 ; $5B - mapconst VERMILION_GYM, 9, 5 ; $5C - mapconst VERMILION_HOUSE_1, 4, 4 ; $5D - mapconst VERMILION_DOCK, 6, 14 ; $5E - mapconst SS_ANNE_1, 9, 20 ; $5F - mapconst SS_ANNE_2, 9, 20 ; $60 - mapconst SS_ANNE_3, 3, 10 ; $61 - mapconst SS_ANNE_4, 4, 15 ; $62 - mapconst SS_ANNE_5, 7, 10 ; $63 - mapconst SS_ANNE_6, 8, 7 ; $64 - mapconst SS_ANNE_7, 4, 3 ; $65 - mapconst SS_ANNE_8, 8, 12 ; $66 - mapconst SS_ANNE_9, 8, 12 ; $67 - mapconst SS_ANNE_10, 8, 12 ; $68 - mapconst UNUSED_MAP_69, 0, 0 ; $69 - mapconst UNUSED_MAP_6A, 0, 0 ; $6A - mapconst UNUSED_MAP_6B, 0, 0 ; $6B - mapconst VICTORY_ROAD_1, 9, 10 ; $6C - mapconst UNUSED_MAP_6D, 0, 0 ; $6D - mapconst UNUSED_MAP_6E, 0, 0 ; $6E - mapconst UNUSED_MAP_6F, 0, 0 ; $6F - mapconst UNUSED_MAP_70, 0, 0 ; $70 - mapconst LANCES_ROOM, 13, 13 ; $71 - mapconst UNUSED_MAP_72, 0, 0 ; $72 - mapconst UNUSED_MAP_73, 0, 0 ; $73 - mapconst UNUSED_MAP_74, 0, 0 ; $74 - mapconst UNUSED_MAP_75, 0, 0 ; $75 - mapconst HALL_OF_FAME, 4, 5 ; $76 - mapconst UNDERGROUND_PATH_NS, 24, 4 ; $77 - mapconst CHAMPIONS_ROOM, 4, 4 ; $78 - mapconst UNDERGROUND_PATH_WE, 4, 25 ; $79 - mapconst CELADON_MART_1, 4, 10 ; $7A - mapconst CELADON_MART_2, 4, 10 ; $7B - mapconst CELADON_MART_3, 4, 10 ; $7C - mapconst CELADON_MART_4, 4, 10 ; $7D - mapconst CELADON_MART_ROOF, 4, 10 ; $7E - mapconst CELADON_MART_ELEVATOR, 2, 2 ; $7F - mapconst CELADON_MANSION_1, 6, 4 ; $80 - mapconst CELADON_MANSION_2, 6, 4 ; $81 - mapconst CELADON_MANSION_3, 6, 4 ; $82 - mapconst CELADON_MANSION_4, 6, 4 ; $83 - mapconst CELADON_MANSION_5, 4, 4 ; $84 - mapconst CELADON_POKECENTER, 4, 7 ; $85 - mapconst CELADON_GYM, 9, 5 ; $86 - mapconst GAME_CORNER, 9, 10 ; $87 - mapconst CELADON_MART_5, 4, 10 ; $88 - mapconst CELADON_PRIZE_ROOM, 4, 5 ; $89 - mapconst CELADON_DINER, 4, 5 ; $8A - mapconst CELADON_HOUSE, 4, 4 ; $8B - mapconst CELADON_HOTEL, 4, 7 ; $8C - mapconst LAVENDER_POKECENTER, 4, 7 ; $8D - mapconst POKEMONTOWER_1, 9, 10 ; $8E - mapconst POKEMONTOWER_2, 9, 10 ; $8F - mapconst POKEMONTOWER_3, 9, 10 ; $90 - mapconst POKEMONTOWER_4, 9, 10 ; $91 - mapconst POKEMONTOWER_5, 9, 10 ; $92 - mapconst POKEMONTOWER_6, 9, 10 ; $93 - mapconst POKEMONTOWER_7, 9, 10 ; $94 - mapconst LAVENDER_HOUSE_1, 4, 4 ; $95 - mapconst LAVENDER_MART, 4, 4 ; $96 - mapconst LAVENDER_HOUSE_2, 4, 4 ; $97 - mapconst FUCHSIA_MART, 4, 4 ; $98 - mapconst FUCHSIA_HOUSE_1, 4, 4 ; $99 - mapconst FUCHSIA_POKECENTER, 4, 7 ; $9A - mapconst FUCHSIA_HOUSE_2, 4, 5 ; $9B - mapconst SAFARI_ZONE_ENTRANCE, 3, 4 ; $9C - mapconst FUCHSIA_GYM, 9, 5 ; $9D - mapconst FUCHSIA_MEETING_ROOM, 4, 7 ; $9E - mapconst SEAFOAM_ISLANDS_2, 9, 15 ; $9F - mapconst SEAFOAM_ISLANDS_3, 9, 15 ; $A0 - mapconst SEAFOAM_ISLANDS_4, 9, 15 ; $A1 - mapconst SEAFOAM_ISLANDS_5, 9, 15 ; $A2 - mapconst VERMILION_HOUSE_2, 4, 4 ; $A3 - mapconst FUCHSIA_HOUSE_3, 4, 4 ; $A4 - mapconst MANSION_1, 14, 15 ; $A5 - mapconst CINNABAR_GYM, 9, 10 ; $A6 - mapconst CINNABAR_LAB_1, 4, 9 ; $A7 - mapconst CINNABAR_LAB_2, 4, 4 ; $A8 - mapconst CINNABAR_LAB_3, 4, 4 ; $A9 - mapconst CINNABAR_LAB_4, 4, 4 ; $AA - mapconst CINNABAR_POKECENTER, 4, 7 ; $AB - mapconst CINNABAR_MART, 4, 4 ; $AC - mapconst CINNABAR_MART_COPY, 4, 4 ; $AD - mapconst INDIGO_PLATEAU_LOBBY, 6, 8 ; $AE - mapconst COPYCATS_HOUSE_1F, 4, 4 ; $AF - mapconst COPYCATS_HOUSE_2F, 4, 4 ; $B0 - mapconst FIGHTING_DOJO, 6, 5 ; $B1 - mapconst SAFFRON_GYM, 9, 10 ; $B2 - mapconst SAFFRON_HOUSE_1, 4, 4 ; $B3 - mapconst SAFFRON_MART, 4, 4 ; $B4 - mapconst SILPH_CO_1F, 9, 15 ; $B5 - mapconst SAFFRON_POKECENTER, 4, 7 ; $B6 - mapconst SAFFRON_HOUSE_2, 4, 4 ; $B7 - mapconst ROUTE_15_GATE_1F, 5, 4 ; $B8 - mapconst ROUTE_15_GATE_2F, 4, 4 ; $B9 - mapconst ROUTE_16_GATE_1F, 7, 4 ; $BA - mapconst ROUTE_16_GATE_2F, 4, 4 ; $BB - mapconst ROUTE_16_HOUSE, 4, 4 ; $BC - mapconst ROUTE_12_HOUSE, 4, 4 ; $BD - mapconst ROUTE_18_GATE_1F, 5, 4 ; $BE - mapconst ROUTE_18_GATE_2F, 4, 4 ; $BF - mapconst SEAFOAM_ISLANDS_1, 9, 15 ; $C0 - mapconst ROUTE_22_GATE, 4, 5 ; $C1 - mapconst VICTORY_ROAD_2, 9, 15 ; $C2 - mapconst ROUTE_12_GATE_2F, 4, 4 ; $C3 - mapconst VERMILION_HOUSE_3, 4, 4 ; $C4 - mapconst DIGLETTS_CAVE, 18, 20 ; $C5 - mapconst VICTORY_ROAD_3, 9, 15 ; $C6 - mapconst ROCKET_HIDEOUT_1, 14, 15 ; $C7 - mapconst ROCKET_HIDEOUT_2, 14, 15 ; $C8 - mapconst ROCKET_HIDEOUT_3, 14, 15 ; $C9 - mapconst ROCKET_HIDEOUT_4, 12, 15 ; $CA - mapconst ROCKET_HIDEOUT_ELEVATOR, 4, 3 ; $CB - mapconst UNUSED_MAP_CC, 0, 0 ; $CC - mapconst UNUSED_MAP_CD, 0, 0 ; $CD - mapconst UNUSED_MAP_CE, 0, 0 ; $CE - mapconst SILPH_CO_2F, 9, 15 ; $CF - mapconst SILPH_CO_3F, 9, 15 ; $D0 - mapconst SILPH_CO_4F, 9, 15 ; $D1 - mapconst SILPH_CO_5F, 9, 15 ; $D2 - mapconst SILPH_CO_6F, 9, 13 ; $D3 - mapconst SILPH_CO_7F, 9, 13 ; $D4 - mapconst SILPH_CO_8F, 9, 13 ; $D5 - mapconst MANSION_2, 14, 15 ; $D6 - mapconst MANSION_3, 9, 15 ; $D7 - mapconst MANSION_4, 14, 15 ; $D8 - mapconst SAFARI_ZONE_EAST, 13, 15 ; $D9 - mapconst SAFARI_ZONE_NORTH, 18, 20 ; $DA - mapconst SAFARI_ZONE_WEST, 13, 15 ; $DB - mapconst SAFARI_ZONE_CENTER, 13, 15 ; $DC - mapconst SAFARI_ZONE_REST_HOUSE_1, 4, 4 ; $DD - mapconst SAFARI_ZONE_SECRET_HOUSE, 4, 4 ; $DE - mapconst SAFARI_ZONE_REST_HOUSE_2, 4, 4 ; $DF - mapconst SAFARI_ZONE_REST_HOUSE_3, 4, 4 ; $E0 - mapconst SAFARI_ZONE_REST_HOUSE_4, 4, 4 ; $E1 - mapconst UNKNOWN_DUNGEON_2, 9, 15 ; $E2 - mapconst UNKNOWN_DUNGEON_3, 9, 15 ; $E3 - mapconst UNKNOWN_DUNGEON_1, 9, 15 ; $E4 - mapconst NAME_RATERS_HOUSE, 4, 4 ; $E5 - mapconst CERULEAN_HOUSE_2, 4, 4 ; $E6 - mapconst UNUSED_MAP_E7, 0, 0 ; $E7 - mapconst ROCK_TUNNEL_2, 18, 20 ; $E8 - mapconst SILPH_CO_9F, 9, 13 ; $E9 - mapconst SILPH_CO_10F, 9, 8 ; $EA - mapconst SILPH_CO_11F, 9, 9 ; $EB - mapconst SILPH_CO_ELEVATOR, 2, 2 ; $EC - mapconst UNUSED_MAP_ED, 0, 0 ; $ED - mapconst UNUSED_MAP_EE, 0, 0 ; $EE - mapconst TRADE_CENTER, 4, 5 ; $EF - mapconst COLOSSEUM, 4, 5 ; $F0 - mapconst UNUSED_MAP_F1, 0, 0 ; $F1 - mapconst UNUSED_MAP_F2, 0, 0 ; $F2 - mapconst UNUSED_MAP_F3, 0, 0 ; $F3 - mapconst UNUSED_MAP_F4, 0, 0 ; $F4 - mapconst LORELEIS_ROOM, 6, 5 ; $F5 - mapconst BRUNOS_ROOM, 6, 5 ; $F6 - mapconst AGATHAS_ROOM, 6, 5 ; $F7 + mapconst PALLET_TOWN, 9, 10 ; $00 + mapconst VIRIDIAN_CITY, 18, 20 ; $01 + mapconst PEWTER_CITY, 18, 20 ; $02 + mapconst CERULEAN_CITY, 18, 20 ; $03 + mapconst LAVENDER_TOWN, 9, 10 ; $04 + mapconst VERMILION_CITY, 18, 20 ; $05 + mapconst CELADON_CITY, 18, 25 ; $06 + mapconst FUCHSIA_CITY, 18, 20 ; $07 + mapconst CINNABAR_ISLAND, 9, 10 ; $08 + mapconst INDIGO_PLATEAU, 9, 10 ; $09 + mapconst SAFFRON_CITY, 18, 20 ; $0A + mapconst UNUSED_MAP_0B, 0, 0 ; $0B + mapconst ROUTE_1, 18, 10 ; $0C + mapconst ROUTE_2, 36, 10 ; $0D + mapconst ROUTE_3, 9, 35 ; $0E + mapconst ROUTE_4, 9, 45 ; $0F + mapconst ROUTE_5, 18, 10 ; $10 + mapconst ROUTE_6, 18, 10 ; $11 + mapconst ROUTE_7, 9, 10 ; $12 + mapconst ROUTE_8, 9, 30 ; $13 + mapconst ROUTE_9, 9, 30 ; $14 + mapconst ROUTE_10, 36, 10 ; $15 + mapconst ROUTE_11, 9, 30 ; $16 + mapconst ROUTE_12, 54, 10 ; $17 + mapconst ROUTE_13, 9, 30 ; $18 + mapconst ROUTE_14, 27, 10 ; $19 + mapconst ROUTE_15, 9, 30 ; $1A + mapconst ROUTE_16, 9, 20 ; $1B + mapconst ROUTE_17, 72, 10 ; $1C + mapconst ROUTE_18, 9, 25 ; $1D + mapconst ROUTE_19, 27, 10 ; $1E + mapconst ROUTE_20, 9, 50 ; $1F + mapconst ROUTE_21, 45, 10 ; $20 + mapconst ROUTE_22, 9, 20 ; $21 + mapconst ROUTE_23, 72, 10 ; $22 + mapconst ROUTE_24, 18, 10 ; $23 + mapconst ROUTE_25, 9, 30 ; $24 + mapconst REDS_HOUSE_1F, 4, 4 ; $25 + mapconst REDS_HOUSE_2F, 4, 4 ; $26 + mapconst BLUES_HOUSE, 4, 4 ; $27 + mapconst OAKS_LAB, 6, 5 ; $28 + mapconst VIRIDIAN_POKECENTER, 4, 7 ; $29 + mapconst VIRIDIAN_MART, 4, 4 ; $2A + mapconst VIRIDIAN_SCHOOL_HOUSE, 4, 4 ; $2B + mapconst VIRIDIAN_NICKNAME_HOUSE, 4, 4 ; $2C + mapconst VIRIDIAN_GYM, 9, 10 ; $2D + mapconst DIGLETTS_CAVE_ROUTE_2, 4, 4 ; $2E + mapconst VIRIDIAN_FOREST_NORTH_GATE, 4, 5 ; $2F + mapconst ROUTE_2_TRADE_HOUSE, 4, 4 ; $30 + mapconst ROUTE_2_GATE, 4, 5 ; $31 + mapconst VIRIDIAN_FOREST_SOUTH_GATE, 4, 5 ; $32 + mapconst VIRIDIAN_FOREST, 24, 17 ; $33 + mapconst MUSEUM_1F, 4, 10 ; $34 + mapconst MUSEUM_2F, 4, 7 ; $35 + mapconst PEWTER_GYM, 7, 5 ; $36 + mapconst PEWTER_NIDORAN_HOUSE, 4, 4 ; $37 + mapconst PEWTER_MART, 4, 4 ; $38 + mapconst PEWTER_SPEECH_HOUSE, 4, 4 ; $39 + mapconst PEWTER_POKECENTER, 4, 7 ; $3A + mapconst MT_MOON_1F, 18, 20 ; $3B + mapconst MT_MOON_B1F, 14, 14 ; $3C + mapconst MT_MOON_B2F, 18, 20 ; $3D + mapconst CERULEAN_TRASHED_HOUSE, 4, 4 ; $3E + mapconst CERULEAN_TRADE_HOUSE, 4, 4 ; $3F + mapconst CERULEAN_POKECENTER, 4, 7 ; $40 + mapconst CERULEAN_GYM, 7, 5 ; $41 + mapconst BIKE_SHOP, 4, 4 ; $42 + mapconst CERULEAN_MART, 4, 4 ; $43 + mapconst MT_MOON_POKECENTER, 4, 7 ; $44 + mapconst CERULEAN_TRASHED_HOUSE_COPY, 4, 4 ; $45 + mapconst ROUTE_5_GATE, 3, 4 ; $46 + mapconst UNDERGROUND_PATH_ROUTE_5, 4, 4 ; $47 + mapconst DAYCARE, 4, 4 ; $48 + mapconst ROUTE_6_GATE, 3, 4 ; $49 + mapconst UNDERGROUND_PATH_ROUTE_6, 4, 4 ; $4A + mapconst UNDERGROUND_PATH_ROUTE_6_COPY, 4, 4 ; $4B + mapconst ROUTE_7_GATE, 4, 3 ; $4C + mapconst UNDERGROUND_PATH_ROUTE_7, 4, 4 ; $4D + mapconst UNDERGROUND_PATH_ROUTE_7_COPY, 4, 4 ; $4E + mapconst ROUTE_8_GATE, 4, 3 ; $4F + mapconst UNDERGROUND_PATH_ROUTE_8, 4, 4 ; $50 + mapconst ROCK_TUNNEL_POKECENTER, 4, 7 ; $51 + mapconst ROCK_TUNNEL_1F, 18, 20 ; $52 + mapconst POWER_PLANT, 18, 20 ; $53 + mapconst ROUTE_11_GATE_1F, 5, 4 ; $54 + mapconst DIGLETTS_CAVE_ROUTE_11, 4, 4 ; $55 + mapconst ROUTE_11_GATE_2F, 4, 4 ; $56 + mapconst ROUTE_12_GATE_1F, 4, 5 ; $57 + mapconst BILLS_HOUSE, 4, 4 ; $58 + mapconst VERMILION_POKECENTER, 4, 7 ; $59 + mapconst POKEMON_FAN_CLUB, 4, 4 ; $5A + mapconst VERMILION_MART, 4, 4 ; $5B + mapconst VERMILION_GYM, 9, 5 ; $5C + mapconst VERMILION_PIDGEY_HOUSE, 4, 4 ; $5D + mapconst VERMILION_DOCK, 6, 14 ; $5E + mapconst SS_ANNE_1F, 9, 20 ; $5F + mapconst SS_ANNE_2F, 9, 20 ; $60 + mapconst SS_ANNE_3F, 3, 10 ; $61 + mapconst SS_ANNE_B1F, 4, 15 ; $62 + mapconst SS_ANNE_BOW, 7, 10 ; $63 + mapconst SS_ANNE_KITCHEN, 8, 7 ; $64 + mapconst SS_ANNE_CAPTAINS_ROOM, 4, 3 ; $65 + mapconst SS_ANNE_1F_ROOMS, 8, 12 ; $66 + mapconst SS_ANNE_2F_ROOMS, 8, 12 ; $67 + mapconst SS_ANNE_B1F_ROOMS, 8, 12 ; $68 + mapconst UNUSED_MAP_69, 0, 0 ; $69 + mapconst UNUSED_MAP_6A, 0, 0 ; $6A + mapconst UNUSED_MAP_6B, 0, 0 ; $6B + mapconst VICTORY_ROAD_1F, 9, 10 ; $6C + mapconst UNUSED_MAP_6D, 0, 0 ; $6D + mapconst UNUSED_MAP_6E, 0, 0 ; $6E + mapconst UNUSED_MAP_6F, 0, 0 ; $6F + mapconst UNUSED_MAP_70, 0, 0 ; $70 + mapconst LANCES_ROOM, 13, 13 ; $71 + mapconst UNUSED_MAP_72, 0, 0 ; $72 + mapconst UNUSED_MAP_73, 0, 0 ; $73 + mapconst UNUSED_MAP_74, 0, 0 ; $74 + mapconst UNUSED_MAP_75, 0, 0 ; $75 + mapconst HALL_OF_FAME, 4, 5 ; $76 + mapconst UNDERGROUND_PATH_NORTH_SOUTH, 24, 4 ; $77 + mapconst CHAMPIONS_ROOM, 4, 4 ; $78 + mapconst UNDERGROUND_PATH_WEST_EAST, 4, 25 ; $79 + mapconst CELADON_MART_1F, 4, 10 ; $7A + mapconst CELADON_MART_2F, 4, 10 ; $7B + mapconst CELADON_MART_3F, 4, 10 ; $7C + mapconst CELADON_MART_4F, 4, 10 ; $7D + mapconst CELADON_MART_ROOF, 4, 10 ; $7E + mapconst CELADON_MART_ELEVATOR, 2, 2 ; $7F + mapconst CELADON_MANSION_1F, 6, 4 ; $80 + mapconst CELADON_MANSION_2F, 6, 4 ; $81 + mapconst CELADON_MANSION_3F, 6, 4 ; $82 + mapconst CELADON_MANSION_ROOF, 6, 4 ; $83 + mapconst CELADON_MANSION_ROOF_HOUSE, 4, 4 ; $84 + mapconst CELADON_POKECENTER, 4, 7 ; $85 + mapconst CELADON_GYM, 9, 5 ; $86 + mapconst GAME_CORNER, 9, 10 ; $87 + mapconst CELADON_MART_5F, 4, 10 ; $88 + mapconst GAME_CORNER_PRIZE_ROOM, 4, 5 ; $89 + mapconst CELADON_DINER, 4, 5 ; $8A + mapconst CELADON_CHIEF_HOUSE, 4, 4 ; $8B + mapconst CELADON_HOTEL, 4, 7 ; $8C + mapconst LAVENDER_POKECENTER, 4, 7 ; $8D + mapconst POKEMON_TOWER_1F, 9, 10 ; $8E + mapconst POKEMON_TOWER_2F, 9, 10 ; $8F + mapconst POKEMON_TOWER_3F, 9, 10 ; $90 + mapconst POKEMON_TOWER_4F, 9, 10 ; $91 + mapconst POKEMON_TOWER_5F, 9, 10 ; $92 + mapconst POKEMON_TOWER_6F, 9, 10 ; $93 + mapconst POKEMON_TOWER_7F, 9, 10 ; $94 + mapconst MR_FUJIS_HOUSE, 4, 4 ; $95 + mapconst LAVENDER_MART, 4, 4 ; $96 + mapconst LAVENDER_CUBONE_HOUSE, 4, 4 ; $97 + mapconst FUCHSIA_MART, 4, 4 ; $98 + mapconst FUCHSIA_BILLS_GRANDPAS_HOUSE, 4, 4 ; $99 + mapconst FUCHSIA_POKECENTER, 4, 7 ; $9A + mapconst WARDENS_HOUSE, 4, 5 ; $9B + mapconst SAFARI_ZONE_GATE, 3, 4 ; $9C + mapconst FUCHSIA_GYM, 9, 5 ; $9D + mapconst FUCHSIA_MEETING_ROOM, 4, 7 ; $9E + mapconst SEAFOAM_ISLANDS_B1F, 9, 15 ; $9F + mapconst SEAFOAM_ISLANDS_B2F, 9, 15 ; $A0 + mapconst SEAFOAM_ISLANDS_B3F, 9, 15 ; $A1 + mapconst SEAFOAM_ISLANDS_B4F, 9, 15 ; $A2 + mapconst VERMILION_OLD_ROD_HOUSE, 4, 4 ; $A3 + mapconst FUCHSIA_GOOD_ROD_HOUSE, 4, 4 ; $A4 + mapconst POKEMON_MANSION_1F, 14, 15 ; $A5 + mapconst CINNABAR_GYM, 9, 10 ; $A6 + mapconst CINNABAR_LAB, 4, 9 ; $A7 + mapconst CINNABAR_LAB_TRADE_ROOM, 4, 4 ; $A8 + mapconst CINNABAR_LAB_METRONOME_ROOM, 4, 4 ; $A9 + mapconst CINNABAR_LAB_FOSSIL_ROOM, 4, 4 ; $AA + mapconst CINNABAR_POKECENTER, 4, 7 ; $AB + mapconst CINNABAR_MART, 4, 4 ; $AC + mapconst CINNABAR_MART_COPY, 4, 4 ; $AD + mapconst INDIGO_PLATEAU_LOBBY, 6, 8 ; $AE + mapconst COPYCATS_HOUSE_1F, 4, 4 ; $AF + mapconst COPYCATS_HOUSE_2F, 4, 4 ; $B0 + mapconst FIGHTING_DOJO, 6, 5 ; $B1 + mapconst SAFFRON_GYM, 9, 10 ; $B2 + mapconst SAFFRON_PIDGEY_HOUSE, 4, 4 ; $B3 + mapconst SAFFRON_MART, 4, 4 ; $B4 + mapconst SILPH_CO_1F, 9, 15 ; $B5 + mapconst SAFFRON_POKECENTER, 4, 7 ; $B6 + mapconst MR_PSYCHICS_HOUSE, 4, 4 ; $B7 + mapconst ROUTE_15_GATE_1F, 5, 4 ; $B8 + mapconst ROUTE_15_GATE_2F, 4, 4 ; $B9 + mapconst ROUTE_16_GATE_1F, 7, 4 ; $BA + mapconst ROUTE_16_GATE_2F, 4, 4 ; $BB + mapconst ROUTE_16_FLY_HOUSE, 4, 4 ; $BC + mapconst ROUTE_12_SUPER_ROD_HOUSE, 4, 4 ; $BD + mapconst ROUTE_18_GATE_1F, 5, 4 ; $BE + mapconst ROUTE_18_GATE_2F, 4, 4 ; $BF + mapconst SEAFOAM_ISLANDS_1F, 9, 15 ; $C0 + mapconst ROUTE_22_GATE, 4, 5 ; $C1 + mapconst VICTORY_ROAD_2F, 9, 15 ; $C2 + mapconst ROUTE_12_GATE_2F, 4, 4 ; $C3 + mapconst VERMILION_TRADE_HOUSE, 4, 4 ; $C4 + mapconst DIGLETTS_CAVE, 18, 20 ; $C5 + mapconst VICTORY_ROAD_3F, 9, 15 ; $C6 + mapconst ROCKET_HIDEOUT_B1F, 14, 15 ; $C7 + mapconst ROCKET_HIDEOUT_B2F, 14, 15 ; $C8 + mapconst ROCKET_HIDEOUT_B3F, 14, 15 ; $C9 + mapconst ROCKET_HIDEOUT_B4F, 12, 15 ; $CA + mapconst ROCKET_HIDEOUT_ELEVATOR, 4, 3 ; $CB + mapconst UNUSED_MAP_CC, 0, 0 ; $CC + mapconst UNUSED_MAP_CD, 0, 0 ; $CD + mapconst UNUSED_MAP_CE, 0, 0 ; $CE + mapconst SILPH_CO_2F, 9, 15 ; $CF + mapconst SILPH_CO_3F, 9, 15 ; $D0 + mapconst SILPH_CO_4F, 9, 15 ; $D1 + mapconst SILPH_CO_5F, 9, 15 ; $D2 + mapconst SILPH_CO_6F, 9, 13 ; $D3 + mapconst SILPH_CO_7F, 9, 13 ; $D4 + mapconst SILPH_CO_8F, 9, 13 ; $D5 + mapconst POKEMON_MANSION_2F, 14, 15 ; $D6 + mapconst POKEMON_MANSION_3F, 9, 15 ; $D7 + mapconst POKEMON_MANSION_B1F, 14, 15 ; $D8 + mapconst SAFARI_ZONE_EAST, 13, 15 ; $D9 + mapconst SAFARI_ZONE_NORTH, 18, 20 ; $DA + mapconst SAFARI_ZONE_WEST, 13, 15 ; $DB + mapconst SAFARI_ZONE_CENTER, 13, 15 ; $DC + mapconst SAFARI_ZONE_CENTER_REST_HOUSE, 4, 4 ; $DD + mapconst SAFARI_ZONE_SECRET_HOUSE, 4, 4 ; $DE + mapconst SAFARI_ZONE_WEST_REST_HOUSE, 4, 4 ; $DF + mapconst SAFARI_ZONE_EAST_REST_HOUSE, 4, 4 ; $E0 + mapconst SAFARI_ZONE_NORTH_REST_HOUSE, 4, 4 ; $E1 + mapconst CERULEAN_CAVE_2F, 9, 15 ; $E2 + mapconst CERULEAN_CAVE_B1F, 9, 15 ; $E3 + mapconst CERULEAN_CAVE_1F, 9, 15 ; $E4 + mapconst NAME_RATERS_HOUSE, 4, 4 ; $E5 + mapconst CERULEAN_BADGE_HOUSE, 4, 4 ; $E6 + mapconst UNUSED_MAP_E7, 0, 0 ; $E7 + mapconst ROCK_TUNNEL_B1F, 18, 20 ; $E8 + mapconst SILPH_CO_9F, 9, 13 ; $E9 + mapconst SILPH_CO_10F, 9, 8 ; $EA + mapconst SILPH_CO_11F, 9, 9 ; $EB + mapconst SILPH_CO_ELEVATOR, 2, 2 ; $EC + mapconst UNUSED_MAP_ED, 0, 0 ; $ED + mapconst UNUSED_MAP_EE, 0, 0 ; $EE + mapconst TRADE_CENTER, 4, 5 ; $EF + mapconst COLOSSEUM, 4, 5 ; $F0 + mapconst UNUSED_MAP_F1, 0, 0 ; $F1 + mapconst UNUSED_MAP_F2, 0, 0 ; $F2 + mapconst UNUSED_MAP_F3, 0, 0 ; $F3 + mapconst UNUSED_MAP_F4, 0, 0 ; $F4 + mapconst LORELEIS_ROOM, 6, 5 ; $F5 + mapconst BRUNOS_ROOM, 6, 5 ; $F6 + mapconst AGATHAS_ROOM, 6, 5 ; $F7 diff --git a/data/force_bike_surf.asm b/data/force_bike_surf.asm index 926db476..fb352aa9 100755 --- a/data/force_bike_surf.asm +++ b/data/force_bike_surf.asm @@ -4,8 +4,8 @@ ForcedBikeOrSurfMaps: db ROUTE_16,$0B,$11 db ROUTE_18,$08,$21 db ROUTE_18,$09,$21 - db SEAFOAM_ISLANDS_4,$07,$12 - db SEAFOAM_ISLANDS_4,$07,$13 - db SEAFOAM_ISLANDS_5,$0E,$04 - db SEAFOAM_ISLANDS_5,$0E,$05 + db SEAFOAM_ISLANDS_B3F,$07,$12 + db SEAFOAM_ISLANDS_B3F,$07,$13 + db SEAFOAM_ISLANDS_B4F,$0E,$04 + db SEAFOAM_ISLANDS_B4F,$0E,$05 db $FF ;end diff --git a/data/hidden_item_coords.asm b/data/hidden_item_coords.asm index 96c4a07b..6b911dea 100755 --- a/data/hidden_item_coords.asm +++ b/data/hidden_item_coords.asm @@ -2,38 +2,38 @@ HiddenItemCoords: ; map ID, then coords db VIRIDIAN_FOREST,$12,$01 db VIRIDIAN_FOREST,$2a,$10 - db MT_MOON_3,$0c,$12 + db MT_MOON_B2F,$0c,$12 db ROUTE_25,$03,$26 db ROUTE_9,$07,$0e - db SS_ANNE_6,$09,$0d - db SS_ANNE_10,$01,$03 + db SS_ANNE_KITCHEN,$09,$0d + db SS_ANNE_B1F_ROOMS,$01,$03 db ROUTE_10,$11,$09 db ROUTE_10,$35,$10 - db ROCKET_HIDEOUT_1,$0f,$15 - db ROCKET_HIDEOUT_3,$11,$1b - db ROCKET_HIDEOUT_4,$01,$19 - db POKEMONTOWER_5,$0c,$04 + db ROCKET_HIDEOUT_B1F,$0f,$15 + db ROCKET_HIDEOUT_B3F,$11,$1b + db ROCKET_HIDEOUT_B4F,$01,$19 + db POKEMON_TOWER_5F,$0c,$04 db ROUTE_13,$0e,$01 db ROUTE_13,$0d,$10 - db MANSION_4,$09,$01 - db SAFARI_ZONE_ENTRANCE,$01,$0a + db POKEMON_MANSION_B1F,$09,$01 + db SAFARI_ZONE_GATE,$01,$0a db SAFARI_ZONE_WEST,$05,$06 db SILPH_CO_5F,$03,$0c db SILPH_CO_9F,$0f,$02 db COPYCATS_HOUSE_2F,$01,$01 - db UNKNOWN_DUNGEON_1,$0b,$0e - db UNKNOWN_DUNGEON_3,$03,$1b + db CERULEAN_CAVE_1F,$0b,$0e + db CERULEAN_CAVE_B1F,$03,$1b db POWER_PLANT,$10,$11 db POWER_PLANT,$01,$0c - db SEAFOAM_ISLANDS_3,$0f,$0f - db SEAFOAM_ISLANDS_5,$11,$19 - db MANSION_1,$10,$08 - db MANSION_3,$09,$01 + db SEAFOAM_ISLANDS_B2F,$0f,$0f + db SEAFOAM_ISLANDS_B4F,$11,$19 + db POKEMON_MANSION_1F,$10,$08 + db POKEMON_MANSION_3F,$09,$01 db ROUTE_23,$2c,$09 db ROUTE_23,$46,$13 db ROUTE_23,$5a,$08 - db VICTORY_ROAD_2,$02,$05 - db VICTORY_ROAD_2,$07,$1a + db VICTORY_ROAD_2F,$02,$05 + db VICTORY_ROAD_2F,$07,$1a db UNUSED_MAP_6F,$0b,$0e db VIRIDIAN_CITY,$04,$0e db ROUTE_11,$05,$30 @@ -43,14 +43,14 @@ HiddenItemCoords: db ROUTE_17,$48,$11 db ROUTE_17,$5b,$04 db ROUTE_17,$79,$08 - db UNDERGROUND_PATH_NS,$04,$03 - db UNDERGROUND_PATH_NS,$22,$04 - db UNDERGROUND_PATH_WE,$02,$0c - db UNDERGROUND_PATH_WE,$05,$15 + db UNDERGROUND_PATH_NORTH_SOUTH,$04,$03 + db UNDERGROUND_PATH_NORTH_SOUTH,$22,$04 + db UNDERGROUND_PATH_WEST_EAST,$02,$0c + db UNDERGROUND_PATH_WEST_EAST,$05,$15 db CELADON_CITY,$0f,$30 db ROUTE_25,$01,$0a - db MT_MOON_3,$09,$21 - db SEAFOAM_ISLANDS_4,$10,$09 + db MT_MOON_B2F,$09,$21 + db SEAFOAM_ISLANDS_B3F,$10,$09 db VERMILION_CITY,$0b,$0e db CERULEAN_CITY,$08,$0f db ROUTE_4,$03,$28 diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm index 43627bfc..b1bfd844 100755 --- a/data/hidden_objects.asm +++ b/data/hidden_objects.asm @@ -4,7 +4,7 @@ HiddenObjectMaps: db OAKS_LAB db VIRIDIAN_POKECENTER db VIRIDIAN_MART - db VIRIDIAN_SCHOOL + db VIRIDIAN_SCHOOL_HOUSE db VIRIDIAN_GYM db MUSEUM_1F db PEWTER_GYM @@ -16,7 +16,7 @@ HiddenObjectMaps: db LAVENDER_POKECENTER db VERMILION_POKECENTER db VERMILION_GYM - db CELADON_MANSION_2 + db CELADON_MANSION_2F db CELADON_POKECENTER db CELADON_GYM db GAME_CORNER @@ -31,56 +31,56 @@ HiddenObjectMaps: db TRADE_CENTER db COLOSSEUM db VIRIDIAN_FOREST - db MT_MOON_3 + db MT_MOON_B2F db INDIGO_PLATEAU db ROUTE_25 db ROUTE_9 - db SS_ANNE_6 - db SS_ANNE_10 - db ROCKET_HIDEOUT_1 - db ROCKET_HIDEOUT_3 - db ROCKET_HIDEOUT_4 + db SS_ANNE_KITCHEN + db SS_ANNE_B1F_ROOMS + db ROCKET_HIDEOUT_B1F + db ROCKET_HIDEOUT_B3F + db ROCKET_HIDEOUT_B4F db SAFFRON_POKECENTER - db POKEMONTOWER_5 + db POKEMON_TOWER_5F db ROUTE_13 - db SAFARI_ZONE_ENTRANCE + db SAFARI_ZONE_GATE db SAFARI_ZONE_WEST db SILPH_CO_5F db SILPH_CO_9F db COPYCATS_HOUSE_2F - db UNKNOWN_DUNGEON_1 - db UNKNOWN_DUNGEON_3 + db CERULEAN_CAVE_1F + db CERULEAN_CAVE_B1F db POWER_PLANT - db SEAFOAM_ISLANDS_3 - db SEAFOAM_ISLANDS_5 - db MANSION_1 - db MANSION_3 + db SEAFOAM_ISLANDS_B2F + db SEAFOAM_ISLANDS_B4F + db POKEMON_MANSION_1F + db POKEMON_MANSION_3F db ROUTE_23 - db VICTORY_ROAD_2 - db $6F + db VICTORY_ROAD_2F + db UNUSED_MAP_6F db BILLS_HOUSE db VIRIDIAN_CITY - db SAFARI_ZONE_REST_HOUSE_2 - db SAFARI_ZONE_REST_HOUSE_3 - db SAFARI_ZONE_REST_HOUSE_4 + db SAFARI_ZONE_WEST_REST_HOUSE + db SAFARI_ZONE_EAST_REST_HOUSE + db SAFARI_ZONE_NORTH_REST_HOUSE db ROUTE_15_GATE_2F - db LAVENDER_HOUSE_1 - db CELADON_MANSION_5 + db MR_FUJIS_HOUSE + db CELADON_MANSION_ROOF_HOUSE db FIGHTING_DOJO db ROUTE_10 db INDIGO_PLATEAU_LOBBY - db CINNABAR_LAB_4 + db CINNABAR_LAB_FOSSIL_ROOM db BIKE_SHOP db ROUTE_11 db ROUTE_12 - db MANSION_2 - db MANSION_4 + db POKEMON_MANSION_2F + db POKEMON_MANSION_B1F db SILPH_CO_11F db ROUTE_17 - db UNDERGROUND_PATH_NS - db UNDERGROUND_PATH_WE + db UNDERGROUND_PATH_NORTH_SOUTH + db UNDERGROUND_PATH_WEST_EAST db CELADON_CITY - db SEAFOAM_ISLANDS_4 + db SEAFOAM_ISLANDS_B3F db VERMILION_CITY db CERULEAN_CITY db ROUTE_4 diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm index 1fa4b64a..7f4593ca 100755 --- a/data/hide_show_data.asm +++ b/data/hide_show_data.asm @@ -343,38 +343,38 @@ MapHS2D: MapHS34: db MUSEUM_1F,$05,Show MapHSE4: - db UNKNOWN_DUNGEON_1,$01,Show - db UNKNOWN_DUNGEON_1,$02,Show - db UNKNOWN_DUNGEON_1,$03,Show + db CERULEAN_CAVE_1F,$01,Show + db CERULEAN_CAVE_1F,$02,Show + db CERULEAN_CAVE_1F,$03,Show MapHS8F: - db POKEMONTOWER_2,$01,Show + db POKEMON_TOWER_2F,$01,Show MapHS90: - db POKEMONTOWER_3,$04,Show + db POKEMON_TOWER_3F,$04,Show MapHS91: - db POKEMONTOWER_4,$04,Show - db POKEMONTOWER_4,$05,Show - db POKEMONTOWER_4,$06,Show + db POKEMON_TOWER_4F,$04,Show + db POKEMON_TOWER_4F,$05,Show + db POKEMON_TOWER_4F,$06,Show MapHS92: - db POKEMONTOWER_5,$06,Show + db POKEMON_TOWER_5F,$06,Show MapHS93: - db POKEMONTOWER_6,$04,Show - db POKEMONTOWER_6,$05,Show + db POKEMON_TOWER_6F,$04,Show + db POKEMON_TOWER_6F,$05,Show MapHS94: - db POKEMONTOWER_7,$01,Show - db POKEMONTOWER_7,$02,Show - db POKEMONTOWER_7,$03,Show - db POKEMONTOWER_7,$04,Show + db POKEMON_TOWER_7F,$01,Show + db POKEMON_TOWER_7F,$02,Show + db POKEMON_TOWER_7F,$03,Show + db POKEMON_TOWER_7F,$04,Show MapHS95: - db LAVENDER_HOUSE_1,$05,Hide + db MR_FUJIS_HOUSE,$05,Hide MapHS84: - db CELADON_MANSION_5,$02,Show + db CELADON_MANSION_ROOF_HOUSE,$02,Show MapHS87: db GAME_CORNER,$0B,Show MapHS9B: - db FUCHSIA_HOUSE_2,$02,Show + db WARDENS_HOUSE,$02,Show MapHSA5: - db MANSION_1,$02,Show - db MANSION_1,$03,Show + db POKEMON_MANSION_1F,$02,Show + db POKEMON_MANSION_1F,$03,Show MapHSB1: db FIGHTING_DOJO,$06,Show db FIGHTING_DOJO,$07,Show @@ -396,12 +396,12 @@ MapHS53: db POWER_PLANT,$0D,Show db POWER_PLANT,$0E,Show MapHSC2: - db VICTORY_ROAD_2,$06,Show - db VICTORY_ROAD_2,$07,Show - db VICTORY_ROAD_2,$08,Show - db VICTORY_ROAD_2,$09,Show - db VICTORY_ROAD_2,$0A,Show - db VICTORY_ROAD_2,$0D,Show + db VICTORY_ROAD_2F,$06,Show + db VICTORY_ROAD_2F,$07,Show + db VICTORY_ROAD_2F,$08,Show + db VICTORY_ROAD_2F,$09,Show + db VICTORY_ROAD_2F,$0A,Show + db VICTORY_ROAD_2F,$0D,Show MapHS58: db BILLS_HOUSE,$01,Show db BILLS_HOUSE,$02,Hide @@ -411,50 +411,50 @@ MapHS33: db VIRIDIAN_FOREST,$06,Show db VIRIDIAN_FOREST,$07,Show MapHS3B: - db MT_MOON_1,$08,Show - db MT_MOON_1,$09,Show - db MT_MOON_1,$0A,Show - db MT_MOON_1,$0B,Show - db MT_MOON_1,$0C,Show - db MT_MOON_1,$0D,Show + db MT_MOON_1F,$08,Show + db MT_MOON_1F,$09,Show + db MT_MOON_1F,$0A,Show + db MT_MOON_1F,$0B,Show + db MT_MOON_1F,$0C,Show + db MT_MOON_1F,$0D,Show MapHS3D: - db MT_MOON_3,$06,Show - db MT_MOON_3,$07,Show - db MT_MOON_3,$08,Show - db MT_MOON_3,$09,Show + db MT_MOON_B2F,$06,Show + db MT_MOON_B2F,$07,Show + db MT_MOON_B2F,$08,Show + db MT_MOON_B2F,$09,Show MapHS60: - db SS_ANNE_2,$02,Hide + db SS_ANNE_2F,$02,Hide MapHS66: - db SS_ANNE_8,$0A,Show + db SS_ANNE_1F_ROOMS,$0A,Show MapHS67: - db SS_ANNE_9,$06,Show - db SS_ANNE_9,$09,Show + db SS_ANNE_2F_ROOMS,$06,Show + db SS_ANNE_2F_ROOMS,$09,Show MapHS68: - db SS_ANNE_10,$09,Show - db SS_ANNE_10,$0A,Show - db SS_ANNE_10,$0B,Show + db SS_ANNE_B1F_ROOMS,$09,Show + db SS_ANNE_B1F_ROOMS,$0A,Show + db SS_ANNE_B1F_ROOMS,$0B,Show MapHSC6: - db VICTORY_ROAD_3,$05,Show - db VICTORY_ROAD_3,$06,Show - db VICTORY_ROAD_3,$0A,Show + db VICTORY_ROAD_3F,$05,Show + db VICTORY_ROAD_3F,$06,Show + db VICTORY_ROAD_3F,$0A,Show MapHSC7: - db ROCKET_HIDEOUT_1,$06,Show - db ROCKET_HIDEOUT_1,$07,Show + db ROCKET_HIDEOUT_B1F,$06,Show + db ROCKET_HIDEOUT_B1F,$07,Show MapHSC8: - db ROCKET_HIDEOUT_2,$02,Show - db ROCKET_HIDEOUT_2,$03,Show - db ROCKET_HIDEOUT_2,$04,Show - db ROCKET_HIDEOUT_2,$05,Show + db ROCKET_HIDEOUT_B2F,$02,Show + db ROCKET_HIDEOUT_B2F,$03,Show + db ROCKET_HIDEOUT_B2F,$04,Show + db ROCKET_HIDEOUT_B2F,$05,Show MapHSC9: - db ROCKET_HIDEOUT_3,$03,Show - db ROCKET_HIDEOUT_3,$04,Show + db ROCKET_HIDEOUT_B3F,$03,Show + db ROCKET_HIDEOUT_B3F,$04,Show MapHSCA: - db ROCKET_HIDEOUT_4,$01,Show - db ROCKET_HIDEOUT_4,$05,Show - db ROCKET_HIDEOUT_4,$06,Show - db ROCKET_HIDEOUT_4,$07,Show - db ROCKET_HIDEOUT_4,$08,Hide - db ROCKET_HIDEOUT_4,$09,Hide + db ROCKET_HIDEOUT_B4F,$01,Show + db ROCKET_HIDEOUT_B4F,$05,Show + db ROCKET_HIDEOUT_B4F,$06,Show + db ROCKET_HIDEOUT_B4F,$07,Show + db ROCKET_HIDEOUT_B4F,$08,Hide + db ROCKET_HIDEOUT_B4F,$09,Hide MapHSCF: db SILPH_CO_2F,$01,Show db SILPH_CO_2F,$02,Show @@ -515,18 +515,18 @@ MapHSEB: db SILPH_CO_11F,$04,Show db SILPH_CO_11F,$05,Show MapHSF4: - db $F4,$02,Show + db UNUSED_MAP_F4,$02,Show MapHSD6: - db MANSION_2,$02,Show + db POKEMON_MANSION_2F,$02,Show MapHSD7: - db MANSION_3,$03,Show - db MANSION_3,$04,Show + db POKEMON_MANSION_3F,$03,Show + db POKEMON_MANSION_3F,$04,Show MapHSD8: - db MANSION_4,$03,Show - db MANSION_4,$04,Show - db MANSION_4,$05,Show - db MANSION_4,$06,Show - db MANSION_4,$08,Show + db POKEMON_MANSION_B1F,$03,Show + db POKEMON_MANSION_B1F,$04,Show + db POKEMON_MANSION_B1F,$05,Show + db POKEMON_MANSION_B1F,$06,Show + db POKEMON_MANSION_B1F,$08,Show MapHSD9: db SAFARI_ZONE_EAST,$01,Show db SAFARI_ZONE_EAST,$02,Show @@ -543,35 +543,35 @@ MapHSDB: MapHSDC: db SAFARI_ZONE_CENTER,$01,Show MapHSE2: - db UNKNOWN_DUNGEON_2,$01,Show - db UNKNOWN_DUNGEON_2,$02,Show - db UNKNOWN_DUNGEON_2,$03,Show + db CERULEAN_CAVE_2F,$01,Show + db CERULEAN_CAVE_2F,$02,Show + db CERULEAN_CAVE_2F,$03,Show MapHSE3: - db UNKNOWN_DUNGEON_3,$01,Show - db UNKNOWN_DUNGEON_3,$02,Show - db UNKNOWN_DUNGEON_3,$03,Show + db CERULEAN_CAVE_B1F,$01,Show + db CERULEAN_CAVE_B1F,$02,Show + db CERULEAN_CAVE_B1F,$03,Show MapHS6C: - db VICTORY_ROAD_1,$03,Show - db VICTORY_ROAD_1,$04,Show + db VICTORY_ROAD_1F,$03,Show + db VICTORY_ROAD_1F,$04,Show MapHS78: db CHAMPIONS_ROOM,$02,Hide MapHSC0: - db SEAFOAM_ISLANDS_1,$01,Show - db SEAFOAM_ISLANDS_1,$02,Show + db SEAFOAM_ISLANDS_1F,$01,Show + db SEAFOAM_ISLANDS_1F,$02,Show MapHS9F: - db SEAFOAM_ISLANDS_2,$01,Hide - db SEAFOAM_ISLANDS_2,$02,Hide + db SEAFOAM_ISLANDS_B1F,$01,Hide + db SEAFOAM_ISLANDS_B1F,$02,Hide MapHSA0: - db SEAFOAM_ISLANDS_3,$01,Hide - db SEAFOAM_ISLANDS_3,$02,Hide + db SEAFOAM_ISLANDS_B2F,$01,Hide + db SEAFOAM_ISLANDS_B2F,$02,Hide MapHSA1: - db SEAFOAM_ISLANDS_4,$02,Show - db SEAFOAM_ISLANDS_4,$03,Show - db SEAFOAM_ISLANDS_4,$05,Hide - db SEAFOAM_ISLANDS_4,$06,Hide + db SEAFOAM_ISLANDS_B3F,$02,Show + db SEAFOAM_ISLANDS_B3F,$03,Show + db SEAFOAM_ISLANDS_B3F,$05,Hide + db SEAFOAM_ISLANDS_B3F,$06,Hide MapHSA2: - db SEAFOAM_ISLANDS_5,$01,Hide - db SEAFOAM_ISLANDS_5,$02,Hide - db SEAFOAM_ISLANDS_5,$03,Show + db SEAFOAM_ISLANDS_B4F,$01,Hide + db SEAFOAM_ISLANDS_B4F,$02,Hide + db SEAFOAM_ISLANDS_B4F,$03,Show db $FF,$01,Show diff --git a/data/mapHeaders/AgathasRoom.asm b/data/mapHeaders/AgathasRoom.asm new file mode 100755 index 00000000..73cd7291 --- /dev/null +++ b/data/mapHeaders/AgathasRoom.asm @@ -0,0 +1,8 @@ +AgathasRoom_h: + db CEMETERY ; tileset + db AGATHAS_ROOM_HEIGHT, AGATHAS_ROOM_WIDTH ; dimensions (y, x) + dw AgathasRoom_Blocks ; blocks + dw AgathasRoom_TextPointers ; texts + dw AgathasRoom_Script ; scripts + db 0 ; connections + dw AgathasRoom_Object ; objects diff --git a/data/mapHeaders/BikeShop.asm b/data/mapHeaders/BikeShop.asm new file mode 100755 index 00000000..c447fd80 --- /dev/null +++ b/data/mapHeaders/BikeShop.asm @@ -0,0 +1,8 @@ +BikeShop_h: + db CLUB ; tileset + db BIKE_SHOP_HEIGHT, BIKE_SHOP_WIDTH ; dimensions (y, x) + dw BikeShop_Blocks ; blocks + dw BikeShop_TextPointers ; texts + dw BikeShop_Script ; scripts + db 0 ; connections + dw BikeShop_Object ; objects diff --git a/data/mapHeaders/BillsHouse.asm b/data/mapHeaders/BillsHouse.asm new file mode 100755 index 00000000..bba9cf83 --- /dev/null +++ b/data/mapHeaders/BillsHouse.asm @@ -0,0 +1,8 @@ +BillsHouse_h: + db INTERIOR ; tileset + db BILLS_HOUSE_HEIGHT, BILLS_HOUSE_WIDTH ; dimensions (y, x) + dw BillsHouse_Blocks ; blocks + dw BillsHouse_TextPointers ; texts + dw BillsHouse_Script ; scripts + db 0 ; connections + dw BillsHouse_Object ; objects diff --git a/data/mapHeaders/BluesHouse.asm b/data/mapHeaders/BluesHouse.asm new file mode 100755 index 00000000..6ef0433e --- /dev/null +++ b/data/mapHeaders/BluesHouse.asm @@ -0,0 +1,8 @@ +BluesHouse_h: + db HOUSE ; tileset + db BLUES_HOUSE_HEIGHT, BLUES_HOUSE_WIDTH ; dimensions (y, x) + dw BluesHouse_Blocks ; blocks + dw BluesHouse_TextPointers ; texts + dw BluesHouse_Script ; scripts + db 0 ; connections + dw BluesHouse_Object ; objects diff --git a/data/mapHeaders/BrunosRoom.asm b/data/mapHeaders/BrunosRoom.asm new file mode 100755 index 00000000..78c7989d --- /dev/null +++ b/data/mapHeaders/BrunosRoom.asm @@ -0,0 +1,8 @@ +BrunosRoom_h: + db GYM ; tileset + db BRUNOS_ROOM_HEIGHT, BRUNOS_ROOM_WIDTH ; dimensions (y, x) + dw BrunosRoom_Blocks ; blocks + dw BrunosRoom_TextPointers ; texts + dw BrunosRoom_Script ; scripts + db 0 ; connections + dw BrunosRoom_Object ; objects diff --git a/data/mapHeaders/CeladonChiefHouse.asm b/data/mapHeaders/CeladonChiefHouse.asm new file mode 100755 index 00000000..a31c8121 --- /dev/null +++ b/data/mapHeaders/CeladonChiefHouse.asm @@ -0,0 +1,8 @@ +CeladonChiefHouse_h: + db MANSION ; tileset + db CELADON_CHIEF_HOUSE_HEIGHT, CELADON_CHIEF_HOUSE_WIDTH ; dimensions (y, x) + dw CeladonChiefHouse_Blocks ; blocks + dw CeladonChiefHouse_TextPointers ; texts + dw CeladonChiefHouse_Script ; scripts + db 0 ; connections + dw CeladonChiefHouse_Object ; objects diff --git a/data/mapHeaders/CeladonCity.asm b/data/mapHeaders/CeladonCity.asm new file mode 100755 index 00000000..62243d27 --- /dev/null +++ b/data/mapHeaders/CeladonCity.asm @@ -0,0 +1,10 @@ +CeladonCity_h: + db OVERWORLD ; tileset + db CELADON_CITY_HEIGHT, CELADON_CITY_WIDTH ; dimensions (y, x) + dw CeladonCity_Blocks ; blocks + dw CeladonCity_TextPointers ; texts + dw CeladonCity_Script ; scripts + db WEST | EAST ; connections + WEST_MAP_CONNECTION CELADON_CITY, ROUTE_16, 4, 0, Route16_Blocks + EAST_MAP_CONNECTION CELADON_CITY, ROUTE_7, 4, 0, Route7_Blocks, 1 + dw CeladonCity_Object ; objects diff --git a/data/mapHeaders/CeladonDiner.asm b/data/mapHeaders/CeladonDiner.asm new file mode 100755 index 00000000..d4220db7 --- /dev/null +++ b/data/mapHeaders/CeladonDiner.asm @@ -0,0 +1,8 @@ +CeladonDiner_h: + db LOBBY ; tileset + db CELADON_DINER_HEIGHT, CELADON_DINER_WIDTH ; dimensions (y, x) + dw CeladonDiner_Blocks ; blocks + dw CeladonDiner_TextPointers ; texts + dw CeladonDiner_Script ; scripts + db 0 ; connections + dw CeladonDiner_Object ; objects diff --git a/data/mapHeaders/CeladonGym.asm b/data/mapHeaders/CeladonGym.asm new file mode 100755 index 00000000..04a9427c --- /dev/null +++ b/data/mapHeaders/CeladonGym.asm @@ -0,0 +1,8 @@ +CeladonGym_h: + db GYM ; tileset + db CELADON_GYM_HEIGHT, CELADON_GYM_WIDTH ; dimensions (y, x) + dw CeladonGym_Blocks ; blocks + dw CeladonGym_TextPointers ; texts + dw CeladonGym_Script ; scripts + db 0 ; connections + dw CeladonGym_Object ; objects diff --git a/data/mapHeaders/CeladonHotel.asm b/data/mapHeaders/CeladonHotel.asm new file mode 100755 index 00000000..e06c2fd3 --- /dev/null +++ b/data/mapHeaders/CeladonHotel.asm @@ -0,0 +1,8 @@ +CeladonHotel_h: + db POKECENTER ; tileset + db CELADON_HOTEL_HEIGHT, CELADON_HOTEL_WIDTH ; dimensions (y, x) + dw CeladonHotel_Blocks ; blocks + dw CeladonHotel_TextPointers ; texts + dw CeladonHotel_Script ; scripts + db 0 ; connections + dw CeladonHotel_Object ; objects diff --git a/data/mapHeaders/CeladonMansion1F.asm b/data/mapHeaders/CeladonMansion1F.asm new file mode 100755 index 00000000..d2d0ee99 --- /dev/null +++ b/data/mapHeaders/CeladonMansion1F.asm @@ -0,0 +1,8 @@ +CeladonMansion1F_h: + db MANSION ; tileset + db CELADON_MANSION_1F_HEIGHT, CELADON_MANSION_1F_WIDTH ; dimensions (y, x) + dw CeladonMansion1F_Blocks ; blocks + dw CeladonMansion1F_TextPointers ; texts + dw CeladonMansion1F_Script ; scripts + db 0 ; connections + dw CeladonMansion1F_Object ; objects diff --git a/data/mapHeaders/CeladonMansion2F.asm b/data/mapHeaders/CeladonMansion2F.asm new file mode 100755 index 00000000..eceac30e --- /dev/null +++ b/data/mapHeaders/CeladonMansion2F.asm @@ -0,0 +1,8 @@ +CeladonMansion2F_h: + db MANSION ; tileset + db CELADON_MANSION_2F_HEIGHT, CELADON_MANSION_2F_WIDTH ; dimensions (y, x) + dw CeladonMansion2F_Blocks ; blocks + dw CeladonMansion2F_TextPointers ; texts + dw CeladonMansion2F_Script ; scripts + db 0 ; connections + dw CeladonMansion2F_Object ; objects diff --git a/data/mapHeaders/CeladonMansion3F.asm b/data/mapHeaders/CeladonMansion3F.asm new file mode 100755 index 00000000..b5a0a705 --- /dev/null +++ b/data/mapHeaders/CeladonMansion3F.asm @@ -0,0 +1,8 @@ +CeladonMansion3F_h: + db MANSION ; tileset + db CELADON_MANSION_3F_HEIGHT, CELADON_MANSION_3F_WIDTH ; dimensions (y, x) + dw CeladonMansion3F_Blocks ; blocks + dw CeladonMansion3F_TextPointers ; texts + dw CeladonMansion3F_Script ; scripts + db 0 ; connections + dw CeladonMansion3F_Object ; objects diff --git a/data/mapHeaders/CeladonMansionRoof.asm b/data/mapHeaders/CeladonMansionRoof.asm new file mode 100755 index 00000000..d7a050c8 --- /dev/null +++ b/data/mapHeaders/CeladonMansionRoof.asm @@ -0,0 +1,8 @@ +CeladonMansionRoof_h: + db MANSION ; tileset + db CELADON_MANSION_ROOF_HEIGHT, CELADON_MANSION_ROOF_WIDTH ; dimensions (y, x) + dw CeladonMansionRoof_Blocks ; blocks + dw CeladonMansionRoof_TextPointers ; texts + dw CeladonMansionRoof_Script ; scripts + db 0 ; connections + dw CeladonMansionRoof_Object ; objects diff --git a/data/mapHeaders/CeladonMansionRoofHouse.asm b/data/mapHeaders/CeladonMansionRoofHouse.asm new file mode 100755 index 00000000..7fcf49e1 --- /dev/null +++ b/data/mapHeaders/CeladonMansionRoofHouse.asm @@ -0,0 +1,8 @@ +CeladonMansionRoofHouse_h: + db HOUSE ; tileset + db CELADON_MANSION_ROOF_HOUSE_HEIGHT, CELADON_MANSION_ROOF_HOUSE_WIDTH ; dimensions (y, x) + dw CeladonMansionRoofHouse_Blocks ; blocks + dw CeladonMansionRoofHouse_TextPointers ; texts + dw CeladonMansionRoofHouse_Script ; scripts + db 0 ; connections + dw CeladonMansionRoofHouse_Object ; objects diff --git a/data/mapHeaders/CeladonMart1F.asm b/data/mapHeaders/CeladonMart1F.asm new file mode 100755 index 00000000..51e968fa --- /dev/null +++ b/data/mapHeaders/CeladonMart1F.asm @@ -0,0 +1,8 @@ +CeladonMart1F_h: + db LOBBY ; tileset + db CELADON_MART_1F_HEIGHT, CELADON_MART_1F_WIDTH ; dimensions (y, x) + dw CeladonMart1F_Blocks ; blocks + dw CeladonMart1F_TextPointers ; texts + dw CeladonMart1F_Script ; scripts + db 0 ; connections + dw CeladonMart1F_Object ; objects diff --git a/data/mapHeaders/CeladonMart2F.asm b/data/mapHeaders/CeladonMart2F.asm new file mode 100755 index 00000000..77106405 --- /dev/null +++ b/data/mapHeaders/CeladonMart2F.asm @@ -0,0 +1,8 @@ +CeladonMart2F_h: + db LOBBY ; tileset + db CELADON_MART_2F_HEIGHT, CELADON_MART_2F_WIDTH ; dimensions (y, x) + dw CeladonMart2F_Blocks ; blocks + dw CeladonMart2F_TextPointers ; texts + dw CeladonMart2F_Script ; scripts + db 0 ; connections + dw CeladonMart2F_Object ; objects diff --git a/data/mapHeaders/CeladonMart3F.asm b/data/mapHeaders/CeladonMart3F.asm new file mode 100755 index 00000000..c460945c --- /dev/null +++ b/data/mapHeaders/CeladonMart3F.asm @@ -0,0 +1,8 @@ +CeladonMart3F_h: + db LOBBY ; tileset + db CELADON_MART_3F_HEIGHT, CELADON_MART_3F_WIDTH ; dimensions (y, x) + dw CeladonMart3F_Blocks ; blocks + dw CeladonMart3F_TextPointers ; texts + dw CeladonMart3F_Script ; scripts + db 0 ; connections + dw CeladonMart3F_Object ; objects diff --git a/data/mapHeaders/CeladonMart4F.asm b/data/mapHeaders/CeladonMart4F.asm new file mode 100755 index 00000000..a742570b --- /dev/null +++ b/data/mapHeaders/CeladonMart4F.asm @@ -0,0 +1,8 @@ +CeladonMart4F_h: + db LOBBY ; tileset + db CELADON_MART_4F_HEIGHT, CELADON_MART_4F_WIDTH ; dimensions (y, x) + dw CeladonMart4F_Blocks ; blocks + dw CeladonMart4F_TextPointers ; texts + dw CeladonMart4F_Script ; scripts + db 0 ; connections + dw CeladonMart4F_Object ; objects diff --git a/data/mapHeaders/CeladonMart5F.asm b/data/mapHeaders/CeladonMart5F.asm new file mode 100755 index 00000000..4b5223e0 --- /dev/null +++ b/data/mapHeaders/CeladonMart5F.asm @@ -0,0 +1,8 @@ +CeladonMart5F_h: + db LOBBY ; tileset + db CELADON_MART_5F_HEIGHT, CELADON_MART_5F_WIDTH ; dimensions (y, x) + dw CeladonMart5F_Blocks ; blocks + dw CeladonMart5F_TextPointers ; texts + dw CeladonMart5F_Script ; scripts + db 0 ; connections + dw CeladonMart5F_Object ; objects diff --git a/data/mapHeaders/CeladonMartElevator.asm b/data/mapHeaders/CeladonMartElevator.asm new file mode 100755 index 00000000..06e87608 --- /dev/null +++ b/data/mapHeaders/CeladonMartElevator.asm @@ -0,0 +1,8 @@ +CeladonMartElevator_h: + db LOBBY ; tileset + db CELADON_MART_ELEVATOR_HEIGHT, CELADON_MART_ELEVATOR_WIDTH ; dimensions (y, x) + dw CeladonMartElevator_Blocks ; blocks + dw CeladonMartElevator_TextPointers ; texts + dw CeladonMartElevator_Script ; scripts + db 0 ; connections + dw CeladonMartElevator_Object ; objects diff --git a/data/mapHeaders/CeladonMartRoof.asm b/data/mapHeaders/CeladonMartRoof.asm new file mode 100755 index 00000000..163e25ed --- /dev/null +++ b/data/mapHeaders/CeladonMartRoof.asm @@ -0,0 +1,8 @@ +CeladonMartRoof_h: + db LOBBY ; tileset + db CELADON_MART_ROOF_HEIGHT, CELADON_MART_ROOF_WIDTH ; dimensions (y, x) + dw CeladonMartRoof_Blocks ; blocks + dw CeladonMartRoof_TextPointers ; texts + dw CeladonMartRoof_Script ; scripts + db 0 ; connections + dw CeladonMartRoof_Object ; objects diff --git a/data/mapHeaders/CeladonPokecenter.asm b/data/mapHeaders/CeladonPokecenter.asm new file mode 100755 index 00000000..b5d9bd73 --- /dev/null +++ b/data/mapHeaders/CeladonPokecenter.asm @@ -0,0 +1,8 @@ +CeladonPokecenter_h: + db POKECENTER ; tileset + db CELADON_POKECENTER_HEIGHT, CELADON_POKECENTER_WIDTH ; dimensions (y, x) + dw CeladonPokecenter_Blocks ; blocks + dw CeladonPokecenter_TextPointers ; texts + dw CeladonPokecenter_Script ; scripts + db 0 ; connections + dw CeladonPokecenter_Object ; objects diff --git a/data/mapHeaders/CeruleanBadgeHouse.asm b/data/mapHeaders/CeruleanBadgeHouse.asm new file mode 100755 index 00000000..a94f1912 --- /dev/null +++ b/data/mapHeaders/CeruleanBadgeHouse.asm @@ -0,0 +1,8 @@ +CeruleanBadgeHouse_h: + db SHIP ; tileset + db CERULEAN_BADGE_HOUSE_HEIGHT, CERULEAN_BADGE_HOUSE_WIDTH ; dimensions (y, x) + dw CeruleanBadgeHouse_Blocks ; blocks + dw CeruleanBadgeHouse_TextPointers ; texts + dw CeruleanBadgeHouse_Script ; scripts + db 0 ; connections + dw CeruleanBadgeHouse_Object ; objects diff --git a/data/mapHeaders/CeruleanCave1F.asm b/data/mapHeaders/CeruleanCave1F.asm new file mode 100755 index 00000000..932dfb48 --- /dev/null +++ b/data/mapHeaders/CeruleanCave1F.asm @@ -0,0 +1,8 @@ +CeruleanCave1F_h: + db CAVERN ; tileset + db CERULEAN_CAVE_1F_HEIGHT, CERULEAN_CAVE_1F_WIDTH ; dimensions (y, x) + dw CeruleanCave1F_Blocks ; blocks + dw CeruleanCave1F_TextPointers ; texts + dw CeruleanCave1F_Script ; scripts + db 0 ; connections + dw CeruleanCave1F_Object ; objects diff --git a/data/mapHeaders/CeruleanCave2F.asm b/data/mapHeaders/CeruleanCave2F.asm new file mode 100755 index 00000000..7cf82371 --- /dev/null +++ b/data/mapHeaders/CeruleanCave2F.asm @@ -0,0 +1,8 @@ +CeruleanCave2F_h: + db CAVERN ; tileset + db CERULEAN_CAVE_2F_HEIGHT, CERULEAN_CAVE_2F_WIDTH ; dimensions (y, x) + dw CeruleanCave2F_Blocks ; blocks + dw CeruleanCave2F_TextPointers ; texts + dw CeruleanCave2F_Script ; scripts + db 0 ; connections + dw CeruleanCave2F_Object ; objects diff --git a/data/mapHeaders/CeruleanCaveB1F.asm b/data/mapHeaders/CeruleanCaveB1F.asm new file mode 100755 index 00000000..eb940faa --- /dev/null +++ b/data/mapHeaders/CeruleanCaveB1F.asm @@ -0,0 +1,8 @@ +CeruleanCaveB1F_h: + db CAVERN ; tileset + db CERULEAN_CAVE_B1F_HEIGHT, CERULEAN_CAVE_B1F_WIDTH ; dimensions (y, x) + dw CeruleanCaveB1F_Blocks ; blocks + dw CeruleanCaveB1F_TextPointers ; texts + dw CeruleanCaveB1F_Script ; scripts + db 0 ; connections + dw CeruleanCaveB1F_Object ; objects diff --git a/data/mapHeaders/CeruleanCity.asm b/data/mapHeaders/CeruleanCity.asm new file mode 100755 index 00000000..cd5444ab --- /dev/null +++ b/data/mapHeaders/CeruleanCity.asm @@ -0,0 +1,12 @@ +CeruleanCity_h: + db OVERWORLD ; tileset + db CERULEAN_CITY_HEIGHT, CERULEAN_CITY_WIDTH ; dimensions (y, x) + dw CeruleanCity_Blocks ; blocks + dw CeruleanCity_TextPointers ; texts + dw CeruleanCity_Script ; scripts + db NORTH | SOUTH | WEST | EAST ; connections + NORTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_24, 5, 0, Route24_Blocks + SOUTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_5, 5, 0, Route5_Blocks, 1 + WEST_MAP_CONNECTION CERULEAN_CITY, ROUTE_4, 4, 0, Route4_Blocks + EAST_MAP_CONNECTION CERULEAN_CITY, ROUTE_9, 4, 0, Route9_Blocks + dw CeruleanCity_Object ; objects diff --git a/data/mapHeaders/CeruleanGym.asm b/data/mapHeaders/CeruleanGym.asm new file mode 100755 index 00000000..3bdb0283 --- /dev/null +++ b/data/mapHeaders/CeruleanGym.asm @@ -0,0 +1,8 @@ +CeruleanGym_h: + db GYM ; tileset + db CERULEAN_GYM_HEIGHT, CERULEAN_GYM_WIDTH ; dimensions (y, x) + dw CeruleanGym_Blocks ; blocks + dw CeruleanGym_TextPointers ; texts + dw CeruleanGym_Script ; scripts + db 0 ; connections + dw CeruleanGym_Object ; objects diff --git a/data/mapHeaders/CeruleanMart.asm b/data/mapHeaders/CeruleanMart.asm new file mode 100755 index 00000000..f020d4a3 --- /dev/null +++ b/data/mapHeaders/CeruleanMart.asm @@ -0,0 +1,8 @@ +CeruleanMart_h: + db MART ; tileset + db CERULEAN_MART_HEIGHT, CERULEAN_MART_WIDTH ; dimensions (y, x) + dw CeruleanMart_Blocks ; blocks + dw CeruleanMart_TextPointers ; texts + dw CeruleanMart_Script ; scripts + db 0 ; connections + dw CeruleanMart_Object ; objects diff --git a/data/mapHeaders/CeruleanPokecenter.asm b/data/mapHeaders/CeruleanPokecenter.asm new file mode 100755 index 00000000..3286acbb --- /dev/null +++ b/data/mapHeaders/CeruleanPokecenter.asm @@ -0,0 +1,8 @@ +CeruleanPokecenter_h: + db POKECENTER ; tileset + db CERULEAN_POKECENTER_HEIGHT, CERULEAN_POKECENTER_WIDTH ; dimensions (y, x) + dw CeruleanPokecenter_Blocks ; blocks + dw CeruleanPokecenter_TextPointers ; texts + dw CeruleanPokecenter_Script ; scripts + db 0 ; connections + dw CeruleanPokecenter_Object ; objects diff --git a/data/mapHeaders/CeruleanTradeHouse.asm b/data/mapHeaders/CeruleanTradeHouse.asm new file mode 100755 index 00000000..23c5062c --- /dev/null +++ b/data/mapHeaders/CeruleanTradeHouse.asm @@ -0,0 +1,8 @@ +CeruleanTradeHouse_h: + db HOUSE ; tileset + db CERULEAN_TRADE_HOUSE_HEIGHT, CERULEAN_TRADE_HOUSE_WIDTH ; dimensions (y, x) + dw CeruleanTradeHouse_Blocks ; blocks + dw CeruleanTradeHouse_TextPointers ; texts + dw CeruleanTradeHouse_Script ; scripts + db 0 ; connections + dw CeruleanTradeHouse_Object ; objects diff --git a/data/mapHeaders/CeruleanTrashedHouse.asm b/data/mapHeaders/CeruleanTrashedHouse.asm new file mode 100755 index 00000000..e105b1ed --- /dev/null +++ b/data/mapHeaders/CeruleanTrashedHouse.asm @@ -0,0 +1,8 @@ +CeruleanTrashedHouse_h: + db HOUSE ; tileset + db CERULEAN_TRASHED_HOUSE_HEIGHT, CERULEAN_TRASHED_HOUSE_WIDTH ; dimensions (y, x) + dw CeruleanTrashedHouse_Blocks ; blocks + dw CeruleanTrashedHouse_TextPointers ; texts + dw CeruleanTrashedHouse_Script ; scripts + db 0 ; connections + dw CeruleanTrashedHouse_Object ; objects diff --git a/data/mapHeaders/ChampionsRoom.asm b/data/mapHeaders/ChampionsRoom.asm new file mode 100755 index 00000000..a22b236a --- /dev/null +++ b/data/mapHeaders/ChampionsRoom.asm @@ -0,0 +1,8 @@ +ChampionsRoom_h: + db GYM ; tileset + db CHAMPIONS_ROOM_HEIGHT, CHAMPIONS_ROOM_WIDTH ; dimensions (y, x) + dw ChampionsRoom_Blocks ; blocks + dw ChampionsRoom_TextPointers ; texts + dw ChampionsRoom_Script ; scripts + db $0 ; connections + dw ChampionsRoom_Object ; objects diff --git a/data/mapHeaders/CinnabarGym.asm b/data/mapHeaders/CinnabarGym.asm new file mode 100755 index 00000000..e871b8f3 --- /dev/null +++ b/data/mapHeaders/CinnabarGym.asm @@ -0,0 +1,8 @@ +CinnabarGym_h: + db FACILITY ; tileset + db CINNABAR_GYM_HEIGHT, CINNABAR_GYM_WIDTH ; dimensions (y, x) + dw CinnabarGym_Blocks ; blocks + dw CinnabarGym_TextPointers ; texts + dw CinnabarGym_Script ; scripts + db 0 ; connections + dw CinnabarGym_Object ; objects diff --git a/data/mapHeaders/CinnabarIsland.asm b/data/mapHeaders/CinnabarIsland.asm new file mode 100755 index 00000000..b8c5d7d4 --- /dev/null +++ b/data/mapHeaders/CinnabarIsland.asm @@ -0,0 +1,10 @@ +CinnabarIsland_h: + db OVERWORLD ; tileset + db CINNABAR_ISLAND_HEIGHT, CINNABAR_ISLAND_WIDTH ; dimensions (y, x) + dw CinnabarIsland_Blocks ; blocks + dw CinnabarIsland_TextPointers ; texts + dw CinnabarIsland_Script ; scripts + db NORTH | EAST ; connections + NORTH_MAP_CONNECTION CINNABAR_ISLAND, ROUTE_21, 0, 0, Route21_Blocks + EAST_MAP_CONNECTION CINNABAR_ISLAND, ROUTE_20, 0, 0, Route20_Blocks + dw CinnabarIsland_Object ; objects diff --git a/data/mapHeaders/CinnabarLab.asm b/data/mapHeaders/CinnabarLab.asm new file mode 100755 index 00000000..c1167960 --- /dev/null +++ b/data/mapHeaders/CinnabarLab.asm @@ -0,0 +1,8 @@ +CinnabarLab_h: + db LAB ; tileset + db CINNABAR_LAB_HEIGHT, CINNABAR_LAB_WIDTH ; dimensions (y, x) + dw CinnabarLab_Blocks ; blocks + dw CinnabarLab_TextPointers ; texts + dw CinnabarLab_Script ; scripts + db 0 ; connections + dw CinnabarLab_Object ; objects diff --git a/data/mapHeaders/CinnabarLabFossilRoom.asm b/data/mapHeaders/CinnabarLabFossilRoom.asm new file mode 100755 index 00000000..4ac2963b --- /dev/null +++ b/data/mapHeaders/CinnabarLabFossilRoom.asm @@ -0,0 +1,8 @@ +CinnabarLabFossilRoom_h: + db LAB ; tileset + db CINNABAR_LAB_FOSSIL_ROOM_HEIGHT, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; dimensions (y, x) + dw CinnabarLabFossilRoom_Blocks ; blocks + dw CinnabarLabFossilRoom_TextPointers ; texts + dw CinnabarLabFossilRoom_Script ; scripts + db 0 ; connections + dw CinnabarLabFossilRoom_Object ; objects diff --git a/data/mapHeaders/CinnabarLabMetronomeRoom.asm b/data/mapHeaders/CinnabarLabMetronomeRoom.asm new file mode 100755 index 00000000..8eb9e502 --- /dev/null +++ b/data/mapHeaders/CinnabarLabMetronomeRoom.asm @@ -0,0 +1,8 @@ +CinnabarLabMetronomeRoom_h: + db LAB ; tileset + db CINNABAR_LAB_METRONOME_ROOM_HEIGHT, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; dimensions (y, x) + dw CinnabarLabMetronomeRoom_Blocks ; blocks + dw CinnabarLabMetronomeRoom_TextPointers ; texts + dw CinnabarLabMetronomeRoom_Script ; scripts + db 0 ; connections + dw CinnabarLabMetronomeRoom_Object ; objects diff --git a/data/mapHeaders/CinnabarLabTradeRoom.asm b/data/mapHeaders/CinnabarLabTradeRoom.asm new file mode 100755 index 00000000..1e0ffd0e --- /dev/null +++ b/data/mapHeaders/CinnabarLabTradeRoom.asm @@ -0,0 +1,8 @@ +CinnabarLabTradeRoom_h: + db LAB ; tileset + db CINNABAR_LAB_TRADE_ROOM_HEIGHT, CINNABAR_LAB_TRADE_ROOM_WIDTH ; dimensions (y, x) + dw CinnabarLabTradeRoom_Blocks ; blocks + dw CinnabarLabTradeRoom_TextPointers ; texts + dw CinnabarLabTradeRoom_Script ; scripts + db 0 ; connections + dw CinnabarLabTradeRoom_Object ; objects diff --git a/data/mapHeaders/CinnabarMart.asm b/data/mapHeaders/CinnabarMart.asm new file mode 100755 index 00000000..5833b2ef --- /dev/null +++ b/data/mapHeaders/CinnabarMart.asm @@ -0,0 +1,8 @@ +CinnabarMart_h: + db MART ; tileset + db CINNABAR_MART_HEIGHT, CINNABAR_MART_WIDTH ; dimensions (y, x) + dw CinnabarMart_Blocks ; blocks + dw CinnabarMart_TextPointers ; texts + dw CinnabarMart_Script ; scripts + db 0 ; connections + dw CinnabarMart_Object ; objects diff --git a/data/mapHeaders/CinnabarPokecenter.asm b/data/mapHeaders/CinnabarPokecenter.asm new file mode 100755 index 00000000..9c54b9b9 --- /dev/null +++ b/data/mapHeaders/CinnabarPokecenter.asm @@ -0,0 +1,8 @@ +CinnabarPokecenter_h: + db POKECENTER ; tileset + db CINNABAR_POKECENTER_HEIGHT, CINNABAR_POKECENTER_WIDTH ; dimensions (y, x) + dw CinnabarPokecenter_Blocks ; blocks + dw CinnabarPokecenter_TextPointers ; texts + dw CinnabarPokecenter_Script ; scripts + db 0 ; connections + dw CinnabarPokecenter_Object ; objects diff --git a/data/mapHeaders/Colosseum.asm b/data/mapHeaders/Colosseum.asm new file mode 100755 index 00000000..9b106204 --- /dev/null +++ b/data/mapHeaders/Colosseum.asm @@ -0,0 +1,8 @@ +Colosseum_h: + db CLUB ; tileset + db COLOSSEUM_HEIGHT, COLOSSEUM_WIDTH ; dimensions (y, x) + dw Colosseum_Blocks ; blocks + dw Colosseum_TextPointers ; texts + dw Colosseum_Script ; scripts + db 0 ; connections + dw Colosseum_Object ; objects diff --git a/data/mapHeaders/CopycatsHouse1F.asm b/data/mapHeaders/CopycatsHouse1F.asm new file mode 100755 index 00000000..f3cfc261 --- /dev/null +++ b/data/mapHeaders/CopycatsHouse1F.asm @@ -0,0 +1,8 @@ +CopycatsHouse1F_h: + db REDS_HOUSE_1 ; tileset + db COPYCATS_HOUSE_1F_HEIGHT, COPYCATS_HOUSE_1F_WIDTH ; dimensions (y, x) + dw CopycatsHouse1F_Blocks ; blocks + dw CopycatsHouse1F_TextPointers ; texts + dw CopycatsHouse1F_Script ; scripts + db 0 ; connections + dw CopycatsHouse1F_Object ; objects diff --git a/data/mapHeaders/CopycatsHouse2F.asm b/data/mapHeaders/CopycatsHouse2F.asm new file mode 100755 index 00000000..453ba455 --- /dev/null +++ b/data/mapHeaders/CopycatsHouse2F.asm @@ -0,0 +1,8 @@ +CopycatsHouse2F_h: + db REDS_HOUSE_2 ; tileset + db COPYCATS_HOUSE_2F_HEIGHT, COPYCATS_HOUSE_2F_WIDTH ; dimensions (y, x) + dw CopycatsHouse2F_Blocks ; blocks + dw CopycatsHouse2F_TextPointers ; texts + dw CopycatsHouse2F_Script ; scripts + db 0 ; connections + dw CopycatsHouse2F_Object ; objects diff --git a/data/mapHeaders/Daycare.asm b/data/mapHeaders/Daycare.asm new file mode 100755 index 00000000..2fb7a771 --- /dev/null +++ b/data/mapHeaders/Daycare.asm @@ -0,0 +1,8 @@ +Daycare_h: + db HOUSE ; tileset + db DAYCARE_HEIGHT, DAYCARE_WIDTH ; dimensions (y, x) + dw Daycare_Blocks ; blocks + dw Daycare_TextPointers ; texts + dw Daycare_Script ; scripts + db 0 ; connections + dw Daycare_Object ; objects diff --git a/data/mapHeaders/DiglettsCave.asm b/data/mapHeaders/DiglettsCave.asm new file mode 100755 index 00000000..096019de --- /dev/null +++ b/data/mapHeaders/DiglettsCave.asm @@ -0,0 +1,8 @@ +DiglettsCave_h: + db CAVERN ; tileset + db DIGLETTS_CAVE_HEIGHT, DIGLETTS_CAVE_WIDTH ; dimensions (y, x) + dw DiglettsCave_Blocks ; blocks + dw DiglettsCave_TextPointers ; texts + dw DiglettsCave_Script ; scripts + db 0 ; connections + dw DiglettsCave_Object ; objects diff --git a/data/mapHeaders/DiglettsCaveRoute11.asm b/data/mapHeaders/DiglettsCaveRoute11.asm new file mode 100755 index 00000000..363859b2 --- /dev/null +++ b/data/mapHeaders/DiglettsCaveRoute11.asm @@ -0,0 +1,8 @@ +DiglettsCaveRoute11_h: + db CAVERN ; tileset + db DIGLETTS_CAVE_ROUTE_11_HEIGHT, DIGLETTS_CAVE_ROUTE_11_WIDTH ; dimensions (y, x) + dw DiglettsCaveRoute11_Blocks ; blocks + dw DiglettsCaveRoute11_TextPointers ; texts + dw DiglettsCaveRoute11_Script ; scripts + db 0 ; connections + dw DiglettsCaveRoute11_Object ; objects diff --git a/data/mapHeaders/DiglettsCaveRoute2.asm b/data/mapHeaders/DiglettsCaveRoute2.asm new file mode 100755 index 00000000..c977415b --- /dev/null +++ b/data/mapHeaders/DiglettsCaveRoute2.asm @@ -0,0 +1,8 @@ +DiglettsCaveRoute2_h: + db CAVERN ; tileset + db DIGLETTS_CAVE_ROUTE_2_HEIGHT, DIGLETTS_CAVE_ROUTE_2_WIDTH ; dimensions (y, x) + dw DiglettsCaveRoute2_Blocks ; blocks + dw DiglettsCaveRoute2_TextPointers ; texts + dw DiglettsCaveRoute2_Script ; scripts + db 0 ; connections + dw DiglettsCaveRoute2_Object ; objects diff --git a/data/mapHeaders/FightingDojo.asm b/data/mapHeaders/FightingDojo.asm new file mode 100755 index 00000000..5c802843 --- /dev/null +++ b/data/mapHeaders/FightingDojo.asm @@ -0,0 +1,8 @@ +FightingDojo_h: + db DOJO ; tileset + db FIGHTING_DOJO_HEIGHT, FIGHTING_DOJO_WIDTH ; dimensions (y, x) + dw FightingDojo_Blocks ; blocks + dw FightingDojo_TextPointers ; texts + dw FightingDojo_Script ; scripts + db 0 ; connections + dw FightingDojo_Object ; objects diff --git a/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm b/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm new file mode 100755 index 00000000..bc4fe8e6 --- /dev/null +++ b/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm @@ -0,0 +1,8 @@ +FuchsiaBillsGrandpasHouse_h: + db HOUSE ; tileset + db FUCHSIA_BILLS_GRANDPAS_HOUSE_HEIGHT, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH ; dimensions (y, x) + dw FuchsiaBillsGrandpasHouse_Blocks ; blocks + dw FuchsiaBillsGrandpasHouse_TextPointers ; texts + dw FuchsiaBillsGrandpasHouse_Script ; scripts + db 0 ; connections + dw FuchsiaBillsGrandpasHouse_Object ; objects diff --git a/data/mapHeaders/FuchsiaCity.asm b/data/mapHeaders/FuchsiaCity.asm new file mode 100755 index 00000000..87398877 --- /dev/null +++ b/data/mapHeaders/FuchsiaCity.asm @@ -0,0 +1,11 @@ +FuchsiaCity_h: + db OVERWORLD ; tileset + db FUCHSIA_CITY_HEIGHT, FUCHSIA_CITY_WIDTH ; dimensions (y, x) + dw FuchsiaCity_Blocks ; blocks + dw FuchsiaCity_TextPointers ; texts + dw FuchsiaCity_Script ; scripts + db SOUTH | WEST | EAST ; connections + SOUTH_MAP_CONNECTION FUCHSIA_CITY, ROUTE_19, 5, 0, Route19_Blocks + WEST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_18, 4, 0, Route18_Blocks + EAST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_15, 4, 0, Route15_Blocks + dw FuchsiaCity_Object ; objects diff --git a/data/mapHeaders/FuchsiaGoodRodHouse.asm b/data/mapHeaders/FuchsiaGoodRodHouse.asm new file mode 100755 index 00000000..4871970e --- /dev/null +++ b/data/mapHeaders/FuchsiaGoodRodHouse.asm @@ -0,0 +1,8 @@ +FuchsiaGoodRodHouse_h: + db SHIP ; tileset + db FUCHSIA_GOOD_ROD_HOUSE_HEIGHT, FUCHSIA_GOOD_ROD_HOUSE_WIDTH ; dimensions (y, x) + dw FuchsiaGoodRodHouse_Blocks ; blocks + dw FuchsiaGoodRodHouse_TextPointers ; texts + dw FuchsiaGoodRodHouse_Script ; scripts + db 0 ; connections + dw FuchsiaGoodRodHouse_Object ; objects diff --git a/data/mapHeaders/FuchsiaGym.asm b/data/mapHeaders/FuchsiaGym.asm new file mode 100755 index 00000000..71ef5960 --- /dev/null +++ b/data/mapHeaders/FuchsiaGym.asm @@ -0,0 +1,8 @@ +FuchsiaGym_h: + db GYM ; tileset + db FUCHSIA_GYM_HEIGHT, FUCHSIA_GYM_WIDTH ; dimensions (y, x) + dw FuchsiaGym_Blocks ; blocks + dw FuchsiaGym_TextPointers ; texts + dw FuchsiaGym_Script ; scripts + db 0 ; connections + dw FuchsiaGym_Object ; objects diff --git a/data/mapHeaders/FuchsiaMart.asm b/data/mapHeaders/FuchsiaMart.asm new file mode 100755 index 00000000..7c1c34d2 --- /dev/null +++ b/data/mapHeaders/FuchsiaMart.asm @@ -0,0 +1,8 @@ +FuchsiaMart_h: + db MART ; tileset + db FUCHSIA_MART_HEIGHT, FUCHSIA_MART_WIDTH ; dimensions (y, x) + dw FuchsiaMart_Blocks ; blocks + dw FuchsiaMart_TextPointers ; texts + dw FuchsiaMart_Script ; scripts + db 0 ; connections + dw FuchsiaMart_Object ; objects diff --git a/data/mapHeaders/FuchsiaMeetingRoom.asm b/data/mapHeaders/FuchsiaMeetingRoom.asm new file mode 100755 index 00000000..8bc0cdbf --- /dev/null +++ b/data/mapHeaders/FuchsiaMeetingRoom.asm @@ -0,0 +1,8 @@ +FuchsiaMeetingRoom_h: + db LAB ; tileset + db FUCHSIA_MEETING_ROOM_HEIGHT, FUCHSIA_MEETING_ROOM_WIDTH ; dimensions (y, x) + dw FuchsiaMeetingRoom_Blocks ; blocks + dw FuchsiaMeetingRoom_TextPointers ; texts + dw FuchsiaMeetingRoom_Script ; scripts + db 0 ; connections + dw FuchsiaMeetingRoom_Object ; objects diff --git a/data/mapHeaders/FuchsiaPokecenter.asm b/data/mapHeaders/FuchsiaPokecenter.asm new file mode 100755 index 00000000..bf654ea6 --- /dev/null +++ b/data/mapHeaders/FuchsiaPokecenter.asm @@ -0,0 +1,8 @@ +FuchsiaPokecenter_h: + db POKECENTER ; tileset + db FUCHSIA_POKECENTER_HEIGHT, FUCHSIA_POKECENTER_WIDTH ; dimensions (y, x) + dw FuchsiaPokecenter_Blocks ; blocks + dw FuchsiaPokecenter_TextPointers ; texts + dw FuchsiaPokecenter_Script ; scripts + db 0 ; connections + dw FuchsiaPokecenter_Object ; objects diff --git a/data/mapHeaders/GameCorner.asm b/data/mapHeaders/GameCorner.asm new file mode 100755 index 00000000..c8b69724 --- /dev/null +++ b/data/mapHeaders/GameCorner.asm @@ -0,0 +1,8 @@ +GameCorner_h: + db LOBBY ; tileset + db GAME_CORNER_HEIGHT, GAME_CORNER_WIDTH ; dimensions (y, x) + dw GameCorner_Blocks ; blocks + dw GameCorner_TextPointers ; texts + dw GameCorner_Script ; scripts + db 0 ; connections + dw GameCorner_Object ; objects diff --git a/data/mapHeaders/GameCornerPrizeRoom.asm b/data/mapHeaders/GameCornerPrizeRoom.asm new file mode 100755 index 00000000..e43d2ec7 --- /dev/null +++ b/data/mapHeaders/GameCornerPrizeRoom.asm @@ -0,0 +1,8 @@ +GameCornerPrizeRoom_h: + db LOBBY ; tileset + db GAME_CORNER_PRIZE_ROOM_HEIGHT, GAME_CORNER_PRIZE_ROOM_WIDTH ; dimensions (y, x) + dw GameCornerPrizeRoom_Blocks ; blocks + dw GameCornerPrizeRoom_TextPointers ; texts + dw GameCornerPrizeRoom_Script ; scripts + db 0 ; connections + dw GameCornerPrizeRoom_Object ; objects diff --git a/data/mapHeaders/HallOfFame.asm b/data/mapHeaders/HallOfFame.asm new file mode 100755 index 00000000..e7f7a982 --- /dev/null +++ b/data/mapHeaders/HallOfFame.asm @@ -0,0 +1,8 @@ +HallOfFame_h: + db GYM ; tileset + db HALL_OF_FAME_HEIGHT, HALL_OF_FAME_WIDTH ; dimensions (y, x) + dw HallOfFame_Blocks ; blocks + dw HallOfFame_TextPointers ; texts + dw HallOfFame_Script ; scripts + db 0 ; connections + dw HallOfFame_Object ; objects diff --git a/data/mapHeaders/IndigoPlateau.asm b/data/mapHeaders/IndigoPlateau.asm new file mode 100755 index 00000000..ee8b2f0c --- /dev/null +++ b/data/mapHeaders/IndigoPlateau.asm @@ -0,0 +1,9 @@ +IndigoPlateau_h: + db PLATEAU ; tileset + db INDIGO_PLATEAU_HEIGHT, INDIGO_PLATEAU_WIDTH ; dimensions (y, x) + dw IndigoPlateau_Blocks ; blocks + dw IndigoPlateau_TextPointers ; texts + dw IndigoPlateau_Script ; scripts + db SOUTH ; connections + SOUTH_MAP_CONNECTION INDIGO_PLATEAU, ROUTE_23, 0, 0, Route23_Blocks + dw IndigoPlateau_Object ; objects diff --git a/data/mapHeaders/IndigoPlateauLobby.asm b/data/mapHeaders/IndigoPlateauLobby.asm new file mode 100755 index 00000000..f099c87d --- /dev/null +++ b/data/mapHeaders/IndigoPlateauLobby.asm @@ -0,0 +1,8 @@ +IndigoPlateauLobby_h: + db MART ; tileset + db INDIGO_PLATEAU_LOBBY_HEIGHT, INDIGO_PLATEAU_LOBBY_WIDTH ; dimensions (y, x) + dw IndigoPlateauLobby_Blocks ; blocks + dw IndigoPlateauLobby_TextPointers ; texts + dw IndigoPlateauLobby_Script ; scripts + db 0 ; connections + dw IndigoPlateauLobby_Object ; objects diff --git a/data/mapHeaders/LancesRoom.asm b/data/mapHeaders/LancesRoom.asm new file mode 100755 index 00000000..a9cea4b6 --- /dev/null +++ b/data/mapHeaders/LancesRoom.asm @@ -0,0 +1,8 @@ +LancesRoom_h: + db DOJO ; tileset + db LANCES_ROOM_HEIGHT, LANCES_ROOM_WIDTH ; dimensions (y, x) + dw LancesRoom_Blocks ; blocks + dw LancesRoom_TextPointers ; texts + dw LancesRoom_Script ; scripts + db 0 ; connections + dw LancesRoom_Object ; objects diff --git a/data/mapHeaders/LavenderCuboneHouse.asm b/data/mapHeaders/LavenderCuboneHouse.asm new file mode 100755 index 00000000..06e9cb40 --- /dev/null +++ b/data/mapHeaders/LavenderCuboneHouse.asm @@ -0,0 +1,8 @@ +LavenderCuboneHouse_h: + db HOUSE ; tileset + db LAVENDER_CUBONE_HOUSE_HEIGHT, LAVENDER_CUBONE_HOUSE_WIDTH ; dimensions (y, x) + dw LavenderCuboneHouse_Blocks ; blocks + dw LavenderCuboneHouse_TextPointers ; texts + dw LavenderCuboneHouse_Script ; scripts + db 0 ; connections + dw LavenderCuboneHouse_Object ; objects diff --git a/data/mapHeaders/LavenderMart.asm b/data/mapHeaders/LavenderMart.asm new file mode 100755 index 00000000..c6869d3c --- /dev/null +++ b/data/mapHeaders/LavenderMart.asm @@ -0,0 +1,8 @@ +LavenderMart_h: + db MART ; tileset + db LAVENDER_MART_HEIGHT, LAVENDER_MART_WIDTH ; dimensions (y, x) + dw LavenderMart_Blocks ; blocks + dw LavenderMart_TextPointers ; texts + dw LavenderMart_Script ; scripts + db 0 ; connections + dw LavenderMart_Object ; objects diff --git a/data/mapHeaders/LavenderPokecenter.asm b/data/mapHeaders/LavenderPokecenter.asm new file mode 100755 index 00000000..820e19cd --- /dev/null +++ b/data/mapHeaders/LavenderPokecenter.asm @@ -0,0 +1,8 @@ +LavenderPokecenter_h: + db POKECENTER ; tileset + db LAVENDER_POKECENTER_HEIGHT, LAVENDER_POKECENTER_WIDTH ; dimensions (y, x) + dw LavenderPokecenter_Blocks ; blocks + dw LavenderPokecenter_TextPointers ; texts + dw LavenderPokecenter_Script ; scripts + db 0 ; connections + dw LavenderPokecenter_Object ; objects diff --git a/data/mapHeaders/LavenderTown.asm b/data/mapHeaders/LavenderTown.asm new file mode 100755 index 00000000..99c9515d --- /dev/null +++ b/data/mapHeaders/LavenderTown.asm @@ -0,0 +1,11 @@ +LavenderTown_h: + db OVERWORLD ; tileset + db LAVENDER_TOWN_HEIGHT, LAVENDER_TOWN_WIDTH ; dimensions (y, x) + dw LavenderTown_Blocks ; blocks + dw LavenderTown_TextPointers ; texts + dw LavenderTown_Script ; scripts + db NORTH | SOUTH | WEST ; connections + NORTH_MAP_CONNECTION LAVENDER_TOWN, ROUTE_10, 0, 0, Route10_Blocks + SOUTH_MAP_CONNECTION LAVENDER_TOWN, ROUTE_12, 0, 0, Route12_Blocks, 1 + WEST_MAP_CONNECTION LAVENDER_TOWN, ROUTE_8, 0, 0, Route8_Blocks + dw LavenderTown_Object ; objects diff --git a/data/mapHeaders/LoreleisRoom.asm b/data/mapHeaders/LoreleisRoom.asm new file mode 100755 index 00000000..216b6621 --- /dev/null +++ b/data/mapHeaders/LoreleisRoom.asm @@ -0,0 +1,8 @@ +LoreleisRoom_h: + db GYM ; tileset + db LORELEIS_ROOM_HEIGHT, LORELEIS_ROOM_WIDTH ; dimensions (y, x) + dw LoreleisRoom_Blocks ; blocks + dw LoreleisRoom_TextPointers ; texts + dw LoreleisRoom_Script ; scripts + db 0 ; connections + dw LoreleisRoom_Object ; objects diff --git a/data/mapHeaders/MrFujisHouse.asm b/data/mapHeaders/MrFujisHouse.asm new file mode 100755 index 00000000..4ae9c5b7 --- /dev/null +++ b/data/mapHeaders/MrFujisHouse.asm @@ -0,0 +1,8 @@ +MrFujisHouse_h: + db HOUSE ; tileset + db MR_FUJIS_HOUSE_HEIGHT, MR_FUJIS_HOUSE_WIDTH ; dimensions (y, x) + dw MrFujisHouse_Blocks ; blocks + dw MrFujisHouse_TextPointers ; texts + dw MrFujisHouse_Script ; scripts + db 0 ; connections + dw MrFujisHouse_Object ; objects diff --git a/data/mapHeaders/MrPsychicsHouse.asm b/data/mapHeaders/MrPsychicsHouse.asm new file mode 100755 index 00000000..5e4ce91b --- /dev/null +++ b/data/mapHeaders/MrPsychicsHouse.asm @@ -0,0 +1,8 @@ +MrPsychicsHouse_h: + db HOUSE ; tileset + db MR_PSYCHICS_HOUSE_HEIGHT, MR_PSYCHICS_HOUSE_WIDTH ; dimensions (y, x) + dw MrPsychicsHouse_Blocks ; blocks + dw MrPsychicsHouse_TextPointers ; texts + dw MrPsychicsHouse_Script ; scripts + db 0 ; connections + dw MrPsychicsHouse_Object ; objects diff --git a/data/mapHeaders/MtMoon1F.asm b/data/mapHeaders/MtMoon1F.asm new file mode 100755 index 00000000..29ce5d6b --- /dev/null +++ b/data/mapHeaders/MtMoon1F.asm @@ -0,0 +1,8 @@ +MtMoon1F_h: + db CAVERN ; tileset + db MT_MOON_1F_HEIGHT, MT_MOON_1F_WIDTH ; dimensions (y, x) + dw MtMoon1F_Blocks ; blocks + dw MtMoon1F_TextPointers ; texts + dw MtMoon1F_Script ; scripts + db 0 ; connections + dw MtMoon1F_Object ; objects diff --git a/data/mapHeaders/MtMoonB1F.asm b/data/mapHeaders/MtMoonB1F.asm new file mode 100755 index 00000000..7ebc3dab --- /dev/null +++ b/data/mapHeaders/MtMoonB1F.asm @@ -0,0 +1,8 @@ +MtMoonB1F_h: + db CAVERN ; tileset + db MT_MOON_B1F_HEIGHT, MT_MOON_B1F_WIDTH ; dimensions (y, x) + dw MtMoonB1F_Blocks ; blocks + dw MtMoonB1F_TextPointers ; texts + dw MtMoonB1F_Script ; scripts + db 0 ; connections + dw MtMoonB1F_Object ; objects diff --git a/data/mapHeaders/MtMoonB2F.asm b/data/mapHeaders/MtMoonB2F.asm new file mode 100755 index 00000000..2ec86247 --- /dev/null +++ b/data/mapHeaders/MtMoonB2F.asm @@ -0,0 +1,8 @@ +MtMoonB2F_h: + db CAVERN ; tileset + db MT_MOON_B2F_HEIGHT, MT_MOON_B2F_WIDTH ; dimensions (y, x) + dw MtMoonB2F_Blocks ; blocks + dw MtMoonB2F_TextPointers ; texts + dw MtMoonB2F_Script ; scripts + db 0 ; connections + dw MtMoonB2F_Object ; objects diff --git a/data/mapHeaders/MtMoonPokecenter.asm b/data/mapHeaders/MtMoonPokecenter.asm new file mode 100755 index 00000000..c3c014ff --- /dev/null +++ b/data/mapHeaders/MtMoonPokecenter.asm @@ -0,0 +1,8 @@ +MtMoonPokecenter_h: + db POKECENTER ; tileset + db MT_MOON_POKECENTER_HEIGHT, MT_MOON_POKECENTER_WIDTH ; dimensions (y, x) + dw MtMoonPokecenter_Blocks ; blocks + dw MtMoonPokecenter_TextPointers ; texts + dw MtMoonPokecenter_Script ; scripts + db 0 ; connections + dw MtMoonPokecenter_Object ; objects diff --git a/data/mapHeaders/Museum1F.asm b/data/mapHeaders/Museum1F.asm new file mode 100755 index 00000000..55625fc4 --- /dev/null +++ b/data/mapHeaders/Museum1F.asm @@ -0,0 +1,8 @@ +Museum1F_h: + db MUSEUM ; tileset + db MUSEUM_1F_HEIGHT, MUSEUM_1F_WIDTH ; dimensions (y, x) + dw Museum1F_Blocks ; blocks + dw Museum1F_TextPointers ; texts + dw Museum1F_Script ; scripts + db 0 ; connections + dw Museum1F_Object ; objects diff --git a/data/mapHeaders/Museum2F.asm b/data/mapHeaders/Museum2F.asm new file mode 100755 index 00000000..b39e161d --- /dev/null +++ b/data/mapHeaders/Museum2F.asm @@ -0,0 +1,8 @@ +Museum2F_h: + db MUSEUM ; tileset + db MUSEUM_2F_HEIGHT, MUSEUM_2F_WIDTH ; dimensions (y, x) + dw Museum2F_Blocks ; blocks + dw Museum2F_TextPointers ; texts + dw Museum2F_Script ; scripts + db 0 ; connections + dw Museum2F_Object ; objects diff --git a/data/mapHeaders/NameRatersHouse.asm b/data/mapHeaders/NameRatersHouse.asm new file mode 100755 index 00000000..7e3acee1 --- /dev/null +++ b/data/mapHeaders/NameRatersHouse.asm @@ -0,0 +1,8 @@ +NameRatersHouse_h: + db HOUSE ; tileset + db NAME_RATERS_HOUSE_HEIGHT, NAME_RATERS_HOUSE_WIDTH ; dimensions (y, x) + dw NameRatersHouse_Blocks ; blocks + dw NameRatersHouse_TextPointers ; texts + dw NameRatersHouse_Script ; scripts + db 0 ; connections + dw NameRatersHouse_Object ; objects diff --git a/data/mapHeaders/OaksLab.asm b/data/mapHeaders/OaksLab.asm new file mode 100755 index 00000000..ffbcdd52 --- /dev/null +++ b/data/mapHeaders/OaksLab.asm @@ -0,0 +1,8 @@ +OaksLab_h: + db DOJO ; tileset + db OAKS_LAB_HEIGHT, OAKS_LAB_WIDTH ; dimensions (y, x) + dw OaksLab_Blocks ; blocks + dw OaksLab_TextPointers ; texts + dw OaksLab_Script ; scripts + db 0 ; connections + dw OaksLab_Object ; objects diff --git a/data/mapHeaders/PalletTown.asm b/data/mapHeaders/PalletTown.asm new file mode 100755 index 00000000..eb8525ae --- /dev/null +++ b/data/mapHeaders/PalletTown.asm @@ -0,0 +1,10 @@ +PalletTown_h: + db OVERWORLD ; tileset + db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions (y, x) + dw PalletTown_Blocks ; blocks + dw PalletTown_TextPointers ; texts + dw PalletTown_Script ; scripts + db NORTH | SOUTH ; connections + NORTH_MAP_CONNECTION PALLET_TOWN, ROUTE_1, 0, 0, Route1_Blocks + SOUTH_MAP_CONNECTION PALLET_TOWN, ROUTE_21, 0, 0, Route21_Blocks, 1 + dw PalletTown_Object ; objects diff --git a/data/mapHeaders/PewterCity.asm b/data/mapHeaders/PewterCity.asm new file mode 100755 index 00000000..73610f86 --- /dev/null +++ b/data/mapHeaders/PewterCity.asm @@ -0,0 +1,10 @@ +PewterCity_h: + db OVERWORLD ; tileset + db PEWTER_CITY_HEIGHT, PEWTER_CITY_WIDTH ; dimensions (y, x) + dw PewterCity_Blocks ; blocks + dw PewterCity_TextPointers ; texts + dw PewterCity_Script ; scripts + db SOUTH | EAST ; connections + SOUTH_MAP_CONNECTION PEWTER_CITY, ROUTE_2, 5, 0, Route2_Blocks + EAST_MAP_CONNECTION PEWTER_CITY, ROUTE_3, 4, 0, Route3_Blocks + dw PewterCity_Object ; objects diff --git a/data/mapHeaders/PewterGym.asm b/data/mapHeaders/PewterGym.asm new file mode 100755 index 00000000..bb9c2e84 --- /dev/null +++ b/data/mapHeaders/PewterGym.asm @@ -0,0 +1,8 @@ +PewterGym_h: + db GYM ; tileset + db PEWTER_GYM_HEIGHT, PEWTER_GYM_WIDTH ; dimensions (y, x) + dw PewterGym_Blocks ; blocks + dw PewterGym_TextPointers ; texts + dw PewterGym_Script ; scripts + db 0 ; connections + dw PewterGym_Object ; objects diff --git a/data/mapHeaders/PewterMart.asm b/data/mapHeaders/PewterMart.asm new file mode 100755 index 00000000..dc8c5c78 --- /dev/null +++ b/data/mapHeaders/PewterMart.asm @@ -0,0 +1,8 @@ +PewterMart_h: + db MART ; tileset + db PEWTER_MART_HEIGHT, PEWTER_MART_WIDTH ; dimensions (y, x) + dw PewterMart_Blocks ; blocks + dw PewterMart_TextPointers ; texts + dw PewterMart_Script ; scripts + db 0 ; connections + dw PewterMart_Object ; objects diff --git a/data/mapHeaders/PewterNidoranHouse.asm b/data/mapHeaders/PewterNidoranHouse.asm new file mode 100755 index 00000000..ffab8473 --- /dev/null +++ b/data/mapHeaders/PewterNidoranHouse.asm @@ -0,0 +1,8 @@ +PewterNidoranHouse_h: + db HOUSE ; tileset + db PEWTER_NIDORAN_HOUSE_HEIGHT, PEWTER_NIDORAN_HOUSE_WIDTH ; dimensions (y, x) + dw PewterNidoranHouse_Blocks ; blocks + dw PewterNidoranHouse_TextPointers ; texts + dw PewterNidoranHouse_Script ; scripts + db 0 ; connections + dw PewterNidoranHouse_Object ; objects diff --git a/data/mapHeaders/PewterPokecenter.asm b/data/mapHeaders/PewterPokecenter.asm new file mode 100755 index 00000000..89adbb80 --- /dev/null +++ b/data/mapHeaders/PewterPokecenter.asm @@ -0,0 +1,8 @@ +PewterPokecenter_h: + db POKECENTER ; tileset + db PEWTER_POKECENTER_HEIGHT, PEWTER_POKECENTER_WIDTH ; dimensions (y, x) + dw PewterPokecenter_Blocks ; blocks + dw PewterPokecenter_TextPointers ; texts + dw PewterPokecenter_Script ; scripts + db 0 ; connections + dw PewterPokecenter_Object ; objects diff --git a/data/mapHeaders/PewterSpeechHouse.asm b/data/mapHeaders/PewterSpeechHouse.asm new file mode 100755 index 00000000..7750c8c7 --- /dev/null +++ b/data/mapHeaders/PewterSpeechHouse.asm @@ -0,0 +1,8 @@ +PewterSpeechHouse_h: + db HOUSE ; tileset + db PEWTER_SPEECH_HOUSE_HEIGHT, PEWTER_SPEECH_HOUSE_WIDTH ; dimensions (y, x) + dw PewterSpeechHouse_Blocks ; blocks + dw PewterSpeechHouse_TextPointers ; texts + dw PewterSpeechHouse_Script ; scripts + db 0 ; connections + dw PewterSpeechHouse_Object ; objects diff --git a/data/mapHeaders/PokemonFanClub.asm b/data/mapHeaders/PokemonFanClub.asm new file mode 100755 index 00000000..18ebb923 --- /dev/null +++ b/data/mapHeaders/PokemonFanClub.asm @@ -0,0 +1,8 @@ +PokemonFanClub_h: + db INTERIOR ; tileset + db POKEMON_FAN_CLUB_HEIGHT, POKEMON_FAN_CLUB_WIDTH ; dimensions (y, x) + dw PokemonFanClub_Blocks ; blocks + dw PokemonFanClub_TextPointers ; texts + dw PokemonFanClub_Script ; scripts + db 0 ; connections + dw PokemonFanClub_Object ; objects diff --git a/data/mapHeaders/PokemonMansion1F.asm b/data/mapHeaders/PokemonMansion1F.asm new file mode 100755 index 00000000..357b0cbb --- /dev/null +++ b/data/mapHeaders/PokemonMansion1F.asm @@ -0,0 +1,8 @@ +PokemonMansion1F_h: + db FACILITY ; tileset + db POKEMON_MANSION_1F_HEIGHT, POKEMON_MANSION_1F_WIDTH ; dimensions (y, x) + dw PokemonMansion1F_Blocks ; blocks + dw PokemonMansion1F_TextPointers ; texts + dw PokemonMansion1F_Script ; scripts + db 0 ; connections + dw PokemonMansion1F_Object ; objects diff --git a/data/mapHeaders/PokemonMansion2F.asm b/data/mapHeaders/PokemonMansion2F.asm new file mode 100755 index 00000000..71c0e3bb --- /dev/null +++ b/data/mapHeaders/PokemonMansion2F.asm @@ -0,0 +1,8 @@ +PokemonMansion2F_h: + db FACILITY ; tileset + db POKEMON_MANSION_2F_HEIGHT, POKEMON_MANSION_2F_WIDTH ; dimensions (y, x) + dw PokemonMansion2F_Blocks ; blocks + dw PokemonMansion2F_TextPointers ; texts + dw PokemonMansion2F_Script ; scripts + db 0 ; connections + dw PokemonMansion2F_Object ; objects diff --git a/data/mapHeaders/PokemonMansion3F.asm b/data/mapHeaders/PokemonMansion3F.asm new file mode 100755 index 00000000..fe4076f9 --- /dev/null +++ b/data/mapHeaders/PokemonMansion3F.asm @@ -0,0 +1,8 @@ +PokemonMansion3F_h: + db FACILITY ; tileset + db POKEMON_MANSION_3F_HEIGHT, POKEMON_MANSION_3F_WIDTH ; dimensions (y, x) + dw PokemonMansion3F_Blocks ; blocks + dw PokemonMansion3F_TextPointers ; texts + dw PokemonMansion3F_Script ; scripts + db 0 ; connections + dw PokemonMansion3F_Object ; objects diff --git a/data/mapHeaders/PokemonMansionB1F.asm b/data/mapHeaders/PokemonMansionB1F.asm new file mode 100755 index 00000000..ccf892b2 --- /dev/null +++ b/data/mapHeaders/PokemonMansionB1F.asm @@ -0,0 +1,8 @@ +PokemonMansionB1F_h: + db FACILITY ; tileset + db POKEMON_MANSION_B1F_HEIGHT, POKEMON_MANSION_B1F_WIDTH ; dimensions (y, x) + dw PokemonMansionB1F_Blocks ; blocks + dw PokemonMansionB1F_TextPointers ; texts + dw PokemonMansionB1F_Script ; scripts + db 0 ; connections + dw PokemonMansionB1F_Object ; objects diff --git a/data/mapHeaders/PokemonTower1F.asm b/data/mapHeaders/PokemonTower1F.asm new file mode 100755 index 00000000..561274bb --- /dev/null +++ b/data/mapHeaders/PokemonTower1F.asm @@ -0,0 +1,8 @@ +PokemonTower1F_h: + db CEMETERY ; tileset + db POKEMON_TOWER_1F_HEIGHT, POKEMON_TOWER_1F_WIDTH ; dimensions (y, x) + dw PokemonTower1F_Blocks ; blocks + dw PokemonTower1F_TextPointers ; texts + dw PokemonTower1F_Script ; scripts + db 0 ; connections + dw PokemonTower1F_Object ; objects diff --git a/data/mapHeaders/PokemonTower2F.asm b/data/mapHeaders/PokemonTower2F.asm new file mode 100755 index 00000000..41e3271e --- /dev/null +++ b/data/mapHeaders/PokemonTower2F.asm @@ -0,0 +1,8 @@ +PokemonTower2F_h: + db CEMETERY ; tileset + db POKEMON_TOWER_2F_HEIGHT, POKEMON_TOWER_2F_WIDTH ; dimensions (y, x) + dw PokemonTower2F_Blocks ; blocks + dw PokemonTower2F_TextPointers ; texts + dw PokemonTower2F_Script ; scripts + db 0 ; connections + dw PokemonTower2F_Object ; objects diff --git a/data/mapHeaders/PokemonTower3F.asm b/data/mapHeaders/PokemonTower3F.asm new file mode 100755 index 00000000..932c4a20 --- /dev/null +++ b/data/mapHeaders/PokemonTower3F.asm @@ -0,0 +1,8 @@ +PokemonTower3F_h: + db CEMETERY ; tileset + db POKEMON_TOWER_3F_HEIGHT, POKEMON_TOWER_3F_WIDTH ; dimensions (y, x) + dw PokemonTower3F_Blocks ; blocks + dw PokemonTower3F_TextPointers ; texts + dw PokemonTower3F_Script ; scripts + db 0 ; connections + dw PokemonTower3F_Object ; objects diff --git a/data/mapHeaders/PokemonTower4F.asm b/data/mapHeaders/PokemonTower4F.asm new file mode 100755 index 00000000..b3027cb0 --- /dev/null +++ b/data/mapHeaders/PokemonTower4F.asm @@ -0,0 +1,8 @@ +PokemonTower4F_h: + db CEMETERY ; tileset + db POKEMON_TOWER_4F_HEIGHT, POKEMON_TOWER_4F_WIDTH ; dimensions (y, x) + dw PokemonTower4F_Blocks ; blocks + dw PokemonTower4F_TextPointers ; texts + dw PokemonTower4F_Script ; scripts + db 0 ; connections + dw PokemonTower4F_Object ; objects diff --git a/data/mapHeaders/PokemonTower5F.asm b/data/mapHeaders/PokemonTower5F.asm new file mode 100755 index 00000000..9452c553 --- /dev/null +++ b/data/mapHeaders/PokemonTower5F.asm @@ -0,0 +1,8 @@ +PokemonTower5F_h: + db CEMETERY ; tileset + db POKEMON_TOWER_5F_HEIGHT, POKEMON_TOWER_5F_WIDTH ; dimensions (y, x) + dw PokemonTower5F_Blocks ; blocks + dw PokemonTower5F_TextPointers ; texts + dw PokemonTower5F_Script ; scripts + db 0 ; connections + dw PokemonTower5F_Object ; objects diff --git a/data/mapHeaders/PokemonTower6F.asm b/data/mapHeaders/PokemonTower6F.asm new file mode 100755 index 00000000..336c8f66 --- /dev/null +++ b/data/mapHeaders/PokemonTower6F.asm @@ -0,0 +1,8 @@ +PokemonTower6F_h: + db CEMETERY ; tileset + db POKEMON_TOWER_6F_HEIGHT, POKEMON_TOWER_6F_WIDTH ; dimensions (y, x) + dw PokemonTower6F_Blocks ; blocks + dw PokemonTower6F_TextPointers ; texts + dw PokemonTower6F_Script ; scripts + db 0 ; connections + dw PokemonTower6F_Object ; objects diff --git a/data/mapHeaders/PokemonTower7F.asm b/data/mapHeaders/PokemonTower7F.asm new file mode 100755 index 00000000..da10fa53 --- /dev/null +++ b/data/mapHeaders/PokemonTower7F.asm @@ -0,0 +1,8 @@ +PokemonTower7F_h: + db CEMETERY ; tileset + db POKEMON_TOWER_7F_HEIGHT, POKEMON_TOWER_7F_WIDTH ; dimensions (y, x) + dw PokemonTower7F_Blocks ; blocks + dw PokemonTower7F_TextPointers ; texts + dw PokemonTower7F_Script ; scripts + db 0 ; connections + dw PokemonTower7F_Object ; objects diff --git a/data/mapHeaders/PowerPlant.asm b/data/mapHeaders/PowerPlant.asm new file mode 100755 index 00000000..91f03d63 --- /dev/null +++ b/data/mapHeaders/PowerPlant.asm @@ -0,0 +1,8 @@ +PowerPlant_h: + db FACILITY ; tileset + db POWER_PLANT_HEIGHT, POWER_PLANT_WIDTH ; dimensions (y, x) + dw PowerPlant_Blocks ; blocks + dw PowerPlant_TextPointers ; texts + dw PowerPlant_Script ; scripts + db 0 ; connections + dw PowerPlant_Object ; objects diff --git a/data/mapHeaders/RedsHouse1F.asm b/data/mapHeaders/RedsHouse1F.asm new file mode 100755 index 00000000..c9acc489 --- /dev/null +++ b/data/mapHeaders/RedsHouse1F.asm @@ -0,0 +1,8 @@ +RedsHouse1F_h: + db REDS_HOUSE_1 ; tileset + db REDS_HOUSE_1F_HEIGHT, REDS_HOUSE_1F_WIDTH ; dimensions (y, x) + dw RedsHouse1F_Blocks ; blocks + dw RedsHouse1F_TextPointers ; texts + dw RedsHouse1F_Script ; scripts + db 0 ; connections + dw RedsHouse1F_Object ; objects diff --git a/data/mapHeaders/RedsHouse2F.asm b/data/mapHeaders/RedsHouse2F.asm new file mode 100755 index 00000000..42215466 --- /dev/null +++ b/data/mapHeaders/RedsHouse2F.asm @@ -0,0 +1,8 @@ +RedsHouse2F_h: + db REDS_HOUSE_2 ; tileset + db REDS_HOUSE_2F_HEIGHT, REDS_HOUSE_2F_WIDTH ; dimensions (y, x) + dw RedsHouse2F_Blocks ; blocks + dw RedsHouse2F_TextPointers ; texts + dw RedsHouse2F_Script ; scripts + db $00 ; connections + dw RedsHouse2F_Object ; objects diff --git a/data/mapHeaders/RockTunnel1F.asm b/data/mapHeaders/RockTunnel1F.asm new file mode 100755 index 00000000..dd552ac9 --- /dev/null +++ b/data/mapHeaders/RockTunnel1F.asm @@ -0,0 +1,8 @@ +RockTunnel1F_h: + db CAVERN ; tileset + db ROCK_TUNNEL_1F_HEIGHT, ROCK_TUNNEL_1F_WIDTH ; dimensions (y, x) + dw RockTunnel1F_Blocks ; blocks + dw RockTunnel1F_TextPointers ; texts + dw RockTunnel1F_Script ; scripts + db 0 ; connections + dw RockTunnel1F_Object ; objects diff --git a/data/mapHeaders/RockTunnelB1F.asm b/data/mapHeaders/RockTunnelB1F.asm new file mode 100755 index 00000000..4e765f20 --- /dev/null +++ b/data/mapHeaders/RockTunnelB1F.asm @@ -0,0 +1,8 @@ +RockTunnelB1F_h: + db CAVERN ; tileset + db ROCK_TUNNEL_B1F_HEIGHT, ROCK_TUNNEL_B1F_WIDTH ; dimensions (y, x) + dw RockTunnelB1F_Blocks ; blocks + dw RockTunnelB1F_TextPointers ; texts + dw RockTunnelB1F_Script ; scripts + db 0 ; connections + dw RockTunnelB1F_Object ; objects diff --git a/data/mapHeaders/RockTunnelPokecenter.asm b/data/mapHeaders/RockTunnelPokecenter.asm new file mode 100755 index 00000000..ac29f1cf --- /dev/null +++ b/data/mapHeaders/RockTunnelPokecenter.asm @@ -0,0 +1,8 @@ +RockTunnelPokecenter_h: + db POKECENTER ; tileset + db ROCK_TUNNEL_POKECENTER_HEIGHT, ROCK_TUNNEL_POKECENTER_WIDTH ; dimensions (y, x) + dw RockTunnelPokecenter_Blocks ; blocks + dw RockTunnelPokecenter_TextPointers ; texts + dw RockTunnelPokecenter_Script ; scripts + db 0 ; connections + dw RockTunnelPokecenter_Object ; objects diff --git a/data/mapHeaders/RocketHideoutB1F.asm b/data/mapHeaders/RocketHideoutB1F.asm new file mode 100755 index 00000000..3c842f1e --- /dev/null +++ b/data/mapHeaders/RocketHideoutB1F.asm @@ -0,0 +1,8 @@ +RocketHideoutB1F_h: + db FACILITY ; tileset + db ROCKET_HIDEOUT_B1F_HEIGHT, ROCKET_HIDEOUT_B1F_WIDTH ; dimensions (y, x) + dw RocketHideoutB1F_Blocks ; blocks + dw RocketHideoutB1F_TextPointers ; texts + dw RocketHideoutB1F_Script ; scripts + db 0 ; connections + dw RocketHideoutB1F_Object ; objects diff --git a/data/mapHeaders/RocketHideoutB2F.asm b/data/mapHeaders/RocketHideoutB2F.asm new file mode 100755 index 00000000..b570c2a6 --- /dev/null +++ b/data/mapHeaders/RocketHideoutB2F.asm @@ -0,0 +1,8 @@ +RocketHideoutB2F_h: + db FACILITY ; tileset + db ROCKET_HIDEOUT_B2F_HEIGHT, ROCKET_HIDEOUT_B2F_WIDTH ; dimensions (y, x) + dw RocketHideoutB2F_Blocks ; blocks + dw RocketHideoutB2F_TextPointers ; texts + dw RocketHideoutB2F_Script ; scripts + db 0 ; connections + dw RocketHideoutB2F_Object ; objects diff --git a/data/mapHeaders/RocketHideoutB3F.asm b/data/mapHeaders/RocketHideoutB3F.asm new file mode 100755 index 00000000..7eab257e --- /dev/null +++ b/data/mapHeaders/RocketHideoutB3F.asm @@ -0,0 +1,8 @@ +RocketHideoutB3F_h: + db FACILITY ; tileset + db ROCKET_HIDEOUT_B3F_HEIGHT, ROCKET_HIDEOUT_B3F_WIDTH ; dimensions (y, x) + dw RocketHideoutB3F_Blocks ; blocks + dw RocketHideoutB3F_TextPointers ; texts + dw RocketHideoutB3F_Script ; scripts + db 0 ; connections + dw RocketHideoutB3F_Object ; objects diff --git a/data/mapHeaders/RocketHideoutB4F.asm b/data/mapHeaders/RocketHideoutB4F.asm new file mode 100755 index 00000000..57797c56 --- /dev/null +++ b/data/mapHeaders/RocketHideoutB4F.asm @@ -0,0 +1,8 @@ +RocketHideoutB4F_h: + db FACILITY ; tileset + db ROCKET_HIDEOUT_B4F_HEIGHT, ROCKET_HIDEOUT_B4F_WIDTH ; dimensions (y, x) + dw RocketHideoutB4F_Blocks ; blocks + dw RocketHideoutB4F_TextPointers ; texts + dw RocketHideoutB4F_Script ; scripts + db 0 ; connections + dw RocketHideoutB4F_Object ; objects diff --git a/data/mapHeaders/RocketHideoutElevator.asm b/data/mapHeaders/RocketHideoutElevator.asm new file mode 100755 index 00000000..742d0038 --- /dev/null +++ b/data/mapHeaders/RocketHideoutElevator.asm @@ -0,0 +1,8 @@ +RocketHideoutElevator_h: + db LOBBY ; tileset + db ROCKET_HIDEOUT_ELEVATOR_HEIGHT, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; dimensions (y, x) + dw RocketHideoutElevator_Blocks ; blocks + dw RocketHideoutElevator_TextPointers ; texts + dw RocketHideoutElevator_Script ; scripts + db 0 ; connections + dw RocketHideoutElevator_Object ; objects diff --git a/data/mapHeaders/Route1.asm b/data/mapHeaders/Route1.asm new file mode 100755 index 00000000..ce460937 --- /dev/null +++ b/data/mapHeaders/Route1.asm @@ -0,0 +1,10 @@ +Route1_h: + db OVERWORLD ; tileset + db ROUTE_1_HEIGHT, ROUTE_1_WIDTH ; dimensions (y, x) + dw Route1_Blocks ; blocks + dw Route1_TextPointers ; texts + dw Route1_Script ; scripts + db NORTH | SOUTH ; connections + NORTH_MAP_CONNECTION ROUTE_1, VIRIDIAN_CITY, -3, 2, ViridianCity_Blocks + SOUTH_MAP_CONNECTION ROUTE_1, PALLET_TOWN, 0, 0, PalletTown_Blocks, 1 + dw Route1_Object ; objects diff --git a/data/mapHeaders/Route10.asm b/data/mapHeaders/Route10.asm new file mode 100755 index 00000000..8c51bfc6 --- /dev/null +++ b/data/mapHeaders/Route10.asm @@ -0,0 +1,10 @@ +Route10_h: + db OVERWORLD ; tileset + db ROUTE_10_HEIGHT, ROUTE_10_WIDTH ; dimensions (y, x) + dw Route10_Blocks ; blocks + dw Route10_TextPointers ; texts + dw Route10_Script ; scripts + db SOUTH | WEST ; connections + SOUTH_MAP_CONNECTION ROUTE_10, LAVENDER_TOWN, 0, 0, LavenderTown_Blocks + WEST_MAP_CONNECTION ROUTE_10, ROUTE_9, 0, 0, Route9_Blocks + dw Route10_Object ; objects diff --git a/data/mapHeaders/Route11.asm b/data/mapHeaders/Route11.asm new file mode 100755 index 00000000..b7814465 --- /dev/null +++ b/data/mapHeaders/Route11.asm @@ -0,0 +1,10 @@ +Route11_h: + db OVERWORLD ; tileset + db ROUTE_11_HEIGHT, ROUTE_11_WIDTH ; dimensions (y, x) + dw Route11_Blocks ; blocks + dw Route11_TextPointers ; texts + dw Route11_Script ; scripts + db WEST | EAST ; connections + WEST_MAP_CONNECTION ROUTE_11, VERMILION_CITY, -3, 1, VermilionCity_Blocks + EAST_MAP_CONNECTION ROUTE_11, ROUTE_12, -3, 24, Route12_Blocks, 1 + dw Route11_Object ; objects diff --git a/data/mapHeaders/Route11Gate1F.asm b/data/mapHeaders/Route11Gate1F.asm new file mode 100755 index 00000000..2e01d168 --- /dev/null +++ b/data/mapHeaders/Route11Gate1F.asm @@ -0,0 +1,8 @@ +Route11Gate1F_h: + db GATE ; tileset + db ROUTE_11_GATE_1F_HEIGHT, ROUTE_11_GATE_1F_WIDTH ; dimensions (y, x) + dw Route11Gate1F_Blocks ; blocks + dw Route11Gate1F_TextPointers ; texts + dw Route11Gate1F_Script ; scripts + db 0 ; connections + dw Route11Gate1F_Object ; objects diff --git a/data/mapHeaders/Route11Gate2F.asm b/data/mapHeaders/Route11Gate2F.asm new file mode 100755 index 00000000..ecb2ab7c --- /dev/null +++ b/data/mapHeaders/Route11Gate2F.asm @@ -0,0 +1,8 @@ +Route11Gate2F_h: + db GATE ; tileset + db ROUTE_11_GATE_2F_HEIGHT, ROUTE_11_GATE_2F_WIDTH ; dimensions (y, x) + dw Route11Gate2F_Blocks ; blocks + dw Route11Gate2F_TextPointers ; texts + dw Route11Gate2F_Script ; scripts + db 0 ; connections + dw Route11Gate2F_Object ; objects diff --git a/data/mapHeaders/Route12.asm b/data/mapHeaders/Route12.asm new file mode 100755 index 00000000..2f76aa27 --- /dev/null +++ b/data/mapHeaders/Route12.asm @@ -0,0 +1,11 @@ +Route12_h: + db OVERWORLD ; tileset + db ROUTE_12_HEIGHT, ROUTE_12_WIDTH ; dimensions (y, x) + dw Route12_Blocks ; blocks + dw Route12_TextPointers ; texts + dw Route12_Script ; scripts + db NORTH | SOUTH | WEST ; connections + NORTH_MAP_CONNECTION ROUTE_12, LAVENDER_TOWN, 0, 0, LavenderTown_Blocks + SOUTH_MAP_CONNECTION ROUTE_12, ROUTE_13, -3, 17, Route13_Blocks + WEST_MAP_CONNECTION ROUTE_12, ROUTE_11, 27, 0, Route11_Blocks + dw Route12_Object ; objects diff --git a/data/mapHeaders/Route12Gate1F.asm b/data/mapHeaders/Route12Gate1F.asm new file mode 100755 index 00000000..e44aecab --- /dev/null +++ b/data/mapHeaders/Route12Gate1F.asm @@ -0,0 +1,8 @@ +Route12Gate1F_h: + db GATE ; tileset + db ROUTE_12_GATE_1F_HEIGHT, ROUTE_12_GATE_1F_WIDTH ; dimensions (y, x) + dw Route12Gate1F_Blocks ; blocks + dw Route12Gate1F_TextPointers ; texts + dw Route12Gate1F_Script ; scripts + db 0 ; connections + dw Route12Gate1F_Object ; objects diff --git a/data/mapHeaders/Route12Gate2F.asm b/data/mapHeaders/Route12Gate2F.asm new file mode 100755 index 00000000..94d5d54c --- /dev/null +++ b/data/mapHeaders/Route12Gate2F.asm @@ -0,0 +1,8 @@ +Route12Gate2F_h: + db GATE ; tileset + db ROUTE_12_GATE_2F_HEIGHT, ROUTE_12_GATE_2F_WIDTH ; dimensions (y, x) + dw Route12Gate2F_Blocks ; blocks + dw Route12Gate2F_TextPointers ; texts + dw Route12Gate2F_Script ; scripts + db 0 ; connections + dw Route12Gate2F_Object ; objects diff --git a/data/mapHeaders/Route12SuperRodHouse.asm b/data/mapHeaders/Route12SuperRodHouse.asm new file mode 100755 index 00000000..ef5e0f2c --- /dev/null +++ b/data/mapHeaders/Route12SuperRodHouse.asm @@ -0,0 +1,8 @@ +Route12SuperRodHouse_h: + db HOUSE ; tileset + db ROUTE_12_SUPER_ROD_HOUSE_HEIGHT, ROUTE_12_SUPER_ROD_HOUSE_WIDTH ; dimensions (y, x) + dw Route12SuperRodHouse_Blocks ; blocks + dw Route12SuperRodHouse_TextPointers ; texts + dw Route12SuperRodHouse_Script ; scripts + db 0 ; connections + dw Route12SuperRodHouse_Object ; objects diff --git a/data/mapHeaders/Route13.asm b/data/mapHeaders/Route13.asm new file mode 100755 index 00000000..e6e244b9 --- /dev/null +++ b/data/mapHeaders/Route13.asm @@ -0,0 +1,10 @@ +Route13_h: + db OVERWORLD ; tileset + db ROUTE_13_HEIGHT, ROUTE_13_WIDTH ; dimensions (y, x) + dw Route13_Blocks ; blocks + dw Route13_TextPointers ; texts + dw Route13_Script ; scripts + db NORTH | WEST ; connections + NORTH_MAP_CONNECTION ROUTE_13, ROUTE_12, 20, 0, Route12_Blocks + WEST_MAP_CONNECTION ROUTE_13, ROUTE_14, 0, 0, Route14_Blocks + dw Route13_Object ; objects diff --git a/data/mapHeaders/Route14.asm b/data/mapHeaders/Route14.asm new file mode 100755 index 00000000..c3934ac5 --- /dev/null +++ b/data/mapHeaders/Route14.asm @@ -0,0 +1,10 @@ +Route14_h: + db OVERWORLD ; tileset + db ROUTE_14_HEIGHT, ROUTE_14_WIDTH ; dimensions (y, x) + dw Route14_Blocks ; blocks + dw Route14_TextPointers ; texts + dw Route14_Script ; scripts + db WEST | EAST ; connections + WEST_MAP_CONNECTION ROUTE_14, ROUTE_15, 18, 0, Route15_Blocks + EAST_MAP_CONNECTION ROUTE_14, ROUTE_13, 0, 0, Route13_Blocks + dw Route14_Object ; objects diff --git a/data/mapHeaders/Route15.asm b/data/mapHeaders/Route15.asm new file mode 100755 index 00000000..eb14d750 --- /dev/null +++ b/data/mapHeaders/Route15.asm @@ -0,0 +1,10 @@ +Route15_h: + db OVERWORLD ; tileset + db ROUTE_15_HEIGHT, ROUTE_15_WIDTH ; dimensions (y, x) + dw Route15_Blocks ; blocks + dw Route15_TextPointers ; texts + dw Route15_Script ; scripts + db WEST | EAST ; connections + WEST_MAP_CONNECTION ROUTE_15, FUCHSIA_CITY, -3, 1, FuchsiaCity_Blocks + EAST_MAP_CONNECTION ROUTE_15, ROUTE_14, -3, 15, Route14_Blocks + dw Route15_Object ; objects diff --git a/data/mapHeaders/Route15Gate1F.asm b/data/mapHeaders/Route15Gate1F.asm new file mode 100755 index 00000000..b1ae5662 --- /dev/null +++ b/data/mapHeaders/Route15Gate1F.asm @@ -0,0 +1,8 @@ +Route15Gate1F_h: + db GATE ; tileset + db ROUTE_15_GATE_1F_HEIGHT, ROUTE_15_GATE_1F_WIDTH ; dimensions (y, x) + dw Route15Gate1F_Blocks ; blocks + dw Route15Gate1F_TextPointers ; texts + dw Route15Gate1F_Script ; scripts + db 0 ; connections + dw Route15Gate1F_Object ; objects diff --git a/data/mapHeaders/Route15Gate2F.asm b/data/mapHeaders/Route15Gate2F.asm new file mode 100755 index 00000000..501da092 --- /dev/null +++ b/data/mapHeaders/Route15Gate2F.asm @@ -0,0 +1,8 @@ +Route15Gate2F_h: + db GATE ; tileset + db ROUTE_15_GATE_2F_HEIGHT, ROUTE_15_GATE_2F_WIDTH ; dimensions (y, x) + dw Route15Gate2F_Blocks ; blocks + dw Route15Gate2F_TextPointers ; texts + dw Route15Gate2F_Script ; scripts + db 0 ; connections + dw Route15Gate2F_Object ; objects diff --git a/data/mapHeaders/Route16.asm b/data/mapHeaders/Route16.asm new file mode 100755 index 00000000..d12b6ea9 --- /dev/null +++ b/data/mapHeaders/Route16.asm @@ -0,0 +1,10 @@ +Route16_h: + db OVERWORLD ; tileset + db ROUTE_16_HEIGHT, ROUTE_16_WIDTH ; dimensions (y, x) + dw Route16_Blocks ; blocks + dw Route16_TextPointers ; texts + dw Route16_Script ; scripts + db SOUTH | EAST ; connections + SOUTH_MAP_CONNECTION ROUTE_16, ROUTE_17, 0, 0, Route17_Blocks + EAST_MAP_CONNECTION ROUTE_16, CELADON_CITY, -3, 1, CeladonCity_Blocks, 1 + dw Route16_Object ; objects diff --git a/data/mapHeaders/Route16FlyHouse.asm b/data/mapHeaders/Route16FlyHouse.asm new file mode 100755 index 00000000..0d3f828d --- /dev/null +++ b/data/mapHeaders/Route16FlyHouse.asm @@ -0,0 +1,8 @@ +Route16FlyHouse_h: + db HOUSE ; tileset + db ROUTE_16_FLY_HOUSE_HEIGHT, ROUTE_16_FLY_HOUSE_WIDTH ; dimensions (y, x) + dw Route16FlyHouse_Blocks ; blocks + dw Route16FlyHouse_TextPointers ; texts + dw Route16FlyHouse_Script ; scripts + db 0 ; connections + dw Route16FlyHouse_Object ; objects diff --git a/data/mapHeaders/Route16Gate1F.asm b/data/mapHeaders/Route16Gate1F.asm new file mode 100755 index 00000000..561fb597 --- /dev/null +++ b/data/mapHeaders/Route16Gate1F.asm @@ -0,0 +1,8 @@ +Route16Gate1F_h: + db GATE ; tileset + db ROUTE_16_GATE_1F_HEIGHT, ROUTE_16_GATE_1F_WIDTH ; dimensions (y, x) + dw Route16Gate1F_Blocks ; blocks + dw Route16Gate1F_TextPointers ; texts + dw Route16Gate1F_Script ; scripts + db 0 ; connections + dw Route16Gate1F_Object ; objects diff --git a/data/mapHeaders/Route16Gate2F.asm b/data/mapHeaders/Route16Gate2F.asm new file mode 100755 index 00000000..90783ab7 --- /dev/null +++ b/data/mapHeaders/Route16Gate2F.asm @@ -0,0 +1,8 @@ +Route16Gate2F_h: + db GATE ; tileset + db ROUTE_16_GATE_2F_HEIGHT, ROUTE_16_GATE_2F_WIDTH ; dimensions (y, x) + dw Route16Gate2F_Blocks ; blocks + dw Route16Gate2F_TextPointers ; texts + dw Route16Gate2F_Script ; scripts + db 0 ; connections + dw Route16Gate2F_Object ; objects diff --git a/data/mapHeaders/Route17.asm b/data/mapHeaders/Route17.asm new file mode 100755 index 00000000..58a785b4 --- /dev/null +++ b/data/mapHeaders/Route17.asm @@ -0,0 +1,10 @@ +Route17_h: + db OVERWORLD ; tileset + db ROUTE_17_HEIGHT, ROUTE_17_WIDTH ; dimensions (y, x) + dw Route17_Blocks ; blocks + dw Route17_TextPointers ; texts + dw Route17_Script ; scripts + db NORTH | SOUTH ; connections + NORTH_MAP_CONNECTION ROUTE_17, ROUTE_16, 0, 0, Route16_Blocks + SOUTH_MAP_CONNECTION ROUTE_17, ROUTE_18, 0, 0, Route18_Blocks, 1 + dw Route17_Object ; objects diff --git a/data/mapHeaders/Route18.asm b/data/mapHeaders/Route18.asm new file mode 100755 index 00000000..5e10bdbd --- /dev/null +++ b/data/mapHeaders/Route18.asm @@ -0,0 +1,10 @@ +Route18_h: + db OVERWORLD ; tileset + db ROUTE_18_HEIGHT, ROUTE_18_WIDTH ; dimensions (y, x) + dw Route18_Blocks ; blocks + dw Route18_TextPointers ; texts + dw Route18_Script ; scripts + db NORTH | EAST ; connections + NORTH_MAP_CONNECTION ROUTE_18, ROUTE_17, 0, 0, Route17_Blocks + EAST_MAP_CONNECTION ROUTE_18, FUCHSIA_CITY, -3, 1, FuchsiaCity_Blocks, 1 + dw Route18_Object ; objects diff --git a/data/mapHeaders/Route18Gate1F.asm b/data/mapHeaders/Route18Gate1F.asm new file mode 100755 index 00000000..0e4a0dc3 --- /dev/null +++ b/data/mapHeaders/Route18Gate1F.asm @@ -0,0 +1,8 @@ +Route18Gate1F_h: + db GATE ; tileset + db ROUTE_18_GATE_1F_HEIGHT, ROUTE_18_GATE_1F_WIDTH ; dimensions (y, x) + dw Route18Gate1F_Blocks ; blocks + dw Route18Gate1F_TextPointers ; texts + dw Route18Gate1F_Script ; scripts + db 0 ; connections + dw Route18Gate1F_Object ; objects diff --git a/data/mapHeaders/Route18Gate2F.asm b/data/mapHeaders/Route18Gate2F.asm new file mode 100755 index 00000000..5d8f7126 --- /dev/null +++ b/data/mapHeaders/Route18Gate2F.asm @@ -0,0 +1,8 @@ +Route18Gate2F_h: + db GATE ; tileset + db ROUTE_18_GATE_2F_HEIGHT, ROUTE_18_GATE_2F_WIDTH ; dimensions (y, x) + dw Route18Gate2F_Blocks ; blocks + dw Route18Gate2F_TextPointers ; texts + dw Route18Gate2F_Script ; scripts + db 0 ; connections + dw Route18Gate2F_Object ; objects diff --git a/data/mapHeaders/Route19.asm b/data/mapHeaders/Route19.asm new file mode 100755 index 00000000..79972677 --- /dev/null +++ b/data/mapHeaders/Route19.asm @@ -0,0 +1,10 @@ +Route19_h: + db OVERWORLD ; tileset + db ROUTE_19_HEIGHT, ROUTE_19_WIDTH ; dimensions (y, x) + dw Route19_Blocks ; blocks + dw Route19_TextPointers ; texts + dw Route19_Script ; scripts + db NORTH | WEST ; connections + NORTH_MAP_CONNECTION ROUTE_19, FUCHSIA_CITY, -3, 2, FuchsiaCity_Blocks + WEST_MAP_CONNECTION ROUTE_19, ROUTE_20, 18, 0, Route20_Blocks + dw Route19_Object ; objects diff --git a/data/mapHeaders/Route2.asm b/data/mapHeaders/Route2.asm new file mode 100755 index 00000000..94511d06 --- /dev/null +++ b/data/mapHeaders/Route2.asm @@ -0,0 +1,10 @@ +Route2_h: + db OVERWORLD ; tileset + db ROUTE_2_HEIGHT, ROUTE_2_WIDTH ; dimensions (y, x) + dw Route2_Blocks ; blocks + dw Route2_TextPointers ; texts + dw Route2_Script ; scripts + db NORTH | SOUTH ; connections + NORTH_MAP_CONNECTION ROUTE_2, PEWTER_CITY, -3, 2, PewterCity_Blocks + SOUTH_MAP_CONNECTION ROUTE_2, VIRIDIAN_CITY, -3, 2, ViridianCity_Blocks, 1 + dw Route2_Object ; objects diff --git a/data/mapHeaders/Route20.asm b/data/mapHeaders/Route20.asm new file mode 100755 index 00000000..689f51cd --- /dev/null +++ b/data/mapHeaders/Route20.asm @@ -0,0 +1,10 @@ +Route20_h: + db OVERWORLD ; tileset + db ROUTE_20_HEIGHT, ROUTE_20_WIDTH ; dimensions (y, x) + dw Route20_Blocks ; blocks + dw Route20_TextPointers ; texts + dw Route20_Script ; scripts + db WEST | EAST ; connections + WEST_MAP_CONNECTION ROUTE_20, CINNABAR_ISLAND, 0, 0, CinnabarIsland_Blocks + EAST_MAP_CONNECTION ROUTE_20, ROUTE_19, -3, 15, Route19_Blocks + dw Route20_Object ; objects diff --git a/data/mapHeaders/Route21.asm b/data/mapHeaders/Route21.asm new file mode 100755 index 00000000..f37869dc --- /dev/null +++ b/data/mapHeaders/Route21.asm @@ -0,0 +1,10 @@ +Route21_h: + db OVERWORLD ; tileset + db ROUTE_21_HEIGHT, ROUTE_21_WIDTH ; dimensions (y, x) + dw Route21_Blocks ; blocks + dw Route21_TextPointers ; texts + dw Route21_Script ; scripts + db NORTH | SOUTH ; connections + NORTH_MAP_CONNECTION ROUTE_21, PALLET_TOWN, 0, 0, PalletTown_Blocks + SOUTH_MAP_CONNECTION ROUTE_21, CINNABAR_ISLAND, 0, 0, CinnabarIsland_Blocks, 1 + dw Route21_Object ; objects diff --git a/data/mapHeaders/Route22.asm b/data/mapHeaders/Route22.asm new file mode 100755 index 00000000..4d07475f --- /dev/null +++ b/data/mapHeaders/Route22.asm @@ -0,0 +1,10 @@ +Route22_h: + db OVERWORLD ; tileset + db ROUTE_22_HEIGHT, ROUTE_22_WIDTH ; dimensions (y, x) + dw Route22_Blocks ; blocks + dw Route22_TextPointers ; texts + dw Route22_Script ; scripts + db NORTH | EAST ; connections + NORTH_MAP_CONNECTION ROUTE_22, ROUTE_23, 0, 0, Route23_Blocks + EAST_MAP_CONNECTION ROUTE_22, VIRIDIAN_CITY, -3, 1, ViridianCity_Blocks, 1 + dw Route22_Object ; objects diff --git a/data/mapHeaders/Route22Gate.asm b/data/mapHeaders/Route22Gate.asm new file mode 100755 index 00000000..4d3ae0cc --- /dev/null +++ b/data/mapHeaders/Route22Gate.asm @@ -0,0 +1,8 @@ +Route22Gate_h: + db GATE ; tileset + db ROUTE_22_GATE_HEIGHT, ROUTE_22_GATE_WIDTH ; dimensions (y, x) + dw Route22Gate_Blocks ; blocks + dw Route22Gate_TextPointers ; texts + dw Route22Gate_Script ; scripts + db 0 ; connections + dw Route22Gate_Object ; objects diff --git a/data/mapHeaders/Route23.asm b/data/mapHeaders/Route23.asm new file mode 100755 index 00000000..6b1fde97 --- /dev/null +++ b/data/mapHeaders/Route23.asm @@ -0,0 +1,10 @@ +Route23_h: + db PLATEAU ; tileset + db ROUTE_23_HEIGHT, ROUTE_23_WIDTH ; dimensions (y, x) + dw Route23_Blocks ; blocks + dw Route23_TextPointers ; texts + dw Route23_Script ; scripts + db NORTH | SOUTH ; connections + NORTH_MAP_CONNECTION ROUTE_23, INDIGO_PLATEAU, 0, 0, IndigoPlateau_Blocks + SOUTH_MAP_CONNECTION ROUTE_23, ROUTE_22, 0, 0, Route22_Blocks, 1 + dw Route23_Object ; objects diff --git a/data/mapHeaders/Route24.asm b/data/mapHeaders/Route24.asm new file mode 100755 index 00000000..87776f60 --- /dev/null +++ b/data/mapHeaders/Route24.asm @@ -0,0 +1,10 @@ +Route24_h: + db OVERWORLD ; tileset + db ROUTE_24_HEIGHT, ROUTE_24_WIDTH ; dimensions (y, x) + dw Route24_Blocks ; blocks + dw Route24_TextPointers ; texts + dw Route24_Script ; scripts + db SOUTH | EAST ; connections + SOUTH_MAP_CONNECTION ROUTE_24, CERULEAN_CITY, -3, 2, CeruleanCity_Blocks, 1 + EAST_MAP_CONNECTION ROUTE_24, ROUTE_25, 0, 0, Route25_Blocks + dw Route24_Object ; objects diff --git a/data/mapHeaders/Route25.asm b/data/mapHeaders/Route25.asm new file mode 100755 index 00000000..c300eeb3 --- /dev/null +++ b/data/mapHeaders/Route25.asm @@ -0,0 +1,9 @@ +Route25_h: + db OVERWORLD ; tileset + db ROUTE_25_HEIGHT, ROUTE_25_WIDTH ; dimensions (y, x) + dw Route25_Blocks ; blocks + dw Route25_TextPointers ; texts + dw Route25_Script ; scripts + db WEST ; connections + WEST_MAP_CONNECTION ROUTE_25, ROUTE_24, 0, 0, Route24_Blocks + dw Route25_Object ; objects diff --git a/data/mapHeaders/Route2Gate.asm b/data/mapHeaders/Route2Gate.asm new file mode 100755 index 00000000..9b284178 --- /dev/null +++ b/data/mapHeaders/Route2Gate.asm @@ -0,0 +1,8 @@ +Route2Gate_h: + db GATE ; tileset + db ROUTE_2_GATE_HEIGHT, ROUTE_2_GATE_WIDTH ; dimensions (y, x) + dw Route2Gate_Blocks ; blocks + dw Route2Gate_TextPointers ; texts + dw Route2Gate_Script ; scripts + db 0 ; connections + dw Route2Gate_Object ; objects diff --git a/data/mapHeaders/Route2TradeHouse.asm b/data/mapHeaders/Route2TradeHouse.asm new file mode 100755 index 00000000..33693943 --- /dev/null +++ b/data/mapHeaders/Route2TradeHouse.asm @@ -0,0 +1,8 @@ +Route2TradeHouse_h: + db HOUSE ; tileset + db ROUTE_2_TRADE_HOUSE_HEIGHT, ROUTE_2_TRADE_HOUSE_WIDTH ; dimensions (y, x) + dw Route2TradeHouse_Blocks ; blocks + dw Route2TradeHouse_TextPointers ; texts + dw Route2TradeHouse_Script ; scripts + db 0 ; connections + dw Route2TradeHouse_Object ; objects diff --git a/data/mapHeaders/Route3.asm b/data/mapHeaders/Route3.asm new file mode 100755 index 00000000..c611e4b8 --- /dev/null +++ b/data/mapHeaders/Route3.asm @@ -0,0 +1,10 @@ +Route3_h: + db OVERWORLD ; tileset + db ROUTE_3_HEIGHT, ROUTE_3_WIDTH ; dimensions (y, x) + dw Route3_Blocks ; blocks + dw Route3_TextPointers ; texts + dw Route3_Script ; scripts + db NORTH | WEST ; connections + NORTH_MAP_CONNECTION ROUTE_3, ROUTE_4, 25, 0, Route4_Blocks + WEST_MAP_CONNECTION ROUTE_3, PEWTER_CITY, -3, 1, PewterCity_Blocks + dw Route3_Object ; objects diff --git a/data/mapHeaders/Route4.asm b/data/mapHeaders/Route4.asm new file mode 100755 index 00000000..999a1207 --- /dev/null +++ b/data/mapHeaders/Route4.asm @@ -0,0 +1,10 @@ +Route4_h: + db OVERWORLD ; tileset + db ROUTE_4_HEIGHT, ROUTE_4_WIDTH ; dimensions (y, x) + dw Route4_Blocks ; blocks + dw Route4_TextPointers ; texts + dw Route4_Script ; scripts + db SOUTH | EAST ; connections + SOUTH_MAP_CONNECTION ROUTE_4, ROUTE_3, -3, 22, Route3_Blocks + EAST_MAP_CONNECTION ROUTE_4, CERULEAN_CITY, -3, 1, CeruleanCity_Blocks, 1 + dw Route4_Object ; objects diff --git a/data/mapHeaders/Route5.asm b/data/mapHeaders/Route5.asm new file mode 100755 index 00000000..6480aebd --- /dev/null +++ b/data/mapHeaders/Route5.asm @@ -0,0 +1,10 @@ +Route5_h: + db OVERWORLD ; tileset + db ROUTE_5_HEIGHT, ROUTE_5_WIDTH ; dimensions (y, x) + dw Route5_Blocks ; blocks + dw Route5_TextPointers ; texts + dw Route5_Script ; scripts + db NORTH | SOUTH ; connections + NORTH_MAP_CONNECTION ROUTE_5, CERULEAN_CITY, -3, 2, CeruleanCity_Blocks + SOUTH_MAP_CONNECTION ROUTE_5, SAFFRON_CITY, -3, 2, SaffronCity_Blocks, 1 + dw Route5_Object ; objects diff --git a/data/mapHeaders/Route5Gate.asm b/data/mapHeaders/Route5Gate.asm new file mode 100755 index 00000000..bb418182 --- /dev/null +++ b/data/mapHeaders/Route5Gate.asm @@ -0,0 +1,8 @@ +Route5Gate_h: + db GATE ; tileset + db ROUTE_5_GATE_HEIGHT, ROUTE_5_GATE_WIDTH ; dimensions (y, x) + dw Route5Gate_Blocks ; blocks + dw Route5Gate_TextPointers ; texts + dw Route5Gate_Script ; scripts + db 0 ; connections + dw Route5Gate_Object ; objects diff --git a/data/mapHeaders/Route6.asm b/data/mapHeaders/Route6.asm new file mode 100755 index 00000000..9385ce5f --- /dev/null +++ b/data/mapHeaders/Route6.asm @@ -0,0 +1,10 @@ +Route6_h: + db OVERWORLD ; tileset + db ROUTE_6_HEIGHT, ROUTE_6_WIDTH ; dimensions (y, x) + dw Route6_Blocks ; blocks + dw Route6_TextPointers ; texts + dw Route6_Script ; scripts + db NORTH | SOUTH ; connections + NORTH_MAP_CONNECTION ROUTE_6, SAFFRON_CITY, -3, 2, SaffronCity_Blocks + SOUTH_MAP_CONNECTION ROUTE_6, VERMILION_CITY, -3, 2, VermilionCity_Blocks, 1 + dw Route6_Object ; objects diff --git a/data/mapHeaders/Route6Gate.asm b/data/mapHeaders/Route6Gate.asm new file mode 100755 index 00000000..282cc5b6 --- /dev/null +++ b/data/mapHeaders/Route6Gate.asm @@ -0,0 +1,8 @@ +Route6Gate_h: + db GATE ; tileset + db ROUTE_6_GATE_HEIGHT, ROUTE_6_GATE_WIDTH ; dimensions (y, x) + dw Route6Gate_Blocks ; blocks + dw Route6Gate_TextPointers ; texts + dw Route6Gate_Script ; scripts + db 0 ; connections + dw Route6Gate_Object ; objects diff --git a/data/mapHeaders/Route7.asm b/data/mapHeaders/Route7.asm new file mode 100755 index 00000000..9b34ea1f --- /dev/null +++ b/data/mapHeaders/Route7.asm @@ -0,0 +1,10 @@ +Route7_h: + db OVERWORLD ; tileset + db ROUTE_7_HEIGHT, ROUTE_7_WIDTH ; dimensions (y, x) + dw Route7_Blocks ; blocks + dw Route7_TextPointers ; texts + dw Route7_Script ; scripts + db WEST | EAST ; connections + WEST_MAP_CONNECTION ROUTE_7, CELADON_CITY, -3, 1, CeladonCity_Blocks + EAST_MAP_CONNECTION ROUTE_7, SAFFRON_CITY, -3, 1, SaffronCity_Blocks, 1 + dw Route7_Object ; objects diff --git a/data/mapHeaders/Route7Gate.asm b/data/mapHeaders/Route7Gate.asm new file mode 100755 index 00000000..61771e42 --- /dev/null +++ b/data/mapHeaders/Route7Gate.asm @@ -0,0 +1,8 @@ +Route7Gate_h: + db GATE ; tileset + db ROUTE_7_GATE_HEIGHT, ROUTE_7_GATE_WIDTH ; dimensions (y, x) + dw Route7Gate_Blocks ; blocks + dw Route7Gate_TextPointers ; texts + dw Route7Gate_Script ; scripts + db 0 ; connections + dw Route7Gate_Object ; objects diff --git a/data/mapHeaders/Route8.asm b/data/mapHeaders/Route8.asm new file mode 100755 index 00000000..bd2ee71e --- /dev/null +++ b/data/mapHeaders/Route8.asm @@ -0,0 +1,10 @@ +Route8_h: + db OVERWORLD ; tileset + db ROUTE_8_HEIGHT, ROUTE_8_WIDTH ; dimensions (y, x) + dw Route8_Blocks ; blocks + dw Route8_TextPointers ; texts + dw Route8_Script ; scripts + db WEST | EAST ; connections + WEST_MAP_CONNECTION ROUTE_8, SAFFRON_CITY, -3, 1, SaffronCity_Blocks + EAST_MAP_CONNECTION ROUTE_8, LAVENDER_TOWN, 0, 0, LavenderTown_Blocks + dw Route8_Object ; objects diff --git a/data/mapHeaders/Route8Gate.asm b/data/mapHeaders/Route8Gate.asm new file mode 100755 index 00000000..dd14a237 --- /dev/null +++ b/data/mapHeaders/Route8Gate.asm @@ -0,0 +1,8 @@ +Route8Gate_h: + db GATE ; tileset + db ROUTE_8_GATE_HEIGHT, ROUTE_8_GATE_WIDTH ; dimensions (y, x) + dw Route8Gate_Blocks ; blocks + dw Route8Gate_TextPointers ; texts + dw Route8Gate_Script ; scripts + db 0 ; connections + dw Route8Gate_Object ; objects diff --git a/data/mapHeaders/Route9.asm b/data/mapHeaders/Route9.asm new file mode 100755 index 00000000..3dec3b0a --- /dev/null +++ b/data/mapHeaders/Route9.asm @@ -0,0 +1,10 @@ +Route9_h: + db OVERWORLD ; tileset + db ROUTE_9_HEIGHT, ROUTE_9_WIDTH ; dimensions (y, x) + dw Route9_Blocks ; blocks + dw Route9_TextPointers ; texts + dw Route9_Script ; scripts + db WEST | EAST ; connections + WEST_MAP_CONNECTION ROUTE_9, CERULEAN_CITY, -3, 1, CeruleanCity_Blocks + EAST_MAP_CONNECTION ROUTE_9, ROUTE_10, 0, 0, Route10_Blocks, 1 + dw Route9_Object ; objects diff --git a/data/mapHeaders/SSAnne1F.asm b/data/mapHeaders/SSAnne1F.asm new file mode 100755 index 00000000..a69423d6 --- /dev/null +++ b/data/mapHeaders/SSAnne1F.asm @@ -0,0 +1,8 @@ +SSAnne1F_h: + db SHIP ; tileset + db SS_ANNE_1F_HEIGHT, SS_ANNE_1F_WIDTH ; dimensions (y, x) + dw SSAnne1F_Blocks ; blocks + dw SSAnne1F_TextPointers ; texts + dw SSAnne1F_Script ; scripts + db 0 ; connections + dw SSAnne1F_Object ; objects diff --git a/data/mapHeaders/SSAnne1FRooms.asm b/data/mapHeaders/SSAnne1FRooms.asm new file mode 100755 index 00000000..1f8af23d --- /dev/null +++ b/data/mapHeaders/SSAnne1FRooms.asm @@ -0,0 +1,8 @@ +SSAnne1FRooms_h: + db SHIP ; tileset + db SS_ANNE_1F_ROOMS_HEIGHT, SS_ANNE_1F_ROOMS_WIDTH ; dimensions (y, x) + dw SSAnne1FRooms_Blocks ; blocks + dw SSAnne1FRooms_TextPointers ; texts + dw SSAnne1FRooms_Script ; scripts + db 0 ; connections + dw SSAnne1FRooms_Object ; objects diff --git a/data/mapHeaders/SSAnne2F.asm b/data/mapHeaders/SSAnne2F.asm new file mode 100755 index 00000000..d42d16f4 --- /dev/null +++ b/data/mapHeaders/SSAnne2F.asm @@ -0,0 +1,8 @@ +SSAnne2F_h: + db SHIP ; tileset + db SS_ANNE_2F_HEIGHT, SS_ANNE_2F_WIDTH ; dimensions (y, x) + dw SSAnne2F_Blocks ; blocks + dw SSAnne2F_TextPointers ; texts + dw SSAnne2F_Script ; scripts + db 0 ; connections + dw SSAnne2F_Object ; objects diff --git a/data/mapHeaders/SSAnne2FRooms.asm b/data/mapHeaders/SSAnne2FRooms.asm new file mode 100755 index 00000000..f22de0fa --- /dev/null +++ b/data/mapHeaders/SSAnne2FRooms.asm @@ -0,0 +1,8 @@ +SSAnne2FRooms_h: + db SHIP ; tileset + db SS_ANNE_2F_ROOMS_HEIGHT, SS_ANNE_2F_ROOMS_WIDTH ; dimensions (y, x) + dw SSAnne2FRooms_Blocks ; blocks + dw SSAnne2FRooms_TextPointers ; texts + dw SSAnne2FRooms_Script ; scripts + db 0 ; connections + dw SSAnne2FRooms_Object ; objects diff --git a/data/mapHeaders/SSAnne3F.asm b/data/mapHeaders/SSAnne3F.asm new file mode 100755 index 00000000..1c5dafea --- /dev/null +++ b/data/mapHeaders/SSAnne3F.asm @@ -0,0 +1,8 @@ +SSAnne3F_h: + db SHIP ; tileset + db SS_ANNE_3F_HEIGHT, SS_ANNE_3F_WIDTH ; dimensions (y, x) + dw SSAnne3F_Blocks ; blocks + dw SSAnne3F_TextPointers ; texts + dw SSAnne3F_Script ; scripts + db 0 ; connections + dw SSAnne3F_Object ; objects diff --git a/data/mapHeaders/SSAnneB1F.asm b/data/mapHeaders/SSAnneB1F.asm new file mode 100755 index 00000000..a3ca6dfa --- /dev/null +++ b/data/mapHeaders/SSAnneB1F.asm @@ -0,0 +1,8 @@ +SSAnneB1F_h: + db SHIP ; tileset + db SS_ANNE_B1F_HEIGHT, SS_ANNE_B1F_WIDTH ; dimensions (y, x) + dw SSAnneB1F_Blocks ; blocks + dw SSAnneB1F_TextPointers ; texts + dw SSAnneB1F_Script ; scripts + db 0 ; connections + dw SSAnneB1F_Object ; objects diff --git a/data/mapHeaders/SSAnneB1FRooms.asm b/data/mapHeaders/SSAnneB1FRooms.asm new file mode 100755 index 00000000..f08e343b --- /dev/null +++ b/data/mapHeaders/SSAnneB1FRooms.asm @@ -0,0 +1,8 @@ +SSAnneB1FRooms_h: + db SHIP ; tileset + db SS_ANNE_B1F_ROOMS_HEIGHT, SS_ANNE_B1F_ROOMS_WIDTH ; dimensions (y, x) + dw SSAnneB1FRooms_Blocks ; blocks + dw SSAnneB1FRooms_TextPointers ; texts + dw SSAnneB1FRooms_Script ; scripts + db 0 ; connections + dw SSAnneB1FRooms_Object ; objects diff --git a/data/mapHeaders/SSAnneBow.asm b/data/mapHeaders/SSAnneBow.asm new file mode 100755 index 00000000..baa71147 --- /dev/null +++ b/data/mapHeaders/SSAnneBow.asm @@ -0,0 +1,8 @@ +SSAnneBow_h: + db SHIP ; tileset + db SS_ANNE_BOW_HEIGHT, SS_ANNE_BOW_WIDTH ; dimensions (y, x) + dw SSAnneBow_Blocks ; blocks + dw SSAnneBow_TextPointers ; texts + dw SSAnneBow_Script ; scripts + db 0 ; connections + dw SSAnneBow_Object ; objects diff --git a/data/mapHeaders/SSAnneCaptainsRoom.asm b/data/mapHeaders/SSAnneCaptainsRoom.asm new file mode 100755 index 00000000..433f060a --- /dev/null +++ b/data/mapHeaders/SSAnneCaptainsRoom.asm @@ -0,0 +1,8 @@ +SSAnneCaptainsRoom_h: + db SHIP ; tileset + db SS_ANNE_CAPTAINS_ROOM_HEIGHT, SS_ANNE_CAPTAINS_ROOM_WIDTH ; dimensions (y, x) + dw SSAnneCaptainsRoom_Blocks ; blocks + dw SSAnneCaptainsRoom_TextPointers ; texts + dw SSAnneCaptainsRoom_Script ; scripts + db 0 ; connections + dw SSAnneCaptainsRoom_Object ; objects diff --git a/data/mapHeaders/SSAnneKitchen.asm b/data/mapHeaders/SSAnneKitchen.asm new file mode 100755 index 00000000..eacbbfb8 --- /dev/null +++ b/data/mapHeaders/SSAnneKitchen.asm @@ -0,0 +1,8 @@ +SSAnneKitchen_h: + db SHIP ; tileset + db SS_ANNE_KITCHEN_HEIGHT, SS_ANNE_KITCHEN_WIDTH ; dimensions (y, x) + dw SSAnneKitchen_Blocks ; blocks + dw SSAnneKitchen_TextPointers ; texts + dw SSAnneKitchen_Script ; scripts + db 0 ; connections + dw SSAnneKitchen_Object ; objects diff --git a/data/mapHeaders/SafariZoneCenter.asm b/data/mapHeaders/SafariZoneCenter.asm new file mode 100755 index 00000000..8ec6c890 --- /dev/null +++ b/data/mapHeaders/SafariZoneCenter.asm @@ -0,0 +1,8 @@ +SafariZoneCenter_h: + db FOREST ; tileset + db SAFARI_ZONE_CENTER_HEIGHT, SAFARI_ZONE_CENTER_WIDTH ; dimensions (y, x) + dw SafariZoneCenter_Blocks ; blocks + dw SafariZoneCenter_TextPointers ; texts + dw SafariZoneCenter_Script ; scripts + db 0 ; connections + dw SafariZoneCenter_Object ; objects diff --git a/data/mapHeaders/SafariZoneCenterRestHouse.asm b/data/mapHeaders/SafariZoneCenterRestHouse.asm new file mode 100755 index 00000000..9b1064f2 --- /dev/null +++ b/data/mapHeaders/SafariZoneCenterRestHouse.asm @@ -0,0 +1,8 @@ +SafariZoneCenterRestHouse_h: + db GATE ; tileset + db SAFARI_ZONE_CENTER_REST_HOUSE_HEIGHT, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; dimensions (y, x) + dw SafariZoneCenterRestHouse_Blocks ; blocks + dw SafariZoneCenterRestHouse_TextPointers ; texts + dw SafariZoneCenterRestHouse_Script ; scripts + db 0 ; connections + dw SafariZoneCenterRestHouse_Object ; objects diff --git a/data/mapHeaders/SafariZoneEast.asm b/data/mapHeaders/SafariZoneEast.asm new file mode 100755 index 00000000..99556473 --- /dev/null +++ b/data/mapHeaders/SafariZoneEast.asm @@ -0,0 +1,8 @@ +SafariZoneEast_h: + db FOREST ; tileset + db SAFARI_ZONE_EAST_HEIGHT, SAFARI_ZONE_EAST_WIDTH ; dimensions (y, x) + dw SafariZoneEast_Blocks ; blocks + dw SafariZoneEast_TextPointers ; texts + dw SafariZoneEast_Script ; scripts + db 0 ; connections + dw SafariZoneEast_Object ; objects diff --git a/data/mapHeaders/SafariZoneEastRestHouse.asm b/data/mapHeaders/SafariZoneEastRestHouse.asm new file mode 100755 index 00000000..b9f219c5 --- /dev/null +++ b/data/mapHeaders/SafariZoneEastRestHouse.asm @@ -0,0 +1,8 @@ +SafariZoneEastRestHouse_h: + db GATE ; tileset + db SAFARI_ZONE_EAST_REST_HOUSE_HEIGHT, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; dimensions (y, x) + dw SafariZoneEastRestHouse_Blocks ; blocks + dw SafariZoneEastRestHouse_TextPointers ; texts + dw SafariZoneEastRestHouse_Script ; scripts + db 0 ; connections + dw SafariZoneEastRestHouse_Object ; objects diff --git a/data/mapHeaders/SafariZoneGate.asm b/data/mapHeaders/SafariZoneGate.asm new file mode 100755 index 00000000..ed306ad0 --- /dev/null +++ b/data/mapHeaders/SafariZoneGate.asm @@ -0,0 +1,8 @@ +SafariZoneGate_h: + db GATE ; tileset + db SAFARI_ZONE_GATE_HEIGHT, SAFARI_ZONE_GATE_WIDTH ; dimensions (y, x) + dw SafariZoneGate_Blocks ; blocks + dw SafariZoneGate_TextPointers ; texts + dw SafariZoneGate_Script ; scripts + db 0 ; connections + dw SafariZoneGate_Object ; objects diff --git a/data/mapHeaders/SafariZoneNorth.asm b/data/mapHeaders/SafariZoneNorth.asm new file mode 100755 index 00000000..3d1a2f51 --- /dev/null +++ b/data/mapHeaders/SafariZoneNorth.asm @@ -0,0 +1,8 @@ +SafariZoneNorth_h: + db FOREST ; tileset + db SAFARI_ZONE_NORTH_HEIGHT, SAFARI_ZONE_NORTH_WIDTH ; dimensions (y, x) + dw SafariZoneNorth_Blocks ; blocks + dw SafariZoneNorth_TextPointers ; texts + dw SafariZoneNorth_Script ; scripts + db 0 ; connections + dw SafariZoneNorth_Object ; objects diff --git a/data/mapHeaders/SafariZoneNorthRestHouse.asm b/data/mapHeaders/SafariZoneNorthRestHouse.asm new file mode 100755 index 00000000..938c15cf --- /dev/null +++ b/data/mapHeaders/SafariZoneNorthRestHouse.asm @@ -0,0 +1,8 @@ +SafariZoneNorthRestHouse_h: + db GATE ; tileset + db SAFARI_ZONE_NORTH_REST_HOUSE_HEIGHT, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; dimensions (y, x) + dw SafariZoneNorthRestHouse_Blocks ; blocks + dw SafariZoneNorthRestHouse_TextPointers ; texts + dw SafariZoneNorthRestHouse_Script ; scripts + db 0 ; connections + dw SafariZoneNorthRestHouse_Object ; objects diff --git a/data/mapHeaders/SafariZoneSecretHouse.asm b/data/mapHeaders/SafariZoneSecretHouse.asm new file mode 100755 index 00000000..91068691 --- /dev/null +++ b/data/mapHeaders/SafariZoneSecretHouse.asm @@ -0,0 +1,8 @@ +SafariZoneSecretHouse_h: + db LAB ; tileset + db SAFARI_ZONE_SECRET_HOUSE_HEIGHT, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; dimensions (y, x) + dw SafariZoneSecretHouse_Blocks ; blocks + dw SafariZoneSecretHouse_TextPointers ; texts + dw SafariZoneSecretHouse_Script ; scripts + db 0 ; connections + dw SafariZoneSecretHouse_Object ; objects diff --git a/data/mapHeaders/SafariZoneWest.asm b/data/mapHeaders/SafariZoneWest.asm new file mode 100755 index 00000000..876169d1 --- /dev/null +++ b/data/mapHeaders/SafariZoneWest.asm @@ -0,0 +1,8 @@ +SafariZoneWest_h: + db FOREST ; tileset + db SAFARI_ZONE_WEST_HEIGHT, SAFARI_ZONE_WEST_WIDTH ; dimensions (y, x) + dw SafariZoneWest_Blocks ; blocks + dw SafariZoneWest_TextPointers ; texts + dw SafariZoneWest_Script ; scripts + db 0 ; connections + dw SafariZoneWest_Object ; objects diff --git a/data/mapHeaders/SafariZoneWestRestHouse.asm b/data/mapHeaders/SafariZoneWestRestHouse.asm new file mode 100755 index 00000000..886382ec --- /dev/null +++ b/data/mapHeaders/SafariZoneWestRestHouse.asm @@ -0,0 +1,8 @@ +SafariZoneWestRestHouse_h: + db GATE ; tileset + db SAFARI_ZONE_WEST_REST_HOUSE_HEIGHT, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; dimensions (y, x) + dw SafariZoneWestRestHouse_Blocks ; blocks + dw SafariZoneWestRestHouse_TextPointers ; texts + dw SafariZoneWestRestHouse_Script ; scripts + db 0 ; connections + dw SafariZoneWestRestHouse_Object ; objects diff --git a/data/mapHeaders/SaffronCity.asm b/data/mapHeaders/SaffronCity.asm new file mode 100755 index 00000000..13239891 --- /dev/null +++ b/data/mapHeaders/SaffronCity.asm @@ -0,0 +1,12 @@ +SaffronCity_h: + db OVERWORLD ; tileset + db SAFFRON_CITY_HEIGHT, SAFFRON_CITY_WIDTH ; dimensions (y, x) + dw SaffronCity_Blocks ; blocks + dw SaffronCity_TextPointers ; texts + dw SaffronCity_Script ; scripts + db NORTH | SOUTH | WEST | EAST ; connections + NORTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_5, 5, 0, Route5_Blocks + SOUTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_6, 5, 0, Route6_Blocks, 1 + WEST_MAP_CONNECTION SAFFRON_CITY, ROUTE_7, 4, 0, Route7_Blocks + EAST_MAP_CONNECTION SAFFRON_CITY, ROUTE_8, 4, 0, Route8_Blocks + dw SaffronCity_Object ; objects diff --git a/data/mapHeaders/SaffronGym.asm b/data/mapHeaders/SaffronGym.asm new file mode 100755 index 00000000..6cbadb2c --- /dev/null +++ b/data/mapHeaders/SaffronGym.asm @@ -0,0 +1,8 @@ +SaffronGym_h: + db FACILITY ; tileset + db SAFFRON_GYM_HEIGHT, SAFFRON_GYM_WIDTH ; dimensions (y, x) + dw SaffronGym_Blocks ; blocks + dw SaffronGym_TextPointers ; texts + dw SaffronGym_Script ; scripts + db 0 ; connections + dw SaffronGym_Object ; objects diff --git a/data/mapHeaders/SaffronMart.asm b/data/mapHeaders/SaffronMart.asm new file mode 100755 index 00000000..abd537b6 --- /dev/null +++ b/data/mapHeaders/SaffronMart.asm @@ -0,0 +1,8 @@ +SaffronMart_h: + db MART ; tileset + db SAFFRON_MART_HEIGHT, SAFFRON_MART_WIDTH ; dimensions (y, x) + dw SaffronMart_Blocks ; blocks + dw SaffronMart_TextPointers ; texts + dw SaffronMart_Script ; scripts + db 0 ; connections + dw SaffronMart_Object ; objects diff --git a/data/mapHeaders/SaffronPidgeyHouse.asm b/data/mapHeaders/SaffronPidgeyHouse.asm new file mode 100755 index 00000000..5d6e21ae --- /dev/null +++ b/data/mapHeaders/SaffronPidgeyHouse.asm @@ -0,0 +1,8 @@ +SaffronPidgeyHouse_h: + db HOUSE ; tileset + db SAFFRON_PIDGEY_HOUSE_HEIGHT, SAFFRON_PIDGEY_HOUSE_WIDTH ; dimensions (y, x) + dw SaffronPidgeyHouse_Blocks ; blocks + dw SaffronPidgeyHouse_TextPointers ; texts + dw SaffronPidgeyHouse_Script ; scripts + db 0 ; connections + dw SaffronPidgeyHouse_Object ; objects diff --git a/data/mapHeaders/SaffronPokecenter.asm b/data/mapHeaders/SaffronPokecenter.asm new file mode 100755 index 00000000..32f1ec71 --- /dev/null +++ b/data/mapHeaders/SaffronPokecenter.asm @@ -0,0 +1,8 @@ +SaffronPokecenter_h: + db POKECENTER ; tileset + db SAFFRON_POKECENTER_HEIGHT, SAFFRON_POKECENTER_WIDTH ; dimensions (y, x) + dw SaffronPokecenter_Blocks ; blocks + dw SaffronPokecenter_TextPointers ; texts + dw SaffronPokecenter_Script ; scripts + db 0 ; connections + dw SaffronPokecenter_Object ; objects diff --git a/data/mapHeaders/SeafoamIslands1F.asm b/data/mapHeaders/SeafoamIslands1F.asm new file mode 100755 index 00000000..f5260cda --- /dev/null +++ b/data/mapHeaders/SeafoamIslands1F.asm @@ -0,0 +1,8 @@ +SeafoamIslands1F_h: + db CAVERN ; tileset + db SEAFOAM_ISLANDS_1F_HEIGHT, SEAFOAM_ISLANDS_1F_WIDTH ; dimensions (y, x) + dw SeafoamIslands1F_Blocks ; blocks + dw SeafoamIslands1F_TextPointers ; texts + dw SeafoamIslands1F_Script ; scripts + db 0 ; connections + dw SeafoamIslands1F_Object ; objects diff --git a/data/mapHeaders/SeafoamIslandsB1F.asm b/data/mapHeaders/SeafoamIslandsB1F.asm new file mode 100755 index 00000000..23116f74 --- /dev/null +++ b/data/mapHeaders/SeafoamIslandsB1F.asm @@ -0,0 +1,8 @@ +SeafoamIslandsB1F_h: + db CAVERN ; tileset + db SEAFOAM_ISLANDS_B1F_HEIGHT, SEAFOAM_ISLANDS_B1F_WIDTH ; dimensions (y, x) + dw SeafoamIslandsB1F_Blocks ; blocks + dw SeafoamIslandsB1F_TextPointers ; texts + dw SeafoamIslandsB1F_Script ; scripts + db 0 ; connections + dw SeafoamIslandsB1F_Object ; objects diff --git a/data/mapHeaders/SeafoamIslandsB2F.asm b/data/mapHeaders/SeafoamIslandsB2F.asm new file mode 100755 index 00000000..10d45dad --- /dev/null +++ b/data/mapHeaders/SeafoamIslandsB2F.asm @@ -0,0 +1,8 @@ +SeafoamIslandsB2F_h: + db CAVERN ; tileset + db SEAFOAM_ISLANDS_B2F_HEIGHT, SEAFOAM_ISLANDS_B2F_WIDTH ; dimensions (y, x) + dw SeafoamIslandsB2F_Blocks ; blocks + dw SeafoamIslandsB2F_TextPointers ; texts + dw SeafoamIslandsB2F_Script ; scripts + db 0 ; connections + dw SeafoamIslandsB2F_Object ; objects diff --git a/data/mapHeaders/SeafoamIslandsB3F.asm b/data/mapHeaders/SeafoamIslandsB3F.asm new file mode 100755 index 00000000..812d1121 --- /dev/null +++ b/data/mapHeaders/SeafoamIslandsB3F.asm @@ -0,0 +1,8 @@ +SeafoamIslandsB3F_h: + db CAVERN ; tileset + db SEAFOAM_ISLANDS_B3F_HEIGHT, SEAFOAM_ISLANDS_B3F_WIDTH ; dimensions (y, x) + dw SeafoamIslandsB3F_Blocks ; blocks + dw SeafoamIslandsB3F_TextPointers ; texts + dw SeafoamIslandsB3F_Script ; scripts + db 0 ; connections + dw SeafoamIslandsB3F_Object ; objects diff --git a/data/mapHeaders/SeafoamIslandsB4F.asm b/data/mapHeaders/SeafoamIslandsB4F.asm new file mode 100755 index 00000000..96c25e06 --- /dev/null +++ b/data/mapHeaders/SeafoamIslandsB4F.asm @@ -0,0 +1,8 @@ +SeafoamIslandsB4F_h: + db CAVERN ; tileset + db SEAFOAM_ISLANDS_B4F_HEIGHT, SEAFOAM_ISLANDS_B4F_WIDTH ; dimensions (y, x) + dw SeafoamIslandsB4F_Blocks ; blocks + dw SeafoamIslandsB4F_TextPointers ; texts + dw SeafoamIslandsB4F_Script ; scripts + db 0 ; connections + dw SeafoamIslandsB4F_Object ; objects diff --git a/data/mapHeaders/SilphCo10F.asm b/data/mapHeaders/SilphCo10F.asm new file mode 100755 index 00000000..ad040479 --- /dev/null +++ b/data/mapHeaders/SilphCo10F.asm @@ -0,0 +1,8 @@ +SilphCo10F_h: + db FACILITY ; tileset + db SILPH_CO_10F_HEIGHT, SILPH_CO_10F_WIDTH ; dimensions (y, x) + dw SilphCo10F_Blocks ; blocks + dw SilphCo10F_TextPointers ; texts + dw SilphCo10F_Script ; scripts + db 0 ; connections + dw SilphCo10F_Object ; objects diff --git a/data/mapHeaders/SilphCo11F.asm b/data/mapHeaders/SilphCo11F.asm new file mode 100755 index 00000000..08d6d650 --- /dev/null +++ b/data/mapHeaders/SilphCo11F.asm @@ -0,0 +1,8 @@ +SilphCo11F_h: + db INTERIOR ; tileset + db SILPH_CO_11F_HEIGHT, SILPH_CO_11F_WIDTH ; dimensions (y, x) + dw SilphCo11F_Blocks ; blocks + dw SilphCo11F_TextPointers ; texts + dw SilphCo11F_Script ; scripts + db 0 ; connections + dw SilphCo11F_Object ; objects diff --git a/data/mapHeaders/SilphCo1F.asm b/data/mapHeaders/SilphCo1F.asm new file mode 100755 index 00000000..45e6c5bf --- /dev/null +++ b/data/mapHeaders/SilphCo1F.asm @@ -0,0 +1,8 @@ +SilphCo1F_h: + db FACILITY ; tileset + db SILPH_CO_1F_HEIGHT, SILPH_CO_1F_WIDTH ; dimensions (y, x) + dw SilphCo1F_Blocks ; blocks + dw SilphCo1F_TextPointers ; texts + dw SilphCo1F_Script ; scripts + db 0 ; connections + dw SilphCo1F_Object ; objects diff --git a/data/mapHeaders/SilphCo2F.asm b/data/mapHeaders/SilphCo2F.asm new file mode 100755 index 00000000..69c2fb51 --- /dev/null +++ b/data/mapHeaders/SilphCo2F.asm @@ -0,0 +1,8 @@ +SilphCo2F_h: + db FACILITY ; tileset + db SILPH_CO_2F_HEIGHT, SILPH_CO_2F_WIDTH ; dimensions (y, x) + dw SilphCo2F_Blocks ; blocks + dw SilphCo2F_TextPointers ; texts + dw SilphCo2F_Script ; scripts + db 0 ; connections + dw SilphCo2F_Object ; objects diff --git a/data/mapHeaders/SilphCo3F.asm b/data/mapHeaders/SilphCo3F.asm new file mode 100755 index 00000000..6911a604 --- /dev/null +++ b/data/mapHeaders/SilphCo3F.asm @@ -0,0 +1,8 @@ +SilphCo3F_h: + db FACILITY ; tileset + db SILPH_CO_3F_HEIGHT, SILPH_CO_3F_WIDTH ; dimensions (y, x) + dw SilphCo3F_Blocks ; blocks + dw SilphCo3F_TextPointers ; texts + dw SilphCo3F_Script ; scripts + db 0 ; connections + dw SilphCo3F_Object ; objects diff --git a/data/mapHeaders/SilphCo4F.asm b/data/mapHeaders/SilphCo4F.asm new file mode 100755 index 00000000..591ddc07 --- /dev/null +++ b/data/mapHeaders/SilphCo4F.asm @@ -0,0 +1,8 @@ +SilphCo4F_h: + db FACILITY ; tileset + db SILPH_CO_4F_HEIGHT, SILPH_CO_4F_WIDTH ; dimensions (y, x) + dw SilphCo4F_Blocks ; blocks + dw SilphCo4F_TextPointers ; texts + dw SilphCo4F_Script ; scripts + db 0 ; connections + dw SilphCo4F_Object ; objects diff --git a/data/mapHeaders/SilphCo5F.asm b/data/mapHeaders/SilphCo5F.asm new file mode 100755 index 00000000..0303ceba --- /dev/null +++ b/data/mapHeaders/SilphCo5F.asm @@ -0,0 +1,8 @@ +SilphCo5F_h: + db FACILITY ; tileset + db SILPH_CO_5F_HEIGHT, SILPH_CO_5F_WIDTH ; dimensions (y, x) + dw SilphCo5F_Blocks ; blocks + dw SilphCo5F_TextPointers ; texts + dw SilphCo5F_Script ; scripts + db 0 ; connections + dw SilphCo5F_Object ; objects diff --git a/data/mapHeaders/SilphCo6F.asm b/data/mapHeaders/SilphCo6F.asm new file mode 100755 index 00000000..b26a7587 --- /dev/null +++ b/data/mapHeaders/SilphCo6F.asm @@ -0,0 +1,8 @@ +SilphCo6F_h: + db FACILITY ; tileset + db SILPH_CO_6F_HEIGHT, SILPH_CO_6F_WIDTH ; dimensions (y, x) + dw SilphCo6F_Blocks ; blocks + dw SilphCo6F_TextPointers ; texts + dw SilphCo6F_Script ; scripts + db 0 ; connections + dw SilphCo6F_Object ; objects diff --git a/data/mapHeaders/SilphCo7F.asm b/data/mapHeaders/SilphCo7F.asm new file mode 100755 index 00000000..5c6ea959 --- /dev/null +++ b/data/mapHeaders/SilphCo7F.asm @@ -0,0 +1,8 @@ +SilphCo7F_h: + db FACILITY ; tileset + db SILPH_CO_7F_HEIGHT, SILPH_CO_7F_WIDTH ; dimensions (y, x) + dw SilphCo7F_Blocks ; blocks + dw SilphCo7F_TextPointers ; texts + dw SilphCo7F_Script ; scripts + db 0 ; connections + dw SilphCo7F_Object ; objects diff --git a/data/mapHeaders/SilphCo8F.asm b/data/mapHeaders/SilphCo8F.asm new file mode 100755 index 00000000..e467298e --- /dev/null +++ b/data/mapHeaders/SilphCo8F.asm @@ -0,0 +1,8 @@ +SilphCo8F_h: + db FACILITY ; tileset + db SILPH_CO_8F_HEIGHT, SILPH_CO_8F_WIDTH ; dimensions (y, x) + dw SilphCo8F_Blocks ; blocks + dw SilphCo8F_TextPointers ; texts + dw SilphCo8F_Script ; scripts + db 0 ; connections + dw SilphCo8F_Object ; objects diff --git a/data/mapHeaders/SilphCo9F.asm b/data/mapHeaders/SilphCo9F.asm new file mode 100755 index 00000000..ec591e51 --- /dev/null +++ b/data/mapHeaders/SilphCo9F.asm @@ -0,0 +1,8 @@ +SilphCo9F_h: + db FACILITY ; tileset + db SILPH_CO_9F_HEIGHT, SILPH_CO_9F_WIDTH ; dimensions (y, x) + dw SilphCo9F_Blocks ; blocks + dw SilphCo9F_TextPointers ; texts + dw SilphCo9F_Script ; scripts + db 0 ; connections + dw SilphCo9F_Object ; objects diff --git a/data/mapHeaders/SilphCoElevator.asm b/data/mapHeaders/SilphCoElevator.asm new file mode 100755 index 00000000..0abe2810 --- /dev/null +++ b/data/mapHeaders/SilphCoElevator.asm @@ -0,0 +1,8 @@ +SilphCoElevator_h: + db LOBBY ; tileset + db SILPH_CO_ELEVATOR_HEIGHT, SILPH_CO_ELEVATOR_WIDTH ; dimensions (y, x) + dw SilphCoElevator_Blocks ; blocks + dw SilphCoElevator_TextPointers ; texts + dw SilphCoElevator_Script ; scripts + db 0 ; connections + dw SilphCoElevator_Object ; objects diff --git a/data/mapHeaders/TradeCenter.asm b/data/mapHeaders/TradeCenter.asm new file mode 100755 index 00000000..39981c35 --- /dev/null +++ b/data/mapHeaders/TradeCenter.asm @@ -0,0 +1,8 @@ +TradeCenter_h: + db CLUB ; tileset + db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x) + dw TradeCenter_Blocks ; blocks + dw TradeCenter_TextPointers ; texts + dw TradeCenter_Script ; scripts + db 0 ; connections + dw TradeCenter_Object ; objects diff --git a/data/mapHeaders/UndergroundPathNorthSouth.asm b/data/mapHeaders/UndergroundPathNorthSouth.asm new file mode 100755 index 00000000..5dd8cdf8 --- /dev/null +++ b/data/mapHeaders/UndergroundPathNorthSouth.asm @@ -0,0 +1,8 @@ +UndergroundPathNorthSouth_h: + db UNDERGROUND ; tileset + db UNDERGROUND_PATH_NORTH_SOUTH_HEIGHT, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; dimensions (y, x) + dw UndergroundPathNorthSouth_Blocks ; blocks + dw UndergroundPathNorthSouth_TextPointers ; texts + dw UndergroundPathNorthSouth_Script ; scripts + db 0 ; connections + dw UndergroundPathNorthSouth_Object ; objects diff --git a/data/mapHeaders/UndergroundPathRoute5.asm b/data/mapHeaders/UndergroundPathRoute5.asm new file mode 100755 index 00000000..14c6aa4d --- /dev/null +++ b/data/mapHeaders/UndergroundPathRoute5.asm @@ -0,0 +1,8 @@ +UndergroundPathRoute5_h: + db GATE ; tileset + db UNDERGROUND_PATH_ROUTE_5_HEIGHT, UNDERGROUND_PATH_ROUTE_5_WIDTH ; dimensions (y, x) + dw UndergroundPathRoute5_Blocks ; blocks + dw UndergroundPathRoute5_TextPointers ; texts + dw UndergroundPathRoute5_Script ; scripts + db 0 ; connections + dw UndergroundPathRoute5_Object ; objects diff --git a/data/mapHeaders/UndergroundPathRoute6.asm b/data/mapHeaders/UndergroundPathRoute6.asm new file mode 100755 index 00000000..6aea459c --- /dev/null +++ b/data/mapHeaders/UndergroundPathRoute6.asm @@ -0,0 +1,8 @@ +UndergroundPathRoute6_h: + db GATE ; tileset + db UNDERGROUND_PATH_ROUTE_6_HEIGHT, UNDERGROUND_PATH_ROUTE_6_WIDTH ; dimensions (y, x) + dw UndergroundPathRoute6_Blocks ; blocks + dw UndergroundPathRoute6_TextPointers ; texts + dw UndergroundPathRoute6_Script ; scripts + db 0 ; connections + dw UndergroundPathRoute6_Object ; objects diff --git a/data/mapHeaders/UndergroundPathRoute7.asm b/data/mapHeaders/UndergroundPathRoute7.asm new file mode 100755 index 00000000..91495ea3 --- /dev/null +++ b/data/mapHeaders/UndergroundPathRoute7.asm @@ -0,0 +1,8 @@ +UndergroundPathRoute7_h: + db GATE ; tileset + db UNDERGROUND_PATH_ROUTE_7_HEIGHT, UNDERGROUND_PATH_ROUTE_7_WIDTH ; dimensions (y, x) + dw UndergroundPathRoute7_Blocks ; blocks + dw UndergroundPathRoute7_TextPointers ; texts + dw UndergroundPathRoute7_Script ; scripts + db 0 ; connections + dw UndergroundPathRoute7_Object ; objects diff --git a/data/mapHeaders/UndergroundPathRoute7Copy.asm b/data/mapHeaders/UndergroundPathRoute7Copy.asm new file mode 100755 index 00000000..9d3f4c62 --- /dev/null +++ b/data/mapHeaders/UndergroundPathRoute7Copy.asm @@ -0,0 +1,8 @@ +UndergroundPathRoute7Copy_h: + db GATE ; tileset + db UNDERGROUND_PATH_ROUTE_7_HEIGHT, UNDERGROUND_PATH_ROUTE_7_WIDTH ; dimensions (y, x) + dw UndergroundPathRoute7Copy_Blocks ; blocks + dw UndergroundPathRoute7Copy_TextPointers ; texts + dw UndergroundPathRoute7Copy_Script ; scripts + db 0 ; connections + dw UndergroundPathRoute7Copy_Object ; objects diff --git a/data/mapHeaders/UndergroundPathRoute8.asm b/data/mapHeaders/UndergroundPathRoute8.asm new file mode 100755 index 00000000..f34265b8 --- /dev/null +++ b/data/mapHeaders/UndergroundPathRoute8.asm @@ -0,0 +1,8 @@ +UndergroundPathRoute8_h: + db GATE ; tileset + db UNDERGROUND_PATH_ROUTE_8_HEIGHT, UNDERGROUND_PATH_ROUTE_8_WIDTH ; dimensions (y, x) + dw UndergroundPathRoute8_Blocks ; blocks + dw UndergroundPathRoute8_TextPointers ; texts + dw UndergroundPathRoute8_Script ; scripts + db 0 ; connections + dw UndergroundPathRoute8_Object ; objects diff --git a/data/mapHeaders/UndergroundPathWestEast.asm b/data/mapHeaders/UndergroundPathWestEast.asm new file mode 100755 index 00000000..d084bd73 --- /dev/null +++ b/data/mapHeaders/UndergroundPathWestEast.asm @@ -0,0 +1,8 @@ +UndergroundPathWestEast_h: + db UNDERGROUND ; tileset + db UNDERGROUND_PATH_WEST_EAST_HEIGHT, UNDERGROUND_PATH_WEST_EAST_WIDTH ; dimensions (y, x) + dw UndergroundPathWestEast_Blocks ; blocks + dw UndergroundPathWestEast_TextPointers ; texts + dw UndergroundPathWestEast_Script ; scripts + db 0 ; connections + dw UndergroundPathWestEast_Object ; objects diff --git a/data/mapHeaders/VermilionCity.asm b/data/mapHeaders/VermilionCity.asm new file mode 100755 index 00000000..6521ad89 --- /dev/null +++ b/data/mapHeaders/VermilionCity.asm @@ -0,0 +1,10 @@ +VermilionCity_h: + db OVERWORLD ; tileset + db VERMILION_CITY_HEIGHT, VERMILION_CITY_WIDTH ; dimensions (y, x) + dw VermilionCity_Blocks ; blocks + dw VermilionCity_TextPointers ; texts + dw VermilionCity_Script ; scripts + db NORTH | EAST ; connections + NORTH_MAP_CONNECTION VERMILION_CITY, ROUTE_6, 5, 0, Route6_Blocks + EAST_MAP_CONNECTION VERMILION_CITY, ROUTE_11, 4, 0, Route11_Blocks + dw VermilionCity_Object ; objects diff --git a/data/mapHeaders/VermilionDock.asm b/data/mapHeaders/VermilionDock.asm new file mode 100755 index 00000000..f7dca8e6 --- /dev/null +++ b/data/mapHeaders/VermilionDock.asm @@ -0,0 +1,8 @@ +VermilionDock_h: + db SHIP_PORT ; tileset + db VERMILION_DOCK_HEIGHT, VERMILION_DOCK_WIDTH ; dimensions (y, x) + dw VermilionDock_Blocks ; blocks + dw VermilionDock_TextPointers ; texts + dw VermilionDock_Script ; scripts + db 0 ; connections + dw VermilionDock_Object ; objects diff --git a/data/mapHeaders/VermilionGym.asm b/data/mapHeaders/VermilionGym.asm new file mode 100755 index 00000000..fe304a2e --- /dev/null +++ b/data/mapHeaders/VermilionGym.asm @@ -0,0 +1,8 @@ +VermilionGym_h: + db GYM ; tileset + db VERMILION_GYM_HEIGHT, VERMILION_GYM_WIDTH ; dimensions (y, x) + dw VermilionGym_Blocks ; blocks + dw VermilionGym_TextPointers ; texts + dw VermilionGym_Script ; scripts + db 0 ; connections + dw VermilionGym_Object ; objects diff --git a/data/mapHeaders/VermilionMart.asm b/data/mapHeaders/VermilionMart.asm new file mode 100755 index 00000000..67f24f59 --- /dev/null +++ b/data/mapHeaders/VermilionMart.asm @@ -0,0 +1,8 @@ +VermilionMart_h: + db MART ; tileset + db VERMILION_MART_HEIGHT, VERMILION_MART_WIDTH ; dimensions (y, x) + dw VermilionMart_Blocks ; blocks + dw VermilionMart_TextPointers ; texts + dw VermilionMart_Script ; scripts + db 0 ; connections + dw VermilionMart_Object ; objects diff --git a/data/mapHeaders/VermilionOldRodHouse.asm b/data/mapHeaders/VermilionOldRodHouse.asm new file mode 100755 index 00000000..f4b69110 --- /dev/null +++ b/data/mapHeaders/VermilionOldRodHouse.asm @@ -0,0 +1,8 @@ +VermilionOldRodHouse_h: + db HOUSE ; tileset + db VERMILION_OLD_ROD_HOUSE_HEIGHT, VERMILION_OLD_ROD_HOUSE_WIDTH ; dimensions (y, x) + dw VermilionOldRodHouse_Blocks ; blocks + dw VermilionOldRodHouse_TextPointers ; texts + dw VermilionOldRodHouse_Script ; scripts + db 0 ; connections + dw VermilionOldRodHouse_Object ; objects diff --git a/data/mapHeaders/VermilionPidgeyHouse.asm b/data/mapHeaders/VermilionPidgeyHouse.asm new file mode 100755 index 00000000..af052fa6 --- /dev/null +++ b/data/mapHeaders/VermilionPidgeyHouse.asm @@ -0,0 +1,8 @@ +VermilionPidgeyHouse_h: + db HOUSE ; tileset + db VERMILION_PIDGEY_HOUSE_HEIGHT, VERMILION_PIDGEY_HOUSE_WIDTH ; dimensions (y, x) + dw VermilionPidgeyHouse_Blocks ; blocks + dw VermilionPidgeyHouse_TextPointers ; texts + dw VermilionPidgeyHouse_Script ; scripts + db 0 ; connections + dw VermilionPidgeyHouse_Object ; objects diff --git a/data/mapHeaders/VermilionPokecenter.asm b/data/mapHeaders/VermilionPokecenter.asm new file mode 100755 index 00000000..3d4c23ec --- /dev/null +++ b/data/mapHeaders/VermilionPokecenter.asm @@ -0,0 +1,8 @@ +VermilionPokecenter_h: + db POKECENTER ; tileset + db VERMILION_POKECENTER_HEIGHT, VERMILION_POKECENTER_WIDTH ; dimensions (y, x) + dw VermilionPokecenter_Blocks ; blocks + dw VermilionPokecenter_TextPointers ; texts + dw VermilionPokecenter_Script ; scripts + db 0 ; connections + dw VermilionPokecenter_Object ; objects diff --git a/data/mapHeaders/VermilionTradeHouse.asm b/data/mapHeaders/VermilionTradeHouse.asm new file mode 100755 index 00000000..21d30049 --- /dev/null +++ b/data/mapHeaders/VermilionTradeHouse.asm @@ -0,0 +1,8 @@ +VermilionTradeHouse_h: + db HOUSE ; tileset + db VERMILION_TRADE_HOUSE_HEIGHT, VERMILION_TRADE_HOUSE_WIDTH ; dimensions (y, x) + dw VermilionTradeHouse_Blocks ; blocks + dw VermilionTradeHouse_TextPointers ; texts + dw VermilionTradeHouse_Script ; scripts + db 0 ; connections + dw VermilionTradeHouse_Object ; objects diff --git a/data/mapHeaders/VictoryRoad1F.asm b/data/mapHeaders/VictoryRoad1F.asm new file mode 100755 index 00000000..3508d782 --- /dev/null +++ b/data/mapHeaders/VictoryRoad1F.asm @@ -0,0 +1,8 @@ +VictoryRoad1F_h: + db CAVERN ; tileset + db VICTORY_ROAD_1F_HEIGHT, VICTORY_ROAD_1F_WIDTH ; dimensions (y, x) + dw VictoryRoad1F_Blocks ; blocks + dw VictoryRoad1F_TextPointers ; texts + dw VictoryRoad1F_Script ; scripts + db 0 ; connections + dw VictoryRoad1F_Object ; objects diff --git a/data/mapHeaders/VictoryRoad2F.asm b/data/mapHeaders/VictoryRoad2F.asm new file mode 100755 index 00000000..31693c1c --- /dev/null +++ b/data/mapHeaders/VictoryRoad2F.asm @@ -0,0 +1,8 @@ +VictoryRoad2F_h: + db CAVERN ; tileset + db VICTORY_ROAD_2F_HEIGHT, VICTORY_ROAD_2F_WIDTH ; dimensions (y, x) + dw VictoryRoad2F_Blocks ; blocks + dw VictoryRoad2F_TextPointers ; texts + dw VictoryRoad2F_Script ; scripts + db 0 ; connections + dw VictoryRoad2F_Object ; objects diff --git a/data/mapHeaders/VictoryRoad3F.asm b/data/mapHeaders/VictoryRoad3F.asm new file mode 100755 index 00000000..3f5e21d2 --- /dev/null +++ b/data/mapHeaders/VictoryRoad3F.asm @@ -0,0 +1,8 @@ +VictoryRoad3F_h: + db CAVERN ; tileset + db VICTORY_ROAD_3F_HEIGHT, VICTORY_ROAD_3F_WIDTH ; dimensions (y, x) + dw VictoryRoad3F_Blocks ; blocks + dw VictoryRoad3F_TextPointers ; texts + dw VictoryRoad3F_Script ; scripts + db 0 ; connections + dw VictoryRoad3F_Object ; objects diff --git a/data/mapHeaders/ViridianCity.asm b/data/mapHeaders/ViridianCity.asm new file mode 100755 index 00000000..09f7b9f4 --- /dev/null +++ b/data/mapHeaders/ViridianCity.asm @@ -0,0 +1,11 @@ +ViridianCity_h: + db OVERWORLD ; tileset + db VIRIDIAN_CITY_HEIGHT, VIRIDIAN_CITY_WIDTH ; dimensions (y, x) + dw ViridianCity_Blocks ; blocks + dw ViridianCity_TextPointers ; texts + dw ViridianCity_Script ; scripts + db NORTH | SOUTH | WEST ; connections + NORTH_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_2, 5, 0, Route2_Blocks + SOUTH_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_1, 5, 0, Route1_Blocks, 1 + WEST_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_22, 4, 0, Route22_Blocks + dw ViridianCity_Object ; objects diff --git a/data/mapHeaders/ViridianForest.asm b/data/mapHeaders/ViridianForest.asm new file mode 100755 index 00000000..a8df3e6e --- /dev/null +++ b/data/mapHeaders/ViridianForest.asm @@ -0,0 +1,8 @@ +ViridianForest_h: + db FOREST ; tileset + db VIRIDIAN_FOREST_HEIGHT, VIRIDIAN_FOREST_WIDTH ; dimensions (y, x) + dw ViridianForest_Blocks ; blocks + dw ViridianForest_TextPointers ; texts + dw ViridianForest_Script ; scripts + db 0 ; connections + dw ViridianForest_Object ; objects diff --git a/data/mapHeaders/ViridianForestNorthGate.asm b/data/mapHeaders/ViridianForestNorthGate.asm new file mode 100755 index 00000000..48535977 --- /dev/null +++ b/data/mapHeaders/ViridianForestNorthGate.asm @@ -0,0 +1,8 @@ +ViridianForestNorthGate_h: + db FOREST_GATE ; tileset + db VIRIDIAN_FOREST_NORTH_GATE_HEIGHT, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; dimensions (y, x) + dw ViridianForestNorthGate_Blocks ; blocks + dw ViridianForestNorthGate_TextPointers ; texts + dw ViridianForestNorthGate_Script ; scripts + db 0 ; connections + dw ViridianForestNorthGate_Object ; objects diff --git a/data/mapHeaders/ViridianForestSouthGate.asm b/data/mapHeaders/ViridianForestSouthGate.asm new file mode 100755 index 00000000..b134ebea --- /dev/null +++ b/data/mapHeaders/ViridianForestSouthGate.asm @@ -0,0 +1,8 @@ +ViridianForestSouthGate_h: + db FOREST_GATE ; tileset + db VIRIDIAN_FOREST_SOUTH_GATE_HEIGHT, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; dimensions (y, x) + dw ViridianForestSouthGate_Blocks ; blocks + dw ViridianForestSouthGate_TextPointers ; texts + dw ViridianForestSouthGate_Script ; scripts + db 0 ; connections + dw ViridianForestSouthGate_Object ; objects diff --git a/data/mapHeaders/ViridianGym.asm b/data/mapHeaders/ViridianGym.asm new file mode 100755 index 00000000..9b27845c --- /dev/null +++ b/data/mapHeaders/ViridianGym.asm @@ -0,0 +1,8 @@ +ViridianGym_h: + db GYM ; tileset + db VIRIDIAN_GYM_HEIGHT, VIRIDIAN_GYM_WIDTH ; dimensions (y, x) + dw ViridianGym_Blocks ; blocks + dw ViridianGym_TextPointers ; texts + dw ViridianGym_Script ; scripts + db 0 ; connections + dw ViridianGym_Object ; objects diff --git a/data/mapHeaders/ViridianMart.asm b/data/mapHeaders/ViridianMart.asm new file mode 100755 index 00000000..063f3327 --- /dev/null +++ b/data/mapHeaders/ViridianMart.asm @@ -0,0 +1,8 @@ +ViridianMart_h: + db MART ; tileset + db VIRIDIAN_MART_HEIGHT, VIRIDIAN_MART_WIDTH ; dimensions (y, x) + dw ViridianMart_Blocks ; blocks + dw ViridianMart_TextPointers ; texts + dw ViridianMart_Script ; scripts + db 0 ; connections + dw ViridianMart_Object ; objects diff --git a/data/mapHeaders/ViridianNicknameHouse.asm b/data/mapHeaders/ViridianNicknameHouse.asm new file mode 100755 index 00000000..b6a00392 --- /dev/null +++ b/data/mapHeaders/ViridianNicknameHouse.asm @@ -0,0 +1,8 @@ +ViridianNicknameHouse_h: + db HOUSE ; tileset + db VIRIDIAN_NICKNAME_HOUSE_HEIGHT, VIRIDIAN_NICKNAME_HOUSE_WIDTH ; dimensions (y, x) + dw ViridianNicknameHouse_Blocks ; blocks + dw ViridianNicknameHouse_TextPointers ; texts + dw ViridianNicknameHouse_Script ; scripts + db 0 ; connections + dw ViridianNicknameHouse_Object ; objects diff --git a/data/mapHeaders/ViridianPokecenter.asm b/data/mapHeaders/ViridianPokecenter.asm new file mode 100755 index 00000000..25c569d8 --- /dev/null +++ b/data/mapHeaders/ViridianPokecenter.asm @@ -0,0 +1,8 @@ +ViridianPokecenter_h: + db POKECENTER ; tileset + db VIRIDIAN_POKECENTER_HEIGHT, VIRIDIAN_POKECENTER_WIDTH ; dimensions (y, x) + dw ViridianPokecenter_Blocks ; blocks + dw ViridianPokecenter_TextPointers ; texts + dw ViridianPokecenter_Script ; scripts + db 0 ; connections + dw ViridianPokecenter_Object ; objects diff --git a/data/mapHeaders/ViridianSchoolHouse.asm b/data/mapHeaders/ViridianSchoolHouse.asm new file mode 100755 index 00000000..15e5c88f --- /dev/null +++ b/data/mapHeaders/ViridianSchoolHouse.asm @@ -0,0 +1,8 @@ +ViridianSchoolHouse_h: + db HOUSE ; tileset + db VIRIDIAN_SCHOOL_HOUSE_HEIGHT, VIRIDIAN_SCHOOL_HOUSE_WIDTH ; dimensions (y, x) + dw ViridianSchoolHouse_Blocks ; blocks + dw ViridianSchoolHouse_TextPointers ; texts + dw ViridianSchoolHouse_Script ; scripts + db 0 ; connections + dw ViridianSchoolHouse_Object ; objects diff --git a/data/mapHeaders/WardensHouse.asm b/data/mapHeaders/WardensHouse.asm new file mode 100755 index 00000000..128e357a --- /dev/null +++ b/data/mapHeaders/WardensHouse.asm @@ -0,0 +1,8 @@ +WardensHouse_h: + db LAB ; tileset + db WARDENS_HOUSE_HEIGHT, WARDENS_HOUSE_WIDTH ; dimensions (y, x) + dw WardensHouse_Blocks ; blocks + dw WardensHouse_TextPointers ; texts + dw WardensHouse_Script ; scripts + db 0 ; connections + dw WardensHouse_Object ; objects diff --git a/data/mapHeaders/agatha.asm b/data/mapHeaders/agatha.asm deleted file mode 100755 index 155f07db..00000000 --- a/data/mapHeaders/agatha.asm +++ /dev/null @@ -1,6 +0,0 @@ -Agatha_h: - db CEMETERY ; tileset - db AGATHAS_ROOM_HEIGHT, AGATHAS_ROOM_WIDTH ; dimensions (y, x) - dw AgathaBlocks, AgathaTextPointers, AgathaScript ; blocks, texts, scripts - db 0 ; connections - dw AgathaObject ; objects diff --git a/data/mapHeaders/bikeshop.asm b/data/mapHeaders/bikeshop.asm deleted file mode 100755 index 1524f59b..00000000 --- a/data/mapHeaders/bikeshop.asm +++ /dev/null @@ -1,6 +0,0 @@ -BikeShop_h: - db CLUB ; tileset - db BIKE_SHOP_HEIGHT, BIKE_SHOP_WIDTH ; dimensions (y, x) - dw BikeShopBlocks, BikeShopTextPointers, BikeShopScript ; blocks, texts, scripts - db 0 ; connections - dw BikeShopObject ; objects diff --git a/data/mapHeaders/billshouse.asm b/data/mapHeaders/billshouse.asm deleted file mode 100755 index 832affe9..00000000 --- a/data/mapHeaders/billshouse.asm +++ /dev/null @@ -1,6 +0,0 @@ -BillsHouse_h: - db INTERIOR ; tileset - db BILLS_HOUSE_HEIGHT, BILLS_HOUSE_WIDTH ; dimensions (y, x) - dw BillsHouseBlocks, BillsHouseTextPointers, BillsHouseScript ; blocks, texts, scripts - db 0 ; connections - dw BillsHouseObject ; objects diff --git a/data/mapHeaders/blueshouse.asm b/data/mapHeaders/blueshouse.asm deleted file mode 100755 index 4b5c45e7..00000000 --- a/data/mapHeaders/blueshouse.asm +++ /dev/null @@ -1,6 +0,0 @@ -BluesHouse_h: - db HOUSE ; tileset - db BLUES_HOUSE_HEIGHT, BLUES_HOUSE_WIDTH ; dimensions (y, x) - dw BluesHouseBlocks, BluesHouseTextPointers, BluesHouseScript ; blocks, texts, scripts - db 0 ; connections - dw BluesHouseObject ; objects diff --git a/data/mapHeaders/bruno.asm b/data/mapHeaders/bruno.asm deleted file mode 100755 index 921fa80c..00000000 --- a/data/mapHeaders/bruno.asm +++ /dev/null @@ -1,6 +0,0 @@ -Bruno_h: - db GYM ; tileset - db BRUNOS_ROOM_HEIGHT, BRUNOS_ROOM_WIDTH ; dimensions (y, x) - dw BrunoBlocks, BrunoTextPointers, BrunoScript ; blocks, texts, scripts - db 0 ; connections - dw BrunoObject ; objects diff --git a/data/mapHeaders/celadoncity.asm b/data/mapHeaders/celadoncity.asm deleted file mode 100755 index 7f94cad5..00000000 --- a/data/mapHeaders/celadoncity.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonCity_h: - db OVERWORLD ; tileset - db CELADON_CITY_HEIGHT, CELADON_CITY_WIDTH ; dimensions (y, x) - dw CeladonCityBlocks, CeladonCityTextPointers, CeladonCityScript ; blocks, texts, scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION CELADON_CITY, ROUTE_16, 4, 0, Route16Blocks - EAST_MAP_CONNECTION CELADON_CITY, ROUTE_7, 4, 0, Route7Blocks, 1 - dw CeladonCityObject ; objects diff --git a/data/mapHeaders/celadondiner.asm b/data/mapHeaders/celadondiner.asm deleted file mode 100755 index f608af16..00000000 --- a/data/mapHeaders/celadondiner.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonDiner_h: - db LOBBY ; tileset - db CELADON_DINER_HEIGHT, CELADON_DINER_WIDTH ; dimensions (y, x) - dw CeladonDinerBlocks, CeladonDinerTextPointers, CeladonDinerScript ; blocks, texts, scripts - db 0 ; connections - dw CeladonDinerObject ; objects diff --git a/data/mapHeaders/celadongamecorner.asm b/data/mapHeaders/celadongamecorner.asm deleted file mode 100755 index 76403d92..00000000 --- a/data/mapHeaders/celadongamecorner.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonGameCorner_h: - db LOBBY ; tileset - db GAME_CORNER_HEIGHT, GAME_CORNER_WIDTH ; dimensions (y, x) - dw CeladonGameCornerBlocks, CeladonGameCornerTextPointers, CeladonGameCornerScript ; blocks, texts, scripts - db 0 ; connections - dw CeladonGameCornerObject ; objects diff --git a/data/mapHeaders/celadongym.asm b/data/mapHeaders/celadongym.asm deleted file mode 100755 index 78e486f3..00000000 --- a/data/mapHeaders/celadongym.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonGym_h: - db GYM ; tileset - db CELADON_GYM_HEIGHT, CELADON_GYM_WIDTH ; dimensions (y, x) - dw CeladonGymBlocks, CeladonGymTextPointers, CeladonGymScript ; blocks, texts, scripts - db 0 ; connections - dw CeladonGymObject ; objects diff --git a/data/mapHeaders/celadonhotel.asm b/data/mapHeaders/celadonhotel.asm deleted file mode 100755 index ddc27cd6..00000000 --- a/data/mapHeaders/celadonhotel.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonHotel_h: - db POKECENTER ; tileset - db CELADON_HOTEL_HEIGHT, CELADON_HOTEL_WIDTH ; dimensions (y, x) - dw CeladonHotelBlocks, CeladonHotelTextPointers, CeladonHotelScript ; blocks, texts, scripts - db 0 ; connections - dw CeladonHotelObject ; objects diff --git a/data/mapHeaders/celadonhouse.asm b/data/mapHeaders/celadonhouse.asm deleted file mode 100755 index d6d27a64..00000000 --- a/data/mapHeaders/celadonhouse.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonHouse_h: - db MANSION ; tileset - db CELADON_HOUSE_HEIGHT, CELADON_HOUSE_WIDTH ; dimensions (y, x) - dw CeladonHouseBlocks, CeladonHouseTextPointers, CeladonHouseScript ; blocks, texts, scripts - db 0 ; connections - dw CeladonHouseObject ; objects diff --git a/data/mapHeaders/celadonmansion1.asm b/data/mapHeaders/celadonmansion1.asm deleted file mode 100755 index da773943..00000000 --- a/data/mapHeaders/celadonmansion1.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMansion1_h: - db MANSION ; tileset - db CELADON_MANSION_1_HEIGHT, CELADON_MANSION_1_WIDTH ; dimensions (y, x) - dw CeladonMansion1Blocks, CeladonMansion1TextPointers, CeladonMansion1Script ; blocks, texts, scripts - db 0 ; connections - dw CeladonMansion1Object ; objects diff --git a/data/mapHeaders/celadonmansion2.asm b/data/mapHeaders/celadonmansion2.asm deleted file mode 100755 index 92970148..00000000 --- a/data/mapHeaders/celadonmansion2.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMansion2_h: - db MANSION ; tileset - db CELADON_MANSION_2_HEIGHT, CELADON_MANSION_2_WIDTH ; dimensions (y, x) - dw CeladonMansion2Blocks, CeladonMansion2TextPointers, CeladonMansion2Script ; blocks, texts, scripts - db 0 ; connections - dw CeladonMansion2Object ; objects diff --git a/data/mapHeaders/celadonmansion3.asm b/data/mapHeaders/celadonmansion3.asm deleted file mode 100755 index 95c93bd7..00000000 --- a/data/mapHeaders/celadonmansion3.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMansion3_h: - db MANSION ; tileset - db CELADON_MANSION_3_HEIGHT, CELADON_MANSION_3_WIDTH ; dimensions (y, x) - dw CeladonMansion3Blocks, CeladonMansion3TextPointers, CeladonMansion3Script ; blocks, texts, scripts - db 0 ; connections - dw CeladonMansion3Object ; objects diff --git a/data/mapHeaders/celadonmansion4.asm b/data/mapHeaders/celadonmansion4.asm deleted file mode 100755 index 6b4e833a..00000000 --- a/data/mapHeaders/celadonmansion4.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMansion4_h: - db MANSION ; tileset - db CELADON_MANSION_4_HEIGHT, CELADON_MANSION_4_WIDTH ; dimensions (y, x) - dw CeladonMansion4Blocks, CeladonMansion4TextPointers, CeladonMansion4Script ; blocks, texts, scripts - db 0 ; connections - dw CeladonMansion4Object ; objects diff --git a/data/mapHeaders/celadonmansion5.asm b/data/mapHeaders/celadonmansion5.asm deleted file mode 100755 index 7cc16d24..00000000 --- a/data/mapHeaders/celadonmansion5.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMansion5_h: - db HOUSE ; tileset - db CELADON_MANSION_5_HEIGHT, CELADON_MANSION_5_WIDTH ; dimensions (y, x) - dw CeladonMansion5Blocks, CeladonMansion5TextPointers, CeladonMansion5Script ; blocks, texts, scripts - db 0 ; connections - dw CeladonMansion5Object ; objects diff --git a/data/mapHeaders/celadonmart1.asm b/data/mapHeaders/celadonmart1.asm deleted file mode 100755 index 12b013a4..00000000 --- a/data/mapHeaders/celadonmart1.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMart1_h: - db LOBBY ; tileset - db CELADON_MART_1_HEIGHT, CELADON_MART_1_WIDTH ; dimensions (y, x) - dw CeladonMart1Blocks, CeladonMart1TextPointers, CeladonMart1Script ; blocks, texts, scripts - db 0 ; connections - dw CeladonMart1Object ; objects diff --git a/data/mapHeaders/celadonmart2.asm b/data/mapHeaders/celadonmart2.asm deleted file mode 100755 index 210f85af..00000000 --- a/data/mapHeaders/celadonmart2.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMart2_h: - db LOBBY ; tileset - db CELADON_MART_2_HEIGHT, CELADON_MART_2_WIDTH ; dimensions (y, x) - dw CeladonMart2Blocks, CeladonMart2TextPointers, CeladonMart2Script ; blocks, texts, scripts - db 0 ; connections - dw CeladonMart2Object ; objects diff --git a/data/mapHeaders/celadonmart3.asm b/data/mapHeaders/celadonmart3.asm deleted file mode 100755 index 511b1405..00000000 --- a/data/mapHeaders/celadonmart3.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMart3_h: - db LOBBY ; tileset - db CELADON_MART_3_HEIGHT, CELADON_MART_3_WIDTH ; dimensions (y, x) - dw CeladonMart3Blocks, CeladonMart3TextPointers, CeladonMart3Script ; blocks, texts, scripts - db 0 ; connections - dw CeladonMart3Object ; objects diff --git a/data/mapHeaders/celadonmart4.asm b/data/mapHeaders/celadonmart4.asm deleted file mode 100755 index fd34406d..00000000 --- a/data/mapHeaders/celadonmart4.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMart4_h: - db LOBBY ; tileset - db CELADON_MART_4_HEIGHT, CELADON_MART_4_WIDTH ; dimensions (y, x) - dw CeladonMart4Blocks, CeladonMart4TextPointers, CeladonMart4Script ; blocks, texts, scripts - db 0 ; connections - dw CeladonMart4Object ; objects diff --git a/data/mapHeaders/celadonmart5.asm b/data/mapHeaders/celadonmart5.asm deleted file mode 100755 index 66e70f28..00000000 --- a/data/mapHeaders/celadonmart5.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMart5_h: - db LOBBY ; tileset - db CELADON_MART_5_HEIGHT, CELADON_MART_5_WIDTH ; dimensions (y, x) - dw CeladonMart5Blocks, CeladonMart5TextPointers, CeladonMart5Script ; blocks, texts, scripts - db 0 ; connections - dw CeladonMart5Object ; objects diff --git a/data/mapHeaders/celadonmartelevator.asm b/data/mapHeaders/celadonmartelevator.asm deleted file mode 100755 index 149e5b0f..00000000 --- a/data/mapHeaders/celadonmartelevator.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMartElevator_h: - db LOBBY ; tileset - db CELADON_MART_ELEVATOR_HEIGHT, CELADON_MART_ELEVATOR_WIDTH ; dimensions (y, x) - dw CeladonMartElevatorBlocks, CeladonMartElevatorTextPointers, CeladonMartElevatorScript ; blocks, texts, scripts - db 0 ; connections - dw CeladonMartElevatorObject ; objects diff --git a/data/mapHeaders/celadonmartroof.asm b/data/mapHeaders/celadonmartroof.asm deleted file mode 100755 index 2073afd2..00000000 --- a/data/mapHeaders/celadonmartroof.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonMartRoof_h: - db LOBBY ; tileset - db CELADON_MART_ROOF_HEIGHT, CELADON_MART_ROOF_WIDTH ; dimensions (y, x) - dw CeladonMartRoofBlocks, CeladonMartRoofTextPointers, CeladonMartRoofScript ; blocks, texts, scripts - db 0 ; connections - dw CeladonMartRoofObject ; objects diff --git a/data/mapHeaders/celadonpokecenter.asm b/data/mapHeaders/celadonpokecenter.asm deleted file mode 100755 index bfeb76b7..00000000 --- a/data/mapHeaders/celadonpokecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonPokecenter_h: - db POKECENTER ; tileset - db CELADON_POKECENTER_HEIGHT, CELADON_POKECENTER_WIDTH ; dimensions (y, x) - dw CeladonPokecenterBlocks, CeladonPokecenterTextPointers, CeladonPokecenterScript ; blocks, texts, scripts - db 0 ; connections - dw CeladonPokecenterObject ; objects diff --git a/data/mapHeaders/celadonprizeroom.asm b/data/mapHeaders/celadonprizeroom.asm deleted file mode 100755 index 83161b30..00000000 --- a/data/mapHeaders/celadonprizeroom.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeladonPrizeRoom_h: - db LOBBY ; tileset - db CELADON_PRIZE_ROOM_HEIGHT, CELADON_PRIZE_ROOM_WIDTH ; dimensions (y, x) - dw CeladonPrizeRoomBlocks, CeladonPrizeRoomTextPointers, CeladonPrizeRoomScript ; blocks, texts, scripts - db 0 ; connections - dw CeladonPrizeRoomObject ; objects diff --git a/data/mapHeaders/ceruleancity.asm b/data/mapHeaders/ceruleancity.asm deleted file mode 100755 index be6dc5b2..00000000 --- a/data/mapHeaders/ceruleancity.asm +++ /dev/null @@ -1,10 +0,0 @@ -CeruleanCity_h: - db OVERWORLD ; tileset - db CERULEAN_CITY_HEIGHT, CERULEAN_CITY_WIDTH ; dimensions (y, x) - dw CeruleanCityBlocks, CeruleanCityTextPointers, CeruleanCityScript ; blocks, texts, scripts - db NORTH | SOUTH | WEST | EAST ; connections - NORTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_24, 5, 0, Route24Blocks - SOUTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_5, 5, 0, Route5Blocks, 1 - WEST_MAP_CONNECTION CERULEAN_CITY, ROUTE_4, 4, 0, Route4Blocks - EAST_MAP_CONNECTION CERULEAN_CITY, ROUTE_9, 4, 0, Route9Blocks - dw CeruleanCityObject ; objects diff --git a/data/mapHeaders/ceruleangym.asm b/data/mapHeaders/ceruleangym.asm deleted file mode 100755 index 3c4f8052..00000000 --- a/data/mapHeaders/ceruleangym.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeruleanGym_h: - db GYM ; tileset - db CERULEAN_GYM_HEIGHT, CERULEAN_GYM_WIDTH ; dimensions (y, x) - dw CeruleanGymBlocks, CeruleanGymTextPointers, CeruleanGymScript ; blocks, texts, scripts - db 0 ; connections - dw CeruleanGymObject ; objects diff --git a/data/mapHeaders/ceruleanhouse1.asm b/data/mapHeaders/ceruleanhouse1.asm deleted file mode 100755 index fa12c61c..00000000 --- a/data/mapHeaders/ceruleanhouse1.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeruleanHouse1_h: - db HOUSE ; tileset - db CERULEAN_HOUSE_1_HEIGHT, CERULEAN_HOUSE_1_WIDTH ; dimensions (y, x) - dw CeruleanHouse1Blocks, CeruleanHouse1TextPointers, CeruleanHouse1Script ; blocks, texts, scripts - db 0 ; connections - dw CeruleanHouse1Object ; objects diff --git a/data/mapHeaders/ceruleanhouse2.asm b/data/mapHeaders/ceruleanhouse2.asm deleted file mode 100755 index 78f6d821..00000000 --- a/data/mapHeaders/ceruleanhouse2.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeruleanHouse2_h: - db SHIP ; tileset - db CERULEAN_HOUSE_2_HEIGHT, CERULEAN_HOUSE_2_WIDTH ; dimensions (y, x) - dw CeruleanHouse2Blocks, CeruleanHouse2TextPointers, CeruleanHouse2Script ; blocks, texts, scripts - db 0 ; connections - dw CeruleanHouse2Object ; objects diff --git a/data/mapHeaders/ceruleanhousetrashed.asm b/data/mapHeaders/ceruleanhousetrashed.asm deleted file mode 100755 index 53eaa581..00000000 --- a/data/mapHeaders/ceruleanhousetrashed.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeruleanHouseTrashed_h: - db HOUSE ; tileset - db TRASHED_HOUSE_HEIGHT, TRASHED_HOUSE_WIDTH ; dimensions (y, x) - dw CeruleanHouseTrashedBlocks, CeruleanHouseTrashedTextPointers, CeruleanHouseTrashedScript ; blocks, texts, scripts - db 0 ; connections - dw CeruleanHouseTrashedObject ; objects diff --git a/data/mapHeaders/ceruleanmart.asm b/data/mapHeaders/ceruleanmart.asm deleted file mode 100755 index 12bafa98..00000000 --- a/data/mapHeaders/ceruleanmart.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeruleanMart_h: - db MART ; tileset - db CERULEAN_MART_HEIGHT, CERULEAN_MART_WIDTH ; dimensions (y, x) - dw CeruleanMartBlocks, CeruleanMartTextPointers, CeruleanMartScript ; blocks, texts, scripts - db 0 ; connections - dw CeruleanMartObject ; objects diff --git a/data/mapHeaders/ceruleanpokecenter.asm b/data/mapHeaders/ceruleanpokecenter.asm deleted file mode 100755 index 41fcdd90..00000000 --- a/data/mapHeaders/ceruleanpokecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -CeruleanPokecenter_h: - db POKECENTER ; tileset - db CERULEAN_POKECENTER_HEIGHT, CERULEAN_POKECENTER_WIDTH ; dimensions (y, x) - dw CeruleanPokecenterBlocks, CeruleanPokecenterTextPointers, CeruleanPokecenterScript ; blocks, texts, scripts - db 0 ; connections - dw CeruleanPokecenterObject ; objects diff --git a/data/mapHeaders/cinnabargym.asm b/data/mapHeaders/cinnabargym.asm deleted file mode 100755 index 2cb7dc74..00000000 --- a/data/mapHeaders/cinnabargym.asm +++ /dev/null @@ -1,6 +0,0 @@ -CinnabarGym_h: - db FACILITY ; tileset - db CINNABAR_GYM_HEIGHT, CINNABAR_GYM_WIDTH ; dimensions (y, x) - dw CinnabarGymBlocks, CinnabarGymTextPointers, CinnabarGymScript ; blocks, texts, scripts - db 0 ; connections - dw CinnabarGymObject ; objects diff --git a/data/mapHeaders/cinnabarisland.asm b/data/mapHeaders/cinnabarisland.asm deleted file mode 100755 index 6ae6424d..00000000 --- a/data/mapHeaders/cinnabarisland.asm +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarIsland_h: - db OVERWORLD ; tileset - db CINNABAR_ISLAND_HEIGHT, CINNABAR_ISLAND_WIDTH ; dimensions (y, x) - dw CinnabarIslandBlocks, CinnabarIslandTextPointers, CinnabarIslandScript ; blocks, texts, scripts - db NORTH | EAST ; connections - NORTH_MAP_CONNECTION CINNABAR_ISLAND, ROUTE_21, 0, 0, Route21Blocks - EAST_MAP_CONNECTION CINNABAR_ISLAND, ROUTE_20, 0, 0, Route20Blocks - dw CinnabarIslandObject ; objects diff --git a/data/mapHeaders/cinnabarmart.asm b/data/mapHeaders/cinnabarmart.asm deleted file mode 100755 index e2c8437d..00000000 --- a/data/mapHeaders/cinnabarmart.asm +++ /dev/null @@ -1,6 +0,0 @@ -CinnabarMart_h: - db MART ; tileset - db CINNABAR_MART_HEIGHT, CINNABAR_MART_WIDTH ; dimensions (y, x) - dw CinnabarMartBlocks, CinnabarMartTextPointers, CinnabarMartScript ; blocks, texts, scripts - db 0 ; connections - dw CinnabarMartObject ; objects diff --git a/data/mapHeaders/cinnabarpokecenter.asm b/data/mapHeaders/cinnabarpokecenter.asm deleted file mode 100755 index a11a02f3..00000000 --- a/data/mapHeaders/cinnabarpokecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -CinnabarPokecenter_h: - db POKECENTER ; tileset - db CINNABAR_POKECENTER_HEIGHT, CINNABAR_POKECENTER_WIDTH ; dimensions (y, x) - dw CinnabarPokecenterBlocks, CinnabarPokecenterTextPointers, CinnabarPokecenterScript ; blocks, texts, scripts - db 0 ; connections - dw CinnabarPokecenterObject ; objects diff --git a/data/mapHeaders/colosseum.asm b/data/mapHeaders/colosseum.asm deleted file mode 100755 index 13d9f0c4..00000000 --- a/data/mapHeaders/colosseum.asm +++ /dev/null @@ -1,6 +0,0 @@ -Colosseum_h: - db CLUB ; tileset - db COLOSSEUM_HEIGHT, COLOSSEUM_WIDTH ; dimensions (y, x) - dw ColosseumBlocks, ColosseumTextPointers, ColosseumScript ; blocks, texts, scripts - db 0 ; connections - dw ColosseumObject ; objects diff --git a/data/mapHeaders/copycatshouse1f.asm b/data/mapHeaders/copycatshouse1f.asm deleted file mode 100755 index 7489eed7..00000000 --- a/data/mapHeaders/copycatshouse1f.asm +++ /dev/null @@ -1,6 +0,0 @@ -CopycatsHouse1F_h: - db REDS_HOUSE_1 ; tileset - db COPYCATS_HOUSE_1F_HEIGHT, COPYCATS_HOUSE_1F_WIDTH ; dimensions (y, x) - dw CopycatsHouse1FBlocks, CopycatsHouse1FTextPointers, CopycatsHouse1FScript ; blocks, texts, scripts - db 0 ; connections - dw CopycatsHouse1FObject ; objects diff --git a/data/mapHeaders/copycatshouse2f.asm b/data/mapHeaders/copycatshouse2f.asm deleted file mode 100755 index 7566143f..00000000 --- a/data/mapHeaders/copycatshouse2f.asm +++ /dev/null @@ -1,6 +0,0 @@ -CopycatsHouse2F_h: - db REDS_HOUSE_2 ; tileset - db COPYCATS_HOUSE_2F_HEIGHT, COPYCATS_HOUSE_2F_WIDTH ; dimensions (y, x) - dw CopycatsHouse2FBlocks, CopycatsHouse2FTextPointers, CopycatsHouse2FScript ; blocks, texts, scripts - db 0 ; connections - dw CopycatsHouse2FObject ; objects diff --git a/data/mapHeaders/daycarem.asm b/data/mapHeaders/daycarem.asm deleted file mode 100755 index b61a00f2..00000000 --- a/data/mapHeaders/daycarem.asm +++ /dev/null @@ -1,6 +0,0 @@ -DayCareM_h: - db HOUSE ; tileset - db DAYCAREM_HEIGHT, DAYCAREM_WIDTH ; dimensions (y, x) - dw DayCareMBlocks, DayCareMTextPointers, DayCareMScript ; blocks, texts, scripts - db 0 ; connections - dw DayCareMObject ; objects diff --git a/data/mapHeaders/diglettscave.asm b/data/mapHeaders/diglettscave.asm deleted file mode 100755 index 29c1db3e..00000000 --- a/data/mapHeaders/diglettscave.asm +++ /dev/null @@ -1,6 +0,0 @@ -DiglettsCave_h: - db CAVERN ; tileset - db DIGLETTS_CAVE_HEIGHT, DIGLETTS_CAVE_WIDTH ; dimensions (y, x) - dw DiglettsCaveBlocks, DiglettsCaveTextPointers, DiglettsCaveScript ; blocks, texts, scripts - db 0 ; connections - dw DiglettsCaveObject ; objects diff --git a/data/mapHeaders/diglettscaveroute11.asm b/data/mapHeaders/diglettscaveroute11.asm deleted file mode 100755 index bb3817ea..00000000 --- a/data/mapHeaders/diglettscaveroute11.asm +++ /dev/null @@ -1,6 +0,0 @@ -DiglettsCaveEntranceRoute11_h: - db CAVERN ; tileset - db DIGLETTS_CAVE_ENTRANCE_HEIGHT, DIGLETTS_CAVE_ENTRANCE_WIDTH ; dimensions (y, x) - dw DiglettsCaveEntranceRoute11Blocks, DiglettsCaveEntranceRoute11TextPointers, DiglettsCaveEntranceRoute11Script ; blocks, texts, scripts - db 0 ; connections - dw DiglettsCaveEntranceRoute11Object ; objects diff --git a/data/mapHeaders/diglettscaveroute2.asm b/data/mapHeaders/diglettscaveroute2.asm deleted file mode 100755 index 505fbbff..00000000 --- a/data/mapHeaders/diglettscaveroute2.asm +++ /dev/null @@ -1,6 +0,0 @@ -DiglettsCaveRoute2_h: - db CAVERN ; tileset - db DIGLETTS_CAVE_EXIT_HEIGHT, DIGLETTS_CAVE_EXIT_WIDTH ; dimensions (y, x) - dw DiglettsCaveRoute2Blocks, DiglettsCaveRoute2TextPointers, DiglettsCaveRoute2Script ; blocks, texts, scripts - db 0 ; connections - dw DiglettsCaveRoute2Object ; objects diff --git a/data/mapHeaders/fanclub.asm b/data/mapHeaders/fanclub.asm deleted file mode 100755 index 6b70e935..00000000 --- a/data/mapHeaders/fanclub.asm +++ /dev/null @@ -1,6 +0,0 @@ -FanClub_h: - db INTERIOR ; tileset - db POKEMON_FAN_CLUB_HEIGHT, POKEMON_FAN_CLUB_WIDTH ; dimensions (y, x) - dw FanClubBlocks, FanClubTextPointers, FanClubScript ; blocks, texts, scripts - db 0 ; connections - dw FanClubObject ; objects diff --git a/data/mapHeaders/fightingdojo.asm b/data/mapHeaders/fightingdojo.asm deleted file mode 100755 index 37f9437c..00000000 --- a/data/mapHeaders/fightingdojo.asm +++ /dev/null @@ -1,6 +0,0 @@ -FightingDojo_h: - db DOJO ; tileset - db FIGHTING_DOJO_HEIGHT, FIGHTING_DOJO_WIDTH ; dimensions (y, x) - dw FightingDojoBlocks, FightingDojoTextPointers, FightingDojoScript ; blocks, texts, scripts - db 0 ; connections - dw FightingDojoObject ; objects diff --git a/data/mapHeaders/fuchsiacity.asm b/data/mapHeaders/fuchsiacity.asm deleted file mode 100755 index 2bfd2793..00000000 --- a/data/mapHeaders/fuchsiacity.asm +++ /dev/null @@ -1,9 +0,0 @@ -FuchsiaCity_h: - db OVERWORLD ; tileset - db FUCHSIA_CITY_HEIGHT, FUCHSIA_CITY_WIDTH ; dimensions (y, x) - dw FuchsiaCityBlocks, FuchsiaCityTextPointers, FuchsiaCityScript ; blocks, texts, scripts - db SOUTH | WEST | EAST ; connections - SOUTH_MAP_CONNECTION FUCHSIA_CITY, ROUTE_19, 5, 0, Route19Blocks - WEST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_18, 4, 0, Route18Blocks - EAST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_15, 4, 0, Route15Blocks - dw FuchsiaCityObject ; objects diff --git a/data/mapHeaders/fuchsiagym.asm b/data/mapHeaders/fuchsiagym.asm deleted file mode 100755 index 9bad3a7f..00000000 --- a/data/mapHeaders/fuchsiagym.asm +++ /dev/null @@ -1,6 +0,0 @@ -FuchsiaGym_h: - db GYM ; tileset - db FUCHSIA_GYM_HEIGHT, FUCHSIA_GYM_WIDTH ; dimensions (y, x) - dw FuchsiaGymBlocks, FuchsiaGymTextPointers, FuchsiaGymScript ; blocks, texts, scripts - db 0 ; connections - dw FuchsiaGymObject ; objects diff --git a/data/mapHeaders/fuchsiahouse1.asm b/data/mapHeaders/fuchsiahouse1.asm deleted file mode 100755 index 7de94ad5..00000000 --- a/data/mapHeaders/fuchsiahouse1.asm +++ /dev/null @@ -1,6 +0,0 @@ -FuchsiaHouse1_h: - db HOUSE ; tileset - db FUCHSIA_HOUSE_1_HEIGHT, FUCHSIA_HOUSE_1_WIDTH ; dimensions (y, x) - dw FuchsiaHouse1Blocks, FuchsiaHouse1TextPointers, FuchsiaHouse1Script ; blocks, texts, scripts - db 0 ; connections - dw FuchsiaHouse1Object ; objects diff --git a/data/mapHeaders/fuchsiahouse2.asm b/data/mapHeaders/fuchsiahouse2.asm deleted file mode 100755 index 7032f549..00000000 --- a/data/mapHeaders/fuchsiahouse2.asm +++ /dev/null @@ -1,6 +0,0 @@ -FuchsiaHouse2_h: - db LAB ; tileset - db FUCHSIA_HOUSE_2_HEIGHT, FUCHSIA_HOUSE_2_WIDTH ; dimensions (y, x) - dw FuchsiaHouse2Blocks, FuchsiaHouse2TextPointers, FuchsiaHouse2Script ; blocks, texts, scripts - db 0 ; connections - dw FuchsiaHouse2Object ; objects diff --git a/data/mapHeaders/fuchsiahouse3.asm b/data/mapHeaders/fuchsiahouse3.asm deleted file mode 100755 index 01917145..00000000 --- a/data/mapHeaders/fuchsiahouse3.asm +++ /dev/null @@ -1,6 +0,0 @@ -FuchsiaHouse3_h: - db SHIP ; tileset - db FUCHSIA_HOUSE_3_HEIGHT, FUCHSIA_HOUSE_3_WIDTH ; dimensions (y, x) - dw FuchsiaHouse3Blocks, FuchsiaHouse3TextPointers, FuchsiaHouse3Script ; blocks, texts, scripts - db 0 ; connections - dw FuchsiaHouse3Object ; objects diff --git a/data/mapHeaders/fuchsiamart.asm b/data/mapHeaders/fuchsiamart.asm deleted file mode 100755 index c1445bc8..00000000 --- a/data/mapHeaders/fuchsiamart.asm +++ /dev/null @@ -1,6 +0,0 @@ -FuchsiaMart_h: - db MART ; tileset - db FUCHSIA_MART_HEIGHT, FUCHSIA_MART_WIDTH ; dimensions (y, x) - dw FuchsiaMartBlocks, FuchsiaMartTextPointers, FuchsiaMartScript ; blocks, texts, scripts - db 0 ; connections - dw FuchsiaMartObject ; objects diff --git a/data/mapHeaders/fuchsiameetingroom.asm b/data/mapHeaders/fuchsiameetingroom.asm deleted file mode 100755 index e7f31770..00000000 --- a/data/mapHeaders/fuchsiameetingroom.asm +++ /dev/null @@ -1,6 +0,0 @@ -FuchsiaMeetingRoom_h: - db LAB ; tileset - db FUCHSIA_MEETING_ROOM_HEIGHT, FUCHSIA_MEETING_ROOM_WIDTH ; dimensions (y, x) - dw FuchsiaMeetingRoomBlocks, FuchsiaMeetingRoomTextPointers, FuchsiaMeetingRoomScript ; blocks, texts, scripts - db 0 ; connections - dw FuchsiaMeetingRoomObject ; objects diff --git a/data/mapHeaders/fuchsiapokecenter.asm b/data/mapHeaders/fuchsiapokecenter.asm deleted file mode 100755 index 4625c980..00000000 --- a/data/mapHeaders/fuchsiapokecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -FuchsiaPokecenter_h: - db POKECENTER ; tileset - db FUCHSIA_POKECENTER_HEIGHT, FUCHSIA_POKECENTER_WIDTH ; dimensions (y, x) - dw FuchsiaPokecenterBlocks, FuchsiaPokecenterTextPointers, FuchsiaPokecenterScript ; blocks, texts, scripts - db 0 ; connections - dw FuchsiaPokecenterObject ; objects diff --git a/data/mapHeaders/gary.asm b/data/mapHeaders/gary.asm deleted file mode 100755 index a9cf381b..00000000 --- a/data/mapHeaders/gary.asm +++ /dev/null @@ -1,6 +0,0 @@ -Gary_h: - db GYM ; tileset - db CHAMPIONS_ROOM_HEIGHT, CHAMPIONS_ROOM_WIDTH ; dimensions (y, x) - dw GaryBlocks, GaryTextPointers, GaryScript ; blocks, texts, scripts - db $0 ; connections - dw GaryObject ; objects diff --git a/data/mapHeaders/halloffameroom.asm b/data/mapHeaders/halloffameroom.asm deleted file mode 100755 index 9c06c434..00000000 --- a/data/mapHeaders/halloffameroom.asm +++ /dev/null @@ -1,6 +0,0 @@ -HallofFameRoom_h: - db GYM ; tileset - db HALL_OF_FAME_HEIGHT, HALL_OF_FAME_WIDTH ; dimensions (y, x) - dw HallofFameRoomBlocks, HallofFameRoomTextPointers, HallofFameRoomScript ; blocks, texts, scripts - db 0 ; connections - dw HallofFameRoomObject ; objects diff --git a/data/mapHeaders/indigoplateau.asm b/data/mapHeaders/indigoplateau.asm deleted file mode 100755 index deaf5041..00000000 --- a/data/mapHeaders/indigoplateau.asm +++ /dev/null @@ -1,7 +0,0 @@ -IndigoPlateau_h: - db PLATEAU ; tileset - db INDIGO_PLATEAU_HEIGHT, INDIGO_PLATEAU_WIDTH ; dimensions (y, x) - dw IndigoPlateauBlocks, IndigoPlateauTextPointers, IndigoPlateauScript ; blocks, texts, scripts - db SOUTH ; connections - SOUTH_MAP_CONNECTION INDIGO_PLATEAU, ROUTE_23, 0, 0, Route23Blocks - dw IndigoPlateauObject ; objects diff --git a/data/mapHeaders/indigoplateaulobby.asm b/data/mapHeaders/indigoplateaulobby.asm deleted file mode 100755 index 67153dbc..00000000 --- a/data/mapHeaders/indigoplateaulobby.asm +++ /dev/null @@ -1,6 +0,0 @@ -IndigoPlateauLobby_h: - db MART ; tileset - db INDIGO_PLATEAU_LOBBY_HEIGHT, INDIGO_PLATEAU_LOBBY_WIDTH ; dimensions (y, x) - dw IndigoPlateauLobbyBlocks, IndigoPlateauLobbyTextPointers, IndigoPlateauLobbyScript ; blocks, texts, scripts - db 0 ; connections - dw IndigoPlateauLobbyObject ; objects diff --git a/data/mapHeaders/lab1.asm b/data/mapHeaders/lab1.asm deleted file mode 100755 index d4d04e3d..00000000 --- a/data/mapHeaders/lab1.asm +++ /dev/null @@ -1,6 +0,0 @@ -Lab1_h: - db LAB ; tileset - db CINNABAR_LAB_1_HEIGHT, CINNABAR_LAB_1_WIDTH ; dimensions (y, x) - dw Lab1Blocks, Lab1TextPointers, Lab1Script ; blocks, texts, scripts - db 0 ; connections - dw Lab1Object ; objects diff --git a/data/mapHeaders/lab2.asm b/data/mapHeaders/lab2.asm deleted file mode 100755 index 3d264741..00000000 --- a/data/mapHeaders/lab2.asm +++ /dev/null @@ -1,6 +0,0 @@ -Lab2_h: - db LAB ; tileset - db CINNABAR_LAB_2_HEIGHT, CINNABAR_LAB_2_WIDTH ; dimensions (y, x) - dw Lab2Blocks, Lab2TextPointers, Lab2Script ; blocks, texts, scripts - db 0 ; connections - dw Lab2Object ; objects diff --git a/data/mapHeaders/lab3.asm b/data/mapHeaders/lab3.asm deleted file mode 100755 index 0f401f65..00000000 --- a/data/mapHeaders/lab3.asm +++ /dev/null @@ -1,6 +0,0 @@ -Lab3_h: - db LAB ; tileset - db CINNABAR_LAB_3_HEIGHT, CINNABAR_LAB_3_WIDTH ; dimensions (y, x) - dw Lab3Blocks, Lab3TextPointers, Lab3Script ; blocks, texts, scripts - db 0 ; connections - dw Lab3Object ; objects diff --git a/data/mapHeaders/lab4.asm b/data/mapHeaders/lab4.asm deleted file mode 100755 index 10ded376..00000000 --- a/data/mapHeaders/lab4.asm +++ /dev/null @@ -1,6 +0,0 @@ -Lab4_h: - db LAB ; tileset - db CINNABAR_LAB_4_HEIGHT, CINNABAR_LAB_4_WIDTH ; dimensions (y, x) - dw Lab4Blocks, Lab4TextPointers, Lab4Script ; blocks, texts, scripts - db 0 ; connections - dw Lab4Object ; objects diff --git a/data/mapHeaders/lance.asm b/data/mapHeaders/lance.asm deleted file mode 100755 index d9a1ae75..00000000 --- a/data/mapHeaders/lance.asm +++ /dev/null @@ -1,6 +0,0 @@ -Lance_h: - db DOJO ; tileset - db LANCES_ROOM_HEIGHT, LANCES_ROOM_WIDTH ; dimensions (y, x) - dw LanceBlocks, LanceTextPointers, LanceScript ; blocks, texts, scripts - db 0 ; connections - dw LanceObject ; objects diff --git a/data/mapHeaders/lavenderhouse1.asm b/data/mapHeaders/lavenderhouse1.asm deleted file mode 100755 index 362e4359..00000000 --- a/data/mapHeaders/lavenderhouse1.asm +++ /dev/null @@ -1,6 +0,0 @@ -LavenderHouse1_h: - db HOUSE ; tileset - db LAVENDER_HOUSE_1_HEIGHT, LAVENDER_HOUSE_1_WIDTH ; dimensions (y, x) - dw LavenderHouse1Blocks, LavenderHouse1TextPointers, LavenderHouse1Script ; blocks, texts, scripts - db 0 ; connections - dw LavenderHouse1Object ; objects diff --git a/data/mapHeaders/lavenderhouse2.asm b/data/mapHeaders/lavenderhouse2.asm deleted file mode 100755 index 971e1e8d..00000000 --- a/data/mapHeaders/lavenderhouse2.asm +++ /dev/null @@ -1,6 +0,0 @@ -LavenderHouse2_h: - db HOUSE ; tileset - db LAVENDER_HOUSE_2_HEIGHT, LAVENDER_HOUSE_2_WIDTH ; dimensions (y, x) - dw LavenderHouse2Blocks, LavenderHouse2TextPointers, LavenderHouse2Script ; blocks, texts, scripts - db 0 ; connections - dw LavenderHouse2Object ; objects diff --git a/data/mapHeaders/lavendermart.asm b/data/mapHeaders/lavendermart.asm deleted file mode 100755 index 13cb06c5..00000000 --- a/data/mapHeaders/lavendermart.asm +++ /dev/null @@ -1,6 +0,0 @@ -LavenderMart_h: - db MART ; tileset - db LAVENDER_MART_HEIGHT, LAVENDER_MART_WIDTH ; dimensions (y, x) - dw LavenderMartBlocks, LavenderMartTextPointers, LavenderMartScript ; blocks, texts, scripts - db 0 ; connections - dw LavenderMartObject ; objects diff --git a/data/mapHeaders/lavenderpokecenter.asm b/data/mapHeaders/lavenderpokecenter.asm deleted file mode 100755 index ce9650f1..00000000 --- a/data/mapHeaders/lavenderpokecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -LavenderPokecenter_h: - db POKECENTER ; tileset - db LAVENDER_POKECENTER_HEIGHT, LAVENDER_POKECENTER_WIDTH ; dimensions (y, x) - dw LavenderPokecenterBlocks, LavenderPokecenterTextPointers, LavenderPokecenterScript ; blocks, texts, scripts - db 0 ; connections - dw LavenderPokecenterObject ; objects diff --git a/data/mapHeaders/lavendertown.asm b/data/mapHeaders/lavendertown.asm deleted file mode 100755 index 74bbd7a8..00000000 --- a/data/mapHeaders/lavendertown.asm +++ /dev/null @@ -1,9 +0,0 @@ -LavenderTown_h: - db OVERWORLD ; tileset - db LAVENDER_TOWN_HEIGHT, LAVENDER_TOWN_WIDTH ; dimensions (y, x) - dw LavenderTownBlocks, LavenderTownTextPointers, LavenderTownScript ; blocks, texts, scripts - db NORTH | SOUTH | WEST ; connections - NORTH_MAP_CONNECTION LAVENDER_TOWN, ROUTE_10, 0, 0, Route10Blocks - SOUTH_MAP_CONNECTION LAVENDER_TOWN, ROUTE_12, 0, 0, Route12Blocks, 1 - WEST_MAP_CONNECTION LAVENDER_TOWN, ROUTE_8, 0, 0, Route8Blocks - dw LavenderTownObject ; objects diff --git a/data/mapHeaders/lorelei.asm b/data/mapHeaders/lorelei.asm deleted file mode 100755 index 82efe164..00000000 --- a/data/mapHeaders/lorelei.asm +++ /dev/null @@ -1,6 +0,0 @@ -Lorelei_h: - db GYM ; tileset - db LORELEIS_ROOM_HEIGHT, LORELEIS_ROOM_WIDTH ; dimensions (y, x) - dw LoreleiBlocks, LoreleiTextPointers, LoreleiScript ; blocks, texts, scripts - db 0 ; connections - dw LoreleiObject ; objects diff --git a/data/mapHeaders/mansion1.asm b/data/mapHeaders/mansion1.asm deleted file mode 100755 index 8b326941..00000000 --- a/data/mapHeaders/mansion1.asm +++ /dev/null @@ -1,6 +0,0 @@ -Mansion1_h: - db FACILITY ; tileset - db MANSION_1_HEIGHT, MANSION_1_WIDTH ; dimensions (y, x) - dw Mansion1Blocks, Mansion1TextPointers, Mansion1Script ; blocks, texts, scripts - db 0 ; connections - dw Mansion1Object ; objects diff --git a/data/mapHeaders/mansion2.asm b/data/mapHeaders/mansion2.asm deleted file mode 100755 index fba95ed8..00000000 --- a/data/mapHeaders/mansion2.asm +++ /dev/null @@ -1,6 +0,0 @@ -Mansion2_h: - db FACILITY ; tileset - db MANSION_2_HEIGHT, MANSION_2_WIDTH ; dimensions (y, x) - dw Mansion2Blocks, Mansion2TextPointers, Mansion2Script ; blocks, texts, scripts - db 0 ; connections - dw Mansion2Object ; objects diff --git a/data/mapHeaders/mansion3.asm b/data/mapHeaders/mansion3.asm deleted file mode 100755 index 933d4c6f..00000000 --- a/data/mapHeaders/mansion3.asm +++ /dev/null @@ -1,6 +0,0 @@ -Mansion3_h: - db FACILITY ; tileset - db MANSION_3_HEIGHT, MANSION_3_WIDTH ; dimensions (y, x) - dw Mansion3Blocks, Mansion3TextPointers, Mansion3Script ; blocks, texts, scripts - db 0 ; connections - dw Mansion3Object ; objects diff --git a/data/mapHeaders/mansion4.asm b/data/mapHeaders/mansion4.asm deleted file mode 100755 index 806b66b6..00000000 --- a/data/mapHeaders/mansion4.asm +++ /dev/null @@ -1,6 +0,0 @@ -Mansion4_h: - db FACILITY ; tileset - db MANSION_4_HEIGHT, MANSION_4_WIDTH ; dimensions (y, x) - dw Mansion4Blocks, Mansion4TextPointers, Mansion4Script ; blocks, texts, scripts - db 0 ; connections - dw Mansion4Object ; objects diff --git a/data/mapHeaders/mtmoon1.asm b/data/mapHeaders/mtmoon1.asm deleted file mode 100755 index 4fbd8de0..00000000 --- a/data/mapHeaders/mtmoon1.asm +++ /dev/null @@ -1,6 +0,0 @@ -MtMoon1_h: - db CAVERN ; tileset - db MT_MOON_1_HEIGHT, MT_MOON_1_WIDTH ; dimensions (y, x) - dw MtMoon1Blocks, MtMoon1TextPointers, MtMoon1Script ; blocks, texts, scripts - db 0 ; connections - dw MtMoon1Object ; objects diff --git a/data/mapHeaders/mtmoon2.asm b/data/mapHeaders/mtmoon2.asm deleted file mode 100755 index 81b0b365..00000000 --- a/data/mapHeaders/mtmoon2.asm +++ /dev/null @@ -1,6 +0,0 @@ -MtMoon2_h: - db CAVERN ; tileset - db MT_MOON_2_HEIGHT, MT_MOON_2_WIDTH ; dimensions (y, x) - dw MtMoon2Blocks, MtMoon2TextPointers, MtMoon2Script ; blocks, texts, scripts - db 0 ; connections - dw MtMoon2Object ; objects diff --git a/data/mapHeaders/mtmoon3.asm b/data/mapHeaders/mtmoon3.asm deleted file mode 100755 index f89d77cb..00000000 --- a/data/mapHeaders/mtmoon3.asm +++ /dev/null @@ -1,6 +0,0 @@ -MtMoon3_h: - db CAVERN ; tileset - db MT_MOON_3_HEIGHT, MT_MOON_3_WIDTH ; dimensions (y, x) - dw MtMoon3Blocks, MtMoon3TextPointers, MtMoon3Script ; blocks, texts, scripts - db 0 ; connections - dw MtMoon3Object ; objects diff --git a/data/mapHeaders/mtmoonpokecenter.asm b/data/mapHeaders/mtmoonpokecenter.asm deleted file mode 100755 index 0cb1791b..00000000 --- a/data/mapHeaders/mtmoonpokecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -MtMoonPokecenter_h: - db POKECENTER ; tileset - db MT_MOON_POKECENTER_HEIGHT, MT_MOON_POKECENTER_WIDTH ; dimensions (y, x) - dw MtMoonPokecenterBlocks, MtMoonPokecenterTextPointers, MtMoonPokecenterScript ; blocks, texts, scripts - db 0 ; connections - dw MtMoonPokecenterObject ; objects diff --git a/data/mapHeaders/museum1f.asm b/data/mapHeaders/museum1f.asm deleted file mode 100755 index eca97706..00000000 --- a/data/mapHeaders/museum1f.asm +++ /dev/null @@ -1,6 +0,0 @@ -Museum1F_h: - db MUSEUM ; tileset - db MUSEUM_1F_HEIGHT, MUSEUM_1F_WIDTH ; dimensions (y, x) - dw Museum1FBlocks, Museum1FTextPointers, Museum1FScript ; blocks, texts, scripts - db 0 ; connections - dw Museum1FObject ; objects diff --git a/data/mapHeaders/museum2f.asm b/data/mapHeaders/museum2f.asm deleted file mode 100755 index 973f5045..00000000 --- a/data/mapHeaders/museum2f.asm +++ /dev/null @@ -1,6 +0,0 @@ -Museum2F_h: - db MUSEUM ; tileset - db MUSEUM_2F_HEIGHT, MUSEUM_2F_WIDTH ; dimensions (y, x) - dw Museum2FBlocks, Museum2FTextPointers, Museum2FScript ; blocks, texts, scripts - db 0 ; connections - dw Museum2FObject ; objects diff --git a/data/mapHeaders/namerater.asm b/data/mapHeaders/namerater.asm deleted file mode 100755 index 01a488a7..00000000 --- a/data/mapHeaders/namerater.asm +++ /dev/null @@ -1,6 +0,0 @@ -NameRater_h: - db HOUSE ; tileset - db NAME_RATERS_HOUSE_HEIGHT, NAME_RATERS_HOUSE_WIDTH ; dimensions (y, x) - dw NameRaterBlocks, NameRaterTextPointers, NameRaterScript ; blocks, texts, scripts - db 0 ; connections - dw NameRaterObject ; objects diff --git a/data/mapHeaders/oakslab.asm b/data/mapHeaders/oakslab.asm deleted file mode 100755 index 94608ef2..00000000 --- a/data/mapHeaders/oakslab.asm +++ /dev/null @@ -1,6 +0,0 @@ -OaksLab_h: - db DOJO ; tileset - db OAKS_LAB_HEIGHT, OAKS_LAB_WIDTH ; dimensions (y, x) - dw OaksLabBlocks, OaksLabTextPointers, OaksLabScript ; blocks, texts, scripts - db 0 ; connections - dw OaksLabObject ; objects diff --git a/data/mapHeaders/pallettown.asm b/data/mapHeaders/pallettown.asm deleted file mode 100755 index 8b8137ce..00000000 --- a/data/mapHeaders/pallettown.asm +++ /dev/null @@ -1,8 +0,0 @@ -PalletTown_h: - db OVERWORLD ; tileset - db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions (y, x) - dw PalletTownBlocks, PalletTownTextPointers, PalletTownScript ; blocks, texts, scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION PALLET_TOWN, ROUTE_1, 0, 0, Route1Blocks - SOUTH_MAP_CONNECTION PALLET_TOWN, ROUTE_21, 0, 0, Route21Blocks, 1 - dw PalletTownObject ; objects diff --git a/data/mapHeaders/pewtercity.asm b/data/mapHeaders/pewtercity.asm deleted file mode 100755 index 88faaacc..00000000 --- a/data/mapHeaders/pewtercity.asm +++ /dev/null @@ -1,8 +0,0 @@ -PewterCity_h: - db OVERWORLD ; tileset - db PEWTER_CITY_HEIGHT, PEWTER_CITY_WIDTH ; dimensions (y, x) - dw PewterCityBlocks, PewterCityTextPointers, PewterCityScript ; blocks, texts, scripts - db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION PEWTER_CITY, ROUTE_2, 5, 0, Route2Blocks - EAST_MAP_CONNECTION PEWTER_CITY, ROUTE_3, 4, 0, Route3Blocks - dw PewterCityObject ; objects diff --git a/data/mapHeaders/pewtergym.asm b/data/mapHeaders/pewtergym.asm deleted file mode 100755 index a335ab50..00000000 --- a/data/mapHeaders/pewtergym.asm +++ /dev/null @@ -1,6 +0,0 @@ -PewterGym_h: - db GYM ; tileset - db PEWTER_GYM_HEIGHT, PEWTER_GYM_WIDTH ; dimensions (y, x) - dw PewterGymBlocks, PewterGymTextPointers, PewterGymScript ; blocks, texts, scripts - db 0 ; connections - dw PewterGymObject ; objects diff --git a/data/mapHeaders/pewterhouse1.asm b/data/mapHeaders/pewterhouse1.asm deleted file mode 100755 index 90b69d00..00000000 --- a/data/mapHeaders/pewterhouse1.asm +++ /dev/null @@ -1,6 +0,0 @@ -PewterHouse1_h: - db HOUSE ; tileset - db PEWTER_HOUSE_1_HEIGHT, PEWTER_HOUSE_1_WIDTH ; dimensions (y, x) - dw PewterHouse1Blocks, PewterHouse1TextPointers, PewterHouse1Script ; blocks, texts, scripts - db 0 ; connections - dw PewterHouse1Object ; objects diff --git a/data/mapHeaders/pewterhouse2.asm b/data/mapHeaders/pewterhouse2.asm deleted file mode 100755 index 9baa3d41..00000000 --- a/data/mapHeaders/pewterhouse2.asm +++ /dev/null @@ -1,6 +0,0 @@ -PewterHouse2_h: - db HOUSE ; tileset - db PEWTER_HOUSE_2_HEIGHT, PEWTER_HOUSE_2_WIDTH ; dimensions (y, x) - dw PewterHouse2Blocks, PewterHouse2TextPointers, PewterHouse2Script ; blocks, texts, scripts - db 0 ; connections - dw PewterHouse2Object ; objects diff --git a/data/mapHeaders/pewtermart.asm b/data/mapHeaders/pewtermart.asm deleted file mode 100755 index 00b91247..00000000 --- a/data/mapHeaders/pewtermart.asm +++ /dev/null @@ -1,6 +0,0 @@ -PewterMart_h: - db MART ; tileset - db PEWTER_MART_HEIGHT, PEWTER_MART_WIDTH ; dimensions (y, x) - dw PewterMartBlocks, PewterMartTextPointers, PewterMartScript ; blocks, texts, scripts - db 0 ; connections - dw PewterMartObject ; objects diff --git a/data/mapHeaders/pewterpokecenter.asm b/data/mapHeaders/pewterpokecenter.asm deleted file mode 100755 index 29851a96..00000000 --- a/data/mapHeaders/pewterpokecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -PewterPokecenter_h: - db POKECENTER ; tileset - db PEWTER_POKECENTER_HEIGHT, PEWTER_POKECENTER_WIDTH ; dimensions (y, x) - dw PewterPokecenterBlocks, PewterPokecenterTextPointers, PewterPokecenterScript ; blocks, texts, scripts - db 0 ; connections - dw PewterPokecenterObject ; objects diff --git a/data/mapHeaders/pokemontower1.asm b/data/mapHeaders/pokemontower1.asm deleted file mode 100755 index 5ea76d21..00000000 --- a/data/mapHeaders/pokemontower1.asm +++ /dev/null @@ -1,6 +0,0 @@ -PokemonTower1_h: - db CEMETERY ; tileset - db POKEMONTOWER_1_HEIGHT, POKEMONTOWER_1_WIDTH ; dimensions (y, x) - dw PokemonTower1Blocks, PokemonTower1TextPointers, PokemonTower1Script ; blocks, texts, scripts - db 0 ; connections - dw PokemonTower1Object ; objects diff --git a/data/mapHeaders/pokemontower2.asm b/data/mapHeaders/pokemontower2.asm deleted file mode 100755 index 3da497e4..00000000 --- a/data/mapHeaders/pokemontower2.asm +++ /dev/null @@ -1,6 +0,0 @@ -PokemonTower2_h: - db CEMETERY ; tileset - db POKEMONTOWER_2_HEIGHT, POKEMONTOWER_2_WIDTH ; dimensions (y, x) - dw PokemonTower2Blocks, PokemonTower2TextPointers, PokemonTower2Script ; blocks, texts, scripts - db 0 ; connections - dw PokemonTower2Object ; objects diff --git a/data/mapHeaders/pokemontower3.asm b/data/mapHeaders/pokemontower3.asm deleted file mode 100755 index bec35122..00000000 --- a/data/mapHeaders/pokemontower3.asm +++ /dev/null @@ -1,6 +0,0 @@ -PokemonTower3_h: - db CEMETERY ; tileset - db POKEMONTOWER_3_HEIGHT, POKEMONTOWER_3_WIDTH ; dimensions (y, x) - dw PokemonTower3Blocks, PokemonTower3TextPointers, PokemonTower3Script ; blocks, texts, scripts - db 0 ; connections - dw PokemonTower3Object ; objects diff --git a/data/mapHeaders/pokemontower4.asm b/data/mapHeaders/pokemontower4.asm deleted file mode 100755 index 4d96c709..00000000 --- a/data/mapHeaders/pokemontower4.asm +++ /dev/null @@ -1,6 +0,0 @@ -PokemonTower4_h: - db CEMETERY ; tileset - db POKEMONTOWER_4_HEIGHT, POKEMONTOWER_4_WIDTH ; dimensions (y, x) - dw PokemonTower4Blocks, PokemonTower4TextPointers, PokemonTower4Script ; blocks, texts, scripts - db 0 ; connections - dw PokemonTower4Object ; objects diff --git a/data/mapHeaders/pokemontower5.asm b/data/mapHeaders/pokemontower5.asm deleted file mode 100755 index f91911b0..00000000 --- a/data/mapHeaders/pokemontower5.asm +++ /dev/null @@ -1,6 +0,0 @@ -PokemonTower5_h: - db CEMETERY ; tileset - db POKEMONTOWER_5_HEIGHT, POKEMONTOWER_5_WIDTH ; dimensions (y, x) - dw PokemonTower5Blocks, PokemonTower5TextPointers, PokemonTower5Script ; blocks, texts, scripts - db 0 ; connections - dw PokemonTower5Object ; objects diff --git a/data/mapHeaders/pokemontower6.asm b/data/mapHeaders/pokemontower6.asm deleted file mode 100755 index 10a54cd5..00000000 --- a/data/mapHeaders/pokemontower6.asm +++ /dev/null @@ -1,6 +0,0 @@ -PokemonTower6_h: - db CEMETERY ; tileset - db POKEMONTOWER_6_HEIGHT, POKEMONTOWER_6_WIDTH ; dimensions (y, x) - dw PokemonTower6Blocks, PokemonTower6TextPointers, PokemonTower6Script ; blocks, texts, scripts - db 0 ; connections - dw PokemonTower6Object ; objects diff --git a/data/mapHeaders/pokemontower7.asm b/data/mapHeaders/pokemontower7.asm deleted file mode 100755 index b69fd01e..00000000 --- a/data/mapHeaders/pokemontower7.asm +++ /dev/null @@ -1,6 +0,0 @@ -PokemonTower7_h: - db CEMETERY ; tileset - db POKEMONTOWER_7_HEIGHT, POKEMONTOWER_7_WIDTH ; dimensions (y, x) - dw PokemonTower7Blocks, PokemonTower7TextPointers, PokemonTower7Script ; blocks, texts, scripts - db 0 ; connections - dw PokemonTower7Object ; objects diff --git a/data/mapHeaders/powerplant.asm b/data/mapHeaders/powerplant.asm deleted file mode 100755 index 3b13491d..00000000 --- a/data/mapHeaders/powerplant.asm +++ /dev/null @@ -1,6 +0,0 @@ -PowerPlant_h: - db FACILITY ; tileset - db POWER_PLANT_HEIGHT, POWER_PLANT_WIDTH ; dimensions (y, x) - dw PowerPlantBlocks, PowerPlantTextPointers, PowerPlantScript ; blocks, texts, scripts - db 0 ; connections - dw PowerPlantObject ; objects diff --git a/data/mapHeaders/redshouse1f.asm b/data/mapHeaders/redshouse1f.asm deleted file mode 100755 index a6f5783f..00000000 --- a/data/mapHeaders/redshouse1f.asm +++ /dev/null @@ -1,6 +0,0 @@ -RedsHouse1F_h: - db REDS_HOUSE_1 ; tileset - db REDS_HOUSE_1F_HEIGHT, REDS_HOUSE_1F_WIDTH ; dimensions (y, x) - dw RedsHouse1FBlocks, RedsHouse1FTextPointers, RedsHouse1FScript ; blocks, texts, scripts - db 0 ; connections - dw RedsHouse1FObject ; objects diff --git a/data/mapHeaders/redshouse2f.asm b/data/mapHeaders/redshouse2f.asm deleted file mode 100755 index 89193e9e..00000000 --- a/data/mapHeaders/redshouse2f.asm +++ /dev/null @@ -1,6 +0,0 @@ -RedsHouse2F_h: - db REDS_HOUSE_2 ; tileset - db REDS_HOUSE_2F_HEIGHT, REDS_HOUSE_2F_WIDTH ; dimensions (y, x) - dw RedsHouse2FBlocks, RedsHouse2FTextPointers, RedsHouse2FScript ; blocks, texts, scripts - db $00 ; connections - dw RedsHouse2FObject ; objects diff --git a/data/mapHeaders/rockethideout1.asm b/data/mapHeaders/rockethideout1.asm deleted file mode 100755 index bbe721ab..00000000 --- a/data/mapHeaders/rockethideout1.asm +++ /dev/null @@ -1,6 +0,0 @@ -RocketHideout1_h: - db FACILITY ; tileset - db ROCKET_HIDEOUT_1_HEIGHT, ROCKET_HIDEOUT_1_WIDTH ; dimensions (y, x) - dw RocketHideout1Blocks, RocketHideout1TextPointers, RocketHideout1Script ; blocks, texts, scripts - db 0 ; connections - dw RocketHideout1Object ; objects diff --git a/data/mapHeaders/rockethideout2.asm b/data/mapHeaders/rockethideout2.asm deleted file mode 100755 index cc2ed948..00000000 --- a/data/mapHeaders/rockethideout2.asm +++ /dev/null @@ -1,6 +0,0 @@ -RocketHideout2_h: - db FACILITY ; tileset - db ROCKET_HIDEOUT_2_HEIGHT, ROCKET_HIDEOUT_2_WIDTH ; dimensions (y, x) - dw RocketHideout2Blocks, RocketHideout2TextPointers, RocketHideout2Script ; blocks, texts, scripts - db 0 ; connections - dw RocketHideout2Object ; objects diff --git a/data/mapHeaders/rockethideout3.asm b/data/mapHeaders/rockethideout3.asm deleted file mode 100755 index 12e9aa1e..00000000 --- a/data/mapHeaders/rockethideout3.asm +++ /dev/null @@ -1,6 +0,0 @@ -RocketHideout3_h: - db FACILITY ; tileset - db ROCKET_HIDEOUT_3_HEIGHT, ROCKET_HIDEOUT_3_WIDTH ; dimensions (y, x) - dw RocketHideout3Blocks, RocketHideout3TextPointers, RocketHideout3Script ; blocks, texts, scripts - db 0 ; connections - dw RocketHideout3Object ; objects diff --git a/data/mapHeaders/rockethideout4.asm b/data/mapHeaders/rockethideout4.asm deleted file mode 100755 index 0b858dc9..00000000 --- a/data/mapHeaders/rockethideout4.asm +++ /dev/null @@ -1,6 +0,0 @@ -RocketHideout4_h: - db FACILITY ; tileset - db ROCKET_HIDEOUT_4_HEIGHT, ROCKET_HIDEOUT_4_WIDTH ; dimensions (y, x) - dw RocketHideout4Blocks, RocketHideout4TextPointers, RocketHideout4Script ; blocks, texts, scripts - db 0 ; connections - dw RocketHideout4Object ; objects diff --git a/data/mapHeaders/rockethideoutelevator.asm b/data/mapHeaders/rockethideoutelevator.asm deleted file mode 100755 index b4269444..00000000 --- a/data/mapHeaders/rockethideoutelevator.asm +++ /dev/null @@ -1,6 +0,0 @@ -RocketHideoutElevator_h: - db LOBBY ; tileset - db ROCKET_HIDEOUT_ELEVATOR_HEIGHT, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; dimensions (y, x) - dw RocketHideoutElevatorBlocks, RocketHideoutElevatorTextPointers, RocketHideoutElevatorScript ; blocks, texts, scripts - db 0 ; connections - dw RocketHideoutElevatorObject ; objects diff --git a/data/mapHeaders/rocktunnel1.asm b/data/mapHeaders/rocktunnel1.asm deleted file mode 100755 index 14fc41b1..00000000 --- a/data/mapHeaders/rocktunnel1.asm +++ /dev/null @@ -1,6 +0,0 @@ -RockTunnel1_h: - db CAVERN ; tileset - db ROCK_TUNNEL_1_HEIGHT, ROCK_TUNNEL_1_WIDTH ; dimensions (y, x) - dw RockTunnel1Blocks, RockTunnel1TextPointers, RockTunnel1Script ; blocks, texts, scripts - db 0 ; connections - dw RockTunnel1Object ; objects diff --git a/data/mapHeaders/rocktunnel2.asm b/data/mapHeaders/rocktunnel2.asm deleted file mode 100755 index c4184b8d..00000000 --- a/data/mapHeaders/rocktunnel2.asm +++ /dev/null @@ -1,6 +0,0 @@ -RockTunnel2_h: - db CAVERN ; tileset - db ROCK_TUNNEL_2_HEIGHT, ROCK_TUNNEL_2_WIDTH ; dimensions (y, x) - dw RockTunnel2Blocks, RockTunnel2TextPointers, RockTunnel2Script ; blocks, texts, scripts - db 0 ; connections - dw RockTunnel2Object ; objects diff --git a/data/mapHeaders/rocktunnelpokecenter.asm b/data/mapHeaders/rocktunnelpokecenter.asm deleted file mode 100755 index 977dd1cf..00000000 --- a/data/mapHeaders/rocktunnelpokecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -RockTunnelPokecenter_h: - db POKECENTER ; tileset - db ROCK_TUNNEL_POKECENTER_HEIGHT, ROCK_TUNNEL_POKECENTER_WIDTH ; dimensions (y, x) - dw RockTunnelPokecenterBlocks, RockTunnelPokecenterTextPointers, RockTunnelPokecenterScript ; blocks, texts, scripts - db 0 ; connections - dw RockTunnelPokecenterObject ; objects diff --git a/data/mapHeaders/route1.asm b/data/mapHeaders/route1.asm deleted file mode 100755 index 5f6a858e..00000000 --- a/data/mapHeaders/route1.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route1_h: - db OVERWORLD ; tileset - db ROUTE_1_HEIGHT, ROUTE_1_WIDTH ; dimensions (y, x) - dw Route1Blocks, Route1TextPointers, Route1Script ; blocks, texts, scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_1, VIRIDIAN_CITY, -3, 2, ViridianCityBlocks - SOUTH_MAP_CONNECTION ROUTE_1, PALLET_TOWN, 0, 0, PalletTownBlocks, 1 - dw Route1Object ; objects diff --git a/data/mapHeaders/route10.asm b/data/mapHeaders/route10.asm deleted file mode 100755 index 7ee588cf..00000000 --- a/data/mapHeaders/route10.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route10_h: - db OVERWORLD ; tileset - db ROUTE_10_HEIGHT, ROUTE_10_WIDTH ; dimensions (y, x) - dw Route10Blocks, Route10TextPointers, Route10Script ; blocks, texts, scripts - db SOUTH | WEST ; connections - SOUTH_MAP_CONNECTION ROUTE_10, LAVENDER_TOWN, 0, 0, LavenderTownBlocks - WEST_MAP_CONNECTION ROUTE_10, ROUTE_9, 0, 0, Route9Blocks - dw Route10Object ; objects diff --git a/data/mapHeaders/route11.asm b/data/mapHeaders/route11.asm deleted file mode 100755 index 04ae8f24..00000000 --- a/data/mapHeaders/route11.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route11_h: - db OVERWORLD ; tileset - db ROUTE_11_HEIGHT, ROUTE_11_WIDTH ; dimensions (y, x) - dw Route11Blocks, Route11TextPointers, Route11Script ; blocks, texts, scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_11, VERMILION_CITY, -3, 1, VermilionCityBlocks - EAST_MAP_CONNECTION ROUTE_11, ROUTE_12, -3, 24, Route12Blocks, 1 - dw Route11Object ; objects diff --git a/data/mapHeaders/route11gate.asm b/data/mapHeaders/route11gate.asm deleted file mode 100755 index 22f90adb..00000000 --- a/data/mapHeaders/route11gate.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route11Gate_h: - db GATE ; tileset - db ROUTE_11_GATE_1F_HEIGHT, ROUTE_11_GATE_1F_WIDTH ; dimensions (y, x) - dw Route11GateBlocks, Route11GateTextPointers, Route11GateScript ; blocks, texts, scripts - db 0 ; connections - dw Route11GateObject ; objects diff --git a/data/mapHeaders/route11gateupstairs.asm b/data/mapHeaders/route11gateupstairs.asm deleted file mode 100755 index d3f4a3e1..00000000 --- a/data/mapHeaders/route11gateupstairs.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route11GateUpstairs_h: - db GATE ; tileset - db ROUTE_11_GATE_2F_HEIGHT, ROUTE_11_GATE_2F_WIDTH ; dimensions (y, x) - dw Route11GateUpstairsBlocks, Route11GateUpstairsTextPointers, Route11GateUpstairsScript ; blocks, texts, scripts - db 0 ; connections - dw Route11GateUpstairsObject ; objects diff --git a/data/mapHeaders/route12.asm b/data/mapHeaders/route12.asm deleted file mode 100755 index b11e0128..00000000 --- a/data/mapHeaders/route12.asm +++ /dev/null @@ -1,9 +0,0 @@ -Route12_h: - db OVERWORLD ; tileset - db ROUTE_12_HEIGHT, ROUTE_12_WIDTH ; dimensions (y, x) - dw Route12Blocks, Route12TextPointers, Route12Script ; blocks, texts, scripts - db NORTH | SOUTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_12, LAVENDER_TOWN, 0, 0, LavenderTownBlocks - SOUTH_MAP_CONNECTION ROUTE_12, ROUTE_13, -3, 17, Route13Blocks - WEST_MAP_CONNECTION ROUTE_12, ROUTE_11, 27, 0, Route11Blocks - dw Route12Object ; objects diff --git a/data/mapHeaders/route12gate.asm b/data/mapHeaders/route12gate.asm deleted file mode 100755 index a870a191..00000000 --- a/data/mapHeaders/route12gate.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route12Gate_h: - db GATE ; tileset - db ROUTE_12_GATE_1F_HEIGHT, ROUTE_12_GATE_1F_WIDTH ; dimensions (y, x) - dw Route12GateBlocks, Route12GateTextPointers, Route12GateScript ; blocks, texts, scripts - db 0 ; connections - dw Route12GateObject ; objects diff --git a/data/mapHeaders/route12gateupstairs.asm b/data/mapHeaders/route12gateupstairs.asm deleted file mode 100755 index 767cb764..00000000 --- a/data/mapHeaders/route12gateupstairs.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route12GateUpstairs_h: - db GATE ; tileset - db ROUTE_12_GATE_2F_HEIGHT, ROUTE_12_GATE_2F_WIDTH ; dimensions (y, x) - dw Route12GateUpstairsBlocks, Route12GateUpstairsTextPointers, Route12GateUpstairsScript ; blocks, texts, scripts - db 0 ; connections - dw Route12GateUpstairsObject ; objects diff --git a/data/mapHeaders/route12house.asm b/data/mapHeaders/route12house.asm deleted file mode 100755 index 48428b10..00000000 --- a/data/mapHeaders/route12house.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route12House_h: - db HOUSE ; tileset - db ROUTE_12_HOUSE_HEIGHT, ROUTE_12_HOUSE_WIDTH ; dimensions (y, x) - dw Route12HouseBlocks, Route12HouseTextPointers, Route12HouseScript ; blocks, texts, scripts - db 0 ; connections - dw Route12HouseObject ; objects diff --git a/data/mapHeaders/route13.asm b/data/mapHeaders/route13.asm deleted file mode 100755 index 53a88633..00000000 --- a/data/mapHeaders/route13.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route13_h: - db OVERWORLD ; tileset - db ROUTE_13_HEIGHT, ROUTE_13_WIDTH ; dimensions (y, x) - dw Route13Blocks, Route13TextPointers, Route13Script ; blocks, texts, scripts - db NORTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_13, ROUTE_12, 20, 0, Route12Blocks - WEST_MAP_CONNECTION ROUTE_13, ROUTE_14, 0, 0, Route14Blocks - dw Route13Object ; objects diff --git a/data/mapHeaders/route14.asm b/data/mapHeaders/route14.asm deleted file mode 100755 index f860d332..00000000 --- a/data/mapHeaders/route14.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route14_h: - db OVERWORLD ; tileset - db ROUTE_14_HEIGHT, ROUTE_14_WIDTH ; dimensions (y, x) - dw Route14Blocks, Route14TextPointers, Route14Script ; blocks, texts, scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_14, ROUTE_15, 18, 0, Route15Blocks - EAST_MAP_CONNECTION ROUTE_14, ROUTE_13, 0, 0, Route13Blocks - dw Route14Object ; objects diff --git a/data/mapHeaders/route15.asm b/data/mapHeaders/route15.asm deleted file mode 100755 index 48d5ff20..00000000 --- a/data/mapHeaders/route15.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route15_h: - db OVERWORLD ; tileset - db ROUTE_15_HEIGHT, ROUTE_15_WIDTH ; dimensions (y, x) - dw Route15Blocks, Route15TextPointers, Route15Script ; blocks, texts, scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_15, FUCHSIA_CITY, -3, 1, FuchsiaCityBlocks - EAST_MAP_CONNECTION ROUTE_15, ROUTE_14, -3, 15, Route14Blocks - dw Route15Object ; objects diff --git a/data/mapHeaders/route15gate.asm b/data/mapHeaders/route15gate.asm deleted file mode 100755 index ae71bc35..00000000 --- a/data/mapHeaders/route15gate.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route15Gate_h: - db GATE ; tileset - db ROUTE_15_GATE_1F_HEIGHT, ROUTE_15_GATE_1F_WIDTH ; dimensions (y, x) - dw Route15GateBlocks, Route15GateTextPointers, Route15GateScript ; blocks, texts, scripts - db 0 ; connections - dw Route15GateObject ; objects diff --git a/data/mapHeaders/route15gateupstairs.asm b/data/mapHeaders/route15gateupstairs.asm deleted file mode 100755 index 02996057..00000000 --- a/data/mapHeaders/route15gateupstairs.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route15GateUpstairs_h: - db GATE ; tileset - db ROUTE_15_GATE_2F_HEIGHT, ROUTE_15_GATE_2F_WIDTH ; dimensions (y, x) - dw Route15GateUpstairsBlocks, Route15GateUpstairsTextPointers, Route15GateUpstairsScript ; blocks, texts, scripts - db 0 ; connections - dw Route15GateUpstairsObject ; objects diff --git a/data/mapHeaders/route16.asm b/data/mapHeaders/route16.asm deleted file mode 100755 index eee71ba2..00000000 --- a/data/mapHeaders/route16.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route16_h: - db OVERWORLD ; tileset - db ROUTE_16_HEIGHT, ROUTE_16_WIDTH ; dimensions (y, x) - dw Route16Blocks, Route16TextPointers, Route16Script ; blocks, texts, scripts - db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION ROUTE_16, ROUTE_17, 0, 0, Route17Blocks - EAST_MAP_CONNECTION ROUTE_16, CELADON_CITY, -3, 1, CeladonCityBlocks, 1 - dw Route16Object ; objects diff --git a/data/mapHeaders/route16gate.asm b/data/mapHeaders/route16gate.asm deleted file mode 100755 index 32d0729b..00000000 --- a/data/mapHeaders/route16gate.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route16Gate_h: - db GATE ; tileset - db ROUTE_16_GATE_1F_HEIGHT, ROUTE_16_GATE_1F_WIDTH ; dimensions (y, x) - dw Route16GateBlocks, Route16GateTextPointers, Route16GateScript ; blocks, texts, scripts - db 0 ; connections - dw Route16GateObject ; objects diff --git a/data/mapHeaders/route16gateupstairs.asm b/data/mapHeaders/route16gateupstairs.asm deleted file mode 100755 index 32c32433..00000000 --- a/data/mapHeaders/route16gateupstairs.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route16GateUpstairs_h: - db GATE ; tileset - db ROUTE_16_GATE_2F_HEIGHT, ROUTE_16_GATE_2F_WIDTH ; dimensions (y, x) - dw Route16GateUpstairsBlocks, Route16GateUpstairsTextPointers, Route16GateUpstairsScript ; blocks, texts, scripts - db 0 ; connections - dw Route16GateUpstairsObject ; objects diff --git a/data/mapHeaders/route16house.asm b/data/mapHeaders/route16house.asm deleted file mode 100755 index 2b633873..00000000 --- a/data/mapHeaders/route16house.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route16House_h: - db HOUSE ; tileset - db ROUTE_16_HOUSE_HEIGHT, ROUTE_16_HOUSE_WIDTH ; dimensions (y, x) - dw Route16HouseBlocks, Route16HouseTextPointers, Route16HouseScript ; blocks, texts, scripts - db 0 ; connections - dw Route16HouseObject ; objects diff --git a/data/mapHeaders/route17.asm b/data/mapHeaders/route17.asm deleted file mode 100755 index 82a5d0f4..00000000 --- a/data/mapHeaders/route17.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route17_h: - db OVERWORLD ; tileset - db ROUTE_17_HEIGHT, ROUTE_17_WIDTH ; dimensions (y, x) - dw Route17Blocks, Route17TextPointers, Route17Script ; blocks, texts, scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_17, ROUTE_16, 0, 0, Route16Blocks - SOUTH_MAP_CONNECTION ROUTE_17, ROUTE_18, 0, 0, Route18Blocks, 1 - dw Route17Object ; objects diff --git a/data/mapHeaders/route18.asm b/data/mapHeaders/route18.asm deleted file mode 100755 index 180111b5..00000000 --- a/data/mapHeaders/route18.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route18_h: - db OVERWORLD ; tileset - db ROUTE_18_HEIGHT, ROUTE_18_WIDTH ; dimensions (y, x) - dw Route18Blocks, Route18TextPointers, Route18Script ; blocks, texts, scripts - db NORTH | EAST ; connections - NORTH_MAP_CONNECTION ROUTE_18, ROUTE_17, 0, 0, Route17Blocks - EAST_MAP_CONNECTION ROUTE_18, FUCHSIA_CITY, -3, 1, FuchsiaCityBlocks, 1 - dw Route18Object ; objects diff --git a/data/mapHeaders/route18gate.asm b/data/mapHeaders/route18gate.asm deleted file mode 100755 index 1b519527..00000000 --- a/data/mapHeaders/route18gate.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route18Gate_h: - db GATE ; tileset - db ROUTE_18_GATE_1F_HEIGHT, ROUTE_18_GATE_1F_WIDTH ; dimensions (y, x) - dw Route18GateBlocks, Route18GateTextPointers, Route18GateScript ; blocks, texts, scripts - db 0 ; connections - dw Route18GateObject ; objects diff --git a/data/mapHeaders/route18gateupstairs.asm b/data/mapHeaders/route18gateupstairs.asm deleted file mode 100755 index 3f78af1b..00000000 --- a/data/mapHeaders/route18gateupstairs.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route18GateUpstairs_h: - db GATE ; tileset - db ROUTE_18_GATE_2F_HEIGHT, ROUTE_18_GATE_2F_WIDTH ; dimensions (y, x) - dw Route18GateUpstairsBlocks, Route18GateUpstairsTextPointers, Route18GateUpstairsScript ; blocks, texts, scripts - db 0 ; connections - dw Route18GateUpstairsObject ; objects diff --git a/data/mapHeaders/route19.asm b/data/mapHeaders/route19.asm deleted file mode 100755 index 1de353f8..00000000 --- a/data/mapHeaders/route19.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route19_h: - db OVERWORLD ; tileset - db ROUTE_19_HEIGHT, ROUTE_19_WIDTH ; dimensions (y, x) - dw Route19Blocks, Route19TextPointers, Route19Script ; blocks, texts, scripts - db NORTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_19, FUCHSIA_CITY, -3, 2, FuchsiaCityBlocks - WEST_MAP_CONNECTION ROUTE_19, ROUTE_20, 18, 0, Route20Blocks - dw Route19Object ; objects diff --git a/data/mapHeaders/route2.asm b/data/mapHeaders/route2.asm deleted file mode 100755 index 550cd702..00000000 --- a/data/mapHeaders/route2.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route2_h: - db OVERWORLD ; tileset - db ROUTE_2_HEIGHT, ROUTE_2_WIDTH ; dimensions (y, x) - dw Route2Blocks, Route2TextPointers, Route2Script ; blocks, texts, scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_2, PEWTER_CITY, -3, 2, PewterCityBlocks - SOUTH_MAP_CONNECTION ROUTE_2, VIRIDIAN_CITY, -3, 2, ViridianCityBlocks, 1 - dw Route2Object ; objects diff --git a/data/mapHeaders/route20.asm b/data/mapHeaders/route20.asm deleted file mode 100755 index f871179f..00000000 --- a/data/mapHeaders/route20.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route20_h: - db OVERWORLD ; tileset - db ROUTE_20_HEIGHT, ROUTE_20_WIDTH ; dimensions (y, x) - dw Route20Blocks, Route20TextPointers, Route20Script ; blocks, texts, scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_20, CINNABAR_ISLAND, 0, 0, CinnabarIslandBlocks - EAST_MAP_CONNECTION ROUTE_20, ROUTE_19, -3, 15, Route19Blocks - dw Route20Object ; objects diff --git a/data/mapHeaders/route21.asm b/data/mapHeaders/route21.asm deleted file mode 100755 index a2c06868..00000000 --- a/data/mapHeaders/route21.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route21_h: - db OVERWORLD ; tileset - db ROUTE_21_HEIGHT, ROUTE_21_WIDTH ; dimensions (y, x) - dw Route21Blocks, Route21TextPointers, Route21Script ; blocks, texts, scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_21, PALLET_TOWN, 0, 0, PalletTownBlocks - SOUTH_MAP_CONNECTION ROUTE_21, CINNABAR_ISLAND, 0, 0, CinnabarIslandBlocks, 1 - dw Route21Object ; objects diff --git a/data/mapHeaders/route22.asm b/data/mapHeaders/route22.asm deleted file mode 100755 index c227d433..00000000 --- a/data/mapHeaders/route22.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route22_h: - db OVERWORLD ; tileset - db ROUTE_22_HEIGHT, ROUTE_22_WIDTH ; dimensions (y, x) - dw Route22Blocks, Route22TextPointers, Route22Script ; blocks, texts, scripts - db NORTH | EAST ; connections - NORTH_MAP_CONNECTION ROUTE_22, ROUTE_23, 0, 0, Route23Blocks - EAST_MAP_CONNECTION ROUTE_22, VIRIDIAN_CITY, -3, 1, ViridianCityBlocks, 1 - dw Route22Object ; objects diff --git a/data/mapHeaders/route22gate.asm b/data/mapHeaders/route22gate.asm deleted file mode 100755 index a8c20e97..00000000 --- a/data/mapHeaders/route22gate.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route22Gate_h: - db GATE ; tileset - db ROUTE_22_GATE_HEIGHT, ROUTE_22_GATE_WIDTH ; dimensions (y, x) - dw Route22GateBlocks, Route22GateTextPointers, Route22GateScript ; blocks, texts, scripts - db 0 ; connections - dw Route22GateObject ; objects diff --git a/data/mapHeaders/route23.asm b/data/mapHeaders/route23.asm deleted file mode 100755 index bec192c2..00000000 --- a/data/mapHeaders/route23.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route23_h: - db PLATEAU ; tileset - db ROUTE_23_HEIGHT, ROUTE_23_WIDTH ; dimensions (y, x) - dw Route23Blocks, Route23TextPointers, Route23Script ; blocks, texts, scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_23, INDIGO_PLATEAU, 0, 0, IndigoPlateauBlocks - SOUTH_MAP_CONNECTION ROUTE_23, ROUTE_22, 0, 0, Route22Blocks, 1 - dw Route23Object ; objects diff --git a/data/mapHeaders/route24.asm b/data/mapHeaders/route24.asm deleted file mode 100755 index 9a313aba..00000000 --- a/data/mapHeaders/route24.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route24_h: - db OVERWORLD ; tileset - db ROUTE_24_HEIGHT, ROUTE_24_WIDTH ; dimensions (y, x) - dw Route24Blocks, Route24TextPointers, Route24Script ; blocks, texts, scripts - db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION ROUTE_24, CERULEAN_CITY, -3, 2, CeruleanCityBlocks, 1 - EAST_MAP_CONNECTION ROUTE_24, ROUTE_25, 0, 0, Route25Blocks - dw Route24Object ; objects diff --git a/data/mapHeaders/route25.asm b/data/mapHeaders/route25.asm deleted file mode 100755 index 39ffa45d..00000000 --- a/data/mapHeaders/route25.asm +++ /dev/null @@ -1,7 +0,0 @@ -Route25_h: - db OVERWORLD ; tileset - db ROUTE_25_HEIGHT, ROUTE_25_WIDTH ; dimensions (y, x) - dw Route25Blocks, Route25TextPointers, Route25Script ; blocks, texts, scripts - db WEST ; connections - WEST_MAP_CONNECTION ROUTE_25, ROUTE_24, 0, 0, Route24Blocks - dw Route25Object ; objects diff --git a/data/mapHeaders/route2gate.asm b/data/mapHeaders/route2gate.asm deleted file mode 100755 index 7ef9f1a8..00000000 --- a/data/mapHeaders/route2gate.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route2Gate_h: - db GATE ; tileset - db ROUTE_2_GATE_HEIGHT, ROUTE_2_GATE_WIDTH ; dimensions (y, x) - dw Route2GateBlocks, Route2GateTextPointers, Route2GateScript ; blocks, texts, scripts - db 0 ; connections - dw Route2GateObject ; objects diff --git a/data/mapHeaders/route2house.asm b/data/mapHeaders/route2house.asm deleted file mode 100755 index 2fc12748..00000000 --- a/data/mapHeaders/route2house.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route2House_h: - db HOUSE ; tileset - db ROUTE_2_HOUSE_HEIGHT, ROUTE_2_HOUSE_WIDTH ; dimensions (y, x) - dw Route2HouseBlocks, Route2HouseTextPointers, Route2HouseScript ; blocks, texts, scripts - db 0 ; connections - dw Route2HouseObject ; objects diff --git a/data/mapHeaders/route3.asm b/data/mapHeaders/route3.asm deleted file mode 100755 index 19adfea8..00000000 --- a/data/mapHeaders/route3.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route3_h: - db OVERWORLD ; tileset - db ROUTE_3_HEIGHT, ROUTE_3_WIDTH ; dimensions (y, x) - dw Route3Blocks, Route3TextPointers, Route3Script ; blocks, texts, scripts - db NORTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_3, ROUTE_4, 25, 0, Route4Blocks - WEST_MAP_CONNECTION ROUTE_3, PEWTER_CITY, -3, 1, PewterCityBlocks - dw Route3Object ; objects diff --git a/data/mapHeaders/route4.asm b/data/mapHeaders/route4.asm deleted file mode 100755 index 26670e6d..00000000 --- a/data/mapHeaders/route4.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route4_h: - db OVERWORLD ; tileset - db ROUTE_4_HEIGHT, ROUTE_4_WIDTH ; dimensions (y, x) - dw Route4Blocks, Route4TextPointers, Route4Script ; blocks, texts, scripts - db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION ROUTE_4, ROUTE_3, -3, 22, Route3Blocks - EAST_MAP_CONNECTION ROUTE_4, CERULEAN_CITY, -3, 1, CeruleanCityBlocks, 1 - dw Route4Object ; objects diff --git a/data/mapHeaders/route5.asm b/data/mapHeaders/route5.asm deleted file mode 100755 index b982c02d..00000000 --- a/data/mapHeaders/route5.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route5_h: - db OVERWORLD ; tileset - db ROUTE_5_HEIGHT, ROUTE_5_WIDTH ; dimensions (y, x) - dw Route5Blocks, Route5TextPointers, Route5Script ; blocks, texts, scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_5, CERULEAN_CITY, -3, 2, CeruleanCityBlocks - SOUTH_MAP_CONNECTION ROUTE_5, SAFFRON_CITY, -3, 2, SaffronCityBlocks, 1 - dw Route5Object ; objects diff --git a/data/mapHeaders/route5gate.asm b/data/mapHeaders/route5gate.asm deleted file mode 100755 index be3fd45c..00000000 --- a/data/mapHeaders/route5gate.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route5Gate_h: - db GATE ; tileset - db ROUTE_5_GATE_HEIGHT, ROUTE_5_GATE_WIDTH ; dimensions (y, x) - dw Route5GateBlocks, Route5GateTextPointers, Route5GateScript ; blocks, texts, scripts - db 0 ; connections - dw Route5GateObject ; objects diff --git a/data/mapHeaders/route6.asm b/data/mapHeaders/route6.asm deleted file mode 100755 index 6ed13d4e..00000000 --- a/data/mapHeaders/route6.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route6_h: - db OVERWORLD ; tileset - db ROUTE_6_HEIGHT, ROUTE_6_WIDTH ; dimensions (y, x) - dw Route6Blocks, Route6TextPointers, Route6Script ; blocks, texts, scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_6, SAFFRON_CITY, -3, 2, SaffronCityBlocks - SOUTH_MAP_CONNECTION ROUTE_6, VERMILION_CITY, -3, 2, VermilionCityBlocks, 1 - dw Route6Object ; objects diff --git a/data/mapHeaders/route6gate.asm b/data/mapHeaders/route6gate.asm deleted file mode 100755 index 37c5032f..00000000 --- a/data/mapHeaders/route6gate.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route6Gate_h: - db GATE ; tileset - db ROUTE_6_GATE_HEIGHT, ROUTE_6_GATE_WIDTH ; dimensions (y, x) - dw Route6GateBlocks, Route6GateTextPointers, Route6GateScript ; blocks, texts, scripts - db 0 ; connections - dw Route6GateObject ; objects diff --git a/data/mapHeaders/route7.asm b/data/mapHeaders/route7.asm deleted file mode 100755 index 62f3bedf..00000000 --- a/data/mapHeaders/route7.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route7_h: - db OVERWORLD ; tileset - db ROUTE_7_HEIGHT, ROUTE_7_WIDTH ; dimensions (y, x) - dw Route7Blocks, Route7TextPointers, Route7Script ; blocks, texts, scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_7, CELADON_CITY, -3, 1, CeladonCityBlocks - EAST_MAP_CONNECTION ROUTE_7, SAFFRON_CITY, -3, 1, SaffronCityBlocks, 1 - dw Route7Object ; objects diff --git a/data/mapHeaders/route7gate.asm b/data/mapHeaders/route7gate.asm deleted file mode 100755 index 9b5802b3..00000000 --- a/data/mapHeaders/route7gate.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route7Gate_h: - db GATE ; tileset - db ROUTE_7_GATE_HEIGHT, ROUTE_7_GATE_WIDTH ; dimensions (y, x) - dw Route7GateBlocks, Route7GateTextPointers, Route7GateScript ; blocks, texts, scripts - db 0 ; connections - dw Route7GateObject ; objects diff --git a/data/mapHeaders/route8.asm b/data/mapHeaders/route8.asm deleted file mode 100755 index 5187fd8f..00000000 --- a/data/mapHeaders/route8.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route8_h: - db OVERWORLD ; tileset - db ROUTE_8_HEIGHT, ROUTE_8_WIDTH ; dimensions (y, x) - dw Route8Blocks, Route8TextPointers, Route8Script ; blocks, texts, scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_8, SAFFRON_CITY, -3, 1, SaffronCityBlocks - EAST_MAP_CONNECTION ROUTE_8, LAVENDER_TOWN, 0, 0, LavenderTownBlocks - dw Route8Object ; objects diff --git a/data/mapHeaders/route8gate.asm b/data/mapHeaders/route8gate.asm deleted file mode 100755 index 66593058..00000000 --- a/data/mapHeaders/route8gate.asm +++ /dev/null @@ -1,6 +0,0 @@ -Route8Gate_h: - db GATE ; tileset - db ROUTE_8_GATE_HEIGHT, ROUTE_8_GATE_WIDTH ; dimensions (y, x) - dw Route8GateBlocks, Route8GateTextPointers, Route8GateScript ; blocks, texts, scripts - db 0 ; connections - dw Route8GateObject ; objects diff --git a/data/mapHeaders/route9.asm b/data/mapHeaders/route9.asm deleted file mode 100755 index 044a4ec0..00000000 --- a/data/mapHeaders/route9.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route9_h: - db OVERWORLD ; tileset - db ROUTE_9_HEIGHT, ROUTE_9_WIDTH ; dimensions (y, x) - dw Route9Blocks, Route9TextPointers, Route9Script ; blocks, texts, scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_9, CERULEAN_CITY, -3, 1, CeruleanCityBlocks - EAST_MAP_CONNECTION ROUTE_9, ROUTE_10, 0, 0, Route10Blocks, 1 - dw Route9Object ; objects diff --git a/data/mapHeaders/safarizonecenter.asm b/data/mapHeaders/safarizonecenter.asm deleted file mode 100755 index 39f20b5d..00000000 --- a/data/mapHeaders/safarizonecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -SafariZoneCenter_h: - db FOREST ; tileset - db SAFARI_ZONE_CENTER_HEIGHT, SAFARI_ZONE_CENTER_WIDTH ; dimensions (y, x) - dw SafariZoneCenterBlocks, SafariZoneCenterTextPointers, SafariZoneCenterScript ; blocks, texts, scripts - db 0 ; connections - dw SafariZoneCenterObject ; objects diff --git a/data/mapHeaders/safarizoneeast.asm b/data/mapHeaders/safarizoneeast.asm deleted file mode 100755 index f94a92bf..00000000 --- a/data/mapHeaders/safarizoneeast.asm +++ /dev/null @@ -1,6 +0,0 @@ -SafariZoneEast_h: - db FOREST ; tileset - db SAFARI_ZONE_EAST_HEIGHT, SAFARI_ZONE_EAST_WIDTH ; dimensions (y, x) - dw SafariZoneEastBlocks, SafariZoneEastTextPointers, SafariZoneEastScript ; blocks, texts, scripts - db 0 ; connections - dw SafariZoneEastObject ; objects diff --git a/data/mapHeaders/safarizoneentrance.asm b/data/mapHeaders/safarizoneentrance.asm deleted file mode 100755 index e2eabdcd..00000000 --- a/data/mapHeaders/safarizoneentrance.asm +++ /dev/null @@ -1,6 +0,0 @@ -SafariZoneEntrance_h: - db GATE ; tileset - db SAFARI_ZONE_ENTRANCE_HEIGHT, SAFARI_ZONE_ENTRANCE_WIDTH ; dimensions (y, x) - dw SafariZoneEntranceBlocks, SafariZoneEntranceTextPointers, SafariZoneEntranceScript ; blocks, texts, scripts - db 0 ; connections - dw SafariZoneEntranceObject ; objects diff --git a/data/mapHeaders/safarizonenorth.asm b/data/mapHeaders/safarizonenorth.asm deleted file mode 100755 index 5b01138d..00000000 --- a/data/mapHeaders/safarizonenorth.asm +++ /dev/null @@ -1,6 +0,0 @@ -SafariZoneNorth_h: - db FOREST ; tileset - db SAFARI_ZONE_NORTH_HEIGHT, SAFARI_ZONE_NORTH_WIDTH ; dimensions (y, x) - dw SafariZoneNorthBlocks, SafariZoneNorthTextPointers, SafariZoneNorthScript ; blocks, texts, scripts - db 0 ; connections - dw SafariZoneNorthObject ; objects diff --git a/data/mapHeaders/safarizoneresthouse1.asm b/data/mapHeaders/safarizoneresthouse1.asm deleted file mode 100755 index 0169c61f..00000000 --- a/data/mapHeaders/safarizoneresthouse1.asm +++ /dev/null @@ -1,6 +0,0 @@ -SafariZoneRestHouse1_h: - db GATE ; tileset - db SAFARI_ZONE_REST_HOUSE_1_HEIGHT, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; dimensions (y, x) - dw SafariZoneRestHouse1Blocks, SafariZoneRestHouse1TextPointers, SafariZoneRestHouse1Script ; blocks, texts, scripts - db 0 ; connections - dw SafariZoneRestHouse1Object ; objects diff --git a/data/mapHeaders/safarizoneresthouse2.asm b/data/mapHeaders/safarizoneresthouse2.asm deleted file mode 100755 index 804d619c..00000000 --- a/data/mapHeaders/safarizoneresthouse2.asm +++ /dev/null @@ -1,6 +0,0 @@ -SafariZoneRestHouse2_h: - db GATE ; tileset - db SAFARI_ZONE_REST_HOUSE_2_HEIGHT, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; dimensions (y, x) - dw SafariZoneRestHouse2Blocks, SafariZoneRestHouse2TextPointers, SafariZoneRestHouse2Script ; blocks, texts, scripts - db 0 ; connections - dw SafariZoneRestHouse2Object ; objects diff --git a/data/mapHeaders/safarizoneresthouse3.asm b/data/mapHeaders/safarizoneresthouse3.asm deleted file mode 100755 index becd3e7c..00000000 --- a/data/mapHeaders/safarizoneresthouse3.asm +++ /dev/null @@ -1,6 +0,0 @@ -SafariZoneRestHouse3_h: - db GATE ; tileset - db SAFARI_ZONE_REST_HOUSE_3_HEIGHT, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; dimensions (y, x) - dw SafariZoneRestHouse3Blocks, SafariZoneRestHouse3TextPointers, SafariZoneRestHouse3Script ; blocks, texts, scripts - db 0 ; connections - dw SafariZoneRestHouse3Object ; objects diff --git a/data/mapHeaders/safarizoneresthouse4.asm b/data/mapHeaders/safarizoneresthouse4.asm deleted file mode 100755 index 7cc8fd25..00000000 --- a/data/mapHeaders/safarizoneresthouse4.asm +++ /dev/null @@ -1,6 +0,0 @@ -SafariZoneRestHouse4_h: - db GATE ; tileset - db SAFARI_ZONE_REST_HOUSE_4_HEIGHT, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; dimensions (y, x) - dw SafariZoneRestHouse4Blocks, SafariZoneRestHouse4TextPointers, SafariZoneRestHouse4Script ; blocks, texts, scripts - db 0 ; connections - dw SafariZoneRestHouse4Object ; objects diff --git a/data/mapHeaders/safarizonesecrethouse.asm b/data/mapHeaders/safarizonesecrethouse.asm deleted file mode 100755 index 35575a10..00000000 --- a/data/mapHeaders/safarizonesecrethouse.asm +++ /dev/null @@ -1,6 +0,0 @@ -SafariZoneSecretHouse_h: - db LAB ; tileset - db SAFARI_ZONE_SECRET_HOUSE_HEIGHT, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; dimensions (y, x) - dw SafariZoneSecretHouseBlocks, SafariZoneSecretHouseTextPointers, SafariZoneSecretHouseScript ; blocks, texts, scripts - db 0 ; connections - dw SafariZoneSecretHouseObject ; objects diff --git a/data/mapHeaders/safarizonewest.asm b/data/mapHeaders/safarizonewest.asm deleted file mode 100755 index 24ac7686..00000000 --- a/data/mapHeaders/safarizonewest.asm +++ /dev/null @@ -1,6 +0,0 @@ -SafariZoneWest_h: - db FOREST ; tileset - db SAFARI_ZONE_WEST_HEIGHT, SAFARI_ZONE_WEST_WIDTH ; dimensions (y, x) - dw SafariZoneWestBlocks, SafariZoneWestTextPointers, SafariZoneWestScript ; blocks, texts, scripts - db 0 ; connections - dw SafariZoneWestObject ; objects diff --git a/data/mapHeaders/saffroncity.asm b/data/mapHeaders/saffroncity.asm deleted file mode 100755 index 8f4ea922..00000000 --- a/data/mapHeaders/saffroncity.asm +++ /dev/null @@ -1,10 +0,0 @@ -SaffronCity_h: - db OVERWORLD ; tileset - db SAFFRON_CITY_HEIGHT, SAFFRON_CITY_WIDTH ; dimensions (y, x) - dw SaffronCityBlocks, SaffronCityTextPointers, SaffronCityScript ; blocks, texts, scripts - db NORTH | SOUTH | WEST | EAST ; connections - NORTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_5, 5, 0, Route5Blocks - SOUTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_6, 5, 0, Route6Blocks, 1 - WEST_MAP_CONNECTION SAFFRON_CITY, ROUTE_7, 4, 0, Route7Blocks - EAST_MAP_CONNECTION SAFFRON_CITY, ROUTE_8, 4, 0, Route8Blocks - dw SaffronCityObject ; objects diff --git a/data/mapHeaders/saffrongym.asm b/data/mapHeaders/saffrongym.asm deleted file mode 100755 index 4e9fe383..00000000 --- a/data/mapHeaders/saffrongym.asm +++ /dev/null @@ -1,6 +0,0 @@ -SaffronGym_h: - db FACILITY ; tileset - db SAFFRON_GYM_HEIGHT, SAFFRON_GYM_WIDTH ; dimensions (y, x) - dw SaffronGymBlocks, SaffronGymTextPointers, SaffronGymScript ; blocks, texts, scripts - db 0 ; connections - dw SaffronGymObject ; objects diff --git a/data/mapHeaders/saffronhouse1.asm b/data/mapHeaders/saffronhouse1.asm deleted file mode 100755 index 747b46b4..00000000 --- a/data/mapHeaders/saffronhouse1.asm +++ /dev/null @@ -1,6 +0,0 @@ -SaffronHouse1_h: - db HOUSE ; tileset - db SAFFRON_HOUSE_1_HEIGHT, SAFFRON_HOUSE_1_WIDTH ; dimensions (y, x) - dw SaffronHouse1Blocks, SaffronHouse1TextPointers, SaffronHouse1Script ; blocks, texts, scripts - db 0 ; connections - dw SaffronHouse1Object ; objects diff --git a/data/mapHeaders/saffronhouse2.asm b/data/mapHeaders/saffronhouse2.asm deleted file mode 100755 index 6a642a73..00000000 --- a/data/mapHeaders/saffronhouse2.asm +++ /dev/null @@ -1,6 +0,0 @@ -SaffronHouse2_h: - db HOUSE ; tileset - db SAFFRON_HOUSE_2_HEIGHT, SAFFRON_HOUSE_2_WIDTH ; dimensions (y, x) - dw SaffronHouse2Blocks, SaffronHouse2TextPointers, SaffronHouse2Script ; blocks, texts, scripts - db 0 ; connections - dw SaffronHouse2Object ; objects diff --git a/data/mapHeaders/saffronmart.asm b/data/mapHeaders/saffronmart.asm deleted file mode 100755 index 72aadb56..00000000 --- a/data/mapHeaders/saffronmart.asm +++ /dev/null @@ -1,6 +0,0 @@ -SaffronMart_h: - db MART ; tileset - db SAFFRON_MART_HEIGHT, SAFFRON_MART_WIDTH ; dimensions (y, x) - dw SaffronMartBlocks, SaffronMartTextPointers, SaffronMartScript ; blocks, texts, scripts - db 0 ; connections - dw SaffronMartObject ; objects diff --git a/data/mapHeaders/saffronpokecenter.asm b/data/mapHeaders/saffronpokecenter.asm deleted file mode 100755 index 85e3b5e3..00000000 --- a/data/mapHeaders/saffronpokecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -SaffronPokecenter_h: - db POKECENTER ; tileset - db SAFFRON_POKECENTER_HEIGHT, SAFFRON_POKECENTER_WIDTH ; dimensions (y, x) - dw SaffronPokecenterBlocks, SaffronPokecenterTextPointers, SaffronPokecenterScript ; blocks, texts, scripts - db 0 ; connections - dw SaffronPokecenterObject ; objects diff --git a/data/mapHeaders/school.asm b/data/mapHeaders/school.asm deleted file mode 100755 index 4c122f2a..00000000 --- a/data/mapHeaders/school.asm +++ /dev/null @@ -1,6 +0,0 @@ -School_h: - db HOUSE ; tileset - db VIRIDIAN_SCHOOL_HEIGHT, VIRIDIAN_SCHOOL_WIDTH ; dimensions (y, x) - dw SchoolBlocks, SchoolTextPointers, SchoolScript ; blocks, texts, scripts - db 0 ; connections - dw SchoolObject ; objects diff --git a/data/mapHeaders/seafoamislands1.asm b/data/mapHeaders/seafoamislands1.asm deleted file mode 100755 index 32754b23..00000000 --- a/data/mapHeaders/seafoamislands1.asm +++ /dev/null @@ -1,6 +0,0 @@ -SeafoamIslands1_h: - db CAVERN ; tileset - db SEAFOAM_ISLANDS_1_HEIGHT, SEAFOAM_ISLANDS_1_WIDTH ; dimensions (y, x) - dw SeafoamIslands1Blocks, SeafoamIslands1TextPointers, SeafoamIslands1Script ; blocks, texts, scripts - db 0 ; connections - dw SeafoamIslands1Object ; objects diff --git a/data/mapHeaders/seafoamislands2.asm b/data/mapHeaders/seafoamislands2.asm deleted file mode 100755 index f59d7201..00000000 --- a/data/mapHeaders/seafoamislands2.asm +++ /dev/null @@ -1,6 +0,0 @@ -SeafoamIslands2_h: - db CAVERN ; tileset - db SEAFOAM_ISLANDS_2_HEIGHT, SEAFOAM_ISLANDS_2_WIDTH ; dimensions (y, x) - dw SeafoamIslands2Blocks, SeafoamIslands2TextPointers, SeafoamIslands2Script ; blocks, texts, scripts - db 0 ; connections - dw SeafoamIslands2Object ; objects diff --git a/data/mapHeaders/seafoamislands3.asm b/data/mapHeaders/seafoamislands3.asm deleted file mode 100755 index e75325ea..00000000 --- a/data/mapHeaders/seafoamislands3.asm +++ /dev/null @@ -1,6 +0,0 @@ -SeafoamIslands3_h: - db CAVERN ; tileset - db SEAFOAM_ISLANDS_3_HEIGHT, SEAFOAM_ISLANDS_3_WIDTH ; dimensions (y, x) - dw SeafoamIslands3Blocks, SeafoamIslands3TextPointers, SeafoamIslands3Script ; blocks, texts, scripts - db 0 ; connections - dw SeafoamIslands3Object ; objects diff --git a/data/mapHeaders/seafoamislands4.asm b/data/mapHeaders/seafoamislands4.asm deleted file mode 100755 index 297ecbbb..00000000 --- a/data/mapHeaders/seafoamislands4.asm +++ /dev/null @@ -1,6 +0,0 @@ -SeafoamIslands4_h: - db CAVERN ; tileset - db SEAFOAM_ISLANDS_4_HEIGHT, SEAFOAM_ISLANDS_4_WIDTH ; dimensions (y, x) - dw SeafoamIslands4Blocks, SeafoamIslands4TextPointers, SeafoamIslands4Script ; blocks, texts, scripts - db 0 ; connections - dw SeafoamIslands4Object ; objects diff --git a/data/mapHeaders/seafoamislands5.asm b/data/mapHeaders/seafoamislands5.asm deleted file mode 100755 index 1e8af6f7..00000000 --- a/data/mapHeaders/seafoamislands5.asm +++ /dev/null @@ -1,6 +0,0 @@ -SeafoamIslands5_h: - db CAVERN ; tileset - db SEAFOAM_ISLANDS_5_HEIGHT, SEAFOAM_ISLANDS_5_WIDTH ; dimensions (y, x) - dw SeafoamIslands5Blocks, SeafoamIslands5TextPointers, SeafoamIslands5Script ; blocks, texts, scripts - db 0 ; connections - dw SeafoamIslands5Object ; objects diff --git a/data/mapHeaders/silphco1.asm b/data/mapHeaders/silphco1.asm deleted file mode 100755 index 4a2b176f..00000000 --- a/data/mapHeaders/silphco1.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCo1_h: - db FACILITY ; tileset - db SILPH_CO_1F_HEIGHT, SILPH_CO_1F_WIDTH ; dimensions (y, x) - dw SilphCo1Blocks, SilphCo1TextPointers, SilphCo1Script ; blocks, texts, scripts - db 0 ; connections - dw SilphCo1Object ; objects diff --git a/data/mapHeaders/silphco10.asm b/data/mapHeaders/silphco10.asm deleted file mode 100755 index 716fa025..00000000 --- a/data/mapHeaders/silphco10.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCo10_h: - db FACILITY ; tileset - db SILPH_CO_10F_HEIGHT, SILPH_CO_10F_WIDTH ; dimensions (y, x) - dw SilphCo10Blocks, SilphCo10TextPointers, SilphCo10Script ; blocks, texts, scripts - db 0 ; connections - dw SilphCo10Object ; objects diff --git a/data/mapHeaders/silphco11.asm b/data/mapHeaders/silphco11.asm deleted file mode 100755 index 4ed282a9..00000000 --- a/data/mapHeaders/silphco11.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCo11_h: - db INTERIOR ; tileset - db SILPH_CO_11F_HEIGHT, SILPH_CO_11F_WIDTH ; dimensions (y, x) - dw SilphCo11Blocks, SilphCo11TextPointers, SilphCo11Script ; blocks, texts, scripts - db 0 ; connections - dw SilphCo11Object ; objects diff --git a/data/mapHeaders/silphco2.asm b/data/mapHeaders/silphco2.asm deleted file mode 100755 index fae02d5b..00000000 --- a/data/mapHeaders/silphco2.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCo2_h: - db FACILITY ; tileset - db SILPH_CO_2F_HEIGHT, SILPH_CO_2F_WIDTH ; dimensions (y, x) - dw SilphCo2Blocks, SilphCo2TextPointers, SilphCo2Script ; blocks, texts, scripts - db 0 ; connections - dw SilphCo2Object ; objects diff --git a/data/mapHeaders/silphco3.asm b/data/mapHeaders/silphco3.asm deleted file mode 100755 index 98a130c0..00000000 --- a/data/mapHeaders/silphco3.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCo3_h: - db FACILITY ; tileset - db SILPH_CO_3F_HEIGHT, SILPH_CO_3F_WIDTH ; dimensions (y, x) - dw SilphCo3Blocks, SilphCo3TextPointers, SilphCo3Script ; blocks, texts, scripts - db 0 ; connections - dw SilphCo3Object ; objects diff --git a/data/mapHeaders/silphco4.asm b/data/mapHeaders/silphco4.asm deleted file mode 100755 index bc91f24b..00000000 --- a/data/mapHeaders/silphco4.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCo4_h: - db FACILITY ; tileset - db SILPH_CO_4F_HEIGHT, SILPH_CO_4F_WIDTH ; dimensions (y, x) - dw SilphCo4Blocks, SilphCo4TextPointers, SilphCo4Script ; blocks, texts, scripts - db 0 ; connections - dw SilphCo4Object ; objects diff --git a/data/mapHeaders/silphco5.asm b/data/mapHeaders/silphco5.asm deleted file mode 100755 index c9a4c1d2..00000000 --- a/data/mapHeaders/silphco5.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCo5_h: - db FACILITY ; tileset - db SILPH_CO_5F_HEIGHT, SILPH_CO_5F_WIDTH ; dimensions (y, x) - dw SilphCo5Blocks, SilphCo5TextPointers, SilphCo5Script ; blocks, texts, scripts - db 0 ; connections - dw SilphCo5Object ; objects diff --git a/data/mapHeaders/silphco6.asm b/data/mapHeaders/silphco6.asm deleted file mode 100755 index 675709c2..00000000 --- a/data/mapHeaders/silphco6.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCo6_h: - db FACILITY ; tileset - db SILPH_CO_6F_HEIGHT, SILPH_CO_6F_WIDTH ; dimensions (y, x) - dw SilphCo6Blocks, SilphCo6TextPointers, SilphCo6Script ; blocks, texts, scripts - db 0 ; connections - dw SilphCo6Object ; objects diff --git a/data/mapHeaders/silphco7.asm b/data/mapHeaders/silphco7.asm deleted file mode 100755 index ee46c3fb..00000000 --- a/data/mapHeaders/silphco7.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCo7_h: - db FACILITY ; tileset - db SILPH_CO_7F_HEIGHT, SILPH_CO_7F_WIDTH ; dimensions (y, x) - dw SilphCo7Blocks, SilphCo7TextPointers, SilphCo7Script ; blocks, texts, scripts - db 0 ; connections - dw SilphCo7Object ; objects diff --git a/data/mapHeaders/silphco8.asm b/data/mapHeaders/silphco8.asm deleted file mode 100755 index 90c0ba0f..00000000 --- a/data/mapHeaders/silphco8.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCo8_h: - db FACILITY ; tileset - db SILPH_CO_8F_HEIGHT, SILPH_CO_8F_WIDTH ; dimensions (y, x) - dw SilphCo8Blocks, SilphCo8TextPointers, SilphCo8Script ; blocks, texts, scripts - db 0 ; connections - dw SilphCo8Object ; objects diff --git a/data/mapHeaders/silphco9.asm b/data/mapHeaders/silphco9.asm deleted file mode 100755 index 182ec5b2..00000000 --- a/data/mapHeaders/silphco9.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCo9_h: - db FACILITY ; tileset - db SILPH_CO_9F_HEIGHT, SILPH_CO_9F_WIDTH ; dimensions (y, x) - dw SilphCo9Blocks, SilphCo9TextPointers, SilphCo9Script ; blocks, texts, scripts - db 0 ; connections - dw SilphCo9Object ; objects diff --git a/data/mapHeaders/silphcoelevator.asm b/data/mapHeaders/silphcoelevator.asm deleted file mode 100755 index 3663cacd..00000000 --- a/data/mapHeaders/silphcoelevator.asm +++ /dev/null @@ -1,6 +0,0 @@ -SilphCoElevator_h: - db LOBBY ; tileset - db SILPH_CO_ELEVATOR_HEIGHT, SILPH_CO_ELEVATOR_WIDTH ; dimensions (y, x) - dw SilphCoElevatorBlocks, SilphCoElevatorTextPointers, SilphCoElevatorScript ; blocks, texts, scripts - db 0 ; connections - dw SilphCoElevatorObject ; objects diff --git a/data/mapHeaders/ssanne1.asm b/data/mapHeaders/ssanne1.asm deleted file mode 100755 index c69481d6..00000000 --- a/data/mapHeaders/ssanne1.asm +++ /dev/null @@ -1,6 +0,0 @@ -SSAnne1_h: - db SHIP ; tileset - db SS_ANNE_1_HEIGHT, SS_ANNE_1_WIDTH ; dimensions (y, x) - dw SSAnne1Blocks, SSAnne1TextPointers, SSAnne1Script ; blocks, texts, scripts - db 0 ; connections - dw SSAnne1Object ; objects diff --git a/data/mapHeaders/ssanne10.asm b/data/mapHeaders/ssanne10.asm deleted file mode 100755 index 79464beb..00000000 --- a/data/mapHeaders/ssanne10.asm +++ /dev/null @@ -1,6 +0,0 @@ -SSAnne10_h: - db SHIP ; tileset - db SS_ANNE_10_HEIGHT, SS_ANNE_10_WIDTH ; dimensions (y, x) - dw SSAnne10Blocks, SSAnne10TextPointers, SSAnne10Script ; blocks, texts, scripts - db 0 ; connections - dw SSAnne10Object ; objects diff --git a/data/mapHeaders/ssanne2.asm b/data/mapHeaders/ssanne2.asm deleted file mode 100755 index 7a6294e5..00000000 --- a/data/mapHeaders/ssanne2.asm +++ /dev/null @@ -1,6 +0,0 @@ -SSAnne2_h: - db SHIP ; tileset - db SS_ANNE_2_HEIGHT, SS_ANNE_2_WIDTH ; dimensions (y, x) - dw SSAnne2Blocks, SSAnne2TextPointers, SSAnne2Script ; blocks, texts, scripts - db 0 ; connections - dw SSAnne2Object ; objects diff --git a/data/mapHeaders/ssanne3.asm b/data/mapHeaders/ssanne3.asm deleted file mode 100755 index 78f9660b..00000000 --- a/data/mapHeaders/ssanne3.asm +++ /dev/null @@ -1,6 +0,0 @@ -SSAnne3_h: - db SHIP ; tileset - db SS_ANNE_3_HEIGHT, SS_ANNE_3_WIDTH ; dimensions (y, x) - dw SSAnne3Blocks, SSAnne3TextPointers, SSAnne3Script ; blocks, texts, scripts - db 0 ; connections - dw SSAnne3Object ; objects diff --git a/data/mapHeaders/ssanne4.asm b/data/mapHeaders/ssanne4.asm deleted file mode 100755 index 9ad2c66c..00000000 --- a/data/mapHeaders/ssanne4.asm +++ /dev/null @@ -1,6 +0,0 @@ -SSAnne4_h: - db SHIP ; tileset - db SS_ANNE_4_HEIGHT, SS_ANNE_4_WIDTH ; dimensions (y, x) - dw SSAnne4Blocks, SSAnne4TextPointers, SSAnne4Script ; blocks, texts, scripts - db 0 ; connections - dw SSAnne4Object ; objects diff --git a/data/mapHeaders/ssanne5.asm b/data/mapHeaders/ssanne5.asm deleted file mode 100755 index a2c2b943..00000000 --- a/data/mapHeaders/ssanne5.asm +++ /dev/null @@ -1,6 +0,0 @@ -SSAnne5_h: - db SHIP ; tileset - db SS_ANNE_5_HEIGHT, SS_ANNE_5_WIDTH ; dimensions (y, x) - dw SSAnne5Blocks, SSAnne5TextPointers, SSAnne5Script ; blocks, texts, scripts - db 0 ; connections - dw SSAnne5Object ; objects diff --git a/data/mapHeaders/ssanne6.asm b/data/mapHeaders/ssanne6.asm deleted file mode 100755 index 5a939b8f..00000000 --- a/data/mapHeaders/ssanne6.asm +++ /dev/null @@ -1,6 +0,0 @@ -SSAnne6_h: - db SHIP ; tileset - db SS_ANNE_6_HEIGHT, SS_ANNE_6_WIDTH ; dimensions (y, x) - dw SSAnne6Blocks, SSAnne6TextPointers, SSAnne6Script ; blocks, texts, scripts - db 0 ; connections - dw SSAnne6Object ; objects diff --git a/data/mapHeaders/ssanne7.asm b/data/mapHeaders/ssanne7.asm deleted file mode 100755 index 97666530..00000000 --- a/data/mapHeaders/ssanne7.asm +++ /dev/null @@ -1,6 +0,0 @@ -SSAnne7_h: - db SHIP ; tileset - db SS_ANNE_7_HEIGHT, SS_ANNE_7_WIDTH ; dimensions (y, x) - dw SSAnne7Blocks, SSAnne7TextPointers, SSAnne7Script ; blocks, texts, scripts - db 0 ; connections - dw SSAnne7Object ; objects diff --git a/data/mapHeaders/ssanne8.asm b/data/mapHeaders/ssanne8.asm deleted file mode 100755 index 2771ad40..00000000 --- a/data/mapHeaders/ssanne8.asm +++ /dev/null @@ -1,6 +0,0 @@ -SSAnne8_h: - db SHIP ; tileset - db SS_ANNE_8_HEIGHT, SS_ANNE_8_WIDTH ; dimensions (y, x) - dw SSAnne8Blocks, SSAnne8TextPointers, SSAnne8Script ; blocks, texts, scripts - db 0 ; connections - dw SSAnne8Object ; objects diff --git a/data/mapHeaders/ssanne9.asm b/data/mapHeaders/ssanne9.asm deleted file mode 100755 index 8f944cf9..00000000 --- a/data/mapHeaders/ssanne9.asm +++ /dev/null @@ -1,6 +0,0 @@ -SSAnne9_h: - db SHIP ; tileset - db SS_ANNE_9_HEIGHT, SS_ANNE_9_WIDTH ; dimensions (y, x) - dw SSAnne9Blocks, SSAnne9TextPointers, SSAnne9Script ; blocks, texts, scripts - db 0 ; connections - dw SSAnne9Object ; objects diff --git a/data/mapHeaders/tradecenter.asm b/data/mapHeaders/tradecenter.asm deleted file mode 100755 index 5d6c7d95..00000000 --- a/data/mapHeaders/tradecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -TradeCenter_h: - db CLUB ; tileset - db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x) - dw TradeCenterBlocks, TradeCenterTextPointers, TradeCenterScript ; blocks, texts, scripts - db 0 ; connections - dw TradeCenterObject ; objects diff --git a/data/mapHeaders/undergroundpathentranceroute5.asm b/data/mapHeaders/undergroundpathentranceroute5.asm deleted file mode 100755 index 9f5a2125..00000000 --- a/data/mapHeaders/undergroundpathentranceroute5.asm +++ /dev/null @@ -1,6 +0,0 @@ -UndergroundPathEntranceRoute5_h: - db GATE ; tileset - db PATH_ENTRANCE_ROUTE_5_HEIGHT, PATH_ENTRANCE_ROUTE_5_WIDTH ; dimensions (y, x) - dw UndergroundPathEntranceRoute5Blocks, UndergroundPathEntranceRoute5TextPointers, UndergroundPathEntranceRoute5Script ; blocks, texts, scripts - db 0 ; connections - dw UndergroundPathEntranceRoute5Object ; objects diff --git a/data/mapHeaders/undergroundpathentranceroute6.asm b/data/mapHeaders/undergroundpathentranceroute6.asm deleted file mode 100755 index 4a5670af..00000000 --- a/data/mapHeaders/undergroundpathentranceroute6.asm +++ /dev/null @@ -1,6 +0,0 @@ -UndergroundPathEntranceRoute6_h: - db GATE ; tileset - db PATH_ENTRANCE_ROUTE_6_HEIGHT, PATH_ENTRANCE_ROUTE_6_WIDTH ; dimensions (y, x) - dw UndergroundPathEntranceRoute6Blocks, UndergroundPathEntranceRoute6TextPointers, UndergroundPathEntranceRoute6Script ; blocks, texts, scripts - db 0 ; connections - dw UndergroundPathEntranceRoute6Object ; objects diff --git a/data/mapHeaders/undergroundpathentranceroute7.asm b/data/mapHeaders/undergroundpathentranceroute7.asm deleted file mode 100755 index e3fe68f0..00000000 --- a/data/mapHeaders/undergroundpathentranceroute7.asm +++ /dev/null @@ -1,6 +0,0 @@ -UndergroundPathEntranceRoute7_h: - db GATE ; tileset - db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x) - dw UndergroundPathEntranceRoute7Blocks, UndergroundPathEntranceRoute7TextPointers, UndergroundPathEntranceRoute7Script ; blocks, texts, scripts - db 0 ; connections - dw UndergroundPathEntranceRoute7Object ; objects diff --git a/data/mapHeaders/undergroundpathentranceroute7copy.asm b/data/mapHeaders/undergroundpathentranceroute7copy.asm deleted file mode 100755 index a15f2f4d..00000000 --- a/data/mapHeaders/undergroundpathentranceroute7copy.asm +++ /dev/null @@ -1,6 +0,0 @@ -UndergroundPathEntranceRoute7Copy_h: - db GATE ; tileset - db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x) - dw UndergroundPathEntranceRoute7CopyBlocks, UndergroundPathEntranceRoute7CopyTextPointers, UndergroundPathEntranceRoute7CopyScript ; blocks, texts, scripts - db 0 ; connections - dw UndergroundPathEntranceRoute7CopyObject ; objects diff --git a/data/mapHeaders/undergroundpathentranceroute8.asm b/data/mapHeaders/undergroundpathentranceroute8.asm deleted file mode 100755 index 0698da9a..00000000 --- a/data/mapHeaders/undergroundpathentranceroute8.asm +++ /dev/null @@ -1,6 +0,0 @@ -UndergroundPathEntranceRoute8_h: - db GATE ; tileset - db PATH_ENTRANCE_ROUTE_8_HEIGHT, PATH_ENTRANCE_ROUTE_8_WIDTH ; dimensions (y, x) - dw UndergroundPathEntranceRoute8Blocks, UndergroundPathEntranceRoute8TextPointers, UndergroundPathEntranceRoute8Script ; blocks, texts, scripts - db 0 ; connections - dw UndergroundPathEntranceRoute8Object ; objects diff --git a/data/mapHeaders/undergroundpathns.asm b/data/mapHeaders/undergroundpathns.asm deleted file mode 100755 index ba021bea..00000000 --- a/data/mapHeaders/undergroundpathns.asm +++ /dev/null @@ -1,6 +0,0 @@ -UndergroundPathNS_h: - db UNDERGROUND ; tileset - db UNDERGROUND_PATH_NS_HEIGHT, UNDERGROUND_PATH_NS_WIDTH ; dimensions (y, x) - dw UndergroundPathNSBlocks, UndergroundPathNSTextPointers, UndergroundPathNSScript ; blocks, texts, scripts - db 0 ; connections - dw UndergroundPathNSObject ; objects diff --git a/data/mapHeaders/undergroundpathwe.asm b/data/mapHeaders/undergroundpathwe.asm deleted file mode 100755 index 7061a8d1..00000000 --- a/data/mapHeaders/undergroundpathwe.asm +++ /dev/null @@ -1,6 +0,0 @@ -UndergroundPathWE_h: - db UNDERGROUND ; tileset - db UNDERGROUND_PATH_WE_HEIGHT, UNDERGROUND_PATH_WE_WIDTH ; dimensions (y, x) - dw UndergroundPathWEBlocks, UndergroundPathWETextPointers, UndergroundPathWEScript ; blocks, texts, scripts - db 0 ; connections - dw UndergroundPathWEObject ; objects diff --git a/data/mapHeaders/unknowndungeon1.asm b/data/mapHeaders/unknowndungeon1.asm deleted file mode 100755 index 0c6adbbd..00000000 --- a/data/mapHeaders/unknowndungeon1.asm +++ /dev/null @@ -1,6 +0,0 @@ -UnknownDungeon1_h: - db CAVERN ; tileset - db UNKNOWN_DUNGEON_1_HEIGHT, UNKNOWN_DUNGEON_1_WIDTH ; dimensions (y, x) - dw UnknownDungeon1Blocks, UnknownDungeon1TextPointers, UnknownDungeon1Script ; blocks, texts, scripts - db 0 ; connections - dw UnknownDungeon1Object ; objects diff --git a/data/mapHeaders/unknowndungeon2.asm b/data/mapHeaders/unknowndungeon2.asm deleted file mode 100755 index b5147da2..00000000 --- a/data/mapHeaders/unknowndungeon2.asm +++ /dev/null @@ -1,6 +0,0 @@ -UnknownDungeon2_h: - db CAVERN ; tileset - db UNKNOWN_DUNGEON_2_HEIGHT, UNKNOWN_DUNGEON_2_WIDTH ; dimensions (y, x) - dw UnknownDungeon2Blocks, UnknownDungeon2TextPointers, UnknownDungeon2Script ; blocks, texts, scripts - db 0 ; connections - dw UnknownDungeon2Object ; objects diff --git a/data/mapHeaders/unknowndungeon3.asm b/data/mapHeaders/unknowndungeon3.asm deleted file mode 100755 index 4b5372d2..00000000 --- a/data/mapHeaders/unknowndungeon3.asm +++ /dev/null @@ -1,6 +0,0 @@ -UnknownDungeon3_h: - db CAVERN ; tileset - db UNKNOWN_DUNGEON_3_HEIGHT, UNKNOWN_DUNGEON_3_WIDTH ; dimensions (y, x) - dw UnknownDungeon3Blocks, UnknownDungeon3TextPointers, UnknownDungeon3Script ; blocks, texts, scripts - db 0 ; connections - dw UnknownDungeon3Object ; objects diff --git a/data/mapHeaders/vermilioncity.asm b/data/mapHeaders/vermilioncity.asm deleted file mode 100755 index c162ab24..00000000 --- a/data/mapHeaders/vermilioncity.asm +++ /dev/null @@ -1,8 +0,0 @@ -VermilionCity_h: - db OVERWORLD ; tileset - db VERMILION_CITY_HEIGHT, VERMILION_CITY_WIDTH ; dimensions (y, x) - dw VermilionCityBlocks, VermilionCityTextPointers, VermilionCityScript ; blocks, texts, scripts - db NORTH | EAST ; connections - NORTH_MAP_CONNECTION VERMILION_CITY, ROUTE_6, 5, 0, Route6Blocks - EAST_MAP_CONNECTION VERMILION_CITY, ROUTE_11, 4, 0, Route11Blocks - dw VermilionCityObject ; objects diff --git a/data/mapHeaders/vermiliondock.asm b/data/mapHeaders/vermiliondock.asm deleted file mode 100755 index 5d93f284..00000000 --- a/data/mapHeaders/vermiliondock.asm +++ /dev/null @@ -1,6 +0,0 @@ -VermilionDock_h: - db SHIP_PORT ; tileset - db VERMILION_DOCK_HEIGHT, VERMILION_DOCK_WIDTH ; dimensions (y, x) - dw VermilionDockBlocks, VermilionDockTextPointers, VermilionDockScript ; blocks, texts, scripts - db 0 ; connections - dw VermilionDockObject ; objects diff --git a/data/mapHeaders/vermiliongym.asm b/data/mapHeaders/vermiliongym.asm deleted file mode 100755 index e960a70f..00000000 --- a/data/mapHeaders/vermiliongym.asm +++ /dev/null @@ -1,6 +0,0 @@ -VermilionGym_h: - db GYM ; tileset - db VERMILION_GYM_HEIGHT, VERMILION_GYM_WIDTH ; dimensions (y, x) - dw VermilionGymBlocks, VermilionGymTextPointers, VermilionGymScript ; blocks, texts, scripts - db 0 ; connections - dw VermilionGymObject ; objects diff --git a/data/mapHeaders/vermilionhouse1.asm b/data/mapHeaders/vermilionhouse1.asm deleted file mode 100755 index 47375c91..00000000 --- a/data/mapHeaders/vermilionhouse1.asm +++ /dev/null @@ -1,6 +0,0 @@ -VermilionHouse1_h: - db HOUSE ; tileset - db VERMILION_HOUSE_1_HEIGHT, VERMILION_HOUSE_1_WIDTH ; dimensions (y, x) - dw VermilionHouse1Blocks, VermilionHouse1TextPointers, VermilionHouse1Script ; blocks, texts, scripts - db 0 ; connections - dw VermilionHouse1Object ; objects diff --git a/data/mapHeaders/vermilionhouse2.asm b/data/mapHeaders/vermilionhouse2.asm deleted file mode 100755 index 3a870db3..00000000 --- a/data/mapHeaders/vermilionhouse2.asm +++ /dev/null @@ -1,6 +0,0 @@ -VermilionHouse2_h: - db HOUSE ; tileset - db VERMILION_HOUSE_2_HEIGHT, VERMILION_HOUSE_2_WIDTH ; dimensions (y, x) - dw VermilionHouse2Blocks, VermilionHouse2TextPointers, VermilionHouse2Script ; blocks, texts, scripts - db 0 ; connections - dw VermilionHouse2Object ; objects diff --git a/data/mapHeaders/vermilionhouse3.asm b/data/mapHeaders/vermilionhouse3.asm deleted file mode 100755 index 139f69f6..00000000 --- a/data/mapHeaders/vermilionhouse3.asm +++ /dev/null @@ -1,6 +0,0 @@ -VermilionHouse3_h: - db HOUSE ; tileset - db VERMILION_HOUSE_3_HEIGHT, VERMILION_HOUSE_3_WIDTH ; dimensions (y, x) - dw VermilionHouse3Blocks, VermilionHouse3TextPointers, VermilionHouse3Script ; blocks, texts, scripts - db 0 ; connections - dw VermilionHouse3Object ; objects diff --git a/data/mapHeaders/vermilionmart.asm b/data/mapHeaders/vermilionmart.asm deleted file mode 100755 index e9dcd913..00000000 --- a/data/mapHeaders/vermilionmart.asm +++ /dev/null @@ -1,6 +0,0 @@ -VermilionMart_h: - db MART ; tileset - db VERMILION_MART_HEIGHT, VERMILION_MART_WIDTH ; dimensions (y, x) - dw VermilionMartBlocks, VermilionMartTextPointers, VermilionMartScript ; blocks, texts, scripts - db 0 ; connections - dw VermilionMartObject ; objects diff --git a/data/mapHeaders/vermilionpokecenter.asm b/data/mapHeaders/vermilionpokecenter.asm deleted file mode 100755 index 6a84204d..00000000 --- a/data/mapHeaders/vermilionpokecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -VermilionPokecenter_h: - db POKECENTER ; tileset - db VERMILION_POKECENTER_HEIGHT, VERMILION_POKECENTER_WIDTH ; dimensions (y, x) - dw VermilionPokecenterBlocks, VermilionPokecenterTextPointers, VermilionPokecenterScript ; blocks, texts, scripts - db 0 ; connections - dw VermilionPokecenterObject ; objects diff --git a/data/mapHeaders/victoryroad1.asm b/data/mapHeaders/victoryroad1.asm deleted file mode 100755 index cb902e37..00000000 --- a/data/mapHeaders/victoryroad1.asm +++ /dev/null @@ -1,6 +0,0 @@ -VictoryRoad1_h: - db CAVERN ; tileset - db VICTORY_ROAD_1_HEIGHT, VICTORY_ROAD_1_WIDTH ; dimensions (y, x) - dw VictoryRoad1Blocks, VictoryRoad1TextPointers, VictoryRoad1Script ; blocks, texts, scripts - db 0 ; connections - dw VictoryRoad1Object ; objects diff --git a/data/mapHeaders/victoryroad2.asm b/data/mapHeaders/victoryroad2.asm deleted file mode 100755 index 223652e5..00000000 --- a/data/mapHeaders/victoryroad2.asm +++ /dev/null @@ -1,6 +0,0 @@ -VictoryRoad2_h: - db CAVERN ; tileset - db VICTORY_ROAD_2_HEIGHT, VICTORY_ROAD_2_WIDTH ; dimensions (y, x) - dw VictoryRoad2Blocks, VictoryRoad2TextPointers, VictoryRoad2Script ; blocks, texts, scripts - db 0 ; connections - dw VictoryRoad2Object ; objects diff --git a/data/mapHeaders/victoryroad3.asm b/data/mapHeaders/victoryroad3.asm deleted file mode 100755 index 5401fe10..00000000 --- a/data/mapHeaders/victoryroad3.asm +++ /dev/null @@ -1,6 +0,0 @@ -VictoryRoad3_h: - db CAVERN ; tileset - db VICTORY_ROAD_3_HEIGHT, VICTORY_ROAD_3_WIDTH ; dimensions (y, x) - dw VictoryRoad3Blocks, VictoryRoad3TextPointers, VictoryRoad3Script ; blocks, texts, scripts - db 0 ; connections - dw VictoryRoad3Object ; objects diff --git a/data/mapHeaders/viridiancity.asm b/data/mapHeaders/viridiancity.asm deleted file mode 100755 index 79b19368..00000000 --- a/data/mapHeaders/viridiancity.asm +++ /dev/null @@ -1,9 +0,0 @@ -ViridianCity_h: - db OVERWORLD ; tileset - db VIRIDIAN_CITY_HEIGHT, VIRIDIAN_CITY_WIDTH ; dimensions (y, x) - dw ViridianCityBlocks, ViridianCityTextPointers, ViridianCityScript ; blocks, texts, scripts - db NORTH | SOUTH | WEST ; connections - NORTH_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_2, 5, 0, Route2Blocks - SOUTH_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_1, 5, 0, Route1Blocks, 1 - WEST_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_22, 4, 0, Route22Blocks - dw ViridianCityObject ; objects diff --git a/data/mapHeaders/viridianforest.asm b/data/mapHeaders/viridianforest.asm deleted file mode 100755 index 250f3de8..00000000 --- a/data/mapHeaders/viridianforest.asm +++ /dev/null @@ -1,6 +0,0 @@ -ViridianForest_h: - db FOREST ; tileset - db VIRIDIAN_FOREST_HEIGHT, VIRIDIAN_FOREST_WIDTH ; dimensions (y, x) - dw ViridianForestBlocks, ViridianForestTextPointers, ViridianForestScript ; blocks, texts, scripts - db 0 ; connections - dw ViridianForestObject ; objects diff --git a/data/mapHeaders/viridianforestentrance.asm b/data/mapHeaders/viridianforestentrance.asm deleted file mode 100755 index 81534daa..00000000 --- a/data/mapHeaders/viridianforestentrance.asm +++ /dev/null @@ -1,6 +0,0 @@ -ViridianForestEntrance_h: - db FOREST_GATE ; tileset - db VIRIDIAN_FOREST_ENTRANCE_HEIGHT, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; dimensions (y, x) - dw ViridianForestEntranceBlocks, ViridianForestEntranceTextPointers, ViridianForestEntranceScript ; blocks, texts, scripts - db 0 ; connections - dw ViridianForestEntranceObject ; objects diff --git a/data/mapHeaders/viridianforestexit.asm b/data/mapHeaders/viridianforestexit.asm deleted file mode 100755 index 9c492487..00000000 --- a/data/mapHeaders/viridianforestexit.asm +++ /dev/null @@ -1,6 +0,0 @@ -ViridianForestExit_h: - db FOREST_GATE ; tileset - db VIRIDIAN_FOREST_EXIT_HEIGHT, VIRIDIAN_FOREST_EXIT_WIDTH ; dimensions (y, x) - dw ViridianForestExitBlocks, ViridianForestExitTextPointers, ViridianForestExitScript ; blocks, texts, scripts - db 0 ; connections - dw ViridianForestExitObject ; objects diff --git a/data/mapHeaders/viridiangym.asm b/data/mapHeaders/viridiangym.asm deleted file mode 100755 index 19833cf0..00000000 --- a/data/mapHeaders/viridiangym.asm +++ /dev/null @@ -1,6 +0,0 @@ -ViridianGym_h: - db GYM ; tileset - db VIRIDIAN_GYM_HEIGHT, VIRIDIAN_GYM_WIDTH ; dimensions (y, x) - dw ViridianGymBlocks, ViridianGymTextPointers, ViridianGymScript ; blocks, texts, scripts - db 0 ; connections - dw ViridianGymObject ; objects diff --git a/data/mapHeaders/viridianhouse.asm b/data/mapHeaders/viridianhouse.asm deleted file mode 100755 index 9b2c73de..00000000 --- a/data/mapHeaders/viridianhouse.asm +++ /dev/null @@ -1,6 +0,0 @@ -ViridianHouse_h: - db HOUSE ; tileset - db VIRIDIAN_HOUSE_HEIGHT, VIRIDIAN_HOUSE_WIDTH ; dimensions (y, x) - dw ViridianHouseBlocks, ViridianHouseTextPointers, ViridianHouseScript ; blocks, texts, scripts - db 0 ; connections - dw ViridianHouseObject ; objects diff --git a/data/mapHeaders/viridianmart.asm b/data/mapHeaders/viridianmart.asm deleted file mode 100755 index 39281567..00000000 --- a/data/mapHeaders/viridianmart.asm +++ /dev/null @@ -1,6 +0,0 @@ -ViridianMart_h: - db MART ; tileset - db VIRIDIAN_MART_HEIGHT, VIRIDIAN_MART_WIDTH ; dimensions (y, x) - dw ViridianMartBlocks, ViridianMartTextPointers, ViridianMartScript ; blocks, texts, scripts - db 0 ; connections - dw ViridianMartObject ; objects diff --git a/data/mapHeaders/viridianpokecenter.asm b/data/mapHeaders/viridianpokecenter.asm deleted file mode 100755 index fbef5193..00000000 --- a/data/mapHeaders/viridianpokecenter.asm +++ /dev/null @@ -1,6 +0,0 @@ -ViridianPokecenter_h: - db POKECENTER ; tileset - db VIRIDIAN_POKECENTER_HEIGHT, VIRIDIAN_POKECENTER_WIDTH ; dimensions (y, x) - dw ViridianPokecenterBlocks, ViridianPokecenterTextPointers, ViridianPokeCenterScript ; blocks, texts, scripts - db 0 ; connections - dw ViridianPokecenterObject ; objects diff --git a/data/mapObjects/agatha.asm b/data/mapObjects/AgathasRoom.asm similarity index 95% rename from data/mapObjects/agatha.asm rename to data/mapObjects/AgathasRoom.asm index cd8bbfe7..4a82e78d 100755 --- a/data/mapObjects/agatha.asm +++ b/data/mapObjects/AgathasRoom.asm @@ -1,4 +1,4 @@ -AgathaObject: +AgathasRoom_Object: db $0 ; border block db 4 ; warps diff --git a/data/mapObjects/bikeshop.asm b/data/mapObjects/BikeShop.asm similarity index 95% rename from data/mapObjects/bikeshop.asm rename to data/mapObjects/BikeShop.asm index 98208a94..9f21ab3e 100755 --- a/data/mapObjects/bikeshop.asm +++ b/data/mapObjects/BikeShop.asm @@ -1,4 +1,4 @@ -BikeShopObject: +BikeShop_Object: db $e ; border block db 2 ; warps diff --git a/data/mapObjects/billshouse.asm b/data/mapObjects/BillsHouse.asm similarity index 94% rename from data/mapObjects/billshouse.asm rename to data/mapObjects/BillsHouse.asm index 317d7c01..c8f708cb 100755 --- a/data/mapObjects/billshouse.asm +++ b/data/mapObjects/BillsHouse.asm @@ -1,4 +1,4 @@ -BillsHouseObject: +BillsHouse_Object: db $d ; border block db 2 ; warps diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/BluesHouse.asm similarity index 95% rename from data/mapObjects/blueshouse.asm rename to data/mapObjects/BluesHouse.asm index 19338885..45ca1286 100755 --- a/data/mapObjects/blueshouse.asm +++ b/data/mapObjects/BluesHouse.asm @@ -1,4 +1,4 @@ -BluesHouseObject: +BluesHouse_Object: db $a ; border block db 2 ; warps diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/BrunosRoom.asm similarity index 95% rename from data/mapObjects/bruno.asm rename to data/mapObjects/BrunosRoom.asm index 45d21186..dde1e2dd 100755 --- a/data/mapObjects/bruno.asm +++ b/data/mapObjects/BrunosRoom.asm @@ -1,4 +1,4 @@ -BrunoObject: +BrunosRoom_Object: db $3 ; border block db 4 ; warps diff --git a/data/mapObjects/celadonhouse.asm b/data/mapObjects/CeladonChiefHouse.asm similarity index 71% rename from data/mapObjects/celadonhouse.asm rename to data/mapObjects/CeladonChiefHouse.asm index d24354a6..88850f35 100755 --- a/data/mapObjects/celadonhouse.asm +++ b/data/mapObjects/CeladonChiefHouse.asm @@ -1,4 +1,4 @@ -CeladonHouseObject: +CeladonChiefHouse_Object: db $f ; border block db 2 ; warps @@ -13,5 +13,5 @@ CeladonHouseObject: object SPRITE_SAILOR, 5, 6, STAY, LEFT, 3 ; person ; warp-to - warp_to 2, 7, CELADON_HOUSE_WIDTH - warp_to 3, 7, CELADON_HOUSE_WIDTH + warp_to 2, 7, CELADON_CHIEF_HOUSE_WIDTH + warp_to 3, 7, CELADON_CHIEF_HOUSE_WIDTH diff --git a/data/mapObjects/celadoncity.asm b/data/mapObjects/CeladonCity.asm similarity index 62% rename from data/mapObjects/celadoncity.asm rename to data/mapObjects/CeladonCity.asm index f3e481f4..005fc61e 100755 --- a/data/mapObjects/celadoncity.asm +++ b/data/mapObjects/CeladonCity.asm @@ -1,19 +1,19 @@ -CeladonCityObject: +CeladonCity_Object: db $f ; border block db 13 ; warps - warp 8, 13, 0, CELADON_MART_1 - warp 10, 13, 2, CELADON_MART_1 - warp 24, 9, 0, CELADON_MANSION_1 - warp 24, 3, 2, CELADON_MANSION_1 - warp 25, 3, 2, CELADON_MANSION_1 + warp 8, 13, 0, CELADON_MART_1F + warp 10, 13, 2, CELADON_MART_1F + warp 24, 9, 0, CELADON_MANSION_1F + warp 24, 3, 2, CELADON_MANSION_1F + warp 25, 3, 2, CELADON_MANSION_1F warp 41, 9, 0, CELADON_POKECENTER warp 12, 27, 0, CELADON_GYM warp 28, 19, 0, GAME_CORNER - warp 39, 19, 0, CELADON_MART_5 ; beta warp! no longer used - warp 33, 19, 0, CELADON_PRIZE_ROOM + warp 39, 19, 0, CELADON_MART_5F ; beta warp! no longer used + warp 33, 19, 0, GAME_CORNER_PRIZE_ROOM warp 31, 27, 0, CELADON_DINER - warp 35, 27, 0, CELADON_HOUSE + warp 35, 27, 0, CELADON_CHIEF_HOUSE warp 43, 27, 0, CELADON_HOTEL db 9 ; signs @@ -39,16 +39,16 @@ CeladonCityObject: object SPRITE_ROCKET, 42, 14, WALK, 2, 9 ; person ; warp-to - warp_to 8, 13, CELADON_CITY_WIDTH ; CELADON_MART_1 - warp_to 10, 13, CELADON_CITY_WIDTH ; CELADON_MART_1 - warp_to 24, 9, CELADON_CITY_WIDTH ; CELADON_MANSION_1 - warp_to 24, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1 - warp_to 25, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1 + warp_to 8, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F + warp_to 10, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F + warp_to 24, 9, CELADON_CITY_WIDTH ; CELADON_MANSION_1F + warp_to 24, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1F + warp_to 25, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1F warp_to 41, 9, CELADON_CITY_WIDTH ; CELADON_POKECENTER warp_to 12, 27, CELADON_CITY_WIDTH ; CELADON_GYM warp_to 28, 19, CELADON_CITY_WIDTH ; GAME_CORNER - warp_to 39, 19, CELADON_CITY_WIDTH ; CELADON_MART_5 - warp_to 33, 19, CELADON_CITY_WIDTH ; CELADON_PRIZE_ROOM + warp_to 39, 19, CELADON_CITY_WIDTH ; CELADON_MART_5F + warp_to 33, 19, CELADON_CITY_WIDTH ; GAME_CORNER_PRIZE_ROOM warp_to 31, 27, CELADON_CITY_WIDTH ; CELADON_DINER - warp_to 35, 27, CELADON_CITY_WIDTH ; CELADON_HOUSE + warp_to 35, 27, CELADON_CITY_WIDTH ; CELADON_CHIEF_HOUSE warp_to 43, 27, CELADON_CITY_WIDTH ; CELADON_HOTEL diff --git a/data/mapObjects/celadondiner.asm b/data/mapObjects/CeladonDiner.asm similarity index 95% rename from data/mapObjects/celadondiner.asm rename to data/mapObjects/CeladonDiner.asm index b976a045..0a4a895d 100755 --- a/data/mapObjects/celadondiner.asm +++ b/data/mapObjects/CeladonDiner.asm @@ -1,4 +1,4 @@ -CeladonDinerObject: +CeladonDiner_Object: db $f ; border block db 2 ; warps diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/CeladonGym.asm similarity index 97% rename from data/mapObjects/celadongym.asm rename to data/mapObjects/CeladonGym.asm index b087153b..98fce576 100755 --- a/data/mapObjects/celadongym.asm +++ b/data/mapObjects/CeladonGym.asm @@ -1,4 +1,4 @@ -CeladonGymObject: +CeladonGym_Object: db $3 ; border block db 2 ; warps diff --git a/data/mapObjects/celadonhotel.asm b/data/mapObjects/CeladonHotel.asm similarity index 94% rename from data/mapObjects/celadonhotel.asm rename to data/mapObjects/CeladonHotel.asm index 09b4d99c..f4aa1305 100755 --- a/data/mapObjects/celadonhotel.asm +++ b/data/mapObjects/CeladonHotel.asm @@ -1,4 +1,4 @@ -CeladonHotelObject: +CeladonHotel_Object: db $0 ; border block db 2 ; warps diff --git a/data/mapObjects/celadonmansion1.asm b/data/mapObjects/CeladonMansion1F.asm similarity index 53% rename from data/mapObjects/celadonmansion1.asm rename to data/mapObjects/CeladonMansion1F.asm index 423a9a2e..1abd434c 100755 --- a/data/mapObjects/celadonmansion1.asm +++ b/data/mapObjects/CeladonMansion1F.asm @@ -1,12 +1,12 @@ -CeladonMansion1Object: +CeladonMansion1F_Object: db $f ; border block db 5 ; warps warp 4, 11, 2, -1 warp 5, 11, 2, -1 warp 4, 0, 4, -1 - warp 7, 1, 1, CELADON_MANSION_2 - warp 2, 1, 2, CELADON_MANSION_2 + warp 7, 1, 1, CELADON_MANSION_2F + warp 2, 1, 2, CELADON_MANSION_2F db 1 ; signs sign 4, 9, 5 ; CeladonMansion1Text5 @@ -18,8 +18,8 @@ CeladonMansion1Object: object SPRITE_SLOWBRO, 4, 4, WALK, 1, 4 ; person ; warp-to - warp_to 4, 11, CELADON_MANSION_1_WIDTH - warp_to 5, 11, CELADON_MANSION_1_WIDTH - warp_to 4, 0, CELADON_MANSION_1_WIDTH - warp_to 7, 1, CELADON_MANSION_1_WIDTH ; CELADON_MANSION_2 - warp_to 2, 1, CELADON_MANSION_1_WIDTH ; CELADON_MANSION_2 + warp_to 4, 11, CELADON_MANSION_1F_WIDTH + warp_to 5, 11, CELADON_MANSION_1F_WIDTH + warp_to 4, 0, CELADON_MANSION_1F_WIDTH + warp_to 7, 1, CELADON_MANSION_1F_WIDTH ; CELADON_MANSION_2F + warp_to 2, 1, CELADON_MANSION_1F_WIDTH ; CELADON_MANSION_2F diff --git a/data/mapObjects/CeladonMansion2F.asm b/data/mapObjects/CeladonMansion2F.asm new file mode 100755 index 00000000..09c94d29 --- /dev/null +++ b/data/mapObjects/CeladonMansion2F.asm @@ -0,0 +1,19 @@ +CeladonMansion2F_Object: + db $f ; border block + + db 4 ; warps + warp 6, 1, 0, CELADON_MANSION_3F + warp 7, 1, 3, CELADON_MANSION_1F + warp 2, 1, 4, CELADON_MANSION_1F + warp 4, 1, 3, CELADON_MANSION_3F + + db 1 ; signs + sign 4, 9, 1 ; CeladonMansion2Text1 + + db 0 ; objects + + ; warp-to + warp_to 6, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_3F + warp_to 7, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_1F + warp_to 2, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_1F + warp_to 4, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_3F diff --git a/data/mapObjects/celadonmansion3.asm b/data/mapObjects/CeladonMansion3F.asm similarity index 52% rename from data/mapObjects/celadonmansion3.asm rename to data/mapObjects/CeladonMansion3F.asm index e9718d9f..32701f14 100755 --- a/data/mapObjects/celadonmansion3.asm +++ b/data/mapObjects/CeladonMansion3F.asm @@ -1,11 +1,11 @@ -CeladonMansion3Object: +CeladonMansion3F_Object: db $f ; border block db 4 ; warps - warp 6, 1, 0, CELADON_MANSION_2 - warp 7, 1, 0, CELADON_MANSION_4 - warp 2, 1, 1, CELADON_MANSION_4 - warp 4, 1, 3, CELADON_MANSION_2 + warp 6, 1, 0, CELADON_MANSION_2F + warp 7, 1, 0, CELADON_MANSION_ROOF + warp 2, 1, 1, CELADON_MANSION_ROOF + warp 4, 1, 3, CELADON_MANSION_2F db 4 ; signs sign 1, 3, 5 ; CeladonMansion3Text5 @@ -20,7 +20,7 @@ CeladonMansion3Object: object SPRITE_LAPRAS_GIVER, 2, 3, STAY, NONE, 4 ; person ; warp-to - warp_to 6, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2 - warp_to 7, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_4 - warp_to 2, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_4 - warp_to 4, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2 + warp_to 6, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F + warp_to 7, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_ROOF + warp_to 2, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_ROOF + warp_to 4, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F diff --git a/data/mapObjects/CeladonMansionRoof.asm b/data/mapObjects/CeladonMansionRoof.asm new file mode 100755 index 00000000..353b0b96 --- /dev/null +++ b/data/mapObjects/CeladonMansionRoof.asm @@ -0,0 +1,17 @@ +CeladonMansionRoof_Object: + db $9 ; border block + + db 3 ; warps + warp 6, 1, 1, CELADON_MANSION_3F + warp 2, 1, 2, CELADON_MANSION_3F + warp 2, 7, 0, CELADON_MANSION_ROOF_HOUSE + + db 1 ; signs + sign 3, 7, 1 ; CeladonMansion4Text1 + + db 0 ; objects + + ; warp-to + warp_to 6, 1, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_3F + warp_to 2, 1, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_3F + warp_to 2, 7, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_ROOF_HOUSE diff --git a/data/mapObjects/CeladonMansionRoofHouse.asm b/data/mapObjects/CeladonMansionRoofHouse.asm new file mode 100755 index 00000000..b6a6149f --- /dev/null +++ b/data/mapObjects/CeladonMansionRoofHouse.asm @@ -0,0 +1,16 @@ +CeladonMansionRoofHouse_Object: + db $a ; border block + + db 2 ; warps + warp 2, 7, 2, CELADON_MANSION_ROOF + warp 3, 7, 2, CELADON_MANSION_ROOF + + db 0 ; signs + + db 2 ; objects + object SPRITE_HIKER, 2, 2, STAY, DOWN, 1 ; person + object SPRITE_BALL, 4, 3, STAY, NONE, 2 ; person + + ; warp-to + warp_to 2, 7, CELADON_MANSION_ROOF_HOUSE_WIDTH ; CELADON_MANSION_ROOF + warp_to 3, 7, CELADON_MANSION_ROOF_HOUSE_WIDTH ; CELADON_MANSION_ROOF diff --git a/data/mapObjects/celadonmart1.asm b/data/mapObjects/CeladonMart1F.asm similarity index 50% rename from data/mapObjects/celadonmart1.asm rename to data/mapObjects/CeladonMart1F.asm index bfd66996..2037369a 100755 --- a/data/mapObjects/celadonmart1.asm +++ b/data/mapObjects/CeladonMart1F.asm @@ -1,4 +1,4 @@ -CeladonMart1Object: +CeladonMart1F_Object: db $f ; border block db 6 ; warps @@ -6,7 +6,7 @@ CeladonMart1Object: warp 3, 7, 0, -1 warp 16, 7, 1, -1 warp 17, 7, 1, -1 - warp 12, 1, 0, CELADON_MART_2 + warp 12, 1, 0, CELADON_MART_2F warp 1, 1, 0, CELADON_MART_ELEVATOR db 2 ; signs @@ -17,9 +17,9 @@ CeladonMart1Object: object SPRITE_CABLE_CLUB_WOMAN, 8, 3, STAY, DOWN, 1 ; person ; warp-to - warp_to 2, 7, CELADON_MART_1_WIDTH - warp_to 3, 7, CELADON_MART_1_WIDTH - warp_to 16, 7, CELADON_MART_1_WIDTH - warp_to 17, 7, CELADON_MART_1_WIDTH - warp_to 12, 1, CELADON_MART_1_WIDTH ; CELADON_MART_2 - warp_to 1, 1, CELADON_MART_1_WIDTH ; CELADON_MART_ELEVATOR + warp_to 2, 7, CELADON_MART_1F_WIDTH + warp_to 3, 7, CELADON_MART_1F_WIDTH + warp_to 16, 7, CELADON_MART_1F_WIDTH + warp_to 17, 7, CELADON_MART_1F_WIDTH + warp_to 12, 1, CELADON_MART_1F_WIDTH ; CELADON_MART_2F + warp_to 1, 1, CELADON_MART_1F_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmart2.asm b/data/mapObjects/CeladonMart2F.asm similarity index 58% rename from data/mapObjects/celadonmart2.asm rename to data/mapObjects/CeladonMart2F.asm index 215861e6..2f5f428e 100755 --- a/data/mapObjects/celadonmart2.asm +++ b/data/mapObjects/CeladonMart2F.asm @@ -1,9 +1,9 @@ -CeladonMart2Object: +CeladonMart2F_Object: db $f ; border block db 3 ; warps - warp 12, 1, 4, CELADON_MART_1 - warp 16, 1, 1, CELADON_MART_3 + warp 12, 1, 4, CELADON_MART_1F + warp 16, 1, 1, CELADON_MART_3F warp 1, 1, 0, CELADON_MART_ELEVATOR db 1 ; signs @@ -16,6 +16,6 @@ CeladonMart2Object: object SPRITE_GIRL, 14, 4, WALK, 1, 4 ; person ; warp-to - warp_to 12, 1, CELADON_MART_2_WIDTH ; CELADON_MART_1 - warp_to 16, 1, CELADON_MART_2_WIDTH ; CELADON_MART_3 - warp_to 1, 1, CELADON_MART_2_WIDTH ; CELADON_MART_ELEVATOR + warp_to 12, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_1F + warp_to 16, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_3F + warp_to 1, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmart3.asm b/data/mapObjects/CeladonMart3F.asm similarity index 76% rename from data/mapObjects/celadonmart3.asm rename to data/mapObjects/CeladonMart3F.asm index 023e3b46..6dfce535 100755 --- a/data/mapObjects/celadonmart3.asm +++ b/data/mapObjects/CeladonMart3F.asm @@ -1,9 +1,9 @@ -CeladonMart3Object: +CeladonMart3F_Object: db $f ; border block db 3 ; warps - warp 12, 1, 0, CELADON_MART_4 - warp 16, 1, 1, CELADON_MART_2 + warp 12, 1, 0, CELADON_MART_4F + warp 16, 1, 1, CELADON_MART_2F warp 1, 1, 0, CELADON_MART_ELEVATOR db 12 ; signs @@ -28,6 +28,6 @@ CeladonMart3Object: object SPRITE_YOUNG_BOY, 2, 5, STAY, UP, 5 ; person ; warp-to - warp_to 12, 1, CELADON_MART_3_WIDTH ; CELADON_MART_4 - warp_to 16, 1, CELADON_MART_3_WIDTH ; CELADON_MART_2 - warp_to 1, 1, CELADON_MART_3_WIDTH ; CELADON_MART_ELEVATOR + warp_to 12, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_4F + warp_to 16, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_2F + warp_to 1, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmart4.asm b/data/mapObjects/CeladonMart4F.asm similarity index 55% rename from data/mapObjects/celadonmart4.asm rename to data/mapObjects/CeladonMart4F.asm index e3ea8955..18ba3bdc 100755 --- a/data/mapObjects/celadonmart4.asm +++ b/data/mapObjects/CeladonMart4F.asm @@ -1,9 +1,9 @@ -CeladonMart4Object: +CeladonMart4F_Object: db $f ; border block db 3 ; warps - warp 12, 1, 0, CELADON_MART_3 - warp 16, 1, 1, CELADON_MART_5 + warp 12, 1, 0, CELADON_MART_3F + warp 16, 1, 1, CELADON_MART_5F warp 1, 1, 0, CELADON_MART_ELEVATOR db 1 ; signs @@ -15,6 +15,6 @@ CeladonMart4Object: object SPRITE_BUG_CATCHER, 5, 2, WALK, 2, 3 ; person ; warp-to - warp_to 12, 1, CELADON_MART_4_WIDTH ; CELADON_MART_3 - warp_to 16, 1, CELADON_MART_4_WIDTH ; CELADON_MART_5 - warp_to 1, 1, CELADON_MART_4_WIDTH ; CELADON_MART_ELEVATOR + warp_to 12, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_3F + warp_to 16, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_5F + warp_to 1, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmart5.asm b/data/mapObjects/CeladonMart5F.asm similarity index 63% rename from data/mapObjects/celadonmart5.asm rename to data/mapObjects/CeladonMart5F.asm index ac2fa454..fb1201c9 100755 --- a/data/mapObjects/celadonmart5.asm +++ b/data/mapObjects/CeladonMart5F.asm @@ -1,9 +1,9 @@ -CeladonMart5Object: +CeladonMart5F_Object: db $f ; border block db 3 ; warps warp 12, 1, 0, CELADON_MART_ROOF - warp 16, 1, 1, CELADON_MART_4 + warp 16, 1, 1, CELADON_MART_4F warp 1, 1, 0, CELADON_MART_ELEVATOR db 1 ; signs @@ -16,6 +16,6 @@ CeladonMart5Object: object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 4 ; person ; warp-to - warp_to 12, 1, CELADON_MART_5_WIDTH ; CELADON_MART_ROOF - warp_to 16, 1, CELADON_MART_5_WIDTH ; CELADON_MART_4 - warp_to 1, 1, CELADON_MART_5_WIDTH ; CELADON_MART_ELEVATOR + warp_to 12, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ROOF + warp_to 16, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_4F + warp_to 1, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/CeladonMartElevator.asm b/data/mapObjects/CeladonMartElevator.asm new file mode 100755 index 00000000..9688daef --- /dev/null +++ b/data/mapObjects/CeladonMartElevator.asm @@ -0,0 +1,15 @@ +CeladonMartElevator_Object: + db $f ; border block + + db 2 ; warps + warp 1, 3, 5, CELADON_MART_1F + warp 2, 3, 5, CELADON_MART_1F + + db 1 ; signs + sign 3, 0, 1 ; CeladonMartElevatorText1 + + db 0 ; objects + + ; warp-to + warp_to 1, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1F + warp_to 2, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1F diff --git a/data/mapObjects/celadonmartroof.asm b/data/mapObjects/CeladonMartRoof.asm similarity index 75% rename from data/mapObjects/celadonmartroof.asm rename to data/mapObjects/CeladonMartRoof.asm index 0268b1ec..05cef2d4 100755 --- a/data/mapObjects/celadonmartroof.asm +++ b/data/mapObjects/CeladonMartRoof.asm @@ -1,8 +1,8 @@ -CeladonMartRoofObject: +CeladonMartRoof_Object: db $42 ; border block db 1 ; warps - warp 15, 2, 0, CELADON_MART_5 + warp 15, 2, 0, CELADON_MART_5F db 4 ; signs sign 10, 1, 3 ; CeladonMartRoofText3 @@ -15,4 +15,4 @@ CeladonMartRoofObject: object SPRITE_LITTLE_GIRL, 5, 5, WALK, 0, 2 ; person ; warp-to - warp_to 15, 2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5 + warp_to 15, 2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5F diff --git a/data/mapObjects/celadonpokecenter.asm b/data/mapObjects/CeladonPokecenter.asm similarity index 94% rename from data/mapObjects/celadonpokecenter.asm rename to data/mapObjects/CeladonPokecenter.asm index ab037ec0..da5d595f 100755 --- a/data/mapObjects/celadonpokecenter.asm +++ b/data/mapObjects/CeladonPokecenter.asm @@ -1,4 +1,4 @@ -CeladonPokecenterObject: +CeladonPokecenter_Object: db $0 ; border block db 2 ; warps diff --git a/data/mapObjects/ceruleanhouse2.asm b/data/mapObjects/CeruleanBadgeHouse.asm similarity index 55% rename from data/mapObjects/ceruleanhouse2.asm rename to data/mapObjects/CeruleanBadgeHouse.asm index cf54c719..62a6873b 100755 --- a/data/mapObjects/ceruleanhouse2.asm +++ b/data/mapObjects/CeruleanBadgeHouse.asm @@ -1,4 +1,4 @@ -CeruleanHouse2Object: +CeruleanBadgeHouse_Object: db $c ; border block db 3 ; warps @@ -12,6 +12,6 @@ CeruleanHouse2Object: object SPRITE_FAT_BALD_GUY, 5, 3, STAY, RIGHT, 1 ; person ; warp-to - warp_to 2, 0, CERULEAN_HOUSE_2_WIDTH - warp_to 2, 7, CERULEAN_HOUSE_2_WIDTH - warp_to 3, 7, CERULEAN_HOUSE_2_WIDTH + warp_to 2, 0, CERULEAN_BADGE_HOUSE_WIDTH + warp_to 2, 7, CERULEAN_BADGE_HOUSE_WIDTH + warp_to 3, 7, CERULEAN_BADGE_HOUSE_WIDTH diff --git a/data/mapObjects/CeruleanCave1F.asm b/data/mapObjects/CeruleanCave1F.asm new file mode 100755 index 00000000..f9670482 --- /dev/null +++ b/data/mapObjects/CeruleanCave1F.asm @@ -0,0 +1,31 @@ +CeruleanCave1F_Object: + db $7d ; border block + + db 9 ; warps + warp 24, 17, 6, -1 + warp 25, 17, 6, -1 + warp 27, 1, 0, CERULEAN_CAVE_2F + warp 23, 7, 1, CERULEAN_CAVE_2F + warp 18, 9, 2, CERULEAN_CAVE_2F + warp 7, 1, 3, CERULEAN_CAVE_2F + warp 1, 3, 4, CERULEAN_CAVE_2F + warp 3, 11, 5, CERULEAN_CAVE_2F + warp 0, 6, 0, CERULEAN_CAVE_B1F + + db 0 ; signs + + db 3 ; objects + object SPRITE_BALL, 7, 13, STAY, NONE, 1, FULL_RESTORE + object SPRITE_BALL, 19, 3, STAY, NONE, 2, MAX_ELIXER + object SPRITE_BALL, 5, 0, STAY, NONE, 3, NUGGET + + ; warp-to + warp_to 24, 17, CERULEAN_CAVE_1F_WIDTH + warp_to 25, 17, CERULEAN_CAVE_1F_WIDTH + warp_to 27, 1, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F + warp_to 23, 7, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F + warp_to 18, 9, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F + warp_to 7, 1, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F + warp_to 1, 3, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F + warp_to 3, 11, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F + warp_to 0, 6, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_B1F diff --git a/data/mapObjects/CeruleanCave2F.asm b/data/mapObjects/CeruleanCave2F.asm new file mode 100755 index 00000000..f8312da0 --- /dev/null +++ b/data/mapObjects/CeruleanCave2F.asm @@ -0,0 +1,25 @@ +CeruleanCave2F_Object: + db $7d ; border block + + db 6 ; warps + warp 29, 1, 2, CERULEAN_CAVE_1F + warp 22, 6, 3, CERULEAN_CAVE_1F + warp 19, 7, 4, CERULEAN_CAVE_1F + warp 9, 1, 5, CERULEAN_CAVE_1F + warp 1, 3, 6, CERULEAN_CAVE_1F + warp 3, 11, 7, CERULEAN_CAVE_1F + + db 0 ; signs + + db 3 ; objects + object SPRITE_BALL, 29, 9, STAY, NONE, 1, PP_UP + object SPRITE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL + object SPRITE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE + + ; warp-to + warp_to 29, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F + warp_to 22, 6, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F + warp_to 19, 7, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F + warp_to 9, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F + warp_to 1, 3, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F + warp_to 3, 11, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/CeruleanCaveB1F.asm similarity index 68% rename from data/mapObjects/unknowndungeon3.asm rename to data/mapObjects/CeruleanCaveB1F.asm index d44ba254..461f77aa 100755 --- a/data/mapObjects/unknowndungeon3.asm +++ b/data/mapObjects/CeruleanCaveB1F.asm @@ -1,8 +1,8 @@ -UnknownDungeon3Object: +CeruleanCaveB1F_Object: db $7d ; border block db 1 ; warps - warp 3, 6, 8, UNKNOWN_DUNGEON_1 + warp 3, 6, 8, CERULEAN_CAVE_1F db 0 ; signs @@ -12,4 +12,4 @@ UnknownDungeon3Object: object SPRITE_BALL, 18, 1, STAY, NONE, 3, MAX_REVIVE ; warp-to - warp_to 3, 6, UNKNOWN_DUNGEON_3_WIDTH ; UNKNOWN_DUNGEON_1 + warp_to 3, 6, CERULEAN_CAVE_B1F_WIDTH ; CERULEAN_CAVE_1F diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/CeruleanCity.asm similarity index 67% rename from data/mapObjects/ceruleancity.asm rename to data/mapObjects/CeruleanCity.asm index 66d18a29..d5adcfd7 100755 --- a/data/mapObjects/ceruleancity.asm +++ b/data/mapObjects/CeruleanCity.asm @@ -1,17 +1,17 @@ -CeruleanCityObject: +CeruleanCity_Object: db $f ; border block db 10 ; warps - warp 27, 11, 0, TRASHED_HOUSE - warp 13, 15, 0, CERULEAN_HOUSE_1 + warp 27, 11, 0, CERULEAN_TRASHED_HOUSE + warp 13, 15, 0, CERULEAN_TRADE_HOUSE warp 19, 17, 0, CERULEAN_POKECENTER warp 30, 19, 0, CERULEAN_GYM warp 13, 25, 0, BIKE_SHOP warp 25, 25, 0, CERULEAN_MART - warp 4, 11, 0, UNKNOWN_DUNGEON_1 - warp 27, 9, 2, TRASHED_HOUSE - warp 9, 11, 1, CERULEAN_HOUSE_2 - warp 9, 9, 0, CERULEAN_HOUSE_2 + warp 4, 11, 0, CERULEAN_CAVE_1F + warp 27, 9, 2, CERULEAN_TRASHED_HOUSE + warp 9, 11, 1, CERULEAN_BADGE_HOUSE + warp 9, 9, 0, CERULEAN_BADGE_HOUSE db 6 ; signs sign 23, 19, 12 ; CeruleanCityText12 @@ -35,13 +35,13 @@ CeruleanCityObject: object SPRITE_GUARD, 27, 12, STAY, DOWN, 11 ; person ; warp-to - warp_to 27, 11, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE - warp_to 13, 15, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_1 + warp_to 27, 11, CERULEAN_CITY_WIDTH ; CERULEAN_TRASHED_HOUSE + warp_to 13, 15, CERULEAN_CITY_WIDTH ; CERULEAN_TRADE_HOUSE warp_to 19, 17, CERULEAN_CITY_WIDTH ; CERULEAN_POKECENTER warp_to 30, 19, CERULEAN_CITY_WIDTH ; CERULEAN_GYM warp_to 13, 25, CERULEAN_CITY_WIDTH ; BIKE_SHOP warp_to 25, 25, CERULEAN_CITY_WIDTH ; CERULEAN_MART - warp_to 4, 11, CERULEAN_CITY_WIDTH ; UNKNOWN_DUNGEON_1 - warp_to 27, 9, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE - warp_to 9, 11, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2 - warp_to 9, 9, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2 + warp_to 4, 11, CERULEAN_CITY_WIDTH ; CERULEAN_CAVE_1F + warp_to 27, 9, CERULEAN_CITY_WIDTH ; CERULEAN_TRASHED_HOUSE + warp_to 9, 11, CERULEAN_CITY_WIDTH ; CERULEAN_BADGE_HOUSE + warp_to 9, 9, CERULEAN_CITY_WIDTH ; CERULEAN_BADGE_HOUSE diff --git a/data/mapObjects/ceruleangym.asm b/data/mapObjects/CeruleanGym.asm similarity index 95% rename from data/mapObjects/ceruleangym.asm rename to data/mapObjects/CeruleanGym.asm index d774c5dd..96713648 100755 --- a/data/mapObjects/ceruleangym.asm +++ b/data/mapObjects/CeruleanGym.asm @@ -1,4 +1,4 @@ -CeruleanGymObject: +CeruleanGym_Object: db $3 ; border block db 2 ; warps diff --git a/data/mapObjects/ceruleanmart.asm b/data/mapObjects/CeruleanMart.asm similarity index 94% rename from data/mapObjects/ceruleanmart.asm rename to data/mapObjects/CeruleanMart.asm index 389e0317..4659375f 100755 --- a/data/mapObjects/ceruleanmart.asm +++ b/data/mapObjects/CeruleanMart.asm @@ -1,4 +1,4 @@ -CeruleanMartObject: +CeruleanMart_Object: db $0 ; border block db 2 ; warps diff --git a/data/mapObjects/ceruleanpokecenter.asm b/data/mapObjects/CeruleanPokecenter.asm similarity index 94% rename from data/mapObjects/ceruleanpokecenter.asm rename to data/mapObjects/CeruleanPokecenter.asm index a6d7a5b5..f65db52c 100755 --- a/data/mapObjects/ceruleanpokecenter.asm +++ b/data/mapObjects/CeruleanPokecenter.asm @@ -1,4 +1,4 @@ -CeruleanPokecenterObject: +CeruleanPokecenter_Object: db $0 ; border block db 2 ; warps diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/CeruleanTradeHouse.asm similarity index 67% rename from data/mapObjects/ceruleanhouse1.asm rename to data/mapObjects/CeruleanTradeHouse.asm index a8c636cf..a4a46e9b 100755 --- a/data/mapObjects/ceruleanhouse1.asm +++ b/data/mapObjects/CeruleanTradeHouse.asm @@ -1,4 +1,4 @@ -CeruleanHouse1Object: +CeruleanTradeHouse_Object: db $a ; border block db 2 ; warps @@ -12,5 +12,5 @@ CeruleanHouse1Object: object SPRITE_GAMBLER, 1, 2, STAY, NONE, 2 ; person ; warp-to - warp_to 2, 7, CERULEAN_HOUSE_1_WIDTH - warp_to 3, 7, CERULEAN_HOUSE_1_WIDTH + warp_to 2, 7, CERULEAN_TRADE_HOUSE_WIDTH + warp_to 3, 7, CERULEAN_TRADE_HOUSE_WIDTH diff --git a/data/mapObjects/ceruleanhousetrashed.asm b/data/mapObjects/CeruleanTrashedHouse.asm similarity index 63% rename from data/mapObjects/ceruleanhousetrashed.asm rename to data/mapObjects/CeruleanTrashedHouse.asm index 7b90ff73..44b7cf20 100755 --- a/data/mapObjects/ceruleanhousetrashed.asm +++ b/data/mapObjects/CeruleanTrashedHouse.asm @@ -1,4 +1,4 @@ -CeruleanHouseTrashedObject: +CeruleanTrashedHouse_Object: db $a ; border block db 3 ; warps @@ -14,6 +14,6 @@ CeruleanHouseTrashedObject: object SPRITE_GIRL, 5, 6, WALK, 2, 2 ; person ; warp-to - warp_to 2, 7, TRASHED_HOUSE_WIDTH - warp_to 3, 7, TRASHED_HOUSE_WIDTH - warp_to 3, 0, TRASHED_HOUSE_WIDTH + warp_to 2, 7, CERULEAN_TRASHED_HOUSE_WIDTH + warp_to 3, 7, CERULEAN_TRASHED_HOUSE_WIDTH + warp_to 3, 0, CERULEAN_TRASHED_HOUSE_WIDTH diff --git a/data/mapObjects/gary.asm b/data/mapObjects/ChampionsRoom.asm similarity index 95% rename from data/mapObjects/gary.asm rename to data/mapObjects/ChampionsRoom.asm index 10d9f0ed..1e0cb7f4 100755 --- a/data/mapObjects/gary.asm +++ b/data/mapObjects/ChampionsRoom.asm @@ -1,4 +1,4 @@ -GaryObject: +ChampionsRoom_Object: db $3 ; border block db 4 ; warps diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/CinnabarGym.asm similarity index 97% rename from data/mapObjects/cinnabargym.asm rename to data/mapObjects/CinnabarGym.asm index 3fc25a02..ab204d43 100755 --- a/data/mapObjects/cinnabargym.asm +++ b/data/mapObjects/CinnabarGym.asm @@ -1,4 +1,4 @@ -CinnabarGymObject: +CinnabarGym_Object: db $2e ; border block db 2 ; warps diff --git a/data/mapObjects/cinnabarisland.asm b/data/mapObjects/CinnabarIsland.asm similarity index 76% rename from data/mapObjects/cinnabarisland.asm rename to data/mapObjects/CinnabarIsland.asm index a66d6444..1932e134 100755 --- a/data/mapObjects/cinnabarisland.asm +++ b/data/mapObjects/CinnabarIsland.asm @@ -1,10 +1,10 @@ -CinnabarIslandObject: +CinnabarIsland_Object: db $43 ; border block db 5 ; warps - warp 6, 3, 1, MANSION_1 + warp 6, 3, 1, POKEMON_MANSION_1F warp 18, 3, 0, CINNABAR_GYM - warp 6, 9, 0, CINNABAR_LAB_1 + warp 6, 9, 0, CINNABAR_LAB warp 11, 11, 0, CINNABAR_POKECENTER warp 15, 11, 0, CINNABAR_MART @@ -20,8 +20,8 @@ CinnabarIslandObject: object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person ; warp-to - warp_to 6, 3, CINNABAR_ISLAND_WIDTH ; MANSION_1 + warp_to 6, 3, CINNABAR_ISLAND_WIDTH ; POKEMON_MANSION_1F warp_to 18, 3, CINNABAR_ISLAND_WIDTH ; CINNABAR_GYM - warp_to 6, 9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB_1 + warp_to 6, 9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB warp_to 11, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_POKECENTER warp_to 15, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_MART diff --git a/data/mapObjects/CinnabarLab.asm b/data/mapObjects/CinnabarLab.asm new file mode 100755 index 00000000..deb5d8ed --- /dev/null +++ b/data/mapObjects/CinnabarLab.asm @@ -0,0 +1,25 @@ +CinnabarLab_Object: + db $17 ; border block + + db 5 ; warps + warp 2, 7, 2, -1 + warp 3, 7, 2, -1 + warp 8, 4, 0, CINNABAR_LAB_TRADE_ROOM + warp 12, 4, 0, CINNABAR_LAB_METRONOME_ROOM + warp 16, 4, 0, CINNABAR_LAB_FOSSIL_ROOM + + db 4 ; signs + sign 3, 2, 2 ; Lab1Text2 + sign 9, 4, 3 ; Lab1Text3 + sign 13, 4, 4 ; Lab1Text4 + sign 17, 4, 5 ; Lab1Text5 + + db 1 ; objects + object SPRITE_FISHER, 1, 3, STAY, NONE, 1 ; person + + ; warp-to + warp_to 2, 7, CINNABAR_LAB_WIDTH + warp_to 3, 7, CINNABAR_LAB_WIDTH + warp_to 8, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_TRADE_ROOM + warp_to 12, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_METRONOME_ROOM + warp_to 16, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_FOSSIL_ROOM diff --git a/data/mapObjects/CinnabarLabFossilRoom.asm b/data/mapObjects/CinnabarLabFossilRoom.asm new file mode 100755 index 00000000..d31502e6 --- /dev/null +++ b/data/mapObjects/CinnabarLabFossilRoom.asm @@ -0,0 +1,16 @@ +CinnabarLabFossilRoom_Object: + db $17 ; border block + + db 2 ; warps + warp 2, 7, 4, CINNABAR_LAB + warp 3, 7, 4, CINNABAR_LAB + + db 0 ; signs + + db 2 ; objects + object SPRITE_OAK_AIDE, 5, 2, WALK, 2, 1 ; person + object SPRITE_OAK_AIDE, 7, 6, STAY, UP, 2 ; person + + ; warp-to + warp_to 2, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB + warp_to 3, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB diff --git a/data/mapObjects/lab3.asm b/data/mapObjects/CinnabarLabMetronomeRoom.asm similarity index 54% rename from data/mapObjects/lab3.asm rename to data/mapObjects/CinnabarLabMetronomeRoom.asm index 73ba321d..37f93d43 100755 --- a/data/mapObjects/lab3.asm +++ b/data/mapObjects/CinnabarLabMetronomeRoom.asm @@ -1,9 +1,9 @@ -Lab3Object: +CinnabarLabMetronomeRoom_Object: db $17 ; border block db 2 ; warps - warp 2, 7, 3, CINNABAR_LAB_1 - warp 3, 7, 3, CINNABAR_LAB_1 + warp 2, 7, 3, CINNABAR_LAB + warp 3, 7, 3, CINNABAR_LAB db 3 ; signs sign 0, 4, 3 ; Lab3Text3 @@ -15,5 +15,5 @@ Lab3Object: object SPRITE_OAK_AIDE, 2, 3, WALK, 2, 2 ; person ; warp-to - warp_to 2, 7, CINNABAR_LAB_3_WIDTH ; CINNABAR_LAB_1 - warp_to 3, 7, CINNABAR_LAB_3_WIDTH ; CINNABAR_LAB_1 + warp_to 2, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB + warp_to 3, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB diff --git a/data/mapObjects/lab2.asm b/data/mapObjects/CinnabarLabTradeRoom.asm similarity index 55% rename from data/mapObjects/lab2.asm rename to data/mapObjects/CinnabarLabTradeRoom.asm index 3062fcae..449cc914 100755 --- a/data/mapObjects/lab2.asm +++ b/data/mapObjects/CinnabarLabTradeRoom.asm @@ -1,9 +1,9 @@ -Lab2Object: +CinnabarLabTradeRoom_Object: db $17 ; border block db 2 ; warps - warp 2, 7, 2, CINNABAR_LAB_1 - warp 3, 7, 2, CINNABAR_LAB_1 + warp 2, 7, 2, CINNABAR_LAB + warp 3, 7, 2, CINNABAR_LAB db 0 ; signs @@ -13,5 +13,5 @@ Lab2Object: object SPRITE_FOULARD_WOMAN, 5, 5, STAY, UP, 3 ; person ; warp-to - warp_to 2, 7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1 - warp_to 3, 7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1 + warp_to 2, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB + warp_to 3, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB diff --git a/data/mapObjects/cinnabarmart.asm b/data/mapObjects/CinnabarMart.asm similarity index 94% rename from data/mapObjects/cinnabarmart.asm rename to data/mapObjects/CinnabarMart.asm index cf135039..af88ddf0 100755 --- a/data/mapObjects/cinnabarmart.asm +++ b/data/mapObjects/CinnabarMart.asm @@ -1,4 +1,4 @@ -CinnabarMartObject: +CinnabarMart_Object: db $0 ; border block db 2 ; warps diff --git a/data/mapObjects/cinnabarpokecenter.asm b/data/mapObjects/CinnabarPokecenter.asm similarity index 93% rename from data/mapObjects/cinnabarpokecenter.asm rename to data/mapObjects/CinnabarPokecenter.asm index d1707ec7..9583ef2a 100755 --- a/data/mapObjects/cinnabarpokecenter.asm +++ b/data/mapObjects/CinnabarPokecenter.asm @@ -1,4 +1,4 @@ -CinnabarPokecenterObject: +CinnabarPokecenter_Object: db $0 ; border block db 2 ; warps diff --git a/data/mapObjects/colosseum.asm b/data/mapObjects/Colosseum.asm similarity index 86% rename from data/mapObjects/colosseum.asm rename to data/mapObjects/Colosseum.asm index 1c32de2f..18762584 100755 --- a/data/mapObjects/colosseum.asm +++ b/data/mapObjects/Colosseum.asm @@ -1,4 +1,4 @@ -ColosseumObject: +Colosseum_Object: db $e ; border block db 0 ; warps diff --git a/data/mapObjects/copycatshouse1f.asm b/data/mapObjects/CopycatsHouse1F.asm similarity index 94% rename from data/mapObjects/copycatshouse1f.asm rename to data/mapObjects/CopycatsHouse1F.asm index e0e02a8d..cb4dbb0b 100755 --- a/data/mapObjects/copycatshouse1f.asm +++ b/data/mapObjects/CopycatsHouse1F.asm @@ -1,4 +1,4 @@ -CopycatsHouse1FObject: +CopycatsHouse1F_Object: db $a ; border block db 3 ; warps diff --git a/data/mapObjects/copycatshouse2f.asm b/data/mapObjects/CopycatsHouse2F.asm similarity index 95% rename from data/mapObjects/copycatshouse2f.asm rename to data/mapObjects/CopycatsHouse2F.asm index 529f3416..18b56419 100755 --- a/data/mapObjects/copycatshouse2f.asm +++ b/data/mapObjects/CopycatsHouse2F.asm @@ -1,4 +1,4 @@ -CopycatsHouse2FObject: +CopycatsHouse2F_Object: db $a ; border block db 1 ; warps diff --git a/data/mapObjects/daycarem.asm b/data/mapObjects/Daycare.asm similarity index 69% rename from data/mapObjects/daycarem.asm rename to data/mapObjects/Daycare.asm index 7c10fe70..c58c83e4 100755 --- a/data/mapObjects/daycarem.asm +++ b/data/mapObjects/Daycare.asm @@ -1,4 +1,4 @@ -DayCareMObject: +Daycare_Object: db $a ; border block db 2 ; warps @@ -11,5 +11,5 @@ DayCareMObject: object SPRITE_GENTLEMAN, 2, 3, STAY, RIGHT, 1 ; person ; warp-to - warp_to 2, 7, DAYCAREM_WIDTH - warp_to 3, 7, DAYCAREM_WIDTH + warp_to 2, 7, DAYCARE_WIDTH + warp_to 3, 7, DAYCARE_WIDTH diff --git a/data/mapObjects/DiglettsCave.asm b/data/mapObjects/DiglettsCave.asm new file mode 100755 index 00000000..b4fd0af8 --- /dev/null +++ b/data/mapObjects/DiglettsCave.asm @@ -0,0 +1,14 @@ +DiglettsCave_Object: + db $19 ; border block + + db 2 ; warps + warp 5, 5, 2, DIGLETTS_CAVE_ROUTE_2 + warp 37, 31, 2, DIGLETTS_CAVE_ROUTE_11 + + db 0 ; signs + + db 0 ; objects + + ; warp-to + warp_to 5, 5, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ROUTE_2 + warp_to 37, 31, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ROUTE_11 diff --git a/data/mapObjects/diglettscaveroute11.asm b/data/mapObjects/DiglettsCaveRoute11.asm similarity index 52% rename from data/mapObjects/diglettscaveroute11.asm rename to data/mapObjects/DiglettsCaveRoute11.asm index af28bfbf..a4c70f06 100755 --- a/data/mapObjects/diglettscaveroute11.asm +++ b/data/mapObjects/DiglettsCaveRoute11.asm @@ -1,4 +1,4 @@ -DiglettsCaveEntranceRoute11Object: +DiglettsCaveRoute11_Object: db $7d ; border block db 3 ; warps @@ -12,6 +12,6 @@ DiglettsCaveEntranceRoute11Object: object SPRITE_GAMBLER, 2, 3, STAY, NONE, 1 ; person ; warp-to - warp_to 2, 7, DIGLETTS_CAVE_ENTRANCE_WIDTH - warp_to 3, 7, DIGLETTS_CAVE_ENTRANCE_WIDTH - warp_to 4, 4, DIGLETTS_CAVE_ENTRANCE_WIDTH ; DIGLETTS_CAVE + warp_to 2, 7, DIGLETTS_CAVE_ROUTE_11_WIDTH + warp_to 3, 7, DIGLETTS_CAVE_ROUTE_11_WIDTH + warp_to 4, 4, DIGLETTS_CAVE_ROUTE_11_WIDTH ; DIGLETTS_CAVE diff --git a/data/mapObjects/diglettscaveroute2.asm b/data/mapObjects/DiglettsCaveRoute2.asm similarity index 53% rename from data/mapObjects/diglettscaveroute2.asm rename to data/mapObjects/DiglettsCaveRoute2.asm index 645cc385..0567fee6 100755 --- a/data/mapObjects/diglettscaveroute2.asm +++ b/data/mapObjects/DiglettsCaveRoute2.asm @@ -1,4 +1,4 @@ -DiglettsCaveRoute2Object: +DiglettsCaveRoute2_Object: db $7d ; border block db 3 ; warps @@ -12,6 +12,6 @@ DiglettsCaveRoute2Object: object SPRITE_FISHER, 3, 3, STAY, NONE, 1 ; person ; warp-to - warp_to 2, 7, DIGLETTS_CAVE_EXIT_WIDTH - warp_to 3, 7, DIGLETTS_CAVE_EXIT_WIDTH - warp_to 4, 4, DIGLETTS_CAVE_EXIT_WIDTH ; DIGLETTS_CAVE + warp_to 2, 7, DIGLETTS_CAVE_ROUTE_2_WIDTH + warp_to 3, 7, DIGLETTS_CAVE_ROUTE_2_WIDTH + warp_to 4, 4, DIGLETTS_CAVE_ROUTE_2_WIDTH ; DIGLETTS_CAVE diff --git a/data/mapObjects/fightingdojo.asm b/data/mapObjects/FightingDojo.asm similarity index 96% rename from data/mapObjects/fightingdojo.asm rename to data/mapObjects/FightingDojo.asm index b9ff9449..fdc7b838 100755 --- a/data/mapObjects/fightingdojo.asm +++ b/data/mapObjects/FightingDojo.asm @@ -1,4 +1,4 @@ -FightingDojoObject: +FightingDojo_Object: db $3 ; border block db 2 ; warps diff --git a/data/mapObjects/fuchsiahouse1.asm b/data/mapObjects/FuchsiaBillsGrandpasHouse.asm similarity index 67% rename from data/mapObjects/fuchsiahouse1.asm rename to data/mapObjects/FuchsiaBillsGrandpasHouse.asm index ca4638f9..363b56f9 100755 --- a/data/mapObjects/fuchsiahouse1.asm +++ b/data/mapObjects/FuchsiaBillsGrandpasHouse.asm @@ -1,4 +1,4 @@ -FuchsiaHouse1Object: +FuchsiaBillsGrandpasHouse_Object: db $a ; border block db 2 ; warps @@ -13,5 +13,5 @@ FuchsiaHouse1Object: object SPRITE_BUG_CATCHER, 5, 5, STAY, NONE, 3 ; person ; warp-to - warp_to 2, 7, FUCHSIA_HOUSE_1_WIDTH - warp_to 3, 7, FUCHSIA_HOUSE_1_WIDTH + warp_to 2, 7, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH + warp_to 3, 7, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH diff --git a/data/mapObjects/fuchsiacity.asm b/data/mapObjects/FuchsiaCity.asm similarity index 74% rename from data/mapObjects/fuchsiacity.asm rename to data/mapObjects/FuchsiaCity.asm index c89c03cd..09c97b02 100755 --- a/data/mapObjects/fuchsiacity.asm +++ b/data/mapObjects/FuchsiaCity.asm @@ -1,16 +1,16 @@ -FuchsiaCityObject: +FuchsiaCity_Object: db $f ; border block db 9 ; warps warp 5, 13, 0, FUCHSIA_MART - warp 11, 27, 0, FUCHSIA_HOUSE_1 + warp 11, 27, 0, FUCHSIA_BILLS_GRANDPAS_HOUSE warp 19, 27, 0, FUCHSIA_POKECENTER - warp 27, 27, 0, FUCHSIA_HOUSE_2 - warp 18, 3, 0, SAFARI_ZONE_ENTRANCE + warp 27, 27, 0, WARDENS_HOUSE + warp 18, 3, 0, SAFARI_ZONE_GATE warp 5, 27, 0, FUCHSIA_GYM warp 22, 13, 0, FUCHSIA_MEETING_ROOM - warp 31, 27, 1, FUCHSIA_HOUSE_3 - warp 31, 24, 0, FUCHSIA_HOUSE_3 + warp 31, 27, 1, FUCHSIA_GOOD_ROD_HOUSE + warp 31, 24, 0, FUCHSIA_GOOD_ROD_HOUSE db 14 ; signs sign 15, 23, 11 ; FuchsiaCityText11 @@ -42,11 +42,11 @@ FuchsiaCityObject: ; warp-to warp_to 5, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MART - warp_to 11, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_1 + warp_to 11, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_BILLS_GRANDPAS_HOUSE warp_to 19, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_POKECENTER - warp_to 27, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_2 - warp_to 18, 3, FUCHSIA_CITY_WIDTH ; SAFARI_ZONE_ENTRANCE + warp_to 27, 27, FUCHSIA_CITY_WIDTH ; WARDENS_HOUSE + warp_to 18, 3, FUCHSIA_CITY_WIDTH ; SAFARI_ZONE_GATE warp_to 5, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GYM warp_to 22, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MEETING_ROOM - warp_to 31, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_3 - warp_to 31, 24, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_3 + warp_to 31, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GOOD_ROD_HOUSE + warp_to 31, 24, FUCHSIA_CITY_WIDTH ; FUCHSIA_GOOD_ROD_HOUSE diff --git a/data/mapObjects/fuchsiahouse3.asm b/data/mapObjects/FuchsiaGoodRodHouse.asm similarity index 54% rename from data/mapObjects/fuchsiahouse3.asm rename to data/mapObjects/FuchsiaGoodRodHouse.asm index 0bed500b..390447c8 100755 --- a/data/mapObjects/fuchsiahouse3.asm +++ b/data/mapObjects/FuchsiaGoodRodHouse.asm @@ -1,4 +1,4 @@ -FuchsiaHouse3Object: +FuchsiaGoodRodHouse_Object: db $c ; border block db 3 ; warps @@ -12,6 +12,6 @@ FuchsiaHouse3Object: object SPRITE_FISHER, 5, 3, STAY, RIGHT, 1 ; person ; warp-to - warp_to 2, 0, FUCHSIA_HOUSE_3_WIDTH - warp_to 2, 7, FUCHSIA_HOUSE_3_WIDTH - warp_to 3, 7, FUCHSIA_HOUSE_3_WIDTH + warp_to 2, 0, FUCHSIA_GOOD_ROD_HOUSE_WIDTH + warp_to 2, 7, FUCHSIA_GOOD_ROD_HOUSE_WIDTH + warp_to 3, 7, FUCHSIA_GOOD_ROD_HOUSE_WIDTH diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/FuchsiaGym.asm similarity index 97% rename from data/mapObjects/fuchsiagym.asm rename to data/mapObjects/FuchsiaGym.asm index 23314fb9..5d707d53 100755 --- a/data/mapObjects/fuchsiagym.asm +++ b/data/mapObjects/FuchsiaGym.asm @@ -1,4 +1,4 @@ -FuchsiaGymObject: +FuchsiaGym_Object: db $3 ; border block db 2 ; warps diff --git a/data/mapObjects/fuchsiamart.asm b/data/mapObjects/FuchsiaMart.asm similarity index 94% rename from data/mapObjects/fuchsiamart.asm rename to data/mapObjects/FuchsiaMart.asm index bfb93979..cfa71d8d 100755 --- a/data/mapObjects/fuchsiamart.asm +++ b/data/mapObjects/FuchsiaMart.asm @@ -1,4 +1,4 @@ -FuchsiaMartObject: +FuchsiaMart_Object: db $0 ; border block db 2 ; warps diff --git a/data/mapObjects/fuchsiameetingroom.asm b/data/mapObjects/FuchsiaMeetingRoom.asm similarity index 93% rename from data/mapObjects/fuchsiameetingroom.asm rename to data/mapObjects/FuchsiaMeetingRoom.asm index c6c10415..9130d920 100755 --- a/data/mapObjects/fuchsiameetingroom.asm +++ b/data/mapObjects/FuchsiaMeetingRoom.asm @@ -1,4 +1,4 @@ -FuchsiaMeetingRoomObject: +FuchsiaMeetingRoom_Object: db $17 ; border block db 2 ; warps diff --git a/data/mapObjects/fuchsiapokecenter.asm b/data/mapObjects/FuchsiaPokecenter.asm similarity index 94% rename from data/mapObjects/fuchsiapokecenter.asm rename to data/mapObjects/FuchsiaPokecenter.asm index 12540cd3..73dc529d 100755 --- a/data/mapObjects/fuchsiapokecenter.asm +++ b/data/mapObjects/FuchsiaPokecenter.asm @@ -1,4 +1,4 @@ -FuchsiaPokecenterObject: +FuchsiaPokecenter_Object: db $0 ; border block db 2 ; warps diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/GameCorner.asm similarity index 88% rename from data/mapObjects/celadongamecorner.asm rename to data/mapObjects/GameCorner.asm index a09691d6..2704f6ab 100755 --- a/data/mapObjects/celadongamecorner.asm +++ b/data/mapObjects/GameCorner.asm @@ -1,10 +1,10 @@ -CeladonGameCornerObject: +GameCorner_Object: db $f ; border block db 3 ; warps warp 15, 17, 7, -1 warp 16, 17, 7, -1 - warp 17, 4, 1, ROCKET_HIDEOUT_1 + warp 17, 4, 1, ROCKET_HIDEOUT_B1F db 1 ; signs sign 9, 4, 12 ; CeladonGameCornerText12 @@ -25,4 +25,4 @@ CeladonGameCornerObject: ; warp-to warp_to 15, 17, GAME_CORNER_WIDTH warp_to 16, 17, GAME_CORNER_WIDTH - warp_to 17, 4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_1 + warp_to 17, 4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_B1F diff --git a/data/mapObjects/celadonprizeroom.asm b/data/mapObjects/GameCornerPrizeRoom.asm similarity index 74% rename from data/mapObjects/celadonprizeroom.asm rename to data/mapObjects/GameCornerPrizeRoom.asm index bdaafe02..35cd3ac8 100755 --- a/data/mapObjects/celadonprizeroom.asm +++ b/data/mapObjects/GameCornerPrizeRoom.asm @@ -1,4 +1,4 @@ -CeladonPrizeRoomObject: +GameCornerPrizeRoom_Object: db $f ; border block db 2 ; warps @@ -15,5 +15,5 @@ CeladonPrizeRoomObject: object SPRITE_GAMBLER, 7, 3, WALK, 2, 2 ; person ; warp-to - warp_to 4, 7, CELADON_PRIZE_ROOM_WIDTH - warp_to 5, 7, CELADON_PRIZE_ROOM_WIDTH + warp_to 4, 7, GAME_CORNER_PRIZE_ROOM_WIDTH + warp_to 5, 7, GAME_CORNER_PRIZE_ROOM_WIDTH diff --git a/data/mapObjects/halloffameroom.asm b/data/mapObjects/HallOfFame.asm similarity index 92% rename from data/mapObjects/halloffameroom.asm rename to data/mapObjects/HallOfFame.asm index a815a053..3762d871 100755 --- a/data/mapObjects/halloffameroom.asm +++ b/data/mapObjects/HallOfFame.asm @@ -1,4 +1,4 @@ -HallofFameRoomObject: +HallOfFame_Object: db $3 ; border block db 2 ; warps diff --git a/data/mapObjects/indigoplateau.asm b/data/mapObjects/IndigoPlateau.asm similarity index 92% rename from data/mapObjects/indigoplateau.asm rename to data/mapObjects/IndigoPlateau.asm index d18f25e1..1447be11 100755 --- a/data/mapObjects/indigoplateau.asm +++ b/data/mapObjects/IndigoPlateau.asm @@ -1,4 +1,4 @@ -IndigoPlateauObject: +IndigoPlateau_Object: db $e ; border block db 2 ; warps diff --git a/data/mapObjects/indigoplateaulobby.asm b/data/mapObjects/IndigoPlateauLobby.asm similarity index 95% rename from data/mapObjects/indigoplateaulobby.asm rename to data/mapObjects/IndigoPlateauLobby.asm index d82256a1..ea113a16 100755 --- a/data/mapObjects/indigoplateaulobby.asm +++ b/data/mapObjects/IndigoPlateauLobby.asm @@ -1,4 +1,4 @@ -IndigoPlateauLobbyObject: +IndigoPlateauLobby_Object: db $0 ; border block db 3 ; warps diff --git a/data/mapObjects/lance.asm b/data/mapObjects/LancesRoom.asm similarity index 95% rename from data/mapObjects/lance.asm rename to data/mapObjects/LancesRoom.asm index 77c0058c..6f22631a 100755 --- a/data/mapObjects/lance.asm +++ b/data/mapObjects/LancesRoom.asm @@ -1,4 +1,4 @@ -LanceObject: +LancesRoom_Object: db $3 ; border block db 3 ; warps diff --git a/data/mapObjects/lavenderhouse2.asm b/data/mapObjects/LavenderCuboneHouse.asm similarity index 66% rename from data/mapObjects/lavenderhouse2.asm rename to data/mapObjects/LavenderCuboneHouse.asm index 6d900f45..96f1b3ba 100755 --- a/data/mapObjects/lavenderhouse2.asm +++ b/data/mapObjects/LavenderCuboneHouse.asm @@ -1,4 +1,4 @@ -LavenderHouse2Object: +LavenderCuboneHouse_Object: db $a ; border block db 2 ; warps @@ -12,5 +12,5 @@ LavenderHouse2Object: object SPRITE_BRUNETTE_GIRL, 2, 4, STAY, RIGHT, 2 ; person ; warp-to - warp_to 2, 7, LAVENDER_HOUSE_2_WIDTH - warp_to 3, 7, LAVENDER_HOUSE_2_WIDTH + warp_to 2, 7, LAVENDER_CUBONE_HOUSE_WIDTH + warp_to 3, 7, LAVENDER_CUBONE_HOUSE_WIDTH diff --git a/data/mapObjects/lavendermart.asm b/data/mapObjects/LavenderMart.asm similarity index 94% rename from data/mapObjects/lavendermart.asm rename to data/mapObjects/LavenderMart.asm index 6661fee9..df14ad39 100755 --- a/data/mapObjects/lavendermart.asm +++ b/data/mapObjects/LavenderMart.asm @@ -1,4 +1,4 @@ -LavenderMartObject: +LavenderMart_Object: db $0 ; border block db 2 ; warps diff --git a/data/mapObjects/lavenderpokecenter.asm b/data/mapObjects/LavenderPokecenter.asm similarity index 93% rename from data/mapObjects/lavenderpokecenter.asm rename to data/mapObjects/LavenderPokecenter.asm index b3eea8ec..89e25571 100755 --- a/data/mapObjects/lavenderpokecenter.asm +++ b/data/mapObjects/LavenderPokecenter.asm @@ -1,4 +1,4 @@ -LavenderPokecenterObject: +LavenderPokecenter_Object: db $0 ; border block db 2 ; warps diff --git a/data/mapObjects/lavendertown.asm b/data/mapObjects/LavenderTown.asm similarity index 71% rename from data/mapObjects/lavendertown.asm rename to data/mapObjects/LavenderTown.asm index 5788c4f3..4aead666 100755 --- a/data/mapObjects/lavendertown.asm +++ b/data/mapObjects/LavenderTown.asm @@ -1,12 +1,12 @@ -LavenderTownObject: +LavenderTown_Object: db $2c ; border block db 6 ; warps warp 3, 5, 0, LAVENDER_POKECENTER - warp 14, 5, 0, POKEMONTOWER_1 - warp 7, 9, 0, LAVENDER_HOUSE_1 + warp 14, 5, 0, POKEMON_TOWER_1F + warp 7, 9, 0, MR_FUJIS_HOUSE warp 15, 13, 0, LAVENDER_MART - warp 3, 13, 0, LAVENDER_HOUSE_2 + warp 3, 13, 0, LAVENDER_CUBONE_HOUSE warp 7, 13, 0, NAME_RATERS_HOUSE db 6 ; signs @@ -24,8 +24,8 @@ LavenderTownObject: ; warp-to warp_to 3, 5, LAVENDER_TOWN_WIDTH ; LAVENDER_POKECENTER - warp_to 14, 5, LAVENDER_TOWN_WIDTH ; POKEMONTOWER_1 - warp_to 7, 9, LAVENDER_TOWN_WIDTH ; LAVENDER_HOUSE_1 + warp_to 14, 5, LAVENDER_TOWN_WIDTH ; POKEMON_TOWER_1F + warp_to 7, 9, LAVENDER_TOWN_WIDTH ; MR_FUJIS_HOUSE warp_to 15, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_MART - warp_to 3, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_HOUSE_2 + warp_to 3, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_CUBONE_HOUSE warp_to 7, 13, LAVENDER_TOWN_WIDTH ; NAME_RATERS_HOUSE diff --git a/data/mapObjects/lorelei.asm b/data/mapObjects/LoreleisRoom.asm similarity index 95% rename from data/mapObjects/lorelei.asm rename to data/mapObjects/LoreleisRoom.asm index e5f0f9f2..06450bb4 100755 --- a/data/mapObjects/lorelei.asm +++ b/data/mapObjects/LoreleisRoom.asm @@ -1,4 +1,4 @@ -LoreleiObject: +LoreleisRoom_Object: db $3 ; border block db 4 ; warps diff --git a/data/mapObjects/lavenderhouse1.asm b/data/mapObjects/MrFujisHouse.asm similarity index 82% rename from data/mapObjects/lavenderhouse1.asm rename to data/mapObjects/MrFujisHouse.asm index d9b61302..5b6ca2a6 100755 --- a/data/mapObjects/lavenderhouse1.asm +++ b/data/mapObjects/MrFujisHouse.asm @@ -1,4 +1,4 @@ -LavenderHouse1Object: +MrFujisHouse_Object: db $a ; border block db 2 ; warps @@ -16,5 +16,5 @@ LavenderHouse1Object: object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 6 ; person ; warp-to - warp_to 2, 7, LAVENDER_HOUSE_1_WIDTH - warp_to 3, 7, LAVENDER_HOUSE_1_WIDTH + warp_to 2, 7, MR_FUJIS_HOUSE_WIDTH + warp_to 3, 7, MR_FUJIS_HOUSE_WIDTH diff --git a/data/mapObjects/saffronhouse2.asm b/data/mapObjects/MrPsychicsHouse.asm similarity index 62% rename from data/mapObjects/saffronhouse2.asm rename to data/mapObjects/MrPsychicsHouse.asm index ac1827b9..01f9e11c 100755 --- a/data/mapObjects/saffronhouse2.asm +++ b/data/mapObjects/MrPsychicsHouse.asm @@ -1,4 +1,4 @@ -SaffronHouse2Object: +MrPsychicsHouse_Object: db $a ; border block db 2 ; warps @@ -11,5 +11,5 @@ SaffronHouse2Object: object SPRITE_FISHER, 5, 3, STAY, LEFT, 1 ; person ; warp-to - warp_to 2, 7, SAFFRON_HOUSE_2_WIDTH - warp_to 3, 7, SAFFRON_HOUSE_2_WIDTH + warp_to 2, 7, MR_PSYCHICS_HOUSE_WIDTH + warp_to 3, 7, MR_PSYCHICS_HOUSE_WIDTH diff --git a/data/mapObjects/mtmoon1.asm b/data/mapObjects/MtMoon1F.asm similarity index 74% rename from data/mapObjects/mtmoon1.asm rename to data/mapObjects/MtMoon1F.asm index 707281aa..56820161 100755 --- a/data/mapObjects/mtmoon1.asm +++ b/data/mapObjects/MtMoon1F.asm @@ -1,12 +1,12 @@ -MtMoon1Object: +MtMoon1F_Object: db $3 ; border block db 5 ; warps warp 14, 35, 1, -1 warp 15, 35, 1, -1 - warp 5, 5, 0, MT_MOON_2 - warp 17, 11, 2, MT_MOON_2 - warp 25, 15, 3, MT_MOON_2 + warp 5, 5, 0, MT_MOON_B1F + warp 17, 11, 2, MT_MOON_B1F + warp 25, 15, 3, MT_MOON_B1F db 1 ; signs sign 15, 23, 14 ; MtMoon1Text14 @@ -27,8 +27,8 @@ MtMoon1Object: object SPRITE_BALL, 5, 32, STAY, NONE, 13, TM_12 ; warp-to - warp_to 14, 35, MT_MOON_1_WIDTH - warp_to 15, 35, MT_MOON_1_WIDTH - warp_to 5, 5, MT_MOON_1_WIDTH ; MT_MOON_2 - warp_to 17, 11, MT_MOON_1_WIDTH ; MT_MOON_2 - warp_to 25, 15, MT_MOON_1_WIDTH ; MT_MOON_2 + warp_to 14, 35, MT_MOON_1F_WIDTH + warp_to 15, 35, MT_MOON_1F_WIDTH + warp_to 5, 5, MT_MOON_1F_WIDTH ; MT_MOON_B1F + warp_to 17, 11, MT_MOON_1F_WIDTH ; MT_MOON_B1F + warp_to 25, 15, MT_MOON_1F_WIDTH ; MT_MOON_B1F diff --git a/data/mapObjects/MtMoonB1F.asm b/data/mapObjects/MtMoonB1F.asm new file mode 100755 index 00000000..a8365ba7 --- /dev/null +++ b/data/mapObjects/MtMoonB1F.asm @@ -0,0 +1,26 @@ +MtMoonB1F_Object: + db $3 ; border block + + db 8 ; warps + warp 5, 5, 2, MT_MOON_1F + warp 17, 11, 0, MT_MOON_B2F + warp 25, 9, 3, MT_MOON_1F + warp 25, 15, 4, MT_MOON_1F + warp 21, 17, 1, MT_MOON_B2F + warp 13, 27, 2, MT_MOON_B2F + warp 23, 3, 3, MT_MOON_B2F + warp 27, 3, 2, -1 + + db 0 ; signs + + db 0 ; objects + + ; warp-to + warp_to 5, 5, MT_MOON_B1F_WIDTH ; MT_MOON_1F + warp_to 17, 11, MT_MOON_B1F_WIDTH ; MT_MOON_B2F + warp_to 25, 9, MT_MOON_B1F_WIDTH ; MT_MOON_1F + warp_to 25, 15, MT_MOON_B1F_WIDTH ; MT_MOON_1F + warp_to 21, 17, MT_MOON_B1F_WIDTH ; MT_MOON_B2F + warp_to 13, 27, MT_MOON_B1F_WIDTH ; MT_MOON_B2F + warp_to 23, 3, MT_MOON_B1F_WIDTH ; MT_MOON_B2F + warp_to 27, 3, MT_MOON_B1F_WIDTH diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/MtMoonB2F.asm similarity index 64% rename from data/mapObjects/mtmoon3.asm rename to data/mapObjects/MtMoonB2F.asm index 13aa5a79..27b2383f 100755 --- a/data/mapObjects/mtmoon3.asm +++ b/data/mapObjects/MtMoonB2F.asm @@ -1,11 +1,11 @@ -MtMoon3Object: +MtMoonB2F_Object: db $3 ; border block db 4 ; warps - warp 25, 9, 1, MT_MOON_2 - warp 21, 17, 4, MT_MOON_2 - warp 15, 27, 5, MT_MOON_2 - warp 5, 7, 6, MT_MOON_2 + warp 25, 9, 1, MT_MOON_B1F + warp 21, 17, 4, MT_MOON_B1F + warp 15, 27, 5, MT_MOON_B1F + warp 5, 7, 6, MT_MOON_B1F db 0 ; signs @@ -21,7 +21,7 @@ MtMoon3Object: object SPRITE_BALL, 29, 5, STAY, NONE, 9, TM_01 ; warp-to - warp_to 25, 9, MT_MOON_3_WIDTH ; MT_MOON_2 - warp_to 21, 17, MT_MOON_3_WIDTH ; MT_MOON_2 - warp_to 15, 27, MT_MOON_3_WIDTH ; MT_MOON_2 - warp_to 5, 7, MT_MOON_3_WIDTH ; MT_MOON_2 + warp_to 25, 9, MT_MOON_B2F_WIDTH ; MT_MOON_B1F + warp_to 21, 17, MT_MOON_B2F_WIDTH ; MT_MOON_B1F + warp_to 15, 27, MT_MOON_B2F_WIDTH ; MT_MOON_B1F + warp_to 5, 7, MT_MOON_B2F_WIDTH ; MT_MOON_B1F diff --git a/data/mapObjects/mtmoonpokecenter.asm b/data/mapObjects/MtMoonPokecenter.asm similarity index 95% rename from data/mapObjects/mtmoonpokecenter.asm rename to data/mapObjects/MtMoonPokecenter.asm index 841d0194..b23703e6 100755 --- a/data/mapObjects/mtmoonpokecenter.asm +++ b/data/mapObjects/MtMoonPokecenter.asm @@ -1,4 +1,4 @@ -MtMoonPokecenterObject: +MtMoonPokecenter_Object: db $0 ; border block db 2 ; warps diff --git a/data/mapObjects/museum1f.asm b/data/mapObjects/Museum1F.asm similarity index 97% rename from data/mapObjects/museum1f.asm rename to data/mapObjects/Museum1F.asm index 3034dc74..1cfd2c68 100755 --- a/data/mapObjects/museum1f.asm +++ b/data/mapObjects/Museum1F.asm @@ -1,4 +1,4 @@ -Museum1FObject: +Museum1F_Object: db $a ; border block db 5 ; warps diff --git a/data/mapObjects/museum2f.asm b/data/mapObjects/Museum2F.asm similarity index 96% rename from data/mapObjects/museum2f.asm rename to data/mapObjects/Museum2F.asm index 11fad941..80815820 100755 --- a/data/mapObjects/museum2f.asm +++ b/data/mapObjects/Museum2F.asm @@ -1,4 +1,4 @@ -Museum2FObject: +Museum2F_Object: db $a ; border block db 1 ; warps diff --git a/data/mapObjects/namerater.asm b/data/mapObjects/NameRatersHouse.asm similarity index 91% rename from data/mapObjects/namerater.asm rename to data/mapObjects/NameRatersHouse.asm index 10487f0b..da95bc43 100755 --- a/data/mapObjects/namerater.asm +++ b/data/mapObjects/NameRatersHouse.asm @@ -1,4 +1,4 @@ -NameRaterObject: +NameRatersHouse_Object: db $a ; border block db 2 ; warps diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/OaksLab.asm similarity index 97% rename from data/mapObjects/oakslab.asm rename to data/mapObjects/OaksLab.asm index d7fc8029..fa78ccdf 100755 --- a/data/mapObjects/oakslab.asm +++ b/data/mapObjects/OaksLab.asm @@ -1,4 +1,4 @@ -OaksLabObject: +OaksLab_Object: db $3 ; border block db 2 ; warps diff --git a/data/mapObjects/pallettown.asm b/data/mapObjects/PalletTown.asm similarity index 96% rename from data/mapObjects/pallettown.asm rename to data/mapObjects/PalletTown.asm index 1bd3d62b..68b01175 100755 --- a/data/mapObjects/pallettown.asm +++ b/data/mapObjects/PalletTown.asm @@ -1,4 +1,4 @@ -PalletTownObject: +PalletTown_Object: db $b ; border block db 3 ; warps diff --git a/data/mapObjects/pewtercity.asm b/data/mapObjects/PewterCity.asm similarity index 83% rename from data/mapObjects/pewtercity.asm rename to data/mapObjects/PewterCity.asm index 4e7d24d0..e1a3eecb 100755 --- a/data/mapObjects/pewtercity.asm +++ b/data/mapObjects/PewterCity.asm @@ -1,13 +1,13 @@ -PewterCityObject: +PewterCity_Object: db $a ; border block db 7 ; warps warp 14, 7, 0, MUSEUM_1F warp 19, 5, 2, MUSEUM_1F warp 16, 17, 0, PEWTER_GYM - warp 29, 13, 0, PEWTER_HOUSE_1 + warp 29, 13, 0, PEWTER_NIDORAN_HOUSE warp 23, 17, 0, PEWTER_MART - warp 7, 29, 0, PEWTER_HOUSE_2 + warp 7, 29, 0, PEWTER_SPEECH_HOUSE warp 13, 25, 0, PEWTER_POKECENTER db 7 ; signs @@ -30,7 +30,7 @@ PewterCityObject: warp_to 14, 7, PEWTER_CITY_WIDTH ; MUSEUM_1F warp_to 19, 5, PEWTER_CITY_WIDTH ; MUSEUM_1F warp_to 16, 17, PEWTER_CITY_WIDTH ; PEWTER_GYM - warp_to 29, 13, PEWTER_CITY_WIDTH ; PEWTER_HOUSE_1 + warp_to 29, 13, PEWTER_CITY_WIDTH ; PEWTER_NIDORAN_HOUSE warp_to 23, 17, PEWTER_CITY_WIDTH ; PEWTER_MART - warp_to 7, 29, PEWTER_CITY_WIDTH ; PEWTER_HOUSE_2 + warp_to 7, 29, PEWTER_CITY_WIDTH ; PEWTER_SPEECH_HOUSE warp_to 13, 25, PEWTER_CITY_WIDTH ; PEWTER_POKECENTER diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/PewterGym.asm similarity index 95% rename from data/mapObjects/pewtergym.asm rename to data/mapObjects/PewterGym.asm index fc571f26..538c3923 100755 --- a/data/mapObjects/pewtergym.asm +++ b/data/mapObjects/PewterGym.asm @@ -1,4 +1,4 @@ -PewterGymObject: +PewterGym_Object: db $3 ; border block db 2 ; warps diff --git a/data/mapObjects/pewtermart.asm b/data/mapObjects/PewterMart.asm similarity index 94% rename from data/mapObjects/pewtermart.asm rename to data/mapObjects/PewterMart.asm index e79952c9..9b983316 100755 --- a/data/mapObjects/pewtermart.asm +++ b/data/mapObjects/PewterMart.asm @@ -1,4 +1,4 @@ -PewterMartObject: +PewterMart_Object: db $0 ; border block db 2 ; warps diff --git a/data/mapObjects/pewterhouse1.asm b/data/mapObjects/PewterNidoranHouse.asm similarity index 71% rename from data/mapObjects/pewterhouse1.asm rename to data/mapObjects/PewterNidoranHouse.asm index 63abe6b3..f00317d1 100755 --- a/data/mapObjects/pewterhouse1.asm +++ b/data/mapObjects/PewterNidoranHouse.asm @@ -1,4 +1,4 @@ -PewterHouse1Object: +PewterNidoranHouse_Object: db $a ; border block db 2 ; warps @@ -13,5 +13,5 @@ PewterHouse1Object: object SPRITE_FAT_BALD_GUY, 1, 2, STAY, NONE, 3 ; person ; warp-to - warp_to 2, 7, PEWTER_HOUSE_1_WIDTH - warp_to 3, 7, PEWTER_HOUSE_1_WIDTH + warp_to 2, 7, PEWTER_NIDORAN_HOUSE_WIDTH + warp_to 3, 7, PEWTER_NIDORAN_HOUSE_WIDTH diff --git a/data/mapObjects/pewterpokecenter.asm b/data/mapObjects/PewterPokecenter.asm similarity index 94% rename from data/mapObjects/pewterpokecenter.asm rename to data/mapObjects/PewterPokecenter.asm index 29f02eb9..2b375bf9 100755 --- a/data/mapObjects/pewterpokecenter.asm +++ b/data/mapObjects/PewterPokecenter.asm @@ -1,4 +1,4 @@ -PewterPokecenterObject: +PewterPokecenter_Object: db $0 ; border block db 2 ; warps diff --git a/data/mapObjects/pewterhouse2.asm b/data/mapObjects/PewterSpeechHouse.asm similarity index 67% rename from data/mapObjects/pewterhouse2.asm rename to data/mapObjects/PewterSpeechHouse.asm index 48cb243d..e7134cb5 100755 --- a/data/mapObjects/pewterhouse2.asm +++ b/data/mapObjects/PewterSpeechHouse.asm @@ -1,4 +1,4 @@ -PewterHouse2Object: +PewterSpeechHouse_Object: db $a ; border block db 2 ; warps @@ -12,5 +12,5 @@ PewterHouse2Object: object SPRITE_BUG_CATCHER, 4, 5, STAY, NONE, 2 ; person ; warp-to - warp_to 2, 7, PEWTER_HOUSE_2_WIDTH - warp_to 3, 7, PEWTER_HOUSE_2_WIDTH + warp_to 2, 7, PEWTER_SPEECH_HOUSE_WIDTH + warp_to 3, 7, PEWTER_SPEECH_HOUSE_WIDTH diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/PokemonFanClub.asm similarity index 96% rename from data/mapObjects/fanclub.asm rename to data/mapObjects/PokemonFanClub.asm index 8e0fd931..e1f175f0 100755 --- a/data/mapObjects/fanclub.asm +++ b/data/mapObjects/PokemonFanClub.asm @@ -1,4 +1,4 @@ -FanClubObject: +PokemonFanClub_Object: db $d ; border block db 2 ; warps diff --git a/data/mapObjects/PokemonMansion1F.asm b/data/mapObjects/PokemonMansion1F.asm new file mode 100755 index 00000000..109b5b8e --- /dev/null +++ b/data/mapObjects/PokemonMansion1F.asm @@ -0,0 +1,29 @@ +PokemonMansion1F_Object: + db $2e ; border block + + db 8 ; warps + warp 4, 27, 0, -1 + warp 5, 27, 0, -1 + warp 6, 27, 0, -1 + warp 7, 27, 0, -1 + warp 5, 10, 0, POKEMON_MANSION_2F + warp 21, 23, 0, POKEMON_MANSION_B1F + warp 26, 27, 0, -1 + warp 27, 27, 0, -1 + + db 0 ; signs + + db 3 ; objects + object SPRITE_OAK_AIDE, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4 + object SPRITE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE + object SPRITE_BALL, 18, 21, STAY, NONE, 3, CARBOS + + ; warp-to + warp_to 4, 27, POKEMON_MANSION_1F_WIDTH + warp_to 5, 27, POKEMON_MANSION_1F_WIDTH + warp_to 6, 27, POKEMON_MANSION_1F_WIDTH + warp_to 7, 27, POKEMON_MANSION_1F_WIDTH + warp_to 5, 10, POKEMON_MANSION_1F_WIDTH ; POKEMON_MANSION_2F + warp_to 21, 23, POKEMON_MANSION_1F_WIDTH ; POKEMON_MANSION_B1F + warp_to 26, 27, POKEMON_MANSION_1F_WIDTH + warp_to 27, 27, POKEMON_MANSION_1F_WIDTH diff --git a/data/mapObjects/PokemonMansion2F.asm b/data/mapObjects/PokemonMansion2F.asm new file mode 100755 index 00000000..6c0cc5f8 --- /dev/null +++ b/data/mapObjects/PokemonMansion2F.asm @@ -0,0 +1,22 @@ +PokemonMansion2F_Object: + db $1 ; border block + + db 4 ; warps + warp 5, 10, 4, POKEMON_MANSION_1F + warp 7, 10, 0, POKEMON_MANSION_3F + warp 25, 14, 2, POKEMON_MANSION_3F + warp 6, 1, 1, POKEMON_MANSION_3F + + db 0 ; signs + + db 4 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 3, 17, WALK, 2, 1, OPP_BURGLAR, 7 + object SPRITE_BALL, 28, 7, STAY, NONE, 2, CALCIUM + object SPRITE_BOOK_MAP_DEX, 18, 2, STAY, NONE, 3 ; person + object SPRITE_BOOK_MAP_DEX, 3, 22, STAY, NONE, 4 ; person + + ; warp-to + warp_to 5, 10, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_1F + warp_to 7, 10, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F + warp_to 25, 14, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F + warp_to 6, 1, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F diff --git a/data/mapObjects/mansion3.asm b/data/mapObjects/PokemonMansion3F.asm similarity index 54% rename from data/mapObjects/mansion3.asm rename to data/mapObjects/PokemonMansion3F.asm index f6ec7aee..7c8c9c22 100755 --- a/data/mapObjects/mansion3.asm +++ b/data/mapObjects/PokemonMansion3F.asm @@ -1,10 +1,10 @@ -Mansion3Object: +PokemonMansion3F_Object: db $1 ; border block db 3 ; warps - warp 7, 10, 1, MANSION_2 - warp 6, 1, 3, MANSION_2 - warp 25, 14, 2, MANSION_2 + warp 7, 10, 1, POKEMON_MANSION_2F + warp 6, 1, 3, POKEMON_MANSION_2F + warp 25, 14, 2, POKEMON_MANSION_2F db 0 ; signs @@ -16,6 +16,6 @@ Mansion3Object: object SPRITE_BOOK_MAP_DEX, 6, 12, STAY, NONE, 5 ; person ; warp-to - warp_to 7, 10, MANSION_3_WIDTH ; MANSION_2 - warp_to 6, 1, MANSION_3_WIDTH ; MANSION_2 - warp_to 25, 14, MANSION_3_WIDTH ; MANSION_2 + warp_to 7, 10, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F + warp_to 6, 1, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F + warp_to 25, 14, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/PokemonMansionB1F.asm similarity index 81% rename from data/mapObjects/mansion4.asm rename to data/mapObjects/PokemonMansionB1F.asm index 3db9d016..ac232799 100755 --- a/data/mapObjects/mansion4.asm +++ b/data/mapObjects/PokemonMansionB1F.asm @@ -1,8 +1,8 @@ -Mansion4Object: +PokemonMansionB1F_Object: db $1 ; border block db 1 ; warps - warp 23, 22, 5, MANSION_1 + warp 23, 22, 5, POKEMON_MANSION_1F db 0 ; signs @@ -17,4 +17,4 @@ Mansion4Object: object SPRITE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY ; warp-to - warp_to 23, 22, MANSION_4_WIDTH ; MANSION_1 + warp_to 23, 22, POKEMON_MANSION_B1F_WIDTH ; POKEMON_MANSION_1F diff --git a/data/mapObjects/pokemontower1.asm b/data/mapObjects/PokemonTower1F.asm similarity index 67% rename from data/mapObjects/pokemontower1.asm rename to data/mapObjects/PokemonTower1F.asm index f15299da..cf62836b 100755 --- a/data/mapObjects/pokemontower1.asm +++ b/data/mapObjects/PokemonTower1F.asm @@ -1,10 +1,10 @@ -PokemonTower1Object: +PokemonTower1F_Object: db $1 ; border block db 3 ; warps warp 10, 17, 1, -1 warp 11, 17, 1, -1 - warp 18, 9, 1, POKEMONTOWER_2 + warp 18, 9, 1, POKEMON_TOWER_2F db 0 ; signs @@ -16,6 +16,6 @@ PokemonTower1Object: object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 5 ; person ; warp-to - warp_to 10, 17, POKEMONTOWER_1_WIDTH - warp_to 11, 17, POKEMONTOWER_1_WIDTH - warp_to 18, 9, POKEMONTOWER_1_WIDTH ; POKEMONTOWER_2 + warp_to 10, 17, POKEMON_TOWER_1F_WIDTH + warp_to 11, 17, POKEMON_TOWER_1F_WIDTH + warp_to 18, 9, POKEMON_TOWER_1F_WIDTH ; POKEMON_TOWER_2F diff --git a/data/mapObjects/PokemonTower2F.asm b/data/mapObjects/PokemonTower2F.asm new file mode 100755 index 00000000..5ce437d1 --- /dev/null +++ b/data/mapObjects/PokemonTower2F.asm @@ -0,0 +1,16 @@ +PokemonTower2F_Object: + db $1 ; border block + + db 2 ; warps + warp 3, 9, 0, POKEMON_TOWER_3F + warp 18, 9, 2, POKEMON_TOWER_1F + + db 0 ; signs + + db 2 ; objects + object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person + object SPRITE_MEDIUM, 3, 7, STAY, RIGHT, 2 ; person + + ; warp-to + warp_to 3, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_3F + warp_to 18, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_1F diff --git a/data/mapObjects/pokemontower3.asm b/data/mapObjects/PokemonTower3F.asm similarity index 61% rename from data/mapObjects/pokemontower3.asm rename to data/mapObjects/PokemonTower3F.asm index 0e7f5e1f..79b83f88 100755 --- a/data/mapObjects/pokemontower3.asm +++ b/data/mapObjects/PokemonTower3F.asm @@ -1,9 +1,9 @@ -PokemonTower3Object: +PokemonTower3F_Object: db $1 ; border block db 2 ; warps - warp 3, 9, 0, POKEMONTOWER_2 - warp 18, 9, 1, POKEMONTOWER_4 + warp 3, 9, 0, POKEMON_TOWER_2F + warp 18, 9, 1, POKEMON_TOWER_4F db 0 ; signs @@ -14,5 +14,5 @@ PokemonTower3Object: object SPRITE_BALL, 12, 1, STAY, NONE, 4, ESCAPE_ROPE ; warp-to - warp_to 3, 9, POKEMONTOWER_3_WIDTH ; POKEMONTOWER_2 - warp_to 18, 9, POKEMONTOWER_3_WIDTH ; POKEMONTOWER_4 + warp_to 3, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_2F + warp_to 18, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_4F diff --git a/data/mapObjects/pokemontower4.asm b/data/mapObjects/PokemonTower4F.asm similarity index 67% rename from data/mapObjects/pokemontower4.asm rename to data/mapObjects/PokemonTower4F.asm index 9acea43e..db86c02c 100755 --- a/data/mapObjects/pokemontower4.asm +++ b/data/mapObjects/PokemonTower4F.asm @@ -1,9 +1,9 @@ -PokemonTower4Object: +PokemonTower4F_Object: db $1 ; border block db 2 ; warps - warp 3, 9, 0, POKEMONTOWER_5 - warp 18, 9, 1, POKEMONTOWER_3 + warp 3, 9, 0, POKEMON_TOWER_5F + warp 18, 9, 1, POKEMON_TOWER_3F db 0 ; signs @@ -16,5 +16,5 @@ PokemonTower4Object: object SPRITE_BALL, 12, 16, STAY, NONE, 6, HP_UP ; warp-to - warp_to 3, 9, POKEMONTOWER_4_WIDTH ; POKEMONTOWER_5 - warp_to 18, 9, POKEMONTOWER_4_WIDTH ; POKEMONTOWER_3 + warp_to 3, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_5F + warp_to 18, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_3F diff --git a/data/mapObjects/pokemontower5.asm b/data/mapObjects/PokemonTower5F.asm similarity index 68% rename from data/mapObjects/pokemontower5.asm rename to data/mapObjects/PokemonTower5F.asm index ac0668b2..b482871f 100755 --- a/data/mapObjects/pokemontower5.asm +++ b/data/mapObjects/PokemonTower5F.asm @@ -1,9 +1,9 @@ -PokemonTower5Object: +PokemonTower5F_Object: db $1 ; border block db 2 ; warps - warp 3, 9, 0, POKEMONTOWER_4 - warp 18, 9, 0, POKEMONTOWER_6 + warp 3, 9, 0, POKEMON_TOWER_4F + warp 18, 9, 0, POKEMON_TOWER_6F db 0 ; signs @@ -16,5 +16,5 @@ PokemonTower5Object: object SPRITE_BALL, 6, 14, STAY, NONE, 6, NUGGET ; warp-to - warp_to 3, 9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_4 - warp_to 18, 9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_6 + warp_to 3, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_4F + warp_to 18, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_6F diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/PokemonTower6F.asm similarity index 64% rename from data/mapObjects/pokemontower6.asm rename to data/mapObjects/PokemonTower6F.asm index 1dd66629..823fe78a 100755 --- a/data/mapObjects/pokemontower6.asm +++ b/data/mapObjects/PokemonTower6F.asm @@ -1,9 +1,9 @@ -PokemonTower6Object: +PokemonTower6F_Object: db $1 ; border block db 2 ; warps - warp 18, 9, 1, POKEMONTOWER_5 - warp 9, 16, 0, POKEMONTOWER_7 + warp 18, 9, 1, POKEMON_TOWER_5F + warp 9, 16, 0, POKEMON_TOWER_7F db 0 ; signs @@ -15,5 +15,5 @@ PokemonTower6Object: object SPRITE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY ; warp-to - warp_to 18, 9, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_5 - warp_to 9, 16, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_7 + warp_to 18, 9, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_5F + warp_to 9, 16, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_7F diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/PokemonTower7F.asm similarity index 73% rename from data/mapObjects/pokemontower7.asm rename to data/mapObjects/PokemonTower7F.asm index 9609253f..79cb5b0d 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/PokemonTower7F.asm @@ -1,8 +1,8 @@ -PokemonTower7Object: +PokemonTower7F_Object: db $1 ; border block db 1 ; warps - warp 9, 16, 1, POKEMONTOWER_6 + warp 9, 16, 1, POKEMON_TOWER_6F db 0 ; signs @@ -13,4 +13,4 @@ PokemonTower7Object: object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 4 ; person ; warp-to - warp_to 9, 16, POKEMONTOWER_7_WIDTH ; POKEMONTOWER_6 + warp_to 9, 16, POKEMON_TOWER_7F_WIDTH ; POKEMON_TOWER_6F diff --git a/data/mapObjects/powerplant.asm b/data/mapObjects/PowerPlant.asm similarity index 98% rename from data/mapObjects/powerplant.asm rename to data/mapObjects/PowerPlant.asm index 402f899f..a8548b1c 100755 --- a/data/mapObjects/powerplant.asm +++ b/data/mapObjects/PowerPlant.asm @@ -1,4 +1,4 @@ -PowerPlantObject: +PowerPlant_Object: db $2e ; border block db 3 ; warps diff --git a/data/mapObjects/redshouse1f.asm b/data/mapObjects/RedsHouse1F.asm similarity index 94% rename from data/mapObjects/redshouse1f.asm rename to data/mapObjects/RedsHouse1F.asm index aabe6656..a54b5411 100755 --- a/data/mapObjects/redshouse1f.asm +++ b/data/mapObjects/RedsHouse1F.asm @@ -1,4 +1,4 @@ -RedsHouse1FObject: +RedsHouse1F_Object: db $a ; border block db 3 ; warps diff --git a/data/mapObjects/redshouse2f.asm b/data/mapObjects/RedsHouse2F.asm similarity index 87% rename from data/mapObjects/redshouse2f.asm rename to data/mapObjects/RedsHouse2F.asm index af3c4b6b..98e9c236 100755 --- a/data/mapObjects/redshouse2f.asm +++ b/data/mapObjects/RedsHouse2F.asm @@ -1,4 +1,4 @@ -RedsHouse2FObject: +RedsHouse2F_Object: db $a ; border block db 1 ; warps diff --git a/data/mapObjects/rocktunnel1.asm b/data/mapObjects/RockTunnel1F.asm similarity index 55% rename from data/mapObjects/rocktunnel1.asm rename to data/mapObjects/RockTunnel1F.asm index 1cfeca65..1cf5a12f 100755 --- a/data/mapObjects/rocktunnel1.asm +++ b/data/mapObjects/RockTunnel1F.asm @@ -1,4 +1,4 @@ -RockTunnel1Object: +RockTunnel1F_Object: db $3 ; border block db 8 ; warps @@ -6,10 +6,10 @@ RockTunnel1Object: warp 15, 0, 1, -1 warp 15, 33, 2, -1 warp 15, 35, 2, -1 - warp 37, 3, 0, ROCK_TUNNEL_2 - warp 5, 3, 1, ROCK_TUNNEL_2 - warp 17, 11, 2, ROCK_TUNNEL_2 - warp 37, 17, 3, ROCK_TUNNEL_2 + warp 37, 3, 0, ROCK_TUNNEL_B1F + warp 5, 3, 1, ROCK_TUNNEL_B1F + warp 17, 11, 2, ROCK_TUNNEL_B1F + warp 37, 17, 3, ROCK_TUNNEL_B1F db 1 ; signs sign 11, 29, 8 ; RockTunnel1Text8 @@ -24,11 +24,11 @@ RockTunnel1Object: object SPRITE_LASS, 32, 24, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19 ; warp-to - warp_to 15, 3, ROCK_TUNNEL_1_WIDTH - warp_to 15, 0, ROCK_TUNNEL_1_WIDTH - warp_to 15, 33, ROCK_TUNNEL_1_WIDTH - warp_to 15, 35, ROCK_TUNNEL_1_WIDTH - warp_to 37, 3, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 - warp_to 5, 3, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 - warp_to 17, 11, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 - warp_to 37, 17, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 + warp_to 15, 3, ROCK_TUNNEL_1F_WIDTH + warp_to 15, 0, ROCK_TUNNEL_1F_WIDTH + warp_to 15, 33, ROCK_TUNNEL_1F_WIDTH + warp_to 15, 35, ROCK_TUNNEL_1F_WIDTH + warp_to 37, 3, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F + warp_to 5, 3, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F + warp_to 17, 11, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F + warp_to 37, 17, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F diff --git a/data/mapObjects/rocktunnel2.asm b/data/mapObjects/RockTunnelB1F.asm similarity index 62% rename from data/mapObjects/rocktunnel2.asm rename to data/mapObjects/RockTunnelB1F.asm index d60863c1..f562168e 100755 --- a/data/mapObjects/rocktunnel2.asm +++ b/data/mapObjects/RockTunnelB1F.asm @@ -1,11 +1,11 @@ -RockTunnel2Object: +RockTunnelB1F_Object: db $3 ; border block db 4 ; warps - warp 33, 25, 4, ROCK_TUNNEL_1 - warp 27, 3, 5, ROCK_TUNNEL_1 - warp 23, 11, 6, ROCK_TUNNEL_1 - warp 3, 3, 7, ROCK_TUNNEL_1 + warp 33, 25, 4, ROCK_TUNNEL_1F + warp 27, 3, 5, ROCK_TUNNEL_1F + warp 23, 11, 6, ROCK_TUNNEL_1F + warp 3, 3, 7, ROCK_TUNNEL_1F db 0 ; signs @@ -20,7 +20,7 @@ RockTunnel2Object: object SPRITE_BLACK_HAIR_BOY_2, 26, 30, STAY, DOWN, 8, OPP_POKEMANIAC, 5 ; warp-to - warp_to 33, 25, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 - warp_to 27, 3, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 - warp_to 23, 11, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 - warp_to 3, 3, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 + warp_to 33, 25, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F + warp_to 27, 3, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F + warp_to 23, 11, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F + warp_to 3, 3, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F diff --git a/data/mapObjects/rocktunnelpokecenter.asm b/data/mapObjects/RockTunnelPokecenter.asm similarity index 93% rename from data/mapObjects/rocktunnelpokecenter.asm rename to data/mapObjects/RockTunnelPokecenter.asm index c664b206..a7619f7f 100755 --- a/data/mapObjects/rocktunnelpokecenter.asm +++ b/data/mapObjects/RockTunnelPokecenter.asm @@ -1,4 +1,4 @@ -RockTunnelPokecenterObject: +RockTunnelPokecenter_Object: db $0 ; border block db 2 ; warps diff --git a/data/mapObjects/rockethideout1.asm b/data/mapObjects/RocketHideoutB1F.asm similarity index 59% rename from data/mapObjects/rockethideout1.asm rename to data/mapObjects/RocketHideoutB1F.asm index 3a51808d..99537510 100755 --- a/data/mapObjects/rockethideout1.asm +++ b/data/mapObjects/RocketHideoutB1F.asm @@ -1,11 +1,11 @@ -RocketHideout1Object: +RocketHideoutB1F_Object: db $2e ; border block db 5 ; warps - warp 23, 2, 0, ROCKET_HIDEOUT_2 + warp 23, 2, 0, ROCKET_HIDEOUT_B2F warp 21, 2, 2, GAME_CORNER warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR - warp 21, 24, 3, ROCKET_HIDEOUT_2 + warp 21, 24, 3, ROCKET_HIDEOUT_B2F warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR db 0 ; signs @@ -20,8 +20,8 @@ RocketHideout1Object: object SPRITE_BALL, 9, 17, STAY, NONE, 7, HYPER_POTION ; warp-to - warp_to 23, 2, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_2 - warp_to 21, 2, ROCKET_HIDEOUT_1_WIDTH ; GAME_CORNER - warp_to 24, 19, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_ELEVATOR - warp_to 21, 24, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_2 - warp_to 25, 19, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to 23, 2, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_B2F + warp_to 21, 2, ROCKET_HIDEOUT_B1F_WIDTH ; GAME_CORNER + warp_to 24, 19, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to 21, 24, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_B2F + warp_to 25, 19, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/RocketHideoutB2F.asm b/data/mapObjects/RocketHideoutB2F.asm new file mode 100755 index 00000000..36fe9289 --- /dev/null +++ b/data/mapObjects/RocketHideoutB2F.asm @@ -0,0 +1,25 @@ +RocketHideoutB2F_Object: + db $2e ; border block + + db 5 ; warps + warp 27, 8, 0, ROCKET_HIDEOUT_B1F + warp 21, 8, 0, ROCKET_HIDEOUT_B3F + warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR + warp 21, 22, 3, ROCKET_HIDEOUT_B1F + warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR + + db 0 ; signs + + db 5 ; objects + object SPRITE_ROCKET, 20, 12, STAY, DOWN, 1, OPP_ROCKET, 13 + object SPRITE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE + object SPRITE_BALL, 16, 8, STAY, NONE, 3, NUGGET + object SPRITE_BALL, 6, 12, STAY, NONE, 4, TM_07 + object SPRITE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION + + ; warp-to + warp_to 27, 8, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B1F + warp_to 21, 8, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B3F + warp_to 24, 19, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to 21, 22, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B1F + warp_to 25, 19, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/RocketHideoutB3F.asm similarity index 58% rename from data/mapObjects/rockethideout3.asm rename to data/mapObjects/RocketHideoutB3F.asm index a8da69d2..6169dbed 100755 --- a/data/mapObjects/rockethideout3.asm +++ b/data/mapObjects/RocketHideoutB3F.asm @@ -1,9 +1,9 @@ -RocketHideout3Object: +RocketHideoutB3F_Object: db $2e ; border block db 2 ; warps - warp 25, 6, 1, ROCKET_HIDEOUT_2 - warp 19, 18, 0, ROCKET_HIDEOUT_4 + warp 25, 6, 1, ROCKET_HIDEOUT_B2F + warp 19, 18, 0, ROCKET_HIDEOUT_B4F db 0 ; signs @@ -14,5 +14,5 @@ RocketHideout3Object: object SPRITE_BALL, 20, 14, STAY, NONE, 4, RARE_CANDY ; warp-to - warp_to 25, 6, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_2 - warp_to 19, 18, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_4 + warp_to 25, 6, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B2F + warp_to 19, 18, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B4F diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/RocketHideoutB4F.asm similarity index 71% rename from data/mapObjects/rockethideout4.asm rename to data/mapObjects/RocketHideoutB4F.asm index 97025c71..be353f25 100755 --- a/data/mapObjects/rockethideout4.asm +++ b/data/mapObjects/RocketHideoutB4F.asm @@ -1,8 +1,8 @@ -RocketHideout4Object: +RocketHideoutB4F_Object: db $2e ; border block db 3 ; warps - warp 19, 10, 1, ROCKET_HIDEOUT_3 + warp 19, 10, 1, ROCKET_HIDEOUT_B3F warp 24, 15, 0, ROCKET_HIDEOUT_ELEVATOR warp 25, 15, 1, ROCKET_HIDEOUT_ELEVATOR @@ -20,6 +20,6 @@ RocketHideout4Object: object SPRITE_BALL, 10, 2, STAY, NONE, 9, LIFT_KEY ; warp-to - warp_to 19, 10, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_3 - warp_to 24, 15, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR - warp_to 25, 15, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to 19, 10, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_B3F + warp_to 24, 15, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to 25, 15, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/RocketHideoutElevator.asm b/data/mapObjects/RocketHideoutElevator.asm new file mode 100755 index 00000000..bc4fd7ff --- /dev/null +++ b/data/mapObjects/RocketHideoutElevator.asm @@ -0,0 +1,15 @@ +RocketHideoutElevator_Object: + db $f ; border block + + db 2 ; warps + warp 2, 1, 2, ROCKET_HIDEOUT_B1F + warp 3, 1, 4, ROCKET_HIDEOUT_B1F + + db 1 ; signs + sign 1, 1, 1 ; RocketHideoutElevatorText1 + + db 0 ; objects + + ; warp-to + warp_to 2, 1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_B1F + warp_to 3, 1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_B1F diff --git a/data/mapObjects/route1.asm b/data/mapObjects/Route1.asm similarity index 94% rename from data/mapObjects/route1.asm rename to data/mapObjects/Route1.asm index 26505ea6..0815fe67 100755 --- a/data/mapObjects/route1.asm +++ b/data/mapObjects/Route1.asm @@ -1,4 +1,4 @@ -Route1Object: +Route1_Object: db $b ; border block db 0 ; warps diff --git a/data/mapObjects/route10.asm b/data/mapObjects/Route10.asm similarity index 81% rename from data/mapObjects/route10.asm rename to data/mapObjects/Route10.asm index 90abb47d..12850577 100755 --- a/data/mapObjects/route10.asm +++ b/data/mapObjects/Route10.asm @@ -1,10 +1,10 @@ -Route10Object: +Route10_Object: db $2c ; border block db 4 ; warps warp 11, 19, 0, ROCK_TUNNEL_POKECENTER - warp 8, 17, 0, ROCK_TUNNEL_1 - warp 8, 53, 2, ROCK_TUNNEL_1 + warp 8, 17, 0, ROCK_TUNNEL_1F + warp 8, 53, 2, ROCK_TUNNEL_1F warp 6, 39, 0, POWER_PLANT db 4 ; signs @@ -23,6 +23,6 @@ Route10Object: ; warp-to warp_to 11, 19, ROUTE_10_WIDTH ; ROCK_TUNNEL_POKECENTER - warp_to 8, 17, ROUTE_10_WIDTH ; ROCK_TUNNEL_1 - warp_to 8, 53, ROUTE_10_WIDTH ; ROCK_TUNNEL_1 + warp_to 8, 17, ROUTE_10_WIDTH ; ROCK_TUNNEL_1F + warp_to 8, 53, ROUTE_10_WIDTH ; ROCK_TUNNEL_1F warp_to 6, 39, ROUTE_10_WIDTH ; POWER_PLANT diff --git a/data/mapObjects/route11.asm b/data/mapObjects/Route11.asm similarity index 90% rename from data/mapObjects/route11.asm rename to data/mapObjects/Route11.asm index 8d8e35d6..5ed232f5 100755 --- a/data/mapObjects/route11.asm +++ b/data/mapObjects/Route11.asm @@ -1,4 +1,4 @@ -Route11Object: +Route11_Object: db $f ; border block db 5 ; warps @@ -6,7 +6,7 @@ Route11Object: warp 49, 9, 1, ROUTE_11_GATE_1F warp 58, 8, 2, ROUTE_11_GATE_1F warp 58, 9, 3, ROUTE_11_GATE_1F - warp 4, 5, 0, DIGLETTS_CAVE_ENTRANCE + warp 4, 5, 0, DIGLETTS_CAVE_ROUTE_11 db 1 ; signs sign 1, 5, 11 ; Route11Text11 @@ -28,4 +28,4 @@ Route11Object: warp_to 49, 9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F warp_to 58, 8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F warp_to 58, 9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F - warp_to 4, 5, ROUTE_11_WIDTH ; DIGLETTS_CAVE_ENTRANCE + warp_to 4, 5, ROUTE_11_WIDTH ; DIGLETTS_CAVE_ROUTE_11 diff --git a/data/mapObjects/route11gate.asm b/data/mapObjects/Route11Gate1F.asm similarity index 95% rename from data/mapObjects/route11gate.asm rename to data/mapObjects/Route11Gate1F.asm index fa627963..5c4a120c 100755 --- a/data/mapObjects/route11gate.asm +++ b/data/mapObjects/Route11Gate1F.asm @@ -1,4 +1,4 @@ -Route11GateObject: +Route11Gate1F_Object: db $a ; border block db 5 ; warps diff --git a/data/mapObjects/route11gateupstairs.asm b/data/mapObjects/Route11Gate2F.asm similarity index 93% rename from data/mapObjects/route11gateupstairs.asm rename to data/mapObjects/Route11Gate2F.asm index e112c685..bf305bba 100755 --- a/data/mapObjects/route11gateupstairs.asm +++ b/data/mapObjects/Route11Gate2F.asm @@ -1,4 +1,4 @@ -Route11GateUpstairsObject: +Route11Gate2F_Object: db $a ; border block db 1 ; warps diff --git a/data/mapObjects/route12.asm b/data/mapObjects/Route12.asm similarity index 89% rename from data/mapObjects/route12.asm rename to data/mapObjects/Route12.asm index b72317d4..a9d84cf0 100755 --- a/data/mapObjects/route12.asm +++ b/data/mapObjects/Route12.asm @@ -1,11 +1,11 @@ -Route12Object: +Route12_Object: db $43 ; border block db 4 ; warps warp 10, 15, 0, ROUTE_12_GATE_1F warp 11, 15, 1, ROUTE_12_GATE_1F warp 10, 21, 2, ROUTE_12_GATE_1F - warp 11, 77, 0, ROUTE_12_HOUSE + warp 11, 77, 0, ROUTE_12_SUPER_ROD_HOUSE db 2 ; signs sign 13, 13, 11 ; Route12Text11 @@ -27,4 +27,4 @@ Route12Object: warp_to 10, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F warp_to 11, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F warp_to 10, 21, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F - warp_to 11, 77, ROUTE_12_WIDTH ; ROUTE_12_HOUSE + warp_to 11, 77, ROUTE_12_WIDTH ; ROUTE_12_SUPER_ROD_HOUSE diff --git a/data/mapObjects/route12gate.asm b/data/mapObjects/Route12Gate1F.asm similarity index 95% rename from data/mapObjects/route12gate.asm rename to data/mapObjects/Route12Gate1F.asm index bbfab54c..94f6b91a 100755 --- a/data/mapObjects/route12gate.asm +++ b/data/mapObjects/Route12Gate1F.asm @@ -1,4 +1,4 @@ -Route12GateObject: +Route12Gate1F_Object: db $a ; border block db 5 ; warps diff --git a/data/mapObjects/route12gateupstairs.asm b/data/mapObjects/Route12Gate2F.asm similarity index 91% rename from data/mapObjects/route12gateupstairs.asm rename to data/mapObjects/Route12Gate2F.asm index 9351ebac..cc6c1c19 100755 --- a/data/mapObjects/route12gateupstairs.asm +++ b/data/mapObjects/Route12Gate2F.asm @@ -1,4 +1,4 @@ -Route12GateUpstairsObject: +Route12Gate2F_Object: db $a ; border block db 1 ; warps diff --git a/data/mapObjects/route12house.asm b/data/mapObjects/Route12SuperRodHouse.asm similarity index 58% rename from data/mapObjects/route12house.asm rename to data/mapObjects/Route12SuperRodHouse.asm index 3161ebe6..458378a2 100755 --- a/data/mapObjects/route12house.asm +++ b/data/mapObjects/Route12SuperRodHouse.asm @@ -1,4 +1,4 @@ -Route12HouseObject: +Route12SuperRodHouse_Object: db $a ; border block db 2 ; warps @@ -11,5 +11,5 @@ Route12HouseObject: object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person ; warp-to - warp_to 2, 7, ROUTE_12_HOUSE_WIDTH - warp_to 3, 7, ROUTE_12_HOUSE_WIDTH + warp_to 2, 7, ROUTE_12_SUPER_ROD_HOUSE_WIDTH + warp_to 3, 7, ROUTE_12_SUPER_ROD_HOUSE_WIDTH diff --git a/data/mapObjects/route13.asm b/data/mapObjects/Route13.asm similarity index 98% rename from data/mapObjects/route13.asm rename to data/mapObjects/Route13.asm index b2a40c2c..3f460901 100755 --- a/data/mapObjects/route13.asm +++ b/data/mapObjects/Route13.asm @@ -1,4 +1,4 @@ -Route13Object: +Route13_Object: db $43 ; border block db 0 ; warps diff --git a/data/mapObjects/route14.asm b/data/mapObjects/Route14.asm similarity index 98% rename from data/mapObjects/route14.asm rename to data/mapObjects/Route14.asm index 9694715b..565e587f 100755 --- a/data/mapObjects/route14.asm +++ b/data/mapObjects/Route14.asm @@ -1,4 +1,4 @@ -Route14Object: +Route14_Object: db $43 ; border block db 0 ; warps diff --git a/data/mapObjects/route15.asm b/data/mapObjects/Route15.asm similarity index 98% rename from data/mapObjects/route15.asm rename to data/mapObjects/Route15.asm index 21fd2d97..f52cc1b8 100755 --- a/data/mapObjects/route15.asm +++ b/data/mapObjects/Route15.asm @@ -1,4 +1,4 @@ -Route15Object: +Route15_Object: db $43 ; border block db 4 ; warps diff --git a/data/mapObjects/route15gate.asm b/data/mapObjects/Route15Gate1F.asm similarity index 95% rename from data/mapObjects/route15gate.asm rename to data/mapObjects/Route15Gate1F.asm index 13c39674..23b1f5a7 100755 --- a/data/mapObjects/route15gate.asm +++ b/data/mapObjects/Route15Gate1F.asm @@ -1,4 +1,4 @@ -Route15GateObject: +Route15Gate1F_Object: db $a ; border block db 5 ; warps diff --git a/data/mapObjects/route15gateupstairs.asm b/data/mapObjects/Route15Gate2F.asm similarity index 90% rename from data/mapObjects/route15gateupstairs.asm rename to data/mapObjects/Route15Gate2F.asm index ff180883..162f2b1f 100755 --- a/data/mapObjects/route15gateupstairs.asm +++ b/data/mapObjects/Route15Gate2F.asm @@ -1,4 +1,4 @@ -Route15GateUpstairsObject: +Route15Gate2F_Object: db $a ; border block db 1 ; warps diff --git a/data/mapObjects/route16.asm b/data/mapObjects/Route16.asm similarity index 92% rename from data/mapObjects/route16.asm rename to data/mapObjects/Route16.asm index 35ffea17..fb23e6ca 100755 --- a/data/mapObjects/route16.asm +++ b/data/mapObjects/Route16.asm @@ -1,4 +1,4 @@ -Route16Object: +Route16_Object: db $f ; border block db 9 ; warps @@ -10,7 +10,7 @@ Route16Object: warp 17, 5, 5, ROUTE_16_GATE_1F warp 24, 4, 6, ROUTE_16_GATE_1F warp 24, 5, 7, ROUTE_16_GATE_1F - warp 7, 5, 0, ROUTE_16_HOUSE + warp 7, 5, 0, ROUTE_16_FLY_HOUSE db 2 ; signs sign 27, 11, 8 ; Route16Text8 @@ -34,4 +34,4 @@ Route16Object: warp_to 17, 5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F warp_to 24, 4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F warp_to 24, 5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 7, 5, ROUTE_16_WIDTH ; ROUTE_16_HOUSE + warp_to 7, 5, ROUTE_16_WIDTH ; ROUTE_16_FLY_HOUSE diff --git a/data/mapObjects/route16house.asm b/data/mapObjects/Route16FlyHouse.asm similarity index 68% rename from data/mapObjects/route16house.asm rename to data/mapObjects/Route16FlyHouse.asm index 7a097105..ec493fef 100755 --- a/data/mapObjects/route16house.asm +++ b/data/mapObjects/Route16FlyHouse.asm @@ -1,4 +1,4 @@ -Route16HouseObject: +Route16FlyHouse_Object: db $a ; border block db 2 ; warps @@ -12,5 +12,5 @@ Route16HouseObject: object SPRITE_BIRD, 6, 4, WALK, 0, 2 ; person ; warp-to - warp_to 2, 7, ROUTE_16_HOUSE_WIDTH - warp_to 3, 7, ROUTE_16_HOUSE_WIDTH + warp_to 2, 7, ROUTE_16_FLY_HOUSE_WIDTH + warp_to 3, 7, ROUTE_16_FLY_HOUSE_WIDTH diff --git a/data/mapObjects/route16gate.asm b/data/mapObjects/Route16Gate1F.asm similarity index 97% rename from data/mapObjects/route16gate.asm rename to data/mapObjects/Route16Gate1F.asm index 4e1863ed..1d5baa1d 100755 --- a/data/mapObjects/route16gate.asm +++ b/data/mapObjects/Route16Gate1F.asm @@ -1,4 +1,4 @@ -Route16GateObject: +Route16Gate1F_Object: db $a ; border block db 9 ; warps diff --git a/data/mapObjects/route16gateupstairs.asm b/data/mapObjects/Route16Gate2F.asm similarity index 93% rename from data/mapObjects/route16gateupstairs.asm rename to data/mapObjects/Route16Gate2F.asm index 41487e6e..5914f854 100755 --- a/data/mapObjects/route16gateupstairs.asm +++ b/data/mapObjects/Route16Gate2F.asm @@ -1,4 +1,4 @@ -Route16GateUpstairsObject: +Route16Gate2F_Object: db $a ; border block db 1 ; warps diff --git a/data/mapObjects/route17.asm b/data/mapObjects/Route17.asm similarity index 98% rename from data/mapObjects/route17.asm rename to data/mapObjects/Route17.asm index 48750597..f5bc4307 100755 --- a/data/mapObjects/route17.asm +++ b/data/mapObjects/Route17.asm @@ -1,4 +1,4 @@ -Route17Object: +Route17_Object: db $43 ; border block db 0 ; warps diff --git a/data/mapObjects/route18.asm b/data/mapObjects/Route18.asm similarity index 97% rename from data/mapObjects/route18.asm rename to data/mapObjects/Route18.asm index d7851f88..8bacd6c0 100755 --- a/data/mapObjects/route18.asm +++ b/data/mapObjects/Route18.asm @@ -1,4 +1,4 @@ -Route18Object: +Route18_Object: db $43 ; border block db 4 ; warps diff --git a/data/mapObjects/route18gate.asm b/data/mapObjects/Route18Gate1F.asm similarity index 95% rename from data/mapObjects/route18gate.asm rename to data/mapObjects/Route18Gate1F.asm index c73d7131..83cb386a 100755 --- a/data/mapObjects/route18gate.asm +++ b/data/mapObjects/Route18Gate1F.asm @@ -1,4 +1,4 @@ -Route18GateObject: +Route18Gate1F_Object: db $a ; border block db 5 ; warps diff --git a/data/mapObjects/route18gateupstairs.asm b/data/mapObjects/Route18Gate2F.asm similarity index 91% rename from data/mapObjects/route18gateupstairs.asm rename to data/mapObjects/Route18Gate2F.asm index 6d298055..e48ec3b8 100755 --- a/data/mapObjects/route18gateupstairs.asm +++ b/data/mapObjects/Route18Gate2F.asm @@ -1,4 +1,4 @@ -Route18GateUpstairsObject: +Route18Gate2F_Object: db $a ; border block db 1 ; warps diff --git a/data/mapObjects/route19.asm b/data/mapObjects/Route19.asm similarity index 97% rename from data/mapObjects/route19.asm rename to data/mapObjects/Route19.asm index 935b3d4d..9b39618e 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/Route19.asm @@ -1,4 +1,4 @@ -Route19Object: +Route19_Object: db $43 ; border block db 0 ; warps diff --git a/data/mapObjects/route2.asm b/data/mapObjects/Route2.asm similarity index 55% rename from data/mapObjects/route2.asm rename to data/mapObjects/Route2.asm index b62f9fdb..b27ad199 100755 --- a/data/mapObjects/route2.asm +++ b/data/mapObjects/Route2.asm @@ -1,13 +1,13 @@ -Route2Object: +Route2_Object: db $f ; border block db 6 ; warps - warp 12, 9, 0, DIGLETTS_CAVE_EXIT - warp 3, 11, 1, VIRIDIAN_FOREST_EXIT - warp 15, 19, 0, ROUTE_2_HOUSE + warp 12, 9, 0, DIGLETTS_CAVE_ROUTE_2 + warp 3, 11, 1, VIRIDIAN_FOREST_NORTH_GATE + warp 15, 19, 0, ROUTE_2_TRADE_HOUSE warp 16, 35, 1, ROUTE_2_GATE warp 15, 39, 2, ROUTE_2_GATE - warp 3, 43, 2, VIRIDIAN_FOREST_ENTRANCE + warp 3, 43, 2, VIRIDIAN_FOREST_SOUTH_GATE db 2 ; signs sign 5, 65, 3 ; Route2Text3 @@ -18,12 +18,12 @@ Route2Object: object SPRITE_BALL, 13, 45, STAY, NONE, 2, HP_UP ; warp-to - warp_to 12, 9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_EXIT - warp_to 3, 11, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_EXIT - warp_to 15, 19, ROUTE_2_WIDTH ; ROUTE_2_HOUSE + warp_to 12, 9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_ROUTE_2 + warp_to 3, 11, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE + warp_to 15, 19, ROUTE_2_WIDTH ; ROUTE_2_TRADE_HOUSE warp_to 16, 35, ROUTE_2_WIDTH ; ROUTE_2_GATE warp_to 15, 39, ROUTE_2_WIDTH ; ROUTE_2_GATE - warp_to 3, 43, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_ENTRANCE + warp_to 3, 43, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE ; unused warp_to 2, 7, 4 diff --git a/data/mapObjects/route20.asm b/data/mapObjects/Route20.asm similarity index 80% rename from data/mapObjects/route20.asm rename to data/mapObjects/Route20.asm index 5f4d5647..7bceef97 100755 --- a/data/mapObjects/route20.asm +++ b/data/mapObjects/Route20.asm @@ -1,9 +1,9 @@ -Route20Object: +Route20_Object: db $43 ; border block db 2 ; warps - warp 48, 5, 0, SEAFOAM_ISLANDS_1 - warp 58, 9, 2, SEAFOAM_ISLANDS_1 + warp 48, 5, 0, SEAFOAM_ISLANDS_1F + warp 58, 9, 2, SEAFOAM_ISLANDS_1F db 2 ; signs sign 51, 7, 11 ; Route20Text11 @@ -22,5 +22,5 @@ Route20Object: object SPRITE_SWIMMER, 15, 8, STAY, UP, 10, OPP_BEAUTY, 8 ; warp-to - warp_to 48, 5, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1 - warp_to 58, 9, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1 + warp_to 48, 5, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1F + warp_to 58, 9, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1F diff --git a/data/mapObjects/route21.asm b/data/mapObjects/Route21.asm similarity index 97% rename from data/mapObjects/route21.asm rename to data/mapObjects/Route21.asm index bb2409ce..b7759b59 100755 --- a/data/mapObjects/route21.asm +++ b/data/mapObjects/Route21.asm @@ -1,4 +1,4 @@ -Route21Object: +Route21_Object: db $43 ; border block db 0 ; warps diff --git a/data/mapObjects/route22.asm b/data/mapObjects/Route22.asm similarity index 94% rename from data/mapObjects/route22.asm rename to data/mapObjects/Route22.asm index e91eb792..56e759fd 100755 --- a/data/mapObjects/route22.asm +++ b/data/mapObjects/Route22.asm @@ -1,4 +1,4 @@ -Route22Object: +Route22_Object: db $2c ; border block db 1 ; warps diff --git a/data/mapObjects/route22gate.asm b/data/mapObjects/Route22Gate.asm similarity index 94% rename from data/mapObjects/route22gate.asm rename to data/mapObjects/Route22Gate.asm index aa9512c6..3f693c7f 100755 --- a/data/mapObjects/route22gate.asm +++ b/data/mapObjects/Route22Gate.asm @@ -1,4 +1,4 @@ -Route22GateObject: +Route22Gate_Object: db $a ; border block db 4 ; warps diff --git a/data/mapObjects/route23.asm b/data/mapObjects/Route23.asm similarity index 78% rename from data/mapObjects/route23.asm rename to data/mapObjects/Route23.asm index 2fd3e3d7..b510c285 100755 --- a/data/mapObjects/route23.asm +++ b/data/mapObjects/Route23.asm @@ -1,11 +1,11 @@ -Route23Object: +Route23_Object: db $f ; border block db 4 ; warps warp 7, 139, 2, ROUTE_22_GATE warp 8, 139, 3, ROUTE_22_GATE - warp 4, 31, 0, VICTORY_ROAD_1 - warp 14, 31, 1, VICTORY_ROAD_2 + warp 4, 31, 0, VICTORY_ROAD_1F + warp 14, 31, 1, VICTORY_ROAD_2F db 1 ; signs sign 3, 33, 8 ; Route23Text8 @@ -22,5 +22,5 @@ Route23Object: ; warp-to warp_to 7, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE warp_to 8, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE - warp_to 4, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_1 - warp_to 14, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_2 + warp_to 4, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_1F + warp_to 14, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_2F diff --git a/data/mapObjects/route24.asm b/data/mapObjects/Route24.asm similarity index 97% rename from data/mapObjects/route24.asm rename to data/mapObjects/Route24.asm index 0fcc1d7b..8ef0d2b9 100755 --- a/data/mapObjects/route24.asm +++ b/data/mapObjects/Route24.asm @@ -1,4 +1,4 @@ -Route24Object: +Route24_Object: db $2c ; border block db 0 ; warps diff --git a/data/mapObjects/route25.asm b/data/mapObjects/Route25.asm similarity index 98% rename from data/mapObjects/route25.asm rename to data/mapObjects/Route25.asm index 3ba5fbdb..a85f85ca 100755 --- a/data/mapObjects/route25.asm +++ b/data/mapObjects/Route25.asm @@ -1,4 +1,4 @@ -Route25Object: +Route25_Object: db $2c ; border block db 1 ; warps diff --git a/data/mapObjects/route2gate.asm b/data/mapObjects/Route2Gate.asm similarity index 95% rename from data/mapObjects/route2gate.asm rename to data/mapObjects/Route2Gate.asm index 714b8ee6..a7feb780 100755 --- a/data/mapObjects/route2gate.asm +++ b/data/mapObjects/Route2Gate.asm @@ -1,4 +1,4 @@ -Route2GateObject: +Route2Gate_Object: db $a ; border block db 4 ; warps diff --git a/data/mapObjects/route2house.asm b/data/mapObjects/Route2TradeHouse.asm similarity index 68% rename from data/mapObjects/route2house.asm rename to data/mapObjects/Route2TradeHouse.asm index b27b65ef..89ece3ea 100755 --- a/data/mapObjects/route2house.asm +++ b/data/mapObjects/Route2TradeHouse.asm @@ -1,4 +1,4 @@ -Route2HouseObject: +Route2TradeHouse_Object: db $a ; border block db 2 ; warps @@ -12,5 +12,5 @@ Route2HouseObject: object SPRITE_GAMEBOY_KID_COPY, 4, 1, STAY, DOWN, 2 ; person ; warp-to - warp_to 2, 7, ROUTE_2_HOUSE_WIDTH - warp_to 3, 7, ROUTE_2_HOUSE_WIDTH + warp_to 2, 7, ROUTE_2_TRADE_HOUSE_WIDTH + warp_to 3, 7, ROUTE_2_TRADE_HOUSE_WIDTH diff --git a/data/mapObjects/route3.asm b/data/mapObjects/Route3.asm similarity index 97% rename from data/mapObjects/route3.asm rename to data/mapObjects/Route3.asm index 422fa29b..372ea6cf 100755 --- a/data/mapObjects/route3.asm +++ b/data/mapObjects/Route3.asm @@ -1,4 +1,4 @@ -Route3Object: +Route3_Object: db $2c ; border block db 0 ; warps diff --git a/data/mapObjects/route4.asm b/data/mapObjects/Route4.asm similarity index 72% rename from data/mapObjects/route4.asm rename to data/mapObjects/Route4.asm index 7d09c28a..4ab88f8f 100755 --- a/data/mapObjects/route4.asm +++ b/data/mapObjects/Route4.asm @@ -1,10 +1,10 @@ -Route4Object: +Route4_Object: db $2c ; border block db 3 ; warps warp 11, 5, 0, MT_MOON_POKECENTER - warp 18, 5, 0, MT_MOON_1 - warp 24, 5, 7, MT_MOON_2 + warp 18, 5, 0, MT_MOON_1F + warp 24, 5, 7, MT_MOON_B1F db 3 ; signs sign 12, 5, 4 ; PokeCenterSignText @@ -18,5 +18,5 @@ Route4Object: ; warp-to warp_to 11, 5, ROUTE_4_WIDTH ; MT_MOON_POKECENTER - warp_to 18, 5, ROUTE_4_WIDTH ; MT_MOON_1 - warp_to 24, 5, ROUTE_4_WIDTH ; MT_MOON_2 + warp_to 18, 5, ROUTE_4_WIDTH ; MT_MOON_1F + warp_to 24, 5, ROUTE_4_WIDTH ; MT_MOON_B1F diff --git a/data/mapObjects/route5.asm b/data/mapObjects/Route5.asm similarity index 65% rename from data/mapObjects/route5.asm rename to data/mapObjects/Route5.asm index 62aa6431..df2c8c03 100755 --- a/data/mapObjects/route5.asm +++ b/data/mapObjects/Route5.asm @@ -1,12 +1,12 @@ -Route5Object: +Route5_Object: db $a ; border block db 5 ; warps warp 10, 29, 3, ROUTE_5_GATE warp 9, 29, 2, ROUTE_5_GATE warp 10, 33, 0, ROUTE_5_GATE - warp 17, 27, 0, PATH_ENTRANCE_ROUTE_5 - warp 10, 21, 0, DAYCAREM + warp 17, 27, 0, UNDERGROUND_PATH_ROUTE_5 + warp 10, 21, 0, DAYCARE db 1 ; signs sign 17, 29, 1 ; Route5Text1 @@ -17,5 +17,5 @@ Route5Object: warp_to 10, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE warp_to 9, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE warp_to 10, 33, ROUTE_5_WIDTH ; ROUTE_5_GATE - warp_to 17, 27, ROUTE_5_WIDTH ; PATH_ENTRANCE_ROUTE_5 - warp_to 10, 21, ROUTE_5_WIDTH ; DAYCAREM + warp_to 17, 27, ROUTE_5_WIDTH ; UNDERGROUND_PATH_ROUTE_5 + warp_to 10, 21, ROUTE_5_WIDTH ; DAYCARE diff --git a/data/mapObjects/route5gate.asm b/data/mapObjects/Route5Gate.asm similarity index 94% rename from data/mapObjects/route5gate.asm rename to data/mapObjects/Route5Gate.asm index 8b230942..e0e06a1d 100755 --- a/data/mapObjects/route5gate.asm +++ b/data/mapObjects/Route5Gate.asm @@ -1,4 +1,4 @@ -Route5GateObject: +Route5Gate_Object: db $a ; border block db 4 ; warps diff --git a/data/mapObjects/route6.asm b/data/mapObjects/Route6.asm similarity index 86% rename from data/mapObjects/route6.asm rename to data/mapObjects/Route6.asm index e0eea85b..fc2d7e24 100755 --- a/data/mapObjects/route6.asm +++ b/data/mapObjects/Route6.asm @@ -1,11 +1,11 @@ -Route6Object: +Route6_Object: db $f ; border block db 4 ; warps warp 9, 1, 2, ROUTE_6_GATE warp 10, 1, 2, ROUTE_6_GATE warp 10, 7, 0, ROUTE_6_GATE - warp 17, 13, 0, PATH_ENTRANCE_ROUTE_6 + warp 17, 13, 0, UNDERGROUND_PATH_ROUTE_6 db 1 ; signs sign 19, 15, 7 ; Route6Text7 @@ -22,4 +22,4 @@ Route6Object: warp_to 9, 1, ROUTE_6_WIDTH ; ROUTE_6_GATE warp_to 10, 1, ROUTE_6_WIDTH ; ROUTE_6_GATE warp_to 10, 7, ROUTE_6_WIDTH ; ROUTE_6_GATE - warp_to 17, 13, ROUTE_6_WIDTH ; PATH_ENTRANCE_ROUTE_6 + warp_to 17, 13, ROUTE_6_WIDTH ; UNDERGROUND_PATH_ROUTE_6 diff --git a/data/mapObjects/route6gate.asm b/data/mapObjects/Route6Gate.asm similarity index 94% rename from data/mapObjects/route6gate.asm rename to data/mapObjects/Route6Gate.asm index e3b7b2b8..8ed96d04 100755 --- a/data/mapObjects/route6gate.asm +++ b/data/mapObjects/Route6Gate.asm @@ -1,4 +1,4 @@ -Route6GateObject: +Route6Gate_Object: db $a ; border block db 4 ; warps diff --git a/data/mapObjects/route7.asm b/data/mapObjects/Route7.asm similarity index 78% rename from data/mapObjects/route7.asm rename to data/mapObjects/Route7.asm index d32e6019..182904ef 100755 --- a/data/mapObjects/route7.asm +++ b/data/mapObjects/Route7.asm @@ -1,4 +1,4 @@ -Route7Object: +Route7_Object: db $f ; border block db 5 ; warps @@ -6,7 +6,7 @@ Route7Object: warp 18, 10, 3, ROUTE_7_GATE warp 11, 9, 0, ROUTE_7_GATE warp 11, 10, 1, ROUTE_7_GATE - warp 5, 13, 0, PATH_ENTRANCE_ROUTE_7 + warp 5, 13, 0, UNDERGROUND_PATH_ROUTE_7 db 1 ; signs sign 3, 13, 1 ; Route7Text1 @@ -18,4 +18,4 @@ Route7Object: warp_to 18, 10, ROUTE_7_WIDTH ; ROUTE_7_GATE warp_to 11, 9, ROUTE_7_WIDTH ; ROUTE_7_GATE warp_to 11, 10, ROUTE_7_WIDTH ; ROUTE_7_GATE - warp_to 5, 13, ROUTE_7_WIDTH ; PATH_ENTRANCE_ROUTE_7 + warp_to 5, 13, ROUTE_7_WIDTH ; UNDERGROUND_PATH_ROUTE_7 diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/Route7Gate.asm similarity index 94% rename from data/mapObjects/route7gate.asm rename to data/mapObjects/Route7Gate.asm index 0b726fd3..7f1afe0a 100755 --- a/data/mapObjects/route7gate.asm +++ b/data/mapObjects/Route7Gate.asm @@ -1,4 +1,4 @@ -Route7GateObject: +Route7Gate_Object: db $a ; border block db 4 ; warps diff --git a/data/mapObjects/route8.asm b/data/mapObjects/Route8.asm similarity index 89% rename from data/mapObjects/route8.asm rename to data/mapObjects/Route8.asm index dc7580fc..137d70a0 100755 --- a/data/mapObjects/route8.asm +++ b/data/mapObjects/Route8.asm @@ -1,4 +1,4 @@ -Route8Object: +Route8_Object: db $2c ; border block db 5 ; warps @@ -6,7 +6,7 @@ Route8Object: warp 1, 10, 1, ROUTE_8_GATE warp 8, 9, 2, ROUTE_8_GATE warp 8, 10, 3, ROUTE_8_GATE - warp 13, 3, 0, PATH_ENTRANCE_ROUTE_8 + warp 13, 3, 0, UNDERGROUND_PATH_ROUTE_8 db 1 ; signs sign 17, 3, 10 ; Route8Text10 @@ -27,4 +27,4 @@ Route8Object: warp_to 1, 10, ROUTE_8_WIDTH ; ROUTE_8_GATE warp_to 8, 9, ROUTE_8_WIDTH ; ROUTE_8_GATE warp_to 8, 10, ROUTE_8_WIDTH ; ROUTE_8_GATE - warp_to 13, 3, ROUTE_8_WIDTH ; PATH_ENTRANCE_ROUTE_8 + warp_to 13, 3, ROUTE_8_WIDTH ; UNDERGROUND_PATH_ROUTE_8 diff --git a/data/mapObjects/route8gate.asm b/data/mapObjects/Route8Gate.asm similarity index 94% rename from data/mapObjects/route8gate.asm rename to data/mapObjects/Route8Gate.asm index ac286aa0..3bba95a0 100755 --- a/data/mapObjects/route8gate.asm +++ b/data/mapObjects/Route8Gate.asm @@ -1,4 +1,4 @@ -Route8GateObject: +Route8Gate_Object: db $a ; border block db 4 ; warps diff --git a/data/mapObjects/route9.asm b/data/mapObjects/Route9.asm similarity index 98% rename from data/mapObjects/route9.asm rename to data/mapObjects/Route9.asm index ab3ceefe..a991c0c7 100755 --- a/data/mapObjects/route9.asm +++ b/data/mapObjects/Route9.asm @@ -1,4 +1,4 @@ -Route9Object: +Route9_Object: db $2c ; border block db 0 ; warps diff --git a/data/mapObjects/SSAnne1F.asm b/data/mapObjects/SSAnne1F.asm new file mode 100755 index 00000000..3e454f06 --- /dev/null +++ b/data/mapObjects/SSAnne1F.asm @@ -0,0 +1,34 @@ +SSAnne1F_Object: + db $c ; border block + + db 11 ; warps + warp 26, 0, 1, VERMILION_DOCK + warp 27, 0, 1, VERMILION_DOCK + warp 31, 8, 0, SS_ANNE_1F_ROOMS + warp 23, 8, 1, SS_ANNE_1F_ROOMS + warp 19, 8, 2, SS_ANNE_1F_ROOMS + warp 15, 8, 3, SS_ANNE_1F_ROOMS + warp 11, 8, 4, SS_ANNE_1F_ROOMS + warp 7, 8, 5, SS_ANNE_1F_ROOMS + warp 2, 6, 6, SS_ANNE_2F + warp 37, 15, 5, SS_ANNE_B1F + warp 3, 16, 0, SS_ANNE_KITCHEN + + db 0 ; signs + + db 2 ; objects + object SPRITE_WAITER, 12, 6, WALK, 2, 1 ; person + object SPRITE_SAILOR, 27, 5, STAY, NONE, 2 ; person + + ; warp-to + warp_to 26, 0, SS_ANNE_1F_WIDTH ; VERMILION_DOCK + warp_to 27, 0, SS_ANNE_1F_WIDTH ; VERMILION_DOCK + warp_to 31, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS + warp_to 23, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS + warp_to 19, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS + warp_to 15, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS + warp_to 11, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS + warp_to 7, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS + warp_to 2, 6, SS_ANNE_1F_WIDTH ; SS_ANNE_2F + warp_to 37, 15, SS_ANNE_1F_WIDTH ; SS_ANNE_B1F + warp_to 3, 16, SS_ANNE_1F_WIDTH ; SS_ANNE_KITCHEN diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/SSAnne1FRooms.asm similarity index 58% rename from data/mapObjects/ssanne8.asm rename to data/mapObjects/SSAnne1FRooms.asm index d26921bd..617d2a55 100755 --- a/data/mapObjects/ssanne8.asm +++ b/data/mapObjects/SSAnne1FRooms.asm @@ -1,13 +1,13 @@ -SSAnne8Object: +SSAnne1FRooms_Object: db $c ; border block db 6 ; warps - warp 0, 0, 2, SS_ANNE_1 - warp 10, 0, 3, SS_ANNE_1 - warp 20, 0, 4, SS_ANNE_1 - warp 0, 10, 5, SS_ANNE_1 - warp 10, 10, 6, SS_ANNE_1 - warp 20, 10, 7, SS_ANNE_1 + warp 0, 0, 2, SS_ANNE_1F + warp 10, 0, 3, SS_ANNE_1F + warp 20, 0, 4, SS_ANNE_1F + warp 0, 10, 5, SS_ANNE_1F + warp 10, 10, 6, SS_ANNE_1F + warp 20, 10, 7, SS_ANNE_1F db 0 ; signs @@ -25,9 +25,9 @@ SSAnne8Object: object SPRITE_GENTLEMAN, 21, 13, WALK, 2, 11 ; person ; warp-to - warp_to 0, 0, SS_ANNE_8_WIDTH ; SS_ANNE_1 - warp_to 10, 0, SS_ANNE_8_WIDTH ; SS_ANNE_1 - warp_to 20, 0, SS_ANNE_8_WIDTH ; SS_ANNE_1 - warp_to 0, 10, SS_ANNE_8_WIDTH ; SS_ANNE_1 - warp_to 10, 10, SS_ANNE_8_WIDTH ; SS_ANNE_1 - warp_to 20, 10, SS_ANNE_8_WIDTH ; SS_ANNE_1 + warp_to 0, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F + warp_to 10, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F + warp_to 20, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F + warp_to 0, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F + warp_to 10, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F + warp_to 20, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F diff --git a/data/mapObjects/SSAnne2F.asm b/data/mapObjects/SSAnne2F.asm new file mode 100755 index 00000000..6abd5ac4 --- /dev/null +++ b/data/mapObjects/SSAnne2F.asm @@ -0,0 +1,30 @@ +SSAnne2F_Object: + db $c ; border block + + db 9 ; warps + warp 9, 11, 0, SS_ANNE_2F_ROOMS + warp 13, 11, 2, SS_ANNE_2F_ROOMS + warp 17, 11, 4, SS_ANNE_2F_ROOMS + warp 21, 11, 6, SS_ANNE_2F_ROOMS + warp 25, 11, 8, SS_ANNE_2F_ROOMS + warp 29, 11, 10, SS_ANNE_2F_ROOMS + warp 2, 4, 8, SS_ANNE_1F + warp 2, 12, 1, SS_ANNE_3F + warp 36, 4, 0, SS_ANNE_CAPTAINS_ROOM + + db 0 ; signs + + db 2 ; objects + object SPRITE_WAITER, 3, 7, WALK, 1, 1 ; person + object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_SONY1, 1 + + ; warp-to + warp_to 9, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS + warp_to 13, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS + warp_to 17, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS + warp_to 21, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS + warp_to 25, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS + warp_to 29, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS + warp_to 2, 4, SS_ANNE_2F_WIDTH ; SS_ANNE_1F + warp_to 2, 12, SS_ANNE_2F_WIDTH ; SS_ANNE_3F + warp_to 36, 4, SS_ANNE_2F_WIDTH ; SS_ANNE_CAPTAINS_ROOM diff --git a/data/mapObjects/SSAnne2FRooms.asm b/data/mapObjects/SSAnne2FRooms.asm new file mode 100755 index 00000000..ebb053a8 --- /dev/null +++ b/data/mapObjects/SSAnne2FRooms.asm @@ -0,0 +1,47 @@ +SSAnne2FRooms_Object: + db $c ; border block + + db 12 ; warps + warp 2, 5, 0, SS_ANNE_2F + warp 3, 5, 0, SS_ANNE_2F + warp 12, 5, 1, SS_ANNE_2F + warp 13, 5, 1, SS_ANNE_2F + warp 22, 5, 2, SS_ANNE_2F + warp 23, 5, 2, SS_ANNE_2F + warp 2, 15, 3, SS_ANNE_2F + warp 3, 15, 3, SS_ANNE_2F + warp 12, 15, 4, SS_ANNE_2F + warp 13, 15, 4, SS_ANNE_2F + warp 22, 15, 5, SS_ANNE_2F + warp 23, 15, 5, SS_ANNE_2F + + db 0 ; signs + + db 13 ; objects + object SPRITE_GENTLEMAN, 10, 2, STAY, RIGHT, 1, OPP_GENTLEMAN, 3 + object SPRITE_FISHER2, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1 + object SPRITE_GENTLEMAN, 0, 14, STAY, RIGHT, 3, OPP_GENTLEMAN, 5 + object SPRITE_LASS, 2, 11, STAY, DOWN, 4, OPP_LASS, 12 + object SPRITE_GENTLEMAN, 1, 2, STAY, DOWN, 5 ; person + object SPRITE_BALL, 12, 1, STAY, NONE, 6, MAX_ETHER + object SPRITE_GENTLEMAN, 21, 2, STAY, DOWN, 7 ; person + object SPRITE_OLD_PERSON, 22, 1, STAY, DOWN, 8 ; person + object SPRITE_BALL, 0, 12, STAY, NONE, 9, RARE_CANDY + object SPRITE_GENTLEMAN, 12, 12, STAY, DOWN, 10 ; person + object SPRITE_YOUNG_BOY, 11, 14, STAY, NONE, 11 ; person + object SPRITE_BRUNETTE_GIRL, 22, 12, STAY, LEFT, 12 ; person + object SPRITE_FOULARD_WOMAN, 20, 12, STAY, RIGHT, 13 ; person + + ; warp-to + warp_to 2, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + warp_to 3, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + warp_to 12, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + warp_to 13, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + warp_to 22, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + warp_to 23, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + warp_to 2, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + warp_to 3, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + warp_to 12, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + warp_to 13, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + warp_to 22, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + warp_to 23, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F diff --git a/data/mapObjects/SSAnne3F.asm b/data/mapObjects/SSAnne3F.asm new file mode 100755 index 00000000..f0bfc17b --- /dev/null +++ b/data/mapObjects/SSAnne3F.asm @@ -0,0 +1,15 @@ +SSAnne3F_Object: + db $c ; border block + + db 2 ; warps + warp 0, 3, 0, SS_ANNE_BOW + warp 19, 3, 7, SS_ANNE_2F + + db 0 ; signs + + db 1 ; objects + object SPRITE_SAILOR, 9, 3, WALK, 2, 1 ; person + + ; warp-to + warp_to 0, 3, SS_ANNE_3F_WIDTH ; SS_ANNE_BOW + warp_to 19, 3, SS_ANNE_3F_WIDTH ; SS_ANNE_2F diff --git a/data/mapObjects/SSAnneB1F.asm b/data/mapObjects/SSAnneB1F.asm new file mode 100755 index 00000000..fe54ea24 --- /dev/null +++ b/data/mapObjects/SSAnneB1F.asm @@ -0,0 +1,22 @@ +SSAnneB1F_Object: + db $c ; border block + + db 6 ; warps + warp 23, 3, 8, SS_ANNE_B1F_ROOMS + warp 19, 3, 6, SS_ANNE_B1F_ROOMS + warp 15, 3, 4, SS_ANNE_B1F_ROOMS + warp 11, 3, 2, SS_ANNE_B1F_ROOMS + warp 7, 3, 0, SS_ANNE_B1F_ROOMS + warp 27, 5, 9, SS_ANNE_1F + + db 0 ; signs + + db 0 ; objects + + ; warp-to + warp_to 23, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS + warp_to 19, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS + warp_to 15, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS + warp_to 11, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS + warp_to 7, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS + warp_to 27, 5, SS_ANNE_B1F_WIDTH ; SS_ANNE_1F diff --git a/data/mapObjects/SSAnneB1FRooms.asm b/data/mapObjects/SSAnneB1FRooms.asm new file mode 100755 index 00000000..1d31b89c --- /dev/null +++ b/data/mapObjects/SSAnneB1FRooms.asm @@ -0,0 +1,41 @@ +SSAnneB1FRooms_Object: + db $c ; border block + + db 10 ; warps + warp 2, 5, 4, SS_ANNE_B1F + warp 3, 5, 4, SS_ANNE_B1F + warp 12, 5, 3, SS_ANNE_B1F + warp 13, 5, 3, SS_ANNE_B1F + warp 22, 5, 2, SS_ANNE_B1F + warp 23, 5, 2, SS_ANNE_B1F + warp 2, 15, 1, SS_ANNE_B1F + warp 3, 15, 1, SS_ANNE_B1F + warp 12, 15, 0, SS_ANNE_B1F + warp 13, 15, 0, SS_ANNE_B1F + + db 0 ; signs + + db 11 ; objects + object SPRITE_SAILOR, 0, 13, STAY, DOWN, 1, OPP_SAILOR, 3 + object SPRITE_SAILOR, 2, 11, STAY, DOWN, 2, OPP_SAILOR, 4 + object SPRITE_SAILOR, 12, 3, STAY, LEFT, 3, OPP_SAILOR, 5 + object SPRITE_SAILOR, 22, 2, STAY, DOWN, 4, OPP_SAILOR, 6 + object SPRITE_SAILOR, 0, 2, STAY, RIGHT, 5, OPP_SAILOR, 7 + object SPRITE_FISHER2, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2 + object SPRITE_BLACK_HAIR_BOY_2, 10, 13, STAY, RIGHT, 7 ; person + object SPRITE_SLOWBRO, 11, 12, STAY, NONE, 8 ; person + object SPRITE_BALL, 20, 2, STAY, NONE, 9, ETHER + object SPRITE_BALL, 10, 2, STAY, NONE, 10, TM_44 + object SPRITE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION + + ; warp-to + warp_to 2, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F + warp_to 3, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F + warp_to 12, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F + warp_to 13, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F + warp_to 22, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F + warp_to 23, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F + warp_to 2, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F + warp_to 3, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F + warp_to 12, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F + warp_to 13, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/SSAnneBow.asm similarity index 69% rename from data/mapObjects/ssanne5.asm rename to data/mapObjects/SSAnneBow.asm index 106557be..8873c8f8 100755 --- a/data/mapObjects/ssanne5.asm +++ b/data/mapObjects/SSAnneBow.asm @@ -1,9 +1,9 @@ -SSAnne5Object: +SSAnneBow_Object: db $23 ; border block db 2 ; warps - warp 13, 6, 0, SS_ANNE_3 - warp 13, 7, 0, SS_ANNE_3 + warp 13, 6, 0, SS_ANNE_3F + warp 13, 7, 0, SS_ANNE_3F db 0 ; signs @@ -15,5 +15,5 @@ SSAnne5Object: object SPRITE_SAILOR, 10, 8, STAY, UP, 5, OPP_SAILOR, 2 ; warp-to - warp_to 13, 6, SS_ANNE_5_WIDTH ; SS_ANNE_3 - warp_to 13, 7, SS_ANNE_5_WIDTH ; SS_ANNE_3 + warp_to 13, 6, SS_ANNE_BOW_WIDTH ; SS_ANNE_3F + warp_to 13, 7, SS_ANNE_BOW_WIDTH ; SS_ANNE_3F diff --git a/data/mapObjects/ssanne7.asm b/data/mapObjects/SSAnneCaptainsRoom.asm similarity index 63% rename from data/mapObjects/ssanne7.asm rename to data/mapObjects/SSAnneCaptainsRoom.asm index 7657170e..545656cc 100755 --- a/data/mapObjects/ssanne7.asm +++ b/data/mapObjects/SSAnneCaptainsRoom.asm @@ -1,8 +1,8 @@ -SSAnne7Object: +SSAnneCaptainsRoom_Object: db $c ; border block db 1 ; warps - warp 0, 7, 8, SS_ANNE_2 + warp 0, 7, 8, SS_ANNE_2F db 2 ; signs sign 4, 1, 2 ; SSAnne7Text2 @@ -12,4 +12,4 @@ SSAnne7Object: object SPRITE_SS_CAPTAIN, 4, 2, STAY, UP, 1 ; person ; warp-to - warp_to 0, 7, SS_ANNE_7_WIDTH ; SS_ANNE_2 + warp_to 0, 7, SS_ANNE_CAPTAINS_ROOM_WIDTH ; SS_ANNE_2F diff --git a/data/mapObjects/ssanne6.asm b/data/mapObjects/SSAnneKitchen.asm similarity index 81% rename from data/mapObjects/ssanne6.asm rename to data/mapObjects/SSAnneKitchen.asm index a25fe9b3..b5771e68 100755 --- a/data/mapObjects/ssanne6.asm +++ b/data/mapObjects/SSAnneKitchen.asm @@ -1,8 +1,8 @@ -SSAnne6Object: +SSAnneKitchen_Object: db $c ; border block db 1 ; warps - warp 6, 0, 10, SS_ANNE_1 + warp 6, 0, 10, SS_ANNE_1F db 0 ; signs @@ -16,4 +16,4 @@ SSAnne6Object: object SPRITE_COOK, 11, 13, STAY, UP, 7 ; person ; warp-to - warp_to 6, 0, SS_ANNE_6_WIDTH ; SS_ANNE_1 + warp_to 6, 0, SS_ANNE_KITCHEN_WIDTH ; SS_ANNE_1F diff --git a/data/mapObjects/safarizonecenter.asm b/data/mapObjects/SafariZoneCenter.asm similarity index 69% rename from data/mapObjects/safarizonecenter.asm rename to data/mapObjects/SafariZoneCenter.asm index 550f9aa4..e54cec74 100755 --- a/data/mapObjects/safarizonecenter.asm +++ b/data/mapObjects/SafariZoneCenter.asm @@ -1,16 +1,16 @@ -SafariZoneCenterObject: +SafariZoneCenter_Object: db $0 ; border block db 9 ; warps - warp 14, 25, 2, SAFARI_ZONE_ENTRANCE - warp 15, 25, 3, SAFARI_ZONE_ENTRANCE + warp 14, 25, 2, SAFARI_ZONE_GATE + warp 15, 25, 3, SAFARI_ZONE_GATE warp 0, 10, 4, SAFARI_ZONE_WEST warp 0, 11, 5, SAFARI_ZONE_WEST warp 14, 0, 4, SAFARI_ZONE_NORTH warp 15, 0, 5, SAFARI_ZONE_NORTH warp 29, 10, 2, SAFARI_ZONE_EAST warp 29, 11, 3, SAFARI_ZONE_EAST - warp 17, 19, 0, SAFARI_ZONE_REST_HOUSE_1 + warp 17, 19, 0, SAFARI_ZONE_CENTER_REST_HOUSE db 2 ; signs sign 18, 20, 2 ; SafariZoneCenterText2 @@ -20,12 +20,12 @@ SafariZoneCenterObject: object SPRITE_BALL, 14, 10, STAY, NONE, 1, NUGGET ; warp-to - warp_to 14, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_ENTRANCE - warp_to 15, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_ENTRANCE + warp_to 14, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_GATE + warp_to 15, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_GATE warp_to 0, 10, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST warp_to 0, 11, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST warp_to 14, 0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH warp_to 15, 0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH warp_to 29, 10, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST warp_to 29, 11, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST - warp_to 17, 19, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_REST_HOUSE_1 + warp_to 17, 19, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_CENTER_REST_HOUSE diff --git a/data/mapObjects/safarizoneresthouse1.asm b/data/mapObjects/SafariZoneCenterRestHouse.asm similarity index 58% rename from data/mapObjects/safarizoneresthouse1.asm rename to data/mapObjects/SafariZoneCenterRestHouse.asm index 031debec..9eda9970 100755 --- a/data/mapObjects/safarizoneresthouse1.asm +++ b/data/mapObjects/SafariZoneCenterRestHouse.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse1Object: +SafariZoneCenterRestHouse_Object: db $a ; border block db 2 ; warps @@ -12,5 +12,5 @@ SafariZoneRestHouse1Object: object SPRITE_OAK_AIDE, 1, 4, WALK, 1, 2 ; person ; warp-to - warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; SAFARI_ZONE_CENTER - warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; SAFARI_ZONE_CENTER + warp_to 2, 7, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; SAFARI_ZONE_CENTER + warp_to 3, 7, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; SAFARI_ZONE_CENTER diff --git a/data/mapObjects/safarizoneeast.asm b/data/mapObjects/SafariZoneEast.asm similarity index 85% rename from data/mapObjects/safarizoneeast.asm rename to data/mapObjects/SafariZoneEast.asm index 53553161..df612ea9 100755 --- a/data/mapObjects/safarizoneeast.asm +++ b/data/mapObjects/SafariZoneEast.asm @@ -1,4 +1,4 @@ -SafariZoneEastObject: +SafariZoneEast_Object: db $0 ; border block db 5 ; warps @@ -6,7 +6,7 @@ SafariZoneEastObject: warp 0, 5, 7, SAFARI_ZONE_NORTH warp 0, 22, 6, SAFARI_ZONE_CENTER warp 0, 23, 6, SAFARI_ZONE_CENTER - warp 25, 9, 0, SAFARI_ZONE_REST_HOUSE_3 + warp 25, 9, 0, SAFARI_ZONE_EAST_REST_HOUSE db 3 ; signs sign 26, 10, 5 ; SafariZoneEastText5 @@ -24,4 +24,4 @@ SafariZoneEastObject: warp_to 0, 5, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH warp_to 0, 22, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER warp_to 0, 23, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER - warp_to 25, 9, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_REST_HOUSE_3 + warp_to 25, 9, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_EAST_REST_HOUSE diff --git a/data/mapObjects/safarizoneresthouse3.asm b/data/mapObjects/SafariZoneEastRestHouse.asm similarity index 64% rename from data/mapObjects/safarizoneresthouse3.asm rename to data/mapObjects/SafariZoneEastRestHouse.asm index 00623953..e7c68343 100755 --- a/data/mapObjects/safarizoneresthouse3.asm +++ b/data/mapObjects/SafariZoneEastRestHouse.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse3Object: +SafariZoneEastRestHouse_Object: db $a ; border block db 2 ; warps @@ -13,5 +13,5 @@ SafariZoneRestHouse3Object: object SPRITE_LAPRAS_GIVER, 5, 2, STAY, NONE, 3 ; person ; warp-to - warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; SAFARI_ZONE_EAST - warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; SAFARI_ZONE_EAST + warp_to 2, 7, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; SAFARI_ZONE_EAST + warp_to 3, 7, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; SAFARI_ZONE_EAST diff --git a/data/mapObjects/safarizoneentrance.asm b/data/mapObjects/SafariZoneGate.asm similarity index 56% rename from data/mapObjects/safarizoneentrance.asm rename to data/mapObjects/SafariZoneGate.asm index 5a3379c7..6749b45b 100755 --- a/data/mapObjects/safarizoneentrance.asm +++ b/data/mapObjects/SafariZoneGate.asm @@ -1,4 +1,4 @@ -SafariZoneEntranceObject: +SafariZoneGate_Object: db $a ; border block db 4 ; warps @@ -14,7 +14,7 @@ SafariZoneEntranceObject: object SPRITE_WHITE_PLAYER, 1, 4, STAY, RIGHT, 2 ; person ; warp-to - warp_to 3, 5, SAFARI_ZONE_ENTRANCE_WIDTH - warp_to 4, 5, SAFARI_ZONE_ENTRANCE_WIDTH - warp_to 3, 0, SAFARI_ZONE_ENTRANCE_WIDTH ; SAFARI_ZONE_CENTER - warp_to 4, 0, SAFARI_ZONE_ENTRANCE_WIDTH ; SAFARI_ZONE_CENTER + warp_to 3, 5, SAFARI_ZONE_GATE_WIDTH + warp_to 4, 5, SAFARI_ZONE_GATE_WIDTH + warp_to 3, 0, SAFARI_ZONE_GATE_WIDTH ; SAFARI_ZONE_CENTER + warp_to 4, 0, SAFARI_ZONE_GATE_WIDTH ; SAFARI_ZONE_CENTER diff --git a/data/mapObjects/safarizonenorth.asm b/data/mapObjects/SafariZoneNorth.asm similarity index 88% rename from data/mapObjects/safarizonenorth.asm rename to data/mapObjects/SafariZoneNorth.asm index 6cbe51f6..9eda7b4b 100755 --- a/data/mapObjects/safarizonenorth.asm +++ b/data/mapObjects/SafariZoneNorth.asm @@ -1,4 +1,4 @@ -SafariZoneNorthObject: +SafariZoneNorth_Object: db $0 ; border block db 9 ; warps @@ -10,7 +10,7 @@ SafariZoneNorthObject: warp 21, 35, 5, SAFARI_ZONE_CENTER warp 39, 30, 0, SAFARI_ZONE_EAST warp 39, 31, 1, SAFARI_ZONE_EAST - warp 35, 3, 0, SAFARI_ZONE_REST_HOUSE_4 + warp 35, 3, 0, SAFARI_ZONE_NORTH_REST_HOUSE db 5 ; signs sign 36, 4, 3 ; SafariZoneNorthText3 @@ -32,4 +32,4 @@ SafariZoneNorthObject: warp_to 21, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER warp_to 39, 30, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST warp_to 39, 31, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST - warp_to 35, 3, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_REST_HOUSE_4 + warp_to 35, 3, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_NORTH_REST_HOUSE diff --git a/data/mapObjects/safarizoneresthouse4.asm b/data/mapObjects/SafariZoneNorthRestHouse.asm similarity index 64% rename from data/mapObjects/safarizoneresthouse4.asm rename to data/mapObjects/SafariZoneNorthRestHouse.asm index d3b81b4e..34b3ab4f 100755 --- a/data/mapObjects/safarizoneresthouse4.asm +++ b/data/mapObjects/SafariZoneNorthRestHouse.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse4Object: +SafariZoneNorthRestHouse_Object: db $a ; border block db 2 ; warps @@ -13,5 +13,5 @@ SafariZoneRestHouse4Object: object SPRITE_GENTLEMAN, 1, 5, WALK, 1, 3 ; person ; warp-to - warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; SAFARI_ZONE_NORTH - warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; SAFARI_ZONE_NORTH + warp_to 2, 7, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; SAFARI_ZONE_NORTH + warp_to 3, 7, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; SAFARI_ZONE_NORTH diff --git a/data/mapObjects/safarizonesecrethouse.asm b/data/mapObjects/SafariZoneSecretHouse.asm similarity index 91% rename from data/mapObjects/safarizonesecrethouse.asm rename to data/mapObjects/SafariZoneSecretHouse.asm index 4faa90c6..2a5fc22d 100755 --- a/data/mapObjects/safarizonesecrethouse.asm +++ b/data/mapObjects/SafariZoneSecretHouse.asm @@ -1,4 +1,4 @@ -SafariZoneSecretHouseObject: +SafariZoneSecretHouse_Object: db $17 ; border block db 2 ; warps diff --git a/data/mapObjects/safarizonewest.asm b/data/mapObjects/SafariZoneWest.asm similarity index 88% rename from data/mapObjects/safarizonewest.asm rename to data/mapObjects/SafariZoneWest.asm index 5d3c6d19..7faced72 100755 --- a/data/mapObjects/safarizonewest.asm +++ b/data/mapObjects/SafariZoneWest.asm @@ -1,4 +1,4 @@ -SafariZoneWestObject: +SafariZoneWest_Object: db $0 ; border block db 8 ; warps @@ -9,7 +9,7 @@ SafariZoneWestObject: warp 29, 22, 2, SAFARI_ZONE_CENTER warp 29, 23, 3, SAFARI_ZONE_CENTER warp 3, 3, 0, SAFARI_ZONE_SECRET_HOUSE - warp 11, 11, 0, SAFARI_ZONE_REST_HOUSE_2 + warp 11, 11, 0, SAFARI_ZONE_WEST_REST_HOUSE db 4 ; signs sign 12, 12, 5 ; SafariZoneWestText5 @@ -31,4 +31,4 @@ SafariZoneWestObject: warp_to 29, 22, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER warp_to 29, 23, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER warp_to 3, 3, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_SECRET_HOUSE - warp_to 11, 11, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_REST_HOUSE_2 + warp_to 11, 11, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_WEST_REST_HOUSE diff --git a/data/mapObjects/safarizoneresthouse2.asm b/data/mapObjects/SafariZoneWestRestHouse.asm similarity index 64% rename from data/mapObjects/safarizoneresthouse2.asm rename to data/mapObjects/SafariZoneWestRestHouse.asm index 7e589731..9f1bc0ed 100755 --- a/data/mapObjects/safarizoneresthouse2.asm +++ b/data/mapObjects/SafariZoneWestRestHouse.asm @@ -1,4 +1,4 @@ -SafariZoneRestHouse2Object: +SafariZoneWestRestHouse_Object: db $a ; border block db 2 ; warps @@ -13,5 +13,5 @@ SafariZoneRestHouse2Object: object SPRITE_ERIKA, 6, 2, STAY, DOWN, 3 ; person ; warp-to - warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; SAFARI_ZONE_WEST - warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; SAFARI_ZONE_WEST + warp_to 2, 7, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; SAFARI_ZONE_WEST + warp_to 3, 7, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/SaffronCity.asm similarity index 89% rename from data/mapObjects/saffroncity.asm rename to data/mapObjects/SaffronCity.asm index d9afc7ec..b8d3a9cf 100755 --- a/data/mapObjects/saffroncity.asm +++ b/data/mapObjects/SaffronCity.asm @@ -1,15 +1,15 @@ -SaffronCityObject: +SaffronCity_Object: db $f ; border block db 8 ; warps warp 7, 5, 0, COPYCATS_HOUSE_1F warp 26, 3, 0, FIGHTING_DOJO warp 34, 3, 0, SAFFRON_GYM - warp 13, 11, 0, SAFFRON_HOUSE_1 + warp 13, 11, 0, SAFFRON_PIDGEY_HOUSE warp 25, 11, 0, SAFFRON_MART warp 18, 21, 0, SILPH_CO_1F warp 9, 29, 0, SAFFRON_POKECENTER - warp 29, 29, 0, SAFFRON_HOUSE_2 + warp 29, 29, 0, MR_PSYCHICS_HOUSE db 10 ; signs sign 17, 5, 16 ; SaffronCityText16 @@ -44,8 +44,8 @@ SaffronCityObject: warp_to 7, 5, SAFFRON_CITY_WIDTH ; COPYCATS_HOUSE_1F warp_to 26, 3, SAFFRON_CITY_WIDTH ; FIGHTING_DOJO warp_to 34, 3, SAFFRON_CITY_WIDTH ; SAFFRON_GYM - warp_to 13, 11, SAFFRON_CITY_WIDTH ; SAFFRON_HOUSE_1 + warp_to 13, 11, SAFFRON_CITY_WIDTH ; SAFFRON_PIDGEY_HOUSE warp_to 25, 11, SAFFRON_CITY_WIDTH ; SAFFRON_MART warp_to 18, 21, SAFFRON_CITY_WIDTH ; SILPH_CO_1F warp_to 9, 29, SAFFRON_CITY_WIDTH ; SAFFRON_POKECENTER - warp_to 29, 29, SAFFRON_CITY_WIDTH ; SAFFRON_HOUSE_2 + warp_to 29, 29, SAFFRON_CITY_WIDTH ; MR_PSYCHICS_HOUSE diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/SaffronGym.asm similarity index 99% rename from data/mapObjects/saffrongym.asm rename to data/mapObjects/SaffronGym.asm index b466d152..1869421a 100755 --- a/data/mapObjects/saffrongym.asm +++ b/data/mapObjects/SaffronGym.asm @@ -1,4 +1,4 @@ -SaffronGymObject: +SaffronGym_Object: db $2e ; border block db 32 ; warps diff --git a/data/mapObjects/saffronmart.asm b/data/mapObjects/SaffronMart.asm similarity index 94% rename from data/mapObjects/saffronmart.asm rename to data/mapObjects/SaffronMart.asm index 6293b901..c376f2de 100755 --- a/data/mapObjects/saffronmart.asm +++ b/data/mapObjects/SaffronMart.asm @@ -1,4 +1,4 @@ -SaffronMartObject: +SaffronMart_Object: db $0 ; border block db 2 ; warps diff --git a/data/mapObjects/saffronhouse1.asm b/data/mapObjects/SaffronPidgeyHouse.asm similarity index 75% rename from data/mapObjects/saffronhouse1.asm rename to data/mapObjects/SaffronPidgeyHouse.asm index c6abb539..65a851bf 100755 --- a/data/mapObjects/saffronhouse1.asm +++ b/data/mapObjects/SaffronPidgeyHouse.asm @@ -1,4 +1,4 @@ -SaffronHouse1Object: +SaffronPidgeyHouse_Object: db $a ; border block db 2 ; warps @@ -14,5 +14,5 @@ SaffronHouse1Object: object SPRITE_PAPER_SHEET, 3, 3, STAY, NONE, 4 ; person ; warp-to - warp_to 2, 7, SAFFRON_HOUSE_1_WIDTH - warp_to 3, 7, SAFFRON_HOUSE_1_WIDTH + warp_to 2, 7, SAFFRON_PIDGEY_HOUSE_WIDTH + warp_to 3, 7, SAFFRON_PIDGEY_HOUSE_WIDTH diff --git a/data/mapObjects/saffronpokecenter.asm b/data/mapObjects/SaffronPokecenter.asm similarity index 94% rename from data/mapObjects/saffronpokecenter.asm rename to data/mapObjects/SaffronPokecenter.asm index b367ec89..e54fd76b 100755 --- a/data/mapObjects/saffronpokecenter.asm +++ b/data/mapObjects/SaffronPokecenter.asm @@ -1,4 +1,4 @@ -SaffronPokecenterObject: +SaffronPokecenter_Object: db $0 ; border block db 2 ; warps diff --git a/data/mapObjects/SeafoamIslands1F.asm b/data/mapObjects/SeafoamIslands1F.asm new file mode 100755 index 00000000..8707ee0a --- /dev/null +++ b/data/mapObjects/SeafoamIslands1F.asm @@ -0,0 +1,30 @@ +SeafoamIslands1F_Object: + db $7d ; border block + + db 7 ; warps + warp 4, 17, 0, -1 + warp 5, 17, 0, -1 + warp 26, 17, 1, -1 + warp 27, 17, 1, -1 + warp 7, 5, 1, SEAFOAM_ISLANDS_B1F + warp 25, 3, 6, SEAFOAM_ISLANDS_B1F + warp 23, 15, 4, SEAFOAM_ISLANDS_B1F + + db 0 ; signs + + db 2 ; objects + object SPRITE_BOULDER, 18, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object SPRITE_BOULDER, 26, 7, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + + ; warp-to + warp_to 4, 17, SEAFOAM_ISLANDS_1F_WIDTH + warp_to 5, 17, SEAFOAM_ISLANDS_1F_WIDTH + warp_to 26, 17, SEAFOAM_ISLANDS_1F_WIDTH + warp_to 27, 17, SEAFOAM_ISLANDS_1F_WIDTH + warp_to 7, 5, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F + warp_to 25, 3, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F + warp_to 23, 15, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F + + ; holes + warp_to 17, 6, SEAFOAM_ISLANDS_1F_WIDTH + warp_to 24, 6, SEAFOAM_ISLANDS_1F_WIDTH diff --git a/data/mapObjects/SeafoamIslandsB1F.asm b/data/mapObjects/SeafoamIslandsB1F.asm new file mode 100755 index 00000000..426ca0c3 --- /dev/null +++ b/data/mapObjects/SeafoamIslandsB1F.asm @@ -0,0 +1,26 @@ +SeafoamIslandsB1F_Object: + db $7d ; border block + + db 7 ; warps + warp 4, 2, 0, SEAFOAM_ISLANDS_B2F + warp 7, 5, 4, SEAFOAM_ISLANDS_1F + warp 13, 7, 2, SEAFOAM_ISLANDS_B2F + warp 19, 15, 3, SEAFOAM_ISLANDS_B2F + warp 23, 15, 6, SEAFOAM_ISLANDS_1F + warp 25, 11, 5, SEAFOAM_ISLANDS_B2F + warp 25, 3, 5, SEAFOAM_ISLANDS_1F + + db 0 ; signs + + db 2 ; objects + object SPRITE_BOULDER, 17, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object SPRITE_BOULDER, 22, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + + ; warp-to + warp_to 4, 2, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F + warp_to 7, 5, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F + warp_to 13, 7, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F + warp_to 19, 15, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F + warp_to 23, 15, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F + warp_to 25, 11, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F + warp_to 25, 3, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F diff --git a/data/mapObjects/SeafoamIslandsB2F.asm b/data/mapObjects/SeafoamIslandsB2F.asm new file mode 100755 index 00000000..9c1a7898 --- /dev/null +++ b/data/mapObjects/SeafoamIslandsB2F.asm @@ -0,0 +1,26 @@ +SeafoamIslandsB2F_Object: + db $7d ; border block + + db 7 ; warps + warp 5, 3, 0, SEAFOAM_ISLANDS_B1F + warp 5, 13, 0, SEAFOAM_ISLANDS_B3F + warp 13, 7, 2, SEAFOAM_ISLANDS_B1F + warp 19, 15, 3, SEAFOAM_ISLANDS_B1F + warp 25, 3, 3, SEAFOAM_ISLANDS_B3F + warp 25, 11, 5, SEAFOAM_ISLANDS_B1F + warp 25, 14, 4, SEAFOAM_ISLANDS_B3F + + db 0 ; signs + + db 2 ; objects + object SPRITE_BOULDER, 18, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object SPRITE_BOULDER, 23, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + + ; warp-to + warp_to 5, 3, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F + warp_to 5, 13, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F + warp_to 13, 7, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F + warp_to 19, 15, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F + warp_to 25, 3, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F + warp_to 25, 11, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F + warp_to 25, 14, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F diff --git a/data/mapObjects/SeafoamIslandsB3F.asm b/data/mapObjects/SeafoamIslandsB3F.asm new file mode 100755 index 00000000..d194e1cd --- /dev/null +++ b/data/mapObjects/SeafoamIslandsB3F.asm @@ -0,0 +1,30 @@ +SeafoamIslandsB3F_Object: + db $7d ; border block + + db 7 ; warps + warp 5, 12, 1, SEAFOAM_ISLANDS_B2F + warp 8, 6, 2, SEAFOAM_ISLANDS_B4F + warp 25, 4, 3, SEAFOAM_ISLANDS_B4F + warp 25, 3, 4, SEAFOAM_ISLANDS_B2F + warp 25, 14, 6, SEAFOAM_ISLANDS_B2F + warp 20, 17, 0, SEAFOAM_ISLANDS_B4F + warp 21, 17, 1, SEAFOAM_ISLANDS_B4F + + db 0 ; signs + + db 6 ; objects + object SPRITE_BOULDER, 5, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object SPRITE_BOULDER, 3, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + object SPRITE_BOULDER, 8, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person + object SPRITE_BOULDER, 9, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person + object SPRITE_BOULDER, 18, 6, STAY, NONE, 5 ; person + object SPRITE_BOULDER, 19, 6, STAY, NONE, 6 ; person + + ; warp-to + warp_to 5, 12, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F + warp_to 8, 6, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F + warp_to 25, 4, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F + warp_to 25, 3, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F + warp_to 25, 14, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F + warp_to 20, 17, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F + warp_to 21, 17, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F diff --git a/data/mapObjects/SeafoamIslandsB4F.asm b/data/mapObjects/SeafoamIslandsB4F.asm new file mode 100755 index 00000000..62d88b0c --- /dev/null +++ b/data/mapObjects/SeafoamIslandsB4F.asm @@ -0,0 +1,23 @@ +SeafoamIslandsB4F_Object: + db $7d ; border block + + db 4 ; warps + warp 20, 17, 5, SEAFOAM_ISLANDS_B3F + warp 21, 17, 6, SEAFOAM_ISLANDS_B3F + warp 11, 7, 1, SEAFOAM_ISLANDS_B3F + warp 25, 4, 2, SEAFOAM_ISLANDS_B3F + + db 2 ; signs + sign 9, 15, 4 ; SeafoamIslands5Text4 + sign 23, 1, 5 ; SeafoamIslands5Text5 + + db 3 ; objects + object SPRITE_BOULDER, 4, 15, STAY, NONE, 1 ; person + object SPRITE_BOULDER, 5, 15, STAY, NONE, 2 ; person + object SPRITE_BIRD, 6, 1, STAY, DOWN, 3, ARTICUNO, 50 + + ; warp-to + warp_to 20, 17, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F + warp_to 21, 17, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F + warp_to 11, 7, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F + warp_to 25, 4, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F diff --git a/data/mapObjects/silphco10.asm b/data/mapObjects/SilphCo10F.asm similarity index 97% rename from data/mapObjects/silphco10.asm rename to data/mapObjects/SilphCo10F.asm index 90fa2acd..1c8948d3 100755 --- a/data/mapObjects/silphco10.asm +++ b/data/mapObjects/SilphCo10F.asm @@ -1,4 +1,4 @@ -SilphCo10Object: +SilphCo10F_Object: db $2e ; border block db 6 ; warps diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/SilphCo11F.asm similarity index 97% rename from data/mapObjects/silphco11.asm rename to data/mapObjects/SilphCo11F.asm index a130f4f1..7a1dff73 100755 --- a/data/mapObjects/silphco11.asm +++ b/data/mapObjects/SilphCo11F.asm @@ -1,4 +1,4 @@ -SilphCo11Object: +SilphCo11F_Object: db $d ; border block db 4 ; warps diff --git a/data/mapObjects/silphco1.asm b/data/mapObjects/SilphCo1F.asm similarity index 96% rename from data/mapObjects/silphco1.asm rename to data/mapObjects/SilphCo1F.asm index 0f98247b..fc040091 100755 --- a/data/mapObjects/silphco1.asm +++ b/data/mapObjects/SilphCo1F.asm @@ -1,4 +1,4 @@ -SilphCo1Object: +SilphCo1F_Object: db $2e ; border block db 5 ; warps diff --git a/data/mapObjects/silphco2.asm b/data/mapObjects/SilphCo2F.asm similarity index 98% rename from data/mapObjects/silphco2.asm rename to data/mapObjects/SilphCo2F.asm index 4b7f34f6..bc30d78d 100755 --- a/data/mapObjects/silphco2.asm +++ b/data/mapObjects/SilphCo2F.asm @@ -1,4 +1,4 @@ -SilphCo2Object: +SilphCo2F_Object: db $2e ; border block db 7 ; warps diff --git a/data/mapObjects/silphco3.asm b/data/mapObjects/SilphCo3F.asm similarity index 98% rename from data/mapObjects/silphco3.asm rename to data/mapObjects/SilphCo3F.asm index 86b3b215..f45cdf81 100755 --- a/data/mapObjects/silphco3.asm +++ b/data/mapObjects/SilphCo3F.asm @@ -1,4 +1,4 @@ -SilphCo3Object: +SilphCo3F_Object: db $2e ; border block db 10 ; warps diff --git a/data/mapObjects/silphco4.asm b/data/mapObjects/SilphCo4F.asm similarity index 98% rename from data/mapObjects/silphco4.asm rename to data/mapObjects/SilphCo4F.asm index 73082342..3d865bbc 100755 --- a/data/mapObjects/silphco4.asm +++ b/data/mapObjects/SilphCo4F.asm @@ -1,4 +1,4 @@ -SilphCo4Object: +SilphCo4F_Object: db $2e ; border block db 7 ; warps diff --git a/data/mapObjects/silphco5.asm b/data/mapObjects/SilphCo5F.asm similarity index 98% rename from data/mapObjects/silphco5.asm rename to data/mapObjects/SilphCo5F.asm index 5a7d59fc..c10f17c8 100755 --- a/data/mapObjects/silphco5.asm +++ b/data/mapObjects/SilphCo5F.asm @@ -1,4 +1,4 @@ -SilphCo5Object: +SilphCo5F_Object: db $2e ; border block db 7 ; warps diff --git a/data/mapObjects/silphco6.asm b/data/mapObjects/SilphCo6F.asm similarity index 98% rename from data/mapObjects/silphco6.asm rename to data/mapObjects/SilphCo6F.asm index c936970d..ad2ac32f 100755 --- a/data/mapObjects/silphco6.asm +++ b/data/mapObjects/SilphCo6F.asm @@ -1,4 +1,4 @@ -SilphCo6Object: +SilphCo6F_Object: db $2e ; border block db 5 ; warps diff --git a/data/mapObjects/silphco7.asm b/data/mapObjects/SilphCo7F.asm similarity index 98% rename from data/mapObjects/silphco7.asm rename to data/mapObjects/SilphCo7F.asm index 96dc64a5..255f4b33 100755 --- a/data/mapObjects/silphco7.asm +++ b/data/mapObjects/SilphCo7F.asm @@ -1,4 +1,4 @@ -SilphCo7Object: +SilphCo7F_Object: db $2e ; border block db 6 ; warps diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/SilphCo8F.asm similarity index 97% rename from data/mapObjects/silphco8.asm rename to data/mapObjects/SilphCo8F.asm index 513e84ea..d05c7844 100755 --- a/data/mapObjects/silphco8.asm +++ b/data/mapObjects/SilphCo8F.asm @@ -1,4 +1,4 @@ -SilphCo8Object: +SilphCo8F_Object: db $2e ; border block db 7 ; warps diff --git a/data/mapObjects/silphco9.asm b/data/mapObjects/SilphCo9F.asm similarity index 97% rename from data/mapObjects/silphco9.asm rename to data/mapObjects/SilphCo9F.asm index 377d7ca0..28ef5f10 100755 --- a/data/mapObjects/silphco9.asm +++ b/data/mapObjects/SilphCo9F.asm @@ -1,4 +1,4 @@ -SilphCo9Object: +SilphCo9F_Object: db $2e ; border block db 5 ; warps diff --git a/data/mapObjects/silphcoelevator.asm b/data/mapObjects/SilphCoElevator.asm similarity index 90% rename from data/mapObjects/silphcoelevator.asm rename to data/mapObjects/SilphCoElevator.asm index 205fc046..9c4b5a79 100755 --- a/data/mapObjects/silphcoelevator.asm +++ b/data/mapObjects/SilphCoElevator.asm @@ -1,4 +1,4 @@ -SilphCoElevatorObject: +SilphCoElevator_Object: db $f ; border block db 2 ; warps diff --git a/data/mapObjects/tradecenter.asm b/data/mapObjects/TradeCenter.asm similarity index 85% rename from data/mapObjects/tradecenter.asm rename to data/mapObjects/TradeCenter.asm index 63c3e04a..e6df8087 100755 --- a/data/mapObjects/tradecenter.asm +++ b/data/mapObjects/TradeCenter.asm @@ -1,4 +1,4 @@ -TradeCenterObject: +TradeCenter_Object: db $e ; border block db 0 ; warps diff --git a/data/mapObjects/UndergroundPathNorthSouth.asm b/data/mapObjects/UndergroundPathNorthSouth.asm new file mode 100755 index 00000000..35e21cca --- /dev/null +++ b/data/mapObjects/UndergroundPathNorthSouth.asm @@ -0,0 +1,14 @@ +UndergroundPathNorthSouth_Object: + db $1 ; border block + + db 2 ; warps + warp 5, 4, 2, UNDERGROUND_PATH_ROUTE_5 + warp 2, 41, 2, UNDERGROUND_PATH_ROUTE_6 + + db 0 ; signs + + db 0 ; objects + + ; warp-to + warp_to 5, 4, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; UNDERGROUND_PATH_ROUTE_5 + warp_to 2, 41, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; UNDERGROUND_PATH_ROUTE_6 diff --git a/data/mapObjects/UndergroundPathRoute5.asm b/data/mapObjects/UndergroundPathRoute5.asm new file mode 100755 index 00000000..af71ebb4 --- /dev/null +++ b/data/mapObjects/UndergroundPathRoute5.asm @@ -0,0 +1,17 @@ +UndergroundPathRoute5_Object: + db $a ; border block + + db 3 ; warps + warp 3, 7, 3, -1 + warp 4, 7, 3, -1 + warp 4, 4, 0, UNDERGROUND_PATH_NORTH_SOUTH + + db 0 ; signs + + db 1 ; objects + object SPRITE_LITTLE_GIRL, 2, 3, STAY, NONE, 1 ; person + + ; warp-to + warp_to 3, 7, UNDERGROUND_PATH_ROUTE_5_WIDTH + warp_to 4, 7, UNDERGROUND_PATH_ROUTE_5_WIDTH + warp_to 4, 4, UNDERGROUND_PATH_ROUTE_5_WIDTH ; UNDERGROUND_PATH_NORTH_SOUTH diff --git a/data/mapObjects/UndergroundPathRoute6.asm b/data/mapObjects/UndergroundPathRoute6.asm new file mode 100755 index 00000000..5a40ade2 --- /dev/null +++ b/data/mapObjects/UndergroundPathRoute6.asm @@ -0,0 +1,17 @@ +UndergroundPathRoute6_Object: + db $a ; border block + + db 3 ; warps + warp 3, 7, 3, -1 + warp 4, 7, 3, -1 + warp 4, 4, 1, UNDERGROUND_PATH_NORTH_SOUTH + + db 0 ; signs + + db 1 ; objects + object SPRITE_GIRL, 2, 3, STAY, NONE, 1 ; person + + ; warp-to + warp_to 3, 7, UNDERGROUND_PATH_ROUTE_6_WIDTH + warp_to 4, 7, UNDERGROUND_PATH_ROUTE_6_WIDTH + warp_to 4, 4, UNDERGROUND_PATH_ROUTE_6_WIDTH ; UNDERGROUND_PATH_NORTH_SOUTH diff --git a/data/mapObjects/UndergroundPathRoute7.asm b/data/mapObjects/UndergroundPathRoute7.asm new file mode 100755 index 00000000..4666e0c9 --- /dev/null +++ b/data/mapObjects/UndergroundPathRoute7.asm @@ -0,0 +1,17 @@ +UndergroundPathRoute7_Object: + db $a ; border block + + db 3 ; warps + warp 3, 7, 4, -1 + warp 4, 7, 4, -1 + warp 4, 4, 0, UNDERGROUND_PATH_WEST_EAST + + db 0 ; signs + + db 1 ; objects + object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 1 ; person + + ; warp-to + warp_to 3, 7, UNDERGROUND_PATH_ROUTE_7_WIDTH + warp_to 4, 7, UNDERGROUND_PATH_ROUTE_7_WIDTH + warp_to 4, 4, UNDERGROUND_PATH_ROUTE_7_WIDTH ; UNDERGROUND_PATH_WEST_EAST diff --git a/data/mapObjects/UndergroundPathRoute7Copy.asm b/data/mapObjects/UndergroundPathRoute7Copy.asm new file mode 100755 index 00000000..c020646e --- /dev/null +++ b/data/mapObjects/UndergroundPathRoute7Copy.asm @@ -0,0 +1,18 @@ +UndergroundPathRoute7Copy_Object: + db $a ; border block + + db 3 ; warps + warp 3, 7, 5, -1 + warp 4, 7, 5, -1 + warp 4, 4, 0, UNDERGROUND_PATH_WEST_EAST + + db 0 ; signs + + db 2 ; objects + object SPRITE_GIRL, 3, 2, STAY, NONE, 1 ; person + object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 2 ; person + + ; warp-to + warp_to 3, 7, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH + warp_to 4, 7, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH + warp_to 4, 4, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH ; UNDERGROUND_PATH_WEST_EAST diff --git a/data/mapObjects/UndergroundPathRoute8.asm b/data/mapObjects/UndergroundPathRoute8.asm new file mode 100755 index 00000000..8be0d474 --- /dev/null +++ b/data/mapObjects/UndergroundPathRoute8.asm @@ -0,0 +1,17 @@ +UndergroundPathRoute8_Object: + db $a ; border block + + db 3 ; warps + warp 3, 7, 4, -1 + warp 4, 7, 4, -1 + warp 4, 4, 1, UNDERGROUND_PATH_WEST_EAST + + db 0 ; signs + + db 1 ; objects + object SPRITE_GIRL, 3, 4, STAY, NONE, 1 ; person + + ; warp-to + warp_to 3, 7, UNDERGROUND_PATH_ROUTE_8_WIDTH + warp_to 4, 7, UNDERGROUND_PATH_ROUTE_8_WIDTH + warp_to 4, 4, UNDERGROUND_PATH_ROUTE_8_WIDTH ; UNDERGROUND_PATH_WEST_EAST diff --git a/data/mapObjects/UndergroundPathWestEast.asm b/data/mapObjects/UndergroundPathWestEast.asm new file mode 100755 index 00000000..fa064aca --- /dev/null +++ b/data/mapObjects/UndergroundPathWestEast.asm @@ -0,0 +1,14 @@ +UndergroundPathWestEast_Object: + db $1 ; border block + + db 2 ; warps + warp 2, 5, 2, UNDERGROUND_PATH_ROUTE_7 + warp 47, 2, 2, UNDERGROUND_PATH_ROUTE_8 + + db 0 ; signs + + db 0 ; objects + + ; warp-to + warp_to 2, 5, UNDERGROUND_PATH_WEST_EAST_WIDTH ; UNDERGROUND_PATH_ROUTE_7 + warp_to 47, 2, UNDERGROUND_PATH_WEST_EAST_WIDTH ; UNDERGROUND_PATH_ROUTE_8 diff --git a/data/mapObjects/vermilioncity.asm b/data/mapObjects/VermilionCity.asm similarity index 78% rename from data/mapObjects/vermilioncity.asm rename to data/mapObjects/VermilionCity.asm index 86cc5685..b1e1a005 100755 --- a/data/mapObjects/vermilioncity.asm +++ b/data/mapObjects/VermilionCity.asm @@ -1,4 +1,4 @@ -VermilionCityObject: +VermilionCity_Object: db $43 ; border block db 9 ; warps @@ -6,11 +6,11 @@ VermilionCityObject: warp 9, 13, 0, POKEMON_FAN_CLUB warp 23, 13, 0, VERMILION_MART warp 12, 19, 0, VERMILION_GYM - warp 23, 19, 0, VERMILION_HOUSE_1 + warp 23, 19, 0, VERMILION_PIDGEY_HOUSE warp 18, 31, 0, VERMILION_DOCK warp 19, 31, 0, VERMILION_DOCK - warp 15, 13, 0, VERMILION_HOUSE_3 - warp 7, 3, 0, VERMILION_HOUSE_2 + warp 15, 13, 0, VERMILION_TRADE_HOUSE + warp 7, 3, 0, VERMILION_OLD_ROD_HOUSE db 7 ; signs sign 27, 3, 7 ; VermilionCityText7 @@ -34,8 +34,8 @@ VermilionCityObject: warp_to 9, 13, VERMILION_CITY_WIDTH ; POKEMON_FAN_CLUB warp_to 23, 13, VERMILION_CITY_WIDTH ; VERMILION_MART warp_to 12, 19, VERMILION_CITY_WIDTH ; VERMILION_GYM - warp_to 23, 19, VERMILION_CITY_WIDTH ; VERMILION_HOUSE_1 + warp_to 23, 19, VERMILION_CITY_WIDTH ; VERMILION_PIDGEY_HOUSE warp_to 18, 31, VERMILION_CITY_WIDTH ; VERMILION_DOCK warp_to 19, 31, VERMILION_CITY_WIDTH ; VERMILION_DOCK - warp_to 15, 13, VERMILION_CITY_WIDTH ; VERMILION_HOUSE_3 - warp_to 7, 3, VERMILION_CITY_WIDTH ; VERMILION_HOUSE_2 + warp_to 15, 13, VERMILION_CITY_WIDTH ; VERMILION_TRADE_HOUSE + warp_to 7, 3, VERMILION_CITY_WIDTH ; VERMILION_OLD_ROD_HOUSE diff --git a/data/mapObjects/vermiliondock.asm b/data/mapObjects/VermilionDock.asm similarity index 58% rename from data/mapObjects/vermiliondock.asm rename to data/mapObjects/VermilionDock.asm index 289689b5..6f07554a 100755 --- a/data/mapObjects/vermiliondock.asm +++ b/data/mapObjects/VermilionDock.asm @@ -1,9 +1,9 @@ -VermilionDockObject: +VermilionDock_Object: db $f ; border block db 2 ; warps warp 14, 0, 5, -1 - warp 14, 2, 1, SS_ANNE_1 + warp 14, 2, 1, SS_ANNE_1F db 0 ; signs @@ -11,4 +11,4 @@ VermilionDockObject: ; warp-to warp_to 14, 0, VERMILION_DOCK_WIDTH - warp_to 14, 2, VERMILION_DOCK_WIDTH ; SS_ANNE_1 + warp_to 14, 2, VERMILION_DOCK_WIDTH ; SS_ANNE_1F diff --git a/data/mapObjects/vermiliongym.asm b/data/mapObjects/VermilionGym.asm similarity index 95% rename from data/mapObjects/vermiliongym.asm rename to data/mapObjects/VermilionGym.asm index 843454c0..4ace83be 100755 --- a/data/mapObjects/vermiliongym.asm +++ b/data/mapObjects/VermilionGym.asm @@ -1,4 +1,4 @@ -VermilionGymObject: +VermilionGym_Object: db $3 ; border block db 2 ; warps diff --git a/data/mapObjects/vermilionmart.asm b/data/mapObjects/VermilionMart.asm similarity index 94% rename from data/mapObjects/vermilionmart.asm rename to data/mapObjects/VermilionMart.asm index f5b15c7d..74bcf35f 100755 --- a/data/mapObjects/vermilionmart.asm +++ b/data/mapObjects/VermilionMart.asm @@ -1,4 +1,4 @@ -VermilionMartObject: +VermilionMart_Object: db $0 ; border block db 2 ; warps diff --git a/data/mapObjects/vermilionhouse2.asm b/data/mapObjects/VermilionOldRodHouse.asm similarity index 58% rename from data/mapObjects/vermilionhouse2.asm rename to data/mapObjects/VermilionOldRodHouse.asm index e612b06a..f5b4b96a 100755 --- a/data/mapObjects/vermilionhouse2.asm +++ b/data/mapObjects/VermilionOldRodHouse.asm @@ -1,4 +1,4 @@ -VermilionHouse2Object: +VermilionOldRodHouse_Object: db $a ; border block db 2 ; warps @@ -11,5 +11,5 @@ VermilionHouse2Object: object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person ; warp-to - warp_to 2, 7, VERMILION_HOUSE_2_WIDTH - warp_to 3, 7, VERMILION_HOUSE_2_WIDTH + warp_to 2, 7, VERMILION_OLD_ROD_HOUSE_WIDTH + warp_to 3, 7, VERMILION_OLD_ROD_HOUSE_WIDTH diff --git a/data/mapObjects/vermilionhouse1.asm b/data/mapObjects/VermilionPidgeyHouse.asm similarity index 70% rename from data/mapObjects/vermilionhouse1.asm rename to data/mapObjects/VermilionPidgeyHouse.asm index bbb7491b..0e820f86 100755 --- a/data/mapObjects/vermilionhouse1.asm +++ b/data/mapObjects/VermilionPidgeyHouse.asm @@ -1,4 +1,4 @@ -VermilionHouse1Object: +VermilionPidgeyHouse_Object: db $a ; border block db 2 ; warps @@ -13,5 +13,5 @@ VermilionHouse1Object: object SPRITE_PAPER_SHEET, 4, 3, STAY, NONE, 3 ; person ; warp-to - warp_to 2, 7, VERMILION_HOUSE_1_WIDTH - warp_to 3, 7, VERMILION_HOUSE_1_WIDTH + warp_to 2, 7, VERMILION_PIDGEY_HOUSE_WIDTH + warp_to 3, 7, VERMILION_PIDGEY_HOUSE_WIDTH diff --git a/data/mapObjects/vermilionpokecenter.asm b/data/mapObjects/VermilionPokecenter.asm similarity index 93% rename from data/mapObjects/vermilionpokecenter.asm rename to data/mapObjects/VermilionPokecenter.asm index da792d34..d2142045 100755 --- a/data/mapObjects/vermilionpokecenter.asm +++ b/data/mapObjects/VermilionPokecenter.asm @@ -1,4 +1,4 @@ -VermilionPokecenterObject: +VermilionPokecenter_Object: db $0 ; border block db 2 ; warps diff --git a/data/mapObjects/vermilionhouse3.asm b/data/mapObjects/VermilionTradeHouse.asm similarity index 60% rename from data/mapObjects/vermilionhouse3.asm rename to data/mapObjects/VermilionTradeHouse.asm index a6dd42fa..30212b2a 100755 --- a/data/mapObjects/vermilionhouse3.asm +++ b/data/mapObjects/VermilionTradeHouse.asm @@ -1,4 +1,4 @@ -VermilionHouse3Object: +VermilionTradeHouse_Object: db $a ; border block db 2 ; warps @@ -11,5 +11,5 @@ VermilionHouse3Object: object SPRITE_LITTLE_GIRL, 3, 5, STAY, UP, 1 ; person ; warp-to - warp_to 2, 7, VERMILION_HOUSE_3_WIDTH - warp_to 3, 7, VERMILION_HOUSE_3_WIDTH + warp_to 2, 7, VERMILION_TRADE_HOUSE_WIDTH + warp_to 3, 7, VERMILION_TRADE_HOUSE_WIDTH diff --git a/data/mapObjects/victoryroad1.asm b/data/mapObjects/VictoryRoad1F.asm similarity index 75% rename from data/mapObjects/victoryroad1.asm rename to data/mapObjects/VictoryRoad1F.asm index 62309bbd..cc0c47ce 100755 --- a/data/mapObjects/victoryroad1.asm +++ b/data/mapObjects/VictoryRoad1F.asm @@ -1,10 +1,10 @@ -VictoryRoad1Object: +VictoryRoad1F_Object: db $7d ; border block db 3 ; warps warp 8, 17, 2, -1 warp 9, 17, 2, -1 - warp 1, 1, 0, VICTORY_ROAD_2 + warp 1, 1, 0, VICTORY_ROAD_2F db 0 ; signs @@ -18,6 +18,6 @@ VictoryRoad1Object: object SPRITE_BOULDER, 2, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person ; warp-to - warp_to 8, 17, VICTORY_ROAD_1_WIDTH - warp_to 9, 17, VICTORY_ROAD_1_WIDTH - warp_to 1, 1, VICTORY_ROAD_1_WIDTH ; VICTORY_ROAD_2 + warp_to 8, 17, VICTORY_ROAD_1F_WIDTH + warp_to 9, 17, VICTORY_ROAD_1F_WIDTH + warp_to 1, 1, VICTORY_ROAD_1F_WIDTH ; VICTORY_ROAD_2F diff --git a/data/mapObjects/victoryroad2.asm b/data/mapObjects/VictoryRoad2F.asm similarity index 63% rename from data/mapObjects/victoryroad2.asm rename to data/mapObjects/VictoryRoad2F.asm index 283e74c8..55559bca 100755 --- a/data/mapObjects/victoryroad2.asm +++ b/data/mapObjects/VictoryRoad2F.asm @@ -1,14 +1,14 @@ -VictoryRoad2Object: +VictoryRoad2F_Object: db $7d ; border block db 7 ; warps - warp 0, 8, 2, VICTORY_ROAD_1 + warp 0, 8, 2, VICTORY_ROAD_1F warp 29, 7, 3, -1 warp 29, 8, 3, -1 - warp 23, 7, 0, VICTORY_ROAD_3 - warp 25, 14, 2, VICTORY_ROAD_3 - warp 27, 7, 1, VICTORY_ROAD_3 - warp 1, 1, 3, VICTORY_ROAD_3 + warp 23, 7, 0, VICTORY_ROAD_3F + warp 25, 14, 2, VICTORY_ROAD_3F + warp 27, 7, 1, VICTORY_ROAD_3F + warp 1, 1, 3, VICTORY_ROAD_3F db 0 ; signs @@ -28,10 +28,10 @@ VictoryRoad2Object: object SPRITE_BOULDER, 23, 16, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person ; warp-to - warp_to 0, 8, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_1 - warp_to 29, 7, VICTORY_ROAD_2_WIDTH - warp_to 29, 8, VICTORY_ROAD_2_WIDTH - warp_to 23, 7, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 - warp_to 25, 14, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 - warp_to 27, 7, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 - warp_to 1, 1, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 + warp_to 0, 8, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_1F + warp_to 29, 7, VICTORY_ROAD_2F_WIDTH + warp_to 29, 8, VICTORY_ROAD_2F_WIDTH + warp_to 23, 7, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F + warp_to 25, 14, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F + warp_to 27, 7, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F + warp_to 1, 1, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F diff --git a/data/mapObjects/victoryroad3.asm b/data/mapObjects/VictoryRoad3F.asm similarity index 67% rename from data/mapObjects/victoryroad3.asm rename to data/mapObjects/VictoryRoad3F.asm index ffa2a843..2eb42417 100755 --- a/data/mapObjects/victoryroad3.asm +++ b/data/mapObjects/VictoryRoad3F.asm @@ -1,11 +1,11 @@ -VictoryRoad3Object: +VictoryRoad3F_Object: db $7d ; border block db 4 ; warps - warp 23, 7, 3, VICTORY_ROAD_2 - warp 26, 8, 5, VICTORY_ROAD_2 - warp 27, 15, 4, VICTORY_ROAD_2 - warp 2, 0, 6, VICTORY_ROAD_2 + warp 23, 7, 3, VICTORY_ROAD_2F + warp 26, 8, 5, VICTORY_ROAD_2F + warp 27, 15, 4, VICTORY_ROAD_2F + warp 2, 0, 6, VICTORY_ROAD_2F db 0 ; signs @@ -22,7 +22,7 @@ VictoryRoad3Object: object SPRITE_BOULDER, 22, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person ; warp-to - warp_to 23, 7, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 - warp_to 26, 8, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 - warp_to 27, 15, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 - warp_to 2, 0, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 + warp_to 23, 7, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F + warp_to 26, 8, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F + warp_to 27, 15, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F + warp_to 2, 0, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F diff --git a/data/mapObjects/viridiancity.asm b/data/mapObjects/ViridianCity.asm similarity index 80% rename from data/mapObjects/viridiancity.asm rename to data/mapObjects/ViridianCity.asm index b45ba9d5..32fe8d3a 100755 --- a/data/mapObjects/viridiancity.asm +++ b/data/mapObjects/ViridianCity.asm @@ -1,11 +1,11 @@ -ViridianCityObject: +ViridianCity_Object: db $f ; border block db 5 ; warps warp 23, 25, 0, VIRIDIAN_POKECENTER warp 29, 19, 0, VIRIDIAN_MART - warp 21, 15, 0, VIRIDIAN_SCHOOL - warp 21, 9, 0, VIRIDIAN_HOUSE + warp 21, 15, 0, VIRIDIAN_SCHOOL_HOUSE + warp 21, 9, 0, VIRIDIAN_NICKNAME_HOUSE warp 32, 7, 0, VIRIDIAN_GYM db 6 ; signs @@ -28,6 +28,6 @@ ViridianCityObject: ; warp-to warp_to 23, 25, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_POKECENTER warp_to 29, 19, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_MART - warp_to 21, 15, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_SCHOOL - warp_to 21, 9, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_HOUSE + warp_to 21, 15, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_SCHOOL_HOUSE + warp_to 21, 9, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_NICKNAME_HOUSE warp_to 32, 7, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_GYM diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/ViridianForest.asm similarity index 54% rename from data/mapObjects/viridianforest.asm rename to data/mapObjects/ViridianForest.asm index 601f73e2..cbcb6ff8 100755 --- a/data/mapObjects/viridianforest.asm +++ b/data/mapObjects/ViridianForest.asm @@ -1,13 +1,13 @@ -ViridianForestObject: +ViridianForest_Object: db $3 ; border block db 6 ; warps - warp 1, 0, 2, VIRIDIAN_FOREST_EXIT - warp 2, 0, 3, VIRIDIAN_FOREST_EXIT - warp 15, 47, 1, VIRIDIAN_FOREST_ENTRANCE - warp 16, 47, 1, VIRIDIAN_FOREST_ENTRANCE - warp 17, 47, 1, VIRIDIAN_FOREST_ENTRANCE - warp 18, 47, 1, VIRIDIAN_FOREST_ENTRANCE + warp 1, 0, 2, VIRIDIAN_FOREST_NORTH_GATE + warp 2, 0, 3, VIRIDIAN_FOREST_NORTH_GATE + warp 15, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE + warp 16, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE + warp 17, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE + warp 18, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE db 6 ; signs sign 24, 40, 9 ; ViridianForestText9 @@ -28,9 +28,9 @@ ViridianForestObject: object SPRITE_BUG_CATCHER, 27, 40, STAY, NONE, 8 ; person ; warp-to - warp_to 1, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_EXIT - warp_to 2, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_EXIT - warp_to 15, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE - warp_to 16, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE - warp_to 17, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE - warp_to 18, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE + warp_to 1, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE + warp_to 2, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE + warp_to 15, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE + warp_to 16, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE + warp_to 17, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE + warp_to 18, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE diff --git a/data/mapObjects/viridianforestexit.asm b/data/mapObjects/ViridianForestNorthGate.asm similarity index 53% rename from data/mapObjects/viridianforestexit.asm rename to data/mapObjects/ViridianForestNorthGate.asm index 521ad818..81e7fece 100755 --- a/data/mapObjects/viridianforestexit.asm +++ b/data/mapObjects/ViridianForestNorthGate.asm @@ -1,4 +1,4 @@ -ViridianForestExitObject: +ViridianForestNorthGate_Object: db $a ; border block db 4 ; warps @@ -14,7 +14,7 @@ ViridianForestExitObject: object SPRITE_OLD_PERSON, 2, 5, STAY, NONE, 2 ; person ; warp-to - warp_to 4, 0, VIRIDIAN_FOREST_EXIT_WIDTH - warp_to 5, 0, VIRIDIAN_FOREST_EXIT_WIDTH - warp_to 4, 7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST - warp_to 5, 7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST + warp_to 4, 0, VIRIDIAN_FOREST_NORTH_GATE_WIDTH + warp_to 5, 0, VIRIDIAN_FOREST_NORTH_GATE_WIDTH + warp_to 4, 7, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; VIRIDIAN_FOREST + warp_to 5, 7, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; VIRIDIAN_FOREST diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/ViridianForestSouthGate.asm similarity index 52% rename from data/mapObjects/viridianforestentrance.asm rename to data/mapObjects/ViridianForestSouthGate.asm index 319ba272..76f87e51 100755 --- a/data/mapObjects/viridianforestentrance.asm +++ b/data/mapObjects/ViridianForestSouthGate.asm @@ -1,4 +1,4 @@ -ViridianForestEntranceObject: +ViridianForestSouthGate_Object: db $a ; border block db 4 ; warps @@ -14,7 +14,7 @@ ViridianForestEntranceObject: object SPRITE_LITTLE_GIRL, 2, 4, WALK, 1, 2 ; person ; warp-to - warp_to 4, 0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST - warp_to 5, 0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST - warp_to 4, 7, VIRIDIAN_FOREST_ENTRANCE_WIDTH - warp_to 5, 7, VIRIDIAN_FOREST_ENTRANCE_WIDTH + warp_to 4, 0, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; VIRIDIAN_FOREST + warp_to 5, 0, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; VIRIDIAN_FOREST + warp_to 4, 7, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH + warp_to 5, 7, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH diff --git a/data/mapObjects/viridiangym.asm b/data/mapObjects/ViridianGym.asm similarity index 97% rename from data/mapObjects/viridiangym.asm rename to data/mapObjects/ViridianGym.asm index c6ddb1d4..e3fd17bd 100755 --- a/data/mapObjects/viridiangym.asm +++ b/data/mapObjects/ViridianGym.asm @@ -1,4 +1,4 @@ -ViridianGymObject: +ViridianGym_Object: db $3 ; border block db 2 ; warps diff --git a/data/mapObjects/viridianmart.asm b/data/mapObjects/ViridianMart.asm similarity index 94% rename from data/mapObjects/viridianmart.asm rename to data/mapObjects/ViridianMart.asm index e692f810..b3e7fee5 100755 --- a/data/mapObjects/viridianmart.asm +++ b/data/mapObjects/ViridianMart.asm @@ -1,4 +1,4 @@ -ViridianMartObject: +ViridianMart_Object: db $0 ; border block db 2 ; warps diff --git a/data/mapObjects/viridianhouse.asm b/data/mapObjects/ViridianNicknameHouse.asm similarity index 73% rename from data/mapObjects/viridianhouse.asm rename to data/mapObjects/ViridianNicknameHouse.asm index 932542a6..aaf20a91 100755 --- a/data/mapObjects/viridianhouse.asm +++ b/data/mapObjects/ViridianNicknameHouse.asm @@ -1,4 +1,4 @@ -ViridianHouseObject: +ViridianNicknameHouse_Object: db $a ; border block db 2 ; warps @@ -14,5 +14,5 @@ ViridianHouseObject: object SPRITE_CLIPBOARD, 4, 0, STAY, NONE, 4 ; person ; warp-to - warp_to 2, 7, VIRIDIAN_HOUSE_WIDTH - warp_to 3, 7, VIRIDIAN_HOUSE_WIDTH + warp_to 2, 7, VIRIDIAN_NICKNAME_HOUSE_WIDTH + warp_to 3, 7, VIRIDIAN_NICKNAME_HOUSE_WIDTH diff --git a/data/mapObjects/viridianpokecenter.asm b/data/mapObjects/ViridianPokecenter.asm similarity index 94% rename from data/mapObjects/viridianpokecenter.asm rename to data/mapObjects/ViridianPokecenter.asm index 9c8ebbfe..43b73e68 100755 --- a/data/mapObjects/viridianpokecenter.asm +++ b/data/mapObjects/ViridianPokecenter.asm @@ -1,4 +1,4 @@ -ViridianPokecenterObject: +ViridianPokecenter_Object: db $0 ; border block db 2 ; warps diff --git a/data/mapObjects/school.asm b/data/mapObjects/ViridianSchoolHouse.asm similarity index 66% rename from data/mapObjects/school.asm rename to data/mapObjects/ViridianSchoolHouse.asm index 8f07144f..01f2465d 100755 --- a/data/mapObjects/school.asm +++ b/data/mapObjects/ViridianSchoolHouse.asm @@ -1,4 +1,4 @@ -SchoolObject: +ViridianSchoolHouse_Object: db $a ; border block db 2 ; warps @@ -12,5 +12,5 @@ SchoolObject: object SPRITE_LASS, 4, 1, STAY, DOWN, 2 ; person ; warp-to - warp_to 2, 7, VIRIDIAN_SCHOOL_WIDTH - warp_to 3, 7, VIRIDIAN_SCHOOL_WIDTH + warp_to 2, 7, VIRIDIAN_SCHOOL_HOUSE_WIDTH + warp_to 3, 7, VIRIDIAN_SCHOOL_HOUSE_WIDTH diff --git a/data/mapObjects/fuchsiahouse2.asm b/data/mapObjects/WardensHouse.asm similarity index 79% rename from data/mapObjects/fuchsiahouse2.asm rename to data/mapObjects/WardensHouse.asm index e3702594..d8445738 100755 --- a/data/mapObjects/fuchsiahouse2.asm +++ b/data/mapObjects/WardensHouse.asm @@ -1,4 +1,4 @@ -FuchsiaHouse2Object: +WardensHouse_Object: db $17 ; border block db 2 ; warps @@ -15,5 +15,5 @@ FuchsiaHouse2Object: object SPRITE_BOULDER, 8, 4, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person ; warp-to - warp_to 4, 7, FUCHSIA_HOUSE_2_WIDTH - warp_to 5, 7, FUCHSIA_HOUSE_2_WIDTH + warp_to 4, 7, WARDENS_HOUSE_WIDTH + warp_to 5, 7, WARDENS_HOUSE_WIDTH diff --git a/data/mapObjects/celadonmansion2.asm b/data/mapObjects/celadonmansion2.asm deleted file mode 100755 index f2b96d89..00000000 --- a/data/mapObjects/celadonmansion2.asm +++ /dev/null @@ -1,19 +0,0 @@ -CeladonMansion2Object: - db $f ; border block - - db 4 ; warps - warp 6, 1, 0, CELADON_MANSION_3 - warp 7, 1, 3, CELADON_MANSION_1 - warp 2, 1, 4, CELADON_MANSION_1 - warp 4, 1, 3, CELADON_MANSION_3 - - db 1 ; signs - sign 4, 9, 1 ; CeladonMansion2Text1 - - db 0 ; objects - - ; warp-to - warp_to 6, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3 - warp_to 7, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1 - warp_to 2, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1 - warp_to 4, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3 diff --git a/data/mapObjects/celadonmansion4.asm b/data/mapObjects/celadonmansion4.asm deleted file mode 100755 index 98f538eb..00000000 --- a/data/mapObjects/celadonmansion4.asm +++ /dev/null @@ -1,17 +0,0 @@ -CeladonMansion4Object: - db $9 ; border block - - db 3 ; warps - warp 6, 1, 1, CELADON_MANSION_3 - warp 2, 1, 2, CELADON_MANSION_3 - warp 2, 7, 0, CELADON_MANSION_5 - - db 1 ; signs - sign 3, 7, 1 ; CeladonMansion4Text1 - - db 0 ; objects - - ; warp-to - warp_to 6, 1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3 - warp_to 2, 1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3 - warp_to 2, 7, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_5 diff --git a/data/mapObjects/celadonmansion5.asm b/data/mapObjects/celadonmansion5.asm deleted file mode 100755 index 0fd06d13..00000000 --- a/data/mapObjects/celadonmansion5.asm +++ /dev/null @@ -1,16 +0,0 @@ -CeladonMansion5Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 2, CELADON_MANSION_4 - warp 3, 7, 2, CELADON_MANSION_4 - - db 0 ; signs - - db 2 ; objects - object SPRITE_HIKER, 2, 2, STAY, DOWN, 1 ; person - object SPRITE_BALL, 4, 3, STAY, NONE, 2 ; person - - ; warp-to - warp_to 2, 7, CELADON_MANSION_5_WIDTH ; CELADON_MANSION_4 - warp_to 3, 7, CELADON_MANSION_5_WIDTH ; CELADON_MANSION_4 diff --git a/data/mapObjects/celadonmartelevator.asm b/data/mapObjects/celadonmartelevator.asm deleted file mode 100755 index 49745aa9..00000000 --- a/data/mapObjects/celadonmartelevator.asm +++ /dev/null @@ -1,15 +0,0 @@ -CeladonMartElevatorObject: - db $f ; border block - - db 2 ; warps - warp 1, 3, 5, CELADON_MART_1 - warp 2, 3, 5, CELADON_MART_1 - - db 1 ; signs - sign 3, 0, 1 ; CeladonMartElevatorText1 - - db 0 ; objects - - ; warp-to - warp_to 1, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1 - warp_to 2, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1 diff --git a/data/mapObjects/diglettscave.asm b/data/mapObjects/diglettscave.asm deleted file mode 100755 index ef4de039..00000000 --- a/data/mapObjects/diglettscave.asm +++ /dev/null @@ -1,14 +0,0 @@ -DiglettsCaveObject: - db $19 ; border block - - db 2 ; warps - warp 5, 5, 2, DIGLETTS_CAVE_EXIT - warp 37, 31, 2, DIGLETTS_CAVE_ENTRANCE - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 5, 5, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_EXIT - warp_to 37, 31, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ENTRANCE diff --git a/data/mapObjects/lab1.asm b/data/mapObjects/lab1.asm deleted file mode 100755 index b9eea581..00000000 --- a/data/mapObjects/lab1.asm +++ /dev/null @@ -1,25 +0,0 @@ -Lab1Object: - db $17 ; border block - - db 5 ; warps - warp 2, 7, 2, -1 - warp 3, 7, 2, -1 - warp 8, 4, 0, CINNABAR_LAB_2 - warp 12, 4, 0, CINNABAR_LAB_3 - warp 16, 4, 0, CINNABAR_LAB_4 - - db 4 ; signs - sign 3, 2, 2 ; Lab1Text2 - sign 9, 4, 3 ; Lab1Text3 - sign 13, 4, 4 ; Lab1Text4 - sign 17, 4, 5 ; Lab1Text5 - - db 1 ; objects - object SPRITE_FISHER, 1, 3, STAY, NONE, 1 ; person - - ; warp-to - warp_to 2, 7, CINNABAR_LAB_1_WIDTH - warp_to 3, 7, CINNABAR_LAB_1_WIDTH - warp_to 8, 4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_2 - warp_to 12, 4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_3 - warp_to 16, 4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_4 diff --git a/data/mapObjects/lab4.asm b/data/mapObjects/lab4.asm deleted file mode 100755 index b9956f5f..00000000 --- a/data/mapObjects/lab4.asm +++ /dev/null @@ -1,16 +0,0 @@ -Lab4Object: - db $17 ; border block - - db 2 ; warps - warp 2, 7, 4, CINNABAR_LAB_1 - warp 3, 7, 4, CINNABAR_LAB_1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_OAK_AIDE, 5, 2, WALK, 2, 1 ; person - object SPRITE_OAK_AIDE, 7, 6, STAY, UP, 2 ; person - - ; warp-to - warp_to 2, 7, CINNABAR_LAB_4_WIDTH ; CINNABAR_LAB_1 - warp_to 3, 7, CINNABAR_LAB_4_WIDTH ; CINNABAR_LAB_1 diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm deleted file mode 100755 index fe543f27..00000000 --- a/data/mapObjects/mansion1.asm +++ /dev/null @@ -1,29 +0,0 @@ -Mansion1Object: - db $2e ; border block - - db 8 ; warps - warp 4, 27, 0, -1 - warp 5, 27, 0, -1 - warp 6, 27, 0, -1 - warp 7, 27, 0, -1 - warp 5, 10, 0, MANSION_2 - warp 21, 23, 0, MANSION_4 - warp 26, 27, 0, -1 - warp 27, 27, 0, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_OAK_AIDE, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4 - object SPRITE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE - object SPRITE_BALL, 18, 21, STAY, NONE, 3, CARBOS - - ; warp-to - warp_to 4, 27, MANSION_1_WIDTH - warp_to 5, 27, MANSION_1_WIDTH - warp_to 6, 27, MANSION_1_WIDTH - warp_to 7, 27, MANSION_1_WIDTH - warp_to 5, 10, MANSION_1_WIDTH ; MANSION_2 - warp_to 21, 23, MANSION_1_WIDTH ; MANSION_4 - warp_to 26, 27, MANSION_1_WIDTH - warp_to 27, 27, MANSION_1_WIDTH diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm deleted file mode 100755 index cea8c8fc..00000000 --- a/data/mapObjects/mansion2.asm +++ /dev/null @@ -1,22 +0,0 @@ -Mansion2Object: - db $1 ; border block - - db 4 ; warps - warp 5, 10, 4, MANSION_1 - warp 7, 10, 0, MANSION_3 - warp 25, 14, 2, MANSION_3 - warp 6, 1, 1, MANSION_3 - - db 0 ; signs - - db 4 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 3, 17, WALK, 2, 1, OPP_BURGLAR, 7 - object SPRITE_BALL, 28, 7, STAY, NONE, 2, CALCIUM - object SPRITE_BOOK_MAP_DEX, 18, 2, STAY, NONE, 3 ; person - object SPRITE_BOOK_MAP_DEX, 3, 22, STAY, NONE, 4 ; person - - ; warp-to - warp_to 5, 10, MANSION_2_WIDTH ; MANSION_1 - warp_to 7, 10, MANSION_2_WIDTH ; MANSION_3 - warp_to 25, 14, MANSION_2_WIDTH ; MANSION_3 - warp_to 6, 1, MANSION_2_WIDTH ; MANSION_3 diff --git a/data/mapObjects/mtmoon2.asm b/data/mapObjects/mtmoon2.asm deleted file mode 100755 index abff4094..00000000 --- a/data/mapObjects/mtmoon2.asm +++ /dev/null @@ -1,26 +0,0 @@ -MtMoon2Object: - db $3 ; border block - - db 8 ; warps - warp 5, 5, 2, MT_MOON_1 - warp 17, 11, 0, MT_MOON_3 - warp 25, 9, 3, MT_MOON_1 - warp 25, 15, 4, MT_MOON_1 - warp 21, 17, 1, MT_MOON_3 - warp 13, 27, 2, MT_MOON_3 - warp 23, 3, 3, MT_MOON_3 - warp 27, 3, 2, -1 - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 5, 5, MT_MOON_2_WIDTH ; MT_MOON_1 - warp_to 17, 11, MT_MOON_2_WIDTH ; MT_MOON_3 - warp_to 25, 9, MT_MOON_2_WIDTH ; MT_MOON_1 - warp_to 25, 15, MT_MOON_2_WIDTH ; MT_MOON_1 - warp_to 21, 17, MT_MOON_2_WIDTH ; MT_MOON_3 - warp_to 13, 27, MT_MOON_2_WIDTH ; MT_MOON_3 - warp_to 23, 3, MT_MOON_2_WIDTH ; MT_MOON_3 - warp_to 27, 3, MT_MOON_2_WIDTH diff --git a/data/mapObjects/pokemontower2.asm b/data/mapObjects/pokemontower2.asm deleted file mode 100755 index 80615cd5..00000000 --- a/data/mapObjects/pokemontower2.asm +++ /dev/null @@ -1,16 +0,0 @@ -PokemonTower2Object: - db $1 ; border block - - db 2 ; warps - warp 3, 9, 0, POKEMONTOWER_3 - warp 18, 9, 2, POKEMONTOWER_1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person - object SPRITE_MEDIUM, 3, 7, STAY, RIGHT, 2 ; person - - ; warp-to - warp_to 3, 9, POKEMONTOWER_2_WIDTH ; POKEMONTOWER_3 - warp_to 18, 9, POKEMONTOWER_2_WIDTH ; POKEMONTOWER_1 diff --git a/data/mapObjects/rockethideout2.asm b/data/mapObjects/rockethideout2.asm deleted file mode 100755 index 328a4fb5..00000000 --- a/data/mapObjects/rockethideout2.asm +++ /dev/null @@ -1,25 +0,0 @@ -RocketHideout2Object: - db $2e ; border block - - db 5 ; warps - warp 27, 8, 0, ROCKET_HIDEOUT_1 - warp 21, 8, 0, ROCKET_HIDEOUT_3 - warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR - warp 21, 22, 3, ROCKET_HIDEOUT_1 - warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR - - db 0 ; signs - - db 5 ; objects - object SPRITE_ROCKET, 20, 12, STAY, DOWN, 1, OPP_ROCKET, 13 - object SPRITE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE - object SPRITE_BALL, 16, 8, STAY, NONE, 3, NUGGET - object SPRITE_BALL, 6, 12, STAY, NONE, 4, TM_07 - object SPRITE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION - - ; warp-to - warp_to 27, 8, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_1 - warp_to 21, 8, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_3 - warp_to 24, 19, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_ELEVATOR - warp_to 21, 22, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_1 - warp_to 25, 19, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/rockethideoutelevator.asm b/data/mapObjects/rockethideoutelevator.asm deleted file mode 100755 index 583c9f89..00000000 --- a/data/mapObjects/rockethideoutelevator.asm +++ /dev/null @@ -1,15 +0,0 @@ -RocketHideoutElevatorObject: - db $f ; border block - - db 2 ; warps - warp 2, 1, 2, ROCKET_HIDEOUT_1 - warp 3, 1, 4, ROCKET_HIDEOUT_1 - - db 1 ; signs - sign 1, 1, 1 ; RocketHideoutElevatorText1 - - db 0 ; objects - - ; warp-to - warp_to 2, 1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_1 - warp_to 3, 1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_1 diff --git a/data/mapObjects/seafoamislands1.asm b/data/mapObjects/seafoamislands1.asm deleted file mode 100755 index a1617004..00000000 --- a/data/mapObjects/seafoamislands1.asm +++ /dev/null @@ -1,30 +0,0 @@ -SeafoamIslands1Object: - db $7d ; border block - - db 7 ; warps - warp 4, 17, 0, -1 - warp 5, 17, 0, -1 - warp 26, 17, 1, -1 - warp 27, 17, 1, -1 - warp 7, 5, 1, SEAFOAM_ISLANDS_2 - warp 25, 3, 6, SEAFOAM_ISLANDS_2 - warp 23, 15, 4, SEAFOAM_ISLANDS_2 - - db 0 ; signs - - db 2 ; objects - object SPRITE_BOULDER, 18, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object SPRITE_BOULDER, 26, 7, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person - - ; warp-to - warp_to 4, 17, SEAFOAM_ISLANDS_1_WIDTH - warp_to 5, 17, SEAFOAM_ISLANDS_1_WIDTH - warp_to 26, 17, SEAFOAM_ISLANDS_1_WIDTH - warp_to 27, 17, SEAFOAM_ISLANDS_1_WIDTH - warp_to 7, 5, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 - warp_to 25, 3, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 - warp_to 23, 15, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 - - ; holes - warp_to 17, 6, SEAFOAM_ISLANDS_1_WIDTH - warp_to 24, 6, SEAFOAM_ISLANDS_1_WIDTH diff --git a/data/mapObjects/seafoamislands2.asm b/data/mapObjects/seafoamislands2.asm deleted file mode 100755 index 76c2ce3c..00000000 --- a/data/mapObjects/seafoamislands2.asm +++ /dev/null @@ -1,26 +0,0 @@ -SeafoamIslands2Object: - db $7d ; border block - - db 7 ; warps - warp 4, 2, 0, SEAFOAM_ISLANDS_3 - warp 7, 5, 4, SEAFOAM_ISLANDS_1 - warp 13, 7, 2, SEAFOAM_ISLANDS_3 - warp 19, 15, 3, SEAFOAM_ISLANDS_3 - warp 23, 15, 6, SEAFOAM_ISLANDS_1 - warp 25, 11, 5, SEAFOAM_ISLANDS_3 - warp 25, 3, 5, SEAFOAM_ISLANDS_1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_BOULDER, 17, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object SPRITE_BOULDER, 22, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person - - ; warp-to - warp_to 4, 2, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 - warp_to 7, 5, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1 - warp_to 13, 7, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 - warp_to 19, 15, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 - warp_to 23, 15, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1 - warp_to 25, 11, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 - warp_to 25, 3, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1 diff --git a/data/mapObjects/seafoamislands3.asm b/data/mapObjects/seafoamislands3.asm deleted file mode 100755 index a5cb848a..00000000 --- a/data/mapObjects/seafoamislands3.asm +++ /dev/null @@ -1,26 +0,0 @@ -SeafoamIslands3Object: - db $7d ; border block - - db 7 ; warps - warp 5, 3, 0, SEAFOAM_ISLANDS_2 - warp 5, 13, 0, SEAFOAM_ISLANDS_4 - warp 13, 7, 2, SEAFOAM_ISLANDS_2 - warp 19, 15, 3, SEAFOAM_ISLANDS_2 - warp 25, 3, 3, SEAFOAM_ISLANDS_4 - warp 25, 11, 5, SEAFOAM_ISLANDS_2 - warp 25, 14, 4, SEAFOAM_ISLANDS_4 - - db 0 ; signs - - db 2 ; objects - object SPRITE_BOULDER, 18, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object SPRITE_BOULDER, 23, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person - - ; warp-to - warp_to 5, 3, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 - warp_to 5, 13, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_4 - warp_to 13, 7, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 - warp_to 19, 15, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 - warp_to 25, 3, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_4 - warp_to 25, 11, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 - warp_to 25, 14, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_4 diff --git a/data/mapObjects/seafoamislands4.asm b/data/mapObjects/seafoamislands4.asm deleted file mode 100755 index 0faaae28..00000000 --- a/data/mapObjects/seafoamislands4.asm +++ /dev/null @@ -1,30 +0,0 @@ -SeafoamIslands4Object: - db $7d ; border block - - db 7 ; warps - warp 5, 12, 1, SEAFOAM_ISLANDS_3 - warp 8, 6, 2, SEAFOAM_ISLANDS_5 - warp 25, 4, 3, SEAFOAM_ISLANDS_5 - warp 25, 3, 4, SEAFOAM_ISLANDS_3 - warp 25, 14, 6, SEAFOAM_ISLANDS_3 - warp 20, 17, 0, SEAFOAM_ISLANDS_5 - warp 21, 17, 1, SEAFOAM_ISLANDS_5 - - db 0 ; signs - - db 6 ; objects - object SPRITE_BOULDER, 5, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object SPRITE_BOULDER, 3, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person - object SPRITE_BOULDER, 8, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person - object SPRITE_BOULDER, 9, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person - object SPRITE_BOULDER, 18, 6, STAY, NONE, 5 ; person - object SPRITE_BOULDER, 19, 6, STAY, NONE, 6 ; person - - ; warp-to - warp_to 5, 12, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_3 - warp_to 8, 6, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 - warp_to 25, 4, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 - warp_to 25, 3, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_3 - warp_to 25, 14, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_3 - warp_to 20, 17, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 - warp_to 21, 17, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 diff --git a/data/mapObjects/seafoamislands5.asm b/data/mapObjects/seafoamislands5.asm deleted file mode 100755 index 9bd82887..00000000 --- a/data/mapObjects/seafoamislands5.asm +++ /dev/null @@ -1,23 +0,0 @@ -SeafoamIslands5Object: - db $7d ; border block - - db 4 ; warps - warp 20, 17, 5, SEAFOAM_ISLANDS_4 - warp 21, 17, 6, SEAFOAM_ISLANDS_4 - warp 11, 7, 1, SEAFOAM_ISLANDS_4 - warp 25, 4, 2, SEAFOAM_ISLANDS_4 - - db 2 ; signs - sign 9, 15, 4 ; SeafoamIslands5Text4 - sign 23, 1, 5 ; SeafoamIslands5Text5 - - db 3 ; objects - object SPRITE_BOULDER, 4, 15, STAY, NONE, 1 ; person - object SPRITE_BOULDER, 5, 15, STAY, NONE, 2 ; person - object SPRITE_BIRD, 6, 1, STAY, DOWN, 3, ARTICUNO, 50 - - ; warp-to - warp_to 20, 17, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 - warp_to 21, 17, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 - warp_to 11, 7, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 - warp_to 25, 4, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 diff --git a/data/mapObjects/ssanne1.asm b/data/mapObjects/ssanne1.asm deleted file mode 100755 index 9d5ddd1f..00000000 --- a/data/mapObjects/ssanne1.asm +++ /dev/null @@ -1,34 +0,0 @@ -SSAnne1Object: - db $c ; border block - - db 11 ; warps - warp 26, 0, 1, VERMILION_DOCK - warp 27, 0, 1, VERMILION_DOCK - warp 31, 8, 0, SS_ANNE_8 - warp 23, 8, 1, SS_ANNE_8 - warp 19, 8, 2, SS_ANNE_8 - warp 15, 8, 3, SS_ANNE_8 - warp 11, 8, 4, SS_ANNE_8 - warp 7, 8, 5, SS_ANNE_8 - warp 2, 6, 6, SS_ANNE_2 - warp 37, 15, 5, SS_ANNE_4 - warp 3, 16, 0, SS_ANNE_6 - - db 0 ; signs - - db 2 ; objects - object SPRITE_WAITER, 12, 6, WALK, 2, 1 ; person - object SPRITE_SAILOR, 27, 5, STAY, NONE, 2 ; person - - ; warp-to - warp_to 26, 0, SS_ANNE_1_WIDTH ; VERMILION_DOCK - warp_to 27, 0, SS_ANNE_1_WIDTH ; VERMILION_DOCK - warp_to 31, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 - warp_to 23, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 - warp_to 19, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 - warp_to 15, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 - warp_to 11, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 - warp_to 7, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8 - warp_to 2, 6, SS_ANNE_1_WIDTH ; SS_ANNE_2 - warp_to 37, 15, SS_ANNE_1_WIDTH ; SS_ANNE_4 - warp_to 3, 16, SS_ANNE_1_WIDTH ; SS_ANNE_6 diff --git a/data/mapObjects/ssanne10.asm b/data/mapObjects/ssanne10.asm deleted file mode 100755 index 93fb2cde..00000000 --- a/data/mapObjects/ssanne10.asm +++ /dev/null @@ -1,41 +0,0 @@ -SSAnne10Object: - db $c ; border block - - db 10 ; warps - warp 2, 5, 4, SS_ANNE_4 - warp 3, 5, 4, SS_ANNE_4 - warp 12, 5, 3, SS_ANNE_4 - warp 13, 5, 3, SS_ANNE_4 - warp 22, 5, 2, SS_ANNE_4 - warp 23, 5, 2, SS_ANNE_4 - warp 2, 15, 1, SS_ANNE_4 - warp 3, 15, 1, SS_ANNE_4 - warp 12, 15, 0, SS_ANNE_4 - warp 13, 15, 0, SS_ANNE_4 - - db 0 ; signs - - db 11 ; objects - object SPRITE_SAILOR, 0, 13, STAY, DOWN, 1, OPP_SAILOR, 3 - object SPRITE_SAILOR, 2, 11, STAY, DOWN, 2, OPP_SAILOR, 4 - object SPRITE_SAILOR, 12, 3, STAY, LEFT, 3, OPP_SAILOR, 5 - object SPRITE_SAILOR, 22, 2, STAY, DOWN, 4, OPP_SAILOR, 6 - object SPRITE_SAILOR, 0, 2, STAY, RIGHT, 5, OPP_SAILOR, 7 - object SPRITE_FISHER2, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2 - object SPRITE_BLACK_HAIR_BOY_2, 10, 13, STAY, RIGHT, 7 ; person - object SPRITE_SLOWBRO, 11, 12, STAY, NONE, 8 ; person - object SPRITE_BALL, 20, 2, STAY, NONE, 9, ETHER - object SPRITE_BALL, 10, 2, STAY, NONE, 10, TM_44 - object SPRITE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION - - ; warp-to - warp_to 2, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to 3, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to 12, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to 13, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to 22, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to 23, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to 2, 15, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to 3, 15, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to 12, 15, SS_ANNE_10_WIDTH ; SS_ANNE_4 - warp_to 13, 15, SS_ANNE_10_WIDTH ; SS_ANNE_4 diff --git a/data/mapObjects/ssanne2.asm b/data/mapObjects/ssanne2.asm deleted file mode 100755 index 3a685610..00000000 --- a/data/mapObjects/ssanne2.asm +++ /dev/null @@ -1,30 +0,0 @@ -SSAnne2Object: - db $c ; border block - - db 9 ; warps - warp 9, 11, 0, SS_ANNE_9 - warp 13, 11, 2, SS_ANNE_9 - warp 17, 11, 4, SS_ANNE_9 - warp 21, 11, 6, SS_ANNE_9 - warp 25, 11, 8, SS_ANNE_9 - warp 29, 11, 10, SS_ANNE_9 - warp 2, 4, 8, SS_ANNE_1 - warp 2, 12, 1, SS_ANNE_3 - warp 36, 4, 0, SS_ANNE_7 - - db 0 ; signs - - db 2 ; objects - object SPRITE_WAITER, 3, 7, WALK, 1, 1 ; person - object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_SONY1, 1 - - ; warp-to - warp_to 9, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9 - warp_to 13, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9 - warp_to 17, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9 - warp_to 21, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9 - warp_to 25, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9 - warp_to 29, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9 - warp_to 2, 4, SS_ANNE_2_WIDTH ; SS_ANNE_1 - warp_to 2, 12, SS_ANNE_2_WIDTH ; SS_ANNE_3 - warp_to 36, 4, SS_ANNE_2_WIDTH ; SS_ANNE_7 diff --git a/data/mapObjects/ssanne3.asm b/data/mapObjects/ssanne3.asm deleted file mode 100755 index 3a45e1f9..00000000 --- a/data/mapObjects/ssanne3.asm +++ /dev/null @@ -1,15 +0,0 @@ -SSAnne3Object: - db $c ; border block - - db 2 ; warps - warp 0, 3, 0, SS_ANNE_5 - warp 19, 3, 7, SS_ANNE_2 - - db 0 ; signs - - db 1 ; objects - object SPRITE_SAILOR, 9, 3, WALK, 2, 1 ; person - - ; warp-to - warp_to 0, 3, SS_ANNE_3_WIDTH ; SS_ANNE_5 - warp_to 19, 3, SS_ANNE_3_WIDTH ; SS_ANNE_2 diff --git a/data/mapObjects/ssanne4.asm b/data/mapObjects/ssanne4.asm deleted file mode 100755 index 7f0d6853..00000000 --- a/data/mapObjects/ssanne4.asm +++ /dev/null @@ -1,22 +0,0 @@ -SSAnne4Object: - db $c ; border block - - db 6 ; warps - warp 23, 3, 8, SS_ANNE_10 - warp 19, 3, 6, SS_ANNE_10 - warp 15, 3, 4, SS_ANNE_10 - warp 11, 3, 2, SS_ANNE_10 - warp 7, 3, 0, SS_ANNE_10 - warp 27, 5, 9, SS_ANNE_1 - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 23, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10 - warp_to 19, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10 - warp_to 15, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10 - warp_to 11, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10 - warp_to 7, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10 - warp_to 27, 5, SS_ANNE_4_WIDTH ; SS_ANNE_1 diff --git a/data/mapObjects/ssanne9.asm b/data/mapObjects/ssanne9.asm deleted file mode 100755 index 455e6983..00000000 --- a/data/mapObjects/ssanne9.asm +++ /dev/null @@ -1,47 +0,0 @@ -SSAnne9Object: - db $c ; border block - - db 12 ; warps - warp 2, 5, 0, SS_ANNE_2 - warp 3, 5, 0, SS_ANNE_2 - warp 12, 5, 1, SS_ANNE_2 - warp 13, 5, 1, SS_ANNE_2 - warp 22, 5, 2, SS_ANNE_2 - warp 23, 5, 2, SS_ANNE_2 - warp 2, 15, 3, SS_ANNE_2 - warp 3, 15, 3, SS_ANNE_2 - warp 12, 15, 4, SS_ANNE_2 - warp 13, 15, 4, SS_ANNE_2 - warp 22, 15, 5, SS_ANNE_2 - warp 23, 15, 5, SS_ANNE_2 - - db 0 ; signs - - db 13 ; objects - object SPRITE_GENTLEMAN, 10, 2, STAY, RIGHT, 1, OPP_GENTLEMAN, 3 - object SPRITE_FISHER2, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1 - object SPRITE_GENTLEMAN, 0, 14, STAY, RIGHT, 3, OPP_GENTLEMAN, 5 - object SPRITE_LASS, 2, 11, STAY, DOWN, 4, OPP_LASS, 12 - object SPRITE_GENTLEMAN, 1, 2, STAY, DOWN, 5 ; person - object SPRITE_BALL, 12, 1, STAY, NONE, 6, MAX_ETHER - object SPRITE_GENTLEMAN, 21, 2, STAY, DOWN, 7 ; person - object SPRITE_OLD_PERSON, 22, 1, STAY, DOWN, 8 ; person - object SPRITE_BALL, 0, 12, STAY, NONE, 9, RARE_CANDY - object SPRITE_GENTLEMAN, 12, 12, STAY, DOWN, 10 ; person - object SPRITE_YOUNG_BOY, 11, 14, STAY, NONE, 11 ; person - object SPRITE_BRUNETTE_GIRL, 22, 12, STAY, LEFT, 12 ; person - object SPRITE_FOULARD_WOMAN, 20, 12, STAY, RIGHT, 13 ; person - - ; warp-to - warp_to 2, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to 3, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to 12, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to 13, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to 22, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to 23, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to 2, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to 3, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to 12, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to 13, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to 22, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2 - warp_to 23, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2 diff --git a/data/mapObjects/undergroundpathentranceroute5.asm b/data/mapObjects/undergroundpathentranceroute5.asm deleted file mode 100755 index 3e3d52dd..00000000 --- a/data/mapObjects/undergroundpathentranceroute5.asm +++ /dev/null @@ -1,17 +0,0 @@ -UndergroundPathEntranceRoute5Object: - db $a ; border block - - db 3 ; warps - warp 3, 7, 3, -1 - warp 4, 7, 3, -1 - warp 4, 4, 0, UNDERGROUND_PATH_NS - - db 0 ; signs - - db 1 ; objects - object SPRITE_LITTLE_GIRL, 2, 3, STAY, NONE, 1 ; person - - ; warp-to - warp_to 3, 7, PATH_ENTRANCE_ROUTE_5_WIDTH - warp_to 4, 7, PATH_ENTRANCE_ROUTE_5_WIDTH - warp_to 4, 4, PATH_ENTRANCE_ROUTE_5_WIDTH ; UNDERGROUND_PATH_NS diff --git a/data/mapObjects/undergroundpathentranceroute6.asm b/data/mapObjects/undergroundpathentranceroute6.asm deleted file mode 100755 index f9c6d224..00000000 --- a/data/mapObjects/undergroundpathentranceroute6.asm +++ /dev/null @@ -1,17 +0,0 @@ -UndergroundPathEntranceRoute6Object: - db $a ; border block - - db 3 ; warps - warp 3, 7, 3, -1 - warp 4, 7, 3, -1 - warp 4, 4, 1, UNDERGROUND_PATH_NS - - db 0 ; signs - - db 1 ; objects - object SPRITE_GIRL, 2, 3, STAY, NONE, 1 ; person - - ; warp-to - warp_to 3, 7, PATH_ENTRANCE_ROUTE_6_WIDTH - warp_to 4, 7, PATH_ENTRANCE_ROUTE_6_WIDTH - warp_to 4, 4, PATH_ENTRANCE_ROUTE_6_WIDTH ; UNDERGROUND_PATH_NS diff --git a/data/mapObjects/undergroundpathentranceroute7.asm b/data/mapObjects/undergroundpathentranceroute7.asm deleted file mode 100755 index 80dde9a3..00000000 --- a/data/mapObjects/undergroundpathentranceroute7.asm +++ /dev/null @@ -1,17 +0,0 @@ -UndergroundPathEntranceRoute7Object: - db $a ; border block - - db 3 ; warps - warp 3, 7, 4, -1 - warp 4, 7, 4, -1 - warp 4, 4, 0, UNDERGROUND_PATH_WE - - db 0 ; signs - - db 1 ; objects - object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 1 ; person - - ; warp-to - warp_to 3, 7, PATH_ENTRANCE_ROUTE_7_WIDTH - warp_to 4, 7, PATH_ENTRANCE_ROUTE_7_WIDTH - warp_to 4, 4, PATH_ENTRANCE_ROUTE_7_WIDTH ; UNDERGROUND_PATH_WE diff --git a/data/mapObjects/undergroundpathentranceroute7copy.asm b/data/mapObjects/undergroundpathentranceroute7copy.asm deleted file mode 100755 index 20b74599..00000000 --- a/data/mapObjects/undergroundpathentranceroute7copy.asm +++ /dev/null @@ -1,18 +0,0 @@ -UndergroundPathEntranceRoute7CopyObject: - db $a ; border block - - db 3 ; warps - warp 3, 7, 5, -1 - warp 4, 7, 5, -1 - warp 4, 4, 0, UNDERGROUND_PATH_WE - - db 0 ; signs - - db 2 ; objects - object SPRITE_GIRL, 3, 2, STAY, NONE, 1 ; person - object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 2 ; person - - ; warp-to - warp_to 3, 7, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH - warp_to 4, 7, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH - warp_to 4, 4, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH ; UNDERGROUND_PATH_WE diff --git a/data/mapObjects/undergroundpathentranceroute8.asm b/data/mapObjects/undergroundpathentranceroute8.asm deleted file mode 100755 index 02390322..00000000 --- a/data/mapObjects/undergroundpathentranceroute8.asm +++ /dev/null @@ -1,17 +0,0 @@ -UndergroundPathEntranceRoute8Object: - db $a ; border block - - db 3 ; warps - warp 3, 7, 4, -1 - warp 4, 7, 4, -1 - warp 4, 4, 1, UNDERGROUND_PATH_WE - - db 0 ; signs - - db 1 ; objects - object SPRITE_GIRL, 3, 4, STAY, NONE, 1 ; person - - ; warp-to - warp_to 3, 7, PATH_ENTRANCE_ROUTE_8_WIDTH - warp_to 4, 7, PATH_ENTRANCE_ROUTE_8_WIDTH - warp_to 4, 4, PATH_ENTRANCE_ROUTE_8_WIDTH ; UNDERGROUND_PATH_WE diff --git a/data/mapObjects/undergroundpathns.asm b/data/mapObjects/undergroundpathns.asm deleted file mode 100755 index 00b096e8..00000000 --- a/data/mapObjects/undergroundpathns.asm +++ /dev/null @@ -1,14 +0,0 @@ -UndergroundPathNSObject: - db $1 ; border block - - db 2 ; warps - warp 5, 4, 2, PATH_ENTRANCE_ROUTE_5 - warp 2, 41, 2, PATH_ENTRANCE_ROUTE_6 - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 5, 4, UNDERGROUND_PATH_NS_WIDTH ; PATH_ENTRANCE_ROUTE_5 - warp_to 2, 41, UNDERGROUND_PATH_NS_WIDTH ; PATH_ENTRANCE_ROUTE_6 diff --git a/data/mapObjects/undergroundpathwe.asm b/data/mapObjects/undergroundpathwe.asm deleted file mode 100755 index 0af2ccc3..00000000 --- a/data/mapObjects/undergroundpathwe.asm +++ /dev/null @@ -1,14 +0,0 @@ -UndergroundPathWEObject: - db $1 ; border block - - db 2 ; warps - warp 2, 5, 2, PATH_ENTRANCE_ROUTE_7 - warp 47, 2, 2, PATH_ENTRANCE_ROUTE_8 - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 2, 5, UNDERGROUND_PATH_WE_WIDTH ; PATH_ENTRANCE_ROUTE_7 - warp_to 47, 2, UNDERGROUND_PATH_WE_WIDTH ; PATH_ENTRANCE_ROUTE_8 diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm deleted file mode 100755 index 97ff99a8..00000000 --- a/data/mapObjects/unknowndungeon1.asm +++ /dev/null @@ -1,31 +0,0 @@ -UnknownDungeon1Object: - db $7d ; border block - - db 9 ; warps - warp 24, 17, 6, -1 - warp 25, 17, 6, -1 - warp 27, 1, 0, UNKNOWN_DUNGEON_2 - warp 23, 7, 1, UNKNOWN_DUNGEON_2 - warp 18, 9, 2, UNKNOWN_DUNGEON_2 - warp 7, 1, 3, UNKNOWN_DUNGEON_2 - warp 1, 3, 4, UNKNOWN_DUNGEON_2 - warp 3, 11, 5, UNKNOWN_DUNGEON_2 - warp 0, 6, 0, UNKNOWN_DUNGEON_3 - - db 0 ; signs - - db 3 ; objects - object SPRITE_BALL, 7, 13, STAY, NONE, 1, FULL_RESTORE - object SPRITE_BALL, 19, 3, STAY, NONE, 2, MAX_ELIXER - object SPRITE_BALL, 5, 0, STAY, NONE, 3, NUGGET - - ; warp-to - warp_to 24, 17, UNKNOWN_DUNGEON_1_WIDTH - warp_to 25, 17, UNKNOWN_DUNGEON_1_WIDTH - warp_to 27, 1, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 - warp_to 23, 7, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 - warp_to 18, 9, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 - warp_to 7, 1, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 - warp_to 1, 3, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 - warp_to 3, 11, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 - warp_to 0, 6, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_3 diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm deleted file mode 100755 index 51626589..00000000 --- a/data/mapObjects/unknowndungeon2.asm +++ /dev/null @@ -1,25 +0,0 @@ -UnknownDungeon2Object: - db $7d ; border block - - db 6 ; warps - warp 29, 1, 2, UNKNOWN_DUNGEON_1 - warp 22, 6, 3, UNKNOWN_DUNGEON_1 - warp 19, 7, 4, UNKNOWN_DUNGEON_1 - warp 9, 1, 5, UNKNOWN_DUNGEON_1 - warp 1, 3, 6, UNKNOWN_DUNGEON_1 - warp 3, 11, 7, UNKNOWN_DUNGEON_1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_BALL, 29, 9, STAY, NONE, 1, PP_UP - object SPRITE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL - object SPRITE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE - - ; warp-to - warp_to 29, 1, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 - warp_to 22, 6, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 - warp_to 19, 7, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 - warp_to 9, 1, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 - warp_to 1, 3, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 - warp_to 3, 11, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index ab8ae1ca..3dc1988a 100755 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -1,176 +1,176 @@ ; see also MapHeaderPointers MapHeaderBanks: - db BANK(PalletTown_h) ;PALLET_TOWN - db BANK(ViridianCity_h) ; VIRIDIAN_CITY - db BANK(PewterCity_h) ; PEWTER_CITY - db BANK(CeruleanCity_h) ; CERULEAN_CITY - db BANK(LavenderTown_h) ; LAVENDER_TOWN - db BANK(VermilionCity_h) ; VERMILION_CITY - db BANK(CeladonCity_h) ; CELADON_CITY - db BANK(FuchsiaCity_h) ; FUCHSIA_CITY - db BANK(CinnabarIsland_h) ; CINNABAR_ISLAND - db BANK(IndigoPlateau_h) ; INDIGO_PLATEAU - db BANK(SaffronCity_h) ; SAFFRON_CITY - db $1 ; unused - db BANK(Route1_h) ; ROUTE_1 - db BANK(Route2_h) ; ROUTE_2 - db BANK(Route3_h) ; ROUTE_3 - db BANK(Route4_h) ; ROUTE_4 - db BANK(Route5_h) ; ROUTE_5 - db BANK(Route6_h) ; ROUTE_6 - db BANK(Route7_h) ; ROUTE_7 - db BANK(Route8_h) ; ROUTE_8 - db BANK(Route9_h) ; ROUTE_9 - db BANK(Route10_h) ; ROUTE_10 - db BANK(Route11_h) ; ROUTE_11 - db BANK(Route12_h) ; ROUTE_12 - db BANK(Route13_h) ; ROUTE_13 - db BANK(Route14_h) ; ROUTE_14 - db BANK(Route15_h) ; ROUTE_15 - db BANK(Route16_h) ; ROUTE_16 - db BANK(Route17_h) ; ROUTE_17 - db BANK(Route18_h) ; ROUTE_18 - db BANK(Route19_h) ; ROUTE_19 - db BANK(Route20_h) ; ROUTE_20 - db BANK(Route21_h) ; ROUTE_21 - db BANK(Route22_h) ; ROUTE_22 - db BANK(Route23_h) ; ROUTE_23 - db BANK(Route24_h) ; ROUTE_24 - db BANK(Route25_h) ; ROUTE_25 + db BANK(PalletTown_h) + db BANK(ViridianCity_h) + db BANK(PewterCity_h) + db BANK(CeruleanCity_h) + db BANK(LavenderTown_h) + db BANK(VermilionCity_h) + db BANK(CeladonCity_h) + db BANK(FuchsiaCity_h) + db BANK(CinnabarIsland_h) + db BANK(IndigoPlateau_h) + db BANK(SaffronCity_h) + db $01 ; UNUSED_MAP_0B + db BANK(Route1_h) + db BANK(Route2_h) + db BANK(Route3_h) + db BANK(Route4_h) + db BANK(Route5_h) + db BANK(Route6_h) + db BANK(Route7_h) + db BANK(Route8_h) + db BANK(Route9_h) + db BANK(Route10_h) + db BANK(Route11_h) + db BANK(Route12_h) + db BANK(Route13_h) + db BANK(Route14_h) + db BANK(Route15_h) + db BANK(Route16_h) + db BANK(Route17_h) + db BANK(Route18_h) + db BANK(Route19_h) + db BANK(Route20_h) + db BANK(Route21_h) + db BANK(Route22_h) + db BANK(Route23_h) + db BANK(Route24_h) + db BANK(Route25_h) db BANK(RedsHouse1F_h) db BANK(RedsHouse2F_h) db BANK(BluesHouse_h) db BANK(OaksLab_h) db BANK(ViridianPokecenter_h) db BANK(ViridianMart_h) - db BANK(School_h) - db BANK(ViridianHouse_h) + db BANK(ViridianSchoolHouse_h) + db BANK(ViridianNicknameHouse_h) db BANK(ViridianGym_h) db BANK(DiglettsCaveRoute2_h) - db BANK(ViridianForestExit_h) - db BANK(Route2House_h) + db BANK(ViridianForestNorthGate_h) + db BANK(Route2TradeHouse_h) db BANK(Route2Gate_h) - db BANK(ViridianForestEntrance_h) + db BANK(ViridianForestSouthGate_h) db BANK(ViridianForest_h) db BANK(Museum1F_h) db BANK(Museum2F_h) db BANK(PewterGym_h) - db BANK(PewterHouse1_h) + db BANK(PewterNidoranHouse_h) db BANK(PewterMart_h) - db BANK(PewterHouse2_h) + db BANK(PewterSpeechHouse_h) db BANK(PewterPokecenter_h) - db BANK(MtMoon1_h) - db BANK(MtMoon2_h) - db BANK(MtMoon3_h) - db BANK(CeruleanHouseTrashed_h) - db BANK(CeruleanHouse1_h) + db BANK(MtMoon1F_h) + db BANK(MtMoonB1F_h) + db BANK(MtMoonB2F_h) + db BANK(CeruleanTrashedHouse_h) + db BANK(CeruleanTradeHouse_h) db BANK(CeruleanPokecenter_h) db BANK(CeruleanGym_h) db BANK(BikeShop_h) db BANK(CeruleanMart_h) db BANK(MtMoonPokecenter_h) - db BANK(CeruleanHouseTrashed_h) + db BANK(CeruleanTrashedHouse_h) db BANK(Route5Gate_h) - db BANK(UndergroundPathEntranceRoute5_h) - db BANK(DayCareM_h) + db BANK(UndergroundPathRoute5_h) + db BANK(Daycare_h) db BANK(Route6Gate_h) - db BANK(UndergroundPathEntranceRoute6_h) - db BANK(UndergroundPathEntranceRoute6_h) ;FREEZE + db BANK(UndergroundPathRoute6_h) + db BANK(UndergroundPathRoute6_h) ; UNDERGROUND_PATH_ROUTE_6_COPY db BANK(Route7Gate_h) - db BANK(UndergroundPathEntranceRoute7_h) - db BANK(UndergroundPathEntranceRoute7Copy_h) ;FREEZE + db BANK(UndergroundPathRoute7_h) + db BANK(UndergroundPathRoute7Copy_h) db BANK(Route8Gate_h) - db BANK(UndergroundPathEntranceRoute8_h) + db BANK(UndergroundPathRoute8_h) db BANK(RockTunnelPokecenter_h) - db BANK(RockTunnel1_h) + db BANK(RockTunnel1F_h) db BANK(PowerPlant_h) - db BANK(Route11Gate_h) - db BANK(DiglettsCaveEntranceRoute11_h) - db BANK(Route11GateUpstairs_h) - db BANK(Route12Gate_h) + db BANK(Route11Gate1F_h) + db BANK(DiglettsCaveRoute11_h) + db BANK(Route11Gate2F_h) + db BANK(Route12Gate1F_h) db BANK(BillsHouse_h) db BANK(VermilionPokecenter_h) - db BANK(FanClub_h) + db BANK(PokemonFanClub_h) db BANK(VermilionMart_h) db BANK(VermilionGym_h) - db BANK(VermilionHouse1_h) + db BANK(VermilionPidgeyHouse_h) db BANK(VermilionDock_h) - db BANK(SSAnne1_h) - db BANK(SSAnne2_h) - db BANK(SSAnne3_h) - db BANK(SSAnne4_h) - db BANK(SSAnne5_h) - db BANK(SSAnne6_h) - db BANK(SSAnne7_h) - db BANK(SSAnne8_h) - db BANK(SSAnne9_h) - db BANK(SSAnne10_h) - db $1D ;unused - db $1D ;unused - db $1D ;unused - db BANK(VictoryRoad1_h) - db $1D ;unused - db $1D ;unused - db $1D ;unused - db $1D ;unused - db BANK(Lance_h) - db $1D ;unused - db $1D ;unused - db $1D ;unused - db $1D ;unused - db BANK(HallofFameRoom_h) - db BANK(UndergroundPathNS_h) - db BANK(Gary_h) - db BANK(UndergroundPathWE_h) - db BANK(CeladonMart1_h) - db BANK(CeladonMart2_h) - db BANK(CeladonMart3_h) - db BANK(CeladonMart4_h) + db BANK(SSAnne1F_h) + db BANK(SSAnne2F_h) + db BANK(SSAnne3F_h) + db BANK(SSAnneB1F_h) + db BANK(SSAnneBow_h) + db BANK(SSAnneKitchen_h) + db BANK(SSAnneCaptainsRoom_h) + db BANK(SSAnne1FRooms_h) + db BANK(SSAnne2FRooms_h) + db BANK(SSAnneB1FRooms_h) + db $1D ; UNUSED_MAP_69 + db $1D ; UNUSED_MAP_6A + db $1D ; UNUSED_MAP_6B + db BANK(VictoryRoad1F_h) + db $1D ; UNUSED_MAP_6D + db $1D ; UNUSED_MAP_6E + db $1D ; UNUSED_MAP_6F + db $1D ; UNUSED_MAP_70 + db BANK(LancesRoom_h) + db $1D ; UNUSED_MAP_72 + db $1D ; UNUSED_MAP_73 + db $1D ; UNUSED_MAP_74 + db $1D ; UNUSED_MAP_75 + db BANK(HallOfFame_h) + db BANK(UndergroundPathNorthSouth_h) + db BANK(ChampionsRoom_h) + db BANK(UndergroundPathWestEast_h) + db BANK(CeladonMart1F_h) + db BANK(CeladonMart2F_h) + db BANK(CeladonMart3F_h) + db BANK(CeladonMart4F_h) db BANK(CeladonMartRoof_h) db BANK(CeladonMartElevator_h) - db BANK(CeladonMansion1_h) - db BANK(CeladonMansion2_h) - db BANK(CeladonMansion3_h) - db BANK(CeladonMansion4_h) - db BANK(CeladonMansion5_h) + db BANK(CeladonMansion1F_h) + db BANK(CeladonMansion2F_h) + db BANK(CeladonMansion3F_h) + db BANK(CeladonMansionRoof_h) + db BANK(CeladonMansionRoofHouse_h) db BANK(CeladonPokecenter_h) db BANK(CeladonGym_h) - db BANK(CeladonGameCorner_h) - db BANK(CeladonMart5_h) - db BANK(CeladonPrizeRoom_h) + db BANK(GameCorner_h) + db BANK(CeladonMart5F_h) + db BANK(GameCornerPrizeRoom_h) db BANK(CeladonDiner_h) - db BANK(CeladonHouse_h) + db BANK(CeladonChiefHouse_h) db BANK(CeladonHotel_h) db BANK(LavenderPokecenter_h) - db BANK(PokemonTower1_h) - db BANK(PokemonTower2_h) - db BANK(PokemonTower3_h) - db BANK(PokemonTower4_h) - db BANK(PokemonTower5_h) - db BANK(PokemonTower6_h) - db BANK(PokemonTower7_h) - db BANK(LavenderHouse1_h) + db BANK(PokemonTower1F_h) + db BANK(PokemonTower2F_h) + db BANK(PokemonTower3F_h) + db BANK(PokemonTower4F_h) + db BANK(PokemonTower5F_h) + db BANK(PokemonTower6F_h) + db BANK(PokemonTower7F_h) + db BANK(MrFujisHouse_h) db BANK(LavenderMart_h) - db BANK(LavenderHouse2_h) + db BANK(LavenderCuboneHouse_h) db BANK(FuchsiaMart_h) - db BANK(FuchsiaHouse1_h) + db BANK(FuchsiaBillsGrandpasHouse_h) db BANK(FuchsiaPokecenter_h) - db BANK(FuchsiaHouse2_h) - db BANK(SafariZoneEntrance_h) + db BANK(WardensHouse_h) + db BANK(SafariZoneGate_h) db BANK(FuchsiaGym_h) db BANK(FuchsiaMeetingRoom_h) - db BANK(SeafoamIslands2_h) - db BANK(SeafoamIslands3_h) - db BANK(SeafoamIslands4_h) - db BANK(SeafoamIslands5_h) - db BANK(VermilionHouse2_h) - db BANK(FuchsiaHouse3_h) - db BANK(Mansion1_h) + db BANK(SeafoamIslandsB1F_h) + db BANK(SeafoamIslandsB2F_h) + db BANK(SeafoamIslandsB3F_h) + db BANK(SeafoamIslandsB4F_h) + db BANK(VermilionOldRodHouse_h) + db BANK(FuchsiaGoodRodHouse_h) + db BANK(PokemonMansion1F_h) db BANK(CinnabarGym_h) - db BANK(Lab1_h) - db BANK(Lab2_h) - db BANK(Lab3_h) - db BANK(Lab4_h) + db BANK(CinnabarLab_h) + db BANK(CinnabarLabTradeRoom_h) + db BANK(CinnabarLabMetronomeRoom_h) + db BANK(CinnabarLabFossilRoom_h) db BANK(CinnabarPokecenter_h) db BANK(CinnabarMart_h) db BANK(CinnabarMart_h) @@ -179,72 +179,72 @@ MapHeaderBanks: db BANK(CopycatsHouse2F_h) db BANK(FightingDojo_h) db BANK(SaffronGym_h) - db BANK(SaffronHouse1_h) + db BANK(SaffronPidgeyHouse_h) db BANK(SaffronMart_h) - db BANK(SilphCo1_h) + db BANK(SilphCo1F_h) db BANK(SaffronPokecenter_h) - db BANK(SaffronHouse2_h) - db BANK(Route15Gate_h) - db BANK(Route15GateUpstairs_h) - db BANK(Route16Gate_h) - db BANK(Route16GateUpstairs_h) - db BANK(Route16House_h) - db BANK(Route12House_h) - db BANK(Route18Gate_h) - db BANK(Route18GateUpstairs_h) - db BANK(SeafoamIslands1_h) + db BANK(MrPsychicsHouse_h) + db BANK(Route15Gate1F_h) + db BANK(Route15Gate2F_h) + db BANK(Route16Gate1F_h) + db BANK(Route16Gate2F_h) + db BANK(Route16FlyHouse_h) + db BANK(Route12SuperRodHouse_h) + db BANK(Route18Gate1F_h) + db BANK(Route18Gate2F_h) + db BANK(SeafoamIslands1F_h) db BANK(Route22Gate_h) - db BANK(VictoryRoad2_h) - db BANK(Route12GateUpstairs_h) - db BANK(VermilionHouse3_h) + db BANK(VictoryRoad2F_h) + db BANK(Route12Gate2F_h) + db BANK(VermilionTradeHouse_h) db BANK(DiglettsCave_h) - db BANK(VictoryRoad3_h) - db BANK(RocketHideout1_h) - db BANK(RocketHideout2_h) - db BANK(RocketHideout3_h) - db BANK(RocketHideout4_h) + db BANK(VictoryRoad3F_h) + db BANK(RocketHideoutB1F_h) + db BANK(RocketHideoutB2F_h) + db BANK(RocketHideoutB3F_h) + db BANK(RocketHideoutB4F_h) db BANK(RocketHideoutElevator_h) - db $01 - db $01 - db $01 - db BANK(SilphCo2_h) - db BANK(SilphCo3_h) - db BANK(SilphCo4_h) - db BANK(SilphCo5_h) - db BANK(SilphCo6_h) - db BANK(SilphCo7_h) - db BANK(SilphCo8_h) - db BANK(Mansion2_h) - db BANK(Mansion3_h) - db BANK(Mansion4_h) + db $01 ; UNUSED_MAP_CC + db $01 ; UNUSED_MAP_CD + db $01 ; UNUSED_MAP_CE + db BANK(SilphCo2F_h) + db BANK(SilphCo3F_h) + db BANK(SilphCo4F_h) + db BANK(SilphCo5F_h) + db BANK(SilphCo6F_h) + db BANK(SilphCo7F_h) + db BANK(SilphCo8F_h) + db BANK(PokemonMansion2F_h) + db BANK(PokemonMansion3F_h) + db BANK(PokemonMansionB1F_h) db BANK(SafariZoneEast_h) db BANK(SafariZoneNorth_h) db BANK(SafariZoneWest_h) db BANK(SafariZoneCenter_h) - db BANK(SafariZoneRestHouse1_h) + db BANK(SafariZoneCenterRestHouse_h) db BANK(SafariZoneSecretHouse_h) - db BANK(SafariZoneRestHouse2_h) - db BANK(SafariZoneRestHouse3_h) - db BANK(SafariZoneRestHouse4_h) - db BANK(UnknownDungeon2_h) - db BANK(UnknownDungeon3_h) - db BANK(UnknownDungeon1_h) - db BANK(NameRater_h) - db BANK(CeruleanHouse2_h) - db $01 - db BANK(RockTunnel2_h) - db BANK(SilphCo9_h) - db BANK(SilphCo10_h) - db BANK(SilphCo11_h) + db BANK(SafariZoneWestRestHouse_h) + db BANK(SafariZoneEastRestHouse_h) + db BANK(SafariZoneNorthRestHouse_h) + db BANK(CeruleanCave2F_h) + db BANK(CeruleanCaveB1F_h) + db BANK(CeruleanCave1F_h) + db BANK(NameRatersHouse_h) + db BANK(CeruleanBadgeHouse_h) + db $01 ; UNUSED_MAP_E7 + db BANK(RockTunnelB1F_h) + db BANK(SilphCo9F_h) + db BANK(SilphCo10F_h) + db BANK(SilphCo11F_h) db BANK(SilphCoElevator_h) - db $11 - db $11 + db $11 ; UNUSED_MAP_ED + db $11 ; UNUSED_MAP_EE db BANK(TradeCenter_h) db BANK(Colosseum_h) - db $11 - db $11 - db $11 - db $11 - db BANK(Lorelei_h) - db BANK(Bruno_h) - db BANK(Agatha_h) + db $11 ; UNUSED_MAP_F1 + db $11 ; UNUSED_MAP_F2 + db $11 ; UNUSED_MAP_F3 + db $11 ; UNUSED_MAP_F4 + db BANK(LoreleisRoom_h) + db BANK(BrunosRoom_h) + db BANK(AgathasRoom_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index b777e4ca..9d85eaae 100755 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -11,7 +11,7 @@ MapHeaderPointers:: dw CinnabarIsland_h dw IndigoPlateau_h dw SaffronCity_h - dw SaffronCity_h + dw SaffronCity_h ; UNUSED_MAP_0B dw Route1_h dw Route2_h dw Route3_h @@ -40,211 +40,211 @@ MapHeaderPointers:: dw RedsHouse1F_h dw RedsHouse2F_h dw BluesHouse_h - dw OaksLab_h ;id=40 + dw OaksLab_h dw ViridianPokecenter_h dw ViridianMart_h - dw School_h - dw ViridianHouse_h + dw ViridianSchoolHouse_h + dw ViridianNicknameHouse_h dw ViridianGym_h dw DiglettsCaveRoute2_h - dw ViridianForestExit_h - dw Route2House_h + dw ViridianForestNorthGate_h + dw Route2TradeHouse_h dw Route2Gate_h - dw ViridianForestEntrance_h ;id=50 + dw ViridianForestSouthGate_h dw ViridianForest_h dw Museum1F_h dw Museum2F_h dw PewterGym_h - dw PewterHouse1_h + dw PewterNidoranHouse_h dw PewterMart_h - dw PewterHouse2_h + dw PewterSpeechHouse_h dw PewterPokecenter_h - dw MtMoon1_h - dw MtMoon2_h ;id=60 - dw MtMoon3_h - dw CeruleanHouseTrashed_h - dw CeruleanHouse1_h + dw MtMoon1F_h + dw MtMoonB1F_h + dw MtMoonB2F_h + dw CeruleanTrashedHouse_h + dw CeruleanTradeHouse_h dw CeruleanPokecenter_h dw CeruleanGym_h dw BikeShop_h dw CeruleanMart_h dw MtMoonPokecenter_h - dw CeruleanHouseTrashed_h ; copy + dw CeruleanTrashedHouse_h ; CERULEAN_TRASHED_HOUSE_COPY dw Route5Gate_h - dw UndergroundPathEntranceRoute5_h - dw DayCareM_h + dw UndergroundPathRoute5_h + dw Daycare_h dw Route6Gate_h - dw UndergroundPathEntranceRoute6_h - dw UndergroundPathEntranceRoute6_h ; unused + dw UndergroundPathRoute6_h + dw UndergroundPathRoute6_h ; UNDERGROUND_PATH_ROUTE_6_COPY dw Route7Gate_h - dw UndergroundPathEntranceRoute7_h - dw UndergroundPathEntranceRoute7Copy_h + dw UndergroundPathRoute7_h + dw UndergroundPathRoute7Copy_h dw Route8Gate_h - dw UndergroundPathEntranceRoute8_h ;id=80 + dw UndergroundPathRoute8_h dw RockTunnelPokecenter_h - dw RockTunnel1_h + dw RockTunnel1F_h dw PowerPlant_h - dw Route11Gate_h - dw DiglettsCaveEntranceRoute11_h - dw Route11GateUpstairs_h - dw Route12Gate_h + dw Route11Gate1F_h + dw DiglettsCaveRoute11_h + dw Route11Gate2F_h + dw Route12Gate1F_h dw BillsHouse_h dw VermilionPokecenter_h - dw FanClub_h ;id=90 + dw PokemonFanClub_h dw VermilionMart_h dw VermilionGym_h - dw VermilionHouse1_h + dw VermilionPidgeyHouse_h dw VermilionDock_h - dw SSAnne1_h - dw SSAnne2_h - dw SSAnne3_h - dw SSAnne4_h - dw SSAnne5_h - dw SSAnne6_h ;id=100 - dw SSAnne7_h - dw SSAnne8_h - dw SSAnne9_h - dw SSAnne10_h - dw Lance_h ; unused - dw Lance_h ; unused - dw Lance_h ; unused - dw VictoryRoad1_h - dw Lance_h ; unused - dw Lance_h ; unused ;id=110 - dw Lance_h ; unused - dw Lance_h ; unused - dw Lance_h - dw Lance_h ; unused - dw Lance_h ; unused - dw Lance_h ; unused - dw Lance_h ; unused - dw HallofFameRoom_h - dw UndergroundPathNS_h - dw Gary_h ;id=120 - dw UndergroundPathWE_h - dw CeladonMart1_h - dw CeladonMart2_h - dw CeladonMart3_h - dw CeladonMart4_h + dw SSAnne1F_h + dw SSAnne2F_h + dw SSAnne3F_h + dw SSAnneB1F_h + dw SSAnneBow_h + dw SSAnneKitchen_h + dw SSAnneCaptainsRoom_h + dw SSAnne1FRooms_h + dw SSAnne2FRooms_h + dw SSAnneB1FRooms_h + dw LancesRoom_h ; UNUSED_MAP_69 + dw LancesRoom_h ; UNUSED_MAP_6A + dw LancesRoom_h ; UNUSED_MAP_6B + dw VictoryRoad1F_h + dw LancesRoom_h ; UNUSED_MAP_6D + dw LancesRoom_h ; UNUSED_MAP_6E + dw LancesRoom_h ; UNUSED_MAP_6F + dw LancesRoom_h ; UNUSED_MAP_70 + dw LancesRoom_h + dw LancesRoom_h ; UNUSED_MAP_72 + dw LancesRoom_h ; UNUSED_MAP_73 + dw LancesRoom_h ; UNUSED_MAP_74 + dw LancesRoom_h ; UNUSED_MAP_75 + dw HallOfFame_h + dw UndergroundPathNorthSouth_h + dw ChampionsRoom_h + dw UndergroundPathWestEast_h + dw CeladonMart1F_h + dw CeladonMart2F_h + dw CeladonMart3F_h + dw CeladonMart4F_h dw CeladonMartRoof_h dw CeladonMartElevator_h - dw CeladonMansion1_h - dw CeladonMansion2_h - dw CeladonMansion3_h ;id=130 - dw CeladonMansion4_h - dw CeladonMansion5_h + dw CeladonMansion1F_h + dw CeladonMansion2F_h + dw CeladonMansion3F_h + dw CeladonMansionRoof_h + dw CeladonMansionRoofHouse_h dw CeladonPokecenter_h dw CeladonGym_h - dw CeladonGameCorner_h - dw CeladonMart5_h - dw CeladonPrizeRoom_h + dw GameCorner_h + dw CeladonMart5F_h + dw GameCornerPrizeRoom_h dw CeladonDiner_h - dw CeladonHouse_h - dw CeladonHotel_h ;id=140 + dw CeladonChiefHouse_h + dw CeladonHotel_h dw LavenderPokecenter_h - dw PokemonTower1_h - dw PokemonTower2_h - dw PokemonTower3_h - dw PokemonTower4_h - dw PokemonTower5_h - dw PokemonTower6_h - dw PokemonTower7_h - dw LavenderHouse1_h - dw LavenderMart_h ;id=150 - dw LavenderHouse2_h + dw PokemonTower1F_h + dw PokemonTower2F_h + dw PokemonTower3F_h + dw PokemonTower4F_h + dw PokemonTower5F_h + dw PokemonTower6F_h + dw PokemonTower7F_h + dw MrFujisHouse_h + dw LavenderMart_h + dw LavenderCuboneHouse_h dw FuchsiaMart_h - dw FuchsiaHouse1_h + dw FuchsiaBillsGrandpasHouse_h dw FuchsiaPokecenter_h - dw FuchsiaHouse2_h - dw SafariZoneEntrance_h + dw WardensHouse_h + dw SafariZoneGate_h dw FuchsiaGym_h dw FuchsiaMeetingRoom_h - dw SeafoamIslands2_h - dw SeafoamIslands3_h ;id=160 - dw SeafoamIslands4_h - dw SeafoamIslands5_h - dw VermilionHouse2_h - dw FuchsiaHouse3_h - dw Mansion1_h + dw SeafoamIslandsB1F_h + dw SeafoamIslandsB2F_h + dw SeafoamIslandsB3F_h + dw SeafoamIslandsB4F_h + dw VermilionOldRodHouse_h + dw FuchsiaGoodRodHouse_h + dw PokemonMansion1F_h dw CinnabarGym_h - dw Lab1_h - dw Lab2_h - dw Lab3_h - dw Lab4_h ;id=170 + dw CinnabarLab_h + dw CinnabarLabTradeRoom_h + dw CinnabarLabMetronomeRoom_h + dw CinnabarLabFossilRoom_h dw CinnabarPokecenter_h dw CinnabarMart_h - dw CinnabarMart_h ; unused + dw CinnabarMart_h ; CINNABAR_MART_COPY dw IndigoPlateauLobby_h dw CopycatsHouse1F_h dw CopycatsHouse2F_h dw FightingDojo_h dw SaffronGym_h - dw SaffronHouse1_h - dw SaffronMart_h ;id=180 - dw SilphCo1_h + dw SaffronPidgeyHouse_h + dw SaffronMart_h + dw SilphCo1F_h dw SaffronPokecenter_h - dw SaffronHouse2_h - dw Route15Gate_h - dw Route15GateUpstairs_h - dw Route16Gate_h - dw Route16GateUpstairs_h - dw Route16House_h - dw Route12House_h - dw Route18Gate_h ;id=190 - dw Route18GateUpstairs_h - dw SeafoamIslands1_h + dw MrPsychicsHouse_h + dw Route15Gate1F_h + dw Route15Gate2F_h + dw Route16Gate1F_h + dw Route16Gate2F_h + dw Route16FlyHouse_h + dw Route12SuperRodHouse_h + dw Route18Gate1F_h + dw Route18Gate2F_h + dw SeafoamIslands1F_h dw Route22Gate_h - dw VictoryRoad2_h - dw Route12GateUpstairs_h - dw VermilionHouse3_h + dw VictoryRoad2F_h + dw Route12Gate2F_h + dw VermilionTradeHouse_h dw DiglettsCave_h - dw VictoryRoad3_h - dw RocketHideout1_h - dw RocketHideout2_h ;200 - dw RocketHideout3_h - dw RocketHideout4_h + dw VictoryRoad3F_h + dw RocketHideoutB1F_h + dw RocketHideoutB2F_h + dw RocketHideoutB3F_h + dw RocketHideoutB4F_h dw RocketHideoutElevator_h - dw RocketHideoutElevator_h ; unused - dw RocketHideoutElevator_h ; unused - dw RocketHideoutElevator_h ; unused - dw SilphCo2_h - dw SilphCo3_h - dw SilphCo4_h - dw SilphCo5_h ;210 - dw SilphCo6_h - dw SilphCo7_h - dw SilphCo8_h - dw Mansion2_h - dw Mansion3_h - dw Mansion4_h + dw RocketHideoutElevator_h ; UNUSED_MAP_CC + dw RocketHideoutElevator_h ; UNUSED_MAP_CD + dw RocketHideoutElevator_h ; UNUSED_MAP_CE + dw SilphCo2F_h + dw SilphCo3F_h + dw SilphCo4F_h + dw SilphCo5F_h + dw SilphCo6F_h + dw SilphCo7F_h + dw SilphCo8F_h + dw PokemonMansion2F_h + dw PokemonMansion3F_h + dw PokemonMansionB1F_h dw SafariZoneEast_h dw SafariZoneNorth_h dw SafariZoneWest_h - dw SafariZoneCenter_h ;220 - dw SafariZoneRestHouse1_h + dw SafariZoneCenter_h + dw SafariZoneCenterRestHouse_h dw SafariZoneSecretHouse_h - dw SafariZoneRestHouse2_h - dw SafariZoneRestHouse3_h - dw SafariZoneRestHouse4_h - dw UnknownDungeon2_h - dw UnknownDungeon3_h - dw UnknownDungeon1_h - dw NameRater_h - dw CeruleanHouse2_h - dw Route16Gate_h ; unused - dw RockTunnel2_h - dw SilphCo9_h - dw SilphCo10_h - dw SilphCo11_h + dw SafariZoneWestRestHouse_h + dw SafariZoneEastRestHouse_h + dw SafariZoneNorthRestHouse_h + dw CeruleanCave2F_h + dw CeruleanCaveB1F_h + dw CeruleanCave1F_h + dw NameRatersHouse_h + dw CeruleanBadgeHouse_h + dw Route16Gate1F_h ; UNUSED_MAP_E7 + dw RockTunnelB1F_h + dw SilphCo9F_h + dw SilphCo10F_h + dw SilphCo11F_h dw SilphCoElevator_h - dw SilphCo2_h ; unused - dw SilphCo2_h ; unused + dw SilphCo2F_h ; UNUSED_MAP_ED + dw SilphCo2F_h ; UNUSED_MAP_EE dw TradeCenter_h dw Colosseum_h - dw SilphCo2_h ; unused - dw SilphCo2_h ; unused - dw SilphCo2_h ; unused - dw SilphCo2_h ; unused - dw Lorelei_h - dw Bruno_h - dw Agatha_h ;247 + dw SilphCo2F_h ; UNUSED_MAP_F1 + dw SilphCo2F_h ; UNUSED_MAP_F2 + dw SilphCo2F_h ; UNUSED_MAP_F3 + dw SilphCo2F_h ; UNUSED_MAP_F4 + dw LoreleisRoom_h + dw BrunosRoom_h + dw AgathasRoom_h ;247 diff --git a/data/map_songs.asm b/data/map_songs.asm index 892f475e..55ec5abf 100755 --- a/data/map_songs.asm +++ b/data/map_songs.asm @@ -1,5 +1,5 @@ MapSongBanks: - db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ;PALLET_TOWN + db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; PALLET_TOWN db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_CITY db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_CITY db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_CITY @@ -10,7 +10,7 @@ MapSongBanks: db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_ISLAND db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; INDIGO_PLATEAU db MUSIC_CITIES1, BANK(Music_Cities1) ; SAFFRON_CITY - db MUSIC_CITIES1, BANK(Music_Cities1) ; unused + db MUSIC_CITIES1, BANK(Music_Cities1) ; UNUSED_MAP_0B db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_1 db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_2 db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_3 @@ -36,214 +36,214 @@ MapSongBanks: db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; ROUTE_23 db MUSIC_ROUTES2, BANK(Music_Routes2) ; ROUTE_24 db MUSIC_ROUTES2, BANK(Music_Routes2) ; ROUTE_25 - db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; RedsHouse1F - db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; RedsHouse2F - db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; BluesHouse - db MUSIC_OAKS_LAB, BANK(Music_OaksLab) ; OaksLab - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; ViridianPokecenter - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; ViridianMart - db MUSIC_CITIES1, BANK(Music_Cities1) ; School - db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianHouse - db MUSIC_GYM, BANK(Music_Gym) ; ViridianGym - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DiglettsCaveRoute2 - db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianForestExit - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route2House - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route2Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianForestEntrance - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; ViridianForest - db MUSIC_CITIES1, BANK(Music_Cities1) ; Museum1F - db MUSIC_CITIES1, BANK(Music_Cities1) ; Museum2F - db MUSIC_GYM, BANK(Music_Gym) ; PewterGym - db MUSIC_CITIES1, BANK(Music_Cities1) ; PewterHouse1 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PewterMart - db MUSIC_CITIES1, BANK(Music_Cities1) ; PewterHouse2 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PewterPokecenter - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MtMoon1 - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MtMoon2 - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MtMoon3 - db MUSIC_CITIES2, BANK(Music_Cities2) ; CeruleanHouseTrashed - db MUSIC_CITIES2, BANK(Music_Cities2) ; CeruleanHouse1 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeruleanPokecenter - db MUSIC_GYM, BANK(Music_Gym) ; CeruleanGym - db MUSIC_CITIES2, BANK(Music_Cities2) ; BikeShop - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeruleanMart - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; MtMoonPokecenter - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; CeruleanHouseTrashed - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route5Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundTunnelEntranceRoute5 - db MUSIC_CITIES1, BANK(Music_Cities1) ; DayCareM - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route6Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundTunnelEntranceRoute6 - db MUSIC_VERMILION, BANK(Music_Vermilion) ; FREEZE - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route7Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundPathEntranceRoute7 - db MUSIC_CELADON, BANK(Music_Celadon) ;FREEZE - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route8Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundPathEntranceRoute8 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; RockTunnelPokecenter - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; RockTunnel1 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; PowerPlant - db MUSIC_VERMILION, BANK(Music_Vermilion) ; Route11Gate - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DiglettsCaveEntranceRoute11 - db MUSIC_VERMILION, BANK(Music_Vermilion) ; Route11GateUpstairs - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route12Gate - db MUSIC_CITIES2, BANK(Music_Cities2) ; BillsHouse - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VermilionPokecenter - db MUSIC_VERMILION, BANK(Music_Vermilion) ; FanClub - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VermilionMart - db MUSIC_GYM, BANK(Music_Gym) ; VermilionGym - db MUSIC_VERMILION, BANK(Music_Vermilion) ; VermilionHouse1 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; VermilionDock - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne1 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne2 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne3 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne4 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne5 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne6 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne7 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne8 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne9 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne10 - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ;unused - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ;unused - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VictoryRoad1 - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ;unused - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ;unused - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ;unused - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ;unused - db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; Lance - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused - db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; HallofFameRoom - db MUSIC_ROUTES1, BANK(Music_Routes1) ; UndergroundPathNS - db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; Gary - db MUSIC_ROUTES1, BANK(Music_Routes1) ; UndergroundPathWE - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart1 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart2 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart3 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart4 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMartRoof - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMartElevator - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion1 - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion2 - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion3 - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion4 - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion5 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonPokecenter - db MUSIC_GYM, BANK(Music_Gym) ; CeladonGym - db MUSIC_GAME_CORNER, BANK(Music_GameCorner) ; CeladonGameCorner - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart5 - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonPrizeRoom - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonDiner - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonHouse - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonHotel - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; LavenderPokecenter - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower1 - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower2 - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower3 - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower4 - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower5 - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower6 - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower7 - db MUSIC_LAVENDER, BANK(Music_Lavender) ; LavenderHouse1 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; LavenderMart - db MUSIC_LAVENDER, BANK(Music_Lavender) ; LavenderHouse2 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; FuchsiaMart - db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaHouse1 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; FuchsiaPokecenter - db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaHouse2 - db MUSIC_CITIES2, BANK(Music_Cities2) ; SafariZoneEntrance - db MUSIC_GYM, BANK(Music_Gym) ; FuchsiaGym - db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaMeetingRoom - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands2 - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands3 - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands4 - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands5 - db MUSIC_CITIES2, BANK(Music_Cities2) ; VermilionHouse2 - db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaHouse3 - db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion1 - db MUSIC_GYM, BANK(Music_Gym) ; CinnabarGym - db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab1 - db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab2 - db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab3 - db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab4 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CinnabarPokecenter - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CinnabarMart - db MUSIC_CINNABAR, BANK(Music_Cinnabar) - db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; IndigoPlateauLobby - db MUSIC_CITIES1, BANK(Music_Cities1) ; CopycatsHouse1F - db MUSIC_CITIES1, BANK(Music_Cities1) ; CopycatsHouse2F - db MUSIC_CITIES1, BANK(Music_Cities1) ; FightingDojo - db MUSIC_GYM, BANK(Music_Gym) ; SaffronGym - db MUSIC_CITIES1, BANK(Music_Cities1) ; SaffronHouse1 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; SaffronMart - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo1 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; SaffronPokecenter - db MUSIC_CITIES1, BANK(Music_Cities1) ; SaffronHouse2 - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route15Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route15GateUpstairs - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route16Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route16GateUpstairs - db MUSIC_CELADON, BANK(Music_Celadon) ; Route16House - db MUSIC_CELADON, BANK(Music_Celadon) ; Route12House - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route18Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route18GateUpstairs - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands1 - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; Route22Gate - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VictoryRoad2 - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route12GateUpstairs - db MUSIC_VERMILION, BANK(Music_Vermilion) ; VermilionHouse3 - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DiglettsCave - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VictoryRoad3 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout1 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout2 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout3 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout4 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideoutElevator - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo2 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo3 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo4 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo5 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo6 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo7 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo8 - db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion2 - db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion3 - db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion4 - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneEast - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneNorth - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneWest - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneCenter - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse1 - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneSecretHouse - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse2 - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse3 - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse4 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UnknownDungeon2 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UnknownDungeon3 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UnknownDungeon1 - db MUSIC_CITIES2, BANK(Music_Cities2) ; NameRater - db MUSIC_CITIES1, BANK(Music_Cities1) ; CeruleanHouse2 - db MUSIC_CINNABAR, BANK(Music_Cinnabar) - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; RockTunnel2 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo9 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo10 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo11 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCoElevator - db MUSIC_SILPH_CO, BANK(Music_SilphCo) - db MUSIC_SILPH_CO, BANK(Music_SilphCo) - db MUSIC_CELADON, BANK(Music_Celadon) ; TradeCenter - db MUSIC_CELADON, BANK(Music_Celadon) ; Colosseum - db MUSIC_SILPH_CO, BANK(Music_SilphCo) - db MUSIC_SILPH_CO, BANK(Music_SilphCo) - db MUSIC_SILPH_CO, BANK(Music_SilphCo) - db MUSIC_SILPH_CO, BANK(Music_SilphCo) - db MUSIC_GYM, BANK(Music_Gym) ; Lorelei - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; Bruno - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; Agatha + db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; REDS_HOUSE_1F + db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; REDS_HOUSE_2F + db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; BLUES_HOUSE + db MUSIC_OAKS_LAB, BANK(Music_OaksLab) ; OAKS_LAB + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VIRIDIAN_POKECENTER + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VIRIDIAN_MART + db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_SCHOOL_HOUSE + db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_NICKNAME_HOUSE + db MUSIC_GYM, BANK(Music_Gym) ; VIRIDIAN_GYM + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DIGLETTS_CAVE_ROUTE_2 + db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_FOREST_NORTH_GATE + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_2_TRADE_HOUSE + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_2_GATE + db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_FOREST_SOUTH_GATE + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; VIRIDIAN_FOREST + db MUSIC_CITIES1, BANK(Music_Cities1) ; MUSEUM_1F + db MUSIC_CITIES1, BANK(Music_Cities1) ; MUSEUM_2F + db MUSIC_GYM, BANK(Music_Gym) ; PEWTER_GYM + db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_NIDORAN_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PEWTER_MART + db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_SPEECH_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PEWTER_POKECENTER + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MT_MOON_1F + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MT_MOON_B1F + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MT_MOON_B2F + db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_TRASHED_HOUSE + db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_TRADE_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CERULEAN_POKECENTER + db MUSIC_GYM, BANK(Music_Gym) ; CERULEAN_GYM + db MUSIC_CITIES2, BANK(Music_Cities2) ; BIKE_SHOP + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CERULEAN_MART + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; MT_MOON_POKECENTER + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; CERULEAN_TRASHED_HOUSE_COPY + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_5_GATE + db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_5 + db MUSIC_CITIES1, BANK(Music_Cities1) ; DAYCARE + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_6_GATE + db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_6 + db MUSIC_VERMILION, BANK(Music_Vermilion) ; UNDERGROUND_PATH_ROUTE_6_COPY + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_7_GATE + db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_7 + db MUSIC_CELADON, BANK(Music_Celadon) ; UNDERGROUND_PATH_ROUTE_7_COPY + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_8_GATE + db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_8 + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; ROCK_TUNNEL_POKECENTER + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; ROCK_TUNNEL_1F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; POWER_PLANT + db MUSIC_VERMILION, BANK(Music_Vermilion) ; ROUTE_11_GATE_1F + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DIGLETTS_CAVE_ROUTE_11 + db MUSIC_VERMILION, BANK(Music_Vermilion) ; ROUTE_11_GATE_2F + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_12_GATE_1F + db MUSIC_CITIES2, BANK(Music_Cities2) ; BILLS_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VERMILION_POKECENTER + db MUSIC_VERMILION, BANK(Music_Vermilion) ; POKEMON_FAN_CLUB + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VERMILION_MART + db MUSIC_GYM, BANK(Music_Gym) ; VERMILION_GYM + db MUSIC_VERMILION, BANK(Music_Vermilion) ; VERMILION_PIDGEY_HOUSE + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; VERMILION_DOCK + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_1F + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_2F + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_3F + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_B1F + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_BOW + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_KITCHEN + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_CAPTAINS_ROOM + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_1F_ROOMS + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_2F_ROOMS + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_B1F_ROOMS + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; UNUSED_MAP_69 + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; UNUSED_MAP_6A + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_6B + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VICTORY_ROAD_1F + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; UNUSED_MAP_6D + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UNUSED_MAP_6E + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_6F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_70 + db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; LANCES_ROOM + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_72 + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_73 + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_74 + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_75 + db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; HALL_OF_FAME + db MUSIC_ROUTES1, BANK(Music_Routes1) ; UNDERGROUND_PATH_NORTH_SOUTH + db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; CHAMPIONS_ROOM + db MUSIC_ROUTES1, BANK(Music_Routes1) ; UNDERGROUND_PATH_WEST_EAST + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_1F + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_2F + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_3F + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_4F + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_ROOF + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_ELEVATOR + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_1F + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_2F + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_3F + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_ROOF + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_ROOF_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_POKECENTER + db MUSIC_GYM, BANK(Music_Gym) ; CELADON_GYM + db MUSIC_GAME_CORNER, BANK(Music_GameCorner) ; GAME_CORNER + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_5F + db MUSIC_CELADON, BANK(Music_Celadon) ; GAME_CORNER_PRIZE_ROOM + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_DINER + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_CHIEF_HOUSE + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_HOTEL + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; LAVENDER_POKECENTER + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_1F + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_2F + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_3F + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_4F + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_5F + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_6F + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_7F + db MUSIC_LAVENDER, BANK(Music_Lavender) ; MR_FUJIS_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; LAVENDER_MART + db MUSIC_LAVENDER, BANK(Music_Lavender) ; LAVENDER_CUBONE_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; FUCHSIA_MART + db MUSIC_CITIES2, BANK(Music_Cities2) ; FUCHSIA_BILLS_GRANDPAS_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; FUCHSIA_POKECENTER + db MUSIC_CITIES2, BANK(Music_Cities2) ; WARDENS_HOUSE + db MUSIC_CITIES2, BANK(Music_Cities2) ; SAFARI_ZONE_GATE + db MUSIC_GYM, BANK(Music_Gym) ; FUCHSIA_GYM + db MUSIC_CITIES2, BANK(Music_Cities2) ; FUCHSIA_MEETING_ROOM + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_B1F + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_B2F + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_B3F + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_B4F + db MUSIC_CITIES2, BANK(Music_Cities2) ; VERMILION_OLD_ROD_HOUSE + db MUSIC_CITIES2, BANK(Music_Cities2) ; FUCHSIA_GOOD_ROD_HOUSE + db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; POKEMON_MANSION_1F + db MUSIC_GYM, BANK(Music_Gym) ; CINNABAR_GYM + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_LAB + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_LAB_TRADE_ROOM + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_LAB_METRONOME_ROOM + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_LAB_FOSSIL_ROOM + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CINNABAR_POKECENTER + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CINNABAR_MART + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_MART_COPY + db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; INDIGO_PLATEAU_LOBBY + db MUSIC_CITIES1, BANK(Music_Cities1) ; COPYCATS_HOUSE_1F + db MUSIC_CITIES1, BANK(Music_Cities1) ; COPYCATS_HOUSE_2F + db MUSIC_CITIES1, BANK(Music_Cities1) ; FIGHTING_DOJO + db MUSIC_GYM, BANK(Music_Gym) ; SAFFRON_GYM + db MUSIC_CITIES1, BANK(Music_Cities1) ; SAFFRON_PIDGEY_HOUSE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; SAFFRON_MART + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_1F + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; SAFFRON_POKECENTER + db MUSIC_CITIES1, BANK(Music_Cities1) ; MR_PSYCHICS_HOUSE + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_15_GATE_1F + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_15_GATE_2F + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_16_GATE_1F + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_16_GATE_2F + db MUSIC_CELADON, BANK(Music_Celadon) ; ROUTE_16_FLY_HOUSE + db MUSIC_CELADON, BANK(Music_Celadon) ; ROUTE_12_SUPER_ROD_HOUSE + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_18_GATE_1F + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_18_GATE_2F + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_1F + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; ROUTE_22_GATE + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VICTORY_ROAD_2F + db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_12_GATE_2F + db MUSIC_VERMILION, BANK(Music_Vermilion) ; VERMILION_TRADE_HOUSE + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DIGLETTS_CAVE + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VICTORY_ROAD_3F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_B1F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_B2F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_B3F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_B4F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_ELEVATOR + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UNUSED_MAP_CC + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UNUSED_MAP_CD + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UNUSED_MAP_CE + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_2F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_3F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_4F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_5F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_6F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_7F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_8F + db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; POKEMON_MANSION_2F + db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; POKEMON_MANSION_3F + db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; POKEMON_MANSION_B1F + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_EAST + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_NORTH + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_WEST + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_CENTER + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_CENTER_REST_HOUSE + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_SECRET_HOUSE + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_WEST_REST_HOUSE + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_EAST_REST_HOUSE + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_NORTH_REST_HOUSE + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; CERULEAN_CAVE_2F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; CERULEAN_CAVE_B1F + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; CERULEAN_CAVE_1F + db MUSIC_CITIES2, BANK(Music_Cities2) ; NAME_RATERS_HOUSE + db MUSIC_CITIES1, BANK(Music_Cities1) ; CERULEAN_BADGE_HOUSE + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; UNUSED_MAP_E7 + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; ROCK_TUNNEL_B1F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_9F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_10F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_11F + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_ELEVATOR + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_ED + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_EE + db MUSIC_CELADON, BANK(Music_Celadon) ; TRADE_CENTER + db MUSIC_CELADON, BANK(Music_Celadon) ; COLOSSEUM + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F1 + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F2 + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F3 + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F4 + db MUSIC_GYM, BANK(Music_Gym) ; LORELEIS_ROOM + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; BRUNOS_ROOM + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; AGATHAS_ROOM diff --git a/data/special_warps.asm b/data/special_warps.asm index 27837109..6b536b67 100755 --- a/data/special_warps.asm +++ b/data/special_warps.asm @@ -2,33 +2,33 @@ ; 00: target map ID ; 01: which dungeon warp in the source map was used DungeonWarpList: - db SEAFOAM_ISLANDS_2,$01 - db SEAFOAM_ISLANDS_2,$02 - db SEAFOAM_ISLANDS_3,$01 - db SEAFOAM_ISLANDS_3,$02 - db SEAFOAM_ISLANDS_4,$01 - db SEAFOAM_ISLANDS_4,$02 - db SEAFOAM_ISLANDS_5,$01 - db SEAFOAM_ISLANDS_5,$02 - db VICTORY_ROAD_2,$02 - db MANSION_1,$01 - db MANSION_1,$02 - db MANSION_2,$03 + db SEAFOAM_ISLANDS_B1F,$01 + db SEAFOAM_ISLANDS_B1F,$02 + db SEAFOAM_ISLANDS_B2F,$01 + db SEAFOAM_ISLANDS_B2F,$02 + db SEAFOAM_ISLANDS_B3F,$01 + db SEAFOAM_ISLANDS_B3F,$02 + db SEAFOAM_ISLANDS_B4F,$01 + db SEAFOAM_ISLANDS_B4F,$02 + db VICTORY_ROAD_2F,$02 + db POKEMON_MANSION_1F,$01 + db POKEMON_MANSION_1F,$02 + db POKEMON_MANSION_2F,$03 db $FF DungeonWarpData: - FLYWARP_DATA SEAFOAM_ISLANDS_2_WIDTH,7,18 - FLYWARP_DATA SEAFOAM_ISLANDS_2_WIDTH,7,23 - FLYWARP_DATA SEAFOAM_ISLANDS_3_WIDTH,7,19 - FLYWARP_DATA SEAFOAM_ISLANDS_3_WIDTH,7,22 - FLYWARP_DATA SEAFOAM_ISLANDS_4_WIDTH,7,18 - FLYWARP_DATA SEAFOAM_ISLANDS_4_WIDTH,7,19 - FLYWARP_DATA SEAFOAM_ISLANDS_5_WIDTH,14,4 - FLYWARP_DATA SEAFOAM_ISLANDS_5_WIDTH,14,5 - FLYWARP_DATA VICTORY_ROAD_2_WIDTH,16,22 - FLYWARP_DATA MANSION_1_WIDTH,14,16 - FLYWARP_DATA MANSION_1_WIDTH,14,16 - FLYWARP_DATA MANSION_2_WIDTH,14,18 + FLYWARP_DATA SEAFOAM_ISLANDS_B1F_WIDTH,7,18 + FLYWARP_DATA SEAFOAM_ISLANDS_B1F_WIDTH,7,23 + FLYWARP_DATA SEAFOAM_ISLANDS_B2F_WIDTH,7,19 + FLYWARP_DATA SEAFOAM_ISLANDS_B2F_WIDTH,7,22 + FLYWARP_DATA SEAFOAM_ISLANDS_B3F_WIDTH,7,18 + FLYWARP_DATA SEAFOAM_ISLANDS_B3F_WIDTH,7,19 + FLYWARP_DATA SEAFOAM_ISLANDS_B4F_WIDTH,14,4 + FLYWARP_DATA SEAFOAM_ISLANDS_B4F_WIDTH,14,5 + FLYWARP_DATA VICTORY_ROAD_2F_WIDTH,16,22 + FLYWARP_DATA POKEMON_MANSION_1F_WIDTH,14,16 + FLYWARP_DATA POKEMON_MANSION_1F_WIDTH,14,16 + FLYWARP_DATA POKEMON_MANSION_2F_WIDTH,14,18 ;Format: ; db Map_id diff --git a/data/super_rod.asm b/data/super_rod.asm index 93ea992b..d3d64632 100755 --- a/data/super_rod.asm +++ b/data/super_rod.asm @@ -25,15 +25,15 @@ SuperRodData: dbw ROUTE_25, FishingGroup3 dbw CERULEAN_GYM, FishingGroup3 dbw VERMILION_DOCK, FishingGroup4 - dbw SEAFOAM_ISLANDS_4, FishingGroup8 - dbw SEAFOAM_ISLANDS_5, FishingGroup8 + dbw SEAFOAM_ISLANDS_B3F, FishingGroup8 + dbw SEAFOAM_ISLANDS_B4F, FishingGroup8 dbw SAFARI_ZONE_EAST, FishingGroup6 dbw SAFARI_ZONE_NORTH, FishingGroup6 dbw SAFARI_ZONE_WEST, FishingGroup6 dbw SAFARI_ZONE_CENTER, FishingGroup6 - dbw UNKNOWN_DUNGEON_2, FishingGroup9 - dbw UNKNOWN_DUNGEON_3, FishingGroup9 - dbw UNKNOWN_DUNGEON_1, FishingGroup9 + dbw CERULEAN_CAVE_2F, FishingGroup9 + dbw CERULEAN_CAVE_B1F, FishingGroup9 + dbw CERULEAN_CAVE_1F, FishingGroup9 db $FF ; fishing groups diff --git a/data/town_map_entries.asm b/data/town_map_entries.asm index abf584de..63ebd51b 100755 --- a/data/town_map_entries.asm +++ b/data/town_map_entries.asm @@ -38,64 +38,64 @@ ExternalMapEntries: EMAP $B,$0,Route25Name InternalMapEntries: - IMAP OAKS_LAB, $2,$B,PalletTownName - IMAP VIRIDIAN_GYM, $2,$8,ViridianCityName - IMAP VIRIDIAN_FOREST_ENTRANCE, $2,$6,Route2Name - IMAP VIRIDIAN_FOREST, $2,$4,ViridianForestName - IMAP PEWTER_POKECENTER, $2,$3,PewterCityName - IMAP MT_MOON_3, $6,$2,MountMoonName - IMAP CERULEAN_MART, $A,$2,CeruleanCityName - IMAP MT_MOON_POKECENTER, $5,$2,Route4Name - IMAP TRASHED_HOUSE_COPY, $A,$2,CeruleanCityName - IMAP DAYCAREM, $A,$4,Route5Name - IMAP PATH_ENTRANCE_ROUTE_6_COPY,$A,$6,Route6Name - IMAP PATH_ENTRANCE_ROUTE_7_COPY,$9,$5,Route7Name - IMAP PATH_ENTRANCE_ROUTE_8, $B,$5,Route8Name - IMAP ROCK_TUNNEL_1, $E,$3,RockTunnelName - IMAP POWER_PLANT, $F,$4,PowerPlantName - IMAP ROUTE_11_GATE_2F, $D,$9,Route11Name - IMAP ROUTE_12_GATE_1F, $E,$7,Route12Name - IMAP BILLS_HOUSE, $C,$0,SeaCottageName - IMAP VERMILION_DOCK, $A,$9,VermilionCityName - IMAP SS_ANNE_10, $9,$A,SSAnneName - IMAP VICTORY_ROAD_1, $0,$4,VictoryRoadName - IMAP HALL_OF_FAME, $0,$2,PokemonLeagueName - IMAP UNDERGROUND_PATH_NS, $A,$5,UndergroundPathName - IMAP CHAMPIONS_ROOM, $0,$2,PokemonLeagueName - IMAP UNDERGROUND_PATH_WE, $A,$5,UndergroundPathName - IMAP CELADON_HOTEL, $7,$5,CeladonCityName - IMAP LAVENDER_POKECENTER, $E,$5,LavenderTownName - IMAP POKEMONTOWER_7, $F,$5,PokemonTowerName - IMAP LAVENDER_HOUSE_2, $E,$5,LavenderTownName - IMAP FUCHSIA_HOUSE_2, $8,$D,FuchsiaCityName - IMAP SAFARI_ZONE_ENTRANCE, $8,$C,SafariZoneName - IMAP FUCHSIA_MEETING_ROOM, $8,$D,FuchsiaCityName - IMAP SEAFOAM_ISLANDS_5, $5,$F,SeafoamIslandsName - IMAP VERMILION_HOUSE_2, $A,$9,VermilionCityName - IMAP FUCHSIA_HOUSE_3, $8,$D,FuchsiaCityName - IMAP MANSION_1, $2,$F,PokemonMansionName - IMAP CINNABAR_MART_COPY, $2,$F,CinnabarIslandName - IMAP INDIGO_PLATEAU_LOBBY, $0,$2,IndigoPlateauName - IMAP SAFFRON_HOUSE_2, $A,$5,SaffronCityName - IMAP ROUTE_15_GATE_2F, $9,$D,Route15Name - IMAP ROUTE_16_HOUSE, $4,$5,Route16Name - IMAP ROUTE_12_HOUSE, $E,$A,Route12Name - IMAP ROUTE_18_GATE_2F, $7,$D,Route18Name - IMAP SEAFOAM_ISLANDS_1, $5,$F,SeafoamIslandsName - IMAP ROUTE_22_GATE, $0,$7,Route22Name - IMAP VICTORY_ROAD_2, $0,$4,VictoryRoadName - IMAP ROUTE_12_GATE_2F, $E,$7,Route12Name - IMAP VERMILION_HOUSE_3, $A,$9,VermilionCityName - IMAP DIGLETTS_CAVE, $3,$4,DiglettsCaveName - IMAP VICTORY_ROAD_3, $0,$4,VictoryRoadName - IMAP UNUSED_MAP_CE, $7,$5,RocketHQName - IMAP SILPH_CO_8F, $A,$5,SilphCoName - IMAP MANSION_4, $2,$F,PokemonMansionName - IMAP SAFARI_ZONE_REST_HOUSE_4, $8,$C,SafariZoneName - IMAP UNKNOWN_DUNGEON_1, $9,$1,CeruleanCaveName - IMAP NAME_RATERS_HOUSE, $E,$5,LavenderTownName - IMAP CERULEAN_HOUSE_2, $A,$2,CeruleanCityName - IMAP ROCK_TUNNEL_2, $E,$3,RockTunnelName - IMAP SILPH_CO_ELEVATOR, $A,$5,SilphCoName - IMAP AGATHAS_ROOM, $0,$2,PokemonLeagueName + IMAP OAKS_LAB, $2,$B,PalletTownName + IMAP VIRIDIAN_GYM, $2,$8,ViridianCityName + IMAP VIRIDIAN_FOREST_SOUTH_GATE, $2,$6,Route2Name + IMAP VIRIDIAN_FOREST, $2,$4,ViridianForestName + IMAP PEWTER_POKECENTER, $2,$3,PewterCityName + IMAP MT_MOON_B2F, $6,$2,MountMoonName + IMAP CERULEAN_MART, $A,$2,CeruleanCityName + IMAP MT_MOON_POKECENTER, $5,$2,Route4Name + IMAP CERULEAN_TRASHED_HOUSE_COPY, $A,$2,CeruleanCityName + IMAP DAYCARE, $A,$4,Route5Name + IMAP UNDERGROUND_PATH_ROUTE_6_COPY, $A,$6,Route6Name + IMAP UNDERGROUND_PATH_ROUTE_7_COPY, $9,$5,Route7Name + IMAP UNDERGROUND_PATH_ROUTE_8, $B,$5,Route8Name + IMAP ROCK_TUNNEL_1F, $E,$3,RockTunnelName + IMAP POWER_PLANT, $F,$4,PowerPlantName + IMAP ROUTE_11_GATE_2F, $D,$9,Route11Name + IMAP ROUTE_12_GATE_1F, $E,$7,Route12Name + IMAP BILLS_HOUSE, $C,$0,SeaCottageName + IMAP VERMILION_DOCK, $A,$9,VermilionCityName + IMAP SS_ANNE_B1F_ROOMS, $9,$A,SSAnneName + IMAP VICTORY_ROAD_1F, $0,$4,VictoryRoadName + IMAP HALL_OF_FAME, $0,$2,PokemonLeagueName + IMAP UNDERGROUND_PATH_NORTH_SOUTH, $A,$5,UndergroundPathName + IMAP CHAMPIONS_ROOM, $0,$2,PokemonLeagueName + IMAP UNDERGROUND_PATH_WEST_EAST, $A,$5,UndergroundPathName + IMAP CELADON_HOTEL, $7,$5,CeladonCityName + IMAP LAVENDER_POKECENTER, $E,$5,LavenderTownName + IMAP POKEMON_TOWER_7F, $F,$5,PokemonTowerName + IMAP LAVENDER_CUBONE_HOUSE, $E,$5,LavenderTownName + IMAP WARDENS_HOUSE, $8,$D,FuchsiaCityName + IMAP SAFARI_ZONE_GATE, $8,$C,SafariZoneName + IMAP FUCHSIA_MEETING_ROOM, $8,$D,FuchsiaCityName + IMAP SEAFOAM_ISLANDS_B4F, $5,$F,SeafoamIslandsName + IMAP VERMILION_OLD_ROD_HOUSE, $A,$9,VermilionCityName + IMAP FUCHSIA_GOOD_ROD_HOUSE, $8,$D,FuchsiaCityName + IMAP POKEMON_MANSION_1F, $2,$F,PokemonMansionName + IMAP CINNABAR_MART_COPY, $2,$F,CinnabarIslandName + IMAP INDIGO_PLATEAU_LOBBY, $0,$2,IndigoPlateauName + IMAP MR_PSYCHICS_HOUSE, $A,$5,SaffronCityName + IMAP ROUTE_15_GATE_2F, $9,$D,Route15Name + IMAP ROUTE_16_FLY_HOUSE, $4,$5,Route16Name + IMAP ROUTE_12_SUPER_ROD_HOUSE, $E,$A,Route12Name + IMAP ROUTE_18_GATE_2F, $7,$D,Route18Name + IMAP SEAFOAM_ISLANDS_1F, $5,$F,SeafoamIslandsName + IMAP ROUTE_22_GATE, $0,$7,Route22Name + IMAP VICTORY_ROAD_2F, $0,$4,VictoryRoadName + IMAP ROUTE_12_GATE_2F, $E,$7,Route12Name + IMAP VERMILION_TRADE_HOUSE, $A,$9,VermilionCityName + IMAP DIGLETTS_CAVE, $3,$4,DiglettsCaveName + IMAP VICTORY_ROAD_3F, $0,$4,VictoryRoadName + IMAP UNUSED_MAP_CE, $7,$5,RocketHQName + IMAP SILPH_CO_8F, $A,$5,SilphCoName + IMAP POKEMON_MANSION_B1F, $2,$F,PokemonMansionName + IMAP SAFARI_ZONE_NORTH_REST_HOUSE, $8,$C,SafariZoneName + IMAP CERULEAN_CAVE_1F, $9,$1,CeruleanCaveName + IMAP NAME_RATERS_HOUSE, $E,$5,LavenderTownName + IMAP CERULEAN_BADGE_HOUSE, $A,$2,CeruleanCityName + IMAP ROCK_TUNNEL_B1F, $E,$3,RockTunnelName + IMAP SILPH_CO_ELEVATOR, $A,$5,SilphCoName + IMAP AGATHAS_ROOM, $0,$2,PokemonLeagueName db $FF diff --git a/data/town_map_order.asm b/data/town_map_order.asm index 10131a31..a082c376 100755 --- a/data/town_map_order.asm +++ b/data/town_map_order.asm @@ -7,7 +7,7 @@ TownMapOrder: db DIGLETTS_CAVE db PEWTER_CITY db ROUTE_3 - db MT_MOON_1 + db MT_MOON_1F db ROUTE_4 db CERULEAN_CITY db ROUTE_24 @@ -16,12 +16,12 @@ TownMapOrder: db ROUTE_5 db ROUTE_6 db VERMILION_CITY - db SS_ANNE_1 + db SS_ANNE_1F db ROUTE_9 db ROCK_TUNNEL_POKECENTER db ROUTE_10 db LAVENDER_TOWN - db POKEMONTOWER_2 + db POKEMON_TOWER_2F db ROUTE_8 db ROUTE_7 db CELADON_CITY @@ -37,13 +37,13 @@ TownMapOrder: db FUCHSIA_CITY db SAFARI_ZONE_EAST db ROUTE_19 - db SEAFOAM_ISLANDS_2 + db SEAFOAM_ISLANDS_B1F db ROUTE_20 db CINNABAR_ISLAND db ROUTE_21 db ROUTE_22 db ROUTE_23 - db VICTORY_ROAD_3 + db VICTORY_ROAD_3F db INDIGO_PLATEAU db POWER_PLANT TownMapOrderEnd: diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index 985a1eb2..1967d33b 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -118,8 +118,8 @@ GetBattleTransitionID_CompareLevels: ld [wBattleTransitionSpiralDirection], a ret -; fails to recognize VICTORY_ROAD_2, VICTORY_ROAD_3, all ROCKET_HIDEOUT maps, -; MANSION_1, SEAFOAM_ISLANDS_[2-5], POWER_PLANT, DIGLETTS_CAVE +; fails to recognize VICTORY_ROAD_2F, VICTORY_ROAD_3F, all ROCKET_HIDEOUT maps, +; POKEMON_MANSION_1F, SEAFOAM_ISLANDS_[B1F-B4F], POWER_PLANT, DIGLETTS_CAVE ; and SILPH_CO_[9-11]F as dungeon maps GetBattleTransitionID_IsDungeonMap: ld a, [wCurMap] @@ -155,30 +155,30 @@ GetBattleTransitionID_IsDungeonMap: ; is equal to one of these maps DungeonMaps1: db VIRIDIAN_FOREST - db ROCK_TUNNEL_1 - db SEAFOAM_ISLANDS_1 - db ROCK_TUNNEL_2 + db ROCK_TUNNEL_1F + db SEAFOAM_ISLANDS_1F + db ROCK_TUNNEL_B1F db $FF ; GetBattleTransitionID_IsDungeonMap checks if wCurMap ; is in between or equal to each pair of maps DungeonMaps2: ; all MT_MOON maps - db MT_MOON_1 - db MT_MOON_3 + db MT_MOON_1F + db MT_MOON_B2F - ; all SS_ANNE maps, VICTORY_ROAD_1, LANCES_ROOM, and HALL_OF_FAME - db SS_ANNE_1 + ; all SS_ANNE maps, VICTORY_ROAD_1F, LANCES_ROOM, and HALL_OF_FAME + db SS_ANNE_1F db HALL_OF_FAME - ; all POKEMONTOWER maps and Lavender Town buildings + ; all POKEMON_TOWER maps and Lavender Town buildings db LAVENDER_POKECENTER - db LAVENDER_HOUSE_2 + db LAVENDER_CUBONE_HOUSE - ; SILPH_CO_[2-8]F, MANSION[2-4], SAFARI_ZONE, and UNKNOWN_DUNGEON maps, - ; except for SILPH_CO_1F + ; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and + ; CERULEAN_CAVE maps, except for SILPH_CO_1F db SILPH_CO_2F - db UNKNOWN_DUNGEON_1 + db CERULEAN_CAVE_1F db $FF LoadBattleTransitionTile: diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index 3d46c947..4a138048 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -3,9 +3,9 @@ PrintBeginningBattleText: dec a jr nz, .trainerBattle ld a, [wCurMap] - cp POKEMONTOWER_3 + cp POKEMON_TOWER_3F jr c, .notPokemonTower - cp LAVENDER_HOUSE_1 + cp MR_FUJIS_HOUSE jr c, .pokemonTower .notPokemonTower ld a, [wEnemyMonSpecies2] diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 9265503d..056a9588 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3371,9 +3371,9 @@ IsGhostBattle: dec a ret nz ld a, [wCurMap] - cp POKEMONTOWER_1 + cp POKEMON_TOWER_1F jr c, .next - cp LAVENDER_HOUSE_1 + cp MR_FUJIS_HOUSE jr nc, .next ld b, SILPH_SCOPE call IsItemInBag diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm index bdd5d8f4..7bc912d2 100644 --- a/engine/battle/init_battle_variables.asm +++ b/engine/battle/init_battle_variables.asm @@ -30,7 +30,7 @@ InitBattleVariables: ld a, [wCurMap] cp SAFARI_ZONE_EAST jr c, .notSafariBattle - cp SAFARI_ZONE_REST_HOUSE_1 + cp SAFARI_ZONE_CENTER_REST_HOUSE jr nc, .notSafariBattle ld a, BATTLE_TYPE_SAFARI ld [wBattleType], a diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index f04c1deb..491be861 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -79,12 +79,12 @@ SafariZoneGameOver: call DisplayTextID xor a ld [wPlayerMovingDirection], a - ld a, SAFARI_ZONE_ENTRANCE + ld a, SAFARI_ZONE_GATE ld [hWarpDestinationMap], a ld a, $3 ld [wDestinationWarpID], a ld a, $5 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a SetEvent EVENT_SAFARI_GAME_OVER ld a, 1 ld [wSafariZoneGameOver], a diff --git a/engine/items/items.asm b/engine/items/items.asm index 3bb2ec9e..38e8a704 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -166,7 +166,7 @@ ItemUseBall: ; If the player is fighting the ghost Marowak, set the value that indicates the ; Pokémon can't be caught and skip the capture calculations. ld a, [wCurMap] - cp POKEMONTOWER_6 + cp POKEMON_TOWER_6F jr nz, .loop ld a, [wEnemyMonSpecies2] cp MAROWAK @@ -1511,7 +1511,7 @@ ItemUseEscapeRope: ResetEvent EVENT_IN_SAFARI_ZONE xor a ld [wNumSafariBalls], a - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a inc a ld [wEscapedFromBattle], a ld [wActionResultOrTookBattleTurn], a ; item used diff --git a/engine/overworld/field_move_messages.asm b/engine/overworld/field_move_messages.asm index 69914bfc..b1506742 100644 --- a/engine/overworld/field_move_messages.asm +++ b/engine/overworld/field_move_messages.asm @@ -28,7 +28,7 @@ IsSurfingAllowed: bit 5, a jr nz, .forcedToRideBike ld a, [wCurMap] - cp SEAFOAM_ISLANDS_5 + cp SEAFOAM_ISLANDS_B4F ret nz CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE ret z diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 2c75b9d8..968615f0 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -268,7 +268,7 @@ RLEList_PewterGymGuy: FreezeEnemyTrainerSprite: ld a, [wCurMap] - cp POKEMONTOWER_7 + cp POKEMON_TOWER_7F ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't freeze them ld hl, RivalIDs ld a, [wEngagedTrainerClass] diff --git a/engine/overworld/player_state.asm b/engine/overworld/player_state.asm index b8d734f2..73c55da2 100644 --- a/engine/overworld/player_state.asm +++ b/engine/overworld/player_state.asm @@ -55,14 +55,14 @@ CheckForceBikeOrSurf: cp c ;compare x-coord jr nz, .loop ; incorrect x-coord, check next item ld a, [wCurMap] - cp SEAFOAM_ISLANDS_4 + cp SEAFOAM_ISLANDS_B3F ld a, $2 - ld [wSeafoamIslands4CurScript], a + ld [wSeafoamIslandsB3FCurScript], a jr z, .forceSurfing ld a, [wCurMap] - cp SEAFOAM_ISLANDS_5 + cp SEAFOAM_ISLANDS_B4F ld a, $2 - ld [wSeafoamIslands5CurScript], a + ld [wSeafoamIslandsB4FCurScript], a jr z, .forceSurfing ;force bike riding ld hl, wd732 @@ -156,7 +156,7 @@ IsWarpTileInFrontOfPlayer: push bc call _GetTileAndCoordsInFrontOfPlayer ld a, [wCurMap] - cp SS_ANNE_5 + cp SS_ANNE_BOW jr z, .ssAnne5 ld a, [wSpriteStateData1 + 9] ; player sprite's facing direction srl a @@ -237,7 +237,7 @@ PrintSafariZoneSteps: ld a, [wCurMap] cp SAFARI_ZONE_EAST ret c - cp UNKNOWN_DUNGEON_2 + cp CERULEAN_CAVE_2F ret nc coord hl, 0, 0 ld b, 3 diff --git a/engine/overworld/set_blackout_map.asm b/engine/overworld/set_blackout_map.asm index 9bfe82bd..bac2f0ca 100644 --- a/engine/overworld/set_blackout_map.asm +++ b/engine/overworld/set_blackout_map.asm @@ -23,7 +23,7 @@ SetLastBlackoutMap: ret SafariZoneRestHouses: - db SAFARI_ZONE_REST_HOUSE_2 - db SAFARI_ZONE_REST_HOUSE_3 - db SAFARI_ZONE_REST_HOUSE_4 + db SAFARI_ZONE_WEST_REST_HOUSE + db SAFARI_ZONE_EAST_REST_HOUSE + db SAFARI_ZONE_NORTH_REST_HOUSE db -1 diff --git a/engine/palettes.asm b/engine/palettes.asm index 4808776e..4ab83f36 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -147,7 +147,7 @@ SetPal_Overworld: ld a, [wCurMap] cp REDS_HOUSE_1F jr c, .townOrRoute - cp UNKNOWN_DUNGEON_2 + cp CERULEAN_CAVE_2F jr c, .normalDungeonOrBuilding cp NAME_RATERS_HOUSE jr c, .caveOrBruno diff --git a/gfx/blocksets/facility.bst b/gfx/blocksets/facility.bst index 1ed2d4361fdf32c9ec519f05fca7fb142605d488..31d69fd1ad46cd7e8b4e564da75b1dcf86fe4bab 100644 GIT binary patch delta 6 NcmZn^Xb@Py0RRTn0m=XX delta 8 PcmZn=XcSn$!N>pr3TOe# diff --git a/home.asm b/home.asm index 5b8aaf6c..70dab701 100644 --- a/home.asm +++ b/home.asm @@ -1,4 +1,3 @@ - ; The rst vectors are unused. SECTION "rst 00", ROM0 rst $38 @@ -83,7 +82,6 @@ HideSprites:: INCLUDE "home/copy.asm" - SECTION "Entry", ROM0 nop @@ -98,7 +96,6 @@ SECTION "Header", ROM0 ds $150 - $104 - SECTION "Main", ROM0 Start:: diff --git a/home/overworld.asm b/home/overworld.asm index 317459ce..66bf73a7 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -494,7 +494,7 @@ WarpFound2:: ld [wUnusedD366], a ; not read ld a, [hWarpDestinationMap] ld [wCurMap], a - cp ROCK_TUNNEL_1 + cp ROCK_TUNNEL_1F jr nz, .notRockTunnel ld a, $06 ld [wMapPalOffset], a @@ -718,15 +718,15 @@ CheckIfInOutsideMap:: ; sets carry if the check passes, otherwise clears carry ExtraWarpCheck:: ld a, [wCurMap] - cp SS_ANNE_3 + cp SS_ANNE_3F jr z, .useFunction1 - cp ROCKET_HIDEOUT_1 + cp ROCKET_HIDEOUT_B1F jr z, .useFunction2 - cp ROCKET_HIDEOUT_2 + cp ROCKET_HIDEOUT_B2F jr z, .useFunction2 - cp ROCKET_HIDEOUT_4 + cp ROCKET_HIDEOUT_B4F jr z, .useFunction2 - cp ROCK_TUNNEL_1 + cp ROCK_TUNNEL_1F jr z, .useFunction2 ld a, [wCurMapTileset] and a ; outside tileset (OVERWORLD) diff --git a/main.asm b/main.asm index 73ab724f..da4e691d 100755 --- a/main.asm +++ b/main.asm @@ -86,6 +86,7 @@ INCLUDE "engine/remove_pokemon.asm" INCLUDE "engine/display_pokedex.asm" + SECTION "bank3", ROMX INCLUDE "engine/joypad.asm" @@ -127,6 +128,7 @@ INCLUDE "engine/pathfinding.asm" INCLUDE "engine/hp_bar.asm" INCLUDE "engine/hidden_object_functions3.asm" + SECTION "NPC Sprites 1", ROMX ; BANK $04 OakAideSprite: INCBIN "gfx/sprites/oak_aide.2bpp" @@ -262,74 +264,74 @@ INCLUDE "engine/menu/pc.asm" SECTION "bank6", ROMX -INCLUDE "data/mapHeaders/celadoncity.asm" -INCLUDE "data/mapObjects/celadoncity.asm" -CeladonCityBlocks: INCBIN "maps/celadoncity.blk" +INCLUDE "data/mapHeaders/CeladonCity.asm" +INCLUDE "data/mapObjects/CeladonCity.asm" +CeladonCity_Blocks: INCBIN "maps/CeladonCity.blk" -INCLUDE "data/mapHeaders/pallettown.asm" -INCLUDE "data/mapObjects/pallettown.asm" -PalletTownBlocks: INCBIN "maps/pallettown.blk" +INCLUDE "data/mapHeaders/PalletTown.asm" +INCLUDE "data/mapObjects/PalletTown.asm" +PalletTown_Blocks: INCBIN "maps/PalletTown.blk" -INCLUDE "data/mapHeaders/viridiancity.asm" -INCLUDE "data/mapObjects/viridiancity.asm" -ViridianCityBlocks: INCBIN "maps/viridiancity.blk" +INCLUDE "data/mapHeaders/ViridianCity.asm" +INCLUDE "data/mapObjects/ViridianCity.asm" +ViridianCity_Blocks: INCBIN "maps/ViridianCity.blk" -INCLUDE "data/mapHeaders/pewtercity.asm" - db $0 -INCLUDE "data/mapObjects/pewtercity.asm" -PewterCityBlocks: INCBIN "maps/pewtercity.blk" +INCLUDE "data/mapHeaders/PewterCity.asm" + ds 1 +INCLUDE "data/mapObjects/PewterCity.asm" +PewterCity_Blocks: INCBIN "maps/PewterCity.blk" -INCLUDE "data/mapHeaders/ceruleancity.asm" -INCLUDE "data/mapObjects/ceruleancity.asm" -CeruleanCityBlocks: INCBIN "maps/ceruleancity.blk" +INCLUDE "data/mapHeaders/CeruleanCity.asm" +INCLUDE "data/mapObjects/CeruleanCity.asm" +CeruleanCity_Blocks: INCBIN "maps/CeruleanCity.blk" -INCLUDE "data/mapHeaders/vermilioncity.asm" -INCLUDE "data/mapObjects/vermilioncity.asm" -VermilionCityBlocks: INCBIN "maps/vermilioncity.blk" +INCLUDE "data/mapHeaders/VermilionCity.asm" +INCLUDE "data/mapObjects/VermilionCity.asm" +VermilionCity_Blocks: INCBIN "maps/VermilionCity.blk" -INCLUDE "data/mapHeaders/fuchsiacity.asm" -INCLUDE "data/mapObjects/fuchsiacity.asm" -FuchsiaCityBlocks: INCBIN "maps/fuchsiacity.blk" +INCLUDE "data/mapHeaders/FuchsiaCity.asm" +INCLUDE "data/mapObjects/FuchsiaCity.asm" +FuchsiaCity_Blocks: INCBIN "maps/FuchsiaCity.blk" INCLUDE "engine/play_time.asm" -INCLUDE "scripts/pallettown.asm" -INCLUDE "scripts/viridiancity.asm" -INCLUDE "scripts/pewtercity.asm" -INCLUDE "scripts/ceruleancity.asm" -INCLUDE "scripts/vermilioncity.asm" -INCLUDE "scripts/celadoncity.asm" -INCLUDE "scripts/fuchsiacity.asm" +INCLUDE "scripts/PalletTown.asm" +INCLUDE "scripts/ViridianCity.asm" +INCLUDE "scripts/PewterCity.asm" +INCLUDE "scripts/CeruleanCity.asm" +INCLUDE "scripts/VermilionCity.asm" +INCLUDE "scripts/CeladonCity.asm" +INCLUDE "scripts/FuchsiaCity.asm" -INCLUDE "data/mapHeaders/blueshouse.asm" -INCLUDE "scripts/blueshouse.asm" -INCLUDE "data/mapObjects/blueshouse.asm" -BluesHouseBlocks: INCBIN "maps/blueshouse.blk" +INCLUDE "data/mapHeaders/BluesHouse.asm" +INCLUDE "scripts/BluesHouse.asm" +INCLUDE "data/mapObjects/BluesHouse.asm" +BluesHouse_Blocks: INCBIN "maps/BluesHouse.blk" -INCLUDE "data/mapHeaders/vermilionhouse3.asm" -INCLUDE "scripts/vermilionhouse3.asm" -INCLUDE "data/mapObjects/vermilionhouse3.asm" -VermilionHouse3Blocks: INCBIN "maps/vermilionhouse3.blk" +INCLUDE "data/mapHeaders/VermilionTradeHouse.asm" +INCLUDE "scripts/VermilionTradeHouse.asm" +INCLUDE "data/mapObjects/VermilionTradeHouse.asm" +VermilionTradeHouse_Blocks: INCBIN "maps/VermilionTradeHouse.blk" -INCLUDE "data/mapHeaders/indigoplateaulobby.asm" -INCLUDE "scripts/indigoplateaulobby.asm" -INCLUDE "data/mapObjects/indigoplateaulobby.asm" -IndigoPlateauLobbyBlocks: INCBIN "maps/indigoplateaulobby.blk" +INCLUDE "data/mapHeaders/IndigoPlateauLobby.asm" +INCLUDE "scripts/IndigoPlateauLobby.asm" +INCLUDE "data/mapObjects/IndigoPlateauLobby.asm" +IndigoPlateauLobby_Blocks: INCBIN "maps/IndigoPlateauLobby.blk" -INCLUDE "data/mapHeaders/silphco4.asm" -INCLUDE "scripts/silphco4.asm" -INCLUDE "data/mapObjects/silphco4.asm" -SilphCo4Blocks: INCBIN "maps/silphco4.blk" +INCLUDE "data/mapHeaders/SilphCo4F.asm" +INCLUDE "scripts/SilphCo4F.asm" +INCLUDE "data/mapObjects/SilphCo4F.asm" +SilphCo4F_Blocks: INCBIN "maps/SilphCo4F.blk" -INCLUDE "data/mapHeaders/silphco5.asm" -INCLUDE "scripts/silphco5.asm" -INCLUDE "data/mapObjects/silphco5.asm" -SilphCo5Blocks: INCBIN "maps/silphco5.blk" +INCLUDE "data/mapHeaders/SilphCo5F.asm" +INCLUDE "scripts/SilphCo5F.asm" +INCLUDE "data/mapObjects/SilphCo5F.asm" +SilphCo5F_Blocks: INCBIN "maps/SilphCo5F.blk" -INCLUDE "data/mapHeaders/silphco6.asm" -INCLUDE "scripts/silphco6.asm" -INCLUDE "data/mapObjects/silphco6.asm" -SilphCo6Blocks: INCBIN "maps/silphco6.blk" +INCLUDE "data/mapHeaders/SilphCo6F.asm" +INCLUDE "scripts/SilphCo6F.asm" +INCLUDE "data/mapObjects/SilphCo6F.asm" +SilphCo6F_Blocks: INCBIN "maps/SilphCo6F.blk" INCLUDE "engine/overworld/npc_movement.asm" INCLUDE "engine/overworld/doors.asm" @@ -338,38 +340,38 @@ INCLUDE "engine/overworld/ledges.asm" SECTION "bank7", ROMX -INCLUDE "data/mapHeaders/cinnabarisland.asm" -INCLUDE "data/mapObjects/cinnabarisland.asm" -CinnabarIslandBlocks: INCBIN "maps/cinnabarisland.blk" +INCLUDE "data/mapHeaders/CinnabarIsland.asm" +INCLUDE "data/mapObjects/CinnabarIsland.asm" +CinnabarIsland_Blocks: INCBIN "maps/CinnabarIsland.blk" -INCLUDE "data/mapHeaders/route1.asm" -INCLUDE "data/mapObjects/route1.asm" -Route1Blocks: INCBIN "maps/route1.blk" +INCLUDE "data/mapHeaders/Route1.asm" +INCLUDE "data/mapObjects/Route1.asm" +Route1_Blocks: INCBIN "maps/Route1.blk" -UndergroundPathEntranceRoute8Blocks: INCBIN "maps/undergroundpathentranceroute8.blk" +UndergroundPathRoute8_Blocks: INCBIN "maps/UndergroundPathRoute8.blk" -OaksLabBlocks: INCBIN "maps/oakslab.blk" +OaksLab_Blocks: INCBIN "maps/OaksLab.blk" -Route16HouseBlocks: -Route2HouseBlocks: -SaffronHouse1Blocks: -SaffronHouse2Blocks: -VermilionHouse1Blocks: -NameRaterBlocks: -LavenderHouse1Blocks: -LavenderHouse2Blocks: -CeruleanHouse1Blocks: -PewterHouse1Blocks: -PewterHouse2Blocks: -ViridianHouseBlocks: INCBIN "maps/viridianhouse.blk" +MrPsychicsHouse_Blocks: +NameRatersHouse_Blocks: +MrFujisHouse_Blocks: +Route16FlyHouse_Blocks: +Route2TradeHouse_Blocks: +SaffronPidgeyHouse_Blocks: +VermilionPidgeyHouse_Blocks: +LavenderCuboneHouse_Blocks: +CeruleanTradeHouse_Blocks: +PewterNidoranHouse_Blocks: +PewterSpeechHouse_Blocks: +ViridianNicknameHouse_Blocks: INCBIN "maps/ViridianNicknameHouse.blk" -CeladonMansion5Blocks: -SchoolBlocks: INCBIN "maps/school.blk" +CeladonMansionRoofHouse_Blocks: +ViridianSchoolHouse_Blocks: INCBIN "maps/ViridianSchoolHouse.blk" -CeruleanHouseTrashedBlocks: INCBIN "maps/ceruleanhousetrashed.blk" +CeruleanTrashedHouse_Blocks: INCBIN "maps/CeruleanTrashedHouse.blk" -DiglettsCaveEntranceRoute11Blocks: -DiglettsCaveRoute2Blocks: INCBIN "maps/diglettscaveroute2.blk" +DiglettsCaveRoute11_Blocks: +DiglettsCaveRoute2_Blocks: INCBIN "maps/DiglettsCaveRoute2.blk" INCLUDE "text/monster_names.asm" @@ -377,141 +379,141 @@ INCLUDE "engine/clear_save.asm" INCLUDE "engine/predefs7.asm" -INCLUDE "scripts/cinnabarisland.asm" +INCLUDE "scripts/CinnabarIsland.asm" -INCLUDE "scripts/route1.asm" +INCLUDE "scripts/Route1.asm" -INCLUDE "data/mapHeaders/oakslab.asm" -INCLUDE "scripts/oakslab.asm" -INCLUDE "data/mapObjects/oakslab.asm" +INCLUDE "data/mapHeaders/OaksLab.asm" +INCLUDE "scripts/OaksLab.asm" +INCLUDE "data/mapObjects/OaksLab.asm" -INCLUDE "data/mapHeaders/viridianmart.asm" -INCLUDE "scripts/viridianmart.asm" -INCLUDE "data/mapObjects/viridianmart.asm" -ViridianMartBlocks: INCBIN "maps/viridianmart.blk" +INCLUDE "data/mapHeaders/ViridianMart.asm" +INCLUDE "scripts/ViridianMart.asm" +INCLUDE "data/mapObjects/ViridianMart.asm" +ViridianMart_Blocks: INCBIN "maps/ViridianMart.blk" -INCLUDE "data/mapHeaders/school.asm" -INCLUDE "scripts/school.asm" -INCLUDE "data/mapObjects/school.asm" +INCLUDE "data/mapHeaders/ViridianSchoolHouse.asm" +INCLUDE "scripts/ViridianSchoolHouse.asm" +INCLUDE "data/mapObjects/ViridianSchoolHouse.asm" -INCLUDE "data/mapHeaders/viridianhouse.asm" - db $0 -INCLUDE "scripts/viridianhouse.asm" -INCLUDE "data/mapObjects/viridianhouse.asm" +INCLUDE "data/mapHeaders/ViridianNicknameHouse.asm" + ds 1 +INCLUDE "scripts/ViridianNicknameHouse.asm" +INCLUDE "data/mapObjects/ViridianNicknameHouse.asm" -INCLUDE "data/mapHeaders/pewterhouse1.asm" -INCLUDE "scripts/pewterhouse1.asm" -INCLUDE "data/mapObjects/pewterhouse1.asm" +INCLUDE "data/mapHeaders/PewterNidoranHouse.asm" +INCLUDE "scripts/PewterNidoranHouse.asm" +INCLUDE "data/mapObjects/PewterNidoranHouse.asm" -INCLUDE "data/mapHeaders/pewterhouse2.asm" -INCLUDE "scripts/pewterhouse2.asm" -INCLUDE "data/mapObjects/pewterhouse2.asm" +INCLUDE "data/mapHeaders/PewterSpeechHouse.asm" +INCLUDE "scripts/PewterSpeechHouse.asm" +INCLUDE "data/mapObjects/PewterSpeechHouse.asm" -INCLUDE "data/mapHeaders/ceruleanhousetrashed.asm" -INCLUDE "scripts/ceruleanhousetrashed.asm" -INCLUDE "data/mapObjects/ceruleanhousetrashed.asm" +INCLUDE "data/mapHeaders/CeruleanTrashedHouse.asm" +INCLUDE "scripts/CeruleanTrashedHouse.asm" +INCLUDE "data/mapObjects/CeruleanTrashedHouse.asm" -INCLUDE "data/mapHeaders/ceruleanhouse1.asm" -INCLUDE "scripts/ceruleanhouse1.asm" -INCLUDE "data/mapObjects/ceruleanhouse1.asm" +INCLUDE "data/mapHeaders/CeruleanTradeHouse.asm" +INCLUDE "scripts/CeruleanTradeHouse.asm" +INCLUDE "data/mapObjects/CeruleanTradeHouse.asm" -INCLUDE "data/mapHeaders/bikeshop.asm" -INCLUDE "scripts/bikeshop.asm" -INCLUDE "data/mapObjects/bikeshop.asm" -BikeShopBlocks: INCBIN "maps/bikeshop.blk" +INCLUDE "data/mapHeaders/BikeShop.asm" +INCLUDE "scripts/BikeShop.asm" +INCLUDE "data/mapObjects/BikeShop.asm" +BikeShop_Blocks: INCBIN "maps/BikeShop.blk" -INCLUDE "data/mapHeaders/lavenderhouse1.asm" -INCLUDE "scripts/lavenderhouse1.asm" -INCLUDE "data/mapObjects/lavenderhouse1.asm" +INCLUDE "data/mapHeaders/MrFujisHouse.asm" +INCLUDE "scripts/MrFujisHouse.asm" +INCLUDE "data/mapObjects/MrFujisHouse.asm" -INCLUDE "data/mapHeaders/lavenderhouse2.asm" -INCLUDE "scripts/lavenderhouse2.asm" -INCLUDE "data/mapObjects/lavenderhouse2.asm" +INCLUDE "data/mapHeaders/LavenderCuboneHouse.asm" +INCLUDE "scripts/LavenderCuboneHouse.asm" +INCLUDE "data/mapObjects/LavenderCuboneHouse.asm" -INCLUDE "data/mapHeaders/namerater.asm" -INCLUDE "scripts/namerater.asm" -INCLUDE "data/mapObjects/namerater.asm" +INCLUDE "data/mapHeaders/NameRatersHouse.asm" +INCLUDE "scripts/NameRatersHouse.asm" +INCLUDE "data/mapObjects/NameRatersHouse.asm" -INCLUDE "data/mapHeaders/vermilionhouse1.asm" -INCLUDE "scripts/vermilionhouse1.asm" -INCLUDE "data/mapObjects/vermilionhouse1.asm" +INCLUDE "data/mapHeaders/VermilionPidgeyHouse.asm" +INCLUDE "scripts/VermilionPidgeyHouse.asm" +INCLUDE "data/mapObjects/VermilionPidgeyHouse.asm" -INCLUDE "data/mapHeaders/vermiliondock.asm" -INCLUDE "scripts/vermiliondock.asm" -INCLUDE "data/mapObjects/vermiliondock.asm" -VermilionDockBlocks: INCBIN "maps/vermiliondock.blk" +INCLUDE "data/mapHeaders/VermilionDock.asm" +INCLUDE "scripts/VermilionDock.asm" +INCLUDE "data/mapObjects/VermilionDock.asm" +VermilionDock_Blocks: INCBIN "maps/VermilionDock.blk" -INCLUDE "data/mapHeaders/celadonmansion5.asm" -INCLUDE "scripts/celadonmansion5.asm" -INCLUDE "data/mapObjects/celadonmansion5.asm" +INCLUDE "data/mapHeaders/CeladonMansionRoofHouse.asm" +INCLUDE "scripts/CeladonMansionRoofHouse.asm" +INCLUDE "data/mapObjects/CeladonMansionRoofHouse.asm" -INCLUDE "data/mapHeaders/fuchsiamart.asm" -INCLUDE "scripts/fuchsiamart.asm" -INCLUDE "data/mapObjects/fuchsiamart.asm" -FuchsiaMartBlocks: INCBIN "maps/fuchsiamart.blk" +INCLUDE "data/mapHeaders/FuchsiaMart.asm" +INCLUDE "scripts/FuchsiaMart.asm" +INCLUDE "data/mapObjects/FuchsiaMart.asm" +FuchsiaMart_Blocks: INCBIN "maps/FuchsiaMart.blk" -INCLUDE "data/mapHeaders/saffronhouse1.asm" -INCLUDE "scripts/saffronhouse1.asm" -INCLUDE "data/mapObjects/saffronhouse1.asm" +INCLUDE "data/mapHeaders/SaffronPidgeyHouse.asm" +INCLUDE "scripts/SaffronPidgeyHouse.asm" +INCLUDE "data/mapObjects/SaffronPidgeyHouse.asm" -INCLUDE "data/mapHeaders/saffronhouse2.asm" -INCLUDE "scripts/saffronhouse2.asm" -INCLUDE "data/mapObjects/saffronhouse2.asm" +INCLUDE "data/mapHeaders/MrPsychicsHouse.asm" +INCLUDE "scripts/MrPsychicsHouse.asm" +INCLUDE "data/mapObjects/MrPsychicsHouse.asm" -INCLUDE "data/mapHeaders/diglettscaveroute2.asm" -INCLUDE "scripts/diglettscaveroute2.asm" -INCLUDE "data/mapObjects/diglettscaveroute2.asm" +INCLUDE "data/mapHeaders/DiglettsCaveRoute2.asm" +INCLUDE "scripts/DiglettsCaveRoute2.asm" +INCLUDE "data/mapObjects/DiglettsCaveRoute2.asm" -INCLUDE "data/mapHeaders/route2house.asm" -INCLUDE "scripts/route2house.asm" -INCLUDE "data/mapObjects/route2house.asm" +INCLUDE "data/mapHeaders/Route2TradeHouse.asm" +INCLUDE "scripts/Route2TradeHouse.asm" +INCLUDE "data/mapObjects/Route2TradeHouse.asm" -INCLUDE "data/mapHeaders/route5gate.asm" -INCLUDE "scripts/route5gate.asm" -INCLUDE "data/mapObjects/route5gate.asm" -Route5GateBlocks: INCBIN "maps/route5gate.blk" +INCLUDE "data/mapHeaders/Route5Gate.asm" +INCLUDE "scripts/Route5Gate.asm" +INCLUDE "data/mapObjects/Route5Gate.asm" +Route5Gate_Blocks: INCBIN "maps/Route5Gate.blk" -INCLUDE "data/mapHeaders/route6gate.asm" -INCLUDE "scripts/route6gate.asm" -INCLUDE "data/mapObjects/route6gate.asm" -Route6GateBlocks: INCBIN "maps/route6gate.blk" +INCLUDE "data/mapHeaders/Route6Gate.asm" +INCLUDE "scripts/Route6Gate.asm" +INCLUDE "data/mapObjects/Route6Gate.asm" +Route6Gate_Blocks: INCBIN "maps/Route6Gate.blk" -INCLUDE "data/mapHeaders/route7gate.asm" -INCLUDE "scripts/route7gate.asm" -INCLUDE "data/mapObjects/route7gate.asm" -Route7GateBlocks: INCBIN "maps/route7gate.blk" +INCLUDE "data/mapHeaders/Route7Gate.asm" +INCLUDE "scripts/Route7Gate.asm" +INCLUDE "data/mapObjects/Route7Gate.asm" +Route7Gate_Blocks: INCBIN "maps/Route7Gate.blk" -INCLUDE "data/mapHeaders/route8gate.asm" -INCLUDE "scripts/route8gate.asm" -INCLUDE "data/mapObjects/route8gate.asm" -Route8GateBlocks: INCBIN "maps/route8gate.blk" +INCLUDE "data/mapHeaders/Route8Gate.asm" +INCLUDE "scripts/Route8Gate.asm" +INCLUDE "data/mapObjects/Route8Gate.asm" +Route8Gate_Blocks: INCBIN "maps/Route8Gate.blk" -INCLUDE "data/mapHeaders/undergroundpathentranceroute8.asm" -INCLUDE "scripts/undergroundpathentranceroute8.asm" -INCLUDE "data/mapObjects/undergroundpathentranceroute8.asm" +INCLUDE "data/mapHeaders/UndergroundPathRoute8.asm" +INCLUDE "scripts/UndergroundPathRoute8.asm" +INCLUDE "data/mapObjects/UndergroundPathRoute8.asm" -INCLUDE "data/mapHeaders/powerplant.asm" -INCLUDE "scripts/powerplant.asm" -INCLUDE "data/mapObjects/powerplant.asm" -PowerPlantBlocks: INCBIN "maps/powerplant.blk" +INCLUDE "data/mapHeaders/PowerPlant.asm" +INCLUDE "scripts/PowerPlant.asm" +INCLUDE "data/mapObjects/PowerPlant.asm" +PowerPlant_Blocks: INCBIN "maps/PowerPlant.blk" -INCLUDE "data/mapHeaders/diglettscaveroute11.asm" -INCLUDE "scripts/diglettscaveroute11.asm" -INCLUDE "data/mapObjects/diglettscaveroute11.asm" +INCLUDE "data/mapHeaders/DiglettsCaveRoute11.asm" +INCLUDE "scripts/DiglettsCaveRoute11.asm" +INCLUDE "data/mapObjects/DiglettsCaveRoute11.asm" -INCLUDE "data/mapHeaders/route16house.asm" -INCLUDE "scripts/route16house.asm" -INCLUDE "data/mapObjects/route16house.asm" +INCLUDE "data/mapHeaders/Route16FlyHouse.asm" +INCLUDE "scripts/Route16FlyHouse.asm" +INCLUDE "data/mapObjects/Route16FlyHouse.asm" -INCLUDE "data/mapHeaders/route22gate.asm" -INCLUDE "scripts/route22gate.asm" -INCLUDE "data/mapObjects/route22gate.asm" -Route22GateBlocks: INCBIN "maps/route22gate.blk" +INCLUDE "data/mapHeaders/Route22Gate.asm" +INCLUDE "scripts/Route22Gate.asm" +INCLUDE "data/mapObjects/Route22Gate.asm" +Route22Gate_Blocks: INCBIN "maps/Route22Gate.blk" -INCLUDE "data/mapHeaders/billshouse.asm" -INCLUDE "scripts/billshouse.asm" -INCLUDE "data/mapObjects/billshouse.asm" -BillsHouseBlocks: INCBIN "maps/billshouse.blk" +INCLUDE "data/mapHeaders/BillsHouse.asm" +INCLUDE "scripts/BillsHouse.asm" +INCLUDE "data/mapObjects/BillsHouse.asm" +BillsHouse_Blocks: INCBIN "maps/BillsHouse.blk" INCLUDE "engine/menu/oaks_pc.asm" @@ -581,6 +583,7 @@ TangelaPicBack:: INCBIN "pic/monback/tangelab.pic" SECTION "Battle (BANK 9)", ROMX + INCLUDE "engine/battle/print_type.asm" INCLUDE "engine/battle/save_trainer_name.asm" INCLUDE "engine/battle/moveEffects/focus_energy_effect.asm" @@ -655,6 +658,7 @@ MoltresPicBack:: INCBIN "pic/monback/moltresb.pic" SECTION "Battle (BANK A)", ROMX + INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm" @@ -814,6 +818,7 @@ OldManPic:: INCBIN "pic/trainer/oldman.pic" SECTION "Battle (BANK C)", ROMX + INCLUDE "engine/battle/moveEffects/mist_effect.asm" INCLUDE "engine/battle/moveEffects/one_hit_ko_effect.asm" @@ -926,326 +931,326 @@ INCLUDE "engine/trade2.asm" SECTION "bank11", ROMX -INCLUDE "data/mapHeaders/lavendertown.asm" -INCLUDE "data/mapObjects/lavendertown.asm" -LavenderTownBlocks: INCBIN "maps/lavendertown.blk" +INCLUDE "data/mapHeaders/LavenderTown.asm" +INCLUDE "data/mapObjects/LavenderTown.asm" +LavenderTown_Blocks: INCBIN "maps/LavenderTown.blk" -ViridianPokecenterBlocks: INCBIN "maps/viridianpokecenter.blk" +ViridianPokecenter_Blocks: INCBIN "maps/ViridianPokecenter.blk" -SafariZoneRestHouse1Blocks: -SafariZoneRestHouse2Blocks: -SafariZoneRestHouse3Blocks: -SafariZoneRestHouse4Blocks: INCBIN "maps/safarizoneresthouse1.blk" +SafariZoneCenterRestHouse_Blocks: +SafariZoneWestRestHouse_Blocks: +SafariZoneEastRestHouse_Blocks: +SafariZoneNorthRestHouse_Blocks: INCBIN "maps/SafariZoneCenterRestHouse.blk" -INCLUDE "scripts/lavendertown.asm" +INCLUDE "scripts/LavenderTown.asm" INCLUDE "engine/pokedex_rating.asm" -INCLUDE "data/mapHeaders/viridianpokecenter.asm" -INCLUDE "scripts/viridianpokecenter.asm" -INCLUDE "data/mapObjects/viridianpokecenter.asm" +INCLUDE "data/mapHeaders/ViridianPokecenter.asm" +INCLUDE "scripts/ViridianPokecenter.asm" +INCLUDE "data/mapObjects/ViridianPokecenter.asm" -INCLUDE "data/mapHeaders/mansion1.asm" -INCLUDE "scripts/mansion1.asm" -INCLUDE "data/mapObjects/mansion1.asm" -Mansion1Blocks: INCBIN "maps/mansion1.blk" +INCLUDE "data/mapHeaders/PokemonMansion1F.asm" +INCLUDE "scripts/PokemonMansion1F.asm" +INCLUDE "data/mapObjects/PokemonMansion1F.asm" +PokemonMansion1F_Blocks: INCBIN "maps/PokemonMansion1F.blk" -INCLUDE "data/mapHeaders/rocktunnel1.asm" -INCLUDE "scripts/rocktunnel1.asm" -INCLUDE "data/mapObjects/rocktunnel1.asm" -RockTunnel1Blocks: INCBIN "maps/rocktunnel1.blk" +INCLUDE "data/mapHeaders/RockTunnel1F.asm" +INCLUDE "scripts/RockTunnel1F.asm" +INCLUDE "data/mapObjects/RockTunnel1F.asm" +RockTunnel1F_Blocks: INCBIN "maps/RockTunnel1F.blk" -INCLUDE "data/mapHeaders/seafoamislands1.asm" -INCLUDE "scripts/seafoamislands1.asm" -INCLUDE "data/mapObjects/seafoamislands1.asm" -SeafoamIslands1Blocks: INCBIN "maps/seafoamislands1.blk" +INCLUDE "data/mapHeaders/SeafoamIslands1F.asm" +INCLUDE "scripts/SeafoamIslands1F.asm" +INCLUDE "data/mapObjects/SeafoamIslands1F.asm" +SeafoamIslands1F_Blocks: INCBIN "maps/SeafoamIslands1F.blk" -INCLUDE "data/mapHeaders/ssanne3.asm" -INCLUDE "scripts/ssanne3.asm" -INCLUDE "data/mapObjects/ssanne3.asm" -SSAnne3Blocks: INCBIN "maps/ssanne3.blk" +INCLUDE "data/mapHeaders/SSAnne3F.asm" +INCLUDE "scripts/SSAnne3F.asm" +INCLUDE "data/mapObjects/SSAnne3F.asm" +SSAnne3F_Blocks: INCBIN "maps/SSAnne3F.blk" -INCLUDE "data/mapHeaders/victoryroad3.asm" -INCLUDE "scripts/victoryroad3.asm" -INCLUDE "data/mapObjects/victoryroad3.asm" -VictoryRoad3Blocks: INCBIN "maps/victoryroad3.blk" +INCLUDE "data/mapHeaders/VictoryRoad3F.asm" +INCLUDE "scripts/VictoryRoad3F.asm" +INCLUDE "data/mapObjects/VictoryRoad3F.asm" +VictoryRoad3F_Blocks: INCBIN "maps/VictoryRoad3F.blk" -INCLUDE "data/mapHeaders/rockethideout1.asm" -INCLUDE "scripts/rockethideout1.asm" -INCLUDE "data/mapObjects/rockethideout1.asm" -RocketHideout1Blocks: INCBIN "maps/rockethideout1.blk" +INCLUDE "data/mapHeaders/RocketHideoutB1F.asm" +INCLUDE "scripts/RocketHideoutB1F.asm" +INCLUDE "data/mapObjects/RocketHideoutB1F.asm" +RocketHideoutB1F_Blocks: INCBIN "maps/RocketHideoutB1F.blk" -INCLUDE "data/mapHeaders/rockethideout2.asm" -INCLUDE "scripts/rockethideout2.asm" -INCLUDE "data/mapObjects/rockethideout2.asm" -RocketHideout2Blocks: INCBIN "maps/rockethideout2.blk" +INCLUDE "data/mapHeaders/RocketHideoutB2F.asm" +INCLUDE "scripts/RocketHideoutB2F.asm" +INCLUDE "data/mapObjects/RocketHideoutB2F.asm" +RocketHideoutB2F_Blocks: INCBIN "maps/RocketHideoutB2F.blk" -INCLUDE "data/mapHeaders/rockethideout3.asm" -INCLUDE "scripts/rockethideout3.asm" -INCLUDE "data/mapObjects/rockethideout3.asm" -RocketHideout3Blocks: INCBIN "maps/rockethideout3.blk" +INCLUDE "data/mapHeaders/RocketHideoutB3F.asm" +INCLUDE "scripts/RocketHideoutB3F.asm" +INCLUDE "data/mapObjects/RocketHideoutB3F.asm" +RocketHideoutB3F_Blocks: INCBIN "maps/RocketHideoutB3F.blk" -INCLUDE "data/mapHeaders/rockethideout4.asm" -INCLUDE "scripts/rockethideout4.asm" -INCLUDE "data/mapObjects/rockethideout4.asm" -RocketHideout4Blocks: INCBIN "maps/rockethideout4.blk" +INCLUDE "data/mapHeaders/RocketHideoutB4F.asm" +INCLUDE "scripts/RocketHideoutB4F.asm" +INCLUDE "data/mapObjects/RocketHideoutB4F.asm" +RocketHideoutB4F_Blocks: INCBIN "maps/RocketHideoutB4F.blk" -INCLUDE "data/mapHeaders/rockethideoutelevator.asm" -INCLUDE "scripts/rockethideoutelevator.asm" -INCLUDE "data/mapObjects/rockethideoutelevator.asm" -RocketHideoutElevatorBlocks: INCBIN "maps/rockethideoutelevator.blk" +INCLUDE "data/mapHeaders/RocketHideoutElevator.asm" +INCLUDE "scripts/RocketHideoutElevator.asm" +INCLUDE "data/mapObjects/RocketHideoutElevator.asm" +RocketHideoutElevator_Blocks: INCBIN "maps/RocketHideoutElevator.blk" -INCLUDE "data/mapHeaders/silphcoelevator.asm" -INCLUDE "scripts/silphcoelevator.asm" -INCLUDE "data/mapObjects/silphcoelevator.asm" -SilphCoElevatorBlocks: INCBIN "maps/silphcoelevator.blk" +INCLUDE "data/mapHeaders/SilphCoElevator.asm" +INCLUDE "scripts/SilphCoElevator.asm" +INCLUDE "data/mapObjects/SilphCoElevator.asm" +SilphCoElevator_Blocks: INCBIN "maps/SilphCoElevator.blk" -INCLUDE "data/mapHeaders/safarizoneeast.asm" -INCLUDE "scripts/safarizoneeast.asm" -INCLUDE "data/mapObjects/safarizoneeast.asm" -SafariZoneEastBlocks: INCBIN "maps/safarizoneeast.blk" +INCLUDE "data/mapHeaders/SafariZoneEast.asm" +INCLUDE "scripts/SafariZoneEast.asm" +INCLUDE "data/mapObjects/SafariZoneEast.asm" +SafariZoneEast_Blocks: INCBIN "maps/SafariZoneEast.blk" -INCLUDE "data/mapHeaders/safarizonenorth.asm" -INCLUDE "scripts/safarizonenorth.asm" -INCLUDE "data/mapObjects/safarizonenorth.asm" -SafariZoneNorthBlocks: INCBIN "maps/safarizonenorth.blk" +INCLUDE "data/mapHeaders/SafariZoneNorth.asm" +INCLUDE "scripts/SafariZoneNorth.asm" +INCLUDE "data/mapObjects/SafariZoneNorth.asm" +SafariZoneNorth_Blocks: INCBIN "maps/SafariZoneNorth.blk" -INCLUDE "data/mapHeaders/safarizonecenter.asm" -INCLUDE "scripts/safarizonecenter.asm" -INCLUDE "data/mapObjects/safarizonecenter.asm" -SafariZoneCenterBlocks: INCBIN "maps/safarizonecenter.blk" +INCLUDE "data/mapHeaders/SafariZoneCenter.asm" +INCLUDE "scripts/SafariZoneCenter.asm" +INCLUDE "data/mapObjects/SafariZoneCenter.asm" +SafariZoneCenter_Blocks: INCBIN "maps/SafariZoneCenter.blk" -INCLUDE "data/mapHeaders/safarizoneresthouse1.asm" -INCLUDE "scripts/safarizoneresthouse1.asm" -INCLUDE "data/mapObjects/safarizoneresthouse1.asm" +INCLUDE "data/mapHeaders/SafariZoneCenterRestHouse.asm" +INCLUDE "scripts/SafariZoneCenterRestHouse.asm" +INCLUDE "data/mapObjects/SafariZoneCenterRestHouse.asm" -INCLUDE "data/mapHeaders/safarizoneresthouse2.asm" -INCLUDE "scripts/safarizoneresthouse2.asm" -INCLUDE "data/mapObjects/safarizoneresthouse2.asm" +INCLUDE "data/mapHeaders/SafariZoneWestRestHouse.asm" +INCLUDE "scripts/SafariZoneWestRestHouse.asm" +INCLUDE "data/mapObjects/SafariZoneWestRestHouse.asm" -INCLUDE "data/mapHeaders/safarizoneresthouse3.asm" -INCLUDE "scripts/safarizoneresthouse3.asm" -INCLUDE "data/mapObjects/safarizoneresthouse3.asm" +INCLUDE "data/mapHeaders/SafariZoneEastRestHouse.asm" +INCLUDE "scripts/SafariZoneEastRestHouse.asm" +INCLUDE "data/mapObjects/SafariZoneEastRestHouse.asm" -INCLUDE "data/mapHeaders/safarizoneresthouse4.asm" -INCLUDE "scripts/safarizoneresthouse4.asm" -INCLUDE "data/mapObjects/safarizoneresthouse4.asm" +INCLUDE "data/mapHeaders/SafariZoneNorthRestHouse.asm" +INCLUDE "scripts/SafariZoneNorthRestHouse.asm" +INCLUDE "data/mapObjects/SafariZoneNorthRestHouse.asm" -INCLUDE "data/mapHeaders/unknowndungeon2.asm" -INCLUDE "scripts/unknowndungeon2.asm" -INCLUDE "data/mapObjects/unknowndungeon2.asm" -UnknownDungeon2Blocks: INCBIN "maps/unknowndungeon2.blk" +INCLUDE "data/mapHeaders/CeruleanCave2F.asm" +INCLUDE "scripts/CeruleanCave2F.asm" +INCLUDE "data/mapObjects/CeruleanCave2F.asm" +CeruleanCave2F_Blocks: INCBIN "maps/CeruleanCave2F.blk" -INCLUDE "data/mapHeaders/unknowndungeon3.asm" -INCLUDE "scripts/unknowndungeon3.asm" -INCLUDE "data/mapObjects/unknowndungeon3.asm" -UnknownDungeon3Blocks: INCBIN "maps/unknowndungeon3.blk" +INCLUDE "data/mapHeaders/CeruleanCaveB1F.asm" +INCLUDE "scripts/CeruleanCaveB1F.asm" +INCLUDE "data/mapObjects/CeruleanCaveB1F.asm" +CeruleanCaveB1F_Blocks: INCBIN "maps/CeruleanCaveB1F.blk" -INCLUDE "data/mapHeaders/rocktunnel2.asm" -INCLUDE "scripts/rocktunnel2.asm" -INCLUDE "data/mapObjects/rocktunnel2.asm" -RockTunnel2Blocks: INCBIN "maps/rocktunnel2.blk" +INCLUDE "data/mapHeaders/RockTunnelB1F.asm" +INCLUDE "scripts/RockTunnelB1F.asm" +INCLUDE "data/mapObjects/RockTunnelB1F.asm" +RockTunnelB1F_Blocks: INCBIN "maps/RockTunnelB1F.blk" -INCLUDE "data/mapHeaders/seafoamislands2.asm" -INCLUDE "scripts/seafoamislands2.asm" -INCLUDE "data/mapObjects/seafoamislands2.asm" -SeafoamIslands2Blocks: INCBIN "maps/seafoamislands2.blk" +INCLUDE "data/mapHeaders/SeafoamIslandsB1F.asm" +INCLUDE "scripts/SeafoamIslandsB1F.asm" +INCLUDE "data/mapObjects/SeafoamIslandsB1F.asm" +SeafoamIslandsB1F_Blocks: INCBIN "maps/SeafoamIslandsB1F.blk" -INCLUDE "data/mapHeaders/seafoamislands3.asm" -INCLUDE "scripts/seafoamislands3.asm" -INCLUDE "data/mapObjects/seafoamislands3.asm" -SeafoamIslands3Blocks: INCBIN "maps/seafoamislands3.blk" +INCLUDE "data/mapHeaders/SeafoamIslandsB2F.asm" +INCLUDE "scripts/SeafoamIslandsB2F.asm" +INCLUDE "data/mapObjects/SeafoamIslandsB2F.asm" +SeafoamIslandsB2F_Blocks: INCBIN "maps/SeafoamIslandsB2F.blk" -INCLUDE "data/mapHeaders/seafoamislands4.asm" -INCLUDE "scripts/seafoamislands4.asm" -INCLUDE "data/mapObjects/seafoamislands4.asm" -SeafoamIslands4Blocks: INCBIN "maps/seafoamislands4.blk" +INCLUDE "data/mapHeaders/SeafoamIslandsB3F.asm" +INCLUDE "scripts/SeafoamIslandsB3F.asm" +INCLUDE "data/mapObjects/SeafoamIslandsB3F.asm" +SeafoamIslandsB3F_Blocks: INCBIN "maps/SeafoamIslandsB3F.blk" -INCLUDE "data/mapHeaders/seafoamislands5.asm" -INCLUDE "scripts/seafoamislands5.asm" -INCLUDE "data/mapObjects/seafoamislands5.asm" -SeafoamIslands5Blocks: INCBIN "maps/seafoamislands5.blk" +INCLUDE "data/mapHeaders/SeafoamIslandsB4F.asm" +INCLUDE "scripts/SeafoamIslandsB4F.asm" +INCLUDE "data/mapObjects/SeafoamIslandsB4F.asm" +SeafoamIslandsB4F_Blocks: INCBIN "maps/SeafoamIslandsB4F.blk" INCLUDE "engine/overworld/hidden_objects.asm" SECTION "bank12", ROMX -INCLUDE "data/mapHeaders/route7.asm" -INCLUDE "data/mapObjects/route7.asm" -Route7Blocks: INCBIN "maps/route7.blk" +INCLUDE "data/mapHeaders/Route7.asm" +INCLUDE "data/mapObjects/Route7.asm" +Route7_Blocks: INCBIN "maps/Route7.blk" -CeladonPokecenterBlocks: -RockTunnelPokecenterBlocks: -MtMoonPokecenterBlocks: INCBIN "maps/mtmoonpokecenter.blk" +CeladonPokecenter_Blocks: +RockTunnelPokecenter_Blocks: +MtMoonPokecenter_Blocks: INCBIN "maps/MtMoonPokecenter.blk" -Route18GateBlocks: -Route15GateBlocks: -Route11GateBlocks: INCBIN "maps/route11gate.blk" +Route18Gate1F_Blocks: +Route15Gate1F_Blocks: +Route11Gate1F_Blocks: INCBIN "maps/Route11Gate1F.blk" -Route18GateUpstairsBlocks: -Route16GateUpstairsBlocks: -Route12GateUpstairsBlocks: -Route15GateUpstairsBlocks: -Route11GateUpstairsBlocks: INCBIN "maps/route11gateupstairs.blk" +Route18Gate2F_Blocks: +Route16Gate2F_Blocks: +Route15Gate2F_Blocks: +Route12Gate2F_Blocks: +Route11Gate2F_Blocks: INCBIN "maps/Route11Gate2F.blk" INCLUDE "engine/predefs12.asm" -INCLUDE "scripts/route7.asm" +INCLUDE "scripts/Route7.asm" -INCLUDE "data/mapHeaders/redshouse1f.asm" -INCLUDE "scripts/redshouse1f.asm" -INCLUDE "data/mapObjects/redshouse1f.asm" -RedsHouse1FBlocks: INCBIN "maps/redshouse1f.blk" +INCLUDE "data/mapHeaders/RedsHouse1F.asm" +INCLUDE "scripts/RedsHouse1F.asm" +INCLUDE "data/mapObjects/RedsHouse1F.asm" +RedsHouse1F_Blocks: INCBIN "maps/RedsHouse1F.blk" -INCLUDE "data/mapHeaders/celadonmart3.asm" -INCLUDE "scripts/celadonmart3.asm" -INCLUDE "data/mapObjects/celadonmart3.asm" -CeladonMart3Blocks: INCBIN "maps/celadonmart3.blk" +INCLUDE "data/mapHeaders/CeladonMart3F.asm" +INCLUDE "scripts/CeladonMart3F.asm" +INCLUDE "data/mapObjects/CeladonMart3F.asm" +CeladonMart3F_Blocks: INCBIN "maps/CeladonMart3F.blk" -INCLUDE "data/mapHeaders/celadonmart4.asm" -INCLUDE "scripts/celadonmart4.asm" -INCLUDE "data/mapObjects/celadonmart4.asm" -CeladonMart4Blocks: INCBIN "maps/celadonmart4.blk" +INCLUDE "data/mapHeaders/CeladonMart4F.asm" +INCLUDE "scripts/CeladonMart4F.asm" +INCLUDE "data/mapObjects/CeladonMart4F.asm" +CeladonMart4F_Blocks: INCBIN "maps/CeladonMart4F.blk" -INCLUDE "data/mapHeaders/celadonmartroof.asm" -INCLUDE "scripts/celadonmartroof.asm" -INCLUDE "data/mapObjects/celadonmartroof.asm" -CeladonMartRoofBlocks: INCBIN "maps/celadonmartroof.blk" +INCLUDE "data/mapHeaders/CeladonMartRoof.asm" +INCLUDE "scripts/CeladonMartRoof.asm" +INCLUDE "data/mapObjects/CeladonMartRoof.asm" +CeladonMartRoof_Blocks: INCBIN "maps/CeladonMartRoof.blk" -INCLUDE "data/mapHeaders/celadonmartelevator.asm" -INCLUDE "scripts/celadonmartelevator.asm" -INCLUDE "data/mapObjects/celadonmartelevator.asm" -CeladonMartElevatorBlocks: INCBIN "maps/celadonmartelevator.blk" +INCLUDE "data/mapHeaders/CeladonMartElevator.asm" +INCLUDE "scripts/CeladonMartElevator.asm" +INCLUDE "data/mapObjects/CeladonMartElevator.asm" +CeladonMartElevator_Blocks: INCBIN "maps/CeladonMartElevator.blk" -INCLUDE "data/mapHeaders/celadonmansion1.asm" -INCLUDE "scripts/celadonmansion1.asm" -INCLUDE "data/mapObjects/celadonmansion1.asm" -CeladonMansion1Blocks: INCBIN "maps/celadonmansion1.blk" +INCLUDE "data/mapHeaders/CeladonMansion1F.asm" +INCLUDE "scripts/CeladonMansion1F.asm" +INCLUDE "data/mapObjects/CeladonMansion1F.asm" +CeladonMansion1F_Blocks: INCBIN "maps/CeladonMansion1F.blk" -INCLUDE "data/mapHeaders/celadonmansion2.asm" -INCLUDE "scripts/celadonmansion2.asm" -INCLUDE "data/mapObjects/celadonmansion2.asm" -CeladonMansion2Blocks: INCBIN "maps/celadonmansion2.blk" +INCLUDE "data/mapHeaders/CeladonMansion2F.asm" +INCLUDE "scripts/CeladonMansion2F.asm" +INCLUDE "data/mapObjects/CeladonMansion2F.asm" +CeladonMansion2F_Blocks: INCBIN "maps/CeladonMansion2F.blk" -INCLUDE "data/mapHeaders/celadonmansion3.asm" -INCLUDE "scripts/celadonmansion3.asm" -INCLUDE "data/mapObjects/celadonmansion3.asm" -CeladonMansion3Blocks: INCBIN "maps/celadonmansion3.blk" +INCLUDE "data/mapHeaders/CeladonMansion3F.asm" +INCLUDE "scripts/CeladonMansion3F.asm" +INCLUDE "data/mapObjects/CeladonMansion3F.asm" +CeladonMansion3F_Blocks: INCBIN "maps/CeladonMansion3F.blk" -INCLUDE "data/mapHeaders/celadonmansion4.asm" -INCLUDE "scripts/celadonmansion4.asm" -INCLUDE "data/mapObjects/celadonmansion4.asm" -CeladonMansion4Blocks: INCBIN "maps/celadonmansion4.blk" +INCLUDE "data/mapHeaders/CeladonMansionRoof.asm" +INCLUDE "scripts/CeladonMansionRoof.asm" +INCLUDE "data/mapObjects/CeladonMansionRoof.asm" +CeladonMansionRoof_Blocks: INCBIN "maps/CeladonMansionRoof.blk" -INCLUDE "data/mapHeaders/celadonpokecenter.asm" -INCLUDE "scripts/celadonpokecenter.asm" -INCLUDE "data/mapObjects/celadonpokecenter.asm" +INCLUDE "data/mapHeaders/CeladonPokecenter.asm" +INCLUDE "scripts/CeladonPokecenter.asm" +INCLUDE "data/mapObjects/CeladonPokecenter.asm" -INCLUDE "data/mapHeaders/celadongym.asm" -INCLUDE "scripts/celadongym.asm" -INCLUDE "data/mapObjects/celadongym.asm" -CeladonGymBlocks: INCBIN "maps/celadongym.blk" +INCLUDE "data/mapHeaders/CeladonGym.asm" +INCLUDE "scripts/CeladonGym.asm" +INCLUDE "data/mapObjects/CeladonGym.asm" +CeladonGym_Blocks: INCBIN "maps/CeladonGym.blk" -INCLUDE "data/mapHeaders/celadongamecorner.asm" -INCLUDE "scripts/celadongamecorner.asm" -INCLUDE "data/mapObjects/celadongamecorner.asm" -CeladonGameCornerBlocks: INCBIN "maps/celadongamecorner.blk" +INCLUDE "data/mapHeaders/GameCorner.asm" +INCLUDE "scripts/GameCorner.asm" +INCLUDE "data/mapObjects/GameCorner.asm" +GameCorner_Blocks: INCBIN "maps/GameCorner.blk" -INCLUDE "data/mapHeaders/celadonmart5.asm" -INCLUDE "scripts/celadonmart5.asm" -INCLUDE "data/mapObjects/celadonmart5.asm" -CeladonMart5Blocks: INCBIN "maps/celadonmart5.blk" +INCLUDE "data/mapHeaders/CeladonMart5F.asm" +INCLUDE "scripts/CeladonMart5F.asm" +INCLUDE "data/mapObjects/CeladonMart5F.asm" +CeladonMart5F_Blocks: INCBIN "maps/CeladonMart5F.blk" -INCLUDE "data/mapHeaders/celadonprizeroom.asm" -INCLUDE "scripts/celadonprizeroom.asm" -INCLUDE "data/mapObjects/celadonprizeroom.asm" -CeladonPrizeRoomBlocks: INCBIN "maps/celadonprizeroom.blk" +INCLUDE "data/mapHeaders/GameCornerPrizeRoom.asm" +INCLUDE "scripts/GameCornerPrizeRoom.asm" +INCLUDE "data/mapObjects/GameCornerPrizeRoom.asm" +GameCornerPrizeRoom_Blocks: INCBIN "maps/GameCornerPrizeRoom.blk" -INCLUDE "data/mapHeaders/celadondiner.asm" -INCLUDE "scripts/celadondiner.asm" -INCLUDE "data/mapObjects/celadondiner.asm" -CeladonDinerBlocks: INCBIN "maps/celadondiner.blk" +INCLUDE "data/mapHeaders/CeladonDiner.asm" +INCLUDE "scripts/CeladonDiner.asm" +INCLUDE "data/mapObjects/CeladonDiner.asm" +CeladonDiner_Blocks: INCBIN "maps/CeladonDiner.blk" -INCLUDE "data/mapHeaders/celadonhouse.asm" -INCLUDE "scripts/celadonhouse.asm" -INCLUDE "data/mapObjects/celadonhouse.asm" -CeladonHouseBlocks: INCBIN "maps/celadonhouse.blk" +INCLUDE "data/mapHeaders/CeladonChiefHouse.asm" +INCLUDE "scripts/CeladonChiefHouse.asm" +INCLUDE "data/mapObjects/CeladonChiefHouse.asm" +CeladonChiefHouse_Blocks: INCBIN "maps/CeladonChiefHouse.blk" -INCLUDE "data/mapHeaders/celadonhotel.asm" -INCLUDE "scripts/celadonhotel.asm" -INCLUDE "data/mapObjects/celadonhotel.asm" -CeladonHotelBlocks: INCBIN "maps/celadonhotel.blk" +INCLUDE "data/mapHeaders/CeladonHotel.asm" +INCLUDE "scripts/CeladonHotel.asm" +INCLUDE "data/mapObjects/CeladonHotel.asm" +CeladonHotel_Blocks: INCBIN "maps/CeladonHotel.blk" -INCLUDE "data/mapHeaders/mtmoonpokecenter.asm" -INCLUDE "scripts/mtmoonpokecenter.asm" -INCLUDE "data/mapObjects/mtmoonpokecenter.asm" +INCLUDE "data/mapHeaders/MtMoonPokecenter.asm" +INCLUDE "scripts/MtMoonPokecenter.asm" +INCLUDE "data/mapObjects/MtMoonPokecenter.asm" -INCLUDE "data/mapHeaders/rocktunnelpokecenter.asm" -INCLUDE "scripts/rocktunnelpokecenter.asm" -INCLUDE "data/mapObjects/rocktunnelpokecenter.asm" +INCLUDE "data/mapHeaders/RockTunnelPokecenter.asm" +INCLUDE "scripts/RockTunnelPokecenter.asm" +INCLUDE "data/mapObjects/RockTunnelPokecenter.asm" -INCLUDE "data/mapHeaders/route11gate.asm" -INCLUDE "scripts/route11gate.asm" -INCLUDE "data/mapObjects/route11gate.asm" +INCLUDE "data/mapHeaders/Route11Gate1F.asm" +INCLUDE "scripts/Route11Gate1F.asm" +INCLUDE "data/mapObjects/Route11Gate1F.asm" -INCLUDE "data/mapHeaders/route11gateupstairs.asm" -INCLUDE "scripts/route11gateupstairs.asm" -INCLUDE "data/mapObjects/route11gateupstairs.asm" +INCLUDE "data/mapHeaders/Route11Gate2F.asm" +INCLUDE "scripts/Route11Gate2F.asm" +INCLUDE "data/mapObjects/Route11Gate2F.asm" -INCLUDE "data/mapHeaders/route12gate.asm" -INCLUDE "scripts/route12gate.asm" -INCLUDE "data/mapObjects/route12gate.asm" -Route12GateBlocks: INCBIN "maps/route12gate.blk" +INCLUDE "data/mapHeaders/Route12Gate1F.asm" +INCLUDE "scripts/Route12Gate1F.asm" +INCLUDE "data/mapObjects/Route12Gate1F.asm" +Route12Gate1F_Blocks: INCBIN "maps/Route12Gate1F.blk" -INCLUDE "data/mapHeaders/route12gateupstairs.asm" -INCLUDE "scripts/route12gateupstairs.asm" -INCLUDE "data/mapObjects/route12gateupstairs.asm" +INCLUDE "data/mapHeaders/Route12Gate2F.asm" +INCLUDE "scripts/Route12Gate2F.asm" +INCLUDE "data/mapObjects/Route12Gate2F.asm" -INCLUDE "data/mapHeaders/route15gate.asm" -INCLUDE "scripts/route15gate.asm" -INCLUDE "data/mapObjects/route15gate.asm" +INCLUDE "data/mapHeaders/Route15Gate1F.asm" +INCLUDE "scripts/Route15Gate1F.asm" +INCLUDE "data/mapObjects/Route15Gate1F.asm" -INCLUDE "data/mapHeaders/route15gateupstairs.asm" -INCLUDE "scripts/route15gateupstairs.asm" -INCLUDE "data/mapObjects/route15gateupstairs.asm" +INCLUDE "data/mapHeaders/Route15Gate2F.asm" +INCLUDE "scripts/Route15Gate2F.asm" +INCLUDE "data/mapObjects/Route15Gate2F.asm" -INCLUDE "data/mapHeaders/route16gate.asm" -INCLUDE "scripts/route16gate.asm" -INCLUDE "data/mapObjects/route16gate.asm" -Route16GateBlocks: INCBIN "maps/route16gate.blk" +INCLUDE "data/mapHeaders/Route16Gate1F.asm" +INCLUDE "scripts/Route16Gate1F.asm" +INCLUDE "data/mapObjects/Route16Gate1F.asm" +Route16Gate1F_Blocks: INCBIN "maps/Route16Gate1F.blk" -INCLUDE "data/mapHeaders/route16gateupstairs.asm" -INCLUDE "scripts/route16gateupstairs.asm" -INCLUDE "data/mapObjects/route16gateupstairs.asm" +INCLUDE "data/mapHeaders/Route16Gate2F.asm" +INCLUDE "scripts/Route16Gate2F.asm" +INCLUDE "data/mapObjects/Route16Gate2F.asm" -INCLUDE "data/mapHeaders/route18gate.asm" -INCLUDE "scripts/route18gate.asm" -INCLUDE "data/mapObjects/route18gate.asm" +INCLUDE "data/mapHeaders/Route18Gate1F.asm" +INCLUDE "scripts/Route18Gate1F.asm" +INCLUDE "data/mapObjects/Route18Gate1F.asm" -INCLUDE "data/mapHeaders/route18gateupstairs.asm" -INCLUDE "scripts/route18gateupstairs.asm" -INCLUDE "data/mapObjects/route18gateupstairs.asm" +INCLUDE "data/mapHeaders/Route18Gate2F.asm" +INCLUDE "scripts/Route18Gate2F.asm" +INCLUDE "data/mapObjects/Route18Gate2F.asm" -INCLUDE "data/mapHeaders/mtmoon1.asm" -INCLUDE "scripts/mtmoon1.asm" -INCLUDE "data/mapObjects/mtmoon1.asm" -MtMoon1Blocks: INCBIN "maps/mtmoon1.blk" +INCLUDE "data/mapHeaders/MtMoon1F.asm" +INCLUDE "scripts/MtMoon1F.asm" +INCLUDE "data/mapObjects/MtMoon1F.asm" +MtMoon1F_Blocks: INCBIN "maps/MtMoon1F.blk" -INCLUDE "data/mapHeaders/mtmoon3.asm" -INCLUDE "scripts/mtmoon3.asm" -INCLUDE "data/mapObjects/mtmoon3.asm" -MtMoon3Blocks: INCBIN "maps/mtmoon3.blk" +INCLUDE "data/mapHeaders/MtMoonB2F.asm" +INCLUDE "scripts/MtMoonB2F.asm" +INCLUDE "data/mapObjects/MtMoonB2F.asm" +MtMoonB2F_Blocks: INCBIN "maps/MtMoonB2F.blk" -INCLUDE "data/mapHeaders/safarizonewest.asm" -INCLUDE "scripts/safarizonewest.asm" -INCLUDE "data/mapObjects/safarizonewest.asm" -SafariZoneWestBlocks: INCBIN "maps/safarizonewest.blk" +INCLUDE "data/mapHeaders/SafariZoneWest.asm" +INCLUDE "scripts/SafariZoneWest.asm" +INCLUDE "data/mapObjects/SafariZoneWest.asm" +SafariZoneWest_Blocks: INCBIN "maps/SafariZoneWest.blk" -INCLUDE "data/mapHeaders/safarizonesecrethouse.asm" -INCLUDE "scripts/safarizonesecrethouse.asm" -INCLUDE "data/mapObjects/safarizonesecrethouse.asm" -SafariZoneSecretHouseBlocks: INCBIN "maps/safarizonesecrethouse.blk" +INCLUDE "data/mapHeaders/SafariZoneSecretHouse.asm" +INCLUDE "scripts/SafariZoneSecretHouse.asm" +INCLUDE "data/mapObjects/SafariZoneSecretHouse.asm" +SafariZoneSecretHouse_Blocks: INCBIN "maps/SafariZoneSecretHouse.blk" SECTION "bank13", ROMX @@ -1298,15 +1303,15 @@ ChannelerPic:: INCBIN "pic/trainer/channeler.pic" AgathaPic:: INCBIN "pic/trainer/agatha.pic" LancePic:: INCBIN "pic/trainer/lance.pic" -INCLUDE "data/mapHeaders/tradecenter.asm" -INCLUDE "scripts/tradecenter.asm" -INCLUDE "data/mapObjects/tradecenter.asm" -TradeCenterBlocks: INCBIN "maps/tradecenter.blk" +INCLUDE "data/mapHeaders/TradeCenter.asm" +INCLUDE "scripts/TradeCenter.asm" +INCLUDE "data/mapObjects/TradeCenter.asm" +TradeCenter_Blocks: INCBIN "maps/TradeCenter.blk" -INCLUDE "data/mapHeaders/colosseum.asm" -INCLUDE "scripts/colosseum.asm" -INCLUDE "data/mapObjects/colosseum.asm" -ColosseumBlocks: INCBIN "maps/colosseum.blk" +INCLUDE "data/mapHeaders/Colosseum.asm" +INCLUDE "scripts/Colosseum.asm" +INCLUDE "data/mapObjects/Colosseum.asm" +Colosseum_Blocks: INCBIN "maps/Colosseum.blk" INCLUDE "engine/give_pokemon.asm" @@ -1315,71 +1320,71 @@ INCLUDE "engine/predefs.asm" SECTION "bank14", ROMX -INCLUDE "data/mapHeaders/route22.asm" -INCLUDE "data/mapObjects/route22.asm" -Route22Blocks: INCBIN "maps/route22.blk" +INCLUDE "data/mapHeaders/Route22.asm" +INCLUDE "data/mapObjects/Route22.asm" +Route22_Blocks: INCBIN "maps/Route22.blk" -INCLUDE "data/mapHeaders/route20.asm" -INCLUDE "data/mapObjects/route20.asm" -Route20Blocks: INCBIN "maps/route20.blk" +INCLUDE "data/mapHeaders/Route20.asm" +INCLUDE "data/mapObjects/Route20.asm" +Route20_Blocks: INCBIN "maps/Route20.blk" -INCLUDE "data/mapHeaders/route23.asm" -INCLUDE "data/mapObjects/route23.asm" -Route23Blocks: INCBIN "maps/route23.blk" +INCLUDE "data/mapHeaders/Route23.asm" +INCLUDE "data/mapObjects/Route23.asm" +Route23_Blocks: INCBIN "maps/Route23.blk" -INCLUDE "data/mapHeaders/route24.asm" -INCLUDE "data/mapObjects/route24.asm" -Route24Blocks: INCBIN "maps/route24.blk" +INCLUDE "data/mapHeaders/Route24.asm" +INCLUDE "data/mapObjects/Route24.asm" +Route24_Blocks: INCBIN "maps/Route24.blk" -INCLUDE "data/mapHeaders/route25.asm" -INCLUDE "data/mapObjects/route25.asm" -Route25Blocks: INCBIN "maps/route25.blk" +INCLUDE "data/mapHeaders/Route25.asm" +INCLUDE "data/mapObjects/Route25.asm" +Route25_Blocks: INCBIN "maps/Route25.blk" -INCLUDE "data/mapHeaders/indigoplateau.asm" -INCLUDE "scripts/indigoplateau.asm" -INCLUDE "data/mapObjects/indigoplateau.asm" -IndigoPlateauBlocks: INCBIN "maps/indigoplateau.blk" +INCLUDE "data/mapHeaders/IndigoPlateau.asm" +INCLUDE "scripts/IndigoPlateau.asm" +INCLUDE "data/mapObjects/IndigoPlateau.asm" +IndigoPlateau_Blocks: INCBIN "maps/IndigoPlateau.blk" -INCLUDE "data/mapHeaders/saffroncity.asm" -INCLUDE "data/mapObjects/saffroncity.asm" -SaffronCityBlocks: INCBIN "maps/saffroncity.blk" -INCLUDE "scripts/saffroncity.asm" +INCLUDE "data/mapHeaders/SaffronCity.asm" +INCLUDE "data/mapObjects/SaffronCity.asm" +SaffronCity_Blocks: INCBIN "maps/SaffronCity.blk" +INCLUDE "scripts/SaffronCity.asm" -INCLUDE "scripts/route20.asm" -INCLUDE "scripts/route22.asm" -INCLUDE "scripts/route23.asm" -INCLUDE "scripts/route24.asm" -INCLUDE "scripts/route25.asm" +INCLUDE "scripts/Route20.asm" +INCLUDE "scripts/Route22.asm" +INCLUDE "scripts/Route23.asm" +INCLUDE "scripts/Route24.asm" +INCLUDE "scripts/Route25.asm" -INCLUDE "data/mapHeaders/victoryroad2.asm" -INCLUDE "scripts/victoryroad2.asm" -INCLUDE "data/mapObjects/victoryroad2.asm" -VictoryRoad2Blocks: INCBIN "maps/victoryroad2.blk" +INCLUDE "data/mapHeaders/VictoryRoad2F.asm" +INCLUDE "scripts/VictoryRoad2F.asm" +INCLUDE "data/mapObjects/VictoryRoad2F.asm" +VictoryRoad2F_Blocks: INCBIN "maps/VictoryRoad2F.blk" -INCLUDE "data/mapHeaders/mtmoon2.asm" -INCLUDE "scripts/mtmoon2.asm" -INCLUDE "data/mapObjects/mtmoon2.asm" -MtMoon2Blocks: INCBIN "maps/mtmoon2.blk" +INCLUDE "data/mapHeaders/MtMoonB1F.asm" +INCLUDE "scripts/MtMoonB1F.asm" +INCLUDE "data/mapObjects/MtMoonB1F.asm" +MtMoonB1F_Blocks: INCBIN "maps/MtMoonB1F.blk" -INCLUDE "data/mapHeaders/silphco7.asm" -INCLUDE "scripts/silphco7.asm" -INCLUDE "data/mapObjects/silphco7.asm" -SilphCo7Blocks: INCBIN "maps/silphco7.blk" +INCLUDE "data/mapHeaders/SilphCo7F.asm" +INCLUDE "scripts/SilphCo7F.asm" +INCLUDE "data/mapObjects/SilphCo7F.asm" +SilphCo7F_Blocks: INCBIN "maps/SilphCo7F.blk" -INCLUDE "data/mapHeaders/mansion2.asm" -INCLUDE "scripts/mansion2.asm" -INCLUDE "data/mapObjects/mansion2.asm" -Mansion2Blocks: INCBIN "maps/mansion2.blk" +INCLUDE "data/mapHeaders/PokemonMansion2F.asm" +INCLUDE "scripts/PokemonMansion2F.asm" +INCLUDE "data/mapObjects/PokemonMansion2F.asm" +PokemonMansion2F_Blocks: INCBIN "maps/PokemonMansion2F.blk" -INCLUDE "data/mapHeaders/mansion3.asm" -INCLUDE "scripts/mansion3.asm" -INCLUDE "data/mapObjects/mansion3.asm" -Mansion3Blocks: INCBIN "maps/mansion3.blk" +INCLUDE "data/mapHeaders/PokemonMansion3F.asm" +INCLUDE "scripts/PokemonMansion3F.asm" +INCLUDE "data/mapObjects/PokemonMansion3F.asm" +PokemonMansion3F_Blocks: INCBIN "maps/PokemonMansion3F.blk" -INCLUDE "data/mapHeaders/mansion4.asm" -INCLUDE "scripts/mansion4.asm" -INCLUDE "data/mapObjects/mansion4.asm" -Mansion4Blocks: INCBIN "maps/mansion4.blk" +INCLUDE "data/mapHeaders/PokemonMansionB1F.asm" +INCLUDE "scripts/PokemonMansionB1F.asm" +INCLUDE "data/mapObjects/PokemonMansionB1F.asm" +PokemonMansionB1F_Blocks: INCBIN "maps/PokemonMansionB1F.blk" INCLUDE "engine/battle/init_battle_variables.asm" INCLUDE "engine/battle/moveEffects/paralyze_effect.asm" @@ -1393,90 +1398,90 @@ INCLUDE "engine/hidden_object_functions14.asm" SECTION "bank15", ROMX -INCLUDE "data/mapHeaders/route2.asm" -INCLUDE "data/mapObjects/route2.asm" -Route2Blocks: INCBIN "maps/route2.blk" +INCLUDE "data/mapHeaders/Route2.asm" +INCLUDE "data/mapObjects/Route2.asm" +Route2_Blocks: INCBIN "maps/Route2.blk" -INCLUDE "data/mapHeaders/route3.asm" -INCLUDE "data/mapObjects/route3.asm" -Route3Blocks: INCBIN "maps/route3.blk" +INCLUDE "data/mapHeaders/Route3.asm" +INCLUDE "data/mapObjects/Route3.asm" +Route3_Blocks: INCBIN "maps/Route3.blk" -INCLUDE "data/mapHeaders/route4.asm" -INCLUDE "data/mapObjects/route4.asm" -Route4Blocks: INCBIN "maps/route4.blk" +INCLUDE "data/mapHeaders/Route4.asm" +INCLUDE "data/mapObjects/Route4.asm" +Route4_Blocks: INCBIN "maps/Route4.blk" -INCLUDE "data/mapHeaders/route5.asm" -INCLUDE "data/mapObjects/route5.asm" -Route5Blocks: INCBIN "maps/route5.blk" +INCLUDE "data/mapHeaders/Route5.asm" +INCLUDE "data/mapObjects/Route5.asm" +Route5_Blocks: INCBIN "maps/Route5.blk" -INCLUDE "data/mapHeaders/route9.asm" -INCLUDE "data/mapObjects/route9.asm" -Route9Blocks: INCBIN "maps/route9.blk" +INCLUDE "data/mapHeaders/Route9.asm" +INCLUDE "data/mapObjects/Route9.asm" +Route9_Blocks: INCBIN "maps/Route9.blk" -INCLUDE "data/mapHeaders/route13.asm" -INCLUDE "data/mapObjects/route13.asm" -Route13Blocks: INCBIN "maps/route13.blk" +INCLUDE "data/mapHeaders/Route13.asm" +INCLUDE "data/mapObjects/Route13.asm" +Route13_Blocks: INCBIN "maps/Route13.blk" -INCLUDE "data/mapHeaders/route14.asm" -INCLUDE "data/mapObjects/route14.asm" -Route14Blocks: INCBIN "maps/route14.blk" +INCLUDE "data/mapHeaders/Route14.asm" +INCLUDE "data/mapObjects/Route14.asm" +Route14_Blocks: INCBIN "maps/Route14.blk" -INCLUDE "data/mapHeaders/route17.asm" -INCLUDE "data/mapObjects/route17.asm" -Route17Blocks: INCBIN "maps/route17.blk" +INCLUDE "data/mapHeaders/Route17.asm" +INCLUDE "data/mapObjects/Route17.asm" +Route17_Blocks: INCBIN "maps/Route17.blk" -INCLUDE "data/mapHeaders/route19.asm" -INCLUDE "data/mapObjects/route19.asm" -Route19Blocks: INCBIN "maps/route19.blk" +INCLUDE "data/mapHeaders/Route19.asm" +INCLUDE "data/mapObjects/Route19.asm" +Route19_Blocks: INCBIN "maps/Route19.blk" -INCLUDE "data/mapHeaders/route21.asm" -INCLUDE "data/mapObjects/route21.asm" -Route21Blocks: INCBIN "maps/route21.blk" +INCLUDE "data/mapHeaders/Route21.asm" +INCLUDE "data/mapObjects/Route21.asm" +Route21_Blocks: INCBIN "maps/Route21.blk" -VermilionHouse2Blocks: -Route12HouseBlocks: -DayCareMBlocks: INCBIN "maps/daycarem.blk" +VermilionOldRodHouse_Blocks: +Route12SuperRodHouse_Blocks: +Daycare_Blocks: INCBIN "maps/Daycare.blk" -FuchsiaHouse3Blocks: INCBIN "maps/fuchsiahouse3.blk" +FuchsiaGoodRodHouse_Blocks: INCBIN "maps/FuchsiaGoodRodHouse.blk" INCLUDE "engine/battle/experience.asm" -INCLUDE "scripts/route2.asm" -INCLUDE "scripts/route3.asm" -INCLUDE "scripts/route4.asm" -INCLUDE "scripts/route5.asm" -INCLUDE "scripts/route9.asm" -INCLUDE "scripts/route13.asm" -INCLUDE "scripts/route14.asm" -INCLUDE "scripts/route17.asm" -INCLUDE "scripts/route19.asm" -INCLUDE "scripts/route21.asm" +INCLUDE "scripts/Route2.asm" +INCLUDE "scripts/Route3.asm" +INCLUDE "scripts/Route4.asm" +INCLUDE "scripts/Route5.asm" +INCLUDE "scripts/Route9.asm" +INCLUDE "scripts/Route13.asm" +INCLUDE "scripts/Route14.asm" +INCLUDE "scripts/Route17.asm" +INCLUDE "scripts/Route19.asm" +INCLUDE "scripts/Route21.asm" -INCLUDE "data/mapHeaders/vermilionhouse2.asm" -INCLUDE "scripts/vermilionhouse2.asm" -INCLUDE "data/mapObjects/vermilionhouse2.asm" +INCLUDE "data/mapHeaders/VermilionOldRodHouse.asm" +INCLUDE "scripts/VermilionOldRodHouse.asm" +INCLUDE "data/mapObjects/VermilionOldRodHouse.asm" -INCLUDE "data/mapHeaders/celadonmart2.asm" -INCLUDE "scripts/celadonmart2.asm" -INCLUDE "data/mapObjects/celadonmart2.asm" -CeladonMart2Blocks: INCBIN "maps/celadonmart2.blk" +INCLUDE "data/mapHeaders/CeladonMart2F.asm" +INCLUDE "scripts/CeladonMart2F.asm" +INCLUDE "data/mapObjects/CeladonMart2F.asm" +CeladonMart2F_Blocks: INCBIN "maps/CeladonMart2F.blk" -INCLUDE "data/mapHeaders/fuchsiahouse3.asm" -INCLUDE "scripts/fuchsiahouse3.asm" -INCLUDE "data/mapObjects/fuchsiahouse3.asm" +INCLUDE "data/mapHeaders/FuchsiaGoodRodHouse.asm" +INCLUDE "scripts/FuchsiaGoodRodHouse.asm" +INCLUDE "data/mapObjects/FuchsiaGoodRodHouse.asm" -INCLUDE "data/mapHeaders/daycarem.asm" -INCLUDE "scripts/daycarem.asm" -INCLUDE "data/mapObjects/daycarem.asm" +INCLUDE "data/mapHeaders/Daycare.asm" +INCLUDE "scripts/Daycare.asm" +INCLUDE "data/mapObjects/Daycare.asm" -INCLUDE "data/mapHeaders/route12house.asm" -INCLUDE "scripts/route12house.asm" -INCLUDE "data/mapObjects/route12house.asm" +INCLUDE "data/mapHeaders/Route12SuperRodHouse.asm" +INCLUDE "scripts/Route12SuperRodHouse.asm" +INCLUDE "data/mapObjects/Route12SuperRodHouse.asm" -INCLUDE "data/mapHeaders/silphco8.asm" -INCLUDE "scripts/silphco8.asm" -INCLUDE "data/mapObjects/silphco8.asm" -SilphCo8Blocks: INCBIN "maps/silphco8.blk" +INCLUDE "data/mapHeaders/SilphCo8F.asm" +INCLUDE "scripts/SilphCo8F.asm" +INCLUDE "data/mapObjects/SilphCo8F.asm" +SilphCo8F_Blocks: INCBIN "maps/SilphCo8F.blk" INCLUDE "engine/menu/diploma.asm" @@ -1485,39 +1490,39 @@ INCLUDE "engine/overworld/trainers.asm" SECTION "bank16", ROMX -INCLUDE "data/mapHeaders/route6.asm" -INCLUDE "data/mapObjects/route6.asm" -Route6Blocks: INCBIN "maps/route6.blk" +INCLUDE "data/mapHeaders/Route6.asm" +INCLUDE "data/mapObjects/Route6.asm" +Route6_Blocks: INCBIN "maps/Route6.blk" -INCLUDE "data/mapHeaders/route8.asm" -INCLUDE "data/mapObjects/route8.asm" -Route8Blocks: INCBIN "maps/route8.blk" +INCLUDE "data/mapHeaders/Route8.asm" +INCLUDE "data/mapObjects/Route8.asm" +Route8_Blocks: INCBIN "maps/Route8.blk" -INCLUDE "data/mapHeaders/route10.asm" -INCLUDE "data/mapObjects/route10.asm" -Route10Blocks: INCBIN "maps/route10.blk" +INCLUDE "data/mapHeaders/Route10.asm" +INCLUDE "data/mapObjects/Route10.asm" +Route10_Blocks: INCBIN "maps/Route10.blk" -INCLUDE "data/mapHeaders/route11.asm" -INCLUDE "data/mapObjects/route11.asm" -Route11Blocks: INCBIN "maps/route11.blk" +INCLUDE "data/mapHeaders/Route11.asm" +INCLUDE "data/mapObjects/Route11.asm" +Route11_Blocks: INCBIN "maps/Route11.blk" -INCLUDE "data/mapHeaders/route12.asm" -INCLUDE "data/mapObjects/route12.asm" -Route12Blocks: INCBIN "maps/route12.blk" +INCLUDE "data/mapHeaders/Route12.asm" +INCLUDE "data/mapObjects/Route12.asm" +Route12_Blocks: INCBIN "maps/Route12.blk" -INCLUDE "data/mapHeaders/route15.asm" -INCLUDE "data/mapObjects/route15.asm" -Route15Blocks: INCBIN "maps/route15.blk" +INCLUDE "data/mapHeaders/Route15.asm" +INCLUDE "data/mapObjects/Route15.asm" +Route15_Blocks: INCBIN "maps/Route15.blk" -INCLUDE "data/mapHeaders/route16.asm" -INCLUDE "data/mapObjects/route16.asm" -Route16Blocks: INCBIN "maps/route16.blk" +INCLUDE "data/mapHeaders/Route16.asm" +INCLUDE "data/mapObjects/Route16.asm" +Route16_Blocks: INCBIN "maps/Route16.blk" -INCLUDE "data/mapHeaders/route18.asm" -INCLUDE "data/mapObjects/route18.asm" -Route18Blocks: INCBIN "maps/route18.blk" +INCLUDE "data/mapHeaders/Route18.asm" +INCLUDE "data/mapObjects/Route18.asm" +Route18_Blocks: INCBIN "maps/Route18.blk" - INCBIN "maps/unusedblocks58d7d.blk" + INCBIN "maps/UnusedPokecenterCopy.blk" INCLUDE "engine/battle/common_text.asm" @@ -1525,198 +1530,198 @@ INCLUDE "engine/experience.asm" INCLUDE "engine/overworld/oaks_aide.asm" -INCLUDE "scripts/route6.asm" -INCLUDE "scripts/route8.asm" -INCLUDE "scripts/route10.asm" -INCLUDE "scripts/route11.asm" -INCLUDE "scripts/route12.asm" -INCLUDE "scripts/route15.asm" -INCLUDE "scripts/route16.asm" -INCLUDE "scripts/route18.asm" +INCLUDE "scripts/Route6.asm" +INCLUDE "scripts/Route8.asm" +INCLUDE "scripts/Route10.asm" +INCLUDE "scripts/Route11.asm" +INCLUDE "scripts/Route12.asm" +INCLUDE "scripts/Route15.asm" +INCLUDE "scripts/Route16.asm" +INCLUDE "scripts/Route18.asm" -INCLUDE "data/mapHeaders/fanclub.asm" -INCLUDE "scripts/fanclub.asm" -INCLUDE "data/mapObjects/fanclub.asm" -FanClubBlocks: INCBIN "maps/fanclub.blk" +INCLUDE "data/mapHeaders/PokemonFanClub.asm" +INCLUDE "scripts/PokemonFanClub.asm" +INCLUDE "data/mapObjects/PokemonFanClub.asm" +PokemonFanClub_Blocks: INCBIN "maps/PokemonFanClub.blk" -INCLUDE "data/mapHeaders/silphco2.asm" -INCLUDE "scripts/silphco2.asm" -INCLUDE "data/mapObjects/silphco2.asm" -SilphCo2Blocks: INCBIN "maps/silphco2.blk" +INCLUDE "data/mapHeaders/SilphCo2F.asm" +INCLUDE "scripts/SilphCo2F.asm" +INCLUDE "data/mapObjects/SilphCo2F.asm" +SilphCo2F_Blocks: INCBIN "maps/SilphCo2F.blk" -INCLUDE "data/mapHeaders/silphco3.asm" -INCLUDE "scripts/silphco3.asm" -INCLUDE "data/mapObjects/silphco3.asm" -SilphCo3Blocks: INCBIN "maps/silphco3.blk" +INCLUDE "data/mapHeaders/SilphCo3F.asm" +INCLUDE "scripts/SilphCo3F.asm" +INCLUDE "data/mapObjects/SilphCo3F.asm" +SilphCo3F_Blocks: INCBIN "maps/SilphCo3F.blk" -INCLUDE "data/mapHeaders/silphco10.asm" -INCLUDE "scripts/silphco10.asm" -INCLUDE "data/mapObjects/silphco10.asm" -SilphCo10Blocks: INCBIN "maps/silphco10.blk" +INCLUDE "data/mapHeaders/SilphCo10F.asm" +INCLUDE "scripts/SilphCo10F.asm" +INCLUDE "data/mapObjects/SilphCo10F.asm" +SilphCo10F_Blocks: INCBIN "maps/SilphCo10F.blk" -INCLUDE "data/mapHeaders/lance.asm" -INCLUDE "scripts/lance.asm" -INCLUDE "data/mapObjects/lance.asm" -LanceBlocks: INCBIN "maps/lance.blk" +INCLUDE "data/mapHeaders/LancesRoom.asm" +INCLUDE "scripts/LancesRoom.asm" +INCLUDE "data/mapObjects/LancesRoom.asm" +LancesRoom_Blocks: INCBIN "maps/LancesRoom.blk" -INCLUDE "data/mapHeaders/halloffameroom.asm" -INCLUDE "scripts/halloffameroom.asm" -INCLUDE "data/mapObjects/halloffameroom.asm" -HallofFameRoomBlocks: INCBIN "maps/halloffameroom.blk" +INCLUDE "data/mapHeaders/HallOfFame.asm" +INCLUDE "scripts/HallOfFame.asm" +INCLUDE "data/mapObjects/HallOfFame.asm" +HallOfFame_Blocks: INCBIN "maps/HallOfFame.blk" INCLUDE "engine/overworld/saffron_guards.asm" SECTION "bank17", ROMX -SaffronMartBlocks: -LavenderMartBlocks: -CeruleanMartBlocks: -VermilionMartBlocks: INCBIN "maps/vermilionmart.blk" +SaffronMart_Blocks: +LavenderMart_Blocks: +CeruleanMart_Blocks: +VermilionMart_Blocks: INCBIN "maps/VermilionMart.blk" -CopycatsHouse2FBlocks: -RedsHouse2FBlocks: INCBIN "maps/redshouse2f.blk" +CopycatsHouse2F_Blocks: +RedsHouse2F_Blocks: INCBIN "maps/RedsHouse2F.blk" -Museum1FBlocks: INCBIN "maps/museum1f.blk" +Museum1F_Blocks: INCBIN "maps/Museum1F.blk" -Museum2FBlocks: INCBIN "maps/museum2f.blk" +Museum2F_Blocks: INCBIN "maps/Museum2F.blk" -SaffronPokecenterBlocks: -VermilionPokecenterBlocks: -LavenderPokecenterBlocks: -PewterPokecenterBlocks: INCBIN "maps/pewterpokecenter.blk" +SaffronPokecenter_Blocks: +VermilionPokecenter_Blocks: +LavenderPokecenter_Blocks: +PewterPokecenter_Blocks: INCBIN "maps/PewterPokecenter.blk" -UndergroundPathEntranceRoute7Blocks: -UndergroundPathEntranceRoute7CopyBlocks: -UndergroundPathEntranceRoute6Blocks: -UndergroundPathEntranceRoute5Blocks: INCBIN "maps/undergroundpathentranceroute5.blk" +UndergroundPathRoute7_Blocks: +UndergroundPathRoute7Copy_Blocks: +UndergroundPathRoute6_Blocks: +UndergroundPathRoute5_Blocks: INCBIN "maps/UndergroundPathRoute5.blk" -Route2GateBlocks: -ViridianForestEntranceBlocks: -ViridianForestExitBlocks: INCBIN "maps/viridianforestexit.blk" +Route2Gate_Blocks: +ViridianForestSouthGate_Blocks: +ViridianForestNorthGate_Blocks: INCBIN "maps/ViridianForestNorthGate.blk" -INCLUDE "data/mapHeaders/redshouse2f.asm" -INCLUDE "scripts/redshouse2f.asm" -INCLUDE "data/mapObjects/redshouse2f.asm" +INCLUDE "data/mapHeaders/RedsHouse2F.asm" +INCLUDE "scripts/RedsHouse2F.asm" +INCLUDE "data/mapObjects/RedsHouse2F.asm" INCLUDE "engine/predefs17.asm" -INCLUDE "data/mapHeaders/museum1f.asm" -INCLUDE "scripts/museum1f.asm" -INCLUDE "data/mapObjects/museum1f.asm" +INCLUDE "data/mapHeaders/Museum1F.asm" +INCLUDE "scripts/Museum1F.asm" +INCLUDE "data/mapObjects/Museum1F.asm" -INCLUDE "data/mapHeaders/museum2f.asm" -INCLUDE "scripts/museum2f.asm" -INCLUDE "data/mapObjects/museum2f.asm" +INCLUDE "data/mapHeaders/Museum2F.asm" +INCLUDE "scripts/Museum2F.asm" +INCLUDE "data/mapObjects/Museum2F.asm" -INCLUDE "data/mapHeaders/pewtergym.asm" -INCLUDE "scripts/pewtergym.asm" -INCLUDE "data/mapObjects/pewtergym.asm" -PewterGymBlocks: INCBIN "maps/pewtergym.blk" +INCLUDE "data/mapHeaders/PewterGym.asm" +INCLUDE "scripts/PewterGym.asm" +INCLUDE "data/mapObjects/PewterGym.asm" +PewterGym_Blocks: INCBIN "maps/PewterGym.blk" -INCLUDE "data/mapHeaders/pewterpokecenter.asm" -INCLUDE "scripts/pewterpokecenter.asm" -INCLUDE "data/mapObjects/pewterpokecenter.asm" +INCLUDE "data/mapHeaders/PewterPokecenter.asm" +INCLUDE "scripts/PewterPokecenter.asm" +INCLUDE "data/mapObjects/PewterPokecenter.asm" -INCLUDE "data/mapHeaders/ceruleanpokecenter.asm" -INCLUDE "scripts/ceruleanpokecenter.asm" -INCLUDE "data/mapObjects/ceruleanpokecenter.asm" -CeruleanPokecenterBlocks: INCBIN "maps/ceruleanpokecenter.blk" +INCLUDE "data/mapHeaders/CeruleanPokecenter.asm" +INCLUDE "scripts/CeruleanPokecenter.asm" +INCLUDE "data/mapObjects/CeruleanPokecenter.asm" +CeruleanPokecenter_Blocks: INCBIN "maps/CeruleanPokecenter.blk" -INCLUDE "data/mapHeaders/ceruleangym.asm" -INCLUDE "scripts/ceruleangym.asm" -INCLUDE "data/mapObjects/ceruleangym.asm" -CeruleanGymBlocks: INCBIN "maps/ceruleangym.blk" +INCLUDE "data/mapHeaders/CeruleanGym.asm" +INCLUDE "scripts/CeruleanGym.asm" +INCLUDE "data/mapObjects/CeruleanGym.asm" +CeruleanGym_Blocks: INCBIN "maps/CeruleanGym.blk" -INCLUDE "data/mapHeaders/ceruleanmart.asm" -INCLUDE "scripts/ceruleanmart.asm" -INCLUDE "data/mapObjects/ceruleanmart.asm" +INCLUDE "data/mapHeaders/CeruleanMart.asm" +INCLUDE "scripts/CeruleanMart.asm" +INCLUDE "data/mapObjects/CeruleanMart.asm" -INCLUDE "data/mapHeaders/lavenderpokecenter.asm" -INCLUDE "scripts/lavenderpokecenter.asm" -INCLUDE "data/mapObjects/lavenderpokecenter.asm" +INCLUDE "data/mapHeaders/LavenderPokecenter.asm" +INCLUDE "scripts/LavenderPokecenter.asm" +INCLUDE "data/mapObjects/LavenderPokecenter.asm" -INCLUDE "data/mapHeaders/lavendermart.asm" -INCLUDE "scripts/lavendermart.asm" -INCLUDE "data/mapObjects/lavendermart.asm" +INCLUDE "data/mapHeaders/LavenderMart.asm" +INCLUDE "scripts/LavenderMart.asm" +INCLUDE "data/mapObjects/LavenderMart.asm" -INCLUDE "data/mapHeaders/vermilionpokecenter.asm" -INCLUDE "scripts/vermilionpokecenter.asm" -INCLUDE "data/mapObjects/vermilionpokecenter.asm" +INCLUDE "data/mapHeaders/VermilionPokecenter.asm" +INCLUDE "scripts/VermilionPokecenter.asm" +INCLUDE "data/mapObjects/VermilionPokecenter.asm" -INCLUDE "data/mapHeaders/vermilionmart.asm" -INCLUDE "scripts/vermilionmart.asm" -INCLUDE "data/mapObjects/vermilionmart.asm" +INCLUDE "data/mapHeaders/VermilionMart.asm" +INCLUDE "scripts/VermilionMart.asm" +INCLUDE "data/mapObjects/VermilionMart.asm" -INCLUDE "data/mapHeaders/vermiliongym.asm" -INCLUDE "scripts/vermiliongym.asm" -INCLUDE "data/mapObjects/vermiliongym.asm" -VermilionGymBlocks: INCBIN "maps/vermiliongym.blk" +INCLUDE "data/mapHeaders/VermilionGym.asm" +INCLUDE "scripts/VermilionGym.asm" +INCLUDE "data/mapObjects/VermilionGym.asm" +VermilionGym_Blocks: INCBIN "maps/VermilionGym.blk" -INCLUDE "data/mapHeaders/copycatshouse2f.asm" -INCLUDE "scripts/copycatshouse2f.asm" -INCLUDE "data/mapObjects/copycatshouse2f.asm" +INCLUDE "data/mapHeaders/CopycatsHouse2F.asm" +INCLUDE "scripts/CopycatsHouse2F.asm" +INCLUDE "data/mapObjects/CopycatsHouse2F.asm" -INCLUDE "data/mapHeaders/fightingdojo.asm" -INCLUDE "scripts/fightingdojo.asm" -INCLUDE "data/mapObjects/fightingdojo.asm" -FightingDojoBlocks: INCBIN "maps/fightingdojo.blk" +INCLUDE "data/mapHeaders/FightingDojo.asm" +INCLUDE "scripts/FightingDojo.asm" +INCLUDE "data/mapObjects/FightingDojo.asm" +FightingDojo_Blocks: INCBIN "maps/FightingDojo.blk" -INCLUDE "data/mapHeaders/saffrongym.asm" -INCLUDE "scripts/saffrongym.asm" -INCLUDE "data/mapObjects/saffrongym.asm" -SaffronGymBlocks: INCBIN "maps/saffrongym.blk" +INCLUDE "data/mapHeaders/SaffronGym.asm" +INCLUDE "scripts/SaffronGym.asm" +INCLUDE "data/mapObjects/SaffronGym.asm" +SaffronGym_Blocks: INCBIN "maps/SaffronGym.blk" -INCLUDE "data/mapHeaders/saffronmart.asm" -INCLUDE "scripts/saffronmart.asm" -INCLUDE "data/mapObjects/saffronmart.asm" +INCLUDE "data/mapHeaders/SaffronMart.asm" +INCLUDE "scripts/SaffronMart.asm" +INCLUDE "data/mapObjects/SaffronMart.asm" -INCLUDE "data/mapHeaders/silphco1.asm" -INCLUDE "scripts/silphco1.asm" -INCLUDE "data/mapObjects/silphco1.asm" -SilphCo1Blocks: INCBIN "maps/silphco1.blk" +INCLUDE "data/mapHeaders/SilphCo1F.asm" +INCLUDE "scripts/SilphCo1F.asm" +INCLUDE "data/mapObjects/SilphCo1F.asm" +SilphCo1F_Blocks: INCBIN "maps/SilphCo1F.blk" -INCLUDE "data/mapHeaders/saffronpokecenter.asm" -INCLUDE "scripts/saffronpokecenter.asm" -INCLUDE "data/mapObjects/saffronpokecenter.asm" +INCLUDE "data/mapHeaders/SaffronPokecenter.asm" +INCLUDE "scripts/SaffronPokecenter.asm" +INCLUDE "data/mapObjects/SaffronPokecenter.asm" -INCLUDE "data/mapHeaders/viridianforestexit.asm" -INCLUDE "scripts/viridianforestexit.asm" -INCLUDE "data/mapObjects/viridianforestexit.asm" +INCLUDE "data/mapHeaders/ViridianForestNorthGate.asm" +INCLUDE "scripts/ViridianForestNorthGate.asm" +INCLUDE "data/mapObjects/ViridianForestNorthGate.asm" -INCLUDE "data/mapHeaders/route2gate.asm" -INCLUDE "scripts/route2gate.asm" -INCLUDE "data/mapObjects/route2gate.asm" +INCLUDE "data/mapHeaders/Route2Gate.asm" +INCLUDE "scripts/Route2Gate.asm" +INCLUDE "data/mapObjects/Route2Gate.asm" -INCLUDE "data/mapHeaders/viridianforestentrance.asm" -INCLUDE "scripts/viridianforestentrance.asm" -INCLUDE "data/mapObjects/viridianforestentrance.asm" +INCLUDE "data/mapHeaders/ViridianForestSouthGate.asm" +INCLUDE "scripts/ViridianForestSouthGate.asm" +INCLUDE "data/mapObjects/ViridianForestSouthGate.asm" -INCLUDE "data/mapHeaders/undergroundpathentranceroute5.asm" -INCLUDE "scripts/undergroundpathentranceroute5.asm" -INCLUDE "data/mapObjects/undergroundpathentranceroute5.asm" +INCLUDE "data/mapHeaders/UndergroundPathRoute5.asm" +INCLUDE "scripts/UndergroundPathRoute5.asm" +INCLUDE "data/mapObjects/UndergroundPathRoute5.asm" -INCLUDE "data/mapHeaders/undergroundpathentranceroute6.asm" -INCLUDE "scripts/undergroundpathentranceroute6.asm" -INCLUDE "data/mapObjects/undergroundpathentranceroute6.asm" +INCLUDE "data/mapHeaders/UndergroundPathRoute6.asm" +INCLUDE "scripts/UndergroundPathRoute6.asm" +INCLUDE "data/mapObjects/UndergroundPathRoute6.asm" -INCLUDE "data/mapHeaders/undergroundpathentranceroute7.asm" -INCLUDE "scripts/undergroundpathentranceroute7.asm" -INCLUDE "data/mapObjects/undergroundpathentranceroute7.asm" +INCLUDE "data/mapHeaders/UndergroundPathRoute7.asm" +INCLUDE "scripts/UndergroundPathRoute7.asm" +INCLUDE "data/mapObjects/UndergroundPathRoute7.asm" -INCLUDE "data/mapHeaders/undergroundpathentranceroute7copy.asm" -INCLUDE "scripts/undergroundpathentranceroute7copy.asm" -INCLUDE "data/mapObjects/undergroundpathentranceroute7copy.asm" +INCLUDE "data/mapHeaders/UndergroundPathRoute7Copy.asm" +INCLUDE "scripts/UndergroundPathRoute7Copy.asm" +INCLUDE "data/mapObjects/UndergroundPathRoute7Copy.asm" -INCLUDE "data/mapHeaders/silphco9.asm" -INCLUDE "scripts/silphco9.asm" -INCLUDE "data/mapObjects/silphco9.asm" -SilphCo9Blocks: INCBIN "maps/silphco9.blk" +INCLUDE "data/mapHeaders/SilphCo9F.asm" +INCLUDE "scripts/SilphCo9F.asm" +INCLUDE "data/mapObjects/SilphCo9F.asm" +SilphCo9F_Blocks: INCBIN "maps/SilphCo9F.blk" -INCLUDE "data/mapHeaders/victoryroad1.asm" -INCLUDE "scripts/victoryroad1.asm" -INCLUDE "data/mapObjects/victoryroad1.asm" -VictoryRoad1Blocks: INCBIN "maps/victoryroad1.blk" +INCLUDE "data/mapHeaders/VictoryRoad1F.asm" +INCLUDE "scripts/VictoryRoad1F.asm" +INCLUDE "data/mapObjects/VictoryRoad1F.asm" +VictoryRoad1F_Blocks: INCBIN "maps/VictoryRoad1F.blk" INCLUDE "engine/predefs17_2.asm" @@ -1725,123 +1730,123 @@ INCLUDE "engine/hidden_object_functions17.asm" SECTION "bank18", ROMX -ViridianForestBlocks: INCBIN "maps/viridianforest.blk" -UndergroundPathNSBlocks: INCBIN "maps/undergroundpathns.blk" -UndergroundPathWEBlocks: INCBIN "maps/undergroundpathwe.blk" +ViridianForest_Blocks: INCBIN "maps/ViridianForest.blk" +UndergroundPathNorthSouth_Blocks: INCBIN "maps/UndergroundPathNorthSouth.blk" +UndergroundPathWestEast_Blocks: INCBIN "maps/UndergroundPathWestEast.blk" - INCBIN "maps/unusedblocks60258.blk" + INCBIN "maps/UnusedDiglettsCaveCopy.blk" -SSAnne10Blocks: -SSAnne9Blocks: INCBIN "maps/ssanne9.blk" +SSAnneB1FRooms_Blocks: +SSAnne2FRooms_Blocks: INCBIN "maps/SSAnne2FRooms.blk" -INCLUDE "data/mapHeaders/pokemontower1.asm" -INCLUDE "scripts/pokemontower1.asm" -INCLUDE "data/mapObjects/pokemontower1.asm" -PokemonTower1Blocks: INCBIN "maps/pokemontower1.blk" +INCLUDE "data/mapHeaders/PokemonTower1F.asm" +INCLUDE "scripts/PokemonTower1F.asm" +INCLUDE "data/mapObjects/PokemonTower1F.asm" +PokemonTower1F_Blocks: INCBIN "maps/PokemonTower1F.blk" -INCLUDE "data/mapHeaders/pokemontower2.asm" -INCLUDE "scripts/pokemontower2.asm" -INCLUDE "data/mapObjects/pokemontower2.asm" -PokemonTower2Blocks: INCBIN "maps/pokemontower2.blk" +INCLUDE "data/mapHeaders/PokemonTower2F.asm" +INCLUDE "scripts/PokemonTower2F.asm" +INCLUDE "data/mapObjects/PokemonTower2F.asm" +PokemonTower2F_Blocks: INCBIN "maps/PokemonTower2F.blk" -INCLUDE "data/mapHeaders/pokemontower3.asm" -INCLUDE "scripts/pokemontower3.asm" -INCLUDE "data/mapObjects/pokemontower3.asm" -PokemonTower3Blocks: INCBIN "maps/pokemontower3.blk" +INCLUDE "data/mapHeaders/PokemonTower3F.asm" +INCLUDE "scripts/PokemonTower3F.asm" +INCLUDE "data/mapObjects/PokemonTower3F.asm" +PokemonTower3F_Blocks: INCBIN "maps/PokemonTower3F.blk" -INCLUDE "data/mapHeaders/pokemontower4.asm" -INCLUDE "scripts/pokemontower4.asm" -INCLUDE "data/mapObjects/pokemontower4.asm" -PokemonTower4Blocks: INCBIN "maps/pokemontower4.blk" +INCLUDE "data/mapHeaders/PokemonTower4F.asm" +INCLUDE "scripts/PokemonTower4F.asm" +INCLUDE "data/mapObjects/PokemonTower4F.asm" +PokemonTower4F_Blocks: INCBIN "maps/PokemonTower4F.blk" -INCLUDE "data/mapHeaders/pokemontower5.asm" -INCLUDE "scripts/pokemontower5.asm" -INCLUDE "data/mapObjects/pokemontower5.asm" -PokemonTower5Blocks: INCBIN "maps/pokemontower5.blk" +INCLUDE "data/mapHeaders/PokemonTower5F.asm" +INCLUDE "scripts/PokemonTower5F.asm" +INCLUDE "data/mapObjects/PokemonTower5F.asm" +PokemonTower5F_Blocks: INCBIN "maps/PokemonTower5F.blk" -INCLUDE "data/mapHeaders/pokemontower6.asm" -INCLUDE "scripts/pokemontower6.asm" -INCLUDE "data/mapObjects/pokemontower6.asm" -PokemonTower6Blocks: INCBIN "maps/pokemontower6.blk" +INCLUDE "data/mapHeaders/PokemonTower6F.asm" +INCLUDE "scripts/PokemonTower6F.asm" +INCLUDE "data/mapObjects/PokemonTower6F.asm" +PokemonTower6F_Blocks: INCBIN "maps/PokemonTower6F.blk" - INCBIN "maps/unusedblocks60cef.blk" + INCBIN "maps/UnusedEmptyMap.blk" -INCLUDE "data/mapHeaders/pokemontower7.asm" -INCLUDE "scripts/pokemontower7.asm" -INCLUDE "data/mapObjects/pokemontower7.asm" -PokemonTower7Blocks: INCBIN "maps/pokemontower7.blk" +INCLUDE "data/mapHeaders/PokemonTower7F.asm" +INCLUDE "scripts/PokemonTower7F.asm" +INCLUDE "data/mapObjects/PokemonTower7F.asm" +PokemonTower7F_Blocks: INCBIN "maps/PokemonTower7F.blk" -INCLUDE "data/mapHeaders/celadonmart1.asm" -INCLUDE "scripts/celadonmart1.asm" -INCLUDE "data/mapObjects/celadonmart1.asm" -CeladonMart1Blocks: INCBIN "maps/celadonmart1.blk" +INCLUDE "data/mapHeaders/CeladonMart1F.asm" +INCLUDE "scripts/CeladonMart1F.asm" +INCLUDE "data/mapObjects/CeladonMart1F.asm" +CeladonMart1F_Blocks: INCBIN "maps/CeladonMart1F.blk" INCLUDE "engine/overworld/cinnabar_lab.asm" -INCLUDE "data/mapHeaders/viridianforest.asm" -INCLUDE "scripts/viridianforest.asm" -INCLUDE "data/mapObjects/viridianforest.asm" +INCLUDE "data/mapHeaders/ViridianForest.asm" +INCLUDE "scripts/ViridianForest.asm" +INCLUDE "data/mapObjects/ViridianForest.asm" -INCLUDE "data/mapHeaders/ssanne1.asm" -INCLUDE "scripts/ssanne1.asm" -INCLUDE "data/mapObjects/ssanne1.asm" -SSAnne1Blocks: INCBIN "maps/ssanne1.blk" +INCLUDE "data/mapHeaders/SSAnne1F.asm" +INCLUDE "scripts/SSAnne1F.asm" +INCLUDE "data/mapObjects/SSAnne1F.asm" +SSAnne1F_Blocks: INCBIN "maps/SSAnne1F.blk" -INCLUDE "data/mapHeaders/ssanne2.asm" -INCLUDE "scripts/ssanne2.asm" -INCLUDE "data/mapObjects/ssanne2.asm" -SSAnne2Blocks: INCBIN "maps/ssanne2.blk" +INCLUDE "data/mapHeaders/SSAnne2F.asm" +INCLUDE "scripts/SSAnne2F.asm" +INCLUDE "data/mapObjects/SSAnne2F.asm" +SSAnne2F_Blocks: INCBIN "maps/SSAnne2F.blk" -INCLUDE "data/mapHeaders/ssanne4.asm" -INCLUDE "scripts/ssanne4.asm" -INCLUDE "data/mapObjects/ssanne4.asm" -SSAnne4Blocks: INCBIN "maps/ssanne4.blk" +INCLUDE "data/mapHeaders/SSAnneB1F.asm" +INCLUDE "scripts/SSAnneB1F.asm" +INCLUDE "data/mapObjects/SSAnneB1F.asm" +SSAnneB1F_Blocks: INCBIN "maps/SSAnneB1F.blk" -INCLUDE "data/mapHeaders/ssanne5.asm" -INCLUDE "scripts/ssanne5.asm" -INCLUDE "data/mapObjects/ssanne5.asm" -SSAnne5Blocks: INCBIN "maps/ssanne5.blk" +INCLUDE "data/mapHeaders/SSAnneBow.asm" +INCLUDE "scripts/SSAnneBow.asm" +INCLUDE "data/mapObjects/SSAnneBow.asm" +SSAnneBow_Blocks: INCBIN "maps/SSAnneBow.blk" -INCLUDE "data/mapHeaders/ssanne6.asm" -INCLUDE "scripts/ssanne6.asm" -INCLUDE "data/mapObjects/ssanne6.asm" -SSAnne6Blocks: INCBIN "maps/ssanne6.blk" +INCLUDE "data/mapHeaders/SSAnneKitchen.asm" +INCLUDE "scripts/SSAnneKitchen.asm" +INCLUDE "data/mapObjects/SSAnneKitchen.asm" +SSAnneKitchen_Blocks: INCBIN "maps/SSAnneKitchen.blk" -INCLUDE "data/mapHeaders/ssanne7.asm" -INCLUDE "scripts/ssanne7.asm" -INCLUDE "data/mapObjects/ssanne7.asm" -SSAnne7Blocks: INCBIN "maps/ssanne7.blk" +INCLUDE "data/mapHeaders/SSAnneCaptainsRoom.asm" +INCLUDE "scripts/SSAnneCaptainsRoom.asm" +INCLUDE "data/mapObjects/SSAnneCaptainsRoom.asm" +SSAnneCaptainsRoom_Blocks: INCBIN "maps/SSAnneCaptainsRoom.blk" -INCLUDE "data/mapHeaders/ssanne8.asm" -INCLUDE "scripts/ssanne8.asm" -INCLUDE "data/mapObjects/ssanne8.asm" -SSAnne8Blocks: INCBIN "maps/ssanne8.blk" +INCLUDE "data/mapHeaders/SSAnne1FRooms.asm" +INCLUDE "scripts/SSAnne1FRooms.asm" +INCLUDE "data/mapObjects/SSAnne1FRooms.asm" +SSAnne1FRooms_Blocks: INCBIN "maps/SSAnne1FRooms.blk" -INCLUDE "data/mapHeaders/ssanne9.asm" -INCLUDE "scripts/ssanne9.asm" -INCLUDE "data/mapObjects/ssanne9.asm" +INCLUDE "data/mapHeaders/SSAnne2FRooms.asm" +INCLUDE "scripts/SSAnne2FRooms.asm" +INCLUDE "data/mapObjects/SSAnne2FRooms.asm" -INCLUDE "data/mapHeaders/ssanne10.asm" -INCLUDE "scripts/ssanne10.asm" -INCLUDE "data/mapObjects/ssanne10.asm" +INCLUDE "data/mapHeaders/SSAnneB1FRooms.asm" +INCLUDE "scripts/SSAnneB1FRooms.asm" +INCLUDE "data/mapObjects/SSAnneB1FRooms.asm" -INCLUDE "data/mapHeaders/undergroundpathns.asm" -INCLUDE "scripts/undergroundpathns.asm" -INCLUDE "data/mapObjects/undergroundpathns.asm" +INCLUDE "data/mapHeaders/UndergroundPathNorthSouth.asm" +INCLUDE "scripts/UndergroundPathNorthSouth.asm" +INCLUDE "data/mapObjects/UndergroundPathNorthSouth.asm" -INCLUDE "data/mapHeaders/undergroundpathwe.asm" -INCLUDE "scripts/undergroundpathwe.asm" -INCLUDE "data/mapObjects/undergroundpathwe.asm" +INCLUDE "data/mapHeaders/UndergroundPathWestEast.asm" +INCLUDE "scripts/UndergroundPathWestEast.asm" +INCLUDE "data/mapObjects/UndergroundPathWestEast.asm" -INCLUDE "data/mapHeaders/diglettscave.asm" -INCLUDE "scripts/diglettscave.asm" -INCLUDE "data/mapObjects/diglettscave.asm" -DiglettsCaveBlocks: INCBIN "maps/diglettscave.blk" +INCLUDE "data/mapHeaders/DiglettsCave.asm" +INCLUDE "scripts/DiglettsCave.asm" +INCLUDE "data/mapObjects/DiglettsCave.asm" +DiglettsCave_Blocks: INCBIN "maps/DiglettsCave.blk" -INCLUDE "data/mapHeaders/silphco11.asm" -INCLUDE "scripts/silphco11.asm" -INCLUDE "data/mapObjects/silphco11.asm" -SilphCo11Blocks: INCBIN "maps/silphco11.blk" +INCLUDE "data/mapHeaders/SilphCo11F.asm" +INCLUDE "scripts/SilphCo11F.asm" +INCLUDE "data/mapObjects/SilphCo11F.asm" +SilphCo11F_Blocks: INCBIN "maps/SilphCo11F.blk" INCLUDE "engine/hidden_object_functions18.asm" @@ -1903,6 +1908,7 @@ Forest_GFX: INCBIN "gfx/tilesets/forest.2bpp" Forest_Block: INCBIN "gfx/blocksets/forest.bst" Facility_GFX: INCBIN "gfx/tilesets/facility.2bpp" Facility_Block: INCBIN "gfx/blocksets/facility.bst" + ds 1 SECTION "bank1B", ROMX @@ -1940,17 +1946,17 @@ INCLUDE "engine/save.asm" SECTION "bank1D", ROMX -CopycatsHouse1FBlocks: INCBIN "maps/copycatshouse1f.blk" +CopycatsHouse1F_Blocks: INCBIN "maps/CopycatsHouse1F.blk" -CinnabarMartBlocks: -PewterMartBlocks: INCBIN "maps/pewtermart.blk" +CinnabarMart_Blocks: +PewterMart_Blocks: INCBIN "maps/PewterMart.blk" -FuchsiaHouse1Blocks: INCBIN "maps/fuchsiahouse1.blk" +FuchsiaBillsGrandpasHouse_Blocks: INCBIN "maps/FuchsiaBillsGrandpasHouse.blk" -CinnabarPokecenterBlocks: -FuchsiaPokecenterBlocks: INCBIN "maps/fuchsiapokecenter.blk" +CinnabarPokecenter_Blocks: +FuchsiaPokecenter_Blocks: INCBIN "maps/FuchsiaPokecenter.blk" -CeruleanHouse2Blocks: INCBIN "maps/ceruleanhouse2.blk" +CeruleanBadgeHouse_Blocks: INCBIN "maps/CeruleanBadgeHouse.blk" INCLUDE "engine/HoF_room_pc.asm" @@ -1958,112 +1964,112 @@ INCLUDE "engine/status_ailments.asm" INCLUDE "engine/items/itemfinder.asm" -INCLUDE "scripts/ceruleancity2.asm" +INCLUDE "scripts/CeruleanCity_2.asm" -INCLUDE "data/mapHeaders/viridiangym.asm" -INCLUDE "scripts/viridiangym.asm" -INCLUDE "data/mapObjects/viridiangym.asm" -ViridianGymBlocks: INCBIN "maps/viridiangym.blk" +INCLUDE "data/mapHeaders/ViridianGym.asm" +INCLUDE "scripts/ViridianGym.asm" +INCLUDE "data/mapObjects/ViridianGym.asm" +ViridianGym_Blocks: INCBIN "maps/ViridianGym.blk" -INCLUDE "data/mapHeaders/pewtermart.asm" -INCLUDE "scripts/pewtermart.asm" -INCLUDE "data/mapObjects/pewtermart.asm" +INCLUDE "data/mapHeaders/PewterMart.asm" +INCLUDE "scripts/PewterMart.asm" +INCLUDE "data/mapObjects/PewterMart.asm" -INCLUDE "data/mapHeaders/unknowndungeon1.asm" -INCLUDE "scripts/unknowndungeon1.asm" -INCLUDE "data/mapObjects/unknowndungeon1.asm" -UnknownDungeon1Blocks: INCBIN "maps/unknowndungeon1.blk" +INCLUDE "data/mapHeaders/CeruleanCave1F.asm" +INCLUDE "scripts/CeruleanCave1F.asm" +INCLUDE "data/mapObjects/CeruleanCave1F.asm" +CeruleanCave1F_Blocks: INCBIN "maps/CeruleanCave1F.blk" -INCLUDE "data/mapHeaders/ceruleanhouse2.asm" -INCLUDE "scripts/ceruleanhouse2.asm" -INCLUDE "data/mapObjects/ceruleanhouse2.asm" +INCLUDE "data/mapHeaders/CeruleanBadgeHouse.asm" +INCLUDE "scripts/CeruleanBadgeHouse.asm" +INCLUDE "data/mapObjects/CeruleanBadgeHouse.asm" INCLUDE "engine/menu/vending_machine.asm" -INCLUDE "data/mapHeaders/fuchsiahouse1.asm" -INCLUDE "scripts/fuchsiahouse1.asm" -INCLUDE "data/mapObjects/fuchsiahouse1.asm" +INCLUDE "data/mapHeaders/FuchsiaBillsGrandpasHouse.asm" +INCLUDE "scripts/FuchsiaBillsGrandpasHouse.asm" +INCLUDE "data/mapObjects/FuchsiaBillsGrandpasHouse.asm" -INCLUDE "data/mapHeaders/fuchsiapokecenter.asm" -INCLUDE "scripts/fuchsiapokecenter.asm" -INCLUDE "data/mapObjects/fuchsiapokecenter.asm" +INCLUDE "data/mapHeaders/FuchsiaPokecenter.asm" +INCLUDE "scripts/FuchsiaPokecenter.asm" +INCLUDE "data/mapObjects/FuchsiaPokecenter.asm" -INCLUDE "data/mapHeaders/fuchsiahouse2.asm" -INCLUDE "scripts/fuchsiahouse2.asm" -INCLUDE "data/mapObjects/fuchsiahouse2.asm" -FuchsiaHouse2Blocks: INCBIN "maps/fuchsiahouse2.blk" +INCLUDE "data/mapHeaders/WardensHouse.asm" +INCLUDE "scripts/WardensHouse.asm" +INCLUDE "data/mapObjects/WardensHouse.asm" +WardensHouse_Blocks: INCBIN "maps/WardensHouse.blk" -INCLUDE "data/mapHeaders/safarizoneentrance.asm" -INCLUDE "scripts/safarizoneentrance.asm" -INCLUDE "data/mapObjects/safarizoneentrance.asm" -SafariZoneEntranceBlocks: INCBIN "maps/safarizoneentrance.blk" +INCLUDE "data/mapHeaders/SafariZoneGate.asm" +INCLUDE "scripts/SafariZoneGate.asm" +INCLUDE "data/mapObjects/SafariZoneGate.asm" +SafariZoneGate_Blocks: INCBIN "maps/SafariZoneGate.blk" -INCLUDE "data/mapHeaders/fuchsiagym.asm" -INCLUDE "scripts/fuchsiagym.asm" -INCLUDE "data/mapObjects/fuchsiagym.asm" -FuchsiaGymBlocks: INCBIN "maps/fuchsiagym.blk" +INCLUDE "data/mapHeaders/FuchsiaGym.asm" +INCLUDE "scripts/FuchsiaGym.asm" +INCLUDE "data/mapObjects/FuchsiaGym.asm" +FuchsiaGym_Blocks: INCBIN "maps/FuchsiaGym.blk" -INCLUDE "data/mapHeaders/fuchsiameetingroom.asm" -INCLUDE "scripts/fuchsiameetingroom.asm" -INCLUDE "data/mapObjects/fuchsiameetingroom.asm" -FuchsiaMeetingRoomBlocks: INCBIN "maps/fuchsiameetingroom.blk" +INCLUDE "data/mapHeaders/FuchsiaMeetingRoom.asm" +INCLUDE "scripts/FuchsiaMeetingRoom.asm" +INCLUDE "data/mapObjects/FuchsiaMeetingRoom.asm" +FuchsiaMeetingRoom_Blocks: INCBIN "maps/FuchsiaMeetingRoom.blk" -INCLUDE "data/mapHeaders/cinnabargym.asm" -INCLUDE "scripts/cinnabargym.asm" -INCLUDE "data/mapObjects/cinnabargym.asm" -CinnabarGymBlocks: INCBIN "maps/cinnabargym.blk" +INCLUDE "data/mapHeaders/CinnabarGym.asm" +INCLUDE "scripts/CinnabarGym.asm" +INCLUDE "data/mapObjects/CinnabarGym.asm" +CinnabarGym_Blocks: INCBIN "maps/CinnabarGym.blk" -INCLUDE "data/mapHeaders/lab1.asm" -INCLUDE "scripts/lab1.asm" -INCLUDE "data/mapObjects/lab1.asm" -Lab1Blocks: INCBIN "maps/lab1.blk" +INCLUDE "data/mapHeaders/CinnabarLab.asm" +INCLUDE "scripts/CinnabarLab.asm" +INCLUDE "data/mapObjects/CinnabarLab.asm" +CinnabarLab_Blocks: INCBIN "maps/CinnabarLab.blk" -INCLUDE "data/mapHeaders/lab2.asm" -INCLUDE "scripts/lab2.asm" -INCLUDE "data/mapObjects/lab2.asm" -Lab2Blocks: INCBIN "maps/lab2.blk" +INCLUDE "data/mapHeaders/CinnabarLabTradeRoom.asm" +INCLUDE "scripts/CinnabarLabTradeRoom.asm" +INCLUDE "data/mapObjects/CinnabarLabTradeRoom.asm" +CinnabarLabTradeRoom_Blocks: INCBIN "maps/CinnabarLabTradeRoom.blk" -INCLUDE "data/mapHeaders/lab3.asm" -INCLUDE "scripts/lab3.asm" -INCLUDE "data/mapObjects/lab3.asm" -Lab3Blocks: INCBIN "maps/lab3.blk" +INCLUDE "data/mapHeaders/CinnabarLabMetronomeRoom.asm" +INCLUDE "scripts/CinnabarLabMetronomeRoom.asm" +INCLUDE "data/mapObjects/CinnabarLabMetronomeRoom.asm" +CinnabarLabMetronomeRoom_Blocks: INCBIN "maps/CinnabarLabMetronomeRoom.blk" -INCLUDE "data/mapHeaders/lab4.asm" -INCLUDE "scripts/lab4.asm" -INCLUDE "data/mapObjects/lab4.asm" -Lab4Blocks: INCBIN "maps/lab4.blk" +INCLUDE "data/mapHeaders/CinnabarLabFossilRoom.asm" +INCLUDE "scripts/CinnabarLabFossilRoom.asm" +INCLUDE "data/mapObjects/CinnabarLabFossilRoom.asm" +CinnabarLabFossilRoom_Blocks: INCBIN "maps/CinnabarLabFossilRoom.blk" -INCLUDE "data/mapHeaders/cinnabarpokecenter.asm" -INCLUDE "scripts/cinnabarpokecenter.asm" -INCLUDE "data/mapObjects/cinnabarpokecenter.asm" +INCLUDE "data/mapHeaders/CinnabarPokecenter.asm" +INCLUDE "scripts/CinnabarPokecenter.asm" +INCLUDE "data/mapObjects/CinnabarPokecenter.asm" -INCLUDE "data/mapHeaders/cinnabarmart.asm" -INCLUDE "scripts/cinnabarmart.asm" -INCLUDE "data/mapObjects/cinnabarmart.asm" +INCLUDE "data/mapHeaders/CinnabarMart.asm" +INCLUDE "scripts/CinnabarMart.asm" +INCLUDE "data/mapObjects/CinnabarMart.asm" -INCLUDE "data/mapHeaders/copycatshouse1f.asm" -INCLUDE "scripts/copycatshouse1f.asm" -INCLUDE "data/mapObjects/copycatshouse1f.asm" +INCLUDE "data/mapHeaders/CopycatsHouse1F.asm" +INCLUDE "scripts/CopycatsHouse1F.asm" +INCLUDE "data/mapObjects/CopycatsHouse1F.asm" -INCLUDE "data/mapHeaders/gary.asm" -INCLUDE "scripts/gary.asm" -INCLUDE "data/mapObjects/gary.asm" -GaryBlocks: INCBIN "maps/gary.blk" +INCLUDE "data/mapHeaders/ChampionsRoom.asm" +INCLUDE "scripts/ChampionsRoom.asm" +INCLUDE "data/mapObjects/ChampionsRoom.asm" +ChampionsRoom_Blocks: INCBIN "maps/ChampionsRoom.blk" -INCLUDE "data/mapHeaders/lorelei.asm" -INCLUDE "scripts/lorelei.asm" -INCLUDE "data/mapObjects/lorelei.asm" -LoreleiBlocks: INCBIN "maps/lorelei.blk" +INCLUDE "data/mapHeaders/LoreleisRoom.asm" +INCLUDE "scripts/LoreleisRoom.asm" +INCLUDE "data/mapObjects/LoreleisRoom.asm" +LoreleisRoom_Blocks: INCBIN "maps/LoreleisRoom.blk" -INCLUDE "data/mapHeaders/bruno.asm" -INCLUDE "scripts/bruno.asm" -INCLUDE "data/mapObjects/bruno.asm" -BrunoBlocks: INCBIN "maps/bruno.blk" +INCLUDE "data/mapHeaders/BrunosRoom.asm" +INCLUDE "scripts/BrunosRoom.asm" +INCLUDE "data/mapObjects/BrunosRoom.asm" +BrunosRoom_Blocks: INCBIN "maps/BrunosRoom.blk" -INCLUDE "data/mapHeaders/agatha.asm" -INCLUDE "scripts/agatha.asm" -INCLUDE "data/mapObjects/agatha.asm" -AgathaBlocks: INCBIN "maps/agatha.blk" +INCLUDE "data/mapHeaders/AgathasRoom.asm" +INCLUDE "scripts/AgathasRoom.asm" +INCLUDE "data/mapObjects/AgathasRoom.asm" +AgathasRoom_Blocks: INCBIN "maps/AgathasRoom.blk" INCLUDE "engine/menu/league_pc.asm" diff --git a/maps/agatha.blk b/maps/AgathasRoom.blk similarity index 100% rename from maps/agatha.blk rename to maps/AgathasRoom.blk diff --git a/maps/bikeshop.blk b/maps/BikeShop.blk similarity index 100% rename from maps/bikeshop.blk rename to maps/BikeShop.blk diff --git a/maps/billshouse.blk b/maps/BillsHouse.blk similarity index 100% rename from maps/billshouse.blk rename to maps/BillsHouse.blk diff --git a/maps/blueshouse.blk b/maps/BluesHouse.blk similarity index 100% rename from maps/blueshouse.blk rename to maps/BluesHouse.blk diff --git a/maps/bruno.blk b/maps/BrunosRoom.blk similarity index 100% rename from maps/bruno.blk rename to maps/BrunosRoom.blk diff --git a/maps/celadonhouse.blk b/maps/CeladonChiefHouse.blk similarity index 100% rename from maps/celadonhouse.blk rename to maps/CeladonChiefHouse.blk diff --git a/maps/celadoncity.blk b/maps/CeladonCity.blk similarity index 100% rename from maps/celadoncity.blk rename to maps/CeladonCity.blk diff --git a/maps/celadondiner.blk b/maps/CeladonDiner.blk similarity index 100% rename from maps/celadondiner.blk rename to maps/CeladonDiner.blk diff --git a/maps/celadongym.blk b/maps/CeladonGym.blk similarity index 100% rename from maps/celadongym.blk rename to maps/CeladonGym.blk diff --git a/maps/celadonhotel.blk b/maps/CeladonHotel.blk similarity index 100% rename from maps/celadonhotel.blk rename to maps/CeladonHotel.blk diff --git a/maps/celadonmansion1.blk b/maps/CeladonMansion1F.blk similarity index 100% rename from maps/celadonmansion1.blk rename to maps/CeladonMansion1F.blk diff --git a/maps/celadonmansion2.blk b/maps/CeladonMansion2F.blk similarity index 100% rename from maps/celadonmansion2.blk rename to maps/CeladonMansion2F.blk diff --git a/maps/celadonmansion3.blk b/maps/CeladonMansion3F.blk similarity index 100% rename from maps/celadonmansion3.blk rename to maps/CeladonMansion3F.blk diff --git a/maps/celadonmansion4.blk b/maps/CeladonMansionRoof.blk similarity index 100% rename from maps/celadonmansion4.blk rename to maps/CeladonMansionRoof.blk diff --git a/maps/celadonmansion5.blk b/maps/CeladonMansionRoofHouse.blk similarity index 100% rename from maps/celadonmansion5.blk rename to maps/CeladonMansionRoofHouse.blk diff --git a/maps/celadonmart1.blk b/maps/CeladonMart1F.blk similarity index 100% rename from maps/celadonmart1.blk rename to maps/CeladonMart1F.blk diff --git a/maps/celadonmart2.blk b/maps/CeladonMart2F.blk similarity index 100% rename from maps/celadonmart2.blk rename to maps/CeladonMart2F.blk diff --git a/maps/celadonmart3.blk b/maps/CeladonMart3F.blk similarity index 100% rename from maps/celadonmart3.blk rename to maps/CeladonMart3F.blk diff --git a/maps/celadonmart4.blk b/maps/CeladonMart4F.blk similarity index 100% rename from maps/celadonmart4.blk rename to maps/CeladonMart4F.blk diff --git a/maps/celadonmart5.blk b/maps/CeladonMart5F.blk similarity index 100% rename from maps/celadonmart5.blk rename to maps/CeladonMart5F.blk diff --git a/maps/celadonmartelevator.blk b/maps/CeladonMartElevator.blk similarity index 100% rename from maps/celadonmartelevator.blk rename to maps/CeladonMartElevator.blk diff --git a/maps/celadonmartroof.blk b/maps/CeladonMartRoof.blk similarity index 100% rename from maps/celadonmartroof.blk rename to maps/CeladonMartRoof.blk diff --git a/maps/celadonpokecenter.blk b/maps/CeladonPokecenter.blk similarity index 100% rename from maps/celadonpokecenter.blk rename to maps/CeladonPokecenter.blk diff --git a/maps/ceruleanhouse2.blk b/maps/CeruleanBadgeHouse.blk similarity index 100% rename from maps/ceruleanhouse2.blk rename to maps/CeruleanBadgeHouse.blk diff --git a/maps/unknowndungeon1.blk b/maps/CeruleanCave1F.blk similarity index 100% rename from maps/unknowndungeon1.blk rename to maps/CeruleanCave1F.blk diff --git a/maps/unknowndungeon2.blk b/maps/CeruleanCave2F.blk similarity index 100% rename from maps/unknowndungeon2.blk rename to maps/CeruleanCave2F.blk diff --git a/maps/unknowndungeon3.blk b/maps/CeruleanCaveB1F.blk similarity index 100% rename from maps/unknowndungeon3.blk rename to maps/CeruleanCaveB1F.blk diff --git a/maps/ceruleancity.blk b/maps/CeruleanCity.blk similarity index 100% rename from maps/ceruleancity.blk rename to maps/CeruleanCity.blk diff --git a/maps/ceruleangym.blk b/maps/CeruleanGym.blk similarity index 100% rename from maps/ceruleangym.blk rename to maps/CeruleanGym.blk diff --git a/maps/ceruleanmart.blk b/maps/CeruleanMart.blk similarity index 100% rename from maps/ceruleanmart.blk rename to maps/CeruleanMart.blk diff --git a/maps/ceruleanpokecenter.blk b/maps/CeruleanPokecenter.blk similarity index 100% rename from maps/ceruleanpokecenter.blk rename to maps/CeruleanPokecenter.blk diff --git a/maps/ceruleanhouse1.blk b/maps/CeruleanTradeHouse.blk similarity index 100% rename from maps/ceruleanhouse1.blk rename to maps/CeruleanTradeHouse.blk diff --git a/maps/ceruleanhousetrashed.blk b/maps/CeruleanTrashedHouse.blk similarity index 100% rename from maps/ceruleanhousetrashed.blk rename to maps/CeruleanTrashedHouse.blk diff --git a/maps/gary.blk b/maps/ChampionsRoom.blk similarity index 100% rename from maps/gary.blk rename to maps/ChampionsRoom.blk diff --git a/maps/cinnabargym.blk b/maps/CinnabarGym.blk similarity index 100% rename from maps/cinnabargym.blk rename to maps/CinnabarGym.blk diff --git a/maps/cinnabarisland.blk b/maps/CinnabarIsland.blk similarity index 100% rename from maps/cinnabarisland.blk rename to maps/CinnabarIsland.blk diff --git a/maps/lab1.blk b/maps/CinnabarLab.blk similarity index 100% rename from maps/lab1.blk rename to maps/CinnabarLab.blk diff --git a/maps/lab4.blk b/maps/CinnabarLabFossilRoom.blk similarity index 100% rename from maps/lab4.blk rename to maps/CinnabarLabFossilRoom.blk diff --git a/maps/lab3.blk b/maps/CinnabarLabMetronomeRoom.blk similarity index 100% rename from maps/lab3.blk rename to maps/CinnabarLabMetronomeRoom.blk diff --git a/maps/lab2.blk b/maps/CinnabarLabTradeRoom.blk similarity index 100% rename from maps/lab2.blk rename to maps/CinnabarLabTradeRoom.blk diff --git a/maps/cinnabarmart.blk b/maps/CinnabarMart.blk similarity index 100% rename from maps/cinnabarmart.blk rename to maps/CinnabarMart.blk diff --git a/maps/cinnabarpokecenter.blk b/maps/CinnabarPokecenter.blk similarity index 100% rename from maps/cinnabarpokecenter.blk rename to maps/CinnabarPokecenter.blk diff --git a/maps/colosseum.blk b/maps/Colosseum.blk similarity index 100% rename from maps/colosseum.blk rename to maps/Colosseum.blk diff --git a/maps/copycatshouse1f.blk b/maps/CopycatsHouse1F.blk similarity index 100% rename from maps/copycatshouse1f.blk rename to maps/CopycatsHouse1F.blk diff --git a/maps/copycatshouse2f.blk b/maps/CopycatsHouse2F.blk similarity index 100% rename from maps/copycatshouse2f.blk rename to maps/CopycatsHouse2F.blk diff --git a/maps/daycarem.blk b/maps/Daycare.blk similarity index 100% rename from maps/daycarem.blk rename to maps/Daycare.blk diff --git a/maps/diglettscave.blk b/maps/DiglettsCave.blk similarity index 100% rename from maps/diglettscave.blk rename to maps/DiglettsCave.blk diff --git a/maps/diglettscaveentranceroute11.blk b/maps/DiglettsCaveRoute11.blk similarity index 100% rename from maps/diglettscaveentranceroute11.blk rename to maps/DiglettsCaveRoute11.blk diff --git a/maps/diglettscaveroute2.blk b/maps/DiglettsCaveRoute2.blk similarity index 100% rename from maps/diglettscaveroute2.blk rename to maps/DiglettsCaveRoute2.blk diff --git a/maps/fightingdojo.blk b/maps/FightingDojo.blk similarity index 100% rename from maps/fightingdojo.blk rename to maps/FightingDojo.blk diff --git a/maps/fuchsiahouse1.blk b/maps/FuchsiaBillsGrandpasHouse.blk similarity index 100% rename from maps/fuchsiahouse1.blk rename to maps/FuchsiaBillsGrandpasHouse.blk diff --git a/maps/fuchsiacity.blk b/maps/FuchsiaCity.blk similarity index 100% rename from maps/fuchsiacity.blk rename to maps/FuchsiaCity.blk diff --git a/maps/fuchsiahouse3.blk b/maps/FuchsiaGoodRodHouse.blk similarity index 100% rename from maps/fuchsiahouse3.blk rename to maps/FuchsiaGoodRodHouse.blk diff --git a/maps/fuchsiagym.blk b/maps/FuchsiaGym.blk similarity index 100% rename from maps/fuchsiagym.blk rename to maps/FuchsiaGym.blk diff --git a/maps/fuchsiamart.blk b/maps/FuchsiaMart.blk similarity index 100% rename from maps/fuchsiamart.blk rename to maps/FuchsiaMart.blk diff --git a/maps/fuchsiameetingroom.blk b/maps/FuchsiaMeetingRoom.blk similarity index 100% rename from maps/fuchsiameetingroom.blk rename to maps/FuchsiaMeetingRoom.blk diff --git a/maps/fuchsiapokecenter.blk b/maps/FuchsiaPokecenter.blk similarity index 100% rename from maps/fuchsiapokecenter.blk rename to maps/FuchsiaPokecenter.blk diff --git a/maps/celadongamecorner.blk b/maps/GameCorner.blk similarity index 100% rename from maps/celadongamecorner.blk rename to maps/GameCorner.blk diff --git a/maps/celadonprizeroom.blk b/maps/GameCornerPrizeRoom.blk similarity index 100% rename from maps/celadonprizeroom.blk rename to maps/GameCornerPrizeRoom.blk diff --git a/maps/halloffameroom.blk b/maps/HallOfFame.blk similarity index 100% rename from maps/halloffameroom.blk rename to maps/HallOfFame.blk diff --git a/maps/indigoplateau.blk b/maps/IndigoPlateau.blk similarity index 100% rename from maps/indigoplateau.blk rename to maps/IndigoPlateau.blk diff --git a/maps/indigoplateaulobby.blk b/maps/IndigoPlateauLobby.blk similarity index 100% rename from maps/indigoplateaulobby.blk rename to maps/IndigoPlateauLobby.blk diff --git a/maps/lance.blk b/maps/LancesRoom.blk similarity index 100% rename from maps/lance.blk rename to maps/LancesRoom.blk diff --git a/maps/lavenderhouse1.blk b/maps/LavenderCuboneHouse.blk similarity index 100% rename from maps/lavenderhouse1.blk rename to maps/LavenderCuboneHouse.blk diff --git a/maps/lavendermart.blk b/maps/LavenderMart.blk similarity index 100% rename from maps/lavendermart.blk rename to maps/LavenderMart.blk diff --git a/maps/lavenderpokecenter.blk b/maps/LavenderPokecenter.blk similarity index 100% rename from maps/lavenderpokecenter.blk rename to maps/LavenderPokecenter.blk diff --git a/maps/lavendertown.blk b/maps/LavenderTown.blk similarity index 100% rename from maps/lavendertown.blk rename to maps/LavenderTown.blk diff --git a/maps/lorelei.blk b/maps/LoreleisRoom.blk similarity index 100% rename from maps/lorelei.blk rename to maps/LoreleisRoom.blk diff --git a/maps/lavenderhouse2.blk b/maps/MrFujisHouse.blk similarity index 100% rename from maps/lavenderhouse2.blk rename to maps/MrFujisHouse.blk diff --git a/maps/namerater.blk b/maps/MrPsychicsHouse.blk similarity index 100% rename from maps/namerater.blk rename to maps/MrPsychicsHouse.blk diff --git a/maps/mtmoon1.blk b/maps/MtMoon1F.blk similarity index 100% rename from maps/mtmoon1.blk rename to maps/MtMoon1F.blk diff --git a/maps/mtmoon2.blk b/maps/MtMoonB1F.blk similarity index 100% rename from maps/mtmoon2.blk rename to maps/MtMoonB1F.blk diff --git a/maps/mtmoon3.blk b/maps/MtMoonB2F.blk similarity index 100% rename from maps/mtmoon3.blk rename to maps/MtMoonB2F.blk diff --git a/maps/mtmoonpokecenter.blk b/maps/MtMoonPokecenter.blk similarity index 100% rename from maps/mtmoonpokecenter.blk rename to maps/MtMoonPokecenter.blk diff --git a/maps/museum1f.blk b/maps/Museum1F.blk similarity index 100% rename from maps/museum1f.blk rename to maps/Museum1F.blk diff --git a/maps/museum2f.blk b/maps/Museum2F.blk similarity index 100% rename from maps/museum2f.blk rename to maps/Museum2F.blk diff --git a/maps/pewterhouse1.blk b/maps/NameRatersHouse.blk similarity index 100% rename from maps/pewterhouse1.blk rename to maps/NameRatersHouse.blk diff --git a/maps/oakslab.blk b/maps/OaksLab.blk similarity index 100% rename from maps/oakslab.blk rename to maps/OaksLab.blk diff --git a/maps/pallettown.blk b/maps/PalletTown.blk similarity index 100% rename from maps/pallettown.blk rename to maps/PalletTown.blk diff --git a/maps/pewtercity.blk b/maps/PewterCity.blk similarity index 100% rename from maps/pewtercity.blk rename to maps/PewterCity.blk diff --git a/maps/pewtergym.blk b/maps/PewterGym.blk similarity index 100% rename from maps/pewtergym.blk rename to maps/PewterGym.blk diff --git a/maps/pewtermart.blk b/maps/PewterMart.blk similarity index 100% rename from maps/pewtermart.blk rename to maps/PewterMart.blk diff --git a/maps/pewterhouse2.blk b/maps/PewterNidoranHouse.blk similarity index 100% rename from maps/pewterhouse2.blk rename to maps/PewterNidoranHouse.blk diff --git a/maps/pewterpokecenter.blk b/maps/PewterPokecenter.blk similarity index 100% rename from maps/pewterpokecenter.blk rename to maps/PewterPokecenter.blk diff --git a/maps/route12house.blk b/maps/PewterSpeechHouse.blk similarity index 100% rename from maps/route12house.blk rename to maps/PewterSpeechHouse.blk diff --git a/maps/fanclub.blk b/maps/PokemonFanClub.blk similarity index 100% rename from maps/fanclub.blk rename to maps/PokemonFanClub.blk diff --git a/maps/mansion1.blk b/maps/PokemonMansion1F.blk similarity index 100% rename from maps/mansion1.blk rename to maps/PokemonMansion1F.blk diff --git a/maps/mansion2.blk b/maps/PokemonMansion2F.blk similarity index 100% rename from maps/mansion2.blk rename to maps/PokemonMansion2F.blk diff --git a/maps/mansion3.blk b/maps/PokemonMansion3F.blk similarity index 100% rename from maps/mansion3.blk rename to maps/PokemonMansion3F.blk diff --git a/maps/mansion4.blk b/maps/PokemonMansionB1F.blk similarity index 100% rename from maps/mansion4.blk rename to maps/PokemonMansionB1F.blk diff --git a/maps/pokemontower1.blk b/maps/PokemonTower1F.blk similarity index 100% rename from maps/pokemontower1.blk rename to maps/PokemonTower1F.blk diff --git a/maps/pokemontower2.blk b/maps/PokemonTower2F.blk similarity index 100% rename from maps/pokemontower2.blk rename to maps/PokemonTower2F.blk diff --git a/maps/pokemontower3.blk b/maps/PokemonTower3F.blk similarity index 100% rename from maps/pokemontower3.blk rename to maps/PokemonTower3F.blk diff --git a/maps/pokemontower4.blk b/maps/PokemonTower4F.blk similarity index 100% rename from maps/pokemontower4.blk rename to maps/PokemonTower4F.blk diff --git a/maps/pokemontower5.blk b/maps/PokemonTower5F.blk similarity index 100% rename from maps/pokemontower5.blk rename to maps/PokemonTower5F.blk diff --git a/maps/pokemontower6.blk b/maps/PokemonTower6F.blk similarity index 100% rename from maps/pokemontower6.blk rename to maps/PokemonTower6F.blk diff --git a/maps/pokemontower7.blk b/maps/PokemonTower7F.blk similarity index 100% rename from maps/pokemontower7.blk rename to maps/PokemonTower7F.blk diff --git a/maps/powerplant.blk b/maps/PowerPlant.blk similarity index 100% rename from maps/powerplant.blk rename to maps/PowerPlant.blk diff --git a/maps/redshouse1f.blk b/maps/RedsHouse1F.blk similarity index 100% rename from maps/redshouse1f.blk rename to maps/RedsHouse1F.blk diff --git a/maps/redshouse2f.blk b/maps/RedsHouse2F.blk similarity index 100% rename from maps/redshouse2f.blk rename to maps/RedsHouse2F.blk diff --git a/maps/rocktunnel1.blk b/maps/RockTunnel1F.blk similarity index 100% rename from maps/rocktunnel1.blk rename to maps/RockTunnel1F.blk diff --git a/maps/rocktunnel2.blk b/maps/RockTunnelB1F.blk similarity index 100% rename from maps/rocktunnel2.blk rename to maps/RockTunnelB1F.blk diff --git a/maps/rocktunnelpokecenter.blk b/maps/RockTunnelPokecenter.blk similarity index 100% rename from maps/rocktunnelpokecenter.blk rename to maps/RockTunnelPokecenter.blk diff --git a/maps/rockethideout1.blk b/maps/RocketHideoutB1F.blk similarity index 100% rename from maps/rockethideout1.blk rename to maps/RocketHideoutB1F.blk diff --git a/maps/rockethideout2.blk b/maps/RocketHideoutB2F.blk similarity index 100% rename from maps/rockethideout2.blk rename to maps/RocketHideoutB2F.blk diff --git a/maps/rockethideout3.blk b/maps/RocketHideoutB3F.blk similarity index 100% rename from maps/rockethideout3.blk rename to maps/RocketHideoutB3F.blk diff --git a/maps/rockethideout4.blk b/maps/RocketHideoutB4F.blk similarity index 100% rename from maps/rockethideout4.blk rename to maps/RocketHideoutB4F.blk diff --git a/maps/rockethideoutelevator.blk b/maps/RocketHideoutElevator.blk similarity index 100% rename from maps/rockethideoutelevator.blk rename to maps/RocketHideoutElevator.blk diff --git a/maps/route1.blk b/maps/Route1.blk similarity index 100% rename from maps/route1.blk rename to maps/Route1.blk diff --git a/maps/route10.blk b/maps/Route10.blk similarity index 100% rename from maps/route10.blk rename to maps/Route10.blk diff --git a/maps/route11.blk b/maps/Route11.blk similarity index 100% rename from maps/route11.blk rename to maps/Route11.blk diff --git a/maps/route11gate.blk b/maps/Route11Gate1F.blk similarity index 100% rename from maps/route11gate.blk rename to maps/Route11Gate1F.blk diff --git a/maps/route11gateupstairs.blk b/maps/Route11Gate2F.blk similarity index 100% rename from maps/route11gateupstairs.blk rename to maps/Route11Gate2F.blk diff --git a/maps/route12.blk b/maps/Route12.blk similarity index 100% rename from maps/route12.blk rename to maps/Route12.blk diff --git a/maps/route12gate.blk b/maps/Route12Gate1F.blk similarity index 100% rename from maps/route12gate.blk rename to maps/Route12Gate1F.blk diff --git a/maps/route12gateupstairs.blk b/maps/Route12Gate2F.blk similarity index 100% rename from maps/route12gateupstairs.blk rename to maps/Route12Gate2F.blk diff --git a/maps/route16house.blk b/maps/Route12SuperRodHouse.blk similarity index 100% rename from maps/route16house.blk rename to maps/Route12SuperRodHouse.blk diff --git a/maps/route13.blk b/maps/Route13.blk similarity index 100% rename from maps/route13.blk rename to maps/Route13.blk diff --git a/maps/route14.blk b/maps/Route14.blk similarity index 100% rename from maps/route14.blk rename to maps/Route14.blk diff --git a/maps/route15.blk b/maps/Route15.blk similarity index 100% rename from maps/route15.blk rename to maps/Route15.blk diff --git a/maps/route15gate.blk b/maps/Route15Gate1F.blk similarity index 100% rename from maps/route15gate.blk rename to maps/Route15Gate1F.blk diff --git a/maps/route15gateupstairs.blk b/maps/Route15Gate2F.blk similarity index 100% rename from maps/route15gateupstairs.blk rename to maps/Route15Gate2F.blk diff --git a/maps/route16.blk b/maps/Route16.blk similarity index 100% rename from maps/route16.blk rename to maps/Route16.blk diff --git a/maps/route2house.blk b/maps/Route16FlyHouse.blk similarity index 100% rename from maps/route2house.blk rename to maps/Route16FlyHouse.blk diff --git a/maps/route16gate.blk b/maps/Route16Gate1F.blk similarity index 100% rename from maps/route16gate.blk rename to maps/Route16Gate1F.blk diff --git a/maps/route16gateupstairs.blk b/maps/Route16Gate2F.blk similarity index 100% rename from maps/route16gateupstairs.blk rename to maps/Route16Gate2F.blk diff --git a/maps/route17.blk b/maps/Route17.blk similarity index 100% rename from maps/route17.blk rename to maps/Route17.blk diff --git a/maps/route18.blk b/maps/Route18.blk similarity index 100% rename from maps/route18.blk rename to maps/Route18.blk diff --git a/maps/route18gate.blk b/maps/Route18Gate1F.blk similarity index 100% rename from maps/route18gate.blk rename to maps/Route18Gate1F.blk diff --git a/maps/route18gateupstairs.blk b/maps/Route18Gate2F.blk similarity index 100% rename from maps/route18gateupstairs.blk rename to maps/Route18Gate2F.blk diff --git a/maps/route19.blk b/maps/Route19.blk similarity index 100% rename from maps/route19.blk rename to maps/Route19.blk diff --git a/maps/route2.blk b/maps/Route2.blk similarity index 100% rename from maps/route2.blk rename to maps/Route2.blk diff --git a/maps/route20.blk b/maps/Route20.blk similarity index 100% rename from maps/route20.blk rename to maps/Route20.blk diff --git a/maps/route21.blk b/maps/Route21.blk similarity index 100% rename from maps/route21.blk rename to maps/Route21.blk diff --git a/maps/route22.blk b/maps/Route22.blk similarity index 100% rename from maps/route22.blk rename to maps/Route22.blk diff --git a/maps/route22gate.blk b/maps/Route22Gate.blk similarity index 100% rename from maps/route22gate.blk rename to maps/Route22Gate.blk diff --git a/maps/route23.blk b/maps/Route23.blk similarity index 100% rename from maps/route23.blk rename to maps/Route23.blk diff --git a/maps/route24.blk b/maps/Route24.blk similarity index 100% rename from maps/route24.blk rename to maps/Route24.blk diff --git a/maps/route25.blk b/maps/Route25.blk similarity index 100% rename from maps/route25.blk rename to maps/Route25.blk diff --git a/maps/route2gate.blk b/maps/Route2Gate.blk similarity index 100% rename from maps/route2gate.blk rename to maps/Route2Gate.blk diff --git a/maps/saffronhouse1.blk b/maps/Route2TradeHouse.blk similarity index 100% rename from maps/saffronhouse1.blk rename to maps/Route2TradeHouse.blk diff --git a/maps/route3.blk b/maps/Route3.blk similarity index 100% rename from maps/route3.blk rename to maps/Route3.blk diff --git a/maps/route4.blk b/maps/Route4.blk similarity index 100% rename from maps/route4.blk rename to maps/Route4.blk diff --git a/maps/route5.blk b/maps/Route5.blk similarity index 100% rename from maps/route5.blk rename to maps/Route5.blk diff --git a/maps/route5gate.blk b/maps/Route5Gate.blk similarity index 100% rename from maps/route5gate.blk rename to maps/Route5Gate.blk diff --git a/maps/route6.blk b/maps/Route6.blk similarity index 100% rename from maps/route6.blk rename to maps/Route6.blk diff --git a/maps/route6gate.blk b/maps/Route6Gate.blk similarity index 100% rename from maps/route6gate.blk rename to maps/Route6Gate.blk diff --git a/maps/route7.blk b/maps/Route7.blk similarity index 100% rename from maps/route7.blk rename to maps/Route7.blk diff --git a/maps/route7gate.blk b/maps/Route7Gate.blk similarity index 100% rename from maps/route7gate.blk rename to maps/Route7Gate.blk diff --git a/maps/route8.blk b/maps/Route8.blk similarity index 100% rename from maps/route8.blk rename to maps/Route8.blk diff --git a/maps/route8gate.blk b/maps/Route8Gate.blk similarity index 100% rename from maps/route8gate.blk rename to maps/Route8Gate.blk diff --git a/maps/route9.blk b/maps/Route9.blk similarity index 100% rename from maps/route9.blk rename to maps/Route9.blk diff --git a/maps/ssanne1.blk b/maps/SSAnne1F.blk similarity index 100% rename from maps/ssanne1.blk rename to maps/SSAnne1F.blk diff --git a/maps/ssanne8.blk b/maps/SSAnne1FRooms.blk similarity index 100% rename from maps/ssanne8.blk rename to maps/SSAnne1FRooms.blk diff --git a/maps/ssanne2.blk b/maps/SSAnne2F.blk similarity index 100% rename from maps/ssanne2.blk rename to maps/SSAnne2F.blk diff --git a/maps/ssanne10.blk b/maps/SSAnne2FRooms.blk similarity index 100% rename from maps/ssanne10.blk rename to maps/SSAnne2FRooms.blk diff --git a/maps/ssanne3.blk b/maps/SSAnne3F.blk similarity index 100% rename from maps/ssanne3.blk rename to maps/SSAnne3F.blk diff --git a/maps/ssanne4.blk b/maps/SSAnneB1F.blk similarity index 100% rename from maps/ssanne4.blk rename to maps/SSAnneB1F.blk diff --git a/maps/ssanne9.blk b/maps/SSAnneB1FRooms.blk similarity index 100% rename from maps/ssanne9.blk rename to maps/SSAnneB1FRooms.blk diff --git a/maps/ssanne5.blk b/maps/SSAnneBow.blk similarity index 100% rename from maps/ssanne5.blk rename to maps/SSAnneBow.blk diff --git a/maps/ssanne7.blk b/maps/SSAnneCaptainsRoom.blk similarity index 100% rename from maps/ssanne7.blk rename to maps/SSAnneCaptainsRoom.blk diff --git a/maps/ssanne6.blk b/maps/SSAnneKitchen.blk similarity index 100% rename from maps/ssanne6.blk rename to maps/SSAnneKitchen.blk diff --git a/maps/safarizonecenter.blk b/maps/SafariZoneCenter.blk similarity index 100% rename from maps/safarizonecenter.blk rename to maps/SafariZoneCenter.blk diff --git a/maps/safarizoneresthouse1.blk b/maps/SafariZoneCenterRestHouse.blk similarity index 100% rename from maps/safarizoneresthouse1.blk rename to maps/SafariZoneCenterRestHouse.blk diff --git a/maps/safarizoneeast.blk b/maps/SafariZoneEast.blk similarity index 100% rename from maps/safarizoneeast.blk rename to maps/SafariZoneEast.blk diff --git a/maps/safarizoneresthouse2.blk b/maps/SafariZoneEastRestHouse.blk similarity index 100% rename from maps/safarizoneresthouse2.blk rename to maps/SafariZoneEastRestHouse.blk diff --git a/maps/safarizoneentrance.blk b/maps/SafariZoneGate.blk similarity index 100% rename from maps/safarizoneentrance.blk rename to maps/SafariZoneGate.blk diff --git a/maps/safarizonenorth.blk b/maps/SafariZoneNorth.blk similarity index 100% rename from maps/safarizonenorth.blk rename to maps/SafariZoneNorth.blk diff --git a/maps/safarizoneresthouse3.blk b/maps/SafariZoneNorthRestHouse.blk similarity index 100% rename from maps/safarizoneresthouse3.blk rename to maps/SafariZoneNorthRestHouse.blk diff --git a/maps/safarizonesecrethouse.blk b/maps/SafariZoneSecretHouse.blk similarity index 100% rename from maps/safarizonesecrethouse.blk rename to maps/SafariZoneSecretHouse.blk diff --git a/maps/safarizonewest.blk b/maps/SafariZoneWest.blk similarity index 100% rename from maps/safarizonewest.blk rename to maps/SafariZoneWest.blk diff --git a/maps/safarizoneresthouse4.blk b/maps/SafariZoneWestRestHouse.blk similarity index 100% rename from maps/safarizoneresthouse4.blk rename to maps/SafariZoneWestRestHouse.blk diff --git a/maps/saffroncity.blk b/maps/SaffronCity.blk similarity index 100% rename from maps/saffroncity.blk rename to maps/SaffronCity.blk diff --git a/maps/saffrongym.blk b/maps/SaffronGym.blk similarity index 100% rename from maps/saffrongym.blk rename to maps/SaffronGym.blk diff --git a/maps/saffronmart.blk b/maps/SaffronMart.blk similarity index 100% rename from maps/saffronmart.blk rename to maps/SaffronMart.blk diff --git a/maps/saffronhouse2.blk b/maps/SaffronPidgeyHouse.blk similarity index 100% rename from maps/saffronhouse2.blk rename to maps/SaffronPidgeyHouse.blk diff --git a/maps/saffronpokecenter.blk b/maps/SaffronPokecenter.blk similarity index 100% rename from maps/saffronpokecenter.blk rename to maps/SaffronPokecenter.blk diff --git a/maps/seafoamislands1.blk b/maps/SeafoamIslands1F.blk similarity index 100% rename from maps/seafoamislands1.blk rename to maps/SeafoamIslands1F.blk diff --git a/maps/seafoamislands2.blk b/maps/SeafoamIslandsB1F.blk similarity index 100% rename from maps/seafoamislands2.blk rename to maps/SeafoamIslandsB1F.blk diff --git a/maps/seafoamislands3.blk b/maps/SeafoamIslandsB2F.blk similarity index 100% rename from maps/seafoamislands3.blk rename to maps/SeafoamIslandsB2F.blk diff --git a/maps/seafoamislands4.blk b/maps/SeafoamIslandsB3F.blk similarity index 100% rename from maps/seafoamislands4.blk rename to maps/SeafoamIslandsB3F.blk diff --git a/maps/seafoamislands5.blk b/maps/SeafoamIslandsB4F.blk similarity index 100% rename from maps/seafoamislands5.blk rename to maps/SeafoamIslandsB4F.blk diff --git a/maps/silphco10.blk b/maps/SilphCo10F.blk similarity index 100% rename from maps/silphco10.blk rename to maps/SilphCo10F.blk diff --git a/maps/silphco11.blk b/maps/SilphCo11F.blk similarity index 100% rename from maps/silphco11.blk rename to maps/SilphCo11F.blk diff --git a/maps/silphco1.blk b/maps/SilphCo1F.blk similarity index 100% rename from maps/silphco1.blk rename to maps/SilphCo1F.blk diff --git a/maps/silphco2.blk b/maps/SilphCo2F.blk similarity index 100% rename from maps/silphco2.blk rename to maps/SilphCo2F.blk diff --git a/maps/silphco3.blk b/maps/SilphCo3F.blk similarity index 100% rename from maps/silphco3.blk rename to maps/SilphCo3F.blk diff --git a/maps/silphco4.blk b/maps/SilphCo4F.blk similarity index 100% rename from maps/silphco4.blk rename to maps/SilphCo4F.blk diff --git a/maps/silphco5.blk b/maps/SilphCo5F.blk similarity index 100% rename from maps/silphco5.blk rename to maps/SilphCo5F.blk diff --git a/maps/silphco6.blk b/maps/SilphCo6F.blk similarity index 100% rename from maps/silphco6.blk rename to maps/SilphCo6F.blk diff --git a/maps/silphco7.blk b/maps/SilphCo7F.blk similarity index 100% rename from maps/silphco7.blk rename to maps/SilphCo7F.blk diff --git a/maps/silphco8.blk b/maps/SilphCo8F.blk similarity index 100% rename from maps/silphco8.blk rename to maps/SilphCo8F.blk diff --git a/maps/silphco9.blk b/maps/SilphCo9F.blk similarity index 100% rename from maps/silphco9.blk rename to maps/SilphCo9F.blk diff --git a/maps/silphcoelevator.blk b/maps/SilphCoElevator.blk similarity index 100% rename from maps/silphcoelevator.blk rename to maps/SilphCoElevator.blk diff --git a/maps/tradecenter.blk b/maps/TradeCenter.blk similarity index 100% rename from maps/tradecenter.blk rename to maps/TradeCenter.blk diff --git a/maps/undergroundpathns.blk b/maps/UndergroundPathNorthSouth.blk similarity index 100% rename from maps/undergroundpathns.blk rename to maps/UndergroundPathNorthSouth.blk diff --git a/maps/undergroundpathentranceroute5.blk b/maps/UndergroundPathRoute5.blk similarity index 100% rename from maps/undergroundpathentranceroute5.blk rename to maps/UndergroundPathRoute5.blk diff --git a/maps/undergroundpathentranceroute6.blk b/maps/UndergroundPathRoute6.blk similarity index 100% rename from maps/undergroundpathentranceroute6.blk rename to maps/UndergroundPathRoute6.blk diff --git a/maps/undergroundpathentranceroute7.blk b/maps/UndergroundPathRoute7.blk similarity index 100% rename from maps/undergroundpathentranceroute7.blk rename to maps/UndergroundPathRoute7.blk diff --git a/maps/undergroundpathentranceroute8.blk b/maps/UndergroundPathRoute8.blk similarity index 100% rename from maps/undergroundpathentranceroute8.blk rename to maps/UndergroundPathRoute8.blk diff --git a/maps/undergroundpathwe.blk b/maps/UndergroundPathWestEast.blk similarity index 100% rename from maps/undergroundpathwe.blk rename to maps/UndergroundPathWestEast.blk diff --git a/maps/unusedblocks60258.blk b/maps/UnusedDiglettsCaveCopy.blk similarity index 100% rename from maps/unusedblocks60258.blk rename to maps/UnusedDiglettsCaveCopy.blk diff --git a/maps/unusedblocks60cef.blk b/maps/UnusedEmptyMap.blk similarity index 100% rename from maps/unusedblocks60cef.blk rename to maps/UnusedEmptyMap.blk diff --git a/maps/unusedblocks58d7d.blk b/maps/UnusedPokecenterCopy.blk similarity index 100% rename from maps/unusedblocks58d7d.blk rename to maps/UnusedPokecenterCopy.blk diff --git a/maps/vermilioncity.blk b/maps/VermilionCity.blk similarity index 100% rename from maps/vermilioncity.blk rename to maps/VermilionCity.blk diff --git a/maps/vermiliondock.blk b/maps/VermilionDock.blk similarity index 100% rename from maps/vermiliondock.blk rename to maps/VermilionDock.blk diff --git a/maps/vermiliongym.blk b/maps/VermilionGym.blk similarity index 100% rename from maps/vermiliongym.blk rename to maps/VermilionGym.blk diff --git a/maps/vermilionmart.blk b/maps/VermilionMart.blk similarity index 100% rename from maps/vermilionmart.blk rename to maps/VermilionMart.blk diff --git a/maps/vermilionhouse1.blk b/maps/VermilionOldRodHouse.blk similarity index 100% rename from maps/vermilionhouse1.blk rename to maps/VermilionOldRodHouse.blk diff --git a/maps/vermilionhouse2.blk b/maps/VermilionPidgeyHouse.blk similarity index 100% rename from maps/vermilionhouse2.blk rename to maps/VermilionPidgeyHouse.blk diff --git a/maps/vermilionpokecenter.blk b/maps/VermilionPokecenter.blk similarity index 100% rename from maps/vermilionpokecenter.blk rename to maps/VermilionPokecenter.blk diff --git a/maps/vermilionhouse3.blk b/maps/VermilionTradeHouse.blk similarity index 100% rename from maps/vermilionhouse3.blk rename to maps/VermilionTradeHouse.blk diff --git a/maps/victoryroad1.blk b/maps/VictoryRoad1F.blk similarity index 100% rename from maps/victoryroad1.blk rename to maps/VictoryRoad1F.blk diff --git a/maps/victoryroad2.blk b/maps/VictoryRoad2F.blk similarity index 100% rename from maps/victoryroad2.blk rename to maps/VictoryRoad2F.blk diff --git a/maps/victoryroad3.blk b/maps/VictoryRoad3F.blk similarity index 100% rename from maps/victoryroad3.blk rename to maps/VictoryRoad3F.blk diff --git a/maps/viridiancity.blk b/maps/ViridianCity.blk similarity index 100% rename from maps/viridiancity.blk rename to maps/ViridianCity.blk diff --git a/maps/viridianforest.blk b/maps/ViridianForest.blk similarity index 100% rename from maps/viridianforest.blk rename to maps/ViridianForest.blk diff --git a/maps/viridianforestentrance.blk b/maps/ViridianForestNorthGate.blk similarity index 100% rename from maps/viridianforestentrance.blk rename to maps/ViridianForestNorthGate.blk diff --git a/maps/viridianforestexit.blk b/maps/ViridianForestSouthGate.blk similarity index 100% rename from maps/viridianforestexit.blk rename to maps/ViridianForestSouthGate.blk diff --git a/maps/viridiangym.blk b/maps/ViridianGym.blk similarity index 100% rename from maps/viridiangym.blk rename to maps/ViridianGym.blk diff --git a/maps/viridianmart.blk b/maps/ViridianMart.blk similarity index 100% rename from maps/viridianmart.blk rename to maps/ViridianMart.blk diff --git a/maps/viridianhouse.blk b/maps/ViridianNicknameHouse.blk similarity index 100% rename from maps/viridianhouse.blk rename to maps/ViridianNicknameHouse.blk diff --git a/maps/viridianpokecenter.blk b/maps/ViridianPokecenter.blk similarity index 100% rename from maps/viridianpokecenter.blk rename to maps/ViridianPokecenter.blk diff --git a/maps/school.blk b/maps/ViridianSchoolHouse.blk similarity index 100% rename from maps/school.blk rename to maps/ViridianSchoolHouse.blk diff --git a/maps/fuchsiahouse2.blk b/maps/WardensHouse.blk similarity index 100% rename from maps/fuchsiahouse2.blk rename to maps/WardensHouse.blk diff --git a/maps/route19-yellow.blk b/maps/route19-yellow.blk deleted file mode 100644 index 3fc58494..00000000 --- a/maps/route19-yellow.blk +++ /dev/null @@ -1 +0,0 @@ -(,)(,)(,)$W%$W%CCC11111CCC111CCk1111kkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkk \ No newline at end of file diff --git a/scripts/agatha.asm b/scripts/AgathasRoom.asm similarity index 89% rename from scripts/agatha.asm rename to scripts/AgathasRoom.asm index 88d6a8de..a1dba196 100755 --- a/scripts/agatha.asm +++ b/scripts/AgathasRoom.asm @@ -1,11 +1,11 @@ -AgathaScript: +AgathasRoom_Script: call AgathaShowOrHideExitBlock call EnableAutoTextBoxDrawing ld hl, AgathaTrainerHeader0 - ld de, AgathaScriptPointers - ld a, [wAgathaCurScript] + ld de, AgathasRoom_ScriptPointers + ld a, [wAgathasRoomCurScript] call ExecuteCurMapScriptInTable - ld [wAgathaCurScript], a + ld [wAgathasRoomCurScript], a ret AgathaShowOrHideExitBlock: @@ -27,10 +27,10 @@ AgathaShowOrHideExitBlock: ResetAgathaScript: xor a - ld [wAgathaCurScript], a + ld [wAgathasRoomCurScript], a ret -AgathaScriptPointers: +AgathasRoom_ScriptPointers: dw AgathaScript0 dw DisplayEnemyTrainerTextAndStartBattle dw AgathaScript2 @@ -54,7 +54,7 @@ AgathaScriptWalkIntoRoom: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [wAgathaCurScript], a + ld [wAgathasRoomCurScript], a ld [wCurMapScript], a ret @@ -82,7 +82,7 @@ AgathaScript0: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [wAgathaCurScript], a + ld [wAgathasRoomCurScript], a ld [wCurMapScript], a ret @@ -100,7 +100,7 @@ AgathaScript3: call Delay3 xor a ld [wJoyIgnore], a - ld [wAgathaCurScript], a + ld [wAgathasRoomCurScript], a ld [wCurMapScript], a ret @@ -113,10 +113,10 @@ AgathaScript2: ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret -AgathaTextPointers: +AgathasRoom_TextPointers: dw AgathaText1 dw AgathaDontRunAwayText diff --git a/scripts/bikeshop.asm b/scripts/BikeShop.asm similarity index 98% rename from scripts/bikeshop.asm rename to scripts/BikeShop.asm index 4d6853be..71149759 100755 --- a/scripts/bikeshop.asm +++ b/scripts/BikeShop.asm @@ -1,7 +1,7 @@ -BikeShopScript: +BikeShop_Script: jp EnableAutoTextBoxDrawing -BikeShopTextPointers: +BikeShop_TextPointers: dw BikeShopText1 dw BikeShopText2 dw BikeShopText3 diff --git a/scripts/billshouse.asm b/scripts/BillsHouse.asm similarity index 97% rename from scripts/billshouse.asm rename to scripts/BillsHouse.asm index 2b60ef8c..74efc960 100755 --- a/scripts/billshouse.asm +++ b/scripts/BillsHouse.asm @@ -1,10 +1,10 @@ -BillsHouseScript: +BillsHouse_Script: call EnableAutoTextBoxDrawing ld a, [wBillsHouseCurScript] - ld hl, BillsHouseScriptPointers + ld hl, BillsHouse_ScriptPointers jp CallFunctionInTable -BillsHouseScriptPointers: +BillsHouse_ScriptPointers: dw BillsHouseScript0 dw BillsHouseScript1 dw BillsHouseScript2 @@ -115,7 +115,7 @@ BillsHouseScript5: ld [wBillsHouseCurScript], a ret -BillsHouseTextPointers: +BillsHouse_TextPointers: dw BillsHouseText1 dw BillsHouseText2 dw BillsHouseText3 diff --git a/scripts/blueshouse.asm b/scripts/BluesHouse.asm similarity index 92% rename from scripts/blueshouse.asm rename to scripts/BluesHouse.asm index 2b72ef97..f325049f 100755 --- a/scripts/blueshouse.asm +++ b/scripts/BluesHouse.asm @@ -1,10 +1,10 @@ -BluesHouseScript: +BluesHouse_Script: call EnableAutoTextBoxDrawing - ld hl, BluesHouseScriptPointers + ld hl, BluesHouse_ScriptPointers ld a, [wBluesHouseCurScript] jp CallFunctionInTable -BluesHouseScriptPointers: +BluesHouse_ScriptPointers: dw BluesHouseScript0 dw BluesHouseScript1 @@ -19,7 +19,7 @@ BluesHouseScript0: BluesHouseScript1: ret -BluesHouseTextPointers: +BluesHouse_TextPointers: dw BluesHouseText1 dw BluesHouseText2 dw BluesHouseText3 diff --git a/scripts/bruno.asm b/scripts/BrunosRoom.asm similarity index 90% rename from scripts/bruno.asm rename to scripts/BrunosRoom.asm index 02ceebf2..3b6385b7 100755 --- a/scripts/bruno.asm +++ b/scripts/BrunosRoom.asm @@ -1,11 +1,11 @@ -BrunoScript: +BrunosRoom_Script: call BrunoShowOrHideExitBlock call EnableAutoTextBoxDrawing ld hl, BrunoTrainerHeader0 - ld de, BrunoScriptPointers - ld a, [wBrunoCurScript] + ld de, BrunosRoom_ScriptPointers + ld a, [wBrunosRoomCurScript] call ExecuteCurMapScriptInTable - ld [wBrunoCurScript], a + ld [wBrunosRoomCurScript], a ret BrunoShowOrHideExitBlock: @@ -27,10 +27,10 @@ BrunoShowOrHideExitBlock: ResetBrunoScript: xor a - ld [wBrunoCurScript], a + ld [wBrunosRoomCurScript], a ret -BrunoScriptPointers: +BrunosRoom_ScriptPointers: dw BrunoScript0 dw DisplayEnemyTrainerTextAndStartBattle dw BrunoScript2 @@ -54,7 +54,7 @@ BrunoScriptWalkIntoRoom: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [wBrunoCurScript], a + ld [wBrunosRoomCurScript], a ld [wCurMapScript], a ret @@ -82,7 +82,7 @@ BrunoScript0: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [wBrunoCurScript], a + ld [wBrunosRoomCurScript], a ld [wCurMapScript], a ret @@ -100,7 +100,7 @@ BrunoScript3: call Delay3 xor a ld [wJoyIgnore], a - ld [wBrunoCurScript], a + ld [wBrunosRoomCurScript], a ld [wCurMapScript], a ret @@ -113,7 +113,7 @@ BrunoScript2: ld [hSpriteIndexOrTextID], a jp DisplayTextID -BrunoTextPointers: +BrunosRoom_TextPointers: dw BrunoText1 dw BrunoDontRunAwayText diff --git a/scripts/celadonhouse.asm b/scripts/CeladonChiefHouse.asm similarity index 82% rename from scripts/celadonhouse.asm rename to scripts/CeladonChiefHouse.asm index 7f2778d1..fc37bd4d 100755 --- a/scripts/celadonhouse.asm +++ b/scripts/CeladonChiefHouse.asm @@ -1,8 +1,8 @@ -CeladonHouseScript: +CeladonChiefHouse_Script: call EnableAutoTextBoxDrawing ret -CeladonHouseTextPointers: +CeladonChiefHouse_TextPointers: dw CeladonHouseText1 dw CeladonHouseText2 dw CeladonHouseText3 diff --git a/scripts/celadoncity.asm b/scripts/CeladonCity.asm similarity index 97% rename from scripts/celadoncity.asm rename to scripts/CeladonCity.asm index 6ef679dc..e2d7d371 100755 --- a/scripts/celadoncity.asm +++ b/scripts/CeladonCity.asm @@ -1,10 +1,10 @@ -CeladonCityScript: +CeladonCity_Script: call EnableAutoTextBoxDrawing ResetEvents EVENT_1B8, EVENT_1BF ResetEvent EVENT_67F ret -CeladonCityTextPointers: +CeladonCity_TextPointers: dw CeladonCityText1 dw CeladonCityText2 dw CeladonCityText3 diff --git a/scripts/celadondiner.asm b/scripts/CeladonDiner.asm similarity index 95% rename from scripts/celadondiner.asm rename to scripts/CeladonDiner.asm index 6fd594f7..371205de 100755 --- a/scripts/celadondiner.asm +++ b/scripts/CeladonDiner.asm @@ -1,8 +1,8 @@ -CeladonDinerScript: +CeladonDiner_Script: call EnableAutoTextBoxDrawing ret -CeladonDinerTextPointers: +CeladonDiner_TextPointers: dw CeladonDinerText1 dw CeladonDinerText2 dw CeladonDinerText3 diff --git a/scripts/celadongym.asm b/scripts/CeladonGym.asm similarity index 98% rename from scripts/celadongym.asm rename to scripts/CeladonGym.asm index ae7e6846..8ceb36ee 100755 --- a/scripts/celadongym.asm +++ b/scripts/CeladonGym.asm @@ -1,11 +1,11 @@ -CeladonGymScript: +CeladonGym_Script: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, CeladonGymScript_48927 call EnableAutoTextBoxDrawing ld hl, CeladonGymTrainerHeader0 - ld de, CeladonGymScriptPointers + ld de, CeladonGym_ScriptPointers ld a, [wCeladonGymCurScript] call ExecuteCurMapScriptInTable ld [wCeladonGymCurScript], a @@ -29,7 +29,7 @@ CeladonGymText_48943: ld [wCurMapScript], a ret -CeladonGymScriptPointers: +CeladonGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -70,7 +70,7 @@ CeladonGymText_48963: jp CeladonGymText_48943 -CeladonGymTextPointers: +CeladonGym_TextPointers: dw CeladonGymText1 dw CeladonGymText2 dw CeladonGymText3 diff --git a/scripts/celadonhotel.asm b/scripts/CeladonHotel.asm similarity index 84% rename from scripts/celadonhotel.asm rename to scripts/CeladonHotel.asm index 23b9eb55..ee4e140c 100755 --- a/scripts/celadonhotel.asm +++ b/scripts/CeladonHotel.asm @@ -1,7 +1,7 @@ -CeladonHotelScript: +CeladonHotel_Script: jp EnableAutoTextBoxDrawing -CeladonHotelTextPointers: +CeladonHotel_TextPointers: dw CeladonHotelText1 dw CeladonHotelText2 dw CeladonHotelText3 diff --git a/scripts/celadonmansion1.asm b/scripts/CeladonMansion1F.asm similarity index 91% rename from scripts/celadonmansion1.asm rename to scripts/CeladonMansion1F.asm index f6ef7669..41524983 100755 --- a/scripts/celadonmansion1.asm +++ b/scripts/CeladonMansion1F.asm @@ -1,7 +1,7 @@ -CeladonMansion1Script: +CeladonMansion1F_Script: jp EnableAutoTextBoxDrawing -CeladonMansion1TextPointers: +CeladonMansion1F_TextPointers: dw CeladonMansion1Text1 dw CeladonMansion1Text2 dw CeladonMansion1Text3 diff --git a/scripts/celadonmansion2.asm b/scripts/CeladonMansion2F.asm similarity index 68% rename from scripts/celadonmansion2.asm rename to scripts/CeladonMansion2F.asm index 520615d4..9deb606d 100755 --- a/scripts/celadonmansion2.asm +++ b/scripts/CeladonMansion2F.asm @@ -1,8 +1,8 @@ -CeladonMansion2Script: +CeladonMansion2F_Script: call EnableAutoTextBoxDrawing ret -CeladonMansion2TextPointers: +CeladonMansion2F_TextPointers: dw CeladonMansion2Text1 CeladonMansion2Text1: diff --git a/scripts/celadonmansion3.asm b/scripts/CeladonMansion3F.asm similarity index 95% rename from scripts/celadonmansion3.asm rename to scripts/CeladonMansion3F.asm index a1fe048b..43832f63 100755 --- a/scripts/celadonmansion3.asm +++ b/scripts/CeladonMansion3F.asm @@ -1,7 +1,7 @@ -CeladonMansion3Script: +CeladonMansion3F_Script: jp EnableAutoTextBoxDrawing -CeladonMansion3TextPointers: +CeladonMansion3F_TextPointers: dw ProgrammerText dw GraphicArtistText dw WriterText diff --git a/scripts/celadonmansion4.asm b/scripts/CeladonMansionRoof.asm similarity index 65% rename from scripts/celadonmansion4.asm rename to scripts/CeladonMansionRoof.asm index 80d887e9..d5028537 100755 --- a/scripts/celadonmansion4.asm +++ b/scripts/CeladonMansionRoof.asm @@ -1,7 +1,7 @@ -CeladonMansion4Script: +CeladonMansionRoof_Script: jp EnableAutoTextBoxDrawing -CeladonMansion4TextPointers: +CeladonMansionRoof_TextPointers: dw CeladonMansion4Text1 CeladonMansion4Text1: diff --git a/scripts/celadonmansion5.asm b/scripts/CeladonMansionRoofHouse.asm similarity index 74% rename from scripts/celadonmansion5.asm rename to scripts/CeladonMansionRoofHouse.asm index 197a0f54..e519d506 100755 --- a/scripts/celadonmansion5.asm +++ b/scripts/CeladonMansionRoofHouse.asm @@ -1,7 +1,7 @@ -CeladonMansion5Script: +CeladonMansionRoofHouse_Script: jp EnableAutoTextBoxDrawing -CeladonMansion5TextPointers: +CeladonMansionRoofHouse_TextPointers: dw CeladonMansion5Text1 dw CeladonMansion5Text2 @@ -14,7 +14,7 @@ CeladonMansion5Text2: lb bc, EEVEE, 25 call GivePokemon jr nc, .asm_24365 - ld a, HS_CELADON_MANSION_5_GIFT + ld a, HS_CELADON_MANSION_EEVEE_GIFT ld [wMissableObjectIndex], a predef HideObject .asm_24365 diff --git a/scripts/celadonmart1.asm b/scripts/CeladonMart1F.asm similarity index 83% rename from scripts/celadonmart1.asm rename to scripts/CeladonMart1F.asm index 0f67972b..8afd805a 100755 --- a/scripts/celadonmart1.asm +++ b/scripts/CeladonMart1F.asm @@ -1,7 +1,7 @@ -CeladonMart1Script: +CeladonMart1F_Script: jp EnableAutoTextBoxDrawing -CeladonMart1TextPointers: +CeladonMart1F_TextPointers: dw CeladonMart1Text1 dw CeladonMart1Text2 dw CeladonMart1Text3 diff --git a/scripts/celadonmart2.asm b/scripts/CeladonMart2F.asm similarity index 86% rename from scripts/celadonmart2.asm rename to scripts/CeladonMart2F.asm index c438d6e1..787c186e 100755 --- a/scripts/celadonmart2.asm +++ b/scripts/CeladonMart2F.asm @@ -1,7 +1,7 @@ -CeladonMart2Script: +CeladonMart2F_Script: jp EnableAutoTextBoxDrawing -CeladonMart2TextPointers: +CeladonMart2F_TextPointers: dw CeladonMart2Clerk1Text dw CeladonMart2Clerk2Text dw CeladonMart2Text3 diff --git a/scripts/celadonmart3.asm b/scripts/CeladonMart3F.asm similarity index 97% rename from scripts/celadonmart3.asm rename to scripts/CeladonMart3F.asm index 6af58f21..e7e216d9 100755 --- a/scripts/celadonmart3.asm +++ b/scripts/CeladonMart3F.asm @@ -1,7 +1,7 @@ -CeladonMart3Script: +CeladonMart3F_Script: jp EnableAutoTextBoxDrawing -CeladonMart3TextPointers: +CeladonMart3F_TextPointers: dw CeladonMart3Text1 dw CeladonMart3Text2 dw CeladonMart3Text3 diff --git a/scripts/celadonmart4.asm b/scripts/CeladonMart4F.asm similarity index 85% rename from scripts/celadonmart4.asm rename to scripts/CeladonMart4F.asm index 18049dc0..20f817e9 100755 --- a/scripts/celadonmart4.asm +++ b/scripts/CeladonMart4F.asm @@ -1,7 +1,7 @@ -CeladonMart4Script: +CeladonMart4F_Script: jp EnableAutoTextBoxDrawing -CeladonMart4TextPointers: +CeladonMart4F_TextPointers: dw CeladonMart4ClerkText dw CeladonMart4Text2 dw CeladonMart4Text3 diff --git a/scripts/celadonmart5.asm b/scripts/CeladonMart5F.asm similarity index 86% rename from scripts/celadonmart5.asm rename to scripts/CeladonMart5F.asm index 7b7371a7..9f52f866 100755 --- a/scripts/celadonmart5.asm +++ b/scripts/CeladonMart5F.asm @@ -1,7 +1,7 @@ -CeladonMart5Script: +CeladonMart5F_Script: jp EnableAutoTextBoxDrawing -CeladonMart5TextPointers: +CeladonMart5F_TextPointers: dw CeladonMart5Text1 dw CeladonMart5Text2 dw CeladonMart5Clerk1Text diff --git a/scripts/celadonmartelevator.asm b/scripts/CeladonMartElevator.asm similarity index 87% rename from scripts/celadonmartelevator.asm rename to scripts/CeladonMartElevator.asm index 60e5210c..34b923f9 100755 --- a/scripts/celadonmartelevator.asm +++ b/scripts/CeladonMartElevator.asm @@ -1,4 +1,4 @@ -CeladonMartElevatorScript: +CeladonMartElevator_Script: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -52,17 +52,17 @@ CeladonMartElevatorWarpMaps: ; first byte is warp number ; second byte is map number ; These specify where the player goes after getting out of the elevator. - db $05, CELADON_MART_1 - db $02, CELADON_MART_2 - db $02, CELADON_MART_3 - db $02, CELADON_MART_4 - db $02, CELADON_MART_5 + db $05, CELADON_MART_1F + db $02, CELADON_MART_2F + db $02, CELADON_MART_3F + db $02, CELADON_MART_4F + db $02, CELADON_MART_5F CeladonMartElevatorWarpMapsEnd: CeladonMartElevatorScript_48654: jpba ShakeElevator -CeladonMartElevatorTextPointers: +CeladonMartElevator_TextPointers: dw CeladonMartElevatorText1 CeladonMartElevatorText1: diff --git a/scripts/celadonmartroof.asm b/scripts/CeladonMartRoof.asm similarity index 98% rename from scripts/celadonmartroof.asm rename to scripts/CeladonMartRoof.asm index 9034e8fc..35c740b2 100755 --- a/scripts/celadonmartroof.asm +++ b/scripts/CeladonMartRoof.asm @@ -1,4 +1,4 @@ -CeladonMartRoofScript: +CeladonMartRoof_Script: jp EnableAutoTextBoxDrawing CeladonMartRoofScript_GetDrinksInBag: @@ -205,7 +205,7 @@ CeladonMartRoofScript_PrintDrinksInBag: pop hl jr .loop -CeladonMartRoofTextPointers: +CeladonMartRoof_TextPointers: dw CeladonMartRoofText1 dw CeladonMartRoofText2 dw CeladonMartRoofText5 diff --git a/scripts/celadonpokecenter.asm b/scripts/CeladonPokecenter.asm similarity index 87% rename from scripts/celadonpokecenter.asm rename to scripts/CeladonPokecenter.asm index bd91af20..b5efb7d5 100755 --- a/scripts/celadonpokecenter.asm +++ b/scripts/CeladonPokecenter.asm @@ -1,8 +1,8 @@ -CeladonPokecenterScript: +CeladonPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -CeladonPokecenterTextPointers: +CeladonPokecenter_TextPointers: dw CeladonHealNurseText dw CeladonPokecenterText2 dw CeladonPokecenterText3 diff --git a/scripts/ceruleanhouse2.asm b/scripts/CeruleanBadgeHouse.asm similarity index 97% rename from scripts/ceruleanhouse2.asm rename to scripts/CeruleanBadgeHouse.asm index e83c2194..cab2bf23 100755 --- a/scripts/ceruleanhouse2.asm +++ b/scripts/CeruleanBadgeHouse.asm @@ -1,11 +1,11 @@ -CeruleanHouse2Script: +CeruleanBadgeHouse_Script: ld a, $1 ld [wAutoTextBoxDrawingControl], a dec a ld [wDoNotWaitForButtonPressAfterDisplayingText], a ret -CeruleanHouse2TextPointers: +CeruleanBadgeHouse_TextPointers: dw CeruleanHouse2Text1 CeruleanHouse2Text1: diff --git a/scripts/unknowndungeon1.asm b/scripts/CeruleanCave1F.asm similarity index 62% rename from scripts/unknowndungeon1.asm rename to scripts/CeruleanCave1F.asm index 9d7f120e..6f5c7b13 100755 --- a/scripts/unknowndungeon1.asm +++ b/scripts/CeruleanCave1F.asm @@ -1,7 +1,7 @@ -UnknownDungeon1Script: +CeruleanCave1F_Script: jp EnableAutoTextBoxDrawing -UnknownDungeon1TextPointers: +CeruleanCave1F_TextPointers: dw PickUpItemText dw PickUpItemText dw PickUpItemText diff --git a/scripts/unknowndungeon2.asm b/scripts/CeruleanCave2F.asm similarity index 62% rename from scripts/unknowndungeon2.asm rename to scripts/CeruleanCave2F.asm index 3ed00a45..1bc8457b 100755 --- a/scripts/unknowndungeon2.asm +++ b/scripts/CeruleanCave2F.asm @@ -1,7 +1,7 @@ -UnknownDungeon2Script: +CeruleanCave2F_Script: jp EnableAutoTextBoxDrawing -UnknownDungeon2TextPointers: +CeruleanCave2F_TextPointers: dw PickUpItemText dw PickUpItemText dw PickUpItemText diff --git a/scripts/unknowndungeon3.asm b/scripts/CeruleanCaveB1F.asm similarity index 79% rename from scripts/unknowndungeon3.asm rename to scripts/CeruleanCaveB1F.asm index 78b1ab80..a570ab18 100755 --- a/scripts/unknowndungeon3.asm +++ b/scripts/CeruleanCaveB1F.asm @@ -1,18 +1,18 @@ -UnknownDungeon3Script: +CeruleanCaveB1F_Script: call EnableAutoTextBoxDrawing ld hl, MewtwoTrainerHeader - ld de, .ScriptPointers - ld a, [wUnknownDungeon3CurScript] + ld de, CeruleanCaveB1F_ScriptPointers + ld a, [wCeruleanCaveB1FCurScript] call ExecuteCurMapScriptInTable - ld [wUnknownDungeon3CurScript], a + ld [wCeruleanCaveB1FCurScript], a ret -.ScriptPointers +CeruleanCaveB1F_ScriptPointers dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -UnknownDungeon3TextPointers: +CeruleanCaveB1F_TextPointers: dw MewtwoText dw PickUpItemText dw PickUpItemText diff --git a/scripts/ceruleancity.asm b/scripts/CeruleanCity.asm similarity index 98% rename from scripts/ceruleancity.asm rename to scripts/CeruleanCity.asm index 555e75f1..117ec4da 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/CeruleanCity.asm @@ -1,6 +1,6 @@ -CeruleanCityScript: +CeruleanCity_Script: call EnableAutoTextBoxDrawing - ld hl, CeruleanCityScriptPointers + ld hl, CeruleanCity_ScriptPointers ld a, [wCeruleanCityCurScript] jp CallFunctionInTable @@ -12,7 +12,7 @@ CeruleanCityScript_1948c: ld [wMissableObjectIndex], a predef_jump HideObject -CeruleanCityScriptPointers: +CeruleanCity_ScriptPointers: dw CeruleanCityScript0 dw CeruleanCityScript1 dw CeruleanCityScript2 @@ -227,7 +227,7 @@ CeruleanCityScript3: ld [wCeruleanCityCurScript], a ret -CeruleanCityTextPointers: +CeruleanCity_TextPointers: dw CeruleanCityText1 dw CeruleanCityText2 dw CeruleanCityText3 diff --git a/scripts/ceruleancity2.asm b/scripts/CeruleanCity_2.asm similarity index 100% rename from scripts/ceruleancity2.asm rename to scripts/CeruleanCity_2.asm diff --git a/scripts/ceruleangym.asm b/scripts/CeruleanGym.asm similarity index 97% rename from scripts/ceruleangym.asm rename to scripts/CeruleanGym.asm index b82b89f6..7d152b4f 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/CeruleanGym.asm @@ -1,11 +1,11 @@ -CeruleanGymScript: +CeruleanGym_Script: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, CeruleanGymScript_5c6d0 call EnableAutoTextBoxDrawing ld hl, CeruleanGymTrainerHeader0 - ld de, CeruleanGymScriptPointers + ld de, CeruleanGym_ScriptPointers ld a, [wCeruleanGymCurScript] call ExecuteCurMapScriptInTable ld [wCeruleanGymCurScript], a @@ -29,7 +29,7 @@ CeruleanGymScript_5c6ed: ld [wCurMapScript], a ret -CeruleanGymScriptPointers: +CeruleanGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -70,7 +70,7 @@ CeruleanGymScript_5c70d: jp CeruleanGymScript_5c6ed -CeruleanGymTextPointers: +CeruleanGym_TextPointers: dw CeruleanGymText1 dw CeruleanGymText2 dw CeruleanGymText3 diff --git a/scripts/ceruleanmart.asm b/scripts/CeruleanMart.asm similarity index 81% rename from scripts/ceruleanmart.asm rename to scripts/CeruleanMart.asm index 76d83f90..f812aadd 100755 --- a/scripts/ceruleanmart.asm +++ b/scripts/CeruleanMart.asm @@ -1,7 +1,7 @@ -CeruleanMartScript: +CeruleanMart_Script: jp EnableAutoTextBoxDrawing -CeruleanMartTextPointers: +CeruleanMart_TextPointers: dw CeruleanCashierText dw CeruleanMartText2 dw CeruleanMartText3 diff --git a/scripts/ceruleanpokecenter.asm b/scripts/CeruleanPokecenter.asm similarity index 87% rename from scripts/ceruleanpokecenter.asm rename to scripts/CeruleanPokecenter.asm index b758f497..82bd04f3 100755 --- a/scripts/ceruleanpokecenter.asm +++ b/scripts/CeruleanPokecenter.asm @@ -1,8 +1,8 @@ -CeruleanPokecenterScript: +CeruleanPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -CeruleanPokecenterTextPointers: +CeruleanPokecenter_TextPointers: dw CeruleanHealNurseText dw CeruleanPokecenterText2 dw CeruleanPokecenterText3 diff --git a/scripts/ceruleanhouse1.asm b/scripts/CeruleanTradeHouse.asm similarity index 80% rename from scripts/ceruleanhouse1.asm rename to scripts/CeruleanTradeHouse.asm index 181a22c3..f80da19a 100755 --- a/scripts/ceruleanhouse1.asm +++ b/scripts/CeruleanTradeHouse.asm @@ -1,7 +1,7 @@ -CeruleanHouse1Script: +CeruleanTradeHouse_Script: jp EnableAutoTextBoxDrawing -CeruleanHouse1TextPointers: +CeruleanTradeHouse_TextPointers: dw CeruleanHouse1Text1 dw CeruleanHouse1Text2 diff --git a/scripts/ceruleanhousetrashed.asm b/scripts/CeruleanTrashedHouse.asm similarity index 91% rename from scripts/ceruleanhousetrashed.asm rename to scripts/CeruleanTrashedHouse.asm index da848b7c..f249ef01 100755 --- a/scripts/ceruleanhousetrashed.asm +++ b/scripts/CeruleanTrashedHouse.asm @@ -1,8 +1,8 @@ -CeruleanHouseTrashedScript: +CeruleanTrashedHouse_Script: call EnableAutoTextBoxDrawing ret -CeruleanHouseTrashedTextPointers: +CeruleanTrashedHouse_TextPointers: dw CeruleanHouseTrashedText1 dw CeruleanHouseTrashedText2 dw CeruleanHouseTrashedText3 diff --git a/scripts/gary.asm b/scripts/ChampionsRoom.asm similarity index 89% rename from scripts/gary.asm rename to scripts/ChampionsRoom.asm index 1fe65fb0..e3cdc6d2 100755 --- a/scripts/gary.asm +++ b/scripts/ChampionsRoom.asm @@ -1,16 +1,16 @@ -GaryScript: +ChampionsRoom_Script: call EnableAutoTextBoxDrawing - ld hl, GaryScriptPointers - ld a, [wGaryCurScript] + ld hl, ChampionsRoom_ScriptPointers + ld a, [wChampionsRoomCurScript] jp CallFunctionInTable ResetGaryScript: xor a ld [wJoyIgnore], a - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret -GaryScriptPointers: +ChampionsRoom_ScriptPointers: dw GaryScript0 dw GaryScript1 dw GaryScript2 @@ -36,7 +36,7 @@ GaryScript1: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $2 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryEntrance_RLEMovement: @@ -86,7 +86,7 @@ GaryScript2: xor a ld [hJoyHeld], a ld a, $3 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript3: @@ -104,7 +104,7 @@ GaryScript3: ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld a, $4 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript4: @@ -123,7 +123,7 @@ GaryScript4: ld [wMissableObjectIndex], a predef ShowObject ld a, $5 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret OakEntranceAfterVictoryMovement: @@ -154,7 +154,7 @@ GaryScript5: ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $6 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript6: @@ -167,7 +167,7 @@ GaryScript6: ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $7 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript7: @@ -184,7 +184,7 @@ GaryScript7: ld [H_SPRITEINDEX], a call MoveSprite ld a, $8 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret OakExitGaryRoomMovement: @@ -200,7 +200,7 @@ GaryScript8: ld [wMissableObjectIndex], a predef HideObject ld a, $9 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript9: @@ -213,7 +213,7 @@ GaryScript9: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $a - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret WalkToHallOfFame_RLEMovment: @@ -228,7 +228,7 @@ GaryScript10: xor a ld [wJoyIgnore], a ld a, $0 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript_760c8: @@ -239,7 +239,7 @@ GaryScript_760c8: ld [wJoyIgnore], a ret -GaryTextPointers: +ChampionsRoom_TextPointers: dw GaryText1 dw GaryText2 dw GaryText3 diff --git a/scripts/cinnabargym.asm b/scripts/CinnabarGym.asm similarity index 98% rename from scripts/cinnabargym.asm rename to scripts/CinnabarGym.asm index 8af7bbd3..295bd63d 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/CinnabarGym.asm @@ -1,7 +1,7 @@ -CinnabarGymScript: +CinnabarGym_Script: call CinnabarGymScript_75759 call EnableAutoTextBoxDrawing - ld hl, CinnabarGymScriptPointers + ld hl, CinnabarGym_ScriptPointers ld a, [wCinnabarGymCurScript] jp CallFunctionInTable @@ -40,7 +40,7 @@ CinnabarGymScript_757a0: ld [wTrainerHeaderFlagBit], a ret -CinnabarGymScriptPointers: +CinnabarGym_ScriptPointers: dw CinnabarGymScript0 dw CinnabarGymScript1 dw CinnabarGymScript2 @@ -170,7 +170,7 @@ CinnabarGymScript3_75857: jp CinnabarGymScript_75792 -CinnabarGymTextPointers: +CinnabarGym_TextPointers: dw CinnabarGymText1 dw CinnabarGymText2 dw CinnabarGymText3 diff --git a/scripts/cinnabarisland.asm b/scripts/CinnabarIsland.asm similarity index 92% rename from scripts/cinnabarisland.asm rename to scripts/CinnabarIsland.asm index 8549042f..b6346a9c 100755 --- a/scripts/cinnabarisland.asm +++ b/scripts/CinnabarIsland.asm @@ -1,14 +1,14 @@ -CinnabarIslandScript: +CinnabarIsland_Script: call EnableAutoTextBoxDrawing ld hl, wCurrentMapScriptFlags set 5, [hl] ResetEvent EVENT_MANSION_SWITCH_ON ResetEvent EVENT_LAB_STILL_REVIVING_FOSSIL - ld hl, CinnabarIslandScriptPointers + ld hl, CinnabarIsland_ScriptPointers ld a, [wCinnabarIslandCurScript] jp CallFunctionInTable -CinnabarIslandScriptPointers: +CinnabarIsland_ScriptPointers: dw CinnabarIslandScript0 dw CinnabarIslandScript1 @@ -50,7 +50,7 @@ CinnabarIslandScript1: ld [wCinnabarIslandCurScript], a ret -CinnabarIslandTextPointers: +CinnabarIsland_TextPointers: dw CinnabarIslandText1 dw CinnabarIslandText2 dw CinnabarIslandText3 diff --git a/scripts/lab1.asm b/scripts/CinnabarLab.asm similarity index 86% rename from scripts/lab1.asm rename to scripts/CinnabarLab.asm index 5b08f4f2..aab3324b 100755 --- a/scripts/lab1.asm +++ b/scripts/CinnabarLab.asm @@ -1,8 +1,8 @@ -Lab1Script: +CinnabarLab_Script: call EnableAutoTextBoxDrawing ret -Lab1TextPointers: +CinnabarLab_TextPointers: dw Lab1Text1 dw Lab1Text2 dw Lab1Text3 diff --git a/scripts/lab4.asm b/scripts/CinnabarLabFossilRoom.asm similarity index 96% rename from scripts/lab4.asm rename to scripts/CinnabarLabFossilRoom.asm index 7d0db339..f5f03a19 100755 --- a/scripts/lab4.asm +++ b/scripts/CinnabarLabFossilRoom.asm @@ -1,7 +1,7 @@ -Lab4Script: +CinnabarLabFossilRoom_Script: jp EnableAutoTextBoxDrawing -Lab4TextPointers: +CinnabarLabFossilRoom_TextPointers: dw Lab4Text1 dw Lab4Text2 diff --git a/scripts/lab3.asm b/scripts/CinnabarLabMetronomeRoom.asm similarity index 92% rename from scripts/lab3.asm rename to scripts/CinnabarLabMetronomeRoom.asm index b533d162..6eddceae 100755 --- a/scripts/lab3.asm +++ b/scripts/CinnabarLabMetronomeRoom.asm @@ -1,7 +1,7 @@ -Lab3Script: +CinnabarLabMetronomeRoom_Script: jp EnableAutoTextBoxDrawing -Lab3TextPointers: +CinnabarLabMetronomeRoom_TextPointers: dw Lab3Text1 dw Lab3Text2 dw Lab3Text3 diff --git a/scripts/lab2.asm b/scripts/CinnabarLabTradeRoom.asm similarity index 81% rename from scripts/lab2.asm rename to scripts/CinnabarLabTradeRoom.asm index ed9ef1b4..6093ae14 100755 --- a/scripts/lab2.asm +++ b/scripts/CinnabarLabTradeRoom.asm @@ -1,7 +1,7 @@ -Lab2Script: +CinnabarLabTradeRoom_Script: jp EnableAutoTextBoxDrawing -Lab2TextPointers: +CinnabarLabTradeRoom_TextPointers: dw Lab2Text1 dw Lab2Text2 dw Lab2Text3 diff --git a/scripts/cinnabarmart.asm b/scripts/CinnabarMart.asm similarity index 81% rename from scripts/cinnabarmart.asm rename to scripts/CinnabarMart.asm index 55b82cf0..898948c7 100755 --- a/scripts/cinnabarmart.asm +++ b/scripts/CinnabarMart.asm @@ -1,7 +1,7 @@ -CinnabarMartScript: +CinnabarMart_Script: jp EnableAutoTextBoxDrawing -CinnabarMartTextPointers: +CinnabarMart_TextPointers: dw CinnabarCashierText dw CinnabarMartText2 dw CinnabarMartText3 diff --git a/scripts/cinnabarpokecenter.asm b/scripts/CinnabarPokecenter.asm similarity index 87% rename from scripts/cinnabarpokecenter.asm rename to scripts/CinnabarPokecenter.asm index 2f6d5791..a6184bb0 100755 --- a/scripts/cinnabarpokecenter.asm +++ b/scripts/CinnabarPokecenter.asm @@ -1,8 +1,8 @@ -CinnabarPokecenterScript: +CinnabarPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -CinnabarPokecenterTextPointers: +CinnabarPokecenter_TextPointers: dw CinnabarHealNurseText dw CinnabarPokecenterText2 dw CinnabarPokecenterText3 diff --git a/scripts/colosseum.asm b/scripts/Colosseum.asm similarity index 51% rename from scripts/colosseum.asm rename to scripts/Colosseum.asm index bdfa3c44..8cc6b056 100755 --- a/scripts/colosseum.asm +++ b/scripts/Colosseum.asm @@ -1,7 +1,7 @@ -ColosseumScript: - jp TradeCenterScript +Colosseum_Script: + jp TradeCenter_Script -ColosseumTextPointers: +Colosseum_TextPointers: dw ColosseumText1 ColosseumText1: diff --git a/scripts/copycatshouse1f.asm b/scripts/CopycatsHouse1F.asm similarity index 86% rename from scripts/copycatshouse1f.asm rename to scripts/CopycatsHouse1F.asm index 25cd0fc2..a86625fc 100755 --- a/scripts/copycatshouse1f.asm +++ b/scripts/CopycatsHouse1F.asm @@ -1,7 +1,7 @@ -CopycatsHouse1FScript: +CopycatsHouse1F_Script: jp EnableAutoTextBoxDrawing -CopycatsHouse1FTextPointers: +CopycatsHouse1F_TextPointers: dw CopycatsHouse1FText1 dw CopycatsHouse1FText2 dw CopycatsHouse1FText3 diff --git a/scripts/copycatshouse2f.asm b/scripts/CopycatsHouse2F.asm similarity index 97% rename from scripts/copycatshouse2f.asm rename to scripts/CopycatsHouse2F.asm index 87946b8f..b43234c3 100755 --- a/scripts/copycatshouse2f.asm +++ b/scripts/CopycatsHouse2F.asm @@ -1,7 +1,7 @@ -CopycatsHouse2FScript: +CopycatsHouse2F_Script: jp EnableAutoTextBoxDrawing -CopycatsHouse2FTextPointers: +CopycatsHouse2F_TextPointers: dw CopycatsHouse2FText1 dw CopycatsHouse2FText2 dw CopycatsHouse2FText3 diff --git a/scripts/daycarem.asm b/scripts/Daycare.asm similarity index 99% rename from scripts/daycarem.asm rename to scripts/Daycare.asm index 60daa3d5..81cf5534 100755 --- a/scripts/daycarem.asm +++ b/scripts/Daycare.asm @@ -1,7 +1,7 @@ -DayCareMScript: +Daycare_Script: jp EnableAutoTextBoxDrawing -DayCareMTextPointers: +Daycare_TextPointers: dw DayCareMText1 DayCareMText1: diff --git a/scripts/DiglettsCave.asm b/scripts/DiglettsCave.asm new file mode 100755 index 00000000..1d7b23f9 --- /dev/null +++ b/scripts/DiglettsCave.asm @@ -0,0 +1,5 @@ +DiglettsCave_Script: + jp EnableAutoTextBoxDrawing + +DiglettsCave_TextPointers: + db "@" diff --git a/scripts/diglettscaveroute11.asm b/scripts/DiglettsCaveRoute11.asm similarity index 71% rename from scripts/diglettscaveroute11.asm rename to scripts/DiglettsCaveRoute11.asm index d97a8446..54c3112e 100755 --- a/scripts/diglettscaveroute11.asm +++ b/scripts/DiglettsCaveRoute11.asm @@ -1,10 +1,10 @@ -DiglettsCaveEntranceRoute11Script: +DiglettsCaveRoute11_Script: call EnableAutoTextBoxDrawing ld a, ROUTE_11 ld [wLastMap], a ret -DiglettsCaveEntranceRoute11TextPointers: +DiglettsCaveRoute11_TextPointers: dw DiglettsCaveEntranceRoute11Text1 DiglettsCaveEntranceRoute11Text1: diff --git a/scripts/diglettscaveroute2.asm b/scripts/DiglettsCaveRoute2.asm similarity index 72% rename from scripts/diglettscaveroute2.asm rename to scripts/DiglettsCaveRoute2.asm index 9f061daa..5fe7777c 100755 --- a/scripts/diglettscaveroute2.asm +++ b/scripts/DiglettsCaveRoute2.asm @@ -1,9 +1,9 @@ -DiglettsCaveRoute2Script: +DiglettsCaveRoute2_Script: ld a, ROUTE_2 ld [wLastMap], a jp EnableAutoTextBoxDrawing -DiglettsCaveRoute2TextPointers: +DiglettsCaveRoute2_TextPointers: dw DiglettsCaveRoute2Text1 DiglettsCaveRoute2Text1: diff --git a/scripts/fightingdojo.asm b/scripts/FightingDojo.asm similarity index 98% rename from scripts/fightingdojo.asm rename to scripts/FightingDojo.asm index 5c7704f5..fc691dba 100755 --- a/scripts/fightingdojo.asm +++ b/scripts/FightingDojo.asm @@ -1,7 +1,7 @@ -FightingDojoScript: +FightingDojo_Script: call EnableAutoTextBoxDrawing ld hl, FightingDojoTrainerHeader0 - ld de, FightingDojoScriptPointers + ld de, FightingDojo_ScriptPointers ld a, [wFightingDojoCurScript] call ExecuteCurMapScriptInTable ld [wFightingDojoCurScript], a @@ -14,7 +14,7 @@ FightingDojoScript_5cd70: ld [wCurMapScript], a ret -FightingDojoScriptPointers: +FightingDojo_ScriptPointers: dw FightingDojoScript1 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -80,7 +80,7 @@ FightingDojoScript3: ld [wCurMapScript], a ret -FightingDojoTextPointers: +FightingDojo_TextPointers: dw FightingDojoText1 dw FightingDojoText2 dw FightingDojoText3 diff --git a/scripts/fuchsiahouse1.asm b/scripts/FuchsiaBillsGrandpasHouse.asm similarity index 78% rename from scripts/fuchsiahouse1.asm rename to scripts/FuchsiaBillsGrandpasHouse.asm index 95e59503..ca5f2c16 100755 --- a/scripts/fuchsiahouse1.asm +++ b/scripts/FuchsiaBillsGrandpasHouse.asm @@ -1,8 +1,8 @@ -FuchsiaHouse1Script: +FuchsiaBillsGrandpasHouse_Script: call EnableAutoTextBoxDrawing ret -FuchsiaHouse1TextPointers: +FuchsiaBillsGrandpasHouse_TextPointers: dw FuchsiaHouse1Text1 dw FuchsiaHouse1Text2 dw FuchsiaHouse1Text3 diff --git a/scripts/fuchsiacity.asm b/scripts/FuchsiaCity.asm similarity index 98% rename from scripts/fuchsiacity.asm rename to scripts/FuchsiaCity.asm index 74d7ee30..d3f0ce32 100755 --- a/scripts/fuchsiacity.asm +++ b/scripts/FuchsiaCity.asm @@ -1,7 +1,7 @@ -FuchsiaCityScript: +FuchsiaCity_Script: jp EnableAutoTextBoxDrawing -FuchsiaCityTextPointers: +FuchsiaCity_TextPointers: dw FuchsiaCityText1 dw FuchsiaCityText2 dw FuchsiaCityText3 diff --git a/scripts/fuchsiahouse3.asm b/scripts/FuchsiaGoodRodHouse.asm similarity index 94% rename from scripts/fuchsiahouse3.asm rename to scripts/FuchsiaGoodRodHouse.asm index 586d62f5..93a20e80 100755 --- a/scripts/fuchsiahouse3.asm +++ b/scripts/FuchsiaGoodRodHouse.asm @@ -1,7 +1,7 @@ -FuchsiaHouse3Script: +FuchsiaGoodRodHouse_Script: jp EnableAutoTextBoxDrawing -FuchsiaHouse3TextPointers: +FuchsiaGoodRodHouse_TextPointers: dw FuchsiaHouse3Text1 FuchsiaHouse3Text1: diff --git a/scripts/fuchsiagym.asm b/scripts/FuchsiaGym.asm similarity index 98% rename from scripts/fuchsiagym.asm rename to scripts/FuchsiaGym.asm index 3628ebc0..c856c93b 100755 --- a/scripts/fuchsiagym.asm +++ b/scripts/FuchsiaGym.asm @@ -1,8 +1,8 @@ -FuchsiaGymScript: +FuchsiaGym_Script: call FuchsiaGymScript_75453 call EnableAutoTextBoxDrawing ld hl, FuchsiaGymTrainerHeader0 - ld de, FuchsiaGymScriptPointers + ld de, FuchsiaGym_ScriptPointers ld a, [wFuchsiaGymCurScript] call ExecuteCurMapScriptInTable ld [wFuchsiaGymCurScript], a @@ -30,7 +30,7 @@ FuchsiaGymScript_75477: ld [wCurMapScript], a ret -FuchsiaGymScriptPointers: +FuchsiaGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -70,7 +70,7 @@ FuchsiaGymScript3_75497: jp FuchsiaGymScript_75477 -FuchsiaGymTextPointers: +FuchsiaGym_TextPointers: dw FuchsiaGymText1 dw FuchsiaGymText2 dw FuchsiaGymText3 diff --git a/scripts/fuchsiamart.asm b/scripts/FuchsiaMart.asm similarity index 81% rename from scripts/fuchsiamart.asm rename to scripts/FuchsiaMart.asm index 96df9290..f17cac49 100755 --- a/scripts/fuchsiamart.asm +++ b/scripts/FuchsiaMart.asm @@ -1,7 +1,7 @@ -FuchsiaMartScript: +FuchsiaMart_Script: jp EnableAutoTextBoxDrawing -FuchsiaMartTextPointers: +FuchsiaMart_TextPointers: dw FuchsiaCashierText dw FuchsiaMartText2 dw FuchsiaMartText3 diff --git a/scripts/fuchsiameetingroom.asm b/scripts/FuchsiaMeetingRoom.asm similarity index 84% rename from scripts/fuchsiameetingroom.asm rename to scripts/FuchsiaMeetingRoom.asm index 7995a49b..95ac12fa 100755 --- a/scripts/fuchsiameetingroom.asm +++ b/scripts/FuchsiaMeetingRoom.asm @@ -1,8 +1,8 @@ -FuchsiaMeetingRoomScript: +FuchsiaMeetingRoom_Script: call EnableAutoTextBoxDrawing ret -FuchsiaMeetingRoomTextPointers: +FuchsiaMeetingRoom_TextPointers: dw FuchsiaMeetingRoomText1 dw FuchsiaMeetingRoomText2 dw FuchsiaMeetingRoomText3 diff --git a/scripts/fuchsiapokecenter.asm b/scripts/FuchsiaPokecenter.asm similarity index 87% rename from scripts/fuchsiapokecenter.asm rename to scripts/FuchsiaPokecenter.asm index a6111e84..182ec8c3 100755 --- a/scripts/fuchsiapokecenter.asm +++ b/scripts/FuchsiaPokecenter.asm @@ -1,8 +1,8 @@ -FuchsiaPokecenterScript: +FuchsiaPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -FuchsiaPokecenterTextPointers: +FuchsiaPokecenter_TextPointers: dw FuchsiaHealNurseText dw FuchsiaPokecenterText2 dw FuchsiaPokecenterText3 diff --git a/scripts/celadongamecorner.asm b/scripts/GameCorner.asm similarity index 96% rename from scripts/celadongamecorner.asm rename to scripts/GameCorner.asm index cc81b076..265508e0 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/GameCorner.asm @@ -1,9 +1,9 @@ -CeladonGameCornerScript: +GameCorner_Script: call CeladonGameCornerScript_48bcf call CeladonGameCornerScript_48bec call EnableAutoTextBoxDrawing - ld hl, CeladonGameCornerScriptPointers - ld a, [wCeladonGameCornerCurScript] + ld hl, GameCorner_ScriptPointers + ld a, [wGameCornerCurScript] jp CallFunctionInTable CeladonGameCornerScript_48bcf: @@ -38,11 +38,11 @@ CeladonGameCornerScript_48bec: CeladonGameCornerScript_48c07: xor a ld [wJoyIgnore], a - ld [wCeladonGameCornerCurScript], a + ld [wGameCornerCurScript], a ld [wCurMapScript], a ret -CeladonGameCornerScriptPointers: +GameCorner_ScriptPointers: dw CeladonGameCornerScript0 dw CeladonGameCornerScript1 dw CeladonGameCornerScript2 @@ -78,7 +78,7 @@ CeladonGameCornerScript1: ld [H_SPRITEINDEX], a call MoveSprite ld a, $2 - ld [wCeladonGameCornerCurScript], a + ld [wGameCornerCurScript], a ret MovementData_48c5a: @@ -113,10 +113,10 @@ CeladonGameCornerScript2: set 5, [hl] set 6, [hl] ld a, $0 - ld [wCeladonGameCornerCurScript], a + ld [wGameCornerCurScript], a ret -CeladonGameCornerTextPointers: +GameCorner_TextPointers: dw CeladonGameCornerText1 dw CeladonGameCornerText2 dw CeladonGameCornerText3 @@ -427,7 +427,7 @@ CeladonGameCornerText11: ld [hJoyPressed], a ld [hJoyReleased], a ld a, $1 - ld [wCeladonGameCornerCurScript], a + ld [wGameCornerCurScript], a jp TextScriptEnd CeladonGameCornerText_48ece: diff --git a/scripts/celadonprizeroom.asm b/scripts/GameCornerPrizeRoom.asm similarity index 84% rename from scripts/celadonprizeroom.asm rename to scripts/GameCornerPrizeRoom.asm index a07ce162..e6cf6f0d 100755 --- a/scripts/celadonprizeroom.asm +++ b/scripts/GameCornerPrizeRoom.asm @@ -1,7 +1,7 @@ -CeladonPrizeRoomScript: +GameCornerPrizeRoom_Script: jp EnableAutoTextBoxDrawing -CeladonPrizeRoomTextPointers: +GameCornerPrizeRoom_TextPointers: dw CeladonPrizeRoomText1 dw CeladonPrizeRoomText2 dw CeladonPrizeRoomText3 diff --git a/scripts/halloffameroom.asm b/scripts/HallOfFame.asm similarity index 78% rename from scripts/halloffameroom.asm rename to scripts/HallOfFame.asm index 94e64431..511c9754 100755 --- a/scripts/halloffameroom.asm +++ b/scripts/HallOfFame.asm @@ -1,16 +1,16 @@ -HallofFameRoomScript: +HallOfFame_Script: call EnableAutoTextBoxDrawing - ld hl, HallofFameRoomScriptPointers - ld a, [wHallOfFameRoomCurScript] + ld hl, HallOfFame_ScriptPointers + ld a, [wHallOfFameCurScript] jp CallFunctionInTable HallofFameRoomScript_5a4aa: xor a ld [wJoyIgnore], a - ld [wHallOfFameRoomCurScript], a + ld [wHallOfFameCurScript], a ret -HallofFameRoomScriptPointers: +HallOfFame_ScriptPointers: dw HallofFameRoomScript0 dw HallofFameRoomScript1 dw HallofFameRoomScript2 @@ -33,16 +33,16 @@ HallofFameRoomScript2: inc hl set 0, [hl] xor a - ld hl, wLoreleiCurScript - ld [hli], a - ld [hli], a - ld [hl], a - ld [wLanceCurScript], a - ld [wHallOfFameRoomCurScript], a + ld hl, wLoreleisRoomCurScript + ld [hli], a ; wLoreleisRoomCurScript + ld [hli], a ; wBrunosRoomCurScript + ld [hl], a ; wAgathasRoomCurScript + ld [wLancesRoomCurScript], a + ld [wHallOfFameCurScript], a ; Elite 4 events ResetEventRange ELITE4_EVENTS_START, ELITE4_CHAMPION_EVENTS_END, 1 xor a - ld [wHallOfFameRoomCurScript], a + ld [wHallOfFameCurScript], a ld a, PALLET_TOWN ld [wLastBlackoutMap], a callba SaveSAVtoSRAM @@ -65,7 +65,7 @@ HallofFameRoomScript0: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $1 - ld [wHallOfFameRoomCurScript], a + ld [wHallOfFameCurScript], a ret RLEMovement5a528: @@ -98,10 +98,10 @@ HallofFameRoomScript1: ld [wMissableObjectIndex], a predef HideObject ld a, $2 - ld [wHallOfFameRoomCurScript], a + ld [wHallOfFameCurScript], a ret -HallofFameRoomTextPointers: +HallOfFame_TextPointers: dw HallofFameRoomText1 HallofFameRoomText1: diff --git a/scripts/IndigoPlateau.asm b/scripts/IndigoPlateau.asm new file mode 100755 index 00000000..86f38b2a --- /dev/null +++ b/scripts/IndigoPlateau.asm @@ -0,0 +1,4 @@ +IndigoPlateau_Script: + ret + +IndigoPlateau_TextPointers: diff --git a/scripts/indigoplateaulobby.asm b/scripts/IndigoPlateauLobby.asm similarity index 92% rename from scripts/indigoplateaulobby.asm rename to scripts/IndigoPlateauLobby.asm index c26f6f0c..f83c0ba4 100755 --- a/scripts/indigoplateaulobby.asm +++ b/scripts/IndigoPlateauLobby.asm @@ -1,4 +1,4 @@ -IndigoPlateauLobbyScript: +IndigoPlateauLobby_Script: call Serial_TryEstablishingExternallyClockedConnection call EnableAutoTextBoxDrawing ld hl, wCurrentMapScriptFlags @@ -14,7 +14,7 @@ IndigoPlateauLobbyScript: ResetEventRange ELITE4_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR ret -IndigoPlateauLobbyTextPointers: +IndigoPlateauLobby_TextPointers: dw IndigoHealNurseText dw IndigoPlateauLobbyText2 dw IndigoPlateauLobbyText3 diff --git a/scripts/lance.asm b/scripts/LancesRoom.asm similarity index 91% rename from scripts/lance.asm rename to scripts/LancesRoom.asm index a0b0e6e7..5e19ea7d 100755 --- a/scripts/lance.asm +++ b/scripts/LancesRoom.asm @@ -1,11 +1,11 @@ -LanceScript: +LancesRoom_Script: call LanceShowOrHideEntranceBlocks call EnableAutoTextBoxDrawing ld hl, LanceTrainerHeader0 - ld de, LanceScriptPointers - ld a, [wLanceCurScript] + ld de, LancesRoom_ScriptPointers + ld a, [wLancesRoomCurScript] call ExecuteCurMapScriptInTable - ld [wLanceCurScript], a + ld [wLancesRoomCurScript], a ret LanceShowOrHideEntranceBlocks: @@ -39,10 +39,10 @@ LanceSetEntranceBlock: ResetLanceScript: xor a - ld [wLanceCurScript], a + ld [wLancesRoomCurScript], a ret -LanceScriptPointers: +LancesRoom_ScriptPointers: dw LanceScript0 dw DisplayEnemyTrainerTextAndStartBattle dw LanceScript2 @@ -105,7 +105,7 @@ WalkToLance: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [wLanceCurScript], a + ld [wLancesRoomCurScript], a ld [wCurMapScript], a ret @@ -123,11 +123,11 @@ LanceScript3: call Delay3 xor a ld [wJoyIgnore], a - ld [wLanceCurScript], a + ld [wLancesRoomCurScript], a ld [wCurMapScript], a ret -LanceTextPointers: +LancesRoom_TextPointers: dw LanceText1 LanceTrainerHeader0: diff --git a/scripts/lavenderhouse2.asm b/scripts/LavenderCuboneHouse.asm similarity index 90% rename from scripts/lavenderhouse2.asm rename to scripts/LavenderCuboneHouse.asm index b531c047..ff5aa732 100755 --- a/scripts/lavenderhouse2.asm +++ b/scripts/LavenderCuboneHouse.asm @@ -1,8 +1,8 @@ -LavenderHouse2Script: +LavenderCuboneHouse_Script: call EnableAutoTextBoxDrawing ret -LavenderHouse2TextPointers: +LavenderCuboneHouse_TextPointers: dw LavenderHouse2Text1 dw LavenderHouse2Text2 diff --git a/scripts/lavendermart.asm b/scripts/LavenderMart.asm similarity index 90% rename from scripts/lavendermart.asm rename to scripts/LavenderMart.asm index 51b64992..47330e5d 100755 --- a/scripts/lavendermart.asm +++ b/scripts/LavenderMart.asm @@ -1,7 +1,7 @@ -LavenderMartScript: +LavenderMart_Script: jp EnableAutoTextBoxDrawing -LavenderMartTextPointers: +LavenderMart_TextPointers: dw LavenderCashierText dw LavenderMartText2 dw LavenderMartText3 diff --git a/scripts/lavenderpokecenter.asm b/scripts/LavenderPokecenter.asm similarity index 87% rename from scripts/lavenderpokecenter.asm rename to scripts/LavenderPokecenter.asm index 61d0b887..10482fef 100755 --- a/scripts/lavenderpokecenter.asm +++ b/scripts/LavenderPokecenter.asm @@ -1,8 +1,8 @@ -LavenderPokecenterScript: +LavenderPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -LavenderPokecenterTextPointers: +LavenderPokecenter_TextPointers: dw LavenderHealNurseText dw LavenderPokecenterText2 dw LavenderPokecenterText3 diff --git a/scripts/lavendertown.asm b/scripts/LavenderTown.asm similarity index 95% rename from scripts/lavendertown.asm rename to scripts/LavenderTown.asm index daf490b1..c23996e9 100755 --- a/scripts/lavendertown.asm +++ b/scripts/LavenderTown.asm @@ -1,7 +1,7 @@ -LavenderTownScript: +LavenderTown_Script: jp EnableAutoTextBoxDrawing -LavenderTownTextPointers: +LavenderTown_TextPointers: dw LavenderTownText1 dw LavenderTownText2 dw LavenderTownText3 diff --git a/scripts/lorelei.asm b/scripts/LoreleisRoom.asm similarity index 90% rename from scripts/lorelei.asm rename to scripts/LoreleisRoom.asm index ec29847a..81142377 100755 --- a/scripts/lorelei.asm +++ b/scripts/LoreleisRoom.asm @@ -1,11 +1,11 @@ -LoreleiScript: +LoreleisRoom_Script: call LoreleiShowOrHideExitBlock call EnableAutoTextBoxDrawing ld hl, LoreleiTrainerHeader0 - ld de, LoreleiScriptPointers - ld a, [wLoreleiCurScript] + ld de, LoreleisRoom_ScriptPointers + ld a, [wLoreleisRoomCurScript] call ExecuteCurMapScriptInTable - ld [wLoreleiCurScript], a + ld [wLoreleisRoomCurScript], a ret LoreleiShowOrHideExitBlock: @@ -29,10 +29,10 @@ LoreleiShowOrHideExitBlock: ResetLoreleiScript: xor a - ld [wLoreleiCurScript], a + ld [wLoreleisRoomCurScript], a ret -LoreleiScriptPointers: +LoreleisRoom_ScriptPointers: dw LoreleiScript0 dw DisplayEnemyTrainerTextAndStartBattle dw LoreleiScript2 @@ -56,7 +56,7 @@ LoreleiScriptWalkIntoRoom: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [wLoreleiCurScript], a + ld [wLoreleisRoomCurScript], a ld [wCurMapScript], a ret @@ -84,7 +84,7 @@ LoreleiScript0: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [wLoreleiCurScript], a + ld [wLoreleisRoomCurScript], a ld [wCurMapScript], a ret @@ -102,7 +102,7 @@ LoreleiScript3: call Delay3 xor a ld [wJoyIgnore], a - ld [wLoreleiCurScript], a + ld [wLoreleisRoomCurScript], a ld [wCurMapScript], a ret @@ -115,7 +115,7 @@ LoreleiScript2: ld [hSpriteIndexOrTextID], a jp DisplayTextID -LoreleiTextPointers: +LoreleisRoom_TextPointers: dw LoreleiText1 dw LoreleiDontRunAwayText diff --git a/scripts/lavenderhouse1.asm b/scripts/MrFujisHouse.asm similarity index 97% rename from scripts/lavenderhouse1.asm rename to scripts/MrFujisHouse.asm index 91b9286b..98190cd8 100755 --- a/scripts/lavenderhouse1.asm +++ b/scripts/MrFujisHouse.asm @@ -1,8 +1,8 @@ -LavenderHouse1Script: +MrFujisHouse_Script: call EnableAutoTextBoxDrawing ret -LavenderHouse1TextPointers: +MrFujisHouse_TextPointers: dw LavenderHouse1Text1 dw LavenderHouse1Text2 dw LavenderHouse1Text3 diff --git a/scripts/saffronhouse2.asm b/scripts/MrPsychicsHouse.asm similarity index 92% rename from scripts/saffronhouse2.asm rename to scripts/MrPsychicsHouse.asm index 10c3d29e..7d4f54c0 100755 --- a/scripts/saffronhouse2.asm +++ b/scripts/MrPsychicsHouse.asm @@ -1,7 +1,7 @@ -SaffronHouse2Script: +MrPsychicsHouse_Script: jp EnableAutoTextBoxDrawing -SaffronHouse2TextPointers: +MrPsychicsHouse_TextPointers: dw SaffronHouse2Text1 SaffronHouse2Text1: diff --git a/scripts/mtmoon1.asm b/scripts/MtMoon1F.asm similarity index 96% rename from scripts/mtmoon1.asm rename to scripts/MtMoon1F.asm index 5ee3d025..b05b3f60 100755 --- a/scripts/mtmoon1.asm +++ b/scripts/MtMoon1F.asm @@ -1,18 +1,18 @@ -MtMoon1Script: +MtMoon1F_Script: call EnableAutoTextBoxDrawing ld hl, MtMoon1TrainerHeader0 - ld de, MtMoon1ScriptPointers - ld a, [wMtMoon1CurScript] + ld de, MtMoon1F_ScriptPointers + ld a, [wMtMoon1FCurScript] call ExecuteCurMapScriptInTable - ld [wMtMoon1CurScript], a + ld [wMtMoon1FCurScript], a ret -MtMoon1ScriptPointers: +MtMoon1F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -MtMoon1TextPointers: +MtMoon1F_TextPointers: dw MtMoon1Text1 dw MtMoon1Text2 dw MtMoon1Text3 diff --git a/scripts/mtmoon2.asm b/scripts/MtMoonB1F.asm similarity index 69% rename from scripts/mtmoon2.asm rename to scripts/MtMoonB1F.asm index 6d1e5339..779812c3 100755 --- a/scripts/mtmoon2.asm +++ b/scripts/MtMoonB1F.asm @@ -1,8 +1,8 @@ -MtMoon2Script: +MtMoonB1F_Script: call EnableAutoTextBoxDrawing ret -MtMoon2TextPointers: +MtMoonB1F_TextPointers: dw MtMoonText1 MtMoonText1: diff --git a/scripts/mtmoon3.asm b/scripts/MtMoonB2F.asm similarity index 93% rename from scripts/mtmoon3.asm rename to scripts/MtMoonB2F.asm index 60cd1ab8..863d9d22 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/MtMoonB2F.asm @@ -1,10 +1,10 @@ -MtMoon3Script: +MtMoonB2F_Script: call EnableAutoTextBoxDrawing ld hl, MtMoon3TrainerHeader0 - ld de, MtMoon3ScriptPointers - ld a, [wMtMoon3CurScript] + ld de, MtMoonB2F_ScriptPointers + ld a, [wMtMoonB2FCurScript] call ExecuteCurMapScriptInTable - ld [wMtMoon3CurScript], a + ld [wMtMoonB2FCurScript], a CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD ret z ld hl, CoordsData_49d37 @@ -40,11 +40,11 @@ CoordsData_49d37: MtMoon3Script_49d58: xor a ld [wJoyIgnore], a - ld [wMtMoon3CurScript], a + ld [wMtMoonB2FCurScript], a ld [wCurMapScript], a ret -MtMoon3ScriptPointers: +MtMoonB2F_ScriptPointers: dw MtMoon3Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -82,7 +82,7 @@ MtMoon3Script3: xor a ld [wJoyIgnore], a ld a, $0 - ld [wMtMoon3CurScript], a + ld [wMtMoonB2FCurScript], a ld [wCurMapScript], a ret @@ -105,7 +105,7 @@ MtMoon3Script4: ld [H_SPRITEINDEX], a call MoveSprite ld a, $5 - ld [wMtMoon3CurScript], a + ld [wMtMoonB2FCurScript], a ld [wCurMapScript], a ret @@ -140,21 +140,21 @@ MtMoon3Script5: call DisplayTextID CheckEvent EVENT_GOT_DOME_FOSSIL jr z, .asm_49e1d - ld a, HS_MT_MOON_3_FOSSIL_2 + ld a, HS_MT_MOON_B2F_FOSSIL_2 jr .asm_49e1f .asm_49e1d - ld a, HS_MT_MOON_3_FOSSIL_1 + ld a, HS_MT_MOON_B2F_FOSSIL_1 .asm_49e1f ld [wMissableObjectIndex], a predef HideObject xor a ld [wJoyIgnore], a ld a, $0 - ld [wMtMoon3CurScript], a + ld [wMtMoonB2FCurScript], a ld [wCurMapScript], a ret -MtMoon3TextPointers: +MtMoonB2F_TextPointers: dw MtMoon3Text1 dw MtMoon3Text2 dw MtMoon3Text3 @@ -227,7 +227,7 @@ MtMoon3Text1: call EngageMapTrainer call InitBattleEnemyParameters ld a, $3 - ld [wMtMoon3CurScript], a + ld [wMtMoonB2FCurScript], a ld [wCurMapScript], a jr .asm_49ebe .asm_49eb8 @@ -274,12 +274,12 @@ MtMoon3Text6: call GiveItem jp nc, MtMoon3Script_49f76 call MtMoon3Script_49f69 - ld a, HS_MT_MOON_3_FOSSIL_1 + ld a, HS_MT_MOON_B2F_FOSSIL_1 ld [wMissableObjectIndex], a predef HideObject SetEvent EVENT_GOT_DOME_FOSSIL ld a, $4 - ld [wMtMoon3CurScript], a + ld [wMtMoonB2FCurScript], a ld [wCurMapScript], a .asm_49f21 jp TextScriptEnd @@ -302,12 +302,12 @@ MtMoon3Text7: call GiveItem jp nc, MtMoon3Script_49f76 call MtMoon3Script_49f69 - ld a, HS_MT_MOON_3_FOSSIL_2 + ld a, HS_MT_MOON_B2F_FOSSIL_2 ld [wMissableObjectIndex], a predef HideObject SetEvent EVENT_GOT_HELIX_FOSSIL ld a, $4 - ld [wMtMoon3CurScript], a + ld [wMtMoonB2FCurScript], a ld [wCurMapScript], a .asm_49f61 jp TextScriptEnd diff --git a/scripts/mtmoonpokecenter.asm b/scripts/MtMoonPokecenter.asm similarity index 96% rename from scripts/mtmoonpokecenter.asm rename to scripts/MtMoonPokecenter.asm index b5edee8d..969031db 100755 --- a/scripts/mtmoonpokecenter.asm +++ b/scripts/MtMoonPokecenter.asm @@ -1,8 +1,8 @@ -MtMoonPokecenterScript: +MtMoonPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -MtMoonPokecenterTextPointers: +MtMoonPokecenter_TextPointers: dw MtMoonHealNurseText dw MtMoonPokecenterText2 dw MtMoonPokecenterText3 diff --git a/scripts/museum1f.asm b/scripts/Museum1F.asm similarity index 96% rename from scripts/museum1f.asm rename to scripts/Museum1F.asm index 35bfb446..712f1fc4 100755 --- a/scripts/museum1f.asm +++ b/scripts/Museum1F.asm @@ -1,13 +1,13 @@ -Museum1FScript: +Museum1F_Script: ld a, $1 ld [wAutoTextBoxDrawingControl], a xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, Museum1FScriptPointers - ld a, [wMuseum1fCurScript] + ld hl, Museum1F_ScriptPointers + ld a, [wMuseum1FCurScript] jp CallFunctionInTable -Museum1FScriptPointers: +Museum1F_ScriptPointers: dw Museum1FScript0 dw Museum1FScript1 @@ -31,7 +31,7 @@ Museum1FScript0: Museum1FScript1: ret -Museum1FTextPointers: +Museum1F_TextPointers: dw Museum1FText1 dw Museum1FText2 dw Museum1FText3 @@ -120,7 +120,7 @@ Museum1FText1: jr Museum1FScriptEnd .asm_0b094 ld a, $1 - ld [wMuseum1fCurScript], a + ld [wMuseum1FCurScript], a jr Museum1FScriptEnd Museum1FScript_5c1f9: diff --git a/scripts/museum2f.asm b/scripts/Museum2F.asm similarity index 92% rename from scripts/museum2f.asm rename to scripts/Museum2F.asm index 6ee8d72a..ce4d3d81 100755 --- a/scripts/museum2f.asm +++ b/scripts/Museum2F.asm @@ -1,7 +1,7 @@ -Museum2FScript: +Museum2F_Script: jp EnableAutoTextBoxDrawing -Museum2FTextPointers: +Museum2F_TextPointers: dw Museum2FText1 dw Museum2FText2 dw Museum2FText3 diff --git a/scripts/namerater.asm b/scripts/NameRatersHouse.asm similarity index 97% rename from scripts/namerater.asm rename to scripts/NameRatersHouse.asm index 160948ac..323cb360 100755 --- a/scripts/namerater.asm +++ b/scripts/NameRatersHouse.asm @@ -1,4 +1,4 @@ -NameRaterScript: +NameRatersHouse_Script: jp EnableAutoTextBoxDrawing NameRaterScript_1da15: @@ -37,7 +37,7 @@ NameRaterScript_1da20: scf ret -NameRaterTextPointers: +NameRatersHouse_TextPointers: dw NameRaterText1 NameRaterText1: diff --git a/scripts/oakslab.asm b/scripts/OaksLab.asm similarity index 99% rename from scripts/oakslab.asm rename to scripts/OaksLab.asm index aa84fab9..364b157b 100755 --- a/scripts/oakslab.asm +++ b/scripts/OaksLab.asm @@ -1,15 +1,15 @@ -OaksLabScript: +OaksLab_Script: CheckEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS_2 call nz, OaksLabScript_1d076 ld a, $1 ld [wAutoTextBoxDrawingControl], a xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, OaksLabScriptPointers + ld hl, OaksLab_ScriptPointers ld a, [wOaksLabCurScript] jp CallFunctionInTable -OaksLabScriptPointers: +OaksLab_ScriptPointers: dw OaksLabScript0 dw OaksLabScript1 dw OaksLabScript2 @@ -712,14 +712,14 @@ OaksLabScript_1d02b: ret OaksLabScript_1d076: - ld hl, OaksLabTextPointers2 + ld hl, OaksLab_TextPointers2 ld a, l ld [wMapTextPtr], a ld a, h ld [wMapTextPtr+1], a ret -OaksLabTextPointers: +OaksLab_TextPointers: dw OaksLabText1 dw OaksLabText2 dw OaksLabText3 @@ -748,7 +748,7 @@ OaksLabTextPointers: dw OaksLabText26 dw OaksLabText27 -OaksLabTextPointers2: +OaksLab_TextPointers2: dw OaksLabText1 dw OaksLabText2 dw OaksLabText3 diff --git a/scripts/pallettown.asm b/scripts/PalletTown.asm similarity index 97% rename from scripts/pallettown.asm rename to scripts/PalletTown.asm index 5b2d2a35..5ad7d40f 100755 --- a/scripts/pallettown.asm +++ b/scripts/PalletTown.asm @@ -1,14 +1,14 @@ -PalletTownScript: +PalletTown_Script: CheckEvent EVENT_GOT_POKEBALLS_FROM_OAK jr z, .next SetEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS .next call EnableAutoTextBoxDrawing - ld hl, PalletTownScriptPointers + ld hl, PalletTown_ScriptPointers ld a, [wPalletTownCurScript] jp CallFunctionInTable -PalletTownScriptPointers: +PalletTown_ScriptPointers: dw PalletTownScript0 dw PalletTownScript1 dw PalletTownScript2 @@ -148,7 +148,7 @@ PalletTownScript5: PalletTownScript6: ret -PalletTownTextPointers: +PalletTown_TextPointers: dw PalletTownText1 dw PalletTownText2 dw PalletTownText3 diff --git a/scripts/pewtercity.asm b/scripts/PewterCity.asm similarity index 97% rename from scripts/pewtercity.asm rename to scripts/PewterCity.asm index 80acede8..dcc449c1 100755 --- a/scripts/pewtercity.asm +++ b/scripts/PewterCity.asm @@ -1,10 +1,10 @@ -PewterCityScript: +PewterCity_Script: call EnableAutoTextBoxDrawing - ld hl, PewterCityScriptPointers + ld hl, PewterCity_ScriptPointers ld a, [wPewterCityCurScript] jp CallFunctionInTable -PewterCityScriptPointers: +PewterCity_ScriptPointers: dw PewterCityScript0 dw PewterCityScript1 dw PewterCityScript2 @@ -15,7 +15,7 @@ PewterCityScriptPointers: PewterCityScript0: xor a - ld [wMuseum1fCurScript], a + ld [wMuseum1FCurScript], a ResetEvent EVENT_BOUGHT_MUSEUM_TICKET call PewterCityScript_1925e ret @@ -176,7 +176,7 @@ PewterCityScript6: ld [wPewterCityCurScript], a ret -PewterCityTextPointers: +PewterCity_TextPointers: dw PewterCityText1 dw PewterCityText2 dw PewterCityText3 diff --git a/scripts/pewtergym.asm b/scripts/PewterGym.asm similarity index 97% rename from scripts/pewtergym.asm rename to scripts/PewterGym.asm index 2cfee6c0..6dd24b08 100755 --- a/scripts/pewtergym.asm +++ b/scripts/PewterGym.asm @@ -1,11 +1,11 @@ -PewterGymScript: +PewterGym_Script: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, PewterGymScript_5c3a4 call EnableAutoTextBoxDrawing ld hl, PewterGymTrainerHeader0 - ld de, PewterGymScriptPointers + ld de, PewterGym_ScriptPointers ld a, [wPewterGymCurScript] call ExecuteCurMapScriptInTable ld [wPewterGymCurScript], a @@ -29,7 +29,7 @@ PewterGymScript_5c3bf: ld [wCurMapScript], a ret -PewterGymScriptPointers: +PewterGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -79,7 +79,7 @@ PewterGymScript_5c3df: jp PewterGymScript_5c3bf -PewterGymTextPointers: +PewterGym_TextPointers: dw PewterGymText1 dw PewterGymText2 dw PewterGymText3 diff --git a/scripts/pewtermart.asm b/scripts/PewterMart.asm similarity index 89% rename from scripts/pewtermart.asm rename to scripts/PewterMart.asm index d5281704..c71f8413 100755 --- a/scripts/pewtermart.asm +++ b/scripts/PewterMart.asm @@ -1,10 +1,10 @@ -PewterMartScript: +PewterMart_Script: call EnableAutoTextBoxDrawing ld a, $1 ld [wAutoTextBoxDrawingControl], a ret -PewterMartTextPointers: +PewterMart_TextPointers: dw PewterCashierText dw PewterMartText2 dw PewterMartText3 diff --git a/scripts/pewterhouse1.asm b/scripts/PewterNidoranHouse.asm similarity index 84% rename from scripts/pewterhouse1.asm rename to scripts/PewterNidoranHouse.asm index 8fa8dc3c..a4e85e08 100755 --- a/scripts/pewterhouse1.asm +++ b/scripts/PewterNidoranHouse.asm @@ -1,7 +1,7 @@ -PewterHouse1Script: +PewterNidoranHouse_Script: jp EnableAutoTextBoxDrawing -PewterHouse1TextPointers: +PewterNidoranHouse_TextPointers: dw PewterHouse1Text1 dw PewterHouse1Text2 dw PewterHouse1Text3 diff --git a/scripts/pewterpokecenter.asm b/scripts/PewterPokecenter.asm similarity index 96% rename from scripts/pewterpokecenter.asm rename to scripts/PewterPokecenter.asm index 4dd63559..68115050 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/PewterPokecenter.asm @@ -1,8 +1,8 @@ -PewterPokecenterScript: +PewterPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -PewterPokecenterTextPointers: +PewterPokecenter_TextPointers: dw PewterHealNurseText dw PewterPokecenterText2 dw PewterJigglypuffText diff --git a/scripts/pewterhouse2.asm b/scripts/PewterSpeechHouse.asm similarity index 76% rename from scripts/pewterhouse2.asm rename to scripts/PewterSpeechHouse.asm index e3bbe01e..943e1759 100755 --- a/scripts/pewterhouse2.asm +++ b/scripts/PewterSpeechHouse.asm @@ -1,7 +1,7 @@ -PewterHouse2Script: +PewterSpeechHouse_Script: jp EnableAutoTextBoxDrawing -PewterHouse2TextPointers: +PewterSpeechHouse_TextPointers: dw PewterHouse2Text1 dw PewterHouse2Text2 diff --git a/scripts/fanclub.asm b/scripts/PokemonFanClub.asm similarity index 97% rename from scripts/fanclub.asm rename to scripts/PokemonFanClub.asm index b6d65586..673d6011 100755 --- a/scripts/fanclub.asm +++ b/scripts/PokemonFanClub.asm @@ -1,4 +1,4 @@ -FanClubScript: +PokemonFanClub_Script: jp EnableAutoTextBoxDrawing FanClubBikeInBag: @@ -11,7 +11,7 @@ FanClubBikeInBag: ld b, BIKE_VOUCHER jp IsItemInBag -FanClubTextPointers: +PokemonFanClub_TextPointers: dw FanClubText1 dw FanClubText2 dw FanClubText3 diff --git a/scripts/mansion1.asm b/scripts/PokemonMansion1F.asm similarity index 92% rename from scripts/mansion1.asm rename to scripts/PokemonMansion1F.asm index 2fdc18c6..41f40635 100755 --- a/scripts/mansion1.asm +++ b/scripts/PokemonMansion1F.asm @@ -1,11 +1,11 @@ -Mansion1Script: +PokemonMansion1F_Script: call Mansion1Subscript1 call EnableAutoTextBoxDrawing ld hl, Mansion1TrainerHeader0 - ld de, Mansion1ScriptPointers - ld a, [wMansion1CurScript] + ld de, PokemonMansion1F_ScriptPointers + ld a, [wPokemonMansion1FCurScript] call ExecuteCurMapScriptInTable - ld [wMansion1CurScript], a + ld [wPokemonMansion1FCurScript], a ret Mansion1Subscript1: @@ -55,12 +55,12 @@ Mansion1Script_Switches: ld [hSpriteIndexOrTextID], a jp DisplayTextID -Mansion1ScriptPointers: +PokemonMansion1F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Mansion1TextPointers: +PokemonMansion1F_TextPointers: dw Mansion1Text1 dw PickUpItemText dw PickUpItemText diff --git a/scripts/mansion2.asm b/scripts/PokemonMansion2F.asm similarity index 92% rename from scripts/mansion2.asm rename to scripts/PokemonMansion2F.asm index ddc1ff7a..a7b90bcd 100755 --- a/scripts/mansion2.asm +++ b/scripts/PokemonMansion2F.asm @@ -1,11 +1,11 @@ -Mansion2Script: +PokemonMansion2F_Script: call Mansion2Script_51fee call EnableAutoTextBoxDrawing ld hl, Mansion2TrainerHeader0 - ld de, Mansion2ScriptPointers - ld a, [wMansion2CurScript] + ld de, PokemonMansion2F_ScriptPointers + ld a, [wPokemonMansion2FCurScript] call ExecuteCurMapScriptInTable - ld [wMansion2CurScript], a + ld [wPokemonMansion2FCurScript], a ret Mansion2Script_51fee: @@ -51,12 +51,12 @@ Mansion2Script_Switches: ld [hSpriteIndexOrTextID], a jp DisplayTextID -Mansion2ScriptPointers: +PokemonMansion2F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Mansion2TextPointers: +PokemonMansion2F_TextPointers: dw Mansion2Text1 dw PickUpItemText dw Mansion2Text3 diff --git a/scripts/mansion3.asm b/scripts/PokemonMansion3F.asm similarity index 93% rename from scripts/mansion3.asm rename to scripts/PokemonMansion3F.asm index abe76df8..3edc7bfd 100755 --- a/scripts/mansion3.asm +++ b/scripts/PokemonMansion3F.asm @@ -1,11 +1,11 @@ -Mansion3Script: +PokemonMansion3F_Script: call Mansion3Script_52204 call EnableAutoTextBoxDrawing ld hl, Mansion3TrainerHeader0 - ld de, Mansion3ScriptPointers - ld a, [wMansion3CurScript] + ld de, PokemonMansion3F_ScriptPointers + ld a, [wPokemonMansion3FCurScript] call ExecuteCurMapScriptInTable - ld [wMansion3CurScript], a + ld [wPokemonMansion3FCurScript], a ret Mansion3Script_52204: @@ -31,7 +31,7 @@ Mansion3Script_52204: call Mansion2Script_5202f ret -Mansion3ScriptPointers: +PokemonMansion3F_ScriptPointers: dw Mansion3Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -82,7 +82,7 @@ Mansion3Script_Switches: ld [hSpriteIndexOrTextID], a jp DisplayTextID -Mansion3TextPointers: +PokemonMansion3F_TextPointers: dw Mansion3Text1 dw Mansion3Text2 dw PickUpItemText diff --git a/scripts/mansion4.asm b/scripts/PokemonMansionB1F.asm similarity index 92% rename from scripts/mansion4.asm rename to scripts/PokemonMansionB1F.asm index de8a5d58..887b4762 100755 --- a/scripts/mansion4.asm +++ b/scripts/PokemonMansionB1F.asm @@ -1,11 +1,11 @@ -Mansion4Script: +PokemonMansionB1F_Script: call Mansion4Script_523cf call EnableAutoTextBoxDrawing ld hl, Mansion4TrainerHeader0 - ld de, Mansion4ScriptPointers - ld a, [wMansion4CurScript] + ld de, PokemonMansionB1F_ScriptPointers + ld a, [wPokemonMansionB1FCurScript] call ExecuteCurMapScriptInTable - ld [wMansion4CurScript], a + ld [wPokemonMansionB1FCurScript], a ret Mansion4Script_523cf: @@ -53,12 +53,12 @@ Mansion4Script_Switches: ld [hSpriteIndexOrTextID], a jp DisplayTextID -Mansion4ScriptPointers: +PokemonMansionB1F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Mansion4TextPointers: +PokemonMansionB1F_TextPointers: dw Mansion4Text1 dw Mansion4Text2 dw PickUpItemText diff --git a/scripts/pokemontower1.asm b/scripts/PokemonTower1F.asm similarity index 89% rename from scripts/pokemontower1.asm rename to scripts/PokemonTower1F.asm index 6d9d1b3f..66b5505c 100755 --- a/scripts/pokemontower1.asm +++ b/scripts/PokemonTower1F.asm @@ -1,7 +1,7 @@ -PokemonTower1Script: +PokemonTower1F_Script: jp EnableAutoTextBoxDrawing -PokemonTower1TextPointers: +PokemonTower1F_TextPointers: dw PokemonTower1Text1 dw PokemonTower1Text2 dw PokemonTower1Text3 diff --git a/scripts/pokemontower2.asm b/scripts/PokemonTower2F.asm similarity index 91% rename from scripts/pokemontower2.asm rename to scripts/PokemonTower2F.asm index 383b175d..81f4c0b3 100755 --- a/scripts/pokemontower2.asm +++ b/scripts/PokemonTower2F.asm @@ -1,17 +1,17 @@ -PokemonTower2Script: +PokemonTower2F_Script: call EnableAutoTextBoxDrawing - ld hl, PokemonTower2ScriptPointers - ld a, [wPokemonTower2CurScript] + ld hl, PokemonTower2F_ScriptPointers + ld a, [wPokemonTower2FCurScript] jp CallFunctionInTable PokemonTower2Script_604fe: xor a ld [wJoyIgnore], a - ld [wPokemonTower2CurScript], a + ld [wPokemonTower2FCurScript], a ld [wCurMapScript], a ret -PokemonTower2ScriptPointers: +PokemonTower2F_ScriptPointers: dw PokemonTower2Script0 dw PokemonTower2Script1 dw PokemonTower2Script2 @@ -81,7 +81,7 @@ PokemonTower2Script1: call PlaySound callba Music_RivalAlternateStart ld a, $2 - ld [wPokemonTower2CurScript], a + ld [wPokemonTower2FCurScript], a ld [wCurMapScript], a ret @@ -111,18 +111,18 @@ PokemonTower2Script2: ld a, [wd730] bit 0, a ret nz - ld a, HS_POKEMONTOWER_2_RIVAL + ld a, HS_POKEMON_TOWER_2F_RIVAL ld [wMissableObjectIndex], a predef HideObject xor a ld [wJoyIgnore], a call PlayDefaultMusic ld a, $0 - ld [wPokemonTower2CurScript], a + ld [wPokemonTower2FCurScript], a ld [wCurMapScript], a ret -PokemonTower2TextPointers: +PokemonTower2F_TextPointers: dw PokemonTower2Text1 dw PokemonTower2Text2 @@ -162,7 +162,7 @@ PokemonTower2Text1: ld [wTrainerNo], a ld a, $1 - ld [wPokemonTower2CurScript], a + ld [wPokemonTower2FCurScript], a ld [wCurMapScript], a .asm_41852 jp TextScriptEnd diff --git a/scripts/pokemontower3.asm b/scripts/PokemonTower3F.asm similarity index 92% rename from scripts/pokemontower3.asm rename to scripts/PokemonTower3F.asm index 6027b450..7d8f63e9 100755 --- a/scripts/pokemontower3.asm +++ b/scripts/PokemonTower3F.asm @@ -1,18 +1,18 @@ -PokemonTower3Script: +PokemonTower3F_Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower3TrainerHeader0 - ld de, PokemonTower3ScriptPointers - ld a, [wPokemonTower3CurScript] + ld de, PokemonTower3F_ScriptPointers + ld a, [wPokemonTower3FCurScript] call ExecuteCurMapScriptInTable - ld [wPokemonTower3CurScript], a + ld [wPokemonTower3FCurScript], a ret -PokemonTower3ScriptPointers: +PokemonTower3F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -PokemonTower3TextPointers: +PokemonTower3F_TextPointers: dw PokemonTower3Text1 dw PokemonTower3Text2 dw PokemonTower3Text3 diff --git a/scripts/pokemontower4.asm b/scripts/PokemonTower4F.asm similarity index 92% rename from scripts/pokemontower4.asm rename to scripts/PokemonTower4F.asm index a8307c01..b8e0d772 100755 --- a/scripts/pokemontower4.asm +++ b/scripts/PokemonTower4F.asm @@ -1,18 +1,18 @@ -PokemonTower4Script: +PokemonTower4F_Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower4TrainerHeader0 - ld de, PokemonTower4ScriptPointers - ld a, [wPokemonTower4CurScript] + ld de, PokemonTower4F_ScriptPointers + ld a, [wPokemonTower4FCurScript] call ExecuteCurMapScriptInTable - ld [wPokemonTower4CurScript], a + ld [wPokemonTower4FCurScript], a ret -PokemonTower4ScriptPointers: +PokemonTower4F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -PokemonTower4TextPointers: +PokemonTower4F_TextPointers: dw PokemonTower4Text1 dw PokemonTower4Text2 dw PokemonTower4Text3 diff --git a/scripts/pokemontower5.asm b/scripts/PokemonTower5F.asm similarity index 95% rename from scripts/pokemontower5.asm rename to scripts/PokemonTower5F.asm index 9a13f286..299261e9 100755 --- a/scripts/pokemontower5.asm +++ b/scripts/PokemonTower5F.asm @@ -1,13 +1,13 @@ -PokemonTower5Script: +PokemonTower5F_Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower5TrainerHeader0 - ld de, PokemonTower5ScriptPointers - ld a, [wPokemonTower5CurScript] + ld de, PokemonTower5F_ScriptPointers + ld a, [wPokemonTower5FCurScript] call ExecuteCurMapScriptInTable - ld [wPokemonTower5CurScript], a + ld [wPokemonTower5FCurScript], a ret -PokemonTower5ScriptPointers: +PokemonTower5F_ScriptPointers: dw PokemonTower5Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -48,7 +48,7 @@ CoordsData_60992: db $09,$0B db $FF -PokemonTower5TextPointers: +PokemonTower5F_TextPointers: dw PokemonTower5Text1 dw PokemonTower5Text2 dw PokemonTower5Text3 diff --git a/scripts/pokemontower6.asm b/scripts/PokemonTower6F.asm similarity index 92% rename from scripts/pokemontower6.asm rename to scripts/PokemonTower6F.asm index c3118f62..14c07c48 100755 --- a/scripts/pokemontower6.asm +++ b/scripts/PokemonTower6F.asm @@ -1,20 +1,20 @@ -PokemonTower6Script: +PokemonTower6F_Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower6TrainerHeader0 - ld de, PokemonTower6ScriptPointers - ld a, [wPokemonTower6CurScript] + ld de, PokemonTower6F_ScriptPointers + ld a, [wPokemonTower6FCurScript] call ExecuteCurMapScriptInTable - ld [wPokemonTower6CurScript], a + ld [wPokemonTower6FCurScript], a ret PokemonTower6Script_60b02: xor a ld [wJoyIgnore], a - ld [wPokemonTower6CurScript], a + ld [wPokemonTower6FCurScript], a ld [wCurMapScript], a ret -PokemonTower6ScriptPointers: +PokemonTower6F_ScriptPointers: dw PokemonTower6Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -37,7 +37,7 @@ PokemonTower6Script0: ld a, 30 ld [wCurEnemyLVL], a ld a, $4 - ld [wPokemonTower6CurScript], a + ld [wPokemonTower6FCurScript], a ld [wCurMapScript], a ret @@ -66,7 +66,7 @@ PokemonTower6Script4: xor a ld [wJoyIgnore], a ld a, $0 - ld [wPokemonTower6CurScript], a + ld [wPokemonTower6FCurScript], a ld [wCurMapScript], a ret .asm_60b82 @@ -80,7 +80,7 @@ PokemonTower6Script4: ld hl, wd730 set 7, [hl] ld a, $3 - ld [wPokemonTower6CurScript], a + ld [wPokemonTower6FCurScript], a ld [wCurMapScript], a ret @@ -90,11 +90,11 @@ PokemonTower6Script3: ret nz call Delay3 xor a - ld [wPokemonTower6CurScript], a + ld [wPokemonTower6FCurScript], a ld [wCurMapScript], a ret -PokemonTower6TextPointers: +PokemonTower6F_TextPointers: dw PokemonTower6Text1 dw PokemonTower6Text2 dw PokemonTower6Text3 diff --git a/scripts/pokemontower7.asm b/scripts/PokemonTower7F.asm similarity index 93% rename from scripts/pokemontower7.asm rename to scripts/PokemonTower7F.asm index 88c62c53..4b2a1827 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/PokemonTower7F.asm @@ -1,20 +1,20 @@ -PokemonTower7Script: +PokemonTower7F_Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower7TrainerHeader0 - ld de, PokemonTower7ScriptPointers - ld a, [wPokemonTower7CurScript] + ld de, PokemonTower7F_ScriptPointers + ld a, [wPokemonTower7FCurScript] call ExecuteCurMapScriptInTable - ld [wPokemonTower7CurScript], a + ld [wPokemonTower7FCurScript], a ret PokemonTower7Script_60d18: xor a ld [wJoyIgnore], a - ld [wPokemonTower7CurScript], a + ld [wPokemonTower7FCurScript], a ld [wCurMapScript], a ret -PokemonTower7ScriptPointers: +PokemonTower7F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw PokemonTower7Script2 @@ -35,7 +35,7 @@ PokemonTower7Script2: call DisplayTextID call PokemonTower7Script_60db6 ld a, $3 - ld [wPokemonTower7CurScript], a + ld [wPokemonTower7FCurScript], a ld [wCurMapScript], a ret @@ -59,19 +59,19 @@ PokemonTower7Script3: ld [wTrainerHeaderFlagBit], a ld [wUnusedDA38], a ld a, $0 - ld [wPokemonTower7CurScript], a + ld [wPokemonTower7FCurScript], a ld [wCurMapScript], a ret PokemonTower7Script4: ld a, $ff ld [wJoyIgnore], a - ld a, HS_POKEMONTOWER_7_MR_FUJI + ld a, HS_POKEMON_TOWER_7F_MR_FUJI ld [wMissableObjectIndex], a predef HideObject ld a, SPRITE_FACING_UP ld [wSpriteStateData1 + 9], a - ld a, LAVENDER_HOUSE_1 + ld a, MR_FUJIS_HOUSE ld [hWarpDestinationMap], a ld a, $1 ld [wDestinationWarpID], a @@ -80,7 +80,7 @@ PokemonTower7Script4: ld hl, wd72d set 3, [hl] ld a, $0 - ld [wPokemonTower7CurScript], a + ld [wPokemonTower7FCurScript], a ld [wCurMapScript], a ret @@ -198,7 +198,7 @@ MovementData_60e37: db NPC_MOVEMENT_DOWN db $FF -PokemonTower7TextPointers: +PokemonTower7F_TextPointers: dw PokemonTower7Text1 dw PokemonTower7Text2 dw PokemonTower7Text3 @@ -257,7 +257,7 @@ PokemonTower7FujiText: call PrintText SetEvent EVENT_RESCUED_MR_FUJI SetEvent EVENT_RESCUED_MR_FUJI_2 - ld a, HS_LAVENDER_HOUSE_1_MR_FUJI + ld a, HS_MR_FUJIS_HOUSE_MR_FUJI ld [wMissableObjectIndex], a predef ShowObject ld a, HS_SAFFRON_CITY_E @@ -267,7 +267,7 @@ PokemonTower7FujiText: ld [wMissableObjectIndex], a predef ShowObject ld a, $4 - ld [wPokemonTower7CurScript], a + ld [wPokemonTower7FCurScript], a ld [wCurMapScript], a jp TextScriptEnd diff --git a/scripts/powerplant.asm b/scripts/PowerPlant.asm similarity index 97% rename from scripts/powerplant.asm rename to scripts/PowerPlant.asm index 5391585d..35b4893f 100755 --- a/scripts/powerplant.asm +++ b/scripts/PowerPlant.asm @@ -1,18 +1,18 @@ -PowerPlantScript: +PowerPlant_Script: call EnableAutoTextBoxDrawing ld hl, Voltorb0TrainerHeader - ld de, .ScriptPointers + ld de, PowerPlant_ScriptPointers ld a, [wPowerPlantCurScript] call ExecuteCurMapScriptInTable ld [wPowerPlantCurScript], a ret -.ScriptPointers +PowerPlant_ScriptPointers dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -PowerPlantTextPointers: +PowerPlant_TextPointers: dw Voltorb0Text dw Voltorb1Text dw Voltorb2Text diff --git a/scripts/redshouse1f.asm b/scripts/RedsHouse1F.asm similarity index 95% rename from scripts/redshouse1f.asm rename to scripts/RedsHouse1F.asm index 59323b8e..b982d71c 100755 --- a/scripts/redshouse1f.asm +++ b/scripts/RedsHouse1F.asm @@ -1,7 +1,7 @@ -RedsHouse1FScript: +RedsHouse1F_Script: jp EnableAutoTextBoxDrawing -RedsHouse1FTextPointers: +RedsHouse1F_TextPointers: dw RedsHouse1FText1 dw RedsHouse1FText2 diff --git a/scripts/redshouse2f.asm b/scripts/RedsHouse2F.asm similarity index 59% rename from scripts/redshouse2f.asm rename to scripts/RedsHouse2F.asm index 0ec59077..5ec86678 100755 --- a/scripts/redshouse2f.asm +++ b/scripts/RedsHouse2F.asm @@ -1,10 +1,10 @@ -RedsHouse2FScript: +RedsHouse2F_Script: call EnableAutoTextBoxDrawing - ld hl, RedsHouse2FScriptPointers - ld a, [wRedsHouse2CurScript] + ld hl, RedsHouse2F_ScriptPointers + ld a, [wRedsHouse2FCurScript] jp CallFunctionInTable -RedsHouse2FScriptPointers: +RedsHouse2F_ScriptPointers: dw RedsHouse2FScript0 dw RedsHouse2FScript1 @@ -14,11 +14,11 @@ RedsHouse2FScript0: ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a ld a, 1 - ld [wRedsHouse2CurScript], a + ld [wRedsHouse2FCurScript], a ret RedsHouse2FScript1: ret -RedsHouse2FTextPointers: +RedsHouse2F_TextPointers: db "@" diff --git a/scripts/rocktunnel1.asm b/scripts/RockTunnel1F.asm similarity index 96% rename from scripts/rocktunnel1.asm rename to scripts/RockTunnel1F.asm index 390330e8..94620d96 100755 --- a/scripts/rocktunnel1.asm +++ b/scripts/RockTunnel1F.asm @@ -1,18 +1,18 @@ -RockTunnel1Script: +RockTunnel1F_Script: call EnableAutoTextBoxDrawing ld hl, RockTunnel1TrainerHeader0 - ld de, RockTunnel1ScriptPointers - ld a, [wRockTunnel1CurScript] + ld de, RockTunnel1F_ScriptPointers + ld a, [wRockTunnel1FCurScript] call ExecuteCurMapScriptInTable - ld [wRockTunnel1CurScript], a + ld [wRockTunnel1FCurScript], a ret -RockTunnel1ScriptPointers: +RockTunnel1F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -RockTunnel1TextPointers: +RockTunnel1F_TextPointers: dw RockTunnel1Text1 dw RockTunnel1Text2 dw RockTunnel1Text3 diff --git a/scripts/rocktunnel2.asm b/scripts/RockTunnelB1F.asm similarity index 96% rename from scripts/rocktunnel2.asm rename to scripts/RockTunnelB1F.asm index 4385b5f7..7e6fcc8b 100755 --- a/scripts/rocktunnel2.asm +++ b/scripts/RockTunnelB1F.asm @@ -1,18 +1,18 @@ -RockTunnel2Script: +RockTunnelB1F_Script: call EnableAutoTextBoxDrawing ld hl, RockTunnel2TrainerHeader0 - ld de, RockTunnel2ScriptPointers - ld a, [wRockTunnel2CurScript] + ld de, RockTunnelB1F_ScriptPointers + ld a, [wRockTunnelB1FCurScript] call ExecuteCurMapScriptInTable - ld [wRockTunnel2CurScript], a + ld [wRockTunnelB1FCurScript], a ret -RockTunnel2ScriptPointers: +RockTunnelB1F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -RockTunnel2TextPointers: +RockTunnelB1F_TextPointers: dw RockTunnel2Text1 dw RockTunnel2Text2 dw RockTunnel2Text3 diff --git a/scripts/rocktunnelpokecenter.asm b/scripts/RockTunnelPokecenter.asm similarity index 86% rename from scripts/rocktunnelpokecenter.asm rename to scripts/RockTunnelPokecenter.asm index 7bcdc1ae..cbcd6318 100755 --- a/scripts/rocktunnelpokecenter.asm +++ b/scripts/RockTunnelPokecenter.asm @@ -1,8 +1,8 @@ -RockTunnelPokecenterScript: +RockTunnelPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -RockTunnelPokecenterTextPointers: +RockTunnelPokecenter_TextPointers: dw RockTunnelHealNurseText dw RockTunnelPokecenterText2 dw RockTunnelPokecenterText3 diff --git a/scripts/rockethideout1.asm b/scripts/RocketHideoutB1F.asm similarity index 95% rename from scripts/rockethideout1.asm rename to scripts/RocketHideoutB1F.asm index 88b3a7e9..0cbddb49 100755 --- a/scripts/rockethideout1.asm +++ b/scripts/RocketHideoutB1F.asm @@ -1,11 +1,11 @@ -RocketHideout1Script: +RocketHideoutB1F_Script: call RocketHideout1Script_44be0 call EnableAutoTextBoxDrawing ld hl, RocketHideout1TrainerHeader0 - ld de, RocketHideout1ScriptPointers - ld a, [wRocketHideout1CurScript] + ld de, RocketHideoutB1F_ScriptPointers + ld a, [wRocketHideoutB1FCurScript] call ExecuteCurMapScriptInTable - ld [wRocketHideout1CurScript], a + ld [wRocketHideoutB1FCurScript], a ret RocketHideout1Script_44be0: @@ -30,12 +30,12 @@ RocketHideout1Script_44be0: lb bc, 8, 12 predef_jump ReplaceTileBlock -RocketHideout1ScriptPointers: +RocketHideoutB1F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -RocketHideout1TextPointers: +RocketHideoutB1F_TextPointers: dw RocketHideout1Text1 dw RocketHideout1Text2 dw RocketHideout1Text3 diff --git a/scripts/rockethideout2.asm b/scripts/RocketHideoutB2F.asm similarity index 97% rename from scripts/rockethideout2.asm rename to scripts/RocketHideoutB2F.asm index c5f026d5..1b487df2 100755 --- a/scripts/rockethideout2.asm +++ b/scripts/RocketHideoutB2F.asm @@ -1,13 +1,13 @@ -RocketHideout2Script: +RocketHideoutB2F_Script: call EnableAutoTextBoxDrawing ld hl, RocketHideout2TrainerHeader0 - ld de, RocketHideout2ScriptPointers - ld a, [wRocketHideout2CurScript] + ld de, RocketHideoutB2F_ScriptPointers + ld a, [wRocketHideoutB2FCurScript] call ExecuteCurMapScriptInTable - ld [wRocketHideout2CurScript], a + ld [wRocketHideoutB2FCurScript], a ret -RocketHideout2ScriptPointers: +RocketHideoutB2F_ScriptPointers: dw RocketHideout2Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -413,7 +413,7 @@ SpinnerPlayerFacingDirections: SpinnerArrowAnimTiles: INCBIN "gfx/spinner_arrow.2bpp" -RocketHideout2TextPointers: +RocketHideoutB2F_TextPointers: dw RocketHideout2Text1 dw PickUpItemText dw PickUpItemText diff --git a/scripts/rockethideout3.asm b/scripts/RocketHideoutB3F.asm similarity index 95% rename from scripts/rockethideout3.asm rename to scripts/RocketHideoutB3F.asm index 00a61568..4dd537b3 100755 --- a/scripts/rockethideout3.asm +++ b/scripts/RocketHideoutB3F.asm @@ -1,13 +1,13 @@ -RocketHideout3Script: +RocketHideoutB3F_Script: call EnableAutoTextBoxDrawing ld hl, RocketHideout3TrainerHeader0 - ld de, RocketHideout3ScriptPointers - ld a, [wRocketHideout3CurScript] + ld de, RocketHideoutB3F_ScriptPointers + ld a, [wRocketHideoutB3FCurScript] call ExecuteCurMapScriptInTable - ld [wRocketHideout3CurScript], a + ld [wRocketHideoutB3FCurScript], a ret -RocketHideout3ScriptPointers: +RocketHideoutB3F_ScriptPointers: dw RocketHideout3Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -143,7 +143,7 @@ RocketHideout3Script3: ld [wCurMapScript], a ret -RocketHideout3TextPointers: +RocketHideoutB3F_TextPointers: dw RocketHideout3Text1 dw RocketHideout3Text2 dw PickUpItemText diff --git a/scripts/rockethideout4.asm b/scripts/RocketHideoutB4F.asm similarity index 91% rename from scripts/rockethideout4.asm rename to scripts/RocketHideoutB4F.asm index e8361988..b2ce21f4 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/RocketHideoutB4F.asm @@ -1,11 +1,11 @@ -RocketHideout4Script: +RocketHideoutB4F_Script: call RocketHideout4Script_45473 call EnableAutoTextBoxDrawing ld hl, RocketHideout4TrainerHeader0 - ld de, RocketHideout4ScriptPointers - ld a, [wRocketHideout4CurScript] + ld de, RocketHideoutB4F_ScriptPointers + ld a, [wRocketHideoutB4FCurScript] call ExecuteCurMapScriptInTable - ld [wRocketHideout4CurScript], a + ld [wRocketHideoutB4FCurScript], a ret RocketHideout4Script_45473: @@ -33,11 +33,11 @@ RocketHideout4Script_45473: RocketHideout4Script_454a3: xor a ld [wJoyIgnore], a - ld [wRocketHideout4CurScript], a + ld [wRocketHideoutB4FCurScript], a ld [wCurMapScript], a ret -RocketHideout4ScriptPointers: +RocketHideoutB4F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -55,10 +55,10 @@ RocketHideout4Script3: ld [hSpriteIndexOrTextID], a call DisplayTextID call GBFadeOutToBlack - ld a, HS_ROCKET_HIDEOUT_4_GIOVANNI + ld a, HS_ROCKET_HIDEOUT_B4F_GIOVANNI ld [wMissableObjectIndex], a predef HideObject - ld a, HS_ROCKET_HIDEOUT_4_ITEM_4 + ld a, HS_ROCKET_HIDEOUT_B4F_ITEM_4 ld [wMissableObjectIndex], a predef ShowObject call UpdateSprites @@ -68,11 +68,11 @@ RocketHideout4Script3: ld hl, wCurrentMapScriptFlags set 5, [hl] ld a, $0 - ld [wRocketHideout4CurScript], a + ld [wRocketHideoutB4FCurScript], a ld [wCurMapScript], a ret -RocketHideout4TextPointers: +RocketHideoutB4F_TextPointers: dw RocketHideout4Text1 dw RocketHideout4Text2 dw RocketHideout4Text3 @@ -132,7 +132,7 @@ RocketHideout4Text1: xor a ld [hJoyHeld], a ld a, $3 - ld [wRocketHideout4CurScript], a + ld [wRocketHideoutB4FCurScript], a ld [wCurMapScript], a jr .asm_209f0 .asm_545571 @@ -209,7 +209,7 @@ RocketHideout4AfterBattleText4: call PrintText CheckAndSetEvent EVENT_ROCKET_DROPPED_LIFT_KEY jr nz, .asm_455e9 - ld a, HS_ROCKET_HIDEOUT_4_ITEM_5 + ld a, HS_ROCKET_HIDEOUT_B4F_ITEM_5 ld [wMissableObjectIndex], a predef ShowObject .asm_455e9 diff --git a/scripts/rockethideoutelevator.asm b/scripts/RocketHideoutElevator.asm similarity index 91% rename from scripts/rockethideoutelevator.asm rename to scripts/RocketHideoutElevator.asm index aed0f0cf..9525db3a 100755 --- a/scripts/rockethideoutelevator.asm +++ b/scripts/RocketHideoutElevator.asm @@ -1,4 +1,4 @@ -RocketHideoutElevatorScript: +RocketHideoutElevator_Script: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -51,9 +51,9 @@ RocketHideoutElevatorWarpMaps: ; first byte is warp number ; second byte is map number ; These specify where the player goes after getting out of the elevator. - db $04, ROCKET_HIDEOUT_1 - db $04, ROCKET_HIDEOUT_2 - db $02, ROCKET_HIDEOUT_4 + db $04, ROCKET_HIDEOUT_B1F + db $04, ROCKET_HIDEOUT_B2F + db $02, ROCKET_HIDEOUT_B4F RocketHideoutElevatorWarpMapsEnd: RocketHideoutElevatorScript_4575f: @@ -61,7 +61,7 @@ RocketHideoutElevatorScript_4575f: callba ShakeElevator ret -RocketHideoutElevatorTextPointers: +RocketHideoutElevator_TextPointers: dw RocketHideoutElevatorText1 RocketHideoutElevatorText1: diff --git a/scripts/route1.asm b/scripts/Route1.asm similarity index 95% rename from scripts/route1.asm rename to scripts/Route1.asm index 7f988fab..e733b54d 100755 --- a/scripts/route1.asm +++ b/scripts/Route1.asm @@ -1,7 +1,7 @@ -Route1Script: +Route1_Script: jp EnableAutoTextBoxDrawing -Route1TextPointers: +Route1_TextPointers: dw Route1Text1 dw Route1Text2 dw Route1Text3 diff --git a/scripts/route10.asm b/scripts/Route10.asm similarity index 97% rename from scripts/route10.asm rename to scripts/Route10.asm index 03a1e818..3fffa2c0 100755 --- a/scripts/route10.asm +++ b/scripts/Route10.asm @@ -1,18 +1,18 @@ -Route10Script: +Route10_Script: call EnableAutoTextBoxDrawing ld hl, Route10TrainerHeader0 - ld de, Route10ScriptPointers + ld de, Route10_ScriptPointers ld a, [wRoute10CurScript] call ExecuteCurMapScriptInTable ld [wRoute10CurScript], a ret -Route10ScriptPointers: +Route10_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route10TextPointers: +Route10_TextPointers: dw Route10Text1 dw Route10Text2 dw Route10Text3 diff --git a/scripts/route11.asm b/scripts/Route11.asm similarity index 98% rename from scripts/route11.asm rename to scripts/Route11.asm index afedfc32..891237cc 100755 --- a/scripts/route11.asm +++ b/scripts/Route11.asm @@ -1,18 +1,18 @@ -Route11Script: +Route11_Script: call EnableAutoTextBoxDrawing ld hl, Route11TrainerHeader0 - ld de, Route11ScriptPointers + ld de, Route11_ScriptPointers ld a, [wRoute11CurScript] call ExecuteCurMapScriptInTable ld [wRoute11CurScript], a ret -Route11ScriptPointers: +Route11_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route11TextPointers: +Route11_TextPointers: dw Route11Text1 dw Route11Text2 dw Route11Text3 diff --git a/scripts/route11gate.asm b/scripts/Route11Gate1F.asm similarity index 67% rename from scripts/route11gate.asm rename to scripts/Route11Gate1F.asm index 9ecfe0ca..8e5f6c03 100755 --- a/scripts/route11gate.asm +++ b/scripts/Route11Gate1F.asm @@ -1,7 +1,7 @@ -Route11GateScript: +Route11Gate1F_Script: jp EnableAutoTextBoxDrawing -Route11GateTextPointers: +Route11Gate1F_TextPointers: dw Route11GateText1 Route11GateText1: diff --git a/scripts/route11gateupstairs.asm b/scripts/Route11Gate2F.asm similarity index 96% rename from scripts/route11gateupstairs.asm rename to scripts/Route11Gate2F.asm index 6c8d6e99..c140937d 100755 --- a/scripts/route11gateupstairs.asm +++ b/scripts/Route11Gate2F.asm @@ -1,7 +1,7 @@ -Route11GateUpstairsScript: +Route11Gate2F_Script: jp DisableAutoTextBoxDrawing -Route11GateUpstairsTextPointers: +Route11Gate2F_TextPointers: dw Route11GateUpstairsText1 dw Route11GateUpstairsText2 dw Route11GateUpstairsText3 diff --git a/scripts/route12.asm b/scripts/Route12.asm similarity index 98% rename from scripts/route12.asm rename to scripts/Route12.asm index 07b5833b..510e7727 100755 --- a/scripts/route12.asm +++ b/scripts/Route12.asm @@ -1,7 +1,7 @@ -Route12Script: +Route12_Script: call EnableAutoTextBoxDrawing ld hl, Route12TrainerHeader0 - ld de, Route12ScriptPointers + ld de, Route12_ScriptPointers ld a, [wRoute12CurScript] call ExecuteCurMapScriptInTable ld [wRoute12CurScript], a @@ -14,7 +14,7 @@ Route12Script_59606: ld [wCurMapScript], a ret -Route12ScriptPointers: +Route12_ScriptPointers: dw Route12Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -60,7 +60,7 @@ Route12Script3: ld [wCurMapScript], a ret -Route12TextPointers: +Route12_TextPointers: dw Route12Text1 dw Route12Text2 dw Route12Text3 diff --git a/scripts/route12gate.asm b/scripts/Route12Gate1F.asm similarity index 67% rename from scripts/route12gate.asm rename to scripts/Route12Gate1F.asm index 8474100d..52d427ee 100755 --- a/scripts/route12gate.asm +++ b/scripts/Route12Gate1F.asm @@ -1,7 +1,7 @@ -Route12GateScript: +Route12Gate1F_Script: jp EnableAutoTextBoxDrawing -Route12GateTextPointers: +Route12Gate1F_TextPointers: dw Route12GateText1 Route12GateText1: diff --git a/scripts/route12gateupstairs.asm b/scripts/Route12Gate2F.asm similarity index 95% rename from scripts/route12gateupstairs.asm rename to scripts/Route12Gate2F.asm index cd355265..0cc2768b 100755 --- a/scripts/route12gateupstairs.asm +++ b/scripts/Route12Gate2F.asm @@ -1,7 +1,7 @@ -Route12GateUpstairsScript: +Route12Gate2F_Script: jp DisableAutoTextBoxDrawing -Route12GateUpstairsTextPointers: +Route12Gate2F_TextPointers: dw Route12GateUpstairsText1 dw Route12GateUpstairsText2 dw Route12GateUpstairsText3 diff --git a/scripts/route12house.asm b/scripts/Route12SuperRodHouse.asm similarity index 93% rename from scripts/route12house.asm rename to scripts/Route12SuperRodHouse.asm index 4b93395f..de8ed8f0 100755 --- a/scripts/route12house.asm +++ b/scripts/Route12SuperRodHouse.asm @@ -1,7 +1,7 @@ -Route12HouseScript: +Route12SuperRodHouse_Script: jp EnableAutoTextBoxDrawing -Route12HouseTextPointers: +Route12SuperRodHouse_TextPointers: dw Route12HouseText1 Route12HouseText1: diff --git a/scripts/route13.asm b/scripts/Route13.asm similarity index 98% rename from scripts/route13.asm rename to scripts/Route13.asm index 54fb9d68..8f92147e 100755 --- a/scripts/route13.asm +++ b/scripts/Route13.asm @@ -1,18 +1,18 @@ -Route13Script: +Route13_Script: call EnableAutoTextBoxDrawing ld hl, Route13TrainerHeader0 - ld de, Route13ScriptPointers + ld de, Route13_ScriptPointers ld a, [wRoute13CurScript] call ExecuteCurMapScriptInTable ld [wRoute13CurScript], a ret -Route13ScriptPointers: +Route13_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route13TextPointers: +Route13_TextPointers: dw Route13Text1 dw Route13Text2 dw Route13Text3 diff --git a/scripts/route14.asm b/scripts/Route14.asm similarity index 98% rename from scripts/route14.asm rename to scripts/Route14.asm index c929451f..fdc84d74 100755 --- a/scripts/route14.asm +++ b/scripts/Route14.asm @@ -1,18 +1,18 @@ -Route14Script: +Route14_Script: call EnableAutoTextBoxDrawing ld hl, Route14TrainerHeader0 - ld de, Route14ScriptPointers + ld de, Route14_ScriptPointers ld a, [wRoute14CurScript] call ExecuteCurMapScriptInTable ld [wRoute14CurScript], a ret -Route14ScriptPointers: +Route14_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route14TextPointers: +Route14_TextPointers: dw Route14Text1 dw Route14Text2 dw Route14Text3 diff --git a/scripts/route15.asm b/scripts/Route15.asm similarity index 98% rename from scripts/route15.asm rename to scripts/Route15.asm index 58c5d0ab..d973eb9c 100755 --- a/scripts/route15.asm +++ b/scripts/Route15.asm @@ -1,18 +1,18 @@ -Route15Script: +Route15_Script: call EnableAutoTextBoxDrawing ld hl, Route15TrainerHeader0 - ld de, Route15ScriptPointers + ld de, Route15_ScriptPointers ld a, [wRoute15CurScript] call ExecuteCurMapScriptInTable ld [wRoute15CurScript], a ret -Route15ScriptPointers: +Route15_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route15TextPointers: +Route15_TextPointers: dw Route15Text1 dw Route15Text2 dw Route15Text3 diff --git a/scripts/route15gate.asm b/scripts/Route15Gate1F.asm similarity index 67% rename from scripts/route15gate.asm rename to scripts/Route15Gate1F.asm index 40db02dd..910eb2a5 100755 --- a/scripts/route15gate.asm +++ b/scripts/Route15Gate1F.asm @@ -1,7 +1,7 @@ -Route15GateScript: +Route15Gate1F_Script: jp EnableAutoTextBoxDrawing -Route15GateTextPointers: +Route15Gate1F_TextPointers: dw Route15GateText1 Route15GateText1: diff --git a/scripts/route15gateupstairs.asm b/scripts/Route15Gate2F.asm similarity index 93% rename from scripts/route15gateupstairs.asm rename to scripts/Route15Gate2F.asm index c7f6a2ad..83763762 100755 --- a/scripts/route15gateupstairs.asm +++ b/scripts/Route15Gate2F.asm @@ -1,7 +1,7 @@ -Route15GateUpstairsScript: +Route15Gate2F_Script: jp DisableAutoTextBoxDrawing -Route15GateUpstairsTextPointers: +Route15Gate2F_TextPointers: dw Route15GateUpstairsText1 dw Route15GateUpstairsText2 diff --git a/scripts/route16.asm b/scripts/Route16.asm similarity index 98% rename from scripts/route16.asm rename to scripts/Route16.asm index 20431608..54f83380 100755 --- a/scripts/route16.asm +++ b/scripts/Route16.asm @@ -1,7 +1,7 @@ -Route16Script: +Route16_Script: call EnableAutoTextBoxDrawing ld hl, Route16TrainerHeader0 - ld de, Route16ScriptPointers + ld de, Route16_ScriptPointers ld a, [wRoute16CurScript] call ExecuteCurMapScriptInTable ld [wRoute16CurScript], a @@ -14,7 +14,7 @@ Route16Script_59946: ld [wCurMapScript], a ret -Route16ScriptPointers: +Route16_ScriptPointers: dw Route16Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -61,7 +61,7 @@ Route16Script3: ld [wCurMapScript], a ret -Route16TextPointers: +Route16_TextPointers: dw Route16Text1 dw Route16Text2 dw Route16Text3 diff --git a/scripts/route16house.asm b/scripts/Route16FlyHouse.asm similarity index 94% rename from scripts/route16house.asm rename to scripts/Route16FlyHouse.asm index 5359248c..1d74ac80 100755 --- a/scripts/route16house.asm +++ b/scripts/Route16FlyHouse.asm @@ -1,7 +1,7 @@ -Route16HouseScript: +Route16FlyHouse_Script: jp EnableAutoTextBoxDrawing -Route16HouseTextPointers: +Route16FlyHouse_TextPointers: dw Route16HouseText1 dw Route16HouseText2 diff --git a/scripts/route16gate.asm b/scripts/Route16Gate1F.asm similarity index 86% rename from scripts/route16gate.asm rename to scripts/Route16Gate1F.asm index e20ba6f7..f814d209 100755 --- a/scripts/route16gate.asm +++ b/scripts/Route16Gate1F.asm @@ -1,12 +1,12 @@ -Route16GateScript: +Route16Gate1F_Script: ld hl, wd732 res 5, [hl] call EnableAutoTextBoxDrawing - ld a, [wRoute16GateCurScript] - ld hl, Route16GateScriptPointers + ld a, [wRoute16Gate1FCurScript] + ld hl, Route16Gate1F_ScriptPointers jp CallFunctionInTable -Route16GateScriptPointers: +Route16Gate1F_ScriptPointers: dw Route16GateScript0 dw Route16GateScript1 dw Route16GateScript2 @@ -36,11 +36,11 @@ Route16GateScript0: call FillMemory call StartSimulatingJoypadStates ld a, $1 - ld [wRoute16GateCurScript], a + ld [wRoute16Gate1FCurScript], a ret .asm_4970e ld a, $2 - ld [wRoute16GateCurScript], a + ld [wRoute16Gate1FCurScript], a ret CoordsData_49714: @@ -67,7 +67,7 @@ Route16GateScript2: ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates ld a, $3 - ld [wRoute16GateCurScript], a + ld [wRoute16Gate1FCurScript], a ret Route16GateScript3: @@ -79,14 +79,14 @@ Route16GateScript3: ld hl, wd730 res 7, [hl] ld a, $0 - ld [wRoute16GateCurScript], a + ld [wRoute16Gate1FCurScript], a ret Route16GateScript_49755: ld b, BICYCLE jp IsItemInBag -Route16GateTextPointers: +Route16Gate1F_TextPointers: dw Route16GateText1 dw Route16GateText2 dw Route16GateText3 diff --git a/scripts/route16gateupstairs.asm b/scripts/Route16Gate2F.asm similarity index 93% rename from scripts/route16gateupstairs.asm rename to scripts/Route16Gate2F.asm index 664976a2..643a5ec7 100755 --- a/scripts/route16gateupstairs.asm +++ b/scripts/Route16Gate2F.asm @@ -1,7 +1,7 @@ -Route16GateUpstairsScript: +Route16Gate2F_Script: jp DisableAutoTextBoxDrawing -Route16GateUpstairsTextPointers: +Route16Gate2F_TextPointers: dw Route16GateUpstairsText1 dw Route16GateUpstairsText2 dw Route16GateUpstairsText3 diff --git a/scripts/route17.asm b/scripts/Route17.asm similarity index 98% rename from scripts/route17.asm rename to scripts/Route17.asm index fb9f4cd8..dd92ac44 100755 --- a/scripts/route17.asm +++ b/scripts/Route17.asm @@ -1,18 +1,18 @@ -Route17Script: +Route17_Script: call EnableAutoTextBoxDrawing ld hl, Route17TrainerHeader0 - ld de, Route17ScriptPointers + ld de, Route17_ScriptPointers ld a, [wRoute17CurScript] call ExecuteCurMapScriptInTable ld [wRoute17CurScript], a ret -Route17ScriptPointers: +Route17_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route17TextPointers: +Route17_TextPointers: dw Route17Text1 dw Route17Text2 dw Route17Text3 diff --git a/scripts/route18.asm b/scripts/Route18.asm similarity index 96% rename from scripts/route18.asm rename to scripts/Route18.asm index 687b269c..022d41be 100755 --- a/scripts/route18.asm +++ b/scripts/Route18.asm @@ -1,18 +1,18 @@ -Route18Script: +Route18_Script: call EnableAutoTextBoxDrawing ld hl, Route18TrainerHeader0 - ld de, Route18ScriptPointers + ld de, Route18_ScriptPointers ld a, [wRoute18CurScript] call ExecuteCurMapScriptInTable ld [wRoute18CurScript], a ret -Route18ScriptPointers: +Route18_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route18TextPointers: +Route18_TextPointers: dw Route18Text1 dw Route18Text2 dw Route18Text3 diff --git a/scripts/route18gate.asm b/scripts/Route18Gate1F.asm similarity index 85% rename from scripts/route18gate.asm rename to scripts/Route18Gate1F.asm index 893801a1..812cb3e0 100755 --- a/scripts/route18gate.asm +++ b/scripts/Route18Gate1F.asm @@ -1,12 +1,12 @@ -Route18GateScript: +Route18Gate1F_Script: ld hl, wd732 res 5, [hl] call EnableAutoTextBoxDrawing - ld a, [wRoute18GateCurScript] - ld hl, Route18GateScriptPointers + ld a, [wRoute18Gate1FCurScript] + ld hl, Route18Gate1F_ScriptPointers jp CallFunctionInTable -Route18GateScriptPointers: +Route18Gate1F_ScriptPointers: dw Route18GateScript0 dw Route18GateScript1 dw Route18GateScript2 @@ -36,11 +36,11 @@ Route18GateScript0: call FillMemory call StartSimulatingJoypadStates ld a, $1 - ld [wRoute18GateCurScript], a + ld [wRoute18Gate1FCurScript], a ret .asm_498c6 ld a, $2 - ld [wRoute18GateCurScript], a + ld [wRoute18Gate1FCurScript], a ret CoordsData_498cc: @@ -67,7 +67,7 @@ Route18GateScript2: ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates ld a, $3 - ld [wRoute18GateCurScript], a + ld [wRoute18Gate1FCurScript], a ret Route18GateScript3: @@ -79,10 +79,10 @@ Route18GateScript3: ld hl, wd730 res 7, [hl] ld a, $0 - ld [wRoute18GateCurScript], a + ld [wRoute18Gate1FCurScript], a ret -Route18GateTextPointers: +Route18Gate1F_TextPointers: dw Route18GateText1 dw Route18GateText2 diff --git a/scripts/route18gateupstairs.asm b/scripts/Route18Gate2F.asm similarity index 91% rename from scripts/route18gateupstairs.asm rename to scripts/Route18Gate2F.asm index 3d623142..6987a099 100755 --- a/scripts/route18gateupstairs.asm +++ b/scripts/Route18Gate2F.asm @@ -1,7 +1,7 @@ -Route18GateUpstairsScript: +Route18Gate2F_Script: jp DisableAutoTextBoxDrawing -Route18GateUpstairsTextPointers: +Route18Gate2F_TextPointers: dw Route18GateUpstairsText1 dw Route18GateUpstairsText2 dw Route18GateUpstairsText3 diff --git a/scripts/route19.asm b/scripts/Route19.asm similarity index 98% rename from scripts/route19.asm rename to scripts/Route19.asm index 01ea5dce..6f603e05 100755 --- a/scripts/route19.asm +++ b/scripts/Route19.asm @@ -1,18 +1,18 @@ -Route19Script: +Route19_Script: call EnableAutoTextBoxDrawing ld hl, Route19TrainerHeader0 - ld de, Route19ScriptPointers + ld de, Route19_ScriptPointers ld a, [wRoute19CurScript] call ExecuteCurMapScriptInTable ld [wRoute19CurScript], a ret -Route19ScriptPointers: +Route19_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route19TextPointers: +Route19_TextPointers: dw Route19Text1 dw Route19Text2 dw Route19Text3 diff --git a/scripts/route2.asm b/scripts/Route2.asm similarity index 83% rename from scripts/route2.asm rename to scripts/Route2.asm index 810792ef..f4b1c8c4 100755 --- a/scripts/route2.asm +++ b/scripts/Route2.asm @@ -1,7 +1,7 @@ -Route2Script: +Route2_Script: jp EnableAutoTextBoxDrawing -Route2TextPointers: +Route2_TextPointers: dw PickUpItemText dw PickUpItemText dw Route2Text3 diff --git a/scripts/route20.asm b/scripts/Route20.asm similarity index 93% rename from scripts/route20.asm rename to scripts/Route20.asm index 53ff5e55..081a723e 100755 --- a/scripts/route20.asm +++ b/scripts/Route20.asm @@ -1,9 +1,9 @@ -Route20Script: +Route20_Script: CheckAndResetEvent EVENT_IN_SEAFOAM_ISLANDS call nz, Route20Script_50cc6 call EnableAutoTextBoxDrawing ld hl, Route20TrainerHeader0 - ld de, Route20ScriptPointers + ld de, Route20_ScriptPointers ld a, [wRoute20CurScript] call ExecuteCurMapScriptInTable ld [wRoute20CurScript], a @@ -12,9 +12,9 @@ Route20Script: Route20Script_50cc6: CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE jr z, .asm_50cef - ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_1 call Route20Script_50d0c - ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_2 call Route20Script_50d0c ld hl, .MissableObjectIDs .asm_50cdc @@ -27,24 +27,24 @@ Route20Script_50cc6: jr .asm_50cdc .MissableObjectIDs: - db HS_SEAFOAM_ISLANDS_2_BOULDER_1 - db HS_SEAFOAM_ISLANDS_2_BOULDER_2 - db HS_SEAFOAM_ISLANDS_3_BOULDER_1 - db HS_SEAFOAM_ISLANDS_3_BOULDER_2 - db HS_SEAFOAM_ISLANDS_4_BOULDER_3 - db HS_SEAFOAM_ISLANDS_4_BOULDER_4 + db HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 + db HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 + db HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 + db HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 + db HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 + db HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 db $FF .asm_50cef CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE ret z - ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 call Route20Script_50d0c - ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 call Route20Script_50d0c - ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 call Route20Script_50d14 - ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 call Route20Script_50d14 ret @@ -56,12 +56,12 @@ Route20Script_50d14: ld [wMissableObjectIndex], a predef_jump HideObject -Route20ScriptPointers: +Route20_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route20TextPointers: +Route20_TextPointers: dw Route20Text1 dw Route20Text2 dw Route20Text3 diff --git a/scripts/route21.asm b/scripts/Route21.asm similarity index 98% rename from scripts/route21.asm rename to scripts/Route21.asm index dcdc8022..15dacd5d 100755 --- a/scripts/route21.asm +++ b/scripts/Route21.asm @@ -1,18 +1,18 @@ -Route21Script: +Route21_Script: call EnableAutoTextBoxDrawing ld hl, Route21TrainerHeader0 - ld de, Route21ScriptPointers + ld de, Route21_ScriptPointers ld a, [wRoute21CurScript] call ExecuteCurMapScriptInTable ld [wRoute21CurScript], a ret -Route21ScriptPointers: +Route21_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route21TextPointers: +Route21_TextPointers: dw Route21Text1 dw Route21Text2 dw Route21Text3 diff --git a/scripts/route22.asm b/scripts/Route22.asm similarity index 98% rename from scripts/route22.asm rename to scripts/Route22.asm index 86c3768b..7226e509 100755 --- a/scripts/route22.asm +++ b/scripts/Route22.asm @@ -1,10 +1,10 @@ -Route22Script: +Route22_Script: call EnableAutoTextBoxDrawing - ld hl, Route22ScriptPointers + ld hl, Route22_ScriptPointers ld a, [wRoute22CurScript] jp CallFunctionInTable -Route22ScriptPointers: +Route22_ScriptPointers: dw Route22Script0 dw Route22Script1 dw Route22Script2 @@ -377,7 +377,7 @@ Route22Script6: ld [wRoute22CurScript], a ret -Route22TextPointers: +Route22_TextPointers: dw Route22Text1 dw Route22Text2 dw Route22FrontGateText diff --git a/scripts/route22gate.asm b/scripts/Route22Gate.asm similarity index 93% rename from scripts/route22gate.asm rename to scripts/Route22Gate.asm index ee2e5b6b..86b1220d 100755 --- a/scripts/route22gate.asm +++ b/scripts/Route22Gate.asm @@ -1,6 +1,6 @@ -Route22GateScript: +Route22Gate_Script: call EnableAutoTextBoxDrawing - ld hl, Route22GateScriptPointers + ld hl, Route22Gate_ScriptPointers ld a, [wRoute22GateCurScript] call CallFunctionInTable ld a, [wYCoord] @@ -12,7 +12,7 @@ Route22GateScript: ld [wLastMap], a ret -Route22GateScriptPointers: +Route22Gate_ScriptPointers: dw Route22GateScript0 dw Route22GateScript1 dw Route22GateScript2 @@ -53,7 +53,7 @@ Route22GateScript1: Route22GateScript2: ret -Route22GateTextPointers: +Route22Gate_TextPointers: dw Route22GateText1 Route22GateText1: diff --git a/scripts/route23.asm b/scripts/Route23.asm similarity index 96% rename from scripts/route23.asm rename to scripts/Route23.asm index 4eb6b5f7..e91e2c98 100755 --- a/scripts/route23.asm +++ b/scripts/Route23.asm @@ -1,7 +1,7 @@ -Route23Script: +Route23_Script: call Route23Script_511e9 call EnableAutoTextBoxDrawing - ld hl, Route23ScriptPointers + ld hl, Route23_ScriptPointers ld a, [wRoute23CurScript] jp CallFunctionInTable @@ -12,14 +12,14 @@ Route23Script_511e9: ret z ResetEvents EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1, EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2 ResetEvents EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1, EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2 - ld a, HS_VICTORY_ROAD_3_BOULDER + ld a, HS_VICTORY_ROAD_3F_BOULDER ld [wMissableObjectIndex], a predef ShowObject - ld a, HS_VICTORY_ROAD_2_BOULDER + ld a, HS_VICTORY_ROAD_2F_BOULDER ld [wMissableObjectIndex], a predef_jump HideObject -Route23ScriptPointers: +Route23_ScriptPointers: dw Route23Script0 dw Route23Script1 dw Route23Script2 @@ -131,7 +131,7 @@ Route23Script2: ld [wRoute23CurScript], a ret -Route23TextPointers: +Route23_TextPointers: dw Route23Text1 dw Route23Text2 dw Route23Text3 diff --git a/scripts/route24.asm b/scripts/Route24.asm similarity index 98% rename from scripts/route24.asm rename to scripts/Route24.asm index f55d2268..a8e16e7d 100755 --- a/scripts/route24.asm +++ b/scripts/Route24.asm @@ -1,7 +1,7 @@ -Route24Script: +Route24_Script: call EnableAutoTextBoxDrawing ld hl, Route24TrainerHeader0 - ld de, Route24ScriptPointers + ld de, Route24_ScriptPointers ld a, [wRoute24CurScript] call ExecuteCurMapScriptInTable ld [wRoute24CurScript], a @@ -14,7 +14,7 @@ Route24Script_513c0: ld [wCurMapScript], a ret -Route24ScriptPointers: +Route24_ScriptPointers: dw Route24Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -75,7 +75,7 @@ Route24Script3: ld [wCurMapScript], a ret -Route24TextPointers: +Route24_TextPointers: dw Route24Text1 dw Route24Text2 dw Route24Text3 diff --git a/scripts/route25.asm b/scripts/Route25.asm similarity index 98% rename from scripts/route25.asm rename to scripts/Route25.asm index c83c725b..7166919d 100755 --- a/scripts/route25.asm +++ b/scripts/Route25.asm @@ -1,8 +1,8 @@ -Route25Script: +Route25_Script: call Route25Script_515e1 call EnableAutoTextBoxDrawing ld hl, Route25TrainerHeader0 - ld de, Route25ScriptPointers + ld de, Route25_ScriptPointers ld a, [wRoute25CurScript] call ExecuteCurMapScriptInTable ld [wRoute25CurScript], a @@ -35,12 +35,12 @@ Route25Script_515e1: ld [wMissableObjectIndex], a predef_jump ShowObject -Route25ScriptPointers: +Route25_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route25TextPointers: +Route25_TextPointers: dw Route25Text1 dw Route25Text2 dw Route25Text3 diff --git a/scripts/route2gate.asm b/scripts/Route2Gate.asm similarity index 93% rename from scripts/route2gate.asm rename to scripts/Route2Gate.asm index 34f1aa35..70d93814 100755 --- a/scripts/route2gate.asm +++ b/scripts/Route2Gate.asm @@ -1,7 +1,7 @@ -Route2GateScript: +Route2Gate_Script: jp EnableAutoTextBoxDrawing -Route2GateTextPointers: +Route2Gate_TextPointers: dw Route2GateText1 dw Route2GateText2 diff --git a/scripts/route2house.asm b/scripts/Route2TradeHouse.asm similarity index 80% rename from scripts/route2house.asm rename to scripts/Route2TradeHouse.asm index 95055aec..a89e2fe9 100755 --- a/scripts/route2house.asm +++ b/scripts/Route2TradeHouse.asm @@ -1,7 +1,7 @@ -Route2HouseScript: +Route2TradeHouse_Script: jp EnableAutoTextBoxDrawing -Route2HouseTextPointers: +Route2TradeHouse_TextPointers: dw Route2HouseText1 dw Route2HouseText2 diff --git a/scripts/route3.asm b/scripts/Route3.asm similarity index 98% rename from scripts/route3.asm rename to scripts/Route3.asm index e4748b8c..d55831bf 100755 --- a/scripts/route3.asm +++ b/scripts/Route3.asm @@ -1,18 +1,18 @@ -Route3Script: +Route3_Script: call EnableAutoTextBoxDrawing ld hl, Route3TrainerHeader0 - ld de, Route3ScriptPointers + ld de, Route3_ScriptPointers ld a, [wRoute3CurScript] call ExecuteCurMapScriptInTable ld [wRoute3CurScript], a ret -Route3ScriptPointers: +Route3_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route3TextPointers: +Route3_TextPointers: dw Route3Text1 dw Route3Text2 dw Route3Text3 diff --git a/scripts/route4.asm b/scripts/Route4.asm similarity index 92% rename from scripts/route4.asm rename to scripts/Route4.asm index ee9e2cdf..9b04a47a 100755 --- a/scripts/route4.asm +++ b/scripts/Route4.asm @@ -1,18 +1,18 @@ -Route4Script: +Route4_Script: call EnableAutoTextBoxDrawing ld hl, Route4TrainerHeader0 - ld de, Route4ScriptPointers + ld de, Route4_ScriptPointers ld a, [wRoute4CurScript] call ExecuteCurMapScriptInTable ld [wRoute4CurScript], a ret -Route4ScriptPointers: +Route4_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route4TextPointers: +Route4_TextPointers: dw Route4Text1 dw Route4Text2 dw PickUpItemText diff --git a/scripts/route5.asm b/scripts/Route5.asm similarity index 71% rename from scripts/route5.asm rename to scripts/Route5.asm index 113212a4..1b2bd242 100755 --- a/scripts/route5.asm +++ b/scripts/Route5.asm @@ -1,7 +1,7 @@ -Route5Script: +Route5_Script: jp EnableAutoTextBoxDrawing -Route5TextPointers: +Route5_TextPointers: dw Route5Text1 Route5Text1: diff --git a/scripts/route5gate.asm b/scripts/Route5Gate.asm similarity index 94% rename from scripts/route5gate.asm rename to scripts/Route5Gate.asm index 6072f943..bc763dfd 100755 --- a/scripts/route5gate.asm +++ b/scripts/Route5Gate.asm @@ -1,10 +1,10 @@ -Route5GateScript: +Route5Gate_Script: call EnableAutoTextBoxDrawing ld a, [wRoute5GateCurScript] - ld hl, Route5GateScriptPointers + ld hl, Route5Gate_ScriptPointers jp CallFunctionInTable -Route5GateScriptPointers: +Route5Gate_ScriptPointers: dw Route5GateScript0 dw Route5GateScript1 @@ -60,7 +60,7 @@ Route5GateScript1: ld [wRoute5GateCurScript], a ret -Route5GateTextPointers: +Route5Gate_TextPointers: dw Route5GateText1 dw Route5GateText2 dw Route5GateText3 diff --git a/scripts/route6.asm b/scripts/Route6.asm similarity index 97% rename from scripts/route6.asm rename to scripts/Route6.asm index ba727adc..9f43b800 100755 --- a/scripts/route6.asm +++ b/scripts/Route6.asm @@ -1,18 +1,18 @@ -Route6Script: +Route6_Script: call EnableAutoTextBoxDrawing ld hl, Route6TrainerHeader0 - ld de, Route6ScriptPointers + ld de, Route6_ScriptPointers ld a, [wRoute6CurScript] call ExecuteCurMapScriptInTable ld [wRoute6CurScript], a ret -Route6ScriptPointers: +Route6_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route6TextPointers: +Route6_TextPointers: dw Route6Text1 dw Route6Text2 dw Route6Text3 diff --git a/scripts/route6gate.asm b/scripts/Route6Gate.asm similarity index 91% rename from scripts/route6gate.asm rename to scripts/Route6Gate.asm index cf872f69..348f61ac 100755 --- a/scripts/route6gate.asm +++ b/scripts/Route6Gate.asm @@ -1,11 +1,11 @@ -Route6GateScript: +Route6Gate_Script: call EnableAutoTextBoxDrawing - ld hl, Route6GateScriptPointers + ld hl, Route6Gate_ScriptPointers ld a, [wRoute6GateCurScript] call CallFunctionInTable ret -Route6GateScriptPointers: +Route6Gate_ScriptPointers: dw Route6GateScript0 dw Route6GateScript1 @@ -64,7 +64,7 @@ Route6GateScript_1e0a1: ld [wOverrideSimulatedJoypadStatesMask], a ret -Route6GateTextPointers: +Route6Gate_TextPointers: dw Route6GateText1 dw Route6GateText2 dw Route6GateText3 diff --git a/scripts/route7.asm b/scripts/Route7.asm similarity index 71% rename from scripts/route7.asm rename to scripts/Route7.asm index 5e8288ea..55774553 100755 --- a/scripts/route7.asm +++ b/scripts/Route7.asm @@ -1,7 +1,7 @@ -Route7Script: +Route7_Script: jp EnableAutoTextBoxDrawing -Route7TextPointers: +Route7_TextPointers: dw Route7Text1 Route7Text1: diff --git a/scripts/route7gate.asm b/scripts/Route7Gate.asm similarity index 91% rename from scripts/route7gate.asm rename to scripts/Route7Gate.asm index 6d4e27bb..724172c5 100755 --- a/scripts/route7gate.asm +++ b/scripts/Route7Gate.asm @@ -1,11 +1,11 @@ -Route7GateScript: +Route7Gate_Script: call EnableAutoTextBoxDrawing ld a, [wRoute7GateCurScript] - ld hl, Route7GateScriptPointers + ld hl, Route7Gate_ScriptPointers call CallFunctionInTable ret -Route7GateScriptPointers: +Route7Gate_ScriptPointers: dw Route7GateScript0 dw Route7GateScript1 @@ -67,7 +67,7 @@ Route7GateScript1: ld [wCurMapScript], a ret -Route7GateTextPointers: +Route7Gate_TextPointers: dw Route7GateText1 dw Route7GateText2 dw Route7GateText3 diff --git a/scripts/route8.asm b/scripts/Route8.asm similarity index 98% rename from scripts/route8.asm rename to scripts/Route8.asm index e05508bb..f3388505 100755 --- a/scripts/route8.asm +++ b/scripts/Route8.asm @@ -1,18 +1,18 @@ -Route8Script: +Route8_Script: call EnableAutoTextBoxDrawing ld hl, Route8TrainerHeader0 - ld de, Route8ScriptPointers + ld de, Route8_ScriptPointers ld a, [wRoute8CurScript] call ExecuteCurMapScriptInTable ld [wRoute8CurScript], a ret -Route8ScriptPointers: +Route8_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route8TextPointers: +Route8_TextPointers: dw Route8Text1 dw Route8Text2 dw Route8Text3 diff --git a/scripts/route8gate.asm b/scripts/Route8Gate.asm similarity index 91% rename from scripts/route8gate.asm rename to scripts/Route8Gate.asm index 28835f9d..8ecea68e 100755 --- a/scripts/route8gate.asm +++ b/scripts/Route8Gate.asm @@ -1,10 +1,10 @@ -Route8GateScript: +Route8Gate_Script: call EnableAutoTextBoxDrawing - ld hl, Route8GateScriptPointers + ld hl, Route8Gate_ScriptPointers ld a, [wRoute8GateCurScript] jp CallFunctionInTable -Route8GateScriptPointers: +Route8Gate_ScriptPointers: dw Route8GateScript0 dw Route8GateScript1 @@ -64,7 +64,7 @@ Route8GateScript1: ld [wRoute8GateCurScript], a ret -Route8GateTextPointers: +Route8Gate_TextPointers: dw Route8GateText1 dw Route8GateText2 dw Route8GateText3 diff --git a/scripts/route9.asm b/scripts/Route9.asm similarity index 98% rename from scripts/route9.asm rename to scripts/Route9.asm index c965d853..a18096f0 100755 --- a/scripts/route9.asm +++ b/scripts/Route9.asm @@ -1,18 +1,18 @@ -Route9Script: +Route9_Script: call EnableAutoTextBoxDrawing ld hl, Route9TrainerHeader0 - ld de, Route9ScriptPointers + ld de, Route9_ScriptPointers ld a, [wRoute9CurScript] call ExecuteCurMapScriptInTable ld [wRoute9CurScript], a ret -Route9ScriptPointers: +Route9_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route9TextPointers: +Route9_TextPointers: dw Route9Text1 dw Route9Text2 dw Route9Text3 diff --git a/scripts/ssanne1.asm b/scripts/SSAnne1F.asm similarity index 80% rename from scripts/ssanne1.asm rename to scripts/SSAnne1F.asm index 3f8861d5..5cace6ee 100755 --- a/scripts/ssanne1.asm +++ b/scripts/SSAnne1F.asm @@ -1,8 +1,8 @@ -SSAnne1Script: +SSAnne1F_Script: call EnableAutoTextBoxDrawing ret -SSAnne1TextPointers: +SSAnne1F_TextPointers: dw SSAnne1Text1 dw SSAnne1Text2 diff --git a/scripts/ssanne8.asm b/scripts/SSAnne1FRooms.asm similarity index 94% rename from scripts/ssanne8.asm rename to scripts/SSAnne1FRooms.asm index c684f84b..2371f286 100755 --- a/scripts/ssanne8.asm +++ b/scripts/SSAnne1FRooms.asm @@ -1,18 +1,18 @@ -SSAnne8Script: +SSAnne1FRooms_Script: call EnableAutoTextBoxDrawing ld hl, SSAnne8TrainerHeader0 - ld de, SSAnne8ScriptPointers - ld a, [wSSAnne8CurScript] + ld de, SSAnne1FRooms_ScriptPointers + ld a, [wSSAnne1FRoomsCurScript] call ExecuteCurMapScriptInTable - ld [wSSAnne8CurScript], a + ld [wSSAnne1FRoomsCurScript], a ret -SSAnne8ScriptPointers: +SSAnne1FRooms_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SSAnne8TextPointers: +SSAnne1FRooms_TextPointers: dw SSAnne8Text1 dw SSAnne8Text2 dw SSAnne8Text3 diff --git a/scripts/ssanne2.asm b/scripts/SSAnne2F.asm similarity index 91% rename from scripts/ssanne2.asm rename to scripts/SSAnne2F.asm index 654b881a..ba900748 100755 --- a/scripts/ssanne2.asm +++ b/scripts/SSAnne2F.asm @@ -1,16 +1,16 @@ -SSAnne2Script: +SSAnne2F_Script: call EnableAutoTextBoxDrawing - ld hl, SSAnne2ScriptPointers - ld a, [wSSAnne2CurScript] + ld hl, SSAnne2F_ScriptPointers + ld a, [wSSAnne2FCurScript] jp CallFunctionInTable SSAnne2Script_613ab: xor a ld [wJoyIgnore], a - ld [wSSAnne2CurScript], a + ld [wSSAnne2FCurScript], a ret -SSAnne2ScriptPointers: +SSAnne2F_ScriptPointers: dw SSAnne2Script0 dw SSAnne2Script1 dw SSAnne2Script2 @@ -32,7 +32,7 @@ SSAnne2Script0: call PlayMusic ld a, [wCoordIndex] ld [$ffdb], a - ld a, HS_SS_ANNE_2_RIVAL + ld a, HS_SS_ANNE_2F_RIVAL ld [wMissableObjectIndex], a predef ShowObject call Delay3 @@ -53,7 +53,7 @@ SSAnne2Script0: .asm_61403 call MoveSprite ld a, $1 - ld [wSSAnne2CurScript], a + ld [wSSAnne2FCurScript], a ret MovementData_6140c: @@ -118,7 +118,7 @@ SSAnne2Script1: call SSAnne2Script_61416 ld a, $2 - ld [wSSAnne2CurScript], a + ld [wSSAnne2FCurScript], a ret SSAnne2Script2: @@ -150,7 +150,7 @@ SSAnne2Script2: call PlaySound callba Music_RivalAlternateStart ld a, $3 - ld [wSSAnne2CurScript], a + ld [wSSAnne2FCurScript], a ret MovementData_614b7: @@ -170,15 +170,15 @@ SSAnne2Script3: ret nz xor a ld [wJoyIgnore], a - ld a, HS_SS_ANNE_2_RIVAL + ld a, HS_SS_ANNE_2F_RIVAL ld [wMissableObjectIndex], a predef HideObject call PlayDefaultMusic ld a, $4 - ld [wSSAnne2CurScript], a + ld [wSSAnne2FCurScript], a ret -SSAnne2TextPointers: +SSAnne2F_TextPointers: dw SSAnne2Text1 dw SSAnne2Text2 dw SSAnne2Text3 diff --git a/scripts/ssanne9.asm b/scripts/SSAnne2FRooms.asm similarity index 95% rename from scripts/ssanne9.asm rename to scripts/SSAnne2FRooms.asm index 1f965e0d..a79e1be8 100755 --- a/scripts/ssanne9.asm +++ b/scripts/SSAnne2FRooms.asm @@ -1,21 +1,21 @@ -SSAnne9Script: +SSAnne2FRooms_Script: ld a, $1 ld [wAutoTextBoxDrawingControl], a xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, SSAnne9TrainerHeader0 - ld de, SSAnne9ScriptPointers - ld a, [wSSAnne9CurScript] + ld de, SSAnne2FRooms_ScriptPointers + ld a, [wSSAnne2FRoomsCurScript] call ExecuteCurMapScriptInTable - ld [wSSAnne9CurScript], a + ld [wSSAnne2FRoomsCurScript], a ret -SSAnne9ScriptPointers: +SSAnne2FRooms_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SSAnne9TextPointers: +SSAnne2FRooms_TextPointers: dw SSAnne9Text1 dw SSAnne9Text2 dw SSAnne9Text3 diff --git a/scripts/ssanne3.asm b/scripts/SSAnne3F.asm similarity index 69% rename from scripts/ssanne3.asm rename to scripts/SSAnne3F.asm index e681591a..5da0e0c7 100755 --- a/scripts/ssanne3.asm +++ b/scripts/SSAnne3F.asm @@ -1,7 +1,7 @@ -SSAnne3Script: +SSAnne3F_Script: jp EnableAutoTextBoxDrawing -SSAnne3TextPointers: +SSAnne3F_TextPointers: dw SSAnne3Text1 SSAnne3Text1: diff --git a/scripts/SSAnneB1F.asm b/scripts/SSAnneB1F.asm new file mode 100755 index 00000000..25df076f --- /dev/null +++ b/scripts/SSAnneB1F.asm @@ -0,0 +1,5 @@ +SSAnneB1F_Script: + jp EnableAutoTextBoxDrawing + +SSAnneB1F_TextPointers: + db "@" diff --git a/scripts/ssanne10.asm b/scripts/SSAnneB1FRooms.asm similarity index 95% rename from scripts/ssanne10.asm rename to scripts/SSAnneB1FRooms.asm index 12433732..3777852c 100755 --- a/scripts/ssanne10.asm +++ b/scripts/SSAnneB1FRooms.asm @@ -1,18 +1,18 @@ -SSAnne10Script: +SSAnneB1FRooms_Script: call EnableAutoTextBoxDrawing ld hl, SSAnne10TrainerHeader0 - ld de, SSAnne10ScriptPointers - ld a, [wSSAnne10CurScript] + ld de, SSAnneB1FRooms_ScriptPointers + ld a, [wSSAnneB1FRoomsCurScript] call ExecuteCurMapScriptInTable - ld [wSSAnne10CurScript], a + ld [wSSAnneB1FRoomsCurScript], a ret -SSAnne10ScriptPointers: +SSAnneB1FRooms_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SSAnne10TextPointers: +SSAnneB1FRooms_TextPointers: dw SSAnne10Text1 dw SSAnne10Text2 dw SSAnne10Text3 diff --git a/scripts/ssanne5.asm b/scripts/SSAnneBow.asm similarity index 91% rename from scripts/ssanne5.asm rename to scripts/SSAnneBow.asm index 0cfef9f4..4569f0f8 100755 --- a/scripts/ssanne5.asm +++ b/scripts/SSAnneBow.asm @@ -1,18 +1,18 @@ -SSAnne5Script: +SSAnneBow_Script: call EnableAutoTextBoxDrawing ld hl, SSAnne5TrainerHeader0 - ld de, SSAnne5ScriptPointers - ld a, [wSSAnne5CurScript] + ld de, SSAnneBow_ScriptPointers + ld a, [wSSAnneBowCurScript] call ExecuteCurMapScriptInTable - ld [wSSAnne5CurScript], a + ld [wSSAnneBowCurScript], a ret -SSAnne5ScriptPointers: +SSAnneBow_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SSAnne5TextPointers: +SSAnneBow_TextPointers: dw SSAnne5Text1 dw SSAnne5Text2 dw SSAnne5Text3 diff --git a/scripts/ssanne7.asm b/scripts/SSAnneCaptainsRoom.asm similarity index 96% rename from scripts/ssanne7.asm rename to scripts/SSAnneCaptainsRoom.asm index 0df842c2..de0272e4 100755 --- a/scripts/ssanne7.asm +++ b/scripts/SSAnneCaptainsRoom.asm @@ -1,4 +1,4 @@ -SSAnne7Script: +SSAnneCaptainsRoom_Script: call SSAnne7Script_6189b jp EnableAutoTextBoxDrawing @@ -9,7 +9,7 @@ SSAnne7Script_6189b: set 5, [hl] ret -SSAnne7TextPointers: +SSAnneCaptainsRoom_TextPointers: dw SSAnne7Text1 dw SSAnne7Text2 dw SSAnne7Text3 diff --git a/scripts/ssanne6.asm b/scripts/SSAnneKitchen.asm similarity index 95% rename from scripts/ssanne6.asm rename to scripts/SSAnneKitchen.asm index e1998858..137706a0 100755 --- a/scripts/ssanne6.asm +++ b/scripts/SSAnneKitchen.asm @@ -1,8 +1,8 @@ -SSAnne6Script: +SSAnneKitchen_Script: call EnableAutoTextBoxDrawing ret -SSAnne6TextPointers: +SSAnneKitchen_TextPointers: dw SSAnne6Text1 dw SSAnne6Text2 dw SSAnne6Text3 diff --git a/scripts/safarizonecenter.asm b/scripts/SafariZoneCenter.asm similarity index 80% rename from scripts/safarizonecenter.asm rename to scripts/SafariZoneCenter.asm index d796c403..0a266887 100755 --- a/scripts/safarizonecenter.asm +++ b/scripts/SafariZoneCenter.asm @@ -1,7 +1,7 @@ -SafariZoneCenterScript: +SafariZoneCenter_Script: jp EnableAutoTextBoxDrawing -SafariZoneCenterTextPointers: +SafariZoneCenter_TextPointers: dw PickUpItemText dw SafariZoneCenterText2 dw SafariZoneCenterText3 diff --git a/scripts/safarizoneresthouse1.asm b/scripts/SafariZoneCenterRestHouse.asm similarity index 75% rename from scripts/safarizoneresthouse1.asm rename to scripts/SafariZoneCenterRestHouse.asm index 1d43890d..a652644b 100755 --- a/scripts/safarizoneresthouse1.asm +++ b/scripts/SafariZoneCenterRestHouse.asm @@ -1,7 +1,7 @@ -SafariZoneRestHouse1Script: +SafariZoneCenterRestHouse_Script: jp EnableAutoTextBoxDrawing -SafariZoneRestHouse1TextPointers: +SafariZoneCenterRestHouse_TextPointers: dw SafariZoneRestHouse1Text1 dw SafariZoneRestHouse1Text2 diff --git a/scripts/safarizoneeast.asm b/scripts/SafariZoneEast.asm similarity index 87% rename from scripts/safarizoneeast.asm rename to scripts/SafariZoneEast.asm index 25d0ee30..7f4a5543 100755 --- a/scripts/safarizoneeast.asm +++ b/scripts/SafariZoneEast.asm @@ -1,7 +1,7 @@ -SafariZoneEastScript: +SafariZoneEast_Script: jp EnableAutoTextBoxDrawing -SafariZoneEastTextPointers: +SafariZoneEast_TextPointers: dw PickUpItemText dw PickUpItemText dw PickUpItemText diff --git a/scripts/safarizoneresthouse3.asm b/scripts/SafariZoneEastRestHouse.asm similarity index 82% rename from scripts/safarizoneresthouse3.asm rename to scripts/SafariZoneEastRestHouse.asm index 18c4770f..24141459 100755 --- a/scripts/safarizoneresthouse3.asm +++ b/scripts/SafariZoneEastRestHouse.asm @@ -1,8 +1,8 @@ -SafariZoneRestHouse3Script: +SafariZoneEastRestHouse_Script: call EnableAutoTextBoxDrawing ret -SafariZoneRestHouse3TextPointers: +SafariZoneEastRestHouse_TextPointers: dw SafariZoneRestHouse3Text1 dw SafariZoneRestHouse3Text2 dw SafariZoneRestHouse3Text3 diff --git a/scripts/safarizoneentrance.asm b/scripts/SafariZoneGate.asm similarity index 90% rename from scripts/safarizoneentrance.asm rename to scripts/SafariZoneGate.asm index 5c6002a9..f3de556b 100755 --- a/scripts/safarizoneentrance.asm +++ b/scripts/SafariZoneGate.asm @@ -1,10 +1,10 @@ -SafariZoneEntranceScript: +SafariZoneGate_Script: call EnableAutoTextBoxDrawing - ld hl, SafariZoneEntranceScriptPointers - ld a, [wSafariZoneEntranceCurScript] + ld hl, SafariZoneGate_ScriptPointers + ld a, [wSafariZoneGateCurScript] jp CallFunctionInTable -SafariZoneEntranceScriptPointers: +SafariZoneGate_ScriptPointers: dw .SafariZoneEntranceScript0 dw .SafariZoneEntranceScript1 dw .SafariZoneEntranceScript2 @@ -30,7 +30,7 @@ SafariZoneEntranceScriptPointers: cp $1 jr z, .asm_7520f ld a, $2 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a ret .asm_7520f ld a, D_RIGHT @@ -39,7 +39,7 @@ SafariZoneEntranceScriptPointers: ld a, $f0 ld [wJoyIgnore], a ld a, $1 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a ret .CoordsData_75221: @@ -68,7 +68,7 @@ SafariZoneEntranceScriptPointers: xor a ld [wJoyIgnore], a ld a, $5 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a ret .SafariZoneEntranceScript5 @@ -89,7 +89,7 @@ SafariZoneEntranceScriptPointers: ld c, $3 call SafariZoneEntranceAutoWalk ld a, $4 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a jr .asm_75286 .asm_7527f ld a, $5 @@ -104,7 +104,7 @@ SafariZoneEntranceScriptPointers: xor a ld [wJoyIgnore], a ld a, $0 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a ret .SafariZoneEntranceScript6 @@ -112,7 +112,7 @@ SafariZoneEntranceScriptPointers: ret nz call Delay3 ld a, [wcf0d] - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a ret SafariZoneEntranceAutoWalk: @@ -130,7 +130,7 @@ SafariZoneEntranceScript_752b4: and a ret -SafariZoneEntranceTextPointers: +SafariZoneGate_TextPointers: dw .SafariZoneEntranceText1 dw .SafariZoneEntranceText2 dw .SafariZoneEntranceText1 @@ -192,7 +192,7 @@ SafariZoneEntranceTextPointers: SetEvent EVENT_IN_SAFARI_ZONE ResetEventReuseHL EVENT_SAFARI_GAME_OVER ld a, 3 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a jr .done .PleaseComeAgain @@ -203,7 +203,7 @@ SafariZoneEntranceTextPointers: ld c, 1 call SafariZoneEntranceAutoWalk ld a, 4 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a .done jp TextScriptEnd @@ -251,7 +251,7 @@ SafariZoneEntranceTextPointers: ld [wcf0d], a .asm_753b3 ld a, $6 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a jp TextScriptEnd .SafariZoneEntranceText_753bb diff --git a/scripts/safarizonenorth.asm b/scripts/SafariZoneNorth.asm similarity index 90% rename from scripts/safarizonenorth.asm rename to scripts/SafariZoneNorth.asm index b870c99e..734328b4 100755 --- a/scripts/safarizonenorth.asm +++ b/scripts/SafariZoneNorth.asm @@ -1,7 +1,7 @@ -SafariZoneNorthScript: +SafariZoneNorth_Script: jp EnableAutoTextBoxDrawing -SafariZoneNorthTextPointers: +SafariZoneNorth_TextPointers: dw PickUpItemText dw PickUpItemText dw SafariZoneNorthText3 diff --git a/scripts/safarizoneresthouse4.asm b/scripts/SafariZoneNorthRestHouse.asm similarity index 82% rename from scripts/safarizoneresthouse4.asm rename to scripts/SafariZoneNorthRestHouse.asm index 3ff3fa48..fdc438f4 100755 --- a/scripts/safarizoneresthouse4.asm +++ b/scripts/SafariZoneNorthRestHouse.asm @@ -1,8 +1,8 @@ -SafariZoneRestHouse4Script: +SafariZoneNorthRestHouse_Script: call EnableAutoTextBoxDrawing ret -SafariZoneRestHouse4TextPointers: +SafariZoneNorthRestHouse_TextPointers: dw SafariZoneRestHouse4Text1 dw SafariZoneRestHouse4Text2 dw SafariZoneRestHouse4Text3 diff --git a/scripts/safarizonesecrethouse.asm b/scripts/SafariZoneSecretHouse.asm similarity index 91% rename from scripts/safarizonesecrethouse.asm rename to scripts/SafariZoneSecretHouse.asm index 44c89281..2d9b2305 100755 --- a/scripts/safarizonesecrethouse.asm +++ b/scripts/SafariZoneSecretHouse.asm @@ -1,7 +1,7 @@ -SafariZoneSecretHouseScript: +SafariZoneSecretHouse_Script: jp EnableAutoTextBoxDrawing -SafariZoneSecretHouseTextPointers: +SafariZoneSecretHouse_TextPointers: dw SafariZoneSecretHouseText1 SafariZoneSecretHouseText1: diff --git a/scripts/safarizonewest.asm b/scripts/SafariZoneWest.asm similarity index 89% rename from scripts/safarizonewest.asm rename to scripts/SafariZoneWest.asm index 81190c4c..483a92ee 100755 --- a/scripts/safarizonewest.asm +++ b/scripts/SafariZoneWest.asm @@ -1,7 +1,7 @@ -SafariZoneWestScript: +SafariZoneWest_Script: jp EnableAutoTextBoxDrawing -SafariZoneWestTextPointers: +SafariZoneWest_TextPointers: dw PickUpItemText dw PickUpItemText dw PickUpItemText diff --git a/scripts/safarizoneresthouse2.asm b/scripts/SafariZoneWestRestHouse.asm similarity index 82% rename from scripts/safarizoneresthouse2.asm rename to scripts/SafariZoneWestRestHouse.asm index 4cd512f2..371bd56c 100755 --- a/scripts/safarizoneresthouse2.asm +++ b/scripts/SafariZoneWestRestHouse.asm @@ -1,8 +1,8 @@ -SafariZoneRestHouse2Script: +SafariZoneWestRestHouse_Script: call EnableAutoTextBoxDrawing ret -SafariZoneRestHouse2TextPointers: +SafariZoneWestRestHouse_TextPointers: dw SafariZoneRestHouse2Text1 dw SafariZoneRestHouse2Text2 dw SafariZoneRestHouse2Text3 diff --git a/scripts/saffroncity.asm b/scripts/SaffronCity.asm similarity index 97% rename from scripts/saffroncity.asm rename to scripts/SaffronCity.asm index 57a1a3a5..02e6e2bb 100755 --- a/scripts/saffroncity.asm +++ b/scripts/SaffronCity.asm @@ -1,7 +1,7 @@ -SaffronCityScript: +SaffronCity_Script: jp EnableAutoTextBoxDrawing -SaffronCityTextPointers: +SaffronCity_TextPointers: dw SaffronCityText1 dw SaffronCityText2 dw SaffronCityText3 diff --git a/scripts/saffrongym.asm b/scripts/SaffronGym.asm similarity index 98% rename from scripts/saffrongym.asm rename to scripts/SaffronGym.asm index cbf935e7..e51763e5 100755 --- a/scripts/saffrongym.asm +++ b/scripts/SaffronGym.asm @@ -1,11 +1,11 @@ -SaffronGymScript: +SaffronGym_Script: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, .extra call EnableAutoTextBoxDrawing ld hl, SaffronGymTrainerHeader0 - ld de, SaffronGymScriptPointers + ld de, SaffronGym_ScriptPointers ld a, [wSaffronGymCurScript] call ExecuteCurMapScriptInTable ld [wSaffronGymCurScript], a @@ -29,7 +29,7 @@ SaffronGymText_5d048: ld [wCurMapScript], a ret -SaffronGymScriptPointers: +SaffronGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -70,7 +70,7 @@ SaffronGymText_5d068: jp SaffronGymText_5d048 -SaffronGymTextPointers: +SaffronGym_TextPointers: dw SaffronGymText1 dw SaffronGymText2 dw SaffronGymText3 diff --git a/scripts/saffronmart.asm b/scripts/SaffronMart.asm similarity index 81% rename from scripts/saffronmart.asm rename to scripts/SaffronMart.asm index 8b140610..ebb3cddf 100755 --- a/scripts/saffronmart.asm +++ b/scripts/SaffronMart.asm @@ -1,7 +1,7 @@ -SaffronMartScript: +SaffronMart_Script: jp EnableAutoTextBoxDrawing -SaffronMartTextPointers: +SaffronMart_TextPointers: dw SaffronCashierText dw SaffronMartText2 dw SaffronMartText3 diff --git a/scripts/saffronhouse1.asm b/scripts/SaffronPidgeyHouse.asm similarity index 86% rename from scripts/saffronhouse1.asm rename to scripts/SaffronPidgeyHouse.asm index 5f417978..f38fbfdb 100755 --- a/scripts/saffronhouse1.asm +++ b/scripts/SaffronPidgeyHouse.asm @@ -1,7 +1,7 @@ -SaffronHouse1Script: +SaffronPidgeyHouse_Script: jp EnableAutoTextBoxDrawing -SaffronHouse1TextPointers: +SaffronPidgeyHouse_TextPointers: dw SaffronHouse1Text1 dw SaffronHouse1Text2 dw SaffronHouse1Text3 diff --git a/scripts/saffronpokecenter.asm b/scripts/SaffronPokecenter.asm similarity index 87% rename from scripts/saffronpokecenter.asm rename to scripts/SaffronPokecenter.asm index 82467215..a1d73628 100755 --- a/scripts/saffronpokecenter.asm +++ b/scripts/SaffronPokecenter.asm @@ -1,8 +1,8 @@ -SaffronPokecenterScript: +SaffronPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -SaffronPokecenterTextPointers: +SaffronPokecenter_TextPointers: dw SaffronHealNurseText dw SaffronPokecenterText2 dw SaffronPokecenterText3 diff --git a/scripts/seafoamislands1.asm b/scripts/SeafoamIslands1F.asm similarity index 81% rename from scripts/seafoamislands1.asm rename to scripts/SeafoamIslands1F.asm index 52561fa7..dc3b8599 100755 --- a/scripts/seafoamislands1.asm +++ b/scripts/SeafoamIslands1F.asm @@ -1,4 +1,4 @@ -SeafoamIslands1Script: +SeafoamIslands1F_Script: call EnableAutoTextBoxDrawing SetEvent EVENT_IN_SEAFOAM_ISLANDS ld hl, wFlags_0xcd60 @@ -13,16 +13,16 @@ SeafoamIslands1Script: cp $1 jr nz, .asm_44819 SetEventReuseHL EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_1 ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ld [wObjectToShow], a jr .asm_44825 .asm_44819 SetEventAfterBranchReuseHL EVENT_SEAFOAM1_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_2 ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ld [wObjectToShow], a .asm_44825 ld a, [wObjectToHide] @@ -42,6 +42,6 @@ Seafoam1HolesCoords: db $06,$18 db $ff -SeafoamIslands1TextPointers: +SeafoamIslands1F_TextPointers: dw BoulderText dw BoulderText diff --git a/scripts/seafoamislands2.asm b/scripts/SeafoamIslandsB1F.asm similarity index 80% rename from scripts/seafoamislands2.asm rename to scripts/SeafoamIslandsB1F.asm index 50024bad..876c0837 100755 --- a/scripts/seafoamislands2.asm +++ b/scripts/SeafoamIslandsB1F.asm @@ -1,4 +1,4 @@ -SeafoamIslands2Script: +SeafoamIslandsB1F_Script: call EnableAutoTextBoxDrawing ld hl, wFlags_0xcd60 bit 7, [hl] @@ -12,16 +12,16 @@ SeafoamIslands2Script: cp $1 jr nz, .asm_46340 SetEventReuseHL EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ld [wObjectToShow], a jr .asm_4634c .asm_46340 SetEventAfterBranchReuseHL EVENT_SEAFOAM2_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ld [wObjectToShow], a .asm_4634c ld a, [wObjectToHide] @@ -41,6 +41,6 @@ Seafoam2HolesCoords: db $06,$17 db $ff -SeafoamIslands2TextPointers: +SeafoamIslandsB1F_TextPointers: dw BoulderText dw BoulderText diff --git a/scripts/seafoamislands3.asm b/scripts/SeafoamIslandsB2F.asm similarity index 80% rename from scripts/seafoamislands3.asm rename to scripts/SeafoamIslandsB2F.asm index 4a7848a4..c0141a3e 100755 --- a/scripts/seafoamislands3.asm +++ b/scripts/SeafoamIslandsB2F.asm @@ -1,4 +1,4 @@ -SeafoamIslands3Script: +SeafoamIslandsB2F_Script: call EnableAutoTextBoxDrawing ld hl, wFlags_0xcd60 bit 7, [hl] @@ -12,16 +12,16 @@ SeafoamIslands3Script: cp $1 jr nz, .asm_4647c SetEventReuseHL EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_3 + ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 ld [wObjectToShow], a jr .asm_46488 .asm_4647c SetEventAfterBranchReuseHL EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_4 + ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 ld [wObjectToShow], a .asm_46488 ld a, [wObjectToHide] @@ -41,6 +41,6 @@ Seafoam3HolesCoords: db $06,$16 db $ff -SeafoamIslands3TextPointers: +SeafoamIslandsB2F_TextPointers: dw BoulderText dw BoulderText diff --git a/scripts/seafoamislands4.asm b/scripts/SeafoamIslandsB3F.asm similarity index 83% rename from scripts/seafoamislands4.asm rename to scripts/SeafoamIslandsB3F.asm index 34873004..7343b17d 100755 --- a/scripts/seafoamislands4.asm +++ b/scripts/SeafoamIslandsB3F.asm @@ -1,4 +1,4 @@ -SeafoamIslands4Script: +SeafoamIslandsB3F_Script: call EnableAutoTextBoxDrawing ld hl, wFlags_0xcd60 bit 7, [hl] @@ -12,16 +12,16 @@ SeafoamIslands4Script: cp $1 jr nz, .asm_465b8 SetEventReuseHL EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ld [wObjectToShow], a jr .asm_465c4 .asm_465b8 SetEventAfterBranchReuseHL EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ld [wObjectToShow], a .asm_465c4 ld a, [wObjectToHide] @@ -40,8 +40,8 @@ SeafoamIslands4Script: bit 4, a ret nz .asm_465ed - ld hl, SeafoamIslands4ScriptPointers - ld a, [wSeafoamIslands4CurScript] + ld hl, SeafoamIslandsB3F_ScriptPointers + ld a, [wSeafoamIslandsB3FCurScript] jp CallFunctionInTable Seafoam4HolesCoords: @@ -49,7 +49,7 @@ Seafoam4HolesCoords: db $10,$06 db $ff -SeafoamIslands4ScriptPointers: +SeafoamIslandsB3F_ScriptPointers: dw SeafoamIslands4Script0 dw SeafoamIslands4Script1 dw SeafoamIslands4Script2 @@ -73,7 +73,7 @@ SeafoamIslands4Script0: ld hl, wFlags_D733 set 2, [hl] ld a, $1 - ld [wSeafoamIslands4CurScript], a + ld [wSeafoamIslandsB3FCurScript], a ret RLEMovement46632: @@ -87,7 +87,7 @@ SeafoamIslands4Script1: and a ret nz ld a, $0 - ld [wSeafoamIslands4CurScript], a + ld [wSeafoamIslandsB3FCurScript], a ret SeafoamIslands4Script2: @@ -116,7 +116,7 @@ SeafoamIslands4Script2: set 2, [hl] ld a, $3 .asm_4667b - ld [wSeafoamIslands4CurScript], a + ld [wSeafoamIslandsB3FCurScript], a ret RLEData_4667f: @@ -137,10 +137,10 @@ SeafoamIslands4Script3: and a ret nz ld a, $0 - ld [wSeafoamIslands4CurScript], a + ld [wSeafoamIslandsB3FCurScript], a ret -SeafoamIslands4TextPointers: +SeafoamIslandsB3F_TextPointers: dw BoulderText dw BoulderText dw BoulderText diff --git a/scripts/seafoamislands5.asm b/scripts/SeafoamIslandsB4F.asm similarity index 86% rename from scripts/seafoamislands5.asm rename to scripts/SeafoamIslandsB4F.asm index a233fb6a..d08628d0 100755 --- a/scripts/seafoamislands5.asm +++ b/scripts/SeafoamIslandsB4F.asm @@ -1,16 +1,16 @@ -SeafoamIslands5Script: +SeafoamIslandsB4F_Script: call EnableAutoTextBoxDrawing - ld a, [wSeafoamIslands5CurScript] - ld hl, SeafoamIslands5ScriptPointers + ld a, [wSeafoamIslandsB4FCurScript] + ld hl, SeafoamIslandsB4F_ScriptPointers jp CallFunctionInTable SeafoamIslands5Script_467a5: xor a - ld [wSeafoamIslands5CurScript], a + ld [wSeafoamIslandsB4FCurScript], a ld [wJoyIgnore], a ret -SeafoamIslands5ScriptPointers: +SeafoamIslandsB4F_ScriptPointers: dw SeafoamIslands5Script0 dw SeafoamIslands5Script1 dw SeafoamIslands5Script2 @@ -23,7 +23,7 @@ SeafoamIslands5Script4: jr z, SeafoamIslands5Script_467a5 call EndTrainerBattle ld a, $0 - ld [wSeafoamIslands5CurScript], a + ld [wSeafoamIslandsB4FCurScript], a ret SeafoamIslands5Script0: @@ -49,7 +49,7 @@ SeafoamIslands5Script0: ld hl, wFlags_D733 res 2, [hl] ld a, $1 - ld [wSeafoamIslands5CurScript], a + ld [wSeafoamIslandsB4FCurScript], a ret .Coords @@ -66,7 +66,7 @@ SeafoamIslands5Script1: xor a ld [wJoyIgnore], a ld a, $0 - ld [wSeafoamIslands5CurScript], a + ld [wSeafoamIslandsB4FCurScript], a ret SeafoamIslands5Script2: @@ -92,7 +92,7 @@ SeafoamIslands5Script2: call StartSimulatingJoypadStates ld a, $3 .asm_46849 - ld [wSeafoamIslands5CurScript], a + ld [wSeafoamIslandsB4FCurScript], a ret .Coords @@ -121,7 +121,7 @@ SeafoamIslands5Script3: and a ret nz ld a, $0 - ld [wSeafoamIslands5CurScript], a + ld [wSeafoamIslandsB4FCurScript], a ret SeaFoamIslands5Script_46872: @@ -130,7 +130,7 @@ SeaFoamIslands5Script_46872: ld [wWalkBikeSurfStateCopy], a jp ForceBikeOrSurf -SeafoamIslands5TextPointers: +SeafoamIslandsB4F_TextPointers: dw BoulderText dw BoulderText dw ArticunoText @@ -153,7 +153,7 @@ ArticunoText: ld hl, ArticunoTrainerHeader call TalkToTrainer ld a, $4 - ld [wSeafoamIslands5CurScript], a + ld [wSeafoamIslandsB4FCurScript], a jp TextScriptEnd ArticunoBattleText: diff --git a/scripts/silphco10.asm b/scripts/SilphCo10F.asm similarity index 93% rename from scripts/silphco10.asm rename to scripts/SilphCo10F.asm index 5cfb92b2..40506682 100755 --- a/scripts/silphco10.asm +++ b/scripts/SilphCo10F.asm @@ -1,11 +1,11 @@ -SilphCo10Script: +SilphCo10F_Script: call SilphCo10Script_5a14f call EnableAutoTextBoxDrawing ld hl, SilphCo10TrainerHeader0 - ld de, SilphCo10ScriptPointers - ld a, [wSilphCo10CurScript] + ld de, SilphCo10F_ScriptPointers + ld a, [wSilphCo10FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo10CurScript], a + ld [wSilphCo10FCurScript], a ret SilphCo10Script_5a14f: @@ -34,12 +34,12 @@ SilphCo10Text_5a176: SetEvent EVENT_SILPH_CO_10_UNLOCKED_DOOR ret -SilphCo10ScriptPointers: +SilphCo10F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo10TextPointers: +SilphCo10F_TextPointers: dw SilphCo10Text1 dw SilphCo10Text2 dw SilphCo10Text3 diff --git a/scripts/silphco11.asm b/scripts/SilphCo11F.asm similarity index 97% rename from scripts/silphco11.asm rename to scripts/SilphCo11F.asm index 342fef07..483082a1 100755 --- a/scripts/silphco11.asm +++ b/scripts/SilphCo11F.asm @@ -1,11 +1,11 @@ -SilphCo11Script: +SilphCo11F_Script: call SilphCo11Script_62110 call EnableAutoTextBoxDrawing ld hl, SilphCo11TrainerHeader0 - ld de, SilphCo11ScriptPointers - ld a, [wSilphCo11CurScript] + ld de, SilphCo11F_ScriptPointers + ld a, [wSilphCo11FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo11CurScript], a + ld [wSilphCo11FCurScript], a ret SilphCo11Script_62110: @@ -150,11 +150,11 @@ SilphCo11Script_621c4: ld [wJoyIgnore], a SilphCo11Script_621c8: - ld [wSilphCo11CurScript], a + ld [wSilphCo11FCurScript], a ld [wCurMapScript], a ret -SilphCo11ScriptPointers: +SilphCo11F_ScriptPointers: dw SilphCo11Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -272,7 +272,7 @@ SilphCo11Script4: ld a, $5 jp SilphCo11Script_621c8 -SilphCo11TextPointers: +SilphCo11F_TextPointers: dw SilphCo11Text1 dw SilphCo11Text2 dw SilphCo11Text3 diff --git a/scripts/silphco1.asm b/scripts/SilphCo1F.asm similarity index 87% rename from scripts/silphco1.asm rename to scripts/SilphCo1F.asm index c0cb169b..6ccaa29c 100755 --- a/scripts/silphco1.asm +++ b/scripts/SilphCo1F.asm @@ -1,4 +1,4 @@ -SilphCo1Script: +SilphCo1F_Script: call EnableAutoTextBoxDrawing CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI ret z @@ -8,7 +8,7 @@ SilphCo1Script: ld [wMissableObjectIndex], a predef_jump ShowObject -SilphCo1TextPointers: +SilphCo1F_TextPointers: dw SilphCo1Text1 SilphCo1Text1: diff --git a/scripts/silphco2.asm b/scripts/SilphCo2F.asm similarity index 96% rename from scripts/silphco2.asm rename to scripts/SilphCo2F.asm index e77c45dd..5fd542cb 100755 --- a/scripts/silphco2.asm +++ b/scripts/SilphCo2F.asm @@ -1,11 +1,11 @@ -SilphCo2Script: +SilphCo2F_Script: call SilphCo2Script_59d07 call EnableAutoTextBoxDrawing ld hl, SilphCo2TrainerHeader0 - ld de, SilphCo2ScriptPointers - ld a, [wSilphCo2CurScript] + ld de, SilphCo2F_ScriptPointers + ld a, [wSilphCo2FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo2CurScript], a + ld [wSilphCo2FCurScript], a ret SilphCo2Script_59d07: @@ -86,12 +86,12 @@ SilphCo2Script_59d6f: SetEventAfterBranchReuseHL EVENT_SILPH_CO_2_UNLOCKED_DOOR2, EVENT_SILPH_CO_2_UNLOCKED_DOOR1 ret -SilphCo2ScriptPointers: +SilphCo2F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo2TextPointers: +SilphCo2F_TextPointers: dw SilphCo2Text1 dw SilphCo2Text2 dw SilphCo2Text3 diff --git a/scripts/silphco3.asm b/scripts/SilphCo3F.asm similarity index 94% rename from scripts/silphco3.asm rename to scripts/SilphCo3F.asm index 0d12b768..42b5d611 100755 --- a/scripts/silphco3.asm +++ b/scripts/SilphCo3F.asm @@ -1,11 +1,11 @@ -SilphCo3Script: +SilphCo3F_Script: call SilphCo3Script_59f71 call EnableAutoTextBoxDrawing ld hl, SilphCo3TrainerHeader0 - ld de, SilphCo3ScriptPointers - ld a, [wSilphCo3CurScript] + ld de, SilphCo3F_ScriptPointers + ld a, [wSilphCo3FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo3CurScript], a + ld [wSilphCo3FCurScript], a ret SilphCo3Script_59f71: @@ -50,12 +50,12 @@ SilphCo3Script_59fad: SetEventAfterBranchReuseHL EVENT_SILPH_CO_3_UNLOCKED_DOOR2, EVENT_SILPH_CO_3_UNLOCKED_DOOR1 ret -SilphCo3ScriptPointers: +SilphCo3F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo3TextPointers: +SilphCo3F_TextPointers: dw SilphCo3Text1 dw SilphCo3Text2 dw SilphCo3Text3 diff --git a/scripts/silphco4.asm b/scripts/SilphCo4F.asm similarity index 95% rename from scripts/silphco4.asm rename to scripts/SilphCo4F.asm index 1cfd1ceb..7d5072f6 100755 --- a/scripts/silphco4.asm +++ b/scripts/SilphCo4F.asm @@ -1,11 +1,11 @@ -SilphCo4Script: +SilphCo4F_Script: call SilphCo4Script_19d21 call EnableAutoTextBoxDrawing ld hl, SilphCo4TrainerHeader0 - ld de, SilphCo4ScriptPointers - ld a, [wSilphCo4CurScript] + ld de, SilphCo4F_ScriptPointers + ld a, [wSilphCo4FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo4CurScript], a + ld [wSilphCo4FCurScript], a ret SilphCo4Script_19d21: @@ -86,12 +86,12 @@ SilphCo4Script_19d89: SetEventAfterBranchReuseHL EVENT_SILPH_CO_4_UNLOCKED_DOOR2, EVENT_SILPH_CO_4_UNLOCKED_DOOR1 ret -SilphCo4ScriptPointers: +SilphCo4F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo4TextPointers: +SilphCo4F_TextPointers: dw SilphCo4Text1 dw SilphCo4Text2 dw SilphCo4Text3 diff --git a/scripts/silphco5.asm b/scripts/SilphCo5F.asm similarity index 96% rename from scripts/silphco5.asm rename to scripts/SilphCo5F.asm index 45a81b68..d9deda5b 100755 --- a/scripts/silphco5.asm +++ b/scripts/SilphCo5F.asm @@ -1,11 +1,11 @@ -SilphCo5Script: +SilphCo5F_Script: call SilphCo5Script_19f4d call EnableAutoTextBoxDrawing ld hl, SilphCo5TrainerHeader0 - ld de, SilphCo5ScriptPointers - ld a, [wSilphCo5CurScript] + ld de, SilphCo5F_ScriptPointers + ld a, [wSilphCo5FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo5CurScript], a + ld [wSilphCo5FCurScript], a ret SilphCo5Script_19f4d: @@ -65,12 +65,12 @@ SilphCo5Script_19f9e: SetEventAfterBranchReuseHL EVENT_SILPH_CO_5_UNLOCKED_DOOR3, EVENT_SILPH_CO_5_UNLOCKED_DOOR1 ret -SilphCo5ScriptPointers: +SilphCo5F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo5TextPointers: +SilphCo5F_TextPointers: dw SilphCo5Text1 dw SilphCo5Text2 dw SilphCo5Text3 diff --git a/scripts/silphco6.asm b/scripts/SilphCo6F.asm similarity index 96% rename from scripts/silphco6.asm rename to scripts/SilphCo6F.asm index 240b6793..ddbcba79 100755 --- a/scripts/silphco6.asm +++ b/scripts/SilphCo6F.asm @@ -1,11 +1,11 @@ -SilphCo6Script: +SilphCo6F_Script: call SilphCo6Script_1a1bf call EnableAutoTextBoxDrawing ld hl, SilphCo6TrainerHeader0 - ld de, SilphCo6ScriptPointers - ld a, [wSilphCo6CurScript] + ld de, SilphCo6F_ScriptPointers + ld a, [wSilphCo6FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo6CurScript], a + ld [wSilphCo6FCurScript], a ret SilphCo6Script_1a1bf: @@ -34,12 +34,12 @@ SilphCo6Script_1a1e6: SetEvent EVENT_SILPH_CO_6_UNLOCKED_DOOR ret -SilphCo6ScriptPointers: +SilphCo6F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo6TextPointers: +SilphCo6F_TextPointers: dw SilphCo6Text1 dw SilphCo6Text2 dw SilphCo6Text3 diff --git a/scripts/silphco7.asm b/scripts/SilphCo7F.asm similarity index 98% rename from scripts/silphco7.asm rename to scripts/SilphCo7F.asm index b211c8a9..e7594663 100755 --- a/scripts/silphco7.asm +++ b/scripts/SilphCo7F.asm @@ -1,11 +1,11 @@ -SilphCo7Script: +SilphCo7F_Script: call SilphCo7Script_51b77 call EnableAutoTextBoxDrawing ld hl, SilphCo7TrainerHeader0 - ld de, SilphCo7ScriptPointers - ld a, [wSilphCo7CurScript] + ld de, SilphCo7F_ScriptPointers + ld a, [wSilphCo7FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo7CurScript], a + ld [wSilphCo7FCurScript], a ret SilphCo7Script_51b77: @@ -106,11 +106,11 @@ SilphCo7Text_51c0c: ld [wJoyIgnore], a SilphCo7Text_51c10: - ld [wSilphCo7CurScript], a + ld [wSilphCo7FCurScript], a ld [wCurMapScript], a ret -SilphCo7ScriptPointers: +SilphCo7F_ScriptPointers: dw SilphCo7Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -262,7 +262,7 @@ SilphCo7Script5: ld [wJoyIgnore], a jp SilphCo7Text_51c10 -SilphCo7TextPointers: +SilphCo7F_TextPointers: dw SilphCo7Text1 dw SilphCo7Text2 dw SilphCo7Text3 diff --git a/scripts/silphco8.asm b/scripts/SilphCo8F.asm similarity index 95% rename from scripts/silphco8.asm rename to scripts/SilphCo8F.asm index 498fd569..ce6579f7 100755 --- a/scripts/silphco8.asm +++ b/scripts/SilphCo8F.asm @@ -1,11 +1,11 @@ -SilphCo8Script: +SilphCo8F_Script: call SilphCo8Script_5651a call EnableAutoTextBoxDrawing ld hl, SilphCo8TrainerHeader0 - ld de, SilphCo8ScriptPointers - ld a, [wSilphCo8CurScript] + ld de, SilphCo8F_ScriptPointers + ld a, [wSilphCo8FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo8CurScript], a + ld [wSilphCo8FCurScript], a ret SilphCo8Script_5651a: @@ -70,12 +70,12 @@ SilphCo8Script_5656d: SetEvent EVENT_SILPH_CO_8_UNLOCKED_DOOR ret -SilphCo8ScriptPointers: +SilphCo8F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo8TextPointers: +SilphCo8F_TextPointers: dw SilphCo8Text1 dw SilphCo8Text2 dw SilphCo8Text3 diff --git a/scripts/silphco9.asm b/scripts/SilphCo9F.asm similarity index 96% rename from scripts/silphco9.asm rename to scripts/SilphCo9F.asm index 57b8bc89..66291e98 100755 --- a/scripts/silphco9.asm +++ b/scripts/SilphCo9F.asm @@ -1,11 +1,11 @@ -SilphCo9Script: +SilphCo9F_Script: call SilphCo9Script_5d7d1 call EnableAutoTextBoxDrawing ld hl, SilphCo9TrainerHeader0 - ld de, SilphCo9ScriptPointers - ld a, [wSilphCo9CurScript] + ld de, SilphCo9F_ScriptPointers + ld a, [wSilphCo9FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo9CurScript], a + ld [wSilphCo9FCurScript], a ret SilphCo9Script_5d7d1: @@ -118,12 +118,12 @@ SilphCo9Script_5d863: SetEventAfterBranchReuseHL EVENT_SILPH_CO_9_UNLOCKED_DOOR4, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 ret -SilphCo9ScriptPointers: +SilphCo9F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo9TextPointers: +SilphCo9F_TextPointers: dw SilphCo9Text1 dw SilphCo9Text2 dw SilphCo9Text3 diff --git a/scripts/silphcoelevator.asm b/scripts/SilphCoElevator.asm similarity index 93% rename from scripts/silphcoelevator.asm rename to scripts/SilphCoElevator.asm index df4d08c7..49de6b27 100755 --- a/scripts/silphcoelevator.asm +++ b/scripts/SilphCoElevator.asm @@ -1,4 +1,4 @@ -SilphCoElevatorScript: +SilphCoElevator_Script: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -32,7 +32,7 @@ SilphCoElevatorScript_457ea: ret SilphCoElevatorScript_457f1: - ld hl, SilphCoElavatorFloors + ld hl, SilphCoElevatorFloors call LoadItemList ld hl, SilphCoElevatorWarpMaps ld de, wElevatorWarpMaps @@ -40,7 +40,7 @@ SilphCoElevatorScript_457f1: call CopyData ret -SilphCoElavatorFloors: +SilphCoElevatorFloors: db $0B ; num elements in list db FLOOR_1F db FLOOR_2F @@ -77,7 +77,7 @@ SilphCoElevatorScript_45827: callba ShakeElevator ret -SilphCoElevatorTextPointers: +SilphCoElevator_TextPointers: dw SilphCoElevatorText1 SilphCoElevatorText1: diff --git a/scripts/tradecenter.asm b/scripts/TradeCenter.asm similarity index 93% rename from scripts/tradecenter.asm rename to scripts/TradeCenter.asm index 80efe4f9..ddb3061e 100755 --- a/scripts/tradecenter.asm +++ b/scripts/TradeCenter.asm @@ -1,4 +1,4 @@ -TradeCenterScript: +TradeCenter_Script: call EnableAutoTextBoxDrawing ld a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK @@ -30,7 +30,7 @@ TradeCenterScript: ld [wSpriteStateData1 + $19], a ret -TradeCenterTextPointers: +TradeCenter_TextPointers: dw TradeCenterText1 TradeCenterText1: diff --git a/scripts/UndergroundPathNorthSouth.asm b/scripts/UndergroundPathNorthSouth.asm new file mode 100755 index 00000000..52b3d8bf --- /dev/null +++ b/scripts/UndergroundPathNorthSouth.asm @@ -0,0 +1,5 @@ +UndergroundPathNorthSouth_Script: + jp EnableAutoTextBoxDrawing + +UndergroundPathNorthSouth_TextPointers: + db "@" diff --git a/scripts/undergroundpathentranceroute5.asm b/scripts/UndergroundPathRoute5.asm similarity index 77% rename from scripts/undergroundpathentranceroute5.asm rename to scripts/UndergroundPathRoute5.asm index 18707c4a..23d72569 100755 --- a/scripts/undergroundpathentranceroute5.asm +++ b/scripts/UndergroundPathRoute5.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute5Script: +UndergroundPathRoute5_Script: ld a, ROUTE_5 ld [wLastMap], a ret @@ -6,7 +6,7 @@ UndergroundPathEntranceRoute5Script: UndergroundPathEntranceRoute5_5d6af: db "@" -UndergroundPathEntranceRoute5TextPointers: +UndergroundPathRoute5_TextPointers: dw UndergroundPathEntranceRoute5Text1 UndergroundPathEntranceRoute5Text1: diff --git a/scripts/undergroundpathentranceroute6.asm b/scripts/UndergroundPathRoute6.asm similarity index 69% rename from scripts/undergroundpathentranceroute6.asm rename to scripts/UndergroundPathRoute6.asm index c6dfdcc9..0a690518 100755 --- a/scripts/undergroundpathentranceroute6.asm +++ b/scripts/UndergroundPathRoute6.asm @@ -1,9 +1,9 @@ -UndergroundPathEntranceRoute6Script: +UndergroundPathRoute6_Script: ld a, ROUTE_6 ld [wLastMap], a jp EnableAutoTextBoxDrawing -UndergroundPathEntranceRoute6TextPointers: +UndergroundPathRoute6_TextPointers: dw UndergroundPathEntranceRoute6Text1 UndergroundPathEntranceRoute6Text1: diff --git a/scripts/undergroundpathentranceroute7.asm b/scripts/UndergroundPathRoute7.asm similarity index 69% rename from scripts/undergroundpathentranceroute7.asm rename to scripts/UndergroundPathRoute7.asm index 84c8e4d5..3a1f14c7 100755 --- a/scripts/undergroundpathentranceroute7.asm +++ b/scripts/UndergroundPathRoute7.asm @@ -1,9 +1,9 @@ -UndergroundPathEntranceRoute7Script: +UndergroundPathRoute7_Script: ld a, ROUTE_7 ld [wLastMap], a jp EnableAutoTextBoxDrawing -UndergroundPathEntranceRoute7TextPointers: +UndergroundPathRoute7_TextPointers: dw UndergroundPathEntranceRoute7Text1 UndergroundPathEntranceRoute7Text1: diff --git a/scripts/undergroundpathentranceroute7copy.asm b/scripts/UndergroundPathRoute7Copy.asm similarity index 84% rename from scripts/undergroundpathentranceroute7copy.asm rename to scripts/UndergroundPathRoute7Copy.asm index c623eeec..8a494caf 100755 --- a/scripts/undergroundpathentranceroute7copy.asm +++ b/scripts/UndergroundPathRoute7Copy.asm @@ -1,9 +1,9 @@ -UndergroundPathEntranceRoute7CopyScript: +UndergroundPathRoute7Copy_Script: ld a, ROUTE_7 ld [wLastMap], a ret -UndergroundPathEntranceRoute7CopyTextPointers: +UndergroundPathRoute7Copy_TextPointers: dw UGPathRoute7EntranceUnusedText_5d773 dw UGPathRoute7EntranceUnusedText_5d77d diff --git a/scripts/undergroundpathentranceroute8.asm b/scripts/UndergroundPathRoute8.asm similarity index 69% rename from scripts/undergroundpathentranceroute8.asm rename to scripts/UndergroundPathRoute8.asm index ad0b60ab..ab0a9977 100755 --- a/scripts/undergroundpathentranceroute8.asm +++ b/scripts/UndergroundPathRoute8.asm @@ -1,9 +1,9 @@ -UndergroundPathEntranceRoute8Script: +UndergroundPathRoute8_Script: ld a, ROUTE_8 ld [wLastMap], a jp EnableAutoTextBoxDrawing -UndergroundPathEntranceRoute8TextPointers: +UndergroundPathRoute8_TextPointers: dw UndergroundPathEntranceRoute8Text1 UndergroundPathEntranceRoute8Text1: diff --git a/scripts/UndergroundPathWestEast.asm b/scripts/UndergroundPathWestEast.asm new file mode 100755 index 00000000..cb1a7bd8 --- /dev/null +++ b/scripts/UndergroundPathWestEast.asm @@ -0,0 +1,5 @@ +UndergroundPathWestEast_Script: + jp EnableAutoTextBoxDrawing + +UndergroundPathWestEast_TextPointers: + db "@" diff --git a/scripts/vermilioncity.asm b/scripts/VermilionCity.asm similarity index 97% rename from scripts/vermilioncity.asm rename to scripts/VermilionCity.asm index 0a734e25..1ac81521 100755 --- a/scripts/vermilioncity.asm +++ b/scripts/VermilionCity.asm @@ -1,4 +1,4 @@ -VermilionCityScript: +VermilionCity_Script: call EnableAutoTextBoxDrawing ld hl, wCurrentMapScriptFlags bit 6, [hl] @@ -9,7 +9,7 @@ VermilionCityScript: bit 5, [hl] res 5, [hl] call nz, VermilionCityScript_197c0 - ld hl, VermilionCityScriptPointers + ld hl, VermilionCity_ScriptPointers ld a, [wVermilionCityCurScript] jp CallFunctionInTable @@ -30,7 +30,7 @@ VermilionCityScript_197cb: ld [wVermilionCityCurScript], a ret -VermilionCityScriptPointers: +VermilionCity_ScriptPointers: dw VermilionCityScript0 dw VermilionCityScript1 dw VermilionCityScript2 @@ -113,7 +113,7 @@ VermilionCityScript1: ld [wVermilionCityCurScript], a ret -VermilionCityTextPointers: +VermilionCity_TextPointers: dw VermilionCityText1 dw VermilionCityText2 dw VermilionCityText3 diff --git a/scripts/vermiliondock.asm b/scripts/VermilionDock.asm similarity index 98% rename from scripts/vermiliondock.asm rename to scripts/VermilionDock.asm index 5b5d520b..65b66c52 100755 --- a/scripts/vermiliondock.asm +++ b/scripts/VermilionDock.asm @@ -1,4 +1,4 @@ -VermilionDockScript: +VermilionDock_Script: call EnableAutoTextBoxDrawing CheckEventHL EVENT_STARTED_WALKING_OUT_OF_DOCK jr nz, .asm_1db8d @@ -207,7 +207,7 @@ VermilionDock_EraseSSAnne: call DelayFrames ret -VermilionDockTextPointers: +VermilionDock_TextPointers: dw VermilionDockText1 VermilionDockText1: diff --git a/scripts/vermiliongym.asm b/scripts/VermilionGym.asm similarity index 97% rename from scripts/vermiliongym.asm rename to scripts/VermilionGym.asm index c22ce9ce..5755628c 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/VermilionGym.asm @@ -1,4 +1,4 @@ -VermilionGymScript: +VermilionGym_Script: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -10,7 +10,7 @@ VermilionGymScript: call nz, VermilionGymScript_5ca6d call EnableAutoTextBoxDrawing ld hl, VermilionGymTrainerHeader0 - ld de, VermilionGymScriptPointers + ld de, VermilionGym_ScriptPointers ld a, [wVermilionGymCurScript] call ExecuteCurMapScriptInTable ld [wVermilionGymCurScript], a @@ -48,7 +48,7 @@ VermilionGymScript_5ca8a: ld [wCurMapScript], a ret -VermilionGymScriptPointers: +VermilionGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -89,7 +89,7 @@ VermilionGymScript_5caaa: jp VermilionGymScript_5ca8a -VermilionGymTextPointers: +VermilionGym_TextPointers: dw VermilionGymText1 dw VermilionGymText2 dw VermilionGymText3 diff --git a/scripts/vermilionmart.asm b/scripts/VermilionMart.asm similarity index 81% rename from scripts/vermilionmart.asm rename to scripts/VermilionMart.asm index 2d4df78d..00ba0c26 100755 --- a/scripts/vermilionmart.asm +++ b/scripts/VermilionMart.asm @@ -1,7 +1,7 @@ -VermilionMartScript: +VermilionMart_Script: jp EnableAutoTextBoxDrawing -VermilionMartTextPointers: +VermilionMart_TextPointers: dw VermilionCashierText dw VermilionMartText2 dw VermilionMartText3 diff --git a/scripts/vermilionhouse2.asm b/scripts/VermilionOldRodHouse.asm similarity index 93% rename from scripts/vermilionhouse2.asm rename to scripts/VermilionOldRodHouse.asm index c0735f32..772158ff 100755 --- a/scripts/vermilionhouse2.asm +++ b/scripts/VermilionOldRodHouse.asm @@ -1,7 +1,7 @@ -VermilionHouse2Script: +VermilionOldRodHouse_Script: jp EnableAutoTextBoxDrawing -VermilionHouse2TextPointers: +VermilionOldRodHouse_TextPointers: dw VermilionHouse2Text1 VermilionHouse2Text1: diff --git a/scripts/vermilionhouse1.asm b/scripts/VermilionPidgeyHouse.asm similarity index 85% rename from scripts/vermilionhouse1.asm rename to scripts/VermilionPidgeyHouse.asm index d2dac4ca..5004d367 100755 --- a/scripts/vermilionhouse1.asm +++ b/scripts/VermilionPidgeyHouse.asm @@ -1,8 +1,8 @@ -VermilionHouse1Script: +VermilionPidgeyHouse_Script: call EnableAutoTextBoxDrawing ret -VermilionHouse1TextPointers: +VermilionPidgeyHouse_TextPointers: dw VermilionHouse1Text1 dw VermilionHouse1Text2 dw VermilionHouse1Text3 diff --git a/scripts/vermilionpokecenter.asm b/scripts/VermilionPokecenter.asm similarity index 87% rename from scripts/vermilionpokecenter.asm rename to scripts/VermilionPokecenter.asm index f70aed31..60b28c57 100755 --- a/scripts/vermilionpokecenter.asm +++ b/scripts/VermilionPokecenter.asm @@ -1,8 +1,8 @@ -VermilionPokecenterScript: +VermilionPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -VermilionPokecenterTextPointers: +VermilionPokecenter_TextPointers: dw VermilionHealNurseText dw VermilionPokecenterText2 dw VermilionPokecenterText3 diff --git a/scripts/vermilionhouse3.asm b/scripts/VermilionTradeHouse.asm similarity index 72% rename from scripts/vermilionhouse3.asm rename to scripts/VermilionTradeHouse.asm index 1f0af501..828e3716 100755 --- a/scripts/vermilionhouse3.asm +++ b/scripts/VermilionTradeHouse.asm @@ -1,7 +1,7 @@ -VermilionHouse3Script: +VermilionTradeHouse_Script: jp EnableAutoTextBoxDrawing -VermilionHouse3TextPointers: +VermilionTradeHouse_TextPointers: dw VermilionHouse3Text1 VermilionHouse3Text1: diff --git a/scripts/victoryroad1.asm b/scripts/VictoryRoad1F.asm similarity index 92% rename from scripts/victoryroad1.asm rename to scripts/VictoryRoad1F.asm index 5409d733..0a2588a7 100755 --- a/scripts/victoryroad1.asm +++ b/scripts/VictoryRoad1F.asm @@ -1,14 +1,14 @@ -VictoryRoad1Script: +VictoryRoad1F_Script: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] call nz, .next call EnableAutoTextBoxDrawing ld hl, VictoryRoad1TrainerHeader0 - ld de, VictoryRoad1ScriptPointers - ld a, [wVictoryRoad1CurScript] + ld de, VictoryRoad1F_ScriptPointers + ld a, [wVictoryRoad1FCurScript] call ExecuteCurMapScriptInTable - ld [wVictoryRoad1CurScript], a + ld [wVictoryRoad1FCurScript], a ret .next CheckEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH @@ -18,7 +18,7 @@ VictoryRoad1Script: lb bc, 6, 4 predef_jump ReplaceTileBlock -VictoryRoad1ScriptPointers: +VictoryRoad1F_ScriptPointers: dw VictoryRoad1Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -37,7 +37,7 @@ VictoryRoad1Script0: CoordsData_5da5c: db $0D,$11,$FF -VictoryRoad1TextPointers: +VictoryRoad1F_TextPointers: dw VictoryRoad1Text1 dw VictoryRoad1Text2 dw PickUpItemText diff --git a/scripts/victoryroad2.asm b/scripts/VictoryRoad2F.asm similarity index 96% rename from scripts/victoryroad2.asm rename to scripts/VictoryRoad2F.asm index 847573d8..9dfb05ed 100755 --- a/scripts/victoryroad2.asm +++ b/scripts/VictoryRoad2F.asm @@ -1,4 +1,4 @@ -VictoryRoad2Script: +VictoryRoad2F_Script: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] @@ -9,10 +9,10 @@ VictoryRoad2Script: call nz, VictoryRoad2Script_517c9 call EnableAutoTextBoxDrawing ld hl, VictoryRoad2TrainerHeader0 - ld de, VictoryRoad2ScriptPointers - ld a, [wVictoryRoad2CurScript] + ld de, VictoryRoad2F_ScriptPointers + ld a, [wVictoryRoad2FCurScript] call ExecuteCurMapScriptInTable - ld [wVictoryRoad2CurScript], a + ld [wVictoryRoad2FCurScript], a ret VictoryRoad2Script_517c4: @@ -37,7 +37,7 @@ VictoryRoad2Script_517e2: predef ReplaceTileBlock ret -VictoryRoad2ScriptPointers: +VictoryRoad2F_ScriptPointers: dw VictoryRoad2Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -68,7 +68,7 @@ CoordsData_51816: db $10,$09 db $FF -VictoryRoad2TextPointers: +VictoryRoad2F_TextPointers: dw VictoryRoad2Text1 dw VictoryRoad2Text2 dw VictoryRoad2Text3 diff --git a/scripts/victoryroad3.asm b/scripts/VictoryRoad3F.asm similarity index 93% rename from scripts/victoryroad3.asm rename to scripts/VictoryRoad3F.asm index c615091b..d145c4a1 100755 --- a/scripts/victoryroad3.asm +++ b/scripts/VictoryRoad3F.asm @@ -1,11 +1,11 @@ -VictoryRoad3Script: +VictoryRoad3F_Script: call VictoryRoad3Script_44996 call EnableAutoTextBoxDrawing ld hl, VictoryRoad3TrainerHeader0 - ld de, VictoryRoad3ScriptPointers - ld a, [wVictoryRoad3CurScript] + ld de, VictoryRoad3F_ScriptPointers + ld a, [wVictoryRoad3FCurScript] call ExecuteCurMapScriptInTable - ld [wVictoryRoad3CurScript], a + ld [wVictoryRoad3FCurScript], a ret VictoryRoad3Script_44996: @@ -20,7 +20,7 @@ VictoryRoad3Script_44996: lb bc, 5, 3 predef_jump ReplaceTileBlock -VictoryRoad3ScriptPointers: +VictoryRoad3F_ScriptPointers: dw VictoryRoad3Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -43,10 +43,10 @@ VictoryRoad3Script0: .asm_449dc CheckAndSetEvent EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2 jr nz, .asm_449fe - ld a, HS_VICTORY_ROAD_3_BOULDER + ld a, HS_VICTORY_ROAD_3F_BOULDER ld [wMissableObjectIndex], a predef HideObject - ld a, HS_VICTORY_ROAD_2_BOULDER + ld a, HS_VICTORY_ROAD_2F_BOULDER ld [wMissableObjectIndex], a predef_jump ShowObject @@ -56,7 +56,7 @@ VictoryRoad3Script0: db $FF .asm_449fe - ld a, VICTORY_ROAD_2 + ld a, VICTORY_ROAD_2F ld [wDungeonWarpDestinationMap], a ld hl, .coordsData_449f9 call IsPlayerOnDungeonWarp @@ -74,7 +74,7 @@ VictoryRoad3Script0: jp z, CheckFightingMapTrainers ret -VictoryRoad3TextPointers: +VictoryRoad3F_TextPointers: dw VictoryRoad3Text1 dw VictoryRoad3Text2 dw VictoryRoad3Text3 diff --git a/scripts/viridiancity.asm b/scripts/ViridianCity.asm similarity index 98% rename from scripts/viridiancity.asm rename to scripts/ViridianCity.asm index 3ccdc509..b70927b2 100755 --- a/scripts/viridiancity.asm +++ b/scripts/ViridianCity.asm @@ -1,10 +1,10 @@ -ViridianCityScript: +ViridianCity_Script: call EnableAutoTextBoxDrawing - ld hl, ViridianCityScriptPointers + ld hl, ViridianCity_ScriptPointers ld a, [wViridianCityCurScript] jp CallFunctionInTable -ViridianCityScriptPointers: +ViridianCity_ScriptPointers: dw ViridianCityScript0 dw ViridianCityScript1 dw ViridianCityScript2 @@ -124,7 +124,7 @@ ViridianCityScript_190cf: ld [wJoyIgnore], a ret -ViridianCityTextPointers: +ViridianCity_TextPointers: dw ViridianCityText1 dw ViridianCityText2 dw ViridianCityText3 diff --git a/scripts/viridianforest.asm b/scripts/ViridianForest.asm similarity index 96% rename from scripts/viridianforest.asm rename to scripts/ViridianForest.asm index bce093a9..acd26b8a 100755 --- a/scripts/viridianforest.asm +++ b/scripts/ViridianForest.asm @@ -1,18 +1,18 @@ -ViridianForestScript: +ViridianForest_Script: call EnableAutoTextBoxDrawing ld hl, ViridianForestTrainerHeader0 - ld de, ViridianForestScriptPointers + ld de, ViridianForest_ScriptPointers ld a, [wViridianForestCurScript] call ExecuteCurMapScriptInTable ld [wViridianForestCurScript], a ret -ViridianForestScriptPointers: +ViridianForest_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -ViridianForestTextPointers: +ViridianForest_TextPointers: dw ViridianForestText1 dw ViridianForestText2 dw ViridianForestText3 diff --git a/scripts/viridianforestexit.asm b/scripts/ViridianForestNorthGate.asm similarity index 75% rename from scripts/viridianforestexit.asm rename to scripts/ViridianForestNorthGate.asm index af7a8523..e421bf5b 100755 --- a/scripts/viridianforestexit.asm +++ b/scripts/ViridianForestNorthGate.asm @@ -1,7 +1,7 @@ -ViridianForestExitScript: +ViridianForestNorthGate_Script: jp EnableAutoTextBoxDrawing -ViridianForestExitTextPointers: +ViridianForestNorthGate_TextPointers: dw ViridianForestExitText1 dw ViridianForestExitText2 diff --git a/scripts/viridianforestentrance.asm b/scripts/ViridianForestSouthGate.asm similarity index 77% rename from scripts/viridianforestentrance.asm rename to scripts/ViridianForestSouthGate.asm index e24225ed..397f0eca 100755 --- a/scripts/viridianforestentrance.asm +++ b/scripts/ViridianForestSouthGate.asm @@ -1,7 +1,7 @@ -ViridianForestEntranceScript: +ViridianForestSouthGate_Script: jp EnableAutoTextBoxDrawing -ViridianForestEntranceTextPointers: +ViridianForestSouthGate_TextPointers: dw ViridianForestEntranceText1 dw ViridianForestEntranceText2 diff --git a/scripts/viridiangym.asm b/scripts/ViridianGym.asm similarity index 98% rename from scripts/viridiangym.asm rename to scripts/ViridianGym.asm index cc8dcb90..44966fef 100755 --- a/scripts/viridiangym.asm +++ b/scripts/ViridianGym.asm @@ -1,10 +1,10 @@ -ViridianGymScript: +ViridianGym_Script: ld hl, Gym8CityName ld de, Gym8LeaderName call LoadGymLeaderAndCityName call EnableAutoTextBoxDrawing ld hl, ViridianGymTrainerHeader0 - ld de, ViridianGymScriptPointers + ld de, ViridianGym_ScriptPointers ld a, [wViridianGymCurScript] call ExecuteCurMapScriptInTable ld [wViridianGymCurScript], a @@ -22,7 +22,7 @@ ViridianGymScript_748d6: ld [wCurMapScript], a ret -ViridianGymScriptPointers: +ViridianGym_ScriptPointers: dw ViridianGymScript0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -168,7 +168,7 @@ ViridianGymScript3_74995: SetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE jp ViridianGymScript_748d6 -ViridianGymTextPointers: +ViridianGym_TextPointers: dw ViridianGymText1 dw ViridianGymText2 dw ViridianGymText3 diff --git a/scripts/viridianmart.asm b/scripts/ViridianMart.asm similarity index 81% rename from scripts/viridianmart.asm rename to scripts/ViridianMart.asm index 451ab989..b90d331c 100755 --- a/scripts/viridianmart.asm +++ b/scripts/ViridianMart.asm @@ -1,17 +1,17 @@ -ViridianMartScript: +ViridianMart_Script: call ViridianMartScript_1d47d call EnableAutoTextBoxDrawing - ld hl, ViridianMartScriptPointers - ld a, [wViridianMarketCurScript] + ld hl, ViridianMart_ScriptPointers + ld a, [wViridianMartCurScript] jp CallFunctionInTable ViridianMartScript_1d47d: CheckEvent EVENT_OAK_GOT_PARCEL jr nz, .asm_1d489 - ld hl, ViridianMartTextPointers + ld hl, ViridianMart_TextPointers jr .asm_1d48c .asm_1d489 - ld hl, ViridianMartTextPointers + $a ; starts at ViridianMartText6 + ld hl, ViridianMart_TextPointers2 .asm_1d48c ld a, l ld [wMapTextPtr], a @@ -19,7 +19,7 @@ ViridianMartScript_1d47d: ld [wMapTextPtr+1], a ret -ViridianMartScriptPointers: +ViridianMart_ScriptPointers: dw ViridianMartScript0 dw ViridianMartScript1 dw ViridianMartScript2 @@ -36,7 +36,7 @@ ViridianMartScript0: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $1 - ld [wViridianMarketCurScript], a + ld [wViridianMartCurScript], a ret RLEMovement1d4bb: @@ -56,17 +56,18 @@ ViridianMartScript1: call GiveItem SetEvent EVENT_GOT_OAKS_PARCEL ld a, $2 - ld [wViridianMarketCurScript], a + ld [wViridianMartCurScript], a ; fallthrough ViridianMartScript2: ret -ViridianMartTextPointers: +ViridianMart_TextPointers: dw ViridianMartText1 dw ViridianMartText2 dw ViridianMartText3 dw ViridianMartText4 dw ViridianMartText5 +ViridianMart_TextPointers2: dw ViridianCashierText dw ViridianMartText2 dw ViridianMartText3 diff --git a/scripts/viridianhouse.asm b/scripts/ViridianNicknameHouse.asm similarity index 88% rename from scripts/viridianhouse.asm rename to scripts/ViridianNicknameHouse.asm index 105c8fb6..000fe82b 100755 --- a/scripts/viridianhouse.asm +++ b/scripts/ViridianNicknameHouse.asm @@ -1,7 +1,7 @@ -ViridianHouseScript: +ViridianNicknameHouse_Script: jp EnableAutoTextBoxDrawing -ViridianHouseTextPointers: +ViridianNicknameHouse_TextPointers: dw ViridianHouseText1 dw ViridianHouseText2 dw ViridianHouseText3 diff --git a/scripts/viridianpokecenter.asm b/scripts/ViridianPokecenter.asm similarity index 87% rename from scripts/viridianpokecenter.asm rename to scripts/ViridianPokecenter.asm index 904ff47f..14c25b9f 100755 --- a/scripts/viridianpokecenter.asm +++ b/scripts/ViridianPokecenter.asm @@ -1,8 +1,8 @@ -ViridianPokeCenterScript: +ViridianPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -ViridianPokecenterTextPointers: +ViridianPokecenter_TextPointers: dw ViridianHealNurseText dw ViridianPokeCenterText2 dw ViridianPokeCenterText3 diff --git a/scripts/school.asm b/scripts/ViridianSchoolHouse.asm similarity index 70% rename from scripts/school.asm rename to scripts/ViridianSchoolHouse.asm index 2300946b..2d9579b7 100755 --- a/scripts/school.asm +++ b/scripts/ViridianSchoolHouse.asm @@ -1,7 +1,7 @@ -SchoolScript: +ViridianSchoolHouse_Script: jp EnableAutoTextBoxDrawing -SchoolTextPointers: +ViridianSchoolHouse_TextPointers: dw SchoolText1 dw SchoolText2 diff --git a/scripts/fuchsiahouse2.asm b/scripts/WardensHouse.asm similarity index 97% rename from scripts/fuchsiahouse2.asm rename to scripts/WardensHouse.asm index 6d49fb2f..69e199c9 100755 --- a/scripts/fuchsiahouse2.asm +++ b/scripts/WardensHouse.asm @@ -1,7 +1,7 @@ -FuchsiaHouse2Script: +WardensHouse_Script: jp EnableAutoTextBoxDrawing -FuchsiaHouse2TextPointers: +WardensHouse_TextPointers: dw FuchsiaHouse2Text1 dw PickUpItemText dw BoulderText diff --git a/scripts/diglettscave.asm b/scripts/diglettscave.asm deleted file mode 100755 index 593b12a6..00000000 --- a/scripts/diglettscave.asm +++ /dev/null @@ -1,5 +0,0 @@ -DiglettsCaveScript: - jp EnableAutoTextBoxDrawing - -DiglettsCaveTextPointers: - db "@" diff --git a/scripts/indigoplateau.asm b/scripts/indigoplateau.asm deleted file mode 100755 index 6a6fdb6c..00000000 --- a/scripts/indigoplateau.asm +++ /dev/null @@ -1,4 +0,0 @@ -IndigoPlateauScript: - ret - -IndigoPlateauTextPointers: diff --git a/scripts/ssanne4.asm b/scripts/ssanne4.asm deleted file mode 100755 index c9411717..00000000 --- a/scripts/ssanne4.asm +++ /dev/null @@ -1,5 +0,0 @@ -SSAnne4Script: - jp EnableAutoTextBoxDrawing - -SSAnne4TextPointers: - db "@" diff --git a/scripts/undergroundpathns.asm b/scripts/undergroundpathns.asm deleted file mode 100755 index 8c744740..00000000 --- a/scripts/undergroundpathns.asm +++ /dev/null @@ -1,5 +0,0 @@ -UndergroundPathNSScript: - jp EnableAutoTextBoxDrawing - -UndergroundPathNSTextPointers: - db "@" diff --git a/scripts/undergroundpathwe.asm b/scripts/undergroundpathwe.asm deleted file mode 100755 index 921d3dab..00000000 --- a/scripts/undergroundpathwe.asm +++ /dev/null @@ -1,5 +0,0 @@ -UndergroundPathWEScript: - jp EnableAutoTextBoxDrawing - -UndergroundPathWETextPointers: - db "@" diff --git a/text.asm b/text.asm index 51355e33..5a760a8e 100644 --- a/text.asm +++ b/text.asm @@ -1,5 +1,7 @@ INCLUDE "charmap.asm" + INCLUDE "constants/text_constants.asm" + TEXT_1 EQU $20 TEXT_2 EQU TEXT_1 + 1 TEXT_3 EQU TEXT_2 + 1 @@ -16,6 +18,7 @@ POKEDEX_TEXT EQU TEXT_11 + 1 MOVE_NAMES EQU POKEDEX_TEXT + 1 INCLUDE "macros.asm" + INCLUDE "hram.asm" @@ -167,67 +170,67 @@ _OaksAideNoRoomText:: text "." done -INCLUDE "text/maps/viridian_forest.asm" -INCLUDE "text/maps/mt_moon_1f.asm" -INCLUDE "text/maps/mt_moon_b1f.asm" -INCLUDE "text/maps/mt_moon_b2f.asm" -INCLUDE "text/maps/ss_anne_1.asm" -INCLUDE "text/maps/ss_anne_2.asm" -INCLUDE "text/maps/ss_anne_3.asm" -INCLUDE "text/maps/ss_anne_5.asm" -INCLUDE "text/maps/ss_anne_6.asm" -INCLUDE "text/maps/ss_anne_7.asm" -INCLUDE "text/maps/ss_anne_8.asm" -INCLUDE "text/maps/ss_anne_9.asm" -INCLUDE "text/maps/ss_anne_10.asm" -INCLUDE "text/maps/victory_road_3f.asm" -INCLUDE "text/maps/rocket_hideout_b1f.asm" -INCLUDE "text/maps/rocket_hideout_b2f.asm" -INCLUDE "text/maps/rocket_hideout_b3f.asm" -INCLUDE "text/maps/rocket_hideout_b4f.asm" -INCLUDE "text/maps/rocket_hideout_elevator.asm" -INCLUDE "text/maps/silph_co_2f.asm" -INCLUDE "text/maps/silph_co_3f.asm" -INCLUDE "text/maps/silph_co_4f.asm" -INCLUDE "text/maps/silph_co_5f_1.asm" +INCLUDE "text/maps/ViridianForest.asm" +INCLUDE "text/maps/MtMoon1F.asm" +INCLUDE "text/maps/MtMoonB1F.asm" +INCLUDE "text/maps/MtMoonB2F.asm" +INCLUDE "text/maps/SSAnne1F.asm" +INCLUDE "text/maps/SSAnne2F.asm" +INCLUDE "text/maps/SSAnne3F.asm" +INCLUDE "text/maps/SSAnneBow.asm" +INCLUDE "text/maps/SSAnneKitchen.asm" +INCLUDE "text/maps/SSAnneCaptainsRoom.asm" +INCLUDE "text/maps/SSAnne1FRooms.asm" +INCLUDE "text/maps/SSAnne2FRooms.asm" +INCLUDE "text/maps/SSAnneB1FRooms.asm" +INCLUDE "text/maps/VictoryRoad3F.asm" +INCLUDE "text/maps/RocketHideoutB1F.asm" +INCLUDE "text/maps/RocketHideoutB2F.asm" +INCLUDE "text/maps/RocketHideoutB3F.asm" +INCLUDE "text/maps/RocketHideoutB4F.asm" +INCLUDE "text/maps/RocketHideoutElevator.asm" +INCLUDE "text/maps/SilphCo2F.asm" +INCLUDE "text/maps/SilphCo3F.asm" +INCLUDE "text/maps/SilphCo4F.asm" +INCLUDE "text/maps/SilphCo5F.asm" SECTION "Text 2", ROMX ; BANK $21 -INCLUDE "text/maps/silph_co_5f_2.asm" -INCLUDE "text/maps/silph_co_6f.asm" -INCLUDE "text/maps/silph_co_7f.asm" -INCLUDE "text/maps/silph_co_8f.asm" -INCLUDE "text/maps/silph_co_9f.asm" -INCLUDE "text/maps/silph_co_10f.asm" -INCLUDE "text/maps/silph_co_11f.asm" -INCLUDE "text/maps/mansion_2f.asm" -INCLUDE "text/maps/mansion_3f.asm" -INCLUDE "text/maps/mansion_b1f.asm" -INCLUDE "text/maps/safari_zone_east.asm" -INCLUDE "text/maps/safari_zone_north.asm" -INCLUDE "text/maps/safari_zone_west.asm" -INCLUDE "text/maps/safari_zone_center.asm" -INCLUDE "text/maps/safari_zone_rest_house_1.asm" -INCLUDE "text/maps/safari_zone_secret_house.asm" -INCLUDE "text/maps/safari_zone_rest_house_2.asm" -INCLUDE "text/maps/safari_zone_rest_house_3.asm" -INCLUDE "text/maps/safari_zone_rest_house_4.asm" -INCLUDE "text/maps/unknown_dungeon_b1f.asm" -INCLUDE "text/maps/victory_road_1f.asm" -INCLUDE "text/maps/lance.asm" -INCLUDE "text/maps/hall_of_fame.asm" -INCLUDE "text/maps/champion.asm" -INCLUDE "text/maps/lorelei.asm" -INCLUDE "text/maps/bruno.asm" -INCLUDE "text/maps/agatha.asm" -INCLUDE "text/maps/rock_tunnel_b2f_1.asm" +INCLUDE "text/maps/SilphCo5F_2.asm" +INCLUDE "text/maps/SilphCo6F.asm" +INCLUDE "text/maps/SilphCo7F.asm" +INCLUDE "text/maps/SilphCo8F.asm" +INCLUDE "text/maps/SilphCo9F.asm" +INCLUDE "text/maps/SilphCo10F.asm" +INCLUDE "text/maps/SilphCo11F.asm" +INCLUDE "text/maps/PokemonMansion2F.asm" +INCLUDE "text/maps/PokemonMansion3F.asm" +INCLUDE "text/maps/PokemonMansionB1F.asm" +INCLUDE "text/maps/SafariZoneEast.asm" +INCLUDE "text/maps/SafariZoneNorth.asm" +INCLUDE "text/maps/SafariZoneWest.asm" +INCLUDE "text/maps/SafariZoneCenter.asm" +INCLUDE "text/maps/SafariZoneCenterRestHouse.asm" +INCLUDE "text/maps/SafariZoneSecretHouse.asm" +INCLUDE "text/maps/SafariZoneWestRestHouse.asm" +INCLUDE "text/maps/SafariZoneEastRestHouse.asm" +INCLUDE "text/maps/SafariZoneNorthRestHouse.asm" +INCLUDE "text/maps/CeruleanCaveB1F.asm" +INCLUDE "text/maps/VictoryRoad1F.asm" +INCLUDE "text/maps/LancesRoom.asm" +INCLUDE "text/maps/HallOfFame.asm" +INCLUDE "text/maps/ChampionsRoom.asm" +INCLUDE "text/maps/LoreleisRoom.asm" +INCLUDE "text/maps/BrunosRoom.asm" +INCLUDE "text/maps/AgathasRoom.asm" +INCLUDE "text/maps/RockTunnelB1F.asm" SECTION "Text 3", ROMX ; BANK $22 -INCLUDE "text/maps/rock_tunnel_b2f_2.asm" -INCLUDE "text/maps/seafoam_islands_b4f.asm" +INCLUDE "text/maps/RockTunnelB1F_2.asm" +INCLUDE "text/maps/SeafoamIslandsB4F.asm" _AIBattleWithdrawText:: TX_RAM wTrainerName @@ -1531,14 +1534,14 @@ _NotVeryEffectiveText:: _SafariZoneEatingText:: text "Wild @" TX_RAM wEnemyMonNick - db $0 + text "" line "is eating!" prompt _SafariZoneAngryText:: text "Wild @" TX_RAM wEnemyMonNick - db $0 + text "" line "is angry!" prompt @@ -1929,77 +1932,77 @@ _Char00Text:: _Char55Text:: text $4B,"@@" -INCLUDE "text/maps/digletts_cave_route_2_entrance.asm" -INCLUDE "text/maps/viridian_forest_exit.asm" -INCLUDE "text/maps/route_2_house.asm" -INCLUDE "text/maps/route_2_gate.asm" -INCLUDE "text/maps/viridian_forest_entrance.asm" -INCLUDE "text/maps/mt_moon_pokecenter.asm" -INCLUDE "text/maps/saffron_gates.asm" -INCLUDE "text/maps/daycare_1.asm" +INCLUDE "text/maps/DiglettsCaveRoute2.asm" +INCLUDE "text/maps/ViridianForestNorthGate.asm" +INCLUDE "text/maps/Route2TradeHouse.asm" +INCLUDE "text/maps/Route2Gate.asm" +INCLUDE "text/maps/ViridianForestSouthGate.asm" +INCLUDE "text/maps/MtMoonPokecenter.asm" +INCLUDE "text/maps/SaffronGates.asm" +INCLUDE "text/maps/Daycare.asm" SECTION "Text 4", ROMX ; BANK $23 -INCLUDE "text/maps/daycare_2.asm" -INCLUDE "text/maps/underground_path_route_6_entrance.asm" -INCLUDE "text/maps/underground_path_route_7_entrance.asm" -INCLUDE "text/maps/underground_path_route_7_entrance_unused.asm" -INCLUDE "text/maps/underground_path_route_8_entrance.asm" -INCLUDE "text/maps/rock_tunnel_pokecenter.asm" -INCLUDE "text/maps/rock_tunnel_b1f.asm" -INCLUDE "text/maps/power_plant.asm" -INCLUDE "text/maps/route_11_gate.asm" -INCLUDE "text/maps/route_11_gate_upstairs.asm" -INCLUDE "text/maps/digletts_cave_route_11_entrance.asm" -INCLUDE "text/maps/route_12_gate.asm" -INCLUDE "text/maps/route_12_gate_upstairs.asm" -INCLUDE "text/maps/route_12_house.asm" -INCLUDE "text/maps/route_15_gate.asm" -INCLUDE "text/maps/route_15_gate_upstairs.asm" -INCLUDE "text/maps/route_16_gate.asm" -INCLUDE "text/maps/route_16_gate_upstairs.asm" -INCLUDE "text/maps/route_16_house.asm" -INCLUDE "text/maps/route_18_gate.asm" -INCLUDE "text/maps/route_18_gate_upstairs.asm" -INCLUDE "text/maps/pokemon_league_gate.asm" -INCLUDE "text/maps/victory_road_2f.asm" -INCLUDE "text/maps/bills_house.asm" -INCLUDE "text/maps/route_1.asm" -INCLUDE "text/maps/route_2.asm" -INCLUDE "text/maps/route_3.asm" -INCLUDE "text/maps/route_4.asm" -INCLUDE "text/maps/route_5.asm" -INCLUDE "text/maps/route_6.asm" -INCLUDE "text/maps/route_7.asm" -INCLUDE "text/maps/route_8.asm" -INCLUDE "text/maps/route_9.asm" -INCLUDE "text/maps/route_10.asm" -INCLUDE "text/maps/route_11_1.asm" +INCLUDE "text/maps/Daycare_2.asm" +INCLUDE "text/maps/UndergroundPathRoute6.asm" +INCLUDE "text/maps/UndergroundPathRoute7.asm" +INCLUDE "text/maps/UndergroundPathRoute7Copy.asm" +INCLUDE "text/maps/UndergroundPathRoute8.asm" +INCLUDE "text/maps/RockTunnelPokecenter.asm" +INCLUDE "text/maps/RockTunnel1F.asm" +INCLUDE "text/maps/PowerPlant.asm" +INCLUDE "text/maps/Route11Gate1F.asm" +INCLUDE "text/maps/Route11Gate2F.asm" +INCLUDE "text/maps/DiglettsCaveRoute11.asm" +INCLUDE "text/maps/Route12Gate1F.asm" +INCLUDE "text/maps/Route12Gate2F.asm" +INCLUDE "text/maps/Route12SuperRodHouse.asm" +INCLUDE "text/maps/Route15Gate1F.asm" +INCLUDE "text/maps/Route15Gate2F.asm" +INCLUDE "text/maps/Route16Gate1F.asm" +INCLUDE "text/maps/Route16Gate2F.asm" +INCLUDE "text/maps/Route16FlyHouse.asm" +INCLUDE "text/maps/Route18Gate1F.asm" +INCLUDE "text/maps/Route18Gate2F.asm" +INCLUDE "text/maps/Route22Gate.asm" +INCLUDE "text/maps/VictoryRoad2F.asm" +INCLUDE "text/maps/BillsHouse.asm" +INCLUDE "text/maps/Route1.asm" +INCLUDE "text/maps/Route2.asm" +INCLUDE "text/maps/Route3.asm" +INCLUDE "text/maps/Route4.asm" +INCLUDE "text/maps/Route5.asm" +INCLUDE "text/maps/Route6.asm" +INCLUDE "text/maps/Route7.asm" +INCLUDE "text/maps/Route8.asm" +INCLUDE "text/maps/Route9.asm" +INCLUDE "text/maps/Route10.asm" +INCLUDE "text/maps/Route11.asm" SECTION "Text 5", ROMX ; BANK $24 -INCLUDE "text/maps/route_11_2.asm" -INCLUDE "text/maps/route_12.asm" -INCLUDE "text/maps/route_13.asm" -INCLUDE "text/maps/route_14.asm" -INCLUDE "text/maps/route_15.asm" -INCLUDE "text/maps/route_16.asm" -INCLUDE "text/maps/route_17.asm" -INCLUDE "text/maps/route_18.asm" -INCLUDE "text/maps/route_19.asm" -INCLUDE "text/maps/route_20.asm" -INCLUDE "text/maps/route_21.asm" -INCLUDE "text/maps/route_22.asm" -INCLUDE "text/maps/route_23.asm" -INCLUDE "text/maps/route_24_1.asm" +INCLUDE "text/maps/Route11_2.asm" +INCLUDE "text/maps/Route12.asm" +INCLUDE "text/maps/Route13.asm" +INCLUDE "text/maps/Route14.asm" +INCLUDE "text/maps/Route15.asm" +INCLUDE "text/maps/Route16.asm" +INCLUDE "text/maps/Route17.asm" +INCLUDE "text/maps/Route18.asm" +INCLUDE "text/maps/Route19.asm" +INCLUDE "text/maps/Route20.asm" +INCLUDE "text/maps/Route21.asm" +INCLUDE "text/maps/Route22.asm" +INCLUDE "text/maps/Route23.asm" +INCLUDE "text/maps/Route24.asm" SECTION "Text 6", ROMX ; BANK $25 -INCLUDE "text/maps/route_24_2.asm" -INCLUDE "text/maps/route_25.asm" +INCLUDE "text/maps/Route24_2.asm" +INCLUDE "text/maps/Route25.asm" _FileDataDestroyedText:: text "The file data is" @@ -2326,106 +2329,106 @@ _ColosseumText1:: text "!" done -INCLUDE "text/maps/reds_house_1f.asm" -INCLUDE "text/maps/blues_house.asm" -INCLUDE "text/maps/oaks_lab.asm" -INCLUDE "text/maps/viridian_pokecenter.asm" -INCLUDE "text/maps/viridian_mart.asm" -INCLUDE "text/maps/school.asm" -INCLUDE "text/maps/viridian_house.asm" -INCLUDE "text/maps/viridian_gym.asm" -INCLUDE "text/maps/museum_1f.asm" -INCLUDE "text/maps/museum_2f.asm" -INCLUDE "text/maps/pewter_gym_1.asm" +INCLUDE "text/maps/RedsHouse1F.asm" +INCLUDE "text/maps/BluesHouse.asm" +INCLUDE "text/maps/OaksLab.asm" +INCLUDE "text/maps/ViridianPokecenter.asm" +INCLUDE "text/maps/ViridianMart.asm" +INCLUDE "text/maps/ViridianSchoolHouse.asm" +INCLUDE "text/maps/ViridianNicknameHouse.asm" +INCLUDE "text/maps/ViridianGym.asm" +INCLUDE "text/maps/Museum1F.asm" +INCLUDE "text/maps/Museum2F.asm" +INCLUDE "text/maps/PewterGym.asm" SECTION "Text 7", ROMX ; BANK $26 -INCLUDE "text/maps/pewter_gym_2.asm" -INCLUDE "text/maps/pewter_house_1.asm" -INCLUDE "text/maps/pewter_mart.asm" -INCLUDE "text/maps/pewter_house_2.asm" -INCLUDE "text/maps/pewter_pokecenter.asm" -INCLUDE "text/maps/cerulean_trashed_house.asm" -INCLUDE "text/maps/cerulean_trade_house.asm" -INCLUDE "text/maps/cerulean_pokecenter.asm" -INCLUDE "text/maps/cerulean_gym.asm" -INCLUDE "text/maps/bike_shop.asm" -INCLUDE "text/maps/cerulean_mart.asm" -INCLUDE "text/maps/cerulean_badge_house.asm" -INCLUDE "text/maps/lavender_pokecenter.asm" -INCLUDE "text/maps/pokemon_tower_1f.asm" -INCLUDE "text/maps/pokemon_tower_2f.asm" -INCLUDE "text/maps/pokemon_tower_3f.asm" -INCLUDE "text/maps/pokemon_tower_4f.asm" -INCLUDE "text/maps/pokemon_tower_5f.asm" -INCLUDE "text/maps/pokemon_tower_6f.asm" -INCLUDE "text/maps/pokemon_tower_7f.asm" -INCLUDE "text/maps/fujis_house.asm" -INCLUDE "text/maps/lavender_mart.asm" -INCLUDE "text/maps/lavender_house.asm" -INCLUDE "text/maps/name_rater.asm" -INCLUDE "text/maps/vermilion_pokecenter.asm" -INCLUDE "text/maps/fan_club.asm" -INCLUDE "text/maps/vermilion_mart.asm" -INCLUDE "text/maps/vermilion_gym_1.asm" +INCLUDE "text/maps/PewterGym_2.asm" +INCLUDE "text/maps/PewterNidoranHouse.asm" +INCLUDE "text/maps/PewterMart.asm" +INCLUDE "text/maps/PewterSpeechHouse.asm" +INCLUDE "text/maps/PewterPokecenter.asm" +INCLUDE "text/maps/CeruleanTrashedHouse.asm" +INCLUDE "text/maps/CeruleanTradeHouse.asm" +INCLUDE "text/maps/CeruleanPokecenter.asm" +INCLUDE "text/maps/CeruleanGym.asm" +INCLUDE "text/maps/BikeShop.asm" +INCLUDE "text/maps/CeruleanMart.asm" +INCLUDE "text/maps/CeruleanBadgeHouse.asm" +INCLUDE "text/maps/LavenderPokecenter.asm" +INCLUDE "text/maps/PokemonTower1F.asm" +INCLUDE "text/maps/PokemonTower2F.asm" +INCLUDE "text/maps/PokemonTower3F.asm" +INCLUDE "text/maps/PokemonTower4F.asm" +INCLUDE "text/maps/PokemonTower5F.asm" +INCLUDE "text/maps/PokemonTower6F.asm" +INCLUDE "text/maps/PokemonTower7F.asm" +INCLUDE "text/maps/MrFujisHouse.asm" +INCLUDE "text/maps/LavenderMart.asm" +INCLUDE "text/maps/LavenderCuboneHouse.asm" +INCLUDE "text/maps/NameRatersHouse.asm" +INCLUDE "text/maps/VermilionPokecenter.asm" +INCLUDE "text/maps/PokemonFanClub.asm" +INCLUDE "text/maps/VermilionMart.asm" +INCLUDE "text/maps/VermilionGym.asm" SECTION "Text 8", ROMX ; BANK $27 -INCLUDE "text/maps/vermilion_gym_2.asm" -INCLUDE "text/maps/vermilion_house.asm" -INCLUDE "text/maps/vermilion_dock.asm" -INCLUDE "text/maps/vermilion_fishing_house.asm" -INCLUDE "text/maps/celadon_dept_store_1f.asm" -INCLUDE "text/maps/celadon_dept_store_2f.asm" -INCLUDE "text/maps/celadon_dept_store_3f.asm" -INCLUDE "text/maps/celadon_dept_store_4f.asm" -INCLUDE "text/maps/celadon_dept_store_roof.asm" -INCLUDE "text/maps/celadon_mansion_1f.asm" -INCLUDE "text/maps/celadon_mansion_2f.asm" -INCLUDE "text/maps/celadon_mansion_3f.asm" -INCLUDE "text/maps/celadon_mansion_4f_outside.asm" -INCLUDE "text/maps/celadon_mansion_4f_inside.asm" -INCLUDE "text/maps/celadon_pokecenter.asm" -INCLUDE "text/maps/celadon_gym.asm" -INCLUDE "text/maps/celadon_game_corner.asm" -INCLUDE "text/maps/celadon_dept_store_5f.asm" -INCLUDE "text/maps/celadon_prize_room.asm" -INCLUDE "text/maps/celadon_diner.asm" -INCLUDE "text/maps/celadon_house.asm" -INCLUDE "text/maps/celadon_hotel.asm" -INCLUDE "text/maps/fuchsia_mart.asm" -INCLUDE "text/maps/fuchsia_house.asm" -INCLUDE "text/maps/fuchsia_pokecenter.asm" -INCLUDE "text/maps/wardens_house.asm" -INCLUDE "text/maps/safari_zone_entrance.asm" -INCLUDE "text/maps/fuchsia_gym_1.asm" +INCLUDE "text/maps/VermilionGym_2.asm" +INCLUDE "text/maps/VermilionPidgeyHouse.asm" +INCLUDE "text/maps/VermilionDock.asm" +INCLUDE "text/maps/VermilionOldRodHouse.asm" +INCLUDE "text/maps/CeladonMart1F.asm" +INCLUDE "text/maps/CeladonMart2F.asm" +INCLUDE "text/maps/CeladonMart3F.asm" +INCLUDE "text/maps/CeladonMart4F.asm" +INCLUDE "text/maps/CeladonMartRoof.asm" +INCLUDE "text/maps/CeladonMansion1F.asm" +INCLUDE "text/maps/CeladonMansion2F.asm" +INCLUDE "text/maps/CeladonMansion3F.asm" +INCLUDE "text/maps/CeladonMansionRoof.asm" +INCLUDE "text/maps/CeladonMansionRoofHouse.asm" +INCLUDE "text/maps/CeladonPokecenter.asm" +INCLUDE "text/maps/CeladonGym.asm" +INCLUDE "text/maps/GameCorner.asm" +INCLUDE "text/maps/CeladonMart5F.asm" +INCLUDE "text/maps/GameCornerPrizeRoom.asm" +INCLUDE "text/maps/CeladonDiner.asm" +INCLUDE "text/maps/CeladonChiefHouse.asm" +INCLUDE "text/maps/CeladonHotel.asm" +INCLUDE "text/maps/FuchsiaMart.asm" +INCLUDE "text/maps/FuchsiaBillsGrandpasHouse.asm" +INCLUDE "text/maps/FuchsiaPokecenter.asm" +INCLUDE "text/maps/WardensHouse.asm" +INCLUDE "text/maps/SafariZoneGate.asm" +INCLUDE "text/maps/FuchsiaGym.asm" SECTION "Text 9", ROMX ; BANK $28 -INCLUDE "text/maps/fuchsia_gym_2.asm" -INCLUDE "text/maps/fuchsia_meeting_room.asm" -INCLUDE "text/maps/fuchsia_fishing_house.asm" -INCLUDE "text/maps/mansion_1f.asm" -INCLUDE "text/maps/cinnabar_gym.asm" -INCLUDE "text/maps/cinnabar_lab.asm" -INCLUDE "text/maps/cinnabar_lab_trade_room.asm" -INCLUDE "text/maps/cinnabar_lab_metronome_room.asm" -INCLUDE "text/maps/cinnabar_lab_fossil_room.asm" -INCLUDE "text/maps/cinnabar_pokecenter.asm" -INCLUDE "text/maps/cinnabar_mart.asm" -INCLUDE "text/maps/indigo_plateau_lobby.asm" -INCLUDE "text/maps/copycats_house_1f.asm" -INCLUDE "text/maps/copycats_house_2f.asm" -INCLUDE "text/maps/fighting_dojo.asm" -INCLUDE "text/maps/saffron_gym.asm" -INCLUDE "text/maps/saffron_house.asm" -INCLUDE "text/maps/saffron_mart.asm" -INCLUDE "text/maps/silph_co_1f.asm" -INCLUDE "text/maps/saffron_pokecenter.asm" -INCLUDE "text/maps/mr_psychics_house.asm" +INCLUDE "text/maps/FuchsiaGym_2.asm" +INCLUDE "text/maps/FuchsiaMeetingRoom.asm" +INCLUDE "text/maps/FuchsiaGoodRodHouse.asm" +INCLUDE "text/maps/PokemonMansion1F.asm" +INCLUDE "text/maps/CinnabarGym.asm" +INCLUDE "text/maps/CinnabarLab.asm" +INCLUDE "text/maps/CinnabarLabTradeRoom.asm" +INCLUDE "text/maps/CinnabarLabMetronomeRoom.asm" +INCLUDE "text/maps/CinnabarLabFossilRoom.asm" +INCLUDE "text/maps/CinnabarPokecenter.asm" +INCLUDE "text/maps/CinnabarMart.asm" +INCLUDE "text/maps/IndigoPlateauLobby.asm" +INCLUDE "text/maps/CopycatsHouse1F.asm" +INCLUDE "text/maps/CopycatsHouse2F.asm" +INCLUDE "text/maps/FightingDojo.asm" +INCLUDE "text/maps/SaffronGym.asm" +INCLUDE "text/maps/SaffronPidgeyHouse.asm" +INCLUDE "text/maps/SaffronMart.asm" +INCLUDE "text/maps/SilphCo1F.asm" +INCLUDE "text/maps/SaffronPokecenter.asm" +INCLUDE "text/maps/MrPsychicsHouse.asm" _PokemartGreetingText:: text "Hi there!" @@ -2751,16 +2754,16 @@ _BoxIsFullText:: line "a #MON CENTER!" done -INCLUDE "text/maps/pallet_town.asm" -INCLUDE "text/maps/viridian_city.asm" -INCLUDE "text/maps/pewter_city.asm" -INCLUDE "text/maps/cerulean_city.asm" -INCLUDE "text/maps/lavender_town.asm" -INCLUDE "text/maps/vermilion_city.asm" -INCLUDE "text/maps/celadon_city.asm" -INCLUDE "text/maps/fuchsia_city.asm" -INCLUDE "text/maps/cinnabar_island.asm" -INCLUDE "text/maps/saffron_city.asm" +INCLUDE "text/maps/PalletTown.asm" +INCLUDE "text/maps/ViridianCity.asm" +INCLUDE "text/maps/PewterCity.asm" +INCLUDE "text/maps/CeruleanCity.asm" +INCLUDE "text/maps/LavenderTown.asm" +INCLUDE "text/maps/VermilionCity.asm" +INCLUDE "text/maps/CeladonCity.asm" +INCLUDE "text/maps/FuchsiaCity.asm" +INCLUDE "text/maps/CinnabarIsland.asm" +INCLUDE "text/maps/SaffronCity.asm" _ItemUseBallText00:: text "It dodged the" diff --git a/text/maps/agatha.asm b/text/maps/AgathasRoom.asm similarity index 100% rename from text/maps/agatha.asm rename to text/maps/AgathasRoom.asm diff --git a/text/maps/bike_shop.asm b/text/maps/BikeShop.asm similarity index 100% rename from text/maps/bike_shop.asm rename to text/maps/BikeShop.asm diff --git a/text/maps/bills_house.asm b/text/maps/BillsHouse.asm similarity index 100% rename from text/maps/bills_house.asm rename to text/maps/BillsHouse.asm diff --git a/text/maps/blues_house.asm b/text/maps/BluesHouse.asm similarity index 100% rename from text/maps/blues_house.asm rename to text/maps/BluesHouse.asm diff --git a/text/maps/bruno.asm b/text/maps/BrunosRoom.asm similarity index 100% rename from text/maps/bruno.asm rename to text/maps/BrunosRoom.asm diff --git a/text/maps/celadon_house.asm b/text/maps/CeladonChiefHouse.asm similarity index 100% rename from text/maps/celadon_house.asm rename to text/maps/CeladonChiefHouse.asm diff --git a/text/maps/celadon_city.asm b/text/maps/CeladonCity.asm similarity index 100% rename from text/maps/celadon_city.asm rename to text/maps/CeladonCity.asm diff --git a/text/maps/celadon_diner.asm b/text/maps/CeladonDiner.asm similarity index 100% rename from text/maps/celadon_diner.asm rename to text/maps/CeladonDiner.asm diff --git a/text/maps/celadon_gym.asm b/text/maps/CeladonGym.asm similarity index 99% rename from text/maps/celadon_gym.asm rename to text/maps/CeladonGym.asm index d8f9394c..d6586035 100644 --- a/text/maps/celadon_gym.asm +++ b/text/maps/CeladonGym.asm @@ -68,7 +68,8 @@ _ReceivedTM21Text:: text "!@@" _TM21ExplanationText:: - db $0 + text "" + para "TM21 contains" line "MEGA DRAIN." diff --git a/text/maps/celadon_hotel.asm b/text/maps/CeladonHotel.asm similarity index 100% rename from text/maps/celadon_hotel.asm rename to text/maps/CeladonHotel.asm diff --git a/text/maps/celadon_mansion_1f.asm b/text/maps/CeladonMansion1F.asm similarity index 100% rename from text/maps/celadon_mansion_1f.asm rename to text/maps/CeladonMansion1F.asm diff --git a/text/maps/celadon_mansion_2f.asm b/text/maps/CeladonMansion2F.asm similarity index 100% rename from text/maps/celadon_mansion_2f.asm rename to text/maps/CeladonMansion2F.asm diff --git a/text/maps/celadon_mansion_3f.asm b/text/maps/CeladonMansion3F.asm similarity index 100% rename from text/maps/celadon_mansion_3f.asm rename to text/maps/CeladonMansion3F.asm diff --git a/text/maps/celadon_mansion_4f_outside.asm b/text/maps/CeladonMansionRoof.asm similarity index 100% rename from text/maps/celadon_mansion_4f_outside.asm rename to text/maps/CeladonMansionRoof.asm diff --git a/text/maps/celadon_mansion_4f_inside.asm b/text/maps/CeladonMansionRoofHouse.asm similarity index 100% rename from text/maps/celadon_mansion_4f_inside.asm rename to text/maps/CeladonMansionRoofHouse.asm diff --git a/text/maps/celadon_dept_store_1f.asm b/text/maps/CeladonMart1F.asm similarity index 100% rename from text/maps/celadon_dept_store_1f.asm rename to text/maps/CeladonMart1F.asm diff --git a/text/maps/celadon_dept_store_2f.asm b/text/maps/CeladonMart2F.asm similarity index 100% rename from text/maps/celadon_dept_store_2f.asm rename to text/maps/CeladonMart2F.asm diff --git a/text/maps/celadon_dept_store_3f.asm b/text/maps/CeladonMart3F.asm similarity index 100% rename from text/maps/celadon_dept_store_3f.asm rename to text/maps/CeladonMart3F.asm diff --git a/text/maps/celadon_dept_store_4f.asm b/text/maps/CeladonMart4F.asm similarity index 100% rename from text/maps/celadon_dept_store_4f.asm rename to text/maps/CeladonMart4F.asm diff --git a/text/maps/celadon_dept_store_5f.asm b/text/maps/CeladonMart5F.asm similarity index 100% rename from text/maps/celadon_dept_store_5f.asm rename to text/maps/CeladonMart5F.asm diff --git a/text/maps/celadon_dept_store_roof.asm b/text/maps/CeladonMartRoof.asm similarity index 98% rename from text/maps/celadon_dept_store_roof.asm rename to text/maps/CeladonMartRoof.asm index 5d104cf5..1ed52e86 100644 --- a/text/maps/celadon_dept_store_roof.asm +++ b/text/maps/CeladonMartRoof.asm @@ -20,7 +20,8 @@ _CeladonMartRoofText_484f9:: text "!@@" _CeladonMartRoofText_484fe:: - db $0 + text "" + para "@" TX_RAM wcf4b text " contains" @@ -46,7 +47,8 @@ _CeladonMartRoofText_4850a:: text "!@@" _CeladonMartRoofText_4850f:: - db $0 + text "" + para "@" TX_RAM wcf4b text " contains" @@ -70,7 +72,8 @@ _ReceivedTM49Text:: line "TM49!@@" _CeladonMartRoofText_48520:: - db $0 + text "" + para "TM49 contains" line "TRI ATTACK!@@" @@ -124,7 +127,7 @@ _VendingMachineText4:: _VendingMachineText5:: TX_RAM wcf4b - db $0 + text "" line "popped out!" done diff --git a/text/maps/celadon_pokecenter.asm b/text/maps/CeladonPokecenter.asm similarity index 100% rename from text/maps/celadon_pokecenter.asm rename to text/maps/CeladonPokecenter.asm diff --git a/text/maps/cerulean_badge_house.asm b/text/maps/CeruleanBadgeHouse.asm similarity index 100% rename from text/maps/cerulean_badge_house.asm rename to text/maps/CeruleanBadgeHouse.asm diff --git a/text/maps/unknown_dungeon_b1f.asm b/text/maps/CeruleanCaveB1F.asm similarity index 100% rename from text/maps/unknown_dungeon_b1f.asm rename to text/maps/CeruleanCaveB1F.asm diff --git a/text/maps/cerulean_city.asm b/text/maps/CeruleanCity.asm similarity index 99% rename from text/maps/cerulean_city.asm rename to text/maps/CeruleanCity.asm index b5319d04..f0d2c29e 100644 --- a/text/maps/cerulean_city.asm +++ b/text/maps/CeruleanCity.asm @@ -73,7 +73,8 @@ _ReceivedTM28Text:: line "TM28!@@" _ReceivedTM28Text2:: - db $0 + text "" + para "I better get" line "moving! Bye!@@" diff --git a/text/maps/cerulean_gym.asm b/text/maps/CeruleanGym.asm similarity index 100% rename from text/maps/cerulean_gym.asm rename to text/maps/CeruleanGym.asm diff --git a/text/maps/cerulean_mart.asm b/text/maps/CeruleanMart.asm similarity index 100% rename from text/maps/cerulean_mart.asm rename to text/maps/CeruleanMart.asm diff --git a/text/maps/cerulean_pokecenter.asm b/text/maps/CeruleanPokecenter.asm similarity index 100% rename from text/maps/cerulean_pokecenter.asm rename to text/maps/CeruleanPokecenter.asm diff --git a/text/maps/cerulean_trade_house.asm b/text/maps/CeruleanTradeHouse.asm similarity index 100% rename from text/maps/cerulean_trade_house.asm rename to text/maps/CeruleanTradeHouse.asm diff --git a/text/maps/cerulean_trashed_house.asm b/text/maps/CeruleanTrashedHouse.asm similarity index 100% rename from text/maps/cerulean_trashed_house.asm rename to text/maps/CeruleanTrashedHouse.asm diff --git a/text/maps/champion.asm b/text/maps/ChampionsRoom.asm similarity index 100% rename from text/maps/champion.asm rename to text/maps/ChampionsRoom.asm diff --git a/text/maps/cinnabar_gym.asm b/text/maps/CinnabarGym.asm similarity index 99% rename from text/maps/cinnabar_gym.asm rename to text/maps/CinnabarGym.asm index 173f94d2..1b531571 100644 --- a/text/maps/cinnabar_gym.asm +++ b/text/maps/CinnabarGym.asm @@ -48,7 +48,8 @@ _ReceivedTM38Text:: text "!@@" _TM38ExplanationText:: - db $0 + text "" + para "TM38 contains" line "FIRE BLAST!" diff --git a/text/maps/cinnabar_island.asm b/text/maps/CinnabarIsland.asm similarity index 100% rename from text/maps/cinnabar_island.asm rename to text/maps/CinnabarIsland.asm diff --git a/text/maps/cinnabar_lab.asm b/text/maps/CinnabarLab.asm similarity index 100% rename from text/maps/cinnabar_lab.asm rename to text/maps/CinnabarLab.asm diff --git a/text/maps/cinnabar_lab_fossil_room.asm b/text/maps/CinnabarLabFossilRoom.asm similarity index 99% rename from text/maps/cinnabar_lab_fossil_room.asm rename to text/maps/CinnabarLabFossilRoom.asm index 3978814e..95bde685 100644 --- a/text/maps/cinnabar_lab_fossil_room.asm +++ b/text/maps/CinnabarLabFossilRoom.asm @@ -31,7 +31,7 @@ _Lab4Text_75dd5:: para "It was @" TX_RAM wcf4b - db $0 + text "" line "like I think!" prompt diff --git a/text/maps/cinnabar_lab_metronome_room.asm b/text/maps/CinnabarLabMetronomeRoom.asm similarity index 100% rename from text/maps/cinnabar_lab_metronome_room.asm rename to text/maps/CinnabarLabMetronomeRoom.asm diff --git a/text/maps/cinnabar_lab_trade_room.asm b/text/maps/CinnabarLabTradeRoom.asm similarity index 100% rename from text/maps/cinnabar_lab_trade_room.asm rename to text/maps/CinnabarLabTradeRoom.asm diff --git a/text/maps/cinnabar_mart.asm b/text/maps/CinnabarMart.asm similarity index 100% rename from text/maps/cinnabar_mart.asm rename to text/maps/CinnabarMart.asm diff --git a/text/maps/cinnabar_pokecenter.asm b/text/maps/CinnabarPokecenter.asm similarity index 100% rename from text/maps/cinnabar_pokecenter.asm rename to text/maps/CinnabarPokecenter.asm diff --git a/text/maps/copycats_house_1f.asm b/text/maps/CopycatsHouse1F.asm similarity index 100% rename from text/maps/copycats_house_1f.asm rename to text/maps/CopycatsHouse1F.asm diff --git a/text/maps/copycats_house_2f.asm b/text/maps/CopycatsHouse2F.asm similarity index 99% rename from text/maps/copycats_house_2f.asm rename to text/maps/CopycatsHouse2F.asm index 44988e58..561b2ac5 100644 --- a/text/maps/copycats_house_2f.asm +++ b/text/maps/CopycatsHouse2F.asm @@ -33,7 +33,8 @@ _ReceivedTM31Text:: text "!@@" _TM31ExplanationText1:: - db $0 + text "" + para "TM31 contains my" line "favorite, MIMIC!" diff --git a/text/maps/daycare_1.asm b/text/maps/Daycare.asm similarity index 96% rename from text/maps/daycare_1.asm rename to text/maps/Daycare.asm index f4cec10e..2759c798 100644 --- a/text/maps/daycare_1.asm +++ b/text/maps/Daycare.asm @@ -14,7 +14,7 @@ _DayCareWillLookAfterMonText:: text "Fine, I'll look" line "after @" TX_RAM wcd6d - db $0 + text "" cont "for a while." prompt @@ -26,7 +26,7 @@ _DayCareComeSeeMeInAWhileText:: _DayCareMonHasGrownText:: text "Your @" TX_RAM wcd6d - db $0 + text "" line "has grown a lot!" para "By level, it's" @@ -40,7 +40,7 @@ _DayCareMonHasGrownText:: _DayCareOweMoneyText:: text "You owe me ¥@" TX_BCD wDayCareTotalCost, $c2 - db $0 + text "" line "for the return" cont "of this #MON." done @@ -56,7 +56,7 @@ _DayCareMonNeedsMoreTimeText:: text "Back already?" line "Your @" TX_RAM wcd6d - db $0 + text "" cont "needs some more" cont "time with me." prompt diff --git a/text/maps/daycare_2.asm b/text/maps/Daycare_2.asm similarity index 100% rename from text/maps/daycare_2.asm rename to text/maps/Daycare_2.asm diff --git a/text/maps/digletts_cave_route_11_entrance.asm b/text/maps/DiglettsCaveRoute11.asm similarity index 100% rename from text/maps/digletts_cave_route_11_entrance.asm rename to text/maps/DiglettsCaveRoute11.asm diff --git a/text/maps/digletts_cave_route_2_entrance.asm b/text/maps/DiglettsCaveRoute2.asm similarity index 100% rename from text/maps/digletts_cave_route_2_entrance.asm rename to text/maps/DiglettsCaveRoute2.asm diff --git a/text/maps/fighting_dojo.asm b/text/maps/FightingDojo.asm similarity index 100% rename from text/maps/fighting_dojo.asm rename to text/maps/FightingDojo.asm diff --git a/text/maps/fuchsia_house.asm b/text/maps/FuchsiaBillsGrandpasHouse.asm similarity index 100% rename from text/maps/fuchsia_house.asm rename to text/maps/FuchsiaBillsGrandpasHouse.asm diff --git a/text/maps/fuchsia_city.asm b/text/maps/FuchsiaCity.asm similarity index 100% rename from text/maps/fuchsia_city.asm rename to text/maps/FuchsiaCity.asm diff --git a/text/maps/fuchsia_fishing_house.asm b/text/maps/FuchsiaGoodRodHouse.asm similarity index 100% rename from text/maps/fuchsia_fishing_house.asm rename to text/maps/FuchsiaGoodRodHouse.asm diff --git a/text/maps/fuchsia_gym_1.asm b/text/maps/FuchsiaGym.asm similarity index 100% rename from text/maps/fuchsia_gym_1.asm rename to text/maps/FuchsiaGym.asm diff --git a/text/maps/fuchsia_gym_2.asm b/text/maps/FuchsiaGym_2.asm similarity index 99% rename from text/maps/fuchsia_gym_2.asm rename to text/maps/FuchsiaGym_2.asm index 2913fb8f..f7b39d9c 100644 --- a/text/maps/fuchsia_gym_2.asm +++ b/text/maps/FuchsiaGym_2.asm @@ -31,7 +31,7 @@ _ReceivedTM06Text:: text "!@@" _TM06ExplanationText:: - db $0 + text "" para "TM06 contains" line "TOXIC!" diff --git a/text/maps/fuchsia_mart.asm b/text/maps/FuchsiaMart.asm similarity index 100% rename from text/maps/fuchsia_mart.asm rename to text/maps/FuchsiaMart.asm diff --git a/text/maps/fuchsia_meeting_room.asm b/text/maps/FuchsiaMeetingRoom.asm similarity index 100% rename from text/maps/fuchsia_meeting_room.asm rename to text/maps/FuchsiaMeetingRoom.asm diff --git a/text/maps/fuchsia_pokecenter.asm b/text/maps/FuchsiaPokecenter.asm similarity index 100% rename from text/maps/fuchsia_pokecenter.asm rename to text/maps/FuchsiaPokecenter.asm diff --git a/text/maps/celadon_game_corner.asm b/text/maps/GameCorner.asm similarity index 100% rename from text/maps/celadon_game_corner.asm rename to text/maps/GameCorner.asm diff --git a/text/maps/celadon_prize_room.asm b/text/maps/GameCornerPrizeRoom.asm similarity index 100% rename from text/maps/celadon_prize_room.asm rename to text/maps/GameCornerPrizeRoom.asm diff --git a/text/maps/hall_of_fame.asm b/text/maps/HallOfFame.asm similarity index 100% rename from text/maps/hall_of_fame.asm rename to text/maps/HallOfFame.asm diff --git a/text/maps/indigo_plateau_lobby.asm b/text/maps/IndigoPlateauLobby.asm similarity index 100% rename from text/maps/indigo_plateau_lobby.asm rename to text/maps/IndigoPlateauLobby.asm diff --git a/text/maps/lance.asm b/text/maps/LancesRoom.asm similarity index 100% rename from text/maps/lance.asm rename to text/maps/LancesRoom.asm diff --git a/text/maps/lavender_house.asm b/text/maps/LavenderCuboneHouse.asm similarity index 100% rename from text/maps/lavender_house.asm rename to text/maps/LavenderCuboneHouse.asm diff --git a/text/maps/lavender_mart.asm b/text/maps/LavenderMart.asm similarity index 100% rename from text/maps/lavender_mart.asm rename to text/maps/LavenderMart.asm diff --git a/text/maps/lavender_pokecenter.asm b/text/maps/LavenderPokecenter.asm similarity index 100% rename from text/maps/lavender_pokecenter.asm rename to text/maps/LavenderPokecenter.asm diff --git a/text/maps/lavender_town.asm b/text/maps/LavenderTown.asm similarity index 100% rename from text/maps/lavender_town.asm rename to text/maps/LavenderTown.asm diff --git a/text/maps/lorelei.asm b/text/maps/LoreleisRoom.asm similarity index 100% rename from text/maps/lorelei.asm rename to text/maps/LoreleisRoom.asm diff --git a/text/maps/fujis_house.asm b/text/maps/MrFujisHouse.asm similarity index 99% rename from text/maps/fujis_house.asm rename to text/maps/MrFujisHouse.asm index 86cade68..f903eb6a 100644 --- a/text/maps/fujis_house.asm +++ b/text/maps/MrFujisHouse.asm @@ -52,7 +52,8 @@ _ReceivedFluteText:: text "!@@" _FluteExplanationText:: - db $0 + text "" + para "Upon hearing #" line "FLUTE, sleeping" cont "#MON will" diff --git a/text/maps/mr_psychics_house.asm b/text/maps/MrPsychicsHouse.asm similarity index 100% rename from text/maps/mr_psychics_house.asm rename to text/maps/MrPsychicsHouse.asm diff --git a/text/maps/mt_moon_1f.asm b/text/maps/MtMoon1F.asm similarity index 100% rename from text/maps/mt_moon_1f.asm rename to text/maps/MtMoon1F.asm diff --git a/text/maps/mt_moon_b1f.asm b/text/maps/MtMoonB1F.asm similarity index 70% rename from text/maps/mt_moon_b1f.asm rename to text/maps/MtMoonB1F.asm index cd995ed5..755fa583 100644 --- a/text/maps/mt_moon_b1f.asm +++ b/text/maps/MtMoonB1F.asm @@ -1,3 +1,3 @@ _MtMoonText1:: - db $0 + text "" done diff --git a/text/maps/mt_moon_b2f.asm b/text/maps/MtMoonB2F.asm similarity index 100% rename from text/maps/mt_moon_b2f.asm rename to text/maps/MtMoonB2F.asm diff --git a/text/maps/mt_moon_pokecenter.asm b/text/maps/MtMoonPokecenter.asm similarity index 98% rename from text/maps/mt_moon_pokecenter.asm rename to text/maps/MtMoonPokecenter.asm index 90fd811e..7bc99dae 100644 --- a/text/maps/mt_moon_pokecenter.asm +++ b/text/maps/MtMoonPokecenter.asm @@ -44,5 +44,5 @@ _MagikarpSalesmanText2:: done _MtMoonPokecenterText5:: - db $0 + text "" done diff --git a/text/maps/museum_1f.asm b/text/maps/Museum1F.asm similarity index 100% rename from text/maps/museum_1f.asm rename to text/maps/Museum1F.asm diff --git a/text/maps/museum_2f.asm b/text/maps/Museum2F.asm similarity index 100% rename from text/maps/museum_2f.asm rename to text/maps/Museum2F.asm diff --git a/text/maps/name_rater.asm b/text/maps/NameRatersHouse.asm similarity index 100% rename from text/maps/name_rater.asm rename to text/maps/NameRatersHouse.asm diff --git a/text/maps/oaks_lab.asm b/text/maps/OaksLab.asm similarity index 100% rename from text/maps/oaks_lab.asm rename to text/maps/OaksLab.asm diff --git a/text/maps/pallet_town.asm b/text/maps/PalletTown.asm similarity index 100% rename from text/maps/pallet_town.asm rename to text/maps/PalletTown.asm diff --git a/text/maps/pewter_city.asm b/text/maps/PewterCity.asm similarity index 100% rename from text/maps/pewter_city.asm rename to text/maps/PewterCity.asm diff --git a/text/maps/pewter_gym_1.asm b/text/maps/PewterGym.asm similarity index 100% rename from text/maps/pewter_gym_1.asm rename to text/maps/PewterGym.asm diff --git a/text/maps/pewter_gym_2.asm b/text/maps/PewterGym_2.asm similarity index 99% rename from text/maps/pewter_gym_2.asm rename to text/maps/PewterGym_2.asm index 86b97018..5312e4f2 100644 --- a/text/maps/pewter_gym_2.asm +++ b/text/maps/PewterGym_2.asm @@ -22,7 +22,8 @@ _ReceivedTM34Text:: line "TM34!@@" _TM34ExplanationText:: - db $0 + text "" + para "A TM contains a" line "technique that" cont "can be taught to" @@ -61,7 +62,8 @@ _PewterGymText_5c4bc:: line "the BOULDERBADGE!@@" _PewterGymText_5c4c1:: - db $0 + text "" + para "That's an official" line "#MON LEAGUE" cont "BADGE!" diff --git a/text/maps/pewter_mart.asm b/text/maps/PewterMart.asm similarity index 100% rename from text/maps/pewter_mart.asm rename to text/maps/PewterMart.asm diff --git a/text/maps/pewter_house_1.asm b/text/maps/PewterNidoranHouse.asm similarity index 100% rename from text/maps/pewter_house_1.asm rename to text/maps/PewterNidoranHouse.asm diff --git a/text/maps/pewter_pokecenter.asm b/text/maps/PewterPokecenter.asm similarity index 100% rename from text/maps/pewter_pokecenter.asm rename to text/maps/PewterPokecenter.asm diff --git a/text/maps/pewter_house_2.asm b/text/maps/PewterSpeechHouse.asm similarity index 100% rename from text/maps/pewter_house_2.asm rename to text/maps/PewterSpeechHouse.asm diff --git a/text/maps/fan_club.asm b/text/maps/PokemonFanClub.asm similarity index 100% rename from text/maps/fan_club.asm rename to text/maps/PokemonFanClub.asm diff --git a/text/maps/mansion_1f.asm b/text/maps/PokemonMansion1F.asm similarity index 100% rename from text/maps/mansion_1f.asm rename to text/maps/PokemonMansion1F.asm diff --git a/text/maps/mansion_2f.asm b/text/maps/PokemonMansion2F.asm similarity index 100% rename from text/maps/mansion_2f.asm rename to text/maps/PokemonMansion2F.asm diff --git a/text/maps/mansion_3f.asm b/text/maps/PokemonMansion3F.asm similarity index 100% rename from text/maps/mansion_3f.asm rename to text/maps/PokemonMansion3F.asm diff --git a/text/maps/mansion_b1f.asm b/text/maps/PokemonMansionB1F.asm similarity index 100% rename from text/maps/mansion_b1f.asm rename to text/maps/PokemonMansionB1F.asm diff --git a/text/maps/pokemon_tower_1f.asm b/text/maps/PokemonTower1F.asm similarity index 100% rename from text/maps/pokemon_tower_1f.asm rename to text/maps/PokemonTower1F.asm diff --git a/text/maps/pokemon_tower_2f.asm b/text/maps/PokemonTower2F.asm similarity index 100% rename from text/maps/pokemon_tower_2f.asm rename to text/maps/PokemonTower2F.asm diff --git a/text/maps/pokemon_tower_3f.asm b/text/maps/PokemonTower3F.asm similarity index 100% rename from text/maps/pokemon_tower_3f.asm rename to text/maps/PokemonTower3F.asm diff --git a/text/maps/pokemon_tower_4f.asm b/text/maps/PokemonTower4F.asm similarity index 100% rename from text/maps/pokemon_tower_4f.asm rename to text/maps/PokemonTower4F.asm diff --git a/text/maps/pokemon_tower_5f.asm b/text/maps/PokemonTower5F.asm similarity index 100% rename from text/maps/pokemon_tower_5f.asm rename to text/maps/PokemonTower5F.asm diff --git a/text/maps/pokemon_tower_6f.asm b/text/maps/PokemonTower6F.asm similarity index 100% rename from text/maps/pokemon_tower_6f.asm rename to text/maps/PokemonTower6F.asm diff --git a/text/maps/pokemon_tower_7f.asm b/text/maps/PokemonTower7F.asm similarity index 100% rename from text/maps/pokemon_tower_7f.asm rename to text/maps/PokemonTower7F.asm diff --git a/text/maps/power_plant.asm b/text/maps/PowerPlant.asm similarity index 100% rename from text/maps/power_plant.asm rename to text/maps/PowerPlant.asm diff --git a/text/maps/reds_house_1f.asm b/text/maps/RedsHouse1F.asm similarity index 100% rename from text/maps/reds_house_1f.asm rename to text/maps/RedsHouse1F.asm diff --git a/text/maps/rock_tunnel_b1f.asm b/text/maps/RockTunnel1F.asm similarity index 100% rename from text/maps/rock_tunnel_b1f.asm rename to text/maps/RockTunnel1F.asm diff --git a/text/maps/rock_tunnel_b2f_1.asm b/text/maps/RockTunnelB1F.asm similarity index 100% rename from text/maps/rock_tunnel_b2f_1.asm rename to text/maps/RockTunnelB1F.asm diff --git a/text/maps/rock_tunnel_b2f_2.asm b/text/maps/RockTunnelB1F_2.asm similarity index 100% rename from text/maps/rock_tunnel_b2f_2.asm rename to text/maps/RockTunnelB1F_2.asm diff --git a/text/maps/rock_tunnel_pokecenter.asm b/text/maps/RockTunnelPokecenter.asm similarity index 100% rename from text/maps/rock_tunnel_pokecenter.asm rename to text/maps/RockTunnelPokecenter.asm diff --git a/text/maps/rocket_hideout_b1f.asm b/text/maps/RocketHideoutB1F.asm similarity index 100% rename from text/maps/rocket_hideout_b1f.asm rename to text/maps/RocketHideoutB1F.asm diff --git a/text/maps/rocket_hideout_b2f.asm b/text/maps/RocketHideoutB2F.asm similarity index 100% rename from text/maps/rocket_hideout_b2f.asm rename to text/maps/RocketHideoutB2F.asm diff --git a/text/maps/rocket_hideout_b3f.asm b/text/maps/RocketHideoutB3F.asm similarity index 100% rename from text/maps/rocket_hideout_b3f.asm rename to text/maps/RocketHideoutB3F.asm diff --git a/text/maps/rocket_hideout_b4f.asm b/text/maps/RocketHideoutB4F.asm similarity index 100% rename from text/maps/rocket_hideout_b4f.asm rename to text/maps/RocketHideoutB4F.asm diff --git a/text/maps/rocket_hideout_elevator.asm b/text/maps/RocketHideoutElevator.asm similarity index 100% rename from text/maps/rocket_hideout_elevator.asm rename to text/maps/RocketHideoutElevator.asm diff --git a/text/maps/route_1.asm b/text/maps/Route1.asm similarity index 100% rename from text/maps/route_1.asm rename to text/maps/Route1.asm diff --git a/text/maps/route_10.asm b/text/maps/Route10.asm similarity index 100% rename from text/maps/route_10.asm rename to text/maps/Route10.asm diff --git a/text/maps/route_11_1.asm b/text/maps/Route11.asm similarity index 100% rename from text/maps/route_11_1.asm rename to text/maps/Route11.asm diff --git a/text/maps/route_11_gate.asm b/text/maps/Route11Gate1F.asm similarity index 100% rename from text/maps/route_11_gate.asm rename to text/maps/Route11Gate1F.asm diff --git a/text/maps/route_11_gate_upstairs.asm b/text/maps/Route11Gate2F.asm similarity index 100% rename from text/maps/route_11_gate_upstairs.asm rename to text/maps/Route11Gate2F.asm diff --git a/text/maps/route_11_2.asm b/text/maps/Route11_2.asm similarity index 100% rename from text/maps/route_11_2.asm rename to text/maps/Route11_2.asm diff --git a/text/maps/route_12.asm b/text/maps/Route12.asm similarity index 100% rename from text/maps/route_12.asm rename to text/maps/Route12.asm diff --git a/text/maps/route_12_gate.asm b/text/maps/Route12Gate1F.asm similarity index 100% rename from text/maps/route_12_gate.asm rename to text/maps/Route12Gate1F.asm diff --git a/text/maps/route_12_gate_upstairs.asm b/text/maps/Route12Gate2F.asm similarity index 100% rename from text/maps/route_12_gate_upstairs.asm rename to text/maps/Route12Gate2F.asm diff --git a/text/maps/route_12_house.asm b/text/maps/Route12SuperRodHouse.asm similarity index 98% rename from text/maps/route_12_house.asm rename to text/maps/Route12SuperRodHouse.asm index e04ce5fb..7dfaa74f 100644 --- a/text/maps/route_12_house.asm +++ b/text/maps/Route12SuperRodHouse.asm @@ -22,7 +22,8 @@ _Route12HouseText_564c5:: text "!@@" _Route12HouseText_564ca:: - db $0 + text "" + para "Fishing is a way" line "of life!" diff --git a/text/maps/route_13.asm b/text/maps/Route13.asm similarity index 100% rename from text/maps/route_13.asm rename to text/maps/Route13.asm diff --git a/text/maps/route_14.asm b/text/maps/Route14.asm similarity index 100% rename from text/maps/route_14.asm rename to text/maps/Route14.asm diff --git a/text/maps/route_15.asm b/text/maps/Route15.asm similarity index 100% rename from text/maps/route_15.asm rename to text/maps/Route15.asm diff --git a/text/maps/route_15_gate.asm b/text/maps/Route15Gate1F.asm similarity index 100% rename from text/maps/route_15_gate.asm rename to text/maps/Route15Gate1F.asm diff --git a/text/maps/route_15_gate_upstairs.asm b/text/maps/Route15Gate2F.asm similarity index 100% rename from text/maps/route_15_gate_upstairs.asm rename to text/maps/Route15Gate2F.asm diff --git a/text/maps/route_16.asm b/text/maps/Route16.asm similarity index 100% rename from text/maps/route_16.asm rename to text/maps/Route16.asm diff --git a/text/maps/route_16_house.asm b/text/maps/Route16FlyHouse.asm similarity index 100% rename from text/maps/route_16_house.asm rename to text/maps/Route16FlyHouse.asm diff --git a/text/maps/route_16_gate.asm b/text/maps/Route16Gate1F.asm similarity index 100% rename from text/maps/route_16_gate.asm rename to text/maps/Route16Gate1F.asm diff --git a/text/maps/route_16_gate_upstairs.asm b/text/maps/Route16Gate2F.asm similarity index 100% rename from text/maps/route_16_gate_upstairs.asm rename to text/maps/Route16Gate2F.asm diff --git a/text/maps/route_17.asm b/text/maps/Route17.asm similarity index 100% rename from text/maps/route_17.asm rename to text/maps/Route17.asm diff --git a/text/maps/route_18.asm b/text/maps/Route18.asm similarity index 100% rename from text/maps/route_18.asm rename to text/maps/Route18.asm diff --git a/text/maps/route_18_gate.asm b/text/maps/Route18Gate1F.asm similarity index 100% rename from text/maps/route_18_gate.asm rename to text/maps/Route18Gate1F.asm diff --git a/text/maps/route_18_gate_upstairs.asm b/text/maps/Route18Gate2F.asm similarity index 100% rename from text/maps/route_18_gate_upstairs.asm rename to text/maps/Route18Gate2F.asm diff --git a/text/maps/route_19.asm b/text/maps/Route19.asm similarity index 100% rename from text/maps/route_19.asm rename to text/maps/Route19.asm diff --git a/text/maps/route_2.asm b/text/maps/Route2.asm similarity index 100% rename from text/maps/route_2.asm rename to text/maps/Route2.asm diff --git a/text/maps/route_20.asm b/text/maps/Route20.asm similarity index 100% rename from text/maps/route_20.asm rename to text/maps/Route20.asm diff --git a/text/maps/route_21.asm b/text/maps/Route21.asm similarity index 100% rename from text/maps/route_21.asm rename to text/maps/Route21.asm diff --git a/text/maps/route_22.asm b/text/maps/Route22.asm similarity index 100% rename from text/maps/route_22.asm rename to text/maps/Route22.asm diff --git a/text/maps/pokemon_league_gate.asm b/text/maps/Route22Gate.asm similarity index 97% rename from text/maps/pokemon_league_gate.asm rename to text/maps/Route22Gate.asm index ac92f4b0..ce3f6824 100644 --- a/text/maps/pokemon_league_gate.asm +++ b/text/maps/Route22Gate.asm @@ -7,7 +7,8 @@ _Route22GateText_1e704:: line "BOULDERBADGE yet!@@" _Route22GateText_1e715:: - db $0 + text "" + para "The rules are" line "rules. I can't" cont "let you pass." diff --git a/text/maps/route_23.asm b/text/maps/Route23.asm similarity index 98% rename from text/maps/route_23.asm rename to text/maps/Route23.asm index 2ecb020e..a7e534de 100644 --- a/text/maps/route_23.asm +++ b/text/maps/Route23.asm @@ -27,7 +27,8 @@ _VictoryRoadGuardText2:: text "!@@" _VictoryRoadGuardText_513a3:: - db $0 + text "" + para "OK then! Please," line "go right ahead!" done diff --git a/text/maps/route_24_1.asm b/text/maps/Route24.asm similarity index 99% rename from text/maps/route_24_1.asm rename to text/maps/Route24.asm index ae861eda..c14b689a 100644 --- a/text/maps/route_24_1.asm +++ b/text/maps/Route24.asm @@ -4,7 +4,8 @@ _Route24Text_51510:: cont "contest trainers!@@" _Route24Text_51515:: - db $0 + text "" + para "You just earned a" line "fabulous prize!" prompt diff --git a/text/maps/route_24_2.asm b/text/maps/Route24_2.asm similarity index 100% rename from text/maps/route_24_2.asm rename to text/maps/Route24_2.asm diff --git a/text/maps/route_25.asm b/text/maps/Route25.asm similarity index 100% rename from text/maps/route_25.asm rename to text/maps/Route25.asm diff --git a/text/maps/route_2_gate.asm b/text/maps/Route2Gate.asm similarity index 100% rename from text/maps/route_2_gate.asm rename to text/maps/Route2Gate.asm diff --git a/text/maps/route_2_house.asm b/text/maps/Route2TradeHouse.asm similarity index 100% rename from text/maps/route_2_house.asm rename to text/maps/Route2TradeHouse.asm diff --git a/text/maps/route_3.asm b/text/maps/Route3.asm similarity index 100% rename from text/maps/route_3.asm rename to text/maps/Route3.asm diff --git a/text/maps/route_4.asm b/text/maps/Route4.asm similarity index 100% rename from text/maps/route_4.asm rename to text/maps/Route4.asm diff --git a/text/maps/route_5.asm b/text/maps/Route5.asm similarity index 100% rename from text/maps/route_5.asm rename to text/maps/Route5.asm diff --git a/text/maps/route_6.asm b/text/maps/Route6.asm similarity index 100% rename from text/maps/route_6.asm rename to text/maps/Route6.asm diff --git a/text/maps/route_7.asm b/text/maps/Route7.asm similarity index 100% rename from text/maps/route_7.asm rename to text/maps/Route7.asm diff --git a/text/maps/route_8.asm b/text/maps/Route8.asm similarity index 100% rename from text/maps/route_8.asm rename to text/maps/Route8.asm diff --git a/text/maps/route_9.asm b/text/maps/Route9.asm similarity index 100% rename from text/maps/route_9.asm rename to text/maps/Route9.asm diff --git a/text/maps/ss_anne_1.asm b/text/maps/SSAnne1F.asm similarity index 100% rename from text/maps/ss_anne_1.asm rename to text/maps/SSAnne1F.asm diff --git a/text/maps/ss_anne_8.asm b/text/maps/SSAnne1FRooms.asm similarity index 100% rename from text/maps/ss_anne_8.asm rename to text/maps/SSAnne1FRooms.asm diff --git a/text/maps/ss_anne_2.asm b/text/maps/SSAnne2F.asm similarity index 100% rename from text/maps/ss_anne_2.asm rename to text/maps/SSAnne2F.asm diff --git a/text/maps/ss_anne_9.asm b/text/maps/SSAnne2FRooms.asm similarity index 100% rename from text/maps/ss_anne_9.asm rename to text/maps/SSAnne2FRooms.asm diff --git a/text/maps/ss_anne_3.asm b/text/maps/SSAnne3F.asm similarity index 100% rename from text/maps/ss_anne_3.asm rename to text/maps/SSAnne3F.asm diff --git a/text/maps/ss_anne_10.asm b/text/maps/SSAnneB1FRooms.asm similarity index 100% rename from text/maps/ss_anne_10.asm rename to text/maps/SSAnneB1FRooms.asm diff --git a/text/maps/ss_anne_5.asm b/text/maps/SSAnneBow.asm similarity index 100% rename from text/maps/ss_anne_5.asm rename to text/maps/SSAnneBow.asm diff --git a/text/maps/ss_anne_7.asm b/text/maps/SSAnneCaptainsRoom.asm similarity index 100% rename from text/maps/ss_anne_7.asm rename to text/maps/SSAnneCaptainsRoom.asm diff --git a/text/maps/ss_anne_6.asm b/text/maps/SSAnneKitchen.asm similarity index 100% rename from text/maps/ss_anne_6.asm rename to text/maps/SSAnneKitchen.asm diff --git a/text/maps/safari_zone_center.asm b/text/maps/SafariZoneCenter.asm similarity index 100% rename from text/maps/safari_zone_center.asm rename to text/maps/SafariZoneCenter.asm diff --git a/text/maps/safari_zone_rest_house_1.asm b/text/maps/SafariZoneCenterRestHouse.asm similarity index 100% rename from text/maps/safari_zone_rest_house_1.asm rename to text/maps/SafariZoneCenterRestHouse.asm diff --git a/text/maps/safari_zone_east.asm b/text/maps/SafariZoneEast.asm similarity index 100% rename from text/maps/safari_zone_east.asm rename to text/maps/SafariZoneEast.asm diff --git a/text/maps/safari_zone_rest_house_3.asm b/text/maps/SafariZoneEastRestHouse.asm similarity index 100% rename from text/maps/safari_zone_rest_house_3.asm rename to text/maps/SafariZoneEastRestHouse.asm diff --git a/text/maps/safari_zone_entrance.asm b/text/maps/SafariZoneGate.asm similarity index 99% rename from text/maps/safari_zone_entrance.asm rename to text/maps/SafariZoneGate.asm index dcc1fd9b..5c143891 100644 --- a/text/maps/safari_zone_entrance.asm +++ b/text/maps/SafariZoneGate.asm @@ -24,7 +24,8 @@ SafariZoneEntranceText_9e747:: line "30 SAFARI BALLs!@@" _SafariZoneEntranceText_75360:: - db $0 + text "" + para "We'll call you on" line "the PA when you" cont "run out of time" diff --git a/text/maps/safari_zone_north.asm b/text/maps/SafariZoneNorth.asm similarity index 100% rename from text/maps/safari_zone_north.asm rename to text/maps/SafariZoneNorth.asm diff --git a/text/maps/safari_zone_rest_house_4.asm b/text/maps/SafariZoneNorthRestHouse.asm similarity index 100% rename from text/maps/safari_zone_rest_house_4.asm rename to text/maps/SafariZoneNorthRestHouse.asm diff --git a/text/maps/safari_zone_secret_house.asm b/text/maps/SafariZoneSecretHouse.asm similarity index 100% rename from text/maps/safari_zone_secret_house.asm rename to text/maps/SafariZoneSecretHouse.asm diff --git a/text/maps/safari_zone_west.asm b/text/maps/SafariZoneWest.asm similarity index 100% rename from text/maps/safari_zone_west.asm rename to text/maps/SafariZoneWest.asm diff --git a/text/maps/safari_zone_rest_house_2.asm b/text/maps/SafariZoneWestRestHouse.asm similarity index 100% rename from text/maps/safari_zone_rest_house_2.asm rename to text/maps/SafariZoneWestRestHouse.asm diff --git a/text/maps/saffron_city.asm b/text/maps/SaffronCity.asm similarity index 100% rename from text/maps/saffron_city.asm rename to text/maps/SaffronCity.asm diff --git a/text/maps/saffron_gates.asm b/text/maps/SaffronGates.asm similarity index 98% rename from text/maps/saffron_gates.asm rename to text/maps/SaffronGates.asm index c16e880e..9bb4601f 100644 --- a/text/maps/saffron_gates.asm +++ b/text/maps/SaffronGates.asm @@ -16,7 +16,8 @@ _SaffronGateText_8aaa9:: cont "Gee, thanks!@@" _SaffronGateText_1dff1:: - db $0 + text "" + para "..." line "Glug glug..." cont "..." diff --git a/text/maps/saffron_gym.asm b/text/maps/SaffronGym.asm similarity index 99% rename from text/maps/saffron_gym.asm rename to text/maps/SaffronGym.asm index 419b56ac..6f49a331 100644 --- a/text/maps/saffron_gym.asm +++ b/text/maps/SaffronGym.asm @@ -59,7 +59,8 @@ ReceivedTM46Text:: line "TM46!@@" _TM46ExplanationText:: - db $0 + text "" + para "TM46 is PSYWAVE!" line "It uses powerful" cont "psychic waves to" diff --git a/text/maps/saffron_mart.asm b/text/maps/SaffronMart.asm similarity index 100% rename from text/maps/saffron_mart.asm rename to text/maps/SaffronMart.asm diff --git a/text/maps/saffron_house.asm b/text/maps/SaffronPidgeyHouse.asm similarity index 100% rename from text/maps/saffron_house.asm rename to text/maps/SaffronPidgeyHouse.asm diff --git a/text/maps/saffron_pokecenter.asm b/text/maps/SaffronPokecenter.asm similarity index 100% rename from text/maps/saffron_pokecenter.asm rename to text/maps/SaffronPokecenter.asm diff --git a/text/maps/seafoam_islands_b4f.asm b/text/maps/SeafoamIslandsB4F.asm similarity index 100% rename from text/maps/seafoam_islands_b4f.asm rename to text/maps/SeafoamIslandsB4F.asm diff --git a/text/maps/silph_co_10f.asm b/text/maps/SilphCo10F.asm similarity index 100% rename from text/maps/silph_co_10f.asm rename to text/maps/SilphCo10F.asm diff --git a/text/maps/silph_co_11f.asm b/text/maps/SilphCo11F.asm similarity index 100% rename from text/maps/silph_co_11f.asm rename to text/maps/SilphCo11F.asm diff --git a/text/maps/silph_co_1f.asm b/text/maps/SilphCo1F.asm similarity index 100% rename from text/maps/silph_co_1f.asm rename to text/maps/SilphCo1F.asm diff --git a/text/maps/silph_co_2f.asm b/text/maps/SilphCo2F.asm similarity index 100% rename from text/maps/silph_co_2f.asm rename to text/maps/SilphCo2F.asm diff --git a/text/maps/silph_co_3f.asm b/text/maps/SilphCo3F.asm similarity index 100% rename from text/maps/silph_co_3f.asm rename to text/maps/SilphCo3F.asm diff --git a/text/maps/silph_co_4f.asm b/text/maps/SilphCo4F.asm similarity index 100% rename from text/maps/silph_co_4f.asm rename to text/maps/SilphCo4F.asm diff --git a/text/maps/silph_co_5f_1.asm b/text/maps/SilphCo5F.asm similarity index 100% rename from text/maps/silph_co_5f_1.asm rename to text/maps/SilphCo5F.asm diff --git a/text/maps/silph_co_5f_2.asm b/text/maps/SilphCo5F_2.asm similarity index 100% rename from text/maps/silph_co_5f_2.asm rename to text/maps/SilphCo5F_2.asm diff --git a/text/maps/silph_co_6f.asm b/text/maps/SilphCo6F.asm similarity index 100% rename from text/maps/silph_co_6f.asm rename to text/maps/SilphCo6F.asm diff --git a/text/maps/silph_co_7f.asm b/text/maps/SilphCo7F.asm similarity index 100% rename from text/maps/silph_co_7f.asm rename to text/maps/SilphCo7F.asm diff --git a/text/maps/silph_co_8f.asm b/text/maps/SilphCo8F.asm similarity index 100% rename from text/maps/silph_co_8f.asm rename to text/maps/SilphCo8F.asm diff --git a/text/maps/silph_co_9f.asm b/text/maps/SilphCo9F.asm similarity index 100% rename from text/maps/silph_co_9f.asm rename to text/maps/SilphCo9F.asm diff --git a/text/maps/underground_path_route_6_entrance.asm b/text/maps/UndergroundPathRoute6.asm similarity index 100% rename from text/maps/underground_path_route_6_entrance.asm rename to text/maps/UndergroundPathRoute6.asm diff --git a/text/maps/underground_path_route_7_entrance.asm b/text/maps/UndergroundPathRoute7.asm similarity index 100% rename from text/maps/underground_path_route_7_entrance.asm rename to text/maps/UndergroundPathRoute7.asm diff --git a/text/maps/underground_path_route_7_entrance_unused.asm b/text/maps/UndergroundPathRoute7Copy.asm similarity index 100% rename from text/maps/underground_path_route_7_entrance_unused.asm rename to text/maps/UndergroundPathRoute7Copy.asm diff --git a/text/maps/underground_path_route_8_entrance.asm b/text/maps/UndergroundPathRoute8.asm similarity index 100% rename from text/maps/underground_path_route_8_entrance.asm rename to text/maps/UndergroundPathRoute8.asm diff --git a/text/maps/vermilion_city.asm b/text/maps/VermilionCity.asm similarity index 100% rename from text/maps/vermilion_city.asm rename to text/maps/VermilionCity.asm diff --git a/text/maps/vermilion_dock.asm b/text/maps/VermilionDock.asm similarity index 100% rename from text/maps/vermilion_dock.asm rename to text/maps/VermilionDock.asm diff --git a/text/maps/vermilion_gym_1.asm b/text/maps/VermilionGym.asm similarity index 100% rename from text/maps/vermilion_gym_1.asm rename to text/maps/VermilionGym.asm diff --git a/text/maps/vermilion_gym_2.asm b/text/maps/VermilionGym_2.asm similarity index 99% rename from text/maps/vermilion_gym_2.asm rename to text/maps/VermilionGym_2.asm index d0a01932..7f645d59 100644 --- a/text/maps/vermilion_gym_2.asm +++ b/text/maps/VermilionGym_2.asm @@ -30,7 +30,8 @@ _ReceivedTM24Text:: text "!@@" _TM24ExplanationText:: - db $0 + text "" + para "TM24 contains" line "THUNDERBOLT!" diff --git a/text/maps/vermilion_mart.asm b/text/maps/VermilionMart.asm similarity index 100% rename from text/maps/vermilion_mart.asm rename to text/maps/VermilionMart.asm diff --git a/text/maps/vermilion_fishing_house.asm b/text/maps/VermilionOldRodHouse.asm similarity index 98% rename from text/maps/vermilion_fishing_house.asm rename to text/maps/VermilionOldRodHouse.asm index 6857bb5b..32526e36 100644 --- a/text/maps/vermilion_fishing_house.asm +++ b/text/maps/VermilionOldRodHouse.asm @@ -22,7 +22,8 @@ _VermilionHouse2Text_560b6:: text "!@@" _VermilionHouse2Text_560bb:: - db $0 + text "" + para "Fishing is a way" line "of life!" diff --git a/text/maps/vermilion_house.asm b/text/maps/VermilionPidgeyHouse.asm similarity index 100% rename from text/maps/vermilion_house.asm rename to text/maps/VermilionPidgeyHouse.asm diff --git a/text/maps/vermilion_pokecenter.asm b/text/maps/VermilionPokecenter.asm similarity index 100% rename from text/maps/vermilion_pokecenter.asm rename to text/maps/VermilionPokecenter.asm diff --git a/text/maps/victory_road_1f.asm b/text/maps/VictoryRoad1F.asm similarity index 100% rename from text/maps/victory_road_1f.asm rename to text/maps/VictoryRoad1F.asm diff --git a/text/maps/victory_road_2f.asm b/text/maps/VictoryRoad2F.asm similarity index 100% rename from text/maps/victory_road_2f.asm rename to text/maps/VictoryRoad2F.asm diff --git a/text/maps/victory_road_3f.asm b/text/maps/VictoryRoad3F.asm similarity index 100% rename from text/maps/victory_road_3f.asm rename to text/maps/VictoryRoad3F.asm diff --git a/text/maps/viridian_city.asm b/text/maps/ViridianCity.asm similarity index 100% rename from text/maps/viridian_city.asm rename to text/maps/ViridianCity.asm diff --git a/text/maps/viridian_forest.asm b/text/maps/ViridianForest.asm similarity index 100% rename from text/maps/viridian_forest.asm rename to text/maps/ViridianForest.asm diff --git a/text/maps/viridian_forest_exit.asm b/text/maps/ViridianForestNorthGate.asm similarity index 100% rename from text/maps/viridian_forest_exit.asm rename to text/maps/ViridianForestNorthGate.asm diff --git a/text/maps/viridian_forest_entrance.asm b/text/maps/ViridianForestSouthGate.asm similarity index 100% rename from text/maps/viridian_forest_entrance.asm rename to text/maps/ViridianForestSouthGate.asm diff --git a/text/maps/viridian_gym.asm b/text/maps/ViridianGym.asm similarity index 99% rename from text/maps/viridian_gym.asm rename to text/maps/ViridianGym.asm index f87d8d58..4c7b5207 100644 --- a/text/maps/viridian_gym.asm +++ b/text/maps/ViridianGym.asm @@ -64,7 +64,8 @@ _ReceivedTM27Text:: line "TM27!@@" _TM27ExplanationText:: - db $0 + text "" + para "TM27 is FISSURE!" line "It will take out" cont "#MON with just" diff --git a/text/maps/viridian_mart.asm b/text/maps/ViridianMart.asm similarity index 100% rename from text/maps/viridian_mart.asm rename to text/maps/ViridianMart.asm diff --git a/text/maps/viridian_house.asm b/text/maps/ViridianNicknameHouse.asm similarity index 100% rename from text/maps/viridian_house.asm rename to text/maps/ViridianNicknameHouse.asm diff --git a/text/maps/viridian_pokecenter.asm b/text/maps/ViridianPokecenter.asm similarity index 100% rename from text/maps/viridian_pokecenter.asm rename to text/maps/ViridianPokecenter.asm diff --git a/text/maps/school.asm b/text/maps/ViridianSchoolHouse.asm similarity index 100% rename from text/maps/school.asm rename to text/maps/ViridianSchoolHouse.asm diff --git a/text/maps/wardens_house.asm b/text/maps/WardensHouse.asm similarity index 99% rename from text/maps/wardens_house.asm rename to text/maps/WardensHouse.asm index 9d40cace..7efddb90 100644 --- a/text/maps/wardens_house.asm +++ b/text/maps/WardensHouse.asm @@ -23,7 +23,8 @@ _WardenTeethText1:: cont "WARDEN!@@" _WardenTeethText2:: - db $0 + text "" + para "The WARDEN popped" line "in his teeth!" prompt diff --git a/wram.asm b/wram.asm index b59cfaad..42485b1c 100755 --- a/wram.asm +++ b/wram.asm @@ -1,4 +1,3 @@ - INCLUDE "constants.asm" flag_array: MACRO @@ -2672,8 +2671,6 @@ wMissableObjectList:: ; d5ce wGameProgressFlags:: ; d5f0 ; $c8 bytes - ds 0 - wOaksLabCurScript:: ; d5f0 ds 1 wPalletTownCurScript:: ; d5f1 @@ -2713,31 +2710,31 @@ wRoute9CurScript:: ; d604 ds 1 wRoute10CurScript:: ; d605 ds 1 -wMtMoon1CurScript:: ; d606 +wMtMoon1FCurScript:: ; d606 ds 1 -wMtMoon3CurScript:: ; d607 +wMtMoonB2FCurScript:: ; d607 ds 1 -wSSAnne8CurScript:: ; d608 +wSSAnne1FRoomsCurScript:: ; d608 ds 1 -wSSAnne9CurScript:: ; d609 +wSSAnne2FRoomsCurScript:: ; d609 ds 1 wRoute22CurScript:: ; d60a ds 1 ds 1 -wRedsHouse2CurScript:: ; d60c +wRedsHouse2FCurScript:: ; d60c ds 1 -wViridianMarketCurScript:: ; d60d +wViridianMartCurScript:: ; d60d ds 1 wRoute22GateCurScript:: ; d60e ds 1 wCeruleanCityCurScript:: ; d60f ds 1 ds 7 -wSSAnne5CurScript:: ; d617 +wSSAnneBowCurScript:: ; d617 ds 1 wViridianForestCurScript:: ; d618 ds 1 -wMuseum1fCurScript:: ; d619 +wMuseum1FCurScript:: ; d619 ds 1 wRoute13CurScript:: ; d61a ds 1 @@ -2749,11 +2746,11 @@ wRoute19CurScript:: ; d61d ds 1 wRoute21CurScript:: ; d61e ds 1 -wSafariZoneEntranceCurScript:: ; d61f +wSafariZoneGateCurScript:: ; d61f ds 1 -wRockTunnel2CurScript:: ; d620 +wRockTunnelB1FCurScript:: ; d620 ds 1 -wRockTunnel1CurScript:: ; d621 +wRockTunnel1FCurScript:: ; d621 ds 1 ds 1 wRoute11CurScript:: ; d623 @@ -2768,29 +2765,29 @@ wRoute18CurScript:: ; d627 ds 1 wRoute20CurScript:: ; d628 ds 1 -wSSAnne10CurScript:: ; d629 +wSSAnneB1FRoomsCurScript:: ; d629 ds 1 wVermilionCityCurScript:: ; d62a ds 1 -wPokemonTower2CurScript:: ; d62b +wPokemonTower2FCurScript:: ; d62b ds 1 -wPokemonTower3CurScript:: ; d62c +wPokemonTower3FCurScript:: ; d62c ds 1 -wPokemonTower4CurScript:: ; d62d +wPokemonTower4FCurScript:: ; d62d ds 1 -wPokemonTower5CurScript:: ; d62e +wPokemonTower5FCurScript:: ; d62e ds 1 -wPokemonTower6CurScript:: ; d62f +wPokemonTower6FCurScript:: ; d62f ds 1 -wPokemonTower7CurScript:: ; d630 +wPokemonTower7FCurScript:: ; d630 ds 1 -wRocketHideout1CurScript:: ; d631 +wRocketHideoutB1FCurScript:: ; d631 ds 1 -wRocketHideout2CurScript:: ; d632 +wRocketHideoutB2FCurScript:: ; d632 ds 1 -wRocketHideout3CurScript:: ; d633 +wRocketHideoutB3FCurScript:: ; d633 ds 1 -wRocketHideout4CurScript:: ; d634 +wRocketHideoutB4FCurScript:: ; d634 ds 2 wRoute6GateCurScript:: ; d636 ds 1 @@ -2798,57 +2795,57 @@ wRoute8GateCurScript:: ; d637 ds 2 wCinnabarIslandCurScript:: ; d639 ds 1 -wMansion1CurScript:: ; d63a +wPokemonMansion1FCurScript:: ; d63a ds 2 -wMansion2CurScript:: ; d63c +wPokemonMansion2FCurScript:: ; d63c ds 1 -wMansion3CurScript:: ; d63d +wPokemonMansion3FCurScript:: ; d63d ds 1 -wMansion4CurScript:: ; d63e +wPokemonMansionB1FCurScript:: ; d63e ds 1 -wVictoryRoad2CurScript:: ; d63f +wVictoryRoad2FCurScript:: ; d63f ds 1 -wVictoryRoad3CurScript:: ; d640 +wVictoryRoad3FCurScript:: ; d640 ds 2 wFightingDojoCurScript:: ; d642 ds 1 -wSilphCo2CurScript:: ; d643 +wSilphCo2FCurScript:: ; d643 ds 1 -wSilphCo3CurScript:: ; d644 +wSilphCo3FCurScript:: ; d644 ds 1 -wSilphCo4CurScript:: ; d645 +wSilphCo4FCurScript:: ; d645 ds 1 -wSilphCo5CurScript:: ; d646 +wSilphCo5FCurScript:: ; d646 ds 1 -wSilphCo6CurScript:: ; d647 +wSilphCo6FCurScript:: ; d647 ds 1 -wSilphCo7CurScript:: ; d648 +wSilphCo7FCurScript:: ; d648 ds 1 -wSilphCo8CurScript:: ; d649 +wSilphCo8FCurScript:: ; d649 ds 1 -wSilphCo9CurScript:: ; d64a +wSilphCo9FCurScript:: ; d64a ds 1 -wHallOfFameRoomCurScript:: ; d64b +wHallOfFameCurScript:: ; d64b ds 1 -wGaryCurScript:: ; d64c +wChampionsRoomCurScript:: ; d64c ds 1 -wLoreleiCurScript:: ; d64d +wLoreleisRoomCurScript:: ; d64d ds 1 -wBrunoCurScript:: ; d64e +wBrunosRoomCurScript:: ; d64e ds 1 -wAgathaCurScript:: ; d64f +wAgathasRoomCurScript:: ; d64f ds 1 -wUnknownDungeon3CurScript:: ; d650 +wCeruleanCaveB1FCurScript:: ; d650 ds 1 -wVictoryRoad1CurScript:: ; d651 +wVictoryRoad1FCurScript:: ; d651 ds 1 ds 1 -wLanceCurScript:: ; d653 +wLancesRoomCurScript:: ; d653 ds 1 ds 4 -wSilphCo10CurScript:: ; d658 +wSilphCo10FCurScript:: ; d658 ds 1 -wSilphCo11CurScript:: ; d659 +wSilphCo11FCurScript:: ; d659 ds 1 ds 1 wFuchsiaGymCurScript:: ; d65b @@ -2858,30 +2855,28 @@ wSaffronGymCurScript:: ; d65c ds 1 wCinnabarGymCurScript:: ; d65e ds 1 -wCeladonGameCornerCurScript:: ; d65f +wGameCornerCurScript:: ; d65f ds 1 -wRoute16GateCurScript:: ; d660 +wRoute16Gate1FCurScript:: ; d660 ds 1 wBillsHouseCurScript:: ; d661 ds 1 wRoute5GateCurScript:: ; d662 ds 1 wPowerPlantCurScript:: ; d663 -; overload - ds 0 wRoute7GateCurScript:: ; d663 ; overload ds 1 ds 1 -wSSAnne2CurScript:: ; d665 +wSSAnne2FCurScript:: ; d665 ds 1 -wSeafoamIslands4CurScript:: ; d666 +wSeafoamIslandsB3FCurScript:: ; d666 ds 1 wRoute23CurScript:: ; d667 ds 1 -wSeafoamIslands5CurScript:: ; d668 +wSeafoamIslandsB4FCurScript:: ; d668 ds 1 -wRoute18GateCurScript:: ; d669 +wRoute18Gate1FCurScript:: ; d669 ds 1 ds 78