Paar Fixes, wie OWs, Scripts etc.

data/overworld/overworld_data.s

 
 .align 2
 ow_data_poke_0089:
-.hword 0xFFFF, 0xC159, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
+.hword 0xFFFF, 0xC159, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_0089, 0x8231CFC
 
 .align 2

data/overworld/overworld_frames.s

 
 .align 2 
 ow_frames_poke_0089:
-.word ow_poke_0089Tiles+(0*0x200)
-.hword 0x200
+.word ow_poke_0089Tiles+(0*0x800)
+.hword 0x800
 .hword 0x0
-.word ow_poke_0089Tiles+(1*0x200)
-.hword 0x200
+.word ow_poke_0089Tiles+(1*0x800)
+.hword 0x800
 .hword 0x0
-.word ow_poke_0089Tiles+(2*0x200)
-.hword 0x200
+.word ow_poke_0089Tiles+(2*0x800)
+.hword 0x800
 .hword 0x0
-.word ow_poke_0089Tiles+(3*0x200)
-.hword 0x200
+.word ow_poke_0089Tiles+(3*0x800)
+.hword 0x800
 .hword 0x0
-.word ow_poke_0089Tiles+(4*0x200)
-.hword 0x200
+.word ow_poke_0089Tiles+(4*0x800)
+.hword 0x800
 .hword 0x0
-.word ow_poke_0089Tiles+(5*0x200)
-.hword 0x200
+.word ow_poke_0089Tiles+(5*0x800)
+.hword 0x800
 .hword 0x0
-.word ow_poke_0089Tiles+(6*0x200)
-.hword 0x200
+.word ow_poke_0089Tiles+(6*0x800)
+.hword 0x800
 .hword 0x0
-.word ow_poke_0089Tiles+(7*0x200)
-.hword 0x200
+.word ow_poke_0089Tiles+(7*0x800)
+.hword 0x800
 .hword 0x0
-.word ow_poke_0089Tiles+(8*0x200)
-.hword 0x200
+.word ow_poke_0089Tiles+(8*0x800)
+.hword 0x800
 .hword 0x0
 
 .align 2 

data/pkmn_tables/pokemon_stats.s

 .hword 0, 259
 .byte 127, 40, 70, 1, 14, 14, 0, 43, 0, 7, 0, 0
 
-.byte 75, 110, 125, 85, 100, 105, 16, 1, 45, 270, 192, 0
+.byte 75, 110, 125, 85, 100, 105, 16, 1, 45, 255, 192, 0
 .hword 259, 0
 .byte 127, 40, 70, 1, 14, 14, 0, 43, 0, 7, 0, 0
 

data/trainer/trainer_pkmn_data.s

 .align 2
+
 .text
+
 .thumb
 
-.align 2
 .global pokemon_von_id_1
