Browse Source

Konstanten -> Symbole : Bitte neue Pymap Version von MIR anfordern WICHTIG!

dragonflysots 6 years ago
parent
commit
2c53e76bb1
4 changed files with 942 additions and 1823 deletions
  1. 1
    1
      sots-private
  2. 929
    1807
      src/include/pymap_constants.h
  3. 2
    14
      src/include/script/language.h
  4. 10
    1
      src/include/songlist.h

+ 1
- 1
sots-private

1
-Subproject commit 40f1f8be5e7a836e26d9e600e11909143eb8ea3d
1
+Subproject commit b694b658783ac98f01c3f018b13ff0c27e99d36e

+ 929
- 1807
src/include/pymap_constants.h
File diff suppressed because it is too large
View File


+ 2
- 14
src/include/script/language.h View File

5
 #include <script/movement.h>
5
 #include <script/movement.h>
6
 #include <script/mugshot.h>
6
 #include <script/mugshot.h>
7
 #include <script/battlescreen.h>
7
 #include <script/battlescreen.h>
8
-#include <script/items.h>
8
+#include <constants/items.h>
9
+#include <pymap_constants.h>
9
 
10
 
10
 @@Some Constants
11
 @@Some Constants
11
 .equ PLAYER, 0xFF
12
 .equ PLAYER, 0xFF
27
 .equ SPRITEFACE_LEFT, 0x3
28
 .equ SPRITEFACE_LEFT, 0x3
28
 .equ SPRITEFACE_RIGHT, 0x4
29
 .equ SPRITEFACE_RIGHT, 0x4
29
 
30
 
30
-@@ Important flags
31
-.equ FLAG_PKMN_MENU, 0x828
32
-.equ FLAG_POKDEX, 0x829
33
-.equ FLAG_RUNNING_SHOES, 0x82F
34
-.equ FLAG_ORDEN_1, 0x820
35
-.equ FLAG_ORDEN_2, 0x821
36
-.equ FLAG_ORDEN_3, 0x822
37
-.equ FLAG_ORDEN_4, 0x823
38
-.equ FLAG_ORDEN_5, 0x824
39
-.equ FLAG_ORDEN_6, 0x825
40
-.equ FLAG_ORDEN_7, 0x826
41
-.equ FLAG_ORDEN_8, 0x827
42
-
43
 @@ LED NAMES
31
 @@ LED NAMES
44
 .equ LED_CARUN_CITY_LINKS, 0x1
32
 .equ LED_CARUN_CITY_LINKS, 0x1
45
 .equ LED_ROUTE_2, 0x2
33
 .equ LED_ROUTE_2, 0x2

+ 10
- 1
src/include/songlist.h View File

24
 // Special Places
24
 // Special Places
25
 
25
 
26
 #define SEQ_BGM_DESERT              350
26
 #define SEQ_BGM_DESERT              350
27
+#define SEQ_BGM_P_TOL               436
27
 
28
 
28
 // Forests
29
 // Forests
29
 
30
 
30
 #define SEQ_BGM_FOREST_YELINA       352
31
 #define SEQ_BGM_FOREST_YELINA       352
32
+#define SEQ_BGM_P_DFOY              347
33
+
34
+// Cave
35
+#define SEQ_BGM_CAVE_GUARDIAN       390
36
+
37
+// Indoor
38
+#define SEQ_BGM_GYM_GHOST           419
39
+#define SEQ_BGM_GYM_WATER           420
31
 
40
 
32
 // Encounter
41
 // Encounter
33
 
42
 
70
 
79
 
71
 // Misc
80
 // Misc
72
 
81
 
73
-#define SEQ_BGM_TITLE_SCREEN        278
82
+#define SEQ_BGM_TITLE_SCREEN        278