Umsortierung Maps, Tilesets

patches/game_engine/quick_hacks.asm

@@ -1,11 +1,11 @@
 EGG_HATCH_LEVEL EQU 1
 EV_CAP EQU 252
 
-PLAYER_S_X EQU 0x2
-PLAYER_S_Y EQU 0x2
+PLAYER_S_X EQU 0x25
+PLAYER_S_Y EQU 0x33
 
-PLAYER_S_B EQU 0x78
-PLAYER_S_M EQU 0x0
+PLAYER_S_B EQU 0x6
+PLAYER_S_M EQU 0x2
 
 // Something //
 .org 0x080441D6

sots-private

@@ -1 +1 @@
-Subproject commit 1731004cee14f089895ed59d01234d5f20023b2c
+Subproject commit 402f15794063c92b114db6a8b449fc234674db1e

src/include/constants/pymap/banks.h

@@ -1,12 +1,8 @@
-#define BANKID_OUTDOOR 0x0
-#define BAMKID_ROUTE 0x1
-#define BANKID_UNTERWASSER 0x2
-#define BANKID_WAELDER_SUEMPFE 0x3
-#define BANKID_HOEHLE_GEBIRGE 0x4
-#define BANKID_LEGENDAERE 0x5
-#define BANKID_HEILIGE_ORTE 0x6
-#define BANKID_WICHTIGE_INDOOR 0x7
-#define BANKID_HESSPERIA_INDOOR 0x8
-#define BANKID_CARUN_CITY_INDOOR 0x9
-#define BANKID_URBANIA_CITY_INDOOR 0xa
-#define BANKID_DEBUG_TEST_START 0x78
+#define BANKID_STADT 0x0
+#define BANKID_ROUTE 0x1
+#define BANKID_ORT 0x2
+#define BANKID_BERG 0x3
+#define BANKID_RUINE 0x4
+#define BANKID_HES 0x5
+#define BANKID_CAR 0x6
+#define BANKID_URBAN 0x7

src/include/constants/pymap/banks.s

@@ -1,12 +1,8 @@
-.equ BANKID_OUTDOOR, 0x0
-.equ BAMKID_ROUTE, 0x1
-.equ BANKID_UNTERWASSER, 0x2
-.equ BANKID_WAELDER_SUEMPFE, 0x3
-.equ BANKID_HOEHLE_GEBIRGE, 0x4
-.equ BANKID_LEGENDAERE, 0x5
-.equ BANKID_HEILIGE_ORTE, 0x6
-.equ BANKID_WICHTIGE_INDOOR, 0x7
-.equ BANKID_HESSPERIA_INDOOR, 0x8
-.equ BANKID_CARUN_CITY_INDOOR, 0x9
-.equ BANKID_URBANIA_CITY_INDOOR, 0xa
-.equ BANKID_DEBUG_TEST_START, 0x78
+.equ BANKID_STADT, 0x0
+.equ BANKID_ROUTE, 0x1
+.equ BANKID_ORT, 0x2
+.equ BANKID_BERG, 0x3
+.equ BANKID_RUINE, 0x4
+.equ BANKID_HES, 0x5
+.equ BANKID_CAR, 0x6
+.equ BANKID_URBAN, 0x7

src/include/constants/pymap/main_story_variables.h

@@ -1,46 +1,47 @@
 #define VAR_STORYVERLAUF 0x5052
-#define VALUE_UNTERRICHT_SCHULE 0x0
-#define VALUE_RIVALE_SCHULE_INDOOR 0x1
-#define VALUE_RIVALE_SCHULE_OUTDOOR 0x2
-#define VALUE_ZUM_LABOR 0x3
-#define VALUE_ERSTES_MAL_LABOR 0x4
-#define VALUE_OHNE_POKE_LABOR 0x5
-#define VALUE_MIT_POKE_LABOR 0x6
-#define VALUE_RIVALKAMPF_HESPERIAPFAD 0x7
-#define VALUE_HESPERIA_BRUECKE 0x8
-#define VALUE_MAPSCRIPT_HESPERIAGRABEN 0x9
-#define VALUE_POKEMON_SPRING_HOEHLE 0xa
-#define VALUE_HESPERIAGRABEN_SPRITEFACEUP 0xb
-#define VALUE_VOR_DEM_REBERATUNNEL 0xc
-#define VALUE_MAPSCRIPT_EINGANG_RDW1 0xd
-#define VALUE_FARBRAETSEL_EINGANG_RDW_AKTIV 0xe
-#define VALUE_FARBRAETSEL_EINGANG_RDW_FALSCH 0xf
-#define VALUE_FARBRAETSEL_EINGANG_RDW_RICHTIG 0x10
-#define VALUE_FARBRAETSEL_RDW_FOR 0x11
-#define VALUE_FARBRAETSEL_RDW_FMR 0x12
-#define VALUE_FARBRAETSEL_RDW_ROF 0x13
-#define VALUE_FARBRAETSEL_RDW_RMF 0x14
-#define VALUE_FARBRAETSEL_EINGANG_RDW_FERTIG 0x15
-#define VALUE_MAPSCRIPT_RDW_INNEN_EINGANG 0x16
-#define VALUE_TIEFESINNERE_RDW_MAPSCRIPT 0x17
-#define VALUE_RDW_INNERES_STEINTAFELN 0x18
-#define VALUE_RDW_INNERES_STEINTAFELN2 0x19
-#define VALUE_HEILIGTUM_RDW_MAPSCRIPT 0x1a
-#define VALUE_HEILIGTUM_RDW_BESIEGT 0x1b
-#define VALUE_PERSON_ANGESPROCHEN1 0x1c
-#define VALUE_PERSON_ANGESPROCHEN2 0x1d
-#define VALUE_PERSON_ANGESPROCHEN3 0x1e
-#define VALUE_ZEHEILIGTUM_INNERES_MAPSCRIPT2 0x1f
-#define VALUE_RDW_INNEN_STEIN_COUNTER1 0x20
-#define VALUE_RDW_INNEN_STEIN_COUNTER2 0x21
-#define VALUE_RDW_TIEFESINNERES_MAPSCRIPT 0x22
-#define VALUE_MAPSCRIPT_RDW_EINGANG2 0x23
-#define VALUE_MAPSCRIPT_CENTER_CAR_MS1 0x24
-#define VALUE_LABOR_NACH_RUINE1 0x25
-#define VALUE_VOR_DEM_HAUS_DES_SPIELERS 0x26
-#define VALUE_MS_SPIELERHAUS_021 0x27
-#define VALUE_MS_SPIELERHAUS_022 0x28
-#define VALUE_SCRIPTFELD_DETEKTOR 0x29
-#define VALUE_MS_HES_OD_1 0x2a
-#define VALUE_ABENTEUER_BEGINNT 0x2b
-#define VALUE_INTRO_FERTIG_ABENTEUER_GO 0x2c
+#define VALUE_INTROSCRIPT 0x0
+#define VALUE_UNTERRICHT_SCHULE 0x1
+#define VALUE_RIVALE_SCHULE_INDOOR 0x2
+#define VALUE_RIVALE_SCHULE_OUTDOOR 0x3
+#define VALUE_ZUM_LABOR 0x4
+#define VALUE_ERSTES_MAL_LABOR 0x5
+#define VALUE_OHNE_POKE_LABOR 0x6
+#define VALUE_MIT_POKE_LABOR 0x7
+#define VALUE_RIVALKAMPF_HESPERIAPFAD 0x8
+#define VALUE_HESPERIA_BRUECKE 0x9
+#define VALUE_MAPSCRIPT_HESPERIAGRABEN 0xa
+#define VALUE_POKEMON_SPRING_HOEHLE 0xb
+#define VALUE_HESPERIAGRABEN_SPRITEFACEUP 0xc
+#define VALUE_VOR_DEM_REBERATUNNEL 0xd
+#define VALUE_MAPSCRIPT_EINGANG_RDW1 0xe
+#define VALUE_FARBRAETSEL_EINGANG_RDW_AKTIV 0xf
+#define VALUE_FARBRAETSEL_EINGANG_RDW_FALSCH 0x10
+#define VALUE_FARBRAETSEL_EINGANG_RDW_RICHTIG 0x11
+#define VALUE_FARBRAETSEL_RDW_FOR 0x12
+#define VALUE_FARBRAETSEL_RDW_FMR 0x13
+#define VALUE_FARBRAETSEL_RDW_ROF 0x14
+#define VALUE_FARBRAETSEL_RDW_RMF 0x15
+#define VALUE_FARBRAETSEL_EINGANG_RDW_FERTIG 0x16
+#define VALUE_MAPSCRIPT_RDW_INNEN_EINGANG 0x17
+#define VALUE_TIEFESINNERE_RDW_MAPSCRIPT 0x18
+#define VALUE_RDW_INNERES_STEINTAFELN 0x19
+#define VALUE_RDW_INNERES_STEINTAFELN2 0x1a
+#define VALUE_HEILIGTUM_RDW_MAPSCRIPT 0x1b
+#define VALUE_HEILIGTUM_RDW_BESIEGT 0x1c
+#define VALUE_PERSON_ANGESPROCHEN1 0x1d
+#define VALUE_PERSON_ANGESPROCHEN2 0x1e
+#define VALUE_PERSON_ANGESPROCHEN3 0x1f
+#define VALUE_ZEHEILIGTUM_INNERES_MAPSCRIPT2 0x20
+#define VALUE_RDW_INNEN_STEIN_COUNTER1 0x21
+#define VALUE_RDW_INNEN_STEIN_COUNTER2 0x22
+#define VALUE_RDW_TIEFESINNERES_MAPSCRIPT 0x23
+#define VALUE_MAPSCRIPT_RDW_EINGANG2 0x24
+#define VALUE_MAPSCRIPT_CENTER_CAR_MS1 0x25
+#define VALUE_LABOR_NACH_RUINE1 0x26
+#define VALUE_VOR_DEM_HAUS_DES_SPIELERS 0x27
+#define VALUE_MS_SPIELERHAUS_021 0x28
+#define VALUE_MS_SPIELERHAUS_022 0x29
+#define VALUE_SCRIPTFELD_DETEKTOR 0x2a
+#define VALUE_MS_HES_OD_1 0x2b
+#define VALUE_ABENTEUER_BEGINNT 0x2c
+#define VALUE_INTRO_FERTIG_ABENTEUER_GO 0x2d

src/include/constants/pymap/main_story_variables.s

@@ -1,46 +1,47 @@
 .equ VAR_STORYVERLAUF, 0x5052
-.equ VALUE_UNTERRICHT_SCHULE, 0x0
-.equ VALUE_RIVALE_SCHULE_INDOOR, 0x1
-.equ VALUE_RIVALE_SCHULE_OUTDOOR, 0x2
-.equ VALUE_ZUM_LABOR, 0x3
-.equ VALUE_ERSTES_MAL_LABOR, 0x4
-.equ VALUE_OHNE_POKE_LABOR, 0x5
-.equ VALUE_MIT_POKE_LABOR, 0x6
-.equ VALUE_RIVALKAMPF_HESPERIAPFAD, 0x7
-.equ VALUE_HESPERIA_BRUECKE, 0x8
-.equ VALUE_MAPSCRIPT_HESPERIAGRABEN, 0x9
-.equ VALUE_POKEMON_SPRING_HOEHLE, 0xa
-.equ VALUE_HESPERIAGRABEN_SPRITEFACEUP, 0xb
-.equ VALUE_VOR_DEM_REBERATUNNEL, 0xc
-.equ VALUE_MAPSCRIPT_EINGANG_RDW1, 0xd
-.equ VALUE_FARBRAETSEL_EINGANG_RDW_AKTIV, 0xe
-.equ VALUE_FARBRAETSEL_EINGANG_RDW_FALSCH, 0xf
-.equ VALUE_FARBRAETSEL_EINGANG_RDW_RICHTIG, 0x10
-.equ VALUE_FARBRAETSEL_RDW_FOR, 0x11
-.equ VALUE_FARBRAETSEL_RDW_FMR, 0x12
-.equ VALUE_FARBRAETSEL_RDW_ROF, 0x13
-.equ VALUE_FARBRAETSEL_RDW_RMF, 0x14
-.equ VALUE_FARBRAETSEL_EINGANG_RDW_FERTIG, 0x15
-.equ VALUE_MAPSCRIPT_RDW_INNEN_EINGANG, 0x16
-.equ VALUE_TIEFESINNERE_RDW_MAPSCRIPT, 0x17
-.equ VALUE_RDW_INNERES_STEINTAFELN, 0x18
-.equ VALUE_RDW_INNERES_STEINTAFELN2, 0x19
-.equ VALUE_HEILIGTUM_RDW_MAPSCRIPT, 0x1a
-.equ VALUE_HEILIGTUM_RDW_BESIEGT, 0x1b
-.equ VALUE_PERSON_ANGESPROCHEN1, 0x1c
-.equ VALUE_PERSON_ANGESPROCHEN2, 0x1d
-.equ VALUE_PERSON_ANGESPROCHEN3, 0x1e
-.equ VALUE_ZEHEILIGTUM_INNERES_MAPSCRIPT2, 0x1f
-.equ VALUE_RDW_INNEN_STEIN_COUNTER1, 0x20
-.equ VALUE_RDW_INNEN_STEIN_COUNTER2, 0x21
-.equ VALUE_RDW_TIEFESINNERES_MAPSCRIPT, 0x22
-.equ VALUE_MAPSCRIPT_RDW_EINGANG2, 0x23
-.equ VALUE_MAPSCRIPT_CENTER_CAR_MS1, 0x24
-.equ VALUE_LABOR_NACH_RUINE1, 0x25
-.equ VALUE_VOR_DEM_HAUS_DES_SPIELERS, 0x26
-.equ VALUE_MS_SPIELERHAUS_021, 0x27
-.equ VALUE_MS_SPIELERHAUS_022, 0x28
-.equ VALUE_SCRIPTFELD_DETEKTOR, 0x29
-.equ VALUE_MS_HES_OD_1, 0x2a
-.equ VALUE_ABENTEUER_BEGINNT, 0x2b
-.equ VALUE_INTRO_FERTIG_ABENTEUER_GO, 0x2c
+.equ VALUE_INTROSCRIPT, 0x0
+.equ VALUE_UNTERRICHT_SCHULE, 0x1
+.equ VALUE_RIVALE_SCHULE_INDOOR, 0x2
+.equ VALUE_RIVALE_SCHULE_OUTDOOR, 0x3
+.equ VALUE_ZUM_LABOR, 0x4
+.equ VALUE_ERSTES_MAL_LABOR, 0x5
+.equ VALUE_OHNE_POKE_LABOR, 0x6
+.equ VALUE_MIT_POKE_LABOR, 0x7
+.equ VALUE_RIVALKAMPF_HESPERIAPFAD, 0x8
+.equ VALUE_HESPERIA_BRUECKE, 0x9
+.equ VALUE_MAPSCRIPT_HESPERIAGRABEN, 0xa
+.equ VALUE_POKEMON_SPRING_HOEHLE, 0xb
+.equ VALUE_HESPERIAGRABEN_SPRITEFACEUP, 0xc
+.equ VALUE_VOR_DEM_REBERATUNNEL, 0xd
+.equ VALUE_MAPSCRIPT_EINGANG_RDW1, 0xe
+.equ VALUE_FARBRAETSEL_EINGANG_RDW_AKTIV, 0xf
+.equ VALUE_FARBRAETSEL_EINGANG_RDW_FALSCH, 0x10
+.equ VALUE_FARBRAETSEL_EINGANG_RDW_RICHTIG, 0x11
+.equ VALUE_FARBRAETSEL_RDW_FOR, 0x12
+.equ VALUE_FARBRAETSEL_RDW_FMR, 0x13
+.equ VALUE_FARBRAETSEL_RDW_ROF, 0x14
+.equ VALUE_FARBRAETSEL_RDW_RMF, 0x15
+.equ VALUE_FARBRAETSEL_EINGANG_RDW_FERTIG, 0x16
+.equ VALUE_MAPSCRIPT_RDW_INNEN_EINGANG, 0x17
+.equ VALUE_TIEFESINNERE_RDW_MAPSCRIPT, 0x18
+.equ VALUE_RDW_INNERES_STEINTAFELN, 0x19
+.equ VALUE_RDW_INNERES_STEINTAFELN2, 0x1a
+.equ VALUE_HEILIGTUM_RDW_MAPSCRIPT, 0x1b
+.equ VALUE_HEILIGTUM_RDW_BESIEGT, 0x1c
+.equ VALUE_PERSON_ANGESPROCHEN1, 0x1d
+.equ VALUE_PERSON_ANGESPROCHEN2, 0x1e
+.equ VALUE_PERSON_ANGESPROCHEN3, 0x1f
+.equ VALUE_ZEHEILIGTUM_INNERES_MAPSCRIPT2, 0x20
+.equ VALUE_RDW_INNEN_STEIN_COUNTER1, 0x21
+.equ VALUE_RDW_INNEN_STEIN_COUNTER2, 0x22
+.equ VALUE_RDW_TIEFESINNERES_MAPSCRIPT, 0x23
+.equ VALUE_MAPSCRIPT_RDW_EINGANG2, 0x24
+.equ VALUE_MAPSCRIPT_CENTER_CAR_MS1, 0x25
+.equ VALUE_LABOR_NACH_RUINE1, 0x26
+.equ VALUE_VOR_DEM_HAUS_DES_SPIELERS, 0x27
+.equ VALUE_MS_SPIELERHAUS_021, 0x28
+.equ VALUE_MS_SPIELERHAUS_022, 0x29
+.equ VALUE_SCRIPTFELD_DETEKTOR, 0x2a
+.equ VALUE_MS_HES_OD_1, 0x2b
+.equ VALUE_ABENTEUER_BEGINNT, 0x2c
+.equ VALUE_INTRO_FERTIG_ABENTEUER_GO, 0x2d

src/include/constants/pymap/map_berg.h

@@ -0,0 +1,9 @@
+#define MAPID_HESGRABENE 0x0
+#define MAPID_HESGRABEN1 0x1
+#define MAPID_HESGRABEN2 0x2
+#define MAPID_HESGRABEN3 0x3
+#define MAPID_HESGRABENA 0x4
+#define MAPID_REBERATUNNEL 0x5
+#define MAPID_REBERAGEBOMI 0x6
+#define MAPID_REBERAGEBOLI 0x7
+#define MAPID_REBEEAGEBORE 0x8

src/include/constants/pymap/map_berg.s

@@ -0,0 +1,9 @@
+.equ MAPID_HESGRABENE, 0x0
+.equ MAPID_HESGRABEN1, 0x1
+.equ MAPID_HESGRABEN2, 0x2
+.equ MAPID_HESGRABEN3, 0x3
+.equ MAPID_HESGRABENA, 0x4
+.equ MAPID_REBERATUNNEL, 0x5
+.equ MAPID_REBERAGEBOMI, 0x6
+.equ MAPID_REBERAGEBOLI, 0x7
+.equ MAPID_REBEEAGEBORE, 0x8

src/include/constants/pymap/map_car.h

@@ -0,0 +1,8 @@
+#define MAPID_CARCENTER 0x0
+#define MAPID_CARSCHULEOD 0x1
+#define MAPID_CARSCHULEID 0x2
+#define MAPID_CARLABORVB 0x3
+#define MAPID_CARLABORHB 0x4
+#define MAPID_CARVERBINDUNGSHAUS12 0x5
+#define MAPID_CARHAUS14EG 0x6
+#define MAPID_CARHAUS14OG 0x7

src/include/constants/pymap/map_car.s

@@ -0,0 +1,8 @@
+.equ MAPID_CARCENTER, 0x0
+.equ MAPID_CARSCHULEOD, 0x1
+.equ MAPID_CARSCHULEID, 0x2
+.equ MAPID_CARLABORVB, 0x3
+.equ MAPID_CARLABORHB, 0x4
+.equ MAPID_CARVERBINDUNGSHAUS12, 0x5
+.equ MAPID_CARHAUS14EG, 0x6
+.equ MAPID_CARHAUS14OG, 0x7

src/include/constants/pymap/map_carun_city_maps.h

@@ -1,15 +0,0 @@
-#define MAPID_CAR_TRAINERSCHULE_OD 0x0
-#define MAPID_CAR_LABOR_VORDERRAUM 0x1
-#define MAPID_CAR_LABOR_HINTERRAUM 0x2
-#define MAPID_CAR_HAUS_1_EG 0x3
-#define MAPID_CAR_HAUS_1_UG 0x4
-#define MAPID_CAR_HAUS_2_EG 0x5
-#define MAPID_CAR_HAUS_2_UG 0x6
-#define MAPID_CAR_HAUS_3_EG 0x7
-#define MAPID_CAR_HAUS_3_UG 0x8
-#define MAPID_CAR_HAUS_4_EG 0x9
-#define MAPID_CAR_HAUS_4_UG 0xa
-#define MAPID_CAR_CENTER 0xb
-#define MAPID_CAR_TRAINERSCHULE_ID 0xc
-#define MAPID_CAR_VERBINDUNGSHAUS_CARUNPFAD 0xd
-#define MAPID_CAR_VERBINDUNGSHAUS_YELNIAPFAD 0xe

src/include/constants/pymap/map_carun_city_maps.s

@@ -1,15 +0,0 @@
-.equ MAPID_CAR_TRAINERSCHULE_OD, 0x0
-.equ MAPID_CAR_LABOR_VORDERRAUM, 0x1
-.equ MAPID_CAR_LABOR_HINTERRAUM, 0x2
-.equ MAPID_CAR_HAUS_1_EG, 0x3
-.equ MAPID_CAR_HAUS_1_UG, 0x4
-.equ MAPID_CAR_HAUS_2_EG, 0x5
-.equ MAPID_CAR_HAUS_2_UG, 0x6
-.equ MAPID_CAR_HAUS_3_EG, 0x7
-.equ MAPID_CAR_HAUS_3_UG, 0x8
-.equ MAPID_CAR_HAUS_4_EG, 0x9
-.equ MAPID_CAR_HAUS_4_UG, 0xa
-.equ MAPID_CAR_CENTER, 0xb
-.equ MAPID_CAR_TRAINERSCHULE_ID, 0xc
-.equ MAPID_CAR_VERBINDUNGSHAUS_CARUNPFAD, 0xd
-.equ MAPID_CAR_VERBINDUNGSHAUS_YELNIAPFAD, 0xe

src/include/constants/pymap/map_connections.h

@@ -1,7 +0,0 @@
-#define ANB_KEINS 0x0
-#define ANB_UNTEN 0x1
-#define ANB_OBEN 0x2
-#define ANB_LINKS 0x3
-#define ANB_RECHTS 0x4
-#define ANB_ABTAUCHEN 0x5
-#define ANB_AUFTAUCHEN 0x6

src/include/constants/pymap/map_connections.s

@@ -1,7 +0,0 @@
-.equ ANB_KEINS, 0x0
-.equ ANB_UNTEN, 0x1
-.equ ANB_OBEN, 0x2
-.equ ANB_LINKS, 0x3
-.equ ANB_RECHTS, 0x4
-.equ ANB_ABTAUCHEN, 0x5
-.equ ANB_AUFTAUCHEN, 0x6

src/include/constants/pymap/map_heilige_orte.h

@@ -1,20 +0,0 @@
-#define MAPID_BAUM_DES_LEBENS_EINGANG 0x0
-#define MAPID_BAUM_DES_LEBENS_EBENE_1 0x1
-#define MAPID_BAUM_DES_LEBENS_EBENE_2 0x2
-#define MAPID_BAUM_DES_LEBENS_EBENE_3 0x3
-#define MAPID_BAUM_DES_LEBENS_EBENE_4 0x4
-#define MAPID_BAUM_DES_LEBENS_EBENE_5 0x5
-#define MAPID_BAUM_DES_LEBENS_EBENE_6 0x6
-#define MAPID_BAUM_DES_LEBENS_EBENE_7 0x7
-#define MAPID_BAUM_DES_LEBENS_EBENE_8 0x8
-#define MAPID_REBERA_GEBIRGE_OST_1 0x9
-#define MAPID_REBERA_GEBIRGE_OST_2 0xa
-#define MAPID_REBERA_GEBIRGE_OST_3 0xb
-#define MAPID_RUINE_DER_WAECHTER_1 0xc
-#define MAPID_RUINE_DER_WAECHTER_2 0xd
-#define MAPID_RUINE_DER_WAECHTER_3 0xe
-#define MAPID_RUINE_DER_WAECHTER_4 0xf
-#define MAPID_RUINE_DER_WAECHTER_5 0x10
-#define MAPID_RUINE_DER_WAECHTER_6 0x11
-#define MAPID_RUINE_DER_WAECHTER_7 0x12
-#define MAPID_RUINE_DER_WAECHTER_8 0x13

src/include/constants/pymap/map_heilige_orte.s

@@ -1,20 +0,0 @@
-.equ MAPID_BAUM_DES_LEBENS_EINGANG, 0x0
-.equ MAPID_BAUM_DES_LEBENS_EBENE_1, 0x1
-.equ MAPID_BAUM_DES_LEBENS_EBENE_2, 0x2
-.equ MAPID_BAUM_DES_LEBENS_EBENE_3, 0x3
-.equ MAPID_BAUM_DES_LEBENS_EBENE_4, 0x4
-.equ MAPID_BAUM_DES_LEBENS_EBENE_5, 0x5
-.equ MAPID_BAUM_DES_LEBENS_EBENE_6, 0x6
-.equ MAPID_BAUM_DES_LEBENS_EBENE_7, 0x7
-.equ MAPID_BAUM_DES_LEBENS_EBENE_8, 0x8
-.equ MAPID_REBERA_GEBIRGE_OST_1, 0x9
-.equ MAPID_REBERA_GEBIRGE_OST_2, 0xa
-.equ MAPID_REBERA_GEBIRGE_OST_3, 0xb
-.equ MAPID_RUINE_DER_WAECHTER_1, 0xc
-.equ MAPID_RUINE_DER_WAECHTER_2, 0xd
-.equ MAPID_RUINE_DER_WAECHTER_3, 0xe
-.equ MAPID_RUINE_DER_WAECHTER_4, 0xf
-.equ MAPID_RUINE_DER_WAECHTER_5, 0x10
-.equ MAPID_RUINE_DER_WAECHTER_6, 0x11
-.equ MAPID_RUINE_DER_WAECHTER_7, 0x12
-.equ MAPID_RUINE_DER_WAECHTER_8, 0x13

src/include/constants/pymap/map_hes.h

@@ -0,0 +1,5 @@
+#define MAPID_HESCENTER 0x0
+#define MAPID_SPIELERHAUSEG 0x1
+#define MAPID_SPIELERHAUSOG 0x2
+#define MAPID_HESHAUS15EG 0x3
+#define MAPID_HESHAUS15OG 0x4

src/include/constants/pymap/map_hes.s

@@ -0,0 +1,5 @@
+.equ MAPID_HESCENTER, 0x0
+.equ MAPID_SPIELERHAUSEG, 0x1
+.equ MAPID_SPIELERHAUSOG, 0x2
+.equ MAPID_HESHAUS15EG, 0x3
+.equ MAPID_HESHAUS15OG, 0x4

src/include/constants/pymap/map_hesperia_maps.h

@@ -1,13 +0,0 @@
-#define MAPID_SPIELERHAUS_EG 0x0
-#define MAPID_SPIELERHAUS_OG 0x1
-#define MAPID_HES_HAUS_1_EG 0x2
-#define MAPID_HES_HAUS_1_UG 0x3
-#define MAPID_HES_HAUS_2_EG 0x4
-#define MAPID_HES_HAUS_2_UG 0x5
-#define MAPID_HES_HAUS_3_EG 0x6
-#define MAPID_HES_HAUS_3_UG 0x7
-#define MAPID_HES_HAUS_4_EG 0x8
-#define MAPID_HES_HAUS_4_UG 0x9
-#define MAPID_HES_HAUS_5_EG 0xa
-#define MAPID_HES_HAUS_5_UG 0xb
-#define MAPID_HES_CENTER 0xc

src/include/constants/pymap/map_hesperia_maps.s

@@ -1,13 +0,0 @@
-.equ MAPID_SPIELERHAUS_EG, 0x0
-.equ MAPID_SPIELERHAUS_OG, 0x1
-.equ MAPID_HES_HAUS_1_EG, 0x2
-.equ MAPID_HES_HAUS_1_UG, 0x3
-.equ MAPID_HES_HAUS_2_EG, 0x4
-.equ MAPID_HES_HAUS_2_UG, 0x5
-.equ MAPID_HES_HAUS_3_EG, 0x6
-.equ MAPID_HES_HAUS_3_UG, 0x7
-.equ MAPID_HES_HAUS_4_EG, 0x8
-.equ MAPID_HES_HAUS_4_UG, 0x9
-.equ MAPID_HES_HAUS_5_EG, 0xa
-.equ MAPID_HES_HAUS_5_UG, 0xb
-.equ MAPID_HES_CENTER, 0xc

src/include/constants/pymap/map_hoehle_gebirge.h

@@ -1,6 +0,0 @@
-#define MAPID_HESPERIAGRABEN_1 0x0
-#define MAPID_HESPERIAGRABEN_2 0x1
-#define MAPID_HESPERIAGRABEN_3 0x2
-#define MAPID_HESPERIAGRABEN_4 0x3
-#define MAPID_HESPERIAGRABEN_5 0x4
-#define MAPID_REBERATUNNEL 0x5

src/include/constants/pymap/map_hoehle_gebirge.s

@@ -1,6 +0,0 @@
-.equ MAPID_HESPERIAGRABEN_1, 0x0
-.equ MAPID_HESPERIAGRABEN_2, 0x1
-.equ MAPID_HESPERIAGRABEN_3, 0x2
-.equ MAPID_HESPERIAGRABEN_4, 0x3
-.equ MAPID_HESPERIAGRABEN_5, 0x4
-.equ MAPID_REBERATUNNEL, 0x5

src/include/constants/pymap/map_ort.h

@@ -0,0 +1,36 @@
+#define MAPID_YELNIAWALD1 0x0
+#define MAPID_YELNIAWALD2 0x1
+#define MAPID_YELNIAWALD3 0x2
+#define MAPID_YELNIAWALD4 0x3
+#define MAPID_YELNIAWALD5 0x4
+#define MAPID_YELNIAWALD6 0x5
+#define MAPID_YELNIAWALD7 0x6
+#define MAPID_YELNIAWALD8 0x7
+#define MAPID_YELNIAWALD9 0x8
+#define MAPID_YELNIAWALDR1 0x9
+#define MAPID_YELNIAWALDR2 0xa
+#define MAPID_YELNIAWALDR3 0xb
+#define MAPID_YELNIAWALDR4 0xc
+#define MAPID_YELNIAWALDR5 0xd
+#define MAPID_YELNIAWALDR6 0xe
+#define MAPID_YELNIAWALDR7 0xf
+#define MAPID_YELNIAWALDR8 0x10
+#define MAPID_YELNIAWALDR9 0x11
+#define MAPID_YELNIAWALDR10 0x12
+#define MAPID_YELNIAWALDR11 0x13
+#define MAPID_YELNIAWALDEBDL 0x14
+#define MAPID_YELNIAWALDBDLE 0x15
+#define MAPID_YELNIAWALDT1 0x16
+#define MAPID_YELNIAWALDT2 0x17
+#define MAPID_YELNIAWALDTA 0x18
+#define MAPID_YELNIAWALDIDEG 0x19
+#define MAPID_YELNIAWALDIDOG 0x1a
+#define MAPID_BAUMDESLEBENSE 0x1b
+#define MAPID_BAUMDESLEBENS1 0x1c
+#define MAPID_BAUMDESLEBENS2 0x1d
+#define MAPID_BAUMDESLEBENS3 0x1e
+#define MAPID_BAUMDESLEBENS4 0x1f
+#define MAPID_BAUMDESLEBENS5 0x20
+#define MAPID_BAUMDESLEBENS6 0x21
+#define MAPID_BAUMDESLEBENSVI 0x22
+#define MAPID_BAUMDESLEBENSII 0x23

src/include/constants/pymap/map_ort.s

