Browse Source

fixed includes

SBird1337 8 years ago
parent
commit
6ae51abd73

+ 1
- 1
nbproject/configurations.xml View File

@@ -1,5 +1,5 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2
-<configurationDescriptor version="97">
2
+<configurationDescriptor version="100">
3 3
   <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
4 4
     <df root="." name="0">
5 5
       <df name="data">

+ 1
- 3
nbproject/private/configurations.xml View File

@@ -1,5 +1,5 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2
-<configurationDescriptor version="97">
2
+<configurationDescriptor version="100">
3 3
   <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
4 4
     <df root="." name="0">
5 5
       <df name="assets">
@@ -5884,8 +5884,6 @@
5884 5884
               </df>
5885 5885
               <df name="chords_normalized">
5886 5886
               </df>
5887
-              <df name="guitar">
5888
-              </df>
5889 5887
             </df>
5890 5888
             <df name="WAV">
5891 5889
             </df>

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit 08230e5250352bbd7c7303c68d307ce22606ecec
1
+Subproject commit 9cda479e9af1b39b15891190ab843fb2559ea29b

+ 1
- 1
src/dns/dns_core.c View File

@@ -1,6 +1,6 @@
1 1
 #include <bpre.h>
2 2
 #include <dns_core.h>
3
-
3
+#include <memory.h>
4 4
 
5 5
 
6 6
 static struct pal_replace lightmap[] = {

+ 2
- 1
src/music/music_override.c View File

@@ -1,4 +1,5 @@
1
-#include <bpre.h>
1
+#include <sound.h>
2
+#include <game_engine.h>
2 3
 #include <config.h>
3 4
 
4 5
 void music_override(u16 songid) {

+ 1
- 1
src/overworld/overworld.c View File

@@ -1,4 +1,4 @@
1
-#include <bpre.h>
1
+#include <game_engine.h>
2 2
 
3 3
 #define OW_REPLACE_VAR  0x500A
4 4
 #define OW_REPLACE_TO_VAR   0x500B

+ 4
- 1
src/specials/camera_move.c View File

@@ -1,5 +1,8 @@
1
-#include <bpre.h>
1
+#include <game_engine.h>
2 2
 #include "camera_move.h"
3
+#include <callback.h>
4
+#include <fade.h>
5
+#include <config.h>
3 6
 
4 7
 struct point** sav_data_map = (struct point**)(0x03005008);
5 8