diff --git a/asm/include/main_0204CD88.inc b/asm/include/main_0204CDB8.inc similarity index 100% rename from asm/include/main_0204CD88.inc rename to asm/include/main_0204CDB8.inc diff --git a/asm/main_0204CD88.s b/asm/main_0204CDB8.s similarity index 98% rename from asm/main_0204CD88.s rename to asm/main_0204CDB8.s index 0d6190c5..d3ceccd4 100644 --- a/asm/main_0204CD88.s +++ b/asm/main_0204CDB8.s @@ -1,24 +1,8 @@ .include "asm/macros.inc" - .include "main_0204CD88.inc" + .include "main_0204CDB8.inc" .text - arm_func_start InitWorldMapScriptVars -InitWorldMapScriptVars: ; 0x0204CD88 - stmdb sp!, {r3, lr} - mov r0, #0 - mov r1, #0x55 - bl ZinitScriptVariable - mov r0, #0 - mov r1, #0x56 - bl ZinitScriptVariable - mov r0, #0 - mov r1, #0x57 - mov r2, #1 - bl SaveScriptVariableValue - ldmia sp!, {r3, pc} - arm_func_end InitWorldMapScriptVars - arm_func_start sub_0204CDB8 sub_0204CDB8: ; 0x0204CDB8 ldr ip, _0204CDC8 ; =ZinitScriptVariable diff --git a/include/script_variable_2.h b/include/script_variable_2.h new file mode 100644 index 00000000..364417c9 --- /dev/null +++ b/include/script_variable_2.h @@ -0,0 +1,6 @@ +#ifndef PMDSKY_SCRIPT_VARIABLE_2_H +#define PMDSKY_SCRIPT_VARIABLE_2_H + +void InitWorldMapScriptVars(); + +#endif PMDSKY_SCRIPT_VARIABLE_2_H \ No newline at end of file diff --git a/main.lsf b/main.lsf index 88efd8d5..f3979c57 100644 --- a/main.lsf +++ b/main.lsf @@ -90,7 +90,8 @@ Static main Object src/special_episode.o Object src/progression.o Object src/scenario_flag.o - Object asm/main_0204CD88.o + Object src/script_variable_2.o + Object asm/main_0204CDB8.o Object src/main_0204DA2C.o Object asm/main_0204DB08.o Object src/main_0204DD80.o diff --git a/src/script_variable_2.c b/src/script_variable_2.c new file mode 100644 index 00000000..dc2576e1 --- /dev/null +++ b/src/script_variable_2.c @@ -0,0 +1,9 @@ +#include "script_variable.h" +#include "script_variable_2.h" +#include "enums.h" + +void InitWorldMapScriptVars() { + ZinitScriptVariable(0, VAR_WORLD_MAP_MARK_LIST_NORMAL); + ZinitScriptVariable(0, VAR_WORLD_MAP_MARK_LIST_SPECIAL); + SaveScriptVariableValue(0, VAR_WORLD_MAP_LEVEL, 1); +}