diff options
147 files changed, 4458 insertions, 3905 deletions
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index bcb9fa04b..1013bd8fd 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -490,7 +490,7 @@ _081348D6: .align 2, 0 _081348E0: .4byte 0x00003270 _081348E4: - bl sub_80BF72C + bl MenuHelpers_CallLinkSomething lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -786,7 +786,7 @@ _08134B38: _08134B58: .4byte gUnknown_203B140 _08134B5C: .4byte 0x00003270 _08134B60: - bl sub_8058244 + bl Overworld_LinkRecvQueueLengthMoreThan2 cmp r0, 0x1 beq _08134B9A bl sub_800B270 @@ -8687,7 +8687,7 @@ _08138D0A: _08138D10: b _08139094 _08138D12: - bl sub_80BF72C + bl MenuHelpers_CallLinkSomething lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -9080,7 +9080,7 @@ _08139024: .align 2, 0 _08139030: .4byte gUnknown_203B16D _08139034: - bl sub_80BF72C + bl MenuHelpers_CallLinkSomething lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -9800,7 +9800,7 @@ _08139604: _08139620: .4byte gUnknown_203B140 _08139624: .4byte 0x00003288 _08139628: - bl sub_80BF72C + bl MenuHelpers_CallLinkSomething lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -13905,7 +13905,7 @@ _0813B700: .4byte 0x00003003 _0813B704: .4byte 0x00003004 _0813B708: .4byte 0x0000328c _0813B70C: - bl sub_8058244 + bl Overworld_LinkRecvQueueLengthMoreThan2 cmp r0, 0 bne _0813B746 bl sub_800B270 diff --git a/common_syms/quest_log.txt b/common_syms/quest_log.txt index c04d849ec..0846bb687 100644 --- a/common_syms/quest_log.txt +++ b/common_syms/quest_log.txt @@ -1,4 +1,4 @@ gUnknown_3005E88 sNumEventsInLogEntry -gUnknown_3005E90 +gQuestLogFieldInput sCurQuestLogEntry diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 4cc93f85e..c6dc96bf4 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -5,6 +5,36 @@ .include "asm/macros.inc" .include "asm/macros/battle_anim_script.inc" +#define FALSE 0 +#define TRUE 1 + +#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10)) +#define RGB_BLACK 0x0000 +#define RGB_WHITE 0x7FFF +#define RGB_WHITEALPHA 0xFFFF + +// BLDCNT +// Bits 0-5 select layers for the 1st target +#define BLDCNT_TGT1_BG0 (1 << 0) +#define BLDCNT_TGT1_BG1 (1 << 1) +#define BLDCNT_TGT1_BG2 (1 << 2) +#define BLDCNT_TGT1_BG3 (1 << 3) +#define BLDCNT_TGT1_OBJ (1 << 4) +#define BLDCNT_TGT1_BD (1 << 5) +// Bits 6-7 select the special effect +#define BLDCNT_EFFECT_NONE (0 << 6) // no special effect +#define BLDCNT_EFFECT_BLEND (1 << 6) // 1st+2nd targets mixed (controlled by BLDALPHA) +#define BLDCNT_EFFECT_LIGHTEN (2 << 6) // 1st target becomes whiter (controlled by BLDY) +#define BLDCNT_EFFECT_DARKEN (3 << 6) // 1st target becomes blacker (controlled by BLDY) +// Bits 8-13 select layers for the 2nd target +#define BLDCNT_TGT2_BG0 (1 << 8) +#define BLDCNT_TGT2_BG1 (1 << 9) +#define BLDCNT_TGT2_BG2 (1 << 10) +#define BLDCNT_TGT2_BG3 (1 << 11) +#define BLDCNT_TGT2_OBJ (1 << 12) +#define BLDCNT_TGT2_BD (1 << 13) +#define BLDCNT_TGT2_ALL (BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD) + .section script_data, "aw", %progbits .align 2 @@ -16,7 +46,7 @@ gMovesWithQuietBGM:: @ 81C68EC gBattleAnims_Moves:: .4byte Move_NONE - .4byte Move_NONE + .4byte Move_POUND .4byte Move_KARATE_CHOP .4byte Move_DOUBLE_SLAP .4byte Move_COMET_PUNCH @@ -134,7 +164,7 @@ gBattleAnims_Moves:: .4byte Move_FOCUS_ENERGY .4byte Move_BIDE .4byte Move_METRONOME - .4byte Move_NONE + .4byte Move_MIRROR_MOVE .4byte Move_SELF_DESTRUCT .4byte Move_EGG_BOMB .4byte Move_LICK @@ -423,7 +453,9 @@ gBattleAnims_Special:: .4byte Special_MonToSubstitute Move_NONE:: @ 81C6F34 - loadspritegfx 10135 +Move_POUND:: @ 81C6F34 +Move_MIRROR_MOVE:: @ 81C6F34 + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 playsewithpan SE_W003, 63 @@ -435,7 +467,7 @@ Move_NONE:: @ 81C6F34 end Move_DOUBLE_SLAP:: @ 81C6F65 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 choosetwoturnanim gUnknown_81C6F90, gUnknown_81C6FA4 @@ -457,8 +489,8 @@ gUnknown_81C6FA4:: @ 81C6FA4 goto gUnknown_81C6F76 Move_POISON_POWDER:: @ 81C6FB8 - loadspritegfx 10065 - loadspritegfx 10150 + loadspritegfx ANIM_TAG_POISON_POWDER + loadspritegfx ANIM_TAG_POISON_BUBBLE loopsewithpan SE_W077, 63, 10, 6 createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 @@ -482,7 +514,7 @@ Move_POISON_POWDER:: @ 81C6FB8 end Move_STUN_SPORE:: @ 81C70E9 - loadspritegfx 10068 + loadspritegfx ANIM_TAG_STUN_SPORE loopsewithpan SE_W077, 63, 10, 6 createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 @@ -506,7 +538,7 @@ Move_STUN_SPORE:: @ 81C70E9 end Move_SLEEP_POWDER:: @ 81C7217 - loadspritegfx 10067 + loadspritegfx ANIM_TAG_SLEEP_POWDER loopsewithpan SE_W077, 63, 10, 6 createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 @@ -530,8 +562,8 @@ Move_SLEEP_POWDER:: @ 81C7217 end Move_SWIFT:: @ 81C7345 - loadspritegfx 10174 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_YELLOW_STAR + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W129, 192 @@ -557,7 +589,7 @@ Move_SWIFT:: @ 81C7345 end Move_STRENGTH:: @ 81C73FE - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W036, 192 @@ -583,7 +615,7 @@ Move_STRENGTH:: @ 81C73FE end Move_TACKLE:: @ 81C7492 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 @@ -597,7 +629,7 @@ Move_TACKLE:: @ 81C7492 end Move_BODY_SLAM:: @ 81C74D0 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W036, 192 @@ -623,7 +655,7 @@ Move_BODY_SLAM:: @ 81C74D0 end Move_SUPERSONIC:: @ 81C755D - loadspritegfx 10163 + loadspritegfx ANIM_TAG_GOLD_RING monbg 2 monbgprio_2A 0 setalpha 12, 8 @@ -646,7 +678,7 @@ gUnknown_81C759B:: @ 81C759B return Move_SCREECH:: @ 81C75B5 - loadspritegfx 10164 + loadspritegfx ANIM_TAG_PURPLE_RING createvisualtask AnimTask_ShakeMon2, 2, 0, 3, 0, 2, 1 call gUnknown_81C75E8 call gUnknown_81C75E8 @@ -662,7 +694,7 @@ gUnknown_81C75E8:: @ 81C75E8 return Move_FLAME_WHEEL:: @ 81C7602 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER monbg 3 monbgprio_2A 1 createsprite gUnknown_83E5DFC, ANIM_ATTACKER, 3, 0, 0, 56, 0 @@ -702,8 +734,8 @@ Move_FLAME_WHEEL:: @ 81C7602 return Move_PIN_MISSILE:: @ 81C76FC - loadspritegfx 10161 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT monbg 1 monbgprio_28 1 setalpha 12, 8 @@ -731,8 +763,8 @@ Move_PIN_MISSILE:: @ 81C76FC end Move_ICICLE_SPEAR:: @ 81C77C1 - loadspritegfx 10262 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ICICLE_SPEAR + loadspritegfx ANIM_TAG_IMPACT monbg 1 monbgprio_28 1 setalpha 12, 8 @@ -760,7 +792,7 @@ Move_ICICLE_SPEAR:: @ 81C77C1 end Move_TAKE_DOWN:: @ 81C7886 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W036, 192 @@ -784,16 +816,16 @@ Move_TAKE_DOWN:: @ 81C7886 end Move_DOUBLE_EDGE:: @ 81C791A - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W129, 192 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 4, 2, 32767, 10, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 4, 2, RGB_WHITE, 10, 0, 0 waitforvisualfinish delay 10 playsewithpan SE_W207, 192 waitplaysewithpan SE_W207, 192, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 18, 6, 2, 4 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 16, 16, 32767 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 16, 16, RGB_WHITE createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 delay 3 waitforvisualfinish @@ -805,7 +837,7 @@ Move_DOUBLE_EDGE:: @ 81C791A createvisualtask sub_8099980, 2, 8, -256, 1, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 4, 0, 12, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 4, 0, 12, 1 - createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, 32767 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, RGB_WHITE waitforvisualfinish createvisualtask sub_8099980, 2, 8, -256, 0, 1 createvisualtask sub_8099980, 2, 8, -256, 1, 1 @@ -817,9 +849,9 @@ Move_DOUBLE_EDGE:: @ 81C791A end Move_POISON_STING:: @ 81C7A2D - loadspritegfx 10161 - loadspritegfx 10135 - loadspritegfx 10150 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_POISON_BUBBLE monbg 1 monbgprio_28 1 setalpha 12, 8 @@ -837,8 +869,8 @@ Move_POISON_STING:: @ 81C7A2D end Move_TWINEEDLE:: @ 81C7A82 - loadspritegfx 10161 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT monbg 1 monbgprio_28 1 setalpha 12, 8 @@ -857,13 +889,13 @@ Move_TWINEEDLE:: @ 81C7A82 end Move_FIRE_BLAST:: @ 81C7AF5 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER createsoundtask sub_80DCE10, 137, 138 call gUnknown_81C7B89 call gUnknown_81C7B89 call gUnknown_81C7B89 delay 24 - createvisualtask sub_80BA7F8, 10, 1, 3, 0, 8, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 3, 0, 8, RGB_BLACK waitforvisualfinish delay 19 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 20, 1 @@ -885,7 +917,7 @@ Move_FIRE_BLAST:: @ 81C7AF5 delay 3 call gUnknown_81C7BCD waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 1, 2, 8, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 2, 8, 0, RGB_BLACK waitforvisualfinish end @@ -907,7 +939,7 @@ gUnknown_81C7BCD:: @ 81C7BCD return Move_LEECH_SEED:: @ 81C7C23 - loadspritegfx 10006 + loadspritegfx ANIM_TAG_SEED playsewithpan SE_W077, 192 createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, 0, 24, 35, -32 delay 8 @@ -922,7 +954,7 @@ Move_LEECH_SEED:: @ 81C7C23 end Move_EMBER:: @ 81C7C79 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER loopsewithpan SE_W052, 192, 5, 2 createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, -16, 24, 20, 1 delay 4 @@ -942,20 +974,20 @@ gUnknown_81C7CD5:: @ 81C7CD5 return Move_MEGA_PUNCH:: @ 81C7CED - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg 1 delay 2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 16, 0 setalpha 12, 8 playsewithpan SE_W025, 63 createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 50 - createvisualtask sub_80BA7F8, 10, 4, 2, 0, 7, 32767 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 7, RGB_WHITE delay 50 call gUnknown_81C7D89 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 22, 1 - createvisualtask sub_80BA7F8, 10, 4, 2, 0, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 0, RGB_WHITE createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 0, 8, 0, 0 playsewithpan SE_W233B, 63 waitforvisualfinish @@ -990,21 +1022,21 @@ gUnknown_81C7DC0:: @ 81C7DC0 goto gUnknown_81C7DB1 Move_MEGA_KICK:: @ 81C7DC7 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg 1 delay 2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 16, 0 setalpha 12, 8 playsewithpan SE_W025, 63 createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 50 - createvisualtask sub_80BA7F8, 10, 4, 2, 0, 7, 32767 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 7, RGB_WHITE delay 50 playsewithpan SE_W025B, 63 call gUnknown_81C7D89 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 22, 1 - createvisualtask sub_80BA7F8, 10, 4, 2, 0, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 0, RGB_WHITE createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 0, 8, 0, 0 waitforvisualfinish clearmonbg 1 @@ -1015,8 +1047,8 @@ Move_MEGA_KICK:: @ 81C7DC7 end Move_COMET_PUNCH:: @ 81C7E63 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg 1 setalpha 12, 8 choosetwoturnanim gUnknown_81C7E91, gUnknown_81C7EB6 @@ -1040,8 +1072,8 @@ gUnknown_81C7EB6:: @ 81C7EB6 goto gUnknown_81C7E77 Move_SONIC_BOOM:: @ 81C7EDB - loadspritegfx 10003 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_AIR_WAVE + loadspritegfx ANIM_TAG_IMPACT monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -1067,31 +1099,31 @@ gUnknown_81C7F2A:: @ 81C7F2A return Move_THUNDER_SHOCK:: @ 81C7F3C - loadspritegfx 10001 - loadspritegfx 10011 - createvisualtask sub_80BA7F8, 10, 1, 0, 0, 6, 0 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_SPARK_2 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish delay 10 createvisualtask sub_80AE220, 5, 0, -44, 0 playsewithpan SE_W085, 63 delay 9 - createvisualtask sub_80BA7F8, 10, 4, 0, 0, 13, 0 + createvisualtask AnimTask_BlendSelected, 10, 4, 0, 0, 13, RGB_BLACK waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 4, 0, 13, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 4, 0, 13, 0, RGB_BLACK waitforvisualfinish delay 20 call gUnknown_81D58D4 waitforvisualfinish delay 20 - createvisualtask sub_80BA7F8, 10, 1, 0, 6, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 6, 0, RGB_BLACK waitforvisualfinish end Move_THUNDERBOLT:: @ 81C7FAA - loadspritegfx 10001 - loadspritegfx 10282 - loadspritegfx 10011 - createvisualtask sub_80BA7F8, 10, 1, 0, 0, 6, 0 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_SHOCK_3 + loadspritegfx ANIM_TAG_SPARK_2 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish delay 10 createvisualtask sub_80AE220, 5, 24, -52, 0 @@ -1103,9 +1135,9 @@ Move_THUNDERBOLT:: @ 81C7FAA createvisualtask sub_80AE220, 5, 0, -60, 1 playsewithpan SE_W085, 63 delay 9 - createvisualtask sub_80BA7F8, 10, 4, 0, 0, 13, 0 + createvisualtask AnimTask_BlendSelected, 10, 4, 0, 0, 13, RGB_BLACK waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 4, 0, 13, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 4, 0, 13, 0, RGB_BLACK waitforvisualfinish delay 20 createsprite gUnknown_83E6058, ANIM_TARGET, 3, 44, 0, 0, 3 @@ -1119,28 +1151,28 @@ Move_THUNDERBOLT:: @ 81C7FAA createsprite gUnknown_83E6070, ANIM_TARGET, 4, 0, 0, 16, 44, 224, 40, 2, -32765 playsewithpan SE_W063, 63 delay 0 - createvisualtask sub_80BA7F8, 10, 1, 0, 2, 2, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 2, 2, RGB_BLACK delay 6 - createvisualtask sub_80BA7F8, 10, 1, 0, 6, 6, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 6, 6, RGB_BLACK delay 6 - createvisualtask sub_80BA7F8, 10, 1, 0, 2, 2, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 2, 2, RGB_BLACK delay 6 - createvisualtask sub_80BA7F8, 10, 1, 0, 6, 6, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 6, 6, RGB_BLACK waitforvisualfinish delay 20 waitplaysewithpan SE_W085B, 63, 19 call gUnknown_81D58D4 waitforvisualfinish delay 20 - createvisualtask sub_80BA7F8, 10, 1, 0, 6, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 6, 0, RGB_BLACK waitforvisualfinish end Move_THUNDER_WAVE:: @ 81C8160 - loadspritegfx 10001 - loadspritegfx 10011 - loadspritegfx 10173 - createvisualtask sub_80BA7F8, 10, 1, 0, 0, 6, 0 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_SPARK_2 + loadspritegfx ANIM_TAG_SPARK_H + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish delay 10 createvisualtask sub_80AE220, 5, 0, -48, 0 @@ -1153,13 +1185,13 @@ Move_THUNDER_WAVE:: @ 81C8160 delay 4 createsprite gUnknown_83E60B8, ANIM_TARGET, 2, -16, 16 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 1, 0, 6, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 6, 0, RGB_BLACK waitforvisualfinish end Move_BEAT_UP:: @ 81C81CF - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg 1 setalpha 12, 8 choosetwoturnanim gUnknown_81C81E8, gUnknown_81C8259 @@ -1195,8 +1227,8 @@ gUnknown_81C8259:: @ 81C8259 goto gUnknown_81C81E3 Move_STOMP:: @ 81C82CA - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 playsewithpan SE_W104, 63 @@ -1217,7 +1249,7 @@ Move_TAIL_WHIP:: @ 81C8311 end Move_CUT:: @ 81C832A - loadspritegfx 10138 + loadspritegfx ANIM_TAG_CUT monbg 1 setalpha 12, 8 playsewithpan SE_W015, 63 @@ -1231,7 +1263,7 @@ Move_CUT:: @ 81C832A end Move_HIDDEN_POWER:: @ 81C835C - loadspritegfx 10217 + loadspritegfx ANIM_TAG_RED_ORB playsewithpan SE_W036, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, 0, 0 waitforvisualfinish @@ -1261,14 +1293,14 @@ Move_HIDDEN_POWER:: @ 81C835C end Move_REVERSAL:: @ 81C8445 - loadspritegfx 10236 - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_BLUE_ORB + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W197, 192 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 3, 32767, 8, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 3, RGB_WHITE, 8, 0, 0 waitforvisualfinish delay 30 - createvisualtask sub_80B9BDC, 2, 31, 3, 2, 0, 10, 32767 + createvisualtask AnimTask_CurseBlendEffect, 2, 31, 3, 2, 0, 10, RGB_WHITE delay 10 playsewithpan SE_W179, 192 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 0 @@ -1282,14 +1314,14 @@ Move_REVERSAL:: @ 81C8445 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 8 playsewithpan SE_W233B, 63 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 32767, 8, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_WHITE, 8, 0, 0 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 10, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 createvisualtask sub_8099BD4, 5, 0, 1, 8, 1, 0 end Move_PURSUIT:: @ 81C8520 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 1 fadetobg 1 waitbgfadein @@ -1319,8 +1351,8 @@ gUnknown_81C8568:: @ 81C8568 goto gUnknown_81C8536 Move_SPIKE_CANNON:: @ 81C8591 - loadspritegfx 10161 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT monbg 1 monbgprio_28 1 setalpha 12, 8 @@ -1343,7 +1375,7 @@ Move_SPIKE_CANNON:: @ 81C8591 end Move_SWORDS_DANCE:: @ 81C8644 - loadspritegfx 10005 + loadspritegfx ANIM_TAG_SWORD monbg 0 setalpha 12, 8 playsewithpan SE_W014, 192 @@ -1358,7 +1390,7 @@ Move_SWORDS_DANCE:: @ 81C8644 end Move_PSYCH_UP:: @ 81C868A - loadspritegfx 10196 + loadspritegfx ANIM_TAG_SPIRAL monbg 2 createvisualtask sub_80B9CE4, 2, 1, 2, 6, 1, 11, 0 setalpha 12, 8 @@ -1369,7 +1401,7 @@ Move_PSYCH_UP:: @ 81C868A delay 4 playsewithpan SE_W060, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, 0, 1 - createvisualtask sub_80BA7F8, 9, 2, 2, 10, 0, 1023 + createvisualtask AnimTask_BlendSelected, 9, 2, 2, 10, 0, RGB(31, 31, 0) delay 30 clearmonbg 2 blendoff @@ -1377,9 +1409,9 @@ Move_PSYCH_UP:: @ 81C868A end Move_DIZZY_PUNCH:: @ 81C86FC - loadspritegfx 10073 - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_DUCK + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 call gUnknown_81C8817 @@ -1415,7 +1447,7 @@ gUnknown_81C8817:: @ 81C8817 return Move_FIRE_SPIN:: @ 81C8836 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W221B, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 47, 1 call gUnknown_81C885F @@ -1440,7 +1472,7 @@ gUnknown_81C885F:: @ 81C885F return Move_FURY_CUTTER:: @ 81C88EA - loadspritegfx 10138 + loadspritegfx ANIM_TAG_CUT monbg 1 setalpha 12, 8 playsewithpan SE_W013, 63 @@ -1485,8 +1517,8 @@ gUnknown_81C899F:: @ 81C899F goto gUnknown_81C892E Move_SELF_DESTRUCT:: @ 81C89B9 - loadspritegfx 10198 - createvisualtask sub_80BA7F8, 10, 2, 1, 0, 9, 31 + loadspritegfx ANIM_TAG_EXPLOSION + createvisualtask AnimTask_BlendSelected, 10, 2, 1, 0, 9, RGB(31, 0, 0) createvisualtask AnimTask_ShakeMon2, 5, 4, 6, 0, 38, 1 createvisualtask AnimTask_ShakeMon2, 5, 5, 6, 0, 38, 1 createvisualtask AnimTask_ShakeMon2, 5, 6, 6, 0, 38, 1 @@ -1495,7 +1527,7 @@ Move_SELF_DESTRUCT:: @ 81C89B9 call gUnknown_81C8A3F call gUnknown_81C8A3F waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 2, 1, 9, 0, 31 + createvisualtask AnimTask_BlendSelected, 10, 2, 1, 9, 0, RGB(31, 0, 0) end gUnknown_81C8A3F:: @ 81C8A3F @@ -1517,8 +1549,8 @@ gUnknown_81C8A3F:: @ 81C8A3F return Move_SLAM:: @ 81C8AA9 - loadspritegfx 10056 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SLAM_HIT + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 playsewithpan SE_W004, 192 @@ -1541,7 +1573,7 @@ Move_SLAM:: @ 81C8AA9 end Move_VINE_WHIP:: @ 81C8B31 - loadspritegfx 10287 + loadspritegfx ANIM_TAG_WHIP_HIT playsewithpan SE_W026, 192 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 6 @@ -1552,8 +1584,8 @@ Move_VINE_WHIP:: @ 81C8B31 end Move_DRILL_PECK:: @ 81C8B68 - loadspritegfx 10135 - loadspritegfx 10162 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_W029, 192 waitforvisualfinish @@ -1571,9 +1603,9 @@ Move_DRILL_PECK:: @ 81C8B68 end Move_WATERFALL:: @ 81C8BC1 - loadspritegfx 10148 - loadspritegfx 10155 - loadspritegfx 10141 + loadspritegfx ANIM_TAG_WATER_IMPACT + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg 3 setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 23, 1 @@ -1652,7 +1684,7 @@ gUnknown_81C8CA2:: @ 81C8CA2 return Move_EXPLOSION:: @ 81C8E15 - loadspritegfx 10198 + loadspritegfx ANIM_TAG_EXPLOSION createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 9, 8474, 8, 0, 8 createvisualtask AnimTask_ShakeMon2, 5, 4, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, 5, 8, 0, 40, 1 @@ -1662,9 +1694,9 @@ Move_EXPLOSION:: @ 81C8E15 call gUnknown_81C8EB2 call gUnknown_81C8EB2 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 1, 1, 16, 16, 32767 + createvisualtask AnimTask_BlendSelected, 10, 1, 1, 16, 16, RGB_WHITE delay 50 - createvisualtask sub_80BA7F8, 10, 1, 3, 16, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 1, 3, 16, 0, RGB_WHITE end gUnknown_81C8EB2:: @ 81C8EB2 @@ -1686,7 +1718,7 @@ gUnknown_81C8EB2:: @ 81C8EB2 return Move_DEFENSE_CURL:: @ 81C8F1C - loadspritegfx 10234 + loadspritegfx ANIM_TAG_ECLIPSING_ORB loopsewithpan SE_W161, 192, 18, 3 createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 0, 0 createvisualtask AnimTask_DefenseCurlDeformMon, 5, @@ -1698,7 +1730,7 @@ Move_DEFENSE_CURL:: @ 81C8F1C end Move_PROTECT:: @ 81C8F55 - loadspritegfx 10280 + loadspritegfx ANIM_TAG_PROTECT monbg 2 monbgprio_28 0 waitplaysewithpan SE_W115, 192, 16 @@ -1708,23 +1740,23 @@ Move_PROTECT:: @ 81C8F55 end Move_DETECT:: @ 81C8F72 - loadspritegfx 10071 + loadspritegfx ANIM_TAG_SPARKLE_4 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 9, 0 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 2, 1, 0, 9, 32767 + createvisualtask AnimTask_BlendSelected, 10, 2, 1, 0, 9, RGB_WHITE delay 18 playsewithpan SE_W197, 192 createsprite gSpriteTemplate_83BF480, ANIM_ATTACKER, 13, 20, -20 waitforvisualfinish delay 10 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 9, 0, 0 - createvisualtask sub_80BA7F8, 10, 2, 2, 9, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 2, 2, 9, 0, RGB_WHITE waitforvisualfinish end Move_FRUSTRATION:: @ 81C8FD0 - loadspritegfx 10135 - loadspritegfx 10087 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_ANGER monbg 3 setalpha 12, 8 createvisualtask AnimTask_GetFrustrationPowerLevel, 1, @@ -1742,7 +1774,7 @@ gUnknown_81C8FFF:: @ 81C8FFF gUnknown_81C9004:: @ 81C9004 playsewithpan SE_W082, 192 createvisualtask AnimTask_ShakeMon2, 5, 0, 1, 0, 15, 1 - createvisualtask sub_80BA7F8, 10, 2, 3, 0, 9, 31 + createvisualtask AnimTask_BlendSelected, 10, 2, 3, 0, 9, RGB(31, 0, 0) waitforvisualfinish delay 20 playsewithpan SE_W207B, 192 @@ -1773,13 +1805,13 @@ gUnknown_81C9004:: @ 81C9004 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, -18, 1, 0 playsewithpan SE_W004, 63 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 2, 3, 9, 0, 31 + createvisualtask AnimTask_BlendSelected, 10, 2, 3, 9, 0, RGB(31, 0, 0) goto gUnknown_81C8FFF gUnknown_81C910A:: @ 81C910A playsewithpan SE_W082, 192 createvisualtask AnimTask_ShakeMon2, 5, 0, 1, 0, 15, 1 - createvisualtask sub_80BA7F8, 10, 2, 3, 0, 9, 31 + createvisualtask AnimTask_BlendSelected, 10, 2, 3, 0, 9, RGB(31, 0, 0) waitforvisualfinish delay 20 playsewithpan SE_W207B, 192 @@ -1800,7 +1832,7 @@ gUnknown_81C910A:: @ 81C910A createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -12, -6, 1, 1 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 6, 1 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 2, 3, 9, 0, 31 + createvisualtask AnimTask_BlendSelected, 10, 2, 3, 9, 0, RGB(31, 0, 0) goto gUnknown_81C8FFF gUnknown_81C91D7:: @ 81C91D7 @@ -1833,7 +1865,7 @@ gUnknown_81C9253:: @ 81C9253 goto gUnknown_81C8FFF Move_SAFEGUARD:: @ 81C9297 - loadspritegfx 10244 + loadspritegfx ANIM_TAG_GUARD_RING monbg 2 setalpha 8, 8 playsewithpan SE_W208, 192 @@ -1844,14 +1876,14 @@ Move_SAFEGUARD:: @ 81C9297 createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2, waitforvisualfinish playsewithpan SE_REAPOKE, 192 - createvisualtask sub_80B9BDC, 2, 10, 0, 2, 0, 10, 32767 + createvisualtask AnimTask_CurseBlendEffect, 2, 10, 0, 2, 0, 10, RGB_WHITE waitforvisualfinish clearmonbg 2 blendoff end Move_PAIN_SPLIT:: @ 81C92D9 - loadspritegfx 10239 + loadspritegfx ANIM_TAG_PAIN_SPLIT createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -8, -42, 0 createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -8, -42, 1 delay 10 @@ -1875,8 +1907,8 @@ Move_PAIN_SPLIT:: @ 81C92D9 end Move_VICE_GRIP:: @ 81C9381 - loadspritegfx 10138 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_CUT + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W011, 63 @@ -1891,8 +1923,8 @@ Move_VICE_GRIP:: @ 81C9381 end Move_GUILLOTINE:: @ 81C93C9 - loadspritegfx 10138 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_CUT + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 fadetobgfromset 12, 13, 14 @@ -1900,7 +1932,7 @@ Move_GUILLOTINE:: @ 81C93C9 playsewithpan SE_W011, 63 createsprite gGuillotineSpriteTemplate, ANIM_ATTACKER, 2, 0 createsprite gGuillotineSpriteTemplate, ANIM_ATTACKER, 2, 1 - createvisualtask sub_80BA7F8, 10, 4, 2, 0, 16, 0 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 16, RGB_BLACK delay 9 createvisualtask AnimTask_ShakeMon2, 5, 1, 2, 0, 23, 1 delay 46 @@ -1916,8 +1948,8 @@ Move_GUILLOTINE:: @ 81C93C9 end Move_PAY_DAY:: @ 81C9455 - loadspritegfx 10100 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_COIN + loadspritegfx ANIM_TAG_IMPACT monbg 1 monbgprio_28 1 setalpha 12, 8 @@ -1934,9 +1966,9 @@ Move_PAY_DAY:: @ 81C9455 end Move_OUTRAGE:: @ 81C94A8 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER loopsewithpan SE_W082, 192, 8, 3 - createvisualtask sub_80B9BDC, 2, 7, 2, 5, 3, 8, 430 + createvisualtask AnimTask_CurseBlendEffect, 2, 7, 2, 5, 3, 8, 430 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 12, 6, 5, 4 delay 0 createsprite gUnknown_83E772C, ANIM_TARGET, 2, 0, 0, 30, 1280, 0, 3 @@ -1980,28 +2012,28 @@ gUnknown_81C95AF:: @ 81C95AF return Move_SPARK:: @ 81C9643 - loadspritegfx 10135 - loadspritegfx 10011 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_SPARK_2 delay 0 - createvisualtask sub_80B9BDC, 2, 3, -31, 1, 5, 5, 23551 + createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 5, 5, 23551 playsewithpan SE_W085B, 192 createsprite gUnknown_83E5FC4, ANIM_ATTACKER, 0, 32, 24, 190, 12, 0, 1, 0 delay 0 createsprite gUnknown_83E5FC4, ANIM_ATTACKER, 0, 80, 24, 22, 12, 0, 1, 0 createsprite gUnknown_83E5FC4, ANIM_ATTACKER, 0, 156, 24, 121, 13, 0, 1, 1 delay 0 - createvisualtask sub_80B9BDC, 2, 3, -31, 1, 0, 0, 23551 + createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 0, 0, 23551 delay 10 - createvisualtask sub_80B9BDC, 2, 3, -31, 1, 5, 5, 23551 + createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 5, 5, 23551 playsewithpan SE_W085B, 192 createsprite gUnknown_83E5FC4, ANIM_ATTACKER, 0, 100, 24, 60, 10, 0, 1, 0 createsprite gUnknown_83E5FC4, ANIM_ATTACKER, 0, 170, 24, 42, 11, 0, 1, 1 delay 0 createsprite gUnknown_83E5FC4, ANIM_ATTACKER, 0, 238, 24, 165, 10, 0, 1, 1 delay 0 - createvisualtask sub_80B9BDC, 2, 3, -31, 1, 0, 0, 23551 + createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 0, 0, 23551 delay 20 - createvisualtask sub_80B9BDC, 2, 3, -31, 1, 7, 7, 23551 + createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 7, 7, 23551 playsewithpan SE_W085B, 192 createsprite gUnknown_83E6070, ANIM_ATTACKER, 4, 0, 0, 32, 12, 0, 20, 0, 0 createsprite gUnknown_83E6070, ANIM_ATTACKER, 4, 0, 0, 32, 12, 64, 20, 1, 0 @@ -2013,20 +2045,20 @@ Move_SPARK:: @ 81C9643 createsprite gUnknown_83E6070, ANIM_ATTACKER, 4, 0, 0, 16, 12, 224, 20, 2, 0 delay 4 waitforvisualfinish - createvisualtask sub_80B9BDC, 2, 3, -31, 1, 0, 0, 23551 + createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 0, 0, 23551 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 4 playsewithpan SE_W063, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 waitforvisualfinish - createvisualtask sub_80B9BDC, 2, 4, -31, 2, 0, 6, 23551 + createvisualtask AnimTask_CurseBlendEffect, 2, 4, -31, 2, 0, 6, 23551 call gUnknown_81D58D4 waitforvisualfinish end Move_ATTRACT:: @ 81C985A - loadspritegfx 10216 + loadspritegfx ANIM_TAG_RED_HEART loopsewithpan SE_W204, 192, 12, 3 createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, 0 delay 15 @@ -2051,7 +2083,7 @@ Move_ATTRACT:: @ 81C985A createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 112, 256, 90 createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 200, 272, 90 delay 75 - createvisualtask sub_80B9BDC, 2, 4, 4, 4, 0, 10, 28479 + createvisualtask AnimTask_CurseBlendEffect, 2, 4, 4, 4, 0, 10, 28479 end Move_GROWTH:: @ 81C9953 @@ -2062,13 +2094,13 @@ Move_GROWTH:: @ 81C9953 end gUnknown_81C9960:: @ 81C9960 - createvisualtask sub_80B9BDC, 2, 2, 0, 2, 0, 8, 32767 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 2, 0, 8, RGB_WHITE playsewithpan SE_W036, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -3, -3, 16, 0, 0 return Move_WHIRLWIND:: @ 81C9989 - loadspritegfx 10162 + loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gUnknown_83E6C84, ANIM_ATTACKER, 2, 0, -8, 1, 60, 0 createsprite gUnknown_83E6C84, ANIM_ATTACKER, 2, 0, 0, 1, 60, 1 createsprite gUnknown_83E6C84, ANIM_ATTACKER, 2, 0, 8, 1, 60, 2 @@ -2087,7 +2119,7 @@ Move_WHIRLWIND:: @ 81C9989 end Move_CONFUSE_RAY:: @ 81C9A31 - loadspritegfx 10013 + loadspritegfx ANIM_TAG_YELLOW_BALL monbg 3 fadetobg 2 waitbgfadein @@ -2107,7 +2139,7 @@ Move_CONFUSE_RAY:: @ 81C9A31 end Move_LOCK_ON:: @ 81C9A84 - loadspritegfx 10014 + loadspritegfx ANIM_TAG_LOCK_ON createsprite gLockOnTargetSpriteTemplate, ANIM_ATTACKER, 40, createsprite gLockOnMoveTargetSpriteTemplate, ANIM_ATTACKER, 40, 1 createsprite gLockOnMoveTargetSpriteTemplate, ANIM_ATTACKER, 40, 2 @@ -2119,7 +2151,7 @@ Move_LOCK_ON:: @ 81C9A84 end Move_MEAN_LOOK:: @ 81C9ABA - loadspritegfx 10187 + loadspritegfx ANIM_TAG_EYE monbg 3 playsewithpan SE_W060, 192 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 16, 0 @@ -2134,7 +2166,7 @@ Move_MEAN_LOOK:: @ 81C9ABA end Move_ROCK_THROW:: @ 81C9AFF - loadspritegfx 10058 + loadspritegfx ANIM_TAG_ROCKS createsprite gUnknown_83E7B88, ANIM_TARGET, 2, 6, 1, 15, 1 createsprite gUnknown_83E73B4, ANIM_TARGET, 2, 0, 1, 0, 0 playsewithpan SE_W088, 63 @@ -2155,7 +2187,7 @@ Move_ROCK_THROW:: @ 81C9AFF end Move_ROCK_SLIDE:: @ 81C9B8B - loadspritegfx 10058 + loadspritegfx ANIM_TAG_ROCKS monbg 3 createsprite gUnknown_83E7B88, ANIM_ATTACKER, 2, 7, 1, 11, 1 createsprite gUnknown_83E73B4, ANIM_TARGET, 2, -5, 1, -5, 1 @@ -2206,7 +2238,7 @@ gUnknown_81C9C23:: @ 81C9C23 return Move_THIEF:: @ 81C9CCC - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 1 delay 1 fadetobg 1 @@ -2226,8 +2258,8 @@ Move_THIEF:: @ 81C9CCC end Move_BUBBLE_BEAM:: @ 81C9D13 - loadspritegfx 10146 - loadspritegfx 10155 + loadspritegfx ANIM_TAG_BUBBLE + loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg 1 monbgprio_28 1 setalpha 12, 8 @@ -2265,10 +2297,10 @@ gUnknown_81C9D4D:: @ 81C9D4D return Move_ICY_WIND:: @ 81C9DF0 - loadspritegfx 10141 - loadspritegfx 10142 + loadspritegfx ANIM_TAG_ICE_CRYSTALS + loadspritegfx ANIM_TAG_ICE_SPIKES monbg 3 - createvisualtask sub_80BA7F8, 10, 11, 4, 0, 4, 0 + createvisualtask AnimTask_BlendSelected, 10, 11, 4, 0, 4, RGB_BLACK fadetobg 15 waitbgfadeout playsewithpan SE_W196, 0 @@ -2285,7 +2317,7 @@ Move_ICY_WIND:: @ 81C9DF0 clearmonbg 3 restorebg waitbgfadeout - createvisualtask sub_80BA7F8, 10, 11, 4, 4, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 11, 4, 4, 0, RGB_BLACK waitbgfadein end @@ -2302,8 +2334,8 @@ gUnknown_81C9E48:: @ 81C9E48 return Move_SMOKESCREEN:: @ 81C9EB0 - loadspritegfx 10016 - loadspritegfx 10017 + loadspritegfx ANIM_TAG_BLACK_SMOKE + loadspritegfx ANIM_TAG_BLACK_BALL playsewithpan SE_W104, 192 createsprite gBlackBallSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25 waitforvisualfinish @@ -2326,7 +2358,7 @@ Move_SMOKESCREEN:: @ 81C9EB0 end Move_CONVERSION:: @ 81C9FA9 - loadspritegfx 10018 + loadspritegfx ANIM_TAG_CONVERSION monbg 2 monbgprio_28 0 setalpha 16, 0 @@ -2378,7 +2410,7 @@ Move_CONVERSION:: @ 81C9FA9 end Move_CONVERSION_2:: @ 81CA0BE - loadspritegfx 10018 + loadspritegfx ANIM_TAG_CONVERSION monbg 3 monbgprio_2A 1 setalpha 0, 16 @@ -2423,8 +2455,8 @@ Move_CONVERSION_2:: @ 81CA0BE end Move_ROLLING_KICK:: @ 81CA1DA - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 18, 6, 1, 4 @@ -2445,7 +2477,7 @@ Move_ROLLING_KICK:: @ 81CA1DA end Move_HEADBUTT:: @ 81CA25D - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_W029, 192 waitforvisualfinish @@ -2461,8 +2493,8 @@ Move_HEADBUTT:: @ 81CA25D end Move_HORN_ATTACK:: @ 81CA2BA - loadspritegfx 10135 - loadspritegfx 10020 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HORN_HIT createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_W029, 192 waitforvisualfinish @@ -2479,8 +2511,8 @@ Move_HORN_ATTACK:: @ 81CA2BA end Move_FURY_ATTACK:: @ 81CA327 - loadspritegfx 10135 - loadspritegfx 10020 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HORN_HIT createvisualtask sub_8099980, 2, 4, 256, 0, 2 choosetwoturnanim gUnknown_81CA358, gUnknown_81CA37E @@ -2504,8 +2536,8 @@ gUnknown_81CA37E:: @ 81CA37E goto gUnknown_81CA345 Move_HORN_DRILL:: @ 81CA3A4 - loadspritegfx 10135 - loadspritegfx 10020 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HORN_HIT jumpifcontest gUnknown_81CA50A fadetobg 7 waitbgfadeout @@ -2572,8 +2604,8 @@ gUnknown_81CA50A:: @ 81CA50A goto gUnknown_81CA3C1 Move_THRASH:: @ 81CA521 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET createvisualtask AnimTask_ThrashMoveMonHorizontal, 2, createvisualtask AnimTask_ThrashMoveMonVertical, 2, createsprite gUnknown_83E6728, ANIM_TARGET, 3, 1, 10, 0 @@ -2590,7 +2622,7 @@ Move_THRASH:: @ 81CA521 end Move_SING:: @ 81CA5A0 - loadspritegfx 10072 + loadspritegfx ANIM_TAG_MUSIC_NOTES monbg 3 createvisualtask AnimTask_MusicNotesRainbowBlend, 2, waitforvisualfinish @@ -2626,8 +2658,8 @@ Move_SING:: @ 81CA5A0 end Move_LOW_KICK:: @ 81CA674 - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 createsprite gUnknown_83E6758, ANIM_TARGET, 2, -24, 28, 40, 8, 160, 0 delay 4 @@ -2643,24 +2675,24 @@ Move_EARTHQUAKE:: @ 81CA6D1 createvisualtask sub_80B94B4, 5, 4, 10, 50 playsewithpan SE_W089, 0 delay 10 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, 32767, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, RGB_WHITE, 14 delay 16 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, 32767, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, RGB_WHITE, 14 end Move_FISSURE:: @ 81CA71E - loadspritegfx 10074 + loadspritegfx ANIM_TAG_MUD_SAND createvisualtask sub_80B94B4, 3, 5, 10, 50 createvisualtask sub_80B94B4, 3, 1, 10, 50 playsewithpan SE_W089, 63 delay 8 call gUnknown_81CA79F delay 15 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, 32767, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, RGB_WHITE, 14 delay 15 call gUnknown_81CA7F0 delay 15 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, 32767, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, RGB_WHITE, 14 delay 15 call gUnknown_81CA79F delay 50 @@ -2698,8 +2730,8 @@ gUnknown_81CA84A:: @ 81CA84A end gUnknown_81CA84B:: @ 81CA84B - loadspritegfx 10074 - loadspritegfx 10281 + loadspritegfx ANIM_TAG_MUD_SAND + loadspritegfx ANIM_TAG_DIRT_MOUND createsprite gUnknown_83E7AC4, ANIM_ATTACKER, 1, 0, 0, 180 createsprite gUnknown_83E7AC4, ANIM_ATTACKER, 1, 0, 1, 180 monbg_22 0 @@ -2718,8 +2750,8 @@ gUnknown_81CA84B:: @ 81CA84B goto gUnknown_81CA84A gUnknown_81CA8A6:: @ 81CA8A6 - loadspritegfx 10135 - loadspritegfx 10281 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_DIRT_MOUND createvisualtask sub_80B90EC, 2, 0 waitforvisualfinish monbg 0 @@ -2757,7 +2789,7 @@ Move_AGILITY:: @ 81CA97A monbg 2 setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 24, 6, 4, 4 - createvisualtask sub_80BAB98, 2, 0, 4, 7, 10 + createvisualtask AnimTask_CloneBattlerSpriteWithBlend, 2, 0, 4, 7, 10 playsewithpan SE_W104, 192 delay 12 playsewithpan SE_W104, 192 @@ -2775,11 +2807,11 @@ Move_AGILITY:: @ 81CA97A end Move_QUICK_ATTACK:: @ 81CA9C4 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 2 setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 24, 6, 1, 5 - createvisualtask sub_80BAB98, 2, 0, 4, 7, 3 + createvisualtask AnimTask_CloneBattlerSpriteWithBlend, 2, 0, 4, 7, 3 playsewithpan SE_W026, 192 delay 4 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 6, 1 @@ -2792,8 +2824,8 @@ Move_QUICK_ATTACK:: @ 81CA9C4 end Move_RAGE:: @ 81CAA1C - loadspritegfx 10135 - loadspritegfx 10087 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_ANGER monbg 1 setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 3, 0, 31, 10, 0, 2 @@ -2857,8 +2889,8 @@ Move_MINIMIZE:: @ 81CAAF2 end Move_METRONOME:: @ 81CAB05 - loadspritegfx 10064 - loadspritegfx 10209 + loadspritegfx ANIM_TAG_FINGER + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 100 playsewithpan SE_W118, 192 delay 6 @@ -2891,12 +2923,12 @@ gUnknown_81CAB49:: @ 81CAB49 return gUnknown_81CAB86:: @ 81CAB86 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_SkullBashPosition, 2, 0 playsewithpan SE_W036, 192 waitforvisualfinish playse SE_BAN - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, 32767, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, RGB_WHITE, 14 createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 2, 0, 40, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 10, 0, 40, 1 createsprite gUnknown_83E7C98, ANIM_TARGET, 4, 0, 0, 1, 0 @@ -2906,7 +2938,7 @@ gUnknown_81CAB86:: @ 81CAB86 goto gUnknown_81CAB38 Move_AMNESIA:: @ 81CABF5 - loadspritegfx 10093 + loadspritegfx ANIM_TAG_AMNESIA call gUnknown_81D59BB delay 8 createsprite gUnknown_83E6FF4, ANIM_ATTACKER, 20, @@ -2918,8 +2950,8 @@ Move_AMNESIA:: @ 81CABF5 end Move_KINESIS:: @ 81CAC19 - loadspritegfx 10075 - loadspritegfx 10097 + loadspritegfx ANIM_TAG_ALERT + loadspritegfx ANIM_TAG_BENT_SPOON playsewithpan SE_W060, 192 call gUnknown_81D59BB createsprite gUnknown_83E6F8C, ANIM_ATTACKER, 20, @@ -2937,12 +2969,12 @@ Move_KINESIS:: @ 81CAC19 end Move_GLARE:: @ 81CAC6A - loadspritegfx 10248 - loadspritegfx 10218 + loadspritegfx ANIM_TAG_SMALL_RED_EYE + loadspritegfx ANIM_TAG_EYE_SPARKLE createvisualtask AnimTask_GlareEyeDots, 5, 0 playsewithpan SE_W060B, 192 waitforvisualfinish - createvisualtask sub_80BA7F8, 5, 1, 0, 0, 16, 0 + createvisualtask AnimTask_BlendSelected, 5, 1, 0, 0, 16, RGB_BLACK waitforvisualfinish createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8 @@ -2951,11 +2983,11 @@ Move_GLARE:: @ 81CAC6A delay 2 createvisualtask sub_80ADAD8, 3, 20, 1, 0 waitforvisualfinish - createvisualtask sub_80BA7F8, 5, 1, 0, 16, 0, 0 + createvisualtask AnimTask_BlendSelected, 5, 1, 0, 16, 0, RGB_BLACK end Move_BARRAGE:: @ 81CACD3 - loadspritegfx 10254 + loadspritegfx ANIM_TAG_RED_BALL createvisualtask AnimTask_BarrageBall, 3, playsewithpan SE_W207, 192 delay 24 @@ -2979,46 +3011,46 @@ gUnknown_81CAD25:: @ 81CAD25 goto gUnknown_81CADB7 gUnknown_81CAD40:: @ 81CAD40 - createvisualtask sub_80BA7F8, 10, 27, 1, 0, 12, 0 + createvisualtask AnimTask_BlendSelected, 10, 27, 1, 0, 12, RGB_BLACK waitforvisualfinish delay 12 - createvisualtask sub_80BA7F8, 10, 2, 1, 8, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 2, 1, 8, 0, RGB_BLACK createvisualtask sub_80B94B4, 5, 0, 2, 16 loopsewithpan SE_W287, 192, 4, 8 - createvisualtask sub_80BA7F8, 10, 2, 1, 0, 15, 32767 + createvisualtask AnimTask_BlendSelected, 10, 2, 1, 0, 15, RGB_WHITE delay 20 - createvisualtask sub_80BA7F8, 10, 2, 1, 15, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 2, 1, 15, 0, RGB_WHITE waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 25, 1, 8, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 25, 1, 8, 0, RGB_BLACK waitforvisualfinish clearmonbg 3 blendoff goto gUnknown_81CAD24 gUnknown_81CADB7:: @ 81CADB7 - createvisualtask sub_80BA83C, 10, 1, 1, 0, 12, 0 + createvisualtask AnimTask_BlendExcept, 10, 1, 1, 0, 12, 0 waitforvisualfinish delay 12 - createvisualtask sub_80BA7F8, 10, 2, 1, 8, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 2, 1, 8, 0, RGB_BLACK createvisualtask sub_80B94B4, 5, 0, 2, 16 playsewithpan SE_W287, 192 delay 8 - createvisualtask sub_80BA7F8, 10, 2, 1, 0, 15, 32767 + createvisualtask AnimTask_BlendSelected, 10, 2, 1, 0, 15, RGB_WHITE delay 20 - createvisualtask sub_80BA7F8, 10, 2, 1, 15, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 2, 1, 15, 0, RGB_WHITE waitforvisualfinish - createvisualtask sub_80BA83C, 10, 4, 1, 8, 0, 0 + createvisualtask AnimTask_BlendExcept, 10, 4, 1, 8, 0, 0 waitforvisualfinish clearmonbg 3 blendoff goto gUnknown_81CAD24 gUnknown_81CAE2E:: @ 81CAE2E - loadspritegfx 10135 - loadspritegfx 10284 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_BIRD call gUnknown_81D59CF monbg 0 - createvisualtask sub_80BA7F8, 10, 2, 0, 0, 16, 32767 + createvisualtask AnimTask_BlendSelected, 10, 2, 0, 0, 16, RGB_WHITE delay 4 createvisualtask sub_80B78E0, 5, 0 waitforvisualfinish @@ -3030,7 +3062,7 @@ gUnknown_81CAE2E:: @ 81CAE2E delay 20 createvisualtask sub_80B79DC, 5, 1 delay 2 - createvisualtask sub_80BA7F8, 10, 2, 0, 15, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 2, 0, 15, 0, RGB_WHITE waitforvisualfinish clearmonbg 0 call gUnknown_81D59FF @@ -3061,13 +3093,13 @@ Move_ACID_ARMOR:: @ 81CAED5 end Move_SHARPEN:: @ 81CAEEE - loadspritegfx 10185 + loadspritegfx ANIM_TAG_SPHERE_TO_CUBE createsprite gSharpenSphereSpriteTemplate, ANIM_ATTACKER, 2, waitforvisualfinish end Move_SUPER_FANG:: @ 81CAEFA - loadspritegfx 10192 + loadspritegfx ANIM_TAG_FANG_ATTACK createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 1, 0, 20, 1 playsewithpan SE_W082, 192 waitforvisualfinish @@ -3080,14 +3112,14 @@ Move_SUPER_FANG:: @ 81CAEFA createsprite gSuperFangSpriteTemplate, ANIM_TARGET, 2, playsewithpan SE_W044, 63 delay 8 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 2143, 14, 32767, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 2143, 14, RGB_WHITE, 14 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 7, 12, 1 waitforvisualfinish blendoff end Move_SLASH:: @ 81CAF7B - loadspritegfx 10183 + loadspritegfx ANIM_TAG_SLASH createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 1, -8, 0 playsewithpan SE_W013, 63 delay 4 @@ -3098,8 +3130,8 @@ Move_SLASH:: @ 81CAF7B end Move_STRUGGLE:: @ 81CAFB5 - loadspritegfx 10135 - loadspritegfx 10215 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_MOVEMENT_WAVES monbg 1 setalpha 12, 8 createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 3, 0, 12, 4 @@ -3116,7 +3148,7 @@ Move_STRUGGLE:: @ 81CAFB5 end Move_SKETCH:: @ 81CB01B - loadspritegfx 10002 + loadspritegfx ANIM_TAG_PENCIL monbg 1 createvisualtask sub_80A8874, 2, createsprite gPencilSpriteTemplate, ANIM_TARGET, 2, @@ -3141,7 +3173,7 @@ Move_NIGHTMARE:: @ 81CB043 end gUnknown_81CB06F:: @ 81CB06F - createvisualtask AnimTask_BlendMonInAndOut, 2, 0, 32767, 10, 2, 1 + createvisualtask AnimTask_BlendMonInAndOut, 2, 0, RGB_WHITE, 10, 2, 1 createvisualtask AnimTask_ShakeMon, 2, 0, 3, 0, 32, 1 playsewithpan SE_W171, 63 waitforvisualfinish @@ -3150,7 +3182,7 @@ gUnknown_81CB06F:: @ 81CB06F end Move_FLAIL:: @ 81CB099 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 createvisualtask AnimTask_FlailMovement, 2, 0 @@ -3169,7 +3201,7 @@ Move_SPITE:: @ 81CB0D6 playsewithpan SE_W060, 192 waitbgfadein monbg 3 - createvisualtask sub_80B9BDC, 2, 2, 2, 6, 0, 8, 32767 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 6, 0, 8, RGB_WHITE createvisualtask sub_80B5AAC, 2, loopsewithpan SE_W060, 63, 20, 3 waitforvisualfinish @@ -3179,8 +3211,8 @@ Move_SPITE:: @ 81CB0D6 end Move_MACH_PUNCH:: @ 81CB105 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg 2 createvisualtask AnimTask_GetAttackerSide, 2, jumpargeq 7, 1, gUnknown_81CB186 @@ -3213,7 +3245,7 @@ gUnknown_81CB186:: @ 81CB186 goto gUnknown_81CB11E Move_FORESIGHT:: @ 81CB18D - loadspritegfx 10258 + loadspritegfx ANIM_TAG_MAGNIFYING_GLASS monbg 3 monbgprio_28 1 setalpha 16, 0 @@ -3224,7 +3256,7 @@ Move_FORESIGHT:: @ 81CB18D delay 24 playsewithpan SE_W166, 63 delay 10 - createvisualtask AnimTask_BlendMonInAndOut, 5, 1, 32767, 12, 2, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, 1, RGB_WHITE, 12, 2, 1 playsewithpan SE_W197, 63 waitforvisualfinish blendoff @@ -3232,7 +3264,7 @@ Move_FORESIGHT:: @ 81CB18D end Move_DESTINY_BOND:: @ 81CB1CC - loadspritegfx 10188 + loadspritegfx ANIM_TAG_WHITE_SHADOW fadetobg 2 playsewithpan SE_W060, 192 waitbgfadein @@ -3240,9 +3272,9 @@ Move_DESTINY_BOND:: @ 81CB1CC playsewithpan SE_W109, 192 delay 48 createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 2, 0, 24, 1 - createvisualtask sub_80BA83C, 2, 6, 1, 0, 12, 30653 + createvisualtask AnimTask_BlendExcept, 2, 6, 1, 0, 12, 30653 delay 24 - createvisualtask sub_80BA83C, 2, 6, 1, 12, 0, 30653 + createvisualtask AnimTask_BlendExcept, 2, 6, 1, 12, 0, 30653 playsewithpan SE_W171, 63 waitforvisualfinish restorebg @@ -3252,11 +3284,11 @@ Move_DESTINY_BOND:: @ 81CB1CC end Move_ENDURE:: @ 81CB227 - loadspritegfx 10184 + loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_W082, 192 call gUnknown_81CB267 delay 8 - createvisualtask sub_80B9BDC, 2, 2, 2, 2, 0, 11, 31 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 11, 31 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 32, 1 call gUnknown_81CB267 delay 8 @@ -3277,7 +3309,7 @@ gUnknown_81CB267:: @ 81CB267 return Move_CHARM:: @ 81CB2BB - loadspritegfx 10210 + loadspritegfx ANIM_TAG_MAGENTA_HEART createvisualtask AnimTask_RockMonBackAndForth, 5, 0, 2, 0 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 playsewithpan SE_W204, 192 @@ -3291,9 +3323,9 @@ Move_CHARM:: @ 81CB2BB end Move_ROLLOUT:: @ 81CB2FE - loadspritegfx 10135 - loadspritegfx 10074 - loadspritegfx 10058 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_MUD_SAND + loadspritegfx ANIM_TAG_ROCKS monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -3308,8 +3340,8 @@ Move_ROLLOUT:: @ 81CB2FE end Move_FALSE_SWIPE:: @ 81CB33F - loadspritegfx 10286 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SLASH_2 + loadspritegfx ANIM_TAG_IMPACT createsprite gFalseSwipeSliceSpriteTemplate, ANIM_TARGET, 2, playsewithpan SE_W233, 63 delay 16 @@ -3335,8 +3367,8 @@ Move_FALSE_SWIPE:: @ 81CB33F end Move_SWAGGER:: @ 81CB3C6 - loadspritegfx 10086 - loadspritegfx 10087 + loadspritegfx ANIM_TAG_BREATH + loadspritegfx ANIM_TAG_ANGER createvisualtask AnimTask_GrowAndShrink, 2, playsewithpan SE_W207, 192 waitforvisualfinish @@ -3353,9 +3385,9 @@ Move_SWAGGER:: @ 81CB3C6 end Move_MILK_DRINK:: @ 81CB40E - loadspritegfx 10099 - loadspritegfx 10203 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_MILK_BOTTLE + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_BLUE_STAR monbg 1 createsprite gMilkBottleSpriteTemplate, ANIM_ATTACKER, 2, delay 40 @@ -3393,14 +3425,14 @@ gUnknown_81CB48E:: @ 81CB48E createvisualtask sub_80B94B4, 5, 4, 0, 50 loopsewithpan SE_W070, 63, 8, 10 delay 10 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, 32767, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, RGB_WHITE, 14 delay 16 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, 32767, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, RGB_WHITE, 14 goto gUnknown_81CB468 Move_RAPID_SPIN:: @ 81CB4E1 - loadspritegfx 10135 - loadspritegfx 10229 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_RAPID_SPIN monbg 0 createsprite gRapidSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 32, -32, 40, -2 createvisualtask AnimTask_RapinSpinMonElevation, 2, 0, 2, 0 @@ -3418,9 +3450,9 @@ Move_RAPID_SPIN:: @ 81CB4E1 end Move_MOONLIGHT:: @ 81CB54E - loadspritegfx 10194 - loadspritegfx 10195 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_MOON + loadspritegfx ANIM_TAG_GREEN_SPARKLE + loadspritegfx ANIM_TAG_BLUE_STAR setalpha 0, 16 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 16, 0 waitforvisualfinish @@ -3445,8 +3477,8 @@ Move_MOONLIGHT:: @ 81CB54E end Move_EXTREME_SPEED:: @ 81CB5DE - loadspritegfx 10207 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SPEED_DUST + loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_GetAttackerSide, 2, jumpargeq 7, 1, gUnknown_81CB695 fadetobg 9 @@ -3495,8 +3527,8 @@ gUnknown_81CB695:: @ 81CB695 goto gUnknown_81CB5F5 Move_UPROAR:: @ 81CB69C - loadspritegfx 10225 - loadspritegfx 10203 + loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE + loadspritegfx ANIM_TAG_THIN_RING monbg 3 createvisualtask AnimTask_UproarDistortion, 2, 0 createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 @@ -3520,7 +3552,7 @@ Move_UPROAR:: @ 81CB69C end Move_HEAT_WAVE:: @ 81CB766 - loadspritegfx 10261 + loadspritegfx ANIM_TAG_FLYING_DIRT createvisualtask AnimTask_BlendParticle, 5, 10261, 0, 6, 6, 31 createvisualtask AnimTask_LoadSandstormBackground, 5, 1 createvisualtask AnimTask_BlendBackground, 6, 6, 31 @@ -3544,19 +3576,19 @@ Move_HEAT_WAVE:: @ 81CB766 end Move_HAIL:: @ 81CB816 - loadspritegfx 10263 - loadspritegfx 10141 - createvisualtask sub_80BA7F8, 10, 1, 3, 0, 6, 0 + loadspritegfx ANIM_TAG_HAIL + loadspritegfx ANIM_TAG_ICE_CRYSTALS + createvisualtask AnimTask_BlendSelected, 10, 1, 3, 0, 6, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_Hail1, 5, loopsewithpan SE_W258, 0, 8, 10 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 1, 3, 6, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 3, 6, 0, RGB_BLACK end Move_TORMENT:: @ 81CB84E - loadspritegfx 10087 - loadspritegfx 10209 + loadspritegfx ANIM_TAG_ANGER + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createvisualtask AnimTask_TormentAttacker, 2, waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 2, 1, 31, 10, 1, 1 @@ -3592,15 +3624,15 @@ Move_MEMENTO:: @ 81CB892 end Move_FACADE:: @ 81CB8D6 - loadspritegfx 10243 + loadspritegfx ANIM_TAG_SWEAT_DROP createvisualtask AnimTask_SquishAndSweatDroplets, 2, 0, 3 createvisualtask AnimTask_FacadeColorBlend, 2, 0, 72 loopsewithpan SE_W207, 192, 24, 3 end Move_SMELLING_SALT:: @ 81CB8F6 - loadspritegfx 10247 - loadspritegfx 10255 + loadspritegfx ANIM_TAG_TAG_HAND + loadspritegfx ANIM_TAG_SMELLINGSALT_EFFECT createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, 1, 0, 2 createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, 1, 1, 2 delay 32 @@ -3614,7 +3646,7 @@ Move_SMELLING_SALT:: @ 81CB8F6 end Move_FOLLOW_ME:: @ 81CB951 - loadspritegfx 10064 + loadspritegfx ANIM_TAG_FINGER createsprite gFollowMeFingerSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_W039, 192 delay 18 @@ -3624,9 +3656,9 @@ Move_FOLLOW_ME:: @ 81CB951 end Move_CHARGE:: @ 81CB970 - loadspritegfx 10211 - loadspritegfx 10212 - loadspritegfx 10213 + loadspritegfx ANIM_TAG_ELECTRIC_ORBS + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_ELECTRICITY monbg 0 setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, 0 @@ -3659,9 +3691,9 @@ Move_CHARGE:: @ 81CB970 end Move_TAUNT:: @ 81CBA0B - loadspritegfx 10214 - loadspritegfx 10209 - loadspritegfx 10087 + loadspritegfx ANIM_TAG_FINGER_2 + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE + loadspritegfx ANIM_TAG_ANGER createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 45 playsewithpan SE_W118, 192 delay 6 @@ -3679,7 +3711,7 @@ Move_TAUNT:: @ 81CBA0B end Move_HELPING_HAND:: @ 81CBA5F - loadspritegfx 10247 + loadspritegfx ANIM_TAG_TAG_HAND createvisualtask AnimTask_HelpingHandAttackerMovement, 5, createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 0 createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 1 @@ -3696,7 +3728,7 @@ Move_HELPING_HAND:: @ 81CBA5F end Move_ASSIST:: @ 81CBAD2 - loadspritegfx 10252 + loadspritegfx ANIM_TAG_PAW_PRINT createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 112, -16, 140, 128, 36 delay 2 createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 208, 128, -16, 48, 36 @@ -3713,9 +3745,9 @@ Move_ASSIST:: @ 81CBAD2 end Move_SUPERPOWER:: @ 81CBB43 - loadspritegfx 10212 - loadspritegfx 10256 - loadspritegfx 10257 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_METEOR + loadspritegfx ANIM_TAG_FLAT_ROCK monbg 2 monbgprio_28 0 setalpha 12, 8 @@ -3747,14 +3779,14 @@ Move_SUPERPOWER:: @ 81CBB43 end Move_RECYCLE:: @ 81CBBFE - loadspritegfx 10278 + loadspritegfx ANIM_TAG_RECYCLE monbg 0 setalpha 0, 16 delay 1 createsprite gRecycleSpriteTemplate, ANIM_ATTACKER, 2, loopsewithpan SE_W036, 192, 24, 3 waitforvisualfinish - createvisualtask AnimTask_BlendMonInAndOut, 5, 0, 32767, 12, 2, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, 0, RGB_WHITE, 12, 2, 1 playsewithpan SE_W036, 192 waitforvisualfinish blendoff @@ -3763,10 +3795,10 @@ Move_RECYCLE:: @ 81CBBFE end Move_BRICK_BREAK:: @ 81CBC32 - loadspritegfx 10167 - loadspritegfx 10135 - loadspritegfx 10143 - loadspritegfx 10208 + loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_TORN_METAL choosetwoturnanim gUnknown_81CBC47, gUnknown_81CBD16 gUnknown_81CBC47:: @ 81CBC47 @@ -3833,7 +3865,7 @@ gUnknown_81CBD16:: @ 81CBD16 end Move_YAWN:: @ 81CBE37 - loadspritegfx 10242 + loadspritegfx ANIM_TAG_PINK_CLOUD createvisualtask AnimTask_DeepInhale, 2, 0 playsewithpan SE_W281, 192 waitforvisualfinish @@ -3849,8 +3881,8 @@ Move_YAWN:: @ 81CBE37 end Move_ENDEAVOR:: @ 81CBE7A - loadspritegfx 10243 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SWEAT_DROP + loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_SquishAndSweatDroplets, 2, 0, 2 loopsewithpan SE_W039, 192, 24, 2 createvisualtask AnimTask_BlendMonInAndOut, 5, 0, 703, 12, 1, 2 @@ -3865,7 +3897,7 @@ Move_ENDEAVOR:: @ 81CBE7A end Move_ERUPTION:: @ 81CBEEF - loadspritegfx 10201 + loadspritegfx ANIM_TAG_WARM_ROCK createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 2, 0, 4, 31 waitforvisualfinish createvisualtask sub_80ACEA4, 2, @@ -3890,21 +3922,21 @@ Move_ERUPTION:: @ 81CBEEF end Move_SKILL_SWAP:: @ 81CBFBC - loadspritegfx 10251 + loadspritegfx ANIM_TAG_BLUEGREEN_ORB call gUnknown_81D59BB createvisualtask sub_80B3834, 3, 1 - createvisualtask AnimTask_BlendMonInAndOut, 5, 1, 32767, 12, 3, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, 1, RGB_WHITE, 12, 3, 1 loopsewithpan SE_W179, 192, 24, 3 delay 16 createvisualtask sub_80B3834, 3, 0 - createvisualtask AnimTask_BlendMonInAndOut, 5, 0, 32767, 12, 3, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, 0, RGB_WHITE, 12, 3, 1 waitforvisualfinish call gUnknown_81D59C7 end Move_IMPRISON:: @ 81CC007 - loadspritegfx 10249 - loadspritegfx 10250 + loadspritegfx ANIM_TAG_HOLLOW_ORB + loadspritegfx ANIM_TAG_X_SIGN call gUnknown_81D59BB monbg 3 createvisualtask sub_80B3584, 5, @@ -3920,7 +3952,7 @@ Move_IMPRISON:: @ 81CC007 end Move_GRUDGE:: @ 81CC04A - loadspritegfx 10253 + loadspritegfx ANIM_TAG_PURPLE_FLAME monbg 0 monbgprio_29 fadetobg 2 @@ -3956,7 +3988,7 @@ Move_CAMOUFLAGE:: @ 81CC072 end Move_TAIL_GLOW:: @ 81CC0B8 - loadspritegfx 10212 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT monbg 0 setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, 0 @@ -3972,8 +4004,8 @@ Move_TAIL_GLOW:: @ 81CC0B8 end Move_LUSTER_PURGE:: @ 81CC0FB - loadspritegfx 10267 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_WHITE_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_IMPACT fadetobg 3 waitbgfadeout createvisualtask AnimTask_FadeScreenToWhite, 5, @@ -3983,7 +4015,7 @@ Move_LUSTER_PURGE:: @ 81CC0FB playsewithpan SE_W076, 192 createsprite gUnknown_83E7148, ANIM_ATTACKER, 41, 0, 0, 0, 0 delay 20 - createvisualtask sub_80BA83C, 5, 5, 2, 0, 16, -1 + createvisualtask AnimTask_BlendExcept, 5, 5, 2, 0, 16, -1 createvisualtask AnimTask_BlendParticle, 5, 10267, 2, 0, 16, -1 waitforvisualfinish createvisualtask AnimTask_BlendParticle, 5, 10135, 0, 12, 12, 23552 @@ -4006,7 +4038,7 @@ Move_LUSTER_PURGE:: @ 81CC0FB createsprite gUnknown_83E7C50, ANIM_TARGET, 3, 1, 2 createvisualtask sub_80DD3DC, 5, 208, 63 waitforvisualfinish - createvisualtask sub_80BA83C, 5, 5, 2, 16, 0, -1 + createvisualtask AnimTask_BlendExcept, 5, 5, 2, 16, 0, -1 createvisualtask sub_80B94B4, 5, 1, 5, 14 waitforvisualfinish clearmonbg 0 @@ -4015,27 +4047,27 @@ Move_LUSTER_PURGE:: @ 81CC0FB end Move_MIST_BALL:: @ 81CC212 - loadspritegfx 10155 - loadspritegfx 10270 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_WHITE_FEATHER delay 0 playsewithpan SE_W081, 192 createsprite gUnknown_83E64E8, ANIM_TARGET, 0, 0, 0, 0, 0, 30, 0 waitforvisualfinish playsewithpan SE_W028, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 10, 0 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 1, 1, 32279, 16, 32767, 16 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 1, 1, 32279, 16, RGB_WHITE, 16 delay 0 playsewithpan SE_W114, 0 createvisualtask AnimTask_LoadMistTiles, 5, - createvisualtask sub_80BA7F8, 10, 4, 3, 0, 16, 32767 + createvisualtask AnimTask_BlendSelected, 10, 4, 3, 0, 16, RGB_WHITE delay 8 createvisualtask AnimTask_ShakeMon, 2, 1, 4, 0, 70, 0 delay 70 - createvisualtask sub_80BA7F8, 10, 4, 2, 16, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 16, 0, RGB_WHITE end Move_FEATHER_DANCE:: @ 81CC2A1 - loadspritegfx 10270 + loadspritegfx ANIM_TAG_WHITE_FEATHER monbg 3 monbgprio_29 playsewithpan SE_W080, 63 @@ -4057,8 +4089,8 @@ Move_FEATHER_DANCE:: @ 81CC2A1 end Move_TEETER_DANCE:: @ 81CC371 - loadspritegfx 10072 - loadspritegfx 10073 + loadspritegfx ANIM_TAG_MUSIC_NOTES + loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_TeeterDanceMovement, 5, createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, -2 playsewithpan SE_W298, 192 @@ -4077,7 +4109,7 @@ Move_TEETER_DANCE:: @ 81CC371 end Move_MUD_SPORT:: @ 81CC3DC - loadspritegfx 10074 + loadspritegfx ANIM_TAG_MUD_SAND createvisualtask AnimTask_Splash, 2, 0, 6 delay 24 createsprite gUnknown_83E7A94, ANIM_TARGET, 2, 0, -4, -16 @@ -4124,9 +4156,9 @@ Move_MUD_SPORT:: @ 81CC3DC end Move_NEEDLE_ARM:: @ 81CC513 - loadspritegfx 10266 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_GREEN_SPIKE + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET loopsewithpan SE_W030, 63, 2, 16 createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 0, -32, 16 delay 2 @@ -4167,7 +4199,7 @@ Move_NEEDLE_ARM:: @ 81CC513 end Move_SLACK_OFF:: @ 81CC6C3 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask AnimTask_SlackOffSquish, 2, 0 playsewithpan SE_W281, 192 waitforvisualfinish @@ -4176,9 +4208,9 @@ Move_SLACK_OFF:: @ 81CC6C3 end Move_CRUSH_CLAW:: @ 81CC6DB - loadspritegfx 10167 - loadspritegfx 10039 - loadspritegfx 10208 + loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL + loadspritegfx ANIM_TAG_CLAW_SLASH + loadspritegfx ANIM_TAG_TORN_METAL monbg 1 setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 @@ -4199,9 +4231,9 @@ Move_CRUSH_CLAW:: @ 81CC6DB Move_AROMATHERAPY:: @ 81CC74B playsewithpan SE_W080, 0 - loadspritegfx 10159 - loadspritegfx 10203 - loadspritegfx 10049 + loadspritegfx ANIM_TAG_FLOWER + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 0, 0, 7, 13293 delay 1 monbg 0 @@ -4237,9 +4269,9 @@ Move_AROMATHERAPY:: @ 81CC74B end Move_FAKE_TEARS:: @ 81CC8AD - loadspritegfx 10155 - loadspritegfx 10209 - loadspritegfx 10072 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE + loadspritegfx ANIM_TAG_MUSIC_NOTES createvisualtask AnimTask_BlendParticle, 5, 10155, 0, 4, 4, 32108 waitforvisualfinish createvisualtask AnimTask_RockMonBackAndForth, 5, 0, 2, 1 @@ -4260,9 +4292,9 @@ Move_FAKE_TEARS:: @ 81CC8AD end Move_AIR_CUTTER:: @ 81CC93D - loadspritegfx 10003 - loadspritegfx 10138 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_AIR_WAVE + loadspritegfx ANIM_TAG_CUT + loadspritegfx ANIM_TAG_IMPACT delay 0 monbg 3 setalpha 12, 8 @@ -4297,7 +4329,7 @@ Move_ODOR_SLEUTH:: @ 81CC99F end Move_GRASS_WHISTLE:: @ 81CC9E9 - loadspritegfx 10072 + loadspritegfx ANIM_TAG_MUSIC_NOTES createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, 13298 waitforvisualfinish createvisualtask AnimTask_MusicNotesRainbowBlend, 2, @@ -4334,7 +4366,7 @@ Move_GRASS_WHISTLE:: @ 81CC9E9 end Move_TICKLE:: @ 81CCADC - loadspritegfx 10218 + loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 0, 16, 0 waitforvisualfinish createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 @@ -4352,8 +4384,8 @@ Move_TICKLE:: @ 81CCADC end Move_WATER_SPOUT:: @ 81CCB48 - loadspritegfx 10268 - loadspritegfx 10148 + loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB + loadspritegfx ANIM_TAG_WATER_IMPACT monbg 3 setalpha 12, 8 createvisualtask sub_80ABB28, 5, @@ -4369,8 +4401,8 @@ Move_WATER_SPOUT:: @ 81CCB48 end Move_SHADOW_PUNCH:: @ 81CCB76 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET fadetobg 2 waitbgfadein monbg 2 @@ -4411,11 +4443,11 @@ Move_EXTRASENSORY:: @ 81CCBD1 end Move_AERIAL_ACE:: @ 81CCC39 - loadspritegfx 10138 + loadspritegfx ANIM_TAG_CUT monbg 1 setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 24, 6, 1, 5 - createvisualtask sub_80BAB98, 2, 0, 4, 7, 3 + createvisualtask AnimTask_CloneBattlerSpriteWithBlend, 2, 0, 4, 7, 3 createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 playsewithpan SE_W013B, 192 delay 5 @@ -4435,13 +4467,13 @@ Move_IRON_DEFENSE:: @ 81CCCA3 end Move_BLOCK:: @ 81CCCCD - loadspritegfx 10250 + loadspritegfx ANIM_TAG_X_SIGN createsprite gBlockXSpriteTemplate, ANIM_TARGET, 66, playsewithpan SE_W207, 63 end Move_HOWL:: @ 81CCCDC - loadspritegfx 10053 + loadspritegfx ANIM_TAG_NOISE_LINE createvisualtask AnimTask_DeepInhale, 2, 0 delay 12 call gUnknown_81CDB06 @@ -4451,7 +4483,7 @@ Move_HOWL:: @ 81CCCDC end Move_BULK_UP:: @ 81CCCFE - loadspritegfx 10086 + loadspritegfx ANIM_TAG_BREATH createvisualtask AnimTask_GrowAndShrink, 2, playsewithpan SE_W207, 192 waitforvisualfinish @@ -4461,8 +4493,8 @@ Move_BULK_UP:: @ 81CCCFE end Move_COVET:: @ 81CCD1C - loadspritegfx 10210 - loadspritegfx 10224 + loadspritegfx ANIM_TAG_MAGENTA_HEART + loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_RockMonBackAndForth, 5, 0, 2, 0 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 playsewithpan SE_W204, 192 @@ -4478,12 +4510,12 @@ Move_COVET:: @ 81CCD1C end Move_VOLT_TACKLE:: @ 81CCD79 - loadspritegfx 10001 - loadspritegfx 10212 - loadspritegfx 10213 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_ELECTRICITY monbg 0 setalpha 12, 8 - createvisualtask sub_80BA7F8, 10, 1, 0, 0, 8, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 0, 8, RGB_BLACK waitforvisualfinish createsprite gUnknown_83E621C, ANIM_ATTACKER, 1, playsewithpan SE_W268, 192 @@ -4520,12 +4552,12 @@ Move_VOLT_TACKLE:: @ 81CCD79 delay 2 createsprite gUnknown_83E6204, ANIM_ATTACKER, 2, 0, -16, -16 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 1, 0, 8, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 8, 0, RGB_BLACK waitforvisualfinish end Move_WATER_SPORT:: @ 81CCE71 - loadspritegfx 10268 + loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB createvisualtask sub_80AC328, 5, delay 8 playsewithpan SE_W057, 192 @@ -4538,9 +4570,9 @@ Move_WATER_SPORT:: @ 81CCE71 end Move_CALM_MIND:: @ 81CCE97 - loadspritegfx 10203 + loadspritegfx ANIM_TAG_THIN_RING monbg 2 - createvisualtask sub_80BA83C, 5, 0, 0, 0, 16, 0 + createvisualtask AnimTask_BlendExcept, 5, 0, 0, 0, 16, 0 waitforvisualfinish createvisualtask sub_80BB9B0, 5, 1 waitforvisualfinish @@ -4556,14 +4588,14 @@ Move_CALM_MIND:: @ 81CCE97 createvisualtask sub_80BB9B0, 5, 0 visible 0 waitforvisualfinish - createvisualtask sub_80BA83C, 5, 0, 0, 16, 0, 0 + createvisualtask AnimTask_BlendExcept, 5, 0, 0, 16, 0, 0 waitforvisualfinish clearmonbg 2 end Move_LEAF_BLADE:: @ 81CCF17 - loadspritegfx 10063 - loadspritegfx 10285 + loadspritegfx ANIM_TAG_LEAF + loadspritegfx ANIM_TAG_CROSS_IMPACT createvisualtask AnimTask_LeafBlade, 5, delay 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 @@ -4587,7 +4619,7 @@ Move_LEAF_BLADE:: @ 81CCF17 end Move_DRAGON_DANCE:: @ 81CCF9A - loadspritegfx 10249 + loadspritegfx ANIM_TAG_HOLLOW_ORB monbg 0 monbgprio_28 0 delay 1 @@ -4611,10 +4643,10 @@ Move_DRAGON_DANCE:: @ 81CCF9A end Move_SHOCK_WAVE:: @ 81CD009 - loadspritegfx 10211 - loadspritegfx 10212 - loadspritegfx 10001 - loadspritegfx 10037 + loadspritegfx ANIM_TAG_ELECTRIC_ORBS + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_LIGHTNING monbg 0 setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, 0 @@ -4631,10 +4663,10 @@ Move_SHOCK_WAVE:: @ 81CD009 playsewithpan SE_W161B, 63 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, 1, 0, 6, 18, 1 - createvisualtask sub_80BA7F8, 5, 1, 3, 16, 0, 32767 - createvisualtask sub_80BA7F8, 5, 4, 0, 16, 16, 0 + createvisualtask AnimTask_BlendSelected, 5, 1, 3, 16, 0, RGB_WHITE + createvisualtask AnimTask_BlendSelected, 5, 4, 0, 16, 16, RGB_BLACK delay 4 - createvisualtask sub_80BA7F8, 5, 4, 0, 0, 0, 0 + createvisualtask AnimTask_BlendSelected, 5, 4, 0, 0, 0, RGB_BLACK waitforvisualfinish clearmonbg 0 blendoff @@ -4647,8 +4679,8 @@ Move_HARDEN:: @ 81CD0AB end Move_BELLY_DRUM:: @ 81CD0C0 - loadspritegfx 10072 - loadspritegfx 10193 + loadspritegfx ANIM_TAG_MUSIC_NOTES + loadspritegfx ANIM_TAG_PURPLE_HAND_OUTLINE createvisualtask AnimTask_MusicNotesRainbowBlend, 2, waitforvisualfinish call gUnknown_81CD18D @@ -4690,16 +4722,16 @@ gUnknown_81CD18D:: @ 81CD18D return Move_MIND_READER:: @ 81CD1A8 - loadspritegfx 10189 - loadspritegfx 10190 - loadspritegfx 10191 + loadspritegfx ANIM_TAG_TEAL_ALERT + loadspritegfx ANIM_TAG_OPENING_EYE + loadspritegfx ANIM_TAG_ROUND_WHITE_HALO monbg 4 playsewithpan SE_W109, 63 createsprite gOpeningEyeSpriteTemplate, ANIM_ATTACKER, 5, 0, 0, 1, 0 createsprite gWhiteHaloSpriteTemplate, ANIM_ATTACKER, 5, delay 40 playsewithpan SE_W043, 63 - createvisualtask sub_80B9BDC, 2, 1, 1, 2, 0, 10, 0 + createvisualtask AnimTask_CurseBlendEffect, 2, 1, 1, 2, 0, 10, 0 call gUnknown_81CD1EF waitforvisualfinish clearmonbg 4 @@ -4732,11 +4764,11 @@ gUnknown_81CD1EF:: @ 81CD1EF Move_ICE_PUNCH:: @ 81CD2E0 monbg 3 setalpha 12, 8 - loadspritegfx 10141 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_ICE_CRYSTALS + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, 0 - createvisualtask sub_80BA7F8, 10, 4, 2, 0, 9, 32588 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 9, RGB(12, 26, 31) delay 20 playsewithpan SE_W081, 63 createsprite gUnknown_83E6360, ANIM_ATTACKER, 2, 0 @@ -4758,7 +4790,7 @@ Move_ICE_PUNCH:: @ 81CD2E0 delay 15 call gUnknown_81D540A delay 5 - createvisualtask sub_80BA7F8, 10, 4, 2, 9, 0, 32588 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 9, 0, RGB(12, 26, 31) waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7, 0, 0 waitforvisualfinish @@ -4768,7 +4800,7 @@ Move_ICE_PUNCH:: @ 81CD2E0 Move_REST:: @ 81CD3CB playsewithpan SE_W173, 192 - loadspritegfx 10228 + loadspritegfx ANIM_TAG_LETTER_Z createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 20 createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 @@ -4782,7 +4814,7 @@ Move_CONFUSION:: @ 81CD40B call gUnknown_81D59BB setalpha 8, 8 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 10, 1 - createvisualtask sub_80B9BDC, 2, 2, 0, 2, 0, 8, 32767 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 2, 0, 8, RGB_WHITE waitforvisualfinish playsewithpan SE_W048, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 15, 1 @@ -4799,7 +4831,7 @@ Move_PSYCHIC:: @ 81CD46C call gUnknown_81D59BB setalpha 8, 8 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 10, 1 - createvisualtask sub_80B9BDC, 2, 2, 0, 2, 0, 8, 767 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 2, 0, 8, 767 waitforvisualfinish loopsewithpan SE_W048, 63, 10, 3 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 15, 1 @@ -4826,7 +4858,7 @@ gUnknown_81CD4DD:: @ 81CD4DD call gUnknown_81D59BB setalpha 8, 8 playsewithpan SE_W048, 192 - createvisualtask sub_80B9BDC, 2, 2, 0, 2, 0, 8, 32767 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 2, 0, 8, RGB_WHITE createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, 0, 1 waitforvisualfinish clearmonbg 2 @@ -4848,7 +4880,7 @@ gUnknown_81CD4DD:: @ 81CD4DD goto gUnknown_81CD4D4 Move_THUNDER:: @ 81CD570 - loadspritegfx 10037 + loadspritegfx ANIM_TAG_LIGHTNING fadetobg 11 waitbgfadeout createvisualtask sub_80BB82C, 5, -256, 0, 1, -1 @@ -4906,9 +4938,9 @@ Move_THUNDER:: @ 81CD570 end Move_THUNDER_PUNCH:: @ 81CD6CA - loadspritegfx 10135 - loadspritegfx 10143 - loadspritegfx 10037 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_LIGHTNING monbg 1 setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, 0 @@ -4939,8 +4971,8 @@ Move_THUNDER_PUNCH:: @ 81CD6CA end Move_SACRED_FIRE:: @ 81CD793 - loadspritegfx 10033 - loadspritegfx 10035 + loadspritegfx ANIM_TAG_FIRE + loadspritegfx ANIM_TAG_FIRE_PLUME loopsewithpan SE_W221, 192, 7, 5 createsprite gUnknown_83E5CA0, ANIM_ATTACKER, 2, -32, 0, 50, 5, -2, 0 delay 1 @@ -4996,7 +5028,7 @@ Move_SACRED_FIRE:: @ 81CD793 end Move_SCRATCH:: @ 81CD97A - loadspritegfx 10137 + loadspritegfx ANIM_TAG_SCRATCH monbg 1 setalpha 12, 8 playsewithpan SE_W010, 63 @@ -5009,7 +5041,7 @@ Move_SCRATCH:: @ 81CD97A end Move_DRAGON_BREATH:: @ 81CD9AC - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER monbg 3 monbgprio_28 1 loopsewithpan SE_W172, 192, 7, 7 @@ -5017,7 +5049,7 @@ Move_DRAGON_BREATH:: @ 81CD9AC delay 2 createsprite gUnknown_83E77A4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createvisualtask sub_80BA7F8, 10, 4, 1, 0, 9, 31 + createvisualtask AnimTask_BlendSelected, 10, 4, 1, 0, 9, RGB(31, 0, 0) createsprite gUnknown_83E77A4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 21, 1 @@ -5037,13 +5069,13 @@ Move_DRAGON_BREATH:: @ 81CD9AC delay 2 createsprite gUnknown_83E77A4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 4, 1, 9, 0, 31 + createvisualtask AnimTask_BlendSelected, 10, 4, 1, 9, 0, RGB(31, 0, 0) waitforvisualfinish clearmonbg 3 end Move_ROAR:: @ 81CDAC0 - loadspritegfx 10053 + loadspritegfx ANIM_TAG_NOISE_LINE monbg 0 monbgprio_28 0 setalpha 8, 8 @@ -5071,7 +5103,7 @@ gUnknown_81CDB06:: @ 81CDB06 return Move_GROWL:: @ 81CDB57 - loadspritegfx 10053 + loadspritegfx ANIM_TAG_NOISE_LINE createvisualtask sub_80DD148, 2, 0, 255 call gUnknown_81CDB06 delay 10 @@ -5083,7 +5115,7 @@ Move_GROWL:: @ 81CDB57 end Move_SNORE:: @ 81CDB98 - loadspritegfx 10197 + loadspritegfx ANIM_TAG_SNORE_Z monbg 2 setalpha 8, 8 call gUnknown_81CDBB1 @@ -5105,8 +5137,8 @@ gUnknown_81CDBB1:: @ 81CDBB1 return Move_LIGHT_SCREEN:: @ 81CDC28 - loadspritegfx 10070 - loadspritegfx 10166 + loadspritegfx ANIM_TAG_SPARKLE_3 + loadspritegfx ANIM_TAG_GREEN_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W115, 192, 15 createsprite gUnknown_83E6E10, ANIM_ATTACKER, 1, 40, 0, 10166 @@ -5132,8 +5164,8 @@ gUnknown_81CDC4F:: @ 81CDC4F return Move_MIRROR_COAT:: @ 81CDCB4 - loadspritegfx 10070 - loadspritegfx 10168 + loadspritegfx ANIM_TAG_SPARKLE_3 + loadspritegfx ANIM_TAG_RED_LIGHT_WALL setalpha 0, 16 createsprite gUnknown_83E6E40, ANIM_ATTACKER, 1, 40, 0, 10168 delay 10 @@ -5145,8 +5177,8 @@ Move_MIRROR_COAT:: @ 81CDCB4 end Move_REFLECT:: @ 81CDCDA - loadspritegfx 10071 - loadspritegfx 10167 + loadspritegfx ANIM_TAG_SPARKLE_4 + loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W115, 192, 15 createsprite gUnknown_83E6E28, ANIM_ATTACKER, 1, 40, 0, 10167 @@ -5162,7 +5194,7 @@ Move_REFLECT:: @ 81CDCDA end Move_BARRIER:: @ 81CDD2D - loadspritegfx 10169 + loadspritegfx ANIM_TAG_GRAY_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W112, 192, 15 createsprite gUnknown_83E6E58, ANIM_ATTACKER, 3, 40, 0, 10169 @@ -5172,8 +5204,8 @@ Move_BARRIER:: @ 81CDD2D end Move_BUBBLE:: @ 81CDD4A - loadspritegfx 10146 - loadspritegfx 10155 + loadspritegfx ANIM_TAG_BUBBLE + loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg 1 setalpha 12, 8 delay 1 @@ -5208,7 +5240,7 @@ Move_BUBBLE:: @ 81CDD4A end Move_SMOG:: @ 81CDE20 - loadspritegfx 10172 + loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD monbg 3 monbgprio_29 setalpha 12, 8 @@ -5222,7 +5254,7 @@ Move_SMOG:: @ 81CDE20 call gUnknown_81CDE85 delay 120 loopsewithpan SE_W092, 63, 18, 2 - createvisualtask sub_80B9BDC, 2, 4, 2, 2, 0, 12, 26650 + createvisualtask AnimTask_CurseBlendEffect, 2, 4, 2, 2, 0, 12, 26650 delay 10 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 15, 1 waitforvisualfinish @@ -5236,7 +5268,7 @@ gUnknown_81CDE85:: @ 81CDE85 return Move_FAINT_ATTACK:: @ 81CDE9B - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 0 fadetobg 1 waitbgfadein @@ -5272,7 +5304,7 @@ Move_FAINT_ATTACK:: @ 81CDE9B end Move_SAND_ATTACK:: @ 81CDF22 - loadspritegfx 10074 + loadspritegfx ANIM_TAG_MUD_SAND monbg 2 monbgprio_28 0 setalpha 12, 8 @@ -5301,7 +5333,7 @@ gUnknown_81CDF72:: @ 81CDF72 return Move_MUD_SLAP:: @ 81CDFCA - loadspritegfx 10074 + loadspritegfx ANIM_TAG_MUD_SAND playsewithpan SE_W028, 192 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 0, 0, 3 waitforvisualfinish @@ -5325,8 +5357,8 @@ gUnknown_81CE010:: @ 81CE010 return Move_DRAGON_RAGE:: @ 81CE068 - loadspritegfx 10029 - loadspritegfx 10035 + loadspritegfx ANIM_TAG_SMALL_EMBER + loadspritegfx ANIM_TAG_FIRE_PLUME playsewithpan SE_W082, 192 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 40, 1 waitforvisualfinish @@ -5357,22 +5389,22 @@ Move_DRAGON_RAGE:: @ 81CE068 end Move_RAIN_DANCE:: @ 81CE145 - loadspritegfx 10115 + loadspritegfx ANIM_TAG_RAIN_DROPS playsewithpan SE_W240, 192 - createvisualtask sub_80BA7F8, 10, 1921, 2, 0, 4, 0 + createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask sub_80AABC0, 2, 0, 3, 120 createvisualtask sub_80AABC0, 2, 0, 3, 120 delay 120 delay 30 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 1921, 2, 4, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 2, 4, 0, RGB_BLACK waitforvisualfinish end Move_BITE:: @ 81CE190 - loadspritegfx 10139 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SHARP_TEETH + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 playsewithpan SE_W044, 63 @@ -5388,8 +5420,8 @@ Move_BITE:: @ 81CE190 end Move_CRUNCH:: @ 81CE1EE - loadspritegfx 10139 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SHARP_TEETH + loadspritegfx ANIM_TAG_IMPACT monbg 1 fadetobg 1 waitbgfadein @@ -5416,8 +5448,8 @@ Move_CRUNCH:: @ 81CE1EE end Move_CLAMP:: @ 81CE29E - loadspritegfx 10145 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_CLAMP + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 playsewithpan SE_W011, 63 @@ -5436,7 +5468,7 @@ Move_ICE_BEAM:: @ 81CE2FB monbg 1 monbgprio_28 1 setalpha 12, 8 - loadspritegfx 10141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, 0 waitforvisualfinish createsoundtask mas_80DCF38, 176, -64, 63, 4, 4, 0, 10 @@ -5484,7 +5516,7 @@ Move_WITHDRAW:: @ 81CE432 end Move_AURORA_BEAM:: @ 81CE43F - loadspritegfx 10140 + loadspritegfx ANIM_TAG_RAINBOW_RINGS fadetobg 20 waitbgfadein playsewithpan SE_W062, 192 @@ -5521,23 +5553,23 @@ gUnknown_81CE4C6:: @ 81CE4C6 return Move_SOLAR_BEAM:: @ 81CE513 - loadspritegfx 10147 - choosetwoturnanim gUnknown_81CE521, gUnknown_81CE61E + loadspritegfx ANIM_TAG_ORBS + choosetwoturnanim BattleAnimScript_SolarBeam_Turn1, BattleAnimScript_SolarBeam_Turn2 -gUnknown_81CE51F:: @ 81CE51F +BattleAnimScript_SolarBeam_End:: @ 81CE51F waitforvisualfinish end -gUnknown_81CE521:: @ 81CE521 +BattleAnimScript_SolarBeam_Turn1:: @ 81CE521 monbg 2 setalpha 12, 8 - createvisualtask sub_80B9BDC, 2, 2, 1, 4, 0, 11, 12287 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 1, 4, 0, 11, 12287 playsewithpan SE_W025, 192 call gUnknown_81CE54B waitforvisualfinish clearmonbg 2 blendoff - goto gUnknown_81CE51F + goto BattleAnimScript_SolarBeam_End gUnknown_81CE54B:: @ 81CE54B createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, 40, 16 @@ -5570,7 +5602,7 @@ gUnknown_81CE54B:: @ 81CE54B delay 2 return -gUnknown_81CE61E:: @ 81CE61E +BattleAnimScript_SolarBeam_Turn2:: @ 81CE61E call gUnknown_81D5A07 panse_1B SE_W076, 192, 63, 2, 0 createvisualtask AnimTask_CreateSmallSolarbeamOrbs, 5, @@ -5578,7 +5610,7 @@ gUnknown_81CE61E:: @ 81CE61E delay 4 createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1 delay 4 - createvisualtask sub_80BA7F8, 10, 4, 1, 0, 10, 1017 + createvisualtask AnimTask_BlendSelected, 10, 4, 1, 0, 10, RGB(25, 31, 0) createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2 delay 4 createvisualtask AnimTask_ShakeMon2, 5, 1, 2, 0, 65, 1 @@ -5593,9 +5625,9 @@ gUnknown_81CE61E:: @ 81CE61E call gUnknown_81CE6F0 call gUnknown_81CE6F0 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 4, 1, 10, 0, 1017 + createvisualtask AnimTask_BlendSelected, 10, 4, 1, 10, 0, RGB(25, 31, 0) call gUnknown_81D5A41 - goto gUnknown_81CE51F + goto BattleAnimScript_SolarBeam_End gUnknown_81CE6F0:: @ 81CE6F0 createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 @@ -5615,7 +5647,7 @@ gUnknown_81CE6F0:: @ 81CE6F0 return Move_BLIZZARD:: @ 81CE768 - loadspritegfx 10141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg 3 createvisualtask AnimTask_GetAttackerSide, 2, jumpargeq 7, 1, gUnknown_81CE8ED @@ -5670,7 +5702,7 @@ gUnknown_81CE8ED:: @ 81CE8ED goto gUnknown_81CE77E Move_POWDER_SNOW:: @ 81CE8F4 - loadspritegfx 10141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg 3 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 1, 0, 3, 0 waitforvisualfinish @@ -5705,8 +5737,8 @@ gUnknown_81CE93E:: @ 81CE93E return Move_HYDRO_PUMP:: @ 81CE9EE - loadspritegfx 10149 - loadspritegfx 10148 + loadspritegfx ANIM_TAG_WATER_ORB + loadspritegfx ANIM_TAG_WATER_IMPACT monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -5754,9 +5786,9 @@ gUnknown_81CEACE:: @ 81CEACE return Move_SIGNAL_BEAM:: @ 81CEAED - loadspritegfx 10264 - loadspritegfx 10265 - loadspritegfx 10073 + loadspritegfx ANIM_TAG_GLOWY_RED_ORB + loadspritegfx ANIM_TAG_GLOWY_GREEN_ORB + loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 25, 1 delay 6 panse_1B SE_W062, 192, 63, 1, 0 @@ -5796,9 +5828,9 @@ gUnknown_81CEBB4:: @ 81CEBB4 return Move_ABSORB:: @ 81CEBD5 - loadspritegfx 10147 - loadspritegfx 10031 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_IMPACT monbg 3 monbgprio_2A 1 setalpha 12, 8 @@ -5849,9 +5881,9 @@ gUnknown_81CEC44:: @ 81CEC44 return Move_MEGA_DRAIN:: @ 81CECED - loadspritegfx 10147 - loadspritegfx 10031 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_IMPACT monbg 3 monbgprio_2A 1 setalpha 12, 8 @@ -5910,9 +5942,9 @@ gUnknown_81CED5C:: @ 81CED5C return Move_GIGA_DRAIN:: @ 81CEE7D - loadspritegfx 10147 - loadspritegfx 10031 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_IMPACT monbg 3 monbgprio_2A 1 setalpha 12, 8 @@ -5979,11 +6011,11 @@ gUnknown_81CEEEC:: @ 81CEEEC return Move_LEECH_LIFE:: @ 81CF085 - loadspritegfx 10161 - loadspritegfx 10147 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_ORBS delay 1 - loadspritegfx 10031 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_IMPACT monbg 3 monbgprio_2A 1 setalpha 12, 8 @@ -6009,9 +6041,9 @@ Move_LEECH_LIFE:: @ 81CF085 end Move_SYNTHESIS:: @ 81CF107 - loadspritegfx 10031 - loadspritegfx 10049 - createvisualtask sub_80B9BDC, 2, 2, 2, 2, 0, 16, 19451 + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_SPARKLE_2 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 16, 19451 playsewithpan SE_W025, 192 call gUnknown_81D569E waitforvisualfinish @@ -6020,8 +6052,8 @@ Move_SYNTHESIS:: @ 81CF107 end Move_TOXIC:: @ 81CF131 - loadspritegfx 10151 - loadspritegfx 10150 + loadspritegfx ANIM_TAG_TOXIC_BUBBLE + loadspritegfx ANIM_TAG_POISON_BUBBLE call gUnknown_81CF14B call gUnknown_81CF14B waitforvisualfinish @@ -6046,18 +6078,18 @@ gUnknown_81CF14B:: @ 81CF14B return Move_SLUDGE:: @ 81CF1A0 - loadspritegfx 10150 + loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_W145C, 192 createsprite gUnknown_83E6A20, ANIM_TARGET, 2, 20, 0, 40, 0 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 5, 1, 3, 0, 5, 1 - createvisualtask sub_80B9BDC, 2, 4, 1, 2, 0, 12, 31774 + createvisualtask AnimTask_CurseBlendEffect, 2, 4, 1, 2, 0, 12, 31774 call gUnknown_81D575B waitforvisualfinish end Move_SLUDGE_BOMB:: @ 81CF1E2 - loadspritegfx 10150 + loadspritegfx ANIM_TAG_POISON_BUBBLE call gUnknown_81CF2F2 call gUnknown_81CF2F2 call gUnknown_81CF2F2 @@ -6069,7 +6101,7 @@ Move_SLUDGE_BOMB:: @ 81CF1E2 call gUnknown_81CF2F2 call gUnknown_81CF2F2 createvisualtask AnimTask_ShakeMon2, 5, 1, 3, 0, 15, 1 - createvisualtask sub_80B9BDC, 2, 4, 1, 2, 0, 12, 31774 + createvisualtask AnimTask_CurseBlendEffect, 2, 4, 1, 2, 0, 12, 31774 createsprite gUnknown_83E6A50, ANIM_TARGET, 2, 42, 27, 20 createsprite gUnknown_83E6A50, ANIM_TARGET, 2, -27, 44, 20 createsprite gUnknown_83E6A50, ANIM_TARGET, 2, 39, -28, 20 @@ -6101,7 +6133,7 @@ gUnknown_81CF2F2:: @ 81CF2F2 return Move_ACID:: @ 81CF308 - loadspritegfx 10150 + loadspritegfx ANIM_TAG_POISON_BUBBLE monbg 3 createsprite gUnknown_83E6A38, ANIM_TARGET, 2, 20, 0, 40, 1, 0, 0 playsewithpan SE_W145C, 192 @@ -6114,7 +6146,7 @@ Move_ACID:: @ 81CF308 delay 15 createvisualtask AnimTask_ShakeMon2, 5, 1, 2, 0, 10, 1 createvisualtask AnimTask_ShakeMon2, 5, 3, 2, 0, 10, 1 - createvisualtask sub_80B9BDC, 2, 20, 2, 2, 0, 12, 31774 + createvisualtask AnimTask_CurseBlendEffect, 2, 20, 2, 2, 0, 12, 31774 createsprite gUnknown_83E6A84, ANIM_TARGET, 2, 0, -22, 0, 15, 55 playsewithpan SE_W145, 63 delay 10 @@ -6134,8 +6166,8 @@ Move_ACID:: @ 81CF308 end Move_BONEMERANG:: @ 81CF402 - loadspritegfx 10000 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_BONE + loadspritegfx ANIM_TAG_IMPACT monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -6154,8 +6186,8 @@ Move_BONEMERANG:: @ 81CF402 end Move_BONE_CLUB:: @ 81CF456 - loadspritegfx 10000 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_BONE + loadspritegfx ANIM_TAG_IMPACT monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -6172,8 +6204,8 @@ Move_BONE_CLUB:: @ 81CF456 end Move_BONE_RUSH:: @ 81CF4B8 - loadspritegfx 10000 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_BONE + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W155, 63 @@ -6188,7 +6220,7 @@ Move_BONE_RUSH:: @ 81CF4B8 end Move_SPIKES:: @ 81CF503 - loadspritegfx 10152 + loadspritegfx ANIM_TAG_SPIKES monbg 3 playsewithpan SE_W026, 192 waitplaysewithpan SE_W030, 63, 28 @@ -6205,8 +6237,8 @@ Move_SPIKES:: @ 81CF503 end Move_MEGAHORN:: @ 81CF55A - loadspritegfx 10153 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HORN_HIT_2 + loadspritegfx ANIM_TAG_IMPACT monbg 3 playsewithpan SE_W082, 192 jumpifcontest gUnknown_81CF631 @@ -6229,7 +6261,7 @@ gUnknown_81CF57D:: @ 81CF57D createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, 4, 1, 4 waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, 1, -4, 1, 12, 1 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 7, 5, 1, 32767, 10, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 7, 5, 1, RGB_WHITE, 10, 0, 0 delay 10 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 11 delay 3 @@ -6251,8 +6283,8 @@ gUnknown_81CF631:: @ 81CF631 goto gUnknown_81CF57D Move_GUST:: @ 81CF648 - loadspritegfx 10009 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_GUST + loadspritegfx ANIM_TAG_IMPACT monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -6269,8 +6301,8 @@ Move_GUST:: @ 81CF648 end Move_WING_ATTACK:: @ 81CF699 - loadspritegfx 10009 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_GUST + loadspritegfx ANIM_TAG_IMPACT monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -6293,7 +6325,7 @@ Move_WING_ATTACK:: @ 81CF699 end Move_PECK:: @ 81CF736 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W030, 63 createvisualtask sub_8099A78, 2, 3, -768, 1, 2 createsprite gUnknown_83E7C98, ANIM_TARGET, 3, -12, 0, 1, 3 @@ -6301,8 +6333,8 @@ Move_PECK:: @ 81CF736 end Move_AEROBLAST:: @ 81CF75D - loadspritegfx 10154 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_AIR_WAVE_2 + loadspritegfx ANIM_TAG_IMPACT monbg 3 call gUnknown_81D59CF monbgprio_28 1 @@ -6343,8 +6375,8 @@ gUnknown_81CF7B9:: @ 81CF7B9 return Move_WATER_GUN:: @ 81CF87A - loadspritegfx 10155 - loadspritegfx 10148 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_WATER_IMPACT monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -6367,8 +6399,8 @@ Move_WATER_GUN:: @ 81CF87A end Move_CRABHAMMER:: @ 81CF907 - loadspritegfx 10141 - loadspritegfx 10148 + loadspritegfx ANIM_TAG_ICE_CRYSTALS + loadspritegfx ANIM_TAG_WATER_IMPACT monbg 3 setalpha 12, 8 createsprite gUnknown_83E7C38, ANIM_ATTACKER, 4, 0, 0, 1, 0 @@ -6411,7 +6443,7 @@ Move_SURF:: @ 81CFA01 end Move_FLAMETHROWER:: @ 81CFA15 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -6444,7 +6476,7 @@ gUnknown_81CFA8F:: @ 81CFA8F return Move_SANDSTORM:: @ 81CFAB2 - loadspritegfx 10261 + loadspritegfx ANIM_TAG_FLYING_DIRT playsewithpan SE_W201, 0 createvisualtask AnimTask_LoadSandstormBackground, 5, 0 delay 16 @@ -6464,7 +6496,7 @@ Move_SANDSTORM:: @ 81CFAB2 end Move_WHIRLPOOL:: @ 81CFB3A - loadspritegfx 10149 + loadspritegfx ANIM_TAG_WATER_ORB monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -6497,20 +6529,20 @@ gUnknown_81CFB92:: @ 81CFB92 return Move_FLY:: @ 81CFC1D - loadspritegfx 10156 - loadspritegfx 10135 - choosetwoturnanim gUnknown_81CFC2E, gUnknown_81CFC46 + loadspritegfx ANIM_TAG_ROUND_SHADOW + loadspritegfx ANIM_TAG_IMPACT + choosetwoturnanim BattleAnimScript_Fly_Turn1, BattleAnimScript_Fly_Turn2 -gUnknown_81CFC2C:: @ 81CFC2C +BattleAnimScript_Fly_End:: @ 81CFC2C waitforvisualfinish end -gUnknown_81CFC2E:: @ 81CFC2E +BattleAnimScript_Fly_Turn1:: @ 81CFC2E playsewithpan SE_W019, 192 createsprite gUnknown_83E6BB8, ANIM_ATTACKER, 2, 0, 0, 13, 336 - goto gUnknown_81CFC2C + goto BattleAnimScript_Fly_End -gUnknown_81CFC46:: @ 81CFC46 +BattleAnimScript_Fly_Turn2:: @ 81CFC46 monbg 3 setalpha 12, 8 playsewithpan SE_W104, 192 @@ -6522,22 +6554,22 @@ gUnknown_81CFC46:: @ 81CFC46 waitforvisualfinish clearmonbg 3 blendoff - goto gUnknown_81CFC2C + goto BattleAnimScript_Fly_End Move_BOUNCE:: @ 81CFC87 - loadspritegfx 10156 - loadspritegfx 10135 - choosetwoturnanim gUnknown_81CFC97, gUnknown_81CFCAB + loadspritegfx ANIM_TAG_ROUND_SHADOW + loadspritegfx ANIM_TAG_IMPACT + choosetwoturnanim BattleAnimScript_Bounce_Turn1, BattleAnimScript_Bounce_Turn2 -gUnknown_81CFC96:: @ 81CFC96 +BattleAnimScript_Bounce_End:: @ 81CFC96 end -gUnknown_81CFC97:: @ 81CFC97 +BattleAnimScript_Bounce_Turn1:: @ 81CFC97 playsewithpan SE_W100, 192 createsprite gUnknown_83E6CD0, ANIM_ATTACKER, 2, 0, 0 - goto gUnknown_81CFC96 + goto BattleAnimScript_Bounce_End -gUnknown_81CFCAB:: @ 81CFCAB +BattleAnimScript_Bounce_Turn2:: @ 81CFCAB monbg 3 setalpha 12, 8 playsewithpan SE_W207, 63 @@ -6549,11 +6581,11 @@ gUnknown_81CFCAB:: @ 81CFCAB waitforvisualfinish clearmonbg 3 blendoff - goto gUnknown_81CFC96 + goto BattleAnimScript_Bounce_End Move_KARATE_CHOP:: @ 81CFCEA - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -6569,8 +6601,8 @@ Move_KARATE_CHOP:: @ 81CFCEA end Move_CROSS_CHOP:: @ 81CFD3C - loadspritegfx 10143 - loadspritegfx 10285 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_CROSS_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W025, 63 @@ -6578,7 +6610,7 @@ Move_CROSS_CHOP:: @ 81CFD3C createsprite gUnknown_83E6740, ANIM_ATTACKER, 2, 0, 0, 1 delay 40 playsewithpan SE_W013, 63 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 32767, 10, 0, 10 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_WHITE, 10, 0, 10 createsprite gUnknown_83E7C80, ANIM_ATTACKER, 3, 0, 0, 1, 20 createvisualtask AnimTask_ShakeMon, 5, 1, 7, 0, 9, 1 waitforvisualfinish @@ -6587,8 +6619,8 @@ Move_CROSS_CHOP:: @ 81CFD3C end Move_JUMP_KICK:: @ 81CFDA5 - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 @@ -6605,8 +6637,8 @@ Move_JUMP_KICK:: @ 81CFDA5 end Move_HI_JUMP_KICK:: @ 81CFE02 - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 0, 0, 8 @@ -6631,8 +6663,8 @@ Move_HI_JUMP_KICK:: @ 81CFE02 end Move_DOUBLE_KICK:: @ 81CFE98 - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 createsprite gUnknown_83E6728, ANIM_ATTACKER, 3, 1, 20, 1 @@ -6645,8 +6677,8 @@ Move_DOUBLE_KICK:: @ 81CFE98 end Move_TRIPLE_KICK:: @ 81CFECB - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W233B, 63 @@ -6679,10 +6711,10 @@ gUnknown_81CFF5C:: @ 81CFF5C goto gUnknown_81CFEEB Move_DYNAMIC_PUNCH:: @ 81CFF92 - loadspritegfx 10143 - loadspritegfx 10135 - loadspritegfx 10198 - loadspritegfx 10007 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_EXPLOSION + loadspritegfx ANIM_TAG_EXPLOSION_6 delay 1 monbg 3 setalpha 12, 8 @@ -6713,8 +6745,8 @@ Move_DYNAMIC_PUNCH:: @ 81CFF92 end Move_COUNTER:: @ 81D005A - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg 3 setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 18, 6, 1, 4 @@ -6745,7 +6777,7 @@ Move_COUNTER:: @ 81D005A end Move_VITAL_THROW:: @ 81D0129 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W233, 192 @@ -6768,9 +6800,9 @@ Move_VITAL_THROW:: @ 81D0129 end Move_ROCK_SMASH:: @ 81D01A4 - loadspritegfx 10058 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_ROCKS + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg 3 setalpha 12, 8 delay 1 @@ -6795,7 +6827,7 @@ Move_ROCK_SMASH:: @ 81D01A4 end Move_SUBMISSION:: @ 81D029C - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W104, 192 @@ -6828,10 +6860,10 @@ gUnknown_81D030B:: @ 81D030B return Move_SUNNY_DAY:: @ 81D033F - loadspritegfx 10157 + loadspritegfx ANIM_TAG_SUNLIGHT monbg 2 setalpha 13, 3 - createvisualtask sub_80BA7F8, 10, 1921, 1, 0, 6, 32767 + createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 1, 0, 6, RGB_WHITE waitforvisualfinish panse_26 SE_W080, 192, 63, 1, 0 call gUnknown_81D038B @@ -6839,7 +6871,7 @@ Move_SUNNY_DAY:: @ 81D033F call gUnknown_81D038B call gUnknown_81D038B waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 1921, 1, 6, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 1, 6, 0, RGB_WHITE waitforvisualfinish clearmonbg 2 blendoff @@ -6851,7 +6883,7 @@ gUnknown_81D038B:: @ 81D038B return Move_COTTON_SPORE:: @ 81D0395 - loadspritegfx 10158 + loadspritegfx ANIM_TAG_SPORE monbg 3 monbgprio_28 1 loopsewithpan SE_W077, 63, 18, 10 @@ -6872,7 +6904,7 @@ gUnknown_81D03B5:: @ 81D03B5 return Move_SPORE:: @ 81D03EF - loadspritegfx 10158 + loadspritegfx ANIM_TAG_SPORE monbg 3 setalpha 12, 8 createvisualtask AnimTask_SporeDoubleBattle, 2, @@ -6896,8 +6928,8 @@ gUnknown_81D041A:: @ 81D041A return Move_PETAL_DANCE:: @ 81D0454 - loadspritegfx 10159 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_FLOWER + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W080, 192 @@ -6934,9 +6966,9 @@ Move_PETAL_DANCE:: @ 81D0454 end Move_RAZOR_LEAF:: @ 81D058C - loadspritegfx 10063 - loadspritegfx 10160 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_LEAF + loadspritegfx ANIM_TAG_RAZOR_LEAF + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 delay 1 @@ -6974,8 +7006,8 @@ Move_RAZOR_LEAF:: @ 81D058C end Move_ANCIENT_POWER:: @ 81D0693 - loadspritegfx 10058 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ROCKS + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 createsprite gUnknown_83E7B88, ANIM_ATTACKER, 2, 4, 1, 10, 1 @@ -7007,8 +7039,8 @@ Move_ANCIENT_POWER:: @ 81D0693 end Move_OCTAZOOKA:: @ 81D07BB - loadspritegfx 10030 - loadspritegfx 10017 + loadspritegfx ANIM_TAG_GRAY_SMOKE + loadspritegfx ANIM_TAG_BLACK_BALL playsewithpan SE_W025B, 192 createsprite gOctazookaBallSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 20, 0 waitforvisualfinish @@ -7024,7 +7056,7 @@ Move_OCTAZOOKA:: @ 81D07BB end Move_MIST:: @ 81D0821 - loadspritegfx 10144 + loadspritegfx ANIM_TAG_MIST_CLOUD monbg 2 setalpha 12, 8 loopsewithpan SE_W054, 192, 20, 15 @@ -7036,7 +7068,7 @@ Move_MIST:: @ 81D0821 call gUnknown_81D086C call gUnknown_81D086C delay 32 - createvisualtask sub_80B9BDC, 2, 10, 8, 2, 0, 14, 32767 + createvisualtask AnimTask_CurseBlendEffect, 2, 10, 8, 2, 0, 14, RGB_WHITE waitforvisualfinish clearmonbg 2 blendoff @@ -7052,18 +7084,18 @@ Move_HAZE:: @ 81D0882 playsewithpan SE_W114, 0 createvisualtask AnimTask_Haze1, 5, delay 30 - createvisualtask sub_80BA7F8, 10, 1920, 2, 0, 16, 0 + createvisualtask AnimTask_BlendSelected, 10, 0 | (0xF << 7), 2, 0, 16, RGB_BLACK delay 90 - createvisualtask sub_80BA7F8, 10, 1920, 1, 16, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 0 | (0xF << 7), 1, 16, 0, RGB_BLACK end Move_FIRE_PUNCH:: @ 81D08B5 - loadspritegfx 10143 - loadspritegfx 10029 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_SMALL_EMBER + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 - createvisualtask sub_80BA7F8, 10, 4, 2, 0, 9, 31 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 9, RGB(31, 0, 0) createsprite gUnknown_83E5BE0, ANIM_TARGET, 1, 0 createsprite gUnknown_83E5BE0, ANIM_TARGET, 1, 64 createsprite gUnknown_83E5BE0, ANIM_TARGET, 1, 128 @@ -7077,7 +7109,7 @@ Move_FIRE_PUNCH:: @ 81D08B5 delay 4 playsewithpan SE_W007, 63 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 4, 0, 9, 0, 31 + createvisualtask AnimTask_BlendSelected, 10, 4, 0, 9, 0, RGB(31, 0, 0) waitforvisualfinish clearmonbg 3 blendoff @@ -7094,7 +7126,7 @@ gUnknown_81D0950:: @ 81D0950 return Move_LEER:: @ 81D09C8 - loadspritegfx 10027 + loadspritegfx ANIM_TAG_LEER monbg 0 monbgprio_28 0 setalpha 8, 8 @@ -7113,8 +7145,8 @@ Move_LEER:: @ 81D09C8 end Move_DREAM_EATER:: @ 81D0A1F - loadspritegfx 10147 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR monbg 3 monbgprio_2A 1 playsewithpan SE_W060, 192 @@ -7181,8 +7213,8 @@ gUnknown_81D0A89:: @ 81D0A89 return Move_POISON_GAS:: @ 81D0C22 - loadspritegfx 10172 - loadspritegfx 10150 + loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD + loadspritegfx ANIM_TAG_POISON_BUBBLE delay 0 monbg 3 monbgprio_29 @@ -7207,7 +7239,7 @@ Move_POISON_GAS:: @ 81D0C22 createsprite gUnknown_83E6514, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 40 loopsewithpan SE_W054, 63, 28, 6 - createvisualtask sub_80B9BDC, 2, 4, 6, 2, 0, 12, 26650 + createvisualtask AnimTask_CurseBlendEffect, 2, 4, 6, 2, 0, 12, 26650 waitforvisualfinish blendoff clearmonbg 3 @@ -7235,14 +7267,14 @@ Move_WRAP:: @ 81D0D3A goto gUnknown_81D0D16 Move_PSYBEAM:: @ 81D0D50 - loadspritegfx 10163 + loadspritegfx ANIM_TAG_GOLD_RING playsewithpan SE_W060, 192 call gUnknown_81D59BB createsoundtask mas_80DCF38, 193, -64, 63, 3, 4, 0, 15 call gUnknown_81D0DD4 call gUnknown_81D0DD4 createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 4, 1 - createvisualtask sub_80B9BDC, 2, 4, 2, 2, 0, 12, 32351 + createvisualtask AnimTask_CurseBlendEffect, 2, 4, 2, 2, 0, 12, 32351 call gUnknown_81D0DD4 call gUnknown_81D0DD4 call gUnknown_81D0DD4 @@ -7263,12 +7295,12 @@ gUnknown_81D0DD4:: @ 81D0DD4 return Move_HYPNOSIS:: @ 81D0DEA - loadspritegfx 10163 + loadspritegfx ANIM_TAG_GOLD_RING call gUnknown_81D59BB call gUnknown_81D0E1D call gUnknown_81D0E1D call gUnknown_81D0E1D - createvisualtask sub_80B9BDC, 2, 4, 2, 2, 0, 12, 32351 + createvisualtask AnimTask_CurseBlendEffect, 2, 4, 2, 2, 0, 12, 32351 waitforvisualfinish delay 1 call gUnknown_81D59C7 @@ -7282,14 +7314,14 @@ gUnknown_81D0E1D:: @ 81D0E1D return Move_PSYWAVE:: @ 81D0E4A - loadspritegfx 10165 + loadspritegfx ANIM_TAG_BLUE_RING playsewithpan SE_W060, 192 call gUnknown_81D59BB createvisualtask sub_80AB100, 5, 100 createsoundtask mas_80DCF38, 196, -64, 63, 2, 9, 0, 10 call gUnknown_81D0EAD call gUnknown_81D0EAD - createvisualtask sub_80B9BDC, 2, 4, 1, 4, 0, 12, 32351 + createvisualtask AnimTask_CurseBlendEffect, 2, 4, 1, 4, 0, 12, 32351 call gUnknown_81D0EAD call gUnknown_81D0EAD call gUnknown_81D0EAD @@ -7307,8 +7339,8 @@ gUnknown_81D0EAD:: @ 81D0EAD return Move_ZAP_CANNON:: @ 81D0ED0 - loadspritegfx 10171 - loadspritegfx 10011 + loadspritegfx ANIM_TAG_BLACK_BALL_2 + loadspritegfx ANIM_TAG_SPARK_2 playsewithpan SE_W086, 192 createsprite gUnknown_83E5FDC, ANIM_TARGET, 3, 10, 0, 0, 0, 30, 0 createsprite gUnknown_83E6008, ANIM_TARGET, 4, 10, 0, 16, 30, 0, 40, 0 @@ -7328,8 +7360,8 @@ Move_ZAP_CANNON:: @ 81D0ED0 end Move_STEEL_WING:: @ 81D0FB5 - loadspritegfx 10009 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_GUST + loadspritegfx ANIM_TAG_IMPACT loopsewithpan SE_W231, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 waitforvisualfinish @@ -7355,7 +7387,7 @@ Move_STEEL_WING:: @ 81D0FB5 end Move_IRON_TAIL:: @ 81D1064 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT loopsewithpan SE_W231, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 1, 0, 0 waitforvisualfinish @@ -7374,8 +7406,8 @@ Move_IRON_TAIL:: @ 81D1064 end Move_POISON_TAIL:: @ 81D10C2 - loadspritegfx 10135 - loadspritegfx 10150 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_POISON_BUBBLE loopsewithpan SE_W231, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 1, 1, 23768 waitforvisualfinish @@ -7395,7 +7427,7 @@ Move_POISON_TAIL:: @ 81D10C2 end Move_METAL_CLAW:: @ 81D1128 - loadspritegfx 10039 + loadspritegfx ANIM_TAG_CLAW_SLASH loopsewithpan SE_W231, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 waitforvisualfinish @@ -7426,7 +7458,7 @@ Move_NIGHT_SHADE:: @ 81D11BB createvisualtask sub_80B54E8, 5, 85 delay 70 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 12, 1 - createvisualtask sub_80B9BDC, 2, 4, 0, 2, 0, 13, 0 + createvisualtask AnimTask_CurseBlendEffect, 2, 4, 0, 2, 0, 13, 0 waitforvisualfinish clearmonbg 0 delay 1 @@ -7435,8 +7467,8 @@ Move_NIGHT_SHADE:: @ 81D11BB end Move_EGG_BOMB:: @ 81D1203 - loadspritegfx 10198 - loadspritegfx 10175 + loadspritegfx ANIM_TAG_EXPLOSION + loadspritegfx ANIM_TAG_LARGE_FRESH_EGG playsewithpan SE_W039, 192 createsprite gEggThrowSpriteTemplate, ANIM_TARGET, 2, 10, 0, 0, 0, 25, -32 waitforvisualfinish @@ -7460,7 +7492,7 @@ Move_EGG_BOMB:: @ 81D1203 end Move_SHADOW_BALL:: @ 81D129D - loadspritegfx 10176 + loadspritegfx ANIM_TAG_SHADOW_BALL fadetobg 2 waitbgfadein delay 15 @@ -7475,7 +7507,7 @@ Move_SHADOW_BALL:: @ 81D129D end Move_LICK:: @ 81D12E0 - loadspritegfx 10177 + loadspritegfx ANIM_TAG_LICK delay 15 playsewithpan SE_W122, 63 createsprite gUnknown_83E763C, ANIM_TARGET, 2, 0, 0 @@ -7484,11 +7516,11 @@ Move_LICK:: @ 81D12E0 end Move_FOCUS_ENERGY:: @ 81D1307 - loadspritegfx 10184 + loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_W082, 192 call gUnknown_81CB267 delay 8 - createvisualtask sub_80B9BDC, 2, 2, 2, 2, 0, 11, 32767 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 11, RGB_WHITE createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 32, 1 call gUnknown_81CB267 delay 8 @@ -7497,22 +7529,22 @@ Move_FOCUS_ENERGY:: @ 81D1307 end Move_BIDE:: @ 81D1347 - choosetwoturnanim gUnknown_81D1351, gUnknown_81D137D + choosetwoturnanim BattleAnimScript_Bide_Setup, BattleAnimScript_Bide_Release end -gUnknown_81D1351:: @ 81D1351 +BattleAnimScript_Bide_Setup:: @ 81D1351 loopsewithpan SE_W036, 192, 9, 2 - createvisualtask sub_80B9BDC, 2, 2, 2, 2, 0, 11, 31 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 11, 31 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 32, 1 waitforvisualfinish end -gUnknown_81D137D:: @ 81D137D - loadspritegfx 10135 +BattleAnimScript_Bide_Release:: @ 81D137D + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 loopsewithpan SE_W036, 192, 9, 2 - createvisualtask sub_80BA7F8, 10, 2, 2, 0, 11, 31 + createvisualtask AnimTask_BlendSelected, 10, 2, 2, 0, 11, RGB(31, 0, 0) createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 32, 1 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 4 @@ -7531,15 +7563,15 @@ gUnknown_81D137D:: @ 81D137D delay 5 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 7 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 2, 2, 11, 0, 31 + createvisualtask AnimTask_BlendSelected, 10, 2, 2, 11, 0, RGB(31, 0, 0) waitforvisualfinish clearmonbg 3 blendoff end Move_STRING_SHOT:: @ 81D1446 - loadspritegfx 10179 - loadspritegfx 10180 + loadspritegfx ANIM_TAG_STRING + loadspritegfx ANIM_TAG_WEB_THREAD monbg 3 delay 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 0, 9, 0 @@ -7583,8 +7615,8 @@ gUnknown_81D1504:: @ 81D1504 return Move_SPIDER_WEB:: @ 81D1518 - loadspritegfx 10181 - loadspritegfx 10180 + loadspritegfx ANIM_TAG_SPIDER_WEB + loadspritegfx ANIM_TAG_WEB_THREAD monbg 3 delay 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 0, 9, 0 @@ -7620,14 +7652,14 @@ gUnknown_81D15A5:: @ 81D15A5 return Move_RAZOR_WIND:: @ 81D15B9 - choosetwoturnanim gUnknown_81D15C4, gUnknown_81D1614 + choosetwoturnanim BattleAnimScript_RazorWInd_Turn1, BattleAnimScript_RazorWInd_Turn2 gUnknown_81D15C2:: @ 81D15C2 waitforvisualfinish end -gUnknown_81D15C4:: @ 81D15C4 - loadspritegfx 10009 +BattleAnimScript_RazorWInd_Turn1:: @ 81D15C4 + loadspritegfx ANIM_TAG_GUST playsewithpan SE_W016, 192 createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 0, 7, 40 createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 85, 7, 40 @@ -7636,9 +7668,9 @@ gUnknown_81D15C4:: @ 81D15C4 playsewithpan SE_W016B, 192 goto gUnknown_81D15C2 -gUnknown_81D1614:: @ 81D1614 - loadspritegfx 10154 - loadspritegfx 10135 +BattleAnimScript_RazorWInd_Turn2:: @ 81D1614 + loadspritegfx ANIM_TAG_AIR_WAVE_2 + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 playsewithpan SE_W013B, 192 @@ -7659,7 +7691,7 @@ gUnknown_81D1614:: @ 81D1614 goto gUnknown_81D15C2 Move_DISABLE:: @ 81D169F - loadspritegfx 10071 + loadspritegfx ANIM_TAG_SPARKLE_4 monbg 1 monbgprio_28 1 setalpha 8, 8 @@ -7675,12 +7707,12 @@ Move_DISABLE:: @ 81D169F end Move_RECOVER:: @ 81D16CD - loadspritegfx 10147 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR monbg 2 setalpha 12, 8 loopsewithpan SE_W025, 192, 13, 3 - createvisualtask sub_80B9BDC, 2, 2, 0, 6, 0, 11, 12287 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 6, 0, 11, 12287 call gUnknown_81D170D call gUnknown_81D170D call gUnknown_81D170D @@ -7710,7 +7742,7 @@ gUnknown_81D170D:: @ 81D170D return Move_MIMIC:: @ 81D1777 - loadspritegfx 10147 + loadspritegfx ANIM_TAG_ORBS monbg_22 3 setalpha 11, 5 panse_1B SE_W107, 63, 192, 253, 0 @@ -7721,14 +7753,14 @@ Move_MIMIC:: @ 81D1777 setarg 7, 65535 waitforvisualfinish playsewithpan SE_W036, 192 - createvisualtask sub_80B9BDC, 2, 2, 0, 2, 0, 11, 32767 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 2, 0, 11, RGB_WHITE waitforvisualfinish clearmonbg_23 3 blendoff end Move_CONSTRICT:: @ 81D17C1 - loadspritegfx 10186 + loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, 63, 6, 4 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 2 delay 7 @@ -7745,11 +7777,11 @@ Move_CONSTRICT:: @ 81D17C1 end Move_CURSE:: @ 81D1829 - choosetwoturnanim gUnknown_81D1832, gUnknown_81D18AF + choosetwoturnanim BattleAnimScript_Curse_Ghost, BattleAnimScript_Curse_Other -gUnknown_81D1832:: @ 81D1832 - loadspritegfx 10199 - loadspritegfx 10200 +BattleAnimScript_Curse_Ghost:: @ 81D1832 + loadspritegfx ANIM_TAG_NAIL + loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg 2 createvisualtask sub_80B63B4, 5, waitforvisualfinish @@ -7779,7 +7811,7 @@ gUnknown_81D1899:: @ 81D1899 playsewithpan SE_W020, 192 return -gUnknown_81D18AF:: @ 81D18AF +BattleAnimScript_Curse_Other:: @ 81D18AF createvisualtask AnimTask_SwayMon, 5, 0, 10, 1536, 3, 0 waitforvisualfinish delay 10 @@ -7789,14 +7821,14 @@ gUnknown_81D18AF:: @ 81D18AF gUnknown_81D18CA:: @ 81D18CA playsewithpan SE_W082, 192 - createvisualtask sub_80BACEC, 5, - createvisualtask sub_80B9BDC, 5, 2, 4, 2, 0, 10, 31 + createvisualtask AnimTask_SetUpCurseBackground, 5, + createvisualtask AnimTask_CurseBlendEffect, 5, 2, 4, 2, 0, 10, 31 return Move_SOFT_BOILED:: @ 81D18E9 - loadspritegfx 10202 - loadspritegfx 10203 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_BREAKING_EGG + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_BLUE_STAR monbg 2 playsewithpan SE_W039, 192 createvisualtask AnimTask_ShakeMon, 2, 0, 0, 2, 6, 1 @@ -7817,10 +7849,10 @@ Move_SOFT_BOILED:: @ 81D18E9 end Move_HEAL_BELL:: @ 81D196B - loadspritegfx 10205 - loadspritegfx 10206 - loadspritegfx 10203 - createvisualtask sub_80BA7F8, 10, 10, 0, 0, 10, 32767 + loadspritegfx ANIM_TAG_BELL + loadspritegfx ANIM_TAG_MUSIC_NOTES_2 + loadspritegfx ANIM_TAG_THIN_RING + createvisualtask AnimTask_BlendSelected, 10, 10, 0, 0, 10, RGB_WHITE waitforvisualfinish createvisualtask sub_80A96B4, 5, createsprite gBellSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 0, 1 @@ -7845,26 +7877,26 @@ Move_HEAL_BELL:: @ 81D196B waitforvisualfinish createvisualtask sub_80A9760, 5, waitforvisualfinish - unloadspritegfx 10205 - unloadspritegfx 10206 - unloadspritegfx 10203 - loadspritegfx 10049 + unloadspritegfx ANIM_TAG_BELL + unloadspritegfx ANIM_TAG_MUSIC_NOTES_2 + unloadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_SPARKLE_2 playsewithpan SE_W234, 192 createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish - unloadspritegfx 10049 - loadspritegfx 10203 + unloadspritegfx ANIM_TAG_SPARKLE_2 + loadspritegfx ANIM_TAG_THIN_RING playsewithpan SE_REAPOKE, 192 - createvisualtask sub_80BA83C, 10, 4, 3, 10, 0, 31500 - createvisualtask sub_80BA7F8, 10, 10, 3, 10, 0, 32767 + createvisualtask AnimTask_BlendExcept, 10, 4, 3, 10, 0, 31500 + createvisualtask AnimTask_BlendSelected, 10, 10, 3, 10, 0, RGB_WHITE createsprite gBlendThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 16, 0, 0, 0, 1 end gUnknown_81D1B2F:: @ 81D1B2F - createvisualtask sub_80BA83C, 10, 4, 3, 8, 0, 31500 - createvisualtask sub_80BA7F8, 10, 10, 3, 2, 10, 32767 + createvisualtask AnimTask_BlendExcept, 10, 4, 3, 8, 0, 31500 + createvisualtask AnimTask_BlendSelected, 10, 10, 3, 2, 10, RGB_WHITE createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 0, 1 playsewithpan SE_W215, 192 return @@ -7877,11 +7909,11 @@ Move_FAKE_OUT:: @ 81D1B65 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 5, 1 createvisualtask sub_80A9A20, 3, waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, 32767 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE end Move_SCARY_FACE:: @ 81D1BA0 - loadspritegfx 10218 + loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 27, 3, 0, 16, 0 playsewithpan SE_W060, 192 waitforvisualfinish @@ -7899,8 +7931,8 @@ Move_SCARY_FACE:: @ 81D1BA0 end Move_SWEET_KISS:: @ 81D1C03 - loadspritegfx 10216 - loadspritegfx 10220 + loadspritegfx ANIM_TAG_RED_HEART + loadspritegfx ANIM_TAG_ANGEL createsprite gAngelSpriteTemplate, ANIM_TARGET, 2, 16, -48 playsewithpan SE_W215, 63 delay 23 @@ -7918,8 +7950,8 @@ Move_SWEET_KISS:: @ 81D1C03 end Move_LOVELY_KISS:: @ 81D1C6C - loadspritegfx 10219 - loadspritegfx 10221 + loadspritegfx ANIM_TAG_PINK_HEART + loadspritegfx ANIM_TAG_DEVIL createsprite gDevilSpriteTemplate, ANIM_TARGET, 2, 0, -24 playsewithpan SE_W060B, 63 waitforvisualfinish @@ -7931,7 +7963,7 @@ Move_LOVELY_KISS:: @ 81D1C6C end Move_FURY_SWIPES:: @ 81D1CB3 - loadspritegfx 10222 + loadspritegfx ANIM_TAG_SWIPE createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 5, 5 delay 4 playsewithpan SE_W010, 63 @@ -7946,8 +7978,8 @@ Move_FURY_SWIPES:: @ 81D1CB3 end Move_INGRAIN:: @ 81D1D17 - loadspritegfx 10223 - loadspritegfx 10147 + loadspritegfx ANIM_TAG_ROOTS + loadspritegfx ANIM_TAG_ORBS createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 16, 26, -1, 2, 150 playsewithpan SE_W010, 192 delay 10 @@ -7976,7 +8008,7 @@ Move_INGRAIN:: @ 81D1D17 end Move_PRESENT:: @ 81D1DC8 - loadspritegfx 10224 + loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_IsHealingMove, 2, createsprite gPresentSpriteTemplate, ANIM_TARGET, 2, 0, -5, 10, 2, -1 playsewithpan SE_W039, 192 @@ -7992,7 +8024,7 @@ Move_PRESENT:: @ 81D1DC8 end gUnknown_81D1E0B:: @ 81D1E0B - loadspritegfx 10198 + loadspritegfx ANIM_TAG_EXPLOSION playsewithpan SE_W120, 63 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 delay 6 @@ -8010,8 +8042,8 @@ gUnknown_81D1E0B:: @ 81D1E0B end gUnknown_81D1E76:: @ 81D1E76 - loadspritegfx 10195 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_GREEN_SPARKLE + loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_W234, 63 createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -16, 32, -3, 1 delay 3 @@ -8036,14 +8068,14 @@ gUnknown_81D1E76:: @ 81D1E76 end Move_BATON_PASS:: @ 81D1F1F - loadspritegfx 10226 + loadspritegfx ANIM_TAG_POKEBALL playsewithpan SE_W226, 192 - createvisualtask sub_80B9BDC, 2, 31, 1, 2, 0, 11, 31455 + createvisualtask AnimTask_CurseBlendEffect, 2, 31, 1, 2, 0, 11, 31455 createsprite gBatonPassPokeballSpriteTemplate, ANIM_ATTACKER, 2, end Move_PERISH_SONG:: @ 81D1F41 - loadspritegfx 10206 + loadspritegfx ANIM_TAG_MUSIC_NOTES_2 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 0 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 1, 1, 16 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 2, 1, 32 @@ -8079,7 +8111,7 @@ Move_PERISH_SONG:: @ 81D1F41 end Move_SLEEP_TALK:: @ 81D20AA - loadspritegfx 10228 + loadspritegfx ANIM_TAG_LETTER_Z createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, 0 delay 20 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -1 @@ -8106,7 +8138,7 @@ Move_SLEEP_TALK:: @ 81D20AA end Move_HYPER_FANG:: @ 81D2165 - loadspritegfx 10192 + loadspritegfx ANIM_TAG_FANG_ATTACK playsewithpan SE_W044, 63 delay 1 delay 2 @@ -8141,7 +8173,7 @@ gUnknown_81D21C5:: @ 81D21C5 goto gUnknown_81D2193 Move_TRI_ATTACK:: @ 81D21CC - loadspritegfx 10230 + loadspritegfx ANIM_TAG_TRI_FORCE_TRIANGLE createsprite gTriAttackTriangleSpriteTemplate, ANIM_TARGET, 2, 16, 0 playsewithpan SE_W161, 192 delay 20 @@ -8151,7 +8183,7 @@ Move_TRI_ATTACK:: @ 81D21CC waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, 0 delay 16 - loadspritegfx 10033 + loadspritegfx ANIM_TAG_FIRE createsprite gUnknown_83E5C88, ANIM_TARGET, 2, 0, 0, 30, 30, -1, 0 playsewithpan SE_W172B, 63 createsprite gUnknown_83E5C88, ANIM_TARGET, 2, 0, 0, 30, 30, 0, 1 @@ -8170,7 +8202,7 @@ Move_TRI_ATTACK:: @ 81D21CC delay 2 createvisualtask sub_80ADAD8, 2, 20, 3, 1, 1 waitforvisualfinish - loadspritegfx 10037 + loadspritegfx ANIM_TAG_LIGHTNING createvisualtask sub_80BA0E8, 2, 257, 257, 257 playsewithpan SE_W161B, 63 createsprite gUnknown_83E5F38, ANIM_TARGET, 2, 0, -48 @@ -8183,15 +8215,15 @@ Move_TRI_ATTACK:: @ 81D21CC delay 2 createvisualtask sub_80BA0E8, 2, 257, 257, 257 waitforvisualfinish - loadspritegfx 10141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS call gUnknown_81D540A createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, 0 waitforvisualfinish end Move_WILL_O_WISP:: @ 81D2340 - loadspritegfx 10232 - loadspritegfx 10231 + loadspritegfx ANIM_TAG_WISP_FIRE + loadspritegfx ANIM_TAG_WISP_ORB monbg 3 monbgprio_2A 1 playsewithpan SE_W052, 192 @@ -8221,10 +8253,10 @@ Move_WILL_O_WISP:: @ 81D2340 end Move_ENCORE:: @ 81D23FE - loadspritegfx 10227 - loadspritegfx 10247 + loadspritegfx ANIM_TAG_SPOTLIGHT + loadspritegfx ANIM_TAG_TAG_HAND createvisualtask AnimTask_CreateSpotlight, 2, - createvisualtask sub_80BAB38, 2, 248, 3, 0, 10, 0 + createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 0, 10, FALSE waitforvisualfinish createsprite gSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8 createsprite gClappingHandSpriteTemplate, ANIM_ATTACKER, 2, -2, 0, 0, 0, 9 @@ -8235,14 +8267,14 @@ Move_ENCORE:: @ 81D23FE createvisualtask sub_80DD410, 5, 216, 63 createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, 1 waitforvisualfinish - createvisualtask sub_80BAB38, 2, 248, 3, 10, 0, 1 + createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 10, 0, TRUE waitforvisualfinish createvisualtask AnimTask_RemoveSpotlight, 2, end Move_TRICK:: @ 81D24A5 - loadspritegfx 10224 - loadspritegfx 10207 + loadspritegfx ANIM_TAG_ITEM_BAG + loadspritegfx ANIM_TAG_SPEED_DUST createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 80 createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 208 delay 16 @@ -8269,8 +8301,8 @@ Move_TRICK:: @ 81D24A5 end Move_WISH:: @ 81D2523 - loadspritegfx 10233 - loadspritegfx 10049 + loadspritegfx ANIM_TAG_GOLD_STARS + loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, 0 waitforvisualfinish panse_27 SE_W115, 63, 192, 253, 0 @@ -8285,14 +8317,14 @@ Move_WISH:: @ 81D2523 end Move_STOCKPILE:: @ 81D256B - loadspritegfx 10235 + loadspritegfx ANIM_TAG_GRAY_ORB playsewithpan SE_W025, 192 - createvisualtask sub_80B9BDC, 2, 2, 8, 1, 0, 12, 32767 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 8, 1, 0, 12, RGB_WHITE createvisualtask AnimTask_StockpileDeformMon, 5, call gUnknown_81D25A9 call gUnknown_81D25A9 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 12, 0, 32767 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 12, 0, RGB_WHITE end gUnknown_81D25A9:: @ 81D25A9 @@ -8315,8 +8347,8 @@ gUnknown_81D25A9:: @ 81D25A9 return Move_SPIT_UP:: @ 81D2622 - loadspritegfx 10237 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_RED_ORB_2 + loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W036, 192 createvisualtask AnimTask_SpitUpDeformMon, 5, createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 8, 2 @@ -8365,8 +8397,8 @@ gUnknown_81D2718:: @ 81D2718 goto gUnknown_81D26B2 Move_SWALLOW:: @ 81D2765 - loadspritegfx 10236 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_BLUE_ORB + loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_W036, 192 createvisualtask AnimTask_SwallowDeformMon, 5, createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 8, 2 @@ -8414,11 +8446,11 @@ Move_TRANSFORM:: @ 81D2811 end Move_MORNING_SUN:: @ 81D2829 - loadspritegfx 10241 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_GREEN_STAR + loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask AnimTask_MorningSunLightBeam, 5, delay 8 - createvisualtask sub_80BA7F8, 10, 1921, 8, 0, 12, 32767 + createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 8, 0, 12, RGB_WHITE delay 14 call gUnknown_81D28AF call gUnknown_81D28AF @@ -8435,7 +8467,7 @@ Move_MORNING_SUN:: @ 81D2829 call gUnknown_81D28AF call gUnknown_81D28AF call gUnknown_81D28AF - createvisualtask sub_80BA7F8, 10, 1921, 3, 12, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 3, 12, 0, RGB_WHITE waitforvisualfinish waitsound call gUnknown_81D56C9 @@ -8447,7 +8479,7 @@ gUnknown_81D28AF:: @ 81D28AF return Move_SWEET_SCENT:: @ 81D28BD - loadspritegfx 10238 + loadspritegfx ANIM_TAG_PINK_PETAL playsewithpan SE_W230, 192 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 100 delay 25 @@ -8455,7 +8487,7 @@ Move_SWEET_SCENT:: @ 81D28BD call gUnknown_81D2901 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 55, 0 setpan 63 - createvisualtask sub_80B9BDC, 2, 20, 1, 5, 5, 13, 22207 + createvisualtask AnimTask_CurseBlendEffect, 2, 20, 1, 5, 5, 13, 22207 call gUnknown_81D2901 waitforvisualfinish end @@ -8486,7 +8518,7 @@ gUnknown_81D2901:: @ 81D2901 return Move_HYPER_BEAM:: @ 81D29A7 - loadspritegfx 10147 + loadspritegfx ANIM_TAG_ORBS createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 0, 16, 0 waitforvisualfinish delay 10 @@ -8503,7 +8535,7 @@ Move_HYPER_BEAM:: @ 81D29A7 call gUnknown_81D2AD8 call gUnknown_81D2AD8 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 50, 1 - createvisualtask sub_80BA7F8, 10, 4, 2, 0, 11, 26425 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 11, RGB(25, 25, 25) call gUnknown_81D2AD8 call gUnknown_81D2AD8 call gUnknown_81D2AD8 @@ -8525,7 +8557,7 @@ Move_HYPER_BEAM:: @ 81D29A7 call gUnknown_81D2AD8 call gUnknown_81D2AD8 call gUnknown_81D2AD8 - createvisualtask sub_80BA7F8, 10, 4, 2, 11, 0, 26425 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 11, 0, RGB(25, 25, 25) waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 16, 0, 0 end @@ -8537,11 +8569,11 @@ gUnknown_81D2AD8:: @ 81D2AD8 return Move_FLATTER:: @ 81D2AE9 - loadspritegfx 10227 - loadspritegfx 10240 + loadspritegfx ANIM_TAG_SPOTLIGHT + loadspritegfx ANIM_TAG_CONFETTI createvisualtask sub_80DD410, 5, 216, 63 createvisualtask AnimTask_CreateSpotlight, 2, - createvisualtask sub_80BAB38, 2, 248, 3, 0, 10, 0 + createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 0, 10, FALSE waitforvisualfinish createsprite gFlatterSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8, 80 delay 0 @@ -8572,7 +8604,7 @@ Move_FLATTER:: @ 81D2AE9 delay 5 createvisualtask sub_80DD3DC, 5, 222, 63 waitforvisualfinish - createvisualtask sub_80BAB38, 2, 248, 3, 10, 0, 1 + createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 10, 0, TRUE waitforvisualfinish createvisualtask AnimTask_RemoveSpotlight, 2, end @@ -8584,7 +8616,7 @@ gUnknown_81D2BD2:: @ 81D2BD2 Move_ROLE_PLAY:: @ 81D2BE5 monbg 2 - createvisualtask sub_80BA7F8, 10, 4, 2, 0, 16, 32767 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 16, RGB_WHITE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 10, 0 waitforvisualfinish playsewithpan SE_W161, 192 @@ -8592,14 +8624,14 @@ Move_ROLE_PLAY:: @ 81D2BE5 createvisualtask AnimTask_RolePlaySilhouette, 2, waitforvisualfinish clearmonbg 2 - createvisualtask sub_80BA7F8, 10, 4, 2, 16, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 16, 0, RGB_WHITE delay 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 10, 0, 0 end Move_REFRESH:: @ 81D2C42 - loadspritegfx 10203 - loadspritegfx 10049 + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_SPARKLE_2 playsewithpan SE_W287, 192 createvisualtask sub_80E2084, 2, 0 waitforvisualfinish @@ -8612,19 +8644,19 @@ Move_REFRESH:: @ 81D2C42 end Move_BLAZE_KICK:: @ 81D2C85 - loadspritegfx 10135 - loadspritegfx 10143 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_SMALL_EMBER monbg 1 setalpha 12, 8 playsewithpan SE_W172, 63 createsprite gUnknown_83E678C, ANIM_TARGET, 3, 0, 0, 1, 30 - createvisualtask sub_80BA7F8, 10, 4, 2, 0, 7, 32767 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 7, RGB_WHITE delay 30 playsewithpan SE_W007, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 14, 1 - createvisualtask sub_80BA7F8, 10, 4, 2, 0, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 0, RGB_WHITE createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 0, 8, 0, 0 call gUnknown_81D0950 waitforvisualfinish @@ -8633,7 +8665,7 @@ Move_BLAZE_KICK:: @ 81D2C85 end Move_HYPER_VOICE:: @ 81D2D0D - loadspritegfx 10203 + loadspritegfx ANIM_TAG_THIN_RING call gUnknown_81D2D1F waitforvisualfinish delay 8 @@ -8653,7 +8685,7 @@ gUnknown_81D2D1F:: @ 81D2D1F return Move_SAND_TOMB:: @ 81D2D96 - loadspritegfx 10074 + loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, 563 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 43, 1 playsewithpan SE_W328, 63 @@ -8685,7 +8717,7 @@ Move_SHEER_COLD:: @ 81D2E6E waitbgfadeout playsewithpan SE_W196, 0 waitbgfadein - loadspritegfx 10010 + loadspritegfx ANIM_TAG_ICE_CUBE monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -8699,8 +8731,8 @@ Move_SHEER_COLD:: @ 81D2E6E end Move_ARM_THRUST:: @ 81D2E93 - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbgprio_28 1 setalpha 12, 8 createvisualtask sub_8099980, 5, 8, 5, 0, 0 @@ -8735,7 +8767,7 @@ Move_MUDDY_WATER:: @ 81D2F28 end Move_BULLET_SEED:: @ 81D2F3A - loadspritegfx 10006 + loadspritegfx ANIM_TAG_SEED createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 delay 5 createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 @@ -8760,10 +8792,10 @@ Move_BULLET_SEED:: @ 81D2F3A end Move_DRAGON_CLAW:: @ 81D2FD0 - loadspritegfx 10029 - loadspritegfx 10039 + loadspritegfx ANIM_TAG_SMALL_EMBER + loadspritegfx ANIM_TAG_CLAW_SLASH playsewithpan SE_W221B, 192 - createvisualtask sub_80BA7F8, 10, 2, 4, 0, 8, 639 + createvisualtask AnimTask_BlendSelected, 10, 2, 4, 0, 8, RGB(31, 19, 0) createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 15, 1 call gUnknown_81D31AD call gUnknown_81D31AD @@ -8800,7 +8832,7 @@ Move_DRAGON_CLAW:: @ 81D2FD0 createsprite gUnknown_83E7438, ANIM_ATTACKER, 2, 0, 28, 512, 25, 16, 46, 0 delay 2 createsprite gUnknown_83E7438, ANIM_ATTACKER, 2, 0, 33, 464, 30, 15, -50, 0 - createvisualtask sub_80BA7F8, 10, 2, 4, 8, 0, 639 + createvisualtask AnimTask_BlendSelected, 10, 2, 4, 8, 0, RGB(31, 19, 0) waitforvisualfinish end @@ -8821,7 +8853,7 @@ gUnknown_81D31AD:: @ 81D31AD end Move_MUD_SHOT:: @ 81D3239 - loadspritegfx 10259 + loadspritegfx ANIM_TAG_BROWN_ORB monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -8854,9 +8886,9 @@ gUnknown_81D32B3:: @ 81D32B3 return Move_METEOR_MASH:: @ 81D32D6 - loadspritegfx 10233 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_GOLD_STARS + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET panse_1B SE_W112, 192, 63, 3, 0 fadetobg 16 waitbgfadein @@ -8879,23 +8911,23 @@ Move_METEOR_MASH:: @ 81D32D6 end Move_REVENGE:: @ 81D335D - loadspritegfx 10245 + loadspritegfx ANIM_TAG_PURPLE_SCRATCH monbg 1 setalpha 12, 8 playsewithpan SE_W036, 192 createsprite gUnknown_83E6900, ANIM_ATTACKER, 2, 10, -10 waitforvisualfinish - createvisualtask sub_80B9BDC, 2, 2, 0, 4, 2, 8, 31 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 4, 2, 8, 31 waitforvisualfinish - unloadspritegfx 10245 - loadspritegfx 10246 + unloadspritegfx ANIM_TAG_PURPLE_SCRATCH + loadspritegfx ANIM_TAG_PURPLE_SWIPE createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 4 playsewithpan SE_W207, 63 createsprite gUnknown_83E6948, ANIM_TARGET, 2, 10, -10 waitforvisualfinish - unloadspritegfx 10246 - loadspritegfx 10135 + unloadspritegfx ANIM_TAG_PURPLE_SWIPE + loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 10, 1 createsprite gUnknown_83E7CB0, ANIM_TARGET, 3, -10, -8, 1, 1, 8 playsewithpan SE_W233B, 63 @@ -8908,14 +8940,14 @@ Move_REVENGE:: @ 81D335D end Move_POISON_FANG:: @ 81D33F4 - loadspritegfx 10192 - loadspritegfx 10150 + loadspritegfx ANIM_TAG_FANG_ATTACK + loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_W044, 63 createsprite gFangSpriteTemplate, ANIM_TARGET, 2, delay 10 createvisualtask AnimTask_ShakeMon, 3, 1, 3, 0, 10, 1 waitforvisualfinish - createvisualtask sub_80B9BDC, 2, 4, 0, 4, 0, 12, 26650 + createvisualtask AnimTask_CurseBlendEffect, 2, 4, 0, 4, 0, 12, 26650 call gUnknown_81D575B waitforvisualfinish end @@ -8926,8 +8958,8 @@ Move_SUBSTITUTE:: @ 81D3433 end Move_FRENZY_PLANT:: @ 81D343F - loadspritegfx 10223 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ROOTS + loadspritegfx ANIM_TAG_IMPACT monbg 1 monbgprio_28 1 setalpha 12, 8 @@ -8986,7 +9018,7 @@ Move_FRENZY_PLANT:: @ 81D343F end Move_METAL_SOUND:: @ 81D35E3 - loadspritegfx 10260 + loadspritegfx ANIM_TAG_METAL_SOUND_WAVES monbg 3 monbgprio_2A 1 createvisualtask AnimTask_ShakeMon2, 2, 0, 2, 0, 8, 1 @@ -9014,8 +9046,8 @@ gUnknown_81D3638:: @ 81D3638 end gUnknown_81D363A:: @ 81D363A - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET delay 1 createvisualtask AnimTask_IsContest, 2, jumpargeq 7, 1, gUnknown_81D36F3 @@ -9061,7 +9093,7 @@ gUnknown_81D36F3:: @ 81D36F3 goto gUnknown_81D3668 Move_RETURN:: @ 81D36FA - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 createvisualtask AnimTask_GetReturnPowerLevel, 2, @@ -9157,13 +9189,13 @@ gUnknown_81D38FD:: @ 81D38FD createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1 waitforvisualfinish delay 2 - createvisualtask sub_80BAB98, 2, 0, 4, 5, 1 + createvisualtask AnimTask_CloneBattlerSpriteWithBlend, 2, 0, 4, 5, 1 createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 4, 1, 0 createvisualtask sub_80DD410, 5, 160, -64 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, 1, 2 createvisualtask sub_80DD3DC, 5, 116, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1 - createvisualtask sub_80BAB98, 2, 0, 4, 5, 1 + createvisualtask AnimTask_CloneBattlerSpriteWithBlend, 2, 0, 4, 5, 1 waitforvisualfinish createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 4, 2, 0 createvisualtask sub_80DD410, 5, 160, -64 @@ -9171,7 +9203,7 @@ gUnknown_81D38FD:: @ 81D38FD createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, 1, 2 createvisualtask sub_80DD3DC, 5, 116, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1 - createvisualtask sub_80BAB98, 2, 0, 4, 5, 1 + createvisualtask AnimTask_CloneBattlerSpriteWithBlend, 2, 0, 4, 5, 1 waitforvisualfinish call gUnknown_81D3B35 call gUnknown_81D3B35 @@ -9199,12 +9231,12 @@ gUnknown_81D3B35:: @ 81D3B35 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask sub_80DD3DC, 5, 116, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1 - createvisualtask sub_80BAB98, 2, 0, 4, 5, 1 + createvisualtask AnimTask_CloneBattlerSpriteWithBlend, 2, 0, 4, 5, 1 waitforvisualfinish return Move_COSMIC_POWER:: @ 81D3B89 - loadspritegfx 10049 + loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask sub_80DD410, 5, 236, 0 playsewithpan SE_W322, 0 createvisualtask sub_80BB7DC, 2, 0, 0, 15, 0 @@ -9229,8 +9261,8 @@ Move_COSMIC_POWER:: @ 81D3B89 end Move_BLAST_BURN:: @ 81D3C0E - loadspritegfx 10035 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_FIRE_PLUME + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W221, 192 @@ -9274,8 +9306,8 @@ Move_BLAST_BURN:: @ 81D3C0E end Move_ROCK_TOMB:: @ 81D3E50 - loadspritegfx 10250 - loadspritegfx 10058 + loadspritegfx ANIM_TAG_X_SIGN + loadspritegfx ANIM_TAG_ROCKS createvisualtask sub_80BA47C, 2, 2, 0, 10, 1 waitforvisualfinish createsprite gUnknown_83E7508, ANIM_TARGET, 2, 20, 12, 64, 114, 0 @@ -9306,14 +9338,14 @@ Move_ROCK_TOMB:: @ 81D3E50 end Move_SILVER_WIND:: @ 81D3F37 - loadspritegfx 10271 + loadspritegfx ANIM_TAG_SPARKLE_6 panse_1B SE_W016, 192, 63, 2, 0 playsewithpan SE_W234, 0 delay 0 monbg 3 monbgprio_29 delay 0 - createvisualtask sub_80BA83C, 10, 1, 0, 0, 4, 0 + createvisualtask AnimTask_BlendExcept, 10, 1, 0, 0, 4, 0 createvisualtask AnimTask_GetTargetSide, 2, jumpargeq 7, 1, gUnknown_81D4138 fadetobg 22 @@ -9322,7 +9354,7 @@ Move_SILVER_WIND:: @ 81D3F37 gUnknown_81D3F7E:: @ 81D3F7E delay 0 - createvisualtask sub_80BA7F8, 10, 1, 0, 4, 4, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 4, 4, RGB_BLACK waitbgfadein createsprite gSilverWindBigSparkSpriteTemplate, ANIM_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 createsprite gSilverWindBigSparkSpriteTemplate, ANIM_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 @@ -9353,7 +9385,7 @@ gUnknown_81D3F7E:: @ 81D3F7E delay 0 restorebg waitbgfadeout - createvisualtask sub_80BA83C, 10, 1, 0, 4, 0, 0 + createvisualtask AnimTask_BlendExcept, 10, 1, 0, 4, 0, 0 setarg 7, 65535 waitbgfadein end @@ -9370,12 +9402,12 @@ Move_SNATCH:: @ 81D414F end Move_DIVE:: @ 81D4169 - loadspritegfx 10272 - loadspritegfx 10273 + loadspritegfx ANIM_TAG_SPLASH + loadspritegfx ANIM_TAG_SWEAT_BEAD choosetwoturnanim gUnknown_81D4178, gUnknown_81D41CD gUnknown_81D4178:: @ 81D4178 - loadspritegfx 10156 + loadspritegfx ANIM_TAG_ROUND_SHADOW playsewithpan SE_W029, 192 createsprite gUnknown_83E6D40, ANIM_ATTACKER, 2, 0, 0, 13, 336 waitforvisualfinish @@ -9394,8 +9426,8 @@ gUnknown_81D41B6:: @ 81D41B6 return gUnknown_81D41CD:: @ 81D41CD - loadspritegfx 10148 - loadspritegfx 10155 + loadspritegfx ANIM_TAG_WATER_IMPACT + loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg 3 setalpha 12, 8 playsewithpan SE_W153, 63 @@ -9419,8 +9451,8 @@ gUnknown_81D420C:: @ 81D420C return Move_ROCK_BLAST:: @ 81D4223 - loadspritegfx 10058 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ROCKS + loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 3 playsewithpan SE_W207, 192 @@ -9437,8 +9469,8 @@ Move_ROCK_BLAST:: @ 81D4223 end Move_OVERHEAT:: @ 81D42C0 - loadspritegfx 10029 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SMALL_EMBER + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 18 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 5, 28 @@ -9518,8 +9550,8 @@ Move_OVERHEAT:: @ 81D42C0 end Move_HYDRO_CANNON:: @ 81D45B2 - loadspritegfx 10149 - loadspritegfx 10148 + loadspritegfx ANIM_TAG_WATER_ORB + loadspritegfx ANIM_TAG_WATER_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W057, 192 @@ -9561,7 +9593,7 @@ gUnknown_81D467C:: @ 81D467C return Move_ASTONISH:: @ 81D46E4 - loadspritegfx 10273 + loadspritegfx ANIM_TAG_SWEAT_BEAD playsewithpan SE_W227, 192 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 25 @@ -9574,8 +9606,8 @@ Move_ASTONISH:: @ 81D46E4 end Move_SEISMIC_TOSS:: @ 81D472C - loadspritegfx 10135 - loadspritegfx 10058 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_ROCKS setarg 7, 0 monbg 3 setalpha 12, 8 @@ -9647,7 +9679,7 @@ gUnknown_81D4828:: @ 81D4828 return Move_MAGIC_COAT:: @ 81D4889 - loadspritegfx 10170 + loadspritegfx ANIM_TAG_ORANGE_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W112, 192, 15 createsprite gUnknown_83E6E70, ANIM_ATTACKER, 3, 40, 0, 10170 @@ -9657,8 +9689,8 @@ Move_MAGIC_COAT:: @ 81D4889 end Move_WATER_PULSE:: @ 81D48A6 - loadspritegfx 10155 - loadspritegfx 10288 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_BLUE_RING_2 monbg 1 monbgprio_28 1 playsewithpan SE_W145C, 192 @@ -9688,14 +9720,14 @@ Move_WATER_PULSE:: @ 81D48A6 end Move_PSYCHO_BOOST:: @ 81D499B - loadspritegfx 10212 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT monbg 2 fadetobg 3 waitbgfadeout createvisualtask AnimTask_FadeScreenToWhite, 5, waitbgfadein delay 6 - createvisualtask sub_80B9BDC, 2, 1, 2, 8, 0, 10, 0 + createvisualtask AnimTask_CurseBlendEffect, 2, 1, 2, 8, 0, 10, 0 delay 0 monbgprio_28 0 setalpha 8, 8 @@ -9715,14 +9747,14 @@ Move_PSYCHO_BOOST:: @ 81D499B end Move_KNOCK_OFF:: @ 81D4A0F - loadspritegfx 10277 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SLAM_HIT_2 + loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 4 playsewithpan SE_W233, 63 createsprite gKnockOffStrikeSpriteTemplate, ANIM_TARGET, 2, -16, -16 delay 8 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, 32767, 10, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 2 playsewithpan SE_W004, 63 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -12, 10, 0, 3 @@ -9753,8 +9785,8 @@ Move_DOOM_DESIRE:: @ 81D4A9F clearmonbg 2 blendoff end - loadspritegfx 10198 - createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, 32767 + loadspritegfx ANIM_TAG_EXPLOSION + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_WHITE waitforvisualfinish delay 10 createvisualtask AnimTask_DoomDesireLightBeam, 5, @@ -9781,12 +9813,12 @@ Move_DOOM_DESIRE:: @ 81D4A9F playsewithpan SE_W120, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, 32767 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE waitforvisualfinish end Move_SKY_UPPERCUT:: @ 81D4BC1 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 3 monbgprio_28 1 fadetobg 17 @@ -9843,9 +9875,9 @@ Move_SECRET_POWER:: @ 81D4CBA goto Move_SLAM Move_TWISTER:: @ 81D4D0E - loadspritegfx 10063 - loadspritegfx 10135 - loadspritegfx 10058 + loadspritegfx ANIM_TAG_LEAF + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_ROCKS monbg 3 monbgprio_28 1 playsewithpan SE_W239, 63 @@ -9889,9 +9921,9 @@ Move_TWISTER:: @ 81D4D0E end Move_MAGICAL_LEAF:: @ 81D4E6D - loadspritegfx 10063 - loadspritegfx 10160 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_LEAF + loadspritegfx ANIM_TAG_RAZOR_LEAF + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 delay 1 @@ -9933,8 +9965,8 @@ Move_MAGICAL_LEAF:: @ 81D4E6D end Move_ICE_BALL:: @ 81D4F8E - loadspritegfx 10043 - loadspritegfx 10141 + loadspritegfx ANIM_TAG_ICE_CHUNK + loadspritegfx ANIM_TAG_ICE_CRYSTALS createvisualtask AnimTask_GetRolloutCounter, 5, 0 jumpargeq 0, 4, gUnknown_81D5005 @@ -10034,7 +10066,7 @@ gUnknown_81D5151:: @ 81D5151 return Move_WEATHER_BALL:: @ 81D515D - loadspritegfx 10283 + loadspritegfx ANIM_TAG_WEATHER_BALL createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, 0 delay 8 playsewithpan SE_W207, 192 @@ -10042,7 +10074,7 @@ Move_WEATHER_BALL:: @ 81D515D waitforvisualfinish delay 15 playsewithpan SE_W197, 0 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, 32767, 10, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 waitforvisualfinish createvisualtask AnimTask_GetWeather, 2, delay 1 @@ -10053,7 +10085,7 @@ Move_WEATHER_BALL:: @ 81D515D jumpargeq 7, 4, gUnknown_81D536D gUnknown_81D51C8:: @ 81D51C8 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT createsprite gSpriteTemplate_83BF44C, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 waitforvisualfinish playsewithpan SE_W025B, 63 @@ -10063,7 +10095,7 @@ gUnknown_81D51C8:: @ 81D51C8 end gUnknown_81D5205:: @ 81D5205 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER createsprite gUnknown_83E5E14, ANIM_TARGET, 2, -30, -100, 25, 1, 40, 10 playsewithpan SE_W172, 63 delay 10 @@ -10079,7 +10111,7 @@ gUnknown_81D5205:: @ 81D5205 end gUnknown_81D5269:: @ 81D5269 - loadspritegfx 10155 + loadspritegfx ANIM_TAG_SMALL_BUBBLES createsprite gUnknown_83E5BA0, ANIM_TARGET, 2, -30, -100, 25, 1, 50, 10 playsewithpan SE_W152, 63 delay 8 @@ -10095,7 +10127,7 @@ gUnknown_81D5269:: @ 81D5269 end gUnknown_81D52CD:: @ 81D52CD - loadspritegfx 10058 + loadspritegfx ANIM_TAG_ROCKS createsprite gUnknown_83E7590, ANIM_TARGET, 2, -30, -100, 25, 1, 30, 0 playsewithpan SE_W088, 63 delay 5 @@ -10115,8 +10147,8 @@ gUnknown_81D52CD:: @ 81D52CD end gUnknown_81D536D:: @ 81D536D - loadspritegfx 10263 - loadspritegfx 10141 + loadspritegfx ANIM_TAG_HAIL + loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gUnknown_83E65BC, ANIM_TARGET, 2, -30, -100, 25, 25, -40, 20 playsewithpan SE_W258, 63 delay 10 @@ -10133,7 +10165,7 @@ gUnknown_81D536D:: @ 81D536D end Move_COUNT:: @ 81D53D9 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 playsewithpan SE_W003, 63 @@ -10433,16 +10465,16 @@ gUnknown_81D5A41:: @ 81D5A41 Status_Poison:: @ 81D5A44 loopsewithpan SE_W092, 63, 13, 6 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 18, 2 - createvisualtask sub_80B9BDC, 2, 2, 2, 2, 0, 12, 31774 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 12, 31774 end Status_Confusion:: @ 81D5A6F - loadspritegfx 10073 + loadspritegfx ANIM_TAG_DUCK call gUnknown_81D595F end Status_Burn:: @ 81D5A78 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W172, 63 call gUnknown_81D5A90 call gUnknown_81D5A90 @@ -10456,7 +10488,7 @@ gUnknown_81D5A90:: @ 81D5A90 return Status_Infatuation:: @ 81D5AA8 - loadspritegfx 10210 + loadspritegfx ANIM_TAG_MAGENTA_HEART playsewithpan SE_W204, 192 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 delay 15 @@ -10468,7 +10500,7 @@ Status_Infatuation:: @ 81D5AA8 end Status_Sleep:: @ 81D5ADD - loadspritegfx 10228 + loadspritegfx ANIM_TAG_LETTER_Z playsewithpan SE_W173, 192 createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 30 @@ -10476,14 +10508,14 @@ Status_Sleep:: @ 81D5ADD end Status_Paralysis:: @ 81D5B09 - loadspritegfx 10011 + loadspritegfx ANIM_TAG_SPARK_2 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 10, 1 call gUnknown_81D58D4 end Status_Freeze:: @ 81D5B23 playsewithpan SE_W196, 0 - loadspritegfx 10010 + loadspritegfx ANIM_TAG_ICE_CUBE monbg 3 monbgprio_28 1 waitplaysewithpan SE_W258, 63, 17 @@ -10493,7 +10525,7 @@ Status_Freeze:: @ 81D5B23 end Status_Curse:: @ 81D5B3E - loadspritegfx 10200 + loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg 3 playsewithpan SE_W171, 63 createsprite gUnknown_83E7698, ANIM_TARGET, 2, @@ -10503,7 +10535,7 @@ Status_Curse:: @ 81D5B3E end Status_Nightmare:: @ 81D5B63 - loadspritegfx 10221 + loadspritegfx ANIM_TAG_DEVIL monbg 3 playsewithpan SE_W171, 63 createsprite gUnknown_83E76B0, ANIM_TARGET, 2, @@ -10538,13 +10570,13 @@ General_StatsChange:: @ 81D5BBE General_SubstituteFade:: @ 81D5BC7 monbg 0 createvisualtask sub_80F15C8, 5, - createvisualtask sub_80BA7F8, 10, 2, 0, 0, 16, 32767 + createvisualtask AnimTask_BlendSelected, 10, 2, 0, 0, 16, RGB_WHITE waitforvisualfinish delay 1 clearmonbg 0 delay 2 blendoff - createvisualtask sub_80BA7F8, 10, 2, 0, 0, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 2, 0, 0, 0, RGB_WHITE createvisualtask sub_80F1420, 2, 1 end @@ -10566,7 +10598,7 @@ General_PokeblockThrow:: @ 81D5C0C end General_ItemKnockoff:: @ 81D5C54 - loadspritegfx 10224 + loadspritegfx ANIM_TAG_ITEM_BAG createsprite gKnockOffItemSpriteTemplate, ANIM_TARGET, 2, end @@ -10579,7 +10611,7 @@ General_TurnTrap:: @ 81D5C5F goto gUnknown_81D5C8B gUnknown_81D5C8B:: @ 81D5C8B - loadspritegfx 10186 + loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, 63, 6, 2 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 1 delay 7 @@ -10593,7 +10625,7 @@ gUnknown_81D5C8B:: @ 81D5C8B end gUnknown_81D5CD3:: @ 81D5CD3 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W221B, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 call gUnknown_81C885F @@ -10603,7 +10635,7 @@ gUnknown_81D5CD3:: @ 81D5CD3 end gUnknown_81D5CF8:: @ 81D5CF8 - loadspritegfx 10149 + loadspritegfx ANIM_TAG_WATER_ORB monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -10621,8 +10653,8 @@ gUnknown_81D5CF8:: @ 81D5CF8 end gUnknown_81D5D4C:: @ 81D5D4C - loadspritegfx 10145 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_CLAMP + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 playsewithpan SE_W011, 63 @@ -10638,7 +10670,7 @@ gUnknown_81D5D4C:: @ 81D5D4C end gUnknown_81D5DA9:: @ 81D5DA9 - loadspritegfx 10074 + loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, 563 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 playsewithpan SE_W328, 63 @@ -10651,8 +10683,8 @@ gUnknown_81D5DA9:: @ 81D5DA9 end General_ItemEffect:: @ 81D5DF2 - loadspritegfx 10203 - loadspritegfx 10049 + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_SPARKLE_2 delay 0 playsewithpan SE_W036, 192 createvisualtask sub_8099A78, 2, 16, 128, 0, 2 @@ -10673,7 +10705,7 @@ General_ItemEffect:: @ 81D5DF2 end General_SmokeballEscape:: @ 81D5E66 - loadspritegfx 10242 + loadspritegfx ANIM_TAG_PINK_CLOUD monbg 0 setalpha 12, 4 delay 0 @@ -10722,15 +10754,15 @@ General_HangedOn:: @ 81D5F42 end General_Rain:: @ 81D5F8F - loadspritegfx 10115 + loadspritegfx ANIM_TAG_RAIN_DROPS playsewithpan SE_W240, 192 - createvisualtask sub_80BA7F8, 10, 1921, 2, 0, 4, 0 + createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask sub_80AABC0, 2, 0, 3, 60 createvisualtask sub_80AABC0, 2, 0, 3, 60 delay 50 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 1921, 2, 4, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 2, 4, 0, RGB_BLACK waitforvisualfinish end @@ -10749,7 +10781,7 @@ General_LeechSeedDrain:: @ 81D5FE7 goto Move_ABSORB General_MonHit:: @ 81D5FF5 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 playsewithpan SE_W003, 63 @@ -10761,7 +10793,7 @@ General_MonHit:: @ 81D5FF5 end General_ItemSteal:: @ 81D6026 - loadspritegfx 10224 + loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_80BC0FC, 2, createvisualtask AnimTask_TargetToEffectBattler, 2, delay 1 @@ -10769,7 +10801,7 @@ General_ItemSteal:: @ 81D6026 end General_SnatchMove:: @ 81D604B - loadspritegfx 10224 + loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_80BC060, 2, call gUnknown_81D6476 delay 1 @@ -10816,8 +10848,8 @@ General_FutureSightHit:: @ 81D60A9 General_DoomDesireHit:: @ 81D6108 createvisualtask sub_80BC0DC, 2, - loadspritegfx 10198 - createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, 32767 + loadspritegfx ANIM_TAG_EXPLOSION + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_WHITE waitforvisualfinish delay 10 createvisualtask AnimTask_DoomDesireLightBeam, 5, @@ -10844,16 +10876,16 @@ General_DoomDesireHit:: @ 81D6108 playsewithpan SE_W120, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, 32767 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE waitforvisualfinish end General_FocusPunchSetUp:: @ 81D61CD - loadspritegfx 10184 + loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_W082, 192 call gUnknown_81CB267 delay 8 - createvisualtask sub_80B9BDC, 2, 2, 2, 2, 0, 11, 31 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 11, 31 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 32, 1 call gUnknown_81CB267 delay 8 @@ -10862,8 +10894,8 @@ General_FocusPunchSetUp:: @ 81D61CD end General_IngrainHeal:: @ 81D620D - loadspritegfx 10147 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR monbg 3 setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, 13293 @@ -10881,8 +10913,8 @@ General_IngrainHeal:: @ 81D620D end General_WishHeal:: @ 81D6250 - loadspritegfx 10031 - loadspritegfx 10049 + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, 0 waitforvisualfinish playsewithpan SE_W025, 192 @@ -10896,7 +10928,7 @@ General_WishHeal:: @ 81D6250 gUnknown_81D628A:: @ 81D628A createvisualtask sub_80F1C8C, 2, 1 waitforvisualfinish - loadspritegfx 10273 + loadspritegfx ANIM_TAG_SWEAT_BEAD createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 10, 26336 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 10, 1 delay 20 @@ -10922,7 +10954,7 @@ gUnknown_81D6301:: @ 81D6301 waitforvisualfinish clearmonbg_23 0 delay 1 - loadspritegfx 10273 + loadspritegfx ANIM_TAG_SWEAT_BEAD createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, -1, 0, 6, 27349 createsprite gUnknown_83E6D94, ANIM_TARGET, 5, 0, 1 createsprite gUnknown_83E6D94, ANIM_TARGET, 5, 1, 1 @@ -10948,8 +10980,8 @@ gUnknown_81D637B:: @ 81D637B gUnknown_81D6394:: @ 81D6394 createvisualtask sub_80F1C8C, 2, 0 waitforvisualfinish - loadspritegfx 10058 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ROCKS + loadspritegfx ANIM_TAG_IMPACT delay 0 waitplaysewithpan SE_W026, 192, 22 createsprite gUnknown_840C210, ANIM_TARGET, 3, -17, 14, 8, 0 @@ -10982,7 +11014,7 @@ gUnknown_81D63FD:: @ 81D63FD end gUnknown_81D6425:: @ 81D6425 - loadspritegfx 10087 + loadspritegfx ANIM_TAG_ANGER createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -20 playsewithpan SE_W207B, 63 waitforvisualfinish @@ -11061,7 +11093,7 @@ gUnknown_81D6524:: @ 81D6524 end gUnknown_81D652D:: @ 81D652D - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT delay 25 monbg 3 setalpha 12, 8 diff --git a/data/decoration_tiles.inc b/data/decoration_tiles.inc deleted file mode 100644 index 2a53f2d8e..000000000 --- a/data/decoration_tiles.inc +++ /dev/null @@ -1,359 +0,0 @@ -gUnknown_8454004:: @ 8454004 - .2byte 0x087 - -gUnknown_8454006:: @ 8454006 - .2byte 0x08F - -gUnknown_8454008:: @ 8454008 - .2byte 0x090, 0x091, 0x092, 0x098, 0x099, 0x09A - -gUnknown_8454014:: @ 8454014 - .2byte 0x093, 0x094, 0x095, 0x09B, 0x09C, 0x09D - -gUnknown_8454020:: @ 8454020 - .2byte 0x096, 0x097, 0x0A3, 0x09E, 0x09F, 0x0AB - -gUnknown_845402C:: @ 845402C - .2byte 0x0BD, 0x0BE, 0x0BF, 0x0C5, 0x0C6, 0x0C7, 0x0CD, 0x0CE, 0x0CF - -gUnknown_845403E:: @ 845403E - .2byte 0x0A0, 0x0A1, 0x0A2, 0x0A8, 0x0A9, 0x0AA, 0x0B0, 0x0B1, 0x0B2 - -gUnknown_8454050:: @ 8454050 - .2byte 0x0A4, 0x0A5, 0x0A6, 0x0AC, 0x0AD, 0x0AE, 0x0B4, 0x0B5, 0x0B6 - -gUnknown_8454062:: @ 8454062 - .2byte 0x0A7, 0x0BB, 0x0BC, 0x0AF, 0x0C3, 0x0C4, 0x0B7, 0x0CB, 0x0CC - -gUnknown_8454074:: @ 8454074 - .2byte 0x0B8 - -gUnknown_8454076:: @ 8454076 - .2byte 0x0B9 - -gUnknown_8454078:: @ 8454078 - .2byte 0x0BA - -gUnknown_845407A:: @ 845407A - .2byte 0x0C0 - -gUnknown_845407C:: @ 845407C - .2byte 0x0C1 - -gUnknown_845407E:: @ 845407E - .2byte 0x0C2 - -gUnknown_8454080:: @ 8454080 - .2byte 0x0C8 - -gUnknown_8454082:: @ 8454082 - .2byte 0x0C9 - -gUnknown_8454084:: @ 8454084 - .2byte 0x0CA - -gUnknown_8454086:: @ 8454086 - .2byte 0x0D0, 0x0D8 - -gUnknown_845408A:: @ 845408A - .2byte 0x0D2, 0x0DA - -gUnknown_845408E:: @ 845408E - .2byte 0x0D4, 0x0DC - -gUnknown_8454092:: @ 8454092 - .2byte 0x0E0, 0x0E2, 0x0E8, 0x0E9 - -gUnknown_845409A:: @ 845409A - .2byte 0x0E4, 0x0E6, 0x0EC, 0x0ED - -gUnknown_84540A2:: @ 84540A2 - .2byte 0x0F0, 0x0F2, 0x0F8, 0x0F9 - -gUnknown_84540AA:: @ 84540AA - .2byte 0x025, 0x02D - -gUnknown_84540AE:: @ 84540AE - .2byte 0x026, 0x02E - -gUnknown_84540B2:: @ 84540B2 - .2byte 0x027, 0x02F - -gUnknown_84540B6:: @ 84540B6 - .2byte 0x138 - -gUnknown_84540B8:: @ 84540B8 - .2byte 0x13C - -gUnknown_84540BA:: @ 84540BA - .2byte 0x140 - -gUnknown_84540BC:: @ 84540BC - .2byte 0x030, 0x031, 0x032, 0x038, 0x039, 0x03A, 0x040, 0x041, 0x03B - -gUnknown_84540CE:: @ 84540CE - .2byte 0x048, 0x049, 0x068, 0x050, 0x051, 0x070, 0x058, 0x059, 0x069 - -gUnknown_84540E0:: @ 84540E0 - .2byte 0x034, 0x03C - -gUnknown_84540E4:: @ 84540E4 - .2byte 0x035, 0x036, 0x03D, 0x03E, 0x063, 0x064, 0x06F, 0x077 - -gUnknown_84540F4:: @ 84540F4 - .2byte 0x033 - -gUnknown_84540F6:: @ 84540F6 - .2byte 0x02C - -gUnknown_84540F8:: @ 84540F8 - .2byte 0x080, 0x081, 0x088, 0x089 - -gUnknown_8454100:: @ 8454100 - .2byte 0x06A, 0x06B, 0x06C, 0x06D, 0x072, 0x073, 0x074, 0x075 - -gUnknown_8454110:: @ 8454110 - .2byte 0x028 - -gUnknown_8454112:: @ 8454112 - .2byte 0x037, 0x03F - -gUnknown_8454116:: @ 8454116 - .2byte 0x085, 0x08D - -gUnknown_845411A:: @ 845411A - .2byte 0x0D6, 0x0DE - -gUnknown_845411E:: @ 845411E - .2byte 0x12E, 0x136 - -gUnknown_8454122:: @ 8454122 - .2byte 0x082, 0x08A - -gUnknown_8454126:: @ 8454126 - .2byte 0x0F4 - -gUnknown_8454128:: @ 8454128 - .2byte 0x0F5 - -gUnknown_845412A:: @ 845412A - .2byte 0x0F6 - -gUnknown_845412C:: @ 845412C - .2byte 0x060 - -gUnknown_845412E:: @ 845412E - .2byte 0x061 - -gUnknown_8454130:: @ 8454130 - .2byte 0x062 - -gUnknown_8454132:: @ 8454132 - .2byte 0x078 - -gUnknown_8454134:: @ 8454134 - .2byte 0x079 - -gUnknown_8454136:: @ 8454136 - .2byte 0x07A - -gUnknown_8454138:: @ 8454138 - .2byte 0x07B - -gUnknown_845413A:: @ 845413A - .2byte 0x07C - -gUnknown_845413C:: @ 845413C - .2byte 0x07D - -gUnknown_845413E:: @ 845413E - .2byte 0x07E - -gUnknown_8454140:: @ 8454140 - .2byte 0x0B3 - -gUnknown_8454142:: @ 8454142 - .2byte 0x042, 0x043, 0x044, 0x04A, 0x04B, 0x04C, 0x052, 0x053, 0x054 - -gUnknown_8454154:: @ 8454154 - .2byte 0x045, 0x046, 0x047, 0x04D, 0x04E, 0x04F, 0x055, 0x056, 0x057 - -gUnknown_8454166:: @ 8454166 - .2byte 0x05A, 0x05B, 0x05C, 0x05D, 0x05E, 0x05F, 0x065, 0x066, 0x067 - -gUnknown_8454178:: @ 8454178 - .2byte 0x100, 0x101, 0x102, 0x108, 0x109, 0x10A, 0x110, 0x111, 0x112 - -gUnknown_845418A:: @ 845418A - .2byte 0x103, 0x104, 0x105, 0x10B, 0x10C, 0x10D, 0x113, 0x114, 0x115 - -gUnknown_845419C:: @ 845419C - .2byte 0x106, 0x107, 0x118, 0x10E, 0x10F, 0x120, 0x116, 0x117, 0x128 - -gUnknown_84541AE:: @ 84541AE - .2byte 0x119, 0x11A, 0x11B, 0x121, 0x122, 0x123, 0x129, 0x12A, 0x12B - -gUnknown_84541C0:: @ 84541C0 - .2byte 0x130 - -gUnknown_84541C2:: @ 84541C2 - .2byte 0x131 - -gUnknown_84541C4:: @ 84541C4 - .2byte 0x132 - -gUnknown_84541C6:: @ 84541C6 - .2byte 0x133 - -gUnknown_84541C8:: @ 84541C8 - .2byte 0x134 - -gUnknown_84541CA:: @ 84541CA - .2byte 0x11C, 0x11D - -gUnknown_84541CE:: @ 84541CE - .2byte 0x11E, 0x11F - -gUnknown_84541D2:: @ 84541D2 - .2byte 0x124, 0x125 - -gUnknown_84541D6:: @ 84541D6 - .2byte 0x126, 0x127 - -gUnknown_84541DA:: @ 84541DA - .2byte 0x12C, 0x12D - -gUnknown_84541DE:: @ 84541DE - .2byte 0x05C - -gUnknown_84541E0:: @ 84541E0 - .2byte 0x05C - -gUnknown_84541E2:: @ 84541E2 - .2byte 0x05C - -gUnknown_84541E4:: @ 84541E4 - .2byte 0x05C - -gUnknown_84541E6:: @ 84541E6 - .2byte 0x05C - -gUnknown_84541E8:: @ 84541E8 - .2byte 0x05C - -gUnknown_84541EA:: @ 84541EA - .2byte 0x05C - -gUnknown_84541EC:: @ 84541EC - .2byte 0x05C - -gUnknown_84541EE:: @ 84541EE - .2byte 0x05C - -gUnknown_84541F0:: @ 84541F0 - .2byte 0x05C - -gUnknown_84541F2:: @ 84541F2 - .2byte 0x05C - -gUnknown_84541F4:: @ 84541F4 - .2byte 0x05C - -gUnknown_84541F6:: @ 84541F6 - .2byte 0x05C - -gUnknown_84541F8:: @ 84541F8 - .2byte 0x05C - -gUnknown_84541FA:: @ 84541FA - .2byte 0x05C - -gUnknown_84541FC:: @ 84541FC - .2byte 0x05C - -gUnknown_84541FE:: @ 84541FE - .2byte 0x05C - -gUnknown_8454200:: @ 8454200 - .2byte 0x05C - -gUnknown_8454202:: @ 8454202 - .2byte 0x05C - -gUnknown_8454204:: @ 8454204 - .2byte 0x05C - -gUnknown_8454206:: @ 8454206 - .2byte 0x05C - -gUnknown_8454208:: @ 8454208 - .2byte 0x05C - -gUnknown_845420A:: @ 845420A - .2byte 0x05C - -gUnknown_845420C:: @ 845420C - .2byte 0x05C - -gUnknown_845420E:: @ 845420E - .2byte 0x05C - -gUnknown_8454210:: @ 8454210 - .2byte 0x05C - -gUnknown_8454212:: @ 8454212 - .2byte 0x05C - -gUnknown_8454214:: @ 8454214 - .2byte 0x05C - -gUnknown_8454216:: @ 8454216 - .2byte 0x05C - -gUnknown_8454218:: @ 8454218 - .2byte 0x05C - -gUnknown_845421A:: @ 845421A - .2byte 0x05C - -gUnknown_845421C:: @ 845421C - .2byte 0x05C - -gUnknown_845421E:: @ 845421E - .2byte 0x05C - -gUnknown_8454220:: @ 8454220 - .2byte 0x05C - -gUnknown_8454222:: @ 8454222 - .2byte 0x05C - -gUnknown_8454224:: @ 8454224 - .2byte 0x05C - -gUnknown_8454226:: @ 8454226 - .2byte 0x05C - -gUnknown_8454228:: @ 8454228 - .2byte 0x05C - -gUnknown_845422A:: @ 845422A - .2byte 0x05C - -gUnknown_845422C:: @ 845422C - .2byte 0x05C - -gUnknown_845422E:: @ 845422E - .2byte 0x05C - -gUnknown_8454230:: @ 8454230 - .2byte 0x05C - -gUnknown_8454232:: @ 8454232 - .2byte 0x05C - -gUnknown_8454234:: @ 8454234 - .2byte 0x05C - -gUnknown_8454236:: @ 8454236 - .2byte 0x05C diff --git a/data/decorations.s b/data/decorations.s deleted file mode 100644 index 0d6e85efe..000000000 --- a/data/decorations.s +++ /dev/null @@ -1,857 +0,0 @@ -#include "constants/decorations.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2 - - .include "data/decoration_tiles.inc" - .include "data/text/decoration_descriptions.inc" - - .align 2 -gDecorations:: @ 84556F8 - .byte DECOR_NONE - .string "SMALL DESK$", 16 - .byte 0x00, 0x00, 0x00 - .2byte 0, 0 - .4byte gUnknown_8454238 - .4byte gUnknown_8454004 - - .byte DECOR_SMALL_DESK - .string "SMALL DESK$", 16 - .byte 0x00, 0x00, 0x00 - .2byte 3000, 0 - .4byte gUnknown_8454238 - .4byte gUnknown_8454004 - - .byte DECOR_POKEMON_DESK - .string "POKéMON DESK$", 16 - .byte 0x00, 0x00, 0x00 - .2byte 3000, 0 - .4byte gUnknown_8454254 - .4byte gUnknown_8454006 - - .byte DECOR_HEAVY_DESK - .string "HEAVY DESK$", 16 - .byte 0x00, 0x09, 0x00 - .2byte 6000, 0 - .4byte gUnknown_8454284 - .4byte gUnknown_8454008 - - .byte DECOR_RAGGED_DESK - .string "RAGGED DESK$", 16 - .byte 0x00, 0x09, 0x00 - .2byte 6000, 0 - .4byte gUnknown_84542BC - .4byte gUnknown_8454014 - - .byte DECOR_COMFORT_DESK - .string "COMFORT DESK$", 16 - .byte 0x00, 0x09, 0x00 - .2byte 6000, 0 - .4byte gUnknown_84542F3 - .4byte gUnknown_8454020 - - .byte DECOR_PRETTY_DESK - .string "PRETTY DESK$", 16 - .byte 0x00, 0x08, 0x00 - .2byte 9000, 0 - .4byte gUnknown_845432C - .4byte gUnknown_845402C - - .byte DECOR_BRICK_DESK - .string "BRICK DESK$", 16 - .byte 0x00, 0x08, 0x00 - .2byte 9000, 0 - .4byte gUnknown_8454362 - .4byte gUnknown_845403E - - .byte DECOR_CAMP_DESK - .string "CAMP DESK$", 16 - .byte 0x00, 0x08, 0x00 - .2byte 9000, 0 - .4byte gUnknown_8454398 - .4byte gUnknown_8454050 - - .byte DECOR_HARD_DESK - .string "HARD DESK$", 16 - .byte 0x00, 0x08, 0x00 - .2byte 9000, 0 - .4byte gUnknown_84543D1 - .4byte gUnknown_8454062 - - .byte DECOR_SMALL_CHAIR - .string "SMALL CHAIR$", 16 - .byte 0x01, 0x00, 0x01 - .2byte 2000, 0 - .4byte gUnknown_8454404 - .4byte gUnknown_8454074 - - .byte DECOR_POKEMON_CHAIR - .string "POKéMON CHAIR$", 16 - .byte 0x01, 0x00, 0x01 - .2byte 2000, 0 - .4byte gUnknown_8454420 - .4byte gUnknown_8454076 - - .byte DECOR_HEAVY_CHAIR - .string "HEAVY CHAIR$", 16 - .byte 0x01, 0x00, 0x01 - .2byte 2000, 0 - .4byte gUnknown_8454451 - .4byte gUnknown_8454078 - - .byte DECOR_PRETTY_CHAIR - .string "PRETTY CHAIR$", 16 - .byte 0x01, 0x00, 0x01 - .2byte 2000, 0 - .4byte gUnknown_845446E - .4byte gUnknown_845407A - - .byte DECOR_COMFORT_CHAIR - .string "COMFORT CHAIR$", 16 - .byte 0x01, 0x00, 0x01 - .2byte 2000, 0 - .4byte gUnknown_845448B - .4byte gUnknown_845407C - - .byte DECOR_RAGGED_CHAIR - .string "RAGGED CHAIR$", 16 - .byte 0x01, 0x00, 0x01 - .2byte 2000, 0 - .4byte gUnknown_84544A9 - .4byte gUnknown_845407E - - .byte DECOR_BRICK_CHAIR - .string "BRICK CHAIR$", 16 - .byte 0x01, 0x00, 0x01 - .2byte 2000, 0 - .4byte gUnknown_84544C5 - .4byte gUnknown_8454080 - - .byte DECOR_CAMP_CHAIR - .string "CAMP CHAIR$", 16 - .byte 0x01, 0x00, 0x01 - .2byte 2000, 0 - .4byte gUnknown_84544E2 - .4byte gUnknown_8454082 - - .byte DECOR_HARD_CHAIR - .string "HARD CHAIR$", 16 - .byte 0x01, 0x00, 0x01 - .2byte 2000, 0 - .4byte gUnknown_84544FE - .4byte gUnknown_8454084 - - .byte DECOR_RED_PLANT - .string "RED PLANT$", 16 - .byte 0x02, 0x05, 0x02 - .2byte 3000, 0 - .4byte gUnknown_845451A - .4byte gUnknown_8454086 - - .byte DECOR_TROPICAL_PLANT - .string "TROPICAL PLANT$", 16 - .byte 0x02, 0x05, 0x02 - .2byte 3000, 0 - .4byte gUnknown_8454534 - .4byte gUnknown_845408A - - .byte DECOR_PRETTY_FLOWERS - .string "PRETTY FLOWERS$", 16 - .byte 0x02, 0x05, 0x02 - .2byte 3000, 0 - .4byte gUnknown_8454559 - .4byte gUnknown_845408E - - .byte DECOR_COLORFUL_PLANT - .string "COLORFUL PLANT$", 16 - .byte 0x02, 0x04, 0x02 - .2byte 5000, 0 - .4byte gUnknown_8454570 - .4byte gUnknown_8454092 - - .byte DECOR_BIG_PLANT - .string "BIG PLANT$", 16 - .byte 0x02, 0x04, 0x02 - .2byte 5000, 0 - .4byte gUnknown_8454598 - .4byte gUnknown_845409A - - .byte DECOR_GORGEOUS_PLANT - .string "GORGEOUS PLANT$", 16 - .byte 0x02, 0x04, 0x02 - .2byte 5000, 0 - .4byte gUnknown_84545C6 - .4byte gUnknown_84540A2 - - .byte DECOR_RED_BRICK - .string "RED BRICK$", 16 - .byte 0x00, 0x05, 0x03 - .2byte 500, 0 - .4byte gUnknown_84545EE - .4byte gUnknown_84540AA - - .byte DECOR_YELLOW_BRICK - .string "YELLOW BRICK$", 16 - .byte 0x00, 0x05, 0x03 - .2byte 500, 0 - .4byte gUnknown_8454625 - .4byte gUnknown_84540AE - - .byte DECOR_BLUE_BRICK - .string "BLUE BRICK$", 16 - .byte 0x00, 0x05, 0x03 - .2byte 500, 0 - .4byte gUnknown_845465A - .4byte gUnknown_84540B2 - - .byte DECOR_RED_BALLOON - .string "RED BALLOON$", 16 - .byte 0x01, 0x00, 0x03 - .2byte 500, 0 - .4byte gUnknown_845468D - .4byte gUnknown_84540B6 - - .byte DECOR_BLUE_BALLOON - .string "BLUE BALLOON$", 16 - .byte 0x01, 0x00, 0x03 - .2byte 500, 0 - .4byte gUnknown_84546C4 - .4byte gUnknown_84540B8 - - .byte DECOR_YELLOW_BALLOON - .string "YELLOW BALLOON$", 16 - .byte 0x01, 0x00, 0x03 - .2byte 500, 0 - .4byte gUnknown_84546FC - .4byte gUnknown_84540BA - - .byte DECOR_RED_TENT - .string "RED TENT$", 16 - .byte 0x01, 0x08, 0x03 - .2byte 10000, 0 - .4byte gUnknown_8454734 - .4byte gUnknown_84540BC - - .byte DECOR_BLUE_TENT - .string "BLUE TENT$", 16 - .byte 0x01, 0x08, 0x03 - .2byte 10000, 0 - .4byte gUnknown_845475E - .4byte gUnknown_84540CE - - .byte DECOR_SOLID_BOARD - .string "SOLID BOARD$", 16 - .byte 0x01, 0x05, 0x03 - .2byte 3000, 0 - .4byte gUnknown_8454789 - .4byte gUnknown_84540E0 - - .byte DECOR_SLIDE - .string "SLIDE$", 16 - .byte 0x01, 0x07, 0x03 - .2byte 8000, 0 - .4byte gUnknown_84547B7 - .4byte gUnknown_84540E4 - - .byte DECOR_FENCE_LENGTH - .string "FENCE LENGTH$", 16 - .byte 0x00, 0x00, 0x03 - .2byte 500, 0 - .4byte gUnknown_84547DC - .4byte gUnknown_84540F4 - - .byte DECOR_FENCE_WIDTH - .string "FENCE WIDTH$", 16 - .byte 0x00, 0x00, 0x03 - .2byte 500, 0 - .4byte gUnknown_84547FF - .4byte gUnknown_84540F6 - - .byte DECOR_TIRE - .string "TIRE$", 16 - .byte 0x00, 0x04, 0x03 - .2byte 800, 0 - .4byte gUnknown_8454822 - .4byte gUnknown_84540F8 - - .byte DECOR_STAND - .string "STAND$", 16 - .byte 0x01, 0x03, 0x03 - .2byte 7000, 0 - .4byte gUnknown_8454857 - .4byte gUnknown_8454100 - - .byte DECOR_MUD_BALL - .string "MUD BALL$", 16 - .byte 0x01, 0x00, 0x03 - .2byte 200, 0 - .4byte gUnknown_8454874 - .4byte gUnknown_8454110 - - .byte DECOR_BREAKABLE_DOOR - .string "BREAKABLE DOOR$", 16 - .byte 0x01, 0x05, 0x03 - .2byte 3000, 0 - .4byte gUnknown_84548A1 - .4byte gUnknown_8454112 - - .byte DECOR_SAND_ORNAMENT - .string "SAND ORNAMENT$", 16 - .byte 0x02, 0x05, 0x03 - .2byte 3000, 0 - .4byte gUnknown_84548D2 - .4byte gUnknown_8454116 - - .byte DECOR_SILVER_SHIELD - .string "SILVER SHIELD$", 16 - .byte 0x02, 0x05, 0x03 - .2byte 0, 0 - .4byte gUnknown_8454901 - .4byte gUnknown_845411A - - .byte DECOR_GOLD_SHIELD - .string "GOLD SHIELD$", 16 - .byte 0x02, 0x05, 0x03 - .2byte 0, 0 - .4byte gUnknown_8454933 - .4byte gUnknown_845411E - - .byte DECOR_GLASS_ORNAMENT - .string "GLASS ORNAMENT$", 16 - .byte 0x02, 0x05, 0x03 - .2byte 0, 0 - .4byte gUnknown_8454966 - .4byte gUnknown_8454122 - - .byte DECOR_TV - .string "TV$", 16 - .byte 0x00, 0x00, 0x03 - .2byte 3000, 0 - .4byte gUnknown_845499F - .4byte gUnknown_8454126 - - .byte DECOR_ROUND_TV - .string "ROUND TV$", 16 - .byte 0x00, 0x00, 0x03 - .2byte 4000, 0 - .4byte gUnknown_84549BE - .4byte gUnknown_8454128 - - .byte DECOR_CUTE_TV - .string "CUTE TV$", 16 - .byte 0x00, 0x00, 0x03 - .2byte 4000, 0 - .4byte gUnknown_84549E9 - .4byte gUnknown_845412A - - .byte DECOR_GLITTER_MAT - .string "GLITTER MAT$", 16 - .byte 0x01, 0x00, 0x04 - .2byte 2000, 0 - .4byte gUnknown_8454A14 - .4byte gUnknown_845412C - - .byte DECOR_JUMP_MAT - .string "JUMP MAT$", 16 - .byte 0x01, 0x00, 0x04 - .2byte 2000, 0 - .4byte gUnknown_8454A3C - .4byte gUnknown_845412E - - .byte DECOR_SPIN_MAT - .string "SPIN MAT$", 16 - .byte 0x01, 0x00, 0x04 - .2byte 2000, 0 - .4byte gUnknown_8454A6A - .4byte gUnknown_8454130 - - .byte DECOR_C_LOW_NOTE_MAT - .string "C Low NOTE MAT$", 16 - .byte 0x01, 0x00, 0x04 - .2byte 500, 0 - .4byte gUnknown_8454A99 - .4byte gUnknown_8454132 - - .byte DECOR_D_NOTE_MAT - .string "D NOTE MAT$", 16 - .byte 0x01, 0x00, 0x04 - .2byte 500, 0 - .4byte gUnknown_8454AC8 - .4byte gUnknown_8454134 - - .byte DECOR_E_NOTE_MAT - .string "E NOTE MAT$", 16 - .byte 0x01, 0x00, 0x04 - .2byte 500, 0 - .4byte gUnknown_8454AF3 - .4byte gUnknown_8454136 - - .byte DECOR_F_NOTE_MAT - .string "F NOTE MAT$", 16 - .byte 0x01, 0x00, 0x04 - .2byte 500, 0 - .4byte gUnknown_8454B1F - .4byte gUnknown_8454138 - - .byte DECOR_G_NOTE_MAT - .string "G NOTE MAT$", 16 - .byte 0x01, 0x00, 0x04 - .2byte 500, 0 - .4byte gUnknown_8454B4B - .4byte gUnknown_845413A - - .byte DECOR_A_NOTE_MAT - .string "A NOTE MAT$", 16 - .byte 0x01, 0x00, 0x04 - .2byte 500, 0 - .4byte gUnknown_8454B76 - .4byte gUnknown_845413C - - .byte DECOR_B_NOTE_MAT - .string "B NOTE MAT$", 16 - .byte 0x01, 0x00, 0x04 - .2byte 500, 0 - .4byte gUnknown_8454BA2 - .4byte gUnknown_845413E - - .byte DECOR_C_HIGH_NOTE_MAT - .string "C High NOTE MAT$", 16 - .byte 0x01, 0x00, 0x04 - .2byte 500, 0 - .4byte gUnknown_8454BCD - .4byte gUnknown_8454140 - - .byte DECOR_SURF_MAT - .string "SURF MAT$", 16 - .byte 0x01, 0x08, 0x04 - .2byte 4000, 0 - .4byte gUnknown_8454BFD - .4byte gUnknown_8454142 - - .byte DECOR_THUNDER_MAT - .string "THUNDER MAT$", 16 - .byte 0x01, 0x08, 0x04 - .2byte 4000, 0 - .4byte gUnknown_8454C31 - .4byte gUnknown_8454154 - - .byte DECOR_FIRE_BLAST_MAT - .string "FIRE BLAST MAT$", 16 - .byte 0x01, 0x08, 0x04 - .2byte 4000, 0 - .4byte gUnknown_8454C68 - .4byte gUnknown_8454166 - - .byte DECOR_POWDER_SNOW_MAT - .string "POWDER SNOW MAT$", 16 - .byte 0x01, 0x08, 0x04 - .2byte 4000, 0 - .4byte gUnknown_8454CA2 - .4byte gUnknown_8454178 - - .byte DECOR_ATTRACT_MAT - .string "ATTRACT MAT$", 16 - .byte 0x01, 0x08, 0x04 - .2byte 4000, 0 - .4byte gUnknown_8454CDB - .4byte gUnknown_845418A - - .byte DECOR_FISSURE_MAT - .string "FISSURE MAT$", 16 - .byte 0x01, 0x08, 0x04 - .2byte 4000, 0 - .4byte gUnknown_8454D13 - .4byte gUnknown_845419C - - .byte DECOR_SPIKES_MAT - .string "SPIKES MAT$", 16 - .byte 0x01, 0x08, 0x04 - .2byte 4000, 0 - .4byte gUnknown_8454D4A - .4byte gUnknown_84541AE - - .byte DECOR_BALL_POSTER - .string "BALL POSTER$", 16 - .byte 0x03, 0x00, 0x05 - .2byte 1000, 0 - .4byte gUnknown_8454D80 - .4byte gUnknown_84541C0 - - .byte DECOR_GREEN_POSTER - .string "GREEN POSTER$", 16 - .byte 0x03, 0x00, 0x05 - .2byte 1000, 0 - .4byte gUnknown_8454DA8 - .4byte gUnknown_84541C2 - - .byte DECOR_RED_POSTER - .string "RED POSTER$", 16 - .byte 0x03, 0x00, 0x05 - .2byte 1000, 0 - .4byte gUnknown_8454DCD - .4byte gUnknown_84541C4 - - .byte DECOR_BLUE_POSTER - .string "BLUE POSTER$", 16 - .byte 0x03, 0x00, 0x05 - .2byte 1000, 0 - .4byte gUnknown_8454DF2 - .4byte gUnknown_84541C6 - - .byte DECOR_CUTE_POSTER - .string "CUTE POSTER$", 16 - .byte 0x03, 0x00, 0x05 - .2byte 1000, 0 - .4byte gUnknown_8454E16 - .4byte gUnknown_84541C8 - - .byte DECOR_PIKA_POSTER - .string "PIKA POSTER$", 16 - .byte 0x03, 0x01, 0x05 - .2byte 1500, 0 - .4byte gUnknown_8454E3C - .4byte gUnknown_84541CA - - .byte DECOR_LONG_POSTER - .string "LONG POSTER$", 16 - .byte 0x03, 0x01, 0x05 - .2byte 1500, 0 - .4byte gUnknown_8454E6B - .4byte gUnknown_84541CE - - .byte DECOR_SEA_POSTER - .string "SEA POSTER$", 16 - .byte 0x03, 0x01, 0x05 - .2byte 1500, 0 - .4byte gUnknown_8454E90 - .4byte gUnknown_84541D2 - - .byte DECOR_SKY_POSTER - .string "SKY POSTER$", 16 - .byte 0x03, 0x01, 0x05 - .2byte 1500, 0 - .4byte gUnknown_8454EB7 - .4byte gUnknown_84541D6 - - .byte DECOR_KISS_POSTER - .string "KISS POSTER$", 16 - .byte 0x03, 0x01, 0x05 - .2byte 1500, 0 - .4byte gUnknown_8454EDC - .4byte gUnknown_84541DA - - .byte DECOR_PICHU_DOLL - .string "PICHU DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8454F02 - .4byte gUnknown_84541DE - - .byte DECOR_PIKACHU_DOLL - .string "PIKACHU DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8454F2D - .4byte gUnknown_84541E0 - - .byte DECOR_MARILL_DOLL - .string "MARILL DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8454F5A - .4byte gUnknown_84541E2 - - .byte DECOR_TOGEPI_DOLL - .string "TOGEPI DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8454F86 - .4byte gUnknown_84541E4 - - .byte DECOR_CYNDAQUIL_DOLL - .string "CYNDAQUIL DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8454FB2 - .4byte gUnknown_84541E6 - - .byte DECOR_CHIKORITA_DOLL - .string "CHIKORITA DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8454FE1 - .4byte gUnknown_84541E8 - - .byte DECOR_TOTODILE_DOLL - .string "TOTODILE DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8455010 - .4byte gUnknown_84541EA - - .byte DECOR_JIGGLYPUFF_DOLL - .string "JIGGLYPUFF DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_845503E - .4byte gUnknown_84541EC - - .byte DECOR_MEOWTH_DOLL - .string "MEOWTH DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_845506E - .4byte gUnknown_84541EE - - .byte DECOR_CLEFAIRY_DOLL - .string "CLEFAIRY DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_845509A - .4byte gUnknown_84541F0 - - .byte DECOR_DITTO_DOLL - .string "DITTO DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_84550C8 - .4byte gUnknown_84541F2 - - .byte DECOR_SMOOCHUM_DOLL - .string "SMOOCHUM DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_84550F3 - .4byte gUnknown_84541F4 - - .byte DECOR_TREECKO_DOLL - .string "TREECKO DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8455121 - .4byte gUnknown_84541F6 - - .byte DECOR_TORCHIC_DOLL - .string "TORCHIC DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_845514E - .4byte gUnknown_84541F8 - - .byte DECOR_MUDKIP_DOLL - .string "MUDKIP DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_845517B - .4byte gUnknown_84541FA - - .byte DECOR_DUSKULL_DOLL - .string "DUSKULL DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_84551A7 - .4byte gUnknown_84541FC - - .byte DECOR_WYNAUT_DOLL - .string "WYNAUT DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_84551D4 - .4byte gUnknown_84541FE - - .byte DECOR_BALTOY_DOLL - .string "BALTOY DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8455200 - .4byte gUnknown_8454200 - - .byte DECOR_KECLEON_DOLL - .string "KECLEON DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_845522C - .4byte gUnknown_8454202 - - .byte DECOR_AZURILL_DOLL - .string "AZURILL DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8455259 - .4byte gUnknown_8454204 - - .byte DECOR_SKITTY_DOLL - .string "SKITTY DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8455287 - .4byte gUnknown_8454206 - - .byte DECOR_SWABLU_DOLL - .string "SWABLU DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_84552B3 - .4byte gUnknown_8454208 - - .byte DECOR_GULPIN_DOLL - .string "GULPIN DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_84552DF - .4byte gUnknown_845420A - - .byte DECOR_LOTAD_DOLL - .string "LOTAD DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_845530B - .4byte gUnknown_845420C - - .byte DECOR_SEEDOT_DOLL - .string "SEEDOT DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8455336 - .4byte gUnknown_845420E - - .byte DECOR_PIKA_CUSHION - .string "PIKA CUSHION$", 16 - .byte 0x04, 0x00, 0x07 - .2byte 2000, 0 - .4byte gUnknown_8455362 - .4byte gUnknown_8454210 - - .byte DECOR_ROUND_CUSHION - .string "ROUND CUSHION$", 16 - .byte 0x04, 0x00, 0x07 - .2byte 2000, 0 - .4byte gUnknown_8455392 - .4byte gUnknown_8454212 - - .byte DECOR_KISS_CUSHION - .string "KISS CUSHION$", 16 - .byte 0x04, 0x00, 0x07 - .2byte 2000, 0 - .4byte gUnknown_84553C1 - .4byte gUnknown_8454214 - - .byte DECOR_ZIGZAG_CUSHION - .string "ZIGZAG CUSHION$", 16 - .byte 0x04, 0x00, 0x07 - .2byte 2000, 0 - .4byte gUnknown_84553F2 - .4byte gUnknown_8454216 - - .byte DECOR_SPIN_CUSHION - .string "SPIN CUSHION$", 16 - .byte 0x04, 0x00, 0x07 - .2byte 2000, 0 - .4byte gUnknown_8455424 - .4byte gUnknown_8454218 - - .byte DECOR_DIAMOND_CUSHION - .string "DIAMOND CUSHION$", 16 - .byte 0x04, 0x00, 0x07 - .2byte 2000, 0 - .4byte gUnknown_8455453 - .4byte gUnknown_845421A - - .byte DECOR_BALL_CUSHION - .string "BALL CUSHION$", 16 - .byte 0x04, 0x00, 0x07 - .2byte 2000, 0 - .4byte gUnknown_8455483 - .4byte gUnknown_845421C - - .byte DECOR_GRASS_CUSHION - .string "GRASS CUSHION$", 16 - .byte 0x04, 0x00, 0x07 - .2byte 2000, 0 - .4byte gUnknown_84554B0 - .4byte gUnknown_845421E - - .byte DECOR_FIRE_CUSHION - .string "FIRE CUSHION$", 16 - .byte 0x04, 0x00, 0x07 - .2byte 2000, 0 - .4byte gUnknown_84554E3 - .4byte gUnknown_8454220 - - .byte DECOR_WATER_CUSHION - .string "WATER CUSHION$", 16 - .byte 0x04, 0x00, 0x07 - .2byte 2000, 0 - .4byte gUnknown_8455515 - .4byte gUnknown_8454222 - - .byte DECOR_SNORLAX_DOLL - .string "SNORLAX DOLL$", 16 - .byte 0x04, 0x05, 0x06 - .2byte 10000, 0 - .4byte gUnknown_8455548 - .4byte gUnknown_8454224 - - .byte DECOR_RHYDON_DOLL - .string "RHYDON DOLL$", 16 - .byte 0x04, 0x05, 0x06 - .2byte 10000, 0 - .4byte gUnknown_8455573 - .4byte gUnknown_8454226 - - .byte DECOR_LAPRAS_DOLL - .string "LAPRAS DOLL$", 16 - .byte 0x04, 0x05, 0x06 - .2byte 10000, 0 - .4byte gUnknown_845559E - .4byte gUnknown_8454228 - - .byte DECOR_VENUSAUR_DOLL - .string "VENUSAUR DOLL$", 16 - .byte 0x04, 0x05, 0x06 - .2byte 10000, 0 - .4byte gUnknown_84555C9 - .4byte gUnknown_845422A - - .byte DECOR_CHARIZARD_DOLL - .string "CHARIZARD DOLL$", 16 - .byte 0x04, 0x05, 0x06 - .2byte 10000, 0 - .4byte gUnknown_84555F4 - .4byte gUnknown_845422C - - .byte DECOR_BLASTOISE_DOLL - .string "BLASTOISE DOLL$", 16 - .byte 0x04, 0x05, 0x06 - .2byte 10000, 0 - .4byte gUnknown_845561F - .4byte gUnknown_845422E - - .byte DECOR_WAILMER_DOLL - .string "WAILMER DOLL$", 16 - .byte 0x04, 0x05, 0x06 - .2byte 10000, 0 - .4byte gUnknown_845564A - .4byte gUnknown_8454230 - - .byte DECOR_REGIROCK_DOLL - .string "REGIROCK DOLL$", 16 - .byte 0x04, 0x05, 0x06 - .2byte 10000, 0 - .4byte gUnknown_8455675 - .4byte gUnknown_8454232 - - .byte DECOR_REGICE_DOLL - .string "REGICE DOLL$", 16 - .byte 0x04, 0x05, 0x06 - .2byte 10000, 0 - .4byte gUnknown_84556A0 - .4byte gUnknown_8454234 - - .byte DECOR_REGISTEEL_DOLL - .string "REGISTEEL DOLL$", 16 - .byte 0x04, 0x05, 0x06 - .2byte 10000, 0 - .4byte gUnknown_84556CB - .4byte gUnknown_8454236 diff --git a/data/event_scripts.s b/data/event_scripts.s index 0a54d8e1a..ec9409782 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1223,10 +1223,10 @@ EventScript_DoInGameTrade:: @ 81A8CD9 faceplayer return -gUnknown_81A8CED:: @ 81A8CED - special sub_810C3A4 +EventScript_VsSeekerChargingDone:: @ 81A8CED + special VsSeekerFreezeObjectsAfterChargeComplete waitstate - special sub_810C444 + special VsSeekerResetObjectMovementAfterChargeComplete releaseall end diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 2f26f58ab..01417f0d1 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -43,7 +43,7 @@ BirthIsland_Exterior_EventScript_Triangle:: @ 8165271 lock faceplayer goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc special DoDeoxysTriangleInteraction waitstate switch VAR_RESULT diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index fb7cac74d..fe0d13a8a 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -3,7 +3,7 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl:: @ 816BCCD goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer call CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index e040978fc..ee0cd370e 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -24,7 +24,7 @@ CeruleanCave_B1F_EventScript_ShowMewtwo:: @ 81624F1 CeruleanCave_B1F_EventScript_Mewtwo:: @ 81624F5 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer waitse diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index b27579cee..5d63feb07 100644 --- a/data/maps/CeruleanCity_House4/scripts.inc +++ b/data/maps/CeruleanCity_House4/scripts.inc @@ -3,7 +3,7 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE CeruleanCity_House4_EventScript_WonderNewsBerryMan:: @ 816ACEF goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock specialvar VAR_0x8004, GetMENewsJisanItemAndState copyvar VAR_0x8008, VAR_RESULT diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index 7fd2a810d..19115df34 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -33,7 +33,7 @@ FiveIsland_MemorialPillar_EventScript_ReturnedForTM42:: @ 8168A22 FiveIsland_MemorialPillar_EventScript_Memorial:: @ 8168A48 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lockall goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 4a5662865..0d70919dd 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -8,7 +8,7 @@ FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD FiveIsland_ResortGorgeous_House_EventScript_Selphy:: @ 8171EBE goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer goto_if_set SHOWN_REQUESTED_MON, FiveIsland_ResortGorgeous_House_EventScript_JustFulfilledRequest diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index 956652eb7..875cb284e 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -3,7 +3,7 @@ FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D FiveIsland_WaterLabyrinth_EventScript_EggGentleman:: @ 816884E goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer goto_if_set FLAG_GOT_TOGEPI_EGG, FiveIsland_WaterLabyrinth_EventScript_PostEggComment diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index f8de01374..17f509515 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -73,7 +73,7 @@ FourIsland_Movement_PlayerWatchRivalExit:: @ 8167D52 FourIsland_EventScript_DaycareMan:: @ 8167D55 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer special GetDaycareMonNicknames diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index fef05c1ce..815a86ddc 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -24,7 +24,7 @@ MtEmber_Summit_EventScript_ShowMoltres:: @ 8163B2F MtEmber_Summit_EventScript_Moltres:: @ 8163B33 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer setwildbattle SPECIES_MOLTRES, 50, ITEM_NONE diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 515242568..46a308ce9 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -63,7 +63,7 @@ MtMoon_B2F_EventScript_DomeFossil:: @ 816071B removeobject LOCALID_DOME_FOSSIL giveitem_msg MtMoon_B2F_Text_ObtainedDomeFossil, ITEM_DOME_FOSSIL, 1, MUS_FAN5 closemessage - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc delay 10 applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToHelixFossil waitmovement 0 @@ -95,7 +95,7 @@ MtMoon_B2F_EventScript_HelixFossil:: @ 816077F removeobject LOCALID_HELIX_FOSSIL giveitem_msg MtMoon_B2F_Text_ObtainedHelixFossil, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 closemessage - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc delay 10 applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToDomeFossil waitmovement 0 diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 707ad84f7..a47454024 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -30,7 +30,7 @@ NavelRock_Base_EventScript_TryRemoveLugia:: @ 8165120 NavelRock_Base_EventScript_Lugia:: @ 8165134 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer waitse diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index b2983cf47..93e1fcdb1 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -33,7 +33,7 @@ NavelRock_Summit_EventScript_TryRemoveHoOh:: @ 8164FE7 NavelRock_Summit_EventScript_HoOh:: @ 8164FFB goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lockall setvar VAR_TEMP_1, 1 special SpawnCameraObject diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 67c48c033..524c99272 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -289,7 +289,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire:: @ 8170FA5 applymovement LOCALID_CELIO, Movement_FacePlayer waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_ManagedToLinkWithHoennThankYou - special sub_810B82C + special SetPostgameFlags setflag FLAG_SYS_CAN_LINK_WITH_RS setflag FLAG_HIDE_CERULEAN_CAVE_GUARD setflag FLAG_HIDE_LORELEI_IN_HER_HOUSE diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 1b98d4cb4..62e9d8a01 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -451,7 +451,7 @@ PalletTown_EventScript_SignLadyShowSign:: @ 8165894 setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 setvar SIGN_LADY_READY, FALSE special SetWalkingIntoSignVars - special sub_80699BC + special DisableMsgBoxWalkaway signmsg msgbox PalletTown_Text_PressStartToOpenMenuCopy normalmsg diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index be4e8dd09..a595182fe 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -50,7 +50,7 @@ PalletTown_GarysHouse_EventScript_HeardBattledRival:: @ 8168DAF PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 goto_if_lt PalletTown_GarysHouse_EventScript_RateMonFriendship msgbox PalletTown_GarysHouse_Text_LikeMeToGroomMon, MSGBOX_YESNO diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index facebea6b..fecfd0b48 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -723,7 +723,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E waitfanfare call EventScript_RestorePrevTextColor setflag FLAG_SYS_POKEDEX_GET - special sub_810B810 + special SetUnlockedPokedexFlags setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1 msgbox PalletTown_ProfessorOaksLab_Text_OakCatchMonsForDataTakeThese giveitem_msg PalletTown_ProfessorOaksLab_Text_ReceivedFivePokeBalls, ITEM_POKE_BALL, 5 @@ -1000,7 +1000,7 @@ PalletTown_ProfessorOaksLab_EventScript_DontStartNationalDexScene:: @ 81699F9 PalletTown_ProfessorOaksLab_EventScript_CheckIfPlayerNeedsBalls:: @ 81699FB goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, PalletTown_ProfessorOaksLab_EventScript_PlayerAlreadyGotBalls checkitem ITEM_POKE_BALL, 1 diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index c50fcdb2d..5bb795169 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -724,7 +724,7 @@ PewterCity_EventScript_AideGiveRunningShoes:: @ 81662DE waitmessage waitfanfare msgbox PewterCity_Text_SwitchedShoesWithRunningShoes - special sub_80699BC + special DisableMsgBoxWalkaway signmsg msgbox PewterCity_Text_ExplainRunningShoes normalmsg diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index d5236139c..bb20b6ac3 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -9,7 +9,7 @@ PokemonTower_6F_EventScript_MarowakGhost:: @ 81634B8 setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE special StartMarowakBattle waitstate - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc compare VAR_RESULT, FALSE @ Set by CB2_EndMarowakBattle goto_if_eq PokemonTower_6F_EventScript_DefeatedMarowakGhost applymovement OBJ_EVENT_ID_PLAYER, PokemonTower_6F_Movement_ForcePlayerUp diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index 3877d5f57..59ba7c6cc 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -35,7 +35,7 @@ PowerPlant_EventScript_ShowElectrode2:: @ 81637B4 PowerPlant_EventScript_Zapdos:: @ 81637B8 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer setwildbattle SPECIES_ZAPDOS, 50, ITEM_NONE @@ -84,7 +84,7 @@ PowerPlant_EventScript_Electrode1:: @ 816382F setflag FLAG_SYS_SPECIAL_WILD_BATTLE dowildbattle clearflag FLAG_SYS_SPECIAL_WILD_BATTLE - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON goto_if_eq PowerPlant_EventScript_FoughtElectrode1 @@ -113,7 +113,7 @@ PowerPlant_EventScript_Electrode2:: @ 816388D setflag FLAG_SYS_SPECIAL_WILD_BATTLE dowildbattle clearflag FLAG_SYS_SPECIAL_WILD_BATTLE - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON goto_if_eq PowerPlant_EventScript_FoughtElectrode2 diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index 9ace7b7b0..af0ab05a4 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -15,7 +15,7 @@ Route12_EventScript_Snorlax:: @ 8168014 faceplayer goto_if_unset FLAG_GOT_POKE_FLUTE, Route12_EventScript_SnorlaxNoPokeFlute goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc msgbox Text_WantToUsePokeFlute, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq Route12_EventScript_DontUsePokeFlute diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index 70c8bf48f..646987ddb 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -31,7 +31,7 @@ Route12_FishingHouse_EventScript_NoRoomForSuperRod:: @ 816FF75 Route12_FishingHouse_EventScript_CheckMagikarpRecord:: @ 816FF7F goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc setvar VAR_0x8004, SPECIES_MAGIKARP specialvar VAR_RESULT, DoesPlayerPartyContainSpecies compare VAR_RESULT, FALSE diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 62d47983f..2096b6a2a 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -34,7 +34,7 @@ Route16_EventScript_Snorlax:: @ 8168121 faceplayer goto_if_unset FLAG_GOT_POKE_FLUTE, Route16_EventScript_SnorlaxNoPokeFlute goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc msgbox Text_WantToUsePokeFlute, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq Route16_EventScript_DontUsePokeFlute diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc index a8e74c94b..3659a1cc6 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc +++ b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc @@ -19,7 +19,7 @@ SaffronCity_CopycatsHouse_2F_EventScript_Doll:: @ 816EB70 SaffronCity_CopycatsHouse_2F_EventScript_Copycat:: @ 816EB7B goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer checkitem ITEM_POKE_DOLL, 1 diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 3e63ff0ed..47accfa73 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -100,7 +100,7 @@ SeafoamIslands_B4F_EventScript_EnterByFalling:: @ 8163121 call_if_lt SeafoamIslands_B4F_EventScript_RideCurrentFar compare VAR_0x8008, 9 call_if_ge SeafoamIslands_B4F_EventScript_RideCurrentClose - special sub_805D1A8 + special SeafoamIslandsB4F_CurrentDumpsPlayerOnLand setvar VAR_TEMP_1, 0 releaseall end @@ -159,7 +159,7 @@ SeafoamIslands_B4F_Movement_WalkUp:: @ 81631AA SeafoamIslands_B4F_EventScript_Articuno:: @ 81631AC goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer setwildbattle SPECIES_ARTICUNO, 50, ITEM_NONE diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index 9f9b33c7f..ce1520ce0 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -5,7 +5,7 @@ SixIsland_WaterPath_House1_EventScript_Beauty:: @ 817206D lock faceplayer goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc setvar VAR_0x8004, SPECIES_HERACROSS specialvar VAR_RESULT, DoesPlayerPartyContainSpecies compare VAR_RESULT, FALSE diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index dab6cb795..faa340706 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -23,7 +23,7 @@ ThreeIsland_BerryForest_EventScript_Lostelle:: @ 8163C83 waitmoncry setwildbattle SPECIES_HYPNO, 30, ITEM_NONE dowildbattle - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc applymovement 1, Movement_FacePlayer waitmovement 0 msgbox ThreeIsland_BerryForest_Text_ThankYouHaveThis diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 20b0a2710..297a82295 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -8,7 +8,7 @@ TwoIsland_House_MapScripts:: @ 8171618 TwoIsland_House_EventScript_MoveManiac:: @ 8171619 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer clearflag HAS_BIG_MUSHROOM diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 0485cd89e..07abeefd0 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -86,7 +86,7 @@ VermilionCity_EventScript_CheckSeagallopPresent:: @ 8166996 VermilionCity_EventScript_ChooseSeagallopDestRainbowPass:: @ 81669BB goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc call VermilionCity_EventScript_CheckHasMysticTicket compare VAR_RESULT, TRUE goto_if_eq VermilionCity_EventScript_HasMysticTicket diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 232453543..b7e07a106 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -142,7 +142,7 @@ VermilionCity_Gym_EventScript_TrashCan15:: @ 816B837 VermilionCity_Gym_EventScript_TrashCan:: @ 816B843 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc copyvar SWITCH1_ID, VAR_TEMP_0 copyvar SWITCH2_ID, VAR_TEMP_1 goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, VermilionCity_Gym_EventScript_LocksAlreadyOpen diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 5309c0493..5eef02b91 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -146,7 +146,7 @@ ViridianCity_EventScript_WatchToLearnBasics:: @ 8165A5B ViridianCity_EventScript_TutorialUnused:: @ 8165A65 msgbox ViridianCity_Text_ThatWasEducationalTakeThis goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc special StartOldManTutorialBattle waitstate release @@ -239,7 +239,7 @@ ViridianCity_EventScript_DoTutorialBattle:: @ 8165B4C msgbox ViridianCity_Text_ShowYouHowToCatchMons closemessage goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc special StartOldManTutorialBattle waitstate lock diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 1053c1028..8bb85bc9f 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -15,7 +15,7 @@ EventScript_HideMysteryGiftMan:: @ 81BB1CE CableClub_EventScript_MysteryGiftMan:: @ 81BB1D2 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc execram @ Unused @@ -111,7 +111,7 @@ CableClub_EventScript_ExitMinigameRoom:: @ 81BB2FD CableClub_EventScript_CloseLinkAndExitLinkRoom:: @ 81BB315 special CloseLink special HelpSystem_Enable - special sub_811390C + special QuestLog_StartRecordingInputsAfterDeferredEvent setvar VAR_CABLE_CLUB_STATE, 0 textcolor 1 compare VAR_0x8007, 0 @@ -137,7 +137,7 @@ CableClub_EventScript_ExitTradeCenter:: @ 81BB34F CableClub_EventScript_PlayerExitTradeCenter:: @ 81BB367 special CloseLink special HelpSystem_Enable - special sub_811390C + special QuestLog_StartRecordingInputsAfterDeferredEvent setvar VAR_CABLE_CLUB_STATE, 0 textcolor 1 compare VAR_0x8007, 0 @@ -161,7 +161,7 @@ CableClub_EventScript_ExitUnionRoom:: @ 81BB39C CableClub_EventScript_PlayerExitUnionRoom:: @ 81BB3B4 special HelpSystem_Enable - special sub_811390C + special QuestLog_StartRecordingInputsAfterDeferredEvent setvar VAR_CABLE_CLUB_STATE, 0 textcolor 1 compare VAR_0x8007, 0 @@ -775,7 +775,7 @@ CableClub_EventScript_DoLinkRoomExit:: @ 81BB9FC CableClub_EventScript_UnionRoomAttendant:: @ 81BBA04 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements @@ -885,7 +885,7 @@ CableClub_EventScript_DontAskAboutLinking:: @ 81BBB92 CableClub_EventScript_DirectCornerAttendant:: @ 81BBB9C goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements @@ -1195,7 +1195,7 @@ CableClub_OnResume:: @ 81BC05C JoyfulGameCorner_EventScript_InfoMan2:: @ 81BC060 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer message Text_DescribeWhichGame @@ -1225,7 +1225,7 @@ CableClub_EventScript_MinigameInfoExit:: @ 81BC0C4 JoyfulGameCorner_EventScript_MinigameAttendant:: @ 81BC0CE goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer message Text_WelcomeCanYouWait diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index 46d4a7c52..ceea4f7bb 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -448,7 +448,7 @@ EventScript_BodySlamTaught:: @ 81C4DE2 TwoIsland_CapeBrink_House_EventScript_StarterTutor:: @ 81C4DEC goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer goto_if_set FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK, CapeBrinkTutor_EventScript_TaughtAllMoves @@ -556,7 +556,7 @@ EventScript_ChooseMoveTutorMon:: @ 81C4F30 EventScript_CanOnlyBeLearnedOnce:: @ 81C4F37 textcolor 3 - special sub_80699BC + special DisableMsgBoxWalkaway signmsg msgbox Text_MoveCanOnlyBeLearnedOnce, MSGBOX_YESNO normalmsg diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc index 79f4ad84c..5cea3a753 100644 --- a/data/scripts/pokedex_rating.inc +++ b/data/scripts/pokedex_rating.inc @@ -1,6 +1,6 @@ PokedexRating_EventScript_RateInPerson:: @ 81A737B goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc call_if_set FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_DexCompleteIntro call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_NormalIntro call PokedexRating_EventScript_Rate diff --git a/data/scripts/questionnaire.inc b/data/scripts/questionnaire.inc index c7636ce22..75508be5c 100644 --- a/data/scripts/questionnaire.inc +++ b/data/scripts/questionnaire.inc @@ -29,7 +29,7 @@ EventScript_EnableMysteryGift:: @ 81A774D msgbox Text_YouKnowThoseWords setflag FLAG_SYS_MYSTERY_GIFT_ENABLED textcolor 3 - special sub_80699BC + special DisableMsgBoxWalkaway signmsg msgbox Text_YouCanAccessMysteryGift normalmsg diff --git a/data/scripts/seagallop.inc b/data/scripts/seagallop.inc index 51fd0c675..ca3b2bc6b 100644 --- a/data/scripts/seagallop.inc +++ b/data/scripts/seagallop.inc @@ -111,7 +111,7 @@ EventScript_SetSail:: @ 81A90DA closemessage delay 20 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc fadescreen FADE_TO_BLACK special DoSeagallopFerryScene waitstate diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc index 993db55bc..0f2171d7c 100644 --- a/data/scripts/trainer_card.inc +++ b/data/scripts/trainer_card.inc @@ -92,7 +92,7 @@ FourIsland_House2_EventScript_StickerManAskForBrag:: @ 81B2994 applymovement 1, Movement_FacePlayer waitmovement 0 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc compare VAR_0x8008, 0 goto_if_eq FourIsland_House2_EventScript_NothingToBragAbout message FourIsland_House2_Text_BragAboutWhatToday diff --git a/data/specials.inc b/data/specials.inc index ab7309c32..c06019606 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -100,7 +100,7 @@ gSpecials:: @ 815FD60 def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial - def_special sub_8081128 + def_special TryContestLinkup def_special Field_AskSaveTheGame def_special DoWateringBerryTreeAnim def_special ShowEasyChatScreen @@ -349,14 +349,14 @@ gSpecials:: @ 815FD60 def_special Dummy_TryEnableBravoTrainerBattleTower def_special DoesPartyHaveEnigmaBerry def_special NullFieldSpecial - def_special sub_810B82C + def_special SetPostgameFlags def_special StartMarowakBattle def_special ForcePlayerOntoBike def_special ListMenu def_special ReturnToListMenu def_special DoPicboxCancel def_special SetVermilionTrashCans - def_special sub_805D1A8 + def_special SeafoamIslandsB4F_CurrentDumpsPlayerOnLand def_special SampleResortGorgeousMonAndReward def_special CheckAddCoins def_special GetDaycarePokemonCount @@ -364,7 +364,7 @@ gSpecials:: @ 815FD60 def_special ForcePlayerToStartSurfing def_special GetStarterSpecies def_special SetSeenMon - def_special sub_810C444 + def_special VsSeekerResetObjectMovementAfterChargeComplete def_special ShouldShowBoxWasFullMessage def_special ChangeBoxPokemonNickname def_special UpdateTrainerCardPhotoIcons @@ -377,8 +377,8 @@ gSpecials:: @ 815FD60 def_special ShowWirelessCommunicationScreen def_special EnableNationalPokedex def_special SetWalkingIntoSignVars - def_special sub_80699BC - def_special sub_810C3A4 + def_special DisableMsgBoxWalkaway + def_special VsSeekerFreezeObjectsAfterChargeComplete def_special SetFlavorTextFlagFromSpecialVars def_special UpdatePickStateFromSpecialVar8005 def_special OverworldWhiteOutGetMoneyLoss @@ -393,14 +393,14 @@ gSpecials:: @ 815FD60 def_special BackupHelpContext def_special RestoreHelpContext def_special ValidateReceivedWonderCard - def_special sub_810B810 + def_special SetUnlockedPokedexFlags def_special InitUnionRoom def_special BufferUnionRoomPlayerName - def_special sub_811390C + def_special QuestLog_StartRecordingInputsAfterDeferredEvent def_special GetMartClerkObjectId def_special BattleCardAction def_special GetQuestLogState - def_special sub_8112364 + def_special QuestLog_OnInteractionWithSpecialNpc def_special GetMENewsJisanItemAndState def_special GetPCBoxToSendMon def_special OpenMuseumFossilPic @@ -418,7 +418,7 @@ gSpecials:: @ 815FD60 def_special DaisyMassageServices def_special HelpSystem_Disable def_special HelpSystem_Enable - def_special sub_810B82C + def_special SetPostgameFlags def_special CheckHasAtLeastOneBerry def_special DisplayBerryPowderVendorMenu def_special RemoveBerryPowderVendorMenu diff --git a/data/text/decoration_descriptions.inc b/data/text/decoration_descriptions.inc deleted file mode 100644 index 358070cb1..000000000 --- a/data/text/decoration_descriptions.inc +++ /dev/null @@ -1,573 +0,0 @@ -gUnknown_8454238:: @ 8454238 - .string "A small desk built\n" - .string "for one.$" - -gUnknown_8454254:: @ 8454254 - .string "A small desk built in\n" - .string "the shape of a POKé\n" - .string "BALL.$" - -gUnknown_8454284:: @ 8454284 - .string "A large desk made\n" - .string "of steel. Put some\n" - .string "decorations on it.$" - -gUnknown_84542BC:: @ 84542BC - .string "A large desk made\n" - .string "of wood. Put some\n" - .string "decorations on it.$" - -gUnknown_84542F3:: @ 84542F3 - .string "A large desk made\n" - .string "of leaves. Put some\n" - .string "decorations on it.$" - -gUnknown_845432C:: @ 845432C - .string "A huge desk made\n" - .string "of glass. Holds lots\n" - .string "of decorations.$" - -gUnknown_8454362:: @ 8454362 - .string "A huge desk made\n" - .string "of brick. Holds lots\n" - .string "of decorations.$" - -gUnknown_8454398:: @ 8454398 - .string "A huge desk made\n" - .string "of logs. Put lots of\n" - .string "decorations on it.$" - -gUnknown_84543D1:: @ 84543D1 - .string "A huge desk made\n" - .string "of rocks. Holds\n" - .string "many decorations.$" - -gUnknown_8454404:: @ 8454404 - .string "A small chair made\n" - .string "for one.$" - -gUnknown_8454420:: @ 8454420 - .string "A small chair built\n" - .string "in the shape of a\n" - .string "POKé BALL.$" - -gUnknown_8454451:: @ 8454451 - .string "A small chair made\n" - .string "of steel.$" - -gUnknown_845446E:: @ 845446E - .string "A small chair made\n" - .string "of glass.$" - -gUnknown_845448B:: @ 845448B - .string "A small chair made\n" - .string "of leaves.$" - -gUnknown_84544A9:: @ 84544A9 - .string "A small chair made\n" - .string "of wood.$" - -gUnknown_84544C5:: @ 84544C5 - .string "A small chair made\n" - .string "of brick.$" - -gUnknown_84544E2:: @ 84544E2 - .string "A small chair made\n" - .string "of logs.$" - -gUnknown_84544FE:: @ 84544FE - .string "A small chair made\n" - .string "of rock.$" - -gUnknown_845451A:: @ 845451A - .string "A vivid red potted\n" - .string "plant.$" - -gUnknown_8454534:: @ 8454534 - .string "A flowering tropical\n" - .string "plant in a pot.$" - -gUnknown_8454559:: @ 8454559 - .string "A pot of cute\n" - .string "flowers.$" - -gUnknown_8454570:: @ 8454570 - .string "A large pot with\n" - .string "many colorful\n" - .string "flowers.$" - -gUnknown_8454598:: @ 8454598 - .string "A large, umbrella-\n" - .string "shaped plant in a\n" - .string "big pot.$" - -gUnknown_84545C6:: @ 84545C6 - .string "A large, impressive\n" - .string "plant in a big pot.$" - -gUnknown_84545EE:: @ 84545EE - .string "A red-colored brick.\n" - .string "Decorations can be\n" - .string "placed on top.$" - -gUnknown_8454625:: @ 8454625 - .string "A yellow-colored\n" - .string "brick. Put some\n" - .string "decorations on top.$" - -gUnknown_845465A:: @ 845465A - .string "A blue-colored\n" - .string "brick. Put some\n" - .string "decorations on top.$" - -gUnknown_845468D:: @ 845468D - .string "A red balloon filled\n" - .string "with water. Bursts\n" - .string "if stepped on.$" - -gUnknown_84546C4:: @ 84546C4 - .string "A blue balloon filled\n" - .string "with water. Bursts\n" - .string "if stepped on.$" - -gUnknown_84546FC:: @ 84546FC - .string "A yellow balloon\n" - .string "filled with water.\n" - .string "Pops if stepped on.$" - -gUnknown_8454734:: @ 8454734 - .string "A large red tent.\n" - .string "You can hide inside\n" - .string "it.$" - -gUnknown_845475E:: @ 845475E - .string "A large blue tent.\n" - .string "You can hide inside\n" - .string "it.$" - -gUnknown_8454789:: @ 8454789 - .string "Place over a hole to\n" - .string "cross to the other\n" - .string "side.$" - -gUnknown_84547B7:: @ 84547B7 - .string "Use to slide down\n" - .string "from the platform.$" - -gUnknown_84547DC:: @ 84547DC - .string "A small fence that\n" - .string "blocks passage.$" - -gUnknown_84547FF:: @ 84547FF - .string "A small fence that\n" - .string "blocks passage.$" - -gUnknown_8454822:: @ 8454822 - .string "An old large tire.\n" - .string "Decorations can be\n" - .string "placed on top.$" - -gUnknown_8454857:: @ 8454857 - .string "A large pedestal\n" - .string "with steps.$" - -gUnknown_8454874:: @ 8454874 - .string "A large ball of mud.\n" - .string "Crumbles if stepped\n" - .string "on.$" - -gUnknown_84548A1:: @ 84548A1 - .string "A weird door that\n" - .string "people can walk\n" - .string "right through.$" - -gUnknown_84548D2:: @ 84548D2 - .string "An ornament made\n" - .string "of sand. Crumbles if\n" - .string "touched.$" - -gUnknown_8454901:: @ 8454901 - .string "Awarded for 50\n" - .string "straight wins at\n" - .string "the BATTLE TOWER.$" - -gUnknown_8454933:: @ 8454933 - .string "Awarded for 100\n" - .string "straight wins at\n" - .string "the BATTLE TOWER.$" - -gUnknown_8454966:: @ 8454966 - .string "A glass replica of\n" - .string "a famous sculpture\n" - .string "at the ART MUSEUM.$" - -gUnknown_845499F:: @ 845499F - .string "A small, gray-\n" - .string "colored toy TV.$" - -gUnknown_84549BE:: @ 84549BE - .string "A toy TV modeled\n" - .string "in the image of a\n" - .string "SEEDOT.$" - -gUnknown_84549E9:: @ 84549E9 - .string "A toy TV modeled\n" - .string "in the image of a\n" - .string "SKITTY.$" - -gUnknown_8454A14:: @ 8454A14 - .string "An odd mat that\n" - .string "glitters if stepped\n" - .string "on.$" - -gUnknown_8454A3C:: @ 8454A3C - .string "A trick mat that\n" - .string "jumps when it is\n" - .string "stepped on.$" - -gUnknown_8454A6A:: @ 8454A6A - .string "A trick mat that\n" - .string "spins around when\n" - .string "stepped on.$" - -gUnknown_8454A99:: @ 8454A99 - .string "A mat that plays\n" - .string "a low C note when\n" - .string "stepped on.$" - -gUnknown_8454AC8:: @ 8454AC8 - .string "A mat that plays\n" - .string "a D note when\n" - .string "stepped on.$" - -gUnknown_8454AF3:: @ 8454AF3 - .string "A mat that plays\n" - .string "an E note when\n" - .string "stepped on.$" - -gUnknown_8454B1F:: @ 8454B1F - .string "A mat that plays\n" - .string "an F note when\n" - .string "stepped on.$" - -gUnknown_8454B4B:: @ 8454B4B - .string "A mat that plays\n" - .string "a G note when\n" - .string "stepped on.$" - -gUnknown_8454B76:: @ 8454B76 - .string "A mat that plays\n" - .string "an A note when\n" - .string "stepped on.$" - -gUnknown_8454BA2:: @ 8454BA2 - .string "A mat that plays\n" - .string "a B note when\n" - .string "stepped on.$" - -gUnknown_8454BCD:: @ 8454BCD - .string "A mat that plays\n" - .string "a high C note when\n" - .string "stepped on.$" - -gUnknown_8454BFD:: @ 8454BFD - .string "A mat designed with\n" - .string "a SURF image.\n" - .string "Put items on top.$" - -gUnknown_8454C31:: @ 8454C31 - .string "A mat designed with\n" - .string "a THUNDER image.\n" - .string "Put items on top.$" - -gUnknown_8454C68:: @ 8454C68 - .string "A mat designed with\n" - .string "a FIRE BLAST image.\n" - .string "Put items on top.$" - -gUnknown_8454CA2:: @ 8454CA2 - .string "A mat with a POWDER\n" - .string "SNOW image design.\n" - .string "Put items on top.$" - -gUnknown_8454CDB:: @ 8454CDB - .string "A mat designed with\n" - .string "an ATTRACT image.\n" - .string "Put items on top.$" - -gUnknown_8454D13:: @ 8454D13 - .string "A mat designed with\n" - .string "a FISSURE image.\n" - .string "Put items on top.$" - -gUnknown_8454D4A:: @ 8454D4A - .string "A mat designed with\n" - .string "a SPIKES image.\n" - .string "Put items on top.$" - -gUnknown_8454D80:: @ 8454D80 - .string "A small poster\n" - .string "printed with POKé\n" - .string "BALLS.$" - -gUnknown_8454DA8:: @ 8454DA8 - .string "A small poster with\n" - .string "a TREECKO print.$" - -gUnknown_8454DCD:: @ 8454DCD - .string "A small poster with\n" - .string "a TORCHIC print.$" - -gUnknown_8454DF2:: @ 8454DF2 - .string "A small poster with\n" - .string "a MUDKIP print.$" - -gUnknown_8454E16:: @ 8454E16 - .string "A small poster with\n" - .string "an AZURILL print.$" - -gUnknown_8454E3C:: @ 8454E3C - .string "A large poster with\n" - .string "a PIKACHU and\n" - .string "PICHU print.$" - -gUnknown_8454E6B:: @ 8454E6B - .string "A large poster with\n" - .string "a SEVIPER print.$" - -gUnknown_8454E90:: @ 8454E90 - .string "A large poster with\n" - .string "a RELICANTH print.$" - -gUnknown_8454EB7:: @ 8454EB7 - .string "A large poster with\n" - .string "a WINGULL print.$" - -gUnknown_8454EDC:: @ 8454EDC - .string "A large poster with\n" - .string "a SMOOCHUM print.$" - -gUnknown_8454F02:: @ 8454F02 - .string "A PICHU doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8454F2D:: @ 8454F2D - .string "A PIKACHU doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8454F5A:: @ 8454F5A - .string "A MARILL doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8454F86:: @ 8454F86 - .string "A TOGEPI doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8454FB2:: @ 8454FB2 - .string "A CYNDAQUIL doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8454FE1:: @ 8454FE1 - .string "A CHIKORITA doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455010:: @ 8455010 - .string "A TOTODILE doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_845503E:: @ 845503E - .string "A JIGGLYPUFF doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_845506E:: @ 845506E - .string "A MEOWTH doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_845509A:: @ 845509A - .string "A CLEFAIRY doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84550C8:: @ 84550C8 - .string "A DITTO doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84550F3:: @ 84550F3 - .string "A SMOOCHUM doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455121:: @ 8455121 - .string "A TREECKO doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_845514E:: @ 845514E - .string "A TORCHIC doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_845517B:: @ 845517B - .string "A MUDKIP doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84551A7:: @ 84551A7 - .string "A DUSKULL doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84551D4:: @ 84551D4 - .string "A WYNAUT doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455200:: @ 8455200 - .string "A BALTOY doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_845522C:: @ 845522C - .string "A KECLEON doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455259:: @ 8455259 - .string "An AZURILL doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455287:: @ 8455287 - .string "A SKITTY doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84552B3:: @ 84552B3 - .string "A SWABLU doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84552DF:: @ 84552DF - .string "A GULPIN doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_845530B:: @ 845530B - .string "A LOTAD doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455336:: @ 8455336 - .string "A SEEDOT doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455362:: @ 8455362 - .string "A PIKACHU cushion.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455392:: @ 8455392 - .string "A MARILL cushion.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84553C1:: @ 84553C1 - .string "A SMOOCHUM\n" - .string "cushion. Place it on\n" - .string "a mat or a desk.$" - -gUnknown_84553F2:: @ 84553F2 - .string "A ZIGZAGOON\n" - .string "cushion. Place it on\n" - .string "a mat or a desk.$" - -gUnknown_8455424:: @ 8455424 - .string "A SPINDA cushion.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455453:: @ 8455453 - .string "A SABLEYE cushion.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455483:: @ 8455483 - .string "A BALL cushion.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84554B0:: @ 84554B0 - .string "A grass-mark\n" - .string "cushion. Place it on\n" - .string "a mat or a desk.$" - -gUnknown_84554E3:: @ 84554E3 - .string "A fire-mark\n" - .string "cushion. Place it on\n" - .string "a mat or a desk.$" - -gUnknown_8455515:: @ 8455515 - .string "A water-mark\n" - .string "cushion. Place it on\n" - .string "a mat or a desk.$" - -gUnknown_8455548:: @ 8455548 - .string "A large doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455573:: @ 8455573 - .string "A large doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_845559E:: @ 845559E - .string "A large doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84555C9:: @ 84555C9 - .string "A large doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84555F4:: @ 84555F4 - .string "A large doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_845561F:: @ 845561F - .string "A large doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_845564A:: @ 845564A - .string "A large doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455675:: @ 8455675 - .string "A large doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84556A0:: @ 84556A0 - .string "A large doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84556CB:: @ 84556CB - .string "A large doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" diff --git a/graphics/intro/unk_8402650.png b/graphics/intro/unk_8402650.png Binary files differindex 1ed1b6dc5..6dd63c6d6 100644 --- a/graphics/intro/unk_8402650.png +++ b/graphics/intro/unk_8402650.png diff --git a/graphics/intro/unk_840272C.png b/graphics/intro/unk_840272C.png Binary files differindex d84885c6a..6dbf123e3 100644 --- a/graphics/intro/unk_840272C.png +++ b/graphics/intro/unk_840272C.png diff --git a/graphics/intro/unk_84028F8.bin b/graphics/intro/unk_84028F8.bin Binary files differdeleted file mode 100644 index 70782b718..000000000 --- a/graphics/intro/unk_84028F8.bin +++ /dev/null diff --git a/graphics/intro/unk_84028F8.png b/graphics/intro/unk_84028F8.png Binary files differnew file mode 100644 index 000000000..99131c4ef --- /dev/null +++ b/graphics/intro/unk_84028F8.png diff --git a/graphics/intro/unk_8402B2C.png b/graphics/intro/unk_8402B2C.png Binary files differindex 791cb0e47..a0fcfd7b6 100644 --- a/graphics/intro/unk_8402B2C.png +++ b/graphics/intro/unk_8402B2C.png diff --git a/graphics/intro/unk_8402CD4.png b/graphics/intro/unk_8402CD4.png Binary files differindex 9e19b576c..7f631f8ec 100644 --- a/graphics/intro/unk_8402CD4.png +++ b/graphics/intro/unk_8402CD4.png diff --git a/graphics/intro/unk_8402D54.png b/graphics/intro/unk_8402D54.png Binary files differindex 0f487f0bd..425963af2 100644 --- a/graphics/intro/unk_8402D54.png +++ b/graphics/intro/unk_8402D54.png diff --git a/graphics/intro/unk_84048EC.png b/graphics/intro/unk_84048EC.png Binary files differindex 577f1926d..0665222d5 100644 --- a/graphics/intro/unk_84048EC.png +++ b/graphics/intro/unk_84048EC.png diff --git a/graphics/intro/unk_8405414.png b/graphics/intro/unk_8405414.png Binary files differindex 254ec3b06..a0b3df803 100644 --- a/graphics/intro/unk_8405414.png +++ b/graphics/intro/unk_8405414.png diff --git a/graphics/intro/unk_8405B28.png b/graphics/intro/unk_8405B28.png Binary files differindex 45400d46d..dce86264f 100644 --- a/graphics/intro/unk_8405B28.png +++ b/graphics/intro/unk_8405B28.png diff --git a/graphics/intro/unk_8406654.png b/graphics/intro/unk_8406654.png Binary files differindex 4c6c06681..b800c9a24 100644 --- a/graphics/intro/unk_8406654.png +++ b/graphics/intro/unk_8406654.png diff --git a/graphics/intro/unk_8407470.png b/graphics/intro/unk_8407470.png Binary files differindex 809c259bf..8ba8577ac 100644 --- a/graphics/intro/unk_8407470.png +++ b/graphics/intro/unk_8407470.png diff --git a/graphics/intro/unk_840926C.png b/graphics/intro/unk_840926C.png Binary files differindex 80cc52d52..319206e2c 100644 --- a/graphics/intro/unk_840926C.png +++ b/graphics/intro/unk_840926C.png diff --git a/graphics/intro/unk_84096CC.png b/graphics/intro/unk_84096CC.png Binary files differindex 75aacced4..7b490a384 100644 --- a/graphics/intro/unk_84096CC.png +++ b/graphics/intro/unk_84096CC.png diff --git a/graphics/intro/unk_8409A3C.png b/graphics/intro/unk_8409A3C.png Binary files differindex 01ed028f8..751cf1f3d 100644 --- a/graphics/intro/unk_8409A3C.png +++ b/graphics/intro/unk_8409A3C.png diff --git a/graphics/intro/unk_8409D20.png b/graphics/intro/unk_8409D20.png Binary files differindex 11f299cfd..9a1305311 100644 --- a/graphics/intro/unk_8409D20.png +++ b/graphics/intro/unk_8409D20.png diff --git a/graphics/intro/unk_840A3E4.png b/graphics/intro/unk_840A3E4.png Binary files differindex 7b91a5bb4..7d2f0ff2e 100644 --- a/graphics/intro/unk_840A3E4.png +++ b/graphics/intro/unk_840A3E4.png diff --git a/graphics/intro/unk_840B874.png b/graphics/intro/unk_840B874.png Binary files differindex b8877f079..a990a99f0 100644 --- a/graphics/intro/unk_840B874.png +++ b/graphics/intro/unk_840B874.png diff --git a/graphics/intro/unk_840BAE0.png b/graphics/intro/unk_840BAE0.png Binary files differindex bf5578cae..4fd9d0fbf 100644 --- a/graphics/intro/unk_840BAE0.png +++ b/graphics/intro/unk_840BAE0.png diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 8c26e9a7d..4b1d9e996 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -26,6 +26,7 @@ ITEMPCGFXDIR := graphics/item_pc TITLESCREENGFXDIR := graphics/title_screen CREDITSGFXDIR := graphics/credits ITEMMENUGFXDIR := graphics/item_menu +INTROGFXDIR := graphics/intro types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough @@ -534,3 +535,12 @@ graphics/misc/emoticons.4bpp: %.4bpp: %.png $(ITEMMENUGFXDIR)/bag_tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 55 + +$(INTROGFXDIR)/unk_8402D54.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 397 + +$(INTROGFXDIR)/unk_8406654.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 170 + +$(INTROGFXDIR)/unk_8405B28.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 17 diff --git a/include/battle_anim.h b/include/battle_anim.h index f568d0f97..c8704707b 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -412,9 +412,9 @@ void TrySetSpriteRotScale(struct Sprite *sprite, bool8 recalcCenterVector, s16 x void sub_8075AD8(struct Sprite *sprite); u16 ArcTan2Neg(s16 a, s16 b); void SetGreyscaleOrOriginalPalette(u16 paletteNum, bool8 restoreOriginalColor); -u32 sub_8075BE8(u8 battleBackground, u8 attacker, u8 target, u8 attackerPartner, u8 targetPartner, u8 a6, u8 a7); -u32 sub_8075CB8(u8 a1, u8 a2, u8 a3, u8 a4); -u8 sub_8075D80(u8 a1); +u32 SelectBattleAnimSpriteAndBgPalettes(bool8 battleBackground, bool8 attacker, bool8 target, bool8 attackerPartner, bool8 targetPartner, bool8 a6, bool8 a7); +u32 SelectBattlerSpritePalettes(bool8 playerLeft, bool8 playerRight, bool8 foeLeft, bool8 foeRight); +u8 GetSpritePalIdxByBattler(u8 a1); void AnimSpriteOnMonPos(struct Sprite *sprite); void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite); void AnimThrowProjectile(struct Sprite *sprite); @@ -468,7 +468,7 @@ void sub_8099BD4(u8 taskId); extern const struct SpriteTemplate gUnknown_83E7C98; extern const struct SpriteTemplate gBasicHitSplatSpriteTemplate; u32 UnpackSelectedBattleAnimPalettes(s16 selector); -void sub_80B9BDC(u8 taskId); +void AnimTask_CurseBlendEffect(u8 taskId); void sub_80B9CE4(u8 taskId); void sub_80B9E58(u8 taskId); void sub_80B9F6C(u8 taskId); @@ -561,13 +561,13 @@ void AnimWaterPulseRing(struct Sprite *sprite); u8 SmokescreenImpact(s16 x, s16 y, u8 a3); // battle_anim_utility_funcs.c -void sub_80BA7F8(u8 taskId); -void sub_80BA83C(u8 taskId); +void AnimTask_BlendSelected(u8 taskId); +void AnimTask_BlendExcept(u8 taskId); void AnimTask_SetCamouflageBlend(u8 taskId); void AnimTask_BlendParticle(u8 taskId); -void sub_80BAB38(u8 taskId); -void sub_80BAB98(u8 taskId); -void sub_80BACEC(u8 taskId); +void AnimTask_HardwarePaletteFade(u8 taskId); +void AnimTask_CloneBattlerSpriteWithBlend(u8 taskId); +void AnimTask_SetUpCurseBackground(u8 taskId); void sub_80BB088(u8 taskId); void sub_80BB660(u8 taskId); void sub_80BB7DC(u8 taskId); diff --git a/include/bike.h b/include/bike.h index abffae435..e4f94becb 100644 --- a/include/bike.h +++ b/include/bike.h @@ -25,8 +25,8 @@ enum ACRO_STATE_TURN_JUMP, }; -void sub_80BD620(u32 directionHistory, u32 abStartSelectHistory); -bool8 sub_80BD540(void); +void InitPlayerAvatarBikeState(u32 directionHistory, u32 abStartSelectHistory); +bool8 MetatileAtPlayerPositionForbidsBiking(void); void StartTransitionToFlipBikeState(u8 flags); s16 GetPlayerSpeed(void); bool8 sub_80BD460(u8); diff --git a/include/constants/flags.h b/include/constants/flags.h index 212718bc9..d7b4195e2 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1437,7 +1437,7 @@ // SPECIAL FLAGS (unknown purpose) #define SPECIAL_FLAGS_START 0x4000 #define SPECIAL_FLAGS_COUNT 16 -#define FLAG_SPECIAL_FLAG_0x4000 0x4000 +#define FLAG_DONT_SHOW_MAP_NAME_POPUP 0x4000 #define FLAG_DONT_TRANSITION_MUSIC 0x4001 #define FLAG_SPECIAL_FLAG_0x4002 0x4002 #define FLAG_SPECIAL_FLAG_0x4003 0x4003 diff --git a/include/decoration.h b/include/decoration.h new file mode 100644 index 000000000..fadb2a3c8 --- /dev/null +++ b/include/decoration.h @@ -0,0 +1,55 @@ +#ifndef GUARD_DECORATION_H +#define GUARD_DECORATION_H + +enum DecorationPermission +{ + /* + * The nomenclature here describes collision and placement permissions, in that order. + */ + DECORPERM_SOLID_FLOOR, + DECORPERM_PASS_FLOOR, + DECORPERM_BEHIND_FLOOR, + DECORPERM_NA_WALL, + DECORPERM_SPRITE, +}; + +enum DecorationShape +{ + DECORSHAPE_1x1, + DECORSHAPE_2x1, + DECORSHAPE_3x1, // unused + DECORSHAPE_4x2, + DECORSHAPE_2x2, + DECORSHAPE_1x2, + DECORSHAPE_1x3, // unused + DECORSHAPE_2x4, + DECORSHAPE_3x3, + DECORSHAPE_3x2, +}; + +enum DecorationCategory +{ + DECORCAT_DESK, + DECORCAT_CHAIR, + DECORCAT_PLANT, + DECORCAT_ORNAMENT, + DECORCAT_MAT, + DECORCAT_POSTER, + DECORCAT_DOLL, + DECORCAT_CUSHION, + DECORCAT_COUNT, +}; + +struct Decoration +{ + u8 id; + u8 name[16]; + u8 permission; + u8 shape; + u8 category; + u16 price; + const u8 *description; + const u16 *tiles; +}; + +#endif //GUARD_DECORATION_H diff --git a/include/event_scripts.h b/include/event_scripts.h index a1bb5e35d..0f076ed28 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1254,7 +1254,7 @@ extern const u8 EventScript_CurrentTooFast[]; extern const u8 EventScript_UseSurf[]; extern const u8 EventScript_Waterfall[]; extern const u8 EventScript_CantUseWaterfall[]; -extern const u8 gUnknown_81A8CED[]; +extern const u8 EventScript_VsSeekerChargingDone[]; extern const u8 EventScript_FieldPoison[]; extern const u8 EventScript_EggHatch[]; extern const u8 EventScript_1C1361[]; diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 79e6c2aef..df9084eab 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -15,7 +15,7 @@ void MovePlayerNotOnBike(u8 direction, u16 heldKeys); void MovementType_Player(struct Sprite * sprite); void sub_805C270(void); -void sub_805C780(void); +void StopPlayerAvatar(void); void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr); u8 GetPlayerAvatarGraphicsIdByStateId(u8); void SetPlayerAvatarStateMask(u8 mask); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index cd553a55a..5fa15b95a 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -333,6 +333,7 @@ enum COLLISION_ISOLATED_HORIZONTAL_RAIL, COLLISION_VERTICAL_RAIL, COLLISION_HORIZONTAL_RAIL, + COLLISION_COUNT }; // player running states diff --git a/include/intro.h b/include/intro.h index 19cdcd032..1630b845e 100644 --- a/include/intro.h +++ b/include/intro.h @@ -1,7 +1,7 @@ #ifndef GUARD_INTRO_H #define GUARD_INTRO_H -void sub_80EC864(void); +void CB2_CopyrightScreen(void); void c2_copyright_1(void); #endif //GUARD_INTRO_H diff --git a/include/link.h b/include/link.h index d6f35f66d..899f0cb03 100644 --- a/include/link.h +++ b/include/link.h @@ -79,8 +79,8 @@ #define LINKTYPE_BATTLE_TOWER 0x2288 #define LINKTYPE_0x3311 0x3311 #define LINKTYPE_0x3322 0x3322 -#define LINKTYPE_0x4411 0x4411 -#define LINKTYPE_0x6601 0x6601 +#define LINKTYPE_BERRY_BLENDER_SETUP 0x4411 +#define LINKTYPE_CONTEST_GMODE 0x6601 #define MASTER_HANDSHAKE 0x8FFF #define SLAVE_HANDSHAKE 0xB9A0 diff --git a/include/menu_helpers.h b/include/menu_helpers.h index d26f50483..fda77d1b6 100644 --- a/include/menu_helpers.h +++ b/include/menu_helpers.h @@ -15,7 +15,7 @@ struct YesNoFuncTable }; bool16 RunTextPrinters_CheckActive(u8 textPrinterId); -bool32 sub_80BF72C(void); +bool32 MenuHelpers_CallLinkSomething(void); bool8 sub_80BF748(void); bool8 MenuHelpers_LinkSomething(void); void SetVBlankHBlankCallbacksToNull(void); diff --git a/include/overworld.h b/include/overworld.h index 5f3728dec..f5cb1987e 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -81,7 +81,7 @@ void SetWarpDestinationToEscapeWarp(void); void SetWarpDestinationToLastHealLocation(void); u8 IsMapTypeOutdoors(u8 mapType); void Overworld_ClearSavedMusic(void); -bool32 sub_8056124(u16 song); +bool32 Overworld_MusicCanOverrideMapMusic(u16 song); void player_avatar_init_params_reset(void); @@ -146,7 +146,7 @@ bool8 BGMusicStopped(void); bool8 IsMapTypeIndoors(u8 mapType); bool32 Overworld_IsBikingAllowed(void); void Overworld_ResetStateAfterDigEscRope(void); -bool32 sub_8058244(void); +bool32 Overworld_LinkRecvQueueLengthMoreThan2(void); u8 GetCurrentMapType(void); u8 GetLastUsedWarpMapType(void); diff --git a/include/quest_log.h b/include/quest_log.h index 54da8822a..090d0daf6 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -9,7 +9,7 @@ extern u8 gQuestLogState; extern u8 gUnknown_3005E88; extern const u16 gUnknown_84566A8[]; -extern struct FieldInput gUnknown_3005E90; +extern struct FieldInput gQuestLogFieldInput; void sub_8112720(u8); void SetQuestLogEvent(u16, const u16 *); @@ -27,8 +27,8 @@ void sub_8111CF0(void); void ResetQuestLog(void); void ResetTrainerFanClub(void); void TrySetUpQuestLogScenes_ElseContinueFromSave(u8 taskId); -void sub_8112450(void); -void sub_8112364(void); +void SaveQuestLogData(void); +void QuestLog_OnInteractionWithSpecialNpc(void); u8 sub_8112CAC(void); void sub_81138F8(void); void sub_811231C(void); diff --git a/include/save_location.h b/include/save_location.h index c8e362231..2d2cb1974 100644 --- a/include/save_location.h +++ b/include/save_location.h @@ -10,7 +10,7 @@ void TrySetMapSaveWarpStatus(void); bool32 IsCurMapPokeCenter(void); -void sub_810B810(void); -void sub_810B82C(void); +void SetUnlockedPokedexFlags(void); +void SetPostgameFlags(void); #endif // GUARD_SAVE_LOCATION_H diff --git a/include/script.h b/include/script.h index a37909137..ba1de4f1c 100644 --- a/include/script.h +++ b/include/script.h @@ -78,7 +78,7 @@ u8 GetRegisteredQuestLogInput(void); void ResetFacingNpcOrSignPostVars(void); bool8 CanWalkAwayToCancelMsgBox(void); void SetWalkingIntoSignVars(void); -bool8 sub_80699D4(void); +bool8 IsMsgBoxWalkawayDisabled(void); extern const u8 *gRAMScriptPtr; extern u8 gWalkAwayFromSignInhibitTimer; diff --git a/include/strings.h b/include/strings.h index eb6a47ce7..6979f6757 100644 --- a/include/strings.h +++ b/include/strings.h @@ -916,7 +916,7 @@ extern const u8 gText_GiveUpTryingToTeachNewMove[]; extern const u8 gText_DecimalPoint[]; // map_name_popup -extern const u8 gUnknown_841D18D[]; +extern const u8 gText_Rooftop2[]; // option menu extern const u8 gText_TextSpeed[]; diff --git a/include/vs_seeker.h b/include/vs_seeker.h index 8c3b86194..6668cc6b4 100644 --- a/include/vs_seeker.h +++ b/include/vs_seeker.h @@ -3,18 +3,14 @@ #include "global.h" -void sub_810C604(void); -void sub_810C640(void); - void Task_VsSeeker_0(u8 taskId); void sub_810CB90(void); void sub_810CDE8(void); int GetRematchTrainerId(u16 a0); bool8 sub_810CF04(u8 a0); -u8 sub_810CF54(); void sub_810D0D0(void); void sub_810CB90(void); -bool8 sub_810C4EC(void); +bool8 UpdateVsSeekerStepCounter(void); void TryUpdateRandomTrainerRematches(u16 mapGroup, u16 mapNum); #endif //GUARD_VS_SEEKER_H diff --git a/ld_script.txt b/ld_script.txt index ecea5f2dd..7eea55ec7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -546,7 +546,7 @@ SECTIONS { src/vs_seeker.o(.rodata); src/item_pc.o(.rodata); src/mailbox_pc.o(.rodata); - data/decorations.o(.rodata); + src/decoration.o(.rodata); src/menu.o(.rodata); src/quest_log.o(.rodata); src/union_room.o(.rodata); diff --git a/src/AgbRfu_LinkManager.c b/src/AgbRfu_LinkManager.c index e4127ee09..35ac45d5f 100644 --- a/src/AgbRfu_LinkManager.c +++ b/src/AgbRfu_LinkManager.c @@ -1,6 +1,6 @@ #include "global.h" #include "librfu.h" -#include "link_rfu.h" +#include "AgbRfu_LinkManager.h" #define RN_ACCEPT 0x01 #define RN_NAME_TIMER_CLEAR 0x02 @@ -1,8 +1,6 @@ #include "global.h" -#include "palette.h" +#include "gflib.h" #include "item_menu.h" -#include "text.h" -#include "window.h" #include "text_window.h" #include "menu_helpers.h" #include "new_menu_helpers.h" diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index a8bc439f4..877fba80a 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -4,7 +4,6 @@ #include "util.h" #include "item.h" #include "random.h" -#include "pokemon.h" #include "battle_ai_script_commands.h" #include "constants/species.h" #include "constants/abilities.h" diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index 5d642bda9..e689d2353 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -2,7 +2,6 @@ #include "battle.h" #include "battle_anim.h" #include "battle_controllers.h" -#include "pokemon.h" #include "random.h" #include "util.h" #include "constants/abilities.h" diff --git a/src/battle_anim.c b/src/battle_anim.c index 0cb88219a..1132b5725 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1,20 +1,13 @@ #include "global.h" +#include "gflib.h" #include "battle.h" #include "battle_anim.h" #include "battle_controllers.h" #include "battle_interface.h" #include "battle_bg.h" -#include "bg.h" #include "decompress.h" -#include "dma3.h" -#include "gpu_regs.h" #include "graphics.h" -#include "main.h" #include "m4a.h" -#include "palette.h" -#include "pokemon.h" -#include "sound.h" -#include "sprite.h" #include "task.h" #include "constants/battle_anim.h" @@ -1970,6 +1963,11 @@ static void ScriptCmd_unloadspritegfx(void) ClearSpriteIndex(GET_TRUE_SPRITE_INDEX(index)); } +// Create sprite from template and init data array with varargs +// args: template, flags, va_args +// flags: +// - bits 0-6: subpriority mod (signed) +// - bit 7: target if set else attacker static void ScriptCmd_createsprite(void) { s32 i; diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 33b5ceacc..d1f75ff8f 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -1,10 +1,8 @@ #include "global.h" +#include "gflib.h" #include "battle_anim.h" #include "battle_interface.h" -#include "gpu_regs.h" -#include "palette.h" #include "random.h" -#include "sound.h" #include "trig.h" #include "util.h" #include "constants/songs.h" @@ -4321,7 +4319,7 @@ static void AnimLockOnTargetStep4(struct Sprite* sprite) sprite->data[1] = 0; } - BlendPalettes(sub_8075BE8(1, 1, 1, 1, 1, 0, 0), sprite->data[1], RGB_WHITE); + BlendPalettes(SelectBattleAnimSpriteAndBgPalettes(1, 1, 1, 1, 1, 0, 0), sprite->data[1], RGB_WHITE); if (sprite->data[1] == 16) { int pal; @@ -4981,7 +4979,7 @@ void AnimTask_FadeScreenBlueStep(u8); void AnimTask_FadeScreenBlue(u8 taskId) { - int a = sub_8075BE8(1, 0, 0, 0, 0, 0, 0) & 0xFFFF; + int a = SelectBattleAnimSpriteAndBgPalettes(1, 0, 0, 0, 0, 0, 0) & 0xFFFF; int b; int c; int d; @@ -4996,7 +4994,7 @@ void AnimTask_FadeScreenBlue(u8 taskId) gTasks[taskId].data[7] = 13; gTasks[taskId].data[8] = 14; gTasks[taskId].data[9] = 15; - b = sub_8075CB8(1, 1, 1, 1); + b = SelectBattlerSpritePalettes(1, 1, 1, 1); c = a | b; StorePointerInVars(&gTasks[taskId].data[14], &gTasks[taskId].data[15], (void*)c); b = b | (0x10000 << IndexOfSpritePaletteTag(ANIM_TAG_MOON)); diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index 093660389..510b8eabb 100644 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -1,15 +1,12 @@ #include "global.h" -#include "malloc.h" +#include "gflib.h" #include "battle_anim.h" #include "battle_interface.h" #include "decompress.h" -#include "gpu_regs.h" #include "graphics.h" #include "math_util.h" -#include "palette.h" #include "random.h" #include "scanline_effect.h" -#include "sound.h" #include "trig.h" #include "util.h" #include "constants/songs.h" @@ -3090,7 +3087,7 @@ static void FakeOutStep2(u8 taskId) { gTasks[taskId].data[11] = 0x88; SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG3 | BLDCNT_EFFECT_LIGHTEN); - BlendPalettes(sub_8075BE8(1, 0, 0, 0, 0, 0, 0), 16, RGB_WHITE); + BlendPalettes(SelectBattleAnimSpriteAndBgPalettes(1, 0, 0, 0, 0, 0, 0), 16, RGB_WHITE); } else if (gTasks[taskId].data[10] > 4) { diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index 69bae2c6f..e9bfb2618 100644 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -1,19 +1,13 @@ #include "global.h" -#include "malloc.h" +#include "gflib.h" #include "battle.h" #include "battle_anim.h" -#include "bg.h" #include "data.h" #include "decompress.h" -#include "dma3.h" -#include "gpu_regs.h" #include "graphics.h" -#include "palette.h" #include "pokemon_icon.h" #include "random.h" #include "scanline_effect.h" -#include "sound.h" -#include "sprite.h" #include "task.h" #include "trig.h" #include "util.h" diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c index 7f3516670..8cc6c9a00 100644 --- a/src/battle_anim_mons.c +++ b/src/battle_anim_mons.c @@ -1,14 +1,9 @@ #include "global.h" +#include "gflib.h" #include "battle_anim.h" -#include "bg.h" #include "data.h" #include "decompress.h" -#include "dma3.h" -#include "gpu_regs.h" -#include "malloc.h" -#include "palette.h" #include "pokemon_icon.h" -#include "sprite.h" #include "task.h" #include "trig.h" #include "util.h" @@ -1240,7 +1235,7 @@ void SetGreyscaleOrOriginalPalette(u16 paletteNum, bool8 restoreOriginalColor) } } -u32 sub_8075BE8(u8 battleBackground, u8 attacker, u8 target, u8 attackerPartner, u8 targetPartner, u8 a6, u8 a7) +u32 SelectBattleAnimSpriteAndBgPalettes(bool8 battleBackground, bool8 attacker, bool8 target, bool8 attackerPartner, bool8 targetPartner, bool8 a6, bool8 a7) { u32 selectedPalettes = 0; u32 shift; @@ -1286,19 +1281,19 @@ u32 sub_8075BE8(u8 battleBackground, u8 attacker, u8 target, u8 attackerPartner, return selectedPalettes; } -u32 sub_8075CB8(u8 a1, u8 a2, u8 a3, u8 a4) +u32 SelectBattlerSpritePalettes(bool8 playerLeft, bool8 playerRight, bool8 foeLeft, bool8 foeRight) { u32 var = 0; u32 shift; - if (a1) + if (playerLeft) { if (IsBattlerSpriteVisible(GetBattlerAtPosition(B_POSITION_PLAYER_LEFT))) { var |= 1 << (GetBattlerAtPosition(B_POSITION_PLAYER_LEFT) + 16); } } - if (a2) + if (playerRight) { if (IsBattlerSpriteVisible(GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT))) { @@ -1306,7 +1301,7 @@ u32 sub_8075CB8(u8 a1, u8 a2, u8 a3, u8 a4) var |= 1 << shift; } } - if (a3) + if (foeLeft) { if (IsBattlerSpriteVisible(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT))) { @@ -1314,7 +1309,7 @@ u32 sub_8075CB8(u8 a1, u8 a2, u8 a3, u8 a4) var |= 1 << shift; } } - if (a4) + if (foeRight) { if (IsBattlerSpriteVisible(GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT))) { @@ -1325,13 +1320,13 @@ u32 sub_8075CB8(u8 a1, u8 a2, u8 a3, u8 a4) return var; } -u8 sub_8075D80(u8 a1) +u8 GetSpritePalIdxByBattler(u8 a1) { return a1; } // not used -static u8 GetBattlerAtPosition_(u8 position) +static u8 GetSpritePalIdxByPosition(u8 position) { return GetBattlerAtPosition(position); } diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c index f2740a1a5..a820667fb 100644 --- a/src/battle_anim_sound_tasks.c +++ b/src/battle_anim_sound_tasks.c @@ -1,7 +1,7 @@ #include "global.h" +#include "gflib.h" #include "battle.h" #include "battle_anim.h" -#include "sound.h" #include "task.h" #include "constants/battle_anim.h" #include "constants/species.h" diff --git a/src/battle_anim_special.c b/src/battle_anim_special.c index 7590c0e58..621ee9039 100644 --- a/src/battle_anim_special.c +++ b/src/battle_anim_special.c @@ -1,19 +1,14 @@ #include "global.h" +#include "gflib.h" #include "battle.h" #include "battle_anim.h" #include "battle_main.h" #include "battle_controllers.h" #include "battle_interface.h" #include "decompress.h" -#include "dma3.h" -#include "gpu_regs.h" #include "graphics.h" #include "m4a.h" -#include "main.h" -#include "palette.h" #include "pokeball.h" -#include "sound.h" -#include "sprite.h" #include "task.h" #include "trig.h" #include "util.h" @@ -666,7 +661,7 @@ void sub_80EF344(u8 taskId) priority = gSprites[spriteId].oam.priority; subpriority = gSprites[spriteId].subpriority; gTasks[taskId].data[10] = LaunchBallStarsTask(x, y + 32, priority, subpriority, ballId); - selectedPalettes = sub_8075BE8(1, 0, 0, 0, 0, 0, 0); + selectedPalettes = SelectBattleAnimSpriteAndBgPalettes(1, 0, 0, 0, 0, 0, 0); gTasks[taskId].data[11] = LaunchBallFadeMonTask(0, gBattleAnimAttacker, selectedPalettes, ballId); gTasks[taskId].data[0]++; break; diff --git a/src/battle_anim_status_effects.c b/src/battle_anim_status_effects.c index 2e7f30ff1..4eb475a5c 100644 --- a/src/battle_anim_status_effects.c +++ b/src/battle_anim_status_effects.c @@ -1,10 +1,8 @@ #include "global.h" +#include "gflib.h" #include "battle.h" #include "battle_anim.h" #include "decompress.h" -#include "gpu_regs.h" -#include "palette.h" -#include "sprite.h" #include "task.h" #include "trig.h" #include "util.h" diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index df4a8243b..a1897b94a 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -1,12 +1,8 @@ #include "global.h" +#include "gflib.h" #include "battle.h" #include "battle_anim.h" -#include "gpu_regs.h" #include "graphics.h" -#include "malloc.h" -#include "palette.h" -#include "sound.h" -#include "sprite.h" #include "task.h" #include "util.h" #include "constants/songs.h" @@ -22,9 +18,9 @@ struct AnimStatsChangeData static void StartBlendAnimSpriteColor(u8 taskId, u32 selectedPalettes); static void AnimTask_BlendSpriteColor_Step2(u8 taskId); -static void sub_80BAB78(u8 taskId); -static void sub_80BABD0(u8 taskId); -static void sub_80BACA8(struct Sprite *sprite); +static void Task_WaitHardwarePaletteFade(u8 taskId); +static void Task_DoCloneBattlerSpriteWithBlend(u8 taskId); +static void Task_FinishCloneBattlerSpriteWithBlend(struct Sprite *sprite); static void sub_80BAF38(u8 taskId); static void sub_80BB0D8(u8 taskId); static void sub_80BB2A0(u8 taskId); @@ -41,18 +37,42 @@ static const u16 gUnknown_83E7CC8[] = { RGB(31, 31, 31) }; const u8 gUnknown_83E7CCA[] = { REG_OFFSET_BG0CNT, REG_OFFSET_BG1CNT, REG_OFFSET_BG2CNT, REG_OFFSET_BG3CNT }; const u8 gUnknown_83E7CCE[] = { REG_OFFSET_BG0CNT, REG_OFFSET_BG1CNT, REG_OFFSET_BG2CNT, REG_OFFSET_BG3CNT }; -void sub_80BA7F8(u8 taskId) +// gBattleAnimArgs[0] is a bitfield. +// Bits 0-10 result in the following palettes being selected: +// 0: battle background palettes (BG palettes 1, 2, and 3) +// 1: gBattleAnimAttacker OBJ palette +// 2: gBattleAnimTarget OBJ palette +// 3: gBattleAnimAttacker partner OBJ palette +// 4: gBattleAnimTarget partner OBJ palette +// 5: BG palette 4 +// 6: BG palette 5 +// 7: Player battler left +// 8: Player battler right +// 9: Enemy battler left +// 10: Enemy battler right +void AnimTask_BlendSelected(u8 taskId) { u32 selectedPalettes = UnpackSelectedBattleAnimPalettes(gBattleAnimArgs[0]); - selectedPalettes |= sub_8075CB8((gBattleAnimArgs[0] >> 7) & 1, - (gBattleAnimArgs[0] >> 8) & 1, - (gBattleAnimArgs[0] >> 9) & 1, - (gBattleAnimArgs[0] >> 10) & 1); + selectedPalettes |= SelectBattlerSpritePalettes( + (gBattleAnimArgs[0] >> 7) & 1, + (gBattleAnimArgs[0] >> 8) & 1, + (gBattleAnimArgs[0] >> 9) & 1, + (gBattleAnimArgs[0] >> 10) & 1); StartBlendAnimSpriteColor(taskId, selectedPalettes); } -void sub_80BA83C(u8 taskId) +// gBattleAnimArgs[0] is a command ID +// This command will blend bg and battlers except as commanded: +// 0: Not attacker +// 1: Not target +// 2: Not attacker nor bg +// 3: Not target nor bg +// 4: Neither attacker nor target +// 5: Blend all +// 6: Neither bg nor attacker's partner +// 7: Neither bg nor target's partner +void AnimTask_BlendExcept(u8 taskId) { u8 battler; u32 selectedPalettes; @@ -95,7 +115,7 @@ void sub_80BA83C(u8 taskId) if (battler != animBattlers[0] && battler != animBattlers[1] && IsBattlerSpriteVisible(battler)) - selectedPalettes |= 0x10000 << sub_8075D80(battler); + selectedPalettes |= 0x10000 << GetSpritePalIdxByBattler(battler); } StartBlendAnimSpriteColor(taskId, selectedPalettes); } @@ -190,23 +210,23 @@ static void AnimTask_BlendSpriteColor_Step2(u8 taskId) } } -void sub_80BAB38(u8 taskId) +void AnimTask_HardwarePaletteFade(u8 taskId) { BeginHardwarePaletteFade(gBattleAnimArgs[0], gBattleAnimArgs[1], gBattleAnimArgs[2], gBattleAnimArgs[3], gBattleAnimArgs[4]); - gTasks[taskId].func = sub_80BAB78; + gTasks[taskId].func = Task_WaitHardwarePaletteFade; } -static void sub_80BAB78(u8 taskId) +static void Task_WaitHardwarePaletteFade(u8 taskId) { if (!gPaletteFade.active) DestroyAnimVisualTask(taskId); } -void sub_80BAB98(u8 taskId) +void AnimTask_CloneBattlerSpriteWithBlend(u8 taskId) { struct Task *task = &gTasks[taskId]; @@ -216,9 +236,9 @@ void sub_80BAB98(u8 taskId) task->data[3] = gBattleAnimArgs[2]; task->data[4] = gBattleAnimArgs[3]; task->data[5] = 0; - task->func = sub_80BABD0; + task->func = Task_DoCloneBattlerSpriteWithBlend; } -static void sub_80BABD0(u8 taskId) +static void Task_DoCloneBattlerSpriteWithBlend(u8 taskId) { struct Task *task = &gTasks[taskId]; @@ -237,7 +257,7 @@ static void sub_80BABD0(u8 taskId) gSprites[task->data[6]].data[0] = task->data[3]; gSprites[task->data[6]].data[1] = taskId; gSprites[task->data[6]].data[2] = 5; - gSprites[task->data[6]].callback = sub_80BACA8; + gSprites[task->data[6]].callback = Task_FinishCloneBattlerSpriteWithBlend; ++task->data[5]; } --task->data[4]; @@ -250,7 +270,7 @@ static void sub_80BABD0(u8 taskId) } } -static void sub_80BACA8(struct Sprite *sprite) +static void Task_FinishCloneBattlerSpriteWithBlend(struct Sprite *sprite) { if (sprite->data[0]) { @@ -263,7 +283,7 @@ static void sub_80BACA8(struct Sprite *sprite) } } -void sub_80BACEC(u8 taskId) +void AnimTask_SetUpCurseBackground(u8 taskId) { u16 species; s32 newSpriteId; @@ -559,11 +579,11 @@ static void sub_80BB4B8(u8 taskId) void sub_80BB660(u8 taskId) { - u32 selectedPalettes = sub_8075CB8(1, 1, 1, 1); + u32 selectedPalettes = SelectBattlerSpritePalettes(1, 1, 1, 1); sub_80BB790(selectedPalettes, 0); gTasks[taskId].data[14] = selectedPalettes >> 16; - selectedPalettes = sub_8075BE8(1, 0, 0, 0, 0, 0, 0) & 0xFFFF; + selectedPalettes = SelectBattleAnimSpriteAndBgPalettes(1, 0, 0, 0, 0, 0, 0) & 0xFFFF; sub_80BB790(selectedPalettes, 0xFFFF); gTasks[taskId].data[15] = selectedPalettes; gTasks[taskId].data[0] = 0; @@ -835,7 +855,7 @@ void sub_80BBE6C(u8 taskId) s32 paletteIndex = 0; if (gBattleAnimArgs[0] == 0) - for (selectedPalettes = sub_8075BE8(1, 0, 0, 0, 0, 0, 0); + for (selectedPalettes = SelectBattleAnimSpriteAndBgPalettes(1, 0, 0, 0, 0, 0, 0); (selectedPalettes & 1) == 0; ++paletteIndex) selectedPalettes >>= 1; @@ -853,7 +873,7 @@ void sub_80BBF08(u8 taskId) s32 paletteIndex = 0; if (gBattleAnimArgs[0] == 0) - for (selectedPalettes = sub_8075BE8(1, 0, 0, 0, 0, 0, 0); + for (selectedPalettes = SelectBattleAnimSpriteAndBgPalettes(1, 0, 0, 0, 0, 0, 0); (selectedPalettes & 1) == 0; ++paletteIndex) selectedPalettes >>= 1; @@ -871,7 +891,7 @@ void sub_80BBFA4(u8 taskId) s32 paletteIndex = 0; if (gBattleAnimArgs[0] == 0) - for (selectedPalettes = sub_8075BE8(1, 0, 0, 0, 0, 0, 0); + for (selectedPalettes = SelectBattleAnimSpriteAndBgPalettes(1, 0, 0, 0, 0, 0, 0); (selectedPalettes & 1) == 0; ++paletteIndex) selectedPalettes >>= 1; diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index a80e79bf4..90080b88e 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -1,14 +1,10 @@ #include "global.h" +#include "gflib.h" #include "data.h" #include "link.h" #include "m4a.h" -#include "palette.h" #include "pokeball.h" -#include "pokemon.h" -#include "sound.h" -#include "string_util.h" #include "task.h" -#include "text.h" #include "util.h" #include "battle.h" #include "battle_anim.h" diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 5ac4f1abc..fdac017c8 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -1,13 +1,9 @@ #include "global.h" +#include "gflib.h" #include "data.h" #include "link.h" -#include "palette.h" #include "pokeball.h" -#include "pokemon.h" -#include "sound.h" -#include "string_util.h" #include "task.h" -#include "text.h" #include "util.h" #include "battle.h" #include "battle_anim.h" diff --git a/src/battle_controller_oak_old_man.c b/src/battle_controller_oak_old_man.c index 0807018a2..97a167fe3 100644 --- a/src/battle_controller_oak_old_man.c +++ b/src/battle_controller_oak_old_man.c @@ -1,21 +1,14 @@ #include "global.h" +#include "gflib.h" #include "task.h" -#include "pokemon.h" #include "pokeball.h" #include "party_menu.h" -#include "bg.h" -#include "data.h" -#include "palette.h" #include "util.h" #include "m4a.h" #include "link.h" -#include "sound.h" #include "item.h" #include "item_menu.h" -#include "text.h" #include "strings.h" -#include "string_util.h" -#include "window.h" #include "battle.h" #include "battle_anim.h" #include "battle_controllers.h" diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 26e35ae65..b7522c0de 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -1,15 +1,11 @@ #include "global.h" +#include "gflib.h" #include "data.h" -#include "main.h" #include "m4a.h" #include "task.h" -#include "text.h" #include "util.h" #include "pokeball.h" -#include "pokemon.h" #include "random.h" -#include "sound.h" -#include "string_util.h" #include "battle.h" #include "battle_anim.h" #include "battle_controllers.h" diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index b28249a97..97e833ffd 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1,23 +1,16 @@ #include "global.h" -#include "bg.h" +#include "gflib.h" #include "data.h" #include "item.h" #include "item_menu.h" #include "link.h" -#include "main.h" #include "m4a.h" -#include "palette.h" #include "party_menu.h" #include "pokeball.h" -#include "pokemon.h" -#include "sound.h" #include "strings.h" -#include "string_util.h" #include "pokemon_special_anim.h" #include "task.h" -#include "text.h" #include "util.h" -#include "window.h" #include "battle.h" #include "battle_anim.h" #include "battle_controllers.h" diff --git a/src/battle_controller_pokedude.c b/src/battle_controller_pokedude.c index a6b3fe994..2489c2d95 100644 --- a/src/battle_controller_pokedude.c +++ b/src/battle_controller_pokedude.c @@ -1,21 +1,15 @@ #include "global.h" +#include "gflib.h" #include "task.h" -#include "pokemon.h" #include "party_menu.h" #include "pokeball.h" -#include "bg.h" #include "data.h" -#include "palette.h" #include "util.h" #include "m4a.h" #include "link.h" -#include "sound.h" #include "event_data.h" #include "item_menu.h" -#include "text.h" #include "strings.h" -#include "string_util.h" -#include "window.h" #include "battle.h" #include "battle_anim.h" #include "battle_controllers.h" diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index 28ed4091e..e15d76deb 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -1,19 +1,15 @@ #include "global.h" +#include "gflib.h" #include "battle.h" #include "battle_anim.h" #include "battle_controllers.h" #include "battle_interface.h" #include "battle_message.h" -#include "bg.h" #include "data.h" #include "item_menu.h" #include "link.h" #include "main.h" -#include "palette.h" #include "pokeball.h" -#include "pokemon.h" -#include "sound.h" -#include "text.h" #include "util.h" #include "strings.h" #include "constants/songs.h" diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 834b9e6b6..d06d09012 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -10,7 +10,6 @@ #include "link_rfu.h" #include "cable_club.h" #include "party_menu.h" -#include "pokemon.h" #include "task.h" #include "util.h" #include "constants/abilities.h" diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 127b0903b..45188d022 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -1,10 +1,8 @@ #include "global.h" -#include "main.h" +#include "gflib.h" #include "m4a.h" #include "task.h" -#include "malloc.h" #include "graphics.h" -#include "sound.h" #include "decompress.h" #include "palette.h" #include "sprite.h" diff --git a/src/battle_interface.c b/src/battle_interface.c index e5145adc0..107999045 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1,19 +1,14 @@ #include "global.h" +#include "gflib.h" #include "battle_anim.h" #include "battle_interface.h" #include "battle_message.h" #include "decompress.h" -#include "gpu_regs.h" #include "graphics.h" #include "menu.h" -#include "palette.h" #include "pokedex.h" #include "pokemon_summary_screen.h" #include "safari_zone.h" -#include "sound.h" -#include "string_util.h" -#include "text.h" -#include "window.h" #include "constants/songs.h" #define GetStringRightAlignXOffset(fontId, string, destWidth) ({ \ diff --git a/src/battle_intro.c b/src/battle_intro.c index 93141f2ca..25fdbafda 100644 --- a/src/battle_intro.c +++ b/src/battle_intro.c @@ -1,10 +1,8 @@ #include "global.h" +#include "gflib.h" #include "battle.h" #include "battle_anim.h" #include "battle_setup.h" -#include "bg.h" -#include "gpu_regs.h" -#include "main.h" #include "scanline_effect.h" #include "task.h" #include "trig.h" diff --git a/src/battle_main.c b/src/battle_main.c index bbfcf5cf9..d2735086f 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1,4 +1,5 @@ #include "global.h" +#include "gflib.h" #include "battle.h" #include "battle_anim.h" #include "battle_ai_script_commands.h" @@ -10,40 +11,29 @@ #include "battle_setup.h" #include "battle_string_ids.h" #include "berry.h" -#include "bg.h" #include "data.h" #include "decompress.h" #include "event_data.h" #include "evolution_scene.h" #include "graphics.h" -#include "gpu_regs.h" #include "help_system.h" #include "item.h" #include "link.h" #include "link_rfu.h" #include "load_save.h" -#include "main.h" -#include "malloc.h" #include "m4a.h" -#include "palette.h" #include "party_menu.h" #include "pokeball.h" #include "pokedex.h" -#include "pokemon.h" #include "quest_log.h" #include "random.h" #include "roamer.h" #include "safari_zone.h" #include "scanline_effect.h" -#include "sound.h" -#include "sprite.h" -#include "string_util.h" #include "task.h" -#include "text.h" #include "trig.h" #include "vs_seeker.h" #include "util.h" -#include "window.h" #include "constants/abilities.h" #include "constants/battle_move_effects.h" #include "constants/battle_setup.h" diff --git a/src/battle_message.c b/src/battle_message.c index 7ca47e6fb..e17d3241b 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1,11 +1,8 @@ #include "global.h" +#include "gflib.h" #include "battle_string_ids.h" #include "battle.h" -#include "palette.h" #include "battle_anim.h" -#include "string_util.h" -#include "text.h" -#include "window.h" #include "strings.h" #include "battle_message.h" #include "link.h" diff --git a/src/battle_records.c b/src/battle_records.c index 3196d9bad..7d9ddffe4 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -1,20 +1,12 @@ #include "global.h" -#include "malloc.h" -#include "main.h" -#include "bg.h" -#include "gpu_regs.h" +#include "gflib.h" #include "event_data.h" -#include "palette.h" #include "task.h" -#include "text.h" -#include "window.h" #include "text_window.h" #include "battle.h" #include "trainer_tower.h" #include "trainer_pokemon_sprites.h" #include "scanline_effect.h" -#include "sound.h" -#include "string_util.h" #include "link.h" #include "menu.h" #include "overworld.h" diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 225a47729..ceccdac87 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -1,17 +1,10 @@ #include "global.h" +#include "gflib.h" #include "item.h" #include "util.h" -#include "pokemon.h" #include "random.h" -#include "text.h" -#include "sound.h" #include "pokedex.h" -#include "window.h" -#include "main.h" -#include "palette.h" #include "money.h" -#include "bg.h" -#include "string_util.h" #include "pokemon_icon.h" #include "mail.h" #include "event_data.h" diff --git a/src/battle_setup.c b/src/battle_setup.c index df8a3ac45..ee923d6c7 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -235,7 +235,7 @@ static void DoStandardWildBattle(void) { ScriptContext2_Enable(); FreezeObjectEvents(); - sub_805C780(); + StopPlayerAvatar(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = 0; CreateBattleStartTask(GetWildBattleTransition(), 0); @@ -247,7 +247,7 @@ void StartRoamerBattle(void) { ScriptContext2_Enable(); FreezeObjectEvents(); - sub_805C780(); + StopPlayerAvatar(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = BATTLE_TYPE_ROAMER; CreateBattleStartTask(GetWildBattleTransition(), MUS_VS_DEN); @@ -259,7 +259,7 @@ static void DoSafariBattle(void) { ScriptContext2_Enable(); FreezeObjectEvents(); - sub_805C780(); + StopPlayerAvatar(); gMain.savedCallback = CB2_EndSafariBattle; gBattleTypeFlags = BATTLE_TYPE_SAFARI; CreateBattleStartTask(GetWildBattleTransition(), 0); @@ -269,7 +269,7 @@ static void DoGhostBattle(void) { ScriptContext2_Enable(); FreezeObjectEvents(); - sub_805C780(); + StopPlayerAvatar(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = BATTLE_TYPE_GHOST; CreateBattleStartTask(GetWildBattleTransition(), 0); @@ -399,7 +399,7 @@ static void sub_807FB08(void) { ScriptContext2_Enable(); FreezeObjectEvents(); - sub_805C780(); + StopPlayerAvatar(); gMain.savedCallback = sub_807FAF8; SavePlayerParty(); InitPokedudePartyAndOpponent(); diff --git a/src/berry_pouch.c b/src/berry_pouch.c index 01a94c075..9798dd441 100644 --- a/src/berry_pouch.c +++ b/src/berry_pouch.c @@ -457,7 +457,7 @@ static void CB2_InitBerryPouch(void) { while (1) { - if ((u8)sub_80BF72C() == TRUE) + if ((u8)MenuHelpers_CallLinkSomething() == TRUE) break; if (RunBerryPouchInit() == TRUE) break; @@ -934,7 +934,7 @@ static void Task_BerryPouchMain(u8 taskId) { s16 * data = gTasks[taskId].data; s32 menuInput; - if (!gPaletteFade.active && (u8)sub_80BF72C() != TRUE) + if (!gPaletteFade.active && (u8)MenuHelpers_CallLinkSomething() != TRUE) { menuInput = ListMenu_ProcessInput(data[0]); ListMenuGetScrollAndRow(data[0], &sStaticCnt.listMenuScrollOffset, &sStaticCnt.listMenuSelectedRow); @@ -1040,7 +1040,7 @@ static void Task_NormalContextMenu(u8 taskId) static void Task_NormalContextMenu_HandleInput(u8 taskId) { s8 input; - if ((u8)sub_80BF72C() != TRUE) + if ((u8)MenuHelpers_CallLinkSomething() != TRUE) { input = Menu_ProcessInputNoWrapAround(); switch (input) diff --git a/src/bike.c b/src/bike.c index eaa4af2bd..d08a5fe82 100644 --- a/src/bike.c +++ b/src/bike.c @@ -9,67 +9,67 @@ #include "constants/map_types.h" #include "constants/songs.h" -static u8 sub_80BD0D4(u8 *, u16, u16); +static u8 GetMovePlayerOnBikeFuncId(u8 *, u16, u16); static void sub_80BD664(void); -static u8 sub_80BD4F0(u8, u8); -static u8 sub_80BD3A0(u8); -static u8 sub_80BD40C(struct ObjectEvent *, s16, s16, u8, u8); -static bool8 sub_80BD4B8(u8); -static void sub_80BD27C(u8); -static void sub_80BD28C(u8); -static void sub_80BD2C8(u8); -static void sub_80BD358(u8); -static void sub_80BD380(u8); -static u8 sub_80BD100(u8 *, u16, u16); -static u8 sub_80BD1C8(u8 *, u16, u16); -static u8 sub_80BD1E8(u8 *, u16, u16); - -static void (*const gUnknown_83E7CFC[])(u8) = +static u8 BikeCanFaceDIrectionOnRail(u8, u8); +static u8 CheckNextTileForBikingCollision(u8); +static u8 AdjustCollisionForBiking(struct ObjectEvent *, s16, s16, u8, u8); +static bool8 MetatileBehaviorForbidsBiking(u8); +static void BikeFaceDirection(u8); +static void BikeFaceDirectionAccountForRail(u8); +static void BikeTryMoveFastInDirection(u8); +static void BikeLetGravityTakeTheWheel(u8); +static void BikeTryMoveInDirection(u8); +static u8 GetBikeMoveCmd_0(u8 *, u16, u16); +static u8 GetBikeMoveCmd_1(u8 *, u16, u16); +static u8 GetBikeMoveCmd_2(u8 *, u16, u16); + +static void (*const sMovePlayerOnBikeFuncs[])(u8) = { - sub_80BD27C, - sub_80BD28C, - sub_80BD2C8, - sub_80BD358, - sub_80BD380, + BikeFaceDirection, + BikeFaceDirectionAccountForRail, + BikeTryMoveFastInDirection, + BikeLetGravityTakeTheWheel, + BikeTryMoveInDirection, }; -static u8 (*const gUnknown_83E7D10[])(u8 *, u16, u16) = +static u8 (*const sGetMovePlayerOnBikeFuncIdFuncs[])(u8 *, u16, u16) = { - sub_80BD100, - sub_80BD1C8, - sub_80BD1E8, + GetBikeMoveCmd_0, + GetBikeMoveCmd_1, + GetBikeMoveCmd_2, }; void MovePlayerOnBike(u8 direction, u16 newKeys, u16 heldKeys) { - gUnknown_83E7CFC[sub_80BD0D4(&direction, newKeys, heldKeys)](direction); + sMovePlayerOnBikeFuncs[GetMovePlayerOnBikeFuncId(&direction, newKeys, heldKeys)](direction); } -static u8 sub_80BD0D4(u8 *direction, u16 newKeys, u16 heldKeys) +static u8 GetMovePlayerOnBikeFuncId(u8 *direction, u16 newKeys, u16 heldKeys) { - return gUnknown_83E7D10[gPlayerAvatar.acroBikeState](direction, newKeys, heldKeys); + return sGetMovePlayerOnBikeFuncIdFuncs[gPlayerAvatar.acroBikeState](direction, newKeys, heldKeys); } -static u8 sub_80BD100(u8 *r6, u16 sl, u16 sb) +static u8 GetBikeMoveCmd_0(u8 *direction_p, u16 newKeys, u16 heldKeys) { - struct ObjectEvent *r4 = &gObjectEvents[gPlayerAvatar.objectEventId]; - u8 r7 = GetPlayerMovementDirection(); + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + u8 direction = GetPlayerMovementDirection(); gPlayerAvatar.bikeFrameCounter = 0; - if (MetatileBehavior_IsCyclingRoadPullDownTile(r4->currentMetatileBehavior) == TRUE) + if (MetatileBehavior_IsCyclingRoadPullDownTile(playerObjEvent->currentMetatileBehavior) == TRUE) { if (!JOY_HELD(B_BUTTON)) { gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING; gPlayerAvatar.runningState = 2; - if (*r6 < 2) + if (*direction_p < DIR_NORTH) return 3; else return 4; } else { - if (*r6 != 0) + if (*direction_p != DIR_NONE) { gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING; gPlayerAvatar.runningState = 2; @@ -83,21 +83,21 @@ static u8 sub_80BD100(u8 *r6, u16 sl, u16 sb) } else { - if (*r6 == 0) + if (*direction_p == DIR_NONE) { _080BD17E: - *r6 = r7; + *direction_p = direction; gPlayerAvatar.runningState = 0; return 0; } else { - if (*r6 != r7 && gPlayerAvatar.runningState != 2) + if (*direction_p != direction && gPlayerAvatar.runningState != 2) { gPlayerAvatar.acroBikeState = ACRO_STATE_TURNING; - gPlayerAvatar.newDirBackup = *r6; + gPlayerAvatar.newDirBackup = *direction_p; gPlayerAvatar.runningState = 0; - return sub_80BD0D4(r6, sl, sb); + return GetMovePlayerOnBikeFuncId(direction_p, newKeys, heldKeys); } else { @@ -108,33 +108,33 @@ static u8 sub_80BD100(u8 *r6, u16 sl, u16 sb) } } -static u8 sub_80BD1C8(u8 *r0, UNUSED u16 r1, UNUSED u16 r2) +static u8 GetBikeMoveCmd_1(u8 *direction_p, UNUSED u16 newKeys, UNUSED u16 heldKeys) { - *r0 = gPlayerAvatar.newDirBackup; + *direction_p = gPlayerAvatar.newDirBackup; gPlayerAvatar.runningState = 1; gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL; sub_80BD664(); return 1; } -static u8 sub_80BD1E8(u8 *r6, u16 sb, u16 r8) +static u8 GetBikeMoveCmd_2(u8 *direction_p, u16 newKeys, u16 heldKeys) { - u8 r5 = GetPlayerMovementDirection(); - u8 r1 = gPlayerAvatar.objectEventId; - if (MetatileBehavior_IsCyclingRoadPullDownTile(r1[gObjectEvents].currentMetatileBehavior) == TRUE) + u8 direction = GetPlayerMovementDirection(); + u8 playerObjEventId = gPlayerAvatar.objectEventId; + if (MetatileBehavior_IsCyclingRoadPullDownTile(playerObjEventId[gObjectEvents].currentMetatileBehavior) == TRUE) { - if (*r6 != r5) + if (*direction_p != direction) { gPlayerAvatar.acroBikeState = ACRO_STATE_TURNING; - gPlayerAvatar.newDirBackup = *r6; + gPlayerAvatar.newDirBackup = *direction_p; gPlayerAvatar.runningState = 0; - return sub_80BD0D4(r6, sb, r8); + return GetMovePlayerOnBikeFuncId(direction_p, newKeys, heldKeys); } else { gPlayerAvatar.runningState = 2; gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING; - if (*r6 < 2) + if (*direction_p < DIR_NORTH) return 3; else return 4; @@ -143,9 +143,9 @@ static u8 sub_80BD1E8(u8 *r6, u16 sb, u16 r8) else { gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL; - if (*r6 == 0) + if (*direction_p == DIR_NONE) { - *r6 = r5; + *direction_p = direction; gPlayerAvatar.runningState = 0; return 0; } @@ -157,100 +157,100 @@ static u8 sub_80BD1E8(u8 *r6, u16 sb, u16 r8) } } -static void sub_80BD27C(u8 r0) +static void BikeFaceDirection(u8 direction) { - PlayerFaceDirection(r0); + PlayerFaceDirection(direction); } -static void sub_80BD28C(u8 r4) +static void BikeFaceDirectionAccountForRail(u8 direction) { - struct ObjectEvent *r5 = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (!sub_80BD4F0(r4, r5->currentMetatileBehavior)) - r4 = r5->movementDirection; - PlayerFaceDirection(r4); + if (!BikeCanFaceDIrectionOnRail(direction, playerObjEvent->currentMetatileBehavior)) + direction = playerObjEvent->movementDirection; + PlayerFaceDirection(direction); } -static void sub_80BD2C8(u8 r4) +static void BikeTryMoveFastInDirection(u8 direction) { - struct ObjectEvent *r5; + struct ObjectEvent *playerObjEvent; - r5 = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (!sub_80BD4F0(r4, r5->currentMetatileBehavior)) + playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!BikeCanFaceDIrectionOnRail(direction, playerObjEvent->currentMetatileBehavior)) { - sub_80BD27C(r5->movementDirection); + BikeFaceDirection(playerObjEvent->movementDirection); } else { - u8 r1 = sub_80BD3A0(r4); + u8 collision = CheckNextTileForBikingCollision(direction); - if (r1 > 0 && r1 <= 11) + if (collision > COLLISION_NONE && collision <= COLLISION_ISOLATED_HORIZONTAL_RAIL) { - if (r1 == 6) - PlayerJumpLedge(r4); - else if (r1 != 5 && r1 != 6 && r1 != 7 && r1 != 8) - PlayerOnBikeCollide(r4); + if (collision == COLLISION_LEDGE_JUMP) + PlayerJumpLedge(direction); + else if (collision != COLLISION_STOP_SURFING && collision != COLLISION_LEDGE_JUMP && collision != COLLISION_PUSHED_BOULDER && collision != COLLISION_UNKNOWN_WARP_6C_6D_6E_6F) + PlayerOnBikeCollide(direction); } else { - if (r1 == 14) - PlayerGoSpeed2(r4); - else if (PlayerIsMovingOnRockStairs(r4)) - PlayerGoSpeed2(r4); + if (collision == COLLISION_COUNT) + PlayerGoSpeed2(direction); + else if (PlayerIsMovingOnRockStairs(direction)) + PlayerGoSpeed2(direction); else - PlayerRideWaterCurrent(r4); + PlayerRideWaterCurrent(direction); } } } -static void sub_80BD358(UNUSED u8 v) +static void BikeLetGravityTakeTheWheel(UNUSED u8 v) { - u8 r0 = sub_80BD3A0(1); + u8 collision = CheckNextTileForBikingCollision(DIR_SOUTH); - if (r0 == 0) - sub_805C164(1); - else if (r0 == 6) - PlayerJumpLedge(1); + if (collision == COLLISION_NONE) + sub_805C164(DIR_SOUTH); + else if (collision == COLLISION_LEDGE_JUMP) + PlayerJumpLedge(DIR_SOUTH); } -static void sub_80BD380(u8 r4) +static void BikeTryMoveInDirection(u8 direction) { - if (sub_80BD3A0(r4) == 0) - PlayerGoSpeed1(r4); + if (CheckNextTileForBikingCollision(direction) == COLLISION_NONE) + PlayerGoSpeed1(direction); } -static u8 sub_80BD3A0(u8 r6) +static u8 CheckNextTileForBikingCollision(u8 direction) { - struct ObjectEvent *r4 = &gObjectEvents[gPlayerAvatar.objectEventId]; - s16 sp04, sp06; - u8 r0; - - sp04 = r4->currentCoords.x; - sp06 = r4->currentCoords.y; - MoveCoords(r6, &sp04, &sp06); - r0 = MapGridGetMetatileBehaviorAt(sp04, sp06); - return sub_80BD40C(r4, sp04, sp06, r6, r0); + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + s16 x, y; + u8 metatileBehavior; + + x = playerObjEvent->currentCoords.x; + y = playerObjEvent->currentCoords.y; + MoveCoords(direction, &x, &y); + metatileBehavior = MapGridGetMetatileBehaviorAt(x, y); + return AdjustCollisionForBiking(playerObjEvent, x, y, direction, metatileBehavior); } -static u8 sub_80BD40C(struct ObjectEvent *r0, s16 r1, s16 r2, u8 r3, u8 r5) +static u8 AdjustCollisionForBiking(struct ObjectEvent *playerObjEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior) { - u8 r4 = CheckForObjectEventCollision(r0, r1, r2, r3, r5); + u8 retVal = CheckForObjectEventCollision(playerObjEvent, x, y, direction, metatileBehavior); - if (r4 <= 4) + if (retVal <= COLLISION_OBJECT_EVENT) { - u8 r0 = MetatileBehavior_IsCrackedIce(r5); - if (r0 == TRUE) - return 14; - if (r4 == 0 && sub_80BD4B8(r5)) - r4 = 2; + bool8 isCrackedIce = MetatileBehavior_IsCrackedIce(metatileBehavior); + if (isCrackedIce == TRUE) + return COLLISION_COUNT; + if (retVal == COLLISION_NONE && MetatileBehaviorForbidsBiking(metatileBehavior)) + retVal = COLLISION_IMPASSABLE; } - return r4; + return retVal; } bool8 sub_80BD460(u8 r0) { - if (sub_80BD4B8(r0)) + if (MetatileBehaviorForbidsBiking(r0)) return TRUE; if (gMapHeader.mapType != MAP_TYPE_INDOOR) return FALSE; @@ -262,13 +262,13 @@ bool32 IsRunningDisallowed(u8 metatileBehavior) { if (!(gMapHeader.flags & MAP_ALLOW_RUN)) return TRUE; - if (sub_80BD4B8(metatileBehavior) != TRUE) + if (MetatileBehaviorForbidsBiking(metatileBehavior) != TRUE) return FALSE; else return TRUE; } -static bool8 sub_80BD4B8(u8 r4) +static bool8 MetatileBehaviorForbidsBiking(u8 r4) { if (MetatileBehavior_IsMB0A(r4)) return TRUE; @@ -279,31 +279,31 @@ static bool8 sub_80BD4B8(u8 r4) return TRUE; } -static bool8 sub_80BD4F0(u8 r0, u8 r4) +static bool8 BikeCanFaceDIrectionOnRail(u8 direction, u8 metatileBehavior) { - if (r0 == DIR_EAST || r0 == DIR_WEST) + if (direction == DIR_EAST || direction == DIR_WEST) { - if (MetatileBehavior_IsIsolatedVerticalRail(r4) || MetatileBehavior_IsVerticalRail(r4)) + if (MetatileBehavior_IsIsolatedVerticalRail(metatileBehavior) || MetatileBehavior_IsVerticalRail(metatileBehavior)) return FALSE; } else { - if (MetatileBehavior_IsIsolatedHorizontalRail(r4) || MetatileBehavior_IsHorizontalRail(r4)) + if (MetatileBehavior_IsIsolatedHorizontalRail(metatileBehavior) || MetatileBehavior_IsHorizontalRail(metatileBehavior)) return FALSE; } return TRUE; } -bool8 sub_80BD540(void) +bool8 MetatileAtPlayerPositionForbidsBiking(void) { - s16 sp00, sp02; - u8 r0; + s16 x, y; + u8 metatileBehavior; if (!(gPlayerAvatar.flags & (PLAYER_AVATAR_FLAG_UNDERWATER | PLAYER_AVATAR_FLAG_SURFING))) { - PlayerGetDestCoords(&sp00, &sp02); - r0 = MapGridGetMetatileBehaviorAt(sp00, sp02); - if (!sub_80BD4B8(r0)) + PlayerGetDestCoords(&x, &y); + metatileBehavior = MapGridGetMetatileBehaviorAt(x, y); + if (!MetatileBehaviorForbidsBiking(metatileBehavior)) return FALSE; } return TRUE; @@ -331,7 +331,7 @@ void StartTransitionToFlipBikeState(u8 flags) else { SetPlayerAvatarTransitionFlags(flags); - if (sub_8056124(MUS_CYCLING)) + if (Overworld_MusicCanOverrideMapMusic(MUS_CYCLING)) { Overworld_SetSavedMusic(MUS_CYCLING); Overworld_ChangeMusicTo(MUS_CYCLING); @@ -339,7 +339,7 @@ void StartTransitionToFlipBikeState(u8 flags) } } -void sub_80BD620(u32 directionHistory, u32 abStartSelectHistory) +void InitPlayerAvatarBikeState(u32 directionHistory, u32 abStartSelectHistory) { u8 i; diff --git a/src/cable_club.c b/src/cable_club.c index e75f1abf8..52856e3a3 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -402,7 +402,7 @@ static void Task_Linkup_6a(u8 taskId) if (gSpecialVar_Result == 1) { // Dumb trick required to match - if (gLinkType == LINKTYPE_0x4411) + if (gLinkType == LINKTYPE_BERRY_BLENDER_SETUP) *UnusedVarNeededToMatch += 0; DestroyLinkPlayerCountDisplayWindow(gTasks[taskId].data[5]); EnableBothScriptContexts(); @@ -493,9 +493,9 @@ void TryRecordMixLinkup(void) CreateLinkupTask(2, 4); } -void sub_8081128(void) +void TryContestLinkup(void) { - gLinkType = LINKTYPE_0x6601; + gLinkType = LINKTYPE_CONTEST_GMODE; gBattleTypeFlags = 0; CreateLinkupTask(4, 4); } diff --git a/src/credits.c b/src/credits.c index 12240c98f..58647f7b1 100644 --- a/src/credits.c +++ b/src/credits.c @@ -738,7 +738,7 @@ static void CB2_Credits(void) sCreditsMgr->unk_1D++; break; case 2: - FlagClear(FLAG_SPECIAL_FLAG_0x4000); + FlagClear(FLAG_DONT_SHOW_MAP_NAME_POPUP); gDisableMapMusicChangeOnMapLoad = MUSIC_DISABLE_OFF; Free(sCreditsMgr); SoftReset(RESET_ALL); @@ -785,7 +785,7 @@ static bool32 DoOverworldMapScrollScene(UNUSED u8 unused) switch (sCreditsMgr->subseqno) { case 0: - FlagSet(FLAG_SPECIAL_FLAG_0x4000); + FlagSet(FLAG_DONT_SHOW_MAP_NAME_POPUP); gDisableMapMusicChangeOnMapLoad = MUSIC_DISABLE_KEEP; sCreditsMgr->ovwldseqno = 0; sCreditsMgr->subseqno++; diff --git a/src/data/decoration/description.h b/src/data/decoration/description.h new file mode 100644 index 000000000..b56f43eb6 --- /dev/null +++ b/src/data/decoration/description.h @@ -0,0 +1,573 @@ +const u8 DecorDesc_SMALL_DESK[] = _( + "A small desk built\n" + "for one."); + +const u8 DecorDesc_POKEMON_DESK[] = _( + "A small desk built in\n" + "the shape of a POKé\n" + "BALL."); + +const u8 DecorDesc_HEAVY_DESK[] = _( + "A large desk made\n" + "of steel. Put some\n" + "decorations on it."); + +const u8 DecorDesc_RAGGED_DESK[] = _( + "A large desk made\n" + "of wood. Put some\n" + "decorations on it."); + +const u8 DecorDesc_COMFORT_DESK[] = _( + "A large desk made\n" + "of leaves. Put some\n" + "decorations on it."); + +const u8 DecorDesc_PRETTY_DESK[] = _( + "A huge desk made\n" + "of glass. Holds lots\n" + "of decorations."); + +const u8 DecorDesc_BRICK_DESK[] = _( + "A huge desk made\n" + "of brick. Holds lots\n" + "of decorations."); + +const u8 DecorDesc_CAMP_DESK[] = _( + "A huge desk made\n" + "of logs. Put lots of\n" + "decorations on it."); + +const u8 DecorDesc_HARD_DESK[] = _( + "A huge desk made\n" + "of rocks. Holds\n" + "many decorations."); + +const u8 DecorDesc_SMALL_CHAIR[] = _( + "A small chair made\n" + "for one."); + +const u8 DecorDesc_POKEMON_CHAIR[] = _( + "A small chair built\n" + "in the shape of a\n" + "POKé BALL."); + +const u8 DecorDesc_HEAVY_CHAIR[] = _( + "A small chair made\n" + "of steel."); + +const u8 DecorDesc_PRETTY_CHAIR[] = _( + "A small chair made\n" + "of glass."); + +const u8 DecorDesc_COMFORT_CHAIR[] = _( + "A small chair made\n" + "of leaves."); + +const u8 DecorDesc_RAGGED_CHAIR[] = _( + "A small chair made\n" + "of wood."); + +const u8 DecorDesc_BRICK_CHAIR[] = _( + "A small chair made\n" + "of brick."); + +const u8 DecorDesc_CAMP_CHAIR[] = _( + "A small chair made\n" + "of logs."); + +const u8 DecorDesc_HARD_CHAIR[] = _( + "A small chair made\n" + "of rock."); + +const u8 DecorDesc_RED_PLANT[] = _( + "A vivid red potted\n" + "plant."); + +const u8 DecorDesc_TROPICAL_PLANT[] = _( + "A flowering tropical\n" + "plant in a pot."); + +const u8 DecorDesc_PRETTY_FLOWERS[] = _( + "A pot of cute\n" + "flowers."); + +const u8 DecorDesc_COLORFUL_PLANT[] = _( + "A large pot with\n" + "many colorful\n" + "flowers."); + +const u8 DecorDesc_BIG_PLANT[] = _( + "A large, umbrella-\n" + "shaped plant in a\n" + "big pot."); + +const u8 DecorDesc_GORGEOUS_PLANT[] = _( + "A large, impressive\n" + "plant in a big pot."); + +const u8 DecorDesc_RED_BRICK[] = _( + "A red-colored brick.\n" + "Decorations can be\n" + "placed on top."); + +const u8 DecorDesc_YELLOW_BRICK[] = _( + "A yellow-colored\n" + "brick. Put some\n" + "decorations on top."); + +const u8 DecorDesc_BLUE_BRICK[] = _( + "A blue-colored\n" + "brick. Put some\n" + "decorations on top."); + +const u8 DecorDesc_RED_BALLOON[] = _( + "A red balloon filled\n" + "with water. Bursts\n" + "if stepped on."); + +const u8 DecorDesc_BLUE_BALLOON[] = _( + "A blue balloon filled\n" + "with water. Bursts\n" + "if stepped on."); + +const u8 DecorDesc_YELLOW_BALLOON[] = _( + "A yellow balloon\n" + "filled with water.\n" + "Pops if stepped on."); + +const u8 DecorDesc_RED_TENT[] = _( + "A large red tent.\n" + "You can hide inside\n" + "it."); + +const u8 DecorDesc_BLUE_TENT[] = _( + "A large blue tent.\n" + "You can hide inside\n" + "it."); + +const u8 DecorDesc_SOLID_BOARD[] = _( + "Place over a hole to\n" + "cross to the other\n" + "side."); + +const u8 DecorDesc_SLIDE[] = _( + "Use to slide down\n" + "from the platform."); + +const u8 DecorDesc_FENCE_LENGTH[] = _( + "A small fence that\n" + "blocks passage."); + +const u8 DecorDesc_FENCE_WIDTH[] = _( + "A small fence that\n" + "blocks passage."); + +const u8 DecorDesc_TIRE[] = _( + "An old large tire.\n" + "Decorations can be\n" + "placed on top."); + +const u8 DecorDesc_STAND[] = _( + "A large pedestal\n" + "with steps."); + +const u8 DecorDesc_MUD_BALL[] = _( + "A large ball of mud.\n" + "Crumbles if stepped\n" + "on."); + +const u8 DecorDesc_BREAKABLE_DOOR[] = _( + "A weird door that\n" + "people can walk\n" + "right through."); + +const u8 DecorDesc_SAND_ORNAMENT[] = _( + "An ornament made\n" + "of sand. Crumbles if\n" + "touched."); + +const u8 DecorDesc_SILVER_SHIELD[] = _( + "Awarded for 50\n" + "straight wins at\n" + "the BATTLE TOWER."); + +const u8 DecorDesc_GOLD_SHIELD[] = _( + "Awarded for 100\n" + "straight wins at\n" + "the BATTLE TOWER."); + +const u8 DecorDesc_GLASS_ORNAMENT[] = _( + "A glass replica of\n" + "a famous sculpture\n" + "at the ART MUSEUM."); + +const u8 DecorDesc_TV[] = _( + "A small, gray-\n" + "colored toy TV."); + +const u8 DecorDesc_ROUND_TV[] = _( + "A toy TV modeled\n" + "in the image of a\n" + "SEEDOT."); + +const u8 DecorDesc_CUTE_TV[] = _( + "A toy TV modeled\n" + "in the image of a\n" + "SKITTY."); + +const u8 DecorDesc_GLITTER_MAT[] = _( + "An odd mat that\n" + "glitters if stepped\n" + "on."); + +const u8 DecorDesc_JUMP_MAT[] = _( + "A trick mat that\n" + "jumps when it is\n" + "stepped on."); + +const u8 DecorDesc_SPIN_MAT[] = _( + "A trick mat that\n" + "spins around when\n" + "stepped on."); + +const u8 DecorDesc_C_LOW_NOTE_MAT[] = _( + "A mat that plays\n" + "a low C note when\n" + "stepped on."); + +const u8 DecorDesc_D_NOTE_MAT[] = _( + "A mat that plays\n" + "a D note when\n" + "stepped on."); + +const u8 DecorDesc_E_NOTE_MAT[] = _( + "A mat that plays\n" + "an E note when\n" + "stepped on."); + +const u8 DecorDesc_F_NOTE_MAT[] = _( + "A mat that plays\n" + "an F note when\n" + "stepped on."); + +const u8 DecorDesc_G_NOTE_MAT[] = _( + "A mat that plays\n" + "a G note when\n" + "stepped on."); + +const u8 DecorDesc_A_NOTE_MAT[] = _( + "A mat that plays\n" + "an A note when\n" + "stepped on."); + +const u8 DecorDesc_B_NOTE_MAT[] = _( + "A mat that plays\n" + "a B note when\n" + "stepped on."); + +const u8 DecorDesc_C_HIGH_NOTE_MAT[] = _( + "A mat that plays\n" + "a high C note when\n" + "stepped on."); + +const u8 DecorDesc_SURF_MAT[] = _( + "A mat designed with\n" + "a SURF image.\n" + "Put items on top."); + +const u8 DecorDesc_THUNDER_MAT[] = _( + "A mat designed with\n" + "a THUNDER image.\n" + "Put items on top."); + +const u8 DecorDesc_FIRE_BLAST_MAT[] = _( + "A mat designed with\n" + "a FIRE BLAST image.\n" + "Put items on top."); + +const u8 DecorDesc_POWDER_SNOW_MAT[] = _( + "A mat with a POWDER\n" + "SNOW image design.\n" + "Put items on top."); + +const u8 DecorDesc_ATTRACT_MAT[] = _( + "A mat designed with\n" + "an ATTRACT image.\n" + "Put items on top."); + +const u8 DecorDesc_FISSURE_MAT[] = _( + "A mat designed with\n" + "a FISSURE image.\n" + "Put items on top."); + +const u8 DecorDesc_SPIKES_MAT[] = _( + "A mat designed with\n" + "a SPIKES image.\n" + "Put items on top."); + +const u8 DecorDesc_BALL_POSTER[] = _( + "A small poster\n" + "printed with POKé\n" + "BALLS."); + +const u8 DecorDesc_GREEN_POSTER[] = _( + "A small poster with\n" + "a TREECKO print."); + +const u8 DecorDesc_RED_POSTER[] = _( + "A small poster with\n" + "a TORCHIC print."); + +const u8 DecorDesc_BLUE_POSTER[] = _( + "A small poster with\n" + "a MUDKIP print."); + +const u8 DecorDesc_CUTE_POSTER[] = _( + "A small poster with\n" + "an AZURILL print."); + +const u8 DecorDesc_PIKA_POSTER[] = _( + "A large poster with\n" + "a PIKACHU and\n" + "PICHU print."); + +const u8 DecorDesc_LONG_POSTER[] = _( + "A large poster with\n" + "a SEVIPER print."); + +const u8 DecorDesc_SEA_POSTER[] = _( + "A large poster with\n" + "a RELICANTH print."); + +const u8 DecorDesc_SKY_POSTER[] = _( + "A large poster with\n" + "a WINGULL print."); + +const u8 DecorDesc_KISS_POSTER[] = _( + "A large poster with\n" + "a SMOOCHUM print."); + +const u8 DecorDesc_PICHU_DOLL[] = _( + "A PICHU doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_PIKACHU_DOLL[] = _( + "A PIKACHU doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_MARILL_DOLL[] = _( + "A MARILL doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_TOGEPI_DOLL[] = _( + "A TOGEPI doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_CYNDAQUIL_DOLL[] = _( + "A CYNDAQUIL doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_CHIKORITA_DOLL[] = _( + "A CHIKORITA doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_TOTODILE_DOLL[] = _( + "A TOTODILE doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_JIGGLYPUFF_DOLL[] = _( + "A JIGGLYPUFF doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_MEOWTH_DOLL[] = _( + "A MEOWTH doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_CLEFAIRY_DOLL[] = _( + "A CLEFAIRY doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_DITTO_DOLL[] = _( + "A DITTO doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_SMOOCHUM_DOLL[] = _( + "A SMOOCHUM doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_TREECKO_DOLL[] = _( + "A TREECKO doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_TORCHIC_DOLL[] = _( + "A TORCHIC doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_MUDKIP_DOLL[] = _( + "A MUDKIP doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_DUSKULL_DOLL[] = _( + "A DUSKULL doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_WYNAUT_DOLL[] = _( + "A WYNAUT doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_BALTOY_DOLL[] = _( + "A BALTOY doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_KECLEON_DOLL[] = _( + "A KECLEON doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_AZURILL_DOLL[] = _( + "An AZURILL doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_SKITTY_DOLL[] = _( + "A SKITTY doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_SWABLU_DOLL[] = _( + "A SWABLU doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_GULPIN_DOLL[] = _( + "A GULPIN doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_LOTAD_DOLL[] = _( + "A LOTAD doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_SEEDOT_DOLL[] = _( + "A SEEDOT doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_PIKA_CUSHION[] = _( + "A PIKACHU cushion.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_ROUND_CUSHION[] = _( + "A MARILL cushion.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_KISS_CUSHION[] = _( + "A SMOOCHUM\n" + "cushion. Place it on\n" + "a mat or a desk."); + +const u8 DecorDesc_ZIGZAG_CUSHION[] = _( + "A ZIGZAGOON\n" + "cushion. Place it on\n" + "a mat or a desk."); + +const u8 DecorDesc_SPIN_CUSHION[] = _( + "A SPINDA cushion.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_DIAMOND_CUSHION[] = _( + "A SABLEYE cushion.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_BALL_CUSHION[] = _( + "A BALL cushion.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_GRASS_CUSHION[] = _( + "A grass-mark\n" + "cushion. Place it on\n" + "a mat or a desk."); + +const u8 DecorDesc_FIRE_CUSHION[] = _( + "A fire-mark\n" + "cushion. Place it on\n" + "a mat or a desk."); + +const u8 DecorDesc_WATER_CUSHION[] = _( + "A water-mark\n" + "cushion. Place it on\n" + "a mat or a desk."); + +const u8 DecorDesc_SNORLAX_DOLL[] = _( + "A large doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_RHYDON_DOLL[] = _( + "A large doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_LAPRAS_DOLL[] = _( + "A large doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_VENUSAUR_DOLL[] = _( + "A large doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_CHARIZARD_DOLL[] = _( + "A large doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_BLASTOISE_DOLL[] = _( + "A large doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_WAILMER_DOLL[] = _( + "A large doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_REGIROCK_DOLL[] = _( + "A large doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_REGICE_DOLL[] = _( + "A large doll.\n" + "Place it on a mat\n" + "or a desk."); + +const u8 DecorDesc_REGISTEEL_DOLL[] = _( + "A large doll.\n" + "Place it on a mat\n" + "or a desk."); diff --git a/src/data/decoration/header.h b/src/data/decoration/header.h new file mode 100644 index 000000000..55458c7a3 --- /dev/null +++ b/src/data/decoration/header.h @@ -0,0 +1,1091 @@ +const struct Decoration gDecorations[] = { + { + DECOR_NONE, + _("SMALL DESK"), + DECORPERM_SOLID_FLOOR, + DECORSHAPE_1x1, + DECORCAT_DESK, + 0, + DecorDesc_SMALL_DESK, + DecorGfx_SMALL_DESK + }, { + DECOR_SMALL_DESK, + _("SMALL DESK"), + DECORPERM_SOLID_FLOOR, + DECORSHAPE_1x1, + DECORCAT_DESK, + 3000, + DecorDesc_SMALL_DESK, + DecorGfx_SMALL_DESK + }, { + DECOR_POKEMON_DESK, + _("POKéMON DESK"), + DECORPERM_SOLID_FLOOR, + DECORSHAPE_1x1, + DECORCAT_DESK, + 3000, + DecorDesc_POKEMON_DESK, + DecorGfx_POKEMON_DESK + }, { + DECOR_HEAVY_DESK, + _("HEAVY DESK"), + DECORPERM_SOLID_FLOOR, + DECORSHAPE_3x2, + DECORCAT_DESK, + 6000, + DecorDesc_HEAVY_DESK, + DecorGfx_HEAVY_DESK + }, { + DECOR_RAGGED_DESK, + _("RAGGED DESK"), + DECORPERM_SOLID_FLOOR, + DECORSHAPE_3x2, + DECORCAT_DESK, + 6000, + DecorDesc_RAGGED_DESK, + DecorGfx_RAGGED_DESK + }, { + DECOR_COMFORT_DESK, + _("COMFORT DESK"), + DECORPERM_SOLID_FLOOR, + DECORSHAPE_3x2, + DECORCAT_DESK, + 6000, + DecorDesc_COMFORT_DESK, + DecorGfx_COMFORT_DESK + }, { + DECOR_PRETTY_DESK, + _("PRETTY DESK"), + DECORPERM_SOLID_FLOOR, + DECORSHAPE_3x3, + DECORCAT_DESK, + 9000, + DecorDesc_PRETTY_DESK, + DecorGfx_PRETTY_DESK + }, { + DECOR_BRICK_DESK, + _("BRICK DESK"), + DECORPERM_SOLID_FLOOR, + DECORSHAPE_3x3, + DECORCAT_DESK, + 9000, + DecorDesc_BRICK_DESK, + DecorGfx_BRICK_DESK + }, { + DECOR_CAMP_DESK, + _("CAMP DESK"), + DECORPERM_SOLID_FLOOR, + DECORSHAPE_3x3, + DECORCAT_DESK, + 9000, + DecorDesc_CAMP_DESK, + DecorGfx_CAMP_DESK + }, { + DECOR_HARD_DESK, + _("HARD DESK"), + DECORPERM_SOLID_FLOOR, + DECORSHAPE_3x3, + DECORCAT_DESK, + 9000, + DecorDesc_HARD_DESK, + DecorGfx_HARD_DESK + }, { + DECOR_SMALL_CHAIR, + _("SMALL CHAIR"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_CHAIR, + 2000, + DecorDesc_SMALL_CHAIR, + DecorGfx_SMALL_CHAIR + }, { + DECOR_POKEMON_CHAIR, + _("POKéMON CHAIR"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_CHAIR, + 2000, + DecorDesc_POKEMON_CHAIR, + DecorGfx_POKEMON_CHAIR + }, { + DECOR_HEAVY_CHAIR, + _("HEAVY CHAIR"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_CHAIR, + 2000, + DecorDesc_HEAVY_CHAIR, + DecorGfx_HEAVY_CHAIR + }, { + DECOR_PRETTY_CHAIR, + _("PRETTY CHAIR"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_CHAIR, + 2000, + DecorDesc_PRETTY_CHAIR, + DecorGfx_PRETTY_CHAIR + }, { + DECOR_COMFORT_CHAIR, + _("COMFORT CHAIR"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_CHAIR, + 2000, + DecorDesc_COMFORT_CHAIR, + DecorGfx_COMFORT_CHAIR + }, { + DECOR_RAGGED_CHAIR, + _("RAGGED CHAIR"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_CHAIR, + 2000, + DecorDesc_RAGGED_CHAIR, + DecorGfx_RAGGED_CHAIR + }, { + DECOR_BRICK_CHAIR, + _("BRICK CHAIR"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_CHAIR, + 2000, + DecorDesc_BRICK_CHAIR, + DecorGfx_BRICK_CHAIR + }, { + DECOR_CAMP_CHAIR, + _("CAMP CHAIR"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_CHAIR, + 2000, + DecorDesc_CAMP_CHAIR, + DecorGfx_CAMP_CHAIR + }, { + DECOR_HARD_CHAIR, + _("HARD CHAIR"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_CHAIR, + 2000, + DecorDesc_HARD_CHAIR, + DecorGfx_HARD_CHAIR + }, { + DECOR_RED_PLANT, + _("RED PLANT"), + DECORPERM_BEHIND_FLOOR, + DECORSHAPE_1x2, + DECORCAT_PLANT, + 3000, + DecorDesc_RED_PLANT, + DecorGfx_RED_PLANT + }, { + DECOR_TROPICAL_PLANT, + _("TROPICAL PLANT"), + DECORPERM_BEHIND_FLOOR, + DECORSHAPE_1x2, + DECORCAT_PLANT, + 3000, + DecorDesc_TROPICAL_PLANT, + DecorGfx_TROPICAL_PLANT + }, { + DECOR_PRETTY_FLOWERS, + _("PRETTY FLOWERS"), + DECORPERM_BEHIND_FLOOR, + DECORSHAPE_1x2, + DECORCAT_PLANT, + 3000, + DecorDesc_PRETTY_FLOWERS, + DecorGfx_PRETTY_FLOWERS + }, { + DECOR_COLORFUL_PLANT, + _("COLORFUL PLANT"), + DECORPERM_BEHIND_FLOOR, + DECORSHAPE_2x2, + DECORCAT_PLANT, + 5000, + DecorDesc_COLORFUL_PLANT, + DecorGfx_COLORFUL_PLANT + }, { + DECOR_BIG_PLANT, + _("BIG PLANT"), + DECORPERM_BEHIND_FLOOR, + DECORSHAPE_2x2, + DECORCAT_PLANT, + 5000, + DecorDesc_BIG_PLANT, + DecorGfx_BIG_PLANT + }, { + DECOR_GORGEOUS_PLANT, + _("GORGEOUS PLANT"), + DECORPERM_BEHIND_FLOOR, + DECORSHAPE_2x2, + DECORCAT_PLANT, + 5000, + DecorDesc_GORGEOUS_PLANT, + DecorGfx_GORGEOUS_PLANT + }, { + DECOR_RED_BRICK, + _("RED BRICK"), + DECORPERM_SOLID_FLOOR, + DECORSHAPE_1x2, + DECORCAT_ORNAMENT, + 500, + DecorDesc_RED_BRICK, + DecorGfx_RED_BRICK + }, { + DECOR_YELLOW_BRICK, + _("YELLOW BRICK"), + DECORPERM_SOLID_FLOOR, + DECORSHAPE_1x2, + DECORCAT_ORNAMENT, + 500, + DecorDesc_YELLOW_BRICK, + DecorGfx_YELLOW_BRICK + }, { + DECOR_BLUE_BRICK, + _("BLUE BRICK"), + DECORPERM_SOLID_FLOOR, + DECORSHAPE_1x2, + DECORCAT_ORNAMENT, + 500, + DecorDesc_BLUE_BRICK, + DecorGfx_BLUE_BRICK + }, { + DECOR_RED_BALLOON, + _("RED BALLOON"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_ORNAMENT, + 500, + DecorDesc_RED_BALLOON, + DecorGfx_RED_BALLOON + }, { + DECOR_BLUE_BALLOON, + _("BLUE BALLOON"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_ORNAMENT, + 500, + DecorDesc_BLUE_BALLOON, + DecorGfx_BLUE_BALLOON + }, { + DECOR_YELLOW_BALLOON, + _("YELLOW BALLOON"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_ORNAMENT, + 500, + DecorDesc_YELLOW_BALLOON, + DecorGfx_YELLOW_BALLOON + }, { + DECOR_RED_TENT, + _("RED TENT"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_3x3, + DECORCAT_ORNAMENT, + 10000, + DecorDesc_RED_TENT, + DecorGfx_RED_TENT + }, { + DECOR_BLUE_TENT, + _("BLUE TENT"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_3x3, + DECORCAT_ORNAMENT, + 10000, + DecorDesc_BLUE_TENT, + DecorGfx_BLUE_TENT + }, { + DECOR_SOLID_BOARD, + _("SOLID BOARD"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x2, + DECORCAT_ORNAMENT, + 3000, + DecorDesc_SOLID_BOARD, + DecorGfx_SOLID_BOARD + }, { + DECOR_SLIDE, + _("SLIDE"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_2x4, + DECORCAT_ORNAMENT, + 8000, + DecorDesc_SLIDE, + DecorGfx_SLIDE + }, { + DECOR_FENCE_LENGTH, + _("FENCE LENGTH"), + DECORPERM_SOLID_FLOOR, + DECORSHAPE_1x1, + DECORCAT_ORNAMENT, + 500, + DecorDesc_FENCE_LENGTH, + DecorGfx_FENCE_LENGTH + }, { + DECOR_FENCE_WIDTH, + _("FENCE WIDTH"), + DECORPERM_SOLID_FLOOR, + DECORSHAPE_1x1, + DECORCAT_ORNAMENT, + 500, + DecorDesc_FENCE_WIDTH, + DecorGfx_FENCE_WIDTH + }, { + DECOR_TIRE, + _("TIRE"), + DECORPERM_SOLID_FLOOR, + DECORSHAPE_2x2, + DECORCAT_ORNAMENT, + 800, + DecorDesc_TIRE, + DecorGfx_TIRE + }, { + DECOR_STAND, + _("STAND"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_4x2, + DECORCAT_ORNAMENT, + 7000, + DecorDesc_STAND, + DecorGfx_STAND + }, { + DECOR_MUD_BALL, + _("MUD BALL"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_ORNAMENT, + 200, + DecorDesc_MUD_BALL, + DecorGfx_MUD_BALL + }, { + DECOR_BREAKABLE_DOOR, + _("BREAKABLE DOOR"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x2, + DECORCAT_ORNAMENT, + 3000, + DecorDesc_BREAKABLE_DOOR, + DecorGfx_BREAKABLE_DOOR + }, { + DECOR_SAND_ORNAMENT, + _("SAND ORNAMENT"), + DECORPERM_BEHIND_FLOOR, + DECORSHAPE_1x2, + DECORCAT_ORNAMENT, + 3000, + DecorDesc_SAND_ORNAMENT, + DecorGfx_SAND_ORNAMENT + }, { + DECOR_SILVER_SHIELD, + _("SILVER SHIELD"), + DECORPERM_BEHIND_FLOOR, + DECORSHAPE_1x2, + DECORCAT_ORNAMENT, + 0, + DecorDesc_SILVER_SHIELD, + DecorGfx_SILVER_SHIELD + }, { + DECOR_GOLD_SHIELD, + _("GOLD SHIELD"), + DECORPERM_BEHIND_FLOOR, + DECORSHAPE_1x2, + DECORCAT_ORNAMENT, + 0, + DecorDesc_GOLD_SHIELD, + DecorGfx_GOLD_SHIELD + }, { + DECOR_GLASS_ORNAMENT, + _("GLASS ORNAMENT"), + DECORPERM_BEHIND_FLOOR, + DECORSHAPE_1x2, + DECORCAT_ORNAMENT, + 0, + DecorDesc_GLASS_ORNAMENT, + DecorGfx_GLASS_ORNAMENT + }, { + DECOR_TV, + _("TV"), + DECORPERM_SOLID_FLOOR, + DECORSHAPE_1x1, + DECORCAT_ORNAMENT, + 3000, + DecorDesc_TV, + DecorGfx_TV + }, { + DECOR_ROUND_TV, + _("ROUND TV"), + DECORPERM_SOLID_FLOOR, + DECORSHAPE_1x1, + DECORCAT_ORNAMENT, + 4000, + DecorDesc_ROUND_TV, + DecorGfx_ROUND_TV + }, { + DECOR_CUTE_TV, + _("CUTE TV"), + DECORPERM_SOLID_FLOOR, + DECORSHAPE_1x1, + DECORCAT_ORNAMENT, + 4000, + DecorDesc_CUTE_TV, + DecorGfx_CUTE_TV + }, { + DECOR_GLITTER_MAT, + _("GLITTER MAT"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_MAT, + 2000, + DecorDesc_GLITTER_MAT, + DecorGfx_GLITTER_MAT + }, { + DECOR_JUMP_MAT, + _("JUMP MAT"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_MAT, + 2000, + DecorDesc_JUMP_MAT, + DecorGfx_JUMP_MAT + }, { + DECOR_SPIN_MAT, + _("SPIN MAT"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_MAT, + 2000, + DecorDesc_SPIN_MAT, + DecorGfx_SPIN_MAT + }, { + DECOR_C_LOW_NOTE_MAT, + _("C Low NOTE MAT"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_MAT, + 500, + DecorDesc_C_LOW_NOTE_MAT, + DecorGfx_C_LOW_NOTE_MAT + }, { + DECOR_D_NOTE_MAT, + _("D NOTE MAT"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_MAT, + 500, + DecorDesc_D_NOTE_MAT, + DecorGfx_D_NOTE_MAT + }, { + DECOR_E_NOTE_MAT, + _("E NOTE MAT"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_MAT, + 500, + DecorDesc_E_NOTE_MAT, + DecorGfx_E_NOTE_MAT + }, { + DECOR_F_NOTE_MAT, + _("F NOTE MAT"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_MAT, + 500, + DecorDesc_F_NOTE_MAT, + DecorGfx_F_NOTE_MAT + }, { + DECOR_G_NOTE_MAT, + _("G NOTE MAT"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_MAT, + 500, + DecorDesc_G_NOTE_MAT, + DecorGfx_G_NOTE_MAT + }, { + DECOR_A_NOTE_MAT, + _("A NOTE MAT"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_MAT, + 500, + DecorDesc_A_NOTE_MAT, + DecorGfx_A_NOTE_MAT + }, { + DECOR_B_NOTE_MAT, + _("B NOTE MAT"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_MAT, + 500, + DecorDesc_B_NOTE_MAT, + DecorGfx_B_NOTE_MAT + }, { + DECOR_C_HIGH_NOTE_MAT, + _("C High NOTE MAT"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_1x1, + DECORCAT_MAT, + 500, + DecorDesc_C_HIGH_NOTE_MAT, + DecorGfx_C_HIGH_NOTE_MAT + }, { + DECOR_SURF_MAT, + _("SURF MAT"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_3x3, + DECORCAT_MAT, + 4000, + DecorDesc_SURF_MAT, + DecorGfx_SURF_MAT + }, { + DECOR_THUNDER_MAT, + _("THUNDER MAT"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_3x3, + DECORCAT_MAT, + 4000, + DecorDesc_THUNDER_MAT, + DecorGfx_THUNDER_MAT + }, { + DECOR_FIRE_BLAST_MAT, + _("FIRE BLAST MAT"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_3x3, + DECORCAT_MAT, + 4000, + DecorDesc_FIRE_BLAST_MAT, + DecorGfx_FIRE_BLAST_MAT + }, { + DECOR_POWDER_SNOW_MAT, + _("POWDER SNOW MAT"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_3x3, + DECORCAT_MAT, + 4000, + DecorDesc_POWDER_SNOW_MAT, + DecorGfx_POWDER_SNOW_MAT + }, { + DECOR_ATTRACT_MAT, + _("ATTRACT MAT"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_3x3, + DECORCAT_MAT, + 4000, + DecorDesc_ATTRACT_MAT, + DecorGfx_ATTRACT_MAT + }, { + DECOR_FISSURE_MAT, + _("FISSURE MAT"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_3x3, + DECORCAT_MAT, + 4000, + DecorDesc_FISSURE_MAT, + DecorGfx_FISSURE_MAT + }, { + DECOR_SPIKES_MAT, + _("SPIKES MAT"), + DECORPERM_PASS_FLOOR, + DECORSHAPE_3x3, + DECORCAT_MAT, + 4000, + DecorDesc_SPIKES_MAT, + DecorGfx_SPIKES_MAT + }, { + DECOR_BALL_POSTER, + _("BALL POSTER"), + DECORPERM_NA_WALL, + DECORSHAPE_1x1, + DECORCAT_POSTER, + 1000, + DecorDesc_BALL_POSTER, + DecorGfx_BALL_POSTER + }, { + DECOR_GREEN_POSTER, + _("GREEN POSTER"), + DECORPERM_NA_WALL, + DECORSHAPE_1x1, + DECORCAT_POSTER, + 1000, + DecorDesc_GREEN_POSTER, + DecorGfx_GREEN_POSTER + }, { + DECOR_RED_POSTER, + _("RED POSTER"), + DECORPERM_NA_WALL, + DECORSHAPE_1x1, + DECORCAT_POSTER, + 1000, + DecorDesc_RED_POSTER, + DecorGfx_RED_POSTER + }, { + DECOR_BLUE_POSTER, + _("BLUE POSTER"), + DECORPERM_NA_WALL, + DECORSHAPE_1x1, + DECORCAT_POSTER, + 1000, + DecorDesc_BLUE_POSTER, + DecorGfx_BLUE_POSTER + }, { + DECOR_CUTE_POSTER, + _("CUTE POSTER"), + DECORPERM_NA_WALL, + DECORSHAPE_1x1, + DECORCAT_POSTER, + 1000, + DecorDesc_CUTE_POSTER, + DecorGfx_CUTE_POSTER + }, { + DECOR_PIKA_POSTER, + _("PIKA POSTER"), + DECORPERM_NA_WALL, + DECORSHAPE_2x1, + DECORCAT_POSTER, + 1500, + DecorDesc_PIKA_POSTER, + DecorGfx_PIKA_POSTER + }, { + DECOR_LONG_POSTER, + _("LONG POSTER"), + DECORPERM_NA_WALL, + DECORSHAPE_2x1, + DECORCAT_POSTER, + 1500, + DecorDesc_LONG_POSTER, + DecorGfx_LONG_POSTER + }, { + DECOR_SEA_POSTER, + _("SEA POSTER"), + DECORPERM_NA_WALL, + DECORSHAPE_2x1, + DECORCAT_POSTER, + 1500, + DecorDesc_SEA_POSTER, + DecorGfx_SEA_POSTER + }, { + DECOR_SKY_POSTER, + _("SKY POSTER"), + DECORPERM_NA_WALL, + DECORSHAPE_2x1, + DECORCAT_POSTER, + 1500, + DecorDesc_SKY_POSTER, + DecorGfx_SKY_POSTER + }, { + DECOR_KISS_POSTER, + _("KISS POSTER"), + DECORPERM_NA_WALL, + DECORSHAPE_2x1, + DECORCAT_POSTER, + 1500, + DecorDesc_KISS_POSTER, + DecorGfx_KISS_POSTER + }, { + DECOR_PICHU_DOLL, + _("PICHU DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_PICHU_DOLL, + DecorGfx_PICHU_DOLL + }, { + DECOR_PIKACHU_DOLL, + _("PIKACHU DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_PIKACHU_DOLL, + DecorGfx_PIKACHU_DOLL + }, { + DECOR_MARILL_DOLL, + _("MARILL DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_MARILL_DOLL, + DecorGfx_MARILL_DOLL + }, { + DECOR_TOGEPI_DOLL, + _("TOGEPI DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_TOGEPI_DOLL, + DecorGfx_TOGEPI_DOLL + }, { + DECOR_CYNDAQUIL_DOLL, + _("CYNDAQUIL DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_CYNDAQUIL_DOLL, + DecorGfx_CYNDAQUIL_DOLL + }, { + DECOR_CHIKORITA_DOLL, + _("CHIKORITA DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_CHIKORITA_DOLL, + DecorGfx_CHIKORITA_DOLL + }, { + DECOR_TOTODILE_DOLL, + _("TOTODILE DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_TOTODILE_DOLL, + DecorGfx_TOTODILE_DOLL + }, { + DECOR_JIGGLYPUFF_DOLL, + _("JIGGLYPUFF DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_JIGGLYPUFF_DOLL, + DecorGfx_JIGGLYPUFF_DOLL + }, { + DECOR_MEOWTH_DOLL, + _("MEOWTH DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_MEOWTH_DOLL, + DecorGfx_MEOWTH_DOLL + }, { + DECOR_CLEFAIRY_DOLL, + _("CLEFAIRY DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_CLEFAIRY_DOLL, + DecorGfx_CLEFAIRY_DOLL + }, { + DECOR_DITTO_DOLL, + _("DITTO DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_DITTO_DOLL, + DecorGfx_DITTO_DOLL + }, { + DECOR_SMOOCHUM_DOLL, + _("SMOOCHUM DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_SMOOCHUM_DOLL, + DecorGfx_SMOOCHUM_DOLL + }, { + DECOR_TREECKO_DOLL, + _("TREECKO DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_TREECKO_DOLL, + DecorGfx_TREECKO_DOLL + }, { + DECOR_TORCHIC_DOLL, + _("TORCHIC DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_TORCHIC_DOLL, + DecorGfx_TORCHIC_DOLL + }, { + DECOR_MUDKIP_DOLL, + _("MUDKIP DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_MUDKIP_DOLL, + DecorGfx_MUDKIP_DOLL + }, { + DECOR_DUSKULL_DOLL, + _("DUSKULL DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_DUSKULL_DOLL, + DecorGfx_DUSKULL_DOLL + }, { + DECOR_WYNAUT_DOLL, + _("WYNAUT DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_WYNAUT_DOLL, + DecorGfx_WYNAUT_DOLL + }, { + DECOR_BALTOY_DOLL, + _("BALTOY DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_BALTOY_DOLL, + DecorGfx_BALTOY_DOLL + }, { + DECOR_KECLEON_DOLL, + _("KECLEON DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_KECLEON_DOLL, + DecorGfx_KECLEON_DOLL + }, { + DECOR_AZURILL_DOLL, + _("AZURILL DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_AZURILL_DOLL, + DecorGfx_AZURILL_DOLL + }, { + DECOR_SKITTY_DOLL, + _("SKITTY DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_SKITTY_DOLL, + DecorGfx_SKITTY_DOLL + }, { + DECOR_SWABLU_DOLL, + _("SWABLU DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_SWABLU_DOLL, + DecorGfx_SWABLU_DOLL + }, { + DECOR_GULPIN_DOLL, + _("GULPIN DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_GULPIN_DOLL, + DecorGfx_GULPIN_DOLL + }, { + DECOR_LOTAD_DOLL, + _("LOTAD DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_LOTAD_DOLL, + DecorGfx_LOTAD_DOLL + }, { + DECOR_SEEDOT_DOLL, + _("SEEDOT DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_DOLL, + 3000, + DecorDesc_SEEDOT_DOLL, + DecorGfx_SEEDOT_DOLL + }, { + DECOR_PIKA_CUSHION, + _("PIKA CUSHION"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_CUSHION, + 2000, + DecorDesc_PIKA_CUSHION, + DecorGfx_PIKA_CUSHION + }, { + DECOR_ROUND_CUSHION, + _("ROUND CUSHION"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_CUSHION, + 2000, + DecorDesc_ROUND_CUSHION, + DecorGfx_ROUND_CUSHION + }, { + DECOR_KISS_CUSHION, + _("KISS CUSHION"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_CUSHION, + 2000, + DecorDesc_KISS_CUSHION, + DecorGfx_KISS_CUSHION + }, { + DECOR_ZIGZAG_CUSHION, + _("ZIGZAG CUSHION"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_CUSHION, + 2000, + DecorDesc_ZIGZAG_CUSHION, + DecorGfx_ZIGZAG_CUSHION + }, { + DECOR_SPIN_CUSHION, + _("SPIN CUSHION"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_CUSHION, + 2000, + DecorDesc_SPIN_CUSHION, + DecorGfx_SPIN_CUSHION + }, { + DECOR_DIAMOND_CUSHION, + _("DIAMOND CUSHION"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_CUSHION, + 2000, + DecorDesc_DIAMOND_CUSHION, + DecorGfx_DIAMOND_CUSHION + }, { + DECOR_BALL_CUSHION, + _("BALL CUSHION"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_CUSHION, + 2000, + DecorDesc_BALL_CUSHION, + DecorGfx_BALL_CUSHION + }, { + DECOR_GRASS_CUSHION, + _("GRASS CUSHION"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_CUSHION, + 2000, + DecorDesc_GRASS_CUSHION, + DecorGfx_GRASS_CUSHION + }, { + DECOR_FIRE_CUSHION, + _("FIRE CUSHION"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_CUSHION, + 2000, + DecorDesc_FIRE_CUSHION, + DecorGfx_FIRE_CUSHION + }, { + DECOR_WATER_CUSHION, + _("WATER CUSHION"), + DECORPERM_SPRITE, + DECORSHAPE_1x1, + DECORCAT_CUSHION, + 2000, + DecorDesc_WATER_CUSHION, + DecorGfx_WATER_CUSHION + }, { + DECOR_SNORLAX_DOLL, + _("SNORLAX DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x2, + DECORCAT_DOLL, + 10000, + DecorDesc_SNORLAX_DOLL, + DecorGfx_SNORLAX_DOLL + }, { + DECOR_RHYDON_DOLL, + _("RHYDON DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x2, + DECORCAT_DOLL, + 10000, + DecorDesc_RHYDON_DOLL, + DecorGfx_RHYDON_DOLL + }, { + DECOR_LAPRAS_DOLL, + _("LAPRAS DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x2, + DECORCAT_DOLL, + 10000, + DecorDesc_LAPRAS_DOLL, + DecorGfx_LAPRAS_DOLL + }, { + DECOR_VENUSAUR_DOLL, + _("VENUSAUR DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x2, + DECORCAT_DOLL, + 10000, + DecorDesc_VENUSAUR_DOLL, + DecorGfx_VENUSAUR_DOLL + }, { + DECOR_CHARIZARD_DOLL, + _("CHARIZARD DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x2, + DECORCAT_DOLL, + 10000, + DecorDesc_CHARIZARD_DOLL, + DecorGfx_CHARIZARD_DOLL + }, { + DECOR_BLASTOISE_DOLL, + _("BLASTOISE DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x2, + DECORCAT_DOLL, + 10000, + DecorDesc_BLASTOISE_DOLL, + DecorGfx_BLASTOISE_DOLL + }, { + DECOR_WAILMER_DOLL, + _("WAILMER DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x2, + DECORCAT_DOLL, + 10000, + DecorDesc_WAILMER_DOLL, + DecorGfx_WAILMER_DOLL + }, { + DECOR_REGIROCK_DOLL, + _("REGIROCK DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x2, + DECORCAT_DOLL, + 10000, + DecorDesc_REGIROCK_DOLL, + DecorGfx_REGIROCK_DOLL + }, { + DECOR_REGICE_DOLL, + _("REGICE DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x2, + DECORCAT_DOLL, + 10000, + DecorDesc_REGICE_DOLL, + DecorGfx_REGICE_DOLL + }, { + DECOR_REGISTEEL_DOLL, + _("REGISTEEL DOLL"), + DECORPERM_SPRITE, + DECORSHAPE_1x2, + DECORCAT_DOLL, + 10000, + DecorDesc_REGISTEEL_DOLL, + DecorGfx_REGISTEEL_DOLL} +}; diff --git a/src/data/decoration/tiles.h b/src/data/decoration/tiles.h new file mode 100644 index 000000000..ff6ef3e12 --- /dev/null +++ b/src/data/decoration/tiles.h @@ -0,0 +1,643 @@ +#include "constants/event_objects.h" + +const u16 DecorGfx_SMALL_DESK[] = { + 0x87 +}; + +const u16 DecorGfx_POKEMON_DESK[] = { + 0x8F +}; + +const u16 DecorGfx_HEAVY_DESK[] = { + 0x90, + 0x91, + 0x92, + 0x98, + 0x99, + 0x9A +}; + +const u16 DecorGfx_RAGGED_DESK[] = { + 0x93, + 0x94, + 0x95, + 0x9B, + 0x9C, + 0x9D +}; + +const u16 DecorGfx_COMFORT_DESK[] = { + 0x96, + 0x97, + 0xA3, + 0x9E, + 0x9F, + 0xAB +}; + +const u16 DecorGfx_PRETTY_DESK[] = { + 0xBD, + 0xBE, + 0xBF, + 0xC5, + 0xC6, + 0xC7, + 0xCD, + 0xCE, + 0xCF +}; + +const u16 DecorGfx_BRICK_DESK[] = { + 0xA0, + 0xA1, + 0xA2, + 0xA8, + 0xA9, + 0xAA, + 0xB0, + 0xB1, + 0xB2 +}; + +const u16 DecorGfx_CAMP_DESK[] = { + 0xA4, + 0xA5, + 0xA6, + 0xAC, + 0xAD, + 0xAE, + 0xB4, + 0xB5, + 0xB6 +}; + +const u16 DecorGfx_HARD_DESK[] = { + 0xA7, + 0xBB, + 0xBC, + 0xAF, + 0xC3, + 0xC4, + 0xB7, + 0xCB, + 0xCC +}; + +const u16 DecorGfx_SMALL_CHAIR[] = { + 0xB8 +}; + +const u16 DecorGfx_POKEMON_CHAIR[] = { + 0xB9 +}; + +const u16 DecorGfx_HEAVY_CHAIR[] = { + 0xBA +}; + +const u16 DecorGfx_PRETTY_CHAIR[] = { + 0xC0 +}; + +const u16 DecorGfx_COMFORT_CHAIR[] = { + 0xC1 +}; + +const u16 DecorGfx_RAGGED_CHAIR[] = { + 0xC2 +}; + +const u16 DecorGfx_BRICK_CHAIR[] = { + 0xC8 +}; + +const u16 DecorGfx_CAMP_CHAIR[] = { + 0xC9 +}; + +const u16 DecorGfx_HARD_CHAIR[] = { + 0xCA +}; + +const u16 DecorGfx_RED_PLANT[] = { + 0xD0, + 0xD8 +}; + +const u16 DecorGfx_TROPICAL_PLANT[] = { + 0xD2, + 0xDA +}; + +const u16 DecorGfx_PRETTY_FLOWERS[] = { + 0xD4, + 0xDC +}; + +const u16 DecorGfx_COLORFUL_PLANT[] = { + 0xE0, + 0xE2, + 0xE8, + 0xE9 +}; + +const u16 DecorGfx_BIG_PLANT[] = { + 0xE4, + 0xE6, + 0xEC, + 0xED +}; + +const u16 DecorGfx_GORGEOUS_PLANT[] = { + 0xF0, + 0xF2, + 0xF8, + 0xF9 +}; + +const u16 DecorGfx_RED_BRICK[] = { + 0x25, + 0x2D +}; + +const u16 DecorGfx_YELLOW_BRICK[] = { + 0x26, + 0x2E +}; + +const u16 DecorGfx_BLUE_BRICK[] = { + 0x27, + 0x2F +}; + +const u16 DecorGfx_RED_BALLOON[] = { + 0x138 +}; + +const u16 DecorGfx_BLUE_BALLOON[] = { + 0x13C +}; + +const u16 DecorGfx_YELLOW_BALLOON[] = { + 0x140 +}; + +const u16 DecorGfx_RED_TENT[] = { + 0x30, + 0x31, + 0x32, + 0x38, + 0x39, + 0x3A, + 0x40, + 0x41, + 0x3B +}; + +const u16 DecorGfx_BLUE_TENT[] = { + 0x48, + 0x49, + 0x68, + 0x50, + 0x51, + 0x70, + 0x58, + 0x59, + 0x69 +}; + +const u16 DecorGfx_SOLID_BOARD[] = { + 0x34, + 0x3C +}; + +const u16 DecorGfx_SLIDE[] = { + 0x35, + 0x36, + 0x3D, + 0x3E, + 0x63, + 0x64, + 0x6F, + 0x77 +}; + +const u16 DecorGfx_FENCE_LENGTH[] = { + 0x33 +}; + +const u16 DecorGfx_FENCE_WIDTH[] = { + 0x2C +}; + +const u16 DecorGfx_TIRE[] = { + 0x80, + 0x81, + 0x88, + 0x89 +}; + +const u16 DecorGfx_STAND[] = { + 0x6A, + 0x6B, + 0x6C, + 0x6D, + 0x72, + 0x73, + 0x74, + 0x75 +}; + +const u16 DecorGfx_MUD_BALL[] = { + 0x28 +}; + +const u16 DecorGfx_BREAKABLE_DOOR[] = { + 0x37, + 0x3F +}; + +const u16 DecorGfx_SAND_ORNAMENT[] = { + 0x85, + 0x8D +}; + +const u16 DecorGfx_SILVER_SHIELD[] = { + 0xD6, + 0xDE +}; + +const u16 DecorGfx_GOLD_SHIELD[] = { + 0x12E, + 0x136 +}; + +const u16 DecorGfx_GLASS_ORNAMENT[] = { + 0x82, + 0x8A +}; + +const u16 DecorGfx_TV[] = { + 0xF4 +}; + +const u16 DecorGfx_ROUND_TV[] = { + 0xF5 +}; + +const u16 DecorGfx_CUTE_TV[] = { + 0xF6 +}; + +const u16 DecorGfx_GLITTER_MAT[] = { + 0x60 +}; + +const u16 DecorGfx_JUMP_MAT[] = { + 0x61 +}; + +const u16 DecorGfx_SPIN_MAT[] = { + 0x62 +}; + +const u16 DecorGfx_C_LOW_NOTE_MAT[] = { + 0x78 +}; + +const u16 DecorGfx_D_NOTE_MAT[] = { + 0x79 +}; + +const u16 DecorGfx_E_NOTE_MAT[] = { + 0x7A +}; + +const u16 DecorGfx_F_NOTE_MAT[] = { + 0x7B +}; + +const u16 DecorGfx_G_NOTE_MAT[] = { + 0x7C +}; + +const u16 DecorGfx_A_NOTE_MAT[] = { + 0x7D +}; + +const u16 DecorGfx_B_NOTE_MAT[] = { + 0x7E +}; + +const u16 DecorGfx_C_HIGH_NOTE_MAT[] = { + 0xB3 +}; + +const u16 DecorGfx_SURF_MAT[] = { + 0x42, + 0x43, + 0x44, + 0x4A, + 0x4B, + 0x4C, + 0x52, + 0x53, + 0x54 +}; + +const u16 DecorGfx_THUNDER_MAT[] = { + 0x45, + 0x46, + 0x47, + 0x4D, + 0x4E, + 0x4F, + 0x55, + 0x56, + 0x57 +}; + +const u16 DecorGfx_FIRE_BLAST_MAT[] = { + 0x5A, + 0x5B, + 0x5C, + 0x5D, + 0x5E, + 0x5F, + 0x65, + 0x66, + 0x67 +}; + +const u16 DecorGfx_POWDER_SNOW_MAT[] = { + 0x100, + 0x101, + 0x102, + 0x108, + 0x109, + 0x10A, + 0x110, + 0x111, + 0x112 +}; + +const u16 DecorGfx_ATTRACT_MAT[] = { + 0x103, + 0x104, + 0x105, + 0x10B, + 0x10C, + 0x10D, + 0x113, + 0x114, + 0x115 +}; + +const u16 DecorGfx_FISSURE_MAT[] = { + 0x106, + 0x107, + 0x118, + 0x10E, + 0x10F, + 0x120, + 0x116, + 0x117, + 0x128 +}; + +const u16 DecorGfx_SPIKES_MAT[] = { + 0x119, + 0x11A, + 0x11B, + 0x121, + 0x122, + 0x123, + 0x129, + 0x12A, + 0x12B +}; + +const u16 DecorGfx_BALL_POSTER[] = { + 0x130 +}; + +const u16 DecorGfx_GREEN_POSTER[] = { + 0x131 +}; + +const u16 DecorGfx_RED_POSTER[] = { + 0x132 +}; + +const u16 DecorGfx_BLUE_POSTER[] = { + 0x133 +}; + +const u16 DecorGfx_CUTE_POSTER[] = { + 0x134 +}; + +const u16 DecorGfx_PIKA_POSTER[] = { + 0x11C, + 0x11D +}; + +const u16 DecorGfx_LONG_POSTER[] = { + 0x11E, + 0x11F +}; + +const u16 DecorGfx_SEA_POSTER[] = { + 0x124, + 0x125 +}; + +const u16 DecorGfx_SKY_POSTER[] = { + 0x126, + 0x127 +}; + +const u16 DecorGfx_KISS_POSTER[] = { + 0x12C, + 0x12D +}; + +const u16 DecorGfx_PICHU_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_PIKACHU_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_MARILL_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_TOGEPI_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_CYNDAQUIL_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_CHIKORITA_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_TOTODILE_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_JIGGLYPUFF_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_MEOWTH_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_CLEFAIRY_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_DITTO_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_SMOOCHUM_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_TREECKO_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_TORCHIC_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_MUDKIP_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_DUSKULL_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_WYNAUT_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_BALTOY_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_KECLEON_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_AZURILL_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_SKITTY_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_SWABLU_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_GULPIN_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_LOTAD_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_SEEDOT_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_PIKA_CUSHION[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_ROUND_CUSHION[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_KISS_CUSHION[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_ZIGZAG_CUSHION[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_SPIN_CUSHION[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_DIAMOND_CUSHION[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_BALL_CUSHION[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_GRASS_CUSHION[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_FIRE_CUSHION[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_WATER_CUSHION[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_SNORLAX_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_RHYDON_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_LAPRAS_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_VENUSAUR_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_CHARIZARD_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_BLASTOISE_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_WAILMER_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_REGIROCK_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_REGICE_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; + +const u16 DecorGfx_REGISTEEL_DOLL[] = { + OBJ_EVENT_GFX_ITEM_BALL +}; diff --git a/src/decoration.c b/src/decoration.c new file mode 100644 index 000000000..4903735f0 --- /dev/null +++ b/src/decoration.c @@ -0,0 +1,7 @@ +#include "global.h" +#include "decoration.h" +#include "constants/decorations.h" + +#include "data/decoration/tiles.h" +#include "data/decoration/description.h" +#include "data/decoration/header.h" diff --git a/src/event_object_lock.c b/src/event_object_lock.c index a72845ac7..aa9a99895 100644 --- a/src/event_object_lock.c +++ b/src/event_object_lock.c @@ -28,7 +28,7 @@ bool8 sub_8069590(void) return FALSE; else { - sub_805C780(); + StopPlayerAvatar(); return TRUE; } } @@ -65,7 +65,7 @@ bool8 sub_8069648(void) return FALSE; else { - sub_805C780(); + StopPlayerAvatar(); return TRUE; } } diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index ee413df2d..286f7519a 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -308,7 +308,7 @@ void FieldInput_HandleCancelSignpost(struct FieldInput * input) { if (input->dpadDirection != 0 && GetPlayerFacingDirection() != input->dpadDirection) { - if (sub_80699D4() == TRUE) + if (IsMsgBoxWalkawayDisabled() == TRUE) return; if (input->dpadDirection == DIR_NORTH) RegisterQuestLogInput(QL_INPUT_UP); @@ -657,9 +657,9 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior) if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_FISHING) && !MetatileBehavior_IsForcedMovementTile(metatileBehavior)) { - if (sub_810C4EC() == TRUE) + if (UpdateVsSeekerStepCounter() == TRUE) { - ScriptContext1_SetupScript(gUnknown_81A8CED); + ScriptContext1_SetupScript(EventScript_VsSeekerChargingDone); return TRUE; } else if (UpdatePoisonStepCounter() == TRUE) @@ -1086,7 +1086,7 @@ void sub_806DE70(u16 x, u16 y) { if (events[i].x + 7 == x && events[i].y + 7 == y) { - sub_8112364(); + QuestLog_OnInteractionWithSpecialNpc(); ScriptContext1_SetupScript(events[i].script); ScriptContext2_Enable(); } diff --git a/src/field_effect.c b/src/field_effect.c index c0d7d3463..b8269ae46 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -2889,7 +2889,7 @@ u8 FldEff_UseSurf(void) u8 taskId = CreateTask(Task_FldEffUseSurf, 0xff); gTasks[taskId].data[15] = gFieldEffectArguments[0]; Overworld_ClearSavedMusic(); - if (sub_8056124(MUS_NAMINORI)) + if (Overworld_MusicCanOverrideMapMusic(MUS_NAMINORI)) Overworld_ChangeMusicTo(MUS_NAMINORI); return FALSE; } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 6b51e7bc2..7e3ba59fe 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -66,7 +66,6 @@ static void PlayerNotOnBikeNotMoving(u8 direction, u16 heldKeys); static void PlayerNotOnBikeTurningInPlace(u8 direction, u16 heldKeys); static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys); static u8 CheckForPlayerAvatarCollision(u8 direction); -u8 CheckForObjectEventCollision(struct ObjectEvent * objectEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior); static bool8 CanStopSurfing(s16 x, s16 y, u8 direction); static bool8 ShouldJumpLedge(s16 x, s16 y, u8 direction); static bool8 TryPushBoulder(s16 x, s16 y, u8 direction); @@ -722,7 +721,7 @@ static void PlayerAvatarTransition_Bike(struct ObjectEvent * playerObjEvent) { sub_8150474(1); sub_8150498(1); - sub_80BD620(0, 0); + InitPlayerAvatarBikeState(0, 0); } static void PlayerAvatarTransition_Surfing(struct ObjectEvent * playerObjEvent) @@ -1115,7 +1114,7 @@ void sub_805C774(void) ForcedMovement_None(); } -void sub_805C780(void) +void StopPlayerAvatar(void) { struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; @@ -1597,7 +1596,7 @@ void CreateStopSurfingTask_NoMusicChange(u8 direction) Task_StopSurfingInit(taskId); } -void sub_805D1A8(void) +void SeafoamIslandsB4F_CurrentDumpsPlayerOnLand(void) { if (gUnknown_3005E88 != 1 && gUnknown_3005E88 != 3) { diff --git a/src/field_specials.c b/src/field_specials.c index 657c80a40..4089f68e8 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -95,7 +95,7 @@ static u8 *const sStringVarPtrs[] = { void ShowDiploma(void) { - sub_8112364(); + QuestLog_OnInteractionWithSpecialNpc(); SetMainCallback2(CB2_ShowDiploma); ScriptContext2_Enable(); } @@ -187,7 +187,7 @@ u8 GetLeadMonFriendship(void) void ShowTownMap(void) { - sub_8112364(); + QuestLog_OnInteractionWithSpecialNpc(); sub_80BFF50(1, CB2_ReturnToFieldContinueScriptPlayMapMusic); } diff --git a/src/ghost.c b/src/ghost.c index 793c9838c..35dcd267b 100644 --- a/src/ghost.c +++ b/src/ghost.c @@ -984,7 +984,7 @@ static void sub_80B6468(u8 taskId) right = 240; top = 0; bottom = 112; - selectedPalettes = sub_8075BE8(1, 0, 0, 0, 0, 0, 0); + selectedPalettes = SelectBattleAnimSpriteAndBgPalettes(1, 0, 0, 0, 0, 0, 0); BeginNormalPaletteFade(selectedPalettes, 0, 16, 16, RGB(0, 0, 0)); gTasks[taskId].func = sub_80B65F0; } diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 2284cbc3f..14f399f24 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -431,7 +431,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId) u16 i; struct HallofFameTeam* lastSavedTeam = (struct HallofFameTeam *)(gDecompressionBuffer); - sub_8112450(); + SaveQuestLogData(); if (!gHasHallOfFameRecords) { memset(gDecompressionBuffer, 0, 0x2000); @@ -706,7 +706,7 @@ static void Task_Hof_HandleExit(u8 taskId) static void SetWarpsToRollCredits(void) { VarSet(VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1); - FlagSet(FLAG_SPECIAL_FLAG_0x4000); + FlagSet(FLAG_DONT_SHOW_MAP_NAME_POPUP); gDisableMapMusicChangeOnMapLoad = 2; SetWarpDestination(MAP_GROUP(INDIGO_PLATEAU_EXTERIOR), MAP_NUM(INDIGO_PLATEAU_EXTERIOR), -1, 11, 6); DoWarp(); diff --git a/src/intro.c b/src/intro.c index 837d4f905..ec15d7473 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1,10 +1,6 @@ #include "global.h" +#include "gflib.h" #include "m4a.h" -#include "malloc.h" -#include "bg.h" -#include "palette.h" -#include "main.h" -#include "gpu_regs.h" #include "task.h" #include "scanline_effect.h" #include "libgcnmultiboot.h" @@ -12,7 +8,6 @@ #include "link.h" #include "menu.h" #include "save.h" -#include "sound.h" #include "new_game.h" #include "title_screen.h" #include "decompress.h" @@ -21,29 +16,30 @@ #include "constants/songs.h" #include "constants/species.h" +struct IntroSequenceData; + +typedef void (*IntroCallback)(struct IntroSequenceData *); + struct IntroSequenceData { - void (*field_0000)(struct IntroSequenceData *); - u8 field_0004; - u8 field_0005; - u8 field_0006; - u16 field_0008; - u16 field_000A; - u8 filler_000C[6]; - u16 field_0012; - struct Sprite * field_0014; - struct Sprite * field_0018; - struct Sprite * field_001C; - struct Sprite * field_0020; - struct Sprite * field_0024; - struct Sprite * field_0028[4]; + IntroCallback callback; + u8 state; + u8 taskId; + bool8 gengarAttackLanded; + u16 data[6]; + struct Sprite * gameFreakLogoArtSprite; + struct Sprite * nidorinoAnimSprite; + struct Sprite * gengarStaticSprite; + struct Sprite * nidorinoStaticSprite; + struct Sprite * grassSprite; + struct Sprite * gengarBackSpriteArray[4]; u8 filler_0038[0x4]; - u8 field_003C[0x400]; - u8 field_043C[0x400]; + u8 gamefreakLogoArtSpriteTiles[0x400]; + u8 gamefreakTextBitmap[0x400]; u8 filler_083C[0x2080]; }; // size: 0x28BC -static EWRAM_DATA struct GcmbStruct gUnknown_203AAD4 = {0}; +static EWRAM_DATA struct GcmbStruct sGcmb = {0}; static EWRAM_DATA u16 gUnknown_203AB00 = 0; static EWRAM_DATA u16 gUnknown_203AB02 = 0; static EWRAM_DATA u16 gUnknown_203AB04 = 0; @@ -63,182 +59,177 @@ static EWRAM_DATA u16 gUnknown_203AB1E = 0; static EWRAM_DATA u16 gUnknown_203AB20 = 0; static EWRAM_DATA u16 gUnknown_203AB22 = 0; static EWRAM_DATA u16 gUnknown_203AB24 = 0; -static EWRAM_DATA u16 gUnknown_203AB26 = 0; -static EWRAM_DATA u32 gUnknown_203AB28 = 0; -static EWRAM_DATA s16 gUnknown_203AB2C = 0; -static EWRAM_DATA u16 gUnknown_203AB2E = 0; -static EWRAM_DATA u32 gUnknown_203AB30 = 0; - -static void sub_80EC870(void); -static void sub_80EC9D4(void); -static void sub_80EC9EC(void); -static void sub_80ECA00(void); -static void sub_80ECA70(void); -static void sub_80ECAB0(u8 taskId); -static void sub_80ECAA8(struct IntroSequenceData * ptr, void (*cb)(struct IntroSequenceData *)); -static void sub_80ECAF0(struct IntroSequenceData * ptr); -static void sub_80ECB98(struct IntroSequenceData * ptr); -static void sub_80ECC3C(struct IntroSequenceData * ptr); -static void sub_80ECCA8(struct IntroSequenceData * ptr); -static void sub_80ECD60(struct IntroSequenceData * ptr); -static void sub_80ECEA4(struct IntroSequenceData * ptr); -static void sub_80ED0AC(u8 taskId); -static void sub_80ED118(void); -static void sub_80ED140(u8 taskId); -static void sub_80ED188(struct IntroSequenceData * ptr); -static void sub_80ED40C(u8 taskId); -static void sub_80ED428(u8 taskId); -static void sub_80ED444(struct IntroSequenceData * ptr); -static void sub_80ED4A0(struct IntroSequenceData * ptr); -static void sub_80ED4C0(struct IntroSequenceData * ptr); -static void sub_80ED6D8(void); -static void sub_80ED714(u8 taskId); -static void sub_80ED7D4(struct IntroSequenceData * ptr); -static void sub_80ED818(struct Sprite * sprite); -static void sub_80ED898(struct IntroSequenceData * ptr); -static void sub_80EDAF0(struct IntroSequenceData * ptr); -static void sub_80EDB70(struct IntroSequenceData * ptr); -static void sub_80EDBAC(struct IntroSequenceData * ptr); -static void sub_80EDBE8(struct IntroSequenceData * ptr); -static void sub_80EDC40(void); -static void sub_80EDDF0(void); -static void sub_80EDE04(u8 taskId); -static void sub_80EDED8(void); -static void sub_80EDEEC(u8 taskId); -static struct Sprite * sub_80EDF68(void); -static void sub_80EDF94(struct IntroSequenceData * ptr); -static void sub_80EE024(u8 taskId); -static void sub_80EE160(void); -static void sub_80EE1C4(struct Sprite * sprite); -static void sub_80EE200(u8 taskId); -static void sub_80EE29C(struct Sprite * sprite); -static void sub_80EE350(struct Sprite * sprite); -static void sub_80EE40C(struct Sprite * sprite); -static void sub_80EE4DC(struct Sprite * sprite); -static void sub_80EE4F8(struct IntroSequenceData * ptr); -static void sub_80EE528(struct Sprite * sprite, s16 a1, s16 a2, u16 a3); -static void sub_80EE580(struct Sprite * sprite); -static bool32 sub_80EE5C8(struct IntroSequenceData * ptr); -static void sub_80EE5E4(struct IntroSequenceData * ptr); -static void sub_80EE610(struct Sprite * sprite); -static void sub_80EE6A4(struct IntroSequenceData * ptr); -static void sub_80EE704(struct Sprite * sprite); -static bool8 sub_80EE850(struct IntroSequenceData * ptr); -static void sub_80EE864(s16 a1, s16 a2, s16 a3); -static void sub_80EE8E4(struct Sprite * sprite); -static void sub_80EE970(struct Sprite * sprite, u16 a1, s16 a2, u8 a3); -static void sub_80EE9D4(struct Sprite * sprite); -static void sub_80EEA94(struct IntroSequenceData * ptr); -static void sub_80EEB08(struct Sprite * sprite); -static void sub_80EEBE4(void); + +static void CB2_SetUpIntro(void); +static void CB2_Intro(void); +static void VBlankCB_Intro(void); +static void Intro_ResetGpuRegs(void); +static void StartIntroSequence(void); +static void Task_CallIntroCallback(u8 taskId); +static void SetIntroCB(struct IntroSequenceData * ptr, IntroCallback cb); +static void IntroCB_Init(struct IntroSequenceData * ptr); +static void IntroCB_OpenWin1ToTheaterDimensions(struct IntroSequenceData * ptr); +static void IntroCB_GameFreakStar(struct IntroSequenceData * ptr); +static void IntroCB_GameFreakScene_RevealGameFreakText(struct IntroSequenceData * ptr); +static void IntroCB_GameFreakScene_CreateGameFreakLogo(struct IntroSequenceData * ptr); +static void IntroCB_FightScene(struct IntroSequenceData * ptr); +static void Task_FightScene1_GrassyFieldAnim(u8 taskId); +static void FightScene1_SignalEndGrassyFieldAnim(void); +static void Task_FightScene1_ZoomEffect(u8 taskId); +static void IntroCB_FightScene2(struct IntroSequenceData * ptr); +static void Task_FightScene2_CameraHorizPanEffect(u8 taskId); +static void Task_FightScene2_CameraVertPanEffect(u8 taskId); +static void CreateMonStaticSprites(struct IntroSequenceData * ptr); +static void DestroyStaticMonSprites(struct IntroSequenceData * ptr); +static void IntroCB_FightScene3(struct IntroSequenceData * ptr); +static void FightScene3_StartBg1Scroll(void); +static void Task_FightScene3_ForestBgScroll(u8 taskId); +static void CreateGrassSprite(struct IntroSequenceData * ptr); +static void SpriteCB_Grass(struct Sprite * sprite); +static void IntroCB_FightScene4(struct IntroSequenceData * ptr); +static void CreateGengarBackSprite(struct IntroSequenceData * ptr); +static void FightScene4_StartNidorinoAffineAnim(struct IntroSequenceData * ptr); +static void FightScene4_StartGengarAffineAnim(struct IntroSequenceData * ptr); +static void IntroCB_CleanUp(struct IntroSequenceData * ptr); +static void GameFreakScene_LoadGfxCreateStar(void); +static void GameFreakScene_StartTrailingSparkleSpawner(void); +static void Task_GameFreakScene_TrailingSparkleSpawner(u8 taskId); +static void GameFreakScene_StartRevealGameFreakTextSparklesSpawner(void); +static void Task_RevealGameFreakTextSparklesSpawner(u8 taskId); +static struct Sprite * CreateGameFreakLogoArtSprite(void); +static void FightScene4_StartGengarAttack(struct IntroSequenceData * ptr); +static void Task_FightScene4_GengarAttack(u8 taskId); +static void FightScene4_CreateGengarSwipeSprites(void); +static void SpriteCB_GengarSwipe(struct Sprite * sprite); +static void Task_FightScene3_Bg0Scroll(u8 taskId); +static void SpriteCB_LargeStar(struct Sprite * sprite); +static void SpriteCB_TrailingSparkles(struct Sprite * sprite); +static void SpriteCB_TrailingSparkles2(struct Sprite * sprite); +static void SpriteCB_RevealGameFreakTextSparkles(struct Sprite * sprite); +static void CreateNidorinoAnimSprite(struct IntroSequenceData * ptr); +static void StartNidorinoAnimSpriteSlideIn(struct Sprite * sprite, s16 x0, s16 x1, u16 speed); +static void SpriteCB_NidorinoAnimSpriteSlideIn(struct Sprite * sprite); +static bool32 IsNidorinoAnimSpriteSlideInRunning(struct IntroSequenceData * ptr); +static void FightScene4_NidorinoRearsUp(struct IntroSequenceData * ptr); +static void SpriteCB_NidorinoRearsUp(struct Sprite * sprite); +static void FightScene4_StartNidorinoRecoilAnim(struct IntroSequenceData * ptr); +static void SpriteCB_NidorinoRecoil(struct Sprite * sprite); +static bool8 FightScene4_NidorinoAnimIsRunning(struct IntroSequenceData * ptr); +static void CreateNidorinoRecoilDustSprites(s16 a1, s16 a2, s16 a3); +static void SpriteCB_NidorinoRecoilDust(struct Sprite * sprite); +static void StartSpriteHopToPosAnim(struct Sprite * sprite, u16 a1, s16 a2, u8 a3); +static void SpriteCB_HopToPos(struct Sprite * sprite); +static void StartNidorinoAnim_LaunchSelfAtGengarAnim(struct IntroSequenceData * ptr); +static void SpriteCB_NidorinoAnim_LaunchSelfAtGengar(struct Sprite * sprite); +static void LoadFightSceneSpriteTilesAndPals(void); #if REVISION >= 1 -static void sub_rev1_80EDFAC(void); +static void Rev1_GameFreakScene_CreatePresentsText(void); #else -#define sub_rev1_80EDFAC() +#define Rev1_GameFreakScene_CreatePresentsText() #endif extern const u32 gMultiBootProgram_PokemonColosseum_Start[]; -static const u16 gUnknown_8402260[] = INCBIN_U16("graphics/intro/unk_8402260.gbapal"); -static const u8 gUnknown_8402280[] = INCBIN_U8("graphics/intro/unk_8402280.4bpp.lz"); -static const u8 gUnknown_84024E4[] = INCBIN_U8("graphics/intro/unk_84024E4.bin.lz"); -static const u16 gUnknown_8402630[] = INCBIN_U16("graphics/intro/unk_8402630.gbapal"); -static const u8 gUnknown_8402650[] = INCBIN_U8("graphics/intro/unk_8402650.4bpp.lz"); -static const u8 gUnknown_8402668[] = INCBIN_U8("graphics/intro/unk_8402668.bin.lz"); -static const u16 gUnknown_840270C[] = INCBIN_U16("graphics/intro/unk_840270C.gbapal"); -static const u8 gUnknown_840272C[] = INCBIN_U8("graphics/intro/unk_840272C.4bpp.lz"); -static const u32 gUnknown_84028F8[] = INCBIN_U32("graphics/intro/unk_84028F8.bin.lz"); -static const u16 gUnknown_8402A44[] = INCBIN_U16("graphics/intro/unk_8402A64.gbapal"); -static const u32 gUnknown_8402A64[] = INCBIN_U32("graphics/intro/unk_8402A64.4bpp.lz"); -static const u16 gUnknown_8402ABC[] = INCBIN_U16("graphics/intro/unk_8402ADC.gbapal"); -static const u32 gUnknown_8402ADC[] = INCBIN_U32("graphics/intro/unk_8402ADC.4bpp.lz"); -static const u32 gUnknown_8402B2C[] = INCBIN_U32("graphics/intro/unk_8402B2C.4bpp.lz"); -static const u32 gUnknown_8402CD4[] = INCBIN_U32("graphics/intro/unk_8402CD4.4bpp.lz"); -static const u16 gUnknown_8402D34[] = INCBIN_U16("graphics/intro/unk_8402D34.gbapal"); -static const u8 gUnknown_8402D54[] = INCBIN_U8("graphics/intro/unk_8402D54.4bpp.lz"); -static const u8 gUnknown_8403FE8[] = INCBIN_U8("graphics/intro/unk_8403FE8.bin.lz"); -static const u16 gUnknown_84048CC[] = INCBIN_U16("graphics/intro/unk_84048CC.gbapal"); -static const u8 gUnknown_84048EC[] = INCBIN_U8("graphics/intro/unk_84048EC.4bpp.lz"); -static const u8 gUnknown_8404F7C[] = INCBIN_U8("graphics/intro/unk_8404F7C.bin.lz"); -static const u16 gUnknown_84053B4[] = INCBIN_U16("graphics/intro/unk_84053B4.gbapal"); -static const u8 gUnknown_8405414[] = INCBIN_U8("graphics/intro/unk_8405414.4bpp.lz"); -static const u8 gUnknown_8405890[] = INCBIN_U8("graphics/intro/unk_8405890.bin.lz"); -static const u16 gUnknown_8405B08[] = INCBIN_U16("graphics/intro/unk_8405B08.gbapal"); -static const u8 gUnknown_8405B28[] = INCBIN_U8("graphics/intro/unk_8405B28.4bpp.lz"); -static const u8 gUnknown_8405CDC[] = INCBIN_U8("graphics/intro/unk_8405CDC.bin.lz"); -static const u16 gUnknown_8405DA4[] = INCBIN_U16("graphics/intro/unk_8405DA4.gbapal"); -static const u8 gUnknown_8405DC4[] = INCBIN_U8("graphics/intro/unk_8405DC4.4bpp.lz"); -static const u8 gUnknown_840644C[] = INCBIN_U8("graphics/intro/unk_840644C.bin.lz"); -static const u16 gUnknown_8406634[] = INCBIN_U16("graphics/intro/unk_8406634.gbapal"); -static const u8 gUnknown_8406654[] = INCBIN_U8("graphics/intro/unk_8406654.4bpp.lz"); -static const u8 gUnknown_84071D0[] = INCBIN_U8("graphics/intro/unk_84071D0.bin.lz"); -static const u16 gUnknown_8407430[] = INCBIN_U16("graphics/intro/unk_8407430.gbapal"); -static const u8 gUnknown_8407470[] = INCBIN_U8("graphics/intro/unk_8407470.4bpp.lz"); -static const u8 gUnknown_8407A50[] = INCBIN_U8("graphics/intro/unk_8407A50.bin.lz"); -static const u8 gUnknown_8407B9C[] = INCBIN_U8("graphics/intro/unk_8407B9C.4bpp.lz"); -static const u8 gUnknown_8408D98[] = INCBIN_U8("graphics/intro/unk_8408D98.bin.lz"); -static const u32 gUnknown_840926C[] = INCBIN_U32("graphics/intro/unk_840926C.4bpp.lz"); -static const u16 gUnknown_84096AC[] = INCBIN_U16("graphics/intro/unk_84096AC.gbapal"); -static const u32 gUnknown_84096CC[] = INCBIN_U32("graphics/intro/unk_84096CC.4bpp.lz"); -static const u16 gUnknown_8409A1C[] = INCBIN_U16("graphics/intro/unk_8409A1C.gbapal"); -static const u32 gUnknown_8409A3C[] = INCBIN_U32("graphics/intro/unk_8409A3C.4bpp.lz"); -static const u32 gUnknown_8409D20[] = INCBIN_U32("graphics/intro/unk_8409D20.4bpp.lz"); -static const u32 gUnknown_840A3E4[] = INCBIN_U32("graphics/intro/unk_840A3E4.4bpp.lz"); -static const u16 gUnknown_840B834[] = INCBIN_U16("graphics/intro/unk_840B834.gbapal"); -static const u16 gUnknown_840B854[] = INCBIN_U16("graphics/intro/unk_840B854.gbapal"); -static const u32 gUnknown_840B874[] = INCBIN_U32("graphics/intro/unk_840B874.4bpp.lz"); -static const u32 gUnknown_840BAE0[] = INCBIN_U32("graphics/intro/unk_840BAE0.4bpp.lz"); - -static const struct BgTemplate gUnknown_840BB80[] = { +static const u16 sCopyrightGraphicsPal[] = INCBIN_U16("graphics/intro/unk_8402260.gbapal"); +static const u8 sCopyrightGraphicsTiles[] = INCBIN_U8("graphics/intro/unk_8402280.4bpp.lz"); +static const u8 sCopyrightGraphicsMap[] = INCBIN_U8("graphics/intro/unk_84024E4.bin.lz"); +static const u16 sBg3Pal_GameFreakPresents[] = INCBIN_U16("graphics/intro/unk_8402630.gbapal"); +static const u8 sBg3Tiles_GameFreakPresents[] = INCBIN_U8("graphics/intro/unk_8402650.4bpp.lz"); +static const u8 sBg3Map_GameFreakPresents[] = INCBIN_U8("graphics/intro/unk_8402668.bin.lz"); +static const u16 sSpritePals_GameFreakPresents[] = INCBIN_U16("graphics/intro/unk_840270C.gbapal"); +static const u8 sBlit_GameFreakText[] = INCBIN_U8("graphics/intro/unk_840272C.4bpp.lz"); +static const u32 sSpriteTiles_GameFreakLogoArt[] = INCBIN_U32("graphics/intro/unk_84028F8.4bpp.lz"); +static const u16 sSpritePals_LargeStar[] = INCBIN_U16("graphics/intro/unk_8402A64.gbapal"); +static const u32 sSpriteTiles_LargeStar[] = INCBIN_U32("graphics/intro/unk_8402A64.4bpp.lz"); +static const u16 sSpritePals_Sparkles[] = INCBIN_U16("graphics/intro/unk_8402ADC.gbapal"); +static const u32 sSpriteTiles_TrailingSparkles[] = INCBIN_U32("graphics/intro/unk_8402ADC.4bpp.lz"); +static const u32 sSpriteTiles_RevealGameFreakTextSparkles[] = INCBIN_U32("graphics/intro/unk_8402B2C.4bpp.lz"); +static const u32 sSpriteTiles_PresentsText[] = INCBIN_U32("graphics/intro/unk_8402CD4.4bpp.lz"); +static const u16 sBg0Pal_FightScene1[] = INCBIN_U16("graphics/intro/unk_8402D34.gbapal"); +static const u8 sBg0Tiles_FightScene1[] = INCBIN_U8("graphics/intro/unk_8402D54.4bpp.lz"); +static const u8 sBg0Map_FightScene1[] = INCBIN_U8("graphics/intro/unk_8403FE8.bin.lz"); +static const u16 sBg1Pal_FightScene1[] = INCBIN_U16("graphics/intro/unk_84048CC.gbapal"); +static const u8 sBg1Tiles_FightScene1[] = INCBIN_U8("graphics/intro/unk_84048EC.4bpp.lz"); +static const u8 sBg1Map_FightScene1[] = INCBIN_U8("graphics/intro/unk_8404F7C.bin.lz"); +static const u16 sBg3Pal_FightScene2[] = INCBIN_U16("graphics/intro/unk_84053B4.gbapal"); +static const u8 sBg3Tiles_FightScene2[] = INCBIN_U8("graphics/intro/unk_8405414.4bpp.lz"); +static const u8 sBg3Map_FightScene2[] = INCBIN_U8("graphics/intro/unk_8405890.bin.lz"); +static const u16 sBg0Pal_FightScene2[] = INCBIN_U16("graphics/intro/unk_8405B08.gbapal"); +static const u8 sBg0Tiles_FightScene2[] = INCBIN_U8("graphics/intro/unk_8405B28.4bpp.lz"); +static const u8 sBg0Map_FightScene2[] = INCBIN_U8("graphics/intro/unk_8405CDC.bin.lz"); +static const u16 sSpritePals_Gengar[] = INCBIN_U16("graphics/intro/unk_8405DA4.gbapal"); +static const u8 sBg2Tiles_FightScene2[] = INCBIN_U8("graphics/intro/unk_8405DC4.4bpp.lz"); +static const u8 sBg2Map_FightScene2[] = INCBIN_U8("graphics/intro/unk_840644C.bin.lz"); +static const u16 sBg1Pal_FightScene2[] = INCBIN_U16("graphics/intro/unk_8406634.gbapal"); +static const u8 sBg1Tiles_FightScene2[] = INCBIN_U8("graphics/intro/unk_8406654.4bpp.lz"); +static const u8 sBg1Map_FightScene2[] = INCBIN_U8("graphics/intro/unk_84071D0.bin.lz"); +static const u16 sBg1Pal_FightScene3[] = INCBIN_U16("graphics/intro/unk_8407430.gbapal"); +static const u8 sBg1Tiles_FightScene3[] = INCBIN_U8("graphics/intro/unk_8407470.4bpp.lz"); +static const u8 sBg1Map_FightScene3[] = INCBIN_U8("graphics/intro/unk_8407A50.bin.lz"); +static const u8 sBg0Tiles_FightScene3[] = INCBIN_U8("graphics/intro/unk_8407B9C.4bpp.lz"); +static const u8 sBg0Map_FightScene3[] = INCBIN_U8("graphics/intro/unk_8408D98.bin.lz"); +static const u32 sSpriteTiles_GengarStatic[] = INCBIN_U32("graphics/intro/unk_840926C.4bpp.lz"); +static const u16 sSpritePals_Nidorino[] = INCBIN_U16("graphics/intro/unk_84096AC.gbapal"); +static const u32 sSpriteTiles_NidorinoStatic[] = INCBIN_U32("graphics/intro/unk_84096CC.4bpp.lz"); +static const u16 sSpritePals_Grass[] = INCBIN_U16("graphics/intro/unk_8409A1C.gbapal"); +static const u32 sSpriteTiles_Grass[] = INCBIN_U32("graphics/intro/unk_8409A3C.4bpp.lz"); +static const u32 sSpriteTiles_GengarBack[] = INCBIN_U32("graphics/intro/unk_8409D20.4bpp.lz"); +static const u32 sSpriteTiles_NidorinoAnim[] = INCBIN_U32("graphics/intro/unk_840A3E4.4bpp.lz"); +static const u16 sSpritePals_GengarSwipe[] = INCBIN_U16("graphics/intro/unk_840B834.gbapal"); +static const u16 sSpritePals_NidorinoRecoilDust[] = INCBIN_U16("graphics/intro/unk_840B854.gbapal"); +static const u32 sSpriteTiles_GengarSwipe[] = INCBIN_U32("graphics/intro/unk_840B874.4bpp.lz"); +static const u32 sSpriteTiles_NidorinoRecoilDust[] = INCBIN_U32("graphics/intro/unk_840BAE0.4bpp.lz"); + +static const struct BgTemplate sBgTemplates_GameFreakScene[] = { { 3, 3, 31, 0, 0, 3, 0x000 }, { 2, 3, 30, 0, 0, 2, 0x010 } }; -static const struct BgTemplate gUnknown_840BB88[] = { +static const struct BgTemplate sBgTemplates_FightScene1[] = { { 0, 0, 28, 2, 0, 0, 0x000 }, { 1, 1, 30, 2, 0, 0, 0x000 } }; -static const struct BgTemplate gUnknown_840BB90[] = { +static const struct BgTemplate sBgTemplates_FightScene2[] = { { 3, 1, 30, 2, 0, 3, 0x000 }, { 0, 0, 29, 0, 0, 0, 0x000 }, { 2, 3, 27, 0, 0, 2, 0x000 }, { 1, 2, 28, 0, 0, 1, 0x000 } }; -static const struct BgTemplate gUnknown_840BBA0[] = { +static const struct BgTemplate sBgTemplates_FightScene3[] = { { 1, 0, 29, 0, 0, 1, 0x000 }, { 0, 1, 30, 2, 0, 0, 0x000 } }; -static const struct WindowTemplate gUnknown_840BBA8[] = { +static const struct WindowTemplate sWindowTemplate[] = { { 2, 6, 4, 18, 9, 0xD, 0x000 }, DUMMY_WIN_TEMPLATE }; -static const u8 gUnknown_840BBB8[][2] = { +static const u8 sGengarBackSpritePos2UpdateMods[][2] = { {0x3f, 0x3f}, {0x00, 0x3f}, {0x3f, 0x00}, {0x00, 0x00} }; -static const struct CompressedSpriteSheet gUnknown_840BBC0[] = { - {gUnknown_8402A64, 0x0080, 0}, - {gUnknown_8402ADC, 0x0080, 1}, - {gUnknown_8402B2C, 0x0800, 2}, - {gUnknown_84028F8, 0x0400, 3}, - {gUnknown_8402CD4, 0x0100, 4} +static const struct CompressedSpriteSheet sSpriteSheets_GameFreakScene[] = { + {sSpriteTiles_LargeStar, 0x0080, 0}, + {sSpriteTiles_TrailingSparkles, 0x0080, 1}, + {sSpriteTiles_RevealGameFreakTextSparkles, 0x0800, 2}, + {sSpriteTiles_GameFreakLogoArt, 0x0400, 3}, + {sSpriteTiles_PresentsText, 0x0100, 4} }; -static const struct SpritePalette gUnknown_840BBE8[] = { - {gUnknown_8402A44, 0}, - {gUnknown_8402ABC, 1}, - {gUnknown_840270C, 3}, +static const struct SpritePalette sSpritePalettes_GameFreakScene[] = { + {sSpritePals_LargeStar, 0}, + {sSpritePals_Sparkles, 1}, + {sSpritePals_GameFreakPresents, 3}, {0} }; -static const struct Coords16 gUnknown_840BC08[] = { +static const struct Coords16 sTrailingSparkleCoords[] = { {0x0048, 0x0050}, {0x0088, 0x004a}, {0x00a8, 0x0050}, @@ -275,9 +266,9 @@ static const union AnimCmd *const gAnimCmdTable_840BC64[] = { gAnimCmd_840BC50 }; -static const struct SpriteTemplate gUnknown_840BC6C = {0, 0, &gOamData_840BC2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80EE29C}; +static const struct SpriteTemplate sSpriteTemplate_LargeStar = {0, 0, &gOamData_840BC2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCB_LargeStar}; -static const struct SpriteTemplate gUnknown_840BC84 = {1, 1, &gOamData_840BC34, gAnimCmdTable_840BC64, NULL, gDummySpriteAffineAnimTable, sub_80EE350}; +static const struct SpriteTemplate sSpriteTemplate_TrailingSparkles = {1, 1, &gOamData_840BC34, gAnimCmdTable_840BC64, NULL, gDummySpriteAffineAnimTable, SpriteCB_TrailingSparkles}; static const struct OamData gOamData_840BC9C = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, .mosaic = FALSE, .bpp = ST_OAM_4BPP, .shape = ST_OAM_SQUARE, .matrixNum = 0, .size = ST_OAM_SIZE_2, .tileNum = 0x000, .priority = 2, .paletteNum = 0 }; @@ -293,15 +284,15 @@ static const union AnimCmd *const gAnimCmdTable_840BCB8[] = { gAnimCmd_840BCA4 }; -static const struct SpriteTemplate gUnknown_840BCBC = {2, 1, &gOamData_840BC9C, gAnimCmdTable_840BCB8, NULL, gDummySpriteAffineAnimTable, sub_80EE4DC}; +static const struct SpriteTemplate sSpriteTemplate_RevealGameFreakTextSparkles = {2, 1, &gOamData_840BC9C, gAnimCmdTable_840BCB8, NULL, gDummySpriteAffineAnimTable, SpriteCB_RevealGameFreakTextSparkles}; static const struct OamData gOamData_840BCD4 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_BLEND, .mosaic = FALSE, .bpp = ST_OAM_4BPP, .shape = ST_OAM_V_RECTANGLE, .matrixNum = 0, .size = ST_OAM_SIZE_3, .tileNum = 0x000, .priority = 3, .paletteNum = 0 }; -static const struct SpriteTemplate gUnknown_840BCDC = {3, 3, &gOamData_840BCD4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; +static const struct SpriteTemplate sSpriteTemplate_GameFreakLogoArt = {3, 3, &gOamData_840BCD4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; static const struct OamData gOamData_840BCF4 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_BLEND, .mosaic = FALSE, .bpp = ST_OAM_4BPP, .shape = ST_OAM_H_RECTANGLE, .matrixNum = 0, .size = ST_OAM_SIZE_1, .tileNum = 0x000, .priority = 3, .paletteNum = 0 }; -static const struct SpriteTemplate gUnknown_840BCFC = {4, 3, &gOamData_840BCF4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; +static const struct SpriteTemplate sSpriteTemplate_PresentsText = {4, 3, &gOamData_840BCF4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; static const struct OamData gOamData_840BD14 = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_NORMAL, .mosaic = FALSE, .bpp = ST_OAM_4BPP, .shape = ST_OAM_SQUARE, .matrixNum = 0, .size = ST_OAM_SIZE_3, .tileNum = 0x000, .priority = 1, .paletteNum = 0 }; @@ -330,7 +321,7 @@ static const union AnimCmd gAnimCmd_840BD3C[] = { ANIMCMD_END }; -static const union AnimCmd *const gAnimCmdTable_840BD44[] = { +static const union AnimCmd *const sAnimTable_NidorinoAnim[] = { gAnimCmd_840BD1C, gAnimCmd_840BD24, gAnimCmd_840BD2C, @@ -349,18 +340,18 @@ static const union AffineAnimCmd gAffineAnimCmd_840BD68[] = { AFFINEANIMCMD_END }; -static const union AffineAnimCmd *const gAffineAnimCmdTable_840BD80[] = { +static const union AffineAnimCmd *const sAffineAnimTable_NidorinoAnim[] = { gAffineAnimCmd_840BD58, gAffineAnimCmd_840BD68 }; -static const struct SpriteTemplate gUnknown_840BD88 = {5, 7, &gOamData_840BD14, gAnimCmdTable_840BD44, NULL, gAffineAnimCmdTable_840BD80, SpriteCallbackDummy}; +static const struct SpriteTemplate sSpriteTemplate_NidorinoAnim = {5, 7, &gOamData_840BD14, sAnimTable_NidorinoAnim, NULL, sAffineAnimTable_NidorinoAnim, SpriteCallbackDummy}; static const struct OamData gOamData_840BDA0 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, .mosaic = FALSE, .bpp = ST_OAM_4BPP, .shape = ST_OAM_SQUARE, .matrixNum = 0, .size = ST_OAM_SIZE_3, .tileNum = 0x000, .priority = 1, .paletteNum = 0 }; -static const struct SpriteTemplate gUnknown_840BDA8 = {7, 7, &gOamData_840BDA0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; +static const struct SpriteTemplate sSpriteTemplate_NidorinoStatic = {7, 7, &gOamData_840BDA0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; -static const struct SpriteTemplate gUnknown_840BDC0 = {6, 6, &gOamData_840BDA0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; +static const struct SpriteTemplate sSpriteTemplate_GengarStatic = {6, 6, &gOamData_840BDA0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; static const struct OamData gOamData_840BDD8 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, .mosaic = FALSE, .bpp = ST_OAM_4BPP, .shape = ST_OAM_H_RECTANGLE, .matrixNum = 0, .size = ST_OAM_SIZE_3, .tileNum = 0x000, .priority = 0, .paletteNum = 0 }; @@ -380,7 +371,7 @@ static const union AnimCmd *const gAnimCmdTable_840BDF4[] = { gAnimCmds_840BDE8 }; -static const struct SpriteTemplate gUnknown_840BDFC = {8, 8, &gOamData_840BDD8, gAnimCmdTable_840BDF4, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; +static const struct SpriteTemplate sSpriteTemplate_Grass = {8, 8, &gOamData_840BDD8, gAnimCmdTable_840BDF4, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; static const struct OamData gOamData_840BE14 = { .affineMode = ST_OAM_AFFINE_DOUBLE, .objMode = ST_OAM_OBJ_NORMAL, .mosaic = FALSE, .bpp = ST_OAM_4BPP, .shape = ST_OAM_SQUARE, .matrixNum = 0, .size = ST_OAM_SIZE_3, .tileNum = 0x000, .priority = 1, .paletteNum = 0 }; @@ -411,7 +402,7 @@ static const union AnimCmd *const gAnimCmdTable_840BE3C[] = { gAnimCmd_840BE34 }; -static const struct SpriteTemplate gUnknown_840BE4C = {9, 6, &gOamData_840BE14, gAnimCmdTable_840BE3C, NULL, gAffineAnimCmdTable_840BD80, SpriteCallbackDummy}; +static const struct SpriteTemplate sSpriteTemplate_GengarBack = {9, 6, &gOamData_840BE14, gAnimCmdTable_840BE3C, NULL, sAffineAnimTable_NidorinoAnim, SpriteCallbackDummy}; static const struct OamData gOamData_840BE64 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, .mosaic = FALSE, .bpp = ST_OAM_4BPP, .shape = ST_OAM_V_RECTANGLE, .matrixNum = 0, .size = ST_OAM_SIZE_3, .tileNum = 0x000, .priority = 1, .paletteNum = 0 }; @@ -432,7 +423,7 @@ static const union AnimCmd *const gAnimCmdTable_840BE84[] = { gAnimCmd_840BE78 }; -static const struct SpriteTemplate gUnknown_840BE8C = {10, 10, &gOamData_840BE64, gAnimCmdTable_840BE84, NULL, gDummySpriteAffineAnimTable, sub_80EE1C4}; +static const struct SpriteTemplate sSpriteTemplate_GengarSwipe = {10, 10, &gOamData_840BE64, gAnimCmdTable_840BE84, NULL, gDummySpriteAffineAnimTable, SpriteCB_GengarSwipe}; static const struct OamData gOamData_840BEA4 = { .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, .mosaic = FALSE, .bpp = ST_OAM_4BPP, .shape = ST_OAM_SQUARE, .matrixNum = 0, .size = ST_OAM_SIZE_1, .tileNum = 0x000, .priority = 1, .paletteNum = 0 }; @@ -448,58 +439,60 @@ static const union AnimCmd *const gAnimCmdTable_840BEC0[] = { gAnimCmd_840BEAC }; -static const struct SpriteTemplate gUnknown_840BEC4 = {11, 11, &gOamData_840BEA4, gAnimCmdTable_840BEC0, NULL, gDummySpriteAffineAnimTable, sub_80EE8E4}; +static const struct SpriteTemplate sSpriteTemplate_NidorinoRecoilDust = {11, 11, &gOamData_840BEA4, gAnimCmdTable_840BEC0, NULL, gDummySpriteAffineAnimTable, SpriteCB_NidorinoRecoilDust}; -static const struct CompressedSpriteSheet gUnknown_840BEDC[] = { - {gUnknown_840926C, 0x0800, 6}, - {gUnknown_84096CC, 0x0800, 7}, - {gUnknown_840A3E4, 0x2800, 5}, - {gUnknown_8409A3C, 0x0800, 8}, - {gUnknown_8409D20, 0x1800, 9}, - {gUnknown_840B874, 0x0a00, 10}, - {gUnknown_840BAE0, 0x0200, 11} +static const struct CompressedSpriteSheet sFightSceneSpriteSheets[] = { + {sSpriteTiles_GengarStatic, 0x0800, 6}, + {sSpriteTiles_NidorinoStatic, 0x0800, 7}, + {sSpriteTiles_NidorinoAnim, 0x2800, 5}, + {sSpriteTiles_Grass, 0x0800, 8}, + {sSpriteTiles_GengarBack, 0x1800, 9}, + {sSpriteTiles_GengarSwipe, 0x0a00, 10}, + {sSpriteTiles_NidorinoRecoilDust, 0x0200, 11} }; // POTENTIAL UB -// This array is passed to LoadSpritePalettes in sub_80EEBE4. +// This array is passed to LoadSpritePalettes in LoadFightSceneSpriteTilesAndPals. // LoadSpritePalettes uses a {0} entry to signal end of array. // Because such an entry is absent in this case, the function // continues reading into the next .rodata section. -static const struct SpritePalette gUnknown_840BF14[] = { - {gUnknown_8405DA4, 6}, - {gUnknown_84096AC, 7}, - {gUnknown_8409A1C, 8}, - {gUnknown_840B834, 10}, - {gUnknown_840B854, 11}, - // {0} +static const struct SpritePalette sFightSceneSpritePalettes[] = { + {sSpritePals_Gengar, 6}, + {sSpritePals_Nidorino, 7}, + {sSpritePals_Grass, 8}, + {sSpritePals_GengarSwipe, 10}, + {sSpritePals_NidorinoRecoilDust, 11}, +#ifdef BUGFIX + {0} +#endif }; -static void sub_80EC5A4(void) +static void VBlankCB_Copyright(void) { LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); } -static void sub_80EC5B8(void) +static void CB2_WaitFadeBeforeSetUpIntro(void) { if (!UpdatePaletteFade()) - SetMainCallback2(sub_80EC870); + SetMainCallback2(CB2_SetUpIntro); } -static void load_copyright_graphics(u16 a, u16 b, u16 c) +static void load_copyright_graphics(u16 charBase, u16 screenBase, u16 palOffset) { - LZ77UnCompVram(gUnknown_8402280, (void *)BG_VRAM + a); - LZ77UnCompVram(gUnknown_84024E4, (void *)BG_VRAM + b); - LoadPalette(gUnknown_8402260, c, 0x20); + LZ77UnCompVram(sCopyrightGraphicsTiles, (void *)BG_VRAM + charBase); + LZ77UnCompVram(sCopyrightGraphicsMap, (void *)BG_VRAM + screenBase); + LoadPalette(sCopyrightGraphicsPal, palOffset, 0x20); } static void SerialCb_CopyrightScreen(void) { - GameCubeMultiBoot_HandleSerialInterrupt(&gUnknown_203AAD4); + GameCubeMultiBoot_HandleSerialInterrupt(&sGcmb); } -static bool8 sub_80EC62C(void) +static bool8 RunCopyrightScreen(void) { switch (gMain.state) { @@ -516,26 +509,27 @@ static bool8 sub_80EC62C(void) DmaFill32(3, 0, OAM, OAM_SIZE); DmaFill16(3, 0, PLTT + sizeof(vu16), PLTT_SIZE - sizeof(vu16)); ResetPaletteFade(); - load_copyright_graphics(0, 0x3800, 0); + load_copyright_graphics(0 * BG_CHAR_SIZE, 7 * BG_SCREEN_SIZE, 0); ScanlineEffect_Stop(); ResetTasks(); ResetSpriteData(); - FreeAllSpritePalettes();BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0xFFFF); - SetGpuReg(REG_OFFSET_BG0CNT, 0x700); + FreeAllSpritePalettes(); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0xFFFF); + SetGpuReg(REG_OFFSET_BG0CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(7)); EnableInterrupts(INTR_FLAG_VBLANK); - SetVBlankCallback(sub_80EC5A4); + SetVBlankCallback(VBlankCB_Copyright); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON); SetSerialCallback(SerialCb_CopyrightScreen); - GameCubeMultiBoot_Init(&gUnknown_203AAD4); + GameCubeMultiBoot_Init(&sGcmb); // fallthrough default: UpdatePaletteFade(); gMain.state++; - GameCubeMultiBoot_Main(&gUnknown_203AAD4); + GameCubeMultiBoot_Main(&sGcmb); break; case 140: - GameCubeMultiBoot_Main(&gUnknown_203AAD4); - if (gUnknown_203AAD4.gcmb_field_2 != 1) + GameCubeMultiBoot_Main(&sGcmb); + if (sGcmb.gcmb_field_2 != 1) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); gMain.state++; @@ -545,16 +539,17 @@ static bool8 sub_80EC62C(void) if (!UpdatePaletteFade()) { gMain.state++; - if (gUnknown_203AAD4.gcmb_field_2 != 0) + if (sGcmb.gcmb_field_2 != 0) { - if (gUnknown_203AAD4.gcmb_field_2 == 2) + if (sGcmb.gcmb_field_2 == 2) { + // Gc6e if (*((u32 *)0x020000AC) == 0x65366347) { CpuCopy16(gMultiBootProgram_PokemonColosseum_Start, (void *)EWRAM_START, 0x28000); *((u32 *)0x020000AC) = 0x65366347; } - GameCubeMultiBoot_ExecuteProgram(&gUnknown_203AAD4); + GameCubeMultiBoot_ExecuteProgram(&sGcmb); } } else @@ -567,7 +562,7 @@ static bool8 sub_80EC62C(void) break; case 142: ResetSerial(); - SetMainCallback2(sub_80EC5B8); + SetMainCallback2(CB2_WaitFadeBeforeSetUpIntro); break; } return TRUE; @@ -575,7 +570,7 @@ static bool8 sub_80EC62C(void) void c2_copyright_1(void) { - if (!sub_80EC62C()) + if (!RunCopyrightScreen()) { ResetMenuAndMonGlobals(); Save_ResetSaveCounters(); @@ -586,12 +581,12 @@ void c2_copyright_1(void) } } -void sub_80EC864(void) +void CB2_CopyrightScreen(void) { - sub_80EC62C(); + RunCopyrightScreen(); } -static void sub_80EC870(void) +static void CB2_SetUpIntro(void) { switch (gMain.state) { @@ -606,34 +601,34 @@ static void sub_80EC870(void) ResetSpriteData(); ResetPaletteFade(); ResetTempTileDataBuffers(); - sub_80ECA00(); + Intro_ResetGpuRegs(); DmaFill16(3, 0, VRAM, VRAM_SIZE); DmaFill32(3, 0, OAM, OAM_SIZE); DmaFill16(3, 0, PLTT, PLTT_SIZE); - FillPalette(0, 0, 0x400); - ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, gUnknown_840BB80, NELEMS(gUnknown_840BB80)); + FillPalette(RGB_BLACK, 0, 0x400); + ResetBgsAndClearDma3BusyFlags(FALSE); + InitBgsFromTemplates(0, sBgTemplates_GameFreakScene, NELEMS(sBgTemplates_GameFreakScene)); break; case 1: - LoadPalette(gUnknown_8402630, 0x00, 0x20); - DecompressAndCopyTileDataToVram(3, gUnknown_8402650, 0, 0, 0); - DecompressAndCopyTileDataToVram(3, gUnknown_8402668, 0, 0, 1); - LoadPalette(gUnknown_840270C, 0xD0, 0x20); + LoadPalette(sBg3Pal_GameFreakPresents, 0x00, 0x20); + DecompressAndCopyTileDataToVram(3, sBg3Tiles_GameFreakPresents, 0, 0, 0); + DecompressAndCopyTileDataToVram(3, sBg3Map_GameFreakPresents, 0, 0, 1); + LoadPalette(sSpritePals_GameFreakPresents, 0xD0, 0x20); break; case 2: if (!FreeTempTileDataBuffersIfPossible()) { - sub_80ECA70(); + StartIntroSequence(); BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); - SetMainCallback2(sub_80EC9D4); - SetVBlankCallback(sub_80EC9EC); + SetMainCallback2(CB2_Intro); + SetVBlankCallback(VBlankCB_Intro); } return; } gMain.state++; } -static void sub_80EC9D4(void) +static void CB2_Intro(void) { RunTasks(); AnimateSprites(); @@ -641,14 +636,14 @@ static void sub_80EC9D4(void) UpdatePaletteFade(); } -static void sub_80EC9EC(void) +static void VBlankCB_Intro(void) { LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); } -static void sub_80ECA00(void) +static void Intro_ResetGpuRegs(void) { SetGpuReg(REG_OFFSET_DISPCNT, 0); SetGpuReg(REG_OFFSET_BLDCNT, 0); @@ -665,53 +660,53 @@ static void sub_80ECA00(void) SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON); } -static void sub_80ECA70(void) +static void StartIntroSequence(void) { struct IntroSequenceData * ptr = Alloc(sizeof(struct IntroSequenceData)); - sub_80ECAA8(ptr, sub_80ECAF0); - ptr->field_0005 = CreateTask(sub_80ECAB0, 3); - SetWordTaskArg(ptr->field_0005, 0, (uintptr_t)ptr); + SetIntroCB(ptr, IntroCB_Init); + ptr->taskId = CreateTask(Task_CallIntroCallback, 3); + SetWordTaskArg(ptr->taskId, 0, (uintptr_t)ptr); } -static void sub_80ECAA8(struct IntroSequenceData * ptr, void (*cb)(struct IntroSequenceData *)) +static void SetIntroCB(struct IntroSequenceData * ptr, IntroCallback cb) { - ptr->field_0000 = cb; - ptr->field_0004 = 0; + ptr->callback = cb; + ptr->state = 0; } -static void sub_80ECAB0(u8 taskId) +static void Task_CallIntroCallback(u8 taskId) { struct IntroSequenceData * ptr = (void *)GetWordTaskArg(taskId, 0); - if (JOY_NEW(A_BUTTON | START_BUTTON | SELECT_BUTTON) && ptr->field_0000 != sub_80EDBE8) - sub_80ECAA8(ptr, sub_80EDBE8); - ptr->field_0000(ptr); + if (JOY_NEW(A_BUTTON | START_BUTTON | SELECT_BUTTON) && ptr->callback != IntroCB_CleanUp) + SetIntroCB(ptr, IntroCB_CleanUp); + ptr->callback(ptr); } -static void sub_80ECAF0(struct IntroSequenceData * this) +static void IntroCB_Init(struct IntroSequenceData * this) { - switch (this->field_0004) + switch (this->state) { case 0: - InitWindows(gUnknown_840BBA8); - LZ77UnCompWram(gUnknown_840272C, this->field_043C); - LZ77UnCompWram(gUnknown_84028F8, this->field_003C); + InitWindows(sWindowTemplate); + LZ77UnCompWram(sBlit_GameFreakText, this->gamefreakTextBitmap); + LZ77UnCompWram(sSpriteTiles_GameFreakLogoArt, this->gamefreakLogoArtSpriteTiles); FillBgTilemapBufferRect(2, 0x000, 0, 0, 32, 32, 0x11); - FillWindowPixelBuffer(0, 0x00); - BlitBitmapToWindow(0, this->field_043C, 0, 40, 144, 16); + FillWindowPixelBuffer(0, PIXEL_FILL(0)); + BlitBitmapToWindow(0, this->gamefreakTextBitmap, 0, 40, 144, 16); PutWindowTilemap(0); CopyWindowToVram(0, 3); - this->field_0004++; + this->state++; break; case 1: if (!IsDma3ManagerBusyWithBgCopy()) - sub_80ECAA8(this, sub_80ECB98); + SetIntroCB(this, IntroCB_OpenWin1ToTheaterDimensions); break; } } -static void sub_80ECB98(struct IntroSequenceData * this) +static void IntroCB_OpenWin1ToTheaterDimensions(struct IntroSequenceData * this) { - switch (this->field_0004) + switch (this->state) { case 0: SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN1_ON); @@ -719,232 +714,232 @@ static void sub_80ECB98(struct IntroSequenceData * this) SetGpuReg(REG_OFFSET_WINOUT, 0x0000); SetGpuReg(REG_OFFSET_WIN1H, 0x00F0); SetGpuReg(REG_OFFSET_WIN1V, 0x0000); - this->field_0012 = 0; - this->field_0004++; + this->data[5] = 0; + this->state++; break; case 1: ShowBg(3); BlendPalettes(0xFFFFFFFF, 0x00, RGB_BLACK); - this->field_0004++; + this->state++; break; case 2: - this->field_0012 += 8; - if (this->field_0012 >= 0x30) - this->field_0012 = 0x30; - SetGpuReg(REG_OFFSET_WIN1V, ((0x50 - this->field_0012) << 8) | (0x50 + this->field_0012)); - if (this->field_0012 == 0x30) - sub_80ECAA8(this, sub_80ECC3C); + this->data[5] += 8; + if (this->data[5] >= 0x30) + this->data[5] = 0x30; + SetGpuReg(REG_OFFSET_WIN1V, ((0x50 - this->data[5]) << 8) | (0x50 + this->data[5])); + if (this->data[5] == 0x30) + SetIntroCB(this, IntroCB_GameFreakStar); break; } } -static void sub_80ECC3C(struct IntroSequenceData * this) +static void IntroCB_GameFreakStar(struct IntroSequenceData * this) { - switch (this->field_0004) + switch (this->state) { case 0: PlaySE(MUS_TITLEROG); - sub_80EDC40(); - this->field_0012 = 0; - this->field_0004++; + GameFreakScene_LoadGfxCreateStar(); + this->data[5] = 0; + this->state++; break; case 1: - this->field_0012++; - if (this->field_0012 == 30) + this->data[5]++; + if (this->data[5] == 30) { - sub_80EDDF0(); - this->field_0012 = 0; - this->field_0004++; + GameFreakScene_StartTrailingSparkleSpawner(); + this->data[5] = 0; + this->state++; } break; case 2: - this->field_0012++; - if (this->field_0012 == 90) - sub_80ECAA8(this, sub_80ECCA8); + this->data[5]++; + if (this->data[5] == 90) + SetIntroCB(this, IntroCB_GameFreakScene_RevealGameFreakText); break; } } -static void sub_80ECCA8(struct IntroSequenceData * this) +static void IntroCB_GameFreakScene_RevealGameFreakText(struct IntroSequenceData * this) { - switch (this->field_0004) + switch (this->state) { case 0: - sub_80EDED8(); - this->field_0012 = 0; - this->field_0004++; + GameFreakScene_StartRevealGameFreakTextSparklesSpawner(); + this->data[5] = 0; + this->state++; break; case 1: - this->field_0012++; - if (this->field_0012 >= 40) - this->field_0004++; + this->data[5]++; + if (this->data[5] >= 40) + this->state++; break; case 2: SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG2 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD); StartBlendTask(0, 16, 16, 0, 48, 0); - this->field_0004++; + this->state++; break; case 3: ShowBg(2); - this->field_0004++; + this->state++; break; case 4: if (!IsBlendTaskActive()) { SetGpuReg(REG_OFFSET_BLDCNT, 0); - this->field_0012 = 0; - this->field_0004++; + this->data[5] = 0; + this->state++; } break; case 5: - this->field_0012++; - if (this->field_0012 > 50) - sub_80ECAA8(this, sub_80ECD60); + this->data[5]++; + if (this->data[5] > 50) + SetIntroCB(this, IntroCB_GameFreakScene_CreateGameFreakLogo); break; } } -static void sub_80ECD60(struct IntroSequenceData * this) +static void IntroCB_GameFreakScene_CreateGameFreakLogo(struct IntroSequenceData * this) { - switch (this->field_0004) + switch (this->state) { case 0: SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_OBJ | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD); StartBlendTask(0, 16, 16, 0, 16, 0); - this->field_0008 = 0; - this->field_000A = 16; - this->field_0012 = 0; - this->field_0004++; + this->data[0] = 0; + this->data[1] = 16; + this->data[5] = 0; + this->state++; break; case 1: - this->field_0014 = sub_80EDF68(); - this->field_0004++; + this->gameFreakLogoArtSprite = CreateGameFreakLogoArtSprite(); + this->state++; break; case 2: if (!IsBlendTaskActive()) { - BlitBitmapToWindow(0, this->field_003C, 0x38, 0x06, 0x20, 0x40); - BlitBitmapToWindow(0, this->field_043C, 0x00, 0x28, 0x90, 0x10); + BlitBitmapToWindow(0, this->gamefreakLogoArtSpriteTiles, 0x38, 0x06, 0x20, 0x40); + BlitBitmapToWindow(0, this->gamefreakTextBitmap, 0x00, 0x28, 0x90, 0x10); CopyWindowToVram(0, 2); - this->field_0004++; + this->state++; } break; case 3: if (!IsDma3ManagerBusyWithBgCopy()) { - DestroySprite(this->field_0014); - sub_rev1_80EDFAC(); - this->field_0012 = 0; - this->field_0004++; + DestroySprite(this->gameFreakLogoArtSprite); + Rev1_GameFreakScene_CreatePresentsText(); + this->data[5] = 0; + this->state++; } break; case 4: - this->field_0012++; - if (this->field_0012 > 90) + this->data[5]++; + if (this->data[5] > 90) { SetGpuRegBits(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG2); StartBlendTask(16, 0, 0, 16, 20, 0); - this->field_0004++; + this->state++; } break; case 5: if (!IsBlendTaskActive()) { HideBg(2); - this->field_0004++; + this->state++; } break; case 6: ResetSpriteData(); FreeAllSpritePalettes(); - this->field_0012 = 0; - this->field_0004++; + this->data[5] = 0; + this->state++; break; case 7: - this->field_0012++; - if (this->field_0012 > 20) + this->data[5]++; + if (this->data[5] > 20) { SetGpuReg(REG_OFFSET_BLDCNT, 0); - sub_80ECAA8(this, sub_80ECEA4); + SetIntroCB(this, IntroCB_FightScene); } break; } } -static void sub_80ECEA4(struct IntroSequenceData * this) +static void IntroCB_FightScene(struct IntroSequenceData * this) { - switch (this->field_0004) + switch (this->state) { case 0: SetVBlankCallback(NULL); - LoadPalette(gUnknown_8402D34, 0x10, 0x20); - LoadPalette(gUnknown_84048CC, 0x20, 0x20); - BlendPalettes(0x06, 0x10, RGB_WHITE); - InitBgsFromTemplates(0, gUnknown_840BB88, NELEMS(gUnknown_840BB88)); - DecompressAndCopyTileDataToVram(1, gUnknown_84048EC, 0, 0, 0); - DecompressAndCopyTileDataToVram(1, gUnknown_8404F7C, 0, 0, 1); + LoadPalette(sBg0Pal_FightScene1, 0x10, 0x20); + LoadPalette(sBg1Pal_FightScene1, 0x20, 0x20); + BlendPalettes(0x00000006, 0x10, RGB_WHITE); + InitBgsFromTemplates(0, sBgTemplates_FightScene1, NELEMS(sBgTemplates_FightScene1)); + DecompressAndCopyTileDataToVram(1, sBg1Tiles_FightScene1, 0, 0, 0); + DecompressAndCopyTileDataToVram(1, sBg1Map_FightScene1, 0, 0, 1); ShowBg(1); HideBg(0); HideBg(2); HideBg(3); - sub_80EEBE4(); - SetVBlankCallback(sub_80EC9EC); - this->field_0004++; + LoadFightSceneSpriteTilesAndPals(); + SetVBlankCallback(VBlankCB_Intro); + this->state++; break; case 1: if (!FreeTempTileDataBuffersIfPossible()) { - DecompressAndCopyTileDataToVram(0, gUnknown_8402D54, 0, 0, 0); - DecompressAndCopyTileDataToVram(0, gUnknown_8403FE8, 0, 0, 1); + DecompressAndCopyTileDataToVram(0, sBg0Tiles_FightScene1, 0, 0, 0); + DecompressAndCopyTileDataToVram(0, sBg0Map_FightScene1, 0, 0, 1); ResetBgPositions(); ShowBg(1); - this->field_0004++; + this->state++; } break; case 2: if (!FreeTempTileDataBuffersIfPossible()) { ShowBg(0); - CreateTask(sub_80ED0AC, 0); + CreateTask(Task_FightScene1_GrassyFieldAnim, 0); BeginNormalPaletteFade(0x00000006, -2, 16, 0, RGB_WHITE); - this->field_0004++; + this->state++; } break; case 3: if (!gPaletteFade.active) { m4aSongNumStart(MUS_DEMO); - this->field_0012 = 0; - this->field_0004++; + this->data[5] = 0; + this->state++; } break; case 4: - this->field_0012++; - if (this->field_0012 == 20) + this->data[5]++; + if (this->data[5] == 20) { - CreateTask(sub_80ED140, 0); - sub_80ED118(); + CreateTask(Task_FightScene1_ZoomEffect, 0); + FightScene1_SignalEndGrassyFieldAnim(); } - if (this->field_0012 >= 30) + if (this->data[5] >= 30) { - BlendPalettes(-2, 16, RGB_WHITE); - DestroyTask(FindTaskIdByFunc(sub_80ED0AC)); - DestroyTask(FindTaskIdByFunc(sub_80ED140)); - sub_80ECAA8(this, sub_80ED188); + BlendPalettes(0xFFFFFFFE, 16, RGB_WHITE); + DestroyTask(FindTaskIdByFunc(Task_FightScene1_GrassyFieldAnim)); + DestroyTask(FindTaskIdByFunc(Task_FightScene1_ZoomEffect)); + SetIntroCB(this, IntroCB_FightScene2); } break; case 5: if (!gPaletteFade.active) { - DestroyTask(FindTaskIdByFunc(sub_80ED0AC)); - DestroyTask(FindTaskIdByFunc(sub_80ED140)); - sub_80ECAA8(this, sub_80ED188); + DestroyTask(FindTaskIdByFunc(Task_FightScene1_GrassyFieldAnim)); + DestroyTask(FindTaskIdByFunc(Task_FightScene1_ZoomEffect)); + SetIntroCB(this, IntroCB_FightScene2); } break; } } -static void sub_80ED0AC(u8 taskId) +static void Task_FightScene1_GrassyFieldAnim(u8 taskId) { s16 * data = gTasks[taskId].data; @@ -964,13 +959,13 @@ static void sub_80ED0AC(u8 taskId) } } -static void sub_80ED118(void) +static void FightScene1_SignalEndGrassyFieldAnim(void) { - u8 taskId = FindTaskIdByFunc(sub_80ED0AC); + u8 taskId = FindTaskIdByFunc(Task_FightScene1_GrassyFieldAnim); gTasks[taskId].data[2] = TRUE; } -static void sub_80ED140(u8 taskId) +static void Task_FightScene1_ZoomEffect(u8 taskId) { s16 * data = gTasks[taskId].data; @@ -984,146 +979,146 @@ static void sub_80ED140(u8 taskId) } } -static void sub_80ED188(struct IntroSequenceData * this) +static void IntroCB_FightScene2(struct IntroSequenceData * this) { - switch (this->field_0004) + switch (this->state) { case 0: BlendPalettes(0xFFFFFFFE, 16, RGB_WHITE); - InitBgsFromTemplates(0, gUnknown_840BB90, NELEMS(gUnknown_840BB90)); - DecompressAndCopyTileDataToVram(3, gUnknown_8405414, 0, 0, 0); - DecompressAndCopyTileDataToVram(3, gUnknown_8405890, 0, 0, 1); + InitBgsFromTemplates(0, sBgTemplates_FightScene2, NELEMS(sBgTemplates_FightScene2)); + DecompressAndCopyTileDataToVram(3, sBg3Tiles_FightScene2, 0, 0, 0); + DecompressAndCopyTileDataToVram(3, sBg3Map_FightScene2, 0, 0, 1); ShowBg(3); - this->field_0004++; + this->state++; break; case 1: if (!FreeTempTileDataBuffersIfPossible()) { SetVBlankCallback(NULL); - LoadPalette(gUnknown_84053B4, 0x10, 0x60); - LoadPalette(gUnknown_8405DA4, 0x50, 0x20); - LoadPalette(gUnknown_8406634, 0x60, 0x20); + LoadPalette(sBg3Pal_FightScene2, 0x10, 0x60); + LoadPalette(sSpritePals_Gengar, 0x50, 0x20); + LoadPalette(sBg1Pal_FightScene2, 0x60, 0x20); BlendPalettes(0xFFFFFFFE, 16, RGB_WHITE); - DecompressAndCopyTileDataToVram(0, gUnknown_8405B28, 0, 0, 0); - DecompressAndCopyTileDataToVram(0, gUnknown_8405CDC, 0, 0, 1); - DecompressAndCopyTileDataToVram(1, gUnknown_8406654, 0, 0, 0); - DecompressAndCopyTileDataToVram(1, gUnknown_84071D0, 0, 0, 1); - DecompressAndCopyTileDataToVram(2, gUnknown_8405DC4, 0, 0, 0); - DecompressAndCopyTileDataToVram(2, gUnknown_840644C, 0, 0, 1); + DecompressAndCopyTileDataToVram(0, sBg0Tiles_FightScene2, 0, 0, 0); + DecompressAndCopyTileDataToVram(0, sBg0Map_FightScene2, 0, 0, 1); + DecompressAndCopyTileDataToVram(1, sBg1Tiles_FightScene2, 0, 0, 0); + DecompressAndCopyTileDataToVram(1, sBg1Map_FightScene2, 0, 0, 1); + DecompressAndCopyTileDataToVram(2, sBg2Tiles_FightScene2, 0, 0, 0); + DecompressAndCopyTileDataToVram(2, sBg2Map_FightScene2, 0, 0, 1); ResetBgPositions(); ShowBg(0); HideBg(1); HideBg(2); ChangeBgY(2, 0x0001CE00, 0); ChangeBgY(1, 0x00002800, 0); - CreateTask(sub_80ED40C, 0); - sub_80ED444(this); + CreateTask(Task_FightScene2_CameraHorizPanEffect, 0); + CreateMonStaticSprites(this); BlendPalettes(0xFFFFFFFE, 16, RGB_WHITE); - SetVBlankCallback(sub_80EC9EC); - this->field_0004++; + SetVBlankCallback(VBlankCB_Intro); + this->state++; } break; case 2: if (!FreeTempTileDataBuffersIfPossible()) { BeginNormalPaletteFade(0xFFFFFFFE, -2, 16, 0, RGB_WHITE); - this->field_0004++; + this->state++; } break; case 3: if (!gPaletteFade.active) { - this->field_0012 = 0; - this->field_0004++; + this->data[5] = 0; + this->state++; } break; case 4: - this->field_0012++; - if (this->field_0012 >= 60) + this->data[5]++; + if (this->data[5] >= 60) { - this->field_0012 = 0; - DestroyTask(FindTaskIdByFunc(sub_80ED40C)); - sub_80ED4A0(this); - CreateTask(sub_80ED428, 0); + this->data[5] = 0; + DestroyTask(FindTaskIdByFunc(Task_FightScene2_CameraHorizPanEffect)); + DestroyStaticMonSprites(this); + CreateTask(Task_FightScene2_CameraVertPanEffect, 0); ChangeBgY(3, 0x00010000, 0); HideBg(0); ShowBg(3); ShowBg(1); ShowBg(2); - this->field_0004++; + this->state++; } break; case 5: if (!IsDma3ManagerBusyWithBgCopy()) { - this->field_0012 = 0; - this->field_0004++; + this->data[5] = 0; + this->state++; } break; case 6: - this->field_0012++; - if (this->field_0012 >= 60) + this->data[5]++; + if (this->data[5] >= 60) { - DestroyTask(FindTaskIdByFunc(sub_80ED428)); - sub_80ECAA8(this, sub_80ED4C0); + DestroyTask(FindTaskIdByFunc(Task_FightScene2_CameraVertPanEffect)); + SetIntroCB(this, IntroCB_FightScene3); } break; } } -static void sub_80ED40C(u8 taskId) +static void Task_FightScene2_CameraHorizPanEffect(u8 taskId) { ChangeBgX(3, 0x0E0, 2); ChangeBgX(0, 0x110, 1); } -static void sub_80ED428(u8 taskId) +static void Task_FightScene2_CameraVertPanEffect(u8 taskId) { ChangeBgY(2, 0x020, 1); ChangeBgY(1, 0x024, 2); } -static void sub_80ED444(struct IntroSequenceData * this) +static void CreateMonStaticSprites(struct IntroSequenceData * this) { u8 spriteId; - this->field_001C = NULL; - this->field_0020 = NULL; + this->gengarStaticSprite = NULL; + this->nidorinoStaticSprite = NULL; - spriteId = CreateSprite(&gUnknown_840BDA8, 168, 80, 11); + spriteId = CreateSprite(&sSpriteTemplate_NidorinoStatic, 168, 80, 11); if (spriteId != MAX_SPRITES) - this->field_0020 = &gSprites[spriteId]; + this->nidorinoStaticSprite = &gSprites[spriteId]; - spriteId = CreateSprite(&gUnknown_840BDC0, 72, 80, 12); + spriteId = CreateSprite(&sSpriteTemplate_GengarStatic, 72, 80, 12); if (spriteId != MAX_SPRITES) - this->field_001C = &gSprites[spriteId]; + this->gengarStaticSprite = &gSprites[spriteId]; } -static void sub_80ED4A0(struct IntroSequenceData * this) +static void DestroyStaticMonSprites(struct IntroSequenceData * this) { - if (this->field_001C != NULL) - DestroySprite(this->field_001C); - if (this->field_0020 != NULL) - DestroySprite(this->field_0020); + if (this->gengarStaticSprite != NULL) + DestroySprite(this->gengarStaticSprite); + if (this->nidorinoStaticSprite != NULL) + DestroySprite(this->nidorinoStaticSprite); } -static void sub_80ED4C0(struct IntroSequenceData * this) +static void IntroCB_FightScene3(struct IntroSequenceData * this) { - switch (this->field_0004) + switch (this->state) { case 0: - LoadPalette(gUnknown_8407430, 0x10, 0x40); - LoadPalette(gUnknown_8405DA4, 0x50, 0x20); + LoadPalette(sBg1Pal_FightScene3, 0x10, 0x40); + LoadPalette(sSpritePals_Gengar, 0x50, 0x20); BlendPalettes(0xFFFFFFFE, 16, RGB_WHITE); - InitBgsFromTemplates(0, gUnknown_840BBA0, NELEMS(gUnknown_840BBA0)); - DecompressAndCopyTileDataToVram(1, gUnknown_8407470, 0, 0, 0); - DecompressAndCopyTileDataToVram(1, gUnknown_8407A50, 0, 0, 1); + InitBgsFromTemplates(0, sBgTemplates_FightScene3, NELEMS(sBgTemplates_FightScene3)); + DecompressAndCopyTileDataToVram(1, sBg1Tiles_FightScene3, 0, 0, 0); + DecompressAndCopyTileDataToVram(1, sBg1Map_FightScene3, 0, 0, 1); ShowBg(1); HideBg(0); HideBg(2); HideBg(3); ResetBgPositions(); - this->field_0004++; + this->state++; SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON); SetGpuRegBits(REG_OFFSET_WININ, 0x12); ClearGpuRegBits(REG_OFFSET_WININ, 0x01); @@ -1134,13 +1129,13 @@ static void sub_80ED4C0(struct IntroSequenceData * this) case 1: if (!FreeTempTileDataBuffersIfPossible()) { - DecompressAndCopyTileDataToVram(0, gUnknown_8407B9C, 0, 0, 0); - DecompressAndCopyTileDataToVram(0, gUnknown_8408D98, 0, 0, 1); + DecompressAndCopyTileDataToVram(0, sBg0Tiles_FightScene3, 0, 0, 0); + DecompressAndCopyTileDataToVram(0, sBg0Map_FightScene3, 0, 0, 1); gUnknown_203AB00 = 4; gUnknown_203AB02 = 52; ChangeBgX(0, 0x00001800, 0); ChangeBgY(0, 0x0001F000, 0); - this->field_0004++; + this->state++; } break; case 2: @@ -1148,26 +1143,26 @@ static void sub_80ED4C0(struct IntroSequenceData * this) { BlendPalettes(0xFFFFFFFE, 0, RGB_WHITE); ShowBg(0); - CreateTask(sub_80ED714, 0); - sub_80EE4F8(this); - sub_80EE528(this->field_0018, 0, 0xB4, 0x34); - CreateTask(sub_80EE200, 0); - sub_80ED6D8(); - this->field_0012 = 0; - this->field_0004++; + CreateTask(Task_FightScene3_ForestBgScroll, 0); + CreateNidorinoAnimSprite(this); + StartNidorinoAnimSpriteSlideIn(this->nidorinoAnimSprite, 0, 0xB4, 0x34); + CreateTask(Task_FightScene3_Bg0Scroll, 0); + FightScene3_StartBg1Scroll(); + this->data[5] = 0; + this->state++; } break; case 3: - this->field_0012++; - if (this->field_0012 == 16) - sub_80ED7D4(this); - if (!sub_80EE5C8(this) && !FuncIsActiveTask(sub_80EE200)) - sub_80ECAA8(this, sub_80ED898); + this->data[5]++; + if (this->data[5] == 16) + CreateGrassSprite(this); + if (!IsNidorinoAnimSpriteSlideInRunning(this) && !FuncIsActiveTask(Task_FightScene3_Bg0Scroll)) + SetIntroCB(this, IntroCB_FightScene4); break; } } -static void sub_80ED69C(u8 taskId) +static void Task_FightScene3_Bg1Scroll(u8 taskId) { if (gTasks[taskId].data[0] == 0) ChangeBgX(1, 0x400, 2); @@ -1175,18 +1170,18 @@ static void sub_80ED69C(u8 taskId) ChangeBgX(1, 0x020, 2); } -static void sub_80ED6D8(void) +static void FightScene3_StartBg1Scroll(void) { - CreateTask(sub_80ED69C, 0); + CreateTask(Task_FightScene3_Bg1Scroll, 0); } -static void sub_80ED6EC(void) +static void FightScene3_SlowBg1Scroll(void) { - u8 taskId = FindTaskIdByFunc(sub_80ED69C); + u8 taskId = FindTaskIdByFunc(Task_FightScene3_Bg1Scroll); gTasks[taskId].data[0] = 1; } -static void sub_80ED714(u8 taskId) +static void Task_FightScene3_ForestBgScroll(u8 taskId) { s16 * data = gTasks[taskId].data; if (data[0] == 0) @@ -1201,37 +1196,37 @@ static void sub_80ED714(u8 taskId) } } -static void sub_80ED760(void) +static void FightScene3_PauseForestBgScroll(void) { - u8 taskId = FindTaskIdByFunc(sub_80ED714); + u8 taskId = FindTaskIdByFunc(Task_FightScene3_ForestBgScroll); gTasks[taskId].data[0] = 1; } -static void sub_80ED788(void) +static void FightScene3_ResumeForestBgScroll(void) { - u8 taskId = FindTaskIdByFunc(sub_80ED714); + u8 taskId = FindTaskIdByFunc(Task_FightScene3_ForestBgScroll); gTasks[taskId].data[0] = 0; } -static u8 sub_80ED7B0(void) +static bool8 FightScene3_GetForestBgScrollState(void) { - u8 taskId = FindTaskIdByFunc(sub_80ED714); + u8 taskId = FindTaskIdByFunc(Task_FightScene3_ForestBgScroll); return gTasks[taskId].data[2]; } -static void sub_80ED7D4(struct IntroSequenceData * this) +static void CreateGrassSprite(struct IntroSequenceData * this) { - u8 spriteId = CreateSprite(&gUnknown_840BDFC, 296, 112, 7); + u8 spriteId = CreateSprite(&sSpriteTemplate_Grass, 296, 112, 7); if (spriteId != MAX_SPRITES) { - this->field_0024 = &gSprites[spriteId]; - this->field_0024->callback = sub_80ED818; + this->grassSprite = &gSprites[spriteId]; + this->grassSprite->callback = SpriteCB_Grass; } else - this->field_0024 = NULL; + this->grassSprite = NULL; } -static void sub_80ED818(struct Sprite * sprite) +static void SpriteCB_Grass(struct Sprite * sprite) { s16 * data = sprite->data; @@ -1247,7 +1242,7 @@ static void sub_80ED818(struct Sprite * sprite) sprite->pos1.x = data[1] >> 5; if (sprite->pos1.x <= 52) { - sub_80ED6EC(); + FightScene3_SlowBg1Scroll(); data[0]++; } break; @@ -1264,206 +1259,207 @@ static void sub_80ED818(struct Sprite * sprite) } } -static void sub_80ED898(struct IntroSequenceData * this) +static void IntroCB_FightScene4(struct IntroSequenceData * this) { - switch (this->field_0004) + switch (this->state) { case 0: - this->field_0012 = 0; - this->field_0004++; + this->data[5] = 0; + this->state++; break; case 1: - this->field_0012++; - if (this->field_0012 > 30) + this->data[5]++; + if (this->data[5] > 30) { - sub_80EE5E4(this); - this->field_0004++; + FightScene4_NidorinoRearsUp(this); + this->state++; } break; case 2: - if (!sub_80EE850(this)) + if (!FightScene4_NidorinoAnimIsRunning(this)) { - this->field_0012 = 0; - this->field_0004++; + this->data[5] = 0; + this->state++; } break; case 3: - this->field_0012++; - if (this->field_0012 > 30) + this->data[5]++; + if (this->data[5] > 30) { - sub_80ED760(); - sub_80EDF94(this); - this->field_0012 = 0; - this->field_0004++; + FightScene3_PauseForestBgScroll(); + FightScene4_StartGengarAttack(this); + this->data[5] = 0; + this->state++; } break; case 4: - if (this->field_0006) + if (this->gengarAttackLanded) { - sub_80EE6A4(this); - this->field_0004++; + FightScene4_StartNidorinoRecoilAnim(this); + this->state++; } break; case 5: - if (!sub_80EE850(this)) + if (!FightScene4_NidorinoAnimIsRunning(this)) { - sub_80ED788(); - this->field_0012 = 0; - this->field_0004++; + FightScene3_ResumeForestBgScroll(); + this->data[5] = 0; + this->state++; } break; case 6: - this->field_0012++; - if (this->field_0012 > 16) + this->data[5]++; + if (this->data[5] > 16) { - sub_80EE970(this->field_0018, 8, 12, 5); - this->field_0004++; + StartSpriteHopToPosAnim(this->nidorinoAnimSprite, 8, 12, 5); + this->state++; } break; case 7: - if (!sub_80EE850(this)) + if (!FightScene4_NidorinoAnimIsRunning(this)) { - sub_80EE970(this->field_0018, 8, 12, 5); - this->field_0004++; + StartSpriteHopToPosAnim(this->nidorinoAnimSprite, 8, 12, 5); + this->state++; } break; case 8: - if (!sub_80EE850(this)) + if (!FightScene4_NidorinoAnimIsRunning(this)) { - this->field_0012 = 0; - this->field_0004++; + this->data[5] = 0; + this->state++; } break; case 9: - this->field_0012++; - if (this->field_0012 > 20) + this->data[5]++; + if (this->data[5] > 20) { - sub_80EEA94(this); - this->field_0012 = 0; - this->field_0004++; + StartNidorinoAnim_LaunchSelfAtGengarAnim(this); + this->data[5] = 0; + this->state++; } break; case 10: - if (!sub_80ED7B0()) + if (!FightScene3_GetForestBgScrollState()) { - sub_80ED760(); - sub_80EDAF0(this); - this->field_0004++; + FightScene3_PauseForestBgScroll(); + CreateGengarBackSprite(this); + this->state++; } break; case 11: HideBg(0); - this->field_0012 = 0; - this->field_0004++; + this->data[5] = 0; + this->state++; break; case 12: - this->field_0012++; - if (this->field_0012 == 48) + this->data[5]++; + if (this->data[5] == 48) BeginNormalPaletteFade(0x00000006, 2, 0, 16, RGB_WHITE); - if (this->field_0012 > 120) + if (this->data[5] > 120) { - sub_80EDB70(this); - sub_80EDBAC(this); - this->field_0004++; - this->field_0012 = 0; + FightScene4_StartNidorinoAffineAnim(this); + FightScene4_StartGengarAffineAnim(this); + this->state++; + this->data[5] = 0; } break; case 13: - this->field_0012++; - if (this->field_0012 > 8) + this->data[5]++; + if (this->data[5] > 8) { CpuFill16(RGB_WHITE, gPlttBufferUnfaded + 16, 64); BeginNormalPaletteFade(0xFFFFFFFE, -2, 0, 16, RGB_BLACK); - this->field_0004++; + this->state++; } break; case 14: if (!gPaletteFade.active) { - this->field_0012 = 0; - this->field_0004++; + this->data[5] = 0; + this->state++; } break; case 15: - this->field_0012++; - if (this->field_0012 > 60) - sub_80ECAA8(this, sub_80EDBE8); + this->data[5]++; + if (this->data[5] > 60) + SetIntroCB(this, IntroCB_CleanUp); break; default: if (JOY_NEW(R_BUTTON)) { BlendPalettes(0xFFFF0064, 0, RGB_WHITE); - this->field_0018->pos2.x = 0; - this->field_0018->pos1.x = 0xB4; - this->field_0004 = 1; - this->field_0012 = 30; + this->nidorinoAnimSprite->pos2.x = 0; + this->nidorinoAnimSprite->pos1.x = 0xB4; + this->state = 1; + this->data[5] = 30; } break; } } -static void sub_80EDAD8(struct Sprite * sprite) +static void FightScene_CalcCenterToCornerVec(struct Sprite * sprite) { CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); } -static void sub_80EDAF0(struct IntroSequenceData * this) +static void CreateGengarBackSprite(struct IntroSequenceData * this) { int i; + // Not using a subsprite table for this for (i = 0; i < 4; i++) { int x = (i & 1) * 48 + 49; int y = (i / 2) * 64 + 72; - u8 spriteId = CreateSprite(&gUnknown_840BE4C, x, y, 8); + u8 spriteId = CreateSprite(&sSpriteTemplate_GengarBack, x, y, 8); if (spriteId != MAX_SPRITES) { StartSpriteAnim(&gSprites[spriteId], i); - this->field_0028[i] = &gSprites[spriteId]; + this->gengarBackSpriteArray[i] = &gSprites[spriteId]; if (i & 1) - this->field_0028[i]->oam.shape = ST_OAM_V_RECTANGLE; - sub_80EDAD8(this->field_0028[i]); + this->gengarBackSpriteArray[i]->oam.shape = ST_OAM_V_RECTANGLE; + FightScene_CalcCenterToCornerVec(this->gengarBackSpriteArray[i]); } } } -static void sub_80EDB70(struct IntroSequenceData * this) +static void FightScene4_StartNidorinoAffineAnim(struct IntroSequenceData * this) { - this->field_0018->pos1.x += this->field_0018->pos2.x; - this->field_0018->pos1.y += this->field_0018->pos2.y; - obj_pos2_update_enable(this->field_0018, 0, 0x2A); - this->field_0018->callback = SpriteCallbackDummy; - StartSpriteAffineAnim(this->field_0018, 1); + this->nidorinoAnimSprite->pos1.x += this->nidorinoAnimSprite->pos2.x; + this->nidorinoAnimSprite->pos1.y += this->nidorinoAnimSprite->pos2.y; + obj_pos2_update_enable(this->nidorinoAnimSprite, 0, 0x2A); + this->nidorinoAnimSprite->callback = SpriteCallbackDummy; + StartSpriteAffineAnim(this->nidorinoAnimSprite, 1); } -static void nullsub_83(struct Sprite * sprite) +static void SpriteCB_DummyButNotDummy(struct Sprite * sprite) { } -static void sub_80EDBAC(struct IntroSequenceData * this) +static void FightScene4_StartGengarAffineAnim(struct IntroSequenceData * this) { int i; for (i = 0; i < 4; i++) { - StartSpriteAffineAnim(this->field_0028[i], 1); - this->field_0028[i]->callback = nullsub_83; - obj_pos2_update_enable(this->field_0028[i], gUnknown_840BBB8[i][0], gUnknown_840BBB8[i][1]); + StartSpriteAffineAnim(this->gengarBackSpriteArray[i], 1); + this->gengarBackSpriteArray[i]->callback = SpriteCB_DummyButNotDummy; + obj_pos2_update_enable(this->gengarBackSpriteArray[i], sGengarBackSpritePos2UpdateMods[i][0], sGengarBackSpritePos2UpdateMods[i][1]); } } -static void sub_80EDBE8(struct IntroSequenceData * this) +static void IntroCB_CleanUp(struct IntroSequenceData * this) { - switch (this->field_0004) + switch (this->state) { case 0: FillPalette(RGB_BLACK, 0, 0x400); - this->field_0004++; + this->state++; break; case 1: if (!FreeTempTileDataBuffersIfPossible()) { - DestroyTask(this->field_0005); + DestroyTask(this->taskId); Free(this); DisableInterrupts(INTR_FLAG_HBLANK); SetHBlankCallback(NULL); @@ -1473,16 +1469,17 @@ static void sub_80EDBE8(struct IntroSequenceData * this) } } -static void sub_80EDC40(void) +static void GameFreakScene_LoadGfxCreateStar(void) { int i; u8 spriteId; + static EWRAM_DATA u32 gUnknown_203AB28 = 0; - for (i = 0; i < NELEMS(gUnknown_840BBC0); i++) + for (i = 0; i < NELEMS(sSpriteSheets_GameFreakScene); i++) { - LoadCompressedSpriteSheet(&gUnknown_840BBC0[i]); + LoadCompressedSpriteSheet(&sSpriteSheets_GameFreakScene[i]); } - LoadSpritePalettes(gUnknown_840BBE8); + LoadSpritePalettes(sSpritePalettes_GameFreakScene); gUnknown_203AB0E = 0x60; gUnknown_203AB10 = 0x10; gUnknown_203AB12 = 0x07; @@ -1496,19 +1493,21 @@ static void sub_80EDC40(void) gUnknown_203AB24 = 0x05; if (gUnknown_203AB28 == 0) gUnknown_203AB28 = 354128453; - spriteId = CreateSprite(&gUnknown_840BC6C, 0xF8, 0x37, 0); + spriteId = CreateSprite(&sSpriteTemplate_LargeStar, 0xF8, 0x37, 0); if (spriteId != MAX_SPRITES) { gSprites[spriteId].data[0] = 0xF80; gSprites[spriteId].data[1] = 0x370; gSprites[spriteId].data[2] = gUnknown_203AB0E; gSprites[spriteId].data[3] = gUnknown_203AB10; - StoreWordInTwoHalfwords(&gSprites[spriteId].data[6], gUnknown_203AB28); + StoreWordInTwoHalfwords((u16 *)&gSprites[spriteId].data[6], gUnknown_203AB28); } } -static void sub_80EDD28(s16 x, s16 y, u16 a2) +static void GameFreakScene_TrailingSparklesGen(s16 x, s16 y, u16 a2) { + static EWRAM_DATA s16 gUnknown_203AB2C = 0; + u8 spriteId; s16 r4 = (a2 & gUnknown_203AB12) + 2; s16 r2 = gUnknown_203AB2C; @@ -1519,7 +1518,7 @@ static void sub_80EDD28(s16 x, s16 y, u16 a2) y += r2; if (x >= 1 && x <= 0xEF) { - spriteId = CreateSprite(&gUnknown_840BC84, x, y, 1); + spriteId = CreateSprite(&sSpriteTemplate_TrailingSparkles, x, y, 1); if (spriteId != MAX_SPRITES) { gSprites[spriteId].data[0] = x << gUnknown_203AB22; @@ -1530,12 +1529,12 @@ static void sub_80EDD28(s16 x, s16 y, u16 a2) } } -static void sub_80EDDF0(void) +static void GameFreakScene_StartTrailingSparkleSpawner(void) { - CreateTask(sub_80EDE04, 1); + CreateTask(Task_GameFreakScene_TrailingSparkleSpawner, 1); } -static void sub_80EDE04(u8 taskId) +static void Task_GameFreakScene_TrailingSparkleSpawner(u8 taskId) { s16 * data = gTasks[taskId].data; u8 r6; @@ -1546,16 +1545,16 @@ static void sub_80EDE04(u8 taskId) { data[2] = 0; r6 = data[0]; - spriteId = CreateSprite(&gUnknown_840BC84, gUnknown_840BC08[r6].x, gUnknown_840BC08[r6].y, 2); + spriteId = CreateSprite(&sSpriteTemplate_TrailingSparkles, sTrailingSparkleCoords[r6].x, sTrailingSparkleCoords[r6].y, 2); StartSpriteAnim(&gSprites[spriteId], 1); - gSprites[spriteId].callback = sub_80EE40C; - gSprites[spriteId].data[1] = gUnknown_840BC08[r6].y << 4; + gSprites[spriteId].callback = SpriteCB_TrailingSparkles2; + gSprites[spriteId].data[1] = sTrailingSparkleCoords[r6].y << 4; gSprites[spriteId].data[2] = 120; gSprites[spriteId].data[3] = data[1]; if (gSprites[spriteId].data[3] < 0) gSprites[spriteId].data[3] = 1; data[0]++; - if (data[0] < 0 || data[0] > 8) + if (data[0] >= NELEMS(sTrailingSparkleCoords)) { data[1]++; if (data[1] > 1) @@ -1566,12 +1565,12 @@ static void sub_80EDE04(u8 taskId) } } -static void sub_80EDED8(void) +static void GameFreakScene_StartRevealGameFreakTextSparklesSpawner(void) { - CreateTask(sub_80EDEEC, 2); + CreateTask(Task_RevealGameFreakTextSparklesSpawner, 2); } -static void sub_80EDEEC(u8 taskId) +static void Task_RevealGameFreakTextSparklesSpawner(u8 taskId) { s16 * data = gTasks[taskId].data; u8 r2; @@ -1580,9 +1579,9 @@ static void sub_80EDEEC(u8 taskId) { r2 = data[1]; data[1] += 4; - if (data[1] < 0 || data[1] > 8) - data[1] -= 9; - CreateSprite(&gUnknown_840BCBC, gUnknown_840BC08[r2].x, gUnknown_840BC08[r2].y, 3); + if (data[1] >= NELEMS(sTrailingSparkleCoords)) + data[1] -= NELEMS(sTrailingSparkleCoords); + CreateSprite(&sSpriteTemplate_RevealGameFreakTextSparkles, sTrailingSparkleCoords[r2].x, sTrailingSparkleCoords[r2].y, 3); data[2]++; if (data[2] > 8) DestroyTask(taskId); @@ -1592,34 +1591,34 @@ static void sub_80EDEEC(u8 taskId) data[0] = 0; } -static struct Sprite * sub_80EDF68(void) +static struct Sprite * CreateGameFreakLogoArtSprite(void) { - u8 spriteId = CreateSprite(&gUnknown_840BCDC, 120, 70, 4); + u8 spriteId = CreateSprite(&sSpriteTemplate_GameFreakLogoArt, 120, 70, 4); return &gSprites[spriteId]; } #if REVISION >= 1 -static void sub_rev1_80EDFAC(void) +static void Rev1_GameFreakScene_CreatePresentsText(void) { int i; for (i = 0; i < 2; i++) { - gSprites[CreateSprite(&gUnknown_840BCFC, 0x68 + 32 * i, 0x6c, 5)].oam.tileNum += i * 4; + gSprites[CreateSprite(&sSpriteTemplate_PresentsText, 0x68 + 32 * i, 0x6c, 5)].oam.tileNum += i * 4; } } #endif -static void sub_80EDF94(struct IntroSequenceData * this) +static void FightScene4_StartGengarAttack(struct IntroSequenceData * this) { u8 taskId; - this->field_0006 = 0; - taskId = CreateTask(sub_80EE024, 4); + this->gengarAttackLanded = FALSE; + taskId = CreateTask(Task_FightScene4_GengarAttack, 4); SetWordTaskArg(taskId, 5, (uintptr_t)this); gTasks[taskId].data[3] = 64; gTasks[taskId].data[4] = GetBgX(0); } -static void sub_80EDFD8(int a, int b, int c, int d) +static void FightScene4_ApplyGengarAnim(int a, int b, int c, int d) { ChangeBgY(0, (a << 15) + 0x1F000, 0); ChangeBgX(0, d, 0); @@ -1627,7 +1626,7 @@ static void sub_80EDFD8(int a, int b, int c, int d) ChangeBgY(0, c << 8, 2); } -static void sub_80EE024(u8 taskId) +static void Task_FightScene4_GengarAttack(u8 taskId) { s16 * data = gTasks[taskId].data; int b, c; @@ -1653,7 +1652,7 @@ static void sub_80EE024(u8 taskId) case 2: data[1]++; if (data[1] == 14) - ((struct IntroSequenceData *)GetWordTaskArg(taskId, 5))->field_0006 = 1; + ((struct IntroSequenceData *)GetWordTaskArg(taskId, 5))->gengarAttackLanded = TRUE; if (data[1] > 15) { data[1] = 0; @@ -1665,7 +1664,7 @@ static void sub_80EE024(u8 taskId) data[1]++; if (data[1] == 4) { - sub_80EE160(); + FightScene4_CreateGengarSwipeSprites(); data[8] = 32; data[9] = 48; data[7] = 3; @@ -1694,34 +1693,35 @@ static void sub_80EE024(u8 taskId) angle = data[3]; b = -((gSineTable[angle + 0x40] * data[9]) >> 8); c = data[8] - ((gSineTable[angle] * data[8]) >> 8); - sub_80EDFD8(data[7], b, c, data[4]); + FightScene4_ApplyGengarAnim(data[7], b, c, data[4]); } -static void sub_80EE160(void) +static void FightScene4_CreateGengarSwipeSprites(void) { u8 spriteId; - spriteId = CreateSprite(&gUnknown_840BE8C, 132, 78, 6); - spriteId = CreateSprite(&gUnknown_840BE8C, 132, 118, 6); + spriteId = CreateSprite(&sSpriteTemplate_GengarSwipe, 132, 78, 6); + spriteId = CreateSprite(&sSpriteTemplate_GengarSwipe, 132, 118, 6); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.shape = ST_OAM_H_RECTANGLE; gSprites[spriteId].oam.size = ST_OAM_SIZE_2; - sub_80EDAD8(&gSprites[spriteId]); + FightScene_CalcCenterToCornerVec(&gSprites[spriteId]); StartSpriteAnim(&gSprites[spriteId], 1); } } -static void sub_80EE1C4(struct Sprite * sprite) +static void SpriteCB_GengarSwipe(struct Sprite * sprite) { sprite->invisible ^= TRUE; if (sprite->animEnded) DestroySprite(sprite); } -static void sub_80EE200(u8 taskId) +static void Task_FightScene3_Bg0Scroll(u8 taskId) { s16 * data = gTasks[taskId].data; + static EWRAM_DATA u32 gUnknown_203AB30 = 0; switch (data[0]) { @@ -1745,7 +1745,7 @@ static void sub_80EE200(u8 taskId) } } -static void sub_80EE29C(struct Sprite * sprite) +static void SpriteCB_LargeStar(struct Sprite * sprite) { u32 v; sprite->data[0] -= sprite->data[2]; @@ -1761,13 +1761,13 @@ static void sub_80EE29C(struct Sprite * sprite) v = v * 1103515245 + 24691; StoreWordInTwoHalfwords(&sprite->data[6], v); v >>= 16; - sub_80EDD28(sprite->pos1.x, sprite->pos1.y + sprite->pos2.y, v); + GameFreakScene_TrailingSparklesGen(sprite->pos1.x, sprite->pos1.y + sprite->pos2.y, v); } if (sprite->pos1.x < -8) DestroySprite(sprite); } -static void sub_80EE350(struct Sprite * sprite) +static void SpriteCB_TrailingSparkles(struct Sprite * sprite) { u32 v; @@ -1790,7 +1790,7 @@ static void sub_80EE350(struct Sprite * sprite) DestroySprite(sprite); } -static void sub_80EE40C(struct Sprite * sprite) +static void SpriteCB_TrailingSparkles2(struct Sprite * sprite) { if (sprite->data[2]) { @@ -1839,31 +1839,31 @@ static void sub_80EE40C(struct Sprite * sprite) } } -static void sub_80EE4DC(struct Sprite * sprite) +static void SpriteCB_RevealGameFreakTextSparkles(struct Sprite * sprite) { if (sprite->animEnded) DestroySprite(sprite); } -static void sub_80EE4F8(struct IntroSequenceData * this) +static void CreateNidorinoAnimSprite(struct IntroSequenceData * this) { - u8 spriteId = CreateSprite(&gUnknown_840BD88, 0, 0, 9); - this->field_0018 = &gSprites[spriteId]; + u8 spriteId = CreateSprite(&sSpriteTemplate_NidorinoAnim, 0, 0, 9); + this->nidorinoAnimSprite = &gSprites[spriteId]; } -static void sub_80EE528(struct Sprite * sprite, s16 a1, s16 a2, u16 a3) +static void StartNidorinoAnimSpriteSlideIn(struct Sprite * sprite, s16 x0, s16 x1, u16 speed) { - sprite->data[0] = a1 << 4; - sprite->data[1] = ((a2 - a1) << 4) / a3; - sprite->data[2] = a3; - sprite->data[3] = a2; + sprite->data[0] = x0 << 4; + sprite->data[1] = ((x1 - x0) << 4) / speed; + sprite->data[2] = speed; + sprite->data[3] = x1; sprite->data[4] = 0; - sprite->pos1.x = a1; + sprite->pos1.x = x0; sprite->pos1.y = 100; - sprite->callback = sub_80EE580; + sprite->callback = SpriteCB_NidorinoAnimSpriteSlideIn; } -static void sub_80EE580(struct Sprite * sprite) +static void SpriteCB_NidorinoAnimSpriteSlideIn(struct Sprite * sprite) { sprite->data[4]++; if (sprite->data[4] >= 40) @@ -1880,21 +1880,21 @@ static void sub_80EE580(struct Sprite * sprite) } } -static bool32 sub_80EE5C8(struct IntroSequenceData * ptr) +static bool32 IsNidorinoAnimSpriteSlideInRunning(struct IntroSequenceData * ptr) { - return ptr->field_0018->callback == sub_80EE580 ? TRUE : FALSE; + return ptr->nidorinoAnimSprite->callback == SpriteCB_NidorinoAnimSpriteSlideIn ? TRUE : FALSE; } -static void sub_80EE5E4(struct IntroSequenceData * ptr) +static void FightScene4_NidorinoRearsUp(struct IntroSequenceData * ptr) { - StartSpriteAnim(ptr->field_0018, 2); - ptr->field_0018->data[0] = 0; - ptr->field_0018->data[1] = 0; - ptr->field_0018->pos2.y = 3; - ptr->field_0018->callback = sub_80EE610; + StartSpriteAnim(ptr->nidorinoAnimSprite, 2); + ptr->nidorinoAnimSprite->data[0] = 0; + ptr->nidorinoAnimSprite->data[1] = 0; + ptr->nidorinoAnimSprite->pos2.y = 3; + ptr->nidorinoAnimSprite->callback = SpriteCB_NidorinoRearsUp; } -static void sub_80EE610(struct Sprite * sprite) +static void SpriteCB_NidorinoRearsUp(struct Sprite * sprite) { switch (sprite->data[0]) { @@ -1930,23 +1930,23 @@ static void sub_80EE610(struct Sprite * sprite) } } -static void sub_80EE6A4(struct IntroSequenceData * ptr) +static void FightScene4_StartNidorinoRecoilAnim(struct IntroSequenceData * ptr) { gUnknown_203AB0A = 16; gUnknown_203AB04 = 3; gUnknown_203AB08 = 5; gUnknown_203AB06 = 0; - StartSpriteAnim(ptr->field_0018, 2); - ptr->field_0018->data[0] = 0; - ptr->field_0018->data[1] = 0; - ptr->field_0018->data[2] = 0; - ptr->field_0018->data[3] = 0; - ptr->field_0018->data[4] = 0; - ptr->field_0018->data[7] = 40; - ptr->field_0018->callback = sub_80EE704; + StartSpriteAnim(ptr->nidorinoAnimSprite, 2); + ptr->nidorinoAnimSprite->data[0] = 0; + ptr->nidorinoAnimSprite->data[1] = 0; + ptr->nidorinoAnimSprite->data[2] = 0; + ptr->nidorinoAnimSprite->data[3] = 0; + ptr->nidorinoAnimSprite->data[4] = 0; + ptr->nidorinoAnimSprite->data[7] = 40; + ptr->nidorinoAnimSprite->callback = SpriteCB_NidorinoRecoil; } -static void sub_80EE704(struct Sprite * sprite) +static void SpriteCB_NidorinoRecoil(struct Sprite * sprite) { switch (sprite->data[0]) { @@ -1985,7 +1985,7 @@ static void sub_80EE704(struct Sprite * sprite) sprite->data[1]++; if (sprite->data[1] > 6) { - sub_80EE864(sprite->pos1.x + sprite->pos2.x, sprite->pos1.y + sprite->pos2.y, sprite->data[6]); + CreateNidorinoRecoilDustSprites(sprite->pos1.x + sprite->pos2.x, sprite->pos1.y + sprite->pos2.y, sprite->data[6]); sprite->data[6] *= 1103515245; } if (sprite->data[1] > 12) @@ -1999,36 +1999,36 @@ static void sub_80EE704(struct Sprite * sprite) sprite->data[1]++; if (sprite->data[1] > 16) { - sub_80EE970(sprite, gUnknown_203AB0A, -sprite->pos2.x, 4); + StartSpriteHopToPosAnim(sprite, gUnknown_203AB0A, -sprite->pos2.x, 4); } break; } } -static bool8 sub_80EE850(struct IntroSequenceData * ptr) +static bool8 FightScene4_NidorinoAnimIsRunning(struct IntroSequenceData * ptr) { - return ptr->field_0018->callback == SpriteCallbackDummy ? FALSE : TRUE; + return ptr->nidorinoAnimSprite->callback == SpriteCallbackDummy ? FALSE : TRUE; } -static void sub_80EE864(s16 a1, s16 a2, s16 a3) +static void CreateNidorinoRecoilDustSprites(s16 x, s16 y, s16 seed) { int i; u8 spriteId; for (i = 0; i < 2; i++) { - spriteId = CreateSprite(&gUnknown_840BEC4, a1 - 22, a2 + 24, 10); + spriteId = CreateSprite(&sSpriteTemplate_NidorinoRecoilDust, x - 22, y + 24, 10); if (spriteId != MAX_SPRITES) { - gSprites[spriteId].data[3] = (a3 % 13) + 8; - gSprites[spriteId].data[4] = a3 % 3; + gSprites[spriteId].data[3] = (seed % 13) + 8; + gSprites[spriteId].data[4] = seed % 3; gSprites[spriteId].data[7] = i; - a3 *= 1103515245; + seed *= 1103515245; } } } -static void sub_80EE8E4(struct Sprite * sprite) +static void SpriteCB_NidorinoRecoilDust(struct Sprite * sprite) { s16 * data = sprite->data; @@ -2056,7 +2056,7 @@ static void sub_80EE8E4(struct Sprite * sprite) } } -static void sub_80EE970(struct Sprite * sprite, u16 a1, s16 a2, u8 a3) +static void StartSpriteHopToPosAnim(struct Sprite * sprite, u16 a1, s16 a2, u8 a3) { sprite->data[0] = 0; sprite->data[1] = a1; @@ -2067,10 +2067,10 @@ static void sub_80EE970(struct Sprite * sprite, u16 a1, s16 a2, u8 a3) sprite->data[6] = 0; sprite->data[7] = a3; StartSpriteAnim(sprite, 2); - sprite->callback = sub_80EE9D4; + sprite->callback = SpriteCB_HopToPos; } -static void sub_80EE9D4(struct Sprite * sprite) +static void SpriteCB_HopToPos(struct Sprite * sprite) { switch (sprite->data[0]) { @@ -2117,26 +2117,26 @@ static void sub_80EE9D4(struct Sprite * sprite) } } -static void sub_80EEA94(struct IntroSequenceData * ptr) +static void StartNidorinoAnim_LaunchSelfAtGengarAnim(struct IntroSequenceData * ptr) { - ptr->field_0018->data[0] = 0; - ptr->field_0018->data[1] = 0; - ptr->field_0018->data[2] = 0; - ptr->field_0018->data[3] = 0; - ptr->field_0018->data[4] = 0; - ptr->field_0018->data[5] = 0; - ptr->field_0018->pos1.x += ptr->field_0018->pos2.x; - ptr->field_0018->pos2.x = 0; + ptr->nidorinoAnimSprite->data[0] = 0; + ptr->nidorinoAnimSprite->data[1] = 0; + ptr->nidorinoAnimSprite->data[2] = 0; + ptr->nidorinoAnimSprite->data[3] = 0; + ptr->nidorinoAnimSprite->data[4] = 0; + ptr->nidorinoAnimSprite->data[5] = 0; + ptr->nidorinoAnimSprite->pos1.x += ptr->nidorinoAnimSprite->pos2.x; + ptr->nidorinoAnimSprite->pos2.x = 0; gUnknown_203AB0C = 0x24; gUnknown_203AB06 = 0x28; gUnknown_203AB04 = 0x03; gUnknown_203AB08 = 0x04; - ptr->field_0018->data[7] = 36; - StartSpriteAnim(ptr->field_0018, 2); - ptr->field_0018->callback = sub_80EEB08; + ptr->nidorinoAnimSprite->data[7] = 36; + StartSpriteAnim(ptr->nidorinoAnimSprite, 2); + ptr->nidorinoAnimSprite->callback = SpriteCB_NidorinoAnim_LaunchSelfAtGengar; } -static void sub_80EEB08(struct Sprite * sprite) +static void SpriteCB_NidorinoAnim_LaunchSelfAtGengar(struct Sprite * sprite) { switch (sprite->data[0]) { @@ -2178,15 +2178,15 @@ static void sub_80EEB08(struct Sprite * sprite) } } -static void sub_80EEBE4(void) +static void LoadFightSceneSpriteTilesAndPals(void) { int i; - for (i = 0; i < NELEMS(gUnknown_840BEDC); i++) + for (i = 0; i < NELEMS(sFightSceneSpriteSheets); i++) { - LoadCompressedSpriteSheet(&gUnknown_840BEDC[i]); + LoadCompressedSpriteSheet(&sFightSceneSpriteSheets[i]); } - // gUnknown_840BF14 is not properly terminated, so this + // sFightSceneSpritePalettes is not properly terminated, so this // call exhibits undefined behavior. - LoadSpritePalettes(gUnknown_840BF14); + LoadSpritePalettes(sFightSceneSpritePalettes); } diff --git a/src/item_menu.c b/src/item_menu.c index e048b4b78..ebad0640d 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -377,7 +377,7 @@ static void CB2_OpenBagMenu(void) { while (1) { - if ((u8)sub_80BF72C() == TRUE) + if ((u8)MenuHelpers_CallLinkSomething() == TRUE) break; if (LoadBagMenuGraphics() == TRUE) break; @@ -1050,7 +1050,7 @@ static void Task_BagMenu_HandleInput(u8 taskId) return; if (FuncIsActiveTask(Task_AnimateWin0v) == TRUE) return; - if ((u8)sub_80BF72C() == TRUE) + if ((u8)MenuHelpers_CallLinkSomething() == TRUE) return; switch (ProcessPocketSwitchInput(taskId, gBagMenuState.pocket)) { @@ -1244,7 +1244,7 @@ static void Task_MoveItemInPocket_HandleInput(u8 taskId) s32 input; u16 itemsAbove; u16 cursorPos; - if ((u8)sub_80BF72C() == TRUE) + if ((u8)MenuHelpers_CallLinkSomething() == TRUE) return; input = ListMenu_ProcessInput(data[0]); ListMenuGetScrollAndRow(data[0], &gBagMenuState.cursorPos[gBagMenuState.pocket], &gBagMenuState.itemsAbove[gBagMenuState.pocket]); @@ -1447,7 +1447,7 @@ static void Task_ItemContext_FieldOrBattle(u8 taskId) static void Task_FieldItemContextMenuHandleInput(u8 taskId) { s8 input; - if ((u8)sub_80BF72C() != TRUE) + if ((u8)MenuHelpers_CallLinkSomething() != TRUE) { input = Menu_ProcessInputNoWrapAround(); switch (input) @@ -2036,7 +2036,7 @@ bool8 UseRegisteredKeyItemOnField(void) ScriptContext2_Enable(); FreezeObjectEvents(); sub_805C270(); - sub_805C780(); + StopPlayerAvatar(); gSpecialVar_ItemId = gSaveBlock1Ptr->registeredItem; taskId = CreateTask(ItemId_GetFieldFunc(gSaveBlock1Ptr->registeredItem), 8); gTasks[taskId].data[3] = 1; diff --git a/src/item_pc.c b/src/item_pc.c index af57d9f03..1fda50d6f 100644 --- a/src/item_pc.c +++ b/src/item_pc.c @@ -385,7 +385,7 @@ static bool8 ItemPc_DoGfxSetup(void) gMain.state++; break; case 20: - if ((u8)sub_80BF72C() != TRUE) + if ((u8)MenuHelpers_CallLinkSomething() != TRUE) gMain.state++; break; default: diff --git a/src/item_use.c b/src/item_use.c index af3243678..45bed65e8 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -268,7 +268,7 @@ void FieldUseFunc_MachBike(u8 taskId) || MetatileBehavior_IsIsolatedVerticalRail(behavior) == TRUE || MetatileBehavior_IsIsolatedHorizontalRail(behavior) == TRUE) sub_80A10C4(taskId, gTasks[taskId].data[3], 2, gUnknown_8416451); - else if (Overworld_IsBikingAllowed() == TRUE && !sub_80BD540()) + else if (Overworld_IsBikingAllowed() == TRUE && !MetatileAtPlayerPositionForbidsBiking()) { sItemUseOnFieldCB = ItemUseOnFieldCB_Bicycle; sub_80A103C(taskId); diff --git a/src/mail.c b/src/mail.c index b5c0343b3..9a28fae41 100644 --- a/src/mail.c +++ b/src/mail.c @@ -588,7 +588,7 @@ static bool8 DoInitMailView(void) } break; case 15: - if (sub_8058244() == TRUE) + if (Overworld_LinkRecvQueueLengthMoreThan2() == TRUE) return FALSE; break; case 16: diff --git a/src/map_name_popup.c b/src/map_name_popup.c index 87df371ce..6f7fa5d3c 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -18,26 +18,36 @@ static u16 MapNamePopupCreateWindow(bool32 palIntoFadedBuffer); static void MapNamePopupPrintMapNameOnWindow(u16 windowId); static u8 *MapNamePopupAppendFloorNum(u8 *dest, s8 flags); +#define tState data[0] +#define tTimer data[1] +#define tPos data[2] +#define tReshow data[3] +#define tWindowId data[4] +#define tWindowExists data[5] +#define tWindowCleared data[6] +#define tWindowDestroyed data[7] +#define tPalIntoFadedBuffer data[8] + void ShowMapNamePopup(bool32 palIntoFadedBuffer) { u8 taskId; - if (FlagGet(FLAG_SPECIAL_FLAG_0x4000) != TRUE && !(gQuestLogState == 2 || gQuestLogState == 3)) + if (FlagGet(FLAG_DONT_SHOW_MAP_NAME_POPUP) != TRUE && !(gQuestLogState == QL_STATE_2 || gQuestLogState == QL_STATE_3)) { taskId = FindTaskIdByFunc(Task_MapNamePopup); if (taskId == 0xFF) { taskId = CreateTask(Task_MapNamePopup, 90); - ChangeBgX(0, 0x00000000, 0); - ChangeBgY(0, 0xFFFFEF7F, 0); - gTasks[taskId].data[0] = 0; - gTasks[taskId].data[2] = 0; - gTasks[taskId].data[8] = palIntoFadedBuffer; + ChangeBgX(0, 0x0000, 0); + ChangeBgY(0, -0x1081, 0); + gTasks[taskId].tState = 0; + gTasks[taskId].tPos = 0; + gTasks[taskId].tPalIntoFadedBuffer = palIntoFadedBuffer; } else { - if (gTasks[taskId].data[0] != 4) - gTasks[taskId].data[0] = 4; - gTasks[taskId].data[3] = 1; + if (gTasks[taskId].tState != 4) + gTasks[taskId].tState = 4; + gTasks[taskId].tReshow = TRUE; } } } @@ -45,71 +55,71 @@ void ShowMapNamePopup(bool32 palIntoFadedBuffer) static void Task_MapNamePopup(u8 taskId) { struct Task * task = &gTasks[taskId]; - switch (task->data[0]) + switch (task->tState) { case 0: - task->data[4] = MapNamePopupCreateWindow(task->data[8]); - task->data[5] = 1; - task->data[0] = 1; + task->tWindowId = MapNamePopupCreateWindow(task->tPalIntoFadedBuffer); + task->tWindowExists = TRUE; + task->tState = 1; break; case 1: if (IsDma3ManagerBusyWithBgCopy()) break; // fallthrough case 2: - task->data[2] -= 2; - if (task->data[2] <= -24) + task->tPos -= 2; + if (task->tPos <= -24) { - task->data[0] = 3; - task->data[1] = 0; + task->tState = 3; + task->tTimer = 0; } break; case 3: - task->data[1]++; - if (task->data[1] > 120) + task->tTimer++; + if (task->tTimer > 120) { - task->data[1] = 0; - task->data[0] = 4; + task->tTimer = 0; + task->tState = 4; } break; case 4: - task->data[2] += 2; - if (task->data[2] >= 0) + task->tPos += 2; + if (task->tPos >= 0) { - if (task->data[3]) + if (task->tReshow) { - MapNamePopupPrintMapNameOnWindow(task->data[4]); - CopyWindowToVram(task->data[4], 2); - task->data[0] = 1; - task->data[3] = 0; + MapNamePopupPrintMapNameOnWindow(task->tWindowId); + CopyWindowToVram(task->tWindowId, 2); + task->tState = 1; + task->tReshow = FALSE; } else { - task->data[0] = 6; + task->tState = 6; return; } } case 5: break; case 6: - if (task->data[5] && !task->data[6]) + if (task->tWindowExists && !task->tWindowCleared) { - rbox_fill_rectangle(task->data[4]); - CopyWindowToVram(task->data[4], 1); - task->data[6] = 1; + rbox_fill_rectangle(task->tWindowId); + CopyWindowToVram(task->tWindowId, 1); + task->tWindowCleared = TRUE; } - task->data[0] = 7; + task->tState = 7; return; case 7: if (!IsDma3ManagerBusyWithBgCopy()) { - if (task->data[5]) + if (task->tWindowExists) { - RemoveWindow(task->data[4]); - task->data[5] = 0; - task->data[7] = 1; + RemoveWindow(task->tWindowId); + task->tWindowExists = FALSE; + task->tWindowDestroyed = TRUE; } - task->data[0] = 8; + task->tState = 8; ChangeBgY(0, 0x00000000, 0); } return; @@ -117,7 +127,7 @@ static void Task_MapNamePopup(u8 taskId) DestroyTask(taskId); return; } - SetGpuReg(REG_OFFSET_BG0VOFS, task->data[2]); + SetGpuReg(REG_OFFSET_BG0VOFS, task->tPos); } void DismissMapNamePopup(void) @@ -128,8 +138,8 @@ void DismissMapNamePopup(void) if (taskId != 0xFF) { data = gTasks[taskId].data; - if (data[0] < 6) - data[0] = 6; + if (tState < 6) + tState = 6; } } @@ -160,6 +170,7 @@ static u16 MapNamePopupCreateWindow(bool32 palintoFadedBuffer) } else { + // ROOFTOP windowTemplate.width += 8; r6 = 0x02D; } @@ -194,7 +205,7 @@ static void MapNamePopupPrintMapNameOnWindow(u16 windowId) } xpos = (maxWidth - GetStringWidth(2, mapName, -1)) / 2; FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); - AddTextPrinterParameterized(windowId, 2, mapName, xpos, 2, 0xFF, NULL); + AddTextPrinterParameterized(windowId, 2, mapName, xpos, 2, TEXT_SPEED_FF, NULL); } static u8 *MapNamePopupAppendFloorNum(u8 *dest, s8 floorNum) @@ -203,7 +214,7 @@ static u8 *MapNamePopupAppendFloorNum(u8 *dest, s8 floorNum) return dest; *dest++ = CHAR_SPACE; if (floorNum == 0x7F) - return StringCopy(dest, gUnknown_841D18D); + return StringCopy(dest, gText_Rooftop2); if (floorNum < 0) { *dest++ = CHAR_B; @@ -214,3 +225,13 @@ static u8 *MapNamePopupAppendFloorNum(u8 *dest, s8 floorNum) *dest = EOS; return dest; } + +#undef tPalIntoFadedBuffer +#undef tWindowDestroyed +#undef tWindowCleared +#undef tWindowExists +#undef tWindowId +#undef tReshow +#undef tPos +#undef tTimer +#undef tState diff --git a/src/menu_helpers.c b/src/menu_helpers.c index dedd7aa9e..8e63ea99d 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -125,17 +125,17 @@ bool8 MenuHelpers_LinkSomething(void) return FALSE; } -bool32 sub_80BF72C(void) +bool32 MenuHelpers_CallLinkSomething(void) { if (!MenuHelpers_LinkSomething()) return FALSE; else - return (u8)sub_8058244(); + return (u8)Overworld_LinkRecvQueueLengthMoreThan2(); } bool8 sub_80BF748(void) { - if ((u8)sub_80BF72C() == TRUE) + if ((u8)MenuHelpers_CallLinkSomething() == TRUE) return TRUE; else if (sub_800B270() != TRUE) return FALSE; diff --git a/src/normal.c b/src/normal.c index 4e045340f..366219c72 100644 --- a/src/normal.c +++ b/src/normal.c @@ -326,7 +326,7 @@ u32 UnpackSelectedBattleAnimPalettes(s16 selector) u8 arg5 = (selector >> 5) & 1; u8 arg6 = (selector >> 6) & 1; - return sub_8075BE8(battleBackground, attacker, target, attackerPartner, targetPartner, arg5, arg6); + return SelectBattleAnimSpriteAndBgPalettes(battleBackground, attacker, target, attackerPartner, targetPartner, arg5, arg6); } static void AnimSimplePaletteBlendStep(struct Sprite *sprite) @@ -406,7 +406,7 @@ static void sub_80B9B8C(struct Sprite *sprite) sprite->callback(sprite); } -void sub_80B9BDC(u8 taskId) +void AnimTask_CurseBlendEffect(u8 taskId) { gTasks[taskId].data[0] = gBattleAnimArgs[0]; gTasks[taskId].data[1] = gBattleAnimArgs[1]; @@ -659,7 +659,7 @@ void sub_80BA0E8(u8 taskId) u8 targetBattler = gBattleAnimTarget; if (gBattleAnimArgs[0] & 0x100) - selectedPalettes = sub_8075BE8(1, 0, 0, 0, 0, 0, 0); + selectedPalettes = SelectBattleAnimSpriteAndBgPalettes(1, 0, 0, 0, 0, 0, 0); if (gBattleAnimArgs[1] & 0x100) selectedPalettes |= (0x10000 << attackerBattler); if (gBattleAnimArgs[2] & 0x100) diff --git a/src/option_menu.c b/src/option_menu.c index 87306c98f..54cca0501 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -43,11 +43,10 @@ enum struct OptionMenu { /*0x00*/ u16 option[MENUITEM_COUNT]; - /*0x0E*/ u16 unkE; - /*0x10*/ u8 state3; + /*0x0E*/ u16 cursorPos; + /*0x10*/ u8 loadState; /*0x11*/ u8 state; - /*0x12*/ u8 state2; - /*0x13*/ u8 unk13; + /*0x12*/ u8 loadPaletteState; }; static EWRAM_DATA struct OptionMenu *sOptionMenuPtr = NULL; @@ -68,9 +67,9 @@ static u8 OptionMenu_ProcessInput(void); static void BufferOptionMenuString(u8 selection); static void CloseAndSaveOptionMenu(u8 taskId); static void PrintOptionMenuHeader(void); -static void sub_8088C0C(void); +static void DrawOptionMenuBg(void); static void LoadOptionMenuItemNames(void); -static void sub_8088DE0(u16 selection); +static void UpdateSettingSelectionDisplay(u16 selection); // Data Definitions static const struct WindowTemplate sOptionMenuWinTemplates[] = @@ -208,10 +207,10 @@ void CB2_OptionsMenuFromStartMenu(void) if (gMain.savedCallback == NULL) gMain.savedCallback = CB2_ReturnToFieldWithOpenMenu; sOptionMenuPtr = AllocZeroed(sizeof(struct OptionMenu)); - sOptionMenuPtr->state3 = 0; - sOptionMenuPtr->state2 = 0; + sOptionMenuPtr->loadState = 0; + sOptionMenuPtr->loadPaletteState = 0; sOptionMenuPtr->state = 0; - sOptionMenuPtr->unkE = 0; + sOptionMenuPtr->cursorPos = 0; sOptionMenuPtr->option[MENUITEM_TEXTSPEED] = gSaveBlock2Ptr->optionsTextSpeed; sOptionMenuPtr->option[MENUITEM_BATTLESCENE] = gSaveBlock2Ptr->optionsBattleSceneOff; sOptionMenuPtr->option[MENUITEM_BATTLESTYLE] = gSaveBlock2Ptr->optionsBattleStyle; @@ -262,7 +261,7 @@ static void CB2_OptionMenu(void) PrintOptionMenuHeader(); break; case 5: - sub_8088C0C(); + DrawOptionMenuBg(); break; case 6: LoadOptionMenuItemNames(); @@ -272,7 +271,7 @@ static void CB2_OptionMenu(void) BufferOptionMenuString(i); break; case 8: - sub_8088DE0(sOptionMenuPtr->unkE); + UpdateSettingSelectionDisplay(sOptionMenuPtr->cursorPos); break; case 9: OptionMenu_PickSwitchCancel(); @@ -340,7 +339,7 @@ static void OptionMenu_ResetSpriteData(void) static bool8 LoadOptionMenuPalette(void) { - switch (sOptionMenuPtr->state2) + switch (sOptionMenuPtr->loadPaletteState) { case 0: LoadBgTiles(1, GetUserFrameGraphicsInfo(sOptionMenuPtr->option[MENUITEM_FRAMETYPE])->tiles, 0x120, 0x1AA); @@ -358,51 +357,55 @@ static bool8 LoadOptionMenuPalette(void) default: return TRUE; } - sOptionMenuPtr->state2++; + sOptionMenuPtr->loadPaletteState++; return FALSE; } static void Task_OptionMenu(u8 taskId) { - switch (sOptionMenuPtr->state3) + switch (sOptionMenuPtr->loadState) { case 0: BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); OptionMenu_SetVBlankCallback(); - sOptionMenuPtr->state3++; + sOptionMenuPtr->loadState++; + break; + case 1: + if (gPaletteFade.active) + return; + sOptionMenuPtr->loadState++; break; case 2: - if (sub_80BF72C() == TRUE) + if (MenuHelpers_CallLinkSomething() == TRUE) break; switch (OptionMenu_ProcessInput()) { case 0: break; case 1: - sOptionMenuPtr->state3++; + sOptionMenuPtr->loadState++; break; case 2: LoadBgTiles(1, GetUserFrameGraphicsInfo(sOptionMenuPtr->option[MENUITEM_FRAMETYPE])->tiles, 0x120, 0x1AA); LoadPalette(GetUserFrameGraphicsInfo(sOptionMenuPtr->option[MENUITEM_FRAMETYPE])->palette, 0x20, 0x20); - BufferOptionMenuString(sOptionMenuPtr->unkE); + BufferOptionMenuString(sOptionMenuPtr->cursorPos); break; case 3: - sub_8088DE0(sOptionMenuPtr->unkE); + UpdateSettingSelectionDisplay(sOptionMenuPtr->cursorPos); break; case 4: - BufferOptionMenuString(sOptionMenuPtr->unkE); + BufferOptionMenuString(sOptionMenuPtr->cursorPos); break; } break; case 3: BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); - sOptionMenuPtr->state3++; + sOptionMenuPtr->loadState++; break; - case 1: case 4: if (gPaletteFade.active) return; - sOptionMenuPtr->state3++; + sOptionMenuPtr->loadState++; break; case 5: CloseAndSaveOptionMenu(taskId); @@ -416,43 +419,43 @@ static u8 OptionMenu_ProcessInput(void) u16* curr; if (JOY_REPT(DPAD_RIGHT)) { - current = sOptionMenuPtr->option[(sOptionMenuPtr->unkE)]; - if (current == (sOptionMenuItemCounts[sOptionMenuPtr->unkE] - 1)) - sOptionMenuPtr->option[sOptionMenuPtr->unkE] = 0; + current = sOptionMenuPtr->option[(sOptionMenuPtr->cursorPos)]; + if (current == (sOptionMenuItemCounts[sOptionMenuPtr->cursorPos] - 1)) + sOptionMenuPtr->option[sOptionMenuPtr->cursorPos] = 0; else - sOptionMenuPtr->option[sOptionMenuPtr->unkE] = current + 1; - if (sOptionMenuPtr->unkE == MENUITEM_FRAMETYPE) + sOptionMenuPtr->option[sOptionMenuPtr->cursorPos] = current + 1; + if (sOptionMenuPtr->cursorPos == MENUITEM_FRAMETYPE) return 2; else return 4; } else if (JOY_REPT(DPAD_LEFT)) { - curr = &sOptionMenuPtr->option[sOptionMenuPtr->unkE]; + curr = &sOptionMenuPtr->option[sOptionMenuPtr->cursorPos]; if (*curr == 0) - *curr = sOptionMenuItemCounts[sOptionMenuPtr->unkE] - 1; + *curr = sOptionMenuItemCounts[sOptionMenuPtr->cursorPos] - 1; else --*curr; - if (sOptionMenuPtr->unkE == MENUITEM_FRAMETYPE) + if (sOptionMenuPtr->cursorPos == MENUITEM_FRAMETYPE) return 2; else return 4; } else if (JOY_REPT(DPAD_UP)) { - if (sOptionMenuPtr->unkE == MENUITEM_TEXTSPEED) - sOptionMenuPtr->unkE = MENUITEM_CANCEL; + if (sOptionMenuPtr->cursorPos == MENUITEM_TEXTSPEED) + sOptionMenuPtr->cursorPos = MENUITEM_CANCEL; else - sOptionMenuPtr->unkE = sOptionMenuPtr->unkE - 1; + sOptionMenuPtr->cursorPos = sOptionMenuPtr->cursorPos - 1; return 3; } else if (JOY_REPT(DPAD_DOWN)) { - if (sOptionMenuPtr->unkE == MENUITEM_CANCEL) - sOptionMenuPtr->unkE = MENUITEM_TEXTSPEED; + if (sOptionMenuPtr->cursorPos == MENUITEM_CANCEL) + sOptionMenuPtr->cursorPos = MENUITEM_TEXTSPEED; else - sOptionMenuPtr->unkE = sOptionMenuPtr->unkE + 1; + sOptionMenuPtr->cursorPos = sOptionMenuPtr->cursorPos + 1; return 3; } else if (JOY_NEW(B_BUTTON) || JOY_NEW(A_BUTTON)) @@ -531,7 +534,7 @@ static void PrintOptionMenuHeader(void) CopyWindowToVram(0, 3); } -static void sub_8088C0C(void) +static void DrawOptionMenuBg(void) { u8 h; h = 2; @@ -566,12 +569,12 @@ static void LoadOptionMenuItemNames(void) } } -static void sub_8088DE0(u16 selection) +static void UpdateSettingSelectionDisplay(u16 selection) { - u16 v1, v2; + u16 maxLetterHeight, y; - v1 = GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT); - v2 = selection * (v1 - 1) + 0x3A; - SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(v2, v2 + v1)); + maxLetterHeight = GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT); + y = selection * (maxLetterHeight - 1) + 0x3A; + SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(y, y + maxLetterHeight)); SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0x10, 0xE0)); } diff --git a/src/overworld.c b/src/overworld.c index e86939f10..a4a6213e6 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -120,7 +120,7 @@ u8 gFieldLinkPlayerCount; static u8 sPlayerTradingStates[4]; static KeyInterCB sPlayerKeyInterceptCallback; -static bool8 gUnknown_3000E88; +static bool8 sReceivingFromLink; static u8 sRfuKeepAliveTimer; static u8 CountBadgesForOverworldWhiteOutLossCalculation(void); @@ -1037,7 +1037,7 @@ void Overworld_PlaySpecialMapMusic(void) if (gSaveBlock1Ptr->savedMusic) music = gSaveBlock1Ptr->savedMusic; - else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) &&sub_8056124(MUS_NAMINORI)) + else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && Overworld_MusicCanOverrideMapMusic(MUS_NAMINORI)) music = MUS_NAMINORI; if (music != GetCurrentMapMusic()) @@ -1075,7 +1075,7 @@ static void Overworld_TryMapConnectionMusicTransition(void) currentMusic = GetCurrentMapMusic(); if (currentMusic == MUS_NAMINORI) return; - if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && sub_8056124(MUS_NAMINORI)) + if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && Overworld_MusicCanOverrideMapMusic(MUS_NAMINORI)) newMusic = MUS_NAMINORI; if (newMusic != currentMusic) { @@ -1193,7 +1193,7 @@ static void ChooseAmbientCrySpecies(void) sAmbientCrySpecies = GetLocalWildMon(&sIsAmbientCryWaterMon); } -bool32 sub_8056124(u16 music) +bool32 Overworld_MusicCanOverrideMapMusic(u16 music) { if (music == MUS_CYCLING || music == MUS_NAMINORI) { @@ -1427,7 +1427,7 @@ static void DoCB1_Overworld_QuestLogPlayback(void) sub_805BEB8(); sub_8111C68(); FieldClearPlayerInput(&fieldInput); - fieldInput = gUnknown_3005E90; + fieldInput = gQuestLogFieldInput; FieldInput_HandleCancelSignpost(&fieldInput); if (!ScriptContext2_IsEnabled()) { @@ -1445,7 +1445,7 @@ static void DoCB1_Overworld_QuestLogPlayback(void) { RunQuestLogCB(); } - FieldClearPlayerInput(&gUnknown_3005E90); + FieldClearPlayerInput(&gQuestLogFieldInput); } void CB1_Overworld(void) @@ -1555,7 +1555,7 @@ void CB2_WhiteOut(void) gFieldCallback = FieldCB_RushInjuredPokemonToCenter; val = 0; do_load_map_stuff_loop(&val); - sub_8112364(); + QuestLog_OnInteractionWithSpecialNpc(); SetFieldVBlankCallback(); SetMainCallback1(CB1_Overworld); SetMainCallback2(CB2_Overworld); @@ -1629,7 +1629,7 @@ static void CB2_ReturnToFieldLocal(void) static void CB2_ReturnToFieldLink(void) { - if (!sub_8058244() && map_loading_iteration_2_link(&gMain.state)) + if (!Overworld_LinkRecvQueueLengthMoreThan2() && map_loading_iteration_2_link(&gMain.state)) SetMainCallback2(CB2_Overworld); } @@ -3181,15 +3181,15 @@ static void sub_8058230(void) ScriptContext2_Enable(); } -bool32 sub_8058244(void) +bool32 Overworld_LinkRecvQueueLengthMoreThan2(void) { if (!IsUpdateLinkStateCBActive()) return FALSE; if (GetLinkRecvQueueLength() >= 3) - gUnknown_3000E88 = TRUE; + sReceivingFromLink = TRUE; else - gUnknown_3000E88 = FALSE; - return gUnknown_3000E88; + sReceivingFromLink = FALSE; + return sReceivingFromLink; } bool32 sub_8058274(void) @@ -3207,8 +3207,8 @@ bool32 sub_8058274(void) else if (sPlayerKeyInterceptCallback != KeyInterCB_DeferToEventScript) return FALSE; - temp = gUnknown_3000E88; - gUnknown_3000E88 = FALSE; + temp = sReceivingFromLink; + sReceivingFromLink = FALSE; if (temp == TRUE) return TRUE; diff --git a/src/quest_log.c b/src/quest_log.c index 3c6b88d3d..51e09e899 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -45,8 +45,6 @@ #include "constants/field_weather.h" #include "constants/event_object_movement.h" -u8 gUnknown_3005E88; - struct TrainerFanClub { u8 timer:7; @@ -96,7 +94,7 @@ struct UnkStruct_203B044 u8 gUnknown_3005E88; u16 sNumEventsInLogEntry; -struct FieldInput gUnknown_3005E90; +struct FieldInput gQuestLogFieldInput; struct QuestLogEntry * sCurQuestLogEntry; static struct UnkStruct_300201C * sFlagOrVarRecords; @@ -108,7 +106,7 @@ EWRAM_DATA u8 gQuestLogState = 0; static EWRAM_DATA u16 gUnknown_203ADFC = 0; static EWRAM_DATA u8 sQuestLogHeaderWindowIds[3] = {0}; static EWRAM_DATA u16 *gUnknown_203AE04 = NULL; -static EWRAM_DATA u16 *gUnknown_203AE08 = NULL; +static EWRAM_DATA u16 *sEventRecordingPointer = NULL; static EWRAM_DATA u16 *gUnknown_203AE0C[32] = {NULL}; static EWRAM_DATA void (* sQuestLogCB)(void) = NULL; static EWRAM_DATA u16 *gUnknown_203AE90 = NULL; @@ -131,7 +129,7 @@ static void sub_8110A00(void); static void sub_8110A3C(void); static void SetPlayerInitialCoordsAtScene(u8); static void SetNPCInitialCoordsAtScene(u8); -static void sub_8110E3C(void); +static void TryRecordEvent39_GoToNextScene(void); static void BackUpTrainerRematchesToVars(void); static void BackUpMapLayoutToVar(void); static void SetGameStateAtScene(u8); @@ -184,7 +182,7 @@ static bool8 sub_81137E4(u16, const u16 *); static u16 *sub_8113828(u16, const u16 *); static bool8 TrySetLinkQuestLogEvent(u16, const u16 *); static bool8 TrySetTrainerBattleQuestLogEvent(u16, const u16 *); -static void sub_8113A1C(u16); +static void TryRecordEvent41_IncCursor(u16); static void sub_811381C(void); static bool8 IsQuestLogEventWithSpecialEncounterSpecies(u16, const u16 *); static u16 *QuestLog_SkipCommand(u16 *, u16 **); @@ -194,9 +192,9 @@ static bool8 sub_8113B44(const u16 *); static void sub_8113B88(void); static void sub_8113B94(u16); static void sub_8113BD8(void); -static u16 *sub_8113BF4(u16 *); +static u16 *TryRecordEvent39_NoParams(u16 *); static u16 *sub_8113C20(u16 *, struct QuestLogEntry *); -static u16 *sub_8113C5C(u16 *, u16); +static u16 *TryRecordEvent41(u16 *, u16); static u16 *sub_8113C8C(u16 *, struct QuestLogEntry *); static u16 *sub_8113CC8(u16 *, struct QuestLogEntry *); static u16 *sub_8113D08(u16 *, struct QuestLogEntry *); @@ -302,8 +300,8 @@ void sub_8110840(void * oldPointer) gUnknown_203AE04 = (void *)gUnknown_203AE04 + offset; if (gQuestLogState != 0) { - if (gUnknown_203AE08) - gUnknown_203AE08 = (void *)gUnknown_203AE08 + offset; + if (sEventRecordingPointer) + sEventRecordingPointer = (void *)sEventRecordingPointer + offset; if (gQuestLogState == QL_STATE_2) { int r3; @@ -320,7 +318,7 @@ void ResetQuestLog(void) sCurrentSceneNum = 0; gQuestLogState = 0; sQuestLogCB = NULL; - gUnknown_203AE08 = NULL; + sEventRecordingPointer = NULL; gUnknown_203AE04 = NULL; sub_8113BD8(); sub_81138F8(); @@ -353,12 +351,12 @@ bool8 sub_8110944(const void * a0, size_t cmdSize) return TRUE; } -bool8 sub_8110988(u16 *a0, size_t a1) +static bool8 WillCommandOfSizeFitInSav1Record(u16 *cursor, size_t size) { - void * r2 = gSaveBlock1Ptr->questLog[sCurrentSceneNum].unk_568; - void * r0 = gSaveBlock1Ptr->questLog[sCurrentSceneNum].end; - r0 -= a1; - if ((void *)a0 < r2 || (void *)a0 > r0) + void * start = gSaveBlock1Ptr->questLog[sCurrentSceneNum].unk_568; + void * end = gSaveBlock1Ptr->questLog[sCurrentSceneNum].end; + end -= size; + if ((void *)cursor < start || (void *)cursor > end) return FALSE; return TRUE; } @@ -377,7 +375,7 @@ static void sub_8110A00(void) if (TryRecordQuestLogEntrySequence(sQuestLogSceneRecordBuffer) != 1) { gUnknown_3005E88 = 0; - sub_8110E3C(); + TryRecordEvent39_GoToNextScene(); gQuestLogState = 0; sQuestLogCB = NULL; } @@ -418,7 +416,7 @@ static void StartRecordingQuestLogEntry(u16 eventId) DestroySav1QuestLogEntry(sCurrentSceneNum); sub_8113B88(); - gUnknown_203AE08 = gSaveBlock1Ptr->questLog[sCurrentSceneNum].unk_568; + sEventRecordingPointer = gSaveBlock1Ptr->questLog[sCurrentSceneNum].unk_568; if (IS_LINK_QL_EVENT(eventId) || eventId == QL_EVENT_DEPARTED) gSaveBlock1Ptr->questLog[sCurrentSceneNum].unk_000 = 2; else @@ -511,9 +509,9 @@ static void BackUpMapLayoutToVar(void) VarSet(VAR_QLBAK_MAP_LAYOUT, gSaveBlock1Ptr->mapLayoutId); } -static void sub_8110E3C(void) +static void TryRecordEvent39_GoToNextScene(void) { - sub_8113BF4(gUnknown_203AE08); + TryRecordEvent39_NoParams(sEventRecordingPointer); if (++sCurrentSceneNum >= QUEST_LOG_SCENE_COUNT) sCurrentSceneNum = 0; } @@ -524,19 +522,19 @@ static bool8 TryRecordQuestLogEntrySequence(struct QuestLogEntry * entry) for (i = gUnknown_203ADFC; i < sQuestLogCursor; i++) { - if (gUnknown_203AE08 == NULL) + if (sEventRecordingPointer == NULL) return FALSE; switch (entry[i].unk_6) { case 0: case 1: - gUnknown_203AE08 = sub_8113D48(gUnknown_203AE08, &entry[i]); + sEventRecordingPointer = sub_8113D48(sEventRecordingPointer, &entry[i]); break; default: - gUnknown_203AE08 = sub_8113CC8(gUnknown_203AE08, &entry[i]); + sEventRecordingPointer = sub_8113CC8(sEventRecordingPointer, &entry[i]); break; } - if (gUnknown_203AE08 == NULL) + if (sEventRecordingPointer == NULL) { gUnknown_3005E88 = 0; return FALSE; @@ -545,7 +543,7 @@ static bool8 TryRecordQuestLogEntrySequence(struct QuestLogEntry * entry) if (gUnknown_3005E88 == 0) { - gUnknown_203AE08 = sub_8113BF4(gUnknown_203AE08); + sEventRecordingPointer = TryRecordEvent39_NoParams(sEventRecordingPointer); return FALSE; } gUnknown_203ADFC = sQuestLogCursor; @@ -968,7 +966,7 @@ bool8 QuestLog_SchedulePlaybackCB(void (*callback)(void)) switch (gQuestLogState) { case 1: - sub_8112364(); + QuestLog_OnInteractionWithSpecialNpc(); break; case 2: gUnknown_3005E88 = 3; @@ -1089,13 +1087,13 @@ void sub_8111C68(void) { if (gUnknown_203AE94.unk_0_6 == 0) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { gUnknown_203AE94.unk_0_6 = 2; gUnknown_3005E88 = 0; sub_81118F4(-3); } - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { gUnknown_203AE94.unk_0_6 = 1; gUnknown_3005E88 = 0; @@ -1230,7 +1228,7 @@ static void sub_8111F8C(u8 taskId) { FreezeObjectEvents(); sub_805C270(); - sub_805C780(); + StopPlayerAvatar(); ScriptContext2_Enable(); task->func = Task_QuestLogScene_SavedGame; } @@ -1262,7 +1260,7 @@ static void Task_WaitAtEndOfQuestLog(u8 taskId) { struct Task *task = &gTasks[taskId]; - if (gMain.newKeys & (A_BUTTON | B_BUTTON) || task->tTimer >= 127 || gUnknown_203AE94.unk_0_6 == 1) + if (JOY_NEW(A_BUTTON | B_BUTTON) || task->tTimer >= 127 || gUnknown_203AE94.unk_0_6 == 1) { QuestLog_CloseTextWindow(); task->tTimer = 0; @@ -1313,7 +1311,7 @@ static void Task_EndQuestLog(u8 taskId) break; default: if (gUnknown_203AE94.unk_0_6 == 1) - ShowMapNamePopup(1); + ShowMapNamePopup(TRUE); CpuCopy16(gUnknown_203AE90, gPlttBufferUnfaded, 0x400); Free(gUnknown_203AE90); gUnknown_203AE94 = (struct UnkStruct_203AE94){}; @@ -1366,31 +1364,31 @@ void sub_811231C(void) if (gQuestLogState == QL_STATE_1) { TryRecordQuestLogEntrySequence(sQuestLogSceneRecordBuffer); - sub_8110E3C(); + TryRecordEvent39_GoToNextScene(); gQuestLogState = 0; sQuestLogCB = NULL; gUnknown_203AE04 = NULL; - gUnknown_203AE08 = NULL; + sEventRecordingPointer = NULL; gUnknown_3005E88 = 0; } } -void sub_8112364(void) +void QuestLog_OnInteractionWithSpecialNpc(void) { if (gUnknown_3005E88 && gQuestLogState == QL_STATE_1) { TryRecordQuestLogEntrySequence(sQuestLogSceneRecordBuffer); - sub_8113A1C(1); - sub_8110E3C(); + TryRecordEvent41_IncCursor(1); + TryRecordEvent39_GoToNextScene(); gUnknown_3005E88 = 0; gQuestLogState = 0; sQuestLogCB = NULL; } gUnknown_203AE04 = NULL; - gUnknown_203AE08 = NULL; + sEventRecordingPointer = NULL; } -void sub_81123BC(void) +static void SortQuestLogInSav1(void) { struct QuestLog * buffer = AllocZeroed(QUEST_LOG_SCENE_COUNT * sizeof(struct QuestLog)); u8 i; @@ -1412,12 +1410,12 @@ void sub_81123BC(void) Free(buffer); } -void sub_8112450(void) +void SaveQuestLogData(void) { if (MenuHelpers_LinkSomething() != TRUE) { - sub_8112364(); - sub_81123BC(); + QuestLog_OnInteractionWithSpecialNpc(); + SortQuestLogInSav1(); } } @@ -1616,7 +1614,7 @@ static void SetUpQuestLogEntry(u8 kind, struct QuestLogEntry *entry, u16 size) } sQuestLogCursor = 0; gUnknown_203B01C = 0; - gUnknown_3005E90 = (struct FieldInput){}; + gQuestLogFieldInput = (struct FieldInput){}; sNextStepDelay = sCurQuestLogEntry[sQuestLogCursor].unk_4; sMovementScripts[0][0] = sCurQuestLogEntry[sQuestLogCursor].unk_3; sMovementScripts[0][1] = 0xFF; @@ -1688,7 +1686,8 @@ void sub_8112B3C(void) sMovementScripts[sCurQuestLogEntry[sQuestLogCursor].unk_0][1] = sCurQuestLogEntry[sQuestLogCursor].unk_3; break; case 2: - *(u32 *)&gUnknown_3005E90 = ((sCurQuestLogEntry[sQuestLogCursor].unk_3 << 24) | (sCurQuestLogEntry[sQuestLogCursor].unk_2 << 16) | (sCurQuestLogEntry[sQuestLogCursor].unk_1 << 8) | (sCurQuestLogEntry[sQuestLogCursor].unk_0 << 0)); + // Player input command + *(u32 *)&gQuestLogFieldInput = ((sCurQuestLogEntry[sQuestLogCursor].unk_3 << 24) | (sCurQuestLogEntry[sQuestLogCursor].unk_2 << 16) | (sCurQuestLogEntry[sQuestLogCursor].unk_1 << 8) | (sCurQuestLogEntry[sQuestLogCursor].unk_0 << 0)); break; case 3: gUnknown_3005E88 = 3; @@ -2443,7 +2442,7 @@ void SetQuestLogEvent(u16 eventId, const u16 *eventData) { if (gUnknown_203AE04 == NULL) { - gUnknown_203AE04 = gUnknown_203AE08; + gUnknown_203AE04 = sEventRecordingPointer; r1 = sQuestLogStorageCBs[eventId](gUnknown_203AE04, eventData); } else @@ -2455,7 +2454,7 @@ void SetQuestLogEvent(u16 eventId, const u16 *eventData) else { gUnknown_203AE04 = NULL; - r1 = sQuestLogStorageCBs[eventId](gUnknown_203AE08, eventData); + r1 = sQuestLogStorageCBs[eventId](sEventRecordingPointer, eventData); } if (r1 == NULL) @@ -2466,7 +2465,7 @@ void SetQuestLogEvent(u16 eventId, const u16 *eventData) return; } - gUnknown_203AE08 = r1; + sEventRecordingPointer = r1; if (gUnknown_203B048 == 0) return; sub_811231C(); @@ -2518,7 +2517,7 @@ bool8 sub_8113748(void) return TRUE; if (gQuestLogState == QL_STATE_1) - sub_8112364(); + QuestLog_OnInteractionWithSpecialNpc(); return FALSE; } @@ -2584,11 +2583,11 @@ static u16 *sub_8113828(u16 eventId, const u16 *eventData) sub_8113B94(eventId); if (eventId == QL_EVENT_DEFEATED_WILD_MON) - gUnknown_203AE04 = gUnknown_203AE08; + gUnknown_203AE04 = sEventRecordingPointer; else gUnknown_203AE04 = NULL; - return sQuestLogStorageCBs[eventId](gUnknown_203AE08, eventData); + return sQuestLogStorageCBs[eventId](sEventRecordingPointer, eventData); } static bool8 TrySetLinkQuestLogEvent(u16 eventId, const u16 *eventData) @@ -2614,15 +2613,15 @@ void sub_81138F8(void) gUnknown_203B024 = (struct UnkStruct_203B024){}; } -void sub_811390C(void) +void QuestLog_StartRecordingInputsAfterDeferredEvent(void) { if (gUnknown_203B024.unk_00 != QL_EVENT_0) { u16 *resp; gUnknown_203B04A = 0; StartRecordingQuestLogEntry(gUnknown_203B024.unk_00); - resp = sQuestLogStorageCBs[gUnknown_203B024.unk_00](gUnknown_203AE08, gUnknown_203B024.unk_04); - gUnknown_203AE08 = resp; + resp = sQuestLogStorageCBs[gUnknown_203B024.unk_00](sEventRecordingPointer, gUnknown_203B024.unk_04); + sEventRecordingPointer = resp; sub_81138F8(); } } @@ -2655,17 +2654,17 @@ void sub_81139BC(void) StartRecordingQuestLogEntry(gUnknown_203B024.unk_00); } sub_8113B94(gUnknown_203B024.unk_00); - resp = sQuestLogStorageCBs[gUnknown_203B024.unk_00](gUnknown_203AE08, gUnknown_203B024.unk_04); - gUnknown_203AE08 = resp; - sub_8113A1C(1); + resp = sQuestLogStorageCBs[gUnknown_203B024.unk_00](sEventRecordingPointer, gUnknown_203B024.unk_04); + sEventRecordingPointer = resp; + TryRecordEvent41_IncCursor(1); sub_81138F8(); sub_811231C(); } } -static void sub_8113A1C(u16 a0) +static void TryRecordEvent41_IncCursor(u16 a0) { - gUnknown_203AE08 = sub_8113C5C(gUnknown_203AE08, a0); + sEventRecordingPointer = TryRecordEvent41(sEventRecordingPointer, a0); sQuestLogCursor++; } @@ -2854,9 +2853,9 @@ static void sub_8113BD8(void) gUnknown_203B04B = FALSE; } -static u16 *sub_8113BF4(u16 *a0) +static u16 *TryRecordEvent39_NoParams(u16 *a0) { - if (!sub_8110988(a0, sQuestLogEventCmdSizes[QL_EVENT_39])) + if (!WillCommandOfSizeFitInSav1Record(a0, sQuestLogEventCmdSizes[QL_EVENT_39])) return NULL; a0[0] = QL_EVENT_39; return a0 + 1; @@ -2864,7 +2863,7 @@ static u16 *sub_8113BF4(u16 *a0) static u16 *sub_8113C20(u16 *a0, struct QuestLogEntry * a1) { - if (!sub_8110988(a0, sQuestLogEventCmdSizes[QL_EVENT_39])) + if (!WillCommandOfSizeFitInSav1Record(a0, sQuestLogEventCmdSizes[QL_EVENT_39])) return NULL; a1->unk_6 = 0xFF; a1->unk_4 = 0; @@ -2875,9 +2874,9 @@ static u16 *sub_8113C20(u16 *a0, struct QuestLogEntry * a1) return a0 + 1; } -static u16 *sub_8113C5C(u16 *a0, u16 a1) +static u16 *TryRecordEvent41(u16 *a0, u16 a1) { - if (!sub_8110988(a0, sQuestLogEventCmdSizes[QL_EVENT_41])) + if (!WillCommandOfSizeFitInSav1Record(a0, sQuestLogEventCmdSizes[QL_EVENT_41])) return NULL; a0[0] = QL_EVENT_41; a0[1] = a1; @@ -2886,7 +2885,7 @@ static u16 *sub_8113C5C(u16 *a0, u16 a1) static u16 *sub_8113C8C(u16 *a0, struct QuestLogEntry * a1) { - if (!sub_8110988(a0, sQuestLogEventCmdSizes[QL_EVENT_41])) + if (!WillCommandOfSizeFitInSav1Record(a0, sQuestLogEventCmdSizes[QL_EVENT_41])) return NULL; a1->unk_6 = 0xFE; a1->unk_4 = a0[1]; @@ -2901,7 +2900,7 @@ static u16 *sub_8113CC8(u16 *a0, struct QuestLogEntry * a1) { u8 *r6 = (u8 *)a0 + 4; - if (!sub_8110988(a0, sQuestLogEventCmdSizes[QL_EVENT_0])) + if (!WillCommandOfSizeFitInSav1Record(a0, sQuestLogEventCmdSizes[QL_EVENT_0])) return NULL; a0[0] = 0; a0[1] = a1->unk_4; @@ -2916,7 +2915,7 @@ static u16 *sub_8113D08(u16 *a0, struct QuestLogEntry * a1) { u8 *r6 = (u8 *)a0 + 4; - if (!sub_8110988(a0, sQuestLogEventCmdSizes[QL_EVENT_0])) + if (!WillCommandOfSizeFitInSav1Record(a0, sQuestLogEventCmdSizes[QL_EVENT_0])) return NULL; a1->unk_6 = 2; a1->unk_4 = a0[1]; @@ -2932,7 +2931,7 @@ static u16 *sub_8113D48(u16 *a0, struct QuestLogEntry * a1) u16 *r4 = a0; u8 *r6 = (u8 *)a0 + 4; - if (!sub_8110988(r4, sQuestLogEventCmdSizes[QL_EVENT_2])) + if (!WillCommandOfSizeFitInSav1Record(r4, sQuestLogEventCmdSizes[QL_EVENT_2])) return NULL; if (a1->unk_6 == 0) r4[0] = 2; @@ -2951,7 +2950,7 @@ static u16 *sub_8113D94(u16 *a0, struct QuestLogEntry * a1) u16 *r5 = a0; u8 *r6 = (u8 *)a0 + 4; - if (!sub_8110988(r5, sQuestLogEventCmdSizes[QL_EVENT_2])) + if (!WillCommandOfSizeFitInSav1Record(r5, sQuestLogEventCmdSizes[QL_EVENT_2])) return NULL; if (r5[0] == 2) a1->unk_6 = 0; diff --git a/src/quest_log_player.c b/src/quest_log_player.c index 42233999e..8abf7fab5 100644 --- a/src/quest_log_player.c +++ b/src/quest_log_player.c @@ -68,7 +68,7 @@ static void sub_81504E8(void) sub_81507BC(objectEvent, GetPlayerAvatarGraphicsIdByStateId(1)); ObjectEventTurn(objectEvent, objectEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_MACH_BIKE); - sub_80BD620(0, 0); + InitPlayerAvatarBikeState(0, 0); } static void sub_8150530(void) diff --git a/src/save_location.c b/src/save_location.c index 561fd2ff2..1fef9e8cf 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -93,16 +93,16 @@ void TrySetMapSaveWarpStatus(void) sub_810B7CC(); } -void sub_810B810(void) +void SetUnlockedPokedexFlags(void) { gSaveBlock2Ptr->field_A8 |= 0x1; gSaveBlock2Ptr->field_A8 |= 0x10; gSaveBlock2Ptr->field_A8 |= 0x20; } -void sub_810B82C(void) +void SetPostgameFlags(void) { - gSaveBlock2Ptr->specialSaveWarpFlags |= 0x80; + gSaveBlock2Ptr->specialSaveWarpFlags |= CHAMPION_SAVEWARP; gSaveBlock2Ptr->field_A8 |= 0x2; gSaveBlock2Ptr->field_A8 |= 0x4; gSaveBlock2Ptr->field_A8 |= 0x8; diff --git a/src/script.c b/src/script.c index 13c571bac..097f6d3f3 100644 --- a/src/script.c +++ b/src/script.c @@ -28,7 +28,7 @@ static struct ScriptContext sScriptContext1; static u32 sUnusedVariable2; static struct ScriptContext sScriptContext2; static bool8 sScriptContext2Enabled; -static u8 gUnknown_3000F9D; +static u8 sMsgBoxWalkawayDisabled; static u8 sMsgBoxIsCancelable; static u8 sQuestLogInput; static u8 sQuestLogInputIsDpad; @@ -235,19 +235,19 @@ u8 GetRegisteredQuestLogInput(void) return sQuestLogInput; } -void sub_80699BC(void) +void DisableMsgBoxWalkaway(void) { - gUnknown_3000F9D = TRUE; + sMsgBoxWalkawayDisabled = TRUE; } -void sub_80699C8(void) +void EnableMsgBoxWalkaway(void) { - gUnknown_3000F9D = FALSE; + sMsgBoxWalkawayDisabled = FALSE; } -bool8 sub_80699D4(void) +bool8 IsMsgBoxWalkawayDisabled(void) { - return gUnknown_3000F9D; + return sMsgBoxWalkawayDisabled; } void SetWalkingIntoSignVars(void) @@ -330,7 +330,7 @@ bool8 ScriptContext2_RunScript(void) void ScriptContext1_SetupScript(const u8 *ptr) { ClearMsgBoxCancelableState(); - sub_80699C8(); + EnableMsgBoxWalkaway(); ClearQuestLogInputIsDpadFlag(); InitScriptContext(&sScriptContext1, gScriptCmdTable, gScriptCmdTableEnd); SetupBytecodeScript(&sScriptContext1, ptr); diff --git a/src/shop.c b/src/shop.c index ddeaf6a68..b84007bed 100644 --- a/src/shop.c +++ b/src/shop.c @@ -120,7 +120,7 @@ static void CB2_InitBuyMenu(void); static bool8 InitShopData(void); static void BuyMenuInitBgs(void); static void BuyMenuDecompressBgGraphics(void); -static void sub_809B10C(bool32 a0); +static void RecolorItemDescriptionBox(bool32 a0); static void BuyMenuDrawGraphics(void); static bool8 BuyMenuBuildListMenuTemplate(void); static void PokeMartWriteNameAndIdAt(struct ListMenuItem *list, u16 index, u8* dst); @@ -134,7 +134,7 @@ static void SetShopExitCallback(void); static void BuyMenuAddScrollIndicatorArrows(void); static void BuyQuantityAddScrollIndicatorArrows(void); static void BuyMenuRemoveScrollIndicatorArrows(void); -static void sub_809B764(void); +static void BuyMenuDrawMapView(void); static void BuyMenuDrawMapBg(void); static void BuyMenuDrawMapMetatile(s16 x, s16 y, const u16 *src, u8 metatileLayerType); static void BuyMenuDrawMapMetatileLayer(u16 *dest, s16 offset1, s16 offset2, const u16 *src); @@ -152,8 +152,8 @@ static void Task_ReturnToItemListAfterItemPurchase(u8 taskId); static void BuyMenuReturnToItemList(u8 taskId); static void ExitBuyMenu(u8 taskId); static void Task_ExitBuyMenu(u8 taskId); -static void nullsub_52(u8 taskId); -static void nullsub_53(void); +static void DebugFunc_PrintPurchaseDetails(u8 taskId); +static void DebugFunc_PrintShopMenuHistoryBeforeClearMaybe(void); static void RecordQuestLogItemPurchase(void); static const struct MenuAction sShopMenuActions_BuySellQuit[] = @@ -496,26 +496,26 @@ static void BuyMenuDecompressBgGraphics(void) Free(pal); } -static void sub_809B10C(bool32 a0) +static void RecolorItemDescriptionBox(bool32 a0) { - u8 v; + u8 paletteNum; if (a0 == FALSE) - v = 0xB; + paletteNum = 0xB; else - v = 6; + paletteNum = 0x6; if ((gShopData.martType) != MART_TYPE_TMHM) - SetBgTilemapPalette(1, 0, 0xE, 0x1E, 6, v); + SetBgTilemapPalette(1, 0, 14, 30, 6, paletteNum); else - SetBgTilemapPalette(1, 0, 0xC, 0x1E, 8, v); + SetBgTilemapPalette(1, 0, 12, 30, 8, paletteNum); ScheduleBgCopyTilemapToVram(1); } static void BuyMenuDrawGraphics(void) { - sub_809B764(); + BuyMenuDrawMapView(); BuyMenuCopyTilemapData(); BuyMenuDrawMoneyBox(); ScheduleBgCopyTilemapToVram(0); @@ -732,7 +732,7 @@ static void BuyMenuRemoveScrollIndicatorArrows(void) gShopData.unk16_11 = 0x1F; } -static void sub_809B764(void) +static void BuyMenuDrawMapView(void) { BuyMenuCollectObjectEventData(); BuyMenuDrawObjectEvents(); @@ -913,7 +913,7 @@ static void Task_BuyMenu(u8 taskId) ClearWindowTilemap(5); BuyMenuRemoveScrollIndicatorArrows(); BuyMenuPrintCursor(tListTaskId, 2); - sub_809B10C(1); + RecolorItemDescriptionBox(1); gShopData.itemPrice = itemid_get_market_price(itemId); if (!IsEnoughMoney(&gSaveBlock1Ptr->money, gShopData.itemPrice)) { @@ -1006,7 +1006,7 @@ static void BuyMenuTryMakePurchase(u8 taskId) if (AddBagItem(tItemId, tItemCount) == TRUE) { BuyMenuDisplayMessage(taskId, gText_HereYouGoThankYou, BuyMenuSubtractMoney); - nullsub_52(taskId); + DebugFunc_PrintPurchaseDetails(taskId); RecordItemPurchase(tItemId, tItemCount, 1); } else @@ -1039,7 +1039,7 @@ static void BuyMenuReturnToItemList(u8 taskId) ClearDialogWindowAndFrameToTransparent(2, 0); BuyMenuPrintCursor(tListTaskId, 1); - sub_809B10C(0); + RecolorItemDescriptionBox(0); PutWindowTilemap(4); PutWindowTilemap(5); if (gShopData.martType == MART_TYPE_TMHM) @@ -1070,11 +1070,11 @@ static void Task_ExitBuyMenu(u8 taskId) } } -static void nullsub_52(u8 taskId) +static void DebugFunc_PrintPurchaseDetails(u8 taskId) { } -static void nullsub_53(void) +static void DebugFunc_PrintShopMenuHistoryBeforeClearMaybe(void) { } @@ -1138,7 +1138,7 @@ void CreatePokemartMenu(const u16 *itemsForSale) SetShopItemsForSale(itemsForSale); CreateShopMenu(MART_TYPE_REGULAR); SetShopMenuCallback(EnableBothScriptContexts); - nullsub_53(); + DebugFunc_PrintShopMenuHistoryBeforeClearMaybe(); memset(&gShopMenuHistory, 0, sizeof(gShopMenuHistory)); gShopMenuHistory[0].unk8 = gMapHeader.regionMapSectionId; gShopMenuHistory[1].unk8 = gMapHeader.regionMapSectionId; diff --git a/src/sprite.c b/src/sprite.c index fd824494b..a71edce1c 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -1,7 +1,5 @@ #include "global.h" -#include "sprite.h" -#include "main.h" -#include "palette.h" +#include "gflib.h" #define MAX_SPRITE_COPY_REQUESTS 64 diff --git a/src/start_menu.c b/src/start_menu.c index 867e469e0..6fd69d9e0 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -1,7 +1,5 @@ #include "global.h" -#include "palette.h" -#include "bg.h" -#include "gpu_regs.h" +#include "gflib.h" #include "scanline_effect.h" #include "overworld.h" #include "link.h" @@ -17,7 +15,6 @@ #include "menu.h" #include "load_save.h" #include "strings.h" -#include "string_util.h" #include "menu_helpers.h" #include "text_window.h" #include "field_fadetransition.h" @@ -26,7 +23,6 @@ #include "event_object_movement.h" #include "event_object_lock.h" #include "script.h" -#include "sound.h" #include "quest_log.h" #include "new_game.h" #include "event_scripts.h" @@ -395,7 +391,7 @@ void ShowStartMenu(void) { FreezeObjectEvents(); sub_805C270(); - sub_805C780(); + StopPlayerAvatar(); } OpenStartMenuWithFollowupFunc(Task_StartMenuHandleInput); ScriptContext2_Enable(); @@ -779,7 +775,7 @@ static u8 SaveDialogCB_AskOverwriteOrReplacePreviousFileHandleInput(void) static u8 SaveDialogCB_PrintSavingDontTurnOffPower(void) { - sub_8112450(); + SaveQuestLogData(); PrintSaveTextWithFollowupFunc(gText_SavingDontTurnOffThePower, SaveDialogCB_DoSave); return SAVECB_RETURN_CONTINUE; } diff --git a/src/strings.c b/src/strings.c index fbe51254c..de428ddd9 100644 --- a/src/strings.c +++ b/src/strings.c @@ -1059,7 +1059,7 @@ ALIGNED(4) const u8 gText_Ghost[] = _("GHOST"); const u8 gText_PokemonOnHook[] = _("A POKéMON's on the hook!{PAUSE_UNTIL_PRESS}"); const u8 gText_NotEvenANibble[] = _("Not even a nibble‥{PAUSE_UNTIL_PRESS}"); const u8 gText_ItGotAway[] = _("It got away‥{PAUSE_UNTIL_PRESS}"); -const u8 gUnknown_841D18D[] = _("ROOFTOP"); +const u8 gText_Rooftop2[] = _("ROOFTOP"); ALIGNED(4) const u8 gString_PokemonFireRed_Staff[] = _("Pokémon FireRed Version\nStaff"); ALIGNED(4) const u8 gString_PokemonLeafGreen_Staff[] = _("Pokémon LeafGreen Version\nStaff"); ALIGNED(4) const u8 gCreditsString_Director[] = _("\n\nDirector\n\n\n\n"); diff --git a/src/title_screen.c b/src/title_screen.c index e1bcf5dd2..14f7a8732 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -668,7 +668,7 @@ static void SetTitleScreenScene_Restart(s16 * data) case 4: HelpSystem_Disable(); DestroyTask(FindTaskIdByFunc(Task_TitleScreenMain)); - SetMainCallback2(sub_80EC864); + SetMainCallback2(CB2_CopyrightScreen); break; } } diff --git a/src/tm_case.c b/src/tm_case.c index 7bb471719..57eee6faf 100644 --- a/src/tm_case.c +++ b/src/tm_case.c @@ -304,7 +304,7 @@ static void CB2_SetUpTMCaseUI_Blocking(void) { while (1) { - if ((u8)sub_80BF72C() == TRUE) + if ((u8)MenuHelpers_CallLinkSomething() == TRUE) break; if (DoSetUpTMCaseUI() == TRUE) break; @@ -733,7 +733,7 @@ static void Task_TMCaseMain(u8 taskId) if (!gPaletteFade.active) { - if ((u8)sub_80BF72C() != TRUE) + if ((u8)MenuHelpers_CallLinkSomething() != TRUE) { input = ListMenu_ProcessInput(data[0]); ListMenuGetScrollAndRow(data[0], &sTMCaseStaticResources.scrollOffset, &sTMCaseStaticResources.selectedRow); @@ -814,7 +814,7 @@ static void Task_TMContextMenu_HandleInput(u8 taskId) { s8 input; - if ((u8)sub_80BF72C() != TRUE) + if ((u8)MenuHelpers_CallLinkSomething() != TRUE) { input = Menu_ProcessInputNoWrapAround(); switch (input) diff --git a/src/trainer_card.c b/src/trainer_card.c index df116d379..01bd2c228 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -589,7 +589,7 @@ static void Task_TrainerCard(u8 taskId) } break; case STATE_WAIT_FLIP_TO_BACK: - if (IsCardFlipTaskActive() && sub_8058244() != TRUE) + if (IsCardFlipTaskActive() && Overworld_LinkRecvQueueLengthMoreThan2() != TRUE) { PlaySE(SE_CARD3); sTrainerCardDataPtr->mainState = STATE_HANDLE_INPUT_BACK; @@ -647,7 +647,7 @@ static void Task_TrainerCard(u8 taskId) CloseTrainerCard(taskId); break; case STATE_WAIT_FLIP_TO_FRONT: - if (IsCardFlipTaskActive() && sub_8058244() != TRUE) + if (IsCardFlipTaskActive() && Overworld_LinkRecvQueueLengthMoreThan2() != TRUE) { sTrainerCardDataPtr->mainState = STATE_HANDLE_INPUT_FRONT; PlaySE(SE_CARD3); @@ -1727,7 +1727,7 @@ static bool8 Task_AnimateCardFlipDown(struct Task* task) static bool8 Task_DrawFlippedCardSide(struct Task* task) { sTrainerCardDataPtr->allowDMACopy = FALSE; - if (sub_8058244() == TRUE) + if (Overworld_LinkRecvQueueLengthMoreThan2() == TRUE) return FALSE; do diff --git a/src/vs_seeker.c b/src/vs_seeker.c index 7054a13ed..849c599e8 100644 --- a/src/vs_seeker.c +++ b/src/vs_seeker.c @@ -80,7 +80,9 @@ extern u8 gSelectedObjectEvent; // static declarations static EWRAM_DATA struct VsSeekerStruct *sVsSeeker = NULL; -static void sub_810C3B8(u8 taskId); +static void VsSeekerResetInBagStepCounter(void); +static void VsSeekerResetChargingStepCounter(void); +static void Task_ResetObjectsRematchWantedState(u8 taskId); static void sub_810C594(void); static void Task_VsSeeker_1(u8 taskId); static void Task_VsSeeker_2(u8 taskId); @@ -103,6 +105,7 @@ static u8 GetRematchableTrainerLocalId(void); static void StartTrainerObjectMovementScript(struct VsSeekerTrainerInfo *, const u8 *); static u8 GetCurVsSeekerResponse(s32, u16); static void StartAllRespondantIdleMovements(void); +static u8 GetRandomFaceDirectionMovementType(); // rodata static const VsSeekerData sVsSeekerData[] = { @@ -581,16 +584,14 @@ static const u8 gUnknown_8453F67[] = { MOVEMENT_TYPE_FACE_RIGHT }; - // text - -void sub_810C3A4(void) +void VsSeekerFreezeObjectsAfterChargeComplete(void) { - CreateTask(sub_810C3B8, 80); + CreateTask(Task_ResetObjectsRematchWantedState, 80); } -static void sub_810C3B8(u8 taskId) +static void Task_ResetObjectsRematchWantedState(u8 taskId) { struct Task * task = &gTasks[taskId]; u8 i; @@ -618,36 +619,36 @@ static void sub_810C3B8(u8 taskId) if (task->data[0] != 0) { DestroyTask(taskId); - sub_805C780(); + StopPlayerAvatar(); EnableBothScriptContexts(); } } -void sub_810C444(void) +void VsSeekerResetObjectMovementAfterChargeComplete(void) { struct ObjectEventTemplate * templates = gSaveBlock1Ptr->objectEventTemplates; u8 i; - u8 r6; - u8 sp0; + u8 movementType; + u8 objEventId; struct ObjectEvent * objectEvent; for (i = 0; i < gMapHeader.events->objectEventCount; i++) { if ((templates[i].trainerType == 1 || templates[i].trainerType == 3) && (templates[i].movementType == MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN || templates[i].movementType == MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP || templates[i].movementType == MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT)) { - r6 = sub_810CF54(); - TryGetObjectEventIdByLocalIdAndMap(templates[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &sp0); - objectEvent = &gObjectEvents[sp0]; - if (sub_810CF04(sp0) == TRUE) + movementType = GetRandomFaceDirectionMovementType(); + TryGetObjectEventIdByLocalIdAndMap(templates[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objEventId); + objectEvent = &gObjectEvents[objEventId]; + if (sub_810CF04(objEventId) == TRUE) { - SetTrainerMovementType(objectEvent, r6); + SetTrainerMovementType(objectEvent, movementType); } - templates[i].movementType = r6; + templates[i].movementType = movementType; } } } -bool8 sub_810C4EC(void) +bool8 UpdateVsSeekerStepCounter(void) { if (CheckBagHasItem(ITEM_VS_SEEKER, 1) == TRUE) { @@ -672,7 +673,7 @@ bool8 sub_810C4EC(void) if (x == 100) { FlagClear(FLAG_SYS_VS_SEEKER_CHARGING); - sub_810C640(); + VsSeekerResetChargingStepCounter(); sub_810D0D0(); return TRUE; } @@ -684,7 +685,7 @@ bool8 sub_810C4EC(void) void TryUpdateRandomTrainerRematches(u16 mapGroup, u16 mapNum) { FlagClear(FLAG_SYS_VS_SEEKER_CHARGING); - sub_810C640(); + VsSeekerResetChargingStepCounter(); sub_810D0D0(); sub_810C594(); } @@ -698,34 +699,34 @@ static void sub_810C594(void) struct ObjectEvent * objectEvent = &gObjectEvents[i]; if (objectEvent->movementType == MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN || objectEvent->movementType == MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP || objectEvent->movementType == MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT) { - u8 r3 = sub_810CF54(); + u8 movementType = GetRandomFaceDirectionMovementType(); if (objectEvent->active && gSprites[objectEvent->spriteId].data[0] == i) { gSprites[objectEvent->spriteId].pos2.x = 0; gSprites[objectEvent->spriteId].pos2.y = 0; - SetTrainerMovementType(objectEvent, r3); + SetTrainerMovementType(objectEvent, movementType); } } } } -void sub_810C604(void) +static void VsSeekerResetInBagStepCounter(void) { gSaveBlock1Ptr->trainerRematchStepCounter &= 0xFF00; } -void sub_810C620(void) +static void VsSeekerSetStepCounterInBagFull(void) { gSaveBlock1Ptr->trainerRematchStepCounter &= 0xFF00; gSaveBlock1Ptr->trainerRematchStepCounter |= 100; } -void sub_810C640(void) +static void VsSeekerResetChargingStepCounter(void) { gSaveBlock1Ptr->trainerRematchStepCounter &= 0x00FF; } -void sub_810C654(void) +static void VsSeekerSetStepCounterFullyCharged(void) { gSaveBlock1Ptr->trainerRematchStepCounter &= 0x00FF; gSaveBlock1Ptr->trainerRematchStepCounter |= (100 << 8); @@ -785,7 +786,7 @@ static void Task_VsSeeker_2(u8 taskId) { data[1] = 0; data[2] = 0; - sub_810C604(); + VsSeekerResetInBagStepCounter(); sVsSeeker->responseCode = GetVsSeekerResponseInArea(sVsSeekerData); ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_8453F5C); gTasks[taskId].func = Task_VsSeeker_3; @@ -934,7 +935,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0) { PlaySE(SE_PIN); FlagSet(FLAG_SYS_VS_SEEKER_CHARGING); - sub_810C640(); + VsSeekerResetChargingStepCounter(); return VSSEEKER_RESPONSE_FOUND_REMATCHES; } if (sVsSeeker->trainerHasNotYetBeenFought) @@ -944,7 +945,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0) void sub_810CB90(void) { - u8 sp0 = 0; + u8 objEventId = 0; struct ObjectEventTemplate *r4 = gSaveBlock1Ptr->objectEventTemplates; s32 r9 = sub_810CE10(sVsSeekerData, gTrainerBattleOpponent_A); @@ -958,12 +959,12 @@ void sub_810CB90(void) { struct ObjectEvent *r4_2; - TryGetObjectEventIdByLocalIdAndMap(r4[r8].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &sp0); - r4_2 = &gObjectEvents[sp0]; - sub_810CF54(&r4[r8]); // You are using this function incorrectly. Please consult the manual. + TryGetObjectEventIdByLocalIdAndMap(r4[r8].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objEventId); + r4_2 = &gObjectEvents[objEventId]; + GetRandomFaceDirectionMovementType(&r4[r8]); // You are using this function incorrectly. Please consult the manual. OverrideMovementTypeForObjectEvent(r4_2, gUnknown_8453F67[r4_2->facingDirection]); gSaveBlock1Ptr->trainerRematches[r4[r8].localId] = 0; - if (gSelectedObjectEvent == sp0) + if (gSelectedObjectEvent == objEventId) r4_2->movementType = gUnknown_8453F67[r4_2->facingDirection]; else r4_2->movementType = MOVEMENT_TYPE_FACE_DOWN; @@ -1113,22 +1114,22 @@ bool8 sub_810CF04(u8 a0) return FALSE; } -u8 sub_810CF54() +static u8 GetRandomFaceDirectionMovementType() { u16 r1 = Random() % 4; switch (r1) { case 0: - return 7; + return MOVEMENT_TYPE_FACE_UP; case 1: - return 8; + return MOVEMENT_TYPE_FACE_DOWN; case 2: - return 9; + return MOVEMENT_TYPE_FACE_LEFT; case 3: - return 10; + return MOVEMENT_TYPE_FACE_RIGHT; default: - return 8; + return MOVEMENT_TYPE_FACE_DOWN; } } |
