Browse Source

TIleset Änderungen & Map Anpassungen

dragonflysots 6 years ago
parent
commit
bcf64663d6

+ 2
- 2
patches/game_engine/quick_hacks.asm View File

1
 EGG_HATCH_LEVEL EQU 1
1
 EGG_HATCH_LEVEL EQU 1
2
 EV_CAP EQU 252
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
 PLAYER_S_B EQU 0x6
7
 PLAYER_S_B EQU 0x6
8
 PLAYER_S_M EQU 0x2
8
 PLAYER_S_M EQU 0x2

+ 1
- 1
sots-private

1
-Subproject commit 230d1b720c11da3d9d54eee6ec86d5683e6a53a1
1
+Subproject commit 2185f8badef9467bd2560587e6384e5be3890f74

+ 2
- 3
src/include/constants/pymap/map_urban.h View File

3
 #define MAPID_URBANBIB 0x2
3
 #define MAPID_URBANBIB 0x2
4
 #define MAPID_URBANCAFEREST 0x3
4
 #define MAPID_URBANCAFEREST 0x3
5
 #define MAPID_WALDHAIN 0x4
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 View File

3
 .equ MAPID_URBANBIB, 0x2
3
 .equ MAPID_URBANBIB, 0x2
4
 .equ MAPID_URBANCAFEREST, 0x3
4
 .equ MAPID_URBANCAFEREST, 0x3
5
 .equ MAPID_WALDHAIN, 0x4
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
- 4
src/include/script/movement.h View File

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