Browse Source

updated private, script headersQ

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

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit 2350d219de04999276e9d09e2805d0146f30211b
1
+Subproject commit dc898bdaa63d13e87dd158f54756b11135ac96e9

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

@@ -2,4 +2,4 @@
2 2
 
3 3
 .macro sethiddenflags
4 4
 setflag 0x501
5
-endm
5
+.endm

+ 2
- 2
src/include/mugssprites.h View File

@@ -1,5 +1,5 @@
1
-#ifndef MUG_IDS
2
-#define MUG_IDS
1
+#ifndef MUG_IDS_H_
2
+#define MUG_IDS_H_
3 3
 
4 4
 #define MUG_NOAH 0x1
5 5
 #define MUG_EMMA 0x2

+ 7
- 2
src/include/script_language.h View File

@@ -1,3 +1,6 @@
1
+#ifndef SCRIPT_LANG_H_
2
+#define SCRIPT_LANG_H_
3
+
1 4
 #include <config.h>
2 5
 #include <applymovements.h>
3 6
 #include <hiddenflags.h>
@@ -59,7 +62,7 @@ waitstate
59 62
 .endm
60 63
 
61 64
 .macro mugmsgr mugmsgr_textpointer:req mugmsgr_callstd:req mugmsgr_sprite:req
62
-setvar MUGHSOT_1_TABLE \msgmugr_sprite | 0x8000
65
+setvar MUGHSOT_1_TABLE \mugmsgr_sprite | 0x8000
63 66
 setvar MUGSHOT_1_X 0xD0
64 67
 setvar MUGSHOT_1_Y 0x60
65 68
 msgbox \mugmsgr_textpointer \mugmsgr_callstd
@@ -67,7 +70,7 @@ setvar MUGHSOT_1_TABLE 0x0
67 70
 .endm
68 71
 
69 72
 .macro mugmsgl mugmsgl_textpointer:req mugmsgl_callstd:req mugmsgl_sprite:req
70
-setvar MUGHSOT_1_TABLE \msgmugl_sprite
73
+setvar MUGHSOT_1_TABLE \mugmsgl_sprite
71 74
 setvar MUGSHOT_1_X 0x16
72 75
 setvar MUGSHOT_1_Y 0x60
73 76
 msgbox \mugmsgl_textpointer \mugmsgl_callstd
@@ -925,3 +928,5 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
925 928
 .hword \bufferitems_item
926 929
 .hword \bufferitems_quantity
927 930
 .endm
931
+
932
+#endif