Karathan
/
source_of_the_sovereign
镜像来自 https://github.com/SBird1337/source_of_the_sovereign
關註 1
收藏 0
複製 0
程式碼 問題管理 版本發佈 0 Wiki Activity
瀏覽代碼

some more structures 

trainers currently not using items due to black cow magic
Philipp 7 年之前
父節點
2d00de3fd2
當前提交
89b302fb7f
共有 23 個文件被更改，包括 2664 次插入 和 1545 次删除
分割檢視 顯示文件統計
  1. 128
    128
      data/item/tm_hm_move_table.S
  2. 3
    3
      data/moves/move_data.S
  3. 954
    0
      data/overworld/wild_pokemon_data.S
  4. 1113
    1360
      data/pkmn_tables/pokemon_habitats.S
  5. 126
    0
      data/trainer/trainer_money_rate.s
  6. 19
    0
      data/trainer/trainer_pkmn_data.s
  7. 0
    0
      gfx_build/item/.gitignore
  8. 2
    0
      main.asm
  9. 42
    0
      nbproject/configurations.xml
  10. 8
    54
      nbproject/private/configurations.xml
  11. 0
    0
      patches/graphics/boot.asm
  12. 0
    0
      patches/graphics/char.asm
  13. 0
    0
      patches/graphics/title.asm
  14. 41
    0
      patches/overworlds/pkm_wild.asm
  15. 77
    0
      patches/trainer_sprites/trainer_data.asm
  16. 6
    0
      sprites.makefile
  17. 0
    0
      src/agb_debug/agb_debug.c
  18. 0
    0
      string/de/item_description.txt
  19. 0
    0
      string/de/pkmn_data/pokedex_data.txt
  20. 0
    0
      string/de/pkmn_data/pokedex_entries.txt
  21. 0
    0
      string/de/pkmn_data/pokemon_names.txt
  22. 25
    0
      string/de/trainers/trainer_data.txt
  23. 120
    0
      string/de/trainers/trainerclasses.txt

+ 128
- 128
data/item/tm_hm_move_table.S 查看文件 

@@ -6,131 +6,131 @@
6 6 
 @TODO: Use attack names to build table
7 7 
 .global tm_hm_move_table
8 8 
 tm_hm_move_table:
9 
-.hword	0x1BC
10 
-.hword	0x209
11 
-.hword	0x56
12 
-.hword	0x168
13 
-.hword	0xE
14 
-.hword	0x20A
15 
-.hword	0xF4
16 
-.hword	0x20B
17 
-.hword	0x20C
18 
-.hword	0x9D
19 
-.hword	0x194
20 
-.hword	0x20D
21 
-.hword	0x263
22 
-.hword	0x18E
23 
-.hword	0x8A
24 
-.hword	0x1BF
25 
-.hword	0xCF
26 
-.hword	0xD6
27 
-.hword	0x171
28 
-.hword	0xA4
29 
-.hword	0x1AE
30 
-.hword	0x1B1
31 
-.hword	0x210
32 
-.hword	0x122
33 
-.hword	0x22B
34 
-.hword	0x10B
35 
-.hword	0x18F
36 
-.hword	0x264
37 
-.hword	0x25D
38 
-.hword	0x24E
39 
-.hword	0x108
40 
-.hword	0x144
41 
-.hword	0x15F
42 
-.hword	0x160
43 
-.hword	0x114
44 
-.hword	0x1B9
45 
-.hword	0xCA
46 
-.hword	0x11B
47 
-.hword	0x1C2
48 
-.hword	0x7
49 
-.hword	0x9
50 
-.hword	0x8
51 
-.hword	0x199
52 
-.hword	0xC8
53 
-.hword	0x191
54 
-.hword	0xE7
55 
-.hword	0x211
56 
-.hword	0x1BA
57 
-.hword	0x1BE
58 
-.hword	0x19E
59 
-.hword	0xF
60 
-.hword	0x13
61 
-.hword	0x39
62 
-.hword	0x46
63 
-.hword	0x1AF
64 
-.hword	0xF9
65 
-.hword	0x7F
66 
-.hword	0x123
67 
-.hword	0x1D4
68 
-.hword	0x151
69 
-.hword	0x1D9
70 
-.hword	0x15B
71 
-.hword	0x2E
72 
-.hword	0x5C
73 
-.hword	0x102
74 
-.hword	0x153
75 
-.hword	0x1DA
76 
-.hword	0xED
77 
-.hword	0xF1
78 
-.hword	0x10D
79 
-.hword	0x3A
80 
-.hword	0x3B
81 
-.hword	0x3F
82 
-.hword	0x71
83 
-.hword	0xB6
84 
-.hword	0xF0
85 
-.hword	0x163
86 
-.hword	0xDB
87 
-.hword	0xDA
88 
-.hword	0x4C
89 
-.hword	0x1DF
90 
-.hword	0x55
91 
-.hword	0x57
92 
-.hword	0x59
93 
-.hword	0xD8
94 
-.hword	0x5B
95 
-.hword	0x5E
96 
-.hword	0xF7
97 
-.hword	0x118
98 
-.hword	0x68
99 
-.hword	0x73
100 
-.hword	0x1E2
101 
-.hword	0x35
102 
-.hword	0xBC
103 
-.hword	0xC9
104 
-.hword	0x7E
105 
-.hword	0x13D
106 
-.hword	0x14C
107 
-.hword	0x103
108 
-.hword	0x107
109 
-.hword	0x1E8
110 
-.hword	0x9C
111 
-.hword	0xD5
112 
-.hword	0xA8
113 
-.hword	0x1EA
114 
-.hword	0x1F0
115 
-.hword	0x1F1
116 
-.hword	0x13B
117 
-.hword	0xD3
118 
-.hword	0x19B
119 
-.hword	0x19C
120 
-.hword	0xCE
121 
-.hword	0x1F7
122 
-.hword	0x176
123 
-.hword	0x1C3
124 
-.hword	0x1FB
125 
-.hword	0x1FE
126 
-.hword	0x1FF
127 
-.hword	0x105
128 
-.hword	0x200
129 
-.hword	0x175
130 
-.hword	0x99
131 
-.hword	0x1A5
132 
-.hword	0x173
133 
-.hword	0x202
134 
-.hword	0x1A0
135 
-.hword	0x18D
136 
-.hword	0x94
9 
+.hword 0x1BC
10 
+.hword 0x209
11 
+.hword 0x56
12 
+.hword 0x168
13 
+.hword 0xE
14 
+.hword 0x13
15 
+.hword 0xF4
16 
+.hword 0x20B
17 
+.hword 0x20C
18 
+.hword 0x9D
19 
+.hword 0x194
20 
+.hword 0x20D
21 
+.hword 0x263
22 
+.hword 0x18E
23 
+.hword 0x8A
24 
+.hword 0x1BF
25 
+.hword 0xCF
26 
+.hword 0xD6
27 
+.hword 0x171
28 
+.hword 0xA4
29 
+.hword 0x1AE
30 
+.hword 0x1B1
31 
+.hword 0x210
32 
+.hword 0x39
33 
+.hword 0x22B
34 
+.hword 0x10B
35 
+.hword 0x18F
36 
+.hword 0x7F
37 
+.hword 0x25D
38 
+.hword 0x24E
39 
+.hword 0x264
40 
+.hword 0x122
41 
+.hword 0x144
42 
+.hword 0x15F
43 
+.hword 0x160
44 
+.hword 0x114
45 
+.hword 0x1B9
46 
+.hword 0xCA
47 
+.hword 0x1C2
48 
+.hword 0x7
49 
+.hword 0x9
50 
+.hword 0x8
51 
+.hword 0x199
52 
+.hword 0xC8
53 
+.hword 0x191
54 
+.hword 0xE7
55 
+.hword 0x211
56 
+.hword 0x1BA
57 
+.hword 0x1BE
58 
+.hword 0x19E
59 
+.hword 0x0
60 
+.hword 0x0
61 
+.hword 0x0
62 
+.hword 0x0
63 
+.hword 0x0
64 
+.hword 0x0
65 
+.hword 0x0
66 
+.hword 0x0
67 
+.hword 0x20E
68 
+.hword 0x151
69 
+.hword 0x1D9
70 
+.hword 0x15B
71 
+.hword 0x2E
72 
+.hword 0x5C
73 
+.hword 0x102
74 
+.hword 0x153
75 
+.hword 0x1DA
76 
+.hword 0xED
77 
+.hword 0xF1
78 
+.hword 0x10D
79 
+.hword 0x3A
80 
+.hword 0x3B
81 
+.hword 0x3F
82 
+.hword 0x71
83 
+.hword 0xB6
84 
+.hword 0xF0
85 
+.hword 0x163
86 
+.hword 0xDB
87 
+.hword 0xDA
88 
+.hword 0x4C
89 
+.hword 0x1DF
90 
+.hword 0x55
91 
+.hword 0x57
92 
+.hword 0x59
93 
+.hword 0xD8
94 
+.hword 0x8D
95 
+.hword 0x5E
96 
+.hword 0xF7
97 
+.hword 0x118
98 
+.hword 0x68
99 
+.hword 0x73
100 
+.hword 0x1E2
101 
+.hword 0x35
102 
+.hword 0xBC
103 
+.hword 0xC9
104 
+.hword 0x7E
105 
+.hword 0x13D
106 
+.hword 0x14C
107 
+.hword 0x103
108 
+.hword 0x107
109 
+.hword 0x1E8
110 
+.hword 0x9C
111 
+.hword 0xD5
112 
+.hword 0xA8
113 
+.hword 0x1EA
114 
+.hword 0x1F0
115 
+.hword 0x1F1
116 
+.hword 0x13B
117 
+.hword 0xD3
118 
+.hword 0x19B
119 
+.hword 0x19C
120 
+.hword 0xCE
121 
+.hword 0x1F7
122 
+.hword 0x176
123 
+.hword 0x1C3
124 
+.hword 0x1FB
125 
+.hword 0x2A3
126 
+.hword 0x1FF
127 
+.hword 0x105
128 
+.hword 0x200
129 
+.hword 0x175
130 
+.hword 0x99
131 
+.hword 0x1A5
132 
+.hword 0x173
133 
+.hword 0x29A
134 
+.hword 0x1A0
135 
+.hword 0x18D
136 
+.hword 0x2A4

