Neue Scripts

sots-private

@@ -1 +1 @@
-Subproject commit 0eb1bd3c286b789bb9c238fefe458ed0b38dc979
+Subproject commit 3b9168a248b28cf6f4bcc867ad61ebe282358fc7

src/include/constants/items.h

@@ -716,5 +716,6 @@
 #define ITEM_AP_BON 0x2C8
 #define ITEM_STATUSWERTEBON 0x2C9
 #define ITEM_FANGBON 0x2CA
+#define ITEM_ENZYKLOPAEDIE 0x0
 
 #endif /* ITEM_IDS */

src/include/constants/pymap/story_flags.h

@@ -21,3 +21,13 @@
 #define FLAG_FARBRAETSEL_GELBTAFEL 0x514
 #define FLAG_FARBRAETSEL_PINKTAFEL 0x515
 #define FLAG_FARBRAETSEL_BLAUTAFEL 0x516
+#define FLAG_REBOST_LATIOS_RAETSEL_AKTIV 0x517
+#define FLAG_REBOST_LATIOS_RAETSEL_KERZE1 0x518
+#define FLAG_REBOST_LATIOS_RAETSEL_KERZE2 0x519
+#define FLAG_REBOST_LATIOS_RAETSEL_KERZE3 0x51a
+#define FLAG_REBOST_LATIOS_RAETSEL_KERZE4 0x51b
+#define FLAG_REBOST_LATIAS_RAETSEL_AKTIV 0x51c
+#define FLAG_REBOST_LATIAS_RAETSEL_KERZE1 0x51d
+#define FLAG_REBOST_LATIAS_RAETSEL_KERZE2 0x51e
+#define FLAG_REBOST_LATIAS_RAETSEL_KERZE3 0x51f
+#define FLAG_REBOST_LATIAS_RAETSEL_KERZE4 0x520

src/include/constants/pymap/story_flags.s

@@ -21,3 +21,13 @@
 .equ FLAG_FARBRAETSEL_GELBTAFEL, 0x514
 .equ FLAG_FARBRAETSEL_PINKTAFEL, 0x515
 .equ FLAG_FARBRAETSEL_BLAUTAFEL, 0x516
+.equ FLAG_REBOST_LATIOS_RAETSEL_AKTIV, 0x517
+.equ FLAG_REBOST_LATIOS_RAETSEL_KERZE1, 0x518
+.equ FLAG_REBOST_LATIOS_RAETSEL_KERZE2, 0x519
+.equ FLAG_REBOST_LATIOS_RAETSEL_KERZE3, 0x51a
+.equ FLAG_REBOST_LATIOS_RAETSEL_KERZE4, 0x51b
+.equ FLAG_REBOST_LATIAS_RAETSEL_AKTIV, 0x51c
+.equ FLAG_REBOST_LATIAS_RAETSEL_KERZE1, 0x51d
+.equ FLAG_REBOST_LATIAS_RAETSEL_KERZE2, 0x51e
+.equ FLAG_REBOST_LATIAS_RAETSEL_KERZE3, 0x51f
+.equ FLAG_REBOST_LATIAS_RAETSEL_KERZE4, 0x520

src/include/script/language.h

@@ -14,6 +14,10 @@
 .equ PLAYER, 0xFF
 .equ CAMERA, 0x7F
 
+@@Yesnos
+.equ MSG_NO, 0x0
+.equ MSG_YES, 0x1
+
 @@Some Gender
 .equ GENDER_MALE, 0x0
 .equ GENDER_FEMALE, 0x1
@@ -52,8 +56,8 @@
 .equ LED_URBANIA_CITY_RECHTS, 0x8
 
 @@ Flag operands
-.equ B_T, 0x0
-.equ B_F, 0x1
+.equ B_F, 0x0
+.equ B_T, 0x1
 
 @@ callstd alias
 .equ ITEM_OBTAIN, 0x0
@@ -156,7 +160,7 @@ call sethiddenflagsall
 writebytetooffset \seteffect_effect_id 0x02036E28
 .endm
 
-.macro setecutscene
+.macro setcutscene
 writebytetooffset 0x80 0x4000044
 writebytetooffset 0x20 0x4000045
 .endm
@@ -335,10 +339,18 @@ setvar BATTLE_SEA_VAR \battlescreen_sea
 .endm
 
 .macro cameramove cameramove_xpos:req cameramove_ypos:req
-setvar CAMERA_VAR_X \cameramove_xpos
-setvar CAMERA_VAR_Y \cameramove_ypos
+.if \cameramove_xpos==VAR_XPOS&&\cameramove_ypos==VAR_YPOS
+    copyvar CAMERA_VAR_X \cameramove_xpos
+    copyvar CAMERA_VAR_Y \cameramove_ypos
+.endif
+.if \cameramove_xpos!=VAR_XPOS&&\cameramove_ypos!=VAR_YPOS
+    setvar CAMERA_VAR_X \cameramove_xpos
+    setvar CAMERA_VAR_Y \cameramove_ypos
+.endif
 setvar CALLASM_VAR 0x1
 special 0x68
+waitstate
+pause 0x20
 .endm
 
 .macro walkingscript walkingscript_value:req