Merge branch 'master' of github.com:SBird1337/source_of_the_sovereign

patches/game_engine/quick_hacks.asm

@@ -1,8 +1,8 @@
 EGG_HATCH_LEVEL EQU 1
 EV_CAP EQU 252
 
-PLAYER_S_X EQU 0x25
-PLAYER_S_Y EQU 0x33
+PLAYER_S_X EQU 0x0
+PLAYER_S_Y EQU 0x29
 
 PLAYER_S_B EQU 0x6
 PLAYER_S_M EQU 0x2

sots-private

@@ -1 +1 @@
-Subproject commit 230d1b720c11da3d9d54eee6ec86d5683e6a53a1
+Subproject commit bed997081c13308092e7a3635d823bea3becdae6

src/include/constants/pymap/map_urban.h

@@ -3,6 +3,5 @@
 #define MAPID_URBANBIB 0x2
 #define MAPID_URBANCAFEREST 0x3
 #define MAPID_WALDHAIN 0x4
-#define MAPID_INDOOR17EG 0x5
-#define MAPID_INDOOR16OG 0x6
-#define MAPID_INDOOR7OGS 0x7
+#define MAPID_URBANHAUS18EG 0x5
+#define MAPID_URBANHAUS18OG 0x6

src/include/constants/pymap/map_urban.s

@@ -3,6 +3,5 @@
 .equ MAPID_URBANBIB, 0x2
 .equ MAPID_URBANCAFEREST, 0x3
 .equ MAPID_WALDHAIN, 0x4
-.equ MAPID_INDOOR17EG, 0x5
-.equ MAPID_INDOOR16OG, 0x6
-.equ MAPID_INDOOR7OGS, 0x7
+.equ MAPID_URBANHAUS18EG, 0x5
+.equ MAPID_URBANHAUS18OG, 0x6

src/include/constants/pymap/songs.h

@@ -1,3 +1,4 @@
+#define SEQ_BGM_TITLE_SCREEN 0x116
 #define SEQ_BGM_TOWN_HESPERIA 0x15e
 #define SEQ_BGM_CITY_CARUN 0x15f
 #define SEQ_BGM_CITY_URBANIA 0x160

src/include/constants/pymap/songs.s

@@ -1,3 +1,4 @@
+.equ SEQ_BGM_TITLE_SCREEN, 0x116
 .equ SEQ_BGM_TOWN_HESPERIA, 0x15e
 .equ SEQ_BGM_CITY_CARUN, 0x15f
 .equ SEQ_BGM_CITY_URBANIA, 0x160

src/include/script/movement.h

@@ -105,7 +105,4 @@
 .equ APPLYMOVE_DIAG_RIGHTUP, 0xAB
 .equ APPLYMOVE_DIAG_LEFTDOWN, 0xAC
 .equ APPLYMOVE_DIAG_RIGHTDOWN, 0xAD
-
-
-
-.equ APPLYMOVE_END, 0xFE
+.equ APPLYMOVE_END, 0xFE