Browse Source

more tables, removed footprints

Philipp 8 years ago
parent
commit
d20a4d1035

+ 2
- 2
data/pkmn_tables/pokemon_enemy_y_table.s View File

@@ -2,6 +2,6 @@
2 2
 .thumb
3 3
 .text
4 4
 
5
-.global pkmn_enemy_y_table
6
-pkmn_enemy_y_table:
5
+.global pokemon_enemy_y_table
6
+pokemon_enemy_y_table:
7 7
 .incbin "data/pkmn_tables/pkmn_enemy_y_table_dump.bin"

+ 2
- 2
data/pkmn_tables/pokemon_player_y_table.s View File

@@ -2,6 +2,6 @@
2 2
 .thumb
3 3
 .text
4 4
 
5
-.global pkmn_player_y_table
6
-pkmn_player_y_table:
5
+.global pokemon_player_y_table
6
+pokemon_player_y_table:
7 7
 .incbin "data/pkmn_tables/pkmn_player_y_table_dump.bin"

+ 4
- 1
main.asm View File

@@ -11,7 +11,10 @@
11 11
 .include "patches/moves.asm"
12 12
 .include "patches/music.asm"
13 13
 
14
-//.include "strings/de_DE/pkmn_names.asm"
14
+.include "patches/pokemon_data/pokemon_footprints.asm"
15
+.include "patches/pokemon_data/altitude_table.asm"
16
+.include "patches/pokemon_data/enemy_y_table.asm"
17
+.include "patches/pokemon_data/player_y_table.asm"
15 18
 .include "patches/pokemon_data/pokedex_order.asm"
16 19
 .include "patches/pokemon_data/pokedex.asm"
17 20
 .include "patches/pokemon_data/pokemon_egg_moves.asm"

+ 4
- 4
patches/pokemon_data/altitude_table.asm View File

@@ -1,12 +1,12 @@
1 1
 .org 0x080356F8
2
-.word altitude_table
2
+.word pkmn_enemy_altitude_table
3 3
 
4 4
 .org 0x0803575C
5
-.word altitude_table
5
+.word pkmn_enemy_altitude_table
6 6
 
7 7
 .org 0x08074794
8
-.word altitude_table
8
+.word pkmn_enemy_altitude_table
9 9
 
10 10
 .org 0x080747A8
11
-.word altitude_table
11
+.word pkmn_enemy_altitude_table
12 12
 

+ 16
- 16
patches/pokemon_data/enemy_y_table.asm View File

@@ -1,48 +1,48 @@
1 1
 .org 0x08011F4C
2
-.word enemy_y_table
2
+.word pokemon_enemy_y_table
3 3
 
4 4
 .org 0x08011F80
5
-.word enemy_y_table
5
+.word pokemon_enemy_y_table
6 6
 
7 7
 .org 0x08011FAC
8
-.word enemy_y_table
8
+.word pokemon_enemy_y_table
9 9
 
10 10
 .org 0x080477E0
11
-.word enemy_y_table
11
+.word pokemon_enemy_y_table
12 12
 
13 13
 .org 0x08051410
14
-.word enemy_y_table
14
+.word pokemon_enemy_y_table
15 15
 
16 16
 .org 0x08052120
17
-.word enemy_y_table
17
+.word pokemon_enemy_y_table
18 18
 
19 19
 .org 0x08052800
20
-.word enemy_y_table
20
+.word pokemon_enemy_y_table
21 21
 
22 22
 .org 0x0805357C
23
-.word enemy_y_table
23
+.word pokemon_enemy_y_table
24 24
 
25 25
 .org 0x08074700
26
-.word enemy_y_table
26
+.word pokemon_enemy_y_table
27 27
 
28 28
 .org 0x08074734
29
-.word enemy_y_table
29
+.word pokemon_enemy_y_table
30 30
 
31 31
 .org 0x08074748
32
-.word enemy_y_table
32
+.word pokemon_enemy_y_table
33 33
 
34 34
 .org 0x080765A8
35
-.word enemy_y_table
35
+.word pokemon_enemy_y_table
36 36
 
37 37
 .org 0x08076AD8
38
-.word enemy_y_table
38
+.word pokemon_enemy_y_table
39 39
 
40 40
 .org 0x08076CD4
41
-.word enemy_y_table
41
+.word pokemon_enemy_y_table
42 42
 
43 43
 .org 0x08076CF0
44
-.word enemy_y_table
44
+.word pokemon_enemy_y_table
45 45
 
46 46
 .org 0x0814A938
47
-.word enemy_y_table
47
+.word pokemon_enemy_y_table
48 48
 

+ 8
- 8
patches/pokemon_data/player_y_table.asm View File

@@ -1,24 +1,24 @@
1 1
 .org 0x08074634
2
-.word player_y_table
2
+.word pokemon_player_y_table
3 3
 
4 4
 .org 0x08074664
5
-.word player_y_table
5
+.word pokemon_player_y_table
6 6
 
7 7
 .org 0x08074670
8
-.word player_y_table
8
+.word pokemon_player_y_table
9 9
 
10 10
 .org 0x08076564
11
-.word player_y_table
11
+.word pokemon_player_y_table
12 12
 
13 13
 .org 0x08076B1C
14
-.word player_y_table
14
+.word pokemon_player_y_table
15 15
 
16 16
 .org 0x08076BE8
17
-.word player_y_table
17
+.word pokemon_player_y_table
18 18
 
19 19
 .org 0x08076BF8
20
-.word player_y_table
20
+.word pokemon_player_y_table
21 21
 
22 22
 .org 0x08076C04
23
-.word player_y_table
23
+.word pokemon_player_y_table
24 24
 

