Skip to content

Instantly share code, notes, and snippets.

@krzys-h

krzys-h/deltarune-switch.patch

Last active March 1, 2019 22:36
Show Gist options
  • Save krzys-h/e27668873c4eb59e946c33fe137d0c1f to your computer and use it in GitHub Desktop.
Save krzys-h/e27668873c4eb59e946c33fe137d0c1f to your computer and use it in GitHub Desktop.
Download ZIP
Deltarune Switch release diff
Raw
deltarune-switch.patch
diff --git a/decomp_normal/gml_Object_DEVICE_CONTACT_Step_0.gml b/decomp_switch/gml_Object_DEVICE_CONTACT_Step_0.gml
index e58927a..9b72f5e 100755
--- a/decomp_normal/gml_Object_DEVICE_CONTACT_Step_0.gml
+++ b/decomp_switch/gml_Object_DEVICE_CONTACT_Step_0.gml
@@ -713,14 +713,20 @@ if (self.EVENT == 67)
{
global.name = self.CHOICE.NAMESTRING
self.FN_2 = global.name
- if (global.lang == "ja")
+ if (self.FN_2 == "GASTER")
+ _temp_var = 1
+ else
{
- if (self.FN_2 == "ＧＡＳＴＥＲ")
- game_restart()
- self.FN_2 = string_to_hiragana(self.FN_2)
+ if (self.FN_2 == "がすたー")
+ _temp_var = 1
+ else
+ _temp_var = (self.FN_2 == "ガスター")
}
- if (self.FN_2 == scr_84_get_lang_string("DEVICE_CONTACT_slash_Step_0_gml_714_0"))
+ if _temp_var
+ {
+ snd_free_all()
game_restart()
+ }
}
else
{
@@ -786,14 +792,20 @@ if (self.EVENT == 71)
{
global.truename = self.CHOICE.NAMESTRING
self.FN_3 = global.truename
- if (global.lang == "ja")
- self.FN_3 = string_to_hiragana(self.FN_3)
- if (self.FN_3 == scr_84_get_lang_string("DEVICE_CONTACT_slash_Step_0_gml_770_0"))
+ if (self.FN_3 == "GASTER")
_temp_var = 1
else
- _temp_var = (self.FN_3 == "ＧＡＳＴＥＲ")
+ {
+ if (self.FN_3 == "がすたー")
+ _temp_var = 1
+ else
+ _temp_var = (self.FN_3 == "ガスター")
+ }
if _temp_var
- game_end()
+ {
+ snd_free_all()
+ game_restart()
+ }
}
else
{
diff --git a/decomp_normal/gml_Object_DEVICE_FAILURE_Create_0.gml b/decomp_switch/gml_Object_DEVICE_FAILURE_Create_0.gml
index 6c48940..1b5f68d 100755
--- a/decomp_normal/gml_Object_DEVICE_FAILURE_Create_0.gml
+++ b/decomp_switch/gml_Object_DEVICE_FAILURE_Create_0.gml
@@ -11,3 +11,6 @@ self.FADEFACTOR = 0
self.WHITEFADE = 0
self.FADEUP = 0
self.DARK_WAIT = 0
+self.restart = 0
+self.restart_timer = 0
+self.gamepad_controls = @@NewGMLArray@@(32769, 32770, 32771, 32772, 32773, 32775, 32774, 32776, 32777, 32778, 32779, 32780, 32781, 32782, 32783, 32784)
diff --git a/decomp_normal/gml_Object_DEVICE_FAILURE_Step_0.gml b/decomp_switch/gml_Object_DEVICE_FAILURE_Step_0.gml
index 4219844..6031342 100755
--- a/decomp_normal/gml_Object_DEVICE_FAILURE_Step_0.gml
+++ b/decomp_switch/gml_Object_DEVICE_FAILURE_Step_0.gml
@@ -121,9 +121,66 @@ if (self.EVENT == 28)
{
self.DARK_WAIT = (self.DARK_WAIT + 1)
if (self.DARK_WAIT >= 2040)
- game_end()
+ ossafe_game_end()
if (! snd_is_playing(global.currentsong[1]))
- game_end()
+ ossafe_game_end()
+ if (self.os_type == os_ps4)
+ _temp_var = 1
+ else
+ _temp_var = (self.os_type == os_switch)
+ if _temp_var
+ {
+ if (self.DARK_WAIT >= 90)
+ _temp_var = (! self.restart)
+ else
+ _temp_var = 0
+ if _temp_var
+ {
+ local.i = 0
+ while(true)
+ {
+ if (local.i < array_length_1d(self.gamepad_controls))
+ {
+ if gamepad_button_check_pressed(obj_gamecontroller.gamepad_id, self.gamepad_controls[local.i])
+ {
+ if (self.gamepad_controls[local.i] == global.button0)
+ _temp_var = 1
+ else
+ {
+ if (self.gamepad_controls[local.i] == global.button1)
+ _temp_var = 1
+ else
+ {
+ if (self.gamepad_controls[local.i] == global.button2)
+ _temp_var = 1
+ else
+ _temp_var = (self.gamepad_controls[local.i] == 32775)
+ }
+ }
+ if _temp_var
+ break
+ else
+ {
+ local.i = (local.i + 1)
+ continue
+ }
+ }
+ else
+ {
+ local.i = (local.i + 1)
+ continue
+ }
+ }
+ break
+ }
+ }
+ if self.restart
+ {
+ self.restart_timer = (self.restart_timer + 1)
+ if (self.restart_timer >= 100)
+ ossafe_game_end()
+ }
+ }
}
if (self.EVENT >= 0)
_temp_var = (self.EVENT <= 4)
diff --git a/decomp_normal/gml_Object_DEVICE_MENU_Create_0.gml b/decomp_switch/gml_Object_DEVICE_MENU_Create_0.gml
index 8978e27..27512d6 100755
--- a/decomp_normal/gml_Object_DEVICE_MENU_Create_0.gml
+++ b/decomp_switch/gml_Object_DEVICE_MENU_Create_0.gml
@@ -1,9 +1,5 @@
self.TYPE = 0
-if file_exists("filech1_3")
- self.TYPE = 1
-if file_exists("filech1_4")
- self.TYPE = 1
-if file_exists("filech1_5")
+if (global.game_won == 1)
self.TYPE = 1
if (self.TYPE == 0)
{
@@ -70,4 +66,5 @@ self.TWOBUFFER = 0
self.THREAT = 0
self.TEMPMESSAGE = " "
self.MESSAGETIMER = 0
+self.version_text = "1.01"
scr_84_load_ini()
diff --git a/decomp_normal/gml_Object_DEVICE_MENU_Draw_0.gml b/decomp_switch/gml_Object_DEVICE_MENU_Draw_0.gml
index a76587c..0dc49c0 100755
--- a/decomp_normal/gml_Object_DEVICE_MENU_Draw_0.gml
+++ b/decomp_switch/gml_Object_DEVICE_MENU_Draw_0.gml
@@ -319,6 +319,21 @@ if (self.MENU_NO >= 0)
draw_set_color(self.COL_B)
draw_text_shadow(190, 190, self.LANGUAGETEXT)
}
+ draw_set_font(fnt_main)
+ if (self.TYPE == 1)
+ {
+ draw_set_alpha(0.4)
+ draw_set_color(0xFFFFFF)
+ draw_text_transformed(195, 230, (("DELTARUNE " + self.version_text) + " (C) Toby Fox 2018-2019 "), 0.5, 0.5, 0)
+ }
+ else
+ {
+ draw_set_color(self.COL_A)
+ draw_text_transformed(248, 230, self.version_text, 0.5, 0.5, 0)
+ draw_set_color(0xFFFFFF)
+ }
+ scr_84_set_draw_font("main")
+ draw_set_alpha(1)
if (self.MESSAGETIMER <= 0)
{
if (self.TYPE == 0)
diff --git a/decomp_normal/gml_Object_DEVICE_MENU_Other_15.gml b/decomp_switch/gml_Object_DEVICE_MENU_Other_15.gml
index d7a70b8..9d75fd4 100755
--- a/decomp_normal/gml_Object_DEVICE_MENU_Other_15.gml
+++ b/decomp_switch/gml_Object_DEVICE_MENU_Other_15.gml
@@ -1,19 +1,57 @@
-self.iniwrite = ini_open("dr.ini")
+self.iniwrite = ossafe_ini_open("dr.ini")
self._NEWNAME = ini_read_string(("G" + string(self.MENUCOORD[2])), "Name", "------")
self._NEWTIME = ini_read_real(("G" + string(self.MENUCOORD[2])), "Time", 0)
self._NEWROOM = ini_read_real(("G" + string(self.MENUCOORD[2])), "Room", 0)
self._NEWLEVEL = ini_read_real(("G" + string(self.MENUCOORD[2])), "Level", 0)
+self._NEWINITLANG = ini_read_real(("G" + string(self.MENUCOORD[2])), "InitLang", 0)
ini_write_string(("G" + string(self.MENUCOORD[3])), "Name", self._NEWNAME)
ini_write_real(("G" + string(self.MENUCOORD[3])), "Time", self._NEWTIME)
ini_write_real(("G" + string(self.MENUCOORD[3])), "Room", self._NEWROOM)
ini_write_real(("G" + string(self.MENUCOORD[3])), "Level", self._NEWLEVEL)
-ini_close()
+ini_write_real(("G" + string(self.MENUCOORD[3])), "InitLang", self._NEWINITLANG)
+ossafe_ini_close()
self.FILE[self.MENUCOORD[3]] = 1
self.PLACE[self.MENUCOORD[3]] = self.PLACE[self.MENUCOORD[2]]
self.TIME[self.MENUCOORD[3]] = self.TIME[self.MENUCOORD[2]]
self.NAME[self.MENUCOORD[3]] = self.NAME[self.MENUCOORD[2]]
self.LEVEL[self.MENUCOORD[3]] = self.LEVEL[self.MENUCOORD[2]]
+self.INITLANG[self.MENUCOORD[3]] = self.INITLANG[self.MENUCOORD[2]]
self.TIME_STRING[self.MENUCOORD[3]] = self.TIME_STRING[self.MENUCOORD[2]]
-file_copy(("filech1_" + string(self.MENUCOORD[2])), ("filech1_" + string(self.MENUCOORD[3])))
-if file_exists((("config_" + string(self.MENUCOORD[2])) + ".ini"))
- file_copy((("config_" + string(self.MENUCOORD[2])) + ".ini"), (("config_" + string(self.MENUCOORD[3])) + ".ini"))
+local.file_to_copy = ds_map_find_value(global.savedata, ("filech1_" + string(self.MENUCOORD[2])))
+local.new_filename = ("filech1_" + string(self.MENUCOORD[3]))
+local.new_file = ossafe_file_text_open_write(local.new_filename)
+ds_map_set(local.new_file, "data", local.file_to_copy)
+ossafe_file_text_close(local.new_file)
+ossafe_savedata_save()
+if ossafe_file_exists((("config_" + string(self.MENUCOORD[2])) + ".ini"))
+{
+ ossafe_ini_open((("config_" + string(self.MENUCOORD[2])) + ".ini"))
+ local.copy_border = ini_read_string("BORDER", "TYPE", global.screen_border_id)
+ local.copy_controls_list = @@NewGMLArray@@()
+ local.i = 0
+ while(true)
+ {
+ if (local.i < 10)
+ {
+ local.copy_controls_list[local.i] = ini_read_real("GAMEPAD_CONTROLS", string(local.i), global.input_g[local.i])
+ local.i = (local.i + 1)
+ continue
+ }
+ break
+ }
+ ossafe_ini_close()
+ ossafe_ini_open((("config_" + string(self.MENUCOORD[3])) + ".ini"))
+ ini_write_string("BORDER", "TYPE", local.copy_border)
+ local.i = 0
+ while(true)
+ {
+ if (local.i < 10)
+ {
+ ini_write_real("GAMEPAD_CONTROLS", string(local.i), local.copy_controls_list[local.i])
+ local.i = (local.i + 1)
+ continue
+ }
+ break
+ }
+ ossafe_ini_close()
+}
diff --git a/decomp_normal/gml_Object_DEVICE_MENU_Step_0.gml b/decomp_switch/gml_Object_DEVICE_MENU_Step_0.gml
index 1141598..792d295 100755
--- a/decomp_normal/gml_Object_DEVICE_MENU_Step_0.gml
+++ b/decomp_switch/gml_Object_DEVICE_MENU_Step_0.gml
@@ -48,12 +48,10 @@ if _temp_var
global.filechoice = self.MENUCOORD[0]
scr_windowcaption(scr_84_get_lang_string("DEVICE_MENU_slash_Step_0_gml_35_0"))
snd_free_all()
- self.f = instance_create(0, 0, obj_persistentfadein)
- self.f.image_xscale = 1000
- self.f.image_yscale = 1000
- if file_exists((("config_" + string(global.filechoice)) + ".ini"))
+ obj_loadscreen.loaded = 1
+ if ossafe_file_exists((("config_" + string(global.filechoice)) + ".ini"))
{
- ini_open((("config_" + string(global.filechoice)) + ".ini"))
+ ossafe_ini_open((("config_" + string(global.filechoice)) + ".ini"))
self.i = 0
while(true)
{
@@ -80,9 +78,19 @@ if _temp_var
}
break
}
- ini_close()
+ global.button0 = global.input_g[4]
+ global.button1 = global.input_g[5]
+ global.button2 = global.input_g[6]
+ global.screen_border_id = ini_read_string("BORDER", "TYPE", "Dynamic")
+ if (global.screen_border_id == "None")
+ _temp_var = 1
+ else
+ _temp_var = (global.screen_border_id == "なし")
+ local._disable_border = _temp_var
+ scr_enable_screen_border((! local._disable_border))
+ ossafe_ini_close()
+ ossafe_savedata_save()
}
- scr_load()
}
if (self.FILE[self.MENUCOORD[0]] == 0)
{
@@ -161,16 +169,17 @@ if _temp_var
self.PLACE[self.MENUCOORD[5]] = "------------"
self.LEVEL[self.MENUCOORD[5]] = 0
self.TIME_STRING[self.MENUCOORD[5]] = "--:--"
- file_delete(("filech1_" + string(self.MENUCOORD[5])))
- self.iniwrite = ini_open("dr.ini")
+ ossafe_file_delete(("filech1_" + string(self.MENUCOORD[5])))
+ self.iniwrite = ossafe_ini_open("dr.ini")
ini_write_string(("G" + string(self.MENUCOORD[5])), "Name", "[EMPTY]")
ini_write_real(("G" + string(self.MENUCOORD[5])), "Level", 0)
ini_write_real(("G" + string(self.MENUCOORD[5])), "Love", 0)
ini_write_real(("G" + string(self.MENUCOORD[5])), "Time", 0)
ini_write_real(("G" + string(self.MENUCOORD[5])), "Room", 0)
- ini_close()
- if file_exists((("config_" + string(self.MENUCOORD[5])) + ".ini"))
- file_delete((("config_" + string(self.MENUCOORD[5])) + ".ini"))
+ ossafe_ini_close()
+ ossafe_savedata_save()
+ if ossafe_file_exists((("config_" + string(self.MENUCOORD[5])) + ".ini"))
+ ossafe_file_delete((("config_" + string(self.MENUCOORD[5])) + ".ini"))
self.TEMPCOMMENT = scr_84_get_lang_string("DEVICE_MENU_slash_Step_0_gml_126_0")
if (self.TYPE == 1)
self.TEMPCOMMENT = scr_84_get_lang_string("DEVICE_MENU_slash_Step_0_gml_127_0")
diff --git a/decomp_normal/gml_Object_PROCESS_DOG_Create_0.gml b/decomp_switch/gml_Object_PROCESS_DOG_Create_0.gml
index 9fae92c..2229dee 100755
--- a/decomp_normal/gml_Object_PROCESS_DOG_Create_0.gml
+++ b/decomp_switch/gml_Object_PROCESS_DOG_Create_0.gml
@@ -1,3 +1,4 @@
+global.currentroom = self.room
self.visible = 1
self.image_xscale = 2
self.image_yscale = 2
@@ -7,3 +8,6 @@ self.SONG_THAT_EMERGES_FROM_A_SLEEPING_DOG = snd_init("dogcheck.ogg")
mus_loop_ext(self.SONG_THAT_EMERGES_FROM_A_SLEEPING_DOG, 1, (0.9 + random(0.1)))
self.image_speed = 0.05
window_set_caption(scr_84_get_lang_string("PROCESS_DOG_slash_Create_0_gml_12_0"))
+self.buffer = 0
+self.start_timer = 0
+self.restart_timer = 0
diff --git a/decomp_switch/gml_Object_PROCESS_DOG_Step_0.gml b/decomp_switch/gml_Object_PROCESS_DOG_Step_0.gml
new file mode 100755
index 0000000..5bb8a76
--- /dev/null
+++ b/decomp_switch/gml_Object_PROCESS_DOG_Step_0.gml
@@ -0,0 +1,23 @@
+self.buffer = (self.buffer + 1)
+if (self.buffer < 60)
+ return
+if button1_p()
+ _temp_var = (! self.start_timer)
+else
+ _temp_var = 0
+if _temp_var
+{
+ self.fadeout = instance_create(0, 0, obj_fadeout)
+ with(self.fadeout)
+ {
+ self.fadespeed = 0.02
+ }
+ self.start_timer = 1
+}
+if self.start_timer
+{
+ snd_free_all()
+ self.restart_timer = (self.restart_timer + 1)
+}
+if (self.restart_timer == 200)
+ game_restart()
diff --git a/decomp_normal/gml_Object_obj_84_lang_helper_Create_0.gml b/decomp_switch/gml_Object_obj_84_lang_helper_Create_0.gml
index 1b4d415..7575a63 100755
--- a/decomp_normal/gml_Object_obj_84_lang_helper_Create_0.gml
+++ b/decomp_switch/gml_Object_obj_84_lang_helper_Create_0.gml
@@ -9,7 +9,6 @@ while(true)
local.__els = layer_get_all_elements(local.__layer_id)
local.__numels = array_length_1d(local.__els)
local.__name = layer_get_name(local.__layer_id)
- show_debug_message((((((("layer: " + string(local.__i)) + " ") + local.__name) + "[") + string(local.__numels)) + "]"))
local.__pos = string_pos("_lang_", local.__name)
if (local.__pos > 0)
_temp_var = (string_length(local.__name) > (local.__pos + 8))
@@ -31,9 +30,6 @@ while(true)
local.__eltype = layer_get_element_type(local.__id)
if (local.__eltype == 2)
{
- local.__inst = layer_instance_get_instance(local.__id)
- local.__name = object_get_name(local.__inst.object_index)
- show_debug_message((((" instance:" + string(local.__j)) + ": ") + local.__name))
}
else
{
@@ -69,7 +65,8 @@ while(true)
else
{
if (local.__eltype == 7)
- show_debug_message((" tile: " + string(local.__j)))
+ {
+ }
else
show_debug_message((" unknown: " + string(local.__j)))
}
@@ -95,9 +92,6 @@ while(true)
local.__eltype = layer_get_element_type(local.__id)
if (local.__eltype == 2)
{
- local.__inst = layer_instance_get_instance(local.__id)
- local.__name = object_get_name(local.__inst.object_index)
- show_debug_message((((" instance:" + string(local.__j)) + ": ") + local.__name))
}
else
{
@@ -133,7 +127,8 @@ while(true)
else
{
if (local.__eltype == 7)
- show_debug_message((" tile: " + string(local.__j)))
+ {
+ }
else
show_debug_message((" unknown: " + string(local.__j)))
}
diff --git a/decomp_normal/gml_Object_obj_battlealphaer_Create_0.gml b/decomp_switch/gml_Object_obj_battlealphaer_Create_0.gml
index 1af2a1c..fb02c10 100755
--- a/decomp_normal/gml_Object_obj_battlealphaer_Create_0.gml
+++ b/decomp_switch/gml_Object_obj_battlealphaer_Create_0.gml
@@ -1,4 +1,4 @@
-global.charinstance[0] = 326
+global.charinstance[0] = 327
global.charinstance[1] = global.cinstance[0]
global.charinstance[2] = global.cinstance[1]
self.battlealpha = 0
diff --git a/decomp_normal/gml_Object_obj_battlecontroller_Step_0.gml b/decomp_switch/gml_Object_obj_battlecontroller_Step_0.gml
index 538c3ff..90b81e8 100755
--- a/decomp_normal/gml_Object_obj_battlecontroller_Step_0.gml
+++ b/decomp_switch/gml_Object_obj_battlecontroller_Step_0.gml
@@ -997,7 +997,10 @@ if (global.myfight == 0)
if (global.canact[self.thisenemy][self.actcoord] == 0)
{
if (self.actcoord > 0)
+ {
global.bmenucoord[9][global.charturn] = (global.bmenucoord[9][global.charturn] - 1)
+ self.actcoord = (self.actcoord - 1)
+ }
}
self.i = (self.i + 1)
continue
diff --git a/decomp_normal/gml_Object_obj_boxpuzzle_event_Step_0.gml b/decomp_switch/gml_Object_obj_boxpuzzle_event_Step_0.gml
index 4fc5207..0050a3b 100755
--- a/decomp_normal/gml_Object_obj_boxpuzzle_event_Step_0.gml
+++ b/decomp_switch/gml_Object_obj_boxpuzzle_event_Step_0.gml
@@ -459,12 +459,12 @@ if (self.con == 34)
self.event = 1
}
self.con = 35
- scr_tempsave()
if (global.plot < 50)
global.plot = 50
global.facing = 0
global.interact = 0
self.leavecon = 0
+ scr_tempsave()
}
if (self.con == 50)
{
diff --git a/decomp_normal/gml_Object_obj_carcutscene_Create_0.gml b/decomp_switch/gml_Object_obj_carcutscene_Create_0.gml
index 2da0e5f..23f2947 100755
--- a/decomp_normal/gml_Object_obj_carcutscene_Create_0.gml
+++ b/decomp_switch/gml_Object_obj_carcutscene_Create_0.gml
@@ -36,7 +36,7 @@ else
self.con = 1
self.alarm[4] = 30
global.interact = 1
- self.k = 326
+ self.k = 327
self.t = scr_marker(195, 240, spr_toriel_lt)
with(self.t)
{
diff --git a/decomp_normal/gml_Object_obj_chain_of_hell_Step_0.gml b/decomp_switch/gml_Object_obj_chain_of_hell_Step_0.gml
index 174ecc0..fee4eae 100755
--- a/decomp_normal/gml_Object_obj_chain_of_hell_Step_0.gml
+++ b/decomp_switch/gml_Object_obj_chain_of_hell_Step_0.gml
@@ -2,15 +2,6 @@ if (self.chaincon == 0)
self.chaincon = 1
if (self.chaincon == 1)
{
- self.mypath1 = self.path_hellchain_hor1
- self.mypath2 = self.path_hellchain_hor2
- if (self.type == 1)
- {
- self.mypath1 = self.path_hellchain_a
- self.mypath2 = self.path_hellchain_b
- self.factor = 8
- }
- path_start(self.mypath1, self.maxspeed, 0, 0)
self.chaincon = 2
self.chaintimer = 0
}
diff --git a/decomp_normal/gml_Object_obj_checkers_enemy_Step_0.gml b/decomp_switch/gml_Object_obj_checkers_enemy_Step_0.gml
index b07051a..4fb091f 100755
--- a/decomp_normal/gml_Object_obj_checkers_enemy_Step_0.gml
+++ b/decomp_switch/gml_Object_obj_checkers_enemy_Step_0.gml
@@ -263,6 +263,8 @@ if (self.scon == 6)
self.milktimer = 0
global.turntimer = 0
}
+ else
+ global.turntimer = 999
}
if (global.myfight == 3)
{
diff --git a/decomp_normal/gml_Object_obj_credits_Step_0.gml b/decomp_switch/gml_Object_obj_credits_Step_0.gml
index cb0293b..a4cca8c 100755
--- a/decomp_normal/gml_Object_obj_credits_Step_0.gml
+++ b/decomp_switch/gml_Object_obj_credits_Step_0.gml
@@ -93,12 +93,15 @@ if (self.timer == 573)
self.linecolor[2] = 16777215
self.linecolor[3] = 12632256
self.linecolor[4] = 16777215
- self.line[3] = "Localization Programming"
- self.line[4] = "Gregg Tavares"
+ self.line[3] = "Additional Programming"
+ self.line[4] = "Gregg Tavares (PC)"
+ self.line[5] = "Sarah O'Donnell (Console)"
if (global.lang == "ja")
{
self.line[0] = "ローカライズプロデューサー"
- self.line[3] = "ローカライズプログラミング"
+ self.line[3] = "追加プログラミング"
+ self.line[4] = "Gregg Tavares (PC版)"
+ self.line[5] = "Sarah O'Donnell (コンシューマー版)"
}
self.lyric = scr_84_get_lang_string("obj_credits_slash_Step_0_gml_108_0")
}
@@ -114,6 +117,7 @@ if (self.timer == 668)
self.line[2] = scr_84_get_lang_string("obj_credits_slash_Step_0_gml_121_0")
self.line[3] = "Snowdrake & Monster Kid Design"
self.line[4] = "Magnolia Porter"
+ self.line[5] = ""
self.linecolor[0] = 12632256
self.linecolor[1] = 12632256
self.linecolor[2] = 16777215
@@ -204,4 +208,4 @@ if (self.timer >= 1300)
if (self.timer == 1660)
snd_free(self.song0)
if (self.timer == 1680)
- game_end()
+ ossafe_game_end()
diff --git a/decomp_normal/gml_Object_obj_darkcastle_event_Step_0.gml b/decomp_switch/gml_Object_obj_darkcastle_event_Step_0.gml
index c642271..23351ff 100755
--- a/decomp_normal/gml_Object_obj_darkcastle_event_Step_0.gml
+++ b/decomp_switch/gml_Object_obj_darkcastle_event_Step_0.gml
@@ -1001,10 +1001,10 @@ else
self.y = (self.y - 12)
}
self.con = 109
- scr_tempsave()
global.currentsong[1] = mus_loop(global.currentsong[0])
global.plot = 30
global.interact = 0
+ scr_tempsave()
}
}
if (self.rflip == 1)
diff --git a/decomp_normal/gml_Object_obj_darkcontroller_Create_0.gml b/decomp_switch/gml_Object_obj_darkcontroller_Create_0.gml
index 1defb92..a481857 100755
--- a/decomp_normal/gml_Object_obj_darkcontroller_Create_0.gml
+++ b/decomp_switch/gml_Object_obj_darkcontroller_Create_0.gml
@@ -8,6 +8,7 @@ self.yy = __view_get(e__VW.YView, 0)
global.fighting = 0
self.movenoise = 0
self.selectnoise = 0
+self.cancelnoise = 0
self.onebuffer = 0
self.twobuffer = 0
self.threebuffer = 0
@@ -17,6 +18,7 @@ self.hold_up = 0
self.hold_down = 0
self.dograndom = 0
self.atalk = 0
+self.deschaver = 0
self.bcolor = merge_color(0x800080, 0x000000, 0.7)
self.bcolor = merge_color(self.bcolor, 0x404040, 0.5)
self.chartotal = 0
@@ -33,51 +35,51 @@ self.mmy[1] = 0
self.mmy[2] = 0
global.submenu = 0
global.charselect = -1
-self.i = 0
+local.i = 0
while(true)
{
- if (self.i < 36)
+ if (local.i < 36)
{
- global.submenucoord[self.i] = 0
- self.i = (self.i + 1)
+ global.submenucoord[local.i] = 0
+ local.i = (local.i + 1)
continue
}
break
}
global.cinstance[0] = 4343434343
global.cinstance[1] = 343434343434
-self.i = 0
+local.i = 0
while(true)
{
- if (self.i < 3)
+ if (local.i < 3)
{
- global.faceaction[self.i] = 0
- if (global.char[self.i] != 0)
+ global.faceaction[local.i] = 0
+ if (global.char[local.i] != 0)
self.chartotal = (self.chartotal + 1)
- if (global.char[self.i] == 1)
+ if (global.char[local.i] == 1)
{
self.havechar[0] = 1
- self.charpos[0] = self.i
+ self.charpos[0] = local.i
}
- if (global.char[self.i] == 2)
+ if (global.char[local.i] == 2)
{
self.havechar[1] = 1
- self.charpos[1] = self.i
- if (self.i > 0)
+ self.charpos[1] = local.i
+ if (local.i > 0)
{
- global.cinstance[(self.i - 1)] = instance_create((obj_mainchara.x - 6), (obj_mainchara.y - 16), obj_caterpillarchara)
- global.cinstance[(self.i - 1)].target = (self.i * 12)
+ global.cinstance[(local.i - 1)] = instance_create((obj_mainchara.x - 6), (obj_mainchara.y - 16), obj_caterpillarchara)
+ global.cinstance[(local.i - 1)].target = (local.i * 12)
}
}
- if (global.char[self.i] == 3)
+ if (global.char[local.i] == 3)
{
self.havechar[2] = 1
- self.charpos[2] = self.i
- if (self.i > 0)
+ self.charpos[2] = local.i
+ if (local.i > 0)
{
- global.cinstance[(self.i - 1)] = instance_create((obj_mainchara.x - 4), (obj_mainchara.y - 12), obj_caterpillarchara)
- global.cinstance[(self.i - 1)].target = (self.i * 12)
- with(global.cinstance[(self.i - 1)])
+ global.cinstance[(local.i - 1)] = instance_create((obj_mainchara.x - 4), (obj_mainchara.y - 12), obj_caterpillarchara)
+ global.cinstance[(local.i - 1)].target = (local.i * 12)
+ with(global.cinstance[(local.i - 1)])
{
self.usprite = 206
self.dsprite = 204
@@ -86,7 +88,7 @@ while(true)
}
}
}
- self.i = (self.i + 1)
+ local.i = (local.i + 1)
continue
}
break
@@ -102,3 +104,68 @@ self.curvol = 1
self.hpcolor[0] = 16776960
self.hpcolor[1] = 16711935
self.hpcolor[2] = 65280
+self.gamepad_controls = @@NewGMLArray@@(32769, 32770, 32771, 32772, 32773, 32775, 32774, 32776, 32777, 32778, 32779, 32780, 32781, 32782, 32783, 32784)
+if (global.lang == "en")
+ _temp_var = "Border"
+else
+ _temp_var = "フレーム"
+self.border_text = _temp_var
+if (global.lang == "en")
+ _temp_var = @@NewGMLArray@@("Dynamic", "Simple", "None")
+else
+ _temp_var = @@NewGMLArray@@("ダイナミック", "シンプル", "なし")
+self.border_options = _temp_var
+local.border_options_en = @@NewGMLArray@@("Dynamic", "Simple", "None")
+local.border_options_ja = @@NewGMLArray@@("ダイナミック", "シンプル", "なし")
+if (global.lang == "ja")
+{
+ local.i = 0
+ while(true)
+ {
+ if (local.i < array_length_1d(local.border_options_en))
+ {
+ if (local.border_options_en[local.i] == global.screen_border_id)
+ break
+ else
+ {
+ local.i = (local.i + 1)
+ continue
+ }
+ }
+ break
+ }
+}
+else
+{
+ local.i = 0
+ while(true)
+ {
+ if (local.i < array_length_1d(local.border_options_ja))
+ {
+ if (local.border_options_ja[local.i] == global.screen_border_id)
+ break
+ else
+ {
+ local.i = (local.i + 1)
+ continue
+ }
+ }
+ break
+ }
+}
+self.selected_border = 0
+local.i = 0
+while(true)
+{
+ if (local.i < array_length_1d(self.border_options))
+ {
+ if (self.border_options[local.i] == global.screen_border_id)
+ break
+ else
+ {
+ local.i = (local.i + 1)
+ continue
+ }
+ }
+ break
+}
diff --git a/decomp_normal/gml_Object_obj_darkcontroller_Draw_0.gml b/decomp_switch/gml_Object_obj_darkcontroller_Draw_0.gml
index 3a5114c..950f53f 100755
--- a/decomp_normal/gml_Object_obj_darkcontroller_Draw_0.gml
+++ b/decomp_switch/gml_Object_obj_darkcontroller_Draw_0.gml
@@ -19,22 +19,22 @@ if (self.drawchar == 1)
self.msprite[2] = spr_darktalkbt
self.msprite[3] = spr_darktechbt
self.msprite[4] = spr_darkconfigbt
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < 5)
+ if (local.i < 5)
{
self.off = 1
- if (global.menucoord[0] == self.i)
+ if (global.menucoord[0] == local.i)
self.off = 0
- if ((global.menuno - 1) == self.i)
+ if ((global.menuno - 1) == local.i)
self.off = 2
self.spritemx = 0
- if (self.i >= 2)
+ if (local.i >= 2)
self.spritemx = -100
- if (self.i != 2)
- draw_sprite_ext(self.msprite[self.i], self.off, (((self.xx + 120) + (self.i * 100)) + self.spritemx), ((self.yy + self.tp) - 60), 2, 2, 0, 0xFFFFFF, 1)
- self.i = (self.i + 1)
+ if (local.i != 2)
+ draw_sprite_ext(self.msprite[local.i], self.off, (((self.xx + 120) + (local.i * 100)) + self.spritemx), ((self.yy + self.tp) - 60), 2, 2, 0, 0xFFFFFF, 1)
+ local.i = (local.i + 1)
continue
}
break
@@ -47,17 +47,44 @@ if (self.drawchar == 1)
if (global.menuno == 5)
{
draw_set_color(0x000000)
- draw_rectangle((self.xx + 60), (self.yy + 90), (self.xx + 580), (self.yy + 410), 0)
- scr_darkbox((self.xx + 50), (self.yy + 80), (self.xx + 590), (self.yy + 420))
+ if (global.lang == "ja")
+ {
+ draw_rectangle((self.xx + 60), (self.yy + 85), (self.xx + 580), (self.yy + 412), 0)
+ scr_darkbox((self.xx + 50), (self.yy + 75), (self.xx + 590), (self.yy + 422))
+ }
+ else
+ {
+ draw_rectangle((self.xx + 60), (self.yy + 90), (self.xx + 580), (self.yy + 410), 0)
+ scr_darkbox((self.xx + 50), (self.yy + 80), (self.xx + 590), (self.yy + 420))
+ }
if (global.submenu >= 30)
_temp_var = (global.submenu <= 33)
else
_temp_var = 0
if _temp_var
+ _temp_var = 1
+ else
+ _temp_var = (global.submenu == 36)
+ if _temp_var
{
+ if (global.lang == "en")
+ _temp_var = (self.xx + 170)
+ else
+ _temp_var = (self.xx + 150)
+ local._xPos = _temp_var
+ if (global.lang == "en")
+ _temp_var = (self.xx + 145)
+ else
+ _temp_var = (self.xx + 125)
+ local._heartXPos = _temp_var
+ if (global.lang == "en")
+ _temp_var = (self.xx + 430)
+ else
+ _temp_var = (self.xx + 385)
+ local._selectXPos = _temp_var
draw_set_color(0xFFFFFF)
draw_text((self.xx + 270), (self.yy + 100), string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_74_0")))
- self.audvol = (string(abs((global.flag[17] * 100))) + "%")
+ self.audvol = (string(round((global.flag[17] * 100))) + "%")
self.musvol = (string(abs((global.flag[16] * 100))) + "%")
self.runoff = scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_79_0")
if (global.flag[11] == 1)
@@ -68,24 +95,28 @@ if (global.menuno == 5)
self.shakeoff = scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_81_0")
if (global.flag[12] == 1)
self.shakeoff = scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_81_1")
- self.fullscreenoff = scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_82_0")
- if window_get_fullscreen()
- self.fullscreenoff = scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_82_1")
- draw_sprite(spr_heart, 0, (self.xx + 145), ((self.yy + 160) + (global.submenucoord[30] * 35)))
+ draw_sprite(spr_heart, 0, local._heartXPos, ((self.yy + 160) + (global.submenucoord[30] * 35)))
if (global.submenu == 33)
draw_set_color(0x00FFFF)
- draw_text((self.xx + 170), (self.yy + 150), string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_86_0")))
- draw_text((self.xx + 430), (self.yy + 150), string_hash_to_newline(self.audvol))
+ draw_text(local._xPos, (self.yy + 150), string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_86_0")))
+ draw_text(local._selectXPos, (self.yy + 150), string_hash_to_newline(self.audvol))
draw_set_color(0xFFFFFF)
- draw_text((self.xx + 170), (self.yy + 185), string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_91_0")))
- draw_text((self.xx + 170), (self.yy + 220), string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_92_0")))
- draw_text((self.xx + 430), (self.yy + 220), string_hash_to_newline(self.flashoff))
- draw_text((self.xx + 170), (self.yy + 255), string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_93_0")))
- draw_text((self.xx + 430), (self.yy + 255), string_hash_to_newline(self.fullscreenoff))
- draw_text((self.xx + 170), (self.yy + 290), string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_94_0")))
- draw_text((self.xx + 430), (self.yy + 290), string_hash_to_newline(self.runoff))
- draw_text((self.xx + 170), (self.yy + 325), string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_95_0")))
- draw_text((self.xx + 170), (self.yy + 360), string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_96_0")))
+ draw_text(local._xPos, (self.yy + 185), string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_91_0")))
+ draw_text(local._xPos, (self.yy + 220), string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_92_0")))
+ draw_text(local._selectXPos, (self.yy + 220), string_hash_to_newline(self.flashoff))
+ draw_text(local._xPos, (self.yy + 255), string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_94_0")))
+ draw_text(local._selectXPos, (self.yy + 255), string_hash_to_newline(self.runoff))
+ if (global.submenu == 36)
+ draw_set_color(0x00FFFF)
+ else
+ {
+ if global.disable_border
+ draw_set_color(0x808080)
+ }
+ draw_text(local._xPos, (self.yy + 290), self.border_text)
+ draw_text(local._selectXPos, (self.yy + 290), self.border_options[self.selected_border])
+ draw_set_color(0xFFFFFF)
+ draw_text(local._xPos, (self.yy + 325), string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_96_0")))
}
if (global.submenu == 34)
{
@@ -94,11 +125,15 @@ if (global.menuno == 5)
}
if (global.submenu == 35)
{
+ if (global.lang == "en")
+ _temp_var = 0
+ else
+ _temp_var = -4
+ local._yOffset = _temp_var
draw_set_color(0xFFFFFF)
- draw_text((self.xx + 105), (self.yy + 100), string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_113_0")))
- draw_text((self.xx + 325), (self.yy + 100), string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_114_0")))
- if obj_time.gamepad_active
- draw_text((self.xx + 435), (self.yy + 100), string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_115_0")))
+ draw_text((self.xx + 105), ((self.yy + 100) + local._yOffset), string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_113_0")))
+ if obj_gamecontroller.gamepad_active
+ draw_text((self.xx + 435), ((self.yy + 100) + local._yOffset), string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_115_0")))
self.function[0] = scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_117_0")
self.function[1] = scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_118_0")
self.function[2] = scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_119_0")
@@ -108,35 +143,47 @@ if (global.menuno == 5)
self.function[6] = scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_123_0")
self.function[7] = scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_124_0")
self.function[8] = scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_125_0")
- draw_sprite(spr_heart, 0, (self.xx + 80), ((self.yy + 150) + (global.submenucoord[35] * 28)))
- self.i = 0
+ draw_sprite(spr_heart, 0, (self.xx + 80), (((self.yy + 150) + (global.submenucoord[35] * 28)) + local._yOffset))
+ if (global.lang == "ja")
+ _temp_var = 1
+ else
+ _temp_var = 0
+ local.line_padding = _temp_var
+ local.i = 0
while(true)
{
- if (self.i <= 8)
+ if (local.i <= 8)
{
draw_set_color(0xFFFFFF)
- if (global.submenucoord[35] == self.i)
+ if (global.submenucoord[35] == local.i)
draw_set_color(0xFFFF00)
- if (global.submenucoord[35] == self.i)
+ if (global.submenucoord[35] == local.i)
_temp_var = (self.control_select_con == 1)
else
_temp_var = 0
if _temp_var
draw_set_color(0x0000FF)
- if (self.i == 7)
+ if (local.i == 7)
_temp_var = (self.control_flash_timer > 0)
else
_temp_var = 0
if _temp_var
draw_set_color(merge_color(0xFFFF00, 0x00FFFF, ((self.control_flash_timer / 10) - 0.1)))
- draw_text((self.xx + 105), ((self.yy + 140) + (self.i * 28)), string_hash_to_newline(self.function[self.i]))
- if (self.i < 7)
+ draw_text((self.xx + 105), (((self.yy + 140) + (local.i * (28 + local.line_padding))) + local._yOffset), string_hash_to_newline(self.function[local.i]))
+ if (local.i < 7)
{
- draw_text((self.xx + 325), ((self.yy + 140) + (self.i * 28)), string_hash_to_newline(global.asc_def[global.input_k[self.i]]))
- if obj_time.gamepad_active
- draw_text((self.xx + 495), ((self.yy + 140) + (self.i * 28)), string_hash_to_newline(string(global.input_g[self.i])))
+ if obj_gamecontroller.gamepad_active
+ {
+ local._sprite = scr_getbuttonsprite(global.input_g[local.i], 0)
+ if (global.lang == "en")
+ _temp_var = (self.xx + 475)
+ else
+ _temp_var = (self.xx + 465)
+ local._xPos = _temp_var
+ draw_sprite_ext(local._sprite, 0, local._xPos, (((self.yy + 140) + (local.i * (28 + local.line_padding))) + local._yOffset), 2, 2, 0, 0xFFFFFF, 1)
+ }
}
- self.i = (self.i + 1)
+ local.i = (local.i + 1)
continue
}
break
@@ -170,16 +217,16 @@ if (global.menuno == 4)
draw_set_color(0xFFFFFF)
scr_84_set_draw_font("mainbig")
draw_text((self.xx + 130), (self.yy + 105), string_hash_to_newline(global.charname[self.charcoord]))
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < 3)
+ if (local.i < 3)
{
self.chosen = 0.4
- if (self.i == self.coord)
+ if (local.i == self.coord)
self.chosen = 1
- draw_sprite_ext(spr_equipchar, global.char[self.i], ((90 + self.xx) + (self.i * 50)), (160 + self.yy), 2, 2, 0, 0xFFFFFF, self.chosen)
- self.i = (self.i + 1)
+ draw_sprite_ext(spr_equipchar, global.char[local.i], ((90 + self.xx) + (local.i * 50)), (160 + self.yy), 2, 2, 0, 0xFFFFFF, self.chosen)
+ local.i = (local.i + 1)
continue
}
break
@@ -289,13 +336,13 @@ if (global.menuno == 4)
self.fluff_xscale = 1
draw_text_transformed((self.xx + 100), local.ch_y[4], string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_286_0")), self.fluff_xscale, 1, 0)
draw_item_icon((self.xx + 74), (local.ch_y[4] + 6), 12)
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < self.fluff_amount)
+ if (local.i < self.fluff_amount)
{
- draw_item_icon(((self.xx + 230) + (self.i * 20)), (local.ch_y[4] + 6), 12)
- self.i = (self.i + 1)
+ draw_item_icon(((self.xx + 230) + (local.i * 20)), (local.ch_y[4] + 6), 12)
+ local.i = (local.i + 1)
continue
}
break
@@ -305,13 +352,13 @@ if (global.menuno == 4)
self.guts_xoff = 0
if (global.lang == "ja")
self.guts_xoff = 16
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < self.guts_amount)
+ if (local.i < self.guts_amount)
{
- draw_item_icon((((self.xx + 190) + (self.i * 20)) + self.guts_xoff), (local.ch_y[5] + 6), 9)
- self.i = (self.i + 1)
+ draw_item_icon((((self.xx + 190) + (local.i * 20)) + self.guts_xoff), (local.ch_y[5] + 6), 9)
+ local.i = (local.i + 1)
continue
}
break
@@ -321,27 +368,27 @@ if (global.menuno == 4)
self.magsum = (((global.mag[global.char[self.coord]] + global.itemmag[global.char[self.coord]][0]) + global.itemmag[global.char[self.coord]][1]) + global.itemmag[global.char[self.coord]][2])
self.grazesum = global.grazeamt
self.sizesum = global.grazesize
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < 3)
+ if (local.i < 3)
{
self.j = 0
while(true)
{
if (self.j < 3)
{
- if (global.char[self.i] != 0)
+ if (global.char[local.i] != 0)
{
- self.grazesum = (self.grazesum + global.itemgrazeamt[global.char[self.i]][self.j])
- self.sizesum = (self.sizesum + global.itemgrazesize[global.char[self.i]][self.j])
+ self.grazesum = (self.grazesum + global.itemgrazeamt[global.char[local.i]][self.j])
+ self.sizesum = (self.sizesum + global.itemgrazesize[global.char[local.i]][self.j])
}
self.j = (self.j + 1)
continue
}
break
}
- self.i = (self.i + 1)
+ local.i = (local.i + 1)
continue
}
break
@@ -352,26 +399,26 @@ if (global.menuno == 4)
self.spell_xoff = 0
if (global.lang == "ja")
self.spell_xoff = -10
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < 6)
+ if (local.i < 6)
{
- if (global.spell[self.charcoord][self.i] > 0)
+ if (global.spell[self.charcoord][local.i] > 0)
{
self.g = 0
- if (global.spellusable[self.charcoord][self.i] == 0)
+ if (global.spellusable[self.charcoord][local.i] == 0)
self.g = 1
- if (global.spellcost[self.charcoord][self.i] > global.tension)
+ if (global.spellcost[self.charcoord][local.i] > global.tension)
self.g = 1
if (self.g == 0)
draw_set_color(0xFFFFFF)
if (self.g == 1)
draw_set_color(0x808080)
- draw_text((self.xx + 340), local.ch_y[self.i], string_hash_to_newline((string(round(((global.spellcost[self.charcoord][self.i] / global.maxtension) * 100))) + "%")))
- draw_text(((self.xx + 410) + self.spell_xoff), local.ch_y[self.i], string_hash_to_newline(global.spellname[self.charcoord][self.i]))
+ draw_text((self.xx + 340), local.ch_y[local.i], string_hash_to_newline((string(round(((global.spellcost[self.charcoord][local.i] / global.maxtension) * 100))) + "%")))
+ draw_text(((self.xx + 410) + self.spell_xoff), local.ch_y[local.i], string_hash_to_newline(global.spellname[self.charcoord][local.i]))
}
- self.i = (self.i + 1)
+ local.i = (local.i + 1)
continue
}
break
@@ -425,16 +472,16 @@ if (global.menuno == 2)
if (global.lang == "ja")
self.charname_xoff = -25
draw_text(((self.xx + 135) + self.charname_xoff), (self.yy + 107), string_hash_to_newline(global.charname[self.charcoord]))
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < 3)
+ if (local.i < 3)
{
self.chosen = 0.4
- if (self.i == self.coord)
+ if (local.i == self.coord)
self.chosen = 1
- draw_sprite_ext(spr_equipchar, global.char[self.i], ((90 + self.xx) + (self.i * 50)), (160 + self.yy), 2, 2, 0, 0xFFFFFF, self.chosen)
- self.i = (self.i + 1)
+ draw_sprite_ext(spr_equipchar, global.char[local.i], ((90 + self.xx) + (local.i * 50)), (160 + self.yy), 2, 2, 0, 0xFFFFFF, self.chosen)
+ local.i = (local.i + 1)
continue
}
break
@@ -501,26 +548,26 @@ if (global.menuno == 2)
if (global.submenucoord[11] == 0)
{
self.j = 0
- self.i = self.pagemax[0]
+ local.i = self.pagemax[0]
while(true)
{
- if (self.i < (6 + self.pagemax[0]))
+ if (local.i < (6 + self.pagemax[0]))
{
self.g = 0
if (self.charcoord == 1)
- _temp_var = (self.weaponchar1[self.i] == 0)
+ _temp_var = (self.weaponchar1[local.i] == 0)
else
_temp_var = 0
if _temp_var
self.g = 1
if (self.charcoord == 2)
- _temp_var = (self.weaponchar2[self.i] == 0)
+ _temp_var = (self.weaponchar2[local.i] == 0)
else
_temp_var = 0
if _temp_var
self.g = 1
if (self.charcoord == 3)
- _temp_var = (self.weaponchar3[self.i] == 0)
+ _temp_var = (self.weaponchar3[local.i] == 0)
else
_temp_var = 0
if _temp_var
@@ -529,16 +576,16 @@ if (global.menuno == 2)
draw_set_color(0xFFFFFF)
if (self.g == 1)
draw_set_color(0x808080)
- draw_item_icon(((self.xx + 364) + self.eq_xoff), ((self.yy + 236) + (self.j * local.ch_vspace)), self.weaponicon[self.i])
- if (global.weapon[self.i] != 0)
- draw_text(((self.xx + 384) + self.eq_xoff), ((self.yy + 230) + (self.j * local.ch_vspace)), string_hash_to_newline(self.weaponname[self.i]))
+ draw_item_icon(((self.xx + 364) + self.eq_xoff), ((self.yy + 236) + (self.j * local.ch_vspace)), self.weaponicon[local.i])
+ if (global.weapon[local.i] != 0)
+ draw_text(((self.xx + 384) + self.eq_xoff), ((self.yy + 230) + (self.j * local.ch_vspace)), string_hash_to_newline(self.weaponname[local.i]))
else
{
draw_set_color(0x404040)
draw_text(((self.xx + 384) + self.eq_xoff), ((self.yy + 230) + (self.j * local.ch_vspace)), string_hash_to_newline("---------"))
}
self.j = (self.j + 1)
- self.i = (self.i + 1)
+ local.i = (local.i + 1)
continue
}
break
@@ -551,26 +598,26 @@ if (global.menuno == 2)
if _temp_var
{
self.j = 0
- self.i = self.pagemax[1]
+ local.i = self.pagemax[1]
while(true)
{
- if (self.i < (6 + self.pagemax[1]))
+ if (local.i < (6 + self.pagemax[1]))
{
self.g = 0
if (self.charcoord == 1)
- _temp_var = (self.armorchar1[self.i] == 0)
+ _temp_var = (self.armorchar1[local.i] == 0)
else
_temp_var = 0
if _temp_var
self.g = 1
if (self.charcoord == 2)
- _temp_var = (self.armorchar2[self.i] == 0)
+ _temp_var = (self.armorchar2[local.i] == 0)
else
_temp_var = 0
if _temp_var
self.g = 1
if (self.charcoord == 3)
- _temp_var = (self.armorchar3[self.i] == 0)
+ _temp_var = (self.armorchar3[local.i] == 0)
else
_temp_var = 0
if _temp_var
@@ -579,16 +626,16 @@ if (global.menuno == 2)
draw_set_color(0xFFFFFF)
if (self.g == 1)
draw_set_color(0x808080)
- draw_item_icon(((self.xx + 364) + self.eq_xoff), ((self.yy + 236) + (self.j * local.ch_vspace)), self.armoricon[self.i])
- if (global.armor[self.i] != 0)
- draw_text(((self.xx + 384) + self.eq_xoff), ((self.yy + 230) + (self.j * local.ch_vspace)), string_hash_to_newline(self.armorname[self.i]))
+ draw_item_icon(((self.xx + 364) + self.eq_xoff), ((self.yy + 236) + (self.j * local.ch_vspace)), self.armoricon[local.i])
+ if (global.armor[local.i] != 0)
+ draw_text(((self.xx + 384) + self.eq_xoff), ((self.yy + 230) + (self.j * local.ch_vspace)), string_hash_to_newline(self.armorname[local.i]))
else
{
draw_set_color(0x404040)
draw_text(((self.xx + 384) + self.eq_xoff), ((self.yy + 230) + (self.j * local.ch_vspace)), string_hash_to_newline("---------"))
}
self.j = (self.j + 1)
- self.i = (self.i + 1)
+ local.i = (local.i + 1)
continue
}
break
@@ -614,26 +661,26 @@ if (global.menuno == 2)
self.pm = 1
draw_sprite(spr_heart, 0, ((self.xx + 344) + self.eq_xoff), ((self.yy + 240) + ((global.submenucoord[global.submenu] - self.pagemax[self.pm]) * local.ch_vspace)))
draw_set_color(0xFFFFFF)
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < 12)
+ if (local.i < 12)
{
self.buff = 0
- if (global.submenucoord[global.submenu] == self.i)
+ if (global.submenucoord[global.submenu] == local.i)
self.buff = (self.buff + 3)
if (self.pm == 0)
{
- if (global.weapon[self.i] == 0)
+ if (global.weapon[local.i] == 0)
self.buff = (self.buff - 1)
}
if (self.pm == 1)
{
- if (global.armor[self.i] == 0)
+ if (global.armor[local.i] == 0)
self.buff = (self.buff - 1)
}
- draw_rectangle((((self.xx + 555) - self.buff) + self.scroll_xoff), (((self.yy + 260) + (self.i * 10)) - self.buff), (((self.xx + 558) + self.buff) + self.scroll_xoff), (((self.yy + 263) + (self.i * 10)) + self.buff), 0)
- self.i = (self.i + 1)
+ draw_rectangle((((self.xx + 555) - self.buff) + self.scroll_xoff), (((self.yy + 260) + (local.i * 10)) - self.buff), (((self.xx + 558) + self.buff) + self.scroll_xoff), (((self.yy + 263) + (local.i * 10)) + self.buff), 0)
+ local.i = (local.i + 1)
continue
}
break
@@ -673,27 +720,27 @@ if (global.menuno == 2)
self.magsum = (((global.mag[global.char[self.coord]] + global.itemmag[global.char[self.coord]][0]) + global.itemmag[global.char[self.coord]][1]) + global.itemmag[global.char[self.coord]][2])
self.grazesum = global.grazeamt
self.sizesum = global.grazesize
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < 3)
+ if (local.i < 3)
{
self.j = 0
while(true)
{
if (self.j < 3)
{
- if (global.char[self.i] != 0)
+ if (global.char[local.i] != 0)
{
- self.grazesum = (self.grazesum + global.itemgrazeamt[global.char[self.i]][self.j])
- self.sizesum = (self.sizesum + global.itemgrazesize[global.char[self.i]][self.j])
+ self.grazesum = (self.grazesum + global.itemgrazeamt[global.char[local.i]][self.j])
+ self.sizesum = (self.sizesum + global.itemgrazesize[global.char[local.i]][self.j])
}
self.j = (self.j + 1)
continue
}
break
}
- self.i = (self.i + 1)
+ local.i = (local.i + 1)
continue
}
break
@@ -858,24 +905,24 @@ if (global.menuno == 2)
draw_text((self.xx + 230), ((self.yy + 230) + (local.ch_vspace * 1)), string_hash_to_newline(self.dfsum))
draw_text((self.xx + 230), ((self.yy + 230) + (local.ch_vspace * 2)), string_hash_to_newline(self.magsum))
}
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < 3)
+ if (local.i < 3)
{
- if (self._abilitytext[self.i] == " ")
+ if (self._abilitytext[local.i] == " ")
{
- draw_set_color(self._abilitycolor[self.i])
- draw_text((self.xx + 100), ((self.yy + 230) + (local.ch_vspace * (self.i + 3))), string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_736_0")))
+ draw_set_color(self._abilitycolor[local.i])
+ draw_text((self.xx + 100), ((self.yy + 230) + (local.ch_vspace * (local.i + 3))), string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_736_0")))
}
else
{
- draw_set_color(self._abilitycolor[self.i])
- draw_text((self.xx + 100), ((self.yy + 230) + (local.ch_vspace * (self.i + 3))), string_hash_to_newline(self._abilitytext[self.i]))
+ draw_set_color(self._abilitycolor[local.i])
+ draw_text((self.xx + 100), ((self.yy + 230) + (local.ch_vspace * (local.i + 3))), string_hash_to_newline(self._abilitytext[local.i]))
draw_set_color(0x40A0FF)
- draw_item_icon((self.xx + 74), (((self.yy + 230) + (local.ch_vspace * (self.i + 3))) + 8), self._abilityicon[self.i])
+ draw_item_icon((self.xx + 74), (((self.yy + 230) + (local.ch_vspace * (local.i + 3))) + 8), self._abilityicon[local.i])
}
- self.i = (self.i + 1)
+ local.i = (local.i + 1)
continue
}
break
@@ -895,24 +942,24 @@ if (global.menuno == 2)
self._abilityicon[0] = self.charweaponabilityicon[self.charcoord]
self._abilityicon[1] = self.chararmor1abilityicon[self.charcoord]
self._abilityicon[2] = self.chararmor2abilityicon[self.charcoord]
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < 3)
+ if (local.i < 3)
{
- if (self._abilitytext[self.i] == " ")
+ if (self._abilitytext[local.i] == " ")
{
draw_set_color(0x404040)
- draw_text((self.xx + 100), ((self.yy + 230) + (local.ch_vspace * (self.i + 3))), string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_773_0")))
+ draw_text((self.xx + 100), ((self.yy + 230) + (local.ch_vspace * (local.i + 3))), string_hash_to_newline(scr_84_get_lang_string("obj_darkcontroller_slash_Draw_0_gml_773_0")))
}
else
{
- draw_set_color(self._abilitycolor[self.i])
- draw_text((self.xx + 100), ((self.yy + 230) + (local.ch_vspace * (self.i + 3))), string_hash_to_newline(self._abilitytext[self.i]))
+ draw_set_color(self._abilitycolor[local.i])
+ draw_text((self.xx + 100), ((self.yy + 230) + (local.ch_vspace * (local.i + 3))), string_hash_to_newline(self._abilitytext[local.i]))
draw_set_color(0x40A0FF)
- draw_item_icon((self.xx + 74), (((self.yy + 230) + (local.ch_vspace * (self.i + 3))) + 8), self._abilityicon[self.i])
+ draw_item_icon((self.xx + 74), (((self.yy + 230) + (local.ch_vspace * (local.i + 3))) + 8), self._abilityicon[local.i])
}
- self.i = (self.i + 1)
+ local.i = (local.i + 1)
continue
}
break
@@ -1089,14 +1136,14 @@ if (global.menuno == 1)
if (global.lang == "ja")
{
draw_set_color(self.bcolor)
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < 6)
+ if (local.i < 6)
{
- draw_text((self.xx + 94), ((self.yy + 154) + (30 * self.i)), string_hash_to_newline(global.itemname[(self.i * 2)]))
- draw_text((self.xx + 358), ((self.yy + 154) + (30 * self.i)), string_hash_to_newline(global.itemname[((self.i * 2) + 1)]))
- self.i = (self.i + 1)
+ draw_text((self.xx + 94), ((self.yy + 154) + (30 * local.i)), string_hash_to_newline(global.itemname[(local.i * 2)]))
+ draw_text((self.xx + 358), ((self.yy + 154) + (30 * local.i)), string_hash_to_newline(global.itemname[((local.i * 2) + 1)]))
+ local.i = (local.i + 1)
continue
}
break
@@ -1104,14 +1151,14 @@ if (global.menuno == 1)
draw_set_color(0xFFFFFF)
if (global.submenu == 1)
draw_set_color(0x808080)
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < 6)
+ if (local.i < 6)
{
- draw_text((self.xx + 92), ((self.yy + 152) + (30 * self.i)), string_hash_to_newline(global.itemname[(self.i * 2)]))
- draw_text((self.xx + 356), ((self.yy + 152) + (30 * self.i)), string_hash_to_newline(global.itemname[((self.i * 2) + 1)]))
- self.i = (self.i + 1)
+ draw_text((self.xx + 92), ((self.yy + 152) + (30 * local.i)), string_hash_to_newline(global.itemname[(local.i * 2)]))
+ draw_text((self.xx + 356), ((self.yy + 152) + (30 * local.i)), string_hash_to_newline(global.itemname[((local.i * 2) + 1)]))
+ local.i = (local.i + 1)
continue
}
break
@@ -1120,14 +1167,14 @@ if (global.menuno == 1)
else
{
draw_set_color(self.bcolor)
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < 6)
+ if (local.i < 6)
{
- draw_text((self.xx + 148), ((self.yy + 154) + (30 * self.i)), string_hash_to_newline(global.itemname[(self.i * 2)]))
- draw_text((self.xx + 358), ((self.yy + 154) + (30 * self.i)), string_hash_to_newline(global.itemname[((self.i * 2) + 1)]))
- self.i = (self.i + 1)
+ draw_text((self.xx + 148), ((self.yy + 154) + (30 * local.i)), string_hash_to_newline(global.itemname[(local.i * 2)]))
+ draw_text((self.xx + 358), ((self.yy + 154) + (30 * local.i)), string_hash_to_newline(global.itemname[((local.i * 2) + 1)]))
+ local.i = (local.i + 1)
continue
}
break
@@ -1135,14 +1182,14 @@ if (global.menuno == 1)
draw_set_color(0xFFFFFF)
if (global.submenu == 1)
draw_set_color(0x808080)
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < 6)
+ if (local.i < 6)
{
- draw_text((self.xx + 146), ((self.yy + 152) + (30 * self.i)), string_hash_to_newline(global.itemname[(self.i * 2)]))
- draw_text((self.xx + 356), ((self.yy + 152) + (30 * self.i)), string_hash_to_newline(global.itemname[((self.i * 2) + 1)]))
- self.i = (self.i + 1)
+ draw_text((self.xx + 146), ((self.yy + 152) + (30 * local.i)), string_hash_to_newline(global.itemname[(local.i * 2)]))
+ draw_text((self.xx + 356), ((self.yy + 152) + (30 * local.i)), string_hash_to_newline(global.itemname[((local.i * 2) + 1)]))
+ local.i = (local.i + 1)
continue
}
break
@@ -1155,14 +1202,14 @@ if (global.menuno == 1)
if (global.lang == "ja")
{
draw_set_color(self.bcolor)
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < 6)
+ if (local.i < 6)
{
- draw_text((self.xx + 94), ((self.yy + 154) + (30 * self.i)), string_hash_to_newline(self.keyitemname[(self.i * 2)]))
- draw_text((self.xx + 358), ((self.yy + 154) + (30 * self.i)), string_hash_to_newline(self.keyitemname[((self.i * 2) + 1)]))
- self.i = (self.i + 1)
+ draw_text((self.xx + 94), ((self.yy + 154) + (30 * local.i)), string_hash_to_newline(self.keyitemname[(local.i * 2)]))
+ draw_text((self.xx + 358), ((self.yy + 154) + (30 * local.i)), string_hash_to_newline(self.keyitemname[((local.i * 2) + 1)]))
+ local.i = (local.i + 1)
continue
}
break
@@ -1170,28 +1217,28 @@ if (global.menuno == 1)
draw_set_color(0xFFFFFF)
if (global.submenu == 1)
draw_set_color(0x808080)
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < 6)
+ if (local.i < 6)
{
if (global.submenu == 4)
{
- if (self.keyitemusable[(self.i * 2)] == 1)
+ if (self.keyitemusable[(local.i * 2)] == 1)
draw_set_color(0xFFFFFF)
else
draw_set_color(0xC0C0C0)
}
- draw_text((self.xx + 92), ((self.yy + 152) + (30 * self.i)), string_hash_to_newline(self.keyitemname[(self.i * 2)]))
+ draw_text((self.xx + 92), ((self.yy + 152) + (30 * local.i)), string_hash_to_newline(self.keyitemname[(local.i * 2)]))
if (global.submenu == 4)
{
- if (self.keyitemusable[((self.i * 2) + 1)] == 1)
+ if (self.keyitemusable[((local.i * 2) + 1)] == 1)
draw_set_color(0xFFFFFF)
else
draw_set_color(0xC0C0C0)
}
- draw_text((self.xx + 356), ((self.yy + 152) + (30 * self.i)), string_hash_to_newline(self.keyitemname[((self.i * 2) + 1)]))
- self.i = (self.i + 1)
+ draw_text((self.xx + 356), ((self.yy + 152) + (30 * local.i)), string_hash_to_newline(self.keyitemname[((local.i * 2) + 1)]))
+ local.i = (local.i + 1)
continue
}
break
@@ -1200,14 +1247,14 @@ if (global.menuno == 1)
else
{
draw_set_color(self.bcolor)
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < 6)
+ if (local.i < 6)
{
- draw_text((self.xx + 148), ((self.yy + 154) + (30 * self.i)), string_hash_to_newline(self.keyitemname[(self.i * 2)]))
- draw_text((self.xx + 358), ((self.yy + 154) + (30 * self.i)), string_hash_to_newline(self.keyitemname[((self.i * 2) + 1)]))
- self.i = (self.i + 1)
+ draw_text((self.xx + 148), ((self.yy + 154) + (30 * local.i)), string_hash_to_newline(self.keyitemname[(local.i * 2)]))
+ draw_text((self.xx + 358), ((self.yy + 154) + (30 * local.i)), string_hash_to_newline(self.keyitemname[((local.i * 2) + 1)]))
+ local.i = (local.i + 1)
continue
}
break
@@ -1215,28 +1262,28 @@ if (global.menuno == 1)
draw_set_color(0xFFFFFF)
if (global.submenu == 1)
draw_set_color(0x808080)
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < 6)
+ if (local.i < 6)
{
if (global.submenu == 4)
{
- if (self.keyitemusable[(self.i * 2)] == 1)
+ if (self.keyitemusable[(local.i * 2)] == 1)
draw_set_color(0xFFFFFF)
else
draw_set_color(0xC0C0C0)
}
- draw_text((self.xx + 146), ((self.yy + 152) + (30 * self.i)), string_hash_to_newline(self.keyitemname[(self.i * 2)]))
+ draw_text((self.xx + 146), ((self.yy + 152) + (30 * local.i)), string_hash_to_newline(self.keyitemname[(local.i * 2)]))
if (global.submenu == 4)
{
- if (self.keyitemusable[((self.i * 2) + 1)] == 1)
+ if (self.keyitemusable[((local.i * 2) + 1)] == 1)
draw_set_color(0xFFFFFF)
else
draw_set_color(0xC0C0C0)
}
- draw_text((self.xx + 356), ((self.yy + 152) + (30 * self.i)), string_hash_to_newline(self.keyitemname[((self.i * 2) + 1)]))
- self.i = (self.i + 1)
+ draw_text((self.xx + 356), ((self.yy + 152) + (30 * local.i)), string_hash_to_newline(self.keyitemname[((local.i * 2) + 1)]))
+ local.i = (local.i + 1)
continue
}
break
diff --git a/decomp_normal/gml_Object_obj_darkcontroller_Step_0.gml b/decomp_switch/gml_Object_obj_darkcontroller_Step_0.gml
index a8917f1..4a68d28 100755
--- a/decomp_normal/gml_Object_obj_darkcontroller_Step_0.gml
+++ b/decomp_switch/gml_Object_obj_darkcontroller_Step_0.gml
@@ -16,6 +16,7 @@ if (global.interact == 5)
global.faceaction[global.charselect] = 7
if left_p()
{
+ self.movenoise = 1
if (global.submenucoord[global.submenu] > 0)
global.submenucoord[global.submenu] = (global.submenucoord[global.submenu] - 1)
else
@@ -23,6 +24,7 @@ if (global.interact == 5)
}
if right_p()
{
+ self.movenoise = 1
if (global.submenucoord[global.submenu] < (self.chartotal - 1))
global.submenucoord[global.submenu] = (global.submenucoord[global.submenu] + 1)
else
@@ -65,6 +67,7 @@ if (global.interact == 5)
}
if (self.close == 1)
{
+ self.cancelnoise = 1
global.faceaction[global.charselect] = 0
global.charselect = -1
self.twobuffer = 2
@@ -122,6 +125,7 @@ if (global.interact == 5)
_temp_var = 0
if _temp_var
{
+ snd_play(snd_ultraswing)
self.onebuffer = 2
global.faceaction[0] = 0
global.faceaction[1] = 0
@@ -204,6 +208,7 @@ if (global.interact == 5)
_temp_var = 0
if _temp_var
{
+ self.cancelnoise = 1
self.twobuffer = 2
global.faceaction[0] = 0
global.faceaction[1] = 0
@@ -225,15 +230,17 @@ if (global.interact == 5)
self.m_quit = 0
if up_p()
{
+ self.movenoise = 1
global.submenucoord[30] = (global.submenucoord[30] - 1)
if (global.submenucoord[30] < 0)
global.submenucoord[30] = 0
}
if down_p()
{
+ self.movenoise = 1
global.submenucoord[30] = (global.submenucoord[30] + 1)
- if (global.submenucoord[30] > 6)
- global.submenucoord[30] = 6
+ if (global.submenucoord[30] > 5)
+ global.submenucoord[30] = 5
}
if button1_p()
_temp_var = (self.onebuffer < 0)
@@ -264,21 +271,23 @@ if (global.interact == 5)
}
if (global.submenucoord[30] == 3)
{
- with(obj_time)
- {
- self.fullscreen_toggle = 1
- }
- }
- if (global.submenucoord[30] == 4)
- {
if (global.flag[11] == 0)
global.flag[11] = 1
else
global.flag[11] = 0
}
+ if (global.submenucoord[30] == 4)
+ {
+ if global.disable_border
+ self.selectnoise = 0
+ else
+ {
+ global.submenu = 36
+ self.check_border = 1
+ self.border_select = 0
+ }
+ }
if (global.submenucoord[30] == 5)
- global.submenu = 34
- if (global.submenucoord[30] == 6)
self.m_quit = 1
}
if button2_p()
@@ -286,7 +295,10 @@ if (global.interact == 5)
else
_temp_var = 0
if _temp_var
+ {
self.m_quit = 1
+ self.cancelnoise = 1
+ }
if (self.m_quit == 1)
{
self.onebuffer = 2
@@ -401,13 +413,14 @@ if (global.interact == 5)
if (global.submenu == 34)
{
if keyboard_check_pressed(vk_escape)
- game_end()
+ ossafe_game_end()
if button2_p()
_temp_var = (self.twobuffer < 0)
else
_temp_var = 0
if _temp_var
{
+ self.cancelnoise = 1
self.onebuffer = 2
self.twobuffer = 2
global.submenu = 30
@@ -418,152 +431,29 @@ if (global.interact == 5)
self.control_select_timer = 0
self.control_flash_timer = (self.control_flash_timer - 1)
self.controls_quitmenu = 0
- self.gamepad_exists = obj_time.gamepad_active
- self.gamepad_id = 0
if (self.control_select_con == 1)
{
self.gamepad_accept = -1
self.new_gamepad_key = -1
self.key_accept = -1
self.new_key = -1
- if keyboard_check_pressed(vk_anykey)
- {
- self.i = 48
- while(true)
- {
- if (self.i <= 90)
- {
- if keyboard_check_pressed(self.i)
- {
- self.new_key = self.i
- self.control_select_con = 2
- }
- self.i = (self.i + 1)
- continue
- }
- break
- }
- if keyboard_check_pressed(';')
- {
- self.new_key = 59
- self.control_select_con = 2
- }
- if keyboard_check_pressed(',')
- {
- self.new_key = 44
- self.control_select_con = 2
- }
- if keyboard_check_pressed('.')
- {
- self.new_key = 46
- self.control_select_con = 2
- }
- if keyboard_check_pressed('/')
- {
- self.new_key = 47
- self.control_select_con = 2
- }
- if keyboard_check_pressed('\')
- {
- self.new_key = 92
- self.control_select_con = 2
- }
- if keyboard_check_pressed(']')
- {
- self.new_key = 93
- self.control_select_con = 2
- }
- if keyboard_check_pressed('[')
- {
- self.new_key = 91
- self.control_select_con = 2
- }
- if keyboard_check_pressed('`')
- {
- self.new_key = 96
- self.control_select_con = 2
- }
- if keyboard_check_pressed('-')
- {
- self.new_key = 45
- self.control_select_con = 2
- }
- if keyboard_check_pressed('=')
- {
- self.new_key = 61
- self.control_select_con = 2
- }
- if keyboard_check_pressed('%')
- {
- self.new_key = 37
- self.control_select_con = 2
- }
- if keyboard_check_pressed(''')
- {
- self.new_key = 39
- self.control_select_con = 2
- }
- if keyboard_check_pressed('&')
- {
- self.new_key = 38
- self.control_select_con = 2
- }
- if keyboard_check_pressed('(')
- {
- self.new_key = 40
- self.control_select_con = 2
- }
- if keyboard_check_pressed(vk_return)
- {
- self.new_key = 13
- self.control_select_con = 2
- }
- if keyboard_check_pressed(vk_shift)
- {
- self.new_key = 16
- self.control_select_con = 2
- }
- if keyboard_check_pressed(vk_control)
- {
- self.new_key = 17
- self.control_select_con = 2
- }
- if keyboard_check_pressed(vk_backspace)
- {
- self.new_key = 8
- self.control_select_con = 2
- }
- if keyboard_check_pressed(vk_alt)
- {
- self.new_key = 18
- self.control_select_con = 2
- }
- if keyboard_check_pressed(vk_escape)
- {
- self.new_key = -1
- self.control_select_con = 0
- }
- }
- if (self.gamepad_exists == 1)
+ if obj_gamecontroller.gamepad_active
_temp_var = (self.control_select_con == 1)
else
_temp_var = 0
if _temp_var
{
- self.gpc = gamepad_button_count(self.gamepad_id)
- if (self.gpc >= 40)
- self.gpc = 40
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i <= self.gpc)
+ if (local.i < array_length_1d(self.gamepad_controls))
{
- if gamepad_button_check_pressed(self.gamepad_id, self.i)
+ if gamepad_button_check_pressed(obj_gamecontroller.gamepad_id, self.gamepad_controls[local.i])
{
- self.new_gamepad_key = self.i
+ self.new_gamepad_key = self.gamepad_controls[local.i]
self.control_select_con = 2
}
- self.i = (self.i + 1)
+ local.i = (local.i + 1)
continue
}
break
@@ -644,6 +534,7 @@ if (global.interact == 5)
_temp_var = 0
if _temp_var
{
+ self.cancelnoise = 1
self.onebuffer = 2
self.twobuffer = 2
if (global.submenucoord[35] == 8)
@@ -655,14 +546,14 @@ if (global.interact == 5)
if (self.new_key != -1)
{
self.dupe = -1
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < 7)
+ if (local.i < 7)
{
- if (global.input_k[self.i] == self.new_key)
- self.dupe = self.i
- self.i = (self.i + 1)
+ if (global.input_k[local.i] == self.new_key)
+ self.dupe = local.i
+ local.i = (local.i + 1)
continue
}
break
@@ -673,27 +564,27 @@ if (global.interact == 5)
self.entercancel = -1
self.shiftcancel = -1
self.ctrlcancel = -1
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < 7)
+ if (local.i < 7)
{
- if (global.input_k[self.i] == 13)
+ if (global.input_k[local.i] == 13)
{
global.input_k[7] = -1
self.entercancel = 1
}
- if (global.input_k[self.i] == 16)
+ if (global.input_k[local.i] == 16)
{
global.input_k[8] = -1
self.shiftcancel = 1
}
- if (global.input_k[self.i] == 17)
+ if (global.input_k[local.i] == 17)
{
global.input_k[9] = -1
self.ctrlcancel = 1
}
- self.i = (self.i + 1)
+ local.i = (local.i + 1)
continue
}
break
@@ -708,14 +599,14 @@ if (global.interact == 5)
else
{
self.dupe = -1
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < 7)
+ if (local.i < 7)
{
- if (global.input_g[self.i] == self.new_gamepad_key)
- self.dupe = self.i
- self.i = (self.i + 1)
+ if (global.input_g[local.i] == self.new_gamepad_key)
+ self.dupe = local.i
+ local.i = (local.i + 1)
continue
}
break
@@ -723,6 +614,9 @@ if (global.interact == 5)
if (self.dupe >= 0)
global.input_g[self.dupe] = global.input_g[global.submenucoord[35]]
global.input_g[global.submenucoord[35]] = self.new_gamepad_key
+ global.button0 = global.input_g[4]
+ global.button1 = global.input_g[5]
+ global.button2 = global.input_g[6]
}
self.upbuffer = 2
self.downbuffer = 2
@@ -733,38 +627,96 @@ if (global.interact == 5)
}
if (self.controls_quitmenu == 1)
{
+ self.selectnoise = 1
self.onebuffer = 2
self.twobuffer = 2
- ini_open((("config_" + string(global.filechoice)) + ".ini"))
- self.i = 0
+ ossafe_ini_open((("config_" + string(global.filechoice)) + ".ini"))
+ local.i = 0
while(true)
{
- if (self.i < 10)
+ if (local.i < 10)
{
- ini_write_real("KEYBOARD_CONTROLS", string(self.i), global.input_k[self.i])
- self.i = (self.i + 1)
+ ini_write_real("KEYBOARD_CONTROLS", string(local.i), global.input_k[local.i])
+ local.i = (local.i + 1)
continue
}
break
}
- self.i = 0
+ local.i = 0
while(true)
{
- if (self.i < 10)
+ if (local.i < 10)
{
- ini_write_real("GAMEPAD_CONTROLS", string(self.i), global.input_g[self.i])
- self.i = (self.i + 1)
+ ini_write_real("GAMEPAD_CONTROLS", string(local.i), global.input_g[local.i])
+ local.i = (local.i + 1)
continue
}
break
}
- ini_close()
+ ossafe_ini_close()
+ ossafe_savedata_save()
self.controls_quitmenu = 0
self.control_select_con = 0
global.submenucoord[35] = 0
global.submenu = 30
}
}
+ if (global.submenu == 36)
+ {
+ if right_p()
+ {
+ if (self.selected_border < (array_length_1d(self.border_options) - 1))
+ {
+ self.selected_border = (self.selected_border + 1)
+ self.check_border = 1
+ }
+ }
+ if left_p()
+ {
+ if (self.selected_border > 0)
+ {
+ self.selected_border = (self.selected_border - 1)
+ self.check_border = 1
+ }
+ }
+ if (self.check_border == 1)
+ {
+ local._border = self.border_options[self.selected_border]
+ if (local._border == "None")
+ _temp_var = 1
+ else
+ _temp_var = (local._border == "なし")
+ if _temp_var
+ scr_enable_screen_border(0)
+ else
+ scr_enable_screen_border(1)
+ global.screen_border_id = self.border_options[self.selected_border]
+ self.check_border = 0
+ }
+ if button1_p()
+ _temp_var = (self.onebuffer < 0)
+ else
+ _temp_var = 0
+ if _temp_var
+ self.border_select = 1
+ if button2_p()
+ _temp_var = (self.twobuffer < 0)
+ else
+ _temp_var = 0
+ if _temp_var
+ self.border_select = 1
+ if (self.border_select == 1)
+ {
+ self.onebuffer = 2
+ self.twobuffer = 2
+ ossafe_ini_open((("config_" + string(global.filechoice)) + ".ini"))
+ ini_write_string("BORDER", "TYPE", global.screen_border_id)
+ ossafe_ini_close()
+ ossafe_savedata_save()
+ self.control_select_con = 0
+ global.submenu = 30
+ }
+ }
}
if (global.menuno == 4)
{
@@ -774,14 +726,20 @@ if (global.interact == 5)
if up_p()
{
if (global.submenucoord[21] > 0)
+ {
global.submenucoord[21] = (global.submenucoord[21] - 1)
+ self.movenoise = 1
+ }
}
if down_p()
{
if (global.submenucoord[21] < 5)
{
if (global.spell[self.charcoord][(global.submenucoord[21] + 1)] != 0)
+ {
global.submenucoord[21] = (global.submenucoord[21] + 1)
+ self.movenoise = 1
+ }
}
}
if button1_p()
@@ -810,6 +768,7 @@ if (global.interact == 5)
_temp_var = 0
if _temp_var
{
+ self.cancelnoise = 1
self.deschaver = 0
self.onebuffer = 2
self.twobuffer = 2
@@ -821,6 +780,7 @@ if (global.interact == 5)
{
if left_p()
{
+ self.movenoise = 1
global.submenucoord[20] = (global.submenucoord[20] - 1)
if (global.submenucoord[20] < 0)
global.submenucoord[20] = (self.chartotal - 1)
@@ -829,6 +789,7 @@ if (global.interact == 5)
}
if right_p()
{
+ self.movenoise = 1
global.submenucoord[20] = (global.submenucoord[20] + 1)
if (global.submenucoord[20] > (self.chartotal - 1))
global.submenucoord[20] = 0
@@ -841,6 +802,7 @@ if (global.interact == 5)
_temp_var = 0
if _temp_var
{
+ self.selectnoise = 1
self.deschaver = 1
global.submenu = 21
self.onebuffer = 2
@@ -851,6 +813,7 @@ if (global.interact == 5)
_temp_var = 0
if _temp_var
{
+ self.cancelnoise = 1
self.twobuffer = 2
global.menuno = 0
global.submenu = 0
@@ -900,7 +863,10 @@ if (global.interact == 5)
if _temp_var
{
if (global.item[(global.submenucoord[2] + 1)] != 0)
+ {
global.submenucoord[2] = (global.submenucoord[2] + 1)
+ self.movenoise = 1
+ }
}
if (self.sm == 1)
_temp_var = 1
@@ -927,7 +893,10 @@ if (global.interact == 5)
}
}
if _temp_var
+ {
global.submenucoord[2] = (global.submenucoord[2] - 1)
+ self.movenoise = 1
+ }
}
if down_p()
{
@@ -954,7 +923,10 @@ if (global.interact == 5)
if _temp_var
{
if (global.item[(global.submenucoord[2] + 2)] != 0)
+ {
global.submenucoord[2] = (global.submenucoord[2] + 2)
+ self.movenoise = 1
+ }
}
if (self.sm == 1)
_temp_var = 1
@@ -978,11 +950,17 @@ if (global.interact == 5)
if _temp_var
{
if (global.item[(global.submenucoord[2] + 2)] != 0)
+ {
global.submenucoord[2] = (global.submenucoord[2] + 2)
+ self.movenoise = 1
+ }
else
{
if (global.item[(global.submenucoord[2] + 1)] != 0)
+ {
global.submenucoord[2] = (global.submenucoord[2] + 1)
+ self.movenoise = 1
+ }
}
}
}
@@ -1009,7 +987,10 @@ if (global.interact == 5)
}
}
if _temp_var
+ {
global.submenucoord[2] = (global.submenucoord[2] - 2)
+ self.movenoise = 1
+ }
if (self.sm == 3)
_temp_var = 1
else
@@ -1030,7 +1011,10 @@ if (global.interact == 5)
}
}
if _temp_var
+ {
global.submenucoord[2] = (global.submenucoord[2] - 2)
+ self.movenoise = 1
+ }
}
if button2_p()
_temp_var = (self.twobuffer < 0)
@@ -1038,6 +1022,7 @@ if (global.interact == 5)
_temp_var = 0
if _temp_var
{
+ self.cancelnoise = 1
self.twobuffer = 2
self.deschaver = 0
global.submenu = 1
@@ -1079,7 +1064,10 @@ if (global.interact == 5)
if _temp_var
{
if (global.keyitem[(global.submenucoord[4] + 1)] != 0)
+ {
global.submenucoord[4] = (global.submenucoord[4] + 1)
+ self.movenoise = 1
+ }
}
if (self.sm == 1)
_temp_var = 1
@@ -1106,7 +1094,10 @@ if (global.interact == 5)
}
}
if _temp_var
+ {
+ self.movenoise = 1
global.submenucoord[4] = (global.submenucoord[4] - 1)
+ }
}
if down_p()
{
@@ -1133,7 +1124,10 @@ if (global.interact == 5)
if _temp_var
{
if (global.keyitem[(global.submenucoord[4] + 2)] != 0)
+ {
global.submenucoord[4] = (global.submenucoord[4] + 2)
+ self.movenoise = 1
+ }
}
if (self.sm == 1)
_temp_var = 1
@@ -1157,11 +1151,17 @@ if (global.interact == 5)
if _temp_var
{
if (global.keyitem[(global.submenucoord[4] + 2)] != 0)
+ {
global.submenucoord[4] = (global.submenucoord[4] + 2)
+ self.movenoise = 1
+ }
else
{
if (global.keyitem[(global.submenucoord[4] + 1)] != 0)
+ {
global.submenucoord[4] = (global.submenucoord[4] + 1)
+ self.movenoise = 1
+ }
}
}
}
@@ -1188,7 +1188,10 @@ if (global.interact == 5)
}
}
if _temp_var
+ {
+ self.movenoise = 1
global.submenucoord[4] = (global.submenucoord[4] - 2)
+ }
if (self.sm == 3)
_temp_var = 1
else
@@ -1209,7 +1212,10 @@ if (global.interact == 5)
}
}
if _temp_var
+ {
+ self.movenoise = 1
global.submenucoord[4] = (global.submenucoord[4] - 2)
+ }
}
if button1_p()
_temp_var = (self.onebuffer < 0)
@@ -1233,6 +1239,7 @@ if (global.interact == 5)
_temp_var = 0
if _temp_var
{
+ self.cancelnoise = 1
self.twobuffer = 2
self.deschaver = 0
global.submenu = 1
@@ -1246,6 +1253,7 @@ if (global.interact == 5)
_temp_var = 0
if _temp_var
{
+ self.selectnoise = 1
self.onebuffer = 3
global.submenu = 7
}
@@ -1273,7 +1281,10 @@ if (global.interact == 5)
self.onebuffer = 3
scr_iteminfo(global.item[global.submenucoord[2]])
if (self.itemtarget == 1)
+ {
+ self.selectnoise = 1
global.submenu = 5
+ }
if (self.itemtarget == 2)
global.submenu = 6
}
@@ -1322,7 +1333,10 @@ if (global.interact == 5)
{
global.submenu = (global.submenucoord[1] + 2)
if (global.submenu == 4)
+ {
self.deschaver = 1
+ self.selectnoise = 1
+ }
if (global.submenu == 2)
_temp_var = 1
else
@@ -1336,6 +1350,8 @@ if (global.interact == 5)
global.submenu = 1
self.deschaver = 0
}
+ else
+ self.selectnoise = 1
}
}
if button2_p()
@@ -1344,6 +1360,7 @@ if (global.interact == 5)
_temp_var = 0
if _temp_var
{
+ self.cancelnoise = 1
self.twobuffer = 2
global.menuno = 0
global.submenu = 0
@@ -1377,11 +1394,17 @@ if (global.interact == 5)
if (self._up_pressed == 1)
{
if (global.submenucoord[global.submenu] > 0)
+ {
global.submenucoord[global.submenu] = (global.submenucoord[global.submenu] - 1)
+ self.movenoise = 1
+ }
if (global.submenu == 12)
{
if (global.submenucoord[global.submenu] < self.pagemax[0])
+ {
self.pagemax[0] = (self.pagemax[0] - 1)
+ self.movenoise = 1
+ }
}
if (global.submenu == 13)
_temp_var = 1
@@ -1390,7 +1413,10 @@ if (global.interact == 5)
if _temp_var
{
if (global.submenucoord[global.submenu] < self.pagemax[1])
+ {
self.pagemax[1] = (self.pagemax[1] - 1)
+ self.movenoise = 1
+ }
}
}
}
@@ -1413,6 +1439,7 @@ if (global.interact == 5)
_temp_var = 0
if _temp_var
{
+ self.movenoise = 1
if (global.submenu == 12)
self.nextone = global.weapon[global.submenucoord[(global.submenu + 1)]]
if (global.submenu == 13)
@@ -1429,7 +1456,10 @@ if (global.interact == 5)
else
_temp_var = 0
if _temp_var
+ {
self.pagemax[0] = (self.pagemax[0] + 1)
+ self.movenoise = 1
+ }
}
if (global.submenu == 13)
_temp_var = 1
@@ -1442,7 +1472,10 @@ if (global.interact == 5)
else
_temp_var = 0
if _temp_var
+ {
self.pagemax[1] = (self.pagemax[1] + 1)
+ self.movenoise = 1
+ }
}
}
}
@@ -1563,6 +1596,7 @@ if (global.interact == 5)
_temp_var = 0
if _temp_var
{
+ self.cancelnoise = 1
self.hold_up = 0
self.hold_down = 0
self.twobuffer = 2
@@ -1577,12 +1611,14 @@ if (global.interact == 5)
global.submenucoord[11] = (global.submenucoord[11] - 1)
if (global.submenucoord[11] == -1)
global.submenucoord[11] = 2
+ self.movenoise = 1
}
if down_p()
{
global.submenucoord[11] = (global.submenucoord[11] + 1)
if (global.submenucoord[11] == 3)
global.submenucoord[11] = 0
+ self.movenoise = 1
}
if button1_p()
_temp_var = (self.onebuffer < 0)
@@ -1590,6 +1626,7 @@ if (global.interact == 5)
_temp_var = 0
if _temp_var
{
+ self.selectnoise = 1
self.onebuffer = 2
global.submenu = (12 + global.submenucoord[11])
scr_dmenu_armor_selection_match()
@@ -1600,6 +1637,7 @@ if (global.interact == 5)
_temp_var = 0
if _temp_var
{
+ self.cancelnoise = 1
self.deschaver = 0
self.twobuffer = 2
global.submenu = 10
@@ -1609,12 +1647,14 @@ if (global.interact == 5)
{
if left_p()
{
+ self.movenoise = 1
global.submenucoord[10] = (global.submenucoord[10] - 1)
if (global.submenucoord[10] < 0)
global.submenucoord[10] = (self.chartotal - 1)
}
if right_p()
{
+ self.movenoise = 1
global.submenucoord[10] = (global.submenucoord[10] + 1)
if (global.submenucoord[10] > (self.chartotal - 1))
global.submenucoord[10] = 0
@@ -1626,6 +1666,7 @@ if (global.interact == 5)
_temp_var = 0
if _temp_var
{
+ self.selectnoise = 1
self.deschaver = 1
global.submenucoord[11] = 0
global.submenu = 11
@@ -1637,6 +1678,7 @@ if (global.interact == 5)
_temp_var = 0
if _temp_var
{
+ self.cancelnoise = 1
self.twobuffer = 2
global.menuno = 0
global.submenu = 0
@@ -1683,6 +1725,7 @@ if (global.interact == 5)
_temp_var = 0
if _temp_var
{
+ self.selectnoise = 1
self.onebuffer = 2
global.menuno = (global.menucoord[0] + 1)
if (global.menuno == 1)
@@ -1820,6 +1863,11 @@ if (self.selectnoise == 1)
snd_play(snd_select)
self.selectnoise = 0
}
+if (self.cancelnoise == 1)
+{
+ snd_play(snd_smallswing)
+ self.cancelnoise = 0
+}
self.onebuffer = (self.onebuffer - 1)
self.twobuffer = (self.twobuffer - 1)
self.threebuffer = (self.threebuffer - 1)
@@ -1830,7 +1878,7 @@ if scr_debug()
if keyboard_check_pressed('S')
instance_create(0, 0, obj_savemenu)
if keyboard_check_pressed('L')
- scr_load()
+ ossafe_savedata_load()
if keyboard_check_pressed('R')
game_restart_true()
}
diff --git a/decomp_normal/gml_Object_obj_darkponman_ow_Create_0.gml b/decomp_switch/gml_Object_obj_darkponman_ow_Create_0.gml
index eec0dbe..abdc73b 100755
--- a/decomp_normal/gml_Object_obj_darkponman_ow_Create_0.gml
+++ b/decomp_switch/gml_Object_obj_darkponman_ow_Create_0.gml
@@ -1,4 +1,4 @@
-global.charinstance[0] = 326
+global.charinstance[0] = 327
global.charinstance[1] = global.cinstance[0]
global.charinstance[2] = global.cinstance[1]
self.boss = 0
diff --git a/decomp_normal/gml_Object_obj_dbulletcontroller_Step_0.gml b/decomp_switch/gml_Object_obj_dbulletcontroller_Step_0.gml
index 5cec832..91276a2 100755
--- a/decomp_normal/gml_Object_obj_dbulletcontroller_Step_0.gml
+++ b/decomp_switch/gml_Object_obj_dbulletcontroller_Step_0.gml
@@ -178,7 +178,7 @@ if (self.type == 10)
if (self.btimer >= 15)
{
self.btimer = 0
- self.dicecomet = instance_create(choose((self.xx + 680), (self.xx - 100)), (0 - random(100)), self.obj_dicebul_comet)
+ self.dicecomet = instance_create(choose((self.xx + 680), (self.xx - 100)), (0 - random(100)), obj_dicebul)
self.dicecomet.damage = self.damage
self.dicecomet.target = self.target
with(self.dicecomet)
diff --git a/decomp_switch/gml_Object_obj_debugcontroller_Create_0.gml b/decomp_switch/gml_Object_obj_debugcontroller_Create_0.gml
new file mode 100755
index 0000000..91bf3fb
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_debugcontroller_Create_0.gml
@@ -0,0 +1 @@
+self.debug = 0
diff --git a/decomp_switch/gml_Object_obj_debugcontroller_PreCreate_0.gml b/decomp_switch/gml_Object_obj_debugcontroller_PreCreate_0.gml
new file mode 100755
index 0000000..f333bfe
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_debugcontroller_PreCreate_0.gml
@@ -0,0 +1 @@
+event_inherited()
diff --git a/decomp_switch/gml_Object_obj_debugcontroller_Step_0.gml b/decomp_switch/gml_Object_obj_debugcontroller_Step_0.gml
new file mode 100755
index 0000000..0f84b30
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_debugcontroller_Step_0.gml
@@ -0,0 +1,5 @@
+if gamepad_button_check_pressed(obj_gamecontroller.gamepad_id, gp_stickl)
+ self.debug = (! self.debug)
+if self.debug
+{
+}
diff --git a/decomp_normal/gml_Object_obj_dustpile_Draw_0.gml b/decomp_switch/gml_Object_obj_dustpile_Draw_0.gml
index ac5dfc0..e64d5a9 100755
--- a/decomp_normal/gml_Object_obj_dustpile_Draw_0.gml
+++ b/decomp_switch/gml_Object_obj_dustpile_Draw_0.gml
@@ -1,3 +1,6 @@
+draw_set_alpha(0)
+draw_rectangle_colour(self.bbox_left, self.bbox_top, self.bbox_right, self.bbox_bottom, 0x000000, 0x000000, 0x000000, 0x000000, 0)
+draw_set_alpha(1)
draw_sprite_ext(spr_dustpile_parts, 3, self.x, self.y, 2, 2, 0, 0xFFFFFF, self.image_alpha)
if (self.bust == 0)
{
diff --git a/decomp_normal/gml_Object_obj_dustpile_susie_Draw_0.gml b/decomp_switch/gml_Object_obj_dustpile_susie_Draw_0.gml
index 6be2276..1f1e308 100755
--- a/decomp_normal/gml_Object_obj_dustpile_susie_Draw_0.gml
+++ b/decomp_switch/gml_Object_obj_dustpile_susie_Draw_0.gml
@@ -1,3 +1,6 @@
+draw_set_alpha(0)
+draw_rectangle_colour(self.bbox_left, self.bbox_top, self.bbox_right, self.bbox_bottom, 0x000000, 0x000000, 0x000000, 0x000000, 0)
+draw_set_alpha(1)
if (self.bust == 0)
{
draw_sprite_ext(spr_dustpile_parts, 3, self.x, self.y, 2, 2, 0, 0xFFFFFF, self.image_alpha)
diff --git a/decomp_switch/gml_Object_obj_gamecontroller_Create_0.gml b/decomp_switch/gml_Object_obj_gamecontroller_Create_0.gml
new file mode 100755
index 0000000..826a3cf
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_gamecontroller_Create_0.gml
@@ -0,0 +1,2 @@
+self.gamepad_active = 1
+self.gamepad_id = 0
diff --git a/decomp_switch/gml_Object_obj_gamecontroller_Other_75.gml b/decomp_switch/gml_Object_obj_gamecontroller_Other_75.gml
new file mode 100755
index 0000000..ef9820e
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_gamecontroller_Other_75.gml
@@ -0,0 +1,31 @@
+show_debug_message(("***** Event = " + ds_map_find_value(self.async_load, "event_type")))
+_temp_var = ds_map_find_value(self.async_load, "event_type")
+switch _temp_var
+{
+ case "gamepad discovered":
+ {
+ local.pad = ds_map_find_value(self.async_load, "pad_index")
+ if gamepad_is_connected(local.pad)
+ {
+ self.gamepad_active = 1
+ self.gamepad_id = local.pad
+ }
+ }
+ break
+
+ case "gamepad lost":
+ {
+ self.gamepad_active = 0
+ if (self.os_type == os_switch)
+ {
+ if (switch_controller_support_show() == 0)
+ {
+ self.gamepad_active = 1
+ self.gamepad_id = switch_controller_support_get_selected_id()
+ }
+ }
+ }
+ break
+
+}
+
diff --git a/decomp_switch/gml_Object_obj_gamecontroller_PreCreate_0.gml b/decomp_switch/gml_Object_obj_gamecontroller_PreCreate_0.gml
new file mode 100755
index 0000000..f333bfe
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_gamecontroller_PreCreate_0.gml
@@ -0,0 +1 @@
+event_inherited()
diff --git a/decomp_normal/gml_Object_obj_gameover_init_Create_0.gml b/decomp_switch/gml_Object_obj_gameover_init_Create_0.gml
index d20f320..1338bf3 100755
--- a/decomp_normal/gml_Object_obj_gameover_init_Create_0.gml
+++ b/decomp_switch/gml_Object_obj_gameover_init_Create_0.gml
@@ -3,3 +3,4 @@ self.visible = 0
self.bg = scr_marker(0, 0, global.screenshot)
self.timer = 0
self.Z_COUNT = 0
+global.interact = 0
diff --git a/decomp_normal/gml_Object_obj_getsusieevent_Create_0.gml b/decomp_switch/gml_Object_obj_getsusieevent_Create_0.gml
index 6334538..541ca8f 100755
--- a/decomp_normal/gml_Object_obj_getsusieevent_Create_0.gml
+++ b/decomp_switch/gml_Object_obj_getsusieevent_Create_0.gml
@@ -1,11 +1,12 @@
self.rcon = 0
+self.block = noone
if (global.plot >= 38)
{
self.doormarker = scr_dark_marker(400, 40, spr_drdoor)
self.doormarker.depth = 600000
self.doormarker.image_index = 1
- self.block = instance_create(400, 120, obj_soliddark)
- self.block = instance_create(480, 120, obj_soliddark)
+ instance_create(380, 120, obj_soliddark)
+ instance_create(500, 120, obj_soliddark)
self.door = instance_create(440, 120, obj_doorA)
self.door.image_yscale = 2
self.door.image_yscale = 2
diff --git a/decomp_switch/gml_Object_obj_glowtilepuzz_Draw_0.gml b/decomp_switch/gml_Object_obj_glowtilepuzz_Draw_0.gml
new file mode 100755
index 0000000..118c9e8
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_glowtilepuzz_Draw_0.gml
@@ -0,0 +1,4 @@
+draw_set_alpha(0)
+draw_rectangle_colour(self.bbox_left, self.bbox_top, self.bbox_right, self.bbox_bottom, 0x000000, 0x000000, 0x000000, 0x000000, 0)
+draw_set_alpha(1)
+draw_sprite_ext(self.sprite_index, self.image_index, self.x, self.y, self.image_xscale, self.image_yscale, 0, 0xFFFFFF, 1)
diff --git a/decomp_normal/gml_Object_obj_initializer2_Create_0.gml b/decomp_normal/gml_Object_obj_initializer2_Create_0.gml
deleted file mode 100755
index 6a32ddd..0000000
--- a/decomp_normal/gml_Object_obj_initializer2_Create_0.gml
+++ /dev/null
@@ -1,22 +0,0 @@
-ini_open("true_config.ini")
-global.lang = ini_read_string("LANG", "LANG", "en")
-ini_close()
-global.damagefont = font_add_sprite_ext(spr_numbersfontbig, "0123456789", 20, 0)
-global.hpfont = font_add_sprite_ext(spr_numbersfontsmall, scr_84_get_lang_string("obj_initializer2_slash_Create_0_gml_2_0"), 0, 2)
-scr_gamestart()
-self.i = 0
-while(true)
-{
- if (self.i < 100)
- {
- global.tempflag[self.i] = 0
- self.i = (self.i + 1)
- continue
- }
- break
-}
-global.heartx = 300
-global.hearty = 220
-audio_group_load(1)
-if (! instance_exists(obj_time))
- instance_create(0, 0, obj_time)
diff --git a/decomp_switch/gml_Object_obj_initializer2_Other_2.gml b/decomp_switch/gml_Object_obj_initializer2_Other_2.gml
new file mode 100755
index 0000000..ca26cf6
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_initializer2_Other_2.gml
@@ -0,0 +1,30 @@
+if (self.os_type == os_switch)
+ _temp_var = (! variable_global_exists("switchlogin"))
+else
+ _temp_var = 0
+if _temp_var
+{
+ local._id = -1
+ while(true)
+ {
+ if (local._id < 0)
+ {
+ local._id = switch_accounts_select_account(1, 0, 0)
+ continue
+ }
+ break
+ }
+ global.switchlogin = local._id
+ switch_accounts_open_user(global.switchlogin)
+}
+global.screen_border_id = "Dynamic"
+global.screen_border_active = 1
+global.screen_border_alpha = 1
+global.screen_border_state = 0
+global.screen_border_dynamic_fade_id = 0
+global.screen_border_dynamic_fade_level = 0
+global.savedata_async_id = -1
+global.savedata_async_load = 0
+global.savedata_error = 0
+global.savedata_debuginfo = ""
+ossafe_savedata_load()
diff --git a/decomp_switch/gml_Object_obj_initializer2_Other_72.gml b/decomp_switch/gml_Object_obj_initializer2_Other_72.gml
new file mode 100755
index 0000000..e4c7d70
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_initializer2_Other_72.gml
@@ -0,0 +1,50 @@
+if (ds_map_find_value(self.async_load, "id") == global.savedata_async_id)
+{
+ global.savedata_async_id = -1
+ if global.savedata_async_load
+ {
+ global.savedata_async_load = 0
+ if (ds_map_find_value(self.async_load, "status") < 0)
+ {
+ global.savedata_error = 1
+ global.savedata_debuginfo = ("load failed: " + string(ds_map_find_value(self.async_load, "status")))
+ global.savedata = ds_map_create()
+ }
+ else
+ {
+ global.savedata_error = 0
+ global.savedata_debuginfo = "load succeeded"
+ local.json = buffer_read(global.savedata_buffer, 11)
+ global.savedata = json_decode(local.json)
+ buffer_delete(global.savedata_buffer)
+ global.savedata_buffer = self.undefined
+ scr_84_init_localization()
+ scr_84_load_ini()
+ scr_gamestart()
+ if ossafe_file_exists("dr.ini")
+ {
+ ossafe_ini_open("dr.ini")
+ global.game_won = ini_read_real("STATUS", "STATUS", 0)
+ ossafe_ini_close()
+ }
+ global.damagefont = font_add_sprite_ext(spr_numbersfontbig, "0123456789", 20, 0)
+ global.hpfont = font_add_sprite_ext(spr_numbersfontsmall, scr_84_get_lang_string("obj_initializer2_slash_Create_0_gml_2_0"), 0, 2)
+ self.i = 0
+ while(true)
+ {
+ if (self.i < 100)
+ {
+ global.tempflag[self.i] = 0
+ self.i = (self.i + 1)
+ continue
+ }
+ break
+ }
+ global.heartx = 300
+ global.hearty = 220
+ audio_group_load(1)
+ if (! instance_exists(obj_time))
+ instance_create(0, 0, obj_time)
+ }
+ }
+}
diff --git a/decomp_normal/gml_Object_obj_initializer2_Step_0.gml b/decomp_switch/gml_Object_obj_initializer2_Step_0.gml
index 39003a5..8441580 100755
--- a/decomp_normal/gml_Object_obj_initializer2_Step_0.gml
+++ b/decomp_switch/gml_Object_obj_initializer2_Step_0.gml
@@ -1,31 +1,35 @@
+if (global.savedata_async_id >= 0)
+ return
if audio_group_is_loaded(1)
{
self.roomchoice = PLACE_CONTACT
self.menu_go = 0
- if file_exists("filech1_0")
+ if ossafe_file_exists("filech1_0")
self.menu_go = 1
- if file_exists("filech1_1")
+ if ossafe_file_exists("filech1_1")
self.menu_go = 1
- if file_exists("filech1_2")
+ if ossafe_file_exists("filech1_2")
self.menu_go = 1
- if file_exists("filech1_3")
+ if ossafe_file_exists("dr.ini")
self.menu_go = 1
- if file_exists("dr.ini")
- self.menu_go = 1
- if file_exists("filech1_3")
- self.menu_go = 2
- if file_exists("filech1_4")
- self.menu_go = 2
- if file_exists("filech1_5")
+ if (global.game_won == 1)
self.menu_go = 2
- if (self.menu_go == 1)
- self.roomchoice = PLACE_MENU
- if (self.menu_go == 2)
+ if (self.menu_go == 0)
+ self.roomchoice = room_splashscreen
+ else
{
- scr_windowcaption(scr_84_get_lang_string("obj_initializer2_slash_Step_0_gml_22_0"))
- global.tempflag[10] = 1
- self.roomchoice = 132
- global.plot = 0
+ if (self.menu_go == 1)
+ self.roomchoice = 139
+ else
+ {
+ if (self.menu_go == 2)
+ {
+ scr_windowcaption(scr_84_get_lang_string("obj_initializer2_slash_Step_0_gml_22_0"))
+ global.tempflag[10] = 1
+ self.roomchoice = 132
+ global.plot = 0
+ }
+ }
}
room_goto(self.roomchoice)
}
diff --git a/decomp_normal/gml_Object_obj_joker_Step_0.gml b/decomp_switch/gml_Object_obj_joker_Step_0.gml
index 8bfb092..53a7ec4 100755
--- a/decomp_normal/gml_Object_obj_joker_Step_0.gml
+++ b/decomp_switch/gml_Object_obj_joker_Step_0.gml
@@ -553,6 +553,12 @@ if (global.myfight == 3)
}
break
}
+ if (global.hp[1] < 1)
+ global.hp[1] = 1
+ if (global.hp[2] < 1)
+ global.hp[2] = 1
+ if (global.hp[3] < 1)
+ global.hp[3] = 1
scr_revive(0)
scr_revive(1)
scr_revive(2)
@@ -568,7 +574,7 @@ if (global.myfight == 3)
{
snd_play(snd_applause)
global.msg[0] = scr_84_get_lang_string("obj_joker_slash_Step_0_gml_379_0")
- scr_healallitemspell((20 + floor(random(21))))
+ scr_healallitemspell((36 + floor(random(15))))
}
scr_battletext_default()
self.hypnosiscounter = (self.hypnosiscounter + 0.5)
diff --git a/decomp_normal/gml_Object_obj_krisroom_Create_0.gml b/decomp_switch/gml_Object_obj_krisroom_Create_0.gml
index bee8702..73b2e2c 100755
--- a/decomp_normal/gml_Object_obj_krisroom_Create_0.gml
+++ b/decomp_switch/gml_Object_obj_krisroom_Create_0.gml
@@ -1,3 +1,5 @@
+if (global.plot <= 10)
+ snd_free_all()
self.con = 0
self.image_speed = 0
self.wallwindow = scr_marker(140, 40, spr_housewindow)
diff --git a/decomp_normal/gml_Object_obj_krisroom_Step_0.gml b/decomp_switch/gml_Object_obj_krisroom_Step_0.gml
index dab2eed..d4d0b0d 100755
--- a/decomp_normal/gml_Object_obj_krisroom_Step_0.gml
+++ b/decomp_switch/gml_Object_obj_krisroom_Step_0.gml
@@ -192,10 +192,11 @@ if _temp_var
_temp_var = 0
if _temp_var
{
- self._remfilechoice = global.filechoice
- global.filechoice = (global.filechoice + 3)
- scr_save()
- global.filechoice = self._remfilechoice
+ global.game_won = 1
+ self.iniwrite = ossafe_ini_open("dr.ini")
+ ini_write_real("STATUS", "STATUS", global.game_won)
+ ossafe_ini_close()
+ ossafe_savedata_save()
mus_volume(global.currentsong[1], 0, 100)
self.fade = instance_create(0, 0, obj_fadeout)
with(self.fade)
diff --git a/decomp_normal/gml_Object_obj_lancerboss3_Step_0.gml b/decomp_switch/gml_Object_obj_lancerboss3_Step_0.gml
index 0b460f7..c6ed96b 100755
--- a/decomp_normal/gml_Object_obj_lancerboss3_Step_0.gml
+++ b/decomp_switch/gml_Object_obj_lancerboss3_Step_0.gml
@@ -116,7 +116,7 @@ if _temp_var
if _temp_var
{
if button1_p()
- _temp_var = (self.talktimer > 15)
+ _temp_var = (self.talktimer > 17)
else
_temp_var = 0
if _temp_var
diff --git a/decomp_normal/gml_Object_obj_lancerscare2_Step_0.gml b/decomp_switch/gml_Object_obj_lancerscare2_Step_0.gml
index de6f1b7..1a1127b 100755
--- a/decomp_normal/gml_Object_obj_lancerscare2_Step_0.gml
+++ b/decomp_switch/gml_Object_obj_lancerscare2_Step_0.gml
@@ -405,9 +405,9 @@ if _temp_var
scr_caterpillar_facing(1)
global.facing = 1
self.con = 38
- scr_tempsave()
global.interact = 0
instance_destroy()
if (global.plot <= 55)
global.plot = 55
+ scr_tempsave()
}
diff --git a/decomp_normal/gml_Object_obj_lancerslideevent_Create_0.gml b/decomp_switch/gml_Object_obj_lancerslideevent_Create_0.gml
index 311daa1..b64ff1a 100755
--- a/decomp_normal/gml_Object_obj_lancerslideevent_Create_0.gml
+++ b/decomp_switch/gml_Object_obj_lancerslideevent_Create_0.gml
@@ -4,3 +4,5 @@ self.cameracon = 0
self.ever = 0
self.seiz = global.flag[8]
self.slidetimer = 0
+self.block1 = -4
+self.block2 = -4
diff --git a/decomp_switch/gml_Object_obj_lancerslideevent_Draw_0.gml b/decomp_switch/gml_Object_obj_lancerslideevent_Draw_0.gml
new file mode 100755
index 0000000..eb07f60
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_lancerslideevent_Draw_0.gml
@@ -0,0 +1,18 @@
+if (self.block1 != noone)
+{
+ draw_set_alpha(0)
+ with(self.block1)
+ {
+ draw_rectangle_colour(self.bbox_left, self.bbox_top, self.bbox_right, self.bbox_bottom, 0x0000FF, 0x0000FF, 0x0000FF, 0x0000FF, 0)
+ }
+ draw_set_alpha(1)
+}
+if (self.block2 != noone)
+{
+ draw_set_alpha(0)
+ with(self.block2)
+ {
+ draw_rectangle_colour(self.bbox_left, self.bbox_top, self.bbox_right, self.bbox_bottom, 0x0000FF, 0x0000FF, 0x0000FF, 0x0000FF, 0)
+ }
+ draw_set_alpha(1)
+}
diff --git a/decomp_switch/gml_Object_obj_loadscreen_Create_0.gml b/decomp_switch/gml_Object_obj_loadscreen_Create_0.gml
new file mode 100755
index 0000000..6739f65
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_loadscreen_Create_0.gml
@@ -0,0 +1,13 @@
+self.loaded = 0
+self.save_ready = 0
+self.save_loaded = 0
+local.ww = window_get_width()
+local.wh = window_get_height()
+self.image_blend = 0x000000
+self.fadespeed = 0
+self.image_alpha = 0
+self.alpha_set = 0
+self.length = local.ww
+self.height = local.wh
+self.x = -20
+self.y = -20
diff --git a/decomp_switch/gml_Object_obj_loadscreen_Draw_0.gml b/decomp_switch/gml_Object_obj_loadscreen_Draw_0.gml
new file mode 100755
index 0000000..acb5688
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_loadscreen_Draw_0.gml
@@ -0,0 +1,15 @@
+self.image_alpha = (self.image_alpha + self.fadespeed)
+if (self.image_alpha >= 1)
+ self.image_alpha = 1
+else
+{
+ if (self.image_alpha <= 0)
+ self.image_alpha = 0
+}
+draw_sprite_ext(self.sprite_index, self.image_index, self.x, self.y, self.length, self.height, 0, self.image_blend, self.image_alpha)
+if (self.image_alpha == 0)
+ _temp_var = (self.save_ready == 3)
+else
+ _temp_var = 0
+if _temp_var
+ instance_destroy()
diff --git a/decomp_switch/gml_Object_obj_loadscreen_Other_4.gml b/decomp_switch/gml_Object_obj_loadscreen_Other_4.gml
new file mode 100755
index 0000000..aade273
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_loadscreen_Other_4.gml
@@ -0,0 +1,4 @@
+local.ww = window_get_width()
+local.wh = window_get_height()
+self.length = local.ww
+self.height = local.wh
diff --git a/decomp_switch/gml_Object_obj_loadscreen_PreCreate_0.gml b/decomp_switch/gml_Object_obj_loadscreen_PreCreate_0.gml
new file mode 100755
index 0000000..f333bfe
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_loadscreen_PreCreate_0.gml
@@ -0,0 +1 @@
+event_inherited()
diff --git a/decomp_switch/gml_Object_obj_loadscreen_Step_0.gml b/decomp_switch/gml_Object_obj_loadscreen_Step_0.gml
new file mode 100755
index 0000000..b7d6b9b
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_loadscreen_Step_0.gml
@@ -0,0 +1,23 @@
+if self.loaded
+{
+ if (self.save_ready == 1)
+ _temp_var = (self.image_alpha == 1)
+ else
+ _temp_var = 0
+ if _temp_var
+ {
+ scr_load()
+ self.save_ready = (self.save_ready + 1)
+ }
+ if (! self.alpha_set)
+ {
+ self.fadespeed = 0.08
+ self.alpha_set = 1
+ self.save_ready = (self.save_ready + 1)
+ }
+ if (self.save_ready == 2)
+ {
+ self.fadespeed = -0.08
+ self.save_ready = (self.save_ready + 1)
+ }
+}
diff --git a/decomp_normal/gml_Object_obj_mainchara_Step_0.gml b/decomp_switch/gml_Object_obj_mainchara_Step_0.gml
index 0ca0299..8f1a02f 100755
--- a/decomp_normal/gml_Object_obj_mainchara_Step_0.gml
+++ b/decomp_switch/gml_Object_obj_mainchara_Step_0.gml
@@ -2,6 +2,7 @@ scr_depth()
self.wallcheck = 0
self.nowx = self.x
self.nowy = self.y
+local.nopress = 0
if (self.press_d == 0)
{
if (self.press_l == 0)
@@ -17,7 +18,7 @@ if (self.press_d == 0)
else
_temp_var = 0
if _temp_var
- self.nopress = 1
+ local.nopress = 1
self.press_l = 0
self.press_r = 0
self.press_d = 0
@@ -50,9 +51,6 @@ if (global.interact == 0)
self.twobuffer = 2
}
}
-}
-if (global.interact == 0)
-{
if (global.flag[11] == 1)
{
if button2_h()
@@ -140,7 +138,7 @@ if (global.interact == 0)
self.py = (- self.wspeed)
self.pressdir = 2
}
- if (self.nopress == 1)
+ if (local.nopress == 1)
_temp_var = (self.pressdir != -1)
else
_temp_var = 0
@@ -190,65 +188,61 @@ if (global.interact == 0)
if _temp_var
global.facing = self.pressdir
}
- self.nopress = 0
+ local.nopress = 0
self.xmeet = 0
self.ymeet = 0
self.xymeet = 0
- if place_meeting((self.x + self.px), (self.y + self.py), obj_solidblock)
- self.xymeet = 1
if place_meeting((self.x + self.px), self.y, obj_solidblock)
{
- if place_meeting((self.x + self.px), self.y, obj_solidblock)
+ local.g = self.wspeed
+ while(true)
{
- self.g = self.wspeed
- while(true)
+ if (local.g > 0)
{
- if (self.g > 0)
+ local.mvd = 0
+ if (self.press_d == 0)
+ _temp_var = (! place_meeting((self.x + self.px), (self.y - local.g), obj_solidblock))
+ else
+ _temp_var = 0
+ if _temp_var
+ break
+ else
{
- self.mvd = 0
- if (self.press_d == 0)
- _temp_var = (! place_meeting((self.x + self.px), (self.y - self.g), obj_solidblock))
+ local.mvd = 1
+ if (self.press_u == 0)
+ {
+ if (local.mvd == 0)
+ _temp_var = (! place_meeting((self.x + self.px), (self.y + local.g), obj_solidblock))
+ else
+ _temp_var = 0
+ }
else
_temp_var = 0
if _temp_var
break
else
{
- if (self.press_u == 0)
- {
- if (self.mvd == 0)
- _temp_var = (! place_meeting((self.x + self.px), (self.y + self.g), obj_solidblock))
- else
- _temp_var = 0
- }
- else
- _temp_var = 0
- if _temp_var
- break
- else
- {
- self.g = (self.g - 1)
- continue
- }
+ local.g = (local.g - 1)
+ continue
}
}
- break
}
+ break
}
self.xmeet = 1
self.bkx = 0
if (self.px > 0)
{
- self.i = self.px
+ local.i = self.px
while(true)
{
- if (self.i >= 0)
+ if (local.i >= 0)
{
- if (! place_meeting((self.x + self.i), self.y, obj_solidblock))
+ if (! place_meeting((self.x + local.i), self.y, obj_solidblock))
break
else
{
- self.i = (self.i - 1)
+ local.i = (local.i - 1)
continue
}
}
@@ -257,16 +251,16 @@ if (global.interact == 0)
}
if (self.px < 0)
{
- self.i = self.px
+ local.i = self.px
while(true)
{
- if (self.i <= 0)
+ if (local.i <= 0)
{
- if (! place_meeting((self.x + self.i), self.y, obj_solidblock))
+ if (! place_meeting((self.x + local.i), self.y, obj_solidblock))
break
else
{
- self.i = (self.i + 1)
+ local.i = (local.i + 1)
continue
}
}
@@ -276,30 +270,31 @@ if (global.interact == 0)
if (self.bkx == 0)
self.px = 0
}
- if place_meeting(self.x, (self.y + self.py), obj_solidblock)
+ else
{
- self.ymeet = 1
- self.bky = 0
if place_meeting(self.x, (self.y + self.py), obj_solidblock)
{
- self.g = self.wspeed
+ self.ymeet = 1
+ self.bky = 0
+ local.g = self.wspeed
while(true)
{
- if (self.g > 0)
+ if (local.g > 0)
{
- self.mvd = 0
+ local.mvd = 0
if (self.press_r == 0)
- _temp_var = (! place_meeting((self.x - self.g), (self.y + self.py), obj_solidblock))
+ _temp_var = (! place_meeting((self.x - local.g), (self.y + self.py), obj_solidblock))
else
_temp_var = 0
if _temp_var
break
else
{
- if (self.mvd == 0)
+ local.mvd = 1
+ if (local.mvd == 0)
{
if (self.press_l == 0)
- _temp_var = (! place_meeting((self.x + self.g), (self.y + self.py), obj_solidblock))
+ _temp_var = (! place_meeting((self.x + local.g), (self.y + self.py), obj_solidblock))
else
_temp_var = 0
}
@@ -309,89 +304,89 @@ if (global.interact == 0)
break
else
{
- self.g = (self.g - 1)
+ local.g = (local.g - 1)
continue
}
}
}
break
}
- }
- if (self.py > 0)
- {
- self.i = self.py
- while(true)
+ if (self.py > 0)
{
- if (self.i >= 0)
+ local.i = self.py
+ while(true)
{
- if (! place_meeting(self.x, (self.y + self.i), obj_solidblock))
- break
- else
+ if (local.i >= 0)
{
- self.i = (self.i - 1)
- continue
+ if (! place_meeting(self.x, (self.y + local.i), obj_solidblock))
+ break
+ else
+ {
+ local.i = (local.i - 1)
+ continue
+ }
}
+ break
}
- break
}
- }
- if (self.py < 0)
- {
- self.i = self.py
- while(true)
+ if (self.py < 0)
{
- if (self.i <= 0)
+ local.i = self.py
+ while(true)
{
- if (! place_meeting(self.x, (self.y + self.i), obj_solidblock))
- break
- else
+ if (local.i <= 0)
{
- self.i = (self.i + 1)
- continue
+ if (! place_meeting(self.x, (self.y + local.i), obj_solidblock))
+ break
+ else
+ {
+ local.i = (local.i + 1)
+ continue
+ }
}
+ break
}
- break
}
+ if (self.bky == 0)
+ self.py = 0
}
- if (self.bky == 0)
- self.py = 0
}
if place_meeting((self.x + self.px), (self.y + self.py), obj_solidblock)
{
self.xymeet = 1
self.bkxy = 0
- self.i = self.px
- self.j = self.py
+ local.i = self.px
+ local.j = self.py
while(true)
{
- if (self.j != 0)
+ if (local.j != 0)
_temp_var = 1
else
- _temp_var = (self.i != 0)
+ _temp_var = (local.i != 0)
if _temp_var
{
- if (! place_meeting((self.x + self.i), (self.y + self.j), obj_solidblock))
+ if (! place_meeting((self.x + local.i), (self.y + local.j), obj_solidblock))
break
else
{
- if (abs(self.j) >= 1)
+ if (abs(local.j) >= 1)
{
- if (self.j > 0)
- self.j = (self.j - 1)
- if (self.j < 0)
- self.j = (self.j + 1)
+ if (local.j > 0)
+ local.j = (local.j - 1)
+ if (local.j < 0)
+ local.j = (local.j + 1)
}
else
- self.j = 0
- if (abs(self.i) >= 1)
+ local.j = 0
+ if (abs(local.i) >= 1)
{
- if (self.i > 0)
- self.i = (self.i - 1)
- if (self.i < 0)
- self.i = (self.i + 1)
+ if (local.i > 0)
+ local.i = (local.i - 1)
+ if (local.i < 0)
+ local.i = (local.i + 1)
}
else
- self.i = 0
+ local.i = 0
continue
}
}
@@ -439,13 +434,13 @@ if (global.interact == 0)
}
self.walk = 0
if (self.x != self.nowx)
- _temp_var = (self.nopress == 0)
+ _temp_var = (local.nopress == 0)
else
_temp_var = 0
if _temp_var
self.walk = 1
if (self.y != self.nowy)
- _temp_var = (self.nopress == 0)
+ _temp_var = (local.nopress == 0)
else
_temp_var = 0
if _temp_var
@@ -472,29 +467,32 @@ if _temp_var
if (self.walktimer >= 30)
self.image_index = 3
}
-if (self.walkbuffer <= 0)
- _temp_var = (self.fun == 0)
else
- _temp_var = 0
-if _temp_var
{
- if (self.walktimer < 10)
- self.walktimer = 9.5
- if (self.walktimer >= 10)
- _temp_var = (self.walktimer < 20)
- else
- _temp_var = 0
- if _temp_var
- self.walktimer = 19.5
- if (self.walktimer >= 20)
- _temp_var = (self.walktimer < 30)
+ if (self.walkbuffer <= 0)
+ _temp_var = (self.fun == 0)
else
_temp_var = 0
if _temp_var
- self.walktimer = 29.5
- if (self.walktimer >= 30)
- self.walktimer = 39.5
- self.image_index = 0
+ {
+ if (self.walktimer < 10)
+ self.walktimer = 9.5
+ if (self.walktimer >= 10)
+ _temp_var = (self.walktimer < 20)
+ else
+ _temp_var = 0
+ if _temp_var
+ self.walktimer = 19.5
+ if (self.walktimer >= 20)
+ _temp_var = (self.walktimer < 30)
+ else
+ _temp_var = 0
+ if _temp_var
+ self.walktimer = 29.5
+ if (self.walktimer >= 30)
+ self.walktimer = 39.5
+ self.image_index = 0
+ }
}
self.walkbuffer = (self.walkbuffer - 0.75)
if (self.fun == 0)
@@ -517,24 +515,32 @@ if (self.stepping == 1)
if _temp_var
{
if (global.flag[31] == 0)
+ {
snd_play(snd_step1)
- self.stepped = 1
+ self.stepped = 1
+ }
}
- if (self.image_index == 0)
- _temp_var = 1
else
- _temp_var = (self.image_index == 2)
- if _temp_var
- self.stepped = 0
- if (self.image_index == 3)
- _temp_var = (self.stepped == 0)
- else
- _temp_var = 0
- if _temp_var
{
- self.stepped = 1
- if (global.flag[31] == 0)
- snd_play(snd_step2)
+ if (self.image_index == 0)
+ _temp_var = 1
+ else
+ _temp_var = (self.image_index == 2)
+ if _temp_var
+ self.stepped = 0
+ else
+ {
+ if (self.image_index == 3)
+ _temp_var = (self.stepped == 0)
+ else
+ _temp_var = 0
+ if _temp_var
+ {
+ self.stepped = 1
+ if (global.flag[31] == 0)
+ snd_play(snd_step2)
+ }
+ }
}
}
if (self.onebuffer < 0)
@@ -662,6 +668,10 @@ if (self.battlemode == 1)
{
global.inv = (global.inv - 1)
if (global.inv < 0)
+ _temp_var = (global.interact != 3)
+ else
+ _temp_var = 0
+ if _temp_var
{
with(collision_rectangle((self.x + 12), (self.y + 40), (self.x + 27), (self.y + 49), obj_overworldbulletparent, 1, 0))
{
@@ -677,233 +687,3 @@ if (self.battlemode == 1)
}
}
}
-if scr_debug()
-{
- if keyboard_check_pressed('P')
- self.room_speed = 60
- if keyboard_check_pressed('O')
- self.room_speed = 3
- if keyboard_check('3')
- _temp_var = keyboard_check('D')
- else
- _temp_var = 0
- if _temp_var
- {
- global.char[0] = 1
- global.char[1] = 0
- global.char[2] = 0
- global.interact = 0
- global.darkzone = 1
- room_goto(room_dark1)
- }
- if keyboard_check('4')
- _temp_var = keyboard_check('D')
- else
- _temp_var = 0
- if _temp_var
- {
- global.char[0] = 1
- global.char[1] = 3
- global.char[2] = 2
- global.interact = 0
- global.darkzone = 1
- room_goto(room_field_checkers5)
- }
- if keyboard_check('5')
- _temp_var = keyboard_check('D')
- else
- _temp_var = 0
- if _temp_var
- {
- global.char[0] = 1
- global.char[1] = 0
- global.char[2] = 0
- global.interact = 0
- global.darkzone = 1
- room_goto(room_castle_tutorial)
- }
- if keyboard_check('6')
- _temp_var = keyboard_check('D')
- else
- _temp_var = 0
- if _temp_var
- {
- global.char[0] = 1
- global.char[1] = 3
- global.char[2] = 0
- global.interact = 0
- global.darkzone = 1
- room_goto(room_field1)
- }
- if keyboard_check('7')
- _temp_var = keyboard_check('D')
- else
- _temp_var = 0
- if _temp_var
- {
- global.char[0] = 1
- global.char[1] = 3
- global.char[2] = 0
- global.interact = 0
- global.darkzone = 1
- room_goto(room_forest_area3)
- }
- if keyboard_check('8')
- _temp_var = keyboard_check('D')
- else
- _temp_var = 0
- if _temp_var
- {
- global.char[0] = 1
- global.char[1] = 3
- global.char[2] = 0
- global.interact = 0
- global.darkzone = 1
- room_goto(room_forest_fightsusie)
- }
- if keyboard_check('9')
- _temp_var = keyboard_check('D')
- else
- _temp_var = 0
- if _temp_var
- {
- global.char[0] = 2
- global.char[1] = 0
- global.char[2] = 0
- global.interact = 0
- global.darkzone = 1
- global.plot = 154
- room_goto(room_cc_prison_cells)
- }
- if keyboard_check('6')
- _temp_var = keyboard_check('J')
- else
- _temp_var = 0
- if _temp_var
- {
- global.char[0] = 1
- global.char[1] = 3
- global.char[2] = 0
- global.interact = 0
- global.darkzone = 1
- global.charauto[2] = 0
- room_goto(room_battletest)
- }
- if keyboard_check('7')
- _temp_var = keyboard_check('J')
- else
- _temp_var = 0
- if _temp_var
- {
- global.char[0] = 1
- global.char[1] = 2
- global.char[2] = 3
- global.interact = 0
- global.darkzone = 1
- global.charauto[2] = 0
- room_goto(room_battletest)
- }
- if keyboard_check('8')
- _temp_var = keyboard_check('J')
- else
- _temp_var = 0
- if _temp_var
- {
- global.char[0] = 1
- global.char[1] = 2
- global.char[2] = 3
- global.interact = 0
- global.darkzone = 1
- global.charauto[2] = 0
- global.plot = 165
- scr_keyitemget(5)
- global.tempflag[4] = 1
- _temp_var = 13
- if (13 <= 0)
- {
- }
- else
- {
- while(true)
- {
- scr_weaponget(5)
- _temp_var = (_temp_var - 1)
- if (_temp_var - 1)
- continue
- break
- }
- }
- room_goto(room_cc_prison_prejoker)
- }
- if keyboard_check('9')
- _temp_var = keyboard_check('J')
- else
- _temp_var = 0
- if _temp_var
- {
- global.char[0] = 1
- global.char[1] = 2
- global.char[2] = 3
- global.interact = 0
- global.darkzone = 1
- global.charauto[2] = 0
- global.flag[248] = 0
- room_goto(room_cc_kingbattle)
- }
- if keyboard_check('2')
- _temp_var = keyboard_check('W')
- else
- _temp_var = 0
- if _temp_var
- {
- global.interact = 0
- global.darkzone = 0
- room_goto(room_town_krisyard)
- }
- if keyboard_check('3')
- _temp_var = keyboard_check('W')
- else
- _temp_var = 0
- if _temp_var
- {
- global.interact = 0
- global.darkzone = 0
- room_goto(room_schooldoor)
- }
- if keyboard_check('4')
- _temp_var = keyboard_check('W')
- else
- _temp_var = 0
- if _temp_var
- {
- global.interact = 0
- global.darkzone = 0
- room_goto(room_school_unusedroom)
- }
- if keyboard_check('5')
- _temp_var = keyboard_check('W')
- else
- _temp_var = 0
- if _temp_var
- {
- global.interact = 0
- global.darkzone = 0
- global.plot = 251
- room_goto(room_town_school)
- }
- if keyboard_check('6')
- _temp_var = keyboard_check('W')
- else
- _temp_var = 0
- if _temp_var
- {
- global.interact = 0
- global.darkzone = 0
- global.plot = 251
- room_goto(room_town_north)
- }
- if keyboard_check_pressed('-')
- room_goto_next()
- if keyboard_check_pressed('.')
- room_goto_previous()
-}
diff --git a/decomp_normal/gml_Object_obj_monster1_Draw_0.gml b/decomp_switch/gml_Object_obj_monster1_Draw_0.gml
index 041424f..8a5cef1 100755
--- a/decomp_normal/gml_Object_obj_monster1_Draw_0.gml
+++ b/decomp_switch/gml_Object_obj_monster1_Draw_0.gml
@@ -21,22 +21,6 @@ if (self.state == 3)
self.shakex = (- self.shakex)
self.hurtshake = 0
}
- draw_sprite_ext(self.spr_enemy1_hurt, 0, (self.x + self.shakex), self.y, 2, 2, self.turnt, self.image_blend, 1)
- }
-}
-if (self.state == 0)
-{
- self.siner = (self.siner + 1)
- self.thissprite = self.spr_enemy1_idle
- if (global.mercymod[self.myself] >= global.mercymax[self.myself])
- self.thissprite = self.spr_enemy1_spared
- draw_sprite_ext(self.thissprite, (self.siner / 5), self.x, self.y, 2, 2, 0, self.image_blend, 1)
- if (self.flash == 1)
- {
- self.fsiner = (self.fsiner + 1)
- d3d_set_fog(1, 16777215, 0, 1)
- draw_sprite_ext(self.thissprite, (self.siner / 5), self.x, self.y, 2, 2, 0, self.image_blend, (((- cos((self.fsiner / 5))) * 0.4) + 0.6))
- d3d_set_fog(0, 0, 0, 0)
}
}
if (self.becomeflash == 0)
diff --git a/decomp_normal/gml_Object_obj_monster1_Step_0.gml b/decomp_switch/gml_Object_obj_monster1_Step_0.gml
index e1e3448..487fe60 100755
--- a/decomp_normal/gml_Object_obj_monster1_Step_0.gml
+++ b/decomp_switch/gml_Object_obj_monster1_Step_0.gml
@@ -65,28 +65,6 @@ if (global.monster[self.myself] == 1)
global.mnfight = 2
}
}
- if (global.mnfight == 2)
- _temp_var = (self.attacked == 0)
- else
- _temp_var = 0
- if _temp_var
- {
- self.simp = instance_create(0, 0, self.obj_simplecontroller)
- self.simp.damage = (global.monsterat[self.myself] * 5)
- self.simp.target = self.mytarget
- self.attacked = 1
- self.rr = floor(random(5))
- if (self.rr == 0)
- global.battlemsg[0] = scr_84_get_lang_string("obj_monster1_slash_Step_0_gml_53_0")
- if (self.rr == 1)
- global.battlemsg[0] = scr_84_get_lang_string("obj_monster1_slash_Step_0_gml_54_0")
- if (self.rr == 2)
- global.battlemsg[0] = scr_84_get_lang_string("obj_monster1_slash_Step_0_gml_55_0")
- if (self.rr == 3)
- global.battlemsg[0] = scr_84_get_lang_string("obj_monster1_slash_Step_0_gml_56_0")
- if (self.rr == 4)
- global.battlemsg[0] = scr_84_get_lang_string("obj_monster1_slash_Step_0_gml_57_0")
- }
}
if (global.myfight == 3)
{
diff --git a/decomp_switch/gml_Object_obj_npc_facing_Draw_0.gml b/decomp_switch/gml_Object_obj_npc_facing_Draw_0.gml
new file mode 100755
index 0000000..118c9e8
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_npc_facing_Draw_0.gml
@@ -0,0 +1,4 @@
+draw_set_alpha(0)
+draw_rectangle_colour(self.bbox_left, self.bbox_top, self.bbox_right, self.bbox_bottom, 0x000000, 0x000000, 0x000000, 0x000000, 0)
+draw_set_alpha(1)
+draw_sprite_ext(self.sprite_index, self.image_index, self.x, self.y, self.image_xscale, self.image_yscale, 0, 0xFFFFFF, 1)
diff --git a/decomp_normal/gml_Object_obj_npc_room_Alarm_11.gml b/decomp_switch/gml_Object_obj_npc_room_Alarm_11.gml
index 0fff47f..09dcd91 100755
--- a/decomp_normal/gml_Object_obj_npc_room_Alarm_11.gml
+++ b/decomp_switch/gml_Object_obj_npc_room_Alarm_11.gml
@@ -1,3 +1,3 @@
self.alarm[11] = 6
-self.cs = instance_create(((self.x + 40) + random(10)), ((self.y + 16) + random(4)), obj_cakesmoke)
-self.cs.depth = self.depth
+local.cs = instance_create(((self.x + 40) + random(10)), ((self.y + 16) + random(4)), obj_cakesmoke)
+local.cs.depth = self.depth
diff --git a/decomp_normal/gml_Object_obj_npc_room_Create_0.gml b/decomp_switch/gml_Object_obj_npc_room_Create_0.gml
index 533911c..f0dde27 100755
--- a/decomp_normal/gml_Object_obj_npc_room_Create_0.gml
+++ b/decomp_switch/gml_Object_obj_npc_room_Create_0.gml
@@ -319,8 +319,6 @@ if (global.darkzone == 1)
self.king.sprite_index = spr_npc_cage_king
scr_depth()
self.king.depth = (self.depth - 10)
- if (global.flag[296] == 0)
- instance_destroy()
}
else
{
@@ -329,8 +327,6 @@ if (global.darkzone == 1)
self.animal.x = self.x
self.animal.y = self.y
self.animal.sprite_index = spr_npc_cage_animals
- if (global.flag[296] == 0)
- instance_destroy()
}
}
else
diff --git a/decomp_switch/gml_Object_obj_npc_room_Draw_0.gml b/decomp_switch/gml_Object_obj_npc_room_Draw_0.gml
new file mode 100755
index 0000000..118c9e8
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_npc_room_Draw_0.gml
@@ -0,0 +1,4 @@
+draw_set_alpha(0)
+draw_rectangle_colour(self.bbox_left, self.bbox_top, self.bbox_right, self.bbox_bottom, 0x000000, 0x000000, 0x000000, 0x000000, 0)
+draw_set_alpha(1)
+draw_sprite_ext(self.sprite_index, self.image_index, self.x, self.y, self.image_xscale, self.image_yscale, 0, 0xFFFFFF, 1)
diff --git a/decomp_switch/gml_Object_obj_npc_room_animated_Draw_0.gml b/decomp_switch/gml_Object_obj_npc_room_animated_Draw_0.gml
new file mode 100755
index 0000000..118c9e8
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_npc_room_animated_Draw_0.gml
@@ -0,0 +1,4 @@
+draw_set_alpha(0)
+draw_rectangle_colour(self.bbox_left, self.bbox_top, self.bbox_right, self.bbox_bottom, 0x000000, 0x000000, 0x000000, 0x000000, 0)
+draw_set_alpha(1)
+draw_sprite_ext(self.sprite_index, self.image_index, self.x, self.y, self.image_xscale, self.image_yscale, 0, 0xFFFFFF, 1)
diff --git a/decomp_switch/gml_Object_obj_npc_sign_Draw_0.gml b/decomp_switch/gml_Object_obj_npc_sign_Draw_0.gml
new file mode 100755
index 0000000..118c9e8
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_npc_sign_Draw_0.gml
@@ -0,0 +1,4 @@
+draw_set_alpha(0)
+draw_rectangle_colour(self.bbox_left, self.bbox_top, self.bbox_right, self.bbox_bottom, 0x000000, 0x000000, 0x000000, 0x000000, 0)
+draw_set_alpha(1)
+draw_sprite_ext(self.sprite_index, self.image_index, self.x, self.y, self.image_xscale, self.image_yscale, 0, 0xFFFFFF, 1)
diff --git a/decomp_normal/gml_Object_obj_ob_gen_Create_0.gml b/decomp_switch/gml_Object_obj_ob_gen_Create_0.gml
index c7687e7..c4eacde 100755
--- a/decomp_normal/gml_Object_obj_ob_gen_Create_0.gml
+++ b/decomp_switch/gml_Object_obj_ob_gen_Create_0.gml
@@ -1,6 +1,6 @@
self.timer = 999
self.con = 0
-global.charinstance[0] = 326
+global.charinstance[0] = 327
global.charinstance[1] = global.cinstance[0]
global.charinstance[2] = global.cinstance[1]
self.battlealpha = 0
diff --git a/decomp_normal/gml_Object_obj_overworld_spademaker_Create_0.gml b/decomp_switch/gml_Object_obj_overworld_spademaker_Create_0.gml
index b381558..19fad1a 100755
--- a/decomp_normal/gml_Object_obj_overworld_spademaker_Create_0.gml
+++ b/decomp_switch/gml_Object_obj_overworld_spademaker_Create_0.gml
@@ -4,7 +4,7 @@ with(obj_mainchara)
{
self.battlemode = 1
}
-global.charinstance[0] = 326
+global.charinstance[0] = 327
self.alarm[0] = 5
self.side = 0
self.homing = 0
diff --git a/decomp_normal/gml_Object_obj_overworldc_Create_0.gml b/decomp_switch/gml_Object_obj_overworldc_Create_0.gml
index ff9d1b9..6a52476 100755
--- a/decomp_normal/gml_Object_obj_overworldc_Create_0.gml
+++ b/decomp_switch/gml_Object_obj_overworldc_Create_0.gml
@@ -2,3 +2,4 @@ self.buffer = 0
self.saved = 0
self.selnoise = 0
self.movenoise = 0
+self.hasitems = 0
diff --git a/decomp_normal/gml_Object_obj_overworldc_Draw_0.gml b/decomp_switch/gml_Object_obj_overworldc_Draw_0.gml
index c0fd891..bde76ce 100755
--- a/decomp_normal/gml_Object_obj_overworldc_Draw_0.gml
+++ b/decomp_switch/gml_Object_obj_overworldc_Draw_0.gml
@@ -57,11 +57,24 @@ if (global.interact == 5)
draw_text((23 + self.xx), (40 + self.moveyy), string_hash_to_newline((scr_84_get_lang_string("obj_overworldc_slash_Draw_0_gml_37_0") + string(global.llv))))
draw_text((23 + self.xx), (58 + self.moveyy), string_hash_to_newline((scr_84_get_lang_string("obj_overworldc_slash_Draw_0_gml_39_0") + string(global.lgold))))
scr_84_set_draw_font("main")
+ if self.hasitems
+ _temp_var = 0xFFFFFF
+ else
+ _temp_var = 0x808080
+ local._itemTextColor = _temp_var
if (global.lang == "ja")
+ {
draw_text((20 + self.xx), (20 + self.moveyy), string_hash_to_newline(global.lcharname))
+ draw_set_color(local._itemTextColor)
+ draw_text((40 + self.xx), (84 + self.yy), string_hash_to_newline(scr_84_get_lang_string("obj_overworldc_slash_Draw_0_gml_42_0")))
+ }
else
+ {
draw_text((23 + self.xx), (20 + self.moveyy), string_hash_to_newline(global.lcharname))
- draw_text((42 + self.xx), (84 + self.yy), string_hash_to_newline(scr_84_get_lang_string("obj_overworldc_slash_Draw_0_gml_42_0")))
+ draw_set_color(local._itemTextColor)
+ draw_text((42 + self.xx), (84 + self.yy), string_hash_to_newline(scr_84_get_lang_string("obj_overworldc_slash_Draw_0_gml_42_0")))
+ }
+ draw_set_color(0xFFFFFF)
draw_text((42 + self.xx), (102 + self.yy), string_hash_to_newline(scr_84_get_lang_string("obj_overworldc_slash_Draw_0_gml_43_0")))
draw_text((42 + self.xx), (120 + self.yy), string_hash_to_newline(scr_84_get_lang_string("obj_overworldc_slash_Draw_0_gml_44_0")))
if (global.menuno == 1)
diff --git a/decomp_normal/gml_Object_obj_overworldc_Step_0.gml b/decomp_switch/gml_Object_obj_overworldc_Step_0.gml
index 2afa504..5df3ce6 100755
--- a/decomp_normal/gml_Object_obj_overworldc_Step_0.gml
+++ b/decomp_switch/gml_Object_obj_overworldc_Step_0.gml
@@ -1,3 +1,4 @@
+self.hasitems = (global.litem[0] != 0)
if (global.interact == 5)
{
self.currentmenu = global.menuno
@@ -213,7 +214,7 @@ if scr_debug()
if keyboard_check_pressed('F')
self.room_speed = 58
if keyboard_check_pressed('L')
- scr_load()
+ ossafe_savedata_load()
if keyboard_check_pressed('R')
game_restart_true()
}
diff --git a/decomp_switch/gml_Object_obj_roomcontroller_Other_4.gml b/decomp_switch/gml_Object_obj_roomcontroller_Other_4.gml
new file mode 100755
index 0000000..e3e2053
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_roomcontroller_Other_4.gml
@@ -0,0 +1,2 @@
+global.currentroom = self.room
+show_debug_message(("global.currentroom : " + string(room_get_name(self.room))))
diff --git a/decomp_switch/gml_Object_obj_roomcontroller_PreCreate_0.gml b/decomp_switch/gml_Object_obj_roomcontroller_PreCreate_0.gml
new file mode 100755
index 0000000..f333bfe
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_roomcontroller_PreCreate_0.gml
@@ -0,0 +1 @@
+event_inherited()
diff --git a/decomp_normal/gml_Object_obj_savemenu_Create_0.gml b/decomp_switch/gml_Object_obj_savemenu_Create_0.gml
index 9ee543d..863d118 100755
--- a/decomp_normal/gml_Object_obj_savemenu_Create_0.gml
+++ b/decomp_switch/gml_Object_obj_savemenu_Create_0.gml
@@ -9,18 +9,17 @@ self.love = 1
self.time = 0
self.roome = 0
self.endme = 0
-global.currentroom = self.room
global.interact = 1
-if file_exists("dr.ini")
+if ossafe_file_exists("dr.ini")
{
self.ini_ex = 1
- self.iniread = ini_open("dr.ini")
+ self.iniread = ossafe_ini_open("dr.ini")
self.name = ini_read_string(("G" + string(global.filechoice)), "Name", "Kris")
self.level = ini_read_real(("G" + string(global.filechoice)), "Level", 1)
self.love = ini_read_real(("G" + string(global.filechoice)), "Love", 1)
self.time = ini_read_real(("G" + string(global.filechoice)), "Time", 0)
self.roome = ini_read_real(("G" + string(global.filechoice)), "Room", 0)
- ini_close()
+ ossafe_ini_close()
}
self.d = (global.darkzone + 1)
self.minutes = floor((self.time / 1800))
diff --git a/decomp_normal/gml_Object_obj_savepoint_Other_10.gml b/decomp_switch/gml_Object_obj_savepoint_Other_10.gml
index 103a7fe..8beff73 100755
--- a/decomp_normal/gml_Object_obj_savepoint_Other_10.gml
+++ b/decomp_switch/gml_Object_obj_savepoint_Other_10.gml
@@ -6,7 +6,6 @@ global.fc = 0
global.fe = 0
global.interact = 1
self.nodialogue = 1
-global.currentroom = self.room
if (self.room == room_dark1a)
{
self.nodialogue = 0
diff --git a/decomp_normal/gml_Object_obj_scissordancer_Create_0.gml b/decomp_switch/gml_Object_obj_scissordancer_Create_0.gml
index 66a6fbf..a8efa5c 100755
--- a/decomp_normal/gml_Object_obj_scissordancer_Create_0.gml
+++ b/decomp_switch/gml_Object_obj_scissordancer_Create_0.gml
@@ -4,7 +4,7 @@ self.sndtimer = 0
self.dancetimer = (0 - (instance_number(self.object_index) * 2))
self.image_xscale = 2
self.image_yscale = 2
-global.charinstance[0] = 326
+global.charinstance[0] = 327
global.charinstance[1] = global.cinstance[0]
global.charinstance[2] = global.cinstance[1]
self.con = 0
diff --git a/decomp_normal/gml_Object_obj_shop1_Draw_0.gml b/decomp_switch/gml_Object_obj_shop1_Draw_0.gml
index cd32abf..fa2a2bc 100755
--- a/decomp_normal/gml_Object_obj_shop1_Draw_0.gml
+++ b/decomp_switch/gml_Object_obj_shop1_Draw_0.gml
@@ -226,12 +226,12 @@ if _temp_var
if (global.lang == "ja")
{
draw_text(460, 290, string_hash_to_newline(scr_84_get_lang_string("obj_shop1_slash_Draw_0_gml_167_0")))
- draw_text(460, 260, string_hash_to_newline((string(self.buyvalue[self.menuc[1]]) + scr_84_get_lang_string("obj_shop1_slash_Draw_0_gml_168_0"))))
+ draw_text(460, 260, ("$" + string_hash_to_newline((string(self.buyvalue[self.menuc[1]]) + scr_84_get_lang_string("obj_shop1_slash_Draw_0_gml_168_0")))))
}
else
{
draw_text(460, 260, string_hash_to_newline(scr_84_get_lang_string("obj_shop1_slash_Draw_0_gml_167_0")))
- draw_text(460, 290, string_hash_to_newline((string(self.buyvalue[self.menuc[1]]) + scr_84_get_lang_string("obj_shop1_slash_Draw_0_gml_168_0"))))
+ draw_text(460, 290, ("$" + string_hash_to_newline((string(self.buyvalue[self.menuc[1]]) + scr_84_get_lang_string("obj_shop1_slash_Draw_0_gml_168_0")))))
}
draw_text(480, 340, string_hash_to_newline(scr_84_get_lang_string("obj_shop1_slash_Draw_0_gml_169_0")))
draw_text(480, 370, string_hash_to_newline(scr_84_get_lang_string("obj_shop1_slash_Draw_0_gml_170_0")))
@@ -545,12 +545,12 @@ if _temp_var
if (global.lang == "ja")
{
draw_text(460, 290, string_hash_to_newline(scr_84_get_lang_string("obj_shop1_slash_Draw_0_gml_365_0")))
- draw_text(460, 260, string_hash_to_newline((string(self.sellvalue) + scr_84_get_lang_string("obj_shop1_slash_Draw_0_gml_366_0"))))
+ draw_text(460, 260, ("$" + string_hash_to_newline((string(self.sellvalue) + scr_84_get_lang_string("obj_shop1_slash_Draw_0_gml_366_0")))))
}
else
{
draw_text(460, 260, string_hash_to_newline(scr_84_get_lang_string("obj_shop1_slash_Draw_0_gml_365_0")))
- draw_text(460, 290, string_hash_to_newline((string(self.sellvalue) + scr_84_get_lang_string("obj_shop1_slash_Draw_0_gml_366_0"))))
+ draw_text(460, 290, ("$" + string_hash_to_newline((string(self.sellvalue) + scr_84_get_lang_string("obj_shop1_slash_Draw_0_gml_366_0")))))
}
draw_text(480, 340, string_hash_to_newline(scr_84_get_lang_string("obj_shop1_slash_Draw_0_gml_367_0")))
draw_text(480, 370, string_hash_to_newline(scr_84_get_lang_string("obj_shop1_slash_Draw_0_gml_368_0")))
@@ -749,7 +749,7 @@ else
_temp_var = (self.menu >= 10)
if _temp_var
{
- draw_text(440, 420, string_hash_to_newline((string(global.gold) + "$")))
+ draw_text(440, 420, ("$" + string_hash_to_newline(string(global.gold))))
if (self.menu == 1)
_temp_var = 1
else
diff --git a/decomp_normal/gml_Object_obj_shop2_Draw_0.gml b/decomp_switch/gml_Object_obj_shop2_Draw_0.gml
index 92b87a3..fa2a39d 100755
--- a/decomp_normal/gml_Object_obj_shop2_Draw_0.gml
+++ b/decomp_switch/gml_Object_obj_shop2_Draw_0.gml
@@ -180,12 +180,12 @@ if _temp_var
if (global.lang == "ja")
{
draw_text(460, 290, string_hash_to_newline(scr_84_get_lang_string("obj_shop2_slash_Draw_0_gml_144_0")))
- draw_text(460, 260, string_hash_to_newline((string(self.buyvalue[self.menuc[1]]) + scr_84_get_lang_string("obj_shop2_slash_Draw_0_gml_145_0"))))
+ draw_text(460, 260, ("$" + string_hash_to_newline((string(self.buyvalue[self.menuc[1]]) + scr_84_get_lang_string("obj_shop2_slash_Draw_0_gml_145_0")))))
}
else
{
draw_text(460, 260, string_hash_to_newline(scr_84_get_lang_string("obj_shop2_slash_Draw_0_gml_144_0")))
- draw_text(460, 290, string_hash_to_newline((string(self.buyvalue[self.menuc[1]]) + scr_84_get_lang_string("obj_shop2_slash_Draw_0_gml_145_0"))))
+ draw_text(460, 290, ("$" + string_hash_to_newline((string(self.buyvalue[self.menuc[1]]) + scr_84_get_lang_string("obj_shop2_slash_Draw_0_gml_145_0")))))
}
draw_text(480, 340, string_hash_to_newline(scr_84_get_lang_string("obj_shop2_slash_Draw_0_gml_146_0")))
draw_text(480, 370, string_hash_to_newline(scr_84_get_lang_string("obj_shop2_slash_Draw_0_gml_147_0")))
@@ -478,12 +478,12 @@ if _temp_var
if (global.lang == "ja")
{
draw_text(460, 290, string_hash_to_newline(scr_84_get_lang_string("obj_shop2_slash_Draw_0_gml_323_0")))
- draw_text(460, 260, string_hash_to_newline((string(self.sellvalue) + scr_84_get_lang_string("obj_shop2_slash_Draw_0_gml_324_0"))))
+ draw_text(460, 260, ("$" + string_hash_to_newline((string(self.sellvalue) + scr_84_get_lang_string("obj_shop2_slash_Draw_0_gml_324_0")))))
}
else
{
draw_text(460, 260, string_hash_to_newline(scr_84_get_lang_string("obj_shop2_slash_Draw_0_gml_323_0")))
- draw_text(460, 290, string_hash_to_newline((string(self.sellvalue) + scr_84_get_lang_string("obj_shop2_slash_Draw_0_gml_324_0"))))
+ draw_text(460, 290, ("$" + string_hash_to_newline((string(self.sellvalue) + scr_84_get_lang_string("obj_shop2_slash_Draw_0_gml_324_0")))))
}
draw_text(480, 340, string_hash_to_newline(scr_84_get_lang_string("obj_shop2_slash_Draw_0_gml_325_0")))
draw_text(480, 370, string_hash_to_newline(scr_84_get_lang_string("obj_shop2_slash_Draw_0_gml_326_0")))
@@ -634,7 +634,7 @@ else
_temp_var = (self.menu >= 10)
if _temp_var
{
- draw_text(440, 420, string_hash_to_newline((string(global.gold) + "$")))
+ draw_text(440, 420, ("$" + string_hash_to_newline(string(global.gold))))
if (self.menu == 1)
_temp_var = 1
else
diff --git a/decomp_switch/gml_Object_obj_splashscreen_Create_0.gml b/decomp_switch/gml_Object_obj_splashscreen_Create_0.gml
new file mode 100755
index 0000000..895dcd9
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_splashscreen_Create_0.gml
@@ -0,0 +1,61 @@
+self.xx = __view_get(e__VW.XView, 0)
+self.yy = __view_get(e__VW.YView, 0)
+self.text_alpha_a = 0
+self.text_alpha_b = 0
+self.loaded = 0
+self.heart_pos_y = (self.yy + 288)
+self.heart_pos_y_ja = (self.yy + 328)
+if (global.lang == "ja")
+ _temp_var = -20
+else
+ _temp_var = -10
+self.heart_pos_x_padding = _temp_var
+self.heart_pos_x_default = ((self.xx + 200) + self.heart_pos_x_padding)
+self.heart_pos_x = self.heart_pos_x_default
+if (global.lang == "ja")
+ _temp_var = 140
+else
+ _temp_var = 155
+self.heart_pos_x_h_padding = _temp_var
+self.line_height = 50
+self.line_height_ja = 33
+self.select_padding = 45
+self.confirming = 0
+self.visit_shop = 0
+self.selected = 0
+self.buffer = 0
+self.played_text_en = "This program is intended for players#who are already familiar with UNDERTALE."
+self.played_text_ja_1 = "このプログラムは、"
+self.played_text_ja_2 = "すでに「UNDERTALE」をプレイした方向けです。"
+self.check_text_en = "Would you like to check out UNDERTALE first?"
+self.check_text_ja_1 = "まだプレイしたことのない方は、"
+self.check_text_ja_2 = "まずは「UNDERTALE」をチェックしてみませんか？"
+if (global.lang == "en")
+ _temp_var = @@NewGMLArray@@("Yes", "No")
+else
+ _temp_var = @@NewGMLArray@@("はい", "いいえ")
+self.shop_options = _temp_var
+if (global.lang == "en")
+ _temp_var = "Nintendo eShop"
+else
+ _temp_var = "ニンテンドーeショップ"
+self.shop_text = _temp_var
+if (self.os_type == os_ps4)
+{
+ if (global.lang == "en")
+ _temp_var = "Playstation Store"
+ else
+ _temp_var = "Playstation Store"
+ self.shop_text = _temp_var
+}
+if (global.lang == "en")
+ _temp_var = "Check Out UNDERTALE"
+else
+ _temp_var = "「UNDERTALE」をチェック"
+self.check_undertale = _temp_var
+if (global.lang == "en")
+ _temp_var = "Start DELTARUNE"
+else
+ _temp_var = "「DELTARUNE」をプレイ"
+self.start_dr = _temp_var
+global.currentroom = self.room
diff --git a/decomp_switch/gml_Object_obj_splashscreen_Draw_0.gml b/decomp_switch/gml_Object_obj_splashscreen_Draw_0.gml
new file mode 100755
index 0000000..9eb4be1
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_splashscreen_Draw_0.gml
@@ -0,0 +1,100 @@
+scr_84_set_draw_font("mainbig")
+draw_set_valign(fa_bottom)
+if (! self.visit_shop)
+{
+ if (global.lang == "en")
+ {
+ draw_set_valign(fa_middle)
+ draw_set_halign(fa_center)
+ draw_set_color(0xFFFFFF)
+ draw_text_color((self.xx + (self.room_width * 0.5)), (self.yy + 160), string_hash_to_newline(self.played_text_en), 0xFFFFFF, 0xFFFFFF, 0xFFFFFF, 0xFFFFFF, self.text_alpha_a)
+ draw_text_color((self.xx + (self.room_width * 0.5)), (self.yy + 240), string_hash_to_newline(self.check_text_en), 0xFFFFFF, 0xFFFFFF, 0xFFFFFF, 0xFFFFFF, self.text_alpha_b)
+ draw_set_valign(fa_top)
+ draw_set_halign(fa_left)
+ draw_sprite_ext(spr_heart, 0, (self.xx + 170), self.heart_pos_y, 1, 1, 0, 0xFFFFFF, self.text_alpha_b)
+ local._colorA = 0xFFFFFF
+ if (self.heart_pos_y == (self.yy + 288))
+ {
+ if self.selected
+ _temp_var = 0x0000FF
+ else
+ _temp_var = 0xFFFF00
+ local._colorA = _temp_var
+ }
+ draw_set_color(local._colorA)
+ draw_text_color((self.xx + 220), (self.yy + 280), self.check_undertale, local._colorA, local._colorA, local._colorA, local._colorA, self.text_alpha_b)
+ local._colorB = 0xFFFFFF
+ if (self.heart_pos_y == ((self.yy + 288) + self.line_height))
+ {
+ if self.selected
+ _temp_var = 0x0000FF
+ else
+ _temp_var = 0xFFFF00
+ local._colorB = _temp_var
+ }
+ draw_set_color(local._colorB)
+ draw_text_color((self.xx + 220), ((self.yy + 280) + self.line_height), self.start_dr, local._colorB, local._colorB, local._colorB, local._colorB, self.text_alpha_b)
+ }
+ else
+ {
+ draw_set_valign(fa_middle)
+ draw_set_halign(fa_center)
+ draw_set_color(0xFFFFFF)
+ draw_text_color((self.xx + (self.room_width * 0.5)), (self.yy + 125), self.played_text_ja_1, 0xFFFFFF, 0xFFFFFF, 0xFFFFFF, 0xFFFFFF, self.text_alpha_a)
+ draw_text_color((self.xx + (self.room_width * 0.5)), ((self.yy + 125) + self.line_height_ja), self.played_text_ja_2, 0xFFFFFF, 0xFFFFFF, 0xFFFFFF, 0xFFFFFF, self.text_alpha_a)
+ draw_text_color((self.xx + (self.room_width * 0.5)), (self.yy + 225), self.check_text_ja_1, 0xFFFFFF, 0xFFFFFF, 0xFFFFFF, 0xFFFFFF, self.text_alpha_b)
+ draw_text_color((self.xx + (self.room_width * 0.5)), ((self.yy + 225) + self.line_height_ja), self.check_text_ja_2, 0xFFFFFF, 0xFFFFFF, 0xFFFFFF, 0xFFFFFF, self.text_alpha_b)
+ draw_set_valign(fa_top)
+ draw_set_halign(fa_left)
+ draw_sprite_ext(spr_heart, 0, (self.xx + 170), self.heart_pos_y_ja, 1, 1, 0, 0xFFFFFF, self.text_alpha_b)
+ local._colorA = 0xFFFFFF
+ if (self.heart_pos_y_ja == (self.yy + 328))
+ {
+ if self.selected
+ _temp_var = 255
+ else
+ _temp_var = 16776960
+ local._colorA = _temp_var
+ }
+ draw_set_color(local._colorA)
+ draw_text_color((self.xx + 189), (self.yy + 318), self.check_undertale, local._colorA, local._colorA, local._colorA, local._colorA, self.text_alpha_b)
+ local._colorB = 0xFFFFFF
+ if (self.heart_pos_y_ja == ((self.yy + 328) + self.select_padding))
+ {
+ if self.selected
+ _temp_var = 255
+ else
+ _temp_var = 16776960
+ local._colorB = _temp_var
+ }
+ draw_set_color(local._colorB)
+ draw_text_color((self.xx + 189), ((self.yy + 318) + self.select_padding), self.start_dr, local._colorB, local._colorB, local._colorB, local._colorB, self.text_alpha_b)
+ }
+}
+else
+{
+ draw_set_valign(fa_middle)
+ draw_set_halign(fa_center)
+ draw_set_color(0xFFFFFF)
+ if (global.lang == "en")
+ draw_text((self.xx + (self.room_width * 0.5)), (self.yy + 220), ((string_hash_to_newline("Visit the UNDERTALE page#in the ") + self.shop_text) + "?"))
+ else
+ draw_text((self.xx + (self.room_width * 0.5)), (self.yy + 220), (self.shop_text + string_hash_to_newline("で「UNDERTALE」の#ページをチェックしますか？ ")))
+ draw_sprite(spr_heart, 0, self.heart_pos_x, (self.yy + 271))
+ local.i = 0
+ while(true)
+ {
+ if (local.i < array_length_1d(self.shop_options))
+ {
+ draw_set_color(0xFFFFFF)
+ local._xPos = (self.heart_pos_x_default + (local.i * self.heart_pos_x_h_padding))
+ if (self.heart_pos_x == local._xPos)
+ draw_set_color(0xFFFF00)
+ draw_text(((self.xx + 240) + (local.i * 150)), (self.yy + 280), self.shop_options[local.i])
+ local.i = (local.i + 1)
+ continue
+ }
+ break
+ }
+ draw_set_halign(fa_left)
+}
diff --git a/decomp_switch/gml_Object_obj_splashscreen_PreCreate_0.gml b/decomp_switch/gml_Object_obj_splashscreen_PreCreate_0.gml
new file mode 100755
index 0000000..f333bfe
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_splashscreen_PreCreate_0.gml
@@ -0,0 +1 @@
+event_inherited()
diff --git a/decomp_switch/gml_Object_obj_splashscreen_Step_0.gml b/decomp_switch/gml_Object_obj_splashscreen_Step_0.gml
new file mode 100755
index 0000000..ee9456a
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_splashscreen_Step_0.gml
@@ -0,0 +1,113 @@
+if self.loaded
+{
+ if self.visit_shop
+ {
+ self.buffer = (self.buffer + 1)
+ if left_p()
+ {
+ snd_play(snd_menumove)
+ self.heart_pos_x = self.heart_pos_x_default
+ }
+ if right_p()
+ {
+ snd_play(snd_menumove)
+ self.heart_pos_x = (self.heart_pos_x_default + self.heart_pos_x_h_padding)
+ }
+ if button1_p()
+ _temp_var = (self.buffer >= 3)
+ else
+ _temp_var = 0
+ if _temp_var
+ {
+ self.buffer = 0
+ snd_play(snd_menumove)
+ if (self.heart_pos_x == self.heart_pos_x_default)
+ {
+ if (self.os_type == os_switch)
+ switch_show_store(72199087622348800)
+ }
+ else
+ {
+ if (self.heart_pos_x == (self.heart_pos_x_default + self.heart_pos_x_h_padding))
+ self.visit_shop = 0
+ }
+ }
+ if button2_p()
+ {
+ snd_play(snd_menumove)
+ self.visit_shop = 0
+ }
+ }
+ else
+ {
+ if up_p()
+ {
+ snd_play(snd_menumove)
+ if (global.lang == "en")
+ {
+ if (self.heart_pos_y == ((self.yy + 288) + self.line_height))
+ self.heart_pos_y = (self.heart_pos_y - self.line_height)
+ }
+ else
+ {
+ if (self.heart_pos_y_ja == ((self.yy + 328) + self.select_padding))
+ self.heart_pos_y_ja = (self.heart_pos_y_ja - self.select_padding)
+ }
+ }
+ if down_p()
+ {
+ snd_play(snd_menumove)
+ if (global.lang == "en")
+ {
+ if (self.heart_pos_y == (self.yy + 288))
+ self.heart_pos_y = (self.heart_pos_y + self.line_height)
+ }
+ else
+ {
+ if (self.heart_pos_y_ja == (self.yy + 328))
+ self.heart_pos_y_ja = (self.heart_pos_y_ja + self.select_padding)
+ }
+ }
+ if button1_p()
+ {
+ snd_play(snd_menumove)
+ if (global.lang == "en")
+ {
+ if (self.heart_pos_y == (self.yy + 288))
+ {
+ self.heart_pos_x = self.heart_pos_x_default
+ self.visit_shop = 1
+ }
+ else
+ {
+ if (self.heart_pos_y == ((self.yy + 288) + self.line_height))
+ room_goto(PLACE_CONTACT)
+ }
+ }
+ else
+ {
+ if (self.heart_pos_y_ja == (self.yy + 328))
+ {
+ self.heart_pos_x = self.heart_pos_x_default
+ self.visit_shop = 1
+ }
+ else
+ {
+ if (self.heart_pos_y_ja == ((self.yy + 328) + self.select_padding))
+ room_goto(PLACE_CONTACT)
+ }
+ }
+ }
+ }
+}
+else
+{
+ if (self.text_alpha_a < 1)
+ self.text_alpha_a = (self.text_alpha_a + 0.015)
+ if (self.text_alpha_a >= 1)
+ {
+ if (self.text_alpha_b < 1)
+ self.text_alpha_b = (self.text_alpha_b + 0.015)
+ }
+ self.loaded = (self.text_alpha_b >= 1)
+}
diff --git a/decomp_normal/gml_Object_obj_susieenemy_Create_0.gml b/decomp_switch/gml_Object_obj_susieenemy_Create_0.gml
index 5f1d66a..907eb9f 100755
--- a/decomp_normal/gml_Object_obj_susieenemy_Create_0.gml
+++ b/decomp_switch/gml_Object_obj_susieenemy_Create_0.gml
@@ -1,3 +1,4 @@
+global.turntimer = 0
self.bikeflip = 0
self.becomeflash = 0
self.turnt = 0
diff --git a/decomp_normal/gml_Object_obj_thrashmaker_event_Step_0.gml b/decomp_switch/gml_Object_obj_thrashmaker_event_Step_0.gml
index 895f4b9..76dbf7b 100755
--- a/decomp_normal/gml_Object_obj_thrashmaker_event_Step_0.gml
+++ b/decomp_switch/gml_Object_obj_thrashmaker_event_Step_0.gml
@@ -564,9 +564,9 @@ if (self.con == 55)
instance_destroy()
}
event_user(1)
- scr_tempsave()
self.con = 56
global.flag[226] = 1
global.interact = 0
+ scr_tempsave()
instance_destroy()
}
diff --git a/decomp_normal/gml_Object_obj_time_Create_0.gml b/decomp_switch/gml_Object_obj_time_Create_0.gml
index 302136c..9b91bcd 100755
--- a/decomp_normal/gml_Object_obj_time_Create_0.gml
+++ b/decomp_switch/gml_Object_obj_time_Create_0.gml
@@ -1,12 +1,15 @@
self.quit_timer = 0
self.keyboard_active = 1
-self.gamepad_active = 1
-self.gamepad_check_timer = 0
-self.gamepad_id = 0
self.axis_value = 0.4
self.fullscreen_toggle = 0
self.window_center_toggle = 0
self.screenshot_number = 0
+self.border_fade_out = 0
+self.border_fade_in = 0
+self.border_alpha = 1
+self.border_fade_value = 0.025
+self.loaded = 0
+self.paused = 0
if (instance_number(obj_time) > 1)
instance_destroy()
else
@@ -35,6 +38,12 @@ else
window_set_size((640 * self.window_size_multiplier), (480 * self.window_size_multiplier))
self.window_center_toggle = 1
}
+ if (self.os_type == os_switch)
+ {
+ switch_controller_support_set_defaults()
+ switch_controller_support_set_singleplayer_only(1)
+ switch_controller_set_supported_styles(7)
+ }
scr_controls_default()
scr_ascii_input_names()
self.i = 0
@@ -50,4 +59,15 @@ else
}
break
}
+ if (self.os_type == os_switch)
+ _temp_var = 1
+ else
+ _temp_var = (self.os_type == os_ps4)
+ local._isConsole = _temp_var
+ if local._isConsole
+ {
+ application_surface_enable(1)
+ application_surface_draw_enable(0)
+ }
+ scr_enable_screen_border(local._isConsole)
}
diff --git a/decomp_switch/gml_Object_obj_time_Draw_75.gml b/decomp_switch/gml_Object_obj_time_Draw_75.gml
new file mode 100755
index 0000000..e7fc848
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_time_Draw_75.gml
@@ -0,0 +1,26 @@
+if (self.os_type == os_ps4)
+{
+ if os_is_paused()
+ _temp_var = (! self.paused)
+ else
+ _temp_var = 0
+ if _temp_var
+ {
+ self.paused = 1
+ audio_pause_all()
+ instance_deactivate_all(1)
+ }
+ else
+ {
+ if (! os_is_paused())
+ _temp_var = self.paused
+ else
+ _temp_var = 0
+ if _temp_var
+ {
+ instance_activate_all()
+ audio_resume_all()
+ self.paused = 0
+ }
+ }
+}
diff --git a/decomp_switch/gml_Object_obj_time_Draw_76.gml b/decomp_switch/gml_Object_obj_time_Draw_76.gml
new file mode 100755
index 0000000..21ac961
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_time_Draw_76.gml
@@ -0,0 +1,23 @@
+local.ww = window_get_width()
+local.wh = window_get_height()
+local.sw = surface_get_width(self.application_surface)
+local.sh = surface_get_height(self.application_surface)
+local.scale_w = (local.ww / local.sw)
+local.scale_h = (local.wh / local.sh)
+if (self.os_type == os_switch)
+ _temp_var = 1
+else
+ _temp_var = (self.os_type == os_ps4)
+if _temp_var
+{
+ if (self.os_type == os_switch)
+ _temp_var = (local.wh == 720)
+ else
+ _temp_var = 0
+ if _temp_var
+ global.window_scale = 1.33333333333333
+ else
+ global.window_scale = floor(min(local.scale_w, local.scale_h))
+}
+else
+ global.window_scale = min(local.scale_w, local.scale_h)
diff --git a/decomp_switch/gml_Object_obj_time_Draw_77.gml b/decomp_switch/gml_Object_obj_time_Draw_77.gml
new file mode 100755
index 0000000..bc79e1a
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_time_Draw_77.gml
@@ -0,0 +1,90 @@
+if (self.os_type == os_switch)
+ _temp_var = 1
+else
+ _temp_var = (self.os_type == os_ps4)
+if _temp_var
+{
+ local.ww = window_get_width()
+ local.wh = window_get_height()
+ local.sw = surface_get_width(self.application_surface)
+ local.sh = surface_get_height(self.application_surface)
+ local.xx = floor(((local.ww - (local.sw * global.window_scale)) / 2))
+ local.yy = floor(((local.wh - (local.sh * global.window_scale)) / 2))
+ global.window_xofs = local.xx
+ global.window_yofs = local.yy
+ if (self.os_type == os_switch)
+ _temp_var = (local.wh == 720)
+ else
+ _temp_var = 0
+ if _temp_var
+ texture_set_interpolation(1)
+ else
+ texture_set_interpolation(0)
+ if global.screen_border_active
+ _temp_var = (self.border_alpha >= 0)
+ else
+ _temp_var = 0
+ if _temp_var
+ {
+ scr_draw_screen_border(global.screen_border_id)
+ if (self.border_alpha < 1)
+ {
+ draw_set_alpha((1 - self.border_alpha))
+ draw_set_color(0x000000)
+ ossafe_fill_rectangle(0, 0, (local.ww - 1), (local.wh - 1))
+ draw_set_alpha(1)
+ draw_set_color(0xFFFFFF)
+ }
+ }
+ else
+ {
+ local.room_id = global.currentroom
+ if instance_exists(obj_savepoint)
+ global.disable_border = 0
+ if (local.room_id == 1)
+ _temp_var = 1
+ else
+ {
+ if (local.room_id == 309)
+ _temp_var = 1
+ else
+ {
+ if (local.room_id == 139)
+ _temp_var = 1
+ else
+ {
+ if (local.room_id == 145)
+ _temp_var = 1
+ else
+ {
+ if (local.room_id == 135)
+ _temp_var = 1
+ else
+ {
+ if (local.room_id == 131)
+ _temp_var = 1
+ else
+ {
+ if (local.room_id == 35)
+ _temp_var = 1
+ else
+ _temp_var = (local.room_id == 40)
+ }
+ }
+ }
+ }
+ }
+ }
+ if _temp_var
+ global.disable_border = 1
+ }
+ draw_enable_alphablend(0)
+ draw_surface_ext(self.application_surface, local.xx, local.yy, global.window_scale, global.window_scale, 0, 16777215, 1)
+ draw_enable_alphablend(1)
+ texture_set_interpolation(0)
+}
+else
+{
+ global.window_xofs = 0
+ global.window_yofs = 0
+}
diff --git a/decomp_switch/gml_Object_obj_time_Other_72.gml b/decomp_switch/gml_Object_obj_time_Other_72.gml
new file mode 100755
index 0000000..54a4b0f
--- /dev/null
+++ b/decomp_switch/gml_Object_obj_time_Other_72.gml
@@ -0,0 +1,36 @@
+if (ds_map_find_value(self.async_load, "id") == global.savedata_async_id)
+{
+ global.savedata_async_id = -1
+ if global.savedata_async_load
+ local.type = "load"
+ else
+ local.type = "save"
+ if (ds_map_find_value(self.async_load, "status") < 0)
+ {
+ global.savedata_error = 1
+ global.savedata_debuginfo = ((local.type + " failed: ") + string(ds_map_find_value(self.async_load, "status")))
+ if global.savedata_async_load
+ {
+ global.savedata = ds_map_create()
+ global.savedata_async_load = 0
+ }
+ }
+ else
+ {
+ global.savedata_error = 0
+ global.savedata_debuginfo = (local.type + " succeeded")
+ if global.savedata_async_load
+ {
+ local.json = buffer_read(global.savedata_buffer, 11)
+ global.savedata = json_decode(local.json)
+ global.savedata_async_load = 0
+ }
+ else
+ {
+ if (self.os_type == os_switch)
+ switch_save_data_commit()
+ }
+ }
+ buffer_delete(global.savedata_buffer)
+ global.savedata_buffer = self.undefined
+}
diff --git a/decomp_normal/gml_Object_obj_time_Step_1.gml b/decomp_switch/gml_Object_obj_time_Step_1.gml
index 8b52c53..b52f033 100755
--- a/decomp_normal/gml_Object_obj_time_Step_1.gml
+++ b/decomp_switch/gml_Object_obj_time_Step_1.gml
@@ -1,4 +1,7 @@
-global.time = (global.time + 1)
+if (! self.paused)
+ global.time = (global.time + 1)
+else
+ return
if scr_debug()
{
if scr_84_debug(1)
@@ -16,7 +19,7 @@ if keyboard_check(vk_escape)
self.quit_timer = 0
self.quit_timer = (self.quit_timer + 1)
if (self.quit_timer >= 30)
- game_end()
+ ossafe_game_end()
}
else
self.quit_timer = (self.quit_timer - 2)
@@ -28,16 +31,18 @@ if (self.fullscreen_toggle == 1)
if window_get_fullscreen()
{
window_set_fullscreen(0)
- ini_open("true_config.ini")
+ ossafe_ini_open("true_config.ini")
ini_write_real("SCREEN", "FULLSCREEN", 0)
- ini_close()
+ ossafe_ini_close()
+ ossafe_savedata_save()
}
else
{
window_set_fullscreen(1)
- ini_open("true_config.ini")
+ ossafe_ini_open("true_config.ini")
ini_write_real("SCREEN", "FULLSCREEN", 1)
- ini_close()
+ ossafe_ini_close()
+ ossafe_savedata_save()
}
}
if (self.window_center_toggle == 2)
@@ -59,73 +64,61 @@ while(true)
}
break
}
-self.gamepad_check_timer = (self.gamepad_check_timer + 1)
-if (self.gamepad_check_timer >= 90)
+if (obj_gamecontroller.gamepad_active == 1)
{
- if gamepad_is_connected(0)
- {
- self.gamepad_active = 1
- self.gamepad_id = 0
- }
- else
- self.gamepad_active = 0
- self.gamepad_check_timer = 0
-}
-if (self.gamepad_active == 1)
-{
- self.i = 0
+ local.j = 0
while(true)
{
- if (self.i < 4)
+ if (local.j < 4)
{
- if keyboard_check(global.input_k[self.i])
+ if keyboard_check(global.input_k[local.j])
_temp_var = 1
else
{
- if gamepad_button_check(0, global.input_g[self.i])
+ if gamepad_button_check(obj_gamecontroller.gamepad_id, global.input_g[local.j])
_temp_var = 1
else
- _temp_var = scr_gamepad_axis_check(0, self.i)
+ _temp_var = scr_gamepad_axis_check(obj_gamecontroller.gamepad_id, local.j)
}
if _temp_var
{
- if (global.input_held[self.i] == 0)
- global.input_pressed[self.i] = 1
- global.input_held[self.i] = 1
+ if (global.input_held[local.j] == 0)
+ global.input_pressed[local.j] = 1
+ global.input_held[local.j] = 1
}
else
{
- if (global.input_held[self.i] == 1)
- global.input_released[self.i] = 1
- global.input_held[self.i] = 0
+ if (global.input_held[local.j] == 1)
+ global.input_released[local.j] = 1
+ global.input_held[local.j] = 0
}
- self.i = (self.i + 1)
+ local.j = (local.j + 1)
continue
}
break
}
- self.i = 4
+ local.k = 4
while(true)
{
- if (self.i < 10)
+ if (local.k < 10)
{
- if keyboard_check(global.input_k[self.i])
+ if keyboard_check(global.input_k[local.k])
_temp_var = 1
else
- _temp_var = gamepad_button_check(0, global.input_g[self.i])
+ _temp_var = gamepad_button_check(obj_gamecontroller.gamepad_id, global.input_g[local.k])
if _temp_var
{
- if (global.input_held[self.i] == 0)
- global.input_pressed[self.i] = 1
- global.input_held[self.i] = 1
+ if (global.input_held[local.k] == 0)
+ global.input_pressed[local.k] = 1
+ global.input_held[local.k] = 1
}
else
{
- if (global.input_held[self.i] == 1)
- global.input_released[self.i] = 1
- global.input_held[self.i] = 0
+ if (global.input_held[local.k] == 1)
+ global.input_released[local.k] = 1
+ global.input_held[local.k] = 0
}
- self.i = (self.i + 1)
+ local.k = (local.k + 1)
continue
}
break
@@ -133,26 +126,47 @@ if (self.gamepad_active == 1)
}
else
{
- self.i = 0
+ local.l = 0
while(true)
{
- if (self.i < 10)
+ if (local.l < 10)
{
- if keyboard_check(global.input_k[self.i])
+ if keyboard_check(global.input_k[local.l])
{
- if (global.input_held[self.i] == 0)
- global.input_pressed[self.i] = 1
- global.input_held[self.i] = 1
+ if (global.input_held[local.l] == 0)
+ global.input_pressed[local.l] = 1
+ global.input_held[local.l] = 1
}
else
{
- if (global.input_held[self.i] == 1)
- global.input_released[self.i] = 1
- global.input_held[self.i] = 0
+ if (global.input_held[local.l] == 1)
+ global.input_released[local.l] = 1
+ global.input_held[local.l] = 0
}
- self.i = (self.i + 1)
+ local.l = (local.l + 1)
continue
}
break
}
}
+if self.border_fade_out
+{
+ if (self.border_alpha > 0)
+ {
+ self.border_alpha = (self.border_alpha - self.border_fade_value)
+ if (self.border_alpha <= 0)
+ self.border_alpha = 0
+ }
+}
+else
+{
+ if self.border_fade_in
+ {
+ if (self.border_alpha <= 1)
+ {
+ self.border_alpha = (self.border_alpha + self.border_fade_value)
+ if (self.border_alpha >= 1)
+ self.border_alpha = 1
+ }
+ }
+}
diff --git a/decomp_normal/gml_Object_obj_wobblything_evil_Create_0.gml b/decomp_switch/gml_Object_obj_wobblything_evil_Create_0.gml
index 1de1f29..a2aeecd 100755
--- a/decomp_normal/gml_Object_obj_wobblything_evil_Create_0.gml
+++ b/decomp_switch/gml_Object_obj_wobblything_evil_Create_0.gml
@@ -1,4 +1,4 @@
-global.charinstance[0] = 326
+global.charinstance[0] = 327
self.image_speed = 0
self.image_xscale = 2
self.image_yscale = 2
diff --git a/decomp_normal/gml_Object_obj_writer_Draw_0.gml b/decomp_switch/gml_Object_obj_writer_Draw_0.gml
index fd75f34..8a644f3 100755
--- a/decomp_normal/gml_Object_obj_writer_Draw_0.gml
+++ b/decomp_switch/gml_Object_obj_writer_Draw_0.gml
@@ -18,9 +18,10 @@ if _temp_var
else
self.automash_timer = 0
if (self.automash_timer == 0)
+ {
self.button1 = 1
- if (self.automash_timer == 1)
self.button2 = 1
+ }
}
}
if (self.dialoguer == 1)
@@ -169,7 +170,12 @@ if (self.formatted == 0)
if (self.aster == 1)
{
if (self.autoaster == 1)
- _temp_var = (self.nextchar != "*")
+ {
+ if (self.nextchar != "*")
+ _temp_var = (global.lang != "ja")
+ else
+ _temp_var = 0
+ }
else
_temp_var = 0
}
@@ -410,6 +416,12 @@ while(true)
self.smallface.writergod = self.id
}
}
+ if (self.nextchar == "*")
+ {
+ self.wx = round(self.wx)
+ local._sprite = scr_getbuttonsprite(self.nextchar2, 1)
+ draw_sprite_ext(local._sprite, 0, (self.wx + 2), (self.wy + 2), 2, 2, 0, 0xFFFFFF, 1)
+ }
if (self.nextchar == "T")
{
if (self.nextchar2 == "0")
@@ -729,6 +741,24 @@ while(true)
if _temp_var
self.wx = (self.wx - (self.hspace / 2))
}
+ if (global.lang == "en")
+ {
+ if (self.myfont == 11)
+ {
+ if (self.mychar == "w")
+ self.wx = (self.wx + 2)
+ if (self.mychar == "m")
+ self.wx = (self.wx + 3)
+ if (self.mychar == "i")
+ self.wx = (self.wx - 2)
+ if (self.mychar == "l")
+ self.wx = (self.wx - 2)
+ if (self.mychar == "s")
+ self.wx = (self.wx - 1)
+ if (self.mychar == "j")
+ self.wx = (self.wx - 1)
+ }
+ }
}
self.n = (self.n + 1)
continue
diff --git a/decomp_switch/gml_Script_background_get_height.gml b/decomp_switch/gml_Script_background_get_height.gml
new file mode 100755
index 0000000..aeea0fd
--- /dev/null
+++ b/decomp_switch/gml_Script_background_get_height.gml
@@ -0,0 +1 @@
+return sprite_get_height(self.argument0)
diff --git a/decomp_switch/gml_Script_background_get_width.gml b/decomp_switch/gml_Script_background_get_width.gml
new file mode 100755
index 0000000..7d81931
--- /dev/null
+++ b/decomp_switch/gml_Script_background_get_width.gml
@@ -0,0 +1 @@
+return sprite_get_width(self.argument0)
diff --git a/decomp_normal/gml_Script_button1_p.gml b/decomp_switch/gml_Script_button1_p.gml
index 689729a..98fe365 100755
--- a/decomp_normal/gml_Script_button1_p.gml
+++ b/decomp_switch/gml_Script_button1_p.gml
@@ -1,4 +1,12 @@
if global.input_pressed[4]
return 1
-if global.input_pressed[7]
- return 1
+else
+{
+ if global.input_pressed[7]
+ return 1
+ else
+ {
+ if gamepad_button_check_pressed(obj_gamecontroller.gamepad_id, gp_shoulderlb)
+ return 1
+ }
+}
diff --git a/decomp_switch/gml_Script_draw_background.gml b/decomp_switch/gml_Script_draw_background.gml
new file mode 100755
index 0000000..2db14f0
--- /dev/null
+++ b/decomp_switch/gml_Script_draw_background.gml
@@ -0,0 +1 @@
+draw_sprite(self.argument0, 0, self.argument1, self.argument2)
diff --git a/decomp_switch/gml_Script_draw_background_stretched.gml b/decomp_switch/gml_Script_draw_background_stretched.gml
new file mode 100755
index 0000000..06efd67
--- /dev/null
+++ b/decomp_switch/gml_Script_draw_background_stretched.gml
@@ -0,0 +1 @@
+draw_sprite_stretched(self.argument0, 0, self.argument1, self.argument2, self.argument3, self.argument4)
diff --git a/decomp_switch/gml_Script_draw_enable_alphablend.gml b/decomp_switch/gml_Script_draw_enable_alphablend.gml
new file mode 100755
index 0000000..b90030b
--- /dev/null
+++ b/decomp_switch/gml_Script_draw_enable_alphablend.gml
@@ -0,0 +1 @@
+gpu_set_blendenable(self.argument0)
diff --git a/decomp_switch/gml_Script_ossafe_file_delete.gml b/decomp_switch/gml_Script_ossafe_file_delete.gml
new file mode 100755
index 0000000..cd4f83e
--- /dev/null
+++ b/decomp_switch/gml_Script_ossafe_file_delete.gml
@@ -0,0 +1,2 @@
+if (! is_undefined(ds_map_find_value(global.savedata, self.argument0)))
+ ds_map_delete(global.savedata, self.argument0)
diff --git a/decomp_switch/gml_Script_ossafe_file_exists.gml b/decomp_switch/gml_Script_ossafe_file_exists.gml
new file mode 100755
index 0000000..4c0d0b8
--- /dev/null
+++ b/decomp_switch/gml_Script_ossafe_file_exists.gml
@@ -0,0 +1 @@
+return (! is_undefined(ds_map_find_value(global.savedata, self.argument0)))
diff --git a/decomp_switch/gml_Script_ossafe_file_text_close.gml b/decomp_switch/gml_Script_ossafe_file_text_close.gml
new file mode 100755
index 0000000..6d11e3c
--- /dev/null
+++ b/decomp_switch/gml_Script_ossafe_file_text_close.gml
@@ -0,0 +1,4 @@
+local.handle = self.argument0
+if ds_map_find_value(local.handle, "is_write")
+ ds_map_set(global.savedata, ds_map_find_value(local.handle, "filename"), ds_map_find_value(local.handle, "data"))
+ds_map_destroy(local.handle)
diff --git a/decomp_switch/gml_Script_ossafe_file_text_eof.gml b/decomp_switch/gml_Script_ossafe_file_text_eof.gml
new file mode 100755
index 0000000..d3f0abe
--- /dev/null
+++ b/decomp_switch/gml_Script_ossafe_file_text_eof.gml
@@ -0,0 +1,2 @@
+local.handle = self.argument0
+return (ds_map_find_value(local.handle, "line") >= ds_map_find_value(local.handle, "num_lines"))
diff --git a/decomp_switch/gml_Script_ossafe_file_text_open_read.gml b/decomp_switch/gml_Script_ossafe_file_text_open_read.gml
new file mode 100755
index 0000000..cd2c09d
--- /dev/null
+++ b/decomp_switch/gml_Script_ossafe_file_text_open_read.gml
@@ -0,0 +1,48 @@
+local.name = string_lower(self.argument0)
+local.file = ds_map_find_value(global.savedata, local.name)
+if is_undefined(local.file)
+ return self.undefined
+local.data = local.file
+local.num_lines = 0
+while(true)
+{
+ if (string_byte_length(local.data) > 0)
+ {
+ local.newline_pos = string_pos("
+ ", local.data)
+ if (local.newline_pos > 0)
+ {
+ local.nextline_pos = (local.newline_pos + 1)
+ if (local.newline_pos > 1)
+ _temp_var = (string_char_at(local.data, (local.newline_pos - 1)) == "
")
+ else
+ _temp_var = 0
+ if _temp_var
+ local.newline_pos = (local.newline_pos - 1)
+ if (local.newline_pos > 1)
+ local.line = substr(local.data, 1, (local.newline_pos - 1))
+ else
+ local.line = ""
+ if (local.nextline_pos <= strlen(local.data))
+ local.data = substr(local.data, local.nextline_pos)
+ else
+ local.data = ""
+ }
+ else
+ {
+ local.line = local.data
+ local.data = ""
+ }
+ local.num_lines = (local.num_lines + 1)
+ local.lines[local.num_lines] = local.line
+ continue
+ }
+ break
+}
+self.handle = ds_map_create()
+ds_map_set(self.handle, "is_write", 0)
+ds_map_set(self.handle, "text", local.lines)
+ds_map_set(self.handle, "num_lines", local.num_lines)
+ds_map_set(self.handle, "line", 0)
+ds_map_set(self.handle, "line_read", 0)
+return self.handle
diff --git a/decomp_switch/gml_Script_ossafe_file_text_open_write.gml b/decomp_switch/gml_Script_ossafe_file_text_open_write.gml
new file mode 100755
index 0000000..ecef8bf
--- /dev/null
+++ b/decomp_switch/gml_Script_ossafe_file_text_open_write.gml
@@ -0,0 +1,5 @@
+local.handle = ds_map_create()
+ds_map_set(local.handle, "is_write", 1)
+ds_map_set(local.handle, "filename", string_lower(self.argument0))
+ds_map_set(local.handle, "data", "")
+return local.handle
diff --git a/decomp_switch/gml_Script_ossafe_file_text_read_real.gml b/decomp_switch/gml_Script_ossafe_file_text_read_real.gml
new file mode 100755
index 0000000..6b46bd0
--- /dev/null
+++ b/decomp_switch/gml_Script_ossafe_file_text_read_real.gml
@@ -0,0 +1,9 @@
+local.handle = self.argument0
+if ds_map_find_value(local.handle, "line_read")
+ return 0
+local.line = ds_map_find_value(local.handle, "line")
+if (local.line >= ds_map_find_value(local.handle, "num_lines"))
+ return 0
+ds_map_set(local.handle, "line_read", 1)
+self.text = ds_map_find_value(local.handle, "text")
+return real(self.text[local.line])
diff --git a/decomp_switch/gml_Script_ossafe_file_text_read_string.gml b/decomp_switch/gml_Script_ossafe_file_text_read_string.gml
new file mode 100755
index 0000000..5a2deef
--- /dev/null
+++ b/decomp_switch/gml_Script_ossafe_file_text_read_string.gml
@@ -0,0 +1,9 @@
+local.handle = self.argument0
+if ds_map_find_value(local.handle, "line_read")
+ return ""
+local.line = ds_map_find_value(local.handle, "line")
+if (local.line >= ds_map_find_value(local.handle, "num_lines"))
+ return ""
+ds_map_set(local.handle, "line_read", 1)
+self.text = ds_map_find_value(local.handle, "text")
+return self.text[local.line]
diff --git a/decomp_switch/gml_Script_ossafe_file_text_readln.gml b/decomp_switch/gml_Script_ossafe_file_text_readln.gml
new file mode 100755
index 0000000..2471552
--- /dev/null
+++ b/decomp_switch/gml_Script_ossafe_file_text_readln.gml
@@ -0,0 +1,8 @@
+local.handle = self.argument0
+ds_map_set(local.handle, "line_read", 0)
+local.line = ds_map_set_post(local.handle, "line", (ds_map_find_value(local.handle, "line") + 1))
+if (local.line >= ds_map_find_value(local.handle, "num_lines"))
+ return ""
+self.text = ds_map_find_value(local.handle, "text")
+return (self.text[local.line] + "
+")
diff --git a/decomp_switch/gml_Script_ossafe_file_text_write_real.gml b/decomp_switch/gml_Script_ossafe_file_text_write_real.gml
new file mode 100755
index 0000000..243e812
--- /dev/null
+++ b/decomp_switch/gml_Script_ossafe_file_text_write_real.gml
@@ -0,0 +1,2 @@
+local.handle = self.argument0
+ds_map_set(local.handle, "data", (ds_map_find_value(local.handle, "data") + string(self.argument1)))
diff --git a/decomp_switch/gml_Script_ossafe_file_text_write_string.gml b/decomp_switch/gml_Script_ossafe_file_text_write_string.gml
new file mode 100755
index 0000000..3252a63
--- /dev/null
+++ b/decomp_switch/gml_Script_ossafe_file_text_write_string.gml
@@ -0,0 +1,2 @@
+local.handle = self.argument0
+ds_map_set(local.handle, "data", (ds_map_find_value(local.handle, "data") + self.argument1))
diff --git a/decomp_switch/gml_Script_ossafe_file_text_writeln.gml b/decomp_switch/gml_Script_ossafe_file_text_writeln.gml
new file mode 100755
index 0000000..6172e13
--- /dev/null
+++ b/decomp_switch/gml_Script_ossafe_file_text_writeln.gml
@@ -0,0 +1,3 @@
+local.handle = self.argument0
+ds_map_set(local.handle, "data", (ds_map_find_value(local.handle, "data") + "
+"))
diff --git a/decomp_switch/gml_Script_ossafe_fill_rectangle.gml b/decomp_switch/gml_Script_ossafe_fill_rectangle.gml
new file mode 100755
index 0000000..1b602d5
--- /dev/null
+++ b/decomp_switch/gml_Script_ossafe_fill_rectangle.gml
@@ -0,0 +1,26 @@
+local.x1 = self.argument0
+local.y1 = self.argument1
+local.x2 = self.argument2
+local.y2 = self.argument3
+if (local.x1 > local.x2)
+{
+ local.temp = local.x1
+ local.x1 = local.x2
+ local.x2 = local.temp
+}
+if (local.y1 > local.y2)
+{
+ local.temp = local.y1
+ local.y1 = local.y2
+ local.y2 = local.temp
+}
+if (self.os_type == os_ps4)
+ _temp_var = 1
+else
+ _temp_var = (self.os_type == os_psvita)
+if _temp_var
+{
+ local.x2 = (local.x2 + 1)
+ local.y2 = (local.y2 + 1)
+}
+draw_rectangle(local.x1, local.y1, local.x2, local.y2, 0)
diff --git a/decomp_switch/gml_Script_ossafe_game_end.gml b/decomp_switch/gml_Script_ossafe_game_end.gml
new file mode 100755
index 0000000..3fdc7a9
--- /dev/null
+++ b/decomp_switch/gml_Script_ossafe_game_end.gml
@@ -0,0 +1,9 @@
+if (self.os_type == os_switch)
+ _temp_var = 1
+else
+ _temp_var = (self.os_type == os_ps4)
+local._isConsole = _temp_var
+if (! local._isConsole)
+ game_end()
+else
+ game_restart()
diff --git a/decomp_switch/gml_Script_ossafe_ini_close.gml b/decomp_switch/gml_Script_ossafe_ini_close.gml
new file mode 100755
index 0000000..05ccb21
--- /dev/null
+++ b/decomp_switch/gml_Script_ossafe_ini_close.gml
@@ -0,0 +1,5 @@
+if (! is_undefined(global.current_ini))
+{
+ ds_map_set(global.savedata, global.current_ini, ini_close())
+ global.current_ini = self.undefined
+}
diff --git a/decomp_switch/gml_Script_ossafe_ini_open.gml b/decomp_switch/gml_Script_ossafe_ini_open.gml
new file mode 100755
index 0000000..6074213
--- /dev/null
+++ b/decomp_switch/gml_Script_ossafe_ini_open.gml
@@ -0,0 +1,8 @@
+local.name = string_lower(self.argument0)
+global.current_ini = local.name
+local.file = ds_map_find_value(global.savedata, local.name)
+if is_undefined(local.file)
+ local.data = ""
+else
+ local.data = local.file
+ini_open_from_string(local.data)
diff --git a/decomp_switch/gml_Script_ossafe_savedata_load.gml b/decomp_switch/gml_Script_ossafe_savedata_load.gml
new file mode 100755
index 0000000..ee7446d
--- /dev/null
+++ b/decomp_switch/gml_Script_ossafe_savedata_load.gml
@@ -0,0 +1,16 @@
+if (global.savedata_async_id >= 0)
+ _temp_var = 1
+else
+ _temp_var = global.savedata_async_load
+if _temp_var
+ return 0
+buffer_async_group_begin("Deltarune")
+buffer_async_group_option("showdialog", 0)
+buffer_async_group_option("savepadindex", 0)
+buffer_async_group_option("slottitle", "DELTARUNE")
+buffer_async_group_option("subtitle", "DELTARUNE Chapter 1 Save Data")
+global.savedata_buffer = buffer_create(1, 1, 1)
+buffer_load_async(global.savedata_buffer, "deltarune_ch1.sav", 0, 1000000)
+global.savedata_async_load = 1
+global.savedata_debuginfo = "load in progress"
+global.savedata_async_id = buffer_async_group_end()
diff --git a/decomp_switch/gml_Script_ossafe_savedata_save.gml b/decomp_switch/gml_Script_ossafe_savedata_save.gml
new file mode 100755
index 0000000..dd0b1f7
--- /dev/null
+++ b/decomp_switch/gml_Script_ossafe_savedata_save.gml
@@ -0,0 +1,18 @@
+if (global.savedata_async_id >= 0)
+ _temp_var = 1
+else
+ _temp_var = global.savedata_async_load
+if _temp_var
+ return 0
+buffer_async_group_begin("Deltarune")
+buffer_async_group_option("showdialog", 0)
+buffer_async_group_option("savepadindex", 0)
+buffer_async_group_option("slottitle", "DELTARUNE")
+buffer_async_group_option("subtitle", "DELTARUNE Chapter 1 Save Data")
+local.json = json_encode(global.savedata)
+global.savedata_buffer = buffer_create((string_byte_length(local.json) + 1), 0, 1)
+buffer_write(global.savedata_buffer, 11, local.json)
+buffer_save_async(global.savedata_buffer, "deltarune_ch1.sav", 0, buffer_get_size(global.savedata_buffer))
+global.savedata_async_load = 0
+global.savedata_debuginfo = "save in progress"
+global.savedata_async_id = buffer_async_group_end()
diff --git a/decomp_normal/gml_Script_scr_84_debug.gml b/decomp_switch/gml_Script_scr_84_debug.gml
index e69de29..de42385 100755
--- a/decomp_normal/gml_Script_scr_84_debug.gml
+++ b/decomp_switch/gml_Script_scr_84_debug.gml
@@ -0,0 +1,966 @@
+local.process = self.argument0
+if (! variable_global_exists("chemg_menu_depth"))
+{
+ global.chemg_menu_indices = array_create(0)
+ global.chemg_menu_indices[0] = 0
+ global.chemg_menu_depth = 0
+ global.chemg_god_mode = 0
+ global.chemg_show_room = 1
+ global.chemg_font_test = 0
+ local.parent = ds_list_create()
+ show_debug_message("init debug")
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "Options")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[loadj]", "", "reload japanese")
+ scr_84_add_menu_item(local.parent, "[lang]", "ja", "use japanese")
+ scr_84_add_menu_item(local.parent, "[lang]", "en", "use english")
+ scr_84_add_menu_item(local.parent, "[showroom]", "", "toggle room name")
+ scr_84_add_menu_item(local.parent, "[restart]", "", "restart room")
+ scr_84_add_menu_item(local.parent, "[god]", "", "god mode")
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "give item")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[item]", 1, "Dark Candy")
+ scr_84_add_menu_item(local.parent, "[item]", 2, "ReviveMint")
+ scr_84_add_menu_item(local.parent, "[item]", 3, "Glowshard")
+ scr_84_add_menu_item(local.parent, "[item]", 4, "Manual")
+ scr_84_add_menu_item(local.parent, "[item]", 5, "BrokenCake")
+ scr_84_add_menu_item(local.parent, "[item]", 6, "Top Cake")
+ scr_84_add_menu_item(local.parent, "[item]", 7, "SpinCake")
+ scr_84_add_menu_item(local.parent, "[item]", 8, "Darkburger")
+ scr_84_add_menu_item(local.parent, "[item]", 9, "LancerCookie")
+ scr_84_add_menu_item(local.parent, "[item]", 10, "GigaSalad")
+ scr_84_add_menu_item(local.parent, "[item]", 11, "Clubswich")
+ scr_84_add_menu_item(local.parent, "[item]", 12, "HeartsDonut")
+ scr_84_add_menu_item(local.parent, "[item]", 13, "ChocDiamond")
+ scr_84_add_menu_item(local.parent, "[item]", 14, "FavSandwich")
+ scr_84_add_menu_item(local.parent, "[item]", 15, "RouxlsRoux")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "give light item")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[lightitem]", 1, "Dark Candy")
+ scr_84_add_menu_item(local.parent, "[lightitem]", 2, "ReviveMint")
+ scr_84_add_menu_item(local.parent, "[lightitem]", 3, "Glowshard")
+ scr_84_add_menu_item(local.parent, "[lightitem]", 4, "Manual")
+ scr_84_add_menu_item(local.parent, "[lightitem]", 5, "BrokenCake")
+ scr_84_add_menu_item(local.parent, "[lightitem]", 6, "Top Cake")
+ scr_84_add_menu_item(local.parent, "[lightitem]", 7, "SpinCake")
+ scr_84_add_menu_item(local.parent, "[lightitem]", 8, "Darkburger")
+ scr_84_add_menu_item(local.parent, "[lightitem]", 9, "LancerCookie")
+ scr_84_add_menu_item(local.parent, "[lightitem]", 10, "GigaSalad")
+ scr_84_add_menu_item(local.parent, "[lightitem]", 11, "Clubswich")
+ scr_84_add_menu_item(local.parent, "[lightitem]", 12, "HeartsDonut")
+ scr_84_add_menu_item(local.parent, "[lightitem]", 13, "ChocDiamond")
+ scr_84_add_menu_item(local.parent, "[lightitem]", 14, "FavSandwich")
+ scr_84_add_menu_item(local.parent, "[lightitem]", 15, "RouxlsRoux")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "give key item")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[keyitem]", 1, "Cell Phone")
+ scr_84_add_menu_item(local.parent, "[keyitem]", 2, "Egg")
+ scr_84_add_menu_item(local.parent, "[keyitem]", 3, "BrokenCake")
+ scr_84_add_menu_item(local.parent, "[keyitem]", 4, "Broken Key A")
+ scr_84_add_menu_item(local.parent, "[keyitem]", 5, "Door Key")
+ scr_84_add_menu_item(local.parent, "[keyitem]", 6, "Broken Key B")
+ scr_84_add_menu_item(local.parent, "[keyitem]", 7, "Broken Key C")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "give weapon")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[weaponitem]", 1, "Wood Blade")
+ scr_84_add_menu_item(local.parent, "[weaponitem]", 2, "Mane Ax")
+ scr_84_add_menu_item(local.parent, "[weaponitem]", 3, "Red Scarf")
+ scr_84_add_menu_item(local.parent, "[weaponitem]", 4, "EverybodyWeapon")
+ scr_84_add_menu_item(local.parent, "[weaponitem]", 5, "Spookysword")
+ scr_84_add_menu_item(local.parent, "[weaponitem]", 6, "Brave Ax")
+ scr_84_add_menu_item(local.parent, "[weaponitem]", 7, "Devilsknife")
+ scr_84_add_menu_item(local.parent, "[weaponitem]", 8, "Trefoil")
+ scr_84_add_menu_item(local.parent, "[weaponitem]", 9, "Ragger")
+ scr_84_add_menu_item(local.parent, "[weaponitem]", 10, "DaintyScarf")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "give armor")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[armoritem]", 1, "Amber Card")
+ scr_84_add_menu_item(local.parent, "[armoritem]", 2, "Dice Brace")
+ scr_84_add_menu_item(local.parent, "[armoritem]", 3, "Pink Ribbon")
+ scr_84_add_menu_item(local.parent, "[armoritem]", 4, "White Ribbon")
+ scr_84_add_menu_item(local.parent, "[armoritem]", 5, "IronShackle")
+ scr_84_add_menu_item(local.parent, "[armoritem]", 6, "MouseToken")
+ scr_84_add_menu_item(local.parent, "[armoritem]", 7, "Jevilstail")
+ local.parent = scr_84_pop()
+ scr_84_add_menu_item(local.parent, "[phone]", "", "give phone number")
+ scr_84_add_menu_item(local.parent, "[gold]", 25, "+25 gold")
+ scr_84_add_menu_item(local.parent, "[gold]", -25, "-25 gold")
+ scr_84_add_menu_item(local.parent, "[lightgold]", 25, "+25 gold")
+ scr_84_add_menu_item(local.parent, "[lightgold]", -25, "-25 gold")
+ scr_84_add_menu_item(local.parent, "[fonttest]", "", "font test")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "Rooms")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "special")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[room]", 131, "PLACE_DOG")
+ scr_84_add_menu_item(local.parent, "[room]", 132, "room_legend")
+ scr_84_add_menu_item(local.parent, "[room]", 133, "room_shop1")
+ scr_84_add_menu_item(local.parent, "[room]", 134, "room_shop2")
+ scr_84_add_menu_item(local.parent, "[room]", 135, "room_gameover")
+ scr_84_add_menu_item(local.parent, "[room]", 136, "room_myroom_dark")
+ scr_84_add_menu_item(local.parent, "[room]", 137, "PLACE_LOGO")
+ scr_84_add_menu_item(local.parent, "[room]", 138, "PLACE_FAILURE")
+ scr_84_add_menu_item(local.parent, "[room]", 139, "PLACE_MENU")
+ scr_84_add_menu_item(local.parent, "[room]", 140, "room_ed")
+ scr_84_add_menu_item(local.parent, "[room]", 145, "room_splashscreen")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "lightworld_exterior")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[room]", 7, "room_town_krisyard")
+ scr_84_add_menu_item(local.parent, "[room]", 8, "room_town_northwest")
+ scr_84_add_menu_item(local.parent, "[room]", 9, "room_town_north")
+ scr_84_add_menu_item(local.parent, "[room]", 10, "room_beach")
+ scr_84_add_menu_item(local.parent, "[room]", 11, "room_town_mid")
+ scr_84_add_menu_item(local.parent, "[room]", 12, "room_town_apartments")
+ scr_84_add_menu_item(local.parent, "[room]", 13, "room_town_south")
+ scr_84_add_menu_item(local.parent, "[room]", 14, "room_town_school")
+ scr_84_add_menu_item(local.parent, "[room]", 15, "room_town_church")
+ scr_84_add_menu_item(local.parent, "[room]", 16, "room_graveyard")
+ scr_84_add_menu_item(local.parent, "[room]", 17, "room_town_shelter")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "cardcastle")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[roomdark]", 105, "room_cc_prison_cells")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 106, "room_cc_prisonlancer")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 107, "room_cc_prison_to_elevator")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 108, "room_cc_prison2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 109, "room_cc_prisonelevator")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 110, "room_cc_elevator")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 111, "room_cc_prison_prejoker")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 112, "room_cc_joker")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 113, "room_cc_entrance")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 114, "room_cc_1f")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 115, "room_cc_rudinn")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 116, "room_cc_2f")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 117, "room_cc_rurus1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 118, "room_cc_3f")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 119, "room_cc_hathy")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 120, "room_cc_4f")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 121, "room_cc_rurus2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 122, "room_cc_clover")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 123, "room_cc_5f")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 124, "room_cc_lancer")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 125, "room_cc_6f")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 126, "room_cc_throneroom")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 127, "room_cc_preroof")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 128, "room_cc_kingbattle")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 129, "room_cc_prefountain")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 130, "room_cc_fountain")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "ralsei_castle")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[roomdark]", 44, "room_castle_outskirts")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 45, "room_castle_town")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 46, "room_castle_front")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 47, "room_castle_tutorial")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 48, "room_castle_darkdoor")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "dark forest")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[roomdark]", 73, "room_forest_savepoint1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 74, "room_forest_area0")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 75, "room_forest_area1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 76, "room_forest_area2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 77, "room_forest_area2A")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 78, "room_forest_puzzle1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 79, "room_forest_beforeclover")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 80, "room_forest_area3A")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 81, "room_forest_area3")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 82, "room_forest_savepoint2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 83, "room_forest_smith")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 84, "room_forest_area4")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 85, "room_forest_dancers1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 86, "room_forest_secret1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 87, "room_forest_thrashmaker")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 88, "room_forest_starwalker")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 89, "room_forest_area5")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 90, "room_forest_savepoint_relax")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 91, "room_forest_maze1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 92, "room_forest_maze_deadend")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 93, "room_forest_maze_susie")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 94, "room_forest_maze2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 95, "room_forest_maze_deadend2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 96, "room_forest_savepoint3")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 97, "room_forest_fightsusie")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 98, "room_forest_afterthrash2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 99, "room_forest_afterthrash3")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 100, "room_forest_afterthrash4")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 101, "room_forest_castleview")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 102, "room_forest_chase1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 103, "room_forest_chase2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 104, "room_forest_castlefront")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "school")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[room]", 28, "room_torielclass")
+ scr_84_add_menu_item(local.parent, "[room]", 29, "room_schoollobby")
+ scr_84_add_menu_item(local.parent, "[room]", 30, "room_alphysclass")
+ scr_84_add_menu_item(local.parent, "[room]", 31, "room_schooldoor")
+ scr_84_add_menu_item(local.parent, "[room]", 32, "room_insidecloset")
+ scr_84_add_menu_item(local.parent, "[room]", 33, "room_school_unusedroom")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "myhouse")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[room]", 2, "room_krisroom")
+ scr_84_add_menu_item(local.parent, "[room]", 3, "room_krishallway")
+ scr_84_add_menu_item(local.parent, "[room]", 4, "room_torroom")
+ scr_84_add_menu_item(local.parent, "[room]", 5, "room_torhouse")
+ scr_84_add_menu_item(local.parent, "[room]", 6, "room_torbathroom")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "dark_start")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[roomdark]", 34, "room_dark1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 35, "room_dark1a")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 36, "room_dark2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 37, "room_dark3")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 38, "room_dark3a")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 39, "room_dark_wobbles")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 40, "room_dark_eyepuzzle")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 41, "room_dark7")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 42, "room_dark_chase1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 43, "room_dark_chase2")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "rooms")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[room]", 0, "ROOM_INITIALIZE")
+ scr_84_add_menu_item(local.parent, "[room]", 1, "PLACE_CONTACT")
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "myhouse")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[room]", 2, "room_krisroom")
+ scr_84_add_menu_item(local.parent, "[room]", 3, "room_krishallway")
+ scr_84_add_menu_item(local.parent, "[room]", 4, "room_torroom")
+ scr_84_add_menu_item(local.parent, "[room]", 5, "room_torhouse")
+ scr_84_add_menu_item(local.parent, "[room]", 6, "room_torbathroom")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "lightworld_exterior")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[room]", 7, "room_town_krisyard")
+ scr_84_add_menu_item(local.parent, "[room]", 8, "room_town_northwest")
+ scr_84_add_menu_item(local.parent, "[room]", 9, "room_town_north")
+ scr_84_add_menu_item(local.parent, "[room]", 10, "room_beach")
+ scr_84_add_menu_item(local.parent, "[room]", 11, "room_town_mid")
+ scr_84_add_menu_item(local.parent, "[room]", 12, "room_town_apartments")
+ scr_84_add_menu_item(local.parent, "[room]", 13, "room_town_south")
+ scr_84_add_menu_item(local.parent, "[room]", 14, "room_town_school")
+ scr_84_add_menu_item(local.parent, "[room]", 15, "room_town_church")
+ scr_84_add_menu_item(local.parent, "[room]", 16, "room_graveyard")
+ scr_84_add_menu_item(local.parent, "[room]", 17, "room_town_shelter")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "lightworld_interior")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[room]", 18, "room_hospital_lobby")
+ scr_84_add_menu_item(local.parent, "[room]", 19, "room_hospital_hallway")
+ scr_84_add_menu_item(local.parent, "[room]", 20, "room_hospital_rudy")
+ scr_84_add_menu_item(local.parent, "[room]", 21, "room_hospital_room2")
+ scr_84_add_menu_item(local.parent, "[room]", 22, "room_diner")
+ scr_84_add_menu_item(local.parent, "[room]", 23, "room_townhall")
+ scr_84_add_menu_item(local.parent, "[room]", 24, "room_flowershop_1f")
+ scr_84_add_menu_item(local.parent, "[room]", 25, "room_flowershop_2f")
+ scr_84_add_menu_item(local.parent, "[room]", 26, "room_library")
+ scr_84_add_menu_item(local.parent, "[room]", 27, "room_alphysalley")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "school")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[room]", 28, "room_torielclass")
+ scr_84_add_menu_item(local.parent, "[room]", 29, "room_schoollobby")
+ scr_84_add_menu_item(local.parent, "[room]", 30, "room_alphysclass")
+ scr_84_add_menu_item(local.parent, "[room]", 31, "room_schooldoor")
+ scr_84_add_menu_item(local.parent, "[room]", 32, "room_insidecloset")
+ scr_84_add_menu_item(local.parent, "[room]", 33, "room_school_unusedroom")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "dark_start")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[roomdark]", 34, "room_dark1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 35, "room_dark1a")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 36, "room_dark2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 37, "room_dark3")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 38, "room_dark3a")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 39, "room_dark_wobbles")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 40, "room_dark_eyepuzzle")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 41, "room_dark7")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 42, "room_dark_chase1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 43, "room_dark_chase2")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "ralsei_castle")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[roomdark]", 44, "room_castle_outskirts")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 45, "room_castle_town")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 46, "room_castle_front")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 47, "room_castle_tutorial")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 48, "room_castle_darkdoor")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "dark field")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[roomdark]", 49, "room_field_start")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 50, "room_field_forest")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 51, "room_field1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 52, "room_field2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 53, "room_field2A")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 54, "room_field_topchef")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 55, "room_field_puzzle1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 56, "room_field_maze")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 57, "room_field_puzzle2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 58, "room_field_getsusie")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 59, "room_field_shop1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 60, "room_field_puzzletutorial")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 61, "room_field3")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 62, "room_field_boxpuzzle")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 63, "room_field4")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 64, "room_field_secret1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 65, "room_field_checkers4")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 66, "room_field_checkers2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 67, "room_field_checkers6")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 68, "room_field_checkers3")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 69, "room_field_checkers1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 70, "room_field_checkers5")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 71, "room_field_checkers7")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 72, "room_field_checkersboss")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "dark forest")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[roomdark]", 73, "room_forest_savepoint1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 74, "room_forest_area0")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 75, "room_forest_area1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 76, "room_forest_area2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 77, "room_forest_area2A")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 78, "room_forest_puzzle1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 79, "room_forest_beforeclover")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 80, "room_forest_area3A")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 81, "room_forest_area3")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 82, "room_forest_savepoint2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 83, "room_forest_smith")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 84, "room_forest_area4")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 85, "room_forest_dancers1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 86, "room_forest_secret1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 87, "room_forest_thrashmaker")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 88, "room_forest_starwalker")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 89, "room_forest_area5")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 90, "room_forest_savepoint_relax")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 91, "room_forest_maze1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 92, "room_forest_maze_deadend")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 93, "room_forest_maze_susie")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 94, "room_forest_maze2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 95, "room_forest_maze_deadend2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 96, "room_forest_savepoint3")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 97, "room_forest_fightsusie")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 98, "room_forest_afterthrash2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 99, "room_forest_afterthrash3")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 100, "room_forest_afterthrash4")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 101, "room_forest_castleview")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 102, "room_forest_chase1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 103, "room_forest_chase2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 104, "room_forest_castlefront")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "cardcastle")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[roomdark]", 105, "room_cc_prison_cells")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 106, "room_cc_prisonlancer")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 107, "room_cc_prison_to_elevator")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 108, "room_cc_prison2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 109, "room_cc_prisonelevator")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 110, "room_cc_elevator")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 111, "room_cc_prison_prejoker")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 112, "room_cc_joker")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 113, "room_cc_entrance")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 114, "room_cc_1f")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 115, "room_cc_rudinn")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 116, "room_cc_2f")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 117, "room_cc_rurus1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 118, "room_cc_3f")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 119, "room_cc_hathy")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 120, "room_cc_4f")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 121, "room_cc_rurus2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 122, "room_cc_clover")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 123, "room_cc_5f")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 124, "room_cc_lancer")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 125, "room_cc_6f")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 126, "room_cc_throneroom")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 127, "room_cc_preroof")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 128, "room_cc_kingbattle")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 129, "room_cc_prefountain")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 130, "room_cc_fountain")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "special")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[room]", 131, "PLACE_DOG")
+ scr_84_add_menu_item(local.parent, "[room]", 132, "room_legend")
+ scr_84_add_menu_item(local.parent, "[room]", 133, "room_shop1")
+ scr_84_add_menu_item(local.parent, "[room]", 134, "room_shop2")
+ scr_84_add_menu_item(local.parent, "[room]", 135, "room_gameover")
+ scr_84_add_menu_item(local.parent, "[room]", 136, "room_myroom_dark")
+ scr_84_add_menu_item(local.parent, "[room]", 137, "PLACE_LOGO")
+ scr_84_add_menu_item(local.parent, "[room]", 138, "PLACE_FAILURE")
+ scr_84_add_menu_item(local.parent, "[room]", 139, "PLACE_MENU")
+ scr_84_add_menu_item(local.parent, "[room]", 140, "room_ed")
+ local.parent = scr_84_pop()
+ scr_84_add_menu_item(local.parent, "[room]", 141, "room_empty")
+ scr_84_add_menu_item(local.parent, "[room]", 142, "room_man")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 143, "room_DARKempty")
+ scr_84_add_menu_item(local.parent, "[room]", 144, "room_battletest")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "dark field")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[roomdark]", 49, "room_field_start")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 50, "room_field_forest")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 51, "room_field1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 52, "room_field2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 53, "room_field2A")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 54, "room_field_topchef")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 55, "room_field_puzzle1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 56, "room_field_maze")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 57, "room_field_puzzle2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 58, "room_field_getsusie")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 59, "room_field_shop1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 60, "room_field_puzzletutorial")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 61, "room_field3")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 62, "room_field_boxpuzzle")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 63, "room_field4")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 64, "room_field_secret1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 65, "room_field_checkers4")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 66, "room_field_checkers2")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 67, "room_field_checkers6")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 68, "room_field_checkers3")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 69, "room_field_checkers1")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 70, "room_field_checkers5")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 71, "room_field_checkers7")
+ scr_84_add_menu_item(local.parent, "[roomdark]", 72, "room_field_checkersboss")
+ local.parent = scr_84_pop()
+ local.group = ds_list_create()
+ scr_84_add_menu_item(local.parent, "[group]", local.group, "lightworld_interior")
+ scr_84_push(local.parent)
+ local.parent = local.group
+ scr_84_add_menu_item(local.parent, "[room]", 18, "room_hospital_lobby")
+ scr_84_add_menu_item(local.parent, "[room]", 19, "room_hospital_hallway")
+ scr_84_add_menu_item(local.parent, "[room]", 20, "room_hospital_rudy")
+ scr_84_add_menu_item(local.parent, "[room]", 21, "room_hospital_room2")
+ scr_84_add_menu_item(local.parent, "[room]", 22, "room_diner")
+ scr_84_add_menu_item(local.parent, "[room]", 23, "room_townhall")
+ scr_84_add_menu_item(local.parent, "[room]", 24, "room_flowershop_1f")
+ scr_84_add_menu_item(local.parent, "[room]", 25, "room_flowershop_2f")
+ scr_84_add_menu_item(local.parent, "[room]", 26, "room_library")
+ scr_84_add_menu_item(local.parent, "[room]", 27, "room_alphysalley")
+ local.parent = scr_84_pop()
+ local.parent = scr_84_pop()
+ global.chemg_menus = local.parent
+}
+if local.process
+ return (global.chemg_menu_depth > 0)
+if gamepad_button_check_pressed(obj_gamecontroller.gamepad_id, gp_stickr)
+{
+ global.chemg_menu_depth = 1
+ global.chemg_interact = global.interact
+ global.chemg_yoffset = 0
+ global.interact = 0
+}
+if (global.chemg_menu_depth > 0)
+{
+ local.parent = global.chemg_menus
+ local.change = 0
+ local.depth_ndx = (global.chemg_menu_depth - 1)
+ local.i = 0
+ while(true)
+ {
+ local.choice_ndx = global.chemg_menu_indices[local.i]
+ local.choice = ds_list_find_value(local.parent, (local.choice_ndx * 3))
+ local.choice_data = ds_list_find_value(local.parent, ((local.choice_ndx * 3) + 1))
+ local.choice_name = ds_list_find_value(local.parent, ((local.choice_ndx * 3) + 2))
+ local.i = (local.i + 1)
+ if (local.i == global.chemg_menu_depth)
+ break
+ else
+ {
+ local.parent = local.choice_data
+ if 0
+ {
+ }
+ else
+ continue
+ }
+ break
+ }
+ local.num_choices = (ds_list_size(local.parent) / 3)
+ if keyboard_check_pressed('&')
+ _temp_var = 1
+ else
+ _temp_var = gamepad_button_check_pressed(obj_gamecontroller.gamepad_id, gp_padu)
+ if _temp_var
+ local.change = -1
+ else
+ {
+ if keyboard_check_pressed('(')
+ _temp_var = 1
+ else
+ _temp_var = gamepad_button_check_pressed(obj_gamecontroller.gamepad_id, gp_padd)
+ if _temp_var
+ local.change = 1
+ else
+ {
+ if keyboard_check_pressed(vk_return)
+ _temp_var = 1
+ else
+ _temp_var = gamepad_button_check_pressed(obj_gamecontroller.gamepad_id, gp_face2)
+ if _temp_var
+ {
+ if (local.choice == "[group]")
+ {
+ global.chemg_menu_indices[global.chemg_menu_depth] = 0
+ global.chemg_menu_depth = (global.chemg_menu_depth + 1)
+ }
+ else
+ {
+ if (local.choice == "[loadj]")
+ {
+ local.type = scr_84_lang_load()
+ show_debug_message((("loaded " + local.type) + " lang file"))
+ show_message((("loaded " + local.type) + " lang file"))
+ global.chemg_menu_depth = 0
+ }
+ else
+ {
+ if (local.choice == "[room]")
+ {
+ room_goto(local.choice_data)
+ global.chemg_menu_depth = 0
+ }
+ else
+ {
+ if (local.choice == "[roomdark]")
+ {
+ show_debug_message(("room_goto: " + local.choice_name))
+ room_goto(local.choice_data)
+ global.chemg_menu_depth = 0
+ }
+ else
+ {
+ if (local.choice == "[lang]")
+ {
+ show_debug_message(("switch lang: " + local.choice_data))
+ global.lang = local.choice_data
+ global.chemg_menu_depth = 0
+ scr_84_init_localization()
+ room_restart()
+ }
+ else
+ {
+ if (local.choice == "[restart]")
+ {
+ show_debug_message("restart room")
+ room_restart()
+ global.chemg_menu_depth = 0
+ }
+ else
+ {
+ if (local.choice == "[god]")
+ global.chemg_god_mode = (1 - global.chemg_god_mode)
+ else
+ {
+ if (local.choice == "[lightitem]")
+ {
+ if (scr_litemcheck(local.choice_data) == 0)
+ scr_litemget(local.choice_data)
+ }
+ else
+ {
+ if (local.choice == "[item]")
+ {
+ if (scr_itemcheck(local.choice_data) == 0)
+ scr_itemget(local.choice_data)
+ }
+ else
+ {
+ if (local.choice == "[keyitem]")
+ {
+ if (scr_keyitemcheck(local.choice_data) == 0)
+ scr_keyitemget(local.choice_data)
+ }
+ else
+ {
+ if (local.choice == "[weaponitem]")
+ {
+ if (scr_weaponcheck_inventory(local.choice_data) == 0)
+ scr_weaponget(local.choice_data)
+ }
+ else
+ {
+ if (local.choice == "[armoritem]")
+ {
+ if (scr_armorcheck_inventory(local.choice_data) == 0)
+ scr_armorget(local.choice_data)
+ }
+ else
+ {
+ if (local.choice == "[phone]")
+ scr_phoneadd(202)
+ else
+ {
+ if (local.choice == "[gold]")
+ global.gold = max(0, (global.gold + local.choice_data))
+ else
+ {
+ if (local.choice == "[lightgold]")
+ global.lgold = max(0, (global.lgold + local.choice_data))
+ else
+ {
+ if (local.choice == "[showroom]")
+ global.chemg_show_room = (! global.chemg_show_room)
+ else
+ {
+ if (local.choice == "[fonttest]")
+ {
+ global.chemg_font_test = (! global.chemg_font_test)
+ global.chemg_menu_depth = 0
+ }
+ else
+ show_debug_message(("unknown menu cmd:" + local.choice))
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ if keyboard_check_pressed(vk_escape)
+ _temp_var = 1
+ else
+ _temp_var = gamepad_button_check_pressed(obj_gamecontroller.gamepad_id, gp_face1)
+ if _temp_var
+ {
+ if (global.chemg_menu_depth > 0)
+ global.chemg_menu_depth = (global.chemg_menu_depth - 1)
+ if (global.chemg_menu_depth == 0)
+ global.interact = global.chemg_interact
+ }
+ }
+ }
+ }
+ local.i = 0
+ while(true)
+ {
+ if (local.i < 10)
+ {
+ global.input_pressed[local.i] = 0
+ global.input_held[local.i] = 0
+ global.input_released[local.i] = 0
+ local.i = (local.i + 1)
+ continue
+ }
+ break
+ }
+ keyboard_clear(38)
+ keyboard_clear(40)
+ keyboard_clear(37)
+ keyboard_clear(39)
+ keyboard_clear(27)
+ keyboard_clear(13)
+ if (local.change != 0)
+ global.chemg_menu_indices[local.depth_ndx] = (((global.chemg_menu_indices[local.depth_ndx] + local.num_choices) + local.change) % local.num_choices)
+ draw_set_font(fnt_main)
+ draw_set_colour(0xFFFFFF)
+ draw_set_halign(fa_left)
+ draw_set_valign(fa_top)
+ local.yy = global.chemg_yoffset
+ local.vspacing = 15
+ scr_84_draw_text_outline(10, local.yy, (((("====[ menu ]====[ gold: " + string(global.gold)) + " light gold: ") + string(global.lgold)) + " ]"))
+ local.yy = (local.yy + local.vspacing)
+ global.chemg_max_depth = -1
+ global.chemg_cursor_y = 0
+ scr_84_draw_menu(global.chemg_menus, 10, local.yy, local.vspacing, global.chemg_menu_indices, 0, (global.chemg_menu_depth - 1))
+ global.chemg_yoffset = min(10, (400 - (global.chemg_cursor_y - global.chemg_yoffset)))
+}
+local.chemg_room_name = room_get_name(self.room)
+if (global.chemg_god_mode > 0)
+ local.chemg_room_name = (local.chemg_room_name + "[god]")
+if global.chemg_show_room
+{
+ draw_set_font(fnt_main)
+ draw_set_colour(0xFFFFFF)
+ local.chemg_x = (635 - string_width(local.chemg_room_name))
+ local.chemg_y = 5
+ scr_84_draw_text_outline(local.chemg_x, local.chemg_y, local.chemg_room_name)
+}
+if global.chemg_font_test
+{
+ if (! variable_global_exists("chemg_font_init"))
+ {
+ global.chemg_font_init = 1
+ local.ft = fnt_tinynoelle
+ local.ft[array_length_1d(local.ft)] = fnt_dotumche
+ local.ft[array_length_1d(local.ft)] = "NORMAL FONT"
+ local.ft[array_length_1d(local.ft)] = fnt_mainbig
+ local.ft[array_length_1d(local.ft)] = "SLOWER, SILENT"
+ local.ft[array_length_1d(local.ft)] = fnt_main
+ local.ft[array_length_1d(local.ft)] = "normal enemy font."
+ local.ft[array_length_1d(local.ft)] = fnt_small
+ local.ft[array_length_1d(local.ft)] = "battle dialogue"
+ local.ft[array_length_1d(local.ft)] = fnt_ja_comicsans
+ local.ft[array_length_1d(local.ft)] = "NORMAL MAIN FONT"
+ local.ft[array_length_1d(local.ft)] = fnt_ja_small
+ local.ft[array_length_1d(local.ft)] = "NORMAL FONT BIG"
+ local.ft[array_length_1d(local.ft)] = fnt_ja_main
+ local.ft[array_length_1d(local.ft)] = "toriel font"
+ local.ft[array_length_1d(local.ft)] = fnt_ja_dotumche
+ local.ft[array_length_1d(local.ft)] = "toriel font slow"
+ local.ft[array_length_1d(local.ft)] = fnt_ja_mainbig
+ local.ft[array_length_1d(local.ft)] = "susie font"
+ local.ft[array_length_1d(local.ft)] = fnt_comicsans
+ local.ft[array_length_1d(local.ft)] = "ralsei font"
+ local.ft[array_length_1d(local.ft)] = 12
+ local.ft[array_length_1d(local.ft)] = "noelle font"
+ local.ft[array_length_1d(local.ft)] = 13
+ local.ft[array_length_1d(local.ft)] = "berdly font"
+ local.ft[array_length_1d(local.ft)] = 14
+ local.ft[array_length_1d(local.ft)] = "sans font"
+ local.ft[array_length_1d(local.ft)] = 15
+ local.ft[array_length_1d(local.ft)] = "pap font"
+ local.ft[array_length_1d(local.ft)] = 16
+ local.ft[array_length_1d(local.ft)] = ")??? font"
+ local.ft[array_length_1d(local.ft)] = 17
+ local.ft[array_length_1d(local.ft)] = "undyne font"
+ local.ft[array_length_1d(local.ft)] = 18
+ local.ft[array_length_1d(local.ft)] = "asgore font"
+ local.ft[array_length_1d(local.ft)] = 19
+ local.ft[array_length_1d(local.ft)] = "lancer font"
+ local.ft[array_length_1d(local.ft)] = 20
+ local.ft[array_length_1d(local.ft)] = "alphys font"
+ local.ft[array_length_1d(local.ft)] = 21
+ local.ft[array_length_1d(local.ft)] = "temmie font"
+ local.ft[array_length_1d(local.ft)] = 22
+ local.ft[array_length_1d(local.ft)] = "alphys font small"
+ local.ft[array_length_1d(local.ft)] = 23
+ local.ft[array_length_1d(local.ft)] = "noelle font small"
+ local.ft[array_length_1d(local.ft)] = 30
+ local.ft[array_length_1d(local.ft)] = "susie dark world"
+ local.ft[array_length_1d(local.ft)] = 31
+ local.ft[array_length_1d(local.ft)] = "ralsei dark world"
+ local.ft[array_length_1d(local.ft)] = 32
+ local.ft[array_length_1d(local.ft)] = "lancer dark world"
+ local.ft[array_length_1d(local.ft)] = 33
+ local.ft[array_length_1d(local.ft)] = "king dark world"
+ local.ft[array_length_1d(local.ft)] = 35
+ local.ft[array_length_1d(local.ft)] = "joker dark world"
+ local.ft[array_length_1d(local.ft)] = 36
+ local.ft[array_length_1d(local.ft)] = "NORMAL FONT SILENT"
+ local.ft[array_length_1d(local.ft)] = 37
+ local.ft[array_length_1d(local.ft)] = "susie dark world slow, spaced."
+ local.ft[array_length_1d(local.ft)] = 40
+ local.ft[array_length_1d(local.ft)] = "inteo"
+ local.ft[array_length_1d(local.ft)] = 41
+ local.ft[array_length_1d(local.ft)] = "intro slower"
+ local.ft[array_length_1d(local.ft)] = 42
+ local.ft[array_length_1d(local.ft)] = "big silent slower"
+ local.ft[array_length_1d(local.ft)] = 45
+ local.ft[array_length_1d(local.ft)] = "battle dialogue ral"
+ local.ft[array_length_1d(local.ft)] = 46
+ local.ft[array_length_1d(local.ft)] = "battle dialogue lan"
+ local.ft[array_length_1d(local.ft)] = 47
+ local.ft[array_length_1d(local.ft)] = "battle dialogue sus"
+ local.ft[array_length_1d(local.ft)] = 48
+ local.ft[array_length_1d(local.ft)] = "king dark world battle"
+ local.ft[array_length_1d(local.ft)] = 50
+ local.ft[array_length_1d(local.ft)] = "enemy"
+ local.ft[array_length_1d(local.ft)] = 51
+ local.ft[array_length_1d(local.ft)] = "hellish yak text"
+ local.ft[array_length_1d(local.ft)] = 52
+ local.ft[array_length_1d(local.ft)] = "hellish yak text 2"
+ local.ft[array_length_1d(local.ft)] = 53
+ local.ft[array_length_1d(local.ft)] = "enemy: Susie"
+ local.ft[array_length_1d(local.ft)] = 54
+ local.ft[array_length_1d(local.ft)] = "enemy: Susie 2"
+ local.ft[array_length_1d(local.ft)] = 55
+ local.ft[array_length_1d(local.ft)] = "rudy font"
+ local.ft[array_length_1d(local.ft)] = 60
+ local.ft[array_length_1d(local.ft)] = "SLOWER, SILENT 2"
+ local.ft[array_length_1d(local.ft)] = 666
+ local.ft[array_length_1d(local.ft)] = "GLOW TEXT"
+ local.ft[array_length_1d(local.ft)] = 667
+ local.ft[array_length_1d(local.ft)] = "GLOW TEXT 2"
+ local.ft[array_length_1d(local.ft)] = -1
+ local.ft[array_length_1d(local.ft)] = fnt_main
+ local.ft[array_length_1d(local.ft)] = -2
+ local.ft[array_length_1d(local.ft)] = fnt_ja_main
+ local.ft[array_length_1d(local.ft)] = -3
+ local.ft[array_length_1d(local.ft)] = fnt_mainbig
+ local.ft[array_length_1d(local.ft)] = -4
+ local.ft[array_length_1d(local.ft)] = fnt_ja_mainbig
+ local.ft[array_length_1d(local.ft)] = -5
+ local.ft[array_length_1d(local.ft)] = fnt_tinynoelle
+ local.ft[array_length_1d(local.ft)] = -6
+ local.ft[array_length_1d(local.ft)] = fnt_ja_tinynoelle
+ local.ft[array_length_1d(local.ft)] = -7
+ local.ft[array_length_1d(local.ft)] = fnt_dotumche
+ local.ft[array_length_1d(local.ft)] = -8
+ local.ft[array_length_1d(local.ft)] = fnt_ja_dotumche
+ local.ft[array_length_1d(local.ft)] = -9
+ local.ft[array_length_1d(local.ft)] = fnt_comicsans
+ local.ft[array_length_1d(local.ft)] = -10
+ local.ft[array_length_1d(local.ft)] = fnt_ja_comicsans
+ local.ft[array_length_1d(local.ft)] = -11
+ local.ft[array_length_1d(local.ft)] = fnt_small
+ local.ft[array_length_1d(local.ft)] = -12
+ local.ft[array_length_1d(local.ft)] = fnt_ja_small
+ global.chemg_font_types = local.ft
+ global.chemg_font_type_ndx = 0
+ }
+ local.ft = global.chemg_font_types
+ local.num_types = (array_length_1d(local.ft) / 2)
+ local.change = 0
+ if keyboard_check_pressed(''')
+ _temp_var = 1
+ else
+ _temp_var = gamepad_button_check_pressed(obj_gamecontroller.gamepad_id, gp_padr)
+ if _temp_var
+ local.change = 1
+ else
+ {
+ if keyboard_check_pressed('%')
+ _temp_var = 1
+ else
+ _temp_var = gamepad_button_check_pressed(obj_gamecontroller.gamepad_id, gp_padl)
+ if _temp_var
+ local.change = -1
+ }
+ global.chemg_font_type_ndx = (((global.chemg_font_type_ndx + local.change) + local.num_types) % local.num_types)
+ local.fndx = (global.chemg_font_type_ndx * 2)
+ local.xx = 10
+ local.yy = 250
+ local.strings[0] = "Pack my box with five"
+ local.strings[1] = "dozen liquor jugs."
+ local.strings[2] = "これは日本語です。"
+ local.strings[3] = "魔物に食われない！"
+ local.typer = local.ft[local.fndx]
+ if (local.typer >= 0)
+ {
+ global.typer = local.typer
+ scr_texttype()
+ local.font = self.myfont
+ local.msg = ((((("(" + string(global.typer)) + ") ") + local.ft[(local.fndx + 1)]) + ", font: ") + font_get_name(self.myfont))
+ local.vspacing = self.vspace
+ }
+ else
+ {
+ local.font = local.ft[(local.fndx + 1)]
+ local.msg = ("font: " + font_get_name(local.font))
+ local.vspacing = (font_get_size(local.font) + 2)
+ }
+ draw_set_font(local.font)
+ draw_set_colour(0xFFFFFF)
+ local.i = 0
+ while(true)
+ {
+ if (local.i < array_length_1d(local.strings))
+ {
+ local.str = local.strings[local.i]
+ if (local.typer >= 0)
+ {
+ local.len = string_length(local.str)
+ local.wx = local.xx
+ local.j = 1
+ while(true)
+ {
+ if (local.j <= local.len)
+ {
+ local.mychar = string_copy(local.str, local.j, 1)
+ draw_text(local.wx, ((local.yy + 20) + (local.i * local.vspacing)), local.mychar)
+ local.wx = (local.wx + self.hspace)
+ if (global.lang == "ja")
+ {
+ if (ord(local.mychar) < 256)
+ _temp_var = 1
+ else
+ {
+ if (ord(local.mychar) >= 65377)
+ _temp_var = (ord(local.mychar) <= 65439)
+ else
+ _temp_var = 0
+ }
+ if _temp_var
+ local.wx = (local.wx - (self.hspace / 2))
+ }
+ local.j = (local.j + 1)
+ continue
+ }
+ break
+ }
+ }
+ else
+ draw_text(local.xx, ((local.yy + 20) + (local.i * local.vspacing)), local.str)
+ local.i = (local.i + 1)
+ continue
+ }
+ break
+ }
+ draw_set_colour(0xFFFFFF)
+ draw_set_font(fnt_main)
+ draw_text(local.xx, local.yy, ("<-/-> to change typer: " + local.msg))
+}
diff --git a/decomp_normal/gml_Script_scr_84_get_font.gml b/decomp_switch/gml_Script_scr_84_get_font.gml
index 6e7fac6..31d2ef9 100755
--- a/decomp_normal/gml_Script_scr_84_get_font.gml
+++ b/decomp_switch/gml_Script_scr_84_get_font.gml
@@ -1,9 +1,5 @@
-scr_84_init_localization()
if (! variable_global_exists("chemg_last_get_font"))
global.chemg_last_get_font = ""
if (self.argument0 != global.chemg_last_get_font)
-{
global.chemg_last_get_font = self.argument0
- show_debug_message(("get font: " + self.argument0))
-}
return ds_map_find_value(global.font_map, self.argument0)
diff --git a/decomp_normal/gml_Script_scr_84_get_lang_string.gml b/decomp_switch/gml_Script_scr_84_get_lang_string.gml
index 8308cc0..f9d7ea5 100755
--- a/decomp_normal/gml_Script_scr_84_get_lang_string.gml
+++ b/decomp_switch/gml_Script_scr_84_get_lang_string.gml
@@ -1,2 +1 @@
-scr_84_init_localization()
return ds_map_find_value(global.lang_map, self.argument0)
diff --git a/decomp_normal/gml_Script_scr_84_get_sound.gml b/decomp_switch/gml_Script_scr_84_get_sound.gml
index 046fbbb..92b4bb3 100755
--- a/decomp_normal/gml_Script_scr_84_get_sound.gml
+++ b/decomp_switch/gml_Script_scr_84_get_sound.gml
@@ -1,2 +1 @@
-scr_84_init_localization()
return ds_map_find_value(global.chemg_sound_map, self.argument0)
diff --git a/decomp_normal/gml_Script_scr_84_get_sprite.gml b/decomp_switch/gml_Script_scr_84_get_sprite.gml
index dbbb30c..d3a909e 100755
--- a/decomp_normal/gml_Script_scr_84_get_sprite.gml
+++ b/decomp_switch/gml_Script_scr_84_get_sprite.gml
@@ -1,2 +1 @@
-scr_84_init_localization()
return ds_map_find_value(global.chemg_sprite_map, self.argument0)
diff --git a/decomp_normal/gml_Script_scr_84_init_localization.gml b/decomp_switch/gml_Script_scr_84_init_localization.gml
index 913fa1f..f9ebe16 100755
--- a/decomp_normal/gml_Script_scr_84_init_localization.gml
+++ b/decomp_switch/gml_Script_scr_84_init_localization.gml
@@ -1,7 +1,38 @@
+if ossafe_file_exists("true_config.ini")
+{
+ ossafe_ini_open("true_config.ini")
+ local._locale = os_get_language()
+ if (self.os_type == os_switch)
+ local._lang = substr(switch_language_get_desired_language(), 1, 2)
+ else
+ {
+ if (substr(local._locale, 1, 2) != "ja")
+ _temp_var = "en"
+ else
+ _temp_var = "ja"
+ local._lang = _temp_var
+ }
+ global.lang = ini_read_string("LANG", "LANG", local._lang)
+ ossafe_ini_close()
+ ossafe_savedata_save()
+}
if (! variable_global_exists("lang_loaded"))
global.lang_loaded = ""
if (! variable_global_exists("lang"))
- global.lang = "en"
+{
+ local._locale = os_get_language()
+ if (self.os_type == os_switch)
+ local._lang = substr(switch_language_get_desired_language(), 1, 2)
+ else
+ {
+ if (substr(local._locale, 1, 2) != "ja")
+ _temp_var = "en"
+ else
+ _temp_var = "ja"
+ local._lang = _temp_var
+ }
+ global.lang = local._lang
+}
if (global.lang_loaded != global.lang)
{
global.lang_loaded = global.lang
diff --git a/decomp_normal/gml_Script_scr_84_lang_load.gml b/decomp_switch/gml_Script_scr_84_lang_load.gml
index f517a4a..72d539d 100755
--- a/decomp_normal/gml_Script_scr_84_lang_load.gml
+++ b/decomp_switch/gml_Script_scr_84_lang_load.gml
@@ -5,7 +5,7 @@ local.filename = local.orig_filename
local.type = "orig"
show_debug_message(("loading lang: " + local.orig_filename))
local.orig_map = scr_84_load_map_json(local.orig_filename)
-if file_exists(local.new_filename)
+if ossafe_file_exists(local.new_filename)
{
local.new_map = scr_84_load_map_json(local.new_filename)
local.new_date = real(ds_map_find_value(local.new_map, "date"))
diff --git a/decomp_normal/gml_Script_scr_84_load_ini.gml b/decomp_switch/gml_Script_scr_84_load_ini.gml
index 6bc1c7c..95763c6 100755
--- a/decomp_normal/gml_Script_scr_84_load_ini.gml
+++ b/decomp_switch/gml_Script_scr_84_load_ini.gml
@@ -26,24 +26,24 @@ while(true)
}
break
}
-if file_exists("filech1_0")
+if ossafe_file_exists("filech1_0")
{
self.FILE[0] = 1
self.NAME[0] = scr_84_get_lang_string("DEVICE_MENU_slash_Create_0_gml_107_0")
}
-if file_exists("filech1_1")
+if ossafe_file_exists("filech1_1")
{
self.FILE[1] = 1
self.NAME[1] = scr_84_get_lang_string("DEVICE_MENU_slash_Create_0_gml_112_0")
}
-if file_exists("filech1_2")
+if ossafe_file_exists("filech1_2")
{
self.FILE[2] = 1
self.NAME[2] = scr_84_get_lang_string("DEVICE_MENU_slash_Create_0_gml_117_0")
}
-if file_exists("dr.ini")
+if ossafe_file_exists("dr.ini")
{
- ini_open("dr.ini")
+ ossafe_ini_open("dr.ini")
self.i = 0
while(true)
{
@@ -75,5 +75,6 @@ if file_exists("dr.ini")
}
break
}
- ini_close()
+ ossafe_ini_close()
+ ossafe_savedata_save()
}
diff --git a/decomp_normal/gml_Script_scr_84_name_input_setup.gml b/decomp_switch/gml_Script_scr_84_name_input_setup.gml
index f9a1c52..6cba2bb 100755
--- a/decomp_normal/gml_Script_scr_84_name_input_setup.gml
+++ b/decomp_switch/gml_Script_scr_84_name_input_setup.gml
@@ -45,7 +45,7 @@ else
self.PLAYERNAMEY = 60
local.menu[0] = "アイウエオ　マミムメモ　ァィゥェォ"
local.menu[1] = "カキクケコ　ヤ　ユ　ヨ　ガギグゲゴ"
- local.menu[2] = "サシスセソ　ラリルレロ　ザジズセゾ"
+ local.menu[2] = "サシスセソ　ラリルレロ　ザジズゼゾ"
local.menu[3] = "タチツテト　ワヲンー　　ダヂヅデド"
local.menu[4] = "ナニヌネノ　ャュョッヮ　バビブベボ"
local.menu[5] = "ハヒフヘホ　　　　　　　パピプペポ"
@@ -61,9 +61,9 @@ else
local.xstep = 32
local.ystep = 15
self.PLAYERNAMEY = 60
- local.menu[0] = "ＡＢＣＤＥＦＧＨＩ"
- local.menu[1] = "ＪＫＬＭＮＯＰＱＲ"
- local.menu[2] = "ＳＴＵＶＷＸＹＺ "
+ local.menu[0] = "ABCDEFGHI"
+ local.menu[1] = "JKLMNOPQR"
+ local.menu[2] = "STUVWXYZ "
local.menu[3] = " "
local.menu[4] = " "
local.menu[5] = " "
diff --git a/decomp_normal/gml_Script_scr_change_language.gml b/decomp_switch/gml_Script_scr_change_language.gml
index 66ed217..a06f22f 100755
--- a/decomp_normal/gml_Script_scr_change_language.gml
+++ b/decomp_switch/gml_Script_scr_change_language.gml
@@ -2,7 +2,8 @@ if (global.lang == "en")
global.lang = "ja"
else
global.lang = "en"
-ini_open("true_config.ini")
+ossafe_ini_open("true_config.ini")
ini_write_string("LANG", "LANG", global.lang)
-ini_close()
+ossafe_ini_close()
+ossafe_savedata_save()
scr_84_init_localization()
diff --git a/decomp_normal/gml_Script_scr_controls_default.gml b/decomp_switch/gml_Script_scr_controls_default.gml
index a9ae556..660516e 100755
--- a/decomp_normal/gml_Script_scr_controls_default.gml
+++ b/decomp_switch/gml_Script_scr_controls_default.gml
@@ -1,3 +1,32 @@
+global.button0 = 2
+global.button1 = 1
+global.button2 = 4
+if (self.os_type == os_ps4)
+{
+ if (global.lang == "ja")
+ {
+ global.button0 = 32770
+ global.button1 = 32769
+ }
+ else
+ {
+ global.button0 = 32769
+ global.button1 = 32770
+ }
+ global.button2 = 32772
+}
+else
+{
+ if (self.os_type == os_switch)
+ {
+ global.button0 = 32770
+ global.button1 = 32769
+ global.button2 = 32772
+ }
+}
+global.default_button0 = global.button0
+global.default_button1 = global.button1
+global.default_button2 = global.button2
global.input_k[0] = 40
global.input_k[1] = 39
global.input_k[2] = 38
@@ -8,13 +37,13 @@ global.input_k[6] = 67
global.input_k[7] = 13
global.input_k[8] = 16
global.input_k[9] = 17
-global.input_g[0] = 1
-global.input_g[1] = 3
-global.input_g[2] = 0
-global.input_g[3] = 2
-global.input_g[4] = 13
-global.input_g[5] = 12
-global.input_g[6] = 15
+global.input_g[0] = 32782
+global.input_g[1] = 32784
+global.input_g[2] = 32781
+global.input_g[3] = 32783
+global.input_g[4] = global.button0
+global.input_g[5] = global.button1
+global.input_g[6] = global.button2
global.input_g[7] = 999
global.input_g[8] = 999
global.input_g[9] = 999
diff --git a/decomp_normal/gml_Script_scr_debug.gml b/decomp_switch/gml_Script_scr_debug.gml
index 5cf80b8..bbbcd9e 100755
--- a/decomp_normal/gml_Script_scr_debug.gml
+++ b/decomp_switch/gml_Script_scr_debug.gml
@@ -1,3 +1,2 @@
-if (global.debug == 1)
- return 0
-return 0
+if instance_exists(obj_debugcontroller)
+ return obj_debugcontroller.debug
diff --git a/decomp_normal/gml_Script_scr_dogcheck.gml b/decomp_switch/gml_Script_scr_dogcheck.gml
index 3b3d6e8..e28d7fa 100755
--- a/decomp_normal/gml_Script_scr_dogcheck.gml
+++ b/decomp_switch/gml_Script_scr_dogcheck.gml
@@ -3,6 +3,11 @@ if (global.currentroom >= 131)
else
_temp_var = (global.currentroom <= 0)
if _temp_var
- return 1
+{
+ if (scr_debug() == 0)
+ return 1
+ else
+ return 0
+}
else
return 0
diff --git a/decomp_switch/gml_Script_scr_draw_background_ps4.gml b/decomp_switch/gml_Script_scr_draw_background_ps4.gml
new file mode 100755
index 0000000..a8a52eb
--- /dev/null
+++ b/decomp_switch/gml_Script_scr_draw_background_ps4.gml
@@ -0,0 +1,14 @@
+local.bg = self.argument0
+local.xx = self.argument1
+local.yy = self.argument2
+if (self.os_type == os_ps4)
+ _temp_var = 1
+else
+ _temp_var = (self.os_type == os_switch)
+if _temp_var
+{
+ local.scale = (window_get_width() / 1920)
+ draw_background_stretched(local.bg, (local.xx * local.scale), (local.yy * local.scale), (background_get_width(local.bg) * local.scale), (background_get_height(local.bg) * local.scale))
+}
+else
+ draw_background(local.bg, local.xx, local.yy)
diff --git a/decomp_switch/gml_Script_scr_draw_screen_border.gml b/decomp_switch/gml_Script_scr_draw_screen_border.gml
new file mode 100755
index 0000000..8e0fdeb
--- /dev/null
+++ b/decomp_switch/gml_Script_scr_draw_screen_border.gml
@@ -0,0 +1,171 @@
+local.border_id = self.argument0
+draw_enable_alphablend(0)
+if (local.border_id == "Dynamic")
+ _temp_var = 1
+else
+ _temp_var = (local.border_id == "ダイナミック")
+if _temp_var
+{
+ if (! self.loaded)
+ {
+ obj_time.border_alpha = 0
+ self.loaded = 1
+ }
+ obj_time.border_fade_value = 0.025
+ local.room_id = global.currentroom
+ if instance_exists(obj_overworldc)
+ _temp_var = border_light
+ else
+ _temp_var = border_dark
+ local._border_image = _temp_var
+ if (local.room_id == 1)
+ _temp_var = 1
+ else
+ {
+ if (local.room_id == 309)
+ _temp_var = 1
+ else
+ {
+ if (local.room_id == 139)
+ _temp_var = 1
+ else
+ {
+ if (local.room_id == 145)
+ _temp_var = 1
+ else
+ {
+ if (local.room_id == 135)
+ _temp_var = 1
+ else
+ {
+ if (local.room_id == 131)
+ _temp_var = 1
+ else
+ {
+ if (local.room_id == 35)
+ _temp_var = 1
+ else
+ _temp_var = (local.room_id == 40)
+ }
+ }
+ }
+ }
+ }
+ }
+ if _temp_var
+ obj_time.border_alpha = 0
+ else
+ {
+ if (local.room_id == 32)
+ _temp_var = 1
+ else
+ _temp_var = (local.room_id == 130)
+ if _temp_var
+ obj_time.border_fade_out = (obj_time.border_alpha > 0)
+ else
+ {
+ if (local.room_id == 7)
+ _temp_var = 1
+ else
+ {
+ if (local.room_id == 45)
+ _temp_var = 1
+ else
+ _temp_var = (local.room_id == 14)
+ }
+ if _temp_var
+ obj_time.border_fade_in = (obj_time.border_alpha < 1)
+ else
+ {
+ if instance_exists(obj_savepoint)
+ obj_time.border_alpha = 1
+ }
+ }
+ }
+ if (local.room_id == 33)
+ {
+ if instance_exists(obj_unusedclassevent)
+ {
+ if (obj_unusedclassevent.lightsoff == 0)
+ obj_time.border_fade_in = (obj_time.border_alpha < 1)
+ else
+ obj_time.border_alpha = 0
+ }
+ }
+ if (local.room_id == 2)
+ {
+ if instance_exists(obj_krisroom)
+ {
+ if (obj_krisroom.con >= 50)
+ obj_time.border_fade_out = (obj_time.border_alpha > 0)
+ else
+ {
+ if (global.plot <= 10)
+ _temp_var = 0
+ else
+ _temp_var = 1
+ obj_time.border_alpha = _temp_var
+ }
+ }
+ }
+ if (local.room_id == 138)
+ {
+ if instance_exists(DEVICE_FAILURE)
+ {
+ if (DEVICE_FAILURE.EVENT >= 27)
+ _temp_var = (! instance_exists(obj_writer))
+ else
+ _temp_var = 0
+ if _temp_var
+ obj_time.border_alpha = 0
+ }
+ }
+ if (local.room_id == 132)
+ _temp_var = 1
+ else
+ {
+ if (local.room_id == 313)
+ _temp_var = 1
+ else
+ _temp_var = (local.room_id == 139)
+ }
+ if _temp_var
+ _temp_var = (global.game_won == 1)
+ else
+ _temp_var = 0
+ if _temp_var
+ {
+ local._border_image = 1051
+ obj_time.border_alpha = 1
+ }
+ scr_draw_background_ps4(local._border_image, 0, 0)
+ global.disable_border = (obj_time.border_alpha != 1)
+}
+else
+{
+ if (local.border_id == "Simple")
+ _temp_var = 1
+ else
+ _temp_var = (local.border_id == "シンプル")
+ if _temp_var
+ {
+ local.room_id = global.currentroom
+ if instance_exists(obj_savepoint)
+ obj_time.border_alpha = 1
+ if (local.room_id == 140)
+ {
+ if instance_exists(obj_credits)
+ {
+ if (obj_credits.timer >= 1560)
+ {
+ obj_time.border_fade_value = 0.01
+ obj_time.border_fade_out = (obj_time.border_alpha > 0)
+ }
+ }
+ }
+ scr_draw_background_ps4(bg_border_line_1080, 0, 0)
+ global.disable_border = (obj_time.border_alpha != 1)
+ }
+}
+draw_set_alpha(1)
+draw_enable_alphablend(1)
diff --git a/decomp_switch/gml_Script_scr_ds_list_read.gml b/decomp_switch/gml_Script_scr_ds_list_read.gml
new file mode 100755
index 0000000..b74f0b9
--- /dev/null
+++ b/decomp_switch/gml_Script_scr_ds_list_read.gml
@@ -0,0 +1,5 @@
+local.new_list = ds_list_create()
+local.list_string = ossafe_file_text_read_string(self.argument0)
+if (local.list_string != "")
+ ds_list_read(local.new_list, local.list_string)
+return local.new_list
diff --git a/decomp_switch/gml_Script_scr_ds_list_write.gml b/decomp_switch/gml_Script_scr_ds_list_write.gml
new file mode 100755
index 0000000..0c373e3
--- /dev/null
+++ b/decomp_switch/gml_Script_scr_ds_list_write.gml
@@ -0,0 +1,15 @@
+local.new_list = ds_list_create()
+local.i = 0
+while(true)
+{
+ if (local.i < self.argument1)
+ {
+ ds_list_add(local.new_list, self.argument0[local.i])
+ local.i = (local.i + 1)
+ continue
+ }
+ break
+}
+local.list_string = ds_list_write(local.new_list)
+ds_map_set(self.myfileid, "data", (ds_map_find_value(self.myfileid, "data") + local.list_string))
+ds_list_destroy(local.new_list)
diff --git a/decomp_switch/gml_Script_scr_enable_screen_border.gml b/decomp_switch/gml_Script_scr_enable_screen_border.gml
new file mode 100755
index 0000000..550e5c7
--- /dev/null
+++ b/decomp_switch/gml_Script_scr_enable_screen_border.gml
@@ -0,0 +1,9 @@
+local.flag = self.argument0
+local.flag = (local.flag != 0)
+if (local.flag != global.screen_border_active)
+{
+ global.screen_border_active = (local.flag != 0)
+ global.screen_border_state = 0
+ global.screen_border_dynamic_fade_id = 0
+ global.screen_border_dynamic_fade_level = 0
+}
diff --git a/decomp_normal/gml_Script_scr_gamepad_axis_check.gml b/decomp_switch/gml_Script_scr_gamepad_axis_check.gml
index 0f8fc88..6b5e8b2 100755
--- a/decomp_normal/gml_Script_scr_gamepad_axis_check.gml
+++ b/decomp_switch/gml_Script_scr_gamepad_axis_check.gml
@@ -1,22 +1,22 @@
self.__returnvalue = 0
if (self.argument1 == 0)
{
- if (gamepad_axis_value(self.argument0, 1) <= (- self.axis_value))
+ if (gamepad_axis_value(self.argument0, 32786) >= self.axis_value)
self.__returnvalue = 1
}
if (self.argument1 == 1)
{
- if (gamepad_axis_value(self.argument0, 0) >= self.axis_value)
+ if (gamepad_axis_value(self.argument0, 32785) >= self.axis_value)
self.__returnvalue = 1
}
if (self.argument1 == 2)
{
- if (gamepad_axis_value(self.argument0, 1) >= self.axis_value)
+ if (gamepad_axis_value(self.argument0, 32786) <= (- self.axis_value))
self.__returnvalue = 1
}
if (self.argument1 == 3)
{
- if (gamepad_axis_value(self.argument0, 0) <= (- self.axis_value))
+ if (gamepad_axis_value(self.argument0, 32785) <= (- self.axis_value))
self.__returnvalue = 1
}
return self.__returnvalue
diff --git a/decomp_normal/gml_Script_scr_gamestart.gml b/decomp_switch/gml_Script_scr_gamestart.gml
index 3cd120f..ad0974d 100755
--- a/decomp_normal/gml_Script_scr_gamestart.gml
+++ b/decomp_switch/gml_Script_scr_gamestart.gml
@@ -284,7 +284,6 @@ global.currentsong[0] = 148
global.currentsong[1] = 148
global.batmusic[0] = 148
global.batmusic[1] = 148
-global.debug = 0
global.fc = 0
global.fe = 0
global.choice = -1
@@ -375,3 +374,6 @@ while(true)
}
break
}
+global.currentroom = 0
+global.disable_border = 0
+global.game_won = 0
diff --git a/decomp_normal/gml_Script_scr_get_input_name.gml b/decomp_switch/gml_Script_scr_get_input_name.gml
index 916830a..2a7602c 100755
--- a/decomp_normal/gml_Script_scr_get_input_name.gml
+++ b/decomp_switch/gml_Script_scr_get_input_name.gml
@@ -1 +1,23 @@
-return global.asc_def[global.input_k[self.argument0]]
+if (self.os_type == os_switch)
+ _temp_var = 1
+else
+ _temp_var = (self.os_type == os_ps4)
+if _temp_var
+{
+ local._control = global.input_g[self.argument0]
+ if (local._control == 32784)
+ return "\*D "
+ if (local._control == 32783)
+ return "\*A "
+ if (local._control == global.button0)
+ return "\*Z "
+ if (local._control == global.button1)
+ return "\*X "
+ if (local._control == global.button2)
+ return "\*C "
+}
+else
+{
+ local._control = global.asc_def[global.input_k[self.argument0]]
+ return local._control
+}
diff --git a/decomp_switch/gml_Script_scr_getbuttonsprite.gml b/decomp_switch/gml_Script_scr_getbuttonsprite.gml
new file mode 100755
index 0000000..5fabfed
--- /dev/null
+++ b/decomp_switch/gml_Script_scr_getbuttonsprite.gml
@@ -0,0 +1,213 @@
+local.control = self.argument0
+local.isString = self.argument1
+local.button = -4
+if local.isString
+{
+ if (local.control == "A")
+ {
+ if (self.os_type == os_switch)
+ return 1017
+ else
+ {
+ if (self.os_type == os_ps4)
+ return 1046
+ }
+ return -4
+ }
+ if (local.control == "D")
+ {
+ if (self.os_type == os_switch)
+ return 1021
+ else
+ {
+ if (self.os_type == os_ps4)
+ return 1047
+ }
+ return -4
+ }
+ if (local.control == "Z")
+ local.button = global.button0
+ if (local.control == "X")
+ local.button = global.button1
+ if (local.control == "C")
+ local.button = global.button2
+}
+else
+{
+ local.button = local.control
+ if (local.control == 32783)
+ {
+ if (self.os_type == os_switch)
+ return 1017
+ else
+ {
+ if (self.os_type == os_ps4)
+ return 1046
+ }
+ return -4
+ }
+ if (local.control == 32784)
+ {
+ if (self.os_type == os_switch)
+ return 1021
+ else
+ {
+ if (self.os_type == os_ps4)
+ return 1047
+ }
+ return -4
+ }
+ if (local.control == 32781)
+ {
+ if (self.os_type == os_switch)
+ return 1024
+ else
+ {
+ if (self.os_type == os_ps4)
+ return 1048
+ }
+ return -4
+ }
+ if (local.control == 32782)
+ {
+ if (self.os_type == os_switch)
+ return 1033
+ else
+ {
+ if (self.os_type == os_ps4)
+ return 1049
+ }
+ return -4
+ }
+}
+if (local.button == 32769)
+{
+ if (self.os_type == os_ps4)
+ return 1043
+ if (self.os_type == os_switch)
+ return 1031
+}
+if (local.button == 32770)
+{
+ if (self.os_type == os_ps4)
+ return 1042
+ if (self.os_type == os_switch)
+ return 1030
+}
+if (local.button == 32771)
+{
+ if (self.os_type == os_ps4)
+ return 1038
+ if (self.os_type == os_switch)
+ return 1026
+}
+if (local.button == 32772)
+{
+ if (self.os_type == os_ps4)
+ return 1040
+ if (self.os_type == os_switch)
+ return 1025
+}
+if (local.button == 32773)
+{
+ if (self.os_type == os_ps4)
+ return 1044
+ if (self.os_type == os_switch)
+ return 1016
+}
+if (local.button == 32775)
+{
+ if (self.os_type == os_ps4)
+ return 1045
+ if (self.os_type == os_switch)
+ return 1027
+}
+if (local.button == 32774)
+{
+ if (self.os_type == os_ps4)
+ return 1035
+ if (self.os_type == os_switch)
+ return 1020
+}
+if (local.button == 32776)
+{
+ if (self.os_type == os_ps4)
+ return 1036
+ if (self.os_type == os_switch)
+ return 1028
+}
+if (local.button == 32779)
+{
+ if (self.os_type == os_switch)
+ _temp_var = 1
+ else
+ _temp_var = (self.os_type == os_ps4)
+ if _temp_var
+ return 1034
+}
+if (local.button == 32780)
+{
+ if (self.os_type == os_switch)
+ _temp_var = 1
+ else
+ _temp_var = (self.os_type == os_ps4)
+ if _temp_var
+ return 1037
+}
+if (local.button == 32777)
+{
+ if (self.os_type == os_ps4)
+ return 1039
+ if (self.os_type == os_switch)
+ return 1018
+}
+if (local.button == 32778)
+{
+ if (self.os_type == os_switch)
+ return 1019
+}
+if (local.button == 32783)
+{
+ if (self.os_type == os_switch)
+ return 1017
+ else
+ {
+ if (self.os_type == os_ps4)
+ return 1046
+ }
+ return -4
+}
+if (local.button == 32784)
+{
+ if (self.os_type == os_switch)
+ return 1021
+ else
+ {
+ if (self.os_type == os_ps4)
+ return 1047
+ }
+ return -4
+}
+if (local.button == 32781)
+{
+ if (self.os_type == os_switch)
+ return 1024
+ else
+ {
+ if (self.os_type == os_ps4)
+ return 1048
+ }
+ return -4
+}
+if (local.button == 32782)
+{
+ if (self.os_type == os_switch)
+ return 1033
+ else
+ {
+ if (self.os_type == os_ps4)
+ return 1049
+ }
+ return -4
+}
+return -4
diff --git a/decomp_normal/gml_Script_scr_itemuse.gml b/decomp_switch/gml_Script_scr_itemuse.gml
index bb09463..f190f07 100755
--- a/decomp_normal/gml_Script_scr_itemuse.gml
+++ b/decomp_switch/gml_Script_scr_itemuse.gml
@@ -35,7 +35,7 @@ switch self.argument0
scr_itemcomment(global.charselect, scr_84_get_lang_string("scr_itemuse_slash_scr_itemuse_gml_28_0"))
if (self._gc == 3)
{
- if scr_havechar(2)
+ if (self.suspos >= 0)
scr_itemcomment(self.suspos, scr_84_get_lang_string("scr_itemuse_slash_scr_itemuse_gml_33_0"))
scr_itemcomment(global.charselect, scr_84_get_lang_string("scr_itemuse_slash_scr_itemuse_gml_35_0"))
}
@@ -54,7 +54,7 @@ switch self.argument0
}
if (self._gc == 3)
{
- if scr_havechar(2)
+ if (self.suspos >= 0)
scr_itemcomment(self.suspos, scr_84_get_lang_string("scr_itemuse_slash_scr_itemuse_gml_53_0"))
scr_itemcomment(self.ralpos, scr_84_get_lang_string("scr_itemuse_slash_scr_itemuse_gml_54_0"))
}
diff --git a/decomp_normal/gml_Script_scr_load.gml b/decomp_switch/gml_Script_scr_load.gml
index 5372c98..a5138d0 100755
--- a/decomp_normal/gml_Script_scr_load.gml
+++ b/decomp_switch/gml_Script_scr_load.gml
@@ -1,87 +1,212 @@
snd_free_all()
-self.filechoicebk = global.filechoice
-scr_gamestart()
+self.filechoicebk = 0
+if variable_global_exists("filechoice")
+ self.filechoicebk = global.filechoice
global.filechoice = self.filechoicebk
self.file = ("filech1_" + string(global.filechoice))
-self.myfileid = file_text_open_read(self.file)
-global.truename = file_text_read_string(self.myfileid)
-file_text_readln(self.myfileid)
+self.myfileid = ossafe_file_text_open_read(self.file)
+if instance_exists(obj_loadscreen)
+ obj_loadscreen.save_loaded = 1
+global.truename = ossafe_file_text_read_string(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+local.othername_list = scr_ds_list_read(self.myfileid)
self.i = 0
while(true)
{
- if (self.i < 6)
+ if (self.i < ds_list_size(local.othername_list))
{
- global.othername[self.i] = file_text_read_string(self.myfileid)
- file_text_readln(self.myfileid)
+ global.othername[self.i] = ds_list_find_value(local.othername_list, self.i)
self.i = (self.i + 1)
continue
}
break
}
-global.char[0] = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.char[1] = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.char[2] = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.gold = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.xp = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.lv = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.inv = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.invc = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.darkzone = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
+ds_list_destroy(local.othername_list)
+ossafe_file_text_readln(self.myfileid)
+global.char[0] = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.char[1] = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.char[2] = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.gold = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.xp = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.lv = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.inv = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.invc = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.darkzone = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+local.hp_list = scr_ds_list_read(self.myfileid)
+self.i = 0
+while(true)
+{
+ if (self.i < ds_list_size(local.hp_list))
+ {
+ global.hp[self.i] = ds_list_find_value(local.hp_list, self.i)
+ self.i = (self.i + 1)
+ continue
+ }
+ break
+}
+ds_list_destroy(local.hp_list)
+ossafe_file_text_readln(self.myfileid)
+local.maxhp_list = scr_ds_list_read(self.myfileid)
+self.i = 0
+while(true)
+{
+ if (self.i < ds_list_size(local.maxhp_list))
+ {
+ global.maxhp[self.i] = ds_list_find_value(local.maxhp_list, self.i)
+ self.i = (self.i + 1)
+ continue
+ }
+ break
+}
+ds_list_destroy(local.maxhp_list)
+ossafe_file_text_readln(self.myfileid)
+local.at_list = scr_ds_list_read(self.myfileid)
+self.i = 0
+while(true)
+{
+ if (self.i < ds_list_size(local.at_list))
+ {
+ global.at[self.i] = ds_list_find_value(local.at_list, self.i)
+ self.i = (self.i + 1)
+ continue
+ }
+ break
+}
+ds_list_destroy(local.at_list)
+ossafe_file_text_readln(self.myfileid)
+local.df_list = scr_ds_list_read(self.myfileid)
+self.i = 0
+while(true)
+{
+ if (self.i < ds_list_size(local.df_list))
+ {
+ global.df[self.i] = ds_list_find_value(local.df_list, self.i)
+ self.i = (self.i + 1)
+ continue
+ }
+ break
+}
+ds_list_destroy(local.df_list)
+ossafe_file_text_readln(self.myfileid)
+local.mag_list = scr_ds_list_read(self.myfileid)
+self.i = 0
+while(true)
+{
+ if (self.i < ds_list_size(local.mag_list))
+ {
+ global.mag[self.i] = ds_list_find_value(local.mag_list, self.i)
+ self.i = (self.i + 1)
+ continue
+ }
+ break
+}
+ds_list_destroy(local.mag_list)
+ossafe_file_text_readln(self.myfileid)
+local.guts_list = scr_ds_list_read(self.myfileid)
+self.i = 0
+while(true)
+{
+ if (self.i < ds_list_size(local.guts_list))
+ {
+ global.guts[self.i] = ds_list_find_value(local.guts_list, self.i)
+ self.i = (self.i + 1)
+ continue
+ }
+ break
+}
+ds_list_destroy(local.guts_list)
+ossafe_file_text_readln(self.myfileid)
+local.charweapon_list = scr_ds_list_read(self.myfileid)
+self.i = 0
+while(true)
+{
+ if (self.i < ds_list_size(local.charweapon_list))
+ {
+ global.charweapon[self.i] = ds_list_find_value(local.charweapon_list, self.i)
+ self.i = (self.i + 1)
+ continue
+ }
+ break
+}
+ds_list_destroy(local.charweapon_list)
+ossafe_file_text_readln(self.myfileid)
+local.chararmor1_list = scr_ds_list_read(self.myfileid)
+self.i = 0
+while(true)
+{
+ if (self.i < ds_list_size(local.chararmor1_list))
+ {
+ global.chararmor1[self.i] = ds_list_find_value(local.chararmor1_list, self.i)
+ self.i = (self.i + 1)
+ continue
+ }
+ break
+}
+ds_list_destroy(local.chararmor1_list)
+ossafe_file_text_readln(self.myfileid)
+local.chararmor2_list = scr_ds_list_read(self.myfileid)
+self.i = 0
+while(true)
+{
+ if (self.i < ds_list_size(local.chararmor2_list))
+ {
+ global.chararmor2[self.i] = ds_list_find_value(local.chararmor2_list, self.i)
+ self.i = (self.i + 1)
+ continue
+ }
+ break
+}
+ds_list_destroy(local.chararmor2_list)
+ossafe_file_text_readln(self.myfileid)
+local.weaponstyle_list = scr_ds_list_read(self.myfileid)
+self.i = 0
+while(true)
+{
+ if (self.i < ds_list_size(local.weaponstyle_list))
+ {
+ global.weaponstyle[self.i] = ds_list_find_value(local.weaponstyle_list, self.i)
+ self.i = (self.i + 1)
+ continue
+ }
+ break
+}
+ds_list_destroy(local.weaponstyle_list)
+ossafe_file_text_readln(self.myfileid)
self.i = 0
while(true)
{
if (self.i < 4)
{
- global.hp[self.i] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
- global.maxhp[self.i] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
- global.at[self.i] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
- global.df[self.i] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
- global.mag[self.i] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
- global.guts[self.i] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
- global.charweapon[self.i] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
- global.chararmor1[self.i] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
- global.chararmor2[self.i] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
- global.weaponstyle[self.i] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
self.q = 0
while(true)
{
if (self.q < 4)
{
- global.itemat[self.i][self.q] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
- global.itemdf[self.i][self.q] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
- global.itemmag[self.i][self.q] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
- global.itembolts[self.i][self.q] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
- global.itemgrazeamt[self.i][self.q] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
- global.itemgrazesize[self.i][self.q] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
- global.itemboltspeed[self.i][self.q] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
- global.itemspecial[self.i][self.q] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
+ global.itemat[self.i][self.q] = ossafe_file_text_read_real(self.myfileid)
+ ossafe_file_text_readln(self.myfileid)
+ global.itemdf[self.i][self.q] = ossafe_file_text_read_real(self.myfileid)
+ ossafe_file_text_readln(self.myfileid)
+ global.itemmag[self.i][self.q] = ossafe_file_text_read_real(self.myfileid)
+ ossafe_file_text_readln(self.myfileid)
+ global.itembolts[self.i][self.q] = ossafe_file_text_read_real(self.myfileid)
+ ossafe_file_text_readln(self.myfileid)
+ global.itemgrazeamt[self.i][self.q] = ossafe_file_text_read_real(self.myfileid)
+ ossafe_file_text_readln(self.myfileid)
+ global.itemgrazesize[self.i][self.q] = ossafe_file_text_read_real(self.myfileid)
+ ossafe_file_text_readln(self.myfileid)
+ global.itemboltspeed[self.i][self.q] = ossafe_file_text_read_real(self.myfileid)
+ ossafe_file_text_readln(self.myfileid)
+ global.itemspecial[self.i][self.q] = ossafe_file_text_read_real(self.myfileid)
+ ossafe_file_text_readln(self.myfileid)
self.q = (self.q + 1)
continue
}
@@ -92,8 +217,8 @@ while(true)
{
if (self.j < 12)
{
- global.spell[self.i][self.j] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
+ global.spell[self.i][self.j] = ossafe_file_text_read_real(self.myfileid)
+ ossafe_file_text_readln(self.myfileid)
self.j = (self.j + 1)
continue
}
@@ -104,93 +229,145 @@ while(true)
}
break
}
-global.boltspeed = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.grazeamt = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.grazesize = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-self.j = 0
+global.boltspeed = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.grazeamt = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.grazesize = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+local.item_list = scr_ds_list_read(self.myfileid)
+self.i = 0
while(true)
{
- if (self.j < 13)
+ if (self.i < ds_list_size(local.item_list))
{
- global.item[self.j] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
- global.keyitem[self.j] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
- global.weapon[self.j] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
- global.armor[self.j] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
- self.j = (self.j + 1)
+ global.item[self.i] = ds_list_find_value(local.item_list, self.i)
+ self.i = (self.i + 1)
continue
}
break
}
-global.tension = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.maxtension = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.lweapon = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.larmor = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.lxp = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.llv = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.lgold = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.lhp = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.lmaxhp = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.lat = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.ldf = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.lwstrength = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.ladef = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
+ds_list_destroy(local.item_list)
+ossafe_file_text_readln(self.myfileid)
+local.keyitem_list = scr_ds_list_read(self.myfileid)
self.i = 0
while(true)
{
- if (self.i < 8)
+ if (self.i < ds_list_size(local.keyitem_list))
{
- global.litem[self.i] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
- global.phone[self.i] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
+ global.keyitem[self.i] = ds_list_find_value(local.keyitem_list, self.i)
self.i = (self.i + 1)
continue
}
break
}
+ds_list_destroy(local.keyitem_list)
+ossafe_file_text_readln(self.myfileid)
+local.weapon_list = scr_ds_list_read(self.myfileid)
self.i = 0
while(true)
{
- if (self.i < 9999)
+ if (self.i < ds_list_size(local.weapon_list))
{
- global.flag[self.i] = file_text_read_real(self.myfileid)
- file_text_readln(self.myfileid)
+ global.weapon[self.i] = ds_list_find_value(local.weapon_list, self.i)
self.i = (self.i + 1)
continue
}
break
}
-global.plot = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.currentroom = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-global.time = file_text_read_real(self.myfileid)
-file_text_readln(self.myfileid)
-file_text_close(self.myfileid)
+ds_list_destroy(local.weapon_list)
+ossafe_file_text_readln(self.myfileid)
+local.armor_list = scr_ds_list_read(self.myfileid)
+self.i = 0
+while(true)
+{
+ if (self.i < ds_list_size(local.armor_list))
+ {
+ global.armor[self.i] = ds_list_find_value(local.armor_list, self.i)
+ self.i = (self.i + 1)
+ continue
+ }
+ break
+}
+ds_list_destroy(local.armor_list)
+ossafe_file_text_readln(self.myfileid)
+global.tension = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.maxtension = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.lweapon = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.larmor = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.lxp = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.llv = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.lgold = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.lhp = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.lmaxhp = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.lat = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.ldf = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.lwstrength = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.ladef = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+local.litem_list = scr_ds_list_read(self.myfileid)
+self.i = 0
+while(true)
+{
+ if (self.i < (ds_list_size(local.litem_list) - 1))
+ {
+ global.litem[self.i] = ds_list_find_value(local.litem_list, self.i)
+ self.i = (self.i + 1)
+ continue
+ }
+ break
+}
+ds_list_destroy(local.litem_list)
+ossafe_file_text_readln(self.myfileid)
+local.phone_list = scr_ds_list_read(self.myfileid)
+self.i = 0
+while(true)
+{
+ if (self.i < (ds_list_size(local.phone_list) - 1))
+ {
+ global.phone[self.i] = ds_list_find_value(local.phone_list, self.i)
+ self.i = (self.i + 1)
+ continue
+ }
+ break
+}
+ds_list_destroy(local.phone_list)
+ossafe_file_text_readln(self.myfileid)
+local.flag_list = scr_ds_list_read(self.myfileid)
+self.i = 0
+while(true)
+{
+ if (self.i < (ds_list_size(local.flag_list) - 1))
+ {
+ global.flag[self.i] = ds_list_find_value(local.flag_list, self.i)
+ self.i = (self.i + 1)
+ continue
+ }
+ break
+}
+ds_list_destroy(local.flag_list)
+ossafe_file_text_readln(self.myfileid)
+global.plot = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.currentroom = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+global.time = ossafe_file_text_read_real(self.myfileid)
+ossafe_file_text_readln(self.myfileid)
+ossafe_file_text_close(self.myfileid)
global.lastsavedtime = global.time
global.lastsavedlv = global.lv
-file_text_close(self.myfileid)
-scr_tempsave()
audio_group_set_gain(1, global.flag[15], 0)
audio_set_master_gain(0, global.flag[17])
if (global.plot >= 156)
@@ -211,3 +388,5 @@ self.__loadedroom = global.currentroom
if scr_dogcheck()
self.__loadedroom = 131
room_goto(self.__loadedroom)
+global.currentroom = self.__loadedroom
+scr_tempsave()
diff --git a/decomp_normal/gml_Script_scr_losechar.gml b/decomp_switch/gml_Script_scr_losechar.gml
index 21f74c0..7533c28 100755
--- a/decomp_normal/gml_Script_scr_losechar.gml
+++ b/decomp_switch/gml_Script_scr_losechar.gml
@@ -1,5 +1,16 @@
global.char[2] = 0
global.char[1] = 0
+self.i = 0
+while(true)
+{
+ if (self.i < 36)
+ {
+ global.submenucoord[self.i] = 0
+ self.i = (self.i + 1)
+ continue
+ }
+ break
+}
with(obj_darkcontroller)
{
self.chartotal = 0
diff --git a/decomp_normal/gml_Script_scr_save.gml b/decomp_switch/gml_Script_scr_save.gml
index dfc3e61..a2f9a45 100755
--- a/decomp_normal/gml_Script_scr_save.gml
+++ b/decomp_switch/gml_Script_scr_save.gml
@@ -3,11 +3,3 @@ self.filechoicebk2 = global.filechoice
global.filechoice = 9
scr_saveprocess(9)
global.filechoice = self.filechoicebk2
-self.iniwrite = ini_open("dr.ini")
-ini_write_string(("G" + string(global.filechoice)), "Name", global.truename)
-ini_write_real(("G" + string(global.filechoice)), "Level", global.lv)
-ini_write_real(("G" + string(global.filechoice)), "Love", global.llv)
-ini_write_real(("G" + string(global.filechoice)), "Time", global.time)
-ini_write_real(("G" + string(global.filechoice)), "Room", self.room)
-ini_write_real(("G" + string(global.filechoice)), "InitLang", global.flag[912])
-ini_close()
diff --git a/decomp_normal/gml_Script_scr_saveprocess.gml b/decomp_switch/gml_Script_scr_saveprocess.gml
index fed08b5..bdbf819 100755
--- a/decomp_normal/gml_Script_scr_saveprocess.gml
+++ b/decomp_switch/gml_Script_scr_saveprocess.gml
@@ -1,85 +1,75 @@
global.lastsavedtime = global.time
global.lastsavedlv = global.lv
self.file = ("filech1_" + string(self.argument0))
-self.myfileid = file_text_open_write(self.file)
-file_text_write_string(self.myfileid, global.truename)
-file_text_writeln(self.myfileid)
-self.i = 0
-while(true)
-{
- if (self.i < 6)
- {
- file_text_write_string(self.myfileid, global.othername[self.i])
- file_text_writeln(self.myfileid)
- self.i = (self.i + 1)
- continue
- }
- break
-}
-file_text_write_real(self.myfileid, global.char[0])
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.char[1])
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.char[2])
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.gold)
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.xp)
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.lv)
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.inv)
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.invc)
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.darkzone)
-file_text_writeln(self.myfileid)
+self.myfileid = ossafe_file_text_open_write(self.file)
+ossafe_file_text_write_string(self.myfileid, global.truename)
+ossafe_file_text_writeln(self.myfileid)
+scr_ds_list_write(global.othername, 6)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.char[0])
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.char[1])
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.char[2])
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.gold)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.xp)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.lv)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.inv)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.invc)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.darkzone)
+ossafe_file_text_writeln(self.myfileid)
+scr_ds_list_write(global.hp, 4)
+ossafe_file_text_writeln(self.myfileid)
+scr_ds_list_write(global.maxhp, 4)
+ossafe_file_text_writeln(self.myfileid)
+scr_ds_list_write(global.at, 4)
+ossafe_file_text_writeln(self.myfileid)
+scr_ds_list_write(global.df, 4)
+ossafe_file_text_writeln(self.myfileid)
+scr_ds_list_write(global.mag, 4)
+ossafe_file_text_writeln(self.myfileid)
+scr_ds_list_write(global.guts, 4)
+ossafe_file_text_writeln(self.myfileid)
+scr_ds_list_write(global.charweapon, 4)
+ossafe_file_text_writeln(self.myfileid)
+scr_ds_list_write(global.chararmor1, 4)
+ossafe_file_text_writeln(self.myfileid)
+scr_ds_list_write(global.chararmor2, 4)
+ossafe_file_text_writeln(self.myfileid)
+scr_ds_list_write(global.weaponstyle, 4)
+ossafe_file_text_writeln(self.myfileid)
self.i = 0
while(true)
{
if (self.i < 4)
{
- file_text_write_real(self.myfileid, global.hp[self.i])
- file_text_writeln(self.myfileid)
- file_text_write_real(self.myfileid, global.maxhp[self.i])
- file_text_writeln(self.myfileid)
- file_text_write_real(self.myfileid, global.at[self.i])
- file_text_writeln(self.myfileid)
- file_text_write_real(self.myfileid, global.df[self.i])
- file_text_writeln(self.myfileid)
- file_text_write_real(self.myfileid, global.mag[self.i])
- file_text_writeln(self.myfileid)
- file_text_write_real(self.myfileid, global.guts[self.i])
- file_text_writeln(self.myfileid)
- file_text_write_real(self.myfileid, global.charweapon[self.i])
- file_text_writeln(self.myfileid)
- file_text_write_real(self.myfileid, global.chararmor1[self.i])
- file_text_writeln(self.myfileid)
- file_text_write_real(self.myfileid, global.chararmor2[self.i])
- file_text_writeln(self.myfileid)
- file_text_write_real(self.myfileid, global.weaponstyle[self.i])
- file_text_writeln(self.myfileid)
self.q = 0
while(true)
{
if (self.q < 4)
{
- file_text_write_real(self.myfileid, global.itemat[self.i][self.q])
- file_text_writeln(self.myfileid)
- file_text_write_real(self.myfileid, global.itemdf[self.i][self.q])
- file_text_writeln(self.myfileid)
- file_text_write_real(self.myfileid, global.itemmag[self.i][self.q])
- file_text_writeln(self.myfileid)
- file_text_write_real(self.myfileid, global.itembolts[self.i][self.q])
- file_text_writeln(self.myfileid)
- file_text_write_real(self.myfileid, global.itemgrazeamt[self.i][self.q])
- file_text_writeln(self.myfileid)
- file_text_write_real(self.myfileid, global.itemgrazesize[self.i][self.q])
- file_text_writeln(self.myfileid)
- file_text_write_real(self.myfileid, global.itemboltspeed[self.i][self.q])
- file_text_writeln(self.myfileid)
- file_text_write_real(self.myfileid, global.itemspecial[self.i][self.q])
- file_text_writeln(self.myfileid)
+ ossafe_file_text_write_real(self.myfileid, global.itemat[self.i][self.q])
+ ossafe_file_text_writeln(self.myfileid)
+ ossafe_file_text_write_real(self.myfileid, global.itemdf[self.i][self.q])
+ ossafe_file_text_writeln(self.myfileid)
+ ossafe_file_text_write_real(self.myfileid, global.itemmag[self.i][self.q])
+ ossafe_file_text_writeln(self.myfileid)
+ ossafe_file_text_write_real(self.myfileid, global.itembolts[self.i][self.q])
+ ossafe_file_text_writeln(self.myfileid)
+ ossafe_file_text_write_real(self.myfileid, global.itemgrazeamt[self.i][self.q])
+ ossafe_file_text_writeln(self.myfileid)
+ ossafe_file_text_write_real(self.myfileid, global.itemgrazesize[self.i][self.q])
+ ossafe_file_text_writeln(self.myfileid)
+ ossafe_file_text_write_real(self.myfileid, global.itemboltspeed[self.i][self.q])
+ ossafe_file_text_writeln(self.myfileid)
+ ossafe_file_text_write_real(self.myfileid, global.itemspecial[self.i][self.q])
+ ossafe_file_text_writeln(self.myfileid)
self.q = (self.q + 1)
continue
}
@@ -90,8 +80,8 @@ while(true)
{
if (self.j < 12)
{
- file_text_write_real(self.myfileid, global.spell[self.i][self.j])
- file_text_writeln(self.myfileid)
+ ossafe_file_text_write_real(self.myfileid, global.spell[self.i][self.j])
+ ossafe_file_text_writeln(self.myfileid)
self.j = (self.j + 1)
continue
}
@@ -102,85 +92,64 @@ while(true)
}
break
}
-file_text_write_real(self.myfileid, global.boltspeed)
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.grazeamt)
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.grazesize)
-file_text_writeln(self.myfileid)
-self.j = 0
-while(true)
-{
- if (self.j < 13)
- {
- file_text_write_real(self.myfileid, global.item[self.j])
- file_text_writeln(self.myfileid)
- file_text_write_real(self.myfileid, global.keyitem[self.j])
- file_text_writeln(self.myfileid)
- file_text_write_real(self.myfileid, global.weapon[self.j])
- file_text_writeln(self.myfileid)
- file_text_write_real(self.myfileid, global.armor[self.j])
- file_text_writeln(self.myfileid)
- self.j = (self.j + 1)
- continue
- }
- break
-}
-file_text_write_real(self.myfileid, global.tension)
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.maxtension)
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.lweapon)
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.larmor)
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.lxp)
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.llv)
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.lgold)
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.lhp)
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.lmaxhp)
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.lat)
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.ldf)
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.lwstrength)
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.ladef)
-file_text_writeln(self.myfileid)
-self.i = 0
-while(true)
-{
- if (self.i < 8)
- {
- file_text_write_real(self.myfileid, global.litem[self.i])
- file_text_writeln(self.myfileid)
- file_text_write_real(self.myfileid, global.phone[self.i])
- file_text_writeln(self.myfileid)
- self.i = (self.i + 1)
- continue
- }
- break
-}
-self.i = 0
-while(true)
-{
- if (self.i < 9999)
- {
- file_text_write_real(self.myfileid, global.flag[self.i])
- file_text_writeln(self.myfileid)
- self.i = (self.i + 1)
- continue
- }
- break
-}
-file_text_write_real(self.myfileid, global.plot)
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.currentroom)
-file_text_writeln(self.myfileid)
-file_text_write_real(self.myfileid, global.time)
-file_text_close(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.boltspeed)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.grazeamt)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.grazesize)
+ossafe_file_text_writeln(self.myfileid)
+scr_ds_list_write(global.item, 13)
+ossafe_file_text_writeln(self.myfileid)
+scr_ds_list_write(global.keyitem, 13)
+ossafe_file_text_writeln(self.myfileid)
+scr_ds_list_write(global.weapon, 13)
+ossafe_file_text_writeln(self.myfileid)
+scr_ds_list_write(global.armor, 13)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.tension)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.maxtension)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.lweapon)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.larmor)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.lxp)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.llv)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.lgold)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.lhp)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.lmaxhp)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.lat)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.ldf)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.lwstrength)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.ladef)
+ossafe_file_text_writeln(self.myfileid)
+scr_ds_list_write(global.litem, 8)
+ossafe_file_text_writeln(self.myfileid)
+scr_ds_list_write(global.phone, 8)
+ossafe_file_text_writeln(self.myfileid)
+scr_ds_list_write(global.flag, 9999)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.plot)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.currentroom)
+ossafe_file_text_writeln(self.myfileid)
+ossafe_file_text_write_real(self.myfileid, global.time)
+ossafe_file_text_close(self.myfileid)
+ossafe_ini_open("dr.ini")
+ini_write_string(("G" + string(global.filechoice)), "Name", global.truename)
+ini_write_real(("G" + string(global.filechoice)), "Level", global.lv)
+ini_write_real(("G" + string(global.filechoice)), "Love", global.llv)
+ini_write_real(("G" + string(global.filechoice)), "Time", global.time)
+ini_write_real(("G" + string(global.filechoice)), "Room", global.currentroom)
+ini_write_real(("G" + string(global.filechoice)), "InitLang", global.flag[912])
+ossafe_ini_close()
+ossafe_savedata_save()
diff --git a/decomp_normal/gml_Script_scr_shopmorearrow.gml b/decomp_switch/gml_Script_scr_shopmorearrow.gml
index ff9f6cc..4d787ad 100755
--- a/decomp_normal/gml_Script_scr_shopmorearrow.gml
+++ b/decomp_switch/gml_Script_scr_shopmorearrow.gml
@@ -3,6 +3,10 @@ if (self.pagemax > 0)
if ((5 + self.pagemax) < 12)
{
if (self.menu == 11)
+ _temp_var = 1
+ else
+ _temp_var = (self.menu == 15)
+ if _temp_var
{
if (global.item[(5 + self.pagemax)] != 0)
draw_sprite_ext(spr_morearrow, 0, 370, (440 + (sin((self.cur_jewel / 12)) * 3)), 1, 1, 0, 0xFFFFFF, 1)
diff --git a/decomp_normal/gml_Script_scr_texttype.gml b/decomp_switch/gml_Script_scr_texttype.gml
index 023a5ab..b53b1f6 100755
--- a/decomp_normal/gml_Script_scr_texttype.gml
+++ b/decomp_switch/gml_Script_scr_texttype.gml
@@ -337,7 +337,10 @@ if _temp_var
else
{
if (self.myfont == 9)
+ {
+ self.textscale = 0.5
self.hspace = (((self.hspace * 13) / 8) + 1)
+ }
else
{
if (self.myfont == 8)
diff --git a/decomp_switch/gml_Script_strlen.gml b/decomp_switch/gml_Script_strlen.gml
new file mode 100755
index 0000000..6ee0af0
--- /dev/null
+++ b/decomp_switch/gml_Script_strlen.gml
@@ -0,0 +1 @@
+return string_length(self.argument0)
diff --git a/decomp_switch/gml_Script_substr.gml b/decomp_switch/gml_Script_substr.gml
new file mode 100755
index 0000000..e13b48d
--- /dev/null
+++ b/decomp_switch/gml_Script_substr.gml
@@ -0,0 +1,12 @@
+local.str = self.argument[0]
+local.pos = self.argument[1]
+if (local.pos < 0)
+ local.pos = ((strlen(local.str) + 1) + local.pos)
+if (self.argument_count == 2)
+ local.len = ((strlen(local.str) - local.pos) + 1)
+else
+ local.len = self.argument[2]
+if (local.len > 0)
+ return string_copy(local.str, local.pos, local.len)
+else
+ return ""
diff --git a/decomp_switch/gml_Script_texture_set_interpolation.gml b/decomp_switch/gml_Script_texture_set_interpolation.gml
new file mode 100755
index 0000000..b5e9ef1
--- /dev/null
+++ b/decomp_switch/gml_Script_texture_set_interpolation.gml
@@ -0,0 +1 @@
+gpu_set_texfilter(self.argument0)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment