OWs gefixt, 4. Table geht nun. Moveset der Starter angepasst, sowie sots-privat

battle_engine

@@ -1 +1 @@
-Subproject commit 4a4fb7ac2ac3def1d4270796bdd2c04e8231d382
+Subproject commit a201b518834f0208efdb82ac95b08675f5279950

data/overworld/overworld_data.s

@@ -4869,13 +4869,13 @@ ow_data_poke_leg_0255:
 
 .align 2
 ow_data_objekt_0000:
-.hword 0xFFFF, 0xC300, 0x1102, 0x800, 0x40, 0x40, 0x0110, 0x0
-.word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_objekt_0000, 0x8231CFC
+.hword 0xFFFF, 0xC300, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
+.word 0x83A3718, 0x83A37F0, 0x83A3660, ow_frames_objekt_0000, 0x8231CFC
 
 .align 2
 ow_data_objekt_0001:
 .hword 0xFFFF, 0xC301, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
-.word 0x83A3718, 0x83A37F0, 0x83A3660, ow_frames_objekt_0001, 0x8231CFC
+.word 0x83A3718, 0x83A37F0, 0x83A3658, ow_frames_objekt_0001, 0x8231CFC
 
 .align 2
 ow_data_objekt_0002:
@@ -4884,8 +4884,8 @@ ow_data_objekt_0002:
 
 .align 2
 ow_data_objekt_0003:
-.hword 0xFFFF, 0xC303, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
-.word 0x83A3718, 0x83A37F0, 0x83A3658, ow_frames_objekt_0003, 0x8231CFC
+.hword 0xFFFF, 0xC303, 0x1102, 0x100, 0x10, 0x20, 0x0110, 0x0
+.word 0x83A3710, 0x83A379C, 0x83A3314, ow_frames_objekt_0003, 0x8231CFC
 
 .align 2
 ow_data_objekt_0004:
@@ -4894,28 +4894,28 @@ ow_data_objekt_0004:
 
 .align 2
 ow_data_objekt_0005:
-.hword 0xFFFF, 0xC305, 0x1102, 0x100, 0x10, 0x20, 0x0110, 0x0
-.word 0x83A3710, 0x83A379C, 0x83A3314, ow_frames_objekt_0005, 0x8231CFC
+.hword 0xFFFF, 0xC305, 0x1102, 0x800, 0x40, 0x40, 0x0110, 0x0
+.word 0x83A3720, 0x83A38D0, 0x83A3658, ow_frames_objekt_0005, 0x8231CFC
 
 .align 2
 ow_data_objekt_0006:
-.hword 0xFFFF, 0xC306, 0x1102, 0x800, 0x40, 0x40, 0x0110, 0x0
-.word 0x83A3720, 0x83A38D0, 0x83A3658, ow_frames_objekt_0006, 0x8231CFC
+.hword 0xFFFF, 0xC306, 0x1102, 0x80, 0x10, 0x10, 0x0110, 0x0
+.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_objekt_0006, 0x8231CFC
 
 .align 2
 ow_data_objekt_0007:
-.hword 0xFFFF, 0xC307, 0x1102, 0x80, 0x10, 0x10, 0x0110, 0x0
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_objekt_0007, 0x8231CFC
+.hword 0xFFFF, 0xC307, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
+.word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_objekt_0007, 0x8231CFC
 
 .align 2
 ow_data_objekt_0008:
-.hword 0xFFFF, 0xC308, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
-.word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_objekt_0008, 0x8231CFC
+.hword 0xFFFF, 0xC308, 0x1102, 0x80, 0x10, 0x10, 0x0110, 0x0
+.word 0x83A36F0, 0x83A3748, 0x83A3368, ow_frames_objekt_0008, 0x8231CFC
 
 .align 2
 ow_data_objekt_0009:
 .hword 0xFFFF, 0xC309, 0x1102, 0x80, 0x10, 0x10, 0x0110, 0x0
-.word 0x83A36F0, 0x83A3748, 0x83A3368, ow_frames_objekt_0009, 0x8231CFC
+.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_objekt_0009, 0x8231CFC
 
 .align 2
 ow_data_objekt_0010:
@@ -4924,18 +4924,18 @@ ow_data_objekt_0010:
 
 .align 2
 ow_data_objekt_0011:
-.hword 0xFFFF, 0xC30B, 0x1102, 0x80, 0x10, 0x10, 0x0110, 0x0
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_objekt_0011, 0x8231CFC
+.hword 0xFFFF, 0xC30B, 0x1102, 0x800, 0x40, 0x40, 0x0110, 0x0
+.word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_objekt_0011, 0x8231CFC
 
 .align 2
 ow_data_objekt_0012:
-.hword 0xFFFF, 0xC30C, 0x1102, 0x800, 0x40, 0x40, 0x0110, 0x0
-.word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_objekt_0012, 0x8231CFC
+.hword 0xFFFF, 0xC30C, 0x1102, 0x1000, 0x80, 0x40, 0x0110, 0x0
+.word 0x83A36E0, 0x83A3A50, 0x83A3368, ow_frames_objekt_0012, 0x8231CFC
 
 .align 2
 ow_data_objekt_0013:
-.hword 0xFFFF, 0xC30D, 0x1102, 0x1000, 0x80, 0x40, 0x0110, 0x0
-.word 0x83A36E0, 0x83A3A50, 0x83A3368, ow_frames_objekt_0013, 0x8231CFC
+.hword 0xFFFF, 0xC30D, 0x1102, 0x800, 0x40, 0x40, 0x0110, 0x0
+.word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_objekt_0013, 0x8231CFC
 
 .align 2
 ow_data_objekt_0014:
@@ -4944,13 +4944,13 @@ ow_data_objekt_0014:
 
 .align 2
 ow_data_objekt_0015:
-.hword 0xFFFF, 0xC30F, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
-.word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_objekt_0015, 0x8231CFC
+.hword 0xFFFF, 0xC30F, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
+.word 0x83A3718, 0x83A37F0, 0x83A3658, ow_frames_objekt_0015, 0x8231CFC
 
 .align 2
 ow_data_objekt_0016:
-.hword 0xFFFF, 0xC310, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
-.word 0x83A3718, 0x83A37F0, 0x83A3658, ow_frames_objekt_0016, 0x8231CFC
+.hword 0xFFFF, 0xC310, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
+.word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_objekt_0016, 0x8231CFC
 
 .align 2
 ow_data_objekt_0017:

data/overworld/overworld_frames.s

@@ -16074,37 +16074,23 @@ ow_frames_poke_leg_0255:
 .hword 0x80
 .hword 0x0
 
-.align 2 
+
+.align 2
 ow_frames_objekt_0000:
-.word ow_objekt_0000Tiles+(0*0x800)
-.hword 0x800
-.hword 0x0
-.word ow_objekt_0000Tiles+(1*0x800)
-.hword 0x800
-.hword 0x0
-.word ow_objekt_0000Tiles+(2*0x800)
-.hword 0x800
-.hword 0x0
-.word ow_objekt_0000Tiles+(0*0x800)
-.hword 0x800
-.hword 0x0
-.word ow_objekt_0000Tiles+(0*0x800)
-.hword 0x800
-.hword 0x0
-.word ow_objekt_0000Tiles+(0*0x800)
-.hword 0x800
+.word ow_objekt_0000Tiles+(0*0x200)
+.hword 0x200
 .hword 0x0
-.word ow_objekt_0000Tiles+(0*0x800)
-.hword 0x800
+.word ow_objekt_0000Tiles+(1*0x200)
+.hword 0x200
 .hword 0x0
-.word ow_objekt_0000Tiles+(0*0x800)
-.hword 0x800
+.word ow_objekt_0000Tiles+(2*0x200)
+.hword 0x200
 .hword 0x0
-.word ow_objekt_0000Tiles+(0*0x800)
-.hword 0x800
+.word ow_objekt_0000Tiles+(3*0x200)
+.hword 0x200
 .hword 0x0
 
-.align 2 
+.align 2
 ow_frames_objekt_0001:
 .word ow_objekt_0001Tiles+(0*0x200)
 .hword 0x200
@@ -16119,7 +16105,7 @@ ow_frames_objekt_0001:
 .hword 0x200
 .hword 0x0
 
-.align 2 
+.align 2
 ow_frames_objekt_0002:
 .word ow_objekt_0002Tiles+(0*0x200)
 .hword 0x200
@@ -16134,328 +16120,343 @@ ow_frames_objekt_0002:
 .hword 0x200
 .hword 0x0
 
-.align 2 
+.align 2
 ow_frames_objekt_0003:
-.word ow_objekt_0003Tiles+(0*0x200)
-.hword 0x200
-.hword 0x0
-.word ow_objekt_0003Tiles+(1*0x200)
-.hword 0x200
-.hword 0x0
-.word ow_objekt_0003Tiles+(2*0x200)
-.hword 0x200
-.hword 0x0
-.word ow_objekt_0003Tiles+(3*0x200)
-.hword 0x200
+.word ow_objekt_0003Tiles+(0*0x100)
+.hword 0x100
 .hword 0x0
 
