sots-privat: Overworlds sortiert, aber 4. Table noch nicht hinzugefügt, Sbird kümmert sich drum, make baut daher noch nicht, bitte gedulden. Zusätzlich Trainerdaten sowie Wilde Pokémon Daten gefixt, aber noch nicht getestet

battle_engine

-Subproject commit 4a4fb7ac2ac3def1d4270796bdd2c04e8231d382
+Subproject commit a201b518834f0208efdb82ac95b08675f5279950

data/overworld/wild_pokemon_data.s

 .word 0x0, water_data_1, 0x0, fishing_data_1
 .byte 0x1, 0x0, 0x0, 0x0
 .word grass_data_2, water_data_2, 0x0, fishing_data_2
-.byte 0x1, 0x2, 0x0, 0x0
+.byte 0x1, 0x1, 0x0, 0x0
 .word grass_data_3, water_data_3, 0x0, fishing_data_3
-.byte 0x1, 0x4, 0x0, 0x0
+.byte 0x1, 0x2, 0x0, 0x0
 .word grass_data_4, water_data_4, 0x0, fishing_data_4
-.byte 0x4, 0x1, 0x0, 0x0
+.byte 0x1, 0x4, 0x0, 0x0
 .word grass_data_5, water_data_5, 0x0, fishing_data_5
-.byte 0x4, 0x2, 0x0, 0x0
+.byte 0x4, 0x1, 0x0, 0x0
 .word grass_data_6, water_data_6, 0x0, fishing_data_6
-.byte 0x4, 0x3, 0x0, 0x0
+.byte 0x4, 0x2, 0x0, 0x0
 .word 0x0, water_data_7, 0x0, fishing_data_7
-.byte 0x4, 0x4, 0x0, 0x0
+.byte 0x4, 0x3, 0x0, 0x0
 .word grass_data_8, water_data_8, 0x0, fishing_data_8
-.byte 0x4, 0x5, 0x0, 0x0
+.byte 0x4, 0x4, 0x0, 0x0
 .word grass_data_9, 0x0, 0x0, 0x0
-.byte 0x4, 0x6, 0x0, 0x0
+.byte 0x4, 0x5, 0x0, 0x0
 .word 0x0, water_data_10, 0x0, fishing_data_10
-.byte 0x4, 0x7, 0x0, 0x0
+.byte 0x4, 0x6, 0x0, 0x0
 .word grass_data_11, water_data_11, 0x0, fishing_data_11
-.byte 0x4, 0x10, 0x0, 0x0
+.byte 0x4, 0x7, 0x0, 0x0
 .word grass_data_12, 0x0, 0x0, 0x0
-.byte 0x4, 0x11, 0x0, 0x0
+.byte 0x4, 0x8, 0x0, 0x0
 .word grass_data_13, water_data_13, 0x0, fishing_data_13
-.byte 0x6, 0x0, 0x0, 0x0
+.byte 0x4, 0x9, 0x0, 0x0
 .word grass_data_14, water_data_14, 0x0, fishing_data_14
-.byte 0x6, 0x1, 0x0, 0x0
+.byte 0x4, 0xE, 0x0, 0x0
 .word grass_data_15, 0x0, 0x0, 0x0
-.byte 0x6, 0x2, 0x0, 0x0
+.byte 0x4, 0xF, 0x0, 0x0
 .word grass_data_16, 0x0, 0x0, 0x0
-.byte 0x6, 0x3, 0x0, 0x0
+.byte 0x4, 0x10, 0x0, 0x0
 .word grass_data_17, water_data_17, 0x0, fishing_data_17
-.byte 0x6, 0x4, 0x0, 0x0
+.byte 0x4, 0x11, 0x0, 0x0
 .word grass_data_18, 0x0, 0x0, 0x0
-.byte 0x4, 0x8, 0x0, 0x0
+.byte 0x6, 0x0, 0x0, 0x0
 .word grass_data_19, 0x0, 0x0, 0x0
-.byte 0x4, 0x9, 0x0, 0x0
+.byte 0x6, 0x1, 0x0, 0x0
 .word grass_data_20, 0x0, 0x0, 0x0
-.byte 0x4, 0xE, 0x0, 0x0
+.byte 0x6, 0x2, 0x0, 0x0
 .word grass_data_21, 0x0, 0x0, 0x0
-.byte 0x4, 0xF, 0x0, 0x0
+.byte 0x6, 0x3, 0x0, 0x0
 .word grass_data_22, 0x0, 0x0, 0x0
-.byte 0x1, 0x1, 0x0, 0x0
+.byte 0x6, 0x4, 0x0, 0x0
 .word grass_data_23, 0x0, 0x0, 0x0
 .byte 0x6, 0x5, 0x0, 0x0
 .word grass_data_24, 0x0, 0x0, 0x0

data/pkmn_tables/pokemon_moveset_table.s

 
 .align 2
 moveset_892:
-.hword 0x15A 
+.hword 0x2B
 .byte 0x1
-.hword 0x10E 
+.hword 0x23
 .byte 0x1
 .hword 0x95 
 .byte 0x5
 
 .align 2
 moveset_895:
-.hword 0xB6 
+.hword 0x2D
 .byte 0x1
-.hword 0x10E 
+.hword 0x21
 .byte 0x1
 .hword 0x95 
 .byte 0x5

data/trainer/trainer_pkmn_data.s

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

sots-private

-Subproject commit d4558f3477b4d6bf47fb733a18f6f1af8933b513
+Subproject commit deea4a395ec7adf578c06a49929c8fabcc642b58