@@ -0,0 +1,36 @@
+.equ MAPID_YELNIAWALD1, 0x0
+.equ MAPID_YELNIAWALD2, 0x1
+.equ MAPID_YELNIAWALD3, 0x2
+.equ MAPID_YELNIAWALD4, 0x3
+.equ MAPID_YELNIAWALD5, 0x4
+.equ MAPID_YELNIAWALD6, 0x5
+.equ MAPID_YELNIAWALD7, 0x6
+.equ MAPID_YELNIAWALD8, 0x7
+.equ MAPID_YELNIAWALD9, 0x8
+.equ MAPID_YELNIAWALDR1, 0x9
+.equ MAPID_YELNIAWALDR2, 0xa
+.equ MAPID_YELNIAWALDR3, 0xb
+.equ MAPID_YELNIAWALDR4, 0xc
+.equ MAPID_YELNIAWALDR5, 0xd
+.equ MAPID_YELNIAWALDR6, 0xe
+.equ MAPID_YELNIAWALDR7, 0xf
+.equ MAPID_YELNIAWALDR8, 0x10
+.equ MAPID_YELNIAWALDR9, 0x11
+.equ MAPID_YELNIAWALDR10, 0x12
+.equ MAPID_YELNIAWALDR11, 0x13
+.equ MAPID_YELNIAWALDEBDL, 0x14
+.equ MAPID_YELNIAWALDBDLE, 0x15
+.equ MAPID_YELNIAWALDT1, 0x16
+.equ MAPID_YELNIAWALDT2, 0x17
+.equ MAPID_YELNIAWALDTA, 0x18
+.equ MAPID_YELNIAWALDIDEG, 0x19
+.equ MAPID_YELNIAWALDIDOG, 0x1a
+.equ MAPID_BAUMDESLEBENSE, 0x1b
+.equ MAPID_BAUMDESLEBENS1, 0x1c
+.equ MAPID_BAUMDESLEBENS2, 0x1d
+.equ MAPID_BAUMDESLEBENS3, 0x1e
+.equ MAPID_BAUMDESLEBENS4, 0x1f
+.equ MAPID_BAUMDESLEBENS5, 0x20
+.equ MAPID_BAUMDESLEBENS6, 0x21
+.equ MAPID_BAUMDESLEBENSVI, 0x22
+.equ MAPID_BAUMDESLEBENSII, 0x23

src/include/constants/pymap/map_outdoor.h

@@ -1,5 +0,0 @@
-#define MAPID_HESPERIA_NORD 0x0
-#define MAPID_HESPERIA_SUED 0x1
-#define MAPID_CARUN_CITY 0x2
-#define MAPID_URBANIA_CITY_OST 0x3
-#define MAPID_URBANIA_CITY_WEST 0x4

src/include/constants/pymap/map_outdoor.s

@@ -1,5 +0,0 @@
-.equ MAPID_HESPERIA_NORD, 0x0
-.equ MAPID_HESPERIA_SUED, 0x1
-.equ MAPID_CARUN_CITY, 0x2
-.equ MAPID_URBANIA_CITY_OST, 0x3
-.equ MAPID_URBANIA_CITY_WEST, 0x4

src/include/constants/pymap/map_route.h

@@ -1,4 +1,4 @@
-#define MAPID_HESPERIAPFAD 0x0
-#define MAPID_HESPERIAZWEIG 0x1
-#define MAPID_CARUNPFAD 0x2
+#define MAPID_HESPFAD 0x0
+#define MAPID_HESZWEIG 0x1
+#define MAPID_CARPFAD 0x2
 #define MAPID_YELNIAPFAD 0x3

src/include/constants/pymap/map_route.s

@@ -1,4 +1,4 @@
-.equ MAPID_HESPERIAPFAD, 0x0
-.equ MAPID_HESPERIAZWEIG, 0x1
-.equ MAPID_CARUNPFAD, 0x2
+.equ MAPID_HESPFAD, 0x0
+.equ MAPID_HESZWEIG, 0x1
+.equ MAPID_CARPFAD, 0x2
 .equ MAPID_YELNIAPFAD, 0x3

src/include/constants/pymap/map_ruinen.h

@@ -0,0 +1,8 @@
+#define MAPID_RDWE 0x0
+#define MAPID_RDW1 0x1
+#define MAPID_RDW2 0x2
+#define MAPID_RDW3 0x3
+#define MAPID_RDW4 0x4
+#define MAPID_RDWVI 0x5
+#define MAPID_RDWIB 0x6
+#define MAPID_RDWVB 0x7

src/include/constants/pymap/map_ruinen.s

@@ -0,0 +1,8 @@
+.equ MAPID_RDWE, 0x0
+.equ MAPID_RDW1, 0x1
+.equ MAPID_RDW2, 0x2
+.equ MAPID_RDW3, 0x3
+.equ MAPID_RDW4, 0x4
+.equ MAPID_RDWVI, 0x5
+.equ MAPID_RDWIB, 0x6
+.equ MAPID_RDWVB, 0x7

src/include/constants/pymap/map_stadt.h

@@ -0,0 +1,5 @@
+#define MAPID_HESNORD 0x0
+#define MAPID_HESSUED 0x1
+#define MAPID_CAROD 0x2
+#define MAPID_URBANOST 0x3
+#define MAPID_URBANWEST 0x4

src/include/constants/pymap/map_stadt.s

@@ -0,0 +1,5 @@
+.equ MAPID_HESNORD, 0x0
+.equ MAPID_HESSUED, 0x1
+.equ MAPID_CAROD, 0x2
+.equ MAPID_URBANOST, 0x3
+.equ MAPID_URBANWEST, 0x4

src/include/constants/pymap/map_urban.h

@@ -0,0 +1,8 @@
+#define MAPID_URBANCENTER 0x0
+#define MAPID_URBANVERBINDUNGSHAUS12 0x1
+#define MAPID_URBANBIB 0x2
+#define MAPID_URBANCAFEREST 0x3
+#define MAPID_WALDHAIN 0x4
+#define MAPID_INDOOR17EG 0x5
+#define MAPID_INDOOR16OG 0x6
+#define MAPID_INDOOR7OGS 0x7

src/include/constants/pymap/map_urban.s

@@ -0,0 +1,8 @@
+.equ MAPID_URBANCENTER, 0x0
+.equ MAPID_URBANVERBINDUNGSHAUS12, 0x1
+.equ MAPID_URBANBIB, 0x2
+.equ MAPID_URBANCAFEREST, 0x3
+.equ MAPID_WALDHAIN, 0x4
+.equ MAPID_INDOOR17EG, 0x5
+.equ MAPID_INDOOR16OG, 0x6
+.equ MAPID_INDOOR7OGS, 0x7

src/include/constants/pymap/map_urbania_city_maps.h

@@ -1,29 +0,0 @@
-#define MAPID_URBANI_CENTER 0x0
-#define MAPID_VERBINDUNGSHAUS_URBANIA_CITY 0x1
-#define MAPID_HAUS_1_EG 0x2
-#define MAPID_HAUS_1_OG_1 0x3
-#define MAPID_HAUS_1_OG_2 0x4
-#define MAPID_HAUS_1_OG_3 0x5
-#define MAPID_HAUS_2_EG 0x6
-#define MAPID_HAUS_2_OG 0x7
-#define MAPID_HAUS_3_EG 0x8
-#define MAPID_HAUS_3_OG 0x9
-#define MAPID_HAUS_4_EG 0xa
-#define MAPID_HAUS_4_OG 0xb
-#define MAPID_HAUS_5_EG 0xc
-#define MAPID_HAUS_5_OG_1 0xd
-#define MAPID_HAUS_5_OG_2 0xe
-#define MAPID_HAUS_6_EG 0xf
-#define MAPID_HAUS_6_OG 0x10
-#define MAPID_HAUS_7_EG 0x11
-#define MAPID_HAUS_7_OG_1 0x12
-#define MAPID_HAUS_7_OG_2 0x13
-#define MAPID_HAUS_7_OG_3 0x14
-#define MAPID_HAUS_7_OG_4 0x15
-#define MAPID_URBANIA_BIB_EG 0x16
-#define MAPID_URBANIA_BIB_OG 0x17
-#define MAPID_URBANIA_CAFE 0x18
-#define MAPID_URBANIA_RESTERAUNT 0x19
-#define MAPID_URBANIA_ARENA_1 0x1a
-#define MAPID_URBANIA_ARENA_2 0x1b
-#define MAPID_URBANIA_ARENA_3 0x1c