+ 3
- 3
data/moves/move_data.S 查看文件 

@@ -159,7 +159,7 @@ move_table:
159 159 
 /*Blitz*/		move_data_148:	.byte		23,		0,		0,		100,		20,		0,		0,		0,		26,		0,		2,		0
160 160 
 /*Psywelle*/		move_data_149:	.byte		88,		1,		14,		100,		15,		0,		0,		0,		50,		0,		1,		0
161 161 
 /*Platscher*/		move_data_150:	.byte		85,		0,		0,		0,		40,		0,		16,		0,		0,		0,		2,		0
162 
-/*Saeurepanzer*/	move_data_151:	.byte		51,		0,		3,		0,		20,		,		0,		0,		4,		0,		2,		0
162 
+/*Saeurepanzer*/	move_data_151:	.byte		51,		0,		3,		0,		20,		0,		0,		0,		4,		0,		2,		0
163 163 
 /*Krabbhammer*/		move_data_152:	.byte		43,		100,		11,		90,		10,		0,		0,		0,		51,		0,		0,		0
164 164 
 /*Explosion*/		move_data_153:	.byte		7,		250,		0,		100,		5,		0,		32,		0,		50,		0,		0,		0
165 165 
 /*Kratzfurie*/		move_data_154:	.byte		29,		18,		0,		80,		15,		0,		0,		0,		51,		0,		0,		0
 
@@ -202,7 +202,7 @@ move_table:
202 202 
 /*Stachler*/		move_data_191:	.byte		0,		0,		4,		0,		20,		0,		64,		0,		56,		0,		2,		0
203 203 
 /*Blitzkanone*/		move_data_192:	.byte		6,		120,		13,		50,		5,		100,		0,		0,		18,		0,		1,		0
204 204 
 /*Gesichte*/		move_data_193:	.byte		113,		0,		0,		0,		40,		0,		0,		0,		18,		0,		2,		0
205 
-/*Abgangsbund*/		move_data_194:	.byte		98,		0,		7,		0,		5,		,		16,		0,		0,		0,		2,		0
205 
+/*Abgangsbund*/		move_data_194:	.byte		98,		0,		7,		0,		5,		0,		16,		0,		0,		0,		2,		0
206 206 
 /*Abgesang*/		move_data_195:	.byte		114,		0,		0,		0,		5,		0,		16,		0,		0,		0,		2,		0
207 207 
 /*Eissturm*/		move_data_196:	.byte		70,		55,		15,		95,		15,		100,		8,		0,		18,		0,		1,		0
208 208 
 /*Scanner*/		move_data_197:	.byte		111,		0,		1,		0,		5,		0,		16,		4,		0,		0,		2,		0
 
@@ -515,7 +515,7 @@ move_table:
515 515 
 /*Seitentausch*/	move_data_502:	.byte		NONE,		0,		14,		0,		15,		0,		16,		1,		0,		0,		2,		0
516 516 
 /*Siedewasser*/		move_data_503:	.byte		125,		80,		11,		100,		15,		30,		0,		0,		50,		0,		1,		0
517 517 
 /*Hausbruch*/		move_data_504:	.byte		NONE,		0,		0,		0,		15,		0,		16,		0,		4,		0,		2,		0
518 
-/*Heilwoge*/		move_data_505:	.byte		NONE,		0,		14,		0,		10,		,		16,		0,		2,		0,		2,		0
518 
+/*Heilwoge*/		move_data_505:	.byte		NONE,		0,		14,		0,		10,		0,		16,		0,		2,		0,		2,		0
519 519 
 /*Buerde*/		move_data_506:	.byte		NONE,		65,		7,		100,		10,		0,		0,		0,		50,		0,		1,		0
520 520 
 /*Freier Fall*/		move_data_507:	.byte		NONE,		60,		2,		100,		10,		0,		0,		0,		51,		0,		0,		0
521 521 
 /*Gangwechsel*/		move_data_508:	.byte		NONE,		0,		8,		0,		10,		0,		16,		0,		4,		0,		2,		0

+ 954
- 0
data/overworld/wild_pokemon_data.S 查看文件 

