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

+ 1
- 1
sots-private

1
-Subproject commit 12a5cdcb5e1137388128f87cf989ea61a8aab898
1
+Subproject commit f8cdb3ed9b7d90044d7ac2fe0a66ed1bd5a1a71e