diff options
| -rw-r--r-- | data/puzzle_names.asm (renamed from data/level_names.asm) | 968 | ||||
| -rw-r--r-- | shim.sym | 2 | ||||
| -rw-r--r-- | source/bank_00.asm | 22 | ||||
| -rw-r--r-- | source/bank_01.asm | 2 |
4 files changed, 497 insertions, 497 deletions
diff --git a/data/level_names.asm b/data/puzzle_names.asm index ec7bd51..b0ffc65 100644 --- a/data/level_names.asm +++ b/data/puzzle_names.asm @@ -1,1684 +1,1684 @@ INCLUDE "text.inc" -SECTION "level_names", ROMX[$4000], BANK[$09] - -level_names:: - dw level_name_pokedex - dw level_name_town_map - dw level_name_slot_machine - dw level_name_rare_candy - dw level_name_pc - dw level_name_repel - dw level_name_silph_scope - dw level_name_poke_doll - dw level_name_gold_teeth - dw level_name_jigglypuffs_microphone - dw level_name_super_rod - dw level_name_poke_flute - dw level_name_balloons - dw level_name_bicycle - dw level_name_hat - dw level_name_diglett - dw level_name_gastly - dw level_name_omanyte - dw level_name_muk - dw level_name_kabuto - dw level_name_rattata - dw level_name_jigglypuff - dw level_name_mankey - dw level_name_slowpoke - dw level_name_poliwag - dw level_name_parasect - dw level_name_venonat - dw level_name_poliwhirl - dw level_name_dragonair - dw level_name_charizard - dw level_name_chansey - dw level_name_porygon - dw level_name_gengar - dw level_name_ditto - dw level_name_bellsprout - dw level_name_haunter - dw level_name_koffing - dw level_name_pinsir - dw level_name_horsea - dw level_name_nidoran_f - dw level_name_dratini - dw level_name_weepinbell - dw level_name_staryu - dw level_name_dugtrio - dw level_name_venusaur - dw level_name_drowzee - dw level_name_seadra - dw level_name_nidoran_m - dw level_name_wigglytuff - dw level_name_magmar - dw level_name_ivysaur - dw level_name_kakuna - dw level_name_clefairy - dw level_name_spearow - dw level_name_starmie - dw level_name_zubat - dw level_name_voltorb - dw level_name_cloyster - dw level_name_exeggutor - dw level_name_magikarp - dw level_name_seel - dw level_name_shellder - dw level_name_meowth - dw level_name_fearow - dw level_name_weedle - dw level_name_magnemite - dw level_name_scyther - dw level_name_vulpix - dw level_name_metapod - dw level_name_venomoth - dw level_name_electabuzz - dw level_name_tangela - dw level_name_goldeen - dw level_name_nidoqueen - dw level_name_gyarados - dw level_name_persian - dw level_name_dodrio - dw level_name_jolteon - dw level_name_golduck - dw level_name_mr_mime - dw level_name_butterfree - dw level_name_graveler - dw level_name_raticate - dw level_name_alakazam - dw level_name_kangaskhan - dw level_name_gloom - dw level_name_ponyta - dw level_name_nidorino - dw level_name_nidoking - dw level_name_blastoise - dw level_name_primeape - dw level_name_machoke - dw level_name_rapidash - dw level_name_grimer - dw level_name_onix - dw level_name_machamp - dw level_name_vileplume - dw level_name_paras - dw level_name_lapras - dw level_name_bulbasaur - dw level_name_machop - dw level_name_magneton - dw level_name_seaking - dw level_name_squirtle - dw level_name_dragonite - dw level_name_omastar - dw level_name_growlithe - dw level_name_vaporeon - dw level_name_farfetchd - dw level_name_beedrill - dw level_name_golem - dw level_name_flareon - dw level_name_charmander - dw level_name_krabby - dw level_name_cubone - dw level_name_arbok - dw level_name_rhyhorn - dw level_name_ninetales - dw level_name_abra - dw level_name_mewtwo - dw level_name_rhydon - dw level_name_raichu - dw level_name_tauros - dw level_name_hitmonlee - dw level_name_clefable - dw level_name_lickitung - dw level_name_eevee - dw level_name_pikachu - dw level_name_caterpie - dw level_name_nidorina - dw level_name_marowak - dw level_name_arcanine - dw level_name_kadabra - dw level_name_victreebel - dw level_name_moltres - dw level_name_doduo - dw level_name_jynx - dw level_name_golbat - dw level_name_sandslash - dw level_name_tentacruel - dw level_name_pidgeot - dw level_name_dewgong - dw level_name_kingler - dw level_name_snorlax - dw level_name_exeggcute - dw level_name_weezing - dw level_name_electrode - dw level_name_aerodactyl - dw level_name_wartortle - dw level_name_articuno - dw level_name_hitmonchan - dw level_name_slowbro - dw level_name_pidgeotto - dw level_name_hypno - dw level_name_kaputops - dw level_name_sandshrew - dw level_name_ekans - dw level_name_poliwrath - dw level_name_charmeleon - dw level_name_psyduck - dw level_name_oddish - dw level_name_tentacool - dw level_name_pidgey - dw level_name_geodude - dw level_name_zapdos - dw level_name_mew - dw level_name_togepi - dw level_name_safari_haunter - dw level_name_mew_and_mewtwo - dw level_name_staring_contest - dw level_name_lapras_and_pikachu - dw level_name_surfing_pikachu - dw level_name_starmie_and_staryu - dw level_name_seel_show - dw level_name_balancing_pikachu - dw level_name_blocks_and_porygon - dw level_name_carp_streamer - dw level_name_crab_and_riceball - dw level_name_safari_magnemite - dw level_name_transforming_ditto - dw level_name_firefighter_squirtle - dw level_name_pidgeot_parent - dw level_name_juggling_mr_mime - dw level_name_charmander_and_squirtle - dw level_name_heracross_and_metapod - dw level_name_napping - dw level_name_regular_psyduck - dw level_name_happy_moment - dw level_name_eating_together - dw level_name_clefairy_and_clefable - dw level_name_drawing_pikachu - dw level_name_rainfall - dw level_name_arm_wrestling - dw level_name_horsea_and_shellder - dw level_name_double_slap - dw level_name_singing_jigglypuff - dw level_name_memorial_photo - dw level_name_match - dw level_name_sea_bathing - dw level_name_safari_butterfree - dw level_name_thunder_shock - dw level_name_eating_contest - dw level_name_playing_in_snow - dw level_name_fossil_pokemon - dw level_name_whack_a_mole - dw level_name_legendary_pokemon - dw level_name_exeggcute_and_togepi - dw level_name_cubone_and_butterfree - dw level_name_race - dw level_name_slowbro_and_psyduck - dw level_name_slowpoke_and_slowbro - dw level_name_monkey_and_crab - dw level_name_three_pokemon - dw level_name_safari_gloom - dw level_name_team_rocket - dw level_name_pikachu_and_togepi - dw level_name_hidden_village - dw level_name_snowman - dw level_name_pikachu_forest - dw level_name_pokeball - dw level_name_safari_pikachu - dw level_name_old_amber - dw level_name_missingno_de - dw level_name_missingno_df - dw level_name_missingno_e0 - dw level_name_missingno_e1 - dw level_name_missingno_e2 - dw level_name_missingno_e3 - dw level_name_missingno_e4 - dw level_name_missingno_e5 - dw level_name_missingno_e6 - dw level_name_missingno_e7 - dw level_name_missingno_e8 - dw level_name_missingno_e9 - dw level_name_missingno_ea - dw level_name_missingno_eb - dw level_name_missingno_ec - dw level_name_missingno_ed - dw level_name_missingno_ee - dw level_name_missingno_ef - -level_name_pokedex: +SECTION "puzzle_names", ROMX[$4000], BANK[$09] + +puzzle_names:: + dw puzzle_name_pokedex + dw puzzle_name_town_map + dw puzzle_name_slot_machine + dw puzzle_name_rare_candy + dw puzzle_name_pc + dw puzzle_name_repel + dw puzzle_name_silph_scope + dw puzzle_name_poke_doll + dw puzzle_name_gold_teeth + dw puzzle_name_jigglypuffs_microphone + dw puzzle_name_super_rod + dw puzzle_name_poke_flute + dw puzzle_name_balloons + dw puzzle_name_bicycle + dw puzzle_name_hat + dw puzzle_name_diglett + dw puzzle_name_gastly + dw puzzle_name_omanyte + dw puzzle_name_muk + dw puzzle_name_kabuto + dw puzzle_name_rattata + dw puzzle_name_jigglypuff + dw puzzle_name_mankey + dw puzzle_name_slowpoke + dw puzzle_name_poliwag + dw puzzle_name_parasect + dw puzzle_name_venonat + dw puzzle_name_poliwhirl + dw puzzle_name_dragonair + dw puzzle_name_charizard + dw puzzle_name_chansey + dw puzzle_name_porygon + dw puzzle_name_gengar + dw puzzle_name_ditto + dw puzzle_name_bellsprout + dw puzzle_name_haunter + dw puzzle_name_koffing + dw puzzle_name_pinsir + dw puzzle_name_horsea + dw puzzle_name_nidoran_f + dw puzzle_name_dratini + dw puzzle_name_weepinbell + dw puzzle_name_staryu + dw puzzle_name_dugtrio + dw puzzle_name_venusaur + dw puzzle_name_drowzee + dw puzzle_name_seadra + dw puzzle_name_nidoran_m + dw puzzle_name_wigglytuff + dw puzzle_name_magmar + dw puzzle_name_ivysaur + dw puzzle_name_kakuna + dw puzzle_name_clefairy + dw puzzle_name_spearow + dw puzzle_name_starmie + dw puzzle_name_zubat + dw puzzle_name_voltorb + dw puzzle_name_cloyster + dw puzzle_name_exeggutor + dw puzzle_name_magikarp + dw puzzle_name_seel + dw puzzle_name_shellder + dw puzzle_name_meowth + dw puzzle_name_fearow + dw puzzle_name_weedle + dw puzzle_name_magnemite + dw puzzle_name_scyther + dw puzzle_name_vulpix + dw puzzle_name_metapod + dw puzzle_name_venomoth + dw puzzle_name_electabuzz + dw puzzle_name_tangela + dw puzzle_name_goldeen + dw puzzle_name_nidoqueen + dw puzzle_name_gyarados + dw puzzle_name_persian + dw puzzle_name_dodrio + dw puzzle_name_jolteon + dw puzzle_name_golduck + dw puzzle_name_mr_mime + dw puzzle_name_butterfree + dw puzzle_name_graveler + dw puzzle_name_raticate + dw puzzle_name_alakazam + dw puzzle_name_kangaskhan + dw puzzle_name_gloom + dw puzzle_name_ponyta + dw puzzle_name_nidorino + dw puzzle_name_nidoking + dw puzzle_name_blastoise + dw puzzle_name_primeape + dw puzzle_name_machoke + dw puzzle_name_rapidash + dw puzzle_name_grimer + dw puzzle_name_onix + dw puzzle_name_machamp + dw puzzle_name_vileplume + dw puzzle_name_paras + dw puzzle_name_lapras + dw puzzle_name_bulbasaur + dw puzzle_name_machop + dw puzzle_name_magneton + dw puzzle_name_seaking + dw puzzle_name_squirtle + dw puzzle_name_dragonite + dw puzzle_name_omastar + dw puzzle_name_growlithe + dw puzzle_name_vaporeon + dw puzzle_name_farfetchd + dw puzzle_name_beedrill + dw puzzle_name_golem + dw puzzle_name_flareon + dw puzzle_name_charmander + dw puzzle_name_krabby + dw puzzle_name_cubone + dw puzzle_name_arbok + dw puzzle_name_rhyhorn + dw puzzle_name_ninetales + dw puzzle_name_abra + dw puzzle_name_mewtwo + dw puzzle_name_rhydon + dw puzzle_name_raichu + dw puzzle_name_tauros + dw puzzle_name_hitmonlee + dw puzzle_name_clefable + dw puzzle_name_lickitung + dw puzzle_name_eevee + dw puzzle_name_pikachu + dw puzzle_name_caterpie + dw puzzle_name_nidorina + dw puzzle_name_marowak + dw puzzle_name_arcanine + dw puzzle_name_kadabra + dw puzzle_name_victreebel + dw puzzle_name_moltres + dw puzzle_name_doduo + dw puzzle_name_jynx + dw puzzle_name_golbat + dw puzzle_name_sandslash + dw puzzle_name_tentacruel + dw puzzle_name_pidgeot + dw puzzle_name_dewgong + dw puzzle_name_kingler + dw puzzle_name_snorlax + dw puzzle_name_exeggcute + dw puzzle_name_weezing + dw puzzle_name_electrode + dw puzzle_name_aerodactyl + dw puzzle_name_wartortle + dw puzzle_name_articuno + dw puzzle_name_hitmonchan + dw puzzle_name_slowbro + dw puzzle_name_pidgeotto + dw puzzle_name_hypno + dw puzzle_name_kaputops + dw puzzle_name_sandshrew + dw puzzle_name_ekans + dw puzzle_name_poliwrath + dw puzzle_name_charmeleon + dw puzzle_name_psyduck + dw puzzle_name_oddish + dw puzzle_name_tentacool + dw puzzle_name_pidgey + dw puzzle_name_geodude + dw puzzle_name_zapdos + dw puzzle_name_mew + dw puzzle_name_togepi + dw puzzle_name_safari_haunter + dw puzzle_name_mew_and_mewtwo + dw puzzle_name_staring_contest + dw puzzle_name_lapras_and_pikachu + dw puzzle_name_surfing_pikachu + dw puzzle_name_starmie_and_staryu + dw puzzle_name_seel_show + dw puzzle_name_balancing_pikachu + dw puzzle_name_blocks_and_porygon + dw puzzle_name_carp_streamer + dw puzzle_name_crab_and_riceball + dw puzzle_name_safari_magnemite + dw puzzle_name_transforming_ditto + dw puzzle_name_firefighter_squirtle + dw puzzle_name_pidgeot_parent + dw puzzle_name_juggling_mr_mime + dw puzzle_name_charmander_and_squirtle + dw puzzle_name_heracross_and_metapod + dw puzzle_name_napping + dw puzzle_name_regular_psyduck + dw puzzle_name_happy_moment + dw puzzle_name_eating_together + dw puzzle_name_clefairy_and_clefable + dw puzzle_name_drawing_pikachu + dw puzzle_name_rainfall + dw puzzle_name_arm_wrestling + dw puzzle_name_horsea_and_shellder + dw puzzle_name_double_slap + dw puzzle_name_singing_jigglypuff + dw puzzle_name_memorial_photo + dw puzzle_name_match + dw puzzle_name_sea_bathing + dw puzzle_name_safari_butterfree + dw puzzle_name_thunder_shock + dw puzzle_name_eating_contest + dw puzzle_name_playing_in_snow + dw puzzle_name_fossil_pokemon + dw puzzle_name_whack_a_mole + dw puzzle_name_legendary_pokemon + dw puzzle_name_exeggcute_and_togepi + dw puzzle_name_cubone_and_butterfree + dw puzzle_name_race + dw puzzle_name_slowbro_and_psyduck + dw puzzle_name_slowpoke_and_slowbro + dw puzzle_name_monkey_and_crab + dw puzzle_name_three_pokemon + dw puzzle_name_safari_gloom + dw puzzle_name_team_rocket + dw puzzle_name_pikachu_and_togepi + dw puzzle_name_hidden_village + dw puzzle_name_snowman + dw puzzle_name_pikachu_forest + dw puzzle_name_pokeball + dw puzzle_name_safari_pikachu + dw puzzle_name_old_amber + dw puzzle_name_missingno_de + dw puzzle_name_missingno_df + dw puzzle_name_missingno_e0 + dw puzzle_name_missingno_e1 + dw puzzle_name_missingno_e2 + dw puzzle_name_missingno_e3 + dw puzzle_name_missingno_e4 + dw puzzle_name_missingno_e5 + dw puzzle_name_missingno_e6 + dw puzzle_name_missingno_e7 + dw puzzle_name_missingno_e8 + dw puzzle_name_missingno_e9 + dw puzzle_name_missingno_ea + dw puzzle_name_missingno_eb + dw puzzle_name_missingno_ec + dw puzzle_name_missingno_ed + dw puzzle_name_missingno_ee + dw puzzle_name_missingno_ef + +puzzle_name_pokedex: dw 99 text "ポケモンずかん" done db 0 -level_name_town_map: +puzzle_name_town_map: dw 105 text "タウンマップ" done db 0 -level_name_slot_machine: +puzzle_name_slot_machine: dw 99 text "スロットマシーン" done db 0 -level_name_rare_candy: +puzzle_name_rare_candy: dw 104 text "ふしぎなあめ" done db 0 -level_name_pc: +puzzle_name_pc: dw 111 text "パソコン" done db 0 -level_name_repel: +puzzle_name_repel: dw 98 text "むしよけスプレー" done db 0 -level_name_silph_scope: +puzzle_name_silph_scope: dw 101 text "シルフスコープ" done db 0 -level_name_poke_doll: +puzzle_name_poke_doll: dw 98 text "ピッピにんぎょう" done db 0 -level_name_gold_teeth: +puzzle_name_gold_teeth: dw 103 text "きんのいれば" done db 0 -level_name_jigglypuffs_microphone: +puzzle_name_jigglypuffs_microphone: dw 100 text "プリンのマイク" done db 0 -level_name_super_rod: +puzzle_name_super_rod: dw 99 text "すごいつりざお" done db 0 -level_name_poke_flute: +puzzle_name_poke_flute: dw 100 text "ポケモンのふえ" done db 0 -level_name_balloons: +puzzle_name_balloons: dw 112 text "ふうせん" done db 0 -level_name_bicycle: +puzzle_name_bicycle: dw 110 text "じてんしゃ" done db 0 -level_name_hat: +puzzle_name_hat: dw 116 text "ぼうし" done db 0 -level_name_diglett: +puzzle_name_diglett: dw 111 text "ディグダ" done db 0 -level_name_gastly: +puzzle_name_gastly: dw 116 text "ゴース" done db 0 -level_name_omanyte: +puzzle_name_omanyte: dw 109 text "オムナイト" done db 0 -level_name_muk: +puzzle_name_muk: dw 109 text "ベトベトン" done db 0 -level_name_kabuto: +puzzle_name_kabuto: dw 116 text "カブト" done db 0 -level_name_rattata: +puzzle_name_rattata: dw 113 text "コラッタ" done db 0 -level_name_jigglypuff: +puzzle_name_jigglypuff: dw 116 text "プリン" done db 0 -level_name_mankey: +puzzle_name_mankey: dw 113 text "マンキー" done db 0 -level_name_slowpoke: +puzzle_name_slowpoke: dw 117 text "ヤドン" done db 0 -level_name_poliwag: +puzzle_name_poliwag: dw 114 text "ニョロモ" done db 0 -level_name_parasect: +puzzle_name_parasect: dw 108 text "パラセクト" done db 0 -level_name_venonat: +puzzle_name_venonat: dw 111 text "コンパン" done db 0 -level_name_poliwhirl: +puzzle_name_poliwhirl: dw 113 text "ニョロゾ" done db 0 -level_name_dragonair: +puzzle_name_dragonair: dw 111 text "ハクリュー" done db 0 -level_name_charizard: +puzzle_name_charizard: dw 110 text "リザードン" done db 0 -level_name_chansey: +puzzle_name_chansey: dw 114 text "ラッキー" done db 0 -level_name_porygon: +puzzle_name_porygon: dw 111 text "ポリゴン" done db 0 -level_name_gengar: +puzzle_name_gengar: dw 111 text "ゲンガー" done db 0 -level_name_ditto: +puzzle_name_ditto: dw 112 text "メタモン" done db 0 -level_name_bellsprout: +puzzle_name_bellsprout: dw 107 text "マダツボミ" done db 0 -level_name_haunter: +puzzle_name_haunter: dw 113 text "ゴースト" done db 0 -level_name_koffing: +puzzle_name_koffing: dw 113 text "ドガース" done db 0 -level_name_pinsir: +puzzle_name_pinsir: dw 112 text "カイロス" done db 0 -level_name_horsea: +puzzle_name_horsea: dw 114 text "タッツー" done db 0 -level_name_nidoran_f: +puzzle_name_nidoran_f: dw 110 text "ニドラン♀" done db 0 -level_name_dratini: +puzzle_name_dratini: dw 110 text "ミニリュウ" done db 0 -level_name_weepinbell: +puzzle_name_weepinbell: dw 113 text "ウツドン" done db 0 -level_name_staryu: +puzzle_name_staryu: dw 108 text "ヒトデマン" done db 0 -level_name_dugtrio: +puzzle_name_dugtrio: dw 108 text "ダグトリオ" done db 0 -level_name_venusaur: +puzzle_name_venusaur: dw 107 text "フシギバナ" done db 0 -level_name_drowzee: +puzzle_name_drowzee: dw 113 text "スリープ" done db 0 -level_name_seadra: +puzzle_name_seadra: dw 114 text "シードラ" done db 0 -level_name_nidoran_m: +puzzle_name_nidoran_m: dw 108 text "ニドラン♂" done db 0 -level_name_wigglytuff: +puzzle_name_wigglytuff: dw 112 text "プクリン" done db 0 -level_name_magmar: +puzzle_name_magmar: dw 113 text "ブーバー" done db 0 -level_name_ivysaur: +puzzle_name_ivysaur: dw 108 text "フシギソウ" done db 0 -level_name_kakuna: +puzzle_name_kakuna: dw 113 text "コクーン" done db 0 -level_name_clefairy: +puzzle_name_clefairy: dw 117 text "ピッピ" done db 0 -level_name_spearow: +puzzle_name_spearow: dw 107 text "オニスズメ" done db 0 -level_name_starmie: +puzzle_name_starmie: dw 111 text "スターミー" done db 0 -level_name_zubat: +puzzle_name_zubat: dw 113 text "ズバット" done db 0 -level_name_voltorb: +puzzle_name_voltorb: dw 108 text "ビリリダマ" done db 0 -level_name_cloyster: +puzzle_name_cloyster: dw 108 text "パルシェン" done db 0 -level_name_exeggutor: +puzzle_name_exeggutor: dw 114 text "ナッシー" done db 0 -level_name_magikarp: +puzzle_name_magikarp: dw 107 text "コイキング" done db 0 -level_name_seel: +puzzle_name_seel: dw 111 text "パウワウ" done db 0 -level_name_shellder: +puzzle_name_shellder: dw 109 text "シェルダー" done db 0 -level_name_meowth: +puzzle_name_meowth: dw 114 text "ニャース" done db 0 -level_name_fearow: +puzzle_name_fearow: dw 109 text "オニドリル" done db 0 -level_name_weedle: +puzzle_name_weedle: dw 113 text "ビードル" done db 0 -level_name_magnemite: +puzzle_name_magnemite: dw 116 text "コイル" done db 0 -level_name_scyther: +puzzle_name_scyther: dw 109 text "ストライク" done db 0 -level_name_vulpix: +puzzle_name_vulpix: dw 116 text "ロコン" done db 0 -level_name_metapod: +puzzle_name_metapod: dw 109 text "トランセル" done db 0 -level_name_venomoth: +puzzle_name_venomoth: dw 109 text "モルフォン" done db 0 -level_name_electabuzz: +puzzle_name_electabuzz: dw 113 text "エレブー" done db 0 -level_name_tangela: +puzzle_name_tangela: dw 109 text "モンジャラ" done db 0 -level_name_goldeen: +puzzle_name_goldeen: dw 110 text "トサキント" done db 0 -level_name_nidoqueen: +puzzle_name_nidoqueen: dw 109 text "ニドクイン" done db 0 -level_name_gyarados: +puzzle_name_gyarados: dw 109 text "ギャラドス" done db 0 -level_name_persian: +puzzle_name_persian: dw 108 text "ペルシアン" done db 0 -level_name_dodrio: +puzzle_name_dodrio: dw 111 text "ドードリオ" done db 0 -level_name_jolteon: +puzzle_name_jolteon: dw 108 text "サンダース" done db 0 -level_name_golduck: +puzzle_name_golduck: dw 107 text "ゴルダック" done db 0 -level_name_mr_mime: +puzzle_name_mr_mime: dw 110 text "バリヤード" done db 0 -level_name_butterfree: +puzzle_name_butterfree: dw 109 text "バタフリー" done db 0 -level_name_graveler: +puzzle_name_graveler: dw 112 text "ゴローン" done db 0 -level_name_raticate: +puzzle_name_raticate: dw 117 text "ラッタ" done db 0 -level_name_alakazam: +puzzle_name_alakazam: dw 110 text "フーディン" done db 0 -level_name_kangaskhan: +puzzle_name_kangaskhan: dw 112 text "ガルーラ" done db 0 -level_name_gloom: +puzzle_name_gloom: dw 108 text "クサイハナ" done db 0 -level_name_ponyta: +puzzle_name_ponyta: dw 113 text "ポニータ" done db 0 -level_name_nidorino: +puzzle_name_nidorino: dw 111 text "ニドリーノ" done db 0 -level_name_nidoking: +puzzle_name_nidoking: dw 108 text "ニドキング" done db 0 -level_name_blastoise: +puzzle_name_blastoise: dw 109 text "カメックス" done db 0 -level_name_primeape: +puzzle_name_primeape: dw 108 text "オコリザル" done db 0 -level_name_machoke: +puzzle_name_machoke: dw 110 text "ゴーリキー" done db 0 -level_name_rapidash: +puzzle_name_rapidash: dw 109 text "ギャロップ" done db 0 -level_name_grimer: +puzzle_name_grimer: dw 109 text "ベトベター" done db 0 -level_name_onix: +puzzle_name_onix: dw 113 text "イワーク" done db 0 -level_name_machamp: +puzzle_name_machamp: dw 110 text "カイリキー" done db 0 -level_name_vileplume: +puzzle_name_vileplume: dw 109 text "ラフレシア" done db 0 -level_name_paras: +puzzle_name_paras: dw 115 text "パラス" done db 0 -level_name_lapras: +puzzle_name_lapras: dw 112 text "ラプラス" done db 0 -level_name_bulbasaur: +puzzle_name_bulbasaur: dw 107 text "フシギダネ" done db 0 -level_name_machop: +puzzle_name_machop: dw 110 text "ワンリキー" done db 0 -level_name_magneton: +puzzle_name_magneton: dw 109 text "レアコイル" done db 0 -level_name_seaking: +puzzle_name_seaking: dw 107 text "アズマオウ" done db 0 -level_name_squirtle: +puzzle_name_squirtle: dw 110 text "ゼニガメ" done db 0 -level_name_dragonite: +puzzle_name_dragonite: dw 111 text "カイリュー" done db 0 -level_name_omastar: +puzzle_name_omastar: dw 109 text "オムスター" done db 0 -level_name_growlithe: +puzzle_name_growlithe: dw 113 text "ガーディ" done db 0 -level_name_vaporeon: +puzzle_name_vaporeon: dw 109 text "シャワーズ" done db 0 -level_name_farfetchd: +puzzle_name_farfetchd: dw 112 text "カモネギ" done db 0 -level_name_beedrill: +puzzle_name_beedrill: dw 113 text "スピアー" done db 0 -level_name_golem: +puzzle_name_golem: dw 109 text "ゴローニャ" done db 0 -level_name_flareon: +puzzle_name_flareon: dw 109 text "ブースター" done db 0 -level_name_charmander: +puzzle_name_charmander: dw 112 text "ヒトカゲ" done db 0 -level_name_krabby: +puzzle_name_krabby: dw 115 text "クラブ" done db 0 -level_name_cubone: +puzzle_name_cubone: dw 112 text "カラカラ" done db 0 -level_name_arbok: +puzzle_name_arbok: dw 110 text "アーボック" done db 0 -level_name_rhyhorn: +puzzle_name_rhyhorn: dw 109 text "サイホーン" done db 0 -level_name_ninetales: +puzzle_name_ninetales: dw 109 text "キュウコン" done db 0 -level_name_abra: +puzzle_name_abra: dw 115 text "ケーシィ" done db 0 -level_name_mewtwo: +puzzle_name_mewtwo: dw 111 text "ミュウツー" done db 0 -level_name_rhydon: +puzzle_name_rhydon: dw 113 text "サイドン" done db 0 -level_name_raichu: +puzzle_name_raichu: dw 109 text "ライチュウ" done db 0 -level_name_tauros: +puzzle_name_tauros: dw 108 text "ケンタロス" done db 0 -level_name_hitmonlee: +puzzle_name_hitmonlee: dw 109 text "サワムラー" done db 0 -level_name_clefable: +puzzle_name_clefable: dw 113 text "ピクシー" done db 0 -level_name_lickitung: +puzzle_name_lickitung: dw 107 text "ベロリンガ" done db 0 -level_name_eevee: +puzzle_name_eevee: dw 112 text "イーブイ" done db 0 -level_name_pikachu: +puzzle_name_pikachu: dw 109 text "ピカチュウ" done db 0 -level_name_caterpie: +puzzle_name_caterpie: dw 110 text "キャタピー" done db 0 -level_name_nidorina: +puzzle_name_nidorina: dw 110 text "ニドリーナ" done db 0 -level_name_marowak: +puzzle_name_marowak: dw 110 text "ガラガラ" done db 0 -level_name_arcanine: +puzzle_name_arcanine: dw 109 text "ウインディ" done db 0 -level_name_kadabra: +puzzle_name_kadabra: dw 108 text "ユンゲラー" done db 0 -level_name_victreebel: +puzzle_name_victreebel: dw 110 text "ウツボット" done db 0 -level_name_moltres: +puzzle_name_moltres: dw 110 text "ファイヤー" done db 0 -level_name_doduo: +puzzle_name_doduo: dw 115 text "ドードー" done db 0 -level_name_jynx: +puzzle_name_jynx: dw 110 text "ルージュラ" done db 0 -level_name_golbat: +puzzle_name_golbat: dw 109 text "ゴルバット" done db 0 -level_name_sandslash: +puzzle_name_sandslash: dw 108 text "サンドパン" done db 0 -level_name_tentacruel: +puzzle_name_tentacruel: dw 108 text "ドククラゲ" done db 0 -level_name_pidgeot: +puzzle_name_pidgeot: dw 111 text "ピジョット" done db 0 -level_name_dewgong: +puzzle_name_dewgong: dw 112 text "ジュゴン" done db 0 -level_name_kingler: +puzzle_name_kingler: dw 108 text "キングラー" done db 0 -level_name_snorlax: +puzzle_name_snorlax: dw 111 text "カビゴン" done db 0 -level_name_exeggcute: +puzzle_name_exeggcute: dw 112 text "タマタマ" done db 0 -level_name_weezing: +puzzle_name_weezing: dw 108 text "マタドガス" done db 0 -level_name_electrode: +puzzle_name_electrode: dw 108 text "マルマイン" done db 0 -level_name_aerodactyl: +puzzle_name_aerodactyl: dw 116 text "プテラ" done db 0 -level_name_wartortle: +puzzle_name_wartortle: dw 113 text "カメール" done db 0 -level_name_articuno: +puzzle_name_articuno: dw 110 text "フリーザー" done db 0 -level_name_hitmonchan: +puzzle_name_hitmonchan: dw 109 text "エビワラー" done db 0 -level_name_slowbro: +puzzle_name_slowbro: dw 113 text "ヤドラン" done db 0 -level_name_pidgeotto: +puzzle_name_pidgeotto: dw 113 text "ピジョン" done db 0 -level_name_hypno: +puzzle_name_hypno: dw 110 text "スリーパー" done db 0 -level_name_kaputops: +puzzle_name_kaputops: dw 108 text "カブトプス" done db 0 -level_name_sandshrew: +puzzle_name_sandshrew: dw 117 text "サンド" done db 0 -level_name_ekans: +puzzle_name_ekans: dw 117 text "アーボ" done db 0 -level_name_poliwrath: +puzzle_name_poliwrath: dw 109 text "ニョロボン" done db 0 -level_name_charmeleon: +puzzle_name_charmeleon: dw 114 text "リザード" done db 0 -level_name_psyduck: +puzzle_name_psyduck: dw 112 text "コダック" done db 0 -level_name_oddish: +puzzle_name_oddish: dw 108 text "ナゾノクサ" done db 0 -level_name_tentacool: +puzzle_name_tentacool: dw 108 text "メノクラゲ" done db 0 -level_name_pidgey: +puzzle_name_pidgey: dw 116 text "ポッポ" done db 0 -level_name_geodude: +puzzle_name_geodude: dw 107 text "イシツブテ" done db 0 -level_name_zapdos: +puzzle_name_zapdos: dw 112 text "サンダー" done db 0 -level_name_mew: +puzzle_name_mew: dw 118 text "ミュウ" done db 0 -level_name_togepi: +puzzle_name_togepi: dw 113 text "トゲピー" done db 0 -level_name_safari_haunter: +puzzle_name_safari_haunter: dw 113 text "ゴースト" done db 0 -level_name_mew_and_mewtwo: +puzzle_name_mew_and_mewtwo: dw 96 text "ミュウとミュウツー" done db 0 -level_name_staring_contest: +puzzle_name_staring_contest: dw 110 text "にらめっこ" done db 0 -level_name_lapras_and_pikachu: +puzzle_name_lapras_and_pikachu: dw 89 text "ラプラスとピカチュウ" done db 0 -level_name_surfing_pikachu: +puzzle_name_surfing_pikachu: dw 94 text "なみのりピカチュウ" done db 0 -level_name_starmie_and_staryu: +puzzle_name_starmie_and_staryu: dw 87 text "スターミーとヒトデマン" done db 0 -level_name_seel_show: +puzzle_name_seel_show: dw 102 text "パウワウショー" done db 0 -level_name_balancing_pikachu: +puzzle_name_balancing_pikachu: dw 94 text "たまのりピカチュウ" done db 0 -level_name_blocks_and_porygon: +puzzle_name_blocks_and_porygon: dw 95 text "つみきとポリゴン" done db 0 -level_name_carp_streamer: +puzzle_name_carp_streamer: dw 108 text "こいのぼり" done db 0 -level_name_crab_and_riceball: +puzzle_name_crab_and_riceball: dw 95 text "クラブとおにぎり" done db 0 -level_name_safari_magnemite: +puzzle_name_safari_magnemite: dw 116 text "コイル" done db 0 -level_name_transforming_ditto: +puzzle_name_transforming_ditto: dw 96 text "へんしんメタモン" done db 0 -level_name_firefighter_squirtle: +puzzle_name_firefighter_squirtle: dw 86 text "ひけしのゼニガメだん" done db 0 -level_name_pidgeot_parent: +puzzle_name_pidgeot_parent: dw 99 text "ピジョットおやこ" done db 0 -level_name_juggling_mr_mime: +puzzle_name_juggling_mr_mime: dw 94 text "おてだまバリヤード" done db 0 -level_name_charmander_and_squirtle: +puzzle_name_charmander_and_squirtle: dw 90 text "ヒトカゲとゼニガメ" done db 0 -level_name_heracross_and_metapod: +puzzle_name_heracross_and_metapod: dw 89 text "カイロスとトランセル" done db 0 -level_name_napping: +puzzle_name_napping: dw 113 text "おひるね" done db 0 -level_name_regular_psyduck: +puzzle_name_regular_psyduck: dw 96 text "いつものコダック" done db 0 -level_name_happy_moment: +puzzle_name_happy_moment: dw 93 text "しあわせのひととき" done db 0 -level_name_eating_together: +puzzle_name_eating_together: dw 95 text "いっしょにたべよう" done db 0 -level_name_clefairy_and_clefable: +puzzle_name_clefairy_and_clefable: dw 98 text "ピッピとピクシー" done db 0 -level_name_drawing_pikachu: +puzzle_name_drawing_pikachu: dw 93 text "おえかきピカチュウ" done db 0 -level_name_rainfall: +puzzle_name_rainfall: dw 113 text "あめふり" done db 0 -level_name_arm_wrestling: +puzzle_name_arm_wrestling: dw 107 text "うでずもう" done db 0 -level_name_horsea_and_shellder: +puzzle_name_horsea_and_shellder: dw 91 text "タッツーとシェルダー" done db 0 -level_name_double_slap: +puzzle_name_double_slap: dw 101 text "おうふくビンタ" done db 0 -level_name_singing_jigglypuff: +puzzle_name_singing_jigglypuff: dw 101 text "うたってプリン" done db 0 -level_name_memorial_photo: +puzzle_name_memorial_photo: dw 102 text "きねんしゃしん" done db 0 -level_name_match: +puzzle_name_match: dw 113 text "しょうぶ" done db 0 -level_name_sea_bathing: +puzzle_name_sea_bathing: dw 106 text "かいすいよく" done db 0 -level_name_safari_butterfree: +puzzle_name_safari_butterfree: dw 109 text "バタフリー" done db 0 -level_name_thunder_shock: +puzzle_name_thunder_shock: dw 102 text "でんきショック" done db 0 -level_name_eating_contest: +puzzle_name_eating_contest: dw 96 text "おおぐいたいけつ" done db 0 -level_name_playing_in_snow: +puzzle_name_playing_in_snow: dw 107 text "ゆきあそび" done db 0 -level_name_fossil_pokemon: +puzzle_name_fossil_pokemon: dw 100 text "かせきポケモン" done db 0 -level_name_whack_a_mole: +puzzle_name_whack_a_mole: dw 105 text "もぐらたたき" done db 0 -level_name_legendary_pokemon: +puzzle_name_legendary_pokemon: dw 95 text "でんせつポケモン" done db 0 -level_name_exeggcute_and_togepi: +puzzle_name_exeggcute_and_togepi: dw 93 text "タマタマとトゲピー" done db 0 -level_name_cubone_and_butterfree: +puzzle_name_cubone_and_butterfree: dw 89 text "カラカラとバタフリー" done db 0 -level_name_race: +puzzle_name_race: dw 110 text "きょうそう" done db 0 -level_name_slowbro_and_psyduck: +puzzle_name_slowbro_and_psyduck: dw 93 text "ヤドランとコダック" done db 0 -level_name_slowpoke_and_slowbro: +puzzle_name_slowpoke_and_slowbro: dw 97 text "ヤドンとヤドラン" done db 0 -level_name_monkey_and_crab: +puzzle_name_monkey_and_crab: dw 97 text "さるかにがっせん" done db 0 -level_name_three_pokemon: +puzzle_name_three_pokemon: dw 100 text "３だいポケモン" done db 0 -level_name_safari_gloom: +puzzle_name_safari_gloom: dw 98 text "くさいクサイハナ" done db 0 -level_name_team_rocket: +puzzle_name_team_rocket: dw 106 text "ロケットだん" done db 0 -level_name_pikachu_and_togepi: +puzzle_name_pikachu_and_togepi: dw 90 text "ピカチュウとトゲピー" done db 0 -level_name_hidden_village: +puzzle_name_hidden_village: dw 88 text "かくれざとのポケモン" done db 0 -level_name_snowman: +puzzle_name_snowman: dw 109 text "ゆきだるま" done db 0 -level_name_pikachu_forest: +puzzle_name_pikachu_forest: dw 98 text "ピカチュウのもり" done db 0 -level_name_pokeball: +puzzle_name_pokeball: dw 98 text "モンスターボール" done db 0 -level_name_safari_pikachu: +puzzle_name_safari_pikachu: dw 109 text "ピカチュウ" done db 0 -level_name_old_amber: +puzzle_name_old_amber: dw 100 text "ひみつのコハク" done db 0 -level_name_missingno_de: +puzzle_name_missingno_de: dw 111 text "けつばん" done db 0 -level_name_missingno_df: +puzzle_name_missingno_df: dw 111 text "けつばん" done db 0 -level_name_missingno_e0: +puzzle_name_missingno_e0: dw 111 text "けつばん" done db 0 -level_name_missingno_e1: +puzzle_name_missingno_e1: dw 111 text "けつばん" done db 0 -level_name_missingno_e2: +puzzle_name_missingno_e2: dw 111 text "けつばん" done db 0 -level_name_missingno_e3: +puzzle_name_missingno_e3: dw 111 text "けつばん" done db 0 -level_name_missingno_e4: +puzzle_name_missingno_e4: dw 111 text "けつばん" done db 0 -level_name_missingno_e5: +puzzle_name_missingno_e5: dw 111 text "けつばん" done db 0 -level_name_missingno_e6: +puzzle_name_missingno_e6: dw 111 text "けつばん" done db 0 -level_name_missingno_e7: +puzzle_name_missingno_e7: dw 111 text "けつばん" done db 0 -level_name_missingno_e8: +puzzle_name_missingno_e8: dw 111 text "けつばん" done db 0 -level_name_missingno_e9: +puzzle_name_missingno_e9: dw 111 text "けつばん" done db 0 -level_name_missingno_ea: +puzzle_name_missingno_ea: dw 111 text "けつばん" done db 0 -level_name_missingno_eb: +puzzle_name_missingno_eb: dw 111 text "けつばん" done db 0 -level_name_missingno_ec: +puzzle_name_missingno_ec: dw 111 text "けつばん" done db 0 -level_name_missingno_ed: +puzzle_name_missingno_ed: dw 111 text "けつばん" done db 0 -level_name_missingno_ee: +puzzle_name_missingno_ee: dw 111 text "けつばん" done db 0 -level_name_missingno_ef: +puzzle_name_missingno_ef: dw 111 text "けつばん" done @@ -207,7 +207,7 @@ 01:d568 w_d568 01:d60f w_d60f 01:d61b w_d61b -01:d625 w_level_index ; dw +01:d625 w_puzzle_index ; dw 01:d628 w_d628 ; ds 3 01:d62d w_d62d 01:d630 w_d630 diff --git a/source/bank_00.asm b/source/bank_00.asm index 6aca0ff..81b99a9 100644 --- a/source/bank_00.asm +++ b/source/bank_00.asm @@ -1759,9 +1759,9 @@ function_00_0c70:: push_bank_rom $09 ; BANK(???) ld hl, $4000 ; ??? - ld a, [w_level_index + 0] + ld a, [w_puzzle_index + 0] ld c, a - ld a, [w_level_index + 1] + ld a, [w_puzzle_index + 1] ld b, a sla c rl b @@ -2324,14 +2324,14 @@ busy_wait:: ret SECTION "home_text", ROM0[$1883] -level_name_print:: - push_bank_rom BANK(level_names) +puzzle_name_print:: + push_bank_rom BANK(puzzle_names) ; Get string address - ld hl, level_names - ld a, [w_level_index + 0] + ld hl, puzzle_names + ld a, [w_puzzle_index + 0] ld c, a - ld a, [w_level_index + 1] + ld a, [w_puzzle_index + 1] ld b, a sla c rl b @@ -2493,13 +2493,13 @@ function_00_1bec:: ld a, b ret -copy_level_name:: +copy_puzzle_name:: ld l, a - push_bank_rom BANK(level_names) + push_bank_rom BANK(puzzle_names) ld h, 0 add hl, hl - ld de, level_names + ld de, puzzle_names add hl, de ld a, [hl+] ld h, [hl] @@ -2507,7 +2507,7 @@ copy_level_name:: inc hl ; skip dw before text inc hl - ld e, 6 ; only copies first 6 characters of level name + ld e, 6 ; only copies first 6 characters of puzzle name .loop ld a, [hl+] ld [bc], a diff --git a/source/bank_01.asm b/source/bank_01.asm index 80e88a7..30e904d 100644 --- a/source/bank_01.asm +++ b/source/bank_01.asm @@ -2,7 +2,7 @@ INCLUDE "macros.inc" SECTION "text_2_char_draw", ROMX[$5e3c], BANK[$01] -level_name_textbox_clear: +puzzle_name_textbox_clear: xor a ld [w_dbe4], a |