@@ -0,0 +1,954 @@
1 
+.align 2
2 
+.text
3 
+.thumb
4 
+.global wild_pokemon_data
5 
+wild_pokemon_data:
6 
+
7 
+.byte 0x1, 0x0, 0x0, 0x0
8 
+.word grass_data_0, water_data_0, 0x0, fishing_data_0
9 
+
10 
+.byte 0x1, 0x1, 0x0, 0x0
11 
+.word grass_data_1, water_data_1, 0x0, fishing_data_1
12 
+
13 
+.byte 0x1, 0x2, 0x0, 0x0
14 
+.word grass_data_2, water_data_2, 0x0, fishing_data_2
15 
+
16 
+.byte 0x4, 0x1, 0x0, 0x0
17 
+.word grass_data_3, water_data_3, 0x0, fishing_data_3
18 
+
19 
+.byte 0x4, 0x2, 0x0, 0x0
20 
+.word 0x0, water_data_4, 0x0, fishing_data_4
21 
+
22 
+.byte 0x4, 0x3, 0x0, 0x0
23 
+.word grass_data_5, water_data_5, 0x0, fishing_data_5
24 
+
25 
+.byte 0x4, 0x4, 0x0, 0x0
26 
+.word grass_data_6, 0x0, 0x0, 0x0
27 
+
28 
+.byte 0x4, 0x5, 0x0, 0x0
29 
+.word 0x0, water_data_7, 0x0, fishing_data_7
30 
+
31 
+.byte 0x4, 0x6, 0x0, 0x0
32 
+.word grass_data_8, water_data_8, 0x0, fishing_data_8
33 
+
34 
+.byte 0x4, 0x7, 0x0, 0x0
35 
+.word grass_data_9, 0x0, 0x0, 0x0
36 
+
37 
+.byte 0x4, 0x8, 0x0, 0x0
38 
+.word grass_data_10, water_data_10, 0x0, fishing_data_10
39 
+
40 
+.byte 0x4, 0x9, 0x0, 0x0
41 
+.word grass_data_11, water_data_11, 0x0, fishing_data_11
42 
+
43 
+
44 
+grass_data_0:
45 
+.byte 0xA
46 
+.byte 0x0, 0x0, 0x0
47 
+.word pkmn_grass_data_0
48 
+
49 
+water_data_0:
50 
+.byte 0xF
51 
+.byte 0x0, 0x0, 0x0
52 
+.word pkmn_water_data_0
53 
+
54 
+fishing_data_0:
55 
+.byte 0x14
56 
+.byte 0x0, 0x0, 0x0
57 
+.word pkmn_fishing_data_0
58 
+
59 
+grass_data_1:
60 
+.byte 0xA
61 
+.byte 0x0, 0x0, 0x0
62 
+.word pkmn_grass_data_1
63 
+
64 
+water_data_1:
65 
+.byte 0xF
66 
+.byte 0x0, 0x0, 0x0
67 
+.word pkmn_water_data_1
68 
+
69 
+fishing_data_1:
70 
+.byte 0x14
71 
+.byte 0x0, 0x0, 0x0
72 
+.word pkmn_fishing_data_1
73 
+
74 
+grass_data_2:
75 
+.byte 0xA
76 
+.byte 0x0, 0x0, 0x0
77 
+.word pkmn_grass_data_2
78 
+
79 
+water_data_2:
80 
+.byte 0xF
81 
+.byte 0x0, 0x0, 0x0
82 
+.word pkmn_water_data_2
83 
+
84 
+fishing_data_2:
85 
+.byte 0x14
86 
+.byte 0x0, 0x0, 0x0
87 
+.word pkmn_fishing_data_2
88 
+
89 
+grass_data_3:
90 
+.byte 0xA
91 
+.byte 0x0, 0x0, 0x0
92 
+.word pkmn_grass_data_3
93 
+
94 
+water_data_3:
95 
+.byte 0xF
96 
+.byte 0x0, 0x0, 0x0
97 
+.word pkmn_water_data_3
98 
+
99 
+fishing_data_3:
100 
+.byte 0x14
101 
+.byte 0x0, 0x0, 0x0
102 
+.word pkmn_fishing_data_3
103 
+
104 
+water_data_4:
105 
+.byte 0xF
106 
+.byte 0x0, 0x0, 0x0
107 
+.word pkmn_water_data_4
108 
+
109 
+fishing_data_4:
110 
+.byte 0x14
111 
+.byte 0x0, 0x0, 0x0
112 
+.word pkmn_fishing_data_4
113 
+
114 
+grass_data_5:
115 
+.byte 0xA
116 
+.byte 0x0, 0x0, 0x0
117 
+.word pkmn_grass_data_5
118 
+
119 
+water_data_5:
120 
+.byte 0xF
121 
+.byte 0x0, 0x0, 0x0
122 
+.word pkmn_water_data_5
123 
+
124 
+fishing_data_5:
125 
+.byte 0x14
126 
+.byte 0x0, 0x0, 0x0
127 
+.word pkmn_fishing_data_5
128 
+
129 
+grass_data_6:
130 
+.byte 0xA
131 
+.byte 0x0, 0x0, 0x0
132 
+.word pkmn_grass_data_6
133 
+
134 
+water_data_7:
135 
+.byte 0xF
136 
+.byte 0x0, 0x0, 0x0
137 
+.word pkmn_water_data_7
138 
+
139 
+fishing_data_7:
140 
+.byte 0x14
141 
+.byte 0x0, 0x0, 0x0
142 
+.word pkmn_fishing_data_7
143 
+
144 
+grass_data_8:
145 
+.byte 0xA
146 
+.byte 0x0, 0x0, 0x0
147 
+.word pkmn_grass_data_8
148 
+
149 
+water_data_8:
150 
+.byte 0xF
151 
+.byte 0x0, 0x0, 0x0
152 
+.word pkmn_water_data_8
153 
+
154 
+fishing_data_8:
155 
+.byte 0x14
156 
+.byte 0x0, 0x0, 0x0
157 
+.word pkmn_fishing_data_8
158 
+
159 
+grass_data_9:
160 
+.byte 0xA
161 
+.byte 0x0, 0x0, 0x0
162 
+.word pkmn_grass_data_9
163 
+
164 
+grass_data_10:
165 
+.byte 0xA
166 
+.byte 0x0, 0x0, 0x0
167 
+.word pkmn_grass_data_10
168 
+
169 
+water_data_10:
170 
+.byte 0xF
171 
+.byte 0x0, 0x0, 0x0
172 
+.word pkmn_water_data_10
173 
+
174 
+fishing_data_10:
175 
+.byte 0x14
176 
+.byte 0x0, 0x0, 0x0
177 
+.word pkmn_fishing_data_10
178 
+
179 
+grass_data_11:
180 
+.byte 0xA
181 
+.byte 0x0, 0x0, 0x0
182 
+.word pkmn_grass_data_11
183 
+
184 
+water_data_11:
185 
+.byte 0xF
186 
+.byte 0x0, 0x0, 0x0
187 
+.word pkmn_water_data_11
188 
+
189 
+fishing_data_11:
190 
+.byte 0x14
191 
+.byte 0x0, 0x0, 0x0
192 
+.word pkmn_fishing_data_11
193 
+
194 
+
195 
+pkmn_grass_data_0:
196 
+.byte 0x2
197 
+.byte 0x3
198 
+.hword 0x2CA
199 
+.byte 0x2
200 
+.byte 0x3
201 
+.hword 0xA1
202 
+.byte 0x2
203 
+.byte 0x3
204 
+.hword 0x2CA
205 
+.byte 0x2
206 
+.byte 0x3
207 
+.hword 0x16F
208 
+.byte 0x2
209 
+.byte 0x3
210 
+.hword 0x2B
211 
+.byte 0x2
212 
+.byte 0x3
213 
+.hword 0x2B
214 
+.byte 0x3
215 
+.byte 0x4
216 
+.hword 0x16F
217 
+.byte 0x3
218 
+.byte 0x4
219 
+.hword 0x310
220 
+.byte 0x3
221 
+.byte 0x4
222 
+.hword 0x2B
223 
+.byte 0x3
224 
+.byte 0x4
225 
+.hword 0x16F
226 
+.byte 0x3
227 
+.byte 0x4
228 
+.hword 0x310
229 
+.byte 0x4
230 
+.byte 0x5
231 
+.hword 0x310
232 
+
233 
+pkmn_water_data_0:
234 
+.byte 0x0
235 
+.byte 0x0
236 
+.hword 0x0
237 
+.byte 0x0
238 
+.byte 0x0
239 
+.hword 0x0
240 
+.byte 0x0
241 
+.byte 0x0
242 
+.hword 0x0
243 
+.byte 0x0
244 
+.byte 0x0
245 
+.hword 0x0
246 
+.byte 0x0
247 
+.byte 0x0
248 
+.hword 0x0
249 
+
250 
+pkmn_fishing_data_0:
251 
+.byte 0x0
252 
+.byte 0x0
253 
+.hword 0x0
254 
+.byte 0x0
255 
+.byte 0x0
256 
+.hword 0x0
257 
+.byte 0x0
258 
+.byte 0x0
259 
+.hword 0x0
260 
+.byte 0x0
261 
+.byte 0x0
262 
+.hword 0x0
263 
+.byte 0x0
264 
+.byte 0x0
265 
+.hword 0x0
266 
+.byte 0x0
267 
+.byte 0x0
268 
+.hword 0x0
269 
+
270 
+
271 
+pkmn_grass_data_1:
272 
+.byte 0x2
273 
+.byte 0x3
274 
+.hword 0x2CA
275 
+.byte 0x2
276 
+.byte 0x3
277 
+.hword 0xA1
278 
+.byte 0x2
279 
+.byte 0x3
280 
+.hword 0x2CA
281 
+.byte 0x2
282 
+.byte 0x3
283 
+.hword 0x16F
284 
+.byte 0x2
285 
+.byte 0x3
286 
+.hword 0x2B
287 
+.byte 0x2
288 
+.byte 0x3
289 
+.hword 0x2B
290 
+.byte 0x3
291 
+.byte 0x4
292 
+.hword 0x16F
293 
+.byte 0x3
294 
+.byte 0x4
295 
+.hword 0x310
296 
+.byte 0x3
297 
+.byte 0x4
298 
+.hword 0x2B
299 
+.byte 0x3
300 
+.byte 0x4
301 
+.hword 0x16F
302 
+.byte 0x3
303 
+.byte 0x4
304 
+.hword 0x310
305 
+.byte 0x4
306 
+.byte 0x5
307 
+.hword 0x310
308 
+
309 
+pkmn_water_data_1:
310 
+.byte 0x0
311 
+.byte 0x0
312 
+.hword 0x0
313 
+.byte 0x0
314 
+.byte 0x0
315 
+.hword 0x0
316 
+.byte 0x0
317 
+.byte 0x0
318 
+.hword 0x0
319 
+.byte 0x0
320 
+.byte 0x0
321 
+.hword 0x0
322 
+.byte 0x0
323 
+.byte 0x0
324 
+.hword 0x0
325 
+
326 
+pkmn_fishing_data_1:
327 
+.byte 0x0
328 
+.byte 0x0
329 
+.hword 0x0
330 
+.byte 0x0
331 
+.byte 0x0
332 
+.hword 0x0
333 
+.byte 0x0
334 
+.byte 0x0
335 
+.hword 0x0
336 
+.byte 0x0
337 
+.byte 0x0
338 
+.hword 0x0
339 
+.byte 0x0
340 
+.byte 0x0
341 
+.hword 0x0
342 
+.byte 0x0
343 
+.byte 0x0
344 
+.hword 0x0
345 
+
346 
+
347 
+pkmn_grass_data_2:
348 
+.byte 0x3
349 
+.byte 0x4
350 
+.hword 0x22D
351 
+.byte 0x3
352 
+.byte 0x4
353 
+.hword 0x2D2
354 
+.byte 0x3
355 
+.byte 0x4
356 
+.hword 0x1C8
357 
+.byte 0x4
358 
+.byte 0x5
359 
+.hword 0x1C1
360 
+.byte 0x4
361 
+.byte 0x5
362 
+.hword 0x166
363 
+.byte 0x4
364 
+.byte 0x5
365 
+.hword 0x1C8
366 
+.byte 0x4
367 
+.byte 0x5
368 
+.hword 0x1C1
369 
+.byte 0x4
370 
+.byte 0x5
371 
+.hword 0x2D2
372 
+.byte 0x5
373 
+.byte 0x6
374 
+.hword 0x1C8
375 
+.byte 0x5
376 
+.byte 0x6
377 
+.hword 0x22D
378 
+.byte 0x5
379 
+.byte 0x7
380 
+.hword 0x31D
381 
+.byte 0x6
382 
+.byte 0x7
383 
+.hword 0x31D
384 
+
385 
+pkmn_water_data_2:
386 
+.byte 0x0
387 
+.byte 0x0
388 
+.hword 0x0
389 
+.byte 0x0
390 
+.byte 0x0
391 
+.hword 0x0
392 
+.byte 0x0
393 
+.byte 0x0
394 
+.hword 0x0
395 
+.byte 0x0
396 
+.byte 0x0
397 
+.hword 0x0
398 
+.byte 0x0
399 
+.byte 0x0
400 
+.hword 0x0
401 
+
402 
+pkmn_fishing_data_2:
403 
+.byte 0x0
404 
+.byte 0x0
405 
+.hword 0x0
406 
+.byte 0x0
407 
+.byte 0x0
408 
+.hword 0x0
409 
+.byte 0x0
410 
+.byte 0x0
411 
+.hword 0x0
412 
+.byte 0x0
413 
+.byte 0x0
414 
+.hword 0x0
415 
+.byte 0x0
416 
+.byte 0x0
417 
+.hword 0x0
418 
+.byte 0x0
419 
+.byte 0x0
420 
+.hword 0x0
421 
+
422 
+
423 
+pkmn_grass_data_3:
424 
+.byte 0x3
425 
+.byte 0x4
426 
+.hword 0xA
427 
+.byte 0x3
428 
+.byte 0x4
429 
+.hword 0x122
430 
+.byte 0x3
431 
+.byte 0x4
432 
+.hword 0xD
433 
+.byte 0x4
434 
+.byte 0x5
435 
+.hword 0x12D
436 
+.byte 0x4
437 
+.byte 0x5
438 
+.hword 0x251
439 
+.byte 0x4
440 
+.byte 0x5
441 
+.hword 0xA7
442 
+.byte 0x4
443 
+.byte 0x5
444 
+.hword 0xA7
445 
+.byte 0x5
446 
+.byte 0x6
447 
+.hword 0xE
448 
+.byte 0x5
449 
+.byte 0x6
450 
+.hword 0xB
451 
+.byte 0x5
452 
+.byte 0x6
453 
+.hword 0x123
454 
+.byte 0x6
455 
+.byte 0x7
456 
+.hword 0x125
457 
+.byte 0x6
458 
+.byte 0x7
459 
+.hword 0x125
460 
+
461 
+pkmn_water_data_3:
462 
+.byte 0x0
463 
+.byte 0x0
464 
+.hword 0x0
465 
+.byte 0x0
466 
+.byte 0x0
467 
+.hword 0x0
468 
+.byte 0x0
469 
+.byte 0x0
470 
+.hword 0x0
471 
+.byte 0x0
472 
+.byte 0x0
473 
+.hword 0x0
474 
+.byte 0x0
475 
+.byte 0x0
476 
+.hword 0x0
477 
+
478 
+pkmn_fishing_data_3:
479 
+.byte 0x0
480 
+.byte 0x0
481 
+.hword 0x0
482 
+.byte 0x0
483 
+.byte 0x0
484 
+.hword 0x0
485 
+.byte 0x0
486 
+.byte 0x0
487 
+.hword 0x0
488 
+.byte 0x0
489 
+.byte 0x0
490 
+.hword 0x0
491 
+.byte 0x0
492 
+.byte 0x0
493 
+.hword 0x0
494 
+.byte 0x0
495 
+.byte 0x0
496 
+.hword 0x0
497 
+
498 
+
499 
+pkmn_water_data_4:
500 
+.byte 0x0
501 
+.byte 0x0
502 
+.hword 0x0
503 
+.byte 0x0
504 
+.byte 0x0
505 
+.hword 0x0
506 
+.byte 0x0
507 
+.byte 0x0
508 
+.hword 0x0
509 
+.byte 0x0
510 
+.byte 0x0
511 
+.hword 0x0
512 
+.byte 0x0
513 
+.byte 0x0
514 
+.hword 0x0
515 
+
516 
+pkmn_fishing_data_4:
517 
+.byte 0x0
518 
+.byte 0x0
519 
+.hword 0x0
520 
+.byte 0x0
521 
+.byte 0x0
522 
+.hword 0x0
523 
+.byte 0x0
524 
+.byte 0x0
525 
+.hword 0x0
526 
+.byte 0x0
527 
+.byte 0x0
528 
+.hword 0x0
529 
+.byte 0x0
530 
+.byte 0x0
531 
+.hword 0x0
532 
+.byte 0x0
533 
+.byte 0x0
534 
+.hword 0x0
535 
+
536 
+
537 
+pkmn_grass_data_5:
538 
+.byte 0x3
539 
+.byte 0x4
540 
+.hword 0xA5
541 
+.byte 0x3
542 
+.byte 0x4
543 
+.hword 0x1D6
544 
+.byte 0x3
545 
+.byte 0x4
546 
+.hword 0xA
547 
+.byte 0x4
548 
+.byte 0x5
549 
+.hword 0x122
550 
+.byte 0x4
551 
+.byte 0x5
552 
+.hword 0xD
553 
+.byte 0x4
554 
+.byte 0x5
555 
+.hword 0xE
556 
+.byte 0x4
557 
+.byte 0x5
558 
+.hword 0xB
559 
+.byte 0x5
560 
+.byte 0x6
561 
+.hword 0x123
562 
+.byte 0x5
563 
+.byte 0x6
564 
+.hword 0x125
565 
+.byte 0x5
566 
+.byte 0x6
567 
+.hword 0x125
568 
+.byte 0x6
569 
+.byte 0x7
570 
+.hword 0x236
571 
+.byte 0x6
572 
+.byte 0x7
573 
+.hword 0x238
574 
+
575 
+pkmn_water_data_5:
576 
+.byte 0x0
577 
+.byte 0x0
578 
+.hword 0x0
579 
+.byte 0x0
580 
+.byte 0x0
581 
+.hword 0x0
582 
+.byte 0x0
583 
+.byte 0x0
584 
+.hword 0x0
585 
+.byte 0x0
586 
+.byte 0x0
587 
+.hword 0x0
588 
+.byte 0x0
589 
+.byte 0x0
590 
+.hword 0x0
591 
+
592 
+pkmn_fishing_data_5:
593 
+.byte 0x0
594 
+.byte 0x0
595 
+.hword 0x0
596 
+.byte 0x0
597 
+.byte 0x0
598 
+.hword 0x0
599 
+.byte 0x0
600 
+.byte 0x0
601 
+.hword 0x0
602 
+.byte 0x0
603 
+.byte 0x0
604 
+.hword 0x0
605 
+.byte 0x0
606 
+.byte 0x0
607 
+.hword 0x0
608 
+.byte 0x0
609 
+.byte 0x0
610 
+.hword 0x0
611 
+
612 
+
613 
+pkmn_grass_data_6:
614 
+.byte 0x3
615 
+.byte 0x4
616 
+.hword 0xA
617 
+.byte 0x3
618 
+.byte 0x4
619 
+.hword 0x122
620 
+.byte 0x3
621 
+.byte 0x4
622 
+.hword 0xD
623 
+.byte 0x4
624 
+.byte 0x5
625 
+.hword 0xE
626 
+.byte 0x4
627 
+.byte 0x5
628 
+.hword 0xB
629 
+.byte 0x4
630 
+.byte 0x5
631 
+.hword 0x123
632 
+.byte 0x4
633 
+.byte 0x5
634 
+.hword 0x125
635 
+.byte 0x5
636 
+.byte 0x6
637 
+.hword 0x125
638 
+.byte 0x5
639 
+.byte 0x6
640 
+.hword 0x238
641 
+.byte 0x5
642 
+.byte 0x6
643 
+.hword 0x236
644 
+.byte 0x6
645 
+.byte 0x7
646 
+.hword 0x234
647 
+.byte 0x6
648 
+.byte 0x7
649 
+.hword 0x1D6
650 
+
651 
+
652 
+pkmn_water_data_7:
653 
+.byte 0x0
654 
+.byte 0x0
655 
+.hword 0x0
656 
+.byte 0x0
657 
+.byte 0x0
658 
+.hword 0x0
659 
+.byte 0x0
660 
+.byte 0x0
661 
+.hword 0x0
662 
+.byte 0x0
663 
+.byte 0x0
664 
+.hword 0x0
665 
+.byte 0x0
666 
+.byte 0x0
667 
+.hword 0x0
668 
+
669 
+pkmn_fishing_data_7:
670 
+.byte 0x0
671 
+.byte 0x0
672 
+.hword 0x0
673 
+.byte 0x0
674 
+.byte 0x0
675 
+.hword 0x0
676 
+.byte 0x0
677 
+.byte 0x0
678 
+.hword 0x0
679 
+.byte 0x0
680 
+.byte 0x0
681 
+.hword 0x0
682 
+.byte 0x0
683 
+.byte 0x0
684 
+.hword 0x0
685 
+.byte 0x0
686 
+.byte 0x0
687 
+.hword 0x0
688 
+
689 
+
690 
+pkmn_grass_data_8:
691 
+.byte 0x3
692 
+.byte 0x4
693 
+.hword 0xA5
694 
+.byte 0x3
695 
+.byte 0x4
696 
+.hword 0xA
697 
+.byte 0x3
698 
+.byte 0x4
699 
+.hword 0x122
700 
+.byte 0x4
701 
+.byte 0x5
702 
+.hword 0xD
703 
+.byte 0x4
704 
+.byte 0x5
705 
+.hword 0x1D6
706 
+.byte 0x4
707 
+.byte 0x5
708 
+.hword 0x2CD
709 
+.byte 0x4
710 
+.byte 0x5
711 
+.hword 0x2CD
712 
+.byte 0x5
713 
+.byte 0x6
714 
+.hword 0x1D6
715 
+.byte 0x5
716 
+.byte 0x6
717 
+.hword 0x234
718 
+.byte 0x5
719 
+.byte 0x6
720 
+.hword 0x238
721 
+.byte 0x6
722 
+.byte 0x7
723 
+.hword 0x236
724 
+.byte 0x6
725 
+.byte 0x7
726 
+.hword 0x2CD
727 
+
728 
+pkmn_water_data_8:
729 
+.byte 0x0
730 
+.byte 0x0
731 
+.hword 0x0
732 
+.byte 0x0
733 
+.byte 0x0
734 
+.hword 0x0
735 
+.byte 0x0
736 
+.byte 0x0
737 
+.hword 0x0
738 
+.byte 0x0
739 
+.byte 0x0
740 
+.hword 0x0
741 
+.byte 0x0
742 
+.byte 0x0
743 
+.hword 0x0
744 
+
745 
+pkmn_fishing_data_8:
746 
+.byte 0x0
747 
+.byte 0x0
748 
+.hword 0x0
749 
+.byte 0x0
750 
+.byte 0x0
751 
+.hword 0x0
752 
+.byte 0x0
753 
+.byte 0x0
754 
+.hword 0x0
755 
+.byte 0x0
756 
+.byte 0x0
757 
+.hword 0x0
758 
+.byte 0x0
759 
+.byte 0x0
760 
+.hword 0x0
761 
+.byte 0x0
762 
+.byte 0x0
763 
+.hword 0x0
764 
+
765 
+
766 
+pkmn_grass_data_9:
767 
+.byte 0x3
768 
+.byte 0x4
769 
+.hword 0x2CD
770 
+.byte 0x3
771 
+.byte 0x4
772 
+.hword 0xA5
773 
+.byte 0x3
774 
+.byte 0x4
775 
+.hword 0x1D6
776 
+.byte 0x4
777 
+.byte 0x5
778 
+.hword 0xA
779 
+.byte 0x4
780 
+.byte 0x5
781 
+.hword 0x122
782 
+.byte 0x4
783 
+.byte 0x5
784 
+.hword 0xD
785 
+.byte 0x4
786 
+.byte 0x5
787 
+.hword 0x2CD
788 
+.byte 0x5
789 
+.byte 0x6
790 
+.hword 0x1D6
791 
+.byte 0x5
792 
+.byte 0x6
793 
+.hword 0x234
794 
+.byte 0x5
795 
+.byte 0x6
796 
+.hword 0x238
797 
+.byte 0x6
798 
+.byte 0x7
799 
+.hword 0x236
800 
+.byte 0x6
801 
+.byte 0x7
802 
+.hword 0x30
803 
+
804 
+
805 
+pkmn_grass_data_10:
806 
+.byte 0x3
807 
+.byte 0x4
808 
+.hword 0x1D6
809 
+.byte 0x3
810 
+.byte 0x4
811 
+.hword 0xA
812 
+.byte 0x3
813 
+.byte 0x4
814 
+.hword 0x122
815 
+.byte 0x4
816 
+.byte 0x5
817 
+.hword 0xD
818 
+.byte 0x4
819 
+.byte 0x5
820 
+.hword 0x2CD
821 
+.byte 0x4
822 
+.byte 0x5
823 
+.hword 0x1D6
824 
+.byte 0x4
825 
+.byte 0x5
826 
+.hword 0x1D6
827 
+.byte 0x5
828 
+.byte 0x6
829 
+.hword 0x2CD
830 
+.byte 0x5
831 
+.byte 0x6
832 
+.hword 0x234
833 
+.byte 0x5
834 
+.byte 0x6
835 
+.hword 0x238
836 
+.byte 0x6
837 
+.byte 0x7
838 
+.hword 0x236
839 
+.byte 0x6
840 
+.byte 0x7
841 
+.hword 0x30
842 
+
843 
+pkmn_water_data_10:
844 
+.byte 0x0
845 
+.byte 0x0
846 
+.hword 0x0
847 
+.byte 0x0
848 
+.byte 0x0
849 
+.hword 0x0
850 
+.byte 0x0
851 
+.byte 0x0
852 
+.hword 0x0
853 
+.byte 0x0
854 
+.byte 0x0
855 
+.hword 0x0
856 
+.byte 0x0
857 
+.byte 0x0
858 
+.hword 0x0
859 
+
860 
+pkmn_fishing_data_10:
861 
+.byte 0x0
862 
+.byte 0x0
863 
+.hword 0x0
864 
+.byte 0x0
865 
+.byte 0x0
866 
+.hword 0x0
867 
+.byte 0x0
868 
+.byte 0x0
869 
+.hword 0x0
870 
+.byte 0x0
871 
+.byte 0x0
872 
+.hword 0x0
873 
+.byte 0x0
874 
+.byte 0x0
875 
+.hword 0x0
876 
+.byte 0x0
877 
+.byte 0x0
878 
+.hword 0x0
879 
+
880 
+
881 
+pkmn_grass_data_11:
882 
+.byte 0x3
883 
+.byte 0x4
884 
+.hword 0x2CD
885 
+.byte 0x3
886 
+.byte 0x4
887 
+.hword 0x2CD
888 
+.byte 0x3
889 
+.byte 0x4
890 
+.hword 0xA
891 
+.byte 0x4
892 
+.byte 0x5
893 
+.hword 0x122
894 
+.byte 0x4
895 
+.byte 0x5
896 
+.hword 0xD
897 
+.byte 0x4
898 
+.byte 0x5
899 
+.hword 0x2CD
900 
+.byte 0x4
901 
+.byte 0x5
902 
+.hword 0x1D6
903 
+.byte 0x5
904 
+.byte 0x6
905 
+.hword 0x30
906 
+.byte 0x5
907 
+.byte 0x6
908 
+.hword 0x2CD
909 
+.byte 0x5
910 
+.byte 0x6
911 
+.hword 0x234
912 
+.byte 0x6
913 
+.byte 0x7
914 
+.hword 0x238
915 
+.byte 0x6
916 
+.byte 0x7
917 
+.hword 0x236
918 
+
919 
+pkmn_water_data_11:
920 
+.byte 0x0
921 
+.byte 0x0
922 
+.hword 0x0
923 
+.byte 0x0
924 
+.byte 0x0
925 
+.hword 0x0
926 
+.byte 0x0
927 
+.byte 0x0
928 
+.hword 0x0
929 
+.byte 0x0
930 
+.byte 0x0
931 
+.hword 0x0
932 
+.byte 0x0
933 
+.byte 0x0
934 
+.hword 0x0
935 
+
936 
+pkmn_fishing_data_11:
937 
+.byte 0x0
938 
+.byte 0x0
939 
+.hword 0x0
940 
+.byte 0x0
941 
+.byte 0x0
942 
+.hword 0x0
943 
+.byte 0x0
944 
+.byte 0x0
945 
+.hword 0x0
946 
+.byte 0x0
947 
+.byte 0x0
948 
+.hword 0x0
949 
+.byte 0x0
950 
+.byte 0x0
951 
+.hword 0x0
952 
+.byte 0x0
953 
+.byte 0x0
954 
+.hword 0x0

