Karathan
/
source_of_the_sovereign
mirror of https://github.com/SBird1337/source_of_the_sovereign
Watch 1
Star 0
Fork 0
Code Issues Releases 0 Wiki Activity
Browse Source

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

SBird1337 8 years ago
parent
b0ae5a7d2e 1974327ed4
commit
51e1c1f46f
3 changed files with 4 additions and 2 deletions
Unified View Show Diff Stats
  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 
-Subproject commit b58cbfa3dff8ab40a328c1bb9e5dccca99ff1fe1
1 
+Subproject commit f2888d0f92a4c3518aa344102d8bb8302288c9cb

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

12 
 setflag 0x51B
 12 
 setflag 0x51B
13 
 setflag 0x51C
 13 
 setflag 0x51C
14 
 setflag 0x51F
 14 
 setflag 0x51F
15 
+setflag 0x52F
16 
+setflag 0x531
15 
 .endm
 17 
 .endm

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

101 
 trainerbattle 0x0 \lookbattle_id 0x0 \lookbattle_before \lookbattle_after
 101 
 trainerbattle 0x0 \lookbattle_id 0x0 \lookbattle_before \lookbattle_after
102 
 .endm
 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 
 trainerbattle 0x1 \gymbattle_id 0x0 \gymbattle_before \gymbattle_after \gymbattle_later
 105 
 trainerbattle 0x1 \gymbattle_id 0x0 \gymbattle_before \gymbattle_after \gymbattle_later
106 
 .endm
 106 
 .endm
107
107