DragonflySotS 6 years ago
parent
commit
e7c0c5bb40
2 changed files with 30 additions and 10 deletions
  1. 29
    9
      data/trainer/trainer_pkmn_data.s
  2. 1
    1
      sots-private

+ 29
- 9
data/trainer/trainer_pkmn_data.s View File

@@ -1608,6 +1608,7 @@ trainer_pkmn_data:
1608 1608
 @@ PKMN Daten der Trainer
1609 1609
 @@ --------------------------------------------------------------------------------------------
1610 1610
 
1611
+
1611 1612
 .align 2
1612 1613
 pokemon_von_id_1:
1613 1614
 .hword 0
@@ -1921,6 +1922,7 @@ pokemon_von_id_29:
1921 1922
 .hword MOVE_HAERTNER
1922 1923
 .hword MOVE_ABSORBER
1923 1924
 .hword MOVE_KEINS
1925
+.hword 0x0
1924 1926
 .hword 20
1925 1927
 .hword 6
1926 1928
 .hword PKMN_SAFCON
@@ -1928,6 +1930,7 @@ pokemon_von_id_29:
1928 1930
 .hword MOVE_FADENSCHUSS
1929 1931
 .hword MOVE_HAERTNER
1930 1932
 .hword MOVE_KEINS
1933
+.hword 0x0
1931 1934
 .hword 0xFFFF
1932 1935
 
1933 1936
 .align 2
@@ -1939,6 +1942,7 @@ pokemon_von_id_30:
1939 1942
 .hword MOVE_HAERTNER
1940 1943
 .hword MOVE_ABSORBER
1941 1944
 .hword MOVE_KEINS
1945
+.hword 0x0
1942 1946
 .hword 50
1943 1947
 .hword 6
1944 1948
 .hword PKMN_SAFCON
@@ -1946,6 +1950,7 @@ pokemon_von_id_30:
1946 1950
 .hword MOVE_FADENSCHUSS
1947 1951
 .hword MOVE_HAERTNER
1948 1952
 .hword MOVE_KEINS
1953
+.hword 0x0
1949 1954
 .hword 0xFFFF
1950 1955
 
1951 1956
 .align 2
@@ -1977,6 +1982,7 @@ pokemon_von_id_32:
1977 1982
 .hword MOVE_SUPERSCHALL
1978 1983
 .hword MOVE_KEINS
1979 1984
 .hword MOVE_KEINS
1985
+.hword 0x0
1980 1986
 .hword 20
1981 1987
 .hword 4
1982 1988
 .hword PKMN_KOKUNA
@@ -1984,6 +1990,7 @@ pokemon_von_id_32:
1984 1990
 .hword MOVE_FADENSCHUSS
1985 1991
 .hword MOVE_HAERTNER
1986 1992
 .hword MOVE_KEINS
1993
+.hword 0x0
1987 1994
 .hword 20
1988 1995
 .hword 5
1989 1996
 .hword PKMN_SAFCON
@@ -1991,6 +1998,7 @@ pokemon_von_id_32:
1991 1998
 .hword MOVE_FADENSCHUSS
1992 1999
 .hword MOVE_HAERTNER
1993 2000
 .hword MOVE_KEINS
2001
+.hword 0x0
1994 2002
 .hword 20
1995 2003
 .hword 5
1996 2004
 .hword PKMN_PANEKON
@@ -1998,6 +2006,7 @@ pokemon_von_id_32:
1998 2006
 .hword MOVE_FADENSCHUSS
1999 2007
 .hword MOVE_HAERTNER
2000 2008
 .hword MOVE_KEINS
2009
+.hword 0x0
2001 2010
 .hword 0xFFFF
2002 2011
 
2003 2012
 .align 2
@@ -2009,6 +2018,7 @@ pokemon_von_id_33:
2009 2018
 .hword MOVE_SUPERSCHALL
2010 2019
 .hword MOVE_KEINS
2011 2020
 .hword MOVE_KEINS
2021
+.hword 0x0
2012 2022
 .hword 50
2013 2023
 .hword 4
2014 2024
 .hword PKMN_KOKUNA
@@ -2016,6 +2026,7 @@ pokemon_von_id_33:
2016 2026
 .hword MOVE_FADENSCHUSS
2017 2027
 .hword MOVE_HAERTNER
2018 2028
 .hword MOVE_KEINS
2029
+.hword 0x0
2019 2030
 .hword 50
2020 2031
 .hword 5
2021 2032
 .hword PKMN_SAFCON
@@ -2023,6 +2034,7 @@ pokemon_von_id_33:
2023 2034
 .hword MOVE_FADENSCHUSS
2024 2035
 .hword MOVE_HAERTNER
2025 2036
 .hword MOVE_KEINS
2037
+.hword 0x0
2026 2038
 .hword 50
2027 2039
 .hword 5
2028 2040
 .hword PKMN_PANEKON
@@ -2030,6 +2042,7 @@ pokemon_von_id_33:
2030 2042
 .hword MOVE_FADENSCHUSS
2031 2043
 .hword MOVE_HAERTNER
2032 2044
 .hword MOVE_KEINS
2045
+.hword 0x0
2033 2046
 .hword 50
2034 2047
 .hword 5
2035 2048
 .hword PKMN_SCHALOKO
@@ -2037,6 +2050,7 @@ pokemon_von_id_33:
2037 2050
 .hword MOVE_FADENSCHUSS
2038 2051
 .hword MOVE_HAERTNER
2039 2052
 .hword MOVE_KEINS
2053
+.hword 0x0
2040 2054
 .hword 0xFFFF
