summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2016-08-31 18:45:31 -0400
committerProjectRevoTPP <projectrevotpp@hotmail.com>2016-08-31 18:45:31 -0400
commitab04f0d19f36812069a0374b350d80729d750329 (patch)
tree3b90f4f32769ab3ee45405c366565db0d9b4696f
parent479be386e5f8b863e02905334f73ba88c1702049 (diff)
parent2c2f4255cb96c3fea95e5fac7655c00cabff9cfb (diff)
Merge remote-tracking branch 'origin/master'
Diffstat
-rw-r--r--asm/macros.s13
-rw-r--r--asm/rom5.s44
-rw-r--r--data/clock_hand_coords.s361
-rw-r--r--data/data2.s82
-rw-r--r--data/pokedex_orders.s1191
-rw-r--r--data/species_id_conversion_tables.s (renamed from data/pokedex_order.s)0
-rw-r--r--data/trainer_eye_trainers.s58
-rw-r--r--graphics/intro/intro2_bgclouds_map.binbin0 -> 4096 bytes
-rw-r--r--graphics/intro/intro2_bgnight_map.binbin0 -> 4096 bytes
-rw-r--r--graphics/intro/intro2_bgtrees_map.binbin0 -> 4096 bytes
-rw-r--r--graphics/intro/intro2_grass_map.binbin0 -> 2048 bytes
-rw-r--r--[-rwxr-xr-x]graphics/intro/intro2_night.png (renamed from graphics/intro/intro2_bgnight2.png)bin212 -> 212 bytes
-rw-r--r--graphics/misc/darkness_field_move_streaks.pal19
-rw-r--r--graphics/misc/darkness_field_move_streaks.pngbin0 -> 159 bytes
-rw-r--r--graphics/misc/darkness_field_move_streaks_map.binbin0 -> 640 bytes
-rw-r--r--graphics/misc/field_move_streaks.pal19
-rw-r--r--graphics/misc/field_move_streaks.pngbin0 -> 157 bytes
-rw-r--r--graphics/misc/field_move_streaks_map.binbin0 -> 640 bytes
18 files changed, 1730 insertions, 57 deletions
diff --git a/asm/macros.s b/asm/macros.s
index 49ed99695..42c35026e 100644
--- a/asm/macros.s
+++ b/asm/macros.s
@@ -118,7 +118,7 @@
.2byte \unknown
.fill 4 @ padding
.endm
-
+
.macro credits_entry number, text
.4byte \number
.4byte \text
@@ -136,3 +136,14 @@
.4byte \tile_addr
.4byte \palette_addr
.endm
+
+ .macro trainer_eye_trainer opp_1, opp_2, opp_3, opp_4, opp_5, map_name
+ .2byte OPPONENT_\opp_1
+ .2byte OPPONENT_\opp_2
+ .2byte OPPONENT_\opp_3
+ .2byte OPPONENT_\opp_4
+ .2byte OPPONENT_\opp_5
+ .2byte GROUP_\map_name
+ .2byte MAP_\map_name
+ .space 2
+ .endm
diff --git a/asm/rom5.s b/asm/rom5.s
index c756134da..feb8c8ef7 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -16350,7 +16350,7 @@ _08082BFA:
pop {r0}
bx r0
.align 2, 0
-_08082C00: .4byte gUnknown_0839AE70
+_08082C00: .4byte gTrainerEyeTrainers
_08082C04: .4byte 0x02025734
_08082C08: .4byte 0x00000978
thumb_func_end sub_8082BD0
@@ -16370,7 +16370,7 @@ sub_8082C0C: @ 8082C0C
pop {r1}
bx r1
.align 2, 0
-_08082C28: .4byte gUnknown_0839AE70
+_08082C28: .4byte gTrainerEyeTrainers
thumb_func_end sub_8082C0C
thumb_func_start unref_sub_8082C2C
@@ -16388,7 +16388,7 @@ unref_sub_8082C2C: @ 8082C2C
pop {r1}
bx r1
.align 2, 0
-_08082C48: .4byte gUnknown_0839AE70
+_08082C48: .4byte gTrainerEyeTrainers
thumb_func_end unref_sub_8082C2C
thumb_func_start sub_8082C4C
@@ -16404,7 +16404,7 @@ sub_8082C4C: @ 8082C4C
pop {r1}
bx r1
.align 2, 0
-_08082C64: .4byte gUnknown_0839AE70
+_08082C64: .4byte gTrainerEyeTrainers
thumb_func_end sub_8082C4C
thumb_func_start sub_8082C68
@@ -16425,7 +16425,7 @@ sub_8082C68: @ 8082C68
lsrs r0, 24
b _08082C96
.align 2, 0
-_08082C8C: .4byte gUnknown_0839AE70
+_08082C8C: .4byte gTrainerEyeTrainers
_08082C90: .4byte 0x0202ff5e
_08082C94:
movs r0, 0x1
@@ -16447,7 +16447,7 @@ sub_8082C9C: @ 8082C9C
pop {r1}
bx r1
.align 2, 0
-_08082CB0: .4byte gUnknown_0839AE70
+_08082CB0: .4byte gTrainerEyeTrainers
_08082CB4: .4byte 0x0202ff5e
thumb_func_end sub_8082C9C
@@ -16462,7 +16462,7 @@ sub_8082CB8: @ 8082CB8
pop {r0}
bx r0
.align 2, 0
-_08082CCC: .4byte gUnknown_0839AE70
+_08082CCC: .4byte gTrainerEyeTrainers
_08082CD0: .4byte 0x0202ff5e
thumb_func_end sub_8082CB8
@@ -27630,9 +27630,9 @@ sub_80881C0: @ 80881C0
bx r0
.align 2, 0
_08088218: .4byte REG_BG0CNT
-_0808821C: .4byte gUnknown_0839E914
+_0808821C: .4byte gFieldMoveStreaksTiles
_08088220: .4byte 0x05000200
-_08088224: .4byte gUnknown_0839EB14
+_08088224: .4byte gFieldMoveStreaksPalette
thumb_func_end sub_80881C0
thumb_func_start sub_8088228
@@ -27943,7 +27943,7 @@ _08088452:
bx r0
.align 2, 0
_08088470: .4byte 0x06000140
-_08088474: .4byte gUnknown_0839EB34
+_08088474: .4byte gFieldMoveStreaksTilemap
_08088478: .4byte 0x0000013f
thumb_func_end sub_808843C
@@ -28048,9 +28048,9 @@ sub_80884E8: @ 80884E8
bx r0
.align 2, 0
_08088544: .4byte REG_BG0CNT
-_08088548: .4byte gUnknown_0839EDB4
+_08088548: .4byte gDarknessFieldMoveStreaksTiles
_0808854C: .4byte 0x05000200
-_08088550: .4byte gUnknown_0839EE34
+_08088550: .4byte gDarknessFieldMoveStreaksPalette
thumb_func_end sub_80884E8
thumb_func_start sub_8088554
@@ -28366,7 +28366,7 @@ _080887A8:
bx r1
.align 2, 0
_080887B8: .4byte 0x06000140
-_080887BC: .4byte gUnknown_0839EE54
+_080887BC: .4byte gDarknessFieldMoveStreaksTilemap
thumb_func_end sub_8088708
thumb_func_start sub_80887C0
@@ -38487,7 +38487,7 @@ _0808D914:
.align 2, 0
_0808D928: .4byte 0x0202ffb4
_0808D92C: .4byte 0x0000060c
-_0808D930: .4byte gUnknown_0839FAC4
+_0808D930: .4byte gPokedexOrder_Alphabetical
_0808D934:
ldr r4, _0808D9B0
lsls r0, r4, 16
@@ -38554,7 +38554,7 @@ _0808D99E:
_0808D9B0: .4byte 0x00000181
_0808D9B4: .4byte 0x0202ffb4
_0808D9B8: .4byte 0x0000060c
-_0808D9BC: .4byte gUnknown_0839FDFA
+_0808D9BC: .4byte gPokedexOrder_Weight
_0808D9C0: .4byte 0xffff0000
_0808D9C4:
movs r4, 0
@@ -38628,7 +38628,7 @@ _0808DA3A:
_0808DA4C: .4byte 0x0202ffb4
_0808DA50: .4byte 0x0000060c
_0808DA54: .4byte 0x00000181
-_0808DA58: .4byte gUnknown_0839FDFA
+_0808DA58: .4byte gPokedexOrder_Weight
_0808DA5C:
ldr r4, _0808DAD8
lsls r0, r4, 16
@@ -38695,7 +38695,7 @@ _0808DAC6:
_0808DAD8: .4byte 0x00000181
_0808DADC: .4byte 0x0202ffb4
_0808DAE0: .4byte 0x0000060c
-_0808DAE4: .4byte gUnknown_083A00FE
+_0808DAE4: .4byte gPokedexOrder_Height
_0808DAE8: .4byte 0xffff0000
_0808DAEC:
movs r4, 0
@@ -38821,7 +38821,7 @@ _0808DBC4:
_0808DBD4: .4byte 0x0202ffb4
_0808DBD8: .4byte 0x0000060c
_0808DBDC: .4byte 0x00000181
-_0808DBE0: .4byte gUnknown_083A00FE
+_0808DBE0: .4byte gPokedexOrder_Height
_0808DBE4: .4byte 0x0000ffff
thumb_func_end sub_808D690
@@ -254360,7 +254360,7 @@ _080F6D0E:
_080F6D44: .4byte gUnknown_083DFEC4
_080F6D48: .4byte 0x0000d158
_080F6D4C: .4byte 0x020260ae
-_080F6D50: .4byte gUnknown_0839AE70
+_080F6D50: .4byte gTrainerEyeTrainers
_080F6D54: .4byte 0x0000cee8
_080F6D58: .4byte 0x0000ceec
_080F6D5C: .4byte 0x0000ceea
@@ -294076,7 +294076,7 @@ _081099E0:
.align 2, 0
_08109A14: .4byte 0x020284c8
_08109A18: .4byte gUnknown_083F62D8
-_08109A1C: .4byte gUnknown_083F62E8
+_08109A1C: .4byte gTraderDecorations
thumb_func_end sub_81099CC
thumb_func_start sub_8109A20
@@ -296935,7 +296935,7 @@ _0810B0E0:
bx r0
.align 2, 0
_0810B0EC: .4byte 0x03004b20
-_0810B0F0: .4byte gUnknown_083F7B58
+_0810B0F0: .4byte gClockHandCoords
thumb_func_end sub_810B05C
thumb_func_start sub_810B0F4
@@ -297015,7 +297015,7 @@ _0810B178:
bx r0
.align 2, 0
_0810B184: .4byte 0x03004b20
-_0810B188: .4byte gUnknown_083F7B58
+_0810B188: .4byte gClockHandCoords
thumb_func_end sub_810B0F4
thumb_func_start sub_810B18C
diff --git a/data/clock_hand_coords.s b/data/clock_hand_coords.s
new file mode 100644
index 000000000..476ffb788
--- /dev/null
+++ b/data/clock_hand_coords.s
@@ -0,0 +1,361 @@
+gClockHandCoords:: @ 83F7B58
+ .byte 0, -24 @ 0
+ .byte 1, -25 @ 1
+ .byte 1, -25 @ 2
+ .byte 2, -25 @ 3
+ .byte 2, -25 @ 4
+ .byte 2, -25 @ 5
+ .byte 3, -24 @ 6
+ .byte 3, -25 @ 7
+ .byte 4, -25 @ 8
+ .byte 4, -25 @ 9
+ .byte 4, -25 @ 10
+ .byte 5, -25 @ 11
+ .byte 5, -25 @ 12
+ .byte 6, -24 @ 13
+ .byte 6, -24 @ 14
+ .byte 6, -24 @ 15
+ .byte 7, -24 @ 16
+ .byte 7, -24 @ 17
+ .byte 7, -24 @ 18
+ .byte 8, -24 @ 19
+ .byte 8, -24 @ 20
+ .byte 9, -24 @ 21
+ .byte 9, -24 @ 22
+ .byte 10, -23 @ 23
+ .byte 10, -23 @ 24
+ .byte 11, -22 @ 25
+ .byte 11, -22 @ 26
+ .byte 11, -22 @ 27
+ .byte 12, -22 @ 28
+ .byte 12, -21 @ 29
+ .byte 13, -21 @ 30
+ .byte 13, -21 @ 31
+ .byte 13, -21 @ 32
+ .byte 14, -21 @ 33
+ .byte 14, -21 @ 34
+ .byte 14, -20 @ 35
+ .byte 14, -20 @ 36
+ .byte 15, -20 @ 37
+ .byte 15, -19 @ 38
+ .byte 16, -19 @ 39
+ .byte 16, -19 @ 40
+ .byte 16, -19 @ 41
+ .byte 16, -18 @ 42
+ .byte 16, -18 @ 43
+ .byte 17, -18 @ 44
+ .byte 17, -17 @ 45
+ .byte 17, -17 @ 46
+ .byte 18, -17 @ 47
+ .byte 18, -17 @ 48
+ .byte 18, -16 @ 49
+ .byte 18, -16 @ 50
+ .byte 19, -16 @ 51
+ .byte 19, -15 @ 52
+ .byte 19, -15 @ 53
+ .byte 20, -15 @ 54
+ .byte 20, -14 @ 55
+ .byte 20, -14 @ 56
+ .byte 20, -13 @ 57
+ .byte 20, -13 @ 58
+ .byte 21, -13 @ 59
+ .byte 21, -13 @ 60
+ .byte 21, -12 @ 61
+ .byte 22, -12 @ 62
+ .byte 22, -12 @ 63
+ .byte 22, -11 @ 64
+ .byte 22, -11 @ 65
+ .byte 22, -10 @ 66
+ .byte 23, -10 @ 67
+ .byte 23, -9 @ 68
+ .byte 23, -9 @ 69
+ .byte 23, -9 @ 70
+ .byte 23, -9 @ 71
+ .byte 23, -8 @ 72
+ .byte 23, -8 @ 73
+ .byte 23, -7 @ 74
+ .byte 23, -7 @ 75
+ .byte 23, -6 @ 76
+ .byte 24, -6 @ 77
+ .byte 24, -6 @ 78
+ .byte 25, -5 @ 79
+ .byte 25, -5 @ 80
+ .byte 24, -4 @ 81
+ .byte 25, -4 @ 82
+ .byte 24, -3 @ 83
+ .byte 25, -3 @ 84
+ .byte 25, -3 @ 85
+ .byte 25, -2 @ 86
+ .byte 25, -2 @ 87
+ .byte 24, -1 @ 88
+ .byte 25, -1 @ 89
+ .byte 24, 0 @ 90
+ .byte 24, 0 @ 91
+ .byte 24, 0 @ 92
+ .byte 24, 1 @ 93
+ .byte 24, 1 @ 94
+ .byte 25, 2 @ 95
+ .byte 24, 2 @ 96
+ .byte 25, 2 @ 97
+ .byte 24, 3 @ 98
+ .byte 24, 3 @ 99
+ .byte 25, 4 @ 100
+ .byte 24, 4 @ 101
+ .byte 24, 5 @ 102
+ .byte 24, 5 @ 103
+ .byte 24, 5 @ 104
+ .byte 24, 6 @ 105
+ .byte 23, 6 @ 106
+ .byte 23, 6 @ 107
+ .byte 23, 7 @ 108
+ .byte 23, 8 @ 109
+ .byte 23, 8 @ 110
+ .byte 23, 8 @ 111
+ .byte 23, 9 @ 112
+ .byte 23, 9 @ 113
+ .byte 23, 10 @ 114
+ .byte 22, 10 @ 115
+ .byte 22, 10 @ 116
+ .byte 22, 11 @ 117
+ .byte 22, 11 @ 118
+ .byte 22, 11 @ 119
+ .byte 22, 12 @ 120
+ .byte 21, 12 @ 121
+ .byte 21, 12 @ 122
+ .byte 21, 13 @ 123
+ .byte 20, 13 @ 124
+ .byte 20, 13 @ 125
+ .byte 19, 13 @ 126
+ .byte 19, 13 @ 127
+ .byte 19, 14 @ 128
+ .byte 19, 14 @ 129
+ .byte 19, 15 @ 130
+ .byte 19, 15 @ 131
+ .byte 18, 15 @ 132
+ .byte 18, 16 @ 133
+ .byte 17, 16 @ 134
+ .byte 17, 16 @ 135
+ .byte 17, 17 @ 136
+ .byte 17, 17 @ 137
+ .byte 16, 17 @ 138
+ .byte 16, 18 @ 139
+ .byte 16, 18 @ 140
+ .byte 15, 18 @ 141
+ .byte 14, 18 @ 142
+ .byte 15, 19 @ 143
+ .byte 14, 19 @ 144
+ .byte 14, 19 @ 145
+ .byte 13, 19 @ 146
+ .byte 13, 20 @ 147
+ .byte 13, 20 @ 148
+ .byte 13, 20 @ 149
+ .byte 12, 20 @ 150
+ .byte 12, 20 @ 151
+ .byte 12, 21 @ 152
+ .byte 11, 21 @ 153
+ .byte 11, 21 @ 154
+ .byte 11, 21 @ 155
+ .byte 10, 21 @ 156
+ .byte 10, 22 @ 157
+ .byte 10, 22 @ 158
+ .byte 9, 22 @ 159
+ .byte 9, 22 @ 160
+ .byte 8, 22 @ 161
+ .byte 7, 22 @ 162
+ .byte 7, 23 @ 163
+ .byte 7, 23 @ 164
+ .byte 6, 23 @ 165
+ .byte 6, 23 @ 166
+ .byte 5, 23 @ 167
+ .byte 5, 23 @ 168
+ .byte 5, 24 @ 169
+ .byte 4, 24 @ 170
+ .byte 4, 24 @ 171
+ .byte 4, 24 @ 172
+ .byte 3, 24 @ 173
+ .byte 2, 24 @ 174
+ .byte 2, 24 @ 175
+ .byte 1, 24 @ 176
+ .byte 1, 24 @ 177
+ .byte 0, 24 @ 178
+ .byte 0, 24 @ 179
+ .byte -1, 23 @ 180
+ .byte 0, 24 @ 181
+ .byte 0, 24 @ 182
+ .byte -1, 24 @ 183
+ .byte -1, 24 @ 184
+ .byte -2, 24 @ 185
+ .byte -2, 24 @ 186
+ .byte -3, 24 @ 187
+ .byte -3, 24 @ 188
+ .byte -4, 24 @ 189
+ .byte -4, 24 @ 190
+ .byte -5, 24 @ 191
+ .byte -5, 23 @ 192
+ .byte -5, 23 @ 193
+ .byte -6, 23 @ 194
+ .byte -6, 23 @ 195
+ .byte -7, 23 @ 196
+ .byte -7, 23 @ 197
+ .byte -7, 23 @ 198
+ .byte -8, 23 @ 199
+ .byte -8, 22 @ 200
+ .byte -9, 22 @ 201
+ .byte -9, 22 @ 202
+ .byte -10, 22 @ 203
+ .byte -10, 22 @ 204
+ .byte -10, 21 @ 205
+ .byte -11, 21 @ 206
+ .byte -11, 21 @ 207
+ .byte -11, 21 @ 208
+ .byte -11, 20 @ 209
+ .byte -12, 20 @ 210
+ .byte -12, 20 @ 211
+ .byte -13, 20 @ 212
+ .byte -13, 20 @ 213
+ .byte -13, 19 @ 214
+ .byte -14, 19 @ 215
+ .byte -14, 19 @ 216
+ .byte -14, 19 @ 217
+ .byte -14, 18 @ 218
+ .byte -15, 18 @ 219
+ .byte -15, 18 @ 220
+ .byte -15, 17 @ 221
+ .byte -16, 17 @ 222
+ .byte -16, 17 @ 223
+ .byte -17, 17 @ 224
+ .byte -17, 16 @ 225
+ .byte -17, 16 @ 226
+ .byte -18, 16 @ 227
+ .byte -17, 15 @ 228
+ .byte -18, 15 @ 229
+ .byte -18, 15 @ 230
+ .byte -19, 15 @ 231
+ .byte -19, 14 @ 232
+ .byte -19, 14 @ 233
+ .byte -19, 13 @ 234
+ .byte -19, 13 @ 235
+ .byte -20, 13 @ 236
+ .byte -20, 12 @ 237
+ .byte -20, 12 @ 238
+ .byte -21, 12 @ 239
+ .byte -21, 12 @ 240
+ .byte -21, 11 @ 241
+ .byte -21, 11 @ 242
+ .byte -21, 10 @ 243
+ .byte -21, 10 @ 244
+ .byte -21, 9 @ 245
+ .byte -22, 9 @ 246
+ .byte -22, 9 @ 247
+ .byte -22, 8 @ 248
+ .byte -22, 8 @ 249
+ .byte -22, 7 @ 250
+ .byte -23, 7 @ 251
+ .byte -23, 7 @ 252
+ .byte -23, 6 @ 253
+ .byte -23, 6 @ 254
+ .byte -23, 5 @ 255
+ .byte -24, 5 @ 256
+ .byte -23, 4 @ 257
+ .byte -23, 4 @ 258
+ .byte -24, 4 @ 259
+ .byte -24, 4 @ 260
+ .byte -24, 3 @ 261
+ .byte -24, 3 @ 262
+ .byte -24, 2 @ 263
+ .byte -24, 2 @ 264
+ .byte -24, 1 @ 265
+ .byte -24, 1 @ 266
+ .byte -24, 1 @ 267
+ .byte -24, 0 @ 268
+ .byte -25, 0 @ 269
+ .byte -24, -1 @ 270
+ .byte -25, -1 @ 271
+ .byte -24, -1 @ 272
+ .byte -24, -2 @ 273
+ .byte -24, -2 @ 274
+ .byte -24, -3 @ 275
+ .byte -24, -3 @ 276
+ .byte -24, -4 @ 277
+ .byte -24, -4 @ 278
+ .byte -24, -4 @ 279
+ .byte -24, -5 @ 280
+ .byte -24, -5 @ 281
+ .byte -24, -6 @ 282
+ .byte -24, -6 @ 283
+ .byte -23, -6 @ 284
+ .byte -23, -7 @ 285
+ .byte -23, -7 @ 286
+ .byte -23, -8 @ 287
+ .byte -23, -8 @ 288
+ .byte -23, -9 @ 289
+ .byte -23, -9 @ 290
+ .byte -22, -9 @ 291
+ .byte -22, -9 @ 292
+ .byte -22, -10 @ 293
+ .byte -22, -10 @ 294
+ .byte -21, -10 @ 295
+ .byte -21, -11 @ 296
+ .byte -22, -11 @ 297
+ .byte -22, -12 @ 298
+ .byte -21, -12 @ 299
+ .byte -21, -13 @ 300
+ .byte -21, -13 @ 301
+ .byte -20, -13 @ 302
+ .byte -21, -14 @ 303
+ .byte -20, -14 @ 304
+ .byte -20, -14 @ 305
+ .byte -19, -14 @ 306
+ .byte -19, -15 @ 307
+ .byte -19, -15 @ 308
+ .byte -18, -16 @ 309
+ .byte -18, -16 @ 310
+ .byte -18, -16 @ 311
+ .byte -18, -17 @ 312
+ .byte -18, -17 @ 313
+ .byte -17, -17 @ 314
+ .byte -17, -18 @ 315
+ .byte -17, -18 @ 316
+ .byte -16, -18 @ 317
+ .byte -16, -18 @ 318
+ .byte -16, -19 @ 319
+ .byte -16, -19 @ 320
+ .byte -15, -19 @ 321
+ .byte -15, -19 @ 322
+ .byte -15, -20 @ 323
+ .byte -14, -20 @ 324
+ .byte -14, -20 @ 325
+ .byte -14, -21 @ 326
+ .byte -13, -21 @ 327
+ .byte -13, -21 @ 328
+ .byte -13, -21 @ 329
+ .byte -12, -21 @ 330
+ .byte -12, -22 @ 331
+ .byte -11, -22 @ 332
+ .byte -11, -22 @ 333
+ .byte -11, -22 @ 334
+ .byte -10, -22 @ 335
+ .byte -10, -22 @ 336
+ .byte -9, -22 @ 337
+ .byte -9, -23 @ 338
+ .byte -9, -23 @ 339
+ .byte -8, -23 @ 340
+ .byte -8, -23 @ 341
+ .byte -7, -23 @ 342
+ .byte -7, -23 @ 343
+ .byte -7, -24 @ 344
+ .byte -6, -24 @ 345
+ .byte -6, -24 @ 346
+ .byte -5, -24 @ 347
+ .byte -5, -24 @ 348
+ .byte -4, -24 @ 349
+ .byte -4, -24 @ 350
+ .byte -4, -24 @ 351
+ .byte -4, -25 @ 352
+ .byte -3, -25 @ 353
+ .byte -2, -25 @ 354
+ .byte -2, -24 @ 355
+ .byte -2, -24 @ 356
+ .byte -1, -25 @ 357
+ .byte -1, -25 @ 358
+ .byte 0, -25 @ 359
diff --git a/data/data2.s b/data/data2.s
index 0c8b67aa5..6a7ff7668 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -1859,7 +1859,7 @@ gUnknown_081FC1D0:: @ 81FC1D0
.space 2
@ 81FC1E0
- .include "data/pokedex_order.s"
+ .include "data/species_id_conversion_tables.s"
@ 81FCB84
.include "data/spinda_spot_graphics.s"
@@ -10975,8 +10975,8 @@ gUnknown_0839ADE0:: @ 839ADE0
gUnknown_0839AE28:: @ 839AE28
.incbin "baserom.gba", 0x0039ae28, 0x48
-gUnknown_0839AE70:: @ 839AE70
- .incbin "baserom.gba", 0x0039ae70, 0x380
+@ 839AE70
+ .include "data/trainer_eye_trainers.s"
.align 2
gUnknown_0839B1F0:: @ 839B1F0
@@ -11178,23 +11178,33 @@ gSpriteImage_839E7F4:: @ 839E7F4
gFieldEffectObjectPalette5: @ 839E8F4
.incbin "graphics/field_effect_objects/palettes/05.gbapal"
-gUnknown_0839E914:: @ 839E914
- .incbin "baserom.gba", 0x0039e914, 0x200
+@ Graphics for the lights streaking past your Pokémon when it uses a field move.
-gUnknown_0839EB14:: @ 839EB14
- .incbin "baserom.gba", 0x0039eb14, 0x20
+ .align 2
+gFieldMoveStreaksTiles:: @ 839E914
+ .incbin "graphics/misc/field_move_streaks.4bpp"
-gUnknown_0839EB34:: @ 839EB34
- .incbin "baserom.gba", 0x0039eb34, 0x280
+ .align 2
+gFieldMoveStreaksPalette:: @ 839EB14
+ .incbin "graphics/misc/field_move_streaks.gbapal"
-gUnknown_0839EDB4:: @ 839EDB4
- .incbin "baserom.gba", 0x0039edb4, 0x80
+ .align 2
+gFieldMoveStreaksTilemap:: @ 839EB34
+ .incbin "graphics/misc/field_move_streaks_map.bin"
-gUnknown_0839EE34:: @ 839EE34
- .incbin "baserom.gba", 0x0039ee34, 0x20
+@ The following light streaks effect is used when the map is dark (e.g. a cave).
-gUnknown_0839EE54:: @ 839EE54
- .incbin "baserom.gba", 0x0039ee54, 0x280
+ .align 2
+gDarknessFieldMoveStreaksTiles:: @ 839EDB4
+ .incbin "graphics/misc/darkness_field_move_streaks.4bpp"
+
+ .align 2
+gDarknessFieldMoveStreaksPalette:: @ 839EE34
+ .incbin "graphics/misc/darkness_field_move_streaks.gbapal"
+
+ .align 2
+gDarknessFieldMoveStreaksTilemap:: @ 839EE54
+ .incbin "graphics/misc/darkness_field_move_streaks_map.bin"
.align 2
gUnknown_0839F0D4:: @ 839F0D4
@@ -11611,14 +11621,8 @@ gUnknown_0839F988:: @ 839F988
gUnknown_0839FA7C:: @ 839FA7C
.incbin "graphics/pokedex/noball.4bpp.lz"
-gUnknown_0839FAC4:: @ 839FAC4
- .incbin "baserom.gba", 0x0039fac4, 0x336
-
-gUnknown_0839FDFA:: @ 839FDFA
- .incbin "baserom.gba", 0x0039fdfa, 0x304
-
-gUnknown_083A00FE:: @ 83A00FE
- .incbin "baserom.gba", 0x003a00fe, 0x306
+@ 839FAC4
+ .include "data/pokedex_orders.s"
.align 2
gOamData_83A0404:: @ 83A0404
@@ -23731,8 +23735,11 @@ gUnknown_083F62D8:: @ 83F62D8
.4byte SecretBaseText_Dennis
.4byte SecretBaseText_Roberto
-gUnknown_083F62E8:: @ 83F62E8
- .incbin "baserom.gba", 0x003f62e8, 0x4
+gTraderDecorations:: @ 83F62E8
+ .byte DECOR_DUSKULL_DOLL
+ .byte DECOR_BALL_CUSHION
+ .byte DECOR_TIRE
+ .byte DECOR_PRETTY_FLOWERS
gUnknown_083F62EC:: @ 83F62EC
.incbin "graphics/misc/birch_bag.gbapal"
@@ -23962,8 +23969,8 @@ gSpriteTemplate_83F7B28:: @ 83F7B28
gSpriteTemplate_83F7B40:: @ 83F7B40
spr_template 4096, 4096, gOamData_83F7B08, gSpriteAnimTable_83F7B24, NULL, gDummySpriteAffineAnimTable, sub_810B230
-gUnknown_083F7B58:: @ 83F7B58
- .incbin "baserom.gba", 0x003f7b58, 0x2d0
+@ 83F7B58
+ .include "data/clock_hand_coords.s"
gUnknown_083F7E28:: @ 83F7E28
.incbin "baserom.gba", 0x003f7e28, 0x80
@@ -30351,11 +30358,13 @@ gUnknown_0841221C:: @ 841221C
gUnknown_0841223C:: @ 841223C
.incbin "baserom.gba", 0x0041223c, 0x20
+ .align 2
gUnknown_0841225C:: @ 841225C
.incbin "graphics/intro/intro2_grass.4bpp.lz"
+ .align 2
gUnknown_084126DC:: @ 84126DC
- .incbin "baserom.gba", 0x004126dc, 0x13c
+ .incbin "graphics/intro/intro2_grass_map.bin.lz"
gUnknown_08412818:: @ 8412818
.incbin "baserom.gba", 0x00412818, 0x60
@@ -30363,11 +30372,13 @@ gUnknown_08412818:: @ 8412818
gUnknown_08412878:: @ 8412878
.incbin "baserom.gba", 0x00412878, 0x60
+ .align 2
gUnknown_084128D8:: @ 84128D8
.incbin "graphics/intro/intro2_bgclouds.4bpp.lz"
+ .align 2
gUnknown_08412EB4:: @ 8412EB4
- .incbin "baserom.gba", 0x00412eb4, 0x2d0
+ .incbin "graphics/intro/intro2_bgclouds_map.bin.lz"
gUnknown_08413184:: @ 8413184
.incbin "graphics/intro/intro2_bgclouds.gbapal"
@@ -30384,11 +30395,13 @@ gUnknown_08413300:: @ 8413300
gUnknown_08413320:: @ 8413320
.incbin "baserom.gba", 0x00413320, 0x20
+ .align 2
gUnknown_08413340:: @ 8413340
.incbin "graphics/intro/intro2_bgtrees.4bpp.lz"
+ .align 2
gUnknown_084139C8:: @ 84139C8
- .incbin "baserom.gba", 0x004139c8, 0x304
+ .incbin "graphics/intro/intro2_bgtrees_map.bin.lz"
.align 2
gUnknown_08413CCC:: @ 8413CCC
@@ -30409,12 +30422,13 @@ gUnknown_08413E78:: @ 8413E78
gUnknown_08414064:: @ 8414064
.incbin "graphics/intro/intro2_bgnight.gbapal"
+ .align 2
gUnknown_08414084:: @ 8414084
- .incbin "baserom.gba", 0x00414084, 0x2AC
+ .incbin "graphics/intro/intro2_bgnight_map.bin.lz"
.align 2
-gIntro2NightBGTiles:: @ 8414330
- .incbin "graphics/intro/intro2_bgnight2.4bpp.lz"
+gIntro2NightTiles:: @ 8414330
+ .incbin "graphics/intro/intro2_night.4bpp.lz"
.align 1
gIntro2BrendanPalette:: @ 84143B4
@@ -30526,7 +30540,7 @@ gUnknown_08416C10:: @ 8416C10
.align 2
gUnknown_08416C70:: @ 8416C70
- obj_tiles gIntro2NightBGTiles, 0x400, 2000
+ obj_tiles gIntro2NightTiles, 0x400, 2000
null_obj_tiles
.align 2
diff --git a/data/pokedex_orders.s b/data/pokedex_orders.s
new file mode 100644
index 000000000..db1cf7e07
--- /dev/null
+++ b/data/pokedex_orders.s
@@ -0,0 +1,1191 @@
+ .align 1
+gPokedexOrder_Alphabetical:: @ 839FAC4
+ .2byte 387
+ .2byte 388
+ .2byte 389
+ .2byte 390
+ .2byte 391
+ .2byte 392
+ .2byte 393
+ .2byte 394
+ .2byte 395
+ .2byte 396
+ .2byte 397
+ .2byte 398
+ .2byte 399
+ .2byte 400
+ .2byte 401
+ .2byte 402
+ .2byte 403
+ .2byte 404
+ .2byte 405
+ .2byte 406
+ .2byte 407
+ .2byte 408
+ .2byte 409
+ .2byte 410
+ .2byte 411
+ .2byte 63 @ Abra
+ .2byte 359 @ Absol
+ .2byte 142 @ Aerodactyl
+ .2byte 306 @ Aggron
+ .2byte 190 @ Aipom
+ .2byte 65 @ Alakazam
+ .2byte 334 @ Altaria
+ .2byte 181 @ Ampharos
+ .2byte 347 @ Anorith
+ .2byte 24 @ Arbok
+ .2byte 59 @ Arcanine
+ .2byte 168 @ Ariados
+ .2byte 348 @ Armaldo
+ .2byte 304 @ Aron
+ .2byte 144 @ Articuno
+ .2byte 184 @ Azumarill
+ .2byte 298 @ Azurill
+ .2byte 371 @ Bagon
+ .2byte 343 @ Baltoy
+ .2byte 354 @ Banette
+ .2byte 339 @ Barboach
+ .2byte 153 @ Bayleef
+ .2byte 267 @ Beautifly
+ .2byte 15 @ Beedrill
+ .2byte 374 @ Beldum
+ .2byte 182 @ Bellossom
+ .2byte 69 @ Bellsprout
+ .2byte 9 @ Blastoise
+ .2byte 257 @ Blaziken
+ .2byte 242 @ Blissey
+ .2byte 286 @ Breloom
+ .2byte 1 @ Bulbasaur
+ .2byte 12 @ Butterfree
+ .2byte 331 @ Cacnea
+ .2byte 332 @ Cacturne
+ .2byte 323 @ Camerupt
+ .2byte 318 @ Carvanha
+ .2byte 268 @ Cascoon
+ .2byte 351 @ Castform
+ .2byte 10 @ Caterpie
+ .2byte 251 @ Celebi
+ .2byte 113 @ Chansey
+ .2byte 6 @ Charizard
+ .2byte 4 @ Charmander
+ .2byte 5 @ Charmeleon
+ .2byte 152 @ Chikorita
+ .2byte 358 @ Chimecho
+ .2byte 170 @ Chinchou
+ .2byte 366 @ Clamperl
+ .2byte 344 @ Claydol
+ .2byte 36 @ Clefable
+ .2byte 35 @ Clefairy
+ .2byte 173 @ Cleffa
+ .2byte 91 @ Cloyster
+ .2byte 256 @ Combusken
+ .2byte 341 @ Corphish
+ .2byte 222 @ Corsola
+ .2byte 346 @ Cradily
+ .2byte 342 @ Crawdaunt
+ .2byte 169 @ Crobat
+ .2byte 159 @ Croconaw
+ .2byte 104 @ Cubone
+ .2byte 155 @ Cyndaquil
+ .2byte 301 @ Delcatty
+ .2byte 225 @ Delibird
+ .2byte 386 @ Deoxys
+ .2byte 87 @ Dewgong
+ .2byte 50 @ Diglett
+ .2byte 132 @ Ditto
+ .2byte 85 @ Dodrio
+ .2byte 84 @ Doduo
+ .2byte 232 @ Donphan
+ .2byte 148 @ Dragonair
+ .2byte 149 @ Dragonite
+ .2byte 147 @ Dratini
+ .2byte 96 @ Drowzee
+ .2byte 51 @ Dugtrio
+ .2byte 206 @ Dunsparce
+ .2byte 356 @ Dusclops
+ .2byte 355 @ Duskull
+ .2byte 269 @ Dustox
+ .2byte 133 @ Eevee
+ .2byte 23 @ Ekans
+ .2byte 125 @ Electabuzz
+ .2byte 309 @ Electrike
+ .2byte 101 @ Electrode
+ .2byte 239 @ Elekid
+ .2byte 244 @ Entei
+ .2byte 196 @ Espeon
+ .2byte 102 @ Exeggcute
+ .2byte 103 @ Exeggutor
+ .2byte 295 @ Exploud
+ .2byte 83 @ Farfetch’d
+ .2byte 22 @ Fearow
+ .2byte 349 @ Feebas
+ .2byte 160 @ Feraligatr
+ .2byte 180 @ Flaaffy
+ .2byte 136 @ Flareon
+ .2byte 330 @ Flygon
+ .2byte 205 @ Forretress
+ .2byte 162 @ Furret
+ .2byte 282 @ Gardevoir
+ .2byte 92 @ Gastly
+ .2byte 94 @ Gengar
+ .2byte 74 @ Geodude
+ .2byte 203 @ Girafarig
+ .2byte 362 @ Glalie
+ .2byte 207 @ Gligar
+ .2byte 44 @ Gloom
+ .2byte 42 @ Golbat
+ .2byte 118 @ Goldeen
+ .2byte 55 @ Golduck
+ .2byte 76 @ Golem
+ .2byte 368 @ Gorebyss
+ .2byte 210 @ Granbull
+ .2byte 75 @ Graveler
+ .2byte 88 @ Grimer
+ .2byte 383 @ Groudon
+ .2byte 253 @ Grovyle
+ .2byte 58 @ Growlithe
+ .2byte 326 @ Grumpig
+ .2byte 316 @ Gulpin
+ .2byte 130 @ Gyarados
+ .2byte 297 @ Hariyama
+ .2byte 93 @ Haunter
+ .2byte 214 @ Heracross
+ .2byte 107 @ Hitmonchan
+ .2byte 106 @ Hitmonlee
+ .2byte 237 @ Hitmontop
+ .2byte 250 @ Ho-Oh
+ .2byte 163 @ Hoothoot
+ .2byte 187 @ Hoppip
+ .2byte 116 @ Horsea
+ .2byte 229 @ Houndoom
+ .2byte 228 @ Houndour
+ .2byte 367 @ Huntail
+ .2byte 97 @ Hypno
+ .2byte 174 @ Igglybuff
+ .2byte 314 @ Illumise
+ .2byte 2 @ Ivysaur
+ .2byte 39 @ Jigglypuff
+ .2byte 385 @ Jirachi
+ .2byte 135 @ Jolteon
+ .2byte 189 @ Jumpluff
+ .2byte 124 @ Jynx
+ .2byte 140 @ Kabuto
+ .2byte 141 @ Kabutops
+ .2byte 64 @ Kadabra
+ .2byte 14 @ Kakuna
+ .2byte 115 @ Kangaskhan
+ .2byte 352 @ Kecleon
+ .2byte 230 @ Kingdra
+ .2byte 99 @ Kingler
+ .2byte 281 @ Kirlia
+ .2byte 109 @ Koffing
+ .2byte 98 @ Krabby
+ .2byte 382 @ Kyogre
+ .2byte 305 @ Lairon
+ .2byte 171 @ Lanturn
+ .2byte 131 @ Lapras
+ .2byte 246 @ Larvitar
+ .2byte 380 @ Latias
+ .2byte 381 @ Latios
+ .2byte 166 @ Ledian
+ .2byte 165 @ Ledyba
+ .2byte 108 @ Lickitung
+ .2byte 345 @ Lileep
+ .2byte 264 @ Linoone
+ .2byte 271 @ Lombre
+ .2byte 270 @ Lotad
+ .2byte 294 @ Loudred
+ .2byte 272 @ Ludicolo
+ .2byte 249 @ Lugia
+ .2byte 337 @ Lunatone
+ .2byte 370 @ Luvdisc
+ .2byte 68 @ Machamp
+ .2byte 67 @ Machoke
+ .2byte 66 @ Machop
+ .2byte 240 @ Magby
+ .2byte 219 @ Magcargo
+ .2byte 129 @ Magikarp
+ .2byte 126 @ Magmar
+ .2byte 81 @ Magnemite
+ .2byte 82 @ Magneton
+ .2byte 296 @ Makuhita
+ .2byte 310 @ Manectric
+ .2byte 56 @ Mankey
+ .2byte 226 @ Mantine
+ .2byte 179 @ Mareep
+ .2byte 183 @ Marill
+ .2byte 105 @ Marowak
+ .2byte 259 @ Marshtomp
+ .2byte 284 @ Masquerain
+ .2byte 303 @ Mawile
+ .2byte 308 @ Medicham
+ .2byte 307 @ Meditite
+ .2byte 154 @ Meganium
+ .2byte 52 @ Meowth
+ .2byte 376 @ Metagross
+ .2byte 375 @ Metang
+ .2byte 11 @ Metapod
+ .2byte 151 @ Mew
+ .2byte 150 @ Mewtwo
+ .2byte 262 @ Mightyena
+ .2byte 350 @ Milotic
+ .2byte 241 @ Miltank
+ .2byte 312 @ Minun
+ .2byte 200 @ Misdreavus
+ .2byte 146 @ Moltres
+ .2byte 122 @ Mr. mime
+ .2byte 258 @ Mudkip
+ .2byte 89 @ Muk
+ .2byte 198 @ Murkrow
+ .2byte 177 @ Natu
+ .2byte 34 @ Nidoking
+ .2byte 31 @ Nidoqueen
+ .2byte 29 @ Nidoran♀
+ .2byte 32 @ Nidoran♂
+ .2byte 30 @ Nidorina
+ .2byte 33 @ Nidorino
+ .2byte 290 @ Nincada
+ .2byte 38 @ Ninetales
+ .2byte 291 @ Ninjask
+ .2byte 164 @ Noctowl
+ .2byte 299 @ Nosepass
+ .2byte 322 @ Numel
+ .2byte 274 @ Nuzleaf
+ .2byte 224 @ Octillery
+ .2byte 43 @ Oddish
+ .2byte 138 @ Omanyte
+ .2byte 139 @ Omastar
+ .2byte 95 @ Onix
+ .2byte 46 @ Paras
+ .2byte 47 @ Parasect
+ .2byte 279 @ Pelipper
+ .2byte 53 @ Persian
+ .2byte 231 @ Phanpy
+ .2byte 172 @ Pichu
+ .2byte 18 @ Pidgeot
+ .2byte 17 @ Pidgeotto
+ .2byte 16 @ Pidgey
+ .2byte 25 @ Pikachu
+ .2byte 221 @ Piloswine
+ .2byte 204 @ Pineco
+ .2byte 127 @ Pinsir
+ .2byte 311 @ Plusle
+ .2byte 186 @ Politoed
+ .2byte 60 @ Poliwag
+ .2byte 61 @ Poliwhirl
+ .2byte 62 @ Poliwrath
+ .2byte 77 @ Ponyta
+ .2byte 261 @ Poochyena
+ .2byte 137 @ Porygon
+ .2byte 233 @ Porygon2
+ .2byte 57 @ Primeape
+ .2byte 54 @ Psyduck
+ .2byte 247 @ Pupitar
+ .2byte 195 @ Quagsire
+ .2byte 156 @ Quilava
+ .2byte 211 @ Qwilfish
+ .2byte 26 @ Raichu
+ .2byte 243 @ Raikou
+ .2byte 280 @ Ralts
+ .2byte 78 @ Rapidash
+ .2byte 20 @ Raticate
+ .2byte 19 @ Rattata
+ .2byte 384 @ Rayquaza
+ .2byte 378 @ Regice
+ .2byte 377 @ Regirock
+ .2byte 379 @ Registeel
+ .2byte 369 @ Relicanth
+ .2byte 223 @ Remoraid
+ .2byte 112 @ Rhydon
+ .2byte 111 @ Rhyhorn
+ .2byte 315 @ Roselia
+ .2byte 302 @ Sableye
+ .2byte 373 @ Salamence
+ .2byte 27 @ Sandshrew
+ .2byte 28 @ Sandslash
+ .2byte 254 @ Sceptile
+ .2byte 212 @ Scizor
+ .2byte 123 @ Scyther
+ .2byte 117 @ Seadra
+ .2byte 119 @ Seaking
+ .2byte 364 @ Sealeo
+ .2byte 273 @ Seedot
+ .2byte 86 @ Seel
+ .2byte 161 @ Sentret
+ .2byte 336 @ Seviper
+ .2byte 319 @ Sharpedo
+ .2byte 292 @ Shedinja
+ .2byte 372 @ Shelgon
+ .2byte 90 @ Shellder
+ .2byte 275 @ Shiftry
+ .2byte 285 @ Shroomish
+ .2byte 213 @ Shuckle
+ .2byte 353 @ Shuppet
+ .2byte 266 @ Silcoon
+ .2byte 227 @ Skarmory
+ .2byte 188 @ Skiploom
+ .2byte 300 @ Skitty
+ .2byte 289 @ Slaking
+ .2byte 287 @ Slakoth
+ .2byte 80 @ Slowbro
+ .2byte 199 @ Slowking
+ .2byte 79 @ Slowpoke
+ .2byte 218 @ Slugma
+ .2byte 235 @ Smeargle
+ .2byte 238 @ Smoochum
+ .2byte 215 @ Sneasel
+ .2byte 143 @ Snorlax
+ .2byte 361 @ Snorunt
+ .2byte 209 @ Snubbull
+ .2byte 338 @ Solrock
+ .2byte 21 @ Spearow
+ .2byte 363 @ Spheal
+ .2byte 167 @ Spinarak
+ .2byte 327 @ Spinda
+ .2byte 325 @ Spoink
+ .2byte 7 @ Squirtle
+ .2byte 234 @ Stantler
+ .2byte 121 @ Starmie
+ .2byte 120 @ Staryu
+ .2byte 208 @ Steelix
+ .2byte 185 @ Sudowoodo
+ .2byte 245 @ Suicune
+ .2byte 192 @ Sunflora
+ .2byte 191 @ Sunkern
+ .2byte 283 @ Surskit
+ .2byte 333 @ Swablu
+ .2byte 317 @ Swalot
+ .2byte 260 @ Swampert
+ .2byte 277 @ Swellow
+ .2byte 220 @ Swinub
+ .2byte 276 @ Taillow
+ .2byte 114 @ Tangela
+ .2byte 128 @ Tauros
+ .2byte 216 @ Teddiursa
+ .2byte 72 @ Tentacool
+ .2byte 73 @ Tentacruel
+ .2byte 175 @ Togepi
+ .2byte 176 @ Togetic
+ .2byte 255 @ Torchic
+ .2byte 324 @ Torkoal
+ .2byte 158 @ Totodile
+ .2byte 328 @ Trapinch
+ .2byte 252 @ Treecko
+ .2byte 357 @ Tropius
+ .2byte 157 @ Typhlosion
+ .2byte 248 @ Tyranitar
+ .2byte 236 @ Tyrogue
+ .2byte 197 @ Umbreon
+ .2byte 201 @ Unown
+ .2byte 217 @ Ursaring
+ .2byte 134 @ Vaporeon
+ .2byte 49 @ Venomoth
+ .2byte 48 @ Venonat
+ .2byte 3 @ Venusaur
+ .2byte 329 @ Vibrava
+ .2byte 71 @ Victreebel
+ .2byte 288 @ Vigoroth
+ .2byte 45 @ Vileplume
+ .2byte 313 @ Volbeat
+ .2byte 100 @ Voltorb
+ .2byte 37 @ Vulpix
+ .2byte 320 @ Wailmer
+ .2byte 321 @ Wailord
+ .2byte 365 @ Walrein
+ .2byte 8 @ Wartortle
+ .2byte 13 @ Weedle
+ .2byte 70 @ Weepinbell
+ .2byte 110 @ Weezing
+ .2byte 340 @ Whiscash
+ .2byte 293 @ Whismur
+ .2byte 40 @ Wigglytuff
+ .2byte 278 @ Wingull
+ .2byte 202 @ Wobbuffet
+ .2byte 194 @ Wooper
+ .2byte 265 @ Wurmple
+ .2byte 360 @ Wynaut
+ .2byte 178 @ Xatu
+ .2byte 193 @ Yanma
+ .2byte 335 @ Zangoose
+ .2byte 145 @ Zapdos
+ .2byte 263 @ Zigzagoon
+ .2byte 41 @ Zubat
+
+ .align 1
+gPokedexOrder_Weight:: @ 839FDFA
+ .2byte 92 @ Gastly
+ .2byte 93 @ Haunter
+ .2byte 187 @ Hoppip
+ .2byte 50 @ Diglett
+ .2byte 351 @ Castform
+ .2byte 109 @ Koffing
+ .2byte 174 @ Igglybuff
+ .2byte 200 @ Misdreavus
+ .2byte 358 @ Chimecho
+ .2byte 188 @ Skiploom
+ .2byte 385 @ Jirachi
+ .2byte 333 @ Swablu
+ .2byte 292 @ Shedinja
+ .2byte 175 @ Togepi
+ .2byte 283 @ Surskit
+ .2byte 16 @ Pidgey
+ .2byte 191 @ Sunkern
+ .2byte 339 @ Barboach
+ .2byte 172 @ Pichu
+ .2byte 298 @ Azurill
+ .2byte 315 @ Roselia
+ .2byte 177 @ Natu
+ .2byte 21 @ Spearow
+ .2byte 198 @ Murkrow
+ .2byte 353 @ Shuppet
+ .2byte 276 @ Taillow
+ .2byte 102 @ Exeggcute
+ .2byte 255 @ Torchic
+ .2byte 270 @ Lotad
+ .2byte 10 @ Caterpie
+ .2byte 189 @ Jumpluff
+ .2byte 173 @ Cleffa
+ .2byte 13 @ Weedle
+ .2byte 176 @ Togetic
+ .2byte 147 @ Dratini
+ .2byte 19 @ Rattata
+ .2byte 284 @ Masquerain
+ .2byte 265 @ Wurmple
+ .2byte 211 @ Qwilfish
+ .2byte 151 @ Mew
+ .2byte 90 @ Shellder
+ .2byte 273 @ Seedot
+ .2byte 132 @ Ditto
+ .2byte 69 @ Bellsprout
+ .2byte 311 @ Plusle
+ .2byte 52 @ Meowth
+ .2byte 312 @ Minun
+ .2byte 285 @ Shroomish
+ .2byte 251 @ Celebi
+ .2byte 222 @ Corsola
+ .2byte 252 @ Treecko
+ .2byte 327 @ Spinda
+ .2byte 201 @ Unown
+ .2byte 46 @ Paras
+ .2byte 43 @ Oddish
+ .2byte 39 @ Jigglypuff
+ .2byte 290 @ Nincada
+ .2byte 182 @ Bellossom
+ .2byte 81 @ Magnemite
+ .2byte 25 @ Pikachu
+ .2byte 238 @ Smoochum
+ .2byte 161 @ Sentret
+ .2byte 70 @ Weepinbell
+ .2byte 152 @ Chikorita
+ .2byte 220 @ Swinub
+ .2byte 133 @ Eevee
+ .2byte 98 @ Krabby
+ .2byte 104 @ Cubone
+ .2byte 280 @ Ralts
+ .2byte 1 @ Bulbasaur
+ .2byte 23 @ Ekans
+ .2byte 29 @ Nidoran♀
+ .2byte 204 @ Pineco
+ .2byte 349 @ Feebas
+ .2byte 138 @ Omanyte
+ .2byte 41 @ Zubat
+ .2byte 35 @ Clefairy
+ .2byte 258 @ Mudkip
+ .2byte 209 @ Snubbull
+ .2byte 179 @ Mareep
+ .2byte 155 @ Cyndaquil
+ .2byte 116 @ Horsea
+ .2byte 4 @ Charmander
+ .2byte 192 @ Sunflora
+ .2byte 183 @ Marill
+ .2byte 194 @ Wooper
+ .2byte 167 @ Spinarak
+ .2byte 44 @ Gloom
+ .2byte 370 @ Luvdisc
+ .2byte 216 @ Teddiursa
+ .2byte 32 @ Nidoran♂
+ .2byte 7 @ Squirtle
+ .2byte 278 @ Wingull
+ .2byte 158 @ Totodile
+ .2byte 110 @ Weezing
+ .2byte 37 @ Vulpix
+ .2byte 11 @ Metapod
+ .2byte 266 @ Silcoon
+ .2byte 129 @ Magikarp
+ .2byte 14 @ Kakuna
+ .2byte 316 @ Gulpin
+ .2byte 100 @ Voltorb
+ .2byte 165 @ Ledyba
+ .2byte 228 @ Houndour
+ .2byte 300 @ Skitty
+ .2byte 302 @ Sableye
+ .2byte 307 @ Meditite
+ .2byte 341 @ Corphish
+ .2byte 190 @ Aipom
+ .2byte 268 @ Cascoon
+ .2byte 303 @ Mawile
+ .2byte 140 @ Kabuto
+ .2byte 40 @ Wigglytuff
+ .2byte 27 @ Sandshrew
+ .2byte 223 @ Remoraid
+ .2byte 291 @ Ninjask
+ .2byte 170 @ Chinchou
+ .2byte 60 @ Poliwag
+ .2byte 347 @ Anorith
+ .2byte 49 @ Venomoth
+ .2byte 354 @ Banette
+ .2byte 2 @ Ivysaur
+ .2byte 180 @ Flaaffy
+ .2byte 261 @ Poochyena
+ .2byte 360 @ Wynaut
+ .2byte 206 @ Dunsparce
+ .2byte 178 @ Xatu
+ .2byte 355 @ Duskull
+ .2byte 83 @ Farfetch’d
+ .2byte 328 @ Trapinch
+ .2byte 118 @ Goldeen
+ .2byte 309 @ Electrike
+ .2byte 329 @ Vibrava
+ .2byte 71 @ Victreebel
+ .2byte 153 @ Bayleef
+ .2byte 225 @ Delibird
+ .2byte 293 @ Whismur
+ .2byte 148 @ Dragonair
+ .2byte 361 @ Snorunt
+ .2byte 263 @ Zigzagoon
+ .2byte 314 @ Illumise
+ .2byte 313 @ Volbeat
+ .2byte 20 @ Raticate
+ .2byte 45 @ Vileplume
+ .2byte 156 @ Quilava
+ .2byte 5 @ Charmeleon
+ .2byte 58 @ Growlithe
+ .2byte 256 @ Combusken
+ .2byte 66 @ Machop
+ .2byte 63 @ Abra
+ .2byte 33 @ Nidorino
+ .2byte 54 @ Psyduck
+ .2byte 277 @ Swellow
+ .2byte 38 @ Ninetales
+ .2byte 30 @ Nidorina
+ .2byte 61 @ Poliwhirl
+ .2byte 74 @ Geodude
+ .2byte 281 @ Kirlia
+ .2byte 213 @ Shuckle
+ .2byte 334 @ Altaria
+ .2byte 318 @ Carvanha
+ .2byte 236 @ Tyrogue
+ .2byte 163 @ Hoothoot
+ .2byte 240 @ Magby
+ .2byte 343 @ Baltoy
+ .2byte 253 @ Grovyle
+ .2byte 352 @ Kecleon
+ .2byte 171 @ Lanturn
+ .2byte 8 @ Wartortle
+ .2byte 368 @ Gorebyss
+ .2byte 369 @ Relicanth
+ .2byte 239 @ Elekid
+ .2byte 340 @ Whiscash
+ .2byte 345 @ Lileep
+ .2byte 322 @ Numel
+ .2byte 287 @ Slakoth
+ .2byte 135 @ Jolteon
+ .2byte 159 @ Croconaw
+ .2byte 136 @ Flareon
+ .2byte 117 @ Seadra
+ .2byte 196 @ Espeon
+ .2byte 367 @ Huntail
+ .2byte 197 @ Umbreon
+ .2byte 259 @ Marshtomp
+ .2byte 274 @ Nuzleaf
+ .2byte 215 @ Sneasel
+ .2byte 56 @ Mankey
+ .2byte 279 @ Pelipper
+ .2byte 267 @ Beautifly
+ .2byte 224 @ Octillery
+ .2byte 184 @ Azumarill
+ .2byte 202 @ Wobbuffet
+ .2byte 134 @ Vaporeon
+ .2byte 28 @ Sandslash
+ .2byte 47 @ Parasect
+ .2byte 15 @ Beedrill
+ .2byte 89 @ Muk
+ .2byte 17 @ Pidgeotto
+ .2byte 88 @ Grimer
+ .2byte 26 @ Raichu
+ .2byte 77 @ Ponyta
+ .2byte 125 @ Electabuzz
+ .2byte 48 @ Venonat
+ .2byte 325 @ Spoink
+ .2byte 356 @ Dusclops
+ .2byte 308 @ Medicham
+ .2byte 269 @ Dustox
+ .2byte 53 @ Persian
+ .2byte 12 @ Butterfree
+ .2byte 57 @ Primeape
+ .2byte 96 @ Drowzee
+ .2byte 162 @ Furret
+ .2byte 233 @ Porygon2
+ .2byte 271 @ Lombre
+ .2byte 264 @ Linoone
+ .2byte 301 @ Delcatty
+ .2byte 342 @ Crawdaunt
+ .2byte 51 @ Dugtrio
+ .2byte 168 @ Ariados
+ .2byte 231 @ Phanpy
+ .2byte 186 @ Politoed
+ .2byte 120 @ Staryu
+ .2byte 113 @ Chansey
+ .2byte 139 @ Omastar
+ .2byte 114 @ Tangela
+ .2byte 218 @ Slugma
+ .2byte 229 @ Houndoom
+ .2byte 166 @ Ledian
+ .2byte 79 @ Slowpoke
+ .2byte 137 @ Porygon
+ .2byte 262 @ Mightyena
+ .2byte 193 @ Yanma
+ .2byte 22 @ Fearow
+ .2byte 185 @ Sudowoodo
+ .2byte 119 @ Seaking
+ .2byte 286 @ Breloom
+ .2byte 84 @ Doduo
+ .2byte 18 @ Pidgeot
+ .2byte 363 @ Spheal
+ .2byte 36 @ Clefable
+ .2byte 380 @ Latias
+ .2byte 310 @ Manectric
+ .2byte 335 @ Zangoose
+ .2byte 141 @ Kabutops
+ .2byte 94 @ Gengar
+ .2byte 294 @ Loudred
+ .2byte 124 @ Jynx
+ .2byte 164 @ Noctowl
+ .2byte 203 @ Girafarig
+ .2byte 371 @ Bagon
+ .2byte 126 @ Magmar
+ .2byte 105 @ Marowak
+ .2byte 72 @ Tentacool
+ .2byte 288 @ Vigoroth
+ .2byte 242 @ Blissey
+ .2byte 359 @ Absol
+ .2byte 65 @ Alakazam
+ .2byte 237 @ Hitmontop
+ .2byte 282 @ Gardevoir
+ .2byte 210 @ Granbull
+ .2byte 106 @ Hitmonlee
+ .2byte 107 @ Hitmonchan
+ .2byte 227 @ Skarmory
+ .2byte 331 @ Cacnea
+ .2byte 257 @ Blaziken
+ .2byte 254 @ Sceptile
+ .2byte 336 @ Seviper
+ .2byte 366 @ Clamperl
+ .2byte 145 @ Zapdos
+ .2byte 214 @ Heracross
+ .2byte 62 @ Poliwrath
+ .2byte 122 @ Mr. mime
+ .2byte 127 @ Pinsir
+ .2byte 272 @ Ludicolo
+ .2byte 73 @ Tentacruel
+ .2byte 42 @ Golbat
+ .2byte 219 @ Magcargo
+ .2byte 144 @ Articuno
+ .2byte 221 @ Piloswine
+ .2byte 123 @ Scyther
+ .2byte 64 @ Kadabra
+ .2byte 235 @ Smeargle
+ .2byte 142 @ Aerodactyl
+ .2byte 275 @ Shiftry
+ .2byte 99 @ Kingler
+ .2byte 31 @ Nidoqueen
+ .2byte 82 @ Magneton
+ .2byte 304 @ Aron
+ .2byte 381 @ Latios
+ .2byte 146 @ Moltres
+ .2byte 346 @ Cradily
+ .2byte 386 @ Deoxys
+ .2byte 181 @ Ampharos
+ .2byte 34 @ Nidoking
+ .2byte 207 @ Gligar
+ .2byte 24 @ Arbok
+ .2byte 108 @ Lickitung
+ .2byte 101 @ Electrode
+ .2byte 348 @ Armaldo
+ .2byte 67 @ Machoke
+ .2byte 234 @ Stantler
+ .2byte 326 @ Grumpig
+ .2byte 246 @ Larvitar
+ .2byte 169 @ Crobat
+ .2byte 195 @ Quagsire
+ .2byte 241 @ Miltank
+ .2byte 97 @ Hypno
+ .2byte 55 @ Golduck
+ .2byte 332 @ Cacturne
+ .2byte 80 @ Slowbro
+ .2byte 157 @ Typhlosion
+ .2byte 199 @ Slowking
+ .2byte 115 @ Kangaskhan
+ .2byte 121 @ Starmie
+ .2byte 317 @ Swalot
+ .2byte 324 @ Torkoal
+ .2byte 260 @ Swampert
+ .2byte 330 @ Flygon
+ .2byte 295 @ Exploud
+ .2byte 85 @ Dodrio
+ .2byte 9 @ Blastoise
+ .2byte 296 @ Makuhita
+ .2byte 364 @ Sealeo
+ .2byte 128 @ Tauros
+ .2byte 319 @ Sharpedo
+ .2byte 160 @ Feraligatr
+ .2byte 86 @ Seel
+ .2byte 6 @ Charizard
+ .2byte 78 @ Rapidash
+ .2byte 374 @ Beldum
+ .2byte 299 @ Nosepass
+ .2byte 3 @ Venusaur
+ .2byte 357 @ Tropius
+ .2byte 154 @ Meganium
+ .2byte 373 @ Salamence
+ .2byte 75 @ Graveler
+ .2byte 344 @ Claydol
+ .2byte 372 @ Shelgon
+ .2byte 111 @ Rhyhorn
+ .2byte 212 @ Scizor
+ .2byte 87 @ Dewgong
+ .2byte 112 @ Rhydon
+ .2byte 232 @ Donphan
+ .2byte 103 @ Exeggutor
+ .2byte 305 @ Lairon
+ .2byte 150 @ Mewtwo
+ .2byte 217 @ Ursaring
+ .2byte 205 @ Forretress
+ .2byte 68 @ Machamp
+ .2byte 320 @ Wailmer
+ .2byte 289 @ Slaking
+ .2byte 91 @ Cloyster
+ .2byte 365 @ Walrein
+ .2byte 247 @ Pupitar
+ .2byte 230 @ Kingdra
+ .2byte 338 @ Solrock
+ .2byte 59 @ Arcanine
+ .2byte 350 @ Milotic
+ .2byte 337 @ Lunatone
+ .2byte 378 @ Regice
+ .2byte 243 @ Raikou
+ .2byte 245 @ Suicune
+ .2byte 244 @ Entei
+ .2byte 250 @ Ho-Oh
+ .2byte 248 @ Tyranitar
+ .2byte 375 @ Metang
+ .2byte 379 @ Registeel
+ .2byte 384 @ Rayquaza
+ .2byte 95 @ Onix
+ .2byte 149 @ Dragonite
+ .2byte 249 @ Lugia
+ .2byte 131 @ Lapras
+ .2byte 323 @ Camerupt
+ .2byte 226 @ Mantine
+ .2byte 377 @ Regirock
+ .2byte 130 @ Gyarados
+ .2byte 297 @ Hariyama
+ .2byte 362 @ Glalie
+ .2byte 76 @ Golem
+ .2byte 382 @ Kyogre
+ .2byte 306 @ Aggron
+ .2byte 321 @ Wailord
+ .2byte 208 @ Steelix
+ .2byte 143 @ Snorlax
+ .2byte 376 @ Metagross
+ .2byte 383 @ Groudon
+
+ .align 1
+gPokedexOrder_Height:: @ 83A00FE
+ .2byte 50 @ Diglett
+ .2byte 298 @ Azurill
+ .2byte 177 @ Natu
+ .2byte 13 @ Weedle
+ .2byte 172 @ Pichu
+ .2byte 173 @ Cleffa
+ .2byte 175 @ Togepi
+ .2byte 351 @ Castform
+ .2byte 174 @ Igglybuff
+ .2byte 10 @ Caterpie
+ .2byte 276 @ Taillow
+ .2byte 132 @ Ditto
+ .2byte 133 @ Eevee
+ .2byte 315 @ Roselia
+ .2byte 21 @ Spearow
+ .2byte 16 @ Pidgey
+ .2byte 191 @ Sunkern
+ .2byte 90 @ Shellder
+ .2byte 19 @ Rattata
+ .2byte 81 @ Magnemite
+ .2byte 46 @ Paras
+ .2byte 265 @ Wurmple
+ .2byte 385 @ Jirachi
+ .2byte 104 @ Cubone
+ .2byte 258 @ Mudkip
+ .2byte 194 @ Wooper
+ .2byte 116 @ Horsea
+ .2byte 52 @ Meowth
+ .2byte 29 @ Nidoran♀
+ .2byte 220 @ Swinub
+ .2byte 151 @ Mew
+ .2byte 333 @ Swablu
+ .2byte 304 @ Aron
+ .2byte 311 @ Plusle
+ .2byte 312 @ Minun
+ .2byte 102 @ Exeggcute
+ .2byte 25 @ Pikachu
+ .2byte 182 @ Bellossom
+ .2byte 316 @ Gulpin
+ .2byte 263 @ Zigzagoon
+ .2byte 285 @ Shroomish
+ .2byte 138 @ Omanyte
+ .2byte 331 @ Cacnea
+ .2byte 98 @ Krabby
+ .2byte 280 @ Ralts
+ .2byte 187 @ Hoppip
+ .2byte 255 @ Torchic
+ .2byte 366 @ Clamperl
+ .2byte 74 @ Geodude
+ .2byte 183 @ Marill
+ .2byte 339 @ Barboach
+ .2byte 238 @ Smoochum
+ .2byte 100 @ Voltorb
+ .2byte 290 @ Nincada
+ .2byte 302 @ Sableye
+ .2byte 198 @ Murkrow
+ .2byte 211 @ Qwilfish
+ .2byte 7 @ Squirtle
+ .2byte 252 @ Treecko
+ .2byte 343 @ Baltoy
+ .2byte 43 @ Oddish
+ .2byte 270 @ Lotad
+ .2byte 39 @ Jigglypuff
+ .2byte 283 @ Surskit
+ .2byte 155 @ Cyndaquil
+ .2byte 140 @ Kabuto
+ .2byte 264 @ Linoone
+ .2byte 324 @ Torkoal
+ .2byte 32 @ Nidoran♂
+ .2byte 167 @ Spinarak
+ .2byte 56 @ Mankey
+ .2byte 273 @ Seedot
+ .2byte 261 @ Poochyena
+ .2byte 231 @ Phanpy
+ .2byte 201 @ Unown
+ .2byte 170 @ Chinchou
+ .2byte 233 @ Porygon2
+ .2byte 60 @ Poliwag
+ .2byte 371 @ Bagon
+ .2byte 349 @ Feebas
+ .2byte 353 @ Shuppet
+ .2byte 158 @ Totodile
+ .2byte 251 @ Celebi
+ .2byte 360 @ Wynaut
+ .2byte 27 @ Sandshrew
+ .2byte 358 @ Chimecho
+ .2byte 370 @ Luvdisc
+ .2byte 228 @ Houndour
+ .2byte 266 @ Silcoon
+ .2byte 309 @ Electrike
+ .2byte 4 @ Charmander
+ .2byte 307 @ Meditite
+ .2byte 278 @ Wingull
+ .2byte 223 @ Remoraid
+ .2byte 341 @ Corphish
+ .2byte 222 @ Corsola
+ .2byte 314 @ Illumise
+ .2byte 209 @ Snubbull
+ .2byte 37 @ Vulpix
+ .2byte 246 @ Larvitar
+ .2byte 374 @ Beldum
+ .2byte 293 @ Whismur
+ .2byte 204 @ Pineco
+ .2byte 239 @ Elekid
+ .2byte 35 @ Clefairy
+ .2byte 213 @ Shuckle
+ .2byte 216 @ Teddiursa
+ .2byte 14 @ Kakuna
+ .2byte 300 @ Skitty
+ .2byte 176 @ Togetic
+ .2byte 118 @ Goldeen
+ .2byte 303 @ Mawile
+ .2byte 179 @ Mareep
+ .2byte 188 @ Skiploom
+ .2byte 109 @ Koffing
+ .2byte 51 @ Dugtrio
+ .2byte 268 @ Cascoon
+ .2byte 322 @ Numel
+ .2byte 347 @ Anorith
+ .2byte 313 @ Volbeat
+ .2byte 163 @ Hoothoot
+ .2byte 328 @ Trapinch
+ .2byte 325 @ Spoink
+ .2byte 11 @ Metapod
+ .2byte 69 @ Bellsprout
+ .2byte 361 @ Snorunt
+ .2byte 20 @ Raticate
+ .2byte 259 @ Marshtomp
+ .2byte 277 @ Swellow
+ .2byte 240 @ Magby
+ .2byte 58 @ Growlithe
+ .2byte 200 @ Misdreavus
+ .2byte 1 @ Bulbasaur
+ .2byte 236 @ Tyrogue
+ .2byte 218 @ Slugma
+ .2byte 287 @ Slakoth
+ .2byte 281 @ Kirlia
+ .2byte 190 @ Aipom
+ .2byte 135 @ Jolteon
+ .2byte 30 @ Nidorina
+ .2byte 184 @ Azumarill
+ .2byte 292 @ Shedinja
+ .2byte 66 @ Machop
+ .2byte 291 @ Ninjask
+ .2byte 284 @ Masquerain
+ .2byte 355 @ Duskull
+ .2byte 192 @ Sunflora
+ .2byte 189 @ Jumpluff
+ .2byte 120 @ Staryu
+ .2byte 180 @ Flaaffy
+ .2byte 363 @ Spheal
+ .2byte 54 @ Psyduck
+ .2byte 219 @ Magcargo
+ .2byte 83 @ Farfetch’d
+ .2byte 41 @ Zubat
+ .2byte 137 @ Porygon
+ .2byte 161 @ Sentret
+ .2byte 318 @ Carvanha
+ .2byte 44 @ Gloom
+ .2byte 26 @ Raichu
+ .2byte 129 @ Magikarp
+ .2byte 215 @ Sneasel
+ .2byte 305 @ Lairon
+ .2byte 256 @ Combusken
+ .2byte 224 @ Octillery
+ .2byte 33 @ Nidorino
+ .2byte 136 @ Flareon
+ .2byte 225 @ Delibird
+ .2byte 72 @ Tentacool
+ .2byte 63 @ Abra
+ .2byte 253 @ Grovyle
+ .2byte 340 @ Whiscash
+ .2byte 156 @ Quilava
+ .2byte 196 @ Espeon
+ .2byte 88 @ Grimer
+ .2byte 152 @ Chikorita
+ .2byte 326 @ Grumpig
+ .2byte 299 @ Nosepass
+ .2byte 53 @ Persian
+ .2byte 262 @ Mightyena
+ .2byte 48 @ Venonat
+ .2byte 82 @ Magneton
+ .2byte 77 @ Ponyta
+ .2byte 296 @ Makuhita
+ .2byte 337 @ Lunatone
+ .2byte 28 @ Sandslash
+ .2byte 96 @ Drowzee
+ .2byte 114 @ Tangela
+ .2byte 57 @ Primeape
+ .2byte 165 @ Ledyba
+ .2byte 40 @ Wigglytuff
+ .2byte 47 @ Parasect
+ .2byte 139 @ Omastar
+ .2byte 294 @ Loudred
+ .2byte 8 @ Wartortle
+ .2byte 75 @ Graveler
+ .2byte 197 @ Umbreon
+ .2byte 345 @ Lileep
+ .2byte 61 @ Poliwhirl
+ .2byte 134 @ Vaporeon
+ .2byte 15 @ Beedrill
+ .2byte 105 @ Marowak
+ .2byte 70 @ Weepinbell
+ .2byte 369 @ Relicanth
+ .2byte 111 @ Rhyhorn
+ .2byte 2 @ Ivysaur
+ .2byte 352 @ Kecleon
+ .2byte 274 @ Nuzleaf
+ .2byte 267 @ Beautifly
+ .2byte 17 @ Pidgeotto
+ .2byte 168 @ Ariados
+ .2byte 86 @ Seel
+ .2byte 186 @ Politoed
+ .2byte 159 @ Croconaw
+ .2byte 113 @ Chansey
+ .2byte 354 @ Banette
+ .2byte 232 @ Donphan
+ .2byte 121 @ Starmie
+ .2byte 5 @ Charmeleon
+ .2byte 221 @ Piloswine
+ .2byte 12 @ Butterfree
+ .2byte 329 @ Vibrava
+ .2byte 125 @ Electabuzz
+ .2byte 342 @ Crawdaunt
+ .2byte 301 @ Delcatty
+ .2byte 334 @ Altaria
+ .2byte 372 @ Shelgon
+ .2byte 38 @ Ninetales
+ .2byte 207 @ Gligar
+ .2byte 364 @ Sealeo
+ .2byte 327 @ Spinda
+ .2byte 247 @ Pupitar
+ .2byte 79 @ Slowpoke
+ .2byte 338 @ Solrock
+ .2byte 241 @ Miltank
+ .2byte 22 @ Fearow
+ .2byte 45 @ Vileplume
+ .2byte 89 @ Muk
+ .2byte 205 @ Forretress
+ .2byte 185 @ Sudowoodo
+ .2byte 359 @ Absol
+ .2byte 193 @ Yanma
+ .2byte 269 @ Dustox
+ .2byte 108 @ Lickitung
+ .2byte 235 @ Smeargle
+ .2byte 171 @ Lanturn
+ .2byte 101 @ Electrode
+ .2byte 271 @ Lombre
+ .2byte 286 @ Breloom
+ .2byte 153 @ Bayleef
+ .2byte 117 @ Seadra
+ .2byte 110 @ Weezing
+ .2byte 279 @ Pelipper
+ .2byte 375 @ Metang
+ .2byte 31 @ Nidoqueen
+ .2byte 332 @ Cacturne
+ .2byte 275 @ Shiftry
+ .2byte 308 @ Medicham
+ .2byte 335 @ Zangoose
+ .2byte 141 @ Kabutops
+ .2byte 99 @ Kingler
+ .2byte 64 @ Kadabra
+ .2byte 119 @ Seaking
+ .2byte 36 @ Clefable
+ .2byte 126 @ Magmar
+ .2byte 202 @ Wobbuffet
+ .2byte 92 @ Gastly
+ .2byte 122 @ Mr. mime
+ .2byte 62 @ Poliwrath
+ .2byte 128 @ Tauros
+ .2byte 380 @ Latias
+ .2byte 181 @ Ampharos
+ .2byte 288 @ Vigoroth
+ .2byte 166 @ Ledian
+ .2byte 76 @ Golem
+ .2byte 365 @ Walrein
+ .2byte 84 @ Doduo
+ .2byte 229 @ Houndoom
+ .2byte 34 @ Nidoking
+ .2byte 124 @ Jynx
+ .2byte 107 @ Hitmonchan
+ .2byte 234 @ Stantler
+ .2byte 210 @ Granbull
+ .2byte 237 @ Hitmontop
+ .2byte 195 @ Quagsire
+ .2byte 344 @ Claydol
+ .2byte 260 @ Swampert
+ .2byte 242 @ Blissey
+ .2byte 272 @ Ludicolo
+ .2byte 295 @ Exploud
+ .2byte 206 @ Dunsparce
+ .2byte 127 @ Pinsir
+ .2byte 91 @ Cloyster
+ .2byte 67 @ Machoke
+ .2byte 203 @ Girafarig
+ .2byte 18 @ Pidgeot
+ .2byte 178 @ Xatu
+ .2byte 346 @ Cradily
+ .2byte 106 @ Hitmonlee
+ .2byte 49 @ Venomoth
+ .2byte 94 @ Gengar
+ .2byte 214 @ Heracross
+ .2byte 362 @ Glalie
+ .2byte 123 @ Scyther
+ .2byte 373 @ Salamence
+ .2byte 310 @ Manectric
+ .2byte 348 @ Armaldo
+ .2byte 65 @ Alakazam
+ .2byte 97 @ Hypno
+ .2byte 164 @ Noctowl
+ .2byte 73 @ Tentacruel
+ .2byte 356 @ Dusclops
+ .2byte 145 @ Zapdos
+ .2byte 42 @ Golbat
+ .2byte 376 @ Metagross
+ .2byte 282 @ Gardevoir
+ .2byte 9 @ Blastoise
+ .2byte 80 @ Slowbro
+ .2byte 93 @ Haunter
+ .2byte 68 @ Machamp
+ .2byte 377 @ Regirock
+ .2byte 317 @ Swalot
+ .2byte 254 @ Sceptile
+ .2byte 227 @ Skarmory
+ .2byte 55 @ Golduck
+ .2byte 386 @ Deoxys
+ .2byte 71 @ Victreebel
+ .2byte 78 @ Rapidash
+ .2byte 6 @ Charizard
+ .2byte 367 @ Huntail
+ .2byte 87 @ Dewgong
+ .2byte 144 @ Articuno
+ .2byte 157 @ Typhlosion
+ .2byte 142 @ Aerodactyl
+ .2byte 368 @ Gorebyss
+ .2byte 217 @ Ursaring
+ .2byte 154 @ Meganium
+ .2byte 378 @ Regice
+ .2byte 212 @ Scizor
+ .2byte 230 @ Kingdra
+ .2byte 147 @ Dratini
+ .2byte 85 @ Dodrio
+ .2byte 319 @ Sharpedo
+ .2byte 169 @ Crobat
+ .2byte 162 @ Furret
+ .2byte 59 @ Arcanine
+ .2byte 243 @ Raikou
+ .2byte 257 @ Blaziken
+ .2byte 323 @ Camerupt
+ .2byte 112 @ Rhydon
+ .2byte 379 @ Registeel
+ .2byte 23 @ Ekans
+ .2byte 330 @ Flygon
+ .2byte 357 @ Tropius
+ .2byte 381 @ Latios
+ .2byte 245 @ Suicune
+ .2byte 146 @ Moltres
+ .2byte 3 @ Venusaur
+ .2byte 103 @ Exeggutor
+ .2byte 199 @ Slowking
+ .2byte 248 @ Tyranitar
+ .2byte 289 @ Slaking
+ .2byte 320 @ Wailmer
+ .2byte 150 @ Mewtwo
+ .2byte 306 @ Aggron
+ .2byte 143 @ Snorlax
+ .2byte 226 @ Mantine
+ .2byte 244 @ Entei
+ .2byte 149 @ Dragonite
+ .2byte 115 @ Kangaskhan
+ .2byte 297 @ Hariyama
+ .2byte 160 @ Feraligatr
+ .2byte 131 @ Lapras
+ .2byte 336 @ Seviper
+ .2byte 24 @ Arbok
+ .2byte 383 @ Groudon
+ .2byte 250 @ Ho-Oh
+ .2byte 148 @ Dragonair
+ .2byte 382 @ Kyogre
+ .2byte 249 @ Lugia
+ .2byte 350 @ Milotic
+ .2byte 130 @ Gyarados
+ .2byte 384 @ Rayquaza
+ .2byte 95 @ Onix
+ .2byte 208 @ Steelix
+ .2byte 321 @ Wailord
diff --git a/data/pokedex_order.s b/data/species_id_conversion_tables.s
index 88725d2bd..88725d2bd 100644
--- a/data/pokedex_order.s
+++ b/data/species_id_conversion_tables.s
diff --git a/data/trainer_eye_trainers.s b/data/trainer_eye_trainers.s
new file mode 100644
index 000000000..3628ea598
--- /dev/null
+++ b/data/trainer_eye_trainers.s
@@ -0,0 +1,58 @@
+ .align 2
+gTrainerEyeTrainers:: @ 839AE70
+ trainer_eye_trainer ROSE_1, ROSE_2, ROSE_3, ROSE_4, ROSE_5, Route118
+ trainer_eye_trainer DUSTY_1, DUSTY_2, DUSTY_3, DUSTY_4, DUSTY_5, Route111
+ trainer_eye_trainer LOLA_1, LOLA_2, LOLA_3, LOLA_4, LOLA_5, Route109
+ trainer_eye_trainer RICKY_1, RICKY_2, RICKY_3, RICKY_4, RICKY_5, Route109
+ trainer_eye_trainer RITA_AND_SAM_1, RITA_AND_SAM_2, RITA_AND_SAM_3, RITA_AND_SAM_4, RITA_AND_SAM_5, Route124
+ trainer_eye_trainer BROOKE_1, BROOKE_2, BROOKE_3, BROOKE_4, BROOKE_5, Route111
+ trainer_eye_trainer WILTON_1, WILTON_2, WILTON_3, WILTON_4, WILTON_5, Route111
+ trainer_eye_trainer VALERIE_1, VALERIE_2, VALERIE_3, VALERIE_4, VALERIE_5, MtPyre_6F
+ trainer_eye_trainer CINDY_1, CINDY_3, CINDY_4, CINDY_5, CINDY_6, Route104
+ trainer_eye_trainer JESSICA_1, JESSICA_2, JESSICA_3, JESSICA_4, JESSICA_5, Route121
+ trainer_eye_trainer WINSTON_1, WINSTON_2, WINSTON_3, WINSTON_4, WINSTON_5, Route104
+ trainer_eye_trainer STEVE_1, STEVE_2, STEVE_3, STEVE_4, STEVE_5, Route114
+ trainer_eye_trainer TONY_1, TONY_2, TONY_3, TONY_4, TONY_5, Route107
+ trainer_eye_trainer NOB_1, NOB_2, NOB_3, NOB_4, NOB_5, Route115
+ trainer_eye_trainer DALTON_1, DALTON_2, DALTON_3, DALTON_4, DALTON_5, Route118
+ trainer_eye_trainer BERNIE_1, BERNIE_2, BERNIE_3, BERNIE_4, BERNIE_5, Route114
+ trainer_eye_trainer ETHAN_1, ETHAN_2, ETHAN_3, ETHAN_4, ETHAN_5, JaggedPass
+ trainer_eye_trainer JOHN_AND_JAY_1, JOHN_AND_JAY_2, JOHN_AND_JAY_3, JOHN_AND_JAY_4, JOHN_AND_JAY_5, MeteorFalls_1F_2R
+ trainer_eye_trainer BRANDON_1, BRANDON_2, BRANDON_3, BRANDON_4, BRANDON_5, Route120
+ trainer_eye_trainer CAMERON_1, CAMERON_2, CAMERON_3, CAMERON_4, CAMERON_5, Route123
+ trainer_eye_trainer JACKI_1, JACKI_2, JACKI_3, JACKI_4, JACKI_5, Route123
+ trainer_eye_trainer WALTER_1, WALTER_2, WALTER_3, WALTER_4, WALTER_5, Route121
+ trainer_eye_trainer KAREN_1, KAREN_2, KAREN_3, KAREN_4, KAREN_5, Route116
+ trainer_eye_trainer JERRY_1, JERRY_2, JERRY_3, JERRY_4, JERRY_5, Route116
+ trainer_eye_trainer ANNA_AND_MEG_1, ANNA_AND_MEG_2, ANNA_AND_MEG_3, ANNA_AND_MEG_4, ANNA_AND_MEG_5, Route117
+ trainer_eye_trainer ISABEL_1, ISABEL_2, ISABEL_3, ISABEL_4, ISABEL_5, Route110
+ trainer_eye_trainer MIGUEL_1, MIGUEL_2, MIGUEL_3, MIGUEL_4, MIGUEL_5, Route103
+ trainer_eye_trainer TIMOTHY_1, TIMOTHY_2, TIMOTHY_3, TIMOTHY_4, TIMOTHY_5, Route115
+ trainer_eye_trainer SHELBY_1, SHELBY_2, SHELBY_3, SHELBY_4, SHELBY_5, MtChimney
+ trainer_eye_trainer CALVIN_1, CALVIN_2, CALVIN_3, CALVIN_4, CALVIN_5, Route102
+ trainer_eye_trainer ELLIOT_1, ELLIOT_2, ELLIOT_3, ELLIOT_4, ELLIOT_5, Route106
+ trainer_eye_trainer ABIGAIL_1, ABIGAIL_2, ABIGAIL_3, ABIGAIL_4, ABIGAIL_5, Route110
+ trainer_eye_trainer BENJAMIN_1, BENJAMIN_2, BENJAMIN_3, BENJAMIN_4, BENJAMIN_5, Route110
+ trainer_eye_trainer ISAIAH_1, ISAIAH_2, ISAIAH_3, ISAIAH_4, ISAIAH_5, Route128
+ trainer_eye_trainer KATELYN_1, KATELYN_2, KATELYN_3, KATELYN_4, KATELYN_5, Route128
+ trainer_eye_trainer MARIA_1, MARIA_2, MARIA_3, MARIA_4, MARIA_5, Route117
+ trainer_eye_trainer DYLAN_1, DYLAN_2, DYLAN_3, DYLAN_4, DYLAN_5, Route117
+ trainer_eye_trainer NICOLAS_1, NICOLAS_2, NICOLAS_3, NICOLAS_4, NICOLAS_5, MeteorFalls_1F_2R
+ trainer_eye_trainer ROBERT_1, ROBERT_2, ROBERT_3, ROBERT_4, ROBERT_5, Route120
+ trainer_eye_trainer LAO_1, LAO_2, LAO_3, LAO_4, LAO_5, Route113
+ trainer_eye_trainer CYNDY_1, CYNDY_2, CYNDY_3, CYNDY_4, CYNDY_5, Route115
+ trainer_eye_trainer MADELINE_1, MADELINE_2, MADELINE_3, MADELINE_4, MADELINE_5, Route113
+ trainer_eye_trainer JENNY_1, JENNY_2, JENNY_3, JENNY_4, JENNY_5, Route124
+ trainer_eye_trainer DIANA_1, DIANA_2, DIANA_3, DIANA_4, DIANA_5, JaggedPass
+ trainer_eye_trainer AMY_AND_LIV_1, AMY_AND_LIV_2, AMY_AND_LIV_4, AMY_AND_LIV_5, AMY_AND_LIV_6, Route103
+ trainer_eye_trainer ERNEST_1, ERNEST_2, ERNEST_3, ERNEST_4, ERNEST_5, Route125
+ trainer_eye_trainer EDWIN_1, EDWIN_2, EDWIN_3, EDWIN_4, EDWIN_5, Route110
+ trainer_eye_trainer LYDIA_1, LYDIA_2, LYDIA_3, LYDIA_4, LYDIA_5, Route117
+ trainer_eye_trainer ISAAC_1, ISAAC_2, ISAAC_3, ISAAC_4, ISAAC_5, Route117
+ trainer_eye_trainer CATHERINE_1, CATHERINE_2, CATHERINE_3, CATHERINE_4, CATHERINE_5, Route119
+ trainer_eye_trainer JACKSON_1, JACKSON_2, JACKSON_3, JACKSON_4, JACKSON_5, Route119
+ trainer_eye_trainer HALEY_1, HALEY_2, HALEY_3, HALEY_4, HALEY_5, Route104
+ trainer_eye_trainer JAMES_1, JAMES_2, JAMES_3, JAMES_4, JAMES_5, PetalburgWoods
+ trainer_eye_trainer TRENT_1, TRENT_2, TRENT_3, TRENT_4, TRENT_5, Route112
+ trainer_eye_trainer LOIS_AND_HAL_1, LOIS_AND_HAL_2, LOIS_AND_HAL_3, LOIS_AND_HAL_4, LOIS_AND_HAL_5, AbandonedShip_Rooms2_1F
+ trainer_eye_trainer WALLY_3, WALLY_4, WALLY_5, WALLY_6, NONE, VictoryRoad_1F
diff --git a/graphics/intro/intro2_bgclouds_map.bin b/graphics/intro/intro2_bgclouds_map.bin
new file mode 100644
index 000000000..25b65f766
--- /dev/null
+++ b/graphics/intro/intro2_bgclouds_map.bin
Binary files differ
diff --git a/graphics/intro/intro2_bgnight_map.bin b/graphics/intro/intro2_bgnight_map.bin
new file mode 100644
index 000000000..ef7c889ba
--- /dev/null
+++ b/graphics/intro/intro2_bgnight_map.bin
Binary files differ
diff --git a/graphics/intro/intro2_bgtrees_map.bin b/graphics/intro/intro2_bgtrees_map.bin
new file mode 100644
index 000000000..d1c23cc36
--- /dev/null
+++ b/graphics/intro/intro2_bgtrees_map.bin
Binary files differ
diff --git a/graphics/intro/intro2_grass_map.bin b/graphics/intro/intro2_grass_map.bin
new file mode 100644
index 000000000..2a6f1a72b
--- /dev/null
+++ b/graphics/intro/intro2_grass_map.bin
Binary files differ
diff --git a/graphics/intro/intro2_bgnight2.png b/graphics/intro/intro2_night.png
index 2a9838c6a..2a9838c6a 100755..100644
--- a/graphics/intro/intro2_bgnight2.png
+++ b/graphics/intro/intro2_night.png
Binary files differ
diff --git a/graphics/misc/darkness_field_move_streaks.pal b/graphics/misc/darkness_field_move_streaks.pal
new file mode 100644
index 000000000..37ea1ae61
--- /dev/null
+++ b/graphics/misc/darkness_field_move_streaks.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 139 57
+0 0 0
+148 148 148
+197 197 197
+255 255 255
+123 156 230
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/misc/darkness_field_move_streaks.png b/graphics/misc/darkness_field_move_streaks.png
new file mode 100644
index 000000000..825d695eb
--- /dev/null
+++ b/graphics/misc/darkness_field_move_streaks.png
Binary files differ
diff --git a/graphics/misc/darkness_field_move_streaks_map.bin b/graphics/misc/darkness_field_move_streaks_map.bin
new file mode 100644
index 000000000..f7c2f2142
--- /dev/null
+++ b/graphics/misc/darkness_field_move_streaks_map.bin
Binary files differ
diff --git a/graphics/misc/field_move_streaks.pal b/graphics/misc/field_move_streaks.pal
new file mode 100644
index 000000000..12bc76261
--- /dev/null
+++ b/graphics/misc/field_move_streaks.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/misc/field_move_streaks.png b/graphics/misc/field_move_streaks.png
new file mode 100644
index 000000000..8becc4413
--- /dev/null
+++ b/graphics/misc/field_move_streaks.png
Binary files differ
diff --git a/graphics/misc/field_move_streaks_map.bin b/graphics/misc/field_move_streaks_map.bin
new file mode 100644
index 000000000..466f456be
--- /dev/null
+++ b/graphics/misc/field_move_streaks_map.bin
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-18 03:29:25 +0000