+ 1113
- 1360
data/pkmn_tables/pokemon_habitats.S
文件差異過大導致無法顯示
查看文件


+ 126
- 0
data/trainer/trainer_money_rate.s 查看文件 

@@ -0,0 +1,126 @@
1 
+.align 2
2 
+.text
3 
+.thumb
4 
+
5 
+.global trainer_money_rate
6 
+trainer_money_rate:
7 
+
8 
+.byte 0, 16, 0, 0
9 
+.byte 1, 16, 0, 0
10 
+.byte 2, 32, 0, 0
11 
+.byte 3, 40, 0, 0
12 
+.byte 4, 80, 0, 0
13 
+.byte 5, 16, 0, 0
14 
+.byte 6, 16, 0, 0
15 
+.byte 7, 32, 0, 0
16 
+.byte 8, 60, 0, 0
17 
+.byte 9, 120, 0, 0
18 
+.byte 10, 20, 0, 0
19 
+.byte 11, 20, 0, 0
20 
+.byte 12, 40, 0, 0
21 
+.byte 13, 32, 0, 0
22 
+.byte 14, 16, 0, 0
23 
+.byte 15, 40, 0, 0
24 
+.byte 16, 112, 0, 0
25 
+.byte 17, 32, 0, 0
26 
+.byte 48, 48, 0, 0
27 
+.byte 19, 24, 0, 0
28 
+.byte 20, 64, 0, 0
29 
+.byte 21, 32, 0, 0
30 
+.byte 22, 32, 0, 0
31 
+.byte 23, 32, 0, 0
32 
+.byte 24, 32, 0, 0
33 
+.byte 25, 64, 0, 0
34 
+.byte 26, 4, 0, 0
35 
+.byte 27, 4, 0, 0
36 
+.byte 28, 64, 0, 0
37 
+.byte 29, 32, 0, 0
38 
+.byte 30, 48, 0, 0
39 
+.byte 31, 16, 0, 0
40 
+.byte 32, 200, 0, 0
41 
+.byte 33, 200, 0, 0
42 
+.byte 34, 40, 0, 0
43 
+.byte 35, 80, 0, 0
44 
+.byte 36, 60, 0, 0
45 
+.byte 37, 32, 0, 0
46 
+.byte 38, 40, 0, 0
47 
+.byte 39, 120, 0, 0
48 
+.byte 40, 120, 0, 0
49 
+.byte 41, 250, 0, 0
50 
+.byte 42, 220, 0, 0
51 
+.byte 43, 160, 0, 0
52 
+.byte 44, 80, 0, 0
53 
+.byte 45, 80, 0, 0
54 
+.byte 46, 28, 0, 0
55 
+.byte 47, 80, 0, 0
56 
+.byte 48, 16, 0, 0
57 
+.byte 49, 64, 0, 0
58 
+.byte 50, 24, 0, 0
59 
+.byte 51, 24, 0, 0
60 
+.byte 52, 64, 0, 0
61 
+.byte 53, 40, 0, 0
62 
+.byte 54, 40, 0, 0
63 
+.byte 55, 80, 0, 0
64 
+.byte 56, 32, 0, 0
65 
+.byte 57, 32, 0, 0
66 
+.byte 58, 32, 0, 0
67 
+.byte 59, 100, 0, 0
68 
+.byte 60, 100, 0, 0
69 
+.byte 61, 100, 0, 0
70 
+.byte 62, 100, 0, 0
71 
+.byte 63, 40, 0, 0
72 
+.byte 64, 80, 0, 0
73 
+.byte 65, 28, 0, 0
74 
+.byte 66, 28, 0, 0
75 
+.byte 67, 40, 0, 0
76 
+.byte 68, 40, 0, 0
77 
+.byte 69, 40, 0, 0
78 
+.byte 70, 40, 0, 0
79 
+.byte 71, 40, 0, 0
80 
+.byte 72, 64, 0, 0
81 
+.byte 73, 40, 0, 0
82 
+.byte 74, 40, 0, 0
83 
+.byte 75, 32, 0, 0
84 
+.byte 76, 24, 0, 0
85 
+.byte 77, 24, 0, 0
86 
+.byte 78, 56, 0, 0
87 
+.byte 79, 56, 0, 0
88 
+.byte 80, 32, 0, 0
89 
+.byte 81, 40, 0, 0
90 
+.byte 82, 40, 0, 0
91 
+.byte 83, 32, 0, 0
92 
+.byte 84, 60, 0, 0
93 
+.byte 85, 100, 0, 0
94 
+.byte 86, 40, 0, 0
95 
+.byte 87, 160, 0, 0
96 
+.byte 88, 100, 0, 0
97 
+.byte 89, 56, 0, 0
98 
+.byte 90, 200, 0, 0
99 
+.byte 91, 16, 0, 0
100 
+.byte 92, 40, 0, 0
101 
+.byte 93, 240, 0, 0
102 
+.byte 94, 28, 0, 0
103 
+.byte 95, 64, 0, 0
104 
+.byte 96, 28, 0, 0
105 
+.byte 97, 32, 0, 0
106 
+.byte 98, 32, 0, 0
107 
+.byte 99, 4, 0, 0
108 
+.byte 100, 4, 0, 0
109 
+.byte 101, 16, 0, 0
110 
+.byte 102, 16, 0, 0
111 
+.byte 103, 140, 0, 0
112 
+.byte 104, 40, 0, 0
113 
+.byte 105, 32, 0, 0
114 
+.byte 106, 32, 0, 0
115 
+.byte 107, 80, 0, 0
116 
+.byte 108, 32, 0, 0
117 
+.byte 109, 72, 0, 0
118 
+.byte 110, 72, 0, 0
119 
+.byte 111, 40, 0, 0
120 
+.byte 112, 80, 0, 0
121 
+.byte 113, 200, 0, 0
122 
+.byte 114, 150, 0, 0
123 
+.byte 115, 240, 0, 0
124 
+.byte 116, 48, 0, 0
125 
+.byte 117, 80, 0, 0
126 
+.byte 118, 250, 0, 0

