Merge branch 'master' of https://github.com/SBird1337/source_of_the_sovereign

sots-private

@@ -1 +1 @@
-Subproject commit b58cbfa3dff8ab40a328c1bb9e5dccca99ff1fe1
+Subproject commit f2888d0f92a4c3518aa344102d8bb8302288c9cb

src/include/hiddenflags.h

@@ -12,4 +12,6 @@ setflag 0x516
 setflag 0x51B
 setflag 0x51C
 setflag 0x51F
+setflag 0x52F
+setflag 0x531
 .endm

src/include/script_language.h

@@ -101,7 +101,7 @@ special 0x136
 trainerbattle 0x0 \lookbattle_id 0x0 \lookbattle_before \lookbattle_after
 .endm
 
-.macro gymbattle gymbattle_id:req gymbattle_before:req gymbattle_after:req
+.macro gymbattle gymbattle_id:req gymbattle_before:req gymbattle_after:req gymbattle_later:req
 trainerbattle 0x1 \gymbattle_id 0x0 \gymbattle_before \gymbattle_after \gymbattle_later
 .endm