mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-12 01:40:47 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup post good scene names (#1452)

Browse source 
* Cleanup scene names

* missing scene id use

* rename scene draw config functions

* remove now useless comments

* format

* fix double defense/magic swapped

* try precision on "from potion shop"

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
This commit is contained in:
Dragorn421 2022-12-05 19:37:40 +01:00 • committed by GitHub
parent 8ff58118b3
commit 9bad1d108e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 227 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

149
src/overlays/gamestates/ovl_select/z_select.c
View file

@ -45,84 +45,65 @@ void MapSelect_LoadGame(MapSelectState* this, s32 entranceIndex) {
// "Translation" (Actual name)
static SceneSelectEntry sScenes[] = {
// "1: SPOT00" (Hyrule Field)
{ " 1:SPOT00", MapSelect_LoadGame, ENTR_HYRULE_FIELD_0 },
// "2: SPOT01" (Kakariko Village)
{ " 2:SPOT01", MapSelect_LoadGame, ENTR_KAKARIKO_VILLAGE_0 },
// "3: SPOT02" (Graveyard)
{ " 3:SPOT02", MapSelect_LoadGame, ENTR_GRAVEYARD_0 },
// "4: SPOT03" (Zora's River)
{ " 4:SPOT03", MapSelect_LoadGame, ENTR_ZORAS_RIVER_0 },
// "5: SPOT04" (Kokiri Forest)
{ " 5:SPOT04", MapSelect_LoadGame, ENTR_KOKIRI_FOREST_0 },
// "6: SPOT05" (Sacred Forest Meadow)
{ " 6:SPOT05", MapSelect_LoadGame, ENTR_SACRED_FOREST_MEADOW_0 },
// "7: SPOT06" (Lake Hylia)
{ " 7:SPOT06", MapSelect_LoadGame, ENTR_LAKE_HYLIA_0 },
// "8: SPOT07" (Zora's Domain)
{ " 8:SPOT07", MapSelect_LoadGame, ENTR_ZORAS_DOMAIN_0 },
// "9: SPOT08" (Zora's Fountain)
{ " 9:SPOT08", MapSelect_LoadGame, ENTR_ZORAS_FOUNTAIN_0 },
// "10: SPOT09" (Gerudo Valley)
{ "10:SPOT09", MapSelect_LoadGame, ENTR_GERUDO_VALLEY_0 },
// "11: SPOT10" (Lost Woods)
{ "11:SPOT10", MapSelect_LoadGame, ENTR_LOST_WOODS_0 },
// "12: SPOT11" (Desert Colossus)
{ "12:SPOT11", MapSelect_LoadGame, ENTR_DESERT_COLOSSUS_0 },
// "13: SPOT12" (Gerudo's Fortress)
{ "13:SPOT12", MapSelect_LoadGame, ENTR_GERUDOS_FORTRESS_0 },
// "14: SPOT13" (Haunted Wasteland)
{ "14:SPOT13", MapSelect_LoadGame, ENTR_HAUNTED_WASTELAND_0 },
// "15: SPOT15" (Hyrule Castle)
{ "15:SPOT15", MapSelect_LoadGame, ENTR_HYRULE_CASTLE_0 },
// "16: SPOT16" (Death Mountain Trail)
{ "16:SPOT16", MapSelect_LoadGame, ENTR_DEATH_MOUNTAIN_TRAIL_0 },
// "17: SPOT17" (Death Mountain Crater)
{ "17:SPOT17", MapSelect_LoadGame, ENTR_DEATH_MOUNTAIN_CRATER_0 },
// "18: SPOT18" (Goron City)
{ "18:SPOT18", MapSelect_LoadGame, ENTR_GORON_CITY_0 },
// "19: SPOT20" (Lon Lon Ranch)
{ "19:SPOT20", MapSelect_LoadGame, ENTR_LON_LON_RANCH_0 },
// "20: Chamber of Time" (Temple Of Time)
// "20: Chamber of Time"
{ "20:" GFXP_HIRAGANA "ﾄｷﾉﾏ", MapSelect_LoadGame, ENTR_TEMPLE_OF_TIME_0 },
// "21: Chamber of the Sages" (Chamber of the Sages)
// "21: Chamber of the Sages"
{ "21:" GFXP_HIRAGANA "ｹﾝｼﾞｬﾉﾏ", MapSelect_LoadGame, ENTR_CHAMBER_OF_THE_SAGES_0 },
// "22: Target Range" (Shooting Gallery)
// "22: Target Range"
{ "22:" GFXP_HIRAGANA "ｼｬﾃｷｼﾞｮｳ", MapSelect_LoadGame, ENTR_SHOOTING_GALLERY_0 },
// "23: Hyrule Garden Game" (Hyrule Garden Minigame)
// "23: Hyrule Garden Game"
{ "23:" GFXP_KATAKANA "ﾊｲﾗﾙ" GFXP_HIRAGANA "ﾆﾜ" GFXP_KATAKANA "ｹﾞｰﾑ", MapSelect_LoadGame,
ENTR_CASTLE_COURTYARD_GUARDS_DAY_0 },
// "24: Grave Dive Hole" (Grave (Redead))
// "24: Grave Dive Hole"
{ "24:" GFXP_HIRAGANA "ﾊｶｼﾀﾄﾋﾞｺﾐｱﾅ", MapSelect_LoadGame, ENTR_REDEAD_GRAVE_0 },
// "25: Grave Dive Hole 2" (Grave (Fairy's Fountain))
// "25: Grave Dive Hole 2"
{ "25:" GFXP_HIRAGANA "ﾊｶｼﾀﾄﾋﾞｺﾐｱﾅ 2", MapSelect_LoadGame, ENTR_GRAVE_WITH_FAIRYS_FOUNTAIN_0 },
// "26: Royal Family's Grave" (Royal Family's Tomb)
// "26: Royal Family's Grave"
{ "26:" GFXP_HIRAGANA "ｵｳｹ ﾉ ﾊｶｱﾅ", MapSelect_LoadGame, ENTR_ROYAL_FAMILYS_TOMB_0 },
// "27: Great Fairy's Fountain" (Great Fairy's Fountain (Upgrades))
// "27: Great Fairy's Fountain"
{ "27:" GFXP_HIRAGANA "ﾀﾞｲﾖｳｾｲﾉｲｽﾞﾐ", MapSelect_LoadGame, ENTR_GREAT_FAIRYS_FOUNTAIN_MAGIC_0 },
// "28: Fairy Dive Hole" (Fairy's Fountain (Healing Fairies))
// "28: Fairy Dive Hole"
{ "28:" GFXP_HIRAGANA "ﾄﾋﾞｺﾐ ﾖｳｾｲ ｱﾅ", MapSelect_LoadGame, ENTR_FAIRYS_FOUNTAIN_0 },
// "29: Magic Stone Fairy's Fountain" (Great Fairy's Fountain (Spells))
// "29: Magic Stone Fairy's Fountain"
{ "29:" GFXP_HIRAGANA "ﾏﾎｳｾｷ ﾖｳｾｲﾉｲｽﾞﾐ", MapSelect_LoadGame, ENTR_GREAT_FAIRYS_FOUNTAIN_SPELLS_0 },
// "30: Final Battle With Ganon" (Battle With Ganon)
// "30: Final Battle With Ganon"
{ "30:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ｻｲｼｭｳｾﾝ", MapSelect_LoadGame, ENTR_GANONS_TOWER_COLLAPSE_EXTERIOR_0 },
// "31: Hyrule Inner Garden" (Castle Courtyard)
// "31: Hyrule Inner Garden"
{ "31:" GFXP_KATAKANA "ﾊｲﾗﾙ" GFXP_HIRAGANA "ﾅｶﾆﾜ", MapSelect_LoadGame, ENTR_CASTLE_COURTYARD_ZELDA_0 },
// "32: Fishing" (Fishing Pond)
// "32: Fishing"
{ "32:" GFXP_HIRAGANA "ﾂﾘﾎﾞﾘ", MapSelect_LoadGame, ENTR_FISHING_POND_0 },
// "33: Bombchu Bowling" (Bombchu Bowling Alley)
// "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" (Guard House)
// "36: Lookout Hut"
{ "36:" GFXP_HIRAGANA "ﾐﾊﾘ ｺﾞﾔ", MapSelect_LoadGame, ENTR_MARKET_GUARD_HOUSE_0 },
// "37: Magic Potion Shop" (Granny's Potion Shop)
// "37: Magic Potion Shop"
{ "37:" GFXP_HIRAGANA "ﾏﾎｳ ﾉ ｸｽﾘﾔ", MapSelect_LoadGame, ENTR_POTION_SHOP_GRANNY_0 },
// "38: Treasure Chest Shop" (Treasure Chest Game)
// "38: Treasure Chest Shop"
{ "38:" GFXP_HIRAGANA "ﾀｶﾗﾊﾞｺﾔ", MapSelect_LoadGame, ENTR_TREASURE_BOX_SHOP_0 },
// "39: Gold Skulltula House" (House of Skulltula)
// "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 },
@ -132,98 +113,98 @@ static SceneSelectEntry sScenes[] = {
{ "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" (Link's House)
// "44: Link's House"
{ "44:" GFXP_HIRAGANA "ﾘﾝｸﾉｲｴ", MapSelect_LoadGame, ENTR_LINKS_HOUSE_0 },
// "45: Kakariko Village Row House" (Carpenter Boss's House)
// "45: Kakariko Village Row House"
{ "45:" GFXP_KATAKANA "ｶｶﾘｺ" GFXP_HIRAGANA "ﾑﾗﾉﾅｶﾞﾔ", MapSelect_LoadGame, ENTR_KAKARIKO_CENTER_GUEST_HOUSE_0 },
// "46: Back Alley House" (Back Alley House (Man in Green))
// "46: Back Alley House"
{ "46:" GFXP_HIRAGANA "ｳﾗﾛｼﾞﾉ ｲｴ", MapSelect_LoadGame, ENTR_BACK_ALLEY_HOUSE_0 },
// "47: Kokiri Village - Know-It-All Brothers' House" (Know-It-All Brothers' House)
// "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" (Twins' House)
// "48: Kokiri Village - Twins' House"
{ "48:" GFXP_HIRAGANA "ｺｷﾘﾉﾑﾗ ﾌﾀｺﾞﾉｲｴ", MapSelect_LoadGame, ENTR_TWINS_HOUSE_0 },
// "49: Kokiri Village - Mido's House" (Mido's House)
// "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" (Saria's House)
// "50: Kokiri Village - Saria's House"
{ "50:" GFXP_HIRAGANA "ｺｷﾘﾉﾑﾗ " GFXP_KATAKANA "ｻﾘｱ" GFXP_HIRAGANA "ﾉｲｴ", MapSelect_LoadGame, ENTR_SARIAS_HOUSE_0 },
// "51: Stable" (Stable)
// "51: Stable"
{ "51:" GFXP_HIRAGANA "ｳﾏｺﾞﾔ", MapSelect_LoadGame, ENTR_STABLE_0 },
// "52: Grave Keeper's House" (Gravekeeper's Hut)
// "52: Grave Keeper's House"
{ "52:" GFXP_HIRAGANA "ﾊｶﾓﾘﾉｲｴ", MapSelect_LoadGame, ENTR_GRAVEKEEPERS_HUT_0 },
// "53: Back Alley - Dog Lady's House" (Back Alley House)
// "53: Back Alley - Dog Lady's House"
{ "53:" GFXP_HIRAGANA "ｳﾗﾛｼﾞ ｲﾇｵﾊﾞｻﾝﾉｲｴ", MapSelect_LoadGame, ENTR_DOG_LADY_HOUSE_0 },
// "54: Kakariko Village - Impa's House" (Impa's House)
// "54: Kakariko Village - Impa's House"
{ "54:" GFXP_HIRAGANA "ｶｶﾘｺﾑﾗ " GFXP_KATAKANA "ｲﾝﾊﾟ" GFXP_HIRAGANA "ﾉｲｴ", MapSelect_LoadGame, ENTR_IMPAS_HOUSE_0 },
// "55: Hylia Laboratory" (Lakeside Laboratory)
// "55: Hylia Laboratory"
{ "55:" GFXP_KATAKANA "ﾊｲﾘｱ" GFXP_HIRAGANA " ｹﾝｷｭｳｼﾞｮ", MapSelect_LoadGame, ENTR_LAKESIDE_LABORATORY_0 },
// "56: Tent" (Carpenters' Tent)
// "56: Tent"
{ "56:" GFXP_KATAKANA "ﾃﾝﾄ", MapSelect_LoadGame, ENTR_CARPENTERS_TENT_0 },
// "57: Shield Shop" (Bazaar)
// "57: Shield Shop"
{ "57:" GFXP_HIRAGANA "ﾀﾃﾉﾐｾ", MapSelect_LoadGame, ENTR_BAZAAR_0 },
// "58: Kokiri Shop" (Kokiri Shop)
// "58: Kokiri Shop"
{ "58:" GFXP_HIRAGANA "ｺｷﾘｿﾞｸﾉﾐｾ", MapSelect_LoadGame, ENTR_KOKIRI_SHOP_0 },
// "59: Goron Shop" (Goron Shop)
// "59: Goron Shop"
{ "59:" GFXP_KATAKANA "ｺﾞﾛﾝ" GFXP_HIRAGANA "ﾉﾐｾ", MapSelect_LoadGame, ENTR_GORON_SHOP_0 },
// "60: Zora Shop" (Zora Shop)
// "60: Zora Shop"
{ "60:" GFXP_KATAKANA "ｿﾞｰﾗ" GFXP_HIRAGANA "ﾉﾐｾ", MapSelect_LoadGame, ENTR_ZORA_SHOP_0 },
// "61: Kakariko Village - Potion Shop" (Kakariko Potion Shop)
// "61: Kakariko Village - Potion Shop"
{ "61:" GFXP_KATAKANA "ｶｶﾘｺ" GFXP_HIRAGANA "ﾑﾗ ｸｽﾘﾔ", MapSelect_LoadGame, ENTR_POTION_SHOP_KAKARIKO_0 },
// "62: Castle Town - Potion Shop" (Market Potion Shop)
// "62: Castle Town - Potion Shop"
{ "62:" GFXP_HIRAGANA "ｼﾞｮｳｶﾏﾁ ｸｽﾘﾔ", MapSelect_LoadGame, ENTR_POTION_SHOP_MARKET_0 },
// "63: Back Alley - Night Shop" (Bombchu Shop)
// "63: Back Alley - Night Shop"
{ "63:" GFXP_HIRAGANA "ｳﾗﾛｼﾞ ﾖﾙﾉﾐｾ", MapSelect_LoadGame, ENTR_BOMBCHU_SHOP_0 },
// "64: Mask Shop" (Happy Mask Shop)
// "64: Mask Shop"
{ "64:" GFXP_HIRAGANA "ｵﾒﾝﾔ", MapSelect_LoadGame, ENTR_HAPPY_MASK_SHOP_0 },
// "65: Gerudo Training Area" (Gerudo Training Ground)
// "65: Gerudo Training Area"
{ "65:" GFXP_KATAKANA "ｹﾞﾙﾄﾞ" GFXP_HIRAGANA "ﾉｼｭｳﾚﾝｼﾞｮｳ", MapSelect_LoadGame, ENTR_GERUDO_TRAINING_GROUND_0 },
// "66: Fairy Tree Dungeon" (Inside the Deku Tree)
// "66: Fairy Tree Dungeon"
{ "66:" GFXP_HIRAGANA "ﾖｳｾｲﾉｷﾉ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", MapSelect_LoadGame, ENTR_DEKU_TREE_0 },
// "67: Fairy Tree Dungeon - Boss" (Gohma's Lair)
// "67: Fairy Tree Dungeon - Boss"
{ "67:" GFXP_HIRAGANA "ﾖｳｾｲﾉｷﾉ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", MapSelect_LoadGame, ENTR_DEKU_TREE_BOSS_0 },
// "68: Dondogo Dungeon" (Dodongo's Cavern)
// "68: Dondogo Dungeon"
{ "68:" GFXP_KATAKANA "ﾄﾞﾄﾞﾝｺﾞ ﾀﾞﾝｼﾞｮﾝ", MapSelect_LoadGame, ENTR_DODONGOS_CAVERN_0 },
// "69: Dondogo Dungeon - Boss" (King Dodongo's Lair)
// "69: Dondogo Dungeon - Boss"
{ "69:" GFXP_KATAKANA "ﾄﾞﾄﾞﾝｺﾞ ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", MapSelect_LoadGame, ENTR_DODONGOS_CAVERN_BOSS_0 },
// "70: Giant Fish Dungeon" (Inside Jabu-Jabu's Belly)
// "70: Giant Fish Dungeon"
{ "70:" GFXP_HIRAGANA "ｷｮﾀﾞｲｷﾞｮ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", MapSelect_LoadGame, ENTR_JABU_JABU_0 },
// "71: Giant Fish Dungeon - Boss" (Barinade's Lair)
// "71: Giant Fish Dungeon - Boss"
{ "71:" GFXP_HIRAGANA "ｷｮﾀﾞｲｷﾞｮ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", MapSelect_LoadGame, ENTR_JABU_JABU_BOSS_0 },
// "72: Forest Temple" (Forest Temple)
// "72: Forest Temple"
{ "72:" GFXP_HIRAGANA "ﾓﾘﾉｼﾝﾃﾞﾝ", MapSelect_LoadGame, ENTR_FOREST_TEMPLE_0 },
// "73: Forest Temple - Boss" (Phantom Ganon's Lair)
// "73: Forest Temple - Boss"
{ "73:" GFXP_HIRAGANA "ﾓﾘﾉｼﾝﾃﾞﾝ " GFXP_KATAKANA "ﾎﾞｽ", MapSelect_LoadGame, ENTR_FOREST_TEMPLE_BOSS_0 },
// "74: Dungeon Below the Well" (Bottom of the Well)
// "74: Dungeon Below the Well"
{ "74:" GFXP_HIRAGANA "ｲﾄﾞｼﾀ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", MapSelect_LoadGame, ENTR_BOTTOM_OF_THE_WELL_0 },
// "75: Dungeon Beneath the Graves" (Shadow Temple)
// "75: Dungeon Beneath the Graves"
{ "75:" GFXP_HIRAGANA "ﾊｶｼﾀ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ", MapSelect_LoadGame, ENTR_SHADOW_TEMPLE_0 },
// "76: Dungeon Beneath the Graves - Boss" (Bongo Bongo's Lair)
// "76: Dungeon Beneath the Graves - Boss"
{ "76:" GFXP_HIRAGANA "ﾊｶｼﾀ " GFXP_KATAKANA "ﾀﾞﾝｼﾞｮﾝ ﾎﾞｽ", MapSelect_LoadGame, ENTR_SHADOW_TEMPLE_BOSS_0 },
// "77: Fire Temple" (Fire Temple)
// "77: Fire Temple"
{ "77:" GFXP_HIRAGANA "ﾋﾉｼﾝﾃﾞﾝ", MapSelect_LoadGame, ENTR_FIRE_TEMPLE_0 },
// "78: Fire Temple - Boss" (Volvagia's Lair)
// "78: Fire Temple - Boss"
{ "78:" GFXP_HIRAGANA "ﾋﾉｼﾝﾃﾞﾝ " GFXP_KATAKANA "ﾎﾞｽ", MapSelect_LoadGame, ENTR_FIRE_TEMPLE_BOSS_0 },
// "79: Water Temple" (Water Temple)
// "79: Water Temple"
{ "79:" GFXP_HIRAGANA "ﾐｽﾞﾉｼﾝﾃﾞﾝ", MapSelect_LoadGame, ENTR_WATER_TEMPLE_0 },
// "80: Water Temple - Boss" (Morpha's Lair)
// "80: Water Temple - Boss"
{ "80:" GFXP_HIRAGANA "ﾐｽﾞﾉｼﾝﾃﾞﾝ " GFXP_KATAKANA "ﾎﾞｽ", MapSelect_LoadGame, ENTR_WATER_TEMPLE_BOSS_0 },
// "81: Evil Goddess Statue Dungeon" (Spirit Temple)
// "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" (Ganon's Tower)
// "84: Ganon's Tower"
{ "84:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ", MapSelect_LoadGame, ENTR_GANONS_TOWER_0 },
// "85: Ganon's Tower - Boss" (Ganondorf's Lair)
// "85: Ganon's Tower - Boss"
{ "85:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ" GFXP_KATAKANA "ﾎﾞｽ", MapSelect_LoadGame, ENTR_GANONDORF_BOSS_0 },
// "86: Ice Cavern" (Ice Cavern)
// "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" (Inside Ganon's Castle)
// "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" (Ganondorf's Death Scene & Tower Escape Exterior)
// "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)
@ -238,7 +219,7 @@ static SceneSelectEntry sScenes[] = {
// "93: Ganon's Tower Aftermath 4" (Escaping Ganon's Tower 4)
{ "93:" GFXP_KATAKANA "ｶﾞﾉﾝ" GFXP_HIRAGANA "ﾉﾄｳ ｿﾉｺﾞ 4", MapSelect_LoadGame,
ENTR_GANONS_TOWER_COLLAPSE_INTERIOR_6 },
// "94: Ganon's Basement Aftermath" (Escaping Ganon's Castle)
// "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 },
@ -280,7 +261,7 @@ static SceneSelectEntry sScenes[] = {
{ "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" (Cutscene Map)
// "115: Hyrule Cutscenes"
{ "115:" GFXP_KATAKANA "ﾊｲﾗﾙ ﾃﾞﾓ", MapSelect_LoadGame, ENTR_CUTSCENE_MAP_0 },
// "116: Special Room (Treasure Chest Warp)" (Ganondorf Test Room)
{ "116:" GFXP_HIRAGANA "ﾍﾞｯｼﾂ (ﾀｶﾗﾊﾞｺ" GFXP_KATAKANA "ﾜｰﾌﾟ)", MapSelect_LoadGame, ENTR_BESITU_0 },
@ -296,8 +277,8 @@ static SceneSelectEntry sScenes[] = {
{ "121:" GFXP_KATAKANA "ﾎﾞｽｽﾀﾛﾌｫｽ" GFXP_HIRAGANA "ﾍﾞﾔ", MapSelect_LoadGame, ENTR_SYOTES2_0 },
// "122: Stal" (Sutaru)
{ "122:Sutaru", MapSelect_LoadGame, ENTR_SUTARU_0 },
// "123: Test Area" (Shooting Gallery)
{ "123:jikkenjyou", MapSelect_LoadGame, ENTR_TEST_SYATEKIJYOU_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)