+.global pokemon_von_id_2
+.global pokemon_von_id_3
+.global pokemon_von_id_4
+.global pokemon_von_id_5
+.global pokemon_von_id_6
+.global pokemon_von_id_7
+.global pokemon_von_id_8
+.global pokemon_von_id_9
+.global pokemon_von_id_10
+.global pokemon_von_id_11
+.global pokemon_von_id_12
+.global pokemon_von_id_13
+.global pokemon_von_id_14
+.global pokemon_von_id_15
+.global pokemon_von_id_16
+.global pokemon_von_id_17
+.global pokemon_von_id_18
+.global pokemon_von_id_19
+.global pokemon_von_id_20
+.global pokemon_von_id_21
+.global pokemon_von_id_22
+.global pokemon_von_id_23
+.global pokemon_von_id_24
+.global pokemon_von_id_25
+.global pokemon_von_id_26
+.global pokemon_von_id_27
+.global pokemon_von_id_28
+.global pokemon_von_id_29
+.global pokemon_von_id_30
+.global pokemon_von_id_31
+.global pokemon_von_id_32
+.global pokemon_von_id_33
+.global pokemon_von_id_34
+.global pokemon_von_id_35
+.global pokemon_von_id_36
+.global pokemon_von_id_37
+.global pokemon_von_id_38
+.global pokemon_von_id_39
+.global pokemon_von_id_40
+.global pokemon_von_id_41
+.global pokemon_von_id_42
+.global pokemon_von_id_43
+.global pokemon_von_id_44
+.global pokemon_von_id_45
+.global pokemon_von_id_46
+.global pokemon_von_id_47
+.global pokemon_von_id_48
+.global pokemon_von_id_49
+.global pokemon_von_id_50
+.global pokemon_von_id_51
+.global pokemon_von_id_52
+.global pokemon_von_id_53
+.global pokemon_von_id_54
+.global pokemon_von_id_55
+.global pokemon_von_id_56
+.global pokemon_von_id_57
+.global pokemon_von_id_58
+.global pokemon_von_id_59
+.global pokemon_von_id_60
+.global pokemon_von_id_61
+.global pokemon_von_id_62
+.global pokemon_von_id_63
+.global pokemon_von_id_64
+.global pokemon_von_id_65
+.global pokemon_von_id_66
+.global pokemon_von_id_67
+.global pokemon_von_id_68
+.global pokemon_von_id_69
+.global pokemon_von_id_70
+.global pokemon_von_id_71
+.global pokemon_von_id_72
+.global pokemon_von_id_73
+.global pokemon_von_id_74
+.global pokemon_von_id_75
+.global pokemon_von_id_76
+.global pokemon_von_id_77
+.global pokemon_von_id_78
+.global pokemon_von_id_79
+.global pokemon_von_id_80
+.global pokemon_von_id_81
+.global pokemon_von_id_82
+.global pokemon_von_id_83
+.global pokemon_von_id_84
+.global pokemon_von_id_85
+.global pokemon_von_id_86
+.global pokemon_von_id_87
+.global pokemon_von_id_88
+.global pokemon_von_id_89
+.global pokemon_von_id_90
+.global pokemon_von_id_91
+.global pokemon_von_id_92
+.global pokemon_von_id_93
+
+.align 2
 pokemon_von_id_1:
 .hword 0, 4, 895, 0
 
 .align 2
-.global pokemon_von_id_2
 pokemon_von_id_2:
 .hword 20, 5, 895, 0
 
 .align 2
-.global pokemon_von_id_3
 pokemon_von_id_3:
 .hword 50, 5, 895, 139
 
 .align 2
-.global pokemon_von_id_4
 pokemon_von_id_4:
 .hword 0, 4, 892, 0
 
 .align 2
-.global pokemon_von_id_5
 pokemon_von_id_5:
 .hword 20, 5, 892, 0
 
 .align 2
-.global pokemon_von_id_6
 pokemon_von_id_6:
 .hword 50, 5, 892, 139
 
 .align 2
-.global pokemon_von_id_7
 pokemon_von_id_7:
 .hword 0, 4, 895, 0
 
 .align 2
-.global pokemon_von_id_8
 pokemon_von_id_8:
 .hword 20, 5, 895, 0
 
 .align 2
-.global pokemon_von_id_9
 pokemon_von_id_9:
 .hword 50, 5, 895, 139
 
 .align 2
-.global pokemon_von_id_10
 pokemon_von_id_10:
 .hword 0, 4, 892, 0
 
 .align 2
-.global pokemon_von_id_11
 pokemon_von_id_11:
 .hword 20, 5, 892, 0
 
 .align 2
-.global pokemon_von_id_12
 pokemon_von_id_12:
 .hword 50, 5, 892, 139
 
 .align 2
-.global pokemon_von_id_13
 pokemon_von_id_13:
 .hword 0, 3, 789, 0
 
 .align 2
-.global pokemon_von_id_14
 pokemon_von_id_14:
 .hword 20, 3, 789, 0
 .hword 20, 4, 787, 0
 
 .align 2
-.global pokemon_von_id_15
 pokemon_von_id_15:
 .hword 50, 3, 789, 0
 .hword 50, 4, 787, 0
 
 .align 2
-.global pokemon_von_id_16
 pokemon_von_id_16:
 .hword 0, 4, 13, 0
 .hword 0, 5, 10, 0
 
 .align 2