+ 19
- 0
data/trainer/trainer_pkmn_data.s 查看文件 

@@ -0,0 +1,19 @@
1 
+.align 2
2 
+.text
3 
+.thumb
4 
+
5 
+.global trainer_pokemon_data
6 
+trainer_pokemon_data:
7 
+
8 
+.global pokemon_von_id_1
9 
+pokemon_von_id_1:
10 
+.hword 0, 1, 3, 13, 33, 45, 73, 22, 0xFFFF
11 
+
12 
+.global pokemon_von_id_2
13 
+pokemon_von_id_2:
14 
+.hword 0, 1, 3, 13, 33, 45, 73, 22, 0xFFFF
15 
+
16 
+.global pokemon_von_id_3
17 
+pokemon_von_id_3:
18 
+.hword 0, 1, 3, 13, 33, 45, 73, 22, 0xFFFF
19 
+

+ 0
- 0
gfx_build/item/.gitignore 查看文件


+ 2
- 0
main.asm 查看文件 

@@ -36,11 +36,13 @@
36 36 
 .include "patches/pokemon_data/pokemon_icons.asm"
37 37 
 .include "patches/pokemon_data/pokemon_habitats.asm"
38 38
39 
+.include "patches/overworlds/pkm_wild.asm"
39 40 
 //.include "patches/dns/core.asm"
