diff options
Diffstat (limited to 'data')
407 files changed, 2604 insertions, 13854 deletions
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/bike.s b/data/bike.s deleted file mode 100644 index 0245f0206..000000000 --- a/data/bike.s +++ /dev/null @@ -1,33 +0,0 @@ -#include "constants/maps.h" -#include "constants/species.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnknown_83E7CFC:: @ 83E7CFC - .4byte sub_80BD27C - .4byte sub_80BD28C - .4byte sub_80BD2C8 - .4byte sub_80BD358 - .4byte sub_80BD380 - -gUnknown_83E7D10:: @ 83E7D10 - .4byte sub_80BD100 - .4byte sub_80BD1C8 - .4byte sub_80BD1E8 - -gUnknown_83E7D1C:: @ 83E7D1C - .2byte 0x0001, 0x0002, 0x0004 - -gUnknown_83E7D22:: - .byte 4 - - .align 2 -gUnknown_83E7D24:: - .4byte 1, 2, 15, 15, gUnknown_83E7D22, gUnknown_83E7D22, 1 - .4byte 2, 2, 15, 15, gUnknown_83E7D22, gUnknown_83E7D22, 2 - .4byte 3, 2, 15, 15, gUnknown_83E7D22, gUnknown_83E7D22, 3 - .4byte 4, 2, 15, 15, gUnknown_83E7D22, gUnknown_83E7D22, 4 - 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_object_movement.s b/data/event_object_movement.s deleted file mode 100644 index 259099795..000000000 --- a/data/event_object_movement.s +++ /dev/null @@ -1,9186 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2 -gReflectionEffectPaletteMap:: @ 835B934 - .byte 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x06, 0x07, 0x08, 0x09, 0x0b, 0x0b, 0x00, 0x00, 0x00, 0x00 - -gCameraSpriteTemplate:: @ 835B944 - spr_template 0, 65535, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject - -gCameraObjectFuncs:: @ 835B95C - .4byte CameraObject_0 - .4byte CameraObject_1 - .4byte CameraObject_2 - -gUnknown_835B968:: @ 835B968 - .incbin "graphics/object_events/0.gbapal" - -gUnknown_835B988:: - .incbin "graphics/object_events/unk_835B988.gbapal" - -gUnknown_835B9A0:: - .space 0x1C0 - -gUnknown_835BB68:: @ 835BB68 - .incbin "graphics/object_events/000.4bpp" - -gUnknown_835C468:: @ 835C468 - .incbin "graphics/object_events/002.4bpp" - -gUnknown_835D268:: @ 835D268 - .incbin "graphics/object_events/007.4bpp" - -gUnknown_835DB68:: @ 835DB68 - .incbin "graphics/object_events/009.4bpp" - -gUnknown_835E968:: @ 835E968 - .incbin "graphics/object_events/1.gbapal" - -gUnknown_835E988:: @ 835E988 - .incbin "graphics/object_events/2.gbapal" - -gUnknown_835E9A8:: @ 835E9A8 - .incbin "graphics/object_events/005.4bpp" - -gUnknown_835F2A8:: @ 835F2A8 - .incbin "graphics/object_events/012.4bpp" - -gObjectEventPic_MaleSurfing:: @ 835FBA8 - .incbin "graphics/object_events/male_surf.4bpp" - -gObjectEventPic_FemaleSurfing:: @ 360DA8 - .incbin "graphics/object_events/female_surf.4bpp" - -gUnknown_8361FA8:: @ 8361FA8 - .incbin "graphics/object_events/001.4bpp" - -gUnknown_83631A8:: @ 83631A8 - .incbin "graphics/object_events/006.4bpp" - -gUnknown_8363DA8:: @ 8363DA8 - .incbin "graphics/object_events/008.4bpp" - -gUnknown_8364FA8:: @ 8364FA8 - .incbin "graphics/object_events/013.4bpp" - -gUnknown_8365BA8:: @ 8365BA8 - .incbin "graphics/object_events/014.4bpp" - -gUnknown_83664A8:: @ 83664A8 - .incbin "graphics/object_events/015.4bpp" - -gUnknown_8366DA8:: @ 8366DA8 - .incbin "graphics/object_events/004.4bpp" - -gUnknown_83685A8:: @ 83685A8 - .incbin "graphics/object_events/011.4bpp" - -gUnknown_8369DA8:: @ 8369DA8 - .incbin "graphics/object_events/094.4bpp" - -gUnknown_8369E28:: @ 8369E28 - .incbin "graphics/object_events/093.4bpp" - -@ 8369F28 - .incbin "graphics/object_events/unk_8369F28.4bpp" - -gUnknown_836A228:: @ 836A228 - .incbin "graphics/object_events/087.4bpp" - -gUnknown_836AB28:: @ 836AB28 - .incbin "graphics/object_events/086.4bpp" - -gUnknown_836AE28:: @ 836AE28 - .incbin "graphics/object_events/085.4bpp" - -gUnknown_836B128:: @ 836B128 - .incbin "graphics/object_events/076.4bpp" - -gUnknown_836BA28:: @ 836BA28 - .incbin "graphics/object_events/077.4bpp" - -gUnknown_836C328:: @ 836C328 - .incbin "graphics/object_events/083.4bpp" - -gUnknown_836C628:: @ 836C628 - .incbin "graphics/object_events/084.4bpp" - -gUnknown_836C928:: @ 836C928 - .incbin "graphics/object_events/080.4bpp" - -gUnknown_836CC28:: @ 836CC28 - .incbin "graphics/object_events/082.4bpp" - -gUnknown_836CF28:: @ 836CF28 - .incbin "graphics/object_events/073.4bpp" - -gUnknown_836D828:: @ 836D828 - .incbin "graphics/object_events/3.gbapal" - -gUnknown_836D848:: @ 836D848 - .incbin "graphics/object_events/4.gbapal" - -gUnknown_836D868:: @ 836D868 - .incbin "graphics/object_events/5.gbapal" - -gUnknown_836D888:: @ 836D888 - .incbin "graphics/object_events/6.gbapal" - -gUnknown_836D8A8:: @ 836D8A8 - .incbin "graphics/object_events/7.gbapal" - -gUnknown_836D8C8:: @ 836D8C8 - .incbin "graphics/object_events/8.gbapal" - -gUnknown_836D8E8:: @ 836D8E8 - .incbin "graphics/object_events/9.gbapal" - -gUnknown_836D908:: @ 836D908 - .incbin "graphics/object_events/10.gbapal" - -gUnknown_836D928:: @ 836D928 - .incbin "graphics/object_events/016.4bpp" - -gUnknown_836DDA8:: @ 836DDA8 - .incbin "graphics/object_events/017.4bpp" - -gUnknown_836E2A8:: @ 836E2A8 - .incbin "graphics/object_events/021.4bpp" - -gUnknown_836E5A8:: @ 836E5A8 - .incbin "graphics/object_events/022.4bpp" - -gUnknown_836EFA8:: @ 836EFA8 - .incbin "graphics/object_events/018.4bpp" - -gUnknown_836F9A8:: @ 836F9A8 - .incbin "graphics/object_events/019.4bpp" - -gUnknown_83703A8:: @ 83703A8 - .incbin "graphics/object_events/023.4bpp" - -gUnknown_8370DA8:: @ 8370DA8 - .incbin "graphics/object_events/031.4bpp" - -gUnknown_83716A8:: @ 83716A8 - .incbin "graphics/object_events/020.4bpp" - -gUnknown_83720A8:: @ 83720A8 - .incbin "graphics/object_events/024.4bpp" - -gUnknown_8372AA8:: @ 8372AA8 - .incbin "graphics/object_events/unk_8372AA8.4bpp" - -gUnknown_83733A8:: @ 83733A8 - .incbin "graphics/object_events/027.4bpp" - -gUnknown_8373CA8:: @ 8373CA8 - .incbin "graphics/object_events/030.4bpp" - -gUnknown_83746A8:: @ 83746A8 - .incbin "graphics/object_events/028.4bpp" - -gUnknown_83750A8:: @ 83750A8 - .incbin "graphics/object_events/032.4bpp" - -gUnknown_8375AA8:: @ 8375AA8 - .incbin "graphics/object_events/034.4bpp" - -gUnknown_8375CA8:: @ 8375CA8 - .incbin "graphics/object_events/047.4bpp" - -gUnknown_83766A8:: @ 83766A8 - .incbin "graphics/object_events/048.4bpp" - -gUnknown_83770A8:: @ 83770A8 - .incbin "graphics/object_events/029.4bpp" - -gUnknown_8377AA8:: @ 8377AA8 - .incbin "graphics/object_events/059.4bpp" - -gUnknown_83783A8:: @ 83783A8 - .incbin "graphics/object_events/033.4bpp" - -gUnknown_8378CA8:: @ 8378CA8 - .incbin "graphics/object_events/035.4bpp" - -gUnknown_83795A8:: @ 83795A8 - .incbin "graphics/object_events/039.4bpp" - -gUnknown_8379FA8:: @ 8379FA8 - .incbin "graphics/object_events/040.4bpp" - -gUnknown_837A9A8:: @ 837A9A8 - .incbin "graphics/object_events/041.4bpp" - -gUnknown_837B3A8:: @ 837B3A8 - .incbin "graphics/object_events/042.4bpp" - -gUnknown_837BDA8:: @ 837BDA8 - .incbin "graphics/object_events/121.4bpp" - -gUnknown_837BF28:: @ 837BF28 - .incbin "graphics/object_events/052.4bpp" - -gUnknown_837C928:: @ 837C928 - .incbin "graphics/object_events/058.4bpp" - -gUnknown_837D328:: @ 837D328 - .incbin "graphics/object_events/050.4bpp" - -gUnknown_837DC28:: @ 837DC28 - .incbin "graphics/object_events/043.4bpp" - -gUnknown_837E628:: @ 837E628 - .incbin "graphics/object_events/044.4bpp" - -gUnknown_837F028:: @ 837F028 - .incbin "graphics/object_events/045.4bpp" - -gUnknown_837FA28:: @ 837FA28 - .incbin "graphics/object_events/046.4bpp" - -gUnknown_8380428:: @ 8380428 - .incbin "graphics/object_events/054.4bpp" - -gUnknown_8380E28:: @ 8380E28 - .incbin "graphics/object_events/055.4bpp" - -gUnknown_8381828:: @ 8381828 - .incbin "graphics/object_events/061.4bpp" - -gUnknown_8382228:: @ 8382228 - .incbin "graphics/object_events/062.4bpp" - -gUnknown_8382C28:: @ 8382C28 - .incbin "graphics/object_events/063.4bpp" - -gUnknown_8383528:: @ 8383528 - .incbin "graphics/object_events/057.4bpp" - -gUnknown_8383F28:: @ 8383F28 - .incbin "graphics/object_events/090.4bpp" - -gUnknown_8384828:: @ 8384828 - .incbin "graphics/object_events/152.4bpp" - -gUnknown_8385128:: @ 8385128 - .incbin "graphics/object_events/037.4bpp" - -gUnknown_8385628:: @ 8385628 - .incbin "graphics/object_events/036.4bpp" - -gUnknown_8385B28:: @ 8385B28 - .incbin "graphics/object_events/038.4bpp" - -gUnknown_8386028:: @ 8386028 - .incbin "graphics/object_events/056.4bpp" - -gUnknown_8386A28:: @ 8386A28 - .incbin "graphics/object_events/053.4bpp" - -gUnknown_8387E28:: @ 8387E28 - .incbin "graphics/object_events/091.4bpp" - -gUnknown_8388728:: @ 8388728 - .incbin "graphics/object_events/025.4bpp" - -gUnknown_8389128:: @ 8389128 - .incbin "graphics/object_events/026.4bpp" - -gUnknown_8389B28:: @ 8389B28 - .incbin "graphics/object_events/071.4bpp" - -gUnknown_838A428:: @ 838A428 - .incbin "graphics/object_events/072.4bpp" - -gUnknown_838AD28:: @ 838AD28 - .incbin "graphics/object_events/064.4bpp" - -gUnknown_838B128:: @ 838B128 - .incbin "graphics/object_events/065.4bpp" - -gUnknown_838B428:: @ 838B428 - .incbin "graphics/object_events/066.4bpp" - -gUnknown_838B728:: @ 838B728 - .incbin "graphics/object_events/067.4bpp" - -gUnknown_838BA28:: @ 838BA28 - .incbin "graphics/object_events/092.4bpp" - -gUnknown_838BAA8:: @ 838BAA8 - .incbin "graphics/object_events/078.4bpp" - -gUnknown_838C3A8:: @ 838C3A8 - .incbin "graphics/object_events/079.4bpp" - -gUnknown_838C6A8:: @ 838C6A8 - .incbin "graphics/object_events/068.4bpp" - -gUnknown_838CFA8:: @ 838CFA8 - .incbin "graphics/object_events/069.4bpp" - -gUnknown_838D2A8:: @ 838D2A8 - .incbin "graphics/object_events/070.4bpp" - -gUnknown_838D5A8:: @ 838D5A8 - .incbin "graphics/object_events/unk_838D5A8.4bpp" - -gUnknown_838DEA8:: @ 838DEA8 - .incbin "graphics/object_events/049.4bpp" - -gUnknown_838E7A8:: @ 838E7A8 - .incbin "graphics/object_events/089.4bpp" - -gUnknown_838F0A8:: @ 838F0A8 - .incbin "graphics/object_events/135.4bpp" - -gUnknown_838F228:: @ 838F228 - .incbin "graphics/object_events/136.4bpp" - -gUnknown_838F428:: @ 838F428 - .incbin "graphics/object_events/137.4bpp" - -gUnknown_838F628:: @ 838F628 - .incbin "graphics/object_events/138.4bpp" - -gUnknown_838F828:: @ 838F828 - .incbin "graphics/object_events/139.4bpp" - -gUnknown_838F8A8:: @ 838F8A8 - .incbin "graphics/object_events/140.4bpp" - -gUnknown_838F928:: @ 838F928 - .incbin "graphics/object_events/141.4bpp" - -gUnknown_838F9A8:: @ 838F9A8 - .incbin "graphics/object_events/143.4bpp" - -gUnknown_838FA28:: @ 838FA28 - .incbin "graphics/object_events/142.4bpp" - -gUnknown_838FAA8:: @ 838FAA8 - .incbin "graphics/object_events/144.4bpp" - -gUnknown_838FEA8:: @ 838FEA8 - .incbin "graphics/object_events/145.4bpp" - -gUnknown_83902A8:: @ 83902A8 - .incbin "graphics/object_events/146.4bpp" - -gUnknown_8390328:: @ 8390328 - .incbin "graphics/object_events/148.4bpp" - -gUnknown_8390728:: @ 8390728 - .incbin "graphics/object_events/149.4bpp" - -gUnknown_8390B28:: @ 8390B28 - .incbin "graphics/object_events/150.4bpp" - -gUnknown_8390F28:: @ 8390F28 - .incbin "graphics/object_events/075.4bpp" - -gUnknown_8391228:: @ 8391228 - .incbin "graphics/object_events/081.4bpp" - -gUnknown_8391528:: @ 8391528 - .incbin "graphics/object_events/074.4bpp" - -gUnknown_8391828:: @ 8391828 - .incbin "graphics/object_events/051.4bpp" - -gUnknown_8391B28:: @ 8391B28 - .incbin "graphics/object_events/088.4bpp" - -gUnknown_8391E28:: @ 8391E28 - .incbin "graphics/object_events/114.4bpp" - -gUnknown_8391FA8:: @ 8391FA8 - .incbin "graphics/object_events/118.4bpp" - -gUnknown_8392128:: @ 8392128 - .incbin "graphics/object_events/119.4bpp" - -gUnknown_83922A8:: @ 83922A8 - .incbin "graphics/object_events/122.4bpp" - -gUnknown_8392428:: @ 8392428 - .incbin "graphics/object_events/123.4bpp" - -gUnknown_83925A8:: @ 83925A8 - .incbin "graphics/object_events/124.4bpp" - -gUnknown_8392728:: @ 8392728 - .incbin "graphics/object_events/125.4bpp" - -gUnknown_83928A8:: @ 83928A8 - .incbin "graphics/object_events/126.4bpp" - -gUnknown_8392A28:: @ 8392A28 - .incbin "graphics/object_events/127.4bpp" - -gUnknown_8392BA8:: @ 8392BA8 - .incbin "graphics/object_events/128.4bpp" - -gUnknown_8392D28:: @ 8392D28 - .incbin "graphics/object_events/129.4bpp" - -gUnknown_8392EA8:: @ 8392EA8 - .incbin "graphics/object_events/130.4bpp" - -gUnknown_8393028:: @ 8393028 - .incbin "graphics/object_events/131.4bpp" - -gUnknown_83931A8:: @ 83931A8 - .incbin "graphics/object_events/132.4bpp" - -gUnknown_8393328:: @ 8393328 - .incbin "graphics/object_events/133.4bpp" - -gUnknown_83934A8:: @ 83934A8 - .incbin "graphics/object_events/147.4bpp" - -gUnknown_8393628:: @ 8393628 - .incbin "graphics/object_events/134.4bpp" - -gUnknown_83937A8:: @ 83937A8 - .incbin "graphics/object_events/109.4bpp" - -gUnknown_83939A8:: @ 83939A8 - .incbin "graphics/object_events/110.4bpp" - -gUnknown_8393B28:: @ 8393B28 - .incbin "graphics/object_events/111.4bpp" - -gUnknown_8393CA8:: @ 8393CA8 - .incbin "graphics/object_events/112.4bpp" - -gUnknown_8393E28:: @ 8393E28 - .incbin "graphics/object_events/117.4bpp" - -gUnknown_8393FA8:: @ 8393FA8 - .incbin "graphics/object_events/120.4bpp" - -gUnknown_8394128:: @ 8394128 - .incbin "graphics/object_events/115.4bpp" - -gUnknown_83942A8:: @ 83942A8 - .incbin "graphics/object_events/116.4bpp" - -gUnknown_8394428:: @ 8394428 - .incbin "graphics/object_events/113.4bpp" - -gUnknown_83945A8:: @ 83945A8 - .incbin "graphics/object_events/095.4bpp" - -gUnknown_83947A8:: @ 83947A8 - .incbin "graphics/object_events/096.4bpp" - -gUnknown_83949A8:: @ 83949A8 - .incbin "graphics/object_events/097.4bpp" - -gUnknown_8394A28:: @ 8394A28 - .incbin "graphics/object_events/098.4bpp" - -gUnknown_8394AA8:: @ 8394AA8 - .incbin "graphics/object_events/099.4bpp" - -gUnknown_8394B28:: @ 8394B28 - .incbin "graphics/object_events/100.4bpp" - -gUnknown_8394BA8:: @ 8394BA8 - .incbin "graphics/object_events/101.4bpp" - -gUnknown_8394C28:: @ 8394C28 - .incbin "graphics/object_events/102.4bpp" - -gUnknown_8394D28:: @ 8394D28 - .incbin "graphics/object_events/103.4bpp" - -gUnknown_8394DA8:: @ 8394DA8 - .incbin "graphics/object_events/104.4bpp" - -gUnknown_8394E28:: @ 8394E28 - .incbin "graphics/object_events/105.4bpp" - -gUnknown_8394EA8:: @ 8394EA8 - .incbin "graphics/object_events/19.gbapal" - -gUnknown_8394EC8:: @ 8394EC8 - .incbin "graphics/object_events/106.4bpp" - -gUnknown_83950C8:: @ 83950C8 - .incbin "graphics/object_events/107.4bpp" - -gUnknown_83952C8:: @ 83952C8 - .incbin "graphics/object_events/20.gbapal" - -gUnknown_83952E8:: @ 83952E8 - .incbin "graphics/object_events/108.4bpp" - -gUnknown_8395AE8:: @ 8395AE8 - .incbin "graphics/object_events/21.gbapal" - -gUnknown_8395B08:: @ 8395B08 - .incbin "graphics/object_events/151.4bpp" - -gUnknown_8396B08:: @ 8396B08 - .incbin "graphics/object_events/unk_396B08.4bpp" - -gUnknown_8397708:: @ 8397708 - .incbin "graphics/object_events/060.4bpp" - -gUnknown_8398008:: @ 8398008 - .incbin "graphics/object_events/11.gbapal" - -gUnknown_8398028:: @ 8398028 - .incbin "graphics/object_events/12.gbapal" - -gUnknown_8398048:: @ 8398048 - .incbin "graphics/object_events/pics/effects/shadow_small.4bpp" - -gUnknown_8398068:: @ 8398068 - .incbin "graphics/object_events/pics/effects/shadow_medium.4bpp" - -gUnknown_83980A8:: @ 83980A8 - .incbin "graphics/object_events/pics/effects/shadow_large.4bpp" - -gUnknown_8398128:: @ 8398128 - .incbin "graphics/object_events/pics/effects/shadow_extra_large.4bpp" - -filler_8398528:: @ 8398528 - .fill 0x48, 0x4, 0x00 - -gUnknown_8398648:: - .incbin "graphics/object_events/fldeff_cut.4bpp" - -gUnknown_8398668:: - .incbin "graphics/object_events/fldeff_cut.4bpp" - -gUnknown_8398688:: - .incbin "graphics/object_events/fldeff_cut.gbapal" - -gUnknown_83986A8:: @ 83986A8 - .incbin "graphics/object_events/pics/unknown/83986A8.4bpp" - -gUnknown_8398928:: @ 8398928 - .incbin "graphics/object_events/pics/unknown/8398928.4bpp" - -gUnknown_8398BA8:: @ 8398BA8 - .incbin "graphics/object_events/pics/unknown/8398BA8.4bpp" - -gUnknown_8398FA8:: @ 8398FA8 - .incbin "graphics/object_events/palettes/8398FA8.gbapal" - -gUnknown_8398FC8:: @ 8398FC8 - .incbin "graphics/object_events/palettes/8398FC8.gbapal" - -gUnknown_8399008:: @ 8399008 - .incbin "graphics/object_events/pics/unknown/8399008.4bpp" - -gUnknown_83990C8:: @ 83990C8 - .incbin "graphics/object_events/pics/unknown/83990C8.4bpp" - -gUnknown_8399188:: @ 8399188 - .incbin "graphics/object_events/pics/unknown/8399188.4bpp" - -gUnknown_8399288:: @ 8399288 - .incbin "graphics/object_events/pics/unknown/8399288.4bpp" - -gUnknown_8399488:: @ 8399488 - .incbin "graphics/object_events/pics/unknown/8399488.4bpp" - -gUnknown_8399788:: @ 8399788 - .incbin "graphics/object_events/pics/unknown/8399788.4bpp" - -gUnknown_8399C08:: @ 8399C08 - .incbin "graphics/object_events/pics/unknown/8399C08.4bpp" - -gUnknown_8399E08:: @ 8399E08 - .incbin "graphics/object_events/pics/unknown/8399E08.4bpp" - -gUnknown_8399E88:: @ 8399E88 - .incbin "graphics/object_events/pics/unknown/8399E88.4bpp" - -gUnknown_8399F08:: @ 8399F08 - .incbin "graphics/object_events/pics/unknown/8399F08.4bpp" - -gUnknown_8399F88:: @ 8399F88 - .incbin "graphics/object_events/pics/unknown/8399F88.4bpp" - -gUnknown_839A008:: @ 839A008 - .incbin "graphics/object_events/pics/unknown/839A008.4bpp" - -gUnknown_839A288:: @ 839A288 - .incbin "graphics/object_events/pics/unknown/839A288.4bpp" - -gUnknown_839A388:: @ 839A388 - .incbin "graphics/object_events/pics/unknown/839A388.4bpp" - -gUnknown_839A408:: @ 839A408 - .incbin "graphics/object_events/pics/unknown/839A408.4bpp" - -gUnknown_839A488:: @ 839A488 - .incbin "graphics/object_events/pics/unknown/839A488.4bpp" - -gUnknown_839A508:: @ 839A508 - .incbin "graphics/object_events/pics/unknown/839A508.4bpp" - -gUnknown_839A588:: @ 839A588 - .incbin "graphics/object_events/pics/unknown/839A588.4bpp" - -gUnknown_839A608:: @ 839A608 - .incbin "graphics/object_events/pics/unknown/839A608.4bpp" - -gUnknown_839A688:: @ 839A688 - .incbin "graphics/object_events/pics/unknown/839A688.4bpp" - -gUnknown_839A708:: @ 839A708 - .incbin "graphics/object_events/pics/unknown/839A708.4bpp" - -gUnknown_839A788:: @ 839A788 - .incbin "graphics/object_events/pics/unknown/839A788.4bpp" - -gUnknown_839A988:: @ 839A988 - .incbin "graphics/object_events/pics/unknown/839A988.4bpp" - -gUnknown_839AA48:: @ 839AA48 - .incbin "graphics/object_events/pics/unknown/839AA48.4bpp" - -gUnknown_839AAC8:: @ 839AAC8 - .incbin "graphics/object_events/pics/unknown/839AAC8.4bpp" - -gUnknown_839AB48:: @ 839AB48 - .incbin "graphics/object_events/pics/unknown/839AB48.4bpp" - -gUnknown_839ABC8:: @ 839ABC8 - .incbin "graphics/object_events/pics/unknown/839ABC8.4bpp" - -gUnknown_839AC48:: @ 839AC48 - .incbin "graphics/object_events/pics/unknown/839AC48.4bpp" - -gUnknown_839AC88:: @ 839AC88 - .incbin "graphics/object_events/pics/unknown/839AC88.4bpp" - -gUnknown_839ACC8:: @ 839ACC8 - .incbin "graphics/object_events/pics/unknown/839ACC8.4bpp" - -gUnknown_839AD08:: @ 839AD08 - .incbin "graphics/object_events/pics/unknown/839AD08.4bpp" - -gUnknown_839AD48:: @ 839AD48 - .incbin "graphics/object_events/pics/unknown/839AD48.4bpp" - -gUnknown_839AD88:: @ 839AD88 - .incbin "graphics/object_events/pics/unknown/839AD88.4bpp" - -gUnknown_839B008:: @ 839B008 - .incbin "graphics/object_events/pics/unknown/839B008.4bpp" - -gUnknown_839B708:: @ 839B708 - .incbin "graphics/object_events/pics/unknown/839B708.4bpp" - -gUnknown_839BE08:: @ 839BE08 - .incbin "graphics/object_events/pics/unknown/839BE08.4bpp" - -gUnknown_839C508:: @ 839C508 - .incbin "graphics/object_events/pics/unknown/839C508.4bpp" - -gUnknown_839C588:: @ 839C588 - .incbin "graphics/object_events/palettes/839C588.gbapal" - -gUnknown_839C5A8:: @ 839C5A8 - .incbin "graphics/object_events/pics/unknown/839C5A8.4bpp" - -gUnknown_839C628:: @ 839C628 - .incbin "graphics/object_events/pics/unknown/839C628.4bpp" - -gUnknown_839C6A8:: @ 839C6A8 - .incbin "graphics/object_events/pics/unknown/839C6A8.4bpp" - -gUnknown_839C728:: @ 839C728 - .incbin "graphics/object_events/pics/unknown/839C728.4bpp" - -gUnknown_839C7A8:: @ 839C7A8 - .incbin "graphics/object_events/pics/unknown/839C7A8.4bpp" - -gUnknown_839C828:: @ 839C828 - .incbin "graphics/object_events/pics/unknown/839C828.4bpp" - -gUnknown_839C8A8:: @ 839C8A8 - .incbin "graphics/object_events/pics/unknown/839C8A8.4bpp" - -gUnknown_839C928:: @ 839C928 - .incbin "graphics/object_events/pics/unknown/839C928.4bpp" - -gUnknown_839C9A8:: @ 839C9A8 - .incbin "graphics/object_events/pics/unknown/839C9A8.4bpp" - -gUnknown_839CA28:: @ 839CA28 - .incbin "graphics/object_events/pics/unknown/839CA28.4bpp" - -gUnknown_839CAA8:: @ 839CAA8 - .incbin "graphics/object_events/pics/unknown/839CAA8.4bpp" - -gUnknown_839CBA8:: @ 839CBA8 - .incbin "graphics/object_events/pics/unknown/839CBA8.4bpp" - -gUnknown_839CCA8:: @ 839CCA8 - .incbin "graphics/object_events/pics/unknown/839CCA8.4bpp" - -gUnknown_839CDA8:: @ 839CDA8 - .incbin "graphics/object_events/pics/unknown/839CDA8.4bpp" - -gUnknown_839CEA8:: @ 839CEA8 - .incbin "graphics/object_events/pics/unknown/839CEA8.4bpp" - -gUnknown_839CFA8:: @ 839CFA8 - .incbin "graphics/object_events/pics/unknown/839CFA8.4bpp" - -gUnknown_839D0A8:: @ 839D0A8 - .incbin "graphics/object_events/pics/unknown/839D0A8.4bpp" - -gUnknown_839D1A8:: @ 839D1A8 - .incbin "graphics/object_events/pics/unknown/839D1A8.4bpp" - -gUnknown_839D2A8:: @ 839D2A8 - .incbin "graphics/object_events/pics/unknown/839D2A8.4bpp" - -gUnknown_839D328:: @ 839D328 - .incbin "graphics/object_events/pics/unknown/839D328.4bpp" - -gUnknown_839D3A8:: @ 839D3A8 - .incbin "graphics/object_events/palettes/839D3A8.gbapal" - -gUnknown_839D3C8:: @ 839D3C8 - .incbin "graphics/object_events/pics/unknown/839D3C8.4bpp" - -sMovementTypeCallbacks:: @ 839FBC8 - .4byte MovementType_None - .4byte MovementType_LookAround - .4byte MovementType_WanderAround - .4byte MovementType_WanderUpAndDown - .4byte MovementType_WanderUpAndDown - .4byte MovementType_WanderLeftAndRight - .4byte MovementType_WanderLeftAndRight - .4byte MovementType_FaceDirection - .4byte MovementType_FaceDirection - .4byte MovementType_FaceDirection - .4byte MovementType_FaceDirection - .4byte sub_805B3B8 - .4byte NULL - .4byte MovementType_FaceDownAndUp - .4byte MovementType_FaceLeftAndRight - .4byte MovementType_FaceUpAndLeft - .4byte MovementType_FaceUpAndRight - .4byte MovementType_FaceDownAndLeft - .4byte MovementType_FaceDownAndRight - .4byte MovementType_FaceDownUpAndLeft - .4byte MovementType_FaceDownUpAndRight - .4byte MovementType_FaceUpRightAndLeft - .4byte MovementType_FaceDownRightAndLeft - .4byte MovementType_RotateCounterclockwise - .4byte MovementType_RotateClockwise - .4byte MovementType_WalkBackAndForth - .4byte MovementType_WalkBackAndForth - .4byte MovementType_WalkBackAndForth - .4byte MovementType_WalkBackAndForth - .4byte MovementType_WalkSequenceUpRightLeftDown - .4byte MovementType_WalkSequenceRightLeftDownUp - .4byte MovementType_WalkSequenceDownUpRightLeft - .4byte MovementType_WalkSequenceLeftDownUpRight - .4byte MovementType_WalkSequenceUpLeftRightDown - .4byte MovementType_WalkSequenceLeftRightDownUp - .4byte MovementType_WalkSequenceDownUpLeftRight - .4byte MovementType_WalkSequenceRightDownUpLeft - .4byte MovementType_WalkSequenceLeftUpDownRight - .4byte MovementType_WalkSequenceUpDownRightLeft - .4byte MovementType_WalkSequenceRightLeftUpDown - .4byte MovementType_WalkSequenceDownRightLeftUp - .4byte MovementType_WalkSequenceRightUpDownLeft - .4byte MovementType_WalkSequenceUpDownLeftRight - .4byte MovementType_WalkSequenceLeftRightUpDown - .4byte MovementType_WalkSequenceDownLeftRightUp - .4byte MovementType_WalkSequenceUpLeftDownRight - .4byte MovementType_WalkSequenceDownRightUpLeft - .4byte MovementType_WalkSequenceLeftDownRightUp - .4byte MovementType_WalkSequenceRightUpLeftDown - .4byte MovementType_WalkSequenceUpRightDownLeft - .4byte MovementType_WalkSequenceDownLeftUpRight - .4byte MovementType_WalkSequenceLeftUpRightDown - .4byte MovementType_WalkSequenceRightDownLeftUp - .4byte MovementType_CopyPlayer - .4byte MovementType_CopyPlayer - .4byte MovementType_CopyPlayer - .4byte MovementType_CopyPlayer - .4byte MovementType_TreeDisguise - .4byte MovementType_MountainDisguise - .4byte MovementType_CopyPlayerInGrass - .4byte MovementType_CopyPlayerInGrass - .4byte MovementType_CopyPlayerInGrass - .4byte MovementType_CopyPlayerInGrass - .4byte MovementType_Hidden - .4byte MovementType_WalkInPlace - .4byte MovementType_WalkInPlace - .4byte MovementType_WalkInPlace - .4byte MovementType_WalkInPlace - .4byte MovementType_WalkSlowlyInPlace - .4byte MovementType_WalkSlowlyInPlace - .4byte MovementType_WalkSlowlyInPlace - .4byte MovementType_WalkSlowlyInPlace - .4byte MovementType_JogInPlace - .4byte MovementType_JogInPlace - .4byte MovementType_JogInPlace - .4byte MovementType_JogInPlace - .4byte MovementType_Invisible - .4byte sub_8063298 - .4byte sub_80632BC - .4byte sub_80632E0 - .4byte MovementType_WanderAroundDuplicate - -gRangedMovementTypes:: @ 839FD0C - .byte FALSE @ MOVEMENT_TYPE_NONE - .byte FALSE @ MOVEMENT_TYPE_LOOK_AROUND - .byte TRUE @ MOVEMENT_TYPE_WANDER_AROUND - .byte TRUE @ MOVEMENT_TYPE_WANDER_UP_AND_DOWN - .byte TRUE @ MOVEMENT_TYPE_WANDER_DOWN_AND_UP - .byte TRUE @ MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT - .byte TRUE @ MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT - .byte FALSE @ MOVEMENT_TYPE_FACE_UP - .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN - .byte FALSE @ MOVEMENT_TYPE_FACE_LEFT - .byte FALSE @ MOVEMENT_TYPE_FACE_RIGHT - .byte FALSE @ MOVEMENT_TYPE_PLAYER - .byte FALSE @ MOVEMENT_TYPE_BERRY_TREE_GROWTH - .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_AND_UP - .byte FALSE @ MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT - .byte FALSE @ MOVEMENT_TYPE_FACE_UP_AND_LEFT - .byte FALSE @ MOVEMENT_TYPE_FACE_UP_AND_RIGHT - .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_AND_LEFT - .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT - .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT - .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT - .byte FALSE @ MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT - .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT - .byte FALSE @ MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE - .byte FALSE @ MOVEMENT_TYPE_ROTATE_CLOCKWISE - .byte TRUE @ MOVEMENT_TYPE_WALK_UP_AND_DOWN - .byte TRUE @ MOVEMENT_TYPE_WALK_DOWN_AND_UP - .byte TRUE @ MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT - .byte TRUE @ MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN - .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP - .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER - .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE - .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE - .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE - .byte FALSE @ MOVEMENT_TYPE_TREE_DISGUISE - .byte FALSE @ MOVEMENT_TYPE_MOUNTAIN_DISGUISE - .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS - .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS - .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS - .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS - .byte FALSE @ MOVEMENT_TYPE_HIDDEN - .byte FALSE @ MOVEMENT_TYPE_WALK_IN_PLACE_DOWN - .byte FALSE @ MOVEMENT_TYPE_WALK_IN_PLACE_UP - .byte FALSE @ MOVEMENT_TYPE_WALK_IN_PLACE_LEFT - .byte FALSE @ MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT - .byte FALSE @ MOVEMENT_TYPE_JOG_IN_PLACE_DOWN - .byte FALSE @ MOVEMENT_TYPE_JOG_IN_PLACE_UP - .byte FALSE @ MOVEMENT_TYPE_JOG_IN_PLACE_LEFT - .byte FALSE @ MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT - .byte FALSE @ MOVEMENT_TYPE_RUN_IN_PLACE_DOWN - .byte FALSE @ MOVEMENT_TYPE_RUN_IN_PLACE_UP - .byte FALSE @ MOVEMENT_TYPE_RUN_IN_PLACE_LEFT - .byte FALSE @ MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT - .byte FALSE @ MOVEMENT_TYPE_INVISIBLE - .byte FALSE @ MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN - .byte FALSE @ MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP - .byte FALSE @ MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT - .byte TRUE @ MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT - -gInitialMovementTypeFacingDirections:: @ 839FD5D - .byte 1 @ [MOVEMENT_TYPE_NONE] = DIR_SOUTH, - .byte 1 @ [MOVEMENT_TYPE_LOOK_AROUND] = DIR_SOUTH, - .byte 1 @ [MOVEMENT_TYPE_WANDER_AROUND] = DIR_SOUTH, - .byte 2 @ [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = DIR_NORTH, - .byte 1 @ [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = DIR_SOUTH, - .byte 3 @ [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = DIR_WEST, - .byte 4 @ [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = DIR_EAST, - .byte 2 @ [MOVEMENT_TYPE_FACE_UP] = DIR_NORTH, - .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN] = DIR_SOUTH, - .byte 3 @ [MOVEMENT_TYPE_FACE_LEFT] = DIR_WEST, - .byte 4 @ [MOVEMENT_TYPE_FACE_RIGHT] = DIR_EAST, - .byte 1 @ [MOVEMENT_TYPE_PLAYER] = DIR_SOUTH, - .byte 1 @ [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = DIR_SOUTH, - .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = DIR_SOUTH, - .byte 3 @ [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = DIR_WEST, - .byte 2 @ [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = DIR_NORTH, - .byte 2 @ [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = DIR_NORTH, - .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = DIR_SOUTH, - .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = DIR_SOUTH, - .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = DIR_SOUTH, - .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = DIR_SOUTH, - .byte 2 @ [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = DIR_NORTH, - .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = DIR_SOUTH, - .byte 1 @ [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = DIR_SOUTH, - .byte 1 @ [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = DIR_SOUTH, - .byte 2 @ [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = DIR_NORTH, - .byte 1 @ [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = DIR_SOUTH, - .byte 3 @ [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = DIR_WEST, - .byte 4 @ [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = DIR_EAST, - .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = DIR_NORTH, - .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = DIR_EAST, - .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = DIR_SOUTH, - .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = DIR_WEST, - .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = DIR_NORTH, - .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = DIR_WEST, - .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = DIR_SOUTH, - .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = DIR_EAST, - .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = DIR_WEST, - .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = DIR_NORTH, - .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = DIR_EAST, - .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = DIR_SOUTH, - .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = DIR_EAST, - .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = DIR_NORTH, - .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = DIR_WEST, - .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = DIR_SOUTH, - .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = DIR_NORTH, - .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = DIR_SOUTH, - .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = DIR_WEST, - .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = DIR_EAST, - .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = DIR_NORTH, - .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = DIR_SOUTH, - .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = DIR_WEST, - .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = DIR_EAST, - .byte 2 @ [MOVEMENT_TYPE_COPY_PLAYER] = DIR_NORTH, - .byte 1 @ [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = DIR_SOUTH, - .byte 3 @ [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = DIR_WEST, - .byte 4 @ [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = DIR_EAST, - .byte 1 @ [MOVEMENT_TYPE_TREE_DISGUISE] = DIR_SOUTH, - .byte 1 @ [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = DIR_SOUTH, - .byte 2 @ [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = DIR_NORTH, - .byte 1 @ [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = DIR_SOUTH, - .byte 3 @ [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = DIR_WEST, - .byte 4 @ [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = DIR_EAST, - .byte 1 @ [MOVEMENT_TYPE_HIDDEN] = DIR_SOUTH, - .byte 1 @ [MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = DIR_SOUTH, - .byte 2 @ [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = DIR_NORTH, - .byte 3 @ [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = DIR_WEST, - .byte 4 @ [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = DIR_EAST, - .byte 1 @ [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = DIR_SOUTH, - .byte 2 @ [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = DIR_NORTH, - .byte 3 @ [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = DIR_WEST, - .byte 4 @ [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = DIR_EAST, - .byte 1 @ [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = DIR_SOUTH, - .byte 2 @ [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = DIR_NORTH, - .byte 3 @ [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = DIR_WEST, - .byte 4 @ [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = DIR_EAST, - .byte 1 @ [MOVEMENT_TYPE_INVISIBLE] = DIR_SOUTH, - .byte 1 @ [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN] = DIR_SOUTH, - .byte 1 @ [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP] = DIR_SOUTH, - .byte 1 @ [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT] = DIR_SOUTH, - .byte 1 @ [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = DIR_SOUTH, - -.align 2, 0 -gObjectEventGraphicsInfoPointers:: @ 839FDB0 - .4byte gObjectEventGraphicsInfo_83A3BB0 - .4byte gObjectEventGraphicsInfo_83A3BD4 - .4byte gObjectEventGraphicsInfo_83A3BF8 - .4byte gObjectEventGraphicsInfo_83A3C1C - .4byte gObjectEventGraphicsInfo_83A4858 - .4byte gObjectEventGraphicsInfo_83A48A0 - .4byte gObjectEventGraphicsInfo_83A48C4 - .4byte gObjectEventGraphicsInfo_83A4564 - .4byte gObjectEventGraphicsInfo_83A4588 - .4byte gObjectEventGraphicsInfo_83A45AC - .4byte gObjectEventGraphicsInfo_83A45D0 - .4byte gObjectEventGraphicsInfo_83A487C - .4byte gObjectEventGraphicsInfo_83A48E8 - .4byte gObjectEventGraphicsInfo_83A490C - .4byte gObjectEventGraphicsInfo_83A3C64 - .4byte gObjectEventGraphicsInfo_83A3C88 - .4byte gObjectEventGraphicsInfo_83A3CAC - .4byte gObjectEventGraphicsInfo_83A3CD0 - .4byte gObjectEventGraphicsInfo_83A3D3C - .4byte gObjectEventGraphicsInfo_83A3DA8 - .4byte gObjectEventGraphicsInfo_83A3DF0 - .4byte gObjectEventGraphicsInfo_83A3CF4 - .4byte gObjectEventGraphicsInfo_83A3D18 - .4byte gObjectEventGraphicsInfo_83A3D60 - .4byte gObjectEventGraphicsInfo_83A3DCC - .4byte gObjectEventGraphicsInfo_83A4390 - .4byte gObjectEventGraphicsInfo_83A43B4 - .4byte gObjectEventGraphicsInfo_83A3E14 - .4byte gObjectEventGraphicsInfo_83A3E5C - .4byte gObjectEventGraphicsInfo_83A3EEC - .4byte gObjectEventGraphicsInfo_83A3E38 - .4byte gObjectEventGraphicsInfo_83A3D84 - .4byte gObjectEventGraphicsInfo_83A3E80 - .4byte gObjectEventGraphicsInfo_83A3F34 - .4byte gObjectEventGraphicsInfo_83A4420 - .4byte gObjectEventGraphicsInfo_83A3F58 - .4byte gObjectEventGraphicsInfo_83A424C - .4byte gObjectEventGraphicsInfo_83A4228 - .4byte gObjectEventGraphicsInfo_83A4270 - .4byte gObjectEventGraphicsInfo_83A3F7C - .4byte gObjectEventGraphicsInfo_83A3FA0 - .4byte gObjectEventGraphicsInfo_83A3FC4 - .4byte gObjectEventGraphicsInfo_83A3FE8 - .4byte gObjectEventGraphicsInfo_83A4078 - .4byte gObjectEventGraphicsInfo_83A409C - .4byte gObjectEventGraphicsInfo_83A40C0 - .4byte gObjectEventGraphicsInfo_83A40E4 - .4byte gObjectEventGraphicsInfo_83A3EA4 - .4byte gObjectEventGraphicsInfo_83A3EC8 - .4byte gObjectEventGraphicsInfo_83A4618 - .4byte gObjectEventGraphicsInfo_83A4054 - .4byte gObjectEventGraphicsInfo_83A4978 - .4byte gObjectEventGraphicsInfo_83A400C - .4byte gObjectEventGraphicsInfo_83A42B8 - .4byte gObjectEventGraphicsInfo_83A4108 - .4byte gObjectEventGraphicsInfo_83A412C - .4byte gObjectEventGraphicsInfo_83A4294 - .4byte gObjectEventGraphicsInfo_83A41BC - .4byte gObjectEventGraphicsInfo_83A4030 - .4byte gObjectEventGraphicsInfo_83A3F10 - .4byte gObjectEventGraphicsInfo_83A3C40 - .4byte gObjectEventGraphicsInfo_83A4150 - .4byte gObjectEventGraphicsInfo_83A4174 - .4byte gObjectEventGraphicsInfo_83A4198 - .4byte gObjectEventGraphicsInfo_83A4300 - .4byte gObjectEventGraphicsInfo_83A44D4 - .4byte gObjectEventGraphicsInfo_83A44F8 - .4byte gObjectEventGraphicsInfo_83A4324 - .4byte gObjectEventGraphicsInfo_83A4468 - .4byte gObjectEventGraphicsInfo_83A448C - .4byte gObjectEventGraphicsInfo_83A44B0 - .4byte gObjectEventGraphicsInfo_83A436C - .4byte gObjectEventGraphicsInfo_83A4834 - .4byte gObjectEventGraphicsInfo_83A47A4 - .4byte gObjectEventGraphicsInfo_83A4810 - .4byte gObjectEventGraphicsInfo_83A4660 - .4byte gObjectEventGraphicsInfo_83A47C8 - .4byte gObjectEventGraphicsInfo_83A47EC - .4byte gObjectEventGraphicsInfo_83A43D8 - .4byte gObjectEventGraphicsInfo_83A43FC - .4byte gObjectEventGraphicsInfo_83A4684 - .4byte gObjectEventGraphicsInfo_83A46A8 - .4byte gObjectEventGraphicsInfo_83A46CC - .4byte gObjectEventGraphicsInfo_83A46F0 - .4byte gObjectEventGraphicsInfo_83A4714 - .4byte gObjectEventGraphicsInfo_83A4780 - .4byte gObjectEventGraphicsInfo_83A475C - .4byte gObjectEventGraphicsInfo_83A4738 - .4byte gObjectEventGraphicsInfo_83A50EC - .4byte gObjectEventGraphicsInfo_83A463C - .4byte gObjectEventGraphicsInfo_83A41E0 - .4byte gObjectEventGraphicsInfo_83A42DC - .4byte gObjectEventGraphicsInfo_83A4348 - .4byte gObjectEventGraphicsInfo_83A4930 - .4byte gObjectEventGraphicsInfo_83A4954 - .4byte gObjectEventGraphicsInfo_83A4444 - .4byte gObjectEventGraphicsInfo_83A451C - .4byte gObjectEventGraphicsInfo_83A4540 - .4byte gObjectEventGraphicsInfo_83A49C0 - .4byte gObjectEventGraphicsInfo_83A49E4 - .4byte gObjectEventGraphicsInfo_83A4A08 - .4byte gObjectEventGraphicsInfo_83A4A2C - .4byte gObjectEventGraphicsInfo_83A4A50 - .4byte gObjectEventGraphicsInfo_83A4A74 - .4byte gObjectEventGraphicsInfo_83A4A98 - .4byte gObjectEventGraphicsInfo_83A4ABC - .4byte gObjectEventGraphicsInfo_83A4AE0 - .4byte gObjectEventGraphicsInfo_83A4B04 - .4byte gObjectEventGraphicsInfo_83A5110 - .4byte gObjectEventGraphicsInfo_83A499C - .4byte gObjectEventGraphicsInfo_83A4B28 - .4byte gObjectEventGraphicsInfo_83A4F84 - .4byte gObjectEventGraphicsInfo_83A4FF0 - .4byte gObjectEventGraphicsInfo_83A50C8 - .4byte gObjectEventGraphicsInfo_83A5014 - .4byte gObjectEventGraphicsInfo_83A5080 - .4byte gObjectEventGraphicsInfo_83A50A4 - .4byte gObjectEventGraphicsInfo_83A5038 - .4byte gObjectEventGraphicsInfo_83A4B4C - .4byte gObjectEventGraphicsInfo_83A4B70 - .4byte gObjectEventGraphicsInfo_83A505C - .4byte gObjectEventGraphicsInfo_83A4B94 - .4byte gObjectEventGraphicsInfo_83A4BB8 - .4byte gObjectEventGraphicsInfo_83A4BDC - .4byte gObjectEventGraphicsInfo_83A4C00 - .4byte gObjectEventGraphicsInfo_83A4C24 - .4byte gObjectEventGraphicsInfo_83A4C48 - .4byte gObjectEventGraphicsInfo_83A4C6C - .4byte gObjectEventGraphicsInfo_83A4C90 - .4byte gObjectEventGraphicsInfo_83A4CB4 - .4byte gObjectEventGraphicsInfo_83A4CD8 - .4byte gObjectEventGraphicsInfo_83A4CFC - .4byte gObjectEventGraphicsInfo_83A4D20 - .4byte gObjectEventGraphicsInfo_83A4D44 - .4byte gObjectEventGraphicsInfo_83A4FA8 - .4byte gObjectEventGraphicsInfo_83A4D68 - .4byte gObjectEventGraphicsInfo_83A4D8C - .4byte gObjectEventGraphicsInfo_83A4DB0 - .4byte gObjectEventGraphicsInfo_83A4DD4 - .4byte gObjectEventGraphicsInfo_83A4E64 - .4byte gObjectEventGraphicsInfo_83A4E88 - .4byte gObjectEventGraphicsInfo_83A4EAC - .4byte gObjectEventGraphicsInfo_83A4EF4 - .4byte gObjectEventGraphicsInfo_83A4ED0 - .4byte gObjectEventGraphicsInfo_83A4F18 - .4byte gObjectEventGraphicsInfo_83A4F3C - .4byte gObjectEventGraphicsInfo_83A4F60 - .4byte gObjectEventGraphicsInfo_83A4FCC - .4byte gObjectEventGraphicsInfo_83A4DF8 - .4byte gObjectEventGraphicsInfo_83A4E1C - .4byte gObjectEventGraphicsInfo_83A4E40 - .4byte gObjectEventGraphicsInfo_83A5134 - -gFieldEffectObjectTemplatePointers:: @ 83A0010 - .4byte gUnknown_83A537C - .4byte gUnknown_83A5394 - .4byte gUnknown_83A53AC - .4byte gUnknown_83A53C4 - .4byte gUnknown_83A5420 - .4byte gUnknown_83A5488 - .4byte gUnknown_83A54E4 - .4byte gUnknown_83A556C - .4byte gUnknown_83A5604 - .4byte gUnknown_83A5648 - .4byte gUnknown_83A5698 - .4byte gUnknown_83A56F4 - .4byte gUnknown_83A583C - .4byte gUnknown_83A589C - .4byte gUnknown_83A58E0 - .4byte gUnknown_83A593C - .4byte gUnknown_83A59A4 - .4byte gUnknown_83A5A30 - .4byte gUnknown_83A5A88 - .4byte gUnknown_83A5AD8 - .4byte gUnknown_83A5B74 - .4byte gUnknown_83A5C34 - .4byte NULL - .4byte gUnknown_83A5750 - .4byte gUnknown_83A5CB4 - .4byte gUnknown_83A5D34 - .4byte gUnknown_83A5E00 - .4byte gUnknown_83A57EC - .4byte gUnknown_83A5D84 - .4byte gUnknown_83A5B1C - .4byte gUnknown_83A5E38 - .4byte gUnknown_83A5E64 - .4byte gUnknown_83A5EC0 - .4byte gUnknown_83A5F24 - .4byte gUnknown_83A5FA4 - .4byte gUnknown_83A5FE0 - -gSpriteImages_83A00A0:: @ 83A00A0 - obj_frame_tiles gUnknown_835BB68, 0x100 - obj_frame_tiles gUnknown_835BB68 + 0x100, 0x100 - obj_frame_tiles gUnknown_835BB68 + 0x200, 0x100 - obj_frame_tiles gUnknown_835BB68 + 0x300, 0x100 - obj_frame_tiles gUnknown_835BB68 + 0x400, 0x100 - obj_frame_tiles gUnknown_835BB68 + 0x500, 0x100 - obj_frame_tiles gUnknown_835BB68 + 0x600, 0x100 - obj_frame_tiles gUnknown_835BB68 + 0x700, 0x100 - obj_frame_tiles gUnknown_835BB68 + 0x800, 0x100 - obj_frame_tiles gUnknown_835C468 + 0x300, 0x100 - obj_frame_tiles gUnknown_835C468 + 0x400, 0x100 - obj_frame_tiles gUnknown_835C468 + 0x500, 0x100 - obj_frame_tiles gUnknown_835C468 + 0x600, 0x100 - obj_frame_tiles gUnknown_835C468 + 0x700, 0x100 - obj_frame_tiles gUnknown_835C468 + 0x800, 0x100 - obj_frame_tiles gUnknown_835C468 + 0x900, 0x100 - obj_frame_tiles gUnknown_835C468 + 0xA00, 0x100 - obj_frame_tiles gUnknown_835C468 + 0xB00, 0x100 - obj_frame_tiles gUnknown_835C468 + 0xC00, 0x100 - obj_frame_tiles gUnknown_835C468 + 0xD00, 0x100 - -gSpriteImages_83A0140:: @ 83A0140 - obj_frame_tiles gUnknown_8361FA8, 0x200 - obj_frame_tiles gUnknown_8361FA8 + 0x200, 0x200 - obj_frame_tiles gUnknown_8361FA8 + 0x400, 0x200 - obj_frame_tiles gUnknown_8361FA8 + 0x600, 0x200 - obj_frame_tiles gUnknown_8361FA8 + 0x800, 0x200 - obj_frame_tiles gUnknown_8361FA8 + 0xA00, 0x200 - obj_frame_tiles gUnknown_8361FA8 + 0xC00, 0x200 - obj_frame_tiles gUnknown_8361FA8 + 0xE00, 0x200 - obj_frame_tiles gUnknown_8361FA8 + 0x1000, 0x200 - -gSpriteImages_83A0188:: @ 83A0188 - obj_frame_tiles gUnknown_835D268, 0x100 - obj_frame_tiles gUnknown_835D268 + 0x100, 0x100 - obj_frame_tiles gUnknown_835D268 + 0x200, 0x100 - obj_frame_tiles gUnknown_835D268 + 0x300, 0x100 - obj_frame_tiles gUnknown_835D268 + 0x400, 0x100 - obj_frame_tiles gUnknown_835D268 + 0x500, 0x100 - obj_frame_tiles gUnknown_835D268 + 0x600, 0x100 - obj_frame_tiles gUnknown_835D268 + 0x700, 0x100 - obj_frame_tiles gUnknown_835D268 + 0x800, 0x100 - obj_frame_tiles gUnknown_835DB68 + 0x300, 0x100 - obj_frame_tiles gUnknown_835DB68 + 0x400, 0x100 - obj_frame_tiles gUnknown_835DB68 + 0x500, 0x100 - obj_frame_tiles gUnknown_835DB68 + 0x600, 0x100 - obj_frame_tiles gUnknown_835DB68 + 0x700, 0x100 - obj_frame_tiles gUnknown_835DB68 + 0x800, 0x100 - obj_frame_tiles gUnknown_835DB68 + 0x900, 0x100 - obj_frame_tiles gUnknown_835DB68 + 0xA00, 0x100 - obj_frame_tiles gUnknown_835DB68 + 0xB00, 0x100 - obj_frame_tiles gUnknown_835DB68 + 0xC00, 0x100 - obj_frame_tiles gUnknown_835DB68 + 0xD00, 0x100 - -gSpriteImages_83A0228:: @ 83A0228 - obj_frame_tiles gUnknown_8363DA8, 0x200 - obj_frame_tiles gUnknown_8363DA8 + 0x200, 0x200 - obj_frame_tiles gUnknown_8363DA8 + 0x400, 0x200 - obj_frame_tiles gUnknown_8363DA8 + 0x600, 0x200 - obj_frame_tiles gUnknown_8363DA8 + 0x800, 0x200 - obj_frame_tiles gUnknown_8363DA8 + 0xA00, 0x200 - obj_frame_tiles gUnknown_8363DA8 + 0xC00, 0x200 - obj_frame_tiles gUnknown_8363DA8 + 0xE00, 0x200 - obj_frame_tiles gUnknown_8363DA8 + 0x1000, 0x200 - -gSpriteImages_83A0270:: @ 83A0270 - obj_frame_tiles gUnknown_835C468, 0x100 - obj_frame_tiles gUnknown_835C468 + 0x100, 0x100 - obj_frame_tiles gUnknown_835C468 + 0x200, 0x100 - obj_frame_tiles gUnknown_835C468, 0x100 - obj_frame_tiles gUnknown_835C468, 0x100 - obj_frame_tiles gUnknown_835C468 + 0x100, 0x100 - obj_frame_tiles gUnknown_835C468 + 0x100, 0x100 - obj_frame_tiles gUnknown_835C468 + 0x200, 0x100 - obj_frame_tiles gUnknown_835C468 + 0x200, 0x100 - obj_frame_tiles gUnknown_835C468, 0x100 - obj_frame_tiles gUnknown_835C468 + 0x100, 0x100 - obj_frame_tiles gUnknown_835C468 + 0x200, 0x100 - -gSpriteImages_83A02D0:: @ 83A02D0 - obj_frame_tiles gUnknown_835DB68, 0x100 - obj_frame_tiles gUnknown_835DB68 + 0x100, 0x100 - obj_frame_tiles gUnknown_835DB68 + 0x200, 0x100 - obj_frame_tiles gUnknown_835DB68, 0x100 - obj_frame_tiles gUnknown_835DB68, 0x100 - obj_frame_tiles gUnknown_835DB68 + 0x100, 0x100 - obj_frame_tiles gUnknown_835DB68 + 0x100, 0x100 - obj_frame_tiles gUnknown_835DB68 + 0x200, 0x100 - obj_frame_tiles gUnknown_835DB68 + 0x200, 0x100 - obj_frame_tiles gUnknown_835DB68, 0x100 - obj_frame_tiles gUnknown_835DB68 + 0x100, 0x100 - obj_frame_tiles gUnknown_835DB68 + 0x200, 0x100 - -gSpriteImages_83A0330:: @ 83A0330 - obj_frame_tiles gUnknown_835E9A8, 0x100 - obj_frame_tiles gUnknown_835E9A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_835E9A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_835E9A8 + 0x300, 0x100 - obj_frame_tiles gUnknown_835E9A8 + 0x400, 0x100 - obj_frame_tiles gUnknown_835E9A8 + 0x500, 0x100 - obj_frame_tiles gUnknown_835E9A8 + 0x600, 0x100 - obj_frame_tiles gUnknown_835E9A8 + 0x700, 0x100 - obj_frame_tiles gUnknown_835E9A8 + 0x800, 0x100 - -gSpriteImages_83A0378:: @ 83A0378 - obj_frame_tiles gUnknown_835F2A8, 0x100 - obj_frame_tiles gUnknown_835F2A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_835F2A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_835F2A8 + 0x300, 0x100 - obj_frame_tiles gUnknown_835F2A8 + 0x400, 0x100 - obj_frame_tiles gUnknown_835F2A8 + 0x500, 0x100 - obj_frame_tiles gUnknown_835F2A8 + 0x600, 0x100 - obj_frame_tiles gUnknown_835F2A8 + 0x700, 0x100 - obj_frame_tiles gUnknown_835F2A8 + 0x800, 0x100 - -gSpriteImages_83A03C0:: @ 83A03C0 - obj_frame_tiles gUnknown_83631A8, 0x200 - obj_frame_tiles gUnknown_83631A8 + 0x200, 0x200 - obj_frame_tiles gUnknown_83631A8 + 0x400, 0x200 - obj_frame_tiles gUnknown_83631A8 + 0x600, 0x200 - obj_frame_tiles gUnknown_83631A8 + 0x800, 0x200 - obj_frame_tiles gUnknown_83631A8 + 0xA00, 0x200 - -gSpriteImages_83A03F0:: @ 83A03F0 - obj_frame_tiles gUnknown_8364FA8, 0x200 - obj_frame_tiles gUnknown_8364FA8 + 0x200, 0x200 - obj_frame_tiles gUnknown_8364FA8 + 0x400, 0x200 - obj_frame_tiles gUnknown_8364FA8 + 0x600, 0x200 - obj_frame_tiles gUnknown_8364FA8 + 0x800, 0x200 - obj_frame_tiles gUnknown_8364FA8 + 0xA00, 0x200 - -gSpriteImages_83A0420:: @ 83A0420 - obj_frame_tiles gUnknown_8365BA8, 0x100 - obj_frame_tiles gUnknown_8365BA8 + 0x100, 0x100 - obj_frame_tiles gUnknown_8365BA8 + 0x200, 0x100 - obj_frame_tiles gUnknown_8365BA8 + 0x300, 0x100 - obj_frame_tiles gUnknown_8365BA8 + 0x400, 0x100 - obj_frame_tiles gUnknown_8365BA8 + 0x500, 0x100 - obj_frame_tiles gUnknown_8365BA8 + 0x600, 0x100 - obj_frame_tiles gUnknown_8365BA8 + 0x700, 0x100 - obj_frame_tiles gUnknown_8365BA8 + 0x800, 0x100 - obj_frame_tiles gUnknown_83664A8, 0x100 - -gSpriteImages_83A0470:: @ 83A0470 - obj_frame_tiles gUnknown_83664A8, 0x100 - obj_frame_tiles gUnknown_83664A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_83664A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_83664A8 + 0x300, 0x100 - obj_frame_tiles gUnknown_83664A8 + 0x400, 0x100 - obj_frame_tiles gUnknown_83664A8 + 0x500, 0x100 - obj_frame_tiles gUnknown_83664A8 + 0x600, 0x100 - obj_frame_tiles gUnknown_83664A8 + 0x700, 0x100 - obj_frame_tiles gUnknown_83664A8 + 0x800, 0x100 - obj_frame_tiles gUnknown_8366DA8, 0x100 - -gSpriteImages_83A04C0:: @ 83A04C0 - obj_frame_tiles gUnknown_8397708, 0x100 - obj_frame_tiles gUnknown_8397708 + 0x100, 0x100 - obj_frame_tiles gUnknown_8397708 + 0x200, 0x100 - obj_frame_tiles gUnknown_8397708 + 0x300, 0x100 - obj_frame_tiles gUnknown_8397708 + 0x400, 0x100 - obj_frame_tiles gUnknown_8397708 + 0x500, 0x100 - obj_frame_tiles gUnknown_8397708 + 0x600, 0x100 - obj_frame_tiles gUnknown_8397708 + 0x700, 0x100 - obj_frame_tiles gUnknown_8397708 + 0x800, 0x100 - -gSpriteImages_83A0508:: @ 83A0508 - obj_frame_tiles gUnknown_836D928, 0x80 - obj_frame_tiles gUnknown_836D928 + 0x80, 0x80 - obj_frame_tiles gUnknown_836D928 + 0x100, 0x80 - obj_frame_tiles gUnknown_836D928 + 0x180, 0x80 - obj_frame_tiles gUnknown_836D928 + 0x200, 0x80 - obj_frame_tiles gUnknown_836D928 + 0x280, 0x80 - obj_frame_tiles gUnknown_836D928 + 0x300, 0x80 - obj_frame_tiles gUnknown_836D928 + 0x380, 0x80 - obj_frame_tiles gUnknown_836D928 + 0x400, 0x80 - -gSpriteImages_83A0550:: @ 83A0550 - obj_frame_tiles gUnknown_836DDA8, 0x80 - obj_frame_tiles gUnknown_836DDA8 + 0x80, 0x80 - obj_frame_tiles gUnknown_836DDA8 + 0x100, 0x80 - obj_frame_tiles gUnknown_836DDA8 + 0x180, 0x80 - obj_frame_tiles gUnknown_836DDA8 + 0x200, 0x80 - obj_frame_tiles gUnknown_836DDA8 + 0x280, 0x80 - obj_frame_tiles gUnknown_836DDA8 + 0x300, 0x80 - obj_frame_tiles gUnknown_836DDA8 + 0x380, 0x80 - obj_frame_tiles gUnknown_836DDA8 + 0x400, 0x80 - obj_frame_tiles gUnknown_836DDA8 + 0x480, 0x80 - -gSpriteImages_83A05A0:: @ 83A05A0 - obj_frame_tiles gUnknown_836E2A8, 0x100 - obj_frame_tiles gUnknown_836E2A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_836E2A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_836E2A8, 0x100 - obj_frame_tiles gUnknown_836E2A8, 0x100 - obj_frame_tiles gUnknown_836E2A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_836E2A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_836E2A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_836E2A8 + 0x100, 0x100 - -gSpriteImages_83A05E8:: @ 83A05E8 - obj_frame_tiles gUnknown_836E5A8, 0x100 - obj_frame_tiles gUnknown_836E5A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_836E5A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_836E5A8 + 0x300, 0x100 - obj_frame_tiles gUnknown_836E5A8 + 0x400, 0x100 - obj_frame_tiles gUnknown_836E5A8 + 0x500, 0x100 - obj_frame_tiles gUnknown_836E5A8 + 0x600, 0x100 - obj_frame_tiles gUnknown_836E5A8 + 0x700, 0x100 - obj_frame_tiles gUnknown_836E5A8 + 0x800, 0x100 - obj_frame_tiles gUnknown_836E5A8 + 0x900, 0x100 - -gSpriteImages_83A0638:: @ 83A0638 - obj_frame_tiles gUnknown_836EFA8, 0x100 - obj_frame_tiles gUnknown_836EFA8 + 0x100, 0x100 - obj_frame_tiles gUnknown_836EFA8 + 0x200, 0x100 - obj_frame_tiles gUnknown_836EFA8 + 0x300, 0x100 - obj_frame_tiles gUnknown_836EFA8 + 0x400, 0x100 - obj_frame_tiles gUnknown_836EFA8 + 0x500, 0x100 - obj_frame_tiles gUnknown_836EFA8 + 0x600, 0x100 - obj_frame_tiles gUnknown_836EFA8 + 0x700, 0x100 - obj_frame_tiles gUnknown_836EFA8 + 0x800, 0x100 - obj_frame_tiles gUnknown_836EFA8 + 0x900, 0x100 - -gSpriteImages_83A0688:: @ 83A0688 - obj_frame_tiles gUnknown_83703A8, 0x100 - obj_frame_tiles gUnknown_83703A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_83703A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_83703A8 + 0x300, 0x100 - obj_frame_tiles gUnknown_83703A8 + 0x400, 0x100 - obj_frame_tiles gUnknown_83703A8 + 0x500, 0x100 - obj_frame_tiles gUnknown_83703A8 + 0x600, 0x100 - obj_frame_tiles gUnknown_83703A8 + 0x700, 0x100 - obj_frame_tiles gUnknown_83703A8 + 0x800, 0x100 - obj_frame_tiles gUnknown_83703A8 + 0x900, 0x100 - -gSpriteImages_83A06D8:: @ 83A06D8 - obj_frame_tiles gUnknown_8370DA8, 0x100 - obj_frame_tiles gUnknown_8370DA8 + 0x100, 0x100 - obj_frame_tiles gUnknown_8370DA8 + 0x200, 0x100 - obj_frame_tiles gUnknown_8370DA8 + 0x300, 0x100 - obj_frame_tiles gUnknown_8370DA8 + 0x400, 0x100 - obj_frame_tiles gUnknown_8370DA8 + 0x500, 0x100 - obj_frame_tiles gUnknown_8370DA8 + 0x600, 0x100 - obj_frame_tiles gUnknown_8370DA8 + 0x700, 0x100 - obj_frame_tiles gUnknown_8370DA8 + 0x800, 0x100 - -gSpriteImages_83A0720:: @ 83A0720 - obj_frame_tiles gUnknown_83720A8, 0x100 - obj_frame_tiles gUnknown_83720A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_83720A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_83720A8 + 0x300, 0x100 - obj_frame_tiles gUnknown_83720A8 + 0x400, 0x100 - obj_frame_tiles gUnknown_83720A8 + 0x500, 0x100 - obj_frame_tiles gUnknown_83720A8 + 0x600, 0x100 - obj_frame_tiles gUnknown_83720A8 + 0x700, 0x100 - obj_frame_tiles gUnknown_83720A8 + 0x800, 0x100 - obj_frame_tiles gUnknown_83720A8 + 0x900, 0x100 - -gSpriteImages_83A0770:: @ 83A0770 - obj_frame_tiles gUnknown_83716A8, 0x100 - obj_frame_tiles gUnknown_83716A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_83716A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_83716A8 + 0x300, 0x100 - obj_frame_tiles gUnknown_83716A8 + 0x400, 0x100 - obj_frame_tiles gUnknown_83716A8 + 0x500, 0x100 - obj_frame_tiles gUnknown_83716A8 + 0x600, 0x100 - obj_frame_tiles gUnknown_83716A8 + 0x700, 0x100 - obj_frame_tiles gUnknown_83716A8 + 0x800, 0x100 - obj_frame_tiles gUnknown_83716A8 + 0x900, 0x100 - -gSpriteImages_83A07C0:: @ 83A07C0 - obj_frame_tiles gUnknown_83733A8, 0x100 - obj_frame_tiles gUnknown_83733A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_83733A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_83733A8 + 0x300, 0x100 - obj_frame_tiles gUnknown_83733A8 + 0x400, 0x100 - obj_frame_tiles gUnknown_83733A8 + 0x500, 0x100 - obj_frame_tiles gUnknown_83733A8 + 0x600, 0x100 - obj_frame_tiles gUnknown_83733A8 + 0x700, 0x100 - obj_frame_tiles gUnknown_83733A8 + 0x800, 0x100 - -gSpriteImages_83A0808:: @ 83A0808 - obj_frame_tiles gUnknown_8373CA8, 0x100 - obj_frame_tiles gUnknown_8373CA8 + 0x100, 0x100 - obj_frame_tiles gUnknown_8373CA8 + 0x200, 0x100 - obj_frame_tiles gUnknown_8373CA8 + 0x300, 0x100 - obj_frame_tiles gUnknown_8373CA8 + 0x400, 0x100 - obj_frame_tiles gUnknown_8373CA8 + 0x500, 0x100 - obj_frame_tiles gUnknown_8373CA8 + 0x600, 0x100 - obj_frame_tiles gUnknown_8373CA8 + 0x700, 0x100 - obj_frame_tiles gUnknown_8373CA8 + 0x800, 0x100 - obj_frame_tiles gUnknown_8373CA8 + 0x900, 0x100 - -gSpriteImages_83A0858:: @ 83A0858 - obj_frame_tiles gUnknown_83746A8, 0x100 - obj_frame_tiles gUnknown_83746A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_83746A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_83746A8 + 0x300, 0x100 - obj_frame_tiles gUnknown_83746A8 + 0x400, 0x100 - obj_frame_tiles gUnknown_83746A8 + 0x500, 0x100 - obj_frame_tiles gUnknown_83746A8 + 0x600, 0x100 - obj_frame_tiles gUnknown_83746A8 + 0x700, 0x100 - obj_frame_tiles gUnknown_83746A8 + 0x800, 0x100 - obj_frame_tiles gUnknown_83746A8 + 0x900, 0x100 - -gSpriteImages_83A08A8:: @ 83A08A8 - obj_frame_tiles gUnknown_83750A8, 0x100 - obj_frame_tiles gUnknown_83750A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_83750A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_83750A8 + 0x300, 0x100 - obj_frame_tiles gUnknown_83750A8 + 0x400, 0x100 - obj_frame_tiles gUnknown_83750A8 + 0x500, 0x100 - obj_frame_tiles gUnknown_83750A8 + 0x600, 0x100 - obj_frame_tiles gUnknown_83750A8 + 0x700, 0x100 - obj_frame_tiles gUnknown_83750A8 + 0x800, 0x100 - obj_frame_tiles gUnknown_83750A8 + 0x900, 0x100 - -gSpriteImages_83A08F8:: @ 83A08F8 - obj_frame_tiles gUnknown_8375CA8, 0x100 - obj_frame_tiles gUnknown_8375CA8 + 0x100, 0x100 - obj_frame_tiles gUnknown_8375CA8 + 0x200, 0x100 - obj_frame_tiles gUnknown_8375CA8 + 0x300, 0x100 - obj_frame_tiles gUnknown_8375CA8 + 0x400, 0x100 - obj_frame_tiles gUnknown_8375CA8 + 0x500, 0x100 - obj_frame_tiles gUnknown_8375CA8 + 0x600, 0x100 - obj_frame_tiles gUnknown_8375CA8 + 0x700, 0x100 - obj_frame_tiles gUnknown_8375CA8 + 0x800, 0x100 - -gSpriteImages_83A0940:: @ 83A0940 - obj_frame_tiles gUnknown_83766A8, 0x100 - obj_frame_tiles gUnknown_83766A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_83766A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_83766A8 + 0x300, 0x100 - obj_frame_tiles gUnknown_83766A8 + 0x400, 0x100 - obj_frame_tiles gUnknown_83766A8 + 0x500, 0x100 - obj_frame_tiles gUnknown_83766A8 + 0x600, 0x100 - obj_frame_tiles gUnknown_83766A8 + 0x700, 0x100 - obj_frame_tiles gUnknown_83766A8 + 0x800, 0x100 - -gSpriteImages_83A0988:: @ 83A0988 - obj_frame_tiles gUnknown_83770A8, 0x100 - obj_frame_tiles gUnknown_83770A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_83770A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_83770A8 + 0x300, 0x100 - obj_frame_tiles gUnknown_83770A8 + 0x400, 0x100 - obj_frame_tiles gUnknown_83770A8 + 0x500, 0x100 - obj_frame_tiles gUnknown_83770A8 + 0x600, 0x100 - obj_frame_tiles gUnknown_83770A8 + 0x700, 0x100 - obj_frame_tiles gUnknown_83770A8 + 0x800, 0x100 - obj_frame_tiles gUnknown_83770A8 + 0x900, 0x100 - -gSpriteImages_83A09D8:: @ 83A09D8 - obj_frame_tiles gUnknown_8377AA8, 0x100 - obj_frame_tiles gUnknown_8377AA8 + 0x100, 0x100 - obj_frame_tiles gUnknown_8377AA8 + 0x200, 0x100 - obj_frame_tiles gUnknown_8377AA8 + 0x300, 0x100 - obj_frame_tiles gUnknown_8377AA8 + 0x400, 0x100 - obj_frame_tiles gUnknown_8377AA8 + 0x500, 0x100 - obj_frame_tiles gUnknown_8377AA8 + 0x600, 0x100 - obj_frame_tiles gUnknown_8377AA8 + 0x700, 0x100 - obj_frame_tiles gUnknown_8377AA8 + 0x800, 0x100 - -gSpriteImages_83A0A20:: @ 83A0A20 - obj_frame_tiles gUnknown_83783A8, 0x100 - obj_frame_tiles gUnknown_83783A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_83783A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_83783A8, 0x100 - obj_frame_tiles gUnknown_83783A8, 0x100 - obj_frame_tiles gUnknown_83783A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_83783A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_83783A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_83783A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_8378CA8, 0x100 - -gSpriteImages_83A0A70:: @ 83A0A70 - obj_frame_tiles gUnknown_8375AA8, 0x200 - obj_frame_tiles gUnknown_8375AA8, 0x200 - obj_frame_tiles gUnknown_8375AA8, 0x200 - obj_frame_tiles gUnknown_8375AA8, 0x200 - obj_frame_tiles gUnknown_8375AA8, 0x200 - obj_frame_tiles gUnknown_8375AA8, 0x200 - obj_frame_tiles gUnknown_8375AA8, 0x200 - obj_frame_tiles gUnknown_8375AA8, 0x200 - obj_frame_tiles gUnknown_8375AA8, 0x200 - -gSpriteImages_83A0AB8:: @ 83A0AB8 - obj_frame_tiles gUnknown_8378CA8, 0x100 - obj_frame_tiles gUnknown_8378CA8 + 0x100, 0x100 - obj_frame_tiles gUnknown_8378CA8 + 0x200, 0x100 - obj_frame_tiles gUnknown_8378CA8 + 0x300, 0x100 - obj_frame_tiles gUnknown_8378CA8 + 0x400, 0x100 - obj_frame_tiles gUnknown_8378CA8 + 0x500, 0x100 - obj_frame_tiles gUnknown_8378CA8 + 0x600, 0x100 - obj_frame_tiles gUnknown_8378CA8 + 0x700, 0x100 - obj_frame_tiles gUnknown_8378CA8 + 0x800, 0x100 - -gSpriteImages_83A0B00:: @ 83A0B00 - obj_frame_tiles gUnknown_83795A8, 0x100 - obj_frame_tiles gUnknown_83795A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_83795A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_83795A8 + 0x300, 0x100 - obj_frame_tiles gUnknown_83795A8 + 0x400, 0x100 - obj_frame_tiles gUnknown_83795A8 + 0x500, 0x100 - obj_frame_tiles gUnknown_83795A8 + 0x600, 0x100 - obj_frame_tiles gUnknown_83795A8 + 0x700, 0x100 - obj_frame_tiles gUnknown_83795A8 + 0x800, 0x100 - obj_frame_tiles gUnknown_83795A8 + 0x900, 0x100 - -gSpriteImages_83A0B50:: @ 83A0B50 - obj_frame_tiles gUnknown_8379FA8, 0x100 - obj_frame_tiles gUnknown_8379FA8 + 0x100, 0x100 - obj_frame_tiles gUnknown_8379FA8 + 0x200, 0x100 - obj_frame_tiles gUnknown_8379FA8 + 0x300, 0x100 - obj_frame_tiles gUnknown_8379FA8 + 0x400, 0x100 - obj_frame_tiles gUnknown_8379FA8 + 0x500, 0x100 - obj_frame_tiles gUnknown_8379FA8 + 0x600, 0x100 - obj_frame_tiles gUnknown_8379FA8 + 0x700, 0x100 - obj_frame_tiles gUnknown_8379FA8 + 0x800, 0x100 - obj_frame_tiles gUnknown_8379FA8 + 0x900, 0x100 - -gSpriteImages_83A0BA0:: @ 83A0BA0 - obj_frame_tiles gUnknown_837A9A8, 0x100 - obj_frame_tiles gUnknown_837A9A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_837A9A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_837A9A8 + 0x300, 0x100 - obj_frame_tiles gUnknown_837A9A8 + 0x400, 0x100 - obj_frame_tiles gUnknown_837A9A8 + 0x500, 0x100 - obj_frame_tiles gUnknown_837A9A8 + 0x600, 0x100 - obj_frame_tiles gUnknown_837A9A8 + 0x700, 0x100 - obj_frame_tiles gUnknown_837A9A8 + 0x800, 0x100 - obj_frame_tiles gUnknown_837A9A8 + 0x900, 0x100 - -gSpriteImages_83A0BF0:: @ 83A0BF0 - obj_frame_tiles gUnknown_837B3A8, 0x100 - obj_frame_tiles gUnknown_837B3A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_837B3A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_837B3A8 + 0x300, 0x100 - obj_frame_tiles gUnknown_837B3A8 + 0x400, 0x100 - obj_frame_tiles gUnknown_837B3A8 + 0x500, 0x100 - obj_frame_tiles gUnknown_837B3A8 + 0x600, 0x100 - obj_frame_tiles gUnknown_837B3A8 + 0x700, 0x100 - obj_frame_tiles gUnknown_837B3A8 + 0x800, 0x100 - obj_frame_tiles gUnknown_837B3A8 + 0x900, 0x100 - -gSpriteImages_83A0C40:: @ 83A0C40 - obj_frame_tiles gUnknown_836F9A8, 0x100 - obj_frame_tiles gUnknown_836F9A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_836F9A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_836F9A8 + 0x300, 0x100 - obj_frame_tiles gUnknown_836F9A8 + 0x400, 0x100 - obj_frame_tiles gUnknown_836F9A8 + 0x500, 0x100 - obj_frame_tiles gUnknown_836F9A8 + 0x600, 0x100 - obj_frame_tiles gUnknown_836F9A8 + 0x700, 0x100 - obj_frame_tiles gUnknown_836F9A8 + 0x800, 0x100 - obj_frame_tiles gUnknown_836F9A8 + 0x900, 0x100 - -gSpriteImages_83A0C90:: @ 83A0C90 - obj_frame_tiles gUnknown_837BF28, 0x100 - obj_frame_tiles gUnknown_837BF28 + 0x100, 0x100 - obj_frame_tiles gUnknown_837BF28 + 0x200, 0x100 - obj_frame_tiles gUnknown_837BF28 + 0x300, 0x100 - obj_frame_tiles gUnknown_837BF28 + 0x400, 0x100 - obj_frame_tiles gUnknown_837BF28 + 0x500, 0x100 - obj_frame_tiles gUnknown_837BF28 + 0x600, 0x100 - obj_frame_tiles gUnknown_837BF28 + 0x700, 0x100 - obj_frame_tiles gUnknown_837BF28 + 0x800, 0x100 - obj_frame_tiles gUnknown_837BF28 + 0x900, 0x100 - -gSpriteImages_83A0CE0:: @ 83A0CE0 - obj_frame_tiles gUnknown_837C928, 0x100 - obj_frame_tiles gUnknown_837C928 + 0x100, 0x100 - obj_frame_tiles gUnknown_837C928 + 0x200, 0x100 - obj_frame_tiles gUnknown_837C928 + 0x300, 0x100 - obj_frame_tiles gUnknown_837C928 + 0x400, 0x100 - obj_frame_tiles gUnknown_837C928 + 0x500, 0x100 - obj_frame_tiles gUnknown_837C928 + 0x600, 0x100 - obj_frame_tiles gUnknown_837C928 + 0x700, 0x100 - obj_frame_tiles gUnknown_837C928 + 0x800, 0x100 - obj_frame_tiles gUnknown_837C928 + 0x900, 0x100 - -gSpriteImages_83A0D30:: @ 83A0D30 - obj_frame_tiles gUnknown_837D328, 0x100 - obj_frame_tiles gUnknown_837D328 + 0x100, 0x100 - obj_frame_tiles gUnknown_837D328 + 0x200, 0x100 - obj_frame_tiles gUnknown_837D328 + 0x300, 0x100 - obj_frame_tiles gUnknown_837D328 + 0x400, 0x100 - obj_frame_tiles gUnknown_837D328 + 0x500, 0x100 - obj_frame_tiles gUnknown_837D328 + 0x600, 0x100 - obj_frame_tiles gUnknown_837D328 + 0x700, 0x100 - obj_frame_tiles gUnknown_837D328 + 0x800, 0x100 - -gSpriteImages_83A0D78:: @ 83A0D78 - obj_frame_tiles gUnknown_837DC28, 0x100 - obj_frame_tiles gUnknown_837DC28 + 0x100, 0x100 - obj_frame_tiles gUnknown_837DC28 + 0x200, 0x100 - obj_frame_tiles gUnknown_837DC28 + 0x300, 0x100 - obj_frame_tiles gUnknown_837DC28 + 0x400, 0x100 - obj_frame_tiles gUnknown_837DC28 + 0x500, 0x100 - obj_frame_tiles gUnknown_837DC28 + 0x600, 0x100 - obj_frame_tiles gUnknown_837DC28 + 0x700, 0x100 - obj_frame_tiles gUnknown_837DC28 + 0x800, 0x100 - obj_frame_tiles gUnknown_837DC28 + 0x900, 0x100 - -gSpriteImages_83A0DC8:: @ 83A0DC8 - obj_frame_tiles gUnknown_837E628, 0x100 - obj_frame_tiles gUnknown_837E628 + 0x100, 0x100 - obj_frame_tiles gUnknown_837E628 + 0x200, 0x100 - obj_frame_tiles gUnknown_837E628 + 0x300, 0x100 - obj_frame_tiles gUnknown_837E628 + 0x400, 0x100 - obj_frame_tiles gUnknown_837E628 + 0x500, 0x100 - obj_frame_tiles gUnknown_837E628 + 0x600, 0x100 - obj_frame_tiles gUnknown_837E628 + 0x700, 0x100 - obj_frame_tiles gUnknown_837E628 + 0x800, 0x100 - obj_frame_tiles gUnknown_837E628 + 0x900, 0x100 - -gSpriteImages_83A0E18:: @ 83A0E18 - obj_frame_tiles gUnknown_837F028, 0x100 - obj_frame_tiles gUnknown_837F028 + 0x100, 0x100 - obj_frame_tiles gUnknown_837F028 + 0x200, 0x100 - obj_frame_tiles gUnknown_837F028 + 0x300, 0x100 - obj_frame_tiles gUnknown_837F028 + 0x400, 0x100 - obj_frame_tiles gUnknown_837F028 + 0x500, 0x100 - obj_frame_tiles gUnknown_837F028 + 0x600, 0x100 - obj_frame_tiles gUnknown_837F028 + 0x700, 0x100 - obj_frame_tiles gUnknown_837F028 + 0x800, 0x100 - obj_frame_tiles gUnknown_837F028 + 0x900, 0x100 - -gSpriteImages_83A0E68:: @ 83A0E68 - obj_frame_tiles gUnknown_837FA28, 0x100 - obj_frame_tiles gUnknown_837FA28 + 0x100, 0x100 - obj_frame_tiles gUnknown_837FA28 + 0x200, 0x100 - obj_frame_tiles gUnknown_837FA28 + 0x300, 0x100 - obj_frame_tiles gUnknown_837FA28 + 0x400, 0x100 - obj_frame_tiles gUnknown_837FA28 + 0x500, 0x100 - obj_frame_tiles gUnknown_837FA28 + 0x600, 0x100 - obj_frame_tiles gUnknown_837FA28 + 0x700, 0x100 - obj_frame_tiles gUnknown_837FA28 + 0x800, 0x100 - obj_frame_tiles gUnknown_837FA28 + 0x900, 0x100 - -gSpriteImages_83A0EB8:: @ 83A0EB8 - obj_frame_tiles gUnknown_8380428, 0x100 - obj_frame_tiles gUnknown_8380428 + 0x100, 0x100 - obj_frame_tiles gUnknown_8380428 + 0x200, 0x100 - obj_frame_tiles gUnknown_8380428 + 0x300, 0x100 - obj_frame_tiles gUnknown_8380428 + 0x400, 0x100 - obj_frame_tiles gUnknown_8380428 + 0x500, 0x100 - obj_frame_tiles gUnknown_8380428 + 0x600, 0x100 - obj_frame_tiles gUnknown_8380428 + 0x700, 0x100 - obj_frame_tiles gUnknown_8380428 + 0x800, 0x100 - obj_frame_tiles gUnknown_8380428 + 0x900, 0x100 - -gSpriteImages_83A0F08:: @ 83A0F08 - obj_frame_tiles gUnknown_8380E28, 0x100 - obj_frame_tiles gUnknown_8380E28 + 0x100, 0x100 - obj_frame_tiles gUnknown_8380E28 + 0x200, 0x100 - obj_frame_tiles gUnknown_8380E28 + 0x300, 0x100 - obj_frame_tiles gUnknown_8380E28 + 0x400, 0x100 - obj_frame_tiles gUnknown_8380E28 + 0x500, 0x100 - obj_frame_tiles gUnknown_8380E28 + 0x600, 0x100 - obj_frame_tiles gUnknown_8380E28 + 0x700, 0x100 - obj_frame_tiles gUnknown_8380E28 + 0x800, 0x100 - obj_frame_tiles gUnknown_8380E28 + 0x900, 0x100 - -gSpriteImages_83A0F58:: @ 83A0F58 - obj_frame_tiles gUnknown_8381828, 0x100 - obj_frame_tiles gUnknown_8381828 + 0x100, 0x100 - obj_frame_tiles gUnknown_8381828 + 0x200, 0x100 - obj_frame_tiles gUnknown_8381828 + 0x300, 0x100 - obj_frame_tiles gUnknown_8381828 + 0x400, 0x100 - obj_frame_tiles gUnknown_8381828 + 0x500, 0x100 - obj_frame_tiles gUnknown_8381828 + 0x600, 0x100 - obj_frame_tiles gUnknown_8381828 + 0x700, 0x100 - obj_frame_tiles gUnknown_8381828 + 0x800, 0x100 - obj_frame_tiles gUnknown_8381828 + 0x900, 0x100 - -gSpriteImages_83A0FA8:: @ 83A0FA8 - obj_frame_tiles gUnknown_8382228, 0x100 - obj_frame_tiles gUnknown_8382228 + 0x100, 0x100 - obj_frame_tiles gUnknown_8382228 + 0x200, 0x100 - obj_frame_tiles gUnknown_8382228 + 0x300, 0x100 - obj_frame_tiles gUnknown_8382228 + 0x400, 0x100 - obj_frame_tiles gUnknown_8382228 + 0x500, 0x100 - obj_frame_tiles gUnknown_8382228 + 0x600, 0x100 - obj_frame_tiles gUnknown_8382228 + 0x700, 0x100 - obj_frame_tiles gUnknown_8382228 + 0x800, 0x100 - obj_frame_tiles gUnknown_8382228 + 0x900, 0x100 - -gSpriteImages_83A0FF8:: @ 83A0FF8 - obj_frame_tiles gUnknown_8382C28, 0x100 - obj_frame_tiles gUnknown_8382C28 + 0x100, 0x100 - obj_frame_tiles gUnknown_8382C28 + 0x200, 0x100 - obj_frame_tiles gUnknown_8382C28 + 0x300, 0x100 - obj_frame_tiles gUnknown_8382C28 + 0x400, 0x100 - obj_frame_tiles gUnknown_8382C28 + 0x500, 0x100 - obj_frame_tiles gUnknown_8382C28 + 0x600, 0x100 - obj_frame_tiles gUnknown_8382C28 + 0x700, 0x100 - obj_frame_tiles gUnknown_8382C28 + 0x800, 0x100 - -gSpriteImages_83A1040:: @ 83A1040 - obj_frame_tiles gUnknown_8383528, 0x100 - obj_frame_tiles gUnknown_8383528 + 0x100, 0x100 - obj_frame_tiles gUnknown_8383528 + 0x200, 0x100 - obj_frame_tiles gUnknown_8383528 + 0x300, 0x100 - obj_frame_tiles gUnknown_8383528 + 0x400, 0x100 - obj_frame_tiles gUnknown_8383528 + 0x500, 0x100 - obj_frame_tiles gUnknown_8383528 + 0x600, 0x100 - obj_frame_tiles gUnknown_8383528 + 0x700, 0x100 - obj_frame_tiles gUnknown_8383528 + 0x800, 0x100 - obj_frame_tiles gUnknown_8383528 + 0x900, 0x100 - -gSpriteImages_83A1090:: @ 83A1090 - obj_frame_tiles gUnknown_8383F28, 0x100 - obj_frame_tiles gUnknown_8383F28 + 0x100, 0x100 - obj_frame_tiles gUnknown_8383F28 + 0x200, 0x100 - obj_frame_tiles gUnknown_8383F28 + 0x300, 0x100 - obj_frame_tiles gUnknown_8383F28 + 0x400, 0x100 - obj_frame_tiles gUnknown_8383F28 + 0x500, 0x100 - obj_frame_tiles gUnknown_8383F28 + 0x600, 0x100 - obj_frame_tiles gUnknown_8383F28 + 0x700, 0x100 - obj_frame_tiles gUnknown_8383F28 + 0x800, 0x100 - -gSpriteImages_83A10D8:: @ 83A10D8 - obj_frame_tiles gUnknown_8384828, 0x100 - obj_frame_tiles gUnknown_8384828 + 0x100, 0x100 - obj_frame_tiles gUnknown_8384828 + 0x200, 0x100 - obj_frame_tiles gUnknown_8384828 + 0x300, 0x100 - obj_frame_tiles gUnknown_8384828 + 0x400, 0x100 - obj_frame_tiles gUnknown_8384828 + 0x500, 0x100 - obj_frame_tiles gUnknown_8384828 + 0x600, 0x100 - obj_frame_tiles gUnknown_8384828 + 0x700, 0x100 - obj_frame_tiles gUnknown_8384828 + 0x800, 0x100 - -gSpriteImages_83A1120:: @ 83A1120 - obj_frame_tiles gUnknown_8385128, 0x80 - obj_frame_tiles gUnknown_8385128 + 0x80, 0x80 - obj_frame_tiles gUnknown_8385128 + 0x100, 0x80 - obj_frame_tiles gUnknown_8385128 + 0x180, 0x80 - obj_frame_tiles gUnknown_8385128 + 0x200, 0x80 - obj_frame_tiles gUnknown_8385128 + 0x280, 0x80 - obj_frame_tiles gUnknown_8385128 + 0x300, 0x80 - obj_frame_tiles gUnknown_8385128 + 0x380, 0x80 - obj_frame_tiles gUnknown_8385128 + 0x400, 0x80 - obj_frame_tiles gUnknown_8385128 + 0x480, 0x80 - -gSpriteImages_83A1170:: @ 83A1170 - obj_frame_tiles gUnknown_8385628, 0x80 - obj_frame_tiles gUnknown_8385628 + 0x80, 0x80 - obj_frame_tiles gUnknown_8385628 + 0x100, 0x80 - obj_frame_tiles gUnknown_8385628 + 0x180, 0x80 - obj_frame_tiles gUnknown_8385628 + 0x200, 0x80 - obj_frame_tiles gUnknown_8385628 + 0x280, 0x80 - obj_frame_tiles gUnknown_8385628 + 0x300, 0x80 - obj_frame_tiles gUnknown_8385628 + 0x380, 0x80 - obj_frame_tiles gUnknown_8385628 + 0x400, 0x80 - obj_frame_tiles gUnknown_8385628 + 0x480, 0x80 - -gSpriteImages_83A11C0:: @ 83A11C0 - obj_frame_tiles gUnknown_8385B28, 0x80 - obj_frame_tiles gUnknown_8385B28 + 0x80, 0x80 - obj_frame_tiles gUnknown_8385B28 + 0x100, 0x80 - obj_frame_tiles gUnknown_8385B28 + 0x180, 0x80 - obj_frame_tiles gUnknown_8385B28 + 0x200, 0x80 - obj_frame_tiles gUnknown_8385B28 + 0x280, 0x80 - obj_frame_tiles gUnknown_8385B28 + 0x300, 0x80 - obj_frame_tiles gUnknown_8385B28 + 0x380, 0x80 - obj_frame_tiles gUnknown_8385B28 + 0x400, 0x80 - obj_frame_tiles gUnknown_8385B28 + 0x480, 0x80 - -gSpriteImages_83A1210:: @ 83A1210 - obj_frame_tiles gUnknown_8386028, 0x100 - obj_frame_tiles gUnknown_8386028 + 0x100, 0x100 - obj_frame_tiles gUnknown_8386028 + 0x200, 0x100 - obj_frame_tiles gUnknown_8386028 + 0x300, 0x100 - obj_frame_tiles gUnknown_8386028 + 0x400, 0x100 - obj_frame_tiles gUnknown_8386028 + 0x500, 0x100 - obj_frame_tiles gUnknown_8386028 + 0x600, 0x100 - obj_frame_tiles gUnknown_8386028 + 0x700, 0x100 - obj_frame_tiles gUnknown_8386028 + 0x800, 0x100 - obj_frame_tiles gUnknown_8386028 + 0x900, 0x100 - -gSpriteImages_83A1260:: @ 83A1260 - obj_frame_tiles gUnknown_8386A28, 0x200 - obj_frame_tiles gUnknown_8386A28 + 0x200, 0x200 - obj_frame_tiles gUnknown_8386A28 + 0x400, 0x200 - obj_frame_tiles gUnknown_8386A28 + 0x600, 0x200 - obj_frame_tiles gUnknown_8386A28 + 0x800, 0x200 - obj_frame_tiles gUnknown_8386A28 + 0xA00, 0x200 - obj_frame_tiles gUnknown_8386A28 + 0xC00, 0x200 - obj_frame_tiles gUnknown_8386A28 + 0xE00, 0x200 - obj_frame_tiles gUnknown_8386A28 + 0x1000, 0x200 - obj_frame_tiles gUnknown_8386A28 + 0x1200, 0x200 - -gSpriteImages_83A12B0:: @ 83A12B0 - obj_frame_tiles gUnknown_8387E28, 0x100 - obj_frame_tiles gUnknown_8387E28 + 0x100, 0x100 - obj_frame_tiles gUnknown_8387E28 + 0x200, 0x100 - obj_frame_tiles gUnknown_8387E28 + 0x300, 0x100 - obj_frame_tiles gUnknown_8387E28 + 0x400, 0x100 - obj_frame_tiles gUnknown_8387E28 + 0x500, 0x100 - obj_frame_tiles gUnknown_8387E28 + 0x600, 0x100 - obj_frame_tiles gUnknown_8387E28 + 0x700, 0x100 - obj_frame_tiles gUnknown_8387E28 + 0x800, 0x100 - -gSpriteImages_83A12F8:: @ 83A12F8 - obj_frame_tiles gUnknown_838AD28, 0x100 - obj_frame_tiles gUnknown_838AD28 + 0x100, 0x100 - obj_frame_tiles gUnknown_838AD28 + 0x200, 0x100 - obj_frame_tiles gUnknown_838AD28, 0x100 - obj_frame_tiles gUnknown_838AD28, 0x100 - obj_frame_tiles gUnknown_838AD28 + 0x100, 0x100 - obj_frame_tiles gUnknown_838AD28 + 0x100, 0x100 - obj_frame_tiles gUnknown_838AD28 + 0x200, 0x100 - obj_frame_tiles gUnknown_838AD28 + 0x200, 0x100 - obj_frame_tiles gUnknown_838AD28 + 0x300, 0x100 - -gSpriteImages_83A1348:: @ 83A1348 - obj_frame_tiles gUnknown_838B728, 0x100 - obj_frame_tiles gUnknown_838B728 + 0x100, 0x100 - obj_frame_tiles gUnknown_838B728 + 0x200, 0x100 - obj_frame_tiles gUnknown_838B728, 0x100 - obj_frame_tiles gUnknown_838B728, 0x100 - obj_frame_tiles gUnknown_838B728 + 0x100, 0x100 - obj_frame_tiles gUnknown_838B728 + 0x100, 0x100 - obj_frame_tiles gUnknown_838B728 + 0x200, 0x100 - obj_frame_tiles gUnknown_838B728 + 0x200, 0x100 - -gSpriteImages_83A1390:: @ 83A1390 - obj_frame_tiles gUnknown_838BA28, 0x80 - -gSpriteImages_83A1398:: @ 83A1398 - obj_frame_tiles gUnknown_8389B28, 0x100 - obj_frame_tiles gUnknown_8389B28 + 0x100, 0x100 - obj_frame_tiles gUnknown_8389B28 + 0x200, 0x100 - obj_frame_tiles gUnknown_8389B28 + 0x300, 0x100 - obj_frame_tiles gUnknown_8389B28 + 0x400, 0x100 - obj_frame_tiles gUnknown_8389B28 + 0x500, 0x100 - obj_frame_tiles gUnknown_8389B28 + 0x600, 0x100 - obj_frame_tiles gUnknown_8389B28 + 0x700, 0x100 - obj_frame_tiles gUnknown_8389B28 + 0x800, 0x100 - -gSpriteImages_83A13E0:: @ 83A13E0 - obj_frame_tiles gUnknown_8388728, 0x100 - obj_frame_tiles gUnknown_8388728 + 0x100, 0x100 - obj_frame_tiles gUnknown_8388728 + 0x200, 0x100 - obj_frame_tiles gUnknown_8388728 + 0x300, 0x100 - obj_frame_tiles gUnknown_8388728 + 0x400, 0x100 - obj_frame_tiles gUnknown_8388728 + 0x500, 0x100 - obj_frame_tiles gUnknown_8388728 + 0x600, 0x100 - obj_frame_tiles gUnknown_8388728 + 0x700, 0x100 - obj_frame_tiles gUnknown_8388728 + 0x800, 0x100 - obj_frame_tiles gUnknown_8388728 + 0x900, 0x100 - -gSpriteImages_83A1430:: @ 83A1430 - obj_frame_tiles gUnknown_8389128, 0x100 - obj_frame_tiles gUnknown_8389128 + 0x100, 0x100 - obj_frame_tiles gUnknown_8389128 + 0x200, 0x100 - obj_frame_tiles gUnknown_8389128 + 0x300, 0x100 - obj_frame_tiles gUnknown_8389128 + 0x400, 0x100 - obj_frame_tiles gUnknown_8389128 + 0x500, 0x100 - obj_frame_tiles gUnknown_8389128 + 0x600, 0x100 - obj_frame_tiles gUnknown_8389128 + 0x700, 0x100 - obj_frame_tiles gUnknown_8389128 + 0x800, 0x100 - obj_frame_tiles gUnknown_8389128 + 0x900, 0x100 - -gSpriteImages_83A1480:: @ 83A1480 - obj_frame_tiles gUnknown_838BAA8, 0x100 - obj_frame_tiles gUnknown_838BAA8 + 0x100, 0x100 - obj_frame_tiles gUnknown_838BAA8 + 0x200, 0x100 - obj_frame_tiles gUnknown_838BAA8 + 0x300, 0x100 - obj_frame_tiles gUnknown_838BAA8 + 0x400, 0x100 - obj_frame_tiles gUnknown_838BAA8 + 0x500, 0x100 - obj_frame_tiles gUnknown_838BAA8 + 0x600, 0x100 - obj_frame_tiles gUnknown_838BAA8 + 0x700, 0x100 - obj_frame_tiles gUnknown_838BAA8 + 0x800, 0x100 - -gSpriteImages_83A14C8:: @ 83A14C8 - obj_frame_tiles gUnknown_838C3A8, 0x100 - obj_frame_tiles gUnknown_838C3A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_838C3A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_838C3A8, 0x100 - obj_frame_tiles gUnknown_838C3A8, 0x100 - obj_frame_tiles gUnknown_838C3A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_838C3A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_838C3A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_838C3A8 + 0x200, 0x100 - -gSpriteImages_83A1510:: @ 83A1510 - obj_frame_tiles gUnknown_83945A8, 0x80 - obj_frame_tiles gUnknown_83945A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83945A8 + 0x100, 0x80 - obj_frame_tiles gUnknown_83945A8 + 0x180, 0x80 - -gSpriteImages_83A1530:: @ 83A1530 - obj_frame_tiles gUnknown_838C6A8, 0x100 - obj_frame_tiles gUnknown_838C6A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_838C6A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_838C6A8 + 0x300, 0x100 - obj_frame_tiles gUnknown_838C6A8 + 0x400, 0x100 - obj_frame_tiles gUnknown_838C6A8 + 0x500, 0x100 - obj_frame_tiles gUnknown_838C6A8 + 0x600, 0x100 - obj_frame_tiles gUnknown_838C6A8 + 0x700, 0x100 - obj_frame_tiles gUnknown_838C6A8 + 0x800, 0x100 - -gSpriteImages_83A1578:: @ 83A1578 - obj_frame_tiles gUnknown_838CFA8, 0x100 - obj_frame_tiles gUnknown_838CFA8 + 0x100, 0x100 - obj_frame_tiles gUnknown_838CFA8 + 0x200, 0x100 - obj_frame_tiles gUnknown_838CFA8, 0x100 - obj_frame_tiles gUnknown_838CFA8, 0x100 - obj_frame_tiles gUnknown_838CFA8 + 0x100, 0x100 - obj_frame_tiles gUnknown_838CFA8 + 0x100, 0x100 - obj_frame_tiles gUnknown_838CFA8 + 0x200, 0x100 - obj_frame_tiles gUnknown_838CFA8 + 0x200, 0x100 - -gSpriteImages_83A15C0:: @ 83A15C0 - obj_frame_tiles gUnknown_838D2A8, 0x100 - obj_frame_tiles gUnknown_838D2A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_838D2A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_838D2A8, 0x100 - obj_frame_tiles gUnknown_838D2A8, 0x100 - obj_frame_tiles gUnknown_838D2A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_838D2A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_838D2A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_838D2A8 + 0x200, 0x100 - -gSpriteImages_83A1608:: @ 83A1608 - obj_frame_tiles gUnknown_838B128, 0x100 - obj_frame_tiles gUnknown_838B128 + 0x100, 0x100 - obj_frame_tiles gUnknown_838B128 + 0x200, 0x100 - obj_frame_tiles gUnknown_838B128, 0x100 - obj_frame_tiles gUnknown_838B128, 0x100 - obj_frame_tiles gUnknown_838B128 + 0x100, 0x100 - obj_frame_tiles gUnknown_838B128 + 0x100, 0x100 - obj_frame_tiles gUnknown_838B128 + 0x200, 0x100 - obj_frame_tiles gUnknown_838B128 + 0x200, 0x100 - -gSpriteImages_83A1650:: @ 83A1650 - obj_frame_tiles gUnknown_838B428, 0x100 - obj_frame_tiles gUnknown_838B428 + 0x100, 0x100 - obj_frame_tiles gUnknown_838B428 + 0x200, 0x100 - obj_frame_tiles gUnknown_838B428, 0x100 - obj_frame_tiles gUnknown_838B428, 0x100 - obj_frame_tiles gUnknown_838B428 + 0x100, 0x100 - obj_frame_tiles gUnknown_838B428 + 0x100, 0x100 - obj_frame_tiles gUnknown_838B428 + 0x200, 0x100 - obj_frame_tiles gUnknown_838B428 + 0x200, 0x100 - -gSpriteImages_83A1698:: @ 83A1698 - obj_frame_tiles gUnknown_83947A8, 0x80 - obj_frame_tiles gUnknown_83947A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83947A8 + 0x100, 0x80 - obj_frame_tiles gUnknown_83947A8 + 0x180, 0x80 - -gSpriteImages_83A16B8:: @ 83A16B8 - obj_frame_tiles gUnknown_83949A8, 0x80 - -gSpriteImages_83A16C0:: @ 83A16C0 - obj_frame_tiles gUnknown_838DEA8, 0x100 - obj_frame_tiles gUnknown_838DEA8 + 0x100, 0x100 - obj_frame_tiles gUnknown_838DEA8 + 0x200, 0x100 - obj_frame_tiles gUnknown_838DEA8 + 0x300, 0x100 - obj_frame_tiles gUnknown_838DEA8 + 0x400, 0x100 - obj_frame_tiles gUnknown_838DEA8 + 0x500, 0x100 - obj_frame_tiles gUnknown_838DEA8 + 0x600, 0x100 - obj_frame_tiles gUnknown_838DEA8 + 0x700, 0x100 - obj_frame_tiles gUnknown_838DEA8 + 0x800, 0x100 - -gSpriteImages_83A1708:: @ 83A1708 - obj_frame_tiles gUnknown_838E7A8, 0x100 - obj_frame_tiles gUnknown_838E7A8 + 0x100, 0x100 - obj_frame_tiles gUnknown_838E7A8 + 0x200, 0x100 - obj_frame_tiles gUnknown_838E7A8 + 0x300, 0x100 - obj_frame_tiles gUnknown_838E7A8 + 0x400, 0x100 - obj_frame_tiles gUnknown_838E7A8 + 0x500, 0x100 - obj_frame_tiles gUnknown_838E7A8 + 0x600, 0x100 - obj_frame_tiles gUnknown_838E7A8 + 0x700, 0x100 - obj_frame_tiles gUnknown_838E7A8 + 0x800, 0x100 - -gSpriteImages_83A1750:: @ 83A1750 - obj_frame_tiles gUnknown_8390F28, 0x100 - obj_frame_tiles gUnknown_8390F28 + 0x100, 0x100 - obj_frame_tiles gUnknown_8390F28 + 0x200, 0x100 - obj_frame_tiles gUnknown_8390F28, 0x100 - obj_frame_tiles gUnknown_8390F28, 0x100 - obj_frame_tiles gUnknown_8390F28 + 0x100, 0x100 - obj_frame_tiles gUnknown_8390F28 + 0x100, 0x100 - obj_frame_tiles gUnknown_8390F28 + 0x200, 0x100 - obj_frame_tiles gUnknown_8390F28 + 0x200, 0x100 - -gSpriteImages_83A1798:: @ 83A1798 - obj_frame_tiles gUnknown_836C928, 0x100 - obj_frame_tiles gUnknown_836C928 + 0x100, 0x100 - obj_frame_tiles gUnknown_836C928 + 0x200, 0x100 - obj_frame_tiles gUnknown_836C928, 0x100 - obj_frame_tiles gUnknown_836C928, 0x100 - obj_frame_tiles gUnknown_836C928 + 0x100, 0x100 - obj_frame_tiles gUnknown_836C928 + 0x100, 0x100 - obj_frame_tiles gUnknown_836C928 + 0x200, 0x100 - obj_frame_tiles gUnknown_836C928 + 0x200, 0x100 - -gSpriteImages_83A17E0:: @ 83A17E0 - obj_frame_tiles gUnknown_8391228, 0x100 - obj_frame_tiles gUnknown_8391228 + 0x100, 0x100 - obj_frame_tiles gUnknown_8391228 + 0x200, 0x100 - obj_frame_tiles gUnknown_8391228, 0x100 - obj_frame_tiles gUnknown_8391228, 0x100 - obj_frame_tiles gUnknown_8391228 + 0x100, 0x100 - obj_frame_tiles gUnknown_8391228 + 0x100, 0x100 - obj_frame_tiles gUnknown_8391228 + 0x200, 0x100 - obj_frame_tiles gUnknown_8391228 + 0x200, 0x100 - -gSpriteImages_83A1828:: @ 83A1828 - obj_frame_tiles gUnknown_836CC28, 0x100 - obj_frame_tiles gUnknown_836CC28 + 0x100, 0x100 - obj_frame_tiles gUnknown_836CC28 + 0x200, 0x100 - obj_frame_tiles gUnknown_836CC28, 0x100 - obj_frame_tiles gUnknown_836CC28, 0x100 - obj_frame_tiles gUnknown_836CC28 + 0x100, 0x100 - obj_frame_tiles gUnknown_836CC28 + 0x100, 0x100 - obj_frame_tiles gUnknown_836CC28 + 0x200, 0x100 - obj_frame_tiles gUnknown_836CC28 + 0x200, 0x100 - -gSpriteImages_83A1870:: @ 83A1870 - obj_frame_tiles gUnknown_836C328, 0x100 - obj_frame_tiles gUnknown_836C328 + 0x100, 0x100 - obj_frame_tiles gUnknown_836C328 + 0x200, 0x100 - obj_frame_tiles gUnknown_836C328, 0x100 - obj_frame_tiles gUnknown_836C328, 0x100 - obj_frame_tiles gUnknown_836C328 + 0x100, 0x100 - obj_frame_tiles gUnknown_836C328 + 0x100, 0x100 - obj_frame_tiles gUnknown_836C328 + 0x200, 0x100 - obj_frame_tiles gUnknown_836C328 + 0x200, 0x100 - -gSpriteImages_83A18B8:: @ 83A18B8 - obj_frame_tiles gUnknown_836C628, 0x100 - obj_frame_tiles gUnknown_836C628 + 0x100, 0x100 - obj_frame_tiles gUnknown_836C628 + 0x200, 0x100 - obj_frame_tiles gUnknown_836C628, 0x100 - obj_frame_tiles gUnknown_836C628, 0x100 - obj_frame_tiles gUnknown_836C628 + 0x100, 0x100 - obj_frame_tiles gUnknown_836C628 + 0x100, 0x100 - obj_frame_tiles gUnknown_836C628 + 0x200, 0x100 - obj_frame_tiles gUnknown_836C628 + 0x200, 0x100 - -gSpriteImages_83A1900:: @ 83A1900 - obj_frame_tiles gUnknown_836A228, 0x100 - obj_frame_tiles gUnknown_836A228 + 0x100, 0x100 - obj_frame_tiles gUnknown_836A228 + 0x200, 0x100 - obj_frame_tiles gUnknown_836A228 + 0x300, 0x100 - obj_frame_tiles gUnknown_836A228 + 0x400, 0x100 - obj_frame_tiles gUnknown_836A228 + 0x500, 0x100 - obj_frame_tiles gUnknown_836A228 + 0x600, 0x100 - obj_frame_tiles gUnknown_836A228 + 0x700, 0x100 - obj_frame_tiles gUnknown_836A228 + 0x800, 0x100 - -gSpriteImages_83A1948:: @ 83A1948 - obj_frame_tiles gUnknown_836AB28, 0x100 - obj_frame_tiles gUnknown_836AB28 + 0x100, 0x100 - obj_frame_tiles gUnknown_836AB28 + 0x200, 0x100 - obj_frame_tiles gUnknown_836AB28, 0x100 - obj_frame_tiles gUnknown_836AB28, 0x100 - obj_frame_tiles gUnknown_836AB28 + 0x100, 0x100 - obj_frame_tiles gUnknown_836AB28 + 0x100, 0x100 - obj_frame_tiles gUnknown_836AB28 + 0x200, 0x100 - obj_frame_tiles gUnknown_836AB28 + 0x200, 0x100 - -gSpriteImages_83A1990:: @ 83A1990 - obj_frame_tiles gUnknown_836AE28, 0x100 - obj_frame_tiles gUnknown_836AE28 + 0x100, 0x100 - obj_frame_tiles gUnknown_836AE28 + 0x200, 0x100 - obj_frame_tiles gUnknown_836AE28, 0x100 - obj_frame_tiles gUnknown_836AE28, 0x100 - obj_frame_tiles gUnknown_836AE28 + 0x100, 0x100 - obj_frame_tiles gUnknown_836AE28 + 0x100, 0x100 - obj_frame_tiles gUnknown_836AE28 + 0x200, 0x100 - obj_frame_tiles gUnknown_836AE28 + 0x200, 0x100 - -gSpriteImages_83A19D8:: @ 83A19D8 - obj_frame_tiles gUnknown_836CF28, 0x100 - obj_frame_tiles gUnknown_836CF28 + 0x100, 0x100 - obj_frame_tiles gUnknown_836CF28 + 0x200, 0x100 - obj_frame_tiles gUnknown_836CF28 + 0x300, 0x100 - obj_frame_tiles gUnknown_836CF28 + 0x400, 0x100 - obj_frame_tiles gUnknown_836CF28 + 0x500, 0x100 - obj_frame_tiles gUnknown_836CF28 + 0x600, 0x100 - obj_frame_tiles gUnknown_836CF28 + 0x700, 0x100 - obj_frame_tiles gUnknown_836CF28 + 0x800, 0x100 - -gSpriteImages_83A1A20:: @ 83A1A20 - obj_frame_tiles gUnknown_836B128, 0x100 - obj_frame_tiles gUnknown_836B128 + 0x100, 0x100 - obj_frame_tiles gUnknown_836B128 + 0x200, 0x100 - obj_frame_tiles gUnknown_836B128 + 0x300, 0x100 - obj_frame_tiles gUnknown_836B128 + 0x400, 0x100 - obj_frame_tiles gUnknown_836B128 + 0x500, 0x100 - obj_frame_tiles gUnknown_836B128 + 0x600, 0x100 - obj_frame_tiles gUnknown_836B128 + 0x700, 0x100 - obj_frame_tiles gUnknown_836B128 + 0x800, 0x100 - -gSpriteImages_83A1A68:: @ 83A1A68 - obj_frame_tiles gUnknown_836BA28, 0x100 - obj_frame_tiles gUnknown_836BA28 + 0x100, 0x100 - obj_frame_tiles gUnknown_836BA28 + 0x200, 0x100 - obj_frame_tiles gUnknown_836BA28 + 0x300, 0x100 - obj_frame_tiles gUnknown_836BA28 + 0x400, 0x100 - obj_frame_tiles gUnknown_836BA28 + 0x500, 0x100 - obj_frame_tiles gUnknown_836BA28 + 0x600, 0x100 - obj_frame_tiles gUnknown_836BA28 + 0x700, 0x100 - obj_frame_tiles gUnknown_836BA28 + 0x800, 0x100 - -gSpriteImages_83A1AB0:: @ 83A1AB0 - obj_frame_tiles gUnknown_8391528, 0x100 - obj_frame_tiles gUnknown_8391528 + 0x100, 0x100 - obj_frame_tiles gUnknown_8391528 + 0x200, 0x100 - obj_frame_tiles gUnknown_8391528, 0x100 - obj_frame_tiles gUnknown_8391528, 0x100 - obj_frame_tiles gUnknown_8391528 + 0x100, 0x100 - obj_frame_tiles gUnknown_8391528 + 0x100, 0x100 - obj_frame_tiles gUnknown_8391528 + 0x200, 0x100 - obj_frame_tiles gUnknown_8391528 + 0x200, 0x100 - -gSpriteImages_83A1AF8:: @ 83A1AF8 - obj_frame_tiles gUnknown_838A428, 0x100 - obj_frame_tiles gUnknown_838A428 + 0x100, 0x100 - obj_frame_tiles gUnknown_838A428 + 0x200, 0x100 - obj_frame_tiles gUnknown_838A428 + 0x300, 0x100 - obj_frame_tiles gUnknown_838A428 + 0x400, 0x100 - obj_frame_tiles gUnknown_838A428 + 0x500, 0x100 - obj_frame_tiles gUnknown_838A428 + 0x600, 0x100 - obj_frame_tiles gUnknown_838A428 + 0x700, 0x100 - obj_frame_tiles gUnknown_838A428 + 0x800, 0x100 - -gSpriteImages_83A1B40:: @ 83A1B40 - obj_frame_tiles gUnknown_8366DA8, 0x200 - obj_frame_tiles gUnknown_8366DA8 + 0x200, 0x200 - obj_frame_tiles gUnknown_8366DA8 + 0x400, 0x200 - obj_frame_tiles gUnknown_8366DA8 + 0x600, 0x200 - obj_frame_tiles gUnknown_8366DA8 + 0x800, 0x200 - obj_frame_tiles gUnknown_8366DA8 + 0xA00, 0x200 - obj_frame_tiles gUnknown_8366DA8 + 0xC00, 0x200 - obj_frame_tiles gUnknown_8366DA8 + 0xE00, 0x200 - obj_frame_tiles gUnknown_8366DA8 + 0x1000, 0x200 - obj_frame_tiles gUnknown_8366DA8 + 0x1200, 0x200 - obj_frame_tiles gUnknown_8366DA8 + 0x1400, 0x200 - obj_frame_tiles gUnknown_8366DA8 + 0x1600, 0x200 - -gSpriteImages_83A1BA0:: @ 83A1BA0 - obj_frame_tiles gUnknown_83685A8, 0x200 - obj_frame_tiles gUnknown_83685A8 + 0x200, 0x200 - obj_frame_tiles gUnknown_83685A8 + 0x400, 0x200 - obj_frame_tiles gUnknown_83685A8 + 0x600, 0x200 - obj_frame_tiles gUnknown_83685A8 + 0x800, 0x200 - obj_frame_tiles gUnknown_83685A8 + 0xA00, 0x200 - obj_frame_tiles gUnknown_83685A8 + 0xC00, 0x200 - obj_frame_tiles gUnknown_83685A8 + 0xE00, 0x200 - obj_frame_tiles gUnknown_83685A8 + 0x1000, 0x200 - obj_frame_tiles gUnknown_83685A8 + 0x1200, 0x200 - obj_frame_tiles gUnknown_83685A8 + 0x1400, 0x200 - obj_frame_tiles gUnknown_83685A8 + 0x1600, 0x200 - -gSpriteImages_83A1C00:: @ 83A1C00 - obj_frame_tiles gUnknown_8369E28, 0x100 - -gSpriteImages_83A1C08:: @ 83A1C08 - obj_frame_tiles gUnknown_8369DA8, 0x80 - -gSpriteImages_83A1C10:: @ 83A1C10 - obj_frame_tiles gUnknown_8391828, 0x100 - obj_frame_tiles gUnknown_8391828 + 0x100, 0x100 - obj_frame_tiles gUnknown_8391828 + 0x200, 0x100 - obj_frame_tiles gUnknown_8391828, 0x100 - obj_frame_tiles gUnknown_8391828, 0x100 - obj_frame_tiles gUnknown_8391828 + 0x100, 0x100 - obj_frame_tiles gUnknown_8391828 + 0x100, 0x100 - obj_frame_tiles gUnknown_8391828 + 0x200, 0x100 - obj_frame_tiles gUnknown_8391828 + 0x200, 0x100 - -gSpriteImages_83A1C58:: @ 83A1C58 - obj_frame_tiles gUnknown_8394A28, 0x80 - -gSpriteImages_83A1C60:: @ 83A1C60 - obj_frame_tiles gUnknown_8394AA8, 0x80 - -gSpriteImages_83A1C68:: @ 83A1C68 - obj_frame_tiles gUnknown_8394B28, 0x80 - -gSpriteImages_83A1C70:: @ 83A1C70 - obj_frame_tiles gUnknown_8394BA8, 0x80 - -gSpriteImages_83A1C78:: @ 83A1C78 - obj_frame_tiles gUnknown_8394C28, 0x100 - -gSpriteImages_83A1C80:: @ 83A1C80 - obj_frame_tiles gUnknown_8394D28, 0x80 - -gSpriteImages_83A1C88:: @ 83A1C88 - obj_frame_tiles gUnknown_8394DA8, 0x80 - -gSpriteImages_83A1C90:: @ 83A1C90 - obj_frame_tiles gUnknown_8394E28, 0x80 - -gSpriteImages_83A1C98:: @ 83A1C98 - obj_frame_tiles gUnknown_8394EC8, 0x200 - -gSpriteImages_83A1CA0:: @ 83A1CA0 - obj_frame_tiles gUnknown_83950C8, 0x200 - -gSpriteImages_83A1CA8:: @ 83A1CA8 - obj_frame_tiles gUnknown_83952E8, 0x800 - obj_frame_tiles gUnknown_83952E8, 0x800 - obj_frame_tiles gUnknown_83952E8, 0x800 - obj_frame_tiles gUnknown_83952E8, 0x800 - obj_frame_tiles gUnknown_83952E8, 0x800 - obj_frame_tiles gUnknown_83952E8, 0x800 - obj_frame_tiles gUnknown_83952E8, 0x800 - obj_frame_tiles gUnknown_83952E8, 0x800 - obj_frame_tiles gUnknown_83952E8, 0x800 - -gSpriteImages_83A1CF0:: @ 83A1CF0 - obj_frame_tiles gUnknown_8395B08, 0x1000 - obj_frame_tiles gUnknown_8395B08, 0x1000 - obj_frame_tiles gUnknown_8395B08, 0x1000 - obj_frame_tiles gUnknown_8395B08, 0x1000 - obj_frame_tiles gUnknown_8395B08, 0x1000 - obj_frame_tiles gUnknown_8395B08, 0x1000 - obj_frame_tiles gUnknown_8395B08, 0x1000 - obj_frame_tiles gUnknown_8395B08, 0x1000 - obj_frame_tiles gUnknown_8395B08, 0x1000 - -gSpriteImages_83A1D38:: @ 83A1D38 - obj_frame_tiles gUnknown_83937A8, 0x200 - obj_frame_tiles gUnknown_83937A8, 0x200 - obj_frame_tiles gUnknown_83937A8, 0x200 - obj_frame_tiles gUnknown_83937A8, 0x200 - obj_frame_tiles gUnknown_83937A8, 0x200 - obj_frame_tiles gUnknown_83937A8, 0x200 - obj_frame_tiles gUnknown_83937A8, 0x200 - obj_frame_tiles gUnknown_83937A8, 0x200 - obj_frame_tiles gUnknown_83937A8, 0x200 - -gSpriteImages_83A1D80:: @ 83A1D80 - obj_frame_tiles gUnknown_83939A8, 0x80 - obj_frame_tiles gUnknown_83939A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83939A8 + 0x100, 0x80 - obj_frame_tiles gUnknown_83939A8, 0x80 - obj_frame_tiles gUnknown_83939A8, 0x80 - obj_frame_tiles gUnknown_83939A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83939A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83939A8 + 0x100, 0x80 - obj_frame_tiles gUnknown_83939A8 + 0x100, 0x80 - -gSpriteImages_83A1DC8:: @ 83A1DC8 - obj_frame_tiles gUnknown_8391E28, 0x80 - obj_frame_tiles gUnknown_8391E28 + 0x80, 0x80 - obj_frame_tiles gUnknown_8391E28 + 0x100, 0x80 - obj_frame_tiles gUnknown_8391E28, 0x80 - obj_frame_tiles gUnknown_8391E28, 0x80 - obj_frame_tiles gUnknown_8391E28 + 0x80, 0x80 - obj_frame_tiles gUnknown_8391E28 + 0x80, 0x80 - obj_frame_tiles gUnknown_8391E28 + 0x100, 0x80 - obj_frame_tiles gUnknown_8391E28 + 0x100, 0x80 - -gSpriteImages_83A1E10:: @ 83A1E10 - obj_frame_tiles gUnknown_8391FA8, 0x80 - obj_frame_tiles gUnknown_8391FA8 + 0x80, 0x80 - obj_frame_tiles gUnknown_8391FA8 + 0x100, 0x80 - obj_frame_tiles gUnknown_8391FA8, 0x80 - obj_frame_tiles gUnknown_8391FA8, 0x80 - obj_frame_tiles gUnknown_8391FA8 + 0x80, 0x80 - obj_frame_tiles gUnknown_8391FA8 + 0x80, 0x80 - obj_frame_tiles gUnknown_8391FA8 + 0x100, 0x80 - obj_frame_tiles gUnknown_8391FA8 + 0x100, 0x80 - -gSpriteImages_83A1E58:: @ 83A1E58 - obj_frame_tiles gUnknown_8392128, 0x80 - obj_frame_tiles gUnknown_8392128 + 0x80, 0x80 - obj_frame_tiles gUnknown_8392128 + 0x100, 0x80 - obj_frame_tiles gUnknown_8392128, 0x80 - obj_frame_tiles gUnknown_8392128, 0x80 - obj_frame_tiles gUnknown_8392128 + 0x80, 0x80 - obj_frame_tiles gUnknown_8392128 + 0x80, 0x80 - obj_frame_tiles gUnknown_8392128 + 0x100, 0x80 - obj_frame_tiles gUnknown_8392128 + 0x100, 0x80 - -gSpriteImages_83A1EA0:: @ 83A1EA0 - obj_frame_tiles gUnknown_837BDA8, 0x80 - obj_frame_tiles gUnknown_837BDA8 + 0x80, 0x80 - obj_frame_tiles gUnknown_837BDA8 + 0x100, 0x80 - obj_frame_tiles gUnknown_837BDA8, 0x80 - obj_frame_tiles gUnknown_837BDA8, 0x80 - obj_frame_tiles gUnknown_837BDA8 + 0x80, 0x80 - obj_frame_tiles gUnknown_837BDA8 + 0x80, 0x80 - obj_frame_tiles gUnknown_837BDA8 + 0x100, 0x80 - obj_frame_tiles gUnknown_837BDA8 + 0x100, 0x80 - -gSpriteImages_83A1EE8:: @ 83A1EE8 - obj_frame_tiles gUnknown_83922A8, 0x80 - obj_frame_tiles gUnknown_83922A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83922A8 + 0x100, 0x80 - obj_frame_tiles gUnknown_83922A8, 0x80 - obj_frame_tiles gUnknown_83922A8, 0x80 - obj_frame_tiles gUnknown_83922A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83922A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83922A8 + 0x100, 0x80 - obj_frame_tiles gUnknown_83922A8 + 0x100, 0x80 - -gSpriteImages_83A1F30:: @ 83A1F30 - obj_frame_tiles gUnknown_8392428, 0x80 - obj_frame_tiles gUnknown_8392428 + 0x80, 0x80 - obj_frame_tiles gUnknown_8392428 + 0x100, 0x80 - obj_frame_tiles gUnknown_8392428, 0x80 - obj_frame_tiles gUnknown_8392428, 0x80 - obj_frame_tiles gUnknown_8392428 + 0x80, 0x80 - obj_frame_tiles gUnknown_8392428 + 0x80, 0x80 - obj_frame_tiles gUnknown_8392428 + 0x100, 0x80 - obj_frame_tiles gUnknown_8392428 + 0x100, 0x80 - -gSpriteImages_83A1F78:: @ 83A1F78 - obj_frame_tiles gUnknown_83925A8, 0x80 - obj_frame_tiles gUnknown_83925A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83925A8 + 0x100, 0x80 - obj_frame_tiles gUnknown_83925A8, 0x80 - obj_frame_tiles gUnknown_83925A8, 0x80 - obj_frame_tiles gUnknown_83925A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83925A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83925A8 + 0x100, 0x80 - obj_frame_tiles gUnknown_83925A8 + 0x100, 0x80 - -gSpriteImages_83A1FC0:: @ 83A1FC0 - obj_frame_tiles gUnknown_8392728, 0x80 - obj_frame_tiles gUnknown_8392728 + 0x80, 0x80 - obj_frame_tiles gUnknown_8392728 + 0x100, 0x80 - obj_frame_tiles gUnknown_8392728, 0x80 - obj_frame_tiles gUnknown_8392728, 0x80 - obj_frame_tiles gUnknown_8392728 + 0x80, 0x80 - obj_frame_tiles gUnknown_8392728 + 0x80, 0x80 - obj_frame_tiles gUnknown_8392728 + 0x100, 0x80 - obj_frame_tiles gUnknown_8392728 + 0x100, 0x80 - -gSpriteImages_83A2008:: @ 83A2008 - obj_frame_tiles gUnknown_83928A8, 0x80 - obj_frame_tiles gUnknown_83928A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83928A8 + 0x100, 0x80 - obj_frame_tiles gUnknown_83928A8, 0x80 - obj_frame_tiles gUnknown_83928A8, 0x80 - obj_frame_tiles gUnknown_83928A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83928A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83928A8 + 0x100, 0x80 - obj_frame_tiles gUnknown_83928A8 + 0x100, 0x80 - -gSpriteImages_83A2050:: @ 83A2050 - obj_frame_tiles gUnknown_8392A28, 0x80 - obj_frame_tiles gUnknown_8392A28 + 0x80, 0x80 - obj_frame_tiles gUnknown_8392A28 + 0x100, 0x80 - obj_frame_tiles gUnknown_8392A28, 0x80 - obj_frame_tiles gUnknown_8392A28, 0x80 - obj_frame_tiles gUnknown_8392A28 + 0x80, 0x80 - obj_frame_tiles gUnknown_8392A28 + 0x80, 0x80 - obj_frame_tiles gUnknown_8392A28 + 0x100, 0x80 - obj_frame_tiles gUnknown_8392A28 + 0x100, 0x80 - -gSpriteImages_83A2098:: @ 83A2098 - obj_frame_tiles gUnknown_8392BA8, 0x80 - obj_frame_tiles gUnknown_8392BA8 + 0x80, 0x80 - obj_frame_tiles gUnknown_8392BA8 + 0x100, 0x80 - obj_frame_tiles gUnknown_8392BA8, 0x80 - obj_frame_tiles gUnknown_8392BA8, 0x80 - obj_frame_tiles gUnknown_8392BA8 + 0x80, 0x80 - obj_frame_tiles gUnknown_8392BA8 + 0x80, 0x80 - obj_frame_tiles gUnknown_8392BA8 + 0x100, 0x80 - obj_frame_tiles gUnknown_8392BA8 + 0x100, 0x80 - -gSpriteImages_83A20E0:: @ 83A20E0 - obj_frame_tiles gUnknown_8392D28, 0x80 - obj_frame_tiles gUnknown_8392D28 + 0x80, 0x80 - obj_frame_tiles gUnknown_8392D28 + 0x100, 0x80 - obj_frame_tiles gUnknown_8392D28, 0x80 - obj_frame_tiles gUnknown_8392D28, 0x80 - obj_frame_tiles gUnknown_8392D28 + 0x80, 0x80 - obj_frame_tiles gUnknown_8392D28 + 0x80, 0x80 - obj_frame_tiles gUnknown_8392D28 + 0x100, 0x80 - obj_frame_tiles gUnknown_8392D28 + 0x100, 0x80 - -gSpriteImages_83A2128:: @ 83A2128 - obj_frame_tiles gUnknown_8392EA8, 0x80 - obj_frame_tiles gUnknown_8392EA8 + 0x80, 0x80 - obj_frame_tiles gUnknown_8392EA8 + 0x100, 0x80 - obj_frame_tiles gUnknown_8392EA8, 0x80 - obj_frame_tiles gUnknown_8392EA8, 0x80 - obj_frame_tiles gUnknown_8392EA8 + 0x80, 0x80 - obj_frame_tiles gUnknown_8392EA8 + 0x80, 0x80 - obj_frame_tiles gUnknown_8392EA8 + 0x100, 0x80 - obj_frame_tiles gUnknown_8392EA8 + 0x100, 0x80 - -gSpriteImages_83A2170:: @ 83A2170 - obj_frame_tiles gUnknown_8393028, 0x80 - obj_frame_tiles gUnknown_8393028 + 0x80, 0x80 - obj_frame_tiles gUnknown_8393028 + 0x100, 0x80 - obj_frame_tiles gUnknown_8393028, 0x80 - obj_frame_tiles gUnknown_8393028, 0x80 - obj_frame_tiles gUnknown_8393028 + 0x80, 0x80 - obj_frame_tiles gUnknown_8393028 + 0x80, 0x80 - obj_frame_tiles gUnknown_8393028 + 0x100, 0x80 - obj_frame_tiles gUnknown_8393028 + 0x100, 0x80 - -gSpriteImages_83A21B8:: @ 83A21B8 - obj_frame_tiles gUnknown_83931A8, 0x80 - obj_frame_tiles gUnknown_83931A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83931A8 + 0x100, 0x80 - obj_frame_tiles gUnknown_83931A8, 0x80 - obj_frame_tiles gUnknown_83931A8, 0x80 - obj_frame_tiles gUnknown_83931A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83931A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83931A8 + 0x100, 0x80 - obj_frame_tiles gUnknown_83931A8 + 0x100, 0x80 - -gSpriteImages_83A2200:: @ 83A2200 - obj_frame_tiles gUnknown_8393328, 0x80 - obj_frame_tiles gUnknown_8393328 + 0x80, 0x80 - obj_frame_tiles gUnknown_8393328 + 0x100, 0x80 - obj_frame_tiles gUnknown_8393328, 0x80 - obj_frame_tiles gUnknown_8393328, 0x80 - obj_frame_tiles gUnknown_8393328 + 0x80, 0x80 - obj_frame_tiles gUnknown_8393328 + 0x80, 0x80 - obj_frame_tiles gUnknown_8393328 + 0x100, 0x80 - obj_frame_tiles gUnknown_8393328 + 0x100, 0x80 - -gSpriteImages_83A2248:: @ 83A2248 - obj_frame_tiles gUnknown_838F0A8, 0x80 - obj_frame_tiles gUnknown_838F0A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_838F0A8 + 0x100, 0x80 - obj_frame_tiles gUnknown_838F0A8, 0x80 - obj_frame_tiles gUnknown_838F0A8, 0x80 - obj_frame_tiles gUnknown_838F0A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_838F0A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_838F0A8 + 0x100, 0x80 - obj_frame_tiles gUnknown_838F0A8 + 0x100, 0x80 - -gSpriteImages_83A2290:: @ 83A2290 - obj_frame_tiles gUnknown_838F228, 0x200 - obj_frame_tiles gUnknown_838F228, 0x200 - obj_frame_tiles gUnknown_838F228, 0x200 - obj_frame_tiles gUnknown_838F228, 0x200 - obj_frame_tiles gUnknown_838F228, 0x200 - obj_frame_tiles gUnknown_838F228, 0x200 - obj_frame_tiles gUnknown_838F228, 0x200 - obj_frame_tiles gUnknown_838F228, 0x200 - obj_frame_tiles gUnknown_838F228, 0x200 - -gSpriteImages_83A22D8:: @ 83A22D8 - obj_frame_tiles gUnknown_838F428, 0x200 - obj_frame_tiles gUnknown_838F428, 0x200 - obj_frame_tiles gUnknown_838F428, 0x200 - obj_frame_tiles gUnknown_838F428, 0x200 - obj_frame_tiles gUnknown_838F428, 0x200 - obj_frame_tiles gUnknown_838F428, 0x200 - obj_frame_tiles gUnknown_838F428, 0x200 - obj_frame_tiles gUnknown_838F428, 0x200 - obj_frame_tiles gUnknown_838F428, 0x200 - -gSpriteImages_83A2320:: @ 83A2320 - obj_frame_tiles gUnknown_838F628, 0x200 - obj_frame_tiles gUnknown_838F628, 0x200 - obj_frame_tiles gUnknown_838F628, 0x200 - obj_frame_tiles gUnknown_838F628, 0x200 - obj_frame_tiles gUnknown_838F628, 0x200 - obj_frame_tiles gUnknown_838F628, 0x200 - obj_frame_tiles gUnknown_838F628, 0x200 - obj_frame_tiles gUnknown_838F628, 0x200 - obj_frame_tiles gUnknown_838F628, 0x200 - -gSpriteImages_83A2368:: @ 83A2368 - obj_frame_tiles gUnknown_8390328, 0x200 - obj_frame_tiles gUnknown_8390328, 0x200 - obj_frame_tiles gUnknown_8390328, 0x200 - obj_frame_tiles gUnknown_8390328, 0x200 - obj_frame_tiles gUnknown_8390328 + 0x200, 0x200 - obj_frame_tiles gUnknown_8390328, 0x200 - obj_frame_tiles gUnknown_8390328 + 0x200, 0x200 - obj_frame_tiles gUnknown_8390328, 0x200 - obj_frame_tiles gUnknown_8390328 + 0x200, 0x200 - -gSpriteImages_83A23B0:: @ 83A23B0 - obj_frame_tiles gUnknown_8390728, 0x200 - obj_frame_tiles gUnknown_8390728, 0x200 - obj_frame_tiles gUnknown_8390728, 0x200 - obj_frame_tiles gUnknown_8390728, 0x200 - obj_frame_tiles gUnknown_8390728 + 0x200, 0x200 - obj_frame_tiles gUnknown_8390728, 0x200 - obj_frame_tiles gUnknown_8390728 + 0x200, 0x200 - obj_frame_tiles gUnknown_8390728, 0x200 - obj_frame_tiles gUnknown_8390728 + 0x200, 0x200 - -gSpriteImages_83A23F8:: @ 83A23F8 - obj_frame_tiles gUnknown_8390B28, 0x200 - obj_frame_tiles gUnknown_8390B28, 0x200 - obj_frame_tiles gUnknown_8390B28, 0x200 - obj_frame_tiles gUnknown_8390B28, 0x200 - obj_frame_tiles gUnknown_8390B28 + 0x200, 0x200 - obj_frame_tiles gUnknown_8390B28, 0x200 - obj_frame_tiles gUnknown_8390B28 + 0x200, 0x200 - obj_frame_tiles gUnknown_8390B28, 0x200 - obj_frame_tiles gUnknown_8390B28 + 0x200, 0x200 - -gSpriteImages_83A2440:: @ 83A2440 - obj_frame_tiles gUnknown_838F828, 0x80 - obj_frame_tiles gUnknown_838F828, 0x80 - obj_frame_tiles gUnknown_838F828, 0x80 - obj_frame_tiles gUnknown_838F828, 0x80 - obj_frame_tiles gUnknown_838F828, 0x80 - obj_frame_tiles gUnknown_838F828, 0x80 - obj_frame_tiles gUnknown_838F828, 0x80 - obj_frame_tiles gUnknown_838F828, 0x80 - obj_frame_tiles gUnknown_838F828, 0x80 - -gSpriteImages_83A2488:: @ 83A2488 - obj_frame_tiles gUnknown_838F8A8, 0x80 - obj_frame_tiles gUnknown_838F8A8, 0x80 - obj_frame_tiles gUnknown_838F8A8, 0x80 - obj_frame_tiles gUnknown_838F8A8, 0x80 - obj_frame_tiles gUnknown_838F8A8, 0x80 - obj_frame_tiles gUnknown_838F8A8, 0x80 - obj_frame_tiles gUnknown_838F8A8, 0x80 - obj_frame_tiles gUnknown_838F8A8, 0x80 - obj_frame_tiles gUnknown_838F8A8, 0x80 - -gSpriteImages_83A24D0:: @ 83A24D0 - obj_frame_tiles gUnknown_838F928, 0x80 - obj_frame_tiles gUnknown_838F928, 0x80 - obj_frame_tiles gUnknown_838F928, 0x80 - obj_frame_tiles gUnknown_838F928, 0x80 - obj_frame_tiles gUnknown_838F928, 0x80 - obj_frame_tiles gUnknown_838F928, 0x80 - obj_frame_tiles gUnknown_838F928, 0x80 - obj_frame_tiles gUnknown_838F928, 0x80 - obj_frame_tiles gUnknown_838F928, 0x80 - -gSpriteImages_83A2518:: @ 83A2518 - obj_frame_tiles gUnknown_838F9A8, 0x80 - obj_frame_tiles gUnknown_838F9A8, 0x80 - obj_frame_tiles gUnknown_838F9A8, 0x80 - obj_frame_tiles gUnknown_838F9A8, 0x80 - obj_frame_tiles gUnknown_838F9A8, 0x80 - obj_frame_tiles gUnknown_838F9A8, 0x80 - obj_frame_tiles gUnknown_838F9A8, 0x80 - obj_frame_tiles gUnknown_838F9A8, 0x80 - obj_frame_tiles gUnknown_838F9A8, 0x80 - -gSpriteImages_83A2560:: @ 83A2560 - obj_frame_tiles gUnknown_838FA28, 0x80 - obj_frame_tiles gUnknown_838FA28, 0x80 - obj_frame_tiles gUnknown_838FA28, 0x80 - obj_frame_tiles gUnknown_838FA28, 0x80 - obj_frame_tiles gUnknown_838FA28, 0x80 - obj_frame_tiles gUnknown_838FA28, 0x80 - obj_frame_tiles gUnknown_838FA28, 0x80 - obj_frame_tiles gUnknown_838FA28, 0x80 - obj_frame_tiles gUnknown_838FA28, 0x80 - -gSpriteImages_83A25A8:: @ 83A25A8 - obj_frame_tiles gUnknown_838FAA8, 0x200 - obj_frame_tiles gUnknown_838FAA8, 0x200 - obj_frame_tiles gUnknown_838FAA8, 0x200 - obj_frame_tiles gUnknown_838FAA8, 0x200 - obj_frame_tiles gUnknown_838FAA8 + 0x200, 0x200 - obj_frame_tiles gUnknown_838FAA8, 0x200 - obj_frame_tiles gUnknown_838FAA8 + 0x200, 0x200 - obj_frame_tiles gUnknown_838FAA8, 0x200 - obj_frame_tiles gUnknown_838FAA8 + 0x200, 0x200 - -gSpriteImages_83A25F0:: @ 83A25F0 - obj_frame_tiles gUnknown_838FEA8, 0x200 - obj_frame_tiles gUnknown_838FEA8, 0x200 - obj_frame_tiles gUnknown_838FEA8, 0x200 - obj_frame_tiles gUnknown_838FEA8, 0x200 - obj_frame_tiles gUnknown_838FEA8 + 0x200, 0x200 - obj_frame_tiles gUnknown_838FEA8, 0x200 - obj_frame_tiles gUnknown_838FEA8 + 0x200, 0x200 - obj_frame_tiles gUnknown_838FEA8, 0x200 - obj_frame_tiles gUnknown_838FEA8 + 0x200, 0x200 - -gSpriteImages_83A2638:: @ 83A2638 - obj_frame_tiles gUnknown_83902A8, 0x80 - obj_frame_tiles gUnknown_83902A8, 0x80 - obj_frame_tiles gUnknown_83902A8, 0x80 - obj_frame_tiles gUnknown_83902A8, 0x80 - obj_frame_tiles gUnknown_83902A8, 0x80 - obj_frame_tiles gUnknown_83902A8, 0x80 - obj_frame_tiles gUnknown_83902A8, 0x80 - obj_frame_tiles gUnknown_83902A8, 0x80 - obj_frame_tiles gUnknown_83902A8, 0x80 - -gSpriteImages_83A2680:: @ 83A2680 - obj_frame_tiles gUnknown_8393B28, 0x80 - obj_frame_tiles gUnknown_8393B28 + 0x80, 0x80 - obj_frame_tiles gUnknown_8393B28 + 0x100, 0x80 - obj_frame_tiles gUnknown_8393B28, 0x80 - obj_frame_tiles gUnknown_8393B28, 0x80 - obj_frame_tiles gUnknown_8393B28 + 0x80, 0x80 - obj_frame_tiles gUnknown_8393B28 + 0x80, 0x80 - obj_frame_tiles gUnknown_8393B28 + 0x100, 0x80 - obj_frame_tiles gUnknown_8393B28 + 0x100, 0x80 - -gSpriteImages_83A26C8:: @ 83A26C8 - obj_frame_tiles gUnknown_8393CA8, 0x80 - obj_frame_tiles gUnknown_8393CA8 + 0x80, 0x80 - obj_frame_tiles gUnknown_8393CA8 + 0x100, 0x80 - obj_frame_tiles gUnknown_8393CA8, 0x80 - obj_frame_tiles gUnknown_8393CA8, 0x80 - obj_frame_tiles gUnknown_8393CA8 + 0x80, 0x80 - obj_frame_tiles gUnknown_8393CA8 + 0x80, 0x80 - obj_frame_tiles gUnknown_8393CA8 + 0x100, 0x80 - obj_frame_tiles gUnknown_8393CA8 + 0x100, 0x80 - -gSpriteImages_83A2710:: @ 83A2710 - obj_frame_tiles gUnknown_8393E28, 0x80 - obj_frame_tiles gUnknown_8393E28 + 0x80, 0x80 - obj_frame_tiles gUnknown_8393E28 + 0x100, 0x80 - obj_frame_tiles gUnknown_8393E28, 0x80 - obj_frame_tiles gUnknown_8393E28, 0x80 - obj_frame_tiles gUnknown_8393E28 + 0x80, 0x80 - obj_frame_tiles gUnknown_8393E28 + 0x80, 0x80 - obj_frame_tiles gUnknown_8393E28 + 0x100, 0x80 - obj_frame_tiles gUnknown_8393E28 + 0x100, 0x80 - -gSpriteImages_83A2758:: @ 83A2758 - obj_frame_tiles gUnknown_8393FA8, 0x80 - obj_frame_tiles gUnknown_8393FA8 + 0x80, 0x80 - obj_frame_tiles gUnknown_8393FA8 + 0x100, 0x80 - obj_frame_tiles gUnknown_8393FA8, 0x80 - obj_frame_tiles gUnknown_8393FA8, 0x80 - obj_frame_tiles gUnknown_8393FA8 + 0x80, 0x80 - obj_frame_tiles gUnknown_8393FA8 + 0x80, 0x80 - obj_frame_tiles gUnknown_8393FA8 + 0x100, 0x80 - obj_frame_tiles gUnknown_8393FA8 + 0x100, 0x80 - -gSpriteImages_83A27A0:: @ 83A27A0 - obj_frame_tiles gUnknown_8394128, 0x80 - obj_frame_tiles gUnknown_8394128 + 0x80, 0x80 - obj_frame_tiles gUnknown_8394128 + 0x100, 0x80 - obj_frame_tiles gUnknown_8394128, 0x80 - obj_frame_tiles gUnknown_8394128, 0x80 - obj_frame_tiles gUnknown_8394128 + 0x80, 0x80 - obj_frame_tiles gUnknown_8394128 + 0x80, 0x80 - obj_frame_tiles gUnknown_8394128 + 0x100, 0x80 - obj_frame_tiles gUnknown_8394128 + 0x100, 0x80 - -gSpriteImages_83A27E8:: @ 83A27E8 - obj_frame_tiles gUnknown_83942A8, 0x80 - obj_frame_tiles gUnknown_83942A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83942A8 + 0x100, 0x80 - obj_frame_tiles gUnknown_83942A8, 0x80 - obj_frame_tiles gUnknown_83942A8, 0x80 - obj_frame_tiles gUnknown_83942A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83942A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83942A8 + 0x100, 0x80 - obj_frame_tiles gUnknown_83942A8 + 0x100, 0x80 - -gSpriteImages_83A2830:: @ 83A2830 - obj_frame_tiles gUnknown_8394428, 0x80 - obj_frame_tiles gUnknown_8394428 + 0x80, 0x80 - obj_frame_tiles gUnknown_8394428 + 0x100, 0x80 - obj_frame_tiles gUnknown_8394428, 0x80 - obj_frame_tiles gUnknown_8394428, 0x80 - obj_frame_tiles gUnknown_8394428 + 0x80, 0x80 - obj_frame_tiles gUnknown_8394428 + 0x80, 0x80 - obj_frame_tiles gUnknown_8394428 + 0x100, 0x80 - obj_frame_tiles gUnknown_8394428 + 0x100, 0x80 - -gSpriteImages_83A2878:: @ 83A2878 - obj_frame_tiles gUnknown_8393628, 0x80 - obj_frame_tiles gUnknown_8393628 + 0x80, 0x80 - obj_frame_tiles gUnknown_8393628 + 0x100, 0x80 - obj_frame_tiles gUnknown_8393628, 0x80 - obj_frame_tiles gUnknown_8393628, 0x80 - obj_frame_tiles gUnknown_8393628 + 0x80, 0x80 - obj_frame_tiles gUnknown_8393628 + 0x80, 0x80 - obj_frame_tiles gUnknown_8393628 + 0x100, 0x80 - obj_frame_tiles gUnknown_8393628 + 0x100, 0x80 - -gSpriteImages_83A28C0:: @ 83A28C0 - obj_frame_tiles gUnknown_83934A8, 0x80 - obj_frame_tiles gUnknown_83934A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83934A8 + 0x100, 0x80 - obj_frame_tiles gUnknown_83934A8, 0x80 - obj_frame_tiles gUnknown_83934A8, 0x80 - obj_frame_tiles gUnknown_83934A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83934A8 + 0x80, 0x80 - obj_frame_tiles gUnknown_83934A8 + 0x100, 0x80 - obj_frame_tiles gUnknown_83934A8 + 0x100, 0x80 - -gSpriteImages_83A2908:: @ 83A2908 - obj_frame_tiles gUnknown_8391B28, 0x100 - obj_frame_tiles gUnknown_8391B28 + 0x100, 0x100 - obj_frame_tiles gUnknown_8391B28 + 0x200, 0x100 - obj_frame_tiles gUnknown_8391B28, 0x100 - obj_frame_tiles gUnknown_8391B28, 0x100 - obj_frame_tiles gUnknown_8391B28 + 0x100, 0x100 - obj_frame_tiles gUnknown_8391B28 + 0x100, 0x100 - obj_frame_tiles gUnknown_8391B28 + 0x200, 0x100 - obj_frame_tiles gUnknown_8391B28 + 0x200, 0x100 - -gAnimCmd_83A2950:: @ 83A2950 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_jump 0 - -gAnimCmd_83A2964:: @ 83A2964 - obj_image_anim_frame 0, 16 - obj_image_anim_jump 0 - -gAnimCmd_83A296C:: @ 83A296C - obj_image_anim_frame 1, 16 - obj_image_anim_jump 0 - -gAnimCmd_83A2974:: @ 83A2974 - obj_image_anim_frame 2, 16 - obj_image_anim_jump 0 - -gAnimCmd_83A297C:: @ 83A297C - obj_image_anim_frame 2, 16, 0x40 - obj_image_anim_jump 0 - -gAnimCmd_83A2984:: @ 83A2984 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 3, 8, 0x40 - obj_image_anim_frame 0, 8 - obj_image_anim_jump 0 - -gAnimCmd_83A2998:: @ 83A2998 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 4, 8, 0x40 - obj_image_anim_frame 1, 8 - obj_image_anim_jump 0 - -gAnimCmd_83A29AC:: @ 83A29AC - obj_image_anim_frame 5, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 6, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_jump 0 - -gAnimCmd_83A29C0:: @ 83A29C0 - obj_image_anim_frame 5, 8, 0x40 - obj_image_anim_frame 2, 8, 0x40 - obj_image_anim_frame 6, 8, 0x40 - obj_image_anim_frame 2, 8, 0x40 - obj_image_anim_jump 0 - -gAnimCmd_83A29D4:: @ 83A29D4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 3, 4, 0x40 - obj_image_anim_frame 0, 4 - obj_image_anim_jump 0 - -gAnimCmd_83A29E8:: @ 83A29E8 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 4, 4, 0x40 - obj_image_anim_frame 1, 4 - obj_image_anim_jump 0 - -gAnimCmd_83A29FC:: @ 83A29FC - obj_image_anim_frame 5, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_jump 0 - -gAnimCmd_83A2A10:: @ 83A2A10 - obj_image_anim_frame 5, 4, 0x40 - obj_image_anim_frame 2, 4, 0x40 - obj_image_anim_frame 6, 4, 0x40 - obj_image_anim_frame 2, 4, 0x40 - obj_image_anim_jump 0 - -gAnimCmd_83A2A24:: @ 83A2A24 - obj_image_anim_frame 3, 2 - obj_image_anim_frame 0, 2 - obj_image_anim_frame 3, 2, 0x40 - obj_image_anim_frame 0, 2 - obj_image_anim_jump 0 - -gAnimCmd_83A2A38:: @ 83A2A38 - obj_image_anim_frame 4, 2 - obj_image_anim_frame 1, 2 - obj_image_anim_frame 4, 2, 0x40 - obj_image_anim_frame 1, 2 - obj_image_anim_jump 0 - -gAnimCmd_83A2A4C:: @ 83A2A4C - obj_image_anim_frame 5, 2 - obj_image_anim_frame 2, 2 - obj_image_anim_frame 6, 2 - obj_image_anim_frame 2, 2 - obj_image_anim_jump 0 - -gAnimCmd_83A2A60:: @ 83A2A60 - obj_image_anim_frame 5, 2, 0x40 - obj_image_anim_frame 2, 2, 0x40 - obj_image_anim_frame 6, 2, 0x40 - obj_image_anim_frame 2, 2, 0x40 - obj_image_anim_jump 0 - -gAnimCmd_83A2A74:: @ 83A2A74 - obj_image_anim_frame 3, 1 - obj_image_anim_frame 0, 1 - obj_image_anim_frame 3, 1, 0x40 - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - -gAnimCmd_83A2A88:: @ 83A2A88 - obj_image_anim_frame 4, 1 - obj_image_anim_frame 1, 1 - obj_image_anim_frame 4, 1, 0x40 - obj_image_anim_frame 1, 1 - obj_image_anim_jump 0 - -gAnimCmd_83A2A9C:: @ 83A2A9C - obj_image_anim_frame 5, 1 - obj_image_anim_frame 2, 1 - obj_image_anim_frame 6, 1 - obj_image_anim_frame 2, 1 - obj_image_anim_jump 0 - -gAnimCmd_83A2AB0:: @ 83A2AB0 - obj_image_anim_frame 5, 1, 0x40 - obj_image_anim_frame 2, 1, 0x40 - obj_image_anim_frame 6, 1, 0x40 - obj_image_anim_frame 2, 1, 0x40 - obj_image_anim_jump 0 - -gAnimCmd_83A2AC4:: @ 83A2AC4 - obj_image_anim_frame 0, 16 - obj_image_anim_jump 0 - -gAnimCmd_83A2ACC:: @ 83A2ACC - obj_image_anim_frame 1, 16 - obj_image_anim_jump 0 - -gAnimCmd_83A2AD4:: @ 83A2AD4 - obj_image_anim_frame 2, 16 - obj_image_anim_jump 0 - -gAnimCmd_83A2ADC:: @ 83A2ADC - obj_image_anim_frame 2, 16, 0x40 - obj_image_anim_jump 0 - -gAnimCmd_83A2AE4:: @ 83A2AE4 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_jump 0 - -gAnimCmd_83A2AF8:: @ 83A2AF8 - obj_image_anim_frame 5, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 6, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_jump 0 - -gAnimCmd_83A2B0C:: @ 83A2B0C - obj_image_anim_frame 7, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 8, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_jump 0 - -gAnimCmd_83A2B20:: @ 83A2B20 - obj_image_anim_frame 7, 8, 0x40 - obj_image_anim_frame 2, 8, 0x40 - obj_image_anim_frame 8, 8, 0x40 - obj_image_anim_frame 2, 8, 0x40 - obj_image_anim_jump 0 - -gAnimCmd_83A2B34:: @ 83A2B34 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_jump 0 - -gAnimCmd_83A2B48:: @ 83A2B48 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_jump 0 - -gAnimCmd_83A2B5C:: @ 83A2B5C - obj_image_anim_frame 7, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 8, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_jump 0 - -gAnimCmd_83A2B70:: @ 83A2B70 - obj_image_anim_frame 7, 4, 0x40 - obj_image_anim_frame 2, 4, 0x40 - obj_image_anim_frame 8, 4, 0x40 - obj_image_anim_frame 2, 4, 0x40 - obj_image_anim_jump 0 - -gAnimCmd_83A2B84:: @ 83A2B84 - obj_image_anim_frame 3, 2 - obj_image_anim_frame 0, 2 - obj_image_anim_frame 4, 2 - obj_image_anim_frame 0, 2 - obj_image_anim_jump 0 - -gAnimCmd_83A2B98:: @ 83A2B98 - obj_image_anim_frame 5, 2 - obj_image_anim_frame 1, 2 - obj_image_anim_frame 6, 2 - obj_image_anim_frame 1, 2 - obj_image_anim_jump 0 - -gAnimCmd_83A2BAC:: @ 83A2BAC - obj_image_anim_frame 7, 2 - obj_image_anim_frame 2, 2 - obj_image_anim_frame 8, 2 - obj_image_anim_frame 2, 2 - obj_image_anim_jump 0 - -gAnimCmd_83A2BC0:: @ 83A2BC0 - obj_image_anim_frame 7, 2, 0x40 - obj_image_anim_frame 2, 2, 0x40 - obj_image_anim_frame 8, 2, 0x40 - obj_image_anim_frame 2, 2, 0x40 - obj_image_anim_jump 0 - -gAnimCmd_83A2BD4:: @ 83A2BD4 - obj_image_anim_frame 3, 1 - obj_image_anim_frame 0, 1 - obj_image_anim_frame 4, 1 - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - -gAnimCmd_83A2BE8:: @ 83A2BE8 - obj_image_anim_frame 5, 1 - obj_image_anim_frame 1, 1 - obj_image_anim_frame 6, 1 - obj_image_anim_frame 1, 1 - obj_image_anim_jump 0 - -gAnimCmd_83A2BFC:: @ 83A2BFC - obj_image_anim_frame 7, 1 - obj_image_anim_frame 2, 1 - obj_image_anim_frame 8, 1 - obj_image_anim_frame 2, 1 - obj_image_anim_jump 0 - -gAnimCmd_83A2C10:: @ 83A2C10 - obj_image_anim_frame 7, 1, 0x40 - obj_image_anim_frame 2, 1, 0x40 - obj_image_anim_frame 8, 1, 0x40 - obj_image_anim_frame 2, 1, 0x40 - obj_image_anim_jump 0 - -gAnimCmd_83A2C24:: @ 83A2C24 - obj_image_anim_frame 9, 0 - obj_image_anim_end - -gAnimCmd_83A2C2C:: @ 83A2C2C - obj_image_anim_frame 3, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_jump 0 - -gAnimCmd_83A2C40:: @ 83A2C40 - obj_image_anim_frame 3, 16 - obj_image_anim_jump 0 - -gAnimCmd_83A2C48:: @ 83A2C48 - obj_image_anim_frame 0, 60 - obj_image_anim_jump 0 - -gAnimCmd_83A2C50:: @ 83A2C50 - obj_image_anim_frame 1, 60 - obj_image_anim_jump 0 - -gAnimCmd_83A2C58:: @ 83A2C58 - obj_image_anim_frame 2, 60 - obj_image_anim_jump 0 - -gAnimCmd_83A2C60:: @ 83A2C60 - obj_image_anim_frame 2, 60, 0x40 - obj_image_anim_jump 0 - -gAnimCmd_83A2C68:: @ 83A2C68 - obj_image_anim_frame 0, 16 - obj_image_anim_jump 0 - -gAnimCmd_83A2C70:: @ 83A2C70 - obj_image_anim_frame 1, 16 - obj_image_anim_jump 0 - -gAnimCmd_83A2C78:: @ 83A2C78 - obj_image_anim_frame 2, 16 - obj_image_anim_jump 0 - -gAnimCmd_83A2C80:: @ 83A2C80 - obj_image_anim_frame 2, 16, 0x40 - obj_image_anim_jump 0 - -gAnimCmd_83A2C88:: @ 83A2C88 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_jump 0 - -gAnimCmd_83A2CAC:: @ 83A2CAC - obj_image_anim_frame 7, 4 - obj_image_anim_frame 8, 4 - obj_image_anim_frame 7, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 9, 4 - obj_image_anim_frame 10, 4 - obj_image_anim_frame 9, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_jump 0 - -gAnimCmd_83A2CD0:: @ 83A2CD0 - obj_image_anim_frame 11, 4 - obj_image_anim_frame 12, 4 - obj_image_anim_frame 11, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 13, 4 - obj_image_anim_frame 14, 4 - obj_image_anim_frame 13, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_jump 0 - -gAnimCmd_83A2CF4:: @ 83A2CF4 - obj_image_anim_frame 11, 4, 0x40 - obj_image_anim_frame 12, 4, 0x40 - obj_image_anim_frame 11, 4, 0x40 - obj_image_anim_frame 2, 4, 0x40 - obj_image_anim_frame 13, 4, 0x40 - obj_image_anim_frame 14, 4, 0x40 - obj_image_anim_frame 13, 4, 0x40 - obj_image_anim_frame 2, 4, 0x40 - obj_image_anim_jump 0 - -gAnimCmd_83A2D18:: @ 83A2D18 - obj_image_anim_frame 3, 2 - obj_image_anim_frame 4, 2 - obj_image_anim_frame 3, 2 - obj_image_anim_frame 0, 2 - obj_image_anim_frame 5, 2 - obj_image_anim_frame 6, 2 - obj_image_anim_frame 5, 2 - obj_image_anim_frame 0, 2 - obj_image_anim_jump 0 - -gAnimCmd_83A2D3C:: @ 83A2D3C - obj_image_anim_frame 7, 2 - obj_image_anim_frame 8, 2 - obj_image_anim_frame 7, 2 - obj_image_anim_frame 1, 2 - obj_image_anim_frame 9, 2 - obj_image_anim_frame 10, 2 - obj_image_anim_frame 9, 2 - obj_image_anim_frame 1, 2 - obj_image_anim_jump 0 - -gAnimCmd_83A2D60:: @ 83A2D60 - obj_image_anim_frame 11, 2 - obj_image_anim_frame 12, 2 - obj_image_anim_frame 11, 2 - obj_image_anim_frame 2, 2 - obj_image_anim_frame 13, 2 - obj_image_anim_frame 14, 2 - obj_image_anim_frame 13, 2 - obj_image_anim_frame 2, 2 - obj_image_anim_jump 0 - -gAnimCmd_83A2D84:: @ 83A2D84 - obj_image_anim_frame 11, 2, 0x40 - obj_image_anim_frame 12, 2, 0x40 - obj_image_anim_frame 11, 2, 0x40 - obj_image_anim_frame 2, 2, 0x40 - obj_image_anim_frame 13, 2, 0x40 - obj_image_anim_frame 14, 2, 0x40 - obj_image_anim_frame 13, 2, 0x40 - obj_image_anim_frame 2, 2, 0x40 - obj_image_anim_jump 0 - -gAnimCmd_83A2DA8:: @ 83A2DA8 - obj_image_anim_frame 3, 1 - obj_image_anim_frame 4, 1 - obj_image_anim_frame 3, 1 - obj_image_anim_frame 0, 1 - obj_image_anim_frame 5, 1 - obj_image_anim_frame 6, 1 - obj_image_anim_frame 5, 1 - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - -gAnimCmd_83A2DCC:: @ 83A2DCC - obj_image_anim_frame 7, 1 - obj_image_anim_frame 8, 1 - obj_image_anim_frame 7, 1 - obj_image_anim_frame 1, 1 - obj_image_anim_frame 9, 1 - obj_image_anim_frame 10, 1 - obj_image_anim_frame 9, 1 - obj_image_anim_frame 1, 1 - obj_image_anim_jump 0 - -gAnimCmd_83A2DF0:: @ 83A2DF0 - obj_image_anim_frame 11, 1 - obj_image_anim_frame 12, 1 - obj_image_anim_frame 11, 1 - obj_image_anim_frame 2, 1 - obj_image_anim_frame 13, 1 - obj_image_anim_frame 14, 1 - obj_image_anim_frame 13, 1 - obj_image_anim_frame 2, 1 - obj_image_anim_jump 0 - -gAnimCmd_83A2E14:: @ 83A2E14 - obj_image_anim_frame 11, 1, 0x40 - obj_image_anim_frame 12, 1, 0x40 - obj_image_anim_frame 11, 1, 0x40 - obj_image_anim_frame 2, 1, 0x40 - obj_image_anim_frame 13, 1, 0x40 - obj_image_anim_frame 14, 1, 0x40 - obj_image_anim_frame 13, 1, 0x40 - obj_image_anim_frame 2, 1, 0x40 - obj_image_anim_jump 0 - -gAnimCmd_83A2E38:: @ 83A2E38 - obj_image_anim_frame 3, 0 - obj_image_anim_frame 4, 0 - obj_image_anim_frame 3, 0 - obj_image_anim_frame 0, 0 - obj_image_anim_frame 5, 0 - obj_image_anim_frame 6, 0 - obj_image_anim_frame 5, 0 - obj_image_anim_frame 0, 0 - obj_image_anim_jump 0 - -gAnimCmd_83A2E5C:: @ 83A2E5C - obj_image_anim_frame 7, 0 - obj_image_anim_frame 8, 0 - obj_image_anim_frame 7, 0 - obj_image_anim_frame 1, 0 - obj_image_anim_frame 9, 0 - obj_image_anim_frame 10, 0 - obj_image_anim_frame 9, 0 - obj_image_anim_frame 1, 0 - obj_image_anim_jump 0 - -gAnimCmd_83A2E80:: @ 83A2E80 - obj_image_anim_frame 11, 0 - obj_image_anim_frame 12, 0 - obj_image_anim_frame 11, 0 - obj_image_anim_frame 2, 0 - obj_image_anim_frame 13, 0 - obj_image_anim_frame 14, 0 - obj_image_anim_frame 13, 0 - obj_image_anim_frame 2, 0 - obj_image_anim_jump 0 - -gAnimCmd_83A2EA4:: @ 83A2EA4 - obj_image_anim_frame 11, 0, 0x40 - obj_image_anim_frame 12, 0, 0x40 - obj_image_anim_frame 11, 0, 0x40 - obj_image_anim_frame 2, 0, 0x40 - obj_image_anim_frame 13, 0, 0x40 - obj_image_anim_frame 14, 0, 0x40 - obj_image_anim_frame 13, 0, 0x40 - obj_image_anim_frame 2, 0, 0x40 - obj_image_anim_jump 0 - -gAnimCmd_83A2EC8:: @ 83A2EC8 - obj_image_anim_frame 0, 2 - obj_image_anim_frame 2, 2, 0x40 - obj_image_anim_frame 1, 2 - obj_image_anim_frame 2, 2 - obj_image_anim_loop 1 - obj_image_anim_end - -gAnimCmd_83A2EE0:: @ 83A2EE0 - obj_image_anim_frame 1, 2 - obj_image_anim_frame 2, 2 - obj_image_anim_frame 0, 2 - obj_image_anim_frame 2, 2, 0x40 - obj_image_anim_loop 1 - obj_image_anim_end - -gAnimCmd_83A2EF8:: @ 83A2EF8 - obj_image_anim_frame 2, 2, 0x40 - obj_image_anim_frame 1, 2 - obj_image_anim_frame 2, 2 - obj_image_anim_frame 0, 2 - obj_image_anim_loop 1 - obj_image_anim_end - -gAnimCmd_83A2F10:: @ 83A2F10 - obj_image_anim_frame 2, 2 - obj_image_anim_frame 0, 2 - obj_image_anim_frame 2, 2, 0x40 - obj_image_anim_frame 1, 2 - obj_image_anim_loop 1 - obj_image_anim_end - -gAnimCmd_83A2F28:: @ 83A2F28 - obj_image_anim_frame 18, 16 - obj_image_anim_frame 0, 16 - obj_image_anim_frame 19, 16 - obj_image_anim_frame 0, 32 - obj_image_anim_loop 1 - obj_image_anim_end - -gAnimCmd_83A2F40:: @ 83A2F40 - obj_image_anim_frame 9, 5 - obj_image_anim_frame 10, 3 - obj_image_anim_frame 9, 5 - obj_image_anim_frame 11, 3 - obj_image_anim_jump 0 - -gAnimCmd_83A2F54:: @ 83A2F54 - obj_image_anim_frame 12, 5 - obj_image_anim_frame 13, 3 - obj_image_anim_frame 12, 5 - obj_image_anim_frame 14, 3 - obj_image_anim_jump 0 - -gAnimCmd_83A2F68:: @ 83A2F68 - obj_image_anim_frame 15, 5 - obj_image_anim_frame 16, 3 - obj_image_anim_frame 15, 5 - obj_image_anim_frame 17, 3 - obj_image_anim_jump 0 - -gAnimCmd_83A2F7C:: @ 83A2F7C - obj_image_anim_frame 15, 5, 0x40 - obj_image_anim_frame 16, 3, 0x40 - obj_image_anim_frame 15, 5, 0x40 - obj_image_anim_frame 17, 3, 0x40 - obj_image_anim_jump 0 - -gAnimCmd_83A2F90:: @ 83A2F90 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 4, 8 - obj_image_anim_end - -gAnimCmd_83A2FA8:: @ 83A2FA8 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_loop 0 - obj_image_anim_frame 7, 4 - obj_image_anim_frame 8, 4 - obj_image_anim_loop 6 - obj_image_anim_frame 6, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_end - -gAnimCmd_83A2FD8:: @ 83A2FD8 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_loop 0 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 5, 4 - obj_image_anim_loop 6 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_end - -gAnimCmd_83A300C:: @ 83A300C - obj_image_anim_frame 9, 32 - obj_image_anim_jump 0 - -gAnimCmd_83A3014:: @ 83A3014 - obj_image_anim_frame 10, 32 - obj_image_anim_jump 0 - -gAnimCmd_83A301C:: @ 83A301C - obj_image_anim_frame 11, 32 - obj_image_anim_jump 0 - -gAnimCmd_83A3024:: @ 83A3024 - obj_image_anim_frame 11, 32, 0x40 - obj_image_anim_jump 0 - -gAnimCmd_83A302C:: @ 83A302C - obj_image_anim_frame 15, 4 - obj_image_anim_frame 16, 4 - obj_image_anim_end - -gAnimCmd_83A3038:: @ 83A3038 - obj_image_anim_frame 19, 4 - obj_image_anim_frame 20, 4 - obj_image_anim_end - -gAnimCmd_83A3044:: @ 83A3044 - obj_image_anim_frame 23, 4 - obj_image_anim_frame 24, 4 - obj_image_anim_end - -gAnimCmd_83A3050:: @ 83A3050 - obj_image_anim_frame 23, 4, 0x40 - obj_image_anim_frame 24, 4, 0x40 - obj_image_anim_end - -gAnimCmd_83A305C:: @ 83A305C - obj_image_anim_frame 17, 4 - obj_image_anim_frame 18, 4 - obj_image_anim_end - -gAnimCmd_83A3068:: @ 83A3068 - obj_image_anim_frame 21, 4 - obj_image_anim_frame 22, 4 - obj_image_anim_end - -gAnimCmd_83A3074:: @ 83A3074 - obj_image_anim_frame 25, 4 - obj_image_anim_frame 26, 4 - obj_image_anim_end - -gAnimCmd_83A3080:: @ 83A3080 - obj_image_anim_frame 25, 4, 0x40 - obj_image_anim_frame 26, 4, 0x40 - obj_image_anim_end - -gAnimCmd_83A308C:: @ 83A308C - obj_image_anim_frame 15, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_end - -gAnimCmd_83A3098:: @ 83A3098 - obj_image_anim_frame 19, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_end - -gAnimCmd_83A30A4:: @ 83A30A4 - obj_image_anim_frame 23, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_end - -gAnimCmd_83A30B0:: @ 83A30B0 - obj_image_anim_frame 23, 4, 0x40 - obj_image_anim_frame 2, 4, 0x40 - obj_image_anim_end - -gAnimCmd_83A30BC:: @ 83A30BC - obj_image_anim_frame 17, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_end - -gAnimCmd_83A30C8:: @ 83A30C8 - obj_image_anim_frame 21, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_end - -gAnimCmd_83A30D4:: @ 83A30D4 - obj_image_anim_frame 25, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_end - -gAnimCmd_83A30E0:: @ 83A30E0 - obj_image_anim_frame 25, 4, 0x40 - obj_image_anim_frame 2, 4, 0x40 - obj_image_anim_end - -gAnimCmd_83A30EC:: @ 83A30EC - obj_image_anim_frame 27, 4 - obj_image_anim_frame 16, 4 - obj_image_anim_frame 28, 4 - obj_image_anim_frame 16, 4 - obj_image_anim_jump 0 - -gAnimCmd_83A3100:: @ 83A3100 - obj_image_anim_frame 29, 4 - obj_image_anim_frame 20, 4 - obj_image_anim_frame 30, 4 - obj_image_anim_frame 20, 4 - obj_image_anim_jump 0 - -gAnimCmd_83A3114:: @ 83A3114 - obj_image_anim_frame 31, 4 - obj_image_anim_frame 24, 4 - obj_image_anim_frame 32, 4 - obj_image_anim_frame 24, 4 - obj_image_anim_jump 0 - -gAnimCmd_83A3128:: @ 83A3128 - obj_image_anim_frame 31, 4, 0x40 - obj_image_anim_frame 24, 4, 0x40 - obj_image_anim_frame 32, 4, 0x40 - obj_image_anim_frame 24, 4, 0x40 - obj_image_anim_jump 0 - -gAnimCmd_83A313C:: @ 83A313C - obj_image_anim_frame 0, 32 - obj_image_anim_end - -gAnimCmd_83A3144:: @ 83A3144 - obj_image_anim_frame 1, 32 - obj_image_anim_frame 2, 32 - obj_image_anim_end - -gAnimCmd_83A3150:: @ 83A3150 - obj_image_anim_frame 3, 48 - obj_image_anim_frame 4, 48 - obj_image_anim_end - -gAnimCmd_83A315C:: @ 83A315C - obj_image_anim_frame 5, 32 - obj_image_anim_frame 5, 32 - obj_image_anim_frame 6, 32 - obj_image_anim_frame 6, 32 - obj_image_anim_end - -gAnimCmd_83A3170:: @ 83A3170 - obj_image_anim_frame 7, 48 - obj_image_anim_frame 7, 48 - obj_image_anim_frame 8, 48 - obj_image_anim_frame 8, 48 - obj_image_anim_end - -gAnimCmd_83A3184:: @ 83A3184 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 9, 32 - obj_image_anim_frame 0, 8 - obj_image_anim_end - -gAnimCmd_83A3194:: @ 83A3194 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_end - -gAnimCmd_83A31A8:: @ 83A31A8 - obj_image_anim_frame 0, 6 - obj_image_anim_frame 1, 6 - obj_image_anim_frame 2, 6 - obj_image_anim_frame 3, 6 - obj_image_anim_end - -gAnimCmd_83A31BC:: @ 83A31BC - obj_image_anim_frame 8, 4 - obj_image_anim_frame 9, 4 - obj_image_anim_frame 10, 4 - obj_image_anim_frame 11, 4 - obj_image_anim_end - -gAnimCmd_83A31D0:: @ 83A31D0 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_frame 7, 4 - obj_image_anim_end - -gAnimCmd_83A31E4:: @ 83A31E4 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_end - -gAnimCmd_83A31F8:: @ 83A31F8 - obj_image_anim_frame 0, 4, 0x40 - obj_image_anim_frame 1, 4, 0x40 - obj_image_anim_frame 2, 4, 0x40 - obj_image_anim_frame 3, 4, 0x40 - obj_image_anim_end - -gAnimCmd_83A320C:: @ 83A320C - obj_image_anim_frame 11, 4 - obj_image_anim_frame 10, 6 - obj_image_anim_frame 9, 6 - obj_image_anim_frame 8, 6 - obj_image_anim_end - -gAnimCmd_83A3220:: @ 83A3220 - obj_image_anim_frame 7, 4 - obj_image_anim_frame 6, 6 - obj_image_anim_frame 5, 6 - obj_image_anim_frame 4, 6 - obj_image_anim_end - -gAnimCmd_83A3234:: @ 83A3234 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_end - -gAnimCmd_83A3248:: @ 83A3248 - obj_image_anim_frame 3, 4, 0x40 - obj_image_anim_frame 2, 4, 0x40 - obj_image_anim_frame 1, 4, 0x40 - obj_image_anim_frame 0, 4, 0x40 - obj_image_anim_end - -gAnimCmd_83A325C:: @ 83A325C - obj_image_anim_frame 10, 6 - obj_image_anim_frame 11, 6 - obj_image_anim_loop 1 - obj_image_anim_frame 11, 30 - obj_image_anim_jump 0 - -gAnimCmd_83A3270:: @ 83A3270 - obj_image_anim_frame 6, 6 - obj_image_anim_frame 7, 6 - obj_image_anim_loop 1 - obj_image_anim_frame 7, 30 - obj_image_anim_jump 0 - -gAnimCmd_83A3284:: @ 83A3284 - obj_image_anim_frame 2, 6 - obj_image_anim_frame 3, 6 - obj_image_anim_loop 1 - obj_image_anim_frame 3, 30 - obj_image_anim_jump 0 - -gAnimCmd_83A3298:: @ 83A3298 - obj_image_anim_frame 2, 6, 0x40 - obj_image_anim_frame 3, 6, 0x40 - obj_image_anim_loop 1 - obj_image_anim_frame 3, 30, 0x40 - obj_image_anim_jump 0 - -gUnknown_83A32AC:: @ 83A32AC - obj_rot_scal_anim_frame 0, 0, 1, 1 - obj_rot_scal_anim_frame 0, 0, 0, 1 - obj_rot_scal_anim_frame 0, 0, 0, 1 - obj_rot_scal_anim_frame 0, 0, 0, 1 - obj_rot_scal_anim_loop 7 - obj_rot_scal_anim_jump 0 - -gUnknown_83A32DC:: @ 83A32DC - obj_rot_scal_anim_frame 0, 0, -1, 1 - obj_rot_scal_anim_frame 0, 0, 0, 1 - obj_rot_scal_anim_loop 15 - obj_rot_scal_anim_frame 0, 0, 1, 1 - obj_rot_scal_anim_frame 0, 0, 0, 1 - obj_rot_scal_anim_loop 15 - obj_rot_scal_anim_jump 0 - -gAnimTable_83A3314:: @ 83A3314 - .4byte gAnimCmd_83A2950 -gAnimTable_83A3318:: @ 83A3318 - .4byte gAnimCmd_83A2964 - .4byte gAnimCmd_83A296C - .4byte gAnimCmd_83A2974 - .4byte gAnimCmd_83A297C - .4byte gAnimCmd_83A2984 - .4byte gAnimCmd_83A2998 - .4byte gAnimCmd_83A29AC - .4byte gAnimCmd_83A29C0 - .4byte gAnimCmd_83A29D4 - .4byte gAnimCmd_83A29E8 - .4byte gAnimCmd_83A29FC - .4byte gAnimCmd_83A2A10 - .4byte gAnimCmd_83A2A24 - .4byte gAnimCmd_83A2A38 - .4byte gAnimCmd_83A2A4C - .4byte gAnimCmd_83A2A60 - .4byte gAnimCmd_83A2A74 - .4byte gAnimCmd_83A2A88 - .4byte gAnimCmd_83A2A9C - .4byte gAnimCmd_83A2AB0 - -gAnimTable_83A3368:: @ 83A3368 - .4byte gAnimCmd_83A2AC4 - .4byte gAnimCmd_83A2ACC - .4byte gAnimCmd_83A2AD4 - .4byte gAnimCmd_83A2ADC - .4byte gAnimCmd_83A2AE4 - .4byte gAnimCmd_83A2AF8 - .4byte gAnimCmd_83A2B0C - .4byte gAnimCmd_83A2B20 - .4byte gAnimCmd_83A2B34 - .4byte gAnimCmd_83A2B48 - .4byte gAnimCmd_83A2B5C - .4byte gAnimCmd_83A2B70 - .4byte gAnimCmd_83A2B84 - .4byte gAnimCmd_83A2B98 - .4byte gAnimCmd_83A2BAC - .4byte gAnimCmd_83A2BC0 - .4byte gAnimCmd_83A2BD4 - .4byte gAnimCmd_83A2BE8 - .4byte gAnimCmd_83A2BFC - .4byte gAnimCmd_83A2C10 - .4byte gAnimCmd_83A2C24 - -gAnimTable_83A33BC:: @ 83A33BC - .4byte gAnimCmd_83A2AC4 - .4byte gAnimCmd_83A2ACC - .4byte gAnimCmd_83A2AD4 - .4byte gAnimCmd_83A2ADC - .4byte gAnimCmd_83A2C2C - .4byte gAnimCmd_83A2C40 - .4byte gAnimCmd_83A2B0C - .4byte gAnimCmd_83A2B20 - .4byte gAnimCmd_83A2B34 - .4byte gAnimCmd_83A2B48 - .4byte gAnimCmd_83A2B5C - .4byte gAnimCmd_83A2B70 - .4byte gAnimCmd_83A2B84 - .4byte gAnimCmd_83A2B98 - .4byte gAnimCmd_83A2BAC - .4byte gAnimCmd_83A2BC0 - .4byte gAnimCmd_83A2BD4 - .4byte gAnimCmd_83A2BE8 - .4byte gAnimCmd_83A2BFC - .4byte gAnimCmd_83A2C10 - .4byte gAnimCmd_83A2C24 - -gAnimTable_83A3410:: - .4byte gAnimCmd_83A2C68 - .4byte gAnimCmd_83A2C70 - .4byte gAnimCmd_83A2C78 - .4byte gAnimCmd_83A2C80 - .4byte gAnimCmd_83A2C88 - .4byte gAnimCmd_83A2CAC - .4byte gAnimCmd_83A2CD0 - .4byte gAnimCmd_83A2CF4 - .4byte gAnimCmd_83A2D18 - .4byte gAnimCmd_83A2D3C - .4byte gAnimCmd_83A2D60 - .4byte gAnimCmd_83A2D84 - .4byte gAnimCmd_83A2DA8 - .4byte gAnimCmd_83A2DCC - .4byte gAnimCmd_83A2DF0 - .4byte gAnimCmd_83A2E14 - .4byte gAnimCmd_83A2E38 - .4byte gAnimCmd_83A2E5C - .4byte gAnimCmd_83A2E80 - .4byte gAnimCmd_83A2EA4 - .4byte gAnimCmd_83A2F40 - .4byte gAnimCmd_83A2F54 - .4byte gAnimCmd_83A2F68 - .4byte gAnimCmd_83A2F7C - -gAnimTable_83A3470:: @ 83A3470 - .4byte gAnimCmd_83A2AC4 - .4byte gAnimCmd_83A2ACC - .4byte gAnimCmd_83A2AD4 - .4byte gAnimCmd_83A2ADC - .4byte gAnimCmd_83A2AE4 - .4byte gAnimCmd_83A2AF8 - .4byte gAnimCmd_83A2B0C - .4byte gAnimCmd_83A2B20 - .4byte gAnimCmd_83A2B34 - .4byte gAnimCmd_83A2B48 - .4byte gAnimCmd_83A2B5C - .4byte gAnimCmd_83A2B70 - .4byte gAnimCmd_83A2B84 - .4byte gAnimCmd_83A2B98 - .4byte gAnimCmd_83A2BAC - .4byte gAnimCmd_83A2BC0 - .4byte gAnimCmd_83A2BD4 - .4byte gAnimCmd_83A2BE8 - .4byte gAnimCmd_83A2BFC - .4byte gAnimCmd_83A2C10 - .4byte gAnimCmd_83A2F40 - .4byte gAnimCmd_83A2F54 - .4byte gAnimCmd_83A2F68 - .4byte gAnimCmd_83A2F7C - .4byte gAnimCmd_83A2EC8 - .4byte gAnimCmd_83A2EE0 - .4byte gAnimCmd_83A2EF8 - .4byte gAnimCmd_83A2F10 - .4byte gAnimCmd_83A2F28 - -gAnimTable_83A34E4:: - .4byte gAnimCmd_83A2AC4 - .4byte gAnimCmd_83A2ACC - .4byte gAnimCmd_83A2AD4 - .4byte gAnimCmd_83A2ADC - .4byte gAnimCmd_83A2AE4 - .4byte gAnimCmd_83A2AF8 - .4byte gAnimCmd_83A2B0C - .4byte gAnimCmd_83A2B20 - .4byte gAnimCmd_83A2B34 - .4byte gAnimCmd_83A2B48 - .4byte gAnimCmd_83A2B5C - .4byte gAnimCmd_83A2B70 - .4byte gAnimCmd_83A2B84 - .4byte gAnimCmd_83A2B98 - .4byte gAnimCmd_83A2BAC - .4byte gAnimCmd_83A2BC0 - .4byte gAnimCmd_83A2BD4 - .4byte gAnimCmd_83A2BE8 - .4byte gAnimCmd_83A2BFC - .4byte gAnimCmd_83A2C10 - .4byte gAnimCmd_83A302C - .4byte gAnimCmd_83A3038 - .4byte gAnimCmd_83A3044 - .4byte gAnimCmd_83A3050 - .4byte gAnimCmd_83A305C - .4byte gAnimCmd_83A3068 - .4byte gAnimCmd_83A3074 - .4byte gAnimCmd_83A3080 - .4byte gAnimCmd_83A308C - .4byte gAnimCmd_83A3098 - .4byte gAnimCmd_83A30A4 - .4byte gAnimCmd_83A30B0 - .4byte gAnimCmd_83A30BC - .4byte gAnimCmd_83A30C8 - .4byte gAnimCmd_83A30D4 - .4byte gAnimCmd_83A30E0 - .4byte gAnimCmd_83A30EC - .4byte gAnimCmd_83A3100 - .4byte gAnimCmd_83A3114 - .4byte gAnimCmd_83A3128 - -gAnimTable_83A3584:: @ 83A3584 - .4byte gAnimCmd_83A2C48 - .4byte gAnimCmd_83A2C50 - .4byte gAnimCmd_83A2C58 - .4byte gAnimCmd_83A2C60 - .4byte gAnimCmd_83A2C48 - .4byte gAnimCmd_83A2C50 - .4byte gAnimCmd_83A2C58 - .4byte gAnimCmd_83A2C60 - .4byte gAnimCmd_83A2C48 - .4byte gAnimCmd_83A2C50 - .4byte gAnimCmd_83A2C58 - .4byte gAnimCmd_83A2C60 - .4byte gAnimCmd_83A2C48 - .4byte gAnimCmd_83A2C50 - .4byte gAnimCmd_83A2C58 - .4byte gAnimCmd_83A2C60 - .4byte gAnimCmd_83A2C48 - .4byte gAnimCmd_83A2C50 - .4byte gAnimCmd_83A2C58 - .4byte gAnimCmd_83A2C60 - .4byte gAnimCmd_83A300C - .4byte gAnimCmd_83A3014 - .4byte gAnimCmd_83A301C - .4byte gAnimCmd_83A3024 - -gAnimTable_83A35E4:: @ 83A35E4 - .4byte gAnimCmd_83A2AC4 - .4byte gAnimCmd_83A2ACC - .4byte gAnimCmd_83A2AD4 - .4byte gAnimCmd_83A2ADC - .4byte gAnimCmd_83A2AE4 - .4byte gAnimCmd_83A2AF8 - .4byte gAnimCmd_83A2B0C - .4byte gAnimCmd_83A2B20 - .4byte gAnimCmd_83A2B34 - .4byte gAnimCmd_83A2B48 - .4byte gAnimCmd_83A2B5C - .4byte gAnimCmd_83A2B70 - .4byte gAnimCmd_83A2B84 - .4byte gAnimCmd_83A2B98 - .4byte gAnimCmd_83A2BAC - .4byte gAnimCmd_83A2BC0 - .4byte gAnimCmd_83A2BD4 - .4byte gAnimCmd_83A2BE8 - .4byte gAnimCmd_83A2BFC - .4byte gAnimCmd_83A2C10 - .4byte gAnimCmd_83A3184 - -gAnimTable_83A3638:: @ 83A3638 - .4byte gAnimCmd_83A2F90 - -gAnimTable_83A363C:: @ 83A363C - .4byte gAnimCmd_83A2FA8 - -gAnimTable_83A3640:: @ 83A3640 - .4byte gAnimCmd_83A2FD8 - .4byte gAnimCmd_83A313C - .4byte gAnimCmd_83A3144 - .4byte gAnimCmd_83A3150 - .4byte gAnimCmd_83A315C - .4byte gAnimCmd_83A3170 - -gAnimTable_83A3658:: @ 83A3658 - .4byte gAnimCmd_83A2950 - .4byte gAnimCmd_83A3194 - -gAnimTable_83A3660:: @ 83A3660 - .4byte gAnimCmd_83A2950 - .4byte gAnimCmd_83A31A8 - -gAnimTable_83A3668:: @ 83A3668 - .4byte gAnimCmd_83A31BC - .4byte gAnimCmd_83A31D0 - .4byte gAnimCmd_83A31E4 - .4byte gAnimCmd_83A31F8 - .4byte gAnimCmd_83A320C - .4byte gAnimCmd_83A3220 - .4byte gAnimCmd_83A3234 - .4byte gAnimCmd_83A3248 - .4byte gAnimCmd_83A325C - .4byte gAnimCmd_83A3270 - .4byte gAnimCmd_83A3284 - .4byte gAnimCmd_83A3298 - -gUnknown_83A3698:: @ 83A3698 - .4byte gAnimTable_83A3318 - .byte 1, 3, 0, 2 - .4byte gAnimTable_83A3368 - .byte 1, 3, 0, 2 - .4byte gAnimTable_83A3470 - .byte 1, 3, 0, 2 - .4byte gAnimTable_83A34E4 - .byte 1, 3, 0, 2 - .4byte gAnimTable_83A3584 - .byte 1, 3, 0, 2 - .4byte gAnimTable_83A35E4 - .byte 1, 3, 0, 2 - .4byte gAnimTable_83A3668 - .byte 1, 3, 0, 2 - .4byte gAnimTable_83A3410 - .byte 3, 7, 0, 4 - .4byte 0x00000000, 0x00000000 - -gObjectEventBaseOam_128x64:: - .4byte 0x00000000, 0x00000800 - -gObjectEventBaseOam_Unknown1:: - .4byte 0x00004000, 0x00000800 - -gObjectEventBaseOam_16x16:: - .4byte 0x40000000, 0x00000800 - -gObjectEventBaseOam_32x16:: - .4byte 0x80004000, 0x00000800 - -gObjectEventBaseOam_Unknown2:: - .4byte 0x40004000, 0x00000800 - -gObjectEventBaseOam_Unknown3:: - .4byte 0xc0004000, 0x00000800 - -gObjectEventBaseOam_16x32:: - .4byte 0x80008000, 0x00000800 - -gObjectEventBaseOam_32x32:: @ 83A3718 - .4byte 0x80000000, 0x00000800 - -gObjectEventBaseOam_64x64:: @ 83A3720 - .4byte 0xc0000000, 0x00000800 - -gSubsprites_83A3728:: @ 83A3728 - subsprite 248, 248, 2, 0x0000, 16x16 - -gSubsprites_83A372C:: @ 83A372C - subsprite 248, 248, 1, 0x0000, 16x16 - -gSubsprites_83A3730:: @ 83A3730 - subsprite 248, 248, 2, 0x0000, 16x8 - subsprite 248, 0, 3, 0x0002, 16x8 - -gSubsprites_83A3738:: @ 83A3738 - subsprite 248, 248, 2, 0x0000, 16x16 - subsprite 248, 248, 3, 0x0000, 16x16 - -gSubsprites_83A3740:: @ 83A3740 - subsprite 248, 248, 1, 0x0000, 16x16 - subsprite 248, 248, 3, 0x0000, 16x16 - -gSubspriteTables_83A3748:: @ 83A3748 - .byte 0 - .align 2 - .4byte NULL - .byte 1 - .align 2 - .4byte gSubsprites_83A3728 - .byte 1 - .align 2 - .4byte gSubsprites_83A372C - .byte 2 - .align 2 - .4byte gSubsprites_83A3730 - .byte 2 - .align 2 - .4byte gSubsprites_83A3738 - .byte 2 - .align 2 - .4byte gSubsprites_83A3740 - -gSubsprites_83A3778:: @ 83A3778 - subsprite 248, 240, 2, 0x0000, 16x32 - -gSubsprites_83A377C:: @ 83A377C - subsprite 248, 240, 1, 0x0000, 16x32 - -gSubsprites_83A3780:: @ 83A3780 - subsprite 248, 240, 2, 0x0000, 16x16 - subsprite 248, 0, 2, 0x0004, 16x8 - subsprite 248, 8, 3, 0x0006, 16x8 - -gSubsprites_83A378C:: @ 83A378C - subsprite 248, 240, 2, 0x0000, 16x16 - subsprite 248, 0, 3, 0x0004, 16x16 - -gSubsprites_83A3794:: @ 83A3794 - subsprite 248, 240, 1, 0x0000, 16x16 - subsprite 248, 0, 3, 0x0004, 16x16 - -gSubspriteTables_83A379C:: @ 83A379C - .byte 0 - .align 2 - .4byte NULL - .byte 1 - .align 2 - .4byte gSubsprites_83A3778 - .byte 1 - .align 2 - .4byte gSubsprites_83A377C - .byte 3 - .align 2 - .4byte gSubsprites_83A3780 - .byte 2 - .align 2 - .4byte gSubsprites_83A378C - .byte 2 - .align 2 - .4byte gSubsprites_83A3794 - -gSubsprites_83A37CC:: @ 83A37CC - subsprite 240, 240, 2, 0x0000, 32x32 - -gSubsprites_83A37D0:: @ 83A37D0 - subsprite 240, 240, 1, 0x0000, 32x32 - -gSubsprites_83A37D4:: @ 83A37D4 - subsprite 240, 240, 2, 0x0000, 32x16 - subsprite 240, 0, 2, 0x0008, 32x8 - subsprite 240, 8, 3, 0x000c, 32x8 - -gSubsprites_83A37E0:: @ 83A37E0 - subsprite 240, 240, 2, 0x0000, 32x16 - subsprite 240, 0, 3, 0x0008, 32x16 - -gSubsprites_83A37E8:: @ 83A37E8 - subsprite 240, 240, 1, 0x0000, 32x16 - subsprite 240, 0, 3, 0x0008, 32x16 - -gSubspriteTables_83A37F0:: @ 83A37F0 - .byte 0 - .align 2 - .4byte NULL - .byte 1 - .align 2 - .4byte gSubsprites_83A37CC - .byte 1 - .align 2 - .4byte gSubsprites_83A37D0 - .byte 3 - .align 2 - .4byte gSubsprites_83A37D4 - .byte 2 - .align 2 - .4byte gSubsprites_83A37E0 - .byte 2 - .align 2 - .4byte gSubsprites_83A37E8 - -gUnknown_83A3820:: @ 83A3820 - subsprite 232, 232, 2, 0, 32x8 - subsprite 8, 232, 2, 4, 16x8 - subsprite 232, 240, 2, 6, 32x8 - subsprite 8, 240, 2, 10, 16x8 - subsprite 232, 248, 2, 12, 32x8 - subsprite 8, 248, 2, 16, 16x8 - subsprite 232, 0, 2, 18, 32x8 - subsprite 8, 0, 2, 22, 16x8 - subsprite 232, 8, 2, 24, 32x8 - subsprite 8, 8, 2, 28, 16x8 - subsprite 232, 16, 2, 30, 32x8 - subsprite 8, 16, 2, 34, 16x8 - -gUnknown_83A3850:: @ 83A3850 - .byte 0xC - .align 2 - .4byte gUnknown_83A3820 - .byte 0xC - .align 2 - .4byte gUnknown_83A3820 - .byte 0xC - .align 2 - .4byte gUnknown_83A3820 - .byte 0xC - .align 2 - .4byte gUnknown_83A3820 - .byte 0xC - .align 2 - .4byte gUnknown_83A3820 - .byte 0xC - .align 2 - .4byte gUnknown_83A3820 - -gUnknown_83A3880:: @ 83A3880 - subsprite 224, 240, 2, 0, 64x32 - -gUnknown_83A3884:: @ 83A3884 - subsprite 224, 240, 1, 0, 64x32 - -gUnknown_83A3888:: @ 83A3888 - subsprite 224, 240, 2, 0, 64x32 - -gUnknown_83A388C:: @ 83A388C - subsprite 224, 240, 2, 0, 64x32 - -gUnknown_83A3890:: @ 83A3890 - .byte 0x0 - .align 2 - .4byte NULL - .byte 1 - .align 2 - .4byte gUnknown_83A3880 - .byte 1 - .align 2 - .4byte gUnknown_83A3884 - .byte 1 - .align 2 - .4byte gUnknown_83A3888 - .byte 1 - .align 2 - .4byte gUnknown_83A388C - .byte 1 - .align 2 - .4byte gUnknown_83A388C - -gSubsprites_83A38C0:: @ 83A38C0 - subsprite 224, 224, 2, 0x0000, 64x64 - -gSubsprites_83A38C4:: @ 83A38C4 - subsprite 224, 224, 1, 0x0000, 64x64 - -gSubsprites_83A38C8:: @ 83A38C8 - subsprite 224, 224, 2, 0x0000, 64x64 - -gSubsprites_83A38CC:: @ 83A38CC - subsprite 224, 224, 2, 0x0000, 64x64 - -gSubspriteTables_83A38D0:: @ 83A38D0 - .byte 0 - .align 2 - .4byte NULL - .byte 1 - .align 2 - .4byte gSubsprites_83A38C0 - .byte 1 - .align 2 - .4byte gSubsprites_83A38C4 - .byte 1 - .align 2 - .4byte gSubsprites_83A38C8 - .byte 1 - .align 2 - .4byte gSubsprites_83A38CC - .byte 1 - .align 2 - .4byte gSubsprites_83A38CC - -gUnknown_83A3900:: @ 83A3900 - subsprite 208, 236, 2, 0, 32x8 - subsprite 240, 236, 2, 4, 32x8 - subsprite 16, 236, 2, 8, 32x8 - subsprite 208, 244, 2, 12, 32x8 - subsprite 240, 244, 2, 16, 32x8 - subsprite 16, 244, 2, 20, 32x8 - subsprite 208, 252, 2, 24, 32x8 - subsprite 240, 252, 2, 28, 32x8 - subsprite 16, 252, 2, 32, 32x8 - subsprite 208, 4, 2, 36, 32x8 - subsprite 240, 4, 2, 40, 32x8 - subsprite 16, 4, 2, 44, 32x8 - subsprite 208, 12, 2, 48, 32x8 - subsprite 240, 12, 2, 52, 32x8 - subsprite 16, 12, 2, 56, 32x8 - -gUnknown_83A393C:: @ 83A393C - subsprite 208, 236, 1, 0, 32x8 - subsprite 240, 236, 1, 4, 32x8 - subsprite 16, 236, 1, 8, 32x8 - subsprite 208, 244, 1, 12, 32x8 - subsprite 240, 244, 1, 16, 32x8 - subsprite 16, 244, 1, 20, 32x8 - subsprite 208, 252, 1, 24, 32x8 - subsprite 240, 252, 1, 28, 32x8 - subsprite 16, 252, 1, 32, 32x8 - subsprite 208, 4, 1, 36, 32x8 - subsprite 240, 4, 1, 40, 32x8 - subsprite 16, 4, 1, 44, 32x8 - subsprite 208, 12, 1, 48, 32x8 - subsprite 240, 12, 1, 52, 32x8 - subsprite 16, 12, 1, 56, 32x8 - -gUnknown_83A3978:: @ 83A3978 - subsprite 208, 236, 2, 0, 32x8 - subsprite 240, 236, 2, 4, 32x8 - subsprite 16, 236, 2, 8, 32x8 - subsprite 208, 244, 2, 12, 32x8 - subsprite 240, 244, 2, 16, 32x8 - subsprite 16, 244, 2, 20, 32x8 - subsprite 208, 252, 2, 24, 32x8 - subsprite 240, 252, 2, 28, 32x8 - subsprite 16, 252, 2, 32, 32x8 - subsprite 208, 4, 2, 36, 32x8 - subsprite 240, 4, 2, 40, 32x8 - subsprite 16, 4, 2, 44, 32x8 - subsprite 208, 12, 2, 48, 32x8 - subsprite 240, 12, 2, 52, 32x8 - subsprite 16, 12, 2, 56, 32x8 - -gUnknown_83A39B4:: @ 83A39B4 - subsprite 208, 236, 1, 0, 32x8 - subsprite 240, 236, 1, 4, 32x8 - subsprite 16, 236, 1, 8, 32x8 - subsprite 208, 244, 1, 12, 32x8 - subsprite 240, 244, 1, 16, 32x8 - subsprite 16, 244, 1, 20, 32x8 - subsprite 208, 252, 2, 24, 32x8 - subsprite 240, 252, 2, 28, 32x8 - subsprite 16, 252, 2, 32, 32x8 - subsprite 208, 4, 2, 36, 32x8 - subsprite 240, 4, 2, 40, 32x8 - subsprite 16, 4, 2, 44, 32x8 - subsprite 208, 12, 2, 48, 32x8 - subsprite 240, 12, 2, 52, 32x8 - subsprite 16, 12, 2, 56, 32x8 - -gUnknown_83A39F0:: @ 83A39F0 - .byte 0xF - .align 2 - .4byte gUnknown_83A3900 - .byte 0xF - .align 2 - .4byte gUnknown_83A3900 - .byte 0xF - .align 2 - .4byte gUnknown_83A393C - .byte 0xF - .align 2 - .4byte gUnknown_83A3978 - .byte 0xF - .align 2 - .4byte gUnknown_83A39B4 - .byte 0xF - .align 2 - .4byte gUnknown_83A39B4 - -gSubsprites_83A3A20:: @ 83A3A20 - subsprite 224, 240, 2, 0x0000, 64x32 - subsprite 32, 240, 2, 0x0020, 64x32 - subsprite 224, 16, 2, 0x0040, 64x32 - subsprite 32, 16, 2, 0x0060, 64x32 - -gSubsprites_83A3A30:: @ 83A3A30 - subsprite 224, 240, 1, 0x0000, 64x32 - subsprite 32, 240, 1, 0x0020, 64x32 - subsprite 224, 16, 1, 0x0040, 64x32 - subsprite 32, 16, 1, 0x0060, 64x32 - -gSubsprites_83A3A40:: @ 83A3A40 - subsprite 224, 240, 1, 0x0000, 64x32 - subsprite 32, 240, 1, 0x0020, 64x32 - subsprite 224, 16, 2, 0x0040, 64x32 - subsprite 32, 16, 2, 0x0060, 64x32 - -gSubspriteTables_83A3A50:: @ 83A3A50 - .byte 4 - .align 2 - .4byte gSubsprites_83A3A20 - .byte 4 - .align 2 - .4byte gSubsprites_83A3A20 - .byte 4 - .align 2 - .4byte gSubsprites_83A3A30 - .byte 4 - .align 2 - .4byte gSubsprites_83A3A40 - .byte 4 - .align 2 - .4byte gSubsprites_83A3A40 - .byte 4 - .align 2 - .4byte gSubsprites_83A3A40 - -gUnknown_83A3A80:: @ 83A3A80 - subsprite 208, 236, 2, 0, 32x8 - subsprite 240, 236, 2, 4, 32x8 - subsprite 16, 236, 2, 8, 16x8 - subsprite 32, 236, 2, 10, 8x8 - subsprite 208, 244, 2, 11, 32x8 - subsprite 240, 244, 2, 15, 32x8 - subsprite 16, 244, 2, 19, 16x8 - subsprite 32, 244, 2, 21, 8x8 - subsprite 208, 252, 2, 22, 32x8 - subsprite 240, 252, 2, 26, 32x8 - subsprite 16, 252, 2, 30, 16x8 - subsprite 32, 252, 2, 32, 8x8 - subsprite 208, 4, 2, 33, 32x8 - subsprite 240, 4, 2, 37, 32x8 - subsprite 16, 4, 2, 41, 16x8 - subsprite 32, 4, 2, 43, 8x8 - -gUnknown_83A3AC0:: @ 83A3AC0 - subsprite 208, 236, 1, 0, 32x8 - subsprite 240, 236, 1, 4, 32x8 - subsprite 16, 236, 1, 8, 16x8 - subsprite 32, 236, 1, 10, 8x8 - subsprite 208, 244, 1, 11, 32x8 - subsprite 240, 244, 1, 15, 32x8 - subsprite 16, 244, 1, 19, 16x8 - subsprite 32, 244, 1, 21, 8x8 - subsprite 208, 252, 1, 22, 32x8 - subsprite 240, 252, 1, 26, 32x8 - subsprite 16, 252, 1, 30, 16x8 - subsprite 32, 252, 1, 32, 8x8 - subsprite 208, 4, 1, 33, 32x8 - subsprite 240, 4, 1, 37, 32x8 - subsprite 16, 4, 1, 41, 16x8 - subsprite 32, 4, 1, 43, 8x8 - -gUnknown_83A3B00:: @ 83A3B00 - subsprite 208, 236, 2, 0, 32x8 - subsprite 240, 236, 2, 4, 32x8 - subsprite 16, 236, 2, 8, 16x8 - subsprite 32, 236, 2, 10, 8x8 - subsprite 208, 244, 2, 11, 32x8 - subsprite 240, 244, 2, 15, 32x8 - subsprite 16, 244, 2, 19, 16x8 - subsprite 32, 244, 2, 21, 8x8 - subsprite 208, 252, 2, 22, 32x8 - subsprite 240, 252, 2, 26, 32x8 - subsprite 16, 252, 2, 30, 16x8 - subsprite 32, 252, 2, 32, 8x8 - subsprite 208, 4, 2, 33, 32x8 - subsprite 240, 4, 2, 37, 32x8 - subsprite 16, 4, 2, 41, 16x8 - subsprite 32, 4, 2, 43, 8x8 - -gUnknown_83A3B40:: @ 83A3B40 - subsprite 208, 236, 1, 0, 32x8 - subsprite 240, 236, 1, 4, 32x8 - subsprite 16, 236, 1, 8, 16x8 - subsprite 32, 236, 1, 10, 8x8 - subsprite 208, 244, 1, 11, 32x8 - subsprite 240, 244, 1, 15, 32x8 - subsprite 16, 244, 1, 19, 16x8 - subsprite 32, 244, 1, 21, 8x8 - subsprite 208, 252, 2, 22, 32x8 - subsprite 240, 252, 2, 26, 32x8 - subsprite 16, 252, 2, 30, 16x8 - subsprite 32, 252, 2, 32, 8x8 - subsprite 208, 4, 2, 33, 32x8 - subsprite 240, 4, 2, 37, 32x8 - subsprite 16, 4, 2, 41, 16x8 - subsprite 32, 4, 2, 43, 8x8 - -gUnknown_83A3B80:: @ 83A3B80 - .byte 0x10 - .align 2 - .4byte gUnknown_83A3A80 - .byte 0x10 - .align 2 - .4byte gUnknown_83A3A80 - .byte 0x10 - .align 2 - .4byte gUnknown_83A3AC0 - .byte 0x10 - .align 2 - .4byte gUnknown_83A3B00 - .byte 0x10 - .align 2 - .4byte gUnknown_83A3B40 - .byte 0x10 - .align 2 - .4byte gUnknown_83A3B40 - -gObjectEventGraphicsInfo_83A3BB0:: @ 83A3BB0 - .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 16, 32 - .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3470 - .4byte gSpriteImages_83A00A0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3BD4:: @ 83A3BD4 - .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32 - .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 2 - .align 2 - .4byte gObjectEventBaseOam_32x32 - .4byte gSubspriteTables_83A37F0 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0140 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3BF8:: @ 83A3BF8 - .2byte 0xFFFF, 0x1100, 0x11FF, 0x100, 16, 32 - .byte 0 | (1 << 4) | (0 << 6) | (1 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3584 - .4byte gSpriteImages_83A0270 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3C1C:: @ 83A3C1C - .2byte 0xFFFF, 0x1100, 0x1102, 0x100, 16, 32 - .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3638 - .4byte gSpriteImages_83A0330 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3C40:: @ 83A3C40 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A04C0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3C64:: @ 83A3C64 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0420 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3C88:: @ 83A3C88 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0470 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3CAC:: @ 83A3CAC - .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0508 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3CD0:: @ 83A3CD0 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0550 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3CF4:: @ 83A3CF4 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A05A0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3D18:: @ 83A3D18 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A05E8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3D3C:: @ 83A3D3C - .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0638 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3D60:: @ 83A3D60 - .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 - .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0688 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3D84:: @ 83A3D84 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A06D8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3DA8:: @ 83A3DA8 - .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 - .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0C40 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3DCC:: @ 83A3DCC - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0720 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3DF0:: @ 83A3DF0 - .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 - .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0770 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3E14:: @ 83A3E14 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A07C0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3E38:: @ 83A3E38 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0808 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3E5C:: @ 83A3E5C - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0858 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3E80:: @ 83A3E80 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A08A8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3EA4:: @ 83A3EA4 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A08F8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3EC8:: @ 83A3EC8 - .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 - .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0940 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3EEC:: @ 83A3EEC - .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0988 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3F10:: @ 83A3F10 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A09D8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3F34:: @ 83A3F34 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0A20 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3F58:: @ 83A3F58 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0AB8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3F7C:: @ 83A3F7C - .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 - .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0B00 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3FA0:: @ 83A3FA0 - .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 - .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0B50 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3FC4:: @ 83A3FC4 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0BA0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A3FE8:: @ 83A3FE8 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0BF0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A400C:: @ 83A400C - .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0C90 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4030:: @ 83A4030 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0CE0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4054:: @ 83A4054 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0D30 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4078:: @ 83A4078 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0D78 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A409C:: @ 83A409C - .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 - .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0DC8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A40C0:: @ 83A40C0 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0E18 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A40E4:: @ 83A40E4 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0E68 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4108:: @ 83A4108 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0EB8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A412C:: @ 83A412C - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0F08 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4150:: @ 83A4150 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0F58 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4174:: @ 83A4174 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0FA8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4198:: @ 83A4198 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0FF8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A41BC:: @ 83A41BC - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1040 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A41E0:: @ 83A41E0 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1090 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4204:: @ 83A4204 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A10D8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4228:: @ 83A4228 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1120 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A424C:: @ 83A424C - .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1170 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4270:: @ 83A4270 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A11C0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4294:: @ 83A4294 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1210 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A42B8:: @ 83A42B8 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 2 - .align 2 - .4byte gObjectEventBaseOam_32x32 - .4byte gSubspriteTables_83A37F0 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1260 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A42DC:: @ 83A42DC - .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 2 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A12B0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4300:: @ 83A4300 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A35E4 - .4byte gSpriteImages_83A12F8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4324:: @ 83A4324 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1348 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4348:: @ 83A4348 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 - .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) - .byte 0 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3314 - .4byte gSpriteImages_83A1390 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A436C:: @ 83A436C - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1398 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4390:: @ 83A4390 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A13E0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A43B4:: @ 83A43B4 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1430 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A43D8:: @ 83A43D8 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1480 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A43FC:: @ 83A43FC - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A14C8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4420:: @ 83A4420 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_32x32 - .4byte gSubspriteTables_83A37F0 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0A70 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4444:: @ 83A4444 - .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 - .byte 4 | (0 << 4) | (1 << 6) | (0 << 7) - .byte 0 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3660 - .4byte gSpriteImages_83A1510 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4468:: @ 83A4468 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1530 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A448C:: @ 83A448C - .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 - .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1578 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A44B0:: @ 83A44B0 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A15C0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A44D4:: @ 83A44D4 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1608 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A44F8:: @ 83A44F8 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1650 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A451C:: @ 83A451C - .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 - .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) - .byte 0 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3658 - .4byte gSpriteImages_83A1698 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4540:: @ 83A4540 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 - .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) - .byte 0 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3314 - .4byte gSpriteImages_83A16B8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4564:: @ 83A4564 - .2byte 0xFFFF, 0x1110, 0x1102, 0x200, 16, 32 - .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3470 - .4byte gSpriteImages_83A0188 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4588:: @ 83A4588 - .2byte 0xFFFF, 0x1110, 0x1102, 0x200, 32, 32 - .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 2 - .align 2 - .4byte gObjectEventBaseOam_32x32 - .4byte gSubspriteTables_83A37F0 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0228 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A45AC:: @ 83A45AC - .2byte 0xFFFF, 0x1110, 0x11FF, 0x100, 16, 32 - .byte 0 | (1 << 4) | (0 << 6) | (1 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3584 - .4byte gSpriteImages_83A02D0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A45D0:: @ 83A45D0 - .2byte 0xFFFF, 0x1110, 0x1102, 0x100, 16, 32 - .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3638 - .4byte gSpriteImages_83A0378 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A45F4:: @ 83A45F4 - .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32 - .byte 10 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 2 - .align 2 - .4byte gObjectEventBaseOam_32x32 - .4byte gSubspriteTables_83A37F0 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A0140 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4618:: @ 83A4618 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A16C0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A463C:: @ 83A463C - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1708 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4660:: @ 83A4660 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1750 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4684:: @ 83A4684 - .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 - .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1798 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A46A8:: @ 83A46A8 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A17E0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A46CC:: @ 83A46CC - .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 - .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1828 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A46F0:: @ 83A46F0 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1870 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4714:: @ 83A4714 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A18B8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4738:: @ 83A4738 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1900 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A475C:: @ 83A475C - .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1948 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4780:: @ 83A4780 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1990 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A47A4:: @ 83A47A4 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A19D8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A47C8:: @ 83A47C8 - .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 - .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1A20 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A47EC:: @ 83A47EC - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1A68 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4810:: @ 83A4810 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1AB0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4834:: @ 83A4834 - .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 - .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1AF8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4858:: @ 83A4858 - .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32 - .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_32x32 - .4byte gSubspriteTables_83A37F0 - .4byte gAnimTable_83A3668 - .4byte gSpriteImages_83A1B40 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A487C:: @ 83A487C - .2byte 0xFFFF, 0x1110, 0x1102, 0x200, 32, 32 - .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_32x32 - .4byte gSubspriteTables_83A37F0 - .4byte gAnimTable_83A3668 - .4byte gSpriteImages_83A1BA0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A48A0:: @ 83A48A0 - .2byte 0xFFFF, 0x1100, 0x1102, 0x100, 16, 32 - .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A363C - .4byte gSpriteImages_83A0330 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A48C4:: @ 83A48C4 - .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32 - .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_32x32 - .4byte gSubspriteTables_83A37F0 - .4byte gAnimTable_83A3640 - .4byte gSpriteImages_83A03C0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A48E8:: @ 83A48E8 - .2byte 0xFFFF, 0x1100, 0x1102, 0x100, 16, 32 - .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A363C - .4byte gSpriteImages_83A0378 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A490C:: @ 83A490C - .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32 - .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_32x32 - .4byte gSubspriteTables_83A37F0 - .4byte gAnimTable_83A3640 - .4byte gSpriteImages_83A03F0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4930:: @ 83A4930 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 32, 16 - .byte 2 | (0 << 4) | (1 << 6) | (0 << 7) - .byte 0 - .align 2 - .4byte gObjectEventBaseOam_32x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3314 - .4byte gSpriteImages_83A1C00 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4954:: @ 83A4954 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 - .byte 2 | (0 << 4) | (1 << 6) | (0 << 7) - .byte 0 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3314 - .4byte gSpriteImages_83A1C08 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4978:: @ 83A4978 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1C10 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A499C:: @ 83A499C - .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_32x32 - .4byte gSubspriteTables_83A37F0 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1D38 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A49C0:: @ 83A49C0 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 - .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) - .byte 0 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3314 - .4byte gSpriteImages_83A1C58 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A49E4:: @ 83A49E4 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 - .byte 2 | (0 << 4) | (1 << 6) | (0 << 7) - .byte 0 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3314 - .4byte gSpriteImages_83A1C60 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4A08:: @ 83A4A08 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 - .byte 2 | (0 << 4) | (1 << 6) | (0 << 7) - .byte 0 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3314 - .4byte gSpriteImages_83A1C68 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4A2C:: @ 83A4A2C - .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 - .byte 2 | (0 << 4) | (1 << 6) | (0 << 7) - .byte 0 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3314 - .4byte gSpriteImages_83A1C70 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4A50:: @ 83A4A50 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 - .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) - .byte 0 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3314 - .4byte gSpriteImages_83A1C78 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4A74:: @ 83A4A74 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 - .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) - .byte 0 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3314 - .4byte gSpriteImages_83A1C80 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4A98:: @ 83A4A98 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 - .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) - .byte 0 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3314 - .4byte gSpriteImages_83A1C88 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4ABC:: @ 83A4ABC - .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 - .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) - .byte 0 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3314 - .4byte gSpriteImages_83A1C90 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4AE0:: @ 83A4AE0 - .2byte 0xFFFF, 0x1113, 0x11FF, 0x200, 32, 32 - .byte 10 | (0 << 4) | (1 << 6) | (0 << 7) - .byte 0 - .align 2 - .4byte gObjectEventBaseOam_32x32 - .4byte gSubspriteTables_83A37F0 - .4byte gAnimTable_83A3314 - .4byte gSpriteImages_83A1C98 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4B04:: @ 83A4B04 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32 - .byte 3 | (0 << 4) | (1 << 6) | (0 << 7) - .byte 0 - .align 2 - .4byte gObjectEventBaseOam_32x32 - .4byte gSubspriteTables_83A37F0 - .4byte gAnimTable_83A3314 - .4byte gSpriteImages_83A1CA0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4B28:: @ 83A4B28 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1D80 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4B4C:: @ 83A4B4C - .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1E10 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4B70:: @ 83A4B70 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1E58 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4B94:: @ 83A4B94 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1EA0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4BB8:: @ 83A4BB8 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1EE8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4BDC:: @ 83A4BDC - .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 - .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1F30 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4C00:: @ 83A4C00 - .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 - .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1F78 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4C24:: @ 83A4C24 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1FC0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4C48:: @ 83A4C48 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A2008 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4C6C:: @ 83A4C6C - .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A2050 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4C90:: @ 83A4C90 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A2098 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4CB4:: @ 83A4CB4 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A20E0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4CD8:: @ 83A4CD8 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A2128 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4CFC:: @ 83A4CFC - .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A2170 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4D20:: @ 83A4D20 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A21B8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4D44:: @ 83A4D44 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A2200 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4D68:: @ 83A4D68 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A2248 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4D8C:: @ 83A4D8C - .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_32x32 - .4byte gSubspriteTables_83A37F0 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A2290 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4DB0:: @ 83A4DB0 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_32x32 - .4byte gSubspriteTables_83A37F0 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A22D8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4DD4:: @ 83A4DD4 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_32x32 - .4byte gSubspriteTables_83A37F0 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A2320 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4DF8:: @ 83A4DF8 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_32x32 - .4byte gSubspriteTables_83A37F0 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A2368 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4E1C:: @ 83A4E1C - .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_32x32 - .4byte gSubspriteTables_83A37F0 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A23B0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4E40:: @ 83A4E40 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_32x32 - .4byte gSubspriteTables_83A37F0 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A23F8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4E64:: @ 83A4E64 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A2440 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4E88:: @ 83A4E88 - .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 - .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A2488 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4EAC:: @ 83A4EAC - .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A24D0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4ED0:: @ 83A4ED0 - .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 - .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A2518 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4EF4:: @ 83A4EF4 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A2560 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4F18:: @ 83A4F18 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_32x32 - .4byte gSubspriteTables_83A37F0 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A25A8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4F3C:: @ 83A4F3C - .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_32x32 - .4byte gSubspriteTables_83A37F0 - .4byte gAnimTable_83A33BC - .4byte gSpriteImages_83A25F0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4F60:: @ 83A4F60 - .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 - .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A2638 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4F84:: @ 83A4F84 - .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 - .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A2680 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4FA8:: @ 83A4FA8 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A2878 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4FCC:: @ 83A4FCC - .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A28C0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A4FF0:: @ 83A4FF0 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A26C8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A5014:: @ 83A5014 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1DC8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A5038:: @ 83A5038 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A2710 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A505C:: @ 83A505C - .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A2758 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A5080:: @ 83A5080 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A27A0 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A50A4:: @ 83A50A4 - .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A27E8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A50C8:: @ 83A50C8 - .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 - .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x16 - .4byte gSubspriteTables_83A3748 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A2830 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A50EC:: @ 83A50EC - .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 - .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 1 - .align 2 - .4byte gObjectEventBaseOam_16x32 - .4byte gSubspriteTables_83A379C - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A2908 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A5110:: @ 83A5110 - .2byte 0xFFFF, 0x1114, 0x11FF, 0x800, 64, 64 - .byte 10 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 0 - .align 2 - .4byte gObjectEventBaseOam_64x64 - .4byte gSubspriteTables_83A38D0 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1CA8 - .4byte gDummySpriteAffineAnimTable - -gObjectEventGraphicsInfo_83A5134:: @ 83A5134 - .2byte 0xFFFF, 0x1115, 0x11FF, 0x1000, 128, 64 - .byte 10 | (1 << 4) | (0 << 6) | (0 << 7) - .byte 0 - .align 2 - .4byte gObjectEventBaseOam_128x64 - .4byte gSubspriteTables_83A3A50 - .4byte gAnimTable_83A3368 - .4byte gSpriteImages_83A1CF0 - .4byte gDummySpriteAffineAnimTable - -sObjectEventSpritePalettes:: @ 83A5158 - obj_pal gUnknown_836D828, 0x1103 - obj_pal gUnknown_836D848, 0x1104 - obj_pal gUnknown_836D868, 0x1105 - obj_pal gUnknown_836D888, 0x1106 - obj_pal gUnknown_836D8A8, 0x1107 - obj_pal gUnknown_836D8C8, 0x1108 - obj_pal gUnknown_836D8E8, 0x1109 - obj_pal gUnknown_836D908, 0x110a - obj_pal gUnknown_835B968, 0x1100 - obj_pal gUnknown_835E968, 0x1101 - obj_pal gUnknown_835E988, 0x1102 - obj_pal gUnknown_8398008, 0x110b - obj_pal gUnknown_8398028, 0x110c - obj_pal gUnknown_835B968, 0x1110 - obj_pal gUnknown_835E968, 0x1111 - obj_pal gUnknown_8394EA8, 0x1113 - obj_pal gUnknown_8395AE8, 0x1115 - obj_pal gUnknown_83952C8, 0x1114 - null_obj_pal - -gPlayerReflectionPaletteTags:: @ 83A51F0 - .2byte 0x1101 - .2byte 0x1101 - .2byte 0x1101 - .2byte 0x1101 - .2byte 0x1111 - .2byte 0x1111 - .2byte 0x1111 - .2byte 0x1111 - -gUnknownPaletteTags_83A5200:: @ 83A5200 - .2byte 0x1116 - .2byte 0x1116 - .2byte 0x1116 - .2byte 0x1116 - -gPlayerReflectionPaletteSets:: @ 83A5208 - .2byte 0x1100 - .2byte 0x0 - .4byte gPlayerReflectionPaletteTags - .2byte 0x1110 - .2byte 0x0 - .4byte gPlayerReflectionPaletteTags - .2byte 0x1116 - .2byte 0x0 - .4byte gUnknownPaletteTags_83A5200 - .2byte 0x11FF - .2byte 0x0 - .4byte NULL - -gUnknownPaletteTags_83A5228:: @ 83A5228 - .2byte 0x110c - .2byte 0x110c - .2byte 0x110c - .2byte 0x110c - -gUnknownPaletteTags_83A5230:: @ 83A5230 - .2byte 0x110d - .2byte 0x110d - .2byte 0x110d - .2byte 0x110d - -gUnknownPaletteTags_83A5238:: - .2byte 0x110e - .2byte 0x110e - .2byte 0x110e - .2byte 0x110e - -gUnknownPaletteTags_83A5240:: - .2byte 0x1112 - .2byte 0x1112 - .2byte 0x1112 - .2byte 0x1112 - -gUnknownPaletteTags_83A5248:: - .2byte 0x1113 - .2byte 0x1113 - .2byte 0x1113 - .2byte 0x1113 - -gUnknownPaletteTags_83A5250:: - .2byte 0x1114 - .2byte 0x1114 - .2byte 0x1114 - .2byte 0x1114 - -gUnknownPaletteTags_83A5258:: - .2byte 0x111b - .2byte 0x111b - .2byte 0x111b - .2byte 0x111b - -gUnknownPaletteTags_83A5260:: - .2byte 0x1118 - .2byte 0x1118 - .2byte 0x1118 - .2byte 0x1118 - -gUnknownPaletteTags_83A5268:: - .2byte 0x111a - .2byte 0x111a - .2byte 0x111a - .2byte 0x111a - -gUnknownPaletteTags_83A5270:: - .2byte 0x1109 - .2byte 0x1109 - .2byte 0x1109 - .2byte 0x1109 - -gSpecialObjectReflectionPaletteSets:: @ 83A5278 - .2byte 0x1100 - .2byte 0x0 - .4byte gPlayerReflectionPaletteTags - .2byte 0x1110 - .2byte 0x0 - .4byte gPlayerReflectionPaletteTags - .2byte 0x110b - .2byte 0x0 - .4byte gUnknownPaletteTags_83A5228 - .2byte 0x110d - .2byte 0x0 - .4byte gUnknownPaletteTags_83A5230 - .2byte 0x110e - .2byte 0x0 - .4byte gUnknownPaletteTags_83A5238 - .2byte 0x1112 - .2byte 0x0 - .4byte gUnknownPaletteTags_83A5240 - .2byte 0x1113 - .2byte 0x0 - .4byte gUnknownPaletteTags_83A5248 - .2byte 0x1114 - .2byte 0x0 - .4byte gUnknownPaletteTags_83A5250 - .2byte 0x1117 - .2byte 0x0 - .4byte gUnknownPaletteTags_83A5260 - .2byte 0x1119 - .2byte 0x0 - .4byte gUnknownPaletteTags_83A5268 - .2byte 0x1105 - .2byte 0x0 - .4byte gUnknownPaletteTags_83A5270 - .2byte 0x111b - .2byte 0x0 - .4byte gUnknownPaletteTags_83A5258 - .2byte 0x11ff - .2byte 0x0 - .4byte NULL - -gUnknownPaletteTags_83A52E0:: - .2byte 0x1100 - .2byte 0x1101 - .2byte 0x1103 - .2byte 0x1104 - .2byte 0x1105 - .2byte 0x1106 - .2byte 0x1107 - .2byte 0x1108 - .2byte 0x1109 - .2byte 0x110a - -gUnknownPaletteTags_83A52F4:: - .2byte 0x1100 - .2byte 0x1110 - .2byte 0x1103 - .2byte 0x1104 - .2byte 0x1105 - .2byte 0x1106 - .2byte 0x1107 - .2byte 0x1108 - .2byte 0x1109 - .2byte 0x110a - -gUnknownPaletteTags_83A5308:: - .2byte 0x1100 - .2byte 0x1101 - .2byte 0x1103 - .2byte 0x1104 - .2byte 0x1105 - .2byte 0x1106 - .2byte 0x1107 - .2byte 0x1108 - .2byte 0x1109 - .2byte 0x110a - -gUnknownPaletteTags_83A531C:: - .2byte 0x1100 - .2byte 0x1101 - .2byte 0x1103 - .2byte 0x1104 - .2byte 0x1105 - .2byte 0x1106 - .2byte 0x1107 - .2byte 0x1108 - .2byte 0x1109 - .2byte 0x110a - -gObjectPaletteTagSets:: @ 83A5330 - .4byte gUnknownPaletteTags_83A52E0 - .4byte gUnknownPaletteTags_83A52F4 - .4byte gUnknownPaletteTags_83A5308 - .4byte gUnknownPaletteTags_83A531C - -gUnknown_83A5340:: - obj_pal gUnknown_8398FA8, 0x1004 - -gUnknown_83A5348:: @ 83A5348 - obj_pal gUnknown_8398FC8, 0x1005 - -gUnknown_83A5350:: @ 83A5350 - obj_image_anim_frame 0, 1, 0 - obj_image_anim_end - -gUnknown_83A5358:: @ 83A5358 - .4byte gUnknown_83A5350 - -gUnknown_83A535C:: @ 83A535C - obj_frame_tiles gUnknown_8398048, 0x20 - -gUnknown_83A5364:: @ 83A5364 - obj_frame_tiles gUnknown_8398068, 0x40 - -gUnknown_83A536C:: @ 83A536C - obj_frame_tiles gUnknown_83980A8, 0x80 - -gUnknown_83A5374:: @ 83A5374 - obj_frame_tiles gUnknown_8398128, 0x400 - -gUnknown_83A537C:: @ 83A537C - spr_template 65535, 65535, gObjectEventBaseOam_128x64, gUnknown_83A5358, gUnknown_83A535C, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect - -gUnknown_83A5394:: @ 83A5394 - spr_template 65535, 65535, gObjectEventBaseOam_Unknown1, gUnknown_83A5358, gUnknown_83A5364, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect - -gUnknown_83A53AC:: @ 83A53AC - spr_template 65535, 65535, gObjectEventBaseOam_Unknown2, gUnknown_83A5358, gUnknown_83A536C, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect - -gUnknown_83A53C4:: @ 83A53C4 - spr_template 65535, 65535, gObjectEventBaseOam_Unknown3, gUnknown_83A5358, gUnknown_83A5374, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect - -gUnknown_83A53DC:: @ 83A53DC - overworld_frame gUnknown_839A008, 2, 2, 0 - overworld_frame gUnknown_839A008, 2, 2, 1 - overworld_frame gUnknown_839A008, 2, 2, 2 - overworld_frame gUnknown_839A008, 2, 2, 3 - overworld_frame gUnknown_839A008, 2, 2, 4 - -gUnknown_83A5404:: @ 83A5404 - obj_image_anim_frame 1, 10 - obj_image_anim_frame 2, 10 - obj_image_anim_frame 3, 10 - obj_image_anim_frame 4, 10 - obj_image_anim_frame 0, 10 - obj_image_anim_end - -gUnknown_83A541C:: @ 83A541C - .4byte gUnknown_83A5404 - -gUnknown_83A5420:: @ 83A5420 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A541C, gUnknown_83A53DC, gDummySpriteAffineAnimTable, UpdateTallGrassFieldEffect - -gUnknown_83A5438:: @ 83A5438 - overworld_frame gUnknown_83986A8, 2, 2, 0 - overworld_frame gUnknown_83986A8, 2, 2, 1 - overworld_frame gUnknown_83986A8, 2, 2, 2 - overworld_frame gUnknown_83986A8, 2, 2, 3 - overworld_frame gUnknown_83986A8, 2, 2, 4 - -gUnknown_83A5460:: @ 83A5460 - obj_image_anim_frame 0, 12 - obj_image_anim_frame 1, 9 - obj_image_anim_frame 2, 9 - obj_image_anim_frame 3, 9 - obj_image_anim_frame 0, 9 - obj_image_anim_frame 1, 9 - obj_image_anim_frame 2, 11 - obj_image_anim_frame 4, 11 - obj_image_anim_end - -gUnknown_83A5484:: @ 83A5484 - .4byte gUnknown_83A5460 - -gUnknown_83A5488:: @ 83A5488 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5484, gUnknown_83A5438, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim - -gUnknown_83A54A0:: @ 83A54A0 - overworld_frame gUnknown_8398928, 2, 2, 0 - overworld_frame gUnknown_8398928, 2, 2, 1 - overworld_frame gUnknown_8398928, 2, 2, 2 - overworld_frame gUnknown_8398928, 2, 2, 3 - overworld_frame gUnknown_8398928, 2, 2, 4 - -gUnknown_83A54C8:: @ 83A54C8 - obj_image_anim_frame 0, 12 - obj_image_anim_frame 1, 12 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 12 - obj_image_anim_frame 4, 12 - obj_image_anim_end - -gUnknown_83A54E0:: @ 83A54E0 - .4byte gUnknown_83A54C8 - -gUnknown_83A54E4:: @ 83A54E4 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A54E0, gUnknown_83A54A0, gDummySpriteAffineAnimTable, UpdateAshFieldEffect - -gUnknown_83A54FC:: @ 83A54FC - overworld_frame gUnknown_8396B08, 2, 8, 0 - overworld_frame gUnknown_8396B08, 2, 8, 1 - overworld_frame gUnknown_8396B08, 2, 8, 2 - overworld_frame gUnknown_8396B08, 2, 8, 3 - overworld_frame gUnknown_8396B08, 2, 8, 4 - overworld_frame gUnknown_8396B08, 2, 8, 5 - -gUnknown_83A552C:: @ 83A552C - obj_image_anim_frame 0, 48 - obj_image_anim_frame 1, 48 - obj_image_anim_jump 0 - -gUnknown_83A5538:: @ 83A5538 - obj_image_anim_frame 2, 48 - obj_image_anim_frame 3, 48 - obj_image_anim_jump 0 - -gUnknown_83A5544:: @ 83A5544 - obj_image_anim_frame 4, 48 - obj_image_anim_frame 5, 48 - obj_image_anim_jump 0 - -gUnknown_83A5550:: @ 83A5550 - obj_image_anim_frame 4, 112 - obj_image_anim_frame 5, 112 - obj_image_anim_jump 0 - -gUnknown_83A555C:: @ 83A555C - .4byte gUnknown_83A552C - .4byte gUnknown_83A5538 - .4byte gUnknown_83A5544 - .4byte gUnknown_83A5550 - -gUnknown_83A556C:: @ 83A556C - spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_32x32, gUnknown_83A555C, gUnknown_83A54FC, gDummySpriteAffineAnimTable, UpdateSurfBlobFieldEffect - -gUnknown_83A5584:: @ 83A5584 - overworld_frame gUnknown_8398BA8, 2, 2, 0 - overworld_frame gUnknown_8398BA8, 2, 2, 1 - overworld_frame gUnknown_8398BA8, 2, 2, 2 - overworld_frame gUnknown_8398BA8, 2, 2, 3 - overworld_frame gUnknown_8398BA8, 2, 2, 4 - overworld_frame gUnknown_8398BA8, 2, 2, 5 - overworld_frame gUnknown_8398BA8, 2, 2, 6 - overworld_frame gUnknown_8398BA8, 2, 2, 7 - -gUnknown_83A55C4:: @ 83A55C4 - obj_image_anim_frame 2, 32 - obj_image_anim_frame 3, 32 - obj_image_anim_jump 0 - -gUnknown_83A55D0:: @ 83A55D0 - obj_image_anim_frame 0, 32 - obj_image_anim_frame 1, 32 - obj_image_anim_jump 0 - -gUnknown_83A55DC:: @ 83A55DC - obj_image_anim_frame 4, 32 - obj_image_anim_frame 5, 32 - obj_image_anim_jump 0 - -gUnknown_83A55E8:: @ 83A55E8 - obj_image_anim_frame 6, 32 - obj_image_anim_frame 7, 32 - obj_image_anim_jump 0 - -gUnknown_83A55F4:: @ 83A55F4 - .4byte gUnknown_83A55C4 - .4byte gUnknown_83A55D0 - .4byte gUnknown_83A55DC - .4byte gUnknown_83A55E8 - -gUnknown_83A5604:: @ 83A5604 - spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x16, gUnknown_83A55F4, gUnknown_83A5584, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_83A561C:: @ 83A561C - overworld_frame gUnknown_8399008, 2, 1, 0 - overworld_frame gUnknown_8399008, 2, 1, 1 - overworld_frame gUnknown_8399008, 2, 1, 2 - -gUnknown_83A5634:: @ 83A5634 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_end - -gUnknown_83A5644:: @ 83A5644 - .4byte gUnknown_83A5634 - -gUnknown_83A5648:: @ 83A5648 - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A5644, gUnknown_83A561C, gDummySpriteAffineAnimTable, sub_80DCCE0 - -gUnknown_83A5660:: @ 83A5660 - overworld_frame gUnknown_8399188, 2, 1, 0 - overworld_frame gUnknown_8399188, 2, 1, 1 - overworld_frame gUnknown_8399188, 2, 1, 2 - overworld_frame gUnknown_8399188, 2, 1, 3 - -gUnknown_83A5680:: @ 83A5680 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_end - -gUnknown_83A5694:: @ 83A5694 - .4byte gUnknown_83A5680 - -gUnknown_83A5698:: @ 83A5698 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_Unknown1, gUnknown_83A5694, gUnknown_83A5660, gDummySpriteAffineAnimTable, sub_80DCCE0 - -gUnknown_83A56B0:: @ 83A56B0 - overworld_frame gUnknown_839A388, 2, 2, 0 - overworld_frame gUnknown_839A388, 2, 2, 1 - -gUnknown_83A56C0:: @ 83A56C0 - obj_image_anim_frame 0, 129 - obj_image_anim_end - -gUnknown_83A56C8:: @ 83A56C8 - obj_image_anim_frame 0, 1 - obj_image_anim_end - -gUnknown_83A56D0:: @ 83A56D0 - obj_image_anim_frame 1, 1 - obj_image_anim_end - -gUnknown_83A56D8:: @ 83A56D8 - obj_image_anim_frame 1, 65 - obj_image_anim_end - -gUnknown_83A56E0:: @ 83A56E0 - .4byte gUnknown_83A56C0 - .4byte gUnknown_83A56C0 - .4byte gUnknown_83A56C8 - .4byte gUnknown_83A56D0 - .4byte gUnknown_83A56D8 - -gUnknown_83A56F4:: @ 83A56F4 - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A56E0, gUnknown_83A56B0, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect - -gUnknown_83A570C:: @ 83A570C - overworld_frame gUnknown_839A488, 2, 2, 0 - overworld_frame gUnknown_839A488, 2, 2, 1 - -gUnknown_83A571C:: @ 83A571C - obj_image_anim_frame 0, 129 - obj_image_anim_end - -gUnknown_83A5724:: @ 83A5724 - obj_image_anim_frame 0, 1 - obj_image_anim_end - -gUnknown_83A572C:: @ 83A572C - obj_image_anim_frame 1, 1 - obj_image_anim_end - -gUnknown_83A5734:: @ 83A5734 - obj_image_anim_frame 1, 65 - obj_image_anim_end - -gUnknown_83A573C:: @ 83A573C - .4byte gUnknown_83A571C - .4byte gUnknown_83A571C - .4byte gUnknown_83A5724 - .4byte gUnknown_83A572C - .4byte gUnknown_83A5734 - -gUnknown_83A5750:: @ 83A5750 - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A573C, gUnknown_83A570C, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect - -gUnknown_83A5768:: @ 83A5768 - overworld_frame gUnknown_839A588, 2, 2, 0 - overworld_frame gUnknown_839A588, 2, 2, 1 - overworld_frame gUnknown_839A588, 2, 2, 2 - overworld_frame gUnknown_839A588, 2, 2, 3 - -gUnknown_83A5788:: @ 83A5788 - obj_image_anim_frame 2, 1 - obj_image_anim_end - -gUnknown_83A5790:: @ 83A5790 - obj_image_anim_frame 2, 1 - obj_image_anim_end - -gUnknown_83A5798:: @ 83A5798 - obj_image_anim_frame 1, 1 - obj_image_anim_end - -gUnknown_83A57A0:: @ 83A57A0 - obj_image_anim_frame 1, 1 - obj_image_anim_end - -gUnknown_83A57A8:: @ 83A57A8 - obj_image_anim_frame 0, 1 - obj_image_anim_end - -gUnknown_83A57B0:: @ 83A57B0 - obj_image_anim_frame 0, 65 - obj_image_anim_end - -gUnknown_83A57B8:: @ 83A57B8 - obj_image_anim_frame 3, 65 - obj_image_anim_end - -gUnknown_83A57C0:: @ 83A57C0 - obj_image_anim_frame 3, 1 - obj_image_anim_end - -gUnknown_83A57C8:: @ 83A57C8 - .4byte gUnknown_83A5788 - .4byte gUnknown_83A5788 - .4byte gUnknown_83A5790 - .4byte gUnknown_83A5798 - .4byte gUnknown_83A57A0 - .4byte gUnknown_83A57A8 - .4byte gUnknown_83A57B0 - .4byte gUnknown_83A57B8 - .4byte gUnknown_83A57C0 - -gUnknown_83A57EC:: @ 83A57EC - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A57C8, gUnknown_83A5768, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect - -gUnknown_83A5804:: @ 83A5804 - overworld_frame gUnknown_839AA48, 2, 2, 0 - overworld_frame gUnknown_839AA48, 2, 2, 1 - overworld_frame gUnknown_839AA48, 2, 2, 2 - overworld_frame gUnknown_839AA48, 2, 2, 3 - -gUnknown_83A5824:: @ 83A5824 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_end - -gUnknown_83A5838:: @ 83A5838 - .4byte gUnknown_83A5824 - -gUnknown_83A583C:: @ 83A583C - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A5838, gUnknown_83A5804, gDummySpriteAffineAnimTable, sub_80DCCE0 - -gUnknown_83A5854:: @ 83A5854 - overworld_frame gUnknown_839AC48, 2, 1, 0 - overworld_frame gUnknown_839AC48, 2, 1, 1 - -gUnknown_83A5864:: @ 83A5864 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_end - -gUnknown_83A5870:: @ 83A5870 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 0, 6 - obj_image_anim_frame 1, 6 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 0, 6 - obj_image_anim_frame 1, 6 - obj_image_anim_jump 0 - -gUnknown_83A5894:: @ 83A5894 - .4byte gUnknown_83A5864 - .4byte gUnknown_83A5870 - -gUnknown_83A589C:: @ 83A589C - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A5894, gUnknown_83A5854, gDummySpriteAffineAnimTable, UpdateSplashFieldEffect - -gUnknown_83A58B4:: @ 83A58B4 - overworld_frame gUnknown_839ACC8, 2, 1, 0 - overworld_frame gUnknown_839ACC8, 2, 1, 1 - overworld_frame gUnknown_839ACC8, 2, 1, 2 - -gUnknown_83A58CC:: @ 83A58CC - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_end - -gUnknown_83A58DC:: @ 83A58DC - .4byte gUnknown_83A58CC - -gUnknown_83A58E0:: @ 83A58E0 - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A58DC, gUnknown_83A58B4, gDummySpriteAffineAnimTable, sub_80DCCE0 - -gUnknown_83A58F8:: @ 83A58F8 - overworld_frame gUnknown_8399E08, 2, 2, 0 - overworld_frame gUnknown_8399E08, 2, 2, 1 - overworld_frame gUnknown_8399E08, 2, 2, 2 - overworld_frame gUnknown_8399E08, 2, 2, 3 - -gUnknown_83A5918:: @ 83A5918 - obj_image_anim_frame 1, 3 - obj_image_anim_frame 2, 3 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_end - -gUnknown_83A5938:: @ 83A5938 - .4byte gUnknown_83A5918 - -gUnknown_83A593C:: @ 83A593C - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5938, gUnknown_83A58F8, gDummySpriteAffineAnimTable, UpdateLongGrassFieldEffect - -gUnknown_83A5954:: @ 83A5954 - overworld_frame gUnknown_8399488, 2, 2, 0 - overworld_frame gUnknown_8399488, 2, 2, 1 - overworld_frame gUnknown_8399488, 2, 2, 2 - overworld_frame gUnknown_8399488, 2, 2, 3 - overworld_frame gUnknown_8399488, 2, 2, 4 - overworld_frame gUnknown_8399488, 2, 2, 6 - -gUnknown_83A5984:: @ 83A5984 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 5, 8 - obj_image_anim_end - -gUnknown_83A59A0:: @ 83A59A0 - .4byte gUnknown_83A5984 - -gUnknown_83A59A4:: @ 83A59A4 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A59A0, gUnknown_83A5954, gDummySpriteAffineAnimTable, sub_80DCCE0 - -gUnknown_83A59BC:: @ 83A59BC - overworld_frame gUnknown_8399788, 2, 2, 0 - overworld_frame gUnknown_8399788, 2, 2, 1 - overworld_frame gUnknown_8399788, 2, 2, 2 - overworld_frame gUnknown_8399788, 2, 2, 3 - overworld_frame gUnknown_8399788, 2, 2, 4 - overworld_frame gUnknown_8399788, 2, 2, 5 - overworld_frame gUnknown_8399788, 2, 2, 6 - overworld_frame gUnknown_8399788, 2, 2, 7 - overworld_frame gUnknown_8399788, 2, 2, 8 - -gUnknown_83A5A04:: @ 83A5A04 - obj_image_anim_frame 0, 10 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_frame 7, 4 - obj_image_anim_frame 8, 4 - obj_image_anim_jump 7 - -gUnknown_83A5A2C:: @ 83A5A2C - .4byte gUnknown_83A5A04 - -gUnknown_83A5A30:: @ 83A5A30 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5A2C, gUnknown_83A59BC, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim - -gUnknown_83A5A48:: @ 83A5A48 - overworld_frame gUnknown_8399C08, 2, 2, 0 - overworld_frame gUnknown_8399C08, 2, 2, 1 - overworld_frame gUnknown_8399C08, 2, 2, 2 - overworld_frame gUnknown_8399C08, 2, 2, 3 - -gUnknown_83A5A68:: @ 83A5A68 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_jump 0 - -gUnknown_83A5A84:: @ 83A5A84 - .4byte gUnknown_83A5A68 - -gUnknown_83A5A88:: @ 83A5A88 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5A84, gUnknown_83A5A48, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim - -gUnknown_83A5AA0:: @ 83A5AA0 - overworld_frame gUnknown_839A788, 2, 2, 0 - overworld_frame gUnknown_839A788, 2, 2, 1 - overworld_frame gUnknown_839A788, 2, 2, 2 - overworld_frame gUnknown_839A788, 2, 2, 3 - -gUnknown_83A5AC0:: @ 83A5AC0 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_jump 0 - -gUnknown_83A5AD4:: @ 83A5AD4 - .4byte gUnknown_83A5AC0 - -gUnknown_83A5AD8:: @ 83A5AD8 - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A5AD4, gUnknown_83A5AA0, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim - -gUnknown_83A5AF0:: @ 83A5AF0 - overworld_frame gUnknown_839A988, 2, 1, 0 - overworld_frame gUnknown_839A988, 2, 1, 1 - overworld_frame gUnknown_839A988, 2, 1, 2 - -gUnknown_83A5B08:: @ 83A5B08 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_end - -gUnknown_83A5B18:: @ 83A5B18 - .4byte gUnknown_83A5B08 - -gUnknown_83A5B1C:: @ 83A5B1C - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A5B18, gUnknown_83A5AF0, gDummySpriteAffineAnimTable, UpdateSandPileFieldEffect - -gUnknown_83A5B34:: @ 83A5B34 - overworld_frame gUnknown_839AD88, 2, 2, 0 - overworld_frame gUnknown_839AD88, 2, 2, 1 - overworld_frame gUnknown_839AD88, 2, 2, 2 - overworld_frame gUnknown_839AD88, 2, 2, 3 - -gUnknown_83A5B54:: @ 83A5B54 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_jump 0 - -gUnknown_83A5B70:: @ 83A5B70 - .4byte gUnknown_83A5B54 - -gUnknown_83A5B74:: @ 83A5B74 - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A5B70, gUnknown_83A5B34, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim - -gUnknown_83A5B8C:: @ 83A5B8C - obj_rot_scal_anim_frame -256, 256, 128, 0 - obj_rot_scal_anim_frame 1, 0, 0, 4 - obj_rot_scal_anim_frame 0, 0, 0, 8 - obj_rot_scal_anim_frame -1, 0, 0, 4 - obj_rot_scal_anim_frame 0, 0, 0, 8 - obj_rot_scal_anim_frame -1, 0, 0, 4 - obj_rot_scal_anim_frame 0, 0, 0, 8 - obj_rot_scal_anim_frame 1, 0, 0, 4 - obj_rot_scal_anim_frame 0, 0, 0, 8 - obj_rot_scal_anim_jump 1 - -gUnknown_83A5BDC:: @ 83A5BDC - obj_rot_scal_anim_frame 256, 256, 128, 0 - obj_rot_scal_anim_frame -1, 0, 0, 4 - obj_rot_scal_anim_frame 0, 0, 0, 8 - obj_rot_scal_anim_frame 1, 0, 0, 4 - obj_rot_scal_anim_frame 0, 0, 0, 8 - obj_rot_scal_anim_frame 1, 0, 0, 4 - obj_rot_scal_anim_frame 0, 0, 0, 8 - obj_rot_scal_anim_frame -1, 0, 0, 4 - obj_rot_scal_anim_frame 0, 0, 0, 8 - obj_rot_scal_anim_jump 1 - -gUnknown_83A5C2C:: @ 83A5C2C - .4byte gUnknown_83A5B8C - .4byte gUnknown_83A5BDC - -gUnknown_83A5C34:: @ 83A5C34 - spr_template 0x0, 0xFFFF, gDummyOamData, gDummySpriteAnimTable, NULL, gUnknown_83A5C2C, SpriteCallbackDummy - -gUnknown_83A5C4C:: @ 83A5C4C - overworld_frame gUnknown_839B008, 2, 4, 0 - overworld_frame gUnknown_839B008, 2, 4, 1 - overworld_frame gUnknown_839B008, 2, 4, 2 - overworld_frame gUnknown_839B008, 2, 4, 3 - overworld_frame gUnknown_839B008, 2, 4, 4 - overworld_frame gUnknown_839B008, 2, 4, 5 - overworld_frame gUnknown_839B008, 2, 4, 6 - -gUnknown_83A5C84:: @ 83A5C84 - obj_image_anim_frame 0, 16 - obj_image_anim_end - -gUnknown_83A5C8C:: @ 83A5C8C - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_end - -gUnknown_83A5CAC:: @ 83A5CAC - .4byte gUnknown_83A5C84 - .4byte gUnknown_83A5C8C - -gUnknown_83A5CB4:: @ 83A5CB4 - spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5CAC, gUnknown_83A5C4C, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect - -gUnknown_83A5CCC:: @ 83A5CCC - overworld_frame gUnknown_839B708, 2, 4, 0 - overworld_frame gUnknown_839B708, 2, 4, 1 - overworld_frame gUnknown_839B708, 2, 4, 2 - overworld_frame gUnknown_839B708, 2, 4, 3 - overworld_frame gUnknown_839B708, 2, 4, 4 - overworld_frame gUnknown_839B708, 2, 4, 5 - overworld_frame gUnknown_839B708, 2, 4, 6 - -gUnknown_83A5D04:: @ 83A5D04 - obj_image_anim_frame 0, 16 - obj_image_anim_end - -gUnknown_83A5D0C:: @ 83A5D0C - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_end - -gUnknown_83A5D2C:: @ 83A5D2C - .4byte gUnknown_83A5D04 - .4byte gUnknown_83A5D0C - -gUnknown_83A5D34:: @ 83A5D34 - spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5D2C, gUnknown_83A5CCC, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect - -gUnknown_83A5D4C:: @ 83A5D4C - overworld_frame gUnknown_839BE08, 2, 4, 0 - overworld_frame gUnknown_839BE08, 2, 4, 1 - overworld_frame gUnknown_839BE08, 2, 4, 2 - overworld_frame gUnknown_839BE08, 2, 4, 3 - overworld_frame gUnknown_839BE08, 2, 4, 4 - overworld_frame gUnknown_839BE08, 2, 4, 5 - overworld_frame gUnknown_839BE08, 2, 4, 6 - -gUnknown_83A5D84:: @ 83A5D84 - spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5CAC, gUnknown_83A5D4C, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect - -gUnknown_83A5D9C:: @ 83A5D9C - overworld_frame gUnknown_839D3C8, 8, 8, 0 - overworld_frame gUnknown_839D3C8, 8, 8, 1 - overworld_frame gUnknown_839D3C8, 8, 8, 2 - overworld_frame gUnknown_839D3C8, 8, 8, 3 - overworld_frame gUnknown_839D3C8, 8, 8, 4 - -gUnknown_83A5DC4:: @ 83A5DC4 - obj_image_anim_frame 0, 1 - obj_image_anim_end - -gUnknown_83A5DCC:: @ 83A5DCC - obj_image_anim_frame 1, 1 - obj_image_anim_end - -gUnknown_83A5DD4:: @ 83A5DD4 - obj_image_anim_frame 2, 1 - obj_image_anim_end - -gUnknown_83A5DDC:: @ 83A5DDC - obj_image_anim_frame 3, 1 - obj_image_anim_end - -gUnknown_83A5DE4:: @ 83A5DE4 - obj_image_anim_frame 4, 1 - obj_image_anim_end - -gUnknown_83A5DEC:: @ 83A5DEC - .4byte gUnknown_83A5DC4 - .4byte gUnknown_83A5DCC - .4byte gUnknown_83A5DD4 - .4byte gUnknown_83A5DDC - .4byte gUnknown_83A5DE4 - -gUnknown_83A5E00:: @ 83A5E00 - spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_64x64, gUnknown_83A5DEC, gUnknown_83A5D9C, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_83A5E18:: @ 83A5E18 - overworld_frame gUnknown_839A288, 2, 2, 0 - overworld_frame gUnknown_839A288, 2, 2, 1 - -gUnknown_83A5E28:: @ 83A5E28 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_end - -gUnknown_83A5E34:: @ 83A5E34 - .4byte gUnknown_83A5E28 - -gUnknown_83A5E38:: @ 83A5E38 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5E34, gUnknown_83A5E18, gDummySpriteAffineAnimTable, UpdateShortGrassFieldEffect - -gUnknown_83A5E50:: @ 83A5E50 - overworld_frame gUnknown_839C508, 2, 2, 0 - -gUnknown_83A5E58:: @ 83A5E58 - obj_image_anim_frame 0, 4 - obj_image_anim_end - -gUnknown_83A5E60:: @ 83A5E60 - .4byte gUnknown_83A5E58 - -gUnknown_83A5E64:: @ 83A5E64 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5E60, gUnknown_83A5E50, gDummySpriteAffineAnimTable, UpdateHotSpringsWaterFieldEffect - -gUnknown_83A5E7C:: @ 83A5E7C - overworld_frame gUnknown_839C5A8, 2, 2, 0 - overworld_frame gUnknown_839C5A8, 2, 2, 1 - overworld_frame gUnknown_839C5A8, 2, 2, 2 - overworld_frame gUnknown_839C5A8, 2, 2, 3 - overworld_frame gUnknown_839C5A8, 2, 2, 4 - -gUnknown_83A5EA4:: @ 83A5EA4 - obj_image_anim_frame 0, 6 - obj_image_anim_frame 1, 6 - obj_image_anim_frame 2, 6 - obj_image_anim_frame 3, 6 - obj_image_anim_frame 4, 6 - obj_image_anim_end - -gUnknown_83A5EBC:: @ 83A5EBC - .4byte gUnknown_83A5EA4 - -gUnknown_83A5EC0:: @ 83A5EC0 - spr_template 0xFFFF, 0x100D, gObjectEventBaseOam_16x16, gUnknown_83A5EBC, gUnknown_83A5E7C, gDummySpriteAffineAnimTable, SpriteCB_PopOutOfAsh - -gUnknown_83A5ED8:: @ 83A5ED8 - obj_pal gUnknown_839C588, 0x100D - -gUnknown_83A5EE0:: @ 83A5EE0 - overworld_frame gUnknown_839C828, 2, 2, 0 - overworld_frame gUnknown_839C828, 2, 2, 1 - overworld_frame gUnknown_839C828, 2, 2, 2 - overworld_frame gUnknown_839C828, 2, 2, 3 - overworld_frame gUnknown_839C828, 2, 2, 4 - -gUnknown_83A5F08:: @ 83A5F08 - obj_image_anim_frame 0, 6 - obj_image_anim_frame 1, 6 - obj_image_anim_frame 2, 6 - obj_image_anim_frame 3, 6 - obj_image_anim_frame 4, 6 - obj_image_anim_end - -gUnknown_83A5F20:: @ 83A5F20 - .4byte gUnknown_83A5F08 - -gUnknown_83A5F24:: @ 83A5F24 - spr_template 0xFFFF, 0x100D, gObjectEventBaseOam_16x16, gUnknown_83A5F20, gUnknown_83A5EE0, gDummySpriteAffineAnimTable, SpriteCB_LavaridgeGymWarp - -gUnknown_83A5F3C:: @ 83A5F3C - overworld_frame gUnknown_839CAA8, 2, 4, 0 - overworld_frame gUnknown_839CAA8, 2, 4, 1 - overworld_frame gUnknown_839CAA8, 2, 4, 2 - overworld_frame gUnknown_839CAA8, 2, 4, 3 - overworld_frame gUnknown_839CAA8, 2, 4, 4 - overworld_frame gUnknown_839CAA8, 2, 4, 5 - overworld_frame gUnknown_839CAA8, 2, 4, 6 - overworld_frame gUnknown_839CAA8, 2, 4, 7 - -gUnknown_83A5F7C:: @ 83A5F7C - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 6 - obj_image_anim_frame 4, 6 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_frame 7, 4 - obj_image_anim_end - -gUnknown_83A5FA0:: @ 83A5FA0 - .4byte gUnknown_83A5F7C - -gUnknown_83A5FA4:: @ 83A5FA4 - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x32, gUnknown_83A5FA0, gUnknown_83A5F3C, gDummySpriteAffineAnimTable, UpdateBubblesFieldEffect - -gUnknown_83A5FBC:: @ 83A5FBC - overworld_frame gUnknown_839D2A8, 2, 2, 0 - overworld_frame gUnknown_839D2A8, 2, 2, 1 - -gUnknown_83A5FCC:: @ 83A5FCC - obj_image_anim_frame 0, 3 - obj_image_anim_frame 1, 5 - obj_image_anim_frame 0, 5 - obj_image_anim_end - -gUnknown_83A5FDC:: @ 83A5FDC - .4byte gUnknown_83A5FCC - -gUnknown_83A5FE0:: @ 83A5FE0 - spr_template 0xFFFF, 0x100F, gObjectEventBaseOam_16x16, gUnknown_83A5FDC, gUnknown_83A5FBC, gDummySpriteAffineAnimTable, UpdateSparkleFieldEffect - -gUnknown_83A5FF8:: - obj_pal gUnknown_839D3A8, 0x100F - -gMovementDelaysMedium:: @ 83A6000 - .2byte 0x0020 - .2byte 0x0040 - .2byte 0x0060 - .2byte 0x0080 - -gUnknown_83A6008:: @ 83A6008 - .2byte 0x0020 - .2byte 0x0040 - .2byte 0x0080 - .2byte 0x00C0 - -gMovementDelaysShort:: @ 83A6010 - .2byte 0x0020 - .2byte 0x0030 - .2byte 0x0040 - .2byte 0x0050 - -gMovementTypeFuncs_WanderAround:: @ 83A6018 - .4byte MovementType_WanderAround_Step0 - .4byte MovementType_WanderAround_Step1 - .4byte MovementType_WanderAround_Step2 - .4byte MovementType_WanderAround_Step3 - .4byte MovementType_WanderAround_Step4 - .4byte MovementType_WanderAround_Step5 - .4byte MovementType_WanderAround_Step6 - -gMovementTypeFuncs_WanderAroundDuplicate:: @ 83A6034 - .4byte MovementType_WanderAround_Step0 - .4byte MovementType_WanderAround_Step1 - .4byte MovementType_WanderAround_Step2 - .4byte MovementType_WanderAround_Step3 - .4byte MovementType_WanderAround_Step4 - .4byte MovementType_WanderAround_Step5Duplicate - .4byte MovementType_WanderAround_Step6 - -gStandardDirections:: @ 83A6050 - .byte 1 @ DIR_SOUTH - .byte 2 @ DIR_NORTH - .byte 3 @ DIR_WEST - .byte 4 @ DIR_EAST - -gGetVectorDirectionFuncs:: @ 83A6054 - .4byte GetVectorDirection - .4byte GetLimitedVectorDirection_SouthNorth - .4byte GetLimitedVectorDirection_WestEast - .4byte GetLimitedVectorDirection_WestNorth - .4byte GetLimitedVectorDirection_EastNorth - .4byte GetLimitedVectorDirection_WestSouth - .4byte GetLimitedVectorDirection_EastSouth - .4byte GetLimitedVectorDirection_SouthNorthWest - .4byte GetLimitedVectorDirection_SouthNorthEast - .4byte GetLimitedVectorDirection_NorthWestEast - .4byte GetLimitedVectorDirection_SouthWestEast - -gMovementTypeFuncs_LookAround:: @ 83A6080 - .4byte MovementType_LookAround_Step0 - .4byte MovementType_LookAround_Step1 - .4byte MovementType_LookAround_Step2 - .4byte MovementType_LookAround_Step3 - .4byte MovementType_LookAround_Step4 - -gMovementTypeFuncs_WanderUpAndDown:: @ 83A6094 - .4byte MovementType_WanderUpAndDown_Step0 - .4byte MovementType_WanderUpAndDown_Step1 - .4byte MovementType_WanderUpAndDown_Step2 - .4byte MovementType_WanderUpAndDown_Step3 - .4byte MovementType_WanderUpAndDown_Step4 - .4byte MovementType_WanderUpAndDown_Step5 - .4byte MovementType_WanderUpAndDown_Step6 - -gUpAndDownDirections:: @ 83A60B0 - .byte 1 @ DIR_SOUTH - .byte 2 @ DIR_NORTH - .byte 0 @ DIR_NONE - .byte 0 @ DIR_NONE - -gMovementTypeFuncs_WanderLeftAndRight:: @ 83A60B4 - .4byte MovementType_WanderLeftAndRight_Step0 - .4byte MovementType_WanderLeftAndRight_Step1 - .4byte MovementType_WanderLeftAndRight_Step2 - .4byte MovementType_WanderLeftAndRight_Step3 - .4byte MovementType_WanderLeftAndRight_Step4 - .4byte MovementType_WanderLeftAndRight_Step5 - .4byte MovementType_WanderLeftAndRight_Step6 - -gLeftAndRightDirections:: @ 83A60D0 - .byte 3 @ DIR_WEST - .byte 4 @ DIR_EAST - .byte 0 @ DIR_NONE - .byte 0 @ DIR_NONE - -gMovementTypeFuncs_FaceDirection:: @ 83A60D4 - .4byte MovementType_FaceDirection_Step0 - .4byte MovementType_FaceDirection_Step1 - .4byte MovementType_FaceDirection_Step2 - -gMovementTypeFuncs_FaceDownAndUp:: @ 83A60E0 - .4byte MovementType_FaceDownAndUp_Step0 - .4byte MovementType_FaceDownAndUp_Step1 - .4byte MovementType_FaceDownAndUp_Step2 - .4byte MovementType_FaceDownAndUp_Step3 - .4byte MovementType_FaceDownAndUp_Step4 - -gMovementTypeFuncs_FaceLeftAndRight:: @ 83A60F4 - .4byte MovementType_FaceLeftAndRight_Step0 - .4byte MovementType_FaceLeftAndRight_Step1 - .4byte MovementType_FaceLeftAndRight_Step2 - .4byte MovementType_FaceLeftAndRight_Step3 - .4byte MovementType_FaceLeftAndRight_Step4 - -gMovementTypeFuncs_FaceUpAndLeft:: @ 83A6108 - .4byte MovementType_FaceUpAndLeft_Step0 - .4byte MovementType_FaceUpAndLeft_Step1 - .4byte MovementType_FaceUpAndLeft_Step2 - .4byte MovementType_FaceUpAndLeft_Step3 - .4byte MovementType_FaceUpAndLeft_Step4 - -gUpAndLeftDirections:: @ 83A611C - .byte 2 @ DIR_NORTH - .byte 3 @ DIR_WEST - .byte 0 @ DIR_NONE - .byte 0 @ DIR_NONE - -gMovementTypeFuncs_FaceUpAndRight:: @ 83A6120 - .4byte MovementType_FaceUpAndRight_Step0 - .4byte MovementType_FaceUpAndRight_Step1 - .4byte MovementType_FaceUpAndRight_Step2 - .4byte MovementType_FaceUpAndRight_Step3 - .4byte MovementType_FaceUpAndRight_Step4 - -gUpAndRightDirections:: @ 83A6134 - .byte 2 @ DIR_NORTH - .byte 4 @ DIR_EAST - .byte 0 @ DIR_NONE - .byte 0 @ DIR_NONE - -gMovementTypeFuncs_FaceDownAndLeft:: @ 83A6138 - .4byte MovementType_FaceDownAndLeft_Step0 - .4byte MovementType_FaceDownAndLeft_Step1 - .4byte MovementType_FaceDownAndLeft_Step2 - .4byte MovementType_FaceDownAndLeft_Step3 - .4byte MovementType_FaceDownAndLeft_Step4 - -gDownAndLeftDirections:: @ 83A614C - .byte 1 @ DIR_SOUTH - .byte 3 @ DIR_WEST - .byte 0 @ DIR_NONE - .byte 0 @ DIR_NONE - -gMovementTypeFuncs_FaceDownAndRight:: @ 83A6150 - .4byte MovementType_FaceDownAndRight_Step0 - .4byte MovementType_FaceDownAndRight_Step1 - .4byte MovementType_FaceDownAndRight_Step2 - .4byte MovementType_FaceDownAndRight_Step3 - .4byte MovementType_FaceDownAndRight_Step4 - -gDownAndRightDirections:: @ 83A6164 - .byte 1 @ DIR_SOUTH - .byte 4 @ DIR_EAST - .byte 0 @ DIR_NONE - .byte 0 @ DIR_NONE - -gMovementTypeFuncs_FaceDownUpAndLeft:: @ 83A6168 - .4byte MovementType_FaceDownUpAndLeft_Step0 - .4byte MovementType_FaceDownUpAndLeft_Step1 - .4byte MovementType_FaceDownUpAndLeft_Step2 - .4byte MovementType_FaceDownUpAndLeft_Step3 - .4byte MovementType_FaceDownUpAndLeft_Step4 - -gDownUpAndLeftDirections:: @ 83A617C - .byte 2 @ DIR_NORTH - .byte 1 @ DIR_SOUTH - .byte 3 @ DIR_WEST - .byte 1 @ DIR_SOUTH - -gMovementTypeFuncs_FaceDownUpAndRight:: @ 83A6180 - .4byte MovementType_FaceDownUpAndRight_Step0 - .4byte MovementType_FaceDownUpAndRight_Step1 - .4byte MovementType_FaceDownUpAndRight_Step2 - .4byte MovementType_FaceDownUpAndRight_Step3 - .4byte MovementType_FaceDownUpAndRight_Step4 - -gDownUpAndRightDirections:: @ 83A6194 - .byte 1 @ DIR_SOUTH - .byte 2 @ DIR_NORTH - .byte 4 @ DIR_EAST - .byte 1 @ DIR_SOUTH - -gMovementTypeFuncs_FaceUpLeftAndRight:: @ 83A6198 - .4byte MovementType_FaceUpLeftAndRight_Step0 - .4byte MovementType_FaceUpLeftAndRight_Step1 - .4byte MovementType_FaceUpLeftAndRight_Step2 - .4byte MovementType_FaceUpLeftAndRight_Step3 - .4byte MovementType_FaceUpLeftAndRight_Step4 - -gUpLeftAndRightDirections:: @ 83A61AC - .byte 2 @ DIR_NORTH - .byte 3 @ DIR_WEST - .byte 4 @ DIR_EAST - .byte 2 @ DIR_NORTH - -gMovementTypeFuncs_FaceDownLeftAndRight:: @ 83A61B0 - .4byte MovementType_FaceDownLeftAndRight_Step0 - .4byte MovementType_FaceDownLeftAndRight_Step1 - .4byte MovementType_FaceDownLeftAndRight_Step2 - .4byte MovementType_FaceDownLeftAndRight_Step3 - .4byte MovementType_FaceDownLeftAndRight_Step4 - -gDownLeftAndRightDirections:: @ 83A61C4 - .byte 3 @ DIR_WEST - .byte 4 @ DIR_EAST - .byte 1 @ DIR_SOUTH - .byte 1 @ DIR_SOUTH - -gMovementTypeFuncs_RotateCounterclockwise:: @ 83A61C8 - .4byte MovementType_RotateCounterclockwise_Step0 - .4byte MovementType_RotateCounterclockwise_Step1 - .4byte MovementType_RotateCounterclockwise_Step2 - .4byte MovementType_RotateCounterclockwise_Step3 - -gCounterclockwiseDirections:: @ 83A61D8 - .byte 0x01 - .byte 0x04 - .byte 0x03 - .byte 0x01 - .byte 0x02 - .byte 0x00 - .byte 0x00 - .byte 0x00 - -gMovementTypeFuncs_RotateClockwise:: @ 83A61E0 - .4byte MovementType_RotateClockwise_Step0 - .4byte MovementType_RotateClockwise_Step1 - .4byte MovementType_RotateClockwise_Step2 - .4byte MovementType_RotateClockwise_Step3 - -gClockwiseDirections:: @ 83A61F0 - .byte 0x01 - .byte 0x03 - .byte 0x04 - .byte 0x02 - .byte 0x01 - .byte 0x00 - .byte 0x00 - .byte 0x00 - -gMovementTypeFuncs_WalkBackAndForth:: @ 83A61F8 - .4byte MovementType_WalkBackAndForth_Step0 - .4byte MovementType_WalkBackAndForth_Step1 - .4byte MovementType_WalkBackAndForth_Step2 - .4byte MovementType_WalkBackAndForth_Step3 - -gMovementTypeFuncs_WalkSequenceUpRightLeftDown:: @ 83A6208 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceUpRightLeftDown_Step1 - .4byte MovementType_WalkSequence_Step2 - -gUpRightLeftDownDirections:: @ 83A6214 - .byte 2 - .byte 4 - .byte 3 - .byte 1 - -gMovementTypeFuncs_WalkSequenceRightLeftDownUp:: @ 83A6218 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceRightLeftDownUp_Step1 - .4byte MovementType_WalkSequence_Step2 - -gRightLeftDownUpDirections:: @ 83A6224 - .byte 4 - .byte 3 - .byte 1 - .byte 2 - -gMovementTypeFuncs_WalkSequenceDownUpRightLeft:: @ 83A6228 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceDownUpRightLeft_Step1 - .4byte MovementType_WalkSequence_Step2 - -gDownUpRightLeftDirections:: @ 83A6234 - .byte 1 - .byte 2 - .byte 4 - .byte 3 - -gMovementTypeFuncs_WalkSequenceLeftDownUpRight:: @ 83A6238 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceLeftDownUpRight_Step1 - .4byte MovementType_WalkSequence_Step2 - -gLeftDownUpRightDirections:: @ 83A6244 - .byte 3 - .byte 1 - .byte 2 - .byte 4 - -gMovementTypeFuncs_WalkSequenceUpLeftRightDown:: @ 83A6248 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceUpLeftRightDown_Step1 - .4byte MovementType_WalkSequence_Step2 - -gUpLeftRightDownDirections:: @ 83A6254 - .byte 2 - .byte 3 - .byte 4 - .byte 1 - -gMovementTypeFuncs_WalkSequenceLeftRightDownUp:: @ 83A6258 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceLeftRightDownUp_Step1 - .4byte MovementType_WalkSequence_Step2 - -gLeftRightDownUpDirections:: @ 83A6264 - .byte 3 - .byte 4 - .byte 1 - .byte 2 - -gMovementTypeFuncs_WalkSequenceDownUpLeftRight:: @ 83A6268 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceDownUpLeftRight_Step1 - .4byte MovementType_WalkSequence_Step2 - -gMovementTypeFuncs_WalkSequenceRightDownUpLeft:: @ 83A6274 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceRightDownUpLeft_Step1 - .4byte MovementType_WalkSequence_Step2 - -gRightDownUpLeftDirections:: @ 83A6280 - .byte 4 - .byte 1 - .byte 2 - .byte 3 - -gMovementTypeFuncs_WalkSequenceLeftUpDownRight:: @ 83A6284 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceLeftUpDownRight_Step1 - .4byte MovementType_WalkSequence_Step2 - -gLeftUpDownRightDirections:: @ 83A6290 - .byte 3 - .byte 2 - .byte 1 - .byte 4 - -gMovementTypeFuncs_WalkSequenceUpDownRightLeft:: @ 83A6294 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceUpDownRightLeft_Step1 - .4byte MovementType_WalkSequence_Step2 - -gUpDownRightLeftDirections:: @ 83A62A0 - .byte 2 - .byte 1 - .byte 4 - .byte 3 - -gMovementTypeFuncs_WalkSequenceRightLeftUpDown:: @ 83A62A4 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceRightLeftUpDown_Step1 - .4byte MovementType_WalkSequence_Step2 - -gRightLeftUpDownDirections:: @ 83A62B0 - .byte 4 - .byte 3 - .byte 2 - .byte 1 - -gMovementTypeFuncs_WalkSequenceDownRightLeftUp:: @ 83A62B4 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceDownRightLeftUp_Step1 - .4byte MovementType_WalkSequence_Step2 - -gDownRightLeftUpDirections:: @ 83A62C0 - .byte 1 - .byte 4 - .byte 3 - .byte 2 - -gMovementTypeFuncs_WalkSequenceRightUpDownLeft:: @ 83A62C4 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceRightUpDownLeft_Step1 - .4byte MovementType_WalkSequence_Step2 - -gRightUpDownLeftDirections:: @ 83A62D0 - .byte 4 - .byte 2 - .byte 1 - .byte 3 - -gMovementTypeFuncs_WalkSequenceUpDownLeftRight:: @ 83A62D4 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceUpDownLeftRight_Step1 - .4byte MovementType_WalkSequence_Step2 - -gUpDownLeftRightDirections:: @ 83A62E0 - .byte 2 - .byte 1 - .byte 3 - .byte 4 - -gMovementTypeFuncs_WalkSequenceLeftRightUpDown:: @ 83A62E4 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceLeftRightUpDown_Step1 - .4byte MovementType_WalkSequence_Step2 - -gLeftRightUpDownDirections:: @ 83A62F0 - .byte 3 - .byte 4 - .byte 2 - .byte 1 - -gMovementTypeFuncs_WalkSequenceDownLeftRightUp:: @ 83A62F4 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceDownLeftRightUp_Step1 - .4byte MovementType_WalkSequence_Step2 - -gDownLeftRightUpDirections:: @ 83A6300 - .byte 1 - .byte 3 - .byte 4 - .byte 2 - -gMovementTypeFuncs_WalkSequenceUpLeftDownRight:: @ 83A6304 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceUpLeftDownRight_Step1 - .4byte MovementType_WalkSequence_Step2 - -gUpLeftDownRightDirections:: @ 83A6310 - .byte 2 - .byte 3 - .byte 1 - .byte 4 - -gMovementTypeFuncs_WalkSequenceDownRightUpLeft:: @ 83A6314 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceDownRightUpLeft_Step1 - .4byte MovementType_WalkSequence_Step2 - -gDownRightUpLeftDirections:: @ 83A6320 - .byte 1 - .byte 4 - .byte 2 - .byte 3 - -gMovementTypeFuncs_WalkSequenceLeftDownRightUp:: @ 83A6324 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceLeftDownRightUp_Step1 - .4byte MovementType_WalkSequence_Step2 - -gLeftDownRightUpDirections:: @ 83A6330 - .byte 3 - .byte 1 - .byte 4 - .byte 2 - -gMovementTypeFuncs_WalkSequenceRightUpLeftDown:: @ 83A6334 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceRightUpLeftDown_Step1 - .4byte MovementType_WalkSequence_Step2 - -gRightUpLeftDownDirections:: @ 83A6340 - .byte 4 - .byte 2 - .byte 3 - .byte 1 - -gMovementTypeFuncs_WalkSequenceUpRightDownLeft:: @ 83A6344 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceUpRightDownLeft_Step1 - .4byte MovementType_WalkSequence_Step2 - -gUpRightDownLeftDirections:: @ 83A6350 - .byte 2 - .byte 4 - .byte 1 - .byte 3 - -gMovementTypeFuncs_WalkSequenceDownLeftUpRight:: @ 83A6354 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceDownLeftUpRight_Step1 - .4byte MovementType_WalkSequence_Step2 - -gDownLeftUpRightDirections:: @ 83A6360 - .byte 1 - .byte 3 - .byte 2 - .byte 4 - -gMovementTypeFuncs_WalkSequenceLeftUpRightDown:: @ 83A6364 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceLeftUpRightDown_Step1 - .4byte MovementType_WalkSequence_Step2 - -gLeftUpRightDownDirections:: @ 83A6370 - .byte 3 - .byte 2 - .byte 4 - .byte 1 - -gMovementTypeFuncs_WalkSequenceRightDownLeftUp:: @ 83A6374 - .4byte MovementType_WalkSequence_Step0 - .4byte MovementType_WalkSequenceRightDownLeftUp_Step1 - .4byte MovementType_WalkSequence_Step2 - -gRightDownLeftUpDirections:: @ 83A6380 - .byte 4 - .byte 1 - .byte 3 - .byte 2 - -gMovementTypeFuncs_CopyPlayer:: @ 83A6384 - .4byte MovementType_CopyPlayer_Step0 - .4byte MovementType_CopyPlayer_Step1 - .4byte MovementType_CopyPlayer_Step2 - -gCopyPlayerMovementFuncs:: @ 83A6390 - .4byte CopyablePlayerMovement_None - .4byte CopyablePlayerMovement_FaceDirection - .4byte CopyablePlayerMovement_GoSpeed0 - .4byte CopyablePlayerMovement_GoSpeed1 - .4byte CopyablePlayerMovement_GoSpeed2 - .4byte CopyablePlayerMovement_Slide - .4byte cph_IM_DIFFERENT - .4byte CopyablePlayerMovement_GoSpeed4 - .4byte CopyablePlayerMovement_Jump - .4byte CopyablePlayerMovement_None - .4byte CopyablePlayerMovement_None - -gMovementTypeFuncs_CopyPlayerInGrass:: @ 83A63BC - .4byte MovementType_CopyPlayer_Step0 - .4byte MovementType_CopyPlayerInGrass_Step1 - .4byte MovementType_CopyPlayer_Step2 - -gMovementTypeFuncs_Hidden:: @ 83A63C8 - .4byte MovementType_Hidden_Step0 - -gMovementTypeFuncs_WalkInPlace:: @ 83A63CC - .4byte MovementType_WalkInPlace_Step0 - .4byte MovementType_MoveInPlace_Step1 - -gMovementTypeFuncs_WalkSlowlyInPlace:: @ 83A63D4 - .4byte MovementType_WalkSlowlyInPlace_Step0 - .4byte MovementType_MoveInPlace_Step1 - -gMovementTypeFuncs_JogInPlace:: @ 83A63DC - .4byte MovementType_JogInPlace_Step0 - .4byte MovementType_MoveInPlace_Step1 - -gMovementTypeFuncs_Invisible:: @ 83A63E4 - .4byte MovementType_Invisible_Step0 - .4byte MovementType_Invisible_Step1 - .4byte MovementType_Invisible_Step2 - -gUnknown_83A63F0:: @ 83A63F0 - .4byte sub_8063364 - .4byte sub_8063384 - .4byte sub_80633A4 - -gUnknown_83A63FC:: @ 83A63FC - .4byte sub_80633B4 - .4byte sub_80633F4 - -gUnknown_83A6404:: @ 83A6404 - .4byte sub_80633D4 - .4byte sub_80633F4 - -gFaceDirectionAnimNums:: @ 83A640C - .byte 0x00 @ DIR_NONE - .byte 0x00 @ DIR_SOUTH - .byte 0x01 @ DIR_NORTH - .byte 0x02 @ DIR_WEST - .byte 0x03 @ DIR_EAST - .byte 0x00 @ DIR_SOUTHWEST - .byte 0x00 @ DIR_SOUTHEAST - .byte 0x01 @ DIR_NORTHWEST - .byte 0x01 @ DIR_NORTHEAST - -gMoveDirectionAnimNums:: @ 83A6415 - .byte 0x4 @ DIR_NONE - .byte 0x4 @ DIR_SOUTH - .byte 0x5 @ DIR_NORTH - .byte 0x6 @ DIR_WEST - .byte 0x7 @ DIR_EAST - .byte 0x4 @ DIR_SOUTHWEST - .byte 0x4 @ DIR_SOUTHEAST - .byte 0x5 @ DIR_NORTHWEST - .byte 0x5 @ DIR_NORTHEAST - -gMoveDirectionFastAnimNums:: @ 83A641E - .byte 0x8 @ DIR_NONE - .byte 0x8 @ DIR_SOUTH - .byte 0x9 @ DIR_NORTH - .byte 0xA @ DIR_WEST - .byte 0xB @ DIR_EAST - .byte 0x8 @ DIR_SOUTHWEST - .byte 0x8 @ DIR_SOUTHEAST - .byte 0x9 @ DIR_NORTHWEST - .byte 0x9 @ DIR_NORTHEAST - -gMoveDirectionFasterAnimNums:: @ 83A6427 - .byte 0xC @ DIR_NONE - .byte 0xC @ DIR_SOUTH - .byte 0xD @ DIR_NORTH - .byte 0xE @ DIR_WEST - .byte 0xF @ DIR_EAST - .byte 0xC @ DIR_SOUTHWEST - .byte 0xC @ DIR_SOUTHEAST - .byte 0xD @ DIR_NORTHWEST - .byte 0xD @ DIR_NORTHEAST - -gMoveDirectionFastestAnimNums:: @ 83A6430 - .byte 0x10 @ DIR_NONE - .byte 0x10 @ DIR_SOUTH - .byte 0x11 @ DIR_NORTH - .byte 0x12 @ DIR_WEST - .byte 0x13 @ DIR_EAST - .byte 0x10 @ DIR_SOUTHWEST - .byte 0x10 @ DIR_SOUTHEAST - .byte 0x11 @ DIR_NORTHWEST - .byte 0x11 @ DIR_NORTHEAST - -gJumpSpecialDirectionAnimNums:: @ 83A6439 - .byte 0x14 @ DIR_NONE - .byte 0x14 @ DIR_SOUTH - .byte 0x15 @ DIR_NORTH - .byte 0x16 @ DIR_WEST - .byte 0x17 @ DIR_EAST - .byte 0x14 @ DIR_SOUTHWEST - .byte 0x14 @ DIR_SOUTHEAST - .byte 0x15 @ DIR_NORTHWEST - .byte 0x15 @ DIR_NORTHEAST - -gAcroWheelieDirectionAnimNums:: @ 83A6442 - .byte 0x14 @ DIR_NONE - .byte 0x14 @ DIR_SOUTH - .byte 0x15 @ DIR_NORTH - .byte 0x16 @ DIR_WEST - .byte 0x17 @ DIR_EAST - .byte 0x14 @ DIR_SOUTHWEST - .byte 0x14 @ DIR_SOUTHEAST - .byte 0x15 @ DIR_NORTHWEST - .byte 0x15 @ DIR_NORTHEAST - -gUnrefAnimNums_080634A0:: @ 83A644B - .byte 0x18 @ DIR_NONE - .byte 0x18 @ DIR_SOUTH - .byte 0x19 @ DIR_NORTH - .byte 0x1A @ DIR_WEST - .byte 0x1B @ DIR_EAST - .byte 0x18 @ DIR_SOUTHWEST - .byte 0x18 @ DIR_SOUTHEAST - .byte 0x19 @ DIR_NORTHWEST - .byte 0x19 @ DIR_NORTHEAST - -gAcroEndWheelieDirectionAnimNums:: @ 83A6454 - .byte 0x1C @ DIR_NONE - .byte 0x1C @ DIR_SOUTH - .byte 0x1D @ DIR_NORTH - .byte 0x1E @ DIR_WEST - .byte 0x1F @ DIR_EAST - .byte 0x1C @ DIR_SOUTHWEST - .byte 0x1C @ DIR_SOUTHEAST - .byte 0x1D @ DIR_NORTHWEST - .byte 0x1D @ DIR_NORTHEAST - -@ gAcroUnusedActionDirectionAnimNums? -gAcroUnusedActionDirectionAnimNums:: @ 83A645D - .byte 0x18 @ DIR_NONE - .byte 0x18 @ DIR_SOUTH - .byte 0x19 @ DIR_NORTH - .byte 0x1A @ DIR_WEST - .byte 0x1B @ DIR_EAST - .byte 0x18 @ DIR_SOUTHWEST - .byte 0x19 @ DIR_SOUTHEAST - .byte 0x1A @ DIR_NORTHWEST - .byte 0x1B @ DIR_NORTHEAST - -@ gAcroWheeliePedalDirectionAnimNums? -gAcroWheeliePedalDirectionAnimNums:: @ 83A6466 - .byte 0x20 @ DIR_NONE - .byte 0x20 @ DIR_SOUTH - .byte 0x21 @ DIR_NORTH - .byte 0x22 @ DIR_WEST - .byte 0x23 @ DIR_EAST - .byte 0x20 @ DIR_SOUTHWEST - .byte 0x20 @ DIR_SOUTHEAST - .byte 0x21 @ DIR_NORTHWEST - .byte 0x21 @ DIR_NORTHEAST - -@ ??? -gFishingDirectionAnimNums:: @ 83A646F - .byte 0x24 @ DIR_NONE - .byte 0x24 @ DIR_SOUTH - .byte 0x25 @ DIR_NORTH - .byte 0x26 @ DIR_WEST - .byte 0x27 @ DIR_EAST - .byte 0x24 @ DIR_SOUTHWEST - .byte 0x24 @ DIR_SOUTHEAST - .byte 0x25 @ DIR_NORTHWEST - .byte 0x25 @ DIR_NORTHEAST - -@ gFishingDirectionAnimNums? -gFishingNoCatchDirectionAnimNums:: @ 83A6478 - .byte 0x0 @ DIR_NONE - .byte 0x0 @ DIR_SOUTH - .byte 0x1 @ DIR_NORTH - .byte 0x2 @ DIR_WEST - .byte 0x3 @ DIR_EAST - .byte 0x0 @ DIR_SOUTHWEST - .byte 0x0 @ DIR_SOUTHEAST - .byte 0x1 @ DIR_NORTHWEST - .byte 0x1 @ DIR_NORTHEAST - -@ gFishingNoCatchDirectionAnimNums? -gFishingBiteDirectionAnimNums:: @ 83A6481 - .byte 0x4 @ DIR_NONE - .byte 0x4 @ DIR_SOUTH - .byte 0x5 @ DIR_NORTH - .byte 0x6 @ DIR_WEST - .byte 0x7 @ DIR_EAST - .byte 0x4 @ DIR_SOUTHWEST - .byte 0x4 @ DIR_SOUTHEAST - .byte 0x5 @ DIR_NORTHWEST - .byte 0x5 @ DIR_NORTHEAST - -@ gFishingBiteDirectionAnimNums? -gUnknown_83A648A:: @ 83A648A - .byte 0x8 @ DIR_NONE - .byte 0x8 @ DIR_SOUTH - .byte 0x9 @ DIR_NORTH - .byte 0xA @ DIR_WEST - .byte 0xB @ DIR_EAST - .byte 0x8 @ DIR_SOUTHWEST - .byte 0x8 @ DIR_SOUTHEAST - .byte 0x9 @ DIR_NORTHWEST - .byte 0x9 @ DIR_NORTHEAST - -@ gRunningDirectionAnimNums? -gRunningDirectionAnimNums:: @ 83A6493 - .byte 0x14 @ DIR_NONE - .byte 0x14 @ DIR_SOUTH - .byte 0x15 @ DIR_NORTH - .byte 0x16 @ DIR_WEST - .byte 0x17 @ DIR_EAST - .byte 0x14 @ DIR_SOUTHWEST - .byte 0x14 @ DIR_SOUTHEAST - .byte 0x15 @ DIR_NORTHWEST - .byte 0x15 @ DIR_NORTHEAST - -gTrainerFacingDirectionMovementTypes:: @ 83A649C - .byte 0x08 @ DIR_NONE - .byte 0x08 @ DIR_SOUTH - .byte 0x07 @ DIR_NORTH - .byte 0x09 @ DIR_WEST - .byte 0x0A @ DIR_EAST - .byte 0x08 @ DIR_SOUTHWEST - .byte 0x08 @ DIR_SOUTHEAST - .byte 0x07 @ DIR_NORTHWEST - .byte 0x07 @ DIR_NORTHEAST - - .align 2 -gOppositeDirectionBlockedMetatileFuncs:: @ 83A64A8 - .4byte MetatileBehavior_IsSouthBlocked - .4byte MetatileBehavior_IsNorthBlocked - .4byte MetatileBehavior_IsWestBlocked - .4byte MetatileBehavior_IsEastBlocked - -gDirectionBlockedMetatileFuncs:: @ 83A64B8 - .4byte MetatileBehavior_IsNorthBlocked - .4byte MetatileBehavior_IsSouthBlocked - .4byte MetatileBehavior_IsEastBlocked - .4byte MetatileBehavior_IsWestBlocked - -@ sDirectionToVectors -sDirectionToVectors:: @ 83A64C8 - .2byte 0, 0 @ DIR_NONE - .2byte 0, 1 @ DIR_SOUTH - .2byte 0, -1 @ DIR_NORTH - .2byte -1, 0 @ DIR_WEST - .2byte 1, 0 @ DIR_EAST - .2byte -1, 1 @ DIR_SOUTHWEST - .2byte 1, 1 @ DIR_SOUTHEAST - .2byte -1, -1 @ DIR_NORTHWEST - .2byte 1, -1 @ DIR_NORTHEAST - -@ gFaceDirectionMovementActions -gFaceDirectionMovementActions:: @ 83A64EC - .byte 0x0 @ DIR_NONE - .byte 0x0 @ DIR_SOUTH - .byte 0x1 @ DIR_NORTH - .byte 0x2 @ DIR_WEST - .byte 0x3 @ DIR_EAST - -gWalkSlowMovementActions:: @ 83A64F1 - .byte 0x4 @ DIR_NONE - .byte 0x4 @ DIR_SOUTH - .byte 0x5 @ DIR_NORTH - .byte 0x6 @ DIR_WEST - .byte 0x7 @ DIR_EAST - -gUnknown_83A64F6:: @ 83A64F6 - .byte 0x9B @ DIR_NONE - .byte 0x9B @ DIR_SOUTH - .byte 0x9C @ DIR_NORTH - .byte 0x9D @ DIR_WEST - .byte 0x9E @ DIR_EAST - -gUnknown_83A64FB:: @ 83A64FB - .byte 0x8 @ DIR_NONE - .byte 0x8 @ DIR_SOUTH - .byte 0x9 @ DIR_NORTH - .byte 0xA @ DIR_WEST - .byte 0xB @ DIR_EAST - -gUnknown_83A6500:: @ 83A6500 - .byte 0xC @ DIR_NONE - .byte 0xC @ DIR_SOUTH - .byte 0xD @ DIR_NORTH - .byte 0xE @ DIR_WEST - .byte 0xF @ DIR_EAST - -gUnknown_83A6505:: @ 83A6505 - .byte 0x10 @ DIR_NONE - .byte 0x10 @ DIR_SOUTH - .byte 0x11 @ DIR_NORTH - .byte 0x12 @ DIR_WEST - .byte 0x13 @ DIR_EAST - -gUnknown_83A650A:: @ 83A650A - .byte 0x1D @ DIR_NONE - .byte 0x1D @ DIR_SOUTH - .byte 0x1E @ DIR_NORTH - .byte 0x1F @ DIR_WEST - .byte 0x20 @ DIR_EAST - -gUnknown_83A650F:: @ 83A650F - .byte 0xA0 @ DIR_NONE - .byte 0xA0 @ DIR_SOUTH - .byte 0xA1 @ DIR_NORTH - .byte 0xA2 @ DIR_WEST - .byte 0xA3 @ DIR_EAST - -gUnknown_83A6514:: @ 83A6514 - .byte 0x31 @ DIR_NONE - .byte 0x31 @ DIR_SOUTH - .byte 0x32 @ DIR_NORTH - .byte 0x33 @ DIR_WEST - .byte 0x34 @ DIR_EAST - -gUnknown_83A6519:: @ 83A6519 - .byte 0x35 @ DIR_NONE - .byte 0x35 @ DIR_SOUTH - .byte 0x36 @ DIR_NORTH - .byte 0x37 @ DIR_WEST - .byte 0x38 @ DIR_EAST - -gUnknown_83A651E:: @ 83A651E - .byte 0x39 @ DIR_NONE - .byte 0x39 @ DIR_SOUTH - .byte 0x3A @ DIR_NORTH - .byte 0x3B @ DIR_WEST - .byte 0x3C @ DIR_EAST - -gUnknown_83A6523:: @ 83A6523 - .byte 0x3D @ DIR_NONE - .byte 0x3D @ DIR_SOUTH - .byte 0x3E @ DIR_NORTH - .byte 0x3F @ DIR_WEST - .byte 0x40 @ DIR_EAST - -gUnknown_83A6528:: @ 83A6528 - .byte 0x41 @ DIR_NONE - .byte 0x41 @ DIR_SOUTH - .byte 0x42 @ DIR_NORTH - .byte 0x43 @ DIR_WEST - .byte 0x44 @ DIR_EAST - -gUnknown_83A652D:: @ 83A652D - .byte 0x94 @ DIR_NONE - .byte 0x94 @ DIR_SOUTH - .byte 0x95 @ DIR_NORTH - .byte 0x96 @ DIR_WEST - .byte 0x97 @ DIR_EAST - -gUnknown_83A6532:: @ 83A6532 - .byte 0x14 @ DIR_NONE - .byte 0x14 @ DIR_SOUTH - .byte 0x15 @ DIR_NORTH - .byte 0x16 @ DIR_WEST - .byte 0x17 @ DIR_EAST - -gUnknown_83A6537:: @ 83A6537 - .byte 0x52 @ DIR_NONE - .byte 0x52 @ DIR_SOUTH - .byte 0x53 @ DIR_NORTH - .byte 0x54 @ DIR_WEST - .byte 0x55 @ DIR_EAST - -gUnknown_83A653C:: @ 83A653C - .byte 0x57 @ DIR_NONE - .byte 0x57 @ DIR_SOUTH - .byte 0x56 @ DIR_NORTH - .byte 0x59 @ DIR_WEST - .byte 0x58 @ DIR_EAST - -gUnknown_83A6541:: @ 83A6541 - .byte 0x4E @ DIR_NONE - .byte 0x4E @ DIR_SOUTH - .byte 0x4F @ DIR_NORTH - .byte 0x50 @ DIR_WEST - .byte 0x51 @ DIR_EAST - -gUnknown_83A6546:: @ 83A6546 - .byte 0x46 @ DIR_NONE - .byte 0x46 @ DIR_SOUTH - .byte 0x47 @ DIR_NORTH - .byte 0x48 @ DIR_WEST - .byte 0x49 @ DIR_EAST - -gUnknown_83A654B:: @ 83A654B - .byte 0xA6 @ DIR_NONE - .byte 0xA6 @ DIR_SOUTH - .byte 0xA7 @ DIR_NORTH - .byte 0xA8 @ DIR_WEST - .byte 0xA9 @ DIR_EAST - -gUnknown_83A6550:: @ 83A6550 - .byte 0x21 @ DIR_NONE - .byte 0x21 @ DIR_SOUTH - .byte 0x22 @ DIR_NORTH - .byte 0x23 @ DIR_WEST - .byte 0x24 @ DIR_EAST - -gUnknown_83A6555:: @ 83A6555 - .byte 0x25 @ DIR_NONE - .byte 0x25 @ DIR_SOUTH - .byte 0x26 @ DIR_NORTH - .byte 0x27 @ DIR_WEST - .byte 0x28 @ DIR_EAST - -gUnknown_83A655A:: @ 83A655A - .byte 0x29 @ DIR_NONE - .byte 0x29 @ DIR_SOUTH - .byte 0x2A @ DIR_NORTH - .byte 0x2B @ DIR_WEST - .byte 0x2C @ DIR_EAST - -gUnknown_83A655F:: @ 83A655F - .byte 0x2D @ DIR_NONE - .byte 0x2D @ DIR_SOUTH - .byte 0x2E @ DIR_NORTH - .byte 0x2F @ DIR_WEST - .byte 0x30 @ DIR_EAST - -gUnknown_83A6564:: @ 83A6564 - .byte 0x70 @ DIR_NONE - .byte 0x70 @ DIR_SOUTH - .byte 0x71 @ DIR_NORTH - .byte 0x72 @ DIR_WEST - .byte 0x73 @ DIR_EAST - -gUnknown_83A6569:: @ 83A6569 - .byte 0x74 @ DIR_NONE - .byte 0x74 @ DIR_SOUTH - .byte 0x75 @ DIR_NORTH - .byte 0x76 @ DIR_WEST - .byte 0x77 @ DIR_EAST - -gUnknown_83A656E:: @ 83A656E - .byte 0x78 @ DIR_NONE - .byte 0x78 @ DIR_SOUTH - .byte 0x79 @ DIR_NORTH - .byte 0x7A @ DIR_WEST - .byte 0x7B @ DIR_EAST - -gUnknown_83A6573:: @ 83A6573 - .byte 0x7C @ DIR_NONE - .byte 0x7C @ DIR_SOUTH - .byte 0x7D @ DIR_NORTH - .byte 0x7E @ DIR_WEST - .byte 0x7F @ DIR_EAST - -gUnknown_83A6578:: @ 83A6578 - .byte 0x80 @ DIR_NONE - .byte 0x80 @ DIR_SOUTH - .byte 0x81 @ DIR_NORTH - .byte 0x82 @ DIR_WEST - .byte 0x83 @ DIR_EAST - -gUnknown_83A657D:: @ 83A657D - .byte 0x84 @ DIR_NONE - .byte 0x84 @ DIR_SOUTH - .byte 0x85 @ DIR_NORTH - .byte 0x86 @ DIR_WEST - .byte 0x87 @ DIR_EAST - -gUnknown_83A6582:: @ 83A6582 - .byte 0x88 @ DIR_NONE - .byte 0x88 @ DIR_SOUTH - .byte 0x89 @ DIR_NORTH - .byte 0x8A @ DIR_WEST - .byte 0x8B @ DIR_EAST - -gUnknown_83A6587:: @ 83A6587 - .byte 0x8C @ DIR_NONE - .byte 0x8C @ DIR_SOUTH - .byte 0x8D @ DIR_NORTH - .byte 0x8E @ DIR_WEST - .byte 0x8F @ DIR_EAST - -gUnknown_83A658C:: @ 83A658C - .byte 0x90 @ DIR_NONE - .byte 0x90 @ DIR_SOUTH - .byte 0x91 @ DIR_NORTH - .byte 0x92 @ DIR_WEST - .byte 0x93 @ DIR_EAST - -@ gOppositeDirections ? -gOppositeDirections:: @ 83A6591 - .byte 0x02 - .byte 0x01 - .byte 0x04 - .byte 0x03 - .byte 0x08 - .byte 0x07 - .byte 0x06 - .byte 0x05 - -gUnknown_83A6599:: @ 83A6599 - .byte 0x02 - .byte 0x01 - .byte 0x04 - .byte 0x03 - .byte 0x01 - .byte 0x02 - .byte 0x03 - .byte 0x04 - .byte 0x03 - .byte 0x04 - .byte 0x02 - .byte 0x01 - .byte 0x04 - .byte 0x03 - .byte 0x01 - .byte 0x02 - -gUnknown_83A65A9:: @ 83A65A9 - .byte 0x02 - .byte 0x01 - .byte 0x04 - .byte 0x03 - .byte 0x01 - .byte 0x02 - .byte 0x03 - .byte 0x04 - .byte 0x04 - .byte 0x03 - .byte 0x01 - .byte 0x02 - .byte 0x03 - .byte 0x04 - .byte 0x02 - .byte 0x01 - .byte 0x00 - .byte 0x00 - .byte 0x00 - -gMovementActionFuncs:: @ 83A65BC - .4byte sMovementActionFuncs_x00 - .4byte sMovementActionFuncs_x01 - .4byte sMovementActionFuncs_x02 - .4byte sMovementActionFuncs_x03 - .4byte sMovementActionFuncs_x04 - .4byte sMovementActionFuncs_x05 - .4byte sMovementActionFuncs_x06 - .4byte sMovementActionFuncs_x07 - .4byte sMovementActionFuncs_x08 - .4byte sMovementActionFuncs_x09 - .4byte sMovementActionFuncs_x0A - .4byte sMovementActionFuncs_x0B - .4byte sMovementActionFuncs_x0C - .4byte sMovementActionFuncs_x0D - .4byte sMovementActionFuncs_x0E - .4byte sMovementActionFuncs_x0F - .4byte sMovementActionFuncs_x10 - .4byte sMovementActionFuncs_x11 - .4byte sMovementActionFuncs_x12 - .4byte sMovementActionFuncs_x13 - .4byte sMovementActionFuncs_x14 - .4byte sMovementActionFuncs_x15 - .4byte sMovementActionFuncs_x16 - .4byte sMovementActionFuncs_x17 - .4byte sMovementActionFuncs_x18 - .4byte sMovementActionFuncs_x19 - .4byte sMovementActionFuncs_x1A - .4byte sMovementActionFuncs_x1B - .4byte sMovementActionFuncs_x1C - .4byte sMovementActionFuncs_x1D - .4byte sMovementActionFuncs_x1E - .4byte sMovementActionFuncs_x1F - .4byte sMovementActionFuncs_x20 - .4byte sMovementActionFuncs_x21 - .4byte sMovementActionFuncs_x22 - .4byte sMovementActionFuncs_x23 - .4byte sMovementActionFuncs_x24 - .4byte sMovementActionFuncs_x25 - .4byte sMovementActionFuncs_x26 - .4byte sMovementActionFuncs_x27 - .4byte sMovementActionFuncs_x28 - .4byte sMovementActionFuncs_x29 - .4byte sMovementActionFuncs_x2A - .4byte sMovementActionFuncs_x2B - .4byte sMovementActionFuncs_x2C - .4byte sMovementActionFuncs_x2D - .4byte sMovementActionFuncs_x2E - .4byte sMovementActionFuncs_x2F - .4byte sMovementActionFuncs_x30 - .4byte sMovementActionFuncs_x31 - .4byte sMovementActionFuncs_x32 - .4byte sMovementActionFuncs_x33 - .4byte sMovementActionFuncs_x34 - .4byte sMovementActionFuncs_x35 - .4byte sMovementActionFuncs_x36 - .4byte sMovementActionFuncs_x37 - .4byte sMovementActionFuncs_x38 - .4byte sMovementActionFuncs_x39 - .4byte sMovementActionFuncs_x3A - .4byte sMovementActionFuncs_x3B - .4byte sMovementActionFuncs_x3C - .4byte sMovementActionFuncs_x3D - .4byte sMovementActionFuncs_x3E - .4byte sMovementActionFuncs_x3F - .4byte sMovementActionFuncs_x40 - .4byte sMovementActionFuncs_x41 - .4byte sMovementActionFuncs_x42 - .4byte sMovementActionFuncs_x43 - .4byte sMovementActionFuncs_x44 - .4byte sMovementActionFuncs_x45 - .4byte sMovementActionFuncs_x46 - .4byte sMovementActionFuncs_x47 - .4byte sMovementActionFuncs_x48 - .4byte sMovementActionFuncs_x49 - .4byte sMovementActionFuncs_x4A - .4byte sMovementActionFuncs_x4B - .4byte sMovementActionFuncs_x4C - .4byte sMovementActionFuncs_x4D - .4byte sMovementActionFuncs_x4E - .4byte sMovementActionFuncs_x4F - .4byte sMovementActionFuncs_x50 - .4byte sMovementActionFuncs_x51 - .4byte sMovementActionFuncs_x52 - .4byte sMovementActionFuncs_x53 - .4byte sMovementActionFuncs_x54 - .4byte sMovementActionFuncs_x55 - .4byte sMovementActionFuncs_x56 - .4byte sMovementActionFuncs_x57 - .4byte sMovementActionFuncs_x58 - .4byte sMovementActionFuncs_x59 - .4byte sMovementActionFuncs_x5A - .4byte sMovementActionFuncs_x5B - .4byte sMovementActionFuncs_x5C - .4byte sMovementActionFuncs_x5D - .4byte sMovementActionFuncs_x5E - .4byte sMovementActionFuncs_x5F - .4byte sMovementActionFuncs_x60 - .4byte sMovementActionFuncs_x61 - .4byte sMovementActionFuncs_x62 - .4byte sMovementActionFuncs_x63 - .4byte sMovementActionFuncs_x64 - .4byte sMovementActionFuncs_x65 - .4byte sMovementActionFuncs_x66 - .4byte sMovementActionFuncs_x67 - .4byte sMovementActionFuncs_x68 - .4byte sMovementActionFuncs_x69 - .4byte sMovementActionFuncs_x6A - .4byte sMovementActionFuncs_x6B - .4byte sMovementActionFuncs_x6C - .4byte sMovementActionFuncs_x6D - .4byte sMovementActionFuncs_x6E - .4byte sMovementActionFuncs_x6F - .4byte sMovementActionFuncs_x70 - .4byte sMovementActionFuncs_x71 - .4byte sMovementActionFuncs_x72 - .4byte sMovementActionFuncs_x73 - .4byte sMovementActionFuncs_x74 - .4byte sMovementActionFuncs_x75 - .4byte sMovementActionFuncs_x76 - .4byte sMovementActionFuncs_x77 - .4byte sMovementActionFuncs_x78 - .4byte sMovementActionFuncs_x79 - .4byte sMovementActionFuncs_x7A - .4byte sMovementActionFuncs_x7B - .4byte sMovementActionFuncs_x7C - .4byte sMovementActionFuncs_x7D - .4byte sMovementActionFuncs_x7E - .4byte sMovementActionFuncs_x7F - .4byte sMovementActionFuncs_x80 - .4byte sMovementActionFuncs_x81 - .4byte sMovementActionFuncs_x82 - .4byte sMovementActionFuncs_x83 - .4byte sMovementActionFuncs_x84 - .4byte sMovementActionFuncs_x85 - .4byte sMovementActionFuncs_x86 - .4byte sMovementActionFuncs_x87 - .4byte sMovementActionFuncs_x88 - .4byte sMovementActionFuncs_x89 - .4byte sMovementActionFuncs_x8A - .4byte sMovementActionFuncs_x8B - .4byte sMovementActionFuncs_x8C - .4byte sMovementActionFuncs_x8D - .4byte sMovementActionFuncs_x8E - .4byte sMovementActionFuncs_x8F - .4byte sMovementActionFuncs_x90 - .4byte sMovementActionFuncs_x91 - .4byte sMovementActionFuncs_x92 - .4byte sMovementActionFuncs_x93 - .4byte sMovementActionFuncs_x94 - .4byte sMovementActionFuncs_x95 - .4byte sMovementActionFuncs_x96 - .4byte sMovementActionFuncs_x97 - .4byte sMovementActionFuncs_x98 - .4byte sMovementActionFuncs_x99 - .4byte sMovementActionFuncs_x9A - .4byte sMovementActionFuncs_x9B - .4byte sMovementActionFuncs_x9C - .4byte sMovementActionFuncs_x9D - .4byte sMovementActionFuncs_x9E - .4byte sMovementActionFuncs_x9F - .4byte sMovementActionFuncs_xA0 - .4byte sMovementActionFuncs_xA1 - .4byte sMovementActionFuncs_xA2 - .4byte sMovementActionFuncs_xA3 - .4byte sMovementActionFuncs_xA4 - .4byte sMovementActionFuncs_xA5 - .4byte sMovementActionFuncs_xA6 - .4byte sMovementActionFuncs_xA7 - .4byte sMovementActionFuncs_xA8 - .4byte sMovementActionFuncs_xA9 - -sMovementActionFuncs_x00:: @ 83A6864 - .4byte MovementAction_FaceDown_Step0 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x01:: @ 83A686C - .4byte MovementAction_FaceUp_Step0 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x02:: @ 83A6874 - .4byte MovementAction_FaceLeft_Step0 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x03:: @ 83A687C - .4byte MovementAction_FaceRight_Step0 - .4byte MovementAction_PauseSpriteAnim - -gUnknown_83A6884:: @ 83A6884 - .4byte GetMoveDirectionAnimNum - .4byte GetMoveDirectionFastAnimNum - .4byte GetMoveDirectionFastAnimNum - .4byte GetMoveDirectionFasterAnimNum - .4byte GetMoveDirectionFastestAnimNum - -sMovementActionFuncs_x9B:: @ 83A6898 - .4byte MovementActionFunc_x9B_0 - .4byte MovementActionFunc_x9B_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x9C:: @ 83A68A4 - .4byte MovementActionFunc_x9C_0 - .4byte MovementActionFunc_x9C_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x9D:: @ 83A68B0 - .4byte MovementActionFunc_x9D_0 - .4byte MovementActionFunc_x9D_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x9E:: @ 83A68BC - .4byte MovementActionFunc_x9E_0 - .4byte MovementActionFunc_x9E_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x08:: @ 83A68C8 - .4byte MovementActionFunc_x08_0 - .4byte MovementActionFunc_x08_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x09:: @ 83A68D4 - .4byte MovementActionFunc_x09_0 - .4byte MovementActionFunc_x09_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x0A:: @ 83A68E0 - .4byte MovementActionFunc_x0A_0 - .4byte MovementActionFunc_x0A_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x0B:: @ 83A68EC - .4byte MovementActionFunc_x0B_0 - .4byte MovementActionFunc_x0B_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x0D:: @ 83A68F8 - .4byte MovementActionFunc_x0D_0 - .4byte MovementActionFunc_x0D_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x0C:: @ 83A6904 - .4byte MovementActionFunc_x0C_0 - .4byte MovementActionFunc_x0C_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x0E:: @ 83A6910 - .4byte MovementActionFunc_x0E_0 - .4byte MovementActionFunc_x0E_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x0F:: @ 83A691C - .4byte MovementActionFunc_x0F_0 - .4byte MovementActionFunc_x0F_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x10:: @ 83A6928 - .4byte MovementAction_WalkNormalDown_Step0 - .4byte MovementAction_WalkNormalDown_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x11:: @ 83A6934 - .4byte MovementAction_WalkNormalUp_Step0 - .4byte MovementAction_WalkNormalUp_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x12:: @ 83A6940 - .4byte MovementAction_WalkNormalLeft_Step0 - .4byte MovementAction_WalkNormalLeft_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x13:: @ 83A694C - .4byte MovementAction_WalkNormalRight_Step0 - .4byte MovementAction_WalkNormalRight_Step1 - .4byte MovementAction_PauseSpriteAnim - -gUnknown_83A6958:: @ 83A6958 - .2byte 0x0000 - .2byte 0x0001 - .2byte 0x0001 - -gUnknown_83A695E:: @ 83A695E - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0001 - -sMovementActionFuncs_x14:: @ 83A6964 - .4byte MovementAction_Jump2Down_Step0 - .4byte MovementAction_Jump2Down_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x15:: @ 83A6970 - .4byte MovementAction_Jump2Up_Step0 - .4byte MovementAction_Jump2Up_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x16:: @ 83A697C - .4byte MovementAction_Jump2Left_Step0 - .4byte MovementAction_Jump2Left_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x17:: @ 83A6988 - .4byte MovementAction_Jump2Right_Step0 - .4byte MovementAction_Jump2Right_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x18:: @ 83A6994 - .4byte MovementAction_Delay1_Step0 - .4byte MovementAction_Delay_Step1 - .4byte MovementAction_Finish - -sMovementActionFuncs_x19:: @ 83A69A0 - .4byte MovementAction_Delay2_Step0 - .4byte MovementAction_Delay_Step1 - .4byte MovementAction_Finish - -sMovementActionFuncs_x1A:: @ 83A69AC - .4byte MovementAction_Delay4_Step0 - .4byte MovementAction_Delay_Step1 - .4byte MovementAction_Finish - -sMovementActionFuncs_x1B:: @ 83A69B8 - .4byte MovementAction_Delay8_Step0 - .4byte MovementAction_Delay_Step1 - .4byte MovementAction_Finish - -sMovementActionFuncs_x1C:: @ 83A69C4 - .4byte MovementAction_Delay16_Step0 - .4byte MovementAction_Delay_Step1 - .4byte MovementAction_Finish - -sMovementActionFuncs_x1D:: @ 83A69D0 - .4byte MovementAction_WalkFastDown_Step0 - .4byte MovementAction_WalkFastDown_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x1E:: @ 83A69DC - .4byte MovementAction_WalkFastUp_Step0 - .4byte MovementAction_WalkFastUp_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x1F:: @ 83A69E8 - .4byte MovementAction_WalkFastLeft_Step0 - .4byte MovementAction_WalkFastLeft_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x20:: @ 83A69F4 - .4byte MovementAction_WalkFastRight_Step0 - .4byte MovementAction_WalkFastRight_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_xA0:: @ 83A6A00 - .4byte MovementActionFunc_xA0_0 - .4byte MovementActionFunc_xA0_1 - .4byte MovementAction_Finish - -sMovementActionFuncs_xA1:: @ 83A6A0C - .4byte MovementActionFunc_xA1_0 - .4byte MovementActionFunc_xA1_1 - .4byte MovementAction_Finish - -sMovementActionFuncs_xA2:: @ 83A6A18 - .4byte MovementActionFunc_xA2_0 - .4byte MovementActionFunc_xA2_1 - .4byte MovementAction_Finish - -sMovementActionFuncs_xA3:: @ 83A6A24 - .4byte MovementActionFunc_xA3_0 - .4byte MovementActionFunc_xA3_1 - .4byte MovementAction_Finish - -sMovementActionFuncs_x04:: @ 83A6A30 - .4byte MovementActionFunc_x04_0 - .4byte MovementAction_Finish - -sMovementActionFuncs_x05:: @ 83A6A38 - .4byte MovementActionFunc_x05_0 - .4byte MovementAction_Finish - -sMovementActionFuncs_x06:: @ 83A6A40 - .4byte MovementActionFunc_x06_0 - .4byte MovementAction_Finish - -sMovementActionFuncs_x07:: @ 83A6A48 - .4byte MovementActionFunc_x07_0 - .4byte MovementAction_Finish - -sMovementActionFuncs_x21:: @ 83A6A50 - .4byte MovementAction_WalkInPlaceSlowDown_Step0 - .4byte MovementAction_WalkInPlaceSlow_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x22:: @ 83A6A5C - .4byte MovementAction_WalkInPlaceSlowUp_Step0 - .4byte MovementAction_WalkInPlaceSlow_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x23:: @ 83A6A68 - .4byte MovementAction_WalkInPlaceSlowLeft_Step0 - .4byte MovementAction_WalkInPlaceSlow_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x24:: @ 83A6A74 - .4byte MovementAction_WalkInPlaceSlowRight_Step0 - .4byte MovementAction_WalkInPlaceSlow_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x25:: @ 83A6A80 - .4byte MovementAction_WalkInPlaceNormalDown_Step0 - .4byte MovementAction_WalkInPlace_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x26:: @ 83A6A8C - .4byte MovementAction_WalkInPlaceNormalUp_Step0 - .4byte MovementAction_WalkInPlace_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x27:: @ 83A6A98 - .4byte MovementAction_WalkInPlaceNormalLeft_Step0 - .4byte MovementAction_WalkInPlace_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x28:: @ 83A6AA4 - .4byte MovementAction_WalkInPlaceNormalRight_Step0 - .4byte MovementAction_WalkInPlace_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x29:: @ 83A6AB0 - .4byte MovementAction_WalkInPlaceFastDown_Step0 - .4byte MovementAction_WalkInPlace_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x2A:: @ 83A6ABC - .4byte MovementAction_WalkInPlaceFastUp_Step0 - .4byte MovementAction_WalkInPlace_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x2B:: @ 83A6AC8 - .4byte MovementAction_WalkInPlaceFastLeft_Step0 - .4byte MovementAction_WalkInPlace_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x2C:: @ 83A6AD4 - .4byte MovementAction_WalkInPlaceFastRight_Step0 - .4byte MovementAction_WalkInPlace_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x2D:: @ 83A6AE0 - .4byte MovementAction_WalkInPlaceFastestDown_Step0 - .4byte MovementAction_WalkInPlace_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x2E:: @ 83A6AEC - .4byte MovementAction_WalkInPlaceFastestUp_Step0 - .4byte MovementAction_WalkInPlace_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x2F:: @ 83A6AF8 - .4byte MovementAction_WalkInPlaceFastestLeft_Step0 - .4byte MovementAction_WalkInPlace_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x30:: @ 83A6B04 - .4byte MovementAction_WalkInPlaceFastestRight_Step0 - .4byte MovementAction_WalkInPlace_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x31:: @ 83A6B10 - .4byte MovementAction_RideWaterCurrentDown_Step0 - .4byte MovementAction_RideWaterCurrentDown_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x32:: @ 83A6B1C - .4byte MovementAction_RideWaterCurrentUp_Step0 - .4byte MovementAction_RideWaterCurrentUp_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x33:: @ 83A6B28 - .4byte MovementAction_RideWaterCurrentLeft_Step0 - .4byte MovementAction_RideWaterCurrentLeft_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x34:: @ 83A6B34 - .4byte MovementAction_RideWaterCurrentRight_Step0 - .4byte MovementAction_RideWaterCurrentRight_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x35:: @ 83A6B40 - .4byte MovementAction_WalkFastestDown_Step0 - .4byte MovementAction_WalkFastestDown_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x36:: @ 83A6B4C - .4byte MovementAction_WalkFastestUp_Step0 - .4byte MovementAction_WalkFastestUp_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x37:: @ 83A6B58 - .4byte MovementAction_WalkFastestLeft_Step0 - .4byte MovementAction_WalkFastestLeft_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x38:: @ 83A6B64 - .4byte MovementAction_WalkFastestRight_Step0 - .4byte MovementAction_WalkFastestRight_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x39:: @ 83A6B70 - .4byte MovementAction_SlideDown_Step0 - .4byte MovementAction_SlideDown_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x3A:: @ 83A6B7C - .4byte MovementAction_SlideUp_Step0 - .4byte MovementAction_SlideUp_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x3B:: @ 83A6B88 - .4byte MovementAction_SlideLeft_Step0 - .4byte MovementAction_SlideLeft_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x3C:: @ 83A6B94 - .4byte MovementAction_SlideRight_Step0 - .4byte MovementAction_SlideRight_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x3D:: @ 83A6BA0 - .4byte MovementAction_PlayerRunDown_Step0 - .4byte MovementAction_PlayerRunDown_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x3E:: @ 83A6BAC - .4byte MovementAction_PlayerRunUp_Step0 - .4byte MovementAction_PlayerRunUp_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x3F:: @ 83A6BB8 - .4byte MovementAction_PlayerRunLeft_Step0 - .4byte MovementAction_PlayerRunLeft_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x40:: @ 83A6BC4 - .4byte MovementAction_PlayerRunRight_Step0 - .4byte MovementAction_PlayerRunRight_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x41:: @ 83A6BD0 - .4byte MovementActionFunc_x41_0 - .4byte MovementActionFunc_x41_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x42:: @ 83A6BDC - .4byte MovementActionFunc_x42_0 - .4byte MovementActionFunc_x42_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x43:: @ 83A6BE8 - .4byte MovementActionFunc_x43_0 - .4byte MovementActionFunc_x43_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x44:: @ 83A6BF4 - .4byte MovementActionFunc_x44_0 - .4byte MovementActionFunc_x44_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x45:: @ 83A6C00 - .4byte MovementAction_StartAnimInDirection_Step0 - .4byte MovementAction_WaitSpriteAnim - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x46:: @ 83A6C0C - .4byte MovementAction_JumpSpecialDown_Step0 - .4byte MovementAction_JumpSpecialDown_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x47:: @ 83A6C18 - .4byte MovementAction_JumpSpecialUp_Step0 - .4byte MovementAction_JumpSpecialUp_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x48:: @ 83A6C24 - .4byte MovementAction_JumpSpecialLeft_Step0 - .4byte MovementAction_JumpSpecialLeft_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x49:: @ 83A6C30 - .4byte MovementAction_JumpSpecialRight_Step0 - .4byte MovementAction_JumpSpecialRight_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_xA6:: @ 83A6C3C - .4byte MovementActionFunc_xA6_0 - .4byte MovementActionFunc_xA6_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_xA7:: @ 83A6C48 - .4byte MovementActionFunc_xA7_0 - .4byte MovementActionFunc_xA7_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_xA8:: @ 83A6C54 - .4byte MovementActionFunc_xA8_0 - .4byte MovementActionFunc_xA8_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_xA9:: @ 83A6C60 - .4byte MovementActionFunc_xA9_0 - .4byte MovementActionFunc_xA9_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x4A:: @ 83A6C6C - .4byte MovementAction_FacePlayer_Step0 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x4B:: @ 83A6C74 - .4byte MovementAction_FaceAwayPlayer_Step0 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x4C:: @ 83A6C7C - .4byte MovementAction_LockFacingDirection_Step0 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x4D:: @ 83A6C84 - .4byte MovementAction_UnlockFacingDirection_Step0 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x4E:: @ 83A6C8C - .4byte MovementAction_JumpDown_Step0 - .4byte MovementAction_JumpDown_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x4F:: @ 83A6C98 - .4byte MovementAction_JumpUp_Step0 - .4byte MovementAction_JumpUp_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x50:: @ 83A6CA4 - .4byte MovementAction_JumpLeft_Step0 - .4byte MovementAction_JumpLeft_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x51:: @ 83A6CB0 - .4byte MovementAction_JumpRight_Step0 - .4byte MovementAction_JumpRight_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x52:: @ 83A6CBC - .4byte MovementAction_JumpInPlaceDown_Step0 - .4byte MovementAction_JumpInPlaceDown_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x53:: @ 83A6CC8 - .4byte MovementAction_JumpInPlaceUp_Step0 - .4byte MovementAction_JumpInPlaceUp_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x54:: @ 83A6CD4 - .4byte MovementAction_JumpInPlaceLeft_Step0 - .4byte MovementAction_JumpInPlaceLeft_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x55:: @ 83A6CE0 - .4byte MovementAction_JumpInPlaceRight_Step0 - .4byte MovementAction_JumpInPlaceRight_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x56:: @ 83A6CEC - .4byte MovementAction_JumpInPlaceDownUp_Step0 - .4byte MovementAction_JumpInPlaceDownUp_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x57:: @ 83A6CF8 - .4byte MovementAction_JumpInPlaceUpDown_Step0 - .4byte MovementAction_JumpInPlaceUpDown_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x58:: @ 83A6D04 - .4byte MovementAction_JumpInPlaceLeftRight_Step0 - .4byte MovementAction_JumpInPlaceLeftRight_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x59:: @ 83A6D10 - .4byte MovementAction_JumpInPlaceRightLeft_Step0 - .4byte MovementAction_JumpInPlaceRightLeft_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x5A:: @ 83A6D1C - .4byte MovementAction_FaceOriginalDirection_Step0 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x5B:: @ 83A6D24 - .4byte MovementAction_NurseJoyBowDown_Step0 - .4byte MovementAction_WaitSpriteAnim - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x5C:: @ 83A6D30 - .4byte MovementAction_EnableJumpLandingGroundEffect_Step0 - .4byte MovementAction_Finish - -sMovementActionFuncs_x5D:: @ 83A6D38 - .4byte MovementAction_DisableJumpLandingGroundEffect_Step0 - .4byte MovementAction_Finish - -sMovementActionFuncs_x5E:: @ 83A6D40 - .4byte MovementAction_DisableAnimation_Step0 - .4byte MovementAction_Finish - -sMovementActionFuncs_x5F:: @ 83A6D48 - .4byte MovementAction_RestoreAnimation_Step0 - .4byte MovementAction_Finish - -sMovementActionFuncs_x60:: @ 83A6D50 - .4byte MovementAction_SetInvisible_Step0 - .4byte MovementAction_Finish - -sMovementActionFuncs_x61:: @ 83A6D58 - .4byte MovementAction_SetVisible_Step0 - .4byte MovementAction_Finish - -sMovementActionFuncs_x62:: @ 83A6D60 - .4byte MovementAction_EmoteExclamationMark_Step0 - .4byte MovementAction_Finish - -sMovementActionFuncs_x63:: @ 83A6D68 - .4byte MovementAction_EmoteQuestionMark_Step0 - .4byte MovementAction_Finish - -sMovementActionFuncs_x64:: @ 83A6D70 - .4byte MovementAction_EmoteHeart_Step0 - .4byte MovementAction_Finish - -sMovementActionFuncs_x65:: @ 83A6D78 - .4byte do_double_excl_bubble - .4byte MovementAction_Finish - -sMovementActionFuncs_x66:: @ 83A6D80 - .4byte do_smile_bubble - .4byte MovementAction_Finish - -sMovementActionFuncs_x67:: @ 83A6D88 - .4byte MovementAction_RevealTrainer_Step0 - .4byte MovementAction_RevealTrainer_Step1 - .4byte MovementAction_Finish - -sMovementActionFuncs_x68:: @ 83A6D94 - .4byte MovementAction_RockSmashBreak_Step0 - .4byte MovementAction_RockSmashBreak_Step1 - .4byte MovementAction_RockSmashBreak_Step2 - .4byte MovementAction_Finish - -sMovementActionFuncs_x69:: @ 83A6DA4 - .4byte MovementAction_CutTree_Step0 - .4byte MovementAction_CutTree_Step1 - .4byte MovementAction_CutTree_Step2 - .4byte MovementAction_Finish - -sMovementActionFuncs_x6A:: @ 83A6DB4 - .4byte MovementAction_SetFixedPriority_Step0 - .4byte MovementAction_Finish - -sMovementActionFuncs_x6B:: @ 83A6DBC - .4byte MovementAction_ClearFixedPriority_Step0 - .4byte MovementAction_Finish - -sMovementActionFuncs_x6C:: @ 83A6DC4 - .4byte MovementAction_InitAffineAnim_Step0 - .4byte MovementAction_Finish - -sMovementActionFuncs_x6D:: @ 83A6DCC - .4byte MovementAction_ClearAffineAnim_Step0 - .4byte MovementAction_Finish - -sMovementActionFuncs_x6E:: @ 83A6DD4 - .4byte MovementAction_WalkDownStartAffine_Step0 - .4byte MovementAction_WalkDownStartAffine_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x6F:: @ 83A6DE0 - .4byte MovementAction_WalkDownAffine_Step0 - .4byte MovementAction_WalkDownAffine_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x70:: @ 83A6DEC - .4byte MovementActionFunc_x70_0 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x71:: @ 83A6DF4 - .4byte MovementActionFunc_x71_0 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x72:: @ 83A6DFC - .4byte MovementActionFunc_x72_0 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x73:: @ 83A6E04 - .4byte MovementActionFunc_x73_0 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x74:: @ 83A6E0C - .4byte MovementAction_AcroPopWheelieDown_Step0 - .4byte MovementAction_WaitSpriteAnim - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x75:: @ 83A6E18 - .4byte MovementAction_AcroPopWheelieUp_Step0 - .4byte MovementAction_WaitSpriteAnim - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x76:: @ 83A6E24 - .4byte MovementAction_AcroPopWheelieLeft_Step0 - .4byte MovementAction_WaitSpriteAnim - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x77:: @ 83A6E30 - .4byte MovementAction_AcroPopWheelieRight_Step0 - .4byte MovementAction_WaitSpriteAnim - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x78:: @ 83A6E3C - .4byte MovementAction_AcroEndWheelieFaceDown_Step0 - .4byte MovementAction_WaitSpriteAnim - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x79:: @ 83A6E48 - .4byte MovementAction_AcroEndWheelieFaceUp_Step0 - .4byte MovementAction_WaitSpriteAnim - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x7A:: @ 83A6E54 - .4byte MovementAction_AcroEndWheelieFaceLeft_Step0 - .4byte MovementAction_WaitSpriteAnim - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x7B:: @ 83A6E60 - .4byte MovementAction_AcroEndWheelieFaceRight_Step0 - .4byte MovementAction_WaitSpriteAnim - .4byte MovementAction_PauseSpriteAnim - .4byte MovementAction_UnusedAcroActionDown_Step0 - .4byte MovementAction_WaitSpriteAnim - .4byte MovementAction_PauseSpriteAnim - .4byte MovementAction_UnusedAcroActionUp_Step0 - .4byte MovementAction_WaitSpriteAnim - .4byte MovementAction_PauseSpriteAnim - .4byte MovementAction_UnusedAcroActionLeft_Step0 - .4byte MovementAction_WaitSpriteAnim - .4byte MovementAction_PauseSpriteAnim - .4byte MovementAction_UnusedAcroActionRight_Step0 - .4byte MovementAction_WaitSpriteAnim - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x7C:: @ 83A6E9C - .4byte MovementAction_AcroWheelieHopFaceDown_Step0 - .4byte MovementAction_AcroWheelieHopFaceDown_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x7D:: @ 83A6EA8 - .4byte MovementAction_AcroWheelieHopFaceUp_Step0 - .4byte MovementAction_AcroWheelieHopFaceUp_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x7E:: @ 83A6EB4 - .4byte MovementAction_AcroWheelieHopFaceLeft_Step0 - .4byte MovementAction_AcroWheelieHopFaceLeft_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x7F:: @ 83A6EC0 - .4byte MovementAction_AcroWheelieHopFaceRight_Step0 - .4byte MovementAction_AcroWheelieHopFaceRight_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x80:: @ 83A6ECC - .4byte MovementAction_AcroWheelieHopDown_Step0 - .4byte MovementAction_AcroWheelieHopDown_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x81:: @ 83A6ED8 - .4byte MovementAction_AcroWheelieHopUp_Step0 - .4byte MovementAction_AcroWheelieHopUp_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x82:: @ 83A6EE4 - .4byte MovementAction_AcroWheelieHopLeft_Step0 - .4byte MovementAction_AcroWheelieHopLeft_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x83:: @ 83A6EF0 - .4byte MovementAction_AcroWheelieHopRight_Step0 - .4byte MovementAction_AcroWheelieHopRight_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x84:: @ 83A6EFC - .4byte MovementAction_AcroWheelieJumpDown_Step0 - .4byte MovementAction_AcroWheelieJumpDown_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x85:: @ 83A6F08 - .4byte MovementAction_AcroWheelieJumpUp_Step0 - .4byte MovementAction_AcroWheelieJumpUp_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x86:: @ 83A6F14 - .4byte MovementAction_AcroWheelieJumpLeft_Step0 - .4byte MovementAction_AcroWheelieJumpLeft_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x87:: @ 83A6F20 - .4byte MovementAction_AcroWheelieJumpRight_Step0 - .4byte MovementAction_AcroWheelieJumpRight_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x88:: @ 83A6F2C - .4byte MovementActionFunc_x88_0 - .4byte MovementAction_WalkInPlace_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x89:: @ 83A6F38 - .4byte MovementActionFunc_x89_0 - .4byte MovementAction_WalkInPlace_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x8A:: @ 83A6F44 - .4byte MovementActionFunc_x8A_0 - .4byte MovementAction_WalkInPlace_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x8B:: @ 83A6F50 - .4byte MovementActionFunc_x8B_0 - .4byte MovementAction_WalkInPlace_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x8C:: @ 83A6F5C - .4byte MovementAction_AcroPopWheelieMoveDown_Step0 - .4byte MovementAction_AcroPopWheelieMoveDown_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x8D:: @ 83A6F68 - .4byte MovementAction_AcroPopWheelieMoveUp_Step0 - .4byte MovementAction_AcroPopWheelieMoveUp_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x8E:: @ 83A6F74 - .4byte MovementAction_AcroPopWheelieMoveLeft_Step0 - .4byte MovementAction_AcroPopWheelieMoveLeft_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x8F:: @ 83A6F80 - .4byte MovementAction_AcroPopWheelieMoveRight_Step0 - .4byte MovementAction_AcroPopWheelieMoveRight_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x90:: @ 83A6F8C - .4byte MovementAction_AcroWheelieMoveDown_Step0 - .4byte MovementAction_AcroWheelieMoveDown_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x91:: @ 83A6F98 - .4byte MovementAction_AcroWheelieMoveUp_Step0 - .4byte MovementAction_AcroWheelieMoveUp_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x92:: @ 83A6FA4 - .4byte MovementAction_AcroWheelieMoveLeft_Step0 - .4byte MovementAction_AcroWheelieMoveLeft_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x93:: @ 83A6FB0 - .4byte MovementAction_AcroWheelieMoveRight_Step0 - .4byte MovementAction_AcroWheelieMoveRight_Step1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x94:: @ 83A6FBC - .4byte MovementActionFunc_x94_0 - .4byte MovementActionFunc_x94_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x95:: @ 83A6FC8 - .4byte MovementActionFunc_x95_0 - .4byte MovementActionFunc_x95_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x96:: @ 83A6FD4 - .4byte MovementActionFunc_x96_0 - .4byte MovementActionFunc_x96_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x97:: @ 83A6FE0 - .4byte MovementActionFunc_x97_0 - .4byte MovementActionFunc_x97_1 - .4byte MovementAction_PauseSpriteAnim - -sMovementActionFuncs_x98:: @ 83A6FEC - .4byte MovementActionFunc_x98_0 - .4byte MovementActionFunc_x98_1 - -sMovementActionFuncs_x99:: @ 83A6FF4 - .4byte MovementActionFunc_x98_0 - .4byte MovementActionFunc_x99_1 - -sMovementActionFuncs_x9A:: @ 83A6FFC - .4byte MovementActionFunc_x98_0 - .4byte MovementActionFunc_x9A_1 - -sMovementActionFuncs_x9F:: @ 83A7004 - .4byte MovementActionFunc_x9F_0 - .4byte MovementActionFunc_x9F_1 - -sMovementActionFuncs_xA4:: @ 83A700C - .4byte MovementActionFunc_xA4_0 - .4byte MovementActionFunc_xA4_1 - .4byte MovementActionFunc_xA4_2 - -sMovementActionFuncs_xA5:: @ 83A7018 - .4byte MovementActionFunc_xA5_0 - .4byte MovementActionFunc_xA5_1 - .4byte MovementActionFunc_xA4_2 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/field_player_avatar.s b/data/field_player_avatar.s deleted file mode 100644 index be4036928..000000000 --- a/data/field_player_avatar.s +++ /dev/null @@ -1,153 +0,0 @@ -#include "constants/event_objects.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2 -gUnknown_835B764:: @ 835B764 - .4byte MetatileBehavior_IsUnknownMovement48, ForcedMovement_Slip - .4byte MetatileBehavior_IsIce_2, ForcedMovement_Slip - .4byte MetatileBehavior_IsWalkSouth, sub_805B750 - .4byte MetatileBehavior_IsWalkNorth, sub_805B768 - .4byte MetatileBehavior_IsWalkWest, sub_805B780 - .4byte MetatileBehavior_IsWalkEast, sub_805B798 - .4byte MetatileBehavior_IsSouthwardCurrent, sub_805B82C - .4byte MetatileBehavior_IsNorthwardCurrent, sub_805B844 - .4byte MetatileBehavior_IsWestwardCurrent, sub_805B85C - .4byte MetatileBehavior_IsEastwardCurrent, sub_805B874 - .4byte MetatileBehavior_UnusedIsSpinRight, sub_805B7B0 - .4byte MetatileBehavior_UnusedIsSpinLeft, sub_805B7CC - .4byte MetatileBehavior_UnusedIsSpinUp, sub_805B7E8 - .4byte MetatileBehavior_UnusedIsSpinDown, sub_805B804 - .4byte MetatileBehavior_IsSlideSouth, ForcedMovement_SlideSouth - .4byte MetatileBehavior_IsSlideNorth, ForcedMovement_SlideNorth - .4byte MetatileBehavior_IsSlideWest, ForcedMovement_SlideWest - .4byte MetatileBehavior_IsSlideEast, ForcedMovement_SlideEast - .4byte MetatileBehavior_IsWaterfall, sub_805B82C - .4byte MetatileBehavior_UnusedReturnFalse_7, sub_805B924 - .4byte MetatileBehavior_UnusedReturnFalse_8, sub_805B930 - .4byte NULL, ForcedMovement_None - -gUnknown_835B814:: @ 835B814 - .4byte PlayerNotOnBikeNotMoving - .4byte sub_805B9C4 - .4byte sub_805B9D4 - -gUnknown_835B820:: @ 835B820 - .byte 0x04, 0x04, 0x05, 0x06, 0x07 - - .align 2 -gUnknown_835B828:: @ 835B828 - .4byte MetatileBehavior_ReturnFalse_14 // Related to Acro Bike - .4byte MetatileBehavior_ReturnFalse_15 // Related to Acro Bike - .4byte MetatileBehavior_ReturnFalse_16 // Related to Acro Bike - .4byte MetatileBehavior_ReturnFalse_17 // Related to Acro Bike - .4byte MetatileBehavior_ReturnFalse_18 // Related to Acro Bike - -gUnknown_835B83C:: @ 835B83C - .byte 0x09, 0x0a, 0x0b, 0x0c, 0x0d - - .align 2 -gUnknown_835B844:: @ 835B844 - .4byte sub_805BE60 - .4byte sub_805BE74 - .4byte sub_805BE74 - .4byte sub_805BE90 - .4byte nullsub_23 - .4byte PlayerAvatarTransition_ReturnToField - .4byte nullsub_22 - .4byte nullsub_22 - -gUnknown_835B864:: @ 835B864 - .4byte MetatileBehavior_IsSouthArrowWarp - .4byte MetatileBehavior_IsNorthArrowWarp - .4byte MetatileBehavior_IsWestArrowWarp - .4byte MetatileBehavior_IsEastArrowWarp - -gUnknown_835B874:: @ 835B874 - .byte OBJ_EVENT_GFX_RED_NORMAL, OBJ_EVENT_GFX_GREEN_NORMAL - .byte OBJ_EVENT_GFX_RED_BIKE, OBJ_EVENT_GFX_GREEN_BIKE - .byte OBJ_EVENT_GFX_RED_SURF, OBJ_EVENT_GFX_GREEN_SURF - .byte OBJ_EVENT_GFX_RED_ITEM, OBJ_EVENT_GFX_GREEN_ITEM - .byte OBJ_EVENT_GFX_RED_FISH, OBJ_EVENT_GFX_GREEN_FISH - .byte OBJ_EVENT_GFX_RED_ITEM_COPY, OBJ_EVENT_GFX_GREEN_ITEM_COPY - -gUnknown_835B880:: @ 835B880 - .byte OBJ_EVENT_GFX_RS_BRENDAN - .byte OBJ_EVENT_GFX_RS_MAY - -gUnknown_835B882:: @ 835B882 - @ Male - .byte OBJ_EVENT_GFX_RED_NORMAL, 0x01 - .byte OBJ_EVENT_GFX_RED_BIKE, 0x02 - .byte OBJ_EVENT_GFX_RED_SURF, 0x08 - @ Female - .byte OBJ_EVENT_GFX_GREEN_NORMAL, 0x01 - .byte OBJ_EVENT_GFX_GREEN_BIKE, 0x02 - .byte OBJ_EVENT_GFX_GREEN_SURF, 0x08 - -gUnknown_835B88E:: @ 835B88E - .byte OBJ_EVENT_GFX_RED_VS_SEEKER - .byte OBJ_EVENT_GFX_GREEN_VS_SEEKER - -gUnknown_835B890:: @ 835B890 - .4byte MetatileBehavior_IsSouthArrowWarp - .4byte MetatileBehavior_IsNorthArrowWarp - .4byte MetatileBehavior_IsWestArrowWarp - .4byte MetatileBehavior_IsEastArrowWarp - -gUnknown_835B8A0:: @ 835B8A0 - .4byte sub_805CD64 - .4byte sub_805CD84 - .4byte sub_805CE20 - -gUnknown_835B8AC:: @ 835B8AC - .4byte PlayerAvatar_DoSecretBaseMatJump - -gUnknown_835B8B0:: @ 835B8B0 - .4byte sub_805CFC4 - .4byte sub_805CFEC - .4byte sub_805D064 - .4byte sub_805D0A4 - -gUnknown_835B8C0:: @ 835B8C0 - .byte 0x03, 0x04, 0x02, 0x01 - -gUnknown_835B8C4:: @ 835B8C4 - .byte 0x18, 0x18, 0x19, 0x1a, 0x1b - - .align 2 -gUnknown_835B8CC:: @ 835B8CC - .4byte sub_805D33C - .4byte fish1 - .4byte fish2 - .4byte sub_805D430 - .4byte sub_805D47C - .4byte sub_805D508 - .4byte sub_805D574 - .4byte sub_805D580 - .4byte sub_805D5EC - .4byte sub_805D66C - .4byte sub_805D6C8 - .4byte sub_805D7C0 - .4byte sub_805D838 - .4byte sub_805D8AC - .4byte sub_805D8D8 - .4byte sub_805D980 - -gUnknown_835B90C:: @ 835B90C - .2byte 0x0001, 0x0001, 0x0001 - -gUnknown_835B912:: @ 835B912 - .2byte 0x0001, 0x0003, 0x0006 - -gUnknown_835B918:: @ 835B918 - .string "·$" - -gUnknown_835B91A:: @ 835B91A - .2byte 0x0024, 0x0021, 0x001e - -gUnknown_835B920:: @ 835B920 - .2byte 0x0000, 0x0000, 0x0028, 0x000a, 0x0046, 0x001e - -gUnknown_835B92C:: @ 835B92C - .byte 0x01, 0x03, 0x04, 0x02, 0x01 diff --git a/data/map_events.s b/data/map_events.s index 9255e3396..5fd6a9331 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -6,6 +6,7 @@ #include "constants/map_scripts.h" #include "constants/layouts.h" #include "constants/maps.h" +#include "constants/trainer_types.h" #include "constants/vars.h" #include "constants/weather.h" .include "asm/macros.inc" diff --git a/data/maps/BattleColosseum_2P/map.json b/data/maps/BattleColosseum_2P/map.json index 5a1d822a3..9f113352e 100644 --- a/data/maps/BattleColosseum_2P/map.json +++ b/data/maps/BattleColosseum_2P/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "BattleColosseum_2P_EventScript_Attendant", "flag": "0" diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index 176ba1fd4..a0522d51a 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "BirthIsland_Exterior_EventScript_Triangle", "flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_DEOXYS" 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/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index da05ab941..91769a123 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "BirthIsland_Harbor_EventScript_Sailor", "flag": "0" diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index 5620c9573..78e63ac74 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_EventScript_RocketGrunt1", "flag": "FLAG_HIDE_CELADON_ROCKETS" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_EventScript_FatMan", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_EventScript_Poliwrath", "flag": "0" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 4, "movement_range_y": 4, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_EventScript_LittleGirl", "flag": "0" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 5, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_EventScript_Woman", "flag": "0" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_EventScript_OldMan2", "flag": "0" @@ -112,7 +112,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_EventScript_SoftboiledTutor", "flag": "0" @@ -125,7 +125,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 5, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_EventScript_RocketGrunt2", "flag": "FLAG_HIDE_CELADON_ROCKETS" @@ -138,7 +138,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_EventScript_OldMan1", "flag": "0" @@ -151,7 +151,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" @@ -164,7 +164,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" @@ -177,7 +177,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_EventScript_Boy", "flag": "0" @@ -204,7 +204,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_EventScript_ItemEther", "flag": "FLAG_HIDE_CELADON_CITY_ETHER" @@ -217,7 +217,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_EventScript_SilphCoScientist", "flag": "FLAG_HIDE_CELADON_ROCKETS" diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index 64a48efd8..1aa8501be 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_Condominiums_1F_EventScript_Meowth", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_Condominiums_1F_EventScript_Clefairy", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_Condominiums_1F_EventScript_Nidoran", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_Condominiums_1F_EventScript_TeaWoman", "flag": "0" diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json index 8df76903e..300be7ee9 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika", "flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika", "flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS" diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index 4cb02dcbc..3f816ba07 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_Condominiums_3F_EventScript_Programmer", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_Condominiums_3F_EventScript_Designer", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_Condominiums_3F_EventScript_GraphicArtist", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_Condominiums_3F_EventScript_Writer", "flag": "0" diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index b43ce8651..90cb8d3d9 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_Condominiums_RoofRoom_EventScript_BlackBelt", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall", "flag": "FLAG_HIDE_EEVEE_BALL" diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index e2d913c24..424719a0a 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_DepartmentStore_1F_EventScript_Receptionist", "flag": "0" diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index d423b503d..ca64f92a7 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_DepartmentStore_2F_EventScript_Lass", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_DepartmentStore_2F_EventScript_ClerkItems", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_DepartmentStore_2F_EventScript_ClerkTMs", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_DepartmentStore_2F_EventScript_Woman", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index a4d7f6299..c4d3d8c3f 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_DepartmentStore_3F_EventScript_CounterTutor", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_DepartmentStore_3F_EventScript_GBAKid1", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_DepartmentStore_3F_EventScript_GBAKid3", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_DepartmentStore_3F_EventScript_GBAKid2", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_DepartmentStore_3F_EventScript_LittleGirl", "flag": "0" diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index 8355b6ab3..48062a10e 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_DepartmentStore_4F_EventScript_Man", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_DepartmentStore_4F_EventScript_Youngster", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_DepartmentStore_4F_EventScript_Clerk", "flag": "0" diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index adaffd5de..5f56ecbd2 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_DepartmentStore_5F_EventScript_Gentleman", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_DepartmentStore_5F_EventScript_Sailor", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_DepartmentStore_5F_EventScript_ClerkXItems", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_DepartmentStore_5F_EventScript_ClerkVitamins", "flag": "0" diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index 105a2305d..8b1c534c7 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_DepartmentStore_Roof_EventScript_CooltrainerM", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl", "flag": "0" 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/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index 49f023552..8f27be39a 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_GameCorner_EventScript_InfoClerk", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_GameCorner_EventScript_CoinsClerk", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_GameCorner_EventScript_BaldingMan", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_GameCorner_EventScript_Woman1", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_GameCorner_EventScript_Fisher", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_GameCorner_EventScript_GymGuy", "flag": "0" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_GameCorner_EventScript_Woman2", "flag": "0" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_GameCorner_EventScript_OldMan", "flag": "0" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_GameCorner_EventScript_Scientist", "flag": "0" @@ -140,7 +140,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_GameCorner_EventScript_Gentleman", "flag": "0" @@ -153,7 +153,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_GameCorner_EventScript_RocketGrunt", "flag": "FLAG_HIDE_GAME_CORNER_ROCKET" diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json index 4eb7a87cd..7bf6091b1 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_BaldingMan", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_OldMan", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkMons", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkTMs", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkItems", "flag": "0" diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index 8af259ef4..9978fa9de 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "CeladonCity_Gym_EventScript_Kay", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "CeladonCity_Gym_EventScript_Bridget", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "CeladonCity_Gym_EventScript_Tina", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "CeladonCity_Gym_EventScript_Tamia", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "CeladonCity_Gym_EventScript_Lori", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "CeladonCity_Gym_EventScript_Lisa", "flag": "0" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_Gym_EventScript_Erika", "flag": "0" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "CeladonCity_Gym_EventScript_Mary", "flag": "0" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" @@ -140,7 +140,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" @@ -153,7 +153,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json index 5294a8b44..e323330ba 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_Hotel_EventScript_Receptionist", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_Hotel_EventScript_Beauty", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_Hotel_EventScript_BeautyBoyfriend", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_Hotel_EventScript_BeautyBrother", "flag": "0" diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json index 1a36cee3d..f4855dcd9 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_House1_EventScript_RocketChief", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 5, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_House1_EventScript_Rocket1", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 5, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_House1_EventScript_Rocket2", "flag": "0" diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index ebc5aef6c..391a7daf9 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_PokemonCenter_1F_EventScript_CooltrainerF", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_PokemonCenter_1F_EventScript_Youngster", "flag": "0" diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index b7098a2aa..b83e53cca 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json index 766f4522e..5d66e4f26 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_Restaurant_EventScript_Chef", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_Restaurant_EventScript_Woman", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_Restaurant_EventScript_FatMan", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_Restaurant_EventScript_CoinCaseMan", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeladonCity_Restaurant_EventScript_WorkerM", "flag": "0" diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index 224427cdc..6cf50ea13 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCave_1F_EventScript_ItemNugget", "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_NUGGET" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCave_1F_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_FULL_RESTORE" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCave_1F_EventScript_ItemMaxElixir", "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_MAX_ELIXIR" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_17" diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index f1a21fe35..a75ea2017 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCave_2F_EventScript_ItemPPUp", "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_PP_UP" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCave_2F_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCave_2F_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_FULL_RESTORE" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_17" @@ -140,7 +140,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_18" @@ -153,7 +153,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_19" @@ -166,7 +166,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1A" @@ -179,7 +179,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1B" diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index b1d5761da..b8ad317b6 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCave_B1F_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCave_B1F_EventScript_ItemMaxRevive", "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCave_B1F_EventScript_Mewtwo", "flag": "FLAG_HIDE_MEWTWO" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_17" @@ -140,7 +140,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_18" @@ -153,7 +153,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_19" @@ -166,7 +166,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1A" 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/map.json b/data/maps/CeruleanCity/map.json index e9a12048b..9ffcce5d5 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -44,7 +44,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_EventScript_Policeman", "flag": "0" @@ -57,7 +57,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_EventScript_Grunt", "flag": "FLAG_HIDE_CERULEAN_ROCKET" @@ -70,7 +70,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_EventScript_LittleBoy", "flag": "0" @@ -83,7 +83,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_EventScript_BaldingMan", "flag": "0" @@ -96,7 +96,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_EventScript_Slowbro", "flag": "0" @@ -109,7 +109,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_EventScript_Lass", "flag": "0" @@ -122,7 +122,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_EventScript_Youngster", "flag": "0" @@ -135,7 +135,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_CERULEAN_RIVAL" @@ -148,7 +148,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_EventScript_Woman", "flag": "0" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_EventScript_CeruleanCaveGuard", "flag": "FLAG_HIDE_CERULEAN_CAVE_GUARD" diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json index ef3d42d00..f7d3b573b 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_BikeShop_EventScript_Clerk", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_BikeShop_EventScript_Youngster", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_BikeShop_EventScript_Woman", "flag": "0" diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json index adc8e292c..78f866633 100644 --- a/data/maps/CeruleanCity_Gym/map.json +++ b/data/maps/CeruleanCity_Gym/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "CeruleanCity_Gym_EventScript_Luis", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "CeruleanCity_Gym_EventScript_Diana", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_Gym_EventScript_Misty", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_Gym_EventScript_GymGuy", "flag": "0" diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json index d6fc3ee74..c26ec9435 100644 --- a/data/maps/CeruleanCity_House1/map.json +++ b/data/maps/CeruleanCity_House1/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_House1_EventScript_BadgeGuy", "flag": "0" diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json index e52ea4cc0..f70b0922f 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_House2_EventScript_Hiker", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_House2_EventScript_Lass", "flag": "0" diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json index bc6c04d73..db0bc7f94 100644 --- a/data/maps/CeruleanCity_House3/map.json +++ b/data/maps/CeruleanCity_House3/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_House3_EventScript_Dontae", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_House3_EventScript_OldWoman", "flag": "0" diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json index 0470c4abe..cb7c7fe0e 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/data/maps/CeruleanCity_House4/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_House4_EventScript_WonderNewsBerryMan", "flag": "0" 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/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json index 8c656c73f..331d7ff54 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_House5_EventScript_BerryPowderMan", "flag": "0" diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json index 90aedf6f9..f5dfc959f 100644 --- a/data/maps/CeruleanCity_Mart/map.json +++ b/data/maps/CeruleanCity_Mart/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_Mart_EventScript_Clerk", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_Mart_EventScript_Woman", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_Mart_EventScript_Youngster", "flag": "0" diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json index 9a90b1f34..91dcfd544 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_PokemonCenter_1F_EventScript_Rocker", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_PokemonCenter_1F_EventScript_Youngster", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_PokemonCenter_1F_EventScript_Lass", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_PokemonCenter_1F_EventScript_PokemonJournalMisty", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CeruleanCity_PokemonCenter_1F_EventScript_PokemonJournalMisty", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index 9e815b487..929d46d1e 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index 1bc8c58ab..c738cff3b 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_EventScript_Woman", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_EventScript_OldMan", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_CINNABAR_BILL" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_CINNABAR_SEAGALLOP" diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index e0260dac5..40e8288cd 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -60,7 +60,7 @@ CinnabarIsland_OnFrame:: @ 8166F6E CinnabarIsland_EventScript_ExitPokeCenterForOneIsland:: @ 8166F88 lockall - clearflag FLAG_SPECIAL_FLAG_0x4001 + clearflag FLAG_DONT_TRANSITION_MUSIC savebgm MUS_DUMMY textcolor 0 setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 2 diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index 9eadd59c2..ae40512d5 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_Gym_EventScript_Quinn", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_Gym_EventScript_Erik", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_Gym_EventScript_Avery", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_Gym_EventScript_Ramon", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_Gym_EventScript_Derek", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_Gym_EventScript_Dusty", "flag": "0" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_Gym_EventScript_Zac", "flag": "0" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_Gym_EventScript_Blaine", "flag": "0" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_Gym_EventScript_GymGuy", "flag": "0" diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json index f9d309d91..e1d02595a 100644 --- a/data/maps/CinnabarIsland_Mart/map.json +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_Mart_EventScript_Clerk", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_Mart_EventScript_Woman", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_Mart_EventScript_Scientist", "flag": "0" diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index 70bce694b..9a4182fe9 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_PokemonCenter_1F_EventScript_Nurse", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_PokemonCenter_1F_EventScript_CooltrainerF", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_PokemonCenter_1F_EventScript_Youngster", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_PokemonCenter_1F_EventScript_PokemonJournalMrFuji", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_PokemonCenter_1F_EventScript_PokemonJournalMrFuji", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_PokemonCenter_1F_EventScript_Bill", "flag": "FLAG_HIDE_CINNABAR_POKECENTER_BILL" diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index c96169d1d..844c38997 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -36,7 +36,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill:: @ 816E90A closemessage playbgm MUS_ANNAI, 1 savebgm MUS_ANNAI - setflag FLAG_SPECIAL_FLAG_0x4001 + setflag FLAG_DONT_TRANSITION_MUSIC setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL delay 20 compare VAR_FACING, DIR_SOUTH diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index da8471d5e..948e9850e 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json index baf8091b1..775ad23c0 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_PokemonLab_Entrance_EventScript_Scientist", "flag": "0" diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json index 8147e7d82..25d094aa2 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_Garett", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_FossilScientist", "flag": "0" diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json index d669a8e35..354bcfc2f 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_PokemonLab_Lounge_EventScript_Scientist", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_PokemonLab_Lounge_EventScript_Clifton", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_PokemonLab_Lounge_EventScript_Norma", "flag": "0" diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index d1ed07ce0..df02316d7 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_MetronomeTutor", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CinnabarIsland_PokemonLab_ResearchRoom_EventScript_Scientist", "flag": "0" diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json index 25c7b11ae..f3bf00f42 100644 --- a/data/maps/DiglettsCave_NorthEntrance/map.json +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DiglettsCave_NorthEntrance_EventScript_Hiker", "flag": "0" diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json index bface89a2..0c6fb74e9 100644 --- a/data/maps/DiglettsCave_SouthEntrance/map.json +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "DiglettsCave_SouthEntrance_EventScript_OldMan", "flag": "0" diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index fa97b6c6f..413782a68 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_EventScript_Fisher", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_EventScript_BugCatcher", "flag": "0" diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json index 13bdcbc65..04b5b134b 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_Harbor_EventScript_Sailor", "flag": "0" diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json index 083aa5aa7..63c4e9c84 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_House1_EventScript_Woman", "flag": "0" diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json index 35ae6a036..872818a50 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_House2_EventScript_OldMan", "flag": "0" diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json index 48a205007..be0c1a618 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "FiveIsland_LostCave_Room1_EventScript_Lawson", "flag": "0" diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index b13e3cc1f..1ad0c8d76 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_LOST_CAVE_SELPHY" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_LostCave_Room10_EventScript_ItemSilkScarf", "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM10_SILK_SCARF" diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json index 1286a3c6c..d8b4dbb62 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_LostCave_Room11_EventScript_ItemLaxIncense", "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM11_LAX_INCENSE" diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json index cb2a071f2..cfe11f2c0 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_LostCave_Room12_EventScript_ItemSeaIncense", "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM12_SEA_INCENSE" diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json index 5ad02ce35..877ebe89a 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_LostCave_Room13_EventScript_ItemMaxRevive", "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM13_MAX_REVIVE" diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json index 5b90ecf7d..20c960ff2 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_LostCave_Room14_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM14_RARE_CANDY" diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json index f1d3c4d74..9789e22ac 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "FiveIsland_LostCave_Room4_EventScript_Laura", "flag": "0" diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index b4e32cf47..f88dfed92 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "FiveIsland_Meadow_EventScript_Rocket3", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "FiveIsland_Meadow_EventScript_Rocket1", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "FiveIsland_Meadow_EventScript_Rocket2", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_Meadow_EventScript_ItemMaxPotion", "flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_MAX_POTION" @@ -112,7 +112,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_Meadow_EventScript_ItemPPUp", "flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_PP_UP" diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index f1722813d..21e92146d 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -29,7 +29,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_MemorialPillar_EventScript_MemorialMan", "flag": "0" @@ -42,7 +42,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "FiveIsland_MemorialPillar_EventScript_Milo", "flag": "0" @@ -55,7 +55,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "FiveIsland_MemorialPillar_EventScript_Chaz", "flag": "0" @@ -68,7 +68,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "FiveIsland_MemorialPillar_EventScript_Harold", "flag": "0" @@ -81,7 +81,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_MemorialPillar_EventScript_ItemMetalCoat", "flag": "FLAG_HIDE_FIVE_ISLAND_MEMORIAL_PILLAR_METAL_COAT" 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_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index 786b64909..edc012fb7 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_PokemonCenter_1F_EventScript_Nurse", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_PokemonCenter_1F_EventScript_CooltrainerF", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_PokemonCenter_1F_EventScript_Chef", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_PokemonCenter_1F_EventScript_PokemonJournal", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_PokemonCenter_1F_EventScript_PokemonJournal", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index d9c891db7..7564186ad 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index 6a0c0bb20..77bb5125c 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -29,7 +29,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "FiveIsland_ResortGorgeous_EventScript_Daisy", "flag": "0" @@ -42,7 +42,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "FiveIsland_ResortGorgeous_EventScript_Celina", "flag": "0" @@ -55,7 +55,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "FiveIsland_ResortGorgeous_EventScript_Rayna", "flag": "0" @@ -68,7 +68,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "FiveIsland_ResortGorgeous_EventScript_Jacki", "flag": "0" @@ -81,7 +81,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "FiveIsland_ResortGorgeous_EventScript_Gillian", "flag": "0" @@ -94,7 +94,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", "movement_range_x": 10, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "FiveIsland_ResortGorgeous_EventScript_Destin", "flag": "0" @@ -107,7 +107,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "FiveIsland_ResortGorgeous_EventScript_Toby", "flag": "0" @@ -120,7 +120,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_RESORT_GORGEOUS_SELPHY" diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index acc0dd1ad..05178a289 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_ResortGorgeous_House_EventScript_Selphy", "flag": "FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_ResortGorgeous_House_EventScript_Butler", "flag": "FLAG_HIDE_SELPHYS_BUTLER" 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_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index 0a6529732..c5863a524 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "FiveIsland_RocketWarehouse_EventScript_Grunt2", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "FiveIsland_RocketWarehouse_EventScript_Grunt3", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "FiveIsland_RocketWarehouse_EventScript_Admin1", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "FiveIsland_RocketWarehouse_EventScript_Admin2", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "FiveIsland_RocketWarehouse_EventScript_Grunt1", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_RocketWarehouse_EventScript_Gideon", "flag": "0" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_RocketWarehouse_EventScript_ItemBigPearl", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_BIG_PEARL" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_RocketWarehouse_EventScript_ItemTM36", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_TM36" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_RocketWarehouse_EventScript_ItemPearl", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_PEARL" @@ -140,7 +140,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_RocketWarehouse_EventScript_ItemUpGrade", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_UP_GRADE" diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json index 5efff8eb5..33c06d199 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/map.json +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FiveIsland_WaterLabyrinth_EventScript_EggGentleman", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "FiveIsland_WaterLabyrinth_EventScript_Alize", "flag": "0" 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/map.json b/data/maps/FourIsland/map.json index d6670c4b5..1c0b06c83 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_EventScript_DaycareMan", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_EventScript_OldWoman", "flag": "0" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_EventScript_ItemStarPiece", "flag": "FLAG_HIDE_FOUR_ISLAND_STAR_PIECE" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_EventScript_ItemStardust", "flag": "FLAG_HIDE_FOUR_ISLAND_STARDUST" @@ -140,7 +140,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_FOUR_ISLAND_RIVAL" @@ -153,7 +153,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_EventScript_FatMan", "flag": "0" @@ -166,7 +166,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_EventScript_LittleGirl", "flag": "0" 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/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json index a166881a8..c324696cc 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_Harbor_EventScript_Sailor", "flag": "0" diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index 2da1c5062..7016ab9ab 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_House1_EventScript_BodySlamTutor", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_House1_EventScript_FatMan", "flag": "0" diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index b6ecb2c73..af7a3322d 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_House2_EventScript_StickerMan", "flag": "0" diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json index 16fae6c59..8e7f52c9e 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_IcefallCave_1F_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_ULTRA_BALL" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_IcefallCave_1F_EventScript_ItemHM07", "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_HM07" diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index af5eeaea1..02db224cb 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_IcefallCave_B1F_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_B1F_FULL_RESTORE" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_IcefallCave_B1F_EventScript_ItemNeverMeltIce", "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_B1F_NEVER_MELT_ICE" diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index 0e9171bdc..a9d838841 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_IcefallCave_Back_EventScript_Lorelei", "flag": "FLAG_HIDE_ICEFALL_CAVE_LORELEI" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS" diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json index c70affea5..77eb60ff2 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_LoreleisHouse_EventScript_Lorelei", "flag": "FLAG_HIDE_LORELEI_IN_HER_HOUSE" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "0" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "0" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEI_HOUSE_MEOWTH_DOLL" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEI_HOUSE_CHANSEY_DOLL" @@ -140,7 +140,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEI_HOUSE_JIGGLYPUFF_DOLL" @@ -153,7 +153,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_F_DOLL" @@ -166,7 +166,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_M_DOLL" @@ -179,7 +179,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEIS_HOUSE_PIDGEOT_DOLL" @@ -192,7 +192,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEIS_HOUSE_FEAROW_DOLL" @@ -205,7 +205,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_LoreleisHouse_EventScript_Doll", "flag": "FLAG_HIDE_LORELEIS_HOUSE_LAPRAS_DOLL" diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json index 69c1f698e..178b8b4bf 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_Mart_EventScript_Clerk", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_Mart_EventScript_OldMan", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_Mart_EventScript_Camper", "flag": "0" diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index 6ce605e81..e87c2955b 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_PokemonCenter_1F_EventScript_Nurse", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_PokemonCenter_1F_EventScript_Man", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_PokemonCenter_1F_EventScript_Woman", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index 7a92f9f97..5191528a8 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json index b137bae07..3cfb9dc54 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FourIsland_PokemonDayCare_EventScript_DaycareWoman", "flag": "0" diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index 1f23ff4c7..aab3609d4 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -39,7 +39,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_EventScript_Erik", "flag": "0" @@ -52,7 +52,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT", "movement_range_x": 4, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -65,7 +65,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -78,7 +78,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_EventScript_Youngster", "flag": "0" @@ -91,7 +91,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -104,7 +104,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_EventScript_LittleBoy", "flag": "0" @@ -117,7 +117,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -130,7 +130,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_EventScript_OldMan", "flag": "0" @@ -143,7 +143,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -156,7 +156,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 4, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -169,7 +169,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" @@ -182,7 +182,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" @@ -195,7 +195,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" @@ -208,7 +208,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_15" @@ -221,7 +221,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_EventScript_SubstituteTutor", "flag": "0" @@ -234,7 +234,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_EventScript_Lass", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json index 24f67f9f9..031e69071 100644 --- a/data/maps/FuchsiaCity_Gym/map.json +++ b/data/maps/FuchsiaCity_Gym/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "FuchsiaCity_Gym_EventScript_Kayden", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "FuchsiaCity_Gym_EventScript_Shawn", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "FuchsiaCity_Gym_EventScript_Kirk", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "FuchsiaCity_Gym_EventScript_Edgar", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "FuchsiaCity_Gym_EventScript_Phil", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "FuchsiaCity_Gym_EventScript_Nate", "flag": "0" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_Gym_EventScript_Koga", "flag": "0" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_Gym_EventScript_GymGuy", "flag": "0" diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json index b36b8dab2..68f802b88 100644 --- a/data/maps/FuchsiaCity_House1/map.json +++ b/data/maps/FuchsiaCity_House1/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_House1_EventScript_OldMan", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_House1_EventScript_Woman", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_House1_EventScript_LittleBoy", "flag": "0" diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json index 537843e7d..25361a07d 100644 --- a/data/maps/FuchsiaCity_House2/map.json +++ b/data/maps/FuchsiaCity_House2/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_House2_EventScript_FishingGurusBrother", "flag": "0" diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json index f146802e5..fde85e8f9 100644 --- a/data/maps/FuchsiaCity_House3/map.json +++ b/data/maps/FuchsiaCity_House3/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_House3_EventScript_MoveDeleter", "flag": "0" diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json index 977e6737c..d7ac2c49d 100644 --- a/data/maps/FuchsiaCity_Mart/map.json +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_Mart_EventScript_Clerk", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_Mart_EventScript_Gentleman", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_Mart_EventScript_CooltrainerF", "flag": "0" diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json index 843600756..b97fbb232 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_PokemonCenter_1F_EventScript_Man", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_PokemonCenter_1F_EventScript_CooltrainerF", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_PokemonCenter_1F_EventScript_Youngster", "flag": "0" diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index 37791a904..588d1a3eb 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index 9ccb25f2b..85b2d38e7 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_SafariZone_Entrance_EventScript_InfoAttendant", "flag": "0" diff --git a/data/maps/FuchsiaCity_SafariZone_Office/map.json b/data/maps/FuchsiaCity_SafariZone_Office/map.json index 6ff679851..77704acae 100644 --- a/data/maps/FuchsiaCity_SafariZone_Office/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Office/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_SafariZone_Office_EventScript_Worker2", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_SafariZone_Office_EventScript_Worker3", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_SafariZone_Office_EventScript_Worker1", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_SafariZone_Office_EventScript_Worker4", "flag": "0" diff --git a/data/maps/FuchsiaCity_WardensHouse/map.json b/data/maps/FuchsiaCity_WardensHouse/map.json index a6d7e8044..ceb1d7398 100644 --- a/data/maps/FuchsiaCity_WardensHouse/map.json +++ b/data/maps/FuchsiaCity_WardensHouse/map.json @@ -23,20 +23,20 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_WardensHouse_EventScript_Warden", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 6, "elevation": 3, "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_WardensHouse_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_FUCHSIA_CITY_WARDENS_HOUSE_RARE_CANDY" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "FuchsiaCity_WardensHouse_EventScript_PokemonJournalKoga", "flag": "FLAG_HIDE_FAME_CHECKER_KOGA_JOURNAL" diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index 6fa8ba079..be976f4ae 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -29,7 +29,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_CREDITS_RIVAL" @@ -42,7 +42,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_CREDITS_OAK" diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json index 711baff7d..485be4c63 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "IndigoPlateau_PokemonCenter_1F_EventScript_Clerk", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "IndigoPlateau_PokemonCenter_1F_EventScript_Nurse", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "IndigoPlateau_PokemonCenter_1F_EventScript_GymGuy", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "IndigoPlateau_PokemonCenter_1F_EventScript_DoorGuard", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "IndigoPlateau_PokemonCenter_1F_EventScript_BlackBelt", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "IndigoPlateau_PokemonCenter_1F_EventScript_PokemonJournal", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "IndigoPlateau_PokemonCenter_1F_EventScript_CooltrainerM", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "IndigoPlateau_PokemonCenter_1F_EventScript_PokemonJournal", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index f08b5a13b..8181715b0 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index d12a524e7..6f9bd7a0b 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -39,7 +39,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavenderTown_EventScript_LittleGirl", "flag": "0" @@ -52,7 +52,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavenderTown_EventScript_WorkerM", "flag": "0" @@ -65,7 +65,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavenderTown_EventScript_Boy", "flag": "0" diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json index 6f9b4349a..ae6263789 100644 --- a/data/maps/LavenderTown_House1/map.json +++ b/data/maps/LavenderTown_House1/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavenderTown_House1_EventScript_CooltrainerF", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavenderTown_House1_EventScript_Cubone", "flag": "0" diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json index 5e580fd54..565db668d 100644 --- a/data/maps/LavenderTown_House2/map.json +++ b/data/maps/LavenderTown_House2/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavenderTown_House2_EventScript_NameRater", "flag": "0" diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json index be2586ae9..5cb531347 100644 --- a/data/maps/LavenderTown_Mart/map.json +++ b/data/maps/LavenderTown_Mart/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavenderTown_Mart_EventScript_Clerk", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavenderTown_Mart_EventScript_BaldingMan", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavenderTown_Mart_EventScript_Rocker", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavenderTown_Mart_EventScript_Youngster", "flag": "0" diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index 451272dff..4af67cd2a 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavenderTown_PokemonCenter_1F_EventScript_Nurse", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavenderTown_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavenderTown_PokemonCenter_1F_EventScript_Lass", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavenderTown_PokemonCenter_1F_EventScript_Youngster", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavenderTown_PokemonCenter_1F_EventScript_BaldingMan", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index 4c120a289..da2a5786a 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index dbf368d46..07ac2badd 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavenderTown_VolunteerPokemonHouse_EventScript_MrFuji", "flag": "FLAG_HIDE_POKEHOUSE_FUJI" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavenderTown_VolunteerPokemonHouse_EventScript_Nidorino", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavenderTown_VolunteerPokemonHouse_EventScript_Psyduck", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavenderTown_VolunteerPokemonHouse_EventScript_LittleBoy", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavenderTown_VolunteerPokemonHouse_EventScript_Youngster", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "LavenderTown_VolunteerPokemonHouse_EventScript_LittleGirl", "flag": "0" diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 7499f0047..6b0c1a8fb 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtEmber_Exterior_EventScript_ExplosionTutor", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtEmber_Exterior_EventScript_Grunt1", "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtEmber_Exterior_EventScript_Grunt2", "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", "movement_range_x": 5, "movement_range_y": 3, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "MtEmber_Exterior_EventScript_Jocelyn", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "MtEmber_Exterior_EventScript_Logan", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "MtEmber_Exterior_EventScript_Beth", "flag": "0" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" @@ -114,46 +114,46 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 22, "y": 45, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 17, "y": 46, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 36, "y": 14, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" @@ -166,7 +166,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" @@ -179,33 +179,33 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 35, "y": 14, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 35, "y": 17, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" @@ -218,7 +218,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" @@ -231,7 +231,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_17" @@ -244,7 +244,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtEmber_Exterior_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ULTRA_BALL" @@ -257,7 +257,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtEmber_Exterior_EventScript_ItemFireStone", "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_FIRE_STONE" @@ -270,7 +270,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtEmber_Exterior_EventScript_ItemDireHit", "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_DIRE_HIT" diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index 21c646983..46da66957 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index d6b81c3fb..af102d21a 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index e6ca5be6f..426dfd840 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index e505dd6ab..ae9032e1a 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -16,40 +16,40 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 3, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 5, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 2, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index fef1ba94c..5aff19b08 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 3107af9f3..80a475e31 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -16,40 +16,40 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 10, "y": 4, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 26, "y": 12, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 28, "y": 8, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" @@ -127,20 +127,20 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 15, "y": 13, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index 990aa81dc..8ca8f26f7 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtEmber_RubyPath_B5F_EventScript_Ruby", "flag": "FLAG_HIDE_RUBY" diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index 9442cb532..521adf657 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -23,59 +23,59 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtEmber_Summit_EventScript_Moltres", "flag": "FLAG_HIDE_MOLTRES" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 10, "y": 12, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 12, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 11, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 10, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" 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/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index f808c2df3..ee43d3bce 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_17" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_18" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_19" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1A" diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index 8606b0c01..7a53c094a 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "MtMoon_1F_EventScript_Iris", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "MtMoon_1F_EventScript_Robby", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "MtMoon_1F_EventScript_Jovan", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP", "movement_range_x": 5, "movement_range_y": 3, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "MtMoon_1F_EventScript_Miriam", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "MtMoon_1F_EventScript_Kent", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "MtMoon_1F_EventScript_Josh", "flag": "0" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "MtMoon_1F_EventScript_Macros", "flag": "0" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtMoon_1F_EventScript_ItemParalyzeHeal", "flag": "FLAG_HIDE_MT_MOON_1F_PARALYZE_HEAL" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtMoon_1F_EventScript_ItemTM09", "flag": "FLAG_HIDE_MT_MOON_1F_TM09" @@ -140,7 +140,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtMoon_1F_EventScript_ItemPotion", "flag": "FLAG_HIDE_MT_MOON_1F_POTION" @@ -153,7 +153,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtMoon_1F_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_MT_MOON_1F_RARE_CANDY" @@ -166,7 +166,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtMoon_1F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_MT_MOON_1F_ESCAPE_ROPE" @@ -179,7 +179,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtMoon_1F_EventScript_ItemMoonStone", "flag": "FLAG_HIDE_MT_MOON_1F_MOON_STONE" @@ -192,7 +192,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtMoon_1F_EventScript_BaldingMan", "flag": "0" diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index dd162b7d2..172a1be21 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtMoon_B2F_EventScript_DomeFossil", "flag": "FLAG_HIDE_DOME_FOSSIL" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtMoon_B2F_EventScript_HelixFossil", "flag": "FLAG_HIDE_HELIX_FOSSIL" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtMoon_B2F_EventScript_Miguel", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "MtMoon_B2F_EventScript_Grunt4", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "MtMoon_B2F_EventScript_Grunt1", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "MtMoon_B2F_EventScript_Grunt3", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "MtMoon_B2F_EventScript_Grunt2", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtMoon_B2F_EventScript_ItemStarPiece", "flag": "FLAG_HIDE_MT_MOON_B2F_STAR_PIECE" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtMoon_B2F_EventScript_ItemTM46", "flag": "FLAG_HIDE_MT_MOON_B2F_TM46" @@ -140,7 +140,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtMoon_B2F_EventScript_ItemRevive", "flag": "FLAG_HIDE_MT_MOON_B2F_REVIVE" @@ -153,7 +153,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MtMoon_B2F_EventScript_ItemAntidote", "flag": "FLAG_HIDE_MT_MOON_B2F_ANTIDOTE" 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/map.json b/data/maps/NavelRock_Base/map.json index f799e76b0..8c00f2a75 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "NavelRock_Base_EventScript_Lugia", "flag": "FLAG_HIDE_LUGIA" 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_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index a6c40dc1e..3b859459e 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "NavelRock_Harbor_EventScript_Sailor", "flag": "0" diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index 8defa69a8..a7bacb9f5 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_HO_OH" 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/map.json b/data/maps/OneIsland/map.json index 3d7e9129f..394af5a6d 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ONE_ISLAND_BILL" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_EventScript_OldMan", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_EventScript_BaldingMan", "flag": "0" diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json index 7b23a5385..f44aaa144 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_Harbor_EventScript_Sailor", "flag": "0" diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json index ecec04042..c6fa1d06f 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_House1_EventScript_OldMan", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_House1_EventScript_OldWoman", "flag": "0" diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json index 1932d08f5..da306f19e 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_House2_EventScript_Lass", "flag": "0" diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 82e45c4fc..c22c95e05 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -29,7 +29,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "OneIsland_KindleRoad_EventScript_Maria", "flag": "0" @@ -42,7 +42,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "OneIsland_KindleRoad_EventScript_Abigail", "flag": "0" @@ -55,7 +55,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 6, "movement_range_y": 3, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "OneIsland_KindleRoad_EventScript_Finn", "flag": "0" @@ -68,7 +68,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "OneIsland_KindleRoad_EventScript_Garrett", "flag": "0" @@ -81,7 +81,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_KindleRoad_EventScript_Tommy", "flag": "0" @@ -94,7 +94,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 7, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "OneIsland_KindleRoad_EventScript_Sharon", "flag": "0" @@ -107,7 +107,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 1, "movement_range_y": 4, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "OneIsland_KindleRoad_EventScript_Tanya", "flag": "0" @@ -120,7 +120,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "OneIsland_KindleRoad_EventScript_Shea", "flag": "0" @@ -133,7 +133,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "OneIsland_KindleRoad_EventScript_Hugh", "flag": "0" @@ -146,7 +146,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "OneIsland_KindleRoad_EventScript_Bryce", "flag": "0" @@ -159,7 +159,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "OneIsland_KindleRoad_EventScript_Claire", "flag": "0" @@ -172,7 +172,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "OneIsland_KindleRoad_EventScript_Mik", "flag": "0" @@ -185,7 +185,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "OneIsland_KindleRoad_EventScript_Kia", "flag": "0" @@ -198,7 +198,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" @@ -211,7 +211,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" @@ -224,7 +224,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" @@ -237,7 +237,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_17" @@ -250,7 +250,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_18" @@ -263,7 +263,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_19" @@ -276,7 +276,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1A" @@ -289,7 +289,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1B" @@ -302,7 +302,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1C" @@ -315,7 +315,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1D" @@ -328,7 +328,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1E" @@ -341,7 +341,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1F" @@ -354,7 +354,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_11" @@ -367,7 +367,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_KindleRoad_EventScript_ItemEther", "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_ETHER" @@ -380,7 +380,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_KindleRoad_EventScript_ItemMaxRepel", "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_MAX_REPEL" @@ -393,7 +393,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_KindleRoad_EventScript_ItemCarbos", "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_CARBOS" diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index 20859bfd2..d7fa5d88f 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_KindleRoad_EmberSpa_EventScript_OldMan", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_KindleRoad_EmberSpa_EventScript_BaldingMan1", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_KindleRoad_EmberSpa_EventScript_BlackBelt", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_KindleRoad_EmberSpa_EventScript_OldWoman", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_KindleRoad_EmberSpa_EventScript_RockSmashMan", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_KindleRoad_EmberSpa_EventScript_BaldingMan2", "flag": "0" diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index f998ac3bc..e3d94753a 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_PokemonCenter_1F_EventScript_Nurse", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_PokemonCenter_1F_EventScript_Bill", "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_PokemonCenter_1F_EventScript_Celio", "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_CELIO" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_PokemonCenter_1F_EventScript_LittleBoy", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_PokemonCenter_1F_EventScript_Hiker", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_PokemonCenter_1F_EventScript_BattleGirl", "flag": "0" 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/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index 95f231de7..13d3d1d02 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json index 64957fb7e..2f96d4b26 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -29,7 +29,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "OneIsland_TreasureBeach_EventScript_Amara", "flag": "0" @@ -42,7 +42,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "OneIsland_TreasureBeach_EventScript_Boy", "flag": "0" diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index dc591cce3..8ebfb8bcc 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 4, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PalletTown_EventScript_SignLady", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 6, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PalletTown_EventScript_FatMan", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_OAK_IN_PALLET_TOWN" diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index b165ae6b9..62e9d8a01 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -224,7 +224,7 @@ PalletTown_EventScript_OakTrigger:: @ 8165605 clearflag FLAG_HIDE_OAK_IN_HIS_LAB setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 1 setflag FLAG_HIDE_OAK_IN_PALLET_TOWN - setflag FLAG_SPECIAL_FLAG_0x4001 + setflag FLAG_DONT_TRANSITION_MUSIC warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 waitstate releaseall @@ -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/map.json b/data/maps/PalletTown_GarysHouse/map.json index 27faa7b3f..0808e9534 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PalletTown_GarysHouse_EventScript_Daisy", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PalletTown_GarysHouse_EventScript_TownMap", "flag": "FLAG_HIDE_TOWN_MAP" 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_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index b1c95778d..60d0d1960 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PalletTown_PlayersHouse_1F_EventScript_Mom", "flag": "0" diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index dceeaaa81..ad076b0c6 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PalletTown_ProfessorOaksLab_EventScript_Aide1", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 4, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PalletTown_ProfessorOaksLab_EventScript_Aide3", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PalletTown_ProfessorOaksLab_EventScript_Aide2", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PalletTown_ProfessorOaksLab_EventScript_ProfOak", "flag": "FLAG_HIDE_OAK_IN_HIS_LAB" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PalletTown_ProfessorOaksLab_EventScript_BulbasaurBall", "flag": "FLAG_HIDE_BULBASAUR_BALL" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PalletTown_ProfessorOaksLab_EventScript_SquirtleBall", "flag": "FLAG_HIDE_SQUIRTLE_BALL" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PalletTown_ProfessorOaksLab_EventScript_CharmanderBall", "flag": "FLAG_HIDE_CHARMANDER_BALL" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PalletTown_ProfessorOaksLab_EventScript_Rival", "flag": "FLAG_HIDE_RIVAL_IN_LAB" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PalletTown_ProfessorOaksLab_EventScript_Pokedex", "flag": "FLAG_HIDE_POKEDEX" @@ -140,7 +140,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PalletTown_ProfessorOaksLab_EventScript_Pokedex", "flag": "FLAG_HIDE_POKEDEX" diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 461318e35..fecfd0b48 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -238,7 +238,7 @@ PalletTown_ProfessorOaksLab_ChooseStarterScene:: @ 816923E waitmovement 0 applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestUp waitmovement 0 - clearflag FLAG_SPECIAL_FLAG_0x4001 + clearflag FLAG_DONT_TRANSITION_MUSIC savebgm SE_STOP fadedefaultbgm msgbox PalletTown_ProfessorOaksLab_Text_RivalFedUpWithWaiting @@ -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/map.json b/data/maps/PewterCity/map.json index 444adf15f..6d6fc0396 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_EventScript_Lass", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_EventScript_MuseumGuide", "flag": "FLAG_HIDE_PEWTER_MUSEUM_GUIDE" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_EventScript_FatMan", "flag": "0" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_EventScript_BugCatcher", "flag": "0" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_EventScript_GymGuide", "flag": "FLAG_HIDE_PEWTER_CITY_GYM_GUIDE" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" @@ -112,7 +112,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_EventScript_RunningShoesAide", "flag": "FLAG_HIDE_PEWTER_CITY_RUNNING_SHOES_GUY" diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index be854826b..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 @@ -744,7 +744,7 @@ PewterCity_EventScript_AideGiveRunningShoes:: @ 81662DE msgbox PewterCity_Text_RunningShoesLetterFromMom closemessage removeobject LOCALID_AIDE - setflag FLAG_SYS_RUNNING_SHOES + setflag FLAG_SYS_B_DASH setvar VAR_MAP_SCENE_PEWTER_CITY, 2 return diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json index 274421b5f..7c160945a 100644 --- a/data/maps/PewterCity_Gym/map.json +++ b/data/maps/PewterCity_Gym/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_Gym_EventScript_Brock", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "PewterCity_Gym_EventScript_Liam", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_Gym_EventScript_GymGuy", "flag": "0" diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json index 58e40a21a..1c45b8da0 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_House1_EventScript_BaldingMan", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_House1_EventScript_LittleBoy", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_House1_EventScript_Nidoran", "flag": "0" diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json index 3acdc7fc3..cb65aa873 100644 --- a/data/maps/PewterCity_House2/map.json +++ b/data/maps/PewterCity_House2/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_House2_EventScript_OldMan", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_House2_EventScript_LittleBoy", "flag": "0" diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json index d73b36b8b..ec45af3a6 100644 --- a/data/maps/PewterCity_Mart/map.json +++ b/data/maps/PewterCity_Mart/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_Mart_EventScript_Youngster", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_Mart_EventScript_Boy", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_Mart_EventScript_Clerk", "flag": "0" diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index e9cd2560b..26cdfbdcd 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_Museum_1F_EventScript_Scientist1", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_Museum_1F_EventScript_OldMan", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_Museum_1F_EventScript_OldAmberScientist", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_Museum_1F_EventScript_OldAmber", "flag": "FLAG_HIDE_OLD_AMBER" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_Museum_1F_EventScript_Scientist2", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_Museum_1F_EventScript_SeismicTossTutor", "flag": "0" diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json index 2949c7174..2e3c40177 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_Museum_2F_EventScript_Scientist", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_Museum_2F_EventScript_Man", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_Museum_2F_EventScript_OldMan", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_Museum_2F_EventScript_LittleGirl", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_Museum_2F_EventScript_BaldingMan", "flag": "0" diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index b81f5e57c..6918c6df2 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_PokemonCenter_1F_EventScript_Jigglypuff", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_PokemonCenter_1F_EventScript_Youngster", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "MysteryEventClub_EventScript_Woman", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_PokemonCenter_1F_EventScript_GBAKid1", "flag": "0" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PewterCity_PokemonCenter_1F_EventScript_GBAKid2", "flag": "0" diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index d5d6250de..d080b6965 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json index 5da2126a1..87f9eb0a7 100644 --- a/data/maps/PokemonLeague_AgathasRoom/map.json +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonLeague_AgathasRoom_EventScript_Agatha", "flag": "0" diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json index 0113e7336..bcc6a1155 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonLeague_BrunosRoom_EventScript_Bruno", "flag": "0" diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index 2dc285b4e..a0480dbd5 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_OAK_IN_CHAMP_ROOM" diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json index 8375ede3d..1b694e4fb 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json index eb1289432..c112adb23 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonLeague_LancesRoom_EventScript_Lance", "flag": "0" diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json index 8a426df7b..d34bcabc7 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/map.json +++ b/data/maps/PokemonLeague_LoreleisRoom/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonLeague_LoreleisRoom_EventScript_Lorelei", "flag": "0" diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index 9e17c9c4c..1cbf97e80 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "PokemonMansion_1F_EventScript_Ted", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonMansion_1F_EventScript_ItemCarbos", "flag": "FLAG_HIDE_POKEMON_MANSION_1F_CARBOS" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonMansion_1F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_POKEMON_MANSION_1F_ESCAPE_ROPE" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonMansion_1F_EventScript_ItemProtein", "flag": "FLAG_HIDE_POKEMON_MANSION_1F_PROTEIN" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "PokemonMansion_1F_EventScript_Johnson", "flag": "0" diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index 49868a8bb..2591840bc 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "PokemonMansion_2F_EventScript_Arnie", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonMansion_2F_EventScript_ItemCalcium", "flag": "FLAG_HIDE_POKEMON_MANSION_2F_CALCIUM" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonMansion_2F_EventScript_ItemZinc", "flag": "FLAG_HIDE_POKEMON_MANSION_2F_ZINC" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonMansion_2F_EventScript_ItemHPUp", "flag": "FLAG_HIDE_POKEMON_MANSION_2F_HP_UP" diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index 77c1a99e9..6437b86b2 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "PokemonMansion_3F_EventScript_Simon", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "PokemonMansion_3F_EventScript_Braydon", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonMansion_3F_EventScript_ItemMaxPotion", "flag": "FLAG_HIDE_POKEMON_MANSION_3F_MAX_POTION" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonMansion_3F_EventScript_ItemIron", "flag": "FLAG_HIDE_POKEMON_MANSION_3F_IRON" diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index b33a6498c..32595b885 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonMansion_B1F_EventScript_ItemTM22", "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM22" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "PokemonMansion_B1F_EventScript_Lewis", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "6", "script": "PokemonMansion_B1F_EventScript_Ivan", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonMansion_B1F_EventScript_ItemTM14", "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM14" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonMansion_B1F_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_FULL_RESTORE" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonMansion_B1F_EventScript_ItemSecretKey", "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY" diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json index 8ab6897d9..fd5d75c8b 100644 --- a/data/maps/PokemonTower_1F/map.json +++ b/data/maps/PokemonTower_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonTower_1F_EventScript_WorkerF", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonTower_1F_EventScript_Channeler", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonTower_1F_EventScript_Woman1", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonTower_1F_EventScript_Woman2", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonTower_1F_EventScript_BaldingMan", "flag": "0" diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index 9e32cc0d3..527af409c 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_TOWER_RIVAL" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonTower_2F_EventScript_Channeler", "flag": "0" diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json index 1fc394672..af3480839 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "PokemonTower_3F_EventScript_Patricia", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "PokemonTower_3F_EventScript_Carly", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "PokemonTower_3F_EventScript_Hope", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonTower_3F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_POKEMON_TOWER_3F_ESCAPE_ROPE" diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index 10d61b4f6..d7104bc15 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "PokemonTower_4F_EventScript_Laurel", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "PokemonTower_4F_EventScript_Jody", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "PokemonTower_4F_EventScript_Paula", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonTower_4F_EventScript_ItemElixir", "flag": "FLAG_HIDE_POKEMON_TOWER_4F_ELIXIR" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonTower_4F_EventScript_ItemAwakening", "flag": "FLAG_HIDE_POKEMON_TOWER_4F_AWAKENING" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonTower_4F_EventScript_ItemGreatBall", "flag": "FLAG_HIDE_POKEMON_TOWER_4F_GREAT_BALL" diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index ede57a424..bd22d3bff 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "PokemonTower_5F_EventScript_Ruth", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "PokemonTower_5F_EventScript_Tammy", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "PokemonTower_5F_EventScript_Karina", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "PokemonTower_5F_EventScript_Janae", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonTower_5F_EventScript_Channeler", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonTower_5F_EventScript_ItemNugget", "flag": "FLAG_HIDE_POKEMON_TOWER_5F_NUGGET" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonTower_5F_EventScript_ItemCleanseTag", "flag": "FLAG_HIDE_POKEMON_TOWER_5F_CLEANSE_TAG" diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index c3e1a37c4..a9bd74228 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "PokemonTower_6F_EventScript_Angelica", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "PokemonTower_6F_EventScript_Jennifer", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "PokemonTower_6F_EventScript_Emilia", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonTower_6F_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_POKEMON_TOWER_6F_RARE_CANDY" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonTower_6F_EventScript_ItemXAccuracy", "flag": "FLAG_HIDE_POKEMON_TOWER_6F_X_ACCURACY" 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/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index fb0ae5fc2..deaaab14d 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PokemonTower_7F_EventScript_MrFuji", "flag": "FLAG_HIDE_TOWER_FUJI" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "PokemonTower_7F_EventScript_Grunt1", "flag": "FLAG_HIDE_TOWER_ROCKET_1" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "PokemonTower_7F_EventScript_Grunt2", "flag": "FLAG_HIDE_TOWER_ROCKET_2" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "PokemonTower_7F_EventScript_Grunt3", "flag": "FLAG_HIDE_TOWER_ROCKET_3" diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index 7f8678469..3e92c9ebc 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PowerPlant_EventScript_ItemMaxPotion", "flag": "FLAG_HIDE_POWER_PLANT_MAX_POTION" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PowerPlant_EventScript_ItemTM17", "flag": "FLAG_HIDE_POWER_PLANT_TM17" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PowerPlant_EventScript_ItemTM25", "flag": "FLAG_HIDE_POWER_PLANT_TM25" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PowerPlant_EventScript_ItemThunderStone", "flag": "FLAG_HIDE_POWER_PLANT_THUNDER_STONE" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PowerPlant_EventScript_ItemElixir", "flag": "FLAG_HIDE_POWER_PLANT_ELIXIR" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PowerPlant_EventScript_Zapdos", "flag": "FLAG_HIDE_ZAPDOS" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PowerPlant_EventScript_Electrode2", "flag": "FLAG_HIDE_POWER_PLANT_ELECTRODE_2" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "PowerPlant_EventScript_Electrode1", "flag": "FLAG_HIDE_POWER_PLANT_ELECTRODE_1" 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/RecordCenter/map.json b/data/maps/RecordCenter/map.json index b72381cd6..ad4308513 100644 --- a/data/maps/RecordCenter/map.json +++ b/data/maps/RecordCenter/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RecordCenter_EventScript_Attendant", "flag": "0" @@ -67,7 +67,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "RecordCenter_EventScript_Spot" + "script": "RecordCenter_EventScript_Spot0" }, { "type": "trigger", @@ -76,7 +76,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "RecordCenter_EventScript_Spot" + "script": "RecordCenter_EventScript_Spot1" }, { "type": "trigger", @@ -85,7 +85,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "RecordCenter_EventScript_Spot" + "script": "RecordCenter_EventScript_Spot2" }, { "type": "trigger", @@ -94,7 +94,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "RecordCenter_EventScript_Spot" + "script": "RecordCenter_EventScript_Spot3" } ], "bg_events": [] diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index 9adc1134a..b248fccdb 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "RockTunnel_1F_EventScript_Dana", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "RockTunnel_1F_EventScript_Ariana", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "RockTunnel_1F_EventScript_Leah", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "RockTunnel_1F_EventScript_Lucas", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "RockTunnel_1F_EventScript_Oliver", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "RockTunnel_1F_EventScript_Lenny", "flag": "0" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "RockTunnel_1F_EventScript_Ashton", "flag": "0" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RockTunnel_1F_EventScript_ItemRepel", "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_REPEL" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RockTunnel_1F_EventScript_ItemPearl", "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_PEARL" @@ -140,7 +140,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RockTunnel_1F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_ESCAPE_ROPE" diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index 5dbfece04..c1b86c78f 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "RockTunnel_B1F_EventScript_Cooper", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "RockTunnel_B1F_EventScript_Dudley", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "RockTunnel_B1F_EventScript_Sofia", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "RockTunnel_B1F_EventScript_Allen", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "RockTunnel_B1F_EventScript_Eric", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "RockTunnel_B1F_EventScript_Steve", "flag": "0" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "RockTunnel_B1F_EventScript_Martha", "flag": "0" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "RockTunnel_B1F_EventScript_Winston", "flag": "0" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RockTunnel_B1F_EventScript_RockSlideTutor", "flag": "0" @@ -140,7 +140,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RockTunnel_B1F_EventScript_ItemRevive", "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_REVIVE" @@ -153,7 +153,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RockTunnel_B1F_EventScript_ItemMaxEther", "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_MAX_ETHER" @@ -166,7 +166,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" @@ -179,7 +179,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" @@ -192,7 +192,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" @@ -205,7 +205,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" @@ -218,7 +218,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" @@ -231,7 +231,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_17" @@ -244,7 +244,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_18" @@ -257,7 +257,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_19" @@ -270,7 +270,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1A" @@ -283,7 +283,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1B" @@ -296,7 +296,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1C" @@ -309,7 +309,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1D" @@ -322,7 +322,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1E" @@ -335,7 +335,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1F" @@ -348,7 +348,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_11" diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index 655f74583..47c8f7b08 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "RocketHideout_B1F_EventScript_Grunt2", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "RocketHideout_B1F_EventScript_Grunt1", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "RocketHideout_B1F_EventScript_Grunt4", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "RocketHideout_B1F_EventScript_Grunt3", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "RocketHideout_B1F_EventScript_Grunt5", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RocketHideout_B1F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_ESCAPE_ROPE" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RocketHideout_B1F_EventScript_ItemHyperPotion", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_HYPER_POTION" diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index 61f08965a..88d13e88a 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "RocketHideout_B2F_EventScript_Grunt", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RocketHideout_B2F_EventScript_ItemXSpeed", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_X_SPEED" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RocketHideout_B2F_EventScript_ItemMoonStone", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_MOON_STONE" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RocketHideout_B2F_EventScript_ItemTM12", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_TM12" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RocketHideout_B2F_EventScript_ItemSuperPotion", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_SUPER_POTION" diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index d85f621fd..0127e1f5d 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "RocketHideout_B3F_EventScript_Grunt2", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "RocketHideout_B3F_EventScript_Grunt1", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RocketHideout_B3F_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_RARE_CANDY" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RocketHideout_B3F_EventScript_ItemTM21", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_TM21" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RocketHideout_B3F_EventScript_ItemBlackGlasses", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_BLACK_GLASSES" diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index 73e80c336..cce2d5ebf 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RocketHideout_B4F_EventScript_Giovanni", "flag": "FLAG_HIDE_HIDEOUT_GIOVANNI" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RocketHideout_B4F_EventScript_SilphScope", "flag": "FLAG_HIDE_SILPH_SCOPE" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "RocketHideout_B4F_EventScript_Grunt1", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RocketHideout_B4F_EventScript_LiftKey", "flag": "FLAG_HIDE_LIFT_KEY" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "RocketHideout_B4F_EventScript_Grunt3", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "RocketHideout_B4F_EventScript_Grunt2", "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RocketHideout_B4F_EventScript_ItemTM49", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_TM49" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RocketHideout_B4F_EventScript_ItemMaxEther", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_MAX_ETHER" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "RocketHideout_B4F_EventScript_ItemCalcium", "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_CALCIUM" diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index 92ada2cc6..e0d5f8b73 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route1_EventScript_MartClerk", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route1_EventScript_Boy", "flag": "0" diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index 500cd0885..748ec3d2a 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route10_EventScript_Carol", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route10_EventScript_Clark", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route10_EventScript_Herman", "flag": "0" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route10_EventScript_Trent", "flag": "0" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "Route10_EventScript_Mark", "flag": "0" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route10_EventScript_Heidi", "flag": "0" @@ -112,7 +112,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" @@ -125,7 +125,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" @@ -138,7 +138,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" @@ -151,7 +151,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_15" diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index 2523b185e..dc4978cc6 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route10_PokemonCenter_1F_EventScript_Nurse", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route10_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route10_PokemonCenter_1F_EventScript_FatMan", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route10_PokemonCenter_1F_EventScript_Youngster", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route10_PokemonCenter_1F_EventScript_Aide", "flag": "0" diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index 7b72bbacf..33dcdb91b 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index 74743bd8f..37d3efa5d 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route11_EventScript_Eddie", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route11_EventScript_Hugo", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route11_EventScript_Dillon", "flag": "0" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP", "movement_range_x": 8, "movement_range_y": 4, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route11_EventScript_Dave", "flag": "0" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route11_EventScript_Jasper", "flag": "0" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route11_EventScript_Darian", "flag": "0" @@ -112,7 +112,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route11_EventScript_Braxton", "flag": "0" @@ -125,7 +125,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 4, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route11_EventScript_Yasu", "flag": "0" @@ -138,7 +138,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route11_EventScript_Dirk", "flag": "0" @@ -151,7 +151,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "6", "script": "Route11_EventScript_Bernie", "flag": "0" @@ -164,7 +164,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route11_EventScript_ItemXDefend", "flag": "FLAG_HIDE_ROUTE11_X_DEFEND" @@ -177,7 +177,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route11_EventScript_ItemGreatBall", "flag": "FLAG_HIDE_ROUTE11_GREAT_BALL" @@ -190,7 +190,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route11_EventScript_ItemAwakening", "flag": "FLAG_HIDE_ROUTE11_AWAKENING" diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json index 3f013e622..e404237d0 100644 --- a/data/maps/Route11_EastEntrance_1F/map.json +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route11_EastEntrance_1F_EventScript_TopGuard", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route11_EastEntrance_1F_EventScript_BottomGuard", "flag": "0" diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index e60a24013..e085ea030 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route11_EastEntrance_2F_EventScript_Turner", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route11_EastEntrance_2F_EventScript_Aide", "flag": "0" diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index 5d3786ff3..fefbe4f9c 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -39,7 +39,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route12_EventScript_Ned", "flag": "0" @@ -52,7 +52,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route12_EventScript_Chip", "flag": "0" @@ -65,7 +65,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route12_EventScript_Hank", "flag": "0" @@ -78,7 +78,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route12_EventScript_Elliot", "flag": "0" @@ -91,7 +91,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route12_EventScript_Snorlax", "flag": "FLAG_HIDE_ROUTE_12_SNORLAX" @@ -104,7 +104,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT", "movement_range_x": 4, "movement_range_y": 4, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route12_EventScript_Luca", "flag": "0" @@ -117,7 +117,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route12_EventScript_Justin", "flag": "0" @@ -130,7 +130,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route12_EventScript_Andrew", "flag": "0" @@ -143,7 +143,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" @@ -156,7 +156,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route12_EventScript_ItemTM48", "flag": "FLAG_HIDE_ROUTE12_TM48" @@ -169,7 +169,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route12_EventScript_ItemIron", "flag": "FLAG_HIDE_ROUTE12_IRON" @@ -182,7 +182,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route12_EventScript_Gia", "flag": "0" @@ -195,7 +195,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route12_EventScript_Jes", "flag": "0" @@ -208,7 +208,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" 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/map.json b/data/maps/Route12_FishingHouse/map.json index 48ab3b5bc..a2546ccc6 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route12_FishingHouse_EventScript_FishingGuruBrother", "flag": "0" 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/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json index 1a653600b..a5314bb34 100644 --- a/data/maps/Route12_NorthEntrance_1F/map.json +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route12_NorthEntrance_1F_EventScript_Guard", "flag": "0" diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index 0d7270674..95dc0469c 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route12_NorthEntrance_2F_EventScript_Lass", "flag": "0" diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 85260be5c..01c83ca04 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route13_EventScript_Alma", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route13_EventScript_Sebastian", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route13_EventScript_Susie", "flag": "0" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route13_EventScript_Sheila", "flag": "0" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route13_EventScript_Lola", "flag": "0" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route13_EventScript_Valerie", "flag": "0" @@ -112,7 +112,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route13_EventScript_Gwen", "flag": "0" @@ -125,7 +125,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route13_EventScript_Robert", "flag": "0" @@ -138,7 +138,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route13_EventScript_Perry", "flag": "0" @@ -151,7 +151,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route13_EventScript_Jared", "flag": "0" @@ -164,7 +164,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 3682817dd..2f6d7cd79 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route14_EventScript_Gerald", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route14_EventScript_Donald", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route14_EventScript_Beck", "flag": "0" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route14_EventScript_Marlon", "flag": "0" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route14_EventScript_Isaac", "flag": "0" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route14_EventScript_Malik", "flag": "0" @@ -112,7 +112,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route14_EventScript_Mitch", "flag": "0" @@ -125,7 +125,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route14_EventScript_Carter", "flag": "0" @@ -138,7 +138,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 6, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route14_EventScript_Lukas", "flag": "0" @@ -151,7 +151,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route14_EventScript_Benny", "flag": "0" @@ -164,7 +164,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" @@ -177,7 +177,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" @@ -190,7 +190,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" @@ -203,7 +203,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route14_EventScript_Jan", "flag": "0" @@ -216,7 +216,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route14_EventScript_Kiri", "flag": "0" diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index f584d4b90..fee9bd531 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route15_EventScript_Yazmin", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "Route15_EventScript_Edwin", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route15_EventScript_Chester", "flag": "0" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route15_EventScript_Kindra", "flag": "0" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route15_EventScript_Olivia", "flag": "0" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route15_EventScript_Alex", "flag": "0" @@ -112,7 +112,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route15_EventScript_Ernest", "flag": "0" @@ -125,7 +125,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 4, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route15_EventScript_Becky", "flag": "0" @@ -138,7 +138,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route15_EventScript_Grace", "flag": "0" @@ -151,7 +151,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 4, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route15_EventScript_Celia", "flag": "0" @@ -164,7 +164,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route15_EventScript_ItemTM18", "flag": "FLAG_HIDE_ROUTE15_TM18" @@ -177,7 +177,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route15_EventScript_Ron", "flag": "0" @@ -190,7 +190,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route15_EventScript_Mya", "flag": "0" diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index f7fea64b1..a48784931 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route15_WestEntrance_1F_EventScript_Guard", "flag": "0" diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index b2da08a1f..f91635160 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route15_WestEntrance_2F_EventScript_Aide", "flag": "0" diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index 7e2fefc63..8cc2f36e2 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route16_EventScript_Lao", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route16_EventScript_Koji", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route16_EventScript_Luke", "flag": "0" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route16_EventScript_Ruben", "flag": "0" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route16_EventScript_Hideo", "flag": "0" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route16_EventScript_Camron", "flag": "0" @@ -112,7 +112,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" @@ -125,7 +125,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route16_EventScript_Lea", "flag": "0" @@ -138,7 +138,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route16_EventScript_Jed", "flag": "0" @@ -151,7 +151,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route16_EventScript_Snorlax", "flag": "FLAG_HIDE_ROUTE_16_SNORLAX" 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/Route16_House/map.json b/data/maps/Route16_House/map.json index ca882b999..875a14cef 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route16_House_EventScript_Woman", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route16_House_EventScript_Fearow", "flag": "0" diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index b0dd97f28..2eb8919d0 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route16_NorthEntrance_1F_EventScript_Guard", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route16_NorthEntrance_1F_EventScript_OldMan", "flag": "0" diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index dca03ae4b..00562e86d 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route16_NorthEntrance_2F_EventScript_LittleBoy", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route16_NorthEntrance_2F_EventScript_LittleGirl", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route16_NorthEntrance_2F_EventScript_Aide", "flag": "0" diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index 96e325fa4..3af5c7379 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 6, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route17_EventScript_Virgil", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 5, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route17_EventScript_Isaiah", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 4, "movement_range_y": 2, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route17_EventScript_Raul", "flag": "0" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 5, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route17_EventScript_Nikolas", "flag": "0" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "Route17_EventScript_Billy", "flag": "0" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route17_EventScript_Jamal", "flag": "0" @@ -112,7 +112,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route17_EventScript_Zeek", "flag": "0" @@ -125,7 +125,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 5, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route17_EventScript_Corey", "flag": "0" @@ -138,7 +138,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP", "movement_range_x": 8, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route17_EventScript_William", "flag": "0" @@ -151,7 +151,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 5, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route17_EventScript_Jaxon", "flag": "0" diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index b4a9b8317..339e931b5 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route18_EventScript_Jacob", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route18_EventScript_Ramiro", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "6", "script": "Route18_EventScript_Wilton", "flag": "0" diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index a2f0d44a4..370a52737 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route18_EastEntrance_1F_EventScript_Guard", "flag": "0" diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index 88de810dc..04642eddf 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route18_EastEntrance_2F_EventScript_Haden", "flag": "0" diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index 94a0bf700..fbd12ad37 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 6, "movement_range_y": 3, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route19_EventScript_Reece", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route19_EventScript_Richard", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route19_EventScript_Tony", "flag": "0" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "movement_range_x": 5, "movement_range_y": 3, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route19_EventScript_Matthew", "flag": "0" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route19_EventScript_Douglas", "flag": "0" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "6", "script": "Route19_EventScript_David", "flag": "0" @@ -112,7 +112,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route19_EventScript_Axle", "flag": "0" @@ -125,7 +125,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route19_EventScript_Alice", "flag": "0" @@ -138,7 +138,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route19_EventScript_Connie", "flag": "0" @@ -151,7 +151,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route19_EventScript_Anya", "flag": "0" @@ -164,20 +164,20 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route19_EventScript_Lia", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_TUBER_M_1", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M_WATER", "x": 9, "y": 41, "elevation": 1, "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route19_EventScript_Luc", "flag": "0" diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 6851ad682..6f9ae1327 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_15" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_16" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route2_EventScript_ItemEther", "flag": "FLAG_HIDE_ROUTE2_ETHER" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route2_EventScript_ItemParalyzeHeal", "flag": "FLAG_HIDE_ROUTE2_PARALYZE_HEAL" @@ -113,7 +113,7 @@ "movement_type": "MOVEMENT_TYPE_NONE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "0x0", "flag": "0" diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index 8f02b7498..cb92a2361 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route20_EventScript_Melissa", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route20_EventScript_Missy", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route20_EventScript_Nora", "flag": "0" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route20_EventScript_Roger", "flag": "0" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 5, "movement_range_y": 4, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route20_EventScript_Dean", "flag": "0" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route20_EventScript_Irene", "flag": "0" @@ -112,7 +112,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", "movement_range_x": 5, "movement_range_y": 3, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route20_EventScript_Barry", "flag": "0" @@ -125,7 +125,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 5, "movement_range_y": 3, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route20_EventScript_Darrin", "flag": "0" @@ -138,7 +138,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "Route20_EventScript_Shirley", "flag": "0" @@ -151,7 +151,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route20_EventScript_Tiffany", "flag": "0" @@ -164,7 +164,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route20_EventScript_Camper", "flag": "0" diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index 0edf558bb..b651f0c16 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route21_North_EventScript_Ronald", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route21_North_EventScript_Wade", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "movement_range_x": 4, "movement_range_y": 2, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route21_North_EventScript_Spencer", "flag": "0" @@ -73,20 +73,20 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route21_North_EventScript_Lil", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_TUBER_M_1", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M_WATER", "x": 15, "y": 35, "elevation": 1, "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route21_North_EventScript_Ian", "flag": "0" @@ -100,7 +100,7 @@ "movement_type": "MOVEMENT_TYPE_NONE", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "3", "script": "0x0", "flag": "0" diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json index 1b6ebda42..21cf0b51b 100644 --- a/data/maps/Route21_South/map.json +++ b/data/maps/Route21_South/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route21_South_EventScript_Claude", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route21_South_EventScript_Nolan", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route21_South_EventScript_Jack", "flag": "0" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route21_South_EventScript_Jerome", "flag": "0" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route21_South_EventScript_Roland", "flag": "0" diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index 73a0f5e54..00ac3625a 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_ROUTE_22_RIVAL" diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json index 108f1eec6..23de05134 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route22_NorthEntrance_EventScript_BoulderBadgeGuard", "flag": "0" diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index 0a02e5b52..3f2de59e9 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route23_EventScript_CascadeBadgeGuard", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route23_EventScript_ThunderBadgeGuard", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route23_EventScript_RainbowBadgeGuard", "flag": "0" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route23_EventScript_SoulBadgeGuard", "flag": "0" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route23_EventScript_MarshBadgeGuard", "flag": "0" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route23_EventScript_VolcanoBadgeGuard", "flag": "0" @@ -112,7 +112,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route23_EventScript_EarthBadgeGuard", "flag": "0" diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index c79eeae5f..0cd897e8c 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route24_EventScript_Rocket", "flag": "FLAG_HIDE_NUGGET_BRIDGE_ROCKET" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route24_EventScript_Ethan", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route24_EventScript_Reli", "flag": "0" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route24_EventScript_Timmy", "flag": "0" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route24_EventScript_Ali", "flag": "0" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route24_EventScript_Cale", "flag": "0" @@ -112,7 +112,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "Route24_EventScript_Shane", "flag": "0" @@ -125,7 +125,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route24_EventScript_ItemTM45", "flag": "FLAG_HIDE_ROUTE24_TM45" diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index fafbdc917..c716acec5 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -29,7 +29,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route25_EventScript_Franklin", "flag": "0" @@ -42,7 +42,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route25_EventScript_Joey", "flag": "0" @@ -55,7 +55,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route25_EventScript_Wayne", "flag": "0" @@ -68,7 +68,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route25_EventScript_Dan", "flag": "0" @@ -81,7 +81,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route25_EventScript_Kelsey", "flag": "0" @@ -94,7 +94,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route25_EventScript_Nob", "flag": "0" @@ -107,7 +107,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route25_EventScript_Flint", "flag": "0" @@ -120,7 +120,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route25_EventScript_Chad", "flag": "0" @@ -133,7 +133,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route25_EventScript_Haley", "flag": "0" @@ -146,7 +146,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route25_EventScript_ItemTM43", "flag": "FLAG_HIDE_ROUTE25_TM43" @@ -159,7 +159,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" @@ -172,7 +172,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route25_EventScript_Beauty", "flag": "0" @@ -185,7 +185,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route25_EventScript_Man", "flag": "0" diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index bd66cb938..6a10da883 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route25_SeaCottage_EventScript_Bill", "flag": "FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route25_SeaCottage_EventScript_Bill", "flag": "FLAG_HIDE_BILL_CLEFAIRY" diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json index 4c8448f3c..20be5345d 100644 --- a/data/maps/Route2_EastBuilding/map.json +++ b/data/maps/Route2_EastBuilding/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route2_EastBuilding_EventScript_Aide", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route2_EastBuilding_EventScript_Rocker", "flag": "0" diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json index 11422fac8..900ad5ba1 100644 --- a/data/maps/Route2_House/map.json +++ b/data/maps/Route2_House/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route2_House_EventScript_Scientist", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route2_House_EventScript_Reyley", "flag": "0" diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json index 876a72168..dbd7c734a 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route2_ViridianForest_NorthEntrance_EventScript_Youngster", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route2_ViridianForest_NorthEntrance_EventScript_OldMan", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route2_ViridianForest_NorthEntrance_EventScript_CooltrainerF", "flag": "0" diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json index ebdf6f019..2590d03f2 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route2_ViridianForest_SouthEntrance_EventScript_Woman1", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route2_ViridianForest_SouthEntrance_EventScript_Woman2", "flag": "0" diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index 7e3cca421..1051a4794 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route3_EventScript_Youngster", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route3_EventScript_Robin", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route3_EventScript_James", "flag": "0" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "Route3_EventScript_Sally", "flag": "0" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route3_EventScript_Greg", "flag": "0" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "Route3_EventScript_Calvin", "flag": "0" @@ -112,7 +112,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "Route3_EventScript_Janice", "flag": "0" @@ -125,7 +125,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route3_EventScript_Colton", "flag": "0" @@ -138,7 +138,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route3_EventScript_Ben", "flag": "0" diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index c238635a9..2fa4ea4df 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route4_EventScript_Woman", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route4_EventScript_Crissy", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route4_EventScript_ItemTM05", "flag": "FLAG_HIDE_ROUTE4_TM05" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route4_EventScript_Boy", "flag": "0" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route4_EventScript_MegaPunchTutor", "flag": "0" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route4_EventScript_MegaKickTutor", "flag": "0" diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index cdc4fd8d1..7b2f02a45 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route4_PokemonCenter_1F_EventScript_Nurse", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route4_PokemonCenter_1F_EventScript_MagikarpSalesman", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route4_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route4_PokemonCenter_1F_EventScript_Boy", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route4_PokemonCenter_1F_EventScript_Youngster", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route4_PokemonCenter_1F_EventScript_Newspaper", "flag": "0" diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index 9f42a6107..b83288910 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json index f44335eb7..321f24a10 100644 --- a/data/maps/Route5_PokemonDayCare/map.json +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route5_PokemonDayCare_EventScript_DaycareMan", "flag": "0" diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index 4c7a1a581..6562e44d3 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route5_SouthEntrance_EventScript_Guard", "flag": "0" diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index 3ca2b4bad..0b044b364 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "Route6_EventScript_Keigo", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route6_EventScript_Ricky", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "Route6_EventScript_Nancy", "flag": "0" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route6_EventScript_Elijah", "flag": "0" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route6_EventScript_Isabelle", "flag": "0" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route6_EventScript_Jeff", "flag": "0" diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index fdb4a29b5..3082859ec 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route6_NorthEntrance_EventScript_Guard", "flag": "0" diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index bcdd3b049..2c990925b 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route7_EastEntrance_EventScript_Guard", "flag": "0" diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index d278616ef..e99df258f 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "6", "script": "Route8_EventScript_Julia", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route8_EventScript_Rich", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route8_EventScript_Glenn", "flag": "0" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route8_EventScript_Paige", "flag": "0" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "6", "script": "Route8_EventScript_Leslie", "flag": "0" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route8_EventScript_Andrea", "flag": "0" @@ -112,7 +112,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "6", "script": "Route8_EventScript_Megan", "flag": "0" @@ -125,7 +125,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route8_EventScript_Stan", "flag": "0" @@ -138,7 +138,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route8_EventScript_Aidan", "flag": "0" @@ -151,7 +151,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" @@ -164,7 +164,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" @@ -177,7 +177,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route8_EventScript_Eli", "flag": "0" @@ -190,7 +190,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route8_EventScript_Anne", "flag": "0" @@ -203,7 +203,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 5, "movement_range_y": 2, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route8_EventScript_Ricardo", "flag": "0" @@ -216,7 +216,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT", "movement_range_x": 5, "movement_range_y": 5, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route8_EventScript_Jaren", "flag": "0" diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index b0c6afe07..043b603c2 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route8_WestEntrance_EventScript_Guard", "flag": "0" diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index ea7a860b3..27e91cab7 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route9_EventScript_Alicia", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route9_EventScript_Jeremy", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route9_EventScript_Alan", "flag": "0" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route9_EventScript_Chris", "flag": "0" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "Route9_EventScript_Brent", "flag": "0" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "Route9_EventScript_Conner", "flag": "0" @@ -112,7 +112,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "Route9_EventScript_Brice", "flag": "0" @@ -125,7 +125,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "Route9_EventScript_Caitlin", "flag": "0" @@ -138,7 +138,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "Route9_EventScript_Drew", "flag": "0" @@ -151,7 +151,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" @@ -164,7 +164,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route9_EventScript_ItemTM40", "flag": "FLAG_HIDE_ROUTE9_TM40" @@ -177,7 +177,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Route9_EventScript_ItemBurnHeal", "flag": "FLAG_HIDE_ROUTE9_BURN_HEAL" diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json index b89db491b..5d4049473 100644 --- a/data/maps/SSAnne_1F_Corridor/map.json +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_1F_Corridor_EventScript_Sailor", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_1F_Corridor_EventScript_WorkerM", "flag": "0" diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json index eba754e5a..a2e30ae70 100644 --- a/data/maps/SSAnne_1F_Room1/map.json +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_1F_Room1_EventScript_Gentleman", "flag": "0" diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index 0afc4c97f..89b501da4 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SSAnne_1F_Room2_EventScript_Ann", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SSAnne_1F_Room2_EventScript_Tyler", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "1", "script": "SSAnne_1F_Room2_EventScript_Woman", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_1F_Room2_EventScript_ItemTM31", "flag": "FLAG_HIDE_SSANNE_1F_ROOM2_TM31" diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json index 2cd2f3b1e..639bbcd72 100644 --- a/data/maps/SSAnne_1F_Room3/map.json +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", "movement_range_x": 2, "movement_range_y": 3, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_1F_Room3_EventScript_LittleGirl", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_1F_Room3_EventScript_Wigglytuff", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_1F_Room3_EventScript_BaldingMan", "flag": "0" diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json index d721a8b6b..abdde83cd 100644 --- a/data/maps/SSAnne_1F_Room4/map.json +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_1F_Room4_EventScript_Woman", "flag": "0" diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json index 370248703..7b6c778c4 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "SSAnne_1F_Room5_EventScript_Arthur", "flag": "0" diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json index ba75aaf26..2db3bf143 100644 --- a/data/maps/SSAnne_1F_Room6/map.json +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_1F_Room6_EventScript_Woman", "flag": "0" diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json index 0e710bac1..ca483216c 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SSAnne_1F_Room7_EventScript_Thomas", "flag": "0" diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index a54f7108d..36afea939 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SS_ANNE_RIVAL" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_2F_Corridor_EventScript_Sailor", "flag": "0" diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json index bece8a7f9..62636dfde 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_2F_Room1_EventScript_Gentleman", "flag": "0" diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index e4d20f77f..c6cd86baa 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SSAnne_2F_Room2_EventScript_Dale", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SSAnne_2F_Room2_EventScript_Brooks", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_2F_Room2_EventScript_ItemStardust", "flag": "FLAG_HIDE_SSANNE_2F_ROOM2_STARDUST" diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json index b1b210cff..0132db9eb 100644 --- a/data/maps/SSAnne_2F_Room3/map.json +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_2F_Room3_EventScript_Gentleman", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_2F_Room3_EventScript_OldMan", "flag": "0" diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index 84e9d70eb..a84f46733 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SSAnne_2F_Room4_EventScript_Lamar", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SSAnne_2F_Room4_EventScript_Dawn", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_2F_Room4_EventScript_ItemXAttack", "flag": "FLAG_HIDE_SSANNE_2F_ROOM4_X_ATTACK" diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json index ca3da2763..f6dde1406 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_2F_Room5_EventScript_Gentleman", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_2F_Room5_EventScript_LittleBoy", "flag": "0" diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json index b5ab4d0c6..9b90147aa 100644 --- a/data/maps/SSAnne_2F_Room6/map.json +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_2F_Room6_EventScript_Woman2", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_2F_Room6_EventScript_Woman1", "flag": "0" diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json index 123423bcd..ce7578a4f 100644 --- a/data/maps/SSAnne_3F_Corridor/map.json +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_3F_Corridor_EventScript_Sailor", "flag": "0" diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json index 8abb00d0c..ca979f0dd 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SSAnne_B1F_Room1_EventScript_Barny", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SSAnne_B1F_Room1_EventScript_Phillip", "flag": "0" diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index f3d1cd6ce..d2236e480 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SSAnne_B1F_Room2_EventScript_Huey", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_B1F_Room2_EventScript_ItemTM44", "flag": "FLAG_HIDE_SSANNE_B1F_ROOM2_TM44" diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index 755832d68..6aed9ce58 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SSAnne_B1F_Room3_EventScript_Dylan", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_B1F_Room3_EventScript_ItemEther", "flag": "FLAG_HIDE_SSANNE_B1F_ROOM3_ETHER" diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json index fb381f9ca..ba41cb495 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SSAnne_B1F_Room4_EventScript_Duncan", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SSAnne_B1F_Room4_EventScript_Leonard", "flag": "0" diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index 9ad0d5898..bb54b7090 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_B1F_Room5_EventScript_Boy", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_B1F_Room5_EventScript_Machoke", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_B1F_Room5_EventScript_ItemSuperPotion", "flag": "FLAG_HIDE_SSANNE_B1F_ROOM5_SUPER_POTION" diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index 7899e23db..d0af547d9 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_CaptainsOffice_EventScript_Captain", "flag": "0" diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json index 5ece90206..b121ed6b1 100644 --- a/data/maps/SSAnne_Deck/map.json +++ b/data/maps/SSAnne_Deck/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SSAnne_Deck_EventScript_Trevor", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_Deck_EventScript_BaldingMan", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_Deck_EventScript_Sailor", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SSAnne_Deck_EventScript_Edmond", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_Deck_EventScript_Youngster", "flag": "0" diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index e89245e04..c125abd59 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SS_ANNE" diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index b1a5d1078..951ab2b00 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_Kitchen_EventScript_Chef1", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_Kitchen_EventScript_Chef2", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_Kitchen_EventScript_Chef3", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_Kitchen_EventScript_Chef4", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_Kitchen_EventScript_Chef5", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_Kitchen_EventScript_Chef6", "flag": "0" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_Kitchen_EventScript_Chef7", "flag": "0" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SSAnne_Kitchen_EventScript_ItemGreatBall", "flag": "FLAG_HIDE_SSANNE_KITCHEN_GREAT_BALL" diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index 1c85dd75b..7192fd254 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Center_EventScript_ItemNugget", "flag": "FLAG_HIDE_SAFARI_ZONE_CENTER_NUGGET" diff --git a/data/maps/SafariZone_Center_RestHouse/map.json b/data/maps/SafariZone_Center_RestHouse/map.json index 158833527..0d5a1430a 100644 --- a/data/maps/SafariZone_Center_RestHouse/map.json +++ b/data/maps/SafariZone_Center_RestHouse/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Center_RestHouse_EventScript_Scientist", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_Center_RestHouse_EventScript_Sara", "flag": "0" diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index 788aecdf2..c9a1120e6 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_East_EventScript_ItemMaxPotion", "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_MAX_POTION" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_East_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_FULL_RESTORE" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_East_EventScript_ItemTM11", "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_TM11" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_East_EventScript_ItemLeafStone", "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_LEAF_STONE" diff --git a/data/maps/SafariZone_East_RestHouse/map.json b/data/maps/SafariZone_East_RestHouse/map.json index e3258053f..20b7a79c4 100644 --- a/data/maps/SafariZone_East_RestHouse/map.json +++ b/data/maps/SafariZone_East_RestHouse/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_East_RestHouse_EventScript_Scientist", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_East_RestHouse_EventScript_Rocker", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_East_RestHouse_EventScript_BaldingMan", "flag": "0" diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index 9a6d7b186..9df7f64b0 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_EventScript_ItemProtein", "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_PROTEIN" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_EventScript_ItemTM47", "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_TM47" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_EventScript_ItemQuickClaw", "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_QUICK_CLAW" diff --git a/data/maps/SafariZone_North_RestHouse/map.json b/data/maps/SafariZone_North_RestHouse/map.json index ba253308c..04e70e66f 100644 --- a/data/maps/SafariZone_North_RestHouse/map.json +++ b/data/maps/SafariZone_North_RestHouse/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_RestHouse_EventScript_Gentleman", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_RestHouse_EventScript_Scientist", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_RestHouse_EventScript_Fisher", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_North_RestHouse_EventScript_BaldingMan", "flag": "0" diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json index e250383d4..cc0eea7df 100644 --- a/data/maps/SafariZone_SecretHouse/map.json +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_SecretHouse_EventScript_Attendant", "flag": "0" diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index ee8968d95..5ccffac5d 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_West_EventScript_ItemGoldTeeth", "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_West_EventScript_ItemTM32", "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_TM32" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_West_EventScript_ItemMaxPotion", "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_POTION" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_West_EventScript_ItemMaxRevive", "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_REVIVE" diff --git a/data/maps/SafariZone_West_RestHouse/map.json b/data/maps/SafariZone_West_RestHouse/map.json index b3a33bb18..57a43a1a2 100644 --- a/data/maps/SafariZone_West_RestHouse/map.json +++ b/data/maps/SafariZone_West_RestHouse/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_West_RestHouse_EventScript_Scientist", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_West_RestHouse_EventScript_Man", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SafariZone_West_RestHouse_EventScript_CooltrainerF", "flag": "0" diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index 6d370cac0..352f9aca5 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -45,7 +45,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_EventScript_RocketGrunt1", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" @@ -58,7 +58,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_EventScript_RocketGrunt2", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" @@ -71,7 +71,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_EventScript_RocketGrunt3", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" @@ -84,7 +84,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_EventScript_RocketGrunt4", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" @@ -97,7 +97,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 7, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_EventScript_RocketGrunt5", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" @@ -110,7 +110,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_EventScript_DoorGuardGrunt", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" @@ -123,7 +123,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 5, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_EventScript_RocketGrunt7", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" @@ -136,7 +136,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_EventScript_RocketGrunt6", "flag": "FLAG_HIDE_SAFFRON_ROCKETS" @@ -149,7 +149,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_EventScript_Youngster", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" @@ -162,7 +162,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_EventScript_WorkerM", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" @@ -175,7 +175,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_EventScript_Man", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" @@ -188,7 +188,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_EventScript_Boy", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" @@ -201,7 +201,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_EventScript_Pidgeot", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" @@ -214,7 +214,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 5, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_EventScript_Lass", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" @@ -227,7 +227,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_EventScript_BattleGirl", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/map.json b/data/maps/SaffronCity_CopycatsHouse_1F/map.json index 9f783457a..0dc8af3e4 100644 --- a/data/maps/SaffronCity_CopycatsHouse_1F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_CopycatsHouse_1F_EventScript_CopycatsDad", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_CopycatsHouse_1F_EventScript_CopycatsMom", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_CopycatsHouse_1F_EventScript_Chansey", "flag": "0" diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/map.json b/data/maps/SaffronCity_CopycatsHouse_2F/map.json index 112d52f64..a9a3cdd59 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_CopycatsHouse_2F_EventScript_Doduo", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_CopycatsHouse_2F_EventScript_Doll", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_CopycatsHouse_2F_EventScript_Doll", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_CopycatsHouse_2F_EventScript_Copycat", "flag": "0" 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/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index c944d6e75..bac95d5bc 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "7", "script": "SaffronCity_Dojo_EventScript_Hitoshi", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "7", "script": "SaffronCity_Dojo_EventScript_Hideki", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "7", "script": "SaffronCity_Dojo_EventScript_Aaron", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "7", "script": "SaffronCity_Dojo_EventScript_Mike", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SaffronCity_Dojo_EventScript_MasterKoichi", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_Dojo_EventScript_HitmonleeBall", "flag": "FLAG_HIDE_DOJO_HITMONLEE_BALL" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_Dojo_EventScript_HitmonchanBall", "flag": "FLAG_HIDE_DOJO_HITMONCHAN_BALL" diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json index 4a3e41102..26a6736b6 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SaffronCity_Gym_EventScript_Cameron", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SaffronCity_Gym_EventScript_Johan", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SaffronCity_Gym_EventScript_Preston", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SaffronCity_Gym_EventScript_Amanda", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SaffronCity_Gym_EventScript_Stacy", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SaffronCity_Gym_EventScript_Tasha", "flag": "0" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_Gym_EventScript_Sabrina", "flag": "0" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SaffronCity_Gym_EventScript_Tyron", "flag": "0" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_Gym_EventScript_GymGuy", "flag": "0" diff --git a/data/maps/SaffronCity_House/map.json b/data/maps/SaffronCity_House/map.json index 1eaeec5e0..32b191884 100644 --- a/data/maps/SaffronCity_House/map.json +++ b/data/maps/SaffronCity_House/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 4, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_House_EventScript_Pidgey", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_House_EventScript_Lass", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_House_EventScript_Youngster", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index f4faaa18c..7b1b3b527 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_Mart_EventScript_Clerk", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_Mart_EventScript_Youngster", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_Mart_EventScript_Lass", "flag": "0" diff --git a/data/maps/SaffronCity_MrPsychicsHouse/map.json b/data/maps/SaffronCity_MrPsychicsHouse/map.json index d84b4c818..29460d55e 100644 --- a/data/maps/SaffronCity_MrPsychicsHouse/map.json +++ b/data/maps/SaffronCity_MrPsychicsHouse/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_MrPsychicsHouse_EventScript_MrPsychic", "flag": "0" diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index eaf94a1d2..f4861adb1 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_PokemonCenter_1F_EventScript_Woman", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_PokemonCenter_1F_EventScript_Youngster", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina", "flag": "FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina", "flag": "FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS" diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index f44aacdb8..7ed2f6050 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index 92b8e823d..92c3b8437 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Youngster", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Woman", "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Rocker", "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Beauty", "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt", "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" @@ -140,7 +140,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index 9ec2b53ae..bffaf7eca 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 22, "y": 12, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_1" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 32, "y": 9, "elevation": 3, @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SeafoamIslands_1F_EventScript_ItemIceHeal", "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_1F_ICE_HEAL" diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index b5a669e7d..1170cd572 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 22, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_1" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 30, "y": 8, "elevation": 3, @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SeafoamIslands_B1F_EventScript_ItemWaterStone", "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B1F_WATER_STONE" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SeafoamIslands_B1F_EventScript_ItemRevive", "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B1F_REVIVE" diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index a91d362c1..0e76f6b7e 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 22, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_1" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 30, "y": 8, "elevation": 3, @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SeafoamIslands_B2F_EventScript_ItemBigPearl", "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B2F_BIG_PEARL" diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index 25ad96266..1cb129adb 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -16,33 +16,33 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 23, "y": 8, "elevation": 1, "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_1" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 24, "y": 8, "elevation": 1, "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_2" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 16, "elevation": 3, @@ -55,33 +55,33 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_5" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 13, "y": 16, "elevation": 3, "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_6" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 16, "elevation": 3, "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_4" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 17, "elevation": 3, diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 4375e5fad..1ce555258 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -16,27 +16,27 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 18, "elevation": 1, "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_1" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 18, "elevation": 1, "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_2" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SeafoamIslands_B4F_EventScript_Articuno", "flag": "FLAG_HIDE_ARTICUNO" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SeafoamIslands_B4F_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B4F_ULTRA_BALL" 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/SevenIsland/map.json b/data/maps/SevenIsland/map.json index 1f3e224cd..7b0b3a72d 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SevenIsland_EventScript_SwordsDanceTutor", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SevenIsland_EventScript_OldWoman", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SevenIsland_EventScript_Scientist", "flag": "0" diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json index a420ef95b..b71cf72bd 100644 --- a/data/maps/SevenIsland_Harbor/map.json +++ b/data/maps/SevenIsland_Harbor/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SevenIsland_Harbor_EventScript_Sailor", "flag": "0" diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index 4affaa8b0..09550738c 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SevenIsland_House_Room1_EventScript_OldWoman", "flag": "0" diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json index 8937e3673..4fc512e42 100644 --- a/data/maps/SevenIsland_House_Room2/map.json +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json index a06b97dcf..cf1f24cfe 100644 --- a/data/maps/SevenIsland_Mart/map.json +++ b/data/maps/SevenIsland_Mart/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SevenIsland_Mart_EventScript_Clerk", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SevenIsland_Mart_EventScript_Lass", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SevenIsland_Mart_EventScript_Fisher", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SevenIsland_Mart_EventScript_Hiker", "flag": "0" diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index fdd1585c0..e3f534260 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SevenIsland_PokemonCenter_1F_EventScript_Nurse", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SevenIsland_PokemonCenter_1F_EventScript_OldMan", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SevenIsland_PokemonCenter_1F_EventScript_Sailor", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SevenIsland_PokemonCenter_1F_EventScript_Beauty", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SevenIsland_PokemonCenter_1F_EventScript_PokemonJournal", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SevenIsland_PokemonCenter_1F_EventScript_PokemonJournal", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index f0d0b299e..65166b9ac 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index 0cb611d5e..4b3f98695 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SevenIsland_SevaultCanyon_EventScript_Cyndy", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SevenIsland_SevaultCanyon_EventScript_Evan", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SevenIsland_SevaultCanyon_EventScript_Jackson", "flag": "0" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SevenIsland_SevaultCanyon_EventScript_Katelyn", "flag": "0" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SevenIsland_SevaultCanyon_EventScript_Leroy", "flag": "0" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SevenIsland_SevaultCanyon_EventScript_Michelle", "flag": "0" @@ -112,7 +112,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SevenIsland_SevaultCanyon_EventScript_Lex", "flag": "0" @@ -125,7 +125,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SevenIsland_SevaultCanyon_EventScript_Nya", "flag": "0" @@ -138,20 +138,20 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 13, "y": 47, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" @@ -164,7 +164,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" @@ -177,7 +177,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" @@ -190,7 +190,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" @@ -203,20 +203,20 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_17" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 17, "y": 47, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" @@ -229,7 +229,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1B" @@ -242,7 +242,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SevenIsland_SevaultCanyon_EventScript_ItemKingsRock", "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_KINGS_ROCK" @@ -255,7 +255,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SevenIsland_SevaultCanyon_EventScript_ItemMaxElixir", "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_MAX_ELIXIR" @@ -268,7 +268,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SevenIsland_SevaultCanyon_EventScript_ItemNugget", "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_NUGGET" @@ -281,7 +281,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SevenIsland_SevaultCanyon_EventScript_BlackBelt", "flag": "0" diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index 097b87608..b0185700e 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Miah", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Eve", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Jon", "flag": "0" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Nicolas", "flag": "0" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Madeline", "flag": "0" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Mason", "flag": "0" diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index badee8fa3..f0c537add 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SevenIsland_SevaultCanyon_House_EventScript_BaldingMan", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SevenIsland_SevaultCanyon_House_EventScript_Chansey", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SevenIsland_SevaultCanyon_House_EventScript_ItemLuckyPunch", "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE_LUCKY_PUNCH" diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index cbcc15d02..183af5fb2 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -16,92 +16,92 @@ "connections": null, "object_events": [ { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 6, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 6, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 9, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 10, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 10, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 9, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 6, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index e4ffe5a5d..b9493d2c5 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -29,7 +29,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SevenIsland_TanobyRuins_EventScript_Brandon", "flag": "0" @@ -42,7 +42,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SevenIsland_TanobyRuins_EventScript_Benjamin", "flag": "0" @@ -55,7 +55,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SevenIsland_TanobyRuins_EventScript_Edna", "flag": "0" @@ -68,7 +68,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SevenIsland_TanobyRuins_EventScript_Clifford", "flag": "0" diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index b39602433..ded18057f 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -29,7 +29,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SevenIsland_TrainerTower_EventScript_Dario", "flag": "0" @@ -42,7 +42,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SevenIsland_TrainerTower_EventScript_Rodette", "flag": "0" diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index 9eb666083..ac20284fc 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SilphCo_10F_EventScript_Travis", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_10F_EventScript_WorkerF", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "SilphCo_10F_EventScript_Grunt", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_10F_EventScript_ItemCarbos", "flag": "FLAG_HIDE_SILPH_CO_10F_CARBOS" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_10F_EventScript_ItemUltraBall", "flag": "FLAG_HIDE_SILPH_CO_10F_ULTRA_BALL" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_10F_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_SILPH_CO_10F_RARE_CANDY" diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 1f31045d0..33c454f88 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_11F_EventScript_President", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_11F_EventScript_Secretary", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "SilphCo_11F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_11F_EventScript_ItemZinc", "flag": "FLAG_HIDE_SILPH_CO_11F_ZINC" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "SilphCo_11F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index a1cccc914..c2a26235a 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_1F_EventScript_Receptionist", "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index 2bdd9e7cb..f5aab3042 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "SilphCo_2F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "SilphCo_2F_EventScript_Jerry", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SilphCo_2F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_2F_EventScript_Connor", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_2F_EventScript_ThunderWaveTutor", "flag": "0" diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index 370c234b4..46b1381c8 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SilphCo_3F_EventScript_Grunt", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_3F_EventScript_WorkerM", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_3F_EventScript_Jose", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_3F_EventScript_ItemHyperPotion", "flag": "FLAG_HIDE_SILPH_CO_3F_HYPER_POTION" diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index e51bf5c3a..bb1db0507 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SilphCo_4F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "SilphCo_4F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SilphCo_4F_EventScript_Rodney", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_4F_EventScript_WorkerM", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_4F_EventScript_ItemMaxRevive", "flag": "FLAG_HIDE_SILPH_CO_4F_MAX_REVIVE" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_4F_EventScript_ItemEscapeRope", "flag": "FLAG_HIDE_SILPH_CO_4F_ESCAPE_ROPE" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_4F_EventScript_ItemFullHeal", "flag": "FLAG_HIDE_SILPH_CO_4F_FULL_HEAL" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_4F_EventScript_ItemTM41", "flag": "FLAG_HIDE_SILPH_CO_4F_TM41" diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index 2c5f28fd5..960fe8ef6 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SilphCo_5F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "SilphCo_5F_EventScript_Dalton", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_5F_EventScript_WorkerM", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SilphCo_5F_EventScript_Beau", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SilphCo_5F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_5F_EventScript_ItemProtein", "flag": "FLAG_HIDE_SILPH_CO_5F_PROTEIN" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_5F_EventScript_ItemTM01", "flag": "FLAG_HIDE_SILPH_CO_5F_TM01" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_5F_EventScript_ItemCardKey", "flag": "FLAG_HIDE_SILPH_CO_5F_CARD_KEY" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_5F_EventScript_Scientist", "flag": "0" diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index 6064d6105..35ec915ad 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SilphCo_6F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_6F_EventScript_WorkerM1", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_6F_EventScript_WorkerF1", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_6F_EventScript_WorkerM2", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_6F_EventScript_WorkerM3", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_6F_EventScript_WorkerF2", "flag": "0" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "SilphCo_6F_EventScript_Taylor", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_6F_EventScript_ItemHPUp", "flag": "FLAG_HIDE_SILPH_CO_6F_HP_UP" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_6F_EventScript_ItemXSpecial", "flag": "FLAG_HIDE_SILPH_CO_6F_X_SPECIAL" @@ -140,7 +140,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SilphCo_6F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index 4e3b277f1..2857c0a7a 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SILPH_RIVAL" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_7F_EventScript_LaprasGuy", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "SilphCo_7F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SilphCo_7F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SilphCo_7F_EventScript_Grunt3", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_7F_EventScript_WorkerF", "flag": "0" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_7F_EventScript_WorkerM1", "flag": "0" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_7F_EventScript_WorkerM2", "flag": "0" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SilphCo_7F_EventScript_Joshua", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -140,7 +140,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_7F_EventScript_ItemCalcium", "flag": "FLAG_HIDE_SILPH_CO_7F_CALCIUM" @@ -153,7 +153,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_7F_EventScript_ItemTM08", "flag": "FLAG_HIDE_SILPH_CO_7F_TM08" diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index ae15df061..7f83591ca 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "SilphCo_8F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "SilphCo_8F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SilphCo_8F_EventScript_Parker", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_8F_EventScript_WorkerM", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_8F_EventScript_ItemIron", "flag": "FLAG_HIDE_SILPH_CO_8F_IRON" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_8F_EventScript_Scientist", "flag": "0" diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index 629cd4e91..e164a4596 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SilphCo_9F_EventScript_Ed", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SilphCo_9F_EventScript_Grunt2", "flag": "FLAG_HIDE_SILPH_ROCKETS" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SilphCo_9F_EventScript_HealWoman", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "SilphCo_9F_EventScript_Grunt1", "flag": "FLAG_HIDE_SILPH_ROCKETS" diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index 0df3472be..6156df736 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -29,7 +29,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SixIsland_EventScript_Boy", "flag": "0" @@ -42,7 +42,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SixIsland_EventScript_Hiker", "flag": "0" diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index 29d5bad54..a6b91e4d6 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire", "flag": "FLAG_HIDE_SAPPHIRE" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_DOTTED_HOLE_SCIENTIST" diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index 2e4e8c19a..6a8499ab0 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SixIsland_GreenPath_EventScript_Jaclyn", "flag": "0" diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json index ab1a85c3c..598de86e0 100644 --- a/data/maps/SixIsland_Harbor/map.json +++ b/data/maps/SixIsland_Harbor/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SixIsland_Harbor_EventScript_Sailor", "flag": "0" diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json index 605e8b4c7..ddb6de1c9 100644 --- a/data/maps/SixIsland_House/map.json +++ b/data/maps/SixIsland_House/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SixIsland_House_EventScript_OldMan", "flag": "0" diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json index e79540088..015822d63 100644 --- a/data/maps/SixIsland_Mart/map.json +++ b/data/maps/SixIsland_Mart/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SixIsland_Mart_EventScript_Clerk", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SixIsland_Mart_EventScript_OldWoman", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SixIsland_Mart_EventScript_Picnicker", "flag": "0" diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index bd365773c..c81781c12 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -29,7 +29,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SixIsland_OutcastIsland_EventScript_Rocket", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" @@ -42,7 +42,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SixIsland_OutcastIsland_EventScript_Tylor", "flag": "0" @@ -55,7 +55,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SixIsland_OutcastIsland_EventScript_Mymo", "flag": "0" @@ -68,7 +68,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", "movement_range_x": 2, "movement_range_y": 4, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SixIsland_OutcastIsland_EventScript_Nicole", "flag": "0" @@ -81,20 +81,20 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SixIsland_OutcastIsland_EventScript_Ava", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_TUBER_M_1", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M_WATER", "x": 11, "y": 44, "elevation": 1, "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SixIsland_OutcastIsland_EventScript_Geb", "flag": "0" @@ -107,7 +107,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SixIsland_OutcastIsland_EventScript_ItemPPUp", "flag": "FLAG_HIDE_SIX_ISLAND_OUTCAST_ISLAND_PP_UP" diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json index d1c655920..1546d370e 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SixIsland_PatternBush_EventScript_Bethany", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SixIsland_PatternBush_EventScript_Allison", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SixIsland_PatternBush_EventScript_Garret", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SixIsland_PatternBush_EventScript_Jonah", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", "movement_range_x": 2, "movement_range_y": 5, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SixIsland_PatternBush_EventScript_Vance", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SixIsland_PatternBush_EventScript_Nash", "flag": "0" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "SixIsland_PatternBush_EventScript_Cordell", "flag": "0" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "SixIsland_PatternBush_EventScript_Dalia", "flag": "0" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SixIsland_PatternBush_EventScript_Joana", "flag": "0" @@ -140,7 +140,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SixIsland_PatternBush_EventScript_Riley", "flag": "0" @@ -153,7 +153,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 5, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SixIsland_PatternBush_EventScript_Marcy", "flag": "0" @@ -166,7 +166,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SixIsland_PatternBush_EventScript_Layton", "flag": "0" diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index e9dc5a96d..24e873369 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SixIsland_PokemonCenter_1F_EventScript_Nurse", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_SIX_ISLAND_POKECENTER_RIVAL" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SixIsland_PokemonCenter_1F_EventScript_Hiker", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SixIsland_PokemonCenter_1F_EventScript_OldMan", "flag": "0" diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index e290f4ce7..8db84cb02 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index 8a5ff9436..e24853081 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -29,7 +29,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SixIsland_RuinValley_EventScript_Scientist", "flag": "FLAG_HIDE_RUIN_VALLEY_SCIENTIST" @@ -42,7 +42,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "SixIsland_RuinValley_EventScript_Stanly", "flag": "0" @@ -55,7 +55,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SixIsland_RuinValley_EventScript_Foster", "flag": "0" @@ -68,7 +68,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SixIsland_RuinValley_EventScript_Larry", "flag": "0" @@ -81,7 +81,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "SixIsland_RuinValley_EventScript_Daryl", "flag": "0" @@ -94,111 +94,111 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 3, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SixIsland_RuinValley_EventScript_Hector", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 17, "y": 10, "elevation": 5, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 17, "y": 12, "elevation": 5, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 18, "y": 11, "elevation": 5, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 33, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 34, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 41, "y": 32, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 41, "y": 33, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 42, "y": 33, "elevation": 3, "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" @@ -211,7 +211,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SixIsland_RuinValley_EventScript_ItemHPUp", "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_HP_UP" @@ -224,7 +224,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SixIsland_RuinValley_EventScript_ItemFullRestore", "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_FULL_RESTORE" @@ -237,7 +237,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SixIsland_RuinValley_EventScript_ItemSunStone", "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_SUN_STONE" diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index a24bb364d..acacd4d97 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -39,7 +39,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SixIsland_WaterPath_EventScript_Rose", "flag": "0" @@ -52,7 +52,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "SixIsland_WaterPath_EventScript_Edward", "flag": "0" @@ -65,7 +65,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "SixIsland_WaterPath_EventScript_Samir", "flag": "0" @@ -78,7 +78,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SixIsland_WaterPath_EventScript_Denise", "flag": "0" @@ -91,7 +91,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SixIsland_WaterPath_EventScript_Miu", "flag": "0" @@ -104,7 +104,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "SixIsland_WaterPath_EventScript_Mia", "flag": "0" @@ -117,7 +117,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "SixIsland_WaterPath_EventScript_Earl", "flag": "0" @@ -130,7 +130,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SixIsland_WaterPath_EventScript_ItemElixir", "flag": "FLAG_HIDE_SIX_ISLAND_WATER_PATH_ELIXIR" @@ -143,7 +143,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SixIsland_WaterPath_EventScript_ItemDragonScale", "flag": "FLAG_HIDE_SIX_ISLAND_WATER_PATH_DRAGON_SCALE" diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json index d7f2a573d..32fd57521 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SixIsland_WaterPath_House1_EventScript_Beauty", "flag": "0" 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/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json index 66010aa55..b853b622e 100644 --- a/data/maps/SixIsland_WaterPath_House2/map.json +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "SixIsland_WaterPath_House2_EventScript_Man", "flag": "0" diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 4bf9714f9..db9fe9ef4 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_EventScript_AntiBiker1", "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_EventScript_AntiBiker2", "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_EventScript_Biker", "flag": "FLAG_HIDE_THREE_ISLAND_LONE_BIKER" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_EventScript_Biker", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_EventScript_Biker", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_EventScript_Biker", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" @@ -112,7 +112,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_EventScript_Biker", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" @@ -125,7 +125,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_EventScript_Biker", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" @@ -138,7 +138,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" @@ -151,7 +151,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_EventScript_ItemZinc", "flag": "FLAG_HIDE_THREE_ISLAND_ZINC" @@ -164,7 +164,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_EventScript_Woman", "flag": "0" @@ -177,7 +177,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_EventScript_LittleBoy", "flag": "0" @@ -190,7 +190,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_EventScript_Doduo", "flag": "0" @@ -203,7 +203,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_EventScript_Biker6", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 9a7d60e6a..0845889ad 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_BerryForest_EventScript_Lostelle", "flag": "FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_15" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_16" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_17" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_18" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_19" @@ -140,7 +140,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_1A" @@ -153,7 +153,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_1B" @@ -166,7 +166,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_BerryForest_EventScript_ItemMaxEther", "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_MAX_ETHER" @@ -179,7 +179,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_BerryForest_EventScript_ItemFullHeal", "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_FULL_HEAL" @@ -192,7 +192,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_BerryForest_EventScript_ItemMaxElixir", "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_MAX_ELIXIR" 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/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index a1fa3deb7..6ffa25cc4 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -29,7 +29,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "ThreeIsland_BondBridge_EventScript_Nikki", "flag": "0" @@ -42,7 +42,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "ThreeIsland_BondBridge_EventScript_Violet", "flag": "0" @@ -55,7 +55,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "ThreeIsland_BondBridge_EventScript_Amira", "flag": "0" @@ -68,7 +68,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "ThreeIsland_BondBridge_EventScript_Alexis", "flag": "0" @@ -81,7 +81,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "ThreeIsland_BondBridge_EventScript_Tisha", "flag": "0" @@ -94,7 +94,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "ThreeIsland_BondBridge_EventScript_Joy", "flag": "0" @@ -107,7 +107,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "ThreeIsland_BondBridge_EventScript_Meg", "flag": "0" @@ -120,7 +120,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" @@ -133,7 +133,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index 4af5c6f7c..a256b5ae7 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_DunsparceTunnel_EventScript_Prospector", "flag": "0" diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json index 8c0fbadcb..d42861413 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_Harbor_EventScript_Sailor", "flag": "0" diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index a81f7db74..049581de7 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_House1_EventScript_Lostelle", "flag": "FLAG_HIDE_LOSTELLE_IN_HER_HOME" diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json index cbb24d7e6..3e32d7a0b 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_House2_EventScript_Rocker", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_House2_EventScript_Man", "flag": "0" diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json index 20b3f60e7..7fad7b0fe 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_House3_EventScript_Beauty", "flag": "0" diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json index 7d77184ff..8daa12557 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_House4_EventScript_BaldingMan", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_House4_EventScript_LittleBoy", "flag": "0" diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json index 580c9b1c2..ba7f2a4de 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_House5_EventScript_LittleGirl", "flag": "0" diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json index 7120f0432..d83d1f533 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_Mart_EventScript_Clerk", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_Mart_EventScript_Picnicker", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_Mart_EventScript_BugCatcher", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_Mart_EventScript_Youngster", "flag": "0" diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index b5cf9bab0..6d0f0391b 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_PokemonCenter_1F_EventScript_Nurse", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_PokemonCenter_1F_EventScript_Rocker", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_PokemonCenter_1F_EventScript_Lass", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_PokemonCenter_1F_EventScript_Sailor", "flag": "0" diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index 001e3a138..2911dc268 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json index 1f4b3d9fc..4858e3645 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -29,7 +29,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_Port_EventScript_Woman", "flag": "0" @@ -42,7 +42,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", "movement_range_x": 3, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_Port_EventScript_Biker1", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" @@ -55,7 +55,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ThreeIsland_Port_EventScript_Biker2", "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index 7c8034bff..c5f0322f2 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TradeCenter_EventScript_Attendant", "flag": "0" diff --git a/data/maps/TrainerTower_1F/map.json b/data/maps/TrainerTower_1F/map.json index 203cbbc56..e5f8fc029 100644 --- a/data/maps/TrainerTower_1F/map.json +++ b/data/maps/TrainerTower_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_TEMP_6" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_DoublesTrainer1", "flag": "FLAG_TEMP_2" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_SinglesTrainer", "flag": "FLAG_TEMP_3" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_KnockoutTrainer", "flag": "FLAG_TEMP_4" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_DoublesTrainer2", "flag": "FLAG_TEMP_5" diff --git a/data/maps/TrainerTower_2F/map.json b/data/maps/TrainerTower_2F/map.json index c565d8131..b574b16c6 100644 --- a/data/maps/TrainerTower_2F/map.json +++ b/data/maps/TrainerTower_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_Owner", "flag": "FLAG_TEMP_6" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_DoublesTrainer1", "flag": "FLAG_TEMP_2" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_SinglesTrainer", "flag": "FLAG_TEMP_3" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_KnockoutTrainer", "flag": "FLAG_TEMP_4" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_DoublesTrainer2", "flag": "FLAG_TEMP_5" diff --git a/data/maps/TrainerTower_3F/map.json b/data/maps/TrainerTower_3F/map.json index 048f60fe2..6a3080531 100644 --- a/data/maps/TrainerTower_3F/map.json +++ b/data/maps/TrainerTower_3F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_Owner", "flag": "FLAG_TEMP_6" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_DoublesTrainer1", "flag": "FLAG_TEMP_2" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_SinglesTrainer", "flag": "FLAG_TEMP_3" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_KnockoutTrainer", "flag": "FLAG_TEMP_4" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_DoublesTrainer2", "flag": "FLAG_TEMP_5" diff --git a/data/maps/TrainerTower_4F/map.json b/data/maps/TrainerTower_4F/map.json index c1f537f5a..4dd210f5b 100644 --- a/data/maps/TrainerTower_4F/map.json +++ b/data/maps/TrainerTower_4F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_Owner", "flag": "FLAG_TEMP_6" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_DoublesTrainer1", "flag": "FLAG_TEMP_2" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_SinglesTrainer", "flag": "FLAG_TEMP_3" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_KnockoutTrainer", "flag": "FLAG_TEMP_4" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_DoublesTrainer2", "flag": "FLAG_TEMP_5" diff --git a/data/maps/TrainerTower_5F/map.json b/data/maps/TrainerTower_5F/map.json index 19c69a492..0e0783e70 100644 --- a/data/maps/TrainerTower_5F/map.json +++ b/data/maps/TrainerTower_5F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_Owner", "flag": "FLAG_TEMP_6" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_DoublesTrainer1", "flag": "FLAG_TEMP_2" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_SinglesTrainer", "flag": "FLAG_TEMP_3" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_KnockoutTrainer", "flag": "FLAG_TEMP_4" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_DoublesTrainer2", "flag": "FLAG_TEMP_5" diff --git a/data/maps/TrainerTower_6F/map.json b/data/maps/TrainerTower_6F/map.json index efb5409c4..bbece23e5 100644 --- a/data/maps/TrainerTower_6F/map.json +++ b/data/maps/TrainerTower_6F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_Owner", "flag": "FLAG_TEMP_6" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_DoublesTrainer1", "flag": "FLAG_TEMP_2" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_SinglesTrainer", "flag": "FLAG_TEMP_3" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_KnockoutTrainer", "flag": "FLAG_TEMP_4" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_DoublesTrainer2", "flag": "FLAG_TEMP_5" diff --git a/data/maps/TrainerTower_7F/map.json b/data/maps/TrainerTower_7F/map.json index d6d857e9b..404078579 100644 --- a/data/maps/TrainerTower_7F/map.json +++ b/data/maps/TrainerTower_7F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_Owner", "flag": "FLAG_TEMP_6" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_DoublesTrainer1", "flag": "FLAG_TEMP_2" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_SinglesTrainer", "flag": "FLAG_TEMP_3" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_KnockoutTrainer", "flag": "FLAG_TEMP_4" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_DoublesTrainer2", "flag": "FLAG_TEMP_5" diff --git a/data/maps/TrainerTower_8F/map.json b/data/maps/TrainerTower_8F/map.json index 1ee44a5fe..7f4a70deb 100644 --- a/data/maps/TrainerTower_8F/map.json +++ b/data/maps/TrainerTower_8F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_Owner", "flag": "FLAG_TEMP_6" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_DoublesTrainer1", "flag": "FLAG_TEMP_2" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_SinglesTrainer", "flag": "FLAG_TEMP_3" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_KnockoutTrainer", "flag": "FLAG_TEMP_4" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_DoublesTrainer2", "flag": "FLAG_TEMP_5" diff --git a/data/maps/TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json index b968a3215..25da318a3 100644 --- a/data/maps/TrainerTower_Lobby/map.json +++ b/data/maps/TrainerTower_Lobby/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_Lobby_EventScript_Nurse", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_Lobby_EventScript_MartClerk", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_Lobby_EventScript_Receptionist", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_Lobby_EventScript_CooltrainerF", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_Lobby_EventScript_BaldingMan", "flag": "0" diff --git a/data/maps/TrainerTower_Roof/map.json b/data/maps/TrainerTower_Roof/map.json index 47ad428cc..2e7907af8 100644 --- a/data/maps/TrainerTower_Roof/map.json +++ b/data/maps/TrainerTower_Roof/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TrainerTower_EventScript_Owner", "flag": "FLAG_TEMP_6" diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 4709681d1..b3e7746c8 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -29,7 +29,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TwoIsland_EventScript_Clerk", "flag": "0" @@ -42,7 +42,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TwoIsland_EventScript_Woman", "flag": "FLAG_HIDE_TWO_ISLAND_WOMAN" @@ -55,7 +55,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TwoIsland_EventScript_Beauty", "flag": "FLAG_HIDE_TWO_ISLAND_BEAUTY" @@ -68,7 +68,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TwoIsland_EventScript_Sailor", "flag": "0" @@ -81,7 +81,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TwoIsland_EventScript_SuperNerd", "flag": "FLAG_HIDE_TWO_ISLAND_SUPER_NERD" @@ -94,7 +94,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" @@ -107,7 +107,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TwoIsland_EventScript_ItemRevive", "flag": "FLAG_HIDE_TWO_ISLAND_REVIVE" @@ -120,7 +120,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TwoIsland_EventScript_LittleBoy", "flag": "0" @@ -133,7 +133,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TwoIsland_EventScript_Boy", "flag": "0" diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index 255d4aca4..277991b06 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TwoIsland_CapeBrink_House_EventScript_StarterTutor", "flag": "0" diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json index 789d3d985..d434c3e6a 100644 --- a/data/maps/TwoIsland_Harbor/map.json +++ b/data/maps/TwoIsland_Harbor/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TwoIsland_Harbor_EventScript_Sailor", "flag": "0" diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json index 020231c3f..798957582 100644 --- a/data/maps/TwoIsland_House/map.json +++ b/data/maps/TwoIsland_House/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TwoIsland_House_EventScript_MoveManiac", "flag": "0" 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/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index 5cf9dc880..4d99f4be4 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TwoIsland_JoyfulGameCorner_EventScript_LostellesDaddy", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_BIKER" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TwoIsland_JoyfulGameCorner_EventScript_Lostelle", "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TwoIsland_JoyfulGameCorner_EventScript_InfoMan", "flag": "0" diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json index 095c6c111..517821717 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TwoIsland_PokemonCenter_1F_EventScript_Nurse", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TwoIsland_PokemonCenter_1F_EventScript_GBAKid", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "TwoIsland_PokemonCenter_1F_EventScript_BugCatcher", "flag": "0" diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index b0a23fec0..bb7b1116f 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json index 66091c755..fbbc056af 100644 --- a/data/maps/UndergroundPath_EastEntrance/map.json +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "UndergroundPath_EastEntrance_EventScript_Woman", "flag": "0" diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json index e1d430ff4..3f7f48f68 100644 --- a/data/maps/UndergroundPath_NorthEntrance/map.json +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "UndergroundPath_NorthEntrance_EventScript_Saige", "flag": "0" diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json index 2eb626909..e6153a7f7 100644 --- a/data/maps/UndergroundPath_SouthEntrance/map.json +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "UndergroundPath_SouthEntrance_EventScript_Woman", "flag": "0" diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json index 3f12fbf25..efb5e86cd 100644 --- a/data/maps/UndergroundPath_WestEntrance/map.json +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "UndergroundPath_WestEntrance_EventScript_BaldingMan", "flag": "0" diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index 5bbd7969b..d1342af5a 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_Attendant", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_Player4", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_Player8", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_Player7", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_Player6", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_Player5", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_Player3", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_Player2", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "UnionRoom_EventScript_Player1", "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_1" diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index 4f2af3a64..c03df3c58 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -34,7 +34,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_EventScript_Woman", "flag": "0" @@ -47,7 +47,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_EventScript_OldMan1", "flag": "0" @@ -60,7 +60,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_EventScript_OldMan2", "flag": "0" @@ -73,7 +73,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 2, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_EventScript_Machop", "flag": "0" @@ -86,7 +86,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_EventScript_Sailor", "flag": "0" @@ -99,7 +99,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_EventScript_FerrySailor", "flag": "0" @@ -112,7 +112,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" @@ -125,7 +125,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 4, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_EventScript_OaksAide", "flag": "FLAG_HIDE_VERMILION_CITY_OAKS_AIDE" 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/map.json b/data/maps/VermilionCity_Gym/map.json index 5c023d9f5..66c27c611 100644 --- a/data/maps/VermilionCity_Gym/map.json +++ b/data/maps/VermilionCity_Gym/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_Gym_EventScript_LtSurge", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "VermilionCity_Gym_EventScript_Baily", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "VermilionCity_Gym_EventScript_Dwayne", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_Gym_EventScript_GymGuy", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "VermilionCity_Gym_EventScript_Tucker", "flag": "0" 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/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json index 0735d28ab..541974a38 100644 --- a/data/maps/VermilionCity_House1/map.json +++ b/data/maps/VermilionCity_House1/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_House1_EventScript_FishingGuru", "flag": "0" diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json index 9d89d21c1..30a081607 100644 --- a/data/maps/VermilionCity_House2/map.json +++ b/data/maps/VermilionCity_House2/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_House2_EventScript_Elyssa", "flag": "0" diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json index e459f8c54..d5afa8458 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_House3_EventScript_Boy", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 2, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_House3_EventScript_Pidgey", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_House3_EventScript_Lass", "flag": "0" diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json index 679cc3a44..ba26357da 100644 --- a/data/maps/VermilionCity_Mart/map.json +++ b/data/maps/VermilionCity_Mart/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_Mart_EventScript_Clerk", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_Mart_EventScript_CooltrainerF", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_Mart_EventScript_BaldingMan", "flag": "0" diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index 69b777890..b14fc3fb5 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_PokemonCenter_1F_EventScript_Man", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_PokemonCenter_1F_EventScript_Hiker", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_PokemonCenter_1F_EventScript_Youngster", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_PokemonCenter_1F_EventScript_VSSeekerWoman", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_PokemonCenter_1F_EventScript_PokemonJournalLtSurge", "flag": "FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_INVISIBLE", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_PokemonCenter_1F_EventScript_PokemonJournalLtSurge", "flag": "FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL" diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index 0802a9ebc..1e233913e 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index 6b394126d..dfa50ca79 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_PokemonFanClub_EventScript_Chairman", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_PokemonFanClub_EventScript_WorkerF", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_PokemonFanClub_EventScript_Pikachu", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_PokemonFanClub_EventScript_Seel", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_PokemonFanClub_EventScript_Woman", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VermilionCity_PokemonFanClub_EventScript_FatMan", "flag": "0" diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 75a812a17..4593b178c 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "VictoryRoad_1F_EventScript_Rolando", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "VictoryRoad_1F_EventScript_Naomi", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_1F_EventScript_ItemRareCandy", "flag": "FLAG_HIDE_VICTORY_ROAD_1F_RARE_CANDY" @@ -62,46 +62,46 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_1F_EventScript_ItemTM02", "flag": "FLAG_HIDE_VICTORY_ROAD_1F_TM02" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 18, "elevation": 3, "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 12, "elevation": 3, "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 16, "y": 3, "elevation": 3, "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 20ce486e2..1b3c43ef6 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "VictoryRoad_2F_EventScript_Dawson", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "VictoryRoad_2F_EventScript_Daisuke", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "VictoryRoad_2F_EventScript_Nelson", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP", "movement_range_x": 4, "movement_range_y": 4, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "VictoryRoad_2F_EventScript_Vincent", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "VictoryRoad_2F_EventScript_Gregory", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_2F_EventScript_ItemGuardSpec", "flag": "FLAG_HIDE_VICTORY_ROAD_2F_GUARD_SPEC" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_2F_EventScript_ItemTM07", "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM07" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_2F_EventScript_ItemFullHeal", "flag": "FLAG_HIDE_VICTORY_ROAD_2F_FULL_HEAL" @@ -127,46 +127,46 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_2F_EventScript_ItemTM37", "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM37" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 7, "elevation": 3, "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 17, "elevation": 3, "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 33, "y": 19, "elevation": 3, "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "FLAG_HIDE_VICTORY_ROAD_2F_BOULDER" @@ -179,7 +179,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_2F_EventScript_DoubleEdgeTutor", "flag": "0" diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index cf2d28b45..58870f921 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "VictoryRoad_3F_EventScript_George", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "VictoryRoad_3F_EventScript_Alexa", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "VictoryRoad_3F_EventScript_Colby", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "VictoryRoad_3F_EventScript_Caroline", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_3F_EventScript_ItemMaxRevive", "flag": "FLAG_HIDE_VICTORY_ROAD_3F_MAX_REVIVE" @@ -88,26 +88,26 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "VictoryRoad_3F_EventScript_ItemTM50", "flag": "FLAG_HIDE_VICTORY_ROAD_3F_TM50" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 19, "y": 15, "elevation": 3, "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 33, "y": 18, "elevation": 0, @@ -120,27 +120,27 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_3F_BOULDER" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 35, "y": 13, "elevation": 3, "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" }, { - "graphics_id": "OBJ_EVENT_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 32, "y": 5, "elevation": 3, "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_StrengthBoulder", "flag": "0" @@ -153,7 +153,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "VictoryRoad_3F_EventScript_Ray", "flag": "0" @@ -166,7 +166,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "VictoryRoad_3F_EventScript_Tyra", "flag": "0" diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index f18b447e3..0c3a19925 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -39,7 +39,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianCity_EventScript_DreamEaterTutor", "flag": "0" @@ -52,7 +52,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_11" @@ -65,7 +65,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianCity_EventScript_OldMan", "flag": "0" @@ -78,7 +78,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 2, "movement_range_y": 3, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianCity_EventScript_TutorialOldMan", "flag": "0" @@ -91,7 +91,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 3, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianCity_EventScript_Woman", "flag": "0" @@ -104,7 +104,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 0, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianCity_EventScript_Youngster", "flag": "0" @@ -117,7 +117,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianCity_EventScript_Boy", "flag": "0" @@ -130,7 +130,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" @@ -143,7 +143,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianCity_EventScript_ItemPotion", "flag": "FLAG_HIDE_VIRIDIAN_CITY_POTION" 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/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index 47e26ee17..b0e1599f5 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "ViridianCity_Gym_EventScript_Takashi", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "ViridianCity_Gym_EventScript_Yuji", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "ViridianCity_Gym_EventScript_Atsushi", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "ViridianCity_Gym_EventScript_Jason", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "ViridianCity_Gym_EventScript_Cole", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "2", "script": "ViridianCity_Gym_EventScript_Kiyo", "flag": "0" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "ViridianCity_Gym_EventScript_Samuel", "flag": "0" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianCity_Gym_EventScript_Giovanni", "flag": "FLAG_HIDE_VIRIDIAN_GIOVANNI" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "3", "script": "ViridianCity_Gym_EventScript_Warren", "flag": "0" @@ -140,7 +140,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianCity_Gym_EventScript_GymGuy", "flag": "0" diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json index 873c2eb0e..e46f3be00 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianCity_House1_EventScript_BaldingMan", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 2, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianCity_House1_EventScript_LittleGirl", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", "movement_range_x": 4, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianCity_House1_EventScript_Speary", "flag": "0" diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json index 57521973d..e8c66213a 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianCity_House2_EventScript_Woman", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianCity_House2_EventScript_Lass", "flag": "0" diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json index 52419bb8f..26fc5e46f 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianCity_Mart_EventScript_Clerk", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianCity_Mart_EventScript_Youngster", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianCity_Mart_EventScript_Woman", "flag": "0" diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json index c864c3a7c..e70f09c9f 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianCity_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianCity_PokemonCenter_1F_EventScript_Boy", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianCity_PokemonCenter_1F_EventScript_Youngster", "flag": "0" diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index 048aae829..bdeac2c5c 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 0, "movement_range_y": 0, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_MG_DELIVERYMEN" diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index 0acd8d80f..0c6125d6e 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -23,7 +23,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianForest_EventScript_Youngster", "flag": "0" @@ -36,7 +36,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianForest_EventScript_Boy", "flag": "0" @@ -49,7 +49,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "5", "script": "ViridianForest_EventScript_Rick", "flag": "0" @@ -62,7 +62,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "ViridianForest_EventScript_Doug", "flag": "0" @@ -75,7 +75,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_LEFT", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "4", "script": "ViridianForest_EventScript_Sammy", "flag": "0" @@ -88,7 +88,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianForest_EventScript_ItemPokeBall", "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POKE_BALL" @@ -101,7 +101,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianForest_EventScript_ItemAntidote", "flag": "FLAG_HIDE_VIRIDIAN_FOREST_ANTIDOTE" @@ -114,7 +114,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianForest_EventScript_ItemPotion", "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION" @@ -127,7 +127,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "ViridianForest_EventScript_Anthony", "flag": "0" @@ -140,7 +140,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_UP", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "1", + "trainer_type": "TRAINER_TYPE_NORMAL", "trainer_sight_or_berry_tree_id": "1", "script": "ViridianForest_EventScript_Charlie", "flag": "0" @@ -153,7 +153,7 @@ "movement_type": "MOVEMENT_TYPE_FACE_DOWN", "movement_range_x": 1, "movement_range_y": 1, - "trainer_type": "0", + "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", "script": "ViridianForest_EventScript_ItemPotion2", "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION_2" diff --git a/data/overworld.s b/data/overworld.s deleted file mode 100644 index 245ee3696..000000000 --- a/data/overworld.s +++ /dev/null @@ -1,126 +0,0 @@ -#include "constants/flags.h" -#include "constants/maps.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2, 0 - -sWhiteOutMoneyLossMultipliers:: @ 826D294 - .byte 2 - .byte 4 - .byte 6 - .byte 9 - .byte 12 - .byte 16 - .byte 20 - .byte 25 - .byte 30 - - .align 1 -sWhiteOutMoneyLossBadgeFlagIDs:: @ 826D29E - .2byte FLAG_BADGE01_GET - .2byte FLAG_BADGE02_GET - .2byte FLAG_BADGE03_GET - .2byte FLAG_BADGE04_GET - .2byte FLAG_BADGE05_GET - .2byte FLAG_BADGE06_GET - .2byte FLAG_BADGE07_GET - .2byte FLAG_BADGE08_GET - - .align 2 -sDummyWarpData:: @ 826D2B0 - map MAP_UNDEFINED - .byte 0xFF - .align 1 - .2byte 0xFFFF, 0xFFFF - -sUnusedData:: @ 826D2B8 - .4byte 1200 - .4byte 3600 - .4byte 1200 - .4byte 2400 - .4byte 50 - .4byte 80 - .4byte -44 - .4byte 44 - -gDirectionToVectors:: @ 826D2D8 - .4byte 0, 0 - .4byte 0, 1 - .4byte 0, -1 - .4byte -1, 0 - .4byte 1, 0 - .4byte -1, 1 - .4byte 1, 1 - .4byte -1, -1 - .4byte 1, -1 - -gUnknown_826D320:: @ 826D320 - .4byte 0x000001f8 - @ { - @ .bg = 0, - @ .charBaseIndex = 2, - @ .mapBaseIndex = 31, - @ .screenSize = 0, - @ .paletteMode = 0, - @ .priority = 0, - @ .baseTile = 0x0000 - @ } - .4byte 0x000011d1 - @ { - @ .bg = 1, - @ .charBaseIndex = 0, - @ .mapBaseIndex = 29, - @ .screenSize = 0, - @ .paletteMode = 0, - @ .priority = 1, - @ .baseTile = 0x0000 - @ } - .4byte 0x000021c2 - @ { - @ .bg = 2, - @ .charBaseIndex = 0, - @ .mapBaseIndex = 28, - @ .screenSize = 0, - @ .paletteMode = 0, - @ .priority = 2, - @ .baseTile = 0x0000 - @ } - .4byte 0x000031e3 - @ { - @ .bg = 3, - @ .charBaseIndex = 0, - @ .mapBaseIndex = 30, - @ .screenSize = 0, - @ .paletteMode = 0, - @ .priority = 3, - @ .baseTile = 0x0000 - @ } - -gFlashEffectParams:: @ 826D330 - .4byte REG_WIN0H - .4byte (2 >> 1) | ((DMA_16BIT | DMA_DEST_RELOAD | DMA_SRC_INC | DMA_REPEAT | DMA_START_HBLANK | DMA_ENABLE) << 16) - .byte 1, 0 - - .align 2 -gUnknown_826D33C:: @ 826D33C - .4byte sub_8058684 - .4byte sub_80586A4 - .4byte sub_80586A8 - -gUnknown_826D348:: @ 826D348 - .4byte sub_80586C8 - .4byte sub_80586CC - .4byte sub_80586CC - .4byte sub_80586CC - .4byte sub_80586CC - .4byte sub_80586C8 - .4byte sub_80586C8 - .4byte sub_8058734 - .4byte sub_8058734 - .4byte sub_8058734 - .4byte sub_8058734 - -gUnknown_826D374:: @ 826D374 - .4byte sub_805874C - .4byte sub_8058754 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 01b0d9b34..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 @@ -702,7 +702,11 @@ TradeCenter_EventScript_Chair3:: @ 81BB974 end @ Nop in FRLG -RecordCenter_EventScript_Spot:: @ 81BB980 +@ Separate labels to match GetDirectionForEventScript +RecordCenter_EventScript_Spot0:: @ 81BB980 +RecordCenter_EventScript_Spot1:: @ 81BB980 +RecordCenter_EventScript_Spot2:: @ 81BB980 +RecordCenter_EventScript_Spot3:: @ 81BB980 end CableClub_EventScript_ReadTrainerCard:: @ 81BB981 @@ -771,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 @@ -881,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 @@ -1191,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 @@ -1221,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/field_moves.inc b/data/scripts/field_moves.inc index 282071755..7ae90849d 100644 --- a/data/scripts/field_moves.inc +++ b/data/scripts/field_moves.inc @@ -125,7 +125,7 @@ EventScript_StrengthBoulder:: @ 81BE11D goto_if_questlog EventScript_ReleaseEnd lockall goto_if_unset FLAG_BADGE04_GET, EventScript_CantMoveBoulder - goto_if_set FLAG_SYS_STRENGTH_ACTIVE, EventScript_AlreadyUsedStrength + goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_AlreadyUsedStrength checkpartymove MOVE_STRENGTH compare VAR_RESULT, PARTY_SIZE goto_if_eq EventScript_CantMoveBoulder @@ -147,7 +147,7 @@ EventScript_FldEffStrength:: @ 81BE16E end EventScript_UseStrength:: @ 81BE179 - setflag FLAG_SYS_STRENGTH_ACTIVE + setflag FLAG_SYS_USE_STRENGTH msgbox Text_MonUsedStrengthCanMoveBoulders, MSGBOX_SIGN end 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.$" |