-.global pokemon_von_id_17
 pokemon_von_id_17:
 .hword 20, 4, 13, 0
 .hword 20, 5, 10, 0
 .hword 20, 5, 290, 0
 
 .align 2
-.global pokemon_von_id_18
 pokemon_von_id_18:
 .hword 50, 4, 13, 0
 .hword 50, 5, 10, 0
 .hword 50, 5, 290, 0
 
 .align 2
-.global pokemon_von_id_19
 pokemon_von_id_19:
 .hword 0, 4, 46, 0
 .hword 0, 5, 795, 0
 .hword 0, 5, 291, 0
 
 .align 2
-.global pokemon_von_id_20
 pokemon_von_id_20:
 .hword 20, 4, 46, 0
 .hword 20, 5, 795, 0
 .hword 20, 5, 291, 0
 
 .align 2
-.global pokemon_von_id_21
 pokemon_von_id_21:
 .hword 50, 4, 46, 0
 .hword 50, 5, 795, 0
 .hword 50, 6, 293, 0
 
 .align 2
-.global pokemon_von_id_22
 pokemon_von_id_22:
 .hword 0, 5, 84, 0
 .hword 0, 5, 456, 0
 
 .align 2
-.global pokemon_von_id_23
 pokemon_von_id_23:
 .hword 20, 5, 84, 0
 .hword 20, 5, 456, 0
 
 .align 2
-.global pokemon_von_id_24
 pokemon_von_id_24:
 .hword 50, 5, 84, 0
 .hword 50, 5, 456, 0
 .hword 50, 6, 564, 0
 
 .align 2
-.global pokemon_von_id_25
 pokemon_von_id_25:
 .hword 0, 6, 566, 0
 
 .align 2
-.global pokemon_von_id_26
 pokemon_von_id_26:
 .hword 20, 6, 566, 0
 
 .align 2
-.global pokemon_von_id_27
 pokemon_von_id_27:
 .hword 50, 6, 566, 0
 .hword 50, 6, 568, 0
 
 .align 2
-.global pokemon_von_id_28
 pokemon_von_id_28:
 .hword 0, 5, 301, 0
 .hword 0, 6, 11, 0
 
 .align 2
-.global pokemon_von_id_29
 pokemon_von_id_29:
 .hword 20, 5, 301, 10, 106, 71, 0
 .hword 20, 6, 11, 10, 81, 106, 0
 
 .align 2
-.global pokemon_von_id_30
 pokemon_von_id_30:
 .hword 50, 5, 301, 10, 106, 71, 0
 .hword 50, 6, 11, 10, 81, 106, 0
 
 .align 2
-.global pokemon_von_id_31
 pokemon_von_id_31:
 .hword 0, 4, 165, 0
 .hword 0, 4, 14, 0
 .hword 0, 5, 293, 0
 
 .align 2
-.global pokemon_von_id_32
 pokemon_von_id_32:
-.hword 20, 4, 165, 0
-.hword 20, 4, 14, 0
-.hword 20, 5, 11, 0
-.hword 20, 5, 293, 0
+.hword 20, 4, 165, 33, 48, 0, 0
+.hword 20, 4, 14, 33, 81, 106, 0
+.hword 20, 5, 11, 33, 81, 106, 0
+.hword 20, 5, 293, 33, 81, 106, 0
 
 .align 2
-.global pokemon_von_id_33
 pokemon_von_id_33:
-.hword 50, 4, 165, 0
-.hword 50, 4, 14, 0
-.hword 50, 5, 11, 0
-.hword 50, 5, 293, 0
-.hword 50, 5, 291, 0
+.hword 50, 4, 165, 33, 48, 0, 0
+.hword 50, 4, 14, 33, 81, 106, 0
+.hword 50, 5, 11, 33, 81, 106, 0
+.hword 50, 5, 293, 33, 81, 106, 0
+.hword 50, 5, 291, 33, 81, 106, 0
 
 .align 2
-.global pokemon_von_id_34
 pokemon_von_id_34:
 .hword 0, 5, 109, 0
 .hword 0, 6, 506, 0
 
 .align 2
