Kaynağa Gözat

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

Michael Panzlaff 5 yıl önce
ebeveyn
işleme
caa8d4255e

+ 2
- 2
patches/game_engine/quick_hacks.asm Dosyayı Görüntüle

@@ -1,8 +1,8 @@
1 1
 EGG_HATCH_LEVEL EQU 1
2 2
 EV_CAP EQU 252
3 3
 
4
-PLAYER_S_X EQU 0x25
5
-PLAYER_S_Y EQU 0x33
4
+PLAYER_S_X EQU 0x0
5
+PLAYER_S_Y EQU 0x29
6 6
 
7 7
 PLAYER_S_B EQU 0x6
8 8
 PLAYER_S_M EQU 0x2

+ 1
- 1
sots-private

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

+ 2
- 3
src/include/constants/pymap/map_urban.h Dosyayı Görüntüle

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

+ 2
- 3
src/include/constants/pymap/map_urban.s Dosyayı Görüntüle

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

+ 1
- 0
src/include/constants/pymap/songs.h Dosyayı Görüntüle

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

+ 1
- 0
src/include/constants/pymap/songs.s Dosyayı Görüntüle

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

+ 1
- 4
src/include/script/movement.h Dosyayı Görüntüle

@@ -105,7 +105,4 @@
105 105
 .equ APPLYMOVE_DIAG_RIGHTUP, 0xAB
106 106
 .equ APPLYMOVE_DIAG_LEFTDOWN, 0xAC
107 107
 .equ APPLYMOVE_DIAG_RIGHTDOWN, 0xAD
108
-
109
-
110
-
111
-.equ APPLYMOVE_END, 0xFE
108
+.equ APPLYMOVE_END, 0xFE