SBird1337 7 years ago
parent
commit
51e1c1f46f
3 changed files with 4 additions and 2 deletions
  1. 1
    1
      sots-private
  2. 2
    0
      src/include/hiddenflags.h
  3. 1
    1
      src/include/script_language.h

+ 1
- 1
sots-private

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

+ 2
- 0
src/include/hiddenflags.h View File

@@ -12,4 +12,6 @@ setflag 0x516
12 12
 setflag 0x51B
13 13
 setflag 0x51C
14 14
 setflag 0x51F
15
+setflag 0x52F
16
+setflag 0x531
15 17
 .endm

+ 1
- 1
src/include/script_language.h View File

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