40 41
41 42 
 .include "patches/overworlds/overworld.asm"
42 43
43 44 
 .include "patches/trainer_sprites/images.asm"
45 
+.include "patches/trainer_sprites/trainer_data.asm"
44 46
45 47 
 .include "patches/interface.asm"
46 48

+ 42
- 0
nbproject/configurations.xml 查看文件 

@@ -2,12 +2,27 @@
2 2 
 <configurationDescriptor version="100">
3 3 
   <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
4 4 
     <df root="." name="0">
5 
+      <df name="data">
6 
+        <df name="overworld">
7 
+          <in>wild_pokemon_data.S</in>
8 
+        </df>
9 
+        <df name="trainer">
10 
+          <in>trainer_money_rate.s</in>
11 
+          <in>trainer_pkmn_data.s</in>
12 
+        </df>
13 
+      </df>
5 14 
       <df name="patches">
6 15 
         <df name="graphics">
7 16 
           <in>boot.asm</in>
8 17 
           <in>char.asm</in>
9 18 
           <in>title.asm</in>
10 19 
         </df>
20 
+        <df name="overworlds">
21 
+          <in>pkm_wild.asm</in>
22 
+        </df>
23 
+        <df name="trainer_sprites">
24 
+          <in>trainer_data.asm</in>
25 
+        </df>
11 26 
       </df>
12 27 
       <df name="sots-private">
13 28 
         <df name="sound">

@@ -162,6 +177,10 @@
162 177 
             <in>pokedex_data.txt</in>
163 178 
             <in>pokedex_entries.txt</in>
164 179 
           </df>
180 
+          <df name="trainers">
181 
+            <in>trainer_data.txt</in>
182 
+            <in>trainerclasses.txt</in>
183 
+          </df>
165 184 
         </df>
166 185 
       </df>
167 186 
     </df>

@@ -209,6 +228,12 @@
209 228 
           <preBuildCommand></preBuildCommand>
210 229 
         </preBuild>
211 230 
       </makefileType>
231 
+      <item path="data/overworld/wild_pokemon_data.S" ex="false" tool="4" flavor2="0">
232 
+      </item>
233 
+      <item path="data/trainer/trainer_money_rate.s" ex="false" tool="4" flavor2="0">
234 
+      </item>
235 
+      <item path="data/trainer/trainer_pkmn_data.s" ex="false" tool="4" flavor2="0">
236 
+      </item>
212 237 
       <folder path="0/sots-private/sound/Assembler">
213 238 
         <cTool>
214 239 
           <incDir>

@@ -240,6 +265,13 @@
240 265 
       </item>
241 266 
       <item path="patches/graphics/title.asm" ex="false" tool="4" flavor2="0">
242 267 
       </item>
268 
+      <item path="patches/overworlds/pkm_wild.asm" ex="false" tool="4" flavor2="0">
269 
+      </item>
270 
+      <item path="patches/trainer_sprites/trainer_data.asm"
271 
+            ex="false"
272 
+            tool="4"
273 
+            flavor2="0">
274 
+      </item>
243 275 
       <item path="sots-private/sound/Assembler/musicInjector.c"
244 276 
             ex="false"
245 277 
             tool="0"

@@ -562,6 +594,16 @@
562 594 
             tool="4"
563 595 
             flavor2="0">
564 596 
       </item>
597 
+      <item path="string/de/trainers/trainer_data.txt"
598 
+            ex="false"
599 
+            tool="4"
600 
+            flavor2="0">
601 
+      </item>
602 
+      <item path="string/de/trainers/trainerclasses.txt"
603 
+            ex="false"
604 
+            tool="4"
605 
+            flavor2="0">
606 
+      </item>
565 607 
     </conf>
566 608 
   </confs>
567 609 
 </configurationDescriptor>

+ 8
- 54
nbproject/private/configurations.xml 查看文件 

@@ -35,6 +35,7 @@
35 35 
           <in>overworld_frames.S</in>
36 36 
           <in>overworld_pal_table.S</in>
37 37 
           <in>overworld_tables.S</in>
38 
+          <in>wild_pokemon_data.S</in>
38 39 
         </df>
39 40 
         <df name="pkmn_tables">
40 41 
           <in>icon_sprites.S</in>

@@ -61,6 +62,8 @@
61 62 
           <in>text_multichoice.s</in>
62 63 
         </df>
63 64 
         <df name="trainer">
65 
+          <in>trainer_money_rate.s</in>
66 
+          <in>trainer_pkmn_data.s</in>
64 67 
           <in>ts_alt.s</in>
65 68 
           <in>ts_pal.s</in>
66 69 
           <in>ts_tiles.s</in>

@@ -642,7 +645,6 @@
642 645 
           <in>item_683.s</in>
643 646 
           <in>item_684.s</in>
644 647 
           <in>item_685.s</in>
645 
-          <in>item_686.s</in>
646 648 
         </df>
647 649 
         <df name="overworlds">
648 650 
           <in>ow_0000.s</in>

@@ -2228,14 +2230,6 @@
2228 2230 
             <in>normal_1197.s</in>
2229 2231 
             <in>normal_1198.s</in>
2230 2232 
             <in>normal_1199.s</in>
2231 
-            <in>normal_798.s</in>
2232 
-            <in>normal_800.s</in>
2233 
-            <in>normal_801.s</in>
2234 
-            <in>normal_802.s</in>
2235 
-            <in>normal_803.s</in>
2236 
-            <in>normal_804.s</in>
2237 
-            <in>normal_805.s</in>
2238 
-            <in>normal_806.s</in>
2239 2233 
           </df>
2240 2234 
           <df name="castform">
2241 2235 
             <in>castform_back.s</in>

@@ -3356,40 +3350,15 @@
3356 3350 
             <in>normal_1197.s</in>
3357 3351 
             <in>normal_1198.s</in>
3358 3352 
             <in>normal_1199.s</in>
3359 
-            <in>normal_798.s</in>
3360 
-            <in>normal_800.s</in>
3361 
-            <in>normal_801.s</in>
3362 
-            <in>normal_802.s</in>
3363 
-            <in>normal_803.s</in>
3364 
-            <in>normal_804.s</in>
3365 
-            <in>normal_805.s</in>
3366 
-            <in>normal_806.s</in>
3367 3353 
           </df>