src/include/constants/pymap/map_urbania_city_maps.s

@@ -1,29 +0,0 @@
-.equ MAPID_URBANI_CENTER, 0x0
-.equ MAPID_VERBINDUNGSHAUS_URBANIA_CITY, 0x1
-.equ MAPID_HAUS_1_EG, 0x2
-.equ MAPID_HAUS_1_OG_1, 0x3
-.equ MAPID_HAUS_1_OG_2, 0x4
-.equ MAPID_HAUS_1_OG_3, 0x5
-.equ MAPID_HAUS_2_EG, 0x6
-.equ MAPID_HAUS_2_OG, 0x7
-.equ MAPID_HAUS_3_EG, 0x8
-.equ MAPID_HAUS_3_OG, 0x9
-.equ MAPID_HAUS_4_EG, 0xa
-.equ MAPID_HAUS_4_OG, 0xb
-.equ MAPID_HAUS_5_EG, 0xc
-.equ MAPID_HAUS_5_OG_1, 0xd
-.equ MAPID_HAUS_5_OG_2, 0xe
-.equ MAPID_HAUS_6_EG, 0xf
-.equ MAPID_HAUS_6_OG, 0x10
-.equ MAPID_HAUS_7_EG, 0x11
-.equ MAPID_HAUS_7_OG_1, 0x12
-.equ MAPID_HAUS_7_OG_2, 0x13
-.equ MAPID_HAUS_7_OG_3, 0x14
-.equ MAPID_HAUS_7_OG_4, 0x15
-.equ MAPID_URBANIA_BIB_EG, 0x16
-.equ MAPID_URBANIA_BIB_OG, 0x17
-.equ MAPID_URBANIA_CAFE, 0x18
-.equ MAPID_URBANIA_RESTERAUNT, 0x19
-.equ MAPID_URBANIA_ARENA_1, 0x1a
-.equ MAPID_URBANIA_ARENA_2, 0x1b
-.equ MAPID_URBANIA_ARENA_3, 0x1c

src/include/constants/pymap/map_wald_suempfe.h

@@ -1,27 +0,0 @@
-#define MAPID_LEBENDERWALD_YELNIA_1 0x0
-#define MAPID_LEBENDERWALD_YELNIA_2 0x1
-#define MAPID_LEBENDERWALD_YELNIA_3 0x2
-#define MAPID_LEBENDERWALD_YELNIA_4 0x3
-#define MAPID_LEBENDERWALD_YELNIA_5 0x4
-#define MAPID_LEBENDERWALD_YELNIA_6 0x5
-#define MAPID_LEBENDERWALD_YELNIA_7 0x6
-#define MAPID_LEBENDERWALD_YELNIA_8 0x7
-#define MAPID_LEBENDERWALD_YELNIA_9 0x8
-#define MAPID_LEBENDERWALD_YELNIA_RAETSEL_1 0x9
-#define MAPID_LEBENDERWALD_YELNIA_RAETSEL_2 0xa
-#define MAPID_LEBENDERWALD_YELNIA_RAETSEL_3 0xb
-#define MAPID_LEBENDERWALD_YELNIA_RAETSEL_4 0xc
-#define MAPID_LEBENDERWALD_YELNIA_RAETSEL_5 0xd
-#define MAPID_LEBENDERWALD_YELNIA_RAETSEL_6 0xe
-#define MAPID_LEBENDERWALD_YELNIA_RAETSEL_7 0xf
-#define MAPID_LEBENDERWALD_YELNIA_RAETSEL_8 0x10
-#define MAPID_LEBENDERWALD_YELNIA_RAETSEL_9 0x11
-#define MAPID_LEBENDERWALD_YELNIA_RAETSEL_10 0x12
-#define MAPID_LEBENDERWALD_YELNIA_RAETSEL_11 0x13
-#define MAPID_LEBENDERWALD_YELNIA_EINGANG_BAUM_DES_LEBENS 0x14
-#define MAPID_LEBENDERWALD_YELNIA_EINGANG_BAUM_DES_LEBENS_ERWACHT 0x15
-#define MAPID_TOTERWALD_YELNIA_1 0x16
-#define MAPID_TOTERWALD_YELNIA_2 0x17
-#define MAPID_TOTERWALD_YELNIA_AUSGANG 0x18
-#define MAPID_YELNIA_WALDHUETTE_EG 0x19
-#define MAPID_YELNIA_WALDHUETTE_SZ 0x1a

src/include/constants/pymap/map_wald_suempfe.s

@@ -1,27 +0,0 @@
-.equ MAPID_LEBENDERWALD_YELNIA_1, 0x0
-.equ MAPID_LEBENDERWALD_YELNIA_2, 0x1
-.equ MAPID_LEBENDERWALD_YELNIA_3, 0x2
-.equ MAPID_LEBENDERWALD_YELNIA_4, 0x3
-.equ MAPID_LEBENDERWALD_YELNIA_5, 0x4
-.equ MAPID_LEBENDERWALD_YELNIA_6, 0x5
-.equ MAPID_LEBENDERWALD_YELNIA_7, 0x6
-.equ MAPID_LEBENDERWALD_YELNIA_8, 0x7
-.equ MAPID_LEBENDERWALD_YELNIA_9, 0x8
-.equ MAPID_LEBENDERWALD_YELNIA_RAETSEL_1, 0x9
-.equ MAPID_LEBENDERWALD_YELNIA_RAETSEL_2, 0xa
-.equ MAPID_LEBENDERWALD_YELNIA_RAETSEL_3, 0xb
-.equ MAPID_LEBENDERWALD_YELNIA_RAETSEL_4, 0xc
-.equ MAPID_LEBENDERWALD_YELNIA_RAETSEL_5, 0xd
-.equ MAPID_LEBENDERWALD_YELNIA_RAETSEL_6, 0xe
-.equ MAPID_LEBENDERWALD_YELNIA_RAETSEL_7, 0xf
-.equ MAPID_LEBENDERWALD_YELNIA_RAETSEL_8, 0x10
-.equ MAPID_LEBENDERWALD_YELNIA_RAETSEL_9, 0x11
-.equ MAPID_LEBENDERWALD_YELNIA_RAETSEL_10, 0x12
-.equ MAPID_LEBENDERWALD_YELNIA_RAETSEL_11, 0x13
-.equ MAPID_LEBENDERWALD_YELNIA_EINGANG_BAUM_DES_LEBENS, 0x14
-.equ MAPID_LEBENDERWALD_YELNIA_EINGANG_BAUM_DES_LEBENS_ERWACHT, 0x15
-.equ MAPID_TOTERWALD_YELNIA_1, 0x16
-.equ MAPID_TOTERWALD_YELNIA_2, 0x17
-.equ MAPID_TOTERWALD_YELNIA_AUSGANG, 0x18
-.equ MAPID_YELNIA_WALDHUETTE_EG, 0x19
-.equ MAPID_YELNIA_WALDHUETTE_SZ, 0x1a

src/include/constants/pymap/story_flags.h

@@ -1,47 +1,48 @@
 #define FLAG_HIDDENALL 0x500