-.global pokemon_von_id_35
 pokemon_von_id_35:
 .hword 20, 5, 109, 0
 .hword 20, 6, 506, 0
 
 .align 2
-.global pokemon_von_id_36
 pokemon_von_id_36:
 .hword 50, 5, 109, 0
 .hword 50, 6, 506, 0
 
 .align 2
-.global pokemon_von_id_37
 pokemon_von_id_37:
 .hword 0, 5, 784, 0
 .hword 0, 6, 797, 0
 
 .align 2
-.global pokemon_von_id_38
 pokemon_von_id_38:
 .hword 20, 5, 784, 0
 .hword 20, 6, 797, 0
 
 .align 2
-.global pokemon_von_id_39
 pokemon_von_id_39:
 .hword 50, 5, 784, 0
 .hword 50, 6, 797, 0
 
 .align 2
-.global pokemon_von_id_40
 pokemon_von_id_40:
 .hword 0, 4, 459, 0
 .hword 0, 5, 306, 0
 .hword 0, 6, 452, 0
 
 .align 2
-.global pokemon_von_id_41
 pokemon_von_id_41:
 .hword 20, 4, 459, 0
 .hword 20, 5, 306, 0
 .hword 20, 6, 452, 0
 
 .align 2
-.global pokemon_von_id_42
 pokemon_von_id_42:
 .hword 50, 4, 459, 0
 .hword 50, 5, 306, 0
 .hword 50, 6, 452, 0
 
 .align 2
-.global pokemon_von_id_43
 pokemon_von_id_43:
 .hword 0, 7, 291, 0
 
 .align 2
-.global pokemon_von_id_44
 pokemon_von_id_44:
 .hword 20, 7, 291, 0
 
 .align 2
-.global pokemon_von_id_45
 pokemon_von_id_45:
 .hword 50, 8, 291, 0
 
 .align 2
-.global pokemon_von_id_46
 pokemon_von_id_46:
 .hword 0, 6, 167, 0
 .hword 0, 7, 386, 0
 
 .align 2
-.global pokemon_von_id_47
 pokemon_von_id_47:
 .hword 20, 6, 167, 0
 .hword 20, 7, 386, 0
 
 .align 2
-.global pokemon_von_id_48
 pokemon_von_id_48:
 .hword 50, 6, 167, 0
 .hword 50, 7, 386, 0
 
 .align 2
-.global pokemon_von_id_49
 pokemon_von_id_49:
 .hword 0, 6, 48, 0
 .hword 0, 7, 717, 0
 
 .align 2
-.global pokemon_von_id_50
 pokemon_von_id_50:
 .hword 20, 6, 48, 0
 .hword 20, 7, 717, 0
 
 .align 2
-.global pokemon_von_id_51
 pokemon_von_id_51:
 .hword 50, 6, 48, 0
 .hword 50, 7, 717, 0
 
 .align 2
-.global pokemon_von_id_52
 pokemon_von_id_52:
 .hword 0, 7, 293, 0
 
 .align 2
-.global pokemon_von_id_53
 pokemon_von_id_53:
 .hword 20, 7, 293, 0
 
 .align 2
-.global pokemon_von_id_54
 pokemon_von_id_54:
 .hword 50, 8, 293, 0
 
 .align 2
-.global pokemon_von_id_55
 pokemon_von_id_55:
 .hword 0, 5, 79, 0
 .hword 0, 6, 804, 0
 
 .align 2
-.global pokemon_von_id_56
 pokemon_von_id_56:
 .hword 20, 5, 79, 0
 .hword 20, 6, 804, 0
 
 .align 2
-.global pokemon_von_id_57
 pokemon_von_id_57:
 .hword 50, 5, 79, 0
 .hword 50, 6, 804, 0
 
 .align 2
-.global pokemon_von_id_58
 pokemon_von_id_58:
 .hword 0, 6, 512, 0
 .hword 0, 6, 765, 0
 .hword 60, 7, 220, 0
 
 .align 2
-.global pokemon_von_id_59
 pokemon_von_id_59:
 .hword 30, 7, 512, 0
 .hword 30, 7, 765, 0
 .hword 60, 8, 220, 0
 
 .align 2