3368 3354 
           <df name="normal_pal">
3369 3355 
             <in>normal_0000.s</in>
3370 3356 
             <in>normal_0001.s</in>
3371 
-            <in>normal_0002.s</in>
3372 
-            <in>normal_0003.s</in>
3373 
-            <in>normal_0004.s</in>
3374 
-            <in>normal_0005.s</in>
3375 
-            <in>normal_0006.s</in>
3376 3357 
             <in>normal_0007.s</in>
3377 
-            <in>normal_0008.s</in>
3378 
-            <in>normal_0009.s</in>
3379 
-            <in>normal_0010.s</in>
3380 3358 
             <in>normal_0011.s</in>
3381 
-            <in>normal_0012.s</in>
3382 
-            <in>normal_0013.s</in>
3383 3359 
             <in>normal_0014.s</in>
3384 
-            <in>normal_0015.s</in>
3385 
-            <in>normal_0016.s</in>
3386 
-            <in>normal_0017.s</in>
3387 
-            <in>normal_0018.s</in>
3388 
-            <in>normal_0019.s</in>
3389 
-            <in>normal_0020.s</in>
3390 3360 
             <in>normal_0021.s</in>
3391 3361 
             <in>normal_0022.s</in>
3392 
-            <in>normal_0023.s</in>
3393 3362 
             <in>normal_0024.s</in>
3394 3363 
             <in>normal_0025.s</in>
3395 3364 
             <in>normal_0026.s</in>

@@ -3399,7 +3368,6 @@
3399 3368 
             <in>normal_0030.s</in>
3400 3369 
             <in>normal_0031.s</in>
3401 3370 
             <in>normal_0032.s</in>
3402 
-            <in>normal_0033.s</in>
3403 3371 
             <in>normal_0034.s</in>
3404 3372 
             <in>normal_0035.s</in>
3405 3373 
             <in>normal_0036.s</in>

@@ -3411,7 +3379,6 @@
3411 3379 
             <in>normal_0042.s</in>
3412 3380 
             <in>normal_0043.s</in>
3413 3381 
             <in>normal_0044.s</in>
3414 
-            <in>normal_0045.s</in>
3415 3382 
             <in>normal_0046.s</in>
3416 3383 
             <in>normal_0047.s</in>
3417 3384 
             <in>normal_0048.s</in>

@@ -4478,14 +4445,6 @@
4478 4445 
             <in>normal_1197.s</in>
4479 4446 
             <in>normal_1198.s</in>
4480 4447 
             <in>normal_1199.s</in>
4481 
-            <in>normal_798.s</in>
4482 
-            <in>normal_800.s</in>
4483 
-            <in>normal_801.s</in>
4484 
-            <in>normal_802.s</in>
4485 
-            <in>normal_803.s</in>
4486 
-            <in>normal_804.s</in>
4487 
-            <in>normal_805.s</in>
4488 
-            <in>normal_806.s</in>
4489 4448 
           </df>
4490 4449 
           <df name="shiny_pal">
4491 4450 
             <in>shiny_0000.s</in>

@@ -5514,14 +5473,6 @@
5514 5473 
             <in>shiny_1197.s</in>
5515 5474 
             <in>shiny_1198.s</in>
5516 5475 
             <in>shiny_1199.s</in>
5517 
-            <in>shiny_798.s</in>
5518 
-            <in>shiny_800.s</in>
5519 
-            <in>shiny_801.s</in>
5520 
-            <in>shiny_802.s</in>
5521 
-            <in>shiny_803.s</in>
5522 
-            <in>shiny_804.s</in>
5523 
-            <in>shiny_805.s</in>
5524 
-            <in>shiny_806.s</in>
5525 5476 
           </df>
5526 5477 
         </df>
5527 5478 
         <df name="title_screen">

@@ -5701,8 +5652,6 @@
5701 5652 
           </df>
5702 5653 
           <df name="trainer">
5703 5654 
           </df>
5704 
-          <df name="trainer_sprites">
5705 
-          </df>
5706 5655 
         </df>
5707 5656 
         <df name="src">
5708 5657 
           <df name="agb_debug">

@@ -5846,6 +5795,7 @@
5846 5795 
         </df>
5847 5796 
         <df name="overworlds">
5848 5797 
           <in>overworld.asm</in>
5798 
+          <in>pkm_wild.asm</in>
5849 5799 
           <in>trainer.asm</in>
5850 5800 
         </df>
5851 5801 
         <df name="pokemon_data">

@@ -5874,6 +5824,7 @@
5874 5824 
         <df name="trainer_sprites">
5875 5825 
           <in>altitude.asm</in>
5876 5826 
           <in>images.asm</in>
5827 
+          <in>trainer_data.asm</in>
5877 5828 
         </df>
5878 5829 
         <in>disable_cry_table_blocks.s</in>
5879 5830 
         <in>dynamic_overworld_hooks.asm</in>

@@ -6888,6 +6839,9 @@
6888 6839 
           </df>
6889 6840 
           <df name="trainers">
6890 6841 
             <in>test_trainers.S</in>
6842 
+            <in>trainer_data.txt</in>
6843 
+            <in>trainerclasses.S</in>
6844 
+            <in>trainerclasses.txt</in>
6891 6845 
           </df>
6892 6846 
           <in>hazards.S</in>
6893 6847 
           <in>invalid.S</in>

+ 0
- 0
patches/graphics/boot.asm 查看文件


+ 0
- 0
patches/graphics/char.asm 查看文件


+ 0
- 0
patches/graphics/title.asm 查看文件


+ 41
- 0
patches/overworlds/pkm_wild.asm 查看文件 

@@ -0,0 +1,41 @@
1 
+.org 0x08082990
2 
+.word wild_pokemon_data
3 
+
4 
+.org 0x08082D4C
5 
+.word wild_pokemon_data
6 
+
7 
+.org 0x08082E18
8 
+.word wild_pokemon_data
9 
+
10 
+.org 0x08082EA8
11 
+.word wild_pokemon_data
12 
+
13 
+.org 0x08082F18
14 
+.word wild_pokemon_data
15 
+
16 
+.org 0x08082F68
17 
+.word wild_pokemon_data
18 
+
19 
+.org 0x08082FA4
20 
+.word wild_pokemon_data
21 
+
22 
+.org 0x08082FE4
23 
+.word wild_pokemon_data
24 
+
25 
+.org 0x08083024
26 
+.word wild_pokemon_data
27 
+
28 
+.org 0x080830AC
29 
+.word wild_pokemon_data
30 
+
31 
+.org 0x08083288
32 
+.word wild_pokemon_data
33 
+
34 
+.org 0x080832AC
35 
+.word wild_pokemon_data
36 
+
37 
+.org 0x0813CA78
38 
+.word wild_pokemon_data
39 
+
40 
+.org 0x0813CB30
41 
+.word wild_pokemon_data

+ 77
- 0
patches/trainer_sprites/trainer_data.asm 查看文件 

@@ -0,0 +1,77 @@
1 
+//Point to trainer data, which is 4 bytes prior to the first name
2 
+
3 
+.org 0x0800FC00
4 
+.word str_trainer_name_0 -4
5 
+
6 
+.org 0x0800FC80
7 
+.word str_trainer_name_0 -4
8 
+
9 
+.org 0x0801133C
10 
+.word str_trainer_name_0 -4
11 
+
12 
+.org 0x080113BC
13 
+.word str_trainer_name_0 -4
14 
+
15 
+.org 0x080116C4
16 
+.word str_trainer_name_0 -4
17 
+
18 
+.org 0x08015728
19 
+.word str_trainer_name_0 -4
20 
+
21 
+.org 0x08025920
22 
+.word str_trainer_name_0 -4
23 
+
24 
+.org 0x080259DC
25 
+.word str_trainer_name_0 -4
26 
+
27 
+.org 0x08037E6C
28 
+.word str_trainer_name_0 -4
29 
+
30 
+.org 0x08038040
31 
+.word str_trainer_name_0 -4
32 
+
33 
+.org 0x08043694
34 
+.word str_trainer_name_0 -4
35 
+
36 
+.org 0x08043884
37 
+.word str_trainer_name_0 -4
38 
+
39 
+.org 0x08044028
40 
+.word str_trainer_name_0 -4
41 
+
42 
+.org 0x0807FE88
43 
+.word str_trainer_name_0 -4
44 
+
45 
+.org 0x0807FFB8
46 
+.word str_trainer_name_0 -4
47 
+
48 
+.org 0x080C6F40
49 
+.word str_trainer_name_0 -4
50 
+
51 
+.org 0x080D809C
52 
+.word str_trainer_name_0 -4
53 
+
54 
+.org 0x080D8158
55 
+.word str_trainer_name_0 -4
56 
+
57 
+.org 0x08113810
58 
+.word str_trainer_name_0 -4
59 
+
60 
+.org 0x08115230
61 
+.word str_trainer_name_0 -4
62 
+
63 
+.org 0x0812C048
64 
+.word str_trainer_name_0 -4
65 
+
66 
+.org 0x080D80A0
67 
+.word str_trainerclassname_0
68 
+
69 
+.org 0x0811B4B4
70 
+.word str_trainerclassname_0
71 
+
72 
+.org 0x080259CC
73 
+.word trainer_money_rate
74 
+
75 
+//Point to new trainer item data
76 
+.org 0x080C6D9C
77 
+.word str_trainer_name_0 +12

+ 6
- 0
sprites.makefile 查看文件 

