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

object/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

patches/game_engine/quick_hacks.asm

@@ -1,11 +1,11 @@
 EGG_HATCH_LEVEL EQU 1
 EV_CAP EQU 252
 
-PLAYER_S_X EQU 7
-PLAYER_S_Y EQU 0x13
+PLAYER_S_X EQU 0x40
+PLAYER_S_Y EQU 0x10
 
-PLAYER_S_B EQU 5
-PLAYER_S_M EQU 0
+PLAYER_S_B EQU 0x0
+PLAYER_S_M EQU 0x0
 
 // Something //
 .org 0x080441D6
@@ -72,16 +72,16 @@ PLAYER_S_M EQU 0
 .word 0x00000000
 
 .org 0x08054A08
-.byte 0x7
+.byte PLAYER_S_X
 
 .org 0x08054A00
-.byte 0x13
+.byte PLAYER_S_Y
 
 .org 0x08054A04
-.byte 0x5
+.byte PLAYER_S_B
 
 .org 0x08054A06
-.byte 0x0
+.byte PLAYER_S_M
 
 .org 0x0807F5EC
 .word scr_whiteout_mom

sots-private

@@ -1 +1 @@
-Subproject commit d4ebc9d55373866a5dbbec5ca784fd5140596544
+Subproject commit 0be870e235729886f488946f0199e6ddacfa0f3f

src/overworld/tileset_animation/main_animator.c

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