New Scripts & Fix

sots-private

@@ -1 +1 @@
-Subproject commit 462815a460dd15a118cefe93ad11ebb4c9ebf19b
+Subproject commit f9e6ee59b56752bf25f71986a0fcd69690992ff2

src/include/hiddenflags.h

@@ -2,4 +2,6 @@
 
 .macro sethiddenflags
 setflag 0x501
+setflag 0x507
+setflag 0x509
 .endm

src/include/script_language.h

@@ -6,6 +6,9 @@
 #include <hiddenflags.h>
 #include <mugssprites.h>
 
+@@ Costum Specials
+.equ SP_BATCHMAPTILE, 0x7
+
 @@ Compare operands
 .equ B_LT, 0x0
 .equ B_EQ, 0x1
@@ -14,6 +17,19 @@
 .equ B_GE, 0x4
 .equ B_NE, 0x5
 
+@@ Important flags
+.equ FLAG_PKMN_MENU, 0x828
+.equ FLAG_POKDEX, 0x829
+.equ FLAG_RUNNING_SHOES, 0x82F
+.equ FLAG_ORDEN_1, 0x820
+.equ FLAG_ORDEN_2, 0x821
+.equ FLAG_ORDEN_3, 0x822
+.equ FLAG_ORDEN_4, 0x823
+.equ FLAG_ORDEN_5, 0x824
+.equ FLAG_ORDEN_6, 0x825
+.equ FLAG_ORDEN_7, 0x826
+.equ FLAG_ORDEN_8, 0x827
+
 @@ Flag operands
 .equ B_T, 0x0
 .equ B_F, 0x1
@@ -28,13 +44,59 @@
 .equ MSG_STD, 0x6
 
 @@ Definition
-.equ MUG_LEFT, 0x0
-.equ MUG_RIGHT, 0x1
+.equ MUGFACE_LEFT, 0x0
+.equ MUGFACE_RIGHT, 0x1
+
+@@ Effect
+.equ EFFECT_NORMAL, 0x0
+.equ EFFECT_GREY, 0x1
+.equ EFFECT_SERPIA, 0x2
 
 @@@@@@@@@@@@@@@@@ Macro
 
 @@ Custom commands
 
+.macro batchmaptile batchmaptile_tiles_from:req batchmaptile_tiles_to:req batchmaptile_kollision_from:req batchmaptile_kollision_to:req
+setvar 0x8000 \batchmaptile_tiles_from
+setvar 0x8001 \batchmaptile_tiles_to
+setvar 0x8002 \batchmaptile_kollision_from
+setvar 0x8003 \batchmaptile_kollision_to
+setvar 0x5006 SP_BATCHMAPTILE
+special 0x68
+.endm
+
+.macro seteffect seteffect_effect_id:req
+writebytetooffset \seteffect_effect_id 0x02036E28
+.endm
+
+.macro setecutscene
+writebytetooffset 0x80 0x4000044
+writebytetooffset 0x20 0x4000045
+.endm
+
+.macro clearcutscene
+writebytetooffset 0xFF 0x4000044
+writebytetooffset 0x00 0x4000045
+.endm
+
+.macro pokemsg pokemsg_string:req pokemsg_callstd:req pokemsg_ID:req
+checksound
+cry \pokemsg_ID 0x0
+showpokepic \pokemsg_ID 0x0 0x5
+loadpointer 0x0 \pokemsg_string
+callstd \pokemsg_callstd
+hidepokepic
+waitcry
+.endm
+
+.macro earthquake earthquake_horri:req earthquake_tiles:req earthquake_sec:req earthquake_vert:req
+setvar 0x8004 \earthquake_horri
+setvar 0x8005 \earthquake_tiles
+setvar 0x8006 \earthquake_sec
+setvar 0x8007 \earthquake_vert
+special 0x136
+.endm
+
 .macro lookbattle lookbattle_id:req lookbattle_before:req lookbattle_after:req
 trainerbattle 0x0 \lookbattle_id 0x0 \lookbattle_before \lookbattle_after
 .endm
@@ -92,6 +154,17 @@ special 0x137
 waitstate
 .endm
 
+.macro wildbattlemusic wildbattlemusic_spezies:req wildbattlemusic_level:req wildbattlemusic_item:req wildbattlemusic_music:req
+setwildbattle \wildbattlemusic_spezies \wildbattlemusic_level \wildbattlemusic_item
+special 0x138
+playsong \wildbattlemusic_music 0x0
+.endm
+
+.macro costumtrainerbattlemusic costumtrainerbattlemusic_id:req
+special 0x3B
+playsong \costumtrainerbattlemusic_id 0x0
+.endm
+
 .macro mugmsgr mugmsgr_textpointer:req mugmsgr_callstd:req mugmsgr_sprite:req
 setvar MUGHSOT_1_TABLE \mugmsgr_sprite
 setvar MUGSHOT_1_X 0xD0
@@ -108,17 +181,10 @@ msgbox \mugmsgl_textpointer \mugmsgl_callstd
 setvar MUGHSOT_1_TABLE 0x0
 .endm
 
-.macro mugrival mugrivalr_textpointer:req mugrivalr_callstd:req mugrivalr_facing:req
-setvar 0x8000 \mugrivalr_facing
-call scr_mugrival
-msgbox \mugrivalr_textpointer \mugrivalr_callstd
-setvar MUGHSOT_1_TABLE 0x0
-.endm
-
-.macro mugrivall mugrivall_textpointer:req mugrivall_callstd:req mugrivall_facing:req
-setvar 0x8000 \mugrivall_facing
+.macro mugrival mugrival_textpointer:req mugrival_callstd:req mugrival_facing:req
+setvar 0x8000 \mugrival_facing
 call scr_mugrival
-msgbox \mugrivall_textpointer \mugrivall_callstd
+msgbox \mugrival_textpointer \mugrival_callstd
 setvar MUGHSOT_1_TABLE 0x0
 .endm