dragonflysots 6 år sedan
förälder
incheckning
a2d4e9a50f

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit 8dd53d298d3951835cbc46005875dd81d90d3733
1
+Subproject commit c392684e7b6ea814fd5a9e5f28f60f2ec24e6865

+ 1
- 0
src/include/constants/pymap/main_story_variables.h Visa fil

@@ -12,3 +12,4 @@
12 12
 #define VALUE_POKEMON_SPRING_HOEHLE 0xa
13 13
 #define VALUE_HESPERIAGRABEN_SPRITEFACEUP 0xb
14 14
 #define VALUE_VOR_DEM_REBERATUNNEL 0xc
15
+#define VALUE_MAPSCRIPT_EINGANG_RDW1 0xd

+ 1
- 0
src/include/constants/pymap/main_story_variables.s Visa fil

@@ -12,3 +12,4 @@
12 12
 .equ VALUE_POKEMON_SPRING_HOEHLE, 0xa
13 13
 .equ VALUE_HESPERIAGRABEN_SPRITEFACEUP, 0xb
14 14
 .equ VALUE_VOR_DEM_REBERATUNNEL, 0xc
15
+.equ VALUE_MAPSCRIPT_EINGANG_RDW1, 0xd

+ 21
- 21
src/include/constants/pymap/starter_variables.h Visa fil

@@ -1,22 +1,22 @@
1 1
 #define VAR_STARTER_PLAYER_POKEMON 0x5052
2
-#define VALUE_STARTER_BISASAM 0x1
3
-#define VALUE_STARTER_GLUMANDA 0x2
4
-#define VALUE_STARTER_SCHIGGY 0x3
5
-#define VALUE_STARTER_ENDIVIE 0x4
6
-#define VALUE_STARTER_FEURIGEL 0x5
7
-#define VALUE_STARTER_KARNIMANI 0x6
8
-#define VALUE_STARTER_GECKARBOR 0x7
9
-#define VALUE_STARTER_FLEMMLI 0x8
10
-#define VALUE_STARTER_HYDROPI 0x9
11
-#define VALUE_STARTER_CHELAST 0xa
12
-#define VALUE_STARTER_PANFLAM 0xb
13
-#define VALUE_STARTER_PLINFA 0xc
14
-#define VALUE_STARTER_SERPIFEU 0xd
15
-#define VALUE_STARTER_FLOINK 0xe
16
-#define VALUE_STARTER_OTTARO 0xf
17
-#define VALUE_STARTER_IGAMARO 0x10
18
-#define VALUE_STARTER_FYNX 0x11
19
-#define VALUE_STARTER_FROXY 0x12
20
-#define VALUE_STARTER_BAUZ 0x13
21
-#define VALUE_STARTER_FLAMIAU 0x14
22
-#define VALUE_STARTER_ROBBALL 0x15
2
+#define VALUE_STARTER_BISASAM 0x0
3
+#define VALUE_STARTER_GLUMANDA 0x1
4
+#define VALUE_STARTER_SCHIGGY 0x2
5
+#define VALUE_STARTER_ENDIVIE 0x3
6
+#define VALUE_STARTER_FEURIGEL 0x4
7
+#define VALUE_STARTER_KARNIMANI 0x5
8
+#define VALUE_STARTER_GECKARBOR 0x6
9
+#define VALUE_STARTER_FLEMMLI 0x7
10
+#define VALUE_STARTER_HYDROPI 0x8
11
+#define VALUE_STARTER_CHELAST 0x9
12
+#define VALUE_STARTER_PANFLAM 0xa
13
+#define VALUE_STARTER_PLINFA 0xb
14
+#define VALUE_STARTER_SERPIFEU 0xc
15
+#define VALUE_STARTER_FLOINK 0xd
16
+#define VALUE_STARTER_OTTARO 0xe
17
+#define VALUE_STARTER_IGAMARO 0xf
18
+#define VALUE_STARTER_FYNX 0x10
19
+#define VALUE_STARTER_FROXY 0x11
20
+#define VALUE_STARTER_BAUZ 0x12
21
+#define VALUE_STARTER_FLAMIAU 0x13
22
+#define VALUE_STARTER_ROBBALL 0x14

+ 21
- 21
src/include/constants/pymap/starter_variables.s Visa fil

@@ -1,22 +1,22 @@
1 1
 .equ VAR_STARTER_PLAYER_POKEMON, 0x5052
2
-.equ VALUE_STARTER_BISASAM, 0x1
3
-.equ VALUE_STARTER_GLUMANDA, 0x2
4
-.equ VALUE_STARTER_SCHIGGY, 0x3
5
-.equ VALUE_STARTER_ENDIVIE, 0x4
6
-.equ VALUE_STARTER_FEURIGEL, 0x5
7
-.equ VALUE_STARTER_KARNIMANI, 0x6
8
-.equ VALUE_STARTER_GECKARBOR, 0x7
9
-.equ VALUE_STARTER_FLEMMLI, 0x8
10
-.equ VALUE_STARTER_HYDROPI, 0x9
11
-.equ VALUE_STARTER_CHELAST, 0xa
12
-.equ VALUE_STARTER_PANFLAM, 0xb
13
-.equ VALUE_STARTER_PLINFA, 0xc
14
-.equ VALUE_STARTER_SERPIFEU, 0xd
15
-.equ VALUE_STARTER_FLOINK, 0xe
16
-.equ VALUE_STARTER_OTTARO, 0xf
17
-.equ VALUE_STARTER_IGAMARO, 0x10
18
-.equ VALUE_STARTER_FYNX, 0x11
19
-.equ VALUE_STARTER_FROXY, 0x12
20
-.equ VALUE_STARTER_BAUZ, 0x13
21
-.equ VALUE_STARTER_FLAMIAU, 0x14
22
-.equ VALUE_STARTER_ROBBALL, 0x15
2
+.equ VALUE_STARTER_BISASAM, 0x0
3
+.equ VALUE_STARTER_GLUMANDA, 0x1
4
+.equ VALUE_STARTER_SCHIGGY, 0x2
5
+.equ VALUE_STARTER_ENDIVIE, 0x3
6
+.equ VALUE_STARTER_FEURIGEL, 0x4
7
+.equ VALUE_STARTER_KARNIMANI, 0x5
8
+.equ VALUE_STARTER_GECKARBOR, 0x6
9
+.equ VALUE_STARTER_FLEMMLI, 0x7
10
+.equ VALUE_STARTER_HYDROPI, 0x8
11
+.equ VALUE_STARTER_CHELAST, 0x9
12
+.equ VALUE_STARTER_PANFLAM, 0xa
13
+.equ VALUE_STARTER_PLINFA, 0xb
14
+.equ VALUE_STARTER_SERPIFEU, 0xc
15
+.equ VALUE_STARTER_FLOINK, 0xd
16
+.equ VALUE_STARTER_OTTARO, 0xe
17
+.equ VALUE_STARTER_IGAMARO, 0xf
18
+.equ VALUE_STARTER_FYNX, 0x10
19
+.equ VALUE_STARTER_FROXY, 0x11
20
+.equ VALUE_STARTER_BAUZ, 0x12
21
+.equ VALUE_STARTER_FLAMIAU, 0x13
22
+.equ VALUE_STARTER_ROBBALL, 0x14