diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c index 6ccf547b91..c6fa26352c 100644 --- a/src/overlays/gamestates/ovl_select/z_select.c +++ b/src/overlays/gamestates/ovl_select/z_select.c @@ -63,7 +63,6 @@ void func_80800B08_unknown(MapSelectState* this, s32 arg1) { } #endif -// "Translation" (Actual name) static SceneSelectEntry sScenes[] = { { " 1:SPOT00", MapSelect_LoadGame, ENTR_HYRULE_FIELD_0 }, { " 2:SPOT01", MapSelect_LoadGame, ENTR_KAKARIKO_VILLAGE_0 }, @@ -84,228 +83,189 @@ static SceneSelectEntry sScenes[] = { { "17:SPOT17", MapSelect_LoadGame, ENTR_DEATH_MOUNTAIN_CRATER_0 }, { "18:SPOT18", MapSelect_LoadGame, ENTR_GORON_CITY_0 }, { "19:SPOT20", MapSelect_LoadGame, ENTR_LON_LON_RANCH_0 }, - // "20: Chamber of Time" - { "20:" GFXP_HIRAGANA "トキノマ", MapSelect_LoadGame, ENTR_TEMPLE_OF_TIME_0 }, - // "21: Chamber of the Sages" - { "21:" GFXP_HIRAGANA "ケンジャノマ", MapSelect_LoadGame, ENTR_CHAMBER_OF_THE_SAGES_0 }, - // "22: Target Range" - { "22:" GFXP_HIRAGANA "シャテキジョウ", MapSelect_LoadGame, ENTR_SHOOTING_GALLERY_0 }, - // "23: Hyrule Garden Game" - { "23:" GFXP_KATAKANA "ハイラル" GFXP_HIRAGANA "ニワ" GFXP_KATAKANA "ゲーム", MapSelect_LoadGame, + { "20:" T(GFXP_HIRAGANA "トキノマ", "Chamber of Time"), MapSelect_LoadGame, ENTR_TEMPLE_OF_TIME_0 }, + { "21:" T(GFXP_HIRAGANA "ケンジャノマ", "Chamber of the Sages"), MapSelect_LoadGame, ENTR_CHAMBER_OF_THE_SAGES_0 }, + { "22:" T(GFXP_HIRAGANA "シャテキジョウ", "Target Range"), MapSelect_LoadGame, ENTR_SHOOTING_GALLERY_0 }, + { "23:" T(GFXP_KATAKANA "ハイラル" GFXP_HIRAGANA "ニワ" GFXP_KATAKANA "ゲーム", "Hyrule Garden Game"), MapSelect_LoadGame, ENTR_CASTLE_COURTYARD_GUARDS_DAY_0 }, - // "24: Grave Dive Hole" - { "24:" GFXP_HIRAGANA "ハカシタトビコミアナ", MapSelect_LoadGame, ENTR_REDEAD_GRAVE_0 }, - // "25: Grave Dive Hole 2" - { "25:" GFXP_HIRAGANA "ハカシタトビコミアナ 2", MapSelect_LoadGame, ENTR_GRAVE_WITH_FAIRYS_FOUNTAIN_0 }, - // "26: Royal Family's Grave" - { "26:" GFXP_HIRAGANA "オウケ ノ ハカアナ", MapSelect_LoadGame, ENTR_ROYAL_FAMILYS_TOMB_0 }, - // "27: Great Fairy's Fountain" - { "27:" GFXP_HIRAGANA "ダイヨウセイノイズミ", MapSelect_LoadGame, ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_0 }, - // "28: Fairy Dive Hole" - { "28:" GFXP_HIRAGANA "トビコミ ヨウセイ アナ", MapSelect_LoadGame, ENTR_FAIRYS_FOUNTAIN_0 }, - // "29: Magic Stone Fairy's Fountain" - { "29:" GFXP_HIRAGANA "マホウセキ ヨウセイノイズミ", MapSelect_LoadGame, ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_0 }, - // "30: Final Battle With Ganon" - { "30:" GFXP_KATAKANA "ガノン" GFXP_HIRAGANA "サイシュウセン", MapSelect_LoadGame, ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_0 }, - // "31: Hyrule Inner Garden" - { "31:" GFXP_KATAKANA "ハイラル" GFXP_HIRAGANA "ナカニワ", MapSelect_LoadGame, ENTR_CASTLE_COURTYARD_ZELDA_0 }, - // "32: Fishing" - { "32:" GFXP_HIRAGANA "ツリボリ", MapSelect_LoadGame, ENTR_FISHING_POND_0 }, - // "33: Bombchu Bowling" - { "33:" GFXP_KATAKANA "ボムチュウボーリング", MapSelect_LoadGame, ENTR_BOMBCHU_BOWLING_ALLEY_0 }, - // "34: Lon Lon Ranch - Storehouse 1" (Talon's House) - { "34:" GFXP_KATAKANA "ロンロン" GFXP_HIRAGANA "ボクジョウ ソウコ 1", MapSelect_LoadGame, ENTR_LON_LON_BUILDINGS_0 }, - // "35: Lon Lon Ranch - Storehouse 2" (Ranch Silo) - { "35:" GFXP_KATAKANA "ロンロン" GFXP_HIRAGANA "ボクジョウ ソウコ 2", MapSelect_LoadGame, ENTR_LON_LON_BUILDINGS_1 }, - // "36: Lookout Hut" - { "36:" GFXP_HIRAGANA "ミハリ ゴヤ", MapSelect_LoadGame, ENTR_MARKET_GUARD_HOUSE_0 }, - // "37: Magic Potion Shop" - { "37:" GFXP_HIRAGANA "マホウ ノ クスリヤ", MapSelect_LoadGame, ENTR_POTION_SHOP_GRANNY_0 }, - // "38: Treasure Chest Shop" - { "38:" GFXP_HIRAGANA "タカラバコヤ", MapSelect_LoadGame, ENTR_TREASURE_BOX_SHOP_0 }, - // "39: Gold Skulltula House" - { "39:" GFXP_HIRAGANA "キン " GFXP_KATAKANA "スタルチュラ ハウス", MapSelect_LoadGame, ENTR_HOUSE_OF_SKULLTULA_0 }, - // "40: Castle Town - Entrance" (Market Entrance) - { "40:" GFXP_HIRAGANA "ジョウカマチ イリグチ", MapSelect_LoadGame, ENTR_MARKET_ENTRANCE_DAY_0 }, - // "41: Castle Town" (Market) - { "41:" GFXP_HIRAGANA "ジョウカマチ", MapSelect_LoadGame, ENTR_MARKET_DAY_0 }, - // "42: Back Alley" (Back Alley) - { "42:" GFXP_HIRAGANA "ウラロジ", MapSelect_LoadGame, ENTR_BACK_ALLEY_DAY_0 }, - // "43: In Front of the Temple of Time" (Temple of Time Exterior) - { "43:" GFXP_HIRAGANA "トキノシンデン マエ", MapSelect_LoadGame, ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_0 }, - // "44: Link's House" - { "44:" GFXP_HIRAGANA "リンクノイエ", MapSelect_LoadGame, ENTR_LINKS_HOUSE_0 }, - // "45: Kakariko Village Row House" - { "45:" GFXP_KATAKANA "カカリコ" GFXP_HIRAGANA "ムラノナガヤ", MapSelect_LoadGame, ENTR_KAKARIKO_CENTER_GUEST_HOUSE_0 }, - // "46: Back Alley House" - { "46:" GFXP_HIRAGANA "ウラロジノ イエ", MapSelect_LoadGame, ENTR_BACK_ALLEY_HOUSE_0 }, - // "47: Kokiri Village - Know-It-All Brothers' House" - { "47:" GFXP_HIRAGANA "コキリノムラ モノシリキョウダイノイエ", MapSelect_LoadGame, ENTR_KNOW_IT_ALL_BROS_HOUSE_0 }, - // "48: Kokiri Village - Twins' House" - { "48:" GFXP_HIRAGANA "コキリノムラ フタゴノイエ", MapSelect_LoadGame, ENTR_TWINS_HOUSE_0 }, - // "49: Kokiri Village - Mido's House" - { "49:" GFXP_HIRAGANA "コキリノムラ " GFXP_KATAKANA "ミド" GFXP_HIRAGANA "ノイエ", MapSelect_LoadGame, ENTR_MIDOS_HOUSE_0 }, - // "50: Kokiri Village - Saria's House" - { "50:" GFXP_HIRAGANA "コキリノムラ " GFXP_KATAKANA "サリア" GFXP_HIRAGANA "ノイエ", MapSelect_LoadGame, ENTR_SARIAS_HOUSE_0 }, - // "51: Stable" - { "51:" GFXP_HIRAGANA "ウマゴヤ", MapSelect_LoadGame, ENTR_STABLE_0 }, - // "52: Grave Keeper's House" - { "52:" GFXP_HIRAGANA "ハカモリノイエ", MapSelect_LoadGame, ENTR_GRAVEKEEPERS_HUT_0 }, - // "53: Back Alley - Dog Lady's House" - { "53:" GFXP_HIRAGANA "ウラロジ イヌオバサンノイエ", MapSelect_LoadGame, ENTR_DOG_LADY_HOUSE_0 }, - // "54: Kakariko Village - Impa's House" - { "54:" GFXP_HIRAGANA "カカリコムラ " GFXP_KATAKANA "インパ" GFXP_HIRAGANA "ノイエ", MapSelect_LoadGame, ENTR_IMPAS_HOUSE_0 }, - // "55: Hylia Laboratory" - { "55:" GFXP_KATAKANA "ハイリア" GFXP_HIRAGANA " ケンキュウジョ", MapSelect_LoadGame, ENTR_LAKESIDE_LABORATORY_0 }, - // "56: Tent" - { "56:" GFXP_KATAKANA "テント", MapSelect_LoadGame, ENTR_CARPENTERS_TENT_0 }, - // "57: Shield Shop" - { "57:" GFXP_HIRAGANA "タテノミセ", MapSelect_LoadGame, ENTR_BAZAAR_0 }, - // "58: Kokiri Shop" - { "58:" GFXP_HIRAGANA "コキリゾクノミセ", MapSelect_LoadGame, ENTR_KOKIRI_SHOP_0 }, - // "59: Goron Shop" - { "59:" GFXP_KATAKANA "ゴロン" GFXP_HIRAGANA "ノミセ", MapSelect_LoadGame, ENTR_GORON_SHOP_0 }, - // "60: Zora Shop" - { "60:" GFXP_KATAKANA "ゾーラ" GFXP_HIRAGANA "ノミセ", MapSelect_LoadGame, ENTR_ZORA_SHOP_0 }, - // "61: Kakariko Village - Potion Shop" - { "61:" GFXP_KATAKANA "カカリコ" GFXP_HIRAGANA "ムラ クスリヤ", MapSelect_LoadGame, ENTR_POTION_SHOP_KAKARIKO_0 }, - // "62: Castle Town - Potion Shop" - { "62:" GFXP_HIRAGANA "ジョウカマチ クスリヤ", MapSelect_LoadGame, ENTR_POTION_SHOP_MARKET_0 }, - // "63: Back Alley - Night Shop" - { "63:" GFXP_HIRAGANA "ウラロジ ヨルノミセ", MapSelect_LoadGame, ENTR_BOMBCHU_SHOP_0 }, - // "64: Mask Shop" - { "64:" GFXP_HIRAGANA "オメンヤ", MapSelect_LoadGame, ENTR_HAPPY_MASK_SHOP_0 }, - // "65: Gerudo Training Area" - { "65:" GFXP_KATAKANA "ゲルド" GFXP_HIRAGANA "ノシュウレンジョウ", MapSelect_LoadGame, ENTR_GERUDO_TRAINING_GROUND_0 }, - // "66: Fairy Tree Dungeon" - { "66:" GFXP_HIRAGANA "ヨウセイノキノ " GFXP_KATAKANA "ダンジョン", MapSelect_LoadGame, ENTR_DEKU_TREE_0 }, - // "67: Fairy Tree Dungeon - Boss" - { "67:" GFXP_HIRAGANA "ヨウセイノキノ " GFXP_KATAKANA "ダンジョン ボス", MapSelect_LoadGame, ENTR_DEKU_TREE_BOSS_0 }, - // "68: Dondogo Dungeon" - { "68:" GFXP_KATAKANA "ドドンゴ ダンジョン", MapSelect_LoadGame, ENTR_DODONGOS_CAVERN_0 }, - // "69: Dondogo Dungeon - Boss" - { "69:" GFXP_KATAKANA "ドドンゴ ダンジョン ボス", MapSelect_LoadGame, ENTR_DODONGOS_CAVERN_BOSS_0 }, - // "70: Giant Fish Dungeon" - { "70:" GFXP_HIRAGANA "キョダイギョ " GFXP_KATAKANA "ダンジョン", MapSelect_LoadGame, ENTR_JABU_JABU_0 }, - // "71: Giant Fish Dungeon - Boss" - { "71:" GFXP_HIRAGANA "キョダイギョ " GFXP_KATAKANA "ダンジョン ボス", MapSelect_LoadGame, ENTR_JABU_JABU_BOSS_0 }, - // "72: Forest Temple" - { "72:" GFXP_HIRAGANA "モリノシンデン", MapSelect_LoadGame, ENTR_FOREST_TEMPLE_0 }, - // "73: Forest Temple - Boss" - { "73:" GFXP_HIRAGANA "モリノシンデン " GFXP_KATAKANA "ボス", MapSelect_LoadGame, ENTR_FOREST_TEMPLE_BOSS_0 }, - // "74: Dungeon Below the Well" - { "74:" GFXP_HIRAGANA "イドシタ " GFXP_KATAKANA "ダンジョン", MapSelect_LoadGame, ENTR_BOTTOM_OF_THE_WELL_0 }, - // "75: Dungeon Beneath the Graves" - { "75:" GFXP_HIRAGANA "ハカシタ " GFXP_KATAKANA "ダンジョン", MapSelect_LoadGame, ENTR_SHADOW_TEMPLE_0 }, - // "76: Dungeon Beneath the Graves - Boss" - { "76:" GFXP_HIRAGANA "ハカシタ " GFXP_KATAKANA "ダンジョン ボス", MapSelect_LoadGame, ENTR_SHADOW_TEMPLE_BOSS_0 }, - // "77: Fire Temple" - { "77:" GFXP_HIRAGANA "ヒノシンデン", MapSelect_LoadGame, ENTR_FIRE_TEMPLE_0 }, - // "78: Fire Temple - Boss" - { "78:" GFXP_HIRAGANA "ヒノシンデン " GFXP_KATAKANA "ボス", MapSelect_LoadGame, ENTR_FIRE_TEMPLE_BOSS_0 }, - // "79: Water Temple" - { "79:" GFXP_HIRAGANA "ミズノシンデン", MapSelect_LoadGame, ENTR_WATER_TEMPLE_0 }, - // "80: Water Temple - Boss" - { "80:" GFXP_HIRAGANA "ミズノシンデン " GFXP_KATAKANA "ボス", MapSelect_LoadGame, ENTR_WATER_TEMPLE_BOSS_0 }, - // "81: Evil Goddess Statue Dungeon" - { "81:" GFXP_HIRAGANA "ジャシンゾウ " GFXP_KATAKANA "ダンジョン", MapSelect_LoadGame, ENTR_SPIRIT_TEMPLE_0 }, - // "82: Evil Goddess Statue Dungeon - Iron Knuckle" (Iron Knuckle's Lair) - { "82:" GFXP_HIRAGANA "ジャシンゾウ " GFXP_KATAKANA "ダンジョン アイアンナック", MapSelect_LoadGame, ENTR_SPIRIT_TEMPLE_BOSS_0 }, - // "83: Evil Goddess Statue Dungeon - Boss" (Twinrova's Lair) - { "83:" GFXP_HIRAGANA "ジャシンゾウ " GFXP_KATAKANA "ダンジョン ボス", MapSelect_LoadGame, ENTR_SPIRIT_TEMPLE_BOSS_2 }, - // "84: Ganon's Tower" - { "84:" GFXP_KATAKANA "ガノン" GFXP_HIRAGANA "ノトウ", MapSelect_LoadGame, ENTR_GANONS_TOWER_0 }, - // "85: Ganon's Tower - Boss" - { "85:" GFXP_KATAKANA "ガノン" GFXP_HIRAGANA "ノトウ" GFXP_KATAKANA "ボス", MapSelect_LoadGame, ENTR_GANONDORF_BOSS_0 }, - // "86: Ice Cavern" - { "86:" GFXP_HIRAGANA "コオリノドウクツ", MapSelect_LoadGame, ENTR_ICE_CAVERN_0 }, - // "87: Relay Beneath the Graves" (Dampé's Grave) - { "87:" GFXP_HIRAGANA "ハカシタ" GFXP_KATAKANA "リレー", MapSelect_LoadGame, ENTR_WINDMILL_AND_DAMPES_GRAVE_0 }, - // "88: Ganon's Basement Dungeon" - { "88:" GFXP_KATAKANA "ガノン" GFXP_HIRAGANA "チカ " GFXP_KATAKANA "ダンジョン", MapSelect_LoadGame, - ENTR_INSIDE_GANONS_CASTLE_0 }, - // "89: Final Battle With Ganon - Cutscene & Battle" - { "89:" GFXP_KATAKANA "ガノン" GFXP_HIRAGANA "サイシュウセン " GFXP_KATAKANA "デモ & バトル", MapSelect_LoadGame, - ENTR_GANON_BOSS_0 }, - // "90: Ganon's Tower Aftermath 1" (Escaping Ganon's Tower 1) - { "90:" GFXP_KATAKANA "ガノン" GFXP_HIRAGANA "ノトウ ソノゴ 1", MapSelect_LoadGame, + { "24:" T(GFXP_HIRAGANA "ハカシタトビコミアナ", "Grave Dive Hole"), MapSelect_LoadGame, ENTR_REDEAD_GRAVE_0 }, + { "25:" T(GFXP_HIRAGANA "ハカシタトビコミアナ 2", "Grave Dive Hole 2"), MapSelect_LoadGame, + ENTR_GRAVE_WITH_FAIRYS_FOUNTAIN_0 }, + { "26:" T(GFXP_HIRAGANA "オウケ ノ ハカアナ", "Royal Family's Grave"), MapSelect_LoadGame, ENTR_ROYAL_FAMILYS_TOMB_0 }, + { "27:" T(GFXP_HIRAGANA "ダイヨウセイノイズミ", "Great Fairy's Fountain"), MapSelect_LoadGame, + ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_0 }, + { "28:" T(GFXP_HIRAGANA "トビコミ ヨウセイ アナ", "Fairy Dive Hole"), MapSelect_LoadGame, ENTR_FAIRYS_FOUNTAIN_0 }, + { "29:" T(GFXP_HIRAGANA "マホウセキ ヨウセイノイズミ", "Magic Stone Fairy's Fountain"), MapSelect_LoadGame, + ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_0 }, + { "30:" T(GFXP_KATAKANA "ガノン" GFXP_HIRAGANA "サイシュウセン", "Final Battle With Ganon"), MapSelect_LoadGame, + ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_0 }, + { "31:" T(GFXP_KATAKANA "ハイラル" GFXP_HIRAGANA "ナカニワ", "Hyrule Inner Garden"), MapSelect_LoadGame, + ENTR_CASTLE_COURTYARD_ZELDA_0 }, + { "32:" T(GFXP_HIRAGANA "ツリボリ", "Fishing"), MapSelect_LoadGame, ENTR_FISHING_POND_0 }, + { "33:" T(GFXP_KATAKANA "ボムチュウボーリング", "Bombchu Bowling"), MapSelect_LoadGame, ENTR_BOMBCHU_BOWLING_ALLEY_0 }, + // Talon's House + { "34:" T(GFXP_KATAKANA "ロンロン" GFXP_HIRAGANA "ボクジョウ ソウコ 1", "Lon Lon Ranch - Storehouse 1"), MapSelect_LoadGame, + ENTR_LON_LON_BUILDINGS_0 }, + // Ranch Silo + { "35:" T(GFXP_KATAKANA "ロンロン" GFXP_HIRAGANA "ボクジョウ ソウコ 2", "Lon Lon Ranch - Storehouse 2"), MapSelect_LoadGame, + ENTR_LON_LON_BUILDINGS_1 }, + { "36:" T(GFXP_HIRAGANA "ミハリ ゴヤ", "Lookout Hut"), MapSelect_LoadGame, ENTR_MARKET_GUARD_HOUSE_0 }, + { "37:" T(GFXP_HIRAGANA "マホウ ノ クスリヤ", "Magic Potion Shop"), MapSelect_LoadGame, ENTR_POTION_SHOP_GRANNY_0 }, + { "38:" T(GFXP_HIRAGANA "タカラバコヤ", "Treasure Chest Shop"), MapSelect_LoadGame, ENTR_TREASURE_BOX_SHOP_0 }, + { "39:" T(GFXP_HIRAGANA "キン " GFXP_KATAKANA "スタルチュラ ハウス", "Gold Skulltula House"), MapSelect_LoadGame, + ENTR_HOUSE_OF_SKULLTULA_0 }, + { "40:" T(GFXP_HIRAGANA "ジョウカマチ イリグチ", "Castle Town - Entrance"), MapSelect_LoadGame, + ENTR_MARKET_ENTRANCE_DAY_0 }, + { "41:" T(GFXP_HIRAGANA "ジョウカマチ", "Castle Town"), MapSelect_LoadGame, ENTR_MARKET_DAY_0 }, + { "42:" T(GFXP_HIRAGANA "ウラロジ", "Back Alley"), MapSelect_LoadGame, ENTR_BACK_ALLEY_DAY_0 }, + { "43:" T(GFXP_HIRAGANA "トキノシンデン マエ", "In Front of the Temple of Time"), MapSelect_LoadGame, + ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY_0 }, + { "44:" T(GFXP_HIRAGANA "リンクノイエ", "Link's House"), MapSelect_LoadGame, ENTR_LINKS_HOUSE_0 }, + { "45:" T(GFXP_KATAKANA "カカリコ" GFXP_HIRAGANA "ムラノナガヤ", "Kakariko Village Row House"), MapSelect_LoadGame, + ENTR_KAKARIKO_CENTER_GUEST_HOUSE_0 }, + { "46:" T(GFXP_HIRAGANA "ウラロジノ イエ", "Back Alley House"), MapSelect_LoadGame, ENTR_BACK_ALLEY_HOUSE_0 }, + { "47:" T(GFXP_HIRAGANA "コキリノムラ モノシリキョウダイノイエ", "Kokiri Village - Know-It-All Brothers' House"), MapSelect_LoadGame, + ENTR_KNOW_IT_ALL_BROS_HOUSE_0 }, + { "48:" T(GFXP_HIRAGANA "コキリノムラ フタゴノイエ", "Kokiri Village - Twins' House"), MapSelect_LoadGame, + ENTR_TWINS_HOUSE_0 }, + { "49:" T(GFXP_HIRAGANA "コキリノムラ " GFXP_KATAKANA "ミド" GFXP_HIRAGANA "ノイエ", "Kokiri Village - Mido's House"), + MapSelect_LoadGame, ENTR_MIDOS_HOUSE_0 }, + { "50:" T(GFXP_HIRAGANA "コキリノムラ " GFXP_KATAKANA "サリア" GFXP_HIRAGANA "ノイエ", "Kokiri Village - Saria's House"), + MapSelect_LoadGame, ENTR_SARIAS_HOUSE_0 }, + { "51:" T(GFXP_HIRAGANA "ウマゴヤ", "Stable"), MapSelect_LoadGame, ENTR_STABLE_0 }, + { "52:" T(GFXP_HIRAGANA "ハカモリノイエ", "Grave Keeper's House"), MapSelect_LoadGame, ENTR_GRAVEKEEPERS_HUT_0 }, + { "53:" T(GFXP_HIRAGANA "ウラロジ イヌオバサンノイエ", "Back Alley - Dog Lady's House"), MapSelect_LoadGame, + ENTR_DOG_LADY_HOUSE_0 }, + { "54:" T(GFXP_HIRAGANA "カカリコムラ " GFXP_KATAKANA "インパ" GFXP_HIRAGANA "ノイエ", "Kakariko Village - Impa's House"), + MapSelect_LoadGame, ENTR_IMPAS_HOUSE_0 }, + { "55:" T(GFXP_KATAKANA "ハイリア" GFXP_HIRAGANA " ケンキュウジョ", "Hylia Laboratory"), MapSelect_LoadGame, + ENTR_LAKESIDE_LABORATORY_0 }, + { "56:" T(GFXP_KATAKANA "テント", "Tent"), MapSelect_LoadGame, ENTR_CARPENTERS_TENT_0 }, + { "57:" T(GFXP_HIRAGANA "タテノミセ", "Shield Shop"), MapSelect_LoadGame, ENTR_BAZAAR_0 }, + { "58:" T(GFXP_HIRAGANA "コキリゾクノミセ", "Kokiri Shop"), MapSelect_LoadGame, ENTR_KOKIRI_SHOP_0 }, + { "59:" T(GFXP_KATAKANA "ゴロン" GFXP_HIRAGANA "ノミセ", "Goron Shop"), MapSelect_LoadGame, ENTR_GORON_SHOP_0 }, + { "60:" T(GFXP_KATAKANA "ゾーラ" GFXP_HIRAGANA "ノミセ", "Zora Shop"), MapSelect_LoadGame, ENTR_ZORA_SHOP_0 }, + { "61:" T(GFXP_KATAKANA "カカリコ" GFXP_HIRAGANA "ムラ クスリヤ", "Kakariko Village - Potion Shop"), MapSelect_LoadGame, + ENTR_POTION_SHOP_KAKARIKO_0 }, + { "62:" T(GFXP_HIRAGANA "ジョウカマチ クスリヤ", "Castle Town - Potion Shop"), MapSelect_LoadGame, + ENTR_POTION_SHOP_MARKET_0 }, + { "63:" T(GFXP_HIRAGANA "ウラロジ ヨルノミセ", "Back Alley - Night Shop"), MapSelect_LoadGame, ENTR_BOMBCHU_SHOP_0 }, + { "64:" T(GFXP_HIRAGANA "オメンヤ", "Mask Shop"), MapSelect_LoadGame, ENTR_HAPPY_MASK_SHOP_0 }, + { "65:" T(GFXP_KATAKANA "ゲルド" GFXP_HIRAGANA "ノシュウレンジョウ", "Gerudo Training Area"), MapSelect_LoadGame, + ENTR_GERUDO_TRAINING_GROUND_0 }, + { "66:" T(GFXP_HIRAGANA "ヨウセイノキノ " GFXP_KATAKANA "ダンジョン", "Fairy Tree Dungeon"), MapSelect_LoadGame, + ENTR_DEKU_TREE_0 }, + { "67:" T(GFXP_HIRAGANA "ヨウセイノキノ " GFXP_KATAKANA "ダンジョン ボス", "Fairy Tree Dungeon - Boss"), MapSelect_LoadGame, + ENTR_DEKU_TREE_BOSS_0 }, + { "68:" T(GFXP_KATAKANA "ドドンゴ ダンジョン", "Dondogo Dungeon"), MapSelect_LoadGame, ENTR_DODONGOS_CAVERN_0 }, + { "69:" T(GFXP_KATAKANA "ドドンゴ ダンジョン ボス", "Dondogo Dungeon - Boss"), MapSelect_LoadGame, + ENTR_DODONGOS_CAVERN_BOSS_0 }, + { "70:" T(GFXP_HIRAGANA "キョダイギョ " GFXP_KATAKANA "ダンジョン", "Giant Fish Dungeon"), MapSelect_LoadGame, + ENTR_JABU_JABU_0 }, + { "71:" T(GFXP_HIRAGANA "キョダイギョ " GFXP_KATAKANA "ダンジョン ボス", "Giant Fish Dungeon - Boss"), MapSelect_LoadGame, + ENTR_JABU_JABU_BOSS_0 }, + { "72:" T(GFXP_HIRAGANA "モリノシンデン", "Forest Temple"), MapSelect_LoadGame, ENTR_FOREST_TEMPLE_0 }, + { "73:" T(GFXP_HIRAGANA "モリノシンデン " GFXP_KATAKANA "ボス", "Forest Temple - Boss"), MapSelect_LoadGame, + ENTR_FOREST_TEMPLE_BOSS_0 }, + { "74:" T(GFXP_HIRAGANA "イドシタ " GFXP_KATAKANA "ダンジョン", "Dungeon Below the Well"), MapSelect_LoadGame, + ENTR_BOTTOM_OF_THE_WELL_0 }, + { "75:" T(GFXP_HIRAGANA "ハカシタ " GFXP_KATAKANA "ダンジョン", "Dungeon Beneath the Graves"), MapSelect_LoadGame, + ENTR_SHADOW_TEMPLE_0 }, + { "76:" T(GFXP_HIRAGANA "ハカシタ " GFXP_KATAKANA "ダンジョン ボス", "Dungeon Beneath the Graves - Boss"), + MapSelect_LoadGame, ENTR_SHADOW_TEMPLE_BOSS_0 }, + { "77:" T(GFXP_HIRAGANA "ヒノシンデン", "Fire Temple"), MapSelect_LoadGame, ENTR_FIRE_TEMPLE_0 }, + { "78:" T(GFXP_HIRAGANA "ヒノシンデン " GFXP_KATAKANA "ボス", "Fire Temple - Boss"), MapSelect_LoadGame, + ENTR_FIRE_TEMPLE_BOSS_0 }, + { "79:" T(GFXP_HIRAGANA "ミズノシンデン", "Water Temple"), MapSelect_LoadGame, ENTR_WATER_TEMPLE_0 }, + { "80:" T(GFXP_HIRAGANA "ミズノシンデン " GFXP_KATAKANA "ボス", "Water Temple - Boss"), MapSelect_LoadGame, + ENTR_WATER_TEMPLE_BOSS_0 }, + { "81:" T(GFXP_HIRAGANA "ジャシンゾウ " GFXP_KATAKANA "ダンジョン", "Evil Goddess Statue Dungeon"), MapSelect_LoadGame, + ENTR_SPIRIT_TEMPLE_0 }, + // Iron Knuckle's Lair + { "82:" T(GFXP_HIRAGANA "ジャシンゾウ " GFXP_KATAKANA "ダンジョン アイアンナック", "Evil Goddess Statue Dungeon - Iron Knuckle"), + MapSelect_LoadGame, ENTR_SPIRIT_TEMPLE_BOSS_0 }, + // Twinrova's Lair + { "83:" T(GFXP_HIRAGANA "ジャシンゾウ " GFXP_KATAKANA "ダンジョン ボス", "Evil Goddess Statue Dungeon - Boss"), + MapSelect_LoadGame, ENTR_SPIRIT_TEMPLE_BOSS_2 }, + { "84:" T(GFXP_KATAKANA "ガノン" GFXP_HIRAGANA "ノトウ", "Ganon's Tower"), MapSelect_LoadGame, ENTR_GANONS_TOWER_0 }, + { "85:" T(GFXP_KATAKANA "ガノン" GFXP_HIRAGANA "ノトウ" GFXP_KATAKANA "ボス", "Ganon's Tower - Boss"), MapSelect_LoadGame, + ENTR_GANONDORF_BOSS_0 }, + { "86:" T(GFXP_HIRAGANA "コオリノドウクツ", "Ice Cavern"), MapSelect_LoadGame, ENTR_ICE_CAVERN_0 }, + // Dampé's Grave + { "87:" T(GFXP_HIRAGANA "ハカシタ" GFXP_KATAKANA "リレー", "Relay Beneath the Graves"), MapSelect_LoadGame, + ENTR_WINDMILL_AND_DAMPES_GRAVE_0 }, + { "88:" T(GFXP_KATAKANA "ガノン" GFXP_HIRAGANA "チカ " GFXP_KATAKANA "ダンジョン", "Ganon's Basement Dungeon"), + MapSelect_LoadGame, ENTR_INSIDE_GANONS_CASTLE_0 }, + { "89:" T(GFXP_KATAKANA "ガノン" GFXP_HIRAGANA "サイシュウセン " GFXP_KATAKANA "デモ & バトル", + "Final Battle With Ganon - Cutscene & Battle"), + MapSelect_LoadGame, ENTR_GANON_BOSS_0 }, + { "90:" T(GFXP_KATAKANA "ガノン" GFXP_HIRAGANA "ノトウ ソノゴ 1", "Ganon's Tower Aftermath 1"), MapSelect_LoadGame, ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_0 }, - // "91: Ganon's Tower Aftermath 2" (Escaping Ganon's Tower 2) - { "91:" GFXP_KATAKANA "ガノン" GFXP_HIRAGANA "ノトウ ソノゴ 2", MapSelect_LoadGame, + { "91:" T(GFXP_KATAKANA "ガノン" GFXP_HIRAGANA "ノトウ ソノゴ 2", "Ganon's Tower Aftermath 2"), MapSelect_LoadGame, ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_2 }, - // "92: Ganon's Tower Aftermath 3" (Escaping Ganon's Tower 3) - { "92:" GFXP_KATAKANA "ガノン" GFXP_HIRAGANA "ノトウ ソノゴ 3", MapSelect_LoadGame, + { "92:" T(GFXP_KATAKANA "ガノン" GFXP_HIRAGANA "ノトウ ソノゴ 3", "Ganon's Tower Aftermath 3"), MapSelect_LoadGame, ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_4 }, - // "93: Ganon's Tower Aftermath 4" (Escaping Ganon's Tower 4) - { "93:" GFXP_KATAKANA "ガノン" GFXP_HIRAGANA "ノトウ ソノゴ 4", MapSelect_LoadGame, + { "93:" T(GFXP_KATAKANA "ガノン" GFXP_HIRAGANA "ノトウ ソノゴ 4", "Ganon's Tower Aftermath 4"), MapSelect_LoadGame, ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_6 }, - // "94: Ganon's Basement Aftermath" - { "94:" GFXP_KATAKANA "ガノン" GFXP_HIRAGANA "チカ ソノゴ", MapSelect_LoadGame, ENTR_INSIDE_GANONS_CASTLE_COLLAPSE_0 }, - // "95: Gerudo Passage 1-2" (Thieves' Hideout 1) - { "95:" GFXP_KATAKANA "ゲルド" GFXP_HIRAGANA "ツウロ 1-2", MapSelect_LoadGame, ENTR_THIEVES_HIDEOUT_0 }, - // "96: Gerudo Passage 3-4 9-10" (Thieves' Hideout 2) - { "96:" GFXP_KATAKANA "ゲルド" GFXP_HIRAGANA "ツウロ 3-4 9-10", MapSelect_LoadGame, ENTR_THIEVES_HIDEOUT_2 }, - // "97: Gerudo Passage 5-6" (Thieves' Hideout 3) - { "97:" GFXP_KATAKANA "ゲルド" GFXP_HIRAGANA "ツウロ 5-6", MapSelect_LoadGame, ENTR_THIEVES_HIDEOUT_4 }, - // "98: Gerudo Passage 7-8" (Thieves' Hideout 4) - { "98:" GFXP_KATAKANA "ゲルド" GFXP_HIRAGANA "ツウロ 7-8", MapSelect_LoadGame, ENTR_THIEVES_HIDEOUT_6 }, - // "99: Gerudo Passage 11-12" (Thieves' Hideout 5) - { "99:" GFXP_KATAKANA "ゲルド" GFXP_HIRAGANA "ツウロ 11-12", MapSelect_LoadGame, ENTR_THIEVES_HIDEOUT_10 }, - // "100: Gerudo Passage 13" (Thieves' Hideout 6) - { "100:" GFXP_KATAKANA "ゲルド" GFXP_HIRAGANA "ツウロ 13", MapSelect_LoadGame, ENTR_THIEVES_HIDEOUT_12 }, - // "101: Hidden Dive Hole 0" (Grotto 0 - Gossip Stone & Chest) - { "101:" GFXP_HIRAGANA "カクシトビコミアナ 0", MapSelect_LoadGame, ENTR_GROTTOS_0 }, - // "102: Hidden Dive Hole 1" (Grotto 1 - Skulltula & Gold Skulltula) - { "102:" GFXP_HIRAGANA "カクシトビコミアナ 1", MapSelect_LoadGame, ENTR_GROTTOS_1 }, - // "103: Hidden Dive Hole 2" (Grotto 2 - Business Scrub & Heart Piece) - { "103:" GFXP_HIRAGANA "カクシトビコミアナ 2", MapSelect_LoadGame, ENTR_GROTTOS_2 }, - // "104: Hidden Dive Hole 3" (Grotto 3 - Redeads) - { "104:" GFXP_HIRAGANA "カクシトビコミアナ 3", MapSelect_LoadGame, ENTR_GROTTOS_3 }, - // "105: Hidden Dive Hole 4" (Grotto 4 - 3 Business Scrubs) - { "105:" GFXP_HIRAGANA "カクシトビコミアナ 4", MapSelect_LoadGame, ENTR_GROTTOS_4 }, - // "106: Hidden Dive Hole 5" (Grotto 5 - Gossip Stone, Skulltula, Cow) - { "106:" GFXP_HIRAGANA "カクシトビコミアナ 5", MapSelect_LoadGame, ENTR_GROTTOS_5 }, - // "107: Hidden Dive Hole 6" (Grotto 6 - Octorok) - { "107:" GFXP_HIRAGANA "カクシトビコミアナ 6", MapSelect_LoadGame, ENTR_GROTTOS_6 }, - // "108: Hidden Dive Hole 7" (Grotto 7 - Business Scrub & Deku Nut Upgrade) - { "108:" GFXP_HIRAGANA "カクシトビコミアナ 7", MapSelect_LoadGame, ENTR_GROTTOS_7 }, - // "109: Hidden Dive Hole 8" (Grotto 8 - 2 Wolfos) - { "109:" GFXP_HIRAGANA "カクシトビコミアナ 8", MapSelect_LoadGame, ENTR_GROTTOS_8 }, - // "110: Hidden Dive Hole 9" (Grotto 9 - Bombable Walls) - { "110:" GFXP_HIRAGANA "カクシトビコミアナ 9", MapSelect_LoadGame, ENTR_GROTTOS_9 }, - // "111: Hidden Dive Hole 10" (Grotto 10 - 2 Business Scrubs) - { "111:" GFXP_HIRAGANA "カクシトビコミアナ 10", MapSelect_LoadGame, ENTR_GROTTOS_10 }, - // "112: Hidden Dive Hole 11" (Grotto 11 - Tektite & Heart Piece) - { "112:" GFXP_HIRAGANA "カクシトビコミアナ 11", MapSelect_LoadGame, ENTR_GROTTOS_11 }, - // "113: Hidden Dive Hole 12" (Grotto 12 - Deku Stage) - { "113:" GFXP_HIRAGANA "カクシトビコミアナ 12", MapSelect_LoadGame, ENTR_GROTTOS_12 }, - // "114: Hidden Dive Hole 13" (Grotto 13 - Rupees & Cow) - { "114:" GFXP_HIRAGANA "カクシトビコミアナ 13", MapSelect_LoadGame, ENTR_GROTTOS_13 }, - // "115: Hyrule Cutscenes" - { "115:" GFXP_KATAKANA "ハイラル デモ", MapSelect_LoadGame, ENTR_CUTSCENE_MAP_0 }, + { "94:" T(GFXP_KATAKANA "ガノン" GFXP_HIRAGANA "チカ ソノゴ", "Ganon's Basement Aftermath"), MapSelect_LoadGame, + ENTR_INSIDE_GANONS_CASTLE_COLLAPSE_0 }, + { "95:" T(GFXP_KATAKANA "ゲルド" GFXP_HIRAGANA "ツウロ 1-2", "Gerudo Passage 1-2"), MapSelect_LoadGame, + ENTR_THIEVES_HIDEOUT_0 }, + { "96:" T(GFXP_KATAKANA "ゲルド" GFXP_HIRAGANA "ツウロ 3-4 9-10", "Gerudo Passage 3-4 9-10"), MapSelect_LoadGame, + ENTR_THIEVES_HIDEOUT_2 }, + { "97:" T(GFXP_KATAKANA "ゲルド" GFXP_HIRAGANA "ツウロ 5-6", "Gerudo Passage 5-6"), MapSelect_LoadGame, + ENTR_THIEVES_HIDEOUT_4 }, + { "98:" T(GFXP_KATAKANA "ゲルド" GFXP_HIRAGANA "ツウロ 7-8", "Gerudo Passage 7-8"), MapSelect_LoadGame, + ENTR_THIEVES_HIDEOUT_6 }, + { "99:" T(GFXP_KATAKANA "ゲルド" GFXP_HIRAGANA "ツウロ 11-12", "Gerudo Passage 11-12"), MapSelect_LoadGame, + ENTR_THIEVES_HIDEOUT_10 }, + { "100:" T(GFXP_KATAKANA "ゲルド" GFXP_HIRAGANA "ツウロ 13", "Gerudo Passage 13"), MapSelect_LoadGame, + ENTR_THIEVES_HIDEOUT_12 }, + // Gossip Stone & Chest Grotto + { "101:" T(GFXP_HIRAGANA "カクシトビコミアナ 0", "Hidden Dive Hole 0"), MapSelect_LoadGame, ENTR_GROTTOS_0 }, + // Skulltula & Gold Skulltula Grotto + { "102:" T(GFXP_HIRAGANA "カクシトビコミアナ 1", "Hidden Dive Hole 1"), MapSelect_LoadGame, ENTR_GROTTOS_1 }, + // Business Scrub & Heart Piece Grotto + { "103:" T(GFXP_HIRAGANA "カクシトビコミアナ 2", "Hidden Dive Hole 2"), MapSelect_LoadGame, ENTR_GROTTOS_2 }, + // Redeads Grotto + { "104:" T(GFXP_HIRAGANA "カクシトビコミアナ 3", "Hidden Dive Hole 3"), MapSelect_LoadGame, ENTR_GROTTOS_3 }, + // 3 Business Scrubs Grotto + { "105:" T(GFXP_HIRAGANA "カクシトビコミアナ 4", "Hidden Dive Hole 4"), MapSelect_LoadGame, ENTR_GROTTOS_4 }, + // Gossip Stone, Skulltula & Cow Grotto + { "106:" T(GFXP_HIRAGANA "カクシトビコミアナ 5", "Hidden Dive Hole 5"), MapSelect_LoadGame, ENTR_GROTTOS_5 }, + // Octorok Grotto + { "107:" T(GFXP_HIRAGANA "カクシトビコミアナ 6", "Hidden Dive Hole 6"), MapSelect_LoadGame, ENTR_GROTTOS_6 }, + // Business Scrub & Deku Nut Upgrade Grotto + { "108:" T(GFXP_HIRAGANA "カクシトビコミアナ 7", "Hidden Dive Hole 7"), MapSelect_LoadGame, ENTR_GROTTOS_7 }, + // 2 Wolfos Grotto + { "109:" T(GFXP_HIRAGANA "カクシトビコミアナ 8", "Hidden Dive Hole 8"), MapSelect_LoadGame, ENTR_GROTTOS_8 }, + // Bombable Walls Grotto + { "110:" T(GFXP_HIRAGANA "カクシトビコミアナ 9", "Hidden Dive Hole 9"), MapSelect_LoadGame, ENTR_GROTTOS_9 }, + // 2 Business Scrubs Grotto + { "111:" T(GFXP_HIRAGANA "カクシトビコミアナ 10", "Hidden Dive Hole 10"), MapSelect_LoadGame, ENTR_GROTTOS_10 }, + // Tektite & Heart Piece Grotto + { "112:" T(GFXP_HIRAGANA "カクシトビコミアナ 11", "Hidden Dive Hole 11"), MapSelect_LoadGame, ENTR_GROTTOS_11 }, + // Deku Stage Grotto + { "113:" T(GFXP_HIRAGANA "カクシトビコミアナ 12", "Hidden Dive Hole 12"), MapSelect_LoadGame, ENTR_GROTTOS_12 }, + // Rupees & Cow Grotto + { "114:" T(GFXP_HIRAGANA "カクシトビコミアナ 13", "Hidden Dive Hole 13"), MapSelect_LoadGame, ENTR_GROTTOS_13 }, + { "115:" T(GFXP_KATAKANA "ハイラル デモ", "Hyrule Cutscenes"), MapSelect_LoadGame, ENTR_CUTSCENE_MAP_0 }, #if OOT_DEBUG - // "116: Special Room (Treasure Chest Warp)" (Ganondorf Test Room) - { "116:" GFXP_HIRAGANA "ベッシツ (タカラバコ" GFXP_KATAKANA "ワープ)", MapSelect_LoadGame, ENTR_BESITU_0 }, - // "117: Sasaki Test" (Sasa Test) - { "117:" GFXP_HIRAGANA "ササ" GFXP_KATAKANA "テスト", MapSelect_LoadGame, ENTR_SASATEST_0 }, - // "118: Test Map" (Jungle Gym) - { "118:" GFXP_KATAKANA "テストマップ", MapSelect_LoadGame, ENTR_TEST01_0 }, - // "119: Test Room" (Treasure Chest Room) - { "119:" GFXP_KATAKANA "テストルーム", MapSelect_LoadGame, ENTR_TESTROOM_0 }, - // "120: Stalfos Miniboss Room" (Stalfos Miniboss Room) - { "120:" GFXP_HIRAGANA "チュウ" GFXP_KATAKANA "スタロフォス" GFXP_HIRAGANA "ベヤ", MapSelect_LoadGame, ENTR_SYOTES_0 }, - // "121: Boss Stalfos Room" (Stalfos Boss Room) - { "121:" GFXP_KATAKANA "ボススタロフォス" GFXP_HIRAGANA "ベヤ", MapSelect_LoadGame, ENTR_SYOTES2_0 }, - // "122: Stal" (Sutaru) - { "122:Sutaru", MapSelect_LoadGame, ENTR_SUTARU_0 }, - // "123: Test Area" - { "123:jikkenjyou", MapSelect_LoadGame, ENTR_TEST_SHOOTING_GALLERY_0 }, - // "124: Depth Test" (Depth Test) - { "124:depth" GFXP_KATAKANA "テスト", MapSelect_LoadGame, ENTR_DEPTH_TEST_0 }, - // "125: Hyrule Garden Game 2" (Early Hyrule Garden Game) - { "125:" GFXP_KATAKANA "ハイラル" GFXP_HIRAGANA "ニワ" GFXP_KATAKANA "ゲーム2", MapSelect_LoadGame, ENTR_HAIRAL_NIWA2_0 }, + { "116:" T(GFXP_HIRAGANA "ベッシツ (タカラバコ" GFXP_KATAKANA "ワープ)", "Special Room (Treasure Chest Warp)"), + MapSelect_LoadGame, ENTR_BESITU_0 }, + { "117:" T(GFXP_HIRAGANA "ササ" GFXP_KATAKANA "テスト", "Sasaki Test"), MapSelect_LoadGame, ENTR_SASATEST_0 }, + { "118:" T(GFXP_KATAKANA "テストマップ", "Test Map"), MapSelect_LoadGame, ENTR_TEST01_0 }, + { "119:" T(GFXP_KATAKANA "テストルーム", "Test Room"), MapSelect_LoadGame, ENTR_TESTROOM_0 }, + { "120:" T(GFXP_HIRAGANA "チュウ" GFXP_KATAKANA "スタロフォス" GFXP_HIRAGANA "ベヤ", "Stalfos Miniboss Room"), + MapSelect_LoadGame, ENTR_SYOTES_0 }, + { "121:" T(GFXP_KATAKANA "ボススタロフォス" GFXP_HIRAGANA "ベヤ", "Boss Stalfos Room"), MapSelect_LoadGame, + ENTR_SYOTES2_0 }, + { "122:" T("Sutaru", "Stal"), MapSelect_LoadGame, ENTR_SUTARU_0 }, + { "123:" T("jikkenjyou", "Test Area"), MapSelect_LoadGame, ENTR_TEST_SHOOTING_GALLERY_0 }, + { "124:depth" T(GFXP_KATAKANA "テスト", "Test"), MapSelect_LoadGame, ENTR_DEPTH_TEST_0 }, + { "125:" T(GFXP_KATAKANA "ハイラル" GFXP_HIRAGANA "ニワ" GFXP_KATAKANA "ゲーム2", "Hyrule Garden Game 2"), + MapSelect_LoadGame, ENTR_HAIRAL_NIWA2_0 }, #endif - // "title" (Title Screen) { "title", (void*)MapSelect_LoadTitle, 0 }, #if PLATFORM_N64 { "64DD TEST n64dd_SetDiskVersion(1)", (void*)func_80800AD0_unknown, 0 }, @@ -554,30 +514,19 @@ void MapSelect_PrintMenu(MapSelectState* this, GfxPrint* printer) { } static const char* sLoadingMessages[] = { - // "Please wait a minute" - GFXP_HIRAGANA "シバラクオマチクダサイ", - // "Hold on a sec" - GFXP_HIRAGANA "チョット マッテネ", - // "Wait a moment" - GFXP_KATAKANA "ウェイト ア モーメント", - // "Loading" - GFXP_KATAKANA "ロード" GFXP_HIRAGANA "チュウ", - // "Now working" - GFXP_HIRAGANA "ナウ ワーキング", - // "Now creating" - GFXP_HIRAGANA "イマ ツクッテマス", - // "It's not broken" - GFXP_HIRAGANA "コショウジャナイヨ", - // "Coffee Break" - GFXP_KATAKANA "コーヒー ブレイク", - // "Please set B side" - GFXP_KATAKANA "Bメンヲセットシテクダサイ", - // "Be patient, now" - GFXP_HIRAGANA "ジット" GFXP_KATAKANA "ガマン" GFXP_HIRAGANA "ノ" GFXP_KATAKANA "コ" GFXP_HIRAGANA "デアッタ", - // "Please wait just a minute" - GFXP_HIRAGANA "イマシバラクオマチクダサイ", - // "Don't worry, don't worry. Take a break, take a break." - GFXP_HIRAGANA "アワテナイアワテナイ。ヒトヤスミヒトヤスミ。", + T(GFXP_HIRAGANA "シバラクオマチクダサイ", "Please wait a minute"), + T(GFXP_HIRAGANA "チョット マッテネ", "Hold on a sec"), + T(GFXP_KATAKANA "ウェイト ア モーメント", "Wait a moment"), + T(GFXP_KATAKANA "ロード" GFXP_HIRAGANA "チュウ", "Loading"), + T(GFXP_HIRAGANA "ナウ ワーキング", "Now working"), + T(GFXP_HIRAGANA "イマ ツクッテマス", "Now creating"), + T(GFXP_HIRAGANA "コショウジャナイヨ", "It's not broken"), + T(GFXP_KATAKANA "コーヒー ブレイク", "Coffee Break"), + T(GFXP_KATAKANA "Bメンヲセットシテクダサイ", "Please set B side"), + T(GFXP_HIRAGANA "ジット" GFXP_KATAKANA "ガマン" GFXP_HIRAGANA "ノ" GFXP_KATAKANA "コ" GFXP_HIRAGANA "デアッタ", + "Be patient, now"), + T(GFXP_HIRAGANA "イマシバラクオマチクダサイ", "Please wait just a minute"), + T(GFXP_HIRAGANA "アワテナイアワテナイ。ヒトヤスミヒトヤスミ。", "Don't worry, don't worry. Take a break, take a break."), }; void MapSelect_PrintLoadingMessage(MapSelectState* this, GfxPrint* printer) { @@ -590,8 +539,8 @@ void MapSelect_PrintLoadingMessage(MapSelectState* this, GfxPrint* printer) { } static const char* sAgeLabels[] = { - GFXP_HIRAGANA "17(ワカモノ)", // "17(young)" - GFXP_HIRAGANA "5(ワカスギ)", // "5(very young)" + T(GFXP_HIRAGANA "17(ワカモノ)", "17(young)"), + T(GFXP_HIRAGANA "5(ワカスギ)", "5(very young)"), }; void MapSelect_PrintAgeSetting(MapSelectState* this, GfxPrint* printer, s32 age) { @@ -608,48 +557,48 @@ void MapSelect_PrintCutsceneSetting(MapSelectState* this, GfxPrint* printer, u16 switch (csIndex) { case 0: - label = GFXP_HIRAGANA " ヨル " GFXP_KATAKANA "ゴロン"; + label = T(GFXP_HIRAGANA " ヨル " GFXP_KATAKANA "ゴロン", "Night"); gSaveContext.save.dayTime = CLOCK_TIME(0, 0); break; case 0x8000: // clang-format off - gSaveContext.save.dayTime = CLOCK_TIME(12, 0); label = GFXP_HIRAGANA "オヒル " GFXP_KATAKANA "ジャラ"; + gSaveContext.save.dayTime = CLOCK_TIME(12, 0); label = T(GFXP_HIRAGANA "オヒル " GFXP_KATAKANA "ジャラ", "Day"); // clang-format on break; case 0xFFF0: // clang-format off - gSaveContext.save.dayTime = CLOCK_TIME(12, 0); label = "デモ00"; + gSaveContext.save.dayTime = CLOCK_TIME(12, 0); label = T("デモ00", "Demo 00"); // clang-format on break; case 0xFFF1: - label = "デモ01"; + label = T("デモ01", "Demo 01"); break; case 0xFFF2: - label = "デモ02"; + label = T("デモ02", "Demo 02"); break; case 0xFFF3: - label = "デモ03"; + label = T("デモ03", "Demo 03"); break; case 0xFFF4: - label = "デモ04"; + label = T("デモ04", "Demo 04"); break; case 0xFFF5: - label = "デモ05"; + label = T("デモ05", "Demo 05"); break; case 0xFFF6: - label = "デモ06"; + label = T("デモ06", "Demo 06"); break; case 0xFFF7: - label = "デモ07"; + label = T("デモ07", "Demo 07"); break; case 0xFFF8: - label = "デモ08"; + label = T("デモ08", "Demo 08"); break; case 0xFFF9: - label = "デモ09"; + label = T("デモ09", "Demo 09"); break; case 0xFFFA: - label = "デモ0A"; + label = T("デモ0A", "Demo 0A"); break; }; @@ -731,8 +680,8 @@ void MapSelect_Main(GameState* thisx) { void MapSelect_Destroy(GameState* thisx) { PRINTF("%c", BEL); - // "view_cleanup will hang, so it won't be called" - PRINTF("*** view_cleanupはハングアップするので、呼ばない ***\n"); + PRINTF(T("*** view_cleanupはハングアップするので、呼ばない ***\n", + "*** view_cleanup will hang, so it won't be called ***\n")); } void MapSelect_Init(GameState* thisx) {