Merge remote-tracking branch 'upstream/master' into use_pokeblock

# Conflicts:
#	src/use_pokeblock.c
This commit is contained in:
Marcus Huderle
2019-03-23 09:39:46 -05:00
5866 changed files with 120190 additions and 82893 deletions
+416 -416
View File
@@ -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");
+2 -2
View File
@@ -1619,7 +1619,7 @@ static u8 CreateAndShowWindow(u8 left, u8 top, u8 width, u8 height)
static void RemoveAndHideWindow(u8 windowId)
{
sub_8198070(windowId, TRUE);
ClearStdWindowAndFrameToTransparent(windowId, TRUE);
RemoveWindow(windowId);
}
@@ -1826,7 +1826,7 @@ static void Script_PrintMessage(void)
FreezeEventObjects();
sub_808B864();
sub_808BCF4();
NewMenuHelpers_DrawDialogueFrame(0, 1);
DrawDialogueFrame(0, 1);
PrintMessage();
}
+173 -173
View File
@@ -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,
};
@@ -1924,7 +1924,7 @@ bool8 IsBattlerSpriteVisible(u8 battlerId)
void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible)
{
struct UnknownAnimStruct2 unknownStruct;
struct BattleAnimBgData animBg;
u8 battlerSpriteId;
if (!toBG_2)
@@ -1933,18 +1933,18 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible)
if (IsContest() == TRUE)
{
RequestDma3Fill(0, (void*)(VRAM + 0x8000), 0x2000, 1);
RequestDma3Fill(0xFF, (void*)(VRAM + 0xF000), 0x1000, 0);
RequestDma3Fill(0, (void*)(BG_SCREEN_ADDR(16)), 0x2000, 1);
RequestDma3Fill(0xFF, (void*)(BG_SCREEN_ADDR(30)), 0x1000, 0);
}
else
{
RequestDma3Fill(0, (void*)(VRAM + 0x4000), 0x2000, 1);
RequestDma3Fill(0xFF, (void*)(VRAM + 0xe000), 0x1000, 0);
RequestDma3Fill(0, (void*)(BG_SCREEN_ADDR(8)), 0x2000, 1);
RequestDma3Fill(0xFF, (void*)(BG_SCREEN_ADDR(28)), 0x1000, 0);
}
sub_80A6B30(&unknownStruct);
CpuFill16(0, unknownStruct.bgTiles, 0x1000);
CpuFill16(0xFF, unknownStruct.unk4, 0x800);
sub_80A6B30(&animBg);
CpuFill16(0, animBg.bgTiles, 0x1000);
CpuFill16(0xFF, animBg.bgTilemap, 0x800);
SetAnimBgAttribute(1, BG_ANIM_PRIORITY, 2);
SetAnimBgAttribute(1, BG_ANIM_SCREEN_SIZE, 1);
@@ -1963,26 +1963,26 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible)
SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X);
SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
LoadPalette(&gPlttBufferUnfaded[0x100 + battlerId * 16], unknownStruct.unk8 * 16, 0x20);
CpuCopy32(&gPlttBufferUnfaded[0x100 + battlerId * 16], (void*)(BG_PLTT + unknownStruct.unk8 * 32), 0x20);
LoadPalette(&gPlttBufferUnfaded[0x100 + battlerId * 16], animBg.paletteId * 16, 0x20);
CpuCopy32(&gPlttBufferUnfaded[0x100 + battlerId * 16], (void*)(BG_PLTT + animBg.paletteId * 32), 0x20);
if (IsContest())
battlerPosition = 0;
else
battlerPosition = GetBattlerPosition(battlerId);
sub_8118FBC(1, 0, 0, battlerPosition, unknownStruct.unk8, unknownStruct.bgTiles, unknownStruct.unk4, unknownStruct.tilesOffset);
sub_8118FBC(1, 0, 0, battlerPosition, animBg.paletteId, animBg.bgTiles, animBg.bgTilemap, animBg.tilesOffset);
if (IsContest())
sub_80A46A0();
}
else
{
RequestDma3Fill(0, (void*)(VRAM + 0x6000), 0x2000, 1);
RequestDma3Fill(0, (void*)(VRAM + 0xF000), 0x1000, 1);
sub_80A6B90(&unknownStruct, 2);
CpuFill16(0, unknownStruct.bgTiles + 0x1000, 0x1000);
CpuFill16(0, unknownStruct.unk4 + 0x400, 0x800);
RequestDma3Fill(0, (void*)(BG_SCREEN_ADDR(12)), 0x2000, 1);
RequestDma3Fill(0, (void*)(BG_SCREEN_ADDR(30)), 0x1000, 1);
sub_80A6B90(&animBg, 2);
CpuFill16(0, animBg.bgTiles + 0x1000, 0x1000);
CpuFill16(0, animBg.bgTilemap + 0x400, 0x800);
SetAnimBgAttribute(2, BG_ANIM_PRIORITY, 2);
SetAnimBgAttribute(2, BG_ANIM_SCREEN_SIZE, 1);
SetAnimBgAttribute(2, BG_ANIM_AREA_OVERFLOW_MODE, 0);
@@ -2001,20 +2001,20 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible)
LoadPalette(&gPlttBufferUnfaded[0x100 + battlerId * 16], 0x90, 0x20);
CpuCopy32(&gPlttBufferUnfaded[0x100 + battlerId * 16], (void*)(BG_PLTT + 0x120), 0x20);
sub_8118FBC(2, 0, 0, GetBattlerPosition(battlerId), unknownStruct.unk8, unknownStruct.bgTiles + 0x1000, unknownStruct.unk4 + 0x400, unknownStruct.tilesOffset);
sub_8118FBC(2, 0, 0, GetBattlerPosition(battlerId), animBg.paletteId, animBg.bgTiles + 0x1000, animBg.bgTilemap + 0x400, animBg.tilesOffset);
}
}
static void sub_80A46A0(void)
{
s32 i, j;
struct UnknownAnimStruct2 unknownStruct;
struct BattleAnimBgData animBg;
u16 *ptr;
if (IsSpeciesNotUnown(gContestResources->field_18->species))
{
sub_80A6B30(&unknownStruct);
ptr = unknownStruct.unk4;
sub_80A6B30(&animBg);
ptr = animBg.bgTilemap;
for (i = 0; i < 8; i++)
{
for (j = 0; j < 4; j++)
@@ -2052,8 +2052,8 @@ void sub_80A4720(u16 a, u16 *b, u32 c, u8 d)
void sub_80A477C(bool8 to_BG2)
{
struct UnknownAnimStruct2 unknownStruct;
sub_80A6B30(&unknownStruct);
struct BattleAnimBgData animBg;
sub_80A6B30(&animBg);
if (!to_BG2 || IsContest())
{
@@ -2073,11 +2073,11 @@ static void task_pA_ma0A_obj_to_bg_pal(u8 taskId)
{
u8 spriteId, palIndex;
s16 x, y;
struct UnknownAnimStruct2 unknownStruct;
struct BattleAnimBgData animBg;
spriteId = gTasks[taskId].data[0];
palIndex = gTasks[taskId].data[6];
sub_80A6B30(&unknownStruct);
sub_80A6B30(&animBg);
x = gTasks[taskId].data[1] - (gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x);
y = gTasks[taskId].data[2] - (gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y);
@@ -2089,7 +2089,7 @@ static void task_pA_ma0A_obj_to_bg_pal(u8 taskId)
gBattle_BG1_X = x + gTasks[taskId].data[3];
gBattle_BG1_Y = y + gTasks[taskId].data[4];
src = gPlttBufferFaded + 0x100 + palIndex * 16;
dst = gPlttBufferFaded + 0x100 + unknownStruct.unk8 * 16 - 256;
dst = gPlttBufferFaded + 0x100 + animBg.paletteId * 16 - 256;
CpuCopy32(src, dst, 0x20);
}
else
@@ -2452,15 +2452,15 @@ static void LoadMoveBg(u16 bgId)
LZDecompressWram(tilemap, gDecompressionBuffer);
sub_80A4720(sub_80A6D94(), (void*)(gDecompressionBuffer), 0x100, 0);
dmaSrc = gDecompressionBuffer;
dmaDest = (void *)(VRAM + 0xD000);
dmaDest = (void *)(BG_SCREEN_ADDR(26));
DmaCopy32(3, dmaSrc, dmaDest, 0x800);
LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(VRAM + 0x2000));
LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(BG_SCREEN_ADDR(4)));
LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, sub_80A6D94() * 16, 32);
}
else
{
LZDecompressVram(gBattleAnimBackgroundTable[bgId].tilemap, (void *)(VRAM + 0xD000));
LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(VRAM + 0x8000));
LZDecompressVram(gBattleAnimBackgroundTable[bgId].tilemap, (void *)(BG_SCREEN_ADDR(26)));
LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(BG_CHAR_ADDR(2)));
LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, 32, 32);
}
}
+112 -115
View File
@@ -33,21 +33,18 @@ extern const u8 gEnemyMonElevation[];
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
extern const union AffineAnimCmd *gUnknown_082FF6C0[];
// This file's functions.
void sub_80A64EC(struct Sprite *sprite);
void sub_80A6FB4(struct Sprite *sprite);
void sub_80A7144(struct Sprite *sprite);
void sub_80A791C(struct Sprite *sprite);
void sub_80A8DFC(struct Sprite *sprite);
void sub_80A8E88(struct Sprite *sprite);
void SetBattlerSpriteYOffsetFromYScale(u8 spriteId);
u16 GetBattlerYDeltaFromSpriteId(u8 spriteId);
void AnimTask_BlendMonInAndOutSetup(struct Task *task);
void sub_80A7AFC(u8 taskId);
void sub_80A8CAC(u8 taskId);
void AnimTask_BlendMonInAndOutStep(u8 taskId);
bool8 sub_80A7238(void);
void sub_80A8D78(struct Task *task, u8 taskId);
static void sub_80A6FB4(struct Sprite *sprite);
static void sub_80A7144(struct Sprite *sprite);
static void sub_80A791C(struct Sprite *sprite);
static void sub_80A8DFC(struct Sprite *sprite);
static void sub_80A8E88(struct Sprite *sprite);
static u16 GetBattlerYDeltaFromSpriteId(u8 spriteId);
static void AnimTask_BlendMonInAndOutSetup(struct Task *task);
static void sub_80A7AFC(u8 taskId);
static void sub_80A8CAC(u8 taskId);
static void AnimTask_BlendMonInAndOutStep(u8 taskId);
static bool8 sub_80A7238(void);
static void sub_80A8D78(struct Task *task, u8 taskId);
// EWRAM vars
EWRAM_DATA static union AffineAnimCmd *gAnimTaskAffineAnim = NULL;
@@ -503,7 +500,7 @@ void sub_80A63C8(struct Sprite *sprite)
}
}
void sub_80A6450(struct Sprite *sprite)
void TranslateSpriteInEllipseOverDuration(struct Sprite *sprite)
{
if (sprite->data[3])
{
@@ -533,28 +530,28 @@ void WaitAnimForDuration(struct Sprite *sprite)
SetCallbackToStoredInData6(sprite);
}
void sub_80A64D0(struct Sprite *sprite)
static void sub_80A64D0(struct Sprite *sprite)
{
sub_80A64EC(sprite);
sprite->callback = TranslateSpriteOverDuration;
sprite->callback = TranslateSpriteLinear;
sprite->callback(sprite);
}
void sub_80A64EC(struct Sprite *sprite)
{
s16 old;
int v1;
int xDiff;
if (sprite->data[1] > sprite->data[2])
sprite->data[0] = -sprite->data[0];
v1 = sprite->data[2] - sprite->data[1];
xDiff = sprite->data[2] - sprite->data[1];
old = sprite->data[0];
sprite->data[0] = abs(v1 / sprite->data[0]);
sprite->data[0] = abs(xDiff / sprite->data[0]);
sprite->data[2] = (sprite->data[4] - sprite->data[3]) / sprite->data[0];
sprite->data[1] = old;
}
void TranslateSpriteOverDuration(struct Sprite *sprite)
void TranslateSpriteLinear(struct Sprite *sprite)
{
if (sprite->data[0] > 0)
{
@@ -568,7 +565,7 @@ void TranslateSpriteOverDuration(struct Sprite *sprite)
}
}
void AnimTranslateLinearSimple(struct Sprite *sprite)
void TranslateSpriteLinearFixedPoint(struct Sprite *sprite)
{
if (sprite->data[0] > 0)
{
@@ -584,7 +581,7 @@ void AnimTranslateLinearSimple(struct Sprite *sprite)
}
}
void sub_80A65A8(struct Sprite *sprite)
static void TranslateSpriteLinearFixedPointIconFrame(struct Sprite *sprite)
{
if (sprite->data[0] > 0)
{
@@ -598,6 +595,7 @@ void sub_80A65A8(struct Sprite *sprite)
{
SetCallbackToStoredInData6(sprite);
}
UpdateMonIconFrame(sprite);
}
@@ -605,12 +603,12 @@ void sub_80A65EC(struct Sprite *sprite)
{
sprite->data[1] = sprite->pos1.x + sprite->pos2.x;
sprite->data[3] = sprite->pos1.y + sprite->pos2.y;
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
sprite->callback = sub_80A64D0;
}
void TranslateMonBGUntil(struct Sprite *sprite)
void TranslateMonSpriteLinear(struct Sprite *sprite)
{
if (sprite->data[0] > 0)
{
@@ -624,9 +622,7 @@ void TranslateMonBGUntil(struct Sprite *sprite)
}
}
// Same as TranslateMonBGUntil, but it operates on sub-pixel values
// to handle slower translations.
void sub_80A6680(struct Sprite *sprite)
void TranslateMonSpriteLinearFixedPoint(struct Sprite *sprite)
{
if (sprite->data[0] > 0)
{
@@ -642,7 +638,7 @@ void sub_80A6680(struct Sprite *sprite)
}
}
void sub_80A66DC(struct Sprite *sprite)
void TranslateSpriteLinearAndFlicker(struct Sprite *sprite)
{
if (sprite->data[0] > 0)
{
@@ -673,8 +669,8 @@ void sub_80A6760(struct Sprite *sprite)
{
sprite->data[1] = sprite->pos1.x + sprite->pos2.x;
sprite->data[3] = sprite->pos1.y + sprite->pos2.y;
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
sprite->callback = sub_80A64D0;
}
@@ -696,7 +692,7 @@ void RunStoredCallbackWhenAnimEnds(struct Sprite *sprite)
SetCallbackToStoredInData6(sprite);
}
void sub_80A67F4(struct Sprite *sprite)
void DestroyAnimSpriteAndDisableBlend(struct Sprite *sprite)
{
SetGpuReg(REG_OFFSET_BLDCNT, 0);
SetGpuReg(REG_OFFSET_BLDALPHA, 0);
@@ -749,7 +745,7 @@ void InitAnimArcTranslation(struct Sprite *sprite)
sprite->data[7] = 0;
}
bool8 TranslateAnimArc(struct Sprite *sprite)
bool8 TranslateAnimHorizontalArc(struct Sprite *sprite)
{
if (AnimTranslateLinear(sprite))
return TRUE;
@@ -758,7 +754,7 @@ bool8 TranslateAnimArc(struct Sprite *sprite)
return FALSE;
}
bool8 sub_80A6934(struct Sprite *sprite)
bool8 TranslateAnimVerticalArc(struct Sprite *sprite)
{
if (AnimTranslateLinear(sprite))
return TRUE;
@@ -767,7 +763,7 @@ bool8 sub_80A6934(struct Sprite *sprite)
return FALSE;
}
void oamt_add_pos2_onto_pos1(struct Sprite *sprite)
void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite)
{
sprite->pos1.x += sprite->pos2.x;
sprite->pos1.y += sprite->pos2.y;
@@ -862,38 +858,38 @@ bool8 IsDoubleBattle(void)
return IS_DOUBLE_BATTLE();
}
void sub_80A6B30(struct UnknownAnimStruct2 *unk)
void sub_80A6B30(struct BattleAnimBgData *unk)
{
if (IsContest())
{
unk->bgTiles = gUnknown_0202305C;
unk->unk4 = (u16 *)gUnknown_02023060;
unk->unk8 = 0xe;
unk->bgTilemap = (u16 *)gUnknown_02023060;
unk->paletteId = 14;
unk->bgId = 1;
unk->tilesOffset = 0;
unk->unkC = 0;
unk->unused = 0;
}
else
{
unk->bgTiles = gUnknown_0202305C;
unk->unk4 = (u16 *)gUnknown_02023060;
unk->unk8 = 0x8;
unk->bgTilemap = (u16 *)gUnknown_02023060;
unk->paletteId = 8;
unk->bgId = 1;
unk->tilesOffset = 0x200;
unk->unkC = 0;
unk->unused = 0;
}
}
void sub_80A6B90(struct UnknownAnimStruct2 *unk, u32 arg1)
void sub_80A6B90(struct BattleAnimBgData *unk, u32 arg1)
{
if (IsContest())
{
unk->bgTiles = gUnknown_0202305C;
unk->unk4 = (u16 *)gUnknown_02023060;
unk->unk8 = 0xe;
unk->bgTilemap = (u16 *)gUnknown_02023060;
unk->paletteId = 14;
unk->bgId = 1;
unk->tilesOffset = 0;
unk->unkC = 0;
unk->unused = 0;
}
else if (arg1 == 1)
{
@@ -902,76 +898,76 @@ void sub_80A6B90(struct UnknownAnimStruct2 *unk, u32 arg1)
else
{
unk->bgTiles = gUnknown_0202305C;
unk->unk4 = (u16 *)gUnknown_02023060;
unk->unk8 = 0x9;
unk->bgTilemap = (u16 *)gUnknown_02023060;
unk->paletteId = 9;
unk->bgId = 2;
unk->tilesOffset = 0x300;
unk->unkC = 0;
unk->unused = 0;
}
}
void sub_80A6BFC(struct UnknownAnimStruct2 *unk, u8 unused)
void sub_80A6BFC(struct BattleAnimBgData *unk, u8 unused)
{
unk->bgTiles = gUnknown_0202305C;
unk->unk4 = (u16 *)gUnknown_02023060;
unk->bgTilemap = (u16 *)gUnknown_02023060;
if (IsContest())
{
unk->unk8 = 0xe;
unk->paletteId = 14;
unk->bgId = 1;
unk->tilesOffset = 0;
unk->unkC = 0;
unk->unused = 0;
}
else if (GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) == 1)
{
unk->unk8 = 8;
unk->paletteId = 8;
unk->bgId = 1;
unk->tilesOffset = 0x200;
unk->unkC = 0;
unk->unused = 0;
}
else
{
unk->unk8 = 0x9;
unk->paletteId = 9;
unk->bgId = 2;
unk->tilesOffset = 0x300;
unk->unkC = 0;
unk->unused = 0;
}
}
void sub_80A6C68(u32 bgId)
{
struct UnknownAnimStruct2 unkStruct;
struct BattleAnimBgData unkStruct;
sub_80A6B90(&unkStruct, bgId);
CpuFill32(0, unkStruct.bgTiles, 0x2000);
LoadBgTiles(unkStruct.bgId, unkStruct.bgTiles, 0x2000, unkStruct.tilesOffset);
FillBgTilemapBufferRect(unkStruct.bgId, 0, 0, 0, 0x20, 0x40, 0x11);
FillBgTilemapBufferRect(unkStruct.bgId, 0, 0, 0, 32, 64, 17);
CopyBgTilemapBufferToVram(unkStruct.bgId);
}
void sub_80A6CC0(u32 bgId, const u32 *src, u32 tilesOffset)
void AnimLoadCompressedBgGfx(u32 bgId, const u32 *src, u32 tilesOffset)
{
CpuFill32(0, gUnknown_0202305C, 0x2000);
LZDecompressWram(src, gUnknown_0202305C);
LoadBgTiles(bgId, gUnknown_0202305C, 0x2000, tilesOffset);
}
void sub_80A6D10(u32 bgId, const void *src)
static void InitAnimBgTilemapBuffer(u32 bgId, const void *src)
{
FillBgTilemapBufferRect(bgId, 0, 0, 0, 0x20, 0x40, 0x11);
FillBgTilemapBufferRect(bgId, 0, 0, 0, 32, 64, 17);
CopyToBgTilemapBuffer(bgId, src, 0, 0);
}
void sub_80A6D48(u32 bgId, const void *src)
void AnimLoadCompressedBgTilemap(u32 bgId, const void *src)
{
sub_80A6D10(bgId, src);
InitAnimBgTilemapBuffer(bgId, src);
CopyBgTilemapBufferToVram(bgId);
}
void sub_80A6D60(struct UnknownAnimStruct2 *unk, const void *src, u32 arg2)
void sub_80A6D60(struct BattleAnimBgData *unk, const void *src, u32 arg2)
{
sub_80A6D10(unk->bgId, src);
InitAnimBgTilemapBuffer(unk->bgId, src);
if (IsContest() == TRUE)
sub_80A4720(unk->unk8, unk->unk4, 0, arg2);
sub_80A4720(unk->paletteId, unk->bgTilemap, 0, arg2);
CopyBgTilemapBufferToVram(unk->bgId);
}
@@ -1002,7 +998,7 @@ void sub_80A6DEC(struct Sprite *sprite)
sprite->data[1] = sprite->pos1.x;
sprite->data[3] = sprite->pos1.y;
InitSpriteDataForLinearTranslation(sprite);
sprite->callback = sub_80A65A8;
sprite->callback = TranslateSpriteLinearFixedPointIconFrame;
sprite->callback(sprite);
}
@@ -1098,7 +1094,7 @@ void sub_80A6F98(struct Sprite *sprite)
SetCallbackToStoredInData6(sprite);
}
void sub_80A6FB4(struct Sprite *sprite)
static void sub_80A6FB4(struct Sprite *sprite)
{
sub_8039E9C(sprite);
if (AnimTranslateLinear(sprite))
@@ -1188,7 +1184,7 @@ bool8 AnimFastTranslateLinear(struct Sprite *sprite)
return FALSE;
}
void sub_80A7144(struct Sprite *sprite)
static void sub_80A7144(struct Sprite *sprite)
{
if (AnimFastTranslateLinear(sprite))
SetCallbackToStoredInData6(sprite);
@@ -1229,7 +1225,7 @@ void SetSpriteRotScale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation)
gOamMatrices[i].d = matrix.d;
}
bool8 sub_80A7238(void)
static bool8 sub_80A7238(void)
{
if (IsContest())
{
@@ -1352,56 +1348,57 @@ void SetGreyscaleOrOriginalPalette(u16 paletteNum, bool8 restoreOriginalColor)
}
}
u32 sub_80A75AC(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7)
u32 sub_80A75AC(u8 battleBackground, u8 attacker, u8 target, u8 attackerPartner, u8 targetPartner, u8 a6, u8 a7)
{
u32 var = 0;
u32 selectedPalettes = 0;
u32 shift;
if (a1)
if (battleBackground)
{
if (!IsContest())
var = 0xe;
selectedPalettes = 0xe;
else
var = 1 << sub_80A6D94();
selectedPalettes = 1 << sub_80A6D94();
}
if (a2)
if (attacker)
{
shift = gBattleAnimAttacker + 16;
var |= 1 << shift;
selectedPalettes |= 1 << shift;
}
if (a3) {
shift = gBattleAnimTarget + 16;
var |= 1 << shift;
}
if (a4)
if (target)
{
if (IsBattlerSpriteVisible(gBattleAnimAttacker ^ 2))
shift = gBattleAnimTarget + 16;
selectedPalettes |= 1 << shift;
}
if (attackerPartner)
{
if (IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker)))
{
shift = (gBattleAnimAttacker ^ 2) + 16;
var |= 1 << shift;
shift = BATTLE_PARTNER(gBattleAnimAttacker) + 16;
selectedPalettes |= 1 << shift;
}
}
if (a5)
if (targetPartner)
{
if (IsBattlerSpriteVisible(gBattleAnimTarget ^ 2))
if (IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimTarget)))
{
shift = (gBattleAnimTarget ^ 2) + 16;
var |= 1 << shift;
shift = BATTLE_PARTNER(gBattleAnimTarget) + 16;
selectedPalettes |= 1 << shift;
}
}
if (a6)
{
if (!IsContest())
var |= 0x100;
selectedPalettes |= 0x100;
else
var |= 0x4000;
selectedPalettes |= 0x4000;
}
if (a7)
{
if (!IsContest())
var |= 0x200;
selectedPalettes |= 0x200;
}
return var;
return selectedPalettes;
}
u32 sub_80A76C4(u8 a1, u8 a2, u8 a3, u8 a4)
@@ -1459,7 +1456,7 @@ u8 sub_80A77AC(u8 a1)
return a1;
}
u8 sub_80A77B4(u8 position)
static u8 GetBattlerAtPosition_(u8 position)
{
return GetBattlerAtPosition(position);
}
@@ -1527,33 +1524,33 @@ void sub_80A78AC(struct Sprite *sprite)
if (GetBattlerSide(gBattleAnimAttacker))
gBattleAnimArgs[2] = -gBattleAnimArgs[2];
sprite->data[0] = gBattleAnimArgs[4];
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2];
sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3];
sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + gBattleAnimArgs[2];
sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[3];
sprite->data[5] = gBattleAnimArgs[5];
InitAnimArcTranslation(sprite);
sprite->callback = sub_80A791C;
}
void sub_80A791C(struct Sprite *sprite)
static void sub_80A791C(struct Sprite *sprite)
{
if (TranslateAnimArc(sprite))
if (TranslateAnimHorizontalArc(sprite))
DestroyAnimSprite(sprite);
}
void sub_80A7938(struct Sprite *sprite)
{
bool8 r4;
u8 battlerId, attributeId;
u8 battlerId, coordType;
if (!gBattleAnimArgs[6])
{
r4 = TRUE;
attributeId = BATTLER_COORD_Y_PIC_OFFSET;
coordType = BATTLER_COORD_Y_PIC_OFFSET;
}
else
{
r4 = FALSE;
attributeId = BATTLER_COORD_Y;
coordType = BATTLER_COORD_Y;
}
if (!gBattleAnimArgs[5])
{
@@ -1570,7 +1567,7 @@ void sub_80A7938(struct Sprite *sprite)
InitSpritePosToAnimTarget(sprite, r4);
sprite->data[0] = gBattleAnimArgs[4];
sprite->data[2] = GetBattlerSpriteCoord(battlerId, BATTLER_COORD_X_2) + gBattleAnimArgs[2];
sprite->data[4] = GetBattlerSpriteCoord(battlerId, attributeId) + gBattleAnimArgs[3];
sprite->data[4] = GetBattlerSpriteCoord(battlerId, coordType) + gBattleAnimArgs[3];
sprite->callback = StartAnimLinearTranslation;
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
}
@@ -1629,7 +1626,7 @@ void sub_80A7A74(u8 taskId)
gTasks[taskId].func = sub_80A7AFC;
}
void sub_80A7AFC(u8 taskId)
static void sub_80A7AFC(u8 taskId)
{
struct Task *task = &gTasks[taskId];
@@ -1674,7 +1671,7 @@ void AnimTask_BlendMonInAndOut(u8 task)
AnimTask_BlendMonInAndOutSetup(&gTasks[task]);
}
void AnimTask_BlendMonInAndOutSetup(struct Task *task)
static void AnimTask_BlendMonInAndOutSetup(struct Task *task)
{
task->data[1] = gBattleAnimArgs[1];
task->data[2] = 0;
@@ -1686,7 +1683,7 @@ void AnimTask_BlendMonInAndOutSetup(struct Task *task)
task->func = AnimTask_BlendMonInAndOutStep;
}
void AnimTask_BlendMonInAndOutStep(u8 taskId)
static void AnimTask_BlendMonInAndOutStep(u8 taskId)
{
struct Task *task = &gTasks[taskId];
@@ -1844,7 +1841,7 @@ void SetBattlerSpriteYOffsetFromOtherYScale(u8 spriteId, u8 otherSpriteId)
gSprites[spriteId].pos2.y = (var - var2) / 2;
}
u16 GetBattlerYDeltaFromSpriteId(u8 spriteId)
static u16 GetBattlerYDeltaFromSpriteId(u8 spriteId)
{
struct BattleSpriteInfo *spriteInfo;
u8 battlerId = gSprites[spriteId].data[0];
@@ -2300,7 +2297,7 @@ void sub_80A8A6C(struct Sprite *sprite)
sprite->data[3] = gBattleAnimArgs[4];
sprite->data[5] = gBattleAnimArgs[5];
StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
sprite->callback = sub_80A66DC;
sprite->callback = TranslateSpriteLinearAndFlicker;
}
void sub_80A8AEC(struct Sprite *sprite)
@@ -2321,7 +2318,7 @@ void sub_80A8AEC(struct Sprite *sprite)
sprite->data[5] = gBattleAnimArgs[5];
StartSpriteAnim(sprite, gBattleAnimArgs[6]);
StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
sprite->callback = sub_80A66DC;
sprite->callback = TranslateSpriteLinearAndFlicker;
}
void sub_80A8B64(struct Sprite *sprite)
@@ -2362,7 +2359,7 @@ void sub_80A8BC4(u8 taskId)
task->func = sub_80A8CAC;
}
void sub_80A8CAC(u8 taskId)
static void sub_80A8CAC(u8 taskId)
{
struct Task *task = &gTasks[taskId];
switch (task->data[2])
@@ -2395,7 +2392,7 @@ void sub_80A8CAC(u8 taskId)
}
}
void sub_80A8D78(struct Task *task, u8 taskId)
static void sub_80A8D78(struct Task *task, u8 taskId)
{
s16 spriteId = CloneBattlerSpriteWithBlend(0);
if (spriteId >= 0)
@@ -2411,7 +2408,7 @@ void sub_80A8D78(struct Task *task, u8 taskId)
}
}
void sub_80A8DFC(struct Sprite *sprite)
static void sub_80A8DFC(struct Sprite *sprite)
{
if (--sprite->data[0] == 0)
{
@@ -2432,7 +2429,7 @@ void sub_80A8E30(struct Sprite *sprite)
sprite->callback = sub_80A8E88;
}
void sub_80A8E88(struct Sprite *sprite)
static void sub_80A8E88(struct Sprite *sprite)
{
sprite->data[2] += sprite->data[0];
sprite->data[3] += sprite->data[1];
+176
View File
@@ -28,6 +28,182 @@ static void sub_80A9E44(struct Sprite *sprite);
static void sub_80A9E78(struct Sprite *sprite);
// const rom data
static const union AnimCmd sSpriteAnim_853EDE4[] =
{
ANIMCMD_FRAME(0, 3),
ANIMCMD_FRAME(4, 3),
ANIMCMD_FRAME(8, 3),
ANIMCMD_FRAME(12, 3),
ANIMCMD_JUMP(0)
};
static const union AnimCmd *const sSpriteAnimTable_853EDF8[] =
{
sSpriteAnim_853EDE4
};
const struct SpriteTemplate gUnknown_0853EDFC =
{
.tileTag = ANIM_TAG_UNUSED_ORB,
.paletteTag = ANIM_TAG_UNUSED_ORB,
.oam = &gUnknown_0852490C,
.anims = sSpriteAnimTable_853EDF8,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80A8AEC,
};
const struct SpriteTemplate gUnknown_0853EE14 =
{
.tileTag = ANIM_TAG_UNUSED_ORB,
.paletteTag = ANIM_TAG_UNUSED_ORB,
.oam = &gUnknown_0852490C,
.anims = sSpriteAnimTable_853EDF8,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80A8A6C,
};
static const union AnimCmd sSpriteAnim_853EE2C[] =
{
ANIMCMD_FRAME(0, 3),
ANIMCMD_JUMP(0)
};
static const union AnimCmd *const sSpriteAnimTable_853EE34[] =
{
sSpriteAnim_853EE2C
};
const struct SpriteTemplate gUnknown_0853EE38 =
{
.tileTag = ANIM_TAG_WEATHER_BALL,
.paletteTag = ANIM_TAG_WEATHER_BALL,
.oam = &gUnknown_08524914,
.anims = sSpriteAnimTable_853EE34,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80A8E30,
};
const struct SpriteTemplate gUnknown_0853EE50 =
{
.tileTag = ANIM_TAG_WEATHER_BALL,
.paletteTag = ANIM_TAG_WEATHER_BALL,
.oam = &gUnknown_08524914,
.anims = sSpriteAnimTable_853EE34,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80A8EE4,
};
static const union AnimCmd sSpriteAnim_853EE68[] =
{
ANIMCMD_FRAME(0, 3),
ANIMCMD_FRAME(16, 3),
ANIMCMD_FRAME(32, 3),
ANIMCMD_FRAME(48, 3),
ANIMCMD_FRAME(64, 3),
ANIMCMD_END
};
static const union AnimCmd *const sSpriteAnimTable_853EE80[] =
{
sSpriteAnim_853EE68
};
const struct SpriteTemplate gUnknown_0853EE84 =
{
.tileTag = ANIM_TAG_SPARKLE_4,
.paletteTag = ANIM_TAG_SPARKLE_4,
.oam = &gUnknown_08524914,
.anims = sSpriteAnimTable_853EE80,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80A8B64,
};
const struct SpriteTemplate gUnknown_0853EE9C =
{
.tileTag = ANIM_TAG_UNUSED_MONSTER_FOOT,
.paletteTag = ANIM_TAG_UNUSED_MONSTER_FOOT,
.oam = &gUnknown_08524914,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80A8AEC,
};
static const union AnimCmd sSpriteAnim_853EEB4[] =
{
ANIMCMD_FRAME(0, 5),
ANIMCMD_JUMP(0)
};
static const union AnimCmd sSpriteAnim_853EEBC[] =
{
ANIMCMD_FRAME(0, 5),
ANIMCMD_JUMP(0)
};
static const union AnimCmd sSpriteAnim_853EEC4[] =
{
ANIMCMD_FRAME(0, 5),
ANIMCMD_JUMP(0)
};
static const union AnimCmd *const sSpriteAnimTable_853EECC[] =
{
sSpriteAnim_853EEB4,
sSpriteAnim_853EEBC,
sSpriteAnim_853EEC4
};
const struct SpriteTemplate gUnknown_0853EED8 =
{
.tileTag = ANIM_TAG_IMPACT,
.paletteTag = ANIM_TAG_IMPACT,
.oam = &gUnknown_08524914,
.anims = sSpriteAnimTable_853EECC,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80A8AEC,
};
static const union AnimCmd sSpriteAnim_853EEF0[] =
{
ANIMCMD_FRAME(0, 15),
ANIMCMD_JUMP(0)
};
static const union AnimCmd *const sSpriteAnimTable_853EEF8[] =
{
sSpriteAnim_853EEF0
};
static const union AffineAnimCmd sSpriteAffineAnim_853EEFC[] =
{
AFFINEANIMCMD_FRAME(96, 96, 0, 0),
AFFINEANIMCMD_FRAME(2, 2, 0, 1),
AFFINEANIMCMD_JUMP(1)
};
static const union AffineAnimCmd *const sSpriteAffineAnimTable_853EEF8[] =
{
sSpriteAffineAnim_853EEFC
};
const struct SpriteTemplate gUnknown_0853EF18 =
{
.tileTag = ANIM_TAG_UNUSED_ORB,
.paletteTag = ANIM_TAG_UNUSED_ORB,
.oam = &gUnknown_085249CC,
.anims = sSpriteAnimTable_853EEF8,
.images = NULL,
.affineAnims = sSpriteAffineAnimTable_853EEF8,
.callback = sub_80A8A6C,
};
static const struct Subsprite gUnknown_0853EF30[] =
{
{.x = -16, .y = -16, .shape = ST_OAM_SQUARE, .size = 3, .tileOffset = 0, .priority = 2},
+6 -6
View File
@@ -441,14 +441,14 @@ static void DoHorizontalLunge(struct Sprite *sprite)
sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker];
sprite->data[4] = gBattleAnimArgs[0];
StoreSpriteCallbackInData6(sprite, ReverseHorizontalLungeDirection);
sprite->callback = TranslateMonBGUntil;
sprite->callback = TranslateMonSpriteLinear;
}
static void ReverseHorizontalLungeDirection(struct Sprite *sprite)
{
sprite->data[0] = sprite->data[4];
sprite->data[1] = -sprite->data[1];
sprite->callback = TranslateMonBGUntil;
sprite->callback = TranslateMonSpriteLinear;
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
}
@@ -468,14 +468,14 @@ static void DoVerticalDip(struct Sprite *sprite)
sprite->data[3] = spriteId;
sprite->data[4] = gBattleAnimArgs[0];
StoreSpriteCallbackInData6(sprite, ReverseVerticalDipDirection);
sprite->callback = TranslateMonBGUntil;
sprite->callback = TranslateMonSpriteLinear;
}
static void ReverseVerticalDipDirection(struct Sprite *sprite)
{
sprite->data[0] = sprite->data[4];
sprite->data[2] = -sprite->data[2];
sprite->callback = TranslateMonBGUntil;
sprite->callback = TranslateMonSpriteLinear;
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
}
@@ -581,7 +581,7 @@ static void SlideMonToOffset(struct Sprite *sprite)
sprite->data[5] = monSpriteId;
sprite->invisible = TRUE;
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
sprite->callback = sub_80A6680;
sprite->callback = TranslateMonSpriteLinearFixedPoint;
}
static void sub_80D5B48(struct Sprite *sprite)
@@ -624,7 +624,7 @@ static void sub_80D5B48(struct Sprite *sprite)
{
StoreSpriteCallbackInData6(sprite, sub_80D5C20);
}
sprite->callback = sub_80A6680;
sprite->callback = TranslateMonSpriteLinearFixedPoint;
}
+7 -7
View File
@@ -392,7 +392,7 @@ extern const struct SpriteTemplate gMiniTwinklingStarSpriteTemplate;
void unref_sub_8170478(u8 taskId)
{
struct UnknownAnimStruct2 unknownStruct;
struct BattleAnimBgData unknownStruct;
u8 healthBoxSpriteId;
u8 battler;
u8 spriteId1, spriteId2, spriteId3, spriteId4;
@@ -426,9 +426,9 @@ void unref_sub_8170478(u8 taskId)
gSprites[spriteId4].callback = SpriteCallbackDummy;
sub_80A6B30(&unknownStruct);
sub_80A6D48(unknownStruct.bgId, gUnknown_08C2EA9C);
sub_80A6CC0(unknownStruct.bgId, gUnknown_08C2EA50, unknownStruct.tilesOffset);
LoadCompressedPalette(gCureBubblesPal, unknownStruct.unk8 << 4, 32);
AnimLoadCompressedBgTilemap(unknownStruct.bgId, gUnknown_08C2EA9C);
AnimLoadCompressedBgGfx(unknownStruct.bgId, gUnknown_08C2EA50, unknownStruct.tilesOffset);
LoadCompressedPalette(gCureBubblesPal, unknownStruct.paletteId << 4, 32);
gBattle_BG1_X = -gSprites[spriteId3].pos1.x + 32;
gBattle_BG1_Y = -gSprites[spriteId3].pos1.y - 32;
@@ -806,7 +806,7 @@ static void sub_8171134(struct Sprite *sprite)
u8 ballId;
int ballId2; // extra var needed to match
if (TranslateAnimArc(sprite))
if (TranslateAnimHorizontalArc(sprite))
{
if (gBattleSpritesDataPtr->animationData->ballThrowCaseId == BALL_TRAINER_BLOCK)
{
@@ -1276,7 +1276,7 @@ static void sub_81719EC(struct Sprite *sprite)
static void sub_8171AAC(struct Sprite *sprite)
{
sprite->invisible = !sprite->invisible;
if (TranslateAnimArc(sprite))
if (TranslateAnimHorizontalArc(sprite))
DestroySprite(sprite);
}
@@ -2206,7 +2206,7 @@ static void sub_817339C(struct Sprite *sprite)
static void sub_81733D4(struct Sprite *sprite)
{
if (TranslateAnimArc(sprite))
if (TranslateAnimHorizontalArc(sprite))
{
sprite->data[0] = 0;
sprite->invisible = 1;
+17 -17
View File
@@ -2326,7 +2326,7 @@ void AnimAbsorptionOrb(struct Sprite* sprite)
static void AnimAbsorptionOrbStep(struct Sprite* sprite)
{
if (TranslateAnimArc(sprite))
if (TranslateAnimHorizontalArc(sprite))
DestroyAnimSprite(sprite);
}
@@ -2401,7 +2401,7 @@ void AnimLeechSeed(struct Sprite* sprite)
static void AnimLeechSeedStep(struct Sprite* sprite)
{
if (TranslateAnimArc(sprite))
if (TranslateAnimHorizontalArc(sprite))
{
sprite->invisible = 1;
sprite->data[0] = 10;
@@ -2662,7 +2662,7 @@ static void AnimTranslateLinearSingleSineWaveStep(struct Sprite* sprite)
s16 r0;
sprite->data[0] = 1;
TranslateAnimArc(sprite);
TranslateAnimHorizontalArc(sprite);
r0 = sprite->data[7];
sprite->data[0] = a;
if (b > 200 && r0 < 56 && sprite->oam.affineParam == 0)
@@ -3325,7 +3325,7 @@ static void sub_8100128(u8 taskId)
{
case 4:
sub_8100524(task, taskId);
if (TranslateAnimArc(sprite))
if (TranslateAnimHorizontalArc(sprite))
{
task->data[15] = 5;
task->data[0] = 0xFF;
@@ -3333,7 +3333,7 @@ static void sub_8100128(u8 taskId)
break;
case 8:
sub_8100524(task, taskId);
if (TranslateAnimArc(sprite))
if (TranslateAnimHorizontalArc(sprite))
{
task->data[15] = 9;
task->data[0] = 0xFF;
@@ -3341,7 +3341,7 @@ static void sub_8100128(u8 taskId)
break;
case 0:
sub_8100524(task, taskId);
if (TranslateAnimArc(sprite))
if (TranslateAnimHorizontalArc(sprite))
{
task->data[15] = 1;
task->data[0] = 0xFF;
@@ -3367,7 +3367,7 @@ static void sub_8100128(u8 taskId)
break;
case 2:
sub_8100524(task, taskId);
if (TranslateAnimArc(sprite))
if (TranslateAnimHorizontalArc(sprite))
{
task->data[15] = 3;
task->data[0] = 0xFF;
@@ -3410,7 +3410,7 @@ static void sub_8100128(u8 taskId)
break;
case 6:
sub_8100524(task, taskId);
if (TranslateAnimArc(sprite))
if (TranslateAnimHorizontalArc(sprite))
{
task->data[15] = 7;
task->data[0] = 0xFF;
@@ -3453,7 +3453,7 @@ static void sub_8100128(u8 taskId)
break;
case 10:
sub_8100524(task, taskId);
if (TranslateAnimArc(sprite))
if (TranslateAnimHorizontalArc(sprite))
{
task->data[15] = 11;
task->data[0] = 0xFF;
@@ -3481,7 +3481,7 @@ static void sub_8100128(u8 taskId)
}
case 12:
sub_8100524(task, taskId);
if (TranslateAnimArc(sprite))
if (TranslateAnimHorizontalArc(sprite))
{
DestroySprite(sprite);
task->data[0]++;
@@ -3766,7 +3766,7 @@ void sub_8100A94(struct Sprite* sprite)
sprite->data[5] = gBattleAnimArgs[5];
StartSpriteAffineAnim(sprite, gBattleAnimArgs[6]);
StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
sprite->callback = sub_80A66DC;
sprite->callback = TranslateSpriteLinearAndFlicker;
}
// Moves the sprite in a diagonally slashing motion across the target mon.
@@ -3995,7 +3995,7 @@ static void sub_8100FD4(struct Sprite *sprite)
if (sprite->data[7] == 16)
{
sprite->invisible = 1;
sprite->callback = sub_80A67F4;
sprite->callback = DestroyAnimSpriteAndDisableBlend;
}
}
}
@@ -4121,7 +4121,7 @@ void sub_810130C(struct Sprite* sprite)
sprite->data[1] = gBattleAnimArgs[3];
sprite->data[2] = gBattleAnimArgs[4];
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
sprite->callback = AnimTranslateLinearSimple;
sprite->callback = TranslateSpriteLinearFixedPoint;
}
void sub_810135C(struct Sprite* sprite)
@@ -4158,7 +4158,7 @@ void sub_810135C(struct Sprite* sprite)
sprite->data[1] = gBattleAnimArgs[3];
sprite->data[2] = gBattleAnimArgs[4];
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
sprite->callback = AnimTranslateLinearSimple;
sprite->callback = TranslateSpriteLinearFixedPoint;
}
void sub_8101440(struct Sprite* sprite)
@@ -4428,7 +4428,7 @@ static void sub_8101998(struct Sprite* sprite)
sprite->data[2] = 0;
sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker];
StoreSpriteCallbackInData6(sprite, sub_81019E8);
sprite->callback = TranslateMonBGUntil;
sprite->callback = TranslateMonSpriteLinear;
}
static void sub_81019E8(struct Sprite* sprite)
@@ -4458,7 +4458,7 @@ static void sub_8101A74(struct Sprite* sprite)
sprite->data[2] = 0;
sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker];
StoreSpriteCallbackInData6(sprite, sub_8101B84);
sprite->callback = TranslateMonBGUntil;
sprite->callback = TranslateMonSpriteLinear;
}
static void sub_8101AC4(struct Sprite* sprite)
@@ -4737,7 +4737,7 @@ static void sub_8102044(struct Sprite* sprite)
sprite->data[1] = 8;
sprite->data[2] = 0;
StoreSpriteCallbackInData6(sprite, sub_810207C);
sprite->callback = TranslateSpriteOverDuration;
sprite->callback = TranslateSpriteLinear;
}
}
+23 -26
View File
@@ -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 *);
@@ -1264,7 +1261,7 @@ void sub_8103448(struct Sprite *sprite)
sprite->data[3] = gBattleAnimArgs[5];
sprite->data[4] = gBattleAnimArgs[3];
StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
sprite->callback = sub_80A6450;
sprite->callback = TranslateSpriteInEllipseOverDuration;
sprite->callback(sprite);
}
@@ -1417,7 +1414,7 @@ static void AnimTask_WithdrawStep(u8 taskId)
}
}
// Animates a "zap of energy" used in KINESIS.
// Animates a "zap of energy" used in KINESIS.
// arg 0: x pixel offset
// arg 1: y pixel offset
// arg 2: vertical flip
@@ -1592,7 +1589,7 @@ void sub_8103AA4(struct Sprite *sprite)
sprite->data[3] = sub_8151534(sub_8151534(b, a), sub_8151624(0x1C0));
sprite->data[4] = sub_8151534(sub_8151534(c, a), sub_8151624(0x1C0));
sprite->callback = sub_8103A00;
}
}
}
static void sub_8103BE4(u8 taskId)
@@ -2318,7 +2315,7 @@ void Anim_BreathPuff(struct Sprite *sprite)
sprite->data[3] = 0;
sprite->data[4] = 0;
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
sprite->callback = AnimTranslateLinearSimple;
sprite->callback = TranslateSpriteLinearFixedPoint;
}
// Animates an "angry" mark above a mon's head.
@@ -3291,7 +3288,7 @@ static void sub_810627C(struct Sprite *sprite)
void sub_81062E8(u8 taskId)
{
struct UnknownAnimStruct2 unknownStruct;
struct BattleAnimBgData animBg;
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND);
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16));
@@ -3304,16 +3301,16 @@ void sub_81062E8(u8 taskId)
gBattle_BG1_Y = 0;
SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X);
SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
sub_80A6B30(&unknownStruct);
sub_80A6CC0(unknownStruct.bgId, &gUnknown_08C232E0, unknownStruct.tilesOffset);
sub_80A6D60(&unknownStruct, &gUnknown_08C23D78, 0);
LoadCompressedPalette(&gUnknown_08C23D50, unknownStruct.unk8 << 4, 32);
sub_80A6B30(&animBg);
AnimLoadCompressedBgGfx(animBg.bgId, &gUnknown_08C232E0, animBg.tilesOffset);
sub_80A6D60(&animBg, &gUnknown_08C23D78, 0);
LoadCompressedPalette(&gUnknown_08C23D50, animBg.paletteId * 16, 32);
gTasks[taskId].func = sub_81063A8;
}
static void sub_81063A8(u8 taskId)
{
struct UnknownAnimStruct2 unknownStruct;
struct BattleAnimBgData animBg;
switch (gTasks[taskId].data[12])
{
@@ -3351,8 +3348,8 @@ static void sub_81063A8(u8 taskId)
}
break;
case 3:
sub_80A6B30(&unknownStruct);
sub_80A6C68(unknownStruct.bgId);
sub_80A6B30(&animBg);
sub_80A6C68(animBg.bgId);
gTasks[taskId].data[12]++;
break;
case 4:
@@ -3369,7 +3366,7 @@ static void sub_81063A8(u8 taskId)
void sub_81064F8(u8 taskId)
{
struct UnknownAnimStruct2 unknownStruct;
struct BattleAnimBgData animBg;
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND);
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16));
@@ -3382,22 +3379,22 @@ void sub_81064F8(u8 taskId)
gBattle_BG1_Y = 0;
SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X);
SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
sub_80A6B30(&unknownStruct);
sub_80A6B30(&animBg);
if (IsContest())
sub_80A6D60(&unknownStruct, &gBattleAnimBackgroundTilemap_ScaryFaceContest, 0);
sub_80A6D60(&animBg, &gBattleAnimBackgroundTilemap_ScaryFaceContest, 0);
else if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT)
sub_80A6D60(&unknownStruct, &gBattleAnimBackgroundTilemap_ScaryFacePlayer, 0);
sub_80A6D60(&animBg, &gBattleAnimBackgroundTilemap_ScaryFacePlayer, 0);
else
sub_80A6D60(&unknownStruct, &gBattleAnimBackgroundTilemap_ScaryFaceOpponent, 0);
sub_80A6D60(&animBg, &gBattleAnimBackgroundTilemap_ScaryFaceOpponent, 0);
sub_80A6CC0(unknownStruct.bgId, gUnknown_08C249F8, unknownStruct.tilesOffset);
LoadCompressedPalette(gUnknown_08C249D0, unknownStruct.unk8 << 4, 32);
AnimLoadCompressedBgGfx(animBg.bgId, gUnknown_08C249F8, animBg.tilesOffset);
LoadCompressedPalette(gUnknown_08C249D0, animBg.paletteId * 16, 32);
gTasks[taskId].func = sub_81065EC;
}
static void sub_81065EC(u8 taskId)
{
struct UnknownAnimStruct2 unknownStruct;
struct BattleAnimBgData animBg;
switch (gTasks[taskId].data[12])
{
@@ -3435,7 +3432,7 @@ static void sub_81065EC(u8 taskId)
}
break;
case 3:
sub_80A6B30(&unknownStruct);
sub_80A6B30(&animBg);
sub_80A6C68(1);
sub_80A6C68(2);
gTasks[taskId].data[12]++;
@@ -3470,7 +3467,7 @@ void AnimOrbitFast(struct Sprite *sprite)
static void AnimOrbitFastStep(struct Sprite *sprite)
{
if ((u16)(sprite->data[1] - 64) < 128)
if (sprite->data[1] >= 64 && sprite->data[1] <= 191)
sprite->subpriority = sprite->data[7] + 1;
else
sprite->subpriority = sprite->data[7] - 1;
@@ -3804,7 +3801,7 @@ void sub_8106F60(struct Sprite *sprite)
sprite->callback = sub_8107018;
sprite->data[0] = 0;
oamt_add_pos2_onto_pos1(sprite);
SetSpritePrimaryCoordsFromSecondaryCoords(sprite);
sprite->data[2] = 5;
sprite->data[4] = 0;
sprite->data[3] = 0;
+27 -30
View File
@@ -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[];
@@ -1453,7 +1450,7 @@ void sub_815A6C4(struct Sprite *sprite)
static void sub_815A73C(struct Sprite *sprite)
{
if (TranslateAnimArc(sprite))
if (TranslateAnimHorizontalArc(sprite))
{
sprite->data[0] = 30;
sprite->data[1] = 0;
@@ -2257,10 +2254,10 @@ void sub_815B7D0(u8 taskId)
{
int i, j;
u8 position;
struct UnknownAnimStruct2 unknownStruct;
struct BattleAnimBgData animBg;
u8 *dest;
u8 *src;
u16 *unk4;
u16 *bgTilemap;
u16 stretch;
switch (gTasks[taskId].data[0])
@@ -2288,7 +2285,7 @@ void sub_815B7D0(u8 taskId)
break;
case 2:
HandleSpeciesGfxDataChange(gBattleAnimAttacker, gBattleAnimTarget, gTasks[taskId].data[10]);
sub_80A6BFC(&unknownStruct, gBattleAnimAttacker);
sub_80A6BFC(&animBg, gBattleAnimAttacker);
if (IsContest())
position = 0;
@@ -2296,21 +2293,21 @@ void sub_815B7D0(u8 taskId)
position = GetBattlerPosition(gBattleAnimAttacker);
src = gMonSpritesGfxPtr->sprites[position] + (gBattleMonForms[gBattleAnimAttacker] << 11);
dest = unknownStruct.bgTiles;
dest = animBg.bgTiles;
CpuCopy32(src, dest, 0x800);
LoadBgTiles(1, unknownStruct.bgTiles, 0x800, unknownStruct.tilesOffset);
LoadBgTiles(1, animBg.bgTiles, 0x800, animBg.tilesOffset);
if (IsContest())
{
if (IsSpeciesNotUnown(gContestResources->field_18->species) != IsSpeciesNotUnown(gContestResources->field_18->unk2))
{
unk4 = (u16 *)unknownStruct.unk4;
bgTilemap = (u16 *)animBg.bgTilemap;
for (i = 0; i < 8; i++)
{
for (j = 0; j < 4; j++)
{
u16 temp = unk4[j + i * 0x20];
unk4[j + i * 0x20] = unk4[(7 - j) + i * 0x20];
unk4[(7 - j) + i * 0x20] = temp;
u16 temp = bgTilemap[j + i * 0x20];
bgTilemap[j + i * 0x20] = bgTilemap[(7 - j) + i * 0x20];
bgTilemap[(7 - j) + i * 0x20] = temp;
}
}
@@ -2318,7 +2315,7 @@ void sub_815B7D0(u8 taskId)
{
for (j = 0; j < 8; j++)
{
unk4[j + i * 0x20] ^= 0x400;
bgTilemap[j + i * 0x20] ^= 0x400;
}
}
}
@@ -2380,7 +2377,7 @@ void sub_815BB58(u8 taskId)
void sub_815BB84(u8 taskId)
{
struct UnknownAnimStruct2 unknownStruct;
struct BattleAnimBgData animBg;
switch (gTasks[taskId].data[0])
{
@@ -2392,8 +2389,8 @@ void sub_815BB84(u8 taskId)
if (!IsContest())
SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 1);
sub_80A6B30(&unknownStruct);
sub_80A6D60(&unknownStruct, &gUnknown_08C2A6EC, 0);
sub_80A6B30(&animBg);
sub_80A6D60(&animBg, &gUnknown_08C2A6EC, 0);
if (IsContest())
{
gBattle_BG1_X = -56;
@@ -2409,8 +2406,8 @@ void sub_815BB84(u8 taskId)
gBattle_BG1_Y = 0;
}
sub_80A6CC0(unknownStruct.bgId, gUnknown_08C2A634, unknownStruct.tilesOffset);
LoadCompressedPalette(gUnknown_08C2A6D4, unknownStruct.unk8 << 4, 32);
AnimLoadCompressedBgGfx(animBg.bgId, gUnknown_08C2A634, animBg.tilesOffset);
LoadCompressedPalette(gUnknown_08C2A6D4, animBg.paletteId * 16, 32);
gTasks[taskId].data[10] = gBattle_BG1_X;
gTasks[taskId].data[11] = gBattle_BG1_Y;
@@ -2455,8 +2452,8 @@ void sub_815BB84(u8 taskId)
}
break;
case 4:
sub_80A6B30(&unknownStruct);
sub_80A6C68(unknownStruct.bgId);
sub_80A6B30(&animBg);
sub_80A6C68(animBg.bgId);
if (!IsContest())
SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 0);
@@ -2571,7 +2568,7 @@ static void sub_815C050(struct Sprite *sprite)
void sub_815C0A4(u8 taskId)
{
struct UnknownAnimStruct2 unknownStruct;
struct BattleAnimBgData animBg;
switch (gTasks[taskId].data[0])
{
@@ -2583,8 +2580,8 @@ void sub_815C0A4(u8 taskId)
if (!IsContest())
SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 1);
sub_80A6B30(&unknownStruct);
sub_80A6D60(&unknownStruct, &gUnknown_08C2A6EC, 0);
sub_80A6B30(&animBg);
sub_80A6D60(&animBg, &gUnknown_08C2A6EC, 0);
if (IsContest())
{
gBattle_BG1_X = -56;
@@ -2615,8 +2612,8 @@ void sub_815C0A4(u8 taskId)
gBattle_BG1_Y = 0;
}
sub_80A6CC0(unknownStruct.bgId, gUnknown_08C2A634, unknownStruct.tilesOffset);
LoadCompressedPalette(gUnknown_08C2A6D4, unknownStruct.unk8 << 4, 32);
AnimLoadCompressedBgGfx(animBg.bgId, gUnknown_08C2A634, animBg.tilesOffset);
LoadCompressedPalette(gUnknown_08C2A6D4, animBg.paletteId * 16, 32);
gTasks[taskId].data[10] = gBattle_BG1_X;
gTasks[taskId].data[11] = gBattle_BG1_Y;
gTasks[taskId].data[0]++;
@@ -2654,8 +2651,8 @@ void sub_815C0A4(u8 taskId)
gTasks[taskId].data[0] = 1;
break;
case 5:
sub_80A6B30(&unknownStruct);
sub_80A6C68(unknownStruct.bgId);
sub_80A6B30(&animBg);
sub_80A6C68(animBg.bgId);
if (!IsContest())
SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 0);
@@ -4130,13 +4127,13 @@ static void AnimTask_BarrageBallStep(u8 taskId)
if (++task->data[1] > 1)
{
task->data[1] = 0;
TranslateAnimArc(&gSprites[task->data[15]]);
TranslateAnimHorizontalArc(&gSprites[task->data[15]]);
if (++task->data[2] > 7)
task->data[0]++;
}
break;
case 1:
if (TranslateAnimArc(&gSprites[task->data[15]]))
if (TranslateAnimHorizontalArc(&gSprites[task->data[15]]))
{
task->data[1] = 0;
task->data[2] = 0;
+17 -17
View File
@@ -276,7 +276,7 @@ void sub_8116B14(u8 taskId)
int spriteId, newSpriteId;
u16 var0;
u16 bg1Cnt;
struct UnknownAnimStruct2 unknownStruct;
struct BattleAnimBgData unknownStruct;
var0 = 0;
gBattle_WIN0H = 0;
@@ -330,8 +330,8 @@ void sub_8116B14(u8 taskId)
newSpriteId = sub_80A89C8(gBattleAnimAttacker, spriteId, species);
sub_80A6B30(&unknownStruct);
sub_80A6D60(&unknownStruct, gUnknown_08C20684, 0);
sub_80A6CC0(unknownStruct.bgId, gUnknown_08C20668, unknownStruct.tilesOffset);
LoadPalette(&gUnknown_08597418, unknownStruct.unk8 * 16 + 1, 2);
AnimLoadCompressedBgGfx(unknownStruct.bgId, gUnknown_08C20668, unknownStruct.tilesOffset);
LoadPalette(&gUnknown_08597418, unknownStruct.paletteId * 16 + 1, 2);
gBattle_BG1_X = -gSprites[spriteId].pos1.x + 32;
gBattle_BG1_Y = -gSprites[spriteId].pos1.y + 32;
@@ -342,7 +342,7 @@ void sub_8116B14(u8 taskId)
static void sub_8116D64(u8 taskId)
{
struct UnknownAnimStruct2 unknownStruct;
struct BattleAnimBgData unknownStruct;
struct Sprite *sprite;
u16 bg1Cnt;
@@ -453,7 +453,7 @@ static void sub_8116F04(u8 taskId)
static void sub_81170EC(u8 taskId)
{
struct UnknownAnimStruct2 unknownStruct;
struct BattleAnimBgData unknownStruct;
u8 spriteId, spriteId2;
u8 battlerSpriteId;
@@ -472,32 +472,32 @@ static void sub_81170EC(u8 taskId)
else
sub_80A6D60(&unknownStruct, gBattleStatMask2_Tilemap, 0);
sub_80A6CC0(unknownStruct.bgId, gBattleStatMask_Gfx, unknownStruct.tilesOffset);
AnimLoadCompressedBgGfx(unknownStruct.bgId, gBattleStatMask_Gfx, unknownStruct.tilesOffset);
switch (sAnimStatsChangeData->data[1])
{
case 0:
LoadCompressedPalette(gBattleStatMask2_Pal, unknownStruct.unk8 << 4, 32);
LoadCompressedPalette(gBattleStatMask2_Pal, unknownStruct.paletteId * 16, 32);
break;
case 1:
LoadCompressedPalette(gBattleStatMask1_Pal, unknownStruct.unk8 << 4, 32);
LoadCompressedPalette(gBattleStatMask1_Pal, unknownStruct.paletteId * 16, 32);
break;
case 2:
LoadCompressedPalette(gBattleStatMask3_Pal, unknownStruct.unk8 << 4, 32);
LoadCompressedPalette(gBattleStatMask3_Pal, unknownStruct.paletteId * 16, 32);
break;
case 3:
LoadCompressedPalette(gBattleStatMask4_Pal, unknownStruct.unk8 << 4, 32);
LoadCompressedPalette(gBattleStatMask4_Pal, unknownStruct.paletteId * 16, 32);
break;
case 4:
LoadCompressedPalette(gBattleStatMask6_Pal, unknownStruct.unk8 << 4, 32);
LoadCompressedPalette(gBattleStatMask6_Pal, unknownStruct.paletteId * 16, 32);
break;
case 5:
LoadCompressedPalette(gBattleStatMask7_Pal, unknownStruct.unk8 << 4, 32);
LoadCompressedPalette(gBattleStatMask7_Pal, unknownStruct.paletteId * 16, 32);
break;
case 6:
LoadCompressedPalette(gBattleStatMask8_Pal, unknownStruct.unk8 << 4, 32);
LoadCompressedPalette(gBattleStatMask8_Pal, unknownStruct.paletteId * 16, 32);
break;
default:
LoadCompressedPalette(gBattleStatMask5_Pal, unknownStruct.unk8 << 4, 32);
LoadCompressedPalette(gBattleStatMask5_Pal, unknownStruct.paletteId * 16, 32);
break;
}
@@ -773,7 +773,7 @@ void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5,
u16 species;
u8 spriteId, spriteId2;
u16 bg1Cnt;
struct UnknownAnimStruct2 unknownStruct;
struct BattleAnimBgData unknownStruct;
u8 battler2;
spriteId2 = 0;
@@ -820,8 +820,8 @@ void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5,
sub_80A6B30(&unknownStruct);
sub_80A6D60(&unknownStruct, tilemap, 0);
sub_80A6CC0(unknownStruct.bgId, gfx, unknownStruct.tilesOffset);
LoadCompressedPalette(palette, unknownStruct.unk8 << 4, 32);
AnimLoadCompressedBgGfx(unknownStruct.bgId, gfx, unknownStruct.tilesOffset);
LoadCompressedPalette(palette, unknownStruct.paletteId * 16, 32);
gBattle_BG1_X = 0;
gBattle_BG1_Y = 0;
+77 -61
View File
@@ -22,18 +22,20 @@
#include "constants/songs.h"
#include "constants/battle_string_ids.h"
#include "constants/battle_frontier.h"
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/rgb.h"
// This file's functions.
static void sub_81A58B4(void);
static void sub_81A5964(void);
static void sub_81A59FC(void);
static void InitArenaChallenge(void);
static void GetArenaData(void);
static void SetArenaData(void);
static void sub_81A5AC4(void);
static void sub_81A5B08(void);
static void sub_81A5B88(void);
static void sub_81A5BE0(void);
static void SetArenaRewardItem(void);
static void GiveArenaRewardItem(void);
static void BufferArenaOpponentName(void);
static void SpriteCb_JudgmentIcon(struct Sprite *sprite);
static void ShowJudgmentSprite(u8 x, u8 y, u8 arg2, u8 battler);
static void ShowJudgmentSprite(u8 x, u8 y, u8 category, u8 battler);
// Const rom data.
static const s8 sMindRatings[] =
@@ -395,91 +397,106 @@ static const s8 sMindRatings[] =
[MOVE_PSYCHO_BOOST] = 1,
};
static const struct OamData sOamData_8611F24 =
#define TAG_JUDGEMENT_ICON 1000
static const struct OamData sJudgementIconOamData =
{
.y = 0,
.affineMode = 0,
.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,
.affineParam = 0
};
static const union AnimCmd sSpriteAnim_8611F2C[] =
static const union AnimCmd sJudgementIconAnimCmd0[] =
{
ANIMCMD_FRAME(0, 1),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_8611F34[] =
static const union AnimCmd sJudgementIconAnimCmd1[] =
{
ANIMCMD_FRAME(4, 1),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_8611F3C[] =
static const union AnimCmd sJudgementIconAnimCmd2[] =
{
ANIMCMD_FRAME(8, 1),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_8611F44[] =
static const union AnimCmd sJudgementIconAnimCmd3[] =
{
ANIMCMD_FRAME(12, 1),
ANIMCMD_END
};
static const union AnimCmd *const sSpriteAnimTable_8611F4C[] =
static const union AnimCmd *const sJudgementIconAnimCmds[] =
{
sSpriteAnim_8611F2C,
sSpriteAnim_8611F34,
sSpriteAnim_8611F3C,
sSpriteAnim_8611F44
sJudgementIconAnimCmd0,
sJudgementIconAnimCmd1,
sJudgementIconAnimCmd2,
sJudgementIconAnimCmd3
};
static const struct SpriteTemplate sSpriteTemplate_JudgmentIcon =
{
.tileTag = 0x3E8,
.tileTag = TAG_JUDGEMENT_ICON,
.paletteTag = 0xFFFF,
.oam = &sOamData_8611F24,
.anims = sSpriteAnimTable_8611F4C,
.oam = &sJudgementIconOamData,
.anims = sJudgementIconAnimCmds,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = SpriteCb_JudgmentIcon,
};
static const struct CompressedSpriteSheet gUnknown_08611F74[] =
static const struct CompressedSpriteSheet sBattleArenaJudgementSymbolsSpriteSheet[] =
{
{gUnknown_08D854E8, 0x200, 0x3E8},
{gBattleArenaJudgementSymbolsGfx, 0x200, TAG_JUDGEMENT_ICON},
{0}
};
static void (* const sArenaFunctions[])(void) =
{
sub_81A58B4,
sub_81A5964,
sub_81A59FC,
InitArenaChallenge,
GetArenaData,
SetArenaData,
sub_81A5AC4,
sub_81A5B08,
sub_81A5B88,
sub_81A5BE0,
SetArenaRewardItem,
GiveArenaRewardItem,
BufferArenaOpponentName,
};
static const u16 gUnknown_08611FA0[6] =
static const u16 sShortStreakRewardItems[] =
{
0x003f, 0x0040, 0x0041, 0x0043, 0x0042, 0x0046
ITEM_HP_UP,
ITEM_PROTEIN,
ITEM_IRON,
ITEM_CALCIUM,
ITEM_CARBOS,
ITEM_ZINC,
};
static const u16 gUnknown_08611FAC[9] =
static const u16 sLongStreakRewardItems[] =
{
0x00b3, 0x00b4, 0x00b7, 0x00c8, 0x00b9, 0x00bb, 0x00c4, 0x00c6, 0x00ba
ITEM_BRIGHT_POWDER,
ITEM_WHITE_HERB,
ITEM_QUICK_CLAW,
ITEM_LEFTOVERS,
ITEM_MENTAL_HERB,
ITEM_KINGS_ROCK,
ITEM_FOCUS_BAND,
ITEM_SCOPE_LENS,
ITEM_CHOICE_BAND,
};
// code
@@ -490,15 +507,15 @@ void CallBattleArenaFunction(void)
u8 BattleArena_ShowJudgmentWindow(u8 *state)
{
s32 i;
int i;
u8 ret = 0;
switch (*state)
{
case 0:
BeginNormalPaletteFade(0x7FFFFF1C, 4, 0, 8, 0);
BeginNormalPaletteFade(0x7FFFFF1C, 4, 0, 8, RGB_BLACK);
SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG1 | WININ_WIN0_BG2 | WININ_WIN0_BG3 | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR);
LoadCompressedSpriteSheet(gUnknown_08611F74);
LoadCompressedPalette(gUnknown_08D855E8, 0x1F0, 0x20);
LoadCompressedSpriteSheet(sBattleArenaJudgementSymbolsSpriteSheet);
LoadCompressedPalette(gBattleArenaJudgementSymbolsPalette, 0x1F0, 0x20);
gBattle_WIN0H = 0xFF;
gBattle_WIN0V = 0x70;
(*state)++;
@@ -536,7 +553,7 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state)
SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR);
for (i = 0; i < 8; i++)
{
u8 spriteId = CreateSprite(&sSpriteTemplate_JudgmentIcon, 0x40 + (i * 0x10), 84, 0);
u8 spriteId = CreateSprite(&sSpriteTemplate_JudgmentIcon, 64 + i * 16, 84, 0);
StartSpriteAnim(&gSprites[spriteId], 3);
}
ret = 1;
@@ -596,14 +613,14 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state)
HandleBattleWindow(5, 0, 24, 13, WINDOW_CLEAR);
CopyBgTilemapBufferToVram(0);
m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256);
BeginNormalPaletteFade(0x7FFFFF1C, 4, 8, 0, 0);
BeginNormalPaletteFade(0x7FFFFF1C, 4, 8, 0, RGB_BLACK);
(*state)++;
break;
case 10:
if (!gPaletteFade.active)
{
SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR);
FreeSpriteTilesByTag(0x3E8);
FreeSpriteTilesByTag(TAG_JUDGEMENT_ICON);
ret = 1;
(*state)++;
}
@@ -615,9 +632,9 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state)
static void ShowJudgmentSprite(u8 x, u8 y, u8 category, u8 battler)
{
s32 animNum = 0;
s32 pointsPlayer = 0;
s32 pointsOpponent = 0;
int animNum = 0;
int pointsPlayer = 0;
int pointsOpponent = 0;
s8 *mindPoints = gBattleStruct->arenaMindPoints;
s8 *skillPoints = gBattleStruct->arenaSkillPoints;
u16 *hpAtStart = gBattleStruct->arenaStartHp;
@@ -686,7 +703,6 @@ void BattleArena_InitPoints(void)
void BattleArena_AddMindPoints(u8 battler)
{
s8 *mindPoints = gBattleStruct->arenaMindPoints;
mindPoints[battler] += sMindRatings[gCurrentMove];
}
@@ -707,7 +723,7 @@ void BattleArena_AddSkillPoints(u8 battler)
if (!(gMoveResultFlags & MOVE_RESULT_MISSED) || gBattleCommunication[6] != 1)
skillPoints[battler] -= 2;
}
else if (gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE && gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE)
else if ((gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE) && (gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE))
{
skillPoints[battler] += 1;
}
@@ -765,7 +781,7 @@ void sub_81A586C(u8 battler) // Unused.
hpAtStart[BATTLE_OPPOSITE(battler)] = gBattleMons[BATTLE_OPPOSITE(battler)].hp;
}
static void sub_81A58B4(void)
static void InitArenaChallenge(void)
{
bool32 isCurrent;
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
@@ -786,14 +802,14 @@ static void sub_81A58B4(void)
gTrainerBattleOpponent_A = 0;
}
static void sub_81A5964(void)
static void GetArenaData(void)
{
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
switch (gSpecialVar_0x8005)
{
case 0:
gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_DD8;
gSpecialVar_Result = gSaveBlock2Ptr->frontier.arenaRewardItem;
break;
case 1:
gSpecialVar_Result = gSaveBlock2Ptr->frontier.arenaWinStreaks[lvlMode];
@@ -807,14 +823,14 @@ static void sub_81A5964(void)
}
}
static void sub_81A59FC(void)
static void SetArenaData(void)
{
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
switch (gSpecialVar_0x8005)
{
case 0:
gSaveBlock2Ptr->frontier.field_DD8 = gSpecialVar_0x8006;
gSaveBlock2Ptr->frontier.arenaRewardItem = gSpecialVar_0x8006;
break;
case 1:
gSaveBlock2Ptr->frontier.arenaWinStreaks[lvlMode] = gSpecialVar_0x8006;
@@ -846,22 +862,22 @@ static void sub_81A5AC4(void)
sub_81A4C30();
}
static void sub_81A5B08(void)
static void SetArenaRewardItem(void)
{
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
if (gSaveBlock2Ptr->frontier.arenaWinStreaks[lvlMode] > 41)
gSaveBlock2Ptr->frontier.field_DD8 = gUnknown_08611FAC[Random() % ARRAY_COUNT(gUnknown_08611FAC)];
gSaveBlock2Ptr->frontier.arenaRewardItem = sLongStreakRewardItems[Random() % ARRAY_COUNT(sLongStreakRewardItems)];
else
gSaveBlock2Ptr->frontier.field_DD8 = gUnknown_08611FA0[Random() % ARRAY_COUNT(gUnknown_08611FA0)];
gSaveBlock2Ptr->frontier.arenaRewardItem = sShortStreakRewardItems[Random() % ARRAY_COUNT(sShortStreakRewardItems)];
}
static void sub_81A5B88(void)
static void GiveArenaRewardItem(void)
{
if (AddBagItem(gSaveBlock2Ptr->frontier.field_DD8, 1) == TRUE)
if (AddBagItem(gSaveBlock2Ptr->frontier.arenaRewardItem, 1) == TRUE)
{
CopyItemName(gSaveBlock2Ptr->frontier.field_DD8, gStringVar1);
gSaveBlock2Ptr->frontier.field_DD8 = 0;
CopyItemName(gSaveBlock2Ptr->frontier.arenaRewardItem, gStringVar1);
gSaveBlock2Ptr->frontier.arenaRewardItem = 0;
gSpecialVar_Result = TRUE;
}
else
@@ -870,12 +886,12 @@ static void sub_81A5B88(void)
}
}
static void sub_81A5BE0(void)
static void BufferArenaOpponentName(void)
{
GetFrontierTrainerName(gStringVar1, gTrainerBattleOpponent_A);
}
void sub_81A5BF8(void)
void DrawArenaRefereeTextBox(void)
{
u8 width = 27;
u8 palNum = 7;
@@ -898,7 +914,7 @@ void sub_81A5BF8(void)
FillBgTilemapBufferRect(0, 0x836, 29, 19, 1, 1, palNum);
}
void sub_81A5D44(void)
void RemoveArenaRefereeTextBox(void)
{
u8 width;
u8 height;
+78 -78
View File
@@ -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,
@@ -720,26 +720,26 @@ void DrawMainBattleBackground(void)
{
if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_x2000000))
{
LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2)));
LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60);
}
else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON)
{
LZDecompressVram(gBattleTerrainTiles_Cave, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTilemap_Cave, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTiles_Cave, (void*)(BG_CHAR_ADDR(2)));
LZDecompressVram(gBattleTerrainTilemap_Cave, (void*)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_Groudon, 0x20, 0x60);
}
else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE)
{
LZDecompressVram(gBattleTerrainTiles_Water, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTilemap_Water, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTiles_Water, (void*)(BG_CHAR_ADDR(2)));
LZDecompressVram(gBattleTerrainTilemap_Water, (void*)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_Kyogre, 0x20, 0x60);
}
else if (gBattleTypeFlags & BATTLE_TYPE_RAYQUAZA)
{
LZDecompressVram(gBattleTerrainTiles_Rayquaza, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTilemap_Rayquaza, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTiles_Rayquaza, (void*)(BG_CHAR_ADDR(2)));
LZDecompressVram(gBattleTerrainTilemap_Rayquaza, (void*)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_Rayquaza, 0x20, 0x60);
}
else
@@ -749,15 +749,15 @@ void DrawMainBattleBackground(void)
u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
if (trainerClass == TRAINER_CLASS_LEADER)
{
LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2)));
LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, 0x20, 0x60);
return;
}
else if (trainerClass == TRAINER_CLASS_CHAMPION)
{
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, 0x20, 0x60);
return;
}
@@ -767,48 +767,48 @@ void DrawMainBattleBackground(void)
{
default:
case MAP_BATTLE_SCENE_NORMAL:
LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tileset, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tilemap, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tileset, (void*)(BG_CHAR_ADDR(2)));
LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tilemap, (void*)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainTable[gBattleTerrain].palette, 0x20, 0x60);
break;
case MAP_BATTLE_SCENE_GYM:
LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2)));
LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, 0x20, 0x60);
break;
case MAP_BATTLE_SCENE_MAGMA:
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, 0x20, 0x60);
break;
case MAP_BATTLE_SCENE_AQUA:
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, 0x20, 0x60);
break;
case MAP_BATTLE_SCENE_SIDNEY:
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, 0x20, 0x60);
break;
case MAP_BATTLE_SCENE_PHOEBE:
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, 0x20, 0x60);
break;
case MAP_BATTLE_SCENE_GLACIA:
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, 0x20, 0x60);
break;
case MAP_BATTLE_SCENE_DRAKE:
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, 0x20, 0x60);
break;
case MAP_BATTLE_SCENE_FRONTIER:
LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2)));
LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60);
break;
}
@@ -1089,7 +1089,7 @@ void DrawBattleEntryBackground(void)
{
if (gBattleTypeFlags & BATTLE_TYPE_LINK)
{
LZDecompressVram(gUnknown_08D778F0, (void*)(VRAM + 0x4000));
LZDecompressVram(gUnknown_08D778F0, (void*)(BG_CHAR_ADDR(1)));
LZDecompressVram(gUnknown_08D77B0C, (void*)(VRAM + 0x10000));
LoadCompressedPalette(gUnknown_08D77AE4, 0x60, 0x20);
SetBgAttribute(1, BG_ATTR_SCREENSIZE, 1);
@@ -1108,8 +1108,8 @@ void DrawBattleEntryBackground(void)
{
if (!(gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) || gPartnerTrainerId == TRAINER_STEVEN_PARTNER)
{
LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000));
LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000));
LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(BG_CHAR_ADDR(1)));
LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(BG_SCREEN_ADDR(28)));
}
else
{
@@ -1123,18 +1123,18 @@ void DrawBattleEntryBackground(void)
}
else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON)
{
LZDecompressVram(gBattleTerrainAnimTiles_Cave, (void*)(VRAM + 0x4000));
LZDecompressVram(gBattleTerrainAnimTilemap_Cave, (void*)(VRAM + 0xE000));
LZDecompressVram(gBattleTerrainAnimTiles_Cave, (void*)(BG_CHAR_ADDR(1)));
LZDecompressVram(gBattleTerrainAnimTilemap_Cave, (void*)(BG_SCREEN_ADDR(28)));
}
else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE)
{
LZDecompressVram(gBattleTerrainAnimTiles_Underwater, (void*)(VRAM + 0x4000));
LZDecompressVram(gBattleTerrainAnimTilemap_Underwater, (void*)(VRAM + 0xE000));
LZDecompressVram(gBattleTerrainAnimTiles_Underwater, (void*)(BG_CHAR_ADDR(1)));
LZDecompressVram(gBattleTerrainAnimTilemap_Underwater, (void*)(BG_SCREEN_ADDR(28)));
}
else if (gBattleTypeFlags & BATTLE_TYPE_RAYQUAZA)
{
LZDecompressVram(gBattleTerrainAnimTiles_Rayquaza, (void*)(VRAM + 0x4000));
LZDecompressVram(gBattleTerrainAnimTilemap_Rayquaza, (void*)(VRAM + 0xE000));
LZDecompressVram(gBattleTerrainAnimTiles_Rayquaza, (void*)(BG_CHAR_ADDR(1)));
LZDecompressVram(gBattleTerrainAnimTilemap_Rayquaza, (void*)(BG_SCREEN_ADDR(28)));
}
else
{
@@ -1143,27 +1143,27 @@ void DrawBattleEntryBackground(void)
u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
if (trainerClass == TRAINER_CLASS_LEADER)
{
LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000));
LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000));
LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(BG_CHAR_ADDR(1)));
LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(BG_SCREEN_ADDR(28)));
return;
}
else if (trainerClass == TRAINER_CLASS_CHAMPION)
{
LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000));
LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000));
LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(BG_CHAR_ADDR(1)));
LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(BG_SCREEN_ADDR(28)));
return;
}
}
if (GetCurrentMapBattleScene() == MAP_BATTLE_SCENE_NORMAL)
{
LZDecompressVram(gBattleTerrainTable[gBattleTerrain].entryTileset, (void*)(VRAM + 0x4000));
LZDecompressVram(gBattleTerrainTable[gBattleTerrain].entryTilemap, (void*)(VRAM + 0xE000));
LZDecompressVram(gBattleTerrainTable[gBattleTerrain].entryTileset, (void*)(BG_CHAR_ADDR(1)));
LZDecompressVram(gBattleTerrainTable[gBattleTerrain].entryTilemap, (void*)(BG_SCREEN_ADDR(28)));
}
else
{
LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000));
LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000));
LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(BG_CHAR_ADDR(1)));
LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(BG_SCREEN_ADDR(28)));
}
}
}
@@ -1187,11 +1187,11 @@ bool8 LoadChosenBattleElement(u8 caseId)
case 3:
if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER))
{
LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2)));
}
else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON)
{
LZDecompressVram(gBattleTerrainTiles_Cave, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTiles_Cave, (void*)(BG_CHAR_ADDR(2)));
}
else
{
@@ -1200,12 +1200,12 @@ bool8 LoadChosenBattleElement(u8 caseId)
u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
if (trainerClass == TRAINER_CLASS_LEADER)
{
LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2)));
break;
}
else if (trainerClass == TRAINER_CLASS_CHAMPION)
{
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
break;
}
}
@@ -1214,31 +1214,31 @@ bool8 LoadChosenBattleElement(u8 caseId)
{
default:
case MAP_BATTLE_SCENE_NORMAL:
LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tileset, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tileset, (void*)(BG_CHAR_ADDR(2)));
break;
case MAP_BATTLE_SCENE_GYM:
LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2)));
break;
case MAP_BATTLE_SCENE_MAGMA:
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
break;
case MAP_BATTLE_SCENE_AQUA:
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
break;
case MAP_BATTLE_SCENE_SIDNEY:
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
break;
case MAP_BATTLE_SCENE_PHOEBE:
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
break;
case MAP_BATTLE_SCENE_GLACIA:
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
break;
case MAP_BATTLE_SCENE_DRAKE:
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(BG_CHAR_ADDR(2)));
break;
case MAP_BATTLE_SCENE_FRONTIER:
LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000));
LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2)));
break;
}
}
@@ -1246,14 +1246,14 @@ bool8 LoadChosenBattleElement(u8 caseId)
case 4:
if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER))
{
LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26)));
}
else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON)
{
if (gGameVersion == VERSION_RUBY)
LZDecompressVram(gBattleTerrainTilemap_Cave, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTilemap_Cave, (void*)(BG_SCREEN_ADDR(26)));
else
LZDecompressVram(gBattleTerrainTilemap_Water, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTilemap_Water, (void*)(BG_SCREEN_ADDR(26)));
}
else
{
@@ -1262,12 +1262,12 @@ bool8 LoadChosenBattleElement(u8 caseId)
u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
if (trainerClass == TRAINER_CLASS_LEADER)
{
LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26)));
break;
}
else if (trainerClass == TRAINER_CLASS_CHAMPION)
{
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
break;
}
}
@@ -1276,31 +1276,31 @@ bool8 LoadChosenBattleElement(u8 caseId)
{
default:
case MAP_BATTLE_SCENE_NORMAL:
LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tilemap, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tilemap, (void*)(BG_SCREEN_ADDR(26)));
break;
case MAP_BATTLE_SCENE_GYM:
LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26)));
break;
case MAP_BATTLE_SCENE_MAGMA:
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
break;
case MAP_BATTLE_SCENE_AQUA:
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
break;
case MAP_BATTLE_SCENE_SIDNEY:
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
break;
case MAP_BATTLE_SCENE_PHOEBE:
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
break;
case MAP_BATTLE_SCENE_GLACIA:
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
break;
case MAP_BATTLE_SCENE_DRAKE:
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(BG_SCREEN_ADDR(26)));
break;
case MAP_BATTLE_SCENE_FRONTIER:
LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000));
LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26)));
break;
}
}
+9 -11
View File
@@ -16,6 +16,7 @@
#include "palette.h"
#include "pokeball.h"
#include "pokemon.h"
#include "recorded_battle.h"
#include "reshow_battle_screen.h"
#include "sound.h"
#include "string_util.h"
@@ -26,15 +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);
extern void sub_81851A8(u8 *);
extern u16 sub_8068B48(void);
// this file's functions
static void LinkOpponentHandleGetMonData(void);
static void LinkOpponentHandleGetRawMonData(void);
@@ -92,7 +90,7 @@ static void LinkOpponentHandleBattleAnimation(void);
static void LinkOpponentHandleLinkStandbyMsg(void);
static void LinkOpponentHandleResetActionMoveSelection(void);
static void LinkOpponentHandleCmd55(void);
static void nullsub_92(void);
static void LinkOpponentCmdEnd(void);
static void LinkOpponentBufferRunCommand(void);
static void LinkOpponentBufferExecCompleted(void);
@@ -164,7 +162,7 @@ static void (*const sLinkOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
LinkOpponentHandleLinkStandbyMsg,
LinkOpponentHandleResetActionMoveSelection,
LinkOpponentHandleCmd55,
nullsub_92
LinkOpponentCmdEnd
};
static void nullsub_28(void)
@@ -1278,7 +1276,7 @@ static void LinkOpponentHandleDrawTrainerPic(void)
else if ((gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_FIRE_RED
|| (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_LEAF_GREEN)
{
if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != 0)
if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != MALE)
trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_LEAF];
else
trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RED];
@@ -1286,7 +1284,7 @@ static void LinkOpponentHandleDrawTrainerPic(void)
else if ((gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_RUBY
|| (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].version & 0xFF) == VERSION_SAPPHIRE)
{
if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != 0)
if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != MALE)
trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_MAY];
else
trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RS_BRENDAN];
@@ -1339,7 +1337,7 @@ static void LinkOpponentHandleTrainerSlide(void)
static void LinkOpponentHandleTrainerSlideBack(void)
{
oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
@@ -1700,7 +1698,7 @@ static void LinkOpponentHandleIntroTrainerBallThrow(void)
u8 paletteNum;
u8 taskId;
oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280;
@@ -1857,6 +1855,6 @@ static void LinkOpponentHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
}
static void nullsub_92(void)
static void LinkOpponentCmdEnd(void)
{
}
+9 -10
View File
@@ -16,6 +16,7 @@
#include "palette.h"
#include "pokeball.h"
#include "pokemon.h"
#include "recorded_battle.h"
#include "reshow_battle_screen.h"
#include "sound.h"
#include "string_util.h"
@@ -26,13 +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);
extern void sub_81851A8(u8 *);
// this file's functions
static void LinkPartnerHandleGetMonData(void);
static void LinkPartnerHandleGetRawMonData(void);
@@ -90,7 +89,7 @@ static void LinkPartnerHandleBattleAnimation(void);
static void LinkPartnerHandleLinkStandbyMsg(void);
static void LinkPartnerHandleResetActionMoveSelection(void);
static void LinkPartnerHandleCmd55(void);
static void nullsub_113(void);
static void LinkPartnerCmdEnd(void);
static void LinkPartnerBufferRunCommand(void);
static void LinkPartnerBufferExecCompleted(void);
@@ -161,10 +160,10 @@ static void (*const sLinkPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
LinkPartnerHandleLinkStandbyMsg,
LinkPartnerHandleResetActionMoveSelection,
LinkPartnerHandleCmd55,
nullsub_113
LinkPartnerCmdEnd
};
static void nullsub_112(void)
static void SpriteCB_Null2(void)
{
}
@@ -1160,7 +1159,7 @@ static void LinkPartnerHandleTrainerSlide(void)
static void LinkPartnerHandleTrainerSlideBack(void)
{
oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
@@ -1525,7 +1524,7 @@ static void LinkPartnerHandleIntroTrainerBallThrow(void)
u8 taskId;
u32 trainerPicId;
oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
@@ -1564,7 +1563,7 @@ static void LinkPartnerHandleIntroTrainerBallThrow(void)
gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary;
gBattleSpritesDataPtr->animationData->field_9_x1 = 1;
gBattlerControllerFuncs[gActiveBattler] = nullsub_112;
gBattlerControllerFuncs[gActiveBattler] = SpriteCB_Null2;
}
static void sub_814DCCC(u8 taskId)
@@ -1687,6 +1686,6 @@ static void LinkPartnerHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
}
static void nullsub_113(void)
static void LinkPartnerCmdEnd(void)
{
}
+6 -8
View File
@@ -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);
@@ -97,7 +95,7 @@ static void OpponentHandleBattleAnimation(void);
static void OpponentHandleLinkStandbyMsg(void);
static void OpponentHandleResetActionMoveSelection(void);
static void OpponentHandleCmd55(void);
static void nullsub_91(void);
static void OpponentCmdEnd(void);
static void OpponentBufferRunCommand(void);
static void OpponentBufferExecCompleted(void);
@@ -169,7 +167,7 @@ static void (*const sOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
OpponentHandleLinkStandbyMsg,
OpponentHandleResetActionMoveSelection,
OpponentHandleCmd55,
nullsub_91
OpponentCmdEnd
};
// unknown unused data
@@ -1376,7 +1374,7 @@ static void OpponentHandleTrainerSlide(void)
static void OpponentHandleTrainerSlideBack(void)
{
oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
@@ -1849,7 +1847,7 @@ static void OpponentHandleIntroTrainerBallThrow(void)
u8 paletteNum;
u8 taskId;
oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280;
@@ -2003,6 +2001,6 @@ static void OpponentHandleCmd55(void)
OpponentBufferExecCompleted();
}
static void nullsub_91(void)
static void OpponentCmdEnd(void)
{
}
+5 -9
View File
@@ -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);
@@ -99,7 +95,7 @@ static void PlayerHandleBattleAnimation(void);
static void PlayerHandleLinkStandbyMsg(void);
static void PlayerHandleResetActionMoveSelection(void);
static void PlayerHandleCmd55(void);
static void nullsub_22(void);
static void PlayerCmdEnd(void);
static void PlayerBufferRunCommand(void);
static void HandleInputChooseTarget(void);
@@ -186,7 +182,7 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
PlayerHandleLinkStandbyMsg,
PlayerHandleResetActionMoveSelection,
PlayerHandleCmd55,
nullsub_22
PlayerCmdEnd
};
static const u8 sTargetIdentities[] = {B_POSITION_PLAYER_LEFT, B_POSITION_PLAYER_RIGHT, B_POSITION_OPPONENT_RIGHT, B_POSITION_OPPONENT_LEFT};
@@ -2377,7 +2373,7 @@ static void PlayerHandleTrainerSlide(void)
static void PlayerHandleTrainerSlideBack(void)
{
oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
@@ -2921,7 +2917,7 @@ static void PlayerHandleIntroTrainerBallThrow(void)
u8 paletteNum;
u8 taskId;
oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
@@ -3105,6 +3101,6 @@ static void PlayerHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
}
static void nullsub_22(void)
static void PlayerCmdEnd(void)
{
}
+5 -8
View File
@@ -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);
@@ -90,7 +87,7 @@ static void PlayerPartnerHandleBattleAnimation(void);
static void PlayerPartnerHandleLinkStandbyMsg(void);
static void PlayerPartnerHandleResetActionMoveSelection(void);
static void PlayerPartnerHandleCmd55(void);
static void nullsub_128(void);
static void PlayerPartnerCmdEnd(void);
static void PlayerPartnerBufferRunCommand(void);
static void PlayerPartnerBufferExecCompleted(void);
@@ -167,7 +164,7 @@ static void (*const sPlayerPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
PlayerPartnerHandleLinkStandbyMsg,
PlayerPartnerHandleResetActionMoveSelection,
PlayerPartnerHandleCmd55,
nullsub_128
PlayerPartnerCmdEnd
};
// unknown unused data
@@ -1354,7 +1351,7 @@ static void PlayerPartnerHandleTrainerSlide(void)
static void PlayerPartnerHandleTrainerSlideBack(void)
{
oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
@@ -1777,7 +1774,7 @@ static void PlayerPartnerHandleIntroTrainerBallThrow(void)
u8 paletteNum;
u8 taskId;
oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
@@ -1928,6 +1925,6 @@ static void PlayerPartnerHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
}
static void nullsub_128(void)
static void PlayerPartnerCmdEnd(void)
{
}
+5 -8
View File
@@ -33,9 +33,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon);
extern u16 sub_8068B48(void);
// this file's functions
static void RecordedOpponentHandleGetMonData(void);
static void RecordedOpponentHandleGetRawMonData(void);
@@ -93,7 +90,7 @@ static void RecordedOpponentHandleBattleAnimation(void);
static void RecordedOpponentHandleLinkStandbyMsg(void);
static void RecordedOpponentHandleResetActionMoveSelection(void);
static void RecordedOpponentHandleCmd55(void);
static void nullsub_119(void);
static void RecordedOpponentCmdEnd(void);
static void RecordedOpponentBufferRunCommand(void);
static void RecordedOpponentBufferExecCompleted(void);
@@ -165,7 +162,7 @@ static void (*const sRecordedOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void
RecordedOpponentHandleLinkStandbyMsg,
RecordedOpponentHandleResetActionMoveSelection,
RecordedOpponentHandleCmd55,
nullsub_119
RecordedOpponentCmdEnd
};
static void nullsub_70(void)
@@ -1267,7 +1264,7 @@ static void RecordedOpponentHandleTrainerSlide(void)
static void RecordedOpponentHandleTrainerSlideBack(void)
{
oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
@@ -1640,7 +1637,7 @@ static void RecordedOpponentHandleIntroTrainerBallThrow(void)
u8 paletteNum;
u8 taskId;
oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280;
@@ -1791,6 +1788,6 @@ static void RecordedOpponentHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
}
static void nullsub_119(void)
static void RecordedOpponentCmdEnd(void)
{
}
+5 -7
View File
@@ -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);
@@ -89,7 +87,7 @@ static void RecordedPlayerHandleBattleAnimation(void);
static void RecordedPlayerHandleLinkStandbyMsg(void);
static void RecordedPlayerHandleResetActionMoveSelection(void);
static void RecordedPlayerHandleCmd55(void);
static void nullsub_121(void);
static void RecordedPlayerCmdEnd(void);
static void RecordedPlayerBufferRunCommand(void);
static void RecordedPlayerBufferExecCompleted(void);
@@ -160,7 +158,7 @@ static void (*const sRecordedPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void)
RecordedPlayerHandleLinkStandbyMsg,
RecordedPlayerHandleResetActionMoveSelection,
RecordedPlayerHandleCmd55,
nullsub_121
RecordedPlayerCmdEnd
};
static void nullsub_120(void)
@@ -1268,7 +1266,7 @@ static void RecordedPlayerHandleTrainerSlide(void)
static void RecordedPlayerHandleTrainerSlideBack(void)
{
oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
@@ -1662,7 +1660,7 @@ static void RecordedPlayerHandleIntroTrainerBallThrow(void)
u8 taskId;
u32 trainerPicId;
oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
@@ -1808,6 +1806,6 @@ static void RecordedPlayerHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
}
static void nullsub_121(void)
static void RecordedPlayerCmdEnd(void)
{
}
+4 -6
View File
@@ -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);
@@ -84,7 +82,7 @@ static void SafariHandleBattleAnimation(void);
static void SafariHandleLinkStandbyMsg(void);
static void SafariHandleResetActionMoveSelection(void);
static void SafariHandleCmd55(void);
static void nullsub_115(void);
static void SafariCmdEnd(void);
static void SafariBufferRunCommand(void);
static void SafariBufferExecCompleted(void);
@@ -148,10 +146,10 @@ static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
SafariHandleLinkStandbyMsg,
SafariHandleResetActionMoveSelection,
SafariHandleCmd55,
nullsub_115
SafariCmdEnd
};
static void nullsub_114(void)
static void SpriteCB_Null4(void)
{
}
@@ -688,6 +686,6 @@ static void SafariHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_81595E4;
}
static void nullsub_115(void)
static void SafariCmdEnd(void)
{
}
+5 -7
View File
@@ -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);
@@ -92,7 +90,7 @@ static void WallyHandleBattleAnimation(void);
static void WallyHandleLinkStandbyMsg(void);
static void WallyHandleResetActionMoveSelection(void);
static void WallyHandleCmd55(void);
static void nullsub_118(void);
static void WallyCmdEnd(void);
static void WallyBufferRunCommand(void);
static void WallyBufferExecCompleted(void);
@@ -161,10 +159,10 @@ static void (*const sWallyBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
WallyHandleLinkStandbyMsg,
WallyHandleResetActionMoveSelection,
WallyHandleCmd55,
nullsub_118
WallyCmdEnd
};
static void nullsub_117(void)
static void SpriteCB_Null7(void)
{
}
@@ -1427,7 +1425,7 @@ static void WallyHandleIntroTrainerBallThrow(void)
u8 paletteNum;
u8 taskId;
oamt_add_pos2_onto_pos1(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
@@ -1559,6 +1557,6 @@ static void WallyHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_80587B0;
}
static void nullsub_118(void)
static void WallyCmdEnd(void)
{
}
+1 -1
View File
@@ -767,7 +767,7 @@ static void Task_HandleSendLinkBuffersData(u8 taskId)
{
if (IsLinkMaster())
{
sub_800A620();
CheckShouldAdvanceLinkState();
gTasks[taskId].data[11]++;
}
else
+385 -502
View File
File diff suppressed because it is too large Load Diff
+102 -98
View File
@@ -11,32 +11,33 @@
#include "constants/species.h"
#include "constants/battle_ai.h"
#include "constants/battle_frontier.h"
#include "constants/layouts.h"
#include "constants/trainers.h"
#include "constants/moves.h"
// IWRAM bss
static IWRAM_DATA bool8 gUnknown_03001288;
static IWRAM_DATA bool8 sPerformedRentalSwap;
// This file's functions.
static void sub_81A5E94(void);
static void sub_81A5FA8(void);
static void sub_81A6054(void);
static void InitFactoryChallenge(void);
static void GetBattleFactoryData(void);
static void SetBattleFactoryData(void);
static void sub_81A613C(void);
static void nullsub_75(void);
static void nullsub_123(void);
static void sub_81A6188(void);
static void sub_81A6198(void);
static void sub_81A61A4(void);
static void sub_81A63CC(void);
static void sub_81A64C4(void);
static void sub_81A63B8(void);
static void sub_81A61B0(void);
static void sub_81A67EC(void);
static void sub_81A6A08(void);
static void sub_81A6AEC(void);
static void sub_81A6C1C(void);
static void SelectInitialRentalMons(void);
static void SwapRentalMons(void);
static void SetPerformedRentalSwap(void);
static void SetRentalsToOpponentParty(void);
static void SetPlayerAndOpponentParties(void);
static void SetOpponentGfxVar(void);
static void GenerateOpponentMons(void);
static void GenerateInitialRentalMons(void);
static void GetOpponentMostCommonMonType(void);
static void GetOpponentBattleStyle(void);
static void RestorePlayerPartyHeldItems(void);
static u16 GetMonSetId(u8 lvlMode, u8 challengeNum, bool8 arg2);
static u8 GetStyleForMove(u16 move);
static u8 GetMoveBattleStyle(u16 move);
// Const rom data.
static const u8 sRequiredMoveCounts[] = {3, 3, 3, 2, 2, 2, 2};
@@ -109,25 +110,25 @@ static const u16 *const sMoveStyles[] =
sMoves_DependsOnTheBattlesFlow,
};
static void (* const gUnknown_08612120[])(void) =
static void (* const sBattleFactoryFunctions[])(void) =
{
sub_81A5E94,
sub_81A5FA8,
sub_81A6054,
InitFactoryChallenge,
GetBattleFactoryData,
SetBattleFactoryData,
sub_81A613C,
nullsub_75,
nullsub_123,
sub_81A6188,
sub_81A6198,
sub_81A61A4,
sub_81A63CC,
sub_81A64C4,
sub_81A63B8,
sub_81A61B0,
sub_81A67EC,
sub_81A6A08,
sub_81A6AEC,
sub_81A6C1C,
SelectInitialRentalMons,
SwapRentalMons,
SetPerformedRentalSwap,
SetRentalsToOpponentParty,
SetPlayerAndOpponentParties,
SetOpponentGfxVar,
GenerateOpponentMons,
GenerateInitialRentalMons,
GetOpponentMostCommonMonType,
GetOpponentBattleStyle,
RestorePlayerPartyHeldItems,
};
static const u32 gUnknown_08612164[][2] =
@@ -177,10 +178,10 @@ static const u16 sMonsToChooseFrom[][2] =
// code
void CallBattleFactoryFunction(void)
{
gUnknown_08612120[gSpecialVar_0x8004]();
sBattleFactoryFunctions[gSpecialVar_0x8004]();
}
static void sub_81A5E94(void)
static void InitFactoryChallenge(void)
{
u8 i;
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
@@ -196,9 +197,9 @@ static void sub_81A5E94(void)
gSaveBlock2Ptr->frontier.factoryRentsCount[battleMode][lvlMode] = 0;
}
gUnknown_03001288 = FALSE;
sPerformedRentalSwap = FALSE;
for (i = 0; i < 6; i++)
gSaveBlock2Ptr->frontier.field_E70[i].monId = 0xFFFF;
gSaveBlock2Ptr->frontier.rentalMons[i].monId = 0xFFFF;
for (i = 0; i < 3; i++)
gUnknown_03006298[i] = 0xFFFF;
@@ -206,10 +207,10 @@ static void sub_81A5E94(void)
gTrainerBattleOpponent_A = 0;
}
static void sub_81A5FA8(void)
static void GetBattleFactoryData(void)
{
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
int lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
int battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
switch (gSpecialVar_0x8005)
{
@@ -225,10 +226,10 @@ static void sub_81A5FA8(void)
}
}
static void sub_81A6054(void)
static void SetBattleFactoryData(void)
{
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
int lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
int battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
switch (gSpecialVar_0x8005)
{
@@ -242,10 +243,10 @@ static void sub_81A6054(void)
gSaveBlock2Ptr->frontier.field_CDC &= gUnknown_08612174[battleMode][lvlMode];
break;
case 3:
if (gUnknown_03001288 == TRUE)
if (sPerformedRentalSwap == TRUE)
{
gSaveBlock2Ptr->frontier.factoryRentsCount[battleMode][lvlMode] = gSpecialVar_0x8006;
gUnknown_03001288 = FALSE;
sPerformedRentalSwap = FALSE;
}
break;
}
@@ -269,28 +270,28 @@ static void nullsub_123(void)
}
static void sub_81A6188(void)
static void SelectInitialRentalMons(void)
{
ZeroPlayerPartyMons();
DoBattleFactorySelectScreen();
}
static void sub_81A6198(void)
static void SwapRentalMons(void)
{
DoBattleFactorySwapScreen();
}
static void sub_81A61A4(void)
static void SetPerformedRentalSwap(void)
{
gUnknown_03001288 = TRUE;
sPerformedRentalSwap = TRUE;
}
static void sub_81A61B0(void)
static void GenerateOpponentMons(void)
{
s32 i, j, k;
int i, j, k;
u16 species[3];
u16 heldItems[3];
s32 firstMonId = 0;
int firstMonId = 0;
u16 trainerId = 0;
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
@@ -303,14 +304,14 @@ static void sub_81A61B0(void)
trainerId = sub_8162548(challengeNum, gSaveBlock2Ptr->frontier.curChallengeBattleNum);
for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum; i++)
{
if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId)
if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId)
break;
}
} while (i != gSaveBlock2Ptr->frontier.curChallengeBattleNum);
gTrainerBattleOpponent_A = trainerId;
if (gSaveBlock2Ptr->frontier.curChallengeBattleNum < 6)
gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = trainerId;
gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = trainerId;
i = 0;
while (i != 3)
@@ -321,7 +322,7 @@ static void sub_81A61B0(void)
for (j = 0; j < 6; j++)
{
if (gFacilityTrainerMons[monSetId].species == gFacilityTrainerMons[gSaveBlock2Ptr->frontier.field_E70[j].monId].species)
if (gFacilityTrainerMons[monSetId].species == gFacilityTrainerMons[gSaveBlock2Ptr->frontier.rentalMons[j].monId].species)
break;
}
if (j != 6)
@@ -353,12 +354,12 @@ static void sub_81A61B0(void)
}
}
static void sub_81A63B8(void)
static void SetOpponentGfxVar(void)
{
SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0);
}
static void sub_81A63CC(void)
static void SetRentalsToOpponentParty(void)
{
u8 i;
@@ -369,18 +370,18 @@ static void sub_81A63CC(void)
for (i = 0; i < 3; i++)
{
gSaveBlock2Ptr->frontier.field_E70[i + 3].monId = gUnknown_03006298[i];
gSaveBlock2Ptr->frontier.field_E70[i + 3].ivs = GetBoxMonData(&gEnemyParty[i].box, MON_DATA_ATK_IV, NULL);
gSaveBlock2Ptr->frontier.field_E70[i + 3].personality = GetMonData(&gEnemyParty[i], MON_DATA_PERSONALITY, NULL);
gSaveBlock2Ptr->frontier.field_E70[i + 3].abilityBit = GetBoxMonData(&gEnemyParty[i].box, MON_DATA_ALT_ABILITY, NULL);
gSaveBlock2Ptr->frontier.rentalMons[i + 3].monId = gUnknown_03006298[i];
gSaveBlock2Ptr->frontier.rentalMons[i + 3].ivs = GetBoxMonData(&gEnemyParty[i].box, MON_DATA_ATK_IV, NULL);
gSaveBlock2Ptr->frontier.rentalMons[i + 3].personality = GetMonData(&gEnemyParty[i], MON_DATA_PERSONALITY, NULL);
gSaveBlock2Ptr->frontier.rentalMons[i + 3].abilityBit = GetBoxMonData(&gEnemyParty[i].box, MON_DATA_ALT_ABILITY, NULL);
SetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[gUnknown_03006298[i]].itemTableId]);
}
}
static void sub_81A64C4(void)
static void SetPlayerAndOpponentParties(void)
{
s32 i, j, k;
s32 count = 0;
int i, j, k;
int count = 0;
u8 bits = 0;
u8 monLevel;
u16 monSetId;
@@ -407,13 +408,13 @@ static void sub_81A64C4(void)
ZeroPlayerPartyMons();
for (i = 0; i < 3; i++)
{
monSetId = gSaveBlock2Ptr->frontier.field_E70[i].monId;
ivs = gSaveBlock2Ptr->frontier.field_E70[i].ivs;
monSetId = gSaveBlock2Ptr->frontier.rentalMons[i].monId;
ivs = gSaveBlock2Ptr->frontier.rentalMons[i].ivs;
CreateMon(&gPlayerParty[i],
gFacilityTrainerMons[monSetId].species,
monLevel,
ivs,
TRUE, gSaveBlock2Ptr->frontier.field_E70[i].personality,
TRUE, gSaveBlock2Ptr->frontier.rentalMons[i].personality,
0, 0);
count = 0;
@@ -438,7 +439,7 @@ static void sub_81A64C4(void)
SetMonMoveAvoidReturn(&gPlayerParty[i], gFacilityTrainerMons[monSetId].moves[k], k);
SetMonData(&gPlayerParty[i], MON_DATA_FRIENDSHIP, &friendship);
SetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]);
SetMonData(&gPlayerParty[i], MON_DATA_ALT_ABILITY, &gSaveBlock2Ptr->frontier.field_E70[i].abilityBit);
SetMonData(&gPlayerParty[i], MON_DATA_ALT_ABILITY, &gSaveBlock2Ptr->frontier.rentalMons[i].abilityBit);
}
}
@@ -448,13 +449,13 @@ static void sub_81A64C4(void)
case 2:
for (i = 0; i < 3; i++)
{
monSetId = gSaveBlock2Ptr->frontier.field_E70[i + 3].monId;
ivs = gSaveBlock2Ptr->frontier.field_E70[i + 3].ivs;
monSetId = gSaveBlock2Ptr->frontier.rentalMons[i + 3].monId;
ivs = gSaveBlock2Ptr->frontier.rentalMons[i + 3].ivs;
CreateMon(&gEnemyParty[i],
gFacilityTrainerMons[monSetId].species,
monLevel,
ivs,
TRUE, gSaveBlock2Ptr->frontier.field_E70[i + 3].personality,
TRUE, gSaveBlock2Ptr->frontier.rentalMons[i + 3].personality,
0, 0);
count = 0;
@@ -477,15 +478,15 @@ static void sub_81A64C4(void)
for (k = 0; k < MAX_MON_MOVES; k++)
SetMonMoveAvoidReturn(&gEnemyParty[i], gFacilityTrainerMons[monSetId].moves[k], k);
SetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]);
SetMonData(&gEnemyParty[i], MON_DATA_ALT_ABILITY, &gSaveBlock2Ptr->frontier.field_E70[i + 3].abilityBit);
SetMonData(&gEnemyParty[i], MON_DATA_ALT_ABILITY, &gSaveBlock2Ptr->frontier.rentalMons[i + 3].abilityBit);
}
break;
}
}
static void sub_81A67EC(void)
static void GenerateInitialRentalMons(void)
{
s32 i, j;
int i, j;
u8 firstMonId;
u8 battleMode;
u8 lvlMode;
@@ -525,7 +526,7 @@ static void sub_81A67EC(void)
factoryLvlMode = FRONTIER_LVL_50;
firstMonId = 0;
}
var_40 = sub_81A6F70(factoryBattleMode, factoryLvlMode);
var_40 = GetNumPastRentalsRank(factoryBattleMode, factoryLvlMode);
currSpecies = SPECIES_NONE;
i = 0;
@@ -569,7 +570,7 @@ static void sub_81A67EC(void)
if (j != firstMonId + i)
continue;
gSaveBlock2Ptr->frontier.field_E70[i].monId = monSetId;
gSaveBlock2Ptr->frontier.rentalMons[i].monId = monSetId;
species[i] = gFacilityTrainerMons[monSetId].species;
heldItems[i] = gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId];
monIds[i] = monSetId;
@@ -577,7 +578,7 @@ static void sub_81A67EC(void)
}
}
static void sub_81A6A08(void)
static void GetOpponentMostCommonMonType(void)
{
u8 i;
u8 typesCount[NUMBER_OF_MON_TYPES];
@@ -612,7 +613,7 @@ static void sub_81A6A08(void)
gSpecialVar_Result = NUMBER_OF_MON_TYPES;
}
static void sub_81A6AEC(void)
static void GetOpponentBattleStyle(void)
{
u8 i, j, count;
u8 stylePoints[8];
@@ -621,13 +622,14 @@ static void sub_81A6AEC(void)
gFacilityTrainerMons = gBattleFrontierMons;
for (i = 0; i < 8; i++)
stylePoints[i] = 0;
for (i = 0; i < 3; i++)
{
u16 monSetId = gUnknown_03006298[i];
for (j = 0; j < MAX_MON_MOVES; j++)
{
u8 id = GetStyleForMove(gFacilityTrainerMons[monSetId].moves[j]);
stylePoints[id]++;
u8 battleStyle = GetMoveBattleStyle(gFacilityTrainerMons[monSetId].moves[j]);
stylePoints[battleStyle]++;
}
}
@@ -640,11 +642,12 @@ static void sub_81A6AEC(void)
count++;
}
}
if (count > 2)
gSpecialVar_Result = 8;
}
static u8 GetStyleForMove(u16 move)
static u8 GetMoveBattleStyle(u16 move)
{
const u16 *moves;
u8 i, j;
@@ -660,12 +663,13 @@ static u8 GetStyleForMove(u16 move)
return 0;
}
bool8 sub_81A6BF4(void)
bool8 InBattleFactory(void)
{
return (gMapHeader.mapLayoutId == 347 || gMapHeader.mapLayoutId == 348);
return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM
|| gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM;
}
static void sub_81A6C1C(void)
static void RestorePlayerPartyHeldItems(void)
{
u8 i;
@@ -678,7 +682,7 @@ static void sub_81A6C1C(void)
{
SetMonData(&gPlayerParty[i],
MON_DATA_HELD_ITEM,
&gBattleFrontierHeldItems[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.field_E70[i].monId].itemTableId]);
&gBattleFrontierHeldItems[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.rentalMons[i].monId].itemTableId]);
}
}
@@ -697,11 +701,11 @@ u8 GetFactoryMonFixedIV(u8 arg0, u8 arg1)
void FillFactoryBrainParty(void)
{
s32 i, j, k;
int i, j, k;
u16 species[3];
u16 heldItems[3];
u8 friendship;
s32 monLevel;
int monLevel;
u8 fixedIV;
u32 otId;
@@ -724,7 +728,7 @@ void FillFactoryBrainParty(void)
for (j = 0; j < 6; j++)
{
if (monSetId == gSaveBlock2Ptr->frontier.field_E70[j].monId)
if (monSetId == gSaveBlock2Ptr->frontier.rentalMons[j].monId)
break;
}
if (j != 6)
@@ -767,7 +771,7 @@ void FillFactoryBrainParty(void)
static u16 GetMonSetId(u8 lvlMode, u8 challengeNum, bool8 arg2)
{
u16 range, ret;
u16 range, monSetId;
u16 adder;
if (lvlMode == FRONTIER_LVL_50)
@@ -780,14 +784,14 @@ static u16 GetMonSetId(u8 lvlMode, u8 challengeNum, bool8 arg2)
if (arg2)
{
range = (sMonsToChooseFrom[adder + challengeNum + 1][1] - sMonsToChooseFrom[adder + challengeNum + 1][0]) + 1;
ret = Random() % range;
ret += sMonsToChooseFrom[adder + challengeNum + 1][0];
monSetId = Random() % range;
monSetId += sMonsToChooseFrom[adder + challengeNum + 1][0];
}
else
{
range = (sMonsToChooseFrom[adder + challengeNum][1] - sMonsToChooseFrom[adder + challengeNum][0]) + 1;
ret = Random() % range;
ret += sMonsToChooseFrom[adder + challengeNum][0];
monSetId = Random() % range;
monSetId += sMonsToChooseFrom[adder + challengeNum][0];
}
}
else
@@ -796,14 +800,14 @@ static u16 GetMonSetId(u8 lvlMode, u8 challengeNum, bool8 arg2)
if (num != 7)
num = 7;
range = (sMonsToChooseFrom[adder + num][1] - sMonsToChooseFrom[adder + num][0]) + 1;
ret = Random() % range;
ret += sMonsToChooseFrom[adder + num][0];
monSetId = Random() % range;
monSetId += sMonsToChooseFrom[adder + num][0];
}
return ret;
return monSetId;
}
u8 sub_81A6F70(u8 battleMode, u8 lvlMode)
u8 GetNumPastRentalsRank(u8 battleMode, u8 lvlMode)
{
u8 ret;
u8 rents = gSaveBlock2Ptr->frontier.factoryRentsCount[battleMode][lvlMode];
@@ -826,7 +830,7 @@ u8 sub_81A6F70(u8 battleMode, u8 lvlMode)
u32 GetAiScriptsInBattleFactory(void)
{
s32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
int lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
if (lvlMode == FRONTIER_LVL_TENT)
{
@@ -834,8 +838,8 @@ u32 GetAiScriptsInBattleFactory(void)
}
else
{
s32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
s32 challengeNum = gSaveBlock2Ptr->frontier.factoryWinStreaks[battleMode][lvlMode] / 7;
int battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
int challengeNum = gSaveBlock2Ptr->frontier.factoryWinStreaks[battleMode][lvlMode] / 7;
if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN)
return AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY;
+45 -45
View File
@@ -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,
@@ -1183,7 +1183,7 @@ static void CB2_InitSelectScreen(void)
break;
case 5:
if (sFactorySelectScreen->fromSummaryScreen == TRUE)
sFactorySelectScreen->cursorPos = gUnknown_0203CF20;
sFactorySelectScreen->cursorPos = gLastViewedMonIndex;
Select_InitMonsData();
Select_InitAllSprites();
if (sFactorySelectScreen->fromSummaryScreen == TRUE)
@@ -1673,12 +1673,12 @@ static void CreateFrontierFactorySelectableMons(u8 firstMonId)
else
level = 50;
var_28 = sub_81A6F70(battleMode, lvlMode);
var_28 = GetNumPastRentalsRank(battleMode, lvlMode);
otId = T1_READ_32(gSaveBlock2Ptr->playerTrainerId);
for (i = 0; i < SELECTABLE_MONS_COUNT; i++)
{
u16 monSetId = gSaveBlock2Ptr->frontier.field_E70[i].monId;
u16 monSetId = gSaveBlock2Ptr->frontier.rentalMons[i].monId;
sFactorySelectScreen->mons[i + firstMonId].monSetId = monSetId;
if (i < var_28)
ivs = GetFactoryMonFixedIV(challengeNum + 1, 0);
@@ -1712,7 +1712,7 @@ static void CreateTentFactorySelectableMons(u8 firstMonId)
for (i = 0; i < SELECTABLE_MONS_COUNT; i++)
{
u16 monSetId = gSaveBlock2Ptr->frontier.field_E70[i].monId;
u16 monSetId = gSaveBlock2Ptr->frontier.rentalMons[i].monId;
sFactorySelectScreen->mons[i + firstMonId].monSetId = monSetId;
CreateMonWithEVSpreadNatureOTID(&sFactorySelectScreen->mons[i + firstMonId].monData,
gFacilityTrainerMons[monSetId].species,
@@ -1740,10 +1740,10 @@ static void Select_CopyMonsToPlayerParty(void)
if (sFactorySelectScreen->mons[j].selectedId == i + 1)
{
gPlayerParty[i] = sFactorySelectScreen->mons[j].monData;
gSaveBlock2Ptr->frontier.field_E70[i].monId = sFactorySelectScreen->mons[j].monSetId;
gSaveBlock2Ptr->frontier.field_E70[i].personality = GetMonData(&gPlayerParty[i].box, MON_DATA_PERSONALITY, NULL);
gSaveBlock2Ptr->frontier.field_E70[i].abilityBit = GetBoxMonData(&gPlayerParty[i].box, MON_DATA_ALT_ABILITY, NULL);
gSaveBlock2Ptr->frontier.field_E70[i].ivs = GetBoxMonData(&gPlayerParty[i].box, MON_DATA_ATK_IV, NULL);
gSaveBlock2Ptr->frontier.rentalMons[i].monId = sFactorySelectScreen->mons[j].monSetId;
gSaveBlock2Ptr->frontier.rentalMons[i].personality = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY, NULL);
gSaveBlock2Ptr->frontier.rentalMons[i].abilityBit = GetBoxMonData(&gPlayerParty[i].box, MON_DATA_ALT_ABILITY, NULL);
gSaveBlock2Ptr->frontier.rentalMons[i].ivs = GetBoxMonData(&gPlayerParty[i].box, MON_DATA_ATK_IV, NULL);
break;
}
}
@@ -1786,14 +1786,14 @@ static void sub_819B958(u8 windowId)
{
gSprites[sFactorySelectScreen->menuCursor1SpriteId].invisible = TRUE;
gSprites[sFactorySelectScreen->menuCursor2SpriteId].invisible = TRUE;
FillWindowPixelBuffer(windowId, 0);
FillWindowPixelBuffer(windowId, PIXEL_FILL(0));
CopyWindowToVram(windowId, 2);
ClearWindowTilemap(windowId);
}
static void Select_PrintRentalPkmnString(void)
{
FillWindowPixelBuffer(0, 0);
FillWindowPixelBuffer(0, PIXEL_FILL(0));
AddTextPrinterParameterized(0, 1, gText_RentalPkmn2, 2, 1, 0, NULL);
CopyWindowToVram(0, 3);
}
@@ -1804,7 +1804,7 @@ static void Select_PrintMonSpecies(void)
u8 x;
u8 monId = sFactorySelectScreen->cursorPos;
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
species = GetMonData(&sFactorySelectScreen->mons[monId].monData, MON_DATA_SPECIES, NULL);
StringCopy(gStringVar4, gSpeciesNames[species]);
x = GetStringRightAlignXOffset(1, gStringVar4, 86);
@@ -1816,7 +1816,7 @@ static void Select_PrintSelectMonString(void)
{
const u8 *str = NULL;
FillWindowPixelBuffer(2, 0);
FillWindowPixelBuffer(2, PIXEL_FILL(0));
if (sFactorySelectScreen->selectingMonsState == 1)
str = gText_SelectFirstPkmn;
else if (sFactorySelectScreen->selectingMonsState == 2)
@@ -1832,7 +1832,7 @@ static void Select_PrintSelectMonString(void)
static void Select_PrintCantSelectSameMon(void)
{
FillWindowPixelBuffer(2, 0);
FillWindowPixelBuffer(2, PIXEL_FILL(0));
AddTextPrinterParameterized(2, 1, gText_CantSelectSamePkmn, 2, 5, 0, NULL);
CopyWindowToVram(2, 2);
}
@@ -1842,7 +1842,7 @@ static void Select_PrintMenuOptions(void)
u8 selectedId = sFactorySelectScreen->mons[sFactorySelectScreen->cursorPos].selectedId;
PutWindowTilemap(3);
FillWindowPixelBuffer(3, 0);
FillWindowPixelBuffer(3, PIXEL_FILL(0));
AddTextPrinterParameterized3(3, 1, 7, 1, gUnknown_08610476, 0, gText_Summary);
if (selectedId != 0)
AddTextPrinterParameterized3(3, 1, 7, 17, gUnknown_08610476, 0, gText_Deselect);
@@ -1856,7 +1856,7 @@ static void Select_PrintMenuOptions(void)
static void Select_PrintYesNoOptions(void)
{
PutWindowTilemap(4);
FillWindowPixelBuffer(4, 0);
FillWindowPixelBuffer(4, PIXEL_FILL(0));
AddTextPrinterParameterized3(4, 1, 7, 1, gUnknown_08610476, 0, gText_Yes2);
AddTextPrinterParameterized3(4, 1, 7, 17, gUnknown_08610476, 0, gText_No2);
CopyWindowToVram(4, 3);
@@ -1924,7 +1924,7 @@ static void Select_PrintMonCategory(void)
if (monId < SELECTABLE_MONS_COUNT)
{
PutWindowTilemap(5);
FillWindowPixelBuffer(5, 0);
FillWindowPixelBuffer(5, PIXEL_FILL(0));
species = GetMonData(&sFactorySelectScreen->mons[monId].monData, MON_DATA_SPECIES, NULL);
CopyMonCategoryText(SpeciesToNationalPokedexNum(species), text);
x = GetStringRightAlignXOffset(1, text, 0x76);
@@ -2263,10 +2263,10 @@ static void CopySwappedMonData(void)
gPlayerParty[sFactorySwapScreen->playerMonId] = gEnemyParty[sFactorySwapScreen->enemyMonId];
happiness = 0;
SetMonData(&gPlayerParty[sFactorySwapScreen->playerMonId], MON_DATA_FRIENDSHIP, &happiness);
gSaveBlock2Ptr->frontier.field_E70[sFactorySwapScreen->playerMonId].monId = gSaveBlock2Ptr->frontier.field_E70[sFactorySwapScreen->enemyMonId + 3].monId;
gSaveBlock2Ptr->frontier.field_E70[sFactorySwapScreen->playerMonId].ivs = gSaveBlock2Ptr->frontier.field_E70[sFactorySwapScreen->enemyMonId + 3].ivs;
gSaveBlock2Ptr->frontier.field_E70[sFactorySwapScreen->playerMonId].personality = GetMonData(&gEnemyParty[sFactorySwapScreen->enemyMonId], MON_DATA_PERSONALITY, NULL);
gSaveBlock2Ptr->frontier.field_E70[sFactorySwapScreen->playerMonId].abilityBit = GetBoxMonData(&gEnemyParty[sFactorySwapScreen->enemyMonId].box, MON_DATA_ALT_ABILITY, NULL);
gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->playerMonId].monId = gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->enemyMonId + 3].monId;
gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->playerMonId].ivs = gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->enemyMonId + 3].ivs;
gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->playerMonId].personality = GetMonData(&gEnemyParty[sFactorySwapScreen->enemyMonId], MON_DATA_PERSONALITY, NULL);
gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->playerMonId].abilityBit = GetBoxMonData(&gEnemyParty[sFactorySwapScreen->enemyMonId].box, MON_DATA_ALT_ABILITY, NULL);
}
static void Task_FromSwapScreenToSummaryScreen(u8 taskId)
@@ -2873,7 +2873,7 @@ static void sub_819D588(u8 taskId)
case 3:
if (!gPaletteFade.active)
{
FillWindowPixelBuffer(5, 0);
FillWindowPixelBuffer(5, PIXEL_FILL(0));
CopyWindowToVram(5, 2);
if (sFactorySwapScreen->inEnemyScreen == TRUE)
{
@@ -3002,7 +3002,7 @@ static void sub_819D770(u8 taskId)
gTasks[taskId].data[0]++;
break;
case 6:
FillWindowPixelBuffer(5, 0);
FillWindowPixelBuffer(5, PIXEL_FILL(0));
CopyWindowToVram(5, 2);
gTasks[taskId].data[0]++;
break;
@@ -3172,7 +3172,7 @@ static void CB2_InitSwapScreen(void)
break;
case 5:
if (sFactorySwapScreen->fromSummaryScreen == TRUE)
sFactorySwapScreen->cursorPos = gUnknown_0203CF20;
sFactorySwapScreen->cursorPos = gLastViewedMonIndex;
gMain.state++;
break;
case 6:
@@ -3546,7 +3546,7 @@ static void sub_819EA64(u8 windowId)
{
gSprites[sFactorySwapScreen->menuCursor1SpriteId].invisible = TRUE;
gSprites[sFactorySwapScreen->menuCursor2SpriteId].invisible = TRUE;
FillWindowPixelBuffer(windowId, 0);
FillWindowPixelBuffer(windowId, PIXEL_FILL(0));
CopyWindowToVram(windowId, 2);
ClearWindowTilemap(windowId);
}
@@ -3554,14 +3554,14 @@ static void sub_819EA64(u8 windowId)
static void sub_819EAC0(void)
{
PutWindowTilemap(1);
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
CopyWindowToVram(1, 2);
}
static void sub_819EADC(void)
{
PutWindowTilemap(7);
FillWindowPixelBuffer(7, 0);
FillWindowPixelBuffer(7, PIXEL_FILL(0));
CopyWindowToVram(7, 2);
}
@@ -3569,13 +3569,13 @@ static void sub_819EAF8(void)
{
sub_819EAC0();
PutWindowTilemap(5);
FillWindowPixelBuffer(5, 0);
FillWindowPixelBuffer(5, PIXEL_FILL(0));
CopyWindowToVram(5, 2);
}
static void Swap_PrintPkmnSwap(void)
{
FillWindowPixelBuffer(0, 0x11);
FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized(0, 1, gText_PkmnSwap, 2, 1, 0, NULL);
CopyWindowToVram(0, 3);
}
@@ -3585,7 +3585,7 @@ static void Swap_PrintMonSpecies(void)
u16 species;
u8 x;
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
if (sFactorySwapScreen->cursorPos > 2)
{
CopyWindowToVram(1, 2);
@@ -3606,7 +3606,7 @@ static void Swap_PrintMonSpecies(void)
static void Swap_PrintOnInfoWindow(const u8 *str)
{
FillWindowPixelBuffer(2, 0);
FillWindowPixelBuffer(2, PIXEL_FILL(0));
AddTextPrinterParameterized(2, 1, str, 2, 5, 0, NULL);
CopyWindowToVram(2, 2);
}
@@ -3614,7 +3614,7 @@ static void Swap_PrintOnInfoWindow(const u8 *str)
static void Swap_PrintMenuOptions(void)
{
PutWindowTilemap(3);
FillWindowPixelBuffer(3, 0);
FillWindowPixelBuffer(3, PIXEL_FILL(0));
AddTextPrinterParameterized3(3, 1, 15, 1, gUnknown_08610922, 0, gText_Summary2);
AddTextPrinterParameterized3(3, 1, 15, 17, gUnknown_08610922, 0, gText_Swap);
AddTextPrinterParameterized3(3, 1, 15, 33, gUnknown_08610922, 0, gText_Rechoose);
@@ -3624,7 +3624,7 @@ static void Swap_PrintMenuOptions(void)
static void Swap_PrintYesNoOptions(void)
{
PutWindowTilemap(4);
FillWindowPixelBuffer(4, 0);
FillWindowPixelBuffer(4, PIXEL_FILL(0));
AddTextPrinterParameterized3(4, 1, 7, 1, gUnknown_08610922, 0, gText_Yes3);
AddTextPrinterParameterized3(4, 1, 7, 17, gUnknown_08610922, 0, gText_No3);
CopyWindowToVram(4, 3);
@@ -3638,7 +3638,7 @@ static void Swap_PrintActionString(const u8 *str, u32 y, u32 windowId)
static void Swap_PrintActionStrings(void)
{
FillWindowPixelBuffer(5, 0);
FillWindowPixelBuffer(5, PIXEL_FILL(0));
switch (sFactorySwapScreen->inEnemyScreen)
{
case TRUE:
@@ -3652,7 +3652,7 @@ static void Swap_PrintActionStrings(void)
static void Swap_PrintActionStrings2(void)
{
FillWindowPixelBuffer(3, 0);
FillWindowPixelBuffer(3, PIXEL_FILL(0));
switch (sFactorySwapScreen->inEnemyScreen)
{
case TRUE:
@@ -3693,7 +3693,7 @@ static void Swap_PrintMonSpecies2(void)
LoadPalette(pal, 0xF0, 0xA);
PutWindowTilemap(7);
FillWindowPixelBuffer(7, 0);
FillWindowPixelBuffer(7, PIXEL_FILL(0));
if (sFactorySwapScreen->cursorPos > 2)
{
CopyWindowToVram(7, 3);
@@ -3745,7 +3745,7 @@ static void Swap_PrintMonCategory(void)
u8 x;
u8 monId = sFactorySwapScreen->cursorPos;
FillWindowPixelBuffer(8, 0);
FillWindowPixelBuffer(8, PIXEL_FILL(0));
if (monId > 2)
{
CopyWindowToVram(8, 2);
@@ -3940,7 +3940,7 @@ static void Task_SwapCantHaveSameMons(u8 taskId)
case 2:
if (sFactorySwapScreen->unk30 != TRUE)
{
FillWindowPixelBuffer(5, 0);
FillWindowPixelBuffer(5, PIXEL_FILL(0));
CopyWindowToVram(5, 2);
gTasks[taskId].data[0]++;
}
+91 -90
View File
@@ -35,125 +35,126 @@ struct TestingBar
};
enum
{
HEALTHBOX_GFX_0,
HEALTHBOX_GFX_1,
HEALTHBOX_GFX_2,
HEALTHBOX_GFX_HP_BAR_GREEN,
HEALTHBOX_GFX_4,
HEALTHBOX_GFX_5,
HEALTHBOX_GFX_6,
HEALTHBOX_GFX_7,
HEALTHBOX_GFX_8,
HEALTHBOX_GFX_9,
HEALTHBOX_GFX_10,
HEALTHBOX_GFX_11,
HEALTHBOX_GFX_12,
HEALTHBOX_GFX_13,
HEALTHBOX_GFX_14,
HEALTHBOX_GFX_15,
HEALTHBOX_GFX_16,
HEALTHBOX_GFX_17,
HEALTHBOX_GFX_18,
HEALTHBOX_GFX_19,
HEALTHBOX_GFX_20,
HEALTHBOX_GFX_STATUS_PSN_BATTLER0,
HEALTHBOX_GFX_22,
HEALTHBOX_GFX_23,
HEALTHBOX_GFX_STATUS_PRZ_BATTLER0,
{ // Corresponds to gHealthboxElementsGfxTable (and the tables after it) in graphics.c
// These are indexes into the tables, which are filled with 8x8 square pixel data.
HEALTHBOX_GFX_0, //hp bar [black section]
HEALTHBOX_GFX_1, //hp bar "H"
HEALTHBOX_GFX_2, //hp bar "P"
HEALTHBOX_GFX_HP_BAR_GREEN, //hp bar [0 pixels]
HEALTHBOX_GFX_4, //hp bar [1 pixels]
HEALTHBOX_GFX_5, //hp bar [2 pixels]
HEALTHBOX_GFX_6, //hp bar [3 pixels]
HEALTHBOX_GFX_7, //hp bar [4 pixels]
HEALTHBOX_GFX_8, //hp bar [5 pixels]
HEALTHBOX_GFX_9, //hp bar [6 pixels]
HEALTHBOX_GFX_10, //hp bar [7 pixels]
HEALTHBOX_GFX_11, //hp bar [8 pixels]
HEALTHBOX_GFX_12, //exp bar [0 pixels]
HEALTHBOX_GFX_13, //exp bar [1 pixels]
HEALTHBOX_GFX_14, //exp bar [2 pixels]
HEALTHBOX_GFX_15, //exp bar [3 pixels]
HEALTHBOX_GFX_16, //exp bar [4 pixels]
HEALTHBOX_GFX_17, //exp bar [5 pixels]
HEALTHBOX_GFX_18, //exp bar [6 pixels]
HEALTHBOX_GFX_19, //exp bar [7 pixels]
HEALTHBOX_GFX_20, //exp bar [8 pixels]
HEALTHBOX_GFX_STATUS_PSN_BATTLER0, //status psn "(P"
HEALTHBOX_GFX_22, //status psn "SN"
HEALTHBOX_GFX_23, //status psn "|)""
HEALTHBOX_GFX_STATUS_PRZ_BATTLER0, //status prz
HEALTHBOX_GFX_25,
HEALTHBOX_GFX_26,
HEALTHBOX_GFX_STATUS_SLP_BATTLER0,
HEALTHBOX_GFX_STATUS_SLP_BATTLER0, //status slp
HEALTHBOX_GFX_28,
HEALTHBOX_GFX_29,
HEALTHBOX_GFX_STATUS_FRZ_BATTLER0,
HEALTHBOX_GFX_STATUS_FRZ_BATTLER0, //status frz
HEALTHBOX_GFX_31,
HEALTHBOX_GFX_32,
HEALTHBOX_GFX_STATUS_BRN_BATTLER0,
HEALTHBOX_GFX_STATUS_BRN_BATTLER0, //status brn
HEALTHBOX_GFX_34,
HEALTHBOX_GFX_35,
HEALTHBOX_GFX_36,
HEALTHBOX_GFX_37,
HEALTHBOX_GFX_38,
HEALTHBOX_GFX_39,
HEALTHBOX_GFX_40,
HEALTHBOX_GFX_41,
HEALTHBOX_GFX_42,
HEALTHBOX_GFX_43,
HEALTHBOX_GFX_44,
HEALTHBOX_GFX_45,
HEALTHBOX_GFX_46,
HEALTHBOX_GFX_HP_BAR_YELLOW,
HEALTHBOX_GFX_48,
HEALTHBOX_GFX_49,
HEALTHBOX_GFX_50,
HEALTHBOX_GFX_51,
HEALTHBOX_GFX_52,
HEALTHBOX_GFX_53,
HEALTHBOX_GFX_54,
HEALTHBOX_GFX_55,
HEALTHBOX_GFX_HP_BAR_RED,
HEALTHBOX_GFX_57,
HEALTHBOX_GFX_58,
HEALTHBOX_GFX_59,
HEALTHBOX_GFX_60,
HEALTHBOX_GFX_61,
HEALTHBOX_GFX_62,
HEALTHBOX_GFX_63,
HEALTHBOX_GFX_64,
HEALTHBOX_GFX_65,
HEALTHBOX_GFX_66,
HEALTHBOX_GFX_67,
HEALTHBOX_GFX_68,
HEALTHBOX_GFX_69,
HEALTHBOX_GFX_70,
HEALTHBOX_GFX_STATUS_PSN_BATTLER1,
HEALTHBOX_GFX_36, //misc [Black section]
HEALTHBOX_GFX_37, //misc [Black section]
HEALTHBOX_GFX_38, //misc [Black section]
HEALTHBOX_GFX_39, //misc [Blank Health Window?]
HEALTHBOX_GFX_40, //misc [Blank Health Window?]
HEALTHBOX_GFX_41, //misc [Blank Health Window?]
HEALTHBOX_GFX_42, //misc [Blank Health Window?]
HEALTHBOX_GFX_43, //misc [Top of Health Window?]
HEALTHBOX_GFX_44, //misc [Top of Health Window?]
HEALTHBOX_GFX_45, //misc [Top of Health Window?]
HEALTHBOX_GFX_46, //misc [Blank Health Window?]
HEALTHBOX_GFX_HP_BAR_YELLOW, //hp bar yellow [0 pixels]
HEALTHBOX_GFX_48, //hp bar yellow [1 pixels]
HEALTHBOX_GFX_49, //hp bar yellow [2 pixels]
HEALTHBOX_GFX_50, //hp bar yellow [3 pixels]
HEALTHBOX_GFX_51, //hp bar yellow [4 pixels]
HEALTHBOX_GFX_52, //hp bar yellow [5 pixels]
HEALTHBOX_GFX_53, //hp bar yellow [6 pixels]
HEALTHBOX_GFX_54, //hp bar yellow [7 pixels]
HEALTHBOX_GFX_55, //hp bar yellow [8 pixels]
HEALTHBOX_GFX_HP_BAR_RED, //hp bar red [0 pixels]
HEALTHBOX_GFX_57, //hp bar red [1 pixels]
HEALTHBOX_GFX_58, //hp bar red [2 pixels]
HEALTHBOX_GFX_59, //hp bar red [3 pixels]
HEALTHBOX_GFX_60, //hp bar red [4 pixels]
HEALTHBOX_GFX_61, //hp bar red [5 pixels]
HEALTHBOX_GFX_62, //hp bar red [6 pixels]
HEALTHBOX_GFX_63, //hp bar red [7 pixels]
HEALTHBOX_GFX_64, //hp bar red [8 pixels]
HEALTHBOX_GFX_65, //hp bar frame end
HEALTHBOX_GFX_66, //status ball [full]
HEALTHBOX_GFX_67, //status ball [empty]
HEALTHBOX_GFX_68, //status ball [fainted]
HEALTHBOX_GFX_69, //status ball [statused]
HEALTHBOX_GFX_70, //status ball [unused extra]
HEALTHBOX_GFX_STATUS_PSN_BATTLER1, //status2 "PSN"
HEALTHBOX_GFX_72,
HEALTHBOX_GFX_73,
HEALTHBOX_GFX_STATUS_PRZ_BATTLER1,
HEALTHBOX_GFX_STATUS_PRZ_BATTLER1, //status2 "PRZ"
HEALTHBOX_GFX_75,
HEALTHBOX_GFX_76,
HEALTHBOX_GFX_STATUS_SLP_BATTLER1,
HEALTHBOX_GFX_STATUS_SLP_BATTLER1, //status2 "SLP"
HEALTHBOX_GFX_78,
HEALTHBOX_GFX_79,
HEALTHBOX_GFX_STATUS_FRZ_BATTLER1,
HEALTHBOX_GFX_STATUS_FRZ_BATTLER1, //status2 "FRZ"
HEALTHBOX_GFX_81,
HEALTHBOX_GFX_82,
HEALTHBOX_GFX_STATUS_BRN_BATTLER1,
HEALTHBOX_GFX_STATUS_BRN_BATTLER1, //status2 "BRN"
HEALTHBOX_GFX_84,
HEALTHBOX_GFX_85,
HEALTHBOX_GFX_STATUS_PSN_BATTLER2,
HEALTHBOX_GFX_STATUS_PSN_BATTLER2, //status3 "PSN"
HEALTHBOX_GFX_87,
HEALTHBOX_GFX_88,
HEALTHBOX_GFX_STATUS_PRZ_BATTLER2,
HEALTHBOX_GFX_STATUS_PRZ_BATTLER2, //status3 "PRZ"
HEALTHBOX_GFX_90,
HEALTHBOX_GFX_91,
HEALTHBOX_GFX_STATUS_SLP_BATTLER2,
HEALTHBOX_GFX_STATUS_SLP_BATTLER2, //status3 "SLP"
HEALTHBOX_GFX_93,
HEALTHBOX_GFX_94,
HEALTHBOX_GFX_STATUS_FRZ_BATTLER2,
HEALTHBOX_GFX_STATUS_FRZ_BATTLER2, //status3 "FRZ"
HEALTHBOX_GFX_96,
HEALTHBOX_GFX_97,
HEALTHBOX_GFX_STATUS_BRN_BATTLER2,
HEALTHBOX_GFX_STATUS_BRN_BATTLER2, //status3 "BRN"
HEALTHBOX_GFX_99,
HEALTHBOX_GFX_100,
HEALTHBOX_GFX_STATUS_PSN_BATTLER3,
HEALTHBOX_GFX_STATUS_PSN_BATTLER3, //status4 "PSN"
HEALTHBOX_GFX_102,
HEALTHBOX_GFX_103,
HEALTHBOX_GFX_STATUS_PRZ_BATTLER3,
HEALTHBOX_GFX_STATUS_PRZ_BATTLER3, //status4 "PRZ"
HEALTHBOX_GFX_105,
HEALTHBOX_GFX_106,
HEALTHBOX_GFX_STATUS_SLP_BATTLER3,
HEALTHBOX_GFX_STATUS_SLP_BATTLER3, //status4 "SLP"
HEALTHBOX_GFX_108,
HEALTHBOX_GFX_109,
HEALTHBOX_GFX_STATUS_FRZ_BATTLER3,
HEALTHBOX_GFX_STATUS_FRZ_BATTLER3, //status4 "FRZ"
HEALTHBOX_GFX_111,
HEALTHBOX_GFX_112,
HEALTHBOX_GFX_STATUS_BRN_BATTLER3,
HEALTHBOX_GFX_STATUS_BRN_BATTLER3, //status4 "BRN"
HEALTHBOX_GFX_114,
HEALTHBOX_GFX_115,
HEALTHBOX_GFX_116,
HEALTHBOX_GFX_117,
HEALTHBOX_GFX_116, //unknown_D12FEC
HEALTHBOX_GFX_117, //unknown_D1300C
};
extern const u8 *const gNatureNamePointers[];
@@ -206,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,
@@ -278,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,
@@ -445,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,
@@ -462,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,
@@ -2578,7 +2579,7 @@ static u8* AddTextPrinterAndCreateWindowOnHealthbox(const u8 *str, u32 x, u32 y,
struct WindowTemplate winTemplate = sHealthboxWindowTemplate;
winId = AddWindow(&winTemplate);
FillWindowPixelBuffer(winId, (bgColor << 4) | (bgColor));
FillWindowPixelBuffer(winId, PIXEL_FILL(bgColor));
color[0] = bgColor;
color[1] = 1;
+9 -11
View File
@@ -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);
@@ -139,7 +137,7 @@ static void HandleAction_ThrowPokeblock(void);
static void HandleAction_GoNear(void);
static void HandleAction_SafariZoneRun(void);
static void HandleAction_WallyBallThrow(void);
static void HandleAction_Action11(void);
static void HandleAction_TryFinish(void);
static void HandleAction_NothingIsFainted(void);
static void HandleAction_ActionFinished(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,
@@ -553,7 +551,7 @@ static void (* const sTurnActionsFuncsTable[])(void) =
[B_ACTION_SAFARI_RUN] = HandleAction_SafariZoneRun,
[B_ACTION_WALLY_THROW] = HandleAction_WallyBallThrow,
[B_ACTION_EXEC_SCRIPT] = HandleAction_RunBattleScript,
[11] = HandleAction_Action11, // not sure about this one
[B_ACTION_TRY_FINISH] = HandleAction_TryFinish,
[B_ACTION_FINISHED] = HandleAction_ActionFinished,
[B_ACTION_NOTHING_FAINTED] = HandleAction_NothingIsFainted,
};
@@ -3279,7 +3277,7 @@ void FaintClearSetData(void)
gProtectStructs[gActiveBattler].targetNotAffected = 0;
gProtectStructs[gActiveBattler].chargingTurn = 0;
gProtectStructs[gActiveBattler].fleeFlag = 0;
gProtectStructs[gActiveBattler].usedImprisionedMove = 0;
gProtectStructs[gActiveBattler].usedImprisonedMove = 0;
gProtectStructs[gActiveBattler].loveImmobility = 0;
gProtectStructs[gActiveBattler].usedDisabledMove = 0;
gProtectStructs[gActiveBattler].usedTauntedMove = 0;
@@ -5845,7 +5843,7 @@ static void HandleAction_WallyBallThrow(void)
gActionsByTurnOrder[1] = B_ACTION_FINISHED;
}
static void HandleAction_Action11(void)
static void HandleAction_TryFinish(void)
{
if (!HandleFaintedMonActions())
{
+47 -47
View File
@@ -1357,7 +1357,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
{
// The corresponding WindowTemplate is gStandardBattleWindowTemplates[] within src/battle_bg.c
{ // 0 Standard battle message
.fillValue = 0xFF,
.fillValue = PIXEL_FILL(0xF),
.fontId = 1,
.x = 0,
.y = 1,
@@ -1369,7 +1369,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 6,
},
{ // 1 "What will (pokemon) do?"
.fillValue = 0xFF,
.fillValue = PIXEL_FILL(0xF),
.fontId = 1,
.x = 1,
.y = 1,
@@ -1381,7 +1381,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 6,
},
{ // 2 "Fight/Pokemon/Bag/Run"
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = 0,
.y = 1,
@@ -1393,7 +1393,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 3 Top left move
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1405,7 +1405,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 4 Top right move
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1417,7 +1417,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 5 Bottom left move
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1429,7 +1429,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 6 Bottom right move
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1441,7 +1441,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 7 "PP"
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1453,7 +1453,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 11,
},
{ // 8
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = 0,
.y = 1,
@@ -1465,7 +1465,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 9 PP remaining
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = 2,
.y = 1,
@@ -1477,7 +1477,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 11,
},
{ // 10 "type"
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1489,7 +1489,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 11 "switch which?"
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1501,7 +1501,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 12 "gText_BattleYesNoChoice"
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = 0,
.y = 1,
@@ -1513,7 +1513,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 13
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = 0,
.y = 1,
@@ -1525,7 +1525,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 14
.fillValue = 0x0,
.fillValue = PIXEL_FILL(0),
.fontId = 1,
.x = 32,
.y = 1,
@@ -1537,7 +1537,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 2,
},
{ // 15
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1549,7 +1549,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 16
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1561,7 +1561,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 17
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1573,7 +1573,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 18
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1585,7 +1585,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 19
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1597,7 +1597,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 20
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1609,7 +1609,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 15,
},
{ // 21
.fillValue = 0x0,
.fillValue = PIXEL_FILL(0),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1621,7 +1621,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 6,
},
{ // 22
.fillValue = 0x0,
.fillValue = PIXEL_FILL(0),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1633,7 +1633,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
.shadowColor = 6,
},
{ // 23
.fillValue = 0x0,
.fillValue = PIXEL_FILL(0x0),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1649,7 +1649,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
{
{ // 0
.fillValue = 0xFF,
.fillValue = PIXEL_FILL(0xF),
.fontId = 1,
.x = 0,
.y = 1,
@@ -1661,7 +1661,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 6,
},
{ // 1
.fillValue = 0xFF,
.fillValue = PIXEL_FILL(0xF),
.fontId = 1,
.x = 1,
.y = 1,
@@ -1673,7 +1673,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 6,
},
{ // 2
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = 0,
.y = 1,
@@ -1685,7 +1685,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 3
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1697,7 +1697,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 4
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1709,7 +1709,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 5
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1721,7 +1721,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 6
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1733,7 +1733,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 7
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1745,7 +1745,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 11,
},
{ // 8
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = 0,
.y = 1,
@@ -1757,7 +1757,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 9
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = 2,
.y = 1,
@@ -1769,7 +1769,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 11,
},
{ // 10
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1781,7 +1781,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 11
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 7,
.x = 0,
.y = 1,
@@ -1793,7 +1793,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 12
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = 0,
.y = 1,
@@ -1805,7 +1805,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 13
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = 0,
.y = 1,
@@ -1817,7 +1817,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 14
.fillValue = 0x0,
.fillValue = PIXEL_FILL(0),
.fontId = 1,
.x = 32,
.y = 1,
@@ -1829,7 +1829,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 2,
},
{ // 15
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1841,7 +1841,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 16
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1853,7 +1853,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 17
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1865,7 +1865,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 18
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1877,7 +1877,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 19
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1889,7 +1889,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 20
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1901,7 +1901,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 21
.fillValue = 0xEE,
.fillValue = PIXEL_FILL(0xE),
.fontId = 1,
.x = -1,
.y = 1,
@@ -1913,7 +1913,7 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
.shadowColor = 15,
},
{ // 22
.fillValue = 0x11,
.fillValue = PIXEL_FILL(0x1),
.fontId = 1,
.x = 0,
.y = 1,
+403 -377
View File
File diff suppressed because it is too large Load Diff
+970 -905
View File
File diff suppressed because it is too large Load Diff
+30 -29
View File
@@ -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,
@@ -338,7 +338,7 @@ static const struct SpriteTemplate gUnknown_0861F3D4 =
};
// code
void sub_81C4EEC(void)
void InitBattlePyramidBagCursorPosition(void)
{
gPyramidBagCursorData.cursorPosition = 0;
gPyramidBagCursorData.scrollPosition = 0;
@@ -576,7 +576,7 @@ static void SetBagItemsListTemplate(void)
}
StringCopy(gPyramidBagResources->itemStrings[i], gText_CloseBag);
gPyramidBagResources->bagListItems[i].name = gPyramidBagResources->itemStrings[i];
gPyramidBagResources->bagListItems[i].id = LIST_B_PRESSED;
gPyramidBagResources->bagListItems[i].id = LIST_CANCEL;
gMultiuseListMenuTemplate = gUnknown_0861F2C0;
gMultiuseListMenuTemplate.totalItems = gPyramidBagResources->listMenuCount;
gMultiuseListMenuTemplate.items = gPyramidBagResources->bagListItems;
@@ -607,7 +607,7 @@ static void PyramidBagMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMen
if (gPyramidBagResources->unk814 == 0xFF)
{
sub_81C6FF8(gPyramidBagResources->unk815 ^ 1);
if (itemIndex != LIST_B_PRESSED)
if (itemIndex != LIST_CANCEL)
ShowItemImage(gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.lvlMode][itemIndex], gPyramidBagResources->unk815);
else
ShowItemImage(0xFFFF, gPyramidBagResources->unk815);
@@ -619,7 +619,7 @@ static void PyramidBagMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMen
static void PrintItemQuantity(u8 windowId, s32 itemIndex, u8 y)
{
s32 xAlign;
if (itemIndex == LIST_B_PRESSED)
if (itemIndex == LIST_CANCEL)
return;
if (gPyramidBagResources->unk814 != 0xFF)
@@ -641,7 +641,7 @@ static void PrintItemQuantity(u8 windowId, s32 itemIndex, u8 y)
static void PrintItemDescription(s32 listMenuId)
{
const u8 *desc;
if (listMenuId != LIST_B_PRESSED)
if (listMenuId != LIST_CANCEL)
{
desc = ItemId_GetDescription(gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.lvlMode][listMenuId]);
}
@@ -651,7 +651,7 @@ static void PrintItemDescription(s32 listMenuId)
StringExpandPlaceholders(gStringVar4, gText_ReturnToVar1);
desc = gStringVar4;
}
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
PrintOnWindow_Font1(1, desc, 3, 0, 0, 1, 0, 0);
}
@@ -804,7 +804,7 @@ static void sub_81C5A98(u8 listMenuTaskId, u8 arg1)
static void sub_81C5AB8(u8 y, u8 arg1)
{
if (arg1 == 0xFF)
FillWindowPixelRect(0, 0, 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1));
FillWindowPixelRect(0, PIXEL_FILL(0), 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1));
else
PrintOnWindow_Font1(0, gText_SelectorArrow2, 0, y, 0, 0, 0, arg1);
}
@@ -853,13 +853,13 @@ static void Task_HandlePyramidBagInput(u8 taskId)
}
else
{
s32 listId = ListMenuHandleInputGetItemId(data[0]);
s32 listId = ListMenu_ProcessInput(data[0]);
ListMenuGetScrollAndRow(data[0], &gPyramidBagCursorData.scrollPosition, &gPyramidBagCursorData.cursorPosition);
switch (listId)
{
case LIST_NOTHING_CHOSEN:
break;
case LIST_B_PRESSED:
case LIST_CANCEL:
PlaySE(SE_SELECT);
gSpecialVar_ItemId = 0;
sub_81C5B14(taskId);
@@ -911,7 +911,7 @@ static void sub_81C5D20(u8 taskId)
CopyItemName(gSpecialVar_ItemId, gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected);
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0);
if (gPyramidBagResources->menuActionsCount == 1)
sub_81C5EAC(sub_81C6D24(0));
@@ -945,9 +945,9 @@ static void HandleFewMenuActionsInput(u8 taskId)
s32 id = Menu_ProcessInputNoWrap();
switch (id)
{
case -2:
case MENU_NOTHING_CHOSEN:
break;
case -1:
case MENU_B_PRESSED:
PlaySE(SE_SELECT);
sMenuActions[ACTION_CANCEL].func.void_u8(taskId);
break;
@@ -1048,7 +1048,7 @@ static void BagAction_UseOnField(u8 taskId)
else if (ItemId_GetFieldFunc(gSpecialVar_ItemId) != NULL)
{
sub_81C61A8();
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
schedule_bg_copy_tilemap_to_vram(0);
ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId);
}
@@ -1086,7 +1086,7 @@ static void BagAction_Toss(u8 taskId)
{
CopyItemName(gSpecialVar_ItemId, gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_TossHowManyVar1s);
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0);
sub_81C6404();
gTasks[taskId].func = sub_81C64B4;
@@ -1100,7 +1100,7 @@ static void sub_81C6350(u8 taskId)
CopyItemName(gSpecialVar_ItemId, gStringVar1);
ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 2);
StringExpandPlaceholders(gStringVar4, gText_ConfirmTossItems);
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0);
sub_81C6DAC(taskId, &sYesNoTossFuncions);
}
@@ -1146,7 +1146,7 @@ static void sub_81C64B4(u8 taskId)
else if (gMain.newKeys & A_BUTTON)
{
PlaySE(SE_SELECT);
sub_8198070(3, 0);
ClearStdWindowAndFrameToTransparent(3, 0);
ClearWindowTilemap(3);
schedule_bg_copy_tilemap_to_vram(1);
sub_81C6350(taskId);
@@ -1154,7 +1154,7 @@ static void sub_81C64B4(u8 taskId)
else if (gMain.newKeys & B_BUTTON)
{
PlaySE(SE_SELECT);
sub_8198070(3, 0);
ClearStdWindowAndFrameToTransparent(3, 0);
ClearWindowTilemap(3);
schedule_bg_copy_tilemap_to_vram(1);
DontTossItem(taskId);
@@ -1168,7 +1168,7 @@ static void TossItem(u8 taskId)
CopyItemName(gSpecialVar_ItemId, gStringVar1);
ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 2);
StringExpandPlaceholders(gStringVar4, gText_ThrewAwayVar2Var1s);
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0);
gTasks[taskId].func = sub_81C65CC;
}
@@ -1265,7 +1265,7 @@ static void Task_BeginItemSwap(u8 taskId)
ListMenuSetUnkIndicatorsStructField(data[0], 0x10, 1);
CopyItemName(gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.lvlMode][data[1]], gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_MoveVar1Where);
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
PrintOnWindow_Font1(1, gStringVar4, 3, 0, 0, 1, 0, 0);
sub_81C5A98(data[0], 1);
sub_81C704C(data[1]);
@@ -1285,7 +1285,7 @@ static void Task_ItemSwapHandleInput(u8 taskId)
}
else
{
s32 id = ListMenuHandleInputGetItemId(data[0]);
s32 id = ListMenu_ProcessInput(data[0]);
ListMenuGetScrollAndRow(data[0], &gPyramidBagCursorData.scrollPosition, &gPyramidBagCursorData.cursorPosition);
sub_81C7028(FALSE);
sub_81C704C(gPyramidBagCursorData.cursorPosition);
@@ -1293,7 +1293,7 @@ static void Task_ItemSwapHandleInput(u8 taskId)
{
case LIST_NOTHING_CHOSEN:
break;
case LIST_B_PRESSED:
case LIST_CANCEL:
PlaySE(SE_SELECT);
if (gMain.newKeys & A_BUTTON)
PerformItemSwap(taskId);
@@ -1395,7 +1395,7 @@ static void sub_81C6BD8(void)
LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
for (i = 0; i < 5; i++)
FillWindowPixelBuffer(i, 0);
FillWindowPixelBuffer(i, PIXEL_FILL(0));
PutWindowTilemap(0);
PutWindowTilemap(1);
@@ -1415,7 +1415,7 @@ static void PrintOnWindow_Font7(u8 windowId, const u8 *src, u8 x, u8 y, u8 lette
static void sub_81C6CEC(u8 windowId)
{
SetWindowBorderStyle(windowId, 0, 1, 0xE);
DrawStdFrameWithCustomTileAndPalette(windowId, 0, 1, 0xE);
schedule_bg_copy_tilemap_to_vram(1);
}
@@ -1430,7 +1430,7 @@ static u8 sub_81C6D24(u8 windowArrayId)
if (*windowId == 0xFF)
{
*windowId = AddWindow(&gUnknown_0861F350[windowArrayId]);
SetWindowBorderStyle(*windowId, FALSE, 1, 0xE);
DrawStdFrameWithCustomTileAndPalette(*windowId, FALSE, 1, 0xE);
schedule_bg_copy_tilemap_to_vram(1);
}
return *windowId;
@@ -1441,7 +1441,7 @@ static void sub_81C6D6C(u8 windowArrayId)
u8 *windowId = &gPyramidBagResources->windowIds[windowArrayId];
if (*windowId != 0xFF)
{
sub_8198070(*windowId, FALSE);
ClearStdWindowAndFrameToTransparent(*windowId, FALSE);
ClearWindowTilemap(*windowId);
RemoveWindow(*windowId);
schedule_bg_copy_tilemap_to_vram(1);
@@ -1456,14 +1456,15 @@ static void sub_81C6DAC(u8 taskId, const struct YesNoFuncTable *yesNoTable)
void DisplayItemMessageInBattlePyramid(u8 taskId, const u8 *str, void (*callback)(u8 taskId))
{
FillWindowPixelBuffer(2, 0x11);
FillWindowPixelBuffer(2, PIXEL_FILL(1));
DisplayMessageAndContinueTask(taskId, 2, 0xA, 0xD, 1, GetPlayerTextSpeedDelay(), str, callback);
schedule_bg_copy_tilemap_to_vram(1);
}
static void sub_81C6E1C(void)
{
sub_8197DF8(2, FALSE);
ClearDialogWindowAndFrameToTransparent(2, FALSE);
// This ClearWindowTilemap call is redundant, since ClearDialogWindowAndFrameToTransparent already calls it.
ClearWindowTilemap(2);
schedule_bg_copy_tilemap_to_vram(1);
}
+5 -6
View File
@@ -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);
@@ -320,8 +319,8 @@ void ShowLinkBattleRecords(void)
s32 i, x;
gRecordsWindowId = AddWindow(&sLinkBattleRecordsWindow);
NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, 0x11);
DrawStdWindowFrame(gRecordsWindowId, FALSE);
FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1));
StringExpandPlaceholders(gStringVar4, gText_PlayersBattleResults);
x = GetStringCenterAlignXOffset(1, gStringVar4, 208);
@@ -342,7 +341,7 @@ void ShowLinkBattleRecords(void)
void RemoveRecordsWindow(void)
{
sub_819746C(gRecordsWindowId, FALSE);
ClearStdWindowAndFrame(gRecordsWindowId, FALSE);
RemoveWindow(gRecordsWindowId);
}
@@ -383,7 +382,7 @@ static void Task_ExitTrainerHillRecords(u8 taskId)
static void RemoveTrainerHillRecordsWindow(u8 windowId)
{
FillWindowPixelBuffer(windowId, 0);
FillWindowPixelBuffer(windowId, PIXEL_FILL(0));
ClearWindowTilemap(windowId);
CopyWindowToVram(windowId, 2);
RemoveWindow(windowId);
+16 -20
View File
@@ -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 sub_81D388C(struct Pokemon* mon, void* statStoreLocation); // pokenav.s
extern void sub_81D3640(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); // pokenav.s
extern void sub_81D3784(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
@@ -297,7 +293,7 @@ static void atkD7_setyawn(void);
static void atkD8_setdamagetohealthdifference(void);
static void atkD9_scaledamagebyhealthratio(void);
static void atkDA_tryswapabilities(void);
static void atkDB_tryimprision(void);
static void atkDB_tryimprison(void);
static void atkDC_trysetgrudge(void);
static void atkDD_weightdamagecalculation(void);
static void atkDE_asistattackselect(void);
@@ -549,7 +545,7 @@ void (* const gBattleScriptingCommandsTable[])(void) =
atkD8_setdamagetohealthdifference,
atkD9_scaledamagebyhealthratio,
atkDA_tryswapabilities,
atkDB_tryimprision,
atkDB_tryimprison,
atkDC_trysetgrudge,
atkDD_weightdamagecalculation,
atkDE_asistattackselect,
@@ -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,
@@ -4233,13 +4229,13 @@ static void atk3D_end(void)
gMoveResultFlags = 0;
gActiveBattler = 0;
gCurrentActionFuncId = 0xB;
gCurrentActionFuncId = B_ACTION_TRY_FINISH;
}
static void atk3E_end2(void)
{
gActiveBattler = 0;
gCurrentActionFuncId = 0xB;
gCurrentActionFuncId = B_ACTION_TRY_FINISH;
}
static void atk3F_end3(void) // pops the main function stack
@@ -6321,16 +6317,16 @@ static void sub_804F100(void)
{
struct StatsArray currentStats;
sub_81D388C(&gPlayerParty[gBattleStruct->expGetterMonId], &currentStats);
sub_81D3640(0xD, gBattleResources->statsBeforeLvlUp, &currentStats, 0xE, 0xD, 0xF);
GetMonLevelUpWindowStats(&gPlayerParty[gBattleStruct->expGetterMonId], &currentStats);
DrawLevelUpWindowPg1(0xD, gBattleResources->statsBeforeLvlUp, &currentStats, 0xE, 0xD, 0xF);
}
static void sub_804F144(void)
{
struct StatsArray currentStats;
sub_81D388C(&gPlayerParty[gBattleStruct->expGetterMonId], &currentStats);
sub_81D3784(0xD, &currentStats, 0xE, 0xD, 0xF);
GetMonLevelUpWindowStats(&gPlayerParty[gBattleStruct->expGetterMonId], &currentStats);
DrawLevelUpWindowPg2(0xD, &currentStats, 0xE, 0xD, 0xF);
}
static void sub_804F17C(void)
@@ -6721,10 +6717,10 @@ static void atk76_various(void)
MarkBattlerForControllerExec(gActiveBattler);
break;
case 14:
sub_81A5BF8();
DrawArenaRefereeTextBox();
break;
case 15:
sub_81A5D44();
RemoveArenaRefereeTextBox();
break;
case VARIOUS_ARENA_JUDGMENT_STRING:
BattleStringExpandPlaceholdersToDisplayedString(gRefereeStringsTable[gBattlescriptCurrInstr[1]]);
@@ -9611,7 +9607,7 @@ static void atkDA_tryswapabilities(void) // skill swap
}
}
static void atkDB_tryimprision(void)
static void atkDB_tryimprison(void)
{
if ((gStatuses3[gBattlerAttacker] & STATUS3_IMPRISONED_OTHERS))
{
@@ -9622,7 +9618,7 @@ static void atkDB_tryimprision(void)
u8 battlerId, sideAttacker;
sideAttacker = GetBattlerSide(gBattlerAttacker);
PressurePPLoseOnUsingImprision(gBattlerAttacker);
PressurePPLoseOnUsingImprison(gBattlerAttacker);
for (battlerId = 0; battlerId < gBattlersCount; battlerId++)
{
if (sideAttacker != GetBattlerSide(battlerId))
+5 -8
View File
@@ -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);
@@ -641,7 +638,7 @@ u8 BattleSetup_GetTerrainId(void)
return BATTLE_TERRAIN_BUILDING;
case MAP_TYPE_UNDERWATER:
return BATTLE_TERRAIN_UNDERWATER;
case MAP_TYPE_6:
case MAP_TYPE_OCEAN_ROUTE:
if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
return BATTLE_TERRAIN_WATER;
return BATTLE_TERRAIN_PLAIN;
@@ -874,8 +871,8 @@ u8 sub_80B100C(s32 arg0)
return sUnknown_0854FE98[Random() % ARRAY_COUNT(sUnknown_0854FE98)];
}
var = gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.curChallengeBattleNum * 2 + 0]
+ gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.curChallengeBattleNum * 2 + 1];
var = gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum * 2 + 0]
+ gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum * 2 + 1];
return sUnknown_0854FE98[var % ARRAY_COUNT(sUnknown_0854FE98)];
}
@@ -1266,7 +1263,7 @@ void BattleSetup_StartTrainerBattle(void)
ZeroMonData(&gEnemyParty[2]);
}
sub_81A9B04();
MarkApproachingPyramidTrainersAsBattled();
}
else if (sub_81D5C18())
{
+8 -7
View File
@@ -12,6 +12,7 @@
#include "frontier_util.h"
#include "string_util.h"
#include "constants/items.h"
#include "constants/layouts.h"
#include "constants/region_map_sections.h"
#include "constants/species.h"
@@ -268,10 +269,10 @@ static void sub_81B9E88(void)
DoBattleFactorySwapScreen();
}
bool8 sub_81B9E94(void)
bool8 InSlateportBattleTent(void)
{
return (gMapHeader.regionMapSectionId == MAPSEC_SLATEPORT_CITY
&& ((gMapHeader.mapLayoutId == 385) | (gMapHeader.mapLayoutId == 386)));
return gMapHeader.regionMapSectionId == MAPSEC_SLATEPORT_CITY
&& (gMapHeader.mapLayoutId == LAYOUT_BATTLE_TENT_CORRIDOR || gMapHeader.mapLayoutId == LAYOUT_BATTLE_TENT_BATTLE_ROOM);
}
static void sub_81B9EC0(void)
@@ -328,7 +329,7 @@ static void sub_81B9EC0(void)
if (j != i + firstMonId)
continue;
gSaveBlock2Ptr->frontier.field_E70[i].monId = monSetId;
gSaveBlock2Ptr->frontier.rentalMons[i].monId = monSetId;
species[i] = gFacilityTrainerMons[monSetId].species;
heldItems[i] = gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId];
monIds[i] = monSetId;
@@ -355,7 +356,7 @@ static void sub_81BA040(void)
trainerId = Random() % 30;
for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum; i++)
{
if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId)
if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId)
break;
}
} while (i != gSaveBlock2Ptr->frontier.curChallengeBattleNum);
@@ -369,7 +370,7 @@ static void sub_81BA040(void)
}
if (gSaveBlock2Ptr->frontier.curChallengeBattleNum < 2)
gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = gTrainerBattleOpponent_A;
gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = gTrainerBattleOpponent_A;
monSets = gFacilityTrainers[gTrainerBattleOpponent_A].monSets;
i = 0;
@@ -378,7 +379,7 @@ static void sub_81BA040(void)
sRandMonSetId = monSets[Random() % setsCount];
for (j = 0; j < 6; j++)
{
if (gFacilityTrainerMons[sRandMonSetId].species == gFacilityTrainerMons[gSaveBlock2Ptr->frontier.field_E70[j].monId].species)
if (gFacilityTrainerMons[sRandMonSetId].species == gFacilityTrainerMons[gSaveBlock2Ptr->frontier.rentalMons[j].monId].species)
break;
}
if (j != 6)
+50 -50
View File
@@ -51,7 +51,7 @@ static void AwardBattleTowerRibbons(void);
static void SaveBattleTowerProgress(void);
static void sub_8163914(void);
static void nullsub_61(void);
static void nullsub_116(void);
static void SpriteCB_Null6(void);
static void sub_81642A0(void);
static void sub_8164828(void);
static void sub_8164B74(void);
@@ -1061,7 +1061,7 @@ static void (* const gUnknown_085DF96C[])(void) =
SaveBattleTowerProgress,
sub_8163914,
nullsub_61,
nullsub_116,
SpriteCB_Null6,
sub_81642A0,
sub_8164828,
sub_8164B74,
@@ -1311,15 +1311,15 @@ static void ChooseNextBattleTowerTrainer(void)
if (battleMode == FRONTIER_MODE_MULTIS || battleMode == FRONTIER_MODE_LINK_MULTIS)
{
id = gSaveBlock2Ptr->frontier.curChallengeBattleNum;
gTrainerBattleOpponent_A = gSaveBlock2Ptr->frontier.field_CB4[id * 2];
gTrainerBattleOpponent_B = gSaveBlock2Ptr->frontier.field_CB4[id * 2 + 1];
gTrainerBattleOpponent_A = gSaveBlock2Ptr->frontier.trainerIds[id * 2];
gTrainerBattleOpponent_B = gSaveBlock2Ptr->frontier.trainerIds[id * 2 + 1];
SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0);
SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_B, 1);
}
else if (ChooseSpecialBattleTowerTrainer())
{
SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0);
gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = gTrainerBattleOpponent_A;
gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = gTrainerBattleOpponent_A;
}
else
{
@@ -1331,7 +1331,7 @@ static void ChooseNextBattleTowerTrainer(void)
// Ensure trainer wasn't previously fought in this challenge.
for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum; i++)
{
if (gSaveBlock2Ptr->frontier.field_CB4[i] == id)
if (gSaveBlock2Ptr->frontier.trainerIds[i] == id)
break;
}
if (i == gSaveBlock2Ptr->frontier.curChallengeBattleNum)
@@ -1341,7 +1341,7 @@ static void ChooseNextBattleTowerTrainer(void)
gTrainerBattleOpponent_A = id;
SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0);
if (gSaveBlock2Ptr->frontier.curChallengeBattleNum + 1 < 7)
gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = gTrainerBattleOpponent_A;
gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = gTrainerBattleOpponent_A;
}
}
}
@@ -2250,7 +2250,7 @@ void DoSpecialTrainerBattle(void)
break;
case FRONTIER_MODE_MULTIS:
FillFrontierTrainersParties(2);
gPartnerTrainerId = gSaveBlock2Ptr->frontier.field_CB4[17];
gPartnerTrainerId = gSaveBlock2Ptr->frontier.trainerIds[17];
FillPartnerParty(gPartnerTrainerId);
gBattleTypeFlags |= BATTLE_TYPE_DOUBLE | BATTLE_TYPE_INGAME_PARTNER | BATTLE_TYPE_MULTI | BATTLE_TYPE_TWO_OPPONENTS;
break;
@@ -2401,9 +2401,9 @@ static void sub_8163EE4(void)
for (i = 0; i < 6; i++)
{
playerRecord->greeting[i] = gSaveBlock1Ptr->unk2BBC[i];
playerRecord->speechWon[i] = gSaveBlock1Ptr->unk2BC8[i];
playerRecord->speechLost[i] = gSaveBlock1Ptr->unk2BD4[i];
playerRecord->greeting[i] = gSaveBlock1Ptr->easyChatBattleStart[i];
playerRecord->speechWon[i] = gSaveBlock1Ptr->easyChatBattleWon[i];
playerRecord->speechLost[i] = gSaveBlock1Ptr->easyChatBattleLost[i];
}
for (i = 0; i < 4; i++)
@@ -2437,7 +2437,7 @@ static void nullsub_61(void)
}
static void nullsub_116(void)
static void SpriteCB_Null6(void)
{
}
@@ -2524,32 +2524,32 @@ static void sub_81642A0(void)
trainerId = sub_8162548(challengeNum, 0);
for (i = 0; i < j; i++)
{
if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId)
if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId)
break;
if (gFacilityTrainers[gSaveBlock2Ptr->frontier.field_CB4[i]].facilityClass == gFacilityTrainers[trainerId].facilityClass)
if (gFacilityTrainers[gSaveBlock2Ptr->frontier.trainerIds[i]].facilityClass == gFacilityTrainers[trainerId].facilityClass)
break;
}
} while (i != j);
gSaveBlock2Ptr->frontier.field_CB4[j] = trainerId;
gSaveBlock2Ptr->frontier.trainerIds[j] = trainerId;
j++;
} while (j < 6);
r10 = 8;
for (i = 0; i < 6; i++)
{
trainerId = gSaveBlock2Ptr->frontier.field_CB4[i];
trainerId = gSaveBlock2Ptr->frontier.trainerIds[i];
eventObjTemplates[i + 1].graphicsId = GetBattleFacilityTrainerGfxId(trainerId);
for (j = 0; j < 2; j++)
{
while (1)
{
monSetId = RandomizeFacilityTrainerMonSet(trainerId);
if (j % 2 != 0 && gFacilityTrainerMons[gSaveBlock2Ptr->frontier.field_CB4[r10 - 1]].itemTableId == gFacilityTrainerMons[monSetId].itemTableId)
if (j % 2 != 0 && gFacilityTrainerMons[gSaveBlock2Ptr->frontier.trainerIds[r10 - 1]].itemTableId == gFacilityTrainerMons[monSetId].itemTableId)
continue;
for (k = 8; k < r10; k++)
{
if (gFacilityTrainerMons[gSaveBlock2Ptr->frontier.field_CB4[k]].species == gFacilityTrainerMons[monSetId].species)
if (gFacilityTrainerMons[gSaveBlock2Ptr->frontier.trainerIds[k]].species == gFacilityTrainerMons[monSetId].species)
break;
if (species1 == gFacilityTrainerMons[monSetId].species)
break;
@@ -2560,7 +2560,7 @@ static void sub_81642A0(void)
break;
}
gSaveBlock2Ptr->frontier.field_CB4[r10] = monSetId;
gSaveBlock2Ptr->frontier.trainerIds[r10] = monSetId;
r10++;
}
}
@@ -2591,10 +2591,10 @@ static void sub_81642A0(void)
}
if (r10 != 0)
{
gSaveBlock2Ptr->frontier.field_CB4[6] = spArray[Random() % r10];
eventObjTemplates[7].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.field_CB4[6]);
gSaveBlock2Ptr->frontier.trainerIds[6] = spArray[Random() % r10];
eventObjTemplates[7].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[6]);
FlagClear(FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1);
sub_81640E0(gSaveBlock2Ptr->frontier.field_CB4[6]);
sub_81640E0(gSaveBlock2Ptr->frontier.trainerIds[6]);
}
r10 = 0;
@@ -2634,10 +2634,10 @@ static void sub_81642A0(void)
}
if (r10 != 0)
{
gSaveBlock2Ptr->frontier.field_CB4[7] = spArray[Random() % r10];
eventObjTemplates[8].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.field_CB4[7]);
gSaveBlock2Ptr->frontier.trainerIds[7] = spArray[Random() % r10];
eventObjTemplates[8].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[7]);
FlagClear(FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2);
sub_8164188(gSaveBlock2Ptr->frontier.field_CB4[7]);
sub_8164188(gSaveBlock2Ptr->frontier.trainerIds[7]);
}
}
@@ -2684,7 +2684,7 @@ static void sub_8164828(void)
u16 winStreak = GetCurrentFacilityWinStreak();
s32 challengeNum = winStreak / 7;
s32 k = gSpecialVar_LastTalked - 2;
s32 trainerId = gSaveBlock2Ptr->frontier.field_CB4[k];
s32 trainerId = gSaveBlock2Ptr->frontier.trainerIds[k];
for (arrId = 0; arrId < ARRAY_COUNT(gUnknown_085DD500); arrId++)
{
@@ -2717,29 +2717,29 @@ static void sub_8164828(void)
}
break;
case 1:
monSetId = gSaveBlock2Ptr->frontier.field_CB4[8 + k * 2];
monSetId = gSaveBlock2Ptr->frontier.trainerIds[8 + k * 2];
sub_81646BC(trainerId, monSetId);
break;
case 2:
monSetId = gSaveBlock2Ptr->frontier.field_CB4[9 + k * 2];
monSetId = gSaveBlock2Ptr->frontier.trainerIds[9 + k * 2];
sub_81646BC(trainerId, monSetId);
break;
case 3:
gPartnerTrainerId = trainerId;
if (trainerId < TRAINER_RECORD_MIXING_FRIEND)
{
gSaveBlock2Ptr->frontier.field_CB4[18] = gSaveBlock2Ptr->frontier.field_CB4[8 + k * 2];
gSaveBlock2Ptr->frontier.field_CB4[19] = gSaveBlock2Ptr->frontier.field_CB4[9 + k * 2];
gSaveBlock2Ptr->frontier.trainerIds[18] = gSaveBlock2Ptr->frontier.trainerIds[8 + k * 2];
gSaveBlock2Ptr->frontier.trainerIds[19] = gSaveBlock2Ptr->frontier.trainerIds[9 + k * 2];
}
else if (trainerId < TRAINER_RECORD_MIXING_APPRENTICE)
{
gSaveBlock2Ptr->frontier.field_CB4[18] = gUnknown_03006298[2];
gSaveBlock2Ptr->frontier.field_CB4[19] = gUnknown_03006298[3];
gSaveBlock2Ptr->frontier.trainerIds[18] = gUnknown_03006298[2];
gSaveBlock2Ptr->frontier.trainerIds[19] = gUnknown_03006298[3];
}
else
{
gSaveBlock2Ptr->frontier.field_CB4[18] = gUnknown_03006298[0];
gSaveBlock2Ptr->frontier.field_CB4[19] = gUnknown_03006298[1];
gSaveBlock2Ptr->frontier.trainerIds[18] = gUnknown_03006298[0];
gSaveBlock2Ptr->frontier.trainerIds[19] = gUnknown_03006298[1];
}
for (k = 0; k < 14; k++)
{
@@ -2751,15 +2751,15 @@ static void sub_8164828(void)
for (j = 0; j < k; j++)
{
if (gSaveBlock2Ptr->frontier.field_CB4[j] == i)
if (gSaveBlock2Ptr->frontier.trainerIds[j] == i)
break;
}
if (j == k)
break;
}
gSaveBlock2Ptr->frontier.field_CB4[k] = i;
gSaveBlock2Ptr->frontier.trainerIds[k] = i;
}
gSaveBlock2Ptr->frontier.field_CB4[17] = trainerId;
gSaveBlock2Ptr->frontier.trainerIds[17] = trainerId;
break;
case 4:
break;
@@ -2825,12 +2825,12 @@ static void sub_8164B74(void)
trainerId = sub_8162548(challengeNum, i / 2);
for (j = 0; j < i; j++)
{
if (gSaveBlock2Ptr->frontier.field_CB4[j] == trainerId)
if (gSaveBlock2Ptr->frontier.trainerIds[j] == trainerId)
break;
}
} while (i != j);
if (i == j) // This condition is always true, because of the loop above.
gSaveBlock2Ptr->frontier.field_CB4[i] = trainerId;
gSaveBlock2Ptr->frontier.trainerIds[i] = trainerId;
}
gSpecialVar_Result = 2;
}
@@ -2838,7 +2838,7 @@ static void sub_8164B74(void)
case 2:
if (IsLinkTaskFinished())
{
SendBlock(bitmask_all_link_players_but_self(), &gSaveBlock2Ptr->frontier.field_CB4, sizeof(gSaveBlock2Ptr->frontier.field_CB4));
SendBlock(bitmask_all_link_players_but_self(), &gSaveBlock2Ptr->frontier.trainerIds, sizeof(gSaveBlock2Ptr->frontier.trainerIds));
gSpecialVar_Result = 3;
}
break;
@@ -2846,9 +2846,9 @@ static void sub_8164B74(void)
if ((GetBlockReceivedStatus() & 3) == 3)
{
ResetBlockReceivedFlags();
memcpy(&gSaveBlock2Ptr->frontier.field_CB4, gBlockRecvBuffer, sizeof(gSaveBlock2Ptr->frontier.field_CB4));
gTrainerBattleOpponent_A = gSaveBlock2Ptr->frontier.field_CB4[battleNum * 2];
gTrainerBattleOpponent_B = gSaveBlock2Ptr->frontier.field_CB4[battleNum * 2 + 1];
memcpy(&gSaveBlock2Ptr->frontier.trainerIds, gBlockRecvBuffer, sizeof(gSaveBlock2Ptr->frontier.trainerIds));
gTrainerBattleOpponent_A = gSaveBlock2Ptr->frontier.trainerIds[battleNum * 2];
gTrainerBattleOpponent_B = gSaveBlock2Ptr->frontier.trainerIds[battleNum * 2 + 1];
SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0);
SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_B, 1);
if (gReceivedRemoteLinkPlayers != 0 && gWirelessCommType == 0)
@@ -2880,7 +2880,7 @@ static void sub_8164DCC(void)
static void sub_8164DE4(void)
{
SetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.field_CB4[17], 0xF);
SetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[17], 0xF);
}
static void sub_8164E04(void)
@@ -3059,7 +3059,7 @@ static void FillEReaderTrainerWithPlayerData(void)
j = 7;
for (i = 0; i < 6; i++)
{
ereaderTrainer->greeting[i] = gSaveBlock1Ptr->unk2BBC[i];
ereaderTrainer->greeting[i] = gSaveBlock1Ptr->easyChatBattleStart[i];
ereaderTrainer->farewellPlayerLost[i] = j;
ereaderTrainer->farewellPlayerWon[i] = j + 6;
j++;
@@ -3213,7 +3213,7 @@ static void FillPartnerParty(u16 trainerId)
otID = Random32();
for (i = 0; i < 2; i++)
{
monSetId = gSaveBlock2Ptr->frontier.field_CB4[i + 18];
monSetId = gSaveBlock2Ptr->frontier.trainerIds[i + 18];
CreateMonWithEVSpreadNatureOTID(&gPlayerParty[3 + i],
gFacilityTrainerMons[monSetId].species,
level,
@@ -3243,7 +3243,7 @@ static void FillPartnerParty(u16 trainerId)
for (i = 0; i < 2; i++)
{
struct EmeraldBattleTowerRecord *record = &gSaveBlock2Ptr->frontier.towerRecords[trainerId];
struct BattleTowerPokemon monData = record->party[gSaveBlock2Ptr->frontier.field_CB4[18 + i]];
struct BattleTowerPokemon monData = record->party[gSaveBlock2Ptr->frontier.trainerIds[18 + i]];
StringCopy(trainerName, record->name);
if (record->language == LANGUAGE_JAPANESE)
{
@@ -3269,7 +3269,7 @@ static void FillPartnerParty(u16 trainerId)
trainerId -= TRAINER_RECORD_MIXING_APPRENTICE;
for (i = 0; i < 2; i++)
{
CreateApprenticeMon(&gPlayerParty[3 + i], &gSaveBlock2Ptr->apprentices[trainerId], gSaveBlock2Ptr->frontier.field_CB4[18 + i]);
CreateApprenticeMon(&gPlayerParty[3 + i], &gSaveBlock2Ptr->apprentices[trainerId], gSaveBlock2Ptr->frontier.trainerIds[18 + i]);
j = IsFrontierTrainerFemale(trainerId + TRAINER_RECORD_MIXING_APPRENTICE);
SetMonData(&gPlayerParty[3 + i], MON_DATA_OT_GENDER, &j);
}
@@ -3564,7 +3564,7 @@ static void sub_8165E18(void)
trainerId = sub_8165D40();
for (i = 0; i < gSaveBlock2Ptr->frontier.curChallengeBattleNum; i++)
{
if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId)
if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId)
break;
}
} while (i != gSaveBlock2Ptr->frontier.curChallengeBattleNum);
@@ -3572,7 +3572,7 @@ static void sub_8165E18(void)
gTrainerBattleOpponent_A = trainerId;
SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0);
if (gSaveBlock2Ptr->frontier.curChallengeBattleNum + 1 < 3)
gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = gTrainerBattleOpponent_A;
gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum] = gTrainerBattleOpponent_A;
}
static void FillTentTrainerParty_(u16 trainerId, u8 firstMonId, u8 monCount)
+2 -2
View File
@@ -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,
+15 -15
View File
@@ -106,10 +106,10 @@ void PressurePPLose(u8 target, u8 attacker, u16 move)
}
}
void PressurePPLoseOnUsingImprision(u8 attacker)
void PressurePPLoseOnUsingImprison(u8 attacker)
{
int i, j;
int imprisionPos = 4;
int imprisonPos = 4;
u8 atkSide = GetBattlerSide(attacker);
for (i = 0; i < gBattlersCount; i++)
@@ -123,19 +123,19 @@ void PressurePPLoseOnUsingImprision(u8 attacker)
}
if (j != MAX_MON_MOVES)
{
imprisionPos = j;
imprisonPos = j;
if (gBattleMons[attacker].pp[j] != 0)
gBattleMons[attacker].pp[j]--;
}
}
}
if (imprisionPos != 4
if (imprisonPos != 4
&& !(gBattleMons[attacker].status2 & STATUS2_TRANSFORMED)
&& !(gDisableStructs[attacker].mimickedMoves & gBitTable[imprisionPos]))
&& !(gDisableStructs[attacker].mimickedMoves & gBitTable[imprisonPos]))
{
gActiveBattler = attacker;
BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + imprisionPos, 0, 1, &gBattleMons[gActiveBattler].pp[imprisionPos]);
BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + imprisonPos, 0, 1, &gBattleMons[gActiveBattler].pp[imprisonPos]);
MarkBattlerForControllerExec(gActiveBattler);
}
}
@@ -224,7 +224,7 @@ bool8 WasUnableToUseMove(u8 battler)
{
if (gProtectStructs[battler].prlzImmobility
|| gProtectStructs[battler].targetNotAffected
|| gProtectStructs[battler].usedImprisionedMove
|| gProtectStructs[battler].usedImprisonedMove
|| gProtectStructs[battler].loveImmobility
|| gProtectStructs[battler].usedDisabledMove
|| gProtectStructs[battler].usedTauntedMove
@@ -365,12 +365,12 @@ u8 TrySetCantSelectMoveBattleScript(void)
gCurrentMove = move;
if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
{
gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingImprisionedMoveInPalace;
gPalaceSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingImprisonedMoveInPalace;
gProtectStructs[gActiveBattler].palaceUnableToUseMove = 1;
}
else
{
gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingImprisionedMove;
gSelectionBattleScripts[gActiveBattler] = BattleScript_SelectingImprisonedMove;
limitations++;
}
}
@@ -438,7 +438,7 @@ u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check)
unusableMoves |= gBitTable[i];
if (gDisableStructs[battlerId].tauntTimer && check & MOVE_LIMITATION_TAUNT && gBattleMoves[gBattleMons[battlerId].moves[i]].power == 0)
unusableMoves |= gBitTable[i];
if (GetImprisonedMovesCount(battlerId, gBattleMons[battlerId].moves[i]) && check & MOVE_LIMITATION_IMPRISION)
if (GetImprisonedMovesCount(battlerId, gBattleMons[battlerId].moves[i]) && check & MOVE_LIMITATION_IMPRISON)
unusableMoves |= gBitTable[i];
if (gDisableStructs[battlerId].encoreTimer && gDisableStructs[battlerId].encoredMove != gBattleMons[battlerId].moves[i])
unusableMoves |= gBitTable[i];
@@ -469,7 +469,7 @@ bool8 AreAllMovesUnusable(void)
u8 GetImprisonedMovesCount(u8 battlerId, u16 move)
{
s32 i;
u8 imprisionedMoves = 0;
u8 imprisonedMoves = 0;
u8 battlerSide = GetBattlerSide(battlerId);
for (i = 0; i < gBattlersCount; i++)
@@ -483,11 +483,11 @@ u8 GetImprisonedMovesCount(u8 battlerId, u16 move)
break;
}
if (j < MAX_MON_MOVES)
imprisionedMoves++;
imprisonedMoves++;
}
}
return imprisionedMoves;
return imprisonedMoves;
}
enum
@@ -1466,7 +1466,7 @@ u8 AtkCanceller_UnableToUseMove(void)
case CANCELLER_IMPRISONED: // imprisoned
if (GetImprisonedMovesCount(gBattlerAttacker, gCurrentMove))
{
gProtectStructs[gBattlerAttacker].usedImprisionedMove = 1;
gProtectStructs[gBattlerAttacker].usedImprisonedMove = 1;
CancelMultiTurnMoves(gBattlerAttacker);
gBattlescriptCurrInstr = BattleScript_MoveUsedIsImprisoned;
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
@@ -1526,7 +1526,7 @@ u8 AtkCanceller_UnableToUseMove(void)
}
else
{
BattleScriptPush(BattleScript_MoveUsedIsParalyzedCantAttack);
BattleScriptPush(BattleScript_MoveUsedIsInLoveCantAttack);
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
gProtectStructs[gBattlerAttacker].loveImmobility = 1;
CancelMultiTurnMoves(gBattlerAttacker);
+2 -4
View File
@@ -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[];
+24 -32
View File
@@ -34,6 +34,8 @@
#include "battle_records.h"
#include "graphics.h"
#include "new_game.h"
#include "save.h"
#include "link.h"
#define BLENDER_SCORE_BEST 0
#define BLENDER_SCORE_GOOD 1
@@ -140,16 +142,6 @@ extern const u8 gText_Space[];
extern const u8 gText_BlenderMaxSpeedRecord[];
extern const u8 gText_234Players[];
extern void sub_800A418(void);
extern u8 sub_800A9D8(void);
extern void sub_81AABF0(void (*callback)(void));
extern void sub_800B4C0(void);
extern void ClearLinkCallback(void);
extern void sub_8009F8C(void);
extern void sub_8153430(void);
extern bool8 sub_8153474(void);
extern void sub_80EECEC(void);
// this file's functions
static void BerryBlender_SetBackgroundsPos(void);
static void sub_8080EA4(u8 taskId);
@@ -412,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,
@@ -555,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,
@@ -624,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,
@@ -711,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,
@@ -769,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,
@@ -945,7 +937,7 @@ static void InitBerryBlenderWindows(void)
DeactivateAllTextPrinters();
for (i = 0; i < 5; i++)
FillWindowPixelBuffer(i, 0);
FillWindowPixelBuffer(i, PIXEL_FILL(0));
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14);
sub_81978B0(0xE0);
@@ -1251,7 +1243,7 @@ static void sub_8080018(void)
case 10:
if (++sBerryBlenderData->framesToWait > 20)
{
sub_8197DF8(4, TRUE);
ClearDialogWindowAndFrameToTransparent(4, TRUE);
if (GetBlockReceivedStatus() == sub_800A9D8())
{
for (i = 0; i < GetLinkPlayerCount(); i++)
@@ -1438,7 +1430,7 @@ static void Blender_SetOpponentsBerryData(u16 playerBerryItemId, u8 playersNum,
{
opponentBerryId = sOpponentBerrySets[opponentSetId][i];
var = playerBerryItemId - 163;
if (!FlagGet(0x340) && gSpecialVar_0x8004 == 1)
if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS) && gSpecialVar_0x8004 == 1)
{
opponentSetId %= 5;
opponentBerryId = sSpecialOpponentBerrySets[opponentSetId];
@@ -2600,7 +2592,7 @@ static bool8 LinkPlayAgainHandleSaving(void)
}
break;
case 2:
sub_8153430();
FullSaveGame();
sBerryBlenderData->field_1A0++;
sBerryBlenderData->framesToWait = 0;
break;
@@ -2614,7 +2606,7 @@ static bool8 LinkPlayAgainHandleSaving(void)
case 4:
if (IsLinkTaskFinished())
{
if (sub_8153474())
if (CheckSaveFile())
{
sBerryBlenderData->field_1A0 = 5;
}
@@ -3104,7 +3096,7 @@ static void sub_8083170(u16 a0, u16 a1)
s32 var1, var2, var3, var4;
u16 *vram;
vram = (u16*)(VRAM + 0x6000);
vram = (u16*)(BG_SCREEN_ADDR(12));
var1 = (a0 * 64) / a1;
var2 = var1 / 8;
for (var4 = 0; var4 < var2; var4++)
@@ -3325,7 +3317,7 @@ static bool8 Blender_PrintBlendingResults(void)
sBerryBlenderData->mainState++;
break;
case 5:
sub_8198070(5, 1);
ClearStdWindowAndFrameToTransparent(5, 1);
for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
{
@@ -3466,7 +3458,7 @@ static bool8 Blender_PrintBlendingRanking(void)
}
break;
case 3:
SetWindowBorderStyle(5, 0, 1, 0xD);
DrawStdFrameWithCustomTileAndPalette(5, 0, 1, 0xD);
xPos = GetStringCenterAlignXOffset(1, sText_Ranking, 0xA8);
Blender_AddTextPrinter(5, sText_Ranking, xPos, 1, TEXT_SPEED_FF, 0);
@@ -3537,8 +3529,8 @@ void ShowBerryBlenderRecordWindow(void)
winTemplate = sBlenderRecordWindowTemplate;
gRecordsWindowId = AddWindow(&winTemplate);
NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, 0);
FillWindowPixelBuffer(gRecordsWindowId, 0x11);
DrawStdWindowFrame(gRecordsWindowId, 0);
FillWindowPixelBuffer(gRecordsWindowId, PIXEL_FILL(1));
xPos = GetStringCenterAlignXOffset(1, gText_BlenderMaxSpeedRecord, 0x90);
AddTextPrinterParameterized(gRecordsWindowId, 1, gText_BlenderMaxSpeedRecord, xPos, 1, 0, NULL);
@@ -3647,7 +3639,7 @@ static void Blender_AddTextPrinter(u8 windowId, const u8 *string, u8 x, u8 y, s3
if (caseId != 3)
{
FillWindowPixelBuffer(windowId, txtColor[0] | (txtColor[0] << 4));
FillWindowPixelBuffer(windowId, PIXEL_FILL(txtColor[0]));
}
AddTextPrinterParameterized4(windowId, 1, x, y, letterSpacing, 1, txtColor, speed, string);
@@ -3658,7 +3650,7 @@ static bool32 Blender_PrintText(s16 *textState, const u8 *string, s32 textSpeed)
switch (*textState)
{
case 0:
sub_8197B1C(4, FALSE, 0x14, 0xF);
DrawDialogFrameWithCustomTileAndPalette(4, FALSE, 0x14, 0xF);
Blender_AddTextPrinter(4, string, 0, 1, textSpeed, 0);
PutWindowTilemap(4);
CopyWindowToVram(4, 3);
+4 -4
View File
@@ -226,9 +226,9 @@ static void berry_fix_gpu_set(void)
DmaCopy32(3, sUnknown_08618138, BG_PLTT + 0x1E0, 0x20);
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP);
FillWindowPixelBuffer(2, 0);
FillWindowPixelBuffer(3, 0);
FillWindowPixelBuffer(0, 0xAA);
FillWindowPixelBuffer(2, PIXEL_FILL(0));
FillWindowPixelBuffer(3, PIXEL_FILL(0));
FillWindowPixelBuffer(0, PIXEL_FILL(0xA));
width = GetStringWidth(0, sUnknown_08617E9B, 0);
left = (0x78 - width) / 2;
@@ -273,7 +273,7 @@ static int berry_fix_text_update(int checkval)
static void berry_fix_text_print(int scene)
{
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 32, 32);
FillWindowPixelBuffer(1, 0xAA);
FillWindowPixelBuffer(1, PIXEL_FILL(0xA));
AddTextPrinterParameterized3(1, 1, 0, 0, sUnknown_08618158, -1, gUnknown_08618160[scene]);
PutWindowTilemap(1);
CopyWindowToVram(1, 2);
+7 -7
View File
@@ -381,7 +381,7 @@ static void PrintTextInBerryTagScreen(u8 windowId, const u8 *text, u8 x, u8 y, s
static void AddBerryTagTextToBg0(void)
{
memcpy(GetBgTilemapBuffer(0), sBerryTag->tilemapBuffers[2], sizeof(sBerryTag->tilemapBuffers[2]));
FillWindowPixelBuffer(WIN_BERRY_TAG, 0xFF);
FillWindowPixelBuffer(WIN_BERRY_TAG, PIXEL_FILL(15));
PrintTextInBerryTagScreen(WIN_BERRY_TAG, gText_BerryTag, GetStringCenterAlignXOffset(1, gText_BerryTag, 0x40), 1, 0, 1);
PutWindowTilemap(WIN_BERRY_TAG);
schedule_bg_copy_tilemap_to_vram(0);
@@ -598,7 +598,7 @@ static void Task_DisplayAnotherBerry(u8 taskId)
switch (data[0])
{
case 0x30:
FillWindowPixelBuffer(0, 0);
FillWindowPixelBuffer(0, PIXEL_FILL(0));
break;
case 0x40:
PrintBerryNumberAndName();
@@ -608,7 +608,7 @@ static void Task_DisplayAnotherBerry(u8 taskId)
CreateBerrySprite();
break;
case 0x60:
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
break;
case 0x70:
PrintBerrySize();
@@ -620,7 +620,7 @@ static void Task_DisplayAnotherBerry(u8 taskId)
SetFlavorCirclesVisiblity();
break;
case 0xA0:
FillWindowPixelBuffer(2, 0);
FillWindowPixelBuffer(2, PIXEL_FILL(0));
break;
case 0xB0:
PrintBerryDescription1();
@@ -635,7 +635,7 @@ static void Task_DisplayAnotherBerry(u8 taskId)
switch (data[0])
{
case 0x30:
FillWindowPixelBuffer(2, 0);
FillWindowPixelBuffer(2, PIXEL_FILL(0));
break;
case 0x40:
PrintBerryDescription2();
@@ -647,7 +647,7 @@ static void Task_DisplayAnotherBerry(u8 taskId)
SetFlavorCirclesVisiblity();
break;
case 0x70:
FillWindowPixelBuffer(1, 0);
FillWindowPixelBuffer(1, PIXEL_FILL(0));
break;
case 0x80:
PrintBerryFirmness();
@@ -660,7 +660,7 @@ static void Task_DisplayAnotherBerry(u8 taskId)
CreateBerrySprite();
break;
case 0xB0:
FillWindowPixelBuffer(0, 0);
FillWindowPixelBuffer(0, PIXEL_FILL(0));
break;
case 0xC0:
PrintBerryNumberAndName();
+2 -2
View File
@@ -1056,7 +1056,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt
for (x16 = x; x16 < (x + width); x16++)
{
CopyTileMapEntry(&firstTileNum, &((u16*)sGpuBgConfigs2[bg].tilemap)[(u16)GetTileMapIndexFromCoords(x16, y16, attribute, mode, mode2)], paletteSlot, 0, 0);
firstTileNum = (firstTileNum & 0xFC00) + ((firstTileNum + tileNumDelta) & 0x3FF);
firstTileNum = (firstTileNum & (METATILE_COLLISION_MASK | METATILE_ELEVATION_MASK)) + ((firstTileNum + tileNumDelta) & METATILE_ID_MASK);
}
}
break;
@@ -1067,7 +1067,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt
for (x16 = x; x16 < (x + width); x16++)
{
((u8*)sGpuBgConfigs2[bg].tilemap)[(y16 * mode3) + x16] = firstTileNum;
firstTileNum = (firstTileNum & 0xFC00) + ((firstTileNum + tileNumDelta) & 0x3FF);
firstTileNum = (firstTileNum & (METATILE_COLLISION_MASK | METATILE_ELEVATION_MASK)) + ((firstTileNum + tileNumDelta) & METATILE_ID_MASK);
}
}
break;
-6
View File
@@ -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 *);
+86 -83
View File
@@ -10,21 +10,20 @@
#include "constants/maps.h"
#include "constants/songs.h"
#include "constants/species.h"
extern void MapGridSetMetatileIdAt(s32 x, s32 y, u16 metatileId); // fieldmap
extern u8 GetCursorSelectionMonId(void);
extern u8 oei_task_add(void);
#include "fieldmap.h"
#include "party_menu.h"
#include "fldeff.h"
// why do this, GF?
enum
{
STRENGTH_PUZZLE,
FLY_PUZZLE
REGIROCK_PUZZLE,
REGISTEEL_PUZZLE
};
EWRAM_DATA static u8 sBraillePuzzleCallbackFlag = 0;
static const u8 gUnknown_085EFE74[][2] =
static const u8 gRegicePathCoords[][2] =
{
{0x04, 0x15},
{0x05, 0x15},
@@ -65,14 +64,14 @@ static const u8 gUnknown_085EFE74[][2] =
};
void SealedChamberShakingEffect(u8);
void sub_8179860(void);
void sub_8179944(void);
void DoBrailleRegirockEffect(void);
void DoBrailleRegisteelEffect(void);
bool8 ShouldDoBrailleDigEffect(void)
{
if (!FlagGet(FLAG_SYS_BRAILLE_DIG)
&& (gSaveBlock1Ptr->location.mapGroup == 0x18
&& gSaveBlock1Ptr->location.mapNum == 0x47))
&& (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SEALED_CHAMBER_OUTER_ROOM)
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEALED_CHAMBER_OUTER_ROOM)))
{
if (gSaveBlock1Ptr->pos.x == 10 && gSaveBlock1Ptr->pos.y == 3)
return TRUE;
@@ -87,12 +86,12 @@ bool8 ShouldDoBrailleDigEffect(void)
void DoBrailleDigEffect(void)
{
MapGridSetMetatileIdAt(16, 8, 554);
MapGridSetMetatileIdAt(17, 8, 555);
MapGridSetMetatileIdAt(18, 8, 556);
MapGridSetMetatileIdAt(16, 9, 3634);
MapGridSetMetatileIdAt(17, 9, 563);
MapGridSetMetatileIdAt(18, 9, 3636);
MapGridSetMetatileIdAt(16, 8, 0x22A);
MapGridSetMetatileIdAt(17, 8, 0x22B);
MapGridSetMetatileIdAt(18, 8, 0x22C);
MapGridSetMetatileIdAt(16, 9, 0xE32);
MapGridSetMetatileIdAt(17, 9, 0x233);
MapGridSetMetatileIdAt(18, 9, 0xE34);
DrawWholeMapView();
PlaySE(SE_BAN);
FlagSet(FLAG_SYS_BRAILLE_DIG);
@@ -115,10 +114,10 @@ bool8 CheckRelicanthWailord(void)
// THEORY: this was caused by block commenting out all of the older R/S braille functions but leaving the call to it itself, which creates the nullsub.
// the code is shown below to show what this might look like.
void ShouldDoBrailleStrengthEffectOld(void)
void ShouldDoBrailleRegirockEffectOld(void)
{
/*
if (!FlagGet(FLAG_SYS_BRAILLE_STRENGTH) && (gSaveBlock1.location.mapGroup == MAP_GROUP_DESERT_RUINS && gSaveBlock1.location.mapNum == MAP_ID_DESERT_RUINS))
if (!FlagGet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETED) && (gSaveBlock1.location.mapGroup == MAP_GROUP_DESERT_RUINS && gSaveBlock1.location.mapNum == MAP_ID_DESERT_RUINS))
{
if (gSaveBlock1.pos.x == 10 && gSaveBlock1.pos.y == 23)
return TRUE;
@@ -131,7 +130,7 @@ void ShouldDoBrailleStrengthEffectOld(void)
return FALSE;
}
void DoBrailleStrengthEffect(void)
void DoBrailleRegirockEffect(void)
{
FieldEffectActiveListRemove(FLDEFF_USE_STRENGTH);
MapGridSetMetatileIdAt(14, 26, 554);
@@ -142,13 +141,13 @@ void DoBrailleStrengthEffect(void)
MapGridSetMetatileIdAt(16, 27, 3636);
DrawWholeMapView();
PlaySE(SE_BAN);
FlagSet(FLAG_SYS_BRAILLE_STRENGTH);
FlagSet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETED);
ScriptContext2_Disable();
}
bool8 ShouldDoBrailleFlyEffect(void)
bool8 ShouldDoBrailleRegisteelEffect(void)
{
if (!FlagGet(FLAG_SYS_BRAILLE_FLY) && (gSaveBlock1.location.mapGroup == MAP_GROUP_ANCIENT_TOMB && gSaveBlock1.location.mapNum == MAP_ID_ANCIENT_TOMB))
if (!FlagGet(FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED) && (gSaveBlock1.location.mapGroup == MAP_GROUP_ANCIENT_TOMB && gSaveBlock1.location.mapNum == MAP_ID_ANCIENT_TOMB))
{
if (gSaveBlock1.pos.x == 8 && gSaveBlock1.pos.y == 25)
return TRUE;
@@ -157,24 +156,24 @@ bool8 ShouldDoBrailleFlyEffect(void)
return FALSE;
}
void DoBrailleFlyEffect(void)
void DoBrailleRegisteelEffect(void)
{
gFieldEffectArguments[0] = gLastFieldPokeMenuOpened;
FieldEffectStart(FLDEFF_USE_FLY_ANCIENT_TOMB);
FieldEffectStart(FLDEFF_USE_TOMB_PUZZLE_EFFECT);
}
bool8 FldEff_UseFlyAncientTomb(void)
{
u8 taskId = oei_task_add();
gTasks[taskId].data[8] = (u32)UseFlyAncientTomb_Callback >> 16;
gTasks[taskId].data[9] = (u32)UseFlyAncientTomb_Callback;
gTasks[taskId].data[8] = (u32)UseRegisteelHm_Callback >> 16;
gTasks[taskId].data[9] = (u32)UseRegisteelHm_Callback;
return FALSE;
}
void UseFlyAncientTomb_Callback(void)
void UseRegisteelHm_Callback(void)
{
FieldEffectActiveListRemove(FLDEFF_USE_FLY_ANCIENT_TOMB);
FieldEffectActiveListRemove(FLDEFF_USE_TOMB_PUZZLE_EFFECT);
UseFlyAncientTomb_Finish();
}
@@ -188,7 +187,7 @@ void UseFlyAncientTomb_Finish(void)
MapGridSetMetatileIdAt(16, 27, 3636);
DrawWholeMapView();
PlaySE(SE_BAN);
FlagSet(FLAG_SYS_BRAILLE_FLY);
FlagSet(FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED);
ScriptContext2_Disable();
}
*/
@@ -240,25 +239,25 @@ void SealedChamberShakingEffect(u8 taskId)
}
// moved later in the function because it was rewritten.
bool8 ShouldDoBrailleStrengthEffect(void)
bool8 ShouldDoBrailleRegirockEffect(void)
{
if (!FlagGet(FLAG_SYS_BRAILLE_STRENGTH)
if (!FlagGet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETED)
&& gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(DESERT_RUINS)
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(DESERT_RUINS))
{
if (gSaveBlock1Ptr->pos.x == 6 && gSaveBlock1Ptr->pos.y == 23)
{
sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE;
sBraillePuzzleCallbackFlag = REGIROCK_PUZZLE;
return TRUE;
}
else if (gSaveBlock1Ptr->pos.x == 5 && gSaveBlock1Ptr->pos.y == 23)
{
sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE;
sBraillePuzzleCallbackFlag = REGIROCK_PUZZLE;
return TRUE;
}
else if (gSaveBlock1Ptr->pos.x == 7 && gSaveBlock1Ptr->pos.y == 23)
{
sBraillePuzzleCallbackFlag = STRENGTH_PUZZLE;
sBraillePuzzleCallbackFlag = REGIROCK_PUZZLE;
return TRUE;
}
}
@@ -266,65 +265,68 @@ bool8 ShouldDoBrailleStrengthEffect(void)
return FALSE;
}
void sub_8179834(void)
void SetUpPuzzleEffectRegirock(void)
{
gFieldEffectArguments[0] = GetCursorSelectionMonId();
FieldEffectStart(FLDEFF_USE_FLY_ANCIENT_TOMB);
FieldEffectStart(FLDEFF_USE_TOMB_PUZZLE_EFFECT);
}
void UseStrengthDesertRuins_Callback(void)
void UseRegirockHm_Callback(void)
{
FieldEffectActiveListRemove(FLDEFF_USE_FLY_ANCIENT_TOMB);
sub_8179860();
FieldEffectActiveListRemove(FLDEFF_USE_TOMB_PUZZLE_EFFECT);
DoBrailleRegirockEffect();
}
void sub_8179860(void)
void DoBrailleRegirockEffect(void)
{
MapGridSetMetatileIdAt(14, 26, 554);
MapGridSetMetatileIdAt(15, 26, 555);
MapGridSetMetatileIdAt(16, 26, 556);
MapGridSetMetatileIdAt(14, 27, 3634);
MapGridSetMetatileIdAt(15, 27, 563);
MapGridSetMetatileIdAt(16, 27, 3636);
MapGridSetMetatileIdAt(14, 26, 0x22A);
MapGridSetMetatileIdAt(15, 26, 0x22B);
MapGridSetMetatileIdAt(16, 26, 0x22C);
MapGridSetMetatileIdAt(14, 27, 0xE32);
MapGridSetMetatileIdAt(15, 27, 0x233);
MapGridSetMetatileIdAt(16, 27, 0xE34);
DrawWholeMapView();
PlaySE(SE_BAN);
FlagSet(FLAG_SYS_BRAILLE_STRENGTH);
FlagSet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETED);
ScriptContext2_Disable();
}
bool8 ShouldDoBrailleFlyEffect(void)
bool8 ShouldDoBrailleRegisteelEffect(void)
{
if (!FlagGet(FLAG_SYS_BRAILLE_FLY) && (gSaveBlock1Ptr->location.mapGroup == 0x18 && gSaveBlock1Ptr->location.mapNum == 0x44))
if (!FlagGet(FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED) && (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ANCIENT_TOMB) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ANCIENT_TOMB)))
{
if (gSaveBlock1Ptr->pos.x == 8 && gSaveBlock1Ptr->pos.y == 25)
{ sBraillePuzzleCallbackFlag = FLY_PUZZLE; return TRUE; }
{
sBraillePuzzleCallbackFlag = REGISTEEL_PUZZLE;
return TRUE;
}
}
return FALSE;
}
void sub_8179918(void)
void SetUpPuzzleEffectRegisteel(void)
{
gFieldEffectArguments[0] = GetCursorSelectionMonId();
FieldEffectStart(FLDEFF_USE_FLY_ANCIENT_TOMB);
FieldEffectStart(FLDEFF_USE_TOMB_PUZZLE_EFFECT);
}
void UseFlyAncientTomb_Callback(void)
void UseRegisteelHm_Callback(void)
{
FieldEffectActiveListRemove(FLDEFF_USE_FLY_ANCIENT_TOMB);
sub_8179944();
FieldEffectActiveListRemove(FLDEFF_USE_TOMB_PUZZLE_EFFECT);
DoBrailleRegisteelEffect();
}
void sub_8179944(void)
void DoBrailleRegisteelEffect(void)
{
MapGridSetMetatileIdAt(14, 26, 554);
MapGridSetMetatileIdAt(15, 26, 555);
MapGridSetMetatileIdAt(16, 26, 556);
MapGridSetMetatileIdAt(14, 27, 3634);
MapGridSetMetatileIdAt(15, 27, 563);
MapGridSetMetatileIdAt(16, 27, 3636);
MapGridSetMetatileIdAt(14, 26, 0x22A);
MapGridSetMetatileIdAt(15, 26, 0x22B);
MapGridSetMetatileIdAt(16, 26, 0x22C);
MapGridSetMetatileIdAt(14, 27, 0xE32);
MapGridSetMetatileIdAt(15, 27, 0x233);
MapGridSetMetatileIdAt(16, 27, 0xE34);
DrawWholeMapView();
PlaySE(SE_BAN);
FlagSet(FLAG_SYS_BRAILLE_FLY);
FlagSet(FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED);
ScriptContext2_Disable();
}
@@ -332,7 +334,7 @@ void sub_8179944(void)
void DoBrailleWait(void)
{
/*
if (!FlagGet(FLAG_SYS_BRAILLE_WAIT))
if (!FlagGet(FLAG_SYS_BRAILLE_REGICE_COMPLETED))
CreateTask(Task_BrailleWait, 0x50);
}
@@ -410,15 +412,15 @@ bool8 FldEff_UsePuzzleEffect(void)
{
u8 taskId = oei_task_add();
if (sBraillePuzzleCallbackFlag == FLY_PUZZLE)
if (sBraillePuzzleCallbackFlag == REGISTEEL_PUZZLE)
{
gTasks[taskId].data[8] = (u32)UseFlyAncientTomb_Callback >> 16;
gTasks[taskId].data[9] = (u32)UseFlyAncientTomb_Callback;
gTasks[taskId].data[8] = (u32)UseRegisteelHm_Callback >> 16;
gTasks[taskId].data[9] = (u32)UseRegisteelHm_Callback;
}
else
{
gTasks[taskId].data[8] = (u32)UseStrengthDesertRuins_Callback >> 16;
gTasks[taskId].data[9] = (u32)UseStrengthDesertRuins_Callback;
gTasks[taskId].data[8] = (u32)UseRegirockHm_Callback >> 16;
gTasks[taskId].data[9] = (u32)UseRegirockHm_Callback;
}
return FALSE;
}
@@ -427,10 +429,10 @@ bool8 ShouldDoBrailleRegicePuzzle(void)
{
u8 i;
if (gSaveBlock1Ptr->location.mapGroup == 0x18
&& gSaveBlock1Ptr->location.mapNum == 0x43)
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ISLAND_CAVE)
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(ISLAND_CAVE))
{
if (FlagGet(FLAG_SYS_BRAILLE_WAIT) != FALSE)
if (FlagGet(FLAG_SYS_BRAILLE_REGICE_COMPLETED))
return FALSE;
if (FlagGet(FLAG_TEMP_2) == FALSE)
return FALSE;
@@ -439,35 +441,36 @@ bool8 ShouldDoBrailleRegicePuzzle(void)
for (i = 0; i < 36; i++)
{
u8 xPos = gUnknown_085EFE74[i][0];
u8 yPos = gUnknown_085EFE74[i][1];
u8 xPos = gRegicePathCoords[i][0];
u8 yPos = gRegicePathCoords[i][1];
if (gSaveBlock1Ptr->pos.x == xPos && gSaveBlock1Ptr->pos.y == yPos)
{
u16 varValue;
if (i < 16)
{
u16 val = VarGet(0x403B);
u16 val = VarGet(VAR_REGICE_STEPS_1);
val |= 1 << i;
VarSet(0x403B, val);
VarSet(VAR_REGICE_STEPS_1, val);
}
else if (i < 32)
{
u16 val = VarGet(0x403C);
u16 val = VarGet(VAR_REGICE_STEPS_2);
val |= 1 << (i - 16);
VarSet(0x403C, val);
VarSet(VAR_REGICE_STEPS_2, val);
}
else
{
u16 val = VarGet(0x403D);
u16 val = VarGet(VAR_REGICE_STEPS_3);
val |= 1 << (i - 32);
VarSet(0x403D, val);
VarSet(VAR_REGICE_STEPS_3, val);
}
varValue = VarGet(0x403B);
if (varValue != 0xFFFF || VarGet(0x403C) != varValue || VarGet(0x403D) != 0xF)
varValue = VarGet(VAR_REGICE_STEPS_1);
if (varValue != 0xFFFF || VarGet(VAR_REGICE_STEPS_2) != 0xFFFF || VarGet(VAR_REGICE_STEPS_3) != 0xF)
return FALSE;
// This final check is redundant.
if (gSaveBlock1Ptr->pos.x == 8 && gSaveBlock1Ptr->pos.y == 21)
return TRUE;
else
+2 -2
View File
@@ -433,7 +433,7 @@ static void AnimMissileArcStep(struct Sprite *sprite)
{
sprite->invisible = FALSE;
if (TranslateAnimArc(sprite))
if (TranslateAnimHorizontalArc(sprite))
{
DestroyAnimSprite(sprite);
}
@@ -453,7 +453,7 @@ static void AnimMissileArcStep(struct Sprite *sprite)
x2 += x1;
y2 += y1;
if (!TranslateAnimArc(sprite))
if (!TranslateAnimHorizontalArc(sprite))
{
u16 rotation = ArcTan2Neg(sprite->pos1.x + sprite->pos2.x - x2,
sprite->pos1.y + sprite->pos2.y - y2);
+10 -7
View File
@@ -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
};
@@ -358,7 +361,7 @@ static void CleanupCableCar(void)
HideBg(3);
sub_8150B6C(0);
gSpriteCoordOffsetX = 0;
sub_80AB130(WEATHER_NONE);
SetCurrentAndNextWeatherNoDelay(WEATHER_NONE);
for (i = 0; i < 20; i++)
gWeatherPtr->sprites.s2.ashSprites[i] = NULL;
@@ -394,7 +397,7 @@ static void sub_81503E4(u8 taskId)
case 0:
if (sCableCar->timer == sCableCar->unk4)
{
ChangeWeather(sCableCar->weather);
SetNextWeather(sCableCar->weather);
sCableCar->state = 1;
}
break;
@@ -798,7 +801,7 @@ static void LoadCableCarSprites(void)
gSprites[spriteId].data[1] = 99;
sCableCar->weather = WEATHER_ASH;
sCableCar->unk4 = 0x15e;
sub_80AB130(WEATHER_SUNNY);
SetCurrentAndNextWeatherNoDelay(WEATHER_SUNNY);
break;
case 1:
CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x24, 24, 26, 12, 3, 17);
@@ -822,7 +825,7 @@ static void LoadCableCarSprites(void)
gSprites[spriteId].data[1] = 0x41;
sCableCar->weather = WEATHER_SUNNY;
sCableCar->unk4 = 0x109;
sub_80AB130(WEATHER_ASH);
SetCurrentAndNextWeatherNoDelay(WEATHER_ASH);
break;
}
for (i = 0; i < 9; i++)
+28 -23
View File
@@ -27,12 +27,10 @@
#include "task.h"
#include "trade.h"
#include "trainer_card.h"
#include "party_menu.h"
#include "window.h"
#include "constants/songs.h"
extern u8 gUnknown_02032298[2];
extern u8 gSelectedOrderFromParty[];
static const struct WindowTemplate gUnknown_08550594 = {
.bg = 0,
.tilemapLeft = 16,
@@ -94,7 +92,9 @@ static void sub_80B23B0(u16 windowId, u32 value)
static void sub_80B241C(u16 windowId)
{
sub_819746C(windowId, FALSE);
// Following this call with a copy-to-vram with mode 3 is identical to
// calling ClearStdWindowAndFrame(windowId, TRUE).
ClearStdWindowAndFrame(windowId, FALSE);
CopyWindowToVram(windowId, 3);
}
@@ -284,7 +284,7 @@ static void sub_80B2804(u8 taskId)
if (GetFieldMessageBoxMode() == FIELD_MESSAGE_BOX_HIDDEN)
{
if (sub_800AA48() != GetLinkPlayerCount_2())
if (GetSavedPlayerCount() != GetLinkPlayerCount_2())
{
ShowFieldAutoScrollMessage(gText_ConfirmLinkWhenPlayersReady);
gTasks[taskId].func = sub_80B270C;
@@ -297,7 +297,7 @@ static void sub_80B2804(u8 taskId)
else if (gMain.heldKeys & A_BUTTON)
{
PlaySE(SE_SELECT);
sub_800A620();
CheckShouldAdvanceLinkState();
gTasks[taskId].func = sub_80B28A8;
}
}
@@ -312,7 +312,7 @@ static void sub_80B28A8(u8 taskId)
|| sub_80B2D6C(taskId) == TRUE)
return;
if (GetLinkPlayerCount_2() != sub_800AA48())
if (GetLinkPlayerCount_2() != GetSavedPlayerCount())
{
gTasks[taskId].func = sub_80B2D2C;
}
@@ -354,7 +354,7 @@ static void sub_80B2918(u8 taskId)
else
{
gFieldLinkPlayerCount = GetLinkPlayerCount_2();
gUnknown_03005DB4 = GetMultiplayerId();
gLocalLinkPlayerId = GetMultiplayerId();
sub_800AA04(gFieldLinkPlayerCount);
card = (struct TrainerCard *)gBlockSendBuffer;
TrainerCard_GenerateCardForPlayer(card);
@@ -401,7 +401,7 @@ static void sub_80B2A08(u8 taskId)
else
{
gFieldLinkPlayerCount = GetLinkPlayerCount_2();
gUnknown_03005DB4 = GetMultiplayerId();
gLocalLinkPlayerId = GetMultiplayerId();
sub_800AA04(gFieldLinkPlayerCount);
card = (struct TrainerCard *)gBlockSendBuffer;
TrainerCard_GenerateCardForPlayer(card);
@@ -766,9 +766,9 @@ static void sub_80B3194(u8 taskId)
static void sub_80B31E8(u8 taskId)
{
if (sub_800AA48() == GetLinkPlayerCount_2())
if (GetSavedPlayerCount() == GetLinkPlayerCount_2())
{
sub_800A620();
CheckShouldAdvanceLinkState();
gTasks[taskId].func = sub_80B3220;
}
}
@@ -974,7 +974,7 @@ void sub_80B360C(void)
if (gSpecialVar_0x8004 == 1 || gSpecialVar_0x8004 == 2)
{
UpdatePlayerLinkBattleRecords(gUnknown_03005DB4 ^ 1);
UpdatePlayerLinkBattleRecords(gLocalLinkPlayerId ^ 1);
if (gWirelessCommType)
{
switch (gBattleOutcome)
@@ -995,13 +995,13 @@ void sub_80B360C(void)
}
else
{
gMain.savedCallback = c2_8056854;
gMain.savedCallback = CB2_ReturnToFieldFromMultiplayer;
}
SetMainCallback2(sub_80A0514);
}
void sub_80B36EC(void)
void CleanupLinkRoomState(void)
{
if (gSpecialVar_0x8004 == 1 || gSpecialVar_0x8004 == 2 || gSpecialVar_0x8004 == 5 || gSpecialVar_0x8004 == 9)
{
@@ -1011,9 +1011,9 @@ void sub_80B36EC(void)
SetWarpDestinationToDynamicWarp(0x7F);
}
void sub_80B371C(void)
void ExitLinkRoom(void)
{
sub_80872B0();
QueueExitLinkRoomKey();
}
static void sub_80B3728(u8 taskId)
@@ -1030,7 +1030,7 @@ static void sub_80B3728(u8 taskId)
if (IsFieldMessageBoxHidden())
{
sub_8087288();
sub_8009628(gSpecialVar_0x8005);
SetLocalLinkPlayerId(gSpecialVar_0x8005);
task->data[0] = 2;
}
break;
@@ -1132,7 +1132,8 @@ static void sub_80B3894(u8 taskId)
}
}
void sub_80B3924(void)
// Note: VAR_0x8005 is set to the ID of the trade seat.
void PlayerEnteredTradeSeat(void)
{
if (gWirelessCommType != 0)
{
@@ -1154,7 +1155,8 @@ void nullsub_37(void)
}
void sub_80B3968(void)
// Note: VAR_0x8005 is set to the ID of the player spot.
void ColosseumPlayerSpotTriggered(void)
{
gLinkType = 0x2211;
@@ -1168,6 +1170,7 @@ void sub_80B3968(void)
}
}
// This function is never called.
static void sub_80B39A4(void)
{
u8 taskId = CreateTask(sub_80B3728, 80);
@@ -1179,14 +1182,16 @@ void sp02A_crash_sound(void)
ShowTrainerCardInLink(gSpecialVar_0x8006, CB2_ReturnToFieldContinueScriptPlayMapMusic);
}
bool32 sub_80B39D4(u8 linkPlayerIndex)
// Returns FALSE if the player has no stars. Returns TRUE otherwise, and puts the name of the
// color into gStringVar2.
bool32 GetLinkTrainerCardColor(u8 linkPlayerIndex)
{
u32 trainerCardColorIndex;
gSpecialVar_0x8006 = linkPlayerIndex;
StringCopy(gStringVar1, gLinkPlayers[linkPlayerIndex].name);
trainerCardColorIndex = sub_80C4904(linkPlayerIndex);
trainerCardColorIndex = GetTrainerCardStars(linkPlayerIndex);
if (trainerCardColorIndex == 0)
return FALSE;
@@ -1265,13 +1270,13 @@ void sub_80B3AF8(u8 taskId)
}
break;
case 2:
if (GetLinkPlayerCount_2() >= sub_800AA48())
if (GetLinkPlayerCount_2() >= GetSavedPlayerCount())
{
if (IsLinkMaster())
{
if (++data[1] > 30)
{
sub_800A620();
CheckShouldAdvanceLinkState();
data[0]++;
}
}
+4 -4
View File
@@ -79,7 +79,7 @@ void CB2_InitClearSaveDataScreen(void)
static void Task_DoClearSaveDataScreenYesNo(u8 taskId)
{
SetWindowBorderStyle(0, 0, 2, 14);
DrawStdFrameWithCustomTileAndPalette(0, 0, 2, 14);
AddTextPrinterParameterized(0, 1, gText_ClearAllSaveData, 0, 1, 0, 0);
CreateYesNoMenu(sClearSaveYesNo, 2, 14, 1);
gTasks[taskId].func = Task_ClearSaveDataScreenYesNoChoice;
@@ -90,7 +90,7 @@ static void Task_ClearSaveDataScreenYesNoChoice(u8 taskId)
switch (Menu_ProcessInputNoWrapClearOnChoose())
{
case 0:
FillWindowPixelBuffer(0, 17);
FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized(0, 1, gText_ClearingData, 0, 1, 0, 0);
gTasks[taskId].func = Task_ClearSaveData;
break;
@@ -153,7 +153,7 @@ static bool8 SetupClearSaveDataScreen(void)
((u16 *)(VRAM + 0x20))[i] = 0x1111;
for (i = 0; i < 0x400; i++)
((u16 *)(VRAM + 0xF000))[i] = 0x0001;
((u16 *)(BG_SCREEN_ADDR(30)))[i] = 0x0001;
ResetTasks();
ResetSpriteData();
ResetBgsAndClearDma3BusyFlags(0);
@@ -203,7 +203,7 @@ static void InitClearSaveDataScreenWindows(void)
{
InitWindows(sClearSaveTextWindow);
DeactivateAllTextPrinters();
FillWindowPixelBuffer(0, 0);
FillWindowPixelBuffer(0, PIXEL_FILL(0));
LoadWindowGfx(0, 0, 2, 224);
LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
}
+1 -1
View File
@@ -41,7 +41,7 @@ static void UpdatePerDay(struct Time *localTime)
if (*days != localTime->days && *days <= localTime->days)
{
daysSince = localTime->days - *days;
ClearUpperFlags();
ClearDailyFlags();
UpdateDewfordTrendPerDay(daysSince);
UpdateTVShowsPerDay(daysSince);
UpdateWeatherPerDay(daysSince);
+3 -3
View File
@@ -27,15 +27,15 @@ void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y)
struct WindowTemplate template;
SetWindowTemplateFields(&template, 0, x, y, 8, 2, 0xF, 0x141);
sCoinsWindowId = AddWindow(&template);
FillWindowPixelBuffer(sCoinsWindowId, 0);
FillWindowPixelBuffer(sCoinsWindowId, PIXEL_FILL(0));
PutWindowTilemap(sCoinsWindowId);
SetWindowBorderStyle(sCoinsWindowId, FALSE, 0x214, 0xE);
DrawStdFrameWithCustomTileAndPalette(sCoinsWindowId, FALSE, 0x214, 0xE);
PrintCoinsString(coinAmount);
}
void HideCoinsWindow(void)
{
sub_819746C(sCoinsWindowId, TRUE);
ClearStdWindowAndFrame(sCoinsWindowId, TRUE);
RemoveWindow(sCoinsWindowId);
}
+17 -17
View File
@@ -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);
@@ -214,6 +212,8 @@ EWRAM_DATA u8 gHighestRibbonRank = 0;
EWRAM_DATA struct ContestResources *gContestResources = NULL;
EWRAM_DATA u8 sContestBgCopyFlags = 0;
EWRAM_DATA struct ContestWinner gUnknown_02039F3C = {0};
EWRAM_DATA u8 gUnknown_02039F5C = 0;
EWRAM_DATA u8 gUnknown_02039F5D = 0;
// IWRAM common vars.
u32 gContestRngValue;
@@ -316,7 +316,7 @@ void LoadContestBgAfterMoveAnim(void)
s32 i;
LZDecompressVram(gContestMiscGfx, (void *)VRAM);
LZDecompressVram(gContestAudienceGfx, (void *)(VRAM + 0x2000));
LZDecompressVram(gContestAudienceGfx, (void *)(BG_SCREEN_ADDR(4)));
CopyToBgTilemapBuffer(3, gUnknown_08C16FA8, 0, 0);
CopyBgTilemapBufferToVram(3);
LoadCompressedPalette(gUnknown_08C16E90, 0, 0x200);
@@ -594,8 +594,8 @@ static u8 sub_80D7E44(u8 *a)
LZDecompressVram(gContestMiscGfx, (void *)VRAM);
break;
case 2:
LZDecompressVram(gContestAudienceGfx, (void *)(VRAM + 0x2000));
DmaCopyLarge32(3, (void *)(VRAM + 0x2000), shared15800, 0x2000, 0x1000);
LZDecompressVram(gContestAudienceGfx, (void *)(BG_SCREEN_ADDR(4)));
DmaCopyLarge32(3, (void *)(BG_SCREEN_ADDR(4)), shared15800, 0x2000, 0x1000);
break;
case 3:
CopyToBgTilemapBuffer(3, gUnknown_08C16FA8, 0, 0);
@@ -817,7 +817,7 @@ static void sub_80D8490(u8 taskId)
}
r5 = StringCopy(r5, gMoveNames[move]);
FillWindowPixelBuffer(i + 5, 0);
FillWindowPixelBuffer(i + 5, PIXEL_FILL(0));
Contest_PrintTextToBg0WindowAt(i + 5, sp8, 5, 1, 7);
}
@@ -939,7 +939,7 @@ static void sub_80D895C(u8 taskId)
for (i = 0; i < 4; i++)
{
FillWindowPixelBuffer(5 + i, 0);
FillWindowPixelBuffer(5 + i, PIXEL_FILL(0));
PutWindowTilemap(5 + i);
CopyWindowToVram(5 + i, 2);
}
@@ -2256,7 +2256,7 @@ static void sub_80DAEA4(void)
for (i = 0; i < 4; i++)
{
FillWindowPixelBuffer(gUnknown_02039F26[i], 0);
FillWindowPixelBuffer(gUnknown_02039F26[i], PIXEL_FILL(0));
sub_80DAF04(i);
sub_80DAF88(i);
}
@@ -2476,7 +2476,7 @@ static void prints_contest_move_description(u16 a)
ContestBG_FillBoxWithTile(0, 0x5036, 0x15, 0x20, 0x08, 0x01, 0x11);
ContestBG_FillBoxWithTile(0, 0x5014, 0x15, 0x20, numHearts, 0x01, 0x11);
FillWindowPixelBuffer(10, 0);
FillWindowPixelBuffer(10, PIXEL_FILL(0));
Contest_PrintTextToBg0WindowStd(10, gContestEffectDescriptionPointers[gContestMoves[a].effect]);
Contest_PrintTextToBg0WindowStd(9, gText_Slash);
}
@@ -2619,7 +2619,7 @@ static void sub_80DB884(void)
static void sub_80DB89C(void)
{
FillWindowPixelBuffer(4, 0);
FillWindowPixelBuffer(4, PIXEL_FILL(0));
CopyWindowToVram(4, 2);
Contest_SetBgCopyFlags(0);
}
@@ -3326,12 +3326,12 @@ static u8 sub_80DC9EC(u8 a)
CopySpriteTiles(0,
3,
(void *)VRAM,
(u16 *)(VRAM + 0xE000 + gUnknown_02039F26[a] * 5 * 64 + 0x26),
(u16 *)(BG_SCREEN_ADDR(28) + gUnknown_02039F26[a] * 5 * 64 + 0x26),
gContestResources->field_34);
CopySpriteTiles(0,
3, (void *)VRAM,
(u16 *)(VRAM + 0xE000 + gUnknown_02039F26[a] * 5 * 64 + 0x36),
(u16 *)(BG_SCREEN_ADDR(28) + gUnknown_02039F26[a] * 5 * 64 + 0x36),
gContestResources->field_38);
CpuFill32(0, gContestResources->field_34 + 0x500, 0x300);
@@ -3454,7 +3454,7 @@ static void sub_80DCD48(void)
break;
default:
for (i = 0; i < 4; i++)
FillWindowPixelBuffer(i, 0);
FillWindowPixelBuffer(i, PIXEL_FILL(0));
for (i = 0; i < 4; i++)
{
value = sContestantStatus[i].unk4;
@@ -4025,11 +4025,11 @@ static void sub_80DDE30(u8 taskId)
gTasks[taskId].data[10] = 0;
if (gTasks[taskId].data[11] == 0)
{
RequestDma3Copy(shared16800, (void *)(VRAM + 0x2000), 0x1000, 1);
RequestDma3Copy(shared16800, (void *)(BG_SCREEN_ADDR(4)), 0x1000, 1);
}
else
{
RequestDma3Copy(shared15800, (void *)(VRAM + 0x2000), 0x1000, 1);
RequestDma3Copy(shared15800, (void *)(BG_SCREEN_ADDR(4)), 0x1000, 1);
gTasks[taskId].data[12]++;
}
@@ -4210,7 +4210,7 @@ static void sub_80DE350(void)
s32 i;
u16 bg1Cnt;
RequestDma3Fill(0,(void *)(VRAM + 0x8000), 0x2000, 0x1);
RequestDma3Fill(0,(void *)(BG_CHAR_ADDR(2)), 0x2000, 0x1);
CpuFill32(0, gContestResources->field_24[1], 0x1000);
Contest_SetBgCopyFlags(1);
bg1Cnt = GetGpuReg(REG_OFFSET_BG1CNT);
@@ -5036,7 +5036,7 @@ static void sub_80DF750(void)
return;
for (i = 0; i < 4; i++)
FillWindowPixelBuffer(i, 0);
FillWindowPixelBuffer(i, PIXEL_FILL(0));
if (gHeap[0x1A000] == 2)
{
+1717 -35
View File
File diff suppressed because it is too large Load Diff
+17 -16
View File
@@ -20,10 +20,11 @@
#include "window.h"
#include "constants/rgb.h"
extern u16 (*gUnknown_03006190)[][32];
extern struct ContestWinner *gUnknown_030061C0;
extern u16 *gContestPaintingMonPalette;
extern struct Unk030061A0 gUnknown_030061A0;
// IWRAM common
u16 (*gUnknown_03006190)[][32];
struct Unk030061A0 gUnknown_030061A0;
struct ContestWinner *gUnknown_030061C0;
u16 *gContestPaintingMonPalette;
// IWRAM bss
IWRAM_DATA u8 gContestPaintingState;
@@ -103,7 +104,7 @@ const u8 *const gContestRankTextPointers[] =
gContestLink,
};
const struct BgTemplate gUnknown_085B07E8[] =
const struct BgTemplate gUnknown_085B07E8[] =
{
{
.bg = 1,
@@ -116,7 +117,7 @@ const struct BgTemplate gUnknown_085B07E8[] =
},
};
const struct WindowTemplate gUnknown_085B07EC =
const struct WindowTemplate gUnknown_085B07EC =
{
.bg = 1,
.tilemapLeft = 2,
@@ -153,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,
@@ -278,7 +279,7 @@ static void InitContestPaintingWindow(void)
SetBgTilemapBuffer(1, AllocZeroed(BG_SCREEN_SIZE));
gContestPaintingWindowId = AddWindow(&gUnknown_085B07EC);
DeactivateAllTextPrinters();
FillWindowPixelBuffer(gContestPaintingWindowId, 0);
FillWindowPixelBuffer(gContestPaintingWindowId, PIXEL_FILL(0));
PutWindowTilemap(gContestPaintingWindowId);
CopyWindowToVram(gContestPaintingWindowId, 3);
ShowBg(1);
@@ -553,7 +554,7 @@ static void sub_8130430(u8 arg0, u8 arg1)
break;
}
#define VRAM_PICTURE_DATA(x, y) (((u16 *)(VRAM + 0x6000))[(y) * 32 + (x)])
#define VRAM_PICTURE_DATA(x, y) (((u16 *)(BG_SCREEN_ADDR(12)))[(y) * 32 + (x)])
// Set the background
for (y = 0; y < 20; y++)
@@ -578,7 +579,7 @@ static void sub_8130430(u8 arg0, u8 arg1)
else if (arg0 < 8)
{
RLUnCompVram(gPictureFrameTiles_5, (void *)VRAM);
RLUnCompVram(gPictureFrameTilemap_5, (void *)(VRAM + 0x6000));
RLUnCompVram(gPictureFrameTilemap_5, (void *)(BG_SCREEN_ADDR(12)));
}
else
{
@@ -586,23 +587,23 @@ static void sub_8130430(u8 arg0, u8 arg1)
{
case CONTEST_CATEGORY_COOL:
RLUnCompVram(gPictureFrameTiles_0, (void *)VRAM);
RLUnCompVram(gPictureFrameTilemap_0, (void *)(VRAM + 0x6000));
RLUnCompVram(gPictureFrameTilemap_0, (void *)(BG_SCREEN_ADDR(12)));
break;
case CONTEST_CATEGORY_BEAUTY:
RLUnCompVram(gPictureFrameTiles_1, (void *)VRAM);
RLUnCompVram(gPictureFrameTilemap_1, (void *)(VRAM + 0x6000));
RLUnCompVram(gPictureFrameTilemap_1, (void *)(BG_SCREEN_ADDR(12)));
break;
case CONTEST_CATEGORY_CUTE:
RLUnCompVram(gPictureFrameTiles_2, (void *)VRAM);
RLUnCompVram(gPictureFrameTilemap_2, (void *)(VRAM + 0x6000));
RLUnCompVram(gPictureFrameTilemap_2, (void *)(BG_SCREEN_ADDR(12)));
break;
case CONTEST_CATEGORY_SMART:
RLUnCompVram(gPictureFrameTiles_3, (void *)VRAM);
RLUnCompVram(gPictureFrameTilemap_3, (void *)(VRAM + 0x6000));
RLUnCompVram(gPictureFrameTilemap_3, (void *)(BG_SCREEN_ADDR(12)));
break;
case CONTEST_CATEGORY_TOUGH:
RLUnCompVram(gPictureFrameTiles_4, (void *)VRAM);
RLUnCompVram(gPictureFrameTilemap_4, (void *)(VRAM + 0x6000));
RLUnCompVram(gPictureFrameTilemap_4, (void *)(BG_SCREEN_ADDR(12)));
break;
}
}
+656 -62
View File
@@ -3,38 +3,62 @@
#include "contest_painting.h"
#include "constants/rgb.h"
extern u8 gUnknown_03006164;
extern u16 (*gUnknown_03006168)[][32];
extern u8 gUnknown_0300616C;
extern u8 gUnknown_03006170;
extern u8 gUnknown_03006174;
extern u8 gUnknown_03006178;
extern u8 gUnknown_0300617C;
extern u8 gUnknown_03006180;
struct Unk8125954
{
u8 unk0;
u8 unk1;
u16 unk2;
};
// 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);
// IWRAM common
u8 gUnknown_03006164;
u16 (*gUnknown_03006168)[][32];
u8 gUnknown_0300616C;
u8 gUnknown_03006170;
u8 gUnknown_03006174;
u8 gUnknown_03006178;
u8 gUnknown_0300617C;
u8 gUnknown_03006180;
u16 *gUnknown_03006184;
u16 gUnknown_03006188;
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)
{
@@ -101,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;
@@ -124,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;
@@ -146,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;
@@ -171,7 +195,7 @@ void sub_8125250(void)
}
}
void sub_81252E8(void)
static void sub_81252E8(void)
{
u8 i, j;
@@ -197,7 +221,7 @@ void sub_81252E8(void)
}
}
void sub_81253A4(u8 arg0)
static void sub_81253A4(u8 arg0)
{
u8 i, j;
@@ -215,7 +239,7 @@ void sub_81253A4(u8 arg0)
}
}
void sub_8125448(void)
static void sub_8125448(void)
{
u8 i, j;
@@ -233,7 +257,7 @@ void sub_8125448(void)
}
}
void sub_81254E0(void)
static void sub_81254E0(void)
{
u8 i, j;
u16 *palette;
@@ -267,7 +291,7 @@ void sub_81254E0(void)
}
}
void sub_8125630(void)
static void sub_8125630(void)
{
u8 i, j;
@@ -285,7 +309,7 @@ void sub_8125630(void)
}
}
void sub_81256C8(void)
static void sub_81256C8(void)
{
u8 i, j;
u16 *palette;
@@ -346,7 +370,7 @@ void sub_81256C8(void)
}
}
void sub_81257F8(void)
static void sub_81257F8(void)
{
u8 i, j;
@@ -366,7 +390,7 @@ void sub_81257F8(void)
}
}
void sub_81258A0(void)
static void sub_81258A0(void)
{
u8 i, j;
@@ -386,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;
@@ -484,7 +499,7 @@ void sub_8125954(u16 arg0)
}
}
u16 ConvertColorToGrayscale(u16 *color)
static u16 ConvertColorToGrayscale(u16 *color)
{
s32 clr = *color;
s32 r = clr & 0x1F;
@@ -496,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;
@@ -510,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;
@@ -561,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;
@@ -573,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)
{
@@ -588,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;
@@ -601,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];
@@ -657,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;
@@ -701,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;
@@ -769,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;
}
+9 -9
View File
@@ -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,
@@ -1343,7 +1343,7 @@ static void sub_81758E4(u8 taskIdA)
FreeAllSpritePalettes();
gReservedSpritePaletteCount = 8;
LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM);
LZ77UnCompVram(gBirchGrassTilemap, (void *)(VRAM + 0x3800));
LZ77UnCompVram(gBirchGrassTilemap, (void *)(BG_SCREEN_ADDR(7)));
LoadPalette(gBirchBagGrassPal[0] + 1, 1, 31 * 2);
for (i = 0; i < 0x800; i++)
@@ -1592,7 +1592,7 @@ static void sub_8175DA0(u8 taskIdB)
case 5:
if (!gPaletteFade.active)
{
FillWindowPixelBuffer(0, 0);
FillWindowPixelBuffer(0, PIXEL_FILL(0));
CopyWindowToVram(0, 2);
gTasks[taskIdB].data[TDB_0] = 2;
}
@@ -1869,7 +1869,7 @@ static void sub_817664C(u8 data, u8 taskIdA)
gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.y = 46;
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data[0] = 0;
gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data[0] = 0;
gTasks[taskIdA].data[TDA_0] = sub_817B3DC(0, 0x2000, 0x20, 8);
gTasks[taskIdA].data[TDA_0] = CreateBicycleAnimationTask(0, 0x2000, 0x20, 8);
break;
case 1:
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE;
@@ -1880,7 +1880,7 @@ static void sub_817664C(u8 data, u8 taskIdA)
gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.y = 46;
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data[0] = 0;
gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data[0] = 0;
gTasks[taskIdA].data[TDA_0] = sub_817B3DC(0, 0x2000, 0x20, 8);
gTasks[taskIdA].data[TDA_0] = CreateBicycleAnimationTask(0, 0x2000, 0x20, 8);
break;
case 2:
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE;
@@ -1891,7 +1891,7 @@ static void sub_817664C(u8 data, u8 taskIdA)
gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.y = 46;
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data[0] = 0;
gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data[0] = 0;
gTasks[taskIdA].data[TDA_0] = sub_817B3DC(1, 0x2000, 0x200, 8);
gTasks[taskIdA].data[TDA_0] = CreateBicycleAnimationTask(1, 0x2000, 0x200, 8);
break;
case 3:
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE;
@@ -1902,7 +1902,7 @@ static void sub_817664C(u8 data, u8 taskIdA)
gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.y = 46;
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data[0] = 0;
gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data[0] = 0;
gTasks[taskIdA].data[TDA_0] = sub_817B3DC(1, 0x2000, 0x200, 8);
gTasks[taskIdA].data[TDA_0] = CreateBicycleAnimationTask(1, 0x2000, 0x200, 8);
break;
case 4:
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].invisible = FALSE;
@@ -1913,7 +1913,7 @@ static void sub_817664C(u8 data, u8 taskIdA)
gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].pos1.y = 46;
gSprites[gTasks[taskIdA].data[TDA_PLAYER_CYCLIST]].data[0] = 0;
gSprites[gTasks[taskIdA].data[TDA_RIVAL_CYCLIST]].data[0] = 0;
gTasks[taskIdA].data[TDA_0] = sub_817B3DC(2, 0x2000, 0x200, 8);
gTasks[taskIdA].data[TDA_0] = CreateBicycleAnimationTask(2, 0x2000, 0x200, 8);
break;
}
+16 -16
View File
@@ -389,14 +389,14 @@ void sub_8113A90(struct Sprite *sprite)
static void sub_8113B90(struct Sprite *sprite)
{
if (TranslateAnimArc(sprite))
if (TranslateAnimHorizontalArc(sprite))
DestroySpriteAndMatrix(sprite);
}
void sub_8113BAC(u8 taskId)
{
struct ScanlineEffectParams scanlineParams;
struct UnknownAnimStruct2 unknownStruct;
struct BattleAnimBgData animBg;
u16 i;
u8 pos;
int var0;
@@ -420,10 +420,10 @@ void sub_8113BAC(u8 taskId)
task->data[3] = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker);
if (task->data[3] == 1)
{
sub_80A6B30(&unknownStruct);
sub_80A6B30(&animBg);
task->data[10] = gBattle_BG1_Y;
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG1);
FillPalette(0, unknownStruct.unk8 << 4, 32);
FillPalette(0, animBg.paletteId * 16, 32);
scanlineParams.dmaDest = &REG_BG1VOFS;
var0 = WINOUT_WIN01_BG1;
if (!IsContest())
@@ -524,7 +524,7 @@ static void sub_8113D60(u8 taskId)
void sub_8113E78(u8 taskId)
{
struct UnknownAnimStruct2 unknownStruct;
struct BattleAnimBgData animBg;
struct ScanlineEffectParams scanlineParams;
u8 x;
u16 i;
@@ -561,14 +561,14 @@ void sub_8113E78(u8 taskId)
case 1:
if (task->data[3] == 1)
{
sub_80A6B30(&unknownStruct);
sub_80A6B30(&animBg);
task->data[10] = gBattle_BG1_Y;
FillPalette(0, unknownStruct.unk8 << 4, 32);
FillPalette(0, animBg.paletteId * 16, 32);
}
else
{
task->data[10] = gBattle_BG2_Y;
FillPalette(0, 144, 32);
FillPalette(0, 9 * 16, 32);
}
sub_8114374(3);
@@ -809,7 +809,7 @@ void sub_81144F8(u8 taskId)
u8 spriteId;
u8 newSpriteId;
u16 paletteNum;
struct UnknownAnimStruct2 unknownStruct;
struct BattleAnimBgData animBg;
int var0 = 0;
gBattle_WIN0H = var0;
@@ -852,10 +852,10 @@ void sub_81144F8(u8 taskId)
spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
newSpriteId = sub_80A89C8(gBattleAnimAttacker, spriteId, species);
sub_80A6B30(&unknownStruct);
sub_80A6D48(unknownStruct.bgId, gUnknown_08C1D210);
sub_80A6CC0(unknownStruct.bgId, gUnknown_08C1D0AC, unknownStruct.tilesOffset);
LoadCompressedPalette(gUnknown_08C1D1E8, unknownStruct.unk8 << 4, 32);
sub_80A6B30(&animBg);
AnimLoadCompressedBgTilemap(animBg.bgId, gMetalShineTilemap);
AnimLoadCompressedBgGfx(animBg.bgId, gMetalShineGfx, animBg.tilesOffset);
LoadCompressedPalette(gMetalShinePalette, animBg.paletteId * 16, 32);
gBattle_BG1_X = -gSprites[spriteId].pos1.x + 96;
gBattle_BG1_Y = -gSprites[spriteId].pos1.y + 32;
@@ -876,7 +876,7 @@ void sub_81144F8(u8 taskId)
static void sub_8114748(u8 taskId)
{
struct UnknownAnimStruct2 unknownStruct;
struct BattleAnimBgData animBg;
u16 paletteNum;
u8 spriteId;
u8 taskIdCopy = taskId;
@@ -896,8 +896,8 @@ static void sub_8114748(u8 taskId)
SetGreyscaleOrOriginalPalette(paletteNum, 1);
DestroySprite(&gSprites[gTasks[taskIdCopy].data[0]]);
sub_80A6B30(&unknownStruct);
sub_80A6C68(unknownStruct.bgId);
sub_80A6B30(&animBg);
sub_80A6C68(animBg.bgId);
if (gTasks[taskIdCopy].data[6] == 1)
gSprites[gBattlerSpriteIds[BATTLE_PARTNER(gBattleAnimAttacker)]].oam.priority++;
}
+471
View File
@@ -0,0 +1,471 @@
const u8 gEasyChatWord_Meets[] = _("MEETS");
const u8 gEasyChatWord_Concede[] = _("CONCEDE");
const u8 gEasyChatWord_Give[] = _("GIVE");
const u8 gEasyChatWord_Gives[] = _("GIVES");
const u8 gEasyChatWord_Played[] = _("PLAYED");
const u8 gEasyChatWord_Plays[] = _("PLAYS");
const u8 gEasyChatWord_Collect[] = _("COLLECT");
const u8 gEasyChatWord_Walking[] = _("WALKING");
const u8 gEasyChatWord_Walks[] = _("WALKS");
const u8 gEasyChatWord_Says[] = _("SAYS");
const u8 gEasyChatWord_Went[] = _("WENT");
const u8 gEasyChatWord_Said[] = _("SAID");
const u8 gEasyChatWord_WakeUp[] = _("WAKE UP");
const u8 gEasyChatWord_WakesUp[] = _("WAKES UP");
const u8 gEasyChatWord_Angers[] = _("ANGERS");
const u8 gEasyChatWord_Teach[] = _("TEACH");
const u8 gEasyChatWord_Teaches[] = _("TEACHES");
const u8 gEasyChatWord_Please[] = _("PLEASE");
const u8 gEasyChatWord_Learn[] = _("LEARN");
const u8 gEasyChatWord_Change[] = _("CHANGE");
const u8 gEasyChatWord_Story[] = _("STORY");
const u8 gEasyChatWord_Trust[] = _("TRUST");
const u8 gEasyChatWord_Lavish[] = _("LAVISH");
const u8 gEasyChatWord_Listens[] = _("LISTENS");
const u8 gEasyChatWord_Hearing[] = _("HEARING");
const u8 gEasyChatWord_Trains[] = _("TRAINS");
const u8 gEasyChatWord_Choose[] = _("CHOOSE");
const u8 gEasyChatWord_Come[] = _("COME");
const u8 gEasyChatWord_Came[] = _("CAME");
const u8 gEasyChatWord_Search[] = _("SEARCH");
const u8 gEasyChatWord_Make[] = _("MAKE");
const u8 gEasyChatWord_Cause[] = _("CAUSE");
const u8 gEasyChatWord_Know[] = _("KNOW");
const u8 gEasyChatWord_Knows[] = _("KNOWS");
const u8 gEasyChatWord_Refuse[] = _("REFUSE");
const u8 gEasyChatWord_Stores[] = _("STORES");
const u8 gEasyChatWord_Brag[] = _("BRAG");
const u8 gEasyChatWord_Ignorant[] = _("IGNORANT");
const u8 gEasyChatWord_Thinks[] = _("THINKS");
const u8 gEasyChatWord_Believe[] = _("BELIEVE");
const u8 gEasyChatWord_Slide[] = _("SLIDE");
const u8 gEasyChatWord_Eats[] = _("EATS");
const u8 gEasyChatWord_Use[] = _("USE");
const u8 gEasyChatWord_Uses[] = _("USES");
const u8 gEasyChatWord_Using[] = _("USING");
const u8 gEasyChatWord_Couldnt[] = _("COULDN'T");
const u8 gEasyChatWord_Capable[] = _("CAPABLE");
const u8 gEasyChatWord_Disappear[] = _("DISAPPEAR");
const u8 gEasyChatWord_Appear[] = _("APPEAR");
const u8 gEasyChatWord_Throw[] = _("THROW");
const u8 gEasyChatWord_Worry[] = _("WORRY");
const u8 gEasyChatWord_Slept[] = _("SLEPT");
const u8 gEasyChatWord_Sleep[] = _("SLEEP");
const u8 gEasyChatWord_Release[] = _("RELEASE");
const u8 gEasyChatWord_Drinks[] = _("DRINKS");
const u8 gEasyChatWord_Runs[] = _("RUNS");
const u8 gEasyChatWord_Run[] = _("RUN");
const u8 gEasyChatWord_Works[] = _("WORKS");
const u8 gEasyChatWord_Working[] = _("WORKING");
const u8 gEasyChatWord_Talking[] = _("TALKING");
const u8 gEasyChatWord_Talk[] = _("TALK");
const u8 gEasyChatWord_Sink[] = _("SINK");
const u8 gEasyChatWord_Smack[] = _("SMACK");
const u8 gEasyChatWord_Pretend[] = _("PRETEND");
const u8 gEasyChatWord_Praise[] = _("PRAISE");
const u8 gEasyChatWord_Overdo[] = _("OVERDO");
const u8 gEasyChatWord_Show[] = _("SHOW");
const u8 gEasyChatWord_Looks[] = _("LOOKS");
const u8 gEasyChatWord_Sees[] = _("SEES");
const u8 gEasyChatWord_Seek[] = _("SEEK");
const u8 gEasyChatWord_Own[] = _("OWN");
const u8 gEasyChatWord_Take[] = _("TAKE");
const u8 gEasyChatWord_Allow[] = _("ALLOW");
const u8 gEasyChatWord_Forget[] = _("FORGET");
const u8 gEasyChatWord_Forgets[] = _("FORGETS");
const u8 gEasyChatWord_Appears[] = _("APPEARS");
const u8 gEasyChatWord_Faint[] = _("FAINT");
const u8 gEasyChatWord_Fainted[] = _("FAINTED");
const struct EasyChatWordInfo gEasyChatGroup_Actions[] = {
{
.text = gEasyChatWord_Meets,
.alphabeticalOrder = 72,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Concede,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Give,
.alphabeticalOrder = 48,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Gives,
.alphabeticalOrder = 75,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Played,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Plays,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Collect,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Walking,
.alphabeticalOrder = 46,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Walks,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Says,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Went,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Said,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WakeUp,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WakesUp,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Angers,
.alphabeticalOrder = 45,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Teach,
.alphabeticalOrder = 47,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Teaches,
.alphabeticalOrder = 54,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Please,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Learn,
.alphabeticalOrder = 76,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Change,
.alphabeticalOrder = 77,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Story,
.alphabeticalOrder = 73,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Trust,
.alphabeticalOrder = 74,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lavish,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Listens,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hearing,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Trains,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Choose,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Come,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Came,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Search,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Make,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Cause,
.alphabeticalOrder = 67,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Know,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Knows,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Refuse,
.alphabeticalOrder = 65,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Stores,
.alphabeticalOrder = 70,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Brag,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ignorant,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Thinks,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Believe,
.alphabeticalOrder = 64,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Slide,
.alphabeticalOrder = 63,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Eats,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Use,
.alphabeticalOrder = 53,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Uses,
.alphabeticalOrder = 56,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Using,
.alphabeticalOrder = 55,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Couldnt,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Capable,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Disappear,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Appear,
.alphabeticalOrder = 69,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Throw,
.alphabeticalOrder = 68,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Worry,
.alphabeticalOrder = 66,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Slept,
.alphabeticalOrder = 61,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sleep,
.alphabeticalOrder = 52,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Release,
.alphabeticalOrder = 51,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Drinks,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Runs,
.alphabeticalOrder = 62,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Run,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Works,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Working,
.alphabeticalOrder = 71,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Talking,
.alphabeticalOrder = 60,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Talk,
.alphabeticalOrder = 59,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sink,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Smack,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pretend,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Praise,
.alphabeticalOrder = 49,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Overdo,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Show,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Looks,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sees,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Seek,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Own,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Take,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Allow,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Forget,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Forgets,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Appears,
.alphabeticalOrder = 58,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Faint,
.alphabeticalOrder = 57,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fainted,
.alphabeticalOrder = 50,
.enabled = TRUE,
},
};
+219
View File
@@ -0,0 +1,219 @@
const u8 gEasyChatWord_Wandering[] = _("WANDERING");
const u8 gEasyChatWord_Rickety[] = _("RICKETY");
const u8 gEasyChatWord_RockSolid[] = _("ROCK-SOLID");
const u8 gEasyChatWord_Hungry[] = _("HUNGRY");
const u8 gEasyChatWord_Tight[] = _("TIGHT");
const u8 gEasyChatWord_Ticklish[] = _("TICKLISH");
const u8 gEasyChatWord_Twirling[] = _("TWIRLING");
const u8 gEasyChatWord_Spiraling[] = _("SPIRALING");
const u8 gEasyChatWord_Thirsty[] = _("THIRSTY");
const u8 gEasyChatWord_Lolling[] = _("LOLLING");
const u8 gEasyChatWord_Silky[] = _("SILKY");
const u8 gEasyChatWord_Sadly[] = _("SADLY");
const u8 gEasyChatWord_Hopeless[] = _("HOPELESS");
const u8 gEasyChatWord_Useless[] = _("USELESS");
const u8 gEasyChatWord_Drooling[] = _("DROOLING");
const u8 gEasyChatWord_Exciting[] = _("EXCITING");
const u8 gEasyChatWord_Thick[] = _("THICK");
const u8 gEasyChatWord_Smooth[] = _("SMOOTH");
const u8 gEasyChatWord_Slimy[] = _("SLIMY");
const u8 gEasyChatWord_Thin[] = _("THIN");
const u8 gEasyChatWord_Break[] = _("BREAK");
const u8 gEasyChatWord_Voracious[] = _("VORACIOUS");
const u8 gEasyChatWord_Scatter[] = _("SCATTER");
const u8 gEasyChatWord_Awesome[] = _("AWESOME");
const u8 gEasyChatWord_Wimpy[] = _("WIMPY");
const u8 gEasyChatWord_Wobbly[] = _("WOBBLY");
const u8 gEasyChatWord_Shaky[] = _("SHAKY");
const u8 gEasyChatWord_Ripped[] = _("RIPPED");
const u8 gEasyChatWord_Shredded[] = _("SHREDDED");
const u8 gEasyChatWord_Increasing[] = _("INCREASING");
const u8 gEasyChatWord_Yet[] = _("YET");
const u8 gEasyChatWord_Destroyed[] = _("DESTROYED");
const u8 gEasyChatWord_Fiery[] = _("FIERY");
const u8 gEasyChatWord_LoveyDovey[] = _("LOVEY-DOVEY");
const u8 gEasyChatWord_Happily[] = _("HAPPILY");
const u8 gEasyChatWord_Anticipation[] = _("ANTICIPATION");
const struct EasyChatWordInfo gEasyChatGroup_Adjectives[] = {
{
.text = gEasyChatWord_Wandering,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Rickety,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_RockSolid,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hungry,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Tight,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ticklish,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Twirling,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Spiraling,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Thirsty,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lolling,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Silky,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sadly,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hopeless,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Useless,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Drooling,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Exciting,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Thick,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Smooth,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Slimy,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Thin,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Break,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Voracious,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Scatter,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Awesome,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wimpy,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wobbly,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Shaky,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ripped,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Shredded,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Increasing,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Yet,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Destroyed,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fiery,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_LoveyDovey,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Happily,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Anticipation,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
};
+381
View File
@@ -0,0 +1,381 @@
const u8 gEasyChatWord_MatchUp[] = _("MATCH UP");
const u8 gEasyChatWord_Go[] = _("GO");
const u8 gEasyChatWord_No1[] = _("NO. 1");
const u8 gEasyChatWord_Decide[] = _("DECIDE");
const u8 gEasyChatWord_LetMeWin[] = _("LET ME WIN");
const u8 gEasyChatWord_Wins[] = _("WINS");
const u8 gEasyChatWord_Win[] = _("WIN");
const u8 gEasyChatWord_Won[] = _("WON");
const u8 gEasyChatWord_IfIWin[] = _("IF I WIN");
const u8 gEasyChatWord_WhenIWin[] = _("WHEN I WIN");
const u8 gEasyChatWord_CantWin[] = _("CAN'T WIN");
const u8 gEasyChatWord_CanWin[] = _("CAN WIN");
const u8 gEasyChatWord_NoMatch[] = _("NO MATCH");
const u8 gEasyChatWord_Spirit[] = _("SPIRIT");
const u8 gEasyChatWord_Decided[] = _("DECIDED");
const u8 gEasyChatWord_TrumpCard[] = _("TRUMP CARD");
const u8 gEasyChatWord_TakeThat[] = _("TAKE THAT");
const u8 gEasyChatWord_ComeOn[] = _("COME ON");
const u8 gEasyChatWord_Attack[] = _("ATTACK");
const u8 gEasyChatWord_Surrender[] = _("SURRENDER");
const u8 gEasyChatWord_Gutsy[] = _("GUTSY");
const u8 gEasyChatWord_Talent[] = _("TALENT");
const u8 gEasyChatWord_Strategy[] = _("STRATEGY");
const u8 gEasyChatWord_Smite[] = _("SMITE");
const u8 gEasyChatWord_Match[] = _("MATCH");
const u8 gEasyChatWord_Victory[] = _("VICTORY");
const u8 gEasyChatWord_Offensive[] = _("OFFENSIVE");
const u8 gEasyChatWord_Sense[] = _("SENSE");
const u8 gEasyChatWord_Versus[] = _("VERSUS");
const u8 gEasyChatWord_Fights[] = _("FIGHTS");
const u8 gEasyChatWord_Power[] = _("POWER");
const u8 gEasyChatWord_Challenge[] = _("CHALLENGE");
const u8 gEasyChatWord_Strong[] = _("STRONG");
const u8 gEasyChatWord_TooStrong[] = _("TOO STRONG");
const u8 gEasyChatWord_GoEasy[] = _("GO EASY");
const u8 gEasyChatWord_Foe[] = _("FOE");
const u8 gEasyChatWord_Genius[] = _("GENIUS");
const u8 gEasyChatWord_Legend[] = _("LEGEND");
const u8 gEasyChatWord_Escape[] = _("ESCAPE");
const u8 gEasyChatWord_Aim[] = _("AIM");
const u8 gEasyChatWord_Battle[] = _("BATTLE");
const u8 gEasyChatWord_Fight[] = _("FIGHT");
const u8 gEasyChatWord_Resuscitate[] = _("RESUSCITATE");
const u8 gEasyChatWord_Points[] = _("POINTS");
const u8 gEasyChatWord_Serious[] = _("SERIOUS");
const u8 gEasyChatWord_GiveUp[] = _("GIVE UP");
const u8 gEasyChatWord_Loss[] = _("LOSS");
const u8 gEasyChatWord_IfILose[] = _("IF I LOSE");
const u8 gEasyChatWord_Lost[] = _("LOST");
const u8 gEasyChatWord_Lose[] = _("LOSE");
const u8 gEasyChatWord_Guard[] = _("GUARD");
const u8 gEasyChatWord_Partner[] = _("PARTNER");
const u8 gEasyChatWord_Reject[] = _("REJECT");
const u8 gEasyChatWord_Accept[] = _("ACCEPT");
const u8 gEasyChatWord_Invincible[] = _("INVINCIBLE");
const u8 gEasyChatWord_Received[] = _("RECEIVED");
const u8 gEasyChatWord_Easy[] = _("EASY");
const u8 gEasyChatWord_Weak[] = _("WEAK");
const u8 gEasyChatWord_TooWeak[] = _("TOO WEAK");
const u8 gEasyChatWord_Pushover[] = _("PUSHOVER");
const u8 gEasyChatWord_Leader[] = _("LEADER");
const u8 gEasyChatWord_Rule[] = _("RULE");
const u8 gEasyChatWord_Move[] = _("MOVE");
const struct EasyChatWordInfo gEasyChatGroup_Battle[] = {
{
.text = gEasyChatWord_MatchUp,
.alphabeticalOrder = 53,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Go,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_No1,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Decide,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_LetMeWin,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wins,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Win,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Won,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_IfIWin,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WhenIWin,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_CantWin,
.alphabeticalOrder = 56,
.enabled = TRUE,
},
{
.text = gEasyChatWord_CanWin,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_NoMatch,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Spirit,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Decided,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_TrumpCard,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_TakeThat,
.alphabeticalOrder = 45,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ComeOn,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Attack,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Surrender,
.alphabeticalOrder = 50,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Gutsy,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Talent,
.alphabeticalOrder = 47,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Strategy,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Smite,
.alphabeticalOrder = 54,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Match,
.alphabeticalOrder = 60,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Victory,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Offensive,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sense,
.alphabeticalOrder = 49,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Versus,
.alphabeticalOrder = 46,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fights,
.alphabeticalOrder = 48,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Power,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Challenge,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Strong,
.alphabeticalOrder = 62,
.enabled = TRUE,
},
{
.text = gEasyChatWord_TooStrong,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_GoEasy,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Foe,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Genius,
.alphabeticalOrder = 51,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Legend,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Escape,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Aim,
.alphabeticalOrder = 59,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Battle,
.alphabeticalOrder = 55,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fight,
.alphabeticalOrder = 52,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Resuscitate,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Points,
.alphabeticalOrder = 61,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Serious,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_GiveUp,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Loss,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_IfILose,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lost,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lose,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Guard,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Partner,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Reject,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Accept,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Invincible,
.alphabeticalOrder = 58,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Received,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Easy,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Weak,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_TooWeak,
.alphabeticalOrder = 57,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pushover,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Leader,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Rule,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Move,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
};
+417
View File
@@ -0,0 +1,417 @@
const u8 gEasyChatWord_Hot[] = _("HOT");
const u8 gEasyChatWord_Exists[] = _("EXISTS");
const u8 gEasyChatWord_Excess[] = _("EXCESS");
const u8 gEasyChatWord_Approved[] = _("APPROVED");
const u8 gEasyChatWord_Has[] = _("HAS");
const u8 gEasyChatWord_Good[] = _("GOOD");
const u8 gEasyChatWord_Less[] = _("LESS");
const u8 gEasyChatWord_Momentum[] = _("MOMENTUM");
const u8 gEasyChatWord_Going[] = _("GOING");
const u8 gEasyChatWord_Weird[] = _("WEIRD");
const u8 gEasyChatWord_Busy[] = _("BUSY");
const u8 gEasyChatWord_Together[] = _("TOGETHER");
const u8 gEasyChatWord_Full[] = _("FULL");
const u8 gEasyChatWord_Absent[] = _("ABSENT");
const u8 gEasyChatWord_Being[] = _("BEING");
const u8 gEasyChatWord_Need[] = _("NEED");
const u8 gEasyChatWord_Tasty[] = _("TASTY");
const u8 gEasyChatWord_Skilled[] = _("SKILLED");
const u8 gEasyChatWord_Noisy[] = _("NOISY");
const u8 gEasyChatWord_Big[] = _("BIG");
const u8 gEasyChatWord_Late[] = _("LATE");
const u8 gEasyChatWord_Close[] = _("CLOSE");
const u8 gEasyChatWord_Docile[] = _("DOCILE");
const u8 gEasyChatWord_Amusing[] = _("AMUSING");
const u8 gEasyChatWord_Entertaining[] = _("ENTERTAINING");
const u8 gEasyChatWord_Perfection[] = _("PERFECTION");
const u8 gEasyChatWord_Pretty[] = _("PRETTY");
const u8 gEasyChatWord_Healthy[] = _("HEALTHY");
const u8 gEasyChatWord_Excellent[] = _("EXCELLENT");
const u8 gEasyChatWord_UpsideDown[] = _("UPSIDE DOWN");
const u8 gEasyChatWord_Cold[] = _("COLD");
const u8 gEasyChatWord_Refreshing[] = _("REFRESHING");
const u8 gEasyChatWord_Unavoidable[] = _("UNAVOIDABLE");
const u8 gEasyChatWord_Much[] = _("MUCH");
const u8 gEasyChatWord_Overwhelming[] = _("OVERWHELMING");
const u8 gEasyChatWord_Fabulous[] = _("FABULOUS");
const u8 gEasyChatWord_Else[] = _("ELSE");
const u8 gEasyChatWord_Expensive[] = _("EXPENSIVE");
const u8 gEasyChatWord_Correct[] = _("CORRECT");
const u8 gEasyChatWord_Impossible[] = _("IMPOSSIBLE");
const u8 gEasyChatWord_Small[] = _("SMALL");
const u8 gEasyChatWord_Different[] = _("DIFFERENT");
const u8 gEasyChatWord_Tired[] = _("TIRED");
const u8 gEasyChatWord_Skill[] = _("SKILL");
const u8 gEasyChatWord_Top[] = _("TOP");
const u8 gEasyChatWord_NonStop[] = _("NON-STOP");
const u8 gEasyChatWord_Preposterous[] = _("PREPOSTEROUS");
const u8 gEasyChatWord_None[] = _("NONE");
const u8 gEasyChatWord_Nothing[] = _("NOTHING");
const u8 gEasyChatWord_Natural[] = _("NATURAL");
const u8 gEasyChatWord_Becomes[] = _("BECOMES");
const u8 gEasyChatWord_Lukewarm[] = _("LUKEWARM");
const u8 gEasyChatWord_Fast[] = _("FAST");
const u8 gEasyChatWord_Low[] = _("LOW");
const u8 gEasyChatWord_Awful[] = _("AWFUL");
const u8 gEasyChatWord_Alone[] = _("ALONE");
const u8 gEasyChatWord_Bored[] = _("BORED");
const u8 gEasyChatWord_Secret[] = _("SECRET");
const u8 gEasyChatWord_Mystery[] = _("MYSTERY");
const u8 gEasyChatWord_Lacks[] = _("LACKS");
const u8 gEasyChatWord_Best[] = _("BEST");
const u8 gEasyChatWord_Lousy[] = _("LOUSY");
const u8 gEasyChatWord_Mistake[] = _("MISTAKE");
const u8 gEasyChatWord_Kind[] = _("KIND");
const u8 gEasyChatWord_Well[] = _("WELL");
const u8 gEasyChatWord_Weakened[] = _("WEAKENED");
const u8 gEasyChatWord_Simple[] = _("SIMPLE");
const u8 gEasyChatWord_Seems[] = _("SEEMS");
const u8 gEasyChatWord_Badly[] = _("BADLY");
const struct EasyChatWordInfo gEasyChatGroup_Conditions[] = {
{
.text = gEasyChatWord_Hot,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Exists,
.alphabeticalOrder = 55,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Excess,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Approved,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Has,
.alphabeticalOrder = 54,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Good,
.alphabeticalOrder = 68,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Less,
.alphabeticalOrder = 50,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Momentum,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Going,
.alphabeticalOrder = 60,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Weird,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Busy,
.alphabeticalOrder = 56,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Together,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Full,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Absent,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Being,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Need,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Tasty,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Skilled,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Noisy,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Big,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Late,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Close,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Docile,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Amusing,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Entertaining,
.alphabeticalOrder = 52,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Perfection,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pretty,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Healthy,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Excellent,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_UpsideDown,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Cold,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Refreshing,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Unavoidable,
.alphabeticalOrder = 63,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Much,
.alphabeticalOrder = 59,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Overwhelming,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fabulous,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Else,
.alphabeticalOrder = 61,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Expensive,
.alphabeticalOrder = 53,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Correct,
.alphabeticalOrder = 51,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Impossible,
.alphabeticalOrder = 62,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Small,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Different,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Tired,
.alphabeticalOrder = 58,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Skill,
.alphabeticalOrder = 49,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Top,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_NonStop,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Preposterous,
.alphabeticalOrder = 45,
.enabled = TRUE,
},
{
.text = gEasyChatWord_None,
.alphabeticalOrder = 47,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Nothing,
.alphabeticalOrder = 48,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Natural,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Becomes,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lukewarm,
.alphabeticalOrder = 46,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fast,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Low,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Awful,
.alphabeticalOrder = 57,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Alone,
.alphabeticalOrder = 67,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Bored,
.alphabeticalOrder = 66,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Secret,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mystery,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lacks,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Best,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lousy,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mistake,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Kind,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Well,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Weakened,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Simple,
.alphabeticalOrder = 65,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Seems,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Badly,
.alphabeticalOrder = 64,
.enabled = TRUE,
},
};
+417
View File
@@ -0,0 +1,417 @@
const u8 gEasyChatWord_Will[] = _("WILL");
const u8 gEasyChatWord_WillBeHere[] = _("WILL BE HERE");
const u8 gEasyChatWord_Or[] = _("OR");
const u8 gEasyChatWord_Times[] = _("TIMES");
const u8 gEasyChatWord_Wonder[] = _("WONDER");
const u8 gEasyChatWord_IsItQues[] = _("IS IT?");
const u8 gEasyChatWord_Be[] = _("BE");
const u8 gEasyChatWord_Gimme[] = _("GIMME");
const u8 gEasyChatWord_Could[] = _("COULD");
const u8 gEasyChatWord_LikelyTo[] = _("LIKELY TO");
const u8 gEasyChatWord_Would[] = _("WOULD");
const u8 gEasyChatWord_Is[] = _("IS");
const u8 gEasyChatWord_IsntItQues[] = _("ISN'T IT?");
const u8 gEasyChatWord_Lets[] = _("LET'S");
const u8 gEasyChatWord_Other[] = _("OTHER");
const u8 gEasyChatWord_Are[] = _("ARE");
const u8 gEasyChatWord_Was[] = _("WAS");
const u8 gEasyChatWord_Were[] = _("WERE");
const u8 gEasyChatWord_Those[] = _("THOSE");
const u8 gEasyChatWord_Isnt[] = _("ISN'T");
const u8 gEasyChatWord_Wont[] = _("WON'T");
const u8 gEasyChatWord_Cant[] = _("CAN'T");
const u8 gEasyChatWord_Can[] = _("CAN");
const u8 gEasyChatWord_Dont[] = _("DON'T");
const u8 gEasyChatWord_Do[] = _("DO");
const u8 gEasyChatWord_Does[] = _("DOES");
const u8 gEasyChatWord_Whom[] = _("WHOM");
const u8 gEasyChatWord_Which[] = _("WHICH");
const u8 gEasyChatWord_Wasnt[] = _("WASN'T");
const u8 gEasyChatWord_Werent[] = _("WEREN'T");
const u8 gEasyChatWord_Have[] = _("HAVE");
const u8 gEasyChatWord_Havent[] = _("HAVEN'T");
const u8 gEasyChatWord_A[] = _("A");
const u8 gEasyChatWord_An[] = _("AN");
const u8 gEasyChatWord_Not[] = _("NOT");
const u8 gEasyChatWord_There[] = _("THERE");
const u8 gEasyChatWord_OkQues[] = _("OK?");
const u8 gEasyChatWord_So[] = _("SO");
const u8 gEasyChatWord_Maybe[] = _("MAYBE");
const u8 gEasyChatWord_About[] = _("ABOUT");
const u8 gEasyChatWord_Over[] = _("OVER");
const u8 gEasyChatWord_It[] = _("IT");
const u8 gEasyChatWord_All[] = _("ALL");
const u8 gEasyChatWord_For[] = _("FOR");
const u8 gEasyChatWord_On[] = _("ON");
const u8 gEasyChatWord_Off[] = _("OFF");
const u8 gEasyChatWord_As[] = _("AS");
const u8 gEasyChatWord_To[] = _("TO");
const u8 gEasyChatWord_With[] = _("WITH");
const u8 gEasyChatWord_Better[] = _("BETTER");
const u8 gEasyChatWord_Ever[] = _("EVER");
const u8 gEasyChatWord_Since[] = _("SINCE");
const u8 gEasyChatWord_Of[] = _("OF");
const u8 gEasyChatWord_BelongsTo[] = _("BELONGS TO");
const u8 gEasyChatWord_At[] = _("AT");
const u8 gEasyChatWord_In[] = _("IN");
const u8 gEasyChatWord_Out[] = _("OUT");
const u8 gEasyChatWord_Too[] = _("TOO");
const u8 gEasyChatWord_Like[] = _("LIKE");
const u8 gEasyChatWord_Did[] = _("DID");
const u8 gEasyChatWord_Didnt[] = _("DIDN'T");
const u8 gEasyChatWord_Doesnt[] = _("DOESN'T");
const u8 gEasyChatWord_Without[] = _("WITHOUT");
const u8 gEasyChatWord_After[] = _("AFTER");
const u8 gEasyChatWord_Before[] = _("BEFORE");
const u8 gEasyChatWord_While[] = _("WHILE");
const u8 gEasyChatWord_Than[] = _("THAN");
const u8 gEasyChatWord_Once[] = _("ONCE");
const u8 gEasyChatWord_Anywhere[] = _("ANYWHERE");
const struct EasyChatWordInfo gEasyChatGroup_Endings[] = {
{
.text = gEasyChatWord_Will,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WillBeHere,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Or,
.alphabeticalOrder = 63,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Times,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wonder,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_IsItQues,
.alphabeticalOrder = 68,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Be,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Gimme,
.alphabeticalOrder = 46,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Could,
.alphabeticalOrder = 54,
.enabled = TRUE,
},
{
.text = gEasyChatWord_LikelyTo,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Would,
.alphabeticalOrder = 64,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Is,
.alphabeticalOrder = 53,
.enabled = TRUE,
},
{
.text = gEasyChatWord_IsntItQues,
.alphabeticalOrder = 49,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lets,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Other,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Are,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Was,
.alphabeticalOrder = 59,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Were,
.alphabeticalOrder = 60,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Those,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Isnt,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wont,
.alphabeticalOrder = 61,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Cant,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Can,
.alphabeticalOrder = 50,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Dont,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Do,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Does,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Whom,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Which,
.alphabeticalOrder = 55,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wasnt,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Werent,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Have,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Havent,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_A,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_An,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Not,
.alphabeticalOrder = 58,
.enabled = TRUE,
},
{
.text = gEasyChatWord_There,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_OkQues,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_So,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Maybe,
.alphabeticalOrder = 52,
.enabled = TRUE,
},
{
.text = gEasyChatWord_About,
.alphabeticalOrder = 45,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Over,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_It,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
{
.text = gEasyChatWord_All,
.alphabeticalOrder = 67,
.enabled = TRUE,
},
{
.text = gEasyChatWord_For,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_On,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Off,
.alphabeticalOrder = 56,
.enabled = TRUE,
},
{
.text = gEasyChatWord_As,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_To,
.alphabeticalOrder = 51,
.enabled = TRUE,
},
{
.text = gEasyChatWord_With,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Better,
.alphabeticalOrder = 66,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ever,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Since,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Of,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_BelongsTo,
.alphabeticalOrder = 47,
.enabled = TRUE,
},
{
.text = gEasyChatWord_At,
.alphabeticalOrder = 57,
.enabled = TRUE,
},
{
.text = gEasyChatWord_In,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Out,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Too,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Like,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Did,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Didnt,
.alphabeticalOrder = 65,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Doesnt,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Without,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_After,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Before,
.alphabeticalOrder = 48,
.enabled = TRUE,
},
{
.text = gEasyChatWord_While,
.alphabeticalOrder = 62,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Than,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Once,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Anywhere,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
};
+177
View File
@@ -0,0 +1,177 @@
const u8 gEasyChatWord_Appeal[] = _("APPEAL");
const u8 gEasyChatWord_Events[] = _("EVENTS");
const u8 gEasyChatWord_StayAtHome[] = _("STAY-AT-HOME");
const u8 gEasyChatWord_Berry[] = _("BERRY");
const u8 gEasyChatWord_Contest[] = _("CONTEST");
const u8 gEasyChatWord_Mc[] = _("MC");
const u8 gEasyChatWord_Judge[] = _("JUDGE");
const u8 gEasyChatWord_Super[] = _("SUPER");
const u8 gEasyChatWord_Stage[] = _("STAGE");
const u8 gEasyChatWord_HallOfFame[] = _("HALL OF FAME");
const u8 gEasyChatWord_Evolution[] = _("EVOLUTION");
const u8 gEasyChatWord_Hyper[] = _("HYPER");
const u8 gEasyChatWord_BattleTower[] = _("BATTLE TOWER");
const u8 gEasyChatWord_Leaders[] = _("LEADERS");
const u8 gEasyChatWord_BattleRoom[] = _("BATTLE ROOM");
const u8 gEasyChatWord_Hidden[] = _("HIDDEN");
const u8 gEasyChatWord_SecretBase[] = _("SECRET BASE");
const u8 gEasyChatWord_Blend[] = _("BLEND");
const u8 gEasyChatWord_POKEBLOCK[] = _("{POKEBLOCK}");
const u8 gEasyChatWord_Master[] = _("MASTER");
const u8 gEasyChatWord_Rank[] = _("RANK");
const u8 gEasyChatWord_Ribbon[] = _("RIBBON");
const u8 gEasyChatWord_Crush[] = _("CRUSH");
const u8 gEasyChatWord_Direct[] = _("DIRECT");
const u8 gEasyChatWord_Tower[] = _("TOWER");
const u8 gEasyChatWord_Union[] = _("UNION");
const u8 gEasyChatWord_Room[] = _("ROOM");
const u8 gEasyChatWord_Wireless[] = _("WIRELESS");
const u8 gEasyChatWord_Frontier[] = _("FRONTIER");
const struct EasyChatWordInfo gEasyChatGroup_Events[] = {
{
.text = gEasyChatWord_Appeal,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Events,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_StayAtHome,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Berry,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Contest,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mc,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Judge,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Super,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Stage,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HallOfFame,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Evolution,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hyper,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_BattleTower,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Leaders,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_BattleRoom,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hidden,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SecretBase,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Blend,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_POKEBLOCK,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Master,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Rank,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ribbon,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Crush,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Direct,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Tower,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Union,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Room,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wireless,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Frontier,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
};
+417
View File
@@ -0,0 +1,417 @@
const u8 gEasyChatWord_Meet[] = _("MEET");
const u8 gEasyChatWord_Play[] = _("PLAY");
const u8 gEasyChatWord_Hurried[] = _("HURRIED");
const u8 gEasyChatWord_Goes[] = _("GOES");
const u8 gEasyChatWord_Giddy[] = _("GIDDY");
const u8 gEasyChatWord_Happy[] = _("HAPPY");
const u8 gEasyChatWord_Happiness[] = _("HAPPINESS");
const u8 gEasyChatWord_Excite[] = _("EXCITE");
const u8 gEasyChatWord_Important[] = _("IMPORTANT");
const u8 gEasyChatWord_Funny[] = _("FUNNY");
const u8 gEasyChatWord_Got[] = _("GOT");
const u8 gEasyChatWord_GoHome[] = _("GO HOME");
const u8 gEasyChatWord_Disappointed[] = _("DISAPPOINTED");
const u8 gEasyChatWord_Disappoints[] = _("DISAPPOINTS");
const u8 gEasyChatWord_Sad[] = _("SAD");
const u8 gEasyChatWord_Try[] = _("TRY");
const u8 gEasyChatWord_Tries[] = _("TRIES");
const u8 gEasyChatWord_Hears[] = _("HEARS");
const u8 gEasyChatWord_Think[] = _("THINK");
const u8 gEasyChatWord_Hear[] = _("HEAR");
const u8 gEasyChatWord_Wants[] = _("WANTS");
const u8 gEasyChatWord_Misheard[] = _("MISHEARD");
const u8 gEasyChatWord_Dislike[] = _("DISLIKE");
const u8 gEasyChatWord_Angry[] = _("ANGRY");
const u8 gEasyChatWord_Anger[] = _("ANGER");
const u8 gEasyChatWord_Scary[] = _("SCARY");
const u8 gEasyChatWord_Lonesome[] = _("LONESOME");
const u8 gEasyChatWord_Disappoint[] = _("DISAPPOINT");
const u8 gEasyChatWord_Joy[] = _("JOY");
const u8 gEasyChatWord_Gets[] = _("GETS");
const u8 gEasyChatWord_Never[] = _("NEVER");
const u8 gEasyChatWord_Darn[] = _("DARN");
const u8 gEasyChatWord_Downcast[] = _("DOWNCAST");
const u8 gEasyChatWord_Incredible[] = _("INCREDIBLE");
const u8 gEasyChatWord_Likes[] = _("LIKES");
const u8 gEasyChatWord_Dislikes[] = _("DISLIKES");
const u8 gEasyChatWord_Boring[] = _("BORING");
const u8 gEasyChatWord_Care[] = _("CARE");
const u8 gEasyChatWord_Cares[] = _("CARES");
const u8 gEasyChatWord_AllRight[] = _("ALL RIGHT");
const u8 gEasyChatWord_Adore[] = _("ADORE");
const u8 gEasyChatWord_Disaster[] = _("DISASTER");
const u8 gEasyChatWord_Enjoy[] = _("ENJOY");
const u8 gEasyChatWord_Enjoys[] = _("ENJOYS");
const u8 gEasyChatWord_Eat[] = _("EAT");
const u8 gEasyChatWord_Lacking[] = _("LACKING");
const u8 gEasyChatWord_Bad[] = _("BAD");
const u8 gEasyChatWord_Hard[] = _("HARD");
const u8 gEasyChatWord_Terrible[] = _("TERRIBLE");
const u8 gEasyChatWord_Should[] = _("SHOULD");
const u8 gEasyChatWord_Nice[] = _("NICE");
const u8 gEasyChatWord_Drink[] = _("DRINK");
const u8 gEasyChatWord_Surprise[] = _("SURPRISE");
const u8 gEasyChatWord_Fear[] = _("FEAR");
const u8 gEasyChatWord_Want[] = _("WANT");
const u8 gEasyChatWord_Wait[] = _("WAIT");
const u8 gEasyChatWord_Satisfied[] = _("SATISFIED");
const u8 gEasyChatWord_See[] = _("SEE");
const u8 gEasyChatWord_Rare[] = _("RARE");
const u8 gEasyChatWord_Negative[] = _("NEGATIVE");
const u8 gEasyChatWord_Done[] = _("DONE");
const u8 gEasyChatWord_Danger[] = _("DANGER");
const u8 gEasyChatWord_Defeated[] = _("DEFEATED");
const u8 gEasyChatWord_Beat[] = _("BEAT");
const u8 gEasyChatWord_Great[] = _("GREAT");
const u8 gEasyChatWord_Romantic[] = _("ROMANTIC");
const u8 gEasyChatWord_Question[] = _("QUESTION");
const u8 gEasyChatWord_Understand[] = _("UNDERSTAND");
const u8 gEasyChatWord_Understands[] = _("UNDERSTANDS");
const struct EasyChatWordInfo gEasyChatGroup_Feelings[] = {
{
.text = gEasyChatWord_Meet,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Play,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hurried,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Goes,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Giddy,
.alphabeticalOrder = 46,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Happy,
.alphabeticalOrder = 63,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Happiness,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Excite,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Important,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Funny,
.alphabeticalOrder = 61,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Got,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_GoHome,
.alphabeticalOrder = 62,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Disappointed,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Disappoints,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sad,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Try,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Tries,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hears,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Think,
.alphabeticalOrder = 60,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hear,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wants,
.alphabeticalOrder = 51,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Misheard,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Dislike,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Angry,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Anger,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Scary,
.alphabeticalOrder = 53,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lonesome,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Disappoint,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Joy,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Gets,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Never,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Darn,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Downcast,
.alphabeticalOrder = 64,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Incredible,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Likes,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Dislikes,
.alphabeticalOrder = 47,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Boring,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Care,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Cares,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_AllRight,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Adore,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Disaster,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Enjoy,
.alphabeticalOrder = 45,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Enjoys,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Eat,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lacking,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Bad,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hard,
.alphabeticalOrder = 59,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Terrible,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Should,
.alphabeticalOrder = 50,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Nice,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Drink,
.alphabeticalOrder = 66,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Surprise,
.alphabeticalOrder = 58,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fear,
.alphabeticalOrder = 65,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Want,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wait,
.alphabeticalOrder = 56,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Satisfied,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_See,
.alphabeticalOrder = 57,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Rare,
.alphabeticalOrder = 49,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Negative,
.alphabeticalOrder = 52,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Done,
.alphabeticalOrder = 48,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Danger,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Defeated,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Beat,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Great,
.alphabeticalOrder = 67,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Romantic,
.alphabeticalOrder = 68,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Question,
.alphabeticalOrder = 55,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Understand,
.alphabeticalOrder = 54,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Understands,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
};
+255
View File
@@ -0,0 +1,255 @@
const u8 gEasyChatWord_Thanks[] = _("THANKS");
const u8 gEasyChatWord_Yes[] = _("YES");
const u8 gEasyChatWord_HereGoes[] = _("HERE GOES");
const u8 gEasyChatWord_HereICome[] = _("HERE I COME");
const u8 gEasyChatWord_HereItIs[] = _("HERE IT IS");
const u8 gEasyChatWord_Yeah[] = _("YEAH");
const u8 gEasyChatWord_Welcome[] = _("WELCOME");
const u8 gEasyChatWord_Oi[] = _("OI");
const u8 gEasyChatWord_HowDo[] = _("HOW DO");
const u8 gEasyChatWord_Congrats[] = _("CONGRATS");
const u8 gEasyChatWord_GiveMe[] = _("GIVE ME");
const u8 gEasyChatWord_Sorry[] = _("SORRY");
const u8 gEasyChatWord_Apologize[] = _("APOLOGIZE");
const u8 gEasyChatWord_Forgive[] = _("FORGIVE");
const u8 gEasyChatWord_HeyThere[] = _("HEY, THERE");
const u8 gEasyChatWord_Hello[] = _("HELLO");
const u8 gEasyChatWord_GoodBye[] = _("GOOD-BYE");
const u8 gEasyChatWord_ThankYou[] = _("THANK YOU");
const u8 gEasyChatWord_IveArrived[] = _("I'VE ARRIVED");
const u8 gEasyChatWord_Pardon[] = _("PARDON");
const u8 gEasyChatWord_Excuse[] = _("EXCUSE");
const u8 gEasyChatWord_SeeYa[] = _("SEE YA");
const u8 gEasyChatWord_ExcuseMe[] = _("EXCUSE ME");
const u8 gEasyChatWord_WellThen[] = _("WELL, THEN");
const u8 gEasyChatWord_GoAhead[] = _("GO AHEAD");
const u8 gEasyChatWord_Appreciate[] = _("APPRECIATE");
const u8 gEasyChatWord_HeyQues[] = _("HEY?");
const u8 gEasyChatWord_WhatsUpQues[] = _("WHAT'S UP?");
const u8 gEasyChatWord_HuhQues[] = _("HUH?");
const u8 gEasyChatWord_No[] = _("NO");
const u8 gEasyChatWord_Hi[] = _("HI");
const u8 gEasyChatWord_YeahYeah[] = _("YEAH, YEAH");
const u8 gEasyChatWord_ByeBye[] = _("BYE-BYE");
const u8 gEasyChatWord_MeetYou[] = _("MEET YOU");
const u8 gEasyChatWord_Hey[] = _("HEY");
const u8 gEasyChatWord_Smell[] = _("SMELL");
const u8 gEasyChatWord_Listening[] = _("LISTENING");
const u8 gEasyChatWord_HooHah[] = _("HOO-HAH");
const u8 gEasyChatWord_Yahoo[] = _("YAHOO");
const u8 gEasyChatWord_Yo[] = _("YO");
const u8 gEasyChatWord_ComeOver[] = _("COME OVER");
const u8 gEasyChatWord_CountOn[] = _("COUNT ON");
const struct EasyChatWordInfo gEasyChatGroup_Greetings[] = {
{
.text = gEasyChatWord_Thanks,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Yes,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HereGoes,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HereICome,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HereItIs,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Yeah,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Welcome,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Oi,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HowDo,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Congrats,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_GiveMe,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sorry,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Apologize,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Forgive,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HeyThere,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hello,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_GoodBye,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ThankYou,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_IveArrived,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pardon,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Excuse,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SeeYa,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ExcuseMe,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WellThen,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_GoAhead,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Appreciate,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HeyQues,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WhatsUpQues,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HuhQues,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_No,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hi,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_YeahYeah,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ByeBye,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_MeetYou,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hey,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Smell,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Listening,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HooHah,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Yahoo,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Yo,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ComeOver,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_CountOn,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
};
+327
View File
@@ -0,0 +1,327 @@
const u8 gEasyChatWord_Idol[] = _("IDOL");
const u8 gEasyChatWord_Anime[] = _("ANIME");
const u8 gEasyChatWord_Song[] = _("SONG");
const u8 gEasyChatWord_Movie[] = _("MOVIE");
const u8 gEasyChatWord_Sweets[] = _("SWEETS");
const u8 gEasyChatWord_Chat[] = _("CHAT");
const u8 gEasyChatWord_ChildsPlay[] = _("CHILD'S PLAY");
const u8 gEasyChatWord_Toys[] = _("TOYS");
const u8 gEasyChatWord_Music[] = _("MUSIC");
const u8 gEasyChatWord_Cards[] = _("CARDS");
const u8 gEasyChatWord_Shopping[] = _("SHOPPING");
const u8 gEasyChatWord_Camera[] = _("CAMERA");
const u8 gEasyChatWord_Viewing[] = _("VIEWING");
const u8 gEasyChatWord_Spectator[] = _("SPECTATOR");
const u8 gEasyChatWord_Gourmet[] = _("GOURMET");
const u8 gEasyChatWord_Game[] = _("GAME");
const u8 gEasyChatWord_Rpg[] = _("RPG");
const u8 gEasyChatWord_Collection[] = _("COLLECTION");
const u8 gEasyChatWord_Complete[] = _("COMPLETE");
const u8 gEasyChatWord_Magazine[] = _("MAGAZINE");
const u8 gEasyChatWord_Walk[] = _("WALK");
const u8 gEasyChatWord_Bike[] = _("BIKE");
const u8 gEasyChatWord_Hobby[] = _("HOBBY");
const u8 gEasyChatWord_Sports[] = _("SPORTS");
const u8 gEasyChatWord_Software[] = _("SOFTWARE");
const u8 gEasyChatWord_Songs[] = _("SONGS");
const u8 gEasyChatWord_Diet[] = _("DIET");
const u8 gEasyChatWord_Treasure[] = _("TREASURE");
const u8 gEasyChatWord_Travel[] = _("TRAVEL");
const u8 gEasyChatWord_Dance[] = _("DANCE");
const u8 gEasyChatWord_Channel[] = _("CHANNEL");
const u8 gEasyChatWord_Making[] = _("MAKING");
const u8 gEasyChatWord_Fishing[] = _("FISHING");
const u8 gEasyChatWord_Date[] = _("DATE");
const u8 gEasyChatWord_Design[] = _("DESIGN");
const u8 gEasyChatWord_Locomotive[] = _("LOCOMOTIVE");
const u8 gEasyChatWord_PlushDoll[] = _("PLUSH DOLL");
const u8 gEasyChatWord_Pc[] = _("PC");
const u8 gEasyChatWord_Flowers[] = _("FLOWERS");
const u8 gEasyChatWord_Hero[] = _("HERO");
const u8 gEasyChatWord_Nap[] = _("NAP");
const u8 gEasyChatWord_Heroine[] = _("HEROINE");
const u8 gEasyChatWord_Fashion[] = _("FASHION");
const u8 gEasyChatWord_Adventure[] = _("ADVENTURE");
const u8 gEasyChatWord_Board[] = _("BOARD");
const u8 gEasyChatWord_Ball[] = _("BALL");
const u8 gEasyChatWord_Book[] = _("BOOK");
const u8 gEasyChatWord_Festival[] = _("FESTIVAL");
const u8 gEasyChatWord_Comics[] = _("COMICS");
const u8 gEasyChatWord_Holiday[] = _("HOLIDAY");
const u8 gEasyChatWord_Plans[] = _("PLANS");
const u8 gEasyChatWord_Trendy[] = _("TRENDY");
const u8 gEasyChatWord_Vacation[] = _("VACATION");
const u8 gEasyChatWord_Look[] = _("LOOK");
const struct EasyChatWordInfo gEasyChatGroup_Hobbies[] = {
{
.text = gEasyChatWord_Idol,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Anime,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Song,
.alphabeticalOrder = 45,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Movie,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sweets,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Chat,
.alphabeticalOrder = 46,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ChildsPlay,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Toys,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Music,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Cards,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Shopping,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Camera,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Viewing,
.alphabeticalOrder = 48,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Spectator,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Gourmet,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Game,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Rpg,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Collection,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Complete,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Magazine,
.alphabeticalOrder = 47,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Walk,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Bike,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hobby,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sports,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Software,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Songs,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Diet,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Treasure,
.alphabeticalOrder = 49,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Travel,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Dance,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Channel,
.alphabeticalOrder = 53,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Making,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fishing,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Date,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Design,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Locomotive,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_PlushDoll,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pc,
.alphabeticalOrder = 50,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Flowers,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hero,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Nap,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Heroine,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fashion,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Adventure,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Board,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ball,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Book,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Festival,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Comics,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Holiday,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Plans,
.alphabeticalOrder = 51,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Trendy,
.alphabeticalOrder = 52,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Vacation,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Look,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
};
+273
View File
@@ -0,0 +1,273 @@
const u8 gEasyChatWord_Chores[] = _("CHORES");
const u8 gEasyChatWord_Home[] = _("HOME");
const u8 gEasyChatWord_Money[] = _("MONEY");
const u8 gEasyChatWord_Allowance[] = _("ALLOWANCE");
const u8 gEasyChatWord_Bath[] = _("BATH");
const u8 gEasyChatWord_Conversation[] = _("CONVERSATION");
const u8 gEasyChatWord_School[] = _("SCHOOL");
const u8 gEasyChatWord_Commemorate[] = _("COMMEMORATE");
const u8 gEasyChatWord_Habit[] = _("HABIT");
const u8 gEasyChatWord_Group[] = _("GROUP");
const u8 gEasyChatWord_Word[] = _("WORD");
const u8 gEasyChatWord_Store[] = _("STORE");
const u8 gEasyChatWord_Service[] = _("SERVICE");
const u8 gEasyChatWord_Work[] = _("WORK");
const u8 gEasyChatWord_System[] = _("SYSTEM");
const u8 gEasyChatWord_Train[] = _("TRAIN");
const u8 gEasyChatWord_Class[] = _("CLASS");
const u8 gEasyChatWord_Lessons[] = _("LESSONS");
const u8 gEasyChatWord_Information[] = _("INFORMATION");
const u8 gEasyChatWord_Living[] = _("LIVING");
const u8 gEasyChatWord_Teacher[] = _("TEACHER");
const u8 gEasyChatWord_Tournament[] = _("TOURNAMENT");
const u8 gEasyChatWord_Letter[] = _("LETTER");
const u8 gEasyChatWord_Event[] = _("EVENT");
const u8 gEasyChatWord_Digital[] = _("DIGITAL");
const u8 gEasyChatWord_Test[] = _("TEST");
const u8 gEasyChatWord_DeptStore[] = _("DEPT. STORE");
const u8 gEasyChatWord_Television[] = _("TELEVISION");
const u8 gEasyChatWord_Phone[] = _("PHONE");
const u8 gEasyChatWord_Item[] = _("ITEM");
const u8 gEasyChatWord_Name[] = _("NAME");
const u8 gEasyChatWord_News[] = _("NEWS");
const u8 gEasyChatWord_Popular[] = _("POPULAR");
const u8 gEasyChatWord_Party[] = _("PARTY");
const u8 gEasyChatWord_Study[] = _("STUDY");
const u8 gEasyChatWord_Machine[] = _("MACHINE");
const u8 gEasyChatWord_Mail[] = _("MAIL");
const u8 gEasyChatWord_Message[] = _("MESSAGE");
const u8 gEasyChatWord_Promise[] = _("PROMISE");
const u8 gEasyChatWord_Dream[] = _("DREAM");
const u8 gEasyChatWord_Kindergarten[] = _("KINDERGARTEN");
const u8 gEasyChatWord_Life[] = _("LIFE");
const u8 gEasyChatWord_Radio[] = _("RADIO");
const u8 gEasyChatWord_Rental[] = _("RENTAL");
const u8 gEasyChatWord_World[] = _("WORLD");
const struct EasyChatWordInfo gEasyChatGroup_Lifestyle[] = {
{
.text = gEasyChatWord_Chores,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Home,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Money,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Allowance,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Bath,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Conversation,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_School,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Commemorate,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Habit,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Group,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Word,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Store,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Service,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Work,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_System,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Train,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Class,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lessons,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Information,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Living,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Teacher,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Tournament,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Letter,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Event,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Digital,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Test,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_DeptStore,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Television,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Phone,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Item,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Name,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_News,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Popular,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Party,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Study,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Machine,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mail,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Message,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Promise,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Dream,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Kindergarten,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Life,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Radio,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Rental,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_World,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
};
+255
View File
@@ -0,0 +1,255 @@
const u8 gEasyChatWord_Highs[] = _("HIGHS");
const u8 gEasyChatWord_Lows[] = _("LOWS");
const u8 gEasyChatWord_Um[] = _("UM");
const u8 gEasyChatWord_Rear[] = _("REAR");
const u8 gEasyChatWord_Things[] = _("THINGS");
const u8 gEasyChatWord_Thing[] = _("THING");
const u8 gEasyChatWord_Below[] = _("BELOW");
const u8 gEasyChatWord_Above[] = _("ABOVE");
const u8 gEasyChatWord_Back[] = _("BACK");
const u8 gEasyChatWord_High[] = _("HIGH");
const u8 gEasyChatWord_Here[] = _("HERE");
const u8 gEasyChatWord_Inside[] = _("INSIDE");
const u8 gEasyChatWord_Outside[] = _("OUTSIDE");
const u8 gEasyChatWord_Beside[] = _("BESIDE");
const u8 gEasyChatWord_ThisIsItExcl[] = _("THIS IS IT!");
const u8 gEasyChatWord_This[] = _("THIS");
const u8 gEasyChatWord_Every[] = _("EVERY");
const u8 gEasyChatWord_These[] = _("THESE");
const u8 gEasyChatWord_TheseWere[] = _("THESE WERE");
const u8 gEasyChatWord_Down[] = _("DOWN");
const u8 gEasyChatWord_That[] = _("THAT");
const u8 gEasyChatWord_ThoseAre[] = _("THOSE ARE");
const u8 gEasyChatWord_ThoseWere[] = _("THOSE WERE");
const u8 gEasyChatWord_ThatsItExcl[] = _("THAT'S IT!");
const u8 gEasyChatWord_Am[] = _("AM");
const u8 gEasyChatWord_ThatWas[] = _("THAT WAS");
const u8 gEasyChatWord_Front[] = _("FRONT");
const u8 gEasyChatWord_Up[] = _("UP");
const u8 gEasyChatWord_Choice[] = _("CHOICE");
const u8 gEasyChatWord_Far[] = _("FAR");
const u8 gEasyChatWord_Away[] = _("AWAY");
const u8 gEasyChatWord_Near[] = _("NEAR");
const u8 gEasyChatWord_Where[] = _("WHERE");
const u8 gEasyChatWord_When[] = _("WHEN");
const u8 gEasyChatWord_What[] = _("WHAT");
const u8 gEasyChatWord_Deep[] = _("DEEP");
const u8 gEasyChatWord_Shallow[] = _("SHALLOW");
const u8 gEasyChatWord_Why[] = _("WHY");
const u8 gEasyChatWord_Confused[] = _("CONFUSED");
const u8 gEasyChatWord_Opposite[] = _("OPPOSITE");
const u8 gEasyChatWord_Left[] = _("LEFT");
const u8 gEasyChatWord_Right[] = _("RIGHT");
const struct EasyChatWordInfo gEasyChatGroup_Misc[] = {
{
.text = gEasyChatWord_Highs,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lows,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Um,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Rear,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Things,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Thing,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Below,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Above,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Back,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_High,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Here,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Inside,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Outside,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Beside,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ThisIsItExcl,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_This,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Every,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_These,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_TheseWere,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Down,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_That,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ThoseAre,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ThoseWere,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ThatsItExcl,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Am,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ThatWas,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Front,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Up,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Choice,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Far,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Away,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Near,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Where,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_When,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_What,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Deep,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Shallow,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Why,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Confused,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Opposite,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Left,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Right,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
};
+158
View File
@@ -0,0 +1,158 @@
#include "constants/moves.h"
const u16 gEasyChatGroup_Move1[] = {
MOVE_ABSORB,
MOVE_AEROBLAST,
MOVE_AGILITY,
MOVE_AIR_CUTTER,
MOVE_ANCIENT_POWER,
MOVE_AROMATHERAPY,
MOVE_ASTONISH,
MOVE_AURORA_BEAM,
MOVE_BIDE,
MOVE_BIND,
MOVE_BITE,
MOVE_BRICK_BREAK,
MOVE_BUBBLE,
MOVE_CHARGE,
MOVE_CHARM,
MOVE_CLAMP,
MOVE_CONFUSE_RAY,
MOVE_CONSTRICT,
MOVE_COSMIC_POWER,
MOVE_COUNTER,
MOVE_CRABHAMMER,
MOVE_CROSS_CHOP,
MOVE_CRUNCH,
MOVE_CUT,
MOVE_DIG,
MOVE_DISABLE,
MOVE_DOUBLE_TEAM,
MOVE_DOUBLE_EDGE,
MOVE_DOUBLE_SLAP,
MOVE_EARTHQUAKE,
MOVE_ENCORE,
MOVE_ENDEAVOR,
MOVE_ENDURE,
MOVE_EXTRASENSORY,
MOVE_EXTREME_SPEED,
MOVE_FACADE,
MOVE_FAKE_TEARS,
MOVE_FISSURE,
MOVE_FLAIL,
MOVE_FLAME_WHEEL,
MOVE_FLAMETHROWER,
MOVE_FLATTER,
MOVE_FLY,
MOVE_FOCUS_ENERGY,
MOVE_FOCUS_PUNCH,
MOVE_FOLLOW_ME,
MOVE_GIGA_DRAIN,
MOVE_GRASS_WHISTLE,
MOVE_GROWTH,
MOVE_GRUDGE,
MOVE_GUST,
MOVE_HAIL,
MOVE_HARDEN,
MOVE_HAZE,
MOVE_HEADBUTT,
MOVE_HEAL_BELL,
MOVE_HYPNOSIS,
MOVE_ICE_BALL,
MOVE_ICY_WIND,
MOVE_IRON_TAIL,
MOVE_KARATE_CHOP,
MOVE_KINESIS,
MOVE_LEECH_LIFE,
MOVE_LICK,
MOVE_LOVELY_KISS,
MOVE_LOW_KICK,
MOVE_MEAN_LOOK,
MOVE_MEMENTO,
MOVE_METAL_SOUND,
MOVE_METEOR_MASH,
MOVE_MIND_READER,
MOVE_MIRROR_MOVE,
MOVE_MIST,
MOVE_MORNING_SUN,
MOVE_NATURE_POWER,
MOVE_NIGHTMARE,
MOVE_OCTAZOOKA,
MOVE_ODOR_SLEUTH,
MOVE_OUTRAGE,
MOVE_OVERHEAT,
MOVE_PAIN_SPLIT,
MOVE_POWDER_SNOW,
MOVE_PSYBEAM,
MOVE_PSYCH_UP,
MOVE_PSYCHIC,
MOVE_PSYCHO_BOOST,
MOVE_PSYWAVE,
MOVE_PURSUIT,
MOVE_RAGE,
MOVE_RAIN_DANCE,
MOVE_RAPID_SPIN,
MOVE_RAZOR_WIND,
MOVE_RECOVER,
MOVE_RETURN,
MOVE_REVERSAL,
MOVE_ROCK_SLIDE,
MOVE_ROCK_SMASH,
MOVE_ROCK_THROW,
MOVE_ROCK_TOMB,
MOVE_ROLLOUT,
MOVE_SACRED_FIRE,
MOVE_SAFEGUARD,
MOVE_SAND_TOMB,
MOVE_SAND_ATTACK,
MOVE_SANDSTORM,
MOVE_SCARY_FACE,
MOVE_SCREECH,
MOVE_SELF_DESTRUCT,
MOVE_SHADOW_BALL,
MOVE_SHADOW_PUNCH,
MOVE_SHARPEN,
MOVE_SHEER_COLD,
MOVE_SIGNAL_BEAM,
MOVE_SILVER_WIND,
MOVE_SING,
MOVE_SKETCH,
MOVE_SKILL_SWAP,
MOVE_SKY_ATTACK,
MOVE_SKY_UPPERCUT,
MOVE_SLASH,
MOVE_SMELLING_SALT,
MOVE_SMOG,
MOVE_SMOKESCREEN,
MOVE_SNORE,
MOVE_SOLAR_BEAM,
MOVE_SONIC_BOOM,
MOVE_SPARK,
MOVE_SPIDER_WEB,
MOVE_SPITE,
MOVE_SPORE,
MOVE_STRENGTH,
MOVE_STRING_SHOT,
MOVE_STUN_SPORE,
MOVE_SUBMISSION,
MOVE_SUPER_FANG,
MOVE_SWAGGER,
MOVE_SWEET_SCENT,
MOVE_SWIFT,
MOVE_SYNTHESIS,
MOVE_TAIL_WHIP,
MOVE_THRASH,
MOVE_THUNDER,
MOVE_THUNDERBOLT,
MOVE_THUNDER_PUNCH,
MOVE_TICKLE,
MOVE_TORMENT,
MOVE_UPROAR,
MOVE_VITAL_THROW,
MOVE_WATER_SPOUT,
MOVE_WEATHER_BALL,
MOVE_WHIRLPOOL,
MOVE_WILL_O_WISP,
MOVE_WITHDRAW,
MOVE_YAWN,
};
+204
View File
@@ -0,0 +1,204 @@
#include "constants/moves.h"
const u16 gEasyChatGroup_Move2[] = {
MOVE_ACID,
MOVE_ACID_ARMOR,
MOVE_AERIAL_ACE,
MOVE_AMNESIA,
MOVE_ARM_THRUST,
MOVE_ASSIST,
MOVE_ATTRACT,
MOVE_BARRAGE,
MOVE_BARRIER,
MOVE_BATON_PASS,
MOVE_BEAT_UP,
MOVE_BELLY_DRUM,
MOVE_BLAST_BURN,
MOVE_BLAZE_KICK,
MOVE_BLIZZARD,
MOVE_BLOCK,
MOVE_BODY_SLAM,
MOVE_BONE_CLUB,
MOVE_BONE_RUSH,
MOVE_BONEMERANG,
MOVE_BOUNCE,
MOVE_BUBBLE_BEAM,
MOVE_BULK_UP,
MOVE_BULLET_SEED,
MOVE_CALM_MIND,
MOVE_CAMOUFLAGE,
MOVE_COMET_PUNCH,
MOVE_CONFUSION,
MOVE_CONVERSION,
MOVE_CONVERSION_2,
MOVE_COTTON_SPORE,
MOVE_COVET,
MOVE_CRUSH_CLAW,
MOVE_CURSE,
MOVE_DEFENSE_CURL,
MOVE_DESTINY_BOND,
MOVE_DETECT,
MOVE_DIVE,
MOVE_DIZZY_PUNCH,
MOVE_DOOM_DESIRE,
MOVE_DOUBLE_KICK,
MOVE_DRAGON_CLAW,
MOVE_DRAGON_DANCE,
MOVE_DRAGON_RAGE,
MOVE_DRAGON_BREATH,
MOVE_DREAM_EATER,
MOVE_DRILL_PECK,
MOVE_DYNAMIC_PUNCH,
MOVE_EGG_BOMB,
MOVE_EMBER,
MOVE_ERUPTION,
MOVE_EXPLOSION,
MOVE_FAINT_ATTACK,
MOVE_FAKE_OUT,
MOVE_FALSE_SWIPE,
MOVE_FEATHER_DANCE,
MOVE_FIRE_BLAST,
MOVE_FIRE_PUNCH,
MOVE_FIRE_SPIN,
MOVE_FLASH,
MOVE_FORESIGHT,
MOVE_FRENZY_PLANT,
MOVE_FRUSTRATION,
MOVE_FURY_ATTACK,
MOVE_FURY_CUTTER,
MOVE_FURY_SWIPES,
MOVE_FUTURE_SIGHT,
MOVE_GLARE,
MOVE_GROWL,
MOVE_GUILLOTINE,
MOVE_HEAT_WAVE,
MOVE_HELPING_HAND,
MOVE_HI_JUMP_KICK,
MOVE_HIDDEN_POWER,
MOVE_HORN_ATTACK,
MOVE_HORN_DRILL,
MOVE_HOWL,
MOVE_HYDRO_CANNON,
MOVE_HYDRO_PUMP,
MOVE_HYPER_BEAM,
MOVE_HYPER_FANG,
MOVE_HYPER_VOICE,
MOVE_ICE_BEAM,
MOVE_ICE_PUNCH,
MOVE_ICICLE_SPEAR,
MOVE_IMPRISON,
MOVE_INGRAIN,
MOVE_IRON_DEFENSE,
MOVE_JUMP_KICK,
MOVE_KNOCK_OFF,
MOVE_LEAF_BLADE,
MOVE_LEECH_SEED,
MOVE_LEER,
MOVE_LIGHT_SCREEN,
MOVE_LOCK_ON,
MOVE_LUSTER_PURGE,
MOVE_MACH_PUNCH,
MOVE_MAGIC_COAT,
MOVE_MAGICAL_LEAF,
MOVE_MAGNITUDE,
MOVE_MEDITATE,
MOVE_MEGA_DRAIN,
MOVE_MEGA_KICK,
MOVE_MEGA_PUNCH,
MOVE_MEGAHORN,
MOVE_METAL_CLAW,
MOVE_METRONOME,
MOVE_MILK_DRINK,
MOVE_MIMIC,
MOVE_MINIMIZE,
MOVE_MIRROR_COAT,
MOVE_MIST_BALL,
MOVE_MOONLIGHT,
MOVE_MUD_SHOT,
MOVE_MUD_SPORT,
MOVE_MUD_SLAP,
MOVE_MUDDY_WATER,
MOVE_NEEDLE_ARM,
MOVE_NIGHT_SHADE,
MOVE_PAY_DAY,
MOVE_PECK,
MOVE_PERISH_SONG,
MOVE_PETAL_DANCE,
MOVE_PIN_MISSILE,
MOVE_POISON_FANG,
MOVE_POISON_GAS,
MOVE_POISON_STING,
MOVE_POISON_TAIL,
MOVE_POISON_POWDER,
MOVE_POUND,
MOVE_PRESENT,
MOVE_PROTECT,
MOVE_QUICK_ATTACK,
MOVE_RAZOR_LEAF,
MOVE_RECYCLE,
MOVE_REFLECT,
MOVE_REFRESH,
MOVE_REST,
MOVE_REVENGE,
MOVE_ROAR,
MOVE_ROCK_BLAST,
MOVE_ROLE_PLAY,
MOVE_ROLLING_KICK,
MOVE_SCRATCH,
MOVE_SECRET_POWER,
MOVE_SEISMIC_TOSS,
MOVE_SHOCK_WAVE,
MOVE_SKULL_BASH,
MOVE_SLACK_OFF,
MOVE_SLAM,
MOVE_SLEEP_POWDER,
MOVE_SLEEP_TALK,
MOVE_SLUDGE,
MOVE_SLUDGE_BOMB,
MOVE_SNATCH,
MOVE_SOFT_BOILED,
MOVE_SPIKE_CANNON,
MOVE_SPIKES,
MOVE_SPIT_UP,
MOVE_SPLASH,
MOVE_STEEL_WING,
MOVE_STOCKPILE,
MOVE_STOMP,
MOVE_STRUGGLE,
MOVE_SUBSTITUTE,
MOVE_SUNNY_DAY,
MOVE_SUPERPOWER,
MOVE_SUPERSONIC,
MOVE_SURF,
MOVE_SWALLOW,
MOVE_SWEET_KISS,
MOVE_SWORDS_DANCE,
MOVE_TACKLE,
MOVE_TAIL_GLOW,
MOVE_TAKE_DOWN,
MOVE_TAUNT,
MOVE_TEETER_DANCE,
MOVE_TELEPORT,
MOVE_THIEF,
MOVE_THUNDER_WAVE,
MOVE_THUNDER_SHOCK,
MOVE_TOXIC,
MOVE_TRANSFORM,
MOVE_TRI_ATTACK,
MOVE_TRICK,
MOVE_TRIPLE_KICK,
MOVE_TWINEEDLE,
MOVE_TWISTER,
MOVE_VICE_GRIP,
MOVE_VINE_WHIP,
MOVE_VOLT_TACKLE,
MOVE_WATER_GUN,
MOVE_WATER_PULSE,
MOVE_WATER_SPORT,
MOVE_WATERFALL,
MOVE_WHIRLWIND,
MOVE_WING_ATTACK,
MOVE_WISH,
MOVE_WRAP,
MOVE_ZAP_CANNON,
};
+453
View File
@@ -0,0 +1,453 @@
const u8 gEasyChatWord_Opponent[] = _("OPPONENT");
const u8 gEasyChatWord_I[] = _("I");
const u8 gEasyChatWord_You[] = _("YOU");
const u8 gEasyChatWord_Yours[] = _("YOURS");
const u8 gEasyChatWord_Son[] = _("SON");
const u8 gEasyChatWord_Your[] = _("YOUR");
const u8 gEasyChatWord_Youre[] = _("YOU'RE");
const u8 gEasyChatWord_Youve[] = _("YOU'VE");
const u8 gEasyChatWord_Mother[] = _("MOTHER");
const u8 gEasyChatWord_Grandfather[] = _("GRANDFATHER");
const u8 gEasyChatWord_Uncle[] = _("UNCLE");
const u8 gEasyChatWord_Father[] = _("FATHER");
const u8 gEasyChatWord_Boy[] = _("BOY");
const u8 gEasyChatWord_Adult[] = _("ADULT");
const u8 gEasyChatWord_Brother[] = _("BROTHER");
const u8 gEasyChatWord_Sister[] = _("SISTER");
const u8 gEasyChatWord_Grandmother[] = _("GRANDMOTHER");
const u8 gEasyChatWord_Aunt[] = _("AUNT");
const u8 gEasyChatWord_Parent[] = _("PARENT");
const u8 gEasyChatWord_Man[] = _("MAN");
const u8 gEasyChatWord_Me[] = _("ME");
const u8 gEasyChatWord_Girl[] = _("GIRL");
const u8 gEasyChatWord_Babe[] = _("BABE");
const u8 gEasyChatWord_Family[] = _("FAMILY");
const u8 gEasyChatWord_Her[] = _("HER");
const u8 gEasyChatWord_Him[] = _("HIM");
const u8 gEasyChatWord_He[] = _("HE");
const u8 gEasyChatWord_Place[] = _("PLACE");
const u8 gEasyChatWord_Daughter[] = _("DAUGHTER");
const u8 gEasyChatWord_His[] = _("HIS");
const u8 gEasyChatWord_Hes[] = _("HE'S");
const u8 gEasyChatWord_Arent[] = _("AREN'T");
const u8 gEasyChatWord_Siblings[] = _("SIBLINGS");
const u8 gEasyChatWord_Kid[] = _("KID");
const u8 gEasyChatWord_Children[] = _("CHILDREN");
const u8 gEasyChatWord_Mr[] = _("MR.");
const u8 gEasyChatWord_Mrs[] = _("MRS.");
const u8 gEasyChatWord_Myself[] = _("MYSELF");
const u8 gEasyChatWord_IWas[] = _("I WAS");
const u8 gEasyChatWord_ToMe[] = _("TO ME");
const u8 gEasyChatWord_My[] = _("MY");
const u8 gEasyChatWord_IAm[] = _("I AM");
const u8 gEasyChatWord_Ive[] = _("I'VE");
const u8 gEasyChatWord_Who[] = _("WHO");
const u8 gEasyChatWord_Someone[] = _("SOMEONE");
const u8 gEasyChatWord_WhoWas[] = _("WHO WAS");
const u8 gEasyChatWord_ToWhom[] = _("TO WHOM");
const u8 gEasyChatWord_Whose[] = _("WHOSE");
const u8 gEasyChatWord_WhoIs[] = _("WHO IS");
const u8 gEasyChatWord_Its[] = _("IT'S");
const u8 gEasyChatWord_Lady[] = _("LADY");
const u8 gEasyChatWord_Friend[] = _("FRIEND");
const u8 gEasyChatWord_Ally[] = _("ALLY");
const u8 gEasyChatWord_Person[] = _("PERSON");
const u8 gEasyChatWord_Dude[] = _("DUDE");
const u8 gEasyChatWord_They[] = _("THEY");
const u8 gEasyChatWord_TheyWere[] = _("THEY WERE");
const u8 gEasyChatWord_ToThem[] = _("TO THEM");
const u8 gEasyChatWord_Their[] = _("THEIR");
const u8 gEasyChatWord_Theyre[] = _("THEY'RE");
const u8 gEasyChatWord_Theyve[] = _("THEY'VE");
const u8 gEasyChatWord_We[] = _("WE");
const u8 gEasyChatWord_Been[] = _("BEEN");
const u8 gEasyChatWord_ToUs[] = _("TO US");
const u8 gEasyChatWord_Our[] = _("OUR");
const u8 gEasyChatWord_WeAre[] = _("WE'RE");
const u8 gEasyChatWord_Rival[] = _("RIVAL");
const u8 gEasyChatWord_Weve[] = _("WE'VE");
const u8 gEasyChatWord_Woman[] = _("WOMAN");
const u8 gEasyChatWord_She[] = _("SHE");
const u8 gEasyChatWord_SheWas[] = _("SHE WAS");
const u8 gEasyChatWord_ToHer[] = _("TO HER");
const u8 gEasyChatWord_Hers[] = _("HERS");
const u8 gEasyChatWord_SheIs[] = _("SHE IS");
const u8 gEasyChatWord_Some[] = _("SOME");
const struct EasyChatWordInfo gEasyChatGroup_People[] = {
{
.text = gEasyChatWord_Opponent,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_I,
.alphabeticalOrder = 52,
.enabled = TRUE,
},
{
.text = gEasyChatWord_You,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Yours,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Son,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Your,
.alphabeticalOrder = 62,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Youre,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Youve,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mother,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Grandfather,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Uncle,
.alphabeticalOrder = 54,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Father,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Boy,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Adult,
.alphabeticalOrder = 51,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Brother,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sister,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Grandmother,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Aunt,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Parent,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Man,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Me,
.alphabeticalOrder = 72,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Girl,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Babe,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Family,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Her,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Him,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_He,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Place,
.alphabeticalOrder = 49,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Daughter,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_His,
.alphabeticalOrder = 50,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hes,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Arent,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Siblings,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Kid,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Children,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mr,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mrs,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Myself,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_IWas,
.alphabeticalOrder = 64,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ToMe,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_My,
.alphabeticalOrder = 53,
.enabled = TRUE,
},
{
.text = gEasyChatWord_IAm,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ive,
.alphabeticalOrder = 66,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Who,
.alphabeticalOrder = 69,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Someone,
.alphabeticalOrder = 73,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WhoWas,
.alphabeticalOrder = 70,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ToWhom,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Whose,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WhoIs,
.alphabeticalOrder = 74,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Its,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lady,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Friend,
.alphabeticalOrder = 58,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ally,
.alphabeticalOrder = 55,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Person,
.alphabeticalOrder = 56,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Dude,
.alphabeticalOrder = 59,
.enabled = TRUE,
},
{
.text = gEasyChatWord_They,
.alphabeticalOrder = 60,
.enabled = TRUE,
},
{
.text = gEasyChatWord_TheyWere,
.alphabeticalOrder = 71,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ToThem,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Their,
.alphabeticalOrder = 57,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Theyre,
.alphabeticalOrder = 63,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Theyve,
.alphabeticalOrder = 46,
.enabled = TRUE,
},
{
.text = gEasyChatWord_We,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Been,
.alphabeticalOrder = 61,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ToUs,
.alphabeticalOrder = 65,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Our,
.alphabeticalOrder = 67,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WeAre,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Rival,
.alphabeticalOrder = 48,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Weve,
.alphabeticalOrder = 45,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Woman,
.alphabeticalOrder = 47,
.enabled = TRUE,
},
{
.text = gEasyChatWord_She,
.alphabeticalOrder = 68,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SheWas,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ToHer,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hers,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SheIs,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Some,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
};
+206
View File
@@ -0,0 +1,206 @@
#include "constants/species.h"
const u16 gEasyChatGroup_Pokemon[] = {
SPECIES_ABRA,
SPECIES_ABSOL,
SPECIES_AGGRON,
SPECIES_ALAKAZAM,
SPECIES_ALTARIA,
SPECIES_ANORITH,
SPECIES_ARMALDO,
SPECIES_ARON,
SPECIES_AZUMARILL,
SPECIES_AZURILL,
SPECIES_BAGON,
SPECIES_BALTOY,
SPECIES_BANETTE,
SPECIES_BARBOACH,
SPECIES_BEAUTIFLY,
SPECIES_BELDUM,
SPECIES_BELLOSSOM,
SPECIES_BLAZIKEN,
SPECIES_BRELOOM,
SPECIES_CACNEA,
SPECIES_CACTURNE,
SPECIES_CAMERUPT,
SPECIES_CARVANHA,
SPECIES_CASCOON,
SPECIES_CASTFORM,
SPECIES_CHIMECHO,
SPECIES_CHINCHOU,
SPECIES_CLAMPERL,
SPECIES_CLAYDOL,
SPECIES_COMBUSKEN,
SPECIES_CORPHISH,
SPECIES_CORSOLA,
SPECIES_CRADILY,
SPECIES_CRAWDAUNT,
SPECIES_CROBAT,
SPECIES_DELCATTY,
SPECIES_DEOXYS,
SPECIES_DODRIO,
SPECIES_DODUO,
SPECIES_DONPHAN,
SPECIES_DUSCLOPS,
SPECIES_DUSKULL,
SPECIES_DUSTOX,
SPECIES_ELECTRIKE,
SPECIES_ELECTRODE,
SPECIES_EXPLOUD,
SPECIES_FEEBAS,
SPECIES_FLYGON,
SPECIES_GARDEVOIR,
SPECIES_GEODUDE,
SPECIES_GIRAFARIG,
SPECIES_GLALIE,
SPECIES_GLOOM,
SPECIES_GOLBAT,
SPECIES_GOLDEEN,
SPECIES_GOLDUCK,
SPECIES_GOLEM,
SPECIES_GOREBYSS,
SPECIES_GRAVELER,
SPECIES_GRIMER,
SPECIES_GROUDON,
SPECIES_GROVYLE,
SPECIES_GRUMPIG,
SPECIES_GULPIN,
SPECIES_GYARADOS,
SPECIES_HARIYAMA,
SPECIES_HERACROSS,
SPECIES_HORSEA,
SPECIES_HUNTAIL,
SPECIES_IGGLYBUFF,
SPECIES_ILLUMISE,
SPECIES_JIGGLYPUFF,
SPECIES_JIRACHI,
SPECIES_KADABRA,
SPECIES_KECLEON,
SPECIES_KINGDRA,
SPECIES_KIRLIA,
SPECIES_KOFFING,
SPECIES_KYOGRE,
SPECIES_LAIRON,
SPECIES_LANTURN,
SPECIES_LATIAS,
SPECIES_LATIOS,
SPECIES_LILEEP,
SPECIES_LINOONE,
SPECIES_LOMBRE,
SPECIES_LOTAD,
SPECIES_LOUDRED,
SPECIES_LUDICOLO,
SPECIES_LUNATONE,
SPECIES_LUVDISC,
SPECIES_MACHAMP,
SPECIES_MACHOKE,
SPECIES_MACHOP,
SPECIES_MAGCARGO,
SPECIES_MAGIKARP,
SPECIES_MAGNEMITE,
SPECIES_MAGNETON,
SPECIES_MAKUHITA,
SPECIES_MANECTRIC,
SPECIES_MARILL,
SPECIES_MARSHTOMP,
SPECIES_MASQUERAIN,
SPECIES_MAWILE,
SPECIES_MEDICHAM,
SPECIES_MEDITITE,
SPECIES_METAGROSS,
SPECIES_METANG,
SPECIES_MIGHTYENA,
SPECIES_MILOTIC,
SPECIES_MINUN,
SPECIES_MUDKIP,
SPECIES_MUK,
SPECIES_NATU,
SPECIES_NINCADA,
SPECIES_NINETALES,
SPECIES_NINJASK,
SPECIES_NOSEPASS,
SPECIES_NUMEL,
SPECIES_NUZLEAF,
SPECIES_ODDISH,
SPECIES_PELIPPER,
SPECIES_PHANPY,
SPECIES_PICHU,
SPECIES_PIKACHU,
SPECIES_PINSIR,
SPECIES_PLUSLE,
SPECIES_POOCHYENA,
SPECIES_PSYDUCK,
SPECIES_RAICHU,
SPECIES_RALTS,
SPECIES_RAYQUAZA,
SPECIES_REGICE,
SPECIES_REGIROCK,
SPECIES_REGISTEEL,
SPECIES_RELICANTH,
SPECIES_RHYDON,
SPECIES_RHYHORN,
SPECIES_ROSELIA,
SPECIES_SABLEYE,
SPECIES_SALAMENCE,
SPECIES_SANDSHREW,
SPECIES_SANDSLASH,
SPECIES_SCEPTILE,
SPECIES_SEADRA,
SPECIES_SEAKING,
SPECIES_SEALEO,
SPECIES_SEEDOT,
SPECIES_SEVIPER,
SPECIES_SHARPEDO,
SPECIES_SHEDINJA,
SPECIES_SHELGON,
SPECIES_SHIFTRY,
SPECIES_SHROOMISH,
SPECIES_SHUPPET,
SPECIES_SILCOON,
SPECIES_SKARMORY,
SPECIES_SKITTY,
SPECIES_SLAKING,
SPECIES_SLAKOTH,
SPECIES_SLUGMA,
SPECIES_SNORUNT,
SPECIES_SOLROCK,
SPECIES_SPHEAL,
SPECIES_SPINDA,
SPECIES_SPOINK,
SPECIES_STARMIE,
SPECIES_STARYU,
SPECIES_SURSKIT,
SPECIES_SWABLU,
SPECIES_SWALOT,
SPECIES_SWAMPERT,
SPECIES_SWELLOW,
SPECIES_TAILLOW,
SPECIES_TENTACOOL,
SPECIES_TENTACRUEL,
SPECIES_TORCHIC,
SPECIES_TORKOAL,
SPECIES_TRAPINCH,
SPECIES_TREECKO,
SPECIES_TROPIUS,
SPECIES_VIBRAVA,
SPECIES_VIGOROTH,
SPECIES_VILEPLUME,
SPECIES_VOLBEAT,
SPECIES_VOLTORB,
SPECIES_VULPIX,
SPECIES_WAILMER,
SPECIES_WAILORD,
SPECIES_WALREIN,
SPECIES_WEEZING,
SPECIES_WHISCASH,
SPECIES_WHISMUR,
SPECIES_WIGGLYTUFF,
SPECIES_WINGULL,
SPECIES_WOBBUFFET,
SPECIES_WURMPLE,
SPECIES_WYNAUT,
SPECIES_XATU,
SPECIES_ZANGOOSE,
SPECIES_ZIGZAGOON,
SPECIES_ZUBAT,
};
+255
View File
@@ -0,0 +1,255 @@
#include "constants/species.h"
const u16 gEasyChatGroup_Pokemon2[] = {
SPECIES_ABRA,
SPECIES_AERODACTYL,
SPECIES_AIPOM,
SPECIES_ALAKAZAM,
SPECIES_AMPHAROS,
SPECIES_ARBOK,
SPECIES_ARCANINE,
SPECIES_ARIADOS,
SPECIES_ARTICUNO,
SPECIES_AZUMARILL,
SPECIES_BAYLEEF,
SPECIES_BEEDRILL,
SPECIES_BELLOSSOM,
SPECIES_BELLSPROUT,
SPECIES_BLASTOISE,
SPECIES_BLISSEY,
SPECIES_BULBASAUR,
SPECIES_BUTTERFREE,
SPECIES_CATERPIE,
SPECIES_CELEBI,
SPECIES_CHANSEY,
SPECIES_CHARIZARD,
SPECIES_CHARMANDER,
SPECIES_CHARMELEON,
SPECIES_CHIKORITA,
SPECIES_CHINCHOU,
SPECIES_CLEFABLE,
SPECIES_CLEFAIRY,
SPECIES_CLEFFA,
SPECIES_CLOYSTER,
SPECIES_CORSOLA,
SPECIES_CROBAT,
SPECIES_CROCONAW,
SPECIES_CUBONE,
SPECIES_CYNDAQUIL,
SPECIES_DELIBIRD,
SPECIES_DEWGONG,
SPECIES_DIGLETT,
SPECIES_DITTO,
SPECIES_DODRIO,
SPECIES_DODUO,
SPECIES_DONPHAN,
SPECIES_DRAGONAIR,
SPECIES_DRAGONITE,
SPECIES_DRATINI,
SPECIES_DROWZEE,
SPECIES_DUGTRIO,
SPECIES_DUNSPARCE,
SPECIES_EEVEE,
SPECIES_EKANS,
SPECIES_ELECTABUZZ,
SPECIES_ELECTRODE,
SPECIES_ELEKID,
SPECIES_ENTEI,
SPECIES_ESPEON,
SPECIES_EXEGGCUTE,
SPECIES_EXEGGUTOR,
SPECIES_FARFETCHD,
SPECIES_FEAROW,
SPECIES_FERALIGATR,
SPECIES_FLAAFFY,
SPECIES_FLAREON,
SPECIES_FORRETRESS,
SPECIES_FURRET,
SPECIES_GASTLY,
SPECIES_GENGAR,
SPECIES_GEODUDE,
SPECIES_GIRAFARIG,
SPECIES_GLIGAR,
SPECIES_GLOOM,
SPECIES_GOLBAT,
SPECIES_GOLDEEN,
SPECIES_GOLDUCK,
SPECIES_GOLEM,
SPECIES_GRANBULL,
SPECIES_GRAVELER,
SPECIES_GRIMER,
SPECIES_GROWLITHE,
SPECIES_GYARADOS,
SPECIES_HAUNTER,
SPECIES_HERACROSS,
SPECIES_HITMONCHAN,
SPECIES_HITMONLEE,
SPECIES_HITMONTOP,
SPECIES_HO_OH,
SPECIES_HOOTHOOT,
SPECIES_HOPPIP,
SPECIES_HORSEA,
SPECIES_HOUNDOOM,
SPECIES_HOUNDOUR,
SPECIES_HYPNO,
SPECIES_IGGLYBUFF,
SPECIES_IVYSAUR,
SPECIES_JIGGLYPUFF,
SPECIES_JOLTEON,
SPECIES_JUMPLUFF,
SPECIES_JYNX,
SPECIES_KABUTO,
SPECIES_KABUTOPS,
SPECIES_KADABRA,
SPECIES_KAKUNA,
SPECIES_KANGASKHAN,
SPECIES_KINGDRA,
SPECIES_KINGLER,
SPECIES_KOFFING,
SPECIES_KRABBY,
SPECIES_LANTURN,
SPECIES_LAPRAS,
SPECIES_LARVITAR,
SPECIES_LEDIAN,
SPECIES_LEDYBA,
SPECIES_LICKITUNG,
SPECIES_LUGIA,
SPECIES_MACHAMP,
SPECIES_MACHOKE,
SPECIES_MACHOP,
SPECIES_MAGBY,
SPECIES_MAGCARGO,
SPECIES_MAGIKARP,
SPECIES_MAGMAR,
SPECIES_MAGNEMITE,
SPECIES_MAGNETON,
SPECIES_MANKEY,
SPECIES_MANTINE,
SPECIES_MAREEP,
SPECIES_MARILL,
SPECIES_MAROWAK,
SPECIES_MEGANIUM,
SPECIES_MEOWTH,
SPECIES_METAPOD,
SPECIES_MEW,
SPECIES_MEWTWO,
SPECIES_MILTANK,
SPECIES_MISDREAVUS,
SPECIES_MOLTRES,
SPECIES_MR_MIME,
SPECIES_MUK,
SPECIES_MURKROW,
SPECIES_NATU,
SPECIES_NIDOKING,
SPECIES_NIDOQUEEN,
SPECIES_NIDORAN_F,
SPECIES_NIDORAN_M,
SPECIES_NIDORINA,
SPECIES_NIDORINO,
SPECIES_NINETALES,
SPECIES_NOCTOWL,
SPECIES_OCTILLERY,
SPECIES_ODDISH,
SPECIES_OMANYTE,
SPECIES_OMASTAR,
SPECIES_ONIX,
SPECIES_PARAS,
SPECIES_PARASECT,
SPECIES_PERSIAN,
SPECIES_PHANPY,
SPECIES_PICHU,
SPECIES_PIDGEOT,
SPECIES_PIDGEOTTO,
SPECIES_PIDGEY,
SPECIES_PIKACHU,
SPECIES_PILOSWINE,
SPECIES_PINECO,
SPECIES_PINSIR,
SPECIES_POLITOED,
SPECIES_POLIWAG,
SPECIES_POLIWHIRL,
SPECIES_POLIWRATH,
SPECIES_PONYTA,
SPECIES_PORYGON,
SPECIES_PORYGON2,
SPECIES_PRIMEAPE,
SPECIES_PSYDUCK,
SPECIES_PUPITAR,
SPECIES_QUAGSIRE,
SPECIES_QUILAVA,
SPECIES_QWILFISH,
SPECIES_RAICHU,
SPECIES_RAIKOU,
SPECIES_RAPIDASH,
SPECIES_RATICATE,
SPECIES_RATTATA,
SPECIES_REMORAID,
SPECIES_RHYDON,
SPECIES_RHYHORN,
SPECIES_SANDSHREW,
SPECIES_SANDSLASH,
SPECIES_SCIZOR,
SPECIES_SCYTHER,
SPECIES_SEADRA,
SPECIES_SEAKING,
SPECIES_SEEL,
SPECIES_SENTRET,
SPECIES_SHELLDER,
SPECIES_SHUCKLE,
SPECIES_SKARMORY,
SPECIES_SKIPLOOM,
SPECIES_SLOWBRO,
SPECIES_SLOWKING,
SPECIES_SLOWPOKE,
SPECIES_SLUGMA,
SPECIES_SMEARGLE,
SPECIES_SMOOCHUM,
SPECIES_SNEASEL,
SPECIES_SNORLAX,
SPECIES_SNUBBULL,
SPECIES_SPEAROW,
SPECIES_SPINARAK,
SPECIES_SQUIRTLE,
SPECIES_STANTLER,
SPECIES_STARMIE,
SPECIES_STARYU,
SPECIES_STEELIX,
SPECIES_SUDOWOODO,
SPECIES_SUICUNE,
SPECIES_SUNFLORA,
SPECIES_SUNKERN,
SPECIES_SWINUB,
SPECIES_TANGELA,
SPECIES_TAUROS,
SPECIES_TEDDIURSA,
SPECIES_TENTACOOL,
SPECIES_TENTACRUEL,
SPECIES_TOGEPI,
SPECIES_TOGETIC,
SPECIES_TOTODILE,
SPECIES_TYPHLOSION,
SPECIES_TYRANITAR,
SPECIES_TYROGUE,
SPECIES_UMBREON,
SPECIES_UNOWN,
SPECIES_URSARING,
SPECIES_VAPOREON,
SPECIES_VENOMOTH,
SPECIES_VENONAT,
SPECIES_VENUSAUR,
SPECIES_VICTREEBEL,
SPECIES_VILEPLUME,
SPECIES_VOLTORB,
SPECIES_VULPIX,
SPECIES_WARTORTLE,
SPECIES_WEEDLE,
SPECIES_WEEPINBELL,
SPECIES_WEEZING,
SPECIES_WIGGLYTUFF,
SPECIES_WOBBUFFET,
SPECIES_WOOPER,
SPECIES_XATU,
SPECIES_YANMA,
SPECIES_ZAPDOS,
SPECIES_ZUBAT,
};
+363
View File
@@ -0,0 +1,363 @@
const u8 gEasyChatWord_Listen[] = _("LISTEN");
const u8 gEasyChatWord_NotVery[] = _("NOT VERY");
const u8 gEasyChatWord_Mean[] = _("MEAN");
const u8 gEasyChatWord_Lie[] = _("LIE");
const u8 gEasyChatWord_Lay[] = _("LAY");
const u8 gEasyChatWord_Recommend[] = _("RECOMMEND");
const u8 gEasyChatWord_Nitwit[] = _("NITWIT");
const u8 gEasyChatWord_Quite[] = _("QUITE");
const u8 gEasyChatWord_From[] = _("FROM");
const u8 gEasyChatWord_Feeling[] = _("FEELING");
const u8 gEasyChatWord_But[] = _("BUT");
const u8 gEasyChatWord_However[] = _("HOWEVER");
const u8 gEasyChatWord_Case[] = _("CASE");
const u8 gEasyChatWord_The[] = _("THE");
const u8 gEasyChatWord_Miss[] = _("MISS");
const u8 gEasyChatWord_How[] = _("HOW");
const u8 gEasyChatWord_Hit[] = _("HIT");
const u8 gEasyChatWord_Enough[] = _("ENOUGH");
const u8 gEasyChatWord_ALot[] = _("A LOT");
const u8 gEasyChatWord_ALittle[] = _("A LITTLE");
const u8 gEasyChatWord_Absolutely[] = _("ABSOLUTELY");
const u8 gEasyChatWord_And[] = _("AND");
const u8 gEasyChatWord_Only[] = _("ONLY");
const u8 gEasyChatWord_Around[] = _("AROUND");
const u8 gEasyChatWord_Probably[] = _("PROBABLY");
const u8 gEasyChatWord_If[] = _("IF");
const u8 gEasyChatWord_Very[] = _("VERY");
const u8 gEasyChatWord_ATinyBit[] = _("A TINY BIT");
const u8 gEasyChatWord_Wild[] = _("WILD");
const u8 gEasyChatWord_Thats[] = _("THAT'S");
const u8 gEasyChatWord_Just[] = _("JUST");
const u8 gEasyChatWord_EvenSo[] = _("EVEN SO,");
const u8 gEasyChatWord_MustBe[] = _("MUST BE");
const u8 gEasyChatWord_Naturally[] = _("NATURALLY");
const u8 gEasyChatWord_ForNow[] = _("FOR NOW,");
const u8 gEasyChatWord_Understood[] = _("UNDERSTOOD");
const u8 gEasyChatWord_Joking[] = _("JOKING");
const u8 gEasyChatWord_Ready[] = _("READY");
const u8 gEasyChatWord_Something[] = _("SOMETHING");
const u8 gEasyChatWord_Somehow[] = _("SOMEHOW");
const u8 gEasyChatWord_Although[] = _("ALTHOUGH");
const u8 gEasyChatWord_Also[] = _("ALSO");
const u8 gEasyChatWord_Perfect[] = _("PERFECT");
const u8 gEasyChatWord_AsMuchAs[] = _("AS MUCH AS");
const u8 gEasyChatWord_Really[] = _("REALLY");
const u8 gEasyChatWord_Truly[] = _("TRULY");
const u8 gEasyChatWord_Seriously[] = _("SERIOUSLY");
const u8 gEasyChatWord_Totally[] = _("TOTALLY");
const u8 gEasyChatWord_Until[] = _("UNTIL");
const u8 gEasyChatWord_AsIf[] = _("AS IF");
const u8 gEasyChatWord_Mood[] = _("MOOD");
const u8 gEasyChatWord_Rather[] = _("RATHER");
const u8 gEasyChatWord_Awfully[] = _("AWFULLY");
const u8 gEasyChatWord_Mode[] = _("MODE");
const u8 gEasyChatWord_More[] = _("MORE");
const u8 gEasyChatWord_TooLate[] = _("TOO LATE");
const u8 gEasyChatWord_Finally[] = _("FINALLY");
const u8 gEasyChatWord_Any[] = _("ANY");
const u8 gEasyChatWord_Instead[] = _("INSTEAD");
const u8 gEasyChatWord_Fantastic[] = _("FANTASTIC");
const struct EasyChatWordInfo gEasyChatGroup_Speech[] = {
{
.text = gEasyChatWord_Listen,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_NotVery,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mean,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lie,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lay,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Recommend,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Nitwit,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Quite,
.alphabeticalOrder = 57,
.enabled = TRUE,
},
{
.text = gEasyChatWord_From,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Feeling,
.alphabeticalOrder = 49,
.enabled = TRUE,
},
{
.text = gEasyChatWord_But,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_However,
.alphabeticalOrder = 52,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Case,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_The,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Miss,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_How,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hit,
.alphabeticalOrder = 59,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Enough,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ALot,
.alphabeticalOrder = 56,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ALittle,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Absolutely,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_And,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Only,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Around,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Probably,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_If,
.alphabeticalOrder = 58,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Very,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ATinyBit,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wild,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Thats,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Just,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_EvenSo,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_MustBe,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Naturally,
.alphabeticalOrder = 53,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ForNow,
.alphabeticalOrder = 50,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Understood,
.alphabeticalOrder = 54,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Joking,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ready,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Something,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Somehow,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Although,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Also,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Perfect,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_AsMuchAs,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Really,
.alphabeticalOrder = 51,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Truly,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Seriously,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Totally,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Until,
.alphabeticalOrder = 46,
.enabled = TRUE,
},
{
.text = gEasyChatWord_AsIf,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mood,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Rather,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Awfully,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mode,
.alphabeticalOrder = 55,
.enabled = TRUE,
},
{
.text = gEasyChatWord_More,
.alphabeticalOrder = 47,
.enabled = TRUE,
},
{
.text = gEasyChatWord_TooLate,
.alphabeticalOrder = 45,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Finally,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Any,
.alphabeticalOrder = 48,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Instead,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fantastic,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
};
+657
View File
@@ -0,0 +1,657 @@
const u8 gEasyChatWord_Dark[] = _("DARK");
const u8 gEasyChatWord_Stench[] = _("STENCH");
const u8 gEasyChatWord_ThickFat[] = _("THICK FAT");
const u8 gEasyChatWord_RainDish[] = _("RAIN DISH");
const u8 gEasyChatWord_Drizzle[] = _("DRIZZLE");
const u8 gEasyChatWord_ArenaTrap[] = _("ARENA TRAP");
const u8 gEasyChatWord_Intimidate[] = _("INTIMIDATE");
const u8 gEasyChatWord_RockHead[] = _("ROCK HEAD");
const u8 gEasyChatWord_Color[] = _("COLOR");
const u8 gEasyChatWord_AltColor[] = _("ALT. COLOR");
const u8 gEasyChatWord_Rock[] = _("ROCK");
const u8 gEasyChatWord_Beautiful[] = _("BEAUTIFUL");
const u8 gEasyChatWord_Beauty[] = _("BEAUTY");
const u8 gEasyChatWord_AirLock[] = _("AIR LOCK");
const u8 gEasyChatWord_Psychic[] = _("PSYCHIC");
const u8 gEasyChatWord_HyperCutter[] = _("HYPER CUTTER");
const u8 gEasyChatWord_Fighting[] = _("FIGHTING");
const u8 gEasyChatWord_ShadowTag[] = _("SHADOW TAG");
const u8 gEasyChatWord_Smart[] = _("SMART");
const u8 gEasyChatWord_Smartness[] = _("SMARTNESS");
const u8 gEasyChatWord_SpeedBoost[] = _("SPEED BOOST");
const u8 gEasyChatWord_Cool[] = _("COOL");
const u8 gEasyChatWord_Coolness[] = _("COOLNESS");
const u8 gEasyChatWord_BattleArmor[] = _("BATTLE ARMOR");
const u8 gEasyChatWord_Cute[] = _("CUTE");
const u8 gEasyChatWord_Cuteness[] = _("CUTENESS");
const u8 gEasyChatWord_Sturdy[] = _("STURDY");
const u8 gEasyChatWord_SuctionCups[] = _("SUCTION CUPS");
const u8 gEasyChatWord_Grass[] = _("GRASS");
const u8 gEasyChatWord_ClearBody[] = _("CLEAR BODY");
const u8 gEasyChatWord_Torrent[] = _("TORRENT");
const u8 gEasyChatWord_Ghost[] = _("GHOST");
const u8 gEasyChatWord_Ice[] = _("ICE");
const u8 gEasyChatWord_Guts[] = _("GUTS");
const u8 gEasyChatWord_RoughSkin[] = _("ROUGH SKIN");
const u8 gEasyChatWord_ShellArmor[] = _("SHELL ARMOR");
const u8 gEasyChatWord_NaturalCure[] = _("NATURAL CURE");
const u8 gEasyChatWord_Damp[] = _("DAMP");
const u8 gEasyChatWord_Ground[] = _("GROUND");
const u8 gEasyChatWord_Limber[] = _("LIMBER");
const u8 gEasyChatWord_MagnetPull[] = _("MAGNET PULL");
const u8 gEasyChatWord_WhiteSmoke[] = _("WHITE SMOKE");
const u8 gEasyChatWord_Synchronize[] = _("SYNCHRONIZE");
const u8 gEasyChatWord_Overgrow[] = _("OVERGROW");
const u8 gEasyChatWord_SwiftSwim[] = _("SWIFT SWIM");
const u8 gEasyChatWord_SandStream[] = _("SAND STREAM");
const u8 gEasyChatWord_SandVeil[] = _("SAND VEIL");
const u8 gEasyChatWord_KeenEye[] = _("KEEN EYE");
const u8 gEasyChatWord_InnerFocus[] = _("INNER FOCUS");
const u8 gEasyChatWord_Static[] = _("STATIC");
const u8 gEasyChatWord_Type[] = _("TYPE");
const u8 gEasyChatWord_Tough[] = _("TOUGH");
const u8 gEasyChatWord_Toughness[] = _("TOUGHNESS");
const u8 gEasyChatWord_ShedSkin[] = _("SHED SKIN");
const u8 gEasyChatWord_HugePower[] = _("HUGE POWER");
const u8 gEasyChatWord_VoltAbsorb[] = _("VOLT ABSORB");
const u8 gEasyChatWord_WaterAbsorb[] = _("WATER ABSORB");
const u8 gEasyChatWord_Electric[] = _("ELECTRIC");
const u8 gEasyChatWord_Forecast[] = _("FORECAST");
const u8 gEasyChatWord_SereneGrace[] = _("SERENE GRACE");
const u8 gEasyChatWord_Poison[] = _("POISON");
const u8 gEasyChatWord_PoisonPoint[] = _("POISON POINT");
const u8 gEasyChatWord_Dragon[] = _("DRAGON");
const u8 gEasyChatWord_Trace[] = _("TRACE");
const u8 gEasyChatWord_Oblivious[] = _("OBLIVIOUS");
const u8 gEasyChatWord_Truant[] = _("TRUANT");
const u8 gEasyChatWord_RunAway[] = _("RUN AWAY");
const u8 gEasyChatWord_StickyHold[] = _("STICKY HOLD");
const u8 gEasyChatWord_CloudNine[] = _("CLOUD NINE");
const u8 gEasyChatWord_Normal[] = _("NORMAL");
const u8 gEasyChatWord_Steel[] = _("STEEL");
const u8 gEasyChatWord_Illuminate[] = _("ILLUMINATE");
const u8 gEasyChatWord_EarlyBird[] = _("EARLY BIRD");
const u8 gEasyChatWord_Hustle[] = _("HUSTLE");
const u8 gEasyChatWord_Shine[] = _("SHINE");
const u8 gEasyChatWord_Flying[] = _("FLYING");
const u8 gEasyChatWord_Drought[] = _("DROUGHT");
const u8 gEasyChatWord_Lightningrod[] = _("LIGHTNINGROD");
const u8 gEasyChatWord_Compoundeyes[] = _("COMPOUNDEYES");
const u8 gEasyChatWord_MarvelScale[] = _("MARVEL SCALE");
const u8 gEasyChatWord_WonderGuard[] = _("WONDER GUARD");
const u8 gEasyChatWord_Insomnia[] = _("INSOMNIA");
const u8 gEasyChatWord_Levitate[] = _("LEVITATE");
const u8 gEasyChatWord_Plus[] = _("PLUS");
const u8 gEasyChatWord_Pressure[] = _("PRESSURE");
const u8 gEasyChatWord_LiquidOoze[] = _("LIQUID OOZE");
const u8 gEasyChatWord_ColorChange[] = _("COLOR CHANGE");
const u8 gEasyChatWord_Soundproof[] = _("SOUNDPROOF");
const u8 gEasyChatWord_EffectSpore[] = _("EFFECT SPORE");
const u8 gEasyChatWord_Pkrs[] = _("{PK}RS");
const u8 gEasyChatWord_Fire[] = _("FIRE");
const u8 gEasyChatWord_FlameBody[] = _("FLAME BODY");
const u8 gEasyChatWord_Minus[] = _("MINUS");
const u8 gEasyChatWord_OwnTempo[] = _("OWN TEMPO");
const u8 gEasyChatWord_MagmaArmor[] = _("MAGMA ARMOR");
const u8 gEasyChatWord_Water[] = _("WATER");
const u8 gEasyChatWord_WaterVeil[] = _("WATER VEIL");
const u8 gEasyChatWord_Bug[] = _("BUG");
const u8 gEasyChatWord_Swarm[] = _("SWARM");
const u8 gEasyChatWord_CuteCharm[] = _("CUTE CHARM");
const u8 gEasyChatWord_Immunity[] = _("IMMUNITY");
const u8 gEasyChatWord_Blaze[] = _("BLAZE");
const u8 gEasyChatWord_Pickup[] = _("PICKUP");
const u8 gEasyChatWord_Pattern[] = _("PATTERN");
const u8 gEasyChatWord_FlashFire[] = _("FLASH FIRE");
const u8 gEasyChatWord_VitalSpirit[] = _("VITAL SPIRIT");
const u8 gEasyChatWord_Chlorophyll[] = _("CHLOROPHYLL");
const u8 gEasyChatWord_PurePower[] = _("PURE POWER");
const u8 gEasyChatWord_ShieldDust[] = _("SHIELD DUST");
const struct EasyChatWordInfo gEasyChatGroup_Status[] = {
{
.text = gEasyChatWord_Dark,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Stench,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ThickFat,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_RainDish,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Drizzle,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ArenaTrap,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Intimidate,
.alphabeticalOrder = 101,
.enabled = TRUE,
},
{
.text = gEasyChatWord_RockHead,
.alphabeticalOrder = 97,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Color,
.alphabeticalOrder = 106,
.enabled = TRUE,
},
{
.text = gEasyChatWord_AltColor,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Rock,
.alphabeticalOrder = 68,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Beautiful,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Beauty,
.alphabeticalOrder = 86,
.enabled = TRUE,
},
{
.text = gEasyChatWord_AirLock,
.alphabeticalOrder = 78,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Psychic,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HyperCutter,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fighting,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ShadowTag,
.alphabeticalOrder = 99,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Smart,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Smartness,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SpeedBoost,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Cool,
.alphabeticalOrder = 62,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Coolness,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_BattleArmor,
.alphabeticalOrder = 76,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Cute,
.alphabeticalOrder = 72,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Cuteness,
.alphabeticalOrder = 88,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sturdy,
.alphabeticalOrder = 57,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SuctionCups,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Grass,
.alphabeticalOrder = 90,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ClearBody,
.alphabeticalOrder = 91,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Torrent,
.alphabeticalOrder = 104,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ghost,
.alphabeticalOrder = 75,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ice,
.alphabeticalOrder = 58,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Guts,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_RoughSkin,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ShellArmor,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_NaturalCure,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Damp,
.alphabeticalOrder = 54,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ground,
.alphabeticalOrder = 73,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Limber,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_MagnetPull,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WhiteSmoke,
.alphabeticalOrder = 71,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Synchronize,
.alphabeticalOrder = 100,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Overgrow,
.alphabeticalOrder = 48,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SwiftSwim,
.alphabeticalOrder = 81,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SandStream,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SandVeil,
.alphabeticalOrder = 47,
.enabled = TRUE,
},
{
.text = gEasyChatWord_KeenEye,
.alphabeticalOrder = 82,
.enabled = TRUE,
},
{
.text = gEasyChatWord_InnerFocus,
.alphabeticalOrder = 77,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Static,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Type,
.alphabeticalOrder = 85,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Tough,
.alphabeticalOrder = 94,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Toughness,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ShedSkin,
.alphabeticalOrder = 79,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HugePower,
.alphabeticalOrder = 92,
.enabled = TRUE,
},
{
.text = gEasyChatWord_VoltAbsorb,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WaterAbsorb,
.alphabeticalOrder = 69,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Electric,
.alphabeticalOrder = 64,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Forecast,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SereneGrace,
.alphabeticalOrder = 93,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Poison,
.alphabeticalOrder = 103,
.enabled = TRUE,
},
{
.text = gEasyChatWord_PoisonPoint,
.alphabeticalOrder = 102,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Dragon,
.alphabeticalOrder = 89,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Trace,
.alphabeticalOrder = 83,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Oblivious,
.alphabeticalOrder = 60,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Truant,
.alphabeticalOrder = 61,
.enabled = TRUE,
},
{
.text = gEasyChatWord_RunAway,
.alphabeticalOrder = 84,
.enabled = TRUE,
},
{
.text = gEasyChatWord_StickyHold,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_CloudNine,
.alphabeticalOrder = 107,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Normal,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Steel,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Illuminate,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_EarlyBird,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hustle,
.alphabeticalOrder = 66,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Shine,
.alphabeticalOrder = 45,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Flying,
.alphabeticalOrder = 46,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Drought,
.alphabeticalOrder = 59,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lightningrod,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Compoundeyes,
.alphabeticalOrder = 53,
.enabled = TRUE,
},
{
.text = gEasyChatWord_MarvelScale,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WonderGuard,
.alphabeticalOrder = 108,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Insomnia,
.alphabeticalOrder = 74,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Levitate,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Plus,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pressure,
.alphabeticalOrder = 87,
.enabled = TRUE,
},
{
.text = gEasyChatWord_LiquidOoze,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ColorChange,
.alphabeticalOrder = 49,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Soundproof,
.alphabeticalOrder = 70,
.enabled = TRUE,
},
{
.text = gEasyChatWord_EffectSpore,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pkrs,
.alphabeticalOrder = 67,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fire,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_FlameBody,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Minus,
.alphabeticalOrder = 98,
.enabled = TRUE,
},
{
.text = gEasyChatWord_OwnTempo,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
{
.text = gEasyChatWord_MagmaArmor,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Water,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WaterVeil,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Bug,
.alphabeticalOrder = 51,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Swarm,
.alphabeticalOrder = 52,
.enabled = TRUE,
},
{
.text = gEasyChatWord_CuteCharm,
.alphabeticalOrder = 63,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Immunity,
.alphabeticalOrder = 65,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Blaze,
.alphabeticalOrder = 50,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pickup,
.alphabeticalOrder = 105,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pattern,
.alphabeticalOrder = 55,
.enabled = TRUE,
},
{
.text = gEasyChatWord_FlashFire,
.alphabeticalOrder = 95,
.enabled = TRUE,
},
{
.text = gEasyChatWord_VitalSpirit,
.alphabeticalOrder = 56,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Chlorophyll,
.alphabeticalOrder = 96,
.enabled = TRUE,
},
{
.text = gEasyChatWord_PurePower,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ShieldDust,
.alphabeticalOrder = 80,
.enabled = TRUE,
},
};
+273
View File
@@ -0,0 +1,273 @@
const u8 gEasyChatWord_Fall[] = _("FALL");
const u8 gEasyChatWord_Morning[] = _("MORNING");
const u8 gEasyChatWord_Tomorrow[] = _("TOMORROW");
const u8 gEasyChatWord_Last[] = _("LAST");
const u8 gEasyChatWord_Day[] = _("DAY");
const u8 gEasyChatWord_Sometime[] = _("SOMETIME");
const u8 gEasyChatWord_Always[] = _("ALWAYS");
const u8 gEasyChatWord_Current[] = _("CURRENT");
const u8 gEasyChatWord_Forever[] = _("FOREVER");
const u8 gEasyChatWord_Days[] = _("DAYS");
const u8 gEasyChatWord_End[] = _("END");
const u8 gEasyChatWord_Tuesday[] = _("TUESDAY");
const u8 gEasyChatWord_Yesterday[] = _("YESTERDAY");
const u8 gEasyChatWord_Today[] = _("TODAY");
const u8 gEasyChatWord_Friday[] = _("FRIDAY");
const u8 gEasyChatWord_Monday[] = _("MONDAY");
const u8 gEasyChatWord_Later[] = _("LATER");
const u8 gEasyChatWord_Earlier[] = _("EARLIER");
const u8 gEasyChatWord_Another[] = _("ANOTHER");
const u8 gEasyChatWord_Time[] = _("TIME");
const u8 gEasyChatWord_Finish[] = _("FINISH");
const u8 gEasyChatWord_Wednesday[] = _("WEDNESDAY");
const u8 gEasyChatWord_Soon[] = _("SOON");
const u8 gEasyChatWord_Start[] = _("START");
const u8 gEasyChatWord_Month[] = _("MONTH");
const u8 gEasyChatWord_Stop[] = _("STOP");
const u8 gEasyChatWord_Now[] = _("NOW");
const u8 gEasyChatWord_Final[] = _("FINAL");
const u8 gEasyChatWord_Next[] = _("NEXT");
const u8 gEasyChatWord_Age[] = _("AGE");
const u8 gEasyChatWord_Saturday[] = _("SATURDAY");
const u8 gEasyChatWord_Summer[] = _("SUMMER");
const u8 gEasyChatWord_Sunday[] = _("SUNDAY");
const u8 gEasyChatWord_Beginning[] = _("BEGINNING");
const u8 gEasyChatWord_Spring[] = _("SPRING");
const u8 gEasyChatWord_Daytime[] = _("DAYTIME");
const u8 gEasyChatWord_Winter[] = _("WINTER");
const u8 gEasyChatWord_Daily[] = _("DAILY");
const u8 gEasyChatWord_Olden[] = _("OLDEN");
const u8 gEasyChatWord_Almost[] = _("ALMOST");
const u8 gEasyChatWord_Nearly[] = _("NEARLY");
const u8 gEasyChatWord_Thursday[] = _("THURSDAY");
const u8 gEasyChatWord_Nighttime[] = _("NIGHTTIME");
const u8 gEasyChatWord_Night[] = _("NIGHT");
const u8 gEasyChatWord_Week[] = _("WEEK");
const struct EasyChatWordInfo gEasyChatGroup_Time[] = {
{
.text = gEasyChatWord_Fall,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Morning,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Tomorrow,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Last,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Day,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sometime,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Always,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Current,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Forever,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Days,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_End,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Tuesday,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Yesterday,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Today,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Friday,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Monday,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Later,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Earlier,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Another,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Time,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Finish,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wednesday,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Soon,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Start,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Month,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Stop,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Now,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Final,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Next,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Age,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Saturday,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Summer,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sunday,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Beginning,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Spring,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Daytime,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Winter,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Daily,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Olden,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Almost,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Nearly,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Thursday,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Nighttime,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Night,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Week,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
};
+165
View File
@@ -0,0 +1,165 @@
const u8 gEasyChatWord_IChooseYou[] = _("I CHOOSE YOU");
const u8 gEasyChatWord_Gotcha[] = _("GOTCHA");
const u8 gEasyChatWord_Trade[] = _("TRADE");
const u8 gEasyChatWord_Sapphire[] = _("SAPPHIRE");
const u8 gEasyChatWord_Evolve[] = _("EVOLVE");
const u8 gEasyChatWord_Encyclopedia[] = _("ENCYCLOPEDIA");
const u8 gEasyChatWord_Nature[] = _("NATURE");
const u8 gEasyChatWord_Center[] = _("CENTER");
const u8 gEasyChatWord_Egg[] = _("EGG");
const u8 gEasyChatWord_Link[] = _("LINK");
const u8 gEasyChatWord_SpAbility[] = _("SP. ABILITY");
const u8 gEasyChatWord_Trainer[] = _("TRAINER");
const u8 gEasyChatWord_Version[] = _("VERSION");
const u8 gEasyChatWord_Pokenav[] = _("POKéNAV");
const u8 gEasyChatWord_Pokemon[] = _("POKéMON");
const u8 gEasyChatWord_Get[] = _("GET");
const u8 gEasyChatWord_Pokedex[] = _("POKéDEX");
const u8 gEasyChatWord_Ruby[] = _("RUBY");
const u8 gEasyChatWord_Level[] = _("LEVEL");
const u8 gEasyChatWord_Red[] = _("RED");
const u8 gEasyChatWord_Green[] = _("GREEN");
const u8 gEasyChatWord_Bag[] = _("BAG");
const u8 gEasyChatWord_Flame[] = _("FLAME");
const u8 gEasyChatWord_Gold[] = _("GOLD");
const u8 gEasyChatWord_Leaf[] = _("LEAF");
const u8 gEasyChatWord_Silver[] = _("SILVER");
const u8 gEasyChatWord_Emerald[] = _("EMERALD");
const struct EasyChatWordInfo gEasyChatGroup_Trainer[] = {
{
.text = gEasyChatWord_IChooseYou,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Gotcha,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Trade,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sapphire,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Evolve,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Encyclopedia,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Nature,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Center,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Egg,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Link,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SpAbility,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Trainer,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Version,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pokenav,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pokemon,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Get,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Pokedex,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ruby,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Level,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Red,
.alphabeticalOrder = 19,
.enabled = FALSE,
},
{
.text = gEasyChatWord_Green,
.alphabeticalOrder = 17,
.enabled = FALSE,
},
{
.text = gEasyChatWord_Bag,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Flame,
.alphabeticalOrder = 25,
.enabled = FALSE,
},
{
.text = gEasyChatWord_Gold,
.alphabeticalOrder = 10,
.enabled = FALSE,
},
{
.text = gEasyChatWord_Leaf,
.alphabeticalOrder = 2,
.enabled = FALSE,
},
{
.text = gEasyChatWord_Silver,
.alphabeticalOrder = 11,
.enabled = FALSE,
},
{
.text = gEasyChatWord_Emerald,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
};
+201
View File
@@ -0,0 +1,201 @@
const u8 gEasyChatWord_KthxBye[] = _("KTHX, BYE.");
const u8 gEasyChatWord_YesSirExcl[] = _("YES, SIR!");
const u8 gEasyChatWord_AvantGarde[] = _("AVANT GARDE");
const u8 gEasyChatWord_Couple[] = _("COUPLE");
const u8 gEasyChatWord_MuchObliged[] = _("MUCH OBLIGED");
const u8 gEasyChatWord_YeehawExcl[] = _("YEEHAW!");
const u8 gEasyChatWord_Mega[] = _("MEGA");
const u8 gEasyChatWord_1HitKOExcl[] = _("1-HIT KO!");
const u8 gEasyChatWord_Destiny[] = _("DESTINY");
const u8 gEasyChatWord_Cancel[] = _("CANCEL");
const u8 gEasyChatWord_New[] = _("NEW");
const u8 gEasyChatWord_Flatten[] = _("FLATTEN");
const u8 gEasyChatWord_Kidding[] = _("KIDDING");
const u8 gEasyChatWord_Loser[] = _("LOSER");
const u8 gEasyChatWord_Losing[] = _("LOSING");
const u8 gEasyChatWord_Happening[] = _("HAPPENING");
const u8 gEasyChatWord_HipAnd[] = _("HIP AND");
const u8 gEasyChatWord_Shake[] = _("SHAKE");
const u8 gEasyChatWord_Shady[] = _("SHADY");
const u8 gEasyChatWord_Upbeat[] = _("UPBEAT");
const u8 gEasyChatWord_Modern[] = _("MODERN");
const u8 gEasyChatWord_SmellYa[] = _("SMELL YA");
const u8 gEasyChatWord_Bang[] = _("BANG");
const u8 gEasyChatWord_Knockout[] = _("KNOCKOUT");
const u8 gEasyChatWord_Hassle[] = _("HASSLE");
const u8 gEasyChatWord_Winner[] = _("WINNER");
const u8 gEasyChatWord_Fever[] = _("FEVER");
const u8 gEasyChatWord_Wannabe[] = _("WANNABE");
const u8 gEasyChatWord_Baby[] = _("BABY");
const u8 gEasyChatWord_Heart[] = _("HEART");
const u8 gEasyChatWord_Old[] = _("OLD");
const u8 gEasyChatWord_Young[] = _("YOUNG");
const u8 gEasyChatWord_Ugly[] = _("UGLY");
const struct EasyChatWordInfo gEasyChatGroup_TrendySaying[] = {
{
.text = gEasyChatWord_KthxBye,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_YesSirExcl,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_AvantGarde,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Couple,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_MuchObliged,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_YeehawExcl,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mega,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_1HitKOExcl,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Destiny,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Cancel,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_New,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Flatten,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Kidding,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Loser,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Losing,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Happening,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_HipAnd,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Shake,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Shady,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Upbeat,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Modern,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_SmellYa,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Bang,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Knockout,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hassle,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Winner,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fever,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wannabe,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Baby,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Heart,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Old,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Young,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ugly,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
};
+381
View File
@@ -0,0 +1,381 @@
const u8 gEasyChatWord_Excl[] = _("!");
const u8 gEasyChatWord_ExclExcl[] = _("!!");
const u8 gEasyChatWord_QuesExcl[] = _("?!");
const u8 gEasyChatWord_Ques[] = _("?");
const u8 gEasyChatWord_Ellipsis[] = _("");
const u8 gEasyChatWord_EllipsisExcl[] = _("…!");
const u8 gEasyChatWord_EllipsisEllipsisEllipsis[] = _("………");
const u8 gEasyChatWord_Dash[] = _("-");
const u8 gEasyChatWord_DashDashDash[] = _("- - -");
const u8 gEasyChatWord_UhOh[] = _("UH-OH");
const u8 gEasyChatWord_Waaah[] = _("WAAAH");
const u8 gEasyChatWord_Ahaha[] = _("AHAHA");
const u8 gEasyChatWord_OhQues[] = _("OH?");
const u8 gEasyChatWord_Nope[] = _("NOPE");
const u8 gEasyChatWord_Urgh[] = _("URGH");
const u8 gEasyChatWord_Hmm[] = _("HMM");
const u8 gEasyChatWord_Whoah[] = _("WHOAH");
const u8 gEasyChatWord_WroooaarExcl[] = _("WROOOAAR!");
const u8 gEasyChatWord_Wow[] = _("WOW");
const u8 gEasyChatWord_Giggle[] = _("GIGGLE");
const u8 gEasyChatWord_Sigh[] = _("SIGH");
const u8 gEasyChatWord_Unbelievable[] = _("UNBELIEVABLE");
const u8 gEasyChatWord_Cries[] = _("CRIES");
const u8 gEasyChatWord_Agree[] = _("AGREE");
const u8 gEasyChatWord_EhQues[] = _("EH?");
const u8 gEasyChatWord_Cry[] = _("CRY");
const u8 gEasyChatWord_Ehehe[] = _("EHEHE");
const u8 gEasyChatWord_OiOiOi[] = _("OI, OI, OI");
const u8 gEasyChatWord_OhYeah[] = _("OH, YEAH");
const u8 gEasyChatWord_Oh[] = _("OH");
const u8 gEasyChatWord_Oops[] = _("OOPS");
const u8 gEasyChatWord_Shocked[] = _("SHOCKED");
const u8 gEasyChatWord_Eek[] = _("EEK");
const u8 gEasyChatWord_Graaah[] = _("GRAAAH");
const u8 gEasyChatWord_Gwahahaha[] = _("GWAHAHAHA");
const u8 gEasyChatWord_Way[] = _("WAY");
const u8 gEasyChatWord_Tch[] = _("TCH");
const u8 gEasyChatWord_Hehe[] = _("HEHE");
const u8 gEasyChatWord_Hah[] = _("HAH");
const u8 gEasyChatWord_Yup[] = _("YUP");
const u8 gEasyChatWord_Hahaha[] = _("HAHAHA");
const u8 gEasyChatWord_Aiyeeh[] = _("AIYEEH");
const u8 gEasyChatWord_Hiyah[] = _("HIYAH");
const u8 gEasyChatWord_Fufufu[] = _("FUFUFU");
const u8 gEasyChatWord_Lol[] = _("LOL");
const u8 gEasyChatWord_Snort[] = _("SNORT");
const u8 gEasyChatWord_Humph[] = _("HUMPH");
const u8 gEasyChatWord_Hehehe[] = _("HEHEHE");
const u8 gEasyChatWord_Heh[] = _("HEH");
const u8 gEasyChatWord_Hohoho[] = _("HOHOHO");
const u8 gEasyChatWord_UhHuh[] = _("UH-HUH");
const u8 gEasyChatWord_OhDear[] = _("OH, DEAR");
const u8 gEasyChatWord_Arrgh[] = _("ARRGH");
const u8 gEasyChatWord_Mufufu[] = _("MUFUFU");
const u8 gEasyChatWord_Mmm[] = _("MMM");
const u8 gEasyChatWord_OhKay[] = _("OH-KAY");
const u8 gEasyChatWord_Okay[] = _("OKAY");
const u8 gEasyChatWord_Lalala[] = _("LALALA");
const u8 gEasyChatWord_Yay[] = _("YAY");
const u8 gEasyChatWord_Aww[] = _("AWW");
const u8 gEasyChatWord_Wowee[] = _("WOWEE");
const u8 gEasyChatWord_Gwah[] = _("GWAH");
const u8 gEasyChatWord_Wahahaha[] = _("WAHAHAHA");
const struct EasyChatWordInfo gEasyChatGroup_Voices[] = {
{
.text = gEasyChatWord_Excl,
.alphabeticalOrder = 0,
.enabled = TRUE,
},
{
.text = gEasyChatWord_ExclExcl,
.alphabeticalOrder = 1,
.enabled = TRUE,
},
{
.text = gEasyChatWord_QuesExcl,
.alphabeticalOrder = 7,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ques,
.alphabeticalOrder = 8,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ellipsis,
.alphabeticalOrder = 4,
.enabled = TRUE,
},
{
.text = gEasyChatWord_EllipsisExcl,
.alphabeticalOrder = 5,
.enabled = TRUE,
},
{
.text = gEasyChatWord_EllipsisEllipsisEllipsis,
.alphabeticalOrder = 6,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Dash,
.alphabeticalOrder = 3,
.enabled = TRUE,
},
{
.text = gEasyChatWord_DashDashDash,
.alphabeticalOrder = 2,
.enabled = TRUE,
},
{
.text = gEasyChatWord_UhOh,
.alphabeticalOrder = 23,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Waaah,
.alphabeticalOrder = 11,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ahaha,
.alphabeticalOrder = 41,
.enabled = TRUE,
},
{
.text = gEasyChatWord_OhQues,
.alphabeticalOrder = 52,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Nope,
.alphabeticalOrder = 59,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Urgh,
.alphabeticalOrder = 22,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hmm,
.alphabeticalOrder = 25,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Whoah,
.alphabeticalOrder = 32,
.enabled = TRUE,
},
{
.text = gEasyChatWord_WroooaarExcl,
.alphabeticalOrder = 24,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wow,
.alphabeticalOrder = 26,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Giggle,
.alphabeticalOrder = 43,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Sigh,
.alphabeticalOrder = 19,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Unbelievable,
.alphabeticalOrder = 33,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Cries,
.alphabeticalOrder = 61,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Agree,
.alphabeticalOrder = 34,
.enabled = TRUE,
},
{
.text = gEasyChatWord_EhQues,
.alphabeticalOrder = 38,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Cry,
.alphabeticalOrder = 40,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Ehehe,
.alphabeticalOrder = 48,
.enabled = TRUE,
},
{
.text = gEasyChatWord_OiOiOi,
.alphabeticalOrder = 37,
.enabled = TRUE,
},
{
.text = gEasyChatWord_OhYeah,
.alphabeticalOrder = 47,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Oh,
.alphabeticalOrder = 42,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Oops,
.alphabeticalOrder = 15,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Shocked,
.alphabeticalOrder = 49,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Eek,
.alphabeticalOrder = 46,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Graaah,
.alphabeticalOrder = 57,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Gwahahaha,
.alphabeticalOrder = 44,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Way,
.alphabeticalOrder = 54,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Tch,
.alphabeticalOrder = 53,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hehe,
.alphabeticalOrder = 13,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hah,
.alphabeticalOrder = 29,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Yup,
.alphabeticalOrder = 51,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hahaha,
.alphabeticalOrder = 28,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Aiyeeh,
.alphabeticalOrder = 55,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hiyah,
.alphabeticalOrder = 12,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Fufufu,
.alphabeticalOrder = 27,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lol,
.alphabeticalOrder = 56,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Snort,
.alphabeticalOrder = 30,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Humph,
.alphabeticalOrder = 31,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hehehe,
.alphabeticalOrder = 20,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Heh,
.alphabeticalOrder = 45,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Hohoho,
.alphabeticalOrder = 36,
.enabled = TRUE,
},
{
.text = gEasyChatWord_UhHuh,
.alphabeticalOrder = 50,
.enabled = TRUE,
},
{
.text = gEasyChatWord_OhDear,
.alphabeticalOrder = 9,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Arrgh,
.alphabeticalOrder = 21,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mufufu,
.alphabeticalOrder = 14,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Mmm,
.alphabeticalOrder = 10,
.enabled = TRUE,
},
{
.text = gEasyChatWord_OhKay,
.alphabeticalOrder = 62,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Okay,
.alphabeticalOrder = 35,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Lalala,
.alphabeticalOrder = 16,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Yay,
.alphabeticalOrder = 18,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Aww,
.alphabeticalOrder = 60,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wowee,
.alphabeticalOrder = 17,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Gwah,
.alphabeticalOrder = 58,
.enabled = TRUE,
},
{
.text = gEasyChatWord_Wahahaha,
.alphabeticalOrder = 39,
.enabled = TRUE,
},
};
+137
View File
@@ -0,0 +1,137 @@
#include "easy_chat.h"
#include "easy_chat_group_pokemon.h"
#include "easy_chat_group_trainer.h"
#include "easy_chat_group_status.h"
#include "easy_chat_group_battle.h"
#include "easy_chat_group_greetings.h"
#include "easy_chat_group_people.h"
#include "easy_chat_group_voices.h"
#include "easy_chat_group_speech.h"
#include "easy_chat_group_endings.h"
#include "easy_chat_group_feelings.h"
#include "easy_chat_group_conditions.h"
#include "easy_chat_group_actions.h"
#include "easy_chat_group_lifestyle.h"
#include "easy_chat_group_hobbies.h"
#include "easy_chat_group_time.h"
#include "easy_chat_group_misc.h"
#include "easy_chat_group_adjectives.h"
#include "easy_chat_group_events.h"
#include "easy_chat_group_move_1.h"
#include "easy_chat_group_move_2.h"
#include "easy_chat_group_trendy_saying.h"
#include "easy_chat_group_pokemon2.h"
const struct EasyChatGroup gEasyChatGroups[] = {
{
.wordData = {.valueList = gEasyChatGroup_Pokemon},
.numWords = 202,
.numEnabledWords = 202,
},
{
.wordData = {.words = gEasyChatGroup_Trainer},
.numWords = 27,
.numEnabledWords = 21,
},
{
.wordData = {.words = gEasyChatGroup_Status},
.numWords = 109,
.numEnabledWords = 109,
},
{
.wordData = {.words = gEasyChatGroup_Battle},
.numWords = 63,
.numEnabledWords = 63,
},
{
.wordData = {.words = gEasyChatGroup_Greetings},
.numWords = 42,
.numEnabledWords = 42,
},
{
.wordData = {.words = gEasyChatGroup_People},
.numWords = 75,
.numEnabledWords = 75,
},
{
.wordData = {.words = gEasyChatGroup_Voices},
.numWords = 63,
.numEnabledWords = 63,
},
{
.wordData = {.words = gEasyChatGroup_Speech},
.numWords = 60,
.numEnabledWords = 60,
},
{
.wordData = {.words = gEasyChatGroup_Endings},
.numWords = 69,
.numEnabledWords = 69,
},
{
.wordData = {.words = gEasyChatGroup_Feelings},
.numWords = 69,
.numEnabledWords = 69,
},
{
.wordData = {.words = gEasyChatGroup_Conditions},
.numWords = 69,
.numEnabledWords = 69,
},
{
.wordData = {.words = gEasyChatGroup_Actions},
.numWords = 78,
.numEnabledWords = 78,
},
{
.wordData = {.words = gEasyChatGroup_Lifestyle},
.numWords = 45,
.numEnabledWords = 45,
},
{
.wordData = {.words = gEasyChatGroup_Hobbies},
.numWords = 54,
.numEnabledWords = 54,
},
{
.wordData = {.words = gEasyChatGroup_Time},
.numWords = 45,
.numEnabledWords = 45,
},
{
.wordData = {.words = gEasyChatGroup_Misc},
.numWords = 42,
.numEnabledWords = 42,
},
{
.wordData = {.words = gEasyChatGroup_Adjectives},
.numWords = 36,
.numEnabledWords = 36,
},
{
.wordData = {.words = gEasyChatGroup_Events},
.numWords = 29,
.numEnabledWords = 29,
},
{
.wordData = {.valueList = gEasyChatGroup_Move1},
.numWords = 154,
.numEnabledWords = 154,
},
{
.wordData = {.valueList = gEasyChatGroup_Move2},
.numWords = 200,
.numEnabledWords = 200,
},
{
.wordData = {.words = gEasyChatGroup_TrendySaying},
.numWords = 33,
.numEnabledWords = 33,
},
{
.wordData = {.valueList = gEasyChatGroup_Pokemon2},
.numWords = 251,
.numEnabledWords = 251,
},
};
File diff suppressed because it is too large Load Diff
+16 -16
View File
@@ -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
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -146,10 +146,10 @@ const u8 gFacilityClassToTrainerClass[] =
[FACILITY_CLASS_TWINS] = TRAINER_CLASS_TWINS,
[FACILITY_CLASS_SAILOR] = TRAINER_CLASS_SAILOR,
[FACILITY_CLASS_WALLY] = TRAINER_CLASS_PKMN_TRAINER_3,
[FACILITY_CLASS_MAY] = TRAINER_CLASS_PKMN_TRAINER_3,
[FACILITY_CLASS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_3,
[FACILITY_CLASS_BRENDAN_2] = TRAINER_CLASS_PKMN_TRAINER_3,
[FACILITY_CLASS_BRENDAN_3] = TRAINER_CLASS_PKMN_TRAINER_3,
[FACILITY_CLASS_BRENDAN] = TRAINER_CLASS_PKMN_TRAINER_3,
[FACILITY_CLASS_MAY] = TRAINER_CLASS_PKMN_TRAINER_3,
[FACILITY_CLASS_MAY_2] = TRAINER_CLASS_PKMN_TRAINER_3,
[FACILITY_CLASS_MAY_3] = TRAINER_CLASS_PKMN_TRAINER_3,
[FACILITY_CLASS_PKMN_BREEDER_M] = TRAINER_CLASS_PKMN_BREEDER,
+6 -6
View File
@@ -70,13 +70,13 @@ const union AnimCmd gAnimCmd_RubySapphireMay_1[] =
const union AnimCmd *const gTrainerBackAnims_Brendan[] =
{
AnimCmd_82FF540,
gAnimCmd_General_Frame3,
gAnimCmd_Brendan_1,
};
const union AnimCmd *const gTrainerBackAnims_May[] =
{
AnimCmd_82FF540,
gAnimCmd_General_Frame3,
gAnimCmd_May_Steven_1,
};
@@ -94,25 +94,25 @@ const union AnimCmd *const gTrainerBackAnims_Leaf[] =
const union AnimCmd *const gTrainerBackAnims_RubySapphireBrendan[] =
{
AnimCmd_82FF540,
gAnimCmd_General_Frame3,
gAnimCmd_RubySapphireBrendan_1,
};
const union AnimCmd *const gTrainerBackAnims_RubySapphireMay[] =
{
AnimCmd_82FF540,
gAnimCmd_General_Frame3,
gAnimCmd_RubySapphireMay_1,
};
const union AnimCmd *const gTrainerBackAnims_Wally[] =
{
AnimCmd_82FF540,
gAnimCmd_General_Frame3,
gAnimCmd_Wally_1,
};
const union AnimCmd *const gTrainerBackAnims_Steven[] =
{
AnimCmd_82FF540,
gAnimCmd_General_Frame3,
gAnimCmd_May_Steven_1,
};
+16 -16
View File
@@ -15,24 +15,24 @@ const struct MonCoords gTrainerBackPicCoords[] =
// the casts are so they'll play nice with the strict struct definition
const struct CompressedSpriteSheet gTrainerBackPicTable[] =
{
(const u32 *)gTrainerBackPic_Brendan, 0x2000, 0,
(const u32 *)gTrainerBackPic_May, 0x2000, 1,
(const u32 *)gTrainerBackPic_Red, 0x2800, 2,
(const u32 *)gTrainerBackPic_Leaf, 0x2800, 3,
(const u32 *)gTrainerBackPic_RubySapphireBrendan, 0x2000, 4,
(const u32 *)gTrainerBackPic_RubySapphireMay, 0x2000, 5,
(const u32 *)gTrainerBackPic_Wally, 0x2000, 6,
(const u32 *)gTrainerBackPic_Steven, 0x2000, 7,
(const u32 *)gTrainerBackPic_Brendan, 0x2000, TRAINER_BACK_PIC_BRENDAN,
(const u32 *)gTrainerBackPic_May, 0x2000, TRAINER_BACK_PIC_MAY,
(const u32 *)gTrainerBackPic_Red, 0x2800, TRAINER_BACK_PIC_RED,
(const u32 *)gTrainerBackPic_Leaf, 0x2800, TRAINER_BACK_PIC_LEAF,
(const u32 *)gTrainerBackPic_RubySapphireBrendan, 0x2000, TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN,
(const u32 *)gTrainerBackPic_RubySapphireMay, 0x2000, TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY,
(const u32 *)gTrainerBackPic_Wally, 0x2000, TRAINER_BACK_PIC_WALLY,
(const u32 *)gTrainerBackPic_Steven, 0x2000, TRAINER_BACK_PIC_STEVEN,
};
const struct CompressedSpritePalette gTrainerBackPicPaletteTable[] =
{
gTrainerPalette_Brendan, 0,
gTrainerPalette_May, 1,
gTrainerBackPicPalette_Red, 2,
gTrainerBackPicPalette_Leaf, 3,
gTrainerPalette_RubySapphireBrendan, 4,
gTrainerPalette_RubySapphireMay, 5,
gTrainerPalette_Wally, 6,
gTrainerPalette_Steven, 7,
gTrainerPalette_Brendan, TRAINER_BACK_PIC_BRENDAN,
gTrainerPalette_May, TRAINER_BACK_PIC_MAY,
gTrainerBackPicPalette_Red, TRAINER_BACK_PIC_RED,
gTrainerBackPicPalette_Leaf, TRAINER_BACK_PIC_LEAF,
gTrainerPalette_RubySapphireBrendan, TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN,
gTrainerPalette_RubySapphireMay, TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY,
gTrainerPalette_Wally, TRAINER_BACK_PIC_WALLY,
gTrainerPalette_Steven, TRAINER_BACK_PIC_STEVEN,
};
+9 -9
View File
@@ -40,7 +40,7 @@ const struct SpriteFrameImage gUnknown_082FF408[] =
gHeap + 0xF800, 0x800,
};
const struct SpriteFrameImage gUnknown_082FF428[] =
const struct SpriteFrameImage gTrainerBackPicTable_Brendan[] =
{
gTrainerBackPic_Brendan, 0x0800,
gTrainerBackPic_Brendan + 0x0800, 0x0800,
@@ -48,7 +48,7 @@ const struct SpriteFrameImage gUnknown_082FF428[] =
gTrainerBackPic_Brendan + 0x1800, 0x0800,
};
const struct SpriteFrameImage gUnknown_082FF448[] =
const struct SpriteFrameImage gTrainerBackPicTable_May[] =
{
gTrainerBackPic_May, 0x0800,
gTrainerBackPic_May + 0x0800, 0x0800,
@@ -56,7 +56,7 @@ const struct SpriteFrameImage gUnknown_082FF448[] =
gTrainerBackPic_May + 0x1800, 0x0800,
};
const struct SpriteFrameImage gUnknown_082FF468[] =
const struct SpriteFrameImage gTrainerBackPicTable_Red[] =
{
gTrainerBackPic_Red, 0x0800,
gTrainerBackPic_Red + 0x0800, 0x0800,
@@ -65,7 +65,7 @@ const struct SpriteFrameImage gUnknown_082FF468[] =
gTrainerBackPic_Red + 0x2000, 0x0800,
};
const struct SpriteFrameImage gUnknown_082FF490[] =
const struct SpriteFrameImage gTrainerBackPicTable_Leaf[] =
{
gTrainerBackPic_Leaf, 0x0800,
gTrainerBackPic_Leaf + 0x0800, 0x0800,
@@ -74,7 +74,7 @@ const struct SpriteFrameImage gUnknown_082FF490[] =
gTrainerBackPic_Leaf + 0x2000, 0x0800,
};
const struct SpriteFrameImage gUnknown_082FF4B8[] =
const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireBrendan[] =
{
gTrainerBackPic_RubySapphireBrendan, 0x0800,
gTrainerBackPic_RubySapphireBrendan + 0x0800, 0x0800,
@@ -82,7 +82,7 @@ const struct SpriteFrameImage gUnknown_082FF4B8[] =
gTrainerBackPic_RubySapphireBrendan + 0x1800, 0x0800,
};
const struct SpriteFrameImage gUnknown_082FF4D8[] =
const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireMay[] =
{
gTrainerBackPic_RubySapphireMay, 0x0800,
gTrainerBackPic_RubySapphireMay + 0x0800, 0x0800,
@@ -90,7 +90,7 @@ const struct SpriteFrameImage gUnknown_082FF4D8[] =
gTrainerBackPic_RubySapphireMay + 0x1800, 0x0800,
};
const struct SpriteFrameImage gUnknown_082FF4F8[] =
const struct SpriteFrameImage gTrainerBackPicTable_Wally[] =
{
gTrainerBackPic_Wally, 0x0800,
gTrainerBackPic_Wally + 0x0800, 0x0800,
@@ -98,7 +98,7 @@ const struct SpriteFrameImage gUnknown_082FF4F8[] =
gTrainerBackPic_Wally + 0x1800, 0x0800,
};
const struct SpriteFrameImage gUnknown_082FF518[] =
const struct SpriteFrameImage gTrainerBackPicTable_Steven[] =
{
gTrainerBackPic_Steven, 0x0800,
gTrainerBackPic_Steven + 0x0800, 0x0800,
@@ -112,7 +112,7 @@ const union AnimCmd gAnimCmd_General_Frame0[] =
ANIMCMD_END,
};
const union AnimCmd AnimCmd_82FF540[] =
const union AnimCmd gAnimCmd_General_Frame3[] =
{
ANIMCMD_FRAME(3, 0),
ANIMCMD_END,
+6 -6
View File
@@ -1244,22 +1244,22 @@ static void DaycarePrintMonInfo(u8 windowId, s32 daycareSlotId, u8 y)
static void Task_HandleDaycareLevelMenuInput(u8 taskId)
{
u32 var = ListMenuHandleInputGetItemId(gTasks[taskId].tMenuListTaskId);
u32 input = ListMenu_ProcessInput(gTasks[taskId].tMenuListTaskId);
if (gMain.newKeys & A_BUTTON)
{
switch (var)
switch (input)
{
case 0:
case 1:
gSpecialVar_Result = var;
gSpecialVar_Result = input;
break;
case 5:
gSpecialVar_Result = 2;
break;
}
DestroyListMenuTask(gTasks[taskId].tMenuListTaskId, NULL, NULL);
sub_819746C(gTasks[taskId].tWindowId, TRUE);
ClearStdWindowAndFrame(gTasks[taskId].tWindowId, TRUE);
RemoveWindow(gTasks[taskId].tWindowId);
DestroyTask(taskId);
EnableBothScriptContexts();
@@ -1268,7 +1268,7 @@ static void Task_HandleDaycareLevelMenuInput(u8 taskId)
{
gSpecialVar_Result = 2;
DestroyListMenuTask(gTasks[taskId].tMenuListTaskId, NULL, NULL);
sub_819746C(gTasks[taskId].tWindowId, TRUE);
ClearStdWindowAndFrame(gTasks[taskId].tWindowId, TRUE);
RemoveWindow(gTasks[taskId].tWindowId);
DestroyTask(taskId);
EnableBothScriptContexts();
@@ -1283,7 +1283,7 @@ void ShowDaycareLevelMenu(void)
u8 daycareMenuTaskId;
windowId = AddWindow(&sDaycareLevelMenuWindowTemplate);
NewMenuHelpers_DrawStdWindowFrame(windowId, FALSE);
DrawStdWindowFrame(windowId, FALSE);
menuTemplate = sDaycareListMenuLevelTemplate;
menuTemplate.windowId = windowId;
+46 -44
View File
@@ -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[] = {
@@ -463,14 +465,14 @@ u8 sub_81269D4(u8 idx)
{
*winidx = AddWindow(&gUnknown_085A6B90[idx]);
}
SetWindowBorderStyle(*winidx, 0, 0x214, 0xe);
DrawStdFrameWithCustomTileAndPalette(*winidx, 0, 0x214, 0xe);
schedule_bg_copy_tilemap_to_vram(0);
return *winidx;
}
void sub_8126A58(u8 idx)
{
sub_8198070(sDecorMenuWindowIndices[idx], FALSE);
ClearStdWindowAndFrameToTransparent(sDecorMenuWindowIndices[idx], FALSE);
ClearWindowTilemap(sDecorMenuWindowIndices[idx]);
RemoveWindow(sDecorMenuWindowIndices[idx]);
schedule_bg_copy_tilemap_to_vram(0);
@@ -526,14 +528,14 @@ void sub_8126B80(u8 taskId)
PlaySE(SE_SELECT);
sSecretBasePCMenuActions[sSecretBasePCMenuCursorPos].func.void_u8(taskId);
break;
case -2:
case MENU_NOTHING_CHOSEN:
sSecretBasePCMenuCursorPos = Menu_GetCursorPos();
if ((s8)menuPos != sSecretBasePCMenuCursorPos)
{
sub_8126C08();
}
break;
case -1:
case MENU_B_PRESSED:
PlaySE(SE_SELECT);
SecretBasePC_Cancel(taskId);
break;
@@ -543,7 +545,7 @@ void sub_8126B80(u8 taskId)
void sub_8126C08(void)
{
FillWindowPixelBuffer(0, 0x11);
FillWindowPixelBuffer(0, PIXEL_FILL(1));
AddTextPrinterParameterized2(0, 1, sSecretBasePCMenuItemDescriptions[sSecretBasePCMenuCursorPos], 0, 0, 2, 1, 3);
}
@@ -572,7 +574,7 @@ void SecretBasePC_PutAway(u8 taskId)
else
{
sub_8126A58(0);
sub_8197434(0, 0);
ClearDialogWindowAndFrame(0, 0);
FadeScreen(1, 0);
gTasks[taskId].data[2] = 0;
gTasks[taskId].func = sub_8129ABC;
@@ -617,7 +619,7 @@ void sub_8126DA4(u8 taskId)
void SecretBasePC_PrepMenuForSelectingStoredDecors(u8 taskId)
{
LoadPalette(gUnknown_085A6BB0, 0xd0, 0x20);
sub_8197434(0, 0);
ClearDialogWindowAndFrame(0, 0);
sub_8126A58(0);
sub_8126DFC(taskId);
}
@@ -634,7 +636,7 @@ void sub_8126DFC(u8 taskId)
void sub_8126E44(u8 taskId)
{
FillWindowPixelBuffer(sDecorMenuWindowIndices[1], 0x11);
FillWindowPixelBuffer(sDecorMenuWindowIndices[1], PIXEL_FILL(1));
sub_8126E8C(taskId);
InitMenuInUpperLeftCornerPlaySoundWhenAPressed(sDecorMenuWindowIndices[1], 9, sCurDecorationCategory);
gTasks[taskId].func = sub_8127088;
@@ -713,12 +715,12 @@ void sub_8127088(u8 taskId)
input = Menu_ProcessInput();
switch (input)
{
case -1:
case MENU_B_PRESSED:
case 8:
PlaySE(SE_SELECT);
sub_812719C(taskId);
break;
case -2:
case MENU_NOTHING_CHOSEN:
break;
default:
PlaySE(SE_SELECT);
@@ -751,7 +753,7 @@ void sub_81270E8(u8 taskId)
void sub_8127180(u8 taskId)
{
sub_8197434(0, 0);
ClearDialogWindowAndFrame(0, 0);
sub_8126DFC(taskId);
}
@@ -771,7 +773,7 @@ void sub_81271CC(u8 taskId)
{
sub_8126A58(1);
sub_8126A88();
NewMenuHelpers_DrawDialogueFrame(0, 0);
DrawDialogueFrame(0, 0);
sub_8126C08();
gTasks[taskId].func = sub_8126B80;
}
@@ -779,7 +781,7 @@ void sub_81271CC(u8 taskId)
void sub_8127208(u8 taskId)
{
LoadPalette(gUnknown_085A6BB0, 0xd0, 0x20);
sub_8197434(0, 0);
ClearDialogWindowAndFrame(0, 0);
gTasks[taskId].data[11] = 2;
sCurDecorationCategory = DECORCAT_DESK;
sub_8126DFC(taskId);
@@ -933,13 +935,13 @@ void sub_812764C(u8 taskId)
data = gTasks[taskId].data;
if (!gPaletteFade.active)
{
input = ListMenuHandleInputGetItemId(data[13]);
input = ListMenu_ProcessInput(data[13]);
ListMenuGetScrollAndRow(data[13], &sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo);
switch (input)
{
case -1:
case LIST_NOTHING_CHOSEN:
break;
case -2:
case LIST_CANCEL:
PlaySE(SE_SELECT);
SecretBasePC_SelectedDecorActions[data[11]][1](taskId);
break;
@@ -968,7 +970,7 @@ void sub_8127744(u32 a0)
const u8 *txt;
winidx = sDecorMenuWindowIndices[3];
FillWindowPixelBuffer(winidx, 0x11);
FillWindowPixelBuffer(winidx, PIXEL_FILL(1));
if (a0 >= sCurDecorCatCount)
{
txt = gText_GoBackPrevMenu;
@@ -1095,7 +1097,7 @@ void sub_8127A14(u8 taskId)
void sub_8127A30(u8 taskId)
{
sub_8197434(0, 0);
ClearDialogWindowAndFrame(0, 0);
gTasks[taskId].func = sub_8127A14;
}
@@ -1103,7 +1105,7 @@ void sub_8127A5C(u8 taskId)
{
if (gMain.newKeys & (A_BUTTON | B_BUTTON))
{
sub_8197434(0, 0);
ClearDialogWindowAndFrame(0, 0);
sub_81269D4(1);
sub_8127620(taskId);
}
@@ -1158,7 +1160,7 @@ void sub_8127B90(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, u16 decor)
u16 i;
u16 j;
u16 behavior;
u16 flags;
u16 impassableFlag;
u16 v0;
u16 v1;
s16 decLeft;
@@ -1173,11 +1175,11 @@ void sub_8127B90(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, u16 decor)
behavior = GetBehaviorByMetatileId(0x200 + gDecorations[decor].tiles[i * decWidth + j]);
if (MetatileBehavior_IsSecretBaseImpassable(behavior) == TRUE || (gDecorations[decor].permission != DECORPERM_PASS_FLOOR && (behavior >> 12)))
{
flags = 0xc00;
impassableFlag = METATILE_COLLISION_MASK;
}
else
{
flags = 0x000;
impassableFlag = 0x000;
}
if (gDecorations[decor].permission != DECORPERM_NA_WALL && MetatileBehavior_IsSecretBaseNorthWall(MapGridGetMetatileBehaviorAt(decLeft, decBottom)) == TRUE)
{
@@ -1190,11 +1192,11 @@ void sub_8127B90(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, u16 decor)
v1 = sub_8127B54(gDecorations[decor].id, i * decWidth + j);
if (v1 != 0xFFFF)
{
MapGridSetMetatileEntryAt(decLeft, decBottom, (gDecorations[decor].tiles[i * decWidth + j] + (0x200 | v0)) | flags | v1);
MapGridSetMetatileEntryAt(decLeft, decBottom, (gDecorations[decor].tiles[i * decWidth + j] + (0x200 | v0)) | impassableFlag | v1);
}
else
{
MapGridSetMetatileIdAt(decLeft, decBottom, (gDecorations[decor].tiles[i * decWidth + j] + (0x200 | v0)) | flags);
MapGridSetMetatileIdAt(decLeft, decBottom, (gDecorations[decor].tiles[i * decWidth + j] + (0x200 | v0)) | impassableFlag);
}
}
}
@@ -1244,17 +1246,17 @@ void sub_8127E18(void)
for (i = 0; i < 14; i ++)
{
if (FlagGet(0xAE + i) == TRUE)
if (FlagGet(FLAG_DECORATION_1 + i) == TRUE)
{
FlagClear(0xAE + i);
FlagClear(FLAG_DECORATION_1 + i);
for (j = 0; j < gMapHeader.events->eventObjectCount; j ++)
{
if (gMapHeader.events->eventObjects[j].flagId == 0xAE + i)
if (gMapHeader.events->eventObjects[j].flagId == FLAG_DECORATION_1 + i)
{
break;
}
}
VarSet(0x3F20 + gMapHeader.events->eventObjects[j].graphicsId, sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]);
VarSet(UNKNOWN_VAR_OFFSET_3F20 + gMapHeader.events->eventObjects[j].graphicsId, sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]);
gSpecialVar_0x8005 = gMapHeader.events->eventObjects[j].localId;
gSpecialVar_0x8006 = sCurDecorMapX;
gSpecialVar_0x8007 = sCurDecorMapY;
@@ -1502,7 +1504,7 @@ bool8 sub_812853C(u8 taskId, const struct Decoration *decoration)
{
curX = gTasks[taskId].data[0] + j;
behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY);
behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & 0xf000;
behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & METATILE_ELEVATION_MASK;
if (!sub_81284F4(behaviorAt, decoration))
{
return FALSE;
@@ -1527,7 +1529,7 @@ bool8 sub_812853C(u8 taskId, const struct Decoration *decoration)
{
curX = gTasks[taskId].data[0] + j;
behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY);
behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & 0xf000;
behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & METATILE_ELEVATION_MASK;
if (!MetatileBehavior_IsNormal(behaviorAt) && !sub_8128484(behaviorAt, behaviorBy))
{
return FALSE;
@@ -1547,7 +1549,7 @@ bool8 sub_812853C(u8 taskId, const struct Decoration *decoration)
{
curX = gTasks[taskId].data[0] + j;
behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY);
behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[j]) & 0xf000;
behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[j]) & METATILE_ELEVATION_MASK;
if (!MetatileBehavior_IsNormal(behaviorAt) && !MetatileBehavior_IsSecretBaseNorthWall(behaviorAt))
{
return FALSE;
@@ -1628,13 +1630,13 @@ void sub_8128950(u8 taskId)
void sub_81289D0(u8 taskId)
{
DisplayYesNoMenu();
DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(taskId, &gUnknown_085A72C4);
}
void sub_81289F0(u8 taskId)
{
sub_8197434(0, 0);
ClearDialogWindowAndFrame(0, 0);
sub_8128AAC(taskId);
if (gDecorations[gCurDecorInventoryItems[gCurDecorationIndex]].permission != DECORPERM_SOLID_MAT)
{
@@ -1693,13 +1695,13 @@ void sub_8128AAC(u8 taskId)
void sub_8128B80(u8 taskId)
{
DisplayYesNoMenu();
DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(taskId, &gUnknown_085A72CC);
}
void sub_8128BA0(u8 taskId)
{
sub_8197434(0, 0);
ClearDialogWindowAndFrame(0, 0);
sub_8128BBC(taskId);
}
@@ -1887,7 +1889,7 @@ void sub_8128E18(u8 taskId)
void sub_8128FD8(u8 taskId)
{
sub_8197434(0, 1);
ClearDialogWindowAndFrame(0, 1);
gSprites[sDecor_CameraSpriteObjectIdx1].data[7] = 0;
gTasks[taskId].data[10] = 0;
gTasks[taskId].func = sub_8128E18;
@@ -2251,7 +2253,7 @@ void sub_81298EC(u8 taskId)
if (!gPaletteFade.active) {
DrawWholeMapView();
ScriptContext1_SetupScript(EventScript_275D2E);
sub_8197434(0, 1);
ClearDialogWindowAndFrame(0, 1);
gTasks[taskId].data[2] = 2;
}
break;
@@ -2343,7 +2345,7 @@ void sub_8129ABC(u8 taskId)
void sub_8129B34(u8 taskId)
{
sub_8197434(0, 1);
ClearDialogWindowAndFrame(0, 1);
gSprites[sDecor_CameraSpriteObjectIdx1].data[7] = 0;
gSprites[sDecor_CameraSpriteObjectIdx1].invisible = FALSE;
gSprites[sDecor_CameraSpriteObjectIdx1].callback = sub_812A36C;
@@ -2588,7 +2590,7 @@ void sub_812A0E8(u8 taskId)
void sub_812A1A0(u8 taskId)
{
DisplayYesNoMenu();
DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(taskId, &gUnknown_085A7348);
}
@@ -2601,13 +2603,13 @@ void sub_812A1C0(u8 taskId)
void sub_812A1F0(u8 taskId)
{
DisplayYesNoMenu();
DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(taskId, &gUnknown_085A7350);
}
void sub_812A210(u8 taskId)
{
sub_8197434(0, 0);
ClearDialogWindowAndFrame(0, 0);
sub_812A22C(taskId);
}
@@ -2671,7 +2673,7 @@ void sub_812A334(void)
u8 taskId;
pal_fill_black();
NewMenuHelpers_DrawDialogueFrame(0, 1);
DrawDialogueFrame(0, 1);
sub_8126ABC();
taskId = CreateTask(sub_812A2C4, 8);
gTasks[taskId].data[2] = 0;
@@ -2725,7 +2727,7 @@ void sub_812A3D4(u8 taskId)
void sub_812A458(u8 taskId)
{
DisplayYesNoMenu();
DisplayYesNoMenuDefaultYes();
DoYesNoFuncWithChoice(taskId, &gUnknown_085A741C);
}
+2 -2
View File
@@ -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;
+2 -3
View File
@@ -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[];
@@ -197,7 +196,7 @@ static void InitDiplomaWindow(void)
InitWindows(sDiplomaWinTemplates);
DeactivateAllTextPrinters();
LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
FillWindowPixelBuffer(0, 0);
FillWindowPixelBuffer(0, PIXEL_FILL(0));
PutWindowTilemap(0);
}
+3 -3
View File
@@ -5,8 +5,6 @@
#include "trig.h"
#include "constants/rgb.h"
extern u16 gUnknown_0203A100[];
void sub_8113064(struct Sprite *);
void sub_81131B4(struct Sprite *);
void sub_8113224(struct Sprite *);
@@ -17,6 +15,8 @@ static void sub_81134B8(u8);
static void sub_8113574(struct Task *);
static void sub_811369C(struct Sprite *);
EWRAM_DATA static u16 gUnknown_0203A100[7] = {0};
const union AnimCmd gUnknown_08596E60[] =
{
ANIMCMD_FRAME(0, 4),
@@ -209,7 +209,7 @@ void sub_8113064(struct Sprite *sprite)
sprite->data[5] = gBattleAnimArgs[5];
sprite->invisible = 1;
StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
sprite->callback = sub_80A66DC;
sprite->callback = TranslateSpriteLinearAndFlicker;
}
static void sub_8113100(struct Sprite *sprite)
+5171 -434
View File
File diff suppressed because it is too large Load Diff
+9 -9
View File
@@ -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,
@@ -469,7 +469,7 @@ static void Task_EggHatch(u8 taskID)
{
CleanupOverworldWindowsAndTilemaps();
SetMainCallback2(CB2_EggHatch_0);
gFieldCallback = sub_80AF168;
gFieldCallback = FieldCallback_ReturnToEventScript2;
DestroyTask(taskID);
}
}
@@ -574,7 +574,7 @@ static void Task_EggHatchPlayBGM(u8 taskID)
if (gTasks[taskID].data[0] == 0)
{
StopMapMusic();
PlayRainSoundEffect();
PlayRainStoppingSoundEffect();
}
if (gTasks[taskID].data[0] == 1)
PlayBGM(MUS_ME_SHINKA);
@@ -606,7 +606,7 @@ static void CB2_EggHatch_1(void)
case 1:
if (!gPaletteFade.active)
{
FillWindowPixelBuffer(sEggHatchData->windowId, 0);
FillWindowPixelBuffer(sEggHatchData->windowId, PIXEL_FILL(0));
sEggHatchData->CB2_PalCounter = 0;
sEggHatchData->CB2_state++;
}
@@ -857,7 +857,7 @@ static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8
static void EggHatchPrintMessage(u8 windowId, u8* string, u8 x, u8 y, u8 speed)
{
FillWindowPixelBuffer(windowId, 0xFF);
FillWindowPixelBuffer(windowId, PIXEL_FILL(15));
sEggHatchData->textColor[0] = 0;
sEggHatchData->textColor[1] = 5;
sEggHatchData->textColor[2] = 6;
-3
View File
@@ -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 *);
+553
View File
@@ -0,0 +1,553 @@
#include "global.h"
#include "alloc.h"
#include "decompress.h"
#include "ereader_helpers.h"
#include "link.h"
#include "main.h"
#include "rom_8011DC0.h"
#include "save.h"
#include "sprite.h"
#include "task.h"
#include "util.h"
struct Unknown030012C8
{
u8 unk0[8];
u32 *unk8;
int unkC;
int unk10;
int unk14;
};
static void sub_81D4170(void);
static u16 sub_81D3EE8(u8);
static void sub_81D413C(void);
static void sub_81D414C(void);
static void sub_81D3F1C(u32, u32*, u32*);
static void sub_81D3F68(void);
extern struct Unknown030012C8 gUnknown_030012C8;
extern u16 gUnknown_030012E0;
extern u16 gUnknown_030012E2;
extern u16 gUnknown_030012E4;
extern u16 gUnknown_030012E6;
extern u32 gUnknown_030012E8;
extern u16 gUnknown_030012EC;
extern u16 gUnknown_030012EE;
extern u16 gUnknown_030012F0;
extern u16 gUnknown_030012F2;
extern u16 gUnknown_030012F4;
extern const u8 gUnknown_08625B6C[];
static u8 sub_81D38D4(void)
{
return (gSaveBlock1Ptr->trainerHill.unused + 1) % 256;
}
static bool32 sub_81D38FC(struct Unk81D38FC *arg0)
{
int checksum = CalcByteArraySum(arg0->unk0, 0x270);
if (checksum != arg0->checksum)
return FALSE;
return TRUE;
}
bool8 sub_81D3920(u8 *buffer)
{
u32 i;
u32 checksum;
int var0 = buffer[0];
if (var0 < 1 || var0 > 8)
return FALSE;
for (i = 0; i < var0; i++)
{
struct Unk81D38FC *var1 = (struct Unk81D38FC *)(&buffer[i * (sizeof(struct Unk81D38FC)) + 8]);
if (!sub_81D38FC(var1))
return FALSE;
}
checksum = CalcByteArraySum(buffer + 8, var0 * 0x274);
if (checksum != ((int *)buffer)[1])
return FALSE;
return TRUE;
}
static bool32 sub_81D396C(u8 *buffer)
{
u32 checksum;
int var0 = buffer[0];
if (var0 < 1 || var0 > 8)
return FALSE;
checksum = CalcByteArraySum(buffer + 8, 0xEE0);
if (checksum != ((int *)buffer)[1])
return FALSE;
return TRUE;
}
static bool32 sub_81D3998(struct Unk81D38FC *arg0, u8 *buffer2)
{
int i;
const u8 *ereaderVals;
memset(buffer2, 0, 0x1000);
buffer2[0] = arg0->unk0[0];
buffer2[1] = sub_81D38D4();
buffer2[2] = (arg0->unk0[0] + 1) / 2;
for (i = 0; i < arg0->unk0[0]; i++)
{
if (!(i & 1))
{
u8 *var0 = &buffer2[(i / 2) * 0x3B8];
u8 *var1 = arg0[i].unk0;
var0[8] = var1[8];
memcpy(&var0[0x29C], &var1[0x154], 0x124);
var0 += 0xC;
var1 += 0xC;
memcpy(var0, var1, 0x148);
}
else
{
u8 *var0 = &buffer2[(i / 2) * 0x3B8];
u8 *var1 = arg0[i].unk0;
var0[9] = var1[8];
memcpy(&var0[0x154], &var1[0xC], 0x148);
}
}
if (i & 1)
{
u8 *var0 = &buffer2[(i / 2) * 0x3B8];
var0 += 0x154;
ereaderVals = gUnknown_08625B6C;
memcpy(var0, &ereaderVals[(i / 2) * 0x148], 0x148);
}
((int *)buffer2)[1] = CalcByteArraySum(buffer2 + 8, 0xEE0);
if (sub_8153634(SECTOR_ID_TRAINER_HILL, buffer2) != 1)
return FALSE;
return TRUE;
}
bool32 sub_81D3AB0(struct Unk81D38FC *arg0)
{
u8 *var0 = AllocZeroed(0x1000);
bool32 result = sub_81D3998(arg0, var0);
Free(var0);
return result;
}
static bool32 sub_81D3AD8(u8 *arg0, u8 *arg1)
{
if (TryCopySpecialSaveSection(SECTOR_ID_TRAINER_HILL, arg1) != 1)
return FALSE;
memcpy(arg0, arg1, 0xEE8);
if (!sub_81D396C(arg0))
return FALSE;
return TRUE;
}
static bool32 sub_81D3B0C(u8 *arg0)
{
u8 *var0 = AllocZeroed(0x1000);
bool32 result = sub_81D3AD8(arg0, var0);
Free(var0);
return result;
}
bool32 sub_81D3B34(void)
{
u8 *var0 = AllocZeroed(0x1000);
bool32 result = sub_81D3B0C(var0);
Free(var0);
return result;
}
static int unref_sub_81D3B54(int arg0, u32 *arg1)
{
int result;
u16 var0;
int var1;
sub_81D41A0();
while (1)
{
sub_81D4170();
if (gUnknown_030012E2 & 2)
gShouldAdvanceLinkState = 2;
var1 = sub_81D3D70(1, arg0, arg1, NULL);
gUnknown_030012E4 = var1;
if ((gUnknown_030012E4 & 0x13) == 0x10)
{
result = 0;
break;
}
if (gUnknown_030012E4 & 0x8)
{
result = 1;
break;
}
var0 = gUnknown_030012E4 & 0x4;
if (var0)
{
result = 2;
break;
}
gShouldAdvanceLinkState = var0;
VBlankIntrWait();
}
CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8));
sub_81D41F4();
return result;
}
static int unref_sub_81D3BE8(u32 *arg0)
{
int result;
u16 var0;
int var1;
sub_81D41A0();
while (1)
{
sub_81D4170();
if (gUnknown_030012E2 & 2)
gShouldAdvanceLinkState = 2;
var1 = sub_81D3D70(0, 0, NULL, arg0);
gUnknown_030012E4 = var1;
if ((gUnknown_030012E4 & 0x13) == 0x10)
{
result = 0;
break;
}
if (gUnknown_030012E4 & 0x8)
{
result = 1;
break;
}
var0 = gUnknown_030012E4 & 0x4;
if (var0)
{
result = 2;
break;
}
gShouldAdvanceLinkState = var0;
VBlankIntrWait();
}
CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8));
sub_81D41F4();
return result;
}
static void sub_81D3C7C(void)
{
REG_IME = 0;
REG_IE &= ~(INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL);
REG_IME = 1;
REG_SIOCNT = 0;
REG_TM3CNT_H = 0;
REG_IF = INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL;
}
static void sub_81D3CBC(void)
{
REG_IME = 0;
REG_IE &= ~(INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL);
REG_IME = 1;
REG_RCNT = 0;
REG_SIOCNT = SIO_MULTI_MODE;
REG_SIOCNT |= SIO_INTR_ENABLE | SIO_115200_BPS;
REG_IME = 0;
REG_IE |= INTR_FLAG_SERIAL;
REG_IME = 1;
if (!gUnknown_030012C8.unk0[1])
CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8));
}
static void sub_81D3D34(void)
{
REG_RCNT = 0;
REG_SIOCNT = SIO_32BIT_MODE | SIO_INTR_ENABLE;
REG_SIOCNT |= SIO_MULTI_SD;
gShouldAdvanceLinkState = 0;
gUnknown_030012E6 = 0;
gUnknown_030012E8 = 0;
}
int sub_81D3D70(u8 arg0, u32 arg1, u32 *arg2, u32 *arg3)
{
switch (gUnknown_030012C8.unk0[1])
{
case 0:
sub_81D3CBC();
gUnknown_030012C8.unk0[2] = 1;
gUnknown_030012C8.unk0[1] = 1;
break;
case 1:
if (sub_81D3EE8(arg0))
sub_81D413C();
if (gShouldAdvanceLinkState == 2)
{
gUnknown_030012C8.unk0[4] = 2;
gUnknown_030012C8.unk0[1] = 6;
}
break;
case 2:
sub_81D3D34();
sub_81D3F1C(arg1, arg2, arg3);
gUnknown_030012C8.unk0[1] = 3;
// fall through
case 3:
if (gShouldAdvanceLinkState == 2)
{
gUnknown_030012C8.unk0[4] = 2;
gUnknown_030012C8.unk0[1] = 6;
}
else
{
gUnknown_030012E6++;
gUnknown_030012E8++;
if (!gUnknown_030012C8.unk0[0] && gUnknown_030012E8 > 60)
{
gUnknown_030012C8.unk0[4] = 1;
gUnknown_030012C8.unk0[1] = 6;
}
if (gUnknown_030012C8.unk0[2] != 2)
{
if (gUnknown_030012C8.unk0[0] && gUnknown_030012E6 > 2)
{
sub_81D413C();
gUnknown_030012C8.unk0[2] = 2;
}
else
{
sub_81D413C();
gUnknown_030012C8.unk0[2] = 2;
}
}
}
break;
case 4:
sub_81D3CBC();
gUnknown_030012C8.unk0[1] = 5;
break;
case 5:
if (gUnknown_030012C8.unk0[0] == 1 && gUnknown_030012E6 > 2)
sub_81D413C();
if (++gUnknown_030012E6 > 60)
{
gUnknown_030012C8.unk0[4] = 1;
gUnknown_030012C8.unk0[1] = 6;
}
break;
case 6:
if (gUnknown_030012C8.unk0[2])
{
sub_81D3C7C();
gUnknown_030012C8.unk0[2] = 0;
}
break;
}
return gUnknown_030012C8.unk0[2] | (gUnknown_030012C8.unk0[4] << 2) | (gUnknown_030012C8.unk0[3] << 4);
}
static u16 sub_81D3EE8(u8 arg0)
{
u16 terminal = (*(vu32 *)REG_ADDR_SIOCNT) & (SIO_MULTI_SI | SIO_MULTI_SD);
if (terminal == SIO_MULTI_SD && arg0)
{
gUnknown_030012C8.unk0[0] = 1;
return 1;
}
else
{
gUnknown_030012C8.unk0[0] = 0;
return 0;
}
}
static void sub_81D3F1C(u32 arg0, u32 *arg1, u32 *arg2)
{
if (gUnknown_030012C8.unk0[0])
{
REG_SIOCNT |= SIO_38400_BPS;
gUnknown_030012C8.unk8 = arg1;
REG_SIODATA32 = arg0;
gUnknown_030012C8.unk10 = arg0 / 4 + 1;
sub_81D3F68();
}
else
{
REG_SIOCNT = REG_SIOCNT;
gUnknown_030012C8.unk8 = arg2;
}
}
static void sub_81D3F68(void)
{
REG_TM3CNT_L = 0xFDA7;
REG_TM3CNT_H = TIMER_INTR_ENABLE;
REG_IME = 0;
REG_IE |= INTR_FLAG_TIMER3;
REG_IME = 1;
}
void sub_81D3F9C(void)
{
sub_81D414C();
sub_81D413C();
}
void sub_81D3FAC(void)
{
u16 i, playerCount, k;
u32 value;
u16 var0;
u16 recvBuffer[4];
switch (gUnknown_030012C8.unk0[1])
{
case 1:
REG_SIOMLT_SEND = 0xCCD0; // Handshake id
*(u64 *)recvBuffer = REG_SIOMLT_RECV;
for (i = 0, playerCount = 0, k = 0; i < 4; i++)
{
if (recvBuffer[i] == 0xCCD0)
playerCount++;
else if (recvBuffer[i] != 0xFFFF)
k++;
}
if (playerCount == 2 && k == 0)
gUnknown_030012C8.unk0[1] = 2;
break;
case 3:
value = REG_SIODATA32;
if (!gUnknown_030012C8.unkC && !gUnknown_030012C8.unk0[0])
gUnknown_030012C8.unk10 = value / 4 + 1;
if (gUnknown_030012C8.unk0[0] == 1)
{
if (gUnknown_030012C8.unkC < gUnknown_030012C8.unk10)
{
REG_SIODATA32 = gUnknown_030012C8.unk8[gUnknown_030012C8.unkC];
gUnknown_030012C8.unk14 += gUnknown_030012C8.unk8[gUnknown_030012C8.unkC];
}
else
{
REG_SIODATA32 = gUnknown_030012C8.unk14;
}
}
else
{
if (gUnknown_030012C8.unkC > 0 && gUnknown_030012C8.unkC < gUnknown_030012C8.unk10 + 1)
{
gUnknown_030012C8.unk8[gUnknown_030012C8.unkC - 1] = value;
gUnknown_030012C8.unk14 += value;
}
else if (gUnknown_030012C8.unkC)
{
if (gUnknown_030012C8.unk14 == value)
gUnknown_030012C8.unk0[3] = 1;
else
gUnknown_030012C8.unk0[3] = 2;
}
gUnknown_030012E8 = 0;
}
if (++gUnknown_030012C8.unkC < gUnknown_030012C8.unk10 + 2)
{
if (gUnknown_030012C8.unk0[0])
REG_TM3CNT_H |= TIMER_ENABLE;
else
sub_81D413C();
}
else
{
gUnknown_030012C8.unk0[1] = 4;
gUnknown_030012E6 = 0;
}
break;
case 5:
if (!gUnknown_030012C8.unk0[0])
REG_SIOMLT_SEND = gUnknown_030012C8.unk0[3];
*(u64 *)recvBuffer = REG_SIOMLT_RECV;
var0 = recvBuffer[1] - 1;
if (var0 < 2)
{
if (gUnknown_030012C8.unk0[0] == 1)
gUnknown_030012C8.unk0[3] = recvBuffer[1];
gUnknown_030012C8.unk0[1] = 6;
}
break;
}
}
static void sub_81D413C(void)
{
REG_SIOCNT |= SIO_ENABLE;
}
static void sub_81D414C(void)
{
REG_TM3CNT_H &= ~TIMER_ENABLE;
REG_TM3CNT_L = 0xFDA7;
}
static void sub_81D4170(void)
{
int keysMask = REG_KEYINPUT ^ KEYS_MASK;
gUnknown_030012E2 = keysMask & ~gUnknown_030012E0;
gUnknown_030012E0 = keysMask;
}
void sub_81D41A0(void)
{
gUnknown_030012EC = REG_IME;
gUnknown_030012EE = REG_IE;
gUnknown_030012F0 = REG_TM3CNT_H;
gUnknown_030012F2 = REG_SIOCNT;
gUnknown_030012F4 = REG_RCNT;
}
void sub_81D41F4(void)
{
REG_IME = gUnknown_030012EC;
REG_IE = gUnknown_030012EE;
REG_TM3CNT_H = gUnknown_030012F0;
REG_SIOCNT = gUnknown_030012F2;
REG_RCNT = gUnknown_030012F4;
}
void sub_81D4238(void)
{
CpuFill32(0, &gUnknown_030012C8, sizeof(struct Unknown030012C8));
}
+464
View File
@@ -0,0 +1,464 @@
#include "global.h"
#include "alloc.h"
#include "decompress.h"
#include "ereader_helpers.h"
#include "link.h"
#include "main.h"
#include "rom_8011DC0.h"
#include "save.h"
#include "sound.h"
#include "sprite.h"
#include "task.h"
#include "strings.h"
#include "util.h"
#include "constants/songs.h"
struct Unk81D5014
{
u16 unk0;
u16 unk2;
u16 unk4;
u16 unk6;
u8 unk8;
u8 unk9;
u8 unkA;
u8 unkB;
u8 unkC;
u8 unkD;
u8 unkE;
u8 *unk10;
};
struct Unk03006370
{
u16 unk0;
u32 unk4;
u32 *unk8;
};
static void sub_81D5084(u8);
extern struct Unk03006370 gUnknown_03006370;
extern const u8 gUnknown_089A3470[];
extern const u8 gMultiBootProgram_BerryGlitchFix_Start[];
static void sub_81D4D50(struct Unk03006370 *arg0, int arg1, u32 *arg2)
{
volatile u16 backupIME = REG_IME;
REG_IME = 0;
gIntrTable[1] = sub_81D3FAC;
gIntrTable[2] = sub_81D3F9C;
sub_81D41A0();
sub_81D4238();
REG_IE |= INTR_FLAG_VCOUNT;
REG_IME = backupIME;
arg0->unk0 = 0;
arg0->unk4 = arg1;
arg0->unk8 = arg2;
}
static void sub_81D4DB8(struct Unk03006370 *arg0)
{
volatile u16 backupIME = REG_IME;
REG_IME = 0;
sub_81D4238();
sub_81D41F4();
RestoreSerialTimer3IntrHandlers();
REG_IME = backupIME;
}
static u8 sub_81D4DE8(struct Unk03006370 *arg0)
{
u8 var0 = 0;
arg0->unk0 = sub_81D3D70(1, arg0->unk4, arg0->unk8, NULL);
if ((arg0->unk0 & 0x13) == 0x10)
var0 = 1;
if (arg0->unk0 & 0x8)
var0 = 2;
if (arg0->unk0 & 0x4)
var0 = 3;
gShouldAdvanceLinkState = 0;
return var0;
}
static void sub_81D4E30(void)
{
memset(gDecompressionBuffer, 0, 0x2000);
gLinkType = 0x5503;
OpenLink();
SetSuppressLinkErrorMessage(TRUE);
}
static bool32 sub_81D4E60(void)
{
volatile u16 backupIME;
u16 sp4[4];
backupIME = REG_IME;
REG_IME = 0;
*(u64 *)sp4 = *(u64 *)gLink.tempRecvBuffer;
REG_IME = backupIME;
if (sp4[0] == 0xB9A0 && sp4[1] == 0xCCD0
&& sp4[2] == 0xFFFF && sp4[3] == 0xFFFF)
{
return TRUE;
}
return FALSE;
}
static bool32 sub_81D4EC0(void)
{
if (IsLinkMaster() && GetLinkPlayerCount_2() == 2)
return TRUE;
return FALSE;
}
static u32 sub_81D4EE4(u8 *arg0, u16 *arg1)
{
u8 var0;
var0 = *arg0 - 3;
if (var0 < 3 && HasLinkErrorOccurred())
{
*arg0 = 0;
return 3;
}
switch (*arg0)
{
case 0:
if (IsLinkMaster() && GetLinkPlayerCount_2() > 1)
{
*arg0 = 1;
}
else if (gMain.newKeys & B_BUTTON)
{
*arg0 = 0;
return 1;
}
break;
case 1:
if (++(*arg1) > 5)
{
*arg1 = 0;
*arg0 = 2;
}
break;
case 2:
if (GetLinkPlayerCount_2() == 2)
{
PlaySE(SE_PINPON);
CheckShouldAdvanceLinkState();
*arg1 = 0;
*arg0 = 3;
}
else if (gMain.newKeys & B_BUTTON)
{
*arg0 = 0;
return 1;
}
break;
case 3:
if (++(*arg1) > 30)
{
*arg0 = 0;
return 5;
}
if (IsLinkConnectionEstablished())
{
if (gReceivedRemoteLinkPlayers)
{
if (IsLinkPlayerDataExchangeComplete())
{
*arg0 = 0;
return 2;
}
else
{
*arg0 = 4;
}
}
else
{
*arg0 = 3;
}
}
break;
case 4:
sub_800ABF4(0);
*arg0 = 5;
break;
case 5:
if (!gReceivedRemoteLinkPlayers)
{
*arg0 = 0;
return 4;
}
break;
default:
return 0;
}
return 0;
}
void sub_81D5014(void)
{
int value;
struct Unk81D5014 *data;
u8 taskId = CreateTask(sub_81D5084, 0);
data = (struct Unk81D5014 *)gTasks[taskId].data;
data->unk8 = 0;
data->unk9 = 0;
data->unkA = 0;
data->unkB = 0;
data->unkC = 0;
data->unkD = 0;
data->unk0 = 0;
data->unk2 = 0;
data->unk4 = 0;
data->unk6 = 0;
data->unkE = 0;
data->unk10 = AllocZeroed(0x40);
}
static void sub_81D505C(u16 *arg0)
{
*arg0 = 0;
}
static bool32 sub_81D5064(u16 *arg0, u16 arg1)
{
if (++(*arg0) > arg1)
{
*arg0 = 0;
return TRUE;
}
return FALSE;
}
static void sub_81D5084(u8 taskId)
{
struct Unk81D5014 *data = (struct Unk81D5014 *)gTasks[taskId].data;
switch (data->unk8)
{
case 0:
if (mevent_0814257C(&data->unk9, gUnknown_085EDFD6))
data->unk8 = 1;
break;
case 1:
sub_81D4E30();
sub_81D505C(&data->unk0);
data->unk8 = 2;
break;
case 2:
if (sub_81D5064(&data->unk0, 10))
data->unk8 = 3;
break;
case 3:
if (!sub_81D4EC0())
{
CloseLink();
data->unk8 = 4;
}
else
{
data->unk8 = 13;
}
break;
case 4:
if (mevent_0814257C(&data->unk9, gUnknown_085EDFF5))
{
sub_8018884(gUnknown_085EE014);
sub_81D505C(&data->unk0);
data->unk8 = 5;
}
break;
case 5:
if (sub_81D5064(&data->unk0, 90))
{
sub_81D4E30();
data->unk8 = 6;
}
else if (gMain.newKeys & B_BUTTON)
{
sub_81D505C(&data->unk0);
PlaySE(SE_SELECT);
data->unk8 = 23;
}
break;
case 6:
if (gMain.newKeys & B_BUTTON)
{
PlaySE(SE_SELECT);
CloseLink();
sub_81D505C(&data->unk0);
data->unk8 = 23;
}
else if (GetLinkPlayerCount_2() > 1)
{
sub_81D505C(&data->unk0);
CloseLink();
data->unk8 = 7;
}
else if (sub_81D4E60())
{
PlaySE(SE_SELECT);
CloseLink();
sub_81D505C(&data->unk0);
data->unk8 = 8;
}
else if (sub_81D5064(&data->unk0, 10))
{
CloseLink();
sub_81D4E30();
sub_81D505C(&data->unk0);
}
break;
case 7:
if (mevent_0814257C(&data->unk9, gUnknown_085EE05C))
data->unk8 = 4;
break;
case 8:
sub_8018884(gUnknown_085EE097);
// XXX: This (u32*) cast is discarding the const qualifier from gUnknown_089A3470
sub_81D4D50(&gUnknown_03006370, gMultiBootProgram_BerryGlitchFix_Start - gUnknown_089A3470, (u32*)gUnknown_089A3470);
data->unk8 = 9;
break;
case 9:
data->unkE = sub_81D4DE8(&gUnknown_03006370);
if (data->unkE)
data->unk8 = 10;
break;
case 10:
sub_81D4DB8(&gUnknown_03006370);
if (data->unkE == 3)
{
data->unk8 = 20;
}
else if (data->unkE == 1)
{
sub_81D505C(&data->unk0);
sub_8018884(gUnknown_085EE120);
data->unk8 = 11;
}
else
{
data->unk8 = 0;
}
break;
case 11:
if (sub_81D5064(&data->unk0, 840))
data->unk8 = 12;
break;
case 12:
sub_81D4E30();
sub_8018884(gUnknown_085EE0DC);
data->unk8 = 13;
break;
case 13:
switch (sub_81D4EE4(&data->unk9, &data->unk0))
{
case 0:
break;
case 2:
sub_8018884(gUnknown_085EE097);
data->unk8 = 14;
break;
case 1:
PlaySE(SE_SELECT);
CloseLink();
data->unk8 = 23;
break;
case 5:
CloseLink();
data->unk8 = 21;
break;
case 3:
case 4:
CloseLink();
data->unk8 = 20;
break;
}
break;
case 14:
if (HasLinkErrorOccurred())
{
CloseLink();
data->unk8 = 20;
}
else if (GetBlockReceivedStatus())
{
ResetBlockReceivedFlags();
data->unk8 = 15;
}
break;
case 15:
data->unkE = sub_81D3920(gDecompressionBuffer);
sub_800ABF4(data->unkE);
data->unk8 = 16;
break;
case 16:
if (!gReceivedRemoteLinkPlayers)
{
if (data->unkE == 1)
data->unk8 = 17;
else
data->unk8 = 20;
}
break;
case 17:
if (sub_81D3AB0((struct Unk81D38FC *)&gDecompressionBuffer))
{
sub_8018884(gUnknown_085EE0FA);
sub_81D505C(&data->unk0);
data->unk8 = 18;
}
else
{
data->unk8 = 22;
}
break;
case 18:
if (sub_81D5064(&data->unk0, 120))
{
sub_8018884(gUnknown_085EE107);
PlayFanfare(MUS_FANFA4);
data->unk8 = 19;
}
break;
case 19:
if (IsFanfareTaskInactive() && (gMain.newKeys & (A_BUTTON | B_BUTTON)))
data->unk8 = 26;
break;
case 23:
if (mevent_0814257C(&data->unk9,gUnknown_085EE06B))
data->unk8 = 26;
break;
case 20:
if (mevent_0814257C(&data->unk9, gUnknown_085EE0A3))
data->unk8 = 0;
break;
case 21:
if (mevent_0814257C(&data->unk9, gUnknown_085EE0BF))
data->unk8 = 0;
break;
case 22:
if (mevent_0814257C(&data->unk9, gUnknown_085EE12D))
data->unk8 = 0;
break;
case 26:
Free(data->unk10);
DestroyTask(taskId);
SetMainCallback2(sub_80186A4);
break;
}
}
+15 -18
View File
@@ -3,7 +3,7 @@
#include "pokedex.h"
#define TEMP_FLAGS_SIZE 0x4
#define TEMP_UPPER_FLAGS_SIZE 0x8
#define DAILY_FLAGS_SIZE 0x8
#define TEMP_VARS_SIZE 0x20
EWRAM_DATA u16 gSpecialVar_0x8000 = 0;
@@ -23,18 +23,16 @@ EWRAM_DATA u16 gSpecialVar_LastTalked = 0;
EWRAM_DATA u16 gSpecialVar_Facing = 0;
EWRAM_DATA u16 gSpecialVar_MonBoxId = 0;
EWRAM_DATA u16 gSpecialVar_MonBoxPos = 0;
EWRAM_DATA u16 gSpecialVar_0x8014 = 0;
EWRAM_DATA static u8 gUnknown_020375FC[16] = {0};
EWRAM_DATA u16 gSpecialVar_Unused_0x8014 = 0;
EWRAM_DATA static u8 gSpecialFlags[16] = {0};
extern u16 *const gSpecialVars[];
extern void sub_80BB358(void);
void InitEventData(void)
{
memset(gSaveBlock1Ptr->flags, 0, sizeof(gSaveBlock1Ptr->flags));
memset(gSaveBlock1Ptr->vars, 0, sizeof(gSaveBlock1Ptr->vars));
memset(gUnknown_020375FC, 0, sizeof(gUnknown_020375FC));
memset(gSpecialFlags, 0, sizeof(gSpecialFlags));
}
void ClearTempFieldEventData(void)
@@ -48,10 +46,9 @@ void ClearTempFieldEventData(void)
FlagClear(FLAG_NURSE_UNION_ROOM_REMINDER);
}
// Probably had different flag splits at one point.
void ClearUpperFlags(void)
void ClearDailyFlags(void)
{
memset(gSaveBlock1Ptr->flags + 0x124, 0, TEMP_UPPER_FLAGS_SIZE);
memset(gSaveBlock1Ptr->flags + 0x124, 0, DAILY_FLAGS_SIZE);
}
void DisableNationalPokedex(void)
@@ -70,7 +67,7 @@ void EnableNationalPokedex(void)
FlagSet(FLAG_SYS_NATIONAL_DEX);
gSaveBlock2Ptr->pokedex.mode = DEX_MODE_NATIONAL;
gSaveBlock2Ptr->pokedex.order = 0;
sub_80BB358();
ResetPokedexScrollPositions();
}
bool32 IsNationalPokedexEnabled(void)
@@ -134,13 +131,13 @@ void sub_809D4D8(void)
void sub_809D570(void)
{
VarSet(VAR_EVENT_PICHU_SLOT, 0);
VarSet(VAR_0x40DE, 0);
VarSet(VAR_0x40DF, 0);
VarSet(VAR_0x40E0, 0);
VarSet(VAR_0x40E1, 0);
VarSet(VAR_0x40E2, 0);
VarSet(VAR_0x40E3, 0);
VarSet(VAR_0x40E4, 0);
VarSet(VAR_NEVER_READ_0x40DE, 0);
VarSet(VAR_NEVER_READ_0x40DF, 0);
VarSet(VAR_NEVER_READ_0x40E0, 0);
VarSet(VAR_NEVER_READ_0x40E1, 0);
VarSet(VAR_NEVER_READ_0x40E2, 0);
VarSet(VAR_NEVER_READ_0x40E3, 0);
VarSet(VAR_NEVER_READ_0x40E4, 0);
}
void DisableResetRTC(void)
@@ -202,7 +199,7 @@ u8 *GetFlagPointer(u16 id)
else if (id < SPECIAL_FLAGS_START)
return &gSaveBlock1Ptr->flags[id / 8];
else
return &gUnknown_020375FC[(id - SPECIAL_FLAGS_START) / 8];
return &gSpecialFlags[(id - SPECIAL_FLAGS_START) / 8];
}
u8 FlagSet(u16 id)
+5 -5
View File
@@ -1,22 +1,22 @@
#include "global.h"
#include "alloc.h"
#include "battle_pyramid.h"
#include "berry.h"
#include "decoration.h"
#include "event_data.h"
#include "event_object_movement.h"
#include "event_scripts.h"
#include "faraway_island.h"
#include "field_camera.h"
#include "field_effect.h"
#include "field_effect_helpers.h"
#include "field_player_avatar.h"
#include "fieldmap.h"
#include "alloc.h"
#include "mauville_old_man.h"
#include "metatile_behavior.h"
#include "overworld.h"
#include "palette.h"
#include "pokenav.h"
#include "random.h"
#include "rom_818CFC8.h"
#include "sprite.h"
#include "task.h"
#include "trainer_see.h"
@@ -1420,7 +1420,7 @@ u8 Unref_TryInitLocalEventObject(u8 localId)
{
if (InBattlePyramid())
{
eventObjectCount = sub_81AAA40();
eventObjectCount = GetNumBattlePyramidEventObjects();
}
else if (InTrainerHill())
{
@@ -1746,7 +1746,7 @@ void TrySpawnEventObjects(s16 cameraX, s16 cameraY)
if (InBattlePyramid())
{
objectCount = sub_81AAA40();
objectCount = GetNumBattlePyramidEventObjects();
}
else if (InTrainerHill())
{

Some files were not shown because too many files have changed in this diff Show More