Hesperiabrückenszene Script

sots-private

@@ -1 +1 @@
-Subproject commit a98c3fe40455aa1763b8bbeda3fc81f848884789
+Subproject commit 7655fe67d1658b6d1ad59e80f11063fd8297da77

src/include/pymap_constants.h

@@ -43,6 +43,9 @@
 .equ FLAG_HIDE_ACHIM_LABOR, 0x506
 .equ FLAG_HIDE_RIVALE_LABOR, 0x507
 .equ FLAG_LABOR_MOVESPRITE2, 0x508
+.equ FLAG_HIDE_IDAN_HES_OD, 0x509
+.equ FLAG_HIDE_ACHIM_HES_OD, 0x50a
+.equ FLAG_HIDE_TUNDRA_RUEPEL_HES, 0x59b
 
 
 
@@ -135,6 +138,16 @@
 .equ VALUE_MIT_POKE_LABOR, 0x6
 .equ VALUE_RIVALKAMPF_HESPERIAPFAD, 0x7
 .equ VALUE_HESPERIA_BRUECKE, 0x8
+.equ VALUE_MAPSCRIPT_HESPERIAGRABEN, 0x9
+.equ VALUE_VOR_DEM_REBERARUNNEL, 0xa
+
+
+
+@ARM Assembly macro definitions for save_var
+
+
+.equ VAR_XPOS, 0x5054
+.equ VAR_YPOS, 0x5055
 
 
 

src/include/script/language.h

@@ -14,6 +14,10 @@
 .equ PLAYER, 0xFF
 .equ CAMERA, 0x7F
 
+@@Some Gender
+.equ GENDER_MALE, 0x0
+.equ GENDER_FEMALE, 0x1
+
 @@ Costum Specials
 .equ SP_BATCHMAPTILE, 0x7
 
@@ -85,12 +89,31 @@
 .equ EMOT_SCHOCKIERT, 0x7
 .equ EMOT_BOESESLACHEN, 0x8
 .equ EMOT_GENERVT, 0x9
-.equ EMOT_ERFREUT, 0xa
 
 @@@@@@@@@@@@@@@@@ Macro
 
 @@ Custom commands
 
+.macro callifvar callifvar_var:req callifvar_value:req callifvar_operands:req callifvar_pointer:req
+compare \callifvar_var \callifvar_value
+callif \callifvar_operands \callifvar_pointer
+.endm
+
+.macro gotoifvar gotoifvar_var:req gotoifvar_value:req gotoifvar_operands:req gotoifvar_pointer:req
+compare \gotoifvar_var \gotoifvar_value
+gotoif \gotoifvar_operands \gotoifvar_pointer
+.endm
+
+.macro callifflag callifflag_flag:req callifflag_operands:req callifflag_pointer:req
+checkflag \callifflag_flag
+callif \callifflag_operands \callifflag_pointer
+.endm
+
+.macro gotoifflag gotoifflag_flag:req gotoifflag_operands:req gotoifflag_pointer:req
+checkflag \gotoifflag_flag
+gotoif \gotoifflag_operands \gotoifflag_pointer
+.endm
+
 .macro camerafreeze
 special 0x113
 .endm
@@ -263,7 +286,15 @@ setvar 0x8000 0x0
         call scr_mugrival_right
     .endif
 .endif
-.if \mugmsg_sprite!=MUG_RIVALE
+.if \mugmsg_sprite==MUG_PLAYER
+    .if \mugmsg_facing==MUGFACE_LEFT
+        call scr_mugrival_player_left
+    .endif
+    .if \mugmsg_facing==MUGFACE_RIGHT
+        call scr_mugrival_player_right
+    .endif
+.endif
+.if \mugmsg_sprite!=MUG_RIVALE&&\mugmsg_sprite!=MUG_PLAYER
     .if \mugmsg_facing==MUGFACE_LEFT
         setvar MUGHSOT_1_TABLE \mugmsg_sprite|0x8000
         setvar MUGSHOT_1_X 0x16
@@ -275,6 +306,7 @@ setvar 0x8000 0x0
         setvar MUGSHOT_1_Y 0x60
     .endif
 .endif
+
 addvar MUGHSOT_1_TABLE \mugmsg_emot
 .if \mugmsg_callstd==5
     msgbox \mugmsg_textpointer \mugmsg_callstd

src/include/script/movement.h

@@ -100,4 +100,11 @@
 .equ APPLYMOVE_SLIDE_NO_MOVEMENT_RIGHT, 0xA3
 .equ APPLYMOVE_TELEPORT_MOVE, 0xA4
 .equ APPLYMOVE_FALLING_DOWN_MOVE, 0xA5
+.equ APPLYMOVE_DIAG_LEFTUP, 0xAA
+.equ APPLYMOVE_DIAG_RIGHTUP, 0xAB
+.equ APPLYMOVE_DIAG_LEFTDOWN, 0xAC
+.equ APPLYMOVE_DIAG_RIGHTDOWN, 0xAD
+
+
+
 .equ APPLYMOVE_END, 0xFE