@@ -88,6 +88,12 @@ clean:
88 88 
 	rm -f $(GFX_BUILD_DIR)/sprites/front_sprites/*
89 89 
 	rm -f $(GFX_BUILD_DIR)/sprites/back_sprites/*
90 90 
 	rm -f $(GFX_BUILD_DIR)/overworlds/*
91 
+	rm -f $(GFX_BUILD_DIR)/item/*
92 
+	rm -f $(GFX_BUILD_DIR)/boot/*
93 
+	rm -f $(GFX_BUILD_DIR)/char/*
94 
+	rm -f $(GFX_BUILD_DIR)/title_screen/*
95 
+	rm -f $(GFX_BUILD_DIR)/trainer_sprites/*
96 
+
91 97
92 98 
 $(SPRITES_BINARY): $(NORMAL_PAL_OBJ) $(HERO_OBJ) $(SHINY_PAL_OBJ) $(SPRITE_FRONT_OBJ) $(SPRITE_BACK_OBJ) $(NORMAL_CASTFORM_PAL_OBJ) $(SHINY_CASTFORM_PAL_OBJ) $(CASTFORM_FRONT_OBJ) $(CASTFORM_BACK_OBJ) $(OW_OBJ) $(TS_OBJ) $(ITEM_OBJ) $(TITLE_OBJ) $(O_BOOT)
93 99 
 	echo "INPUT($^)" > $(TMP_LD)

+ 0
- 0
src/agb_debug/agb_debug.c 查看文件


+ 0
- 0
string/de/item_description.txt 查看文件


+ 0
- 0
string/de/pkmn_data/pokedex_data.txt 查看文件


+ 0
- 0
string/de/pkmn_data/pokedex_entries.txt 查看文件


+ 0
- 0
string/de/pkmn_data/pokemon_names.txt 查看文件


+ 25
- 0
string/de/trainers/trainer_data.txt 查看文件 

@@ -0,0 +1,25 @@
1 
+@string_len=12
2 
+
3 
+@byte 0, 0, 0, 0
4 
+str_trainer_name_0=
5 
+@hword 0, 0, 0, 0
6 
+@byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
7 
+@word 0
8 
+
9 
+@byte 3, 8, 228, 0
10 
+str_trainer_name_1=Trainer 1 E
11 
+@hword 13, 13, 13, 13
12 
+@byte 0, 1, 0, 0, 0, 11, 0, 0, 1, 0, 0, 0
13 
+@word pokemon_von_id_1
14 
+
15 
+@byte 3, 8, 228, 0
16 
+str_trainer_name_2=Trainer 1 N
17 
+@hword 13, 13, 13, 13
18 
+@byte 0, 1, 0, 0, 0, 11, 0, 0, 1, 0, 0, 0
19 
+@word pokemon_von_id_2
20 
+
21 
+@byte 3, 8, 228, 0
22 
+str_trainer_name_3=Trainer 1 S
23 
+@hword 13, 13, 13, 13
24 
+@byte 0, 1, 0, 0, 0, 11, 0, 0, 1, 0, 0, 0
25 
+@word pokemon_von_id_3

+ 120
- 0
string/de/trainers/trainerclasses.txt 查看文件 

@@ -0,0 +1,120 @@
1 
+@string_len=13
2 
+str_trainerclassname_0=Picknicker
3 
+str_trainerclassname_1=Camper
4 
+str_trainerclassname_2=Pfandfinder
5 
+str_trainerclassname_3=Vogelfänger
6 
+str_trainerclassname_4=Fänger Team
7 
+str_trainerclassname_5=Teenager
8 
+str_trainerclassname_6=Göre
9 
+str_trainerclassname_7=Wanderer
10 
+str_trainerclassname_8=Ass-Trainer
11 
+str_trainerclassname_9=Ass-Duo
12 
+str_trainerclassname_10=Schüler
13 
+str_trainerclassname_11=Schülerin
14 
+str_trainerclassname_12=Schüler-Duo
15 
+str_trainerclassname_13=Zwillinge
16 
+str_trainerclassname_14=Cowgirl
17 
+str_trainerclassname_15=Farmer
18 
+str_trainerclassname_16=Farmer-Duo
19 
+str_trainerclassname_17=Feuerspucker
20 
+str_trainerclassname_18=Medium
21 
+str_trainerclassname_19=Streber
22 
+str_trainerclassname_20=Arbeiter
23 
+str_trainerclassname_21=Angler
24 
+str_trainerclassname_22=Radfahrerin
25 
+str_trainerclassname_23=Radfahrer
26 
+str_trainerclassname_24=Psycho
27 
+str_trainerclassname_25=Psycho-Duo
28 
+str_trainerclassname_26=Vorschülerin
29 
+str_trainerclassname_27=Vorschüler
30 
+str_trainerclassname_28=Künstler
31 
+str_trainerclassname_29=Schwarzgurt
32 
+str_trainerclassname_30=Kämpferin
33 
+str_trainerclassname_31=Ninjajunge
34 
+str_trainerclassname_32=Gentleman
35 
+str_trainerclassname_33=Dame
36 
+str_trainerclassname_34=PKMN-Züchter
37 
+str_trainerclassname_35=Züchter-Duo
38 
+str_trainerclassname_36=PKMN-Ranger
39 
+str_trainerclassname_37=Wache
40 
+str_trainerclassname_38=Polizist
41 
+str_trainerclassname_39=Lady
42 
+str_trainerclassname_40=Schnösel
43 
+str_trainerclassname_41=Edles Paar
44 
+str_trainerclassname_42=Junges Paar
45 
+str_trainerclassname_43=Altes Paar
46 
+str_trainerclassname_44=Experte
47 
+str_trainerclassname_45=Expertin
48 
+str_trainerclassname_46=Käfermaniac
49 
+str_trainerclassname_47=Hexe
50 
+str_trainerclassname_48=Käfersammler
51 
+str_trainerclassname_49=Pokéfan
52 
+str_trainerclassname_50=Rowdy
53 
+str_trainerclassname_51=Raufbold
54 
+str_trainerclassname_52=Hooligans
55 
+str_trainerclassname_53=Joggerin
56 
+str_trainerclassname_54=Jogger
57 
+str_trainerclassname_55=Jogger-Duo
58 
+str_trainerclassname_56=Ski-Fahrer
59 
+str_trainerclassname_57=Ski-Fahrerin
60 
+str_trainerclassname_58=Snowboarder
61 
+str_trainerclassname_59=Korbleger
62 
+str_trainerclassname_60=Footballer
63 
+str_trainerclassname_61=Fußballer
64 
+str_trainerclassname_62=Baseballer
65 
+str_trainerclassname_63=Anhänger
66 
+str_trainerclassname_64=Anhänger-Duo
67 
+str_trainerclassname_65=Gitarristin
68 
+str_trainerclassname_66=Gitarrist
69 
+str_trainerclassname_67=Zoffe
70 
+str_trainerclassname_68=Servierer
71 
+str_trainerclassname_69=Serviererin
72 
+str_trainerclassname_70=Angestellte
73 
+str_trainerclassname_71=Angestellter
74 
+str_trainerclassname_72=Junges Glück
75 
+str_trainerclassname_73=Doktor
76 
+str_trainerclassname_74=Pflegerin
77 
+str_trainerclassname_75=Schirmdame
78 
+str_trainerclassname_76=Backpackerin
79 
+str_trainerclassname_77=Backpacker
80 
+str_trainerclassname_78=Model
81 
+str_trainerclassname_79=Schönheit
82 
+str_trainerclassname_80=Tänzer
83 
+str_trainerclassname_81=Bäckerin
84 
+str_trainerclassname_82=Hausmeister
85 
+str_trainerclassname_83=Kasper
86 
+str_trainerclassname_84=Pilot
87 
+str_trainerclassname_85=Tennis-Ass
88 
+str_trainerclassname_86=Erzieherin
89 
+str_trainerclassname_87=Arenaleiter
90 
+str_trainerclassname_88=PKMN-Trainer
91 
+str_trainerclassname_89=Maler
92 
+str_trainerclassname_90=Top Vier
93 
+str_trainerclassname_91=Dieb
94 
+str_trainerclassname_92=Matrose
95 
+str_trainerclassname_93=Champ
96 
+str_trainerclassname_94=Pokémaniac
97 
+str_trainerclassname_95=PKMN-Sammler
98 
+str_trainerclassname_96=Ruinenmaniac
99 
+str_trainerclassname_97=Hitzkopf
100 
+str_trainerclassname_98=Jongleur
101 
+str_trainerclassname_99=Planscher
102 
+str_trainerclassname_100=Planscherin
103 
+str_trainerclassname_101=Schwimmer
104 
+str_trainerclassname_102=Schwimmerin
105 
+str_trainerclassname_103=Veteran
106 
+str_trainerclassname_104=Lockführer
107 
+str_trainerclassname_105=Drachenprofi
108 
+str_trainerclassname_106=Aromalady
109 
+str_trainerclassname_107=Interviewer
110 
+str_trainerclassname_108=Schwimm-Duo
111 
+str_trainerclassname_109=Forscherin
112 
+str_trainerclassname_110=Froscher
113 
+str_trainerclassname_111=Team Tundra
114 
+str_trainerclassname_112=Tundra Vors.
115 
+str_trainerclassname_113=Tundra Boss
116 
+str_trainerclassname_114=Professor
117 
+str_trainerclassname_115=Myster. Mann
118 
+str_trainerclassname_116=Elektriker
119 
+str_trainerclassname_117=Tundra Duo
120 
+str_trainerclassname_118=Tundra Bosse