-.align 2 
+.align 2
 ow_frames_objekt_0004:
 .word ow_objekt_0004Tiles+(0*0x100)
 .hword 0x100
 .hword 0x0
 
-.align 2 
+.align 2
 ow_frames_objekt_0005:
-.word ow_objekt_0005Tiles+(0*0x100)
-.hword 0x100
-.hword 0x0
-
-.align 2 
-ow_frames_objekt_0006:
-.word ow_objekt_0006Tiles+(0*0x800)
+.word ow_objekt_0005Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0006Tiles+(1*0x800)
+.word ow_objekt_0005Tiles+(1*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0006Tiles+(2*0x800)
+.word ow_objekt_0005Tiles+(2*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0006Tiles+(3*0x800)
+.word ow_objekt_0005Tiles+(3*0x800)
 .hword 0x800
 .hword 0x0
 
-.align 2 
-ow_frames_objekt_0007:
-.word ow_objekt_0007Tiles+(0*0x80)
+.align 2
+ow_frames_objekt_0006:
+.word ow_objekt_0006Tiles+(0*0x80)
 .hword 0x80
 .hword 0x0
 
-.align 2 
-ow_frames_objekt_0008:
-.word ow_objekt_0008Tiles+(0*0x200)
+.align 2
+ow_frames_objekt_0007:
+.word ow_objekt_0007Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_objekt_0008Tiles+(0*0x200)
+.word ow_objekt_0007Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_objekt_0008Tiles+(0*0x200)
+.word ow_objekt_0007Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_objekt_0008Tiles+(1*0x200)
+.word ow_objekt_0007Tiles+(1*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_objekt_0008Tiles+(2*0x200)
+.word ow_objekt_0007Tiles+(2*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_objekt_0008Tiles+(1*0x200)
+.word ow_objekt_0007Tiles+(1*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_objekt_0008Tiles+(2*0x200)
+.word ow_objekt_0007Tiles+(2*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_objekt_0008Tiles+(1*0x200)
+.word ow_objekt_0007Tiles+(1*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_objekt_0008Tiles+(2*0x200)
+.word ow_objekt_0007Tiles+(2*0x200)
 .hword 0x200
 .hword 0x0
 
-.align 2 
-ow_frames_objekt_0009:
-.word ow_objekt_0009Tiles+(0*0x80)
+.align 2
+ow_frames_objekt_0008:
+.word ow_objekt_0008Tiles+(0*0x80)
 .hword 0x80
 .hword 0x0
-.word ow_objekt_0009Tiles+(0*0x80)
+.word ow_objekt_0008Tiles+(0*0x80)
 .hword 0x80
 .hword 0x0
-.word ow_objekt_0009Tiles+(0*0x80)
+.word ow_objekt_0008Tiles+(0*0x80)
 .hword 0x80
 .hword 0x0
-.word ow_objekt_0009Tiles+(1*0x80)
+.word ow_objekt_0008Tiles+(1*0x80)
 .hword 0x80
 .hword 0x0
-.word ow_objekt_0009Tiles+(2*0x80)
+.word ow_objekt_0008Tiles+(2*0x80)
 .hword 0x80
 .hword 0x0
-.word ow_objekt_0009Tiles+(1*0x80)
+.word ow_objekt_0008Tiles+(1*0x80)
 .hword 0x80
 .hword 0x0
-.word ow_objekt_0009Tiles+(2*0x80)
+.word ow_objekt_0008Tiles+(2*0x80)
 .hword 0x80
 .hword 0x0
-.word ow_objekt_0009Tiles+(1*0x80)
+.word ow_objekt_0008Tiles+(1*0x80)
 .hword 0x80
 .hword 0x0
-.word ow_objekt_0009Tiles+(2*0x80)
+.word ow_objekt_0008Tiles+(2*0x80)
 .hword 0x80
 .hword 0x0
 
-.align 2 
-ow_frames_objekt_0010:
-.word ow_objekt_0010Tiles+(0*0x80)
+.align 2
+ow_frames_objekt_0009:
+.word ow_objekt_0009Tiles+(0*0x80)
 .hword 0x80
 .hword 0x0
 
-.align 2 
-ow_frames_objekt_0011:
-.word ow_objekt_0011Tiles+(0*0x80)
+.align 2
+ow_frames_objekt_0010:
+.word ow_objekt_0010Tiles+(0*0x80)
 .hword 0x80
 .hword 0x0
 
-.align 2 
-ow_frames_objekt_0012:
-.word ow_objekt_0012Tiles+(0*0x800)
+.align 2
+ow_frames_objekt_0011:
+.word ow_objekt_0011Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0012Tiles+(0*0x800)
+.word ow_objekt_0011Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0012Tiles+(0*0x800)
+.word ow_objekt_0011Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0012Tiles+(0*0x800)
+.word ow_objekt_0011Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0012Tiles+(0*0x800)
+.word ow_objekt_0011Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0012Tiles+(0*0x800)
+.word ow_objekt_0011Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0012Tiles+(0*0x800)
+.word ow_objekt_0011Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0012Tiles+(0*0x800)
+.word ow_objekt_0011Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0012Tiles+(0*0x800)
+.word ow_objekt_0011Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
 
-.align 2 
-ow_frames_objekt_0013:
-.word ow_objekt_0013Tiles+(0*0x1000)
+.align 2
+ow_frames_objekt_0012:
+.word ow_objekt_0012Tiles+(0*0x1000)
 .hword 0x1000
 .hword 0x0
-.word ow_objekt_0013Tiles+(0*0x1000)
+.word ow_objekt_0012Tiles+(0*0x1000)
 .hword 0x1000
 .hword 0x0
-.word ow_objekt_0013Tiles+(0*0x1000)
+.word ow_objekt_0012Tiles+(0*0x1000)
 .hword 0x1000
 .hword 0x0
-.word ow_objekt_0013Tiles+(0*0x1000)
+.word ow_objekt_0012Tiles+(0*0x1000)
 .hword 0x1000
 .hword 0x0
-.word ow_objekt_0013Tiles+(0*0x1000)
+.word ow_objekt_0012Tiles+(0*0x1000)
 .hword 0x1000
 .hword 0x0
-.word ow_objekt_0013Tiles+(0*0x1000)
+.word ow_objekt_0012Tiles+(0*0x1000)
 .hword 0x1000
 .hword 0x0
-.word ow_objekt_0013Tiles+(0*0x1000)
+.word ow_objekt_0012Tiles+(0*0x1000)
 .hword 0x1000
 .hword 0x0
-.word ow_objekt_0013Tiles+(0*0x1000)
+.word ow_objekt_0012Tiles+(0*0x1000)
 .hword 0x1000
 .hword 0x0
-.word ow_objekt_0013Tiles+(0*0x1000)
+.word ow_objekt_0012Tiles+(0*0x1000)
 .hword 0x1000
 .hword 0x0
 
-.align 2 
-ow_frames_objekt_0014:
-.word ow_objekt_0014Tiles+(0*0x800)
+.align 2
+ow_frames_objekt_0013:
+.word ow_objekt_0013Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0014Tiles+(0*0x800)
+.word ow_objekt_0013Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0014Tiles+(0*0x800)
+.word ow_objekt_0013Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0014Tiles+(1*0x800)
+.word ow_objekt_0013Tiles+(1*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0014Tiles+(2*0x800)
+.word ow_objekt_0013Tiles+(2*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0014Tiles+(1*0x800)
+.word ow_objekt_0013Tiles+(1*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0014Tiles+(2*0x800)
+.word ow_objekt_0013Tiles+(2*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0014Tiles+(1*0x800)
+.word ow_objekt_0013Tiles+(1*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0014Tiles+(2*0x800)
+.word ow_objekt_0013Tiles+(2*0x800)
 .hword 0x800
 .hword 0x0
 
-.align 2 
-ow_frames_objekt_0015:
-.word ow_objekt_0015Tiles+(0*0x800)
+.align 2
+ow_frames_objekt_0014:
+.word ow_objekt_0014Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0015Tiles+(1*0x800)
+.word ow_objekt_0014Tiles+(1*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0015Tiles+(2*0x800)
+.word ow_objekt_0014Tiles+(2*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0015Tiles+(3*0x800)
+.word ow_objekt_0014Tiles+(3*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0015Tiles+(4*0x800)
+.word ow_objekt_0014Tiles+(4*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0015Tiles+(5*0x800)
+.word ow_objekt_0014Tiles+(5*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0015Tiles+(6*0x800)
+.word ow_objekt_0014Tiles+(6*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0015Tiles+(7*0x800)
+.word ow_objekt_0014Tiles+(7*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0015Tiles+(8*0x800)
+.word ow_objekt_0014Tiles+(8*0x800)
 .hword 0x800
 .hword 0x0
 
-.align 2 
-ow_frames_objekt_0016:
-.word ow_objekt_0016Tiles+(0*0x200)
+.align 2
+ow_frames_objekt_0015:
+.word ow_objekt_0015Tiles+(0*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_objekt_0016Tiles+(1*0x200)
+.word ow_objekt_0015Tiles+(1*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_objekt_0016Tiles+(2*0x200)
+.word ow_objekt_0015Tiles+(2*0x200)
 .hword 0x200
 .hword 0x0
-.word ow_objekt_0016Tiles+(3*0x200)
+.word ow_objekt_0015Tiles+(3*0x200)
 .hword 0x200
 .hword 0x0
 
-.align 2 
+.align 2
+ow_frames_objekt_0016:
+.word ow_objekt_0016Tiles+(0*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0016Tiles+(1*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0016Tiles+(2*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0016Tiles+(3*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0016Tiles+(4*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0016Tiles+(5*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0016Tiles+(6*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0016Tiles+(7*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0016Tiles+(8*0x800)
+.hword 0x800
+.hword 0x0
+
+.align 2
 ow_frames_objekt_0017:
 .word ow_objekt_0017Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0017Tiles+(1*0x800)
+.word ow_objekt_0017Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0017Tiles+(2*0x800)
+.word ow_objekt_0017Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0017Tiles+(3*0x800)
+.word ow_objekt_0017Tiles+(1*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0017Tiles+(4*0x800)
+.word ow_objekt_0017Tiles+(2*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0017Tiles+(5*0x800)
+.word ow_objekt_0017Tiles+(1*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0017Tiles+(6*0x800)
+.word ow_objekt_0017Tiles+(2*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0017Tiles+(7*0x800)
+.word ow_objekt_0017Tiles+(1*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0017Tiles+(8*0x800)
+.word ow_objekt_0017Tiles+(2*0x800)
 .hword 0x800
 .hword 0x0
 
-.align 2 
+.align 2
 ow_frames_objekt_0018:
 .word ow_objekt_0018Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0018Tiles+(0*0x800)
+
+.align 2
+ow_frames_objekt_0019:
+.word ow_objekt_0019Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0018Tiles+(0*0x800)
+.word ow_objekt_0019Tiles+(1*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0018Tiles+(1*0x800)
+.word ow_objekt_0019Tiles+(2*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0018Tiles+(2*0x800)
+.word ow_objekt_0019Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0018Tiles+(1*0x800)
+.word ow_objekt_0019Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0018Tiles+(2*0x800)
+.word ow_objekt_0019Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0018Tiles+(1*0x800)
+.word ow_objekt_0019Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-.word ow_objekt_0018Tiles+(2*0x800)
+.word ow_objekt_0019Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
-
-.align 2 
-ow_frames_objekt_0019:
 .word ow_objekt_0019Tiles+(0*0x800)
 .hword 0x800
 .hword 0x0
 
-.align 2 
+.align 2
 ow_frames_objekt_0020:
 .word ow_objekt_0020Tiles+(0*0x800)
 .hword 0x800
@@ -16470,7 +16471,7 @@ ow_frames_objekt_0020:
 .hword 0x800
 .hword 0x0
 
-.align 2 
+.align 2
 ow_frames_objekt_0021:
 .word ow_objekt_0021Tiles+(0*0x800)
 .hword 0x800

data/overworld/overworld_tables.s

@@ -13,7 +13,7 @@ ow_second_table:
 ow_third_table:
     .word ow_maintable_3
 ow_fourth_table:
-    .word ow_maintable_3
+    .word ow_maintable_4
 
 .align 2
 ow_maintable_1:

data/pkmn_tables/pokemon_moveset_table.s

@@ -31210,10 +31210,10 @@ moveset_891:
 moveset_892:
 .hword 0x2B
 .byte 0x1
-.hword 0x23
+.hword 0x1
 .byte 0x1
-.hword 0x95 
-.byte 0x5
+.hword 0x95
+.byte 0x7
 .hword 0xDB 
 .byte 0x8
 .hword 0x1F4 
@@ -31341,8 +31341,8 @@ moveset_895:
 .byte 0x1
 .hword 0x21
 .byte 0x1
-.hword 0x95 
-.byte 0x5
+.hword 0x95
+.byte 0x7
 .hword 0xDB 
 .byte 0x8
 .hword 0x1F4 

sots-private

@@ -1 +1 @@
-Subproject commit 6143505d348bfe059d453e14a0e76d455bafd76e
+Subproject commit d079c6e188441e30e40c0fd7bd84fe7c420d7a66