fix gaia text when ds_warp is disabled

DontBaguMe · Aug 10, 2024 · 5a9fc7c · 5a9fc7c
1 parent cd0ff17
commit 5a9fc7c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/src/iog_randomizer/gui/gui.py b/src/iog_randomizer/gui/gui.py
@@ -207,7 +207,8 @@ def get_printlevel():
             break_on_error=break_on_error.get(),
             break_on_init=break_on_init.get(),
             ingame_debug=ingame_debug.get(),
-            infinite_inventory=infinite_inventory.get()
+            infinite_inventory=infinite_inventory.get(),
+            ds_warp=ds_warp.get()
         )
 
         base_filename = generate_filename(settings, "")
@@ -675,6 +676,8 @@ def checkbox_clear_tests():
 gen_patches_toggle.set(False)
 do_tests_toggle = tkinter.BooleanVar(root)
 do_tests_toggle.set(False)
+ds_warp = tkinter.BooleanVar(root)
+ds_warp.set(False)
 
 ROM = tkinter.Entry(mainframe, width=40)
 ROM.grid(row=0, column=1)
@@ -862,6 +865,11 @@ def checkbox_clear_tests():
                     variable=do_tests_toggle,
                     command=checkbox_clear_profile).grid(row=3, column=4)
 
+tkinter.Label(devtools_frame,
+              text="DS Warp:").grid(row=4, column=0, sticky=tkinter.E)
+tkinter.Checkbutton(devtools_frame,
+                    variable=ds_warp).grid(row=4, column=1)
+
 tkinter.Button(mainframe, text='Browse...', command=find_ROM).grid(row=0, column=2)
 tkinter.Button(seed_frame, text='Random Seed', command=generate_seed).pack(side='left')
 tkinter.Button(mainframe, text='Generate ROM', command=generate_ROM).grid(row=1, column=2)

diff --git a/src/iog_randomizer/randomizer/iogr.asr b/src/iog_randomizer/randomizer/iogr.asr
@@ -9736,7 +9736,7 @@ if !SettingDsWarp == 1
 db "Warp to a Dark Space"
 else
 db "Return to "
-db $04 : dl TextStartDsNameInclude : dw $0bfa
+db $CD : dl TextStartDsNameInclude
 endif
 db "?",$CB
 db "_No",$CB
@@ -10812,7 +10812,11 @@ db $03    ; 4 difficulty levels available
 
 ; Upon starting a new game, set IOGR flags.
 org $8be515
+if !StartAtWarpLocation == 1
 jsl LR_WarpToStart
+else
+jsl LR_WarpToSchool
+endif
 jmp EIogrGameInitFlagSetter
 
 ; To support button mappings, IOG stores a dynamic bitmask for each SNES button, and the mask determines functionality;

diff --git a/src/iog_randomizer/randomizer/iogr_code_overflow.asr b/src/iog_randomizer/randomizer/iogr_code_overflow.asr
@@ -2505,13 +2505,13 @@ lda.w #BankOf(TableDsMapSpawnData) : sta $0af2
 bra .Done
 
 LR_WarpToStart:
-if !StartAtWarpLocation == 1 || !SettingDsWarp == 0
 lda.w #!StartDsIndex : sta $0bf6
-  jsl LR_WarpToDsIndexAWithForceSetDeathWarp
-else
+jsl LR_WarpToDsIndexAWithForceSetDeathWarp
+rtl
+
+LR_WarpToSchool:
 stz $0bf6
 cop #$26 : db $08 : dw $0050, $00a0 : db $80, $00, $12
-endif
 rtl
 
 

diff --git a/src/iog_randomizer/randomizer/iogr_dialogue_overflow.asr b/src/iog_randomizer/randomizer/iogr_dialogue_overflow.asr
@@ -961,8 +961,10 @@ db $00
 table "table_dialogue.txt",rtl
 
 TextStartDsNameInclude:
-{
+db $C5 : dw .Pointers, $0bfa
+db $ca
 .Pointers:
+{
 dw .Cape
 dw .Prison
 dw .EdDgFinal