Browse Source

Neuer Titelscreen (Paletten sind noch verbuggt, wird noch gefixt), Alte Maps, Tilesets entfernt, neue Hesperia Map inklusive Tileset eingefügt, Startposition angepasst, Problem: Blackscreen beim Spiel Neustart, Ursache ist mir nicht bekannt

DragonflySotS 6 years ago
parent
commit
0cd9459bd4

+ 0
- 2
object/.gitignore View File

1
-*
2
-!.gitignore

+ 8
- 8
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 7
5
-PLAYER_S_Y EQU 0x13
4
+PLAYER_S_X EQU 0x40
5
+PLAYER_S_Y EQU 0x10
6
 
6
 
7
-PLAYER_S_B EQU 5
8
-PLAYER_S_M EQU 0
7
+PLAYER_S_B EQU 0x0
8
+PLAYER_S_M EQU 0x0
9
 
9
 
10
 // Something //
10
 // Something //
11
 .org 0x080441D6
11
 .org 0x080441D6
72
 .word 0x00000000
72
 .word 0x00000000
73
 
73
 
74
 .org 0x08054A08
74
 .org 0x08054A08
75
-.byte 0x7
75
+.byte PLAYER_S_X
76
 
76
 
77
 .org 0x08054A00
77
 .org 0x08054A00
78
-.byte 0x13
78
+.byte PLAYER_S_Y
79
 
79
 
80
 .org 0x08054A04
80
 .org 0x08054A04
81
-.byte 0x5
81
+.byte PLAYER_S_B
82
 
82
 
83
 .org 0x08054A06
83
 .org 0x08054A06
84
-.byte 0x0
84
+.byte PLAYER_S_M
85
 
85
 
86
 .org 0x0807F5EC
86
 .org 0x0807F5EC
87
 .word scr_whiteout_mom
87
 .word scr_whiteout_mom

+ 1
- 1
sots-private

1
-Subproject commit d4ebc9d55373866a5dbbec5ca784fd5140596544
1
+Subproject commit 0be870e235729886f488946f0199e6ddacfa0f3f

+ 1
- 1
src/overworld/tileset_animation/main_animator.c View File

27
     const void *image;
27
     const void *image;
28
 };
28
 };
29
 
29
 
30
-#define AS_WATER 9
30
+#define AS_WATER 15
31
 
31
 
32
 const struct TilesetAnimation hesperia_second_animations[] = {
32
 const struct TilesetAnimation hesperia_second_animations[] = {
33
     {.tile_start = 0x10C, .frame_length = 14, .tile_length = 4, .frame_count = 10, .image = flowers_magTiles},
33
     {.tile_start = 0x10C, .frame_length = 14, .tile_length = 4, .frame_count = 10, .image = flowers_magTiles},