Merge remote-tracking branch 'upstream/master' into move-tutor
# Conflicts: # include/pokenav.h # src/battle_script_commands.c
This commit is contained in:
Marcus Huderle
+416
-416
@@ -1,424 +1,424 @@
|
||||
#include "global.h"
|
||||
|
||||
const u32 gMonFrontPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/anim_front_pics/circled_question_mark_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/anim_front.4bpp.lz");
|
||||
|
||||
const u32 gMonFrontPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/anim_front_pics/bulbasaur_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ivysaur_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Venusaur[] = INCBIN_U32("graphics/pokemon/anim_front_pics/venusaur_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Charmander[] = INCBIN_U32("graphics/pokemon/anim_front_pics/charmander_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/charmeleon_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Charizard[] = INCBIN_U32("graphics/pokemon/anim_front_pics/charizard_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Squirtle[] = INCBIN_U32("graphics/pokemon/anim_front_pics/squirtle_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Wartortle[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wartortle_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Blastoise[] = INCBIN_U32("graphics/pokemon/anim_front_pics/blastoise_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Caterpie[] = INCBIN_U32("graphics/pokemon/anim_front_pics/caterpie_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Metapod[] = INCBIN_U32("graphics/pokemon/anim_front_pics/metapod_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Butterfree[] = INCBIN_U32("graphics/pokemon/anim_front_pics/butterfree_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Weedle[] = INCBIN_U32("graphics/pokemon/anim_front_pics/weedle_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Kakuna[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kakuna_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Beedrill[] = INCBIN_U32("graphics/pokemon/anim_front_pics/beedrill_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Pidgey[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pidgey_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pidgeotto_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pidgeot_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Rattata[] = INCBIN_U32("graphics/pokemon/anim_front_pics/rattata_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Raticate[] = INCBIN_U32("graphics/pokemon/anim_front_pics/raticate_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Spearow[] = INCBIN_U32("graphics/pokemon/anim_front_pics/spearow_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Fearow[] = INCBIN_U32("graphics/pokemon/anim_front_pics/fearow_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ekans[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ekans_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Arbok[] = INCBIN_U32("graphics/pokemon/anim_front_pics/arbok_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Pikachu[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pikachu_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Raichu[] = INCBIN_U32("graphics/pokemon/anim_front_pics/raichu_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sandshrew_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Sandslash[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sandslash_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_NidoranF[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nidoran_f_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Nidorina[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nidorina_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nidoqueen_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_NidoranM[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nidoran_m_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Nidorino[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nidorino_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Nidoking[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nidoking_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Clefairy[] = INCBIN_U32("graphics/pokemon/anim_front_pics/clefairy_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Clefable[] = INCBIN_U32("graphics/pokemon/anim_front_pics/clefable_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Vulpix[] = INCBIN_U32("graphics/pokemon/anim_front_pics/vulpix_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ninetales[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ninetales_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/anim_front_pics/jigglypuff_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wigglytuff_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Zubat[] = INCBIN_U32("graphics/pokemon/anim_front_pics/zubat_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Golbat[] = INCBIN_U32("graphics/pokemon/anim_front_pics/golbat_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Oddish[] = INCBIN_U32("graphics/pokemon/anim_front_pics/oddish_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Gloom[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gloom_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Vileplume[] = INCBIN_U32("graphics/pokemon/anim_front_pics/vileplume_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Paras[] = INCBIN_U32("graphics/pokemon/anim_front_pics/paras_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Parasect[] = INCBIN_U32("graphics/pokemon/anim_front_pics/parasect_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Venonat[] = INCBIN_U32("graphics/pokemon/anim_front_pics/venonat_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Venomoth[] = INCBIN_U32("graphics/pokemon/anim_front_pics/venomoth_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Diglett[] = INCBIN_U32("graphics/pokemon/anim_front_pics/diglett_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dugtrio_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Meowth[] = INCBIN_U32("graphics/pokemon/anim_front_pics/meowth_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Persian[] = INCBIN_U32("graphics/pokemon/anim_front_pics/persian_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Psyduck[] = INCBIN_U32("graphics/pokemon/anim_front_pics/psyduck_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Golduck[] = INCBIN_U32("graphics/pokemon/anim_front_pics/golduck_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Mankey[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mankey_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Primeape[] = INCBIN_U32("graphics/pokemon/anim_front_pics/primeape_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Growlithe[] = INCBIN_U32("graphics/pokemon/anim_front_pics/growlithe_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Arcanine[] = INCBIN_U32("graphics/pokemon/anim_front_pics/arcanine_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Poliwag[] = INCBIN_U32("graphics/pokemon/anim_front_pics/poliwag_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/anim_front_pics/poliwhirl_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/anim_front_pics/poliwrath_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Abra[] = INCBIN_U32("graphics/pokemon/anim_front_pics/abra_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Kadabra[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kadabra_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Alakazam[] = INCBIN_U32("graphics/pokemon/anim_front_pics/alakazam_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Machop[] = INCBIN_U32("graphics/pokemon/anim_front_pics/machop_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Machoke[] = INCBIN_U32("graphics/pokemon/anim_front_pics/machoke_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Machamp[] = INCBIN_U32("graphics/pokemon/anim_front_pics/machamp_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/anim_front_pics/bellsprout_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/anim_front_pics/weepinbell_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Victreebel[] = INCBIN_U32("graphics/pokemon/anim_front_pics/victreebel_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Tentacool[] = INCBIN_U32("graphics/pokemon/anim_front_pics/tentacool_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/anim_front_pics/tentacruel_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Geodude[] = INCBIN_U32("graphics/pokemon/anim_front_pics/geodude_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Graveler[] = INCBIN_U32("graphics/pokemon/anim_front_pics/graveler_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Golem[] = INCBIN_U32("graphics/pokemon/anim_front_pics/golem_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ponyta[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ponyta_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Rapidash[] = INCBIN_U32("graphics/pokemon/anim_front_pics/rapidash_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/anim_front_pics/slowpoke_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Slowbro[] = INCBIN_U32("graphics/pokemon/anim_front_pics/slowbro_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Magnemite[] = INCBIN_U32("graphics/pokemon/anim_front_pics/magnemite_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Magneton[] = INCBIN_U32("graphics/pokemon/anim_front_pics/magneton_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/anim_front_pics/farfetch_d_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Doduo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/doduo_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Dodrio[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dodrio_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Seel[] = INCBIN_U32("graphics/pokemon/anim_front_pics/seel_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Dewgong[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dewgong_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Grimer[] = INCBIN_U32("graphics/pokemon/anim_front_pics/grimer_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Muk[] = INCBIN_U32("graphics/pokemon/anim_front_pics/muk_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Shellder[] = INCBIN_U32("graphics/pokemon/anim_front_pics/shellder_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Cloyster[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cloyster_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Gastly[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gastly_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Haunter[] = INCBIN_U32("graphics/pokemon/anim_front_pics/haunter_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Gengar[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gengar_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Onix[] = INCBIN_U32("graphics/pokemon/anim_front_pics/onix_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Drowzee[] = INCBIN_U32("graphics/pokemon/anim_front_pics/drowzee_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Hypno[] = INCBIN_U32("graphics/pokemon/anim_front_pics/hypno_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Krabby[] = INCBIN_U32("graphics/pokemon/anim_front_pics/krabby_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Kingler[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kingler_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Voltorb[] = INCBIN_U32("graphics/pokemon/anim_front_pics/voltorb_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Electrode[] = INCBIN_U32("graphics/pokemon/anim_front_pics/electrode_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/anim_front_pics/exeggcute_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/anim_front_pics/exeggutor_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Cubone[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cubone_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Marowak[] = INCBIN_U32("graphics/pokemon/anim_front_pics/marowak_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/anim_front_pics/hitmonlee_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/anim_front_pics/hitmonchan_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Lickitung[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lickitung_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Koffing[] = INCBIN_U32("graphics/pokemon/anim_front_pics/koffing_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Weezing[] = INCBIN_U32("graphics/pokemon/anim_front_pics/weezing_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/anim_front_pics/rhyhorn_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Rhydon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/rhydon_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Chansey[] = INCBIN_U32("graphics/pokemon/anim_front_pics/chansey_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Tangela[] = INCBIN_U32("graphics/pokemon/anim_front_pics/tangela_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kangaskhan_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Horsea[] = INCBIN_U32("graphics/pokemon/anim_front_pics/horsea_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Seadra[] = INCBIN_U32("graphics/pokemon/anim_front_pics/seadra_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Goldeen[] = INCBIN_U32("graphics/pokemon/anim_front_pics/goldeen_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Seaking[] = INCBIN_U32("graphics/pokemon/anim_front_pics/seaking_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Staryu[] = INCBIN_U32("graphics/pokemon/anim_front_pics/staryu_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Starmie[] = INCBIN_U32("graphics/pokemon/anim_front_pics/starmie_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Mrmime[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mr_mime_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Scyther[] = INCBIN_U32("graphics/pokemon/anim_front_pics/scyther_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Jynx[] = INCBIN_U32("graphics/pokemon/anim_front_pics/jynx_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/anim_front_pics/electabuzz_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Magmar[] = INCBIN_U32("graphics/pokemon/anim_front_pics/magmar_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Pinsir[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pinsir_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Tauros[] = INCBIN_U32("graphics/pokemon/anim_front_pics/tauros_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Magikarp[] = INCBIN_U32("graphics/pokemon/anim_front_pics/magikarp_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Gyarados[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gyarados_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Lapras[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lapras_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ditto[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ditto_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Eevee[] = INCBIN_U32("graphics/pokemon/anim_front_pics/eevee_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/vaporeon_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Jolteon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/jolteon_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Flareon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/flareon_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Porygon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/porygon_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Omanyte[] = INCBIN_U32("graphics/pokemon/anim_front_pics/omanyte_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Omastar[] = INCBIN_U32("graphics/pokemon/anim_front_pics/omastar_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Kabuto[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kabuto_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Kabutops[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kabutops_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/anim_front_pics/aerodactyl_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Snorlax[] = INCBIN_U32("graphics/pokemon/anim_front_pics/snorlax_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Articuno[] = INCBIN_U32("graphics/pokemon/anim_front_pics/articuno_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Zapdos[] = INCBIN_U32("graphics/pokemon/anim_front_pics/zapdos_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Moltres[] = INCBIN_U32("graphics/pokemon/anim_front_pics/moltres_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Dratini[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dratini_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Dragonair[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dragonair_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Dragonite[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dragonite_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mewtwo_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Mew[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mew_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Bulbasaur[] = INCBIN_U32("graphics/pokemon/bulbasaur/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ivysaur[] = INCBIN_U32("graphics/pokemon/ivysaur/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Venusaur[] = INCBIN_U32("graphics/pokemon/venusaur/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Charmander[] = INCBIN_U32("graphics/pokemon/charmander/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Charmeleon[] = INCBIN_U32("graphics/pokemon/charmeleon/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Charizard[] = INCBIN_U32("graphics/pokemon/charizard/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Squirtle[] = INCBIN_U32("graphics/pokemon/squirtle/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Wartortle[] = INCBIN_U32("graphics/pokemon/wartortle/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Blastoise[] = INCBIN_U32("graphics/pokemon/blastoise/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Caterpie[] = INCBIN_U32("graphics/pokemon/caterpie/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Metapod[] = INCBIN_U32("graphics/pokemon/metapod/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Butterfree[] = INCBIN_U32("graphics/pokemon/butterfree/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Weedle[] = INCBIN_U32("graphics/pokemon/weedle/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Kakuna[] = INCBIN_U32("graphics/pokemon/kakuna/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Beedrill[] = INCBIN_U32("graphics/pokemon/beedrill/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Pidgey[] = INCBIN_U32("graphics/pokemon/pidgey/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Pidgeotto[] = INCBIN_U32("graphics/pokemon/pidgeotto/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Pidgeot[] = INCBIN_U32("graphics/pokemon/pidgeot/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Rattata[] = INCBIN_U32("graphics/pokemon/rattata/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Raticate[] = INCBIN_U32("graphics/pokemon/raticate/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Spearow[] = INCBIN_U32("graphics/pokemon/spearow/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Fearow[] = INCBIN_U32("graphics/pokemon/fearow/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ekans[] = INCBIN_U32("graphics/pokemon/ekans/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Arbok[] = INCBIN_U32("graphics/pokemon/arbok/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Pikachu[] = INCBIN_U32("graphics/pokemon/pikachu/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Raichu[] = INCBIN_U32("graphics/pokemon/raichu/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Sandshrew[] = INCBIN_U32("graphics/pokemon/sandshrew/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Sandslash[] = INCBIN_U32("graphics/pokemon/sandslash/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_NidoranF[] = INCBIN_U32("graphics/pokemon/nidoran_f/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Nidorina[] = INCBIN_U32("graphics/pokemon/nidorina/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Nidoqueen[] = INCBIN_U32("graphics/pokemon/nidoqueen/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_NidoranM[] = INCBIN_U32("graphics/pokemon/nidoran_m/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Nidorino[] = INCBIN_U32("graphics/pokemon/nidorino/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Nidoking[] = INCBIN_U32("graphics/pokemon/nidoking/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Clefairy[] = INCBIN_U32("graphics/pokemon/clefairy/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Clefable[] = INCBIN_U32("graphics/pokemon/clefable/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Vulpix[] = INCBIN_U32("graphics/pokemon/vulpix/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ninetales[] = INCBIN_U32("graphics/pokemon/ninetales/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Jigglypuff[] = INCBIN_U32("graphics/pokemon/jigglypuff/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Wigglytuff[] = INCBIN_U32("graphics/pokemon/wigglytuff/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Zubat[] = INCBIN_U32("graphics/pokemon/zubat/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Golbat[] = INCBIN_U32("graphics/pokemon/golbat/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Oddish[] = INCBIN_U32("graphics/pokemon/oddish/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Gloom[] = INCBIN_U32("graphics/pokemon/gloom/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Vileplume[] = INCBIN_U32("graphics/pokemon/vileplume/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Paras[] = INCBIN_U32("graphics/pokemon/paras/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Parasect[] = INCBIN_U32("graphics/pokemon/parasect/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Venonat[] = INCBIN_U32("graphics/pokemon/venonat/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Venomoth[] = INCBIN_U32("graphics/pokemon/venomoth/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Diglett[] = INCBIN_U32("graphics/pokemon/diglett/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Dugtrio[] = INCBIN_U32("graphics/pokemon/dugtrio/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Meowth[] = INCBIN_U32("graphics/pokemon/meowth/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Persian[] = INCBIN_U32("graphics/pokemon/persian/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Psyduck[] = INCBIN_U32("graphics/pokemon/psyduck/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Golduck[] = INCBIN_U32("graphics/pokemon/golduck/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Mankey[] = INCBIN_U32("graphics/pokemon/mankey/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Primeape[] = INCBIN_U32("graphics/pokemon/primeape/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Growlithe[] = INCBIN_U32("graphics/pokemon/growlithe/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Arcanine[] = INCBIN_U32("graphics/pokemon/arcanine/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Poliwag[] = INCBIN_U32("graphics/pokemon/poliwag/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Poliwhirl[] = INCBIN_U32("graphics/pokemon/poliwhirl/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Poliwrath[] = INCBIN_U32("graphics/pokemon/poliwrath/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Abra[] = INCBIN_U32("graphics/pokemon/abra/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Kadabra[] = INCBIN_U32("graphics/pokemon/kadabra/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Alakazam[] = INCBIN_U32("graphics/pokemon/alakazam/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Machop[] = INCBIN_U32("graphics/pokemon/machop/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Machoke[] = INCBIN_U32("graphics/pokemon/machoke/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Machamp[] = INCBIN_U32("graphics/pokemon/machamp/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Bellsprout[] = INCBIN_U32("graphics/pokemon/bellsprout/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Weepinbell[] = INCBIN_U32("graphics/pokemon/weepinbell/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Victreebel[] = INCBIN_U32("graphics/pokemon/victreebel/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Tentacool[] = INCBIN_U32("graphics/pokemon/tentacool/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Tentacruel[] = INCBIN_U32("graphics/pokemon/tentacruel/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Geodude[] = INCBIN_U32("graphics/pokemon/geodude/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Graveler[] = INCBIN_U32("graphics/pokemon/graveler/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Golem[] = INCBIN_U32("graphics/pokemon/golem/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ponyta[] = INCBIN_U32("graphics/pokemon/ponyta/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Rapidash[] = INCBIN_U32("graphics/pokemon/rapidash/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Slowpoke[] = INCBIN_U32("graphics/pokemon/slowpoke/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Slowbro[] = INCBIN_U32("graphics/pokemon/slowbro/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Magnemite[] = INCBIN_U32("graphics/pokemon/magnemite/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Magneton[] = INCBIN_U32("graphics/pokemon/magneton/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Farfetchd[] = INCBIN_U32("graphics/pokemon/farfetch_d/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Doduo[] = INCBIN_U32("graphics/pokemon/doduo/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Dodrio[] = INCBIN_U32("graphics/pokemon/dodrio/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Seel[] = INCBIN_U32("graphics/pokemon/seel/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Dewgong[] = INCBIN_U32("graphics/pokemon/dewgong/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Grimer[] = INCBIN_U32("graphics/pokemon/grimer/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Muk[] = INCBIN_U32("graphics/pokemon/muk/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Shellder[] = INCBIN_U32("graphics/pokemon/shellder/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Cloyster[] = INCBIN_U32("graphics/pokemon/cloyster/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Gastly[] = INCBIN_U32("graphics/pokemon/gastly/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Haunter[] = INCBIN_U32("graphics/pokemon/haunter/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Gengar[] = INCBIN_U32("graphics/pokemon/gengar/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Onix[] = INCBIN_U32("graphics/pokemon/onix/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Drowzee[] = INCBIN_U32("graphics/pokemon/drowzee/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Hypno[] = INCBIN_U32("graphics/pokemon/hypno/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Krabby[] = INCBIN_U32("graphics/pokemon/krabby/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Kingler[] = INCBIN_U32("graphics/pokemon/kingler/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Voltorb[] = INCBIN_U32("graphics/pokemon/voltorb/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Electrode[] = INCBIN_U32("graphics/pokemon/electrode/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Exeggcute[] = INCBIN_U32("graphics/pokemon/exeggcute/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Exeggutor[] = INCBIN_U32("graphics/pokemon/exeggutor/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Cubone[] = INCBIN_U32("graphics/pokemon/cubone/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Marowak[] = INCBIN_U32("graphics/pokemon/marowak/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Hitmonlee[] = INCBIN_U32("graphics/pokemon/hitmonlee/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Hitmonchan[] = INCBIN_U32("graphics/pokemon/hitmonchan/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Lickitung[] = INCBIN_U32("graphics/pokemon/lickitung/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Koffing[] = INCBIN_U32("graphics/pokemon/koffing/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Weezing[] = INCBIN_U32("graphics/pokemon/weezing/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Rhyhorn[] = INCBIN_U32("graphics/pokemon/rhyhorn/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Rhydon[] = INCBIN_U32("graphics/pokemon/rhydon/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Chansey[] = INCBIN_U32("graphics/pokemon/chansey/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Tangela[] = INCBIN_U32("graphics/pokemon/tangela/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Kangaskhan[] = INCBIN_U32("graphics/pokemon/kangaskhan/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Horsea[] = INCBIN_U32("graphics/pokemon/horsea/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Seadra[] = INCBIN_U32("graphics/pokemon/seadra/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Magmar[] = INCBIN_U32("graphics/pokemon/magmar/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Pinsir[] = INCBIN_U32("graphics/pokemon/pinsir/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Tauros[] = INCBIN_U32("graphics/pokemon/tauros/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Magikarp[] = INCBIN_U32("graphics/pokemon/magikarp/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Gyarados[] = INCBIN_U32("graphics/pokemon/gyarados/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Lapras[] = INCBIN_U32("graphics/pokemon/lapras/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ditto[] = INCBIN_U32("graphics/pokemon/ditto/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Eevee[] = INCBIN_U32("graphics/pokemon/eevee/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Vaporeon[] = INCBIN_U32("graphics/pokemon/vaporeon/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Jolteon[] = INCBIN_U32("graphics/pokemon/jolteon/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Flareon[] = INCBIN_U32("graphics/pokemon/flareon/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Porygon[] = INCBIN_U32("graphics/pokemon/porygon/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Omanyte[] = INCBIN_U32("graphics/pokemon/omanyte/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Omastar[] = INCBIN_U32("graphics/pokemon/omastar/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Kabuto[] = INCBIN_U32("graphics/pokemon/kabuto/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Kabutops[] = INCBIN_U32("graphics/pokemon/kabutops/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Aerodactyl[] = INCBIN_U32("graphics/pokemon/aerodactyl/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Snorlax[] = INCBIN_U32("graphics/pokemon/snorlax/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Articuno[] = INCBIN_U32("graphics/pokemon/articuno/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Zapdos[] = INCBIN_U32("graphics/pokemon/zapdos/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Moltres[] = INCBIN_U32("graphics/pokemon/moltres/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Dratini[] = INCBIN_U32("graphics/pokemon/dratini/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Dragonair[] = INCBIN_U32("graphics/pokemon/dragonair/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Dragonite[] = INCBIN_U32("graphics/pokemon/dragonite/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Mewtwo[] = INCBIN_U32("graphics/pokemon/mewtwo/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Mew[] = INCBIN_U32("graphics/pokemon/mew/anim_front.4bpp.lz");
|
||||
|
||||
const u32 gMonFrontPic_Chikorita[] = INCBIN_U32("graphics/pokemon/anim_front_pics/chikorita_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Bayleef[] = INCBIN_U32("graphics/pokemon/anim_front_pics/bayleef_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Meganium[] = INCBIN_U32("graphics/pokemon/anim_front_pics/meganium_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cyndaquil_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Quilava[] = INCBIN_U32("graphics/pokemon/anim_front_pics/quilava_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/anim_front_pics/typhlosion_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Totodile[] = INCBIN_U32("graphics/pokemon/anim_front_pics/totodile_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Croconaw[] = INCBIN_U32("graphics/pokemon/anim_front_pics/croconaw_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/anim_front_pics/feraligatr_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Sentret[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sentret_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Furret[] = INCBIN_U32("graphics/pokemon/anim_front_pics/furret_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/anim_front_pics/hoothoot_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Noctowl[] = INCBIN_U32("graphics/pokemon/anim_front_pics/noctowl_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ledyba[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ledyba_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ledian[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ledian_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Spinarak[] = INCBIN_U32("graphics/pokemon/anim_front_pics/spinarak_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ariados[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ariados_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Crobat[] = INCBIN_U32("graphics/pokemon/anim_front_pics/crobat_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Chinchou[] = INCBIN_U32("graphics/pokemon/anim_front_pics/chinchou_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Lanturn[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lanturn_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Pichu[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pichu_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Cleffa[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cleffa_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/anim_front_pics/igglybuff_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Togepi[] = INCBIN_U32("graphics/pokemon/anim_front_pics/togepi_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Togetic[] = INCBIN_U32("graphics/pokemon/anim_front_pics/togetic_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Natu[] = INCBIN_U32("graphics/pokemon/anim_front_pics/natu_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Xatu[] = INCBIN_U32("graphics/pokemon/anim_front_pics/xatu_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Mareep[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mareep_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/anim_front_pics/flaaffy_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ampharos[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ampharos_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Bellossom[] = INCBIN_U32("graphics/pokemon/anim_front_pics/bellossom_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Marill[] = INCBIN_U32("graphics/pokemon/anim_front_pics/marill_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Azumarill[] = INCBIN_U32("graphics/pokemon/anim_front_pics/azumarill_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sudowoodo_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Politoed[] = INCBIN_U32("graphics/pokemon/anim_front_pics/politoed_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Hoppip[] = INCBIN_U32("graphics/pokemon/anim_front_pics/hoppip_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Skiploom[] = INCBIN_U32("graphics/pokemon/anim_front_pics/skiploom_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/anim_front_pics/jumpluff_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Aipom[] = INCBIN_U32("graphics/pokemon/anim_front_pics/aipom_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Sunkern[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sunkern_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Sunflora[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sunflora_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Yanma[] = INCBIN_U32("graphics/pokemon/anim_front_pics/yanma_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Wooper[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wooper_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Quagsire[] = INCBIN_U32("graphics/pokemon/anim_front_pics/quagsire_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Espeon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/espeon_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Umbreon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/umbreon_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Murkrow[] = INCBIN_U32("graphics/pokemon/anim_front_pics/murkrow_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Slowking[] = INCBIN_U32("graphics/pokemon/anim_front_pics/slowking_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/anim_front_pics/misdreavus_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownA[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_a_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wobbuffet_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Girafarig[] = INCBIN_U32("graphics/pokemon/anim_front_pics/girafarig_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Pineco[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pineco_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Forretress[] = INCBIN_U32("graphics/pokemon/anim_front_pics/forretress_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dunsparce_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Gligar[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gligar_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Steelix[] = INCBIN_U32("graphics/pokemon/anim_front_pics/steelix_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Snubbull[] = INCBIN_U32("graphics/pokemon/anim_front_pics/snubbull_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Granbull[] = INCBIN_U32("graphics/pokemon/anim_front_pics/granbull_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/anim_front_pics/qwilfish_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Scizor[] = INCBIN_U32("graphics/pokemon/anim_front_pics/scizor_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Shuckle[] = INCBIN_U32("graphics/pokemon/anim_front_pics/shuckle_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Heracross[] = INCBIN_U32("graphics/pokemon/anim_front_pics/heracross_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Sneasel[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sneasel_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/anim_front_pics/teddiursa_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ursaring[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ursaring_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Slugma[] = INCBIN_U32("graphics/pokemon/anim_front_pics/slugma_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Magcargo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/magcargo_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Swinub[] = INCBIN_U32("graphics/pokemon/anim_front_pics/swinub_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Piloswine[] = INCBIN_U32("graphics/pokemon/anim_front_pics/piloswine_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Corsola[] = INCBIN_U32("graphics/pokemon/anim_front_pics/corsola_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Remoraid[] = INCBIN_U32("graphics/pokemon/anim_front_pics/remoraid_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Octillery[] = INCBIN_U32("graphics/pokemon/anim_front_pics/octillery_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Delibird[] = INCBIN_U32("graphics/pokemon/anim_front_pics/delibird_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Mantine[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mantine_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Skarmory[] = INCBIN_U32("graphics/pokemon/anim_front_pics/skarmory_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Houndour[] = INCBIN_U32("graphics/pokemon/anim_front_pics/houndour_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Houndoom[] = INCBIN_U32("graphics/pokemon/anim_front_pics/houndoom_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Kingdra[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kingdra_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Phanpy[] = INCBIN_U32("graphics/pokemon/anim_front_pics/phanpy_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Donphan[] = INCBIN_U32("graphics/pokemon/anim_front_pics/donphan_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/anim_front_pics/porygon2_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Stantler[] = INCBIN_U32("graphics/pokemon/anim_front_pics/stantler_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Smeargle[] = INCBIN_U32("graphics/pokemon/anim_front_pics/smeargle_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/anim_front_pics/tyrogue_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/anim_front_pics/hitmontop_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Smoochum[] = INCBIN_U32("graphics/pokemon/anim_front_pics/smoochum_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Elekid[] = INCBIN_U32("graphics/pokemon/anim_front_pics/elekid_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Magby[] = INCBIN_U32("graphics/pokemon/anim_front_pics/magby_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Miltank[] = INCBIN_U32("graphics/pokemon/anim_front_pics/miltank_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Blissey[] = INCBIN_U32("graphics/pokemon/anim_front_pics/blissey_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Raikou[] = INCBIN_U32("graphics/pokemon/anim_front_pics/raikou_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Entei[] = INCBIN_U32("graphics/pokemon/anim_front_pics/entei_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Suicune[] = INCBIN_U32("graphics/pokemon/anim_front_pics/suicune_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Larvitar[] = INCBIN_U32("graphics/pokemon/anim_front_pics/larvitar_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Pupitar[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pupitar_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/anim_front_pics/tyranitar_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Lugia[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lugia_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_HoOh[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ho_oh_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Celebi[] = INCBIN_U32("graphics/pokemon/anim_front_pics/celebi_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Chikorita[] = INCBIN_U32("graphics/pokemon/chikorita/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Bayleef[] = INCBIN_U32("graphics/pokemon/bayleef/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Meganium[] = INCBIN_U32("graphics/pokemon/meganium/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Cyndaquil[] = INCBIN_U32("graphics/pokemon/cyndaquil/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Quilava[] = INCBIN_U32("graphics/pokemon/quilava/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Typhlosion[] = INCBIN_U32("graphics/pokemon/typhlosion/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Totodile[] = INCBIN_U32("graphics/pokemon/totodile/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Croconaw[] = INCBIN_U32("graphics/pokemon/croconaw/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Feraligatr[] = INCBIN_U32("graphics/pokemon/feraligatr/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Sentret[] = INCBIN_U32("graphics/pokemon/sentret/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Furret[] = INCBIN_U32("graphics/pokemon/furret/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Hoothoot[] = INCBIN_U32("graphics/pokemon/hoothoot/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Noctowl[] = INCBIN_U32("graphics/pokemon/noctowl/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ledyba[] = INCBIN_U32("graphics/pokemon/ledyba/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ledian[] = INCBIN_U32("graphics/pokemon/ledian/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Spinarak[] = INCBIN_U32("graphics/pokemon/spinarak/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ariados[] = INCBIN_U32("graphics/pokemon/ariados/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Crobat[] = INCBIN_U32("graphics/pokemon/crobat/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Chinchou[] = INCBIN_U32("graphics/pokemon/chinchou/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Lanturn[] = INCBIN_U32("graphics/pokemon/lanturn/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Pichu[] = INCBIN_U32("graphics/pokemon/pichu/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Cleffa[] = INCBIN_U32("graphics/pokemon/cleffa/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Igglybuff[] = INCBIN_U32("graphics/pokemon/igglybuff/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Togepi[] = INCBIN_U32("graphics/pokemon/togepi/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Togetic[] = INCBIN_U32("graphics/pokemon/togetic/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Natu[] = INCBIN_U32("graphics/pokemon/natu/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Xatu[] = INCBIN_U32("graphics/pokemon/xatu/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Mareep[] = INCBIN_U32("graphics/pokemon/mareep/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Flaaffy[] = INCBIN_U32("graphics/pokemon/flaaffy/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ampharos[] = INCBIN_U32("graphics/pokemon/ampharos/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Bellossom[] = INCBIN_U32("graphics/pokemon/bellossom/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Marill[] = INCBIN_U32("graphics/pokemon/marill/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Azumarill[] = INCBIN_U32("graphics/pokemon/azumarill/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Sudowoodo[] = INCBIN_U32("graphics/pokemon/sudowoodo/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Politoed[] = INCBIN_U32("graphics/pokemon/politoed/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Hoppip[] = INCBIN_U32("graphics/pokemon/hoppip/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Skiploom[] = INCBIN_U32("graphics/pokemon/skiploom/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Jumpluff[] = INCBIN_U32("graphics/pokemon/jumpluff/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Aipom[] = INCBIN_U32("graphics/pokemon/aipom/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Sunkern[] = INCBIN_U32("graphics/pokemon/sunkern/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Sunflora[] = INCBIN_U32("graphics/pokemon/sunflora/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Yanma[] = INCBIN_U32("graphics/pokemon/yanma/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Wooper[] = INCBIN_U32("graphics/pokemon/wooper/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Quagsire[] = INCBIN_U32("graphics/pokemon/quagsire/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Espeon[] = INCBIN_U32("graphics/pokemon/espeon/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Umbreon[] = INCBIN_U32("graphics/pokemon/umbreon/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Murkrow[] = INCBIN_U32("graphics/pokemon/murkrow/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Slowking[] = INCBIN_U32("graphics/pokemon/slowking/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Misdreavus[] = INCBIN_U32("graphics/pokemon/misdreavus/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownA[] = INCBIN_U32("graphics/pokemon/unown/anim_front_a.4bpp.lz");
|
||||
const u32 gMonFrontPic_Wobbuffet[] = INCBIN_U32("graphics/pokemon/wobbuffet/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Girafarig[] = INCBIN_U32("graphics/pokemon/girafarig/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Pineco[] = INCBIN_U32("graphics/pokemon/pineco/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Forretress[] = INCBIN_U32("graphics/pokemon/forretress/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Dunsparce[] = INCBIN_U32("graphics/pokemon/dunsparce/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Gligar[] = INCBIN_U32("graphics/pokemon/gligar/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Steelix[] = INCBIN_U32("graphics/pokemon/steelix/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Snubbull[] = INCBIN_U32("graphics/pokemon/snubbull/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Granbull[] = INCBIN_U32("graphics/pokemon/granbull/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Qwilfish[] = INCBIN_U32("graphics/pokemon/qwilfish/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Scizor[] = INCBIN_U32("graphics/pokemon/scizor/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Shuckle[] = INCBIN_U32("graphics/pokemon/shuckle/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Heracross[] = INCBIN_U32("graphics/pokemon/heracross/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Sneasel[] = INCBIN_U32("graphics/pokemon/sneasel/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Teddiursa[] = INCBIN_U32("graphics/pokemon/teddiursa/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ursaring[] = INCBIN_U32("graphics/pokemon/ursaring/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Slugma[] = INCBIN_U32("graphics/pokemon/slugma/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Magcargo[] = INCBIN_U32("graphics/pokemon/magcargo/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Swinub[] = INCBIN_U32("graphics/pokemon/swinub/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Piloswine[] = INCBIN_U32("graphics/pokemon/piloswine/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Corsola[] = INCBIN_U32("graphics/pokemon/corsola/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Remoraid[] = INCBIN_U32("graphics/pokemon/remoraid/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Octillery[] = INCBIN_U32("graphics/pokemon/octillery/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Delibird[] = INCBIN_U32("graphics/pokemon/delibird/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Mantine[] = INCBIN_U32("graphics/pokemon/mantine/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Skarmory[] = INCBIN_U32("graphics/pokemon/skarmory/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Houndour[] = INCBIN_U32("graphics/pokemon/houndour/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Houndoom[] = INCBIN_U32("graphics/pokemon/houndoom/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Kingdra[] = INCBIN_U32("graphics/pokemon/kingdra/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Phanpy[] = INCBIN_U32("graphics/pokemon/phanpy/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Donphan[] = INCBIN_U32("graphics/pokemon/donphan/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Porygon2[] = INCBIN_U32("graphics/pokemon/porygon2/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Stantler[] = INCBIN_U32("graphics/pokemon/stantler/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Smeargle[] = INCBIN_U32("graphics/pokemon/smeargle/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Tyrogue[] = INCBIN_U32("graphics/pokemon/tyrogue/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Hitmontop[] = INCBIN_U32("graphics/pokemon/hitmontop/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Smoochum[] = INCBIN_U32("graphics/pokemon/smoochum/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Elekid[] = INCBIN_U32("graphics/pokemon/elekid/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Magby[] = INCBIN_U32("graphics/pokemon/magby/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Miltank[] = INCBIN_U32("graphics/pokemon/miltank/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Blissey[] = INCBIN_U32("graphics/pokemon/blissey/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Raikou[] = INCBIN_U32("graphics/pokemon/raikou/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Entei[] = INCBIN_U32("graphics/pokemon/entei/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Suicune[] = INCBIN_U32("graphics/pokemon/suicune/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Larvitar[] = INCBIN_U32("graphics/pokemon/larvitar/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Pupitar[] = INCBIN_U32("graphics/pokemon/pupitar/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Tyranitar[] = INCBIN_U32("graphics/pokemon/tyranitar/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Lugia[] = INCBIN_U32("graphics/pokemon/lugia/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_HoOh[] = INCBIN_U32("graphics/pokemon/ho_oh/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Celebi[] = INCBIN_U32("graphics/pokemon/celebi/anim_front.4bpp.lz");
|
||||
|
||||
const u32 gMonFrontPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/anim_front_pics/double_question_mark_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/double_question_mark/anim_front.4bpp.lz");
|
||||
|
||||
const u32 gMonFrontPic_Treecko[] = INCBIN_U32("graphics/pokemon/anim_front_pics/treecko_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Grovyle[] = INCBIN_U32("graphics/pokemon/anim_front_pics/grovyle_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Sceptile[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sceptile_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Torchic[] = INCBIN_U32("graphics/pokemon/anim_front_pics/torchic_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Combusken[] = INCBIN_U32("graphics/pokemon/anim_front_pics/combusken_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Blaziken[] = INCBIN_U32("graphics/pokemon/anim_front_pics/blaziken_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Mudkip[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mudkip_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/anim_front_pics/marshtomp_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Swampert[] = INCBIN_U32("graphics/pokemon/anim_front_pics/swampert_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Poochyena[] = INCBIN_U32("graphics/pokemon/anim_front_pics/poochyena_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Mightyena[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mightyena_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/zigzagoon_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Linoone[] = INCBIN_U32("graphics/pokemon/anim_front_pics/linoone_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Wurmple[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wurmple_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Silcoon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/silcoon_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Beautifly[] = INCBIN_U32("graphics/pokemon/anim_front_pics/beautifly_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Cascoon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cascoon_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Dustox[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dustox_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Lotad[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lotad_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Lombre[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lombre_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ludicolo_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Seedot[] = INCBIN_U32("graphics/pokemon/anim_front_pics/seedot_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nuzleaf_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Shiftry[] = INCBIN_U32("graphics/pokemon/anim_front_pics/shiftry_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Nincada[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nincada_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ninjask[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ninjask_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Shedinja[] = INCBIN_U32("graphics/pokemon/anim_front_pics/shedinja_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Taillow[] = INCBIN_U32("graphics/pokemon/anim_front_pics/taillow_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Swellow[] = INCBIN_U32("graphics/pokemon/anim_front_pics/swellow_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Shroomish[] = INCBIN_U32("graphics/pokemon/anim_front_pics/shroomish_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Breloom[] = INCBIN_U32("graphics/pokemon/anim_front_pics/breloom_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Spinda[] = INCBIN_U32("graphics/pokemon/anim_front_pics/spinda_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Wingull[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wingull_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Pelipper[] = INCBIN_U32("graphics/pokemon/anim_front_pics/pelipper_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Surskit[] = INCBIN_U32("graphics/pokemon/anim_front_pics/surskit_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Masquerain[] = INCBIN_U32("graphics/pokemon/anim_front_pics/masquerain_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Wailmer[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wailmer_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Wailord[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wailord_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Skitty[] = INCBIN_U32("graphics/pokemon/anim_front_pics/skitty_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Delcatty[] = INCBIN_U32("graphics/pokemon/anim_front_pics/delcatty_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Kecleon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kecleon_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Baltoy[] = INCBIN_U32("graphics/pokemon/anim_front_pics/baltoy_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Claydol[] = INCBIN_U32("graphics/pokemon/anim_front_pics/claydol_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Nosepass[] = INCBIN_U32("graphics/pokemon/anim_front_pics/nosepass_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Torkoal[] = INCBIN_U32("graphics/pokemon/anim_front_pics/torkoal_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Sableye[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sableye_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Barboach[] = INCBIN_U32("graphics/pokemon/anim_front_pics/barboach_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Whiscash[] = INCBIN_U32("graphics/pokemon/anim_front_pics/whiscash_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/anim_front_pics/luvdisc_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Corphish[] = INCBIN_U32("graphics/pokemon/anim_front_pics/corphish_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/anim_front_pics/crawdaunt_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Feebas[] = INCBIN_U32("graphics/pokemon/anim_front_pics/feebas_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Milotic[] = INCBIN_U32("graphics/pokemon/anim_front_pics/milotic_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Carvanha[] = INCBIN_U32("graphics/pokemon/anim_front_pics/carvanha_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sharpedo_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Trapinch[] = INCBIN_U32("graphics/pokemon/anim_front_pics/trapinch_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Vibrava[] = INCBIN_U32("graphics/pokemon/anim_front_pics/vibrava_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Flygon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/flygon_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Makuhita[] = INCBIN_U32("graphics/pokemon/anim_front_pics/makuhita_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Hariyama[] = INCBIN_U32("graphics/pokemon/anim_front_pics/hariyama_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Electrike[] = INCBIN_U32("graphics/pokemon/anim_front_pics/electrike_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Manectric[] = INCBIN_U32("graphics/pokemon/anim_front_pics/manectric_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Numel[] = INCBIN_U32("graphics/pokemon/anim_front_pics/numel_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Camerupt[] = INCBIN_U32("graphics/pokemon/anim_front_pics/camerupt_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Spheal[] = INCBIN_U32("graphics/pokemon/anim_front_pics/spheal_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Sealeo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/sealeo_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Walrein[] = INCBIN_U32("graphics/pokemon/anim_front_pics/walrein_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Cacnea[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cacnea_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Cacturne[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cacturne_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Snorunt[] = INCBIN_U32("graphics/pokemon/anim_front_pics/snorunt_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Glalie[] = INCBIN_U32("graphics/pokemon/anim_front_pics/glalie_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Lunatone[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lunatone_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Solrock[] = INCBIN_U32("graphics/pokemon/anim_front_pics/solrock_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Azurill[] = INCBIN_U32("graphics/pokemon/anim_front_pics/azurill_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Spoink[] = INCBIN_U32("graphics/pokemon/anim_front_pics/spoink_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Grumpig[] = INCBIN_U32("graphics/pokemon/anim_front_pics/grumpig_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Plusle[] = INCBIN_U32("graphics/pokemon/anim_front_pics/plusle_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Minun[] = INCBIN_U32("graphics/pokemon/anim_front_pics/minun_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Mawile[] = INCBIN_U32("graphics/pokemon/anim_front_pics/mawile_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Meditite[] = INCBIN_U32("graphics/pokemon/anim_front_pics/meditite_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Medicham[] = INCBIN_U32("graphics/pokemon/anim_front_pics/medicham_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Swablu[] = INCBIN_U32("graphics/pokemon/anim_front_pics/swablu_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Altaria[] = INCBIN_U32("graphics/pokemon/anim_front_pics/altaria_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Wynaut[] = INCBIN_U32("graphics/pokemon/anim_front_pics/wynaut_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Duskull[] = INCBIN_U32("graphics/pokemon/anim_front_pics/duskull_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Dusclops[] = INCBIN_U32("graphics/pokemon/anim_front_pics/dusclops_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Roselia[] = INCBIN_U32("graphics/pokemon/anim_front_pics/roselia_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Slakoth[] = INCBIN_U32("graphics/pokemon/anim_front_pics/slakoth_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/anim_front_pics/vigoroth_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Slaking[] = INCBIN_U32("graphics/pokemon/anim_front_pics/slaking_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Gulpin[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gulpin_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Swalot[] = INCBIN_U32("graphics/pokemon/anim_front_pics/swalot_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Tropius[] = INCBIN_U32("graphics/pokemon/anim_front_pics/tropius_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Whismur[] = INCBIN_U32("graphics/pokemon/anim_front_pics/whismur_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Loudred[] = INCBIN_U32("graphics/pokemon/anim_front_pics/loudred_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Exploud[] = INCBIN_U32("graphics/pokemon/anim_front_pics/exploud_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Clamperl[] = INCBIN_U32("graphics/pokemon/anim_front_pics/clamperl_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Huntail[] = INCBIN_U32("graphics/pokemon/anim_front_pics/huntail_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gorebyss_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Absol[] = INCBIN_U32("graphics/pokemon/anim_front_pics/absol_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Shuppet[] = INCBIN_U32("graphics/pokemon/anim_front_pics/shuppet_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Banette[] = INCBIN_U32("graphics/pokemon/anim_front_pics/banette_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Seviper[] = INCBIN_U32("graphics/pokemon/anim_front_pics/seviper_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Zangoose[] = INCBIN_U32("graphics/pokemon/anim_front_pics/zangoose_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Relicanth[] = INCBIN_U32("graphics/pokemon/anim_front_pics/relicanth_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Aron[] = INCBIN_U32("graphics/pokemon/anim_front_pics/aron_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Lairon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lairon_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Aggron[] = INCBIN_U32("graphics/pokemon/anim_front_pics/aggron_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Castform[] = INCBIN_U32("graphics/pokemon/anim_front_pics/castform_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Volbeat[] = INCBIN_U32("graphics/pokemon/anim_front_pics/volbeat_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Illumise[] = INCBIN_U32("graphics/pokemon/anim_front_pics/illumise_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Lileep[] = INCBIN_U32("graphics/pokemon/anim_front_pics/lileep_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Cradily[] = INCBIN_U32("graphics/pokemon/anim_front_pics/cradily_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Anorith[] = INCBIN_U32("graphics/pokemon/anim_front_pics/anorith_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Armaldo[] = INCBIN_U32("graphics/pokemon/anim_front_pics/armaldo_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ralts[] = INCBIN_U32("graphics/pokemon/anim_front_pics/ralts_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Kirlia[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kirlia_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/anim_front_pics/gardevoir_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Bagon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/bagon_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Shelgon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/shelgon_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Salamence[] = INCBIN_U32("graphics/pokemon/anim_front_pics/salamence_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Beldum[] = INCBIN_U32("graphics/pokemon/anim_front_pics/beldum_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Metang[] = INCBIN_U32("graphics/pokemon/anim_front_pics/metang_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Metagross[] = INCBIN_U32("graphics/pokemon/anim_front_pics/metagross_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Regirock[] = INCBIN_U32("graphics/pokemon/anim_front_pics/regirock_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Regice[] = INCBIN_U32("graphics/pokemon/anim_front_pics/regice_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Registeel[] = INCBIN_U32("graphics/pokemon/anim_front_pics/registeel_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Kyogre[] = INCBIN_U32("graphics/pokemon/anim_front_pics/kyogre_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Groudon[] = INCBIN_U32("graphics/pokemon/anim_front_pics/groudon_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/anim_front_pics/rayquaza_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Latias[] = INCBIN_U32("graphics/pokemon/anim_front_pics/latias_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Latios[] = INCBIN_U32("graphics/pokemon/anim_front_pics/latios_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Jirachi[] = INCBIN_U32("graphics/pokemon/anim_front_pics/jirachi_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Deoxys[] = INCBIN_U32("graphics/pokemon/anim_front_pics/deoxys_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Chimecho[] = INCBIN_U32("graphics/pokemon/anim_front_pics/chimecho_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Treecko[] = INCBIN_U32("graphics/pokemon/treecko/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Grovyle[] = INCBIN_U32("graphics/pokemon/grovyle/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Sceptile[] = INCBIN_U32("graphics/pokemon/sceptile/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Torchic[] = INCBIN_U32("graphics/pokemon/torchic/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Combusken[] = INCBIN_U32("graphics/pokemon/combusken/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Blaziken[] = INCBIN_U32("graphics/pokemon/blaziken/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Mudkip[] = INCBIN_U32("graphics/pokemon/mudkip/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Marshtomp[] = INCBIN_U32("graphics/pokemon/marshtomp/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Swampert[] = INCBIN_U32("graphics/pokemon/swampert/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Poochyena[] = INCBIN_U32("graphics/pokemon/poochyena/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Mightyena[] = INCBIN_U32("graphics/pokemon/mightyena/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Zigzagoon[] = INCBIN_U32("graphics/pokemon/zigzagoon/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Linoone[] = INCBIN_U32("graphics/pokemon/linoone/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Wurmple[] = INCBIN_U32("graphics/pokemon/wurmple/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Silcoon[] = INCBIN_U32("graphics/pokemon/silcoon/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Beautifly[] = INCBIN_U32("graphics/pokemon/beautifly/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Cascoon[] = INCBIN_U32("graphics/pokemon/cascoon/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Dustox[] = INCBIN_U32("graphics/pokemon/dustox/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Lotad[] = INCBIN_U32("graphics/pokemon/lotad/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Lombre[] = INCBIN_U32("graphics/pokemon/lombre/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ludicolo[] = INCBIN_U32("graphics/pokemon/ludicolo/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Seedot[] = INCBIN_U32("graphics/pokemon/seedot/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Nuzleaf[] = INCBIN_U32("graphics/pokemon/nuzleaf/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Shiftry[] = INCBIN_U32("graphics/pokemon/shiftry/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Nincada[] = INCBIN_U32("graphics/pokemon/nincada/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ninjask[] = INCBIN_U32("graphics/pokemon/ninjask/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Shedinja[] = INCBIN_U32("graphics/pokemon/shedinja/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Taillow[] = INCBIN_U32("graphics/pokemon/taillow/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Swellow[] = INCBIN_U32("graphics/pokemon/swellow/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Shroomish[] = INCBIN_U32("graphics/pokemon/shroomish/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Breloom[] = INCBIN_U32("graphics/pokemon/breloom/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Spinda[] = INCBIN_U32("graphics/pokemon/spinda/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Wingull[] = INCBIN_U32("graphics/pokemon/wingull/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Pelipper[] = INCBIN_U32("graphics/pokemon/pelipper/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Surskit[] = INCBIN_U32("graphics/pokemon/surskit/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Masquerain[] = INCBIN_U32("graphics/pokemon/masquerain/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Wailmer[] = INCBIN_U32("graphics/pokemon/wailmer/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Wailord[] = INCBIN_U32("graphics/pokemon/wailord/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Skitty[] = INCBIN_U32("graphics/pokemon/skitty/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Delcatty[] = INCBIN_U32("graphics/pokemon/delcatty/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Kecleon[] = INCBIN_U32("graphics/pokemon/kecleon/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Baltoy[] = INCBIN_U32("graphics/pokemon/baltoy/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Claydol[] = INCBIN_U32("graphics/pokemon/claydol/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Nosepass[] = INCBIN_U32("graphics/pokemon/nosepass/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Torkoal[] = INCBIN_U32("graphics/pokemon/torkoal/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Sableye[] = INCBIN_U32("graphics/pokemon/sableye/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Barboach[] = INCBIN_U32("graphics/pokemon/barboach/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Whiscash[] = INCBIN_U32("graphics/pokemon/whiscash/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Luvdisc[] = INCBIN_U32("graphics/pokemon/luvdisc/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Corphish[] = INCBIN_U32("graphics/pokemon/corphish/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Crawdaunt[] = INCBIN_U32("graphics/pokemon/crawdaunt/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Feebas[] = INCBIN_U32("graphics/pokemon/feebas/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Milotic[] = INCBIN_U32("graphics/pokemon/milotic/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Carvanha[] = INCBIN_U32("graphics/pokemon/carvanha/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Sharpedo[] = INCBIN_U32("graphics/pokemon/sharpedo/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Trapinch[] = INCBIN_U32("graphics/pokemon/trapinch/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Vibrava[] = INCBIN_U32("graphics/pokemon/vibrava/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Flygon[] = INCBIN_U32("graphics/pokemon/flygon/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Makuhita[] = INCBIN_U32("graphics/pokemon/makuhita/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Hariyama[] = INCBIN_U32("graphics/pokemon/hariyama/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Electrike[] = INCBIN_U32("graphics/pokemon/electrike/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Manectric[] = INCBIN_U32("graphics/pokemon/manectric/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Numel[] = INCBIN_U32("graphics/pokemon/numel/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Camerupt[] = INCBIN_U32("graphics/pokemon/camerupt/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Spheal[] = INCBIN_U32("graphics/pokemon/spheal/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Sealeo[] = INCBIN_U32("graphics/pokemon/sealeo/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Walrein[] = INCBIN_U32("graphics/pokemon/walrein/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Cacnea[] = INCBIN_U32("graphics/pokemon/cacnea/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Cacturne[] = INCBIN_U32("graphics/pokemon/cacturne/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Snorunt[] = INCBIN_U32("graphics/pokemon/snorunt/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Glalie[] = INCBIN_U32("graphics/pokemon/glalie/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Lunatone[] = INCBIN_U32("graphics/pokemon/lunatone/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Solrock[] = INCBIN_U32("graphics/pokemon/solrock/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Azurill[] = INCBIN_U32("graphics/pokemon/azurill/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Spoink[] = INCBIN_U32("graphics/pokemon/spoink/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Grumpig[] = INCBIN_U32("graphics/pokemon/grumpig/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Plusle[] = INCBIN_U32("graphics/pokemon/plusle/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Minun[] = INCBIN_U32("graphics/pokemon/minun/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Mawile[] = INCBIN_U32("graphics/pokemon/mawile/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Meditite[] = INCBIN_U32("graphics/pokemon/meditite/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Medicham[] = INCBIN_U32("graphics/pokemon/medicham/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Swablu[] = INCBIN_U32("graphics/pokemon/swablu/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Altaria[] = INCBIN_U32("graphics/pokemon/altaria/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Wynaut[] = INCBIN_U32("graphics/pokemon/wynaut/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Duskull[] = INCBIN_U32("graphics/pokemon/duskull/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Dusclops[] = INCBIN_U32("graphics/pokemon/dusclops/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Roselia[] = INCBIN_U32("graphics/pokemon/roselia/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Slakoth[] = INCBIN_U32("graphics/pokemon/slakoth/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Vigoroth[] = INCBIN_U32("graphics/pokemon/vigoroth/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Slaking[] = INCBIN_U32("graphics/pokemon/slaking/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Gulpin[] = INCBIN_U32("graphics/pokemon/gulpin/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Swalot[] = INCBIN_U32("graphics/pokemon/swalot/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Tropius[] = INCBIN_U32("graphics/pokemon/tropius/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Whismur[] = INCBIN_U32("graphics/pokemon/whismur/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Loudred[] = INCBIN_U32("graphics/pokemon/loudred/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Exploud[] = INCBIN_U32("graphics/pokemon/exploud/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Clamperl[] = INCBIN_U32("graphics/pokemon/clamperl/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Huntail[] = INCBIN_U32("graphics/pokemon/huntail/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Gorebyss[] = INCBIN_U32("graphics/pokemon/gorebyss/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Absol[] = INCBIN_U32("graphics/pokemon/absol/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Shuppet[] = INCBIN_U32("graphics/pokemon/shuppet/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Banette[] = INCBIN_U32("graphics/pokemon/banette/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Seviper[] = INCBIN_U32("graphics/pokemon/seviper/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Zangoose[] = INCBIN_U32("graphics/pokemon/zangoose/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Relicanth[] = INCBIN_U32("graphics/pokemon/relicanth/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Aron[] = INCBIN_U32("graphics/pokemon/aron/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Lairon[] = INCBIN_U32("graphics/pokemon/lairon/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Aggron[] = INCBIN_U32("graphics/pokemon/aggron/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Castform[] = INCBIN_U32("graphics/pokemon/castform/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Volbeat[] = INCBIN_U32("graphics/pokemon/volbeat/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Illumise[] = INCBIN_U32("graphics/pokemon/illumise/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Lileep[] = INCBIN_U32("graphics/pokemon/lileep/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Cradily[] = INCBIN_U32("graphics/pokemon/cradily/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Anorith[] = INCBIN_U32("graphics/pokemon/anorith/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Armaldo[] = INCBIN_U32("graphics/pokemon/armaldo/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Ralts[] = INCBIN_U32("graphics/pokemon/ralts/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Kirlia[] = INCBIN_U32("graphics/pokemon/kirlia/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Gardevoir[] = INCBIN_U32("graphics/pokemon/gardevoir/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Bagon[] = INCBIN_U32("graphics/pokemon/bagon/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Shelgon[] = INCBIN_U32("graphics/pokemon/shelgon/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Salamence[] = INCBIN_U32("graphics/pokemon/salamence/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Beldum[] = INCBIN_U32("graphics/pokemon/beldum/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Metang[] = INCBIN_U32("graphics/pokemon/metang/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Metagross[] = INCBIN_U32("graphics/pokemon/metagross/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Regirock[] = INCBIN_U32("graphics/pokemon/regirock/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Regice[] = INCBIN_U32("graphics/pokemon/regice/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Registeel[] = INCBIN_U32("graphics/pokemon/registeel/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Kyogre[] = INCBIN_U32("graphics/pokemon/kyogre/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Latias[] = INCBIN_U32("graphics/pokemon/latias/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Latios[] = INCBIN_U32("graphics/pokemon/latios/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Chimecho[] = INCBIN_U32("graphics/pokemon/chimecho/anim_front.4bpp.lz");
|
||||
|
||||
const u32 gMonFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/anim_front_pics/egg_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/egg/anim_front.4bpp.lz");
|
||||
|
||||
const u32 gMonFrontPic_UnownB[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_b_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownC[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_c_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownD[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_d_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownE[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_e_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownF[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_f_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownG[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_g_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownH[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_h_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownI[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_i_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownJ[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_j_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownK[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_k_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownL[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_l_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownM[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_m_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownN[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_n_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownO[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_o_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownP[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_p_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownQ[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_q_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownR[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_r_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownS[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_s_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownT[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_t_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownU[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_u_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownV[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_v_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownW[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_w_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownX[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_x_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownY[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_y_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownZ[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_z_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_exclamation_mark_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/anim_front_pics/unown_question_mark_front_pic.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/anim_front_b.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/anim_front_c.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/anim_front_d.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownE[] = INCBIN_U32("graphics/pokemon/unown/anim_front_e.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownF[] = INCBIN_U32("graphics/pokemon/unown/anim_front_f.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownG[] = INCBIN_U32("graphics/pokemon/unown/anim_front_g.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownH[] = INCBIN_U32("graphics/pokemon/unown/anim_front_h.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownI[] = INCBIN_U32("graphics/pokemon/unown/anim_front_i.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownJ[] = INCBIN_U32("graphics/pokemon/unown/anim_front_j.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownK[] = INCBIN_U32("graphics/pokemon/unown/anim_front_k.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownL[] = INCBIN_U32("graphics/pokemon/unown/anim_front_l.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownM[] = INCBIN_U32("graphics/pokemon/unown/anim_front_m.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownN[] = INCBIN_U32("graphics/pokemon/unown/anim_front_n.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownO[] = INCBIN_U32("graphics/pokemon/unown/anim_front_o.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownP[] = INCBIN_U32("graphics/pokemon/unown/anim_front_p.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownQ[] = INCBIN_U32("graphics/pokemon/unown/anim_front_q.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownR[] = INCBIN_U32("graphics/pokemon/unown/anim_front_r.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownS[] = INCBIN_U32("graphics/pokemon/unown/anim_front_s.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownT[] = INCBIN_U32("graphics/pokemon/unown/anim_front_t.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownU[] = INCBIN_U32("graphics/pokemon/unown/anim_front_u.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownV[] = INCBIN_U32("graphics/pokemon/unown/anim_front_v.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownW[] = INCBIN_U32("graphics/pokemon/unown/anim_front_w.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownX[] = INCBIN_U32("graphics/pokemon/unown/anim_front_x.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownY[] = INCBIN_U32("graphics/pokemon/unown/anim_front_y.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownZ[] = INCBIN_U32("graphics/pokemon/unown/anim_front_z.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownExclamationMark[] = INCBIN_U32("graphics/pokemon/unown/anim_front_exclamation_mark.4bpp.lz");
|
||||
const u32 gMonFrontPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/anim_front_question_mark.4bpp.lz");
|
||||
|
||||
+144
-144
@@ -119,8 +119,8 @@ const struct OamData gUnknown_08524904 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -129,8 +129,8 @@ const struct OamData gUnknown_0852490C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -138,8 +138,8 @@ const struct OamData gUnknown_08524914 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -147,8 +147,8 @@ const struct OamData gUnknown_0852491C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 3,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -156,8 +156,8 @@ const struct OamData gUnknown_08524924 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(16x8),
|
||||
.size = SPRITE_SIZE(16x8),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -165,8 +165,8 @@ const struct OamData gUnknown_0852492C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(32x8),
|
||||
.size = SPRITE_SIZE(32x8),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -174,8 +174,8 @@ const struct OamData gUnknown_08524934 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(32x16),
|
||||
.size = SPRITE_SIZE(32x16),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -183,8 +183,8 @@ const struct OamData gUnknown_0852493C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 3,
|
||||
.shape = SPRITE_SHAPE(64x32),
|
||||
.size = SPRITE_SIZE(64x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -192,8 +192,8 @@ const struct OamData gUnknown_08524944 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(8x16),
|
||||
.size = SPRITE_SIZE(8x16),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -201,8 +201,8 @@ const struct OamData gUnknown_0852494C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(8x32),
|
||||
.size = SPRITE_SIZE(8x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -210,8 +210,8 @@ const struct OamData gUnknown_08524954 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(16x32),
|
||||
.size = SPRITE_SIZE(16x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -219,8 +219,8 @@ const struct OamData gUnknown_0852495C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 3,
|
||||
.shape = SPRITE_SHAPE(32x64),
|
||||
.size = SPRITE_SIZE(32x64),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -228,8 +228,8 @@ const struct OamData gUnknown_08524964 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -237,8 +237,8 @@ const struct OamData gUnknown_0852496C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -246,8 +246,8 @@ const struct OamData gUnknown_08524974 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -255,8 +255,8 @@ const struct OamData gUnknown_0852497C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 3,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -264,8 +264,8 @@ const struct OamData gUnknown_08524984 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(16x8),
|
||||
.size = SPRITE_SIZE(16x8),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -273,8 +273,8 @@ const struct OamData gUnknown_0852498C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(32x8),
|
||||
.size = SPRITE_SIZE(32x8),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -282,8 +282,8 @@ const struct OamData gUnknown_08524994 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(32x16),
|
||||
.size = SPRITE_SIZE(32x16),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -291,8 +291,8 @@ const struct OamData gUnknown_0852499C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 3,
|
||||
.shape = SPRITE_SHAPE(64x32),
|
||||
.size = SPRITE_SIZE(64x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -300,8 +300,8 @@ const struct OamData gUnknown_085249A4 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(8x16),
|
||||
.size = SPRITE_SIZE(8x16),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -309,8 +309,8 @@ const struct OamData gUnknown_085249AC =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(8x32),
|
||||
.size = SPRITE_SIZE(8x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -318,8 +318,8 @@ const struct OamData gUnknown_085249B4 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(16x32),
|
||||
.size = SPRITE_SIZE(16x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -327,8 +327,8 @@ const struct OamData gUnknown_085249BC =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 3,
|
||||
.shape = SPRITE_SHAPE(32x64),
|
||||
.size = SPRITE_SIZE(32x64),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -336,8 +336,8 @@ const struct OamData gUnknown_085249C4 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -345,8 +345,8 @@ const struct OamData gUnknown_085249CC =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -354,8 +354,8 @@ const struct OamData gUnknown_085249D4 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -363,8 +363,8 @@ const struct OamData gUnknown_085249DC =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 3,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -372,8 +372,8 @@ const struct OamData gUnknown_085249E4 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(16x8),
|
||||
.size = SPRITE_SIZE(16x8),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -381,8 +381,8 @@ const struct OamData gUnknown_085249EC =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(32x8),
|
||||
.size = SPRITE_SIZE(32x8),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -390,8 +390,8 @@ const struct OamData gUnknown_085249F4 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(32x16),
|
||||
.size = SPRITE_SIZE(32x16),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -399,8 +399,8 @@ const struct OamData gUnknown_085249FC =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 3,
|
||||
.shape = SPRITE_SHAPE(64x32),
|
||||
.size = SPRITE_SIZE(64x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -408,8 +408,8 @@ const struct OamData gUnknown_08524A04 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(8x16),
|
||||
.size = SPRITE_SIZE(8x16),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -417,8 +417,8 @@ const struct OamData gUnknown_08524A0C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(8x32),
|
||||
.size = SPRITE_SIZE(8x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -426,8 +426,8 @@ const struct OamData gUnknown_08524A14 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(16x32),
|
||||
.size = SPRITE_SIZE(16x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -435,8 +435,8 @@ const struct OamData gUnknown_08524A1C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 3,
|
||||
.shape = SPRITE_SHAPE(32x64),
|
||||
.size = SPRITE_SIZE(32x64),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -444,8 +444,8 @@ const struct OamData gUnknown_08524A24 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -453,8 +453,8 @@ const struct OamData gUnknown_08524A2C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -462,8 +462,8 @@ const struct OamData gUnknown_08524A34 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -471,8 +471,8 @@ const struct OamData gUnknown_08524A3C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 3,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -480,8 +480,8 @@ const struct OamData gUnknown_08524A44 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(16x8),
|
||||
.size = SPRITE_SIZE(16x8),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -489,8 +489,8 @@ const struct OamData gUnknown_08524A4C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(32x8),
|
||||
.size = SPRITE_SIZE(32x8),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -498,8 +498,8 @@ const struct OamData gUnknown_08524A54 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(32x16),
|
||||
.size = SPRITE_SIZE(32x16),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -507,8 +507,8 @@ const struct OamData gUnknown_08524A5C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 3,
|
||||
.shape = SPRITE_SHAPE(64x32),
|
||||
.size = SPRITE_SIZE(64x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -516,8 +516,8 @@ const struct OamData gUnknown_08524A64 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(8x16),
|
||||
.size = SPRITE_SIZE(8x16),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -525,8 +525,8 @@ const struct OamData gUnknown_08524A6C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(8x32),
|
||||
.size = SPRITE_SIZE(8x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -534,8 +534,8 @@ const struct OamData gUnknown_08524A74 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(16x32),
|
||||
.size = SPRITE_SIZE(16x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -543,8 +543,8 @@ const struct OamData gUnknown_08524A7C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 3,
|
||||
.shape = SPRITE_SHAPE(32x64),
|
||||
.size = SPRITE_SIZE(32x64),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -552,8 +552,8 @@ const struct OamData gUnknown_08524A84 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -561,8 +561,8 @@ const struct OamData gUnknown_08524A8C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -570,8 +570,8 @@ const struct OamData gUnknown_08524A94 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -579,8 +579,8 @@ const struct OamData gUnknown_08524A9C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 3,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -588,8 +588,8 @@ const struct OamData gUnknown_08524AA4 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(16x8),
|
||||
.size = SPRITE_SIZE(16x8),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -597,8 +597,8 @@ const struct OamData gUnknown_08524AAC =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(32x8),
|
||||
.size = SPRITE_SIZE(32x8),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -606,8 +606,8 @@ const struct OamData gUnknown_08524AB4 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(32x16),
|
||||
.size = SPRITE_SIZE(32x16),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -615,8 +615,8 @@ const struct OamData gUnknown_08524ABC =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 3,
|
||||
.shape = SPRITE_SHAPE(64x32),
|
||||
.size = SPRITE_SIZE(64x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -624,8 +624,8 @@ const struct OamData gUnknown_08524AC4 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(8x16),
|
||||
.size = SPRITE_SIZE(8x16),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -633,8 +633,8 @@ const struct OamData gUnknown_08524ACC =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(8x32),
|
||||
.size = SPRITE_SIZE(8x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -642,8 +642,8 @@ const struct OamData gUnknown_08524AD4 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(16x32),
|
||||
.size = SPRITE_SIZE(16x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -651,8 +651,8 @@ const struct OamData gUnknown_08524ADC =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 3,
|
||||
.shape = SPRITE_SHAPE(32x64),
|
||||
.size = SPRITE_SIZE(32x64),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -660,8 +660,8 @@ const struct OamData gUnknown_08524AE4 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -669,8 +669,8 @@ const struct OamData gUnknown_08524AEC =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -678,8 +678,8 @@ const struct OamData gUnknown_08524AF4 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -687,8 +687,8 @@ const struct OamData gUnknown_08524AFC =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 3,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -696,8 +696,8 @@ const struct OamData gUnknown_08524B04 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(16x8),
|
||||
.size = SPRITE_SIZE(16x8),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -705,8 +705,8 @@ const struct OamData gUnknown_08524B0C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(32x8),
|
||||
.size = SPRITE_SIZE(32x8),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -714,8 +714,8 @@ const struct OamData gUnknown_08524B14 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(32x16),
|
||||
.size = SPRITE_SIZE(32x16),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -723,8 +723,8 @@ const struct OamData gUnknown_08524B1C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 3,
|
||||
.shape = SPRITE_SHAPE(64x32),
|
||||
.size = SPRITE_SIZE(64x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -732,8 +732,8 @@ const struct OamData gUnknown_08524B24 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(8x16),
|
||||
.size = SPRITE_SIZE(8x16),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -741,8 +741,8 @@ const struct OamData gUnknown_08524B2C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(8x32),
|
||||
.size = SPRITE_SIZE(8x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -750,8 +750,8 @@ const struct OamData gUnknown_08524B34 =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(16x32),
|
||||
.size = SPRITE_SIZE(16x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -759,8 +759,8 @@ const struct OamData gUnknown_08524B3C =
|
||||
{
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.objMode = ST_OAM_OBJ_BLEND,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 3,
|
||||
.shape = SPRITE_SHAPE(32x64),
|
||||
.size = SPRITE_SIZE(32x64),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
|
||||
@@ -16,9 +16,6 @@
|
||||
#include "constants/rgb.h"
|
||||
#include "constants/songs.h"
|
||||
|
||||
extern void sub_8108C94(struct Sprite *);
|
||||
extern void sub_810310C(u8, struct Sprite *);
|
||||
|
||||
void sub_8103448(struct Sprite *);
|
||||
void sub_8103498(struct Sprite *);
|
||||
void sub_810358C(struct Sprite *);
|
||||
|
||||
@@ -24,9 +24,6 @@
|
||||
#include "constants/species.h"
|
||||
#include "constants/weather.h"
|
||||
|
||||
extern u8 sub_807521C(s16 x, s16 y, u8 a3);
|
||||
extern void sub_810E2C8(struct Sprite *);
|
||||
|
||||
extern const struct SpriteTemplate gUnknown_08593114;
|
||||
extern const union AffineAnimCmd *const gUnknown_082FF6C0[];
|
||||
extern const union AffineAnimCmd *const gUnknown_082FF694[];
|
||||
|
||||
+2
-2
@@ -406,10 +406,10 @@ static const struct OamData sJudgementIconOamData =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 1,
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 15,
|
||||
|
||||
+4
-4
@@ -42,10 +42,10 @@ static const struct OamData gUnknown_0831A988 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -59,10 +59,10 @@ static const struct OamData gUnknown_0831A990 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 64,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
|
||||
@@ -27,13 +27,12 @@
|
||||
#include "constants/battle_anim.h"
|
||||
#include "constants/songs.h"
|
||||
#include "constants/trainers.h"
|
||||
#include "recorded_battle.h"
|
||||
|
||||
extern struct MusicPlayerInfo gMPlayInfo_BGM;
|
||||
|
||||
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
|
||||
|
||||
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
|
||||
|
||||
// this file's functions
|
||||
static void LinkOpponentHandleGetMonData(void);
|
||||
static void LinkOpponentHandleGetRawMonData(void);
|
||||
|
||||
@@ -27,12 +27,11 @@
|
||||
#include "constants/battle_anim.h"
|
||||
#include "constants/songs.h"
|
||||
#include "constants/trainers.h"
|
||||
#include "recorded_battle.h"
|
||||
|
||||
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
|
||||
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
|
||||
|
||||
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
|
||||
|
||||
// this file's functions
|
||||
static void LinkPartnerHandleGetMonData(void);
|
||||
static void LinkPartnerHandleGetRawMonData(void);
|
||||
|
||||
@@ -32,14 +32,12 @@
|
||||
#include "constants/moves.h"
|
||||
#include "constants/songs.h"
|
||||
#include "constants/trainers.h"
|
||||
#include "trainer_hill.h"
|
||||
|
||||
extern struct MusicPlayerInfo gMPlayInfo_BGM;
|
||||
|
||||
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
|
||||
|
||||
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
|
||||
extern u8 GetTrainerHillTrainerFrontSpriteId(u16 trainerId);
|
||||
|
||||
// this file's functions
|
||||
static void OpponentHandleGetMonData(void);
|
||||
static void OpponentHandleGetRawMonData(void);
|
||||
|
||||
@@ -39,10 +39,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
|
||||
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
|
||||
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
|
||||
|
||||
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
|
||||
extern void sub_81AABB0(void);
|
||||
extern void sub_81851A8(u8 *);
|
||||
|
||||
// this file's functions
|
||||
static void PlayerHandleGetMonData(void);
|
||||
static void PlayerHandleSetMonData(void);
|
||||
|
||||
@@ -30,9 +30,6 @@
|
||||
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
|
||||
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
|
||||
|
||||
extern void sub_81358F4(void);
|
||||
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
|
||||
|
||||
// this file's functions
|
||||
static void PlayerPartnerHandleGetMonData(void);
|
||||
static void PlayerPartnerHandleGetRawMonData(void);
|
||||
|
||||
@@ -33,8 +33,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
|
||||
|
||||
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
|
||||
|
||||
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
|
||||
|
||||
// this file's functions
|
||||
static void RecordedOpponentHandleGetMonData(void);
|
||||
static void RecordedOpponentHandleGetRawMonData(void);
|
||||
|
||||
@@ -30,8 +30,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
|
||||
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
|
||||
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
|
||||
|
||||
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
|
||||
|
||||
// this file's functions
|
||||
static void RecordedPlayerHandleGetMonData(void);
|
||||
static void RecordedPlayerHandleGetRawMonData(void);
|
||||
|
||||
@@ -25,8 +25,6 @@
|
||||
|
||||
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
|
||||
|
||||
extern void sub_81358F4(void);
|
||||
|
||||
// this file's functions
|
||||
static void SafariHandleGetMonData(void);
|
||||
static void SafariHandleGetRawMonData(void);
|
||||
|
||||
@@ -33,8 +33,6 @@
|
||||
|
||||
extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
|
||||
|
||||
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
|
||||
|
||||
// this file's functions
|
||||
static void WallyHandleGetMonData(void);
|
||||
static void WallyHandleGetRawMonData(void);
|
||||
|
||||
+8
-8
@@ -872,10 +872,10 @@ static const struct OamData gUnknown_0860CF70 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 1,
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -889,10 +889,10 @@ static const struct OamData gUnknown_0860CF78 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 1,
|
||||
.shape = SPRITE_SHAPE(32x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(32x16),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 1,
|
||||
@@ -906,10 +906,10 @@ static const struct OamData gUnknown_0860CF80 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 1,
|
||||
.shape = SPRITE_SHAPE(16x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 0,
|
||||
.size = SPRITE_SIZE(16x8),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 2,
|
||||
@@ -923,10 +923,10 @@ static const struct OamData gUnknown_0860CF88 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 2,
|
||||
.shape = SPRITE_SHAPE(8x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 0,
|
||||
.size = SPRITE_SIZE(8x16),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 2,
|
||||
|
||||
@@ -385,10 +385,10 @@ static const struct OamData gUnknown_0861047C =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.tileNum = 0,
|
||||
.priority = 3,
|
||||
.paletteNum = 0,
|
||||
@@ -402,10 +402,10 @@ static const struct OamData gUnknown_08610484 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 1,
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.tileNum = 0,
|
||||
.priority = 3,
|
||||
.paletteNum = 0,
|
||||
@@ -419,10 +419,10 @@ static const struct OamData gUnknown_0861048C =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 1,
|
||||
.shape = SPRITE_SHAPE(32x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(32x16),
|
||||
.tileNum = 0,
|
||||
.priority = 2,
|
||||
.paletteNum = 0,
|
||||
@@ -436,10 +436,10 @@ static const struct OamData gUnknown_08610494 =
|
||||
.objMode = 1,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
|
||||
@@ -207,10 +207,10 @@ static const struct OamData sUnknown_0832C138 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 1,
|
||||
.shape = SPRITE_SHAPE(64x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x32),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
@@ -279,10 +279,10 @@ static const struct OamData sOamData_Healthbar =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 1,
|
||||
.shape = SPRITE_SHAPE(32x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 1,
|
||||
.size = SPRITE_SIZE(32x8),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
@@ -446,10 +446,10 @@ static const struct OamData sUnknown_0832C354 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 1,
|
||||
.shape = SPRITE_SHAPE(64x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x32),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
@@ -463,10 +463,10 @@ static const struct OamData sOamData_StatusSummaryBalls =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 0,
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
|
||||
+5
-7
@@ -57,6 +57,7 @@
|
||||
#include "constants/songs.h"
|
||||
#include "constants/species.h"
|
||||
#include "constants/trainers.h"
|
||||
#include "cable_club.h"
|
||||
|
||||
extern struct MusicPlayerInfo gMPlayInfo_SE1;
|
||||
extern struct MusicPlayerInfo gMPlayInfo_SE2;
|
||||
@@ -69,9 +70,6 @@ extern const u8 *const gBattlescriptsForRunningByItem[];
|
||||
extern const u8 *const gBattlescriptsForUsingItem[];
|
||||
extern const u8 *const gBattlescriptsForSafariActions[];
|
||||
|
||||
// functions
|
||||
extern void sub_80B3AF8(u8 taskId); // cable club
|
||||
|
||||
// this file's functions
|
||||
static void CB2_InitBattleInternal(void);
|
||||
static void CB2_PreInitMultiBattle(void);
|
||||
@@ -298,10 +296,10 @@ const struct OamData gOamData_831ACA8 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 2,
|
||||
.paletteNum = 0,
|
||||
@@ -315,10 +313,10 @@ const struct OamData gOamData_831ACB0 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 2,
|
||||
.paletteNum = 2,
|
||||
|
||||
@@ -282,10 +282,10 @@ static const struct OamData gOamData_861F378 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
|
||||
@@ -21,8 +21,7 @@
|
||||
#include "alloc.h"
|
||||
#include "gpu_regs.h"
|
||||
#include "constants/game_stat.h"
|
||||
|
||||
extern void PrintOnTrainerHillRecordsWindow(void); // pokenav.s
|
||||
#include "trainer_hill.h"
|
||||
|
||||
// this file's functions
|
||||
static void Task_CloseTrainerHillRecordsOnButton(u8 taskId);
|
||||
|
||||
@@ -48,17 +48,13 @@
|
||||
#include "battle_pyramid.h"
|
||||
#include "field_specials.h"
|
||||
#include "pokemon_summary_screen.h"
|
||||
#include "pokenav.h"
|
||||
#include "menu_specialized.h"
|
||||
|
||||
extern struct MusicPlayerInfo gMPlayInfo_BGM;
|
||||
|
||||
extern const u8* const gBattleScriptsForMoveEffects[];
|
||||
|
||||
// functions
|
||||
extern void GetMonLevelUpWindowStats(struct Pokemon* mon, void* statStoreLocation); // pokenav.s
|
||||
extern void DrawLevelUpWindowPg1(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); // pokenav.s
|
||||
extern void DrawLevelUpWindowPg2(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); // pokenav.s
|
||||
extern u8 sub_813B21C(void);
|
||||
|
||||
#define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattlerTarget].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED))
|
||||
|
||||
// this file's functions
|
||||
@@ -735,10 +731,10 @@ static const struct OamData sOamData_MonIconOnLvlUpBox =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
|
||||
+1
-4
@@ -44,6 +44,7 @@
|
||||
#include "mirage_tower.h"
|
||||
#include "constants/map_types.h"
|
||||
#include "constants/battle_frontier.h"
|
||||
#include "field_screen_effect.h"
|
||||
|
||||
enum
|
||||
{
|
||||
@@ -62,10 +63,6 @@ struct TrainerBattleParameter
|
||||
u8 ptrType;
|
||||
};
|
||||
|
||||
extern void ClearPoisonStepCounter(void);
|
||||
extern void sub_808BCF4(void);
|
||||
extern void sub_80AF6F0(void);
|
||||
|
||||
// this file's functions
|
||||
static void DoBattlePikeWildBattle(void);
|
||||
static void DoSafariBattle(void);
|
||||
|
||||
+1
-1
@@ -269,7 +269,7 @@ static void sub_81B9E88(void)
|
||||
DoBattleFactorySwapScreen();
|
||||
}
|
||||
|
||||
bool8 sub_81B9E94(void)
|
||||
bool8 InSlateportBattleTent(void)
|
||||
{
|
||||
return gMapHeader.regionMapSectionId == MAPSEC_SLATEPORT_CITY
|
||||
&& (gMapHeader.mapLayoutId == LAYOUT_BATTLE_TENT_CORRIDOR || gMapHeader.mapLayoutId == LAYOUT_BATTLE_TENT_BATTLE_ROOM);
|
||||
|
||||
@@ -763,10 +763,10 @@ static const struct OamData gOamData_85C8E80 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
|
||||
+2
-4
@@ -11,11 +11,9 @@
|
||||
#include "text.h"
|
||||
#include "constants/event_object_movement_constants.h"
|
||||
#include "constants/items.h"
|
||||
#include "event_object_movement.h"
|
||||
|
||||
|
||||
extern u8 EventObjectGetBerryTreeId(u8 eventObjectId);
|
||||
extern void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup);
|
||||
extern void CB2_ChooseBerry(void);
|
||||
extern bool8 IsBerryTreeSparkling(u8, u8, u8);
|
||||
|
||||
extern const u8 BerryTreeScript[];
|
||||
|
||||
|
||||
+10
-13
@@ -142,9 +142,6 @@ extern const u8 gText_Space[];
|
||||
extern const u8 gText_BlenderMaxSpeedRecord[];
|
||||
extern const u8 gText_234Players[];
|
||||
|
||||
extern void sub_81AABF0(void (*callback)(void));
|
||||
extern void sub_800B4C0(void);
|
||||
|
||||
// this file's functions
|
||||
static void BerryBlender_SetBackgroundsPos(void);
|
||||
static void sub_8080EA4(u8 taskId);
|
||||
@@ -407,10 +404,10 @@ static const struct OamData sOamData_8216314 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
@@ -550,10 +547,10 @@ static const struct OamData sOamData_821640C =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 1,
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -619,10 +616,10 @@ static const struct OamData sOamData_8216474 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 0,
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
@@ -706,10 +703,10 @@ static const struct OamData sOamData_8216514 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
@@ -764,10 +761,10 @@ static const struct OamData sOamData_8216560 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 1,
|
||||
.shape = SPRITE_SHAPE(64x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x32),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
|
||||
@@ -14,12 +14,6 @@
|
||||
extern bool8 gBikeCyclingChallenge;
|
||||
extern u8 gBikeCollisions;
|
||||
|
||||
extern u8 sub_808B980(u8 direction);
|
||||
extern u8 sub_808B9BC(u8 direction);
|
||||
extern u8 sub_808B9A4(u8 direction);
|
||||
extern u8 sub_808C1B4(u8 direction);
|
||||
extern u8 sub_808B9D4(u8 direction);
|
||||
|
||||
// this file's functions
|
||||
static void MovePlayerOnMachBike(u8, u16, u16);
|
||||
static u8 GetMachBikeTransition(u8 *);
|
||||
|
||||
+6
-3
@@ -153,19 +153,22 @@ const struct SpritePalette gUnknown_085CDB74[] = {
|
||||
|
||||
const struct OamData gOamData_85CDB84 = {
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.size = 3,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.priority = 2
|
||||
};
|
||||
|
||||
const struct OamData gOamData_85CDB8C = {
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.shape = SPRITE_SHAPE(16x8),
|
||||
.size = SPRITE_SIZE(16x8),
|
||||
.priority = 2
|
||||
};
|
||||
|
||||
const struct OamData gOamData_85CDB94 = {
|
||||
.affineMode = ST_OAM_AFFINE_DOUBLE,
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.priority = 2
|
||||
};
|
||||
|
||||
|
||||
@@ -45,8 +45,6 @@
|
||||
#include "constants/rgb.h"
|
||||
#include "contest_ai.h"
|
||||
|
||||
extern void sub_80FC9F8(u8); // contest_link_80FC4F4.c
|
||||
|
||||
// This file's functions.
|
||||
static void sub_80D782C(void);
|
||||
static void sub_80D7C7C(u8 taskId);
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
#include "constants/rgb.h"
|
||||
#include "constants/songs.h"
|
||||
#include "constants/vars.h"
|
||||
#include "contest.h"
|
||||
|
||||
struct ContestLinkUnk0
|
||||
{
|
||||
@@ -99,8 +100,6 @@ extern const struct SpriteSheet gUnknown_0858D810[];
|
||||
extern const struct SpritePalette gUnknown_0858D850;
|
||||
extern const struct SpriteTemplate gSpriteTemplate_858D860;
|
||||
|
||||
extern void sub_81D9DE4(u8);
|
||||
|
||||
static void sub_80F6A9C(void);
|
||||
static void sub_80F71C8(void);
|
||||
u8 sub_80F7310(u8, u8);
|
||||
|
||||
@@ -154,10 +154,10 @@ const struct OamData gUnknown_085B0830 =
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.mosaic = 1,
|
||||
.bpp = ST_OAM_8BPP,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
|
||||
+646
-55
@@ -3,6 +3,13 @@
|
||||
#include "contest_painting.h"
|
||||
#include "constants/rgb.h"
|
||||
|
||||
struct Unk8125954
|
||||
{
|
||||
u8 unk0;
|
||||
u8 unk1;
|
||||
u16 unk2;
|
||||
};
|
||||
|
||||
// IWRAM common
|
||||
u8 gUnknown_03006164;
|
||||
u16 (*gUnknown_03006168)[][32];
|
||||
@@ -12,32 +19,46 @@ u8 gUnknown_03006174;
|
||||
u8 gUnknown_03006178;
|
||||
u8 gUnknown_0300617C;
|
||||
u8 gUnknown_03006180;
|
||||
u16 gUnknown_03006184;
|
||||
u16 *gUnknown_03006184;
|
||||
u16 gUnknown_03006188;
|
||||
|
||||
// this file's functions
|
||||
void sub_8125230(void);
|
||||
void sub_81252E8(void);
|
||||
void sub_81254E0(void);
|
||||
void sub_8125630(void);
|
||||
void sub_8125448(void);
|
||||
void sub_81257F8(void);
|
||||
void sub_81258A0(void);
|
||||
void sub_81256C8(void);
|
||||
void sub_8125250(void);
|
||||
void sub_81253A4(u8);
|
||||
void sub_81250B8(u8);
|
||||
void sub_8125170(u8);
|
||||
void sub_8125954(u16);
|
||||
u16 ConvertColorToGrayscale(u16*);
|
||||
u16 sub_8125E18(u16*, u16*, u16*);
|
||||
u16 ConvertCoolColor(u16*, u8);
|
||||
u16 ConvertToBlackOrWhite(u16*);
|
||||
u16 sub_8125C98(u16*, u16*);
|
||||
u16 InvertColor(u16*);
|
||||
u16 sub_8125F38(u16*, u16*, u16*);
|
||||
u16 sub_8125CF4(u16*, u16*);
|
||||
u16 GetCoolColorFromPersonality(u8);
|
||||
static void sub_8125230(void);
|
||||
static void sub_81252E8(void);
|
||||
static void sub_81254E0(void);
|
||||
static void sub_8125630(void);
|
||||
static void sub_8125448(void);
|
||||
static void sub_81257F8(void);
|
||||
static void sub_81258A0(void);
|
||||
static void sub_81256C8(void);
|
||||
static void sub_8125250(void);
|
||||
static void sub_81253A4(u8);
|
||||
static void sub_81250B8(u8);
|
||||
static void sub_8125170(u8);
|
||||
static void sub_8125954(u16);
|
||||
static u16 ConvertColorToGrayscale(u16*);
|
||||
static u16 sub_8125E18(u16*, u16*, u16*);
|
||||
static u16 ConvertCoolColor(u16*, u8);
|
||||
static u16 ConvertToBlackOrWhite(u16*);
|
||||
static u16 sub_8125C98(u16*, u16*);
|
||||
static u16 InvertColor(u16*);
|
||||
static u16 sub_8125F38(u16*, u16*, u16*);
|
||||
static u16 sub_8125CF4(u16*, u16*);
|
||||
static u16 GetCoolColorFromPersonality(u8);
|
||||
static void sub_81263A4(bool8);
|
||||
static void sub_8126270(void);
|
||||
static void sub_8126714(void);
|
||||
static void sub_8126370(void);
|
||||
static void sub_8126664(void);
|
||||
static void sub_8126334(void);
|
||||
static void sub_81265B4(void);
|
||||
static void sub_8126318(void);
|
||||
static void sub_81264FC(void);
|
||||
static u16 sub_81267C4(u16*);
|
||||
static u16 sub_8126908(u16*);
|
||||
static u16 sub_812693C(u16*);
|
||||
static u16 sub_8126838(u16*);
|
||||
|
||||
extern const u8 gUnknown_085A1F94[][3];
|
||||
|
||||
void sub_8124F2C(struct Unk030061A0 *info)
|
||||
{
|
||||
@@ -104,7 +125,7 @@ void sub_8124F2C(struct Unk030061A0 *info)
|
||||
}
|
||||
}
|
||||
|
||||
void sub_81250B8(u8 a0) // it changes palette someway somehow... .__.
|
||||
static void sub_81250B8(u8 a0) // it changes palette someway somehow... .__.
|
||||
{
|
||||
u8 i, j;
|
||||
|
||||
@@ -127,7 +148,7 @@ void sub_81250B8(u8 a0) // it changes palette someway somehow... .__.
|
||||
}
|
||||
}
|
||||
|
||||
void sub_8125170(u8 a0)
|
||||
static void sub_8125170(u8 a0)
|
||||
{
|
||||
u8 i, j;
|
||||
|
||||
@@ -149,14 +170,14 @@ void sub_8125170(u8 a0)
|
||||
}
|
||||
}
|
||||
|
||||
void sub_8125230(void)
|
||||
static void sub_8125230(void)
|
||||
{
|
||||
u32 i;
|
||||
for (i = 0; i < 3200; i++)
|
||||
sub_8125954(i);
|
||||
}
|
||||
|
||||
void sub_8125250(void)
|
||||
static void sub_8125250(void)
|
||||
{
|
||||
u8 i, j;
|
||||
|
||||
@@ -174,7 +195,7 @@ void sub_8125250(void)
|
||||
}
|
||||
}
|
||||
|
||||
void sub_81252E8(void)
|
||||
static void sub_81252E8(void)
|
||||
{
|
||||
u8 i, j;
|
||||
|
||||
@@ -200,7 +221,7 @@ void sub_81252E8(void)
|
||||
}
|
||||
}
|
||||
|
||||
void sub_81253A4(u8 arg0)
|
||||
static void sub_81253A4(u8 arg0)
|
||||
{
|
||||
u8 i, j;
|
||||
|
||||
@@ -218,7 +239,7 @@ void sub_81253A4(u8 arg0)
|
||||
}
|
||||
}
|
||||
|
||||
void sub_8125448(void)
|
||||
static void sub_8125448(void)
|
||||
{
|
||||
u8 i, j;
|
||||
|
||||
@@ -236,7 +257,7 @@ void sub_8125448(void)
|
||||
}
|
||||
}
|
||||
|
||||
void sub_81254E0(void)
|
||||
static void sub_81254E0(void)
|
||||
{
|
||||
u8 i, j;
|
||||
u16 *palette;
|
||||
@@ -270,7 +291,7 @@ void sub_81254E0(void)
|
||||
}
|
||||
}
|
||||
|
||||
void sub_8125630(void)
|
||||
static void sub_8125630(void)
|
||||
{
|
||||
u8 i, j;
|
||||
|
||||
@@ -288,7 +309,7 @@ void sub_8125630(void)
|
||||
}
|
||||
}
|
||||
|
||||
void sub_81256C8(void)
|
||||
static void sub_81256C8(void)
|
||||
{
|
||||
u8 i, j;
|
||||
u16 *palette;
|
||||
@@ -349,7 +370,7 @@ void sub_81256C8(void)
|
||||
}
|
||||
}
|
||||
|
||||
void sub_81257F8(void)
|
||||
static void sub_81257F8(void)
|
||||
{
|
||||
u8 i, j;
|
||||
|
||||
@@ -369,7 +390,7 @@ void sub_81257F8(void)
|
||||
}
|
||||
}
|
||||
|
||||
void sub_81258A0(void)
|
||||
static void sub_81258A0(void)
|
||||
{
|
||||
u8 i, j;
|
||||
|
||||
@@ -389,16 +410,7 @@ void sub_81258A0(void)
|
||||
}
|
||||
}
|
||||
|
||||
struct Unk8125954
|
||||
{
|
||||
u8 unk0;
|
||||
u8 unk1;
|
||||
u16 unk2;
|
||||
};
|
||||
|
||||
extern const u8 gUnknown_085A1F94[][3];
|
||||
|
||||
void sub_8125954(u16 arg0)
|
||||
static void sub_8125954(u16 arg0)
|
||||
{
|
||||
u8 i;
|
||||
u8 r5, r9;
|
||||
@@ -487,7 +499,7 @@ void sub_8125954(u16 arg0)
|
||||
}
|
||||
}
|
||||
|
||||
u16 ConvertColorToGrayscale(u16 *color)
|
||||
static u16 ConvertColorToGrayscale(u16 *color)
|
||||
{
|
||||
s32 clr = *color;
|
||||
s32 r = clr & 0x1F;
|
||||
@@ -499,7 +511,7 @@ u16 ConvertColorToGrayscale(u16 *color)
|
||||
|
||||
// The dark colors are the colored edges of the Cool painting effect.
|
||||
// Everything else is white.
|
||||
u16 ConvertCoolColor(u16 *color, u8 personality)
|
||||
static u16 ConvertCoolColor(u16 *color, u8 personality)
|
||||
{
|
||||
u16 red = *color & 0x1F;
|
||||
u16 green = (*color >> 5) & 0x1F;
|
||||
@@ -513,7 +525,7 @@ u16 ConvertCoolColor(u16 *color, u8 personality)
|
||||
|
||||
// Based on the given value, which comes from the first 8 bits of
|
||||
// the mon's personality value, return a color.
|
||||
u16 GetCoolColorFromPersonality(u8 personality)
|
||||
static u16 GetCoolColorFromPersonality(u8 personality)
|
||||
{
|
||||
u16 red = 0;
|
||||
u16 green = 0;
|
||||
@@ -564,7 +576,7 @@ u16 GetCoolColorFromPersonality(u8 personality)
|
||||
return RGB2(red, green, blue);
|
||||
}
|
||||
|
||||
u16 ConvertToBlackOrWhite(u16 *color)
|
||||
static u16 ConvertToBlackOrWhite(u16 *color)
|
||||
{
|
||||
u16 red = *color & 0x1F;
|
||||
u16 green = (*color >> 5) & 0x1F;
|
||||
@@ -576,7 +588,7 @@ u16 ConvertToBlackOrWhite(u16 *color)
|
||||
return RGB_WHITE;
|
||||
}
|
||||
|
||||
u16 sub_8125C98(u16 *colorA, u16 *colorB)
|
||||
static u16 sub_8125C98(u16 *colorA, u16 *colorB)
|
||||
{
|
||||
if (*colorA)
|
||||
{
|
||||
@@ -591,7 +603,7 @@ u16 sub_8125C98(u16 *colorA, u16 *colorB)
|
||||
return RGB_BLACK;
|
||||
}
|
||||
|
||||
u16 InvertColor(u16 *color)
|
||||
static u16 InvertColor(u16 *color)
|
||||
{
|
||||
u16 red = *color & 0x1F;
|
||||
u16 green = (*color >> 5) & 0x1F;
|
||||
@@ -604,7 +616,7 @@ u16 InvertColor(u16 *color)
|
||||
return RGB2(red, green, blue);
|
||||
}
|
||||
|
||||
u16 sub_8125CF4(u16 *a0, u16 *a1)
|
||||
static u16 sub_8125CF4(u16 *a0, u16 *a1)
|
||||
{
|
||||
u16 sp0[2][3];
|
||||
u16 spC[3];
|
||||
@@ -660,7 +672,7 @@ u16 sub_8125CF4(u16 *a0, u16 *a1)
|
||||
return RGB2(r, g, b);
|
||||
}
|
||||
|
||||
u16 sub_8125E18(u16 * a0, u16 * a1, u16 * a2)
|
||||
static u16 sub_8125E18(u16 * a0, u16 * a1, u16 * a2)
|
||||
{
|
||||
u16 red, green, blue;
|
||||
u16 avg0, avg1, avg2;
|
||||
@@ -704,7 +716,7 @@ u16 sub_8125E18(u16 * a0, u16 * a1, u16 * a2)
|
||||
return RGB2(red, green, blue);
|
||||
}
|
||||
|
||||
u16 sub_8125F38(u16 *a0, u16 *a1, u16 *a2)
|
||||
static u16 sub_8125F38(u16 *a0, u16 *a1, u16 *a2)
|
||||
{
|
||||
u16 red, green, blue;
|
||||
u16 avg0, avg1, avg2;
|
||||
@@ -772,3 +784,582 @@ void sub_8126058(struct Unk030061A0 *arg0)
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
NAKED
|
||||
void sub_8126058(struct Unk030061A0 *arg0)
|
||||
{
|
||||
asm_unified("\n\
|
||||
push {r4-r7,lr}\n\
|
||||
mov r7, r10\n\
|
||||
mov r6, r9\n\
|
||||
mov r5, r8\n\
|
||||
push {r5-r7}\n\
|
||||
sub sp, 0xC\n\
|
||||
ldrb r1, [r0, 0x1D]\n\
|
||||
lsrs r5, r1, 3\n\
|
||||
ldrb r1, [r0, 0x1E]\n\
|
||||
lsrs r1, 3\n\
|
||||
str r1, [sp, 0x8]\n\
|
||||
ldr r1, [r0, 0x4]\n\
|
||||
str r1, [sp]\n\
|
||||
ldr r2, [r0, 0x10]\n\
|
||||
str r2, [sp, 0x4]\n\
|
||||
ldrh r0, [r0, 0x16]\n\
|
||||
cmp r0, 0x2\n\
|
||||
bne _08126108\n\
|
||||
movs r1, 0\n\
|
||||
ldr r0, [sp, 0x8]\n\
|
||||
cmp r1, r0\n\
|
||||
bcc _08126086\n\
|
||||
b _08126194\n\
|
||||
_08126086:\n\
|
||||
movs r0, 0\n\
|
||||
adds r2, r1, 0x1\n\
|
||||
mov r10, r2\n\
|
||||
cmp r0, r5\n\
|
||||
bcs _081260FA\n\
|
||||
adds r2, r1, 0\n\
|
||||
muls r2, r5\n\
|
||||
mov r9, r2\n\
|
||||
lsls r1, 3\n\
|
||||
mov r8, r1\n\
|
||||
_0812609A:\n\
|
||||
movs r4, 0\n\
|
||||
lsls r6, r0, 4\n\
|
||||
adds r7, r0, 0x1\n\
|
||||
add r0, r9\n\
|
||||
lsls r0, 6\n\
|
||||
ldr r1, [sp, 0x4]\n\
|
||||
adds r1, r0\n\
|
||||
mov r12, r1\n\
|
||||
_081260AA:\n\
|
||||
lsls r0, r4, 3\n\
|
||||
mov r2, r12\n\
|
||||
adds r3, r2, r0\n\
|
||||
mov r1, r8\n\
|
||||
adds r0, r1, r4\n\
|
||||
lsls r0, 3\n\
|
||||
muls r0, r5\n\
|
||||
lsls r0, 1\n\
|
||||
ldr r2, [sp]\n\
|
||||
adds r0, r2, r0\n\
|
||||
adds r2, r0, r6\n\
|
||||
ldrh r0, [r2, 0x2]\n\
|
||||
lsls r0, 8\n\
|
||||
ldrh r1, [r2]\n\
|
||||
orrs r0, r1\n\
|
||||
strh r0, [r3]\n\
|
||||
ldrh r0, [r2, 0x6]\n\
|
||||
lsls r0, 8\n\
|
||||
ldrh r1, [r2, 0x4]\n\
|
||||
orrs r0, r1\n\
|
||||
strh r0, [r3, 0x2]\n\
|
||||
ldrh r0, [r2, 0xA]\n\
|
||||
lsls r0, 8\n\
|
||||
ldrh r1, [r2, 0x8]\n\
|
||||
orrs r0, r1\n\
|
||||
strh r0, [r3, 0x4]\n\
|
||||
ldrh r0, [r2, 0xE]\n\
|
||||
lsls r0, 8\n\
|
||||
ldrh r1, [r2, 0xC]\n\
|
||||
orrs r0, r1\n\
|
||||
strh r0, [r3, 0x6]\n\
|
||||
adds r0, r4, 0x1\n\
|
||||
lsls r0, 16\n\
|
||||
lsrs r4, r0, 16\n\
|
||||
cmp r4, 0x7\n\
|
||||
bls _081260AA\n\
|
||||
lsls r0, r7, 16\n\
|
||||
lsrs r0, 16\n\
|
||||
cmp r0, r5\n\
|
||||
bcc _0812609A\n\
|
||||
_081260FA:\n\
|
||||
mov r1, r10\n\
|
||||
lsls r0, r1, 16\n\
|
||||
lsrs r1, r0, 16\n\
|
||||
ldr r2, [sp, 0x8]\n\
|
||||
cmp r1, r2\n\
|
||||
bcc _08126086\n\
|
||||
b _08126194\n\
|
||||
_08126108:\n\
|
||||
movs r1, 0\n\
|
||||
ldr r0, [sp, 0x8]\n\
|
||||
cmp r1, r0\n\
|
||||
bcs _08126194\n\
|
||||
_08126110:\n\
|
||||
movs r0, 0\n\
|
||||
adds r2, r1, 0x1\n\
|
||||
mov r10, r2\n\
|
||||
cmp r0, r5\n\
|
||||
bcs _08126188\n\
|
||||
adds r2, r1, 0\n\
|
||||
muls r2, r5\n\
|
||||
mov r9, r2\n\
|
||||
lsls r1, 3\n\
|
||||
mov r8, r1\n\
|
||||
_08126124:\n\
|
||||
movs r4, 0\n\
|
||||
lsls r6, r0, 4\n\
|
||||
adds r7, r0, 0x1\n\
|
||||
add r0, r9\n\
|
||||
lsls r0, 5\n\
|
||||
ldr r1, [sp, 0x4]\n\
|
||||
adds r1, r0\n\
|
||||
mov r12, r1\n\
|
||||
_08126134:\n\
|
||||
lsls r0, r4, 2\n\
|
||||
mov r2, r12\n\
|
||||
adds r3, r2, r0\n\
|
||||
mov r1, r8\n\
|
||||
adds r0, r1, r4\n\
|
||||
lsls r0, 3\n\
|
||||
muls r0, r5\n\
|
||||
lsls r0, 1\n\
|
||||
ldr r2, [sp]\n\
|
||||
adds r0, r2, r0\n\
|
||||
adds r2, r0, r6\n\
|
||||
ldrh r1, [r2, 0x2]\n\
|
||||
lsls r1, 4\n\
|
||||
ldrh r0, [r2]\n\
|
||||
orrs r1, r0\n\
|
||||
ldrh r0, [r2, 0x4]\n\
|
||||
lsls r0, 8\n\
|
||||
orrs r1, r0\n\
|
||||
ldrh r0, [r2, 0x6]\n\
|
||||
lsls r0, 12\n\
|
||||
orrs r1, r0\n\
|
||||
strh r1, [r3]\n\
|
||||
ldrh r1, [r2, 0xA]\n\
|
||||
lsls r1, 4\n\
|
||||
ldrh r0, [r2, 0x8]\n\
|
||||
orrs r1, r0\n\
|
||||
ldrh r0, [r2, 0xC]\n\
|
||||
lsls r0, 8\n\
|
||||
orrs r1, r0\n\
|
||||
ldrh r0, [r2, 0xE]\n\
|
||||
lsls r0, 12\n\
|
||||
orrs r1, r0\n\
|
||||
strh r1, [r3, 0x2]\n\
|
||||
adds r0, r4, 0x1\n\
|
||||
lsls r0, 16\n\
|
||||
lsrs r4, r0, 16\n\
|
||||
cmp r4, 0x7\n\
|
||||
bls _08126134\n\
|
||||
lsls r0, r7, 16\n\
|
||||
lsrs r0, 16\n\
|
||||
cmp r0, r5\n\
|
||||
bcc _08126124\n\
|
||||
_08126188:\n\
|
||||
mov r1, r10\n\
|
||||
lsls r0, r1, 16\n\
|
||||
lsrs r1, r0, 16\n\
|
||||
ldr r2, [sp, 0x8]\n\
|
||||
cmp r1, r2\n\
|
||||
bcc _08126110\n\
|
||||
_08126194:\n\
|
||||
add sp, 0xC\n\
|
||||
pop {r3-r5}\n\
|
||||
mov r8, r3\n\
|
||||
mov r9, r4\n\
|
||||
mov r10, r5\n\
|
||||
pop {r4-r7}\n\
|
||||
pop {r0}\n\
|
||||
bx r0");
|
||||
}
|
||||
|
||||
void sub_81261A4(struct Unk030061A0 *arg0)
|
||||
{
|
||||
gUnknown_03006188 = arg0->var_18 * 16;
|
||||
gUnknown_03006184 = &arg0->var_8[gUnknown_03006188];
|
||||
gUnknown_03006168 = arg0->var_4;
|
||||
gUnknown_03006164 = arg0->var_19;
|
||||
gUnknown_03006178 = arg0->var_1A;
|
||||
gUnknown_03006174 = arg0->var_1B;
|
||||
gUnknown_0300616C = arg0->var_1C;
|
||||
gUnknown_03006180 = arg0->var_1D;
|
||||
gUnknown_03006170 = arg0->var_1E;
|
||||
|
||||
switch (arg0->var_14)
|
||||
{
|
||||
case 0:
|
||||
sub_81263A4(FALSE);
|
||||
break;
|
||||
case 1:
|
||||
sub_81263A4(TRUE);
|
||||
break;
|
||||
case 2:
|
||||
sub_8126270();
|
||||
sub_8126714();
|
||||
break;
|
||||
case 3:
|
||||
sub_8126370();
|
||||
sub_8126664();
|
||||
break;
|
||||
case 4:
|
||||
sub_8126334();
|
||||
sub_81265B4();
|
||||
break;
|
||||
case 5:
|
||||
sub_8126318();
|
||||
sub_81264FC();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void sub_8126270(void)
|
||||
{
|
||||
gUnknown_03006184[0] = RGB2(0, 0, 0);
|
||||
gUnknown_03006184[1] = RGB2(6, 6, 6);
|
||||
gUnknown_03006184[2] = RGB2(29, 29, 29);
|
||||
gUnknown_03006184[3] = RGB2(11, 11, 11);
|
||||
gUnknown_03006184[4] = RGB2(29, 6, 6);
|
||||
gUnknown_03006184[5] = RGB2(6, 29, 6);
|
||||
gUnknown_03006184[6] = RGB2(6, 6, 29);
|
||||
gUnknown_03006184[7] = RGB2(29, 29, 6);
|
||||
gUnknown_03006184[8] = RGB2(29, 6, 29);
|
||||
gUnknown_03006184[9] = RGB2(6, 29, 29);
|
||||
gUnknown_03006184[10] = RGB2(29, 11, 6);
|
||||
gUnknown_03006184[11] = RGB2(11, 29, 6);
|
||||
gUnknown_03006184[12] = RGB2(6, 11, 29);
|
||||
gUnknown_03006184[13] = RGB2(29, 6, 11);
|
||||
gUnknown_03006184[14] = RGB2(6, 29, 11);
|
||||
gUnknown_03006184[15] = RGB2(11, 6, 29);
|
||||
}
|
||||
|
||||
static void sub_8126318(void)
|
||||
{
|
||||
gUnknown_03006184[0] = RGB2(0, 0, 0);
|
||||
gUnknown_03006184[1] = RGB2(0, 0, 0);
|
||||
gUnknown_03006184[2] = RGB2(31, 31, 31);
|
||||
}
|
||||
|
||||
static void sub_8126334(void)
|
||||
{
|
||||
u8 i;
|
||||
|
||||
gUnknown_03006184[0] = RGB2(0, 0, 0);
|
||||
gUnknown_03006184[1] = RGB2(0, 0, 0);
|
||||
for (i = 0; i < 14; i++)
|
||||
gUnknown_03006184[i + 2] = RGB2(2 * (i + 2), 2 * (i + 2), 2 * (i + 2));
|
||||
}
|
||||
|
||||
static void sub_8126370(void)
|
||||
{
|
||||
u8 i;
|
||||
|
||||
gUnknown_03006184[0] = RGB2(0, 0, 0);
|
||||
for (i = 0; i < 32; i++)
|
||||
gUnknown_03006184[i + 1] = RGB2(i, i, i);
|
||||
}
|
||||
|
||||
static void sub_81263A4(bool8 arg0)
|
||||
{
|
||||
u8 i, j;
|
||||
u16 maxIndex;
|
||||
|
||||
maxIndex = 0xDF;
|
||||
if (!arg0)
|
||||
maxIndex = 0xFF;
|
||||
|
||||
for (j = 0; j < maxIndex; j++)
|
||||
gUnknown_03006184[j] = 0;
|
||||
|
||||
gUnknown_03006184[maxIndex] = RGB2(15, 15, 15);
|
||||
for (i = 0; i < gUnknown_0300616C; i++)
|
||||
{
|
||||
u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
|
||||
u16* pal = &var2[gUnknown_03006164];
|
||||
for (j = 0; j < gUnknown_03006174; j++, pal++)
|
||||
{
|
||||
if (*pal & 0x8000)
|
||||
{
|
||||
*pal = gUnknown_03006188;
|
||||
}
|
||||
else
|
||||
{
|
||||
u16 color = sub_81267C4(pal);
|
||||
u8 curIndex = 1;
|
||||
if (curIndex < maxIndex)
|
||||
{
|
||||
if (gUnknown_03006184[curIndex] == RGB_BLACK)
|
||||
{
|
||||
gUnknown_03006184[curIndex] = color;
|
||||
*pal = gUnknown_03006188 + curIndex;
|
||||
}
|
||||
else
|
||||
{
|
||||
while (curIndex < maxIndex)
|
||||
{
|
||||
if (gUnknown_03006184[curIndex] == RGB_BLACK)
|
||||
{
|
||||
gUnknown_03006184[curIndex] = color;
|
||||
*pal = gUnknown_03006188 + curIndex;
|
||||
break;
|
||||
}
|
||||
|
||||
if (gUnknown_03006184[curIndex] == color)
|
||||
{
|
||||
*pal = gUnknown_03006188 + curIndex;
|
||||
break;
|
||||
}
|
||||
|
||||
curIndex++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (curIndex == maxIndex)
|
||||
{
|
||||
curIndex = maxIndex;
|
||||
*pal = curIndex;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void sub_81264FC(void)
|
||||
{
|
||||
u8 i, j;
|
||||
|
||||
for (i = 0; i < gUnknown_0300616C; i++)
|
||||
{
|
||||
u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
|
||||
u16* pal = &var2[gUnknown_03006164];
|
||||
for (j = 0; j < gUnknown_03006174; j++, pal++)
|
||||
{
|
||||
if (*pal & 0x8000)
|
||||
{
|
||||
*pal = gUnknown_03006188;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (ConvertToBlackOrWhite(pal) == RGB_BLACK)
|
||||
*pal = gUnknown_03006188 + 1;
|
||||
else
|
||||
*pal = gUnknown_03006188 + 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void sub_81265B4(void)
|
||||
{
|
||||
u8 i, j;
|
||||
|
||||
for (i = 0; i < gUnknown_0300616C; i++)
|
||||
{
|
||||
u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
|
||||
u16* pal = &var2[gUnknown_03006164];
|
||||
for (j = 0; j < gUnknown_03006174; j++, pal++)
|
||||
{
|
||||
if (*pal & 0x8000)
|
||||
*pal = gUnknown_03006188;
|
||||
else
|
||||
*pal = sub_8126908(pal) + gUnknown_03006188;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void sub_8126664(void)
|
||||
{
|
||||
u8 i, j;
|
||||
|
||||
for (i = 0; i < gUnknown_0300616C; i++)
|
||||
{
|
||||
u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
|
||||
u16* pal = &var2[gUnknown_03006164];
|
||||
for (j = 0; j < gUnknown_03006174; j++, pal++)
|
||||
{
|
||||
if (*pal & 0x8000)
|
||||
*pal = gUnknown_03006188;
|
||||
else
|
||||
*pal = sub_812693C(pal) + gUnknown_03006188;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void sub_8126714(void)
|
||||
{
|
||||
u8 i, j;
|
||||
|
||||
for (i = 0; i < gUnknown_0300616C; i++)
|
||||
{
|
||||
u16* var2 = &(*gUnknown_03006168)[0][(gUnknown_03006178 + i) * gUnknown_03006180];
|
||||
u16* pal = &var2[gUnknown_03006164];
|
||||
for (j = 0; j < gUnknown_03006174; j++, pal++)
|
||||
{
|
||||
if (*pal & 0x8000)
|
||||
*pal = gUnknown_03006188;
|
||||
else
|
||||
*pal = sub_8126838(pal) + gUnknown_03006188;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static u16 sub_81267C4(u16 *color)
|
||||
{
|
||||
u16 red = *color & 0x1F;
|
||||
u16 green = (*color >> 5) & 0x1F;
|
||||
u16 blue = (*color >> 10) & 0x1F;
|
||||
|
||||
if (red & 3)
|
||||
red = (red & 0x1C) + 4;
|
||||
if (green & 3)
|
||||
green = (green & 0x1C) + 4;
|
||||
if (blue & 3)
|
||||
blue = (blue & 0x1C) + 4;
|
||||
|
||||
if (red < 6)
|
||||
red = 6;
|
||||
if (red > 30)
|
||||
red = 30;
|
||||
|
||||
if (green < 6)
|
||||
green = 6;
|
||||
if (green > 30)
|
||||
green = 30;
|
||||
|
||||
if (blue < 6)
|
||||
blue = 6;
|
||||
if (blue > 30)
|
||||
blue = 30;
|
||||
|
||||
return RGB2(red, green, blue);
|
||||
}
|
||||
|
||||
static u16 sub_8126838(u16* color)
|
||||
{
|
||||
u16 red = *color & 0x1F;
|
||||
u16 green = (*color >> 5) & 0x1F;
|
||||
u16 blue = (*color >> 10) & 0x1F;
|
||||
|
||||
if (red < 12 && green < 11 && blue < 11)
|
||||
return 1;
|
||||
|
||||
if (red > 19 && green > 19 && blue > 19)
|
||||
return 2;
|
||||
|
||||
if (red > 19)
|
||||
{
|
||||
if (green > 19)
|
||||
{
|
||||
if (blue > 14)
|
||||
return 2;
|
||||
else
|
||||
return 7;
|
||||
}
|
||||
else if (blue > 19)
|
||||
{
|
||||
if (green > 14)
|
||||
return 2;
|
||||
else
|
||||
return 8;
|
||||
}
|
||||
}
|
||||
|
||||
if (green > 19 && blue > 19)
|
||||
{
|
||||
if (red > 14)
|
||||
return 2;
|
||||
else
|
||||
return 9;
|
||||
}
|
||||
|
||||
if (red > 19)
|
||||
{
|
||||
if (green > 11)
|
||||
{
|
||||
if (blue > 11)
|
||||
{
|
||||
if (green < blue)
|
||||
return 8;
|
||||
else
|
||||
return 7;
|
||||
}
|
||||
else
|
||||
{
|
||||
return 10;
|
||||
}
|
||||
}
|
||||
else if (blue > 11)
|
||||
{
|
||||
return 13;
|
||||
}
|
||||
else
|
||||
{
|
||||
return 4;
|
||||
}
|
||||
}
|
||||
|
||||
if (green > 19)
|
||||
{
|
||||
if (red > 11)
|
||||
{
|
||||
if (blue > 11)
|
||||
{
|
||||
if (red < blue)
|
||||
return 9;
|
||||
else
|
||||
return 7;
|
||||
}
|
||||
else
|
||||
{
|
||||
return 11;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (blue > 11)
|
||||
return 14;
|
||||
else
|
||||
return 5;
|
||||
}
|
||||
}
|
||||
|
||||
if (blue > 19)
|
||||
{
|
||||
if (red > 11)
|
||||
{
|
||||
if (green > 11)
|
||||
{
|
||||
if (red < green)
|
||||
return 9;
|
||||
else
|
||||
return 8;
|
||||
}
|
||||
}
|
||||
else if (green > 11)
|
||||
{
|
||||
return 12;
|
||||
}
|
||||
|
||||
if (blue > 11)
|
||||
return 15;
|
||||
else
|
||||
return 6;
|
||||
}
|
||||
|
||||
return 3;
|
||||
}
|
||||
|
||||
static u16 sub_8126908(u16 *color)
|
||||
{
|
||||
u16 red = *color & 0x1F;
|
||||
u16 green = (*color >> 5) & 0x1F;
|
||||
u16 blue = (*color >> 10) & 0x1F;
|
||||
u16 average = ((red + green + blue) / 3) & 0x1E;
|
||||
if (average == 0)
|
||||
return 1;
|
||||
else
|
||||
return average / 2;
|
||||
}
|
||||
|
||||
static u16 sub_812693C(u16 *color)
|
||||
{
|
||||
u16 red = *color & 0x1F;
|
||||
u16 green = (*color >> 5) & 0x1F;
|
||||
u16 blue = (*color >> 10) & 0x1F;
|
||||
u16 average = (red + green + blue) / 3;
|
||||
return average + 1;
|
||||
}
|
||||
|
||||
+2
-2
@@ -1056,10 +1056,10 @@ static const struct OamData gUnknown_085E703C =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
|
||||
@@ -1,47 +1,47 @@
|
||||
const struct OamData gEventObjectBaseOam_8x8 = {
|
||||
.shape = 0,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.priority = 2
|
||||
};
|
||||
|
||||
const struct OamData gEventObjectBaseOam_16x8 = {
|
||||
.shape = 1,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(16x8),
|
||||
.size = SPRITE_SIZE(16x8),
|
||||
.priority = 2
|
||||
};
|
||||
|
||||
const struct OamData gEventObjectBaseOam_16x16 = {
|
||||
.shape = 0,
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.priority = 2
|
||||
};
|
||||
|
||||
const struct OamData gEventObjectBaseOam_32x8 = {
|
||||
.shape = 1,
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(32x8),
|
||||
.size = SPRITE_SIZE(32x8),
|
||||
.priority = 2
|
||||
};
|
||||
|
||||
const struct OamData gEventObjectBaseOam_64x32 = {
|
||||
.shape = 1,
|
||||
.size = 3,
|
||||
.shape = SPRITE_SHAPE(64x32),
|
||||
.size = SPRITE_SIZE(64x32),
|
||||
.priority = 2
|
||||
};
|
||||
|
||||
const struct OamData gEventObjectBaseOam_16x32 = {
|
||||
.shape = 2,
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(16x32),
|
||||
.size = SPRITE_SIZE(16x32),
|
||||
.priority = 2
|
||||
};
|
||||
|
||||
const struct OamData gEventObjectBaseOam_32x32 = {
|
||||
.shape = 0,
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.priority = 2
|
||||
};
|
||||
|
||||
const struct OamData gEventObjectBaseOam_64x64 = {
|
||||
.shape = 0,
|
||||
.size = 3,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.priority = 2
|
||||
};
|
||||
|
||||
+2788
-2788
File diff suppressed because it is too large
Load Diff
+3
-1
@@ -392,7 +392,9 @@ const struct SpritePalette gUnknown_085A73E0 = {
|
||||
};
|
||||
|
||||
const struct OamData Unknown_085A73E8 = {
|
||||
.size = 1, .priority = 1
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.priority = 1
|
||||
};
|
||||
|
||||
const union AnimCmd Unknown_085A73F0[] = {
|
||||
|
||||
+2
-2
@@ -159,7 +159,7 @@ static void sub_8122804(struct EasyChatPair *s, u16 b, u8 c)
|
||||
}
|
||||
}
|
||||
|
||||
void ReceiveEasyChatPairsData(void *a, u32 b, u8 unused)
|
||||
void ReceiveEasyChatPairsData(struct EasyChatPair *a, size_t size, u8 unused)
|
||||
{
|
||||
u16 i, j, r3, players;
|
||||
struct EasyChatPair *buffer1, *buffer2, *src, *dst, *foo_of_buffer2;
|
||||
@@ -176,7 +176,7 @@ void ReceiveEasyChatPairsData(void *a, u32 b, u8 unused)
|
||||
{
|
||||
players = GetLinkPlayerCount();
|
||||
for (i = 0; i < players; i++)
|
||||
memcpy(&(buffer1[i * 5]), (u8 *)a + i * b, 40);
|
||||
memcpy(&(buffer1[i * 5]), (u8 *)a + i * size, 40);
|
||||
src = buffer1;
|
||||
dst = buffer2;
|
||||
r3 = 0;
|
||||
|
||||
+1
-2
@@ -13,8 +13,7 @@
|
||||
#include "text.h"
|
||||
#include "overworld.h"
|
||||
#include "menu.h"
|
||||
|
||||
extern bool16 sub_80C0944(void);
|
||||
#include "pokedex.h"
|
||||
|
||||
extern const u8 gText_DexNational[];
|
||||
extern const u8 gText_DexHoenn[];
|
||||
|
||||
+12
-12
@@ -772,10 +772,10 @@ static const struct OamData sOamData_8597D10 = {
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.mosaic = 0,
|
||||
.bpp = ST_OAM_4BPP,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 0,
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileNum = 0,
|
||||
.priority = 3,
|
||||
.paletteNum = 0,
|
||||
@@ -798,10 +798,10 @@ static const struct OamData sUnknown_08597D30 = {
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.mosaic = 0,
|
||||
.bpp = ST_OAM_4BPP,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.shape = SPRITE_SHAPE(64x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x32),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
@@ -851,10 +851,10 @@ static const struct OamData sUnknown_08597D80 = {
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.mosaic = 0,
|
||||
.bpp = ST_OAM_4BPP,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.shape = SPRITE_SHAPE(64x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x32),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
@@ -913,10 +913,10 @@ static const struct OamData sUnknown_08597DE8 = {
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.mosaic = 0,
|
||||
.bpp = ST_OAM_4BPP,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 3,
|
||||
.paletteNum = 0,
|
||||
@@ -939,10 +939,10 @@ static const struct OamData sUnknown_08597E08 = {
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.mosaic = 0,
|
||||
.bpp = ST_OAM_4BPP,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.shape = SPRITE_SHAPE(32x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 1,
|
||||
.size = SPRITE_SIZE(32x8),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
@@ -955,10 +955,10 @@ static const struct OamData gUnknown_08597E10 = {
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.mosaic = 0,
|
||||
.bpp = ST_OAM_4BPP,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 1,
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
|
||||
+5
-5
@@ -75,7 +75,7 @@ static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8
|
||||
static IWRAM_DATA struct EggHatchData *sEggHatchData;
|
||||
|
||||
// rom data
|
||||
static const u16 sEggPalette[] = INCBIN_U16("graphics/pokemon/palettes/egg_palette.gbapal");
|
||||
static const u16 sEggPalette[] = INCBIN_U16("graphics/pokemon/egg/normal.gbapal");
|
||||
static const u8 sEggHatchTiles[] = INCBIN_U8("graphics/misc/egg_hatch.4bpp");
|
||||
static const u8 sEggShardTiles[] = INCBIN_U8("graphics/misc/egg_shard.4bpp");
|
||||
|
||||
@@ -86,10 +86,10 @@ static const struct OamData sOamData_EggHatch =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
@@ -166,10 +166,10 @@ static const struct OamData sOamData_EggShard =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 0,
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileNum = 0,
|
||||
.priority = 2,
|
||||
.paletteNum = 0,
|
||||
|
||||
@@ -5,9 +5,6 @@
|
||||
#include "constants/songs.h"
|
||||
#include "sound.h"
|
||||
|
||||
extern void sub_810E2C8(struct Sprite *);
|
||||
extern void TranslateAnimSpriteToTargetMonLocation(struct Sprite *);
|
||||
|
||||
static void sub_810A1A8(struct Sprite *);
|
||||
static void sub_810A1F8(struct Sprite *);
|
||||
static void sub_810A214(struct Sprite *);
|
||||
|
||||
@@ -53,10 +53,10 @@ static const struct OamData sOamData_EvoSparkle =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 0,
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
|
||||
@@ -32,8 +32,7 @@
|
||||
#include "constants/map_types.h"
|
||||
#include "constants/maps.h"
|
||||
#include "constants/songs.h"
|
||||
|
||||
extern bool32 TryStartMatchCall(void);
|
||||
#include "match_call.h"
|
||||
|
||||
static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0;
|
||||
static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0;
|
||||
|
||||
+103
-47
@@ -240,12 +240,6 @@ static IWRAM_DATA u8 sActiveList[32];
|
||||
|
||||
extern u8 *gFieldEffectScriptPointers[];
|
||||
extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
|
||||
extern void sub_81555D8(u8, u8);
|
||||
extern void pal_fill_for_maplights(void);
|
||||
extern void sub_80E1558(u8);
|
||||
extern void sub_80E1570(void);
|
||||
extern bool8 sub_80E1584(void);
|
||||
extern void WarpFadeScreen(void);
|
||||
|
||||
// .rodata
|
||||
const u32 gNewGameBirchPic[] = INCBIN_U32("graphics/birch_speech/birch.4bpp");
|
||||
@@ -276,7 +270,8 @@ const u8 gUnknown_0855C190[] = INCBIN_U8("graphics/unknown/unknown_55C190.4bpp")
|
||||
const u8 gUnknown_0855C1B0[] = INCBIN_U8("graphics/unknown/unknown_55C1B0.4bpp");
|
||||
const u8 gUnknown_0855C1D0[] = INCBIN_U8("graphics/unknown/unknown_55C1D0.4bpp");
|
||||
|
||||
bool8 (*const gFieldEffectScriptFuncs[])(u8 **, u32 *) = {
|
||||
bool8 (*const gFieldEffectScriptFuncs[])(u8 **, u32 *) =
|
||||
{
|
||||
FieldEffectCmd_loadtiles,
|
||||
FieldEffectCmd_loadfadedpal,
|
||||
FieldEffectCmd_loadpal,
|
||||
@@ -287,25 +282,48 @@ bool8 (*const gFieldEffectScriptFuncs[])(u8 **, u32 *) = {
|
||||
FieldEffectCmd_loadfadedpal_callnative,
|
||||
};
|
||||
|
||||
const struct OamData gNewGameBirchOamAttributes = {.size = 3};
|
||||
const struct OamData gOamData_855C218 = {.size = 0};
|
||||
const struct OamData gOamData_855C220 = {.size = 1};
|
||||
const struct OamData gNewGameBirchOamAttributes =
|
||||
{
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.size = SPRITE_SIZE(64x64)
|
||||
};
|
||||
|
||||
const struct SpriteFrameImage gNewGameBirchPicTable[] = {
|
||||
const struct OamData gOamData_855C218 =
|
||||
{
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.size = SPRITE_SIZE(8x8)
|
||||
};
|
||||
|
||||
const struct OamData gOamData_855C220 =
|
||||
{
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.size = SPRITE_SIZE(16x16)
|
||||
};
|
||||
|
||||
const struct SpriteFrameImage gNewGameBirchPicTable[] =
|
||||
{
|
||||
obj_frame_tiles(gNewGameBirchPic)
|
||||
};
|
||||
const struct SpritePalette gNewGameBirchObjectPaletteInfo = {.data = gNewGameBirchPalette, .tag = 0x1006};
|
||||
|
||||
const union AnimCmd gNewGameBirchImageAnim[] = {
|
||||
const struct SpritePalette gNewGameBirchObjectPaletteInfo =
|
||||
{
|
||||
.data = gNewGameBirchPalette,
|
||||
.tag = 0x1006
|
||||
};
|
||||
|
||||
const union AnimCmd gNewGameBirchImageAnim[] =
|
||||
{
|
||||
ANIMCMD_FRAME(.imageValue = 0, .duration = 1),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
const union AnimCmd *const gNewGameBirchImageAnimTable[] = {
|
||||
const union AnimCmd *const gNewGameBirchImageAnimTable[] =
|
||||
{
|
||||
gNewGameBirchImageAnim
|
||||
};
|
||||
|
||||
const struct SpriteTemplate gNewGameBirchObjectTemplate = {
|
||||
const struct SpriteTemplate gNewGameBirchObjectTemplate =
|
||||
{
|
||||
.tileTag = 0xFFFF,
|
||||
.paletteTag = 4102,
|
||||
.oam = &gNewGameBirchOamAttributes,
|
||||
@@ -315,31 +333,47 @@ const struct SpriteTemplate gNewGameBirchObjectTemplate = {
|
||||
.callback = SpriteCallbackDummy
|
||||
};
|
||||
|
||||
const struct SpritePalette gFieldEffectObjectPaletteInfo4 = {.data = gFieldEffectObjectPalette4, .tag = 0x1007};
|
||||
const struct SpritePalette gFieldEffectObjectPaletteInfo5 = {.data = gFieldEffectObjectPalette5, .tag = 0x1010};
|
||||
const struct OamData gOamData_855C26C = {
|
||||
.shape = 1,
|
||||
.size = 2
|
||||
const struct SpritePalette gFieldEffectObjectPaletteInfo4 =
|
||||
{
|
||||
.data = gFieldEffectObjectPalette4,
|
||||
.tag = 0x1007
|
||||
};
|
||||
|
||||
const struct SpriteFrameImage gSpriteImageTable_855C274[] = {
|
||||
const struct SpritePalette gFieldEffectObjectPaletteInfo5 =
|
||||
{
|
||||
.data = gFieldEffectObjectPalette5,
|
||||
.tag = 0x1010
|
||||
};
|
||||
|
||||
const struct OamData gOamData_855C26C =
|
||||
{
|
||||
.shape = SPRITE_SHAPE(32x16),
|
||||
.size = SPRITE_SIZE(32x16)
|
||||
};
|
||||
|
||||
const struct SpriteFrameImage gSpriteImageTable_855C274[] =
|
||||
{
|
||||
obj_frame_tiles(gSpriteImage_855A970)
|
||||
};
|
||||
|
||||
const struct SpriteFrameImage gSpriteImageTable_855C27C[] = {
|
||||
const struct SpriteFrameImage gSpriteImageTable_855C27C[] =
|
||||
{
|
||||
obj_frame_tiles(gSpriteImage_855A9B0),
|
||||
obj_frame_tiles(gSpriteImage_855AA70)
|
||||
};
|
||||
|
||||
const struct SpriteFrameImage gSpriteImageTable_855C28C[] = {
|
||||
const struct SpriteFrameImage gSpriteImageTable_855C28C[] =
|
||||
{
|
||||
obj_frame_tiles(gSpriteImage_855AB30)
|
||||
};
|
||||
|
||||
const struct SpriteFrameImage gSpriteImageTable_855C294[] = {
|
||||
const struct SpriteFrameImage gSpriteImageTable_855C294[] =
|
||||
{
|
||||
{.data = gSpriteImage_855AD30, .size = 0x200} // the macro breaks down here
|
||||
};
|
||||
|
||||
const struct Subsprite gSubspriteTable_855C29C[] = {
|
||||
const struct Subsprite gSubspriteTable_855C29C[] =
|
||||
{
|
||||
{.x = -12, .y = -8, .priority = 2, .tileOffset = 0, .shape = 1, .size = 0},
|
||||
{.x = 4, .y = -8, .priority = 2, .tileOffset = 2, .shape = 0, .size = 0},
|
||||
{.x = -12, .y = 0, .priority = 2, .tileOffset = 3, .shape = 1, .size = 0},
|
||||
@@ -348,7 +382,8 @@ const struct Subsprite gSubspriteTable_855C29C[] = {
|
||||
|
||||
const struct SubspriteTable gUnknown_0855C2AC = subsprite_table(gSubspriteTable_855C29C);
|
||||
|
||||
const struct Subsprite gSubspriteTable_855C2B4[] = {
|
||||
const struct Subsprite gSubspriteTable_855C2B4[] =
|
||||
{
|
||||
{.x = -32, .y = -8, .priority = 2, .tileOffset = 0, .shape = 1, .size = 1},
|
||||
{.x = 0, .y = -8, .priority = 2, .tileOffset = 4, .shape = 1, .size = 1},
|
||||
{.x = -32, .y = 0, .priority = 2, .tileOffset = 8, .shape = 1, .size = 1},
|
||||
@@ -357,12 +392,14 @@ const struct Subsprite gSubspriteTable_855C2B4[] = {
|
||||
|
||||
const struct SubspriteTable gUnknown_0855C2C4 = subsprite_table(gSubspriteTable_855C2B4);
|
||||
|
||||
const union AnimCmd gSpriteAnim_855C2CC[] = {
|
||||
const union AnimCmd gSpriteAnim_855C2CC[] =
|
||||
{
|
||||
ANIMCMD_FRAME(.imageValue = 0, .duration = 1),
|
||||
ANIMCMD_JUMP(0)
|
||||
};
|
||||
|
||||
const union AnimCmd gSpriteAnim_855C2D4[] = {
|
||||
const union AnimCmd gSpriteAnim_855C2D4[] =
|
||||
{
|
||||
ANIMCMD_FRAME(.imageValue = 0, .duration = 16),
|
||||
ANIMCMD_FRAME(.imageValue = 1, .duration = 16),
|
||||
ANIMCMD_FRAME(.imageValue = 0, .duration = 16),
|
||||
@@ -374,16 +411,19 @@ const union AnimCmd gSpriteAnim_855C2D4[] = {
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
const union AnimCmd *const gSpriteAnimTable_855C2F8[] = {
|
||||
const union AnimCmd *const gSpriteAnimTable_855C2F8[] =
|
||||
{
|
||||
gSpriteAnim_855C2CC,
|
||||
gSpriteAnim_855C2D4
|
||||
};
|
||||
|
||||
const union AnimCmd *const gSpriteAnimTable_855C300[] = {
|
||||
const union AnimCmd *const gSpriteAnimTable_855C300[] =
|
||||
{
|
||||
gSpriteAnim_855C2CC
|
||||
};
|
||||
|
||||
const struct SpriteTemplate gSpriteTemplate_855C304 = {
|
||||
const struct SpriteTemplate gSpriteTemplate_855C304 =
|
||||
{
|
||||
.tileTag = 0xFFFF,
|
||||
.paletteTag = 4103,
|
||||
.oam = &gOamData_855C218,
|
||||
@@ -393,7 +433,8 @@ const struct SpriteTemplate gSpriteTemplate_855C304 = {
|
||||
.callback = SpriteCB_PokeballGlow
|
||||
};
|
||||
|
||||
const struct SpriteTemplate gSpriteTemplate_855C31C = {
|
||||
const struct SpriteTemplate gSpriteTemplate_855C31C =
|
||||
{
|
||||
.tileTag = 0xFFFF,
|
||||
.paletteTag = 4100,
|
||||
.oam = &gOamData_855C220,
|
||||
@@ -403,7 +444,8 @@ const struct SpriteTemplate gSpriteTemplate_855C31C = {
|
||||
.callback = SpriteCB_PokecenterMonitor
|
||||
};
|
||||
|
||||
const struct SpriteTemplate gSpriteTemplate_855C334 = {
|
||||
const struct SpriteTemplate gSpriteTemplate_855C334 =
|
||||
{
|
||||
.tileTag = 0xFFFF,
|
||||
.paletteTag = 4112,
|
||||
.oam = &gOamData_855C220,
|
||||
@@ -413,7 +455,8 @@ const struct SpriteTemplate gSpriteTemplate_855C334 = {
|
||||
.callback = SpriteCB_HallOfFameMonitor
|
||||
};
|
||||
|
||||
const struct SpriteTemplate gSpriteTemplate_855C34C = {
|
||||
const struct SpriteTemplate gSpriteTemplate_855C34C =
|
||||
{
|
||||
.tileTag = 0xFFFF,
|
||||
.paletteTag = 4112,
|
||||
.oam = &gOamData_855C26C,
|
||||
@@ -423,21 +466,24 @@ const struct SpriteTemplate gSpriteTemplate_855C34C = {
|
||||
.callback = SpriteCB_HallOfFameMonitor
|
||||
};
|
||||
|
||||
void (*const gUnknown_0855C364[])(struct Task *) = {
|
||||
void (*const gUnknown_0855C364[])(struct Task *) =
|
||||
{
|
||||
PokecenterHealEffect_0,
|
||||
PokecenterHealEffect_1,
|
||||
PokecenterHealEffect_2,
|
||||
PokecenterHealEffect_3
|
||||
};
|
||||
|
||||
void (*const gUnknown_0855C374[])(struct Task *) = {
|
||||
void (*const gUnknown_0855C374[])(struct Task *) =
|
||||
{
|
||||
HallOfFameRecordEffect_0,
|
||||
HallOfFameRecordEffect_1,
|
||||
HallOfFameRecordEffect_2,
|
||||
HallOfFameRecordEffect_3
|
||||
};
|
||||
|
||||
void (*const gUnknown_0855C384[])(struct Sprite *) = {
|
||||
void (*const gUnknown_0855C384[])(struct Sprite *) =
|
||||
{
|
||||
PokeballGlowEffect_0,
|
||||
PokeballGlowEffect_1,
|
||||
PokeballGlowEffect_2,
|
||||
@@ -448,7 +494,8 @@ void (*const gUnknown_0855C384[])(struct Sprite *) = {
|
||||
PokeballGlowEffect_7
|
||||
};
|
||||
|
||||
const struct Coords16 gUnknown_0855C3A4[] = {
|
||||
const struct Coords16 gUnknown_0855C3A4[] =
|
||||
{
|
||||
{.x = 0, .y = 0},
|
||||
{.x = 6, .y = 0},
|
||||
{.x = 0, .y = 4},
|
||||
@@ -461,7 +508,8 @@ const u8 gUnknown_0855C3BC[] = {16, 12, 8, 0};
|
||||
const u8 gUnknown_0855C3C0[] = {16, 12, 8, 0};
|
||||
const u8 gUnknown_0855C3C4[] = { 0, 0, 0, 0};
|
||||
|
||||
bool8 (*const gUnknown_0855C3C8[])(struct Task *) = {
|
||||
bool8 (*const gUnknown_0855C3C8[])(struct Task *) =
|
||||
{
|
||||
sub_80B6BCC,
|
||||
sub_80B6C74,
|
||||
sub_80B6C90,
|
||||
@@ -471,7 +519,8 @@ bool8 (*const gUnknown_0855C3C8[])(struct Task *) = {
|
||||
sub_80B6E18,
|
||||
};
|
||||
|
||||
bool8 (*const gUnknown_0855C3E4[])(struct Task *) = {
|
||||
bool8 (*const gUnknown_0855C3E4[])(struct Task *) =
|
||||
{
|
||||
sub_80B6EC0,
|
||||
sub_80B6EE0,
|
||||
sub_80B6F50,
|
||||
@@ -480,7 +529,8 @@ bool8 (*const gUnknown_0855C3E4[])(struct Task *) = {
|
||||
sub_80B6FA8,
|
||||
};
|
||||
|
||||
bool8 (*const gUnknown_0855C3FC[])(struct Task *) = {
|
||||
bool8 (*const gUnknown_0855C3FC[])(struct Task *) =
|
||||
{
|
||||
sub_80B7114,
|
||||
sub_80B7190,
|
||||
sub_80B71D0,
|
||||
@@ -490,7 +540,8 @@ bool8 (*const gUnknown_0855C3FC[])(struct Task *) = {
|
||||
sub_80B72F4,
|
||||
};
|
||||
|
||||
bool8 (*const gUnknown_0855C418[])(struct Task *, struct EventObject *) = {
|
||||
bool8 (*const gUnknown_0855C418[])(struct Task *, struct EventObject *) =
|
||||
{
|
||||
sub_80B73D0,
|
||||
waterfall_1_do_anim_probably,
|
||||
waterfall_2_wait_anim_finish_probably,
|
||||
@@ -498,13 +549,15 @@ bool8 (*const gUnknown_0855C418[])(struct Task *, struct EventObject *) = {
|
||||
sub_80B7478,
|
||||
};
|
||||
|
||||
bool8 (*const gUnknown_0855C42C[])(struct Task *) = {
|
||||
bool8 (*const gUnknown_0855C42C[])(struct Task *) =
|
||||
{
|
||||
dive_1_lock,
|
||||
dive_2_unknown,
|
||||
dive_3_unknown,
|
||||
};
|
||||
|
||||
bool8 (*const gUnknown_0855C438[])(struct Task *, struct EventObject *, struct Sprite *) = {
|
||||
bool8 (*const gUnknown_0855C438[])(struct Task *, struct EventObject *, struct Sprite *) =
|
||||
{
|
||||
sub_80B764C,
|
||||
sub_80B7684,
|
||||
sub_80B76B8,
|
||||
@@ -513,14 +566,16 @@ bool8 (*const gUnknown_0855C438[])(struct Task *, struct EventObject *, struct S
|
||||
sub_80B7814,
|
||||
};
|
||||
|
||||
bool8 (*const gUnknown_0855C450[])(struct Task *, struct EventObject *, struct Sprite *) = {
|
||||
bool8 (*const gUnknown_0855C450[])(struct Task *, struct EventObject *, struct Sprite *) =
|
||||
{
|
||||
sub_80B78EC,
|
||||
sub_80B791C,
|
||||
sub_80B7968,
|
||||
sub_80B79BC,
|
||||
};
|
||||
|
||||
bool8 (*const gUnknown_0855C460[])(struct Task *, struct EventObject *, struct Sprite *) = {
|
||||
bool8 (*const gUnknown_0855C460[])(struct Task *, struct EventObject *, struct Sprite *) =
|
||||
{
|
||||
sub_80B7AE8,
|
||||
sub_80B7B18,
|
||||
sub_80B7B94,
|
||||
@@ -528,7 +583,8 @@ bool8 (*const gUnknown_0855C460[])(struct Task *, struct EventObject *, struct S
|
||||
sub_80B7BF4,
|
||||
};
|
||||
|
||||
void (*const gEscapeRopeFieldEffectFuncs[])(struct Task *) = {
|
||||
void (*const gEscapeRopeFieldEffectFuncs[])(struct Task *) =
|
||||
{
|
||||
EscapeRopeFieldEffect_Step0,
|
||||
EscapeRopeFieldEffect_Step1,
|
||||
};
|
||||
|
||||
@@ -4,9 +4,7 @@
|
||||
#include "string_util.h"
|
||||
#include "task.h"
|
||||
#include "text.h"
|
||||
|
||||
extern bool32 IsMatchCallTaskActive(void);
|
||||
extern void StartMatchCallFromScript(u8*);
|
||||
#include "match_call.h"
|
||||
|
||||
static EWRAM_DATA u8 sFieldMessageBoxMode = 0;
|
||||
|
||||
|
||||
@@ -2125,7 +2125,7 @@ void sub_808D194(void)
|
||||
sub_808D1FC(CreateTask(sub_808D1FC, 0));
|
||||
}
|
||||
|
||||
bool8 sub_808D1B4(void)
|
||||
bool32 sub_808D1B4(void)
|
||||
{
|
||||
return FuncIsActiveTask(sub_808D1FC);
|
||||
}
|
||||
@@ -2135,7 +2135,7 @@ void sub_808D1C8(void)
|
||||
sub_808D094(CreateTask(sub_808D094, 0));
|
||||
}
|
||||
|
||||
bool8 sub_808D1E8(void)
|
||||
bool32 sub_808D1E8(void)
|
||||
{
|
||||
return FuncIsActiveTask(sub_808D094);
|
||||
}
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
#include "field_screen_effect.h"
|
||||
#include "field_special_scene.h"
|
||||
#include "field_weather.h"
|
||||
// #include "fldeff_flash.h"
|
||||
#include "gpu_regs.h"
|
||||
#include "link.h"
|
||||
#include "link_rfu.h"
|
||||
@@ -31,22 +30,9 @@
|
||||
#include "constants/event_object_movement_constants.h"
|
||||
#include "constants/songs.h"
|
||||
#include "constants/rgb.h"
|
||||
|
||||
extern bool32 sub_81D6534(void);
|
||||
extern bool8 walkrun_is_standing_still(void);
|
||||
extern void ScriptUnfreezeEventObjects(void);
|
||||
extern void sub_80FB768(void);
|
||||
extern void sub_808D194(void);
|
||||
extern void sub_808D1C8(void);
|
||||
extern bool32 sub_808D1B4(void);
|
||||
extern bool32 sub_808D1E8(void);
|
||||
extern void sub_80B6B68(void);
|
||||
extern void sub_80B6E4C(u8, u8);
|
||||
extern void sub_80B75D8(u8);
|
||||
extern void sub_80B7A74(u8);
|
||||
extern void sub_808C0A8(u8);
|
||||
extern u8 GetMapPairFadeToType(u8, u8);
|
||||
extern u8 GetMapPairFadeFromType(u8, u8);
|
||||
#include "trainer_hill.h"
|
||||
#include "event_obj_lock.h"
|
||||
#include "fldeff.h"
|
||||
|
||||
extern const u16 gUnknown_82EC7CC[];
|
||||
|
||||
|
||||
@@ -301,7 +301,7 @@ void Task_HandlePorthole(u8 taskId)
|
||||
break;
|
||||
case EXIT_PORTHOLE: // exit porthole.
|
||||
FlagClear(FLAG_SPECIAL_FLAG_0x4001);
|
||||
FlagClear(FLAG_SPECIAL_FLAG_0x4000);
|
||||
FlagClear(FLAG_HIDE_MAP_NAME_POPUP);
|
||||
SetWarpDestinationToDynamicWarp(0);
|
||||
DoDiveWarp();
|
||||
DestroyTask(taskId);
|
||||
@@ -338,7 +338,7 @@ void sub_80FB7A4(void)
|
||||
{
|
||||
FlagSet(FLAG_SYS_CRUISE_MODE);
|
||||
FlagSet(FLAG_SPECIAL_FLAG_0x4001);
|
||||
FlagSet(FLAG_SPECIAL_FLAG_0x4000);
|
||||
FlagSet(FLAG_HIDE_MAP_NAME_POPUP);
|
||||
SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
|
||||
sub_80FB59C();
|
||||
sub_80AF8B8();
|
||||
|
||||
+10
-10
@@ -55,6 +55,7 @@
|
||||
#include "constants/vars.h"
|
||||
#include "constants/battle_frontier.h"
|
||||
#include "constants/weather.h"
|
||||
#include "palette.h"
|
||||
|
||||
EWRAM_DATA bool8 gBikeCyclingChallenge = FALSE;
|
||||
EWRAM_DATA u8 gBikeCollisions = 0;
|
||||
@@ -80,9 +81,6 @@ extern const u16 gEventObjectPalette17[];
|
||||
extern const u16 gEventObjectPalette33[];
|
||||
extern const u16 gEventObjectPalette34[];
|
||||
|
||||
extern void LoadPalette(const void *src, u32 offset, u16 size); // incorrect signature, needed to match
|
||||
extern void BlendPalettes(u32, u8, u16);
|
||||
extern void FieldInitRegionMap(MainCallback callback);
|
||||
|
||||
void UpdateMovedLilycoveFanClubMembers(void);
|
||||
void sub_813BF60(void);
|
||||
@@ -591,7 +589,9 @@ void SpawnLinkPartnerEventObject(void)
|
||||
|
||||
static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum)
|
||||
{
|
||||
paletteNum += 6;
|
||||
u8 adjustedPaletteNum;
|
||||
// Note: This temp var is necessary; paletteNum += 6 doesn't match.
|
||||
adjustedPaletteNum = paletteNum + 6;
|
||||
if (graphicsId == EVENT_OBJ_GFX_LINK_RS_BRENDAN ||
|
||||
graphicsId == EVENT_OBJ_GFX_LINK_RS_MAY ||
|
||||
graphicsId == EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL ||
|
||||
@@ -602,21 +602,21 @@ static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEvent
|
||||
{
|
||||
u8 spriteId = gEventObjects[obj].spriteId;
|
||||
struct Sprite *sprite = &gSprites[spriteId];
|
||||
sprite->oam.paletteNum = paletteNum;
|
||||
sprite->oam.paletteNum = adjustedPaletteNum;
|
||||
|
||||
switch (graphicsId)
|
||||
{
|
||||
case EVENT_OBJ_GFX_LINK_RS_BRENDAN:
|
||||
LoadPalette(gEventObjectPalette33, 0x100 + paletteNum * 16, 0x20);
|
||||
LoadPalette(gEventObjectPalette33, 0x100 + (adjustedPaletteNum << 4), 0x20);
|
||||
break;
|
||||
case EVENT_OBJ_GFX_LINK_RS_MAY:
|
||||
LoadPalette(gEventObjectPalette34, 0x100 + paletteNum * 16, 0x20);
|
||||
LoadPalette(gEventObjectPalette34, 0x100 + (adjustedPaletteNum << 4), 0x20);
|
||||
break;
|
||||
case EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL:
|
||||
LoadPalette(gEventObjectPalette8, 0x100 + paletteNum * 16, 0x20);
|
||||
LoadPalette(gEventObjectPalette8, 0x100 + (adjustedPaletteNum << 4), 0x20);
|
||||
break;
|
||||
case EVENT_OBJ_GFX_RIVAL_MAY_NORMAL:
|
||||
LoadPalette(gEventObjectPalette17, 0x100 + paletteNum * 16, 0x20);
|
||||
LoadPalette(gEventObjectPalette17, 0x100 + (adjustedPaletteNum << 4), 0x20);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -3379,7 +3379,7 @@ u16 get_unknown_box_id(void)
|
||||
return gUnknown_0203AB6F;
|
||||
}
|
||||
|
||||
bool32 sub_813B21C(void)
|
||||
bool8 sub_813B21C(void)
|
||||
{
|
||||
if (FlagGet(FLAG_SYS_STORAGE_UNKNOWN_FLAG) == FALSE)
|
||||
{
|
||||
|
||||
+14
-14
@@ -48,10 +48,10 @@ static const struct OamData gOamData_839A9DC =
|
||||
.objMode = 1,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 3,
|
||||
.paletteNum = 0,
|
||||
@@ -577,10 +577,10 @@ static const struct OamData gOamData_839AA68 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 2,
|
||||
.shape = SPRITE_SHAPE(16x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(16x32),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 2,
|
||||
@@ -648,10 +648,10 @@ static const struct OamData gOamData_839AAD4 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 0,
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
@@ -704,10 +704,10 @@ static const struct OamData gOamData_839AB2C =
|
||||
.objMode = 1,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 2,
|
||||
.paletteNum = 0,
|
||||
@@ -1517,10 +1517,10 @@ const struct OamData gOamData_839ABB8 =
|
||||
.objMode = 1,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 15,
|
||||
@@ -1754,10 +1754,10 @@ const struct OamData gOamData_839ABF0 =
|
||||
.objMode = 1,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 2,
|
||||
.paletteNum = 0,
|
||||
@@ -1953,10 +1953,10 @@ const struct OamData gOamData_839AC1C =
|
||||
.objMode = 1,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
|
||||
+2
-3
@@ -20,7 +20,6 @@
|
||||
#include "constants/field_effects.h"
|
||||
#include "constants/songs.h"
|
||||
|
||||
extern void ScriptUnfreezeEventObjects(void);
|
||||
extern bool8 IsMewPlayingHideAndSeek(void);
|
||||
|
||||
extern struct MapPosition gPlayerFacingPosition;
|
||||
@@ -133,10 +132,10 @@ static const struct OamData sOamData_CutGrass =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 0,
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileNum = 1,
|
||||
.priority = 1,
|
||||
.paletteNum = 1,
|
||||
|
||||
+4
-4
@@ -93,8 +93,8 @@ static const struct OamData gOamData_858E4D8 =
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.bpp = ST_OAM_4BPP,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
@@ -246,8 +246,8 @@ static const struct OamData gOamData_858E658 =
|
||||
.affineMode = ST_OAM_AFFINE_OFF,
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.bpp = ST_OAM_4BPP,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(16x32),
|
||||
.size = SPRITE_SIZE(16x32),
|
||||
.priority = 2,
|
||||
};
|
||||
|
||||
|
||||
+1
-4
@@ -35,8 +35,7 @@
|
||||
#include "constants/moves.h"
|
||||
#include "constants/items.h"
|
||||
#include "constants/event_objects.h"
|
||||
|
||||
extern u8 gSelectedOrderFromParty[];
|
||||
#include "party_menu.h"
|
||||
|
||||
struct FrontierBrainMon
|
||||
{
|
||||
@@ -48,8 +47,6 @@ struct FrontierBrainMon
|
||||
u16 moves[4];
|
||||
};
|
||||
|
||||
extern void sub_81B8558(void);
|
||||
|
||||
// This file's functions.
|
||||
static void sub_81A17A0(void);
|
||||
static void sub_81A1830(void);
|
||||
|
||||
+7
-7
@@ -4,10 +4,10 @@ const u32 gBattleTextboxTiles[] = INCBIN_U32("graphics/battle_interface/textbox.
|
||||
const u32 gBattleTextboxPalette[] = INCBIN_U32("graphics/battle_interface/textbox.gbapal.lz");
|
||||
const u32 gBattleTextboxTilemap[] = INCBIN_U32("graphics/battle_interface/textbox_map.bin.lz");
|
||||
|
||||
const u32 gMonStillFrontPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/front_pics/circled_question_mark_still_front_pic.4bpp.lz");
|
||||
const u32 gMonBackPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/back_pics/circled_question_mark_back_pic.4bpp.lz");
|
||||
const u32 gMonPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/palettes/circled_question_mark_palette.gbapal.lz");
|
||||
const u32 gMonShinyPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/palettes/circled_question_mark_shiny_palette.gbapal.lz");
|
||||
const u32 gMonStillFrontPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/front.4bpp.lz");
|
||||
const u32 gMonBackPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/back.4bpp.lz");
|
||||
const u32 gMonPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/normal.gbapal.lz");
|
||||
const u32 gMonShinyPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/circled_question_mark/shiny.gbapal.lz");
|
||||
|
||||
const u32 gUnusedGfx_OldCharmap[] = INCBIN_U32("graphics/unused/old_charmap.4bpp.lz"); // japanese table and bunch of stuff
|
||||
const u32 gUnusedTimemap_OldCharmap[] = INCBIN_U32("graphics/unused/old_charmap.bin.lz");
|
||||
@@ -953,8 +953,8 @@ const u32 gUnknownPal_C2F9E0[] = INCBIN_U32("graphics/unknown/unknown_C2F9E0.gba
|
||||
#include "data/graphics/pokemon.h"
|
||||
#include "data/graphics/trainers.h"
|
||||
|
||||
const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/icons/question_mark_icon.4bpp");
|
||||
const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/footprints/question_mark_footprint.1bpp");
|
||||
const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp");
|
||||
const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/footprint.1bpp");
|
||||
|
||||
const u32 gUnknown_08D778F0[] = INCBIN_U32("graphics/battle_transitions/vs_frame.4bpp.lz");
|
||||
const u32 gUnknown_08D779D8[] = INCBIN_U32("graphics/battle_transitions/vs_frame.bin.lz");
|
||||
@@ -1064,7 +1064,7 @@ const u32 gEnemyMonShadow_Gfx[] = INCBIN_U32("graphics/battle_interface/enemy_mo
|
||||
|
||||
const u32 gBattleInterface_BallStatusBarGfx[] = INCBIN_U32("graphics/battle_interface/ball_status_bar.4bpp.lz");
|
||||
|
||||
const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/icons/egg_icon.4bpp");
|
||||
const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/egg/icon.4bpp");
|
||||
|
||||
const u32 gBattleAnimBackgroundImage_02[] = INCBIN_U32("graphics/battle_anims/backgrounds/02.4bpp.lz");
|
||||
const u32 gBattleAnimBackgroundPalette_02[] = INCBIN_U32("graphics/battle_anims/backgrounds/02.gbapal.lz");
|
||||
|
||||
+2
-4
@@ -66,8 +66,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
|
||||
|
||||
#define HALL_OF_FAME_MAX_TEAMS 50
|
||||
|
||||
extern void ReturnFromHallOfFamePC(void);
|
||||
|
||||
// this file's functions
|
||||
static void ClearVramOamPltt_LoadHofPal(void);
|
||||
static void sub_8174F70(void);
|
||||
@@ -180,10 +178,10 @@ static const struct OamData sOamData_85E53FC =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 0,
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
|
||||
@@ -7,10 +7,6 @@
|
||||
#include "script_menu.h"
|
||||
#include "task.h"
|
||||
|
||||
extern void Overworld_PlaySpecialMapMusic(void);
|
||||
extern bool16 ScrSpecial_CreatePCMenu(void);
|
||||
extern void ScriptMenu_DisplayPCStartupPrompt(void);
|
||||
|
||||
static void ReshowPCMenuAfterHallOfFamePC(void);
|
||||
static void Task_WaitForPaletteFade(u8);
|
||||
|
||||
|
||||
@@ -21,30 +21,29 @@ struct HailStruct {
|
||||
};
|
||||
|
||||
static void sub_810B6C4(struct Sprite *);
|
||||
extern void sub_810B848(struct Sprite *);
|
||||
extern void AnimIcePunchSwirlingParticle(struct Sprite *);
|
||||
extern void AnimIceBeamParticle(struct Sprite *);
|
||||
extern void AnimIceEffectParticle(struct Sprite *);
|
||||
extern void AnimFlickerIceEffectParticle(struct Sprite *);
|
||||
extern void AnimSwirlingSnowball_Step1(struct Sprite *);
|
||||
extern void AnimSwirlingSnowball_Step2(struct Sprite *);
|
||||
extern void AnimSwirlingSnowball_Step3(struct Sprite *);
|
||||
extern void AnimSwirlingSnowball_End(struct Sprite *);
|
||||
extern void AnimMoveParticleBeyondTarget(struct Sprite *);
|
||||
extern void AnimWiggleParticleTowardsTarget(struct Sprite *);
|
||||
extern void AnimWaveFromCenterOfTarget(struct Sprite *);
|
||||
extern void InitSwirlingFogAnim(struct Sprite *);
|
||||
extern void AnimSwirlingFogAnim(struct Sprite *);
|
||||
extern void AnimThrowMistBall(struct Sprite *);
|
||||
extern void InitPoisonGasCloudAnim(struct Sprite *);
|
||||
extern void MovePoisonGasCloud(struct Sprite *);
|
||||
extern void AnimHailBegin(struct Sprite *);
|
||||
extern void AnimHailContinue(struct Sprite *);
|
||||
extern void sub_80A8EE4(struct Sprite *);
|
||||
extern void InitIceBallAnim(struct Sprite *);
|
||||
extern void AnimThrowIceBall(struct Sprite *);
|
||||
extern void InitIceBallParticle(struct Sprite *);
|
||||
extern void AnimIceBallParticle(struct Sprite *);
|
||||
void sub_810B848(struct Sprite *);
|
||||
void AnimIcePunchSwirlingParticle(struct Sprite *);
|
||||
void AnimIceBeamParticle(struct Sprite *);
|
||||
void AnimIceEffectParticle(struct Sprite *);
|
||||
void AnimFlickerIceEffectParticle(struct Sprite *);
|
||||
void AnimSwirlingSnowball_Step1(struct Sprite *);
|
||||
void AnimSwirlingSnowball_Step2(struct Sprite *);
|
||||
void AnimSwirlingSnowball_Step3(struct Sprite *);
|
||||
void AnimSwirlingSnowball_End(struct Sprite *);
|
||||
void AnimMoveParticleBeyondTarget(struct Sprite *);
|
||||
void AnimWiggleParticleTowardsTarget(struct Sprite *);
|
||||
void AnimWaveFromCenterOfTarget(struct Sprite *);
|
||||
void InitSwirlingFogAnim(struct Sprite *);
|
||||
void AnimSwirlingFogAnim(struct Sprite *);
|
||||
void AnimThrowMistBall(struct Sprite *);
|
||||
void InitPoisonGasCloudAnim(struct Sprite *);
|
||||
void MovePoisonGasCloud(struct Sprite *);
|
||||
void AnimHailBegin(struct Sprite *);
|
||||
void AnimHailContinue(struct Sprite *);
|
||||
void InitIceBallAnim(struct Sprite *);
|
||||
void AnimThrowIceBall(struct Sprite *);
|
||||
void InitIceBallParticle(struct Sprite *);
|
||||
void AnimIceBallParticle(struct Sprite *);
|
||||
void AnimTask_Haze2(u8);
|
||||
void AnimTask_OverlayFogTiles(u8);
|
||||
void AnimTask_Hail2(u8);
|
||||
|
||||
+30
-30
@@ -145,10 +145,10 @@ static const struct OamData gUnknown_085E4A94 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 1,
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
@@ -214,10 +214,10 @@ static const struct OamData gUnknown_085E4B28 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
@@ -251,10 +251,10 @@ static const struct OamData gUnknown_085E4B58 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
@@ -307,10 +307,10 @@ static const struct OamData gUnknown_085E4BBC =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
@@ -356,10 +356,10 @@ static const struct OamData gUnknown_085E4C14 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -441,10 +441,10 @@ static const struct OamData gUnknown_085E4CF0 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 2,
|
||||
.shape = SPRITE_SHAPE(16x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(16x32),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -481,10 +481,10 @@ static const struct OamData gUnknown_085E4D2C =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -572,10 +572,10 @@ static const struct OamData gUnknown_085E4DD4 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 1,
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -588,10 +588,10 @@ static const struct OamData gUnknown_085E4DDC =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 0,
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -604,10 +604,10 @@ static const struct OamData gUnknown_085E4DE4 =
|
||||
.objMode = 1,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 2,
|
||||
.shape = SPRITE_SHAPE(32x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(32x64),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -804,10 +804,10 @@ static const struct OamData gUnknown_085E4FB0 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 1,
|
||||
.shape = SPRITE_SHAPE(64x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x32),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -857,10 +857,10 @@ static const struct OamData gUnknown_085E501C =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -2427,7 +2427,7 @@ static void Task_IntroWaterDrops_1(u8 taskId)
|
||||
| BLDCNT_TGT2_BG3
|
||||
| BLDCNT_TGT2_OBJ
|
||||
| BLDCNT_TGT2_BD);
|
||||
SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[31]);
|
||||
SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropAlphaBlend[31]);
|
||||
SetGpuReg(REG_OFFSET_BLDY, 0);
|
||||
gTasks[taskId].data[1] = 0x40;
|
||||
gTasks[taskId].data[0]++;
|
||||
@@ -2439,11 +2439,11 @@ static void Task_IntroWaterDrops_1(u8 taskId)
|
||||
|
||||
gTasks[taskId].data[1]--;
|
||||
tmp = gTasks[taskId].data[1] / 2;
|
||||
SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[tmp]);
|
||||
SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropAlphaBlend[tmp]);
|
||||
}
|
||||
else
|
||||
{
|
||||
SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[0]);
|
||||
SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropAlphaBlend[0]);
|
||||
gTasks[taskId].data[1] = 0x10;
|
||||
gTasks[taskId].data[0]++;
|
||||
}
|
||||
@@ -2470,7 +2470,7 @@ static void Task_IntroWaterDrops_2(u8 taskId)
|
||||
| BLDCNT_TGT2_BG3
|
||||
| BLDCNT_TGT2_OBJ
|
||||
| BLDCNT_TGT2_BD);
|
||||
SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[0]);
|
||||
SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropAlphaBlend[0]);
|
||||
SetGpuReg(REG_OFFSET_BLDY, 0);
|
||||
gTasks[taskId].data[1] = 0;
|
||||
gTasks[taskId].data[0]++;
|
||||
@@ -2482,11 +2482,11 @@ static void Task_IntroWaterDrops_2(u8 taskId)
|
||||
|
||||
gTasks[taskId].data[1]++;
|
||||
tmp = gTasks[taskId].data[1] / 2;
|
||||
SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[tmp]);
|
||||
SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropAlphaBlend[tmp]);
|
||||
}
|
||||
else
|
||||
{
|
||||
SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropData[31]);
|
||||
SetGpuReg(REG_OFFSET_BLDALPHA, gIntroWaterDropAlphaBlend[31]);
|
||||
gTasks[taskId].data[1] = 0x10;
|
||||
gTasks[taskId].data[0]++;
|
||||
}
|
||||
|
||||
+500
-125
@@ -57,123 +57,380 @@ static void nullsub_65(struct Sprite *sprite);
|
||||
static void sub_817B7C4(struct Sprite *sprite);
|
||||
static void nullsub_66(struct Sprite *sprite);
|
||||
|
||||
static const struct SpriteTemplate gUnknown_085F504C = {
|
||||
2000, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817B62C
|
||||
static const struct SpriteTemplate gUnknown_085F504C =
|
||||
{
|
||||
.tileTag = 2000,
|
||||
.paletteTag = 0xFFFF,
|
||||
.oam = &gDummyOamData,
|
||||
.anims = gDummySpriteAnimTable,
|
||||
.images = NULL,
|
||||
.affineAnims = gDummySpriteAffineAnimTable,
|
||||
.callback = sub_817B62C
|
||||
};
|
||||
|
||||
static const struct CompressedSpriteSheet gUnknown_085F5064[] = {
|
||||
{ gUnknown_085F16A8, 0x400, 2000 },
|
||||
{ NULL }
|
||||
static const struct CompressedSpriteSheet gUnknown_085F5064[] =
|
||||
{
|
||||
{
|
||||
.data = gUnknown_085F16A8,
|
||||
.size = 0x400,
|
||||
.tag = 2000
|
||||
},
|
||||
{}
|
||||
};
|
||||
|
||||
static const union AnimCmd gUnknown_085F5074[] = {
|
||||
static const union AnimCmd gUnknown_085F5074[] =
|
||||
{
|
||||
ANIMCMD_FRAME( 0, 30),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd gUnknown_085F507C[] = {
|
||||
static const union AnimCmd gUnknown_085F507C[] =
|
||||
{
|
||||
ANIMCMD_FRAME(16, 30),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd gUnknown_085F5084[] = {
|
||||
static const union AnimCmd gUnknown_085F5084[] =
|
||||
{
|
||||
ANIMCMD_FRAME(20, 30),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd gUnknown_085F508C[] = {
|
||||
static const union AnimCmd gUnknown_085F508C[] =
|
||||
{
|
||||
ANIMCMD_FRAME(22, 30),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd *const gUnknown_085F5094[] = {
|
||||
static const union AnimCmd *const gUnknown_085F5094[] =
|
||||
{
|
||||
gUnknown_085F5074,
|
||||
gUnknown_085F507C,
|
||||
gUnknown_085F5084,
|
||||
gUnknown_085F508C
|
||||
};
|
||||
|
||||
static const struct IntroCreditsSpriteMetadata gUnknown_085F50A4[] = {
|
||||
{ 0, ST_OAM_SQUARE, 2, 72, 32, 100, 0xc00 },
|
||||
{ 0, ST_OAM_SQUARE, 2, 158, 32, 100, 0xc00 },
|
||||
{ 1, ST_OAM_SQUARE, 1, 192, 40, 101, 0x800 },
|
||||
{ 1, ST_OAM_SQUARE, 1, 56, 40, 101, 0x800 },
|
||||
{ 2, ST_OAM_H_RECTANGLE, 0, 100, 44, 102, 0x400 },
|
||||
{ 2, ST_OAM_H_RECTANGLE, 0, 152, 44, 102, 0x400 },
|
||||
{ 3, ST_OAM_H_RECTANGLE, 0, 8, 46, 103, 0x100 },
|
||||
{ 3, ST_OAM_H_RECTANGLE, 0, 56, 46, 103, 0x100 },
|
||||
{ 3, ST_OAM_H_RECTANGLE, 0, 240, 46, 103, 0x100 },
|
||||
static const struct IntroCreditsSpriteMetadata gUnknown_085F50A4[] =
|
||||
{
|
||||
{
|
||||
.animNum = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.x = 72,
|
||||
.y = 32,
|
||||
.subpriority = 100,
|
||||
.xOff = 0xc00
|
||||
},
|
||||
{
|
||||
.animNum = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.x = 158,
|
||||
.y = 32,
|
||||
.subpriority = 100,
|
||||
.xOff = 0xc00
|
||||
},
|
||||
{
|
||||
.animNum = 1,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.x = 192,
|
||||
.y = 40,
|
||||
.subpriority = 101,
|
||||
.xOff = 0x800
|
||||
},
|
||||
{
|
||||
.animNum = 1,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.x = 56,
|
||||
.y = 40,
|
||||
.subpriority = 101,
|
||||
.xOff = 0x800
|
||||
},
|
||||
{
|
||||
.animNum = 2,
|
||||
.shape = SPRITE_SHAPE(16x8),
|
||||
.size = SPRITE_SIZE(16x8),
|
||||
.x = 100,
|
||||
.y = 44,
|
||||
.subpriority = 102,
|
||||
.xOff = 0x400
|
||||
},
|
||||
{
|
||||
.animNum = 2,
|
||||
.shape = SPRITE_SHAPE(16x8),
|
||||
.size = SPRITE_SIZE(16x8),
|
||||
.x = 152,
|
||||
.y = 44,
|
||||
.subpriority = 102,
|
||||
.xOff = 0x400
|
||||
},
|
||||
{
|
||||
.animNum = 3,
|
||||
.shape = SPRITE_SHAPE(16x8),
|
||||
.size = SPRITE_SIZE(16x8),
|
||||
.x = 8,
|
||||
.y = 46,
|
||||
.subpriority = 103,
|
||||
.xOff = 0x100
|
||||
},
|
||||
{
|
||||
.animNum = 3,
|
||||
.shape = SPRITE_SHAPE(16x8),
|
||||
.size = SPRITE_SIZE(16x8),
|
||||
.x = 56,
|
||||
.y = 46,
|
||||
.subpriority = 103,
|
||||
.xOff = 0x100
|
||||
},
|
||||
{
|
||||
.animNum = 3,
|
||||
.shape = SPRITE_SHAPE(16x8),
|
||||
.size = SPRITE_SIZE(16x8),
|
||||
.x = 240,
|
||||
.y = 46,
|
||||
.subpriority = 103,
|
||||
.xOff = 0x100
|
||||
},
|
||||
};
|
||||
|
||||
static const struct CompressedSpriteSheet gUnknown_085F50EC[] = {
|
||||
{ gIntro2TreeTiles, 0x400, 2000 },
|
||||
{ NULL }
|
||||
static const struct CompressedSpriteSheet gUnknown_085F50EC[] =
|
||||
{
|
||||
{
|
||||
.data = gIntro2TreeTiles,
|
||||
.size = 0x400,
|
||||
.tag = 2000
|
||||
},
|
||||
{}
|
||||
};
|
||||
|
||||
static const union AnimCmd gUnknown_085F50FC[] = {
|
||||
static const union AnimCmd gUnknown_085F50FC[] =
|
||||
{
|
||||
ANIMCMD_FRAME( 0, 30),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd gUnknown_085F5104[] = {
|
||||
static const union AnimCmd gUnknown_085F5104[] =
|
||||
{
|
||||
ANIMCMD_FRAME(16, 30),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd gUnknown_085F510C[] = {
|
||||
static const union AnimCmd gUnknown_085F510C[] =
|
||||
{
|
||||
ANIMCMD_FRAME(24, 30),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd *const gUnknown_085F5114[] = {
|
||||
static const union AnimCmd *const gUnknown_085F5114[] =
|
||||
{
|
||||
gUnknown_085F50FC,
|
||||
gUnknown_085F5104,
|
||||
gUnknown_085F510C
|
||||
};
|
||||
|
||||
static const struct IntroCreditsSpriteMetadata gUnknown_085F5120[] = {
|
||||
{ 0, ST_OAM_SQUARE, 2, 16, 88, 100, 0x2000 },
|
||||
{ 0, ST_OAM_SQUARE, 2, 80, 88, 100, 0x2000 },
|
||||
{ 0, ST_OAM_SQUARE, 2, 144, 88, 100, 0x2000 },
|
||||
{ 0, ST_OAM_SQUARE, 2, 208, 88, 100, 0x2000 },
|
||||
{ 1, ST_OAM_V_RECTANGLE, 2, 40, 88, 101, 0x1000 },
|
||||
{ 1, ST_OAM_V_RECTANGLE, 2, 104, 88, 101, 0x1000 },
|
||||
{ 1, ST_OAM_V_RECTANGLE, 2, 168, 88, 101, 0x1000 },
|
||||
{ 1, ST_OAM_V_RECTANGLE, 2, 232, 88, 101, 0x1000 },
|
||||
{ 2, ST_OAM_V_RECTANGLE, 2, 56, 88, 102, 0x800 },
|
||||
{ 2, ST_OAM_V_RECTANGLE, 2, 120, 88, 102, 0x800 },
|
||||
{ 2, ST_OAM_V_RECTANGLE, 2, 184, 88, 102, 0x800 },
|
||||
{ 2, ST_OAM_V_RECTANGLE, 2, 248, 88, 102, 0x800 },
|
||||
static const struct IntroCreditsSpriteMetadata gUnknown_085F5120[] =
|
||||
{
|
||||
{
|
||||
.animNum = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.x = 16,
|
||||
.y = 88,
|
||||
.subpriority = 100,
|
||||
.xOff = 0x2000,
|
||||
},
|
||||
{
|
||||
.animNum = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.x = 80,
|
||||
.y = 88,
|
||||
.subpriority = 100,
|
||||
.xOff = 0x2000,
|
||||
},
|
||||
{
|
||||
.animNum = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.x = 144,
|
||||
.y = 88,
|
||||
.subpriority = 100,
|
||||
.xOff = 0x2000,
|
||||
},
|
||||
{
|
||||
.animNum = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.x = 208,
|
||||
.y = 88,
|
||||
.subpriority = 100,
|
||||
.xOff = 0x2000,
|
||||
},
|
||||
{
|
||||
.animNum = 1,
|
||||
.shape = SPRITE_SHAPE(16x32),
|
||||
.size = SPRITE_SIZE(16x32),
|
||||
.x = 40,
|
||||
.y = 88,
|
||||
.subpriority = 101,
|
||||
.xOff = 0x1000,
|
||||
},
|
||||
{
|
||||
.animNum = 1,
|
||||
.shape = SPRITE_SHAPE(16x32),
|
||||
.size = SPRITE_SIZE(16x32),
|
||||
.x = 104,
|
||||
.y = 88,
|
||||
.subpriority = 101,
|
||||
.xOff = 0x1000,
|
||||
},
|
||||
{
|
||||
.animNum = 1,
|
||||
.shape = SPRITE_SHAPE(16x32),
|
||||
.size = SPRITE_SIZE(16x32),
|
||||
.x = 168,
|
||||
.y = 88,
|
||||
.subpriority = 101,
|
||||
.xOff = 0x1000,
|
||||
},
|
||||
{
|
||||
.animNum = 1,
|
||||
.shape = SPRITE_SHAPE(16x32),
|
||||
.size = SPRITE_SIZE(16x32),
|
||||
.x = 232,
|
||||
.y = 88,
|
||||
.subpriority = 101,
|
||||
.xOff = 0x1000,
|
||||
},
|
||||
{
|
||||
.animNum = 2,
|
||||
.shape = SPRITE_SHAPE(16x32),
|
||||
.size = SPRITE_SIZE(16x32),
|
||||
.x = 56,
|
||||
.y = 88,
|
||||
.subpriority = 102,
|
||||
.xOff = 0x800,
|
||||
},
|
||||
{
|
||||
.animNum = 2,
|
||||
.shape = SPRITE_SHAPE(16x32),
|
||||
.size = SPRITE_SIZE(16x32),
|
||||
.x = 120,
|
||||
.y = 88,
|
||||
.subpriority = 102,
|
||||
.xOff = 0x800,
|
||||
},
|
||||
{
|
||||
.animNum = 2,
|
||||
.shape = SPRITE_SHAPE(16x32),
|
||||
.size = SPRITE_SIZE(16x32),
|
||||
.x = 184,
|
||||
.y = 88,
|
||||
.subpriority = 102,
|
||||
.xOff = 0x800,
|
||||
},
|
||||
{
|
||||
.animNum = 2,
|
||||
.shape = SPRITE_SHAPE(16x32),
|
||||
.size = SPRITE_SIZE(16x32),
|
||||
.x = 248,
|
||||
.y = 88,
|
||||
.subpriority = 102,
|
||||
.xOff = 0x800,
|
||||
}
|
||||
};
|
||||
|
||||
static const struct CompressedSpriteSheet gUnknown_085F5180[] = {
|
||||
{ gIntro2NightTiles, 0x400, 2000 },
|
||||
{ NULL }
|
||||
static const struct CompressedSpriteSheet gUnknown_085F5180[] =
|
||||
{
|
||||
{
|
||||
.data = gIntro2NightTiles,
|
||||
.size = 0x400,
|
||||
.tag = 2000
|
||||
},
|
||||
{}
|
||||
};
|
||||
|
||||
static const union AnimCmd gUnknown_085F5190[] = {
|
||||
static const union AnimCmd gUnknown_085F5190[] =
|
||||
{
|
||||
ANIMCMD_FRAME(0, 30),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd *const gUnknown_085F5198[] = {
|
||||
static const union AnimCmd *const gUnknown_085F5198[] =
|
||||
{
|
||||
gUnknown_085F5190
|
||||
};
|
||||
|
||||
static const struct IntroCreditsSpriteMetadata gUnknown_085F519C[] = {
|
||||
{ 0, ST_OAM_SQUARE, 2, 24, 88, 100, 0x1000 },
|
||||
{ 0, ST_OAM_SQUARE, 2, 64, 88, 100, 0x1000 },
|
||||
{ 0, ST_OAM_SQUARE, 2, 104, 88, 100, 0x1000 },
|
||||
{ 0, ST_OAM_SQUARE, 2, 144, 88, 100, 0x1000 },
|
||||
{ 0, ST_OAM_SQUARE, 2, 184, 88, 100, 0x1000 },
|
||||
{ 0, ST_OAM_SQUARE, 2, 224, 88, 100, 0x1000 },
|
||||
static const struct IntroCreditsSpriteMetadata gUnknown_085F519C[] =
|
||||
{
|
||||
{
|
||||
.animNum = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.x = 24,
|
||||
.y = 88,
|
||||
.subpriority = 100,
|
||||
.xOff = 0x1000,
|
||||
},
|
||||
{
|
||||
.animNum = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.x = 64,
|
||||
.y = 88,
|
||||
.subpriority = 100,
|
||||
.xOff = 0x1000,
|
||||
},
|
||||
{
|
||||
.animNum = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.x = 104,
|
||||
.y = 88,
|
||||
.subpriority = 100,
|
||||
.xOff = 0x1000,
|
||||
},
|
||||
{
|
||||
.animNum = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.x = 144,
|
||||
.y = 88,
|
||||
.subpriority = 100,
|
||||
.xOff = 0x1000,
|
||||
},
|
||||
{
|
||||
.animNum = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.x = 184,
|
||||
.y = 88,
|
||||
.subpriority = 100,
|
||||
.xOff = 0x1000,
|
||||
},
|
||||
{
|
||||
.animNum = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.x = 224,
|
||||
.y = 88,
|
||||
.subpriority = 100,
|
||||
.xOff = 0x1000,
|
||||
}
|
||||
};
|
||||
|
||||
static const struct OamData gOamData_85F51CC = {
|
||||
.y = 160, .shape = ST_OAM_SQUARE, .size = 3, .priority = 1
|
||||
static const struct OamData gOamData_85F51CC =
|
||||
{
|
||||
.y = 160,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.priority = 1
|
||||
};
|
||||
|
||||
static const union AnimCmd gUnknown_085F51D4[] = {
|
||||
static const union AnimCmd gUnknown_085F51D4[] =
|
||||
{
|
||||
ANIMCMD_FRAME( 0, 8),
|
||||
ANIMCMD_FRAME( 64, 8),
|
||||
ANIMCMD_FRAME(128, 8),
|
||||
@@ -181,23 +438,43 @@ static const union AnimCmd gUnknown_085F51D4[] = {
|
||||
ANIMCMD_JUMP(0)
|
||||
};
|
||||
|
||||
static const union AnimCmd *const gUnknown_085F51E8[] = {
|
||||
static const union AnimCmd *const gUnknown_085F51E8[] =
|
||||
{
|
||||
gUnknown_085F51D4
|
||||
};
|
||||
|
||||
static const struct SpriteTemplate gUnknown_085F51EC = {
|
||||
1002, 1002, &gOamData_85F51CC, gUnknown_085F51E8, NULL, gDummySpriteAffineAnimTable, nullsub_65
|
||||
static const struct SpriteTemplate gUnknown_085F51EC =
|
||||
{
|
||||
.tileTag = 1002,
|
||||
.paletteTag = 1002,
|
||||
.oam = &gOamData_85F51CC,
|
||||
.anims = gUnknown_085F51E8,
|
||||
.images = NULL,
|
||||
.affineAnims = gDummySpriteAffineAnimTable,
|
||||
.callback = nullsub_65
|
||||
};
|
||||
|
||||
static const struct SpriteTemplate gUnknown_085F5204 = {
|
||||
1003, 1003, &gOamData_85F51CC, gUnknown_085F51E8, NULL, gDummySpriteAffineAnimTable, nullsub_65
|
||||
static const struct SpriteTemplate gUnknown_085F5204 =
|
||||
{
|
||||
.tileTag = 1003,
|
||||
.paletteTag = 1003,
|
||||
.oam = &gOamData_85F51CC,
|
||||
.anims = gUnknown_085F51E8,
|
||||
.images = NULL,
|
||||
.affineAnims = gDummySpriteAffineAnimTable,
|
||||
.callback = nullsub_65
|
||||
};
|
||||
|
||||
static const struct OamData gUnknown_085F521C = {
|
||||
.y = 160, .shape = ST_OAM_H_RECTANGLE, .size = 3, .priority = 1
|
||||
static const struct OamData gUnknown_085F521C =
|
||||
{
|
||||
.y = 160,
|
||||
.shape = SPRITE_SHAPE(64x32),
|
||||
.size = SPRITE_SIZE(64x32),
|
||||
.priority = 1
|
||||
};
|
||||
|
||||
static const union AnimCmd gUnknown_085F5224[] = {
|
||||
static const union AnimCmd gUnknown_085F5224[] =
|
||||
{
|
||||
ANIMCMD_FRAME( 0, 8),
|
||||
ANIMCMD_FRAME( 32, 8),
|
||||
ANIMCMD_FRAME( 64, 8),
|
||||
@@ -205,119 +482,217 @@ static const union AnimCmd gUnknown_085F5224[] = {
|
||||
ANIMCMD_JUMP(0)
|
||||
};
|
||||
|
||||
static const union AnimCmd *const gUnknown_085F5238[] = {
|
||||
static const union AnimCmd *const gUnknown_085F5238[] =
|
||||
{
|
||||
gUnknown_085F5224
|
||||
};
|
||||
|
||||
static const struct SpriteTemplate gUnknown_085F523C = {
|
||||
1001, 1002, &gUnknown_085F521C, gUnknown_085F5238, NULL, gDummySpriteAffineAnimTable, sub_817B7C4
|
||||
static const struct SpriteTemplate gUnknown_085F523C =
|
||||
{
|
||||
.tileTag = 1001,
|
||||
.paletteTag = 1002,
|
||||
.oam = &gUnknown_085F521C,
|
||||
.anims = gUnknown_085F5238,
|
||||
.images = NULL,
|
||||
.affineAnims = gDummySpriteAffineAnimTable,
|
||||
.callback = sub_817B7C4
|
||||
};
|
||||
|
||||
static const struct SpriteTemplate gUnknown_085F5254 = {
|
||||
1001, 1003, &gUnknown_085F521C, gUnknown_085F5238, NULL, gDummySpriteAffineAnimTable, sub_817B7C4
|
||||
static const struct SpriteTemplate gUnknown_085F5254 =
|
||||
{
|
||||
.tileTag = 1001,
|
||||
.paletteTag = 1003,
|
||||
.oam = &gUnknown_085F521C,
|
||||
.anims = gUnknown_085F5238,
|
||||
.images = NULL,
|
||||
.affineAnims = gDummySpriteAffineAnimTable,
|
||||
.callback = sub_817B7C4
|
||||
};
|
||||
|
||||
static const struct OamData gUnknown_085F526C = {
|
||||
.y = 160, .shape = ST_OAM_SQUARE, .size = 3, .priority = 1
|
||||
static const struct OamData gUnknown_085F526C =
|
||||
{
|
||||
.y = 160,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.priority = 1
|
||||
};
|
||||
|
||||
static const union AnimCmd gUnknown_085F5274[] = {
|
||||
static const union AnimCmd gUnknown_085F5274[] =
|
||||
{
|
||||
ANIMCMD_FRAME( 0, 16),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd gUnknown_085F527C[] = {
|
||||
static const union AnimCmd gUnknown_085F527C[] =
|
||||
{
|
||||
ANIMCMD_FRAME( 64, 16),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd *const gUnknown_085F5284[] = {
|
||||
static const union AnimCmd *const gUnknown_085F5284[] =
|
||||
{
|
||||
gUnknown_085F5274,
|
||||
gUnknown_085F527C
|
||||
};
|
||||
|
||||
static const struct SpriteTemplate gUnknown_085F528C = {
|
||||
1004, 1004, &gUnknown_085F526C, gUnknown_085F5284, NULL, gDummySpriteAffineAnimTable, nullsub_66
|
||||
static const struct SpriteTemplate gUnknown_085F528C =
|
||||
{
|
||||
.tileTag = 1004,
|
||||
.paletteTag = 1004,
|
||||
.oam = &gUnknown_085F526C,
|
||||
.anims = gUnknown_085F5284,
|
||||
.images = NULL,
|
||||
.affineAnims = gDummySpriteAffineAnimTable,
|
||||
.callback = nullsub_66
|
||||
};
|
||||
|
||||
static const struct SpriteTemplate gUnknown_085F52A4 = {
|
||||
1005, 1005, &gUnknown_085F526C, gUnknown_085F5284, NULL, gDummySpriteAffineAnimTable, nullsub_66
|
||||
static const struct SpriteTemplate gUnknown_085F52A4 =
|
||||
{
|
||||
.tileTag = 1005,
|
||||
.paletteTag = 1005,
|
||||
.oam = &gUnknown_085F526C,
|
||||
.anims = gUnknown_085F5284,
|
||||
.images = NULL,
|
||||
.affineAnims = gDummySpriteAffineAnimTable,
|
||||
.callback = nullsub_66
|
||||
};
|
||||
|
||||
const struct CompressedSpriteSheet gIntro2BrendanSpriteSheet[] = {
|
||||
{ gIntro2BrendanNoTurnGfx, 0x2000, 1002 },
|
||||
{ NULL }
|
||||
const struct CompressedSpriteSheet gIntro2BrendanSpriteSheet[] =
|
||||
{
|
||||
{
|
||||
.data = gIntro2BrendanNoTurnGfx,
|
||||
.size = 0x2000,
|
||||
.tag = 1002
|
||||
},
|
||||
{}
|
||||
};
|
||||
|
||||
const struct CompressedSpriteSheet gIntro2MaySpriteSheet[] = {
|
||||
{ gIntro2MayNoTurnGfx, 0x2000, 1003 },
|
||||
{ NULL }
|
||||
const struct CompressedSpriteSheet gIntro2MaySpriteSheet[] =
|
||||
{
|
||||
{
|
||||
.data = gIntro2MayNoTurnGfx,
|
||||
.size = 0x2000,
|
||||
.tag = 1003
|
||||
},
|
||||
{}
|
||||
};
|
||||
|
||||
const struct CompressedSpriteSheet gIntro2BicycleSpriteSheet[] = {
|
||||
{ gIntro2BicycleTiles, 0x1000, 1001 },
|
||||
{ NULL }
|
||||
const struct CompressedSpriteSheet gIntro2BicycleSpriteSheet[] =
|
||||
{
|
||||
{
|
||||
.data = gIntro2BicycleTiles,
|
||||
.size = 0x1000,
|
||||
.tag = 1001
|
||||
},
|
||||
{}
|
||||
};
|
||||
|
||||
static const struct CompressedSpriteSheet gUnknown_085F52EC[] = {
|
||||
{ gIntro2FlygonGfx, 0x1000, 1004 },
|
||||
{ NULL }
|
||||
static const struct CompressedSpriteSheet gUnknown_085F52EC[] =
|
||||
{
|
||||
{
|
||||
.data = gIntro2FlygonGfx,
|
||||
.size = 0x1000,
|
||||
.tag = 1004
|
||||
},
|
||||
{}
|
||||
};
|
||||
|
||||
const struct CompressedSpriteSheet gIntro2FlygonSpriteSheet[] = {
|
||||
{ gIntro2FlygonGfx, 0x1000, 1005 },
|
||||
{ NULL }
|
||||
const struct CompressedSpriteSheet gIntro2FlygonSpriteSheet[] =
|
||||
{
|
||||
{
|
||||
.data = gIntro2FlygonGfx,
|
||||
.size = 0x1000,
|
||||
.tag = 1005
|
||||
},
|
||||
{}
|
||||
};
|
||||
|
||||
const struct SpritePalette gIntroBikeAndFlygonPalette[] = {
|
||||
{ gIntro2BrendanNoTurnPal, 1002 },
|
||||
{ gIntro2BrendanNoTurnPal, 1003 },
|
||||
{ gIntro2FlygonPal, 1004 },
|
||||
{ gIntro2FlygonPal, 1005 },
|
||||
{ NULL }
|
||||
const struct SpritePalette gIntroBikeAndFlygonPalette[] =
|
||||
{
|
||||
{ .data = gIntro2BrendanNoTurnPal, .tag = 1002 },
|
||||
{ .data = gIntro2BrendanNoTurnPal, .tag = 1003 },
|
||||
{ .data = gIntro2FlygonPal, .tag = 1004 },
|
||||
{ .data = gIntro2FlygonPal, .tag = 1005 },
|
||||
{}
|
||||
};
|
||||
|
||||
const struct CompressedSpriteSheet gUnknown_085F5334[] = {
|
||||
{ gIntro2BrendanTiles, 0x3800, 1002 },
|
||||
{ NULL }
|
||||
const struct CompressedSpriteSheet gUnknown_085F5334[] =
|
||||
{
|
||||
{
|
||||
.data = gIntro2BrendanTiles,
|
||||
.size = 0x3800,
|
||||
.tag = 1002
|
||||
},
|
||||
{}
|
||||
};
|
||||
|
||||
const struct CompressedSpriteSheet gUnknown_085F5344[] = {
|
||||
{ gIntro2MayTiles, 0x3800, 1003 },
|
||||
{ NULL }
|
||||
const struct CompressedSpriteSheet gUnknown_085F5344[] =
|
||||
{
|
||||
{
|
||||
.data = gIntro2MayTiles,
|
||||
.size = 0x3800,
|
||||
.tag = 1003
|
||||
},
|
||||
{}
|
||||
};
|
||||
|
||||
const struct CompressedSpriteSheet gUnknown_085F5354[] = {
|
||||
{ gIntro2BicycleTiles, 0x1000, 1001 },
|
||||
{ NULL }
|
||||
const struct CompressedSpriteSheet gUnknown_085F5354[] =
|
||||
{
|
||||
{
|
||||
.data = gIntro2BicycleTiles,
|
||||
.size = 0x1000,
|
||||
.tag = 1001
|
||||
},
|
||||
{}
|
||||
};
|
||||
|
||||
static const struct CompressedSpriteSheet gUnknown_085F5364[] = {
|
||||
{ gIntro2LatiosTiles, 0x1000, 1004 },
|
||||
{ NULL }
|
||||
static const struct CompressedSpriteSheet gUnknown_085F5364[] =
|
||||
{
|
||||
{
|
||||
.data = gIntro2LatiosTiles,
|
||||
.size = 0x1000,
|
||||
.tag = 1004
|
||||
},
|
||||
{}
|
||||
};
|
||||
|
||||
static const struct CompressedSpriteSheet gUnknown_085F5374[] = {
|
||||
{ gIntro2LatiasTiles, 0x1000, 1005 },
|
||||
{ NULL }
|
||||
static const struct CompressedSpriteSheet gUnknown_085F5374[] =
|
||||
{
|
||||
{
|
||||
.data = gIntro2LatiasTiles,
|
||||
.size = 0x1000,
|
||||
.tag = 1005
|
||||
},
|
||||
{}
|
||||
};
|
||||
|
||||
const struct SpritePalette gUnknown_085F5384[] = {
|
||||
{ gIntro2BrendanPalette, 1002 },
|
||||
{ gIntro2MayPalette, 1003 },
|
||||
{ gIntro2LatiosPalette, 1004 },
|
||||
{ gIntro2LatiasPalette, 1005 },
|
||||
{ NULL }
|
||||
const struct SpritePalette gUnknown_085F5384[] =
|
||||
{
|
||||
{ .data = gIntro2BrendanPalette, .tag = 1002 },
|
||||
{ .data = gIntro2MayPalette, .tag = 1003 },
|
||||
{ .data = gIntro2LatiosPalette, .tag = 1004 },
|
||||
{ .data = gIntro2LatiasPalette, .tag = 1005 },
|
||||
{}
|
||||
};
|
||||
|
||||
const struct CompressedSpriteSheet gUnknown_085F53AC[] = {
|
||||
{ gIntro2BrendanTiles, 0x2000, 1002},
|
||||
{ NULL }
|
||||
const struct CompressedSpriteSheet gUnknown_085F53AC[] =
|
||||
{
|
||||
{
|
||||
.data = gIntro2BrendanTiles,
|
||||
.size = 0x2000,
|
||||
.tag = 1002
|
||||
},
|
||||
{}
|
||||
};
|
||||
|
||||
const struct CompressedSpriteSheet gUnknown_085F53BC[] = {
|
||||
{ gIntro2MayTiles, 0x2000, 1003},
|
||||
{ NULL }
|
||||
const struct CompressedSpriteSheet gUnknown_085F53BC[] =
|
||||
{
|
||||
{
|
||||
.data = gIntro2MayTiles,
|
||||
.size = 0x2000,
|
||||
.tag = 1003
|
||||
},
|
||||
{}
|
||||
};
|
||||
|
||||
EWRAM_DATA u16 gUnknown_0203BD24 = 0;
|
||||
|
||||
+2
-2
@@ -20,10 +20,10 @@ static const struct OamData sOamData_ItemIcon =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 2,
|
||||
|
||||
+1
-2
@@ -141,7 +141,6 @@ void unknown_ItemMenu_Confirm2(u8 taskId);
|
||||
void unknown_item_menu_type(u8 taskId);
|
||||
void item_menu_type_2(u8 taskId);
|
||||
void display_sell_item_ask_str(u8 taskId);
|
||||
void unknown_ItemMenu_Confirm(u8 taskId);
|
||||
void display_deposit_item_ask_str(u8 taskId);
|
||||
void item_menu_type_b(u8 taskId);
|
||||
void BagMenuActuallyToss(u8 taskId);
|
||||
@@ -476,7 +475,7 @@ void CB2_ChooseBerry(void)
|
||||
GoToBagMenu(RETURN_LOCATION_FIELD_2, BERRIES_POCKET, CB2_ReturnToFieldContinueScript);
|
||||
}
|
||||
|
||||
void sub_81AABF0(void(*callback)(void))
|
||||
void sub_81AABF0(void (*callback)(void))
|
||||
{
|
||||
GoToBagMenu(RETURN_LOCATION_FIELD_3, BERRIES_POCKET, callback);
|
||||
}
|
||||
|
||||
+10
-10
@@ -36,10 +36,10 @@ static const struct OamData sOamData_857FAA4 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
@@ -146,10 +146,10 @@ static const struct OamData sOamData_857FB64 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.x = 0,
|
||||
.matrixNum = 4,
|
||||
.size = 1,
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.tileNum = 0,
|
||||
.priority = 2,
|
||||
.paletteNum = 0,
|
||||
@@ -217,10 +217,10 @@ static const struct OamData sOamData_857FBC8 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 7,
|
||||
@@ -234,10 +234,10 @@ static const struct OamData sOamData_857FBD0 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 7,
|
||||
@@ -374,10 +374,10 @@ static const struct OamData sOamData_857FDFC =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
|
||||
+9
-23
@@ -8,13 +8,15 @@
|
||||
#include "coins.h"
|
||||
#include "data2.h"
|
||||
#include "event_data.h"
|
||||
#include "fieldmap.h"
|
||||
#include "event_object_movement.h"
|
||||
#include "fieldmap.h"
|
||||
#include "field_effect.h"
|
||||
#include "field_player_avatar.h"
|
||||
#include "field_screen_effect.h"
|
||||
#include "field_weather.h"
|
||||
#include "item.h"
|
||||
#include "item_menu.h"
|
||||
#include "item_use.h"
|
||||
#include "mail.h"
|
||||
#include "main.h"
|
||||
#include "menu.h"
|
||||
@@ -37,31 +39,15 @@
|
||||
#include "constants/items.h"
|
||||
#include "constants/songs.h"
|
||||
#include "constants/vars.h"
|
||||
#include "event_obj_lock.h"
|
||||
|
||||
extern void unknown_ItemMenu_Confirm(u8 taskId);
|
||||
extern void sub_81C5B14(u8 taskId);
|
||||
extern void ScriptUnfreezeEventObjects(void);
|
||||
extern void ItemUseOutOfBattle_TMHM(u8 a);
|
||||
extern void ItemUseOutOfBattle_EvolutionStone(u8 b);
|
||||
extern bool8 IsPlayerFacingSurfableFishableWater(void);
|
||||
extern bool8 sub_81221AC(void);
|
||||
extern u8 Route102_EventScript_274482[];
|
||||
extern u8 Route102_EventScript_2744C0[];
|
||||
extern u8 BattleFrontier_OutsideEast_EventScript_242CFC[];
|
||||
extern int sub_80247BC(void);
|
||||
extern struct MapHeader* mapconnection_get_mapheader(struct MapConnection *connection);
|
||||
extern void SetUpItemUseCallback(u8 taskId);
|
||||
extern void ItemUseCB_Medicine(u8, TaskFunc);
|
||||
extern void bag_menu_yes_no(u8, u8, const struct YesNoFuncTable*);
|
||||
extern void sub_81C5924(void);
|
||||
extern void sub_81C59BC(void);
|
||||
extern void sub_81AB9A8(u8);
|
||||
extern void StartEscapeRopeFieldEffect(void);
|
||||
extern u8* sub_806CF78(u16);
|
||||
extern void sub_81B89F0(void);
|
||||
extern u8 GetItemEffectType(u16);
|
||||
extern struct MapConnection *sub_8088A8C(s16, s16);
|
||||
|
||||
extern s32 sub_80247BC(void);
|
||||
|
||||
void SetUpItemUseCallback(u8 taskId);
|
||||
void MapPostLoadHook_UseItem(void);
|
||||
void sub_80AF6D4(void);
|
||||
void Task_CallItemUseOnFieldCallback(u8 taskId);
|
||||
@@ -404,12 +390,12 @@ bool8 sub_80FD6D4(const struct MapEvents *events, s16 x, s16 y)
|
||||
|
||||
bool8 sub_80FD730(struct MapConnection *connection, int x, int y)
|
||||
{
|
||||
struct MapHeader *mapHeader;
|
||||
|
||||
u16 localX, localY;
|
||||
u32 localOffset;
|
||||
s32 localLength;
|
||||
|
||||
mapHeader = mapconnection_get_mapheader(connection);
|
||||
struct MapHeader const *const mapHeader = mapconnection_get_mapheader(connection);
|
||||
|
||||
switch (connection->direction)
|
||||
{
|
||||
|
||||
+1
-1
@@ -1893,7 +1893,7 @@ u32 GetLinkRecvQueueLength(void)
|
||||
return gLink.recvQueue.count;
|
||||
}
|
||||
|
||||
bool8 sub_800B504(void)
|
||||
bool32 sub_800B504(void)
|
||||
{
|
||||
if (GetLinkRecvQueueLength() > 2)
|
||||
{
|
||||
|
||||
+3
-2
@@ -17,9 +17,9 @@
|
||||
#include "text.h"
|
||||
#include "constants/species.h"
|
||||
#include "save.h"
|
||||
#include "rom_8011DC0.h"
|
||||
|
||||
extern u16 gHeldKeyCodeToSend;
|
||||
extern void nullsub_89(u8 taskId);
|
||||
|
||||
struct UnkRfuStruct_1 gUnknown_03004140;
|
||||
struct UnkRfuStruct_2 gUnknown_03005000;
|
||||
@@ -155,7 +155,8 @@ const u8 sWireless_RSEtoASCIITable[] = {
|
||||
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00
|
||||
};
|
||||
const struct OamData sWirelessStatusIndicatorOamData = {
|
||||
.size = 1
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.size = SPRITE_SIZE(16x16)
|
||||
};
|
||||
static const union AnimCmd sWirelessStatusIndicatorAnim0[] = {
|
||||
// 3 bars
|
||||
|
||||
+20
-20
@@ -129,10 +129,10 @@ static const struct OamData sOamData_ScrollArrowIndicator =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 1,
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -186,8 +186,8 @@ static const struct Subsprite sSubsprite_RedOutline1 =
|
||||
{
|
||||
.x = 0,
|
||||
.y = 0,
|
||||
.shape = 0,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileOffset = 0,
|
||||
.priority = 0,
|
||||
};
|
||||
@@ -196,8 +196,8 @@ static const struct Subsprite sSubsprite_RedOutline2 =
|
||||
{
|
||||
.x = 0,
|
||||
.y = 0,
|
||||
.shape = 0,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileOffset = 1,
|
||||
.priority = 0,
|
||||
};
|
||||
@@ -206,8 +206,8 @@ static const struct Subsprite sSubsprite_RedOutline3 =
|
||||
{
|
||||
.x = 0,
|
||||
.y = 0,
|
||||
.shape = 0,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileOffset = 2,
|
||||
.priority = 0,
|
||||
};
|
||||
@@ -216,8 +216,8 @@ static const struct Subsprite sSubsprite_RedOutline4 =
|
||||
{
|
||||
.x = 0,
|
||||
.y = 0,
|
||||
.shape = 0,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileOffset = 3,
|
||||
.priority = 0,
|
||||
};
|
||||
@@ -226,8 +226,8 @@ static const struct Subsprite sSubsprite_RedOutline5 =
|
||||
{
|
||||
.x = 0,
|
||||
.y = 0,
|
||||
.shape = 0,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileOffset = 4,
|
||||
.priority = 0,
|
||||
};
|
||||
@@ -236,8 +236,8 @@ static const struct Subsprite sSubsprite_RedOutline6 =
|
||||
{
|
||||
.x = 0,
|
||||
.y = 0,
|
||||
.shape = 0,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileOffset = 5,
|
||||
.priority = 0,
|
||||
};
|
||||
@@ -246,8 +246,8 @@ static const struct Subsprite sSubsprite_RedOutline7 =
|
||||
{
|
||||
.x = 0,
|
||||
.y = 0,
|
||||
.shape = 0,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileOffset = 6,
|
||||
.priority = 0,
|
||||
};
|
||||
@@ -256,8 +256,8 @@ static const struct Subsprite sSubsprite_RedOutline8 =
|
||||
{
|
||||
.x = 0,
|
||||
.y = 0,
|
||||
.shape = 0,
|
||||
.size = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileOffset = 7,
|
||||
.priority = 0,
|
||||
};
|
||||
@@ -269,10 +269,10 @@ static const struct OamData sOamData_RedArrowCursor =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 1,
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
|
||||
+1
-1
@@ -11,10 +11,10 @@
|
||||
#include "trainer_hill.h"
|
||||
#include "gba/flash_internal.h"
|
||||
#include "decoration_inventory.h"
|
||||
#include "agb_flash.h"
|
||||
|
||||
static void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey);
|
||||
|
||||
extern bool16 IdentifyFlash(void);
|
||||
extern void ApplyNewEncryptionKeyToBerryPowder(u32 key);
|
||||
|
||||
#define SAVEBLOCK_MOVE_RANGE 128
|
||||
|
||||
@@ -24,9 +24,6 @@
|
||||
#include "main.h"
|
||||
#include "trainer_hill.h"
|
||||
|
||||
extern void sub_800B9B8(void);
|
||||
extern u8 gUnknown_03002748;
|
||||
|
||||
static void VBlankIntr(void);
|
||||
static void HBlankIntr(void);
|
||||
static void VCountIntr(void);
|
||||
@@ -313,8 +310,6 @@ void SetSerialCallback(IntrCallback callback)
|
||||
gMain.serialCallback = callback;
|
||||
}
|
||||
|
||||
extern void CopyBufferedValuesToGpuRegs(void);
|
||||
|
||||
static void VBlankIntr(void)
|
||||
{
|
||||
if (gWirelessCommType != 0)
|
||||
|
||||
@@ -207,7 +207,7 @@ bool8 sub_80D47D4(void)
|
||||
|
||||
void ShowMapNamePopup(void)
|
||||
{
|
||||
if (FlagGet(FLAG_SPECIAL_FLAG_0x4000) != TRUE)
|
||||
if (FlagGet(FLAG_HIDE_MAP_NAME_POPUP) != TRUE)
|
||||
{
|
||||
if (!FuncIsActiveTask(Task_MapNamePopUpWindow))
|
||||
{
|
||||
|
||||
@@ -111,8 +111,6 @@ static void PopulateSpeciesFromTrainerParty(int, u8 *);
|
||||
static void PopulateBattleFrontierFacilityName(int, u8 *);
|
||||
static void PopulateBattleFrontierStreak(int, u8 *);
|
||||
|
||||
extern void sub_81973A4(void);
|
||||
|
||||
#define TEXT_ID(topic, id) (((topic) << 8) | ((id) & 0xFF))
|
||||
|
||||
static const struct MatchCallTrainerTextInfo sMatchCallTrainers[] =
|
||||
|
||||
+11
-13
@@ -122,20 +122,18 @@ const struct MoveMenuInfoIcon gMoveMenuInfoIcons[] =
|
||||
{ 8, 8, 0xAF }, // Unused (Small dark pokeball)
|
||||
};
|
||||
|
||||
|
||||
// Forward declarations
|
||||
extern void sub_81973A4(void);
|
||||
extern void WindowFunc_DrawStandardFrame(u8, u8, u8, u8, u8, u8);
|
||||
extern void WindowFunc_DrawDialogueFrame(u8, u8, u8, u8, u8, u8);
|
||||
extern void WindowFunc_ClearStdWindowAndFrame(u8, u8, u8, u8, u8, u8);
|
||||
extern void WindowFunc_ClearDialogWindowAndFrame(u8, u8, u8, u8, u8, u8);
|
||||
extern void WindowFunc_DrawDialogFrameWithCustomTileAndPalette(u8, u8, u8, u8, u8, u8);
|
||||
extern void WindowFunc_ClearDialogWindowAndFrameNullPalette(u8, u8, u8, u8, u8, u8);
|
||||
extern void WindowFunc_DrawStdFrameWithCustomTileAndPalette(u8, u8, u8, u8, u8, u8);
|
||||
extern void WindowFunc_ClearStdWindowAndFrameToTransparent(u8, u8, u8, u8, u8, u8);
|
||||
extern u8 Menu_MoveCursor(s8);
|
||||
extern u8 sub_8199134(s8, s8);
|
||||
extern void sub_8198C78(void);
|
||||
extern void task_free_buf_after_copying_tile_data_to_vram(u8 taskId);
|
||||
void WindowFunc_DrawStandardFrame(u8, u8, u8, u8, u8, u8);
|
||||
void WindowFunc_DrawDialogueFrame(u8, u8, u8, u8, u8, u8);
|
||||
void WindowFunc_ClearStdWindowAndFrame(u8, u8, u8, u8, u8, u8);
|
||||
void WindowFunc_ClearDialogWindowAndFrame(u8, u8, u8, u8, u8, u8);
|
||||
void WindowFunc_DrawDialogFrameWithCustomTileAndPalette(u8, u8, u8, u8, u8, u8);
|
||||
void WindowFunc_ClearDialogWindowAndFrameNullPalette(u8, u8, u8, u8, u8, u8);
|
||||
void WindowFunc_DrawStdFrameWithCustomTileAndPalette(u8, u8, u8, u8, u8, u8);
|
||||
void WindowFunc_ClearStdWindowAndFrameToTransparent(u8, u8, u8, u8, u8, u8);
|
||||
void sub_8198C78(void);
|
||||
void task_free_buf_after_copying_tile_data_to_vram(u8 taskId);
|
||||
|
||||
void InitStandardTextBoxWindows(void)
|
||||
{
|
||||
|
||||
+2
-4
@@ -18,8 +18,6 @@
|
||||
#include "constants/items.h"
|
||||
#include "constants/maps.h"
|
||||
|
||||
extern bool32 sub_800B504(void);
|
||||
|
||||
// this file's functions
|
||||
static void Task_ContinueTaskAfterMessagePrints(u8 taskId);
|
||||
static void Task_CallYesOrNoCallback(u8 taskId);
|
||||
@@ -39,10 +37,10 @@ static const struct OamData sOamData_859F4E8 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 1,
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
|
||||
+6
-6
@@ -142,10 +142,10 @@ static const struct OamData gOamData_8617DF4 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 1,
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 3,
|
||||
@@ -192,10 +192,10 @@ static const struct OamData sCeilingCrumble2OamData =
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.mosaic = 0,
|
||||
.bpp = ST_OAM_4BPP,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 0,
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -230,10 +230,10 @@ static const struct OamData sCeilingCrumble1OamData =
|
||||
.objMode = ST_OAM_OBJ_NORMAL,
|
||||
.mosaic = 0,
|
||||
.bpp = ST_OAM_4BPP,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 1,
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
|
||||
+6
-6
@@ -30,10 +30,10 @@ static const struct OamData gUnknown_0859EE7C =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -47,10 +47,10 @@ static const struct OamData gUnknown_0859EE84 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 0,
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -156,10 +156,10 @@ static const struct OamData gUnknown_0859EF1C =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 1,
|
||||
.shape = SPRITE_SHAPE(32x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 1,
|
||||
.size = SPRITE_SIZE(32x8),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
|
||||
+2
-2
@@ -24,10 +24,10 @@ static const struct OamData sOamData_MoneyLabel =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 1,
|
||||
.shape = SPRITE_SHAPE(32x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(32x16),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
|
||||
@@ -17,8 +17,6 @@
|
||||
#include "mystery_event_msg.h"
|
||||
#include "pokemon_storage_system.h"
|
||||
|
||||
extern void sub_811EFC0(u8);
|
||||
|
||||
extern ScrCmdFunc gMysteryEventScriptCmdTable[];
|
||||
extern ScrCmdFunc gMysteryEventScriptCmdTableEnd[];
|
||||
|
||||
|
||||
+6
-6
@@ -1910,10 +1910,10 @@ const struct OamData gOamData_858BFEC =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 0,
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -1927,10 +1927,10 @@ const struct OamData gOamData_858BFF4 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 1,
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -1944,10 +1944,10 @@ const struct OamData gOamData_858BFFC =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 1,
|
||||
.shape = SPRITE_SHAPE(32x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(32x16),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
|
||||
@@ -36,8 +36,6 @@ static void sub_81162F8(u8);
|
||||
static void sub_81163D0(struct Sprite *);
|
||||
static void sub_81165E4(struct Sprite *);
|
||||
|
||||
extern void sub_810E2C8(struct Sprite *);
|
||||
|
||||
const union AnimCmd gUnknown_0859722C[] =
|
||||
{
|
||||
ANIMCMD_FRAME(0, 8),
|
||||
|
||||
+1
-2
@@ -13,8 +13,7 @@
|
||||
#include "text_window.h"
|
||||
#include "international_string_util.h"
|
||||
#include "strings.h"
|
||||
|
||||
extern void SetPokemonCryStereo(u32 val);
|
||||
#include "gba/m4a_internal.h"
|
||||
|
||||
// Task data
|
||||
enum
|
||||
|
||||
+11
-11
@@ -1176,10 +1176,10 @@ static const struct OamData gOamData_83765EC =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 0,
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
@@ -1232,10 +1232,10 @@ static const struct OamData sOamData_8615ED8 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
@@ -1288,10 +1288,10 @@ static const struct OamData sOamData_8615F20 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 1,
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.tileNum = 0,
|
||||
.priority = 2,
|
||||
.paletteNum = 0,
|
||||
@@ -1367,10 +1367,10 @@ static const struct OamData sOamData_8615F90 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 1,
|
||||
.shape = SPRITE_SHAPE(32x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 1,
|
||||
.size = SPRITE_SIZE(32x8),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
@@ -2937,7 +2937,7 @@ u8 pokemon_ailments_get_primary(u32 status)
|
||||
return AILMENT_NONE;
|
||||
}
|
||||
|
||||
u8 sub_81B205C(struct Pokemon *mon)
|
||||
u8 GetMonAilment(struct Pokemon *mon)
|
||||
{
|
||||
u8 ailment;
|
||||
|
||||
@@ -3356,7 +3356,7 @@ static void DisplayPartyPokemonLevelCheck(struct Pokemon *mon, struct Struct203C
|
||||
{
|
||||
if (GetMonData(mon, MON_DATA_SPECIES) != SPECIES_NONE)
|
||||
{
|
||||
u8 ailment = sub_81B205C(mon);
|
||||
u8 ailment = GetMonAilment(mon);
|
||||
if (ailment == AILMENT_NONE || ailment == AILMENT_PKRS)
|
||||
{
|
||||
if (c != 0)
|
||||
@@ -5185,7 +5185,7 @@ static void party_menu_link_mon_status_condition_object(u16 species, u8 status,
|
||||
|
||||
static void party_menu_get_status_condition_and_update_object(struct Pokemon *mon, struct Struct203CEDC *ptr)
|
||||
{
|
||||
party_menu_update_status_condition_object(sub_81B205C(mon), ptr);
|
||||
party_menu_update_status_condition_object(GetMonAilment(mon), ptr);
|
||||
}
|
||||
|
||||
static void party_menu_update_status_condition_object(u8 status, struct Struct203CEDC *ptr)
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
#include "trig.h"
|
||||
#include "constants/rgb.h"
|
||||
|
||||
extern void sub_80A77C8(struct Sprite *);
|
||||
|
||||
void sub_810DBAC(struct Sprite *);
|
||||
void sub_810DC2C(struct Sprite *);
|
||||
void sub_810DCD0(struct Sprite *);
|
||||
|
||||
+2
-2
@@ -99,10 +99,10 @@ static const struct OamData sBallOamData =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 1,
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.tileNum = 0,
|
||||
.priority = 2,
|
||||
.paletteNum = 0,
|
||||
|
||||
+2
-2
@@ -222,10 +222,10 @@ static const struct OamData sOamData_PokeblockCase =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 2,
|
||||
.paletteNum = 0,
|
||||
|
||||
@@ -55,8 +55,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
|
||||
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
|
||||
extern const u16 gUnknown_0860F074[];
|
||||
|
||||
extern bool8 sub_81221EC(void);
|
||||
|
||||
// this file's functions
|
||||
static void HandleInitBackgrounds(void);
|
||||
static void HandleInitWindows(void);
|
||||
@@ -465,10 +463,10 @@ static const struct OamData sThrownPokeblockOamData =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 0,
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
|
||||
+12
-12
@@ -248,10 +248,10 @@ static const struct OamData sOamData_855CFE4 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 0,
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
@@ -265,10 +265,10 @@ static const struct OamData sOamData_855CFEC =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.shape = SPRITE_SHAPE(16x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 0,
|
||||
.size = SPRITE_SIZE(16x8),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -282,10 +282,10 @@ static const struct OamData sOamData_855CFF4 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.shape = SPRITE_SHAPE(32x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(32x16),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -299,10 +299,10 @@ static const struct OamData sOamData_855CFFC =
|
||||
.objMode = 2,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = ST_OAM_SQUARE,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
@@ -316,10 +316,10 @@ static const struct OamData sOamData_855D004 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.shape = SPRITE_SHAPE(64x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x32),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -333,10 +333,10 @@ static const struct OamData sOamData_855D00C =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.shape = SPRITE_SHAPE(8x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 0,
|
||||
.size = SPRITE_SIZE(8x16),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
|
||||
+32
-14
@@ -83,14 +83,21 @@ static const u32 sAreaGlow_Gfx[] = INCBIN_U32("graphics/pokedex/area_glow.4bpp.l
|
||||
|
||||
static const u16 sSpeciesHiddenFromAreaScreen[] = { SPECIES_WYNAUT };
|
||||
|
||||
static const u16 sMovingRegionMapSections[3] = { MAPSEC_MARINE_CAVE, MAPSEC_UNDERWATER_MARINE_CAVE, MAPSEC_TERRA_CAVE };
|
||||
static const u16 sMovingRegionMapSections[3] =
|
||||
{
|
||||
MAPSEC_MARINE_CAVE,
|
||||
MAPSEC_UNDERWATER_MARINE_CAVE,
|
||||
MAPSEC_TERRA_CAVE
|
||||
};
|
||||
|
||||
static const u16 sFeebasData[][3] = {
|
||||
static const u16 sFeebasData[][3] =
|
||||
{
|
||||
{SPECIES_FEEBAS, MAP_GROUP(ROUTE119), MAP_NUM(ROUTE119)},
|
||||
{NUM_SPECIES}
|
||||
};
|
||||
|
||||
static const u16 sLandmarkData[][2] = {
|
||||
static const u16 sLandmarkData[][2] =
|
||||
{
|
||||
{MAPSEC_SKY_PILLAR, FLAG_LANDMARK_SKY_PILLAR},
|
||||
{MAPSEC_SEAFLOOR_CAVERN, FLAG_LANDMARK_SEAFLOOR_CAVERN},
|
||||
{MAPSEC_ALTERING_CAVE_2, FLAG_LANDMARK_ALTERING_CAVE},
|
||||
@@ -100,7 +107,8 @@ static const u16 sLandmarkData[][2] = {
|
||||
{MAPSEC_NONE}
|
||||
};
|
||||
|
||||
static const u8 sAreaGlowTilemapMapping[] = {
|
||||
static const u8 sAreaGlowTilemapMapping[] =
|
||||
{
|
||||
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
|
||||
0x11, 0x20, 0x02, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
|
||||
0x12, 0x21, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x2a, 0x2e, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
|
||||
@@ -119,7 +127,8 @@ static const u8 sAreaGlowTilemapMapping[] = {
|
||||
0x1f, 0x22, 0x25, 0x03, 0x28, 0x2d, 0x2c, 0x07, 0x2b, 0x2e, 0x2f, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
|
||||
};
|
||||
|
||||
static const struct UnkStruct_1C4D70 sUnknown_085B4018 = {
|
||||
static const struct UnkStruct_1C4D70 sUnknown_085B4018 =
|
||||
{
|
||||
.bg = 3,
|
||||
.unk2 = 0,
|
||||
.unk10 = 0,
|
||||
@@ -127,21 +136,26 @@ static const struct UnkStruct_1C4D70 sUnknown_085B4018 = {
|
||||
};
|
||||
|
||||
static const u8 sAreaMarkerTiles[];
|
||||
static const struct SpriteSheet sAreaMarkerSpriteSheet = {
|
||||
static const struct SpriteSheet sAreaMarkerSpriteSheet =
|
||||
{
|
||||
sAreaMarkerTiles, 0x80, 2
|
||||
};
|
||||
|
||||
static const u16 sAreaMarkerPalette[];
|
||||
static const struct SpritePalette sAreaMarkerSpritePalette = {
|
||||
static const struct SpritePalette sAreaMarkerSpritePalette =
|
||||
{
|
||||
sAreaMarkerPalette, 2
|
||||
};
|
||||
|
||||
static const struct OamData sAreaMarkerOamData = {
|
||||
.size = 1,
|
||||
static const struct OamData sAreaMarkerOamData =
|
||||
{
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.priority = 1
|
||||
};
|
||||
|
||||
static const struct SpriteTemplate sAreaMarkerSpriteTemplate = {
|
||||
static const struct SpriteTemplate sAreaMarkerSpriteTemplate =
|
||||
{
|
||||
2,
|
||||
2,
|
||||
&sAreaMarkerOamData,
|
||||
@@ -154,16 +168,20 @@ static const struct SpriteTemplate sAreaMarkerSpriteTemplate = {
|
||||
static const u16 sAreaMarkerPalette[] = INCBIN_U16("graphics/pokedex/area_marker.gbapal");
|
||||
static const u8 sAreaMarkerTiles[] = INCBIN_U8("graphics/pokedex/area_marker.4bpp");
|
||||
|
||||
static const struct SpritePalette sAreaUnknownSpritePalette = {
|
||||
static const struct SpritePalette sAreaUnknownSpritePalette =
|
||||
{
|
||||
gPokedexAreaScreenAreaUnknown_Pal, 3
|
||||
};
|
||||
|
||||
static const struct OamData sAreaUnknownOamData = {
|
||||
.size = 2,
|
||||
static const struct OamData sAreaUnknownOamData =
|
||||
{
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.priority = 1
|
||||
};
|
||||
|
||||
static const struct SpriteTemplate sAreaUnknownSpriteTemplate = {
|
||||
static const struct SpriteTemplate sAreaUnknownSpriteTemplate =
|
||||
{
|
||||
3,
|
||||
3,
|
||||
&sAreaUnknownOamData,
|
||||
|
||||
@@ -54,7 +54,8 @@ const u16 gUnknown_085B8378[] = INCBIN_U16("graphics/pokedex/cry_meter_map.bin")
|
||||
const u16 gUnknown_085B8418[] = INCBIN_U16("graphics/pokedex/cry_meter.gbapal");
|
||||
const u8 gUnknown_085B8438[] = INCBIN_U8("graphics/pokedex/cry_meter.4bpp.lz");
|
||||
|
||||
const u16 gUnknown_085B8770[][72] = {
|
||||
const u16 gUnknown_085B8770[][72] =
|
||||
{
|
||||
{
|
||||
0x0000, 0x0004, 0x0008, 0x000C, 0x0010, 0x0014, 0x0018, 0x001C,
|
||||
0x0400, 0x0404, 0x0408, 0x040C, 0x0410, 0x0414, 0x0418, 0x041C,
|
||||
@@ -142,7 +143,8 @@ const u16 gUnknown_085B8BF0[] = INCBIN_U16("graphics/pokedex/85B8C10.gbapal");
|
||||
const u8 gUnknown_085B8C10[] = INCBIN_U8("graphics/pokedex/85B8C10.4bpp");
|
||||
|
||||
const u8 gUnknown_085B8C30[] = {0xF0, 0x0F};
|
||||
const u8 gUnknown_085B8C32[][16] = {
|
||||
const u8 gUnknown_085B8C32[][16] =
|
||||
{
|
||||
{
|
||||
0x0F, 0x0E, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08,
|
||||
0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
|
||||
@@ -152,23 +154,28 @@ const u8 gUnknown_085B8C32[][16] = {
|
||||
}
|
||||
};
|
||||
|
||||
const union AnimCmd gSpriteAnim_85B8C54[] = {
|
||||
const union AnimCmd gSpriteAnim_85B8C54[] =
|
||||
{
|
||||
ANIMCMD_FRAME(0, 30),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
const union AnimCmd *const gSpriteAnimTable_85B8C5C[] = {
|
||||
const union AnimCmd *const gSpriteAnimTable_85B8C5C[] =
|
||||
{
|
||||
gSpriteAnim_85B8C54
|
||||
};
|
||||
|
||||
const struct OamData gOamData_85B8C60 = {
|
||||
const struct OamData gOamData_85B8C60 =
|
||||
{
|
||||
.y = 160,
|
||||
.affineMode = ST_OAM_AFFINE_NORMAL,
|
||||
.size = 3,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.priority = 1
|
||||
};
|
||||
|
||||
const struct SpriteTemplate gUnknown_085B8C68 = {
|
||||
const struct SpriteTemplate gUnknown_085B8C68 =
|
||||
{
|
||||
0x2000,
|
||||
0x2000,
|
||||
&gOamData_85B8C60,
|
||||
@@ -178,12 +185,14 @@ const struct SpriteTemplate gUnknown_085B8C68 = {
|
||||
sub_814596C
|
||||
};
|
||||
|
||||
const struct SpriteSheet gCryMeterNeedleSpriteSheets[] = {
|
||||
const struct SpriteSheet gCryMeterNeedleSpriteSheets[] =
|
||||
{
|
||||
{CryMeterNeedleTiles, 0x800, 0x2000},
|
||||
{}
|
||||
};
|
||||
|
||||
const struct SpritePalette gCryMeterNeedleSpritePalettes[] = {
|
||||
const struct SpritePalette gCryMeterNeedleSpritePalettes[] =
|
||||
{
|
||||
{CryMeterNeedlePalette, 0x2000},
|
||||
{}
|
||||
};
|
||||
|
||||
+3
-6
@@ -10,6 +10,7 @@
|
||||
#include "battle_tower.h"
|
||||
#include "event_data.h"
|
||||
#include "evolution_scene.h"
|
||||
#include "field_specials.h"
|
||||
#include "item.h"
|
||||
#include "link.h"
|
||||
#include "main.h"
|
||||
@@ -72,10 +73,6 @@ extern const struct CompressedSpritePalette gMonPaletteTable[];
|
||||
extern const struct CompressedSpritePalette gMonShinyPaletteTable[];
|
||||
extern const u8 gTrainerClassNames[][13];
|
||||
|
||||
extern u16 get_unknown_box_id(void);
|
||||
extern void set_unknown_box_id(u8);
|
||||
extern bool8 sub_806F104(void);
|
||||
|
||||
// this file's functions
|
||||
static u16 CalculateBoxMonChecksum(struct BoxPokemon *boxMon);
|
||||
static union PokemonSubstruct *GetSubstruct(struct BoxPokemon *boxMon, u32 personality, u8 substructType);
|
||||
@@ -2465,10 +2462,10 @@ static const struct OamData sOamData_8329F20 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
|
||||
+2
-2
@@ -931,10 +931,10 @@ const struct OamData sMonIconOamData =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#include "global.h"
|
||||
#include "event_data.h"
|
||||
#include "pokedex.h"
|
||||
#include "pokemon.h"
|
||||
#include "pokemon_size_record.h"
|
||||
#include "string_util.h"
|
||||
@@ -15,9 +16,6 @@ struct UnknownStruct
|
||||
u16 unk4;
|
||||
};
|
||||
|
||||
extern u16 GetPokedexHeightWeight(u16 dexNo, bool8 height);
|
||||
extern u16 SpeciesToNationalPokedexNum(u16 species);
|
||||
|
||||
static const struct UnknownStruct sBigMonSizeTable[] =
|
||||
{
|
||||
{ 290, 1, 0 },
|
||||
|
||||
@@ -969,10 +969,10 @@ static const struct OamData sOamData_857286C =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -986,10 +986,10 @@ static const struct OamData sOamData_8572874 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 1,
|
||||
.shape = SPRITE_SHAPE(16x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 0,
|
||||
.size = SPRITE_SIZE(16x8),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -1062,10 +1062,10 @@ static const struct OamData sOamData_85728EC =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
@@ -1467,8 +1467,8 @@ static const struct SpriteSheet gUnknown_0857B080 = {gPCGfx_Arrow, 0x80, 6};
|
||||
|
||||
static const struct OamData gOamData_83BB298 =
|
||||
{
|
||||
.shape = ST_OAM_H_RECTANGLE,
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(32x16),
|
||||
.size = SPRITE_SIZE(32x16),
|
||||
.priority = 2
|
||||
};
|
||||
|
||||
@@ -1503,7 +1503,8 @@ static const struct SpriteTemplate gSpriteTemplate_857B0A8 =
|
||||
|
||||
static const struct OamData gOamData_83BB2D0 =
|
||||
{
|
||||
.shape = ST_OAM_V_RECTANGLE,
|
||||
.shape = SPRITE_SHAPE(8x16),
|
||||
.size = SPRITE_SIZE(8x16),
|
||||
.priority = 2
|
||||
};
|
||||
|
||||
@@ -2004,7 +2005,7 @@ static void sub_80C7958(u8 curBox)
|
||||
u8 spriteId;
|
||||
struct SpriteTemplate template;
|
||||
struct OamData oamData = {};
|
||||
oamData.size = 3;
|
||||
oamData.size = SPRITE_SIZE(64x64);
|
||||
oamData.paletteNum = 1;
|
||||
template = (struct SpriteTemplate){
|
||||
0, 0, &oamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
@@ -2017,8 +2018,8 @@ static void sub_80C7958(u8 curBox)
|
||||
spriteId = CreateSprite(&template, 160, 96, 0);
|
||||
gUnknown_02039D04->unk_0000 = gSprites + spriteId;
|
||||
|
||||
oamData.shape = ST_OAM_V_RECTANGLE;
|
||||
oamData.size = 1;
|
||||
oamData.shape = SPRITE_SHAPE(8x32);
|
||||
oamData.size = SPRITE_SIZE(8x32);
|
||||
template.tileTag = gUnknown_02039D04->unk_0240 + 1;
|
||||
template.anims = sSpriteAnimTable_8571710;
|
||||
for (i = 0; i < 4; i++)
|
||||
@@ -8490,12 +8491,14 @@ static void sub_80CFC14(void)
|
||||
|
||||
static const struct OamData sOamData_857BA0C =
|
||||
{
|
||||
.size = 2,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.priority = 1,
|
||||
};
|
||||
static const struct OamData sOamData_857BA14 =
|
||||
{
|
||||
.size = 1,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.priority = 1,
|
||||
};
|
||||
|
||||
@@ -9358,10 +9361,10 @@ static const struct OamData sOamData_857BBA4 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.tileNum = 0,
|
||||
.priority = 1,
|
||||
.paletteNum = 0,
|
||||
|
||||
+617
-563
File diff suppressed because it is too large
Load Diff
+5
-5
@@ -141,7 +141,7 @@ void sub_81C7710(void);
|
||||
static void InitKeys_(void);
|
||||
static void FreeVars(void);
|
||||
static void VblankCb_Pokenav(void);
|
||||
static void Cb2_Pokenav(void);
|
||||
static void CB2_Pokenav(void);
|
||||
void sub_81C7C28(void);
|
||||
void sub_81C72BC(void);
|
||||
void sub_81C7B74(void);
|
||||
@@ -485,7 +485,7 @@ void sub_81C71E4(u8 taskId)
|
||||
}
|
||||
}
|
||||
|
||||
void CB2_PokeNav(void)
|
||||
void CB2_InitPokeNav(void)
|
||||
{
|
||||
gUnknown_0203CF40 = Alloc(sizeof(*gUnknown_0203CF40));
|
||||
if (gUnknown_0203CF40 == NULL)
|
||||
@@ -498,7 +498,7 @@ void CB2_PokeNav(void)
|
||||
ResetTasks();
|
||||
SetVBlankCallback(NULL);
|
||||
CreateTask(sub_81C742C, 0);
|
||||
SetMainCallback2(Cb2_Pokenav);
|
||||
SetMainCallback2(CB2_Pokenav);
|
||||
SetVBlankCallback(VblankCb_Pokenav);
|
||||
}
|
||||
}
|
||||
@@ -529,7 +529,7 @@ void sub_81C72BC(void)
|
||||
FreeAllSpritePalettes();
|
||||
SetVBlankCallback(NULL);
|
||||
CreateTask(sub_81C742C, 0);
|
||||
SetMainCallback2(Cb2_Pokenav);
|
||||
SetMainCallback2(CB2_Pokenav);
|
||||
SetVBlankCallback(VblankCb_Pokenav);
|
||||
}
|
||||
}
|
||||
@@ -588,7 +588,7 @@ static bool32 AnyMonHasRibbon(void)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void Cb2_Pokenav(void)
|
||||
static void CB2_Pokenav(void)
|
||||
{
|
||||
RunTasks();
|
||||
AnimateSprites();
|
||||
|
||||
@@ -1,13 +1,11 @@
|
||||
|
||||
// Includes
|
||||
#include "global.h"
|
||||
#include "battle_setup.h"
|
||||
#include "event_data.h"
|
||||
#include "string_util.h"
|
||||
#include "battle.h"
|
||||
#include "gym_leader_rematch.h"
|
||||
#include "match_call.h"
|
||||
|
||||
extern void sub_8197080(u8 *dest);
|
||||
extern const u8 gTrainerClassNames[][13];
|
||||
|
||||
// Static type declarations
|
||||
|
||||
+16
-16
@@ -105,10 +105,10 @@ static const struct OamData sOamData_862A6BC =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(64x64),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x64),
|
||||
.tileNum = 0,
|
||||
.priority = 2,
|
||||
.paletteNum = 0,
|
||||
@@ -122,10 +122,10 @@ static const struct OamData sOamData_862A6C4 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(32x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(32x32),
|
||||
.tileNum = 0,
|
||||
.priority = 2,
|
||||
.paletteNum = 0,
|
||||
@@ -139,10 +139,10 @@ static const struct OamData sOamData_862A6CC =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 1,
|
||||
.shape = SPRITE_SHAPE(64x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 3,
|
||||
.size = SPRITE_SIZE(64x32),
|
||||
.tileNum = 0,
|
||||
.priority = 2,
|
||||
.paletteNum = 0,
|
||||
@@ -156,10 +156,10 @@ static const struct OamData sOamData_862A6D4 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 1,
|
||||
.shape = SPRITE_SHAPE(32x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(32x16),
|
||||
.tileNum = 0,
|
||||
.priority = 2,
|
||||
.paletteNum = 0,
|
||||
@@ -173,10 +173,10 @@ static const struct OamData sOamData_862A6DC =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 1,
|
||||
.shape = SPRITE_SHAPE(16x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 0,
|
||||
.size = SPRITE_SIZE(16x8),
|
||||
.tileNum = 0,
|
||||
.priority = 2,
|
||||
.paletteNum = 0,
|
||||
@@ -190,10 +190,10 @@ static const struct OamData sOamData_862A6E4 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 2,
|
||||
.shape = SPRITE_SHAPE(16x32),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 2,
|
||||
.size = SPRITE_SIZE(16x32),
|
||||
.tileNum = 0,
|
||||
.priority = 2,
|
||||
.paletteNum = 0,
|
||||
@@ -207,10 +207,10 @@ static const struct OamData sOamData_862A6EC =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 1,
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.tileNum = 0,
|
||||
.priority = 2,
|
||||
.paletteNum = 0,
|
||||
@@ -224,10 +224,10 @@ static const struct OamData sOamData_862A6F4 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 1,
|
||||
.shape = SPRITE_SHAPE(32x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 1,
|
||||
.size = SPRITE_SIZE(32x8),
|
||||
.tileNum = 0,
|
||||
.priority = 2,
|
||||
.paletteNum = 0,
|
||||
|
||||
+1
-2
@@ -34,9 +34,8 @@
|
||||
#include "daycare.h"
|
||||
#include "international_string_util.h"
|
||||
#include "constants/battle_frontier.h"
|
||||
#include "dewford_trend.h"
|
||||
|
||||
extern void ReceiveSecretBasesData(struct SecretBaseRecord *, size_t, u8);
|
||||
extern void ReceiveEasyChatPairsData(struct EasyChatPair *, size_t, u8);
|
||||
|
||||
// Static type declarations
|
||||
|
||||
|
||||
+164
-66
@@ -36,6 +36,13 @@
|
||||
|
||||
// Static type declarations
|
||||
|
||||
struct FlagControlledFlyDest
|
||||
{
|
||||
const u8 *const *name;
|
||||
u16 mapSecId;
|
||||
u16 flag;
|
||||
};
|
||||
|
||||
// Static RAM declarations
|
||||
|
||||
static EWRAM_DATA struct RegionMap *gRegionMap = NULL;
|
||||
@@ -106,7 +113,8 @@ static const u8 sRegionMap_MapSectionLayout[] = INCBIN_U8("graphics/pokenav/regi
|
||||
|
||||
#include "data/region_map/region_map_entries.h"
|
||||
|
||||
static const u16 sRegionMap_SpecialPlaceLocations[][2] = {
|
||||
static const u16 sRegionMap_SpecialPlaceLocations[][2] =
|
||||
{
|
||||
{MAPSEC_UNDERWATER_TERRA_CAVE, MAPSEC_ROUTE_105},
|
||||
{MAPSEC_UNDERWATER_124, MAPSEC_ROUTE_124},
|
||||
{MAPSEC_UNDERWATER_UNK1, MAPSEC_ROUTE_129},
|
||||
@@ -133,13 +141,15 @@ static const u16 sRegionMap_SpecialPlaceLocations[][2] = {
|
||||
{MAPSEC_NONE, MAPSEC_NONE}
|
||||
};
|
||||
|
||||
static const u16 sRegionMap_MarineCaveMapSecIds[] = {
|
||||
static const u16 sRegionMap_MarineCaveMapSecIds[] =
|
||||
{
|
||||
MAPSEC_MARINE_CAVE,
|
||||
MAPSEC_UNDERWATER_MARINE_CAVE,
|
||||
MAPSEC_UNDERWATER_MARINE_CAVE
|
||||
};
|
||||
|
||||
static const u16 sTerraCaveMapSectionIds[] = {
|
||||
static const u16 sTerraCaveMapSectionIds[] =
|
||||
{
|
||||
MAPSEC_ROUTE_114,
|
||||
MAPSEC_ROUTE_114,
|
||||
MAPSEC_ROUTE_115,
|
||||
@@ -158,7 +168,8 @@ static const u16 sTerraCaveMapSectionIds[] = {
|
||||
MAPSEC_ROUTE_129
|
||||
};
|
||||
|
||||
static const struct UCoords16 sTerraCaveLocationCoords[] = {
|
||||
static const struct UCoords16 sTerraCaveLocationCoords[] =
|
||||
{
|
||||
{0x00, 0x0a},
|
||||
{0x00, 0x0c},
|
||||
{0x18, 0x03},
|
||||
@@ -169,21 +180,27 @@ static const struct UCoords16 sTerraCaveLocationCoords[] = {
|
||||
{0x18, 0x0a}
|
||||
};
|
||||
|
||||
static const u8 sRegionMap_MapSecAquaHideoutOld[] = {
|
||||
static const u8 sRegionMap_MapSecAquaHideoutOld[] =
|
||||
{
|
||||
MAPSEC_AQUA_HIDEOUT_OLD
|
||||
};
|
||||
|
||||
static const struct OamData sRegionMapCursorOam = {
|
||||
.size = 1, .priority = 1
|
||||
static const struct OamData sRegionMapCursorOam =
|
||||
{
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.priority = 1
|
||||
};
|
||||
|
||||
static const union AnimCmd sRegionMapCursorAnim1[] = {
|
||||
static const union AnimCmd sRegionMapCursorAnim1[] =
|
||||
{
|
||||
ANIMCMD_FRAME(0, 20),
|
||||
ANIMCMD_FRAME(4, 20),
|
||||
ANIMCMD_JUMP(0)
|
||||
};
|
||||
|
||||
static const union AnimCmd sRegionMapCursorAnim2[] = {
|
||||
static const union AnimCmd sRegionMapCursorAnim2[] =
|
||||
{
|
||||
ANIMCMD_FRAME( 0, 10),
|
||||
ANIMCMD_FRAME(16, 10),
|
||||
ANIMCMD_FRAME(32, 10),
|
||||
@@ -191,37 +208,49 @@ static const union AnimCmd sRegionMapCursorAnim2[] = {
|
||||
ANIMCMD_JUMP(0)
|
||||
};
|
||||
|
||||
static const union AnimCmd *const sRegionMapCursorAnimTable[] = {
|
||||
static const union AnimCmd *const sRegionMapCursorAnimTable[] =
|
||||
{
|
||||
sRegionMapCursorAnim1,
|
||||
sRegionMapCursorAnim2
|
||||
};
|
||||
|
||||
static const struct SpritePalette sRegionMapCursorSpritePalette = { sRegionMapCursorPal, 0 };
|
||||
|
||||
static const struct SpriteTemplate sRegionMapCursorSpriteTemplate = {
|
||||
0,
|
||||
0,
|
||||
&sRegionMapCursorOam,
|
||||
sRegionMapCursorAnimTable,
|
||||
NULL,
|
||||
gDummySpriteAffineAnimTable,
|
||||
SpriteCallback_CursorFull
|
||||
static const struct SpritePalette sRegionMapCursorSpritePalette =
|
||||
{
|
||||
.data = sRegionMapCursorPal,
|
||||
.tag = 0
|
||||
};
|
||||
|
||||
static const struct OamData sRegionMapPlayerIconOam = {
|
||||
.size = 1, .priority = 2
|
||||
static const struct SpriteTemplate sRegionMapCursorSpriteTemplate =
|
||||
{
|
||||
.tileTag = 0,
|
||||
.paletteTag = 0,
|
||||
.oam = &sRegionMapCursorOam,
|
||||
.anims = sRegionMapCursorAnimTable,
|
||||
.images = NULL,
|
||||
.affineAnims = gDummySpriteAffineAnimTable,
|
||||
.callback = SpriteCallback_CursorFull
|
||||
};
|
||||
|
||||
static const union AnimCmd sRegionMapPlayerIconAnim1[] = {
|
||||
static const struct OamData sRegionMapPlayerIconOam =
|
||||
{
|
||||
.shape = SPRITE_SHAPE(16x16),
|
||||
.size = SPRITE_SIZE(16x16),
|
||||
.priority = 2
|
||||
};
|
||||
|
||||
static const union AnimCmd sRegionMapPlayerIconAnim1[] =
|
||||
{
|
||||
ANIMCMD_FRAME(0, 5),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd *const sRegionMapPlayerIconAnimTable[] = {
|
||||
static const union AnimCmd *const sRegionMapPlayerIconAnimTable[] =
|
||||
{
|
||||
sRegionMapPlayerIconAnim1
|
||||
};
|
||||
|
||||
static const u8 sRegionMapEventSectionIds[] = {
|
||||
static const u8 sRegionMapEventSectionIds[] =
|
||||
{
|
||||
MAPSEC_BIRTH_ISLAND_2,
|
||||
MAPSEC_FARAWAY_ISLAND,
|
||||
MAPSEC_NAVEL_ROCK2
|
||||
@@ -237,7 +266,8 @@ static const u16 Unknown_085A1D48[] = INCBIN_U16("graphics/pokenav/fly_target_ic
|
||||
|
||||
static const u32 sUnknown_085A1D68[] = INCBIN_U32("graphics/pokenav/fly_target_icons.4bpp.lz");
|
||||
|
||||
static const u8 sMapHealLocations[][3] = {
|
||||
static const u8 sMapHealLocations[][3] =
|
||||
{
|
||||
{MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F},
|
||||
{MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), HEAL_LOCATION_OLDALE_TOWN},
|
||||
{MAP_GROUP(DEWFORD_TOWN), MAP_NUM(DEWFORD_TOWN), HEAL_LOCATION_DEWFORD_TOWN},
|
||||
@@ -290,83 +320,150 @@ static const u8 sMapHealLocations[][3] = {
|
||||
{MAP_GROUP(ROUTE134), MAP_NUM(ROUTE134), 0}
|
||||
};
|
||||
|
||||
static const u8 *const gUnknown_085A1ED4[] = {
|
||||
static const u8 *const gUnknown_085A1ED4[] =
|
||||
{
|
||||
gText_PokemonLeague,
|
||||
gText_PokemonCenter
|
||||
};
|
||||
|
||||
static const struct {
|
||||
const u8 *const *name;
|
||||
u16 mapSecId;
|
||||
u16 flag;
|
||||
} gUnknown_085A1EDC[] = {
|
||||
gUnknown_085A1ED4,
|
||||
MAPSEC_EVER_GRANDE_CITY,
|
||||
FLAG_LANDMARK_POKEMON_LEAGUE
|
||||
static const struct FlagControlledFlyDest gUnknown_085A1EDC[] =
|
||||
{
|
||||
{
|
||||
.name = gUnknown_085A1ED4,
|
||||
.mapSecId = MAPSEC_EVER_GRANDE_CITY,
|
||||
.flag = FLAG_LANDMARK_POKEMON_LEAGUE
|
||||
}
|
||||
};
|
||||
|
||||
static const struct BgTemplate gUnknown_085A1EE4[] = {
|
||||
{ .bg = 0, .charBaseIndex = 0, .mapBaseIndex = 31, .screenSize = 0, .paletteMode = 0, .priority = 0 },
|
||||
{ .bg = 1, .charBaseIndex = 3, .mapBaseIndex = 30, .screenSize = 0, .paletteMode = 0, .priority = 1 },
|
||||
{ .bg = 2, .charBaseIndex = 2, .mapBaseIndex = 28, .screenSize = 2, .paletteMode = 1, .priority = 2 }
|
||||
static const struct BgTemplate gUnknown_085A1EE4[] =
|
||||
{
|
||||
{
|
||||
.bg = 0,
|
||||
.charBaseIndex = 0,
|
||||
.mapBaseIndex = 31,
|
||||
.screenSize = 0,
|
||||
.paletteMode = 0,
|
||||
.priority = 0
|
||||
},
|
||||
{
|
||||
.bg = 1,
|
||||
.charBaseIndex = 3,
|
||||
.mapBaseIndex = 30,
|
||||
.screenSize = 0,
|
||||
.paletteMode = 0,
|
||||
.priority = 1
|
||||
},
|
||||
{
|
||||
.bg = 2,
|
||||
.charBaseIndex = 2,
|
||||
.mapBaseIndex = 28,
|
||||
.screenSize = 2,
|
||||
.paletteMode = 1,
|
||||
.priority = 2
|
||||
}
|
||||
};
|
||||
|
||||
static const struct WindowTemplate gUnknown_085A1EF0[] = {
|
||||
{ 0, 17, 17, 12, 2, 15, 0x01 },
|
||||
{ 0, 17, 15, 12, 4, 15, 0x19 },
|
||||
{ 0, 1, 18, 14, 2, 15, 0x49 },
|
||||
static const struct WindowTemplate gUnknown_085A1EF0[] =
|
||||
{
|
||||
{
|
||||
.bg = 0,
|
||||
.tilemapLeft = 17,
|
||||
.tilemapTop = 17,
|
||||
.width = 12,
|
||||
.height = 2,
|
||||
.paletteNum = 15,
|
||||
.baseBlock = 0x01
|
||||
},
|
||||
{
|
||||
.bg = 0,
|
||||
.tilemapLeft = 17,
|
||||
.tilemapTop = 15,
|
||||
.width = 12,
|
||||
.height = 4,
|
||||
.paletteNum = 15,
|
||||
.baseBlock = 0x19
|
||||
},
|
||||
{
|
||||
.bg = 0,
|
||||
.tilemapLeft = 1,
|
||||
.tilemapTop = 18,
|
||||
.width = 14,
|
||||
.height = 2,
|
||||
.paletteNum = 15,
|
||||
.baseBlock = 0x49
|
||||
},
|
||||
DUMMY_WIN_TEMPLATE
|
||||
};
|
||||
|
||||
static const struct SpritePalette gUnknown_085A1F10 = {
|
||||
Unknown_085A1D48, 2
|
||||
static const struct SpritePalette gUnknown_085A1F10 =
|
||||
{
|
||||
.data = Unknown_085A1D48,
|
||||
.tag = 2
|
||||
};
|
||||
|
||||
static const u16 sUnknown_085A1F18[][2] = {
|
||||
{FLAG_LANDMARK_BATTLE_FRONTIER, MAPSEC_BATTLE_FRONTIER},
|
||||
{-1, MAPSEC_NONE}
|
||||
static const u16 sUnknown_085A1F18[][2] =
|
||||
{
|
||||
{
|
||||
FLAG_LANDMARK_BATTLE_FRONTIER,
|
||||
MAPSEC_BATTLE_FRONTIER
|
||||
},
|
||||
{
|
||||
-1,
|
||||
MAPSEC_NONE
|
||||
}
|
||||
};
|
||||
|
||||
static const struct OamData gOamData_085A1F20 = {
|
||||
static const struct OamData gOamData_085A1F20 =
|
||||
{
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.priority = 2
|
||||
};
|
||||
|
||||
static const union AnimCmd gUnknown_085A1F28[] = {
|
||||
static const union AnimCmd gUnknown_085A1F28[] =
|
||||
{
|
||||
ANIMCMD_FRAME( 0, 5),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd gUnknown_085A1F30[] = {
|
||||
static const union AnimCmd gUnknown_085A1F30[] =
|
||||
{
|
||||
ANIMCMD_FRAME( 1, 5),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd gUnknown_085A1F38[] = {
|
||||
static const union AnimCmd gUnknown_085A1F38[] =
|
||||
{
|
||||
ANIMCMD_FRAME( 3, 5),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd gUnknown_085A1F40[] = {
|
||||
static const union AnimCmd gUnknown_085A1F40[] =
|
||||
{
|
||||
ANIMCMD_FRAME( 5, 5),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd gUnknown_085A1F48[] = {
|
||||
static const union AnimCmd gUnknown_085A1F48[] =
|
||||
{
|
||||
ANIMCMD_FRAME( 6, 5),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd gUnknown_085A1F50[] = {
|
||||
static const union AnimCmd gUnknown_085A1F50[] =
|
||||
{
|
||||
ANIMCMD_FRAME( 8, 5),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd gUnknown_085A1F58[] = {
|
||||
static const union AnimCmd gUnknown_085A1F58[] =
|
||||
{
|
||||
ANIMCMD_FRAME(10, 5),
|
||||
ANIMCMD_END
|
||||
};
|
||||
|
||||
static const union AnimCmd *const gUnknown_085A1F60[] = {
|
||||
static const union AnimCmd *const gUnknown_085A1F60[] =
|
||||
{
|
||||
gUnknown_085A1F28,
|
||||
gUnknown_085A1F30,
|
||||
gUnknown_085A1F38,
|
||||
@@ -376,14 +473,15 @@ static const union AnimCmd *const gUnknown_085A1F60[] = {
|
||||
gUnknown_085A1F58
|
||||
};
|
||||
|
||||
static const struct SpriteTemplate gUnknown_085A1F7C = {
|
||||
2,
|
||||
2,
|
||||
&gOamData_085A1F20,
|
||||
gUnknown_085A1F60,
|
||||
NULL,
|
||||
gDummySpriteAffineAnimTable,
|
||||
SpriteCallbackDummy
|
||||
static const struct SpriteTemplate gUnknown_085A1F7C =
|
||||
{
|
||||
.tileTag = 2,
|
||||
.paletteTag = 2,
|
||||
.oam = &gOamData_085A1F20,
|
||||
.anims = gUnknown_085A1F60,
|
||||
.images = NULL,
|
||||
.affineAnims = gDummySpriteAffineAnimTable,
|
||||
.callback = SpriteCallbackDummy
|
||||
};
|
||||
|
||||
// .text
|
||||
@@ -1679,7 +1777,7 @@ static void sub_8124904(void)
|
||||
if (sFlyMap->regionMap.iconDrawType > MAPSECTYPE_NONE && sFlyMap->regionMap.iconDrawType <= MAPSECTYPE_BATTLE_FRONTIER)
|
||||
{
|
||||
flag = FALSE;
|
||||
for (i = 0; i < 1; i++)
|
||||
for (i = 0; i < ARRAY_COUNT(gUnknown_085A1EDC); i++)
|
||||
{
|
||||
if (sFlyMap->regionMap.mapSecId == gUnknown_085A1EDC[i].mapSecId)
|
||||
{
|
||||
|
||||
@@ -108,10 +108,10 @@ static const struct OamData sOamData_08510464 =
|
||||
.objMode = 0,
|
||||
.mosaic = 0,
|
||||
.bpp = 0,
|
||||
.shape = 0,
|
||||
.shape = SPRITE_SHAPE(8x8),
|
||||
.x = 0,
|
||||
.matrixNum = 0,
|
||||
.size = 0,
|
||||
.size = SPRITE_SIZE(8x8),
|
||||
.tileNum = 0,
|
||||
.priority = 0,
|
||||
.paletteNum = 0,
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
#include "reshow_battle_screen.h"
|
||||
#include "battle.h"
|
||||
#include "palette.h"
|
||||
#include "pokemon.h"
|
||||
#include "main.h"
|
||||
#include "scanline_effect.h"
|
||||
#include "text.h"
|
||||
@@ -18,8 +19,6 @@
|
||||
|
||||
extern const union AnimCmd * const * const gMonAnimationsSpriteAnimsPtrTable[];
|
||||
|
||||
extern void SetMultiuseSpriteTemplateToTrainerBack(u16 backPicId, u8 battlerPosition);
|
||||
|
||||
// this file's functions
|
||||
static void CB2_ReshowBattleScreenAfterMenu(void);
|
||||
static bool8 LoadBattlerSpriteGfx(u8 battlerId);
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user