-#define FLAG_SCHOOL_MOVESPRITE 0x501
-#define FLAG_HIDE_RIVAL_SCHOOL 0x502
-#define FLAG_HIDE_RIVAL_SCHOOL_OUT 0x503
-#define FLAG_BRUECKE_DEFEKT_CARUNPFAD 0x504
-#define FLAG_LABOR_MOVESPRITE1 0x505
-#define FLAG_HIDE_IDAN_LABOR 0x506
-#define FLAG_HIDE_ACHIM_LABOR 0x507
-#define FLAG_HIDE_RIVALE_LABOR 0x508
-#define FLAG_LABOR_MOVESPRITE2 0x509
-#define FLAG_HIDE_IDAN_HES_OD 0x50a
-#define FLAG_HIDE_ACHIM_HES_OD 0x50b
-#define FLAG_HIDE_TUNDRA_RUEPEL_HES 0x50c
-#define FLAG_HIDE_POKE_HESPERIAPFAD 0x50d
-#define FLAG_HIDE_RIVALE_BERGSPITZE_RDW 0x50e
-#define FLAG_HIDE_IDAN_BERGSPITZE_RDW 0x50f
-#define FLAG_HIDE_ACHIM_BERGSPITZE_RDW 0x510
-#define FLAG_FARBRAETSEL_FALSCH 0x511
-#define FLAG_FARBRAETSEL_RICHTIG 0x512
-#define FLAG_FARBRAETSEL_WETTER 0x513
-#define FLAG_FARBRAETSEL_GELBTAFEL 0x514
-#define FLAG_FARBRAETSEL_PINKTAFEL 0x515
-#define FLAG_FARBRAETSEL_BLAUTAFEL 0x516
-#define FLAG_REBOST_LATIOS_RAETSEL_AKTIV 0x517
-#define FLAG_REBOST_LATIOS_RAETSEL_KERZE1 0x518
-#define FLAG_REBOST_LATIOS_RAETSEL_KERZE2 0x519
-#define FLAG_REBOST_LATIOS_RAETSEL_KERZE3 0x51a
-#define FLAG_REBOST_LATIOS_RAETSEL_KERZE4 0x51b
-#define FLAG_REBOST_LATIAS_RAETSEL_AKTIV 0x51c
-#define FLAG_REBOST_LATIAS_RAETSEL_KERZE1 0x51d
-#define FLAG_REBOST_LATIAS_RAETSEL_KERZE2 0x51e
-#define FLAG_REBOST_LATIAS_RAETSEL_KERZE3 0x51f
-#define FLAG_REBOST_LATIAS_RAETSEL_KERZE4 0x520
-#define FLAG_RDW_INNERES_GEFAESSE 0x521
-#define FLAG_RDW_HIDE_OHNMAECHTIG_NOAH 0x522
-#define FLAG_RDW_HIDE_OHNMAECHTIG_EMMA 0x523
-#define FLAG_RDW_HIDE_OHNMAECHTIG_ACHIM 0x524
-#define FLAG_RDW_HIDE_OHNMAECHTIG_IDAN 0x525
-#define FLAG_RDW_HIDE_ACHIM_IDAN_RIVAL 0x526
-#define FLAG_RDW_HIDE_FIRNONTOR_FROSDEDJE 0x527
-#define FLAG_HIDE_SEELENOWS_RDW_INNEN 0x528
-#define FLAG_HIDE_ROTER_STEIN_RDW_INNEN 0x529
-#define FLAG_HIDE_BLAUER_STEIN_RDW_INNEN 0x52a
-#define FLAG_ZERTRUEMMERERWAND_RDW 0x52b
-#define FLAG_HIDE_IDAN_SPIELERHAUS 0x52c
-#define FLAG_HIDE_LINDA_SPIELERHAUS 0x52d
-#define FLAG_HIDE_RIVALE_SPIELERHAUS 0x52e
+#define FLAG_SETINTRO 0x501
+#define FLAG_SCHOOL_MOVESPRITE 0x502
+#define FLAG_HIDE_RIVAL_SCHOOL 0x503
+#define FLAG_HIDE_RIVAL_SCHOOL_OUT 0x504
+#define FLAG_BRUECKE_DEFEKT_CARUNPFAD 0x505
+#define FLAG_LABOR_MOVESPRITE1 0x506
+#define FLAG_HIDE_IDAN_LABOR 0x507
+#define FLAG_HIDE_ACHIM_LABOR 0x508
+#define FLAG_HIDE_RIVALE_LABOR 0x509
+#define FLAG_LABOR_MOVESPRITE2 0x50a
+#define FLAG_HIDE_IDAN_HES_OD 0x50b
+#define FLAG_HIDE_ACHIM_HES_OD 0x50c
+#define FLAG_HIDE_TUNDRA_RUEPEL_HES 0x50d
+#define FLAG_HIDE_POKE_HESPERIAPFAD 0x50e
+#define FLAG_HIDE_RIVALE_BERGSPITZE_RDW 0x50f
+#define FLAG_HIDE_IDAN_BERGSPITZE_RDW 0x510
+#define FLAG_HIDE_ACHIM_BERGSPITZE_RDW 0x511
+#define FLAG_FARBRAETSEL_FALSCH 0x512
+#define FLAG_FARBRAETSEL_RICHTIG 0x513
+#define FLAG_FARBRAETSEL_WETTER 0x514
+#define FLAG_FARBRAETSEL_GELBTAFEL 0x515
+#define FLAG_FARBRAETSEL_PINKTAFEL 0x516
+#define FLAG_FARBRAETSEL_BLAUTAFEL 0x517
+#define FLAG_REBOST_LATIOS_RAETSEL_AKTIV 0x518
+#define FLAG_REBOST_LATIOS_RAETSEL_KERZE1 0x519
+#define FLAG_REBOST_LATIOS_RAETSEL_KERZE2 0x51a
+#define FLAG_REBOST_LATIOS_RAETSEL_KERZE3 0x51b
+#define FLAG_REBOST_LATIOS_RAETSEL_KERZE4 0x51c
+#define FLAG_REBOST_LATIAS_RAETSEL_AKTIV 0x51d
+#define FLAG_REBOST_LATIAS_RAETSEL_KERZE1 0x51e
+#define FLAG_REBOST_LATIAS_RAETSEL_KERZE2 0x51f
+#define FLAG_REBOST_LATIAS_RAETSEL_KERZE3 0x520
+#define FLAG_REBOST_LATIAS_RAETSEL_KERZE4 0x521
+#define FLAG_RDW_INNERES_GEFAESSE 0x522
+#define FLAG_RDW_HIDE_OHNMAECHTIG_NOAH 0x523
+#define FLAG_RDW_HIDE_OHNMAECHTIG_EMMA 0x524
+#define FLAG_RDW_HIDE_OHNMAECHTIG_ACHIM 0x525
+#define FLAG_RDW_HIDE_OHNMAECHTIG_IDAN 0x526
+#define FLAG_RDW_HIDE_ACHIM_IDAN_RIVAL 0x527
+#define FLAG_RDW_HIDE_FIRNONTOR_FROSDEDJE 0x528
+#define FLAG_HIDE_SEELENOWS_RDW_INNEN 0x529
+#define FLAG_HIDE_ROTER_STEIN_RDW_INNEN 0x52a
+#define FLAG_HIDE_BLAUER_STEIN_RDW_INNEN 0x52b
+#define FLAG_ZERTRUEMMERERWAND_RDW 0x52c
+#define FLAG_HIDE_IDAN_SPIELERHAUS 0x52d
+#define FLAG_HIDE_LINDA_SPIELERHAUS 0x52e
+#define FLAG_HIDE_RIVALE_SPIELERHAUS 0x52f

src/include/constants/pymap/story_flags.s

@@ -1,47 +1,48 @@
 .equ FLAG_HIDDENALL, 0x500