-.global pokemon_von_id_60
 pokemon_von_id_60:
 .hword 60, 8, 512, 0
 .hword 60, 8, 765, 0
 .hword 60, 10, 215, 0
 
 .align 2
-.global pokemon_von_id_61
 pokemon_von_id_61:
 .hword 0, 7, 346, 0
 .hword 0, 7, 220, 0
 .hword 0, 8, 934, 0
 
 .align 2
-.global pokemon_von_id_62
 pokemon_von_id_62:
 .hword 30, 7, 346, 0
 .hword 30, 7, 220, 0
 .hword 30, 8, 934, 0
 
 .align 2
-.global pokemon_von_id_63
 pokemon_von_id_63:
 .hword 60, 8, 346, 0
 .hword 60, 8, 220, 0
 .hword 60, 9, 512, 0
 
 .align 2
-.global pokemon_von_id_64
 pokemon_von_id_64:
 .hword 0, 7, 341, 0
 .hword 0, 7, 635, 0
 .hword 0, 8, 936, 0
 
 .align 2
-.global pokemon_von_id_65
 pokemon_von_id_65:
 .hword 30, 7, 341, 0
 .hword 30, 7, 635, 0
 .hword 30, 8, 936, 0
 
 .align 2
-.global pokemon_von_id_66
 pokemon_von_id_66:
 .hword 60, 8, 341, 0
 .hword 60, 8, 635, 0
 .hword 60, 9, 215, 0
 
 .align 2
-.global pokemon_von_id_67
 pokemon_von_id_67:
 .hword 0, 9, 934, 0
 .hword 0, 10, 635, 0
 
 .align 2
-.global pokemon_von_id_68
 pokemon_von_id_68:
 .hword 30, 9, 934, 0
 .hword 30, 10, 635, 0
 
 .align 2
-.global pokemon_von_id_69
 pokemon_von_id_69:
 .hword 60, 9, 934, 0
 .hword 60, 10, 635, 0
 .hword 60, 10, 512, 0
 
 .align 2
-.global pokemon_von_id_70
 pokemon_von_id_70:
 .hword 0, 9, 936, 0
 .hword 0, 10, 765, 0
 
 .align 2
-.global pokemon_von_id_71
 pokemon_von_id_71:
 .hword 30, 9, 936, 0
 .hword 30, 10, 765, 0
 
 .align 2
-.global pokemon_von_id_72
 pokemon_von_id_72:
 .hword 60, 9, 936, 0
 .hword 60, 10, 765, 0
 .hword 60, 10, 215, 0
 
 .align 2
-.global pokemon_von_id_73
 pokemon_von_id_73:
 .hword 0, 10, 346, 0
 .hword 0, 10, 341, 0
 
 .align 2
-.global pokemon_von_id_74
 pokemon_von_id_74:
 .hword 30, 10, 346, 0
 .hword 30, 10, 341, 0
 
 .align 2
-.global pokemon_von_id_75
 pokemon_von_id_75:
 .hword 60, 10, 346, 0
 .hword 60, 10, 341, 0
 .hword 60, 11, 934, 0
 
 .align 2
-.global pokemon_von_id_76
 pokemon_von_id_76:
 .hword 0, 10, 86, 0
 .hword 0, 11, 666, 0
 
 .align 2
-.global pokemon_von_id_77
 pokemon_von_id_77:
 .hword 30, 10, 86, 0
 .hword 30, 11, 666, 0
 
 .align 2
-.global pokemon_von_id_78
 pokemon_von_id_78:
 .hword 60, 10, 86, 0
 .hword 60, 11, 666, 0
 .hword 60, 11, 936, 0
 
 .align 2
-.global pokemon_von_id_79
 pokemon_von_id_79:
 .hword 0, 9, 220, 0
 .hword 0, 10, 792, 0
 .hword 0, 10, 512, 0
 
 .align 2
-.global pokemon_von_id_80
 pokemon_von_id_80:
 .hword 30, 9, 220, 0
 .hword 30, 10, 792, 0
 .hword 30, 10, 512, 0
 
 .align 2
