summaryrefslogtreecommitdiff
path: root/src/fileselect.S
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/fileselect.S12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/fileselect.S b/src/fileselect.S
index 20acc3e..4d6ce85 100644
--- a/src/fileselect.S
+++ b/src/fileselect.S
@@ -73,6 +73,14 @@ DFNiceWorldName:
# Savefile is in r31
# World Name field is in r20
+ lhz r4, 0x734(r31)
+ cmpwi r4, 1000
+ blt useNormalWName
+ lis r4, WarpZoneName@h
+ ori r4, r4, WarpZoneName@l
+ b chosenWName
+
+useNormalWName:
lis r4, ConvertedWorldName@h
ori r4, r4, ConvertedWorldName@l
mr r3, r4
@@ -86,6 +94,7 @@ convWNameLoop:
addi r5, r5, 1
bdnz convWNameLoop
+chosenWName:
mr r3, r20
li r5, 0
lwz r12, 0(r3)
@@ -360,6 +369,9 @@ ConvertedWorldName:
.short 0,0,0,0,0,0,0,0,0,0,0,0 # 12
.short 0,0,0,0,0,0,0,0 # 8
+WarpZoneName:
+.short 'W','a','r','p',' ','Z','o','n','e',0
+
.align 4
DefaultSavefileInfoData:
.string "Yoshi's Island" #15