diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2016-10-31 03:14:22 -0500 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2016-10-31 09:43:17 -0500 |
commit | 4df1937738c4dc39d23f5c4e4b0d6a3774ff1b17 (patch) | |
tree | 4035a8314efc3149a5f818a2589c099643b08850 /data | |
parent | 6874afafe545365a52c2262da4e4a84ddf14afaf (diff) |
Ported task.c and others from pokeruby
Diffstat (limited to 'data')
-rw-r--r-- | data/cry_id_table.s | 137 | ||||
-rw-r--r-- | data/data2.s | 4 | ||||
-rw-r--r-- | data/graphics.s | 21 |
3 files changed, 154 insertions, 8 deletions
diff --git a/data/cry_id_table.s b/data/cry_id_table.s new file mode 100644 index 000000000..ece08de06 --- /dev/null +++ b/data/cry_id_table.s @@ -0,0 +1,137 @@ + .align 1 +gSpeciesIdToCryId:: @ 831F61C + .2byte 273 @ TREECKO + .2byte 274 @ GROVYLE + .2byte 275 @ SCEPTILE + .2byte 270 @ TORCHIC + .2byte 271 @ COMBUSKEN + .2byte 272 @ BLAZIKEN + .2byte 276 @ MUDKIP + .2byte 277 @ MARSHTOMP + .2byte 278 @ SWAMPERT + .2byte 359 @ POOCHYENA + .2byte 360 @ MIGHTYENA + .2byte 378 @ ZIGZAGOON + .2byte 375 @ LINOONE + .2byte 290 @ WURMPLE + .2byte 291 @ SILCOON + .2byte 292 @ BEAUTIFLY + .2byte 293 @ CASCOON + .2byte 294 @ DUSTOX + .2byte 283 @ LOTAD + .2byte 284 @ LOMBRE + .2byte 285 @ LUDICOLO + .2byte 286 @ SEEDOT + .2byte 287 @ NUZLEAF + .2byte 288 @ SHIFTRY + .2byte 301 @ NINCADA + .2byte 302 @ NINJASK + .2byte 303 @ SHEDINJA + .2byte 266 @ TAILLOW + .2byte 267 @ SWELLOW + .2byte 374 @ SHROOMISH + .2byte 373 @ BRELOOM + .2byte 269 @ SPINDA + .2byte 280 @ WINGULL + .2byte 279 @ PELIPPER + .2byte 310 @ SURSKIT + .2byte 311 @ MASQUERAIN + .2byte 377 @ WAILMER + .2byte 381 @ WAILORD + .2byte 312 @ SKITTY + .2byte 313 @ DELCATTY + .2byte 251 @ KECLEON + .2byte 329 @ BALTOY + .2byte 330 @ CLAYDOL + .2byte 306 @ NOSEPASS + .2byte 253 @ TORKOAL + .2byte 362 @ SABLEYE + .2byte 318 @ BARBOACH + .2byte 319 @ WHISCASH + .2byte 368 @ LUVDISC + .2byte 320 @ CORPHISH + .2byte 321 @ CRAWDAUNT + .2byte 333 @ FEEBAS + .2byte 334 @ MILOTIC + .2byte 289 @ CARVANHA + .2byte 260 @ SHARPEDO + .2byte 324 @ TRAPINCH + .2byte 325 @ VIBRAVA + .2byte 326 @ FLYGON + .2byte 304 @ MAKUHITA + .2byte 305 @ HARIYAMA + .2byte 254 @ ELECTRIKE + .2byte 255 @ MANECTRIC + .2byte 316 @ NUMEL + .2byte 317 @ CAMERUPT + .2byte 338 @ SPHEAL + .2byte 339 @ SEALEO + .2byte 340 @ WALREIN + .2byte 327 @ CACNEA + .2byte 328 @ CACTURNE + .2byte 383 @ SNORUNT + .2byte 307 @ GLALIE + .2byte 331 @ LUNATONE + .2byte 332 @ SOLROCK + .2byte 262 @ AZURILL + .2byte 322 @ SPOINK + .2byte 323 @ GRUMPIG + .2byte 308 @ PLUSLE + .2byte 309 @ MINUN + .2byte 363 @ MAWILE + .2byte 336 @ MEDITITE + .2byte 337 @ MEDICHAM + .2byte 263 @ SWABLU + .2byte 264 @ ALTARIA + .2byte 258 @ WYNAUT + .2byte 256 @ DUSKULL + .2byte 361 @ DUSCLOPS + .2byte 252 @ ROSELIA + .2byte 298 @ SLAKOTH + .2byte 299 @ VIGOROTH + .2byte 300 @ SLAKING + .2byte 314 @ GULPIN + .2byte 315 @ SWALOT + .2byte 376 @ TROPIUS + .2byte 382 @ WHISMUR + .2byte 380 @ LOUDRED + .2byte 379 @ EXPLOUD + .2byte 341 @ CLAMPERL + .2byte 342 @ HUNTAIL + .2byte 343 @ GOREBYSS + .2byte 335 @ ABSOL + .2byte 282 @ SHUPPET + .2byte 281 @ BANETTE + .2byte 259 @ SEVIPER + .2byte 261 @ ZANGOOSE + .2byte 367 @ RELICANTH + .2byte 364 @ ARON + .2byte 365 @ LAIRON + .2byte 366 @ AGGRON + .2byte 356 @ CASTFORM + .2byte 357 @ VOLBEAT + .2byte 358 @ ILLUMISE + .2byte 344 @ LILEEP + .2byte 345 @ CRADILY + .2byte 346 @ ANORITH + .2byte 347 @ ARMALDO + .2byte 295 @ RALTS + .2byte 296 @ KIRLIA + .2byte 297 @ GARDEVOIR + .2byte 351 @ BAGON + .2byte 352 @ SHELGON + .2byte 372 @ SALAMENCE + .2byte 348 @ BELDUM + .2byte 349 @ METANG + .2byte 350 @ METAGROSS + .2byte 353 @ REGIROCK + .2byte 354 @ REGICE + .2byte 355 @ REGISTEEL + .2byte 370 @ KYOGRE + .2byte 369 @ GROUDON + .2byte 371 @ RAYQUAZA + .2byte 257 @ LATIAS + .2byte 384 @ LATIOS + .2byte 385 @ JIRACHI + .2byte 386 @ DEOXYS + .2byte 387 @ CHIMECHO diff --git a/data/data2.s b/data/data2.s index 3541b35de..8f9853f62 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1645,8 +1645,8 @@ gUnknown_0831C7B4:: @ 831C7B4 @ 831F5CA .include "data/trainer_class_name_indices.s" -gUnknown_0831F61C:: @ 831F61C - .incbin "baserom.gba", 0x31f61c, 0x110 +@ 831F61C + .include "data/cry_id_table.s" @ 831F72C .include "data/experience_tables.s" diff --git a/data/graphics.s b/data/graphics.s index 9f7af036e..e71f55906 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -716,14 +716,23 @@ gUnknown_08DC3A0C:: @ 8DC3A0C gUnknown_08DC3CD4:: @ 8DC3CD4 .incbin "baserom.gba", 0xdc3cd4, 0x80 -gUnknown_08DC3D54:: @ 8DC3D54 - .incbin "baserom.gba", 0xdc3d54, 0x20 +gIntroCopyright_Pal:: @ 8DC3D54 + .incbin "graphics/intro/copyright.gbapal" -gUnknown_08DC3D74:: @ 8DC3D74 - .incbin "baserom.gba", 0xdc3d74, 0x260 + .align 2 + +gIntroCopyright_Gfx:: @ 8DC3D74 + .incbin "graphics/intro/copyright.4bpp.lz" + + .align 2 + +gIntroCopyright_Tilemap:: @ 8DC3FD4 + .incbin "graphics/intro/copyright.bin.lz" -gUnknown_08DC3FD4:: @ 8DC3FD4 - .incbin "baserom.gba", 0xdc3fd4, 0x16c + .align 2 + +gUnknown_08DC4120:: @ 8DC4120 + .incbin "baserom.gba", 0xdc4120, 0x20 gUnknown_08DC4140:: @ 8DC4140 .incbin "baserom.gba", 0xdc4140, 0x1d8 |