-.equ FLAG_SCHOOL_MOVESPRITE, 0x501
-.equ FLAG_HIDE_RIVAL_SCHOOL, 0x502
-.equ FLAG_HIDE_RIVAL_SCHOOL_OUT, 0x503
-.equ FLAG_BRUECKE_DEFEKT_CARUNPFAD, 0x504
-.equ FLAG_LABOR_MOVESPRITE1, 0x505
-.equ FLAG_HIDE_IDAN_LABOR, 0x506
-.equ FLAG_HIDE_ACHIM_LABOR, 0x507
-.equ FLAG_HIDE_RIVALE_LABOR, 0x508
-.equ FLAG_LABOR_MOVESPRITE2, 0x509
-.equ FLAG_HIDE_IDAN_HES_OD, 0x50a
-.equ FLAG_HIDE_ACHIM_HES_OD, 0x50b
-.equ FLAG_HIDE_TUNDRA_RUEPEL_HES, 0x50c
-.equ FLAG_HIDE_POKE_HESPERIAPFAD, 0x50d
-.equ FLAG_HIDE_RIVALE_BERGSPITZE_RDW, 0x50e
-.equ FLAG_HIDE_IDAN_BERGSPITZE_RDW, 0x50f
-.equ FLAG_HIDE_ACHIM_BERGSPITZE_RDW, 0x510
-.equ FLAG_FARBRAETSEL_FALSCH, 0x511
-.equ FLAG_FARBRAETSEL_RICHTIG, 0x512
-.equ FLAG_FARBRAETSEL_WETTER, 0x513
-.equ FLAG_FARBRAETSEL_GELBTAFEL, 0x514
-.equ FLAG_FARBRAETSEL_PINKTAFEL, 0x515
-.equ FLAG_FARBRAETSEL_BLAUTAFEL, 0x516
-.equ FLAG_REBOST_LATIOS_RAETSEL_AKTIV, 0x517
-.equ FLAG_REBOST_LATIOS_RAETSEL_KERZE1, 0x518
-.equ FLAG_REBOST_LATIOS_RAETSEL_KERZE2, 0x519
-.equ FLAG_REBOST_LATIOS_RAETSEL_KERZE3, 0x51a
-.equ FLAG_REBOST_LATIOS_RAETSEL_KERZE4, 0x51b
-.equ FLAG_REBOST_LATIAS_RAETSEL_AKTIV, 0x51c
-.equ FLAG_REBOST_LATIAS_RAETSEL_KERZE1, 0x51d
-.equ FLAG_REBOST_LATIAS_RAETSEL_KERZE2, 0x51e
-.equ FLAG_REBOST_LATIAS_RAETSEL_KERZE3, 0x51f
-.equ FLAG_REBOST_LATIAS_RAETSEL_KERZE4, 0x520
-.equ FLAG_RDW_INNERES_GEFAESSE, 0x521
-.equ FLAG_RDW_HIDE_OHNMAECHTIG_NOAH, 0x522
-.equ FLAG_RDW_HIDE_OHNMAECHTIG_EMMA, 0x523
-.equ FLAG_RDW_HIDE_OHNMAECHTIG_ACHIM, 0x524
-.equ FLAG_RDW_HIDE_OHNMAECHTIG_IDAN, 0x525
-.equ FLAG_RDW_HIDE_ACHIM_IDAN_RIVAL, 0x526
-.equ FLAG_RDW_HIDE_FIRNONTOR_FROSDEDJE, 0x527
-.equ FLAG_HIDE_SEELENOWS_RDW_INNEN, 0x528
-.equ FLAG_HIDE_ROTER_STEIN_RDW_INNEN, 0x529
-.equ FLAG_HIDE_BLAUER_STEIN_RDW_INNEN, 0x52a
-.equ FLAG_ZERTRUEMMERERWAND_RDW, 0x52b
-.equ FLAG_HIDE_IDAN_SPIELERHAUS, 0x52c
-.equ FLAG_HIDE_LINDA_SPIELERHAUS, 0x52d
-.equ FLAG_HIDE_RIVALE_SPIELERHAUS, 0x52e
+.equ FLAG_SETINTRO, 0x501
+.equ FLAG_SCHOOL_MOVESPRITE, 0x502
+.equ FLAG_HIDE_RIVAL_SCHOOL, 0x503
+.equ FLAG_HIDE_RIVAL_SCHOOL_OUT, 0x504
+.equ FLAG_BRUECKE_DEFEKT_CARUNPFAD, 0x505
+.equ FLAG_LABOR_MOVESPRITE1, 0x506
+.equ FLAG_HIDE_IDAN_LABOR, 0x507
+.equ FLAG_HIDE_ACHIM_LABOR, 0x508
+.equ FLAG_HIDE_RIVALE_LABOR, 0x509
+.equ FLAG_LABOR_MOVESPRITE2, 0x50a
+.equ FLAG_HIDE_IDAN_HES_OD, 0x50b
+.equ FLAG_HIDE_ACHIM_HES_OD, 0x50c
+.equ FLAG_HIDE_TUNDRA_RUEPEL_HES, 0x50d
+.equ FLAG_HIDE_POKE_HESPERIAPFAD, 0x50e
+.equ FLAG_HIDE_RIVALE_BERGSPITZE_RDW, 0x50f
+.equ FLAG_HIDE_IDAN_BERGSPITZE_RDW, 0x510
+.equ FLAG_HIDE_ACHIM_BERGSPITZE_RDW, 0x511
+.equ FLAG_FARBRAETSEL_FALSCH, 0x512
+.equ FLAG_FARBRAETSEL_RICHTIG, 0x513
+.equ FLAG_FARBRAETSEL_WETTER, 0x514
+.equ FLAG_FARBRAETSEL_GELBTAFEL, 0x515
+.equ FLAG_FARBRAETSEL_PINKTAFEL, 0x516
+.equ FLAG_FARBRAETSEL_BLAUTAFEL, 0x517
+.equ FLAG_REBOST_LATIOS_RAETSEL_AKTIV, 0x518
+.equ FLAG_REBOST_LATIOS_RAETSEL_KERZE1, 0x519
+.equ FLAG_REBOST_LATIOS_RAETSEL_KERZE2, 0x51a
+.equ FLAG_REBOST_LATIOS_RAETSEL_KERZE3, 0x51b
+.equ FLAG_REBOST_LATIOS_RAETSEL_KERZE4, 0x51c
+.equ FLAG_REBOST_LATIAS_RAETSEL_AKTIV, 0x51d
+.equ FLAG_REBOST_LATIAS_RAETSEL_KERZE1, 0x51e
+.equ FLAG_REBOST_LATIAS_RAETSEL_KERZE2, 0x51f
+.equ FLAG_REBOST_LATIAS_RAETSEL_KERZE3, 0x520
+.equ FLAG_REBOST_LATIAS_RAETSEL_KERZE4, 0x521
+.equ FLAG_RDW_INNERES_GEFAESSE, 0x522
+.equ FLAG_RDW_HIDE_OHNMAECHTIG_NOAH, 0x523
+.equ FLAG_RDW_HIDE_OHNMAECHTIG_EMMA, 0x524
+.equ FLAG_RDW_HIDE_OHNMAECHTIG_ACHIM, 0x525
+.equ FLAG_RDW_HIDE_OHNMAECHTIG_IDAN, 0x526
+.equ FLAG_RDW_HIDE_ACHIM_IDAN_RIVAL, 0x527
+.equ FLAG_RDW_HIDE_FIRNONTOR_FROSDEDJE, 0x528
+.equ FLAG_HIDE_SEELENOWS_RDW_INNEN, 0x529
+.equ FLAG_HIDE_ROTER_STEIN_RDW_INNEN, 0x52a
+.equ FLAG_HIDE_BLAUER_STEIN_RDW_INNEN, 0x52b
+.equ FLAG_ZERTRUEMMERERWAND_RDW, 0x52c
+.equ FLAG_HIDE_IDAN_SPIELERHAUS, 0x52d
+.equ FLAG_HIDE_LINDA_SPIELERHAUS, 0x52e
+.equ FLAG_HIDE_RIVALE_SPIELERHAUS, 0x52f

src/include/pymap_constants.h

@@ -11,19 +11,18 @@
 #include <constants/pymap/main_story_variables.h>
 #include <constants/pymap/map_adjacency_types.h>
 #include <constants/pymap/map_battle_styles.h>
-#include <constants/pymap/map_carun_city_maps.h>
-#include <constants/pymap/map_connections.h>
+#include <constants/pymap/map_berg.h>
+#include <constants/pymap/map_car.h>
 #include <constants/pymap/map_flash_types.h>
-#include <constants/pymap/map_heilige_orte.h>
-#include <constants/pymap/map_hesperia_maps.h>
-#include <constants/pymap/map_hoehle_gebirge.h>
+#include <constants/pymap/map_hes.h>
 #include <constants/pymap/map_namespaces.h>
-#include <constants/pymap/map_outdoor.h>
+#include <constants/pymap/map_ort.h>
 #include <constants/pymap/map_route.h>
+#include <constants/pymap/map_ruinen.h>
 #include <constants/pymap/map_show_name_types.h>
+#include <constants/pymap/map_stadt.h>
 #include <constants/pymap/map_types.h>
-#include <constants/pymap/map_urbania_city_maps.h>
-#include <constants/pymap/map_wald_suempfe.h>
+#include <constants/pymap/map_urban.h>
 #include <constants/pymap/map_weathers.h>
 #include <constants/pymap/npc_sprite_table1.h>
 #include <constants/pymap/npc_sprite_table2.h>