· 5 years ago · Nov 25, 2019, 11:06 AM
1 tmlearn 50,53,54
2-db 0 ; padding
3+db BANK(SeelPicFront)
4diff --git a/data/baseStats/shellder.asm b/data/baseStats/shellder.asm
5old mode 100644
6new mode 100755
7index 1a4644cb..3b3cc87e
8--- a/data/baseStats/shellder.asm
9+++ b/data/baseStats/shellder.asm
10@@ -25,4 +25,4 @@ db 5 ; growth rate
11 tmlearn 33,34,36,39
12 tmlearn 44,47
13 tmlearn 49,50,53
14-db 0 ; padding
15+db BANK(ShellderPicFront)
16diff --git a/data/baseStats/slowbro.asm b/data/baseStats/slowbro.asm
17old mode 100644
18new mode 100755
19index f471a646..34ab0ae6
20--- a/data/baseStats/slowbro.asm
21+++ b/data/baseStats/slowbro.asm
22@@ -25,4 +25,4 @@ db 0 ; growth rate
23 tmlearn 33,34,38,39,40
24 tmlearn 44,45,46
25 tmlearn 49,50,53,54,55
26-db 0 ; padding
27+db BANK(SlowbroPicFront)
28diff --git a/data/baseStats/slowpoke.asm b/data/baseStats/slowpoke.asm
29old mode 100644
30new mode 100755
31index f7a1a510..32639f25
32--- a/data/baseStats/slowpoke.asm
33+++ b/data/baseStats/slowpoke.asm
34@@ -25,4 +25,4 @@ db 0 ; growth rate
35 tmlearn 33,34,38,39,40
36 tmlearn 44,45,46
37 tmlearn 49,50,53,54,55
38-db 0 ; padding
39+db BANK(SlowpokePicFront)
40diff --git a/data/baseStats/snorlax.asm b/data/baseStats/snorlax.asm
41old mode 100644
42new mode 100755
43index 62144d31..a31c2828
44--- a/data/baseStats/snorlax.asm
45+++ b/data/baseStats/snorlax.asm
46@@ -25,4 +25,4 @@ db 5 ; growth rate
47 tmlearn 33,34,35,36,38,40
48 tmlearn 44,46,48
49 tmlearn 50,53,54
50-db 0 ; padding
51+db BANK(SnorlaxPicFront)
52diff --git a/data/baseStats/spearow.asm b/data/baseStats/spearow.asm
53old mode 100644
54new mode 100755
55index b7d35b3a..d543dbce
56--- a/data/baseStats/spearow.asm
57+++ b/data/baseStats/spearow.asm
58@@ -25,4 +25,4 @@ db 0 ; growth rate
59 tmlearn 34,39
60 tmlearn 43,44
61 tmlearn 50,52
62-db 0 ; padding
63+db BANK(SpearowPicFront)
64diff --git a/data/baseStats/squirtle.asm b/data/baseStats/squirtle.asm
65old mode 100644
66new mode 100755
67index 1d302a00..af9acacd
68--- a/data/baseStats/squirtle.asm
69+++ b/data/baseStats/squirtle.asm
70@@ -25,4 +25,4 @@ db 3 ; growth rate
71 tmlearn 33,34,40
72 tmlearn 44
73 tmlearn 50,53,54
74-db 0 ; padding
75+db BANK(SquirtlePicFront)
76diff --git a/data/baseStats/starmie.asm b/data/baseStats/starmie.asm
77old mode 100644
78new mode 100755
79index 8ef77af8..7fb47d68
80--- a/data/baseStats/starmie.asm
81+++ b/data/baseStats/starmie.asm
82@@ -25,4 +25,4 @@ db 5 ; growth rate
83 tmlearn 33,34,39,40
84 tmlearn 44,45,46
85 tmlearn 49,50,53,55
86-db 0 ; padding
87+db BANK(StarmiePicFront)
88diff --git a/data/baseStats/staryu.asm b/data/baseStats/staryu.asm
89old mode 100644
90new mode 100755
91index bc774f42..c5c92f42
92--- a/data/baseStats/staryu.asm
93+++ b/data/baseStats/staryu.asm
94@@ -25,4 +25,4 @@ db 5 ; growth rate
95 tmlearn 33,34,39,40
96 tmlearn 44,45,46
97 tmlearn 49,50,53,55
98-db 0 ; padding
99+db BANK(StaryuPicFront)
100diff --git a/data/baseStats/tangela.asm b/data/baseStats/tangela.asm
101old mode 100644
102new mode 100755
103index 8b76bde5..32b206fc
104--- a/data/baseStats/tangela.asm
105+++ b/data/baseStats/tangela.asm
106@@ -25,4 +25,4 @@ db 0 ; growth rate
107 tmlearn 34,40
108 tmlearn 44
109 tmlearn 50,51
110-db 0 ; padding
111+db BANK(TangelaPicFront)
112diff --git a/data/baseStats/tauros.asm b/data/baseStats/tauros.asm
113old mode 100644
114new mode 100755
115index ac55ed65..ff6280b5
116--- a/data/baseStats/tauros.asm
117+++ b/data/baseStats/tauros.asm
118@@ -25,4 +25,4 @@ db 5 ; growth rate
119 tmlearn 34,38,40
120 tmlearn 44
121 tmlearn 50,54
122-db 0 ; padding
123+db BANK(TaurosPicFront)
124diff --git a/data/baseStats/tentacool.asm b/data/baseStats/tentacool.asm
125old mode 100644
126new mode 100755
127index 123d904c..6020af84
128--- a/data/baseStats/tentacool.asm
129+++ b/data/baseStats/tentacool.asm
130@@ -25,4 +25,4 @@ db 5 ; growth rate
131 tmlearn 33,34,40
132 tmlearn 44
133 tmlearn 50,51,53
134-db 0 ; padding
135+db BANK(TentacoolPicFront)
136diff --git a/data/baseStats/tentacruel.asm b/data/baseStats/tentacruel.asm
137old mode 100644
138new mode 100755
139index 9c65fe15..e0a31faf
140--- a/data/baseStats/tentacruel.asm
141+++ b/data/baseStats/tentacruel.asm
142@@ -25,4 +25,4 @@ db 5 ; growth rate
143 tmlearn 33,34,40
144 tmlearn 44
145 tmlearn 50,51,53
146-db 0 ; padding
147+db BANK(TentacruelPicFront)
148diff --git a/data/baseStats/vaporeon.asm b/data/baseStats/vaporeon.asm
149old mode 100644
150new mode 100755
151index 3d5024b5..b824858d
152--- a/data/baseStats/vaporeon.asm
153+++ b/data/baseStats/vaporeon.asm
154@@ -25,4 +25,4 @@ db 0 ; growth rate
155 tmlearn 33,34,39,40
156 tmlearn 44
157 tmlearn 50,53
158-db 0 ; padding
159+db BANK(VaporeonPicFront)
160diff --git a/data/baseStats/venomoth.asm b/data/baseStats/venomoth.asm
161old mode 100644
162new mode 100755
163index 6709e42a..9cd93cd8
164--- a/data/baseStats/venomoth.asm
165+++ b/data/baseStats/venomoth.asm
166@@ -25,4 +25,4 @@ db 0 ; growth rate
167 tmlearn 33,34,39
168 tmlearn 44,46
169 tmlearn 50,55
170-db 0 ; padding
171+db BANK(VenomothPicFront)
172diff --git a/data/baseStats/venonat.asm b/data/baseStats/venonat.asm
173old mode 100644
174new mode 100755
175index ef3db9a1..c68d094d
176--- a/data/baseStats/venonat.asm
177+++ b/data/baseStats/venonat.asm
178@@ -25,4 +25,4 @@ db 0 ; growth rate
179 tmlearn 33,34
180 tmlearn 44,46
181 tmlearn 50,55
182-db 0 ; padding
183+db BANK(VenonatPicFront)
184diff --git a/data/baseStats/venusaur.asm b/data/baseStats/venusaur.asm
185old mode 100644
186new mode 100755
187index d3725735..edf1db77
188--- a/data/baseStats/venusaur.asm
189+++ b/data/baseStats/venusaur.asm
190@@ -25,4 +25,4 @@ db 3 ; growth rate
191 tmlearn 33,34
192 tmlearn 44
193 tmlearn 50,51
194-db 0 ; padding
195+db BANK(VenusaurPicFront)
196diff --git a/data/baseStats/victreebel.asm b/data/baseStats/victreebel.asm
197old mode 100644
198new mode 100755
199index 685ece60..34e4f8ea
200--- a/data/baseStats/victreebel.asm
201+++ b/data/baseStats/victreebel.asm
202@@ -25,4 +25,4 @@ db 3 ; growth rate
203 tmlearn 33,34
204 tmlearn 44
205 tmlearn 50,51
206-db 0 ; padding
207+db BANK(VictreebelPicFront)
208diff --git a/data/baseStats/vileplume.asm b/data/baseStats/vileplume.asm
209old mode 100644
210new mode 100755
211index ed463650..be1a2bf6
212--- a/data/baseStats/vileplume.asm
213+++ b/data/baseStats/vileplume.asm
214@@ -3,7 +3,7 @@ db 75 ; base hp
215 db 80 ; base attack
216 db 85 ; base defense
217 db 50 ; base speed
218-db 100 ; base special
219+db 110 ; base special
220 db GRASS ; species type 1
221 db POISON ; species type 2
222 db 45 ; catch rate
223@@ -25,4 +25,4 @@ db 3 ; growth rate
224 tmlearn 33,34
225 tmlearn 44
226 tmlearn 50,51
227-db 0 ; padding
228+db BANK(VileplumePicFront)
229diff --git a/data/baseStats/voltorb.asm b/data/baseStats/voltorb.asm
230old mode 100644
231new mode 100755
232index ffd12992..b9422989
233--- a/data/baseStats/voltorb.asm
234+++ b/data/baseStats/voltorb.asm
235@@ -25,4 +25,4 @@ db 0 ; growth rate
236 tmlearn 33,34,36,39
237 tmlearn 44,45,47
238 tmlearn 50,55
239-db 0 ; padding
240+db BANK(VoltorbPicFront)
241diff --git a/data/baseStats/vulpix.asm b/data/baseStats/vulpix.asm
242old mode 100644
243new mode 100755
244index b67b9bbd..b1e307a1
245--- a/data/baseStats/vulpix.asm
246+++ b/data/baseStats/vulpix.asm
247@@ -25,4 +25,4 @@ db 0 ; growth rate
248 tmlearn 33,34,38,39,40
249 tmlearn 44
250 tmlearn 50
251-db 0 ; padding
252+db BANK(VulpixPicFront)
253diff --git a/data/baseStats/wartortle.asm b/data/baseStats/wartortle.asm
254old mode 100644
255new mode 100755
256index daf85dc6..00f539a8
257--- a/data/baseStats/wartortle.asm
258+++ b/data/baseStats/wartortle.asm
259@@ -25,4 +25,4 @@ db 3 ; growth rate
260 tmlearn 33,34,40
261 tmlearn 44
262 tmlearn 50,53,54
263-db 0 ; padding
264+db BANK(WartortlePicFront)
265diff --git a/data/baseStats/weedle.asm b/data/baseStats/weedle.asm
266old mode 100644
267new mode 100755
268index 44ca5c2c..6298bed6
269--- a/data/baseStats/weedle.asm
270+++ b/data/baseStats/weedle.asm
271@@ -25,4 +25,4 @@ db 0 ; growth rate
272 tmlearn 0
273 tmlearn 0
274 tmlearn 0
275-db 0 ; padding
276+db BANK(WeedlePicFront)
277diff --git a/data/baseStats/weepinbell.asm b/data/baseStats/weepinbell.asm
278old mode 100644
279new mode 100755
280index 0ac287f8..21d60c8b
281--- a/data/baseStats/weepinbell.asm
282+++ b/data/baseStats/weepinbell.asm
283@@ -25,4 +25,4 @@ db 3 ; growth rate
284 tmlearn 33,34
285 tmlearn 44
286 tmlearn 50,51
287-db 0 ; padding
288+db BANK(WeepinbellPicFront)
289diff --git a/data/baseStats/weezing.asm b/data/baseStats/weezing.asm
290old mode 100644
291new mode 100755
292index 089ef495..6f3d402b
293--- a/data/baseStats/weezing.asm
294+++ b/data/baseStats/weezing.asm
295@@ -25,4 +25,4 @@ db 0 ; growth rate
296 tmlearn 34,36,38
297 tmlearn 44,47
298 tmlearn 50
299-db 0 ; padding
300+db BANK(WeezingPicFront)
301diff --git a/data/baseStats/wigglytuff.asm b/data/baseStats/wigglytuff.asm
302old mode 100644
303new mode 100755
304index 815b1244..ccf75174
305--- a/data/baseStats/wigglytuff.asm
306+++ b/data/baseStats/wigglytuff.asm
307@@ -5,7 +5,7 @@ db 45 ; base defense
308 db 45 ; base speed
309 db 50 ; base special
310 db NORMAL ; species type 1
311-db NORMAL ; species type 2
312+db FAIRY ; species type 2
313 db 50 ; catch rate
314 db 109 ; base exp yield
315 INCBIN "pic/ymon/wigglytuff.pic",0,1 ; 66, sprite dimensions
316@@ -25,4 +25,4 @@ db 4 ; growth rate
317 tmlearn 33,34,38,40
318 tmlearn 44,45,46
319 tmlearn 49,50,54,55
320-db 0 ; padding
321+db BANK(WigglytuffPicFront)
322diff --git a/data/baseStats/zapdos.asm b/data/baseStats/zapdos.asm
323old mode 100644
324new mode 100755
325index b7befb99..d2947e27
326--- a/data/baseStats/zapdos.asm
327+++ b/data/baseStats/zapdos.asm
328@@ -25,4 +25,4 @@ db 5 ; growth rate
329 tmlearn 33,34,39
330 tmlearn 43,44,45
331 tmlearn 50,52,55
332-db 0 ; padding
333+db BANK(ZapdosPicFront)
334diff --git a/data/baseStats/zubat.asm b/data/baseStats/zubat.asm
335old mode 100644
336new mode 100755
337index 7ddad05c..eb188203
338--- a/data/baseStats/zubat.asm
339+++ b/data/baseStats/zubat.asm
340@@ -25,4 +25,4 @@ db 0 ; growth rate
341 tmlearn 34,39
342 tmlearn 44
343 tmlearn 50
344-db 0 ; padding
345+db BANK(ZubatPicFront)
346diff --git a/data/base_stats.asm b/data/base_stats.asm
347index 23e85e0f..6f66d998 100755
348--- a/data/base_stats.asm
349+++ b/data/base_stats.asm
350@@ -109,7 +109,7 @@ INCLUDE "data/baseStats/lickitung.asm"
351 INCLUDE "data/baseStats/koffing.asm"
352 INCLUDE "data/baseStats/weezing.asm"
353 INCLUDE "data/baseStats/rhyhorn.asm"
354-INCLUDE "data/baseStats/rhydon.asm"
355+INCLUDE "data/baseStats/rizeros.asm"
356 INCLUDE "data/baseStats/chansey.asm"
357 INCLUDE "data/baseStats/tangela.asm"
358 INCLUDE "data/baseStats/kangaskhan.asm"
359@@ -149,3 +149,5 @@ INCLUDE "data/baseStats/dragonair.asm"
360 INCLUDE "data/baseStats/dragonite.asm"
361 INCLUDE "data/baseStats/mewtwo.asm"
362 INCLUDE "data/baseStats/mew.asm"
363+INCLUDE "data/baseStats/stahlos.asm"
364+INCLUDE "data/baseStats/iksbat.asm"
365diff --git a/data/bg_map_attributes.asm b/data/bg_map_attributes.asm
366old mode 100644
367new mode 100755
368diff --git a/data/collision.asm b/data/collision.asm
369old mode 100644
370new mode 100755
371diff --git a/data/cries.asm b/data/cries.asm
372index 7031536e..d530a437 100755
373--- a/data/cries.asm
374+++ b/data/cries.asm
375@@ -1,6 +1,6 @@
376 CryData:
377 ;$BaseCry, $Pitch, $Length
378- db $11, $00, $80; Rhydon
379+ db $11, $00, $80; Rizeros
380 db $03, $00, $80; Kangaskhan
381 db $00, $00, $80; Nidoran♂
382 db $19, $CC, $01; Clefairy
383@@ -30,7 +30,7 @@ CryData:
384 db $13, $00, $80; Blastoise
385 db $14, $00, $80; Pinsir
386 db $12, $00, $80; Tangela
387- db $00, $00, $00; MissingNo.
388+ db $17, $FF, $C0; Stahlos
389 db $00, $00, $00; MissingNo.
390 db $1F, $20, $40; Growlithe
391 db $17, $FF, $C0; Onix
392diff --git a/data/evos_moves.asm b/data/evos_moves.asm
393index d819b916..bb1c7483 100755
394--- a/data/evos_moves.asm
395+++ b/data/evos_moves.asm
396@@ -29,8 +29,8 @@ EvosMovesPointerTable:
397 dw Mon009_EvosMoves
398 dw Mon127_EvosMoves
399 dw Mon114_EvosMoves
400- dw Mon152_EvosMoves ;MissingNo
401- dw Mon153_EvosMoves ;MissingNo
402+ dw Mon152_EvosMoves
403+ dw Mon153_EvosMoves
404 dw Mon058_EvosMoves
405 dw Mon095_EvosMoves
406 dw Mon022_EvosMoves
407@@ -191,7 +191,7 @@ EvosMovesPointerTable:
408 dw Mon071_EvosMoves
409
410 Mon112_EvosMoves:
411-;RHYDON
412+;RIZEROS
413 ;Evolutions
414 db 0
415 ;Learnset
416@@ -408,7 +408,7 @@ Mon104_EvosMoves:
417 Mon111_EvosMoves:
418 ;RHYHORN
419 ;Evolutions
420- db EV_LEVEL,42,RHYDON
421+ db EV_LEVEL,42,RIZEROS
422 db 0
423 ;Learnset
424 db 30,STOMP
425@@ -573,17 +573,26 @@ Mon114_EvosMoves:
426 db 0
427
428 Mon152_EvosMoves:
429-;MISSINGNO_1F
430+;STAHLOS
431 ;Evolutions
432 db 0
433 ;Learnset
434- db 0
435+ db 15, BIND
436+ db 19, ROCK_THROW
437+ db 25, RAGE
438+ db 33, SLAM
439+ db 43, HARDEN
440
441 Mon153_EvosMoves:
442-;MISSINGNO_20
443+;IKSBAT
444 ;Evolutions
445 db 0
446 ;Learnset
447+ db 10,SUPERSONIC
448+ db 15,BITE
449+ db 21,CONFUSE_RAY
450+ db 32,WING_ATTACK
451+ db 43,HAZE
452 db 0
453
454 Mon058_EvosMoves:
455@@ -602,6 +611,7 @@ Mon058_EvosMoves:
456 Mon095_EvosMoves:
457 ;ONIX
458 ;Evolutions
459+ db EV_ITEM,METAL_COAT,1,STAHLOS
460 db 0
461 ;Learnset
462 db 15,BIND
463@@ -654,7 +664,7 @@ Mon079_EvosMoves:
464 Mon064_EvosMoves:
465 ;KADABRA
466 ;Evolutions
467- db EV_TRADE,1,ALAKAZAM
468+ db EV_LEVEL,28,ALAKAZAM
469 db 0
470 ;Learnset
471 db 16,CONFUSION
472@@ -668,7 +678,7 @@ Mon064_EvosMoves:
473 Mon075_EvosMoves:
474 ;GRAVELER
475 ;Evolutions
476- db EV_TRADE,1,GOLEM
477+ db EV_LEVEL,36,GOLEM
478 db 0
479 ;Learnset
480 db 11,DEFENSE_CURL
481@@ -696,7 +706,7 @@ Mon113_EvosMoves:
482 Mon067_EvosMoves:
483 ;MACHOKE
484 ;Evolutions
485- db EV_TRADE,1,MACHAMP
486+ db EV_LEVEL,42,MACHAMP
487 db 0
488 ;Learnset
489 db 20,LOW_KICK
490@@ -1505,6 +1515,7 @@ Mon014_EvosMoves:
491 db EV_LEVEL,10,BEEDRILL
492 db 0
493 ;Learnset
494+ db 7,HARDEN
495 db 0
496
497 Mon015_EvosMoves:
498@@ -1575,6 +1586,7 @@ Mon049_EvosMoves:
499 db 22,POISONPOWDER
500 db 27,LEECH_LIFE
501 db 30,STUN_SPORE
502+ db 31,GUST
503 db 38,PSYBEAM
504 db 43,SLEEP_POWDER
505 db 50,PSYCHIC_M
506@@ -1685,6 +1697,7 @@ Mon097_EvosMoves:
507 Mon042_EvosMoves:
508 ;GOLBAT
509 ;Evolutions
510+ db EV_LEVEL,55,IKSBAT
511 db 0
512 ;Learnset
513 db 10,SUPERSONIC
514@@ -1855,7 +1868,7 @@ Mon178_EvosMoves:
515 Mon093_EvosMoves:
516 ;HAUNTER
517 ;Evolutions
518- db EV_TRADE,1,GENGAR
519+ db EV_LEVEL,36,GENGAR
520 db 0
521 ;Learnset
522 db 29,HYPNOSIS
523@@ -2056,10 +2069,13 @@ Mon019_EvosMoves:
524 db EV_LEVEL,20,RATICATE
525 db 0
526 ;Learnset
527- db 7,QUICK_ATTACK
528- db 14,HYPER_FANG
529- db 23,FOCUS_ENERGY
530- db 34,SUPER_FANG
531+ db 4,QUICK_ATTACK
532+ db 7,FOCUS_ENERGY
533+ db 10,BITE
534+ db 16,HYPER_FANG
535+ db 22,KNIRSCHER
536+ db 28,SUPER_FANG
537+ db 31,DOUBLE_EDGE
538 db 0
539
540 Mon020_EvosMoves:
541@@ -2067,10 +2083,13 @@ Mon020_EvosMoves:
542 ;Evolutions
543 db 0
544 ;Learnset
545- db 7,QUICK_ATTACK
546+ db 4,QUICK_ATTACK
547+ db 7,FOCUS_ENERGY
548+ db 10,BITE
549 db 14,HYPER_FANG
550- db 27,FOCUS_ENERGY
551- db 41,SUPER_FANG
552+ db 24,KNIRSCHER
553+ db 34,SUPER_FANG
554+ db 39,DOUBLE_EDGE
555 db 0
556
557 Mon033_EvosMoves:
558diff --git a/data/facing.asm b/data/facing.asm
559old mode 100644
560new mode 100755
561diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm
562index 190c03e9..eb1aeff2 100755
563--- a/data/hidden_objects.asm
564+++ b/data/hidden_objects.asm
565@@ -144,7 +144,7 @@ SeafoamIslands5HiddenObjects:
566 db $ff
567
568 ViridianForestHiddenObjects:
569- hidden_object 18, 1, POTION, HiddenItems
570+ hidden_object 18, 1, TRANK, HiddenItems
571 hidden_object 42, 16, ANTIDOTE, HiddenItems
572 db $ff
573
574@@ -316,7 +316,7 @@ OaksLabHiddenObjects:
575 db $ff
576
577 ViridianCityHiddenObjects:
578- hidden_object 4, 14, POTION, HiddenItems
579+ hidden_object 4, 14, TRANK, HiddenItems
580 db $ff
581
582 ViridianPokecenterHiddenObjects:
583diff --git a/data/item_prices.asm b/data/item_prices.asm
584index 15a1bd34..0872fdfb 100755
585--- a/data/item_prices.asm
586+++ b/data/item_prices.asm
587@@ -2,13 +2,13 @@ ItemPrices:
588 money 0 ; MASTER_BALL
589 money 1200 ; ULTRA_BALL
590 money 600 ; GREAT_BALL
591- money 200 ; POKE_BALL
592+ money 200 ; POKEBALL
593 money 0 ; TOWN_MAP
594 money 0 ; BICYCLE
595 money 0 ; SURFBOARD
596 money 1000 ; SAFARI_BALL
597 money 0 ; POKEDEX
598- money 0 ; MOON_STONE
599+ money 2100 ; MOON_STONE
600 money 100 ; ANTIDOTE
601 money 250 ; BURN_HEAL
602 money 250 ; ICE_HEAL
603@@ -18,7 +18,7 @@ ItemPrices:
604 money 2500 ; MAX_POTION
605 money 1500 ; HYPER_POTION
606 money 700 ; SUPER_POTION
607- money 300 ; POTION
608+ money 300 ; TRANK
609 money 0 ; BOULDERBADGE
610 money 0 ; CASCADEBADGE
611 money 0 ; THUNDERBADGE
612@@ -29,7 +29,7 @@ ItemPrices:
613 money 0 ; EARTHBADGE
614 money 550 ; ESCAPE_ROPE
615 money 350 ; REPEL
616- money 0 ; OLD_AMBER
617+ money 4200 ; OLD_AMBER
618 money 2100 ; FIRE_STONE
619 money 2100 ; THUNDER_STONE
620 money 2100 ; WATER_STONE
621@@ -39,8 +39,8 @@ ItemPrices:
622 money 9800 ; CARBOS
623 money 9800 ; CALCIUM
624 money 4800 ; RARE_CANDY
625- money 0 ; DOME_FOSSIL
626- money 0 ; HELIX_FOSSIL
627+ money 4200 ; DOME_FOSSIL
628+ money 4200 ; HELIX_FOSSIL
629 money 0 ; SECRET_KEY
630 money 0 ; XXX
631 money 0 ; BIKE_VOUCHER
632@@ -96,3 +96,4 @@ ItemPrices:
633 money 0 ; FLOOR_10F
634 money 0 ; FLOOR_11F
635 money 0 ; FLOOR_B4F
636+ money 2100 ; METAL_COAT
637diff --git a/data/mapHeaders/beach_house.asm b/data/mapHeaders/beach_house.asm
638old mode 100644
639new mode 100755
640diff --git a/data/mapHeaders/colosseum.asm b/data/mapHeaders/colosseum.asm
641old mode 100644
642new mode 100755
643diff --git a/data/mapHeaders/route12.asm b/data/mapHeaders/route12.asm
644index b11e0128..2fdc7e90 100755
645--- a/data/mapHeaders/route12.asm
646+++ b/data/mapHeaders/route12.asm
647@@ -2,8 +2,9 @@ Route12_h:
648 db OVERWORLD ; tileset
649 db ROUTE_12_HEIGHT, ROUTE_12_WIDTH ; dimensions (y, x)
650 dw Route12Blocks, Route12TextPointers, Route12Script ; blocks, texts, scripts
651- db NORTH | SOUTH | WEST ; connections
652+ db NORTH | SOUTH | WEST | EAST ; connections
653 NORTH_MAP_CONNECTION ROUTE_12, LAVENDER_TOWN, 0, 0, LavenderTownBlocks
654 SOUTH_MAP_CONNECTION ROUTE_12, ROUTE_13, -3, 17, Route13Blocks
655 WEST_MAP_CONNECTION ROUTE_12, ROUTE_11, 27, 0, Route11Blocks
656+ EAST_MAP_CONNECTION ROUTE_12, ROUTE_26, 0, -2, Route26Blocks
657 dw Route12Object ; objects
658diff --git a/data/mapHeaders/tradecenter.asm b/data/mapHeaders/tradecenter.asm
659old mode 100644
660new mode 100755
661diff --git a/data/mapObjects/beach_house.asm b/data/mapObjects/beach_house.asm
662old mode 100644
663new mode 100755
664diff --git a/data/mapObjects/colosseum.asm b/data/mapObjects/colosseum.asm
665old mode 100644
666new mode 100755
667diff --git a/data/mapObjects/mtmoon1.asm b/data/mapObjects/mtmoon1.asm
668index 42c45016..66a86c26 100755
669--- a/data/mapObjects/mtmoon1.asm
670+++ b/data/mapObjects/mtmoon1.asm
671@@ -19,11 +19,11 @@ MtMoon1Object:
672 object SPRITE_LASS, $10, $17, STAY, DOWN, $5, OPP_LASS, $6
673 object SPRITE_BUG_CATCHER, $7, $16, STAY, DOWN, $6, OPP_BUG_CATCHER, $7
674 object SPRITE_BUG_CATCHER, $1e, $1b, STAY, RIGHT, $7, OPP_BUG_CATCHER, $8
675- object SPRITE_BALL, $2, $14, STAY, NONE, $8, POTION
676+ object SPRITE_BALL, $2, $14, STAY, NONE, $8, TRANK
677 object SPRITE_BALL, $2, $2, STAY, NONE, $9, MOON_STONE
678 object SPRITE_BALL, $23, $1f, STAY, NONE, $a, RARE_CANDY
679 object SPRITE_BALL, $24, $17, STAY, NONE, $b, ESCAPE_ROPE
680- object SPRITE_BALL, $14, $21, STAY, NONE, $c, POTION
681+ object SPRITE_BALL, $14, $21, STAY, NONE, $c, TRANK
682 object SPRITE_BALL, $5, $20, STAY, NONE, $d, TM_12
683
684 ; warp-to
685diff --git a/data/mapObjects/route1.asm b/data/mapObjects/route1.asm
686index 0e6237e7..95f04d29 100755
687--- a/data/mapObjects/route1.asm
688+++ b/data/mapObjects/route1.asm
689@@ -6,9 +6,10 @@ Route1Object:
690 db $1 ; signs
691 db $1b, $9, $3 ; Route1Text3
692
693- db $2 ; objects
694+ db $3 ; objects
695 object SPRITE_BUG_CATCHER, $5, $18, WALK, $1, $1 ; person
696 object SPRITE_BUG_CATCHER, $f, $d, WALK, $2, $2 ; person
697+ object SPRITE_BUG_CATCHER, $d, $6, STAY, RIGHT, $2, OPP_BUG_CATCHER, $10
698
699 ; warp-to (unused)
700 EVENT_DISP $4, $7, $2
701diff --git a/data/mapObjects/tradecenter.asm b/data/mapObjects/tradecenter.asm
702old mode 100644
703new mode 100755
704diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/unknowndungeon3.asm
705index 18439368..9cd48b2b 100755
706--- a/data/mapObjects/unknowndungeon3.asm
707+++ b/data/mapObjects/unknowndungeon3.asm
708@@ -7,7 +7,7 @@ UnknownDungeon3Object:
709 db $0 ; signs
710
711 db $5 ; objects
712- object SPRITE_SLOWBRO, $1b, $d, STAY, DOWN, $1, MEWTWO, 70
713+ object SPRITE_SLOWBRO, $1b, $d, STAY, DOWN, $1, MEWTWO, 2
714 object SPRITE_BALL, $1a, $1, STAY, NONE, $2, ULTRA_BALL
715 object SPRITE_BALL, $2, $d, STAY, NONE, $3, ULTRA_BALL
716 object SPRITE_BALL, $3, $d, STAY, NONE, $4, MAX_REVIVE
717diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/viridianforest.asm
718index 0bb67f82..bc74f814 100755
719--- a/data/mapObjects/viridianforest.asm
720+++ b/data/mapObjects/viridianforest.asm
721@@ -24,9 +24,9 @@ ViridianForestObject:
722 object SPRITE_BUG_CATCHER, $2, $12, STAY, LEFT, $4, OPP_BUG_CATCHER, $3
723 object SPRITE_LASS, $2, $29, STAY, NONE, $5, OPP_LASS, $13
724 object SPRITE_BUG_CATCHER, $d, $11, STAY, RIGHT, $6, OPP_BUG_CATCHER, $f
725- object SPRITE_BALL, $19, $b, STAY, NONE, $7, POTION
726- object SPRITE_BALL, $c, $1d, STAY, NONE, $8, POTION
727- object SPRITE_BALL, $1, $1f, STAY, NONE, $9, POKE_BALL
728+ object SPRITE_BALL, $19, $b, STAY, NONE, $7, TRANK
729+ object SPRITE_BALL, $c, $1d, STAY, NONE, $8, TRANK
730+ object SPRITE_BALL, $1, $1f, STAY, NONE, $9, POKEBALL
731 object SPRITE_BUG_CATCHER, $1b, $28, STAY, NONE, $a ; person
732
733 ; warp-to
734diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
735old mode 100644
736new mode 100755
737index f26b305d..c0c423ee
738--- a/data/map_header_banks.asm
739+++ b/data/map_header_banks.asm
740@@ -249,3 +249,4 @@ MapHeaderBanks::
741 db BANK(Bruno_h)
742 db BANK(Agatha_h)
743 db BANK(BeachHouse_h)
744+ db BANK(Route26_h) ; ROUTE_26
745diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
746old mode 100644
747new mode 100755
748index 325ff4bb..2120096c
749--- a/data/map_header_pointers.asm
750+++ b/data/map_header_pointers.asm
751@@ -249,3 +249,4 @@ MapHeaderPointers::
752 dw Bruno_h
753 dw Agatha_h ;247
754 dw BeachHouse_h
755+ dw Route26_h
756diff --git a/data/map_songs.asm b/data/map_songs.asm
757old mode 100644
758new mode 100755
759index 973f6945..580a166f
760--- a/data/map_songs.asm
761+++ b/data/map_songs.asm
762@@ -248,3 +248,4 @@ MapSongBanks:
763 db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; Bruno
764 db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; Agatha
765 db MUSIC_ROUTES3, BANK(Music_Routes3) ; BeachHouse
766+ db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_26
767diff --git a/data/mart_inventories.asm b/data/mart_inventories.asm
768index b821f4d7..0804380f 100755
769--- a/data/mart_inventories.asm
770+++ b/data/mart_inventories.asm
771@@ -3,22 +3,22 @@
772
773 ; Viridian
774 ViridianCashierText::
775- TX_MART POKE_BALL,POTION,ANTIDOTE,PARLYZ_HEAL,BURN_HEAL
776+ TX_MART POKEBALL,TRANK,ANTIDOTE,PARLYZ_HEAL,BURN_HEAL
777
778 ; Pewter
779 PewterCashierText::
780- TX_MART POKE_BALL,POTION,ESCAPE_ROPE,ANTIDOTE,BURN_HEAL,AWAKENING,PARLYZ_HEAL
781+ TX_MART POKEBALL,TRANK,ESCAPE_ROPE,ANTIDOTE,BURN_HEAL,AWAKENING,PARLYZ_HEAL
782
783 ; Cerulean
784 CeruleanCashierText::
785- TX_MART POKE_BALL,POTION,ESCAPE_ROPE,REPEL,ANTIDOTE,BURN_HEAL,AWAKENING,PARLYZ_HEAL
786+ TX_MART POKEBALL,TRANK,ESCAPE_ROPE,REPEL,ANTIDOTE,BURN_HEAL,AWAKENING,PARLYZ_HEAL
787
788 ; Bike shop
789 TX_MART BICYCLE
790
791 ; Vermilion
792 VermilionCashierText::
793- TX_MART POKE_BALL,SUPER_POTION,ICE_HEAL,AWAKENING,PARLYZ_HEAL,REPEL
794+ TX_MART POKEBALL,SUPER_POTION,ICE_HEAL,AWAKENING,PARLYZ_HEAL,REPEL
795
796 ; Lavender
797 LavenderCashierText::
798@@ -34,7 +34,7 @@ CeladonMart2Clerk2Text::
799
800 ; Celadon Dept. Store 4F
801 CeladonMart4ClerkText::
802- TX_MART POKE_DOLL,FIRE_STONE,THUNDER_STONE,WATER_STONE,LEAF_STONE
803+ TX_MART POKE_DOLL,FIRE_STONE,THUNDER_STONE,WATER_STONE,LEAF_STONE,MOON_STONE
804
805 ; Celadon Dept. Store 5F (1)
806 CeladonMart5Clerk1Text::
807@@ -53,7 +53,7 @@ FuchsiaCashierText::
808
809 ; Cinnabar
810 CinnabarCashierText::
811- TX_MART ULTRA_BALL,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL,REVIVE
812+ TX_MART ULTRA_BALL,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL,REVIVE,OLD_AMBER,DOME_FOSSIL,HELIX_FOSSIL
813
814 ; Saffron
815 SaffronCashierText::
816@@ -61,4 +61,4 @@ SaffronCashierText::
817
818 ; Indigo
819 IndigoCashierText::
820- TX_MART ULTRA_BALL,GREAT_BALL,FULL_RESTORE,MAX_POTION,FULL_HEAL,REVIVE,MAX_REPEL
821+ TX_MART ULTRA_BALL,GREAT_BALL,FULL_RESTORE,MAX_POTION,FULL_HEAL,REVIVE,MAX_REPEL,METAL_COAT
822diff --git a/data/mon_palettes.asm b/data/mon_palettes.asm
823index 8c4d0bc0..a3b8ec7c 100755
824--- a/data/mon_palettes.asm
825+++ b/data/mon_palettes.asm
826@@ -111,7 +111,7 @@ MonsterPalettes:
827 db PAL_PURPLEMON ; KOFFING
828 db PAL_PURPLEMON ; WEEZING
829 db PAL_GREYMON ; RHYHORN
830- db PAL_GREYMON ; RHYDON
831+ db PAL_GREYMON ; RIZEROS
832 db PAL_PINKMON ; CHANSEY
833 db PAL_BLUEMON ; TANGELA
834 db PAL_BROWNMON ; KANGASKHAN
835@@ -151,3 +151,5 @@ MonsterPalettes:
836 db PAL_BROWNMON ; DRAGONITE
837 db PAL_MEWMON ; MEWTWO
838 db PAL_MEWMON ; MEW
839+ db PAL_GREYMON ; STAHLOS
840+ db PAL_PURPLEMON ; IKSBAT
841diff --git a/data/mon_party_sprites.asm b/data/mon_party_sprites.asm
842index 81600f45..694f9cac 100755
843--- a/data/mon_party_sprites.asm
844+++ b/data/mon_party_sprites.asm
845@@ -16,7 +16,7 @@ MonPartyData:
846 dn SPRITE_WATER, SPRITE_WATER ;Squirtle/Wartortle
847 dn SPRITE_WATER, SPRITE_BUG ;Blastoise/Caterpie
848 dn SPRITE_BUG, SPRITE_BUG ;Metapod/Butterfree
849- dn SPRITE_BUG, SPRITE_BUG ;Weedle/Kakuna
850+ dn SPRITE_BUG, SPRITE_BUG ;Weedle/Kakuna
851 dn SPRITE_BUG, SPRITE_BIRD_M ;Beedrill/Pidgey
852 dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Pidgeotto/Pidgeot
853 dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Rattata/Raticate
854@@ -65,7 +65,7 @@ MonPartyData:
855 dn SPRITE_MON, SPRITE_MON ;Marowak/Hitmonlee
856 dn SPRITE_MON, SPRITE_MON ;Hitmonchan/Lickitung
857 dn SPRITE_MON, SPRITE_MON ;Koffing/Weezing
858- dn SPRITE_QUADRUPED, SPRITE_MON ;Rhyhorn/Rhydon
859+ dn SPRITE_QUADRUPED, SPRITE_MON ;Rhyhorn/Rizeros
860 dn SPRITE_FAIRY, SPRITE_GRASS ;Chansey/Tangela
861 dn SPRITE_MON, SPRITE_WATER ;Kangaskhan/Horsea
862 dn SPRITE_WATER, SPRITE_WATER ;Seadra/Goldeen
863@@ -85,4 +85,5 @@ MonPartyData:
864 dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Zapdos/Moltres
865 dn SPRITE_SNAKE, SPRITE_SNAKE ;Dratini/Dragonair
866 dn SPRITE_SNAKE, SPRITE_MON ;Dragonite/Mewtwo
867- dn SPRITE_MON, 0 ;Mew/Padding
868+ dn SPRITE_MON, SPRITE_SNAKE ;Mew/Stahlos
869+ dn SPRITE_MON, 0 ;Iksbat/Padding
870diff --git a/data/moves.asm b/data/moves.asm
871index 44859681..8f8f36b9 100755
872--- a/data/moves.asm
873+++ b/data/moves.asm
874@@ -12,7 +12,7 @@ endm
875
876 move POUND, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35
877 MoveEnd:
878- move KARATE_CHOP, NO_ADDITIONAL_EFFECT, 50, NORMAL, 100, 25
879+ move KARATE_CHOP, NO_ADDITIONAL_EFFECT, 50, FIGHTING, 100, 25
880 move DOUBLESLAP, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 10
881 move COMET_PUNCH, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 85, 15
882 move MEGA_PUNCH, NO_ADDITIONAL_EFFECT, 80, NORMAL, 85, 20
883@@ -26,26 +26,26 @@ MoveEnd:
884 move RAZOR_WIND, CHARGE_EFFECT, 80, NORMAL, 75, 10
885 move SWORDS_DANCE, ATTACK_UP2_EFFECT, 0, NORMAL, 100, 30
886 move CUT, NO_ADDITIONAL_EFFECT, 50, NORMAL, 95, 30
887- move GUST, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35
888- move WING_ATTACK, NO_ADDITIONAL_EFFECT, 35, FLYING, 100, 35
889+ move GUST, NO_ADDITIONAL_EFFECT, 40, FLYING, 100, 35
890+ move WING_ATTACK, NO_ADDITIONAL_EFFECT, 60, FLYING, 100, 35
891 move WHIRLWIND, SWITCH_AND_TELEPORT_EFFECT, 0, NORMAL, 85, 20
892- move FLY, FLY_EFFECT, 70, FLYING, 95, 15
893- move BIND, TRAPPING_EFFECT, 15, NORMAL, 75, 20
894+ move FLY, FLY_EFFECT, 90, FLYING, 95, 15
895+ move BIND, TRAPPING_EFFECT, 15, NORMAL, 85, 20
896 move SLAM, NO_ADDITIONAL_EFFECT, 80, NORMAL, 75, 20
897- move VINE_WHIP, NO_ADDITIONAL_EFFECT, 35, GRASS, 100, 10
898+ move VINE_WHIP, NO_ADDITIONAL_EFFECT, 45, GRASS, 100, 10
899 move STOMP, FLINCH_SIDE_EFFECT2, 65, NORMAL, 100, 20
900 move DOUBLE_KICK, ATTACK_TWICE_EFFECT, 30, FIGHTING, 100, 30
901 move MEGA_KICK, NO_ADDITIONAL_EFFECT, 120, NORMAL, 75, 5
902- move JUMP_KICK, JUMP_KICK_EFFECT, 70, FIGHTING, 95, 25
903+ move JUMP_KICK, JUMP_KICK_EFFECT, 100, FIGHTING, 95, 10
904 move ROLLING_KICK, FLINCH_SIDE_EFFECT2, 60, FIGHTING, 85, 15
905 move SAND_ATTACK, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 100, 15
906 move HEADBUTT, FLINCH_SIDE_EFFECT2, 70, NORMAL, 100, 15
907 move HORN_ATTACK, NO_ADDITIONAL_EFFECT, 65, NORMAL, 100, 25
908 move FURY_ATTACK, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 20
909 move HORN_DRILL, OHKO_EFFECT, 1, NORMAL, 30, 5
910- move TACKLE, NO_ADDITIONAL_EFFECT, 35, NORMAL, 95, 35
911+ move TACKLE, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35
912 move BODY_SLAM, PARALYZE_SIDE_EFFECT2, 85, NORMAL, 100, 15
913- move WRAP, TRAPPING_EFFECT, 15, NORMAL, 85, 20
914+ move WRAP, TRAPPING_EFFECT, 15, NORMAL, 90, 20
915 move TAKE_DOWN, RECOIL_EFFECT, 90, NORMAL, 85, 20
916 move THRASH, THRASH_PETAL_DANCE_EFFECT, 90, NORMAL, 100, 20
917 move DOUBLE_EDGE, RECOIL_EFFECT, 100, NORMAL, 100, 15
918@@ -54,7 +54,7 @@ MoveEnd:
919 move TWINEEDLE, TWINEEDLE_EFFECT, 25, BUG, 100, 20
920 move PIN_MISSILE, TWO_TO_FIVE_ATTACKS_EFFECT, 14, BUG, 85, 20
921 move LEER, DEFENSE_DOWN1_EFFECT, 0, NORMAL, 100, 30
922- move BITE, FLINCH_SIDE_EFFECT1, 60, NORMAL, 100, 25
923+ move BITE, FLINCH_SIDE_EFFECT1, 60, DARK, 100, 25
924 move GROWL, ATTACK_DOWN1_EFFECT, 0, NORMAL, 100, 40
925 move ROAR, SWITCH_AND_TELEPORT_EFFECT, 0, NORMAL, 100, 20
926 move SING, SLEEP_EFFECT, 0, NORMAL, 55, 15
927@@ -63,13 +63,13 @@ MoveEnd:
928 move DISABLE, DISABLE_EFFECT, 0, NORMAL, 55, 20
929 move ACID, DEFENSE_DOWN_SIDE_EFFECT, 40, POISON, 100, 30
930 move EMBER, BURN_SIDE_EFFECT1, 40, FIRE, 100, 25
931- move FLAMETHROWER, BURN_SIDE_EFFECT1, 95, FIRE, 100, 15
932+ move FLAMETHROWER, BURN_SIDE_EFFECT1, 90, FIRE, 100, 15
933 move MIST, MIST_EFFECT, 0, ICE, 100, 30
934 move WATER_GUN, NO_ADDITIONAL_EFFECT, 40, WATER, 100, 25
935- move HYDRO_PUMP, NO_ADDITIONAL_EFFECT, 120, WATER, 80, 5
936- move SURF, NO_ADDITIONAL_EFFECT, 95, WATER, 100, 15
937- move ICE_BEAM, FREEZE_SIDE_EFFECT, 95, ICE, 100, 10
938- move BLIZZARD, FREEZE_SIDE_EFFECT, 120, ICE, 90, 5
939+ move HYDRO_PUMP, NO_ADDITIONAL_EFFECT, 110, WATER, 80, 5
940+ move SURF, NO_ADDITIONAL_EFFECT, 90, WATER, 100, 15
941+ move ICE_BEAM, FREEZE_SIDE_EFFECT, 90, ICE, 100, 10
942+ move BLIZZARD, FREEZE_SIDE_EFFECT, 110, ICE, 90, 5
943 move PSYBEAM, CONFUSION_SIDE_EFFECT, 65, PSYCHIC, 100, 20
944 move BUBBLEBEAM, SPEED_DOWN_SIDE_EFFECT, 65, WATER, 100, 20
945 move AURORA_BEAM, ATTACK_DOWN_SIDE_EFFECT, 65, ICE, 100, 20
946@@ -77,12 +77,12 @@ MoveEnd:
947 move PECK, NO_ADDITIONAL_EFFECT, 35, FLYING, 100, 35
948 move DRILL_PECK, NO_ADDITIONAL_EFFECT, 80, FLYING, 100, 20
949 move SUBMISSION, RECOIL_EFFECT, 80, FIGHTING, 80, 25
950- move LOW_KICK, FLINCH_SIDE_EFFECT2, 50, FIGHTING, 90, 20
951+ move LOW_KICK, FLINCH_SIDE_EFFECT2, 50, FIGHTING, 100, 20
952 move COUNTER, NO_ADDITIONAL_EFFECT, 1, FIGHTING, 100, 20
953 move SEISMIC_TOSS, SPECIAL_DAMAGE_EFFECT, 1, FIGHTING, 100, 20
954 move STRENGTH, NO_ADDITIONAL_EFFECT, 80, NORMAL, 100, 15
955- move ABSORB, DRAIN_HP_EFFECT, 20, GRASS, 100, 20
956- move MEGA_DRAIN, DRAIN_HP_EFFECT, 40, GRASS, 100, 10
957+ move ABSORB, DRAIN_HP_EFFECT, 40, GRASS, 100, 25
958+ move MEGA_DRAIN, DRAIN_HP_EFFECT, 40, GRASS, 100, 15
959 move LEECH_SEED, LEECH_SEED_EFFECT, 0, GRASS, 90, 10
960 move GROWTH, SPECIAL_UP1_EFFECT, 0, NORMAL, 100, 40
961 move RAZOR_LEAF, NO_ADDITIONAL_EFFECT, 55, GRASS, 95, 25
962@@ -90,18 +90,18 @@ MoveEnd:
963 move POISONPOWDER, POISON_EFFECT, 0, POISON, 75, 35
964 move STUN_SPORE, PARALYZE_EFFECT, 0, GRASS, 75, 30
965 move SLEEP_POWDER, SLEEP_EFFECT, 0, GRASS, 75, 15
966- move PETAL_DANCE, THRASH_PETAL_DANCE_EFFECT, 70, GRASS, 100, 20
967- move STRING_SHOT, SPEED_DOWN1_EFFECT, 0, BUG, 95, 40
968+ move PETAL_DANCE, THRASH_PETAL_DANCE_EFFECT, 120, GRASS, 100, 10
969+ move STRING_SHOT, SPEED_DOWN2_EFFECT, 0, BUG, 95, 40
970 move DRAGON_RAGE, SPECIAL_DAMAGE_EFFECT, 1, DRAGON, 100, 10
971- move FIRE_SPIN, TRAPPING_EFFECT, 15, FIRE, 70, 15
972+ move FIRE_SPIN, TRAPPING_EFFECT, 35, FIRE, 85, 15
973 move THUNDERSHOCK, PARALYZE_SIDE_EFFECT1, 40, ELECTRIC, 100, 30
974- move THUNDERBOLT, PARALYZE_SIDE_EFFECT1, 95, ELECTRIC, 100, 15
975+ move THUNDERBOLT, PARALYZE_SIDE_EFFECT1, 90, ELECTRIC, 100, 15
976 move THUNDER_WAVE, PARALYZE_EFFECT, 0, ELECTRIC, 100, 20
977- move THUNDER, PARALYZE_SIDE_EFFECT1, 120, ELECTRIC, 70, 10
978- move ROCK_THROW, NO_ADDITIONAL_EFFECT, 50, ROCK, 65, 15
979+ move THUNDER, PARALYZE_SIDE_EFFECT1, 110, ELECTRIC, 70, 10
980+ move ROCK_THROW, NO_ADDITIONAL_EFFECT, 50, ROCK, 90, 15
981 move EARTHQUAKE, NO_ADDITIONAL_EFFECT, 100, GROUND, 100, 10
982 move FISSURE, OHKO_EFFECT, 1, GROUND, 30, 5
983- move DIG, CHARGE_EFFECT, 100, GROUND, 100, 10
984+ move DIG, CHARGE_EFFECT, 80, GROUND, 100, 10
985 move TOXIC, POISON_EFFECT, 0, POISON, 85, 10
986 move CONFUSION, CONFUSION_SIDE_EFFECT, 50, PSYCHIC, 100, 25
987 move PSYCHIC_M, SPECIAL_DOWN_SIDE_EFFECT, 90, PSYCHIC, 100, 10
988@@ -115,7 +115,7 @@ MoveEnd:
989 move MIMIC, MIMIC_EFFECT, 0, NORMAL, 100, 10
990 move SCREECH, DEFENSE_DOWN2_EFFECT, 0, NORMAL, 85, 40
991 move DOUBLE_TEAM, EVASION_UP1_EFFECT, 0, NORMAL, 100, 15
992- move RECOVER, HEAL_EFFECT, 0, NORMAL, 100, 20
993+ move RECOVER, HEAL_EFFECT, 0, NORMAL, 100, 10
994 move HARDEN, DEFENSE_UP1_EFFECT, 0, NORMAL, 100, 30
995 move MINIMIZE, EVASION_UP1_EFFECT, 0, NORMAL, 100, 20
996 move SMOKESCREEN, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 100, 20
997@@ -132,38 +132,38 @@ MoveEnd:
998 move MIRROR_MOVE, MIRROR_MOVE_EFFECT, 0, FLYING, 100, 20
999 move SELFDESTRUCT, EXPLODE_EFFECT, 130, NORMAL, 100, 5
1000 move EGG_BOMB, NO_ADDITIONAL_EFFECT, 100, NORMAL, 75, 10
1001- move LICK, PARALYZE_SIDE_EFFECT2, 20, GHOST, 100, 30
1002- move SMOG, POISON_SIDE_EFFECT2, 20, POISON, 70, 20
1003+ move LICK, PARALYZE_SIDE_EFFECT2, 30, GHOST, 100, 30
1004+ move SMOG, POISON_SIDE_EFFECT2, 30, POISON, 70, 20
1005 move SLUDGE, POISON_SIDE_EFFECT2, 65, POISON, 100, 20
1006 move BONE_CLUB, FLINCH_SIDE_EFFECT1, 65, GROUND, 85, 20
1007- move FIRE_BLAST, BURN_SIDE_EFFECT2, 120, FIRE, 85, 5
1008+ move FIRE_BLAST, BURN_SIDE_EFFECT2, 110, FIRE, 85, 5
1009 move WATERFALL, NO_ADDITIONAL_EFFECT, 80, WATER, 100, 15
1010 move CLAMP, TRAPPING_EFFECT, 35, WATER, 75, 10
1011 move SWIFT, SWIFT_EFFECT, 60, NORMAL, 100, 20
1012- move SKULL_BASH, CHARGE_EFFECT, 100, NORMAL, 100, 15
1013+ move SKULL_BASH, CHARGE_EFFECT, 130, NORMAL, 100, 10
1014 move SPIKE_CANNON, TWO_TO_FIVE_ATTACKS_EFFECT, 20, NORMAL, 100, 15
1015 move CONSTRICT, SPEED_DOWN_SIDE_EFFECT, 10, NORMAL, 100, 35
1016 move AMNESIA, SPECIAL_UP2_EFFECT, 0, PSYCHIC, 100, 20
1017 move KINESIS, ACCURACY_DOWN1_EFFECT, 0, PSYCHIC, 80, 15
1018 move SOFTBOILED, HEAL_EFFECT, 0, NORMAL, 100, 10
1019- move HI_JUMP_KICK, JUMP_KICK_EFFECT, 85, FIGHTING, 90, 20
1020+ move HI_JUMP_KICK, JUMP_KICK_EFFECT, 130, FIGHTING, 90, 10
1021 move GLARE, PARALYZE_EFFECT, 0, NORMAL, 75, 30
1022 move DREAM_EATER, DREAM_EATER_EFFECT, 100, PSYCHIC, 100, 15
1023 move POISON_GAS, POISON_EFFECT, 0, POISON, 55, 40
1024 move BARRAGE, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 20
1025- move LEECH_LIFE, DRAIN_HP_EFFECT, 20, BUG, 100, 15
1026+ move LEECH_LIFE, DRAIN_HP_EFFECT, 80, BUG, 100, 10
1027 move LOVELY_KISS, SLEEP_EFFECT, 0, NORMAL, 75, 10
1028 move SKY_ATTACK, CHARGE_EFFECT, 140, FLYING, 90, 5
1029 move TRANSFORM, TRANSFORM_EFFECT, 0, NORMAL, 100, 10
1030- move BUBBLE, SPEED_DOWN_SIDE_EFFECT, 20, WATER, 100, 30
1031+ move BUBBLE, SPEED_DOWN_SIDE_EFFECT, 40, WATER, 100, 30
1032 move DIZZY_PUNCH, NO_ADDITIONAL_EFFECT, 70, NORMAL, 100, 10
1033 move SPORE, SLEEP_EFFECT, 0, GRASS, 100, 15
1034 move FLASH, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 70, 20
1035 move PSYWAVE, SPECIAL_DAMAGE_EFFECT, 1, PSYCHIC, 80, 15
1036 move SPLASH, SPLASH_EFFECT, 0, NORMAL, 100, 40
1037 move ACID_ARMOR, DEFENSE_UP2_EFFECT, 0, POISON, 100, 40
1038- move CRABHAMMER, NO_ADDITIONAL_EFFECT, 90, WATER, 85, 10
1039- move EXPLOSION, EXPLODE_EFFECT, 170, NORMAL, 100, 5
1040+ move CRABHAMMER, NO_ADDITIONAL_EFFECT, 100, WATER, 90, 10
1041+ move EXPLOSION, EXPLODE_EFFECT, 250, NORMAL, 100, 5
1042 move FURY_SWIPES, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 80, 15
1043 move BONEMERANG, ATTACK_TWICE_EFFECT, 50, GROUND, 90, 10
1044 move REST, HEAL_EFFECT, 0, PSYCHIC, 100, 10
1045@@ -175,4 +175,5 @@ MoveEnd:
1046 move SUPER_FANG, SUPER_FANG_EFFECT, 1, NORMAL, 90, 10
1047 move SLASH, NO_ADDITIONAL_EFFECT, 70, NORMAL, 100, 20
1048 move SUBSTITUTE, SUBSTITUTE_EFFECT, 0, NORMAL, 100, 10
1049+ move BITE, FLINCH_SIDE_EFFECT1, 80, DARK, 100, 15
1050 move STRUGGLE, RECOIL_EFFECT, 50, NORMAL, 100, 10
1051diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm
1052index a1dad53a..0dd5319a 100755
1053--- a/data/pokedex_entries.asm
1054+++ b/data/pokedex_entries.asm
1055@@ -1,5 +1,5 @@
1056 PokedexEntryPointers:
1057- dw RhydonDexEntry
1058+ dw RizerosDexEntry
1059 dw KangaskhanDexEntry
1060 dw NidoranMDexEntry
1061 dw ClefairyDexEntry
1062@@ -29,8 +29,8 @@ PokedexEntryPointers:
1063 dw BlastoiseDexEntry
1064 dw PinsirDexEntry
1065 dw TangelaDexEntry
1066- dw MissingNoDexEntry
1067- dw MissingNoDexEntry
1068+ dw StahlosDexEntry
1069+ dw IksbatDexEntry
1070 dw GrowlitheDexEntry
1071 dw OnixDexEntry
1072 dw FearowDexEntry
1073@@ -972,11 +972,11 @@ RhyhornDexEntry:
1074 TX_FAR _RhyhornDexEntry
1075 db "@"
1076
1077-RhydonDexEntry:
1078+RizerosDexEntry:
1079 db "DRILL@"
1080 db 6,3
1081 dw 2650
1082- TX_FAR _RhydonDexEntry
1083+ TX_FAR _RizerosDexEntry
1084 db "@"
1085
1086 ChanseyDexEntry:
1087@@ -992,7 +992,7 @@ TangelaDexEntry:
1088 dw 770
1089 TX_FAR _TangelaDexEntry
1090 db "@"
1091-
1092+
1093 KangaskhanDexEntry:
1094 db "PARENT@"
1095 db 7,3
1096@@ -1251,6 +1251,21 @@ MewDexEntry:
1097 dw 90
1098 TX_FAR _MewDexEntry
1099 db "@"
1100+
1101+StahlosDexEntry:
1102+ db "Stahlboa@"
1103+ db 30,02
1104+ dw 8818
1105+ TX_FAR _StahlosDexEntry
1106+ db "@"
1107+
1108+IksbatDexEntry:
1109+ db "Fledermaus@"
1110+ db 5,11
1111+ dw 1653
1112+ TX_FAR _IksbatDexEntry
1113+ db "@"
1114+
1115
1116 MissingNoDexEntry:
1117 db "???@"
1118diff --git a/data/pokedex_order.asm b/data/pokedex_order.asm
1119index 0e293946..3e21ecaa 100755
1120--- a/data/pokedex_order.asm
1121+++ b/data/pokedex_order.asm
1122@@ -1,5 +1,5 @@
1123 PokedexOrder:
1124- db DEX_RHYDON
1125+ db DEX_RIZEROS
1126 db DEX_KANGASKHAN
1127 db DEX_NIDORAN_M
1128 db DEX_CLEFAIRY
1129@@ -29,8 +29,8 @@ PokedexOrder:
1130 db DEX_BLASTOISE
1131 db DEX_PINSIR
1132 db DEX_TANGELA
1133- db 0 ; MISSINGNO.
1134- db 0 ; MISSINGNO.
1135+ db DEX_STAHLOS
1136+ db DEX_IKSBAT
1137 db DEX_GROWLITHE
1138 db DEX_ONIX
1139 db DEX_FEAROW
1140diff --git a/data/town_map_entries.asm b/data/town_map_entries.asm
1141index e9ced645..fef48061 100755
1142--- a/data/town_map_entries.asm
1143+++ b/data/town_map_entries.asm
1144@@ -36,6 +36,7 @@ ExternalMapEntries:
1145 EMAP $0,$6,Route23Name
1146 EMAP $A,$1,Route24Name
1147 EMAP $B,$0,Route25Name
1148+ EMAP $E,$B,Route26Name
1149
1150 InternalMapEntries:
1151 IMAP OAKS_LAB, $2,$B,PalletTownName
1152diff --git a/data/town_map_order.asm b/data/town_map_order.asm
1153index 10131a31..ff836fc0 100755
1154--- a/data/town_map_order.asm
1155+++ b/data/town_map_order.asm
1156@@ -46,4 +46,5 @@ TownMapOrder:
1157 db VICTORY_ROAD_3
1158 db INDIGO_PLATEAU
1159 db POWER_PLANT
1160+ db ROUTE_26
1161 TownMapOrderEnd:
1162diff --git a/data/trades.asm b/data/trades.asm
1163index 4fa52d30..a4a8e1f4 100755
1164--- a/data/trades.asm
1165+++ b/data/trades.asm
1166@@ -7,6 +7,6 @@ TradeMons:
1167 db MEW, MEW, 2,"BART@@@@@@@"
1168 db TANGELA, PARASECT,0,"SPIKE@@@@@@"
1169 db PIDGEOT, PIDGEOT, 1,"MARTY@@@@@@"
1170- db GOLDUCK, RHYDON, 1,"BUFFY@@@@@@"
1171+ db GOLDUCK, RIZEROS, 1,"BUFFY@@@@@@"
1172 db GROWLITHE, DEWGONG, 2,"CEZANNE@@@@"
1173 db CUBONE, MACHOKE, 2,"RICKY@@@@@@"
1174diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm
1175index 865d1907..085b126c 100755
1176--- a/data/trainer_parties.asm
1177+++ b/data/trainer_parties.asm
1178@@ -87,6 +87,7 @@ BugCatcherData:
1179 db 19,BEEDRILL,BEEDRILL,0
1180 db 20,CATERPIE,WEEDLE,VENONAT,0
1181 db 8,CATERPIE,METAPOD,0
1182+ db 4,CATERPIE,WEEDLE,0
1183 LassData:
1184 db 9,PIDGEY,PIDGEY,0
1185 db 10,RATTATA,NIDORAN_M,0
1186@@ -362,7 +363,7 @@ ScientistData:
1187 GiovanniData:
1188 db $FF,25,ONIX,24,RHYHORN,29,PERSIAN,0
1189 db $FF,37,NIDORINO,35,PERSIAN,37,RHYHORN,41,NIDOQUEEN,0
1190- db $FF,50,DUGTRIO,53,PERSIAN,53,NIDOQUEEN,55,NIDOKING,55,RHYDON,0
1191+ db $FF,50,DUGTRIO,53,PERSIAN,53,NIDOQUEEN,55,NIDOKING,55,RIZEROS,58,KANGASKHAN,0
1192 RocketData:
1193 db 13,RATTATA,ZUBAT,0
1194 db 11,SANDSHREW,RATTATA,ZUBAT,0
1195@@ -436,19 +437,19 @@ CooltrainerFData:
1196 db 45,NIDORINA,NIDOQUEEN,0
1197 db 43,PERSIAN,NINETALES,RAICHU,0
1198 BrunoData:
1199- db $FF,53,ONIX,55,HITMONCHAN,55,HITMONLEE,56,ONIX,58,MACHAMP,0
1200+ db $FF,73,ONIX,75,HITMONCHAN,75,HITMONLEE,76,STAHLOS,78,MACHAMP,80,GOLEM,0
1201 BrockData:
1202- db $FF,10,GEODUDE,12,ONIX,0
1203+ db $FF,12,GEODUDE,14,ONIX,17,VULPIX,0
1204 MistyData:
1205- db $FF,18,STARYU,21,STARMIE,0
1206+ db $FF,18,STARYU,21,STARMIE,24,GOLDEEN,0
1207 LtSurgeData:
1208- db $FF,28,RAICHU,0
1209+ db $FF,28,RAICHU,24,PIKACHU,23,VOLTORB,26,MAGNEMITE,0
1210 ErikaData:
1211- db $FF,30,TANGELA,32,WEEPINBELL,32,GLOOM,0
1212+ db $FF,30,TANGELA,32,VICTREEBEL,32,VILEPLUME,0
1213 KogaData:
1214- db $FF,44,VENONAT,46,VENONAT,48,VENONAT,50,VENOMOTH,0
1215+ db $FF,44,VENONAT,45,WEEZING,46,VENONAT,48,VENONAT,50,VENOMOTH,52,WEEZING,0
1216 BlaineData:
1217- db $FF,48,NINETALES,50,RAPIDASH,54,ARCANINE,0
1218+ db $FF,48,NINETALES,50,RAPIDASH,54,ARCANINE,58,CHARIZARD,0
1219 SabrinaData:
1220 db $FF,50,ABRA,50,KADABRA,50,ALAKAZAM,0
1221 GentlemanData:
1222@@ -469,11 +470,11 @@ Green2Data:
1223 db $FF,47,SANDSLASH,45,EXEGGCUTE,45,CLOYSTER,47,MAGNETON,50,KADABRA,53,FLAREON,0
1224 db $FF,47,SANDSLASH,45,EXEGGCUTE,45,MAGNETON,47,NINETALES,50,KADABRA,53,VAPOREON,0
1225 Green3Data:
1226- db $FF,61,SANDSLASH,59,ALAKAZAM,61,EXEGGUTOR,61,CLOYSTER,63,NINETALES,65,JOLTEON,0
1227- db $FF,61,SANDSLASH,59,ALAKAZAM,61,EXEGGUTOR,61,MAGNETON,63,CLOYSTER,65,FLAREON,0
1228- db $FF,61,SANDSLASH,59,ALAKAZAM,61,EXEGGUTOR,61,NINETALES,63,MAGNETON,65,VAPOREON,0
1229+ db $FF,84,SANDSLASH,82,ALAKAZAM,84,EXEGGUTOR,84,CLOYSTER,86,NINETALES,88,JOLTEON,0
1230+ db $FF,84,SANDSLASH,82,ALAKAZAM,84,EXEGGUTOR,84,MAGNETON,86,CLOYSTER,88,FLAREON,0
1231+ db $FF,84,SANDSLASH,82,ALAKAZAM,84,EXEGGUTOR,84,NINETALES,86,MAGNETON,88,VAPOREON,0
1232 LoreleiData:
1233- db $FF,54,DEWGONG,53,CLOYSTER,54,SLOWBRO,56,JYNX,56,LAPRAS,0
1234+ db $FF,74,DEWGONG,73,CLOYSTER,74,SLOWBRO,76,JYNX,76,LAPRAS,78,KINGLER,0
1235 ChannelerData:
1236 db 22,GASTLY,0
1237 db 24,GASTLY,0
1238@@ -500,6 +501,6 @@ ChannelerData:
1239 db 38,HAUNTER,0
1240 db 33,GASTLY,GASTLY,HAUNTER,0
1241 AgathaData:
1242- db $FF,56,GENGAR,56,GOLBAT,55,HAUNTER,58,ARBOK,60,GENGAR,0
1243+ db $FF,76,GENGAR,76,GOLBAT,75,HAUNTER,78,ARBOK,80,GENGAR,82,MUK,0
1244 LanceData:
1245- db $FF,58,GYARADOS,56,DRAGONAIR,56,DRAGONAIR,60,AERODACTYL,62,DRAGONITE,0
1246+ db $FF,78,GYARADOS,76,DRAGONAIR,76,DRAGONAIR,80,AERODACTYL,82,DRAGONITE,85,DRAGONITE,0
1247diff --git a/data/type_effects.asm b/data/type_effects.asm
1248index 1321a3d9..102f553c 100755
1249--- a/data/type_effects.asm
1250+++ b/data/type_effects.asm
1251@@ -4,40 +4,46 @@ TypeEffects:
1252 ; 20 is ×2.0
1253 ; 05 is ×0.5
1254 ; 00 is ×0
1255- db WATER,FIRE,20
1256- db FIRE,GRASS,20
1257- db FIRE,ICE,20
1258- db GRASS,WATER,20
1259- db ELECTRIC,WATER,20
1260- db WATER,ROCK,20
1261- db GROUND,FLYING,00
1262- db WATER,WATER,05
1263- db FIRE,FIRE,05
1264- db ELECTRIC,ELECTRIC,05
1265- db ICE,ICE,05
1266- db GRASS,GRASS,05
1267- db PSYCHIC,PSYCHIC,05
1268- db FIRE,WATER,05
1269- db GRASS,FIRE,05
1270- db WATER,GRASS,05
1271- db ELECTRIC,GRASS,05
1272 db NORMAL,ROCK,05
1273 db NORMAL,GHOST,00
1274- db GHOST,GHOST,20
1275+ db NORMAL,STEEL,05
1276+ db FIRE,FIRE,05
1277+ db FIRE,WATER,05
1278+ db FIRE,GRASS,20
1279+ db FIRE,ICE,20
1280 db FIRE,BUG,20
1281 db FIRE,ROCK,05
1282+ db FIRE,DRAGON,05
1283+ db FIRE,STEEL,20
1284+ db WATER,FIRE,20
1285+ db WATER,WATER,05
1286+ db WATER,GRASS,05
1287 db WATER,GROUND,20
1288+ db WATER,ROCK,20
1289+ db WATER,DRAGON,05
1290+ db ELECTRIC,WATER,20
1291+ db ELECTRIC,ELECTRIC,05
1292+ db ELECTRIC,GRASS,05
1293 db ELECTRIC,GROUND,00
1294 db ELECTRIC,FLYING,20
1295+ db ELECTRIC,DRAGON,05
1296+ db GRASS,FIRE,05
1297+ db GRASS,WATER,20
1298+ db GRASS,GRASS,05
1299 db GRASS,GROUND,20
1300 db GRASS,BUG,05
1301 db GRASS,POISON,05
1302 db GRASS,ROCK,20
1303 db GRASS,FLYING,05
1304+ db GRASS,DRAGON,05
1305+ db GRASS,STEEL,05
1306 db ICE,WATER,05
1307 db ICE,GRASS,20
1308+ db ICE,ICE,05
1309 db ICE,GROUND,20
1310 db ICE,FLYING,20
1311+ db ICE,DRAGON,20
1312+ db ICE,STEEL,05
1313 db FIGHTING,NORMAL,20
1314 db FIGHTING,POISON,05
1315 db FIGHTING,FLYING,05
1316@@ -46,25 +52,36 @@ TypeEffects:
1317 db FIGHTING,ROCK,20
1318 db FIGHTING,ICE,20
1319 db FIGHTING,GHOST,00
1320+ db FIGHTING,STEEL,20
1321+ db FIGHTING,DARK,20
1322+ db FIGHTING,FAIRY,05
1323 db POISON,GRASS,20
1324 db POISON,POISON,05
1325 db POISON,GROUND,05
1326 db POISON,BUG,20
1327 db POISON,ROCK,05
1328 db POISON,GHOST,05
1329+ db POISON,STEEL,00
1330+ db POISON,FAIRY,20
1331 db GROUND,FIRE,20
1332 db GROUND,ELECTRIC,20
1333 db GROUND,GRASS,05
1334+ db GROUND,FLYING,00
1335 db GROUND,BUG,05
1336 db GROUND,ROCK,20
1337 db GROUND,POISON,20
1338+ db GROUND,STEEL,20
1339 db FLYING,ELECTRIC,05
1340 db FLYING,FIGHTING,20
1341 db FLYING,BUG,20
1342 db FLYING,GRASS,20
1343 db FLYING,ROCK,05
1344+ db FLYING,STEEL,05
1345 db PSYCHIC,FIGHTING,20
1346 db PSYCHIC,POISON,20
1347+ db PSYCHIC,PSYCHIC,05
1348+ db PSYCHIC,STEEL,05
1349+ db PSYCHIC,DARK,00
1350 db BUG,FIRE,05
1351 db BUG,GRASS,20
1352 db BUG,FIGHTING,05
1353@@ -72,18 +89,36 @@ TypeEffects:
1354 db BUG,PSYCHIC,20
1355 db BUG,GHOST,05
1356 db BUG,POISON,20
1357+ db BUG,STEEL,05
1358+ db BUG,DARK,20
1359+ db BUG,FAIRY,05
1360 db ROCK,FIRE,20
1361 db ROCK,FIGHTING,05
1362 db ROCK,GROUND,05
1363 db ROCK,FLYING,20
1364 db ROCK,BUG,20
1365 db ROCK,ICE,20
1366+ db ROCK,STEEL,05
1367 db GHOST,NORMAL,00
1368- db GHOST,PSYCHIC,00
1369- db FIRE,DRAGON,05
1370- db WATER,DRAGON,05
1371- db ELECTRIC,DRAGON,05
1372- db GRASS,DRAGON,05
1373- db ICE,DRAGON,20
1374+ db GHOST,GHOST,20
1375+ db GHOST,PSYCHIC,20
1376+ db GHOST,STEEL,05
1377+ db GHOST,DARK,05
1378 db DRAGON,DRAGON,20
1379+ db DRAGON,STEEL,05
1380+ db DRAGON,FAIRY,00
1381+ db STEEL,ROCK,20
1382+ db STEEL,FAIRY,20
1383+ db STEEL,ICE,20
1384+ db STEEL,STEEL,05
1385+ db DARK,STEEL,05
1386+ db DARK,FIGHTING,05
1387+ db DARK,PSYCHIC,20
1388+ db DARK,GHOST,20
1389+ db DARK,DARK,05
1390+ db DARK,FAIRY,05
1391+ db FAIRY,FIGHTING,20
1392+ db FAIRY,STEEL,05
1393+ db FAIRY,DARK,20
1394+ db FAIRY,DRAGON,20
1395 db $FF
1396diff --git a/data/wildPokemon/diglettscave.asm b/data/wildPokemon/diglettscave.asm
1397index 0b8ec1c7..570c7d55 100755
1398--- a/data/wildPokemon/diglettscave.asm
1399+++ b/data/wildPokemon/diglettscave.asm
1400@@ -5,7 +5,7 @@ CaveMons:
1401 db 17,DIGLETT
1402 db 20,DIGLETT
1403 db 16,DIGLETT
1404- db 15,DIGLETT
1405+ db 7,MEW
1406 db 21,DIGLETT
1407 db 22,DIGLETT
1408 db 29,DUGTRIO
1409diff --git a/data/wildPokemon/mansion3.asm b/data/wildPokemon/mansion3.asm
1410index cc180e3b..8b180b71 100755
1411--- a/data/wildPokemon/mansion3.asm
1412+++ b/data/wildPokemon/mansion3.asm
1413@@ -2,12 +2,12 @@ MansionMons3:
1414 db $0A
1415 db 40,RATTATA
1416 db 40,RATICATE
1417- db 32,GRIMER
1418+ db 32,KOFFING
1419 db 35,GRIMER
1420 db 43,RATTATA
1421 db 43,RATICATE
1422 db 38,GRIMER
1423- db 38,GRIMER
1424+ db 38,MAGMAR
1425 db 38,MUK
1426 db 41,MUK
1427 db $00
1428diff --git a/data/wildPokemon/powerplant.asm b/data/wildPokemon/powerplant.asm
1429index 8a1667a5..aa0db03a 100755
1430--- a/data/wildPokemon/powerplant.asm
1431+++ b/data/wildPokemon/powerplant.asm
1432@@ -1,10 +1,10 @@
1433 PowerPlantMons:
1434 db $0A
1435- db 30,MAGNEMITE
1436+ db 30,RAICHU
1437 db 35,MAGNEMITE
1438 db 33,MAGNETON
1439 db 33,VOLTORB
1440- db 37,VOLTORB
1441+ db 37,ELECTABUZZ
1442 db 33,GRIMER
1443 db 37,GRIMER
1444 db 38,MAGNETON
1445diff --git a/data/wildPokemon/route1.asm b/data/wildPokemon/route1.asm
1446index 4b85ba40..7a13acbe 100755
1447--- a/data/wildPokemon/route1.asm
1448+++ b/data/wildPokemon/route1.asm
1449@@ -1,8 +1,8 @@
1450 Route1Mons:
1451 db $19
1452- db 3,PIDGEY
1453+ db 3,EKANS
1454 db 4,PIDGEY
1455- db 2,RATTATA
1456+ db 2,MEOWTH
1457 db 3,RATTATA
1458 db 2,PIDGEY
1459 db 3,PIDGEY
1460diff --git a/data/wildPokemon/route19.asm b/data/wildPokemon/route19.asm
1461old mode 100644
1462new mode 100755
1463diff --git a/data/wildPokemon/route20.asm b/data/wildPokemon/route20.asm
1464old mode 100644
1465new mode 100755
1466diff --git a/data/wildPokemon/seafoamislandb4.asm b/data/wildPokemon/seafoamislandb4.asm
1467index dd842dda..ebccea1f 100755
1468--- a/data/wildPokemon/seafoamislandb4.asm
1469+++ b/data/wildPokemon/seafoamislandb4.asm
1470@@ -9,7 +9,7 @@ IslandMonsB4:
1471 db 27,GOLBAT
1472 db 45,ZUBAT
1473 db 30,DEWGONG
1474- db 34,DEWGONG
1475+ db 34,JYNX
1476
1477 db $05
1478 db 25,TENTACOOL
1479diff --git a/data/wildPokemon/unknowndungeon1.asm b/data/wildPokemon/unknowndungeon1.asm
1480index ff7be04e..5e9c434f 100755
1481--- a/data/wildPokemon/unknowndungeon1.asm
1482+++ b/data/wildPokemon/unknowndungeon1.asm
1483@@ -1,14 +1,14 @@
1484 DungeonMons1:
1485 db $0A
1486- db 50,GOLBAT
1487- db 55,GOLBAT
1488- db 45,GRAVELER
1489- db 55,GLOOM
1490- db 55,WEEPINBELL
1491- db 52,SANDSLASH
1492- db 54,VENOMOTH
1493- db 54,PARASECT
1494- db 55,DITTO
1495- db 60,DITTO
1496+ db 83,KADABRA
1497+ db 85,IKSBAT
1498+ db 83,GRAVELER
1499+ db 86,GLOOM
1500+ db 86,WEEPINBELL
1501+ db 84,SANDSLASH
1502+ db 83,MACHOKE
1503+ db 83,HAUNTER
1504+ db 82,ONIX
1505+ db 88,RHYHORN
1506 db $00
1507
1508diff --git a/data/wildPokemon/unknowndungeon2.asm b/data/wildPokemon/unknowndungeon2.asm
1509index 1fd20019..033b9076 100755
1510--- a/data/wildPokemon/unknowndungeon2.asm
1511+++ b/data/wildPokemon/unknowndungeon2.asm
1512@@ -1,14 +1,14 @@
1513 DungeonMons2:
1514 db $0F
1515- db 52,GOLBAT
1516- db 57,GOLBAT
1517- db 50,GRAVELER
1518- db 56,SANDSLASH
1519- db 50,RHYHORN
1520- db 60,DITTO
1521- db 58,GLOOM
1522- db 58,WEEPINBELL
1523- db 60,RHYDON
1524- db 58,RHYDON
1525+ db 85,ALAKAZAM
1526+ db 87,IKSBAT
1527+ db 85,GOLEM
1528+ db 86,SANDSLASH
1529+ db 85,GENGAR
1530+ db 85,STAHLOS
1531+ db 88,GLOOM
1532+ db 88,WEEPINBELL
1533+ db 90,RIZEROS
1534+ db 85,MACHAMP
1535 db $00
1536
1537diff --git a/data/wildPokemon/unknowndungeonb1.asm b/data/wildPokemon/unknowndungeonb1.asm
1538index 5848678f..a43118c4 100755
1539--- a/data/wildPokemon/unknowndungeonb1.asm
1540+++ b/data/wildPokemon/unknowndungeonb1.asm
1541@@ -1,14 +1,14 @@
1542 DungeonMonsB1:
1543 db $19
1544- db 54,GOLBAT
1545- db 59,GOLBAT
1546- db 55,GRAVELER
1547- db 52,RHYHORN
1548- db 62,RHYDON
1549- db 60,DITTO
1550- db 56,CHANSEY
1551- db 65,DITTO
1552- db 55,LICKITUNG
1553- db 50,LICKITUNG
1554+ db 88,ALAKAZAM
1555+ db 91,IKSBAT
1556+ db 88,GOLEM
1557+ db 90,SANDSLASH
1558+ db 88,GENGAR
1559+ db 88,STAHLOS
1560+ db 92,GLOOM
1561+ db 92,WEEPINBELL
1562+ db 95,RIZEROS
1563+ db 88,MACHAMP
1564 db $00
1565
1566diff --git a/data/wildPokemon/viridianforest.asm b/data/wildPokemon/viridianforest.asm
1567index eb4889a7..8d73c471 100755
1568--- a/data/wildPokemon/viridianforest.asm
1569+++ b/data/wildPokemon/viridianforest.asm
1570@@ -2,9 +2,9 @@ ForestMons:
1571 db $19
1572 db 3,CATERPIE
1573 db 4,METAPOD
1574- db 4,CATERPIE
1575+ db 4,WEEDLE
1576 db 5,CATERPIE
1577- db 4,PIDGEY
1578+ db 4,KAKUNA
1579 db 6,PIDGEY
1580 db 6,CATERPIE
1581 db 6,METAPOD
1582diff --git a/engine/add_party_mon.asm b/engine/add_party_mon.asm
1583old mode 100644
1584new mode 100755
1585diff --git a/engine/bank30.bin b/engine/bank30.bin
1586old mode 100644
1587new mode 100755
1588diff --git a/engine/bank3c.asm b/engine/bank3c.asm
1589old mode 100644
1590new mode 100755
1591diff --git a/engine/bank3d.asm b/engine/bank3d.asm
1592old mode 100644
1593new mode 100755
1594diff --git a/engine/bank3e.asm b/engine/bank3e.asm
1595old mode 100644
1596new mode 100755
1597diff --git a/engine/bank3f.asm b/engine/bank3f.asm
1598old mode 100644
1599new mode 100755
1600diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
1601index 629aa8cd..ed445fd0 100755
1602--- a/engine/battle/animations.asm
1603+++ b/engine/battle/animations.asm
1604@@ -3178,7 +3178,7 @@ TossBallAnimation:
1605 ld hl, .PokeBallAnimations
1606 ; choose which toss animation to use
1607 ld a, [wcf91]
1608- cp a, POKE_BALL
1609+ cp a, POKEBALL
1610 ld b, TOSS_ANIM
1611 jr z, .done
1612 cp a, GREAT_BALL
1613diff --git a/engine/battle/bank3d_battle.asm b/engine/battle/bank3d_battle.asm
1614old mode 100644
1615new mode 100755
1616diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm
1617old mode 100644
1618new mode 100755
1619diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm
1620old mode 100644
1621new mode 100755
1622diff --git a/engine/battle/core.asm b/engine/battle/core.asm
1623index f23dd649..9ade66f5 100755
1624--- a/engine/battle/core.asm
1625+++ b/engine/battle/core.asm
1626@@ -2401,7 +2401,7 @@ BagWasSelected:
1627
1628 SimulatedInputBattleItemList:
1629 db 1 ; # of items
1630- db POKE_BALL, 1
1631+ db POKEBALL, 1
1632 db $ff
1633
1634 DisplayPlayerBag:
1635diff --git a/engine/battle/decrement_pp.asm b/engine/battle/decrement_pp.asm
1636old mode 100644
1637new mode 100755
1638diff --git a/engine/battle/display_effectiveness.asm b/engine/battle/display_effectiveness.asm
1639old mode 100644
1640new mode 100755
1641diff --git a/engine/battle/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm
1642old mode 100644
1643new mode 100755
1644diff --git a/engine/battle/experience.asm b/engine/battle/experience.asm
1645old mode 100644
1646new mode 100755
1647diff --git a/engine/battle/get_trainer_name.asm b/engine/battle/get_trainer_name.asm
1648old mode 100644
1649new mode 100755
1650diff --git a/engine/battle/ghost_marowak_anim.asm b/engine/battle/ghost_marowak_anim.asm
1651old mode 100644
1652new mode 100755
1653diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm
1654old mode 100644
1655new mode 100755
1656diff --git a/engine/battle/link_battle_versus_text.asm b/engine/battle/link_battle_versus_text.asm
1657old mode 100644
1658new mode 100755
1659diff --git a/engine/battle/moveEffects/conversion_effect.asm b/engine/battle/moveEffects/conversion_effect.asm
1660old mode 100644
1661new mode 100755
1662diff --git a/engine/battle/moveEffects/drain_hp_effect.asm b/engine/battle/moveEffects/drain_hp_effect.asm
1663old mode 100644
1664new mode 100755
1665diff --git a/engine/battle/moveEffects/focus_energy_effect.asm b/engine/battle/moveEffects/focus_energy_effect.asm
1666old mode 100644
1667new mode 100755
1668diff --git a/engine/battle/moveEffects/haze_effect.asm b/engine/battle/moveEffects/haze_effect.asm
1669old mode 100644
1670new mode 100755
1671diff --git a/engine/battle/moveEffects/heal_effect.asm b/engine/battle/moveEffects/heal_effect.asm
1672old mode 100644
1673new mode 100755
1674diff --git a/engine/battle/moveEffects/leech_seed_effect.asm b/engine/battle/moveEffects/leech_seed_effect.asm
1675old mode 100644
1676new mode 100755
1677diff --git a/engine/battle/moveEffects/mist_effect.asm b/engine/battle/moveEffects/mist_effect.asm
1678old mode 100644
1679new mode 100755
1680diff --git a/engine/battle/moveEffects/one_hit_ko_effect.asm b/engine/battle/moveEffects/one_hit_ko_effect.asm
1681old mode 100644
1682new mode 100755
1683diff --git a/engine/battle/moveEffects/paralyze_effect.asm b/engine/battle/moveEffects/paralyze_effect.asm
1684old mode 100644
1685new mode 100755
1686diff --git a/engine/battle/moveEffects/pay_day_effect.asm b/engine/battle/moveEffects/pay_day_effect.asm
1687old mode 100644
1688new mode 100755
1689diff --git a/engine/battle/moveEffects/recoil_effect.asm b/engine/battle/moveEffects/recoil_effect.asm
1690old mode 100644
1691new mode 100755
1692diff --git a/engine/battle/moveEffects/reflect_light_screen_effect.asm b/engine/battle/moveEffects/reflect_light_screen_effect.asm
1693old mode 100644
1694new mode 100755
1695diff --git a/engine/battle/moveEffects/substitute_effect.asm b/engine/battle/moveEffects/substitute_effect.asm
1696old mode 100644
1697new mode 100755
1698diff --git a/engine/battle/moveEffects/transform_effect.asm b/engine/battle/moveEffects/transform_effect.asm
1699old mode 100644
1700new mode 100755
1701diff --git a/engine/battle/print_type.asm b/engine/battle/print_type.asm
1702old mode 100644
1703new mode 100755
1704diff --git a/engine/battle/save_trainer_name.asm b/engine/battle/save_trainer_name.asm
1705old mode 100644
1706new mode 100755
1707diff --git a/engine/battle/scale_sprites.asm b/engine/battle/scale_sprites.asm
1708old mode 100644
1709new mode 100755
1710diff --git a/engine/battle/scroll_draw_trainer_pic.asm b/engine/battle/scroll_draw_trainer_pic.asm
1711old mode 100644
1712new mode 100755
1713diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm
1714old mode 100644
1715new mode 100755
1716index f4e50562..95f9c435
1717--- a/engine/battle/trainer_ai.asm
1718+++ b/engine/battle/trainer_ai.asm
1719@@ -508,7 +508,7 @@ Sony2AI:
1720 ld a,5
1721 call AICheckIfHPBelowFraction
1722 ret nc
1723- jp AIUsePotion
1724+ jp AIUseTrank
1725
1726 Sony3AI:
1727 cp $20
1728@@ -589,9 +589,9 @@ AIUseFullRestore:
1729 ld [wEnemyMonHP],a
1730 jr AIPrintItemUseAndUpdateHPBar
1731
1732-AIUsePotion:
1733+AIUseTrank:
1734 ; enemy trainer heals his monster with a potion
1735- ld a,POTION
1736+ ld a,TRANK
1737 ld b,20
1738 jr AIRecoverHP
1739
1740diff --git a/engine/battle/unused_stats_functions.asm b/engine/battle/unused_stats_functions.asm
1741old mode 100644
1742new mode 100755
1743diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm
1744old mode 100644
1745new mode 100755
1746diff --git a/engine/bcd.asm b/engine/bcd.asm
1747old mode 100644
1748new mode 100755
1749diff --git a/engine/bg_map_attributes.asm b/engine/bg_map_attributes.asm
1750old mode 100644
1751new mode 100755
1752diff --git a/engine/debug1.asm b/engine/debug1.asm
1753old mode 100644
1754new mode 100755
1755diff --git a/engine/display_pokedex.asm b/engine/display_pokedex.asm
1756old mode 100644
1757new mode 100755
1758diff --git a/engine/draw_badges.asm b/engine/draw_badges.asm
1759old mode 100644
1760new mode 100755
1761diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm
1762index 8ec2c4c7..3eb0934f 100755
1763--- a/engine/evos_moves.asm
1764+++ b/engine/evos_moves.asm
1765@@ -485,6 +485,7 @@ Pointer_3b0ee:
1766 db CHARIZARD
1767 db VILEPLUME
1768 db VICTREEBEL
1769+ db STAHLOS
1770 db $ff
1771
1772 Func_3b10f:
1773@@ -516,7 +517,7 @@ Func_3b10f:
1774 .asm_3b130
1775 inc c
1776 ld a, c
1777- cp VICTREEBEL
1778+ cp STAHLOS
1779 jr c, .asm_3b111
1780 and a
1781 ret
1782diff --git a/engine/flag_action_predef.asm b/engine/flag_action_predef.asm
1783old mode 100644
1784new mode 100755
1785diff --git a/engine/get_bag_item_quantity.asm b/engine/get_bag_item_quantity.asm
1786old mode 100644
1787new mode 100755
1788diff --git a/engine/heal_party.asm b/engine/heal_party.asm
1789old mode 100644
1790new mode 100755
1791diff --git a/engine/hidden_object_functions18.asm b/engine/hidden_object_functions18.asm
1792index 8d468988..0cfad2bc 100755
1793--- a/engine/hidden_object_functions18.asm
1794+++ b/engine/hidden_object_functions18.asm
1795@@ -96,12 +96,6 @@ BenchGuyTextPointers:
1796 db_tx_pre MtMoonPokecenterBenchGuyText
1797 db ROCK_TUNNEL_POKECENTER, SPRITE_FACING_LEFT
1798 db_tx_pre RockTunnelPokecenterBenchGuyText
1799- db SAFARI_ZONE_REST_HOUSE_2,SPRITE_FACING_LEFT
1800- db_tx_pre UnusedBenchGuyText1
1801- db SAFARI_ZONE_REST_HOUSE_3,SPRITE_FACING_LEFT
1802- db_tx_pre UnusedBenchGuyText2
1803- db SAFARI_ZONE_REST_HOUSE_4,SPRITE_FACING_LEFT
1804- db_tx_pre UnusedBenchGuyText3
1805 db $FF
1806
1807 ViridianCityPokecenterBenchGuyText:
1808@@ -128,18 +122,6 @@ RockTunnelPokecenterBenchGuyText:
1809 TX_FAR _RockTunnelPokecenterGuyText
1810 db "@"
1811
1812-UnusedBenchGuyText1:
1813- TX_FAR _UnusedBenchGuyText1
1814- db "@"
1815-
1816-UnusedBenchGuyText2:
1817- TX_FAR _UnusedBenchGuyText2
1818- db "@"
1819-
1820-UnusedBenchGuyText3:
1821- TX_FAR _UnusedBenchGuyText3
1822- db "@"
1823-
1824 VermilionCityPokecenterBenchGuyText:
1825 TX_FAR _VermilionPokecenterGuyText
1826 db "@"
1827diff --git a/engine/init_player_data.asm b/engine/init_player_data.asm
1828old mode 100644
1829new mode 100755
1830diff --git a/engine/items/items.asm b/engine/items/items.asm
1831index 8cce45f0..eb1a2fed 100755
1832--- a/engine/items/items.asm
1833+++ b/engine/items/items.asm
1834@@ -19,7 +19,7 @@ ItemUsePtrTable:
1835 dw ItemUseBall ; MASTER_BALL
1836 dw ItemUseBall ; ULTRA_BALL
1837 dw ItemUseBall ; GREAT_BALL
1838- dw ItemUseBall ; POKE_BALL
1839+ dw ItemUseBall ; POKEBALL
1840 dw ItemUseTownMap ; TOWN_MAP
1841 dw ItemUseBicycle ; BICYCLE
1842 dw ItemUseSurfboard ; out-of-battle Surf effect
1843@@ -35,7 +35,7 @@ ItemUsePtrTable:
1844 dw ItemUseMedicine ; MAX_POTION
1845 dw ItemUseMedicine ; HYPER_POTION
1846 dw ItemUseMedicine ; SUPER_POTION
1847- dw ItemUseMedicine ; POTION
1848+ dw ItemUseMedicine ; TRANK
1849 dw ItemUseBait ; BOULDERBADGE
1850 dw ItemUseRock ; CASCADEBADGE
1851 dw UnusableItem ; THUNDERBADGE
1852@@ -99,6 +99,21 @@ ItemUsePtrTable:
1853 dw ItemUsePPRestore ; MAX_ETHER
1854 dw ItemUsePPRestore ; ELIXER
1855 dw ItemUsePPRestore ; MAX_ELIXER
1856+ dw UnusableItem ; FLOOR_B2F
1857+ dw UnusableItem ; FLOOR_B1F
1858+ dw UnusableItem ; FLOOR_1F
1859+ dw UnusableItem ; FLOOR_2F
1860+ dw UnusableItem ; FLOOR_3F
1861+ dw UnusableItem ; FLOOR_4F
1862+ dw UnusableItem ; FLOOR_5F
1863+ dw UnusableItem ; FLOOR_6F
1864+ dw UnusableItem ; FLOOR_7F
1865+ dw UnusableItem ; FLOOR_8F
1866+ dw UnusableItem ; FLOOR_9F
1867+ dw UnusableItem ; FLOOR_10F
1868+ dw UnusableItem ; FLOOR_11F
1869+ dw UnusableItem ; FLOOR_B4F
1870+ dw ItemUseEvoStone ; METAL_COAT
1871
1872 ItemUseBall:
1873
1874@@ -207,7 +222,7 @@ ItemUseBall:
1875 jp z,.captured
1876
1877 ; Anything will do for the basic Poké Ball.
1878- cp a,POKE_BALL
1879+ cp a,POKEBALL
1880 jr z,.checkForAilments
1881
1882 ; If it's a Great/Ultra/Safari Ball and Rand1 is greater than 200, try again.
1883@@ -351,7 +366,7 @@ ItemUseBall:
1884 ; Ultra/Safari Ball: BallFactor2 = 150
1885 ld a,[wcf91]
1886 ld b,255
1887- cp POKE_BALL
1888+ cp POKEBALL
1889 jr z,.skip4
1890 ld b,200
1891 cp GREAT_BALL
1892@@ -1338,7 +1353,7 @@ ItemUseMedicine:
1893 jr z, .showHealingItemMessage
1894 cp MAX_REVIVE
1895 jr z, .showHealingItemMessage
1896- ld a, POTION_MSG
1897+ ld a, TRANK_MSG
1898 ld [wPartyMenuTypeOrMessageID], a
1899 jr .showHealingItemMessage
1900
1901diff --git a/engine/joypad.asm b/engine/joypad.asm
1902old mode 100644
1903new mode 100755
1904diff --git a/engine/load_mon_data.asm b/engine/load_mon_data.asm
1905old mode 100644
1906new mode 100755
1907diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm
1908old mode 100644
1909new mode 100755
1910diff --git a/engine/menu/diploma_1.asm b/engine/menu/diploma_1.asm
1911old mode 100644
1912new mode 100755
1913diff --git a/engine/menu/link_menu.asm b/engine/menu/link_menu.asm
1914old mode 100644
1915new mode 100755
1916diff --git a/engine/menu/options.asm b/engine/menu/options.asm
1917old mode 100644
1918new mode 100755
1919diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm
1920index 669d49db..832fb284 100755
1921--- a/engine/menu/party_menu.asm
1922+++ b/engine/menu/party_menu.asm
1923@@ -148,11 +148,11 @@ RedrawPartyMenu_:
1924 rl b
1925 ld c,a
1926 add hl,bc
1927- ld de,wcd6d
1928+ ld de,wEvolutionData
1929 ld a,BANK(EvosMovesPointerTable)
1930 ld bc,2
1931 call FarCopyData
1932- ld hl,wcd6d
1933+ ld hl,wEvolutionData
1934 ld a,[hli]
1935 ld h,[hl]
1936 ld l,a
1937diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm
1938index a93fb2e3..29365018 100755
1939--- a/engine/menu/start_sub_menus.asm
1940+++ b/engine/menu/start_sub_menus.asm
1941@@ -275,7 +275,7 @@ StartMenu_Pokemon:
1942 jp nc,.notHealthyEnough
1943 ld a,[wPartyAndBillsPCSavedMenuItem]
1944 push af
1945- ld a,POTION
1946+ ld a,TRANK
1947 ld [wcf91],a
1948 ld [wPseudoItemID],a
1949 call UseItem
1950@@ -474,7 +474,7 @@ UsableItems_PartyMenu:
1951 db MAX_POTION
1952 db HYPER_POTION
1953 db SUPER_POTION
1954- db POTION
1955+ db TRANK
1956 db FIRE_STONE
1957 db THUNDER_STONE
1958 db WATER_STONE
1959@@ -500,6 +500,7 @@ UsableItems_PartyMenu:
1960 db MAX_ETHER
1961 db ELIXER
1962 db MAX_ELIXER
1963+ db METAL_COAT
1964 db $ff
1965
1966 ; items which close the item menu when used
1967diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm
1968index 4adfb543..85c76826 100755
1969--- a/engine/menu/status_screen.asm
1970+++ b/engine/menu/status_screen.asm
1971@@ -303,10 +303,10 @@ PrintStat:
1972 ret
1973
1974 StatsText:
1975- db "ATTACK"
1976- next "DEFENSE"
1977- next "SPEED"
1978- next "SPECIAL@"
1979+ db "Angriff"
1980+ next "Vert"
1981+ next "Init"
1982+ next "Spezial@"
1983
1984 StatusScreen2:
1985 ld a, [hTilesetType]
1986diff --git a/engine/menu/swap_items.asm b/engine/menu/swap_items.asm
1987old mode 100644
1988new mode 100755
1989diff --git a/engine/menu/text_ids1.asm b/engine/menu/text_ids1.asm
1990old mode 100644
1991new mode 100755
1992diff --git a/engine/menu/text_ids2.asm b/engine/menu/text_ids2.asm
1993old mode 100644
1994new mode 100755
1995index b22c9507..88f8a60b
1996--- a/engine/menu/text_ids2.asm
1997+++ b/engine/menu/text_ids2.asm
1998@@ -693,7 +693,6 @@ GetMonFieldMoves:
1999 jr .fieldMoveLoop
2000 .foundFieldMove
2001 ld a, b
2002- ld [wLastFieldMoveID], a
2003 ld a, [hli] ; field move name index
2004 ld b, [hl] ; field move leftmost X coordinate
2005 pop hl
2006@@ -707,7 +706,6 @@ GetMonFieldMoves:
2007 ld a, b
2008 ld [wFieldMovesLeftmostXCoord], a
2009 .skipUpdatingLeftmostXCoord
2010- ld a, [wLastFieldMoveID]
2011 ld b, a
2012 jr .loop
2013 .done
2014diff --git a/engine/move_mon.asm b/engine/move_mon.asm
2015old mode 100644
2016new mode 100755
2017diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm
2018index 38fe66f9..e3f591cf 100755
2019--- a/engine/oak_speech.asm
2020+++ b/engine/oak_speech.asm
2021@@ -51,11 +51,11 @@ OakSpeech:
2022 call SetDefaultNames
2023 predef InitPlayerData2
2024 ld hl,wNumBoxItems
2025- ld a,POTION
2026+ ld a,TRANK
2027 ld [wcf91],a
2028 ld a,1
2029 ld [wItemQuantity],a
2030- call AddItemToInventory ; give one potion
2031+ call AddItemToInventory ; give one trank
2032 ld a,[wDefaultMap]
2033 ld [wDestinationMap],a
2034 call SpecialWarpIn
2035diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm
2036index 80f1bafc..4a0233a9 100755
2037--- a/engine/oak_speech2.asm
2038+++ b/engine/oak_speech2.asm
2039@@ -188,17 +188,19 @@ DisplayIntroNameTextBox:
2040 db "NAME@"
2041
2042 DefaultNamesPlayer:
2043- db "NEW NAME"
2044- next "YELLOW"
2045- next "ASH"
2046- next "JACK"
2047+ db "NAME"
2048+ next "Gelb"
2049+ next "Ash"
2050+ next "Jack"
2051+ next "Daniel"
2052 db "@"
2053
2054 DefaultNamesRival:
2055- db "NEW NAME"
2056- next "BLUE"
2057- next "GARY"
2058- next "JOHN"
2059+ db "NAME"
2060+ next "Blau"
2061+ next "Gary"
2062+ next "John"
2063+ next "Pascal"
2064 db "@"
2065
2066 GetDefaultName:
2067@@ -226,16 +228,18 @@ GetDefaultName:
2068 jp CopyData
2069
2070 DefaultNamesPlayerList:
2071- db "NEW NAME@"
2072- db "YELLOW@"
2073- db "ASH@"
2074- db "JACK@"
2075+ db "NAME@"
2076+ db "Gelb@"
2077+ db "Ash@"
2078+ db "Jack@"
2079+ db "Daniel@"
2080
2081 DefaultNamesRivalList:
2082- db "NEW NAME@"
2083- db "BLUE@"
2084- db "GARY@"
2085- db "JOHN@"
2086+ db "NAME@"
2087+ db "Blau@"
2088+ db "Gary@"
2089+ db "John@"
2090+ db "Pascal@"
2091
2092 TextTerminator_6b20:
2093 db "@"
2094diff --git a/engine/oam_dma.asm b/engine/oam_dma.asm
2095old mode 100644
2096new mode 100755
2097diff --git a/engine/overworld/advance_player_sprite.asm b/engine/overworld/advance_player_sprite.asm
2098old mode 100644
2099new mode 100755
2100diff --git a/engine/overworld/boulders.asm b/engine/overworld/boulders.asm
2101old mode 100644
2102new mode 100755
2103diff --git a/engine/overworld/check_player_state.asm b/engine/overworld/check_player_state.asm
2104old mode 100644
2105new mode 100755
2106diff --git a/engine/overworld/clear_loadmapdata_vars.asm b/engine/overworld/clear_loadmapdata_vars.asm
2107old mode 100644
2108new mode 100755
2109diff --git a/engine/overworld/daycare_exp.asm b/engine/overworld/daycare_exp.asm
2110old mode 100644
2111new mode 100755
2112diff --git a/engine/overworld/dungeon_warps.asm b/engine/overworld/dungeon_warps.asm
2113old mode 100644
2114new mode 100755
2115diff --git a/engine/overworld/get_coords_tile_in_front_of_player.asm b/engine/overworld/get_coords_tile_in_front_of_player.asm
2116old mode 100644
2117new mode 100755
2118diff --git a/engine/overworld/is_player_just_outside_map.asm b/engine/overworld/is_player_just_outside_map.asm
2119old mode 100644
2120new mode 100755
2121diff --git a/engine/overworld/item.asm b/engine/overworld/item.asm
2122old mode 100644
2123new mode 100755
2124diff --git a/engine/overworld/load_tileset_header.asm b/engine/overworld/load_tileset_header.asm
2125old mode 100644
2126new mode 100755
2127diff --git a/engine/overworld/load_wild_data.asm b/engine/overworld/load_wild_data.asm
2128old mode 100644
2129new mode 100755
2130diff --git a/engine/overworld/map_sprite_functions1.asm b/engine/overworld/map_sprite_functions1.asm
2131old mode 100644
2132new mode 100755
2133diff --git a/engine/overworld/missable_objects.asm b/engine/overworld/missable_objects.asm
2134old mode 100644
2135new mode 100755
2136diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
2137old mode 100644
2138new mode 100755
2139diff --git a/engine/overworld/npc_pathfinding.asm b/engine/overworld/npc_pathfinding.asm
2140old mode 100644
2141new mode 100755
2142diff --git a/engine/overworld/oam.asm b/engine/overworld/oam.asm
2143old mode 100644
2144new mode 100755
2145diff --git a/engine/overworld/print_safari_steps.asm b/engine/overworld/print_safari_steps.asm
2146old mode 100644
2147new mode 100755
2148diff --git a/engine/overworld/replace_tile_block.asm b/engine/overworld/replace_tile_block.asm
2149old mode 100644
2150new mode 100755
2151diff --git a/engine/overworld/set_blackout_map.asm b/engine/overworld/set_blackout_map.asm
2152old mode 100644
2153new mode 100755
2154diff --git a/engine/overworld/special_warps.asm b/engine/overworld/special_warps.asm
2155old mode 100644
2156new mode 100755
2157diff --git a/engine/overworld/step_functions.asm b/engine/overworld/step_functions.asm
2158old mode 100644
2159new mode 100755
2160diff --git a/engine/overworld/try_pushing_boulder.asm b/engine/overworld/try_pushing_boulder.asm
2161old mode 100644
2162new mode 100755
2163diff --git a/engine/predefsA.asm b/engine/predefsA.asm
2164old mode 100644
2165new mode 100755
2166diff --git a/engine/print_waiting_text.asm b/engine/print_waiting_text.asm
2167old mode 100644
2168new mode 100755
2169diff --git a/engine/printer.asm b/engine/printer.asm
2170old mode 100644
2171new mode 100755
2172diff --git a/engine/remove_pokemon.asm b/engine/remove_pokemon.asm
2173old mode 100644
2174new mode 100755
2175diff --git a/engine/save.asm b/engine/save.asm
2176index c28ba1f6..6ae73050 100755
2177--- a/engine/save.asm
2178+++ b/engine/save.asm
2179@@ -111,7 +111,7 @@ LoadSAV2:
2180 call CopyData
2181 ld hl, sMainData
2182 ld de, wPokedexOwned
2183- ld bc, wPokedexSeenEnd - wPokedexOwned
2184+ ld bc, wPokedexSeenEndOld - wPokedexOwned
2185 call CopyData
2186 and a
2187 jp SAVGoodChecksum
2188@@ -246,7 +246,7 @@ SaveSAVtoSRAM2:
2189 call CopyData
2190 ld hl, wPokedexOwned ; pokédex only
2191 ld de, sMainData
2192- ld bc, wPokedexSeenEnd - wPokedexOwned
2193+ ld bc, wPokedexSeenEndOld - wPokedexOwned
2194 call CopyData
2195 ld hl, wPikachuHappiness
2196 ld de, sMainData + $179
2197diff --git a/engine/subtract_paid_money.asm b/engine/subtract_paid_money.asm
2198old mode 100644
2199new mode 100755
2200diff --git a/gfx.py b/gfx.py
2201old mode 100644
2202new mode 100755
2203diff --git a/gfx/9_tile.png b/gfx/9_tile.png
2204old mode 100644
2205new mode 100755
2206diff --git a/gfx/AB.png b/gfx/AB.png
2207old mode 100644
2208new mode 100755
2209diff --git a/gfx/ED_tile.png b/gfx/ED_tile.png
2210old mode 100644
2211new mode 100755
2212diff --git a/gfx/attack_anim_1.png b/gfx/attack_anim_1.png
2213old mode 100644
2214new mode 100755
2215diff --git a/gfx/attack_anim_2.png b/gfx/attack_anim_2.png
2216old mode 100644
2217new mode 100755
2218diff --git a/gfx/badge_numbers.png b/gfx/badge_numbers.png
2219old mode 100644
2220new mode 100755
2221diff --git a/gfx/badges.png b/gfx/badges.png
2222old mode 100644
2223new mode 100755
2224diff --git a/gfx/battle_hud1.png b/gfx/battle_hud1.png
2225old mode 100644
2226new mode 100755
2227diff --git a/gfx/battle_hud2.png b/gfx/battle_hud2.png
2228old mode 100644
2229new mode 100755
2230diff --git a/gfx/battle_hud3.png b/gfx/battle_hud3.png
2231old mode 100644
2232new mode 100755
2233diff --git a/gfx/battle_transition.png b/gfx/battle_transition.png
2234old mode 100644
2235new mode 100755
2236diff --git a/gfx/blank_leader_names.png b/gfx/blank_leader_names.png
2237old mode 100644
2238new mode 100755
2239diff --git a/gfx/blocksets/beachhouse.bst b/gfx/blocksets/beachhouse.bst
2240old mode 100644
2241new mode 100755
2242diff --git a/gfx/blocksets/cavern.bst b/gfx/blocksets/cavern.bst
2243old mode 100644
2244new mode 100755
2245diff --git a/gfx/blocksets/cemetery.bst b/gfx/blocksets/cemetery.bst
2246old mode 100644
2247new mode 100755
2248diff --git a/gfx/blocksets/club.bst b/gfx/blocksets/club.bst
2249old mode 100644
2250new mode 100755
2251diff --git a/gfx/blocksets/facility.bst b/gfx/blocksets/facility.bst
2252old mode 100644
2253new mode 100755
2254diff --git a/gfx/blocksets/forest.bst b/gfx/blocksets/forest.bst
2255old mode 100644
2256new mode 100755
2257diff --git a/gfx/blocksets/gym.bst b/gfx/blocksets/gym.bst
2258old mode 100644
2259new mode 100755
2260diff --git a/gfx/blocksets/house.bst b/gfx/blocksets/house.bst
2261old mode 100644
2262new mode 100755
2263diff --git a/gfx/blocksets/interior.bst b/gfx/blocksets/interior.bst
2264old mode 100644
2265new mode 100755
2266diff --git a/gfx/blocksets/lab.bst b/gfx/blocksets/lab.bst
2267old mode 100644
2268new mode 100755
2269diff --git a/gfx/blocksets/lobby.bst b/gfx/blocksets/lobby.bst
2270old mode 100644
2271new mode 100755
2272diff --git a/gfx/blocksets/mansion.bst b/gfx/blocksets/mansion.bst
2273old mode 100644
2274new mode 100755
2275diff --git a/gfx/blocksets/museum.bst b/gfx/blocksets/museum.bst
2276old mode 100644
2277new mode 100755
2278diff --git a/gfx/blocksets/overworld.bst b/gfx/blocksets/overworld.bst
2279old mode 100644
2280new mode 100755
2281diff --git a/gfx/blocksets/plateau.bst b/gfx/blocksets/plateau.bst
2282old mode 100644
2283new mode 100755
2284diff --git a/gfx/blocksets/pokecenter.bst b/gfx/blocksets/pokecenter.bst
2285old mode 100644
2286new mode 100755
2287diff --git a/gfx/blocksets/redshouse2.bst b/gfx/blocksets/redshouse2.bst
2288old mode 100644
2289new mode 100755
2290diff --git a/gfx/blocksets/ship.bst b/gfx/blocksets/ship.bst
2291old mode 100644
2292new mode 100755
2293diff --git a/gfx/blocksets/shipport.bst b/gfx/blocksets/shipport.bst
2294old mode 100644
2295new mode 100755
2296diff --git a/gfx/blocksets/underground.bst b/gfx/blocksets/underground.bst
2297old mode 100644
2298new mode 100755
2299diff --git a/gfx/blueversion.png b/gfx/blueversion.png
2300old mode 100644
2301new mode 100755
2302diff --git a/gfx/circle_tile.png b/gfx/circle_tile.png
2303old mode 100644
2304new mode 100755
2305diff --git a/gfx/copyright.png b/gfx/copyright.png
2306old mode 100644
2307new mode 100755
2308diff --git a/gfx/emotion_bubbles.png b/gfx/emotion_bubbles.png
2309old mode 100644
2310new mode 100755
2311diff --git a/gfx/falling_star.png b/gfx/falling_star.png
2312old mode 100644
2313new mode 100755
2314diff --git a/gfx/font.png b/gfx/font.png
2315old mode 100644
2316new mode 100755
2317index 34e86b4a..f85ffa21
2318Binary files a/gfx/font.png and b/gfx/font.png differ
2319diff --git a/gfx/game_boy.norepeat.png b/gfx/game_boy.norepeat.png
2320old mode 100644
2321new mode 100755
2322diff --git a/gfx/gamefreak.png b/gfx/gamefreak.png
2323old mode 100644
2324new mode 100755
2325diff --git a/gfx/gamefreak_intro.png b/gfx/gamefreak_intro.png
2326old mode 100644
2327new mode 100755
2328diff --git a/gfx/gamefreak_logo.png b/gfx/gamefreak_logo.png
2329old mode 100644
2330new mode 100755
2331diff --git a/gfx/hp_bar_and_status.png b/gfx/hp_bar_and_status.png
2332old mode 100644
2333new mode 100755
2334diff --git a/gfx/ledge_hopping_shadow.png b/gfx/ledge_hopping_shadow.png
2335old mode 100644
2336new mode 100755
2337diff --git a/gfx/link_cable.png b/gfx/link_cable.png
2338old mode 100644
2339new mode 100755
2340diff --git a/gfx/minimized_mon_sprite.png b/gfx/minimized_mon_sprite.png
2341old mode 100644
2342new mode 100755
2343diff --git a/gfx/mon_nest_icon.png b/gfx/mon_nest_icon.png
2344old mode 100644
2345new mode 100755
2346diff --git a/gfx/mon_ow_sprites.png b/gfx/mon_ow_sprites.png
2347old mode 100644
2348new mode 100755
2349diff --git a/gfx/p_tile.png b/gfx/p_tile.png
2350old mode 100644
2351new mode 100755
2352diff --git a/gfx/pikachu/unknown_e4000.png b/gfx/pikachu/unknown_e4000.png
2353old mode 100644
2354new mode 100755
2355diff --git a/gfx/pikachu/unknown_e40cc.png b/gfx/pikachu/unknown_e40cc.png
2356old mode 100644
2357new mode 100755
2358diff --git a/gfx/pikachu/unknown_e411c.png b/gfx/pikachu/unknown_e411c.png
2359old mode 100644
2360new mode 100755
2361diff --git a/gfx/pikachu/unknown_e41d2.png b/gfx/pikachu/unknown_e41d2.png
2362old mode 100644
2363new mode 100755
2364diff --git a/gfx/pikachu/unknown_e4272.png b/gfx/pikachu/unknown_e4272.png
2365old mode 100644
2366new mode 100755
2367diff --git a/gfx/pikachu/unknown_e4323.png b/gfx/pikachu/unknown_e4323.png
2368old mode 100644
2369new mode 100755
2370diff --git a/gfx/pikachu/unknown_e4383.png b/gfx/pikachu/unknown_e4383.png
2371old mode 100644
2372new mode 100755
2373diff --git a/gfx/pikachu/unknown_e444b.png b/gfx/pikachu/unknown_e444b.png
2374old mode 100644
2375new mode 100755
2376diff --git a/gfx/pikachu/unknown_e458b.png b/gfx/pikachu/unknown_e458b.png
2377old mode 100644
2378new mode 100755
2379diff --git a/gfx/pikachu/unknown_e463b.png b/gfx/pikachu/unknown_e463b.png
2380old mode 100644
2381new mode 100755
2382diff --git a/gfx/pikachu/unknown_e467b.png b/gfx/pikachu/unknown_e467b.png
2383old mode 100644
2384new mode 100755
2385diff --git a/gfx/pikachu/unknown_e472e.png b/gfx/pikachu/unknown_e472e.png
2386old mode 100644
2387new mode 100755
2388diff --git a/gfx/pikachu/unknown_e476e.png b/gfx/pikachu/unknown_e476e.png
2389old mode 100644
2390new mode 100755
2391diff --git a/gfx/pikachu/unknown_e4841.png b/gfx/pikachu/unknown_e4841.png
2392old mode 100644
2393new mode 100755
2394diff --git a/gfx/pikachu/unknown_e49d1.png b/gfx/pikachu/unknown_e49d1.png
2395old mode 100644
2396new mode 100755
2397diff --git a/gfx/pikachu/unknown_e4a99.png b/gfx/pikachu/unknown_e4a99.png
2398old mode 100644
2399new mode 100755
2400diff --git a/gfx/pikachu/unknown_e4b39.png b/gfx/pikachu/unknown_e4b39.png
2401old mode 100644
2402new mode 100755
2403diff --git a/gfx/pikachu/unknown_e4bde.png b/gfx/pikachu/unknown_e4bde.png
2404old mode 100644
2405new mode 100755
2406diff --git a/gfx/pikachu/unknown_e4c3e.png b/gfx/pikachu/unknown_e4c3e.png
2407old mode 100644
2408new mode 100755
2409diff --git a/gfx/pikachu/unknown_e4ce0.png b/gfx/pikachu/unknown_e4ce0.png
2410old mode 100644
2411new mode 100755
2412diff --git a/gfx/pikachu/unknown_e4e70.png b/gfx/pikachu/unknown_e4e70.png
2413old mode 100644
2414new mode 100755
2415diff --git a/gfx/pikachu/unknown_e5000.png b/gfx/pikachu/unknown_e5000.png
2416old mode 100644
2417new mode 100755
2418diff --git a/gfx/pikachu/unknown_e50af.png b/gfx/pikachu/unknown_e50af.png
2419old mode 100644
2420new mode 100755
2421diff --git a/gfx/pikachu/unknown_e523f.png b/gfx/pikachu/unknown_e523f.png
2422old mode 100644
2423new mode 100755
2424diff --git a/gfx/pikachu/unknown_e52fe.png b/gfx/pikachu/unknown_e52fe.png
2425old mode 100644
2426new mode 100755
2427diff --git a/gfx/pikachu/unknown_e548e.png b/gfx/pikachu/unknown_e548e.png
2428old mode 100644
2429new mode 100755
2430diff --git a/gfx/pikachu/unknown_e5541.png b/gfx/pikachu/unknown_e5541.png
2431old mode 100644
2432new mode 100755
2433diff --git a/gfx/pikachu/unknown_e56d1.png b/gfx/pikachu/unknown_e56d1.png
2434old mode 100644
2435new mode 100755
2436diff --git a/gfx/pikachu/unknown_e5794.png b/gfx/pikachu/unknown_e5794.png
2437old mode 100644
2438new mode 100755
2439diff --git a/gfx/pikachu/unknown_e5924.png b/gfx/pikachu/unknown_e5924.png
2440old mode 100644
2441new mode 100755
2442diff --git a/gfx/pikachu/unknown_e59ed.png b/gfx/pikachu/unknown_e59ed.png
2443old mode 100644
2444new mode 100755
2445diff --git a/gfx/pikachu/unknown_e5b7d.png b/gfx/pikachu/unknown_e5b7d.png
2446old mode 100644
2447new mode 100755
2448diff --git a/gfx/pikachu/unknown_e5c4d.png b/gfx/pikachu/unknown_e5c4d.png
2449old mode 100644
2450new mode 100755
2451diff --git a/gfx/pikachu/unknown_e5ddd.png b/gfx/pikachu/unknown_e5ddd.png
2452old mode 100644
2453new mode 100755
2454diff --git a/gfx/pikachu/unknown_e5e90.png b/gfx/pikachu/unknown_e5e90.png
2455old mode 100644
2456new mode 100755
2457diff --git a/gfx/pikachu/unknown_e6020.png b/gfx/pikachu/unknown_e6020.png
2458old mode 100644
2459new mode 100755
2460diff --git a/gfx/pikachu/unknown_e61b0.png b/gfx/pikachu/unknown_e61b0.png
2461old mode 100644
2462new mode 100755
2463diff --git a/gfx/pikachu/unknown_e6340.png b/gfx/pikachu/unknown_e6340.png
2464old mode 100644
2465new mode 100755
2466diff --git a/gfx/pikachu/unknown_e63f7.png b/gfx/pikachu/unknown_e63f7.png
2467old mode 100644
2468new mode 100755
2469diff --git a/gfx/pikachu/unknown_e6587.png b/gfx/pikachu/unknown_e6587.png
2470old mode 100644
2471new mode 100755
2472diff --git a/gfx/pikachu/unknown_e6646.png b/gfx/pikachu/unknown_e6646.png
2473old mode 100644
2474new mode 100755
2475diff --git a/gfx/pikachu/unknown_e67d6.png b/gfx/pikachu/unknown_e67d6.png
2476old mode 100644
2477new mode 100755
2478diff --git a/gfx/pikachu/unknown_e682f.png b/gfx/pikachu/unknown_e682f.png
2479old mode 100644
2480new mode 100755
2481diff --git a/gfx/pikachu/unknown_e69bf.png b/gfx/pikachu/unknown_e69bf.png
2482old mode 100644
2483new mode 100755
2484diff --git a/gfx/pikachu/unknown_e6b4f.png b/gfx/pikachu/unknown_e6b4f.png
2485old mode 100644
2486new mode 100755
2487diff --git a/gfx/pikachu/unknown_e6cdf.png b/gfx/pikachu/unknown_e6cdf.png
2488old mode 100644
2489new mode 100755
2490diff --git a/gfx/pikachu/unknown_e6e6f.png b/gfx/pikachu/unknown_e6e6f.png
2491old mode 100644
2492new mode 100755
2493diff --git a/gfx/pikachu/unknown_e6fff.png b/gfx/pikachu/unknown_e6fff.png
2494old mode 100644
2495new mode 100755
2496diff --git a/gfx/pikachu/unknown_e718f.png b/gfx/pikachu/unknown_e718f.png
2497old mode 100644
2498new mode 100755
2499diff --git a/gfx/pikachu/unknown_e731f.png b/gfx/pikachu/unknown_e731f.png
2500old mode 100644
2501new mode 100755
2502diff --git a/gfx/pikachu/unknown_e74af.png b/gfx/pikachu/unknown_e74af.png
2503old mode 100644
2504new mode 100755
2505diff --git a/gfx/pikachu/unknown_e763f.png b/gfx/pikachu/unknown_e763f.png
2506old mode 100644
2507new mode 100755
2508diff --git a/gfx/pikachu/unknown_e77cf.png b/gfx/pikachu/unknown_e77cf.png
2509old mode 100644
2510new mode 100755
2511diff --git a/gfx/pikachu/unknown_e7863.png b/gfx/pikachu/unknown_e7863.png
2512old mode 100644
2513new mode 100755
2514diff --git a/gfx/pikachu/unknown_e79f3.png b/gfx/pikachu/unknown_e79f3.png
2515old mode 100644
2516new mode 100755
2517diff --git a/gfx/pikachu/unknown_e7b83.png b/gfx/pikachu/unknown_e7b83.png
2518old mode 100644
2519new mode 100755
2520diff --git a/gfx/pikachu/unknown_e7d13.png b/gfx/pikachu/unknown_e7d13.png
2521old mode 100644
2522new mode 100755
2523diff --git a/gfx/pikachu/unknown_f0abf.png b/gfx/pikachu/unknown_f0abf.png
2524old mode 100644
2525new mode 100755
2526diff --git a/gfx/pikachu/unknown_f0b64.png b/gfx/pikachu/unknown_f0b64.png
2527old mode 100644
2528new mode 100755
2529diff --git a/gfx/pikachu/unknown_f0cf4.png b/gfx/pikachu/unknown_f0cf4.png
2530old mode 100644
2531new mode 100755
2532diff --git a/gfx/pikachu/unknown_f0d82.png b/gfx/pikachu/unknown_f0d82.png
2533old mode 100644
2534new mode 100755
2535diff --git a/gfx/player_title.png b/gfx/player_title.png
2536old mode 100644
2537new mode 100755
2538diff --git a/gfx/pokeball.png b/gfx/pokeball.png
2539old mode 100644
2540new mode 100755
2541diff --git a/gfx/pokecenter_ball.png b/gfx/pokecenter_ball.png
2542old mode 100644
2543new mode 100755
2544diff --git a/gfx/pokedex.png b/gfx/pokedex.png
2545old mode 100644
2546new mode 100755
2547diff --git a/gfx/pokemon_logo.png b/gfx/pokemon_logo.png
2548old mode 100644
2549new mode 100755
2550diff --git a/gfx/pokemon_logo_japan.png b/gfx/pokemon_logo_japan.png
2551old mode 100644
2552new mode 100755
2553diff --git a/gfx/pokemon_yellow.t6.png b/gfx/pokemon_yellow.t6.png
2554old mode 100644
2555new mode 100755
2556index 7c86a1ec..ac59de88
2557Binary files a/gfx/pokemon_yellow.t6.png and b/gfx/pokemon_yellow.t6.png differ
2558diff --git a/gfx/red_fishing_tile_back.png b/gfx/red_fishing_tile_back.png
2559old mode 100644
2560new mode 100755
2561diff --git a/gfx/red_fishing_tile_front.png b/gfx/red_fishing_tile_front.png
2562old mode 100644
2563new mode 100755
2564diff --git a/gfx/red_fishing_tile_side.png b/gfx/red_fishing_tile_side.png
2565old mode 100644
2566new mode 100755
2567diff --git a/gfx/red_fishingrod_tiles.png b/gfx/red_fishingrod_tiles.png
2568old mode 100644
2569new mode 100755
2570diff --git a/gfx/slotmachine1.png b/gfx/slotmachine1.png
2571old mode 100644
2572new mode 100755
2573diff --git a/gfx/slotmachine2.png b/gfx/slotmachine2.png
2574old mode 100644
2575new mode 100755
2576diff --git a/gfx/spinner_arrow.png b/gfx/spinner_arrow.png
2577old mode 100644
2578new mode 100755
2579diff --git a/gfx/sprites/agatha.png b/gfx/sprites/agatha.png
2580old mode 100644
2581new mode 100755
2582diff --git a/gfx/sprites/balding_guy.png b/gfx/sprites/balding_guy.png
2583old mode 100644
2584new mode 100755
2585diff --git a/gfx/sprites/ball.png b/gfx/sprites/ball.png
2586old mode 100644
2587new mode 100755
2588diff --git a/gfx/sprites/bike_shop_guy.png b/gfx/sprites/bike_shop_guy.png
2589old mode 100644
2590new mode 100755
2591diff --git a/gfx/sprites/biker.png b/gfx/sprites/biker.png
2592old mode 100644
2593new mode 100755
2594diff --git a/gfx/sprites/bird.png b/gfx/sprites/bird.png
2595old mode 100644
2596new mode 100755
2597diff --git a/gfx/sprites/black_hair_boy_1.png b/gfx/sprites/black_hair_boy_1.png
2598old mode 100644
2599new mode 100755
2600diff --git a/gfx/sprites/black_hair_boy_2.png b/gfx/sprites/black_hair_boy_2.png
2601old mode 100644
2602new mode 100755
2603diff --git a/gfx/sprites/blackbelt.png b/gfx/sprites/blackbelt.png
2604old mode 100644
2605new mode 100755
2606diff --git a/gfx/sprites/blue.png b/gfx/sprites/blue.png
2607old mode 100644
2608new mode 100755
2609diff --git a/gfx/sprites/book_map_dex.png b/gfx/sprites/book_map_dex.png
2610old mode 100644
2611new mode 100755
2612diff --git a/gfx/sprites/boulder.png b/gfx/sprites/boulder.png
2613old mode 100644
2614new mode 100755
2615diff --git a/gfx/sprites/brunette_girl.png b/gfx/sprites/brunette_girl.png
2616old mode 100644
2617new mode 100755
2618diff --git a/gfx/sprites/bruno.png b/gfx/sprites/bruno.png
2619old mode 100644
2620new mode 100755
2621diff --git a/gfx/sprites/bug_catcher.png b/gfx/sprites/bug_catcher.png
2622old mode 100644
2623new mode 100755
2624diff --git a/gfx/sprites/bulbasaur.png b/gfx/sprites/bulbasaur.png
2625old mode 100644
2626new mode 100755
2627diff --git a/gfx/sprites/cable_club_woman.png b/gfx/sprites/cable_club_woman.png
2628old mode 100644
2629new mode 100755
2630diff --git a/gfx/sprites/chansey.png b/gfx/sprites/chansey.png
2631old mode 100644
2632new mode 100755
2633diff --git a/gfx/sprites/clefairy.png b/gfx/sprites/clefairy.png
2634old mode 100644
2635new mode 100755
2636diff --git a/gfx/sprites/clefairy2.png b/gfx/sprites/clefairy2.png
2637old mode 100644
2638new mode 100755
2639diff --git a/gfx/sprites/clipboard.png b/gfx/sprites/clipboard.png
2640old mode 100644
2641new mode 100755
2642diff --git a/gfx/sprites/cook.png b/gfx/sprites/cook.png
2643old mode 100644
2644new mode 100755
2645diff --git a/gfx/sprites/cycling.png b/gfx/sprites/cycling.png
2646old mode 100644
2647new mode 100755
2648diff --git a/gfx/sprites/daisy.png b/gfx/sprites/daisy.png
2649old mode 100644
2650new mode 100755
2651diff --git a/gfx/sprites/erika.png b/gfx/sprites/erika.png
2652old mode 100644
2653new mode 100755
2654diff --git a/gfx/sprites/fat_bald_guy.png b/gfx/sprites/fat_bald_guy.png
2655old mode 100644
2656new mode 100755
2657diff --git a/gfx/sprites/fisher.png b/gfx/sprites/fisher.png
2658old mode 100644
2659new mode 100755
2660diff --git a/gfx/sprites/fisher2.png b/gfx/sprites/fisher2.png
2661old mode 100644
2662new mode 100755
2663diff --git a/gfx/sprites/foulard_woman.png b/gfx/sprites/foulard_woman.png
2664old mode 100644
2665new mode 100755
2666diff --git a/gfx/sprites/gambler.png b/gfx/sprites/gambler.png
2667old mode 100644
2668new mode 100755
2669diff --git a/gfx/sprites/gameboy_kid.png b/gfx/sprites/gameboy_kid.png
2670old mode 100644
2671new mode 100755
2672diff --git a/gfx/sprites/gentleman.png b/gfx/sprites/gentleman.png
2673old mode 100644
2674new mode 100755
2675diff --git a/gfx/sprites/giovanni.png b/gfx/sprites/giovanni.png
2676old mode 100644
2677new mode 100755
2678diff --git a/gfx/sprites/girl.png b/gfx/sprites/girl.png
2679old mode 100644
2680new mode 100755
2681diff --git a/gfx/sprites/guard.png b/gfx/sprites/guard.png
2682old mode 100644
2683new mode 100755
2684diff --git a/gfx/sprites/gym_helper.png b/gfx/sprites/gym_helper.png
2685old mode 100644
2686new mode 100755
2687diff --git a/gfx/sprites/hiker.png b/gfx/sprites/hiker.png
2688old mode 100644
2689new mode 100755
2690diff --git a/gfx/sprites/james.png b/gfx/sprites/james.png
2691old mode 100644
2692new mode 100755
2693diff --git a/gfx/sprites/jessie.png b/gfx/sprites/jessie.png
2694old mode 100644
2695new mode 100755
2696diff --git a/gfx/sprites/jigglypuff.png b/gfx/sprites/jigglypuff.png
2697old mode 100644
2698new mode 100755
2699diff --git a/gfx/sprites/lance.png b/gfx/sprites/lance.png
2700old mode 100644
2701new mode 100755
2702diff --git a/gfx/sprites/lapras_giver.png b/gfx/sprites/lapras_giver.png
2703old mode 100644
2704new mode 100755
2705diff --git a/gfx/sprites/lass.png b/gfx/sprites/lass.png
2706old mode 100644
2707new mode 100755
2708diff --git a/gfx/sprites/little_girl.png b/gfx/sprites/little_girl.png
2709old mode 100644
2710new mode 100755
2711diff --git a/gfx/sprites/lorelei.png b/gfx/sprites/lorelei.png
2712old mode 100644
2713new mode 100755
2714diff --git a/gfx/sprites/lying_old_man.png b/gfx/sprites/lying_old_man.png
2715old mode 100644
2716new mode 100755
2717diff --git a/gfx/sprites/mart_guy.png b/gfx/sprites/mart_guy.png
2718old mode 100644
2719new mode 100755
2720diff --git a/gfx/sprites/medium.png b/gfx/sprites/medium.png
2721old mode 100644
2722new mode 100755
2723diff --git a/gfx/sprites/mom.png b/gfx/sprites/mom.png
2724old mode 100644
2725new mode 100755
2726diff --git a/gfx/sprites/mom_geisha.png b/gfx/sprites/mom_geisha.png
2727old mode 100644
2728new mode 100755
2729diff --git a/gfx/sprites/mr_fuji.png b/gfx/sprites/mr_fuji.png
2730old mode 100644
2731new mode 100755
2732diff --git a/gfx/sprites/mr_masterball.png b/gfx/sprites/mr_masterball.png
2733old mode 100644
2734new mode 100755
2735diff --git a/gfx/sprites/nurse.png b/gfx/sprites/nurse.png
2736old mode 100644
2737new mode 100755
2738diff --git a/gfx/sprites/oak.png b/gfx/sprites/oak.png
2739old mode 100644
2740new mode 100755
2741diff --git a/gfx/sprites/oak_aide.png b/gfx/sprites/oak_aide.png
2742old mode 100644
2743new mode 100755
2744diff --git a/gfx/sprites/oddish.png b/gfx/sprites/oddish.png
2745old mode 100644
2746new mode 100755
2747diff --git a/gfx/sprites/officer_jenny.png b/gfx/sprites/officer_jenny.png
2748old mode 100644
2749new mode 100755
2750diff --git a/gfx/sprites/old_amber.png b/gfx/sprites/old_amber.png
2751old mode 100644
2752new mode 100755
2753diff --git a/gfx/sprites/old_medium_woman.png b/gfx/sprites/old_medium_woman.png
2754old mode 100644
2755new mode 100755
2756diff --git a/gfx/sprites/old_person.png b/gfx/sprites/old_person.png
2757old mode 100644
2758new mode 100755
2759diff --git a/gfx/sprites/omanyte.png b/gfx/sprites/omanyte.png
2760old mode 100644
2761new mode 100755
2762diff --git a/gfx/sprites/paper_sheet.png b/gfx/sprites/paper_sheet.png
2763old mode 100644
2764new mode 100755
2765diff --git a/gfx/sprites/pikachu.png b/gfx/sprites/pikachu.png
2766old mode 100644
2767new mode 100755
2768diff --git a/gfx/sprites/question_mark.png b/gfx/sprites/question_mark.png
2769old mode 100644
2770new mode 100755
2771diff --git a/gfx/sprites/red.png b/gfx/sprites/red.png
2772old mode 100644
2773new mode 100755
2774diff --git a/gfx/sprites/rocker.png b/gfx/sprites/rocker.png
2775old mode 100644
2776new mode 100755
2777diff --git a/gfx/sprites/rocket.png b/gfx/sprites/rocket.png
2778old mode 100644
2779new mode 100755
2780diff --git a/gfx/sprites/sailor.png b/gfx/sprites/sailor.png
2781old mode 100644
2782new mode 100755
2783diff --git a/gfx/sprites/sandshrew.png b/gfx/sprites/sandshrew.png
2784old mode 100644
2785new mode 100755
2786diff --git a/gfx/sprites/seel.png b/gfx/sprites/seel.png
2787old mode 100644
2788new mode 100755
2789diff --git a/gfx/sprites/slowbro.png b/gfx/sprites/slowbro.png
2790old mode 100644
2791new mode 100755
2792diff --git a/gfx/sprites/snorlax.png b/gfx/sprites/snorlax.png
2793old mode 100644
2794new mode 100755
2795diff --git a/gfx/sprites/ss_captain.png b/gfx/sprites/ss_captain.png
2796old mode 100644
2797new mode 100755
2798diff --git a/gfx/sprites/surfing_pikachu.png b/gfx/sprites/surfing_pikachu.png
2799old mode 100644
2800new mode 100755
2801diff --git a/gfx/sprites/swimmer.png b/gfx/sprites/swimmer.png
2802old mode 100644
2803new mode 100755
2804diff --git a/gfx/sprites/waiter.png b/gfx/sprites/waiter.png
2805old mode 100644
2806new mode 100755
2807diff --git a/gfx/sprites/warden.png b/gfx/sprites/warden.png
2808old mode 100644
2809new mode 100755
2810diff --git a/gfx/sprites/white_player.png b/gfx/sprites/white_player.png
2811old mode 100644
2812new mode 100755
2813diff --git a/gfx/sprites/young_boy.png b/gfx/sprites/young_boy.png
2814old mode 100644
2815new mode 100755
2816diff --git a/gfx/ss_anne_smoke_puff.png b/gfx/ss_anne_smoke_puff.png
2817old mode 100644
2818new mode 100755
2819diff --git a/gfx/stats_screen_hp.png b/gfx/stats_screen_hp.png
2820old mode 100644
2821new mode 100755
2822diff --git a/gfx/stats_screen_lv.png b/gfx/stats_screen_lv.png
2823old mode 100644
2824new mode 100755
2825diff --git a/gfx/surfing_pikachu_1.t4.png b/gfx/surfing_pikachu_1.t4.png
2826old mode 100644
2827new mode 100755
2828diff --git a/gfx/surfing_pikachu_1a.png b/gfx/surfing_pikachu_1a.png
2829old mode 100644
2830new mode 100755
2831diff --git a/gfx/surfing_pikachu_1b.png b/gfx/surfing_pikachu_1b.png
2832old mode 100644
2833new mode 100755
2834diff --git a/gfx/surfing_pikachu_1c.t5.png b/gfx/surfing_pikachu_1c.t5.png
2835old mode 100644
2836new mode 100755
2837diff --git a/gfx/surfing_pikachu_2.png b/gfx/surfing_pikachu_2.png
2838old mode 100644
2839new mode 100755
2840diff --git a/gfx/surfing_pikachu_3.t1.png b/gfx/surfing_pikachu_3.t1.png
2841old mode 100644
2842new mode 100755
2843diff --git a/gfx/text_box.png b/gfx/text_box.png
2844old mode 100644
2845new mode 100755
2846diff --git a/gfx/theend.interleave.png b/gfx/theend.interleave.png
2847old mode 100644
2848new mode 100755
2849diff --git a/gfx/tilemaps/sgbborder.map b/gfx/tilemaps/sgbborder.map
2850old mode 100644
2851new mode 100755
2852diff --git a/gfx/tilemaps/slotmachine.map b/gfx/tilemaps/slotmachine.map
2853old mode 100644
2854new mode 100755
2855diff --git a/gfx/tilesets/beachhouse.png b/gfx/tilesets/beachhouse.png
2856old mode 100644
2857new mode 100755
2858diff --git a/gfx/tilesets/beachhouse.tilecoll b/gfx/tilesets/beachhouse.tilecoll
2859old mode 100644
2860new mode 100755
2861diff --git a/gfx/tilesets/cavern.t14.png b/gfx/tilesets/cavern.t14.png
2862old mode 100644
2863new mode 100755
2864diff --git a/gfx/tilesets/cavern.tilecoll b/gfx/tilesets/cavern.tilecoll
2865old mode 100644
2866new mode 100755
2867diff --git a/gfx/tilesets/cemetery.t4.png b/gfx/tilesets/cemetery.t4.png
2868old mode 100644
2869new mode 100755
2870diff --git a/gfx/tilesets/cemetery.tilecoll b/gfx/tilesets/cemetery.tilecoll
2871old mode 100644
2872new mode 100755
2873diff --git a/gfx/tilesets/club.t5.png b/gfx/tilesets/club.t5.png
2874old mode 100644
2875new mode 100755
2876diff --git a/gfx/tilesets/club.tilecoll b/gfx/tilesets/club.tilecoll
2877old mode 100644
2878new mode 100755
2879diff --git a/gfx/tilesets/facility.png b/gfx/tilesets/facility.png
2880old mode 100644
2881new mode 100755
2882diff --git a/gfx/tilesets/facility.tilecoll b/gfx/tilesets/facility.tilecoll
2883old mode 100644
2884new mode 100755
2885diff --git a/gfx/tilesets/flower/flower1.png b/gfx/tilesets/flower/flower1.png
2886old mode 100644
2887new mode 100755
2888diff --git a/gfx/tilesets/flower/flower2.png b/gfx/tilesets/flower/flower2.png
2889old mode 100644
2890new mode 100755
2891diff --git a/gfx/tilesets/flower/flower3.png b/gfx/tilesets/flower/flower3.png
2892old mode 100644
2893new mode 100755
2894diff --git a/gfx/tilesets/forest.png b/gfx/tilesets/forest.png
2895old mode 100644
2896new mode 100755
2897diff --git a/gfx/tilesets/forest.tilecoll b/gfx/tilesets/forest.tilecoll
2898old mode 100644
2899new mode 100755
2900diff --git a/gfx/tilesets/gate.tilecoll b/gfx/tilesets/gate.tilecoll
2901old mode 100644
2902new mode 100755
2903diff --git a/gfx/tilesets/gym.png b/gfx/tilesets/gym.png
2904old mode 100644
2905new mode 100755
2906diff --git a/gfx/tilesets/gym.tilecoll b/gfx/tilesets/gym.tilecoll
2907old mode 100644
2908new mode 100755
2909diff --git a/gfx/tilesets/house.t2.png b/gfx/tilesets/house.t2.png
2910old mode 100644
2911new mode 100755
2912diff --git a/gfx/tilesets/house.tilecoll b/gfx/tilesets/house.tilecoll
2913old mode 100644
2914new mode 100755
2915diff --git a/gfx/tilesets/interior.t1.png b/gfx/tilesets/interior.t1.png
2916old mode 100644
2917new mode 100755
2918diff --git a/gfx/tilesets/interior.tilecoll b/gfx/tilesets/interior.tilecoll
2919old mode 100644
2920new mode 100755
2921diff --git a/gfx/tilesets/lab.t4.png b/gfx/tilesets/lab.t4.png
2922old mode 100644
2923new mode 100755
2924diff --git a/gfx/tilesets/lab.tilecoll b/gfx/tilesets/lab.tilecoll
2925old mode 100644
2926new mode 100755
2927diff --git a/gfx/tilesets/lobby.t2.png b/gfx/tilesets/lobby.t2.png
2928old mode 100644
2929new mode 100755
2930diff --git a/gfx/tilesets/lobby.tilecoll b/gfx/tilesets/lobby.tilecoll
2931old mode 100644
2932new mode 100755
2933diff --git a/gfx/tilesets/mansion.t2.png b/gfx/tilesets/mansion.t2.png
2934old mode 100644
2935new mode 100755
2936diff --git a/gfx/tilesets/mansion.tilecoll b/gfx/tilesets/mansion.tilecoll
2937old mode 100644
2938new mode 100755
2939diff --git a/gfx/tilesets/museum.t1.png b/gfx/tilesets/museum.t1.png
2940old mode 100644
2941new mode 100755
2942diff --git a/gfx/tilesets/overworld.png b/gfx/tilesets/overworld.png
2943old mode 100644
2944new mode 100755
2945diff --git a/gfx/tilesets/overworld.tilecoll b/gfx/tilesets/overworld.tilecoll
2946old mode 100644
2947new mode 100755
2948diff --git a/gfx/tilesets/plateau.t10.png b/gfx/tilesets/plateau.t10.png
2949old mode 100644
2950new mode 100755
2951diff --git a/gfx/tilesets/plateau.tilecoll b/gfx/tilesets/plateau.tilecoll
2952old mode 100644
2953new mode 100755
2954diff --git a/gfx/tilesets/pokecenter.png b/gfx/tilesets/pokecenter.png
2955old mode 100644
2956new mode 100755
2957diff --git a/gfx/tilesets/pokecenter.tilecoll b/gfx/tilesets/pokecenter.tilecoll
2958old mode 100644
2959new mode 100755
2960diff --git a/gfx/tilesets/reds_house.tilecoll b/gfx/tilesets/reds_house.tilecoll
2961old mode 100644
2962new mode 100755
2963diff --git a/gfx/tilesets/redshouse2.t7.png b/gfx/tilesets/redshouse2.t7.png
2964old mode 100644
2965new mode 100755
2966diff --git a/gfx/tilesets/ship.t6.png b/gfx/tilesets/ship.t6.png
2967old mode 100644
2968new mode 100755
2969diff --git a/gfx/tilesets/ship.tilecoll b/gfx/tilesets/ship.tilecoll
2970old mode 100644
2971new mode 100755
2972diff --git a/gfx/tilesets/ship_port.tilecoll b/gfx/tilesets/ship_port.tilecoll
2973old mode 100644
2974new mode 100755
2975diff --git a/gfx/tilesets/shipport.t2.png b/gfx/tilesets/shipport.t2.png
2976old mode 100644
2977new mode 100755
2978diff --git a/gfx/tilesets/underground.t7.png b/gfx/tilesets/underground.t7.png
2979old mode 100644
2980new mode 100755
2981diff --git a/gfx/tilesets/underground.tilecoll b/gfx/tilesets/underground.tilecoll
2982old mode 100644
2983new mode 100755
2984diff --git a/gfx/town_map.png b/gfx/town_map.png
2985old mode 100644
2986new mode 100755
2987diff --git a/gfx/town_map.rle b/gfx/town_map.rle
2988index f9ede0ec..c90c824d 100755
2989Binary files a/gfx/town_map.rle and b/gfx/town_map.rle differ
2990diff --git a/gfx/town_map_cursor.png b/gfx/town_map_cursor.png
2991old mode 100644
2992new mode 100755
2993diff --git a/gfx/trade2.png b/gfx/trade2.png
2994old mode 100644
2995new mode 100755
2996diff --git a/gfx/trainer_info.png b/gfx/trainer_info.png
2997old mode 100644
2998new mode 100755
2999diff --git a/gfx/unknown_f8946.map b/gfx/unknown_f8946.map
3000old mode 100644
3001new mode 100755
3002diff --git a/gfx/unknown_f90bc.map b/gfx/unknown_f90bc.map
3003old mode 100644
3004new mode 100755
3005diff --git a/gfx/unknown_f91ac.map b/gfx/unknown_f91ac.map
3006old mode 100644
3007new mode 100755
3008diff --git a/gfx/unknown_f91bb.map b/gfx/unknown_f91bb.map
3009old mode 100644
3010new mode 100755
3011diff --git a/gfx/unknown_f91c8.map b/gfx/unknown_f91c8.map
3012old mode 100644
3013new mode 100755
3014diff --git a/gfx/unknown_f9b6e.map b/gfx/unknown_f9b6e.map
3015old mode 100644
3016new mode 100755
3017diff --git a/gfx/unknown_f9be6.map b/gfx/unknown_f9be6.map
3018old mode 100644
3019new mode 100755
3020diff --git a/gfx/unknown_f9bf2.map b/gfx/unknown_f9bf2.map
3021old mode 100644
3022new mode 100755
3023diff --git a/gfx/unknown_f9c2c.png b/gfx/unknown_f9c2c.png
3024old mode 100644
3025new mode 100755
3026diff --git a/gfx/unknown_f9c6c.png b/gfx/unknown_f9c6c.png
3027old mode 100644
3028new mode 100755
3029diff --git a/gfx/unknown_fd86b.png b/gfx/unknown_fd86b.png
3030old mode 100644
3031new mode 100755
3032diff --git a/gfx/up_arrow.png b/gfx/up_arrow.png
3033old mode 100644
3034new mode 100755
3035diff --git a/gfx/yellow_intro.png b/gfx/yellow_intro.png
3036old mode 100644
3037new mode 100755
3038diff --git a/gfx/yellow_titlescreen.png b/gfx/yellow_titlescreen.png
3039old mode 100644
3040new mode 100755
3041diff --git a/gfx/zero_one_ea597.png b/gfx/zero_one_ea597.png
3042old mode 100644
3043new mode 100755
3044diff --git a/home.asm b/home.asm
3045old mode 100644
3046new mode 100755
3047index 5ad11ffe..0928be81
3048--- a/home.asm
3049+++ b/home.asm
3050@@ -335,7 +335,7 @@ LoadFrontSpriteByMonIndex::
3051 cp NUM_POKEMON + 1
3052 jr c, .validDexNumber ; dex >#151 invalid
3053 .invalidDexNumber
3054- ld a, RHYDON ; $1
3055+ ld a, RIZEROS ; $1
3056 ld [wcf91], a
3057 ret
3058 .validDexNumber
3059@@ -781,40 +781,17 @@ UncompressMonSprite::
3060 ld [wSpriteInputPtr], a ; fetch sprite input pointer
3061 ld a, [hl]
3062 ld [wSpriteInputPtr + 1], a
3063-; define (by index number) the bank that a pokemon's image is in
3064-; index = Mew, bank 1
3065-; index = Kabutops fossil, bank $B
3066-; index < $1F, bank 9
3067-; $1F ≤ index < $4A, bank $A
3068-; $4A ≤ index < $74, bank $B
3069-; $74 ≤ index < $99, bank $C
3070-; $99 ≤ index, bank $D
3071 ld a, [wcf91] ; XXX name for this ram location
3072- ld b, a
3073- ;cp MEW
3074- ;ld a, BANK(MewPicFront)
3075- ;jr z, .GotBank
3076- ;ld a, b
3077 cp FOSSIL_KABUTOPS
3078+ jr z, .RecallBank
3079+ cp FOSSIL_AERODACTYL
3080+ jr z, .RecallBank
3081+ cp MON_GHOST
3082+ jr z, .RecallBank
3083+ ld a, [wMonHSpriteBank]
3084+ jr .GotBank
3085+.RecallBank
3086 ld a, BANK(FossilKabutopsPic)
3087- jr z, .GotBank
3088- ld a, b
3089- cp TANGELA + 1
3090- ld a, BANK(TangelaPicFront)
3091- jr c, .GotBank
3092- ld a, b
3093- cp MOLTRES + 1
3094- ld a, BANK(MoltresPicFront)
3095- jr c, .GotBank
3096- ld a, b
3097- cp BEEDRILL + 2
3098- ld a, BANK(BeedrillPicFront)
3099- jr c, .GotBank
3100- ld a, b
3101- cp STARMIE + 1
3102- ld a, BANK(StarmiePicFront)
3103- jr c, .GotBank
3104- ld a, BANK(VictreebelPicFront)
3105 .GotBank
3106 jp UncompressSpriteData
3107
3108@@ -4893,9 +4870,6 @@ const_value = 1
3109 add_tx_pre SaffronCityPokecenterBenchGuyText ; 1A
3110 add_tx_pre MtMoonPokecenterBenchGuyText ; 1B
3111 add_tx_pre RockTunnelPokecenterBenchGuyText ; 1C
3112- add_tx_pre UnusedBenchGuyText1 ; 1D
3113- add_tx_pre UnusedBenchGuyText2 ; 1E
3114- add_tx_pre UnusedBenchGuyText3 ; 1F
3115 add_tx_pre UnusedPredefText ; 20
3116 add_tx_pre PokemonCenterPCText ; 21
3117 add_tx_pre ViridianSchoolNotebook ; 22
3118diff --git a/home/audio.asm b/home/audio.asm
3119old mode 100644
3120new mode 100755
3121diff --git a/home/copy.asm b/home/copy.asm
3122old mode 100644
3123new mode 100755
3124diff --git a/home/copy2.asm b/home/copy2.asm
3125old mode 100644
3126new mode 100755
3127diff --git a/home/fade.asm b/home/fade.asm
3128old mode 100644
3129new mode 100755
3130diff --git a/home/init.asm b/home/init.asm
3131old mode 100644
3132new mode 100755
3133diff --git a/home/lcdc.asm b/home/lcdc.asm
3134old mode 100644
3135new mode 100755
3136diff --git a/home/overworld.asm b/home/overworld.asm
3137old mode 100644
3138new mode 100755
3139diff --git a/home/pic.asm b/home/pic.asm
3140old mode 100644
3141new mode 100755
3142diff --git a/home/play_time.asm b/home/play_time.asm
3143old mode 100644
3144new mode 100755
3145diff --git a/home/predef.asm b/home/predef.asm
3146old mode 100644
3147new mode 100755
3148diff --git a/home/serial.asm b/home/serial.asm
3149old mode 100644
3150new mode 100755
3151diff --git a/home/text.asm b/home/text.asm
3152old mode 100644
3153new mode 100755
3154diff --git a/home/timer.asm b/home/timer.asm
3155old mode 100644
3156new mode 100755
3157diff --git a/home/vblank.asm b/home/vblank.asm
3158old mode 100644
3159new mode 100755
3160diff --git a/home/vcopy.asm b/home/vcopy.asm
3161old mode 100644
3162new mode 100755
3163diff --git a/hram.asm b/hram.asm
3164old mode 100644
3165new mode 100755
3166diff --git a/macros.asm b/macros.asm
3167old mode 100644
3168new mode 100755
3169index 28aad1e5..2835c99a
3170--- a/macros.asm
3171+++ b/macros.asm
3172@@ -715,6 +715,27 @@ endchannel: MACRO
3173 db $FF
3174 ENDM
3175
3176+;\1 x position
3177+;\2 y position
3178+;\3 destination warp id
3179+;\4 destination map ($ff = wLastMap)
3180+warp: MACRO
3181+ db \2, \1, \3, \4
3182+ENDM
3183+
3184+;\1 x position
3185+;\2 y position
3186+;\3 sign id
3187+sign: MACRO
3188+ db \2, \1, \3
3189+ENDM
3190+
3191+;\1 x position
3192+;\2 y position
3193+;\3 map width
3194+warp_to: MACRO
3195+ EVENT_DISP \3, \2, \1
3196+ENDM
3197
3198 ;\1 (byte) = current map id
3199 ;\2 (byte) = connected map id
3200diff --git a/main.asm b/main.asm
3201index 2b72e85b..629367b7 100755
3202--- a/main.asm
3203+++ b/main.asm
3204@@ -468,216 +468,17 @@ INCLUDE "engine/menu/oaks_pc.asm"
3205 INCLUDE "engine/hidden_object_functions7.asm"
3206
3207
3208-SECTION "Pics 1", ROMX ; BANK $09
3209-
3210-RhydonPicFront: INCBIN "pic/ymon/rhydon.pic"
3211-RhydonPicBack: INCBIN "pic/monback/rhydonb.pic"
3212-KangaskhanPicFront: INCBIN "pic/ymon/kangaskhan.pic"
3213-KangaskhanPicBack: INCBIN "pic/monback/kangaskhanb.pic"
3214-NidoranMPicFront: INCBIN "pic/ymon/nidoranm.pic"
3215-NidoranMPicBack: INCBIN "pic/monback/nidoranmb.pic"
3216-ClefairyPicFront: INCBIN "pic/ymon/clefairy.pic"
3217-ClefairyPicBack: INCBIN "pic/monback/clefairyb.pic"
3218-SpearowPicFront: INCBIN "pic/ymon/spearow.pic"
3219-SpearowPicBack: INCBIN "pic/monback/spearowb.pic"
3220-VoltorbPicFront: INCBIN "pic/ymon/voltorb.pic"
3221-VoltorbPicBack: INCBIN "pic/monback/voltorbb.pic"
3222-NidokingPicFront: INCBIN "pic/ymon/nidoking.pic"
3223-NidokingPicBack: INCBIN "pic/monback/nidokingb.pic"
3224-SlowbroPicFront: INCBIN "pic/ymon/slowbro.pic"
3225-SlowbroPicBack: INCBIN "pic/monback/slowbrob.pic"
3226-IvysaurPicFront: INCBIN "pic/ymon/ivysaur.pic"
3227-IvysaurPicBack: INCBIN "pic/monback/ivysaurb.pic"
3228-ExeggutorPicFront: INCBIN "pic/ymon/exeggutor.pic"
3229-ExeggutorPicBack: INCBIN "pic/monback/exeggutorb.pic"
3230-LickitungPicFront: INCBIN "pic/ymon/lickitung.pic"
3231-LickitungPicBack: INCBIN "pic/monback/lickitungb.pic"
3232-ExeggcutePicFront: INCBIN "pic/ymon/exeggcute.pic"
3233-ExeggcutePicBack: INCBIN "pic/monback/exeggcuteb.pic"
3234-GrimerPicFront: INCBIN "pic/ymon/grimer.pic"
3235-GrimerPicBack: INCBIN "pic/monback/grimerb.pic"
3236-GengarPicFront: INCBIN "pic/ymon/gengar.pic"
3237-GengarPicBack: INCBIN "pic/monback/gengarb.pic"
3238-NidoranFPicFront: INCBIN "pic/ymon/nidoranf.pic"
3239-NidoranFPicBack: INCBIN "pic/monback/nidoranfb.pic"
3240-NidoqueenPicFront: INCBIN "pic/ymon/nidoqueen.pic"
3241-NidoqueenPicBack: INCBIN "pic/monback/nidoqueenb.pic"
3242-CubonePicFront: INCBIN "pic/ymon/cubone.pic"
3243-CubonePicBack: INCBIN "pic/monback/cuboneb.pic"
3244-RhyhornPicFront: INCBIN "pic/ymon/rhyhorn.pic"
3245-RhyhornPicBack: INCBIN "pic/monback/rhyhornb.pic"
3246-LaprasPicFront: INCBIN "pic/ymon/lapras.pic"
3247-LaprasPicBack: INCBIN "pic/monback/laprasb.pic"
3248-ArcaninePicFront: INCBIN "pic/ymon/arcanine.pic"
3249-ArcaninePicBack: INCBIN "pic/monback/arcanineb.pic"
3250-MewPicFront: INCBIN "pic/ymon/mew.pic"
3251-MewPicBack: INCBIN "pic/monback/mewb.pic"
3252-GyaradosPicFront: INCBIN "pic/ymon/gyarados.pic"
3253-GyaradosPicBack: INCBIN "pic/monback/gyaradosb.pic"
3254-ShellderPicFront: INCBIN "pic/ymon/shellder.pic"
3255-ShellderPicBack: INCBIN "pic/monback/shellderb.pic"
3256-TentacoolPicFront: INCBIN "pic/ymon/tentacool.pic"
3257-TentacoolPicBack: INCBIN "pic/monback/tentacoolb.pic"
3258-GastlyPicFront: INCBIN "pic/ymon/gastly.pic"
3259-GastlyPicBack: INCBIN "pic/monback/gastlyb.pic"
3260-ScytherPicFront: INCBIN "pic/ymon/scyther.pic"
3261-ScytherPicBack: INCBIN "pic/monback/scytherb.pic"
3262-StaryuPicFront: INCBIN "pic/ymon/staryu.pic"
3263-StaryuPicBack: INCBIN "pic/monback/staryub.pic"
3264-BlastoisePicFront: INCBIN "pic/ymon/blastoise.pic"
3265-BlastoisePicBack: INCBIN "pic/monback/blastoiseb.pic"
3266-PinsirPicFront: INCBIN "pic/ymon/pinsir.pic"
3267-PinsirPicBack: INCBIN "pic/monback/pinsirb.pic"
3268-TangelaPicFront: INCBIN "pic/ymon/tangela.pic"
3269-TangelaPicBack: INCBIN "pic/monback/tangelab.pic"
3270+SECTION "bank09", ROMX
3271
3272 INCLUDE "engine/battle/print_type.asm"
3273 INCLUDE "engine/battle/save_trainer_name.asm"
3274
3275-
3276-SECTION "Pics 2", ROMX ; BANK $0A
3277-
3278-GrowlithePicFront: INCBIN "pic/ymon/growlithe.pic"
3279-GrowlithePicBack: INCBIN "pic/monback/growlitheb.pic"
3280-OnixPicFront: INCBIN "pic/ymon/onix.pic"
3281-OnixPicBack: INCBIN "pic/monback/onixb.pic"
3282-FearowPicFront: INCBIN "pic/ymon/fearow.pic"
3283-FearowPicBack: INCBIN "pic/monback/fearowb.pic"
3284-PidgeyPicFront: INCBIN "pic/ymon/pidgey.pic"
3285-PidgeyPicBack: INCBIN "pic/monback/pidgeyb.pic"
3286-SlowpokePicFront: INCBIN "pic/ymon/slowpoke.pic"
3287-SlowpokePicBack: INCBIN "pic/monback/slowpokeb.pic"
3288-KadabraPicFront: INCBIN "pic/ymon/kadabra.pic"
3289-KadabraPicBack: INCBIN "pic/monback/kadabrab.pic"
3290-GravelerPicFront: INCBIN "pic/ymon/graveler.pic"
3291-GravelerPicBack: INCBIN "pic/monback/gravelerb.pic"
3292-ChanseyPicFront: INCBIN "pic/ymon/chansey.pic"
3293-ChanseyPicBack: INCBIN "pic/monback/chanseyb.pic"
3294-MachokePicFront: INCBIN "pic/ymon/machoke.pic"
3295-MachokePicBack: INCBIN "pic/monback/machokeb.pic"
3296-MrMimePicFront: INCBIN "pic/ymon/mr.mime.pic"
3297-MrMimePicBack: INCBIN "pic/monback/mr.mimeb.pic"
3298-HitmonleePicFront: INCBIN "pic/ymon/hitmonlee.pic"
3299-HitmonleePicBack: INCBIN "pic/monback/hitmonleeb.pic"
3300-HitmonchanPicFront: INCBIN "pic/ymon/hitmonchan.pic"
3301-HitmonchanPicBack: INCBIN "pic/monback/hitmonchanb.pic"
3302-ArbokPicFront: INCBIN "pic/ymon/arbok.pic"
3303-ArbokPicBack: INCBIN "pic/monback/arbokb.pic"
3304-ParasectPicFront: INCBIN "pic/ymon/parasect.pic"
3305-ParasectPicBack: INCBIN "pic/monback/parasectb.pic"
3306-PsyduckPicFront: INCBIN "pic/ymon/psyduck.pic"
3307-PsyduckPicBack: INCBIN "pic/monback/psyduckb.pic"
3308-DrowzeePicFront: INCBIN "pic/ymon/drowzee.pic"
3309-DrowzeePicBack: INCBIN "pic/monback/drowzeeb.pic"
3310-GolemPicFront: INCBIN "pic/ymon/golem.pic"
3311-GolemPicBack: INCBIN "pic/monback/golemb.pic"
3312-MagmarPicFront: INCBIN "pic/ymon/magmar.pic"
3313-MagmarPicBack: INCBIN "pic/monback/magmarb.pic"
3314-ElectabuzzPicFront: INCBIN "pic/ymon/electabuzz.pic"
3315-ElectabuzzPicBack: INCBIN "pic/monback/electabuzzb.pic"
3316-MagnetonPicFront: INCBIN "pic/ymon/magneton.pic"
3317-MagnetonPicBack: INCBIN "pic/monback/magnetonb.pic"
3318-KoffingPicFront: INCBIN "pic/ymon/koffing.pic"
3319-KoffingPicBack: INCBIN "pic/monback/koffingb.pic"
3320-MankeyPicFront: INCBIN "pic/ymon/mankey.pic"
3321-MankeyPicBack: INCBIN "pic/monback/mankeyb.pic"
3322-SeelPicFront: INCBIN "pic/ymon/seel.pic"
3323-SeelPicBack: INCBIN "pic/monback/seelb.pic"
3324-DiglettPicFront: INCBIN "pic/ymon/diglett.pic"
3325-DiglettPicBack: INCBIN "pic/monback/diglettb.pic"
3326-TaurosPicFront: INCBIN "pic/ymon/tauros.pic"
3327-TaurosPicBack: INCBIN "pic/monback/taurosb.pic"
3328-FarfetchdPicFront: INCBIN "pic/ymon/farfetchd.pic"
3329-FarfetchdPicBack: INCBIN "pic/monback/farfetchdb.pic"
3330-VenonatPicFront: INCBIN "pic/ymon/venonat.pic"
3331-VenonatPicBack: INCBIN "pic/monback/venonatb.pic"
3332-DragonitePicFront: INCBIN "pic/ymon/dragonite.pic"
3333-DragonitePicBack: INCBIN "pic/monback/dragoniteb.pic"
3334-DoduoPicFront: INCBIN "pic/ymon/doduo.pic"
3335-DoduoPicBack: INCBIN "pic/monback/doduob.pic"
3336-PoliwagPicFront: INCBIN "pic/ymon/poliwag.pic"
3337-PoliwagPicBack: INCBIN "pic/monback/poliwagb.pic"
3338-JynxPicFront: INCBIN "pic/ymon/jynx.pic"
3339-JynxPicBack: INCBIN "pic/monback/jynxb.pic"
3340-MoltresPicFront: INCBIN "pic/ymon/moltres.pic"
3341-MoltresPicBack: INCBIN "pic/monback/moltresb.pic"
3342+SECTION "bank0A", ROMX
3343
3344 INCLUDE "engine/predefsA.asm"
3345 INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm"
3346
3347-
3348-SECTION "Pics 3", ROMX ; BANK $0B
3349-
3350-ArticunoPicFront: INCBIN "pic/ymon/articuno.pic"
3351-ArticunoPicBack: INCBIN "pic/monback/articunob.pic"
3352-ZapdosPicFront: INCBIN "pic/ymon/zapdos.pic"
3353-ZapdosPicBack: INCBIN "pic/monback/zapdosb.pic"
3354-DittoPicFront: INCBIN "pic/ymon/ditto.pic"
3355-DittoPicBack: INCBIN "pic/monback/dittob.pic"
3356-MeowthPicFront: INCBIN "pic/ymon/meowth.pic"
3357-MeowthPicBack: INCBIN "pic/monback/meowthb.pic"
3358-KrabbyPicFront: INCBIN "pic/ymon/krabby.pic"
3359-KrabbyPicBack: INCBIN "pic/monback/krabbyb.pic"
3360-VulpixPicFront: INCBIN "pic/ymon/vulpix.pic"
3361-VulpixPicBack: INCBIN "pic/monback/vulpixb.pic"
3362-NinetalesPicFront: INCBIN "pic/ymon/ninetales.pic"
3363-NinetalesPicBack: INCBIN "pic/monback/ninetalesb.pic"
3364-PikachuPicFront: INCBIN "pic/ymon/pikachu.pic"
3365-PikachuPicBack: INCBIN "pic/monback/pikachub.pic"
3366-RaichuPicFront: INCBIN "pic/ymon/raichu.pic"
3367-RaichuPicBack: INCBIN "pic/monback/raichub.pic"
3368-DratiniPicFront: INCBIN "pic/ymon/dratini.pic"
3369-DratiniPicBack: INCBIN "pic/monback/dratinib.pic"
3370-DragonairPicFront: INCBIN "pic/ymon/dragonair.pic"
3371-DragonairPicBack: INCBIN "pic/monback/dragonairb.pic"
3372-KabutoPicFront: INCBIN "pic/ymon/kabuto.pic"
3373-KabutoPicBack: INCBIN "pic/monback/kabutob.pic"
3374-KabutopsPicFront: INCBIN "pic/ymon/kabutops.pic"
3375-KabutopsPicBack: INCBIN "pic/monback/kabutopsb.pic"
3376-HorseaPicFront: INCBIN "pic/ymon/horsea.pic"
3377-HorseaPicBack: INCBIN "pic/monback/horseab.pic"
3378-SeadraPicFront: INCBIN "pic/ymon/seadra.pic"
3379-SeadraPicBack: INCBIN "pic/monback/seadrab.pic"
3380-SandshrewPicFront: INCBIN "pic/ymon/sandshrew.pic"
3381-SandshrewPicBack: INCBIN "pic/monback/sandshrewb.pic"
3382-SandslashPicFront: INCBIN "pic/ymon/sandslash.pic"
3383-SandslashPicBack: INCBIN "pic/monback/sandslashb.pic"
3384-OmanytePicFront: INCBIN "pic/ymon/omanyte.pic"
3385-OmanytePicBack: INCBIN "pic/monback/omanyteb.pic"
3386-OmastarPicFront: INCBIN "pic/ymon/omastar.pic"
3387-OmastarPicBack: INCBIN "pic/monback/omastarb.pic"
3388-JigglypuffPicFront: INCBIN "pic/ymon/jigglypuff.pic"
3389-JigglypuffPicBack: INCBIN "pic/monback/jigglypuffb.pic"
3390-WigglytuffPicFront: INCBIN "pic/ymon/wigglytuff.pic"
3391-WigglytuffPicBack: INCBIN "pic/monback/wigglytuffb.pic"
3392-EeveePicFront: INCBIN "pic/ymon/eevee.pic"
3393-EeveePicBack: INCBIN "pic/monback/eeveeb.pic"
3394-FlareonPicFront: INCBIN "pic/ymon/flareon.pic"
3395-FlareonPicBack: INCBIN "pic/monback/flareonb.pic"
3396-JolteonPicFront: INCBIN "pic/ymon/jolteon.pic"
3397-JolteonPicBack: INCBIN "pic/monback/jolteonb.pic"
3398-VaporeonPicFront: INCBIN "pic/ymon/vaporeon.pic"
3399-VaporeonPicBack: INCBIN "pic/monback/vaporeonb.pic"
3400-MachopPicFront: INCBIN "pic/ymon/machop.pic"
3401-MachopPicBack: INCBIN "pic/monback/machopb.pic"
3402-ZubatPicFront: INCBIN "pic/ymon/zubat.pic"
3403-ZubatPicBack: INCBIN "pic/monback/zubatb.pic"
3404-EkansPicFront: INCBIN "pic/ymon/ekans.pic"
3405-EkansPicBack: INCBIN "pic/monback/ekansb.pic"
3406-ParasPicFront: INCBIN "pic/ymon/paras.pic"
3407-ParasPicBack: INCBIN "pic/monback/parasb.pic"
3408-PoliwhirlPicFront: INCBIN "pic/ymon/poliwhirl.pic"
3409-PoliwhirlPicBack: INCBIN "pic/monback/poliwhirlb.pic"
3410-PoliwrathPicFront: INCBIN "pic/ymon/poliwrath.pic"
3411-PoliwrathPicBack: INCBIN "pic/monback/poliwrathb.pic"
3412-WeedlePicFront: INCBIN "pic/ymon/weedle.pic"
3413-WeedlePicBack: INCBIN "pic/monback/weedleb.pic"
3414-KakunaPicFront: INCBIN "pic/ymon/kakuna.pic"
3415-KakunaPicBack: INCBIN "pic/monback/kakunab.pic"
3416-BeedrillPicFront: INCBIN "pic/ymon/beedrill.pic"
3417-BeedrillPicBack: INCBIN "pic/monback/beedrillb.pic"
3418-
3419-FossilKabutopsPic: INCBIN "pic/ymon/fossilkabutops.pic"
3420+SECTION "bank0B", ROMX
3421
3422 INCLUDE "engine/battle/display_effectiveness.asm"
3423 INCLUDE "engine/items/tmhm.asm"
3424@@ -692,125 +493,9 @@ Func_2fd6a:
3425 INCLUDE "engine/battle/scale_sprites.asm"
3426 INCLUDE "engine/game_corner_slots2.asm"
3427
3428+SECTION "bank0C", ROMX
3429
3430-SECTION "Pics 4", ROMX ; BANK $0C
3431-
3432-DodrioPicFront: INCBIN "pic/ymon/dodrio.pic"
3433-DodrioPicBack: INCBIN "pic/monback/dodriob.pic"
3434-PrimeapePicFront: INCBIN "pic/ymon/primeape.pic"
3435-PrimeapePicBack: INCBIN "pic/monback/primeapeb.pic"
3436-DugtrioPicFront: INCBIN "pic/ymon/dugtrio.pic"
3437-DugtrioPicBack: INCBIN "pic/monback/dugtriob.pic"
3438-VenomothPicFront: INCBIN "pic/ymon/venomoth.pic"
3439-VenomothPicBack: INCBIN "pic/monback/venomothb.pic"
3440-DewgongPicFront: INCBIN "pic/ymon/dewgong.pic"
3441-DewgongPicBack: INCBIN "pic/monback/dewgongb.pic"
3442-CaterpiePicFront: INCBIN "pic/ymon/caterpie.pic"
3443-CaterpiePicBack: INCBIN "pic/monback/caterpieb.pic"
3444-MetapodPicFront: INCBIN "pic/ymon/metapod.pic"
3445-MetapodPicBack: INCBIN "pic/monback/metapodb.pic"
3446-ButterfreePicFront: INCBIN "pic/ymon/butterfree.pic"
3447-ButterfreePicBack: INCBIN "pic/monback/butterfreeb.pic"
3448-MachampPicFront: INCBIN "pic/ymon/machamp.pic"
3449-MachampPicBack: INCBIN "pic/monback/machampb.pic"
3450-GolduckPicFront: INCBIN "pic/ymon/golduck.pic"
3451-GolduckPicBack: INCBIN "pic/monback/golduckb.pic"
3452-HypnoPicFront: INCBIN "pic/ymon/hypno.pic"
3453-HypnoPicBack: INCBIN "pic/monback/hypnob.pic"
3454-GolbatPicFront: INCBIN "pic/ymon/golbat.pic"
3455-GolbatPicBack: INCBIN "pic/monback/golbatb.pic"
3456-MewtwoPicFront: INCBIN "pic/ymon/mewtwo.pic"
3457-MewtwoPicBack: INCBIN "pic/monback/mewtwob.pic"
3458-SnorlaxPicFront: INCBIN "pic/ymon/snorlax.pic"
3459-SnorlaxPicBack: INCBIN "pic/monback/snorlaxb.pic"
3460-MagikarpPicFront: INCBIN "pic/ymon/magikarp.pic"
3461-MagikarpPicBack: INCBIN "pic/monback/magikarpb.pic"
3462-MukPicFront: INCBIN "pic/ymon/muk.pic"
3463-MukPicBack: INCBIN "pic/monback/mukb.pic"
3464-KinglerPicFront: INCBIN "pic/ymon/kingler.pic"
3465-KinglerPicBack: INCBIN "pic/monback/kinglerb.pic"
3466-CloysterPicFront: INCBIN "pic/ymon/cloyster.pic"
3467-CloysterPicBack: INCBIN "pic/monback/cloysterb.pic"
3468-ElectrodePicFront: INCBIN "pic/ymon/electrode.pic"
3469-ElectrodePicBack: INCBIN "pic/monback/electrodeb.pic"
3470-ClefablePicFront: INCBIN "pic/ymon/clefable.pic"
3471-ClefablePicBack: INCBIN "pic/monback/clefableb.pic"
3472-WeezingPicFront: INCBIN "pic/ymon/weezing.pic"
3473-WeezingPicBack: INCBIN "pic/monback/weezingb.pic"
3474-PersianPicFront: INCBIN "pic/ymon/persian.pic"
3475-PersianPicBack: INCBIN "pic/monback/persianb.pic"
3476-MarowakPicFront: INCBIN "pic/ymon/marowak.pic"
3477-MarowakPicBack: INCBIN "pic/monback/marowakb.pic"
3478-HaunterPicFront: INCBIN "pic/ymon/haunter.pic"
3479-HaunterPicBack: INCBIN "pic/monback/haunterb.pic"
3480-AbraPicFront: INCBIN "pic/ymon/abra.pic"
3481-AbraPicBack: INCBIN "pic/monback/abrab.pic"
3482-AlakazamPicFront: INCBIN "pic/ymon/alakazam.pic"
3483-AlakazamPicBack: INCBIN "pic/monback/alakazamb.pic"
3484-PidgeottoPicFront: INCBIN "pic/ymon/pidgeotto.pic"
3485-PidgeottoPicBack: INCBIN "pic/monback/pidgeottob.pic"
3486-PidgeotPicFront: INCBIN "pic/ymon/pidgeot.pic"
3487-PidgeotPicBack: INCBIN "pic/monback/pidgeotb.pic"
3488-StarmiePicFront: INCBIN "pic/ymon/starmie.pic"
3489-StarmiePicBack: INCBIN "pic/monback/starmieb.pic"
3490-
3491-
3492-SECTION "Pics 5", ROMX ; BANK $0D
3493-
3494-BulbasaurPicFront: INCBIN "pic/ymon/bulbasaur.pic"
3495-BulbasaurPicBack: INCBIN "pic/monback/bulbasaurb.pic"
3496-VenusaurPicFront: INCBIN "pic/ymon/venusaur.pic"
3497-VenusaurPicBack: INCBIN "pic/monback/venusaurb.pic"
3498-TentacruelPicFront: INCBIN "pic/ymon/tentacruel.pic"
3499-TentacruelPicBack: INCBIN "pic/monback/tentacruelb.pic"
3500-GoldeenPicFront: INCBIN "pic/ymon/goldeen.pic"
3501-GoldeenPicBack: INCBIN "pic/monback/goldeenb.pic"
3502-SeakingPicFront: INCBIN "pic/ymon/seaking.pic"
3503-SeakingPicBack: INCBIN "pic/monback/seakingb.pic"
3504-PonytaPicFront: INCBIN "pic/ymon/ponyta.pic"
3505-RapidashPicFront: INCBIN "pic/ymon/rapidash.pic"
3506-PonytaPicBack: INCBIN "pic/monback/ponytab.pic"
3507-RapidashPicBack: INCBIN "pic/monback/rapidashb.pic"
3508-RattataPicFront: INCBIN "pic/ymon/rattata.pic"
3509-RattataPicBack: INCBIN "pic/monback/rattatab.pic"
3510-RaticatePicFront: INCBIN "pic/ymon/raticate.pic"
3511-RaticatePicBack: INCBIN "pic/monback/raticateb.pic"
3512-NidorinoPicFront: INCBIN "pic/ymon/nidorino.pic"
3513-NidorinoPicBack: INCBIN "pic/monback/nidorinob.pic"
3514-NidorinaPicFront: INCBIN "pic/ymon/nidorina.pic"
3515-NidorinaPicBack: INCBIN "pic/monback/nidorinab.pic"
3516-GeodudePicFront: INCBIN "pic/ymon/geodude.pic"
3517-GeodudePicBack: INCBIN "pic/monback/geodudeb.pic"
3518-PorygonPicFront: INCBIN "pic/ymon/porygon.pic"
3519-PorygonPicBack: INCBIN "pic/monback/porygonb.pic"
3520-AerodactylPicFront: INCBIN "pic/ymon/aerodactyl.pic"
3521-AerodactylPicBack: INCBIN "pic/monback/aerodactylb.pic"
3522-MagnemitePicFront: INCBIN "pic/ymon/magnemite.pic"
3523-MagnemitePicBack: INCBIN "pic/monback/magnemiteb.pic"
3524-CharmanderPicFront: INCBIN "pic/ymon/charmander.pic"
3525-CharmanderPicBack: INCBIN "pic/monback/charmanderb.pic"
3526-SquirtlePicFront: INCBIN "pic/ymon/squirtle.pic"
3527-SquirtlePicBack: INCBIN "pic/monback/squirtleb.pic"
3528-CharmeleonPicFront: INCBIN "pic/ymon/charmeleon.pic"
3529-CharmeleonPicBack: INCBIN "pic/monback/charmeleonb.pic"
3530-WartortlePicFront: INCBIN "pic/ymon/wartortle.pic"
3531-WartortlePicBack: INCBIN "pic/monback/wartortleb.pic"
3532-CharizardPicFront: INCBIN "pic/ymon/charizard.pic"
3533-CharizardPicBack: INCBIN "pic/monback/charizardb.pic"
3534-FossilAerodactylPic: INCBIN "pic/ymon/fossilaerodactyl.pic"
3535-GhostPic: INCBIN "pic/other/ghost.pic"
3536-OddishPicFront: INCBIN "pic/ymon/oddish.pic"
3537-OddishPicBack: INCBIN "pic/monback/oddishb.pic"
3538-GloomPicFront: INCBIN "pic/ymon/gloom.pic"
3539-GloomPicBack: INCBIN "pic/monback/gloomb.pic"
3540-VileplumePicFront: INCBIN "pic/ymon/vileplume.pic"
3541-VileplumePicBack: INCBIN "pic/monback/vileplumeb.pic"
3542-BellsproutPicFront: INCBIN "pic/ymon/bellsprout.pic"
3543-BellsproutPicBack: INCBIN "pic/monback/bellsproutb.pic"
3544-WeepinbellPicFront: INCBIN "pic/ymon/weepinbell.pic"
3545-WeepinbellPicBack: INCBIN "pic/monback/weepinbellb.pic"
3546-VictreebelPicFront: INCBIN "pic/ymon/victreebel.pic"
3547-VictreebelPicBack: INCBIN "pic/monback/victreebelb.pic"
3548+SECTION "bank0D", ROMX
3549
3550 INCLUDE "engine/titlescreen2.asm"
3551 INCLUDE "engine/slot_machine.asm"
3552@@ -1435,8 +1120,6 @@ INCLUDE "data/mapHeaders/route18.asm"
3553 INCLUDE "data/mapObjects/route18.asm"
3554 Route18Blocks: INCBIN "maps/route18.blk"
3555
3556-INCBIN "maps/unusedblocks58d7d.blk"
3557-
3558 INCLUDE "engine/experience.asm"
3559
3560 INCLUDE "engine/status_ailments.asm"
3561@@ -1643,8 +1326,6 @@ ViridianForestBlocks: INCBIN "maps/viridianforest.blk"
3562 UndergroundPathNSBlocks: INCBIN "maps/undergroundpathns.blk"
3563 UndergroundPathWEBlocks: INCBIN "maps/undergroundpathwe.blk"
3564
3565-INCBIN "maps/unusedblocks60258.blk"
3566-
3567 SSAnne9Blocks:
3568 SSAnne10Blocks: INCBIN "maps/ssanne9.blk"
3569
3570@@ -1678,8 +1359,6 @@ INCLUDE "scripts/pokemontower6.asm"
3571 INCLUDE "data/mapObjects/pokemontower6.asm"
3572 PokemonTower6Blocks: INCBIN "maps/pokemontower6.blk"
3573
3574-INCBIN "maps/unusedblocks60cef.blk"
3575-
3576 INCLUDE "data/mapHeaders/pokemontower7.asm"
3577 INCLUDE "scripts/pokemontower7.asm"
3578 INCLUDE "data/mapObjects/pokemontower7.asm"
3579@@ -2121,6 +1800,7 @@ INCLUDE "engine/overworld/npc_movement_2.asm"
3580
3581 ; bank $3b is empty
3582
3583+
3584 SECTION "bank3C", ROMX
3585
3586 INCLUDE "engine/bank3c.asm"
3587@@ -2139,3 +1819,335 @@ INCLUDE "engine/bank3e.asm"
3588 SECTION "bank3F", ROMX
3589
3590 INCLUDE "engine/bank3f.asm"
3591+
3592+SECTION "Pics 1", ROMX ; BANK $40
3593+
3594+RizerosPicFront: INCBIN "pic/ymon/rizeros.pic"
3595+RizerosPicBack: INCBIN "pic/monback/rizerosb.pic"
3596+KangaskhanPicFront: INCBIN "pic/ymon/kangaskhan.pic"
3597+KangaskhanPicBack: INCBIN "pic/monback/kangaskhanb.pic"
3598+NidoranMPicFront: INCBIN "pic/ymon/nidoranm.pic"
3599+NidoranMPicBack: INCBIN "pic/monback/nidoranmb.pic"
3600+ClefairyPicFront: INCBIN "pic/ymon/clefairy.pic"
3601+ClefairyPicBack: INCBIN "pic/monback/clefairyb.pic"
3602+SpearowPicFront: INCBIN "pic/ymon/spearow.pic"
3603+SpearowPicBack: INCBIN "pic/monback/spearowb.pic"
3604+VoltorbPicFront: INCBIN "pic/ymon/voltorb.pic"
3605+VoltorbPicBack: INCBIN "pic/monback/voltorbb.pic"
3606+NidokingPicFront: INCBIN "pic/ymon/nidoking.pic"
3607+NidokingPicBack: INCBIN "pic/monback/nidokingb.pic"
3608+SlowbroPicFront: INCBIN "pic/ymon/slowbro.pic"
3609+SlowbroPicBack: INCBIN "pic/monback/slowbrob.pic"
3610+IvysaurPicFront: INCBIN "pic/ymon/ivysaur.pic"
3611+IvysaurPicBack: INCBIN "pic/monback/ivysaurb.pic"
3612+ExeggutorPicFront: INCBIN "pic/ymon/exeggutor.pic"
3613+ExeggutorPicBack: INCBIN "pic/monback/exeggutorb.pic"
3614+LickitungPicFront: INCBIN "pic/ymon/lickitung.pic"
3615+LickitungPicBack: INCBIN "pic/monback/lickitungb.pic"
3616+ExeggcutePicFront: INCBIN "pic/ymon/exeggcute.pic"
3617+ExeggcutePicBack: INCBIN "pic/monback/exeggcuteb.pic"
3618+GrimerPicFront: INCBIN "pic/ymon/grimer.pic"
3619+GrimerPicBack: INCBIN "pic/monback/grimerb.pic"
3620+GengarPicFront: INCBIN "pic/ymon/gengar.pic"
3621+GengarPicBack: INCBIN "pic/monback/gengarb.pic"
3622+NidoranFPicFront: INCBIN "pic/ymon/nidoranf.pic"
3623+NidoranFPicBack: INCBIN "pic/monback/nidoranfb.pic"
3624+NidoqueenPicFront: INCBIN "pic/ymon/nidoqueen.pic"
3625+NidoqueenPicBack: INCBIN "pic/monback/nidoqueenb.pic"
3626+CubonePicFront: INCBIN "pic/ymon/cubone.pic"
3627+CubonePicBack: INCBIN "pic/monback/cuboneb.pic"
3628+RhyhornPicFront: INCBIN "pic/ymon/rhyhorn.pic"
3629+RhyhornPicBack: INCBIN "pic/monback/rhyhornb.pic"
3630+LaprasPicFront: INCBIN "pic/ymon/lapras.pic"
3631+LaprasPicBack: INCBIN "pic/monback/laprasb.pic"
3632+ArcaninePicFront: INCBIN "pic/ymon/arcanine.pic"
3633+ArcaninePicBack: INCBIN "pic/monback/arcanineb.pic"
3634+MewPicFront: INCBIN "pic/ymon/mew.pic"
3635+MewPicBack: INCBIN "pic/monback/mewb.pic"
3636+GyaradosPicFront: INCBIN "pic/ymon/gyarados.pic"
3637+GyaradosPicBack: INCBIN "pic/monback/gyaradosb.pic"
3638+ShellderPicFront: INCBIN "pic/ymon/shellder.pic"
3639+ShellderPicBack: INCBIN "pic/monback/shellderb.pic"
3640+TentacoolPicFront: INCBIN "pic/ymon/tentacool.pic"
3641+TentacoolPicBack: INCBIN "pic/monback/tentacoolb.pic"
3642+GastlyPicFront: INCBIN "pic/ymon/gastly.pic"
3643+GastlyPicBack: INCBIN "pic/monback/gastlyb.pic"
3644+ScytherPicFront: INCBIN "pic/ymon/scyther.pic"
3645+ScytherPicBack: INCBIN "pic/monback/scytherb.pic"
3646+StaryuPicFront: INCBIN "pic/ymon/staryu.pic"
3647+StaryuPicBack: INCBIN "pic/monback/staryub.pic"
3648+BlastoisePicFront: INCBIN "pic/ymon/blastoise.pic"
3649+BlastoisePicBack: INCBIN "pic/monback/blastoiseb.pic"
3650+PinsirPicFront: INCBIN "pic/ymon/pinsir.pic"
3651+PinsirPicBack: INCBIN "pic/monback/pinsirb.pic"
3652+TangelaPicFront: INCBIN "pic/ymon/tangela.pic"
3653+TangelaPicBack: INCBIN "pic/monback/tangelab.pic"
3654+
3655+SECTION "Pics 2", ROMX ; BANK $41
3656+
3657+GrowlithePicFront: INCBIN "pic/ymon/growlithe.pic"
3658+GrowlithePicBack: INCBIN "pic/monback/growlitheb.pic"
3659+OnixPicFront: INCBIN "pic/ymon/onix.pic"
3660+OnixPicBack: INCBIN "pic/monback/onixb.pic"
3661+FearowPicFront: INCBIN "pic/ymon/fearow.pic"
3662+FearowPicBack: INCBIN "pic/monback/fearowb.pic"
3663+PidgeyPicFront: INCBIN "pic/ymon/pidgey.pic"
3664+PidgeyPicBack: INCBIN "pic/monback/pidgeyb.pic"
3665+SlowpokePicFront: INCBIN "pic/ymon/slowpoke.pic"
3666+SlowpokePicBack: INCBIN "pic/monback/slowpokeb.pic"
3667+KadabraPicFront: INCBIN "pic/ymon/kadabra.pic"
3668+KadabraPicBack: INCBIN "pic/monback/kadabrab.pic"
3669+GravelerPicFront: INCBIN "pic/ymon/graveler.pic"
3670+GravelerPicBack: INCBIN "pic/monback/gravelerb.pic"
3671+ChanseyPicFront: INCBIN "pic/ymon/chansey.pic"
3672+ChanseyPicBack: INCBIN "pic/monback/chanseyb.pic"
3673+MachokePicFront: INCBIN "pic/ymon/machoke.pic"
3674+MachokePicBack: INCBIN "pic/monback/machokeb.pic"
3675+MrMimePicFront: INCBIN "pic/ymon/mr.mime.pic"
3676+MrMimePicBack: INCBIN "pic/monback/mr.mimeb.pic"
3677+HitmonleePicFront: INCBIN "pic/ymon/hitmonlee.pic"
3678+HitmonleePicBack: INCBIN "pic/monback/hitmonleeb.pic"
3679+HitmonchanPicFront: INCBIN "pic/ymon/hitmonchan.pic"
3680+HitmonchanPicBack: INCBIN "pic/monback/hitmonchanb.pic"
3681+ArbokPicFront: INCBIN "pic/ymon/arbok.pic"
3682+ArbokPicBack: INCBIN "pic/monback/arbokb.pic"
3683+ParasectPicFront: INCBIN "pic/ymon/parasect.pic"
3684+ParasectPicBack: INCBIN "pic/monback/parasectb.pic"
3685+PsyduckPicFront: INCBIN "pic/ymon/psyduck.pic"
3686+PsyduckPicBack: INCBIN "pic/monback/psyduckb.pic"
3687+DrowzeePicFront: INCBIN "pic/ymon/drowzee.pic"
3688+DrowzeePicBack: INCBIN "pic/monback/drowzeeb.pic"
3689+GolemPicFront: INCBIN "pic/ymon/golem.pic"
3690+GolemPicBack: INCBIN "pic/monback/golemb.pic"
3691+MagmarPicFront: INCBIN "pic/ymon/magmar.pic"
3692+MagmarPicBack: INCBIN "pic/monback/magmarb.pic"
3693+ElectabuzzPicFront: INCBIN "pic/ymon/electabuzz.pic"
3694+ElectabuzzPicBack: INCBIN "pic/monback/electabuzzb.pic"
3695+MagnetonPicFront: INCBIN "pic/ymon/magneton.pic"
3696+MagnetonPicBack: INCBIN "pic/monback/magnetonb.pic"
3697+KoffingPicFront: INCBIN "pic/ymon/koffing.pic"
3698+KoffingPicBack: INCBIN "pic/monback/koffingb.pic"
3699+MankeyPicFront: INCBIN "pic/ymon/mankey.pic"
3700+MankeyPicBack: INCBIN "pic/monback/mankeyb.pic"
3701+SeelPicFront: INCBIN "pic/ymon/seel.pic"
3702+SeelPicBack: INCBIN "pic/monback/seelb.pic"
3703+DiglettPicFront: INCBIN "pic/ymon/diglett.pic"
3704+DiglettPicBack: INCBIN "pic/monback/diglettb.pic"
3705+TaurosPicFront: INCBIN "pic/ymon/tauros.pic"
3706+TaurosPicBack: INCBIN "pic/monback/taurosb.pic"
3707+FarfetchdPicFront: INCBIN "pic/ymon/farfetchd.pic"
3708+FarfetchdPicBack: INCBIN "pic/monback/farfetchdb.pic"
3709+VenonatPicFront: INCBIN "pic/ymon/venonat.pic"
3710+VenonatPicBack: INCBIN "pic/monback/venonatb.pic"
3711+DragonitePicFront: INCBIN "pic/ymon/dragonite.pic"
3712+DragonitePicBack: INCBIN "pic/monback/dragoniteb.pic"
3713+DoduoPicFront: INCBIN "pic/ymon/doduo.pic"
3714+DoduoPicBack: INCBIN "pic/monback/doduob.pic"
3715+PoliwagPicFront: INCBIN "pic/ymon/poliwag.pic"
3716+PoliwagPicBack: INCBIN "pic/monback/poliwagb.pic"
3717+JynxPicFront: INCBIN "pic/ymon/jynx.pic"
3718+JynxPicBack: INCBIN "pic/monback/jynxb.pic"
3719+MoltresPicFront: INCBIN "pic/ymon/moltres.pic"
3720+MoltresPicBack: INCBIN "pic/monback/moltresb.pic"
3721+
3722+SECTION "Pics 3", ROMX ; BANK $42
3723+
3724+ArticunoPicFront: INCBIN "pic/ymon/articuno.pic"
3725+ArticunoPicBack: INCBIN "pic/monback/articunob.pic"
3726+ZapdosPicFront: INCBIN "pic/ymon/zapdos.pic"
3727+ZapdosPicBack: INCBIN "pic/monback/zapdosb.pic"
3728+DittoPicFront: INCBIN "pic/ymon/ditto.pic"
3729+DittoPicBack: INCBIN "pic/monback/dittob.pic"
3730+MeowthPicFront: INCBIN "pic/ymon/meowth.pic"
3731+MeowthPicBack: INCBIN "pic/monback/meowthb.pic"
3732+KrabbyPicFront: INCBIN "pic/ymon/krabby.pic"
3733+KrabbyPicBack: INCBIN "pic/monback/krabbyb.pic"
3734+VulpixPicFront: INCBIN "pic/ymon/vulpix.pic"
3735+VulpixPicBack: INCBIN "pic/monback/vulpixb.pic"
3736+NinetalesPicFront: INCBIN "pic/ymon/ninetales.pic"
3737+NinetalesPicBack: INCBIN "pic/monback/ninetalesb.pic"
3738+PikachuPicFront: INCBIN "pic/ymon/pikachu.pic"
3739+PikachuPicBack: INCBIN "pic/monback/pikachub.pic"
3740+RaichuPicFront: INCBIN "pic/ymon/raichu.pic"
3741+RaichuPicBack: INCBIN "pic/monback/raichub.pic"
3742+DratiniPicFront: INCBIN "pic/ymon/dratini.pic"
3743+DratiniPicBack: INCBIN "pic/monback/dratinib.pic"
3744+DragonairPicFront: INCBIN "pic/ymon/dragonair.pic"
3745+DragonairPicBack: INCBIN "pic/monback/dragonairb.pic"
3746+KabutoPicFront: INCBIN "pic/ymon/kabuto.pic"
3747+KabutoPicBack: INCBIN "pic/monback/kabutob.pic"
3748+KabutopsPicFront: INCBIN "pic/ymon/kabutops.pic"
3749+KabutopsPicBack: INCBIN "pic/monback/kabutopsb.pic"
3750+HorseaPicFront: INCBIN "pic/ymon/horsea.pic"
3751+HorseaPicBack: INCBIN "pic/monback/horseab.pic"
3752+SeadraPicFront: INCBIN "pic/ymon/seadra.pic"
3753+SeadraPicBack: INCBIN "pic/monback/seadrab.pic"
3754+SandshrewPicFront: INCBIN "pic/ymon/sandshrew.pic"
3755+SandshrewPicBack: INCBIN "pic/monback/sandshrewb.pic"
3756+SandslashPicFront: INCBIN "pic/ymon/sandslash.pic"
3757+SandslashPicBack: INCBIN "pic/monback/sandslashb.pic"
3758+OmanytePicFront: INCBIN "pic/ymon/omanyte.pic"
3759+OmanytePicBack: INCBIN "pic/monback/omanyteb.pic"
3760+OmastarPicFront: INCBIN "pic/ymon/omastar.pic"
3761+OmastarPicBack: INCBIN "pic/monback/omastarb.pic"
3762+JigglypuffPicFront: INCBIN "pic/ymon/jigglypuff.pic"
3763+JigglypuffPicBack: INCBIN "pic/monback/jigglypuffb.pic"
3764+WigglytuffPicFront: INCBIN "pic/ymon/wigglytuff.pic"
3765+WigglytuffPicBack: INCBIN "pic/monback/wigglytuffb.pic"
3766+EeveePicFront: INCBIN "pic/ymon/eevee.pic"
3767+EeveePicBack: INCBIN "pic/monback/eeveeb.pic"
3768+FlareonPicFront: INCBIN "pic/ymon/flareon.pic"
3769+FlareonPicBack: INCBIN "pic/monback/flareonb.pic"
3770+JolteonPicFront: INCBIN "pic/ymon/jolteon.pic"
3771+JolteonPicBack: INCBIN "pic/monback/jolteonb.pic"
3772+VaporeonPicFront: INCBIN "pic/ymon/vaporeon.pic"
3773+VaporeonPicBack: INCBIN "pic/monback/vaporeonb.pic"
3774+MachopPicFront: INCBIN "pic/ymon/machop.pic"
3775+MachopPicBack: INCBIN "pic/monback/machopb.pic"
3776+ZubatPicFront: INCBIN "pic/ymon/zubat.pic"
3777+ZubatPicBack: INCBIN "pic/monback/zubatb.pic"
3778+EkansPicFront: INCBIN "pic/ymon/ekans.pic"
3779+EkansPicBack: INCBIN "pic/monback/ekansb.pic"
3780+ParasPicFront: INCBIN "pic/ymon/paras.pic"
3781+ParasPicBack: INCBIN "pic/monback/parasb.pic"
3782+PoliwhirlPicFront: INCBIN "pic/ymon/poliwhirl.pic"
3783+PoliwhirlPicBack: INCBIN "pic/monback/poliwhirlb.pic"
3784+PoliwrathPicFront: INCBIN "pic/ymon/poliwrath.pic"
3785+PoliwrathPicBack: INCBIN "pic/monback/poliwrathb.pic"
3786+WeedlePicFront: INCBIN "pic/ymon/weedle.pic"
3787+WeedlePicBack: INCBIN "pic/monback/weedleb.pic"
3788+KakunaPicFront: INCBIN "pic/ymon/kakuna.pic"
3789+KakunaPicBack: INCBIN "pic/monback/kakunab.pic"
3790+BeedrillPicFront: INCBIN "pic/ymon/beedrill.pic"
3791+BeedrillPicBack: INCBIN "pic/monback/beedrillb.pic"
3792+
3793+FossilKabutopsPic: INCBIN "pic/ymon/fossilkabutops.pic"
3794+
3795+SECTION "Pics 4", ROMX ; BANK $43
3796+
3797+DodrioPicFront: INCBIN "pic/ymon/dodrio.pic"
3798+DodrioPicBack: INCBIN "pic/monback/dodriob.pic"
3799+PrimeapePicFront: INCBIN "pic/ymon/primeape.pic"
3800+PrimeapePicBack: INCBIN "pic/monback/primeapeb.pic"
3801+DugtrioPicFront: INCBIN "pic/ymon/dugtrio.pic"
3802+DugtrioPicBack: INCBIN "pic/monback/dugtriob.pic"
3803+VenomothPicFront: INCBIN "pic/ymon/venomoth.pic"
3804+VenomothPicBack: INCBIN "pic/monback/venomothb.pic"
3805+DewgongPicFront: INCBIN "pic/ymon/dewgong.pic"
3806+DewgongPicBack: INCBIN "pic/monback/dewgongb.pic"
3807+CaterpiePicFront: INCBIN "pic/ymon/caterpie.pic"
3808+CaterpiePicBack: INCBIN "pic/monback/caterpieb.pic"
3809+MetapodPicFront: INCBIN "pic/ymon/metapod.pic"
3810+MetapodPicBack: INCBIN "pic/monback/metapodb.pic"
3811+ButterfreePicFront: INCBIN "pic/ymon/butterfree.pic"
3812+ButterfreePicBack: INCBIN "pic/monback/butterfreeb.pic"
3813+MachampPicFront: INCBIN "pic/ymon/machamp.pic"
3814+MachampPicBack: INCBIN "pic/monback/machampb.pic"
3815+GolduckPicFront: INCBIN "pic/ymon/golduck.pic"
3816+GolduckPicBack: INCBIN "pic/monback/golduckb.pic"
3817+HypnoPicFront: INCBIN "pic/ymon/hypno.pic"
3818+HypnoPicBack: INCBIN "pic/monback/hypnob.pic"
3819+GolbatPicFront: INCBIN "pic/ymon/golbat.pic"
3820+GolbatPicBack: INCBIN "pic/monback/golbatb.pic"
3821+MewtwoPicFront: INCBIN "pic/ymon/mewtwo.pic"
3822+MewtwoPicBack: INCBIN "pic/monback/mewtwob.pic"
3823+SnorlaxPicFront: INCBIN "pic/ymon/snorlax.pic"
3824+SnorlaxPicBack: INCBIN "pic/monback/snorlaxb.pic"
3825+MagikarpPicFront: INCBIN "pic/ymon/magikarp.pic"
3826+MagikarpPicBack: INCBIN "pic/monback/magikarpb.pic"
3827+MukPicFront: INCBIN "pic/ymon/muk.pic"
3828+MukPicBack: INCBIN "pic/monback/mukb.pic"
3829+KinglerPicFront: INCBIN "pic/ymon/kingler.pic"
3830+KinglerPicBack: INCBIN "pic/monback/kinglerb.pic"
3831+CloysterPicFront: INCBIN "pic/ymon/cloyster.pic"
3832+CloysterPicBack: INCBIN "pic/monback/cloysterb.pic"
3833+ElectrodePicFront: INCBIN "pic/ymon/electrode.pic"
3834+ElectrodePicBack: INCBIN "pic/monback/electrodeb.pic"
3835+ClefablePicFront: INCBIN "pic/ymon/clefable.pic"
3836+ClefablePicBack: INCBIN "pic/monback/clefableb.pic"
3837+WeezingPicFront: INCBIN "pic/ymon/weezing.pic"
3838+WeezingPicBack: INCBIN "pic/monback/weezingb.pic"
3839+PersianPicFront: INCBIN "pic/ymon/persian.pic"
3840+PersianPicBack: INCBIN "pic/monback/persianb.pic"
3841+MarowakPicFront: INCBIN "pic/ymon/marowak.pic"
3842+MarowakPicBack: INCBIN "pic/monback/marowakb.pic"
3843+HaunterPicFront: INCBIN "pic/ymon/haunter.pic"
3844+HaunterPicBack: INCBIN "pic/monback/haunterb.pic"
3845+AbraPicFront: INCBIN "pic/ymon/abra.pic"
3846+AbraPicBack: INCBIN "pic/monback/abrab.pic"
3847+AlakazamPicFront: INCBIN "pic/ymon/alakazam.pic"
3848+AlakazamPicBack: INCBIN "pic/monback/alakazamb.pic"
3849+PidgeottoPicFront: INCBIN "pic/ymon/pidgeotto.pic"
3850+PidgeottoPicBack: INCBIN "pic/monback/pidgeottob.pic"
3851+PidgeotPicFront: INCBIN "pic/ymon/pidgeot.pic"
3852+PidgeotPicBack: INCBIN "pic/monback/pidgeotb.pic"
3853+StarmiePicFront: INCBIN "pic/ymon/starmie.pic"
3854+StarmiePicBack: INCBIN "pic/monback/starmieb.pic"
3855+
3856+SECTION "Pics 5", ROMX ; BANK $44
3857+
3858+BulbasaurPicFront: INCBIN "pic/ymon/bulbasaur.pic"
3859+BulbasaurPicBack: INCBIN "pic/monback/bulbasaurb.pic"
3860+VenusaurPicFront: INCBIN "pic/ymon/venusaur.pic"
3861+VenusaurPicBack: INCBIN "pic/monback/venusaurb.pic"
3862+TentacruelPicFront: INCBIN "pic/ymon/tentacruel.pic"
3863+TentacruelPicBack: INCBIN "pic/monback/tentacruelb.pic"
3864+GoldeenPicFront: INCBIN "pic/ymon/goldeen.pic"
3865+GoldeenPicBack: INCBIN "pic/monback/goldeenb.pic"
3866+SeakingPicFront: INCBIN "pic/ymon/seaking.pic"
3867+SeakingPicBack: INCBIN "pic/monback/seakingb.pic"
3868+PonytaPicFront: INCBIN "pic/ymon/ponyta.pic"
3869+RapidashPicFront: INCBIN "pic/ymon/rapidash.pic"
3870+PonytaPicBack: INCBIN "pic/monback/ponytab.pic"
3871+RapidashPicBack: INCBIN "pic/monback/rapidashb.pic"
3872+RattataPicFront: INCBIN "pic/ymon/rattata.pic"
3873+RattataPicBack: INCBIN "pic/monback/rattatab.pic"
3874+RaticatePicFront: INCBIN "pic/ymon/raticate.pic"
3875+RaticatePicBack: INCBIN "pic/monback/raticateb.pic"
3876+NidorinoPicFront: INCBIN "pic/ymon/nidorino.pic"
3877+NidorinoPicBack: INCBIN "pic/monback/nidorinob.pic"
3878+NidorinaPicFront: INCBIN "pic/ymon/nidorina.pic"
3879+NidorinaPicBack: INCBIN "pic/monback/nidorinab.pic"
3880+GeodudePicFront: INCBIN "pic/ymon/geodude.pic"
3881+GeodudePicBack: INCBIN "pic/monback/geodudeb.pic"
3882+PorygonPicFront: INCBIN "pic/ymon/porygon.pic"
3883+PorygonPicBack: INCBIN "pic/monback/porygonb.pic"
3884+AerodactylPicFront: INCBIN "pic/ymon/aerodactyl.pic"
3885+AerodactylPicBack: INCBIN "pic/monback/aerodactylb.pic"
3886+MagnemitePicFront: INCBIN "pic/ymon/magnemite.pic"
3887+MagnemitePicBack: INCBIN "pic/monback/magnemiteb.pic"
3888+CharmanderPicFront: INCBIN "pic/ymon/charmander.pic"
3889+CharmanderPicBack: INCBIN "pic/monback/charmanderb.pic"
3890+SquirtlePicFront: INCBIN "pic/ymon/squirtle.pic"
3891+SquirtlePicBack: INCBIN "pic/monback/squirtleb.pic"
3892+CharmeleonPicFront: INCBIN "pic/ymon/charmeleon.pic"
3893+CharmeleonPicBack: INCBIN "pic/monback/charmeleonb.pic"
3894+WartortlePicFront: INCBIN "pic/ymon/wartortle.pic"
3895+WartortlePicBack: INCBIN "pic/monback/wartortleb.pic"
3896+CharizardPicFront: INCBIN "pic/ymon/charizard.pic"
3897+CharizardPicBack: INCBIN "pic/monback/charizardb.pic"
3898+FossilAerodactylPic: INCBIN "pic/ymon/fossilaerodactyl.pic"
3899+GhostPic: INCBIN "pic/other/ghost.pic"
3900+OddishPicFront: INCBIN "pic/ymon/oddish.pic"
3901+OddishPicBack: INCBIN "pic/monback/oddishb.pic"
3902+GloomPicFront: INCBIN "pic/ymon/gloom.pic"
3903+GloomPicBack: INCBIN "pic/monback/gloomb.pic"
3904+VileplumePicFront: INCBIN "pic/ymon/vileplume.pic"
3905+VileplumePicBack: INCBIN "pic/monback/vileplumeb.pic"
3906+BellsproutPicFront: INCBIN "pic/ymon/bellsprout.pic"
3907+BellsproutPicBack: INCBIN "pic/monback/bellsproutb.pic"
3908+WeepinbellPicFront: INCBIN "pic/ymon/weepinbell.pic"
3909+WeepinbellPicBack: INCBIN "pic/monback/weepinbellb.pic"
3910+VictreebelPicFront: INCBIN "pic/ymon/victreebel.pic"
3911+VictreebelPicBack: INCBIN "pic/monback/victreebelb.pic"
3912+StahlosPicFront: INCBIN "pic/ymon/stahlos.pic"
3913+StahlosPicBack: INCBIN "pic/monback/stahlosb.pic"
3914+IksbatPicFront: INCBIN "pic/ymon/iksbat.pic"
3915+IksbatPicBack: INCBIN "pic/monback/iksbatb.pic"
3916+
3917+SECTION "bank45", ROMX
3918+
3919+INCLUDE "data/mapHeaders/route26.asm"
3920+INCLUDE "scripts/route26.asm"
3921+INCLUDE "data/mapObjects/route26.asm"
3922+Route26Blocks: INCBIN "maps/Route26.blk"
3923diff --git a/maps/agatha.blk b/maps/agatha.blk
3924old mode 100644
3925new mode 100755
3926diff --git a/maps/beach_house.blk b/maps/beach_house.blk
3927old mode 100644
3928new mode 100755
3929diff --git a/maps/bikeshop.blk b/maps/bikeshop.blk
3930old mode 100644
3931new mode 100755
3932diff --git a/maps/billshouse.blk b/maps/billshouse.blk
3933old mode 100644
3934new mode 100755
3935diff --git a/maps/blueshouse.blk b/maps/blueshouse.blk
3936old mode 100644
3937new mode 100755
3938diff --git a/maps/bruno.blk b/maps/bruno.blk
3939old mode 100644
3940new mode 100755
3941diff --git a/maps/celadoncity.blk b/maps/celadoncity.blk
3942old mode 100644
3943new mode 100755
3944diff --git a/maps/celadondiner.blk b/maps/celadondiner.blk
3945old mode 100644
3946new mode 100755
3947diff --git a/maps/celadongamecorner.blk b/maps/celadongamecorner.blk
3948old mode 100644
3949new mode 100755
3950diff --git a/maps/celadongym.blk b/maps/celadongym.blk
3951old mode 100644
3952new mode 100755
3953diff --git a/maps/celadonhotel.blk b/maps/celadonhotel.blk
3954old mode 100644
3955new mode 100755
3956diff --git a/maps/celadonhouse.blk b/maps/celadonhouse.blk
3957old mode 100644
3958new mode 100755
3959diff --git a/maps/celadonmansion1.blk b/maps/celadonmansion1.blk
3960old mode 100644
3961new mode 100755
3962diff --git a/maps/celadonmansion2.blk b/maps/celadonmansion2.blk
3963old mode 100644
3964new mode 100755
3965diff --git a/maps/celadonmansion3.blk b/maps/celadonmansion3.blk
3966old mode 100644
3967new mode 100755
3968diff --git a/maps/celadonmansion4.blk b/maps/celadonmansion4.blk
3969old mode 100644
3970new mode 100755
3971diff --git a/maps/celadonmansion5.blk b/maps/celadonmansion5.blk
3972old mode 100644
3973new mode 100755
3974diff --git a/maps/celadonmart1.blk b/maps/celadonmart1.blk
3975old mode 100644
3976new mode 100755
3977diff --git a/maps/celadonmart2.blk b/maps/celadonmart2.blk
3978old mode 100644
3979new mode 100755
3980diff --git a/maps/celadonmart3.blk b/maps/celadonmart3.blk
3981old mode 100644
3982new mode 100755
3983diff --git a/maps/celadonmart4.blk b/maps/celadonmart4.blk
3984old mode 100644
3985new mode 100755
3986diff --git a/maps/celadonmart5.blk b/maps/celadonmart5.blk
3987old mode 100644
3988new mode 100755
3989diff --git a/maps/celadonmartelevator.blk b/maps/celadonmartelevator.blk
3990old mode 100644
3991new mode 100755
3992diff --git a/maps/celadonmartroof.blk b/maps/celadonmartroof.blk
3993old mode 100644
3994new mode 100755
3995diff --git a/maps/celadonpokecenter.blk b/maps/celadonpokecenter.blk
3996old mode 100644
3997new mode 100755
3998diff --git a/maps/celadonprizeroom.blk b/maps/celadonprizeroom.blk
3999old mode 100644
4000new mode 100755
4001diff --git a/maps/ceruleancity.blk b/maps/ceruleancity.blk
4002old mode 100644
4003new mode 100755
4004diff --git a/maps/ceruleangym.blk b/maps/ceruleangym.blk
4005old mode 100644
4006new mode 100755
4007diff --git a/maps/ceruleanhouse1.blk b/maps/ceruleanhouse1.blk
4008old mode 100644
4009new mode 100755
4010diff --git a/maps/ceruleanhouse2.blk b/maps/ceruleanhouse2.blk
4011old mode 100644
4012new mode 100755
4013diff --git a/maps/ceruleanhousetrashed.blk b/maps/ceruleanhousetrashed.blk
4014old mode 100644
4015new mode 100755
4016diff --git a/maps/ceruleanmart.blk b/maps/ceruleanmart.blk
4017old mode 100644
4018new mode 100755
4019diff --git a/maps/ceruleanpokecenter.blk b/maps/ceruleanpokecenter.blk
4020old mode 100644
4021new mode 100755
4022diff --git a/maps/cinnabargym.blk b/maps/cinnabargym.blk
4023old mode 100644
4024new mode 100755
4025diff --git a/maps/cinnabarisland.blk b/maps/cinnabarisland.blk
4026old mode 100644
4027new mode 100755
4028diff --git a/maps/cinnabarmart.blk b/maps/cinnabarmart.blk
4029old mode 100644
4030new mode 100755
4031diff --git a/maps/cinnabarpokecenter.blk b/maps/cinnabarpokecenter.blk
4032old mode 100644
4033new mode 100755
4034diff --git a/maps/colosseum.blk b/maps/colosseum.blk
4035old mode 100644
4036new mode 100755
4037diff --git a/maps/copycatshouse1f.blk b/maps/copycatshouse1f.blk
4038old mode 100644
4039new mode 100755
4040diff --git a/maps/copycatshouse2f.blk b/maps/copycatshouse2f.blk
4041old mode 100644
4042new mode 100755
4043diff --git a/maps/daycarem.blk b/maps/daycarem.blk
4044old mode 100644
4045new mode 100755
4046diff --git a/maps/diglettscave.blk b/maps/diglettscave.blk
4047old mode 100644
4048new mode 100755
4049diff --git a/maps/diglettscaveentranceroute11.blk b/maps/diglettscaveentranceroute11.blk
4050old mode 100644
4051new mode 100755
4052diff --git a/maps/diglettscaveroute2.blk b/maps/diglettscaveroute2.blk
4053old mode 100644
4054new mode 100755
4055diff --git a/maps/fanclub.blk b/maps/fanclub.blk
4056old mode 100644
4057new mode 100755
4058diff --git a/maps/fightingdojo.blk b/maps/fightingdojo.blk
4059old mode 100644
4060new mode 100755
4061diff --git a/maps/fuchsiacity.blk b/maps/fuchsiacity.blk
4062old mode 100644
4063new mode 100755
4064diff --git a/maps/fuchsiagym.blk b/maps/fuchsiagym.blk
4065old mode 100644
4066new mode 100755
4067diff --git a/maps/fuchsiahouse1.blk b/maps/fuchsiahouse1.blk
4068old mode 100644
4069new mode 100755
4070diff --git a/maps/fuchsiahouse2.blk b/maps/fuchsiahouse2.blk
4071old mode 100644
4072new mode 100755
4073diff --git a/maps/fuchsiahouse3.blk b/maps/fuchsiahouse3.blk
4074old mode 100644
4075new mode 100755
4076diff --git a/maps/fuchsiamart.blk b/maps/fuchsiamart.blk
4077old mode 100644
4078new mode 100755
4079diff --git a/maps/fuchsiameetingroom.blk b/maps/fuchsiameetingroom.blk
4080old mode 100644
4081new mode 100755
4082diff --git a/maps/fuchsiapokecenter.blk b/maps/fuchsiapokecenter.blk
4083old mode 100644
4084new mode 100755
4085diff --git a/maps/gary.blk b/maps/gary.blk
4086old mode 100644
4087new mode 100755
4088diff --git a/maps/halloffameroom.blk b/maps/halloffameroom.blk
4089old mode 100644
4090new mode 100755
4091diff --git a/maps/indigoplateau.blk b/maps/indigoplateau.blk
4092old mode 100644
4093new mode 100755
4094diff --git a/maps/indigoplateaulobby.blk b/maps/indigoplateaulobby.blk
4095old mode 100644
4096new mode 100755
4097diff --git a/maps/lab1.blk b/maps/lab1.blk
4098old mode 100644
4099new mode 100755
4100diff --git a/maps/lab2.blk b/maps/lab2.blk
4101old mode 100644
4102new mode 100755
4103diff --git a/maps/lab3.blk b/maps/lab3.blk
4104old mode 100644
4105new mode 100755
4106diff --git a/maps/lab4.blk b/maps/lab4.blk
4107old mode 100644
4108new mode 100755
4109diff --git a/maps/lance.blk b/maps/lance.blk
4110old mode 100644
4111new mode 100755
4112diff --git a/maps/lavenderhouse1.blk b/maps/lavenderhouse1.blk
4113old mode 100644
4114new mode 100755
4115diff --git a/maps/lavenderhouse2.blk b/maps/lavenderhouse2.blk
4116old mode 100644
4117new mode 100755
4118diff --git a/maps/lavendermart.blk b/maps/lavendermart.blk
4119old mode 100644
4120new mode 100755
4121diff --git a/maps/lavenderpokecenter.blk b/maps/lavenderpokecenter.blk
4122old mode 100644
4123new mode 100755
4124diff --git a/maps/lavendertown.blk b/maps/lavendertown.blk
4125old mode 100644
4126new mode 100755
4127diff --git a/maps/lorelei.blk b/maps/lorelei.blk
4128old mode 100644
4129new mode 100755
4130diff --git a/maps/mansion1.blk b/maps/mansion1.blk
4131old mode 100644
4132new mode 100755
4133diff --git a/maps/mansion2.blk b/maps/mansion2.blk
4134old mode 100644
4135new mode 100755
4136diff --git a/maps/mansion3.blk b/maps/mansion3.blk
4137old mode 100644
4138new mode 100755
4139diff --git a/maps/mansion4.blk b/maps/mansion4.blk
4140old mode 100644
4141new mode 100755
4142diff --git a/maps/mtmoon1.blk b/maps/mtmoon1.blk
4143old mode 100644
4144new mode 100755
4145diff --git a/maps/mtmoon2.blk b/maps/mtmoon2.blk
4146old mode 100644
4147new mode 100755
4148diff --git a/maps/mtmoon3.blk b/maps/mtmoon3.blk
4149old mode 100644
4150new mode 100755
4151diff --git a/maps/mtmoonpokecenter.blk b/maps/mtmoonpokecenter.blk
4152old mode 100644
4153new mode 100755
4154diff --git a/maps/museum1f.blk b/maps/museum1f.blk
4155old mode 100644
4156new mode 100755
4157diff --git a/maps/museum2f.blk b/maps/museum2f.blk
4158old mode 100644
4159new mode 100755
4160diff --git a/maps/namerater.blk b/maps/namerater.blk
4161old mode 100644
4162new mode 100755
4163diff --git a/maps/oakslab.blk b/maps/oakslab.blk
4164old mode 100644
4165new mode 100755
4166diff --git a/maps/pallettown.blk b/maps/pallettown.blk
4167old mode 100644
4168new mode 100755
4169diff --git a/maps/pewtercity.blk b/maps/pewtercity.blk
4170old mode 100644
4171new mode 100755
4172diff --git a/maps/pewtergym.blk b/maps/pewtergym.blk
4173old mode 100644
4174new mode 100755
4175diff --git a/maps/pewterhouse1.blk b/maps/pewterhouse1.blk
4176old mode 100644
4177new mode 100755
4178diff --git a/maps/pewterhouse2.blk b/maps/pewterhouse2.blk
4179old mode 100644
4180new mode 100755
4181diff --git a/maps/pewtermart.blk b/maps/pewtermart.blk
4182old mode 100644
4183new mode 100755
4184diff --git a/maps/pewterpokecenter.blk b/maps/pewterpokecenter.blk
4185old mode 100644
4186new mode 100755
4187diff --git a/maps/pokemontower1.blk b/maps/pokemontower1.blk
4188old mode 100644
4189new mode 100755
4190diff --git a/maps/pokemontower2.blk b/maps/pokemontower2.blk
4191old mode 100644
4192new mode 100755
4193diff --git a/maps/pokemontower3.blk b/maps/pokemontower3.blk
4194old mode 100644
4195new mode 100755
4196diff --git a/maps/pokemontower4.blk b/maps/pokemontower4.blk
4197old mode 100644
4198new mode 100755
4199diff --git a/maps/pokemontower5.blk b/maps/pokemontower5.blk
4200old mode 100644
4201new mode 100755
4202diff --git a/maps/pokemontower6.blk b/maps/pokemontower6.blk
4203old mode 100644
4204new mode 100755
4205diff --git a/maps/pokemontower7.blk b/maps/pokemontower7.blk
4206old mode 100644
4207new mode 100755
4208diff --git a/maps/powerplant.blk b/maps/powerplant.blk
4209old mode 100644
4210new mode 100755
4211diff --git a/maps/redshouse1f.blk b/maps/redshouse1f.blk
4212old mode 100644
4213new mode 100755
4214diff --git a/maps/redshouse2f.blk b/maps/redshouse2f.blk
4215old mode 100644
4216new mode 100755
4217diff --git a/maps/rockethideout1.blk b/maps/rockethideout1.blk
4218old mode 100644
4219new mode 100755
4220diff --git a/maps/rockethideout2.blk b/maps/rockethideout2.blk
4221old mode 100644
4222new mode 100755
4223diff --git a/maps/rockethideout3.blk b/maps/rockethideout3.blk
4224old mode 100644
4225new mode 100755
4226diff --git a/maps/rockethideout4.blk b/maps/rockethideout4.blk
4227old mode 100644
4228new mode 100755
4229diff --git a/maps/rockethideoutelevator.blk b/maps/rockethideoutelevator.blk
4230old mode 100644
4231new mode 100755
4232diff --git a/maps/rocktunnel1.blk b/maps/rocktunnel1.blk
4233old mode 100644
4234new mode 100755
4235diff --git a/maps/rocktunnel2.blk b/maps/rocktunnel2.blk
4236old mode 100644
4237new mode 100755
4238diff --git a/maps/rocktunnelpokecenter.blk b/maps/rocktunnelpokecenter.blk
4239old mode 100644
4240new mode 100755
4241diff --git a/maps/route1.blk b/maps/route1.blk
4242old mode 100644
4243new mode 100755
4244diff --git a/maps/route10.blk b/maps/route10.blk
4245old mode 100644
4246new mode 100755
4247diff --git a/maps/route11.blk b/maps/route11.blk
4248old mode 100644
4249new mode 100755
4250diff --git a/maps/route11gate.blk b/maps/route11gate.blk
4251old mode 100644
4252new mode 100755
4253diff --git a/maps/route11gateupstairs.blk b/maps/route11gateupstairs.blk
4254old mode 100644
4255new mode 100755
4256diff --git a/maps/route12.blk b/maps/route12.blk
4257old mode 100644
4258new mode 100755
4259index d79f59e3..a470fe87
4260Binary files a/maps/route12.blk and b/maps/route12.blk differ
4261diff --git a/maps/route12gate.blk b/maps/route12gate.blk
4262old mode 100644
4263new mode 100755
4264diff --git a/maps/route12gateupstairs.blk b/maps/route12gateupstairs.blk
4265old mode 100644
4266new mode 100755
4267diff --git a/maps/route12house.blk b/maps/route12house.blk
4268old mode 100644
4269new mode 100755
4270diff --git a/maps/route13.blk b/maps/route13.blk
4271old mode 100644
4272new mode 100755
4273diff --git a/maps/route14.blk b/maps/route14.blk
4274old mode 100644
4275new mode 100755
4276diff --git a/maps/route15.blk b/maps/route15.blk
4277old mode 100644
4278new mode 100755
4279diff --git a/maps/route15gate.blk b/maps/route15gate.blk
4280old mode 100644
4281new mode 100755
4282diff --git a/maps/route16.blk b/maps/route16.blk
4283old mode 100644
4284new mode 100755
4285diff --git a/maps/route16gate.blk b/maps/route16gate.blk
4286old mode 100644
4287new mode 100755
4288diff --git a/maps/route16gateupstairs.blk b/maps/route16gateupstairs.blk
4289old mode 100644
4290new mode 100755
4291diff --git a/maps/route16house.blk b/maps/route16house.blk
4292old mode 100644
4293new mode 100755
4294diff --git a/maps/route17.blk b/maps/route17.blk
4295old mode 100644
4296new mode 100755
4297diff --git a/maps/route18.blk b/maps/route18.blk
4298old mode 100644
4299new mode 100755
4300diff --git a/maps/route18gate.blk b/maps/route18gate.blk
4301old mode 100644
4302new mode 100755
4303diff --git a/maps/route18gateupstairs.blk b/maps/route18gateupstairs.blk
4304old mode 100644
4305new mode 100755
4306diff --git a/maps/route19-yellow.blk b/maps/route19-yellow.blk
4307old mode 100644
4308new mode 100755
4309diff --git a/maps/route19.blk b/maps/route19.blk
4310old mode 100644
4311new mode 100755
4312diff --git a/maps/route2.blk b/maps/route2.blk
4313old mode 100644
4314new mode 100755
4315diff --git a/maps/route20.blk b/maps/route20.blk
4316old mode 100644
4317new mode 100755
4318diff --git a/maps/route21.blk b/maps/route21.blk
4319old mode 100644
4320new mode 100755
4321diff --git a/maps/route22.blk b/maps/route22.blk
4322old mode 100644
4323new mode 100755
4324diff --git a/maps/route22gate.blk b/maps/route22gate.blk
4325diff --git a/maps/route22gate.blk b/maps/route22gate.blk
4326old mode 100644
4327new mode 100755
4328diff --git a/maps/route23.blk b/maps/route23.blk
4329old mode 100644
4330new mode 100755
4331diff --git a/maps/route24.blk b/maps/route24.blk
4332old mode 100644
4333new mode 100755
4334diff --git a/maps/route25.blk b/maps/route25.blk
4335old mode 100644
4336new mode 100755
4337diff --git a/maps/route2gate.blk b/maps/route2gate.blk
4338old mode 100644
4339new mode 100755
4340diff --git a/maps/route2house.blk b/maps/route2house.blk
4341old mode 100644
4342new mode 100755
4343diff --git a/maps/route3.blk b/maps/route3.blk
4344old mode 100644
4345new mode 100755
4346diff --git a/maps/route4.blk b/maps/route4.blk
4347old mode 100644
4348new mode 100755
4349diff --git a/maps/route5.blk b/maps/route5.blk
4350old mode 100644
4351new mode 100755
4352diff --git a/maps/route5gate.blk b/maps/route5gate.blk
4353old mode 100644
4354new mode 100755
4355diff --git a/maps/route6.blk b/maps/route6.blk
4356old mode 100644
4357new mode 100755
4358diff --git a/maps/route6gate.blk b/maps/route6gate.blk
4359old mode 100644
4360new mode 100755
4361diff --git a/maps/route7.blk b/maps/route7.blk
4362old mode 100644
4363new mode 100755
4364diff --git a/maps/route7gate.blk b/maps/route7gate.blk
4365old mode 100644
4366new mode 100755
4367diff --git a/maps/route8.blk b/maps/route8.blk
4368old mode 100644
4369new mode 100755
4370diff --git a/maps/route8gate.blk b/maps/route8gate.blk
4371old mode 100644
4372new mode 100755
4373diff --git a/maps/route9.blk b/maps/route9.blk
4374old mode 100644
4375new mode 100755
4376diff --git a/maps/safarizonecenter.blk b/maps/safarizonecenter.blk
4377old mode 100644
4378new mode 100755
4379diff --git a/maps/safarizoneeast.blk b/maps/safarizoneeast.blk
4380old mode 100644
4381new mode 100755
4382diff --git a/maps/safarizoneentrance.blk b/maps/safarizoneentrance.blk
4383old mode 100644
4384new mode 100755
4385diff --git a/maps/safarizonenorth.blk b/maps/safarizonenorth.blk
4386old mode 100644
4387new mode 100755
4388diff --git a/maps/safarizoneresthouse1.blk b/maps/safarizoneresthouse1.blk
4389old mode 100644
4390new mode 100755
4391diff --git a/maps/safarizoneresthouse2.blk b/maps/safarizoneresthouse2.blk
4392old mode 100644
4393new mode 100755
4394diff --git a/maps/safarizoneresthouse3.blk b/maps/safarizoneresthouse3.blk
4395old mode 100644
4396new mode 100755
4397diff --git a/maps/safarizoneresthouse4.blk b/maps/safarizoneresthouse4.blk
4398old mode 100644
4399new mode 100755
4400diff --git a/maps/safarizonesecrethouse.blk b/maps/safarizonesecrethouse.blk
4401old mode 100644
4402new mode 100755
4403diff --git a/maps/safarizonewest.blk b/maps/safarizonewest.blk
4404old mode 100644
4405new mode 100755
4406diff --git a/maps/saffroncity.blk b/maps/saffroncity.blk
4407old mode 100644
4408new mode 100755
4409diff --git a/maps/saffrongym.blk b/maps/saffrongym.blk
4410old mode 100644
4411new mode 100755
4412diff --git a/maps/saffronhouse1.blk b/maps/saffronhouse1.blk
4413old mode 100644
4414new mode 100755
4415diff --git a/maps/saffronhouse2.blk b/maps/saffronhouse2.blk
4416old mode 100644
4417new mode 100755
4418diff --git a/maps/saffronmart.blk b/maps/saffronmart.blk
4419old mode 100644
4420new mode 100755
4421diff --git a/maps/saffronpokecenter.blk b/maps/saffronpokecenter.blk
4422old mode 100644
4423new mode 100755
4424diff --git a/maps/school.blk b/maps/school.blk
4425old mode 100644
4426new mode 100755
4427diff --git a/maps/seafoamislands1.blk b/maps/seafoamislands1.blk
4428old mode 100644
4429new mode 100755
4430diff --git a/maps/seafoamislands2.blk b/maps/seafoamislands2.blk
4431old mode 100644
4432new mode 100755
4433diff --git a/maps/seafoamislands3.blk b/maps/seafoamislands3.blk
4434old mode 100644
4435new mode 100755
4436diff --git a/maps/seafoamislands4.blk b/maps/seafoamislands4.blk
4437old mode 100644
4438new mode 100755
4439diff --git a/maps/seafoamislands5.blk b/maps/seafoamislands5.blk
4440old mode 100644
4441new mode 100755
4442diff --git a/maps/silphco1.blk b/maps/silphco1.blk
4443old mode 100644
4444new mode 100755
4445diff --git a/maps/silphco10.blk b/maps/silphco10.blk
4446old mode 100644
4447new mode 100755
4448diff --git a/maps/silphco11.blk b/maps/silphco11.blk
4449old mode 100644
4450new mode 100755
4451diff --git a/maps/silphco2.blk b/maps/silphco2.blk
4452old mode 100644
4453new mode 100755
4454diff --git a/maps/silphco3.blk b/maps/silphco3.blk
4455old mode 100644
4456new mode 100755
4457diff --git a/maps/silphco4.blk b/maps/silphco4.blk
4458old mode 100644
4459new mode 100755
4460diff --git a/maps/silphco5.blk b/maps/silphco5.blk
4461old mode 100644
4462new mode 100755
4463diff --git a/maps/silphco6.blk b/maps/silphco6.blk
4464old mode 100644
4465new mode 100755
4466diff --git a/maps/silphco7.blk b/maps/silphco7.blk
4467old mode 100644
4468new mode 100755
4469diff --git a/maps/silphco8.blk b/maps/silphco8.blk
4470old mode 100644
4471new mode 100755
4472diff --git a/maps/silphco9.blk b/maps/silphco9.blk
4473old mode 100644
4474new mode 100755
4475diff --git a/maps/silphcoelevator.blk b/maps/silphcoelevator.blk
4476old mode 100644
4477new mode 100755
4478diff --git a/maps/ssanne1.blk b/maps/ssanne1.blk
4479old mode 100644
4480new mode 100755
4481diff --git a/maps/ssanne10.blk b/maps/ssanne10.blk
4482old mode 100644
4483new mode 100755
4484diff --git a/maps/ssanne2.blk b/maps/ssanne2.blk
4485old mode 100644
4486new mode 100755
4487diff --git a/maps/ssanne3.blk b/maps/ssanne3.blk
4488old mode 100644
4489new mode 100755
4490diff --git a/maps/ssanne4.blk b/maps/ssanne4.blk
4491old mode 100644
4492new mode 100755
4493diff --git a/maps/ssanne5.blk b/maps/ssanne5.blk
4494old mode 100644
4495new mode 100755
4496diff --git a/maps/ssanne6.blk b/maps/ssanne6.blk
4497old mode 100644
4498new mode 100755
4499diff --git a/maps/ssanne7.blk b/maps/ssanne7.blk
4500old mode 100644
4501new mode 100755
4502diff --git a/maps/ssanne8.blk b/maps/ssanne8.blk
4503old mode 100644
4504new mode 100755
4505diff --git a/maps/ssanne9.blk b/maps/ssanne9.blk
4506old mode 100644
4507new mode 100755
4508diff --git a/maps/tradecenter.blk b/maps/tradecenter.blk
4509old mode 100644
4510new mode 100755
4511diff --git a/maps/undergroundpathentranceroute5.blk b/maps/undergroundpathentranceroute5.blk
4512old mode 100644
4513new mode 100755
4514diff --git a/maps/undergroundpathentranceroute6.blk b/maps/undergroundpathentranceroute6.blk
4515old mode 100644
4516new mode 100755
4517diff --git a/maps/undergroundpathentranceroute7.blk b/maps/undergroundpathentranceroute7.blk
4518old mode 100644
4519new mode 100755
4520diff --git a/maps/undergroundpathentranceroute8.blk b/maps/undergroundpathentranceroute8.blk
4521old mode 100644
4522new mode 100755
4523diff --git a/maps/undergroundpathns.blk b/maps/undergroundpathns.blk
4524old mode 100644
4525new mode 100755
4526diff --git a/maps/undergroundpathwe.blk b/maps/undergroundpathwe.blk
4527old mode 100644
4528new mode 100755
4529diff --git a/maps/unknowndungeon1.blk b/maps/unknowndungeon1.blk
4530old mode 100644
4531new mode 100755
4532diff --git a/maps/unknowndungeon2.blk b/maps/unknowndungeon2.blk
4533old mode 100644
4534new mode 100755
4535diff --git a/maps/unknowndungeon3.blk b/maps/unknowndungeon3.blk
4536old mode 100644
4537new mode 100755
4538diff --git a/maps/unusedblocks58d7d.blk b/maps/unusedblocks58d7d.blk
4539deleted file mode 100755
4540index dd54efd9..00000000
4541Binary files a/maps/unusedblocks58d7d.blk and /dev/null differ
4542diff --git a/maps/unusedblocks60258.blk b/maps/unusedblocks60258.blk
4543deleted file mode 100755
4544index ff81fc7d..00000000
4545Binary files a/maps/unusedblocks60258.blk and /dev/null differ
4546diff --git a/maps/unusedblocks60cef.blk b/maps/unusedblocks60cef.blk
4547deleted file mode 100755
4548index 21808bb7..00000000
4549Binary files a/maps/unusedblocks60cef.blk and /dev/null differ
4550diff --git a/maps/vermilioncity.blk b/maps/vermilioncity.blk
4551old mode 100644
4552new mode 100755
4553diff --git a/maps/vermiliondock.blk b/maps/vermiliondock.blk
4554old mode 100644
4555new mode 100755
4556diff --git a/maps/vermiliongym.blk b/maps/vermiliongym.blk
4557old mode 100644
4558new mode 100755
4559diff --git a/maps/vermilionhouse1.blk b/maps/vermilionhouse1.blk
4560old mode 100644
4561new mode 100755
4562diff --git a/maps/vermilionhouse2.blk b/maps/vermilionhouse2.blk
4563old mode 100644
4564new mode 100755
4565diff --git a/maps/vermilionhouse3.blk b/maps/vermilionhouse3.blk
4566old mode 100644
4567new mode 100755
4568diff --git a/maps/vermilionmart.blk b/maps/vermilionmart.blk
4569old mode 100644
4570new mode 100755
4571diff --git a/maps/vermilionpokecenter.blk b/maps/vermilionpokecenter.blk
4572old mode 100644
4573new mode 100755
4574diff --git a/maps/victoryroad1.blk b/maps/victoryroad1.blk
4575old mode 100644
4576new mode 100755
4577diff --git a/maps/victoryroad2.blk b/maps/victoryroad2.blk
4578old mode 100644
4579new mode 100755
4580diff --git a/maps/victoryroad3.blk b/maps/victoryroad3.blk
4581old mode 100644
4582new mode 100755
4583diff --git a/maps/viridiancity.blk b/maps/viridiancity.blk
4584old mode 100644
4585new mode 100755
4586diff --git a/maps/viridianforest.blk b/maps/viridianforest.blk
4587old mode 100644
4588new mode 100755
4589diff --git a/maps/viridianforestentrance.blk b/maps/viridianforestentrance.blk
4590old mode 100644
4591new mode 100755
4592diff --git a/maps/viridianforestexit.blk b/maps/viridianforestexit.blk
4593old mode 100644
4594new mode 100755
4595diff --git a/maps/viridiangym.blk b/maps/viridiangym.blk
4596old mode 100644
4597new mode 100755
4598diff --git a/maps/viridianhouse.blk b/maps/viridianhouse.blk
4599old mode 100644
4600new mode 100755
4601diff --git a/maps/viridianmart.blk b/maps/viridianmart.blk
4602old mode 100644
4603new mode 100755
4604diff --git a/maps/viridianpokecenter.blk b/maps/viridianpokecenter.blk
4605old mode 100644
4606new mode 100755
4607diff --git a/pic/monback/abrab.png b/pic/monback/abrab.png
4608old mode 100644
4609new mode 100755
4610diff --git a/pic/monback/aerodactylb.png b/pic/monback/aerodactylb.png
4611old mode 100644
4612new mode 100755
4613diff --git a/pic/monback/alakazamb.png b/pic/monback/alakazamb.png
4614old mode 100644
4615new mode 100755
4616diff --git a/pic/monback/arbokb.png b/pic/monback/arbokb.png
4617old mode 100644
4618new mode 100755
4619diff --git a/pic/monback/arcanineb.png b/pic/monback/arcanineb.png
4620old mode 100644
4621new mode 100755
4622diff --git a/pic/monback/articunob.png b/pic/monback/articunob.png
4623old mode 100644
4624new mode 100755
4625diff --git a/pic/monback/beedrillb.png b/pic/monback/beedrillb.png
4626old mode 100644
4627new mode 100755
4628diff --git a/pic/monback/bellsproutb.png b/pic/monback/bellsproutb.png
4629old mode 100644
4630new mode 100755
4631diff --git a/pic/monback/blastoiseb.png b/pic/monback/blastoiseb.png
4632old mode 100644
4633new mode 100755
4634diff --git a/pic/monback/bulbasaurb.png b/pic/monback/bulbasaurb.png
4635old mode 100644
4636new mode 100755
4637diff --git a/pic/monback/butterfreeb.png b/pic/monback/butterfreeb.png
4638old mode 100644
4639new mode 100755
4640diff --git a/pic/monback/caterpieb.png b/pic/monback/caterpieb.png
4641old mode 100644
4642new mode 100755
4643diff --git a/pic/monback/chanseyb.png b/pic/monback/chanseyb.png
4644old mode 100644
4645new mode 100755
4646diff --git a/pic/monback/charizardb.png b/pic/monback/charizardb.png
4647old mode 100644
4648new mode 100755
4649diff --git a/pic/monback/charmanderb.png b/pic/monback/charmanderb.png
4650old mode 100644
4651new mode 100755
4652diff --git a/pic/monback/charmeleonb.png b/pic/monback/charmeleonb.png
4653old mode 100644
4654new mode 100755
4655diff --git a/pic/monback/clefableb.png b/pic/monback/clefableb.png
4656old mode 100644
4657new mode 100755
4658diff --git a/pic/monback/clefairyb.png b/pic/monback/clefairyb.png
4659old mode 100644
4660new mode 100755
4661diff --git a/pic/monback/cloysterb.png b/pic/monback/cloysterb.png
4662old mode 100644
4663new mode 100755
4664diff --git a/pic/monback/cuboneb.png b/pic/monback/cuboneb.png
4665old mode 100644
4666new mode 100755
4667diff --git a/pic/monback/dewgongb.png b/pic/monback/dewgongb.png
4668old mode 100644
4669new mode 100755
4670diff --git a/pic/monback/diglettb.png b/pic/monback/diglettb.png
4671old mode 100644
4672new mode 100755
4673diff --git a/pic/monback/dittob.png b/pic/monback/dittob.png
4674old mode 100644
4675new mode 100755
4676diff --git a/pic/monback/dodriob.png b/pic/monback/dodriob.png
4677old mode 100644
4678new mode 100755
4679diff --git a/pic/monback/doduob.png b/pic/monback/doduob.png
4680old mode 100644
4681new mode 100755
4682diff --git a/pic/monback/dragonairb.png b/pic/monback/dragonairb.png
4683old mode 100644
4684new mode 100755
4685diff --git a/pic/monback/dragoniteb.png b/pic/monback/dragoniteb.png
4686old mode 100644
4687new mode 100755
4688diff --git a/pic/monback/dratinib.png b/pic/monback/dratinib.png
4689old mode 100644
4690new mode 100755
4691diff --git a/pic/monback/drowzeeb.png b/pic/monback/drowzeeb.png
4692old mode 100644
4693new mode 100755
4694diff --git a/pic/monback/dugtriob.png b/pic/monback/dugtriob.png
4695old mode 100644
4696new mode 100755
4697diff --git a/pic/monback/eeveeb.png b/pic/monback/eeveeb.png
4698old mode 100644
4699new mode 100755
4700diff --git a/pic/monback/ekansb.png b/pic/monback/ekansb.png
4701old mode 100644
4702new mode 100755
4703diff --git a/pic/monback/electabuzzb.png b/pic/monback/electabuzzb.png
4704old mode 100644
4705new mode 100755
4706diff --git a/pic/monback/electrodeb.png b/pic/monback/electrodeb.png
4707old mode 100644
4708new mode 100755
4709diff --git a/pic/monback/exeggcuteb.png b/pic/monback/exeggcuteb.png
4710old mode 100644
4711new mode 100755
4712diff --git a/pic/monback/exeggutorb.png b/pic/monback/exeggutorb.png
4713old mode 100644
4714new mode 100755
4715diff --git a/pic/monback/farfetchdb.png b/pic/monback/farfetchdb.png
4716old mode 100644
4717new mode 100755
4718diff --git a/pic/monback/fearowb.png b/pic/monback/fearowb.png
4719old mode 100644
4720new mode 100755
4721diff --git a/pic/monback/flareonb.png b/pic/monback/flareonb.png
4722old mode 100644
4723new mode 100755
4724diff --git a/pic/monback/gastlyb.png b/pic/monback/gastlyb.png
4725old mode 100644
4726new mode 100755
4727diff --git a/pic/monback/gengarb.png b/pic/monback/gengarb.png
4728old mode 100644
4729new mode 100755
4730diff --git a/pic/monback/geodudeb.png b/pic/monback/geodudeb.png
4731old mode 100644
4732new mode 100755
4733diff --git a/pic/monback/gloomb.png b/pic/monback/gloomb.png
4734old mode 100644
4735new mode 100755
4736diff --git a/pic/monback/golbatb.png b/pic/monback/golbatb.png
4737old mode 100644
4738new mode 100755
4739diff --git a/pic/monback/goldeenb.png b/pic/monback/goldeenb.png
4740old mode 100644
4741new mode 100755
4742diff --git a/pic/monback/golduckb.png b/pic/monback/golduckb.png
4743old mode 100644
4744new mode 100755
4745diff --git a/pic/monback/golemb.png b/pic/monback/golemb.png
4746old mode 100644
4747new mode 100755
4748diff --git a/pic/monback/gravelerb.png b/pic/monback/gravelerb.png
4749old mode 100644
4750new mode 100755
4751diff --git a/pic/monback/grimerb.png b/pic/monback/grimerb.png
4752old mode 100644
4753new mode 100755
4754diff --git a/pic/monback/growlitheb.png b/pic/monback/growlitheb.png
4755old mode 100644
4756new mode 100755
4757diff --git a/pic/monback/gyaradosb.png b/pic/monback/gyaradosb.png
4758old mode 100644
4759new mode 100755
4760diff --git a/pic/monback/haunterb.png b/pic/monback/haunterb.png
4761old mode 100644
4762new mode 100755
4763diff --git a/pic/monback/hitmonchanb.png b/pic/monback/hitmonchanb.png
4764old mode 100644
4765new mode 100755
4766diff --git a/pic/monback/hitmonleeb.png b/pic/monback/hitmonleeb.png
4767old mode 100644
4768new mode 100755
4769diff --git a/pic/monback/horseab.png b/pic/monback/horseab.png
4770old mode 100644
4771new mode 100755
4772diff --git a/pic/monback/hypnob.png b/pic/monback/hypnob.png
4773old mode 100644
4774new mode 100755
4775diff --git a/pic/monback/ivysaurb.png b/pic/monback/ivysaurb.png
4776old mode 100644
4777new mode 100755
4778diff --git a/pic/monback/jigglypuffb.png b/pic/monback/jigglypuffb.png
4779old mode 100644
4780new mode 100755
4781diff --git a/pic/monback/jolteonb.png b/pic/monback/jolteonb.png
4782old mode 100644
4783new mode 100755
4784diff --git a/pic/monback/jynxb.png b/pic/monback/jynxb.png
4785old mode 100644
4786new mode 100755
4787diff --git a/pic/monback/kabutob.png b/pic/monback/kabutob.png
4788old mode 100644
4789new mode 100755
4790diff --git a/pic/monback/kabutopsb.png b/pic/monback/kabutopsb.png
4791old mode 100644
4792new mode 100755
4793diff --git a/pic/monback/kadabrab.png b/pic/monback/kadabrab.png
4794old mode 100644
4795new mode 100755
4796diff --git a/pic/monback/kakunab.png b/pic/monback/kakunab.png
4797old mode 100644
4798new mode 100755
4799diff --git a/pic/monback/kangaskhanb.png b/pic/monback/kangaskhanb.png
4800old mode 100644
4801new mode 100755
4802diff --git a/pic/monback/kinglerb.png b/pic/monback/kinglerb.png
4803old mode 100644
4804new mode 100755
4805diff --git a/pic/monback/koffingb.png b/pic/monback/koffingb.png
4806old mode 100644
4807new mode 100755
4808diff --git a/pic/monback/krabbyb.png b/pic/monback/krabbyb.png
4809old mode 100644
4810new mode 100755
4811diff --git a/pic/monback/laprasb.png b/pic/monback/laprasb.png
4812old mode 100644
4813new mode 100755
4814diff --git a/pic/monback/lickitungb.png b/pic/monback/lickitungb.png
4815old mode 100644
4816new mode 100755
4817diff --git a/pic/monback/machampb.png b/pic/monback/machampb.png
4818old mode 100644
4819new mode 100755
4820diff --git a/pic/monback/machokeb.png b/pic/monback/machokeb.png
4821old mode 100644
4822new mode 100755
4823diff --git a/pic/monback/machopb.png b/pic/monback/machopb.png
4824old mode 100644
4825new mode 100755
4826diff --git a/pic/monback/magikarpb.png b/pic/monback/magikarpb.png
4827old mode 100644
4828new mode 100755
4829diff --git a/pic/monback/magmarb.png b/pic/monback/magmarb.png
4830old mode 100644
4831new mode 100755
4832diff --git a/pic/monback/magnemiteb.png b/pic/monback/magnemiteb.png
4833old mode 100644
4834new mode 100755
4835diff --git a/pic/monback/magnetonb.png b/pic/monback/magnetonb.png
4836old mode 100644
4837new mode 100755
4838diff --git a/pic/monback/mankeyb.png b/pic/monback/mankeyb.png
4839old mode 100644
4840new mode 100755
4841diff --git a/pic/monback/marowakb.png b/pic/monback/marowakb.png
4842old mode 100644
4843new mode 100755
4844diff --git a/pic/monback/meowthb.png b/pic/monback/meowthb.png
4845old mode 100644
4846new mode 100755
4847diff --git a/pic/monback/metapodb.png b/pic/monback/metapodb.png
4848old mode 100644
4849new mode 100755
4850diff --git a/pic/monback/mewb.png b/pic/monback/mewb.png
4851old mode 100644
4852new mode 100755
4853diff --git a/pic/monback/mewtwob.png b/pic/monback/mewtwob.png
4854old mode 100644
4855new mode 100755
4856diff --git a/pic/monback/moltresb.png b/pic/monback/moltresb.png
4857old mode 100644
4858new mode 100755
4859diff --git a/pic/monback/mr.mimeb.png b/pic/monback/mr.mimeb.png
4860old mode 100644
4861new mode 100755
4862diff --git a/pic/monback/mukb.png b/pic/monback/mukb.png
4863old mode 100644
4864new mode 100755
4865diff --git a/pic/monback/nidokingb.png b/pic/monback/nidokingb.png
4866old mode 100644
4867new mode 100755
4868diff --git a/pic/monback/nidoqueenb.png b/pic/monback/nidoqueenb.png
4869old mode 100644
4870new mode 100755
4871diff --git a/pic/monback/nidoranfb.png b/pic/monback/nidoranfb.png
4872old mode 100644
4873new mode 100755
4874diff --git a/pic/monback/nidoranmb.png b/pic/monback/nidoranmb.png
4875old mode 100644
4876new mode 100755
4877diff --git a/pic/monback/nidorinab.png b/pic/monback/nidorinab.png
4878old mode 100644
4879new mode 100755
4880diff --git a/pic/monback/nidorinob.png b/pic/monback/nidorinob.png
4881old mode 100644
4882new mode 100755
4883diff --git a/pic/monback/ninetalesb.png b/pic/monback/ninetalesb.png
4884old mode 100644
4885new mode 100755
4886diff --git a/pic/monback/oddishb.png b/pic/monback/oddishb.png
4887old mode 100644
4888new mode 100755
4889diff --git a/pic/monback/omanyteb.png b/pic/monback/omanyteb.png
4890old mode 100644
4891new mode 100755
4892diff --git a/pic/monback/omastarb.png b/pic/monback/omastarb.png
4893old mode 100644
4894new mode 100755
4895diff --git a/pic/monback/onixb.png b/pic/monback/onixb.png
4896old mode 100644
4897new mode 100755
4898diff --git a/pic/monback/parasb.png b/pic/monback/parasb.png
4899old mode 100644
4900new mode 100755
4901diff --git a/pic/monback/parasectb.png b/pic/monback/parasectb.png
4902old mode 100644
4903new mode 100755
4904diff --git a/pic/monback/persianb.png b/pic/monback/persianb.png
4905old mode 100644
4906new mode 100755
4907diff --git a/pic/monback/pidgeotb.png b/pic/monback/pidgeotb.png
4908old mode 100644
4909new mode 100755
4910diff --git a/pic/monback/pidgeottob.png b/pic/monback/pidgeottob.png
4911old mode 100644
4912new mode 100755
4913diff --git a/pic/monback/pidgeyb.png b/pic/monback/pidgeyb.png
4914old mode 100644
4915new mode 100755
4916diff --git a/pic/monback/pikachub.png b/pic/monback/pikachub.png
4917old mode 100644
4918new mode 100755
4919diff --git a/pic/monback/pinsirb.png b/pic/monback/pinsirb.png
4920old mode 100644
4921new mode 100755
4922diff --git a/pic/monback/poliwagb.png b/pic/monback/poliwagb.png
4923old mode 100644
4924new mode 100755
4925diff --git a/pic/monback/poliwhirlb.png b/pic/monback/poliwhirlb.png
4926old mode 100644
4927new mode 100755
4928diff --git a/pic/monback/poliwrathb.png b/pic/monback/poliwrathb.png
4929old mode 100644
4930new mode 100755
4931diff --git a/pic/monback/ponytab.png b/pic/monback/ponytab.png
4932old mode 100644
4933new mode 100755
4934diff --git a/pic/monback/porygonb.png b/pic/monback/porygonb.png
4935old mode 100644
4936new mode 100755
4937diff --git a/pic/monback/primeapeb.png b/pic/monback/primeapeb.png
4938old mode 100644
4939new mode 100755
4940diff --git a/pic/monback/psyduckb.png b/pic/monback/psyduckb.png
4941old mode 100644
4942new mode 100755
4943diff --git a/pic/monback/raichub.png b/pic/monback/raichub.png
4944old mode 100644
4945new mode 100755
4946diff --git a/pic/monback/rapidashb.png b/pic/monback/rapidashb.png
4947old mode 100644
4948new mode 100755
4949diff --git a/pic/monback/raticateb.png b/pic/monback/raticateb.png
4950old mode 100644
4951new mode 100755
4952diff --git a/pic/monback/rattatab.png b/pic/monback/rattatab.png
4953old mode 100644
4954new mode 100755
4955diff --git a/pic/monback/rhydonb.png b/pic/monback/rhydonb.png
4956deleted file mode 100644
4957index 12a20582..00000000
4958Binary files a/pic/monback/rhydonb.png and /dev/null differ
4959diff --git a/pic/monback/rhyhornb.png b/pic/monback/rhyhornb.png
4960old mode 100644
4961new mode 100755
4962diff --git a/pic/monback/sandshrewb.png b/pic/monback/sandshrewb.png
4963old mode 100644
4964new mode 100755
4965diff --git a/pic/monback/sandslashb.png b/pic/monback/sandslashb.png
4966old mode 100644
4967new mode 100755
4968diff --git a/pic/monback/scytherb.png b/pic/monback/scytherb.png
4969old mode 100644
4970new mode 100755
4971diff --git a/pic/monback/seadrab.png b/pic/monback/seadrab.png
4972old mode 100644
4973new mode 100755
4974diff --git a/pic/monback/seakingb.png b/pic/monback/seakingb.png
4975old mode 100644
4976new mode 100755
4977diff --git a/pic/monback/seelb.png b/pic/monback/seelb.png
4978old mode 100644
4979new mode 100755
4980diff --git a/pic/monback/shellderb.png b/pic/monback/shellderb.png
4981old mode 100644
4982new mode 100755
4983diff --git a/pic/monback/slowbrob.png b/pic/monback/slowbrob.png
4984old mode 100644
4985new mode 100755
4986diff --git a/pic/monback/slowpokeb.png b/pic/monback/slowpokeb.png
4987old mode 100644
4988new mode 100755
4989diff --git a/pic/monback/snorlaxb.png b/pic/monback/snorlaxb.png
4990old mode 100644
4991new mode 100755
4992diff --git a/pic/monback/spearowb.png b/pic/monback/spearowb.png
4993old mode 100644
4994new mode 100755
4995diff --git a/pic/monback/squirtleb.png b/pic/monback/squirtleb.png
4996old mode 100644
4997new mode 100755
4998diff --git a/pic/monback/starmieb.png b/pic/monback/starmieb.png
4999old mode 100644
5000new mode 100755
5001diff --git a/pic/monback/staryub.png b/pic/monback/staryub.png
5002old mode 100644
5003new mode 100755
5004diff --git a/pic/monback/tangelab.png b/pic/monback/tangelab.png
5005old mode 100644
5006new mode 100755
5007diff --git a/pic/monback/taurosb.png b/pic/monback/taurosb.png
5008old mode 100644
5009new mode 100755
5010diff --git a/pic/monback/tentacoolb.png b/pic/monback/tentacoolb.png
5011old mode 100644
5012new mode 100755
5013diff --git a/pic/monback/tentacruelb.png b/pic/monback/tentacruelb.png
5014old mode 100644
5015new mode 100755
5016diff --git a/pic/monback/vaporeonb.png b/pic/monback/vaporeonb.png
5017old mode 100644
5018new mode 100755
5019diff --git a/pic/monback/venomothb.png b/pic/monback/venomothb.png
5020old mode 100644
5021new mode 100755
5022diff --git a/pic/monback/venonatb.png b/pic/monback/venonatb.png
5023old mode 100644
5024new mode 100755
5025diff --git a/pic/monback/venusaurb.png b/pic/monback/venusaurb.png
5026old mode 100644
5027new mode 100755
5028diff --git a/pic/monback/victreebelb.png b/pic/monback/victreebelb.png
5029old mode 100644
5030new mode 100755
5031diff --git a/pic/monback/vileplumeb.png b/pic/monback/vileplumeb.png
5032old mode 100644
5033new mode 100755
5034diff --git a/pic/monback/voltorbb.png b/pic/monback/voltorbb.png
5035old mode 100644
5036new mode 100755
5037diff --git a/pic/monback/vulpixb.png b/pic/monback/vulpixb.png
5038old mode 100644
5039new mode 100755
5040diff --git a/pic/monback/wartortleb.png b/pic/monback/wartortleb.png
5041old mode 100644
5042new mode 100755
5043diff --git a/pic/monback/weedleb.png b/pic/monback/weedleb.png
5044old mode 100644
5045new mode 100755
5046diff --git a/pic/monback/weepinbellb.png b/pic/monback/weepinbellb.png
5047old mode 100644
5048new mode 100755
5049diff --git a/pic/monback/weezingb.png b/pic/monback/weezingb.png
5050old mode 100644
5051new mode 100755
5052diff --git a/pic/monback/wigglytuffb.png b/pic/monback/wigglytuffb.png
5053old mode 100644
5054new mode 100755
5055diff --git a/pic/monback/zapdosb.png b/pic/monback/zapdosb.png
5056old mode 100644
5057new mode 100755
5058diff --git a/pic/monback/zubatb.png b/pic/monback/zubatb.png
5059old mode 100644
5060new mode 100755
5061diff --git a/pic/other/ghost.png b/pic/other/ghost.png
5062old mode 100644
5063new mode 100755
5064diff --git a/pic/rgmon/abra.png b/pic/rgmon/abra.png
5065old mode 100644
5066new mode 100755
5067diff --git a/pic/rgmon/aerodactyl.png b/pic/rgmon/aerodactyl.png
5068old mode 100644
5069new mode 100755
5070diff --git a/pic/rgmon/alakazam.png b/pic/rgmon/alakazam.png
5071old mode 100644
5072new mode 100755
5073diff --git a/pic/rgmon/arbok.png b/pic/rgmon/arbok.png
5074old mode 100644
5075new mode 100755
5076diff --git a/pic/rgmon/arcanine.png b/pic/rgmon/arcanine.png
5077old mode 100644
5078new mode 100755
5079diff --git a/pic/rgmon/articuno.png b/pic/rgmon/articuno.png
5080old mode 100644
5081new mode 100755
5082diff --git a/pic/rgmon/beedrill.png b/pic/rgmon/beedrill.png
5083old mode 100644
5084new mode 100755
5085diff --git a/pic/rgmon/bellsprout.png b/pic/rgmon/bellsprout.png
5086old mode 100644
5087new mode 100755
5088diff --git a/pic/rgmon/blastoise.png b/pic/rgmon/blastoise.png
5089old mode 100644
5090new mode 100755
5091diff --git a/pic/rgmon/bulbasaur.png b/pic/rgmon/bulbasaur.png
5092old mode 100644
5093new mode 100755
5094diff --git a/pic/rgmon/butterfree.png b/pic/rgmon/butterfree.png
5095old mode 100644
5096new mode 100755
5097diff --git a/pic/rgmon/caterpie.png b/pic/rgmon/caterpie.png
5098old mode 100644
5099new mode 100755
5100diff --git a/pic/rgmon/chansey.png b/pic/rgmon/chansey.png
5101old mode 100644
5102new mode 100755
5103diff --git a/pic/rgmon/charizard.png b/pic/rgmon/charizard.png
5104old mode 100644
5105new mode 100755
5106diff --git a/pic/rgmon/charmander.png b/pic/rgmon/charmander.png
5107old mode 100644
5108new mode 100755
5109diff --git a/pic/rgmon/charmeleon.png b/pic/rgmon/charmeleon.png
5110old mode 100644
5111new mode 100755
5112diff --git a/pic/rgmon/clefable.png b/pic/rgmon/clefable.png
5113old mode 100644
5114new mode 100755
5115diff --git a/pic/rgmon/clefairy.png b/pic/rgmon/clefairy.png
5116old mode 100644
5117new mode 100755
5118diff --git a/pic/rgmon/cloyster.png b/pic/rgmon/cloyster.png
5119old mode 100644
5120new mode 100755
5121diff --git a/pic/rgmon/cubone.png b/pic/rgmon/cubone.png
5122old mode 100644
5123new mode 100755
5124diff --git a/pic/rgmon/dewgong.png b/pic/rgmon/dewgong.png
5125old mode 100644
5126new mode 100755
5127diff --git a/pic/rgmon/diglett.png b/pic/rgmon/diglett.png
5128old mode 100644
5129new mode 100755
5130diff --git a/pic/rgmon/ditto.png b/pic/rgmon/ditto.png
5131old mode 100644
5132new mode 100755
5133diff --git a/pic/rgmon/dodrio.png b/pic/rgmon/dodrio.png
5134old mode 100644
5135new mode 100755
5136diff --git a/pic/rgmon/doduo.png b/pic/rgmon/doduo.png
5137old mode 100644
5138new mode 100755
5139diff --git a/pic/rgmon/dragonair.png b/pic/rgmon/dragonair.png
5140old mode 100644
5141new mode 100755
5142diff --git a/pic/rgmon/dragonite.png b/pic/rgmon/dragonite.png
5143old mode 100644
5144new mode 100755
5145diff --git a/pic/rgmon/dratini.png b/pic/rgmon/dratini.png
5146old mode 100644
5147new mode 100755
5148diff --git a/pic/rgmon/drowzee.png b/pic/rgmon/drowzee.png
5149old mode 100644
5150new mode 100755
5151diff --git a/pic/rgmon/dugtrio.png b/pic/rgmon/dugtrio.png
5152old mode 100644
5153new mode 100755
5154diff --git a/pic/rgmon/eevee.png b/pic/rgmon/eevee.png
5155old mode 100644
5156new mode 100755
5157diff --git a/pic/rgmon/ekans.png b/pic/rgmon/ekans.png
5158old mode 100644
5159new mode 100755
5160diff --git a/pic/rgmon/electabuzz.png b/pic/rgmon/electabuzz.png
5161old mode 100644
5162new mode 100755
5163diff --git a/pic/rgmon/electrode.png b/pic/rgmon/electrode.png
5164old mode 100644
5165new mode 100755
5166diff --git a/pic/rgmon/exeggcute.png b/pic/rgmon/exeggcute.png
5167old mode 100644
5168new mode 100755
5169diff --git a/pic/rgmon/exeggutor.png b/pic/rgmon/exeggutor.png
5170old mode 100644
5171new mode 100755
5172diff --git a/pic/rgmon/farfetchd.png b/pic/rgmon/farfetchd.png
5173old mode 100644
5174new mode 100755
5175diff --git a/pic/rgmon/fearow.png b/pic/rgmon/fearow.png
5176old mode 100644
5177new mode 100755
5178diff --git a/pic/rgmon/flareon.png b/pic/rgmon/flareon.png
5179old mode 100644
5180new mode 100755
5181diff --git a/pic/rgmon/fossilaerodactyl.png b/pic/rgmon/fossilaerodactyl.png
5182old mode 100644
5183new mode 100755
5184diff --git a/pic/rgmon/fossilkabutops.png b/pic/rgmon/fossilkabutops.png
5185old mode 100644
5186new mode 100755
5187diff --git a/pic/rgmon/gastly.png b/pic/rgmon/gastly.png
5188old mode 100644
5189new mode 100755
5190diff --git a/pic/rgmon/gengar.png b/pic/rgmon/gengar.png
5191old mode 100644
5192new mode 100755
5193diff --git a/pic/rgmon/geodude.png b/pic/rgmon/geodude.png
5194old mode 100644
5195new mode 100755
5196diff --git a/pic/rgmon/gloom.png b/pic/rgmon/gloom.png
5197old mode 100644
5198new mode 100755
5199diff --git a/pic/rgmon/golbat.png b/pic/rgmon/golbat.png
5200old mode 100644
5201new mode 100755
5202diff --git a/pic/rgmon/goldeen.png b/pic/rgmon/goldeen.png
5203old mode 100644
5204new mode 100755
5205diff --git a/pic/rgmon/golduck.png b/pic/rgmon/golduck.png
5206old mode 100644
5207new mode 100755
5208diff --git a/pic/rgmon/golem.png b/pic/rgmon/golem.png
5209old mode 100644
5210new mode 100755
5211diff --git a/pic/rgmon/graveler.png b/pic/rgmon/graveler.png
5212old mode 100644
5213new mode 100755
5214diff --git a/pic/rgmon/grimer.png b/pic/rgmon/grimer.png
5215old mode 100644
5216new mode 100755
5217diff --git a/pic/rgmon/growlithe.png b/pic/rgmon/growlithe.png
5218old mode 100644
5219new mode 100755
5220diff --git a/pic/rgmon/gyarados.png b/pic/rgmon/gyarados.png
5221old mode 100644
5222new mode 100755
5223diff --git a/pic/rgmon/haunter.png b/pic/rgmon/haunter.png
5224old mode 100644
5225new mode 100755
5226diff --git a/pic/rgmon/hitmonchan.png b/pic/rgmon/hitmonchan.png
5227old mode 100644
5228new mode 100755
5229diff --git a/pic/rgmon/hitmonlee.png b/pic/rgmon/hitmonlee.png
5230old mode 100644
5231new mode 100755
5232diff --git a/pic/rgmon/horsea.png b/pic/rgmon/horsea.png
5233old mode 100644
5234new mode 100755
5235diff --git a/pic/rgmon/hypno.png b/pic/rgmon/hypno.png
5236old mode 100644
5237new mode 100755
5238diff --git a/pic/rgmon/ivysaur.png b/pic/rgmon/ivysaur.png
5239old mode 100644
5240new mode 100755
5241diff --git a/pic/rgmon/jigglypuff.png b/pic/rgmon/jigglypuff.png
5242old mode 100644
5243new mode 100755
5244diff --git a/pic/rgmon/jolteon.png b/pic/rgmon/jolteon.png
5245old mode 100644
5246new mode 100755
5247diff --git a/pic/rgmon/jynx.png b/pic/rgmon/jynx.png
5248old mode 100644
5249new mode 100755
5250diff --git a/pic/rgmon/kabuto.png b/pic/rgmon/kabuto.png
5251old mode 100644
5252new mode 100755
5253diff --git a/pic/rgmon/kabutops.png b/pic/rgmon/kabutops.png
5254old mode 100644
5255new mode 100755
5256diff --git a/pic/rgmon/kadabra.png b/pic/rgmon/kadabra.png
5257old mode 100644
5258new mode 100755
5259diff --git a/pic/rgmon/kakuna.png b/pic/rgmon/kakuna.png
5260old mode 100644
5261new mode 100755
5262diff --git a/pic/rgmon/kangaskhan.png b/pic/rgmon/kangaskhan.png
5263old mode 100644
5264new mode 100755
5265diff --git a/pic/rgmon/kingler.png b/pic/rgmon/kingler.png
5266old mode 100644
5267new mode 100755
5268diff --git a/pic/rgmon/koffing.png b/pic/rgmon/koffing.png
5269old mode 100644
5270new mode 100755
5271diff --git a/pic/rgmon/krabby.png b/pic/rgmon/krabby.png
5272old mode 100644
5273new mode 100755
5274diff --git a/pic/rgmon/lapras.png b/pic/rgmon/lapras.png
5275old mode 100644
5276new mode 100755
5277diff --git a/pic/rgmon/lickitung.png b/pic/rgmon/lickitung.png
5278old mode 100644
5279new mode 100755
5280diff --git a/pic/rgmon/machamp.png b/pic/rgmon/machamp.png
5281old mode 100644
5282new mode 100755
5283diff --git a/pic/rgmon/machoke.png b/pic/rgmon/machoke.png
5284old mode 100644
5285new mode 100755
5286diff --git a/pic/rgmon/machop.png b/pic/rgmon/machop.png
5287old mode 100644
5288new mode 100755
5289diff --git a/pic/rgmon/magikarp.png b/pic/rgmon/magikarp.png
5290old mode 100644
5291new mode 100755
5292diff --git a/pic/rgmon/magmar.png b/pic/rgmon/magmar.png
5293old mode 100644
5294new mode 100755
5295diff --git a/pic/rgmon/magnemite.png b/pic/rgmon/magnemite.png
5296old mode 100644
5297new mode 100755
5298diff --git a/pic/rgmon/magneton.png b/pic/rgmon/magneton.png
5299old mode 100644
5300new mode 100755
5301diff --git a/pic/rgmon/mankey.png b/pic/rgmon/mankey.png
5302old mode 100644
5303new mode 100755
5304diff --git a/pic/rgmon/marowak.png b/pic/rgmon/marowak.png
5305old mode 100644
5306new mode 100755
5307diff --git a/pic/rgmon/meowth.png b/pic/rgmon/meowth.png
5308old mode 100644
5309new mode 100755
5310diff --git a/pic/rgmon/metapod.png b/pic/rgmon/metapod.png
5311old mode 100644
5312new mode 100755
5313diff --git a/pic/rgmon/mew.png b/pic/rgmon/mew.png
5314old mode 100644
5315new mode 100755
5316diff --git a/pic/rgmon/mewtwo.png b/pic/rgmon/mewtwo.png
5317old mode 100644
5318new mode 100755
5319diff --git a/pic/rgmon/moltres.png b/pic/rgmon/moltres.png
5320old mode 100644
5321new mode 100755
5322diff --git a/pic/rgmon/mr.mime.png b/pic/rgmon/mr.mime.png
5323old mode 100644
5324new mode 100755
5325diff --git a/pic/rgmon/muk.png b/pic/rgmon/muk.png
5326old mode 100644
5327new mode 100755
5328diff --git a/pic/rgmon/nidoking.png b/pic/rgmon/nidoking.png
5329old mode 100644
5330new mode 100755
5331diff --git a/pic/rgmon/nidoqueen.png b/pic/rgmon/nidoqueen.png
5332old mode 100644
5333new mode 100755
5334diff --git a/pic/rgmon/nidoranf.png b/pic/rgmon/nidoranf.png
5335old mode 100644
5336new mode 100755
5337diff --git a/pic/rgmon/nidoranm.png b/pic/rgmon/nidoranm.png
5338old mode 100644
5339new mode 100755
5340diff --git a/pic/rgmon/nidorina.png b/pic/rgmon/nidorina.png
5341old mode 100644
5342new mode 100755
5343diff --git a/pic/rgmon/nidorino.png b/pic/rgmon/nidorino.png
5344old mode 100644
5345new mode 100755
5346diff --git a/pic/rgmon/ninetales.png b/pic/rgmon/ninetales.png
5347old mode 100644
5348new mode 100755
5349diff --git a/pic/rgmon/oddish.png b/pic/rgmon/oddish.png
5350old mode 100644
5351new mode 100755
5352diff --git a/pic/rgmon/omanyte.png b/pic/rgmon/omanyte.png
5353old mode 100644
5354new mode 100755
5355diff --git a/pic/rgmon/omastar.png b/pic/rgmon/omastar.png
5356old mode 100644
5357new mode 100755
5358diff --git a/pic/rgmon/onix.png b/pic/rgmon/onix.png
5359old mode 100644
5360new mode 100755
5361diff --git a/pic/rgmon/paras.png b/pic/rgmon/paras.png
5362old mode 100644
5363new mode 100755
5364diff --git a/pic/rgmon/parasect.png b/pic/rgmon/parasect.png
5365old mode 100644
5366new mode 100755
5367diff --git a/pic/rgmon/persian.png b/pic/rgmon/persian.png
5368old mode 100644
5369new mode 100755
5370diff --git a/pic/rgmon/pidgeot.png b/pic/rgmon/pidgeot.png
5371old mode 100644
5372new mode 100755
5373diff --git a/pic/rgmon/pidgeotto.png b/pic/rgmon/pidgeotto.png
5374old mode 100644
5375new mode 100755
5376diff --git a/pic/rgmon/pidgey.png b/pic/rgmon/pidgey.png
5377old mode 100644
5378new mode 100755
5379diff --git a/pic/rgmon/pikachu.png b/pic/rgmon/pikachu.png
5380old mode 100644
5381new mode 100755
5382diff --git a/pic/rgmon/pinsir.png b/pic/rgmon/pinsir.png
5383old mode 100644
5384new mode 100755
5385diff --git a/pic/rgmon/poliwag.png b/pic/rgmon/poliwag.png
5386old mode 100644
5387new mode 100755
5388diff --git a/pic/rgmon/poliwhirl.png b/pic/rgmon/poliwhirl.png
5389old mode 100644
5390new mode 100755
5391diff --git a/pic/rgmon/poliwrath.png b/pic/rgmon/poliwrath.png
5392old mode 100644
5393new mode 100755
5394diff --git a/pic/rgmon/ponyta.png b/pic/rgmon/ponyta.png
5395old mode 100644
5396new mode 100755
5397diff --git a/pic/rgmon/porygon.png b/pic/rgmon/porygon.png
5398old mode 100644
5399new mode 100755
5400diff --git a/pic/rgmon/primeape.png b/pic/rgmon/primeape.png
5401old mode 100644
5402new mode 100755
5403diff --git a/pic/rgmon/psyduck.png b/pic/rgmon/psyduck.png
5404old mode 100644
5405new mode 100755
5406diff --git a/pic/rgmon/raichu.png b/pic/rgmon/raichu.png
5407old mode 100644
5408new mode 100755
5409diff --git a/pic/rgmon/rapidash.png b/pic/rgmon/rapidash.png
5410old mode 100644
5411new mode 100755
5412diff --git a/pic/rgmon/raticate.png b/pic/rgmon/raticate.png
5413old mode 100644
5414new mode 100755
5415diff --git a/pic/rgmon/rattata.png b/pic/rgmon/rattata.png
5416old mode 100644
5417new mode 100755
5418diff --git a/pic/rgmon/rhydon.png b/pic/rgmon/rhydon.png
5419old mode 100644
5420new mode 100755
5421diff --git a/pic/rgmon/rhyhorn.png b/pic/rgmon/rhyhorn.png
5422old mode 100644
5423new mode 100755
5424diff --git a/pic/rgmon/sandshrew.png b/pic/rgmon/sandshrew.png
5425old mode 100644
5426new mode 100755
5427diff --git a/pic/rgmon/sandslash.png b/pic/rgmon/sandslash.png
5428old mode 100644
5429new mode 100755
5430diff --git a/pic/rgmon/scyther.png b/pic/rgmon/scyther.png
5431old mode 100644
5432new mode 100755
5433diff --git a/pic/rgmon/seadra.png b/pic/rgmon/seadra.png
5434old mode 100644
5435new mode 100755
5436diff --git a/pic/rgmon/seaking.png b/pic/rgmon/seaking.png
5437old mode 100644
5438new mode 100755
5439diff --git a/pic/rgmon/seel.png b/pic/rgmon/seel.png
5440old mode 100644
5441new mode 100755
5442diff --git a/pic/rgmon/shellder.png b/pic/rgmon/shellder.png
5443old mode 100644
5444new mode 100755
5445diff --git a/pic/rgmon/slowbro.png b/pic/rgmon/slowbro.png
5446old mode 100644
5447new mode 100755
5448diff --git a/pic/rgmon/slowpoke.png b/pic/rgmon/slowpoke.png
5449old mode 100644
5450new mode 100755
5451diff --git a/pic/rgmon/snorlax.png b/pic/rgmon/snorlax.png
5452old mode 100644
5453new mode 100755
5454diff --git a/pic/rgmon/spearow.png b/pic/rgmon/spearow.png
5455old mode 100644
5456new mode 100755
5457diff --git a/pic/rgmon/squirtle.png b/pic/rgmon/squirtle.png
5458old mode 100644
5459new mode 100755
5460diff --git a/pic/rgmon/starmie.png b/pic/rgmon/starmie.png
5461old mode 100644
5462new mode 100755
5463diff --git a/pic/rgmon/staryu.png b/pic/rgmon/staryu.png
5464old mode 100644
5465new mode 100755
5466diff --git a/pic/rgmon/tangela.png b/pic/rgmon/tangela.png
5467old mode 100644
5468new mode 100755
5469diff --git a/pic/rgmon/tauros.png b/pic/rgmon/tauros.png
5470old mode 100644
5471new mode 100755
5472diff --git a/pic/rgmon/tentacool.png b/pic/rgmon/tentacool.png
5473old mode 100644
5474new mode 100755
5475diff --git a/pic/rgmon/tentacruel.png b/pic/rgmon/tentacruel.png
5476old mode 100644
5477new mode 100755
5478diff --git a/pic/rgmon/vaporeon.png b/pic/rgmon/vaporeon.png
5479old mode 100644
5480new mode 100755
5481diff --git a/pic/rgmon/venomoth.png b/pic/rgmon/venomoth.png
5482old mode 100644
5483new mode 100755
5484diff --git a/pic/rgmon/venonat.png b/pic/rgmon/venonat.png
5485old mode 100644
5486new mode 100755
5487diff --git a/pic/rgmon/venusaur.png b/pic/rgmon/venusaur.png
5488old mode 100644
5489new mode 100755
5490diff --git a/pic/rgmon/victreebel.png b/pic/rgmon/victreebel.png
5491old mode 100644
5492new mode 100755
5493diff --git a/pic/rgmon/vileplume.png b/pic/rgmon/vileplume.png
5494old mode 100644
5495new mode 100755
5496diff --git a/pic/rgmon/voltorb.png b/pic/rgmon/voltorb.png
5497old mode 100644
5498new mode 100755
5499diff --git a/pic/rgmon/vulpix.png b/pic/rgmon/vulpix.png
5500old mode 100644
5501new mode 100755
5502diff --git a/pic/rgmon/wartortle.png b/pic/rgmon/wartortle.png
5503old mode 100644
5504new mode 100755
5505diff --git a/pic/rgmon/weedle.png b/pic/rgmon/weedle.png
5506old mode 100644
5507new mode 100755
5508diff --git a/pic/rgmon/weepinbell.png b/pic/rgmon/weepinbell.png
5509old mode 100644
5510new mode 100755
5511diff --git a/pic/rgmon/weezing.png b/pic/rgmon/weezing.png
5512old mode 100644
5513new mode 100755
5514diff --git a/pic/rgmon/wigglytuff.png b/pic/rgmon/wigglytuff.png
5515old mode 100644
5516new mode 100755
5517diff --git a/pic/rgmon/zapdos.png b/pic/rgmon/zapdos.png
5518old mode 100644
5519new mode 100755
5520diff --git a/pic/rgmon/zubat.png b/pic/rgmon/zubat.png
5521old mode 100644
5522new mode 100755
5523diff --git a/pic/trainer/agatha.png b/pic/trainer/agatha.png
5524old mode 100644
5525new mode 100755
5526diff --git a/pic/trainer/beauty.png b/pic/trainer/beauty.png
5527old mode 100644
5528new mode 100755
5529diff --git a/pic/trainer/biker.png b/pic/trainer/biker.png
5530old mode 100644
5531new mode 100755
5532diff --git a/pic/trainer/birdkeeper.png b/pic/trainer/birdkeeper.png
5533old mode 100644
5534new mode 100755
5535diff --git a/pic/trainer/blackbelt.png b/pic/trainer/blackbelt.png
5536old mode 100644
5537new mode 100755
5538diff --git a/pic/trainer/blaine.png b/pic/trainer/blaine.png
5539old mode 100644
5540new mode 100755
5541diff --git a/pic/trainer/brock.png b/pic/trainer/brock.png
5542old mode 100644
5543new mode 100755
5544diff --git a/pic/trainer/bruno.png b/pic/trainer/bruno.png
5545diff --git a/pic/trainer/bruno.png b/pic/trainer/bruno.png
5546old mode 100644
5547new mode 100755
5548diff --git a/pic/trainer/bugcatcher.png b/pic/trainer/bugcatcher.png
5549old mode 100644
5550new mode 100755
5551diff --git a/pic/trainer/burglar.png b/pic/trainer/burglar.png
5552old mode 100644
5553new mode 100755
5554diff --git a/pic/trainer/channeler.png b/pic/trainer/channeler.png
5555old mode 100644
5556new mode 100755
5557diff --git a/pic/trainer/cooltrainerf.png b/pic/trainer/cooltrainerf.png
5558old mode 100644
5559new mode 100755
5560diff --git a/pic/trainer/cooltrainerm.png b/pic/trainer/cooltrainerm.png
5561old mode 100644
5562new mode 100755
5563diff --git a/pic/trainer/cueball.png b/pic/trainer/cueball.png
5564old mode 100644
5565new mode 100755
5566diff --git a/pic/trainer/engineer.png b/pic/trainer/engineer.png
5567old mode 100644
5568new mode 100755
5569diff --git a/pic/trainer/erika.png b/pic/trainer/erika.png
5570old mode 100644
5571new mode 100755
5572diff --git a/pic/trainer/fisher.png b/pic/trainer/fisher.png
5573old mode 100644
5574new mode 100755
5575diff --git a/pic/trainer/gambler.png b/pic/trainer/gambler.png
5576old mode 100644
5577new mode 100755
5578diff --git a/pic/trainer/gentleman.png b/pic/trainer/gentleman.png
5579old mode 100644
5580new mode 100755
5581diff --git a/pic/trainer/giovanni.png b/pic/trainer/giovanni.png
5582old mode 100644
5583new mode 100755
5584diff --git a/pic/trainer/hiker.png b/pic/trainer/hiker.png
5585old mode 100644
5586new mode 100755
5587diff --git a/pic/trainer/jr.trainerf.png b/pic/trainer/jr.trainerf.png
5588old mode 100644
5589new mode 100755
5590diff --git a/pic/trainer/jr.trainerm.png b/pic/trainer/jr.trainerm.png
5591old mode 100644
5592new mode 100755
5593diff --git a/pic/trainer/juggler.png b/pic/trainer/juggler.png
5594old mode 100644
5595new mode 100755
5596diff --git a/pic/trainer/koga.png b/pic/trainer/koga.png
5597old mode 100644
5598new mode 100755
5599diff --git a/pic/trainer/lance.png b/pic/trainer/lance.png
5600old mode 100644
5601new mode 100755
5602diff --git a/pic/trainer/lass.png b/pic/trainer/lass.png
5603old mode 100644
5604new mode 100755
5605diff --git a/pic/trainer/lorelei.png b/pic/trainer/lorelei.png
5606old mode 100644
5607new mode 100755
5608diff --git a/pic/trainer/lt.surge.png b/pic/trainer/lt.surge.png
5609old mode 100644
5610new mode 100755
5611diff --git a/pic/trainer/misty.png b/pic/trainer/misty.png
5612old mode 100644
5613new mode 100755
5614diff --git a/pic/trainer/oldman.png b/pic/trainer/oldman.png
5615old mode 100644
5616new mode 100755
5617diff --git a/pic/trainer/pokemaniac.png b/pic/trainer/pokemaniac.png
5618old mode 100644
5619new mode 100755
5620diff --git a/pic/trainer/prof.oak.png b/pic/trainer/prof.oak.png
5621old mode 100644
5622new mode 100755
5623diff --git a/pic/trainer/psychic.png b/pic/trainer/psychic.png
5624old mode 100644
5625new mode 100755
5626diff --git a/pic/trainer/red.png b/pic/trainer/red.png
5627old mode 100644
5628new mode 100755
5629diff --git a/pic/trainer/redb.png b/pic/trainer/redb.png
5630old mode 100644
5631new mode 100755
5632diff --git a/pic/trainer/rival1.png b/pic/trainer/rival1.png
5633old mode 100644
5634new mode 100755
5635diff --git a/pic/trainer/rival2.png b/pic/trainer/rival2.png
5636old mode 100644
5637new mode 100755
5638diff --git a/pic/trainer/rival3.png b/pic/trainer/rival3.png
5639old mode 100644
5640new mode 100755
5641diff --git a/pic/trainer/rocker.png b/pic/trainer/rocker.png
5642old mode 100644
5643new mode 100755
5644diff --git a/pic/trainer/rocket.png b/pic/trainer/rocket.png
5645old mode 100644
5646new mode 100755
5647diff --git a/pic/trainer/sabrina.png b/pic/trainer/sabrina.png
5648old mode 100644
5649new mode 100755
5650diff --git a/pic/trainer/sailor.png b/pic/trainer/sailor.png
5651old mode 100644
5652new mode 100755
5653diff --git a/pic/trainer/scientist.png b/pic/trainer/scientist.png
5654old mode 100644
5655new mode 100755
5656diff --git a/pic/trainer/shrink1.png b/pic/trainer/shrink1.png
5657old mode 100644
5658new mode 100755
5659diff --git a/pic/trainer/shrink2.png b/pic/trainer/shrink2.png
5660old mode 100644
5661new mode 100755
5662diff --git a/pic/trainer/supernerd.png b/pic/trainer/supernerd.png
5663old mode 100644
5664new mode 100755
5665diff --git a/pic/trainer/swimmer.png b/pic/trainer/swimmer.png
5666old mode 100644
5667new mode 100755
5668diff --git a/pic/trainer/tamer.png b/pic/trainer/tamer.png
5669old mode 100644
5670new mode 100755
5671diff --git a/pic/trainer/youngster.png b/pic/trainer/youngster.png
5672old mode 100644
5673new mode 100755
5674diff --git a/pic/ymon/abra.png b/pic/ymon/abra.png
5675old mode 100644
5676new mode 100755
5677index 3573a040..bc0cb24b
5678Binary files a/pic/ymon/abra.png and b/pic/ymon/abra.png differ
5679diff --git a/pic/ymon/aerodactyl.png b/pic/ymon/aerodactyl.png
5680old mode 100644
5681new mode 100755
5682index cf0212a0..89812b32
5683Binary files a/pic/ymon/aerodactyl.png and b/pic/ymon/aerodactyl.png differ
5684diff --git a/pic/ymon/alakazam.png b/pic/ymon/alakazam.png
5685old mode 100644
5686new mode 100755
5687index 613ae5ad..3a8b32d1
5688Binary files a/pic/ymon/alakazam.png and b/pic/ymon/alakazam.png differ
5689diff --git a/pic/ymon/arbok.png b/pic/ymon/arbok.png
5690old mode 100644
5691new mode 100755
5692index 45df87b1..dab294f5
5693Binary files a/pic/ymon/arbok.png and b/pic/ymon/arbok.png differ
5694diff --git a/pic/ymon/arcanine.png b/pic/ymon/arcanine.png
5695old mode 100644
5696new mode 100755
5697index 77bb89b0..0149138b
5698Binary files a/pic/ymon/arcanine.png and b/pic/ymon/arcanine.png differ
5699diff --git a/pic/ymon/articuno.png b/pic/ymon/articuno.png
5700old mode 100644
5701new mode 100755
5702index e8ae875e..99b6385d
5703Binary files a/pic/ymon/articuno.png and b/pic/ymon/articuno.png differ
5704diff --git a/pic/ymon/beedrill.png b/pic/ymon/beedrill.png
5705old mode 100644
5706new mode 100755
5707index bc9ca73d..b6f31036
5708Binary files a/pic/ymon/beedrill.png and b/pic/ymon/beedrill.png differ
5709diff --git a/pic/ymon/bellsprout.png b/pic/ymon/bellsprout.png
5710old mode 100644
5711new mode 100755
5712index f3d2ff1c..380913d5
5713Binary files a/pic/ymon/bellsprout.png and b/pic/ymon/bellsprout.png differ
5714diff --git a/pic/ymon/blastoise.png b/pic/ymon/blastoise.png
5715old mode 100644
5716new mode 100755
5717index 6cdd8e30..97bf497b
5718Binary files a/pic/ymon/blastoise.png and b/pic/ymon/blastoise.png differ
5719diff --git a/pic/ymon/bulbasaur.png b/pic/ymon/bulbasaur.png
5720old mode 100644
5721new mode 100755
5722index 27abe273..1a4676a1
5723Binary files a/pic/ymon/bulbasaur.png and b/pic/ymon/bulbasaur.png differ
5724diff --git a/pic/ymon/butterfree.png b/pic/ymon/butterfree.png
5725old mode 100644
5726new mode 100755
5727index 951ae4c4..0b3044d4
5728Binary files a/pic/ymon/butterfree.png and b/pic/ymon/butterfree.png differ
5729diff --git a/pic/ymon/caterpie.png b/pic/ymon/caterpie.png
5730old mode 100644
5731new mode 100755
5732index 8e3205c9..dca52b88
5733Binary files a/pic/ymon/caterpie.png and b/pic/ymon/caterpie.png differ
5734diff --git a/pic/ymon/chansey.png b/pic/ymon/chansey.png
5735old mode 100644
5736new mode 100755
5737index d517535a..fa47540e
5738Binary files a/pic/ymon/chansey.png and b/pic/ymon/chansey.png differ
5739diff --git a/pic/ymon/charizard.png b/pic/ymon/charizard.png
5740old mode 100644
5741new mode 100755
5742index 100416d4..a8b87e05
5743Binary files a/pic/ymon/charizard.png and b/pic/ymon/charizard.png differ
5744diff --git a/pic/ymon/charmander.png b/pic/ymon/charmander.png
5745old mode 100644
5746new mode 100755
5747index 155a68a4..153f9381
5748Binary files a/pic/ymon/charmander.png and b/pic/ymon/charmander.png differ
5749diff --git a/pic/ymon/charmeleon.png b/pic/ymon/charmeleon.png
5750old mode 100644
5751new mode 100755
5752index 63808b25..f60d1294
5753Binary files a/pic/ymon/charmeleon.png and b/pic/ymon/charmeleon.png differ
5754diff --git a/pic/ymon/clefable.png b/pic/ymon/clefable.png
5755old mode 100644
5756new mode 100755
5757index 8e5111f9..8ef6be5f
5758Binary files a/pic/ymon/clefable.png and b/pic/ymon/clefable.png differ
5759diff --git a/pic/ymon/clefairy.png b/pic/ymon/clefairy.png
5760old mode 100644
5761new mode 100755
5762index 4a26be0b..632844d5
5763Binary files a/pic/ymon/clefairy.png and b/pic/ymon/clefairy.png differ
5764diff --git a/pic/ymon/cloyster.png b/pic/ymon/cloyster.png
5765old mode 100644
5766new mode 100755
5767index 67542d93..b6e16485
5768Binary files a/pic/ymon/cloyster.png and b/pic/ymon/cloyster.png differ
5769diff --git a/pic/ymon/cubone.png b/pic/ymon/cubone.png
5770old mode 100644
5771new mode 100755
5772index c5dec329..1312b7c7
5773Binary files a/pic/ymon/cubone.png and b/pic/ymon/cubone.png differ
5774diff --git a/pic/ymon/dewgong.png b/pic/ymon/dewgong.png
5775old mode 100644
5776new mode 100755
5777index c7bb5424..823b7125
5778Binary files a/pic/ymon/dewgong.png and b/pic/ymon/dewgong.png differ
5779diff --git a/pic/ymon/diglett.png b/pic/ymon/diglett.png
5780old mode 100644
5781new mode 100755
5782index a9becda8..69b93a90
5783Binary files a/pic/ymon/diglett.png and b/pic/ymon/diglett.png differ
5784diff --git a/pic/ymon/ditto.png b/pic/ymon/ditto.png
5785old mode 100644
5786new mode 100755
5787index 3c662491..1a38c474
5788Binary files a/pic/ymon/ditto.png and b/pic/ymon/ditto.png differ
5789diff --git a/pic/ymon/dodrio.png b/pic/ymon/dodrio.png
5790old mode 100644
5791new mode 100755
5792index 45606e63..c88fa388
5793Binary files a/pic/ymon/dodrio.png and b/pic/ymon/dodrio.png differ
5794diff --git a/pic/ymon/doduo.png b/pic/ymon/doduo.png
5795old mode 100644
5796new mode 100755
5797index 0aa722c0..c95aae73
5798Binary files a/pic/ymon/doduo.png and b/pic/ymon/doduo.png differ
5799diff --git a/pic/ymon/dragonair.png b/pic/ymon/dragonair.png
5800old mode 100644
5801new mode 100755
5802index e7fc1448..fe097cfa
5803Binary files a/pic/ymon/dragonair.png and b/pic/ymon/dragonair.png differ
5804diff --git a/pic/ymon/dragonite.png b/pic/ymon/dragonite.png
5805old mode 100644
5806new mode 100755
5807index 7ac78924..49474a4d
5808Binary files a/pic/ymon/dragonite.png and b/pic/ymon/dragonite.png differ
5809diff --git a/pic/ymon/dratini.png b/pic/ymon/dratini.png
5810old mode 100644
5811new mode 100755
5812index 5a1a880f..9c7e454d
5813Binary files a/pic/ymon/dratini.png and b/pic/ymon/dratini.png differ
5814diff --git a/pic/ymon/drowzee.png b/pic/ymon/drowzee.png
5815old mode 100644
5816new mode 100755
5817index 16d3edfc..b8cdf0db
5818Binary files a/pic/ymon/drowzee.png and b/pic/ymon/drowzee.png differ
5819diff --git a/pic/ymon/dugtrio.png b/pic/ymon/dugtrio.png
5820old mode 100644
5821new mode 100755
5822index c20d01b6..1619ab92
5823Binary files a/pic/ymon/dugtrio.png and b/pic/ymon/dugtrio.png differ
5824diff --git a/pic/ymon/eevee.png b/pic/ymon/eevee.png
5825old mode 100644
5826new mode 100755
5827index 7bc62ae9..b8fcab5a
5828Binary files a/pic/ymon/eevee.png and b/pic/ymon/eevee.png differ
5829diff --git a/pic/ymon/ekans.png b/pic/ymon/ekans.png
5830old mode 100644
5831new mode 100755
5832index 1d454a13..cd43c69c
5833Binary files a/pic/ymon/ekans.png and b/pic/ymon/ekans.png differ
5834diff --git a/pic/ymon/electabuzz.png b/pic/ymon/electabuzz.png
5835old mode 100644
5836new mode 100755
5837index 77647d26..24791e64
5838Binary files a/pic/ymon/electabuzz.png and b/pic/ymon/electabuzz.png differ
5839diff --git a/pic/ymon/electrode.png b/pic/ymon/electrode.png
5840index f5e05464..ff812003 100755
5841Binary files a/pic/ymon/electrode.png and b/pic/ymon/electrode.png differ
5842diff --git a/pic/ymon/exeggcute.png b/pic/ymon/exeggcute.png
5843old mode 100644
5844new mode 100755
5845index 901e2244..63b55927
5846Binary files a/pic/ymon/exeggcute.png and b/pic/ymon/exeggcute.png differ
5847diff --git a/pic/ymon/exeggutor.png b/pic/ymon/exeggutor.png
5848old mode 100644
5849new mode 100755
5850index 3e8d37cb..dc1f7287
5851Binary files a/pic/ymon/exeggutor.png and b/pic/ymon/exeggutor.png differ
5852diff --git a/pic/ymon/farfetchd.png b/pic/ymon/farfetchd.png
5853old mode 100644
5854new mode 100755
5855index 8412e767..bd97b9e8
5856Binary files a/pic/ymon/farfetchd.png and b/pic/ymon/farfetchd.png differ
5857diff --git a/pic/ymon/fearow.png b/pic/ymon/fearow.png
5858old mode 100644
5859new mode 100755
5860index 7b54a854..93d7a847
5861Binary files a/pic/ymon/fearow.png and b/pic/ymon/fearow.png differ
5862diff --git a/pic/ymon/flareon.png b/pic/ymon/flareon.png
5863old mode 100644
5864new mode 100755
5865index 5b0e5376..7a39866a
5866Binary files a/pic/ymon/flareon.png and b/pic/ymon/flareon.png differ
5867diff --git a/pic/ymon/fossilaerodactyl.png b/pic/ymon/fossilaerodactyl.png
5868old mode 100644
5869new mode 100755
5870index eb7fc3a3..27d5c3ac
5871Binary files a/pic/ymon/fossilaerodactyl.png and b/pic/ymon/fossilaerodactyl.png differ
5872diff --git a/pic/ymon/fossilkabutops.png b/pic/ymon/fossilkabutops.png
5873old mode 100644
5874new mode 100755
5875index dd8d41ea..d37edb02
5876Binary files a/pic/ymon/fossilkabutops.png and b/pic/ymon/fossilkabutops.png differ
5877diff --git a/pic/ymon/gastly.png b/pic/ymon/gastly.png
5878old mode 100644
5879new mode 100755
5880index 9d236e5a..a5c0f406
5881Binary files a/pic/ymon/gastly.png and b/pic/ymon/gastly.png differ
5882diff --git a/pic/ymon/gengar.png b/pic/ymon/gengar.png
5883old mode 100644
5884new mode 100755
5885index 1993bcfc..cb31fecf
5886Binary files a/pic/ymon/gengar.png and b/pic/ymon/gengar.png differ
5887diff --git a/pic/ymon/geodude.png b/pic/ymon/geodude.png
5888old mode 100644
5889new mode 100755
5890index c28db680..02b690e9
5891Binary files a/pic/ymon/geodude.png and b/pic/ymon/geodude.png differ
5892diff --git a/pic/ymon/gloom.png b/pic/ymon/gloom.png
5893old mode 100644
5894new mode 100755
5895index 6071ea5d..c2fd2aa7
5896Binary files a/pic/ymon/gloom.png and b/pic/ymon/gloom.png differ
5897diff --git a/pic/ymon/golbat.png b/pic/ymon/golbat.png
5898old mode 100644
5899new mode 100755
5900index 7d2b17da..1fb2a341
5901Binary files a/pic/ymon/golbat.png and b/pic/ymon/golbat.png differ
5902diff --git a/pic/ymon/goldeen.png b/pic/ymon/goldeen.png
5903old mode 100644
5904new mode 100755
5905index c6bbeae5..bee7de2a
5906Binary files a/pic/ymon/goldeen.png and b/pic/ymon/goldeen.png differ
5907diff --git a/pic/ymon/golduck.png b/pic/ymon/golduck.png
5908old mode 100644
5909new mode 100755
5910index 299b6300..a0827b54
5911Binary files a/pic/ymon/golduck.png and b/pic/ymon/golduck.png differ
5912diff --git a/pic/ymon/golem.png b/pic/ymon/golem.png
5913old mode 100644
5914new mode 100755
5915index 7d317b7d..86ea3c68
5916Binary files a/pic/ymon/golem.png and b/pic/ymon/golem.png differ
5917diff --git a/pic/ymon/graveler.png b/pic/ymon/graveler.png
5918old mode 100644
5919new mode 100755
5920index 26d4b0a1..5e876f0b
5921Binary files a/pic/ymon/graveler.png and b/pic/ymon/graveler.png differ
5922diff --git a/pic/ymon/grimer.png b/pic/ymon/grimer.png
5923old mode 100644
5924new mode 100755
5925index a72c9e45..cc6931fb
5926Binary files a/pic/ymon/grimer.png and b/pic/ymon/grimer.png differ
5927diff --git a/pic/ymon/growlithe.png b/pic/ymon/growlithe.png
5928old mode 100644
5929new mode 100755
5930index e75173cf..1aafd535
5931Binary files a/pic/ymon/growlithe.png and b/pic/ymon/growlithe.png differ
5932diff --git a/pic/ymon/gyarados.png b/pic/ymon/gyarados.png
5933old mode 100644
5934new mode 100755
5935index 387c2725..4d25aabb
5936Binary files a/pic/ymon/gyarados.png and b/pic/ymon/gyarados.png differ
5937diff --git a/pic/ymon/haunter.png b/pic/ymon/haunter.png
5938old mode 100644
5939new mode 100755
5940index d7f96e3d..531c8a62
5941Binary files a/pic/ymon/haunter.png and b/pic/ymon/haunter.png differ
5942diff --git a/pic/ymon/hitmonchan.png b/pic/ymon/hitmonchan.png
5943old mode 100644
5944new mode 100755
5945index 2fb7122b..1774dd18
5946Binary files a/pic/ymon/hitmonchan.png and b/pic/ymon/hitmonchan.png differ
5947diff --git a/pic/ymon/hitmonlee.png b/pic/ymon/hitmonlee.png
5948old mode 100644
5949new mode 100755
5950index acbe68ff..04ca9be3
5951Binary files a/pic/ymon/hitmonlee.png and b/pic/ymon/hitmonlee.png differ
5952diff --git a/pic/ymon/horsea.png b/pic/ymon/horsea.png
5953old mode 100644
5954new mode 100755
5955index 390c419d..0d11d78c
5956Binary files a/pic/ymon/horsea.png and b/pic/ymon/horsea.png differ
5957diff --git a/pic/ymon/hypno.png b/pic/ymon/hypno.png
5958old mode 100644
5959new mode 100755
5960index ed100f66..f29559c2
5961Binary files a/pic/ymon/hypno.png and b/pic/ymon/hypno.png differ
5962diff --git a/pic/ymon/ivysaur.png b/pic/ymon/ivysaur.png
5963old mode 100644
5964new mode 100755
5965index 4da5664b..337bc27d
5966Binary files a/pic/ymon/ivysaur.png and b/pic/ymon/ivysaur.png differ
5967diff --git a/pic/ymon/jigglypuff.png b/pic/ymon/jigglypuff.png
5968old mode 100644
5969new mode 100755
5970index d11ec165..607c429e
5971Binary files a/pic/ymon/jigglypuff.png and b/pic/ymon/jigglypuff.png differ
5972diff --git a/pic/ymon/jolteon.png b/pic/ymon/jolteon.png
5973old mode 100644
5974new mode 100755
5975index a1942ec6..fab34a30
5976Binary files a/pic/ymon/jolteon.png and b/pic/ymon/jolteon.png differ
5977diff --git a/pic/ymon/jynx.png b/pic/ymon/jynx.png
5978old mode 100644
5979new mode 100755
5980index 699ab3f5..6966ce34
5981Binary files a/pic/ymon/jynx.png and b/pic/ymon/jynx.png differ
5982diff --git a/pic/ymon/kabuto.png b/pic/ymon/kabuto.png
5983old mode 100644
5984new mode 100755
5985index 58f27e0f..b8923ad7
5986Binary files a/pic/ymon/kabuto.png and b/pic/ymon/kabuto.png differ
5987diff --git a/pic/ymon/kabutops.png b/pic/ymon/kabutops.png
5988old mode 100644
5989new mode 100755
5990index e898ca12..0f33c4d0
5991Binary files a/pic/ymon/kabutops.png and b/pic/ymon/kabutops.png differ
5992diff --git a/pic/ymon/kadabra.png b/pic/ymon/kadabra.png
5993old mode 100644
5994new mode 100755
5995index 58aff19a..8b8abc1a
5996Binary files a/pic/ymon/kadabra.png and b/pic/ymon/kadabra.png differ
5997diff --git a/pic/ymon/kakuna.png b/pic/ymon/kakuna.png
5998old mode 100644
5999new mode 100755
6000index fb4ec863..0cc6eabf
6001Binary files a/pic/ymon/kakuna.png and b/pic/ymon/kakuna.png differ
6002diff --git a/pic/ymon/kangaskhan.png b/pic/ymon/kangaskhan.png
6003old mode 100644
6004new mode 100755
6005index 56ab2619..c9d3361d
6006Binary files a/pic/ymon/kangaskhan.png and b/pic/ymon/kangaskhan.png differ
6007diff --git a/pic/ymon/kingler.png b/pic/ymon/kingler.png
6008old mode 100644
6009new mode 100755
6010index c7610d11..c1302fbf
6011Binary files a/pic/ymon/kingler.png and b/pic/ymon/kingler.png differ
6012diff --git a/pic/ymon/koffing.png b/pic/ymon/koffing.png
6013old mode 100644
6014new mode 100755
6015index 9d394cdc..e6dfee04
6016Binary files a/pic/ymon/koffing.png and b/pic/ymon/koffing.png differ
6017diff --git a/pic/ymon/krabby.png b/pic/ymon/krabby.png
6018old mode 100644
6019new mode 100755
6020index fe463732..2740128f
6021Binary files a/pic/ymon/krabby.png and b/pic/ymon/krabby.png differ
6022diff --git a/pic/ymon/lapras.png b/pic/ymon/lapras.png
6023old mode 100644
6024new mode 100755
6025index ee954079..b696b8d9
6026Binary files a/pic/ymon/lapras.png and b/pic/ymon/lapras.png differ
6027diff --git a/pic/ymon/lickitung.png b/pic/ymon/lickitung.png
6028old mode 100644
6029new mode 100755
6030index 3b480655..3deb9b12
6031Binary files a/pic/ymon/lickitung.png and b/pic/ymon/lickitung.png differ
6032diff --git a/pic/ymon/machamp.png b/pic/ymon/machamp.png
6033old mode 100644
6034new mode 100755
6035index f2bf5a0b..a6f773a0
6036Binary files a/pic/ymon/machamp.png and b/pic/ymon/machamp.png differ
6037diff --git a/pic/ymon/machoke.png b/pic/ymon/machoke.png
6038old mode 100644
6039new mode 100755
6040index 7079a52b..ed637897
6041Binary files a/pic/ymon/machoke.png and b/pic/ymon/machoke.png differ
6042diff --git a/pic/ymon/machop.png b/pic/ymon/machop.png
6043old mode 100644
6044new mode 100755
6045index cd6d6891..a5e20532
6046Binary files a/pic/ymon/machop.png and b/pic/ymon/machop.png differ
6047diff --git a/pic/ymon/magikarp.png b/pic/ymon/magikarp.png
6048old mode 100644
6049new mode 100755
6050index 881aa50a..68bc4f8c
6051Binary files a/pic/ymon/magikarp.png and b/pic/ymon/magikarp.png differ
6052diff --git a/pic/ymon/magmar.png b/pic/ymon/magmar.png
6053old mode 100644
6054new mode 100755
6055index 839fa204..f12bd2f2
6056Binary files a/pic/ymon/magmar.png and b/pic/ymon/magmar.png differ
6057diff --git a/pic/ymon/magnemite.png b/pic/ymon/magnemite.png
6058old mode 100644
6059new mode 100755
6060index 4cb5e3da..fc807398
6061Binary files a/pic/ymon/magnemite.png and b/pic/ymon/magnemite.png differ
6062diff --git a/pic/ymon/magneton.png b/pic/ymon/magneton.png
6063old mode 100644
6064new mode 100755
6065index 5d2a3eaa..51a3f12c
6066Binary files a/pic/ymon/magneton.png and b/pic/ymon/magneton.png differ
6067diff --git a/pic/ymon/mankey.png b/pic/ymon/mankey.png
6068old mode 100644
6069new mode 100755
6070index f3266f29..9ae43757
6071Binary files a/pic/ymon/mankey.png and b/pic/ymon/mankey.png differ
6072diff --git a/pic/ymon/marowak.png b/pic/ymon/marowak.png
6073old mode 100644
6074new mode 100755
6075index d90e4627..8ac6c6ee
6076Binary files a/pic/ymon/marowak.png and b/pic/ymon/marowak.png differ
6077diff --git a/pic/ymon/meowth.png b/pic/ymon/meowth.png
6078old mode 100644
6079new mode 100755
6080index de82b0c2..d00a08db
6081Binary files a/pic/ymon/meowth.png and b/pic/ymon/meowth.png differ
6082diff --git a/pic/ymon/metapod.png b/pic/ymon/metapod.png
6083old mode 100644
6084new mode 100755
6085index 6268ed9a..5d7514f4
6086Binary files a/pic/ymon/metapod.png and b/pic/ymon/metapod.png differ
6087diff --git a/pic/ymon/mew.png b/pic/ymon/mew.png
6088old mode 100644
6089new mode 100755
6090index a00783a9..0d9bef36
6091Binary files a/pic/ymon/mew.png and b/pic/ymon/mew.png differ
6092diff --git a/pic/ymon/mewtwo.png b/pic/ymon/mewtwo.png
6093old mode 100644
6094new mode 100755
6095index 40c6f217..b41409ca
6096Binary files a/pic/ymon/mewtwo.png and b/pic/ymon/mewtwo.png differ
6097diff --git a/pic/ymon/moltres.png b/pic/ymon/moltres.png
6098old mode 100644
6099new mode 100755
6100index e5e3d02e..52259f4a
6101Binary files a/pic/ymon/moltres.png and b/pic/ymon/moltres.png differ
6102diff --git a/pic/ymon/mr.mime.png b/pic/ymon/mr.mime.png
6103old mode 100644
6104new mode 100755
6105index 5a3642d3..6dca1791
6106Binary files a/pic/ymon/mr.mime.png and b/pic/ymon/mr.mime.png differ
6107diff --git a/pic/ymon/muk.png b/pic/ymon/muk.png
6108old mode 100644
6109new mode 100755
6110index d7d98e37..8816e939
6111Binary files a/pic/ymon/muk.png and b/pic/ymon/muk.png differ
6112diff --git a/pic/ymon/nidoking.png b/pic/ymon/nidoking.png
6113old mode 100644
6114new mode 100755
6115index 785adc67..c181e60c
6116Binary files a/pic/ymon/nidoking.png and b/pic/ymon/nidoking.png differ
6117diff --git a/pic/ymon/nidoqueen.png b/pic/ymon/nidoqueen.png
6118old mode 100644
6119new mode 100755
6120index 24f786c7..86cba6d6
6121Binary files a/pic/ymon/nidoqueen.png and b/pic/ymon/nidoqueen.png differ
6122diff --git a/pic/ymon/nidoranf.png b/pic/ymon/nidoranf.png
6123old mode 100644
6124new mode 100755
6125index 1f6532d2..8d99c920
6126Binary files a/pic/ymon/nidoranf.png and b/pic/ymon/nidoranf.png differ
6127diff --git a/pic/ymon/nidoranm.png b/pic/ymon/nidoranm.png
6128old mode 100644
6129new mode 100755
6130index bb960e01..9a93e864
6131Binary files a/pic/ymon/nidoranm.png and b/pic/ymon/nidoranm.png differ
6132diff --git a/pic/ymon/nidorina.png b/pic/ymon/nidorina.png
6133old mode 100644
6134new mode 100755
6135index 76edf719..a8d277b8
6136Binary files a/pic/ymon/nidorina.png and b/pic/ymon/nidorina.png differ
6137diff --git a/pic/ymon/nidorino.png b/pic/ymon/nidorino.png
6138old mode 100644
6139new mode 100755
6140index c68dbdd1..4d6c9e55
6141Binary files a/pic/ymon/nidorino.png and b/pic/ymon/nidorino.png differ
6142diff --git a/pic/ymon/ninetales.png b/pic/ymon/ninetales.png
6143old mode 100644
6144new mode 100755
6145index f7ff9ff6..128e8e53
6146Binary files a/pic/ymon/ninetales.png and b/pic/ymon/ninetales.png differ
6147diff --git a/pic/ymon/oddish.png b/pic/ymon/oddish.png
6148old mode 100644
6149new mode 100755
6150index 17281e3b..55aa2d09
6151Binary files a/pic/ymon/oddish.png and b/pic/ymon/oddish.png differ
6152diff --git a/pic/ymon/omanyte.png b/pic/ymon/omanyte.png
6153old mode 100644
6154new mode 100755
6155index eafbd593..d042710e
6156Binary files a/pic/ymon/omanyte.png and b/pic/ymon/omanyte.png differ
6157diff --git a/pic/ymon/omastar.png b/pic/ymon/omastar.png
6158old mode 100644
6159new mode 100755
6160index 2eb40d37..af84f55f
6161Binary files a/pic/ymon/omastar.png and b/pic/ymon/omastar.png differ
6162diff --git a/pic/ymon/onix.png b/pic/ymon/onix.png
6163old mode 100644
6164new mode 100755
6165index 1e49634f..3b731ece
6166Binary files a/pic/ymon/onix.png and b/pic/ymon/onix.png differ
6167diff --git a/pic/ymon/paras.png b/pic/ymon/paras.png
6168old mode 100644
6169new mode 100755
6170index 73c805c8..b8ee6517
6171Binary files a/pic/ymon/paras.png and b/pic/ymon/paras.png differ
6172diff --git a/pic/ymon/parasect.png b/pic/ymon/parasect.png
6173old mode 100644
6174new mode 100755
6175index def9e493..3d58b8e5
6176Binary files a/pic/ymon/parasect.png and b/pic/ymon/parasect.png differ
6177diff --git a/pic/ymon/persian.png b/pic/ymon/persian.png
6178old mode 100644
6179new mode 100755
6180index 831a9da8..aed4d6dc
6181Binary files a/pic/ymon/persian.png and b/pic/ymon/persian.png differ
6182diff --git a/pic/ymon/pidgeot.png b/pic/ymon/pidgeot.png
6183old mode 100644
6184new mode 100755
6185index 4bb98422..4b4aa72f
6186Binary files a/pic/ymon/pidgeot.png and b/pic/ymon/pidgeot.png differ
6187diff --git a/pic/ymon/pidgeotto.png b/pic/ymon/pidgeotto.png
6188old mode 100644
6189new mode 100755
6190index 0490003c..58a51f5d
6191Binary files a/pic/ymon/pidgeotto.png and b/pic/ymon/pidgeotto.png differ
6192diff --git a/pic/ymon/pidgey.png b/pic/ymon/pidgey.png
6193old mode 100644
6194new mode 100755
6195index fe507e6d..7636fb67
6196Binary files a/pic/ymon/pidgey.png and b/pic/ymon/pidgey.png differ
6197diff --git a/pic/ymon/pikachu.png b/pic/ymon/pikachu.png
6198old mode 100644
6199new mode 100755
6200index 4fc61c87..5a3eb782
6201Binary files a/pic/ymon/pikachu.png and b/pic/ymon/pikachu.png differ
6202diff --git a/pic/ymon/pinsir.png b/pic/ymon/pinsir.png
6203old mode 100644
6204new mode 100755
6205index 0f8d8639..2944c453
6206Binary files a/pic/ymon/pinsir.png and b/pic/ymon/pinsir.png differ
6207diff --git a/pic/ymon/poliwag.png b/pic/ymon/poliwag.png
6208old mode 100644
6209new mode 100755
6210index 1c19fd1c..a1ad26c8
6211Binary files a/pic/ymon/poliwag.png and b/pic/ymon/poliwag.png differ
6212diff --git a/pic/ymon/poliwhirl.png b/pic/ymon/poliwhirl.png
6213old mode 100644
6214new mode 100755
6215index f56f75df..d18311d6
6216Binary files a/pic/ymon/poliwhirl.png and b/pic/ymon/poliwhirl.png differ
6217diff --git a/pic/ymon/poliwrath.png b/pic/ymon/poliwrath.png
6218old mode 100644
6219new mode 100755
6220index 20fe9e6c..49f07b96
6221Binary files a/pic/ymon/poliwrath.png and b/pic/ymon/poliwrath.png differ
6222diff --git a/pic/ymon/ponyta.png b/pic/ymon/ponyta.png
6223old mode 100644
6224new mode 100755
6225index b4ec63b2..c3a67849
6226Binary files a/pic/ymon/ponyta.png and b/pic/ymon/ponyta.png differ
6227diff --git a/pic/ymon/porygon.png b/pic/ymon/porygon.png
6228old mode 100644
6229new mode 100755
6230index f991dd6e..1ed804ff
6231Binary files a/pic/ymon/porygon.png and b/pic/ymon/porygon.png differ
6232diff --git a/pic/ymon/primeape.png b/pic/ymon/primeape.png
6233old mode 100644
6234new mode 100755
6235index a14234f5..42c03f6d
6236Binary files a/pic/ymon/primeape.png and b/pic/ymon/primeape.png differ
6237diff --git a/pic/ymon/psyduck.png b/pic/ymon/psyduck.png
6238old mode 100644
6239new mode 100755
6240index 75cd2f17..cd0a5e9e
6241Binary files a/pic/ymon/psyduck.png and b/pic/ymon/psyduck.png differ
6242diff --git a/pic/ymon/raichu.png b/pic/ymon/raichu.png
6243old mode 100644
6244new mode 100755
6245index 1ef39dc9..961d2aeb
6246Binary files a/pic/ymon/raichu.png and b/pic/ymon/raichu.png differ
6247diff --git a/pic/ymon/rapidash.png b/pic/ymon/rapidash.png
6248old mode 100644
6249new mode 100755
6250index 804e7829..d118b947
6251Binary files a/pic/ymon/rapidash.png and b/pic/ymon/rapidash.png differ
6252diff --git a/pic/ymon/raticate.png b/pic/ymon/raticate.png
6253old mode 100644
6254new mode 100755
6255index 95018e0b..895c1006
6256Binary files a/pic/ymon/raticate.png and b/pic/ymon/raticate.png differ
6257diff --git a/pic/ymon/rattata.png b/pic/ymon/rattata.png
6258old mode 100644
6259new mode 100755
6260index 423299bb..8d114876
6261Binary files a/pic/ymon/rattata.png and b/pic/ymon/rattata.png differ
6262diff --git a/pic/ymon/rhydon.png b/pic/ymon/rhydon.png
6263deleted file mode 100644
6264index 6d75e4be..00000000
6265Binary files a/pic/ymon/rhydon.png and /dev/null differ
6266diff --git a/pic/ymon/rhyhorn.png b/pic/ymon/rhyhorn.png
6267old mode 100644
6268new mode 100755
6269index dcf9dd6a..1b968785
6270Binary files a/pic/ymon/rhyhorn.png and b/pic/ymon/rhyhorn.png differ
6271diff --git a/pic/ymon/sandshrew.png b/pic/ymon/sandshrew.png
6272old mode 100644
6273new mode 100755
6274index 010908fd..e078d6d3
6275Binary files a/pic/ymon/sandshrew.png and b/pic/ymon/sandshrew.png differ
6276diff --git a/pic/ymon/sandslash.png b/pic/ymon/sandslash.png
6277old mode 100644
6278new mode 100755
6279index d37a8de1..55320b96
6280Binary files a/pic/ymon/sandslash.png and b/pic/ymon/sandslash.png differ
6281diff --git a/pic/ymon/scyther.png b/pic/ymon/scyther.png
6282old mode 100644
6283new mode 100755
6284index 51663342..de4d89ed
6285Binary files a/pic/ymon/scyther.png and b/pic/ymon/scyther.png differ
6286diff --git a/pic/ymon/seadra.png b/pic/ymon/seadra.png
6287old mode 100644
6288new mode 100755
6289index 150416dc..17cdf4ea
6290Binary files a/pic/ymon/seadra.png and b/pic/ymon/seadra.png differ
6291diff --git a/pic/ymon/seaking.png b/pic/ymon/seaking.png
6292old mode 100644
6293new mode 100755
6294index 75060461..184f0556
6295Binary files a/pic/ymon/seaking.png and b/pic/ymon/seaking.png differ
6296diff --git a/pic/ymon/seel.png b/pic/ymon/seel.png
6297old mode 100644
6298new mode 100755
6299index ef3574b0..cb2f7f2e
6300Binary files a/pic/ymon/seel.png and b/pic/ymon/seel.png differ
6301diff --git a/pic/ymon/shellder.png b/pic/ymon/shellder.png
6302old mode 100644
6303new mode 100755
6304index d7ddfa48..b7c41dd2
6305Binary files a/pic/ymon/shellder.png and b/pic/ymon/shellder.png differ
6306diff --git a/pic/ymon/slowbro.png b/pic/ymon/slowbro.png
6307old mode 100644
6308new mode 100755
6309index e506c9ec..b67bbc08
6310Binary files a/pic/ymon/slowbro.png and b/pic/ymon/slowbro.png differ
6311diff --git a/pic/ymon/slowpoke.png b/pic/ymon/slowpoke.png
6312old mode 100644
6313new mode 100755
6314index 1328f4a0..d59e9008
6315Binary files a/pic/ymon/slowpoke.png and b/pic/ymon/slowpoke.png differ
6316diff --git a/pic/ymon/snorlax.png b/pic/ymon/snorlax.png
6317old mode 100644
6318new mode 100755
6319index 00c78d27..c249327d
6320Binary files a/pic/ymon/snorlax.png and b/pic/ymon/snorlax.png differ
6321diff --git a/pic/ymon/spearow.png b/pic/ymon/spearow.png
6322old mode 100644
6323new mode 100755
6324index d9349987..c1fce869
6325Binary files a/pic/ymon/spearow.png and b/pic/ymon/spearow.png differ
6326diff --git a/pic/ymon/squirtle.png b/pic/ymon/squirtle.png
6327old mode 100644
6328new mode 100755
6329index db7aa6c7..3139cddc
6330Binary files a/pic/ymon/squirtle.png and b/pic/ymon/squirtle.png differ
6331diff --git a/pic/ymon/starmie.png b/pic/ymon/starmie.png
6332old mode 100644
6333new mode 100755
6334index 2ed93b4d..395fd857
6335Binary files a/pic/ymon/starmie.png and b/pic/ymon/starmie.png differ
6336diff --git a/pic/ymon/staryu.png b/pic/ymon/staryu.png
6337old mode 100644
6338new mode 100755
6339index 320fb6a6..740089e8
6340Binary files a/pic/ymon/staryu.png and b/pic/ymon/staryu.png differ
6341diff --git a/pic/ymon/tangela.png b/pic/ymon/tangela.png
6342old mode 100644
6343new mode 100755
6344index 43d04726..a6f6327c
6345Binary files a/pic/ymon/tangela.png and b/pic/ymon/tangela.png differ
6346diff --git a/pic/ymon/tauros.png b/pic/ymon/tauros.png
6347old mode 100644
6348new mode 100755
6349index 8086fd13..ae57f111
6350Binary files a/pic/ymon/tauros.png and b/pic/ymon/tauros.png differ
6351diff --git a/pic/ymon/tentacool.png b/pic/ymon/tentacool.png
6352old mode 100644
6353new mode 100755
6354index 88d7fde3..59a979c2
6355Binary files a/pic/ymon/tentacool.png and b/pic/ymon/tentacool.png differ
6356diff --git a/pic/ymon/tentacruel.png b/pic/ymon/tentacruel.png
6357old mode 100644
6358new mode 100755
6359index 47383372..aaf4d426
6360Binary files a/pic/ymon/tentacruel.png and b/pic/ymon/tentacruel.png differ
6361diff --git a/pic/ymon/vaporeon.png b/pic/ymon/vaporeon.png
6362old mode 100644
6363new mode 100755
6364index 2c35af22..72db05da
6365Binary files a/pic/ymon/vaporeon.png and b/pic/ymon/vaporeon.png differ
6366diff --git a/pic/ymon/venomoth.png b/pic/ymon/venomoth.png
6367old mode 100644
6368new mode 100755
6369index 9d801497..e677255e
6370Binary files a/pic/ymon/venomoth.png and b/pic/ymon/venomoth.png differ
6371diff --git a/pic/ymon/venonat.png b/pic/ymon/venonat.png
6372old mode 100644
6373new mode 100755
6374index 574ed26b..cf2f4df1
6375Binary files a/pic/ymon/venonat.png and b/pic/ymon/venonat.png differ
6376diff --git a/pic/ymon/venusaur.png b/pic/ymon/venusaur.png
6377old mode 100644
6378new mode 100755
6379index f6a964e3..f444a234
6380Binary files a/pic/ymon/venusaur.png and b/pic/ymon/venusaur.png differ
6381diff --git a/pic/ymon/victreebel.png b/pic/ymon/victreebel.png
6382old mode 100644
6383new mode 100755
6384index 115c45a3..62193011
6385Binary files a/pic/ymon/victreebel.png and b/pic/ymon/victreebel.png differ
6386diff --git a/pic/ymon/vileplume.png b/pic/ymon/vileplume.png
6387old mode 100644
6388new mode 100755
6389index af4f0862..e39d50e0
6390Binary files a/pic/ymon/vileplume.png and b/pic/ymon/vileplume.png differ
6391diff --git a/pic/ymon/voltorb.png b/pic/ymon/voltorb.png
6392old mode 100644
6393new mode 100755
6394index 8b4bc64d..c2159e6c
6395Binary files a/pic/ymon/voltorb.png and b/pic/ymon/voltorb.png differ
6396diff --git a/pic/ymon/vulpix.png b/pic/ymon/vulpix.png
6397old mode 100644
6398new mode 100755
6399index cef8fbd8..8b8810ad
6400Binary files a/pic/ymon/vulpix.png and b/pic/ymon/vulpix.png differ
6401diff --git a/pic/ymon/wartortle.png b/pic/ymon/wartortle.png
6402old mode 100644
6403new mode 100755
6404index 961aaf4f..6e65bb7c
6405Binary files a/pic/ymon/wartortle.png and b/pic/ymon/wartortle.png differ
6406diff --git a/pic/ymon/weedle.png b/pic/ymon/weedle.png
6407old mode 100644
6408new mode 100755
6409index 989b57b5..3efbd49d
6410Binary files a/pic/ymon/weedle.png and b/pic/ymon/weedle.png differ
6411diff --git a/pic/ymon/weepinbell.png b/pic/ymon/weepinbell.png
6412old mode 100644
6413new mode 100755
6414index 8dd8fc34..18b44783
6415Binary files a/pic/ymon/weepinbell.png and b/pic/ymon/weepinbell.png differ
6416diff --git a/pic/ymon/weezing.png b/pic/ymon/weezing.png
6417old mode 100644
6418new mode 100755
6419index 445556b3..5b30b4e0
6420Binary files a/pic/ymon/weezing.png and b/pic/ymon/weezing.png differ
6421diff --git a/pic/ymon/wigglytuff.png b/pic/ymon/wigglytuff.png
6422old mode 100644
6423new mode 100755
6424index c9ae89ad..e986affd
6425Binary files a/pic/ymon/wigglytuff.png and b/pic/ymon/wigglytuff.png differ
6426diff --git a/pic/ymon/zapdos.png b/pic/ymon/zapdos.png
6427old mode 100644
6428new mode 100755
6429index 47b63d6a..534ac4a9
6430Binary files a/pic/ymon/zapdos.png and b/pic/ymon/zapdos.png differ
6431diff --git a/pic/ymon/zubat.png b/pic/ymon/zubat.png
6432old mode 100644
6433new mode 100755
6434index 86ac4710..14dc9118
6435Binary files a/pic/ymon/zubat.png and b/pic/ymon/zubat.png differ
6436diff --git a/pic/ytrainer/brock.png b/pic/ytrainer/brock.png
6437old mode 100644
6438new mode 100755
6439diff --git a/pic/ytrainer/erika.png b/pic/ytrainer/erika.png
6440old mode 100644
6441new mode 100755
6442diff --git a/pic/ytrainer/jessiejames.png b/pic/ytrainer/jessiejames.png
6443old mode 100644
6444new mode 100755
6445diff --git a/pic/ytrainer/misty.png b/pic/ytrainer/misty.png
6446old mode 100644
6447new mode 100755
6448diff --git a/pic/ytrainer/prof.oakb.png b/pic/ytrainer/prof.oakb.png
6449old mode 100644
6450new mode 100755
6451diff --git a/pic/ytrainer/red.png b/pic/ytrainer/red.png
6452old mode 100644
6453new mode 100755
6454diff --git a/pic/ytrainer/rival1.png b/pic/ytrainer/rival1.png
6455old mode 100644
6456new mode 100755
6457diff --git a/pic/ytrainer/rival2.png b/pic/ytrainer/rival2.png
6458old mode 100644
6459new mode 100755
6460diff --git a/pic/ytrainer/rival3.png b/pic/ytrainer/rival3.png
6461old mode 100644
6462new mode 100755
6463diff --git a/pokeyellow.link b/pokeyellow.link
6464old mode 100644
6465new mode 100755
6466index ea309bd9..b4f66c28
6467--- a/pokeyellow.link
6468+++ b/pokeyellow.link
6469@@ -91,23 +91,23 @@ ROMX $8
6470
6471 ROMX $9
6472 org $4000
6473- "Pics 1"
6474+ "bank09"
6475
6476 ROMX $A
6477 org $4000
6478- "Pics 2"
6479+ "bank0A"
6480
6481 ROMX $B
6482 org $4000
6483- "Pics 3"
6484+ "bank0B"
6485
6486 ROMX $C
6487 org $4000
6488- "Pics 4"
6489+ "bank0C"
6490
6491 ROMX $D
6492 org $4000
6493- "Pics 5"
6494+ "bank0D"
6495
6496 ROMX $E
6497 org $4000
6498@@ -316,6 +316,30 @@ ROMX $3E
6499 ROMX $3F
6500 org $4000
6501 "bank3F"
6502+
6503+ROMX $40
6504+ org $4000
6505+ "Pics 1"
6506+
6507+ROMX $41
6508+ org $4000
6509+ "Pics 2"
6510+
6511+ROMX $42
6512+ org $4000
6513+ "Pics 3"
6514+
6515+ROMX $43
6516+ org $4000
6517+ "Pics 4"
6518+
6519+ROMX $44
6520+ org $4000
6521+ "Pics 5"
6522+
6523+ROMX $45
6524+ org $4000
6525+ "bank45"
6526
6527 WRAM0
6528 org $c000
6529diff --git a/replace.sh b/replace.sh
6530old mode 100644
6531new mode 100755
6532diff --git a/roms.md5 b/roms.md5
6533old mode 100644
6534new mode 100755
6535diff --git a/scripts/beach_house.asm b/scripts/beach_house.asm
6536old mode 100644
6537new mode 100755
6538diff --git a/scripts/colosseum.asm b/scripts/colosseum.asm
6539old mode 100644
6540new mode 100755
6541diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm
6542index 4bc8198c..4031acb0 100755
6543--- a/scripts/oakslab.asm
6544+++ b/scripts/oakslab.asm
6545@@ -823,7 +823,7 @@ OaksLabText3:
6546 jp .asm_1ca6f
6547
6548 .asm_1c9ec
6549- ld b, POKE_BALL
6550+ ld b, POKEBALL
6551 call IsItemInBag
6552 jr nz, .asm_1ca69
6553 ld hl, wPokedexOwned
6554@@ -874,7 +874,7 @@ OaksLabText3:
6555 .asm_1ca52
6556 CheckAndSetEvent EVENT_GOT_POKEBALLS_FROM_OAK
6557 jr nz, .asm_1ca69
6558- lb bc, POKE_BALL, 5
6559+ lb bc, POKEBALL, 5
6560 call GiveItem
6561 ld hl, OaksLabText_1ca90
6562 call PrintText
6563diff --git a/scripts/route1_2.asm b/scripts/route1_2.asm
6564index 6e9b472e..1cd85d07 100755
6565--- a/scripts/route1_2.asm
6566+++ b/scripts/route1_2.asm
6567@@ -1,9 +1,9 @@
6568 Func_f1ad2:
6569- CheckAndSetEvent EVENT_GOT_POTION_SAMPLE
6570+ CheckAndSetEvent EVENT_GOT_TRANK_SAMPLE
6571 jr nz, .asm_1cada
6572 ld hl, Route1ViridianMartSampleText
6573 call PrintText
6574- lb bc, POTION, 1
6575+ lb bc, TRANK, 1
6576 call GiveItem
6577 jr nc, .BagFull
6578 ld hl, Route1Text_f1aff
6579diff --git a/scripts/tradecenter.asm b/scripts/tradecenter.asm
6580old mode 100644
6581new mode 100755
6582diff --git a/sram.asm b/sram.asm
6583old mode 100644
6584new mode 100755
6585diff --git a/text.asm b/text.asm
6586old mode 100644
6587new mode 100755
6588index 277dbab8..1cffa5fa
6589--- a/text.asm
6590+++ b/text.asm
6591@@ -426,22 +426,6 @@ _RockTunnelPokecenterGuyText::
6592 cont "LAVENDER TOWN!"
6593 done
6594
6595-_UnusedBenchGuyText1::
6596- text "I wish I could"
6597- line "catch #MON."
6598- done
6599-
6600-_UnusedBenchGuyText2::
6601- text "I'm tired from"
6602- line "all the fun..."
6603- done
6604-
6605-_UnusedBenchGuyText3::
6606- text "SILPH's manager"
6607- line "is hiding in the"
6608- cont "SAFARI ZONE."
6609- done
6610-
6611 _VermilionPokecenterGuyText::
6612 text "It is true that a"
6613 line "higher level"
6614diff --git a/text/credits_text.asm b/text/credits_text.asm
6615index 0010b93a..f15d4a9e 100755
6616--- a/text/credits_text.asm
6617+++ b/text/credits_text.asm
6618@@ -87,8 +87,8 @@ CreditsTextPointers:
6619 dw CreditsText_Yamazaki
6620
6621 CreditsText_Version:
6622- db -6, "YELLOW VERSION"
6623- next " STAFF@"
6624+ db -6, "Gelb++ Version"
6625+ next " Staff@"
6626 CreditsText_Tajiri:
6627 db -6, "SATOSHI TAJIRI@"
6628 CreditsText_Oota:
6629diff --git a/text/item_names.asm b/text/item_names.asm
6630index e436d74d..e2661675 100755
6631--- a/text/item_names.asm
6632+++ b/text/item_names.asm
6633@@ -1,24 +1,24 @@
6634 ItemNames:
6635- db "MASTER BALL@"
6636- db "ULTRA BALL@"
6637- db "GREAT BALL@"
6638- db "POKé BALL@"
6639- db "TOWN MAP@"
6640- db "BICYCLE@"
6641+ db "Meisterball@"
6642+ db "Hyperball@"
6643+ db "Superball@"
6644+ db "Pokéball@"
6645+ db "Karte@"
6646+ db "Fahrrad@"
6647 db "?????@"
6648- db "SAFARI BALL@"
6649- db "POKéDEX@"
6650- db "MOON STONE@"
6651- db "ANTIDOTE@"
6652- db "BURN HEAL@"
6653- db "ICE HEAL@"
6654- db "AWAKENING@"
6655- db "PARLYZ HEAL@"
6656- db "FULL RESTORE@"
6657- db "MAX POTION@"
6658- db "HYPER POTION@"
6659- db "SUPER POTION@"
6660- db "POTION@"
6661+ db "Safariball@"
6662+ db "PokéDex@"
6663+ db "Mondstein@"
6664+ db "Gegengift@"
6665+ db "Feuerheiler@"
6666+ db "Eisheiler@"
6667+ db "Aufwecker@"
6668+ db "Paraheiler@"
6669+ db "Top-Genesung@"
6670+ db "Top-Trank@"
6671+ db "Hypertrank@"
6672+ db "Supertrank@"
6673+ db "Trank@"
6674 db "BOULDERBADGE@"
6675 db "CASCADEBADGE@"
6676 db "THUNDERBADGE@"
6677@@ -27,61 +27,61 @@ ItemNames:
6678 db "MARSHBADGE@"
6679 db "VOLCANOBADGE@"
6680 db "EARTHBADGE@"
6681- db "ESCAPE ROPE@"
6682- db "REPEL@"
6683- db "OLD AMBER@"
6684- db "FIRE STONE@"
6685- db "THUNDERSTONE@"
6686- db "WATER STONE@"
6687- db "HP UP@"
6688- db "PROTEIN@"
6689- db "IRON@"
6690- db "CARBOS@"
6691- db "CALCIUM@"
6692- db "RARE CANDY@"
6693- db "DOME FOSSIL@"
6694- db "HELIX FOSSIL@"
6695- db "SECRET KEY@"
6696+ db "Fluchtseil@"
6697+ db "Schutz@"
6698+ db "Altbernstein@"
6699+ db "Feuerstein@"
6700+ db "Donnerstein@"
6701+ db "Wasserstein@"
6702+ db "KP-Plus@"
6703+ db "Protein@"
6704+ db "Eisen@"
6705+ db "Carbon@"
6706+ db "Kalzium@"
6707+ db "Sonderbonbon@"
6708+ db "Domfossil@"
6709+ db "Helixfossil@"
6710+ db "?-Öffner@"
6711 db "?????@"
6712- db "BIKE VOUCHER@"
6713- db "X ACCURACY@"
6714- db "LEAF STONE@"
6715- db "CARD KEY@"
6716- db "NUGGET@"
6717- db "PP UP@"
6718- db "POKé DOLL@"
6719- db "FULL HEAL@"
6720- db "REVIVE@"
6721- db "MAX REVIVE@"
6722- db "GUARD SPEC.@"
6723- db "SUPER REPEL@"
6724- db "MAX REPEL@"
6725- db "DIRE HIT@"
6726- db "COIN@"
6727- db "FRESH WATER@"
6728- db "SODA POP@"
6729- db "LEMONADE@"
6730- db "S.S.TICKET@"
6731- db "GOLD TEETH@"
6732- db "X ATTACK@"
6733- db "X DEFEND@"
6734- db "X SPEED@"
6735- db "X SPECIAL@"
6736- db "COIN CASE@"
6737- db "OAK's PARCEL@"
6738- db "ITEMFINDER@"
6739- db "SILPH SCOPE@"
6740- db "POKé FLUTE@"
6741- db "LIFT KEY@"
6742- db "EXP.ALL@"
6743- db "OLD ROD@"
6744- db "GOOD ROD@"
6745- db "SUPER ROD@"
6746- db "PP UP@"
6747- db "ETHER@"
6748- db "MAX ETHER@"
6749- db "ELIXER@"
6750- db "MAX ELIXER@"
6751+ db "Rad-Coupon@"
6752+ db "X-Treffer@"
6753+ db "Blattstein@"
6754+ db "Türöffner@"
6755+ db "Nugget@"
6756+ db "AP-Plus@"
6757+ db "POKépuppe@"
6758+ db "Hyperheiler@"
6759+ db "Beleber@"
6760+ db "Top-Beleber@"
6761+ db "Megablock@"
6762+ db "Superschutz@"
6763+ db "Top-Schutz@"
6764+ db "Angriffplus@"
6765+ db "Münze@"
6766+ db "Tafelwasser@"
6767+ db "Sprudel@"
6768+ db "Limonade@"
6769+ db "Bootsticket@"
6770+ db "Goldzähne@"
6771+ db "X-Angriff@"
6772+ db "X-Abwehr@"
6773+ db "X-Tempo@"
6774+ db "X-Spezial@"
6775+ db "Münzkorb@"
6776+ db "Eichs Paket@"
6777+ db "Detektor@"
6778+ db "Silph Scope@"
6779+ db "POKéflöte@"
6780+ db "Liftöffner@"
6781+ db "EP-Teiler@"
6782+ db "Angel@"
6783+ db "Profiangel@"
6784+ db "Superangel@"
6785+ db "AP-Plus@"
6786+ db "Äther@"
6787+ db "Top-Äther@"
6788+ db "Elixier@"
6789+ db "Top-Elixier@"
6790 db "B2F@"
6791 db "B1F@"
6792 db "1F@"
6793@@ -96,3 +96,4 @@ ItemNames:
6794 db "10F@"
6795 db "11F@"
6796 db "B4F@"
6797+ db "Metallmantel@"
6798diff --git a/text/map_names.asm b/text/map_names.asm
6799index c2642942..2ccafc89 100755
6800--- a/text/map_names.asm
6801+++ b/text/map_names.asm
6802@@ -1,107 +1,109 @@
6803 MapNames:
6804 PalletTownName:
6805- db "PALLET TOWN@"
6806+ db "Alabastia@"
6807 ViridianCityName:
6808- db "VIRIDIAN CITY@"
6809+ db "Vertania City@"
6810 PewterCityName:
6811- db "PEWTER CITY@"
6812+ db "Marmoria City@"
6813 CeruleanCityName:
6814- db "CERULEAN CITY@"
6815+ db "Azuria City@"
6816 LavenderTownName:
6817- db "LAVENDER TOWN@"
6818+ db "Lavandia@"
6819 VermilionCityName:
6820- db "VERMILION CITY@"
6821+ db "Orania City@"
6822 CeladonCityName:
6823- db "CELADON CITY@"
6824+ db "Prismania City@"
6825 FuchsiaCityName:
6826- db "FUCHSIA CITY@"
6827+ db "Fuchsania City@"
6828 CinnabarIslandName:
6829- db "CINNABAR ISLAND@"
6830+ db "Zinnoberinsel@"
6831 IndigoPlateauName:
6832- db "INDIGO PLATEAU@"
6833+ db "Indigo-Plateau@"
6834 SaffronCityName:
6835- db "SAFFRON CITY@"
6836+ db "Saffronia City@"
6837 Route1Name:
6838- db "ROUTE 1@"
6839+ db "Route 1@"
6840 Route2Name:
6841- db "ROUTE 2@"
6842+ db "Route 2@"
6843 Route3Name:
6844- db "ROUTE 3@"
6845+ db "Route 3@"
6846 Route4Name:
6847- db "ROUTE 4@"
6848+ db "Route 4@"
6849 Route5Name:
6850- db "ROUTE 5@"
6851+ db "Route 5@"
6852 Route6Name:
6853- db "ROUTE 6@"
6854+ db "Route 6@"
6855 Route7Name:
6856- db "ROUTE 7@"
6857+ db "Route 7@"
6858 Route8Name:
6859- db "ROUTE 8@"
6860+ db "Route 8@"
6861 Route9Name:
6862- db "ROUTE 9@"
6863+ db "Route 9@"
6864 Route10Name:
6865- db "ROUTE 10@"
6866+ db "Route 10@"
6867 Route11Name:
6868- db "ROUTE 11@"
6869+ db "Route 11@"
6870 Route12Name:
6871- db "ROUTE 12@"
6872+ db "Route 12@"
6873 Route13Name:
6874- db "ROUTE 13@"
6875+ db "Route 13@"
6876 Route14Name:
6877- db "ROUTE 14@"
6878+ db "Route 14@"
6879 Route15Name:
6880- db "ROUTE 15@"
6881+ db "Route 15@"
6882 Route16Name:
6883- db "ROUTE 16@"
6884+ db "Route 16@"
6885 Route17Name:
6886- db "ROUTE 17@"
6887+ db "Route 17@"
6888 Route18Name:
6889- db "ROUTE 18@"
6890+ db "Route 18@"
6891 Route19Name:
6892- db "SEA ROUTE 19@"
6893+ db "Route 19@"
6894 Route20Name:
6895- db "SEA ROUTE 20@"
6896+ db "Route 20@"
6897 Route21Name:
6898- db "SEA ROUTE 21@"
6899+ db "Route 21@"
6900 Route22Name:
6901- db "ROUTE 22@"
6902+ db "Route 22@"
6903 Route23Name:
6904- db "ROUTE 23@"
6905+ db "Route 23@"
6906 Route24Name:
6907- db "ROUTE 24@"
6908+ db "Route 24@"
6909 Route25Name:
6910- db "ROUTE 25@"
6911+ db "Route 25@"
6912 ViridianForestName:
6913- db "VIRIDIAN FOREST@"
6914+ db "Vertania-Wald@"
6915 MountMoonName:
6916- db "MT.MOON@"
6917+ db "Mondberg@"
6918 RockTunnelName:
6919- db "ROCK TUNNEL@"
6920+ db "Felstunnel@"
6921 SeaCottageName:
6922- db "SEA COTTAGE@"
6923+ db "Bills Küstenhaus@"
6924 SSAnneName:
6925- db "S.S.ANNE@"
6926+ db "MS Anne@"
6927 PokemonLeagueName:
6928- db "#MON LEAGUE@"
6929+ db "#MON Liga@"
6930 UndergroundPathName:
6931- db "UNDERGROUND PATH@"
6932+ db "Unterführung@"
6933 PokemonTowerName:
6934- db "#MON TOWER@"
6935+ db "#MON-Turm@"
6936 SeafoamIslandsName:
6937- db "SEAFOAM ISLANDS@"
6938+ db "Seeschauminseln@"
6939 VictoryRoadName:
6940- db "VICTORY ROAD@"
6941+ db "Siegessstrasse@"
6942 DiglettsCaveName:
6943- db "DIGLETT's CAVE@"
6944+ db "Digda-Höhle@"
6945 RocketHQName:
6946- db "ROCKET HQ@"
6947+ db "Rocket-Versteck@"
6948 SilphCoName:
6949- db "SILPH CO.@"
6950+ db "Silph Co.@"
6951 PokemonMansionName:
6952- db "<pkmn> MANSION@"
6953+ db "#MON-Villa@"
6954 SafariZoneName:
6955- db "SAFARI ZONE@"
6956+ db "Safari-Zone@"
6957 CeruleanCaveName:
6958- db "CERULEAN CAVE@"
6959+ db "Azuria-Höhle@"
6960 PowerPlantName:
6961- db "POWER PLANT@"
6962+ db "Kraftwerk@"
6963+Route26Name:
6964+ db "Route26@"
6965diff --git a/text/maps/agatha.asm b/text/maps/agatha.asm
6966old mode 100644
6967new mode 100755
6968diff --git a/text/maps/beach_house.asm b/text/maps/beach_house.asm
6969old mode 100644
6970new mode 100755
6971diff --git a/text/maps/bike_shop.asm b/text/maps/bike_shop.asm
6972old mode 100644
6973new mode 100755
6974diff --git a/text/maps/bills_house.asm b/text/maps/bills_house.asm
6975old mode 100644
6976new mode 100755
6977diff --git a/text/maps/blues_house.asm b/text/maps/blues_house.asm
6978old mode 100644
6979new mode 100755
6980diff --git a/text/maps/bruno.asm b/text/maps/bruno.asm
6981old mode 100644
6982new mode 100755
6983diff --git a/text/maps/celadon_city.asm b/text/maps/celadon_city.asm
6984old mode 100644
6985new mode 100755
6986diff --git a/text/maps/celadon_dept_store_1f.asm b/text/maps/celadon_dept_store_1f.asm
6987old mode 100644
6988new mode 100755
6989diff --git a/text/maps/celadon_dept_store_2f.asm b/text/maps/celadon_dept_store_2f.asm
6990old mode 100644
6991new mode 100755
6992diff --git a/text/maps/celadon_dept_store_3f.asm b/text/maps/celadon_dept_store_3f.asm
6993old mode 100644
6994new mode 100755
6995diff --git a/text/maps/celadon_dept_store_4f.asm b/text/maps/celadon_dept_store_4f.asm
6996old mode 100644
6997new mode 100755
6998diff --git a/text/maps/celadon_dept_store_5f.asm b/text/maps/celadon_dept_store_5f.asm
6999old mode 100644
7000new mode 100755
7001diff --git a/text/maps/celadon_dept_store_roof.asm b/text/maps/celadon_dept_store_roof.asm
7002old mode 100644
7003new mode 100755
7004diff --git a/text/maps/celadon_diner.asm b/text/maps/celadon_diner.asm
7005old mode 100644
7006new mode 100755
7007diff --git a/text/maps/celadon_game_corner_1.asm b/text/maps/celadon_game_corner_1.asm
7008old mode 100644
7009new mode 100755
7010diff --git a/text/maps/celadon_gym.asm b/text/maps/celadon_gym.asm
7011old mode 100644
7012new mode 100755
7013diff --git a/text/maps/celadon_hotel.asm b/text/maps/celadon_hotel.asm
7014old mode 100644
7015new mode 100755
7016diff --git a/text/maps/celadon_house.asm b/text/maps/celadon_house.asm
7017old mode 100644
7018new mode 100755
7019diff --git a/text/maps/celadon_mansion_1f.asm b/text/maps/celadon_mansion_1f.asm
7020old mode 100644
7021new mode 100755
7022diff --git a/text/maps/celadon_mansion_2f.asm b/text/maps/celadon_mansion_2f.asm
7023old mode 100644
7024new mode 100755
7025diff --git a/text/maps/celadon_mansion_3f.asm b/text/maps/celadon_mansion_3f.asm
7026old mode 100644
7027new mode 100755
7028diff --git a/text/maps/celadon_mansion_4f_inside.asm b/text/maps/celadon_mansion_4f_inside.asm
7029old mode 100644
7030new mode 100755
7031diff --git a/text/maps/celadon_mansion_4f_outside.asm b/text/maps/celadon_mansion_4f_outside.asm
7032old mode 100644
7033new mode 100755
7034diff --git a/text/maps/celadon_pokecenter.asm b/text/maps/celadon_pokecenter.asm
7035old mode 100644
7036new mode 100755
7037diff --git a/text/maps/celadon_prize_room.asm b/text/maps/celadon_prize_room.asm
7038old mode 100644
7039new mode 100755
7040diff --git a/text/maps/cerulean_badge_house_1.asm b/text/maps/cerulean_badge_house_1.asm
7041old mode 100644
7042new mode 100755
7043diff --git a/text/maps/cerulean_city.asm b/text/maps/cerulean_city.asm
7044old mode 100644
7045new mode 100755
7046diff --git a/text/maps/cerulean_gym.asm b/text/maps/cerulean_gym.asm
7047old mode 100644
7048new mode 100755
7049diff --git a/text/maps/cerulean_mart.asm b/text/maps/cerulean_mart.asm
7050old mode 100644
7051new mode 100755
7052diff --git a/text/maps/cerulean_pokecenter.asm b/text/maps/cerulean_pokecenter.asm
7053old mode 100644
7054new mode 100755
7055diff --git a/text/maps/cerulean_trade_house.asm b/text/maps/cerulean_trade_house.asm
7056old mode 100644
7057new mode 100755
7058diff --git a/text/maps/cerulean_trashed_house.asm b/text/maps/cerulean_trashed_house.asm
7059old mode 100644
7060new mode 100755
7061diff --git a/text/maps/champion.asm b/text/maps/champion.asm
7062old mode 100644
7063new mode 100755
7064diff --git a/text/maps/cinnabar_gym.asm b/text/maps/cinnabar_gym.asm
7065old mode 100644
7066new mode 100755
7067diff --git a/text/maps/cinnabar_island.asm b/text/maps/cinnabar_island.asm
7068old mode 100644
7069new mode 100755
7070diff --git a/text/maps/cinnabar_lab.asm b/text/maps/cinnabar_lab.asm
7071old mode 100644
7072new mode 100755
7073diff --git a/text/maps/cinnabar_lab_fossil_room.asm b/text/maps/cinnabar_lab_fossil_room.asm
7074old mode 100644
7075new mode 100755
7076diff --git a/text/maps/cinnabar_lab_metronome_room.asm b/text/maps/cinnabar_lab_metronome_room.asm
7077old mode 100644
7078new mode 100755
7079diff --git a/text/maps/cinnabar_lab_trade_room.asm b/text/maps/cinnabar_lab_trade_room.asm
7080old mode 100644
7081new mode 100755
7082diff --git a/text/maps/cinnabar_mart.asm b/text/maps/cinnabar_mart.asm
7083old mode 100644
7084new mode 100755
7085diff --git a/text/maps/cinnabar_pokecenter.asm b/text/maps/cinnabar_pokecenter.asm
7086old mode 100644
7087new mode 100755
7088diff --git a/text/maps/copycats_house_1f.asm b/text/maps/copycats_house_1f.asm
7089old mode 100644
7090new mode 100755
7091diff --git a/text/maps/copycats_house_2f.asm b/text/maps/copycats_house_2f.asm
7092old mode 100644
7093new mode 100755
7094diff --git a/text/maps/daycare.asm b/text/maps/daycare.asm
7095old mode 100644
7096new mode 100755
7097diff --git a/text/maps/digletts_cave_route_11_entrance.asm b/text/maps/digletts_cave_route_11_entrance.asm
7098old mode 100644
7099new mode 100755
7100diff --git a/text/maps/digletts_cave_route_2_entrance.asm b/text/maps/digletts_cave_route_2_entrance.asm
7101old mode 100644
7102new mode 100755
7103diff --git a/text/maps/fan_club.asm b/text/maps/fan_club.asm
7104old mode 100644
7105new mode 100755
7106diff --git a/text/maps/fighting_dojo.asm b/text/maps/fighting_dojo.asm
7107old mode 100644
7108new mode 100755
7109diff --git a/text/maps/fuchsia_city.asm b/text/maps/fuchsia_city.asm
7110old mode 100644
7111new mode 100755
7112diff --git a/text/maps/fuchsia_fishing_house.asm b/text/maps/fuchsia_fishing_house.asm
7113old mode 100644
7114new mode 100755
7115diff --git a/text/maps/fuchsia_gym.asm b/text/maps/fuchsia_gym.asm
7116old mode 100644
7117new mode 100755
7118diff --git a/text/maps/fuchsia_house.asm b/text/maps/fuchsia_house.asm
7119old mode 100644
7120new mode 100755
7121diff --git a/text/maps/fuchsia_mart.asm b/text/maps/fuchsia_mart.asm
7122old mode 100644
7123new mode 100755
7124diff --git a/text/maps/fuchsia_meeting_room.asm b/text/maps/fuchsia_meeting_room.asm
7125old mode 100644
7126new mode 100755
7127diff --git a/text/maps/fuchsia_pokecenter.asm b/text/maps/fuchsia_pokecenter.asm
7128old mode 100644
7129new mode 100755
7130diff --git a/text/maps/fujis_house.asm b/text/maps/fujis_house.asm
7131old mode 100644
7132new mode 100755
7133diff --git a/text/maps/hall_of_fame.asm b/text/maps/hall_of_fame.asm
7134old mode 100644
7135new mode 100755
7136diff --git a/text/maps/indigo_plateau_lobby.asm b/text/maps/indigo_plateau_lobby.asm
7137old mode 100644
7138new mode 100755
7139diff --git a/text/maps/lance.asm b/text/maps/lance.asm
7140old mode 100644
7141new mode 100755
7142diff --git a/text/maps/lavender_house.asm b/text/maps/lavender_house.asm
7143old mode 100644
7144new mode 100755
7145diff --git a/text/maps/lavender_mart.asm b/text/maps/lavender_mart.asm
7146old mode 100644
7147new mode 100755
7148diff --git a/text/maps/lavender_pokecenter.asm b/text/maps/lavender_pokecenter.asm
7149old mode 100644
7150new mode 100755
7151diff --git a/text/maps/lavender_town.asm b/text/maps/lavender_town.asm
7152old mode 100644
7153new mode 100755
7154diff --git a/text/maps/lorelei.asm b/text/maps/lorelei.asm
7155old mode 100644
7156new mode 100755
7157diff --git a/text/maps/mansion_1f.asm b/text/maps/mansion_1f.asm
7158old mode 100644
7159new mode 100755
7160diff --git a/text/maps/mansion_2f.asm b/text/maps/mansion_2f.asm
7161old mode 100644
7162new mode 100755
7163diff --git a/text/maps/mansion_3f.asm b/text/maps/mansion_3f.asm
7164old mode 100644
7165new mode 100755
7166diff --git a/text/maps/mansion_b1f.asm b/text/maps/mansion_b1f.asm
7167old mode 100644
7168new mode 100755
7169diff --git a/text/maps/mr_psychics_house.asm b/text/maps/mr_psychics_house.asm
7170old mode 100644
7171new mode 100755
7172diff --git a/text/maps/mt_moon_1f.asm b/text/maps/mt_moon_1f.asm
7173old mode 100644
7174new mode 100755
7175diff --git a/text/maps/mt_moon_b1f.asm b/text/maps/mt_moon_b1f.asm
7176old mode 100644
7177new mode 100755
7178diff --git a/text/maps/mt_moon_b2f.asm b/text/maps/mt_moon_b2f.asm
7179old mode 100644
7180new mode 100755
7181diff --git a/text/maps/mt_moon_pokecenter.asm b/text/maps/mt_moon_pokecenter.asm
7182old mode 100644
7183new mode 100755
7184diff --git a/text/maps/museum_1f.asm b/text/maps/museum_1f.asm
7185old mode 100644
7186new mode 100755
7187diff --git a/text/maps/museum_2f.asm b/text/maps/museum_2f.asm
7188old mode 100644
7189new mode 100755
7190diff --git a/text/maps/name_rater.asm b/text/maps/name_rater.asm
7191old mode 100644
7192new mode 100755
7193diff --git a/text/maps/oaks_lab.asm b/text/maps/oaks_lab.asm
7194old mode 100644
7195new mode 100755
7196index 097fa931..231ea44a
7197--- a/text/maps/oaks_lab.asm
7198+++ b/text/maps/oaks_lab.asm
7199@@ -9,15 +9,16 @@ _OaksLabGaryText1::
7200 done
7201
7202 _OaksLabText40::
7203- text "<RIVAL>: Humph!"
7204- line "I'll get a better"
7205- cont "#MON than you!"
7206+ text "<RIVAL>: Pah!"
7207+ line "Ich werde ein"
7208+ cont "besseres #MON"
7209+ cont "als Du erhalten!"
7210 done
7211
7212 _OaksLabText41::
7213- text "<RIVAL>: Heh, my"
7214- line "#MON looks a"
7215- cont "lot stronger."
7216+ text "<RIVAL>: Mein"
7217+ line "#MON sieht"
7218+ cont "viel stärker aus!"
7219 done
7220
7221 _OaksLabText39::
7222@@ -32,13 +33,16 @@ _OaksLabPikachuText::
7223 done
7224
7225 _OaksLabText_1d2f5::
7226- text "OAK: If a wild"
7227- line "#MON appears,"
7228- cont "your #MON can"
7229- cont "fight against it!"
7230-
7231- para "Afterward, go on"
7232- line "to the next town."
7233+ text "PROF. EICH: Wenn"
7234+ line "Du auf ein wildes"
7235+ cont "#MON triffst,"
7236+ cont "dann kann Dein"
7237+ cont "#MON dagegen"
7238+ cont "kämpfen!"
7239+
7240+ para "Gehe danach in"
7241+ line "die nächste"
7242+ cont "Stadt!"
7243 done
7244
7245 _OaksLabText_1d2fa::
7246@@ -48,40 +52,46 @@ _OaksLabText_1d2fa::
7247 done
7248
7249 _OaksLabDeliverParcelText1::
7250- text "OAK: Oh, <PLAYER>!"
7251+ text "PROF. EICH:"
7252+ line "Hallo, <PLAYER>!"
7253
7254- para "How is my old"
7255- line "#MON?"
7256+ para "Wie geht es"
7257+ line "dem #MON?"
7258
7259- para "Well, it seems to"
7260- line "like you a lot."
7261+ para "Es scheint Dich"
7262+ line "sehr zu mögen!"
7263
7264- para "You must be"
7265- line "talented as a"
7266- cont "#MON trainer!"
7267+ para "Du musst als"
7268+ line "#MON-TRAINER"
7269+ cont "sehr talentiert"
7270+ cont "sein!"
7271
7272- para "What? You have"
7273- line "something for me?"
7274+ para "Du hast etwas"
7275+ line "für mich?"
7276
7277- para "<PLAYER> delivered"
7278- line "OAK's PARCEL.@@"
7279+ para "<PLAYER> übergibt"
7280+ line "PROF. EICH das"
7281+ cont "PAKET.@@"
7282
7283 _OaksLabDeliverParcelText2::
7284 text ""
7285- para "Ah! This is the"
7286- line "custom # BALL"
7287- cont "I ordered!"
7288- cont "Thanks, <PLAYER>!"
7289-
7290- para "By the way, I must"
7291- line "ask you to do"
7292- cont "something for me."
7293+ para "Ah! Auf diesen"
7294+ line "SPEZIAL-#BALL"
7295+ cont "warte ich schon"
7296+ cont "lange! Danke,"
7297+ cont "<PLAYER>!"
7298+
7299+ para "Ich möchte Dich"
7300+ line "noch bitten, mir"
7301+ cont "einen Gefallen"
7302+ cont "zu tun."
7303 done
7304
7305 _OaksLabAroundWorldText::
7306- text "#MON around the"
7307- line "world wait for"
7308- cont "you, <PLAYER>!"
7309+ text "<PLAYER>,"
7310+ line "überall in dieser"
7311+ cont "Welt erwarten"
7312+ cont "Dich #MON!"
7313 done
7314
7315 _OaksLabGivePokeballsText1::
7316@@ -145,104 +155,111 @@ _OaksLabText8::
7317 done
7318
7319 _OaksLabText_1d340::
7320- text "PROF.OAK is the"
7321- line "authority on"
7322- cont "#MON!"
7323-
7324- para "Many #MON"
7325- line "trainers hold him"
7326- cont "in high regard!"
7327+ text "PROF. EICH ist"
7328+ line "für #MON"
7329+ cont "eine Kapazität!"
7330+
7331+ para "Unter #MON-"
7332+ line "TRAINERN geniesst"
7333+ cont "er ein sehr hohes"
7334+ cont "Ansehen!"
7335 done
7336
7337 _OaksLabRivalWaitingText::
7338- text "<RIVAL>: Gramps!"
7339- line "I'm fed up with"
7340- cont "waiting!"
7341+ text "<RIVAL>: Opa!"
7342+ line "Ich will nicht"
7343+ cont "länger warten!"
7344 done
7345
7346 _OaksLabChooseMonText::
7347- text "OAK: Hmm? <RIVAL>?"
7348- line "Why are you here"
7349- cont "already?"
7350+ text "PROF. EICH:"
7351+ line "<RIVAL>? Du bist"
7352+ cont "früh dran...?"
7353
7354- para "I said for you to"
7355- line "come by later..."
7356+ para "Du solltest doch"
7357+ line "erst später"
7358+ cont "kommen..."
7359
7360- para "Ah, whatever!"
7361- line "Just wait there."
7362+ para "Naja, egal. Warte"
7363+ line "einen Moment."
7364
7365- para "Look, <PLAYER>! Do"
7366- line "you see that ball"
7367- cont "on the table?"
7368+ para "Siehst Du dort"
7369+ line "den Ball auf dem"
7370+ cont "Tisch liegen,"
7371+ cont "<PLAYER>?"
7372
7373- para "It's called a #"
7374- line "BALL. It holds a"
7375- cont "#MON inside."
7376+ para "Das ist ein"
7377+ line "#BALL. Darin"
7378+ cont "befindet sich ein"
7379+ cont "#MON."
7380
7381- para "You may have it!"
7382- line "Go on, take it!"
7383+ para "Ich schenke es"
7384+ line "Dir, nimm es Dir"
7385+ cont "ruhig!"
7386 done
7387
7388 _OaksLabRivalInterjectionText::
7389- text "<RIVAL>: Hey!"
7390- line "Gramps! What"
7391- cont "about me?"
7392+ text "<RIVAL>: Halt!"
7393+ line "Opa! Und was ist"
7394+ cont "mit mir?"
7395 done
7396
7397 _OaksLabBePatientText::
7398- text "OAK: Be patient,"
7399- line "<RIVAL>, I'll give"
7400- cont "you one later."
7401+ text "EICH: Habe einen"
7402+ line "Moment Geduld,"
7403+ cont "<RIVAL>. Ich gebe"
7404+ cont "Dir später eines."
7405 done
7406
7407 _OaksLabRivalTakesText1::
7408- text "<RIVAL>: No way!"
7409- line "<PLAYER>, I want"
7410- cont "this #MON!"
7411+ text "<RIVAL>: Nein!"
7412+ line "<PLAYER>, ich will"
7413+ cont "dieses #MON!"
7414 prompt
7415
7416 _OaksLabRivalTakesText2::
7417- text "<RIVAL> snatched"
7418- line "the #MON!@@"
7419+ text "<RIVAL> schnappt"
7420+ line "sich das #MON!@@"
7421
7422 _OaksLabRivalTakesText3::
7423- text "OAK: <RIVAL>! What"
7424- line "are you doing?"
7425+ text "EICH: <RIVAL>!"
7426+ line "Was soll das?"
7427 prompt
7428
7429 _OaksLabRivalTakesText4::
7430- text "<RIVAL>: Gramps, I"
7431- line "want this one!"
7432+ text "<RIVAL>: Bitte,"
7433+ line "Opa! Ich möchte"
7434+ cont "dieses #MON!"
7435 prompt
7436
7437 _OaksLabRivalTakesText5::
7438- text "OAK: But, I... Oh,"
7439- line "all right then."
7440- cont "That #MON is"
7441- cont "yours."
7442+ text "EICH: Aber..."
7443+ line "Hmm. OK. Behalte"
7444+ cont "dieses #MON."
7445+ cont "Es ist Deines."
7446
7447- para "I was going to"
7448- line "give you one"
7449- cont "anyway..."
7450+ para "Ich hätte Dir"
7451+ line "sowieso eines"
7452+ cont "gegeben..."
7453
7454- para "<PLAYER>, come over"
7455- line "here."
7456+ para "<PLAYER>, komm zu"
7457+ line "mir herüber."
7458 done
7459
7460 _OaksLabOakGivesText::
7461- text "OAK: <PLAYER>, this"
7462- line "is the #MON I"
7463- cont "caught earlier."
7464-
7465- para "You can have it."
7466- line "I caught it in"
7467- cont "the wild and it's"
7468- cont "not tame yet."
7469+ text "OAK: <PLAYER>,"
7470+ line "ich habe noch ein"
7471+ cont "#MON gefangen!"
7472+
7473+ para "Ich gebe es Dir."
7474+ line "Allerdings ist es"
7475+ cont "ein ungezähmtes,"
7476+ cont "wildes #MON."
7477 prompt
7478
7479 _OaksLabReceivedText::
7480- text "<PLAYER> received"
7481- line "a @"
7482+ text "<PLAYER> erhält"
7483+ line "ein @"
7484 TX_RAM wcd6d
7485 text "!@@"
7486
7487@@ -252,20 +269,22 @@ _OaksLabLeavingText::
7488 done
7489
7490 _OaksLabRivalChallengeText::
7491- text "<RIVAL>: Wait"
7492+ text "<RIVAL>: Warte,"
7493 line "<PLAYER>!"
7494- cont "Let's check out"
7495- cont "our #MON!"
7496+ cont "Lass uns unsere"
7497+ cont "#MON testen!"
7498
7499- para "Come on, I'll take"
7500- line "you on!"
7501+ para "Komm schon!"
7502+ line "Ich fordere Dich"
7503+ cont "heraus!"
7504 done
7505
7506 _OaksLabText_1d3be::
7507- text "WHAT?"
7508- line "Unbelievable!"
7509- cont "I picked the"
7510- cont "wrong #MON!"
7511+ text "WAS?"
7512+ line "Unmöglich! Ich"
7513+ cont "habe mir das"
7514+ cont "falsche #MON"
7515+ cont "ausgesucht!"
7516 prompt
7517
7518 _OaksLabText_1d3c3::
7519@@ -274,123 +293,141 @@ _OaksLabText_1d3c3::
7520 prompt
7521
7522 _OaksLabRivalToughenUpText::
7523- text "<RIVAL>: Okay!"
7524- line "I'll make my"
7525- cont "#MON fight to"
7526- cont "toughen it up!"
7527-
7528- para "<PLAYER>! Gramps!"
7529- line "Smell you later!"
7530+ text "<RIVAL>: OK!"
7531+ line "Ich werde mein"
7532+ cont "#MON"
7533+ cont "trainieren, damit"
7534+ cont "es stärker wird!"
7535+
7536+ para "<PLAYER>! Opa!"
7537+ line "Wir sehen uns"
7538+ cont "später!"
7539 done
7540
7541 _OaksLabPikachuDislikesPokeballsText1::
7542- text "OAK: What?"
7543+ text "EICH: Wie bitte?"
7544 done
7545
7546 _OaksLabPikachuDislikesPokeballsText2::
7547- text "OAK: Would you"
7548- line "look at that!"
7549+ text "EICH: Schau Dir"
7550+ line "das an!"
7551
7552- para "It's odd, but it"
7553- line "appears that your"
7554- cont "PIKACHU dislikes"
7555- cont "# BALLs."
7556+ para "Es ist seltsam,"
7557+ line "aber Dein PIKACHU"
7558+ cont "mag scheinbar"
7559+ cont "keine #BÄLLE."
7560
7561- para "You should just"
7562- line "keep it with you."
7563+ para "Es muss Dich"
7564+ line "so begleiten."
7565
7566- para "That should make"
7567- line "it happy!"
7568+ para "Dann ist es"
7569+ line "auch glücklich."
7570
7571- para "You can talk to it"
7572- line "and see how it"
7573- cont "feels about you."
7574+ para "Du kannst mit ihm"
7575+ line "sprechen und"
7576+ cont "merkst dann, ob"
7577+ cont "es Dich mag."
7578 done
7579
7580 _OaksLabText21::
7581- text "<RIVAL>: Gramps!"
7582+ text "<RIVAL>: Opa!"
7583 done
7584
7585 _OaksLabText22::
7586- text "<RIVAL>: Gramps,"
7587- line "my #MON has"
7588- cont "grown stronger!"
7589- cont "Check it out!"
7590+ text "<RIVAL>: Opa,"
7591+ line "mein #MON ist"
7592+ cont "stärker geworden!"
7593+ cont "Schau es Dir an!"
7594 done
7595
7596 _OaksLabText23::
7597- text "OAK: Ah, <RIVAL>,"
7598- line "good timing!"
7599+ text "EICH: Ah, <RIVAL>,"
7600+ line "Du kommst genau"
7601+ cont "zur rechten Zeit."
7602
7603- para "I needed to ask"
7604- line "both of you to do"
7605- cont "something for me."
7606+ para "Ich möchte Euch"
7607+ line "um einen grossen"
7608+ cont "Gefallen bitten."
7609 done
7610
7611 _OaksLabText24::
7612- text "On the desk there"
7613- line "is my invention,"
7614+ text "Auf dem Tisch"
7615+ line "dort seht Ihr"
7616+ cont "eine Erfindung"
7617+ cont "von mir, den"
7618 cont "#DEX!"
7619
7620- para "It automatically"
7621- line "records data on"
7622- cont "#MON you've"
7623- cont "seen or caught!"
7624+ para "Er erfasst"
7625+ line "automatisch Daten"
7626+ cont "über #MON,"
7627+ cont "die man gefangen"
7628+ cont "oder gesehen hat!"
7629
7630- para "It's a hi-tech"
7631- line "encyclopedia!"
7632+ para "Er ist eine Art"
7633+ line "Hi-Tech-Lexikon!"
7634 done
7635
7636 _OaksLabText25::
7637- text "OAK: <PLAYER> and"
7638- line "<RIVAL>! Take"
7639- cont "these with you!"
7640+ text "PROF. EICH:"
7641+ line "<PLAYER>! <RIVAL>!"
7642+ cont "Diese beiden sind"
7643+ cont "für Euch!"
7644
7645- para "<PLAYER> got"
7646- line "#DEX from OAK!@@"
7647+ para "<PLAYER> erhält"
7648+ line "einen #DEX von"
7649+ cont "PROF. EICH!@@"
7650
7651 _OaksLabText26::
7652- text "To make a complete"
7653- line "guide on all the"
7654- cont "#MON in the"
7655- cont "world..."
7656+ text "Ein Lexikon über"
7657+ line "alle #MON der"
7658+ cont "Welt..."
7659
7660- para "That was my dream!"
7661+ para "Das war immer"
7662+ line "mein Traum!"
7663
7664- para "But, I'm too old!"
7665- line "I can't do it!"
7666+ para "Aber ich bin zu"
7667+ line "alt! Ich schaffe"
7668+ cont "es nicht mehr!"
7669
7670- para "So, I want you two"
7671- line "to fulfill my"
7672- cont "dream for me!"
7673+ para "Also bitte ich"
7674+ line "Euch, meinen"
7675+ cont "Traum zu"
7676+ cont "verwirklichen!"
7677
7678- para "Get moving, you"
7679- line "two!"
7680+ para "Macht Euch auf"
7681+ line "den Weg, Jungs!"
7682
7683- para "This is a great"
7684- line "undertaking in"
7685- cont "#MON history!"
7686+ para "Dies ist eines"
7687+ line "der bedeutendsten"
7688+ cont "Projekte in der"
7689+ cont "Geschichte der"
7690+ cont "#MON!"
7691 done
7692
7693 _OaksLabText27::
7694- text "<RIVAL>: Alright"
7695- line "Gramps! Leave it"
7696- cont "all to me!"
7697-
7698- para "<PLAYER>, I hate to"
7699- line "say it, but I"
7700- cont "don't need you!"
7701-
7702- para "I know! I'll"
7703- line "borrow a TOWN MAP"
7704- cont "from my sis!"
7705-
7706- para "I'll tell her not"
7707- line "to lend you one,"
7708+ text "<RIVAL>:"
7709+ line "Alles klar, Opa!"
7710+ cont "überlass es"
7711+ cont "ruhig mir!"
7712+
7713+ para "<PLAYER>, es tut"
7714+ line "mir leid, aber"
7715+ cont "ich brauche Deine"
7716+ cont "Hilfe nicht!"
7717+
7718+ para "Ich hab's! Ich"
7719+ line "leihe mir von"
7720+ cont "meiner Schwester"
7721+ cont "eine KARTE!"
7722+
7723+ para "Und Dir soll sie"
7724+ line "keine geben,"
7725 cont "<PLAYER>! Hahaha!"
7726 done
7727
7728 _OaksLabText_1d405::
7729- text "I study #MON as"
7730- line "PROF.OAK's AIDE."
7731+ text "Ich bin PROF."
7732+ line "EICHS Gehilfe."
7733+ cont "Ich studiere mit"
7734+ cont "ihm die #MON!"
7735 done
7736diff --git a/text/maps/pallet_town.asm b/text/maps/pallet_town.asm
7737old mode 100644
7738new mode 100755
7739index 741ad529..8f8024dd
7740--- a/text/maps/pallet_town.asm
7741+++ b/text/maps/pallet_town.asm
7742@@ -1,61 +1,64 @@
7743 _OakAppearsText::
7744- text "OAK: Hey! Wait!"
7745- line "Don't go out!@@"
7746+ text "EICH: Warte!"
7747+ line "Geh nicht raus!@@"
7748
7749 _OakWalksUpText::
7750- text "OAK: That was"
7751- line "close!"
7752+ text "PROF. EICH:"
7753+ line "Das war knapp!"
7754
7755- para "Wild #MON live"
7756- line "in tall grass!"
7757+ para "Wilde #MON"
7758+ line "leben in hohem"
7759+ cont "Gras!"
7760 done
7761
7762 _OakWhewText::
7763- text "OAK: Whew..."
7764+ text "PROF. Eich: Puuh!"
7765 done
7766
7767 _OakGrassText::
7768- text "OAK: A #MON can"
7769- line "appear anytime in"
7770- cont "tall grass."
7771+ text "PROF. EICH:"
7772+ line "Wilde #MON"
7773+ cont "können jederzeit"
7774+ cont "auftauchen!"
7775
7776- para "You need your own"
7777- line "#MON for your"
7778- cont "protection."
7779- cont "I know!"
7780+ para "Du brauchst eigene"
7781+ line "#MON, um"
7782+ cont "Dich zu schützen."
7783
7784- para "Here, come with"
7785- line "me!"
7786+ para "Komm, folge"
7787+ line "mir!"
7788 done
7789
7790 _PalletTownText2::
7791- text "I'm raising"
7792- line "#MON too!"
7793+ text "Auch ich ziehe"
7794+ line "#MON auf!"
7795
7796- para "When they get"
7797- line "strong, they can"
7798- cont "protect me!"
7799+ para "Wenn sie stark"
7800+ line "sind, können sie"
7801+ cont "mich beschützen!"
7802 done
7803
7804 _PalletTownText3::
7805- text "Technology is"
7806- line "incredible!"
7807+ text "Die Technik"
7808+ line "heutzutage ist"
7809+ cont "unglaublich!"
7810
7811- para "You can now store"
7812- line "and recall items"
7813- cont "and #MON as"
7814- cont "data via PC!"
7815+ para "Man kann sogar"
7816+ line "Items und #MON"
7817+ cont "via PC lagern und"
7818+ cont "wieder abrufen!"
7819 done
7820
7821 _PalletTownText4::
7822- text "OAK #MON"
7823- line "RESEARCH LAB"
7824+ text "PROFESSOR EICH"
7825+ line "#MON-LABOR"
7826 done
7827
7828 _PalletTownText5::
7829- text "PALLET TOWN"
7830- line "Shades of your"
7831- cont "journey await!"
7832+ text "ALABASTIA"
7833+ line "Dich erwarten"
7834+ cont "aufregende"
7835+ cont "Abenteuer!"
7836 done
7837
7838 _PalletTownText6::
7839diff --git a/text/maps/pewter_city.asm b/text/maps/pewter_city.asm
7840old mode 100644
7841new mode 100755
7842diff --git a/text/maps/pewter_gym.asm b/text/maps/pewter_gym.asm
7843old mode 100644
7844new mode 100755
7845diff --git a/text/maps/pewter_house_1.asm b/text/maps/pewter_house_1.asm
7846old mode 100644
7847new mode 100755
7848diff --git a/text/maps/pewter_house_2.asm b/text/maps/pewter_house_2.asm
7849old mode 100644
7850new mode 100755
7851diff --git a/text/maps/pewter_mart.asm b/text/maps/pewter_mart.asm
7852old mode 100644
7853new mode 100755
7854diff --git a/text/maps/pewter_pokecenter.asm b/text/maps/pewter_pokecenter.asm
7855old mode 100644
7856new mode 100755
7857diff --git a/text/maps/pokemon_league_gate.asm b/text/maps/pokemon_league_gate.asm
7858old mode 100644
7859new mode 100755
7860diff --git a/text/maps/pokemon_tower_1f.asm b/text/maps/pokemon_tower_1f.asm
7861old mode 100644
7862new mode 100755
7863diff --git a/text/maps/pokemon_tower_2f.asm b/text/maps/pokemon_tower_2f.asm
7864old mode 100644
7865new mode 100755
7866diff --git a/text/maps/pokemon_tower_3f.asm b/text/maps/pokemon_tower_3f.asm
7867old mode 100644
7868new mode 100755
7869diff --git a/text/maps/pokemon_tower_4f.asm b/text/maps/pokemon_tower_4f.asm
7870old mode 100644
7871new mode 100755
7872diff --git a/text/maps/pokemon_tower_5f.asm b/text/maps/pokemon_tower_5f.asm
7873old mode 100644
7874new mode 100755
7875diff --git a/text/maps/pokemon_tower_6f.asm b/text/maps/pokemon_tower_6f.asm
7876old mode 100644
7877new mode 100755
7878diff --git a/text/maps/pokemon_tower_7f.asm b/text/maps/pokemon_tower_7f.asm
7879old mode 100644
7880new mode 100755
7881diff --git a/text/maps/power_plant.asm b/text/maps/power_plant.asm
7882old mode 100644
7883new mode 100755
7884diff --git a/text/maps/reds_house_1f.asm b/text/maps/reds_house_1f.asm
7885old mode 100644
7886new mode 100755
7887index 633075bb..7d3ec2ee
7888--- a/text/maps/reds_house_1f.asm
7889+++ b/text/maps/reds_house_1f.asm
7890@@ -1,42 +1,50 @@
7891 _MomWakeUpText::
7892- text "MOM: Right."
7893- line "All boys leave"
7894- cont "home someday."
7895- cont "It said so on TV."
7896+ text "MUTTER: Richtig."
7897+ line "Irgendwann gehen"
7898+ cont "alle JUNGEN fort,"
7899+ cont "um ein Abenteuer"
7900+ cont "zu erleben!"
7901
7902- para "PROF.OAK, next"
7903- line "door, is looking"
7904- cont "for you."
7905+ para "PROF. EICH von"
7906+ line "nebenan hat nach"
7907+ cont "Dir gefragt."
7908 done
7909
7910 _MomHealText1::
7911- text "MOM: <PLAYER>, if"
7912- line "you drive your"
7913- cont "#MON too hard,"
7914- cont "they'll dislike"
7915- cont "you."
7916+ text "MUTTER: <PLAYER>!"
7917+ line "Wenn Du zu hart"
7918+ cont "zu Deinen #MON"
7919+ cont "bist, werden sie"
7920+ cont "nicht zutraulich!"
7921
7922- para "You should take a"
7923- line "rest."
7924+ para "Du solltest eine"
7925+ line "kurze Pause"
7926+ cont "einlegen."
7927 prompt
7928
7929 _MomHealText2::
7930- text "MOM: Oh good!"
7931- line "You and your"
7932- cont "#MON are"
7933- cont "looking great!"
7934- cont "Take care now!"
7935+ text "MUTTER: sehr gut!"
7936+ line "Du und Deine"
7937+ cont "#MON sehen"
7938+ cont "grossartig aus!"
7939+ cont "Achte auf Dich!"
7940 done
7941
7942 _StandByMeText::
7943- text "There's a movie"
7944- line "on TV. Four boys"
7945- cont "are walking on"
7946- cont "railroad tracks."
7947+ text "Im Fernsehen"
7948+ line "läuft ein Film."
7949+ cont "Vier JUNGEN"
7950+ cont "laufen ein"
7951+ cont "Bahngleis"
7952+ cont "entlang!"
7953
7954- para "I better go too."
7955+ para "Den Film kenne"
7956+ line "ich schon! Ich"
7957+ cont "mache mich besser"
7958+ cont "auf den Weg!"
7959 done
7960
7961 _TVWrongSideText::
7962- text "Oops, wrong side."
7963+ text "Ups,"
7964+ line "falsche Richtung!"
7965 done
7966diff --git a/text/maps/rock_tunnel_b1f.asm b/text/maps/rock_tunnel_b1f.asm
7967old mode 100644
7968new mode 100755
7969diff --git a/text/maps/rock_tunnel_b2f.asm b/text/maps/rock_tunnel_b2f.asm
7970old mode 100644
7971new mode 100755
7972diff --git a/text/maps/rock_tunnel_pokecenter.asm b/text/maps/rock_tunnel_pokecenter.asm
7973old mode 100644
7974new mode 100755
7975diff --git a/text/maps/rocket_hideout_b1f.asm b/text/maps/rocket_hideout_b1f.asm
7976old mode 100644
7977new mode 100755
7978diff --git a/text/maps/rocket_hideout_b2f.asm b/text/maps/rocket_hideout_b2f.asm
7979old mode 100644
7980new mode 100755
7981diff --git a/text/maps/rocket_hideout_b3f.asm b/text/maps/rocket_hideout_b3f.asm
7982old mode 100644
7983new mode 100755
7984diff --git a/text/maps/rocket_hideout_b4f.asm b/text/maps/rocket_hideout_b4f.asm
7985old mode 100644
7986new mode 100755
7987diff --git a/text/maps/rocket_hideout_elevator.asm b/text/maps/rocket_hideout_elevator.asm
7988old mode 100644
7989new mode 100755
7990diff --git a/text/maps/route_1.asm b/text/maps/route_1.asm
7991old mode 100644
7992new mode 100755
7993index adffd705..8e1a1039
7994--- a/text/maps/route_1.asm
7995+++ b/text/maps/route_1.asm
7996@@ -1,27 +1,31 @@
7997 _Route1ViridianMartSampleText::
7998- text "Hi! I work at a"
7999- line "#MON MART."
8000-
8001- para "It's a convenient"
8002- line "shop, so please"
8003- cont "visit us in"
8004- cont "VIRIDIAN CITY."
8005-
8006- para "I know, I'll give"
8007- line "you a sample!"
8008- cont "Here you go!"
8009+ text "Hi! Ich arbeite"
8010+ line "in einem"
8011+ cont "PKMN-SUPERMARKT."
8012+
8013+ para "Wir verkaufen"
8014+ line "viele praktische"
8015+ cont "Dinge! Du findest"
8016+ cont "unseren Laden in"
8017+ cont "VERTANIA CITY."
8018+
8019+ para "Am besten gebe"
8020+ line "ich Dir ein"
8021+ cont "Werbegeschenk!"
8022+ cont "Hier, bitte!"
8023 prompt
8024
8025 _Route1Text_1cae8::
8026- text $52, " got"
8027+ text $52, " erhält"
8028 line "@"
8029 TX_RAM wcf4b
8030 text "!@@"
8031
8032 _Route1Text_1caee::
8033- text "We also carry"
8034- line "# BALLs for"
8035- cont "catching #MON!"
8036+ text "Willst Du #MON"
8037+ line "fangen? Wir haben"
8038+ cont "auch #BÄLLE"
8039+ cont "im Sortiment!"
8040 done
8041
8042 _Route1Text_1caf3::
8043@@ -30,20 +34,21 @@ _Route1Text_1caf3::
8044 done
8045
8046 _Route1Text2::
8047- text "See those ledges"
8048- line "along the road?"
8049+ text "Siehst Du die"
8050+ line "Stufen hier?"
8051
8052- para "It's a bit scary,"
8053- line "but you can jump"
8054- cont "from them."
8055+ para "Du kannst nicht"
8056+ line "hinaufklettern,"
8057+ cont "dafür aber"
8058+ cont "herunterspringen!"
8059
8060- para "You can get back"
8061- line "to PALLET TOWN"
8062- cont "quicker that way."
8063+ para "So kommst Du viel"
8064+ line "schneller nach"
8065+ cont "ALABASTIA zurück."
8066 done
8067
8068 _Route1Text3::
8069 text "ROUTE 1"
8070- line "PALLET TOWN -"
8071- cont "VIRIDIAN CITY"
8072+ line "ALABASTIA -"
8073+ cont "VERTANIA CITY"
8074 done
8075diff --git a/text/maps/route_10.asm b/text/maps/route_10.asm
8076old mode 100644
8077new mode 100755
8078diff --git a/text/maps/route_11.asm b/text/maps/route_11.asm
8079old mode 100644
8080new mode 100755
8081diff --git a/text/maps/route_11_gate.asm b/text/maps/route_11_gate.asm
8082old mode 100644
8083new mode 100755
8084diff --git a/text/maps/route_11_gate_upstairs.asm b/text/maps/route_11_gate_upstairs.asm
8085old mode 100644
8086new mode 100755
8087diff --git a/text/maps/route_12.asm b/text/maps/route_12.asm
8088old mode 100644
8089new mode 100755
8090diff --git a/text/maps/route_12_gate.asm b/text/maps/route_12_gate.asm
8091old mode 100644
8092new mode 100755
8093diff --git a/text/maps/route_12_gate_upstairs.asm b/text/maps/route_12_gate_upstairs.asm
8094old mode 100644
8095new mode 100755
8096diff --git a/text/maps/route_12_house.asm b/text/maps/route_12_house.asm
8097old mode 100644
8098new mode 100755
8099diff --git a/text/maps/route_13.asm b/text/maps/route_13.asm
8100old mode 100644
8101new mode 100755
8102diff --git a/text/maps/route_14.asm b/text/maps/route_14.asm
8103old mode 100644
8104new mode 100755
8105diff --git a/text/maps/route_15.asm b/text/maps/route_15.asm
8106old mode 100644
8107new mode 100755
8108diff --git a/text/maps/route_15_gate.asm b/text/maps/route_15_gate.asm
8109old mode 100644
8110new mode 100755
8111diff --git a/text/maps/route_15_gate_upstairs.asm b/text/maps/route_15_gate_upstairs.asm
8112old mode 100644
8113new mode 100755
8114diff --git a/text/maps/route_16.asm b/text/maps/route_16.asm
8115old mode 100644
8116new mode 100755
8117diff --git a/text/maps/route_16_gate.asm b/text/maps/route_16_gate.asm
8118old mode 100644
8119new mode 100755
8120diff --git a/text/maps/route_16_gate_upstairs.asm b/text/maps/route_16_gate_upstairs.asm
8121old mode 100644
8122new mode 100755
8123diff --git a/text/maps/route_16_house.asm b/text/maps/route_16_house.asm
8124old mode 100644
8125new mode 100755
8126diff --git a/text/maps/route_17.asm b/text/maps/route_17.asm
8127old mode 100644
8128new mode 100755
8129diff --git a/text/maps/route_18.asm b/text/maps/route_18.asm
8130old mode 100644
8131new mode 100755
8132diff --git a/text/maps/route_18_gate.asm b/text/maps/route_18_gate.asm
8133old mode 100644
8134new mode 100755
8135diff --git a/text/maps/route_18_gate_upstairs.asm b/text/maps/route_18_gate_upstairs.asm
8136old mode 100644
8137new mode 100755
8138diff --git a/text/maps/route_19.asm b/text/maps/route_19.asm
8139old mode 100644
8140new mode 100755
8141diff --git a/text/maps/route_2.asm b/text/maps/route_2.asm
8142old mode 100644
8143new mode 100755
8144diff --git a/text/maps/route_20.asm b/text/maps/route_20.asm
8145old mode 100644
8146new mode 100755
8147diff --git a/text/maps/route_21.asm b/text/maps/route_21.asm
8148old mode 100644
8149new mode 100755
8150diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm
8151old mode 100644
8152new mode 100755
8153index 342d5015..4d2bbe08
8154--- a/text/maps/route_22.asm
8155+++ b/text/maps/route_22.asm
8156@@ -35,33 +35,40 @@ _Route22RivalBeforeBattleText1::
8157 text $53, ": Hey!"
8158 line $52, "!"
8159
8160- para "You're going to"
8161- line "#MON LEAGUE?"
8162-
8163- para "Forget it! You"
8164- line "probably don't"
8165- cont "have any BADGEs!"
8166-
8167- para "The guard won't"
8168- line "let you through!"
8169-
8170- para "By the way, did"
8171- line "your #MON"
8172- cont "get any stronger?"
8173+ para "Bist Du auf"
8174+ line "dem Weg zur"
8175+ cont "PKMN-LIGA?"
8176+
8177+ para "Vergiss es!"
8178+ line "Wahrscheinlich"
8179+ cont "besitzt Du nicht"
8180+ cont "einmal einen"
8181+ cont "ORDEN!"
8182+
8183+ para "Die Wache wird"
8184+ line "Dich gar nicht"
8185+ cont "erst durchlassen!"
8186+
8187+ para "Ach, sind"
8188+ line "deine #MON"
8189+ cont "eigentlich"
8190+ cont "stärker geworden?"
8191 done
8192
8193 _Route22RivalAfterBattleText1::
8194- text "I heard #MON"
8195- line "LEAGUE has many"
8196- cont "tough trainers!"
8197-
8198- para "I have to figure"
8199- line "out how to get"
8200- cont "past them!"
8201-
8202- para "You should quit"
8203- line "dawdling and get"
8204- cont "a move on!"
8205+ text "In der PKMN-LIGA"
8206+ line "gibt es viele"
8207+ cont "starke Trainer!"
8208+
8209+ para "Ich muss einen Weg"
8210+ line "finden, an ihnen"
8211+ cont "vorbeizukommen."
8212+
8213+ para "Du solltest"
8214+ line "aufhören zu"
8215+ cont "bummeln und Dich"
8216+ cont "in Bewegung"
8217+ cont "setzen!"
8218 done
8219
8220 _Route22RivalBeforeBattleText2::
8221@@ -71,7 +78,7 @@ _Route22RivalBeforeBattleText2::
8222 cont "you here!"
8223
8224 para "So you're going to"
8225- line "#MON LEAGUE?"
8226+ line "#MON LEAGü?"
8227
8228 para "You collected all"
8229 line "the BADGEs too?"
8230@@ -80,7 +87,7 @@ _Route22RivalBeforeBattleText2::
8231 para "Then I'll whip"
8232 line "you, <PLAYER>, as"
8233 cont "a warmup for"
8234- cont "#MON LEAGUE!"
8235+ cont "#MON LEAGü!"
8236
8237 para "Come on!"
8238 done
8239@@ -88,7 +95,7 @@ _Route22RivalBeforeBattleText2::
8240 _Route22RivalAfterBattleText2::
8241 text "That loosened me"
8242 line "up! I'm ready for"
8243- cont "#MON LEAGUE!"
8244+ cont "#MON LEAGü!"
8245
8246 para $52, ", you need"
8247 line "more practice!"
8248@@ -99,6 +106,6 @@ _Route22RivalAfterBattleText2::
8249 done
8250
8251 _Route22FrontGateText::
8252- text "#MON LEAGUE"
8253- line "Front Gate"
8254+ text "PKMN-LIGA"
8255+ line "Haupteingang"
8256 done
8257diff --git a/text/maps/route_23.asm b/text/maps/route_23.asm
8258old mode 100644
8259new mode 100755
8260diff --git a/text/maps/route_24.asm b/text/maps/route_24.asm
8261old mode 100644
8262new mode 100755
8263diff --git a/text/maps/route_25.asm b/text/maps/route_25.asm
8264old mode 100644
8265new mode 100755
8266diff --git a/text/maps/route_2_gate.asm b/text/maps/route_2_gate.asm
8267old mode 100644
8268new mode 100755
8269diff --git a/text/maps/route_2_house.asm b/text/maps/route_2_house.asm
8270old mode 100644
8271new mode 100755
8272diff --git a/text/maps/route_3.asm b/text/maps/route_3.asm
8273old mode 100644
8274new mode 100755
8275diff --git a/text/maps/route_4.asm b/text/maps/route_4.asm
8276old mode 100644
8277new mode 100755
8278diff --git a/text/maps/route_5.asm b/text/maps/route_5.asm
8279old mode 100644
8280new mode 100755
8281diff --git a/text/maps/route_6.asm b/text/maps/route_6.asm
8282old mode 100644
8283new mode 100755
8284diff --git a/text/maps/route_7.asm b/text/maps/route_7.asm
8285old mode 100644
8286new mode 100755
8287diff --git a/text/maps/route_8.asm b/text/maps/route_8.asm
8288old mode 100644
8289new mode 100755
8290diff --git a/text/maps/route_9_1.asm b/text/maps/route_9_1.asm
8291old mode 100644
8292new mode 100755
8293diff --git a/text/maps/safari_zone_center.asm b/text/maps/safari_zone_center.asm
8294old mode 100644
8295new mode 100755
8296diff --git a/text/maps/safari_zone_east.asm b/text/maps/safari_zone_east.asm
8297old mode 100644
8298new mode 100755
8299diff --git a/text/maps/safari_zone_entrance.asm b/text/maps/safari_zone_entrance.asm
8300old mode 100644
8301new mode 100755
8302diff --git a/text/maps/safari_zone_north.asm b/text/maps/safari_zone_north.asm
8303old mode 100644
8304new mode 100755
8305diff --git a/text/maps/safari_zone_rest_house_1.asm b/text/maps/safari_zone_rest_house_1.asm
8306old mode 100644
8307new mode 100755
8308diff --git a/text/maps/safari_zone_rest_house_2.asm b/text/maps/safari_zone_rest_house_2.asm
8309old mode 100644
8310new mode 100755
8311diff --git a/text/maps/safari_zone_rest_house_3.asm b/text/maps/safari_zone_rest_house_3.asm
8312old mode 100644
8313new mode 100755
8314diff --git a/text/maps/safari_zone_rest_house_4.asm b/text/maps/safari_zone_rest_house_4.asm
8315old mode 100644
8316new mode 100755
8317diff --git a/text/maps/safari_zone_secret_house.asm b/text/maps/safari_zone_secret_house.asm
8318old mode 100644
8319new mode 100755
8320diff --git a/text/maps/safari_zone_west.asm b/text/maps/safari_zone_west.asm
8321old mode 100644
8322new mode 100755
8323diff --git a/text/maps/saffron_city.asm b/text/maps/saffron_city.asm
8324old mode 100644
8325new mode 100755
8326diff --git a/text/maps/saffron_gates.asm b/text/maps/saffron_gates.asm
8327old mode 100644
8328new mode 100755
8329diff --git a/text/maps/saffron_gym.asm b/text/maps/saffron_gym.asm
8330old mode 100644
8331new mode 100755
8332diff --git a/text/maps/saffron_house.asm b/text/maps/saffron_house.asm
8333old mode 100644
8334new mode 100755
8335diff --git a/text/maps/saffron_mart.asm b/text/maps/saffron_mart.asm
8336old mode 100644
8337new mode 100755
8338diff --git a/text/maps/saffron_pokecenter.asm b/text/maps/saffron_pokecenter.asm
8339old mode 100644
8340new mode 100755
8341diff --git a/text/maps/school.asm b/text/maps/school.asm
8342old mode 100644
8343new mode 100755
8344diff --git a/text/maps/seafoam_islands_b4f.asm b/text/maps/seafoam_islands_b4f.asm
8345old mode 100644
8346new mode 100755
8347diff --git a/text/maps/silph_co_10f.asm b/text/maps/silph_co_10f.asm
8348old mode 100644
8349new mode 100755
8350diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm
8351old mode 100644
8352new mode 100755
8353diff --git a/text/maps/silph_co_1f.asm b/text/maps/silph_co_1f.asm
8354old mode 100644
8355new mode 100755
8356diff --git a/text/maps/silph_co_2f.asm b/text/maps/silph_co_2f.asm
8357old mode 100644
8358new mode 100755
8359diff --git a/text/maps/silph_co_3f.asm b/text/maps/silph_co_3f.asm
8360old mode 100644
8361new mode 100755
8362diff --git a/text/maps/silph_co_4f.asm b/text/maps/silph_co_4f.asm
8363old mode 100644
8364new mode 100755
8365diff --git a/text/maps/silph_co_5f.asm b/text/maps/silph_co_5f.asm
8366old mode 100644
8367new mode 100755
8368diff --git a/text/maps/silph_co_6f.asm b/text/maps/silph_co_6f.asm
8369old mode 100644
8370new mode 100755
8371diff --git a/text/maps/silph_co_7f.asm b/text/maps/silph_co_7f.asm
8372old mode 100644
8373new mode 100755
8374diff --git a/text/maps/silph_co_8f.asm b/text/maps/silph_co_8f.asm
8375old mode 100644
8376new mode 100755
8377diff --git a/text/maps/silph_co_9f.asm b/text/maps/silph_co_9f.asm
8378old mode 100644
8379new mode 100755
8380diff --git a/text/maps/ss_anne_1.asm b/text/maps/ss_anne_1.asm
8381old mode 100644
8382new mode 100755
8383diff --git a/text/maps/ss_anne_10.asm b/text/maps/ss_anne_10.asm
8384old mode 100644
8385new mode 100755
8386diff --git a/text/maps/ss_anne_2.asm b/text/maps/ss_anne_2.asm
8387old mode 100644
8388new mode 100755
8389diff --git a/text/maps/ss_anne_3.asm b/text/maps/ss_anne_3.asm
8390old mode 100644
8391new mode 100755
8392diff --git a/text/maps/ss_anne_5.asm b/text/maps/ss_anne_5.asm
8393old mode 100644
8394new mode 100755
8395diff --git a/text/maps/ss_anne_6.asm b/text/maps/ss_anne_6.asm
8396old mode 100644
8397new mode 100755
8398diff --git a/text/maps/ss_anne_7.asm b/text/maps/ss_anne_7.asm
8399old mode 100644
8400new mode 100755
8401diff --git a/text/maps/ss_anne_8.asm b/text/maps/ss_anne_8.asm
8402old mode 100644
8403new mode 100755
8404diff --git a/text/maps/ss_anne_9.asm b/text/maps/ss_anne_9.asm
8405old mode 100644
8406new mode 100755
8407diff --git a/text/maps/underground_path_route_6_entrance.asm b/text/maps/underground_path_route_6_entrance.asm
8408old mode 100644
8409new mode 100755
8410diff --git a/text/maps/underground_path_route_7_entrance.asm b/text/maps/underground_path_route_7_entrance.asm
8411old mode 100644
8412new mode 100755
8413diff --git a/text/maps/underground_path_route_7_entrance_unused.asm b/text/maps/underground_path_route_7_entrance_unused.asm
8414old mode 100644
8415new mode 100755
8416diff --git a/text/maps/underground_path_route_8_entrance.asm b/text/maps/underground_path_route_8_entrance.asm
8417old mode 100644
8418new mode 100755
8419diff --git a/text/maps/unknown_dungeon_b1f.asm b/text/maps/unknown_dungeon_b1f.asm
8420old mode 100644
8421new mode 100755
8422diff --git a/text/maps/vermilion_city.asm b/text/maps/vermilion_city.asm
8423old mode 100644
8424new mode 100755
8425diff --git a/text/maps/vermilion_dock.asm b/text/maps/vermilion_dock.asm
8426old mode 100644
8427new mode 100755
8428diff --git a/text/maps/vermilion_fishing_house.asm b/text/maps/vermilion_fishing_house.asm
8429old mode 100644
8430new mode 100755
8431diff --git a/text/maps/vermilion_gym.asm b/text/maps/vermilion_gym.asm
8432old mode 100644
8433new mode 100755
8434diff --git a/text/maps/vermilion_house.asm b/text/maps/vermilion_house.asm
8435old mode 100644
8436new mode 100755
8437diff --git a/text/maps/vermilion_mart.asm b/text/maps/vermilion_mart.asm
8438old mode 100644
8439new mode 100755
8440diff --git a/text/maps/vermilion_pokecenter.asm b/text/maps/vermilion_pokecenter.asm
8441old mode 100644
8442new mode 100755
8443diff --git a/text/maps/victory_road_1f.asm b/text/maps/victory_road_1f.asm
8444old mode 100644
8445new mode 100755
8446diff --git a/text/maps/victory_road_2f.asm b/text/maps/victory_road_2f.asm
8447old mode 100644
8448new mode 100755
8449diff --git a/text/maps/victory_road_3f.asm b/text/maps/victory_road_3f.asm
8450old mode 100644
8451new mode 100755
8452diff --git a/text/maps/viridian_city.asm b/text/maps/viridian_city.asm
8453old mode 100644
8454new mode 100755
8455index 46c01fc8..e8ccbbaf
8456--- a/text/maps/viridian_city.asm
8457+++ b/text/maps/viridian_city.asm
8458@@ -5,53 +5,65 @@ _ViridianCityText_19219::
8459 done
8460
8461 _ViridianCityText_1920a::
8462- text "Ahh, I've had my"
8463- line "coffee now and I"
8464- cont "feel great!"
8465+ text "Ahh, ich habe"
8466+ line "endlich meinen"
8467+ cont "Kaffee bekommen!"
8468
8469- para "Sure, you can go"
8470- line "through!"
8471+ para "Natürlich kannst"
8472+ line "Du passieren!"
8473
8474- para "I'm sorry I was"
8475- line "so rude to you!"
8476+ para "Es tut mir leid,"
8477+ line "dass ich so grob"
8478+ cont "zu Dir war!"
8479
8480- para "I see you're using"
8481- line "a #DEX."
8482+ para "Wie ich sehe,"
8483+ line "besitzt Du einen"
8484+ cont "#DEX."
8485
8486- para "I'll show you how"
8487- line "to catch #MON"
8488- cont "as my apology."
8489+ para "Als kleine"
8490+ line "Wiedergutmachung"
8491+ cont "zeige ich Dir,"
8492+ cont "wie man #MON"
8493+ cont "fängt."
8494 done
8495
8496 _OldManTextAfterBattle::
8497- text "That didn't work!"
8498- line "I must be losing"
8499- cont "my touch."
8500+ text "Es funktioniert"
8501+ line "nicht! Ich bin"
8502+ cont "aus der übung."
8503
8504- para "I've run out of"
8505- line "# BALLs too."
8506+ para "Und #BÄLLE"
8507+ line "habe ich auch"
8508+ cont "keine mehr..."
8509
8510- para "I have to get some"
8511- line "at #MON MART."
8512+ para "Ich muss mir im"
8513+ line "PKMN-SUPERMARKT"
8514+ cont "neue besorgen."
8515 done
8516
8517 _ViridianCityText1::
8518- text "Those # BALLs"
8519- line "at your waist!"
8520- cont "You have #MON!"
8521+ text "Diese #BÄLLE"
8522+ line "an Deinem Gürtel"
8523+ cont "zeigen mir, dass"
8524+ cont "Du #MON"
8525+ cont "besitzt!"
8526
8527- para "It's great that"
8528- line "you can carry and"
8529- cont "use #MON any-"
8530- cont "time, anywhere!"
8531+ para "Es ist klasse,"
8532+ line "dass man jederzeit"
8533+ cont "#MON tragen"
8534+ cont "und einsetzen"
8535+ cont "kann, nicht wahr?"
8536 done
8537
8538 _ViridianCityText_19122::
8539- text "This #MON GYM"
8540- line "is always closed."
8541+ text "Diese PKMN-ARENA"
8542+ line "ist stets"
8543+ cont "geschlossen!"
8544
8545- para "I wonder who the"
8546- line "LEADER is?"
8547+ para "Ich frage mich,"
8548+ line "wer hier wohl"
8549+ cont "der ARENALEITER"
8550+ cont "sein mag?"
8551 done
8552
8553 _ViridianCityText_19127::
8554@@ -60,46 +72,48 @@ _ViridianCityText_19127::
8555 done
8556
8557 _ViridianCityText_1914d::
8558- text "You want to know"
8559- line "about the 2 kinds"
8560- cont "of caterpillar"
8561- cont "#MON?"
8562+ text "Möchtest Du etwas"
8563+ line "über die zwei"
8564+ cont "RAUPEN-#MON"
8565+ cont "erfahren??"
8566 done
8567
8568 _ViridianCityText_19152::
8569- text "Oh, OK then!"
8570+ text "OK, alles klar!"
8571 done
8572
8573 _ViridianCityText_19157::
8574- text "CATERPIE has no"
8575- line "poison, but"
8576- cont "WEEDLE does."
8577+ text "RAUPY ist nicht"
8578+ line "giftig, aber"
8579+ cont "HORNLIU!"
8580
8581- para "Watch out for its"
8582- line "POISON STING!"
8583+ para "Achte auf seinen"
8584+ line "GIFTSTACHEL!"
8585 done
8586
8587 _ViridianCityText_19175::
8588- text "Oh Grandpa! Don't"
8589- line "be so mean!"
8590- cont "He hasn't had his"
8591- cont "coffee yet."
8592+ text "Grossvater! Sei"
8593+ line "nicht so gemein!"
8594+ cont "Er hatte noch"
8595+ cont "keinen Kaffee!!!"
8596 done
8597
8598 _ViridianCityText_1917a::
8599- text "When I go shop in"
8600- line "PEWTER CITY, I"
8601- cont "have to take the"
8602- cont "winding trail in"
8603- cont "VIRIDIAN FOREST."
8604+ text "Wenn ich zum"
8605+ line "Einkaufen nach"
8606+ cont "MARMORIA CITY"
8607+ cont "möchte muss ich"
8608+ cont "immer durch den"
8609+ cont "VERTANIA-WALD"
8610+ cont "gehen."
8611 done
8612
8613 _ViridianCityText_19191::
8614- text "You can't go"
8615- line "through here!"
8616+ text "Du kannst hier"
8617+ line "nicht durch!"
8618
8619- para "This is private"
8620- line "property!"
8621+ para "Das ist ein"
8622+ line "Privatgelände!"
8623 done
8624
8625 _ViridianCityText_191ca::
8626@@ -120,7 +134,7 @@ _ViridianCityText_191ca::
8627 prompt
8628
8629 _ReceivedTM42Text::
8630- text $52, " received"
8631+ text $52, " erhält"
8632 line "TM42!@@"
8633
8634 _TM42Explanation::
8635@@ -152,43 +166,46 @@ _OldManAgainText3::
8636 done
8637
8638 _ViridianCityText8::
8639- text "VIRIDIAN CITY "
8640- line "The Eternally"
8641- cont "Green Paradise"
8642+ text "VERTANIA CITY "
8643+ line "Das immergrüne"
8644+ cont "Paradis!"
8645 done
8646
8647 _ViridianCityText9::
8648- text "TRAINER TIPS"
8649+ text "TIPS FÜR TRAINER"
8650
8651- para "Catch #MON"
8652- line "and expand your"
8653- cont "collection!"
8654+ para "Fange #MON,"
8655+ line "um Deine Sammlung"
8656+ cont "zu erweitern!"
8657
8658- para "The more you have,"
8659- line "the easier it is"
8660- cont "to fight!"
8661+ para "Je mehr Du"
8662+ line "besitzt, desto"
8663+ cont "leichter werden"
8664+ cont "die Kämpfe!"
8665 done
8666
8667 _ViridianCityText10::
8668- text "TRAINER TIPS"
8669+ text "TIPS FÜR TRAINER"
8670
8671- para "The battle moves"
8672- line "of #MON are"
8673- cont "limited by their"
8674- cont "POWER POINTs, PP."
8675+ para "Die Attacken der"
8676+ line "#MON werden"
8677+ cont "durch ihre"
8678+ cont "ANGRIFFSPUNKTE,"
8679+ cont "AP, limitiert."
8680
8681- para "To replenish PP,"
8682- line "rest your tired"
8683- cont "#MON at a"
8684- cont "#MON CENTER!"
8685+ para "Um die AP wieder"
8686+ line "aufzufüllen, musst"
8687+ cont "Du die #MON"
8688+ cont "in ein #-"
8689+ cont "MONCENTER bringen!"
8690 done
8691
8692 _ViridianCityText13::
8693- text "VIRIDIAN CITY"
8694- line "#MON GYM"
8695+ text "VERTANIA CITY"
8696+ line "PKMN-ARENA"
8697 done
8698
8699 _ViridianCityText14::
8700- text "The GYM's doors"
8701- line "are locked..."
8702+ text "Die Tür der ARENA"
8703+ line "ist verschölossen!"
8704 done
8705diff --git a/text/maps/viridian_forest.asm b/text/maps/viridian_forest.asm
8706old mode 100644
8707new mode 100755
8708diff --git a/text/maps/viridian_forest_entrance.asm b/text/maps/viridian_forest_entrance.asm
8709old mode 100644
8710new mode 100755
8711index a5278742..75faea6c
8712--- a/text/maps/viridian_forest_entrance.asm
8713+++ b/text/maps/viridian_forest_entrance.asm
8714@@ -1,16 +1,20 @@
8715 _ViridianForestEntranceText1::
8716- text "Are you going to"
8717- line "VIRIDIAN FOREST?"
8718- cont "Be careful, it's"
8719- cont "a natural maze!"
8720+ text "Du gehst in den"
8721+ line "VERTANIA-WALD?"
8722+ cont "Sei auf der Hut,"
8723+ cont "dort verläuft man"
8724+ cont "sich leicht!"
8725 done
8726
8727 _ViridianForestEntranceText2::
8728- text "You have to roam"
8729- line "far to get new"
8730- cont "kinds of #MON."
8731+ text "Um neue Arten"
8732+ line "von #MON zu"
8733+ cont "finden, musst Du"
8734+ cont "durch das ganze"
8735+ cont "Land ziehen."
8736
8737- para "Look for other"
8738- line "types outside of"
8739- cont "VIRIDIAN FOREST."
8740+ para "Bereits hinter"
8741+ line "dem VERTANIA-WALD"
8742+ cont "findest Du andere"
8743+ cont "Arten."
8744 done
8745diff --git a/text/maps/viridian_forest_exit.asm b/text/maps/viridian_forest_exit.asm
8746old mode 100644
8747new mode 100755
8748diff --git a/text/maps/viridian_gym.asm b/text/maps/viridian_gym.asm
8749old mode 100644
8750new mode 100755
8751diff --git a/text/maps/viridian_house.asm b/text/maps/viridian_house.asm
8752old mode 100644
8753new mode 100755
8754diff --git a/text/maps/viridian_mart.asm b/text/maps/viridian_mart.asm
8755old mode 100644
8756new mode 100755
8757index 5f4e147c..f9adbcd6
8758--- a/text/maps/viridian_mart.asm
8759+++ b/text/maps/viridian_mart.asm
8760@@ -1,32 +1,35 @@
8761 _ViridianMartText1::
8762- text "Okay! Say hi to"
8763- line "PROF.OAK for me!"
8764+ text "OK! Grüsse PROF."
8765+ line "EICH von mir!"
8766 done
8767
8768 _ViridianMartText4::
8769- text "Hey! You came from"
8770- line "PALLET TOWN?"
8771+ text "Hey! Kommst Du"
8772+ line "aus ALABASTIA?"
8773 done
8774
8775 ViridianMartParcelQuestText::
8776- text "You know PROF."
8777- line "OAK, right?"
8778+ text "PROF. EICH"
8779+ line "schickt Dich,"
8780+ cont "oder?"
8781
8782- para "His order came in."
8783- line "Will you take it"
8784- cont "to him?"
8785+ para "Seine Bestellung"
8786+ line "ist angekommen!"
8787+ cont "Holst Du das"
8788+ cont "Paket für ihn ab?"
8789
8790- para $52, " got"
8791- line "OAK's PARCEL!@@"
8792+ para $52, " erhält"
8793+ line "EICHS PAKET!@@"
8794
8795 _ViridianMartText2::
8796- text "This shop sells a"
8797- line "lot of PARLYZ"
8798- cont "HEALs."
8799+ text "Dieser Laden"
8800+ line "führt viele"
8801+ cont "GEGENGIFTE."
8802 done
8803
8804 _ViridianMartText3::
8805- text "The shop finally"
8806- line "has some POTIONs"
8807- cont "in stock."
8808+ text "Der Laden hat"
8809+ line "endlich wieder"
8810+ cont "GEGENGIFT"
8811+ cont "vorrätig."
8812 done
8813diff --git a/text/maps/viridian_pokecenter.asm b/text/maps/viridian_pokecenter.asm
8814index 4ac18bf6..09a801a0 100755
8815--- a/text/maps/viridian_pokecenter.asm
8816+++ b/text/maps/viridian_pokecenter.asm
8817@@ -1,16 +1,20 @@
8818 _ViridianPokeCenterText2::
8819- text "You can use that"
8820- line "PC in the corner."
8821+ text "Du kannst den PC"
8822+ line "in der Ecke dort"
8823+ cont "drürben benutzen!"
8824
8825- para "The receptionist"
8826- line "told me. So kind!"
8827+ para "Darauf hat man"
8828+ line "mich am Empfang"
8829+ cont "freundlicherweise"
8830+ cont "hingewiesen."
8831 done
8832
8833 _ViridianPokeCenterText3::
8834- text "There's a #MON"
8835- line "CENTER in every"
8836- cont "town ahead."
8837+ text "Es gibt in jeder"
8838+ line "Stadt ein"
8839+ cont "PKMN-CENTER."
8840
8841- para "They don't charge"
8842- line "any money either!"
8843+ para "Dort behandelt"
8844+ line "man Deine #MON"
8845+ cont "kostenlos!"
8846 done
8847diff --git a/text/maps/wardens_house.asm b/text/maps/wardens_house.asm
8848old mode 100644
8849new mode 100755
8850diff --git a/text/monster_names.asm b/text/monster_names.asm
8851index a62b1bd9..2f3e66ff 100755
8852--- a/text/monster_names.asm
8853+++ b/text/monster_names.asm
8854@@ -1,191 +1,191 @@
8855 MonsterNames:
8856- db "RHYDON@@@@"
8857- db "KANGASKHAN"
8858- db "NIDORAN♂@@"
8859- db "CLEFAIRY@@"
8860- db "SPEAROW@@@"
8861- db "VOLTORB@@@"
8862- db "NIDOKING@@"
8863- db "SLOWBRO@@@"
8864- db "IVYSAUR@@@"
8865- db "EXEGGUTOR@"
8866- db "LICKITUNG@"
8867- db "EXEGGCUTE@"
8868- db "GRIMER@@@@"
8869- db "GENGAR@@@@"
8870- db "NIDORAN♀@@"
8871- db "NIDOQUEEN@"
8872- db "CUBONE@@@@"
8873- db "RHYHORN@@@"
8874- db "LAPRAS@@@@"
8875- db "ARCANINE@@"
8876- db "MEW@@@@@@@"
8877- db "GYARADOS@@"
8878- db "SHELLDER@@"
8879- db "TENTACOOL@"
8880- db "GASTLY@@@@"
8881- db "SCYTHER@@@"
8882- db "STARYU@@@@"
8883- db "BLASTOISE@"
8884- db "PINSIR@@@@"
8885- db "TANGELA@@@"
8886- db "MISSINGNO."
8887- db "MISSINGNO."
8888- db "GROWLITHE@"
8889- db "ONIX@@@@@@"
8890- db "FEAROW@@@@"
8891- db "PIDGEY@@@@"
8892- db "SLOWPOKE@@"
8893- db "KADABRA@@@"
8894- db "GRAVELER@@"
8895- db "CHANSEY@@@"
8896- db "MACHOKE@@@"
8897- db "MR.MIME@@@"
8898- db "HITMONLEE@"
8899- db "HITMONCHAN"
8900- db "ARBOK@@@@@"
8901- db "PARASECT@@"
8902- db "PSYDUCK@@@"
8903- db "DROWZEE@@@"
8904- db "GOLEM@@@@@"
8905- db "MISSINGNO."
8906- db "MAGMAR@@@@"
8907- db "MISSINGNO."
8908- db "ELECTABUZZ"
8909- db "MAGNETON@@"
8910- db "KOFFING@@@"
8911- db "MISSINGNO."
8912- db "MANKEY@@@@"
8913- db "SEEL@@@@@@"
8914- db "DIGLETT@@@"
8915- db "TAUROS@@@@"
8916- db "MISSINGNO."
8917- db "MISSINGNO."
8918- db "MISSINGNO."
8919- db "FARFETCH'D"
8920- db "VENONAT@@@"
8921- db "DRAGONITE@"
8922- db "MISSINGNO."
8923- db "MISSINGNO."
8924- db "MISSINGNO."
8925- db "DODUO@@@@@"
8926- db "POLIWAG@@@"
8927- db "JYNX@@@@@@"
8928- db "MOLTRES@@@"
8929- db "ARTICUNO@@"
8930- db "ZAPDOS@@@@"
8931- db "DITTO@@@@@"
8932- db "MEOWTH@@@@"
8933- db "KRABBY@@@@"
8934- db "MISSINGNO."
8935- db "MISSINGNO."
8936- db "MISSINGNO."
8937- db "VULPIX@@@@"
8938- db "NINETALES@"
8939- db "PIKACHU@@@"
8940- db "RAICHU@@@@"
8941- db "MISSINGNO."
8942- db "MISSINGNO."
8943- db "DRATINI@@@"
8944- db "DRAGONAIR@"
8945- db "KABUTO@@@@"
8946- db "KABUTOPS@@"
8947- db "HORSEA@@@@"
8948- db "SEADRA@@@@"
8949- db "MISSINGNO."
8950- db "MISSINGNO."
8951- db "SANDSHREW@"
8952- db "SANDSLASH@"
8953- db "OMANYTE@@@"
8954- db "OMASTAR@@@"
8955- db "JIGGLYPUFF"
8956- db "WIGGLYTUFF"
8957- db "EEVEE@@@@@"
8958- db "FLAREON@@@"
8959- db "JOLTEON@@@"
8960- db "VAPOREON@@"
8961- db "MACHOP@@@@"
8962- db "ZUBAT@@@@@"
8963- db "EKANS@@@@@"
8964- db "PARAS@@@@@"
8965- db "POLIWHIRL@"
8966- db "POLIWRATH@"
8967- db "WEEDLE@@@@"
8968- db "KAKUNA@@@@"
8969- db "BEEDRILL@@"
8970- db "MISSINGNO."
8971- db "DODRIO@@@@"
8972- db "PRIMEAPE@@"
8973- db "DUGTRIO@@@"
8974- db "VENOMOTH@@"
8975- db "DEWGONG@@@"
8976- db "MISSINGNO."
8977- db "MISSINGNO."
8978- db "CATERPIE@@"
8979- db "METAPOD@@@"
8980- db "BUTTERFREE"
8981- db "MACHAMP@@@"
8982- db "MISSINGNO."
8983- db "GOLDUCK@@@"
8984- db "HYPNO@@@@@"
8985- db "GOLBAT@@@@"
8986- db "MEWTWO@@@@"
8987- db "SNORLAX@@@"
8988- db "MAGIKARP@@"
8989- db "MISSINGNO."
8990- db "MISSINGNO."
8991- db "MUK@@@@@@@"
8992- db "MISSINGNO."
8993- db "KINGLER@@@"
8994- db "CLOYSTER@@"
8995+ db "Rizeros@@@"
8996+ db "Kangama@@@"
8997+ db "Nidoran♂@@"
8998+ db "Piepi@@@@@"
8999+ db "Habitak@@@"
9000+ db "Voltobal@@"
9001+ db "Nidoking@@"
9002+ db "Lahmus@@@@"
9003+ db "Bisaknosp@"
9004+ db "Kokowei@@@"
9005+ db "Schlup@@@@"
9006+ db "Owei@@@@@@"
9007+ db "Sleima@@@@"
9008+ db "Gengar@@@@"
9009+ db "Nidoran♀@@"
9010+ db "Nidoqueen@"
9011+ db "Tragosso@@"
9012+ db "Rihorn@@@@"
9013+ db "Lapras@@@@"
9014+ db "Arkani@@@@"
9015+ db "Mew@@@@@@@"
9016+ db "Garados@@@"
9017+ db "Muchas@@@@"
9018+ db "Tentacha@@"
9019+ db "Nebulak@@@"
9020+ db "Sichlor@@@"
9021+ db "Sterndu@@@"
9022+ db "Turtok@@@@"
9023+ db "Pinsir@@@@"
9024+ db "Tangela@@@"
9025+ db "Stahlos@@@"
9026+ db "Iksbat@@@@"
9027+ db "Fukano@@@@"
9028+ db "Onix@@@@@@"
9029+ db "Ibitak@@@@"
9030+ db "Taubsi@@@@"
9031+ db "Flegmon@@@"
9032+ db "Kadabra@@@"
9033+ db "Georok@@@@"
9034+ db "Chaneira@@"
9035+ db "Maschok@@@"
9036+ db "Patimos@@@"
9037+ db "Kicklee@@@"
9038+ db "Nockchan@@"
9039+ db "Arbok@@@@@"
9040+ db "Parasek@@@"
9041+ db "Enton@@@@@"
9042+ db "Traumato@@"
9043+ db "Geowaz@@@@"
9044+ db "MISSINGNO."
9045+ db "Magmar@@@@"
9046+ db "MISSINGNO."
9047+ db "Elektek@@@"
9048+ db "Magneton@@"
9049+ db "Smogon@@@@"
9050+ db "MISSINGNO."
9051+ db "Menki@@@@@"
9052+ db "Jurob@@@@@"
9053+ db "Digda@@@@@"
9054+ db "Tauros@@@@"
9055+ db "MISSINGNO."
9056+ db "MISSINGNO."
9057+ db "MISSINGNO."
9058+ db "Porenta@@@"
9059+ db "Bluzuk@@@@"
9060+ db "Dragoran@@"
9061+ db "MISSINGNO."
9062+ db "MISSINGNO."
9063+ db "MISSINGNO."
9064+ db "Dodu@@@@@@"
9065+ db "Quapsel@@@"
9066+ db "Rosana@@@@"
9067+ db "Lavados@@@"
9068+ db "Arktos@@@@"
9069+ db "Zapdos@@@@"
9070+ db "Ditto@@@@@"
9071+ db "Mauzi@@@@@"
9072+ db "Krabby@@@@"
9073+ db "MISSINGNO."
9074+ db "MISSINGNO."
9075+ db "MISSINGNO."
9076+ db "Vulpix@@@@"
9077+ db "Vulnona@@@"
9078+ db "Pikachu@@@"
9079+ db "Raichu@@@@"
9080+ db "MISSINGNO."
9081+ db "MISSINGNO."
9082+ db "Dratini@@@"
9083+ db "Dragonir@@"
9084+ db "Kabuto@@@@"
9085+ db "Kabutops@@"
9086+ db "Seeper@@@@"
9087+ db "Seemon@@@@"
9088+ db "MISSINGNO."
9089+ db "MISSINGNO."
9090+ db "Sandan@@@@"
9091+ db "Sandamer@@"
9092+ db "Amonitas@@"
9093+ db "Amoroso@@@"
9094+ db "Pummeluff@"
9095+ db "Knuddeluff"
9096+ db "Evoli@@@@@"
9097+ db "Flamara@@@"
9098+ db "Blitza@@@@"
9099+ db "Aquana@@@@"
9100+ db "Machollo@@"
9101+ db "Zubat@@@@@"
9102+ db "Rettan@@@@"
9103+ db "Paras@@@@@"
9104+ db "Quapuzi@@@"
9105+ db "Quappo@@@@"
9106+ db "Hornliu@@@"
9107+ db "Kokuna@@@@"
9108+ db "Bibor@@@@@"
9109+ db "MISSINGNO."
9110+ db "Dodri@@@@@"
9111+ db "Rasaff@@@@"
9112+ db "Digdri@@@@"
9113+ db "Omot@@@@@@"
9114+ db "Jugong@@@@"
9115+ db "MISSINGNO."
9116+ db "MISSINGNO."
9117+ db "Raupy@@@@@"
9118+ db "Safcon@@@@"
9119+ db "Smettbo@@@"
9120+ db "Machomei@@"
9121+ db "MISSINGNO."
9122+ db "Entoron@@@"
9123+ db "Hypno@@@@@"
9124+ db "Golbat@@@@"
9125+ db "Mewtu@@@@@"
9126+ db "Relaxo@@@@"
9127+ db "Karpador@@"
9128+ db "MISSINGNO."
9129+ db "MISSINGNO."
9130+ db "Sleimok@@@"
9131+ db "MISSINGNO."
9132+ db "Kingler@@@"
9133+ db "Austos@@@@"
9134 db "MISSINGNO."
9135- db "ELECTRODE@"
9136- db "CLEFABLE@@"
9137- db "WEEZING@@@"
9138- db "PERSIAN@@@"
9139- db "MAROWAK@@@"
9140+ db "Lektrobal@"
9141+ db "Pixi@@@@@@"
9142+ db "Smogmog@@@"
9143+ db "Snobilikat"
9144+ db "Knogga@@@@"
9145 db "MISSINGNO."
9146- db "HAUNTER@@@"
9147- db "ABRA@@@@@@"
9148- db "ALAKAZAM@@"
9149- db "PIDGEOTTO@"
9150- db "PIDGEOT@@@"
9151- db "STARMIE@@@"
9152- db "BULBASAUR@"
9153- db "VENUSAUR@@"
9154- db "TENTACRUEL"
9155+ db "Alpollo@@@"
9156+ db "Abra@@@@@@"
9157+ db "Simsala@@@"
9158+ db "Tauboga@@@"
9159+ db "Tauboss@@@"
9160+ db "Starmie@@@"
9161+ db "Bisasam@@@"
9162+ db "Bisaflor@@"
9163+ db "Tentoca@@@"
9164 db "MISSINGNO."
9165- db "GOLDEEN@@@"
9166- db "SEAKING@@@"
9167+ db "Goldini@@@"
9168+ db "Golking@@@"
9169 db "MISSINGNO."
9170 db "MISSINGNO."
9171 db "MISSINGNO."
9172 db "MISSINGNO."
9173- db "PONYTA@@@@"
9174- db "RAPIDASH@@"
9175- db "RATTATA@@@"
9176- db "RATICATE@@"
9177- db "NIDORINO@@"
9178- db "NIDORINA@@"
9179- db "GEODUDE@@@"
9180- db "PORYGON@@@"
9181- db "AERODACTYL"
9182- db "MISSINGNO."
9183- db "MAGNEMITE@"
9184- db "MISSINGNO."
9185- db "MISSINGNO."
9186- db "CHARMANDER"
9187- db "SQUIRTLE@@"
9188- db "CHARMELEON"
9189- db "WARTORTLE@"
9190- db "CHARIZARD@"
9191- db "MISSINGNO."
9192- db "MISSINGNO."
9193- db "MISSINGNO."
9194- db "MISSINGNO."
9195- db "ODDISH@@@@"
9196- db "GLOOM@@@@@"
9197- db "VILEPLUME@"
9198- db "BELLSPROUT"
9199- db "WEEPINBELL"
9200- db "VICTREEBEL"
9201+ db "Ponita@@@@"
9202+ db "Gallopa@@@"
9203+ db "Rattfratz@"
9204+ db "Rattikarl@"
9205+ db "Nidorino@@"
9206+ db "Nidorina@@"
9207+ db "Kleinstein"
9208+ db "Porygon@@@"
9209+ db "Aerodactyl"
9210+ db "MISSINGNO."
9211+ db "Magnetilo@"
9212+ db "MISSINGNO."
9213+ db "MISSINGNO."
9214+ db "Glumanda@@"
9215+ db "Schiggy@@@"
9216+ db "Glutexo@@@"
9217+ db "Schillok@@"
9218+ db "Glurak@@@@"
9219+ db "MISSINGNO."
9220+ db "MISSINGNO."
9221+ db "MISSINGNO."
9222+ db "MISSINGNO."
9223+ db "Myrapla@@@"
9224+ db "Duflor@@@@"
9225+ db "Giflor@@@@"
9226+ db "Knofensa@@"
9227+ db "Ultrigaria"
9228+ db "Sarzenia@@"
9229diff --git a/text/move_names.asm b/text/move_names.asm
9230old mode 100644
9231new mode 100755
9232index cbb1a322..656c9ee0
9233--- a/text/move_names.asm
9234+++ b/text/move_names.asm
9235@@ -1,166 +1,167 @@
9236 MoveNames::
9237- db "POUND@"
9238- db "KARATE CHOP@"
9239- db "DOUBLESLAP@"
9240- db "COMET PUNCH@"
9241- db "MEGA PUNCH@"
9242- db "PAY DAY@"
9243- db "FIRE PUNCH@"
9244- db "ICE PUNCH@"
9245- db "THUNDERPUNCH@"
9246- db "SCRATCH@"
9247- db "VICEGRIP@"
9248- db "GUILLOTINE@"
9249- db "RAZOR WIND@"
9250- db "SWORDS DANCE@"
9251- db "CUT@"
9252- db "GUST@"
9253- db "WING ATTACK@"
9254- db "WHIRLWIND@"
9255- db "FLY@"
9256- db "BIND@"
9257- db "SLAM@"
9258- db "VINE WHIP@"
9259- db "STOMP@"
9260- db "DOUBLE KICK@"
9261- db "MEGA KICK@"
9262- db "JUMP KICK@"
9263- db "ROLLING KICK@"
9264- db "SAND-ATTACK@"
9265- db "HEADBUTT@"
9266- db "HORN ATTACK@"
9267- db "FURY ATTACK@"
9268- db "HORN DRILL@"
9269- db "TACKLE@"
9270- db "BODY SLAM@"
9271- db "WRAP@"
9272- db "TAKE DOWN@"
9273- db "THRASH@"
9274- db "DOUBLE-EDGE@"
9275- db "TAIL WHIP@"
9276- db "POISON STING@"
9277- db "TWINEEDLE@"
9278- db "PIN MISSILE@"
9279- db "LEER@"
9280- db "BITE@"
9281- db "GROWL@"
9282- db "ROAR@"
9283- db "SING@"
9284- db "SUPERSONIC@"
9285- db "SONICBOOM@"
9286- db "DISABLE@"
9287- db "ACID@"
9288- db "EMBER@"
9289- db "FLAMETHROWER@"
9290- db "MIST@"
9291- db "WATER GUN@"
9292- db "HYDRO PUMP@"
9293- db "SURF@"
9294- db "ICE BEAM@"
9295- db "BLIZZARD@"
9296- db "PSYBEAM@"
9297- db "BUBBLEBEAM@"
9298- db "AURORA BEAM@"
9299- db "HYPER BEAM@"
9300- db "PECK@"
9301- db "DRILL PECK@"
9302- db "SUBMISSION@"
9303- db "LOW KICK@"
9304- db "COUNTER@"
9305- db "SEISMIC TOSS@"
9306- db "STRENGTH@"
9307- db "ABSORB@"
9308- db "MEGA DRAIN@"
9309- db "LEECH SEED@"
9310- db "GROWTH@"
9311- db "RAZOR LEAF@"
9312- db "SOLARBEAM@"
9313- db "POISONPOWDER@"
9314- db "STUN SPORE@"
9315- db "SLEEP POWDER@"
9316- db "PETAL DANCE@"
9317- db "STRING SHOT@"
9318- db "DRAGON RAGE@"
9319- db "FIRE SPIN@"
9320- db "THUNDERSHOCK@"
9321- db "THUNDERBOLT@"
9322- db "THUNDER WAVE@"
9323- db "THUNDER@"
9324- db "ROCK THROW@"
9325- db "EARTHQUAKE@"
9326- db "FISSURE@"
9327- db "DIG@"
9328- db "TOXIC@"
9329- db "CONFUSION@"
9330- db "PSYCHIC@"
9331- db "HYPNOSIS@"
9332- db "MEDITATE@"
9333- db "AGILITY@"
9334- db "QUICK ATTACK@"
9335- db "RAGE@"
9336- db "TELEPORT@"
9337- db "NIGHT SHADE@"
9338- db "MIMIC@"
9339- db "SCREECH@"
9340- db "DOUBLE TEAM@"
9341- db "RECOVER@"
9342- db "HARDEN@"
9343- db "MINIMIZE@"
9344- db "SMOKESCREEN@"
9345- db "CONFUSE RAY@"
9346- db "WITHDRAW@"
9347- db "DEFENSE CURL@"
9348- db "BARRIER@"
9349- db "LIGHT SCREEN@"
9350- db "HAZE@"
9351- db "REFLECT@"
9352- db "FOCUS ENERGY@"
9353- db "BIDE@"
9354- db "METRONOME@"
9355- db "MIRROR MOVE@"
9356- db "SELFDESTRUCT@"
9357- db "EGG BOMB@"
9358- db "LICK@"
9359- db "SMOG@"
9360- db "SLUDGE@"
9361- db "BONE CLUB@"
9362- db "FIRE BLAST@"
9363- db "WATERFALL@"
9364- db "CLAMP@"
9365- db "SWIFT@"
9366- db "SKULL BASH@"
9367- db "SPIKE CANNON@"
9368- db "CONSTRICT@"
9369- db "AMNESIA@"
9370- db "KINESIS@"
9371- db "SOFTBOILED@"
9372- db "HI JUMP KICK@"
9373- db "GLARE@"
9374- db "DREAM EATER@"
9375- db "POISON GAS@"
9376- db "BARRAGE@"
9377- db "LEECH LIFE@"
9378- db "LOVELY KISS@"
9379- db "SKY ATTACK@"
9380- db "TRANSFORM@"
9381- db "BUBBLE@"
9382- db "DIZZY PUNCH@"
9383- db "SPORE@"
9384- db "FLASH@"
9385- db "PSYWAVE@"
9386- db "SPLASH@"
9387- db "ACID ARMOR@"
9388- db "CRABHAMMER@"
9389- db "EXPLOSION@"
9390- db "FURY SWIPES@"
9391- db "BONEMERANG@"
9392- db "REST@"
9393- db "ROCK SLIDE@"
9394- db "HYPER FANG@"
9395- db "SHARPEN@"
9396- db "CONVERSION@"
9397- db "TRI ATTACK@"
9398- db "SUPER FANG@"
9399- db "SLASH@"
9400- db "SUBSTITUTE@"
9401- db "STRUGGLE@"
9402+ db "Pfund@"
9403+ db "Karateschlag@"
9404+ db "Duplexhieb@"
9405+ db "Kometenhieb@"
9406+ db "Megahieb@"
9407+ db "Zahltag@"
9408+ db "Feuerschlag@"
9409+ db "Eishieb@"
9410+ db "Donnerschlag@"
9411+ db "Kratzer@"
9412+ db "Klammer@"
9413+ db "Guillotine@"
9414+ db "Klingensturm@"
9415+ db "Schwerttanz@"
9416+ db "Zerschneider@"
9417+ db "Windstoss@"
9418+ db "Flügelschlag@"
9419+ db "Wirbelwind@"
9420+ db "Fliegen@"
9421+ db "Klammergriff@"
9422+ db "Slam@"
9423+ db "Rankenhieb@"
9424+ db "Stampfer@"
9425+ db "Doppelkick@"
9426+ db "Megakick@"
9427+ db "Sprungkick@"
9428+ db "Fegekick@"
9429+ db "Sandwirbel@"
9430+ db "Kopfnuss@"
9431+ db "Hornattacke@"
9432+ db "Furienschlag@"
9433+ db "Hornbohrer@"
9434+ db "Tackle@"
9435+ db "Bodyslam@"
9436+ db "Wickel@"
9437+ db "Bodycheck@"
9438+ db "Fuchtler@"
9439+ db "Risikotackle@"
9440+ db "Rutenschlag@"
9441+ db "Giftstachel@"
9442+ db "Duonadel@"
9443+ db "Nadelrakete@"
9444+ db "Silberblick@"
9445+ db "Biss@"
9446+ db "Heuler@"
9447+ db "Brüller@"
9448+ db "Gesang@"
9449+ db "Superschall@"
9450+ db "Ultraschall@"
9451+ db "Aussetzer@"
9452+ db "Säure@"
9453+ db "Glut@"
9454+ db "Flammenwurf@"
9455+ db "Weissnebel@"
9456+ db "Aquaknarre@"
9457+ db "Hydropumpe@"
9458+ db "Surfer@"
9459+ db "Eisstrahl@"
9460+ db "Blizzard@"
9461+ db "Psystrahl@"
9462+ db "Blubbstrahl@"
9463+ db "Aurorastrahl@"
9464+ db "Hyperstrahl@"
9465+ db "Schnabel@"
9466+ db "Bohrschnabel@"
9467+ db "Überroller@"
9468+ db "Fusskick@"
9469+ db "Konter@"
9470+ db "Geowurf@"
9471+ db "Stärke@"
9472+ db "Absorber@"
9473+ db "Megasauger@"
9474+ db "Egelsamen@"
9475+ db "Wachsturm@"
9476+ db "Rasierblatt@"
9477+ db "Solarstrahl@"
9478+ db "Giftpuder@"
9479+ db "Stachelspore@"
9480+ db "Schlafpuder@"
9481+ db "Blättertanz@"
9482+ db "Fadenschuss@"
9483+ db "Drachenwut@"
9484+ db "Feuerwirbel@"
9485+ db "Donnerschock@"
9486+ db "Donnerblitz@"
9487+ db "Donnerwelle@"
9488+ db "Donner@"
9489+ db "Steinwurf@"
9490+ db "Erdbeben@"
9491+ db "Geofissur@"
9492+ db "Schaufler@"
9493+ db "Toxin@"
9494+ db "Konfusion@"
9495+ db "Psychokinese@"
9496+ db "Hypnose@"
9497+ db "Meditation@"
9498+ db "Agilität@"
9499+ db "Ruckzuckhieb@"
9500+ db "Raserei@"
9501+ db "Teleport@"
9502+ db "Nachtnebel@"
9503+ db "Mimikry@"
9504+ db "Kreideschrei@"
9505+ db "Doppelteam@"
9506+ db "Genesung@"
9507+ db "Härtner@"
9508+ db "Komprimator@"
9509+ db "Rauchwolke@"
9510+ db "Konfustrahl@"
9511+ db "Panzerschutz@"
9512+ db "Einigler@"
9513+ db "Barriere@"
9514+ db "Lichtschild@"
9515+ db "Dunkelnebel@"
9516+ db "Reflektor@"
9517+ db "Energiefokus@"
9518+ db "Geduld@"
9519+ db "Metronom@"
9520+ db "Spiegeltrick@"
9521+ db "Finale@"
9522+ db "Eierbombe@"
9523+ db "Schlecker@"
9524+ db "Smog@"
9525+ db "Schlammbad@"
9526+ db "Knochenkeule@"
9527+ db "Feuersturm@"
9528+ db "Kaskade@"
9529+ db "Schnapper@"
9530+ db "Sternschauer@"
9531+ db "Schädelwumme@"
9532+ db "Dornkanone@"
9533+ db "Umklammerung@"
9534+ db "Amnesie@"
9535+ db "Psykraft@"
9536+ db "Weichei@"
9537+ db "Turmkick@"
9538+ db "Giftblick@"
9539+ db "Traumfresser@"
9540+ db "Giftwolke@"
9541+ db "Stakkato@"
9542+ db "Blutsauger@"
9543+ db "Todeskuss@"
9544+ db "Himmelsfeger@"
9545+ db "Wandler@"
9546+ db "Blubber@"
9547+ db "Irrschlag@"
9548+ db "Pilzspore@"
9549+ db "Blitz@"
9550+ db "Psywelle@"
9551+ db "Platscher@"
9552+ db "Säurepanzer@"
9553+ db "Krabbhammer@"
9554+ db "Explosion@"
9555+ db "Kratzfurie@"
9556+ db "Knochmerang@"
9557+ db "Erholung@"
9558+ db "Steinhagel@"
9559+ db "Hyperzahn@"
9560+ db "Schärfer@"
9561+ db "Umwandlung@"
9562+ db "Triplette@"
9563+ db "Superzahn@"
9564+ db "Schlitzer@"
9565+ db "Delegator@"
9566+ db "Knirscher@"
9567+ db "Verzweifler@"
9568diff --git a/text/oakspeech.asm b/text/oakspeech.asm
9569old mode 100644
9570new mode 100755
9571index 5911092c..9671b0cc
9572--- a/text/oakspeech.asm
9573+++ b/text/oakspeech.asm
9574@@ -1,55 +1,62 @@
9575 _OakSpeechText1::
9576- text "Hello there!"
9577- line "Welcome to the"
9578- cont "world of #MON!"
9579-
9580- para "My name is OAK!"
9581- line "People call me"
9582- cont "the #MON PROF!"
9583+ text "Hallo! Herzlich"
9584+ line "willkommen in der"
9585+ cont "Welt der #MON!"
9586+
9587+ para "Mein Name ist"
9588+ line "EICH! Man nennt"
9589+ cont "mich den #MON-"
9590+ cont "PROFESSOR!"
9591 prompt
9592
9593 _OakSpeechText2A::
9594- text "This world is"
9595- line "inhabited by"
9596- cont "creatures called"
9597- cont "#MON!@@"
9598+ text "Diese Welt wird"
9599+ line "von Wesen"
9600+ cont "bewohnt, die man"
9601+ cont "#MON nennt!@@"
9602
9603 _OakSpeechText2B::
9604- text $51,"For some people,"
9605- line "#MON are"
9606- cont "pets. Others use"
9607- cont "them for fights."
9608-
9609- para "Myself..."
9610-
9611- para "I study #MON"
9612- line "as a profession."
9613+ text $51,"Für manche Leute"
9614+ line "sind #MON"
9615+ cont "Haustiere, andere"
9616+ cont "tragen Kämpfe mit"
9617+ cont "ihnen aus."
9618+
9619+ para "Ich selbst..."
9620+
9621+ para "...habe mein"
9622+ line "Hobby zum Beruf"
9623+ cont "gemacht und"
9624+ cont "studiere #MON."
9625 prompt
9626
9627 _IntroducePlayerText::
9628- text "First, what is"
9629- line "your name?"
9630+ text "Wie lautet Dein"
9631+ line "Name?"
9632 prompt
9633
9634 _IntroduceRivalText::
9635- text "This is my grand-"
9636- line "son. He's been"
9637- cont "your rival since"
9638- cont "you were a baby."
9639-
9640- para "...Erm, what is"
9641- line "his name again?"
9642+ text "Dies ist mein"
9643+ line "Enkel."
9644+ cont "Von jeher wollt"
9645+ cont "Ihr einander"
9646+ cont "übertrumpfen!"
9647+
9648+ para "Hmm, wie war noch"
9649+ line "gleich sein Name?"
9650 prompt
9651
9652 _OakSpeechText3::
9653 text $52,"!"
9654
9655- para "Your very own"
9656- line "#MON legend is"
9657- cont "about to unfold!"
9658+ para "Eine unglaubliche"
9659+ line "Reise in die Welt"
9660+ cont "der #MON"
9661+ cont "erwartet Dich!"
9662
9663- para "A world of dreams"
9664- line "and adventures"
9665- cont "with #MON"
9666- cont "awaits! Let's go!"
9667+ para "Eine Welt voller"
9668+ line "Wunder, Abenteuer"
9669+ cont "und Geheimnisse!"
9670+ cont "Kurz gesagt, ein"
9671+ cont "Traum wird wahr!"
9672 done
9673diff --git a/text/pokedex.asm b/text/pokedex.asm
9674old mode 100644
9675new mode 100755
9676index 7e84a83d..7e621c5e
9677--- a/text/pokedex.asm
9678+++ b/text/pokedex.asm
9679@@ -1107,7 +1107,7 @@ _RhyhornDexEntry::
9680 next "falls asleep"
9681 dex
9682
9683-_RhydonDexEntry::
9684+_RizerosDexEntry::
9685 text "Walks on its hind"
9686 next "legs. Shows signs"
9687 next "of intelligence."
9688@@ -1506,3 +1506,24 @@ _MewDexEntry::
9689 next "fine, delicate"
9690 next "hair can be seen"
9691 dex
9692+
9693+_StahlosDexEntry::
9694+ text "Es wurde tief in"
9695+ next "der Erde deratig"
9696+ next "zusammengestaucht,"
9697+
9698+ page "dass sein Körper"
9699+ next "härter als ein"
9700+ next "Diamant wurde"
9701+ dex
9702+
9703+_IksbatDexEntry::
9704+ text "Aufgrund seines"
9705+ next "Strebens noch"
9706+ next "schneller und"
9707+
9708+ page "leiser zu fliegen,"
9709+ next "wuchsen ihm zwei"
9710+ next "neue Flügel"
9711+ dex
9712+
9713diff --git a/text/pokedex_ratings.asm b/text/pokedex_ratings.asm
9714old mode 100644
9715new mode 100755
9716diff --git a/text/type_names.asm b/text/type_names.asm
9717index d94675b8..8db59379 100755
9718--- a/text/type_names.asm
9719+++ b/text/type_names.asm
9720@@ -10,8 +10,8 @@ TypeNames:
9721 dw .Bug
9722 dw .Ghost
9723
9724- dw .Normal
9725- dw .Normal
9726+ dw .Steel
9727+ dw .Dark
9728 dw .Normal
9729 dw .Normal
9730 dw .Normal
9731@@ -29,20 +29,24 @@ TypeNames:
9732 dw .Psychic
9733 dw .Ice
9734 dw .Dragon
9735+ dw .Fairy
9736
9737-.Normal: db "NORMAL@"
9738-.Fighting: db "FIGHTING@"
9739-.Flying: db "FLYING@"
9740-.Poison: db "POISON@"
9741-.Fire: db "FIRE@"
9742-.Water: db "WATER@"
9743-.Grass: db "GRASS@"
9744-.Electric: db "ELECTRIC@"
9745-.Psychic: db "PSYCHIC@"
9746-.Ice: db "ICE@"
9747-.Ground: db "GROUND@"
9748-.Rock: db "ROCK@"
9749-.Bird: db "BIRD@"
9750-.Bug: db "BUG@"
9751-.Ghost: db "GHOST@"
9752-.Dragon: db "DRAGON@"
9753+.Normal: db "Normal@"
9754+.Fighting: db "Kampf@"
9755+.Flying: db "Flug@"
9756+.Poison: db "Gift@"
9757+.Fire: db "Feuer@"
9758+.Water: db "Wasser@"
9759+.Grass: db "Pflanze@"
9760+.Electric: db "Elektro@"
9761+.Psychic: db "Psycho@"
9762+.Ice: db "Eis@"
9763+.Ground: db "Boden@"
9764+.Rock: db "Gestein@"
9765+.Bird: db "Vogel@"
9766+.Bug: db "Käfer@"
9767+.Ghost: db "Gheist@"
9768+.Dragon: db "Drache@"
9769+.Steel: db "Stahl@"
9770+.Dark: db "Unlicht@"
9771+.Fairy: db "Fee@"
9772diff --git a/text/unused_names.asm b/text/unused_names.asm
9773old mode 100644
9774new mode 100755
9775index dd4c9a12..ffb2c85b
9776--- a/text/unused_names.asm
9777+++ b/text/unused_names.asm
9778@@ -17,4 +17,4 @@ UnusedNames:
9779 db "キャプテン@"
9780 db "プチマスター@"
9781 db "マスター@"
9782- db "エクセレント" ; note the lack of a terminator
9783+ db "エクセレント" ; note the lack of a terminator
9784\ No newline at end of file
9785diff --git a/vram.asm b/vram.asm
9786old mode 100644
9787new mode 100755
9788diff --git a/wram.asm b/wram.asm
9789index 543072ab..dace1647 100755
9790--- a/wram.asm
9791+++ b/wram.asm
9792@@ -1336,9 +1336,6 @@ wFieldMovesLeftmostXCoord:: ; cd42
9793 wcd42:: ; cd42
9794 ds 1
9795
9796-wLastFieldMoveID:: ; cd43
9797-; unused
9798-
9799 wSlotMachineWheel1TopTile:: ; cd43
9800 ds 1
9801
9802@@ -2338,6 +2335,8 @@ wMonHGrowthRate:: ; d0ca
9803 wMonHLearnset:: ; d0cb
9804 ; bit field
9805 flag_array 50 + 5
9806+
9807+wMonHSpriteBank:: ; d0cc
9808 ds 1
9809
9810 wSavedTilesetType:: ; d0d3
9811@@ -2556,6 +2555,8 @@ wUnusedD153:: ; d152
9812
9813 wEvoStoneItemID:: ; d155
9814 ds 1
9815+
9816+ ds 2
9817
9818 wSavedNPCMovementDirections2Index:: ; d156
9819 ds 1
9820@@ -2591,10 +2592,8 @@ wPokedexOwned:: ; d2f5
9821 flag_array NUM_POKEMON
9822 wPokedexOwnedEnd::
9823
9824-wPokedexSeen:: ; d309
9825- flag_array NUM_POKEMON
9826-wPokedexSeenEnd::
9827-
9828+ flag_array 2 * 151 - NUM_POKEMON
9829+wPokedexSeenEndOld:: ; d309
9830
9831 wNumBagItems:: ; d31c
9832 ds 1
9833@@ -2820,9 +2819,15 @@ wWarpEntries:: ; d3ae
9834 ; current map warp entries
9835 ds 128
9836
9837-wDestinationWarpID:: ; d42e
9838+wDestinationWarpID:: ; d42f
9839 ; if $ff, the player's coordinates are not updated when entering the map
9840 ds 1
9841+
9842+wPokedexSeen::
9843+ flag_array NUM_POKEMON
9844+wPokedexSeenEnd::
9845+
9846+ ds 128 - (wPokedexSeenEnd - wPokedexSeen)
9847
9848 wPikachuOverworldStateFlags:: ds 1 ; d42f
9849 wPikachuSpawnState:: ds 1 ; d430
9850@@ -2838,7 +2843,7 @@ wExpressionNumber:: ; d447
9851 ds 1
9852 wPikaPicAnimNumber:: ; d448
9853 ds 1
9854-
9855+
9856 wPikachuMovementScriptBank:: ds 1 ; d449
9857 wPikachuMovementScriptAddress:: dw ; d44a
9858 wPikachuMovementFlags:: ; d44c
9859@@ -2901,11 +2906,11 @@ wd475:: ds 1 ; d474
9860 wd47a:: ds 1 ; d479
9861
9862 ds 24
9863-
9864+
9865 wd492:: ds 1 ; d492
9866-
9867+
9868+
9869 ds 1
9870-
9871+
9872 wSurfingMinigameHiScore:: ds 2 ; 4-digit BCD little-endian
9873 ds 1
9874
9875@@ -2917,7 +2922,7 @@ wd49c:: ds 1 ; d49b
9876
9877 ds 19
9878
9879-wNumSigns:: ; d4af
9880+wNumSigns:: ; d4b0
9881 ; number of signs in the current map (up to 16)
9882 ds 1
9883
9884@@ -3257,6 +3262,7 @@ wRoute18GateCurScript:: ; d668
9885 ds 78
9886 wGameProgressFlagsEnd:: ; d6b7
9887
9888+wEvolutionData::
9889 ds 56
9890
9891 wObtainedHiddenItemsFlags:: ; d6ef
9892(END)