2041 2055
 
2042 2056
 .align 2
@@ -2079,11 +2093,11 @@ pokemon_von_id_36:
2079 2093
 pokemon_von_id_37:
2080 2094
 .hword 0
2081 2095
 .hword 5
2082
-.hword PKMN_PEPPECK
2096
+.hword PKMN_BURMY
2083 2097
 .hword 0x0
2084 2098
 .hword 0
2085 2099
 .hword 6
2086
-.hword PKMN_WUFFELS
2100
+.hword PKMN_ILLUMISE
2087 2101
 .hword 0x0
2088 2102
 .hword 0xFFFF
2089 2103
 
@@ -2091,11 +2105,11 @@ pokemon_von_id_37:
2091 2105
 pokemon_von_id_38:
2092 2106
 .hword 20
2093 2107
 .hword 5
2094
-.hword PKMN_PEPPECK
2108
+.hword PKMN_BURMY
2095 2109
 .hword 0x0
2096 2110
 .hword 20
2097 2111
 .hword 6
2098
-.hword PKMN_WUFFELS
2112
+.hword PKMN_ILLUMISE
2099 2113
 .hword 0x0
2100 2114
 .hword 0xFFFF
2101 2115
 
@@ -2103,11 +2117,11 @@ pokemon_von_id_38:
2103 2117
 pokemon_von_id_39:
2104 2118
 .hword 50
2105 2119
 .hword 5
2106
-.hword PKMN_PEPPECK
2120
+.hword PKMN_BURMY
2107 2121
 .hword 0x0
2108 2122
 .hword 50
2109 2123
 .hword 6
2110
-.hword PKMN_WUFFELS
2124
+.hword PKMN_ILLUMISE
2111 2125
 .hword 0x0
2112 2126
 .hword 0xFFFF
2113 2127
 
@@ -2255,7 +2269,7 @@ pokemon_von_id_51:
2255 2269
 pokemon_von_id_52:
2256 2270
 .hword 0
2257 2271
 .hword 7
2258
-.hword PKMN_PANEKON
2272
+.hword PKMN_FLEMMLI
2259 2273
 .hword 0x0
2260 2274
 .hword 0xFFFF
2261 2275
 
@@ -2263,7 +2277,7 @@ pokemon_von_id_52:
2263 2277
 pokemon_von_id_53:
2264 2278
 .hword 20
2265 2279
 .hword 7
2266
-.hword PKMN_PANEKON
2280
+.hword PKMN_FLEMMLI
2267 2281
 .hword 0x0
2268 2282
 .hword 0xFFFF
2269 2283
 
@@ -2271,7 +2285,7 @@ pokemon_von_id_53:
2271 2285
 pokemon_von_id_54:
2272 2286
 .hword 50
2273 2287
 .hword 8
2274
-.hword PKMN_PANEKON
2288
+.hword PKMN_FLEMMLI
2275 2289
 .hword 0x0
2276 2290
 .hword 0xFFFF
2277 2291
 
@@ -2788,6 +2802,7 @@ pokemon_von_id_87:
2788 2802
 .hword MOVE_GESCHENK
2789 2803
 .hword MOVE_EISSPLITTER
2790 2804
 .hword MOVE_MOGELHIEB
2805
+.hword 0x0
2791 2806
 .hword 100
2792 2807
 .hword 12
2793 2808
 .hword PKMN_QUIEKEL
@@ -2795,6 +2810,7 @@ pokemon_von_id_87:
2795 2810
 .hword MOVE_LEHMSCHELLE
2796 2811
 .hword MOVE_ANTIK_KRAFT
2797 2812
 .hword MOVE_EISSPEER
2813
+.hword 0x0
2798 2814
 .hword 100
2799 2815
 .hword 13
2800 2816
 .hword PKMN_ALOLA_SANDAN
@@ -2802,6 +2818,7 @@ pokemon_von_id_87:
2802 2818
 .hword MOVE_FROSTBEULE
2803 2819
 .hword MOVE_FLUCH
2804 2820
 .hword MOVE_METALLKLAUE
2821
+.hword 0x0
2805 2822
 .hword 100
2806 2823
 .hword 13
2807 2824
 .hword PKMN_ALOLA_VULPIX
@@ -2809,6 +2826,7 @@ pokemon_von_id_87:
2809 2826
 .hword MOVE_CHARME
2810 2827
 .hword MOVE_AUSSETZER
2811 2828
 .hword MOVE_KONFUSTRAHL
2829
+.hword 0x0
2812 2830
 .hword 100
2813 2831
 .hword 14
2814 2832
 .hword PKMN_FORMEO
@@ -2816,6 +2834,7 @@ pokemon_von_id_87:
2816 2834
 .hword MOVE_PULVERSCHNEE
2817 2835
 .hword MOVE_GLUT
2818 2836
 .hword MOVE_AQUAKNARRE
2837
+.hword 0x0
2819 2838
 .hword 100
2820 2839
 .hword 15
2821 2840
 .hword PKMN_AUSTOS
@@ -2823,6 +2842,7 @@ pokemon_von_id_87:
2823 2842
 .hword MOVE_SCHUTZSCHILD
2824 2843
 .hword MOVE_DUONADEL
2825 2844
 .hword MOVE_FELSWURF
2845
+.hword 0x0
2826 2846
 .hword 0xFFFF
2827 2847
 
2828 2848
 .align 2

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit 12a5cdcb5e1137388128f87cf989ea61a8aab898
1
+Subproject commit f8cdb3ed9b7d90044d7ac2fe0a66ed1bd5a1a71e