+ 2
- 0
patches/pokemon_data/pokemon_footprints.asm View File

@@ -0,0 +1,2 @@
1
+.org 0x08105E14
2
+.word pokemon_footprints

+ 0
- 3602
strings/de_DE/pkmn_names.asm
File diff suppressed because it is too large
View File


+ 0
- 164
strings/de_DE/table.tbl View File

@@ -1,164 +0,0 @@
1
-[Table]
2
-00= 
3
-01=À
4
-02=Á
5
-03=Â
6
-04=Ç
7
-05=È
8
-06=É
9
-07=Ê
10
-08=Ë
11
-09=Ì
12
-0B=Î
13
-0C=Ï
14
-0D=Ò
15
-0E=Ó
16
-0F=Ô
17
-10=Œ
18
-11=Ù
19
-12=Ú
20
-13=Û
21
-14=Ñ
22
-15=ß
23
-16=à
24
-17=á
25
-19=ç
26
-1A=è
27
-1B=é
28
-1C=ê
29
-1D=ë
30
-1E=ì
31
-20=î
32
-21=ï
33
-22=ò
34
-23=ó
35
-24=ô
36
-25=œ
37
-26=ù
38
-27=ú
39
-28=û
40
-29=ñ
41
-2A=º
42
-2B=ª
43
-2D=&
44
-2E=+
45
-34=[Lv]
46
-35==
47
-36=;
48
-51=¿
49
-52=¡
50
-53=[pk]
51
-54=[mn]
52
-55=[po]
53
-56=[ké]
54
-57=[bl]
55
-58=[oc]
56
-59=[k]
57
-5A=Í
58
-5B=%
59
-5C=(
60
-5D=)
61
-68=â
62
-6F=í
63
-79=[U]
64
-7A=[D]
65
-7B=[L]
66
-7C=[R]
67
-85=<
68
-86=>
69
-A1=0
70
-A2=1
71
-A3=2
72
-A4=3
73
-A5=4
74
-A6=5
75
-A7=6
76
-A8=7
77
-A9=8
78
-AA=9
79
-AB=!
80
-AC=?
81
-AD=.
82
-AE=-
83
-AF=·
84
-B0=...
85
-B1=«
86
-B2=»
87
-B3='
88
-B4='
89
-B5=|m|
90
-B6=|f|
91
-B7=$
92
-B8=,
93
-B9=*
94
-BA=/
95
-BB=A
96
-BC=B
97
-BD=C
98
-BE=D
99
-BF=E
100
-C0=F
101
-C1=G
102
-C2=H
103
-C3=I
104
-C4=J
105
-C5=K
106
-C6=L
107
-C7=M
108
-C8=N
109
-C9=O
110
-CA=P
111
-CB=Q
112
-CC=R
113
-CD=S
114
-CE=T
115
-CF=U
116
-D0=V
117
-D1=W
118
-D2=X
119
-D3=Y
120
-D4=Z
121
-D5=a
122
-D6=b
123
-D7=c
124
-D8=d
125
-D9=e
126
-DA=f
127
-DB=g
128
-DC=h
129
-DD=i
130
-DE=j
131
-DF=k
132
-E0=l
133
-E1=m
134
-E2=n
135
-E3=o
136
-E4=p
137
-E5=q
138
-E6=r
139
-E7=s
140
-E8=t
141
-E9=u
142
-EA=v
143
-EB=w
144
-EC=x
145
-ED=y
146
-EE=z
147
-EF=|>|
148
-F0=:
149
-F1=Ä
150
-F2=Ö
151
-F3=Ü
152
-F4=ä
153
-F5=ö
154
-F6=ü
155
-F7=|A|
156
-F8=|V|
157
-F9=|<|
158
-FA=|nb|
159
-FB=|nb2|
160
-//FC=|FC|
161
-//FC=" " damit sieht es blöd aus... (dan hat es 2 lücken)
162
-FD=|FD|
163
-FE=|br|
164
-FF=|end|

+ 0
- 7
todo/pkmn_enemy_altitude_table.s View File

@@ -1,7 +0,0 @@
1
-.align 2
2
-.thumb
3
-.text
4
-
5
-.global pkmn_enemy_altitude_table
6
-pkmn_enemy_altitude_table:
7
-.incbin "data/pkmn_tables/pkmn_enemy_altitude_table_dump.bin"

+ 0
- 7
todo/pkmn_enemy_y_table.s View File

@@ -1,7 +0,0 @@
1
-.align 2
2
-.thumb
3
-.text
4
-
5
-.global pkmn_enemy_y_table
6
-pkmn_enemy_y_table:
7
-.incbin "data/pkmn_tables/pkmn_enemy_y_table_dump.bin"

+ 0
- 7
todo/pkmn_player_y_table.s View File

@@ -1,7 +0,0 @@
1
-.align 2
2
-.thumb
3
-.text
4
-
5
-.global pkmn_player_y_table
6
-pkmn_player_y_table:
7
-.incbin "data/pkmn_tables/pkmn_player_y_table_dump.bin"

data/pkmn_tables/pokemon_evolution.s → todo/pokemon_evolution.s View File


+ 0
- 1205
todo/pokemon_evolutionen.s
File diff suppressed because it is too large
View File


+ 0
- 2006
todo/pokemon_footprints.s
File diff suppressed because it is too large
View File


todo/pokemon_habitate.s → todo/pokemon_habitats.s View File


+ 0
- 1203
todo/pokemon_movetutorcomp.s
File diff suppressed because it is too large
View File


todo/tm_vm_kompatibilitaet.s → todo/pokemon_tm_vm.s View File