-.global pokemon_von_id_81
 pokemon_von_id_81:
 .hword 60, 9, 220, 0
 .hword 60, 10, 792, 0
 .hword 60, 11, 635, 0
 
 .align 2
-.global pokemon_von_id_82
 pokemon_von_id_82:
 .hword 0, 9, 238, 0
 .hword 0, 10, 936, 0
 .hword 0, 10, 346, 0
 
 .align 2
-.global pokemon_von_id_83
 pokemon_von_id_83:
 .hword 30, 9, 238, 0
 .hword 30, 10, 936, 0
 .hword 30, 10, 346, 0
 
 .align 2
-.global pokemon_von_id_84
 pokemon_von_id_84:
 .hword 60, 9, 238, 0
 .hword 60, 10, 936, 0
 .hword 60, 11, 666, 0
 
 .align 2
-.global pokemon_von_id_85
 pokemon_von_id_85:
 .hword 30, 10, 225, 0
 .hword 30, 11, 220, 0
 .hword 30, 14, 385, 0
 
 .align 2
-.global pokemon_von_id_86
 pokemon_von_id_86:
 .hword 60, 10, 225, 0
 .hword 60, 11, 220, 0
 .hword 60, 14, 385, 0
 
 .align 2
-.global pokemon_von_id_87
 pokemon_von_id_87:
 .hword 100, 11, 225, 258, 217, 420, 252
 .hword 100, 12, 220, 258, 189, 246, 333
 .hword 100, 15, 91, 258, 182, 41, 350
 
 .align 2
-.global pokemon_von_id_88
 pokemon_von_id_88:
 .hword 0, 10, 635, 0
 .hword 0, 11, 341, 0
 
 .align 2
-.global pokemon_von_id_89
 pokemon_von_id_89:
 .hword 30, 10, 635, 0
 .hword 30, 11, 341, 0
 
 .align 2
-.global pokemon_von_id_90
 pokemon_von_id_90:
 .hword 60, 10, 635, 0
 .hword 60, 11, 341, 0
 .hword 60, 11, 751, 0
 
 .align 2
-.global pokemon_von_id_91
 pokemon_von_id_91:
 .hword 0, 10, 220, 0
 .hword 0, 11, 238, 0
 
 .align 2
-.global pokemon_von_id_92
 pokemon_von_id_92:
 .hword 30, 10, 220, 0
 .hword 30, 11, 238, 0
 
 .align 2
-.global pokemon_von_id_93
 pokemon_von_id_93:
 .hword 60, 10, 220, 0
 .hword 60, 11, 238, 0

sots-private

-Subproject commit 6c9c96e663aaaca5f1602d7bcf3442e0f42fbe76
+Subproject commit 24dcc0d5ff2d694b7e8a2d252ca79005c2d5924f

src/include/script_language.h

 #include <applymovements.h>
 #include <mugssprites.h>
 #include <battlescreen.h>
+#include <script_constant.h>
 
 @@ Costum Specials
 .equ SP_BATCHMAPTILE, 0x7
 
 @@ Custom commands
 
-.macro batchmaptile batchmaptile_tiles_from:req batchmaptile_tiles_to:req batchmaptile_kollision_from:req batchmaptile_kollision_to:req
+.macro batchmaptilefromto batchmaptile_tiles_from:req batchmaptile_tiles_to:req batchmaptile_kollision_from:req batchmaptile_kollision_to:req
 setvar 0x8000 \batchmaptile_tiles_from
 setvar 0x8001 \batchmaptile_tiles_to
 setvar 0x8002 \batchmaptile_kollision_from
 special 0x68
 .endm
 
+.macro batchmaptiletofrom batchmaptile_tiles_from:req batchmaptile_tiles_to:req batchmaptile_kollision_from:req batchmaptile_kollision_to:req
+setvar 0x8001 \batchmaptile_tiles_from
+setvar 0x8002 \batchmaptile_tiles_to
+setvar 0x8003 \batchmaptile_kollision_from
+setvar 0x8002 \batchmaptile_kollision_to
+setvar 0x5006 SP_BATCHMAPTILE
+special 0x68
+.endm
+
 .macro sethiddenflags
 call sethiddenflagsall
 .endm