diff options
Diffstat (limited to 'data')
553 files changed, 18088 insertions, 18242 deletions
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index f366d4426..b3feb4f43 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1469,19 +1469,19 @@ Move_SELF_DESTRUCT: end SelfDestruct1: playsewithpan SE_W120, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 0, 0, 0, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 24, -24, 0, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 0, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -16, 16, 0, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 0, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -24, -12, 0, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 0, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 16, 16, 0, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 0, 1 delay 6 return @@ -1493,7 +1493,7 @@ Move_SLAM: playsewithpan SE_W004, SOUND_PAN_ATTACKER createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 3, 0, 4 delay 1 - createsprite gUnknown_085928D0, ANIM_ATTACKER, 2, 0, 0 + createsprite gSlamHitSpriteTemplate, ANIM_ATTACKER, 2, 0, 0 delay 3 playsewithpan SE_W025B, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 @@ -1523,17 +1523,17 @@ Move_VINE_WHIP: Move_DRILL_PECK: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_WHIRLWIND_LINES - createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 0 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 - createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 1 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 delay 2 loopsewithpan SE_W030, SOUND_PAN_TARGET, 4, 8 createvisualtask sub_810EB88, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 waitforvisualfinish - createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 2 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 6 waitforvisualfinish @@ -1637,19 +1637,19 @@ Move_EXPLOSION: end Explosion1: playsewithpan SE_W153, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 0, 0, 0, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 1 delay 6 playsewithpan SE_W153, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 24, -24, 0, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 0, 1 delay 6 playsewithpan SE_W153, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -16, 16, 0, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 0, 1 delay 6 playsewithpan SE_W153, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -24, -12, 0, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 0, 1 delay 6 playsewithpan SE_W153, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 16, 16, 0, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 0, 1 delay 6 return @@ -1800,11 +1800,11 @@ Move_SAFEGUARD: monbg ANIM_ATK_PARTNER setalpha 8, 8 playsewithpan SE_W208, SOUND_PAN_ATTACKER - createsprite gUnknown_08593C64, ANIM_ATTACKER, 2 + createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2 delay 4 - createsprite gUnknown_08593C64, ANIM_ATTACKER, 2 + createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2 delay 4 - createsprite gUnknown_08593C64, ANIM_ATTACKER, 2 + createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2 waitforvisualfinish playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER createvisualtask sub_8115A04, 2, 10, 0, 2, 0, 10, RGB_WHITE @@ -1885,11 +1885,11 @@ Move_PAY_DAY: monbgprio_28 ANIM_TARGET setalpha 12, 8 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite gUnknown_085934D8, ANIM_ATTACKER, 2, 20, 0, 0, 0, 1152 + createsprite gCoinThrowSpriteTemplate, ANIM_ATTACKER, 2, 20, 0, 0, 0, 1152 waitforvisualfinish playsewithpan SE_W006, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, 1, 2 - createsprite gUnknown_085934F0, ANIM_ATTACKER, 2 + createsprite gFallingCoinSpriteTemplate, ANIM_ATTACKER, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_TARGET @@ -1992,26 +1992,26 @@ Move_ATTRACT: loopsewithpan SE_W204, SOUND_PAN_ATTACKER, 12, 3 createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_ATTACKER delay 15 - createsprite gUnknown_085939A0, ANIM_TARGET, 3, 20, -8 + createsprite gRedHeartProjectileSpriteTemplate, ANIM_TARGET, 3, 20, -8 waitforvisualfinish playsewithpan SE_W213, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 160, -32 - createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -256, -40 - createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 128, -16 - createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 416, -38 - createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -128, -22 - createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -384, -31 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 160, -32 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -256, -40 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 128, -16 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 416, -38 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -128, -22 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -384, -31 waitforvisualfinish waitplaysewithpan SE_W213B, 0, 15 createvisualtask AnimTask_HeartsBackground, 5 - createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 16, 256, 0 - createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 224, 240, 15 - createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 126, 272, 30 - createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 80, 224, 45 - createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 170, 272, 60 - createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 40, 256, 75 - createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 112, 256, 90 - createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 200, 272, 90 + createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 16, 256, 0 + createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 224, 240, 15 + createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 126, 272, 30 + createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 80, 224, 45 + createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 170, 272, 60 + createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 40, 256, 75 + createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 112, 256, 90 + createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 200, 272, 90 delay 75 createvisualtask sub_8115A04, 2, 4, 4, 4, 0, 10, RGB(31, 25, 27) end @@ -2069,11 +2069,11 @@ Move_CONFUSE_RAY: Move_LOCK_ON: loadspritegfx ANIM_TAG_LOCK_ON - createsprite gUnknown_08592CA0, ANIM_ATTACKER, 40 - createsprite gUnknown_08592CB8, ANIM_ATTACKER, 40, 1 - createsprite gUnknown_08592CB8, ANIM_ATTACKER, 40, 2 - createsprite gUnknown_08592CB8, ANIM_ATTACKER, 40, 3 - createsprite gUnknown_08592CB8, ANIM_ATTACKER, 40, 4 + createsprite gLockOnTargetSpriteTemplate, ANIM_ATTACKER, 40 + createsprite gLockOnMoveTargetSpriteTemplate, ANIM_ATTACKER, 40, 1 + createsprite gLockOnMoveTargetSpriteTemplate, ANIM_ATTACKER, 40, 2 + createsprite gLockOnMoveTargetSpriteTemplate, ANIM_ATTACKER, 40, 3 + createsprite gLockOnMoveTargetSpriteTemplate, ANIM_ATTACKER, 40, 4 delay 120 setarg 7, -1 waitforvisualfinish @@ -2291,45 +2291,45 @@ Move_CONVERSION: setalpha 16, 0 delay 0 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -24, -24 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, -24 delay 3 - createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -8, -24 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, -24 delay 3 - createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 8, -24 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 8, -24 delay 3 - createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 24, -24 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, -24 delay 3 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -24, -8 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, -8 delay 3 - createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -8, -8 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, -8 delay 3 - createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 8, -8 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 8, -8 delay 3 - createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 24, -8 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, -8 delay 3 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -24, 8 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, 8 delay 3 - createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -8, 8 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, 8 delay 3 - createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 8, 8 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 8, 8 delay 3 - createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 24, 8 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, 8 delay 3 playsewithpan SE_W129, SOUND_PAN_ATTACKER - createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -24, 24 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, 24 delay 3 - createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, -8, 24 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, 24 delay 3 - createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 8, 24 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 8, 24 delay 3 - createsprite gUnknown_08592E74, ANIM_ATTACKER, 2, 24, 24 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, 24 delay 20 playsewithpan SE_W112, SOUND_PAN_ATTACKER createvisualtask sub_8115D94, 2, ANIM_TAG_CONVERSION, 1, 1, 14335, 12, 0, 0 delay 6 - createvisualtask sub_81022D4, 5 + createvisualtask AnimTask_ConversionAlphaBlend, 5 waitforvisualfinish delay 1 clearmonbg ANIM_ATK_PARTNER @@ -2343,23 +2343,23 @@ Move_CONVERSION_2: setalpha 0, 16 delay 0 playsewithpan SE_W112, SOUND_PAN_TARGET - createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -24, -24, 60 - createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -8, -24, 65 - createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 8, -24, 70 - createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 24, -24, 75 - createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -24, -8, 80 - createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -8, -8, 85 - createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 8, -8, 90 - createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 24, -8, 95 - createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -24, 8, 100 - createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -8, 8, 105 - createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 8, 8, 110 - createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 24, 8, 115 - createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -24, 24, 120 - createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, -8, 24, 125 - createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 8, 24, 130 - createsprite gUnknown_08592EA4, ANIM_ATTACKER, 2, 24, 24, 135 - createvisualtask sub_81023E0, 5 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -24, -24, 60 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -8, -24, 65 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 8, -24, 70 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 24, -24, 75 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -24, -8, 80 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -8, -8, 85 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 8, -8, 90 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 24, -8, 95 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -24, 8, 100 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -8, 8, 105 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 8, 8, 110 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 24, 8, 115 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -24, 24, 120 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -8, 24, 125 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 8, 24, 130 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 24, 24, 135 + createvisualtask AnimTask_Conversion2AlphaBlend, 5 delay 60 playsewithpan SE_W129, SOUND_PAN_TARGET delay 10 @@ -2405,15 +2405,15 @@ Move_ROLLING_KICK: Move_HEADBUTT: loadspritegfx ANIM_TAG_IMPACT - createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 0 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 - createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 1 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 4, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 - createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 2 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2 createsprite gUnknown_085973E8, ANIM_TARGET, 3, 0, 0, 1, 1 playsewithpan SE_W233B, SOUND_PAN_TARGET waitforvisualfinish @@ -2422,16 +2422,16 @@ Move_HEADBUTT: Move_HORN_ATTACK: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT - createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 0 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 - createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 1 - createsprite gUnknown_08592F44, ANIM_TARGET, 4, 0, 0, 10 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 + createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, 0, 0, 10 waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 4, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 - createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 2 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2 createsprite gUnknown_085973E8, ANIM_TARGET, 3, 0, 0, 1, 1 playsewithpan SE_W030, SOUND_PAN_TARGET waitforvisualfinish @@ -2448,14 +2448,14 @@ FuryAttackContinue: end FuryAttackRight: - createsprite gUnknown_08592F44, ANIM_TARGET, 4, 8, 8, 10 + createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, 8, 8, 10 waitforvisualfinish createsprite gUnknown_085973E8, ANIM_TARGET, 3, 0, 0, 1, 1 playsewithpan SE_W030, SOUND_PAN_TARGET goto FuryAttackContinue FuryAttackLeft: - createsprite gUnknown_08592F44, ANIM_TARGET, 4, -8, -8, 10 + createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, -8, -8, 10 waitforvisualfinish createsprite gUnknown_085973E8, ANIM_TARGET, 3, 0, 0, 1, 1 playsewithpan SE_W030, SOUND_PAN_TARGET @@ -2471,12 +2471,12 @@ Move_HORN_DRILL: HornDrillContinue: waitbgfadein setalpha 12, 8 - createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 0 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish delay 2 - createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 1 - createsprite gUnknown_08592F44, ANIM_TARGET, 4, 0, 0, 12 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 + createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, 0, 0, 12 waitforvisualfinish playse SE_BAN createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 40, 1 @@ -2514,7 +2514,7 @@ HornDrillContinue: createsprite gUnknown_085973E8, ANIM_TARGET, 3, 32, 0, 1, 2 playsewithpan SE_W030, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08592CD8, ANIM_ATTACKER, 2, 2 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2 waitforvisualfinish restorebg waitbgfadeout @@ -2531,8 +2531,8 @@ HornDrillInContest: Move_THRASH: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - createvisualtask sub_8104C38, 2 - createvisualtask sub_8104CA4, 2 + createvisualtask AnimTask_ThrashMoveMonHorizontal, 2 + createvisualtask AnimTask_ThrashMoveMonVertical, 2 createsprite gUnknown_08595EB0, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1 playsewithpan SE_W004, SOUND_PAN_TARGET @@ -2549,36 +2549,36 @@ Move_THRASH: Move_SING: loadspritegfx ANIM_TAG_MUSIC_NOTES monbg ANIM_DEF_PARTNER - createvisualtask sub_8102BE8, 2 + createvisualtask AnimTask_MusicNotesRainbowBlend, 2 waitforvisualfinish panse_1B SE_W047, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 7, 0, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 7, 0, 12 delay 5 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 6, 1, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 6, 1, 12 delay 5 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 1, 2, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 1, 2, 12 delay 5 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 3, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 2, 3, 12 delay 5 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 3, 0, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 3, 0, 12 delay 4 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 1, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 2, 1, 12 delay 4 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 5, 2, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 5, 2, 12 delay 4 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 6, 3, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 6, 3, 12 delay 4 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 0, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 2, 0, 12 delay 4 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 1, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 2, 1, 12 delay 4 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 1, 2, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 1, 2, 12 delay 4 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 5, 3, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 5, 3, 12 delay 4 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER - createvisualtask sub_8102CA0, 2 + createvisualtask AnimTask_MusicNotesClearRainbowBlend, 2 waitforvisualfinish end @@ -2775,7 +2775,7 @@ Move_TELEPORT: end Move_DOUBLE_TEAM: - createvisualtask sub_81029B4, 2 + createvisualtask AnimTask_DoubleTeam, 2 setalpha 12, 8 monbg ANIM_ATK_PARTNER playsewithpan SE_W104, SOUND_PAN_ATTACKER @@ -2812,10 +2812,10 @@ Move_MINIMIZE: Move_METRONOME: loadspritegfx ANIM_TAG_FINGER loadspritegfx ANIM_TAG_THOUGHT_BUBBLE - createsprite gUnknown_08593114, ANIM_ATTACKER, 11, 0, 100 + createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 100 playsewithpan SE_W118, SOUND_PAN_ATTACKER delay 6 - createsprite gUnknown_085931BC, ANIM_ATTACKER, 12, 0 + createsprite gMetronomeFingerSpriteTemplate, ANIM_ATTACKER, 12, 0 delay 24 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 22, 3 waitforvisualfinish @@ -2841,7 +2841,7 @@ SkullBashSetUp1: return SkullBashAttack: loadspritegfx ANIM_TAG_IMPACT - createvisualtask sub_8101C94, 2, 0 + createvisualtask AnimTask_SkullBashPosition, 2, 0 playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish playse SE_BAN @@ -2851,7 +2851,7 @@ SkullBashAttack: createsprite gUnknown_085973E8, ANIM_TARGET, 4, 0, 0, 1, 0 loopsewithpan SE_W025B, SOUND_PAN_TARGET, 8, 3 waitforvisualfinish - createvisualtask sub_8101C94, 2, 1 + createvisualtask AnimTask_SkullBashPosition, 2, 1 goto SkullBashEnd Move_AMNESIA: @@ -2893,9 +2893,9 @@ Move_GLARE: waitforvisualfinish createvisualtask sub_8116620, 5, 1, 0, 0, 16, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, -16, -8 - createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, 16, -8 - createvisualtask sub_81064F8, 5 + createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 + createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8 + createvisualtask AnimTask_ScaryFace, 5 playsewithpan SE_W043, SOUND_PAN_ATTACKER delay 2 createvisualtask sub_810A094, 3, 20, 1, 0 @@ -3006,7 +3006,7 @@ Move_ACID_ARMOR: Move_SHARPEN: loadspritegfx ANIM_TAG_SPHERE_TO_CUBE - createsprite gUnknown_08592DE4, ANIM_ATTACKER, 2 + createsprite gSharpenSphereSpriteTemplate, ANIM_ATTACKER, 2 waitforvisualfinish end @@ -3021,7 +3021,7 @@ Move_SUPER_FANG: delay 20 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 4 - createsprite gUnknown_08592F74, ANIM_TARGET, 2 + createsprite gSuperFangSpriteTemplate, ANIM_TARGET, 2 playsewithpan SE_W044, SOUND_PAN_TARGET delay 8 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB(31, 2, 2), 14, 0x7FFF, 14 @@ -3032,10 +3032,10 @@ Move_SUPER_FANG: Move_SLASH: loadspritegfx ANIM_TAG_SLASH - createsprite gUnknown_08592D2C, ANIM_TARGET, 2, 1, -8, 0 + createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 1, -8, 0 playsewithpan SE_W013, SOUND_PAN_TARGET delay 4 - createsprite gUnknown_08592D2C, ANIM_TARGET, 2, 1, 8, 0 + createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 1, 8, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 playsewithpan SE_W013, SOUND_PAN_TARGET waitforvisualfinish @@ -3047,8 +3047,8 @@ Move_STRUGGLE: monbg ANIM_TARGET setalpha 12, 8 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4 - createsprite gUnknown_08593B80, ANIM_ATTACKER, 2, 0, 0, 2 - createsprite gUnknown_08593B80, ANIM_ATTACKER, 2, 0, 1, 2 + createsprite gMovementWavesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2 + createsprite gMovementWavesSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 2 loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 12, 4 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 @@ -3063,7 +3063,7 @@ Move_SKETCH: loadspritegfx ANIM_TAG_PENCIL monbg ANIM_TARGET createvisualtask sub_8104E74, 2 - createsprite gUnknown_085936D4, ANIM_TARGET, 2 + createsprite gPencilSpriteTemplate, ANIM_TARGET, 2 waitforvisualfinish clearmonbg ANIM_TARGET createvisualtask AnimTask_Splash, 2, 0, 2 @@ -3206,15 +3206,15 @@ Move_ENDURE: end EndureEffect: - createsprite gUnknown_08592D8C, ANIM_ATTACKER, 2, 0, -24, 26, 2 + createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 26, 2 delay 4 - createsprite gUnknown_08592D8C, ANIM_ATTACKER, 2, 0, 14, 28, 1 + createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0, 14, 28, 1 delay 4 - createsprite gUnknown_08592D8C, ANIM_ATTACKER, 2, 0, -5, 10, 2 + createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 10, 2 delay 4 - createsprite gUnknown_08592D8C, ANIM_ATTACKER, 2, 0, 28, 26, 3 + createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0, 28, 26, 3 delay 4 - createsprite gUnknown_08592D8C, ANIM_ATTACKER, 2, 0, -12, 0, 1 + createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0, -12, 0, 1 return Move_CHARM: @@ -3251,23 +3251,23 @@ Move_ROLLOUT: Move_FALSE_SWIPE: loadspritegfx ANIM_TAG_SLASH_2 loadspritegfx ANIM_TAG_IMPACT - createsprite gUnknown_08592D44, ANIM_TARGET, 2 + createsprite gFalseSwipeSliceSpriteTemplate, ANIM_TARGET, 2 playsewithpan SE_W233, SOUND_PAN_TARGET delay 16 - createsprite gUnknown_08592D5C, ANIM_TARGET, 2, 0 + createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 0 playsewithpan SE_W104, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08592D5C, ANIM_TARGET, 2, 16 + createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 16 delay 2 - createsprite gUnknown_08592D5C, ANIM_TARGET, 2, 32 + createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 32 playsewithpan SE_W104, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08592D5C, ANIM_TARGET, 2, 48 + createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 48 delay 2 - createsprite gUnknown_08592D5C, ANIM_TARGET, 2, 64 + createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 64 playsewithpan SE_W104, SOUND_PAN_TARGET delay 2 - createsprite gUnknown_08592D5C, ANIM_TARGET, 2, 80 + createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 80 delay 2 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 @@ -3298,7 +3298,7 @@ Move_MILK_DRINK: loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_TARGET - createsprite gUnknown_08592B3C, ANIM_ATTACKER, 2 + createsprite gMilkBottleSpriteTemplate, ANIM_ATTACKER, 2 delay 40 playsewithpan SE_W152, SOUND_PAN_ATTACKER delay 12 @@ -3306,7 +3306,7 @@ Move_MILK_DRINK: delay 20 playsewithpan SE_W152, SOUND_PAN_ATTACKER waitforvisualfinish - createsprite gUnknown_0859381C, ANIM_ATTACKER, 3, 0, 0, 1, 0 + createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 0 playsewithpan SE_W208, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_TARGET @@ -3362,21 +3362,21 @@ Move_MOONLIGHT: setalpha 0, 16 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 16, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08592EBC, ANIM_ATTACKER, 2, 120, 56 + createsprite gMoonSpriteTemplate, ANIM_ATTACKER, 2, 120, 56 createvisualtask sub_80A7A74, 3, 0, 16, 16, 0, 1 playsewithpan SE_W236, 0 delay 30 - createsprite gBattleAnimSpriteTemplate_8592EEC, ANIM_ATTACKER, 40, -12, 0 + createsprite gMoonlightSparkleSpriteTemplate, ANIM_ATTACKER, 40, -12, 0 delay 30 - createsprite gBattleAnimSpriteTemplate_8592EEC, ANIM_ATTACKER, 40, -24, 0 + createsprite gMoonlightSparkleSpriteTemplate, ANIM_ATTACKER, 40, -24, 0 delay 30 - createsprite gBattleAnimSpriteTemplate_8592EEC, ANIM_ATTACKER, 40, 21, 0 + createsprite gMoonlightSparkleSpriteTemplate, ANIM_ATTACKER, 40, 21, 0 delay 30 - createsprite gBattleAnimSpriteTemplate_8592EEC, ANIM_ATTACKER, 40, 0, 0 + createsprite gMoonlightSparkleSpriteTemplate, ANIM_ATTACKER, 40, 0, 0 delay 30 - createsprite gBattleAnimSpriteTemplate_8592EEC, ANIM_ATTACKER, 40, 10, 0 + createsprite gMoonlightSparkleSpriteTemplate, ANIM_ATTACKER, 40, 10, 0 delay 20 - createvisualtask sub_81025C0, 2 + createvisualtask AnimTask_FadeScreenBlue, 2 waitforvisualfinish call HealingEffect waitforvisualfinish @@ -3392,15 +3392,15 @@ ExtremeSpeedContinue: waitbgfadeout createvisualtask sub_8117660, 5, -2304, 0, 1, -1 waitbgfadein - createvisualtask sub_810577C, 2 + createvisualtask AnimTask_StretchAttacker, 2 loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 3 waitforvisualfinish delay 1 - createvisualtask sub_8117F60, 2 + createvisualtask AnimTask_ExtremeSpeedMoveTarget, 2 monbg ANIM_TARGET setalpha 12, 8 delay 18 - createvisualtask sub_8105810, 2 + createvisualtask AnimTask_ExtremeSpeedImpact, 2 delay 2 playsewithpan SE_W004, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_85973B8, ANIM_TARGET, 2, 1, 0, -12, 3 @@ -3411,9 +3411,9 @@ ExtremeSpeedContinue: playsewithpan SE_W233B, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_85973B8, ANIM_TARGET, 2, 1, 0, 0, 3 waitforvisualfinish - createvisualtask sub_8105AAC, 2 + createvisualtask AnimTask_SpeedDust, 2 delay 10 - createvisualtask sub_810599C, 2 + createvisualtask AnimTask_ExtremeSpeedMonReappear, 2 loopsewithpan SE_W104, SOUND_PAN_ATTACKER, 8, 4 waitforvisualfinish restorebg @@ -3434,23 +3434,23 @@ Move_UPROAR: loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE loadspritegfx ANIM_TAG_THIN_RING monbg ANIM_DEF_PARTNER - createvisualtask sub_8106D90, 2, 0 - createsprite gBattleAnimSpriteTemplate_8593898, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 + createvisualtask AnimTask_UproarDistortion, 2, 0 + createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, 29, -12, 0 - createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, -12, -29, 1 + createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 29, -12, 0 + createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -12, -29, 1 delay 16 - createvisualtask sub_8106D90, 2, 0 - createsprite gBattleAnimSpriteTemplate_8593898, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 + createvisualtask AnimTask_UproarDistortion, 2, 0 + createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, 12, -29, 1 - createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, -29, -12, 0 + createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 12, -29, 1 + createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -29, -12, 0 delay 16 - createvisualtask sub_8106D90, 2, 0 - createsprite gBattleAnimSpriteTemplate_8593898, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 + createvisualtask AnimTask_UproarDistortion, 2, 0 + createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, 24, -24, 1 - createsprite gBattleAnimSpriteTemplate_8593BB8, ANIM_ATTACKER, 2, 0, -24, -24, 0 + createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, -24, 1 + createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, -24, 0 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end @@ -3551,7 +3551,7 @@ Move_SMELLING_SALT: Move_FOLLOW_ME: loadspritegfx ANIM_TAG_FINGER - createsprite gUnknown_085931D4, ANIM_ATTACKER, 2, 0 + createsprite gFollowMeFingerSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_W039, SOUND_PAN_ATTACKER delay 18 playsewithpan SE_W213, SOUND_PAN_ATTACKER @@ -3598,10 +3598,10 @@ Move_TAUNT: loadspritegfx ANIM_TAG_FINGER_2 loadspritegfx ANIM_TAG_THOUGHT_BUBBLE loadspritegfx ANIM_TAG_ANGER - createsprite gUnknown_08593114, ANIM_ATTACKER, 11, 0, 45 + createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 45 playsewithpan SE_W118, SOUND_PAN_ATTACKER delay 6 - createsprite gUnknown_0859324C, ANIM_ATTACKER, 12, 0 + createsprite gTauntFingerSpriteTemplate, ANIM_ATTACKER, 12, 0 delay 4 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 16, 2 waitforvisualfinish @@ -3990,19 +3990,19 @@ Move_TEETER_DANCE: loadspritegfx ANIM_TAG_MUSIC_NOTES loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_TeeterDanceMovement, 5 - createsprite gUnknown_08593050, ANIM_ATTACKER, 2, 0, 16, -2 + createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, -2 playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 24 - createsprite gUnknown_08593050, ANIM_ATTACKER, 2, 0, 0, -2 + createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, -2 playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 24 - createsprite gUnknown_08593050, ANIM_ATTACKER, 2, 0, -16, -2 + createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, -16, -2 playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 24 - createsprite gUnknown_08593050, ANIM_ATTACKER, 2, 1, -8, -2 + createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, -8, -2 playsewithpan SE_W298, SOUND_PAN_ATTACKER delay 24 - createsprite gUnknown_08593050, ANIM_ATTACKER, 2, 2, 8, -2 + createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 2, 8, -2 playsewithpan SE_W298, SOUND_PAN_ATTACKER end @@ -4058,42 +4058,42 @@ Move_NEEDLE_ARM: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET loopsewithpan SE_W030, SOUND_PAN_TARGET, 2, 16 - createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 0, -32, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 0, -32, 16 delay 2 - createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 22, -22, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 22, -22, 16 delay 2 - createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 30, 0, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 30, 0, 16 delay 2 - createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 20, 20, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 20, 20, 16 delay 2 - createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 0, 28, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 0, 28, 16 delay 2 - createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, -19, 19, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, -19, 19, 16 delay 2 - createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, -27, 0, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, -27, 0, 16 delay 2 - createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, -18, -18, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, -18, -18, 16 delay 2 - createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 0, -25, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 0, -25, 16 delay 2 - createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 17, -17, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 17, -17, 16 delay 2 - createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 23, 0, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 23, 0, 16 delay 2 - createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 0, 16, 16, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 16, 16, 16 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 playsewithpan SE_W233B, SOUND_PAN_TARGET - createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, 0, -24, 10 - createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, 17, -17, 10 - createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, 24, 0, 10 - createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, 17, 17, 10 - createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, 0, 24, 10 - createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, -17, 17, 10 - createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, -24, 0, 10 - createsprite gUnknown_08592888, ANIM_TARGET, 2, 1, 1, -17, -17, 10 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 0, -24, 10 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 17, -17, 10 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 24, 0, 10 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 17, 17, 10 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 0, 24, 10 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, -17, 17, 10 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, -24, 0, 10 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, -17, -17, 10 end Move_SLACK_OFF: @@ -4135,17 +4135,17 @@ Move_AROMATHERAPY: delay 1 monbg ANIM_ATTACKER delay 1 - createsprite gUnknown_085927AC, ANIM_ATTACKER, 0, 24, 16, 0, 2, 2, 0, 0 - createsprite gUnknown_085927AC, ANIM_ATTACKER, 66, 64, 24, 0, 3, 1, 1, 0 - createsprite gUnknown_085927C4, ANIM_ATTACKER, 0, 16, 24, 0, 2, 1, 0, 0 + createsprite gAromatherapySmallFlowerSpriteTemplate, ANIM_ATTACKER, 0, 24, 16, 0, 2, 2, 0, 0 + createsprite gAromatherapySmallFlowerSpriteTemplate, ANIM_ATTACKER, 66, 64, 24, 0, 3, 1, 1, 0 + createsprite gAromatherapyBigFlowerSpriteTemplate, ANIM_ATTACKER, 0, 16, 24, 0, 2, 1, 0, 0 delay 20 - createsprite gUnknown_085927AC, ANIM_ATTACKER, 66, 48, 12, 0, 4, 3, 1, 0 - createsprite gUnknown_085927AC, ANIM_ATTACKER, 0, 100, 16, 0, 3, 2, 0, 0 - createsprite gUnknown_085927AC, ANIM_ATTACKER, 0, 74, 24, 180, 3, 2, 0, 0 + createsprite gAromatherapySmallFlowerSpriteTemplate, ANIM_ATTACKER, 66, 48, 12, 0, 4, 3, 1, 0 + createsprite gAromatherapySmallFlowerSpriteTemplate, ANIM_ATTACKER, 0, 100, 16, 0, 3, 2, 0, 0 + createsprite gAromatherapySmallFlowerSpriteTemplate, ANIM_ATTACKER, 0, 74, 24, 180, 3, 2, 0, 0 delay 10 - createsprite gUnknown_085927AC, ANIM_ATTACKER, 66, 80, 30, 0, 4, 1, 1, 0 - createsprite gUnknown_085927AC, ANIM_ATTACKER, 0, 128, 12, 0, 3, 3, 0, 0 - createsprite gUnknown_085927C4, ANIM_ATTACKER, 0, 90, 16, 0, 2, 1, 0, 0 + createsprite gAromatherapySmallFlowerSpriteTemplate, ANIM_ATTACKER, 66, 80, 30, 0, 4, 1, 1, 0 + createsprite gAromatherapySmallFlowerSpriteTemplate, ANIM_ATTACKER, 0, 128, 12, 0, 3, 3, 0, 0 + createsprite gAromatherapyBigFlowerSpriteTemplate, ANIM_ATTACKER, 0, 90, 16, 0, 2, 1, 0, 0 waitforvisualfinish clearmonbg ANIM_ATTACKER delay 1 @@ -4155,13 +4155,13 @@ Move_AROMATHERAPY: createvisualtask sub_815DFCC, 2, 1 waitforvisualfinish playsewithpan SE_W234, SOUND_PAN_ATTACKER - createsprite gUnknown_08592B94, ANIM_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 + createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 - createsprite gUnknown_08592B94, ANIM_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 + createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 43, 3, 10, 0, RGB(13, 31, 12) - createsprite gUnknown_08593868, ANIM_ATTACKER, 16, 0, 0, 0, 1 + createsprite gBlendThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 16, 0, 0, 0, 1 waitforvisualfinish end @@ -4196,10 +4196,10 @@ Move_AIR_CUTTER: monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 0 - createvisualtask sub_8103CF0, 2, 32, -24, 1536, 2, 128 + createvisualtask AnimTask_AirCutterProjectile, 2, 32, -24, 1536, 2, 128 waitforvisualfinish playsewithpan SE_W015, SOUND_PAN_TARGET - createsprite gUnknown_08592A34, ANIM_ATTACKER, 2, 40, -32, 0, 2 + createsprite gAirCutterSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0, 2 delay 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 8, 1 @@ -4229,35 +4229,35 @@ Move_GRASS_WHISTLE: loadspritegfx ANIM_TAG_MUSIC_NOTES createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, RGB(18, 31, 12) waitforvisualfinish - createvisualtask sub_8102BE8, 2 + createvisualtask AnimTask_MusicNotesRainbowBlend, 2 waitforvisualfinish panse_1B SE_W320, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 7, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 7, 1, 0 delay 5 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 6, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 6, 1, 0 delay 5 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 1, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 1, 1, 0 delay 5 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 2, 1, 0 delay 5 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 3, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 3, 1, 0 delay 4 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 2, 1, 0 delay 4 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 5, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 5, 1, 0 delay 4 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 6, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 6, 1, 0 delay 4 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 2, 1, 0 delay 4 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 2, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 2, 1, 0 delay 4 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 1, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 1, 1, 0 delay 4 - createsprite gUnknown_08593008, ANIM_TARGET, 2, 5, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 5, 1, 0 delay 4 waitforvisualfinish - createvisualtask sub_8102CA0, 2 + createvisualtask AnimTask_MusicNotesClearRainbowBlend, 2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 4, 0, RGB(18, 31, 12) waitforvisualfinish end @@ -4266,8 +4266,8 @@ Move_TICKLE: loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 0, 16, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, -16, -8 - createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, 16, -8 + createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 + createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8 playsewithpan SE_W197, SOUND_PAN_ATTACKER waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 16, 0, RGB_BLACK @@ -4473,13 +4473,13 @@ Move_CALM_MIND: waitforvisualfinish createvisualtask sub_81177E4, 5, 1 waitforvisualfinish - createsprite gUnknown_08593850, ANIM_ATTACKER, 40, 0, 0, 0, 0 + createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 playsewithpan SE_W048, SOUND_PAN_ATTACKER delay 14 - createsprite gUnknown_08593850, ANIM_ATTACKER, 40, 0, 0, 0, 0 + createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 playsewithpan SE_W048, SOUND_PAN_ATTACKER delay 14 - createsprite gUnknown_08593850, ANIM_ATTACKER, 40, 0, 0, 0, 0 + createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 playsewithpan SE_W048, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask sub_81177E4, 5, 0 @@ -4492,7 +4492,7 @@ Move_CALM_MIND: Move_LEAF_BLADE: loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_CROSS_IMPACT - createvisualtask sub_80FFFC0, 5 + createvisualtask AnimTask_LeafBlade, 5 delay 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 playsewithpan SE_W015, SOUND_PAN_TARGET @@ -4577,43 +4577,43 @@ Move_HARDEN: Move_BELLY_DRUM: loadspritegfx ANIM_TAG_MUSIC_NOTES loadspritegfx ANIM_TAG_PURPLE_HAND_OUTLINE - createvisualtask sub_8102BE8, 2 + createvisualtask AnimTask_MusicNotesRainbowBlend, 2 waitforvisualfinish call BellyDrum1 - createsprite gUnknown_0859309C, ANIM_ATTACKER, 2, 0, 0, 0, 0 + createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0, 0 playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 15 call BellyDrum2 - createsprite gUnknown_0859309C, ANIM_ATTACKER, 2, 1, 1, 1, 0 + createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 1, 0 playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 15 call BellyDrum1 - createsprite gUnknown_0859309C, ANIM_ATTACKER, 2, 0, 3, 3, 128 + createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 3, 3, 128 playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 7 call BellyDrum2 - createsprite gUnknown_0859309C, ANIM_ATTACKER, 2, 1, 2, 0, 128 + createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 128 playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 7 call BellyDrum1 - createsprite gUnknown_0859309C, ANIM_ATTACKER, 2, 0, 1, 1, 0 + createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 1, 0 playsewithpan SE_W187, SOUND_PAN_ATTACKER delay 7 call BellyDrum2 - createsprite gUnknown_0859309C, ANIM_ATTACKER, 2, 1, 0, 3, 0 + createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 3, 0 playsewithpan SE_W187, SOUND_PAN_ATTACKER waitforvisualfinish - createvisualtask sub_8102CA0, 2 + createvisualtask AnimTask_MusicNotesClearRainbowBlend, 2 waitforvisualfinish end BellyDrum2: - createsprite gUnknown_08593068, ANIM_ATTACKER, 3, 0 + createsprite gBellyDrumHandSpriteTemplate, ANIM_ATTACKER, 3, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 8, 2, 1 return BellyDrum1: - createsprite gUnknown_08593068, ANIM_ATTACKER, 3, 1 + createsprite gBellyDrumHandSpriteTemplate, ANIM_ATTACKER, 3, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 8, 2, 1 return @@ -4697,11 +4697,11 @@ Move_ICE_PUNCH: Move_REST: playsewithpan SE_W173, SOUND_PAN_ATTACKER loadspritegfx ANIM_TAG_LETTER_Z - createsprite gUnknown_08592C88, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 + createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 20 - createsprite gUnknown_08592C88, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 + createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 20 - createsprite gUnknown_08592C88, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 + createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 waitforvisualfinish end @@ -5010,9 +5010,9 @@ Snore1: createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, ANIM_ATTACKER, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1 createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, 6, 1, 14, 0, 0 - createsprite gUnknown_085936EC, ANIM_ATTACKER, 2, 0, 0, -42, -38, 24, 0, 0 - createsprite gUnknown_085936EC, ANIM_ATTACKER, 2, 0, 0, 0, -42, 24, 0, 0 - createsprite gUnknown_085936EC, ANIM_ATTACKER, 2, 0, 0, 42, -38, 24, 0, 0 + createsprite gSnoreZSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, -42, -38, 24, 0, 0 + createsprite gSnoreZSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0, -42, 24, 0, 0 + createsprite gSnoreZSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 42, -38, 24, 0, 0 return Move_LIGHT_SCREEN: @@ -5158,7 +5158,7 @@ Move_FAINT_ATTACK: clearmonbg ANIM_ATTACKER invisible ANIM_ATTACKER delay 1 - createvisualtask sub_8117F60, 2 + createvisualtask AnimTask_ExtremeSpeedMoveTarget, 2 setalpha 12, 8 monbg ANIM_TARGET delay 1 @@ -6580,19 +6580,19 @@ Move_DYNAMIC_PUNCH: waitsound playsewithpan SE_W120, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 5, 0, 28, 1 - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 0, 0, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 24, -24, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -16, 16, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -24, -12, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 16, 16, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6897,16 +6897,16 @@ Move_OCTAZOOKA: loadspritegfx ANIM_TAG_GRAY_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL playsewithpan SE_W025B, SOUND_PAN_ATTACKER - createsprite gUnknown_08592DFC, ANIM_TARGET, 2, 20, 0, 0, 0, 20, 0 + createsprite gOctazookaBallSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 20, 0 waitforvisualfinish playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gUnknown_08592E30, ANIM_TARGET, 2, 8, 8, 1, 0 + createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 2, 8, 8, 1, 0 delay 2 - createsprite gUnknown_08592E30, ANIM_TARGET, 2, -8, -8, 1, 0 + createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 2, -8, -8, 1, 0 delay 2 - createsprite gUnknown_08592E30, ANIM_TARGET, 2, 8, -8, 1, 0 + createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 2, 8, -8, 1, 0 delay 2 - createsprite gUnknown_08592E30, ANIM_TARGET, 2, -8, 8, 1, 0 + createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 2, -8, 8, 1, 0 waitforvisualfinish end @@ -7320,22 +7320,22 @@ Move_EGG_BOMB: loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_LARGE_FRESH_EGG playsewithpan SE_W039, SOUND_PAN_ATTACKER - createsprite gUnknown_08593488, ANIM_TARGET, 2, 10, 0, 0, 0, 25, -32 + createsprite gEggThrowSpriteTemplate, ANIM_TARGET, 2, 10, 0, 0, 0, 25, -32 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 16, 1 - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, 6, 5, 1, 0 + createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 6, 5, 1, 0 playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, -16, -15, 1, 0 + createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, -16, -15, 1, 0 playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, 16, -5, 1, 0 + createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 16, -5, 1, 0 playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, -12, 18, 1, 0 + createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, -12, 18, 1, 0 playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 4, 0, 5, 1, 0 + createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 0, 5, 1, 0 playsewithpan SE_W120, SOUND_PAN_TARGET delay 3 waitforvisualfinish @@ -7677,15 +7677,15 @@ Move_SOFT_BOILED: monbg ANIM_ATK_PARTNER playsewithpan SE_W039, SOUND_PAN_ATTACKER createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 2, 6, 1 - createsprite gUnknown_085937B0, ANIM_ATTACKER, 4, 0, 16, 0 - createsprite gUnknown_085937B0, ANIM_ATTACKER, 4, 0, 16, 1 + createsprite gSoftBoiledEggSpriteTemplate, ANIM_ATTACKER, 4, 0, 16, 0 + createsprite gSoftBoiledEggSpriteTemplate, ANIM_ATTACKER, 4, 0, 16, 1 delay 120 delay 7 playsewithpan SE_W030, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 10, 0, RGB(12, 24, 30) - createsprite gUnknown_0859381C, ANIM_ATTACKER, 3, 31, 16, 0, 1 + createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 31, 16, 0, 1 delay 8 - createsprite gUnknown_0859381C, ANIM_ATTACKER, 3, 31, 16, 0, 1 + createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 31, 16, 0, 1 delay 60 setarg 7, -1 waitforvisualfinish @@ -7700,24 +7700,24 @@ Move_HEAL_BELL: createvisualtask sub_8116620, 10, 10, 0, 0, 10, RGB_WHITE waitforvisualfinish createvisualtask sub_8105CB4, 5 - createsprite gUnknown_08593938, ANIM_ATTACKER, 2, 0, -24, 0, 1 + createsprite gBellSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 0, 1 delay 12 - createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 48, -18, 35, 0, 0 - createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -48, 20, 30, 1, 1 - createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -38, -29, 30, 2, 2 - createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 36, 18, 30, 3, 3 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 48, -18, 35, 0, 0 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, -48, 20, 30, 1, 1 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, -38, -29, 30, 2, 2 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 36, 18, 30, 3, 3 call HealBell1 delay 0x21 - createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 19, 26, 35, 4, 4 - createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -34, -12, 30, 5, 5 - createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 41, -20, 34, 6, 2 - createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -15, 26, 32, 7, 0 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 19, 26, 35, 4, 4 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, -34, -12, 30, 5, 5 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 41, -20, 34, 6, 2 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, -15, 26, 32, 7, 0 call HealBell1 delay 0x21 - createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -48, 18, 31, 0, 2 - createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 48, -20, 30, 2, 5 - createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, 38, 29, 33, 4, 3 - createsprite gUnknown_08593958, ANIM_ATTACKER, 40, 0, -24, -36, -18, 30, 6, 1 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, -48, 18, 31, 0, 2 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 48, -20, 30, 2, 5 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 38, 29, 33, 4, 3 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, -36, -18, 30, 6, 1 call HealBell1 waitforvisualfinish createvisualtask sub_8105D60, 5 @@ -7727,27 +7727,27 @@ Move_HEAL_BELL: unloadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 playsewithpan SE_W234, SOUND_PAN_ATTACKER - createsprite gUnknown_08592B94, ANIM_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 + createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 - createsprite gUnknown_08592B94, ANIM_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 + createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish unloadspritegfx ANIM_TAG_SPARKLE_2 loadspritegfx ANIM_TAG_THIN_RING playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER createvisualtask sub_8116664, 10, 4, 3, 10, 0, RGB(12, 24, 30) createvisualtask sub_8116620, 10, 10, 3, 10, 0, RGB_WHITE - createsprite gUnknown_08593868, ANIM_ATTACKER, 16, 0, 0, 0, 1 + createsprite gBlendThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 16, 0, 0, 0, 1 end HealBell1: createvisualtask sub_8116664, 10, 4, 3, 8, 0, RGB(12, 24, 30) createvisualtask sub_8116620, 10, 10, 3, 2, 10, RGB_WHITE - createsprite gUnknown_0859381C, ANIM_ATTACKER, 40, 0, -24, 0, 1 + createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 0, 1 playsewithpan SE_W215, SOUND_PAN_ATTACKER return Move_FAKE_OUT: playsewithpan SE_W260, 0 - createvisualtask sub_8105EB0, 5 + createvisualtask AnimTask_FakeOut, 5 waitforvisualfinish playsewithpan SE_W166, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 @@ -7763,10 +7763,10 @@ Move_SCARY_FACE: waitforvisualfinish delay 10 playsewithpan SE_W043, SOUND_PAN_ATTACKER - createvisualtask sub_81064F8, 5 + createvisualtask AnimTask_ScaryFace, 5 delay 13 - createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, -16, -8 - createsprite gUnknown_08593A84, ANIM_ATTACKER, 0, 16, -8 + createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 + createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8 waitforvisualfinish createvisualtask sub_810A094, 3, 20, 1, 0 playsewithpan SE_W081B, SOUND_PAN_TARGET @@ -7777,33 +7777,33 @@ Move_SCARY_FACE: Move_SWEET_KISS: loadspritegfx ANIM_TAG_RED_HEART loadspritegfx ANIM_TAG_ANGEL - createsprite gUnknown_08593AA8, ANIM_TARGET, 2, 16, -48 + createsprite gAngelSpriteTemplate, ANIM_TARGET, 2, 16, -48 playsewithpan SE_W215, SOUND_PAN_TARGET delay 23 playsewithpan SE_W215, SOUND_PAN_TARGET delay 23 playsewithpan SE_W215, SOUND_PAN_TARGET waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 160, -30 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 160, -30 playsewithpan SE_W213, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -256, -42 - createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 128, -14 - createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, 416, -38 - createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -128, -22 - createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -384, -31 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -256, -42 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 128, -14 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 416, -38 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -128, -22 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -384, -31 end Move_LOVELY_KISS: loadspritegfx ANIM_TAG_PINK_HEART loadspritegfx ANIM_TAG_DEVIL - createsprite gUnknown_08593AF0, ANIM_TARGET, 2, 0, -24 + createsprite gDevilSpriteTemplate, ANIM_TARGET, 2, 0, -24 playsewithpan SE_W060B, SOUND_PAN_TARGET waitforvisualfinish playsewithpan SE_W213, SOUND_PAN_TARGET - createsprite gUnknown_08593AC0, ANIM_TARGET, 3, -256, -42 - createsprite gUnknown_08593AC0, ANIM_TARGET, 3, 128, -14 - createsprite gUnknown_08593AC0, ANIM_TARGET, 3, 416, -38 - createsprite gUnknown_08593AC0, ANIM_TARGET, 3, -128, -22 + createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, -256, -42 + createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 128, -14 + createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 416, -38 + createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, -128, -22 end Move_FURY_SWIPES: @@ -7811,13 +7811,13 @@ Move_FURY_SWIPES: createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 5, 5 delay 4 playsewithpan SE_W010, SOUND_PAN_TARGET - createsprite gUnknown_08593B38, ANIM_TARGET, 2, 16, 0, 1 + createsprite gFurySwipesSpriteTemplate, ANIM_TARGET, 2, 16, 0, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 5, 1 delay 10 createsprite gHorizontalLungeSpriteTemplate, ANIM_TARGET, 2, 5, 5 delay 4 playsewithpan SE_W010, SOUND_PAN_TARGET - createsprite gUnknown_08593B38, ANIM_TARGET, 2, -16, 0, 0 + createsprite gFurySwipesSpriteTemplate, ANIM_TARGET, 2, -16, 0, 0 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1 end @@ -7870,19 +7870,19 @@ Move_PRESENT: PresentDamage: loadspritegfx ANIM_TAG_EXPLOSION playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 3, 0, 0, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 3, 24, -24, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 24, -24, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 3, -16, 16, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, -16, 16, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 3, -24, -12, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, -24, -12, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_TARGET, 3, 16, 16, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 16, 16, 1, 1 end PresentHeal: @@ -7920,23 +7920,23 @@ Move_BATON_PASS: Move_PERISH_SONG: loadspritegfx ANIM_TAG_MUSIC_NOTES_2 - createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 0, 0, 0 - createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 1, 1, 16 - createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 2, 1, 32 - createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 3, 2, 48 - createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 4, 2, 64 - createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 5, 0, 80 - createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 6, 0, 96 - createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 7, 1, 112 - createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 8, 2, 128 - createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 9, 0, 144 - createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 10, 2, 160 - createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 11, 0, 176 - createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 12, 1, 192 - createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 13, 3, 208 - createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 14, 3, 224 - createsprite gUnknown_08593C0C, ANIM_ATTACKER, 4, 15, 0, 240 - createsprite gUnknown_08593C24, ANIM_ATTACKER, 4, 15, 0, 0 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 0 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 1, 1, 16 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 2, 1, 32 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 3, 2, 48 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 4, 2, 64 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 5, 0, 80 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 6, 0, 96 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 7, 1, 112 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 8, 2, 128 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 9, 0, 144 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 10, 2, 160 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 11, 0, 176 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 12, 1, 192 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 13, 3, 208 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 14, 3, 224 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 15, 0, 240 + createsprite gPerishSongMusicNote2SpriteTemplate, ANIM_ATTACKER, 4, 15, 0, 0 delay 20 panse_1B SE_W195, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 delay 80 @@ -8194,14 +8194,14 @@ Move_SPIT_UP: delay 45 playsewithpan SE_W255, SOUND_PAN_ATTACKER delay 3 - createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 0, 12 - createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 32, 12 - createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 64, 12 - createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 96, 12 - createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 128, 12 - createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 160, 12 - createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 192, 12 - createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 224, 12 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 12 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 32, 12 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 64, 12 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 96, 12 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 128, 12 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 160, 12 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 192, 12 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 224, 12 delay 5 jumpifmoveturn 2, SpitUpStrong jumpifmoveturn 3, SpitUpStrongest @@ -8216,20 +8216,20 @@ SpitUpContinue: waitforvisualfinish end SpitUpStrong: - createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 16 - createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 80 - createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 144 - createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 208 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 16 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 80 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 144 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 208 goto SpitUpContinue SpitUpStrongest: - createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 16 - createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 48 - createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 80 - createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 112 - createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 144 - createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 176 - createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 208 - createsprite gUnknown_08593A50, ANIM_ATTACKER, 2, 240 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 16 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 48 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 80 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 112 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 144 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 176 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 208 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 240 goto SpitUpContinue Move_SWALLOW: @@ -8468,7 +8468,7 @@ Move_REFRESH: waitforvisualfinish playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 10, 0, RGB(12, 24, 30) - createsprite gUnknown_0859381C, ANIM_ATTACKER, 3, 0, 0, 0, 0 + createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0 end Move_BLAZE_KICK: @@ -8505,7 +8505,7 @@ Move_HYPER_VOICE: HyperVoiceEffect: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 8, 0, RGB_YELLOW createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 5, ANIM_ATTACKER, 0 - createsprite gUnknown_08593880, ANIM_ATTACKER, 0, 45, 0, 0, 0, 0, 0, 1 + createsprite gHyperVoiceRingSpriteTemplate, ANIM_ATTACKER, 0, 45, 0, 0, 0, 0, 0, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 6, 1 createvisualtask sub_81162A4, 2, 1, 0, 6, 1 @@ -8593,26 +8593,26 @@ Move_MUDDY_WATER: Move_BULLET_SEED: loadspritegfx ANIM_TAG_SEED - createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 + createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 + createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 + createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 delay 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 30, 1 - createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 + createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 + createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 + createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 + createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 + createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 + createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_0859351C, ANIM_TARGET, 2, 20, 0 + createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 waitforvisualfinish end @@ -8858,7 +8858,7 @@ Move_METAL_SOUND: end MetalSound1: panse_1B SE_W103, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 - createsprite gUnknown_08593458, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 + createsprite gMetalSoundSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -9059,9 +9059,9 @@ Move_COSMIC_POWER: waitbgfadein delay 70 createvisualtask sub_8159210, 5, 228, SOUND_PAN_ATTACKER - createsprite gUnknown_08592B7C, ANIM_ATTACKER, 2, -15, 0, 0, 0, 32, 60 + createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, -15, 0, 0, 0, 32, 60 delay 8 - createsprite gUnknown_08592B7C, ANIM_ATTACKER, 2, 12, -5, 0, 0, 32, 60 + createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, 12, -5, 0, 0, 32, 60 delay 40 createvisualtask sub_8117610, 2, 0, 15, 0, 0 waitforvisualfinish @@ -9167,29 +9167,29 @@ SilverWindContinue: delay 0 createvisualtask sub_8116620, 10, 1, 0, 4, 4, RGB_BLACK waitbgfadein - createsprite gUnknown_08592830, ANIM_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 - createsprite gUnknown_08592830, ANIM_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 - createsprite gUnknown_08592830, ANIM_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 - createsprite gUnknown_08592830, ANIM_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 + createsprite gSilverWindBigSparkSpriteTemplate, ANIM_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 + createsprite gSilverWindBigSparkSpriteTemplate, ANIM_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 + createsprite gSilverWindBigSparkSpriteTemplate, ANIM_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 + createsprite gSilverWindBigSparkSpriteTemplate, ANIM_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 delay 0 - createsprite gUnknown_08592848, ANIM_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 - createsprite gUnknown_08592848, ANIM_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 - createsprite gUnknown_08592848, ANIM_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 - createsprite gUnknown_08592848, ANIM_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 + createsprite gSilverWindMediumSparkSpriteTemplate, ANIM_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 + createsprite gSilverWindMediumSparkSpriteTemplate, ANIM_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 + createsprite gSilverWindMediumSparkSpriteTemplate, ANIM_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 + createsprite gSilverWindMediumSparkSpriteTemplate, ANIM_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 delay 0 - createsprite gUnknown_08592860, ANIM_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 - createsprite gUnknown_08592860, ANIM_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 - createsprite gUnknown_08592860, ANIM_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 - createsprite gUnknown_08592860, ANIM_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 + createsprite gSilverWindSmallSparkSpriteTemplate, ANIM_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 + createsprite gSilverWindSmallSparkSpriteTemplate, ANIM_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 + createsprite gSilverWindSmallSparkSpriteTemplate, ANIM_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 + createsprite gSilverWindSmallSparkSpriteTemplate, ANIM_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 delay 6 - createsprite gUnknown_08592830, ANIM_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 - createsprite gUnknown_08592830, ANIM_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 + createsprite gSilverWindBigSparkSpriteTemplate, ANIM_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 + createsprite gSilverWindBigSparkSpriteTemplate, ANIM_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 delay 0 - createsprite gUnknown_08592848, ANIM_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 - createsprite gUnknown_08592848, ANIM_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 + createsprite gSilverWindMediumSparkSpriteTemplate, ANIM_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 + createsprite gSilverWindMediumSparkSpriteTemplate, ANIM_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 delay 0 - createsprite gUnknown_08592860, ANIM_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 - createsprite gUnknown_08592860, ANIM_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 + createsprite gSilverWindSmallSparkSpriteTemplate, ANIM_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 + createsprite gSilverWindSmallSparkSpriteTemplate, ANIM_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 waitforvisualfinish playsewithpan SE_W016B, SOUND_PAN_TARGET clearmonbg ANIM_DEF_PARTNER @@ -9503,13 +9503,13 @@ Move_WATER_PULSE: playsewithpan SE_W145C, SOUND_PAN_TARGET waitforvisualfinish playsewithpan SE_W202, SOUND_PAN_ATTACKER - createsprite gUnknown_08593470, ANIM_TARGET, 2, 0, 0, 40, 15 + createsprite gWaterPulseRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 40, 15 delay 5 playsewithpan SE_W202, SOUND_PAN_ATTACKER - createsprite gUnknown_08593470, ANIM_TARGET, 2, 0, 0, 40, 15 + createsprite gWaterPulseRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 40, 15 delay 5 playsewithpan SE_W202, SOUND_PAN_ATTACKER - createsprite gUnknown_08593470, ANIM_TARGET, 2, 0, 0, 40, 15 + createsprite gWaterPulseRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 40, 15 delay 13 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 8, 18, 1 waitforvisualfinish @@ -10027,33 +10027,33 @@ IcyWindEffect2: return GrantingStarsEffect: - createsprite gUnknown_08592B7C, ANIM_ATTACKER, 2, -15, 0, 0, 0, 32, 60 + createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, -15, 0, 0, 0, 32, 60 delay 8 - createsprite gUnknown_08592B7C, ANIM_ATTACKER, 2, 12, -5, 0, 0, 32, 60 + createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, 12, -5, 0, 0, 32, 60 delay 8 return HealingEffect: playsewithpan SE_W071B, SOUND_PAN_ATTACKER - createsprite gUnknown_08592F2C, ANIM_ATTACKER, 2, 0, -5, 0, 0 + createsprite gHealingBlueStarSpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 0, 0 delay 7 - createsprite gUnknown_08592F2C, ANIM_ATTACKER, 2, -15, 10, 0, 0 + createsprite gHealingBlueStarSpriteTemplate, ANIM_ATTACKER, 2, -15, 10, 0, 0 delay 7 - createsprite gUnknown_08592F2C, ANIM_ATTACKER, 2, -15, -15, 0, 0 + createsprite gHealingBlueStarSpriteTemplate, ANIM_ATTACKER, 2, -15, -15, 0, 0 delay 7 - createsprite gUnknown_08592F2C, ANIM_ATTACKER, 2, 10, -5, 0, 0 + createsprite gHealingBlueStarSpriteTemplate, ANIM_ATTACKER, 2, 10, -5, 0, 0 delay 7 return HealingEffect2: playsewithpan SE_W071B, SOUND_PAN_TARGET - createsprite gUnknown_08592F2C, ANIM_TARGET, 2, 0, -5, 1, 0 + createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, 0, -5, 1, 0 delay 7 - createsprite gUnknown_08592F2C, ANIM_TARGET, 2, -15, 10, 1, 0 + createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, -15, 10, 1, 0 delay 7 - createsprite gUnknown_08592F2C, ANIM_TARGET, 2, -15, -15, 1, 0 + createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, -15, -15, 1, 0 delay 7 - createsprite gUnknown_08592F2C, ANIM_TARGET, 2, 10, -5, 1, 0 + createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, 10, -5, 1, 0 delay 7 return @@ -10249,9 +10249,9 @@ Status_Infatuation: Status_Sleep: loadspritegfx ANIM_TAG_LETTER_Z playsewithpan SE_W173, SOUND_PAN_ATTACKER - createsprite gUnknown_08592C88, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 + createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 30 - createsprite gUnknown_08592C88, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 + createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 end Status_Paralysis: @@ -10440,7 +10440,7 @@ General_ItemEffect: waitforvisualfinish playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 3, 7, 0, RGB(17, 31, 25) - createsprite gUnknown_0859381C, ANIM_ATTACKER, 3, 0, 0, 0, 0 + createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0 waitforvisualfinish end @@ -10599,19 +10599,19 @@ General_DoomDesireHit: delay 25 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 20, 1 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 0, 0, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 24, -24, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -16, 16, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, -24, -12, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 1, 1 delay 6 playsewithpan SE_W120, SOUND_PAN_TARGET - createsprite gBattleAnimSpriteTemplate_859371C, ANIM_ATTACKER, 3, 16, 16, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE waitforvisualfinish diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 886a6ae98..24a266de6 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2875,7 +2875,7 @@ BattleScript_FaintedMonTryChooseAnother:: switchhandleorder BS_ATTACKER, 0x2 jumpifbyte CMP_EQUAL, gBattleCommunication, 0x6, BattleScript_FaintedMonChooseAnother atknameinbuff1 - resetintrimidatetracebits BS_ATTACKER + resetintimidatetracebits BS_ATTACKER hpthresholds2 BS_ATTACKER printstring STRINGID_RETURNMON switchoutabilities BS_ATTACKER diff --git a/data/berry_crush.s b/data/berry_crush.s index 6535cd558..fa1170062 100755 --- a/data/berry_crush.s +++ b/data/berry_crush.s @@ -281,23 +281,23 @@ gUnknown_082F4304:: @ 82F4304 .align 2 gUnknown_082F430C:: @ 82F430C - spr_template 0x0001, 0x0001, gUnknown_0852491C, gUnknown_082F42E8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0x0001, 0x0001, gOamData_AffineOff_ObjNormal_64x64, gUnknown_082F42E8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 2 gUnknown_082F4324:: @ 82F4324 - spr_template 0x0002, 0x0002, gUnknown_08524914, gUnknown_082F42EC, NULL, gDummySpriteAffineAnimTable, sub_8022A20 + spr_template 0x0002, 0x0002, gOamData_AffineOff_ObjNormal_32x32, gUnknown_082F42EC, NULL, gDummySpriteAffineAnimTable, sub_8022A20 .align 2 gUnknown_082F433C:: @ 82F433C - spr_template 0x0003, 0x0002, gUnknown_0852490C, gUnknown_082F42F4, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0x0003, 0x0002, gOamData_AffineOff_ObjNormal_16x16, gUnknown_082F42F4, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 2 gUnknown_082F4354:: @ 82F4354 - spr_template 0x0004, 0x0004, gUnknown_08524944, gUnknown_082F42FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0x0004, 0x0004, gOamData_AffineOff_ObjNormal_8x16, gUnknown_082F42FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 2 gUnknown_082F436C:: @ 82F436C - spr_template 0x0005, 0x0005, gUnknown_085249D4, gUnknown_082F4300, NULL, gUnknown_082F4304, SpriteCallbackDummy + spr_template 0x0005, 0x0005, gOamData_AffineDouble_ObjNormal_32x32, gUnknown_082F4300, NULL, gUnknown_082F4304, SpriteCallbackDummy .align 2 gUnknown_082F4384:: @ 82F4384 diff --git a/data/event_scripts.s b/data/event_scripts.s index 1ed8581f9..532e87d36 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,8 +1,11 @@ #include "constants/global.h" #include "constants/battle.h" +#include "constants/battle_pike.h" +#include "constants/battle_pyramid.h" #include "constants/battle_frontier.h" #include "constants/battle_setup.h" #include "constants/berry.h" +#include "constants/cable_club.h" #include "constants/contest.h" #include "constants/daycare.h" #include "constants/decorations.h" @@ -10,7 +13,9 @@ #include "constants/event_objects.h" #include "constants/event_object_movement_constants.h" #include "constants/field_effects.h" +#include "constants/field_poison.h" #include "constants/field_specials.h" +#include "constants/field_tasks.h" #include "constants/flags.h" #include "constants/game_stat.h" #include "constants/item.h" @@ -20,14 +25,19 @@ #include "constants/lilycove_lady.h" #include "constants/map_scripts.h" #include "constants/maps.h" +#include "constants/mauville_old_man.h" #include "constants/metatile_labels.h" #include "constants/moves.h" +#include "constants/party_menu.h" #include "constants/pokemon.h" #include "constants/script_menu.h" +#include "constants/secret_bases.h" #include "constants/songs.h" #include "constants/species.h" +#include "constants/trade.h" #include "constants/trainer_hill.h" #include "constants/trainers.h" +#include "constants/tv.h" #include "constants/vars.h" #include "constants/weather.h" .include "asm/macros.inc" @@ -165,8 +175,8 @@ gStdScripts_End:: @ 81DC2CC .include "data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc" .include "data/maps/FallarborTown_PokemonCenter_1F/scripts.inc" .include "data/maps/FallarborTown_PokemonCenter_2F/scripts.inc" - .include "data/maps/FallarborTown_House1/scripts.inc" - .include "data/maps/FallarborTown_House2/scripts.inc" + .include "data/maps/FallarborTown_CozmosHouse/scripts.inc" + .include "data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc" .include "data/maps/VerdanturfTown_BattleTentLobby/scripts.inc" .include "data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc" .include "data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc" @@ -425,227 +435,7 @@ gStdScripts_End:: @ 81DC2CC .include "data/maps/TerraCave_End/scripts.inc" .include "data/maps/AlteringCave/scripts.inc" .include "data/maps/MeteorFalls_StevensCave/scripts.inc" - .include "data/maps/SecretBase_BlueCave1/scripts.inc" - .include "data/maps/SecretBase_BlueCave2/scripts.inc" - .include "data/maps/SecretBase_BlueCave3/scripts.inc" - .include "data/maps/SecretBase_BlueCave4/scripts.inc" - .include "data/maps/SecretBase_BrownCave1/scripts.inc" - .include "data/maps/SecretBase_BrownCave2/scripts.inc" - .include "data/maps/SecretBase_BrownCave3/scripts.inc" - .include "data/maps/SecretBase_BrownCave4/scripts.inc" - .include "data/maps/SecretBase_RedCave1/scripts.inc" - .include "data/maps/SecretBase_RedCave2/scripts.inc" - .include "data/maps/SecretBase_RedCave3/scripts.inc" - .include "data/maps/SecretBase_RedCave4/scripts.inc" - .include "data/maps/SecretBase_Shrub1/scripts.inc" - .include "data/maps/SecretBase_Shrub2/scripts.inc" - .include "data/maps/SecretBase_Shrub3/scripts.inc" - .include "data/maps/SecretBase_Shrub4/scripts.inc" - .include "data/maps/SecretBase_Tree1/scripts.inc" - .include "data/maps/SecretBase_Tree2/scripts.inc" - .include "data/maps/SecretBase_Tree3/scripts.inc" - .include "data/maps/SecretBase_Tree4/scripts.inc" - .include "data/maps/SecretBase_YellowCave1/scripts.inc" - .include "data/maps/SecretBase_YellowCave2/scripts.inc" - .include "data/maps/SecretBase_YellowCave3/scripts.inc" - .include "data/maps/SecretBase_YellowCave4/scripts.inc" - -EventScript_SecretBasePC:: @ 823B4BB - lockall - playse SE_PC_LOGIN - message Text_SecretBaseBootUpPC - dofieldeffect FLDEFF_PCTURN_ON - waitstate - waitmessage - waitbuttonpress - playse SE_SELECT - goto EventScript_SecretBasePCShowMainMenu - end - -EventScript_SecretBasePCShowMainMenu:: @ 823B4D3 - message Text_SecretBasePCStartMenu - waitmessage - goto_if_set FLAG_SECRET_BASE_REGISTRY_ENABLED, EventScript_SecretBasePCMainMenuChoice - goto EventScript_23B531 - end - -gUnknown_0823B4E8:: @ 823B4E8 ;EventScript_SecretBasePCCancel? - lockall - goto EventScript_SecretBasePCShowMainMenu - end - -EventScript_SecretBasePCMainMenuChoice:: @ 823B4EF - multichoice 0, 0, MULTI_DECOR_REGISTRY, 0 - switch VAR_RESULT - case 0, EventScript_23B581 - case 1, EventScript_23B568 - case 2, EventScript_23B585 - case 3, EventScript_23B66E - case MULTI_B_PRESSED, EventScript_23B66E - end - -EventScript_23B531:: @ 823B531 - multichoice 0, 0, MULTI_DECOR_NOREGISTRY, 0 - switch VAR_RESULT - case 0, EventScript_23B581 - case 1, EventScript_23B568 - case 2, EventScript_23B66E - case MULTI_B_PRESSED, EventScript_23B66E - end - -EventScript_23B568:: @ 823B568 - msgbox Text_2766AA, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_SecretBasePCShowMainMenu - closemessage - special MoveOutOfSecretBase - releaseall - end - -EventScript_23B581:: @ 823B581 - special ShowSecretBaseDecorationMenu - end - -EventScript_23B585:: @ 823B585 - special ShowSecretBaseRegistryMenu - end - -EventScript_RecordMixingSecretBasePC:: @ 823B589 - lockall - message Text_SecretBaseBootUpPC - playse SE_PC_LOGIN - dofieldeffect FLDEFF_PCTURN_ON - waitstate - waitmessage - waitbuttonpress - playse SE_SELECT - goto EventScript_23B5A1 - end - -EventScript_23B5A1:: @ 823B5A1 - message Text_SecretBasePCStartMenu - waitmessage - multichoice 0, 0, MULTI_REGISTER_MENU, 0 - switch VAR_RESULT - case 0, EventScript_23B5F0 - case 1, EventScript_23B585 - case 2, EventScript_23B660 - case 3, EventScript_23B66E - case MULTI_B_PRESSED, EventScript_23B66E - end - -gUnknown_0823B5E9:: @ 823B5E9 - lockall - goto EventScript_23B5A1 - end - -EventScript_23B5F0:: @ 823B5F0 - special GetCurSecretBaseRegistrationValidity - compare VAR_RESULT, 1 - goto_if_eq EventScript_23B62F - compare VAR_RESULT, 2 - goto_if_eq EventScript_CantRegisterTooManyBases - special CopyCurSecretBaseOwnerName_StrVar1 - msgbox Text_WantToRegisterSecretBase, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_23B5A1 - msgbox Text_2767D1, MSGBOX_SIGN - special ToggleCurSecretBaseRegistry - special DoSecretBasePCTurnOffEffect - releaseall - end - -EventScript_23B62F:: @ 823B62F - msgbox Text_276731, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_23B5A1 - msgbox Text_2767E9, MSGBOX_SIGN - special ToggleCurSecretBaseRegistry - special DoSecretBasePCTurnOffEffect - releaseall - end - -EventScript_CantRegisterTooManyBases:: @ 823B652 - msgbox Text_TooManyBasesDeleteSome, MSGBOX_SIGN - special DoSecretBasePCTurnOffEffect - closemessage - releaseall - end - -EventScript_23B660:: @ 823B660 - msgbox Text_276835, MSGBOX_DEFAULT - goto EventScript_23B5A1 - end - -EventScript_23B66E:: @ 823B66E - special DoSecretBasePCTurnOffEffect - closemessage - releaseall - end - -EventScript_23B674:: @ 823B674 - special SetSecretBaseSecretsTvFlags_Poster - end - -EventScript_23B678:: @ 823B678 - special SetSecretBaseSecretsTvFlags_MiscFurnature - end - -EventScript_23B67C:: @ 823B67C - special SetSecretBaseSecretsTvFlags_LargeDecorationSpot - end - -EventScript_23B680:: @ 823B680 - special SetSecretBaseSecretsTvFlags_SmallDecorationSpot - end - -EventScript_SecretBaseSandOrnament:: @ 823B684 - special SetSecretBaseSecretsTvFlags_SandOrnament - dofieldeffect FLDEFF_SAND_PILLAR - waitstate - end - -EventScript_SecretBaseShieldOrToyTV:: @ 823B68C - special GetShieldToyTVDecorationInfo - compare VAR_RESULT, 0 - goto_if_eq EventScript_23B6BC - compare VAR_RESULT, 1 - goto_if_eq EventScript_23B6C5 - compare VAR_RESULT, 2 - goto_if_eq EventScript_23B6CE - compare VAR_RESULT, 3 - goto_if_eq EventScript_23B6D7 - end - -EventScript_23B6BC:: @ 823B6BC - msgbox Text_27692B, MSGBOX_SIGN - end - -EventScript_23B6C5:: @ 823B6C5 - msgbox Text_276974, MSGBOX_SIGN - end - -EventScript_23B6CE:: @ 823B6CE - msgbox Text_2769B8, MSGBOX_SIGN - end - -EventScript_23B6D7:: @ 823B6D7 - msgbox Text_2769FF, MSGBOX_SIGN - end - -gText_23B6E0:: @ 823B6E0 - .string "There's a small indent in the wall.$" - -gText_23B704:: @ 823B704 - .string "There's a small indent in the wall.\p" - .string "Use the SECRET POWER?$" - -gText_23B73E:: @ 823B73E - .string "Discovered a small cavern!$" - -SecretBase_RedCave1_Text_23B759: @ 823B759 - .string "Want to make your SECRET BASE here?$" - + .include "data/scripts/shared_secret_base.inc" .include "data/maps/SingleBattleColosseum/scripts.inc" .include "data/maps/TradeCenter/scripts.inc" .include "data/maps/RecordCorner/scripts.inc" @@ -795,6 +585,7 @@ SecretBase_RedCave1_Text_23B759: @ 823B759 .include "data/maps/Route119_House/scripts.inc" .include "data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc" +@ Below could be split as std_msgbox.inc but autoclose straddles trainer_battle.inc Std_MsgboxNPC: @ 8271315 lock faceplayer @@ -844,10 +635,6 @@ Common_EventScript_SaveGame:: @ 827134F waitstate return -EventScript_271354:: @ 8271354 - cmdD8 - cmdD9 - .include "data/scripts/trainer_battle.inc" Std_MsgboxAutoclose:: @ 8271494 @@ -857,252 +644,9 @@ Std_MsgboxAutoclose:: @ 8271494 release return -EventScript_ResetAllBerries:: @ 827149D - setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES - setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES - setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES - setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES - setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES - setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES - setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES - setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES - setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES - setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES - setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES - setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES - setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES - setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES - setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES - setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES - setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES - setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES - setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES - setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES - setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES - setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES - setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES - setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES - setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES - setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES - setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES - setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES - setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES - setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES - setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES - setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES - setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES - setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES - setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES - setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES - setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES - setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES - setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES - setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES - setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES - setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES - setberrytree 83, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES - setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES - setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES - setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES - setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES - setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES - setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES - setberrytree 40, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES - setberrytree 41, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES - setberrytree 42, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES - setberrytree 46, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES - setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES - setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES - setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES - setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES - setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES - setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES - setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES - setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES - setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES - setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES - setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES - setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES - setberrytree 59, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES - setberrytree 60, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES - setberrytree 61, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES - setberrytree 79, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES - setberrytree 14, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES - setberrytree 15, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES - setberrytree 30, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES - setberrytree 65, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES - setberrytree 72, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES - setberrytree 73, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES - setberrytree 74, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES - setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES - setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES - setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES - setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), BERRY_STAGE_BERRIES - return - -EventScript_ResetAllMapFlags:: @ 82715DE - setflag FLAG_LINK_CONTEST_POKE_BALL - setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE - setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE - setflag FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE - setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH - setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL - setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL - setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE - setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA - setflag FLAG_HIDE_PETALBURG_CITY_WALLY - setflag FLAG_UNKNOWN_0x363 - setflag FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT - setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 - setflag FLAG_HIDE_RUSBORO_CITY_RIVAL - setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST - setflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN - setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY - setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO - setflag FLAG_HIDE_ROUTE_104_MR_BRINEY - setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN - setflag FLAG_HIDE_ROUTE_108_MR_BRINEY - setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN - setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT - setflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST - setflag FLAG_HIDE_ROUTE_110_BIRCH - setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1 - setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2 - setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1 - setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 - setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 - setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 - setflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS - setflag FLAG_HIDE_PETALBURG_GYM_GREETER - setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE - setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN - setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN - setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM - setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM - setflag FLAG_HIDE_PLAYERS_HOUSE_DAD - setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL - setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL - setflag FLAG_HIDE_FANCLUB_OLD_LADY - setflag FLAG_HIDE_FANCLUB_BOY - setflag FLAG_HIDE_FANCLUB_LITTLE_BOY - setflag FLAG_HIDE_FANCLUB_LADY - setflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER - setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 - setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 - setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 - setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 - setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 - setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 - setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 - setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER - setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER - setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY - setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN - setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE - setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN - setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT - setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE - setflag FLAG_HIDE_PETALBURG_GYM_WALLY - setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY - setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE - setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE - setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS - setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1 - setflag FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1 - setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN - setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT - setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE - setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL - setflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL - setflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY - setflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN - setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW - setflag FLAG_HIDE_ROUTE_119_RIVAL - setflag FLAG_HIDE_ROUTE_119_SCOTT - setflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN - setflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE - setflag FLAG_HIDE_LANETTES_HOUSE_LANETTE - setflag FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN - setflag FLAG_HIDE_MT_CHIMNEY_TRAINERS - setflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY - setflag FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN - setflag FLAG_HIDE_ROUTE_116_MR_BRINEY - setflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO - setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT - setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN - setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN - setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE - setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1 - setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2 - setflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT - setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE - setflag FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM - setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL - setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH - setflag FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS - setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 - setflag FLAG_HIDE_ROUTE_101_BIRCH - setflag FLAG_HIDE_ROUTE_103_BIRCH - setflag FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR - setflag FLAG_HIDE_LILYCOVE_HARBOR_EVENT_TICKET_TAKER - setflag FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE - setflag FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON - setflag FLAG_UNKNOWN_0x393 - setflag FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE - setflag FLAG_HIDE_MAUVILLE_CITY_WATTSON - setflag FLAG_HIDE_MAUVILLE_CITY_SCOTT - setflag FLAG_HIDE_CHAMPIONS_ROOM_RIVAL - setflag FLAG_HIDE_CHAMPIONS_ROOM_BIRCH - setflag FLAG_HIDE_ROUTE_110_RIVAL_2 - setflag FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE - setflag FLAG_HIDE_ROUTE_104_RIVAL - setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 - setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 - setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL - setflag FLAG_HIDE_METEOR_FALLS_TEAM_AQUA - setflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN - setflag FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO - setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M - setflag FLAG_HIDE_ROUTE_128_STEVEN - setflag FLAG_HIDE_ROUTE_128_ARCHIE - setflag FLAG_HIDE_ROUTE_128_MAXIE - setflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE - setflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN - setflag FLAG_HIDE_SLATEPORT_CITY_SCOTT - setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY - setflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY - setflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY - setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN - setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL - setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY - setflag FLAG_HIDE_OLDALE_TOWN_RIVAL - setflag FLAG_HIDE_ROUTE_101_BOY - setflag FLAG_HIDE_PETALBURG_CITY_SCOTT - setflag FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA - setflag FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE - setflag FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON - setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS - setflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE - setflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE - setflag FLAG_HIDE_ROUTE_111_DESERT_FOSSIL - setflag FLAG_HIDE_ROUTE_111_PLAYER_DESCENT - setflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL - setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA - setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA - setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA - setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN - setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - setflag FLAG_HIDE_DEOXYS - setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION - setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT - setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT - setflag FLAG_HIDE_SKY_PILLAR_WALLACE - setflag FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT - call EventScript_ResetAllBerries - end + .include "data/scripts/new_game.inc" +@ Below seems to be hall_of_fame.inc and briney.inc together? EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 special sub_81AFDD0 setflag FLAG_IS_CHAMPION @@ -1168,13 +712,13 @@ EventScript_ResetMrBriney:: @ 8271862 compare VAR_BRINEY_LOCATION, 2 goto_if_eq EventScript_MoveMrBrineyToDewford compare VAR_BRINEY_LOCATION, 3 - goto_if_eq EventScript_MoveMrBrineyToRoute108 + goto_if_eq EventScript_MoveMrBrineyToRoute109 end EventScript_MoveMrBrineyToHouse:: @ 8271884 setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN - setflag FLAG_HIDE_ROUTE_108_MR_BRINEY + setflag FLAG_HIDE_ROUTE_109_MR_BRINEY setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY @@ -1182,7 +726,7 @@ EventScript_MoveMrBrineyToHouse:: @ 8271884 end EventScript_MoveMrBrineyToDewford:: @ 827189A - setflag FLAG_HIDE_ROUTE_108_MR_BRINEY + setflag FLAG_HIDE_ROUTE_109_MR_BRINEY setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT setflag FLAG_HIDE_ROUTE_104_MR_BRINEY setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT @@ -1192,14 +736,14 @@ EventScript_MoveMrBrineyToDewford:: @ 827189A clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN end -EventScript_MoveMrBrineyToRoute108:: @ 82718B3 +EventScript_MoveMrBrineyToRoute109:: @ 82718B3 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN - clearflag FLAG_HIDE_ROUTE_108_MR_BRINEY + clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT end @@ -1211,484 +755,32 @@ EverGrandeCity_HallOfFame_EventScript_ResetEliteFour:: @ 82718CC setvar VAR_ELITE_4_STATE, 0 return -DewfordTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE -FallarborTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE -LavaridgeTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE -MauvilleCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE -OldaleTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE -PetalburgCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE -RustboroCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE -SlateportCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE -VerdanturfTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE +Common_EventScript_UpdateBrineyLocation:: @ 82718DE goto_if_unset FLAG_RECEIVED_POKENAV, Common_EventScript_NopReturn goto_if_set FLAG_DEFEATED_PETALBURG_GYM, Common_EventScript_NopReturn - goto_if_unset FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT, OldaleTown_PokemonCenter_1F_EventScript_27190C - goto_if_unset FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, OldaleTown_PokemonCenter_1F_EventScript_271912 - goto_if_unset FLAG_HIDE_ROUTE_108_MR_BRINEY, OldaleTown_PokemonCenter_1F_EventScript_271918 + goto_if_unset FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT, EventScript_SetBrineyLocation_House + goto_if_unset FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, EventScript_SetBrineyLocation_Dewford + goto_if_unset FLAG_HIDE_ROUTE_109_MR_BRINEY, EventScript_SetBrineyLocation_Route109 return -OldaleTown_PokemonCenter_1F_EventScript_27190C:: @ 827190C +EventScript_SetBrineyLocation_House:: @ 827190C setvar VAR_BRINEY_LOCATION, 1 return -OldaleTown_PokemonCenter_1F_EventScript_271912:: @ 8271912 +EventScript_SetBrineyLocation_Dewford:: @ 8271912 setvar VAR_BRINEY_LOCATION, 2 return -OldaleTown_PokemonCenter_1F_EventScript_271918:: @ 8271918 +EventScript_SetBrineyLocation_Route109:: @ 8271918 setvar VAR_BRINEY_LOCATION, 3 return -BattleFrontier_PokemonCenter_1F_EventScript_27191E:: @ 827191E -DewfordTown_PokemonCenter_1F_EventScript_27191E:: @ 827191E -EverGrandeCity_PokemonCenter_1F_EventScript_27191E:: @ 827191E -EverGrandeCity_PokemonLeague_1F_EventScript_27191E:: @ 827191E -FallarborTown_PokemonCenter_1F_EventScript_27191E:: @ 827191E -FortreeCity_PokemonCenter_1F_EventScript_27191E:: @ 827191E -LavaridgeTown_PokemonCenter_1F_EventScript_27191E:: @ 827191E -LilycoveCity_PokemonCenter_1F_EventScript_27191E:: @ 827191E -MauvilleCity_PokemonCenter_1F_EventScript_27191E:: @ 827191E -MossdeepCity_PokemonCenter_1F_EventScript_27191E:: @ 827191E -OldaleTown_PokemonCenter_1F_EventScript_27191E:: @ 827191E -PacifidlogTown_PokemonCenter_1F_EventScript_27191E:: @ 827191E -PetalburgCity_PokemonCenter_1F_EventScript_27191E:: @ 827191E -RustboroCity_PokemonCenter_1F_EventScript_27191E:: @ 827191E -SlateportCity_PokemonCenter_1F_EventScript_27191E:: @ 827191E -SootopolisCity_PokemonCenter_1F_EventScript_27191E:: @ 827191E -TrainerHill_Entrance_EventScript_27191E:: @ 827191E -VerdanturfTown_PokemonCenter_1F_EventScript_27191E:: @ 827191E - lock - faceplayer - setvar VAR_0x8004, 0 - specialvar VAR_RESULT, CountPlayerTrainerStars - compare VAR_RESULT, 4 - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271A68 - msgbox gUnknown_082726EB, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_27195A - compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271954 - end - -OldaleTown_PokemonCenter_1F_EventScript_271954:: @ 8271954 - message gUnknown_082727DB - return - -OldaleTown_PokemonCenter_1F_EventScript_27195A:: @ 827195A - incrementgamestat 15 - compare VAR_0x8004, 0 - call_if_eq OldaleTown_PokemonCenter_1F_EventScript_271987 - compare VAR_0x8004, 1 - call_if_eq OldaleTown_PokemonCenter_1F_EventScript_27198D - waitmessage - call OldaleTown_PokemonCenter_1F_EventScript_271993 - goto_if_unset FLAG_POKERUS_EXPLAINED, OldaleTown_PokemonCenter_1F_EventScript_271A43 - goto OldaleTown_PokemonCenter_1F_EventScript_2719B1 - end - -OldaleTown_PokemonCenter_1F_EventScript_271987:: @ 8271987 - message gUnknown_08272768 - return - -OldaleTown_PokemonCenter_1F_EventScript_27198D:: @ 827198D - message gUnknown_082729C0 - return - -OldaleTown_PokemonCenter_1F_EventScript_271993:: @ 8271993 - applymovement VAR_0x800B, Common_Movement_WalkInPlaceLeft - waitmovement 0 - dofieldeffect FLDEFF_POKECENTER_HEAL - waitfieldeffect FLDEFF_POKECENTER_HEAL - applymovement VAR_0x800B, Common_Movement_WalkInPlaceDown - waitmovement 0 - special HealPlayerParty - return - -OldaleTown_PokemonCenter_1F_EventScript_2719B1:: @ 82719B1 - specialvar VAR_RESULT, sub_8139ED0 - compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_2719E2 - specialvar VAR_RESULT, sp182_move_string - copyvar VAR_0x8008, VAR_RESULT - compare VAR_0x8008, 0 - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_2719E2 - compare VAR_0x8008, 1 - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271A19 - end - -OldaleTown_PokemonCenter_1F_EventScript_2719E2:: @ 82719E2 - compare VAR_0x8004, 1 - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271A03 - message gUnknown_08272798 - waitmessage - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_271AD0 - waitmovement 0 - message gUnknown_082727DB - return - -OldaleTown_PokemonCenter_1F_EventScript_271A03:: @ 8271A03 - message gUnknown_082729F0 - waitmessage - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_271AD0 - waitmovement 0 - message gUnknown_08272A07 - return - -OldaleTown_PokemonCenter_1F_EventScript_271A19:: @ 8271A19 - goto_if_set FLAG_NURSE_UNION_ROOM_REMINDER, OldaleTown_PokemonCenter_1F_EventScript_2719E2 - msgbox gUnknown_08272798, MSGBOX_DEFAULT - setflag FLAG_NURSE_UNION_ROOM_REMINDER - message OldaleTown_PokemonCenter_1F_Text_278A48 - waitmessage - applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_271AD0 - waitmovement 0 - message gUnknown_082727DB - return - -OldaleTown_PokemonCenter_1F_EventScript_271A43:: @ 8271A43 - specialvar VAR_RESULT, IsPokerusInParty - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_Explain_Pokerus - compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_2719B1 - end - -OldaleTown_PokemonCenter_1F_EventScript_Explain_Pokerus:: @ 8271A5F - message gText_PokerusExplanation - setflag FLAG_POKERUS_EXPLAINED - return - -OldaleTown_PokemonCenter_1F_EventScript_271A68:: @ 8271A68 - goto_if_set FLAG_OLDALE_NURSE_MENTIONS_GOLD_CARD, OldaleTown_PokemonCenter_1F_EventScript_271AAC - setflag FLAG_OLDALE_NURSE_MENTIONS_GOLD_CARD - msgbox gUnknown_082727F5, MSGBOX_DEFAULT - playse SE_PIN - applymovement VAR_0x800B, Common_Movement_ExclamationMark - waitmovement 0 - applymovement VAR_0x800B, Common_Movement_Delay48 - waitmovement 0 - msgbox gUnknown_08272860, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271AC5 - message gUnknown_08272A07 - return - -OldaleTown_PokemonCenter_1F_EventScript_271AAC:: @ 8271AAC - msgbox gUnknown_08272982, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271AC5 - message gUnknown_08272A07 - return - -OldaleTown_PokemonCenter_1F_EventScript_271AC5:: @ 8271AC5 - setvar VAR_0x8004, 1 - goto OldaleTown_PokemonCenter_1F_EventScript_27195A - end - -OldaleTown_PokemonCenter_1F_Movement_271AD0: @ 8271AD0 - nurse_joy_bow - delay_4 - step_end - -Std_ObtainItem:: @ 8271AD3 - giveitem VAR_0x8000, VAR_0x8001 - copyvar VAR_0x8007, VAR_RESULT - call EventScript_271AE3 - return - -EventScript_271AE3:: @ 8271AE3 - bufferitemnameplural 1, VAR_0x8000, VAR_0x8001 - checkitemtype VAR_0x8000 - call EventScript_BufferStdString - compare VAR_0x8007, 1 - call_if_eq EventScript_271B95 - compare VAR_0x8007, 0 - call_if_eq EventScript_271BA9 - return - -EventScript_BufferStdString:: @ 8271B08 - switch VAR_RESULT - case POCKET_ITEMS, EventScript_StdStringItem - case POCKET_KEY_ITEMS, EventScript_StdStringKeyItems - case POCKET_POKE_BALLS, EventScript_StdStringPokeballs - case POCKET_TM_HM, EventScript_StdStringTMHMS - case POCKET_BERRIES, EventScript_StdStringBerries - end - -EventScript_StdStringItem:: @ 8271B45 - bufferstdstring 2, STDSTRING_ITEMS - compare VAR_0x8007, 1 - call_if_eq EventScript_PlayFanfare4 - return - -EventScript_StdStringKeyItems:: @ 8271B55 - bufferstdstring 2, STDSTRING_KEYITEMS - compare VAR_0x8007, 1 - call_if_eq EventScript_PlayFanfare4 - return - -EventScript_StdStringPokeballs:: @ 8271B65 - bufferstdstring 2, STDSTRING_POKEBALLS - compare VAR_0x8007, 1 - call_if_eq EventScript_PlayFanfare4 - return - -EventScript_StdStringTMHMS:: @ 8271B75 - bufferstdstring 2, STDSTRING_TMHMS - compare VAR_0x8007, 1 - call_if_eq EventScript_271BB3 - return - -EventScript_StdStringBerries:: @ 8271B85 - bufferstdstring 2, STDSTRING_BERRIES - compare VAR_0x8007, 1 - call_if_eq EventScript_PlayFanfare4 - return - -EventScript_271B95:: @ 8271B95 - message gUnknown_08272A78 - waitfanfare - msgbox gText_PutItemInPocket, MSGBOX_DEFAULT - setvar VAR_RESULT, 1 - return - -EventScript_271BA9:: @ 8271BA9 - setvar VAR_RESULT, 0 - return - -EventScript_PlayFanfare4:: @ 8271BAF - playfanfare MUS_FANFA4 - return - -EventScript_271BB3:: @ 8271BB3 - playfanfare MUS_ME_WAZA - return - -Std_ObtainDecoration:: @ 8271BB7 - givedecoration VAR_0x8000 - copyvar VAR_0x8007, VAR_RESULT - call EventScript_271BC5 - return - -EventScript_271BC5:: @ 8271BC5 - bufferdecorationname 1, VAR_0x8000 - compare VAR_0x8007, 1 - call_if_eq EventScript_271BE0 - compare VAR_0x8007, 0 - call_if_eq EventScript_271BF7 - return - -EventScript_271BE0:: @ 8271BE0 - playfanfare MUS_FANFA4 - message gUnknown_08272B09 - waitfanfare - msgbox gUnknown_08272B48, MSGBOX_DEFAULT - setvar VAR_RESULT, 1 - return - -EventScript_271BF7:: @ 8271BF7 - setvar VAR_RESULT, 0 - return - -Std_FindItem:: @ 8271BFD - lock - faceplayer - waitse - copyvar VAR_0x8004, VAR_0x8000 - copyvar VAR_0x8005, VAR_0x8001 - checkitemspace VAR_0x8000, VAR_0x8001 - copyvar VAR_0x8007, VAR_RESULT - bufferitemnameplural 1, VAR_0x8000, VAR_0x8001 - checkitemtype VAR_0x8000 - call EventScript_BufferStdString - compare VAR_0x8007, 1 - call_if_eq EventScript_PickItemUp - compare VAR_0x8007, 0 - call_if_eq EventScript_271CA1 - release - return - -EventScript_PickItemUp:: @ 8271C3A - removeobject VAR_LAST_TALKED - giveitem VAR_0x8004, VAR_0x8005 - specialvar VAR_RESULT, BufferTMHMMoveName - copyvar VAR_0x8008, VAR_RESULT - compare VAR_0x8008, 1 - call_if_eq EventScript_271C8F - compare VAR_0x8008, 0 - call_if_eq EventScript_271C9B - waitfanfare - waitmessage - bufferitemnameplural 1, VAR_0x8004, VAR_0x8005 - setvar VAR_0x8004, 12 - special CallBattlePyramidFunction - compare VAR_RESULT, 1 - goto_if_eq EventScript_271C86 - msgbox gText_PutItemInPocket, MSGBOX_DEFAULT - return - -EventScript_271C86:: @ 8271C86 - msgbox gText_PlayerPutItemInBag, MSGBOX_DEFAULT - return - -EventScript_271C8F:: @ 8271C8F - bufferitemnameplural 0, VAR_0x8004, VAR_0x8005 - message gText_PlayerFoundOneItemTwoLines - return - -EventScript_271C9B:: @ 8271C9B - message gText_PlayerFoundOneItem - return - -EventScript_271CA1:: @ 8271CA1 - msgbox gUnknown_08272A78, MSGBOX_DEFAULT - msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT - setvar VAR_RESULT, 0 - return - -EventScript_HiddenItemScript:: @ 8271CB7 - lockall - waitse - giveitem VAR_0x8005, 1 - copyvar VAR_0x8007, VAR_RESULT - bufferitemnameplural 1, VAR_0x8005, 1 - checkitemtype VAR_0x8005 - call EventScript_BufferStdString - compare VAR_0x8007, 1 - goto_if_eq EventScript_271CE8 - compare VAR_0x8007, 0 - goto_if_eq EventScript_271D47 - end - -EventScript_271CE8:: @ 8271CE8 - copyvar VAR_0x8008, VAR_0x8004 - copyvar VAR_0x8004, VAR_0x8005 - specialvar VAR_RESULT, BufferTMHMMoveName - compare VAR_RESULT, 1 - goto_if_eq EventScript_271D0E - compare VAR_RESULT, 0 - goto_if_eq EventScript_271D1F - end - -EventScript_271D0E:: @ 8271D0E - bufferitemnameplural 0, VAR_0x8004, 1 - message gText_PlayerFoundOneItemTwoLines - goto EventScript_271D2A - end - -EventScript_271D1F:: @ 8271D1F - message gText_PlayerFoundOneItem - goto EventScript_271D2A - end - -EventScript_271D2A:: @ 8271D2A - waitmessage - waitfanfare - bufferitemnameplural 1, VAR_0x8004, 1 - copyvar VAR_0x8004, VAR_0x8008 - msgbox gText_PutItemInPocket, MSGBOX_DEFAULT - special sub_80EDCE8 - special SetFlagInVar - releaseall - end - -EventScript_271D47:: @ 8271D47 - msgbox gText_PlayerFoundOneItem, MSGBOX_DEFAULT - msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT - setvar VAR_RESULT, 0 - releaseall - end - -EventScript_271D5E:: @ 8271D5E - lock - faceplayer - msgbox Text_WouldYouLikeToMixRecords, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq EventScript_271D83 - compare VAR_RESULT, 0 - goto_if_eq EventScript_271D89 - goto EventScript_271D89 - -EventScript_271D83:: @ 8271D83 - special RecordMixingPlayerSpotTriggered - waitstate - lock - faceplayer - -EventScript_271D89:: @ 8271D89 - message Text_WouldNotLikeToMixRecords - waitmessage - waitbuttonpress - release - end - -EventScript_PC:: @ 8271D92 - lockall - setvar VAR_0x8004, 0 - special DoPCTurnOnEffect - playse SE_PC_ON - msgbox Text_BootUpPC, MSGBOX_DEFAULT - goto EventScript_271DAC - end - -EventScript_271DAC:: @ 8271DAC - message gText_WhichPCShouldBeAccessed - waitmessage - special ScriptMenu_CreatePCMultichoice - waitstate - goto EventScript_271DBC - end - -EventScript_271DBC:: @ 8271DBC - switch VAR_RESULT - case 0, EventScript_271E0E - case 1, EventScript_271DF9 - case 2, EventScript_271E54 - case 3, EventScript_271E47 - case MULTI_B_PRESSED, EventScript_271E47 - end - -EventScript_271DF9:: @ 8271DF9 - playse SE_PC_LOGIN - msgbox gText_AccessedPlayersPC, MSGBOX_DEFAULT - special PlayerPC - waitstate - goto EventScript_271DAC - end - -EventScript_271E0E:: @ 8271E0E - playse SE_PC_LOGIN - call_if_unset FLAG_SYS_PC_LANETTE, EventScript_271E35 - call_if_set FLAG_SYS_PC_LANETTE, EventScript_271E3E - msgbox gText_StorageSystemOpened, MSGBOX_DEFAULT - special ShowPokemonStorageSystemPC - waitstate - goto EventScript_271DAC - end - -EventScript_271E35:: @ 8271E35 - msgbox gText_AccessedSomeonesPC, MSGBOX_DEFAULT - return - -EventScript_271E3E:: @ 8271E3E - msgbox gText_AccessedLanettesPC, MSGBOX_DEFAULT - return - -EventScript_271E47:: @ 8271E47 - setvar VAR_0x8004, 0 - playse SE_PC_OFF - special DoPCTurnOffEffect - releaseall - end - -EventScript_271E54:: @ 8271E54 - goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_271E47 - playse SE_PC_LOGIN - special AccessHallOfFamePC - waitstate - goto EventScript_271DBC - end + .include "data/scripts/pkmn_center_nurse.inc" + .include "data/scripts/obtain_item.inc" + .include "data/scripts/record_mix.inc" + .include "data/scripts/pc.inc" +@ scripts/notices.inc? signs.inc? See comment about text/notices.inc Common_EventScript_ShowPokemartSign:: @ 8271E6A msgbox gText_PokemartSign, MSGBOX_SIGN end @@ -1703,10 +795,7 @@ Common_ShowEasyChatScreen:: @ 8271E7C fadescreen 0 return -DewfordTown_Gym_EventScript_271E84:: @ 8271E84 -LavaridgeTown_Gym_1F_EventScript_271E84:: @ 8271E84 -MauvilleCity_Gym_EventScript_271E84:: @ 8271E84 -RustboroCity_Gym_EventScript_271E84:: @ 8271E84 +Common_EventScript_ReadyPetalburgGymForBattle:: @ 8271E84 clearflag FLAG_HIDE_PETALBURG_GYM_GREETER setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS return @@ -1718,179 +807,14 @@ DewfordTown_Hall_EventScript_271E8B:: @ 8271E8B special BufferTrendyPhraseString return -DewfordTown_EventScript_271E95:: @ 8271E95 -Route104_MrBrineysHouse_EventScript_271E95:: @ 8271E95 -Route109_EventScript_271E95:: @ 8271E95 +EventScript_BackupMrBrineyLocation:: @ 8271E95 copyvar VAR_0x8008, VAR_BRINEY_LOCATION setvar VAR_BRINEY_LOCATION, 0 return -EventScript_UseSurf:: @ 8271EA0 - checkpartymove MOVE_SURF - compare VAR_RESULT, 6 - goto_if_eq EventScript_CantSurf - bufferpartymonnick 0, VAR_RESULT - setfieldeffectargument 0, VAR_RESULT - lockall - msgbox gText_WantToUseSurf, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_CancelSurf - msgbox gText_PlayerUsedSurf, MSGBOX_DEFAULT - dofieldeffect FLDEFF_USE_SURF - -EventScript_CancelSurf:: @ 8271ED5 - releaseall - -EventScript_CantSurf:: @ 8271ED6 - end - -Common_EventScript_SetupRivalGender:: @ 8271ED7 - checkplayergender - compare VAR_RESULT, MALE - goto_if_eq RustboroCity_EventScript_271EEF - compare VAR_RESULT, FEMALE - goto_if_eq RustboroCity_EventScript_271EF5 - end - -RustboroCity_EventScript_271EEF:: @ 8271EEF - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL - return - -RustboroCity_EventScript_271EF5:: @ 8271EF5 - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL - return - -Common_EventScript_SetupRivalOnBikeGender:: @ 8271EFB - checkplayergender - compare VAR_RESULT, MALE - goto_if_eq LavaridgeTown_EventScript_271F13 - compare VAR_RESULT, FEMALE - goto_if_eq LavaridgeTown_EventScript_271F19 - end - -LavaridgeTown_EventScript_271F13:: @ 8271F13 - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE - return - -LavaridgeTown_EventScript_271F19:: @ 8271F19 - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE - return - -EventScript_271F1F:: @ 8271F1F - checkplayergender - compare VAR_RESULT, MALE - goto_if_eq EventScript_271F37 - compare VAR_RESULT, FEMALE - goto_if_eq EventScript_271F3D - end - -EventScript_271F37:: @ 8271F37 - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL - return - -EventScript_271F3D:: @ 8271F3D - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL - return - -DewfordTown_Gym_EventScript_271F43:: @ 8271F43 -FortreeCity_Gym_EventScript_271F43:: @ 8271F43 -LavaridgeTown_Gym_1F_EventScript_271F43:: @ 8271F43 -MauvilleCity_Gym_EventScript_271F43:: @ 8271F43 -MossdeepCity_Gym_EventScript_271F43:: @ 8271F43 -PetalburgCity_Gym_EventScript_271F43:: @ 8271F43 -RustboroCity_Gym_EventScript_271F43:: @ 8271F43 -SootopolisCity_Gym_1F_EventScript_271F43:: @ 8271F43 - switch VAR_0x8008 - case 1, DewfordTown_Gym_EventScript_271FA1 - case 2, DewfordTown_Gym_EventScript_271FAB - case 3, DewfordTown_Gym_EventScript_271FBE - case 4, DewfordTown_Gym_EventScript_271FCE - case 5, DewfordTown_Gym_EventScript_271FE7 - case 6, DewfordTown_Gym_EventScript_271FFD - case 7, DewfordTown_Gym_EventScript_272010 - case 8, DewfordTown_Gym_EventScript_272035 - end - -DewfordTown_Gym_EventScript_271FA1:: @ 8271FA1 - settrainerflag TRAINER_JOSH - settrainerflag TRAINER_TOMMY - settrainerflag TRAINER_MARC - return - -DewfordTown_Gym_EventScript_271FAB:: @ 8271FAB - settrainerflag TRAINER_TAKAO - settrainerflag TRAINER_JOCELYN - settrainerflag TRAINER_LAURA - settrainerflag TRAINER_BRENDEN - settrainerflag TRAINER_CRISTIAN - settrainerflag TRAINER_LILITH - return - -DewfordTown_Gym_EventScript_271FBE:: @ 8271FBE - settrainerflag TRAINER_KIRK - settrainerflag TRAINER_SHAWN - settrainerflag TRAINER_BEN - settrainerflag TRAINER_VIVIAN - settrainerflag TRAINER_ANGELO - return - -DewfordTown_Gym_EventScript_271FCE:: @ 8271FCE - settrainerflag TRAINER_COLE - settrainerflag TRAINER_AXLE - settrainerflag TRAINER_KEEGAN - settrainerflag TRAINER_GERALD - settrainerflag TRAINER_DANIELLE - settrainerflag TRAINER_JACE - settrainerflag TRAINER_JEFF - settrainerflag TRAINER_ELI - return - -DewfordTown_Gym_EventScript_271FE7:: @ 8271FE7 - settrainerflag TRAINER_RANDALL - settrainerflag TRAINER_PARKER - settrainerflag TRAINER_GEORGE - settrainerflag TRAINER_BERKE - settrainerflag TRAINER_MARY - settrainerflag TRAINER_ALEXIA - settrainerflag TRAINER_JODY - return - -DewfordTown_Gym_EventScript_271FFD:: @ 8271FFD - settrainerflag TRAINER_JARED - settrainerflag TRAINER_FLINT - settrainerflag TRAINER_ASHLEY - settrainerflag TRAINER_EDWARDO - settrainerflag TRAINER_HUMBERTO - settrainerflag TRAINER_DARIUS - return - -DewfordTown_Gym_EventScript_272010:: @ 8272010 - settrainerflag TRAINER_PRESTON - settrainerflag TRAINER_VIRGIL - settrainerflag TRAINER_BLAKE - settrainerflag TRAINER_HANNAH - settrainerflag TRAINER_SAMANTHA - settrainerflag TRAINER_MAURA - settrainerflag TRAINER_SYLVIA - settrainerflag TRAINER_NATE - settrainerflag TRAINER_KATHLEEN - settrainerflag TRAINER_CLIFFORD - settrainerflag TRAINER_MACEY - settrainerflag TRAINER_NICHOLAS - return - -DewfordTown_Gym_EventScript_272035:: @ 8272035 - settrainerflag TRAINER_ANDREA - settrainerflag TRAINER_CRISSY - settrainerflag TRAINER_BRIANNA - settrainerflag TRAINER_CONNIE - settrainerflag TRAINER_BRIDGET - settrainerflag TRAINER_OLIVIA - settrainerflag TRAINER_TIFFANY - settrainerflag TRAINER_BETHANY - settrainerflag TRAINER_ANNIKA - settrainerflag TRAINER_DAPHNE - return + .include "data/scripts/surf.inc" + .include "data/scripts/rival_graphics.inc" + .include "data/scripts/set_gym_trainers.inc" Common_EventScript_ShowBagIsFull:: @ 8272054 msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT @@ -1936,115 +860,19 @@ EventScript_RegionMap:: @ 827208F releaseall end -DewfordTown_EventScript_2720A0:: @ 82720A0 -Route104_EventScript_2720A0:: @ 82720A0 -Route109_EventScript_2720A0:: @ 82720A0 - setflag FLAG_SPECIAL_FLAG_0x4001 +Common_EventScript_PlayBrineysBoatMusic:: @ 82720A0 + setflag FLAG_DONT_TRANSITION_MUSIC playbgm MUS_M_BOAT, 0 return -DewfordTown_EventScript_2720A8:: @ 82720A8 -Route104_EventScript_2720A8:: @ 82720A8 -Route109_EventScript_2720A8:: @ 82720A8 - clearflag FLAG_SPECIAL_FLAG_0x4001 +Common_EventScript_StopBrineysBoatMusic:: @ 82720A8 + clearflag FLAG_DONT_TRANSITION_MUSIC fadedefaultbgm return -LittlerootTown_ProfessorBirchsLab_EventScript_2720AD:: @ 82720AD -Route101_EventScript_2720AD:: @ 82720AD -Route103_EventScript_2720AD:: @ 82720AD - compare VAR_PETALBURG_GYM_STATE, 0 - goto_if_eq Common_EventScript_NopReturn - goto_if_set FLAG_SYS_GAME_CLEAR, Route101_EventScript_27211A - compare VAR_BIRCH_STATE, 0 - call_if_eq Route101_EventScript_27211A - compare VAR_BIRCH_STATE, 1 - call_if_eq Route101_EventScript_27211A - compare VAR_BIRCH_STATE, 2 - call_if_eq Route101_EventScript_272127 - compare VAR_BIRCH_STATE, 3 - call_if_eq Route101_EventScript_272127 - compare VAR_BIRCH_STATE, 4 - call_if_eq Route101_EventScript_272134 - compare VAR_BIRCH_STATE, 5 - call_if_eq Route101_EventScript_272134 - compare VAR_BIRCH_STATE, 6 - call_if_eq Route101_EventScript_27211A - compare VAR_BIRCH_STATE, 7 - call_if_eq Route101_EventScript_27211A - return - -Route101_EventScript_27211A:: @ 827211A - clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH - clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 - setflag FLAG_HIDE_ROUTE_101_BIRCH - setflag FLAG_HIDE_ROUTE_103_BIRCH - return - -Route101_EventScript_272127:: @ 8272127 - clearflag FLAG_HIDE_ROUTE_101_BIRCH - setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH - setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 - setflag FLAG_HIDE_ROUTE_103_BIRCH - return - -Route101_EventScript_272134:: @ 8272134 - clearflag FLAG_HIDE_ROUTE_103_BIRCH - setflag FLAG_HIDE_ROUTE_101_BIRCH - setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH - setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 - return - -LittlerootTown_ProfessorBirchsLab_EventScript_272141:: @ 8272141 -Route101_EventScript_272141:: @ 8272141 -Route103_EventScript_272141:: @ 8272141 - lock - faceplayer - goto_if_unset FLAG_HAS_MATCH_CALL, Route101_EventScript_272155 - goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, Route101_EventScript_1FA2D2 - -Route101_EventScript_272155:: @ 8272155 - msgbox gUnknown_082A5C9C, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq Route101_EventScript_27216F - call Route101_EventScript_272184 - release - end - -Route101_EventScript_27216F:: @ 827216F - msgbox Route101_Text_2A5CEB, MSGBOX_DEFAULT - release - end - -Route101_EventScript_272179:: @ 8272179 - copyvar VAR_0x8004, VAR_0x8009 - special ShowPokedexRatingMessage - waitmessage - waitbuttonpress - return - -EverGrandeCity_ChampionsRoom_EventScript_272184:: @ 8272184 -Route101_EventScript_272184:: @ 8272184 - setvar VAR_0x8004, 0 - specialvar VAR_RESULT, ScriptGetPokedexInfo - copyvar VAR_0x8008, VAR_0x8005 - copyvar VAR_0x8009, VAR_0x8006 - copyvar VAR_0x800A, VAR_RESULT - buffernumberstring 0, VAR_0x8008 - buffernumberstring 1, VAR_0x8009 - msgbox gUnknown_082A5D2C, MSGBOX_DEFAULT - call Route101_EventScript_272179 - compare VAR_0x800A, 0 - goto_if_eq Common_EventScript_NopReturn - setvar VAR_0x8004, 1 - specialvar VAR_RESULT, ScriptGetPokedexInfo - copyvar VAR_0x8008, VAR_0x8005 - copyvar VAR_0x8009, VAR_0x8006 - buffernumberstring 0, VAR_0x8008 - buffernumberstring 1, VAR_0x8009 - msgbox gUnknown_082A633D, MSGBOX_DEFAULT - return + .include "data/scripts/prof_birch.inc" +@ Below could be split as ferry.inc aside from the Rusturf tunnel script Common_EventScript_FerryDepart:: @ 82721E2 delay 60 applymovement VAR_0x8004, Movement_FerryDepart @@ -2061,10 +889,10 @@ Movement_FerryDepart: @ 82721F0 walk_right step_end -PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8 +EventScript_HideMrBriney:: @ 82721F8 setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN - setflag FLAG_HIDE_ROUTE_108_MR_BRINEY + setflag FLAG_HIDE_ROUTE_109_MR_BRINEY setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT setflag FLAG_HIDE_ROUTE_104_MR_BRINEY setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT @@ -2082,792 +910,219 @@ RusturfTunnel_EventScript_272216:: @ 8272216 setflag FLAG_RUSTURF_TUNNEL_OPENED return -EventScript_27222B:: @ 827222B +EventScript_UnusedBoardFerry:: @ 827222B delay 30 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 showobjectat 255, MAP_PETALBURG_CITY delay 30 - applymovement EVENT_OBJ_ID_PLAYER, Movement_27224E + applymovement EVENT_OBJ_ID_PLAYER, Movement_UnusedBoardFerry waitmovement 0 delay 30 return -Movement_27224E: @ 827224E +Movement_UnusedBoardFerry: @ 827224E walk_up step_end -BattleFrontier_OutsideWest_EventScript_272250:: @ 8272250 -BirthIsland_Harbor_EventScript_272250:: @ 8272250 -FarawayIsland_Entrance_EventScript_272250:: @ 8272250 -NavelRock_Harbor_EventScript_272250:: @ 8272250 -SouthernIsland_Exterior_EventScript_272250:: @ 8272250 - compare VAR_FACING, 1 - call_if_eq BattleFrontier_OutsideWest_EventScript_242A21 - compare VAR_FACING, 3 - call_if_eq BattleFrontier_OutsideWest_EventScript_242A2C +Common_EventScript_FerryDepartIsland:: @ 8272250 + compare VAR_FACING, DIR_SOUTH + call_if_eq Ferry_EventScript_DepartIslandSouth + compare VAR_FACING, DIR_WEST + call_if_eq Ferry_EventScript_DepartIslandWest delay 30 hideobjectat 255, MAP_PETALBURG_CITY call Common_EventScript_FerryDepart return -EventScript_272274:: @ 8272274 - lockall - waitse - playmoncry SPECIES_KYOGRE, 2 - waitmoncry - setvar VAR_TEMP_5, 1 - releaseall - end - -EventScript_272283:: @ 8272283 - lockall - setvar VAR_TEMP_1, 1 - goto EventScript_2722A7 - end - -EventScript_27228F:: @ 827228F - lockall - setvar VAR_TEMP_2, 1 - goto EventScript_2722A7 - end - -EventScript_27229B:: @ 827229B - lockall - setvar VAR_TEMP_3, 1 - goto EventScript_2722A7 - end - -EventScript_2722A7:: @ 82722A7 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 - waitstate - releaseall - end + .include "data/scripts/cave_of_origin.inc" + .include "data/scripts/kecleon.inc" -CaveOfOrigin_1F_EventScript_2722C1:: @ 82722C1 -CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1:: @ 82722C1 -CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1:: @ 82722C1 -CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1:: @ 82722C1 - setvar VAR_TEMP_1, 1 - setvar VAR_TEMP_2, 1 - setvar VAR_TEMP_3, 1 - setvar VAR_TEMP_4, 1 - setvar VAR_TEMP_5, 1 - return - -Route120_EventScript_2722DB:: @ 82722DB - lock - faceplayer - setvar VAR_0x8009, 1 - goto Route120_EventScript_272336 - end - -Route120_EventScript_2722E8:: @ 82722E8 - lock - faceplayer - setvar VAR_0x8009, 2 - goto Route120_EventScript_272336 - end - -Route120_EventScript_2722F5:: @ 82722F5 - lock - faceplayer - setvar VAR_0x8009, 3 - goto Route120_EventScript_272336 - end - -Route120_EventScript_272302:: @ 8272302 - lock - faceplayer - setvar VAR_0x8009, 4 - goto Route120_EventScript_272336 - end - -Route120_EventScript_27230F:: @ 827230F - lock - faceplayer - setvar VAR_0x8009, 5 - goto Route120_EventScript_272336 - end - -Route119_EventScript_27231C:: @ 827231C - lock - faceplayer - setvar VAR_0x8009, 6 - goto Route119_EventScript_272336 - end - -Route119_EventScript_272329:: @ 8272329 - lock - faceplayer - setvar VAR_0x8009, 7 - goto Route119_EventScript_272336 - end - -Route119_EventScript_272336:: @ 8272336 -Route120_EventScript_272336:: @ 8272336 - checkitem ITEM_DEVON_SCOPE, 1 - compare VAR_RESULT, 1 - goto_if_eq Route119_EventScript_272350 - msgbox Route119_Text_1F5D00, MSGBOX_DEFAULT - release - end - -Route119_EventScript_272350:: @ 8272350 - msgbox Route119_Text_1F5D23, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq Route119_EventScript_272365 - release - end - -Route119_EventScript_272365:: @ 8272365 - msgbox Route119_Text_1F5D63, MSGBOX_DEFAULT - closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer - waitmovement 0 - applymovement VAR_LAST_TALKED, Route119_Movement_2723C7 - waitmovement 0 - waitse - playmoncry SPECIES_KECLEON, 2 - delay 40 - waitmoncry - setwildbattle SPECIES_KECLEON, 30, ITEM_NONE - setflag FLAG_SYS_CTRL_OBJ_DELETE - dowildbattle - clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 - goto_if_eq Route119_EventScript_2723C1 - compare VAR_RESULT, 4 - goto_if_eq Route119_EventScript_2723C1 - compare VAR_RESULT, 5 - goto_if_eq Route119_EventScript_2723C1 - release - end - -Route119_EventScript_2723C1:: @ 82723C1 - goto Route119_EventScript_27376D - end - -FortreeCity_Movement_2723C7: @ 82723C7 -Route119_Movement_2723C7: @ 82723C7 -Route120_Movement_2723C7: @ 82723C7 - set_visible - delay_4 - set_invisible - delay_4 - set_visible - delay_4 - set_invisible - delay_4 - set_visible - delay_8 - set_invisible - delay_8 - set_visible - delay_8 - set_invisible - delay_8 - set_visible - delay_16 - set_invisible - delay_16 - set_visible - step_end - -Common_EventScript_NameReceivedPokemon:: @ 82723DD +Common_EventScript_NameReceivedPartyMon:: @ 82723DD fadescreen 1 special ChangePokemonNickname waitstate return -FallarborTown_House1_EventScript_2723E4:: @ 82723E4 -GraniteCave_StevensRoom_EventScript_2723E4:: @ 82723E4 -SlateportCity_OceanicMuseum_2F_EventScript_2723E4:: @ 82723E4 +Common_EventScript_PlayerHandedOverTheItem:: @ 82723E4 bufferitemname 0, VAR_0x8004 playfanfare MUS_ME_WAZA - message gUnknown_08273161 + message gText_PlayerHandedOverTheItem waitmessage waitfanfare takeitem VAR_0x8004, 1 return -EverGrandeCity_DrakesRoom_EventScript_2723F8:: @ 82723F8 -EverGrandeCity_GlaciasRoom_EventScript_2723F8:: @ 82723F8 -EverGrandeCity_PhoebesRoom_EventScript_2723F8:: @ 82723F8 -EverGrandeCity_SidneysRoom_EventScript_2723F8:: @ 82723F8 -PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725C6 - waitmovement 0 - playse SE_DOOR - setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 - setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0 - setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1 - setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1 - setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1 - setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1 - setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1 - setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1 - setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1 - setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1 - setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1 - setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1 - special DrawWholeMapView - return - -EverGrandeCity_DrakesRoom_EventScript_272475:: @ 8272475 -EverGrandeCity_GlaciasRoom_EventScript_272475:: @ 8272475 -EverGrandeCity_PhoebesRoom_EventScript_272475:: @ 8272475 -EverGrandeCity_SidneysRoom_EventScript_272475:: @ 8272475 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725BA - waitmovement 0 - playse SE_TRACK_DOOR - setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 - setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 - setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 - setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 - setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 - setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 - special DrawWholeMapView - return - -EverGrandeCity_DrakesRoom_EventScript_2724BC:: @ 82724BC -EverGrandeCity_GlaciasRoom_EventScript_2724BC:: @ 82724BC -EverGrandeCity_PhoebesRoom_EventScript_2724BC:: @ 82724BC -EverGrandeCity_SidneysRoom_EventScript_2724BC:: @ 82724BC - setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 - setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0 - setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 - setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 - setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 - setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 - setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 - setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 - setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1 - setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1 - setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1 - setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1 - setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1 - setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1 - setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1 - setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1 - setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1 - setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1 - return - -EverGrandeCity_DrakesRoom_EventScript_27255F:: @ 827255F -EverGrandeCity_GlaciasRoom_EventScript_27255F:: @ 827255F -EverGrandeCity_PhoebesRoom_EventScript_27255F:: @ 827255F -EverGrandeCity_SidneysRoom_EventScript_27255F:: @ 827255F - setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 - setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 - setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 - setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 - setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 - setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 - return - -SlateportCity_Movement_272596: @ 8272596 - emote_question_mark - step_end - -Common_Movement_ExclamationMark: @ 8272598 - emote_exclamation_mark - step_end - -Common_Movement_Delay48: @ 827259A - delay_16 - delay_16 - delay_16 - step_end - -Common_Movement_FacePlayer: @ 827259E - face_player - step_end - -Common_Movement_FaceAwayPlayer: @ 82725A0 - face_away_player - step_end - -Common_Movement_FaceOriginalDirection: @ 82725A2 - face_original_direction - step_end - -Common_Movement_WalkInPlaceLeft: @ 82725A4 - walk_in_place_fastest_left - step_end - -Common_Movement_WalkInPlaceUp: @ 82725A6 - walk_in_place_fastest_up - step_end - -Common_Movement_WalkInPlaceRight: @ 82725A8 - walk_in_place_fastest_right - step_end - -Common_Movement_WalkInPlaceDown: @ 82725AA - walk_in_place_fastest_down - step_end - -RustboroCity_Movement_2725AC: @ 82725AC - face_right - step_end - -RustboroCity_Movement_2725AE: @ 82725AE - face_left - step_end - -Common_Movement_FaceDown: @ 82725B0 - face_down - step_end - -Common_Movement_FaceUp: @ 82725B2 - face_up - step_end - -BattleFrontier_BattleDomeBattleRoom_Movement_2725B4: @ 82725B4 -MeteorFalls_1F_1R_Movement_2725B4: @ 82725B4 - walk_in_place_down - step_end - -BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6: @ 82725B6 -BattleFrontier_BattleTowerBattleRoom_Movement_2725B6: @ 82725B6 - walk_in_place_left - step_end - -Route121_Movement_2725B8: @ 82725B8 - walk_in_place_right - step_end - -EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA - walk_up - walk_up - walk_up - walk_up - walk_up - walk_up - step_end - -EverGrandeCity_ChampionsRoom_Movement_2725C1: @ 82725C1 - walk_up - walk_up - walk_up - walk_up - step_end - -EverGrandeCity_SidneysRoom_Movement_2725C6: @ 82725C6 - delay_16 - delay_16 - step_end - -Route110_TrickHouseEntrance_Movement_2725C9: @ 82725C9 - walk_up - step_end - -Movement_2725CB:: @ 82725CB - walk_up - walk_up - step_end - -EventScript_PictureBookShelf:: @ 82725CE - msgbox Text_PictureBookShelf, MSGBOX_SIGN - end - -EventScript_BookShelf:: @ 82725D7 - msgbox Text_BookShelf, MSGBOX_SIGN - end - -EventScript_PokemonCenterBookShelf:: @ 82725E0 - msgbox Text_PokemonCenterBookShelf, MSGBOX_SIGN - end - -EventScript_Vase:: @ 82725E9 - msgbox Text_Vase, MSGBOX_SIGN - end - -EventScript_EmptyTrashCan:: @ 82725F2 - msgbox Text_EmptyTrashCan, MSGBOX_SIGN - end - -EventScript_ShopShelf:: @ 82725FB - msgbox Text_ShopShelf, MSGBOX_SIGN - end - -EventScript_Blueprint:: @ 8272604 - msgbox Text_Blueprint, MSGBOX_SIGN - end - -Text_WouldYouLikeToMixRecords: @ 827260D - .string "Would you like to mix records with\n" - .string "other TRAINERS?$" - -Text_WouldNotLikeToMixRecords: @ 8272640 - .string "We hope to see you again!$" - -Text_BootUpPC: @ 827265A - .string "{PLAYER} booted up the PC.$" - -gText_WhichPCShouldBeAccessed:: @ 827266F - .string "Which PC should be accessed?$" - -gText_AccessedSomeonesPC:: @ 827268C - .string "Accessed SOMEONE'S PC.$" - -gText_StorageSystemOpened:: @ 82726A3 - .string "POKéMON Storage System opened.$" - -gText_AccessedPlayersPC:: @ 82726C2 - .string "Accessed {PLAYER}'s PC.$" - -gText_AccessedLanettesPC:: @ 82726D4 - .string "Accessed LANETTE's PC.$" - -gUnknown_082726EB:: @ 82726EB - .string "Hello, and welcome to\nthe POKéMON CENTER.\pWe restore your tired POKéMON\nto full health.\pWould you like to rest your POKéMON?$" - -gUnknown_08272768:: @ 8272768 - .string "Okay, I'll take your POKéMON\nfor a few seconds.$" - -gUnknown_08272798:: @ 8272798 - .string "Thank you for waiting.\pWe've restored your POKéMON\nto full health.$" - -gUnknown_082727DB:: @ 82727DB - .string "We hope to see you again!$" - -gUnknown_082727F5:: @ 82727F5 - .string "Hello, and welcome to\nthe POKéMON CENTER.\pWe restore your tired POKéMON\nto full health.\pWould you like to…$" - -gUnknown_08272860:: @ 8272860 - .string "Th-that card…\nCould it be… The GOLD CARD?!\pOh, the gold color is brilliant!\nThe four stars seem to sparkle!\pI've seen several TRAINERS with\na SILVER CARD before, but, {PLAYER},\lyou're the first TRAINER I've ever\lseen with a GOLD CARD!\pOkay, {PLAYER}, please allow me\nthe honor of resting your POKéMON!$" - -gUnknown_08272982:: @ 8272982 - .string "I'm delighted to see you, {PLAYER}!\nYou want the usual, am I right?$" - -gUnknown_082729C0:: @ 82729C0 - .string "Okay, I'll take your POKéMON\nfor a few seconds.$" - -gUnknown_082729F0:: @ 82729F0 - .string "Thank you for waiting.$" - -gUnknown_08272A07:: @ 8272A07 - .string "We hope to see you again!$" - -gUnknown_08272A21:: @ 8272A21 - .string "Welcome!\pHow may I serve you?$" - -gUnknown_08272A3F:: @ 8272A3F - .string "Please come again!$" - -gUnknown_08272A52:: @ 8272A52 - .string "{PLAYER}{KUN}, welcome!\pWhat can I do for you?$" - -gUnknown_08272A78:: @ 8272A78 - .string "Obtained the {STR_VAR_2}!$" - -gUnknown_08272A89:: @ 8272A89 - .string "The BAG is full…$" - -gText_PutItemInPocket:: @ 8272A9A - .string "{PLAYER} put away the {STR_VAR_2}\nin the {STR_VAR_3} POCKET.$" - -gText_PlayerFoundOneItem:: @ 8272ABF - .string "{PLAYER} found one {STR_VAR_2}!$" - -gText_TooBadBagIsFull:: @ 8272AD0 - .string "Too bad!\nThe BAG is full…$" - -gText_PlayerPutItemInBag:: @ 8272AEA - .string "{PLAYER} put away the {STR_VAR_2}\nin the BAG.$" - -gUnknown_08272B09:: @ 8272B09 - .string "Obtained the {STR_VAR_2}!$" - -gText_NoRoomLeftForAnother:: @ 8272B1A - .string "Too bad! There's no room left for\nanother {STR_VAR_2}…$" - -gUnknown_08272B48:: @ 8272B48 - .string "The {STR_VAR_2} was transferred\nto the PC.$" + .include "data/scripts/elite_four.inc" + .include "data/scripts/movement.inc" + .include "data/scripts/check_furniture.inc" + .include "data/text/record_mix.inc" + .include "data/text/pc.inc" + .include "data/text/pkmn_center_nurse.inc" + .include "data/text/mart_clerk.inc" + .include "data/text/obtain_item.inc" +@ The below and surf.inc could be split into some text/notices.inc gText_PokemartSign:: @ 8272B6A - .string "“Selected items for your convenience!”\nPOKéMON MART$" + .string "“Selected items for your convenience!”\n" + .string "POKéMON MART$" gText_PokemonCenterSign:: @ 8272B9E - .string "“Rejuvenate your tired partners!”\nPOKéMON CENTER$" + .string "“Rejuvenate your tired partners!”\n" + .string "POKéMON CENTER$" -gUnknown_08272BCF:: @ 8272BCF - .string "{STR_VAR_1} might like this program.\n… … … … … … … … … … … … … … … …\pBetter get going!$" +gText_MomOrDadMightLikeThisProgram:: @ 8272BCF + .string "{STR_VAR_1} might like this program.\n" + .string "… … … … … … … … … … … … … … … …\p" + .string "Better get going!$" -gUnknown_08272C1D:: @ 8272C1D - .string "Welcome to LILYCOVE DEPARTMENT STORE.\pWhich floor would you like?$" +gText_WhichFloorWouldYouLike:: @ 8272C1D + .string "Welcome to LILYCOVE DEPARTMENT STORE.\p" + .string "Which floor would you like?$" -gUnknown_08272C5F:: @ 8272C5F - .string "The sandstorm is vicious.\nIt's impossible to keep going.$" +gText_SandstormIsVicious:: @ 8272C5F + .string "The sandstorm is vicious.\n" + .string "It's impossible to keep going.$" gText_SelectWithoutRegisteredItem:: @ 8272C98 - .string "An item in the BAG can be\nregistered to SELECT for easy use.$" - -gUnknown_08272CD5:: @ 8272CD5 - .string "There's an e-mail from POKéMON TRAINER\nSCHOOL.\p… … … … … …\pA POKéMON may learn up to four moves.\pA TRAINER's expertise is tested on the\nmove sets chosen for POKéMON.\p… … … … … …$" + .string "An item in the BAG can be\n" + .string "registered to SELECT for easy use.$" + +gText_PokemonTrainerSchoolEmail:: @ 8272CD5 + .string "There's an e-mail from POKéMON TRAINER\n" + .string "SCHOOL.\p" + .string "… … … … … …\p" + .string "A POKéMON may learn up to four moves.\p" + .string "A TRAINER's expertise is tested on the\n" + .string "move sets chosen for POKéMON.\p" + .string "… … … … … …$" gText_PlayerHouseBootPC:: @ 8272D87 .string "{PLAYER} booted up the PC.$" -gUnknown_08272D9C:: @ 8272D9C +gText_PokeblockLinkCanceled:: @ 8272D9C .string "The link was canceled.$" -gUnknown_08272DB3:: @ 8272DB3 - .string "Want to give a nickname to\nthe {STR_VAR_2} you received?$" +gText_UnusedNicknameReceivedPokemon:: @ 8272DB3 + .string "Want to give a nickname to\n" + .string "the {STR_VAR_2} you received?$" -gUnknown_08272DE3:: @ 8272DE3 - .string "{PLAYER} is out of usable\nPOKéMON!\p{PLAYER} whited out!$" +gText_PlayerWhitedOut:: @ 8272DE3 + .string "{PLAYER} is out of usable\n" + .string "POKéMON!\p{PLAYER} whited out!$" gText_RegisteredTrainerinPokeNav:: @ 8272E0F - .string "Registered {STR_VAR_1} {STR_VAR_2}\nin the POKéNAV.$" - -gUnknown_08272E30:: @ 8272E30 - .string "Do you know the TM SECRET POWER?\pOur group, we love the TM SECRET\nPOWER.\pOne of our members will give it to you.\nCome back and show me if you get it.\pWe'll accept you as a member and sell\nyou good stuff in secrecy.$" + .string "Registered {STR_VAR_1} {STR_VAR_2}\n" + .string "in the POKéNAV.$" + +gText_ComeBackWithSecretPower:: @ 8272E30 + .string "Do you know the TM SECRET POWER?\p" + .string "Our group, we love the TM SECRET\n" + .string "POWER.\p" + .string "One of our members will give it to you.\n" + .string "Come back and show me if you get it.\p" + .string "We'll accept you as a member and sell\n" + .string "you good stuff in secrecy.$" gText_PokerusExplanation:: @ 8272F07 - .string "Your POKéMON may be infected with\nPOKéRUS.\pLittle is known about the POKéRUS\nexcept that they are microscopic life-\lforms that attach to POKéMON.\pWhile infected, POKéMON are said to\ngrow exceptionally well.$" + .string "Your POKéMON may be infected with\n" + .string "POKéRUS.\p" + .string "Little is known about the POKéRUS\n" + .string "except that they are microscopic life-\l" + .string "forms that attach to POKéMON.\p" + .string "While infected, POKéMON are said to\n" + .string "grow exceptionally well.$" .include "data/text/surf.inc" -gUnknown_0827301B:: @ 827301B - .string "It sounded as if a door opened\nsomewhere far away.$" +gText_DoorOpenedFarAway:: @ 827301B + .string "It sounded as if a door opened\n" + .string "somewhere far away.$" -gUnknown_0827304E:: @ 827304E +gText_BigHoleInTheWall:: @ 827304E .string "There is a big hole in the wall.$" -gUnknown_0827306F:: @ 827306F - .string "I'm terribly sorry.\nThe POKéMON WIRELESS CLUB is\lundergoing adjustments now.$" +gText_SorryWirelessClubAdjustments:: @ 827306F + .string "I'm terribly sorry.\n" + .string "The POKéMON WIRELESS CLUB is\l" + .string "undergoing adjustments now.$" -gUnknown_082730BC:: @ 82730BC - .string "It appears to be undergoing\nadjustments…$" +gText_UndergoingAdjustments:: @ 82730BC + .string "It appears to be undergoing\n" + .string "adjustments…$" -gUnknown_082730E5:: @ 82730E5 - .string "I'm terribly sorry. The TRADE CENTER\nis undergoing inspections.$" +@ Unused +gText_SorryTradeCenterInspections:: @ 82730E5 + .string "I'm terribly sorry. The TRADE CENTER\n" + .string "is undergoing inspections.$" -gUnknown_08273125:: @ 8273125 - .string "I'm terribly sorry. The RECORD CORNER\nis under preparation.$" +@ Unused +gText_SorryRecordCornerPreparation:: @ 8273125 + .string "I'm terribly sorry. The RECORD CORNER\n" + .string "is under preparation.$" -gUnknown_08273161:: @ 8273161 - .string "{PLAYER} handed over the\n{STR_VAR_1}.$" +gText_PlayerHandedOverTheItem:: @ 8273161 + .string "{PLAYER} handed over the\n" + .string "{STR_VAR_1}.$" -gUnknown_08273178:: @ 8273178 - .string "Thank you for accessing the\nMYSTERY GIFT System.$" +gText_ThankYouForAccessingMysteryGift:: @ 8273178 + .string "Thank you for accessing the\n" + .string "MYSTERY GIFT System.$" -gText_PlayerFoundOneItemTwoLines:: @ 82731A9 - .string "{PLAYER} found one {STR_VAR_1}\n{STR_VAR_2}!$" +gText_PlayerFoundOneTMHM:: @ 82731A9 + .string "{PLAYER} found one {STR_VAR_1}\n" + .string "{STR_VAR_2}!$" gText_Sudowoodo_Attacked:: @ 82731BD - .string "The weird tree doesn't like the\nWAILMER PAIL!\pThe weird tree attacked!$" + .string "The weird tree doesn't like the\n" + .string "WAILMER PAIL!\p" + .string "The weird tree attacked!$" gText_LegendaryFlewAway:: @ 8273204 .string "The {STR_VAR_1} flew away!$" -gText_PkmnTransferredSomeonesPC:: @ 8273216 - .string "{STR_VAR_2} was transferred to\nSOMEONE'S PC.\pIt was placed in \nBOX “{STR_VAR_1}.”$" - -gText_PkmnTransferredLanettesPC:: @ 8273256 - .string "{STR_VAR_2} was transferred to\nLANETTE'S PC.\pIt was placed in \nBOX “{STR_VAR_1}.”$" - -gText_PkmnBoxSomeonesPCFull:: @ 8273296 - .string "BOX “{STR_VAR_3}” on\nSOMEONE'S PC was full.\p{STR_VAR_2} was transferred to\nBOX “{STR_VAR_1}.”$" - -gText_PkmnBoxLanettesPCFull:: @ 82732D9 - .string "BOX “{STR_VAR_3}” on\nLANETTE'S PC was full.\p{STR_VAR_2} was transferred to\nBOX “{STR_VAR_1}.”$" - -gUnknown_0827331C:: @ 827331C - .string "There's no more room for POKéMON!\pThe POKéMON BOXES are full and\ncan't accept any more!$" - -gText_NicknameThisPokemon:: @ 8273374 - .string "Do you want to give a nickname to\nthis {STR_VAR_1}?$" - -gUnknown_0827339F:: @ 827339F - .string "There is a questionnaire.\nWould you like to fill it out?$" - -gUnknown_082733D8:: @ 82733D8 - .string "Thank you for taking the time to\nfill out our questionnaire.\pYour feedback will be used for\nfuture reference.$" - -gUnknown_08273446:: @ 8273446 - .string "Oh, hello!\nYou know those words?\pThat means you must know about\nthe MYSTERY GIFT.\pFrom now on, you should be\nreceiving MYSTERY GIFTS!$" - -gUnknown_082734CC:: @ 82734CC - .string "Once you save your game, you can\naccess the MYSTERY GIFT.$" - -gUnknown_08273506:: @ 8273506 - .string "Oh, hello!\nYou know those words?\pThat means you must know about\nthe MYSTERY EVENT.$" - -gUnknown_08273559:: @ 8273559 - .string "Once you save your game, you can\naccess the MYSTERY EVENT.$" - -gUnknown_08273594:: @ 8273594 - .string "Thank you for using the MYSTERY\nEVENT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" - -gUnknown_082735F2:: @ 82735F2 - .string "It appears to be for use at\nthe LILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" - -gText_UnusualWeatherEnded_Rain:: @ 8273656 - .string "The massive downpour appears to\nhave stopped…$" - -gText_UnusualWeatherEnded_Sun:: @ 8273684 - .string "The intense sunshine appears to\nhave subsided…$" + .include "data/text/pc_transfer.inc" + .include "data/text/mevent.inc" + .include "data/text/unusual_weather.inc" EventScript_SelectWithoutRegisteredItem:: @ 82736B3 msgbox gText_SelectWithoutRegisteredItem, MSGBOX_SIGN end -EventScript_Poison:: @ 82736BC - lockall - special ExecuteWhiteOut - waitstate - compare VAR_RESULT, 1 - goto_if_eq EventScript_2736D9 - compare VAR_RESULT, 2 - goto_if_eq EventScript_2736F8 - releaseall - end - -EventScript_2736D9:: @ 82736D9 - message gUnknown_08272DE3 - waitmessage - waitbuttonpress - special sub_80B05B4 - waitstate - fadescreen 1 - call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_2736F4 - special sp0C8_whiteout_maybe - waitstate - end - -EventScript_2736F4:: @ 82736F4 - setrespawn HEAL_LOCATION_LAVARIDGE_TOWN - return - -EventScript_2736F8:: @ 82736F8 - message gUnknown_08272DE3 - waitmessage - waitbuttonpress - setvar VAR_0x8004, 16 - special CallBattlePikeFunction - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222 - setvar VAR_0x8004, 12 - special CallBattlePyramidFunction - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - compare VAR_RESULT, 2 - goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - setvar VAR_0x8004, TRAINER_HILL_FUNC_10 - special CallTrainerHillFunction - compare VAR_RESULT, 1 - goto_if_eq TrainerHill_1F_EventScript_2C83C9 - special sub_80B05B4 - waitstate - fadescreen 1 - special sp0C8_whiteout_maybe - waitstate - end + .include "data/scripts/field_poison.inc" Common_EventScript_NopReturn:: @ 827374E return -EventScript_UnusedSetVarResult1:: @ 827374F +@ Unused +EventScript_CableClub_SetVarResult1:: @ 827374F setvar VAR_RESULT, 1 return -OldaleTown_PokemonCenter_2F_EventScript_273755:: @ 8273755 +EventScript_CableClub_SetVarResult0:: @ 8273755 setvar VAR_RESULT, 0 return -BattleFrontier_PokemonCenter_2F_EventScript_27375B:: @ 827375B -DewfordTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B -EverGrandeCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -EverGrandeCity_PokemonLeague_2F_EventScript_27375B:: @ 827375B -FallarborTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B -FortreeCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -LavaridgeTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B -LilycoveCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -MauvilleCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -MossdeepCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -OldaleTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B -PacifidlogTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B -PetalburgCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -RustboroCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -SlateportCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -SootopolisCity_PokemonCenter_2F_EventScript_27375B:: @ 827375B -VerdanturfTown_PokemonCenter_2F_EventScript_27375B:: @ 827375B - call OldaleTown_PokemonCenter_2F_EventScript_27751B +Common_EventScript_UnionRoomAttendant:: @ 827375B + call CableClub_EventScript_UnionRoomAttendant end -BattleFrontier_PokemonCenter_2F_EventScript_273761:: @ 8273761 -DewfordTown_PokemonCenter_2F_EventScript_273761:: @ 8273761 -EverGrandeCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -EverGrandeCity_PokemonLeague_2F_EventScript_273761:: @ 8273761 -FallarborTown_PokemonCenter_2F_EventScript_273761:: @ 8273761 -FortreeCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -LavaridgeTown_PokemonCenter_2F_EventScript_273761:: @ 8273761 -LilycoveCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -MauvilleCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -MossdeepCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -OldaleTown_PokemonCenter_2F_EventScript_273761:: @ 8273761 -PacifidlogTown_PokemonCenter_2F_EventScript_273761:: @ 8273761 -PetalburgCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -RustboroCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -SlateportCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -SootopolisCity_PokemonCenter_2F_EventScript_273761:: @ 8273761 -VerdanturfTown_PokemonCenter_2F_EventScript_273761:: @ 8273761 - call OldaleTown_PokemonCenter_2F_EventScript_277672 +Common_EventScript_WirelessClubAttendant:: @ 8273761 + call CableClub_EventScript_WirelessClubAttendant end -BattleFrontier_PokemonCenter_2F_EventScript_273767:: @ 8273767 -DewfordTown_PokemonCenter_2F_EventScript_273767:: @ 8273767 -EverGrandeCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -EverGrandeCity_PokemonLeague_2F_EventScript_273767:: @ 8273767 -FallarborTown_PokemonCenter_2F_EventScript_273767:: @ 8273767 -FortreeCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -LavaridgeTown_PokemonCenter_2F_EventScript_273767:: @ 8273767 -LilycoveCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -MauvilleCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -MossdeepCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -OldaleTown_PokemonCenter_2F_EventScript_273767:: @ 8273767 -PacifidlogTown_PokemonCenter_2F_EventScript_273767:: @ 8273767 -PetalburgCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -RustboroCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -SlateportCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -SootopolisCity_PokemonCenter_2F_EventScript_273767:: @ 8273767 -VerdanturfTown_PokemonCenter_2F_EventScript_273767:: @ 8273767 - call OldaleTown_PokemonCenter_2F_EventScript_2776A4 +Common_EventScript_DirectCornerAttendant:: @ 8273767 + call CableClub_EventScript_DirectCornerAttendant end -AncientTomb_EventScript_27376D:: @ 827376D -AquaHideout_B1F_EventScript_27376D:: @ 827376D -DesertRuins_EventScript_27376D:: @ 827376D -IslandCave_EventScript_27376D:: @ 827376D -MarineCave_End_EventScript_27376D:: @ 827376D -NewMauville_Inside_EventScript_27376D:: @ 827376D -Route119_EventScript_27376D:: @ 827376D -TerraCave_End_EventScript_27376D:: @ 827376D +Common_EventScript_RemoveStaticPokemon:: @ 827376D fadescreenswapbuffers 1 removeobject VAR_LAST_TALKED fadescreenswapbuffers 0 release end -AncientTomb_EventScript_273776:: @ 8273776 -BirthIsland_Exterior_EventScript_273776:: @ 8273776 -DesertRuins_EventScript_273776:: @ 8273776 -FarawayIsland_Interior_EventScript_273776:: @ 8273776 -IslandCave_EventScript_273776:: @ 8273776 -MarineCave_End_EventScript_273776:: @ 8273776 -NavelRock_Bottom_EventScript_273776:: @ 8273776 -NavelRock_Top_EventScript_273776:: @ 8273776 -SouthernIsland_Interior_EventScript_273776:: @ 8273776 -TerraCave_End_EventScript_273776:: @ 8273776 +Common_EventScript_LegendaryFlewAway:: @ 8273776 fadescreenswapbuffers 1 removeobject VAR_LAST_TALKED fadescreenswapbuffers 0 @@ -2876,1215 +1131,22 @@ TerraCave_End_EventScript_273776:: @ 8273776 release end -LittlerootTown_ProfessorBirchsLab_EventScript_27378B:: @ 827378B -MossdeepCity_StevensHouse_EventScript_27378B:: @ 827378B -Route119_WeatherInstitute_2F_EventScript_27378B:: @ 827378B -RustboroCity_DevonCorp_2F_EventScript_27378B:: @ 827378B - getpartysize - subvar VAR_RESULT, 1 - copyvar VAR_0x8004, VAR_RESULT - return - -LittlerootTown_ProfessorBirchsLab_EventScript_273797:: @ 8273797 -MossdeepCity_StevensHouse_EventScript_273797:: @ 8273797 -Route119_WeatherInstitute_2F_EventScript_273797:: @ 8273797 -RustboroCity_DevonCorp_2F_EventScript_273797:: @ 8273797 - fadescreen 1 - special ChangeBoxPokemonNickname - waitstate - lock - faceplayer - return - -LittlerootTown_ProfessorBirchsLab_EventScript_2737A0:: @ 82737A0 -MossdeepCity_StevensHouse_EventScript_2737A0:: @ 82737A0 -Route119_WeatherInstitute_2F_EventScript_2737A0:: @ 82737A0 -RustboroCity_DevonCorp_2F_EventScript_2737A0:: @ 82737A0 - bufferboxname 0, VAR_PC_BOX_TO_SEND_MON - bufferspeciesname 1, VAR_TEMP_1 - call_if_unset FLAG_SYS_PC_LANETTE, LittlerootTown_ProfessorBirchsLab_EventScript_2737BB - call_if_set FLAG_SYS_PC_LANETTE, LittlerootTown_ProfessorBirchsLab_EventScript_2737E6 - return - -LittlerootTown_ProfessorBirchsLab_EventScript_2737BB:: @ 82737BB - specialvar VAR_RESULT, ShouldShowBoxWasFullMessage - compare VAR_RESULT, 1 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737D4 - msgbox gText_PkmnTransferredSomeonesPC, MSGBOX_DEFAULT - return - -LittlerootTown_ProfessorBirchsLab_EventScript_2737D4:: @ 82737D4 - specialvar VAR_RESULT, GetPCBoxToSendMon - bufferboxname 2, VAR_RESULT - msgbox gText_PkmnBoxSomeonesPCFull, MSGBOX_DEFAULT - return - -LittlerootTown_ProfessorBirchsLab_EventScript_2737E6:: @ 82737E6 - specialvar VAR_RESULT, ShouldShowBoxWasFullMessage - compare VAR_RESULT, 1 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737FF - msgbox gText_PkmnTransferredLanettesPC, MSGBOX_DEFAULT - return - -LittlerootTown_ProfessorBirchsLab_EventScript_2737FF:: @ 82737FF - specialvar VAR_RESULT, GetPCBoxToSendMon - bufferboxname 2, VAR_RESULT - msgbox gText_PkmnBoxLanettesPCFull, MSGBOX_DEFAULT - return - -LittlerootTown_ProfessorBirchsLab_EventScript_273811:: @ 8273811 -MossdeepCity_StevensHouse_EventScript_273811:: @ 8273811 -Route119_WeatherInstitute_2F_EventScript_273811:: @ 8273811 -RustboroCity_DevonCorp_2F_EventScript_273811:: @ 8273811 - msgbox gUnknown_0827331C, MSGBOX_DEFAULT - release - end - -EventScript_Questionnaire:: @ 827381B - lockall - msgbox gUnknown_0827339F, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_2738FD - setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE - call Common_ShowEasyChatScreen - lock - faceplayer - specialvar VAR_0x8008, GetMartEmployeeObjectEventId - compare VAR_0x8004, 1 - goto_if_eq EventScript_27386D - compare VAR_0x8004, 2 - goto_if_eq EventScript_2738B5 - compare VAR_RESULT, 0 - goto_if_eq EventScript_2738FD - compare VAR_RESULT, 1 - goto_if_eq EventScript_2738FF - end - -EventScript_27386D:: @ 827386D - goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF - goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, EventScript_2738FF - applymovement VAR_0x8008, Common_Movement_FaceDown - waitmovement 0 - playse SE_PIN - applymovement VAR_0x8008, Common_Movement_ExclamationMark - waitmovement 0 - applymovement VAR_0x8008, Common_Movement_Delay48 - waitmovement 0 - msgbox gUnknown_08273506, MSGBOX_DEFAULT - setflag FLAG_SYS_MYSTERY_EVENT_ENABLE - msgbox gUnknown_08273559, MSGBOX_DEFAULT - releaseall - end - -EventScript_2738B5:: @ 82738B5 - goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF - goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, EventScript_2738FF - applymovement VAR_0x8008, Common_Movement_FaceDown - waitmovement 0 - playse SE_PIN - applymovement VAR_0x8008, Common_Movement_ExclamationMark - waitmovement 0 - applymovement VAR_0x8008, Common_Movement_Delay48 - waitmovement 0 - msgbox gUnknown_08273446, MSGBOX_DEFAULT - setflag FLAG_SYS_MYSTERY_GIFT_ENABLE - msgbox gUnknown_082734CC, MSGBOX_DEFAULT - releaseall - end - -EventScript_2738FD:: @ 82738FD - releaseall - end - -EventScript_2738FF:: @ 82738FF - applymovement VAR_0x8008, Common_Movement_FaceDown - waitmovement 0 - msgbox gUnknown_082733D8, MSGBOX_DEFAULT - releaseall - end - -UnusualWeather_EventScript_PlaceTilesRoute114North:: @ 8273913 - setmetatile 7, 3, METATILE_Fallarbor_RedCaveEntrance_Top, 1 - setmetatile 7, 4, METATILE_Fallarbor_RedCaveEntrance_Bottom, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute114South:: @ 8273926 - setmetatile 6, 45, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 - setmetatile 6, 46, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute115West:: @ 8273939 - setmetatile 21, 5, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 - setmetatile 21, 6, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute115East:: @ 827394C - setmetatile 36, 9, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 - setmetatile 36, 10, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute116North:: @ 827395F - setmetatile 59, 12, METATILE_General_CaveEntrance_Top, 1 - setmetatile 59, 13, METATILE_General_CaveEntrance_Bottom, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute116South:: @ 8273972 - setmetatile 79, 5, METATILE_General_CaveEntrance_Top, 1 - setmetatile 79, 6, METATILE_General_CaveEntrance_Bottom, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute118East:: @ 8273985 - setmetatile 42, 5, METATILE_General_CaveEntrance_Top, 1 - setmetatile 42, 6, METATILE_General_CaveEntrance_Bottom, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute118West:: @ 8273998 - setmetatile 9, 5, METATILE_General_CaveEntrance_Top, 1 - setmetatile 9, 6, METATILE_General_CaveEntrance_Bottom, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB - setmetatile 10, 28, METATILE_General_RoughWater, 0 - setmetatile 11, 28, METATILE_General_RoughWater, 0 - setmetatile 9, 29, METATILE_General_RoughWater, 0 - setmetatile 10, 29, METATILE_General_RoughDeepWater, 0 - setmetatile 11, 29, METATILE_General_RoughDeepWater, 0 - setmetatile 12, 29, METATILE_General_RoughWater, 0 - setmetatile 9, 30, METATILE_General_RoughWater, 0 - setmetatile 10, 30, METATILE_General_RoughDeepWater, 0 - setmetatile 11, 30, METATILE_General_RoughDeepWater, 0 - setmetatile 12, 30, METATILE_General_RoughWater, 0 - setmetatile 10, 31, METATILE_General_RoughWater, 0 - setmetatile 11, 31, METATILE_General_RoughWater, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18 - setmetatile 20, 53, METATILE_General_RoughWater, 0 - setmetatile 21, 53, METATILE_General_RoughWater, 0 - setmetatile 19, 54, METATILE_General_RoughWater, 0 - setmetatile 20, 54, METATILE_General_RoughDeepWater, 0 - setmetatile 21, 54, METATILE_General_RoughDeepWater, 0 - setmetatile 22, 54, METATILE_General_RoughWater, 0 - setmetatile 19, 55, METATILE_General_RoughWater, 0 - setmetatile 20, 55, METATILE_General_RoughDeepWater, 0 - setmetatile 21, 55, METATILE_General_RoughDeepWater, 0 - setmetatile 22, 55, METATILE_General_RoughWater, 0 - setmetatile 20, 56, METATILE_General_RoughWater, 0 - setmetatile 21, 56, METATILE_General_RoughWater, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85 - setmetatile 8, 16, METATILE_General_RoughWater, 0 - setmetatile 9, 16, METATILE_General_RoughWater, 0 - setmetatile 7, 17, METATILE_General_RoughWater, 0 - setmetatile 8, 17, METATILE_General_RoughDeepWater, 0 - setmetatile 9, 17, METATILE_General_RoughDeepWater, 0 - setmetatile 10, 17, METATILE_General_RoughWater, 0 - setmetatile 7, 18, METATILE_General_RoughWater, 0 - setmetatile 8, 18, METATILE_General_RoughDeepWater, 0 - setmetatile 9, 18, METATILE_General_RoughDeepWater, 0 - setmetatile 10, 18, METATILE_General_RoughWater, 0 - setmetatile 8, 19, METATILE_General_RoughWater, 0 - setmetatile 9, 19, METATILE_General_RoughWater, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2 - setmetatile 53, 18, METATILE_General_RoughWater, 0 - setmetatile 54, 18, METATILE_General_RoughWater, 0 - setmetatile 52, 19, METATILE_General_RoughWater, 0 - setmetatile 53, 19, METATILE_General_RoughDeepWater, 0 - setmetatile 54, 19, METATILE_General_RoughDeepWater, 0 - setmetatile 55, 19, METATILE_General_RoughWater, 0 - setmetatile 52, 20, METATILE_General_RoughWater, 0 - setmetatile 53, 20, METATILE_General_RoughDeepWater, 0 - setmetatile 54, 20, METATILE_General_RoughDeepWater, 0 - setmetatile 55, 20, METATILE_General_RoughWater, 0 - setmetatile 53, 21, METATILE_General_RoughWater, 0 - setmetatile 54, 21, METATILE_General_RoughWater, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F - setmetatile 57, 9, METATILE_General_RoughWater, 0 - setmetatile 58, 9, METATILE_General_RoughWater, 0 - setmetatile 56, 10, METATILE_General_RoughWater, 0 - setmetatile 57, 10, METATILE_General_RoughDeepWater, 0 - setmetatile 58, 10, METATILE_General_RoughDeepWater, 0 - setmetatile 59, 10, METATILE_General_RoughWater, 0 - setmetatile 56, 11, METATILE_General_RoughWater, 0 - setmetatile 57, 11, METATILE_General_RoughDeepWater, 0 - setmetatile 58, 11, METATILE_General_RoughDeepWater, 0 - setmetatile 59, 11, METATILE_General_RoughWater, 0 - setmetatile 57, 12, METATILE_General_RoughWater, 0 - setmetatile 58, 12, METATILE_General_RoughWater, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC - setmetatile 61, 30, METATILE_General_RoughWater, 0 - setmetatile 62, 30, METATILE_General_RoughWater, 0 - setmetatile 60, 31, METATILE_General_RoughWater, 0 - setmetatile 61, 31, METATILE_General_RoughDeepWater, 0 - setmetatile 62, 31, METATILE_General_RoughDeepWater, 0 - setmetatile 63, 31, METATILE_General_RoughWater, 0 - setmetatile 60, 32, METATILE_General_RoughWater, 0 - setmetatile 61, 32, METATILE_General_RoughDeepWater, 0 - setmetatile 62, 32, METATILE_General_RoughDeepWater, 0 - setmetatile 63, 32, METATILE_General_RoughWater, 0 - setmetatile 61, 33, METATILE_General_RoughWater, 0 - setmetatile 62, 33, METATILE_General_RoughWater, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39 - setmetatile 16, 14, METATILE_General_RoughWater, 0 - setmetatile 17, 14, METATILE_General_RoughWater, 0 - setmetatile 15, 15, METATILE_General_RoughWater, 0 - setmetatile 16, 15, METATILE_General_RoughDeepWater, 0 - setmetatile 17, 15, METATILE_General_RoughDeepWater, 0 - setmetatile 18, 15, METATILE_General_RoughWater, 0 - setmetatile 15, 16, METATILE_General_RoughWater, 0 - setmetatile 16, 16, METATILE_General_RoughDeepWater, 0 - setmetatile 17, 16, METATILE_General_RoughDeepWater, 0 - setmetatile 18, 16, METATILE_General_RoughWater, 0 - setmetatile 16, 17, METATILE_General_RoughWater, 0 - setmetatile 17, 17, METATILE_General_RoughWater, 0 - return - -UnusualWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6 - setmetatile 42, 19, METATILE_General_RoughWater, 0 - setmetatile 43, 19, METATILE_General_RoughWater, 0 - setmetatile 41, 20, METATILE_General_RoughWater, 0 - setmetatile 42, 20, METATILE_General_RoughDeepWater, 0 - setmetatile 43, 20, METATILE_General_RoughDeepWater, 0 - setmetatile 44, 20, METATILE_General_RoughWater, 0 - setmetatile 41, 21, METATILE_General_RoughWater, 0 - setmetatile 42, 21, METATILE_General_RoughDeepWater, 0 - setmetatile 43, 21, METATILE_General_RoughDeepWater, 0 - setmetatile 44, 21, METATILE_General_RoughWater, 0 - setmetatile 42, 22, METATILE_General_RoughWater, 0 - setmetatile 43, 22, METATILE_General_RoughWater, 0 - return - -Route105_EventScript_273D13:: @ 8273D13 -Route114_EventScript_273D13:: @ 8273D13 -Route115_EventScript_273D13:: @ 8273D13 -Route116_EventScript_273D13:: @ 8273D13 -Route118_EventScript_273D13:: @ 8273D13 -Route125_EventScript_273D13:: @ 8273D13 -Route127_EventScript_273D13:: @ 8273D13 -Route129_EventScript_273D13:: @ 8273D13 - setflag FLAG_HIDE_MAP_NAME_POPUP - return - -UnusualWeather_StartKyogreWeather:: @ 8273D17 - setweather WEATHER_RAIN_HEAVY - return - -UnusualWeather_StartGroudonWeather:: @ 8273D1B - setweather WEATHER_DROUGHT - return - -UnusualWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F - lockall - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START - goto_if_ge UnusualWeather_EventScript_ShowRainEndedMessage - goto UnusualWeather_EventScript_ShowSunEndedMessage - end - -UnusualWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31 - closemessage - fadescreenswapbuffers 1 - setweather WEATHER_SUNNY - doweather - call UnusualWeather_EventScript_CleanupMapTiles - special DrawWholeMapView - setvar VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE - setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 0 - clearflag FLAG_HIDE_MAP_NAME_POPUP - fadescreenswapbuffers 0 - releaseall - end - -UnusualWeather_EventScript_ShowRainEndedMessage:: @ 8273D51 - msgbox gText_UnusualWeatherEnded_Rain, MSGBOX_DEFAULT - goto UnusualWeather_EventScript_EndEventAndCleanup_2 - end - -UnusualWeather_EventScript_ShowSunEndedMessage:: @ 8273D5F - msgbox gText_UnusualWeatherEnded_Sun, MSGBOX_DEFAULT - goto UnusualWeather_EventScript_EndEventAndCleanup_2 - end - -UnusualWeather_EventScript_CleanupMapTiles:: @ 8273D6D - switch VAR_UNUSUAL_WEATHER_LOCATION - case UNUSUAL_WEATHER_ROUTE_114_NORTH, UnusualWeather_EventScript_CleanupRoute114North - case UNUSUAL_WEATHER_ROUTE_114_SOUTH, UnusualWeather_EventScript_CleanupRoute114South - case UNUSUAL_WEATHER_ROUTE_115_WEST, UnusualWeather_EventScript_CleanupRoute115West - case UNUSUAL_WEATHER_ROUTE_115_EAST, UnusualWeather_EventScript_CleanupRoute115East - case UNUSUAL_WEATHER_ROUTE_116_NORTH, UnusualWeather_EventScript_CleanupRoute116North - case UNUSUAL_WEATHER_ROUTE_116_SOUTH, UnusualWeather_EventScript_CleanupRoute116South - case UNUSUAL_WEATHER_ROUTE_118_EAST, UnusualWeather_EventScript_CleanupRoute118East - case UNUSUAL_WEATHER_ROUTE_118_WEST, UnusualWeather_EventScript_CleanupRoute118West - case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_EventScript_CleanupRoute105North - case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_EventScript_CleanupRoute105South - case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_EventScript_CleanupRoute125West - case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_EventScript_CleanupRoute125East - case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_EventScript_CleanupRoute127North - case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_EventScript_CleanupRoute127South - case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_EventScript_CleanupRoute129West - case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_EventScript_CleanupRoute129East - return - -UnusualWeather_EventScript_CleanupRoute114North:: @ 8273E23 - setmetatile 7, 3, METATILE_Fallarbor_RedRockWall, 1 - setmetatile 7, 4, METATILE_Fallarbor_RedRockWall, 1 - return - -UnusualWeather_EventScript_CleanupRoute114South:: @ 8273E36 - setmetatile 6, 45, METATILE_Fallarbor_BrownRockWall, 1 - setmetatile 6, 46, METATILE_Fallarbor_BrownRockWall, 1 - return - -UnusualWeather_EventScript_CleanupRoute115West:: @ 8273E49 - setmetatile 21, 5, METATILE_Fallarbor_BrownRockWall, 1 - setmetatile 21, 6, METATILE_Fallarbor_BrownRockWall, 1 - return - -UnusualWeather_EventScript_CleanupRoute115East:: @ 8273E5C - setmetatile 36, 9, METATILE_Fallarbor_BrownRockWall, 1 - setmetatile 36, 10, METATILE_Fallarbor_BrownRockWall, 1 - return - -UnusualWeather_EventScript_CleanupRoute116North:: @ 8273E6F - setmetatile 59, 12, METATILE_General_RockWall_RockBase, 1 - setmetatile 59, 13, METATILE_General_RockWall_RockBase, 1 - return - -UnusualWeather_EventScript_CleanupRoute116South:: @ 8273E82 - setmetatile 79, 5, METATILE_General_RockWall_RockBase, 1 - setmetatile 79, 6, METATILE_General_RockWall_RockBase, 1 - return - -UnusualWeather_EventScript_CleanupRoute118East:: @ 8273E95 - setmetatile 42, 5, METATILE_General_RockWall_RockBase, 1 - setmetatile 42, 6, METATILE_General_RockWall_GrassBase, 1 - return - -UnusualWeather_EventScript_CleanupRoute118West:: @ 8273EA8 - setmetatile 9, 5, METATILE_General_RockWall_RockBase, 1 - setmetatile 9, 6, METATILE_General_RockWall_GrassBase, 1 - return - -UnusualWeather_EventScript_CleanupRoute105North:: @ 8273EBB - setmetatile 10, 28, METATILE_General_CalmWater, 0 - setmetatile 11, 28, METATILE_General_CalmWater, 0 - setmetatile 9, 29, METATILE_General_CalmWater, 0 - setmetatile 10, 29, METATILE_General_CalmWater, 0 - setmetatile 11, 29, METATILE_General_CalmWater, 0 - setmetatile 12, 29, METATILE_General_CalmWater, 0 - setmetatile 9, 30, METATILE_General_CalmWater, 0 - setmetatile 10, 30, METATILE_General_CalmWater, 0 - setmetatile 11, 30, METATILE_General_CalmWater, 0 - setmetatile 12, 30, METATILE_General_CalmWater, 0 - setmetatile 10, 31, METATILE_General_CalmWater, 0 - setmetatile 11, 31, METATILE_General_CalmWater, 0 - return - -UnusualWeather_EventScript_CleanupRoute105South:: @ 8273F28 - setmetatile 20, 53, METATILE_General_CalmWater, 0 - setmetatile 21, 53, METATILE_General_CalmWater, 0 - setmetatile 19, 54, METATILE_General_CalmWater, 0 - setmetatile 20, 54, METATILE_General_CalmWater, 0 - setmetatile 21, 54, METATILE_General_CalmWater, 0 - setmetatile 22, 54, METATILE_General_CalmWater, 0 - setmetatile 19, 55, METATILE_General_CalmWater, 0 - setmetatile 20, 55, METATILE_General_CalmWater, 0 - setmetatile 21, 55, METATILE_General_CalmWater, 0 - setmetatile 22, 55, METATILE_General_CalmWater, 0 - setmetatile 20, 56, METATILE_General_CalmWater, 0 - setmetatile 21, 56, METATILE_General_CalmWater, 0 - return - -UnusualWeather_EventScript_CleanupRoute125West:: @ 8273F95 - setmetatile 8, 16, METATILE_General_CalmWater, 0 - setmetatile 9, 16, METATILE_General_CalmWater, 0 - setmetatile 7, 17, METATILE_General_CalmWater, 0 - setmetatile 8, 17, METATILE_General_CalmWater, 0 - setmetatile 9, 17, METATILE_General_CalmWater, 0 - setmetatile 10, 17, METATILE_General_CalmWater, 0 - setmetatile 7, 18, METATILE_General_CalmWater, 0 - setmetatile 8, 18, METATILE_General_CalmWater, 0 - setmetatile 9, 18, METATILE_General_CalmWater, 0 - setmetatile 10, 18, METATILE_General_CalmWater, 0 - setmetatile 8, 19, METATILE_General_CalmWater, 0 - setmetatile 9, 19, METATILE_General_CalmWater, 0 - return - -UnusualWeather_EventScript_CleanupRoute125East:: @ 8274002 - setmetatile 53, 18, METATILE_General_CalmWater, 0 - setmetatile 54, 18, METATILE_General_CalmWater, 0 - setmetatile 52, 19, METATILE_General_CalmWater, 0 - setmetatile 53, 19, METATILE_General_CalmWater, 0 - setmetatile 54, 19, METATILE_General_CalmWater, 0 - setmetatile 55, 19, METATILE_General_CalmWater, 0 - setmetatile 52, 20, METATILE_General_CalmWater, 0 - setmetatile 53, 20, METATILE_General_CalmWater, 0 - setmetatile 54, 20, METATILE_General_CalmWater, 0 - setmetatile 55, 20, METATILE_General_CalmWater, 0 - setmetatile 53, 21, METATILE_General_CalmWater, 0 - setmetatile 54, 21, METATILE_General_CalmWater, 0 - return - -UnusualWeather_EventScript_CleanupRoute127North:: @ 827406F - setmetatile 57, 9, METATILE_General_CalmWater, 0 - setmetatile 58, 9, METATILE_General_CalmWater, 0 - setmetatile 56, 10, METATILE_General_CalmWater, 0 - setmetatile 57, 10, METATILE_General_CalmWater, 0 - setmetatile 58, 10, METATILE_General_CalmWater, 0 - setmetatile 59, 10, METATILE_General_CalmWater, 0 - setmetatile 56, 11, METATILE_General_CalmWater, 0 - setmetatile 57, 11, METATILE_General_CalmWater, 0 - setmetatile 58, 11, METATILE_General_CalmWater, 0 - setmetatile 59, 11, METATILE_General_CalmWater, 0 - setmetatile 57, 12, METATILE_General_CalmWater, 0 - setmetatile 58, 12, METATILE_General_CalmWater, 0 - return - -UnusualWeather_EventScript_CleanupRoute127South:: @ 82740DC - setmetatile 61, 30, METATILE_General_CalmWater, 0 - setmetatile 62, 30, METATILE_General_CalmWater, 0 - setmetatile 60, 31, METATILE_General_CalmWater, 0 - setmetatile 61, 31, METATILE_General_CalmWater, 0 - setmetatile 62, 31, METATILE_General_CalmWater, 0 - setmetatile 63, 31, METATILE_General_CalmWater, 0 - setmetatile 60, 32, METATILE_General_CalmWater, 0 - setmetatile 61, 32, METATILE_General_CalmWater, 0 - setmetatile 62, 32, METATILE_General_CalmWater, 0 - setmetatile 63, 32, METATILE_General_CalmWater, 0 - setmetatile 61, 33, METATILE_General_CalmWater, 0 - setmetatile 62, 33, METATILE_General_CalmWater, 0 - return - -UnusualWeather_EventScript_CleanupRoute129West:: @ 8274149 - setmetatile 16, 14, METATILE_General_CalmWater, 0 - setmetatile 17, 14, METATILE_General_CalmWater, 0 - setmetatile 15, 15, METATILE_General_CalmWater, 0 - setmetatile 16, 15, METATILE_General_CalmWater, 0 - setmetatile 17, 15, METATILE_General_CalmWater, 0 - setmetatile 18, 15, METATILE_General_CalmWater, 0 - setmetatile 15, 16, METATILE_General_CalmWater, 0 - setmetatile 16, 16, METATILE_General_CalmWater, 0 - setmetatile 17, 16, METATILE_General_CalmWater, 0 - setmetatile 18, 16, METATILE_General_CalmWater, 0 - setmetatile 16, 17, METATILE_General_CalmWater, 0 - setmetatile 17, 17, METATILE_General_CalmWater, 0 - return - -UnusualWeather_EventScript_CleanupRoute129East:: @ 82741B6 - setmetatile 42, 19, METATILE_General_CalmWater, 0 - setmetatile 43, 19, METATILE_General_CalmWater, 0 - setmetatile 41, 20, METATILE_General_CalmWater, 0 - setmetatile 42, 20, METATILE_General_CalmWater, 0 - setmetatile 43, 20, METATILE_General_CalmWater, 0 - setmetatile 44, 20, METATILE_General_CalmWater, 0 - setmetatile 41, 21, METATILE_General_CalmWater, 0 - setmetatile 42, 21, METATILE_General_CalmWater, 0 - setmetatile 43, 21, METATILE_General_CalmWater, 0 - setmetatile 44, 21, METATILE_General_CalmWater, 0 - setmetatile 42, 22, METATILE_General_CalmWater, 0 - setmetatile 43, 22, METATILE_General_CalmWater, 0 - return - -UnusualWeather_Underwater_SetupEscapeWarp:: @ 8274223 - switch VAR_UNUSUAL_WEATHER_LOCATION - case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105North - case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105South - case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute125West - case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute125East - case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127North - case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127South - case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute129West - case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute129East - return - -UnusualWeather_Underwater_SetupEscapeWarpRoute105North:: @ 8274281 - setescapewarp MAP_ROUTE105, 255, 11, 29 - return - -UnusualWeather_Underwater_SetupEscapeWarpRoute105South:: @ 827428A - setescapewarp MAP_ROUTE105, 255, 21, 54 - return - -UnusualWeather_Underwater_SetupEscapeWarpRoute125West:: @ 8274293 - setescapewarp MAP_ROUTE125, 255, 9, 17 - return - -UnusualWeather_Underwater_SetupEscapeWarpRoute125East:: @ 827429C - setescapewarp MAP_ROUTE125, 255, 54, 19 - return - -UnusualWeather_Underwater_SetupEscapeWarpRoute127North:: @ 82742A5 - setescapewarp MAP_ROUTE127, 255, 58, 10 - return - -UnusualWeather_Underwater_SetupEscapeWarpRoute127South:: @ 82742AE - setescapewarp MAP_ROUTE127, 255, 62, 31 - return - -UnusualWeather_Underwater_SetupEscapeWarpRoute129West:: @ 82742B7 - setescapewarp MAP_ROUTE129, 255, 17, 15 - return - -UnusualWeather_Underwater_SetupEscapeWarpRoute129East:: @ 82742C0 - setescapewarp MAP_ROUTE129, 255, 43, 20 - return - -Std_RegisteredInMatchCall:: @ 82742C9 - buffertrainerclassname 0, VAR_0x8000 - buffertrainername 1, VAR_0x8000 - closemessage - delay 30 - playfanfare MUS_ME_TORE_EYE - msgbox gText_RegisteredTrainerinPokeNav, MSGBOX_DEFAULT - waitfanfare - closemessage - delay 30 - return - -EventScript_TryGetTrainerScript:: @ 82742E6 - special ShouldTryGetTrainerScript - compare VAR_RESULT, 1 - goto_if_eq EventScript_GotoTrainerScript - releaseall - end - -EventScript_GotoTrainerScript:: @ 82742F6 - gotobeatenscript - releaseall - end - + .include "data/scripts/pc_transfer.inc" + .include "data/scripts/mevent.inc" + .include "data/scripts/unusual_weather.inc" + .include "data/scripts/trainer_script.inc" .include "data/scripts/berry_tree.inc" .include "data/scripts/secret_base.inc" .include "data/scripts/cable_club.inc" + .include "data/text/cable_club.inc" .include "data/scripts/contest_hall.inc" .include "data/text/contest_strings.inc" - -gUnknown_0827E8CE:: @ 827E8CE - .string "Missed turn$" - -gText_LinkStandby4:: @ 827E8DA - .string "Link standby!$" - -gUnknown_0827E8E8:: @ 827E8E8 - .string "The winner is {STR_VAR_1}'s {STR_VAR_2}!\n" - .string "Congratulations!$" - -gUnknown_0827E910:: @ 827E910 - .string "The winner is {STR_VAR_1}'s {STR_VAR_2}!{PAUSE_UNTIL_PRESS}$" - -gUnknown_0827E929:: @ 827E929 - .string "Primary judging: No. {STR_VAR_1}{PAUSE_UNTIL_PRESS}$" - -gUnknown_0827E943:: @ 827E943 - .string "Secondary judging: No. {STR_VAR_1}{PAUSE_UNTIL_PRESS}$" - -gUnknown_0827E95F:: @ 827E95F - .string "Set event: No. {STR_VAR_1}{PAUSE_UNTIL_PRESS}$" - -gUnknown_0827E973:: @ 827E973 - .string "The move used most often:\n" - .string "{STR_VAR_1}{PAUSE_UNTIL_PRESS}$" - -gUnknown_0827E992:: @ 827E992 - .string "The most impressive POKéMON:\n" - .string "{STR_VAR_1}'s {STR_VAR_2}{PAUSE_UNTIL_PRESS}$" - -gUnknown_0827E9B9:: @ 827E9B9 - .string "Set event: No. {STR_VAR_1}{PAUSE_UNTIL_PRESS}$" - -gUnknown_0827E9CD:: @ 827E9CD - .string "A link TV program will not be made\n" - .string "because the TRAINER lost.{PAUSE_UNTIL_PRESS}$" - -gUnknown_0827EA0C:: @ 827EA0C - .string "{STR_VAR_1}\n" - .string "{STR_VAR_2}'s {STR_VAR_3}$" - -gUnknown_0827EA17:: @ 827EA17 - .string "CONTEST$" - -gContestRankNormal:: - .string "NORMAL RANK$" - -gContestRankSuper:: - .string "SUPER RANK$" - -gContestRankHyper:: - .string "HYPER RANK$" - -gContestRankMaster:: - .string "MASTER RANK$" - -gContestLink:: - .string "LINK$" - -gContestCoolness:: - .string "COOLNESS$" - -gContestBeauty:: - .string "BEAUTY$" - -gContestCuteness:: - .string "CUTENESS$" - -gContestSmartness:: - .string "SMARTNESS$" - -gContestToughness:: - .string "TOUGHNESS$" - -gContestPaintingCool1:: - .string "Nonstop supercool--\n" - .string "the inestimable {STR_VAR_1}$" - -gContestPaintingCool2:: - .string "Hey, there!\n" - .string "The good-looking POKéMON {STR_VAR_1}$" - -gContestPaintingCool3:: - .string "The marvelous, wonderful, and\n" - .string "very great {STR_VAR_1}$" - -gContestPaintingBeauty1:: - .string "This century's last Venus--\n" - .string "the beautiful {STR_VAR_1}$" - -gContestPaintingBeauty2:: - .string "{STR_VAR_1}'s dazzling,\n" - .string "glittering smile$" - -gContestPaintingBeauty3:: - .string "POKéMON CENTER's super idol--\n" - .string "the incomparable {STR_VAR_1}$" - -gContestPaintingCute1:: - .string "The lovely and sweet {STR_VAR_1}$" - -gContestPaintingCute2:: - .string "The pretty {STR_VAR_1}'s\n" - .string "winning portrait$" - -gContestPaintingCute3:: - .string "Give us a wink!\n" - .string "The cutie POKéMON {STR_VAR_1}$" - -gContestPaintingSmart1:: - .string "The smartness maestro--\n" - .string "the wise POKéMON {STR_VAR_1}$" - -gContestPaintingSmart2:: - .string "{STR_VAR_1}--the one chosen\n" - .string "above all POKéMON$" - -gContestPaintingSmart3:: - .string "The excellent {STR_VAR_1}'s\n" - .string "moment of elegance$" - -gContestPaintingTough1:: - .string "The powerfully muscular\n" - .string "speedster {STR_VAR_1}$" - -gContestPaintingTough2:: - .string "The strong, stronger, and\n" - .string "strongest {STR_VAR_1}$" - -gContestPaintingTough3:: - .string "The mighty tough\n" - .string "hyper POKéMON {STR_VAR_1}$" - -gTrickHouse_Mechadoll_Oddish:: @ 27ECBC - .string "ODDISH$" - -gTrickHouse_Mechadoll_Poochyena:: @ 27ECC3 - .string "POOCHYENA$" - -gTrickHouse_Mechadoll_Taillow:: @ 27ECCD - .string "TAILLOW$" - -gTrickHouse_Mechadoll_Azurill:: @ 27ECD5 - .string "AZURILL$" - -gTrickHouse_Mechadoll_Lotad:: @ 27ECDD - .string "LOTAD$" - -gTrickHouse_Mechadoll_Wingull:: @ 27ECE3 - .string "WINGULL$" - -gTrickHouse_Mechadoll_Dustox:: @ 27ECEB - .string "DUSTOX$" - -gTrickHouse_Mechadoll_Zubat:: @ 27ECF2 - .string "ZUBAT$" - -gTrickHouse_Mechadoll_Nincada:: @ 27ECF8 - .string "NINCADA$" - -gTrickHouse_Mechadoll_Ralts:: @ 27ED00 - .string "RALTS$" - -gTrickHouse_Mechadoll_Zigzagoon:: @ 27ED06 - .string "ZIGZAGOON$" - -gTrickHouse_Mechadoll_Slakoth:: @ 27ED10 - .string "SLAKOTH$" - -gTrickHouse_Mechadoll_Poochyena2:: @ 27ED18 - .string "POOCHYENA$" - -gTrickHouse_Mechadoll_Shroomish:: @ 27ED22 - .string "SHROOMISH$" - -gTrickHouse_Mechadoll_Zigzagoon2:: @ 27ED2C - .string "ZIGZAGOON$" - -gTrickHouse_Mechadoll_Poochyena3:: @ 27ED36 - .string "POOCHYENA$" - -gTrickHouse_Mechadoll_Zubat2:: @ 27ED40 - .string "ZUBAT$" - -gTrickHouse_Mechadoll_Carvanha:: @ 27ED46 - .string "CARVANHA$" - -gTrickHouse_Mechadoll_BurnHeal:: @ 27ED4F - .string "BURN HEAL$" - -gTrickHouse_Mechadoll_HarborMail:: @ 27ED59 - .string "HARBOR MAIL$" - -gTrickHouse_Mechadoll_SamePrice:: @ 27ED65 - .string "Same price$" - -gTrickHouse_Mechadoll_60Yen:: @ 27ED70 - .string "¥60$" - -gTrickHouse_Mechadoll_55Yen:: @ 27ED74 - .string "¥55$" - -gTrickHouse_Mechadoll_Nothing:: @ 27ED78 - .string "Nothing$" - -gTrickHouse_Mechadoll_CostMore:: @ 27ED80 - .string "They will cost more.$" - -gTrickHouse_Mechadoll_CostLess:: @ 27ED95 - .string "They will cost less.$" - -gTrickHouse_Mechadoll_SamePrice2:: @ 27EDAA - .string "Same price$" - -gTrickHouse_Mechadoll_Male:: @ 27EDB5 - .string "Male$" - -gTrickHouse_Mechadoll_Female:: @ 27EDBA - .string "Female$" - -gTrickHouse_Mechadoll_Neither:: @ 27EDC1 - .string "Neither$" - -gTrickHouse_Mechadoll_ElderlyMen:: @ 27EDC9 - .string "Elderly men$" - -gTrickHouse_Mechadoll_ElderlyLadies:: @ 27EDD5 - .string "Elderly ladies$" - -gTrickHouse_Mechadoll_SameNumber:: @ 27EDE4 - .string "Same number$" - -gTrickHouse_Mechadoll_None:: @ 27EDF0 - .string "None$" - -gTrickHouse_Mechadoll_One:: @ 27EDF5 - .string "1$" - -gTrickHouse_Mechadoll_Two:: @ 27EDF7 - .string "2$" - -gTrickHouse_Mechadoll_Two2:: @ 27EDF9 - .string "2$" - -gTrickHouse_Mechadoll_Three:: @ 27EDFB - .string "3$" - -gTrickHouse_Mechadoll_Four:: @ 27EDFD - .string "4$" - -gTrickHouse_Mechadoll_Six:: @ 27EDFF - .string "6$" - -gTrickHouse_Mechadoll_Seven:: @ 27EE01 - .string "7$" - -gTrickHouse_Mechadoll_Eight:: @ 27EE03 - .string "8$" - -gTrickHouse_Mechadoll_Six2:: @ 27EE05 - .string "6$" - -gTrickHouse_Mechadoll_Seven2:: @ 27EE07 - .string "7$" - -gTrickHouse_Mechadoll_Eight2:: @ 27EE09 - .string "8$" - + .include "data/text/contest_link.inc" + .include "data/text/contest_painting.inc" + .include "data/text/trick_house_mechadolls.inc" .include "data/scripts/tv.inc" .include "data/text/tv.inc" - -BattleFrontier_BattleTowerLobby_EventScript_28C7E9:: @ 828C7E9 -LilycoveCity_ContestLobby_EventScript_28C7E9:: @ 828C7E9 -SlateportCity_OceanicMuseum_1F_EventScript_28C7E9:: @ 828C7E9 -SlateportCity_PokemonFanClub_EventScript_28C7E9:: @ 828C7E9 - special InterviewAfter - incrementgamestat 6 - release - end - -SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0 - setvar VAR_0x8005, 1 - special InterviewBefore - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C879 - copyvar VAR_0x8009, VAR_0x8006 - msgbox SlateportCity_PokemonFanClub_Text_280674, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C827 - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C - end - -SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827 - msgbox SlateportCity_PokemonFanClub_Text_28073B, MSGBOX_DEFAULT - setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW - copyvar VAR_0x8005, VAR_0x8009 - setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_FEMALE - call Common_ShowEasyChatScreen - lock - faceplayer - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C866 - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C - end - -SlateportCity_PokemonFanClub_EventScript_28C85C:: @ 828C85C - msgbox SlateportCity_PokemonFanClub_Text_2805E2, MSGBOX_DEFAULT - release - end - -SlateportCity_PokemonFanClub_EventScript_28C866:: @ 828C866 - msgbox SlateportCity_PokemonFanClub_Text_280789, MSGBOX_DEFAULT - setvar VAR_0x8005, 1 - goto SlateportCity_PokemonFanClub_EventScript_28C7E9 - end - -SlateportCity_PokemonFanClub_EventScript_28C879:: @ 828C879 - msgbox SlateportCity_PokemonFanClub_Text_28062E, MSGBOX_DEFAULT - release - end - -SlateportCity_OceanicMuseum_1F_EventScript_28C883:: @ 828C883 - lock - faceplayer - setvar VAR_0x8005, 2 - special InterviewBefore - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C939 - copyvar VAR_0x8009, VAR_0x8006 - goto_if_set FLAG_OCEANIC_MUSEUM_MET_REPORTER, SlateportCity_OceanicMuseum_1F_EventScript_28C8C8 - setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER - msgbox SlateportCity_OceanicMuseum_1F_Text_2811A0, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C - end - -SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8 - msgbox SlateportCity_OceanicMuseum_1F_Text_28126D, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C - end - -SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7 - msgbox SlateportCity_OceanicMuseum_1F_Text_2812F2, MSGBOX_DEFAULT - setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW - copyvar VAR_0x8005, VAR_0x8009 - setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_MALE - call Common_ShowEasyChatScreen - lock - faceplayer - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C926 - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C - end - -SlateportCity_OceanicMuseum_1F_EventScript_28C91C:: @ 828C91C - msgbox SlateportCity_OceanicMuseum_1F_Text_281367, MSGBOX_DEFAULT - release - end - -SlateportCity_OceanicMuseum_1F_EventScript_28C926:: @ 828C926 - msgbox SlateportCity_OceanicMuseum_1F_Text_2813B9, MSGBOX_DEFAULT - setvar VAR_0x8005, 2 - goto SlateportCity_OceanicMuseum_1F_EventScript_28C7E9 - end - -SlateportCity_OceanicMuseum_1F_EventScript_28C939:: @ 828C939 - msgbox SlateportCity_OceanicMuseum_1F_Text_28144D, MSGBOX_DEFAULT - release - end - -SlateportCity_PokemonFanClub_EventScript_28C943:: @ 828C943 - lock - faceplayer - specialvar VAR_RESULT, sub_80EF8F8 - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C7F0 - setvar VAR_0x8005, 3 - special InterviewBefore - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA4F - copyvar VAR_0x8009, VAR_0x8006 - msgbox SlateportCity_PokemonFanClub_Text_280270, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C98C - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 - end - -SlateportCity_PokemonFanClub_EventScript_28C98C:: @ 828C98C - msgbox SlateportCity_PokemonFanClub_Text_28034F, MSGBOX_DEFAULT - random 3 - copyvar VAR_0x800A, VAR_RESULT - switch VAR_RESULT - case 0, SlateportCity_PokemonFanClub_EventScript_28C9C3 - case 1, SlateportCity_PokemonFanClub_EventScript_28C9D1 - case 2, SlateportCity_PokemonFanClub_EventScript_28C9DF - end - -SlateportCity_PokemonFanClub_EventScript_28C9C3:: @ 828C9C3 - msgbox SlateportCity_PokemonFanClub_Text_280393, MSGBOX_DEFAULT - goto SlateportCity_PokemonFanClub_EventScript_28C9ED - end - -SlateportCity_PokemonFanClub_EventScript_28C9D1:: @ 828C9D1 - msgbox SlateportCity_PokemonFanClub_Text_2803EF, MSGBOX_DEFAULT - goto SlateportCity_PokemonFanClub_EventScript_28C9ED - end - -SlateportCity_PokemonFanClub_EventScript_28C9DF:: @ 828C9DF - msgbox SlateportCity_PokemonFanClub_Text_280454, MSGBOX_DEFAULT - goto SlateportCity_PokemonFanClub_EventScript_28C9ED - end - -SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED - setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_CLUB - copyvar VAR_0x8005, VAR_0x8009 - setvar VAR_0x8006, 0 - call Common_ShowEasyChatScreen - lock - faceplayer - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 - msgbox SlateportCity_PokemonFanClub_Text_2804AC, MSGBOX_DEFAULT - setvar VAR_0x8006, 1 - call Common_ShowEasyChatScreen - lock - faceplayer - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 - msgbox SlateportCity_PokemonFanClub_Text_280523, MSGBOX_DEFAULT - copyvar VAR_0x8007, VAR_0x800A - setvar VAR_0x8005, 3 - goto SlateportCity_PokemonFanClub_EventScript_28C7E9 - end - -SlateportCity_PokemonFanClub_EventScript_28CA45:: @ 828CA45 - msgbox SlateportCity_PokemonFanClub_Text_2805E2, MSGBOX_DEFAULT - release - end - -SlateportCity_PokemonFanClub_EventScript_28CA4F:: @ 828CA4F - msgbox SlateportCity_PokemonFanClub_Text_28062E, MSGBOX_DEFAULT - release - end - -LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59 - lock - faceplayer - goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_28CB21 - setvar VAR_0x8005, 6 - special InterviewBefore - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB21 - copyvar VAR_0x8009, VAR_0x8006 - msgbox LilycoveCity_ContestLobby_Text_27EF15, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_28CA9B - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 - end - -LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B - msgbox LilycoveCity_ContestLobby_Text_27EFE7, MSGBOX_DEFAULT - setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW - copyvar VAR_0x8005, VAR_0x8009 - setvar VAR_0x8006, 0 - call Common_ShowEasyChatScreen - lock - faceplayer - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_28CADA - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 - end - -LilycoveCity_ContestLobby_EventScript_28CAD0:: @ 828CAD0 - msgbox LilycoveCity_ContestLobby_Text_27F1EF, MSGBOX_DEFAULT - release - end - -LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA - setvar VAR_0x8004, 24 - special SetContestCategoryStringVarForInterview - msgbox LilycoveCity_ContestLobby_Text_27F03E, MSGBOX_DEFAULT - setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW - copyvar VAR_0x8005, VAR_0x8009 - setvar VAR_0x8006, 1 - call Common_ShowEasyChatScreen - lock - faceplayer - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 - msgbox LilycoveCity_ContestLobby_Text_27F0EC, MSGBOX_DEFAULT - setflag FLAG_TEMP_2 - setvar VAR_0x8005, 6 - goto LilycoveCity_ContestLobby_EventScript_28C7E9 - end - -LilycoveCity_ContestLobby_EventScript_28CB21:: @ 828CB21 - msgbox LilycoveCity_ContestLobby_Text_27F23F, MSGBOX_DEFAULT - release - end - -LilycoveCity_ContestLobby_EventScript_28CB2B:: @ 828CB2B - compare VAR_LINK_CONTEST_ROOM_STATE, 2 - goto_if_ne LilycoveCity_ContestLobby_EventScript_28CB95 - setvar VAR_0x8005, 6 - special InterviewBefore - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB95 - switch VAR_CONTEST_LOCATION - case 0, LilycoveCity_ContestLobby_EventScript_28CB95 - case 2, LilycoveCity_ContestLobby_EventScript_28CB91 - case 1, LilycoveCity_ContestLobby_EventScript_28CB91 - case 3, LilycoveCity_ContestLobby_EventScript_28CB91 - case 4, LilycoveCity_ContestLobby_EventScript_28CB91 - case 5, LilycoveCity_ContestLobby_EventScript_28CB95 - end - -LilycoveCity_ContestLobby_EventScript_28CB91:: @ 828CB91 - clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER - return - -LilycoveCity_ContestLobby_EventScript_28CB95:: @ 828CB95 - return - -BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96 - lock - faceplayer - goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerLobby_EventScript_28CC7A - setvar VAR_0x8005, 7 - special InterviewBefore - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A - copyvar VAR_0x8009, VAR_0x8006 - msgbox BattleFrontier_BattleTowerLobby_Text_27F704, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CBD8 - compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC2E - end - -BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 - message BattleFrontier_BattleTowerLobby_Text_27F7BA - waitmessage - multichoice 20, 8, MULTI_SATISFACTION, 1 - copyvar VAR_0x8008, VAR_RESULT - compare VAR_RESULT, 0 - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC38 - compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC41 - msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT - setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW - copyvar VAR_0x8005, VAR_0x8009 - call Common_ShowEasyChatScreen - lock - faceplayer - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC4A - compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 - end - -BattleFrontier_BattleTowerLobby_EventScript_28CC2E:: @ 828CC2E - msgbox BattleFrontier_BattleTowerLobby_Text_27F84C, MSGBOX_DEFAULT - release - end - -BattleFrontier_BattleTowerLobby_EventScript_28CC38:: @ 828CC38 - msgbox BattleFrontier_BattleTowerLobby_Text_27F8AE, MSGBOX_DEFAULT - return - -BattleFrontier_BattleTowerLobby_EventScript_28CC41:: @ 828CC41 - msgbox BattleFrontier_BattleTowerLobby_Text_27F921, MSGBOX_DEFAULT - return - -BattleFrontier_BattleTowerLobby_EventScript_28CC4A:: @ 828CC4A - compare VAR_RESULT, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 - msgbox BattleFrontier_BattleTowerLobby_Text_27F9FD, MSGBOX_DEFAULT - setflag FLAG_TEMP_2 - copyvar VAR_0x8004, VAR_0x8008 - setvar VAR_0x8005, 7 - goto BattleFrontier_BattleTowerLobby_EventScript_28C7E9 - end - -BattleFrontier_BattleTowerLobby_EventScript_28CC70:: @ 828CC70 - msgbox BattleFrontier_BattleTowerLobby_Text_27FA6F, MSGBOX_DEFAULT - release - end - -BattleFrontier_BattleTowerLobby_EventScript_28CC7A:: @ 828CC7A - msgbox BattleFrontier_BattleTowerLobby_Text_27FAF3, MSGBOX_DEFAULT - release - end - -BattleFrontier_BattleTowerLobby_EventScript_28CC84:: @ 828CC84 - compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 - setvar VAR_0x8005, 7 - special InterviewBefore - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 - clearflag FLAG_HIDE_BATTLE_TOWER_REPORTER - return - -BattleFrontier_BattleTowerLobby_EventScript_28CCA6:: @ 828CCA6 - setflag FLAG_HIDE_BATTLE_TOWER_REPORTER - return - + .include "data/scripts/interview.inc" .include "data/scripts/gabby_and_ty.inc" .include "data/text/pokemon_news.inc" .include "data/scripts/mauville_man.inc" @@ -4092,2967 +1154,34 @@ BattleFrontier_BattleTowerLobby_EventScript_28CCA6:: @ 828CCA6 .include "data/scripts/item_ball_scripts.inc" .include "data/scripts/mystery_event_club.inc" .include "data/scripts/day_care.inc" - -EventScript_2926F8:: @ 82926F8 - animateflash 1 - setflashradius 1 - end - + .include "data/scripts/flash.inc" .include "data/scripts/players_house.inc" - -EventScript_RunningShoesManual:: @ 8292DE5 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F66, MSGBOX_SIGN - end - .include "data/scripts/pokeblocks.inc" - -gText_SoPretty:: @ 8294295 - .string " so pretty!$" - -gText_SoDarling:: @ 82942A1 - .string " so darling!$" - -gText_SoRelaxed:: @ 82942AE - .string " so relaxed!$" - -gText_SoSunny:: @ 82942BB - .string " so sunny!$" - -gText_SoDesirable:: @ 82942C6 - .string " so desirable!$" - -gText_SoExciting:: @ 82942D5 - .string " so exciting!$" - -gText_SoAmusing:: @ 82942E3 - .string " so amusing!$" - -gText_SoMagical:: @ 82942F0 - .string " so magical!$" - -gOtherText_Is:: @ 82942FD - .string " is$" - -gOtherText_DontYouAgree:: @ 8294301 - .string "\n" - .string "Don't you agree?$" - -gMauvilleManText_ISoWantToGoOnAVacation:: @ 8294313 - .string "I so want to go on a vacation.\n" - .string "Would you happen to know a nice place?$" - -gMauvilleManText_IBoughtCrayonsWith120Colors:: @ 8294359 - .string "I bought crayons with 120 colors!\n" - .string "Don't you think that's nice?$" - -gMauvilleManText_WouldntItBeNiceIfWeCouldFloat:: @ 8294398 - .string "Wouldn't it be nice if we could float\n" - .string "away on a cloud of bubbles?$" - -gMauvilleManText_WhenYouWriteOnASandyBeach:: @ 82943DA - .string "When you write on a sandy beach,\n" - .string "they wash away. It makes me sad.$" - -gMauvilleManText_WhatsTheBottomOfTheSeaLike:: @ 829441C - .string "What's the bottom of the sea like?\n" - .string "Just once I would so love to go!$" - -gMauvilleManText_WhenYouSeeTheSettingSunDoesIt:: @ 8294460 - .string "When you see the setting sun, does it\n" - .string "make you want to go home?$" - -gMauvilleManText_LyingBackInTheGreenGrass:: @ 82944A0 - .string "Lying back in the green grass…\n" - .string "Oh, it's so, so nice!$" - -gMauvilleManText_SecretBasesAreSoWonderful:: @ 82944D5 - .string "SECRET BASES are so wonderful!\n" - .string "Can't you feel the excitement?$" - + .include "data/text/mauville_man.inc" .include "data/text/trainers.inc" - -EventScript_RepelWoreOff:: @ 82A4B2A - msgbox Text_RepelWoreOff, MSGBOX_SIGN - end - -Text_RepelWoreOff: @ 82A4B33 - .string "REPEL's effect wore off…$" - + .include "data/scripts/repel.inc" .include "data/scripts/safari_zone.inc" - -MauvilleCity_GameCorner_EventScript_2A5AB1:: @ 82A5AB1 - checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 - setvar VAR_0x8004, 0 - getpricereduction 2 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_2A5B0D - addvar VAR_0x8004, 128 - goto MauvilleCity_GameCorner_EventScript_2A5B0D - end - -MauvilleCity_GameCorner_EventScript_2A5ADF:: @ 82A5ADF - checkitem ITEM_COIN_CASE, 1 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 - setvar VAR_0x8004, 1 - getpricereduction 2 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_2A5B0D - addvar VAR_0x8004, 128 - goto MauvilleCity_GameCorner_EventScript_2A5B0D - end - -MauvilleCity_GameCorner_EventScript_2A5B0D:: @ 82A5B0D - special PlayRoulette - waitstate - end - - .include "data/text/roulette.inc" + .include "data/scripts/roulette.inc" .include "data/text/pokedex_rating.inc" .include "data/text/lottery_corner.inc" .include "data/text/event_ticket_1.inc" .include "data/text/braille.inc" .include "data/text/berries.inc" .include "data/text/shoal_cave.inc" - -Text_PictureBookShelf: @ 82A81E5 - .string "There's a set of POKéMON picture books.$" - -Text_BookShelf: @ 82A820D - .string "It's filled with all sorts of books.$" - -Text_PokemonCenterBookShelf: @ 82A8232 - .string "POKéMON magazines!\n" - .string "POKéMON PAL…\p" - .string "POKéMON HANDBOOK…\n" - .string "ADORABLE POKéMON…$" - -Text_Vase: @ 82A8276 - .string "This vase looks expensive…\n" - .string "Peered inside…\p" - .string "But, it was empty.$" - -Text_EmptyTrashCan: @ 82A82B3 - .string "It's empty.$" - -Text_ShopShelf: @ 82A82BF - .string "The shelves brim with all sorts of\n" - .string "POKéMON merchandise.$" - -Text_Blueprint: @ 82A82F7 - .string "A blueprint of some sort?\n" - .string "It's too complicated!$" - -GraniteCave_B1F_MapScript2_2A8327: @ 82A8327 -MirageTower_2F_MapScript2_2A8327: @ 82A8327 -MirageTower_3F_MapScript2_2A8327: @ 82A8327 -MtPyre_2F_MapScript2_2A8327: @ 82A8327 -SkyPillar_2F_MapScript2_2A8327: @ 82A8327 -SkyPillar_4F_MapScript2_2A8327: @ 82A8327 - map_script_2 VAR_ICE_STEP_COUNT, 0, EventScript_FallDownHole - .2byte 0 - -GraniteCave_B1F_MapScript1_2A8331: @ 82A8331 -MirageTower_2F_MapScript1_2A8331: @ 82A8331 -MirageTower_3F_MapScript1_2A8331: @ 82A8331 -MtPyre_2F_MapScript1_2A8331: @ 82A8331 - copyvar VAR_ICE_STEP_COUNT, 0x1 - end - -EventScript_FallDownHole:: @ 82A8337 - lockall - delay 20 - applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_B1F_Movement_2A8369 - waitmovement 0 - playse SE_RU_HYUU - delay 60 - warphole MAP_UNDEFINED - waitstate - end - -gUnknown_082A8350:: @ 82A8350 - lockall - delay 20 - applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_B1F_Movement_2A8369 - waitmovement 0 - playse SE_RU_HYUU - delay 60 - special DoFallWarp - waitstate - end - -GraniteCave_B1F_Movement_2A8369: @ 82A8369 - set_invisible - step_end - -LilycoveCity_PokemonCenter_1F_EventScript_2A836B:: @ 82A836B - special Script_GetLilycoveLadyId - switch VAR_RESULT - case LILYCOVE_LADY_QUIZ, LilycoveCity_PokemonCenter_1F_EventScript_2A8554 - case LILYCOVE_LADY_FAVOR, LilycoveCity_PokemonCenter_1F_EventScript_2A8395 - case LILYCOVE_LADY_CONTEST, LilycoveCity_PokemonCenter_1F_EventScript_2A882A - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8395:: @ 82A8395 - lock - faceplayer - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A69, MSGBOX_DEFAULT - specialvar VAR_RESULT, GetFavorLadyState - compare VAR_RESULT, LILYCOVE_LADY_STATE_READY - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83D0 - compare VAR_RESULT, LILYCOVE_LADY_STATE_COMPLETED - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83C6 - compare VAR_RESULT, LILYCOVE_LADY_STATE_PRIZE - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8510 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A83C6:: @ 82A83C6 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8AB1, MSGBOX_DEFAULT - release - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A83D0:: @ 82A83D0 - special BufferFavorLadyRequest - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A7D, MSGBOX_DEFAULT - specialvar VAR_RESULT, HasAnotherPlayerGivenFavorLadyItem - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8435 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83F7 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A83F7:: @ 82A83F7 - special BufferFavorLadyItemName - special BufferFavorLadyPlayerName - specialvar VAR_RESULT, DidFavorLadyLikeItem - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8419 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8427 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8419:: @ 82A8419 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8ACE, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8435 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8427:: @ 82A8427 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8B36, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8435 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8435:: @ 82A8435 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8B69, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A845E - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8454:: @ 82A8454 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BCD, MSGBOX_DEFAULT - release - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A845E:: @ 82A845E - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BAD, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A846C - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A846C:: @ 82A846C - fadescreen 1 - setvar VAR_RESULT, 0 - special Script_FavorLadyOpenBagMenu - waitstate - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A848E - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84AD - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A848E:: @ 82A848E - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BEE, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454 - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A846C - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A84AD:: @ 82A84AD - specialvar VAR_RESULT, Script_DoesFavorLadyLikeItem - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84C9 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84D6 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A84C9:: @ 82A84C9 - special BufferFavorLadyRequest - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8C0F, MSGBOX_DEFAULT - release - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A84D6:: @ 82A84D6 - specialvar VAR_RESULT, IsFavorLadyThresholdMet - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84F2 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84FF - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A84F2:: @ 82A84F2 - special BufferFavorLadyRequest - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8C6F, MSGBOX_DEFAULT - release - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A84FF:: @ 82A84FF - special BufferFavorLadyRequest - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8CC8, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8510 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8510:: @ 82A8510 - setvar VAR_0x8004, 0 - specialvar VAR_0x8004, FavorLadyGetPrize - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8D5D, MSGBOX_DEFAULT - giveitem_std VAR_0x8004 - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8545 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A854F - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8545:: @ 82A8545 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8DBD, MSGBOX_DEFAULT - release - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A854F:: @ 82A854F - special SetFavorLadyState_Complete - release - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8554:: @ 82A8554 - lock - faceplayer - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8E2B, MSGBOX_DEFAULT - specialvar VAR_RESULT, GetQuizLadyState - compare VAR_RESULT, LILYCOVE_LADY_STATE_READY - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8585 - compare VAR_RESULT, LILYCOVE_LADY_STATE_COMPLETED - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85AC - compare VAR_RESULT, LILYCOVE_LADY_STATE_PRIZE - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86EC - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8585:: @ 82A8585 - specialvar VAR_RESULT, GetQuizAuthor - compare VAR_RESULT, QUIZ_AUTHOR_PLAYER - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85C8 - compare VAR_RESULT, QUIZ_AUTHOR_OTHER_PLAYER - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85D2 - compare VAR_RESULT, QUIZ_AUTHOR_LADY - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85E0 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A85AC:: @ 82A85AC - specialvar VAR_RESULT, IsQuizLadyWaitingForChallenger - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8759 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85C8 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A85C8:: @ 82A85C8 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8E4E, MSGBOX_DEFAULT - release - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A85D2:: @ 82A85D2 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EAC, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A85EE - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A85E0:: @ 82A85E0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EAC, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A85EE - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A85EE:: @ 82A85EE - setvar VAR_0x8004, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EEC, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8612 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8612:: @ 82A8612 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F65, MSGBOX_DEFAULT - release - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A861C:: @ 82A861C - special ClearQuizLadyPlayerAnswer - compare VAR_0x8004, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A864C - compare VAR_0x8004, EASY_CHAT_TYPE_QUIZ_ANSWER - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8656 - -LilycoveCity_PokemonCenter_1F_EventScript_2A8635:: @ 82A8635 - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8660 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8689 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A864C:: @ 82A864C - special QuizLadyShowQuizQuestion - waitstate - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8635 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8656:: @ 82A8656 - special QuizLadyGetPlayerAnswer - waitstate - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8635 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8660:: @ 82A8660 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F7E, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A867F - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A867F:: @ 82A867F - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F9A, MSGBOX_DEFAULT - release - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8689:: @ 82A8689 - special SetQuizLadyState_Complete - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F4D, MSGBOX_DEFAULT - specialvar VAR_RESULT, IsQuizAnswerCorrect - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86C7 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86B0 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A86B0:: @ 82A86B0 - playse SE_SEIKAI - delay 10 - playse SE_SEIKAI - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8FC7, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A86EC - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A86C7:: @ 82A86C7 - special BufferQuizCorrectAnswer - special BufferQuizPrizeName - playse SE_HAZURE - delay 10 - playse SE_HAZURE - msgbox LilycoveCity_PokemonCenter_1F_Text_2A90A5, MSGBOX_DEFAULT - msgbox LilycoveCity_PokemonCenter_1F_Text_2A90CD, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8759 - end - -@ VAR_RESULT is essentially ignored, both jumps are identical -LilycoveCity_PokemonCenter_1F_EventScript_2A86EC:: @ 82A86EC - specialvar VAR_RESULT, BufferQuizAuthorNameAndCheckIfLady - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8708 - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8716 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8708:: @ 82A8708 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9007, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8724 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8716:: @ 82A8716 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9007, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8724 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8724:: @ 82A8724 - setvar VAR_0x8005, 0 - special BufferQuizPrizeItem - special SetQuizLadyState_Complete - giveitem_std VAR_0x8005 - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A874C - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8759 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A874C:: @ 82A874C - msgbox LilycoveCity_PokemonCenter_1F_Text_2A906A, MSGBOX_DEFAULT - special SetQuizLadyState_GivePrize - release - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8759:: @ 82A8759 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A90FB, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8785 - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8778:: @ 82A8778 - special QuizLadyPickNewQuestion - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9131, MSGBOX_DEFAULT - release - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8785:: @ 82A8785 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9153, MSGBOX_DEFAULT - -LilycoveCity_PokemonCenter_1F_EventScript_2A878D:: @ 82A878D - fadescreen 1 - setvar VAR_RESULT, 0 - special Script_QuizLadyOpenBagMenu - waitstate - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87AF - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87CE - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A87AF:: @ 82A87AF - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9212, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A878D - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A87CE:: @ 82A87CE - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9270, MSGBOX_DEFAULT - special ClearQuizLadyQuestionAndAnswer - special ClearQuizLadyPlayerAnswer - setvar VAR_0x8004, EASY_CHAT_TYPE_QUIZ_QUESTION - -LilycoveCity_PokemonCenter_1F_EventScript_2A87E1:: @ 82A87E1 - fadescreen 1 - special QuizLadySetCustomQuestion - waitstate - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87F8 - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8817 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A87F8:: @ 82A87F8 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A92D3, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87E1 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8817:: @ 82A8817 - special QuizLadyTakePrizeForCustomQuiz - special QuizLadyRecordCustomQuizData - special QuizLadySetWaitingForChallenger - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9336, MSGBOX_DEFAULT - release - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A882A:: @ 82A882A - lock - faceplayer - msgbox LilycoveCity_PokemonCenter_1F_Text_2A93A7, MSGBOX_DEFAULT - specialvar VAR_RESULT, HasPlayerGivenContestLadyPokeblock - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8850 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A886C - end - -@ Redundant with above script, VAR_RESULT will always be 0 here -LilycoveCity_PokemonCenter_1F_EventScript_2A8850:: @ 82A8850 - specialvar VAR_RESULT, ShouldContestLadyShowGoOnAir - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8876 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A886C - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A886C:: @ 82A886C - msgbox LilycoveCity_PokemonCenter_1F_Text_2A93D6, MSGBOX_DEFAULT - release - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8876:: @ 82A8876 - special Script_BufferContestLadyCategoryAndMonName - msgbox LilycoveCity_PokemonCenter_1F_Text_2A93F4, MSGBOX_DEFAULT - checkitem ITEM_POKEBLOCK_CASE, 1 - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A89AE - msgbox LilycoveCity_PokemonCenter_1F_Text_2A94E8, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88BA - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A88B0:: @ 82A88B0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9556, MSGBOX_DEFAULT - release - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A88BA:: @ 82A88BA - fadescreen 1 - special OpenPokeblockCaseForContestLady - waitstate - compare VAR_RESULT, 65535 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88D7 - compare VAR_RESULT, 65535 - goto_if_ne LilycoveCity_PokemonCenter_1F_EventScript_2A88F6 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A88D7:: @ 82A88D7 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9537, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0 - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88BA - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A88F6:: @ 82A88F6 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9571, MSGBOX_DEFAULT - special SetContestLadyGivenPokeblock - special GetContestLadyMonSpecies - goto LilycoveCity_PokemonCenter_1F_EventScript_2A890A - end - -@ VAR_0x8004 here is the return value from GivePokeblockToContestLady -LilycoveCity_PokemonCenter_1F_EventScript_2A890A:: @ 82A890A - applymovement 4, LilycoveCity_PokemonCenter_1F_Movement_2A89B8 - waitmovement 0 - delay 60 - applymovement 5, LilycoveCity_PokemonCenter_1F_Movement_2A89BB - waitmovement 0 - delay 60 - waitse - playmoncry VAR_0x8005, 0 - delay 120 - waitmoncry - compare VAR_0x8004, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A893F - goto LilycoveCity_PokemonCenter_1F_EventScript_2A894C - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A893F:: @ 82A893F - applymovement 5, LilycoveCity_PokemonCenter_1F_Movement_2A89C2 - waitmovement 0 - delay 60 - -@ VAR_0x8004 here is the return value from GivePokeblockToContestLady -LilycoveCity_PokemonCenter_1F_EventScript_2A894C:: @ 82A894C - applymovement 4, LilycoveCity_PokemonCenter_1F_Movement_2A89C0 - waitmovement 0 - delay 60 - compare VAR_0x8004, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8970 - compare VAR_0x8004, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A897E - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8970:: @ 82A8970 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A95AD, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A898F - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A897E:: @ 82A897E - special Script_BufferContestLadyCategoryAndMonName - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9605, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A898F - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A898F:: @ 82A898F - specialvar VAR_RESULT, ShouldContestLadyShowGoOnAir - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A89A1 - release - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A89A1:: @ 82A89A1 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9669, MSGBOX_DEFAULT - special PutLilycoveContestLadyShowOnTheAir - release - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A89AE:: @ 82A89AE - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9451, MSGBOX_DEFAULT - release - end - -LilycoveCity_PokemonCenter_1F_Movement_2A89B8: @ 82A89B8 - face_right - delay_8 - step_end - -LilycoveCity_PokemonCenter_1F_Movement_2A89BB: @ 82A89BB - face_left - delay_8 - step_end - -LilycoveCity_PokemonCenter_1F_Movement_2A89BE: @ 82A89BE - face_down - step_end - -LilycoveCity_PokemonCenter_1F_Movement_2A89C0: @ 82A89C0 - face_player - step_end - -LilycoveCity_PokemonCenter_1F_Movement_2A89C2: @ 82A89C2 - disable_jump_landing_ground_effect - jump_in_place_left - disable_jump_landing_ground_effect - jump_in_place_left - step_end - -LilycoveCity_PokemonCenter_1F_EventScript_2A89C7:: @ 82A89C7 - specialvar VAR_RESULT, GetContestLadyCategory - special Script_BufferContestLadyCategoryAndMonName - special GetContestLadyMonSpecies - compare VAR_RESULT, CONTEST_CATEGORY_COOL - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A0A - compare VAR_RESULT, CONTEST_CATEGORY_BEAUTY - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A1D - compare VAR_RESULT, CONTEST_CATEGORY_CUTE - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A30 - compare VAR_RESULT, CONTEST_CATEGORY_SMART - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A43 - compare VAR_RESULT, CONTEST_CATEGORY_TOUGH - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A56 - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8A0A:: @ 82A8A0A - lock - faceplayer - waitse - playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A96DA, MSGBOX_DEFAULT - waitmoncry - release - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8A1D:: @ 82A8A1D - lock - faceplayer - waitse - playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A970E, MSGBOX_DEFAULT - waitmoncry - release - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8A30:: @ 82A8A30 - lock - faceplayer - waitse - playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A96F6, MSGBOX_DEFAULT - waitmoncry - release - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8A43:: @ 82A8A43 - lock - faceplayer - waitse - playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A96E6, MSGBOX_DEFAULT - waitmoncry - release - end - -LilycoveCity_PokemonCenter_1F_EventScript_2A8A56:: @ 82A8A56 - lock - faceplayer - waitse - playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9703, MSGBOX_DEFAULT - waitmoncry - release - end - -LilycoveCity_PokemonCenter_1F_Text_2A8A69: @ 82A8A69 - .string "I'm the FAVOR LADY…$" - -LilycoveCity_PokemonCenter_1F_Text_2A8A7D: @ 82A8A7D - .string "I've recently developed an obsession\n" - .string "for {STR_VAR_1} things…$" - -LilycoveCity_PokemonCenter_1F_Text_2A8AB1: @ 82A8AB1 - .string "Oh…\n" - .string "Thank you for last time…$" - -LilycoveCity_PokemonCenter_1F_Text_2A8ACE: @ 82A8ACE - .string "Before, I think it was {STR_VAR_3}…\p" - .string "{STR_VAR_3} gave me one {STR_VAR_2},\n" - .string "saying it was {STR_VAR_1}.\p" - .string "But it wasn't {STR_VAR_1}.\n" - .string "Not in the least bit.$" - -LilycoveCity_PokemonCenter_1F_Text_2A8B36: @ 82A8B36 - .string "Before, {STR_VAR_3} gave me a very\n" - .string "{STR_VAR_1} {STR_VAR_2}.\p" - .string "I cherish it now.$" - -LilycoveCity_PokemonCenter_1F_Text_2A8B69: @ 82A8B69 - .string "Listen, if you have anything that\n" - .string "is {STR_VAR_1}, will you share it\l" - .string "with me?$" - -LilycoveCity_PokemonCenter_1F_Text_2A8BAD: @ 82A8BAD - .string "…Really?\n" - .string "What will you give me?$" - -LilycoveCity_PokemonCenter_1F_Text_2A8BCD: @ 82A8BCD - .string "Is that so?\n" - .string "Then, it's good-bye…$" - -LilycoveCity_PokemonCenter_1F_Text_2A8BEE: @ 82A8BEE - .string "Oh…\n" - .string "You're not willing to share?$" - -LilycoveCity_PokemonCenter_1F_Text_2A8C0F: @ 82A8C0F - .string "Oh?\n" - .string "That {STR_VAR_2} is {STR_VAR_1}?\p" - .string "…Oh, is that right?\p" - .string "Well, I owe you a thanks anyway.\n" - .string "I'll try to cherish it…$" - -LilycoveCity_PokemonCenter_1F_Text_2A8C6F: @ 82A8C6F - .string "Oh…\p" - .string "That's a quite {STR_VAR_1}\n" - .string "{STR_VAR_2}…\p" - .string "Isn't it nice?\n" - .string "It's so dreamy…\p" - .string "Thank you…\n" - .string "I will cherish this…$" - -LilycoveCity_PokemonCenter_1F_Text_2A8CC8: @ 82A8CC8 - .string "…Oh, oh, oh…\p" - .string "This is amazing!\n" - .string "This really is {STR_VAR_1}!\p" - .string "I never knew that one {STR_VAR_2}\n" - .string "could be this {STR_VAR_1}!\p" - .string "Thank you!\p" - .string "I will treasure this for the rest\n" - .string "of my life!$" - -LilycoveCity_PokemonCenter_1F_Text_2A8D5D: @ 82A8D5D - .string "I'll give you this wonderful item in\n" - .string "return for your fabulous gift.\p" - .string "I hope you will cherish it…$" - -LilycoveCity_PokemonCenter_1F_Text_2A8DBD: @ 82A8DBD - .string "Oh, you can't have it if you don't have\n" - .string "the space for it.\p" - .string "Please come see me when you get\n" - .string "your BAG organized…$" - -LilycoveCity_PokemonCenter_1F_Text_2A8E2B: @ 82A8E2B - .string "I'm the QUIZ LADY!\n" - .string "I love quizzes!$" - -LilycoveCity_PokemonCenter_1F_Text_2A8E4E: @ 82A8E4E - .string "Oh?\p" - .string "I'm waiting for a challenger to answer\n" - .string "the quiz you made.\p" - .string "We can chat another time, okay?$" - -LilycoveCity_PokemonCenter_1F_Text_2A8EAC: @ 82A8EAC - .string "I'm waiting for someone to challenge\n" - .string "a quiz this {STR_VAR_1} thought up!$" - -LilycoveCity_PokemonCenter_1F_Text_2A8EEC: @ 82A8EEC - .string "If you answer correctly, you can win\n" - .string "fabulous prizes!\p" - .string "Would you like to take the quiz\n" - .string "challenge?$" - -LilycoveCity_PokemonCenter_1F_Text_2A8F4D: @ 82A8F4D - .string "… … … … … …\n" - .string "… … … … … …$" - -LilycoveCity_PokemonCenter_1F_Text_2A8F65: @ 82A8F65 - .string "Oh, how boring!\n" - .string "Bye-bye!$" - -LilycoveCity_PokemonCenter_1F_Text_2A8F7E: @ 82A8F7E - .string "Awww!\n" - .string "You're going to quit?$" - -LilycoveCity_PokemonCenter_1F_Text_2A8F9A: @ 82A8F9A - .string "Please take the quiz challenge\n" - .string "another time!$" - -LilycoveCity_PokemonCenter_1F_Text_2A8FC7: @ 82A8FC7 - .string "You're amazing! You've got it right!\n" - .string "You're one sharp customer!$" - -LilycoveCity_PokemonCenter_1F_Text_2A9007: @ 82A9007 - .string "Congratulations!\n" - .string "You've got the quiz right!\p" - .string "You've won a prize provided by\n" - .string "{STR_VAR_1}!$" - -LilycoveCity_PokemonCenter_1F_Text_2A9056: @ 82A9056 - .string "{STR_VAR_1} received\n" - .string "one {STR_VAR_2}!$" - -LilycoveCity_PokemonCenter_1F_Text_2A906A: @ 82A906A - .string "Oh? Your BAG is filled up!\n" - .string "Come see me when you have room.$" - -LilycoveCity_PokemonCenter_1F_Text_2A90A5: @ 82A90A5 - .string "Hmm… Wrong!\n" - .string "The correct answer is “{STR_VAR_3}”!$" - -LilycoveCity_PokemonCenter_1F_Text_2A90CD: @ 82A90CD - .string "Too bad!\p" - .string "I get to keep the quiz prize\n" - .string "{STR_VAR_1} now!$" - -LilycoveCity_PokemonCenter_1F_Text_2A90FB: @ 82A90FB - .string "Listen, listen!\n" - .string "Would you like to make your own quiz?$" - -LilycoveCity_PokemonCenter_1F_Text_2A9131: @ 82A9131 - .string "Oh, I see…\n" - .string "Well, maybe next time!$" - -LilycoveCity_PokemonCenter_1F_Text_2A9153: @ 82A9153 - .string "Okay, the first thing you have to do\n" - .string "is pick the prize for the person that\l" - .string "answers your quiz correctly.\p" - .string "But beware, if the person taking\n" - .string "the quiz can't get it right, I get to\l" - .string "keep the prize!$" - -LilycoveCity_PokemonCenter_1F_Text_2A9212: @ 82A9212 - .string "If you don't choose a prize,\n" - .string "your quiz can't be made.\p" - .string "Are you going to quit making\n" - .string "your quiz?$" - -LilycoveCity_PokemonCenter_1F_Text_2A9270: @ 82A9270 - .string "Oh, how nice!\n" - .string "That's a wonderful prize!\p" - .string "Next, you need to write your quiz\n" - .string "question and its answer.$" - -LilycoveCity_PokemonCenter_1F_Text_2A92D3: @ 82A92D3 - .string "Are you going to quit writing\n" - .string "your quiz question?$" - -LilycoveCity_PokemonCenter_1F_Text_2A9305: @ 82A9305 - .string "Are you going to quit choosing\n" - .string "your quiz answer?$" - -LilycoveCity_PokemonCenter_1F_Text_2A9336: @ 82A9336 - .string "Thank you!\n" - .string "You've put together a nice quiz.\p" - .string "I'll go look for someone who'll take\n" - .string "your quiz challenge right away.$" - -LilycoveCity_PokemonCenter_1F_Text_2A93A7: @ 82A93A7 - .string "I'm the CONTEST LADY!\n" - .string "I sure do love CONTESTS!$" - -LilycoveCity_PokemonCenter_1F_Text_2A93D6: @ 82A93D6 - .string "Thanks for your {POKEBLOCK} before!$" - -LilycoveCity_PokemonCenter_1F_Text_2A93F4: @ 82A93F4 - .string "This is my friend {STR_VAR_1}!\n" - .string "It's the epitome of {STR_VAR_2}!\p" - .string "But I think that it will display\n" - .string "even more {STR_VAR_2}!$" - -LilycoveCity_PokemonCenter_1F_Text_2A9451: @ 82A9451 - .string "So, I need your help!\p" - .string "Please, may I have one {POKEBLOCK}?\n" - .string "All I'm asking for is one!\p" - .string "…Oh, but…\n" - .string "Don't you have a {POKEBLOCK} CASE?\l" - .string "That's no good. Next time, then!$" - -LilycoveCity_PokemonCenter_1F_Text_2A94E8: @ 82A94E8 - .string "So, I need your help!\p" - .string "Please, may I have one {POKEBLOCK}?\n" - .string "All I'm asking for is one!$" - -LilycoveCity_PokemonCenter_1F_Text_2A9537: @ 82A9537 - .string "Awww!\n" - .string "I can't have one {POKEBLOCK}?!$" - -LilycoveCity_PokemonCenter_1F_Text_2A9556: @ 82A9556 - .string "Sheesh!\n" - .string "What a cheapskate!$" - -LilycoveCity_PokemonCenter_1F_Text_2A9571: @ 82A9571 - .string "Yay!\n" - .string "Thank you!\p" - .string "I'll feed my POKéMON your {POKEBLOCK}\n" - .string "right away.$" - -LilycoveCity_PokemonCenter_1F_Text_2A95AD: @ 82A95AD - .string "…It doesn't seem to have changed\n" - .string "in any way at all…\p" - .string "Hmm…\p" - .string "Oh, well!\n" - .string "Thank you very much!$" - -LilycoveCity_PokemonCenter_1F_Text_2A9605: @ 82A9605 - .string "Oh, yay!\n" - .string "It's really delighted!\p" - .string "I think it really improved {STR_VAR_1}'s\n" - .string "{STR_VAR_2} quality, too.\p" - .string "Thank you so much!$" - -LilycoveCity_PokemonCenter_1F_Text_2A9669: @ 82A9669 - .string "Hmm…\p" - .string "I think we may be ready to enter\n" - .string "some CONTESTS.\p" - .string "If you see us in one somewhere,\n" - .string "I hope you'll cheer for us.$" - -LilycoveCity_PokemonCenter_1F_Text_2A96DA: @ 82A96DA - .string "{STR_VAR_1}: Guguuh!$" - -LilycoveCity_PokemonCenter_1F_Text_2A96E6: @ 82A96E6 - .string "{STR_VAR_1}: Igigigiiih!$" - -LilycoveCity_PokemonCenter_1F_Text_2A96F6: @ 82A96F6 - .string "{STR_VAR_1}: Baaarun…$" - -LilycoveCity_PokemonCenter_1F_Text_2A9703: @ 82A9703 - .string "{STR_VAR_1}: Pikka!$" - -LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E - .string "{STR_VAR_1}: Umyaaaan!$" - + .include "data/text/check_furniture.inc" + .include "data/scripts/cave_hole.inc" + .include "data/scripts/lilycove_lady.inc" .include "data/text/match_call.inc" .include "data/scripts/apprentice.inc" - -gBattleDomeOpponentPotentialText1:: - .string "The best candidate to be a champ!$" - -gBattleDomeOpponentPotentialText2:: - .string "A sure-finalist team.$" - -gBattleDomeOpponentPotentialText3:: - .string "A likely top-three finisher.$" - -gBattleDomeOpponentPotentialText4:: - .string "A candidate to finish first.$" - -gBattleDomeOpponentPotentialText5:: - .string "A team with top-class potential.$" - -gBattleDomeOpponentPotentialText6:: - .string "The dark horse team this tournament.$" - -gBattleDomeOpponentPotentialText7:: - .string "A better-than-average team.$" - -gBattleDomeOpponentPotentialText8:: - .string "This tournament's average team.$" - -gBattleDomeOpponentPotentialText9:: - .string "A team with average potential.$" - -gBattleDomeOpponentPotentialText10:: - .string "A weaker-than-average team.$" - -gBattleDomeOpponentPotentialText11:: - .string "A team looking for its first win.$" - -gBattleDomeOpponentPotentialText12:: - .string "One win will make this team proud.$" - -gBattleDomeOpponentPotentialText13:: - .string "Overall, a weak team.$" - -gBattleDomeOpponentPotentialText14:: - .string "A team with very low potential.$" - -gBattleDomeOpponentPotentialText15:: - .string "A team unlikely to win the tournament.$" - -gBattleDomeOpponentPotentialText16:: - .string "The team most unlikely to win.$" - -gBattleDomeOpponentPotentialText17:: - .string "The perfect, invincible superstar!$" - -gBattleDomeOpponentStyleText1:: - .string "Willing to risk total disaster at times.$" - -gBattleDomeOpponentStyleText2:: - .string "Skilled at enduring long battles.$" - -gBattleDomeOpponentStyleText3:: - .string "Varies tactics to suit the opponent.$" - -gBattleDomeOpponentStyleText4:: - .string "Has a tough winning pattern.$" - -gBattleDomeOpponentStyleText5:: - .string "Occasionally uses a very rare move.$" - -gBattleDomeOpponentStyleText6:: - .string "Uses startling and disruptive moves.$" - -gBattleDomeOpponentStyleText7:: - .string "Constantly watches HP in battle.$" - -gBattleDomeOpponentStyleText8:: - .string "Good at storing then loosing power.$" - -gBattleDomeOpponentStyleText9:: - .string "Skilled at enfeebling foes.$" - -gBattleDomeOpponentStyleText10:: - .string "Prefers tactics that rely on luck.$" - -gBattleDomeOpponentStyleText11:: - .string "Attacks with a regal atmosphere.$" - -gBattleDomeOpponentStyleText12:: - .string "Attacks with powerful, low-PP moves.$" - -gBattleDomeOpponentStyleText13:: - .string "Skilled at enfeebling, then attacking.$" - -gBattleDomeOpponentStyleText14:: - .string "Battles while enduring all attacks.$" - -gBattleDomeOpponentStyleText15:: - .string "Skilled at upsetting foes emotionally.$" - -gBattleDomeOpponentStyleText16:: - .string "Uses strong and straightforward moves.$" - -gBattleDomeOpponentStyleText17:: - .string "Aggressively uses strong moves.$" - -gBattleDomeOpponentStyleText18:: - .string "Battles while cleverly dodging attacks.$" - -gBattleDomeOpponentStyleText19:: - .string "Skilled at using upsetting attacks.$" - -gBattleDomeOpponentStyleText20:: - .string "Uses many popular moves.$" - -gBattleDomeOpponentStyleText21:: - .string "Has moves for powerful combinations.$" - -gBattleDomeOpponentStyleText22:: - .string "Uses high-probability attacks.$" - -gBattleDomeOpponentStyleText23:: - .string "Aggressively uses spectacular moves.$" - -gBattleDomeOpponentStyleText24:: - .string "Emphasizes offense over defense.$" - -gBattleDomeOpponentStyleText25:: - .string "Emphasizes defense over offense.$" - -gBattleDomeOpponentStyleText26:: - .string "Attacks quickly with strong moves.$" - -gBattleDomeOpponentStyleText27:: - .string "Often uses moves with added effects.$" - -gBattleDomeOpponentStyleText28:: - .string "Uses a well-balanced mix of moves.$" - -gBattleDomeOpponentStyleTextUnused1:: - .string "This is sample message 1.$" - -gBattleDomeOpponentStyleTextUnused2:: - .string "This is sample message 2.$" - -gBattleDomeOpponentStyleTextUnused3:: - .string "This is sample message 3.$" - -gBattleDomeOpponentStyleTextUnused4:: - .string "This is sample message 4.$" - -gBattleDomeOpponentStatsText1:: - .string "Emphasizes HP and ATTACK.$" - -gBattleDomeOpponentStatsText2:: - .string "Emphasizes HP and DEFENSE.$" - -gBattleDomeOpponentStatsText3:: - .string "Emphasizes HP and SPEED.$" - -gBattleDomeOpponentStatsText4:: - .string "Emphasizes HP and SP. ATTACK.$" - -gBattleDomeOpponentStatsText5:: - .string "Emphasizes HP and SP. DEFENSE.$" - -gBattleDomeOpponentStatsText6:: - .string "Emphasizes ATTACK and DEFENSE.$" - -gBattleDomeOpponentStatsText7:: - .string "Emphasizes ATTACK and SPEED.$" - -gBattleDomeOpponentStatsText8:: - .string "Emphasizes ATTACK and SP. ATTACK.$" - -gBattleDomeOpponentStatsText9:: - .string "Emphasizes ATTACK and SP. DEFENSE.$" - -gBattleDomeOpponentStatsText10:: - .string "Emphasizes DEFENSE and SPEED.$" - -gBattleDomeOpponentStatsText11:: - .string "Emphasizes DEFENSE and SP. ATTACK.$" - -gBattleDomeOpponentStatsText12:: - .string "Emphasizes DEFENSE and SP. DEFENSE.$" - -gBattleDomeOpponentStatsText13:: - .string "Emphasizes SPEED and SP. ATTACK.$" - -gBattleDomeOpponentStatsText14:: - .string "Emphasizes SPEED and SP. DEFENSE.$" - -gBattleDomeOpponentStatsText15:: - .string "Emphasizes SP. ATTACK and SP. DEFENSE.$" - -gBattleDomeOpponentStatsText16:: - .string "Emphasizes HP.$" - -gBattleDomeOpponentStatsText17:: - .string "Emphasizes ATTACK.$" - -gBattleDomeOpponentStatsText18:: - .string "Emphasizes DEFENSE.$" - -gBattleDomeOpponentStatsText19:: - .string "Emphasizes SPEED.$" - -gBattleDomeOpponentStatsText20:: - .string "Emphasizes SP. ATTACK.$" - -gBattleDomeOpponentStatsText21:: - .string "Emphasizes SP. DEFENSE.$" - -gBattleDomeOpponentStatsText22:: - .string "Neglects HP and ATTACK.$" - -gBattleDomeOpponentStatsText23:: - .string "Neglects HP and DEFENSE.$" - -gBattleDomeOpponentStatsText24:: - .string "Neglects HP and SPEED.$" - -gBattleDomeOpponentStatsText25:: - .string "Neglects HP and SP. ATTACK.$" - -gBattleDomeOpponentStatsText26:: - .string "Neglects HP and SP. DEFENSE.$" - -gBattleDomeOpponentStatsText27:: - .string "Neglects ATTACK and DEFENSE.$" - -gBattleDomeOpponentStatsText28:: - .string "Neglects ATTACK and SPEED.$" - -gBattleDomeOpponentStatsText29:: - .string "Neglects ATTACK and SP. ATTACK.$" - -gBattleDomeOpponentStatsText30:: - .string "Neglects ATTACK and SP. DEFENSE.$" - -gBattleDomeOpponentStatsText31:: - .string "Neglects DEFENSE and SPEED.$" - -gBattleDomeOpponentStatsText32:: - .string "Neglects DEFENSE and SP. ATTACK.$" - -gBattleDomeOpponentStatsText33:: - .string "Neglects DEFENSE and SP. DEFENSE.$" - -gBattleDomeOpponentStatsText34:: - .string "Neglects SPEED and SP. ATTACK.$" - -gBattleDomeOpponentStatsText35:: - .string "Neglects SPEED and SP. DEFENSE.$" - -gBattleDomeOpponentStatsText36:: - .string "Neglects SP. ATTACK and SP. DEFENSE.$" - -gBattleDomeOpponentStatsText37:: - .string "Neglects HP.$" - -gBattleDomeOpponentStatsText38:: - .string "Neglects ATTACK.$" - -gBattleDomeOpponentStatsText39:: - .string "Neglects DEFENSE.$" - -gBattleDomeOpponentStatsText40:: - .string "Neglects SPEED.$" - -gBattleDomeOpponentStatsText41:: - .string "Neglects SP. ATTACK.$" - -gBattleDomeOpponentStatsText42:: - .string "Neglects SP. DEFENSE.$" - -gBattleDomeOpponentStatsText43:: - .string "Raises POKéMON in a well-balanced way.$" - -gBattleDomeWinText1:: - .string "Let the battle begin!$" - -gBattleDomeWinText2:: - .string "{STR_VAR_1} won using {STR_VAR_2}!$" - -gBattleDomeWinText3:: - .string "{STR_VAR_1} became the champ!$" - -gBattleDomeWinText4:: - .string "{STR_VAR_1} won by default!$" - -gBattleDomeWinText5:: - .string "{STR_VAR_1} won outright by default!$" - -gBattleDomeWinText6:: - .string "{STR_VAR_1} won without using a move!$" - -gBattleDomeWinText7:: - .string "{STR_VAR_1} won outright with no moves!$" - -gBattleDomeMatchNumberText1:: - .string "Round 1, Match 1$" - -gBattleDomeMatchNumberText2:: - .string "Round 1, Match 2$" - -gBattleDomeMatchNumberText3:: - .string "Round 1, Match 3$" - -gBattleDomeMatchNumberText4:: - .string "Round 1, Match 4$" - -gBattleDomeMatchNumberText5:: - .string "Round 1, Match 5$" - -gBattleDomeMatchNumberText6:: - .string "Round 1, Match 6$" - -gBattleDomeMatchNumberText7:: - .string "Round 1, Match 7$" - -gBattleDomeMatchNumberText8:: - .string "Round 1, Match 8$" - -gBattleDomeMatchNumberText9:: - .string "Round 2, Match 1$" - -gBattleDomeMatchNumberText10:: - .string "Round 2, Match 2$" - -gBattleDomeMatchNumberText11:: - .string "Round 2, Match 3$" - -gBattleDomeMatchNumberText12:: - .string "Round 2, Match 4$" - -gBattleDomeMatchNumberText13:: - .string "Semifinal Match 1$" - -gBattleDomeMatchNumberText14:: - .string "Semifinal Match 2$" - -gBattleDomeMatchNumberText15:: - .string "Final Match$" - -BattleFrontier_BattlePikeRandomRoom1_MapScripts_2C3E1B: @ 82C3E1B - map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE - -BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25: @ 82C3E25 - setvar VAR_0x8004, 4 - special CallBattlePikeFunction - setvar VAR_0x8004, 5 - special CallBattlePikeFunction - switch VAR_RESULT - case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 - case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 - case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EC0 - case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EA2 - case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 - case 7, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3E93 - case 6, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EA2 - case 8, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3ECF - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3E93:: @ 82C3E93 - setobjectxyperm 1, 2, 5 - setobjectxyperm 2, 6, 5 - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EA2:: @ 82C3EA2 - setobjectxyperm 1, 4, 4 - setobjectxyperm 2, 3, 4 - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1:: @ 82C3EB1 - setobjectxyperm 1, 4, 4 - setobjectxyperm 2, 0, 0 - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EC0:: @ 82C3EC0 - setobjectxyperm 1, 5, 5 - setobjectxyperm 2, 0, 0 - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3ECF:: @ 82C3ECF - setobjectxyperm 1, 4, 3 - setobjectxyperm 2, 4, 4 - end - -BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE: @ 82C3EDE - map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8 - .2byte 0 - -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST - setvar VAR_0x8004, 5 - special CallBattlePikeFunction - compare VAR_RESULT, 3 - goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 - compare VAR_RESULT, 6 - goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 - compare VAR_RESULT, 7 - goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 - compare VAR_RESULT, 8 - goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F - hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 - setvar VAR_TEMP_4, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35:: @ 82C3F35 - setvar VAR_TEMP_4, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F:: @ 82C3F3F - setvar VAR_TEMP_4, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH - hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E:: @ 82C3F4E - setvar VAR_0x8007, 0 - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59:: @ 82C3F59 - setvar VAR_0x8007, 1 - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64:: @ 82C3F64 - setvar VAR_0x8007, 2 - goto BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special CallBattlePikeFunction - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special CallBattlePikeFunction - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special CallFrontierUtilFunc - setvar VAR_0x8004, 0 - special CallBattlePikeFunction - setvar VAR_0x8004, 5 - special CallBattlePikeFunction - switch VAR_RESULT - case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 4, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 5, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4049 - case 6, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 7, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - case 8, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030:: @ 82C4030 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A - waitmovement 0 - call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 - warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1, 255, 4, 7 - waitstate - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4049:: @ 82C4049 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A - waitmovement 0 - call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 - warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3, 255, 4, 19 - waitstate - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062:: @ 82C4062 - setvar VAR_TEMP_3, 1 - setvar VAR_TEMP_2, 1 - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D:: @ 82C406D - setvar VAR_TEMP_3, 0 - setvar VAR_TEMP_2, 0 - lockall - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE36, MSGBOX_DEFAULT - closemessage - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082:: @ 82C4082 - setvar VAR_TEMP_3, 1 - setvar VAR_TEMP_2, 1 - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D:: @ 82C408D - setvar VAR_TEMP_3, 0 - setvar VAR_TEMP_2, 0 - lockall - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25CE36, MSGBOX_DEFAULT - closemessage - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2 - setvar VAR_0x8004, 25 - special CallBattlePikeFunction - compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128 - compare VAR_RESULT, 1 - call_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special CallBattlePikeFunction - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special CallBattlePikeFunction - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special CallFrontierUtilFunc - setvar VAR_0x8004, 3 - special CallBattlePikeFunction - compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144 - compare VAR_RESULT, 0 - call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C - waitstate - end - -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128:: @ 82C4128 -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128:: @ 82C4128 - setvar VAR_0x8004, 24 - setvar VAR_0x8005, 1 - special CallBattlePikeFunction - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136:: @ 82C4136 -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136:: @ 82C4136 - setvar VAR_0x8004, 24 - setvar VAR_0x8005, 0 - special CallBattlePikeFunction - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144:: @ 82C4144 -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144:: @ 82C4144 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A - waitmovement 0 - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 - warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2, 255, 2, 7 - return - -BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C:: @ 82C415C -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C:: @ 82C415C - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A - waitmovement 0 - call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 - warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 - return - -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 - setvar VAR_0x8004, 7 - special CallBattlePikeFunction - setvar VAR_0x8004, 25 - special CallBattlePikeFunction - compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128 - compare VAR_RESULT, 1 - call_if_ne BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special CallBattlePikeFunction - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - copyvar VAR_0x8006, VAR_RESULT - special CallBattlePikeFunction - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc - addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special CallFrontierUtilFunc - setvar VAR_0x8004, 3 - special CallBattlePikeFunction - compare VAR_RESULT, 1 - call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144 - compare VAR_RESULT, 0 - call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C - waitstate - end - -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202:: @ 82C4202 - setvar VAR_TEMP_3, 1 - setvar VAR_TEMP_2, 1 - end - -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D:: @ 82C420D - setvar VAR_TEMP_3, 0 - setvar VAR_TEMP_2, 0 - lockall - msgbox BattleFrontier_BattlePikeRandomRoom3_Text_25CE36, MSGBOX_DEFAULT - closemessage - end - -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222:: @ 82C4222 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special CallFrontierUtilFunc - warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 - waitstate - end - -BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E: @ 82C423E -BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E: @ 82C423E - setorcopyvar VAR_0x8006, VAR_RESULT - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 0 - special CallFrontierUtilFunc - compare VAR_RESULT, 2 - goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B - call BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271 - -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B:: @ 82C426B - setorcopyvar VAR_RESULT, VAR_0x8006 - end - -BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271:: @ 82C4271 -BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271:: @ 82C4271 - setvar VAR_0x8004, 21 - special CallFrontierUtilFunc - return - -BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A: @ 82C427A -BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A: @ 82C427A - set_invisible - step_end - -LilycoveCity_ContestLobby_Text_2C427C: @ 82C427C - .string "BLEND MASTER: Indeed I am!\n" - .string "The BLEND MASTER am I!\p" - .string "Blend with me, and you shall witness\n" - .string "the mastery I bring to blending!$" - -LilycoveCity_ContestLobby_Text_2C42F4: @ 82C42F4 - .string "BLEND MASTER: Hmmm! So, you wish to\n" - .string "see my mastery in action?$" - -LilycoveCity_ContestLobby_Text_2C4332: @ 82C4332 - .string "Hmmm!\p" - .string "So, you are too busy now, I see!\p" - .string "But fear not!\n" - .string "I shall be here all day!\l" - .string "Hurry back from your errand!$" - -LilycoveCity_ContestLobby_Text_2C439D: @ 82C439D - .string "Hmmm!\p" - .string "You haven't got a single BERRY!\p" - .string "I shall be here all day!\n" - .string "Hurry back with some BERRIES!$" - -LilycoveCity_ContestLobby_Text_2C43FA: @ 82C43FA - .string "Of course!\n" - .string "Of course!\p" - .string "Incidentally…\n" - .string "You do know how to blend {POKEBLOCK}S\l" - .string "from BERRIES?$" - -LilycoveCity_ContestLobby_Text_2C444C: @ 82C444C - .string "Hmmm!\p" - .string "Ah, but it is a simple process!\p" - .string "When the BLENDER's arrow comes to\n" - .string "your marker, just press the A Button.\p" - .string "That's all you have to do.\p" - .string "When you see how precisely I press\n" - .string "the A Button, you will understand.$" - -LilycoveCity_ContestLobby_Text_2C451B: @ 82C451B - .string "Fine!\p" - .string "Let's get started, then!\p" - .string "All together with the BLEND MASTER,\n" - .string "let's BERRY BLENDER!$" - -LilycoveCity_ContestLobby_Text_2C4573: @ 82C4573 - .string "Hmmm!\p" - .string "You don't appear to have gotten\n" - .string "the {POKEBLOCK} CASE!\p" - .string "I shall be here all day!\n" - .string "Obtain the {POKEBLOCK} CASE and hurry back!$" - -LilycoveCity_ContestLobby_Text_2C45E8: @ 82C45E8 - .string "Hmmm!\p" - .string "Your {POKEBLOCK} CASE appears to be full!\p" - .string "I shall be here all day!\n" - .string "Use some {POKEBLOCK}S and hurry back!$" - -LilycoveCity_ContestLobby_Text_2C464B: @ 82C464B - .string "Whoa!\n" - .string "Awesome!$" - -LilycoveCity_ContestLobby_Text_2C465A: @ 82C465A - .string "Wickedly fast!$" - -LilycoveCity_ContestLobby_Text_2C4669: @ 82C4669 - .string "What an expert!$" - -LilycoveCity_ContestLobby_Text_2C4679: @ 82C4679 - .string "When I blended with the MASTER,\n" - .string "we made amazing {POKEBLOCK}S!$" - -LilycoveCity_ContestLobby_Text_2C46B1: @ 82C46B1 - .string "Eyes that track the arrow with\n" - .string "machinelike intensity…\p" - .string "A hand that taps the A Button\n" - .string "with clockwork-like precision…\p" - .string "Possessing these qualities makes\n" - .string "the BLEND MASTER truly great.$" - -LilycoveCity_ContestLobby_Text_2C4763: @ 82C4763 - .string "The BLEND MASTER's supposed to work\n" - .string "on his skills deep in the mountains.\p" - .string "Sometimes, he comes to LILYCOVE\n" - .string "to blend BERRIES all day long.$" - -FallarborTown_BattleTentLobby_Text_2C47EB: @ 82C47EB - .string "I welcome you to the BATTLE TENT\n" - .string "FALLARBOR SITE!\p" - .string "I am your guide to the Set KO Tourney!$" - -FallarborTown_BattleTentLobby_Text_2C4843: @ 82C4843 - .string "Now, do you wish to take the challenge\n" - .string "of a Set KO Tourney?$" - -FallarborTown_BattleTentLobby_Text_2C487F: @ 82C487F - .string "We await your challenge on\n" - .string "another occasion!$" - -FallarborTown_BattleTentLobby_Text_2C48AC: @ 82C48AC - .string "In the FALLARBOR BATTLE TENT,\n" - .string "we undertake the Set KO Tourney.\p" - .string "All participants enter with a team of\n" - .string "three POKéMON.\p" - .string "The three POKéMON must be lined up\n" - .string "in the order that they are to appear in.\p" - .string "During battle, the POKéMON will appear\n" - .string "one at a time in the preset order.\p" - .string "Once a POKéMON enters battle, it must\n" - .string "remain out until the match is decided.\p" - .string "If a match remains undecided in\n" - .string "three turns, it goes to judging.\p" - .string "If you wish to interrupt your challenge,\n" - .string "please save the game.\p" - .string "If you don't save, you will not be able\n" - .string "to continue with your challenge.\p" - .string "If you pull off the feat of beating\n" - .string "three TRAINERS in succession,\l" - .string "we will present you with a fine prize.$" - -FallarborTown_BattleTentLobby_Text_2C4B35: @ 82C4B35 - .string "Before showing you to the BATTLE\n" - .string "TENT, I must save. Is that okay?$" - -FallarborTown_BattleTentLobby_Text_2C4B77: @ 82C4B77 - .string "We offer two levels of challenge,\n" - .string "Level 50 and Open Level.\l" - .string "Which is your choice?$" - -FallarborTown_BattleTentLobby_Text_2C4BC8: @ 82C4BC8 - .string "Very well, now select your\n" - .string "three POKéMON, please.$" - -FallarborTown_BattleTentLobby_Text_2C4BFA: @ 82C4BFA - .string "My dear challenger!\p" - .string "You do not have the three POKéMON\n" - .string "required for entry.\p" - .string "They also must not hold the same\n" - .string "kinds of items.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "When you have made your preparations,\n" - .string "please do return.$" - -FallarborTown_BattleTentLobby_Text_2C4CC0: @ 82C4CC0 - .string "My dear challenger!\p" - .string "You do not have the three POKéMON\n" - .string "required for entry.\p" - .string "To qualify, you must bring three\n" - .string "different kinds of POKéMON.\p" - .string "They also must not hold the same\n" - .string "kinds of items.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "When you have made your preparations,\n" - .string "please do return.$" - -FallarborTown_BattleTentLobby_Text_2C4DC3: @ 82C4DC3 - .string "I shall now guide you to\n" - .string "the BATTLE TENT.$" - -FallarborTown_BattleTentLobby_Text_2C4DED: @ 82C4DED - .string "My dear challenger!\p" - .string "You did not save the game before\n" - .string "shutting down, did you?\p" - .string "It is unfortunate, but that has\n" - .string "resulted in your disqualification\l" - .string "from your challenge.\p" - .string "You may, of course, start with a fresh\n" - .string "challenge.$" - -FallarborTown_BattleTentLobby_Text_2C4EC3: @ 82C4EC3 - .string "How splendid! You have beaten\n" - .string "three TRAINERS in succession!$" - -FallarborTown_BattleTentLobby_Text_2C4EFF: @ 82C4EFF - .string "Please wait while I save the game.$" - -FallarborTown_BattleTentLobby_Text_2C4F22: @ 82C4F22 - .string "In commemoration of your 3-win streak,\n" - .string "we present you with this prize.$" - -FallarborTown_BattleTentLobby_Text_2C4F69: @ 82C4F69 - .string "{PLAYER} received the prize\n" - .string "{STR_VAR_1}.$" - -FallarborTown_BattleTentLobby_Text_2C4F83: @ 82C4F83 - .string "Oh?\n" - .string "Your BAG seems to be full.\p" - .string "I urge you to clear space and\n" - .string "return for your prize.$" - -FallarborTown_BattleTentLobby_Text_2C4FD7: @ 82C4FD7 - .string "Thank you so much for participating!\p" - .string "Please wait while I save the game.$" - -FallarborTown_BattleTentLobby_Text_2C501F: @ 82C501F - .string "We await your challenge on\n" - .string "another occasion!$" - -FallarborTown_BattleTentLobby_Text_2C504C: @ 82C504C - .string "We have been looking forward to\n" - .string "your arrival.\p" - .string "Before I show you to the BATTLE TENT,\n" - .string "I must save the game. Please wait.$" - -VerdanturfTown_BattleTentLobby_Text_2C50C3: @ 82C50C3 - .string "I welcome you to the BATTLE TENT\n" - .string "VERDANTURF SITE!\p" - .string "Here, the TRAINER's trust toward\n" - .string "POKéMON is tested.$" - -VerdanturfTown_BattleTentLobby_Text_2C5129: @ 82C5129 - .string "Do you wish to take the VERDANTURF\n" - .string "BATTLE TENT challenge?$" - -VerdanturfTown_BattleTentLobby_Text_2C5163: @ 82C5163 - .string "In the VERDANTURF BATTLE TENT,\n" - .string "there is one crucial rule that must\l" - .string "be obeyed.\p" - .string "TRAINERS are permitted only to switch\n" - .string "their POKéMON in and out.\p" - .string "TRAINERS are otherwise forbidden to\n" - .string "command their POKéMON.\p" - .string "The POKéMON are to behave according\n" - .string "to their nature and battle on their own.\p" - .string "You must put your trust in your\n" - .string "POKéMON and watch over them.\p" - .string "If you achieve the honor of beating\n" - .string "three TRAINERS in succession,\l" - .string "we will present you with a prize.\p" - .string "If you want to interrupt your\n" - .string "challenge, please save the game.\p" - .string "If you don't save before interrupting,\n" - .string "you will be disqualified.$" - -VerdanturfTown_BattleTentLobby_Text_2C539A: @ 82C539A - .string "When you have fortified your heart\n" - .string "and POKéMON, you must return.$" - -VerdanturfTown_BattleTentLobby_Text_2C53DB: @ 82C53DB - .string "There are two levels of difficulty,\n" - .string "Level 50 and Open Level.\l" - .string "Which is your choice of a challenge?$" - -VerdanturfTown_BattleTentLobby_Text_2C543D: @ 82C543D - .string "Sigh…\p" - .string "You do not have the three POKéMON\n" - .string "required for the challenge.\p" - .string "To enter, you must provide three\n" - .string "different kinds of POKéMON.\p" - .string "They also must not be holding\n" - .string "the same kinds of items.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "Come back when you have made\n" - .string "your preparations.$" - -VerdanturfTown_BattleTentLobby_Text_2C5538: @ 82C5538 - .string "Sigh…\p" - .string "You do not have the three POKéMON\n" - .string "required for the challenge.\p" - .string "To enter, you must provide three\n" - .string "different kinds of POKéMON.\p" - .string "They also must not be holding\n" - .string "the same kinds of items.\p" - .string "EGGS{STR_VAR_1} ineligible.\p" - .string "Come back when you have made\n" - .string "your preparations.$" - -VerdanturfTown_BattleTentLobby_Text_2C5633: @ 82C5633 - .string "Good. Now, you must select your\n" - .string "three POKéMON.$" - -VerdanturfTown_BattleTentLobby_Text_2C5662: @ 82C5662 - .string "I must save before I show you to\n" - .string "the BATTLE TENT. Is that okay?$" - -VerdanturfTown_BattleTentLobby_Text_2C56A2: @ 82C56A2 - .string "Good.\n" - .string "Now, follow me.$" - -VerdanturfTown_BattleTentLobby_Text_2C56B8: @ 82C56B8 - .string "I feel privileged for having seen\n" - .string "your POKéMON's exploits.\p" - .string "The results will be recorded.\n" - .string "I must ask you to briefly wait.$" - -VerdanturfTown_BattleTentLobby_Text_2C5731: @ 82C5731 - .string "To achieve a 3-win streak…\p" - .string "The bonds that bind your heart with\n" - .string "your POKéMON seem firm and true.$" - -VerdanturfTown_BattleTentLobby_Text_2C5791: @ 82C5791 - .string "Your feat will be recorded.\n" - .string "I must ask you to briefly wait.$" - -VerdanturfTown_BattleTentLobby_Text_2C57CD: @ 82C57CD - .string "For the feat of your 3-win streak,\n" - .string "we present you with this prize.$" - -SlateportCity_BattleTentLobby_Text_2C5810: @ 82C5810 - .string "Welcome to the BATTLE TENT\n" - .string "SLATEPORT SITE!\p" - .string "I am your guide to the Battle Swap\n" - .string "Tournament.$" - -SlateportCity_BattleTentLobby_Text_2C586A: @ 82C586A - .string "Would you like to take the Battle\n" - .string "Swap challenge?$" - -SlateportCity_BattleTentLobby_Text_2C589C: @ 82C589C - .string "Here at the SLATEPORT BATTLE TENT,\n" - .string "we hold Battle Swap events\l" - .string "using rental POKéMON.\p" - .string "First, you will be loaned three\n" - .string "POKéMON specifically for this event.\p" - .string "Using the supplied rental POKéMON,\n" - .string "you must conduct a SINGLE BATTLE.\p" - .string "If you win, you are permitted to trade\n" - .string "one of your rental POKéMON.\p" - .string "Repeat this cycle of battling and\n" - .string "trading--if you win three times in\l" - .string "a row, you will earn a fine prize.\p" - .string "If you want to interrupt your\n" - .string "challenge, please save the game.\p" - .string "If you don't save before interrupting,\n" - .string "you will be disqualified.$" - -SlateportCity_BattleTentLobby_Text_2C5AA5: @ 82C5AA5 - .string "We look forward to your next visit.$" - -SlateportCity_BattleTentLobby_Text_2C5AC9: @ 82C5AC9 - .string "Which level do you wish to challenge?\n" - .string "Level 50 or Level 100?$" - -SlateportCity_BattleTentLobby_Text_2C5B06: @ 82C5B06 - .string "Before you begin your challenge,\n" - .string "I need to save data. Is that okay?$" - -SlateportCity_BattleTentLobby_Text_2C5B4A: @ 82C5B4A - .string "Okay, I will hold your POKéMON for\n" - .string "safekeeping while you compete.$" - -SlateportCity_BattleTentLobby_Text_2C5B8C: @ 82C5B8C - .string "Please step this way.$" - -SlateportCity_BattleTentLobby_Text_2C5BA2: @ 82C5BA2 - .string "Thank you for participating!\p" - .string "I will return your POKéMON in exchange\n" - .string "for our rental POKéMON.\p" - .string "I must also save your event results.\n" - .string "Please wait.$" - -SlateportCity_BattleTentLobby_Text_2C5C30: @ 82C5C30 - .string "I will return your POKéMON in exchange\n" - .string "for our rental POKéMON.$" - -SlateportCity_BattleTentLobby_Text_2C5C6F: @ 82C5C6F - .string "Congratulations!\n" - .string "You've won three straight matches!\p" - .string "I will return your POKéMON in exchange\n" - .string "for our rental POKéMON.\p" - .string "I must also save your event results.\n" - .string "Please wait.$" - -SlateportCity_BattleTentLobby_Text_2C5D14: @ 82C5D14 - .string "In recognition of your 3-win streak,\n" - .string "we award you this prize.$" - -SlateportCity_BattleTentLobby_Text_2C5D52: @ 82C5D52 - .string "Oh?\n" - .string "You seem to have no room for this.\p" - .string "Please make room in your BAG and\n" - .string "let me know.$" - -SlateportCity_BattleTentLobby_Text_2C5DA7: @ 82C5DA7 - .string "We've been waiting for you!\p" - .string "Before we resume your challenge,\n" - .string "I must save the game.$" - -SlateportCity_BattleTentLobby_Text_2C5DFA: @ 82C5DFA - .string "I'm sorry to say this, but you didn't\n" - .string "save before you quit playing last time.\p" - .string "As a result, you have been disqualified\n" - .string "from your challenge.$" - -SlateportCity_BattleTentLobby_Text_2C5E85: @ 82C5E85 - .string "We'll return your personal POKéMON.$" - -SlateportCity_BattleTentLobby_Text_2C5EA9: @ 82C5EA9 - .string "{PLAYER} received the prize\n" - .string "{STR_VAR_1}.$" - -SlateportCity_BattleTentLobby_Text_2C5EC3: @ 82C5EC3 - .string "The Battle Swap rules are listed.$" - -SlateportCity_BattleTentLobby_Text_2C5EE5: @ 82C5EE5 - .string "Which heading do you want to read?$" - -SlateportCity_BattleTentLobby_Text_2C5F08: @ 82C5F08 - .string "In a Battle Swap event, you may use\n" - .string "only three POKéMON.\p" - .string "Whether you are renting or swapping,\n" - .string "your team may not have two or more\l" - .string "of the same POKéMON.$" - -SlateportCity_BattleTentLobby_Text_2C5F9D: @ 82C5F9D - .string "You may swap POKéMON only with\n" - .string "the TRAINER you have just defeated.\p" - .string "You may swap for only those POKéMON\n" - .string "used by the beaten TRAINER.$" - -SlateportCity_BattleTentLobby_Text_2C6020: @ 82C6020 - .string "After every battle you win, you may\n" - .string "swap for one of your defeated\l" - .string "opponent's POKéMON.\p" - .string "You will not be able to swap POKéMON\n" - .string "with the third TRAINER in the event.$" - -SlateportCity_BattleTentLobby_Text_2C60C0: @ 82C60C0 - .string "There are two key points to be aware\n" - .string "of when swapping POKéMON.\p" - .string "First, when swapping, you can't check\n" - .string "the stats of the POKéMON you are\l" - .string "about to receive.\p" - .string "Second, the POKéMON on your team\n" - .string "are lined up in sequence, depending on\l" - .string "the order in which you rented them.\p" - .string "This sequence remains unchanged\n" - .string "even when swaps are made.$" - -SlateportCity_BattleTentLobby_Text_2C61FE: @ 82C61FE - .string "The POKéMON of the SLATEPORT\n" - .string "BATTLE TENT are all rentals.\p" - .string "All rental POKéMON are kept at\n" - .string "Level 30.$" - -VerdanturfTown_BattleTentLobby_Text_2C6261: @ 82C6261 - .string "The VERDANTURF BATTLE TENT\n" - .string "rules are listed.$" - -VerdanturfTown_BattleTentLobby_Text_2C628E: @ 82C628E - .string "Which heading do you want to read?$" - -VerdanturfTown_BattleTentLobby_Text_2C62B1: @ 82C62B1 - .string "Here at the VERDANTURF BATTLE TENT,\n" - .string "POKéMON are required to think and\l" - .string "battle by themselves.\p" - .string "Unlike in the wild, POKéMON that live\n" - .string "with people behave differently\l" - .string "depending on their nature.$" - -VerdanturfTown_BattleTentLobby_Text_2C636D: @ 82C636D - .string "Depending on its nature, a POKéMON\n" - .string "may prefer to attack no matter what.\p" - .string "Another POKéMON may prefer to protect\n" - .string "itself from any harm.\p" - .string "Yet another may enjoy vexing or\n" - .string "confounding its foes.\p" - .string "Depending on its nature, a POKéMON\n" - .string "will have favorite moves that it is good\l" - .string "at using.\p" - .string "It may also dislike certain moves that\n" - .string "it has trouble using.$" - -VerdanturfTown_BattleTentLobby_Text_2C64BA: @ 82C64BA - .string "There are offensive moves that inflict\n" - .string "direct damage on the foe.\p" - .string "There are defensive moves that are\n" - .string "used to prepare for enemy attacks or\l" - .string "used to heal HP and so on.\p" - .string "There are also other somewhat-odd\n" - .string "moves that may enfeeble the foes with\l" - .string "stat problems including poison and \l" - .string "paralysis.\p" - .string "POKéMON will consider using moves in\n" - .string "these three categories.$" - -VerdanturfTown_BattleTentLobby_Text_2C6612: @ 82C6612 - .string "When not under command by its TRAINER,\n" - .string "a POKéMON may be unable to effectively\l" - .string "use certain moves.\p" - .string "A POKéMON is not good at using any\n" - .string "move that it dislikes.\p" - .string "If a POKéMON only knows moves that\n" - .string "do not match its nature, it will often\l" - .string "be unable to live up to its potential.$" - -VerdanturfTown_BattleTentLobby_Text_2C671E: @ 82C671E - .string "Depending on its nature, a POKéMON may\n" - .string "start using moves that don't match its\l" - .string "nature when it is in trouble.\p" - .string "If a POKéMON begins behaving oddly\n" - .string "in a pinch, watch it carefully.$" - -FallarborTown_BattleTentLobby_Text_2C67CD: @ 82C67CD -VerdanturfTown_BattleTentLobby_Text_2C67CD: @ 82C67CD - .string "At this BATTLE TENT, the levels of\n" - .string "your opponents will be adjusted to\l" - .string "match the levels of your POKéMON.\p" - .string "However, no TRAINER you face will\n" - .string "have any POKéMON below Level 30.$" - -VerdanturfTown_BattleTentLobby_Text_2C6878: @ 82C6878 - .string "The VERDANTURF BATTLE TENT\n" - .string "rules are listed.$" - + .include "data/text/battle_dome.inc" + .include "data/scripts/battle_pike.inc" + .include "data/text/contest_hall.inc" + .include "data/text/battle_tent.inc" .include "data/text/event_ticket_2.inc" - -MauvilleCity_Text_2C6E05: @ 82C6E05 - .string "This move can be learned only\n" - .string "once. Is that okay?$" - -SlateportCity_PokemonFanClub_Text_2C6E37: @ 82C6E37 - .string "Heh! My POKéMON totally rules!\n" - .string "It's cooler than any POKéMON!\p" - .string "I was lipping off with a swagger in\n" - .string "my step like that when the CHAIRMAN\l" - .string "chewed me out.\p" - .string "That took the swagger out of my step.\p" - .string "If you'd like, I'll teach the move\n" - .string "SWAGGER to a POKéMON of yours.$" - -SlateportCity_PokemonFanClub_Text_2C6F33: @ 82C6F33 - .string "What, no? Can't you get into\n" - .string "the spirit of things?$" - -SlateportCity_PokemonFanClub_Text_2C6F66: @ 82C6F66 - .string "All right, which POKéMON wants to\n" - .string "learn how to SWAGGER?$" - -SlateportCity_PokemonFanClub_Text_2C6F9E: @ 82C6F9E - .string "I'll just praise my POKéMON from now\n" - .string "on without the swagger.$" - -MauvilleCity_Text_2C6FDB: @ 82C6FDB - .string "Did you know that you can go from\n" - .string "here a long way in that direction\l" - .string "without changing direction?\p" - .string "I might even be able to roll\n" - .string "that way.\p" - .string "Do you think your POKéMON will\n" - .string "want to roll, too?\p" - .string "I can teach one the move ROLLOUT\n" - .string "if you'd like.$" - -MauvilleCity_Text_2C70C4: @ 82C70C4 - .string "You don't need to be shy about it.\n" - .string "Let's roll!$" - -MauvilleCity_Text_2C70F3: @ 82C70F3 - .string "Ehehe, sure thing! It'd be great if\n" - .string "the POKéMON looked like me.$" - -MauvilleCity_Text_2C7133: @ 82C7133 - .string "Rolling around in the grass makes me\n" - .string "happy. Come on, let's roll!$" - -VerdanturfTown_PokemonCenter_1F_Text_2C7174: @ 82C7174 - .string "There's a move that gets stronger\n" - .string "when you keep using it in a row.\p" - .string "It's a BUG-type move, and it is\n" - .string "wickedly cool.\p" - .string "It's called FURY CUTTER.\n" - .string "Want me to teach it to a POKéMON?$" - -VerdanturfTown_PokemonCenter_1F_Text_2C7221: @ 82C7221 - .string "We're not on the same wavelength.$" - -VerdanturfTown_PokemonCenter_1F_Text_2C7243: @ 82C7243 - .string "Yay!\n" - .string "Show me which POKéMON I should teach.$" - -VerdanturfTown_PokemonCenter_1F_Text_2C726E: @ 82C726E - .string "I get a thrill watching to see if\n" - .string "the move keeps hitting in succession!$" - -LavaridgeTown_House_Text_2C72B6: @ 82C72B6 - .string "Ah, young one!\p" - .string "I am also a young one, but I mimic\n" - .string "the styles and speech of the elderly\l" - .string "folks of this town.\p" - .string "What do you say, young one?\n" - .string "Would you agree to it if I were to\l" - .string "offer to teach the move MIMIC?$" - -LavaridgeTown_House_Text_2C737F: @ 82C737F - .string "Oh, boo! I wanted to teach MIMIC\n" - .string "to your POKéMON!$" - -LavaridgeTown_House_Text_2C73B1: @ 82C73B1 - .string "Fwofwo! And so I shall!\n" - .string "Let me see the POKéMON\l" - .string "you wish me to teach.$" - -LavaridgeTown_House_Text_2C73F6: @ 82C73F6 - .string "MIMIC is a move of great depth.\p" - .string "Could you execute it to perfection\n" - .string "as well as me…?$" - -FallarborTown_Mart_Text_2C7449: @ 82C7449 - .string "I want all sorts of things!\n" - .string "But I used up my allowance…\p" - .string "Wouldn't it be nice if there were\n" - .string "a spell that made money appear when\l" - .string "you waggle a finger?\p" - .string "If you want, I can teach your POKéMON\n" - .string "the move METRONOME.\p" - .string "Money won't appear, but your POKéMON\n" - .string "will waggle a finger. Yes?$" - -FallarborTown_Mart_Text_2C7556: @ 82C7556 - .string "Okay. I'll be here if you change\n" - .string "your mind.$" - -FallarborTown_Mart_Text_2C7582: @ 82C7582 - .string "Okay! I'll teach it!\n" - .string "Which POKéMON should I teach?$" - -FallarborTown_Mart_Text_2C75B5: @ 82C75B5 - .string "When a POKéMON waggles its finger\n" - .string "like a METRONOME, all sorts of nice\l" - .string "things happen.\p" - .string "Wouldn't it be nice if we could\n" - .string "use it, too?$" - -FortreeCity_House2_Text_2C7637: @ 82C7637 - .string "Humph! My wife relies on HIDDEN\n" - .string "POWER to stay awake.\p" - .string "She should just take a nap like I do,\n" - .string "and SLEEP TALK.\p" - .string "I can teach your POKéMON how to\n" - .string "SLEEP TALK instead. Interested?$" - -FortreeCity_House2_Text_2C76E2: @ 82C76E2 - .string "Oh, fine, fine. You want to stay awake\n" - .string "with HIDDEN POWER, too…$" - -FortreeCity_House2_Text_2C7721: @ 82C7721 - .string "Ah, an appreciative child!\n" - .string "Which POKéMON should I teach?$" - -FortreeCity_House2_Text_2C775A: @ 82C775A - .string "I've never once gotten my wife's\n" - .string "coin trick right.\p" - .string "I would be happy if I got it right\n" - .string "even as I SLEEP TALK…$" - -LilycoveCity_DepartmentStoreRooftop_Text_2C77C6: @ 82C77C6 - .string "When I see the wide world from up\n" - .string "here on the roof…\p" - .string "I think about how nice it would be\n" - .string "if there were more than just one me\l" - .string "so I could enjoy all sorts of lives.\p" - .string "Of course it's not possible.\n" - .string "Giggle…\p" - .string "I know! Would you be interested in\n" - .string "having a POKéMON learn SUBSTITUTE?$" - -LilycoveCity_DepartmentStoreRooftop_Text_2C78D1: @ 82C78D1 - .string "Oh, no?\p" - .string "A POKéMON can make a copy of\n" - .string "itself using it, you know.$" - -LilycoveCity_DepartmentStoreRooftop_Text_2C7911: @ 82C7911 - .string "Giggle…\n" - .string "Which POKéMON do you want me to\l" - .string "teach SUBSTITUTE?$" - -LilycoveCity_DepartmentStoreRooftop_Text_2C794B: @ 82C794B - .string "We human beings should enjoy our\n" - .string "own lives to the utmost!\p" - .string "I hope you'll get that way, too!$" - -MossdeepCity_Text_2C79A6: @ 82C79A6 - .string "I can't do this anymore!\p" - .string "It's utterly hopeless!\p" - .string "I'm a FIGHTING-type TRAINER,\n" - .string "so I can't win at the MOSSDEEP GYM\l" - .string "no matter how hard I try!\p" - .string "Argh! Punch! Punch! Punch!\n" - .string "Punch! Punch! Punch!\p" - .string "What, don't look at me that way!\n" - .string "I'm only hitting the ground!\p" - .string "Or do you want me to teach your\n" - .string "POKéMON DYNAMICPUNCH?$" - -MossdeepCity_Text_2C7AD4: @ 82C7AD4 - .string "Darn! You're even making fun of me?\n" - .string "Punch! Punch! Punch!$" - -MossdeepCity_Text_2C7B0D: @ 82C7B0D - .string "What? You do? You're a good person!\n" - .string "Which POKéMON should I teach?$" - -MossdeepCity_Text_2C7B4F: @ 82C7B4F - .string "I want you to win at the MOSSDEEP GYM\n" - .string "using that DYNAMICPUNCH!$" - -SootopolisCity_PokemonCenter_1F_Text_2C7B8E: @ 82C7B8E - .string "Sigh…\p" - .string "SOOTOPOLIS's GYM LEADER is really\n" - .string "lovably admirable.\p" - .string "But that also means I have many\n" - .string "rivals for his attention.\p" - .string "He's got appeal with a DOUBLE-EDGE.\n" - .string "I couldn't even catch his eye.\p" - .string "Please, let me teach your POKéMON\n" - .string "the move DOUBLE-EDGE!$" - -SootopolisCity_PokemonCenter_1F_Text_2C7C7E: @ 82C7C7E - .string "Oh…\n" - .string "Even you rejected me…$" - -SootopolisCity_PokemonCenter_1F_Text_2C7C98: @ 82C7C98 - .string "Okay, which POKéMON should I teach\n" - .string "DOUBLE-EDGE?$" - -SootopolisCity_PokemonCenter_1F_Text_2C7CC8: @ 82C7CC8 - .string "I won't live for love anymore!\n" - .string "I'll become tough!$" - -PacifidlogTown_PokemonCenter_1F_Text_2C7CFA: @ 82C7CFA - .string "I don't intend to be going nowhere\n" - .string "fast in the sticks like this forever.\p" - .string "You watch me, I'll get out to the city\n" - .string "and become a huge hit.\p" - .string "Seriously, I'm going to cause\n" - .string "a huge EXPLOSION of popularity!\p" - .string "If you overheard that, I'll happily\n" - .string "teach EXPLOSION to your POKéMON!$" - -PacifidlogTown_PokemonCenter_1F_Text_2C7E04: @ 82C7E04 - .string "Gaah! You're turning me down because\n" - .string "I live in the country?$" - -PacifidlogTown_PokemonCenter_1F_Text_2C7E40: @ 82C7E40 - .string "Fine! An EXPLOSION it is!\n" - .string "Which POKéMON wants to blow up?$" - -PacifidlogTown_PokemonCenter_1F_Text_2C7E7A: @ 82C7E7A - .string "For a long time, I've taught POKéMON\n" - .string "how to use EXPLOSION, but I've yet\l" - .string "to ignite my own EXPLOSION…\p" - .string "Maybe it's because deep down,\n" - .string "I would rather stay here…$" - -SlateportCity_PokemonFanClub_EventScript_2C7F16:: @ 82C7F16 - lock - faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SWAGGER, SlateportCity_PokemonFanClub_EventScript_2C7F74 - msgbox SlateportCity_PokemonFanClub_Text_2C6E37, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A - call SlateportCity_PokemonFanClub_EventScript_2C832D - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A - msgbox SlateportCity_PokemonFanClub_Text_2C6F66, MSGBOX_DEFAULT - setvar VAR_0x8005, 23 - call EventScript_ShowPartyMenu - compare VAR_RESULT, 0 - goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A - setflag FLAG_MOVE_TUTOR_TAUGHT_SWAGGER - goto SlateportCity_PokemonFanClub_EventScript_2C7F74 - end - -SlateportCity_PokemonFanClub_EventScript_2C7F6A:: @ 82C7F6A - msgbox SlateportCity_PokemonFanClub_Text_2C6F33, MSGBOX_DEFAULT - release - end - -SlateportCity_PokemonFanClub_EventScript_2C7F74:: @ 82C7F74 - msgbox SlateportCity_PokemonFanClub_Text_2C6F9E, MSGBOX_DEFAULT - release - end - -MauvilleCity_EventScript_2C7F7E:: @ 82C7F7E - lock - faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT, MauvilleCity_EventScript_2C7FDC - msgbox MauvilleCity_Text_2C6FDB, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_EventScript_2C7FD2 - call MauvilleCity_EventScript_2C832D - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_EventScript_2C7FD2 - msgbox MauvilleCity_Text_2C70F3, MSGBOX_DEFAULT - setvar VAR_0x8005, 16 - call EventScript_ShowPartyMenu - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_EventScript_2C7FD2 - setflag FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT - goto MauvilleCity_EventScript_2C7FDC - end - -MauvilleCity_EventScript_2C7FD2:: @ 82C7FD2 - msgbox MauvilleCity_Text_2C70C4, MSGBOX_DEFAULT - release - end - -MauvilleCity_EventScript_2C7FDC:: @ 82C7FDC - msgbox MauvilleCity_Text_2C7133, MSGBOX_DEFAULT - release - end - -VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6:: @ 82C7FE6 - lock - faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER, VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7174, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A - call VerdanturfTown_PokemonCenter_1F_EventScript_2C832D - compare VAR_RESULT, 0 - goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7243, MSGBOX_DEFAULT - setvar VAR_0x8005, 29 - call EventScript_ShowPartyMenu - compare VAR_RESULT, 0 - goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A - setflag FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER - goto VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 - end - -VerdanturfTown_PokemonCenter_1F_EventScript_2C803A:: @ 82C803A - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7221, MSGBOX_DEFAULT - release - end - -VerdanturfTown_PokemonCenter_1F_EventScript_2C8044:: @ 82C8044 - msgbox VerdanturfTown_PokemonCenter_1F_Text_2C726E, MSGBOX_DEFAULT - release - end - -LavaridgeTown_House_EventScript_2C804E:: @ 82C804E - lock - faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_MIMIC, LavaridgeTown_House_EventScript_2C80AC - msgbox LavaridgeTown_House_Text_2C72B6, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_House_EventScript_2C80A2 - call LavaridgeTown_House_EventScript_2C832D - compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_House_EventScript_2C80A2 - msgbox LavaridgeTown_House_Text_2C73B1, MSGBOX_DEFAULT - setvar VAR_0x8005, 7 - call EventScript_ShowPartyMenu - compare VAR_RESULT, 0 - goto_if_eq LavaridgeTown_House_EventScript_2C80A2 - setflag FLAG_MOVE_TUTOR_TAUGHT_MIMIC - goto LavaridgeTown_House_EventScript_2C80AC - end - -LavaridgeTown_House_EventScript_2C80A2:: @ 82C80A2 - msgbox LavaridgeTown_House_Text_2C737F, MSGBOX_DEFAULT - release - end - -LavaridgeTown_House_EventScript_2C80AC:: @ 82C80AC - msgbox LavaridgeTown_House_Text_2C73F6, MSGBOX_DEFAULT - release - end - -FallarborTown_Mart_EventScript_2C80B6:: @ 82C80B6 - lock - faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_METRONOME, FallarborTown_Mart_EventScript_2C8114 - msgbox FallarborTown_Mart_Text_2C7449, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq FallarborTown_Mart_EventScript_2C810A - call FallarborTown_Mart_EventScript_2C832D - compare VAR_RESULT, 0 - goto_if_eq FallarborTown_Mart_EventScript_2C810A - msgbox FallarborTown_Mart_Text_2C7582, MSGBOX_DEFAULT - setvar VAR_0x8005, 8 - call EventScript_ShowPartyMenu - compare VAR_RESULT, 0 - goto_if_eq FallarborTown_Mart_EventScript_2C810A - setflag FLAG_MOVE_TUTOR_TAUGHT_METRONOME - goto FallarborTown_Mart_EventScript_2C8114 - end - -FallarborTown_Mart_EventScript_2C810A:: @ 82C810A - msgbox FallarborTown_Mart_Text_2C7556, MSGBOX_DEFAULT - release - end - -FallarborTown_Mart_EventScript_2C8114:: @ 82C8114 - msgbox FallarborTown_Mart_Text_2C75B5, MSGBOX_DEFAULT - release - end - -FortreeCity_House2_EventScript_2C811E:: @ 82C811E - lock - faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK, FortreeCity_House2_EventScript_2C817C - msgbox FortreeCity_House2_Text_2C7637, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq FortreeCity_House2_EventScript_2C8172 - call FortreeCity_House2_EventScript_2C832D - compare VAR_RESULT, 0 - goto_if_eq FortreeCity_House2_EventScript_2C8172 - msgbox FortreeCity_House2_Text_2C7721, MSGBOX_DEFAULT - setvar VAR_0x8005, 24 - call EventScript_ShowPartyMenu - compare VAR_RESULT, 0 - goto_if_eq FortreeCity_House2_EventScript_2C8172 - setflag FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK - goto FortreeCity_House2_EventScript_2C817C - end - -FortreeCity_House2_EventScript_2C8172:: @ 82C8172 - msgbox FortreeCity_House2_Text_2C76E2, MSGBOX_DEFAULT - release - end - -FortreeCity_House2_EventScript_2C817C:: @ 82C817C - msgbox FortreeCity_House2_Text_2C775A, MSGBOX_DEFAULT - release - end - -LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186:: @ 82C8186 - lock - faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE, LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C77C6, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA - call LilycoveCity_DepartmentStoreRooftop_EventScript_2C832D - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C7911, MSGBOX_DEFAULT - setvar VAR_0x8005, 14 - call EventScript_ShowPartyMenu - compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA - setflag FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE - goto LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 - end - -LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA:: @ 82C81DA - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C78D1, MSGBOX_DEFAULT - release - end - -LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4:: @ 82C81E4 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C794B, MSGBOX_DEFAULT - release - end - -MossdeepCity_EventScript_2C81EE:: @ 82C81EE - lock - faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH, MossdeepCity_EventScript_2C824C - msgbox MossdeepCity_Text_2C79A6, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_EventScript_2C8242 - call MossdeepCity_EventScript_2C832D - compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_EventScript_2C8242 - msgbox MossdeepCity_Text_2C7B0D, MSGBOX_DEFAULT - setvar VAR_0x8005, 15 - call EventScript_ShowPartyMenu - compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_EventScript_2C8242 - setflag FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH - goto MossdeepCity_EventScript_2C824C - end - -MossdeepCity_EventScript_2C8242:: @ 82C8242 - msgbox MossdeepCity_Text_2C7AD4, MSGBOX_DEFAULT - release - end - -MossdeepCity_EventScript_2C824C:: @ 82C824C - msgbox MossdeepCity_Text_2C7B4F, MSGBOX_DEFAULT - release - end - -SootopolisCity_PokemonCenter_1F_EventScript_2C8256:: @ 82C8256 - lock - faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE, SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7B8E, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA - call SootopolisCity_PokemonCenter_1F_EventScript_2C832D - compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C98, MSGBOX_DEFAULT - setvar VAR_0x8005, 4 - call EventScript_ShowPartyMenu - compare VAR_RESULT, 0 - goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA - setflag FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE - goto SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 - end - -SootopolisCity_PokemonCenter_1F_EventScript_2C82AA:: @ 82C82AA - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C7E, MSGBOX_DEFAULT - release - end - -SootopolisCity_PokemonCenter_1F_EventScript_2C82B4:: @ 82C82B4 - msgbox SootopolisCity_PokemonCenter_1F_Text_2C7CC8, MSGBOX_DEFAULT - release - end - -PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE:: @ 82C82BE - lock - faceplayer - goto_if_set FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION, PacifidlogTown_PokemonCenter_1F_EventScript_2C831C - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7CFA, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 - call PacifidlogTown_PokemonCenter_1F_EventScript_2C832D - compare VAR_RESULT, 0 - goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E40, MSGBOX_DEFAULT - setvar VAR_0x8005, 12 - call EventScript_ShowPartyMenu - compare VAR_RESULT, 0 - goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 - setflag FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION - goto PacifidlogTown_PokemonCenter_1F_EventScript_2C831C - end - -PacifidlogTown_PokemonCenter_1F_EventScript_2C8312:: @ 82C8312 - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E04, MSGBOX_DEFAULT - release - end - -PacifidlogTown_PokemonCenter_1F_EventScript_2C831C:: @ 82C831C - msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E7A, MSGBOX_DEFAULT - release - end - -EventScript_ShowPartyMenu:: @ 82C8326 - special sub_81B892C - waitstate - lock - faceplayer - return - -FallarborTown_Mart_EventScript_2C832D:: @ 82C832D -FortreeCity_House2_EventScript_2C832D:: @ 82C832D -LavaridgeTown_House_EventScript_2C832D:: @ 82C832D -LilycoveCity_DepartmentStoreRooftop_EventScript_2C832D:: @ 82C832D -MauvilleCity_EventScript_2C832D:: @ 82C832D -MossdeepCity_EventScript_2C832D:: @ 82C832D -PacifidlogTown_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D -SlateportCity_PokemonFanClub_EventScript_2C832D:: @ 82C832D -SootopolisCity_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D -VerdanturfTown_PokemonCenter_1F_EventScript_2C832D:: @ 82C832D - msgbox MauvilleCity_Text_2C6E05, MSGBOX_YESNO - return - -TrainerHill_1F_MapScript1_2C8336: @ 82C8336 -TrainerHill_2F_MapScript1_2C8336: @ 82C8336 -TrainerHill_3F_MapScript1_2C8336: @ 82C8336 -TrainerHill_4F_MapScript1_2C8336: @ 82C8336 -TrainerHill_Roof_MapScript1_2C8336: @ 82C8336 - setvar VAR_TEMP_2, 0 - setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER - special CallTrainerHillFunction - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 5 - special CallFrontierUtilFunc - compare VAR_RESULT, B_OUTCOME_LOST - goto_if_eq TrainerHill_1F_EventScript_2C83C9 - compare VAR_RESULT, B_OUTCOME_DREW - goto_if_eq TrainerHill_1F_EventScript_2C83C9 - compare VAR_RESULT, B_OUTCOME_FORFEITED - goto_if_eq TrainerHill_1F_EventScript_2C83C9 - end - -TrainerHill_1F_MapScript2_2C8372: @ 82C8372 -TrainerHill_2F_MapScript2_2C8372: @ 82C8372 - map_script_2 VAR_TEMP_3, 0, TrainerHill_1F_EventScript_2C837C - .2byte 0 - -TrainerHill_1F_EventScript_2C837C:: @ 82C837C - setvar VAR_TEMP_3, 1 -@ forced stop - -TrainerHill_1F_MapScript2_2C8381: @ 82C8381 -TrainerHill_2F_MapScript2_2C8381: @ 82C8381 -TrainerHill_3F_MapScript2_2C8381: @ 82C8381 -TrainerHill_4F_MapScript2_2C8381: @ 82C8381 -TrainerHill_Roof_MapScript2_2C8381: @ 82C8381 - map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_2C83A6 - map_script_2 VAR_TEMP_1, 1, TrainerHill_1F_EventScript_2C83DF - .2byte 0 - -EventScript_TrainerHillTimer:: @ 82C8393 - lockall - setvar VAR_0x8004, TRAINER_HILL_FUNC_7 - special CallTrainerHillFunction - msgbox TrainerHill_Entrance_Text_268D47, MSGBOX_DEFAULT - releaseall - end - -TrainerHill_1F_EventScript_2C83A6:: @ 82C83A6 - setvar VAR_TEMP_2, 1 - setvar VAR_0x8004, TRAINER_HILL_FUNC_9 - special CallTrainerHillFunction - compare VAR_RESULT, 1 - goto_if_eq TrainerHill_1F_EventScript_2C83BF - end - -TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF - warpsilent MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6 - waitstate - end - -TrainerHill_1F_EventScript_2C83C9:: @ 82C83C9 - setvar VAR_0x8004, TRAINER_HILL_FUNC_12 - special CallTrainerHillFunction - setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_LOST - special CallTrainerHillFunction - setvar VAR_TEMP_1, 1 - end - -TrainerHill_1F_EventScript_2C83DF:: @ 82C83DF -TrainerHill_Entrance_EventScript_2C83DF:: @ 82C83DF - setvar VAR_TEMP_1, 0 - warp MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6 - waitstate - end - -TrainerHill_1F_Movement_2C83EE:: @ 82C83EE - set_invisible - step_end - -EventScript_2C83F0:: @ 82C83F0 - trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText - setvar VAR_0x8004, TRAINER_HILL_FUNC_11 - special CallTrainerHillFunction - waitmessage - waitbuttonpress - closemessage - end - -Text_ThisIsATestSignpostMsg:: @ 82C840A - .string "This is a test message.\n" - .string "This is a signpost.$" - -EventScript_TestSignpostMsg:: @ 82C8436 - msgbox Text_ThisIsATestSignpostMsg, MSGBOX_SIGN - end - -gText_082C843F:: @ 82C843F - .string "It's very disappointing…$" - -gText_082C8458:: @ 82C8458 - .string "Okay, I understand…$" - -gText_082C846C:: @ 82C846C - .string "I'm terribly sorry…$" - -gText_082C8480:: @ 82C8480 - .string "Thank you…$" - -gText_082C848B:: @ 82C848B - .string "Ahahaha! Aren't you embarrassed?\n" - .string "Everyone's watching!$" - -gText_082C84C1:: @ 82C84C1 - .string "Grr…\n" - .string "What the…$" - -gText_082C84D0:: @ 82C84D0 - .string "My DOME ACE title isn't just for show!$" - -gText_082C84F7:: @ 82C84F7 - .string "Ahahaha!\n" - .string "You're inspiring!$" - -gText_082C8512:: @ 82C8512 - .string "Way to work!\n" - .string "That was a good lesson, eh?$" - -gText_082C853B:: @ 82C853B - .string "Good job!\n" - .string "You know what you're doing!$" - -gText_082C8561:: @ 82C8561 - .string "Hey, hey, hey!\n" - .string "You're finished already?$" - -gText_082C8589:: @ 82C8589 - .string "What happened here?$" - -gText_082C859D:: @ 82C859D - .string "Humph…$" - -gText_082C85A4:: @ 82C85A4 - .string "Urk…$" - -gText_082C85A9:: @ 82C85A9 - .string "Hah!$" - -gText_082C85AE:: @ 82C85AE - .string "Darn!$" - -gText_082C85B4:: @ 82C85B4 - .string "Oh, come on!\n" - .string "You have to try harder than that!$" - -gText_082C85E3:: @ 82C85E3 - .string "No way!\n" - .string "Good job!$" - -gText_082C85F5:: @ 82C85F5 - .string "Heheh!\n" - .string "What did you expect?$" - -gText_082C8611:: @ 82C8611 - .string "Huh?\n" - .string "Are you serious?!$" - -gText_082C8628:: @ 82C8628 - .string "Your POKéMON are wimpy because\n" - .string "you're wimpy as a TRAINER!$" - -gText_082C8662:: @ 82C8662 - .string "Ah…\n" - .string "Now this is something else…$" - -gText_082C8682:: @ 82C8682 - .string "Gwahahaha!\n" - .string "My brethren, we have nothing to fear!$" - -gText_082C86B3:: @ 82C86B3 - .string "Gwah!\n" - .string "Hahahaha!$" - -gText_082C86C3:: @ 82C86C3 - .string "Hey! What's wrong with you!\n" - .string "Let's see some effort! Get up!$" - -gText_082C86FE:: @ 82C86FE - .string "That's it! You've done great!\n" - .string "You've worked hard for this!$" - -gText_082C8739:: @ 82C8739 - .string "Hey! Don't you give up now!\n" - .string "Get up! Don't lose faith in yourself!$" - -gText_082C877B:: @ 82C877B - .string "That's it! You've done it!\n" - .string "You kept working for this!$" - - .align 2 + .include "data/text/move_tutors.inc" + .include "data/scripts/move_tutors.inc" + .include "data/scripts/trainer_hill.inc" + .include "data/scripts/test_signpost.inc" + .include "data/text/frontier_brain.inc" .include "data/text/save.inc" .include "data/text/birch_speech.inc" diff --git a/data/io_reg.s b/data/io_reg.s index 9c5f64f58..0941b4345 100644 --- a/data/io_reg.s +++ b/data/io_reg.s @@ -7,31 +7,31 @@ .align 2 gUnref_82EC784:: @ 82EC784 - .4byte 0x00000000 - .4byte 0x00000000 - .4byte 0x04000008 - .4byte 0x0400000A - .4byte 0x0400000C - .4byte 0x0400000E - .4byte 0x04000010 - .4byte 0x04000014 - .4byte 0x04000018 - .4byte 0x0400001C - .4byte 0x04000012 - .4byte 0x04000016 - .4byte 0x0400001A - .4byte 0x0400001E - .4byte 0x02000100 - .4byte 0x08000400 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x04000008 + .4byte 0x0400000A + .4byte 0x0400000C + .4byte 0x0400000E + .4byte 0x04000010 + .4byte 0x04000014 + .4byte 0x04000018 + .4byte 0x0400001C + .4byte 0x04000012 + .4byte 0x04000016 + .4byte 0x0400001A + .4byte 0x0400001E + .4byte 0x02000100 + .4byte 0x08000400 gOverworldBackgroundLayerFlags:: @ 82EC7C4 - .2byte 0x0100 /* BLDCNT_TGT2_BG0 */ - .2byte 0x0200 /* BLDCNT_TGT2_BG1 */ - .2byte 0x0400 /* BLDCNT_TGT2_BG2 */ - .2byte 0x0800 /* BLDCNT_TGT2_BG3 */ + .2byte BLDCNT_TGT2_BG0 + .2byte BLDCNT_TGT2_BG1 + .2byte BLDCNT_TGT2_BG2 + .2byte BLDCNT_TGT2_BG3 -gUnknown_82EC7CC:: @ 82EC7CC - .2byte 0x0001 - .2byte 0x0002 - .2byte 0x0004 - .2byte 0x0008 +gOrbEffectBackgroundLayerFlags:: @ 82EC7CC + .2byte BLDCNT_TGT1_BG0 + .2byte BLDCNT_TGT1_BG1 + .2byte BLDCNT_TGT1_BG2 + .2byte BLDCNT_TGT1_BG3 diff --git a/data/maps/AbandonedShip_Rooms_1F/scripts.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc index 5797ed5fb..2c3ff862a 100644 --- a/data/maps/AbandonedShip_Rooms_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc @@ -20,7 +20,7 @@ AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3 end AbandonedShip_Rooms_1F_EventScript_237ADF:: @ 8237ADF - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox AbandonedShip_Rooms_1F_Text_237C2A, MSGBOX_DEFAULT register_matchcall TRAINER_THALIA_1 diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json index 9de100bff..9229f7581 100644 --- a/data/maps/AncientTomb/map.json +++ b/data/maps/AncientTomb/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AncientTomb_EventScript_23905A", + "script": "AncientTomb_EventScript_Registeel", "flag": "FLAG_HIDE_REGISTEEL" } ], @@ -59,7 +59,7 @@ "y": 20, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AncientTomb_EventScript_239033" + "script": "AncientTomb_EventScript_CaveEntranceMiddle" }, { "type": "sign", @@ -67,7 +67,7 @@ "y": 20, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AncientTomb_EventScript_239050" + "script": "AncientTomb_EventScript_CaveEntranceSide" }, { "type": "sign", @@ -75,7 +75,7 @@ "y": 20, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "AncientTomb_EventScript_239050" + "script": "AncientTomb_EventScript_CaveEntranceSide" } ] }
\ No newline at end of file diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index 9bc404af6..95dd85d28 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -1,34 +1,34 @@ AncientTomb_MapScripts:: @ 8238FB3 - map_script MAP_SCRIPT_ON_RESUME, AncientTomb_MapScript1_238FC3 - map_script MAP_SCRIPT_ON_LOAD, AncientTomb_MapScript1_238FF2 + map_script MAP_SCRIPT_ON_RESUME, AncientTomb_OnResume + map_script MAP_SCRIPT_ON_LOAD, AncientTomb_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_OnTransition .byte 0 -AncientTomb_MapScript1_238FC3: @ 8238FC3 - call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AncientTomb_EventScript_238FCD +AncientTomb_OnResume: @ 8238FC3 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AncientTomb_EventScript_TryRemoveRegisteel end -AncientTomb_EventScript_238FCD:: @ 8238FCD +AncientTomb_EventScript_TryRemoveRegisteel:: @ 8238FCD specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return AncientTomb_OnTransition: @ 8238FE1 setflag FLAG_LANDMARK_ANCIENT_TOMB - call_if_unset FLAG_DEFEATED_REGISTEEL, AncientTomb_EventScript_238FEE + call_if_unset FLAG_DEFEATED_REGISTEEL, AncientTomb_EventScript_ShowRegisteel end -AncientTomb_EventScript_238FEE:: @ 8238FEE +AncientTomb_EventScript_ShowRegisteel:: @ 8238FEE clearflag FLAG_HIDE_REGISTEEL return -AncientTomb_MapScript1_238FF2: @ 8238FF2 - call_if_unset FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_238FFC +AncientTomb_OnLoad: @ 8238FF2 + call_if_unset FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_HideRegiEntrance end -AncientTomb_EventScript_238FFC:: @ 8238FFC +AncientTomb_EventScript_HideRegiEntrance:: @ 8238FFC setmetatile 7, 19, METATILE_Cave_EntranceCover, 1 setmetatile 8, 19, METATILE_Cave_EntranceCover, 1 setmetatile 9, 19, METATILE_Cave_EntranceCover, 1 @@ -37,29 +37,29 @@ AncientTomb_EventScript_238FFC:: @ 8238FFC setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, 1 return -AncientTomb_EventScript_239033:: @ 8239033 +AncientTomb_EventScript_CaveEntranceMiddle:: @ 8239033 lockall - goto_if_set FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_239046 - braillemessage AncientTomb_Braille_2A6D06 + goto_if_set FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_BigHoleInWall + braillemessage AncientTomb_Braille_ShineInTheMiddle waitbuttonpress - hidebox2 + closebraillemessage releaseall end -AncientTomb_EventScript_239046:: @ 8239046 - msgbox gUnknown_0827304E, MSGBOX_DEFAULT +AncientTomb_EventScript_BigHoleInWall:: @ 8239046 + msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT releaseall end -AncientTomb_EventScript_239050:: @ 8239050 +AncientTomb_EventScript_CaveEntranceSide:: @ 8239050 lockall - braillemessage AncientTomb_Braille_2A6D06 + braillemessage AncientTomb_Braille_ShineInTheMiddle waitbuttonpress - hidebox2 + closebraillemessage releaseall end -AncientTomb_EventScript_23905A:: @ 823905A +AncientTomb_EventScript_Registeel:: @ 823905A lock faceplayer waitse @@ -72,23 +72,23 @@ AncientTomb_EventScript_23905A:: @ 823905A waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 - goto_if_eq AncientTomb_EventScript_2390A1 - compare VAR_RESULT, 4 - goto_if_eq AncientTomb_EventScript_2390AA - compare VAR_RESULT, 5 - goto_if_eq AncientTomb_EventScript_2390AA + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq AncientTomb_EventScript_DefeatedRegisteel + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq AncientTomb_EventScript_RanFromRegisteel + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq AncientTomb_EventScript_RanFromRegisteel setflag FLAG_DEFEATED_REGISTEEL release end -AncientTomb_EventScript_2390A1:: @ 82390A1 +AncientTomb_EventScript_DefeatedRegisteel:: @ 82390A1 setflag FLAG_DEFEATED_REGISTEEL - goto AncientTomb_EventScript_27376D + goto Common_EventScript_RemoveStaticPokemon end -AncientTomb_EventScript_2390AA:: @ 82390AA - setvar VAR_0x8004, 403 - goto AncientTomb_EventScript_273776 +AncientTomb_EventScript_RanFromRegisteel:: @ 82390AA + setvar VAR_0x8004, SPECIES_REGISTEEL + goto Common_EventScript_LegendaryFlewAway end diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json index 5f585f32f..25fe48a9e 100644 --- a/data/maps/AquaHideout_1F/map.json +++ b/data/maps/AquaHideout_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AquaHideout_1F_EventScript_233494", + "script": "AquaHideout_1F_EventScript_HideoutEntranceGrunt1", "flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AquaHideout_1F_EventScript_2334C6", + "script": "AquaHideout_1F_EventScript_HideoutEntranceGrunt2", "flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE" }, { @@ -50,7 +50,7 @@ "movement_range_y": 5, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "AquaHideout_1F_EventScript_2334F8", + "script": "AquaHideout_1F_EventScript_Grunt1", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" } ], diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc index 653e0f7c7..ff8b6c16d 100644 --- a/data/maps/AquaHideout_1F/scripts.inc +++ b/data/maps/AquaHideout_1F/scripts.inc @@ -1,55 +1,56 @@ AquaHideout_1F_MapScripts:: @ 8233493 .byte 0 -AquaHideout_1F_EventScript_233494:: @ 8233494 +@ The below two entrance guards give hints about what to do to progress the story +AquaHideout_1F_EventScript_HideoutEntranceGrunt1:: @ 8233494 lock faceplayer - goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, AquaHideout_1F_EventScript_2334BC - goto_if_set FLAG_RECEIVED_RED_OR_BLUE_ORB, AquaHideout_1F_EventScript_2334B2 - msgbox AquaHideout_1F_Text_23351D, MSGBOX_DEFAULT + goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, AquaHideout_1F_EventScript_SlateportHint1 + goto_if_set FLAG_RECEIVED_RED_OR_BLUE_ORB, AquaHideout_1F_EventScript_MagmaHideoutHint1 + msgbox AquaHideout_1F_Text_OurBossIsSnatchingSomething, MSGBOX_DEFAULT release end -AquaHideout_1F_EventScript_2334B2:: @ 82334B2 - msgbox AquaHideout_1F_Text_2335E3, MSGBOX_DEFAULT +AquaHideout_1F_EventScript_MagmaHideoutHint1:: @ 82334B2 + msgbox AquaHideout_1F_Text_WhereMightMagmaHideoutBe, MSGBOX_DEFAULT release end -AquaHideout_1F_EventScript_2334BC:: @ 82334BC - msgbox AquaHideout_1F_Text_23367D, MSGBOX_DEFAULT +AquaHideout_1F_EventScript_SlateportHint1:: @ 82334BC + msgbox AquaHideout_1F_Text_BossWentToJackASubmarine, MSGBOX_DEFAULT release end -AquaHideout_1F_EventScript_2334C6:: @ 82334C6 +AquaHideout_1F_EventScript_HideoutEntranceGrunt2:: @ 82334C6 lock faceplayer - goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, AquaHideout_1F_EventScript_2334EE - goto_if_set FLAG_RECEIVED_RED_OR_BLUE_ORB, AquaHideout_1F_EventScript_2334E4 - msgbox AquaHideout_1F_Text_233739, MSGBOX_DEFAULT + goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, AquaHideout_1F_EventScript_SlateportHint2 + goto_if_set FLAG_RECEIVED_RED_OR_BLUE_ORB, AquaHideout_1F_EventScript_MagmaHideoutHint2 + msgbox AquaHideout_1F_Text_BossIsOnRoute122, MSGBOX_DEFAULT release end -AquaHideout_1F_EventScript_2334E4:: @ 82334E4 - msgbox AquaHideout_1F_Text_2337FA, MSGBOX_DEFAULT +AquaHideout_1F_EventScript_MagmaHideoutHint2:: @ 82334E4 + msgbox AquaHideout_1F_Text_TeamMagmaAtMtChimney, MSGBOX_DEFAULT release end -AquaHideout_1F_EventScript_2334EE:: @ 82334EE - msgbox AquaHideout_1F_Text_233884, MSGBOX_DEFAULT +AquaHideout_1F_EventScript_SlateportHint2:: @ 82334EE + msgbox AquaHideout_1F_Text_BossIsInSlateportCity, MSGBOX_DEFAULT release end -AquaHideout_1F_EventScript_2334F8:: @ 82334F8 - trainerbattle_single TRAINER_GRUNT_1, AquaHideout_1F_Text_23393D, AquaHideout_1F_Text_233964, AquaHideout_1F_EventScript_233513 - msgbox AquaHideout_1F_Text_233977, MSGBOX_AUTOCLOSE +AquaHideout_1F_EventScript_Grunt1:: @ 82334F8 + trainerbattle_single TRAINER_GRUNT_1, AquaHideout_1F_Text_Grunt1Intro, AquaHideout_1F_Text_Grunt1Defeat, AquaHideout_1F_EventScript_Grunt1Defeated + msgbox AquaHideout_1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -AquaHideout_1F_EventScript_233513:: @ 8233513 - msgbox AquaHideout_1F_Text_233977, MSGBOX_DEFAULT +AquaHideout_1F_EventScript_Grunt1Defeated:: @ 8233513 + msgbox AquaHideout_1F_Text_Grunt1PostBattle, MSGBOX_DEFAULT release end -AquaHideout_1F_Text_23351D: @ 823351D +AquaHideout_1F_Text_OurBossIsSnatchingSomething: @ 823351D .string "What? What? What do you want with \n" .string "TEAM AQUA?\p" .string "Our BOSS isn't here! He's gone off to\n" @@ -59,7 +60,7 @@ AquaHideout_1F_Text_23351D: @ 823351D .string "Wahaha! Do you really think I'd tell\n" .string "you something that crucial?$" -AquaHideout_1F_Text_2335E3: @ 82335E3 +AquaHideout_1F_Text_WhereMightMagmaHideoutBe: @ 82335E3 .string "What? What?\n" .string "Are you a TEAM MAGMA grunt?\p" .string "I hear that TEAM MAGMA is trying to\n" @@ -67,7 +68,7 @@ AquaHideout_1F_Text_2335E3: @ 82335E3 .string "HIDEOUT.\p" .string "But where might their HIDEOUT be?$" -AquaHideout_1F_Text_23367D: @ 823367D +AquaHideout_1F_Text_BossWentToJackASubmarine: @ 823367D .string "What? What? What do you want with \n" .string "TEAM AQUA?\p" .string "Our BOSS isn't here!\n" @@ -77,7 +78,7 @@ AquaHideout_1F_Text_23367D: @ 823367D .string "Wahaha! Do you really think I'd tell\n" .string "you something that crucial?$" -AquaHideout_1F_Text_233739: @ 8233739 +AquaHideout_1F_Text_BossIsOnRoute122: @ 8233739 .string "What? What? What do you want with \n" .string "TEAM AQUA?\p" .string "Our BOSS isn't here! He's on his way to\n" @@ -87,14 +88,14 @@ AquaHideout_1F_Text_233739: @ 8233739 .string "Wahaha! Do you really think I'd tell\n" .string "you something that crucial?$" -AquaHideout_1F_Text_2337FA: @ 82337FA +AquaHideout_1F_Text_TeamMagmaAtMtChimney: @ 82337FA .string "What? What?\n" .string "Are you a TEAM MAGMA grunt?\p" .string "I hear that TEAM MAGMA is after\n" .string "an awesome POKéMON at MT. CHIMNEY.\p" .string "But what is that POKéMON like?$" -AquaHideout_1F_Text_233884: @ 8233884 +AquaHideout_1F_Text_BossIsInSlateportCity: @ 8233884 .string "What? What? What do you want with\n" .string "TEAM AQUA?\p" .string "Our BOSS isn't here!\n" @@ -104,15 +105,15 @@ AquaHideout_1F_Text_233884: @ 8233884 .string "Wahaha! Do you really think I'd tell\n" .string "you something that crucial?$" -AquaHideout_1F_Text_23393D: @ 823393D +AquaHideout_1F_Text_Grunt1Intro: @ 823393D .string "Ayiyiyi!\n" .string "Suspicious character spotted!$" -AquaHideout_1F_Text_233964: @ 8233964 +AquaHideout_1F_Text_Grunt1Defeat: @ 8233964 .string "Grrrrr…\n" .string "I lost it!$" -AquaHideout_1F_Text_233977: @ 8233977 +AquaHideout_1F_Text_Grunt1PostBattle: @ 8233977 .string "I took the loss for the TEAM,\n" .string "but I did my job…$" diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json index 8cdc901ec..78e37bdf9 100644 --- a/data/maps/AquaHideout_B1F/map.json +++ b/data/maps/AquaHideout_B1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "AquaHideout_B1F_EventScript_233A85", + "script": "AquaHideout_B1F_EventScript_Grunt2", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "AquaHideout_B1F_EventScript_233AB0", + "script": "AquaHideout_B1F_EventScript_Grunt3", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "AquaHideout_B1F_EventScript_233AD5", + "script": "AquaHideout_B1F_EventScript_Grunt21", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AquaHideout_B1F_EventScript_2339EB", + "script": "AquaHideout_B1F_EventScript_Electrode1", "flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1" }, { @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AquaHideout_B1F_EventScript_233A38", + "script": "AquaHideout_B1F_EventScript_Electrode2", "flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2" }, { @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "AquaHideout_B1F_EventScript_233AEC", + "script": "AquaHideout_B1F_EventScript_Grunt25", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" } ], diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 589e41612..8b1a07c54 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -1,33 +1,33 @@ AquaHideout_B1F_MapScripts:: @ 82339A7 - map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_MapScript1_2339B2 + map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_OnResume map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_OnTransition .byte 0 -AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 - call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AquaHideout_B1F_EventScript_2339BC +AquaHideout_B1F_OnResume: @ 82339B2 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AquaHideout_B1F_EventScript_TryRemoveElectrode end -AquaHideout_B1F_EventScript_2339BC:: @ 82339BC +AquaHideout_B1F_EventScript_TryRemoveElectrode:: @ 82339BC specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return AquaHideout_B1F_OnTransition: @ 82339D0 - call_if_unset FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_2339E3 - call_if_unset FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_2339E7 + call_if_unset FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_ShowElectrode1 + call_if_unset FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_ShowElectrode2 end -AquaHideout_B1F_EventScript_2339E3:: @ 82339E3 +AquaHideout_B1F_EventScript_ShowElectrode1:: @ 82339E3 clearflag FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1 return -AquaHideout_B1F_EventScript_2339E7:: @ 82339E7 +AquaHideout_B1F_EventScript_ShowElectrode2:: @ 82339E7 clearflag FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2 return -AquaHideout_B1F_EventScript_2339EB:: @ 82339EB +AquaHideout_B1F_EventScript_Electrode1:: @ 82339EB lock faceplayer setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE @@ -39,22 +39,22 @@ AquaHideout_B1F_EventScript_2339EB:: @ 82339EB dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 - goto_if_eq AquaHideout_B1F_EventScript_233A2F - compare VAR_RESULT, 4 - goto_if_eq AquaHideout_B1F_EventScript_233A2F - compare VAR_RESULT, 5 - goto_if_eq AquaHideout_B1F_EventScript_233A2F + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode1 + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode1 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode1 setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT release end -AquaHideout_B1F_EventScript_233A2F:: @ 8233A2F +AquaHideout_B1F_EventScript_DefeatedElectrode1:: @ 8233A2F setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT - goto AquaHideout_B1F_EventScript_27376D + goto Common_EventScript_RemoveStaticPokemon end -AquaHideout_B1F_EventScript_233A38:: @ 8233A38 +AquaHideout_B1F_EventScript_Electrode2:: @ 8233A38 lock faceplayer setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE @@ -66,102 +66,102 @@ AquaHideout_B1F_EventScript_233A38:: @ 8233A38 dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 - goto_if_eq AquaHideout_B1F_EventScript_233A7C - compare VAR_RESULT, 4 - goto_if_eq AquaHideout_B1F_EventScript_233A7C - compare VAR_RESULT, 5 - goto_if_eq AquaHideout_B1F_EventScript_233A7C + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode2 + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode2 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode2 setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT release end -AquaHideout_B1F_EventScript_233A7C:: @ 8233A7C +AquaHideout_B1F_EventScript_DefeatedElectrode2:: @ 8233A7C setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT - goto AquaHideout_B1F_EventScript_27376D + goto Common_EventScript_RemoveStaticPokemon end -AquaHideout_B1F_EventScript_233A85:: @ 8233A85 - trainerbattle_single TRAINER_GRUNT_2, AquaHideout_B1F_Text_233B03, AquaHideout_B1F_Text_233B4A, AquaHideout_B1F_EventScript_233AA0 - msgbox AquaHideout_B1F_Text_233B5E, MSGBOX_AUTOCLOSE +AquaHideout_B1F_EventScript_Grunt2:: @ 8233A85 + trainerbattle_single TRAINER_GRUNT_2, AquaHideout_B1F_Text_Grunt2Intro, AquaHideout_B1F_Text_Grunt2Defeat, AquaHideout_B1F_EventScript_Grunt2Defeated + msgbox AquaHideout_B1F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end -AquaHideout_B1F_EventScript_233AA0:: @ 8233AA0 - special sub_80B4808 +AquaHideout_B1F_EventScript_Grunt2Defeated:: @ 8233AA0 + special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox AquaHideout_B1F_Text_233B5E, MSGBOX_DEFAULT + msgbox AquaHideout_B1F_Text_Grunt2PostBattle, MSGBOX_DEFAULT release end -AquaHideout_B1F_EventScript_233AB0:: @ 8233AB0 - trainerbattle_single TRAINER_GRUNT_3, AquaHideout_B1F_Text_233BC5, AquaHideout_B1F_Text_233C27, AquaHideout_B1F_EventScript_233ACB - msgbox AquaHideout_B1F_Text_233C41, MSGBOX_AUTOCLOSE +AquaHideout_B1F_EventScript_Grunt3:: @ 8233AB0 + trainerbattle_single TRAINER_GRUNT_3, AquaHideout_B1F_Text_Grunt3Intro, AquaHideout_B1F_Text_Grunt3Defeat, AquaHideout_B1F_EventScript_Grunt3Defeated + msgbox AquaHideout_B1F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE end -AquaHideout_B1F_EventScript_233ACB:: @ 8233ACB - msgbox AquaHideout_B1F_Text_233C41, MSGBOX_DEFAULT +AquaHideout_B1F_EventScript_Grunt3Defeated:: @ 8233ACB + msgbox AquaHideout_B1F_Text_Grunt3PostBattle, MSGBOX_DEFAULT release end -AquaHideout_B1F_EventScript_233AD5:: @ 8233AD5 - trainerbattle_single TRAINER_GRUNT_21, AquaHideout_B1F_Text_233C89, AquaHideout_B1F_Text_233CCA - msgbox AquaHideout_B1F_Text_233CDC, MSGBOX_AUTOCLOSE +AquaHideout_B1F_EventScript_Grunt21:: @ 8233AD5 + trainerbattle_single TRAINER_GRUNT_21, AquaHideout_B1F_Text_Grunt21Intro, AquaHideout_B1F_Text_Grunt21Defeat + msgbox AquaHideout_B1F_Text_Grunt21PostBattle, MSGBOX_AUTOCLOSE end -AquaHideout_B1F_EventScript_233AEC:: @ 8233AEC - trainerbattle_single TRAINER_GRUNT_25, AquaHideout_B1F_Text_233D1B, AquaHideout_B1F_Text_233D6E - msgbox AquaHideout_B1F_Text_233D84, MSGBOX_AUTOCLOSE +AquaHideout_B1F_EventScript_Grunt25:: @ 8233AEC + trainerbattle_single TRAINER_GRUNT_25, AquaHideout_B1F_Text_Grunt25Intro, AquaHideout_B1F_Text_Grunt25Defeat + msgbox AquaHideout_B1F_Text_Grunt25PostBattle, MSGBOX_AUTOCLOSE end -AquaHideout_B1F_Text_233B03: @ 8233B03 +AquaHideout_B1F_Text_Grunt2Intro: @ 8233B03 .string "If you want to know the secret about\n" .string "our HIDEOUT, you have me to beat!$" -AquaHideout_B1F_Text_233B4A: @ 8233B4A +AquaHideout_B1F_Text_Grunt2Defeat: @ 8233B4A .string "I can't win at all…$" -AquaHideout_B1F_Text_233B5E: @ 8233B5E +AquaHideout_B1F_Text_Grunt2PostBattle: @ 8233B5E .string "Our HIDEOUT's secret?\p" .string "Well, let's just say…\n" .string "There's a submarine at the far end!\p" .string "But, by now…\n" .string "Kekekeke…$" -AquaHideout_B1F_Text_233BC5: @ 8233BC5 +AquaHideout_B1F_Text_Grunt3Intro: @ 8233BC5 .string "Fuel supply loaded A-OK!\n" .string "In-cruise snacks loaded A-OK!\p" .string "Nothing left to do but KO a pesky\n" .string "meddler!$" -AquaHideout_B1F_Text_233C27: @ 8233C27 +AquaHideout_B1F_Text_Grunt3Defeat: @ 8233C27 .string "I took a serious licking!$" -AquaHideout_B1F_Text_233C41: @ 8233C41 +AquaHideout_B1F_Text_Grunt3PostBattle: @ 8233C41 .string "Humph!\n" .string "This was supposed to happen!\p" .string "My mission was to just hold you up!$" -AquaHideout_B1F_Text_233C89: @ 8233C89 +AquaHideout_B1F_Text_Grunt21Intro: @ 8233C89 .string "Yawn… Keeping watch over the\n" .string "HIDEOUT bores me. I'll take you on.$" -AquaHideout_B1F_Text_233CCA: @ 8233CCA +AquaHideout_B1F_Text_Grunt21Defeat: @ 8233CCA .string "Yawn…\n" .string "Oh, I lost…$" -AquaHideout_B1F_Text_233CDC: @ 8233CDC +AquaHideout_B1F_Text_Grunt21PostBattle: @ 8233CDC .string "If you scurry too much, other TEAM\n" .string "AQUA members might get you.$" -AquaHideout_B1F_Text_233D1B: @ 8233D1B +AquaHideout_B1F_Text_Grunt25Intro: @ 8233D1B .string "Hey!\n" .string "You there!\p" .string "Which do you think is cooler?\n" .string "TEAM AQUA's uniform or TEAM MAGMA's?$" -AquaHideout_B1F_Text_233D6E: @ 8233D6E +AquaHideout_B1F_Text_Grunt25Defeat: @ 8233D6E .string "I lost in a cool way…$" -AquaHideout_B1F_Text_233D84: @ 8233D84 +AquaHideout_B1F_Text_Grunt25PostBattle: @ 8233D84 .string "If you have a cool uniform, you look\n" .string "good even in a loss, don't you think?$" diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json index b286872af..a5d58554d 100644 --- a/data/maps/AquaHideout_B2F/map.json +++ b/data/maps/AquaHideout_B2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AquaHideout_B2F_EventScript_233E09", + "script": "AquaHideout_B2F_EventScript_Matt", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, { @@ -37,7 +37,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "AquaHideout_B2F_EventScript_233E8A", + "script": "AquaHideout_B2F_EventScript_Grunt4", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "AquaHideout_B2F_EventScript_233EAF", + "script": "AquaHideout_B2F_EventScript_Grunt22", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "AquaHideout_B2F_EventScript_233EC6", + "script": "AquaHideout_B2F_EventScript_Grunt26", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" } ], @@ -173,7 +173,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "AquaHideout_B2F_EventScript_233DE5" + "script": "AquaHideout_B2F_EventScript_MattNoticePlayer" }, { "type": "trigger", @@ -182,7 +182,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "AquaHideout_B2F_EventScript_233DE5" + "script": "AquaHideout_B2F_EventScript_MattNoticePlayer" } ], "bg_events": [] diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index 975715fc2..84e0c6622 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -3,16 +3,16 @@ AquaHideout_B2F_MapScripts:: @ 8233DCF .byte 0 AquaHideout_B2F_OnTransition: @ 8233DD5 - call_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, AquaHideout_B2F_EventScript_233DDF + call_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, AquaHideout_B2F_EventScript_PreventMattNoticing end -AquaHideout_B2F_EventScript_233DDF:: @ 8233DDF +AquaHideout_B2F_EventScript_PreventMattNoticing:: @ 8233DDF setvar VAR_TEMP_1, 1 return -AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5 +AquaHideout_B2F_EventScript_MattNoticePlayer:: @ 8233DE5 lockall - setvar VAR_0x8008, 1 + setvar VAR_0x8008, 1 @ Matt object event id playse SE_PIN applymovement VAR_0x8008, Common_Movement_ExclamationMark waitmovement 0 @@ -22,70 +22,71 @@ AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5 releaseall end -AquaHideout_B2F_EventScript_233E09:: @ 8233E09 - trainerbattle_single TRAINER_MATT, AquaHideout_B2F_Text_233EDD, AquaHideout_B2F_Text_233F8D, AquaHideout_B2F_EventScript_233E25 - msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT +AquaHideout_B2F_EventScript_Matt:: @ 8233E09 + trainerbattle_single TRAINER_MATT, AquaHideout_B2F_Text_MattIntro, AquaHideout_B2F_Text_MattDefeat, AquaHideout_B2F_EventScript_SubmarineEscape + msgbox AquaHideout_B2F_Text_MattPostBattle, MSGBOX_DEFAULT release end -AquaHideout_B2F_EventScript_233E25:: @ 8233E25 - setvar VAR_0x8008, 1 - setvar VAR_0x8009, 4 - applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft +AquaHideout_B2F_EventScript_SubmarineEscape:: @ 8233E25 + setvar VAR_0x8008, 1 @ Matt object event id + setvar VAR_0x8009, 4 @ Submarine object event id + applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 20 applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 - msgbox AquaHideout_B2F_Text_233FA6, MSGBOX_DEFAULT + msgbox AquaHideout_B2F_Text_OurBossGotThroughHisPreparations, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft - applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80 + applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestLeft + applymovement VAR_0x8009, AquaHideout_B2F_Movement_SumbarineDepartLeft waitmovement 0 removeobject VAR_0x8009 delay 20 applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 - msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT + msgbox AquaHideout_B2F_Text_MattPostBattle, MSGBOX_DEFAULT setflag FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE setflag FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS release end -AquaHideout_B2F_Movement_233E80: @ 8233E80 +AquaHideout_B2F_Movement_SumbarineDepartLeft: @ 8233E80 walk_left walk_left walk_left walk_left step_end -AquaHideout_B2F_Movement_233E85: @ 8233E85 +@ Unused +AquaHideout_B2F_Movement_SumbarineDepartRight: @ 8233E85 walk_right walk_right walk_right walk_right step_end -AquaHideout_B2F_EventScript_233E8A:: @ 8233E8A - trainerbattle_single TRAINER_GRUNT_4, AquaHideout_B2F_Text_2340B4, AquaHideout_B2F_Text_2340F0, AquaHideout_B2F_EventScript_233EA5 - msgbox AquaHideout_B2F_Text_234112, MSGBOX_AUTOCLOSE +AquaHideout_B2F_EventScript_Grunt4:: @ 8233E8A + trainerbattle_single TRAINER_GRUNT_4, AquaHideout_B2F_Text_Grunt4Intro, AquaHideout_B2F_Text_Grunt4Defeat, AquaHideout_B2F_EventScript_Grunt4Defeated + msgbox AquaHideout_B2F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE end -AquaHideout_B2F_EventScript_233EA5:: @ 8233EA5 - msgbox AquaHideout_B2F_Text_234112, MSGBOX_DEFAULT +AquaHideout_B2F_EventScript_Grunt4Defeated:: @ 8233EA5 + msgbox AquaHideout_B2F_Text_Grunt4PostBattle, MSGBOX_DEFAULT release end -AquaHideout_B2F_EventScript_233EAF:: @ 8233EAF - trainerbattle_single TRAINER_GRUNT_22, AquaHideout_B2F_Text_23412D, AquaHideout_B2F_Text_2341CE - msgbox AquaHideout_B2F_Text_2341FE, MSGBOX_AUTOCLOSE +AquaHideout_B2F_EventScript_Grunt22:: @ 8233EAF + trainerbattle_single TRAINER_GRUNT_22, AquaHideout_B2F_Text_Grunt22Intro, AquaHideout_B2F_Text_Grunt22Defeat + msgbox AquaHideout_B2F_Text_Grunt22PostBattle, MSGBOX_AUTOCLOSE end -AquaHideout_B2F_EventScript_233EC6:: @ 8233EC6 - trainerbattle_single TRAINER_GRUNT_26, AquaHideout_B2F_Text_23426F, AquaHideout_B2F_Text_2342CC - msgbox AquaHideout_B2F_Text_2342FF, MSGBOX_AUTOCLOSE +AquaHideout_B2F_EventScript_Grunt26:: @ 8233EC6 + trainerbattle_single TRAINER_GRUNT_26, AquaHideout_B2F_Text_Grunt26Intro, AquaHideout_B2F_Text_Grunt26Defeat + msgbox AquaHideout_B2F_Text_Grunt26PostBattle, MSGBOX_AUTOCLOSE end -AquaHideout_B2F_Text_233EDD: @ 8233EDD +AquaHideout_B2F_Text_MattIntro: @ 8233EDD .string "Hehehe…\p" .string "Got here already, did you?\n" .string "We underestimated you!\p" @@ -95,16 +96,16 @@ AquaHideout_B2F_Text_233EDD: @ 8233EDD .string "I'm not stalling for time.\n" .string "I'm going to pulverize you!$" -AquaHideout_B2F_Text_233F8D: @ 8233F8D +AquaHideout_B2F_Text_MattDefeat: @ 8233F8D .string "Hehehe…\n" .string "So, I lost, too…$" -AquaHideout_B2F_Text_233FA6: @ 8233FA6 +AquaHideout_B2F_Text_OurBossGotThroughHisPreparations: @ 8233FA6 .string "Hehehe!\p" .string "While I was toying with you, our BOSS\n" .string "got through his preparations!$" -AquaHideout_B2F_Text_233FF2: @ 8233FF2 +AquaHideout_B2F_Text_MattPostBattle: @ 8233FF2 .string "Hehehe!\p" .string "Our BOSS has already gone on his way to\n" .string "some cave under the sea!\p" @@ -114,19 +115,19 @@ AquaHideout_B2F_Text_233FF2: @ 8233FF2 .string "But will you find it then?\n" .string "Hehehe!$" -AquaHideout_B2F_Text_2340B4: @ 82340B4 +AquaHideout_B2F_Text_Grunt4Intro: @ 82340B4 .string "Wahahah, I grew weary of waiting!\n" .string "You owe me a battle, too!$" -AquaHideout_B2F_Text_2340F0: @ 82340F0 +AquaHideout_B2F_Text_Grunt4Defeat: @ 82340F0 .string "Tired of waiting…\n" .string "Lost and dazed…$" -AquaHideout_B2F_Text_234112: @ 8234112 +AquaHideout_B2F_Text_Grunt4PostBattle: @ 8234112 .string "BOSS…\n" .string "Is this good enough?$" -AquaHideout_B2F_Text_23412D: @ 823412D +AquaHideout_B2F_Text_Grunt22Intro: @ 823412D .string "Warp panels, the HIDEOUT's pride\n" .string "and joy!\p" .string "You're clueless about where you are,\n" @@ -134,25 +135,25 @@ AquaHideout_B2F_Text_23412D: @ 823412D .string "Fluster and tire out the enemy, then\n" .string "lower the boom! That's our plan!$" -AquaHideout_B2F_Text_2341CE: @ 82341CE +AquaHideout_B2F_Text_Grunt22Defeat: @ 82341CE .string "What's wrong with you?\n" .string "You're not tired at all!$" -AquaHideout_B2F_Text_2341FE: @ 82341FE +AquaHideout_B2F_Text_Grunt22PostBattle: @ 82341FE .string "That reminds me… I can't remember\n" .string "where I put the MASTER BALL.\p" .string "If I fail to guard it, our BOSS will\n" .string "chew me out…$" -AquaHideout_B2F_Text_23426F: @ 823426F +AquaHideout_B2F_Text_Grunt26Intro: @ 823426F .string "When I joined TEAM AQUA, the first\n" .string "thing I had to learn was how these\l" .string "warp panels connected.$" -AquaHideout_B2F_Text_2342CC: @ 82342CC +AquaHideout_B2F_Text_Grunt26Defeat: @ 82342CC .string "I was too occupied thinking about\n" .string "the warp panels…$" -AquaHideout_B2F_Text_2342FF: @ 82342FF +AquaHideout_B2F_Text_Grunt26PostBattle: @ 82342FF .string "I'll have to learn about how I can\n" .string "battle more effectively…$" diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index 205ee0e71..5f6e78a35 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -6,7 +6,7 @@ BattleFrontier_BattleArenaBattleRoom_MapScripts:: @ 8257487 .byte 0 BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C: @ 825749C - special sub_8139980 + special OffsetCameraForBattle end BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0 @@ -201,9 +201,9 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2577D0:: @ 82577D0 BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA:: @ 82577DA msgbox BattleFrontier_BattleArenaBattleRoom_Text_257E6B, MSGBOX_YESNO switch VAR_RESULT - case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 - case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25789A - case 127, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + case NO, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 + case YES, BattleFrontier_BattleArenaBattleRoom_EventScript_25789A + case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 BattleFrontier_BattleArenaBattleRoom_EventScript_257808:: @ 8257808 message BattleFrontier_BattleArenaBattleRoom_Text_257E9E diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 0c55e9917..00feed9c9 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -173,9 +173,9 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FF8 msgbox BattleFrontier_BattleArenaLobby_Text_2564CE, MSGBOX_YESNO switch VAR_RESULT - case 0, BattleFrontier_BattleArenaLobby_EventScript_255FF8 - case 1, BattleFrontier_BattleArenaLobby_EventScript_255EE8 - case 127, BattleFrontier_BattleArenaLobby_EventScript_255FF8 + case NO, BattleFrontier_BattleArenaLobby_EventScript_255FF8 + case YES, BattleFrontier_BattleArenaLobby_EventScript_255EE8 + case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_255FF8 BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 setvar VAR_TEMP_0, 0 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index a44b51ef5..5ef17d381 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -43,7 +43,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD compare VAR_RESULT, 0 call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C938 - applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 call BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C970, MSGBOX_DEFAULT @@ -114,7 +114,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7 case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0 BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F - applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 setvar VAR_0x8004, 4 special CallBattleDomeFunction @@ -163,7 +163,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9:: @ 824BED9 return BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0 - applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 compare VAR_TEMP_2, 0 call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 4ba6db967..ea62948c6 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -226,9 +226,9 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C61 msgbox BattleFrontier_BattleDomeLobby_Text_24A1C6, MSGBOX_YESNO switch VAR_RESULT - case 0, BattleFrontier_BattleDomeLobby_EventScript_249C61 - case 1, BattleFrontier_BattleDomeLobby_EventScript_249B60 - case 127, BattleFrontier_BattleDomeLobby_EventScript_249C61 + case NO, BattleFrontier_BattleDomeLobby_EventScript_249C61 + case YES, BattleFrontier_BattleDomeLobby_EventScript_249B60 + case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_249C61 BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 setvar VAR_TEMP_0, 0 diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index 3f5d53ac1..bd3add50c 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -71,9 +71,9 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B33F:: @ 824B33F BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349:: @ 824B349 msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA69, MSGBOX_YESNO switch VAR_RESULT - case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F - case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB - case 127, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F + case NO, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F + case YES, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB + case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F BattleFrontier_BattleDomePreBattleRoom_EventScript_24B377:: @ 824B377 message BattleFrontier_BattleDomePreBattleRoom_Text_24BA93 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 9c76544f6..68e6194cf 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -304,12 +304,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA:: @ 825B1AA end BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4:: @ 825B1B4 - applymovement 1, Common_Movement_WalkInPlaceRight - applymovement 3, Common_Movement_WalkInPlaceRight - applymovement 4, Common_Movement_WalkInPlaceRight - applymovement 5, Common_Movement_WalkInPlaceLeft - applymovement 6, Common_Movement_WalkInPlaceLeft - applymovement 7, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceFastestRight + applymovement 3, Common_Movement_WalkInPlaceFastestRight + applymovement 4, Common_Movement_WalkInPlaceFastestRight + applymovement 5, Common_Movement_WalkInPlaceFastestLeft + applymovement 6, Common_Movement_WalkInPlaceFastestLeft + applymovement 7, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index 9569d23ca..54ecb435c 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -186,9 +186,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653 special CallFrontierUtilFunc msgbox BattleFrontier_BattleFactoryLobby_Text_258C27, MSGBOX_YESNO switch VAR_RESULT - case 0, BattleFrontier_BattleFactoryLobby_EventScript_25879A - case 1, BattleFrontier_BattleFactoryLobby_EventScript_2586B9 - case 127, BattleFrontier_BattleFactoryLobby_EventScript_25879A + case NO, BattleFrontier_BattleFactoryLobby_EventScript_25879A + case YES, BattleFrontier_BattleFactoryLobby_EventScript_2586B9 + case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_25879A BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 setvar VAR_TEMP_0, 0 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index f65ffae0d..ced2a5f13 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -150,9 +150,9 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D2E:: @ 8259D2E BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38:: @ 8259D38 msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A350, MSGBOX_YESNO switch VAR_RESULT - case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 - case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47 - case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 + case NO, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 + case YES, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47 + case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D66:: @ 8259D66 message BattleFrontier_BattleFactoryPreBattleRoom_Text_25A37A @@ -176,9 +176,9 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98:: @ 8259D98 call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004 msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, MSGBOX_YESNO switch VAR_RESULT - case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 - case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2 - case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 + case NO, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 + case YES, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2 + case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2:: @ 8259DF2 fadescreen 1 @@ -442,9 +442,9 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146:: @ 825A146 msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD61, MSGBOX_DEFAULT msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, MSGBOX_YESNO switch VAR_RESULT - case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 - case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2 - case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 + case NO, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 + case YES, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2 + case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C:: @ 825A17C applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 605807580..766ab149a 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -158,9 +158,9 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAAA:: @ 824FAAA BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4:: @ 824FAB4 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250030, MSGBOX_YESNO switch VAR_RESULT - case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A - case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F - case 127, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A + case NO, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A + case YES, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F + case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAE2:: @ 824FAE2 message BattleFrontier_BattlePalaceBattleRoom_Text_25005A @@ -278,10 +278,10 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 + applymovement 2, Common_Movement_WalkInPlaceLeft waitmovement 0 - applymovement 1, Common_Movement_WalkInPlaceRight - applymovement 3, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight + applymovement 3, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 @@ -321,10 +321,10 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 + applymovement 2, Common_Movement_WalkInPlaceLeft waitmovement 0 - applymovement 1, Common_Movement_WalkInPlaceRight - applymovement 3, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight + applymovement 3, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index c3b688661..fd887e1d9 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -197,9 +197,9 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB91 msgbox BattleFrontier_BattlePalaceLobby_Text_24E3C8, MSGBOX_YESNO switch VAR_RESULT - case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DB91 - case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DA87 - case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB91 + case NO, BattleFrontier_BattlePalaceLobby_EventScript_24DB91 + case YES, BattleFrontier_BattlePalaceLobby_EventScript_24DA87 + case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_24DB91 BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 setvar VAR_TEMP_0, 0 diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc index 20e14b72b..44027d7ce 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc @@ -13,9 +13,9 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786 setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special CallFrontierUtilFunc - setvar VAR_0x8004, 20 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_CLEAR_TRAINER_IDS special CallBattlePikeFunction - setvar VAR_0x8004, 24 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED setvar VAR_0x8005, 1 special CallBattlePikeFunction applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80B diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index 05cdfa8a3..1a87dec82 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -26,16 +26,16 @@ BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707 BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710 special HealPlayerParty - setvar VAR_0x8004, 27 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS special CallBattlePikeFunction lockall msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallBattlePikeFunction - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA setvar VAR_0x8005, 4 setvar VAR_0x8006, 0 special CallBattlePikeFunction @@ -68,21 +68,21 @@ BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D msgbox BattleFrontier_BattlePikeLobby_Text_241520, 9 setvar VAR_0x8004, 8 special CallFrontierUtilFunc - setvar VAR_0x8004, 1 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA setvar VAR_0x8005, 3 special CallBattlePikeFunction addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA setvar VAR_0x8005, 3 copyvar VAR_0x8006, VAR_RESULT special CallBattlePikeFunction special LoadPlayerParty special HealPlayerParty - setvar VAR_0x8004, 27 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS special CallBattlePikeFunction message BattleFrontier_BattlePikeLobby_Text_25C1DF waitmessage - setvar VAR_0x8004, 8 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_8 setvar VAR_0x8005, 0 special CallBattlePikeFunction playse SE_SAVE @@ -103,15 +103,15 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806 setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 special CallFrontierUtilFunc - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA setvar VAR_0x8005, 4 setvar VAR_0x8006, 0 special CallBattlePikeFunction special LoadPlayerParty special HealPlayerParty - setvar VAR_0x8004, 27 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS special CallBattlePikeFunction - setvar VAR_0x8004, 8 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_8 setvar VAR_0x8005, 0 special CallBattlePikeFunction playse SE_SAVE @@ -166,9 +166,9 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA73 msgbox BattleFrontier_BattlePikeLobby_Text_25C0D8, MSGBOX_YESNO switch VAR_RESULT - case 0, BattleFrontier_BattlePikeLobby_EventScript_25BA73 - case 1, BattleFrontier_BattlePikeLobby_EventScript_25B95C - case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA73 + case NO, BattleFrontier_BattlePikeLobby_EventScript_25BA73 + case YES, BattleFrontier_BattlePikeLobby_EventScript_25B95C + case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_25BA73 BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C setvar VAR_TEMP_0, 0 @@ -176,17 +176,17 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 special CallFrontierUtilFunc - setvar VAR_0x8004, 28 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_INIT_CHALLENGE special CallBattlePikeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 1 special CallFrontierUtilFunc - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA setvar VAR_0x8005, 4 setvar VAR_0x8006, 1 special CallBattlePikeFunction - setvar VAR_0x8004, 26 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS special CallBattlePikeFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 @@ -197,7 +197,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C delay 2 call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 - setvar VAR_0x8004, 26 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS special CallBattlePikeFunction compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C @@ -329,8 +329,8 @@ BattleFrontier_BattlePikeCorridor_EventScript_25BB49:: @ 825BB49 BattleFrontier_BattlePikeLobby_EventScript_25BB49:: @ 825BB49 BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49:: @ 825BB49 BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49:: @ 825BB49 - playse 267 - special sub_813B880 + playse SE_CURTAIN + special CloseBattlePikeCurtain waitstate waitse return diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc index ea959387b..565e28d47 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc @@ -11,7 +11,7 @@ BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167: @ 825D167 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171:: @ 825D171 setvar VAR_TEMP_0, 1 - setvar VAR_0x8004, 5 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE special CallBattlePikeFunction switch VAR_RESULT case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6 @@ -27,7 +27,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6:: @ 825D1C6 delay 16 applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795 waitmovement 0 - setvar VAR_0x8004, 21 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG setvar VAR_0x8005, 0 special CallBattlePikeFunction msgbox gStringVar4, MSGBOX_DEFAULT @@ -63,7 +63,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231 closemessage applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795 waitmovement 0 - setvar VAR_0x8004, 21 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG setvar VAR_0x8005, 0 special CallBattlePikeFunction msgbox gStringVar4, MSGBOX_DEFAULT @@ -102,7 +102,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF lockall applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF waitmovement 0 - setvar VAR_0x8004, 23 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_MONS_BEFORE_QUEEN special CallBattlePikeFunction switch VAR_RESULT case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC @@ -136,7 +136,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB waitse applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7 waitmovement 0 - setvar VAR_0x8004, 22 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_QUEEN_FIGHT_TYPE special CallBattlePikeFunction switch VAR_RESULT case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416 @@ -217,11 +217,11 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D:: @ 825D49D waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC waitmovement 0 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA setvar VAR_0x8005, 1 special CallBattlePikeFunction addvar VAR_RESULT, 1 - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallBattlePikeFunction @@ -279,7 +279,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB waitmovement 0 - setvar VAR_0x8004, 21 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG setvar VAR_0x8005, 0 special CallBattlePikeFunction msgbox gStringVar4, MSGBOX_DEFAULT @@ -287,7 +287,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E delay 16 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD waitmovement 0 - setvar VAR_0x8004, 21 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG setvar VAR_0x8005, 1 special CallBattlePikeFunction msgbox gStringVar4, MSGBOX_DEFAULT @@ -317,7 +317,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605 message BattleFrontier_BattlePikeRandomRoom1_Text_25DBD1 applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA waitmovement 0 - setvar VAR_0x8004, 12 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON special CallBattlePikeFunction copyvar VAR_0x8004, VAR_RESULT compare VAR_0x8004, 0 @@ -335,7 +335,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 waitse playmoncry SPECIES_KIRLIA, 0 waitmoncry - setvar VAR_0x8004, 11 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS special CallBattlePikeFunction compare VAR_RESULT, 2 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751 @@ -345,7 +345,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F compare VAR_RESULT, 4 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766 - setvar VAR_0x8004, 15 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE special CallBattlePikeFunction waitstate applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2 @@ -372,13 +372,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5 waitse playmoncry SPECIES_DUSCLOPS, 0 waitmoncry - setvar VAR_0x8004, 11 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS special CallBattlePikeFunction compare VAR_RESULT, 0 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D compare VAR_RESULT, 1 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774 - setvar VAR_0x8004, 15 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE special CallBattlePikeFunction waitstate applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2 @@ -578,7 +578,7 @@ BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA: @ 825D7EA step_end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED - setvar VAR_0x8004, 5 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE special CallBattlePikeFunction switch VAR_RESULT case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B @@ -588,7 +588,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B lock faceplayer - setvar VAR_0x8004, 14 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_NPC_MSG special CallBattlePikeFunction msgbox gStringVar4, MSGBOX_DEFAULT waitmessage @@ -605,7 +605,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831:: @ 825D831 end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E - setvar VAR_0x8004, 13 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS special CallBattlePikeFunction compare VAR_RESULT, 2 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc index 9a4448226..a18ccda4c 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc @@ -11,7 +11,7 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A: @ 825E42A BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C:: @ 825E43C setvar VAR_TEMP_0, 1 - setvar VAR_0x8004, 6 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_6 special CallBattlePikeFunction end diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index 927222e8c..cd72a27d1 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -35,7 +35,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4 lockall message BattleFrontier_BattlePikeThreePathRoom_Text_25CD75 waitmessage - setvar VAR_0x8004, 8 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_8 setvar VAR_0x8005, 1 special CallBattlePikeFunction playse SE_SAVE @@ -126,8 +126,8 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9C8:: @ 825C9C8 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8:: @ 825C9D8 msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCD4, MSGBOX_YESNO switch VAR_RESULT - case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A - case 127, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A + case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A + case MULTI_B_PRESSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A release end @@ -137,7 +137,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD message BattleFrontier_BattlePikeThreePathRoom_Text_25CE08 waitmessage special LoadPlayerParty - setvar VAR_0x8004, 8 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_8 setvar VAR_0x8005, 2 special CallBattlePikeFunction playse SE_SAVE @@ -150,9 +150,9 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A:: @ 825CA2A msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCFB, MSGBOX_YESNO switch VAR_RESULT - case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD - case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A - case 127, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A + case YES, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD + case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A + case MULTI_B_PRESSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A release end @@ -161,12 +161,12 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A waitmessage multichoicedefault 20, 8, MULTI_YESNO, 1, 0 switch VAR_RESULT - case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222 + case 0, BattleFrontier_BattlePike_EventScript_Retire release end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78 - setvar VAR_0x8004, 17 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HINT_ROOM special CallBattlePikeFunction compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91 @@ -189,7 +189,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB - setvar VAR_0x8004, 19 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT special CallBattlePikeFunction compare VAR_RESULT, 4 goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2 @@ -197,9 +197,9 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB faceplayer msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE69, MSGBOX_YESNO switch VAR_RESULT - case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A - case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00 - case 127, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00 + case YES, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A + case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00 + case MULTI_B_PRESSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00 release end @@ -209,7 +209,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00:: @ 825CB00 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A:: @ 825CB0A - setvar VAR_0x8004, 18 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HINT_ROOM_ID special CallBattlePikeFunction switch VAR_RESULT case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39 @@ -230,7 +230,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB53:: @ 825CB53 goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60:: @ 825CB60 - setvar VAR_0x8004, 19 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT special CallBattlePikeFunction switch VAR_RESULT case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc index 2011c42df..8fc97e74a 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc @@ -107,7 +107,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185:: @ 825F185 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8B6, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 16 setvar VAR_0x8009, DECOR_KISS_POSTER @@ -116,7 +116,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8E6, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 32 setvar VAR_0x8009, DECOR_KISS_CUSHION @@ -125,7 +125,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F917, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 32 setvar VAR_0x8009, DECOR_SMOOCHUM_DOLL @@ -134,7 +134,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F949, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 setvar VAR_0x8009, DECOR_TOGEPI_DOLL @@ -143,7 +143,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F979, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 setvar VAR_0x8009, DECOR_MEOWTH_DOLL @@ -152,7 +152,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9A9, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 setvar VAR_0x8009, DECOR_CLEFAIRY_DOLL @@ -161,7 +161,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9DB, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 setvar VAR_0x8009, DECOR_DITTO_DOLL @@ -170,7 +170,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA0A, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 setvar VAR_0x8009, DECOR_CYNDAQUIL_DOLL @@ -179,7 +179,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA3D, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 setvar VAR_0x8009, DECOR_CHIKORITA_DOLL @@ -188,7 +188,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F359:: @ 825F359 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA70, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 setvar VAR_0x8009, DECOR_TOTODILE_DOLL @@ -221,7 +221,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E:: @ 825F38E BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAA2, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 128 setvar VAR_0x8009, DECOR_LAPRAS_DOLL @@ -230,7 +230,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAD2, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 128 setvar VAR_0x8009, DECOR_SNORLAX_DOLL @@ -239,7 +239,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB03, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 setvar VAR_0x8009, DECOR_VENUSAUR_DOLL @@ -248,7 +248,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB35, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 setvar VAR_0x8009, DECOR_CHARIZARD_DOLL @@ -257,7 +257,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F47C:: @ 825F47C msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB68, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 setvar VAR_0x8009, DECOR_BLASTOISE_DOLL @@ -291,7 +291,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1:: @ 825F4B1 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB9B, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, ITEM_PROTEIN @@ -300,7 +300,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBC7, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, ITEM_CALCIUM @@ -309,7 +309,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBF3, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, ITEM_IRON @@ -318,7 +318,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC1C, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, ITEM_ZINC @@ -327,7 +327,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC45, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, ITEM_CARBOS @@ -336,7 +336,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5CD:: @ 825F5CD msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC70, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, ITEM_HP_UP @@ -373,7 +373,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602:: @ 825F602 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE17, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 setvar VAR_0x8009, ITEM_LEFTOVERS @@ -382,7 +382,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCCB, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 setvar VAR_0x8009, ITEM_WHITE_HERB @@ -391,7 +391,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCFA, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 setvar VAR_0x8009, ITEM_QUICK_CLAW @@ -400,7 +400,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD29, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 setvar VAR_0x8009, ITEM_MENTAL_HERB @@ -409,7 +409,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC9A, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, ITEM_BRIGHT_POWDER @@ -418,7 +418,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD59, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, ITEM_CHOICE_BAND @@ -427,7 +427,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD89, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, ITEM_KINGS_ROCK @@ -436,7 +436,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDB9, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, ITEM_FOCUS_BAND @@ -445,7 +445,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8:: @ 825F7A8 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDE8, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, ITEM_SCOPE_LENS diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc index 723c666d8..ba862ebdf 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc @@ -12,7 +12,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43: @ 8252A43 BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D lockall - setvar VAR_0x8004, 13 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT setvar VAR_0x8005, 4 setvar VAR_0x8006, 1 setvar VAR_0x8007, 55 @@ -38,7 +38,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98 end BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 - setvar VAR_0x8004, 15 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE special CallBattlePyramidFunction setvar VAR_0x8004, 0 special CallFrontierUtilFunc @@ -67,7 +67,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 setvar VAR_TEMP_D, 1 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39 - setvar VAR_0x8004, 17 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY special CallBattlePyramidFunction end @@ -77,18 +77,18 @@ BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 special CallFrontierUtilFunc - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA setvar VAR_0x8005, 7 setvar VAR_0x8006, 255 special CallBattlePyramidFunction BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66:: @ 8252B66 BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66 - setvar VAR_0x8004, 13 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallBattlePyramidFunction - setvar VAR_0x8004, 14 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS special CallBattlePyramidFunction special HealPlayerParty warpsilent MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 @@ -96,7 +96,7 @@ BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66 end BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D - setvar VAR_0x8004, 3 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3 setvar VAR_0x8005, 1 special CallBattlePyramidFunction special SavePlayerParty @@ -104,7 +104,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc - setvar VAR_0x8004, 9 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS special CallBattlePyramidFunction setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 @@ -118,7 +118,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA: @ 8252BCA end BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5 - setvar VAR_0x8004, 13 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT setvar VAR_0x8005, 32 setvar VAR_0x8006, 0 special CallBattlePyramidFunction @@ -136,7 +136,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8 special CallFrontierUtilFunc compare VAR_RESULT, 7 goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45 - setvar VAR_0x8004, 6 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR special CallBattlePyramidFunction setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 @@ -154,7 +154,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45 BattlePyramid_TrainerBattle:: @ 8252C4F trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText - setvar VAR_0x8004, 10 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SHOW_HINT_TEXT special CallBattlePyramidFunction waitmessage waitbuttonpress @@ -163,12 +163,12 @@ BattlePyramid_TrainerBattle:: @ 8252C4F end BattlePyramid_FindItemBall:: @ 8252C6A - setvar VAR_0x8004, 7 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_ITEM special CallBattlePyramidFunction callstd STD_FIND_ITEM compare VAR_0x8007, 0 goto_if_eq BattlePyramid_FindItemBall_End - setvar VAR_0x8004, 8 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_HIDE_ITEM special CallBattlePyramidFunction BattlePyramid_FindItemBall_End:: @ 8252C87 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index b2f7d4579..4982c152c 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -32,11 +32,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768 playse SE_EXPMAX waitse closemessage - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA setvar VAR_0x8005, 1 setvar VAR_0x8006, 0 special CallBattlePyramidFunction - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 special CallBattlePyramidFunction @@ -61,14 +61,14 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507D2:: @ 82507D2 msgbox BattleFrontier_BattlePyramidLobby_Text_2525F4, MSGBOX_DEFAULT BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA - special sub_81B95E0 - compare VAR_RESULT, 1 + special DoBattlePyramidMonsHaveHeldItem + compare VAR_RESULT, TRUE call_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250DDB - clearflag FLAG_SPECIAL_FLAG_0x4004 + clearflag FLAG_STORING_ITEMS_IN_PYRAMID_BAG setvar VAR_0x8004, 8 special CallFrontierUtilFunc special LoadPlayerParty - setvar VAR_0x8004, 14 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS special CallBattlePyramidFunction special HealPlayerParty message BattleFrontier_BattlePyramidLobby_Text_2519F8 @@ -81,9 +81,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA msgbox BattleFrontier_BattlePyramidLobby_Text_241520, 9 message BattleFrontier_BattlePyramidLobby_Text_251A77 waitmessage - setvar VAR_0x8004, 4 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_REWARD special CallBattlePyramidFunction - setvar VAR_0x8004, 3 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3 setvar VAR_0x8005, 0 special CallBattlePyramidFunction playse SE_SAVE @@ -98,7 +98,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852 setvar VAR_0x8004, 8 special CallFrontierUtilFunc special LoadPlayerParty - setvar VAR_0x8004, 14 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS special CallBattlePyramidFunction special HealPlayerParty lockall @@ -108,11 +108,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852 waitse message BattleFrontier_BattlePyramidLobby_Text_251A77 waitmessage - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA setvar VAR_0x8005, 2 setvar VAR_0x8006, 0 special CallBattlePyramidFunction - setvar VAR_0x8004, 3 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3 setvar VAR_0x8005, 0 special CallBattlePyramidFunction playse SE_SAVE @@ -170,18 +170,18 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250AC1 msgbox BattleFrontier_BattlePyramidLobby_Text_2514E6, MSGBOX_YESNO switch VAR_RESULT - case 0, BattleFrontier_BattlePyramidLobby_EventScript_250AC1 - case 1, BattleFrontier_BattlePyramidLobby_EventScript_2509A5 - case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC1 + case NO, BattleFrontier_BattlePyramidLobby_EventScript_250AC1 + case YES, BattleFrontier_BattlePyramidLobby_EventScript_2509A5 + case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_250AC1 BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 special CallFrontierUtilFunc - setvar VAR_0x8004, 0 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_CHALLENGE special CallBattlePyramidFunction - setvar VAR_0x8004, 2 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA setvar VAR_0x8005, 2 setvar VAR_0x8006, 1 special CallBattlePyramidFunction @@ -193,9 +193,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 setvar VAR_0x8005, 3 setvar VAR_0x8006, 0 special CallFrontierUtilFunc - setvar VAR_0x8004, 6 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR special CallBattlePyramidFunction - setvar VAR_0x8004, 9 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS special CallBattlePyramidFunction special LoadPlayerParty closemessage @@ -282,7 +282,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B27:: @ 8250B27 BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28 msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT - setvar VAR_0x8004, 1 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA setvar VAR_0x8005, 5 special CallBattlePyramidFunction compare VAR_RESULT, 0 @@ -292,7 +292,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28 return BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA setvar VAR_0x8005, 3 special CallBattlePyramidFunction goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 @@ -300,7 +300,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53 BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66 msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT - setvar VAR_0x8004, 1 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA setvar VAR_0x8005, 6 special CallBattlePyramidFunction compare VAR_RESULT, 0 @@ -310,7 +310,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66 return BattleFrontier_BattlePyramidLobby_EventScript_250B91:: @ 8250B91 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA setvar VAR_0x8005, 4 special CallBattlePyramidFunction goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 @@ -437,7 +437,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56 applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DCD waitmovement 0 msgbox BattleFrontier_BattlePyramidLobby_Text_251569, MSGBOX_DEFAULT - setvar VAR_0x8004, 1 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA setvar VAR_0x8005, 1 special CallBattlePyramidFunction compare VAR_RESULT, 0 @@ -494,8 +494,8 @@ BattleFrontier_BattlePyramidLobby_Movement_250DD8: @ 8250DD8 BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB msgbox BattleFrontier_BattlePyramidLobby_Text_2517FC, MSGBOX_DEFAULT - setflag FLAG_SPECIAL_FLAG_0x4004 - special sub_81C6A94 + setflag FLAG_STORING_ITEMS_IN_PYRAMID_BAG + special TryStoreHeldItemsInPyramidBag compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250E00 message BattleFrontier_BattlePyramidLobby_Text_2518C6 @@ -525,7 +525,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250E40:: @ 8250E40 end BattleFrontier_BattlePyramidLobby_EventScript_250E50:: @ 8250E50 - special sub_81B9620 + special BattlePyramidChooseMonHeldItems waitstate message BattleFrontier_BattlePyramidLobby_Text_25197E waitmessage @@ -533,8 +533,8 @@ BattleFrontier_BattlePyramidLobby_EventScript_250E50:: @ 8250E50 end BattleFrontier_BattlePyramidLobby_EventScript_250E60:: @ 8250E60 - special sub_81B95E0 - compare VAR_RESULT, 1 + special DoBattlePyramidMonsHaveHeldItem + compare VAR_RESULT, TRUE goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250E6F return diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index 211ab0c87..8906d4c42 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -6,7 +6,7 @@ BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1 .byte 0 BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6 - setvar VAR_0x8004, 13 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT setvar VAR_0x8005, 200 setvar VAR_0x8006, 0 special CallBattlePyramidFunction @@ -69,7 +69,7 @@ BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A end BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193 - setvar VAR_0x8004, 3 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3 setvar VAR_0x8005, 1 special CallBattlePyramidFunction special SavePlayerParty @@ -77,7 +77,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193 setvar VAR_0x8005, 0 setvar VAR_0x8006, 0 special CallFrontierUtilFunc - setvar VAR_0x8004, 9 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS special CallBattlePyramidFunction setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index ce171e3c0..7661b9089 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -131,9 +131,9 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241D72:: @ 8241D72 BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C:: @ 8241D7C msgbox BattleFrontier_BattleTowerBattleRoom_Text_2423FC, MSGBOX_YESNO switch VAR_RESULT - case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F - case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241E22 - case 127, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + case NO, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F + case YES, BattleFrontier_BattleTowerBattleRoom_EventScript_241E22 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA:: @ 8241DAA message BattleFrontier_BattleTowerBattleRoom_Text_24244C @@ -230,7 +230,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA:: @ 8241EBA BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_24219A waitmovement 0 - applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2725B6 + applymovement 3, Common_Movement_WalkInPlaceLeft waitmovement 0 playse SE_PIN applymovement 2, Common_Movement_ExclamationMark diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index 07883c7ca..476caa21d 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -205,8 +205,8 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249219:: @ 8249219 BattleFrontier_BattleTowerBattleRoom2_EventScript_249223:: @ 8249223 msgbox BattleFrontier_BattleTowerBattleRoom2_Text_2423FC, MSGBOX_YESNO switch VAR_RESULT - case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 - case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB + case NO, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 + case YES, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 BattleFrontier_BattleTowerBattleRoom2_EventScript_249251:: @ 8249251 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc index 6e3e05959..786f1fa3e 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc @@ -36,7 +36,7 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248D9F:: @ 8248D9F hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 - special sub_8139980 + special OffsetCameraForBattle end BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2: @ 8248DB2 @@ -68,8 +68,8 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248ED5 waitmovement 0 delay 40 - applymovement 3, Common_Movement_WalkInPlaceUp - applymovement 2, Common_Movement_WalkInPlaceUp + applymovement 3, Common_Movement_WalkInPlaceFastestUp + applymovement 2, Common_Movement_WalkInPlaceFastestUp waitmovement 0 opendoor 7, 1 waitdooranim diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 9b6a406b8..353af931a 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -278,9 +278,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - case 1, BattleFrontier_BattleTowerLobby_EventScript_23EA2A - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + case NO, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + case YES, BattleFrontier_BattleTowerLobby_EventScript_23EA2A + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A setvar VAR_0x8004, 2 @@ -304,7 +304,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 - incrementgamestat 30 + incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1 goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 end @@ -358,9 +358,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - case 1, BattleFrontier_BattleTowerLobby_EventScript_23EB93 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + case NO, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + case YES, BattleFrontier_BattleTowerLobby_EventScript_23EB93 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 setvar VAR_0x8004, 2 @@ -384,7 +384,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 - incrementgamestat 30 + incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 end @@ -439,9 +439,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - case 1, BattleFrontier_BattleTowerLobby_EventScript_23ECFF - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + case NO, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + case YES, BattleFrontier_BattleTowerLobby_EventScript_23ECFF + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF setvar VAR_0x8004, 2 @@ -465,7 +465,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 - incrementgamestat 30 + incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 end @@ -519,9 +519,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT - case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - case 1, BattleFrontier_BattleTowerLobby_EventScript_23EE68 - case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + case NO, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + case YES, BattleFrontier_BattleTowerLobby_EventScript_23EE68 + case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 setvar VAR_0x8004, 2 @@ -548,7 +548,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 - incrementgamestat 30 + incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3E8 @@ -926,16 +926,16 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7 return BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5 - setvar VAR_0x8004, 9 + setvar VAR_0x8004, USING_BATTLE_TOWER message gText_PleaseWaitForLink waitmessage setvar VAR_0x8005, 0 - special sub_80B2DA4 + special TryBattleLinkup waitstate compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3AF compare VAR_RESULT, 2 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2772D2 + goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady compare VAR_RESULT, 3 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F327 compare VAR_RESULT, 4 @@ -943,7 +943,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5 compare VAR_RESULT, 5 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E6 compare VAR_RESULT, 6 - goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2772C5 + goto_if_eq CableClub_EventScript_AbortLinkConnectionError compare VAR_RESULT, 11 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 end @@ -952,7 +952,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F327:: @ 823F327 special CloseLink compare VAR_0x8005, 3 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F - msgbox BattleFrontier_BattleTowerLobby_Text_278255, MSGBOX_DEFAULT + msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT release end @@ -965,7 +965,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F33F:: @ 823F33F BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351 msgbox BattleFrontier_BattleTowerLobby_Text_241240, MSGBOX_DEFAULT special CloseLink - msgbox BattleFrontier_BattleTowerLobby_Text_2782A8, MSGBOX_DEFAULT + msgbox CableClub_Text_IncorrectNumberOfParticipants, MSGBOX_DEFAULT release end @@ -994,7 +994,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3A6:: @ 823F3A6 return BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF - incrementgamestat 30 + incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 message BattleFrontier_BattleTowerLobby_Text_24144D waitmessage @@ -1020,7 +1020,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3E8:: @ 823F3E8 end BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3 - message BattleFrontier_BattleTowerLobby_Text_2792CD + message CableClub_Text_ChooseGroupLeaderOfTwo waitmessage multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT @@ -1031,7 +1031,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3 end BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430 - call BattleFrontier_BattleTowerLobby_EventScript_277B30 + call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 compare VAR_RESULT, 5 @@ -1044,7 +1044,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430 return BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463 - call BattleFrontier_BattleTowerLobby_EventScript_277B35 + call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 compare VAR_RESULT, 5 @@ -1057,7 +1057,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463 return BattleFrontier_BattleTowerLobby_EventScript_23F496:: @ 823F496 - incrementgamestat 30 + incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 message BattleFrontier_BattleTowerLobby_Text_24144D waitmessage diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index 29e14473d..d053c33e4 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -6,7 +6,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92 .byte 0 BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7 - setvar VAR_0x8004, 17 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY special CallBattlePyramidFunction end @@ -64,7 +64,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77 waitmovement 0 copyobjectxytoperm 1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT special HealPlayerParty @@ -104,7 +104,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5 msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, MSGBOX_DEFAULT closemessage - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 opendoor 10, 1 waitdooranim @@ -190,9 +190,9 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36 waitmessage waitbuttonpress closemessage - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if_ne BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF removeobject VAR_LAST_TALKED setflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER diff --git a/data/maps/BattleFrontier_Lounge1/scripts.inc b/data/maps/BattleFrontier_Lounge1/scripts.inc index dee3fd431..ed9628e5e 100644 --- a/data/maps/BattleFrontier_Lounge1/scripts.inc +++ b/data/maps/BattleFrontier_Lounge1/scripts.inc @@ -11,7 +11,7 @@ BattleFrontier_Lounge1_EventScript_25E775:: @ 825E775 end BattleFrontier_Lounge1_EventScript_25E792:: @ 825E792 - special sub_81B94B0 + special ChoosePartyMon waitstate compare VAR_0x8004, 255 goto_if_ne BattleFrontier_Lounge1_EventScript_25E7BF diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc index 3be247099..892c6ef81 100644 --- a/data/maps/BattleFrontier_Lounge3/scripts.inc +++ b/data/maps/BattleFrontier_Lounge3/scripts.inc @@ -18,10 +18,10 @@ BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF waitmessage waitbuttonpress msgbox BattleFrontier_Lounge3_Text_262A60, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_Lounge3_EventScript_261FA5 msgbox BattleFrontier_Lounge3_Text_262ABD, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_Lounge3_EventScript_261FA5 message BattleFrontier_Lounge3_Text_262B42 waitmessage diff --git a/data/maps/BattleFrontier_Lounge5/scripts.inc b/data/maps/BattleFrontier_Lounge5/scripts.inc index 020c8fdfb..a801cb107 100644 --- a/data/maps/BattleFrontier_Lounge5/scripts.inc +++ b/data/maps/BattleFrontier_Lounge5/scripts.inc @@ -5,9 +5,9 @@ BattleFrontier_Lounge5_EventScript_NatureGirl:: @ 82645C6 lock faceplayer msgbox BattleFrontier_Lounge5_Text_NatureGirlGreeting, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_Lounge5_EventScript_NatureGirlNoneShown - special sub_81B94B0 + special ChoosePartyMon waitstate lock faceplayer diff --git a/data/maps/BattleFrontier_Lounge6/scripts.inc b/data/maps/BattleFrontier_Lounge6/scripts.inc index 2b14c43c5..09690c8d3 100644 --- a/data/maps/BattleFrontier_Lounge6/scripts.inc +++ b/data/maps/BattleFrontier_Lounge6/scripts.inc @@ -5,14 +5,14 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED lock faceplayer goto_if_set FLAG_BATTLE_FRONTIER_TRADE_DONE, BattleFrontier_Lounge6_EventScript_265083 - setvar VAR_0x8008, 3 + setvar VAR_0x8008, INGAME_TRADE_MEOWTH copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT msgbox BattleFrontier_Lounge6_Text_26508D, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_Lounge6_EventScript_26506B - special sub_81B94B0 + special ChoosePartyMon waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 diff --git a/data/maps/BattleFrontier_Lounge7/scripts.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc index 82b04023f..3605b9bf1 100644 --- a/data/maps/BattleFrontier_Lounge7/scripts.inc +++ b/data/maps/BattleFrontier_Lounge7/scripts.inc @@ -250,7 +250,7 @@ BattleFrontier_Lounge7_EventScript_26564F:: @ 826564F buffernumberstring 1, VAR_0x8008 copyvar VAR_0x8004, VAR_TEMP_C msgbox BattleFrontier_Lounge7_Text_265921, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_Lounge7_EventScript_2656CA specialvar VAR_TEMP_1, GetFrontierBattlePoints compare VAR_TEMP_1, VAR_0x8008 @@ -265,7 +265,7 @@ BattleFrontier_Lounge7_EventScript_265696:: @ 8265696 fadescreen 1 special CloseBattlePointsWindow special CloseBattleFrontierTutorWindow - special sub_81B892C + special ChooseMonForMoveTutor waitstate compare VAR_RESULT, 0 goto_if_eq BattleFrontier_Lounge7_EventScript_265645 diff --git a/data/maps/BattleFrontier_Mart/scripts.inc b/data/maps/BattleFrontier_Mart/scripts.inc index d84b2cb0a..59ba707d8 100644 --- a/data/maps/BattleFrontier_Mart/scripts.inc +++ b/data/maps/BattleFrontier_Mart/scripts.inc @@ -4,10 +4,10 @@ BattleFrontier_Mart_MapScripts:: @ 8267ACB BattleFrontier_Mart_EventScript_267ACC:: @ 8267ACC lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart BattleFrontier_Mart_Pokemart_267AE4 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/BattleFrontier_OutsideEast/map.json b/data/maps/BattleFrontier_OutsideEast/map.json index 341b20321..e45e4f13b 100644 --- a/data/maps/BattleFrontier_OutsideEast/map.json +++ b/data/maps/BattleFrontier_OutsideEast/map.json @@ -199,7 +199,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_OutsideEast_EventScript_242CEA", + "script": "BattleFrontier_OutsideEast_EventScript_Sudowoodo", "flag": "FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO" }, { diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index b502da8ec..ab968b6dd 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return @@ -102,24 +102,24 @@ BattleFrontier_OutsideEast_EventScript_242CE1:: @ 8242CE1 msgbox BattleFrontier_OutsideEast_Text_243230, MSGBOX_NPC end -BattleFrontier_OutsideEast_EventScript_242CEA:: @ 8242CEA +BattleFrontier_OutsideEast_EventScript_Sudowoodo:: @ 8242CEA lock faceplayer waitse playse 269 - applymovement 14, BattleFrontier_OutsideEast_Movement_242D69 + applymovement 14, BattleFrontier_OutsideEast_Movement_SudowoodoShake waitmovement 0 release end -BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC +BattleFrontier_OutsideEast_EventScript_WaterSudowoodo:: @ 8242CFC lock faceplayer special DoWateringBerryTreeAnim waitstate waitse - playse 269 - applymovement 14, BattleFrontier_OutsideEast_Movement_242D69 + playse SE_USSOKI + applymovement 14, BattleFrontier_OutsideEast_Movement_SudowoodoShake waitmovement 0 msgbox gText_Sudowoodo_Attacked, MSGBOX_DEFAULT closemessage @@ -127,28 +127,28 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC playmoncry SPECIES_SUDOWOODO, 2 delay 40 waitmoncry - setvar VAR_LAST_TALKED, 14 + setvar VAR_LAST_TALKED, 14 @ Sudowoodo object event id setwildbattle SPECIES_SUDOWOODO, 40, ITEM_NONE setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 - goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 - compare VAR_RESULT, 4 - goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 - compare VAR_RESULT, 5 - goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq BattleFrontier_OutsideEast_EventScript_RemoveSudowoodo + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq BattleFrontier_OutsideEast_EventScript_RemoveSudowoodo + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq BattleFrontier_OutsideEast_EventScript_RemoveSudowoodo setflag FLAG_DEFEATED_SUDOWOODO release end -BattleFrontier_OutsideEast_EventScript_242D60:: @ 8242D60 +BattleFrontier_OutsideEast_EventScript_RemoveSudowoodo:: @ 8242D60 setflag FLAG_DEFEATED_SUDOWOODO - goto IslandCave_EventScript_27376D + goto Common_EventScript_RemoveStaticPokemon end -BattleFrontier_OutsideEast_Movement_242D69: @ 8242D69 +BattleFrontier_OutsideEast_Movement_SudowoodoShake: @ 8242D69 face_right delay_8 face_down diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc index fb96172d2..41d52ba7c 100644 --- a/data/maps/BattleFrontier_OutsideWest/scripts.inc +++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc @@ -35,7 +35,7 @@ BattleFrontier_OutsideWest_EventScript_23D44E:: @ 823D44E BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458 msgbox BattleFrontier_OutsideWest_Text_23D8F2, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_OutsideWest_EventScript_23D4AE msgbox BattleFrontier_OutsideWest_Text_23D94B, MSGBOX_DEFAULT call BattleFrontier_OutsideWest_EventScript_23D4BA @@ -46,7 +46,7 @@ BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458 BattleFrontier_OutsideWest_EventScript_23D483:: @ 823D483 msgbox BattleFrontier_OutsideWest_Text_23D90E, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BattleFrontier_OutsideWest_EventScript_23D4AE msgbox BattleFrontier_OutsideWest_Text_23D94B, MSGBOX_DEFAULT call BattleFrontier_OutsideWest_EventScript_23D4BA @@ -63,12 +63,12 @@ BattleFrontier_OutsideWest_EventScript_23D4AE:: @ 823D4AE BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 hideobjectat 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST setvar VAR_0x8004, 2 - call BattleFrontier_OutsideWest_EventScript_272250 + call Common_EventScript_FerryDepartIsland return BattleFrontier_OutsideWest_EventScript_23D4D8:: @ 823D4D8 @@ -126,16 +126,16 @@ BattleFrontier_OutsideWest_EventScript_23D53D:: @ 823D53D end BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544 - applymovement 9, Common_Movement_WalkInPlaceRight + applymovement 9, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox BattleFrontier_OutsideWest_Text_23DB7D, MSGBOX_DEFAULT - applymovement 10, Common_Movement_WalkInPlaceLeft + applymovement 10, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox BattleFrontier_OutsideWest_Text_23DBCE, MSGBOX_DEFAULT closemessage delay 25 - applymovement 9, Common_Movement_WalkInPlaceUp - applymovement 10, Common_Movement_WalkInPlaceUp + applymovement 9, Common_Movement_WalkInPlaceFastestUp + applymovement 10, Common_Movement_WalkInPlaceFastestUp waitmovement 0 release end @@ -144,20 +144,20 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F lock faceplayer delay 20 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if_eq BattleFrontier_OutsideWest_EventScript_23D5C5 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA msgbox BattleFrontier_OutsideWest_Text_23DC36, MSGBOX_DEFAULT release end BattleFrontier_OutsideWest_EventScript_23D5BA:: @ 823D5BA - applymovement 14, Common_Movement_WalkInPlaceUp + applymovement 14, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -169,13 +169,13 @@ BattleFrontier_OutsideWest_EventScript_23D5C6:: @ 823D5C6 faceplayer message BattleFrontier_OutsideWest_Text_23DCB0 waitmessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq BattleFrontier_OutsideWest_EventScript_23D5FD - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if_eq BattleFrontier_OutsideWest_EventScript_23D608 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if_eq BattleFrontier_OutsideWest_EventScript_23D613 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq BattleFrontier_OutsideWest_EventScript_23D61E waitbuttonpress release diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc index c99a0de38..84aeef182 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9 map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_MapScript1_267904 - map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904 @@ -9,7 +9,7 @@ BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904 BattleFrontier_PokemonCenter_1F_EventScript_267908:: @ 8267908 setvar VAR_0x800B, 1 - call BattleFrontier_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/map.json b/data/maps/BattleFrontier_PokemonCenter_2F/map.json index caa6fed8a..fa93cde5f 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/map.json +++ b/data/maps/BattleFrontier_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BattleFrontier_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc index 59ede7f6a..5a19a9d28 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4 - map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -BattleFrontier_PokemonCenter_2F_EventScript_267AB9:: @ 8267AB9 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +BattleFrontier_PokemonCenter_2F_EventScript_Colosseum:: @ 8267AB9 + call CableClub_EventScript_Colosseum end -BattleFrontier_PokemonCenter_2F_EventScript_267ABF:: @ 8267ABF - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +BattleFrontier_PokemonCenter_2F_EventScript_TradeCenter:: @ 8267ABF + call CableClub_EventScript_TradeCenter end -BattleFrontier_PokemonCenter_2F_EventScript_267AC5:: @ 8267AC5 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +BattleFrontier_PokemonCenter_2F_EventScript_RecordCorner:: @ 8267AC5 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/BattleFrontier_RankingHall/scripts.inc b/data/maps/BattleFrontier_RankingHall/scripts.inc index 5f8a6c44e..86682522c 100644 --- a/data/maps/BattleFrontier_RankingHall/scripts.inc +++ b/data/maps/BattleFrontier_RankingHall/scripts.inc @@ -86,7 +86,7 @@ BattleFrontier_RankingHall_EventScript_25E54A:: @ 825E54A lock faceplayer msgbox BattleFrontier_RankingHall_Text_25E666, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq BattleFrontier_RankingHall_EventScript_25E569 msgbox BattleFrontier_RankingHall_Text_25E6B6, MSGBOX_DEFAULT release diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index 3eac4655b..640309975 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -38,9 +38,9 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT msgbox BattleFrontier_ReceptionGate_Text_266703, MSGBOX_DEFAULT closemessage - applymovement 1, Common_Movement_WalkInPlaceUp - applymovement 2, Common_Movement_WalkInPlaceUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp + applymovement 2, Common_Movement_WalkInPlaceFastestUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN applymovement 1, Common_Movement_ExclamationMark diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index b59adefcc..eeb6f6904 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -172,13 +172,13 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943 msgbox BattleFrontier_ScottsHouse_Text_263A3F, MSGBOX_DEFAULT closemessage delay 30 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq BattleFrontier_ScottsHouse_EventScript_263A13 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if_eq BattleFrontier_ScottsHouse_EventScript_263A1E - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq BattleFrontier_ScottsHouse_EventScript_263A29 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if_eq BattleFrontier_ScottsHouse_EventScript_263A34 msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT applymovement 1, Common_Movement_FacePlayer @@ -227,22 +227,22 @@ BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8 end BattleFrontier_ScottsHouse_EventScript_263A13:: @ 8263A13 - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_263A1E:: @ 8263A1E - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_263A29:: @ 8263A29 - applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return BattleFrontier_ScottsHouse_EventScript_263A34:: @ 8263A34 - applymovement 1, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index c3e5ddddf..50bd57f0b 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BirthIsland_Exterior_EventScript_267F83", + "script": "BirthIsland_Exterior_EventScript_Triangle", "flag": "FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE" }, { diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 3eb491e0f..b51940a7c 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -1,11 +1,11 @@ BirthIsland_Exterior_MapScripts:: @ 8267F15 map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_OnTransition - map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_MapScript1_267F65 - map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_MapScript1_267F25 + map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_OnResume + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_OnReturnToField .byte 0 -BirthIsland_Exterior_MapScript1_267F25: @ 8267F25 - special sub_813B1D0 +BirthIsland_Exterior_OnReturnToField: @ 8267F25 + special SetDeoxysRockPalette end BirthIsland_Exterior_OnTransition: @ 8267F29 @@ -13,57 +13,57 @@ BirthIsland_Exterior_OnTransition: @ 8267F29 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL setvar VAR_DEOXYS_ROCK_STEP_COUNT, 0 setvar VAR_DEOXYS_ROCK_LEVEL, 0 - call_if_set FLAG_BATTLED_DEOXYS, BirthIsland_Exterior_EventScript_267F4E - call_if_unset FLAG_BATTLED_DEOXYS, BirthIsland_Exterior_EventScript_267F55 + call_if_set FLAG_BATTLED_DEOXYS, BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle + call_if_unset FLAG_BATTLED_DEOXYS, BirthIsland_Exterior_EventScript_TryShowDeoxysPuzzle end -BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E +BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle:: @ 8267F4E setflag FLAG_HIDE_DEOXYS setflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE return -BirthIsland_Exterior_EventScript_267F55:: @ 8267F55 +BirthIsland_Exterior_EventScript_TryShowDeoxysPuzzle:: @ 8267F55 goto_if_set FLAG_DEFEATED_DEOXYS, Common_EventScript_NopReturn clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE clearflag FLAG_DEOXYS_ROCK_COMPLETE return -BirthIsland_Exterior_MapScript1_267F65: @ 8267F65 - call_if_set FLAG_SYS_CTRL_OBJ_DELETE, BirthIsland_Exterior_EventScript_267F6F +BirthIsland_Exterior_OnResume: @ 8267F65 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, BirthIsland_Exterior_EventScript_TryRemoveDeoxys end -BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F +BirthIsland_Exterior_EventScript_TryRemoveDeoxys:: @ 8267F6F specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject 2 return -BirthIsland_Exterior_EventScript_267F83:: @ 8267F83 +BirthIsland_Exterior_EventScript_Triangle:: @ 8267F83 lock faceplayer special DoDeoxysRockInteraction waitstate switch VAR_RESULT - case 0, BirthIsland_Exterior_EventScript_267FBB - case 1, BirthIsland_Exterior_EventScript_267FBD - case 2, BirthIsland_Exterior_EventScript_267FC1 - case 3, BirthIsland_Exterior_EventScript_267FBF + case 0, BirthIsland_Exterior_EventScript_NotSolved1 + case 1, BirthIsland_Exterior_EventScript_NotSolved2 + case 2, BirthIsland_Exterior_EventScript_Deoxys + case 3, BirthIsland_Exterior_EventScript_NotSolved3 end -BirthIsland_Exterior_EventScript_267FBB:: @ 8267FBB +BirthIsland_Exterior_EventScript_NotSolved1:: @ 8267FBB release end -BirthIsland_Exterior_EventScript_267FBD:: @ 8267FBD +BirthIsland_Exterior_EventScript_NotSolved2:: @ 8267FBD release end -BirthIsland_Exterior_EventScript_267FBF:: @ 8267FBF +BirthIsland_Exterior_EventScript_NotSolved3:: @ 8267FBF release end -BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1 +BirthIsland_Exterior_EventScript_Deoxys:: @ 8267FC1 waitse setfieldeffectargument 0, 1 setfieldeffectargument 1, 58 @@ -72,44 +72,44 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1 playbgm MUS_RG_DEOEYE, 0 waitfieldeffect FLDEFF_65 addobject 2 - applymovement 2, BirthIsland_Exterior_Movement_268054 + applymovement 2, BirthIsland_Exterior_Movement_DeoxysApproach waitmovement 0 waitse playmoncry SPECIES_DEOXYS, 2 delay 40 waitmoncry setvar VAR_LAST_TALKED, 2 - setvar VAR_0x8004, 410 - setvar VAR_0x8005, 30 - setvar VAR_0x8006, 0 + setvar VAR_0x8004, SPECIES_DEOXYS + setvar VAR_0x8005, 30 @ level + setvar VAR_0x8006, ITEM_NONE special CreateObedientEnemyMon setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 - goto_if_eq BirthIsland_Exterior_EventScript_26803B - compare VAR_RESULT, 4 - goto_if_eq BirthIsland_Exterior_EventScript_268049 - compare VAR_RESULT, 5 - goto_if_eq BirthIsland_Exterior_EventScript_268049 + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq BirthIsland_Exterior_EventScript_DefeatedDeoxys + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq BirthIsland_Exterior_EventScript_RanFromDeoxys + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq BirthIsland_Exterior_EventScript_RanFromDeoxys setflag FLAG_BATTLED_DEOXYS release end -BirthIsland_Exterior_EventScript_26803B:: @ 826803B +BirthIsland_Exterior_EventScript_DefeatedDeoxys:: @ 826803B setflag FLAG_DEFEATED_DEOXYS - setvar VAR_0x8004, 410 - goto BirthIsland_Exterior_EventScript_273776 + setvar VAR_0x8004, SPECIES_DEOXYS + goto Common_EventScript_LegendaryFlewAway end -BirthIsland_Exterior_EventScript_268049:: @ 8268049 - setvar VAR_0x8004, 410 - goto BirthIsland_Exterior_EventScript_273776 +BirthIsland_Exterior_EventScript_RanFromDeoxys:: @ 8268049 + setvar VAR_0x8004, SPECIES_DEOXYS + goto Common_EventScript_LegendaryFlewAway end -BirthIsland_Exterior_Movement_268054: @ 8268054 +BirthIsland_Exterior_Movement_DeoxysApproach: @ 8268054 walk_slow_down walk_slow_down walk_slow_down diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index 48937d482..ea124d9ef 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "BirthIsland_Harbor_EventScript_26805D", + "script": "BirthIsland_Harbor_EventScript_Sailor", "flag": "0" }, { diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index 9ef54cdc8..f19b373f5 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -1,26 +1,26 @@ BirthIsland_Harbor_MapScripts:: @ 826805C .byte 0 -BirthIsland_Harbor_EventScript_26805D:: @ 826805D +BirthIsland_Harbor_EventScript_Sailor:: @ 826805D lock faceplayer msgbox BirthIsland_Harbor_Text_SailorReturn, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq BirthIsland_Harbor_EventScript_2680A2 + compare VAR_RESULT, NO + goto_if_eq BirthIsland_Harbor_EventScript_AsYouLike msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 hideobjectat 1, MAP_BIRTH_ISLAND_HARBOR setvar VAR_0x8004, 2 - call BirthIsland_Harbor_EventScript_272250 + call Common_EventScript_FerryDepartIsland warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end -BirthIsland_Harbor_EventScript_2680A2:: @ 82680A2 +BirthIsland_Harbor_EventScript_AsYouLike:: @ 82680A2 msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT release end diff --git a/data/maps/CaveOfOrigin_1F/scripts.inc b/data/maps/CaveOfOrigin_1F/scripts.inc index 8c72ec4b8..de1d979d4 100644 --- a/data/maps/CaveOfOrigin_1F/scripts.inc +++ b/data/maps/CaveOfOrigin_1F/scripts.inc @@ -3,5 +3,5 @@ CaveOfOrigin_1F_MapScripts:: @ 8235768 .byte 0 CaveOfOrigin_1F_OnTransition: @ 823576E - call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_1F_EventScript_2722C1 + call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_SetTempVars end diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json index ac3baeaf8..61d8dc715 100644 --- a/data/maps/CaveOfOrigin_B1F/map.json +++ b/data/maps/CaveOfOrigin_B1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "CaveOfOrigin_B1F_EventScript_2357A9", + "script": "CaveOfOrigin_B1F_EventScript_Wallace", "flag": "FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE" } ], diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc index 3b130e756..378819f43 100644 --- a/data/maps/CaveOfOrigin_B1F/scripts.inc +++ b/data/maps/CaveOfOrigin_B1F/scripts.inc @@ -1,12 +1,12 @@ CaveOfOrigin_B1F_MapScripts:: @ 82357A8 .byte 0 -CaveOfOrigin_B1F_EventScript_2357A9:: @ 82357A9 +CaveOfOrigin_B1F_EventScript_Wallace:: @ 82357A9 lock faceplayer - msgbox CaveOfOrigin_B1F_Text_23586E, MSGBOX_DEFAULT + msgbox CaveOfOrigin_B1F_Text_WallaceStory, MSGBOX_DEFAULT closemessage - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 60 playse SE_PIN @@ -17,37 +17,37 @@ CaveOfOrigin_B1F_EventScript_2357A9:: @ 82357A9 delay 30 applymovement 1, Common_Movement_FacePlayer waitmovement 0 - message CaveOfOrigin_B1F_Text_235ACE + message CaveOfOrigin_B1F_Text_WhereIsRayquaza waitmessage - goto CaveOfOrigin_B1F_EventScript_2357F0 + goto CaveOfOrigin_B1F_EventScript_WheresRayquaza -CaveOfOrigin_B1F_EventScript_2357F0:: @ 82357F0 +CaveOfOrigin_B1F_EventScript_WheresRayquaza:: @ 82357F0 multichoice 0, 0, MULTI_WHERES_RAYQUAZA, 0 switch VAR_RESULT - case 0, CaveOfOrigin_B1F_EventScript_23582C - case 1, CaveOfOrigin_B1F_EventScript_235837 - case 2, CaveOfOrigin_B1F_EventScript_23584D - case 3, CaveOfOrigin_B1F_EventScript_235842 - goto CaveOfOrigin_B1F_EventScript_235842 + case 0, CaveOfOrigin_B1F_EventScript_AtCaveOfOrigin + case 1, CaveOfOrigin_B1F_EventScript_AtMtPyre + case 2, CaveOfOrigin_B1F_EventScript_AtSkyPillar + case 3, CaveOfOrigin_B1F_EventScript_DontRemember + goto CaveOfOrigin_B1F_EventScript_DontRemember end -CaveOfOrigin_B1F_EventScript_23582C:: @ 823582C - message CaveOfOrigin_B1F_Text_235B23 +CaveOfOrigin_B1F_EventScript_AtCaveOfOrigin:: @ 823582C + message CaveOfOrigin_B1F_Text_ButWereInCaveOfOrigin waitmessage - goto CaveOfOrigin_B1F_EventScript_2357F0 + goto CaveOfOrigin_B1F_EventScript_WheresRayquaza -CaveOfOrigin_B1F_EventScript_235837:: @ 8235837 - message CaveOfOrigin_B1F_Text_235BBF +CaveOfOrigin_B1F_EventScript_AtMtPyre:: @ 8235837 + message CaveOfOrigin_B1F_Text_OldLadyDidntMentionThat waitmessage - goto CaveOfOrigin_B1F_EventScript_2357F0 + goto CaveOfOrigin_B1F_EventScript_WheresRayquaza -CaveOfOrigin_B1F_EventScript_235842:: @ 8235842 - message CaveOfOrigin_B1F_Text_235C99 +CaveOfOrigin_B1F_EventScript_DontRemember:: @ 8235842 + message CaveOfOrigin_B1F_Text_CantYouRememberSomehow waitmessage - goto CaveOfOrigin_B1F_EventScript_2357F0 + goto CaveOfOrigin_B1F_EventScript_WheresRayquaza -CaveOfOrigin_B1F_EventScript_23584D:: @ 823584D - msgbox CaveOfOrigin_B1F_Text_235CEE, MSGBOX_DEFAULT +CaveOfOrigin_B1F_EventScript_AtSkyPillar:: @ 823584D + msgbox CaveOfOrigin_B1F_Text_WellHeadToSkyPillar, MSGBOX_DEFAULT closemessage playse SE_KAIDAN fadescreenspeed 1, 4 @@ -59,7 +59,7 @@ CaveOfOrigin_B1F_EventScript_23584D:: @ 823584D release end -CaveOfOrigin_B1F_Text_23586E: @ 823586E +CaveOfOrigin_B1F_Text_WallaceStory: @ 823586E .string "Ah, so you are {PLAYER}{KUN}?\n" .string "I've heard tales of your exploits.\p" .string "My name is WALLACE.\p" @@ -83,19 +83,19 @@ CaveOfOrigin_B1F_Text_23586E: @ 823586E .string "But even I have no clue as to\n" .string "RAYQUAZA's whereabouts…$" -CaveOfOrigin_B1F_Text_235ACE: @ 8235ACE +CaveOfOrigin_B1F_Text_WhereIsRayquaza: @ 8235ACE .string "WALLACE: {PLAYER}{KUN}, do you perhaps\n" .string "know where RAYQUAZA is now?\p" .string "If you do, please tell me.$" -CaveOfOrigin_B1F_Text_235B23: @ 8235B23 +CaveOfOrigin_B1F_Text_ButWereInCaveOfOrigin: @ 8235B23 .string "WALLACE: The CAVE OF ORIGIN?\p" .string "But that's right here!\n" .string "I need you to do better than that!\p" .string "Please, I need you to think about\n" .string "where RAYQUAZA might be right now.$" -CaveOfOrigin_B1F_Text_235BBF: @ 8235BBF +CaveOfOrigin_B1F_Text_OldLadyDidntMentionThat: @ 8235BBF .string "WALLACE: MT. PYRE?\p" .string "But when I met the old lady there\n" .string "earlier, she made no mention of it.\p" @@ -104,12 +104,12 @@ CaveOfOrigin_B1F_Text_235BBF: @ 8235BBF .string "{PLAYER}{KUN}, could you think about this\n" .string "more carefully for me?$" -CaveOfOrigin_B1F_Text_235C99: @ 8235C99 +CaveOfOrigin_B1F_Text_CantYouRememberSomehow: @ 8235C99 .string "WALLACE: Huh? You don't remember?\n" .string "Hmm… That's a problem…\p" .string "Can't you remember somehow?$" -CaveOfOrigin_B1F_Text_235CEE: @ 8235CEE +CaveOfOrigin_B1F_Text_WellHeadToSkyPillar: @ 8235CEE .string "WALLACE: The SKY PILLAR?\p" .string "That's it!\n" .string "It must be the SKY PILLAR!\p" diff --git a/data/maps/CaveOfOrigin_Entrance/scripts.inc b/data/maps/CaveOfOrigin_Entrance/scripts.inc index 53228f63c..76cdbc7ad 100644 --- a/data/maps/CaveOfOrigin_Entrance/scripts.inc +++ b/data/maps/CaveOfOrigin_Entrance/scripts.inc @@ -1,8 +1,8 @@ CaveOfOrigin_Entrance_MapScripts:: @ 8235759 - map_script MAP_SCRIPT_ON_RESUME, CaveOfOrigin_Entrance_MapScript1_23575F + map_script MAP_SCRIPT_ON_RESUME, CaveOfOrigin_Entrance_OnResume .byte 0 -CaveOfOrigin_Entrance_MapScript1_23575F: @ 823575F +CaveOfOrigin_Entrance_OnResume: @ 823575F setescapewarp MAP_SOOTOPOLIS_CITY, 255, 31, 17 end diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc index bc574be2d..326ea21e3 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc @@ -3,5 +3,5 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778 .byte 0 CaveOfOrigin_UnusedRubySapphireMap1_OnTransition: @ 823577E - call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1 + call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_SetTempVars end diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc index 340e4a585..5e92a7d45 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc @@ -3,6 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788 .byte 0 CaveOfOrigin_UnusedRubySapphireMap2_OnTransition: @ 823578E - call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1 + call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_SetTempVars end diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc index f2e118907..2f0e2b66c 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc @@ -3,6 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798 .byte 0 CaveOfOrigin_UnusedRubySapphireMap3_OnTransition: @ 823579E - call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1 + call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_SetTempVars end diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json index 28a04a458..441157d86 100644 --- a/data/maps/DesertRuins/map.json +++ b/data/maps/DesertRuins/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DesertRuins_EventScript_22DA02", + "script": "DesertRuins_EventScript_Regirock", "flag": "FLAG_HIDE_REGIROCK" } ], @@ -59,7 +59,7 @@ "y": 20, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DesertRuins_EventScript_22D9DB" + "script": "DesertRuins_EventScript_CaveEntranceMiddle" }, { "type": "sign", @@ -67,7 +67,7 @@ "y": 20, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DesertRuins_EventScript_22D9F8" + "script": "DesertRuins_EventScript_CaveEntranceSide" }, { "type": "sign", @@ -75,7 +75,7 @@ "y": 20, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "DesertRuins_EventScript_22D9F8" + "script": "DesertRuins_EventScript_CaveEntranceSide" } ] }
\ No newline at end of file diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 5cadf3ec0..bd7b04fb4 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -1,25 +1,25 @@ DesertRuins_MapScripts:: @ 822D95B - map_script MAP_SCRIPT_ON_RESUME, DesertRuins_MapScript1_22D96B - map_script MAP_SCRIPT_ON_LOAD, DesertRuins_MapScript1_22D989 + map_script MAP_SCRIPT_ON_RESUME, DesertRuins_OnResume + map_script MAP_SCRIPT_ON_LOAD, DesertRuins_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, DesertRuins_OnTransition .byte 0 -DesertRuins_MapScript1_22D96B: @ 822D96B - call_if_set FLAG_SYS_CTRL_OBJ_DELETE, DesertRuins_EventScript_22D975 +DesertRuins_OnResume: @ 822D96B + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, DesertRuins_EventScript_TryRemoveRegirock end -DesertRuins_EventScript_22D975:: @ 822D975 +DesertRuins_EventScript_TryRemoveRegirock:: @ 822D975 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return -DesertRuins_MapScript1_22D989: @ 822D989 - call_if_unset FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_22D993 +DesertRuins_OnLoad: @ 822D989 + call_if_unset FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_HideRegiEntrance end -DesertRuins_EventScript_22D993:: @ 822D993 +DesertRuins_EventScript_HideRegiEntrance:: @ 822D993 setmetatile 7, 19, METATILE_Cave_EntranceCover, 1 setmetatile 8, 19, METATILE_Cave_EntranceCover, 1 setmetatile 9, 19, METATILE_Cave_EntranceCover, 1 @@ -30,36 +30,36 @@ DesertRuins_EventScript_22D993:: @ 822D993 DesertRuins_OnTransition: @ 822D9CA setflag FLAG_LANDMARK_DESERT_RUINS - call_if_unset FLAG_DEFEATED_REGIROCK, DesertRuins_EventScript_22D9D7 + call_if_unset FLAG_DEFEATED_REGIROCK, DesertRuins_EventScript_ShowRegirock end -DesertRuins_EventScript_22D9D7:: @ 822D9D7 +DesertRuins_EventScript_ShowRegirock:: @ 822D9D7 clearflag FLAG_HIDE_REGIROCK return -DesertRuins_EventScript_22D9DB:: @ 822D9DB +DesertRuins_EventScript_CaveEntranceMiddle:: @ 822D9DB lockall - goto_if_set FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_22D9EE - braillemessage DesertRuins_Braille_2A6CA0 + goto_if_set FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_BigHoleInWall + braillemessage DesertRuins_Braille_UseRockSmash waitbuttonpress - hidebox2 + closebraillemessage releaseall end -DesertRuins_EventScript_22D9EE:: @ 822D9EE - msgbox gUnknown_0827304E, MSGBOX_DEFAULT +DesertRuins_EventScript_BigHoleInWall:: @ 822D9EE + msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT releaseall end -DesertRuins_EventScript_22D9F8:: @ 822D9F8 +DesertRuins_EventScript_CaveEntranceSide:: @ 822D9F8 lockall - braillemessage DesertRuins_Braille_2A6CA0 + braillemessage DesertRuins_Braille_UseRockSmash waitbuttonpress - hidebox2 + closebraillemessage releaseall end -DesertRuins_EventScript_22DA02:: @ 822DA02 +DesertRuins_EventScript_Regirock:: @ 822DA02 lock faceplayer waitse @@ -72,23 +72,23 @@ DesertRuins_EventScript_22DA02:: @ 822DA02 waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 - goto_if_eq DesertRuins_EventScript_22DA49 - compare VAR_RESULT, 4 - goto_if_eq DesertRuins_EventScript_22DA52 - compare VAR_RESULT, 5 - goto_if_eq DesertRuins_EventScript_22DA52 + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq DesertRuins_EventScript_DefeatedRegirock + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq DesertRuins_EventScript_RanFromRegirock + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq DesertRuins_EventScript_RanFromRegirock setflag FLAG_DEFEATED_REGIROCK release end -DesertRuins_EventScript_22DA49:: @ 822DA49 +DesertRuins_EventScript_DefeatedRegirock:: @ 822DA49 setflag FLAG_DEFEATED_REGIROCK - goto DesertRuins_EventScript_27376D + goto Common_EventScript_RemoveStaticPokemon end -DesertRuins_EventScript_22DA52:: @ 822DA52 - setvar VAR_0x8004, 401 - goto DesertRuins_EventScript_273776 +DesertRuins_EventScript_RanFromRegirock:: @ 822DA52 + setvar VAR_0x8004, SPECIES_REGIROCK + goto Common_EventScript_LegendaryFlewAway end diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 1711405e1..9d6011a1f 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -42,7 +42,7 @@ DewfordTown_EventScript_1E957A:: @ 81E957A DewfordTown_EventScript_1E9585:: @ 81E9585 msgbox DewfordTown_Text_1E9B24, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq DewfordTown_EventScript_1E95A2 msgbox DewfordTown_Text_1E9BD9, MSGBOX_DEFAULT release @@ -75,9 +75,9 @@ DewfordTown_EventScript_1E95D5:: @ 81E95D5 faceplayer goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_1E962A msgbox DewfordTown_Text_1E9DD1, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq DewfordTown_EventScript_1E95FF - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq DewfordTown_EventScript_1E9620 end @@ -115,7 +115,7 @@ DewfordTown_EventScript_1E9656:: @ 81E9656 end DewfordTown_EventScript_1E9660:: @ 81E9660 - call DewfordTown_EventScript_271E95 + call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_DEWFORD_TOWN, 0 setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 0 applymovement 2, DewfordTown_Movement_1E991D @@ -124,12 +124,12 @@ DewfordTown_EventScript_1E9660:: @ 81E9660 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911 waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN - call DewfordTown_EventScript_2720A0 + call Common_EventScript_PlayBrineysBoatMusic applymovement 4, DewfordTown_Movement_1E97A2 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E97A2 waitmovement 0 showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 - call DewfordTown_EventScript_2720A8 + call Common_EventScript_StopBrineysBoatMusic applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9914 waitmovement 0 showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 @@ -147,7 +147,7 @@ DewfordTown_EventScript_1E9660:: @ 81E9660 end DewfordTown_EventScript_1E96E7:: @ 81E96E7 - call DewfordTown_EventScript_271E95 + call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_DEWFORD_TOWN, 0 setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 1 applymovement 2, DewfordTown_Movement_1E991D @@ -156,11 +156,11 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911 waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN - call DewfordTown_EventScript_2720A0 + call Common_EventScript_PlayBrineysBoatMusic applymovement 4, DewfordTown_Movement_1E9865 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9865 waitmovement 0 - call DewfordTown_EventScript_2720A8 + call Common_EventScript_StopBrineysBoatMusic showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9918 waitmovement 0 @@ -169,7 +169,7 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7 setobjectpriority 2, MAP_ROUTE109, 0 applymovement 2, DewfordTown_Movement_1E991F waitmovement 0 - clearflag FLAG_HIDE_ROUTE_108_MR_BRINEY + clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY addobject 1 clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN @@ -185,11 +185,11 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7 end DewfordTown_EventScript_1E9790:: @ 81E9790 - msgbox DewfordTown_Text_1EEC1D, MSGBOX_DEFAULT + msgbox DewfordTown_Text_BrineyLandedInSlateportDeliverGoods, MSGBOX_DEFAULT return DewfordTown_EventScript_1E9799:: @ 81E9799 - msgbox DewfordTown_Text_1EEDA7, MSGBOX_DEFAULT + msgbox DewfordTown_Text_BrineyLandedInSlateport, MSGBOX_DEFAULT return DewfordTown_Movement_1E97A2: @ 81E97A2 @@ -595,9 +595,9 @@ DewfordTown_EventScript_1E9922:: @ 81E9922 faceplayer call DewfordTown_EventScript_271E8B msgbox DewfordTown_Text_1EA136, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq DewfordTown_EventScript_1E9948 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq DewfordTown_EventScript_1E9952 end @@ -619,7 +619,7 @@ DewfordTown_EventScript_1E9952:: @ 81E9952 end DewfordTown_EventScript_1E997D:: @ 81E997D - incrementgamestat 2 + incrementgamestat GAME_STAT_STARTED_TRENDS compare VAR_0x8004, 0 goto_if_eq DewfordTown_EventScript_1E999E msgbox DewfordTown_Text_1EA2AA, MSGBOX_DEFAULT @@ -654,7 +654,7 @@ DewfordTown_Text_1E9A7F: @ 81E9A7F .string "DEWFORD HALL\n" .string "“Everyone's information exchange!”$" -Route104_Text_1E9AAF: @ 81E9AAF +Route104_Text_LandedInDewfordDeliverLetter: @ 81E9AAF .string "MR. BRINEY: Ahoy!\n" .string "We've hit land in DEWFORD.\p" .string "I suppose you're off to deliver that\n" @@ -675,8 +675,7 @@ DewfordTown_Text_1E9BD9: @ 81E9BD9 .string "MR. BRINEY: Then you go on and deliver\n" .string "the LETTER. I'll be waiting.$" -Route104_Text_1E9C1D: @ 81E9C1D -Route109_Text_1E9C1D: @ 81E9C1D +DewfordTown_Text_BrineyLandedInDewford: @ 81E9C1D .string "MR. BRINEY: Ahoy!\n" .string "We've hit land in DEWFORD!\p" .string "You just go on and tell me whenever\n" diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json index cf87f878a..35ba61064 100644 --- a/data/maps/DewfordTown_Gym/map.json +++ b/data/maps/DewfordTown_Gym/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Gym_EventScript_1FC7C2", + "script": "DewfordTown_Gym_EventScript_Brawly", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "DewfordTown_Gym_EventScript_1FC8B7", + "script": "DewfordTown_Gym_EventScript_Takao", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "DewfordTown_Gym_EventScript_1FC8D9", + "script": "DewfordTown_Gym_EventScript_Jocelyn", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "DewfordTown_Gym_EventScript_1FC8FB", + "script": "DewfordTown_Gym_EventScript_Laura", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_Gym_EventScript_1FC983", + "script": "DewfordTown_Gym_EventScript_GymGuide", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "DewfordTown_Gym_EventScript_1FC93F", + "script": "DewfordTown_Gym_EventScript_Cristian", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "DewfordTown_Gym_EventScript_1FC961", + "script": "DewfordTown_Gym_EventScript_Lilith", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "DewfordTown_Gym_EventScript_1FC91D", + "script": "DewfordTown_Gym_EventScript_Brenden", "flag": "0" } ], @@ -143,7 +143,7 @@ "y": 23, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "DewfordTown_Gym_EventScript_1FC9A2" + "script": "DewfordTown_Gym_EventScript_LeftGymStatue" }, { "type": "sign", @@ -151,7 +151,7 @@ "y": 23, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "DewfordTown_Gym_EventScript_1FC9B2" + "script": "DewfordTown_Gym_EventScript_RightGymStatue" }, { "type": "sign", @@ -159,7 +159,7 @@ "y": 24, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "DewfordTown_Gym_EventScript_1FC9A2" + "script": "DewfordTown_Gym_EventScript_LeftGymStatue" }, { "type": "sign", @@ -167,7 +167,7 @@ "y": 24, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "DewfordTown_Gym_EventScript_1FC9B2" + "script": "DewfordTown_Gym_EventScript_RightGymStatue" } ] }
\ No newline at end of file diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 5601c7477..2641db5dc 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -3,186 +3,181 @@ DewfordTown_Gym_MapScripts:: @ 81FC63C .byte 0 DewfordTown_Gym_OnTransition: @ 81FC642 - call DewfordTown_Gym_EventScript_1FC648 + call DewfordTown_Gym_EventScript_SetFlashRadius end -DewfordTown_Gym_EventScript_1FC648:: @ 81FC648 +DewfordTown_Gym_EventScript_SetFlashRadius:: @ 81FC648 checktrainerflag TRAINER_BRAWLY_1 - goto_if_eq DewfordTown_Gym_EventScript_1FC6A2 - call DewfordTown_Gym_EventScript_1FC768 + goto_if_eq DewfordTown_Gym_EventScript_SetLightsOn + call DewfordTown_Gym_EventScript_CountTrainersDefeated copyvar VAR_0x8001, VAR_0x8000 compare VAR_0x8000, 0 - goto_if_eq DewfordTown_Gym_EventScript_1FC6BE + goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius7 compare VAR_0x8000, 1 - goto_if_eq DewfordTown_Gym_EventScript_1FC6BA + goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius6 compare VAR_0x8000, 2 - goto_if_eq DewfordTown_Gym_EventScript_1FC6B6 + goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius5 compare VAR_0x8000, 3 - goto_if_eq DewfordTown_Gym_EventScript_1FC6B2 + goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius4 compare VAR_0x8000, 4 - goto_if_eq DewfordTown_Gym_EventScript_1FC6AE + goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius3 compare VAR_0x8000, 5 - goto_if_eq DewfordTown_Gym_EventScript_1FC6AA - goto DewfordTown_Gym_EventScript_1FC6A6 + goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius2 + goto DewfordTown_Gym_EventScript_SetFlashRadius1 -DewfordTown_Gym_EventScript_1FC6A2:: @ 81FC6A2 +DewfordTown_Gym_EventScript_SetLightsOn:: @ 81FC6A2 setflashradius 0 return -DewfordTown_Gym_EventScript_1FC6A6:: @ 81FC6A6 +DewfordTown_Gym_EventScript_SetFlashRadius1:: @ 81FC6A6 setflashradius 1 return -DewfordTown_Gym_EventScript_1FC6AA:: @ 81FC6AA +DewfordTown_Gym_EventScript_SetFlashRadius2:: @ 81FC6AA setflashradius 2 return -DewfordTown_Gym_EventScript_1FC6AE:: @ 81FC6AE +DewfordTown_Gym_EventScript_SetFlashRadius3:: @ 81FC6AE setflashradius 3 return -DewfordTown_Gym_EventScript_1FC6B2:: @ 81FC6B2 +DewfordTown_Gym_EventScript_SetFlashRadius4:: @ 81FC6B2 setflashradius 4 return -DewfordTown_Gym_EventScript_1FC6B6:: @ 81FC6B6 +DewfordTown_Gym_EventScript_SetFlashRadius5:: @ 81FC6B6 setflashradius 5 return -DewfordTown_Gym_EventScript_1FC6BA:: @ 81FC6BA +DewfordTown_Gym_EventScript_SetFlashRadius6:: @ 81FC6BA setflashradius 6 return -DewfordTown_Gym_EventScript_1FC6BE:: @ 81FC6BE +DewfordTown_Gym_EventScript_SetFlashRadius7:: @ 81FC6BE setflashradius 7 return -DewfordTown_Gym_EventScript_1FC6C2:: @ 81FC6C2 - call DewfordTown_Gym_EventScript_1FC768 +DewfordTown_Gym_EventScript_BrightenRoom:: @ 81FC6C2 + call DewfordTown_Gym_EventScript_CountTrainersDefeated nop1 compare VAR_0x8000, VAR_0x8001 - goto_if_eq DewfordTown_Gym_EventScript_1FC71A + goto_if_eq DewfordTown_Gym_EventScript_NoLightChange copyvar VAR_0x8001, VAR_0x8000 compare VAR_0x8000, 1 - goto_if_eq DewfordTown_Gym_EventScript_1FC71B + goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash1Trainer compare VAR_0x8000, 2 - goto_if_eq DewfordTown_Gym_EventScript_1FC726 + goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash2Trainers compare VAR_0x8000, 3 - goto_if_eq DewfordTown_Gym_EventScript_1FC731 + goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash3Trainers compare VAR_0x8000, 4 - goto_if_eq DewfordTown_Gym_EventScript_1FC73C + goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash4Trainers compare VAR_0x8000, 5 - goto_if_eq DewfordTown_Gym_EventScript_1FC747 + goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash5Trainers compare VAR_0x8000, 6 - goto_if_eq DewfordTown_Gym_EventScript_1FC752 + goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash6Trainers -DewfordTown_Gym_EventScript_1FC71A:: @ 81FC71A +DewfordTown_Gym_EventScript_NoLightChange:: @ 81FC71A return -DewfordTown_Gym_EventScript_1FC71B:: @ 81FC71B +@ NOTE: A little confusingly, a larger animateflash param value is a smaller flash radius +DewfordTown_Gym_EventScript_AnimateFlash1Trainer:: @ 81FC71B playse SE_MU_PACHI animateflash 6 - call DewfordTown_Gym_EventScript_1FC648 + call DewfordTown_Gym_EventScript_SetFlashRadius return -DewfordTown_Gym_EventScript_1FC726:: @ 81FC726 +DewfordTown_Gym_EventScript_AnimateFlash2Trainers:: @ 81FC726 playse SE_MU_PACHI animateflash 5 - call DewfordTown_Gym_EventScript_1FC648 + call DewfordTown_Gym_EventScript_SetFlashRadius return -DewfordTown_Gym_EventScript_1FC731:: @ 81FC731 +DewfordTown_Gym_EventScript_AnimateFlash3Trainers:: @ 81FC731 playse SE_MU_PACHI animateflash 4 - call DewfordTown_Gym_EventScript_1FC648 + call DewfordTown_Gym_EventScript_SetFlashRadius return -DewfordTown_Gym_EventScript_1FC73C:: @ 81FC73C +DewfordTown_Gym_EventScript_AnimateFlash4Trainers:: @ 81FC73C playse SE_MU_PACHI animateflash 3 - call DewfordTown_Gym_EventScript_1FC648 + call DewfordTown_Gym_EventScript_SetFlashRadius return -DewfordTown_Gym_EventScript_1FC747:: @ 81FC747 +DewfordTown_Gym_EventScript_AnimateFlash5Trainers:: @ 81FC747 playse SE_MU_PACHI animateflash 2 - call DewfordTown_Gym_EventScript_1FC648 + call DewfordTown_Gym_EventScript_SetFlashRadius return -DewfordTown_Gym_EventScript_1FC752:: @ 81FC752 +DewfordTown_Gym_EventScript_AnimateFlash6Trainers:: @ 81FC752 playse SE_MU_PACHI animateflash 1 - call DewfordTown_Gym_EventScript_1FC648 + call DewfordTown_Gym_EventScript_SetFlashRadius return -DewfordTown_Gym_EventScript_1FC75D:: @ 81FC75D +DewfordTown_Gym_EventScript_AnimateFlashFullBrightness:: @ 81FC75D playse SE_MU_PACHI animateflash 0 - call DewfordTown_Gym_EventScript_1FC648 + call DewfordTown_Gym_EventScript_SetFlashRadius return -DewfordTown_Gym_EventScript_1FC768:: @ 81FC768 +DewfordTown_Gym_EventScript_CountTrainersDefeated:: @ 81FC768 setvar VAR_0x8000, 0 checktrainerflag TRAINER_TAKAO - goto_if_lt DewfordTown_Gym_EventScript_1FC77B + goto_if_lt DewfordTown_Gym_EventScript_CheckJocelyn addvar VAR_0x8000, 1 - -DewfordTown_Gym_EventScript_1FC77B:: @ 81FC77B +DewfordTown_Gym_EventScript_CheckJocelyn:: @ 81FC77B checktrainerflag TRAINER_JOCELYN - goto_if_lt DewfordTown_Gym_EventScript_1FC789 + goto_if_lt DewfordTown_Gym_EventScript_CheckLaura addvar VAR_0x8000, 1 - -DewfordTown_Gym_EventScript_1FC789:: @ 81FC789 +DewfordTown_Gym_EventScript_CheckLaura:: @ 81FC789 checktrainerflag TRAINER_LAURA - goto_if_lt DewfordTown_Gym_EventScript_1FC797 + goto_if_lt DewfordTown_Gym_EventScript_CheckBrenden addvar VAR_0x8000, 1 - -DewfordTown_Gym_EventScript_1FC797:: @ 81FC797 +DewfordTown_Gym_EventScript_CheckBrenden:: @ 81FC797 checktrainerflag TRAINER_BRENDEN - goto_if_lt DewfordTown_Gym_EventScript_1FC7A5 + goto_if_lt DewfordTown_Gym_EventScript_CheckCristian addvar VAR_0x8000, 1 - -DewfordTown_Gym_EventScript_1FC7A5:: @ 81FC7A5 +DewfordTown_Gym_EventScript_CheckCristian:: @ 81FC7A5 checktrainerflag TRAINER_CRISTIAN - goto_if_lt DewfordTown_Gym_EventScript_1FC7B3 + goto_if_lt DewfordTown_Gym_EventScript_CheckLilith addvar VAR_0x8000, 1 - -DewfordTown_Gym_EventScript_1FC7B3:: @ 81FC7B3 +DewfordTown_Gym_EventScript_CheckLilith:: @ 81FC7B3 checktrainerflag TRAINER_LILITH - goto_if_lt DewfordTown_Gym_EventScript_1FC7C1 + goto_if_lt DewfordTown_Gym_EventScript_StopCountingTrainers addvar VAR_0x8000, 1 - -DewfordTown_Gym_EventScript_1FC7C1:: @ 81FC7C1 +DewfordTown_Gym_EventScript_StopCountingTrainers:: @ 81FC7C1 return -DewfordTown_Gym_EventScript_1FC7C2:: @ 81FC7C2 - trainerbattle_single TRAINER_BRAWLY_1, DewfordTown_Gym_Text_1FCF44, DewfordTown_Gym_Text_1FD008, DewfordTown_Gym_EventScript_1FC7F7, NO_MUSIC +DewfordTown_Gym_EventScript_Brawly:: @ 81FC7C2 + trainerbattle_single TRAINER_BRAWLY_1, DewfordTown_Gym_Text_BrawlyPreBattle, DewfordTown_Gym_Text_BrawlyDefeat, DewfordTown_Gym_EventScript_BrawlyDefeated, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq DewfordTown_Gym_EventScript_1FC89C - goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_1FC878 - msgbox DewfordTown_Gym_Text_1FD20D, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq DewfordTown_Gym_EventScript_BrawlyRematch + goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_GiveBulkUp2 + msgbox DewfordTown_Gym_Text_BrawlyPostBattle, MSGBOX_DEFAULT release end -DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 - call DewfordTown_Gym_EventScript_1FC75D - message DewfordTown_Gym_Text_1FD07D +DewfordTown_Gym_EventScript_BrawlyDefeated:: @ 81FC7F7 + call DewfordTown_Gym_EventScript_AnimateFlashFullBrightness + message DewfordTown_Gym_Text_ReceivedKnuckleBadge waitmessage call Common_EventScript_PlayGymBadgeFanfare - msgbox DewfordTown_Gym_Text_1FD0A8, MSGBOX_DEFAULT + msgbox DewfordTown_Gym_Text_KnuckleBadgeInfoTakeThis, MSGBOX_DEFAULT setflag FLAG_DEFEATED_DEWFORD_GYM setflag FLAG_BADGE02_GET addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 - call_if_eq DewfordTown_Gym_EventScript_271E84 + call_if_eq Common_EventScript_ReadyPetalburgGymForBattle setvar VAR_0x8008, 2 - call DewfordTown_Gym_EventScript_271F43 - call DewfordTown_Gym_EventScript_1FC855 + call Common_EventScript_SetGymTrainers + call DewfordTown_Gym_EventScript_GiveBulkUp closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox DewfordTown_Gym_Text_1FD1E0, MSGBOX_DEFAULT + msgbox DewfordTown_Gym_Text_RegisteredBrawly, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -192,124 +187,124 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 release end -DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 +DewfordTown_Gym_EventScript_GiveBulkUp:: @ 81FC855 giveitem_std ITEM_TM08 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_BagIsFull - msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT + msgbox DewfordTown_Gym_Text_ExplainBulkUp, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM08 return -DewfordTown_Gym_EventScript_1FC878:: @ 81FC878 +DewfordTown_Gym_EventScript_GiveBulkUp2: @ 81FC878 giveitem_std ITEM_TM08 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT + msgbox DewfordTown_Gym_Text_ExplainBulkUp, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM08 release end -DewfordTown_Gym_EventScript_1FC89C:: @ 81FC89C - trainerbattle_rematch_double TRAINER_BRAWLY_1, DewfordTown_Gym_Text_1FD2C4, DewfordTown_Gym_Text_1FD367, DewfordTown_Gym_Text_1FD3DE - msgbox DewfordTown_Gym_Text_1FD37B, MSGBOX_AUTOCLOSE +DewfordTown_Gym_EventScript_BrawlyRematch:: @ 81FC89C + trainerbattle_rematch_double TRAINER_BRAWLY_1, DewfordTown_Gym_Text_BrawlyPreRematch, DewfordTown_Gym_Text_BrawlyRematchDefeat, DewfordTown_Gym_Text_BrawlyRematchNeedTwoMons + msgbox DewfordTown_Gym_Text_BrawlyPostRematch, MSGBOX_AUTOCLOSE end -DewfordTown_Gym_EventScript_1FC8B7:: @ 81FC8B7 - trainerbattle_single TRAINER_TAKAO, DewfordTown_Gym_Text_1FCB9F, DewfordTown_Gym_Text_1FCBB8, DewfordTown_Gym_EventScript_1FC8D2 - msgbox DewfordTown_Gym_Text_1FCBCA, MSGBOX_AUTOCLOSE +DewfordTown_Gym_EventScript_Takao:: @ 81FC8B7 + trainerbattle_single TRAINER_TAKAO, DewfordTown_Gym_Text_TakaoPreBattle, DewfordTown_Gym_Text_TakaoDefeat, DewfordTown_Gym_EventScript_TakaoBrightenRoom + msgbox DewfordTown_Gym_Text_TakaoPostBattle, MSGBOX_AUTOCLOSE end -DewfordTown_Gym_EventScript_1FC8D2:: @ 81FC8D2 - call DewfordTown_Gym_EventScript_1FC6C2 +DewfordTown_Gym_EventScript_TakaoBrightenRoom:: @ 81FC8D2 + call DewfordTown_Gym_EventScript_BrightenRoom release end -DewfordTown_Gym_EventScript_1FC8D9:: @ 81FC8D9 - trainerbattle_single TRAINER_JOCELYN, DewfordTown_Gym_Text_1FCC0A, DewfordTown_Gym_Text_1FCC45, DewfordTown_Gym_EventScript_1FC8F4 - msgbox DewfordTown_Gym_Text_1FCC6B, MSGBOX_AUTOCLOSE +DewfordTown_Gym_EventScript_Jocelyn:: @ 81FC8D9 + trainerbattle_single TRAINER_JOCELYN, DewfordTown_Gym_Text_JocelynPreBattle, DewfordTown_Gym_Text_JocelynDefeat, DewfordTown_Gym_EventScript_JocelynBrightenRoom + msgbox DewfordTown_Gym_Text_JocelynPostBattle, MSGBOX_AUTOCLOSE end -DewfordTown_Gym_EventScript_1FC8F4:: @ 81FC8F4 - call DewfordTown_Gym_EventScript_1FC6C2 +DewfordTown_Gym_EventScript_JocelynBrightenRoom:: @ 81FC8F4 + call DewfordTown_Gym_EventScript_BrightenRoom release end -DewfordTown_Gym_EventScript_1FC8FB:: @ 81FC8FB - trainerbattle_single TRAINER_LAURA, DewfordTown_Gym_Text_1FCD01, DewfordTown_Gym_Text_1FCD3C, DewfordTown_Gym_EventScript_1FC916 - msgbox DewfordTown_Gym_Text_1FCD4F, MSGBOX_AUTOCLOSE +DewfordTown_Gym_EventScript_Laura:: @ 81FC8FB + trainerbattle_single TRAINER_LAURA, DewfordTown_Gym_Text_LauraPreBattle, DewfordTown_Gym_Text_LauraDefeat, DewfordTown_Gym_EventScript_LauraBrightenRoom + msgbox DewfordTown_Gym_Text_LauraPostBattle, MSGBOX_AUTOCLOSE end -DewfordTown_Gym_EventScript_1FC916:: @ 81FC916 - call DewfordTown_Gym_EventScript_1FC6C2 +DewfordTown_Gym_EventScript_LauraBrightenRoom:: @ 81FC916 + call DewfordTown_Gym_EventScript_BrightenRoom release end -DewfordTown_Gym_EventScript_1FC91D:: @ 81FC91D - trainerbattle_single TRAINER_BRENDEN, DewfordTown_Gym_Text_1FCE48, DewfordTown_Gym_Text_1FCE75, DewfordTown_Gym_EventScript_1FC938 - msgbox DewfordTown_Gym_Text_1FCEAB, MSGBOX_AUTOCLOSE +DewfordTown_Gym_EventScript_Brenden:: @ 81FC91D + trainerbattle_single TRAINER_BRENDEN, DewfordTown_Gym_Text_BrendenPreBattle, DewfordTown_Gym_Text_BrendenDefeat, DewfordTown_Gym_EventScript_BrendenBrightenRoom + msgbox DewfordTown_Gym_Text_BrendenPostBattle, MSGBOX_AUTOCLOSE end -DewfordTown_Gym_EventScript_1FC938:: @ 81FC938 - call DewfordTown_Gym_EventScript_1FC6C2 +DewfordTown_Gym_EventScript_BrendenBrightenRoom:: @ 81FC938 + call DewfordTown_Gym_EventScript_BrightenRoom release end -DewfordTown_Gym_EventScript_1FC93F:: @ 81FC93F - trainerbattle_single TRAINER_CRISTIAN, DewfordTown_Gym_Text_1FCEDC, DewfordTown_Gym_Text_1FCF0A, DewfordTown_Gym_EventScript_1FC95A - msgbox DewfordTown_Gym_Text_1FCF26, MSGBOX_AUTOCLOSE +DewfordTown_Gym_EventScript_Cristian:: @ 81FC93F + trainerbattle_single TRAINER_CRISTIAN, DewfordTown_Gym_Text_CristianPreBattle, DewfordTown_Gym_Text_CristianDefeat, DewfordTown_Gym_EventScript_CristianBrightenRoom + msgbox DewfordTown_Gym_Text_CristianPostBattle, MSGBOX_AUTOCLOSE end -DewfordTown_Gym_EventScript_1FC95A:: @ 81FC95A - call DewfordTown_Gym_EventScript_1FC6C2 +DewfordTown_Gym_EventScript_CristianBrightenRoom:: @ 81FC95A + call DewfordTown_Gym_EventScript_BrightenRoom release end -DewfordTown_Gym_EventScript_1FC961:: @ 81FC961 - trainerbattle_single TRAINER_LILITH, DewfordTown_Gym_Text_1FCDB8, DewfordTown_Gym_Text_1FCDE5, DewfordTown_Gym_EventScript_1FC97C - msgbox DewfordTown_Gym_Text_1FCE08, MSGBOX_AUTOCLOSE +DewfordTown_Gym_EventScript_Lilith:: @ 81FC961 + trainerbattle_single TRAINER_LILITH, DewfordTown_Gym_Text_LilithPreBattle, DewfordTown_Gym_Text_LilithDefeat, DewfordTown_Gym_EventScript_LilithBrightenRoom + msgbox DewfordTown_Gym_Text_LilithPostBattle, MSGBOX_AUTOCLOSE end -DewfordTown_Gym_EventScript_1FC97C:: @ 81FC97C - call DewfordTown_Gym_EventScript_1FC6C2 +DewfordTown_Gym_EventScript_LilithBrightenRoom:: @ 81FC97C + call DewfordTown_Gym_EventScript_BrightenRoom release end -DewfordTown_Gym_EventScript_1FC983:: @ 81FC983 +DewfordTown_Gym_EventScript_GymGuide:: @ 81FC983 lock faceplayer - goto_if_set FLAG_DEFEATED_DEWFORD_GYM, DewfordTown_Gym_EventScript_1FC998 - msgbox DewfordTown_Gym_Text_1FC9D6, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_DEWFORD_GYM, DewfordTown_Gym_EventScript_GymGuidePostVictory + msgbox DewfordTown_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT release end -DewfordTown_Gym_EventScript_1FC998:: @ 81FC998 - msgbox DewfordTown_Gym_Text_1FCB5C, MSGBOX_DEFAULT +DewfordTown_Gym_EventScript_GymGuidePostVictory:: @ 81FC998 + msgbox DewfordTown_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT release end -DewfordTown_Gym_EventScript_1FC9A2:: @ 81FC9A2 +DewfordTown_Gym_EventScript_LeftGymStatue:: @ 81FC9A2 lockall - goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_1FC9C2 - goto DewfordTown_Gym_EventScript_1FC9CC + goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_GymStatueCertified + goto DewfordTown_Gym_EventScript_GymStatue end -DewfordTown_Gym_EventScript_1FC9B2:: @ 81FC9B2 +DewfordTown_Gym_EventScript_RightGymStatue:: @ 81FC9B2 lockall - goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_1FC9C2 - goto DewfordTown_Gym_EventScript_1FC9CC + goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_GymStatueCertified + goto DewfordTown_Gym_EventScript_GymStatue end -DewfordTown_Gym_EventScript_1FC9C2:: @ 81FC9C2 - msgbox DewfordTown_Gym_Text_1FD28B, MSGBOX_DEFAULT +DewfordTown_Gym_EventScript_GymStatueCertified:: @ 81FC9C2 + msgbox DewfordTown_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT releaseall end -DewfordTown_Gym_EventScript_1FC9CC:: @ 81FC9CC - msgbox DewfordTown_Gym_Text_1FD272, MSGBOX_DEFAULT +DewfordTown_Gym_EventScript_GymStatue:: @ 81FC9CC + msgbox DewfordTown_Gym_Text_GymStatue, MSGBOX_DEFAULT releaseall end -DewfordTown_Gym_Text_1FC9D6: @ 81FC9D6 +DewfordTown_Gym_Text_GymGuideAdvice: @ 81FC9D6 .string "Hey, how's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" .string "DEWFORD's GYM LEADER BRAWLY commands\n" @@ -325,88 +320,88 @@ DewfordTown_Gym_Text_1FC9D6: @ 81FC9D6 .string "the TRAINERS in your way.\p" .string "Hey, okay, go for it!$" -DewfordTown_Gym_Text_1FCB5C: @ 81FCB5C +DewfordTown_Gym_Text_GymGuidePostVictory: @ 81FCB5C .string "Whoah! It's turned too bright in here!\p" .string "Your future is bright, too!$" -DewfordTown_Gym_Text_1FCB9F: @ 81FCB9F +DewfordTown_Gym_Text_TakaoPreBattle: @ 81FCB9F .string "Might is right!\n" .string "Come on!$" -DewfordTown_Gym_Text_1FCBB8: @ 81FCBB8 +DewfordTown_Gym_Text_TakaoDefeat: @ 81FCBB8 .string "Not enough power…$" -DewfordTown_Gym_Text_1FCBCA: @ 81FCBCA +DewfordTown_Gym_Text_TakaoPostBattle: @ 81FCBCA .string "Your skill overcame my strength!\n" .string "Your technique is commendable!$" -DewfordTown_Gym_Text_1FCC0A: @ 81FCC0A +DewfordTown_Gym_Text_JocelynPreBattle: @ 81FCC0A .string "There's no need for BRAWLY to be\n" .string "involved!\p" .string "I'll crush you!$" -DewfordTown_Gym_Text_1FCC45: @ 81FCC45 +DewfordTown_Gym_Text_JocelynDefeat: @ 81FCC45 .string "But… How?\n" .string "How could I lose so easily?$" -DewfordTown_Gym_Text_1FCC6B: @ 81FCC6B +DewfordTown_Gym_Text_JocelynPostBattle: @ 81FCC6B .string "I'm not going to waste this loss.\n" .string "I'll use it to motivate me to train!\p" .string "One day I'll become a GYM LEADER…\p" .string "No, I'll become the POKéMON LEAGUE\n" .string "CHAMPION!$" -DewfordTown_Gym_Text_1FCD01: @ 81FCD01 +DewfordTown_Gym_Text_LauraPreBattle: @ 81FCD01 .string "Don't you dare brush me off!\n" .string "It's not my fault if you cry!$" -DewfordTown_Gym_Text_1FCD3C: @ 81FCD3C +DewfordTown_Gym_Text_LauraDefeat: @ 81FCD3C .string "Waaaaaaah!\n" .string "I lost!$" -DewfordTown_Gym_Text_1FCD4F: @ 81FCD4F +DewfordTown_Gym_Text_LauraPostBattle: @ 81FCD4F .string "I battle in the dark to make my heart\n" .string "stronger.\p" .string "But because it's so dark, I can never\n" .string "see BRAWLY's face…$" -DewfordTown_Gym_Text_1FCDB8: @ 81FCDB8 +DewfordTown_Gym_Text_LilithPreBattle: @ 81FCDB8 .string "Ufufu…\n" .string "Are you stumbling around in the dark?$" -DewfordTown_Gym_Text_1FCDE5: @ 81FCDE5 +DewfordTown_Gym_Text_LilithDefeat: @ 81FCDE5 .string "Oh, you…\n" .string "I don't want to know you!$" -DewfordTown_Gym_Text_1FCE08: @ 81FCE08 +DewfordTown_Gym_Text_LilithPostBattle: @ 81FCE08 .string "You deserve to stay lost and end up\n" .string "back at the entrance again!$" -DewfordTown_Gym_Text_1FCE48: @ 81FCE48 +DewfordTown_Gym_Text_BrendenPreBattle: @ 81FCE48 .string "I'll show you the gumption of\n" .string "a sailing man!$" -DewfordTown_Gym_Text_1FCE75: @ 81FCE75 +DewfordTown_Gym_Text_BrendenDefeat: @ 81FCE75 .string "How'd this happen?\n" .string "It's not like me to lose this way!$" -DewfordTown_Gym_Text_1FCEAB: @ 81FCEAB +DewfordTown_Gym_Text_BrendenPostBattle: @ 81FCEAB .string "Oh, aye! You're worthy of seeing\n" .string "our GYM LEADER.$" -DewfordTown_Gym_Text_1FCEDC: @ 81FCEDC +DewfordTown_Gym_Text_CristianPreBattle: @ 81FCEDC .string "If you mean to pass, it has to be\n" .string "through me!$" -DewfordTown_Gym_Text_1FCF0A: @ 81FCF0A +DewfordTown_Gym_Text_CristianDefeat: @ 81FCF0A .string "Grrrrr!\n" .string "Vastly overpowered!$" -DewfordTown_Gym_Text_1FCF26: @ 81FCF26 +DewfordTown_Gym_Text_CristianPostBattle: @ 81FCF26 .string "You win!\n" .string "Go after that BADGE!$" -DewfordTown_Gym_Text_1FCF44: @ 81FCF44 +DewfordTown_Gym_Text_BrawlyPreBattle: @ 81FCF44 .string "I'm BRAWLY!\n" .string "DEWFORD's GYM LEADER!\p" .string "I've been churned in the rough waves\n" @@ -415,18 +410,18 @@ DewfordTown_Gym_Text_1FCF44: @ 81FCF44 .string "So you wanted to challenge me?\n" .string "Let me see what you're made of!$" -DewfordTown_Gym_Text_1FD008: @ 81FD008 +DewfordTown_Gym_Text_BrawlyDefeat: @ 81FD008 .string "Whoah, wow! You made a much bigger\n" .string "splash than I expected!\p" .string "You swamped me!\p" .string "Okay, you've got me.\n" .string "Take this GYM BADGE!$" -DewfordTown_Gym_Text_1FD07D: @ 81FD07D +DewfordTown_Gym_Text_ReceivedKnuckleBadge: @ 81FD07D .string "{PLAYER} received the KNUCKLE BADGE\n" .string "from BRAWLY.$" -DewfordTown_Gym_Text_1FD0A8: @ 81FD0A8 +DewfordTown_Gym_Text_KnuckleBadgeInfoTakeThis: @ 81FD0A8 .string "The KNUCKLE BADGE makes all POKéMON\n" .string "up to Level 30, even those you get in\l" .string "trades, obey without question.\p" @@ -435,30 +430,30 @@ DewfordTown_Gym_Text_1FD0A8: @ 81FD0A8 .string "If you'd like, use this TECHNICAL\n" .string "MACHINE, too.$" -DewfordTown_Gym_Text_1FD181: @ 81FD181 +DewfordTown_Gym_Text_ExplainBulkUp: @ 81FD181 .string "That TM08 contains BULK UP.\p" .string "It's a move that raises both ATTACK\n" .string "and DEFENSE stats.\p" .string "… … … … … …$" -DewfordTown_Gym_Text_1FD1E0: @ 81FD1E0 +DewfordTown_Gym_Text_RegisteredBrawly: @ 81FD1E0 .string "Registered GYM LEADER BRAWLY\n" .string "in the POKéNAV.$" -DewfordTown_Gym_Text_1FD20D: @ 81FD20D +DewfordTown_Gym_Text_BrawlyPostBattle: @ 81FD20D .string "I can see your talent becoming a giant\n" .string "wave to cause a storm of astonishment\l" .string "among TRAINERS one day!$" -DewfordTown_Gym_Text_1FD272: @ 81FD272 +DewfordTown_Gym_Text_GymStatue: @ 81FD272 .string "DEWFORD TOWN POKéMON GYM$" -DewfordTown_Gym_Text_1FD28B: @ 81FD28B +DewfordTown_Gym_Text_GymStatueCertified: @ 81FD28B .string "DEWFORD TOWN POKéMON GYM\p" .string "BRAWLY'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" -DewfordTown_Gym_Text_1FD2C4: @ 81FD2C4 +DewfordTown_Gym_Text_BrawlyPreRematch: @ 81FD2C4 .string "BRAWLY: A wave may draw back, but it\n" .string "always returns to the shore.\p" .string "A giant wave of a talent like you…\n" @@ -466,16 +461,16 @@ DewfordTown_Gym_Text_1FD2C4: @ 81FD2C4 .string "Show me how much higher\n" .string "you've gone!$" -DewfordTown_Gym_Text_1FD367: @ 81FD367 +DewfordTown_Gym_Text_BrawlyRematchDefeat: @ 81FD367 .string "Wow!\n" .string "Swamped again!$" -DewfordTown_Gym_Text_1FD37B: @ 81FD37B +DewfordTown_Gym_Text_BrawlyPostRematch: @ 81FD37B .string "BRAWLY: Battling is vast and it's deep.\n" .string "You can't see the bottom.\l" .string "It's just like the sea of HOENN!$" -DewfordTown_Gym_Text_1FD3DE: @ 81FD3DE +DewfordTown_Gym_Text_BrawlyRematchNeedTwoMons: @ 81FD3DE .string "BRAWLY: A wave may draw back, but it\n" .string "always returns to the shore.\p" .string "A giant wave of a talent like you…\n" diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index 22bf5ed6a..e6eeec010 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -31,9 +31,9 @@ DewfordTown_Hall_EventScript_1FD50A:: @ 81FD50A call DewfordTown_Hall_EventScript_271E8B special sub_811EF6C msgbox DewfordTown_Hall_Text_1FD948, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq DewfordTown_Hall_EventScript_1FD533 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq DewfordTown_Hall_EventScript_1FD53D end @@ -53,7 +53,7 @@ DewfordTown_Hall_EventScript_1FD547:: @ 81FD547 call DewfordTown_Hall_EventScript_271E8B msgbox DewfordTown_Hall_Text_1FDA5C, MSGBOX_DEFAULT closemessage - applymovement 4, Common_Movement_WalkInPlaceUp + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 release end @@ -64,7 +64,7 @@ DewfordTown_Hall_EventScript_1FD563:: @ 81FD563 call DewfordTown_Hall_EventScript_271E8B msgbox DewfordTown_Hall_Text_1FDA99, MSGBOX_DEFAULT closemessage - applymovement 5, Common_Movement_WalkInPlaceUp + applymovement 5, Common_Movement_WalkInPlaceFastestUp waitmovement 0 release end @@ -198,9 +198,9 @@ DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A end DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST goto_if_eq DewfordTown_Hall_EventScript_1FD739 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -217,26 +217,26 @@ DewfordTown_Hall_EventScript_1FD772:: @ 81FD772 end DewfordTown_Hall_EventScript_1FD793:: @ 81FD793 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq DewfordTown_Hall_EventScript_1FD7AA - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if_eq DewfordTown_Hall_EventScript_1FD7B5 return DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST goto_if_eq DewfordTown_Hall_EventScript_1FD739 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc index be9005d7d..6fc9abb99 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -1,16 +1,16 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523 map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, DewfordTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 DewfordTown_PokemonCenter_1F_OnTransition: @ 81FC52E setrespawn HEAL_LOCATION_DEWFORD_TOWN - call DewfordTown_PokemonCenter_1F_EventScript_2718DE + call Common_EventScript_UpdateBrineyLocation end DewfordTown_PokemonCenter_1F_EventScript_1FC537:: @ 81FC537 setvar VAR_0x800B, 1 - call DewfordTown_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/DewfordTown_PokemonCenter_2F/map.json b/data/maps/DewfordTown_PokemonCenter_2F/map.json index 2792a9a20..6ebca2ae0 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "DewfordTown_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc index f49560d8c..df8539f0b 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615 - map_script MAP_SCRIPT_ON_FRAME_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, DewfordTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -DewfordTown_PokemonCenter_2F_EventScript_1FC62A:: @ 81FC62A - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +DewfordTown_PokemonCenter_2F_EventScript_Colosseum:: @ 81FC62A + call CableClub_EventScript_Colosseum end -DewfordTown_PokemonCenter_2F_EventScript_1FC630:: @ 81FC630 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +DewfordTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 81FC630 + call CableClub_EventScript_TradeCenter end -DewfordTown_PokemonCenter_2F_EventScript_1FC636:: @ 81FC636 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +DewfordTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 81FC636 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index b26e0e030..22acc0361 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -1,140 +1,140 @@ EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_OnTransition - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A05 - map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A14 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_OnFrame .byte 0 EverGrandeCity_ChampionsRoom_OnTransition: @ 82289FF - call Common_EventScript_SetupRivalGender + call Common_EventScript_SetupRivalGfxId end -EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_228A0F +EverGrandeCity_ChampionsRoom_OnWarp: @ 8228A05 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_PlayerTurnNorth .2byte 0 -EverGrandeCity_ChampionsRoom_EventScript_228A0F:: @ 8228A0F +EverGrandeCity_ChampionsRoom_EventScript_PlayerTurnNorth:: @ 8228A0F turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -EverGrandeCity_ChampionsRoom_MapScript2_228A14: @ 8228A14 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_228A1E +EverGrandeCity_ChampionsRoom_OnFrame: @ 8228A14 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_EnterRoom .2byte 0 -EverGrandeCity_ChampionsRoom_EventScript_228A1E:: @ 8228A1E +EverGrandeCity_ChampionsRoom_EventScript_EnterRoom:: @ 8228A1E lockall - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725C1 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp4 waitmovement 0 delay 40 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228A42 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace waitmovement 0 setvar VAR_TEMP_1, 1 - goto EverGrandeCity_ChampionsRoom_EventScript_228A45 + goto EverGrandeCity_ChampionsRoom_EventScript_Wallace releaseall end -EverGrandeCity_ChampionsRoom_Movement_228A42: @ 8228A42 +EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace: @ 8228A42 walk_up walk_up step_end -EverGrandeCity_ChampionsRoom_EventScript_228A45:: @ 8228A45 +EverGrandeCity_ChampionsRoom_EventScript_Wallace:: @ 8228A45 playbgm MUS_DAIGO, 0 - msgbox EverGrandeCity_ChampionsRoom_Text_228C4C, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_WALLACE, EverGrandeCity_ChampionsRoom_Text_228EAC - goto EverGrandeCity_ChampionsRoom_EventScript_228A61 + msgbox EverGrandeCity_ChampionsRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_WALLACE, EverGrandeCity_ChampionsRoom_Text_Defeat + goto EverGrandeCity_ChampionsRoom_EventScript_Defeated end -EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61 +EverGrandeCity_ChampionsRoom_EventScript_Defeated:: @ 8228A61 playse SE_DOOR setmetatile 6, 1, METATILE_EliteFour_OpenDoorChampion_Frame, 0 setmetatile 6, 2, METATILE_EliteFour_OpenDoorChampion_Opening, 0 special DrawWholeMapView - msgbox EverGrandeCity_ChampionsRoom_Text_228F66, MSGBOX_DEFAULT + msgbox EverGrandeCity_ChampionsRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT closemessage playse SE_DOOR checkplayergender compare VAR_RESULT, MALE - call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228ABC + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic compare VAR_RESULT, FEMALE - call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AC1 + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_PlayBrendanMusic addobject 2 - call EverGrandeCity_ChampionsRoom_EventScript_228BFD + call EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer checkplayergender compare VAR_RESULT, MALE - goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AC6 + goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_MayAdvice compare VAR_RESULT, FEMALE - goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AFB + goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice end -EverGrandeCity_ChampionsRoom_EventScript_228ABC:: @ 8228ABC +EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic:: @ 8228ABC playbgm MUS_GIRL_SUP, 0 return -EverGrandeCity_ChampionsRoom_EventScript_228AC1:: @ 8228AC1 +EverGrandeCity_ChampionsRoom_EventScript_PlayBrendanMusic:: @ 8228AC1 playbgm MUS_BOY_SUP, 0 return -EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6 - msgbox EverGrandeCity_ChampionsRoom_Text_2290CA, MSGBOX_DEFAULT +EverGrandeCity_ChampionsRoom_EventScript_MayAdvice:: @ 8228AC6 + msgbox EverGrandeCity_ChampionsRoom_Text_MayAdvice, MSGBOX_DEFAULT delay 40 playse SE_PIN applymovement 2, Common_Movement_ExclamationMark waitmovement 0 applymovement 2, Common_Movement_Delay48 waitmovement 0 - call EverGrandeCity_ChampionsRoom_EventScript_228C12 - msgbox EverGrandeCity_ChampionsRoom_Text_22910B, MSGBOX_DEFAULT - goto EverGrandeCity_ChampionsRoom_EventScript_228B30 + call EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth + msgbox EverGrandeCity_ChampionsRoom_Text_MayItsAlreadyOver, MSGBOX_DEFAULT + goto EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF end -EverGrandeCity_ChampionsRoom_EventScript_228AFB:: @ 8228AFB - msgbox EverGrandeCity_ChampionsRoom_Text_229152, MSGBOX_DEFAULT +EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice:: @ 8228AFB + msgbox EverGrandeCity_ChampionsRoom_Text_BrendanAdvice, MSGBOX_DEFAULT delay 40 playse SE_PIN applymovement 2, Common_Movement_ExclamationMark waitmovement 0 applymovement 2, Common_Movement_Delay48 waitmovement 0 - call EverGrandeCity_ChampionsRoom_EventScript_228C12 - msgbox EverGrandeCity_ChampionsRoom_Text_2291A2, MSGBOX_DEFAULT - goto EverGrandeCity_ChampionsRoom_EventScript_228B30 + call EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth + msgbox EverGrandeCity_ChampionsRoom_Text_BrendanYouveWon, MSGBOX_DEFAULT + goto EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF end -EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 +EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF:: @ 8228B30 closemessage addobject 3 - applymovement 3, EverGrandeCity_ChampionsRoom_Movement_228C43 + applymovement 3, EverGrandeCity_ChampionsRoom_Movement_BirchArrives waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT - call EverGrandeCity_ChampionsRoom_EventScript_272184 - msgbox EverGrandeCity_ChampionsRoom_Text_22934D, MSGBOX_DEFAULT - applymovement 1, Common_Movement_WalkInPlaceUp + msgbox EverGrandeCity_ChampionsRoom_Text_BirchArriveRatePokedex, MSGBOX_DEFAULT + call ProfBirch_EventScript_RatePokedex + msgbox EverGrandeCity_ChampionsRoom_Text_BirchCongratulations, MSGBOX_DEFAULT + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox EverGrandeCity_ChampionsRoom_Text_229399, MSGBOX_DEFAULT + msgbox EverGrandeCity_ChampionsRoom_Text_WallaceComeWithMe, MSGBOX_DEFAULT closemessage delay 30 - applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3B - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C1D - applymovement 3, Common_Movement_WalkInPlaceUp - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C38 + applymovement 1, EverGrandeCity_ChampionsRoom_Movement_WallaceExitStart + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart + applymovement 3, Common_Movement_WalkInPlaceFastestUp + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalFollows waitmovement 0 delay 20 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT + msgbox EverGrandeCity_ChampionsRoom_Text_WallaceWaitOutside, MSGBOX_DEFAULT checkplayergender compare VAR_RESULT, MALE - call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228BEB + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_MayCongratulations compare VAR_RESULT, FEMALE - call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228BF4 + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations closemessage - applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3F - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C20 + applymovement 1, EverGrandeCity_ChampionsRoom_Movement_WallaceExit + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExit waitmovement 0 setflag FLAG_HIDE_PETALBURG_GYM_GREETER warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 @@ -142,32 +142,32 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 releaseall end -EverGrandeCity_ChampionsRoom_EventScript_228BEB:: @ 8228BEB - msgbox EverGrandeCity_ChampionsRoom_Text_229479, MSGBOX_DEFAULT +EverGrandeCity_ChampionsRoom_EventScript_MayCongratulations:: @ 8228BEB + msgbox EverGrandeCity_ChampionsRoom_Text_MayCongratulations, MSGBOX_DEFAULT return -EverGrandeCity_ChampionsRoom_EventScript_228BF4:: @ 8228BF4 - msgbox EverGrandeCity_ChampionsRoom_Text_2294F5, MSGBOX_DEFAULT +EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations:: @ 8228BF4 + msgbox EverGrandeCity_ChampionsRoom_Text_BrendanCongratulations, MSGBOX_DEFAULT return -EverGrandeCity_ChampionsRoom_EventScript_228BFD:: @ 8228BFD - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C26 +EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer:: @ 8228BFD + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -EverGrandeCity_ChampionsRoom_EventScript_228C12:: @ 8228C12 - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C2F +EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth:: @ 8228C12 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalLookBackAndForth waitmovement 0 return -EverGrandeCity_ChampionsRoom_Movement_228C1D: @ 8228C1D +EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart: @ 8228C1D walk_up walk_up step_end -EverGrandeCity_ChampionsRoom_Movement_228C20: @ 8228C20 +EverGrandeCity_ChampionsRoom_Movement_PlayerExit: @ 8228C20 walk_up delay_16 walk_up @@ -175,7 +175,7 @@ EverGrandeCity_ChampionsRoom_Movement_228C20: @ 8228C20 set_invisible step_end -EverGrandeCity_ChampionsRoom_Movement_228C26: @ 8228C26 +EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer: @ 8228C26 walk_up walk_up walk_up @@ -186,7 +186,7 @@ EverGrandeCity_ChampionsRoom_Movement_228C26: @ 8228C26 walk_in_place_fastest_right step_end -EverGrandeCity_ChampionsRoom_Movement_228C2F: @ 8228C2F +EverGrandeCity_ChampionsRoom_Movement_RivalLookBackAndForth: @ 8228C2F walk_in_place_fastest_up delay_16 walk_in_place_fastest_right @@ -197,24 +197,24 @@ EverGrandeCity_ChampionsRoom_Movement_228C2F: @ 8228C2F delay_16 step_end -EverGrandeCity_ChampionsRoom_Movement_228C38: @ 8228C38 +EverGrandeCity_ChampionsRoom_Movement_RivalFollows: @ 8228C38 walk_right walk_up step_end -EverGrandeCity_ChampionsRoom_Movement_228C3B: @ 8228C3B +EverGrandeCity_ChampionsRoom_Movement_WallaceExitStart: @ 8228C3B walk_up walk_up walk_in_place_fastest_down step_end -EverGrandeCity_ChampionsRoom_Movement_228C3F: @ 8228C3F +EverGrandeCity_ChampionsRoom_Movement_WallaceExit: @ 8228C3F walk_up delay_8 set_invisible step_end -EverGrandeCity_ChampionsRoom_Movement_228C43: @ 8228C43 +EverGrandeCity_ChampionsRoom_Movement_BirchArrives: @ 8228C43 walk_up walk_up walk_up @@ -225,7 +225,7 @@ EverGrandeCity_ChampionsRoom_Movement_228C43: @ 8228C43 walk_in_place_fastest_left step_end -EverGrandeCity_ChampionsRoom_Text_228C4C: @ 8228C4C +EverGrandeCity_ChampionsRoom_Text_PreBattleSpeech: @ 8228C4C .string "WALLACE: Welcome, {PLAYER}{KUN}.\p" .string "That incident in SOOTOPOLIS CITY…\n" .string "That was superb work, putting an end\l" @@ -248,7 +248,7 @@ EverGrandeCity_ChampionsRoom_Text_228C4C: @ 8228C4C .string "their POKéMON in HOENN?\p" .string "Show me right here and now!$" -EverGrandeCity_ChampionsRoom_Text_228EAC: @ 8228EAC +EverGrandeCity_ChampionsRoom_Text_Defeat: @ 8228EAC .string "I, the CHAMPION, fall in defeat…\p" .string "That was wonderful work.\n" .string "You were elegant, infuriatingly so.\l" @@ -257,7 +257,7 @@ EverGrandeCity_ChampionsRoom_Text_228EAC: @ 8228EAC .string "You are a truly noble POKéMON\n" .string "TRAINER!$" -EverGrandeCity_ChampionsRoom_Text_228F66: @ 8228F66 +EverGrandeCity_ChampionsRoom_Text_PostBattleSpeech: @ 8228F66 .string "WALLACE: The POKéMON you sent into\n" .string "battle…\p" .string "At times they danced like a spring\n" @@ -272,29 +272,29 @@ EverGrandeCity_ChampionsRoom_Text_228F66: @ 8228F66 .string "I now proclaim you to be the new\n" .string "HOENN region…$" -EverGrandeCity_ChampionsRoom_Text_2290CA: @ 82290CA +EverGrandeCity_ChampionsRoom_Text_MayAdvice: @ 82290CA .string "MAY: {PLAYER}{KUN}!\p" .string "Here's some advice before you challenge\n" .string "the CHAMPION…$" -EverGrandeCity_ChampionsRoom_Text_22910B: @ 822910B +EverGrandeCity_ChampionsRoom_Text_MayItsAlreadyOver: @ 822910B .string "MAY: Huh?\n" .string "What, what, what?\p" .string "{PLAYER}{KUN}…\n" .string "Could it be that…\l" .string "It's already over?$" -EverGrandeCity_ChampionsRoom_Text_229152: @ 8229152 +EverGrandeCity_ChampionsRoom_Text_BrendanAdvice: @ 8229152 .string "BRENDAN: {PLAYER}!\p" .string "How would you like some advice before\n" .string "you challenge the CHAMPION?…$" -EverGrandeCity_ChampionsRoom_Text_2291A2: @ 82291A2 +EverGrandeCity_ChampionsRoom_Text_BrendanYouveWon: @ 82291A2 .string "BRENDAN: {PLAYER}…\p" .string "Are you trying to tell me…\n" .string "You've beaten the CHAMPION?$" -EverGrandeCity_ChampionsRoom_Text_2291E6: @ 82291E6 +EverGrandeCity_ChampionsRoom_Text_BirchArriveRatePokedex: @ 82291E6 .string "PROF. BIRCH: See?\n" .string "What did I tell you, {RIVAL}?\p" .string "Didn't I tell you that you don't need\n" @@ -310,25 +310,25 @@ EverGrandeCity_ChampionsRoom_Text_2291E6: @ 82291E6 .string "What became of your POKéDEX?\n" .string "Here, let me see.$" -EverGrandeCity_ChampionsRoom_Text_22934D: @ 822934D +EverGrandeCity_ChampionsRoom_Text_BirchCongratulations: @ 822934D .string "PROF. BIRCH: Anyways,\n" .string "congratulations!\p" .string "Now, go proudly into the final room!$" -EverGrandeCity_ChampionsRoom_Text_229399: @ 8229399 +EverGrandeCity_ChampionsRoom_Text_WallaceComeWithMe: @ 8229399 .string "WALLACE: {PLAYER}{KUN}…\p" .string "No, let me rephrase that properly.\p" .string "The new CHAMPION!\p" .string "Come with me.$" -EverGrandeCity_ChampionsRoom_Text_2293EB: @ 82293EB +EverGrandeCity_ChampionsRoom_Text_WallaceWaitOutside: @ 82293EB .string "WALLACE: I'm sorry, but…\p" .string "From here on, only those TRAINERS who\n" .string "have become CHAMPIONS may enter.\p" .string "You'll have to wait outside with\n" .string "PROF. BIRCH.$" -EverGrandeCity_ChampionsRoom_Text_229479: @ 8229479 +EverGrandeCity_ChampionsRoom_Text_MayCongratulations: @ 8229479 .string "MAY: Groan…\p" .string "… … … … … … … …\n" .string "… … … … … … … …\p" @@ -337,7 +337,7 @@ EverGrandeCity_ChampionsRoom_Text_229479: @ 8229479 .string "{PLAYER}{KUN}!\n" .string "Honestly, congratulations!$" -EverGrandeCity_ChampionsRoom_Text_2294F5: @ 82294F5 +EverGrandeCity_ChampionsRoom_Text_BrendanCongratulations: @ 82294F5 .string "BRENDAN: Whaaaat?! … … … … …\n" .string "… … … … … … … …\p" .string "It can't be helped if that's the rule.\p" diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json index 4fb0d16ef..5ff910790 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/map.json +++ b/data/maps/EverGrandeCity_DrakesRoom/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_DrakesRoom_EventScript_2286F3", + "script": "EverGrandeCity_DrakesRoom_EventScript_Drake", "flag": "0" } ], diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index bfc1b6027..e2623e28c 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -1,67 +1,68 @@ EverGrandeCity_DrakesRoom_MapScripts:: @ 822869C - map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_DrakesRoom_MapScript2_2286BB - map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_DrakesRoom_MapScript1_2286D2 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_DrakesRoom_MapScript2_227F3E + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_DrakesRoom_OnFrame + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_DrakesRoom_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_OnWarp .byte 0 -EverGrandeCity_DrakesRoom_MapScript2_2286AC: @ 82286AC - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_2286B6 +@ Unused, Drake uses Sidneys identical OnWarp for some reason +EverGrandeCity_DrakesRoom_OnWarp: @ 82286AC + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_PlayerTurnNorth .2byte 0 -EverGrandeCity_DrakesRoom_EventScript_2286B6:: @ 82286B6 +EverGrandeCity_DrakesRoom_EventScript_PlayerTurnNorth:: @ 82286B6 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -EverGrandeCity_DrakesRoom_MapScript2_2286BB: @ 82286BB - map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_2286C5 +EverGrandeCity_DrakesRoom_OnFrame: @ 82286BB + map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_WalkInCloseDoor .2byte 0 -EverGrandeCity_DrakesRoom_EventScript_2286C5:: @ 82286C5 +EverGrandeCity_DrakesRoom_EventScript_WalkInCloseDoor:: @ 82286C5 lockall - call EverGrandeCity_DrakesRoom_EventScript_272475 + call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor setvar VAR_ELITE_4_STATE, 4 releaseall end -EverGrandeCity_DrakesRoom_MapScript1_2286D2: @ 82286D2 - call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_2286E7 +EverGrandeCity_DrakesRoom_OnLoad: @ 82286D2 + call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_ResetAdvanceToNextRoom compare VAR_ELITE_4_STATE, 4 - call_if_eq EverGrandeCity_DrakesRoom_EventScript_2286ED + call_if_eq EverGrandeCity_DrakesRoom_EventScript_CloseDoor end -EverGrandeCity_DrakesRoom_EventScript_2286E7:: @ 82286E7 - call EverGrandeCity_DrakesRoom_EventScript_2724BC +EverGrandeCity_DrakesRoom_EventScript_ResetAdvanceToNextRoom:: @ 82286E7 + call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom return -EverGrandeCity_DrakesRoom_EventScript_2286ED:: @ 82286ED - call EverGrandeCity_DrakesRoom_EventScript_27255F +EverGrandeCity_DrakesRoom_EventScript_CloseDoor:: @ 82286ED + call PokemonLeague_EliteFour_EventScript_CloseDoor return -EverGrandeCity_DrakesRoom_EventScript_2286F3:: @ 82286F3 +EverGrandeCity_DrakesRoom_EventScript_Drake:: @ 82286F3 lock faceplayer - goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_22871A + goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_PostBattleSpeech playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_DrakesRoom_Text_22873E, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_228895 - goto EverGrandeCity_DrakesRoom_EventScript_228724 + msgbox EverGrandeCity_DrakesRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_Defeat + goto EverGrandeCity_DrakesRoom_EventScript_Defeated end -EverGrandeCity_DrakesRoom_EventScript_22871A:: @ 822871A - msgbox EverGrandeCity_DrakesRoom_Text_2288B0, MSGBOX_DEFAULT +EverGrandeCity_DrakesRoom_EventScript_PostBattleSpeech:: @ 822871A + msgbox EverGrandeCity_DrakesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end -EverGrandeCity_DrakesRoom_EventScript_228724:: @ 8228724 +EverGrandeCity_DrakesRoom_EventScript_Defeated:: @ 8228724 setvar VAR_0x8004, 0 special sub_813BF7C setflag FLAG_DEFEATED_ELITE_4_DRAKE - call EverGrandeCity_DrakesRoom_EventScript_2723F8 - msgbox EverGrandeCity_DrakesRoom_Text_2288B0, MSGBOX_DEFAULT + call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles + msgbox EverGrandeCity_DrakesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end -EverGrandeCity_DrakesRoom_Text_22873E: @ 822873E +EverGrandeCity_DrakesRoom_Text_PreBattleSpeech: @ 822873E .string "I am the last of the POKéMON LEAGUE\n" .string "ELITE FOUR, DRAKE the DRAGON master!\p" .string "In their natural state, POKéMON are\n" @@ -74,10 +75,10 @@ EverGrandeCity_DrakesRoom_Text_22873E: @ 822873E .string "If you don't, then you will never\n" .string "prevail over me!$" -EverGrandeCity_DrakesRoom_Text_228895: @ 8228895 +EverGrandeCity_DrakesRoom_Text_Defeat: @ 8228895 .string "Superb, it should be said.$" -EverGrandeCity_DrakesRoom_Text_2288B0: @ 82288B0 +EverGrandeCity_DrakesRoom_Text_PostBattleSpeech: @ 82288B0 .string "You deserve every credit for coming\n" .string "this far as a TRAINER of POKéMON.\p" .string "You do seem to know what is needed.\p" diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json index ea3116460..8d220202e 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.json +++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_GlaciasRoom_EventScript_228469", + "script": "EverGrandeCity_GlaciasRoom_EventScript_Glacia", "flag": "0" } ], diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 00e829930..6836b886d 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -1,65 +1,65 @@ EverGrandeCity_GlaciasRoom_MapScripts:: @ 8228412 - map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_228431 - map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_GlaciasRoom_MapScript1_228448 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_228422 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_GlaciasRoom_OnFrame + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_GlaciasRoom_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_GlaciasRoom_OnWarp .byte 0 -EverGrandeCity_GlaciasRoom_MapScript2_228422: @ 8228422 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_22842C +EverGrandeCity_GlaciasRoom_OnWarp: @ 8228422 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_PlayerTurnNorth .2byte 0 -EverGrandeCity_GlaciasRoom_EventScript_22842C:: @ 822842C +EverGrandeCity_GlaciasRoom_EventScript_PlayerTurnNorth:: @ 822842C turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -EverGrandeCity_GlaciasRoom_MapScript2_228431: @ 8228431 - map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_22843B +EverGrandeCity_GlaciasRoom_OnFrame: @ 8228431 + map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_WalkInCloseDoor .2byte 0 -EverGrandeCity_GlaciasRoom_EventScript_22843B:: @ 822843B +EverGrandeCity_GlaciasRoom_EventScript_WalkInCloseDoor:: @ 822843B lockall - call EverGrandeCity_GlaciasRoom_EventScript_272475 + call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor setvar VAR_ELITE_4_STATE, 3 releaseall end -EverGrandeCity_GlaciasRoom_MapScript1_228448: @ 8228448 - call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_22845D +EverGrandeCity_GlaciasRoom_OnLoad: @ 8228448 + call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_ResetAdvanceToNextRoom compare VAR_ELITE_4_STATE, 3 - call_if_eq EverGrandeCity_GlaciasRoom_EventScript_228463 + call_if_eq EverGrandeCity_GlaciasRoom_EventScript_CloseDoor end -EverGrandeCity_GlaciasRoom_EventScript_22845D:: @ 822845D - call EverGrandeCity_GlaciasRoom_EventScript_2724BC +EverGrandeCity_GlaciasRoom_EventScript_ResetAdvanceToNextRoom:: @ 822845D + call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom return -EverGrandeCity_GlaciasRoom_EventScript_228463:: @ 8228463 - call EverGrandeCity_GlaciasRoom_EventScript_27255F +EverGrandeCity_GlaciasRoom_EventScript_CloseDoor:: @ 8228463 + call PokemonLeague_EliteFour_EventScript_CloseDoor return -EverGrandeCity_GlaciasRoom_EventScript_228469:: @ 8228469 +EverGrandeCity_GlaciasRoom_EventScript_Glacia:: @ 8228469 lock faceplayer - goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_228490 + goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_PostBattleSpeech playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_GlaciasRoom_Text_2284AC, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_2285B4 - goto EverGrandeCity_GlaciasRoom_EventScript_22849A + msgbox EverGrandeCity_GlaciasRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_Defeat + goto EverGrandeCity_GlaciasRoom_EventScript_Defeated end -EverGrandeCity_GlaciasRoom_EventScript_228490:: @ 8228490 - msgbox EverGrandeCity_GlaciasRoom_Text_228640, MSGBOX_DEFAULT +EverGrandeCity_GlaciasRoom_EventScript_PostBattleSpeech:: @ 8228490 + msgbox EverGrandeCity_GlaciasRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end -EverGrandeCity_GlaciasRoom_EventScript_22849A:: @ 822849A +EverGrandeCity_GlaciasRoom_EventScript_Defeated:: @ 822849A setflag FLAG_DEFEATED_ELITE_4_GLACIA - call EverGrandeCity_GlaciasRoom_EventScript_2723F8 - msgbox EverGrandeCity_GlaciasRoom_Text_228640, MSGBOX_DEFAULT + call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles + msgbox EverGrandeCity_GlaciasRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end -EverGrandeCity_GlaciasRoom_Text_2284AC: @ 82284AC +EverGrandeCity_GlaciasRoom_Text_PreBattleSpeech: @ 82284AC .string "Welcome, my name is GLACIA\n" .string "of the ELITE FOUR.\p" .string "I've traveled from afar to HOENN\n" @@ -70,14 +70,14 @@ EverGrandeCity_GlaciasRoom_Text_2284AC: @ 82284AC .string "It would please me to no end if I could\n" .string "go all out against you!$" -EverGrandeCity_GlaciasRoom_Text_2285B4: @ 82285B4 +EverGrandeCity_GlaciasRoom_Text_Defeat: @ 82285B4 .string "You and your POKéMON…\n" .string "How hot your spirits burn!\p" .string "The all-consuming heat overwhelms.\p" .string "It's no surprise that my icy skills\n" .string "failed to harm you.$" -EverGrandeCity_GlaciasRoom_Text_228640: @ 8228640 +EverGrandeCity_GlaciasRoom_Text_PostBattleSpeech: @ 8228640 .string "Advance to the next room.\p" .string "And there, confirm the truly fearsome\n" .string "side of the POKéMON LEAGUE.$" diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index ebfcb3311..638e18eb5 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -20,8 +20,8 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 applymovement 1, EverGrandeCity_HallOfFame_Movement_229901 applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229901 waitmovement 0 - applymovement 1, Common_Movement_WalkInPlaceRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceFastestRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_22990E, MSGBOX_DEFAULT closemessage @@ -29,13 +29,13 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229908 waitmovement 0 delay 20 - applymovement 1, Common_Movement_WalkInPlaceRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceFastestRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT closemessage - applymovement 1, Common_Movement_WalkInPlaceUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 dofieldeffect FLDEFF_HALL_OF_FAME_RECORD diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json index a0072fd08..73ee3357d 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.json +++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PhoebesRoom_EventScript_2281CB", + "script": "EverGrandeCity_PhoebesRoom_EventScript_Phoebe", "flag": "0" } ], diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index b5a3a9999..4843359c0 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -1,65 +1,65 @@ EverGrandeCity_PhoebesRoom_MapScripts:: @ 8228174 - map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PhoebesRoom_MapScript1_2281AA - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_228184 - map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_228193 + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PhoebesRoom_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PhoebesRoom_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PhoebesRoom_OnFrame .byte 0 -EverGrandeCity_PhoebesRoom_MapScript2_228184: @ 8228184 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_22818E +EverGrandeCity_PhoebesRoom_OnWarp: @ 8228184 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_PlayerTurnNorth .2byte 0 -EverGrandeCity_PhoebesRoom_EventScript_22818E:: @ 822818E +EverGrandeCity_PhoebesRoom_EventScript_PlayerTurnNorth:: @ 822818E turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -EverGrandeCity_PhoebesRoom_MapScript2_228193: @ 8228193 - map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_22819D +EverGrandeCity_PhoebesRoom_OnFrame: @ 8228193 + map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_WalkInCloseDoor .2byte 0 -EverGrandeCity_PhoebesRoom_EventScript_22819D:: @ 822819D +EverGrandeCity_PhoebesRoom_EventScript_WalkInCloseDoor:: @ 822819D lockall - call EverGrandeCity_PhoebesRoom_EventScript_272475 + call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor setvar VAR_ELITE_4_STATE, 2 releaseall end -EverGrandeCity_PhoebesRoom_MapScript1_2281AA: @ 82281AA - call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_2281BF +EverGrandeCity_PhoebesRoom_OnLoad: @ 82281AA + call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_ResetAdvanceToNextRoom compare VAR_ELITE_4_STATE, 2 - call_if_eq EverGrandeCity_PhoebesRoom_EventScript_2281C5 + call_if_eq EverGrandeCity_PhoebesRoom_EventScript_CloseDoor end -EverGrandeCity_PhoebesRoom_EventScript_2281BF:: @ 82281BF - call EverGrandeCity_PhoebesRoom_EventScript_2724BC +EverGrandeCity_PhoebesRoom_EventScript_ResetAdvanceToNextRoom:: @ 82281BF + call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom return -EverGrandeCity_PhoebesRoom_EventScript_2281C5:: @ 82281C5 - call EverGrandeCity_PhoebesRoom_EventScript_27255F +EverGrandeCity_PhoebesRoom_EventScript_CloseDoor:: @ 82281C5 + call PokemonLeague_EliteFour_EventScript_CloseDoor return -EverGrandeCity_PhoebesRoom_EventScript_2281CB:: @ 82281CB +EverGrandeCity_PhoebesRoom_EventScript_Phoebe:: @ 82281CB lock faceplayer - goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_2281F2 + goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_PostBattleSpeech playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_PhoebesRoom_Text_22820E, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_228325 - goto EverGrandeCity_PhoebesRoom_EventScript_2281FC + msgbox EverGrandeCity_PhoebesRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_Defeat + goto EverGrandeCity_PhoebesRoom_EventScript_Defeated end -EverGrandeCity_PhoebesRoom_EventScript_2281F2:: @ 82281F2 - msgbox EverGrandeCity_PhoebesRoom_Text_228343, MSGBOX_DEFAULT +EverGrandeCity_PhoebesRoom_EventScript_PostBattleSpeech:: @ 82281F2 + msgbox EverGrandeCity_PhoebesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end -EverGrandeCity_PhoebesRoom_EventScript_2281FC:: @ 82281FC +EverGrandeCity_PhoebesRoom_EventScript_Defeated:: @ 82281FC setflag FLAG_DEFEATED_ELITE_4_PHOEBE - call EverGrandeCity_PhoebesRoom_EventScript_2723F8 - msgbox EverGrandeCity_PhoebesRoom_Text_228343, MSGBOX_DEFAULT + call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles + msgbox EverGrandeCity_PhoebesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end -EverGrandeCity_PhoebesRoom_Text_22820E: @ 822820E +EverGrandeCity_PhoebesRoom_Text_PreBattleSpeech: @ 822820E .string "Ahahaha!\p" .string "I'm PHOEBE of the ELITE FOUR.\n" .string "I did my training on MT. PYRE.\p" @@ -70,11 +70,11 @@ EverGrandeCity_PhoebesRoom_Text_22820E: @ 822820E .string "So, come on, just try and see if you can\n" .string "even inflict damage on my POKéMON!$" -EverGrandeCity_PhoebesRoom_Text_228325: @ 8228325 +EverGrandeCity_PhoebesRoom_Text_Defeat: @ 8228325 .string "Oh, darn.\n" .string "I've gone and lost.$" -EverGrandeCity_PhoebesRoom_Text_228343: @ 8228343 +EverGrandeCity_PhoebesRoom_Text_PostBattleSpeech: @ 8228343 .string "There's a definite bond between you\n" .string "and your POKéMON, too.\p" .string "I didn't recognize it, so it's only\n" diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 0b292530e..2d1f1de37 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34 map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 EverGrandeCity_PokemonCenter_1F_OnTransition: @ 8229A3F @@ -15,7 +15,7 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C EverGrandeCity_PokemonCenter_1F_EventScript_229A59:: @ 8229A59 setvar VAR_0x800B, 1 - call EverGrandeCity_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release @@ -34,11 +34,11 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79 faceplayer msgbox EverGrandeCity_PokemonCenter_1F_Text_229BF1, MSGBOX_DEFAULT closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AB6 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 addvar VAR_SCOTT_STATE, 1 setflag FLAG_MET_SCOTT_IN_EVERGRANDE diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json index f1dcd3868..b99590829 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc index 690032b8a..f52419d60 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc @@ -1,20 +1,21 @@ EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0 - map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -EverGrandeCity_PokemonCenter_2F_EventScript_229CF5:: @ 8229CF5 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +EverGrandeCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8229CF5 + call CableClub_EventScript_Colosseum end -EverGrandeCity_PokemonCenter_2F_EventScript_229CFB:: @ 8229CFB - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +EverGrandeCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8229CFB + call CableClub_EventScript_TradeCenter end -EverGrandeCity_PokemonCenter_2F_EventScript_229D01:: @ 8229D01 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +EverGrandeCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8229D01 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index f688918ea..4b695d9d9 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -1,6 +1,6 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2 map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 EverGrandeCity_PokemonLeague_1F_OnTransition: @ 82295DD @@ -16,7 +16,7 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2295ED:: @ 82295ED EverGrandeCity_PokemonLeague_1F_EventScript_2295FC:: @ 82295FC setvar VAR_0x800B, 1 - call EverGrandeCity_PokemonLeague_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release @@ -25,10 +25,10 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2295FC:: @ 82295FC EverGrandeCity_PokemonLeague_1F_EventScript_22960A:: @ 822960A lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart EverGrandeCity_PokemonLeague_1F_Pokemart_229624 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json index 0d0bb68a1..a016be34b 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonLeague_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonLeague_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonLeague_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PokemonLeague_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc index 2a2652938..b860f95b8 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc @@ -1,19 +1,20 @@ EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07 - map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -EverGrandeCity_PokemonLeague_2F_EventScript_229D1C:: @ 8229D1C - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +EverGrandeCity_PokemonLeague_2F_EventScript_Colosseum:: @ 8229D1C + call CableClub_EventScript_Colosseum end -EverGrandeCity_PokemonLeague_2F_EventScript_229D22:: @ 8229D22 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +EverGrandeCity_PokemonLeague_2F_EventScript_TradeCenter:: @ 8229D22 + call CableClub_EventScript_TradeCenter end -EverGrandeCity_PokemonLeague_2F_EventScript_229D28:: @ 8229D28 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +EverGrandeCity_PokemonLeague_2F_EventScript_RecordCorner:: @ 8229D28 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json index 87545b597..0aa57a944 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/map.json +++ b/data/maps/EverGrandeCity_SidneysRoom/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_SidneysRoom_EventScript_227F64", + "script": "EverGrandeCity_SidneysRoom_EventScript_Sidney", "flag": "0" } ], diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 432747fda..74cd384fb 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -1,8 +1,8 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01 - map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_MapScript1_227F1D - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F3E + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_OnWarp map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_SidneysRoom_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F4D + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_OnFrame .byte 0 EverGrandeCity_SidneysRoom_OnTransition: @ 8227F16 @@ -10,63 +10,62 @@ EverGrandeCity_SidneysRoom_OnTransition: @ 8227F16 setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT end -EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D - call_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_227F32 +EverGrandeCity_SidneysRoom_OnLoad: @ 8227F1D + call_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_ResetAdvanceToNextRoom compare VAR_ELITE_4_STATE, 1 - call_if_eq EverGrandeCity_SidneysRoom_EventScript_227F38 + call_if_eq EverGrandeCity_SidneysRoom_EventScript_CloseDoor end -EverGrandeCity_SidneysRoom_EventScript_227F32:: @ 8227F32 - call EverGrandeCity_SidneysRoom_EventScript_2724BC +EverGrandeCity_SidneysRoom_EventScript_ResetAdvanceToNextRoom:: @ 8227F32 + call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom return -EverGrandeCity_SidneysRoom_EventScript_227F38:: @ 8227F38 - call EverGrandeCity_SidneysRoom_EventScript_27255F +EverGrandeCity_SidneysRoom_EventScript_CloseDoor:: @ 8227F38 + call PokemonLeague_EliteFour_EventScript_CloseDoor return -EverGrandeCity_DrakesRoom_MapScript2_227F3E: @ 8227F3E -EverGrandeCity_SidneysRoom_MapScript2_227F3E: @ 8227F3E - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_227F48 +EverGrandeCity_SidneysRoom_OnWarp: @ 8227F3E + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_PlayerTurnNorth .2byte 0 -EverGrandeCity_SidneysRoom_EventScript_227F48:: @ 8227F48 +EverGrandeCity_SidneysRoom_EventScript_PlayerTurnNorth:: @ 8227F48 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -EverGrandeCity_SidneysRoom_MapScript2_227F4D: @ 8227F4D - map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_227F57 +EverGrandeCity_SidneysRoom_OnFrame: @ 8227F4D + map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_WalkInCloseDoor .2byte 0 -EverGrandeCity_SidneysRoom_EventScript_227F57:: @ 8227F57 +EverGrandeCity_SidneysRoom_EventScript_WalkInCloseDoor:: @ 8227F57 lockall - call EverGrandeCity_SidneysRoom_EventScript_272475 + call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor setvar VAR_ELITE_4_STATE, 1 releaseall end -EverGrandeCity_SidneysRoom_EventScript_227F64:: @ 8227F64 +EverGrandeCity_SidneysRoom_EventScript_Sidney:: @ 8227F64 lock faceplayer - goto_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_227F8B + goto_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_PostBattleSpeech playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_SidneysRoom_Text_227FA7, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_2280A2 - goto EverGrandeCity_SidneysRoom_EventScript_227F95 + msgbox EverGrandeCity_SidneysRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_Defeat + goto EverGrandeCity_SidneysRoom_EventScript_Defeated end -EverGrandeCity_SidneysRoom_EventScript_227F8B:: @ 8227F8B - msgbox EverGrandeCity_SidneysRoom_Text_2280EC, MSGBOX_DEFAULT +EverGrandeCity_SidneysRoom_EventScript_PostBattleSpeech:: @ 8227F8B + msgbox EverGrandeCity_SidneysRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end -EverGrandeCity_SidneysRoom_EventScript_227F95:: @ 8227F95 +EverGrandeCity_SidneysRoom_EventScript_Defeated:: @ 8227F95 setflag FLAG_DEFEATED_ELITE_4_SIDNEY - call EverGrandeCity_SidneysRoom_EventScript_2723F8 - msgbox EverGrandeCity_SidneysRoom_Text_2280EC, MSGBOX_DEFAULT + call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles + msgbox EverGrandeCity_SidneysRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end -EverGrandeCity_SidneysRoom_Text_227FA7: @ 8227FA7 +EverGrandeCity_SidneysRoom_Text_PreBattleSpeech: @ 8227FA7 .string "Welcome, challenger!\n" .string "I'm SIDNEY of the ELITE FOUR.\p" .string "I like that look you're giving me.\n" @@ -76,11 +75,11 @@ EverGrandeCity_SidneysRoom_Text_227FA7: @ 8227FA7 .string "a battle that can only be staged\l" .string "here in the POKéMON LEAGUE!$" -EverGrandeCity_SidneysRoom_Text_2280A2: @ 82280A2 +EverGrandeCity_SidneysRoom_Text_Defeat: @ 82280A2 .string "Well, how do you like that? I lost!\n" .string "Eh, it was fun, so it doesn't matter.$" -EverGrandeCity_SidneysRoom_Text_2280EC: @ 82280EC +EverGrandeCity_SidneysRoom_Text_PostBattleSpeech: @ 82280EC .string "Well, listen to what this loser has\n" .string "to say.\p" .string "You've got what it takes to go far.\n" diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 863319184..9f4acc988 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -104,14 +104,14 @@ "x": 6, "y": 17, "elevation": 0, - "dest_map": "MAP_FALLARBOR_TOWN_HOUSE1", + "dest_map": "MAP_FALLARBOR_TOWN_COZMOS_HOUSE", "dest_warp_id": 0 }, { "x": 1, "y": 6, "elevation": 0, - "dest_map": "MAP_FALLARBOR_TOWN_HOUSE2", + "dest_map": "MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE", "dest_warp_id": 0 } ], diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index b63846abd..1f8989955 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -129,9 +129,9 @@ FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A FallarborTown_BattleTentBattleRoom_EventScript_200A78:: @ 8200A78 msgbox FallarborTown_BattleTentBattleRoom_Text_257E6B, MSGBOX_YESNO switch VAR_RESULT - case 0, FallarborTown_BattleTentBattleRoom_EventScript_200A2A - case 1, FallarborTown_BattleTentBattleRoom_EventScript_200B51 - case 127, FallarborTown_BattleTentBattleRoom_EventScript_200A2A + case NO, FallarborTown_BattleTentBattleRoom_EventScript_200A2A + case YES, FallarborTown_BattleTentBattleRoom_EventScript_200B51 + case MULTI_B_PRESSED, FallarborTown_BattleTentBattleRoom_EventScript_200A2A FallarborTown_BattleTentBattleRoom_EventScript_200AA6:: @ 8200AA6 message FallarborTown_BattleTentBattleRoom_Text_257E9E diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index 3f6eec374..5823f0611 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -169,9 +169,9 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D goto_if_eq FallarborTown_BattleTentLobby_EventScript_2001C2 msgbox FallarborTown_BattleTentLobby_Text_2C4B35, MSGBOX_YESNO switch VAR_RESULT - case 0, FallarborTown_BattleTentLobby_EventScript_2001C2 - case 1, FallarborTown_BattleTentLobby_EventScript_2000E2 - case 127, FallarborTown_BattleTentLobby_EventScript_2001C2 + case NO, FallarborTown_BattleTentLobby_EventScript_2001C2 + case YES, FallarborTown_BattleTentLobby_EventScript_2000E2 + case MULTI_B_PRESSED, FallarborTown_BattleTentLobby_EventScript_2001C2 FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2 setvar VAR_TEMP_0, 0 diff --git a/data/maps/FallarborTown_House1/map.json b/data/maps/FallarborTown_CozmosHouse/map.json index e5e75c631..a31c1c5bf 100644 --- a/data/maps/FallarborTown_House1/map.json +++ b/data/maps/FallarborTown_CozmosHouse/map.json @@ -1,6 +1,6 @@ { - "id": "MAP_FALLARBOR_TOWN_HOUSE1", - "name": "FallarborTown_House1", + "id": "MAP_FALLARBOR_TOWN_COZMOS_HOUSE", + "name": "FallarborTown_CozmosHouse", "layout": "LAYOUT_HOUSE1", "music": "MUS_TONEKUSA", "region_map_section": "MAPSEC_FALLARBOR_TOWN", @@ -24,8 +24,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_House1_EventScript_200F13", - "flag": "FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO" + "script": "FallarborTown_CozmosHouse_EventScript_ProfCozmo", + "flag": "FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO" }, { "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_House1_EventScript_200FBC", + "script": "FallarborTown_CozmosHouse_EventScript_CozmosWife", "flag": "0" } ], diff --git a/data/maps/FallarborTown_CozmosHouse/scripts.inc b/data/maps/FallarborTown_CozmosHouse/scripts.inc new file mode 100644 index 000000000..224147bc5 --- /dev/null +++ b/data/maps/FallarborTown_CozmosHouse/scripts.inc @@ -0,0 +1,121 @@ +FallarborTown_CozmosHouse_MapScripts:: @ 8200F12 + .byte 0 + +FallarborTown_CozmosHouse_EventScript_ProfCozmo:: @ 8200F13 + lock + faceplayer + goto_if_set FLAG_RECEIVED_TM27, FallarborTown_CozmosHouse_EventScript_GaveMeteorite + checkitem ITEM_METEORITE, 1 + compare VAR_RESULT, TRUE + goto_if_eq FallarborTown_CozmosHouse_EventScript_PlayerHasMeteorite + msgbox FallarborTown_CozmosHouse_Text_MeteoriteWillNeverBeMineNow, MSGBOX_DEFAULT + release + end + +FallarborTown_CozmosHouse_EventScript_PlayerHasMeteorite:: @ 8200F38 + call_if_unset FLAG_TEMP_2, FallarborTown_CozmosHouse_EventScript_NoticeMeteorite + call_if_set FLAG_TEMP_2, FallarborTown_CozmosHouse_EventScript_AskForMeteorite + compare VAR_RESULT, NO + goto_if_eq FallarborTown_CozmosHouse_EventScript_DeclineGiveMeteorite + msgbox FallarborTown_CozmosHouse_Text_PleaseUseThisTM, MSGBOX_DEFAULT + giveitem_std ITEM_TM27 + compare VAR_RESULT, FALSE + goto_if_eq Common_EventScript_ShowBagIsFull + setvar VAR_0x8004, ITEM_METEORITE + call Common_EventScript_PlayerHandedOverTheItem + setflag FLAG_RECEIVED_TM27 + msgbox FallarborTown_CozmosHouse_Text_ReallyGoingToHelpMyResearch, MSGBOX_DEFAULT + release + end + +FallarborTown_CozmosHouse_EventScript_NoticeMeteorite:: @ 8200F8B + msgbox FallarborTown_CozmosHouse_Text_MeteoriteWillNeverBeMineNow, MSGBOX_DEFAULT + msgbox FallarborTown_CozmosHouse_Text_IsThatMeteoriteMayIHaveIt, MSGBOX_YESNO + return + +FallarborTown_CozmosHouse_EventScript_AskForMeteorite:: @ 8200F9C + msgbox FallarborTown_CozmosHouse_Text_MayIHaveMeteorite, MSGBOX_YESNO + return + +FallarborTown_CozmosHouse_EventScript_DeclineGiveMeteorite:: @ 8200FA5 + setflag FLAG_TEMP_2 + msgbox FallarborTown_CozmosHouse_Text_CrushedWithDisappointment, MSGBOX_DEFAULT + release + end + +FallarborTown_CozmosHouse_EventScript_GaveMeteorite:: @ 8200FB2 + msgbox FallarborTown_CozmosHouse_Text_ReallyGoingToHelpMyResearch, MSGBOX_DEFAULT + release + end + +FallarborTown_CozmosHouse_EventScript_CozmosWife:: @ 8200FBC + lock + faceplayer + goto_if_set FLAG_RECEIVED_TM27, FallarborTown_CozmosHouse_EventScript_CozmoIsHappy + goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_CozmosHouse_EventScript_CozmoIsSad + msgbox FallarborTown_CozmosHouse_Text_CozmoWentToMeteorFalls, MSGBOX_DEFAULT + release + end + +FallarborTown_CozmosHouse_EventScript_CozmoIsSad:: @ 8200FDA + msgbox FallarborTown_CozmosHouse_Text_FeelSorryForCozmo, MSGBOX_DEFAULT + release + end + +FallarborTown_CozmosHouse_EventScript_CozmoIsHappy:: @ 8200FE4 + msgbox FallarborTown_CozmosHouse_Text_CozmoIsSoHappy, MSGBOX_DEFAULT + release + end + +FallarborTown_CozmosHouse_Text_MeteoriteWillNeverBeMineNow: @ 8200FEE + .string "PROF. COZMO: Oh…\n" + .string "I never should have let myself be\l" + .string "conned into telling TEAM MAGMA where\l" + .string "you can find METEORITES…\p" + .string "That METEORITE from METEOR FALLS…\n" + .string "It's never going to be mine now…$" + +FallarborTown_CozmosHouse_Text_IsThatMeteoriteMayIHaveIt: @ 82010A2 + .string "Oh!\n" + .string "Hah?\p" + .string "That item…\p" + .string "Could it be?\p" + .string "Is it the METEORITE that TEAM MAGMA\n" + .string "took from METEOR FALLS?\p" + .string "Please, may I have it?\p" + .string "I'm not asking for it for free.\n" + .string "How about in exchange for this TM?$" + +FallarborTown_CozmosHouse_Text_PleaseUseThisTM: @ 8201159 + .string "PROF. COZMO: This TM, it represents\n" + .string "my feeling of gratitude.\l" + .string "Please use it!$" + +FallarborTown_CozmosHouse_Text_ReallyGoingToHelpMyResearch: @ 82011A5 + .string "PROF. COZMO: Oh, I can't believe it.\n" + .string "This is really, really great!\p" + .string "This is really going to help my research!$" + +FallarborTown_CozmosHouse_Text_CrushedWithDisappointment: @ 8201212 + .string "PROF. COZMO: Oh, but…\n" + .string "I'm crushed with disappointment…$" + +FallarborTown_CozmosHouse_Text_MayIHaveMeteorite: @ 8201249 + .string "PROF. COZMO: Please, may I have that\n" + .string "METEORITE?\p" + .string "I'm not asking for it for free.\n" + .string "How about in exchange for this TM?$" + +FallarborTown_CozmosHouse_Text_CozmoWentToMeteorFalls: @ 82012BC + .string "PROF. COZMO went off to METEOR FALLS\n" + .string "on ROUTE 114 with some people from\l" + .string "TEAM MAGMA.$" + +FallarborTown_CozmosHouse_Text_FeelSorryForCozmo: @ 8201310 + .string "Poor PROF. COZMO…\n" + .string "He's so depressed… I feel sorry for him.$" + +FallarborTown_CozmosHouse_Text_CozmoIsSoHappy: @ 820134B + .string "Look at PROF. COZMO…\n" + .string "He's so happy! I think it's cute.$" + diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc deleted file mode 100644 index 2255f90d3..000000000 --- a/data/maps/FallarborTown_House1/scripts.inc +++ /dev/null @@ -1,121 +0,0 @@ -FallarborTown_House1_MapScripts:: @ 8200F12 - .byte 0 - -FallarborTown_House1_EventScript_200F13:: @ 8200F13 - lock - faceplayer - goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_200FB2 - checkitem ITEM_METEORITE, 1 - compare VAR_RESULT, 1 - goto_if_eq FallarborTown_House1_EventScript_200F38 - msgbox FallarborTown_House1_Text_200FEE, MSGBOX_DEFAULT - release - end - -FallarborTown_House1_EventScript_200F38:: @ 8200F38 - call_if_unset FLAG_TEMP_2, FallarborTown_House1_EventScript_200F8B - call_if_set FLAG_TEMP_2, FallarborTown_House1_EventScript_200F9C - compare VAR_RESULT, 0 - goto_if_eq FallarborTown_House1_EventScript_200FA5 - msgbox FallarborTown_House1_Text_201159, MSGBOX_DEFAULT - giveitem_std ITEM_TM27 - compare VAR_RESULT, 0 - goto_if_eq Common_EventScript_ShowBagIsFull - setvar VAR_0x8004, 280 - call FallarborTown_House1_EventScript_2723E4 - setflag FLAG_RECEIVED_TM27 - msgbox FallarborTown_House1_Text_2011A5, MSGBOX_DEFAULT - release - end - -FallarborTown_House1_EventScript_200F8B:: @ 8200F8B - msgbox FallarborTown_House1_Text_200FEE, MSGBOX_DEFAULT - msgbox FallarborTown_House1_Text_2010A2, MSGBOX_YESNO - return - -FallarborTown_House1_EventScript_200F9C:: @ 8200F9C - msgbox FallarborTown_House1_Text_201249, MSGBOX_YESNO - return - -FallarborTown_House1_EventScript_200FA5:: @ 8200FA5 - setflag FLAG_TEMP_2 - msgbox FallarborTown_House1_Text_201212, MSGBOX_DEFAULT - release - end - -FallarborTown_House1_EventScript_200FB2:: @ 8200FB2 - msgbox FallarborTown_House1_Text_2011A5, MSGBOX_DEFAULT - release - end - -FallarborTown_House1_EventScript_200FBC:: @ 8200FBC - lock - faceplayer - goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_200FE4 - goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_House1_EventScript_200FDA - msgbox FallarborTown_House1_Text_2012BC, MSGBOX_DEFAULT - release - end - -FallarborTown_House1_EventScript_200FDA:: @ 8200FDA - msgbox FallarborTown_House1_Text_201310, MSGBOX_DEFAULT - release - end - -FallarborTown_House1_EventScript_200FE4:: @ 8200FE4 - msgbox FallarborTown_House1_Text_20134B, MSGBOX_DEFAULT - release - end - -FallarborTown_House1_Text_200FEE: @ 8200FEE - .string "PROF. COZMO: Oh…\n" - .string "I never should have let myself be\l" - .string "conned into telling TEAM MAGMA where\l" - .string "you can find METEORITES…\p" - .string "That METEORITE from METEOR FALLS…\n" - .string "It's never going to be mine now…$" - -FallarborTown_House1_Text_2010A2: @ 82010A2 - .string "Oh!\n" - .string "Hah?\p" - .string "That item…\p" - .string "Could it be?\p" - .string "Is it the METEORITE that TEAM MAGMA\n" - .string "took from METEOR FALLS?\p" - .string "Please, may I have it?\p" - .string "I'm not asking for it for free.\n" - .string "How about in exchange for this TM?$" - -FallarborTown_House1_Text_201159: @ 8201159 - .string "PROF. COZMO: This TM, it represents\n" - .string "my feeling of gratitude.\l" - .string "Please use it!$" - -FallarborTown_House1_Text_2011A5: @ 82011A5 - .string "PROF. COZMO: Oh, I can't believe it.\n" - .string "This is really, really great!\p" - .string "This is really going to help my research!$" - -FallarborTown_House1_Text_201212: @ 8201212 - .string "PROF. COZMO: Oh, but…\n" - .string "I'm crushed with disappointment…$" - -FallarborTown_House1_Text_201249: @ 8201249 - .string "PROF. COZMO: Please, may I have that\n" - .string "METEORITE?\p" - .string "I'm not asking for it for free.\n" - .string "How about in exchange for this TM?$" - -FallarborTown_House1_Text_2012BC: @ 82012BC - .string "PROF. COZMO went off to METEOR FALLS\n" - .string "on ROUTE 114 with some people from\l" - .string "TEAM MAGMA.$" - -FallarborTown_House1_Text_201310: @ 8201310 - .string "Poor PROF. COZMO…\n" - .string "He's so depressed… I feel sorry for him.$" - -FallarborTown_House1_Text_20134B: @ 820134B - .string "Look at PROF. COZMO…\n" - .string "He's so happy! I think it's cute.$" - diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc deleted file mode 100644 index d0305ad4b..000000000 --- a/data/maps/FallarborTown_House2/scripts.inc +++ /dev/null @@ -1,102 +0,0 @@ -FallarborTown_House2_MapScripts:: @ 8201382 - .byte 0 - -FallarborTown_House2_EventScript_201383:: @ 8201383 - lockall - applymovement 1, Common_Movement_FacePlayer - waitmovement 0 - goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_2013A8 - msgbox FallarborTown_House2_Text_20145C, MSGBOX_DEFAULT - setflag FLAG_TEMP_1 - goto FallarborTown_House2_EventScript_2013A8 - end - -FallarborTown_House2_EventScript_2013A8:: @ 82013A8 - checkitem ITEM_HEART_SCALE, 1 - compare VAR_RESULT, 0 - goto_if_eq FallarborTown_House2_EventScript_201452 - msgbox FallarborTown_House2_Text_201541, MSGBOX_YESNO - switch VAR_RESULT - case 0, FallarborTown_House2_EventScript_201452 - goto FallarborTown_House2_EventScript_2013D6 - end - -FallarborTown_House2_EventScript_2013D6:: @ 82013D6 - msgbox FallarborTown_House2_Text_2015A5, MSGBOX_DEFAULT - special sub_81B951C - waitstate - compare VAR_0x8004, 255 - goto_if_eq FallarborTown_House2_EventScript_201452 - special sub_81B98DC - compare VAR_RESULT, 1 - goto_if_eq FallarborTown_House2_EventScript_201444 - compare VAR_0x8005, 0 - goto_if_eq FallarborTown_House2_EventScript_201436 - goto FallarborTown_House2_EventScript_20140C - end - -FallarborTown_House2_EventScript_20140C:: @ 820140C - msgbox FallarborTown_House2_Text_2015C3, MSGBOX_DEFAULT - special TeachMoveRelearnerMove - waitstate - compare VAR_0x8004, 0 - goto_if_eq FallarborTown_House2_EventScript_2013D6 - msgbox FallarborTown_House2_Text_201627, MSGBOX_DEFAULT - takeitem ITEM_HEART_SCALE, 1 - goto FallarborTown_House2_EventScript_201452 - end - -FallarborTown_House2_EventScript_201436:: @ 8201436 - msgbox FallarborTown_House2_Text_2015DE, MSGBOX_DEFAULT - goto FallarborTown_House2_EventScript_2013D6 - end - -FallarborTown_House2_EventScript_201444:: @ 8201444 - msgbox FallarborTown_House2_Text_201697, MSGBOX_DEFAULT - goto FallarborTown_House2_EventScript_2013D6 - end - -FallarborTown_House2_EventScript_201452:: @ 8201452 - msgbox FallarborTown_House2_Text_201653, MSGBOX_DEFAULT - releaseall - end - -FallarborTown_House2_Text_20145C: @ 820145C - .string "I'm the MOVE TUTOR.\p" - .string "I know all the moves that POKéMON\n" - .string "learn--every one of them--and I can\l" - .string "teach POKéMON those moves.\p" - .string "I can teach a move to a POKéMON\n" - .string "of yours if you'd like.\p" - .string "I'll do it for a HEART SCALE.\n" - .string "I'm collecting those now.$" - -FallarborTown_House2_Text_201541: @ 8201541 - .string "Oh! That's it! That's an honest to\n" - .string "goodness HEART SCALE!\p" - .string "Let me guess, you want me to teach\n" - .string "a move?$" - -FallarborTown_House2_Text_2015A5: @ 82015A5 - .string "Which POKéMON needs tutoring?$" - -FallarborTown_House2_Text_2015C3: @ 82015C3 - .string "Which move should I teach?$" - -FallarborTown_House2_Text_2015DE: @ 82015DE - .string "Sorry…\p" - .string "It doesn't appear as if I have any move\n" - .string "I can teach that POKéMON.$" - -FallarborTown_House2_Text_201627: @ 8201627 - .string "{PLAYER} handed over one HEART SCALE\n" - .string "in exchange.$" - -FallarborTown_House2_Text_201653: @ 8201653 - .string "If your POKéMON need to learn a move,\n" - .string "come back with a HEART SCALE.$" - -FallarborTown_House2_Text_201697: @ 8201697 - .string "Hunh? There isn't a single move that\n" - .string "I can teach an EGG.$" - diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json index 9248eec87..60b0be26a 100644 --- a/data/maps/FallarborTown_Mart/map.json +++ b/data/maps/FallarborTown_Mart/map.json @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_Mart_EventScript_2C80B6", + "script": "FallarborTown_Mart_EventScript_MetronomeTutor", "flag": "0" } ], diff --git a/data/maps/FallarborTown_Mart/scripts.inc b/data/maps/FallarborTown_Mart/scripts.inc index bd9de930c..3ae8dc9dd 100644 --- a/data/maps/FallarborTown_Mart/scripts.inc +++ b/data/maps/FallarborTown_Mart/scripts.inc @@ -4,10 +4,10 @@ FallarborTown_Mart_MapScripts:: @ 81FFCBE FallarborTown_Mart_EventScript_1FFCBF:: @ 81FFCBF lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart FallarborTown_Mart_Pokemart_1FFCD8 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/FallarborTown_House2/map.json b/data/maps/FallarborTown_MoveRelearnersHouse/map.json index fe0ce67a0..c444c1e38 100644 --- a/data/maps/FallarborTown_House2/map.json +++ b/data/maps/FallarborTown_MoveRelearnersHouse/map.json @@ -1,6 +1,6 @@ { - "id": "MAP_FALLARBOR_TOWN_HOUSE2", - "name": "FallarborTown_House2", + "id": "MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE", + "name": "FallarborTown_MoveRelearnersHouse", "layout": "LAYOUT_HOUSE2", "music": "MUS_TONEKUSA", "region_map_section": "MAPSEC_FALLARBOR_TOWN", @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_House2_EventScript_201383", + "script": "FallarborTown_MoveRelearnersHouse_EventScript_MoveRelearner", "flag": "0" } ], diff --git a/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc b/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc new file mode 100644 index 000000000..788ee088d --- /dev/null +++ b/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc @@ -0,0 +1,102 @@ +FallarborTown_MoveRelearnersHouse_MapScripts:: @ 8201382 + .byte 0 + +FallarborTown_MoveRelearnersHouse_EventScript_MoveRelearner:: @ 8201383 + lockall + applymovement 1, Common_Movement_FacePlayer + waitmovement 0 + goto_if_set FLAG_TEMP_1, FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove + msgbox FallarborTown_MoveRelearnersHouse_Text_ImTheMoveTutor, MSGBOX_DEFAULT + setflag FLAG_TEMP_1 + goto FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove + end + +FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove:: @ 82013A8 + checkitem ITEM_HEART_SCALE, 1 + compare VAR_RESULT, 0 + goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale + msgbox FallarborTown_MoveRelearnersHouse_Text_ThatsAHeartScaleWantMeToTeachMove, MSGBOX_YESNO + switch VAR_RESULT + case NO, FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale + goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon + end + +FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon:: @ 82013D6 + msgbox FallarborTown_MoveRelearnersHouse_Text_TutorWhichMon, MSGBOX_DEFAULT + special ChooseMonForMoveRelearner + waitstate + compare VAR_0x8004, 255 + goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale + special IsSelectedMonEgg + compare VAR_RESULT, TRUE + goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_CantTeachEgg + compare VAR_0x8005, 0 + goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_NoMoveToTeachMon + goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMove + end + +FallarborTown_MoveRelearnersHouse_EventScript_ChooseMove:: @ 820140C + msgbox FallarborTown_MoveRelearnersHouse_Text_TeachWhichMove, MSGBOX_DEFAULT + special TeachMoveRelearnerMove + waitstate + compare VAR_0x8004, 0 + goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon + msgbox FallarborTown_MoveRelearnersHouse_Text_HandedOverHeartScale, MSGBOX_DEFAULT + takeitem ITEM_HEART_SCALE, 1 + goto FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale + end + +FallarborTown_MoveRelearnersHouse_EventScript_NoMoveToTeachMon:: @ 8201436 + msgbox FallarborTown_MoveRelearnersHouse_Text_DontHaveMoveToTeachPokemon, MSGBOX_DEFAULT + goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon + end + +FallarborTown_MoveRelearnersHouse_EventScript_CantTeachEgg:: @ 8201444 + msgbox FallarborTown_MoveRelearnersHouse_Text_CantTeachEgg, MSGBOX_DEFAULT + goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon + end + +FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale:: @ 8201452 + msgbox FallarborTown_MoveRelearnersHouse_Text_ComeBackWithHeartScale, MSGBOX_DEFAULT + releaseall + end + +FallarborTown_MoveRelearnersHouse_Text_ImTheMoveTutor: @ 820145C + .string "I'm the MOVE TUTOR.\p" + .string "I know all the moves that POKéMON\n" + .string "learn--every one of them--and I can\l" + .string "teach POKéMON those moves.\p" + .string "I can teach a move to a POKéMON\n" + .string "of yours if you'd like.\p" + .string "I'll do it for a HEART SCALE.\n" + .string "I'm collecting those now.$" + +FallarborTown_MoveRelearnersHouse_Text_ThatsAHeartScaleWantMeToTeachMove: @ 8201541 + .string "Oh! That's it! That's an honest to\n" + .string "goodness HEART SCALE!\p" + .string "Let me guess, you want me to teach\n" + .string "a move?$" + +FallarborTown_MoveRelearnersHouse_Text_TutorWhichMon: @ 82015A5 + .string "Which POKéMON needs tutoring?$" + +FallarborTown_MoveRelearnersHouse_Text_TeachWhichMove: @ 82015C3 + .string "Which move should I teach?$" + +FallarborTown_MoveRelearnersHouse_Text_DontHaveMoveToTeachPokemon: @ 82015DE + .string "Sorry…\p" + .string "It doesn't appear as if I have any move\n" + .string "I can teach that POKéMON.$" + +FallarborTown_MoveRelearnersHouse_Text_HandedOverHeartScale: @ 8201627 + .string "{PLAYER} handed over one HEART SCALE\n" + .string "in exchange.$" + +FallarborTown_MoveRelearnersHouse_Text_ComeBackWithHeartScale: @ 8201653 + .string "If your POKéMON need to learn a move,\n" + .string "come back with a HEART SCALE.$" + +FallarborTown_MoveRelearnersHouse_Text_CantTeachEgg: @ 8201697 + .string "Hunh? There isn't a single move that\n" + .string "I can teach an EGG.$" + diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index 5dbd35b48..db9122b6d 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -1,16 +1,16 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, FallarborTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 FallarborTown_PokemonCenter_1F_OnTransition: @ 8200BD8 setrespawn HEAL_LOCATION_FALLARBOR_TOWN - call FallarborTown_PokemonCenter_1F_EventScript_2718DE + call Common_EventScript_UpdateBrineyLocation end FallarborTown_PokemonCenter_1F_EventScript_200BE1:: @ 8200BE1 setvar VAR_0x800B, 1 - call FallarborTown_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release @@ -30,8 +30,8 @@ FallarborTown_PokemonCenter_1F_EventScript_200C01:: @ 8200C01 msgbox FallarborTown_PokemonCenter_1F_Text_200C6B, MSGBOX_DEFAULT closemessage switch VAR_FACING - case 2, FallarborTown_PokemonCenter_1F_EventScript_200C28 - case 3, FallarborTown_PokemonCenter_1F_EventScript_200C38 + case DIR_NORTH, FallarborTown_PokemonCenter_1F_EventScript_200C28 + case DIR_WEST, FallarborTown_PokemonCenter_1F_EventScript_200C38 end FallarborTown_PokemonCenter_1F_EventScript_200C28:: @ 8200C28 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json index 029a4a9c6..60bca57a9 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FallarborTown_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc index 0d5332647..e9912ee68 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB - map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, FallarborTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -FallarborTown_PokemonCenter_2F_EventScript_200F00:: @ 8200F00 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +FallarborTown_PokemonCenter_2F_EventScript_Colosseum:: @ 8200F00 + call CableClub_EventScript_Colosseum end -FallarborTown_PokemonCenter_2F_EventScript_200F06:: @ 8200F06 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +FallarborTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 8200F06 + call CableClub_EventScript_TradeCenter end -FallarborTown_PokemonCenter_2F_EventScript_200F0C:: @ 8200F0C - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +FallarborTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 8200F0C + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/FarawayIsland_Entrance/map.json b/data/maps/FarawayIsland_Entrance/map.json index e8dc6dbed..fe81fd10a 100644 --- a/data/maps/FarawayIsland_Entrance/map.json +++ b/data/maps/FarawayIsland_Entrance/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FarawayIsland_Entrance_EventScript_267CA2", + "script": "FarawayIsland_Entrance_EventScript_Sailor", "flag": "0" }, { @@ -65,7 +65,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "FarawayIsland_Entrance_EventScript_267C98" + "script": "FarawayIsland_Entrance_EventScript_SetCloudsWeather" }, { "type": "trigger", @@ -74,7 +74,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "FarawayIsland_Entrance_EventScript_267C9D" + "script": "FarawayIsland_Entrance_EventScript_ClearWeather" }, { "type": "trigger", @@ -83,7 +83,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "FarawayIsland_Entrance_EventScript_267C98" + "script": "FarawayIsland_Entrance_EventScript_SetCloudsWeather" } ], "bg_events": [ @@ -93,7 +93,7 @@ "y": 32, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FarawayIsland_Entrance_EventScript_267CF1" + "script": "FarawayIsland_Entrance_EventScript_Sign" } ] }
\ No newline at end of file diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc index e0d54233b..33b2a294c 100644 --- a/data/maps/FarawayIsland_Entrance/scripts.inc +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -6,41 +6,41 @@ FarawayIsland_Entrance_OnTransition: @ 8267C94 setflag FLAG_ARRIVED_ON_FARAWAY_ISLAND end -FarawayIsland_Entrance_EventScript_267C98:: @ 8267C98 +FarawayIsland_Entrance_EventScript_SetCloudsWeather:: @ 8267C98 setweather WEATHER_CLOUDS doweather end -FarawayIsland_Entrance_EventScript_267C9D:: @ 8267C9D +FarawayIsland_Entrance_EventScript_ClearWeather:: @ 8267C9D setweather WEATHER_NONE doweather end -FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 +FarawayIsland_Entrance_EventScript_Sailor:: @ 8267CA2 lock faceplayer msgbox FarawayIsland_Entrance_Text_SailorReturn, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq FarawayIsland_Entrance_EventScript_267CE7 + compare VAR_RESULT, NO + goto_if_eq FarawayIsland_Entrance_EventScript_AsYouLike msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 hideobjectat 1, MAP_FARAWAY_ISLAND_ENTRANCE setvar VAR_0x8004, 2 - call FarawayIsland_Entrance_EventScript_272250 + call Common_EventScript_FerryDepartIsland warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end -FarawayIsland_Entrance_EventScript_267CE7:: @ 8267CE7 +FarawayIsland_Entrance_EventScript_AsYouLike:: @ 8267CE7 msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT release end -FarawayIsland_Entrance_EventScript_267CF1:: @ 8267CF1 +FarawayIsland_Entrance_EventScript_Sign:: @ 8267CF1 msgbox FarawayIsland_Entrance_Text_Sign, MSGBOX_SIGN end diff --git a/data/maps/FarawayIsland_Interior/map.json b/data/maps/FarawayIsland_Interior/map.json index b41c5461a..4998380e1 100644 --- a/data/maps/FarawayIsland_Interior/map.json +++ b/data/maps/FarawayIsland_Interior/map.json @@ -24,7 +24,7 @@ "movement_range_y": 15, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "1", - "script": "FarawayIsland_Interior_EventScript_267DF2", + "script": "FarawayIsland_Interior_EventScript_Mew", "flag": "FLAG_HIDE_MEW" } ], diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index 3b8f1f88f..20121d500 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -1,23 +1,23 @@ FarawayIsland_Interior_MapScripts:: @ 8267CFA - map_script MAP_SCRIPT_ON_RESUME, FarawayIsland_Interior_MapScript1_267D54 + map_script MAP_SCRIPT_ON_RESUME, FarawayIsland_Interior_OnResume map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Interior_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, FarawayIsland_Interior_MapScript2_267D98 - map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, FarawayIsland_Interior_MapScript1_267D0F + map_script MAP_SCRIPT_ON_FRAME_TABLE, FarawayIsland_Interior_OnFrame + map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, FarawayIsland_Interior_OnReturnToField .byte 0 -FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F +FarawayIsland_Interior_OnReturnToField: @ 8267D0F call_if_set FLAG_SYS_CTRL_OBJ_DELETE, FarawayIsland_Interior_EventScript_267D19 end FarawayIsland_Interior_EventScript_267D19:: @ 8267D19 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq FarawayIsland_Interior_EventScript_267D4B - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq FarawayIsland_Interior_EventScript_267D4B - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq FarawayIsland_Interior_EventScript_267D4B - compare VAR_RESULT, 10 + compare VAR_RESULT, B_OUTCOME_MON_TELEPORTED goto_if_eq FarawayIsland_Interior_EventScript_267D4B return @@ -26,13 +26,13 @@ FarawayIsland_Interior_EventScript_267D4B:: @ 8267D4B special sub_81D4A90 return -FarawayIsland_Interior_MapScript1_267D54: @ 8267D54 - call_if_set FLAG_SYS_CTRL_OBJ_DELETE, FarawayIsland_Interior_EventScript_267D5E +FarawayIsland_Interior_OnResume: @ 8267D54 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, FarawayIsland_Interior_EventScript_TryRemoveMew end -FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E +FarawayIsland_Interior_EventScript_TryRemoveMew:: @ 8267D5E specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return @@ -40,34 +40,34 @@ FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E FarawayIsland_Interior_OnTransition: @ 8267D72 setvar VAR_FARAWAY_ISLAND_STEP_COUNTER, 0 setvar VAR_TEMP_1, 1 - call_if_unset FLAG_CAUGHT_MEW, FarawayIsland_Interior_EventScript_267D86 + call_if_unset FLAG_CAUGHT_MEW, FarawayIsland_Interior_EventScript_TryShowMew end -FarawayIsland_Interior_EventScript_267D86:: @ 8267D86 +FarawayIsland_Interior_EventScript_TryShowMew:: @ 8267D86 goto_if_set FLAG_DEFEATED_MEW, Common_EventScript_NopReturn clearflag FLAG_HIDE_MEW setvar VAR_TEMP_1, 0 return -FarawayIsland_Interior_MapScript2_267D98: @ 8267D98 - map_script_2 VAR_TEMP_1, 0, FarawayIsland_Interior_EventScript_267DA2 +FarawayIsland_Interior_OnFrame: @ 8267D98 + map_script_2 VAR_TEMP_1, 0, FarawayIsland_Interior_EventScript_FindMew .2byte 0 -FarawayIsland_Interior_EventScript_267DA2:: @ 8267DA2 +FarawayIsland_Interior_EventScript_FindMew:: @ 8267DA2 lockall playse SE_PIN applymovement 1, Common_Movement_ExclamationMark waitmovement 0 applymovement 1, Common_Movement_Delay48 waitmovement 0 - applymovement 1, FarawayIsland_Interior_Movement_267DCE + applymovement 1, FarawayIsland_Interior_Movement_MewMoveAndHide waitmovement 0 copyobjectxytoperm 1 setvar VAR_TEMP_1, 1 releaseall end -FarawayIsland_Interior_Movement_267DCE: @ 8267DCE +FarawayIsland_Interior_Movement_MewMoveAndHide: @ 8267DCE walk_up walk_up walk_up @@ -75,11 +75,11 @@ FarawayIsland_Interior_Movement_267DCE: @ 8267DCE set_invisible step_end -FarawayIsland_Interior_Movement_267DD4: @ 8267DD4 +FarawayIsland_Interior_Movement_MewAppear: @ 8267DD4 set_visible step_end -FarawayIsland_Interior_Movement_267DD6: @ 8267DD6 +FarawayIsland_Interior_Movement_MewHideDown: @ 8267DD6 lock_facing_direction walk_fast_up walk_fast_up @@ -88,7 +88,7 @@ FarawayIsland_Interior_Movement_267DD6: @ 8267DD6 walk_in_place_down step_end -FarawayIsland_Interior_Movement_267DDD: @ 8267DDD +FarawayIsland_Interior_Movement_MewHideUp: @ 8267DDD lock_facing_direction walk_fast_up walk_fast_up @@ -97,7 +97,7 @@ FarawayIsland_Interior_Movement_267DDD: @ 8267DDD walk_in_place_up step_end -FarawayIsland_Interior_Movement_267DE4: @ 8267DE4 +FarawayIsland_Interior_Movement_MewHideRight: @ 8267DE4 lock_facing_direction walk_fast_up walk_fast_up @@ -106,7 +106,7 @@ FarawayIsland_Interior_Movement_267DE4: @ 8267DE4 walk_in_place_right step_end -FarawayIsland_Interior_Movement_267DEB: @ 8267DEB +FarawayIsland_Interior_Movement_MewHideLeft: @ 8267DEB lock_facing_direction walk_fast_up walk_fast_up @@ -115,89 +115,89 @@ FarawayIsland_Interior_Movement_267DEB: @ 8267DEB walk_in_place_left step_end -FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 +FarawayIsland_Interior_EventScript_Mew:: @ 8267DF2 lock faceplayer - applymovement 1, FarawayIsland_Interior_Movement_267DD4 + applymovement 1, FarawayIsland_Interior_Movement_MewAppear waitmovement 0 setvar VAR_0x8004, 0 special sub_81D4A90 message FarawayIsland_Interior_Text_Mew waitse playmoncry SPECIES_MEW, 2 - compare VAR_FACING, 2 - call_if_eq FarawayIsland_Interior_EventScript_267EAF - compare VAR_FACING, 1 - call_if_eq FarawayIsland_Interior_EventScript_267EBA - compare VAR_FACING, 3 - call_if_eq FarawayIsland_Interior_EventScript_267EC5 - compare VAR_FACING, 4 - call_if_eq FarawayIsland_Interior_EventScript_267ED0 + compare VAR_FACING, DIR_NORTH + call_if_eq FarawayIsland_Interior_EventScript_MewHideDown + compare VAR_FACING, DIR_SOUTH + call_if_eq FarawayIsland_Interior_EventScript_MewHideUp + compare VAR_FACING, DIR_WEST + call_if_eq FarawayIsland_Interior_EventScript_MewHideRight + compare VAR_FACING, DIR_EAST + call_if_eq FarawayIsland_Interior_EventScript_MewHideLeft special sub_81D4BEC delay 40 waitmoncry - setvar VAR_0x8004, 151 - setvar VAR_0x8005, 30 - setvar VAR_0x8006, 0 + setvar VAR_0x8004, SPECIES_MEW + setvar VAR_0x8005, 30 @ level + setvar VAR_0x8006, ITEM_NONE special CreateObedientEnemyMon setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 - goto_if_eq FarawayIsland_Interior_EventScript_267E96 - compare VAR_RESULT, 4 - goto_if_eq FarawayIsland_Interior_EventScript_267EA4 - compare VAR_RESULT, 5 - goto_if_eq FarawayIsland_Interior_EventScript_267EA4 - compare VAR_RESULT, 10 - goto_if_eq FarawayIsland_Interior_EventScript_267EA4 + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq FarawayIsland_Interior_EventScript_MewDefeated + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq FarawayIsland_Interior_EventScript_PlayerOrMewRan + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq FarawayIsland_Interior_EventScript_PlayerOrMewRan + compare VAR_RESULT, B_OUTCOME_MON_TELEPORTED + goto_if_eq FarawayIsland_Interior_EventScript_PlayerOrMewRan setflag FLAG_CAUGHT_MEW release end -FarawayIsland_Interior_EventScript_267E96:: @ 8267E96 +FarawayIsland_Interior_EventScript_MewDefeated:: @ 8267E96 setflag FLAG_DEFEATED_MEW - setvar VAR_0x8004, 151 - goto FarawayIsland_Interior_EventScript_273776 + setvar VAR_0x8004, SPECIES_MEW + goto Common_EventScript_LegendaryFlewAway end -FarawayIsland_Interior_EventScript_267EA4:: @ 8267EA4 - setvar VAR_0x8004, 151 - goto FarawayIsland_Interior_EventScript_273776 +FarawayIsland_Interior_EventScript_PlayerOrMewRan:: @ 8267EA4 + setvar VAR_0x8004, SPECIES_MEW + goto Common_EventScript_LegendaryFlewAway end -FarawayIsland_Interior_EventScript_267EAF:: @ 8267EAF - applymovement 1, FarawayIsland_Interior_Movement_267DD6 +FarawayIsland_Interior_EventScript_MewHideDown:: @ 8267EAF + applymovement 1, FarawayIsland_Interior_Movement_MewHideDown waitmovement 0 return -FarawayIsland_Interior_EventScript_267EBA:: @ 8267EBA - applymovement 1, FarawayIsland_Interior_Movement_267DDD +FarawayIsland_Interior_EventScript_MewHideUp:: @ 8267EBA + applymovement 1, FarawayIsland_Interior_Movement_MewHideUp waitmovement 0 return -FarawayIsland_Interior_EventScript_267EC5:: @ 8267EC5 - applymovement 1, FarawayIsland_Interior_Movement_267DE4 +FarawayIsland_Interior_EventScript_MewHideRight:: @ 8267EC5 + applymovement 1, FarawayIsland_Interior_Movement_MewHideRight waitmovement 0 return -FarawayIsland_Interior_EventScript_267ED0:: @ 8267ED0 - applymovement 1, FarawayIsland_Interior_Movement_267DEB +FarawayIsland_Interior_EventScript_MewHideLeft:: @ 8267ED0 + applymovement 1, FarawayIsland_Interior_Movement_MewHideLeft waitmovement 0 return -FarawayIsland_Interior_EventScript_267EDB:: @ 8267EDB +FarawayIsland_Interior_EventScript_HideMewWhenGrassCut:: @ 8267EDB lockall fadescreenswapbuffers 1 setflag FLAG_HIDE_MEW removeobject 1 fadescreenswapbuffers 0 - msgbox FarawayIsland_Interior_Text_267EF1, MSGBOX_DEFAULT + msgbox FarawayIsland_Interior_Text_TheFeelingOfBeingWatchedFaded, MSGBOX_DEFAULT closemessage releaseall end -FarawayIsland_Interior_Text_267EF1: @ 8267EF1 +FarawayIsland_Interior_Text_TheFeelingOfBeingWatchedFaded: @ 8267EF1 .string "The feeling of being watched faded…$" diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index 30f617f78..716a511b0 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -8,7 +8,7 @@ FortreeCity_OnTransition: @ 81E25AF end FortreeCity_MapScript1_1E25B3: @ 81E25B3 - setstepcallback 2 + setstepcallback STEP_CB_FORTREE_BRIDGE end FortreeCity_EventScript_1E25B6:: @ 81E25B6 @@ -64,7 +64,7 @@ FortreeCity_EventScript_1E2614:: @ 81E2614 FortreeCity_EventScript_1E2630:: @ 81E2630 msgbox FortreeCity_Text_1E2A08, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq FortreeCity_EventScript_1E2645 release end @@ -72,7 +72,7 @@ FortreeCity_EventScript_1E2630:: @ 81E2630 FortreeCity_EventScript_1E2645:: @ 81E2645 msgbox FortreeCity_Text_1E2A48, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, FortreeCity_Movement_2723C7 + applymovement VAR_LAST_TALKED, Movement_KecleonAppears waitmovement 0 waitse playmoncry SPECIES_KECLEON, 2 diff --git a/data/maps/FortreeCity_DecorationShop/scripts.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc index 3b0021cf3..14c864ee5 100644 --- a/data/maps/FortreeCity_DecorationShop/scripts.inc +++ b/data/maps/FortreeCity_DecorationShop/scripts.inc @@ -12,10 +12,10 @@ FortreeCity_DecorationShop_EventScript_218017:: @ 8218017 FortreeCity_DecorationShop_EventScript_218020:: @ 8218020 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_Desks - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -36,10 +36,10 @@ FortreeCity_DecorationShop_PokemartDecor_Desks: @ 8218038 FortreeCity_DecorationShop_EventScript_21804C:: @ 821804C lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_Chairs - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json index f985b2ce4..7b17c58c0 100644 --- a/data/maps/FortreeCity_Gym/map.json +++ b/data/maps/FortreeCity_Gym/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_Gym_EventScript_2165C8", + "script": "FortreeCity_Gym_EventScript_Winona", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "FortreeCity_Gym_EventScript_2166A8", + "script": "FortreeCity_Gym_EventScript_Jared", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "FortreeCity_Gym_EventScript_2166D6", + "script": "FortreeCity_Gym_EventScript_Flint", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "FortreeCity_Gym_EventScript_2166ED", + "script": "FortreeCity_Gym_EventScript_Ashley", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "FortreeCity_Gym_EventScript_2166BF", + "script": "FortreeCity_Gym_EventScript_Edwardo", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_Gym_EventScript_216732", + "script": "FortreeCity_Gym_EventScript_GymGuide", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "FortreeCity_Gym_EventScript_216704", + "script": "FortreeCity_Gym_EventScript_Humberto", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "FortreeCity_Gym_EventScript_21671B", + "script": "FortreeCity_Gym_EventScript_Darius", "flag": "0" } ], @@ -143,7 +143,7 @@ "y": 21, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_Gym_EventScript_216751" + "script": "FortreeCity_Gym_EventScript_LeftGymStatue" }, { "type": "sign", @@ -151,7 +151,7 @@ "y": 21, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FortreeCity_Gym_EventScript_216761" + "script": "FortreeCity_Gym_EventScript_RightGymStatue" } ] }
\ No newline at end of file diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 1b3cf29e9..0b0008d53 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -1,44 +1,44 @@ FortreeCity_Gym_MapScripts:: @ 82165AB map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_OnTransition - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_Gym_MapScript2_2165BA + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_Gym_OnWarp .byte 0 FortreeCity_Gym_OnTransition: @ 82165B6 special RotatingGate_InitPuzzle end -FortreeCity_Gym_MapScript2_2165BA: @ 82165BA - map_script_2 VAR_TEMP_0, 16384, FortreeCity_Gym_EventScript_2165C4 +FortreeCity_Gym_OnWarp: @ 82165BA + map_script_2 VAR_TEMP_0, VAR_TEMP_0, FortreeCity_Gym_EventScript_InitRotatingGates .2byte 0 -FortreeCity_Gym_EventScript_2165C4:: @ 82165C4 +FortreeCity_Gym_EventScript_InitRotatingGates:: @ 82165C4 special RotatingGate_InitPuzzleAndGraphics end -FortreeCity_Gym_EventScript_2165C8:: @ 82165C8 - trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD, NO_MUSIC +FortreeCity_Gym_EventScript_Winona:: @ 82165C8 + trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_WinonaPreBattle, FortreeCity_Gym_Text_WinonaDefeat, FortreeCity_Gym_EventScript_WinonaDefeated, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq FortreeCity_Gym_EventScript_21668D - goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_216646 - msgbox FortreeCity_Gym_Text_217071, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq FortreeCity_Gym_EventScript_WinonaRematch + goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_GiveAerialAce2 + msgbox FortreeCity_Gym_Text_WinonaPostBattle, MSGBOX_DEFAULT release end -FortreeCity_Gym_EventScript_2165FD:: @ 82165FD - message FortreeCity_Gym_Text_216EEC +FortreeCity_Gym_EventScript_WinonaDefeated:: @ 82165FD + message FortreeCity_Gym_Text_ReceivedFeatherBadge waitmessage call Common_EventScript_PlayGymBadgeFanfare - msgbox FortreeCity_Gym_Text_216F17, MSGBOX_DEFAULT + msgbox FortreeCity_Gym_Text_ExplainFeatherBadgeTakeThis, MSGBOX_DEFAULT setflag FLAG_DEFEATED_FORTREE_GYM setflag FLAG_BADGE06_GET setvar VAR_0x8008, 6 - call FortreeCity_Gym_EventScript_271F43 - call FortreeCity_Gym_EventScript_21666A + call Common_EventScript_SetGymTrainers + call FortreeCity_Gym_EventScript_GiveAerialAce closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox FortreeCity_Gym_Text_217044, MSGBOX_DEFAULT + msgbox FortreeCity_Gym_Text_RegisteredWinona, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -48,94 +48,94 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD release end -FortreeCity_Gym_EventScript_216646:: @ 8216646 +FortreeCity_Gym_EventScript_GiveAerialAce2:: @ 8216646 giveitem_std ITEM_TM40 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT + msgbox FortreeCity_Gym_Text_ExplainAerialAce, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM40 release end -FortreeCity_Gym_EventScript_21666A:: @ 821666A +FortreeCity_Gym_EventScript_GiveAerialAce:: @ 821666A giveitem_std ITEM_TM40 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_BagIsFull - msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT + msgbox FortreeCity_Gym_Text_ExplainAerialAce, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM40 return -FortreeCity_Gym_EventScript_21668D:: @ 821668D - trainerbattle_rematch_double TRAINER_WINONA_1, FortreeCity_Gym_Text_217100, FortreeCity_Gym_Text_2171E6, FortreeCity_Gym_Text_217292 - msgbox FortreeCity_Gym_Text_21720B, MSGBOX_AUTOCLOSE +FortreeCity_Gym_EventScript_WinonaRematch:: @ 821668D + trainerbattle_rematch_double TRAINER_WINONA_1, FortreeCity_Gym_Text_WinonaPreRematch, FortreeCity_Gym_Text_WinonaRematchDefeat, FortreeCity_Gym_Text_WinonaRematchNeedTwoMons + msgbox FortreeCity_Gym_Text_WinonaPostRematch, MSGBOX_AUTOCLOSE end -FortreeCity_Gym_EventScript_2166A8:: @ 82166A8 - trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_2168A2, FortreeCity_Gym_Text_2168D3 - msgbox FortreeCity_Gym_Text_2168E7, MSGBOX_AUTOCLOSE +FortreeCity_Gym_EventScript_Jared:: @ 82166A8 + trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_JaredPreBattle, FortreeCity_Gym_Text_JaredDefeat + msgbox FortreeCity_Gym_Text_JaredPostBattle, MSGBOX_AUTOCLOSE end -FortreeCity_Gym_EventScript_2166BF:: @ 82166BF - trainerbattle_single TRAINER_EDWARDO, FortreeCity_Gym_Text_21695A, FortreeCity_Gym_Text_2169C7 - msgbox FortreeCity_Gym_Text_2169F1, MSGBOX_AUTOCLOSE +FortreeCity_Gym_EventScript_Edwardo:: @ 82166BF + trainerbattle_single TRAINER_EDWARDO, FortreeCity_Gym_Text_EdwardoPreBattle, FortreeCity_Gym_Text_EdwardoDefeat + msgbox FortreeCity_Gym_Text_EdwardoPostBattle, MSGBOX_AUTOCLOSE end -FortreeCity_Gym_EventScript_2166D6:: @ 82166D6 - trainerbattle_single TRAINER_FLINT, FortreeCity_Gym_Text_216A66, FortreeCity_Gym_Text_216AC4 - msgbox FortreeCity_Gym_Text_216AD7, MSGBOX_AUTOCLOSE +FortreeCity_Gym_EventScript_Flint:: @ 82166D6 + trainerbattle_single TRAINER_FLINT, FortreeCity_Gym_Text_FlintPreBattle, FortreeCity_Gym_Text_FlintDefeat + msgbox FortreeCity_Gym_Text_FlintPostBattle, MSGBOX_AUTOCLOSE end -FortreeCity_Gym_EventScript_2166ED:: @ 82166ED - trainerbattle_single TRAINER_ASHLEY, FortreeCity_Gym_Text_216B1A, FortreeCity_Gym_Text_216B51 - msgbox FortreeCity_Gym_Text_216B5F, MSGBOX_AUTOCLOSE +FortreeCity_Gym_EventScript_Ashley:: @ 82166ED + trainerbattle_single TRAINER_ASHLEY, FortreeCity_Gym_Text_AshleyPreBattle, FortreeCity_Gym_Text_AshleyDefeat + msgbox FortreeCity_Gym_Text_AshleyPostBattle, MSGBOX_AUTOCLOSE end -FortreeCity_Gym_EventScript_216704:: @ 8216704 - trainerbattle_single TRAINER_HUMBERTO, FortreeCity_Gym_Text_216B9E, FortreeCity_Gym_Text_216C18 - msgbox FortreeCity_Gym_Text_216C32, MSGBOX_AUTOCLOSE +FortreeCity_Gym_EventScript_Humberto:: @ 8216704 + trainerbattle_single TRAINER_HUMBERTO, FortreeCity_Gym_Text_HumbertoPreBattle, FortreeCity_Gym_Text_HumbertoDefeat + msgbox FortreeCity_Gym_Text_HumbertoPostBattle, MSGBOX_AUTOCLOSE end -FortreeCity_Gym_EventScript_21671B:: @ 821671B - trainerbattle_single TRAINER_DARIUS, FortreeCity_Gym_Text_216C96, FortreeCity_Gym_Text_216CF2 - msgbox FortreeCity_Gym_Text_216D0F, MSGBOX_AUTOCLOSE +FortreeCity_Gym_EventScript_Darius:: @ 821671B + trainerbattle_single TRAINER_DARIUS, FortreeCity_Gym_Text_DariusPreBattle, FortreeCity_Gym_Text_DariusDefeat + msgbox FortreeCity_Gym_Text_DariusPostBattle, MSGBOX_AUTOCLOSE end -FortreeCity_Gym_EventScript_216732:: @ 8216732 +FortreeCity_Gym_EventScript_GymGuide:: @ 8216732 lock faceplayer - goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_216747 - msgbox FortreeCity_Gym_Text_216785, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_GymGuidePostVictory + msgbox FortreeCity_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT release end -FortreeCity_Gym_EventScript_216747:: @ 8216747 - msgbox FortreeCity_Gym_Text_21687D, MSGBOX_DEFAULT +FortreeCity_Gym_EventScript_GymGuidePostVictory:: @ 8216747 + msgbox FortreeCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT release end -FortreeCity_Gym_EventScript_216751:: @ 8216751 +FortreeCity_Gym_EventScript_LeftGymStatue:: @ 8216751 lockall - goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_216771 - goto FortreeCity_Gym_EventScript_21677B + goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_GymStatueCertified + goto FortreeCity_Gym_EventScript_GymStatue end -FortreeCity_Gym_EventScript_216761:: @ 8216761 +FortreeCity_Gym_EventScript_RightGymStatue:: @ 8216761 lockall - goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_216771 - goto FortreeCity_Gym_EventScript_21677B + goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_GymStatueCertified + goto FortreeCity_Gym_EventScript_GymStatue end -FortreeCity_Gym_EventScript_216771:: @ 8216771 - msgbox FortreeCity_Gym_Text_2170C7, MSGBOX_DEFAULT +FortreeCity_Gym_EventScript_GymStatueCertified:: @ 8216771 + msgbox FortreeCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT releaseall end -FortreeCity_Gym_EventScript_21677B:: @ 821677B - msgbox FortreeCity_Gym_Text_2170AE, MSGBOX_DEFAULT +FortreeCity_Gym_EventScript_GymStatue:: @ 821677B + msgbox FortreeCity_Gym_Text_GymStatue, MSGBOX_DEFAULT releaseall end -FortreeCity_Gym_Text_216785: @ 8216785 +FortreeCity_Gym_Text_GymGuideAdvice: @ 8216785 .string "Yo, how's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" .string "FORTREE GYM LEADER WINONA is\n" @@ -146,94 +146,94 @@ FortreeCity_Gym_Text_216785: @ 8216785 .string "who are trying to take wing!\p" .string "Okay, go for it!$" -FortreeCity_Gym_Text_21687D: @ 821687D +FortreeCity_Gym_Text_GymGuidePostVictory: @ 821687D .string "You did it!\n" .string "You've achieved liftoff!$" -FortreeCity_Gym_Text_2168A2: @ 82168A2 +FortreeCity_Gym_Text_JaredPreBattle: @ 82168A2 .string "Behold the elegant battle style of\n" .string "BIRD POKéMON!$" -FortreeCity_Gym_Text_2168D3: @ 82168D3 +FortreeCity_Gym_Text_JaredDefeat: @ 82168D3 .string "You…\n" .string "You're strong…$" -FortreeCity_Gym_Text_2168E7: @ 82168E7 +FortreeCity_Gym_Text_JaredPostBattle: @ 82168E7 .string "A TRAINER has to be smart to keep\n" .string "up with unexpected turns of events.\p" .string "Do you have the smarts to get to\n" .string "our LEADER?$" -FortreeCity_Gym_Text_21695A: @ 821695A +FortreeCity_Gym_Text_EdwardoPreBattle: @ 821695A .string "The lovers of BIRD POKéMON aspire\n" .string "to join this GYM.\p" .string "As a member of the FORTREE GYM,\n" .string "I'm not allowed to lose!$" -FortreeCity_Gym_Text_2169C7: @ 82169C7 +FortreeCity_Gym_Text_EdwardoDefeat: @ 82169C7 .string "It was too much of a load for me\n" .string "to bear…$" -FortreeCity_Gym_Text_2169F1: @ 82169F1 +FortreeCity_Gym_Text_EdwardoPostBattle: @ 82169F1 .string "The world is huge, and there are\n" .string "countless tough TRAINERS.\p" .string "I'm going to keep training and make\n" .string "myself even stronger.$" -FortreeCity_Gym_Text_216A66: @ 8216A66 +FortreeCity_Gym_Text_FlintPreBattle: @ 8216A66 .string "There's no need for WINONA, our GYM\n" .string "LEADER, to deal with you!\p" .string "I'm plenty good enough for you!$" -FortreeCity_Gym_Text_216AC4: @ 8216AC4 +FortreeCity_Gym_Text_FlintDefeat: @ 8216AC4 .string "WINONA, I…\n" .string "I lost!$" -FortreeCity_Gym_Text_216AD7: @ 8216AD7 +FortreeCity_Gym_Text_FlintPostBattle: @ 8216AD7 .string "WINONA is cute and she's strong.\n" .string "She's the ultimate LEADER!\p" .string "Blush…$" -FortreeCity_Gym_Text_216B1A: @ 8216B1A +FortreeCity_Gym_Text_AshleyPreBattle: @ 8216B1A .string "WINONA taught me personally!\n" .string "You can't beat me easily!$" -FortreeCity_Gym_Text_216B51: @ 8216B51 +FortreeCity_Gym_Text_AshleyDefeat: @ 8216B51 .string "I was beaten…$" -FortreeCity_Gym_Text_216B5F: @ 8216B5F +FortreeCity_Gym_Text_AshleyPostBattle: @ 8216B5F .string "Thanks to WINONA, the people of\n" .string "FORTREE can live without fear.$" -FortreeCity_Gym_Text_216B9E: @ 8216B9E +FortreeCity_Gym_Text_HumbertoPreBattle: @ 8216B9E .string "When WINONA takes to battle, her face\n" .string "shines with beautiful determination…\p" .string "I'm not letting you witness that\n" .string "lovely sight!$" -FortreeCity_Gym_Text_216C18: @ 8216C18 +FortreeCity_Gym_Text_HumbertoDefeat: @ 8216C18 .string "Urk!\n" .string "I couldn't stop you.$" -FortreeCity_Gym_Text_216C32: @ 8216C32 +FortreeCity_Gym_Text_HumbertoPostBattle: @ 8216C32 .string "You'd better watch it!\n" .string "Don't get distracted staring at WINONA\l" .string "or you'll go crashing down in a heap!$" -FortreeCity_Gym_Text_216C96: @ 8216C96 +FortreeCity_Gym_Text_DariusPreBattle: @ 8216C96 .string "You'd better know that there are all\n" .string "sorts of FLYING-type POKéMON.\p" .string "You do know that, right?$" -FortreeCity_Gym_Text_216CF2: @ 8216CF2 +FortreeCity_Gym_Text_DariusDefeat: @ 8216CF2 .string "You seem to know your stuff!$" -FortreeCity_Gym_Text_216D0F: @ 8216D0F +FortreeCity_Gym_Text_DariusPostBattle: @ 8216D0F .string "Sure, you beat me all right.\n" .string "But you'd better watch it! Our LEADER\l" .string "WINONA's POKéMON are all business.$" -FortreeCity_Gym_Text_216D75: @ 8216D75 +FortreeCity_Gym_Text_WinonaPreBattle: @ 8216D75 .string "I am WINONA. I am the LEADER of\n" .string "the FORTREE POKéMON GYM.\p" .string "I have become one with BIRD POKéMON\n" @@ -243,18 +243,18 @@ FortreeCity_Gym_Text_216D75: @ 8216D75 .string "Witness the elegant choreography\n" .string "of BIRD POKéMON and I!$" -FortreeCity_Gym_Text_216E60: @ 8216E60 +FortreeCity_Gym_Text_WinonaDefeat: @ 8216E60 .string "Never before have I seen a TRAINER\n" .string "command POKéMON with more grace\l" .string "than I…\p" .string "In recognition of your prowess,\n" .string "I present to you this GYM BADGE.$" -FortreeCity_Gym_Text_216EEC: @ 8216EEC +FortreeCity_Gym_Text_ReceivedFeatherBadge: @ 8216EEC .string "{PLAYER} received the FEATHER BADGE\n" .string "from WINONA.$" -FortreeCity_Gym_Text_216F17: @ 8216F17 +FortreeCity_Gym_Text_ExplainFeatherBadgeTakeThis: @ 8216F17 .string "With the FEATHER BADGE, all POKéMON up\n" .string "to LV 70, even those received through\l" .string "trades, will obey your every command.\p" @@ -263,29 +263,29 @@ FortreeCity_Gym_Text_216F17: @ 8216F17 .string "And this…\n" .string "This is a gift from me.$" -FortreeCity_Gym_Text_216FEC: @ 8216FEC +FortreeCity_Gym_Text_ExplainAerialAce: @ 8216FEC .string "TM40 contains AERIAL ACE.\p" .string "Its speed…\n" .string "No POKéMON should be able to avoid it.\p" .string "… … … … … …$" -FortreeCity_Gym_Text_217044: @ 8217044 +FortreeCity_Gym_Text_RegisteredWinona: @ 8217044 .string "Registered GYM LEADER WINONA\n" .string "in the POKéNAV.$" -FortreeCity_Gym_Text_217071: @ 8217071 +FortreeCity_Gym_Text_WinonaPostBattle: @ 8217071 .string "Though I fell to you, I will remain\n" .string "devoted to BIRD POKéMON.$" -FortreeCity_Gym_Text_2170AE: @ 82170AE +FortreeCity_Gym_Text_GymStatue: @ 82170AE .string "FORTREE CITY POKéMON GYM$" -FortreeCity_Gym_Text_2170C7: @ 82170C7 +FortreeCity_Gym_Text_GymStatueCertified: @ 82170C7 .string "FORTREE CITY POKéMON GYM\p" .string "WINONA'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" -FortreeCity_Gym_Text_217100: @ 8217100 +FortreeCity_Gym_Text_WinonaPreRematch: @ 8217100 .string "WINONA: We humans can never escape\n" .string "gravity's pull on the ground.\p" .string "But by striving for excellence,\n" @@ -295,17 +295,17 @@ FortreeCity_Gym_Text_217100: @ 8217100 .string "Please, allow me to see your power\n" .string "at full flight!$" -FortreeCity_Gym_Text_2171E6: @ 82171E6 +FortreeCity_Gym_Text_WinonaRematchDefeat: @ 82171E6 .string "I failed to reach your height again…$" -FortreeCity_Gym_Text_21720B: @ 821720B +FortreeCity_Gym_Text_WinonaPostRematch: @ 821720B .string "WINONA: Even though I have lost,\n" .string "the wings of my heart remain unbroken.\p" .string "I can rise and soar again and\n" .string "yet again.\p" .string "I am convinced of it!$" -FortreeCity_Gym_Text_217292: @ 8217292 +FortreeCity_Gym_Text_WinonaRematchNeedTwoMons: @ 8217292 .string "WINONA: We humans can never escape\n" .string "gravity's pull on the ground.\p" .string "But by striving for excellence,\n" diff --git a/data/maps/FortreeCity_House1/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc index 87aa7a643..9ef94b12b 100644 --- a/data/maps/FortreeCity_House1/scripts.inc +++ b/data/maps/FortreeCity_House1/scripts.inc @@ -5,14 +5,14 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB lock faceplayer goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_216355 - setvar VAR_0x8008, 1 + setvar VAR_0x8008, INGAME_TRADE_PLUSLE copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT msgbox FortreeCity_House1_Text_21637B, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq FortreeCity_House1_EventScript_21633D - special sub_81B94B0 + special ChoosePartyMon waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json index 17f928fe9..492590c6c 100644 --- a/data/maps/FortreeCity_House2/map.json +++ b/data/maps/FortreeCity_House2/map.json @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_House2_EventScript_2C811E", + "script": "FortreeCity_House2_EventScript_SleepTalkTutor", "flag": "0" } ], diff --git a/data/maps/FortreeCity_Mart/scripts.inc b/data/maps/FortreeCity_Mart/scripts.inc index 8d2f9b568..30caaeff3 100644 --- a/data/maps/FortreeCity_Mart/scripts.inc +++ b/data/maps/FortreeCity_Mart/scripts.inc @@ -4,10 +4,10 @@ FortreeCity_Mart_MapScripts:: @ 8217665 FortreeCity_Mart_EventScript_217666:: @ 8217666 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart FortreeCity_Mart_Pokemart_217680 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc index 0c62f97e2..fa88bd752 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8 map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, FortreeCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 FortreeCity_PokemonCenter_1F_OnTransition: @ 82173E3 @@ -9,7 +9,7 @@ FortreeCity_PokemonCenter_1F_OnTransition: @ 82173E3 FortreeCity_PokemonCenter_1F_EventScript_2173E7:: @ 82173E7 setvar VAR_0x800B, 1 - call FortreeCity_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json index 79bdfad30..42aca8164 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FortreeCity_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc index 2ab9510f3..183dbece0 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E - map_script MAP_SCRIPT_ON_FRAME_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, FortreeCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -FortreeCity_PokemonCenter_2F_EventScript_217653:: @ 8217653 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +FortreeCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8217653 + call CableClub_EventScript_Colosseum end -FortreeCity_PokemonCenter_2F_EventScript_217659:: @ 8217659 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +FortreeCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8217659 + call CableClub_EventScript_TradeCenter end -FortreeCity_PokemonCenter_2F_EventScript_21765F:: @ 821765F - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +FortreeCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 821765F + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/GraniteCave_B1F/scripts.inc b/data/maps/GraniteCave_B1F/scripts.inc index 099e5a501..f465b0694 100644 --- a/data/maps/GraniteCave_B1F/scripts.inc +++ b/data/maps/GraniteCave_B1F/scripts.inc @@ -1,11 +1,11 @@ GraniteCave_B1F_MapScripts:: @ 822DC5E - map_script MAP_SCRIPT_ON_FRAME_TABLE, GraniteCave_B1F_MapScript2_2A8327 - map_script MAP_SCRIPT_ON_TRANSITION, GraniteCave_B1F_MapScript1_2A8331 - map_script MAP_SCRIPT_ON_RESUME, GraniteCave_B1F_MapScript1_22DC6E + map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole + map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround + map_script MAP_SCRIPT_ON_RESUME, GraniteCave_B1F_SetHoleWarp .byte 0 -GraniteCave_B1F_MapScript1_22DC6E: @ 822DC6E - setstepcallback 7 +GraniteCave_B1F_SetHoleWarp: @ 822DC6E + setstepcallback STEP_CB_CRACKED_FLOOR setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0 end diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index d29ee13f2..333f97a66 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -5,8 +5,8 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B lock faceplayer msgbox GraniteCave_StevensRoom_Text_22DD5A, MSGBOX_DEFAULT - setvar VAR_0x8004, 274 - call GraniteCave_StevensRoom_EventScript_2723E4 + setvar VAR_0x8004, ITEM_LETTER + call Common_EventScript_PlayerHandedOverTheItem setflag FLAG_DELIVERED_STEVEN_LETTER msgbox GraniteCave_StevensRoom_Text_22DDBD, MSGBOX_DEFAULT giveitem_std ITEM_TM47 @@ -23,13 +23,13 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B setflag FLAG_REGISTERED_STEVEN_POKENAV msgbox GraniteCave_StevensRoom_Text_22DF8C, MSGBOX_DEFAULT closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq GraniteCave_StevensRoom_EventScript_22DD0D - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if_eq GraniteCave_StevensRoom_EventScript_22DD2A - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if_eq GraniteCave_StevensRoom_EventScript_22DD18 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq GraniteCave_StevensRoom_EventScript_22DD18 playse SE_KAIDAN removeobject 1 diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index 043c8a8d8..9573fe745 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -10,7 +10,7 @@ InsideOfTruck_MapScript1_23BEE5: @ 823BEE5 end InsideOfTruck_MapScript1_23BF01: @ 823BF01 - setstepcallback 5 + setstepcallback STEP_CB_TRUCK end InsideOfTruck_EventScript_23BF04:: @ 823BF04 diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json index 27876f5e5..dbecdf4ed 100644 --- a/data/maps/IslandCave/map.json +++ b/data/maps/IslandCave/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "IslandCave_EventScript_238F58", + "script": "IslandCave_EventScript_Regice", "flag": "FLAG_HIDE_REGICE" } ], @@ -59,7 +59,7 @@ "y": 20, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "IslandCave_EventScript_238EEF" + "script": "IslandCave_EventScript_CaveEntranceMiddle" }, { "type": "sign", @@ -67,7 +67,7 @@ "y": 20, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "IslandCave_EventScript_238F1D" + "script": "IslandCave_EventScript_CaveEntranceSide" }, { "type": "sign", @@ -75,7 +75,7 @@ "y": 20, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "IslandCave_EventScript_238F1D" + "script": "IslandCave_EventScript_CaveEntranceSide" } ] }
\ No newline at end of file diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index 911e882f2..8587e62c2 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -1,25 +1,25 @@ IslandCave_MapScripts:: @ 8238E2A - map_script MAP_SCRIPT_ON_RESUME, IslandCave_MapScript1_238E3A - map_script MAP_SCRIPT_ON_LOAD, IslandCave_MapScript1_238E58 + map_script MAP_SCRIPT_ON_RESUME, IslandCave_OnResume + map_script MAP_SCRIPT_ON_LOAD, IslandCave_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, IslandCave_OnTransition .byte 0 -IslandCave_MapScript1_238E3A: @ 8238E3A - call_if_set FLAG_SYS_CTRL_OBJ_DELETE, IslandCave_EventScript_238E44 +IslandCave_OnResume: @ 8238E3A + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, IslandCave_EventScript_TryRemoveRegice end -IslandCave_EventScript_238E44:: @ 8238E44 +IslandCave_EventScript_TryRemoveRegice:: @ 8238E44 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return -IslandCave_MapScript1_238E58: @ 8238E58 - call_if_unset FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_238E62 +IslandCave_OnLoad: @ 8238E58 + call_if_unset FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_HideRegiEntrance end -IslandCave_EventScript_238E62:: @ 8238E62 +IslandCave_EventScript_HideRegiEntrance:: @ 8238E62 setmetatile 7, 19, METATILE_Cave_EntranceCover, 1 setmetatile 8, 19, METATILE_Cave_EntranceCover, 1 setmetatile 9, 19, METATILE_Cave_EntranceCover, 1 @@ -30,15 +30,15 @@ IslandCave_EventScript_238E62:: @ 8238E62 IslandCave_OnTransition: @ 8238E99 setflag FLAG_LANDMARK_ISLAND_CAVE - call IslandCave_EventScript_238F45 - call_if_unset FLAG_DEFEATED_REGICE, IslandCave_EventScript_238EAB + call IslandCave_EventScript_ClearSteps + call_if_unset FLAG_DEFEATED_REGICE, IslandCave_EventScript_ShowRegice end -IslandCave_EventScript_238EAB:: @ 8238EAB +IslandCave_EventScript_ShowRegice:: @ 8238EAB clearflag FLAG_HIDE_REGICE return -IslandCave_EventScript_238EAF:: @ 8238EAF +IslandCave_EventScript_OpenRegiEntrance:: @ 8238EAF setmetatile 7, 19, METATILE_Cave_SealedChamberEntrance_TopLeft, 1 setmetatile 8, 19, METATILE_Cave_SealedChamberEntrance_TopMid, 1 setmetatile 9, 19, METATILE_Cave_SealedChamberEntrance_TopRight, 1 @@ -50,45 +50,45 @@ IslandCave_EventScript_238EAF:: @ 8238EAF setflag FLAG_SYS_BRAILLE_REGICE_COMPLETED end -IslandCave_EventScript_238EEF:: @ 8238EEF +IslandCave_EventScript_CaveEntranceMiddle:: @ 8238EEF lockall - call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45 - goto_if_set FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_238F13 - braillemessage IslandCave_Braille_2A6CD4 + call_if_set FLAG_TEMP_3, IslandCave_EventScript_ClearSteps + goto_if_set FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_BigHoleInWall + braillemessage IslandCave_Braille_RunLapAroundWall setflag FLAG_TEMP_2 special ShouldDoBrailleRegicePuzzle - goto IslandCave_EventScript_238F41 + goto IslandCave_EventScript_CloseBrailleMsg end -IslandCave_EventScript_238F13:: @ 8238F13 - msgbox gUnknown_0827304E, MSGBOX_DEFAULT +IslandCave_EventScript_BigHoleInWall:: @ 8238F13 + msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT releaseall end -IslandCave_EventScript_238F1D:: @ 8238F1D +IslandCave_EventScript_CaveEntranceSide:: @ 8238F1D lockall - call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45 - braillemessage IslandCave_Braille_2A6CD4 - goto_if_set FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_238F41 + call_if_set FLAG_TEMP_3, IslandCave_EventScript_ClearSteps + braillemessage IslandCave_Braille_RunLapAroundWall + goto_if_set FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_CloseBrailleMsg setflag FLAG_TEMP_2 special ShouldDoBrailleRegicePuzzle - goto IslandCave_EventScript_238F41 + goto IslandCave_EventScript_CloseBrailleMsg end -IslandCave_EventScript_238F41:: @ 8238F41 +IslandCave_EventScript_CloseBrailleMsg:: @ 8238F41 waitbuttonpress - hidebox2 + closebraillemessage releaseall end -IslandCave_EventScript_238F45:: @ 8238F45 +IslandCave_EventScript_ClearSteps:: @ 8238F45 setvar VAR_REGICE_STEPS_1, 0 setvar VAR_REGICE_STEPS_2, 0 setvar VAR_REGICE_STEPS_3, 0 clearflag FLAG_TEMP_3 return -IslandCave_EventScript_238F58:: @ 8238F58 +IslandCave_EventScript_Regice:: @ 8238F58 lock faceplayer waitse @@ -101,22 +101,22 @@ IslandCave_EventScript_238F58:: @ 8238F58 waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 - goto_if_eq IslandCave_EventScript_238F9F - compare VAR_RESULT, 4 - goto_if_eq IslandCave_EventScript_238FA8 - compare VAR_RESULT, 5 - goto_if_eq IslandCave_EventScript_238FA8 + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq IslandCave_EventScript_DefeatedRegice + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq IslandCave_EventScript_RanFromRegice + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq IslandCave_EventScript_RanFromRegice setflag FLAG_DEFEATED_REGICE release end -IslandCave_EventScript_238F9F:: @ 8238F9F +IslandCave_EventScript_DefeatedRegice:: @ 8238F9F setflag FLAG_DEFEATED_REGICE - goto IslandCave_EventScript_27376D + goto Common_EventScript_RemoveStaticPokemon end -IslandCave_EventScript_238FA8:: @ 8238FA8 - setvar VAR_0x8004, 402 - goto IslandCave_EventScript_273776 +IslandCave_EventScript_RanFromRegice:: @ 8238FA8 + setvar VAR_0x8004, SPECIES_REGICE + goto Common_EventScript_LegendaryFlewAway end diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index e695c826c..ea13d94c2 100644 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "JaggedPass_EventScript_230785", + "script": "JaggedPass_EventScript_Eric", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "JaggedPass_EventScript_2307FB", + "script": "JaggedPass_EventScript_Ethan", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "JaggedPass_EventScript_23079C", + "script": "JaggedPass_EventScript_Diana", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "JaggedPass_EventScript_230718", + "script": "JaggedPass_EventScript_MagmaHideoutGuard", "flag": "FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "JaggedPass_EventScript_230871", + "script": "JaggedPass_EventScript_Autumn", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "JaggedPass_EventScript_23085A", + "script": "JaggedPass_EventScript_Julio", "flag": "0" } ], @@ -186,7 +186,7 @@ "elevation": 3, "var": "VAR_JAGGED_PASS_STATE", "var_value": "1", - "script": "JaggedPass_EventScript_2306BB" + "script": "JaggedPass_EventScript_OpenMagmaHideout" }, { "type": "trigger", @@ -195,7 +195,7 @@ "elevation": 3, "var": "VAR_JAGGED_PASS_STATE", "var_value": "1", - "script": "JaggedPass_EventScript_2306BB" + "script": "JaggedPass_EventScript_OpenMagmaHideout" }, { "type": "trigger", @@ -204,7 +204,7 @@ "elevation": 3, "var": "VAR_JAGGED_PASS_STATE", "var_value": "1", - "script": "JaggedPass_EventScript_2306BB" + "script": "JaggedPass_EventScript_OpenMagmaHideout" }, { "type": "trigger", @@ -213,7 +213,7 @@ "elevation": 3, "var": "VAR_JAGGED_PASS_STATE", "var_value": "1", - "script": "JaggedPass_EventScript_2306BB" + "script": "JaggedPass_EventScript_OpenMagmaHideout" }, { "type": "trigger", @@ -222,7 +222,7 @@ "elevation": 3, "var": "VAR_JAGGED_PASS_STATE", "var_value": "1", - "script": "JaggedPass_EventScript_2306BB" + "script": "JaggedPass_EventScript_OpenMagmaHideout" } ], "bg_events": [ diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 1bb9e82a2..d0a032ab2 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -1,60 +1,60 @@ JaggedPass_MapScripts:: @ 8230656 - map_script MAP_SCRIPT_ON_RESUME, JaggedPass_MapScript1_230666 + map_script MAP_SCRIPT_ON_RESUME, JaggedPass_OnResume map_script MAP_SCRIPT_ON_TRANSITION, JaggedPass_OnTransition - map_script MAP_SCRIPT_ON_LOAD, JaggedPass_MapScript1_23069C + map_script MAP_SCRIPT_ON_LOAD, JaggedPass_OnLoad .byte 0 -JaggedPass_MapScript1_230666: @ 8230666 - setstepcallback 1 +JaggedPass_OnResume: @ 8230666 + setstepcallback STEP_CB_ASH compare VAR_JAGGED_PASS_STATE, 0 - call_if_eq JaggedPass_EventScript_230674 + call_if_eq JaggedPass_EventScript_CheckHasMagmaEmblem end -JaggedPass_EventScript_230674:: @ 8230674 +JaggedPass_EventScript_CheckHasMagmaEmblem:: @ 8230674 checkitem ITEM_MAGMA_EMBLEM, 1 compare VAR_RESULT, 1 - goto_if_eq JaggedPass_EventScript_230685 + goto_if_eq JaggedPass_EventScript_SetReadyToOpenHideout return -JaggedPass_EventScript_230685:: @ 8230685 +JaggedPass_EventScript_SetReadyToOpenHideout:: @ 8230685 setvar VAR_JAGGED_PASS_STATE, 1 return JaggedPass_OnTransition: @ 823068B compare VAR_JAGGED_PASS_ASH_WEATHER, 1 - call_if_eq JaggedPass_EventScript_230697 + call_if_eq JaggedPass_EventScript_SetWeatherAsh end -JaggedPass_EventScript_230697:: @ 8230697 +JaggedPass_EventScript_SetWeatherAsh:: @ 8230697 setweather WEATHER_ASH doweather return -JaggedPass_MapScript1_23069C: @ 823069C +JaggedPass_OnLoad: @ 823069C compare VAR_JAGGED_PASS_STATE, 1 - goto_if_le JaggedPass_EventScript_2306A8 + goto_if_le JaggedPass_EventScript_ConcealHideoutEntrance end -JaggedPass_EventScript_2306A8:: @ 82306A8 +JaggedPass_EventScript_ConcealHideoutEntrance:: @ 82306A8 setmetatile 16, 17, METATILE_Lavaridge_RockWall, 1 setmetatile 16, 18, METATILE_Lavaridge_RockWall, 1 end -JaggedPass_EventScript_2306BB:: @ 82306BB +JaggedPass_EventScript_OpenMagmaHideout:: @ 82306BB lockall - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 + setvar VAR_0x8004, 1 @ vertical pan + setvar VAR_0x8005, 1 @ horizontal pan + setvar VAR_0x8006, 8 @ num shakes + setvar VAR_0x8007, 5 @ shake delay + special ShakeCamera waitstate - msgbox JaggedPass_Text_230DBA, MSGBOX_DEFAULT + msgbox JaggedPass_Text_BoulderShakingInResponseToEmblem, MSGBOX_DEFAULT closemessage - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 16 - setvar VAR_0x8007, 3 - special sub_8139560 + setvar VAR_0x8004, 1 @ vertical pan + setvar VAR_0x8005, 1 @ horizontal pan + setvar VAR_0x8006, 16 @ num shakes + setvar VAR_0x8007, 3 @ shake delay + special ShakeCamera waitstate playse SE_KOUKA_M setmetatile 16, 17, METATILE_Lavaridge_CaveEntrance_Top, 1 @@ -66,9 +66,9 @@ JaggedPass_EventScript_2306BB:: @ 82306BB releaseall end -JaggedPass_EventScript_230718:: @ 8230718 +JaggedPass_EventScript_MagmaHideoutGuard:: @ 8230718 lockall - goto_if_set FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS, JaggedPass_EventScript_230766 + goto_if_set FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS, JaggedPass_EventScript_GuardDefeated waitse playse SE_PIN applymovement 5, Common_Movement_ExclamationMark @@ -77,196 +77,196 @@ JaggedPass_EventScript_230718:: @ 8230718 waitmovement 0 applymovement 5, Common_Movement_FacePlayer waitmovement 0 - msgbox JaggedPass_Text_230CCB, MSGBOX_DEFAULT + msgbox JaggedPass_Text_Grunt30Intro, MSGBOX_DEFAULT closemessage - trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_230D2D + trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_Grunt30Defeat setflag FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end -JaggedPass_EventScript_230766:: @ 8230766 +JaggedPass_EventScript_GuardDefeated:: @ 8230766 applymovement 5, Common_Movement_FacePlayer waitmovement 0 - msgbox JaggedPass_Text_230D65, MSGBOX_DEFAULT + msgbox JaggedPass_Text_GoWhereverYouWant, MSGBOX_DEFAULT closemessage applymovement 5, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end -JaggedPass_EventScript_230785:: @ 8230785 - trainerbattle_single TRAINER_ERIC, JaggedPass_Text_230888, JaggedPass_Text_2308FF - msgbox JaggedPass_Text_230916, MSGBOX_AUTOCLOSE +JaggedPass_EventScript_Eric:: @ 8230785 + trainerbattle_single TRAINER_ERIC, JaggedPass_Text_EricIntro, JaggedPass_Text_EricDefeat + msgbox JaggedPass_Text_EricPostBattle, MSGBOX_AUTOCLOSE end -JaggedPass_EventScript_23079C:: @ 823079C - trainerbattle_single TRAINER_DIANA_1, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8 +JaggedPass_EventScript_Diana:: @ 823079C + trainerbattle_single TRAINER_DIANA_1, JaggedPass_Text_DianaIntro, JaggedPass_Text_DianaDefeat, JaggedPass_EventScript_RegisterDiana specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if_eq JaggedPass_EventScript_2307E4 - msgbox JaggedPass_Text_2309D8, MSGBOX_DEFAULT + goto_if_eq JaggedPass_EventScript_DianaRematch + msgbox JaggedPass_Text_DianaPostBattle, MSGBOX_DEFAULT release end -JaggedPass_EventScript_2307C8:: @ 82307C8 - special sub_80B4808 - msgbox JaggedPass_Text_230A2C, MSGBOX_DEFAULT +JaggedPass_EventScript_RegisterDiana:: @ 82307C8 + special PlayerFaceTrainerAfterBattle + msgbox JaggedPass_Text_DianaRegister, MSGBOX_DEFAULT register_matchcall TRAINER_DIANA_1 release end -JaggedPass_EventScript_2307E4:: @ 82307E4 - trainerbattle_rematch TRAINER_DIANA_1, JaggedPass_Text_230A76, JaggedPass_Text_230AAA - msgbox JaggedPass_Text_230AD7, MSGBOX_AUTOCLOSE +JaggedPass_EventScript_DianaRematch:: @ 82307E4 + trainerbattle_rematch TRAINER_DIANA_1, JaggedPass_Text_DianaRematchIntro, JaggedPass_Text_DianaRematchDefeat + msgbox JaggedPass_Text_DianaPostRematch, MSGBOX_AUTOCLOSE end -JaggedPass_EventScript_2307FB:: @ 82307FB - trainerbattle_single TRAINER_ETHAN_1, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827 +JaggedPass_EventScript_Ethan:: @ 82307FB + trainerbattle_single TRAINER_ETHAN_1, JaggedPass_Text_EthanIntro, JaggedPass_Text_EthanDefeat, JaggedPass_EventScript_RegisterEthan specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if_eq JaggedPass_EventScript_230843 - msgbox JaggedPass_Text_230B93, MSGBOX_DEFAULT + goto_if_eq JaggedPass_EventScript_EthanRematch + msgbox JaggedPass_Text_EthanPostBattle, MSGBOX_DEFAULT release end -JaggedPass_EventScript_230827:: @ 8230827 - special sub_80B4808 - msgbox JaggedPass_Text_230BC6, MSGBOX_DEFAULT +JaggedPass_EventScript_RegisterEthan:: @ 8230827 + special PlayerFaceTrainerAfterBattle + msgbox JaggedPass_Text_EthanRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ETHAN_1 release end -JaggedPass_EventScript_230843:: @ 8230843 - trainerbattle_rematch TRAINER_ETHAN_1, JaggedPass_Text_230C28, JaggedPass_Text_230C60 - msgbox JaggedPass_Text_230C94, MSGBOX_AUTOCLOSE +JaggedPass_EventScript_EthanRematch:: @ 8230843 + trainerbattle_rematch TRAINER_ETHAN_1, JaggedPass_Text_EthanRematchIntro, JaggedPass_Text_EthanRematchDefeat + msgbox JaggedPass_Text_EthanPostRematch, MSGBOX_AUTOCLOSE end -JaggedPass_EventScript_23085A:: @ 823085A - trainerbattle_single TRAINER_JULIO, JaggedPass_Text_230DF7, JaggedPass_Text_230E38 - msgbox JaggedPass_Text_230E57, MSGBOX_AUTOCLOSE +JaggedPass_EventScript_Julio:: @ 823085A + trainerbattle_single TRAINER_JULIO, JaggedPass_Text_JulioIntro, JaggedPass_Text_JulioDefeat + msgbox JaggedPass_Text_JulioPostBattle, MSGBOX_AUTOCLOSE end -JaggedPass_EventScript_230871:: @ 8230871 - trainerbattle_single TRAINER_AUTUMN, JaggedPass_Text_230E8E, JaggedPass_Text_230ECD - msgbox JaggedPass_Text_230EE3, MSGBOX_AUTOCLOSE +JaggedPass_EventScript_Autumn:: @ 8230871 + trainerbattle_single TRAINER_AUTUMN, JaggedPass_Text_AutumnIntro, JaggedPass_Text_AutumnDefeat + msgbox JaggedPass_Text_AutumnPostBattle, MSGBOX_AUTOCLOSE end -JaggedPass_Text_230888: @ 8230888 +JaggedPass_Text_EricIntro: @ 8230888 .string "MT. CHIMNEY's JAGGED PASS…\p" .string "Now this is what I've always wanted\n" .string "in a mountain.\p" .string "This jagged bumpiness…\n" .string "It rocks my soul!$" -JaggedPass_Text_2308FF: @ 82308FF +JaggedPass_Text_EricDefeat: @ 82308FF .string "Losing left me bitter!$" -JaggedPass_Text_230916: @ 8230916 +JaggedPass_Text_EricPostBattle: @ 8230916 .string "Yes, I did lose at POKéMON…\p" .string "But, when it comes to the love of\n" .string "the mountains, I have you beat!$" -JaggedPass_Text_230974: @ 8230974 +JaggedPass_Text_DianaIntro: @ 8230974 .string "This place isn't your casual hike.\n" .string "It's not suited for a picnic.$" -JaggedPass_Text_2309B5: @ 82309B5 +JaggedPass_Text_DianaDefeat: @ 82309B5 .string "Ohhh, no!\n" .string "The ground is too bumpy…$" -JaggedPass_Text_2309D8: @ 82309D8 +JaggedPass_Text_DianaPostBattle: @ 82309D8 .string "Did you know?\p" .string "Some people cleverly ride their\n" .string "bicycles up this horribly bumpy pass.$" -JaggedPass_Text_230A2C: @ 8230A2C +JaggedPass_Text_DianaRegister: @ 8230A2C .string "Will you ever be back in this area?\n" .string "If you do return, I'd like a rematch.$" -JaggedPass_Text_230A76: @ 8230A76 +JaggedPass_Text_DianaRematchIntro: @ 8230A76 .string "Picnics are fun wherever you go.\n" .string "Just like POKéMON!$" -JaggedPass_Text_230AAA: @ 8230AAA +JaggedPass_Text_DianaRematchDefeat: @ 8230AAA .string "I only lost because the ground is\n" .string "too bumpy!$" -JaggedPass_Text_230AD7: @ 8230AD7 +JaggedPass_Text_DianaPostRematch: @ 8230AD7 .string "I'll forget about losing and just\n" .string "enjoy this bumpy hike.$" -JaggedPass_Text_230B10: @ 8230B10 +JaggedPass_Text_EthanIntro: @ 8230B10 .string "JAGGED PASS is hard to walk on.\n" .string "It's a good place for training.$" -JaggedPass_Text_230B50: @ 8230B50 +JaggedPass_Text_EthanDefeat: @ 8230B50 .string "It was all over while we were still\n" .string "trying to find a good footing…$" -JaggedPass_Text_230B93: @ 8230B93 +JaggedPass_Text_EthanPostBattle: @ 8230B93 .string "If I had an ACRO BIKE, I'd be able to\n" .string "jump ledges.$" -JaggedPass_Text_230BC6: @ 8230BC6 +JaggedPass_Text_EthanRegister: @ 8230BC6 .string "When I get more used to this bumpiness,\n" .string "I'll be sure to win!\p" .string "Can you register me in your POKéNAV?$" -JaggedPass_Text_230C28: @ 8230C28 +JaggedPass_Text_EthanRematchIntro: @ 8230C28 .string "I got used to this bumpiness.\n" .string "I sing while I climb now.$" -JaggedPass_Text_230C60: @ 8230C60 +JaggedPass_Text_EthanRematchDefeat: @ 8230C60 .string "It's still not easy to battle on this\n" .string "bumpy ground…$" -JaggedPass_Text_230C94: @ 8230C94 +JaggedPass_Text_EthanPostRematch: @ 8230C94 .string "I should get an ACRO BIKE from RYDEL\n" .string "in MAUVILLE CITY…$" -JaggedPass_Text_230CCB: @ 8230CCB +JaggedPass_Text_Grunt30Intro: @ 8230CCB .string "Wah!\n" .string "What are you doing here?\p" .string "What am I doing in a place like this?\p" .string "What business is it of yours?$" -JaggedPass_Text_230D2D: @ 8230D2D +JaggedPass_Text_Grunt30Defeat: @ 8230D2D .string "Urrrgh…\p" .string "I should've ducked into our HIDEOUT\n" .string "right away…$" -JaggedPass_Text_230D65: @ 8230D65 +JaggedPass_Text_GoWhereverYouWant: @ 8230D65 .string "Okay, oh-kay!\n" .string "I admit it--you're strong!\p" .string "Don't worry about me.\n" .string "Go wherever you want!$" -JaggedPass_Text_230DBA: @ 8230DBA +JaggedPass_Text_BoulderShakingInResponseToEmblem: @ 8230DBA .string "Oh! This boulder is shaking in response\n" .string "to the MAGMA EMBLEM!$" -JaggedPass_Text_230DF7: @ 8230DF7 +JaggedPass_Text_JulioIntro: @ 8230DF7 .string "Aiyeeh! It's awfully scary to shoot\n" .string "down the mountain in one go!$" -JaggedPass_Text_230E38: @ 8230E38 +JaggedPass_Text_JulioDefeat: @ 8230E38 .string "I feel like I'm falling apart…$" -JaggedPass_Text_230E57: @ 8230E57 +JaggedPass_Text_JulioPostBattle: @ 8230E57 .string "My bicycle bounced around so much,\n" .string "my rear end's sore…$" -JaggedPass_Text_230E8E: @ 8230E8E +JaggedPass_Text_AutumnIntro: @ 8230E8E .string "I climb this hill every day.\n" .string "I have confidence in my strength!$" -JaggedPass_Text_230ECD: @ 8230ECD +JaggedPass_Text_AutumnDefeat: @ 8230ECD .string "Hmm…\n" .string "What went wrong?$" -JaggedPass_Text_230EE3: @ 8230EE3 +JaggedPass_Text_AutumnPostBattle: @ 8230EE3 .string "What is that odd rock protrusion\n" .string "a little up the hill from here?$" diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index de1a2bcee..a964d42e5 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -7,8 +7,8 @@ LavaridgeTown_OnTransition: @ 81EA4DE setflag FLAG_VISITED_LAVARIDGE_TOWN call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, LavaridgeTown_EventScript_1EA514 call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F - call Common_EventScript_SetupRivalGender - call Common_EventScript_SetupRivalOnBikeGender + call Common_EventScript_SetupRivalGfxId + call Common_EventScript_SetupRivalOnBikeGfxId compare VAR_LAVARIDGE_TOWN_STATE, 1 call_if_eq LavaridgeTown_EventScript_1EA518 compare VAR_LAVARIDGE_TOWN_STATE, 1 @@ -110,7 +110,7 @@ LavaridgeTown_EventScript_1EA635:: @ 81EA635 return LavaridgeTown_EventScript_1EA63A:: @ 81EA63A - applymovement 8, Common_Movement_WalkInPlaceUp + applymovement 8, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN applymovement 8, Common_Movement_ExclamationMark @@ -127,14 +127,14 @@ LavaridgeTown_EventScript_1EA65C:: @ 81EA65C waitmovement 0 closedoor 12, 15 waitdooranim - applymovement 8, Common_Movement_WalkInPlaceLeft + applymovement 8, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 playse SE_PIN applymovement 8, Common_Movement_ExclamationMark waitmovement 0 applymovement 8, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -216,7 +216,7 @@ LavaridgeTown_EventScript_1EA6FA:: @ 81EA6FA end LavaridgeTown_EventScript_1EA70B:: @ 81EA70B - incrementgamestat 49 + incrementgamestat GAME_STAT_ENTERED_HOT_SPRINGS end LavaridgeTown_EventScript_1EA70E:: @ 81EA70E @@ -248,10 +248,10 @@ LavaridgeTown_EventScript_1EA744:: @ 81EA744 faceplayer goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_1EA787 msgbox LavaridgeTown_Text_1EAB80, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LavaridgeTown_EventScript_1EA79B getpartysize - compare VAR_RESULT, 6 + compare VAR_RESULT, PARTY_SIZE goto_if_eq LavaridgeTown_EventScript_1EA791 msgbox LavaridgeTown_Text_1EACC0, MSGBOX_DEFAULT setflag FLAG_RECEIVED_LAVARIDGE_EGG diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json index aae6afc03..51665cdeb 100644 --- a/data/maps/LavaridgeTown_Gym_1F/map.json +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_Gym_1F_EventScript_1FE78C", + "script": "LavaridgeTown_Gym_1F_EventScript_Flannery", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "3", "trainer_sight_or_berry_tree_id": "1", - "script": "LavaridgeTown_Gym_1F_EventScript_1FE87F", + "script": "LavaridgeTown_Gym_1F_EventScript_Cole", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "3", "trainer_sight_or_berry_tree_id": "1", - "script": "LavaridgeTown_Gym_1F_EventScript_1FE900", + "script": "LavaridgeTown_Gym_1F_EventScript_Gerald", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "3", "trainer_sight_or_berry_tree_id": "1", - "script": "LavaridgeTown_Gym_1F_EventScript_1FE8AF", + "script": "LavaridgeTown_Gym_1F_EventScript_Axle", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "3", "trainer_sight_or_berry_tree_id": "1", - "script": "LavaridgeTown_Gym_1F_EventScript_1FE8E5", + "script": "LavaridgeTown_Gym_1F_EventScript_Danielle", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_Gym_1F_EventScript_1FE96C", + "script": "LavaridgeTown_Gym_1F_EventScript_GymGuide", "flag": "0" } ], @@ -285,7 +285,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_Gym_1F_EventScript_1FE98B" + "script": "LavaridgeTown_Gym_1F_EventScript_LeftGymStatue" }, { "type": "sign", @@ -293,7 +293,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "LavaridgeTown_Gym_1F_EventScript_1FE99B" + "script": "LavaridgeTown_Gym_1F_EventScript_RightGymStatue" } ] }
\ No newline at end of file diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 8eec8cf43..a5dcabf30 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -3,91 +3,84 @@ LavaridgeTown_Gym_1F_MapScripts:: @ 81FE6F4 .byte 0 LavaridgeTown_Gym_1F_OnTransition: @ 81FE6FA - call LavaridgeTown_Gym_1F_EventScript_1FE705 - call LavaridgeTown_Gym_1F_EventScript_1FE757 + call LavaridgeTown_Gym_1F_EventScript_SetTrainerTempVars + call LavaridgeTown_Gym_1F_EventScript_CheckHideTrainers end -LavaridgeTown_Gym_1F_EventScript_1FE705:: @ 81FE705 +@ Unclear where/if these temp vars are getting checked +LavaridgeTown_Gym_1F_EventScript_SetTrainerTempVars:: @ 81FE705 setvar VAR_TEMP_B, 0 setvar VAR_TEMP_C, 0 setvar VAR_TEMP_D, 0 setvar VAR_TEMP_E, 0 setvar VAR_TEMP_F, 0 checktrainerflag TRAINER_COLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE72C + goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetGeraldTempVar setvar VAR_TEMP_B, 1 - -LavaridgeTown_Gym_1F_EventScript_1FE72C:: @ 81FE72C +LavaridgeTown_Gym_1F_EventScript_SetGeraldTempVar:: @ 81FE72C checktrainerflag TRAINER_GERALD - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE73A + goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar setvar VAR_TEMP_C, 1 - -LavaridgeTown_Gym_1F_EventScript_1FE73A:: @ 81FE73A +LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar:: @ 81FE73A checktrainerflag TRAINER_AXLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE748 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetDanielleTempVar setvar VAR_TEMP_D, 1 - -LavaridgeTown_Gym_1F_EventScript_1FE748:: @ 81FE748 +LavaridgeTown_Gym_1F_EventScript_SetDanielleTempVar:: @ 81FE748 checktrainerflag TRAINER_DANIELLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE756 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars setvar VAR_TEMP_E, 1 - -LavaridgeTown_Gym_1F_EventScript_1FE756:: @ 81FE756 +LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars:: @ 81FE756 return -LavaridgeTown_Gym_1F_EventScript_1FE757:: @ 81FE757 +LavaridgeTown_Gym_1F_EventScript_CheckHideTrainers:: @ 81FE757 checktrainerflag TRAINER_COLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE764 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideGerald setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN - -LavaridgeTown_Gym_1F_EventScript_1FE764:: @ 81FE764 +LavaridgeTown_Gym_1F_EventScript_CheckHideGerald:: @ 81FE764 checktrainerflag TRAINER_GERALD - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE771 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideAxle setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN - -LavaridgeTown_Gym_1F_EventScript_1FE771:: @ 81FE771 +LavaridgeTown_Gym_1F_EventScript_CheckHideAxle:: @ 81FE771 checktrainerflag TRAINER_AXLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE77E + goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideDanielle setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN - -LavaridgeTown_Gym_1F_EventScript_1FE77E:: @ 81FE77E +LavaridgeTown_Gym_1F_EventScript_CheckHideDanielle:: @ 81FE77E checktrainerflag TRAINER_DANIELLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE78B + goto_if_eq LavaridgeTown_Gym_1F_EventScript_EndCheckHideTrainers setobjectmovementtype 5, MOVEMENT_TYPE_HIDDEN - -LavaridgeTown_Gym_1F_EventScript_1FE78B:: @ 81FE78B +LavaridgeTown_Gym_1F_EventScript_EndCheckHideTrainers:: @ 81FE78B return -LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C - trainerbattle_single TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_1FF0DC, LavaridgeTown_Gym_1F_Text_1FF233, LavaridgeTown_Gym_1F_EventScript_1FE7C1, NO_MUSIC +LavaridgeTown_Gym_1F_EventScript_Flannery:: @ 81FE78C + trainerbattle_single TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_FlanneryPreBattle, LavaridgeTown_Gym_1F_Text_FlanneryDefeat, LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE864 - goto_if_unset FLAG_RECEIVED_TM50, LavaridgeTown_Gym_1F_EventScript_1FE81D - msgbox LavaridgeTown_Gym_1F_Text_1FF546, MSGBOX_DEFAULT + goto_if_eq LavaridgeTown_Gym_1F_EventScript_FlanneryRematch + goto_if_unset FLAG_RECEIVED_TM50, LavaridgeTown_Gym_1F_EventScript_GiveOverheat2 + msgbox LavaridgeTown_Gym_1F_Text_FlanneryPostBattle, MSGBOX_DEFAULT release end -LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 - message LavaridgeTown_Gym_1F_Text_1FF32F +LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated:: @ 81FE7C1 + message LavaridgeTown_Gym_1F_Text_ReceivedHeatBadge waitmessage call Common_EventScript_PlayGymBadgeFanfare - msgbox LavaridgeTown_Gym_1F_Text_1FF359, MSGBOX_DEFAULT + msgbox LavaridgeTown_Gym_1F_Text_ExplainHeatBadgeTakeThis, MSGBOX_DEFAULT setflag FLAG_FLANNERY_GIVES_BADGE_INFO setflag FLAG_DEFEATED_LAVARIDGE_GYM setflag FLAG_BADGE04_GET addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 - call_if_eq LavaridgeTown_Gym_1F_EventScript_271E84 + call_if_eq Common_EventScript_ReadyPetalburgGymForBattle setvar VAR_0x8008, 4 - call LavaridgeTown_Gym_1F_EventScript_271F43 + call Common_EventScript_SetGymTrainers setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY setvar VAR_LAVARIDGE_TOWN_STATE, 1 - call LavaridgeTown_Gym_1F_EventScript_1FE841 + call LavaridgeTown_Gym_1F_EventScript_GiveOverheat closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox LavaridgeTown_Gym_1F_Text_1FF517, MSGBOX_DEFAULT + msgbox LavaridgeTown_Gym_1F_Text_RegisteredFlannery, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -95,113 +88,112 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 release end -LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D +LavaridgeTown_Gym_1F_EventScript_GiveOverheat2:: @ 81FE81D giveitem_std ITEM_TM50 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT + msgbox LavaridgeTown_Gym_1F_Text_ExplainOverheat, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM50 release end -LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841 +LavaridgeTown_Gym_1F_EventScript_GiveOverheat:: @ 81FE841 giveitem_std ITEM_TM50 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_BagIsFull - msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT + msgbox LavaridgeTown_Gym_1F_Text_ExplainOverheat, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM50 return -LavaridgeTown_Gym_1F_EventScript_1FE864:: @ 81FE864 - trainerbattle_rematch_double TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_1FF601, LavaridgeTown_Gym_1F_Text_1FF69F, LavaridgeTown_Gym_1F_Text_1FF75E - msgbox LavaridgeTown_Gym_1F_Text_1FF6BF, MSGBOX_AUTOCLOSE +LavaridgeTown_Gym_1F_EventScript_FlanneryRematch:: @ 81FE864 + trainerbattle_rematch_double TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_FlanneryPreRematch, LavaridgeTown_Gym_1F_Text_FlanneryRematchDefeat, LavaridgeTown_Gym_1F_Text_FlanneryRematchNeedTwoMons + msgbox LavaridgeTown_Gym_1F_Text_FlanneryPostRematch, MSGBOX_AUTOCLOSE end -LavaridgeTown_Gym_1F_EventScript_1FE87F:: @ 81FE87F - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_1FEADE, LavaridgeTown_Gym_1F_Text_1FEAFB, LavaridgeTown_Gym_1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_1F_Text_1FEB1C, MSGBOX_AUTOCLOSE +LavaridgeTown_Gym_1F_EventScript_Cole:: @ 81FE87F + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_ColePreBattle, LavaridgeTown_Gym_1F_Text_ColeDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript + msgbox LavaridgeTown_Gym_1F_Text_ColePostBattle MSGBOX_AUTOCLOSE end -LavaridgeTown_Gym_1F_EventScript_1FE89A:: @ 81FE89A -LavaridgeTown_Gym_B1F_EventScript_1FE89A:: @ 81FE89A - call LavaridgeTown_Gym_1F_EventScript_1FE705 +LavaridgeTown_Gym_EventScript_CheckTrainerScript:: @ 81FE89A + call LavaridgeTown_Gym_1F_EventScript_SetTrainerTempVars release special ShouldTryGetTrainerScript compare VAR_RESULT, 1 goto_if_eq EventScript_GotoTrainerScript end -LavaridgeTown_Gym_1F_EventScript_1FE8AF:: @ 81FE8AF - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1FEB7B, LavaridgeTown_Gym_1F_Text_1FEBC0, LavaridgeTown_Gym_1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_1F_Text_1FEBE1, MSGBOX_AUTOCLOSE +LavaridgeTown_Gym_1F_EventScript_Axle:: @ 81FE8AF + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_AxlePreBattle, LavaridgeTown_Gym_1F_Text_AxleDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript + msgbox LavaridgeTown_Gym_1F_Text_AxlePostBattle, MSGBOX_AUTOCLOSE end -LavaridgeTown_Gym_B1F_EventScript_1FE8CA:: @ 81FE8CA - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_KEEGAN, 2, LavaridgeTown_Gym_B1F_Text_1FEC31, LavaridgeTown_Gym_B1F_Text_1FECE3, LavaridgeTown_Gym_B1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_B1F_Text_1FED02, MSGBOX_AUTOCLOSE +LavaridgeTown_Gym_B1F_EventScript_Keegan:: @ 81FE8CA + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_KEEGAN, 2, LavaridgeTown_Gym_B1F_Text_KeeganPreBattle, LavaridgeTown_Gym_B1F_Text_KeeganDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript + msgbox LavaridgeTown_Gym_B1F_Text_KeeganPostBattle, MSGBOX_AUTOCLOSE end -LavaridgeTown_Gym_1F_EventScript_1FE8E5:: @ 81FE8E5 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_DANIELLE, 5, LavaridgeTown_Gym_1F_Text_1FEE22, LavaridgeTown_Gym_1F_Text_1FEE42, LavaridgeTown_Gym_1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_1F_Text_1FEE5D, MSGBOX_AUTOCLOSE +LavaridgeTown_Gym_1F_EventScript_Danielle:: @ 81FE8E5 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_DANIELLE, 5, LavaridgeTown_Gym_1F_Text_DaniellePreBattle, LavaridgeTown_Gym_1F_Text_DanielleDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript + msgbox LavaridgeTown_Gym_1F_Text_DaniellePostBattle, MSGBOX_AUTOCLOSE end -LavaridgeTown_Gym_1F_EventScript_1FE900:: @ 81FE900 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_GERALD, 3, LavaridgeTown_Gym_1F_Text_1FED72, LavaridgeTown_Gym_1F_Text_1FED9E, LavaridgeTown_Gym_1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_1F_Text_1FEDBB, MSGBOX_AUTOCLOSE +LavaridgeTown_Gym_1F_EventScript_Gerald:: @ 81FE900 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_GERALD, 3, LavaridgeTown_Gym_1F_Text_GeraldPreBattle, LavaridgeTown_Gym_1F_Text_GeraldDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript + msgbox LavaridgeTown_Gym_1F_Text_GeraldPostBattle, MSGBOX_AUTOCLOSE end -LavaridgeTown_Gym_B1F_EventScript_1FE91B:: @ 81FE91B - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JACE, 1, LavaridgeTown_Gym_B1F_Text_1FEE9D, LavaridgeTown_Gym_B1F_Text_1FEED5, LavaridgeTown_Gym_B1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_B1F_Text_1FEF07, MSGBOX_AUTOCLOSE +LavaridgeTown_Gym_B1F_EventScript_Jace:: @ 81FE91B + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JACE, 1, LavaridgeTown_Gym_B1F_Text_JacePreBattle, LavaridgeTown_Gym_B1F_Text_JaceDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript + msgbox LavaridgeTown_Gym_B1F_Text_JacePostBattle, MSGBOX_AUTOCLOSE end -LavaridgeTown_Gym_B1F_EventScript_1FE936:: @ 81FE936 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JEFF, 3, LavaridgeTown_Gym_B1F_Text_1FEF60, LavaridgeTown_Gym_B1F_Text_1FEFA7, LavaridgeTown_Gym_B1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_B1F_Text_1FEFC2, MSGBOX_AUTOCLOSE +LavaridgeTown_Gym_B1F_EventScript_Jeff:: @ 81FE936 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JEFF, 3, LavaridgeTown_Gym_B1F_Text_JeffPreBattle, LavaridgeTown_Gym_B1F_Text_JeffDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript + msgbox LavaridgeTown_Gym_B1F_Text_JeffPostBattle, MSGBOX_AUTOCLOSE end -LavaridgeTown_Gym_B1F_EventScript_1FE951:: @ 81FE951 - trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ELI, 4, LavaridgeTown_Gym_B1F_Text_1FF025, LavaridgeTown_Gym_B1F_Text_1FF05F, LavaridgeTown_Gym_B1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_B1F_Text_1FF09A, MSGBOX_AUTOCLOSE +LavaridgeTown_Gym_B1F_EventScript_Eli:: @ 81FE951 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ELI, 4, LavaridgeTown_Gym_B1F_Text_EliPreBattle, LavaridgeTown_Gym_B1F_Text_EliDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript + msgbox LavaridgeTown_Gym_B1F_Text_EliPostBattle, MSGBOX_AUTOCLOSE end -LavaridgeTown_Gym_1F_EventScript_1FE96C:: @ 81FE96C +LavaridgeTown_Gym_1F_EventScript_GymGuide:: @ 81FE96C lock faceplayer - goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, LavaridgeTown_Gym_1F_EventScript_1FE981 - msgbox LavaridgeTown_Gym_1F_Text_1FE9BF, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, LavaridgeTown_Gym_1F_EventScript_GymGuidePostVictory + msgbox LavaridgeTown_Gym_1F_Text_GymGuideAdvice, MSGBOX_DEFAULT release end -LavaridgeTown_Gym_1F_EventScript_1FE981:: @ 81FE981 - msgbox LavaridgeTown_Gym_1F_Text_1FEAB8, MSGBOX_DEFAULT +LavaridgeTown_Gym_1F_EventScript_GymGuidePostVictory:: @ 81FE981 + msgbox LavaridgeTown_Gym_1F_Text_GymGuidePostVictory, MSGBOX_DEFAULT release end -LavaridgeTown_Gym_1F_EventScript_1FE98B:: @ 81FE98B +LavaridgeTown_Gym_1F_EventScript_LeftGymStatue:: @ 81FE98B lockall - goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_1FE9AB - goto LavaridgeTown_Gym_1F_EventScript_1FE9B5 + goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_GymStatueCertified + goto LavaridgeTown_Gym_1F_EventScript_GymStatue end -LavaridgeTown_Gym_1F_EventScript_1FE99B:: @ 81FE99B +LavaridgeTown_Gym_1F_EventScript_RightGymStatue:: @ 81FE99B lockall - goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_1FE9AB - goto LavaridgeTown_Gym_1F_EventScript_1FE9B5 + goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_GymStatueCertified + goto LavaridgeTown_Gym_1F_EventScript_GymStatue end -LavaridgeTown_Gym_1F_EventScript_1FE9AB:: @ 81FE9AB - msgbox LavaridgeTown_Gym_1F_Text_1FF5C4, MSGBOX_DEFAULT +LavaridgeTown_Gym_1F_EventScript_GymStatueCertified:: @ 81FE9AB + msgbox LavaridgeTown_Gym_1F_Text_GymStatueCertified, MSGBOX_DEFAULT releaseall end -LavaridgeTown_Gym_1F_EventScript_1FE9B5:: @ 81FE9B5 - msgbox LavaridgeTown_Gym_1F_Text_1FF5A9, MSGBOX_DEFAULT +LavaridgeTown_Gym_1F_EventScript_GymStatue:: @ 81FE9B5 + msgbox LavaridgeTown_Gym_1F_Text_GymStatue, MSGBOX_DEFAULT releaseall end -LavaridgeTown_Gym_1F_Text_1FE9BF: @ 81FE9BF +LavaridgeTown_Gym_1F_Text_GymGuideAdvice: @ 81FE9BF .string "Hey, how's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" .string "LAVARIDGE's GYM LEADER FLANNERY\n" @@ -212,35 +204,35 @@ LavaridgeTown_Gym_1F_Text_1FE9BF: @ 81FE9BF .string "Hose her down with water and then\l" .string "go for it!$" -LavaridgeTown_Gym_1F_Text_1FEAB8: @ 81FEAB8 +LavaridgeTown_Gym_1F_Text_GymGuidePostVictory: @ 81FEAB8 .string "Yow! That was a scorching-hot battle!$" -LavaridgeTown_Gym_1F_Text_1FEADE: @ 81FEADE +LavaridgeTown_Gym_1F_Text_ColePreBattle: @ 81FEADE .string "Owowowowow!\n" .string "Yikes, it's hot!$" -LavaridgeTown_Gym_1F_Text_1FEAFB: @ 81FEAFB +LavaridgeTown_Gym_1F_Text_ColeDefeat: @ 81FEAFB .string "I'm blinded by sweat in my eyes…$" -LavaridgeTown_Gym_1F_Text_1FEB1C: @ 81FEB1C +LavaridgeTown_Gym_1F_Text_ColePostBattle: @ 81FEB1C .string "Being buried in hot sand promotes\n" .string "circulation.\p" .string "It's effective for healing pain in\n" .string "your joints.$" -LavaridgeTown_Gym_1F_Text_1FEB7B: @ 81FEB7B +LavaridgeTown_Gym_1F_Text_AxlePreBattle: @ 81FEB7B .string "I'm trying to relieve my stress.\n" .string "Don't come along and stress me out!$" -LavaridgeTown_Gym_1F_Text_1FEBC0: @ 81FEBC0 +LavaridgeTown_Gym_1F_Text_AxleDefeat: @ 81FEBC0 .string "I hope FLANNERY flames you good!$" -LavaridgeTown_Gym_1F_Text_1FEBE1: @ 81FEBE1 +LavaridgeTown_Gym_1F_Text_AxlePostBattle: @ 81FEBE1 .string "Haaah… Whew…\p" .string "If you spend too much time buried in\n" .string "hot sand, it tuckers you out…$" -LavaridgeTown_Gym_B1F_Text_1FEC31: @ 81FEC31 +LavaridgeTown_Gym_B1F_Text_KeeganPreBattle: @ 81FEC31 .string "You must be getting tired by now.\n" .string "You'd like to rest in the hot sand,\l" .string "wouldn't you?\p" @@ -248,78 +240,78 @@ LavaridgeTown_Gym_B1F_Text_1FEC31: @ 81FEC31 .string "your willpower is an important ability\l" .string "for all TRAINERS.$" -LavaridgeTown_Gym_B1F_Text_1FECE3: @ 81FECE3 +LavaridgeTown_Gym_B1F_Text_KeeganDefeat: @ 81FECE3 .string "Play with fire, and be burned…$" -LavaridgeTown_Gym_B1F_Text_1FED02: @ 81FED02 +LavaridgeTown_Gym_B1F_Text_KeeganPostBattle: @ 81FED02 .string "Your skill is real…\n" .string "But our LEADER FLANNERY is strong.\p" .string "If you don't watch yourself, you'll be\n" .string "burned seriously.$" -LavaridgeTown_Gym_1F_Text_1FED72: @ 81FED72 +LavaridgeTown_Gym_1F_Text_GeraldPreBattle: @ 81FED72 .string "Can your POKéMON withstand\n" .string "392-degree heat?$" -LavaridgeTown_Gym_1F_Text_1FED9E: @ 81FED9E +LavaridgeTown_Gym_1F_Text_GeraldDefeat: @ 81FED9E .string "It didn't burn hotly enough…$" -LavaridgeTown_Gym_1F_Text_1FEDBB: @ 81FEDBB +LavaridgeTown_Gym_1F_Text_GeraldPostBattle: @ 81FEDBB .string "The temperature of magma is\n" .string "392 degrees.\p" .string "Your POKéMON beat me, so they should\n" .string "easily survive in magma.$" -LavaridgeTown_Gym_1F_Text_1FEE22: @ 81FEE22 +LavaridgeTown_Gym_1F_Text_DaniellePreBattle: @ 81FEE22 .string "Um…\n" .string "Okay, I'll battle with you.$" -LavaridgeTown_Gym_1F_Text_1FEE42: @ 81FEE42 +LavaridgeTown_Gym_1F_Text_DanielleDefeat: @ 81FEE42 .string "Oh, but you're too strong.$" -LavaridgeTown_Gym_1F_Text_1FEE5D: @ 81FEE5D +LavaridgeTown_Gym_1F_Text_DaniellePostBattle: @ 81FEE5D .string "I'm going to be a pretty and strong\n" .string "TRAINER just like FLANNERY.$" -LavaridgeTown_Gym_B1F_Text_1FEE9D: @ 81FEE9D +LavaridgeTown_Gym_B1F_Text_JacePreBattle: @ 81FEE9D .string "Come on, get with it!\n" .string "Let's go before my feelings cool!$" -LavaridgeTown_Gym_B1F_Text_1FEED5: @ 81FEED5 +LavaridgeTown_Gym_B1F_Text_JaceDefeat: @ 81FEED5 .string "It's so hot, and yet my heart is\n" .string "clutched by ice…$" -LavaridgeTown_Gym_B1F_Text_1FEF07: @ 81FEF07 +LavaridgeTown_Gym_B1F_Text_JacePostBattle: @ 81FEF07 .string "The way the battling spirit burns\n" .string "within you, you may stand a chance\l" .string "against our LEADER.$" -LavaridgeTown_Gym_B1F_Text_1FEF60: @ 81FEF60 +LavaridgeTown_Gym_B1F_Text_JeffPreBattle: @ 81FEF60 .string "See how the flames blaze wildly?\n" .string "They flare in anticipation of my win!$" -LavaridgeTown_Gym_B1F_Text_1FEFA7: @ 81FEFA7 +LavaridgeTown_Gym_B1F_Text_JeffDefeat: @ 81FEFA7 .string "Something didn't go right.$" -LavaridgeTown_Gym_B1F_Text_1FEFC2: @ 81FEFC2 +LavaridgeTown_Gym_B1F_Text_JeffPostBattle: @ 81FEFC2 .string "Well, so what? I say so what?\n" .string "I can walk on hot coals barefoot!\p" .string "…Don't even think about trying it!$" -LavaridgeTown_Gym_B1F_Text_1FF025: @ 81FF025 +LavaridgeTown_Gym_B1F_Text_EliPreBattle: @ 81FF025 .string "As much as I love mountains,\n" .string "I especially love volcanoes.$" -LavaridgeTown_Gym_B1F_Text_1FF05F: @ 81FF05F +LavaridgeTown_Gym_B1F_Text_EliDefeat: @ 81FF05F .string "Well, it seems to me I lost without\n" .string "ever being in control.$" -LavaridgeTown_Gym_B1F_Text_1FF09A: @ 81FF09A +LavaridgeTown_Gym_B1F_Text_EliPostBattle: @ 81FF09A .string "I stay here because I became a fan\n" .string "of FLANNERY's power.\p" .string "Hehehehe.$" -LavaridgeTown_Gym_1F_Text_1FF0DC: @ 81FF0DC +LavaridgeTown_Gym_1F_Text_FlanneryPreBattle: @ 81FF0DC .string "Welcome… No, wait.\p" .string "Puny TRAINER, how good to see you've\n" .string "made it here!\p" @@ -334,7 +326,7 @@ LavaridgeTown_Gym_1F_Text_1FF0DC: @ 81FF0DC .string "father, I shall, uh…demonstrate the\l" .string "hot moves we have honed on this land!$" -LavaridgeTown_Gym_1F_Text_1FF233: @ 81FF233 +LavaridgeTown_Gym_1F_Text_FlanneryDefeat: @ 81FF233 .string "Oh…\n" .string "I guess I was trying too hard…\p" .string "I… I've only recently become\n" @@ -346,11 +338,11 @@ LavaridgeTown_Gym_1F_Text_1FF233: @ 81FF233 .string "Thanks for teaching me that.\n" .string "For that, you deserve this.$" -LavaridgeTown_Gym_1F_Text_1FF32F: @ 81FF32F +LavaridgeTown_Gym_1F_Text_ReceivedHeatBadge: @ 81FF32F .string "{PLAYER} received the HEAT BADGE\n" .string "from FLANNERY.$" -LavaridgeTown_Gym_1F_Text_1FF359: @ 81FF359 +LavaridgeTown_Gym_1F_Text_ExplainHeatBadgeTakeThis: @ 81FF359 .string "If you have a HEAT BADGE, all POKéMON\n" .string "up to Level 50, even those you get in\l" .string "trades from other people, will obey\l" @@ -360,7 +352,7 @@ LavaridgeTown_Gym_1F_Text_1FF359: @ 81FF359 .string "This is a token of my appreciation.\n" .string "Don't be shy about taking it!$" -LavaridgeTown_Gym_1F_Text_1FF45C: @ 81FF45C +LavaridgeTown_Gym_1F_Text_ExplainOverheat: @ 81FF45C .string "That TM50 contains OVERHEAT.\p" .string "That move inflicts serious damage on\n" .string "the opponent.\p" @@ -368,24 +360,24 @@ LavaridgeTown_Gym_1F_Text_1FF45C: @ 81FF45C .string "of the POKéMON using it. It might not\l" .string "be suitable for longer battles.$" -LavaridgeTown_Gym_1F_Text_1FF517: @ 81FF517 +LavaridgeTown_Gym_1F_Text_RegisteredFlannery: @ 81FF517 .string "Registered GYM LEADER FLANNERY\n" .string "in the POKéNAV.$" -LavaridgeTown_Gym_1F_Text_1FF546: @ 81FF546 +LavaridgeTown_Gym_1F_Text_FlanneryPostBattle: @ 81FF546 .string "Your power reminds me of someone…\p" .string "Oh! I know! You battle like NORMAN,\n" .string "the GYM LEADER of PETALBURG.$" -LavaridgeTown_Gym_1F_Text_1FF5A9: @ 81FF5A9 +LavaridgeTown_Gym_1F_Text_GymStatue: @ 81FF5A9 .string "LAVARIDGE TOWN POKéMON GYM$" -LavaridgeTown_Gym_1F_Text_1FF5C4: @ 81FF5C4 +LavaridgeTown_Gym_1F_Text_GymStatueCertified: @ 81FF5C4 .string "LAVARIDGE TOWN POKéMON GYM\p" .string "FLANNERY'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" -LavaridgeTown_Gym_1F_Text_1FF601: @ 81FF601 +LavaridgeTown_Gym_1F_Text_FlanneryPreRematch: @ 81FF601 .string "FLANNERY: Losing a battle isn't going\n" .string "to deflate me.\p" .string "I love POKéMON.\n" @@ -394,11 +386,11 @@ LavaridgeTown_Gym_1F_Text_1FF601: @ 81FF601 .string "Let's exchange superhot moves\n" .string "in another battle!$" -LavaridgeTown_Gym_1F_Text_1FF69F: @ 81FF69F +LavaridgeTown_Gym_1F_Text_FlanneryRematchDefeat: @ 81FF69F .string "Whew!\n" .string "On the verge of eruption!$" -LavaridgeTown_Gym_1F_Text_1FF6BF: @ 81FF6BF +LavaridgeTown_Gym_1F_Text_FlanneryPostRematch: @ 81FF6BF .string "FLANNERY: I lost the match,\n" .string "but I'm completely satisfied.\p" .string "It's not often I get to enjoy a battle\n" @@ -406,7 +398,7 @@ LavaridgeTown_Gym_1F_Text_1FF6BF: @ 81FF6BF .string "Let's have another one like this\n" .string "again sometime!$" -LavaridgeTown_Gym_1F_Text_1FF75E: @ 81FF75E +LavaridgeTown_Gym_1F_Text_FlanneryRematchNeedTwoMons: @ 81FF75E .string "FLANNERY: Losing a battle isn't going\n" .string "to deflate me.\p" .string "I love POKéMON.\n" diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.json b/data/maps/LavaridgeTown_Gym_B1F/map.json index 9679beb48..7b03d4f53 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/map.json +++ b/data/maps/LavaridgeTown_Gym_B1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "3", "trainer_sight_or_berry_tree_id": "1", - "script": "LavaridgeTown_Gym_B1F_EventScript_1FE91B", + "script": "LavaridgeTown_Gym_B1F_EventScript_Jace", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "3", "trainer_sight_or_berry_tree_id": "1", - "script": "LavaridgeTown_Gym_B1F_EventScript_1FE8CA", + "script": "LavaridgeTown_Gym_B1F_EventScript_Keegan", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "3", "trainer_sight_or_berry_tree_id": "1", - "script": "LavaridgeTown_Gym_B1F_EventScript_1FE936", + "script": "LavaridgeTown_Gym_B1F_EventScript_Jeff", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "3", "trainer_sight_or_berry_tree_id": "1", - "script": "LavaridgeTown_Gym_B1F_EventScript_1FE951", + "script": "LavaridgeTown_Gym_B1F_EventScript_Eli", "flag": "0" } ], diff --git a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc index 4f3bb062d..9be4e2975 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc @@ -3,57 +3,50 @@ LavaridgeTown_Gym_B1F_MapScripts:: @ 81FF87E .byte 0 LavaridgeTown_Gym_B1F_OnTransition: @ 81FF884 - call LavaridgeTown_Gym_B1F_EventScript_1FF88F - call LavaridgeTown_Gym_B1F_EventScript_1FF8DC + call LavaridgeTown_Gym_B1F_EventScript_SetTrainerTempVars + call LavaridgeTown_Gym_B1F_EventScript_CheckHideTrainers end -LavaridgeTown_Gym_B1F_EventScript_1FF88F:: @ 81FF88F +@ Unclear where/if these temp vars are getting checked +LavaridgeTown_Gym_B1F_EventScript_SetTrainerTempVars:: @ 81FF88F setvar VAR_TEMP_7, 0 setvar VAR_TEMP_8, 0 setvar VAR_TEMP_9, 0 setvar VAR_TEMP_A, 0 checktrainerflag TRAINER_KEEGAN - goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8B1 + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_SetJaceTempVar setvar VAR_TEMP_7, 1 - -LavaridgeTown_Gym_B1F_EventScript_1FF8B1:: @ 81FF8B1 +LavaridgeTown_Gym_B1F_EventScript_SetJaceTempVar:: @ 81FF8B1 checktrainerflag TRAINER_JACE - goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8BF + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_SetJeffTempVar setvar VAR_TEMP_8, 1 - -LavaridgeTown_Gym_B1F_EventScript_1FF8BF:: @ 81FF8BF +LavaridgeTown_Gym_B1F_EventScript_SetJeffTempVar:: @ 81FF8BF checktrainerflag TRAINER_JEFF - goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8CD + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_SetEliTempVar setvar VAR_TEMP_9, 1 - -LavaridgeTown_Gym_B1F_EventScript_1FF8CD:: @ 81FF8CD +LavaridgeTown_Gym_B1F_EventScript_SetEliTempVar:: @ 81FF8CD checktrainerflag TRAINER_ELI - goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8DB + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_EndSetTrainerTempVars setvar VAR_TEMP_A, 1 - -LavaridgeTown_Gym_B1F_EventScript_1FF8DB:: @ 81FF8DB +LavaridgeTown_Gym_B1F_EventScript_EndSetTrainerTempVars:: @ 81FF8DB return -LavaridgeTown_Gym_B1F_EventScript_1FF8DC:: @ 81FF8DC +LavaridgeTown_Gym_B1F_EventScript_CheckHideTrainers:: @ 81FF8DC checktrainerflag TRAINER_KEEGAN - goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8E9 + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_CheckHideJace setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN - -LavaridgeTown_Gym_B1F_EventScript_1FF8E9:: @ 81FF8E9 +LavaridgeTown_Gym_B1F_EventScript_CheckHideJace:: @ 81FF8E9 checktrainerflag TRAINER_JACE - goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8F6 + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_CheckHideJeff setobjectmovementtype 1, MOVEMENT_TYPE_HIDDEN - -LavaridgeTown_Gym_B1F_EventScript_1FF8F6:: @ 81FF8F6 +LavaridgeTown_Gym_B1F_EventScript_CheckHideJeff:: @ 81FF8F6 checktrainerflag TRAINER_JEFF - goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF903 + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_CheckHideEli setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN - -LavaridgeTown_Gym_B1F_EventScript_1FF903:: @ 81FF903 +LavaridgeTown_Gym_B1F_EventScript_CheckHideEli:: @ 81FF903 checktrainerflag TRAINER_ELI - goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF910 + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_EndCheckHideTrainers setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN - -LavaridgeTown_Gym_B1F_EventScript_1FF910:: @ 81FF910 +LavaridgeTown_Gym_B1F_EventScript_EndCheckHideTrainers:: @ 81FF910 return diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc index f6ad8e26b..c7ae5fb9e 100644 --- a/data/maps/LavaridgeTown_HerbShop/scripts.inc +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -7,7 +7,7 @@ LavaridgeTown_HerbShop_EventScript_1FE4D7:: @ 81FE4D7 message LavaridgeTown_HerbShop_Text_1FE53E waitmessage pokemart LavaridgeTown_HerbShop_Pokemart_1FE4F0 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json index a0cd74f59..83416a7c0 100644 --- a/data/maps/LavaridgeTown_House/map.json +++ b/data/maps/LavaridgeTown_House/map.json @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_House_EventScript_2C804E", + "script": "LavaridgeTown_House_EventScript_MimicTutor", "flag": "0" } ], diff --git a/data/maps/LavaridgeTown_Mart/scripts.inc b/data/maps/LavaridgeTown_Mart/scripts.inc index ff9772b1d..d1d2ec4d2 100644 --- a/data/maps/LavaridgeTown_Mart/scripts.inc +++ b/data/maps/LavaridgeTown_Mart/scripts.inc @@ -4,10 +4,10 @@ LavaridgeTown_Mart_MapScripts:: @ 81FF9CD LavaridgeTown_Mart_EventScript_1FF9CE:: @ 81FF9CE lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart LavaridgeTown_Mart_Pokemart_1FF9E8 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc index 4905a5bce..3a27182d5 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -1,16 +1,16 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, LavaridgeTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 LavaridgeTown_PokemonCenter_1F_OnTransition: @ 81FFB05 setrespawn HEAL_LOCATION_LAVARIDGE_TOWN - call LavaridgeTown_PokemonCenter_1F_EventScript_2718DE + call Common_EventScript_UpdateBrineyLocation end LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E:: @ 81FFB0E setvar VAR_0x800B, 1 - call LavaridgeTown_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json index 95d1e194f..2ee196f9b 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LavaridgeTown_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc index c8e52468f..633f91e95 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 81FFC97 - map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -LavaridgeTown_PokemonCenter_2F_EventScript_1FFCAC:: @ 81FFCAC - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +LavaridgeTown_PokemonCenter_2F_EventScript_Colosseum:: @ 81FFCAC + call CableClub_EventScript_Colosseum end -LavaridgeTown_PokemonCenter_2F_EventScript_1FFCB2:: @ 81FFCB2 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +LavaridgeTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 81FFCB2 + call CableClub_EventScript_TradeCenter end -LavaridgeTown_PokemonCenter_2F_EventScript_1FFCB8:: @ 81FFCB8 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +LavaridgeTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 81FFCB8 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 364b376bf..be8a7a521 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -8,7 +8,7 @@ LilycoveCity_OnTransition: @ 81E2B47 setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 - call Common_EventScript_SetupRivalGender + call Common_EventScript_SetupRivalGfxId end LilycoveCity_MapScript1_1E2B61: @ 81E2B61 @@ -241,7 +241,7 @@ LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8 playbgm MUS_GIRL_SUP, 1 call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2E48 call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2E51 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_EventScript_1E2E5A msgbox LilycoveCity_Text_1E3234, MSGBOX_DEFAULT switch VAR_STARTER_MON @@ -270,7 +270,7 @@ LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B playbgm MUS_BOY_SUP, 1 call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2EBB call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2EC4 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_EventScript_1E2ECD msgbox LilycoveCity_Text_1E373C, MSGBOX_DEFAULT switch VAR_STARTER_MON @@ -387,7 +387,7 @@ LilycoveCity_EventScript_1E2FFD:: @ 81E2FFD LilycoveCity_EventScript_1E3006:: @ 81E3006 closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 @@ -405,9 +405,9 @@ LilycoveCity_EventScript_1E302D:: @ 81E302D lock faceplayer msgbox LilycoveCity_Text_1E4774, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES call_if_eq LilycoveCity_EventScript_1E304F - compare VAR_RESULT, 0 + compare VAR_RESULT, NO call_if_eq LilycoveCity_EventScript_1E3058 release end diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 3a4753d8a..29162f3e0 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -9,7 +9,7 @@ LilycoveCity_ContestLobby_OnTransition: @ 821A21C end LilycoveCity_ContestLobby_EventScript_21A227:: @ 821A227 - getpricereduction 4 + getpricereduction POKENEWS_BLENDMASTER compare VAR_RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_21A23C clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT @@ -44,9 +44,9 @@ LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264 drawcontestwinner 0 lockall msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_21A2AA - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_ContestLobby_EventScript_21A2E4 releaseall end @@ -69,7 +69,7 @@ LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA LilycoveCity_ContestLobby_EventScript_21A2E4:: @ 821A2E4 msgbox LilycoveCity_ContestLobby_Text_21B0BC, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_21A2AA msgbox LilycoveCity_ContestLobby_Text_21B132, MSGBOX_DEFAULT closemessage @@ -81,7 +81,7 @@ LilycoveCity_ContestLobby_EventScript_21A2E4:: @ 821A2E4 end LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314 - incrementgamestat 42 + incrementgamestat GAME_STAT_RECEIVED_RIBBONS special sub_80F8390 applymovement 4, LilycoveCity_ContestLobby_Movement_21A41A waitmovement 0 @@ -217,9 +217,9 @@ LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436 fadescreen 1 drawcontestwinner 0 msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_21A47A - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_ContestLobby_EventScript_21A4B4 end @@ -241,7 +241,7 @@ LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A LilycoveCity_ContestLobby_EventScript_21A4B4:: @ 821A4B4 msgbox LilycoveCity_ContestLobby_Text_21B0BC, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_21A47A msgbox LilycoveCity_ContestLobby_Text_21B132, MSGBOX_DEFAULT closemessage @@ -253,7 +253,7 @@ LilycoveCity_ContestLobby_EventScript_21A4B4:: @ 821A4B4 end LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4 - incrementgamestat 42 + incrementgamestat GAME_STAT_RECEIVED_RIBBONS setflag FLAG_SYS_RIBBON_GET special sub_80F8390 applymovement 11, LilycoveCity_ContestLobby_Movement_21A547 @@ -640,7 +640,7 @@ LilycoveCity_ContestLobby_EventScript_21A819:: @ 821A819 LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856 msgbox LilycoveCity_ContestLobby_Text_27BD17, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F call Common_EventScript_SaveGame compare VAR_RESULT, 0 @@ -810,7 +810,7 @@ LilycoveCity_ContestLobby_EventScript_21AAE1:: @ 821AAE1 LilycoveCity_ContestLobby_EventScript_21AAEF:: @ 821AAEF special CloseLink - msgbox LilycoveCity_ContestLobby_Text_27821C, MSGBOX_DEFAULT + msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT release end @@ -908,12 +908,12 @@ LilycoveCity_ContestLobby_EventScript_21AC0B:: @ 821AC0B end LilycoveCity_ContestLobby_EventScript_21AC33:: @ 821AC33 - special BerryBlenderLinkBecomeLeader + special TryBecomeLinkLeader waitstate return LilycoveCity_ContestLobby_EventScript_21AC38:: @ 821AC38 - special BerryBlenderLinkJoinGroup + special TryJoinLinkGroup waitstate return diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index 87e4c0afd..d4e630e4a 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -44,7 +44,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211 waitmovement 0 applymovement 1, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, MSGBOX_DEFAULT closemessage diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc index c22e0c0ec..d7061d7e4 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624 call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR special ShowDeptStoreElevatorFloorSelect - message gUnknown_08272C1D + message gText_WhichFloorWouldYouLike waitmessage setvar VAR_0x8004, 0 specialvar VAR_RESULT, GetDeptStoreDefaultFloorChoice @@ -114,7 +114,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E0:: @ 82207E0 LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5 special CloseDeptStoreElevatorWindow closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 waitse special MoveElevator diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json index 7514a548a..06159b81a 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186", + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_SubstituteTutor", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index c9e423ebb..44b9b2d24 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207 .byte 0 LilycoveCity_DepartmentStoreRooftop_OnTransition: @ 822020D - getpricereduction 3 + getpricereduction POKENEWS_LILYCOVE compare VAR_RESULT, 1 call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220227 compare VAR_RESULT, 0 @@ -21,10 +21,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22022B:: @ 822022B LilycoveCity_DepartmentStoreRooftop_EventScript_22022F:: @ 822022F lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemartdecoration LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -51,7 +51,7 @@ LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248: @ 8220248 LilycoveCity_DepartmentStoreRooftop_EventScript_220268:: @ 8220268 lock faceplayer - getpricereduction 3 + getpricereduction POKENEWS_LILYCOVE compare VAR_RESULT, 1 call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220282 msgbox LilycoveCity_DepartmentStoreRooftop_Text_220463, MSGBOX_DEFAULT @@ -190,7 +190,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220442:: @ 8220442 end LilycoveCity_DepartmentStoreRooftop_EventScript_220450:: @ 8220450 - msgbox gUnknown_08272A89, MSGBOX_DEFAULT + msgbox gText_TheBagIsFull, MSGBOX_DEFAULT goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E end diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index 1e01fc168..3f9378b7a 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -13,7 +13,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_21F7F7 goto_if_set FLAG_DAILY_PICKED_LOTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_21F78D msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F797 setflag FLAG_DAILY_PICKED_LOTO_TICKET message LilycoveCity_DepartmentStore_1F_Text_2A64C8 @@ -22,7 +22,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C copyvar VAR_0x8008, VAR_RESULT special BufferLottoTicketNumber msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, MSGBOX_DEFAULT - applymovement 2, Common_Movement_WalkInPlaceRight + applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 playse SE_PC_ON special DoLotteryCornerComputerEffect @@ -34,7 +34,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C waitmovement 0 compare VAR_0x8004, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1 - incrementgamestat 46 + incrementgamestat GAME_STAT_WON_POKEMON_LOTTERY compare VAR_0x8006, 0 call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F77B compare VAR_0x8006, 1 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc index 4d4edf373..33f0bff9a 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc @@ -16,10 +16,10 @@ LilycoveCity_DepartmentStore_2F_EventScript_21FB3F:: @ 821FB3F LilycoveCity_DepartmentStore_2F_EventScript_21FB48:: @ 821FB48 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart LilycoveCity_DepartmentStore_2F_Pokemart_21FB60 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -43,10 +43,10 @@ LilycoveCity_DepartmentStore_2F_Pokemart_21FB60: @ 821FB60 LilycoveCity_DepartmentStore_2F_EventScript_21FB7A:: @ 821FB7A lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart LilycoveCity_DepartmentStore_2F_Pokemart_21FB94 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc index 053ff4632..23c24b681 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc @@ -4,10 +4,10 @@ LilycoveCity_DepartmentStore_3F_MapScripts:: @ 821FC64 LilycoveCity_DepartmentStore_3F_EventScript_21FC65:: @ 821FC65 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart LilycoveCity_DepartmentStore_3F_Pokemart_21FC7C - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -25,10 +25,10 @@ LilycoveCity_DepartmentStore_3F_Pokemart_21FC7C: @ 821FC7C LilycoveCity_DepartmentStore_3F_EventScript_21FC8C:: @ 821FC8C lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc index d78baaf3d..25bc7c33c 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc @@ -16,10 +16,10 @@ LilycoveCity_DepartmentStore_4F_EventScript_21FDFD:: @ 821FDFD LilycoveCity_DepartmentStore_4F_EventScript_21FE06:: @ 821FE06 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart LilycoveCity_DepartmentStore_4F_Pokemart_21FE20 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -36,10 +36,10 @@ LilycoveCity_DepartmentStore_4F_Pokemart_21FE20: @ 821FE20 LilycoveCity_DepartmentStore_4F_EventScript_21FE2C:: @ 821FE2C lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart LilycoveCity_DepartmentStore_4F_Pokemart_21FE44 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index ccad13e27..79943cec3 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -16,10 +16,10 @@ LilycoveCity_DepartmentStore_5F_EventScript_21FF9A:: @ 821FF9A LilycoveCity_DepartmentStore_5F_EventScript_21FFA6:: @ 821FFA6 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Dolls - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -44,10 +44,10 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Dolls: @ 821FFC0 LilycoveCity_DepartmentStore_5F_EventScript_21FFDC:: @ 821FFDC lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Cushions - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -69,10 +69,10 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Cushions: @ 821FFF4 LilycoveCity_DepartmentStore_5F_EventScript_22000A:: @ 822000A lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Posters - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -94,10 +94,10 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Posters: @ 8220024 LilycoveCity_DepartmentStore_5F_EventScript_22003A:: @ 822003A lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Mats - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -141,7 +141,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22009C:: @ 822009C LilycoveCity_DepartmentStore_5F_EventScript_2200A7:: @ 82200A7 msgbox LilycoveCity_DepartmentStore_5F_Text_2201C4, MSGBOX_DEFAULT closemessage - applymovement 7, Common_Movement_WalkInPlaceUp + applymovement 7, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 292180d31..3d087c914 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -87,7 +87,7 @@ LilycoveCity_Harbor_EventScript_GoToFarawayIsland:: @ 821E139 LilycoveCity_Harbor_EventScript_GoToSlateport:: @ 821E149 msgbox LilycoveCity_Harbor_Text_SlateportItIs, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind setvar VAR_PORTHOLE_STATE, 5 call LilycoveCity_Harbor_EventScript_BoardFerry @@ -98,7 +98,7 @@ LilycoveCity_Harbor_EventScript_GoToSlateport:: @ 821E149 LilycoveCity_Harbor_EventScript_GoToBattleFrontier:: @ 821E171 msgbox LilycoveCity_Harbor_Text_BattleFrontierItIs, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind call LilycoveCity_Harbor_EventScript_BoardFerry warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 @@ -247,7 +247,7 @@ LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime:: @ 821E350 call LilycoveCity_Harbor_EventScript_GetEventTicketSailor msgbox EventTicket_Text_OldSeaMapTooFar, MSGBOX_DEFAULT closemessage - applymovement 4, Common_Movement_WalkInPlaceUp + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN applymovement 4, Common_Movement_ExclamationMark @@ -329,12 +329,12 @@ LilycoveCity_Harbor_EventScript_MultipleEventTicketsFirstTime:: @ 821E44D LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect:: @ 821E4B6 msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT closemessage - applymovement 4, Common_Movement_WalkInPlaceUp + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 30 removeobject 4 delay 30 - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 showobjectat 1, MAP_LILYCOVE_CITY_HARBOR delay 30 @@ -343,7 +343,7 @@ LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect:: @ 821E4B6 end LilycoveCity_Harbor_EventScript_GetEventTicketSailor:: @ 821E4EE - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR @@ -355,7 +355,7 @@ LilycoveCity_Harbor_EventScript_GetEventTicketSailor:: @ 821E4EE return LilycoveCity_Harbor_EventScript_BoardFerryWithSailor:: @ 821E514 - applymovement 4, Common_Movement_WalkInPlaceUp + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 30 removeobject 4 @@ -390,7 +390,7 @@ LilycoveCity_Harbor_EventScript_NoTicket:: @ 821E56B @ Unused LilycoveCity_Harbor_EventScript_GoToSlateportUnused:: @ 821E575 msgbox LilycoveCity_Harbor_Text_SlateportItIs, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind setvar VAR_PORTHOLE_STATE, 5 call LilycoveCity_Harbor_EventScript_BoardFerry @@ -402,7 +402,7 @@ LilycoveCity_Harbor_EventScript_GoToSlateportUnused:: @ 821E575 @ Unused LilycoveCity_Harbor_EventScript_GoToBattleFrontierUnused:: @ 821E59D msgbox LilycoveCity_Harbor_Text_BattleFrontierItIs, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind call LilycoveCity_Harbor_EventScript_BoardFerry warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 @@ -419,7 +419,7 @@ LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind:: @ 821E5C0 LilycoveCity_Harbor_EventScript_BoardFerry:: @ 821E5CC msgbox LilycoveCity_Harbor_Text_PleaseBoard, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR @@ -499,22 +499,22 @@ LilycoveCity_Harbor_Movement_SailorOutOfWayEast: @ 821E671 step_end LilycoveCity_Harbor_EventScript_BrineyFaceSailorNorth:: @ 821E675 - applymovement 5, Common_Movement_WalkInPlaceLeft + applymovement 5, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return LilycoveCity_Harbor_EventScript_BrineyFaceSailorEast:: @ 821E680 - applymovement 5, Common_Movement_WalkInPlaceDown + applymovement 5, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return LilycoveCity_Harbor_EventScript_BrineyFacePlayerNorth:: @ 821E68B - applymovement 5, Common_Movement_WalkInPlaceDown + applymovement 5, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return LilycoveCity_Harbor_EventScript_BrineyFacePlayerEast:: @ 821E696 - applymovement 5, Common_Movement_WalkInPlaceLeft + applymovement 5, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index 7d949fd8b..1f4cef433 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -11,7 +11,7 @@ LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B lock faceplayer msgbox LilycoveCity_House3_Text_21EF99, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_House3_EventScript_21EE75 msgbox LilycoveCity_House3_Text_21F0F8, MSGBOX_DEFAULT closemessage diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index 8ac18ba85..8075215aa 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -23,9 +23,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC:: @ 8218CEC LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5:: @ 8218CF5 msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F98, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D14 - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E end @@ -40,9 +40,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E:: @ 8218D1E waitmovement 0 removeobject 2 switch VAR_FACING - case 2, LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A - case 3, LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F - case 4, LilycoveCity_LilycoveMuseum_1F_EventScript_218D84 + case DIR_NORTH, LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A + case DIR_WEST, LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F + case DIR_EAST, LilycoveCity_LilycoveMuseum_1F_EventScript_218D84 end LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A:: @ 8218D5A diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json index f4adbabe8..30c5a413f 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/map.json +++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_MoveDeletersHouse_EventScript_21EA0B", + "script": "LilycoveCity_MoveDeletersHouse_EventScript_MoveDeleter", "flag": "0" } ], diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index e94fa43f1..7d9e0f239 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -1,110 +1,110 @@ LilycoveCity_MoveDeletersHouse_MapScripts:: @ 821EA0A .byte 0 -LilycoveCity_MoveDeletersHouse_EventScript_21EA0B:: @ 821EA0B +LilycoveCity_MoveDeletersHouse_EventScript_MoveDeleter:: @ 821EA0B lockall applymovement 1, Common_Movement_FacePlayer waitmovement 0 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EAFD, MSGBOX_YESNO + msgbox LilycoveCity_MoveDeletersHouse_Text_ICanMakeMonForgetMove, MSGBOX_YESNO switch VAR_RESULT - case 1, LilycoveCity_MoveDeletersHouse_EventScript_21EA3B - case 0, LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 + case YES, LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget + case NO, LilycoveCity_MoveDeletersHouse_EventScript_ComeAgain releaseall end -LilycoveCity_MoveDeletersHouse_EventScript_21EA3B:: @ 821EA3B - msgbox LilycoveCity_MoveDeletersHouse_Text_21EB65, MSGBOX_DEFAULT - special sub_81B94B0 +LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget:: @ 821EA3B + msgbox LilycoveCity_MoveDeletersHouse_Text_WhichMonShouldForget, MSGBOX_DEFAULT + special ChoosePartyMon waitstate compare VAR_0x8004, 255 - goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 - special sub_81B98DC + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_ComeAgain + special IsSelectedMonEgg + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_EggCantForgetMoves + special GetNumMovesSelectedMonHas compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EADC - special sub_81B96D0 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EACF - msgbox LilycoveCity_MoveDeletersHouse_Text_21EB89, MSGBOX_DEFAULT + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_MonOnlyKnowsOneMove + msgbox LilycoveCity_MoveDeletersHouse_Text_WhichMoveShouldBeForgotten, MSGBOX_DEFAULT fadescreen 1 - special sub_81B968C + special MoveDeleterChooseMoveToForget fadescreen 0 - compare VAR_0x8005, 4 - goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EA3B - special sub_81B9718 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EBDA, MSGBOX_YESNO + compare VAR_0x8005, MAX_MON_MOVES + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget + special BufferMoveDeleterNicknameAndMove + msgbox LilycoveCity_MoveDeletersHouse_Text_MonsMoveShouldBeForgotten, MSGBOX_YESNO switch VAR_RESULT - case 1, LilycoveCity_MoveDeletersHouse_EventScript_21EAB0 - case 0, LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 + case YES, LilycoveCity_MoveDeletersHouse_EventScript_TryForgetMove + case NO, LilycoveCity_MoveDeletersHouse_EventScript_ComeAgain releaseall end -LilycoveCity_MoveDeletersHouse_EventScript_21EAB0:: @ 821EAB0 - special sub_81B9918 - compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAF0 - special sub_81B9770 +LilycoveCity_MoveDeletersHouse_EventScript_TryForgetMove:: @ 821EAB0 + special IsLastMonThatKnowsSurf + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_LastMonWithSurf + special MoveDeleterForgetMove playfanfare MUS_ME_WASURE waitfanfare - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC06, MSGBOX_DEFAULT + msgbox LilycoveCity_MoveDeletersHouse_Text_MonHasForgottenMove, MSGBOX_DEFAULT releaseall end -LilycoveCity_MoveDeletersHouse_EventScript_21EACF:: @ 821EACF - special sub_81B9718 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EBA9, MSGBOX_DEFAULT +LilycoveCity_MoveDeletersHouse_EventScript_MonOnlyKnowsOneMove:: @ 821EACF + special BufferMoveDeleterNicknameAndMove + msgbox LilycoveCity_MoveDeletersHouse_Text_MonOnlyKnowsOneMove, MSGBOX_DEFAULT releaseall end -LilycoveCity_MoveDeletersHouse_EventScript_21EADC:: @ 821EADC - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC78, MSGBOX_DEFAULT +LilycoveCity_MoveDeletersHouse_EventScript_EggCantForgetMoves:: @ 821EADC + msgbox LilycoveCity_MoveDeletersHouse_Text_EggCantForgetMoves, MSGBOX_DEFAULT releaseall end -LilycoveCity_MoveDeletersHouse_EventScript_21EAE6:: @ 821EAE6 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC3F, MSGBOX_DEFAULT +LilycoveCity_MoveDeletersHouse_EventScript_ComeAgain:: @ 821EAE6 + msgbox LilycoveCity_MoveDeletersHouse_Text_ComeAgain, MSGBOX_DEFAULT releaseall end -LilycoveCity_MoveDeletersHouse_EventScript_21EAF0:: @ 821EAF0 - special sub_81B9718 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC9C, MSGBOX_DEFAULT +LilycoveCity_MoveDeletersHouse_EventScript_LastMonWithSurf:: @ 821EAF0 + special BufferMoveDeleterNicknameAndMove + msgbox LilycoveCity_MoveDeletersHouse_Text_CantForgetSurf, MSGBOX_DEFAULT releaseall end -LilycoveCity_MoveDeletersHouse_Text_21EAFD: @ 821EAFD +LilycoveCity_MoveDeletersHouse_Text_ICanMakeMonForgetMove: @ 821EAFD .string "Uh…\n" .string "Oh, yes, I'm the MOVE DELETER.\p" .string "I can make POKéMON forget their moves.\p" .string "Would you like me to do that?$" -LilycoveCity_MoveDeletersHouse_Text_21EB65: @ 821EB65 +LilycoveCity_MoveDeletersHouse_Text_WhichMonShouldForget: @ 821EB65 .string "Which POKéMON should forget a move?$" -LilycoveCity_MoveDeletersHouse_Text_21EB89: @ 821EB89 +LilycoveCity_MoveDeletersHouse_Text_WhichMoveShouldBeForgotten: @ 821EB89 .string "Which move should be forgotten?$" -LilycoveCity_MoveDeletersHouse_Text_21EBA9: @ 821EBA9 +LilycoveCity_MoveDeletersHouse_Text_MonOnlyKnowsOneMove: @ 821EBA9 .string "{STR_VAR_1} knows only one move\n" .string "so it can't be forgotten…$" -LilycoveCity_MoveDeletersHouse_Text_21EBDA: @ 821EBDA +LilycoveCity_MoveDeletersHouse_Text_MonsMoveShouldBeForgotten: @ 821EBDA .string "Hm! {STR_VAR_1}'s {STR_VAR_2}?\n" .string "That move should be forgotten?$" -LilycoveCity_MoveDeletersHouse_Text_21EC06: @ 821EC06 +LilycoveCity_MoveDeletersHouse_Text_MonHasForgottenMove: @ 821EC06 .string "It worked to perfection!\p" .string "{STR_VAR_1} has forgotten\n" .string "{STR_VAR_2} completely.$" -LilycoveCity_MoveDeletersHouse_Text_21EC3F: @ 821EC3F +LilycoveCity_MoveDeletersHouse_Text_ComeAgain: @ 821EC3F .string "Come again if there are moves that\n" .string "need to be forgotten.$" -LilycoveCity_MoveDeletersHouse_Text_21EC78: @ 821EC78 +LilycoveCity_MoveDeletersHouse_Text_EggCantForgetMoves: @ 821EC78 .string "What?\n" .string "No EGG should know any moves.$" -LilycoveCity_MoveDeletersHouse_Text_21EC9C: @ 821EC9C +LilycoveCity_MoveDeletersHouse_Text_CantForgetSurf: @ 821EC9C .string "Hm!\p" .string "Your {STR_VAR_1} doesn't seem willing\n" .string "to forget SURF.$" diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json index c5c0121f4..023717a59 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonCenter_1F_EventScript_2A836B", + "script": "LilycoveCity_PokemonCenter_1F_EventScript_LilycoveLady", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonCenter_1F_EventScript_2A89C7", + "script": "LilycoveCity_PokemonCenter_1F_EventScript_ContestLadyMon", "flag": "FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY" } ], diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index c2e1deb5d..09b18f4bd 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2 map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, LilycoveCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 LilycoveCity_PokemonCenter_1F_OnTransition: @ 821C5BD @@ -26,7 +26,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_21C5E4:: @ 821C5E4 LilycoveCity_PokemonCenter_1F_EventScript_21C5E8:: @ 821C5E8 setvar VAR_0x800B, 1 - call LilycoveCity_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/map.json b/data/maps/LilycoveCity_PokemonCenter_2F/map.json index 6bfb1c4cb..cd1324cbe 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LilycoveCity_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc index 9bbf4f349..965580da5 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ LilycoveCity_PokemonCenter_2F_MapScripts:: @ 821C75D - map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -LilycoveCity_PokemonCenter_2F_EventScript_21C772:: @ 821C772 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +LilycoveCity_PokemonCenter_2F_EventScript_Colosseum:: @ 821C772 + call CableClub_EventScript_Colosseum end -LilycoveCity_PokemonCenter_2F_EventScript_21C778:: @ 821C778 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +LilycoveCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 821C778 + call CableClub_EventScript_TradeCenter end -LilycoveCity_PokemonCenter_2F_EventScript_21C77E:: @ 821C77E - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +LilycoveCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 821C77E + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index d9ba545fb..6348829ba 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -9,18 +9,18 @@ LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790 LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A lockall - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807 waitmovement 0 @@ -532,9 +532,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE setvar VAR_0x8004, 8 special BufferStreakTrainerText msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15 end @@ -577,9 +577,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F setvar VAR_0x8004, 8 special BufferStreakTrainerText msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D end diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index d42f277eb..8825d1899 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -6,7 +6,7 @@ LittlerootTown_MapScripts:: @ 81E7DCB LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB setflag FLAG_VISITED_LITTLEROOT_TOWN - call Common_EventScript_SetupRivalGender + call Common_EventScript_SetupRivalGfxId compare VAR_LITTLEROOT_INTRO_STATE, 2 call_if_eq LittlerootTown_EventScript_1E7E67 call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E7E6F @@ -357,9 +357,9 @@ LittlerootTown_Movement_1E8118: @ 81E8118 LittlerootTown_EventScript_1E811F:: @ 81E811F lockall - applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT @@ -490,12 +490,12 @@ LittlerootTown_EventScript_1E828C:: @ 81E828C return LittlerootTown_EventScript_1E8297:: @ 81E8297 - applymovement 4, Common_Movement_WalkInPlaceRight + applymovement 4, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return LittlerootTown_EventScript_1E82A2:: @ 81E82A2 - applymovement 4, Common_Movement_WalkInPlaceLeft + applymovement 4, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -530,70 +530,70 @@ LittlerootTown_EventScript_1E82F0:: @ 81E82F0 return LittlerootTown_EventScript_1E8333:: @ 81E8333 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85D1 waitmovement 0 return LittlerootTown_EventScript_1E8348:: @ 81E8348 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85D8 waitmovement 0 return LittlerootTown_EventScript_1E835D:: @ 81E835D - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85DF waitmovement 0 return LittlerootTown_EventScript_1E8372:: @ 81E8372 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85E4 waitmovement 0 return LittlerootTown_EventScript_1E8387:: @ 81E8387 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85EA waitmovement 0 return LittlerootTown_EventScript_1E839C:: @ 81E839C - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85ED waitmovement 0 return LittlerootTown_EventScript_1E83B1:: @ 81E83B1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F1 waitmovement 0 return LittlerootTown_EventScript_1E83C6:: @ 81E83C6 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F5 waitmovement 0 return LittlerootTown_EventScript_1E83DB:: @ 81E83DB - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F8 waitmovement 0 return LittlerootTown_EventScript_1E83F0:: @ 81E83F0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85FE waitmovement 0 @@ -894,7 +894,7 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_EventScript_1E828C call LittlerootTown_EventScript_1E8693 - applymovement 4, Common_Movement_WalkInPlaceUp + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 opendoor VAR_0x8009, VAR_0x800A waitdooranim diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index d6d4af86c..8b0c762f9 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_BrendansHouse_1F_EventScript_2929C5", + "script": "PlayersHouse_1F_EventScript_Mom", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_BrendansHouse_1F_EventScript_292ACD", + "script": "PlayersHouse_1F_EventScript_Vigoroth2", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_BrendansHouse_1F_EventScript_292ABA", + "script": "PlayersHouse_1F_EventScript_Vigoroth1", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F89F3", + "script": "RivalsHouse_1F_EventScript_RivalMom", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D", + "script": "RivalsHouse_1F_EventScript_RivalSibling", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING" }, { @@ -137,7 +137,7 @@ "elevation": 0, "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "4", - "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78A3" + "script": "LittlerootTown_BrendansHouse_1F_EventScript_GoSeeRoom" }, { "type": "trigger", @@ -146,7 +146,7 @@ "elevation": 0, "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", - "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78BE" + "script": "LittlerootTown_BrendansHouse_1F_EventScript_MeetRival0" }, { "type": "trigger", @@ -155,7 +155,7 @@ "elevation": 0, "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", - "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78CA" + "script": "LittlerootTown_BrendansHouse_1F_EventScript_MeetRival1" }, { "type": "trigger", @@ -164,7 +164,7 @@ "elevation": 0, "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", - "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78D6" + "script": "LittlerootTown_BrendansHouse_1F_EventScript_MeetRival2" } ], "bg_events": [] diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 397bdfb8f..59c173cf9 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -1,110 +1,111 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755 - map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_BrendansHouse_1F_MapScript1_1F7765 - map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4 - map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA + map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_BrendansHouse_1F_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_1F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_BrendansHouse_1F_OnFrame .byte 0 -LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765 +LittlerootTown_BrendansHouse_1F_OnLoad: @ 81F7765 compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_1F777A - call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_1F778D + call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_SetMovingBoxes + call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_CheckShowShoesManual end -LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A +LittlerootTown_BrendansHouse_1F_EventScript_SetMovingBoxes:: @ 81F777A setmetatile 5, 4, METATILE_BrendansMaysHouse_MovingBox_Open, 1 setmetatile 5, 2, METATILE_BrendansMaysHouse_MovingBox_Closed, 1 return -LittlerootTown_BrendansHouse_1F_EventScript_1F778D:: @ 81F778D +LittlerootTown_BrendansHouse_1F_EventScript_CheckShowShoesManual:: @ 81F778D checkplayergender compare VAR_RESULT, MALE - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F779A + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_ShowRunningShoesManual return -LittlerootTown_BrendansHouse_1F_EventScript_1F779A:: @ 81F779A +LittlerootTown_BrendansHouse_1F_EventScript_ShowRunningShoesManual:: @ 81F779A setmetatile 3, 7, METATILE_BrendansMaysHouse_BookOnTable, 1 return -LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4 +LittlerootTown_BrendansHouse_1F_OnTransition: @ 81F77A4 compare VAR_LITTLEROOT_INTRO_STATE, 3 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77DE + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToDoor compare VAR_LITTLEROOT_INTRO_STATE, 5 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77C6 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToStairs compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77D2 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToTV end -LittlerootTown_BrendansHouse_1F_EventScript_1F77C6:: @ 81F77C6 +LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToStairs:: @ 81F77C6 setobjectxyperm 1, 8, 4 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return -LittlerootTown_BrendansHouse_1F_EventScript_1F77D2:: @ 81F77D2 +LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToTV:: @ 81F77D2 setobjectxyperm 1, 4, 5 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return -LittlerootTown_BrendansHouse_1F_EventScript_1F77DE:: @ 81F77DE +LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToDoor:: @ 81F77DE setobjectxyperm 1, 9, 8 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return -LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA: @ 81F77EA - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_1F783C - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7814 - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_1F784D - map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 1, LittlerootTown_BrendansHouse_1F_EventScript_1F785E - map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_292AF2 +@ Many of the below scripts have no gender check because they assume youre in the correct house +LittlerootTown_BrendansHouse_1F_OnFrame: @ 81F77EA + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_EnterHouseMovingIn + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_PetalburgGymReport + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 1, LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV .2byte 0 -LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814 +LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F7814 lockall - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B67, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_GoSetTheClock, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1F783A - applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_1F783A + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PushTowardStairs + applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_PushTowardStairs waitmovement 0 warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1 waitstate releaseall end -LittlerootTown_BrendansHouse_1F_Movement_1F783A: @ 81F783A +LittlerootTown_BrendansHouse_1F_Movement_PushTowardStairs: @ 81F783A walk_up step_end -LittlerootTown_BrendansHouse_1F_EventScript_1F783C:: @ 81F783C +LittlerootTown_BrendansHouse_1F_EventScript_EnterHouseMovingIn:: @ 81F783C lockall setvar VAR_0x8004, 1 - setvar VAR_0x8005, 0 - goto LittlerootTown_BrendansHouse_1F_EventScript_292704 + setvar VAR_0x8005, MALE + goto PlayersHouse_1F_EventScript_EnterHouseMovingIn end -LittlerootTown_BrendansHouse_1F_EventScript_1F784D:: @ 81F784D +LittlerootTown_BrendansHouse_1F_EventScript_PetalburgGymReport:: @ 81F784D lockall setvar VAR_0x8004, 0 - setvar VAR_0x8005, 1 - goto LittlerootTown_BrendansHouse_1F_EventScript_29286D + setvar VAR_0x8005, 1 @ Object event ID for Mom + goto PlayersHouse_1F_EventScript_PetalburgGymReportMale end -LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E +LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor:: @ 81F785E lockall playse SE_PIN applymovement 4, Common_Movement_ExclamationMark waitmovement 0 applymovement 4, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft - applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_RivalMomApproach waitmovement 0 special GetRivalSonDaughterString - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT + msgbox RivalsHouse_1F_Text_OhYoureTheNewNeighbor, MSGBOX_DEFAULT setflag FLAG_MET_RIVAL_MOM setvar VAR_LITTLEROOT_HOUSES_STATE, 2 releaseall end -LittlerootTown_BrendansHouse_1F_Movement_1F789C: @ 81F789C +LittlerootTown_BrendansHouse_1F_Movement_RivalMomApproach: @ 81F789C walk_down walk_right walk_right @@ -113,34 +114,34 @@ LittlerootTown_BrendansHouse_1F_Movement_1F789C: @ 81F789C walk_right step_end -LittlerootTown_BrendansHouse_1F_EventScript_1F78A3:: @ 81F78A3 +LittlerootTown_BrendansHouse_1F_EventScript_GoSeeRoom:: @ 81F78A3 lockall setvar VAR_0x8004, 1 - setvar VAR_0x8005, 0 - applymovement VAR_0x8004, Common_Movement_WalkInPlaceLeft + setvar VAR_0x8005, MALE + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - goto LittlerootTown_BrendansHouse_1F_EventScript_292765 + goto PlayersHouse_1F_EventScript_MomGoSeeRoom end -LittlerootTown_BrendansHouse_1F_EventScript_1F78BE:: @ 81F78BE +LittlerootTown_BrendansHouse_1F_EventScript_MeetRival0:: @ 81F78BE lockall setvar VAR_0x8008, 0 - goto LittlerootTown_BrendansHouse_1F_EventScript_1F78E2 + goto LittlerootTown_BrendansHouse_1F_EventScript_MeetRival end -LittlerootTown_BrendansHouse_1F_EventScript_1F78CA:: @ 81F78CA +LittlerootTown_BrendansHouse_1F_EventScript_MeetRival1:: @ 81F78CA lockall setvar VAR_0x8008, 1 - goto LittlerootTown_BrendansHouse_1F_EventScript_1F78E2 + goto LittlerootTown_BrendansHouse_1F_EventScript_MeetRival end -LittlerootTown_BrendansHouse_1F_EventScript_1F78D6:: @ 81F78D6 +LittlerootTown_BrendansHouse_1F_EventScript_MeetRival2:: @ 81F78D6 lockall setvar VAR_0x8008, 2 - goto LittlerootTown_BrendansHouse_1F_EventScript_1F78E2 + goto LittlerootTown_BrendansHouse_1F_EventScript_MeetRival end -LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 +LittlerootTown_BrendansHouse_1F_EventScript_MeetRival:: @ 81F78E2 playse SE_KAIDAN delay 10 addobject 7 @@ -151,22 +152,22 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 applymovement 7, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 1 - call_if_ne LittlerootTown_BrendansHouse_1F_EventScript_1F7981 + call_if_ne LittlerootTown_BrendansHouse_1F_EventScript_PlayerFaceBrendan playbgm MUS_BOY_SUP, 1 compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F798C + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer0 compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F7997 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79A2 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F90B4, MSGBOX_DEFAULT + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer2 + msgbox RivalsHouse_1F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79C1 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs0 compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79D3 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs1 compare VAR_0x8008, 2 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79E5 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs2 playse SE_KAIDAN removeobject 7 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN @@ -180,27 +181,27 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 releaseall end -LittlerootTown_BrendansHouse_1F_EventScript_1F7981:: @ 81F7981 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown +LittlerootTown_BrendansHouse_1F_EventScript_PlayerFaceBrendan:: @ 81F7981 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_1F798C:: @ 81F798C - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F79AD +LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer0:: @ 81F798C + applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer0 waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_1F7997:: @ 81F7997 - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F79B5 +LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer1:: @ 81F7997 + applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer1 waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_1F79A2:: @ 81F79A2 - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F79B9 +LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer2:: @ 81F79A2 + applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer2 waitmovement 0 return -LittlerootTown_BrendansHouse_1F_Movement_1F79AD: @ 81F79AD +LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer0: @ 81F79AD walk_in_place_fastest_left walk_left walk_in_place_fastest_up @@ -210,13 +211,13 @@ LittlerootTown_BrendansHouse_1F_Movement_1F79AD: @ 81F79AD walk_up step_end -LittlerootTown_BrendansHouse_1F_Movement_1F79B5: @ 81F79B5 +LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer1: @ 81F79B5 walk_up walk_up walk_up step_end -LittlerootTown_BrendansHouse_1F_Movement_1F79B9: @ 81F79B9 +LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer2: @ 81F79B9 walk_in_place_fastest_right walk_right walk_in_place_fastest_up @@ -226,31 +227,31 @@ LittlerootTown_BrendansHouse_1F_Movement_1F79B9: @ 81F79B9 walk_up step_end -LittlerootTown_BrendansHouse_1F_EventScript_1F79C1:: @ 81F79C1 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1F79F7 - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A06 +LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs0:: @ 81F79C1 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit0 + applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs0 waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_1F79D3:: @ 81F79D3 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1F79FB - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A0C +LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs1:: @ 81F79D3 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit1 + applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs1 waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_1F79E5:: @ 81F79E5 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1F7A02 - applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A16 +LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs2:: @ 81F79E5 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit2 + applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs2 waitmovement 0 return -LittlerootTown_BrendansHouse_1F_Movement_1F79F7: @ 81F79F7 +LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit0: @ 81F79F7 delay_16 delay_8 walk_in_place_fastest_right step_end -LittlerootTown_BrendansHouse_1F_Movement_1F79FB: @ 81F79FB +LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit1: @ 81F79FB delay_16 delay_8 walk_in_place_fastest_right @@ -259,13 +260,13 @@ LittlerootTown_BrendansHouse_1F_Movement_1F79FB: @ 81F79FB walk_in_place_fastest_up step_end -LittlerootTown_BrendansHouse_1F_Movement_1F7A02: @ 81F7A02 +LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit2: @ 81F7A02 delay_16 delay_8 walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_1F_Movement_1F7A06: @ 81F7A06 +LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs0: @ 81F7A06 walk_in_place_fastest_right walk_right walk_in_place_fastest_up @@ -273,7 +274,7 @@ LittlerootTown_BrendansHouse_1F_Movement_1F7A06: @ 81F7A06 walk_up step_end -LittlerootTown_BrendansHouse_1F_Movement_1F7A0C: @ 81F7A0C +LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs1: @ 81F7A0C walk_in_place_fastest_right walk_right walk_in_place_fastest_up @@ -285,7 +286,7 @@ LittlerootTown_BrendansHouse_1F_Movement_1F7A0C: @ 81F7A0C walk_up step_end -LittlerootTown_BrendansHouse_1F_Movement_1F7A16: @ 81F7A16 +LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs2: @ 81F7A16 walk_in_place_fastest_left walk_left walk_in_place_fastest_up @@ -293,11 +294,11 @@ LittlerootTown_BrendansHouse_1F_Movement_1F7A16: @ 81F7A16 walk_up step_end -LittlerootTown_BrendansHouse_1F_Text_1F7A1C: @ 81F7A1C +PlayersHouse_1F_Text_IsntItNiceInHere: @ 81F7A1C .string "MOM: See, {PLAYER}?\n" .string "Isn't it nice in here, too?$" -LittlerootTown_BrendansHouse_1F_Text_1F7A46: @ 81F7A46 +PlayersHouse_1F_Text_MoversPokemonGoSetClock: @ 81F7A46 .string "The mover's POKéMON do all the work\n" .string "of moving us in and cleaning up after.\l" .string "This is so convenient!\p" @@ -307,91 +308,87 @@ LittlerootTown_BrendansHouse_1F_Text_1F7A46: @ 81F7A46 .string "our move here.\l" .string "Don't forget to set it!$" -LittlerootTown_BrendansHouse_1F_Text_1F7B24: @ 81F7B24 +PlayersHouse_1F_Text_ArentYouInterestedInRoom: @ 81F7B24 .string "MOM: Well, {PLAYER}?\p" .string "Aren't you interested in seeing your\n" .string "very own room?$" -LittlerootTown_BrendansHouse_1F_Text_1F7B67: @ 81F7B67 -LittlerootTown_MaysHouse_1F_Text_1F7B67: @ 81F7B67 +PlayersHouse_1F_Text_GoSetTheClock: @ 81F7B67 .string "MOM: {PLAYER}.\p" .string "Go set the clock in your room, honey.$" -LittlerootTown_BrendansHouse_1F_Text_1F7B96: @ 81F7B96 +PlayersHouse_1F_Text_OhComeQuickly: @ 81F7B96 .string "MOM: Oh! {PLAYER}, {PLAYER}!\n" .string "Quick! Come quickly!$" -LittlerootTown_BrendansHouse_1F_Text_1F7BBC: @ 81F7BBC -LittlerootTown_MaysHouse_1F_Text_1F7BBC: @ 81F7BBC +PlayersHouse_1F_Text_MaybeDadWillBeOn: @ 81F7BBC .string "MOM: Look! It's PETALBURG GYM!\n" .string "Maybe DAD will be on!$" -LittlerootTown_BrendansHouse_1F_Text_1F7BF1: @ 81F7BF1 -LittlerootTown_MaysHouse_1F_Text_1F7BF1: @ 81F7BF1 +PlayersHouse_1F_Text_ItsOverWeMissedHim: @ 81F7BF1 .string "MOM: Oh… It's over.\p" .string "I think DAD was on, but we missed him.\n" .string "Too bad.$" -LittlerootTown_BrendansHouse_1F_Text_1F7C35: @ 81F7C35 -LittlerootTown_MaysHouse_1F_Text_1F7C35: @ 81F7C35 +PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor: @ 81F7C35 .string "Oh, yes.\n" .string "One of DAD's friends lives in town.\p" .string "PROF. BIRCH is his name.\p" .string "He lives right next door, so you should\n" .string "go over and introduce yourself.$" -LittlerootTown_BrendansHouse_1F_Text_1F7CC3: @ 81F7CC3 +PlayersHouse_1F_Text_SeeYouHoney: @ 81F7CC3 .string "MOM: See you, honey!$" -LittlerootTown_BrendansHouse_1F_Text_1F7CD8: @ 81F7CD8 +PlayersHouse_1F_Text_DidYouMeetProfBirch: @ 81F7CD8 .string "MOM: Did you introduce yourself to\n" .string "PROF. BIRCH?$" -LittlerootTown_BrendansHouse_1F_Text_1F7D08: @ 81F7D08 +PlayersHouse_1F_Text_YouShouldRestABit: @ 81F7D08 .string "MOM: How are you doing, {PLAYER}?\n" .string "You look a little tired.\p" .string "I think you should rest a bit.$" -LittlerootTown_BrendansHouse_1F_Text_1F7D5C: @ 81F7D5C +PlayersHouse_1F_Text_TakeCareHoney: @ 81F7D5C .string "MOM: Take care, honey!$" -LittlerootTown_BrendansHouse_1F_Text_1F7D73: @ 81F7D73 +PlayersHouse_1F_Text_GotDadsBadgeHeresSomethingFromMom: @ 81F7D73 .string "MOM: Oh? Did DAD give you that BADGE?\p" .string "Then here's something from your MOM!$" -LittlerootTown_BrendansHouse_1F_Text_1F7DBE: @ 81F7DBE +PlayersHouse_1F_Text_DontPushYourselfTooHard: @ 81F7DBE .string "Don't push yourself too hard, dear.\n" .string "You can always come home.\p" .string "Go for it, honey!$" -LittlerootTown_BrendansHouse_1F_Text_1F7E0E: @ 81F7E0E +PlayersHouse_1F_Text_IsThatAPokenav: @ 81F7E0E .string "MOM: What is that, honey? A POKéNAV?\n" .string "Someone from DEVON gave it to you?\p" .string "Well, honey, how about registering\n" .string "your mom?\p" .string "… … …$" -LittlerootTown_BrendansHouse_1F_Text_1F7E89: @ 81F7E89 +PlayersHouse_1F_Text_RegisteredMom: @ 81F7E89 .string "Registered MOM\n" .string "in the POKéNAV.$" -LittlerootTown_BrendansHouse_1F_Text_1F7EA8: @ 81F7EA8 +PlayersHouse_1F_Text_Vigoroth1: @ 81F7EA8 .string "Fugiiiiih!$" -LittlerootTown_BrendansHouse_1F_Text_1F7EB3: @ 81F7EB3 +PlayersHouse_1F_Text_Vigoroth2: @ 81F7EB3 .string "Huggoh, uggo uggo…$" -LittlerootTown_BrendansHouse_1F_Text_1F7EC6: @ 81F7EC6 +PlayersHouse_1F_Text_ReportFromPetalburgGym: @ 81F7EC6 .string "INTERVIEWER: …We brought you this\n" .string "report from in front of PETALBURG GYM.$" -LittlerootTown_BrendansHouse_1F_Text_1F7F0F: @ 81F7F0F +PlayersHouse_1F_Text_TheresAMovieOnTV: @ 81F7F0F .string "There is a movie on TV.\p" .string "Two men are dancing on a big piano\n" .string "keyboard.\p" .string "Better get going!$" -LittlerootTown_BrendansHouse_1F_Text_1F7F66: @ 81F7F66 +PlayersHouse_1F_Text_RunningShoesManual: @ 81F7F66 .string "It's the instruction booklet for the\n" .string "RUNNING SHOES.\p" .string "“Press the B Button to run while\n" @@ -399,7 +396,7 @@ LittlerootTown_BrendansHouse_1F_Text_1F7F66: @ 81F7F66 .string "“Lace up your RUNNING SHOES and hit\n" .string "the road running!”$" -LittlerootTown_BrendansHouse_1F_Text_1F800E: @ 81F800E +PlayersHouse_1F_Text_TicketFromBrineyCameForYou: @ 81F800E .string "DAD: Hm?\p" .string "Hey, it's {PLAYER}!\p" .string "It's been a while since I saw you,\n" @@ -410,26 +407,26 @@ LittlerootTown_BrendansHouse_1F_Text_1F800E: @ 81F800E .string "This came to you from someone named\l" .string "MR. BRINEY.$" -LittlerootTown_BrendansHouse_1F_Text_1F80FE: @ 81F80FE +PlayersHouse_1F_Text_PortsInSlateportLilycove: @ 81F80FE .string "DAD: Hm, a TICKET for a ferry?\p" .string "If I recall, there are ferry ports in\n" .string "SLATEPORT and LILYCOVE.$" -LittlerootTown_BrendansHouse_1F_Text_1F815B: @ 81F815B +PlayersHouse_1F_Text_BetterGetBackToGym: @ 81F815B .string "I'd better get back to PETALBURG GYM.\p" .string "MOM, thanks for looking after the house\n" .string "while I'm away.$" -LittlerootTown_BrendansHouse_1F_Text_1F81B9: @ 81F81B9 +PlayersHouse_1F_Text_DadShouldStayLonger: @ 81F81B9 .string "MOM: That DAD of yours…\p" .string "He comes home for the first time in a\n" .string "while, but all he talks about is POKéMON.\p" .string "He should relax and stay a little longer.$" -LittlerootTown_BrendansHouse_1F_Text_1F824B: @ 81F824B +PlayersHouse_1F_Text_IsThatABreakingStory: @ 81F824B .string "MOM: Is that a breaking news story?$" -LittlerootTown_BrendansHouse_1F_Text_1F826F: @ 81F826F +PlayersHouse_1F_Text_LatiEmergencyNewsFlash: @ 81F826F .string "We bring you this emergency\n" .string "news flash!\p" .string "In various HOENN locales, there have\n" @@ -440,11 +437,11 @@ LittlerootTown_BrendansHouse_1F_Text_1F826F: @ 81F826F .string "We now return you to the regular\n" .string "movie program.$" -LittlerootTown_BrendansHouse_1F_Text_1F8351: @ 81F8351 +PlayersHouse_1F_Text_WhatColorDidTheySay: @ 81F8351 .string "MOM: {PLAYER}, did you catch that?\p" .string "What color did the announcer say\n" .string "that POKéMON was?$" -LittlerootTown_BrendansHouse_1F_Text_1F83A1: @ 81F83A1 +PlayersHouse_1F_Text_StillUnknownPokemon: @ 81F83A1 .string "MOM: Well, isn't that something!\n" .string "There are still unknown POKéMON.$" diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json index e07959b20..01af64e7d 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F94C1", + "script": "RivalsHouse_2F_EventScript_Rival", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM" }, { @@ -206,7 +206,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F8481", + "script": "LittlerootTown_BrendansHouse_2F_EventScript_RivalsPokeBall", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL" }, { @@ -240,7 +240,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "EventScript_PlayerPCMale" + "script": "LittlerootTown_BrendansHouse_2F_EventScript_PC" }, { "type": "sign", @@ -248,7 +248,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F8656" + "script": "PlayersHouse_2F_EventScript_Notebook" }, { "type": "sign", @@ -256,7 +256,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_BrendansHouse_2F_EventScript_292781" + "script": "LittlerootTown_BrendansHouse_2F_EventScript_WallClock" }, { "type": "sign", @@ -264,7 +264,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F865F" + "script": "PlayersHouse_2F_EventScript_GameCube" } ] }
\ No newline at end of file diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 394db3e22..101e2bbad 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -1,70 +1,70 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81F83E3 - map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_BrendansHouse_2F_MapScript2_1F846A + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_2F_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_BrendansHouse_2F_OnWarp .byte 0 -LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE +LittlerootTown_BrendansHouse_2F_OnTransition: @ 81F83EE compare VAR_LITTLEROOT_RIVAL_STATE, 2 - call_if_lt LittlerootTown_BrendansHouse_2F_EventScript_1F8457 + call_if_lt LittlerootTown_BrendansHouse_2F_EventScript_CheckSetReadyToMeetBrendan compare VAR_LITTLEROOT_RIVAL_STATE, 3 - call_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F841A + call_if_ge LittlerootTown_BrendansHouse_2F_EventScript_CheckShouldUpdateBrendanPos compare VAR_LITTLEROOT_INTRO_STATE, 4 - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2926FE - call LittlerootTown_BrendansHouse_2F_EventScript_275CE1 + call_if_eq PlayersHouse_2F_EventScript_BlockStairsUntilClockIsSet + call SecretBase_EventScript_SetDecorationFlags setvar VAR_SECRET_BASE_INITIALIZED, 0 end -LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A - goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F8433 +LittlerootTown_BrendansHouse_2F_EventScript_CheckShouldUpdateBrendanPos:: @ 81F841A + goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_TryUpdateBrendanPos compare VAR_BIRCH_LAB_STATE, 2 - goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F8456 - goto LittlerootTown_BrendansHouse_2F_EventScript_1F8433 + goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_Ret + goto LittlerootTown_BrendansHouse_2F_EventScript_TryUpdateBrendanPos -LittlerootTown_BrendansHouse_2F_EventScript_1F8433:: @ 81F8433 +LittlerootTown_BrendansHouse_2F_EventScript_TryUpdateBrendanPos:: @ 81F8433 checkplayergender compare VAR_RESULT, MALE - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8456 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_Ret compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2 - goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F9309 + goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_Ret @ Odd that the MaysHouse equivalent was used here instead setobjectxyperm 1, 0, 2 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return -LittlerootTown_BrendansHouse_2F_EventScript_1F8456:: @ 81F8456 +LittlerootTown_BrendansHouse_2F_EventScript_Ret:: @ 81F8456 return -LittlerootTown_BrendansHouse_2F_EventScript_1F8457:: @ 81F8457 +LittlerootTown_BrendansHouse_2F_EventScript_CheckSetReadyToMeetBrendan:: @ 81F8457 checkplayergender compare VAR_RESULT, FEMALE - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8464 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_SetReadyToMeetBrendan return -LittlerootTown_BrendansHouse_2F_EventScript_1F8464:: @ 81F8464 +LittlerootTown_BrendansHouse_2F_EventScript_SetReadyToMeetBrendan:: @ 81F8464 setvar VAR_LITTLEROOT_RIVAL_STATE, 2 return -LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A - map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8474 +LittlerootTown_BrendansHouse_2F_OnWarp: @ 81F846A + map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_BrendansHouse_2F_EventScript_CheckInitDecor .2byte 0 -LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474 +LittlerootTown_BrendansHouse_2F_EventScript_CheckInitDecor:: @ 81F8474 checkplayergender compare VAR_RESULT, MALE - goto_if_eq EventScript_275D0C + goto_if_eq SecretBase_EventScript_InitDecorations end -LittlerootTown_BrendansHouse_2F_EventScript_1F8481:: @ 81F8481 +LittlerootTown_BrendansHouse_2F_EventScript_RivalsPokeBall:: @ 81F8481 lockall compare VAR_LITTLEROOT_RIVAL_STATE, 2 - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8497 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9991, MSGBOX_DEFAULT + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendan + msgbox RivalsHouse_2F_Text_ItsRivalsPokeBall, MSGBOX_DEFAULT releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 +LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendan:: @ 81F8497 delay 10 addobject 1 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85BC + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanEnters waitmovement 0 playse SE_PIN applymovement 1, Common_Movement_ExclamationMark @@ -73,14 +73,14 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 waitmovement 0 delay 10 playbgm MUS_BOY_SUP, 1 - compare VAR_FACING, 2 - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8507 - compare VAR_FACING, 1 - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8536 - compare VAR_FACING, 3 - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8565 - compare VAR_FACING, 4 - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8594 + compare VAR_FACING, DIR_NORTH + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth + compare VAR_FACING, DIR_SOUTH + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanSouth + compare VAR_FACING, DIR_WEST + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanWest + compare VAR_FACING, DIR_EAST + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanEast setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM @@ -90,60 +90,60 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C0 +LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth:: @ 81F8507 + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerNorth waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT + msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_1F85CF - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C6 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanNorth + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCNorth waitmovement 0 return -LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85D7 +LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanSouth:: @ 81F8536 + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerSouth waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT + msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_1F85E2 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85DB + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanSouth + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCSouth waitmovement 0 return -LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85E8 +LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanWest:: @ 81F8565 + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerWest waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT + msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_1F85F6 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85ED + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanWest + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCWest waitmovement 0 return -LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594 - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85FD +LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanEast:: @ 81F8594 + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT + msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F8604 + applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCEast waitmovement 0 return -LittlerootTown_BrendansHouse_2F_Movement_1F85BC: @ 81F85BC +LittlerootTown_BrendansHouse_2F_Movement_BrendanEnters: @ 81F85BC walk_down walk_down walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_2F_Movement_1F85C0: @ 81F85C0 +LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerNorth: @ 81F85C0 walk_left walk_left walk_down @@ -151,7 +151,7 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85C0: @ 81F85C0 walk_left step_end -LittlerootTown_BrendansHouse_2F_Movement_1F85C6: @ 81F85C6 +LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCNorth: @ 81F85C6 walk_up walk_up walk_up @@ -162,7 +162,7 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85C6: @ 81F85C6 walk_in_place_fastest_up step_end -LittlerootTown_BrendansHouse_2F_Movement_1F85CF: @ 81F85CF +LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanNorth: @ 81F85CF delay_16 walk_in_place_fastest_up delay_16 @@ -172,13 +172,13 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85CF: @ 81F85CF walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_2F_Movement_1F85D7: @ 81F85D7 +LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerSouth: @ 81F85D7 walk_left walk_left walk_left step_end -LittlerootTown_BrendansHouse_2F_Movement_1F85DB: @ 81F85DB +LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCSouth: @ 81F85DB walk_up walk_left walk_left @@ -187,7 +187,7 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85DB: @ 81F85DB walk_in_place_fastest_up step_end -LittlerootTown_BrendansHouse_2F_Movement_1F85E2: @ 81F85E2 +LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanSouth: @ 81F85E2 delay_16 walk_in_place_fastest_up delay_16 @@ -195,14 +195,14 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85E2: @ 81F85E2 walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_2F_Movement_1F85E8: @ 81F85E8 +LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerWest: @ 81F85E8 walk_left walk_left walk_down walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_2F_Movement_1F85ED: @ 81F85ED +LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCWest: @ 81F85ED walk_up walk_up walk_left @@ -213,7 +213,7 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85ED: @ 81F85ED walk_in_place_fastest_up step_end -LittlerootTown_BrendansHouse_2F_Movement_1F85F6: @ 81F85F6 +LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanWest: @ 81F85F6 delay_8 delay_16 walk_in_place_fastest_up @@ -222,7 +222,7 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85F6: @ 81F85F6 walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_2F_Movement_1F85FD: @ 81F85FD +LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast: @ 81F85FD walk_left walk_left walk_left @@ -231,29 +231,30 @@ LittlerootTown_BrendansHouse_2F_Movement_1F85FD: @ 81F85FD walk_in_place_fastest_down step_end -LittlerootTown_BrendansHouse_2F_Movement_1F8604: @ 81F8604 +LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCEast: @ 81F8604 walk_up walk_left walk_left walk_in_place_fastest_up step_end -LittlerootTown_BrendansHouse_2F_Movement_1F8609: @ 81F8609 +@ Unused, the player is already facing this direction so its unneeded +LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanEast: @ 81F8609 delay_16 delay_16 walk_in_place_fastest_left step_end -EventScript_PlayerPCMale:: @ 81F860D +LittlerootTown_BrendansHouse_2F_EventScript_PC:: @ 81F860D lockall checkplayergender compare VAR_RESULT, MALE - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8626 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_CheckPlayersPC compare VAR_RESULT, FEMALE - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F864C + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_CheckRivalsPC end -LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626 +LittlerootTown_BrendansHouse_2F_EventScript_CheckPlayersPC:: @ 81F8626 setvar VAR_0x8004, 1 special DoPCTurnOnEffect playse SE_PC_ON @@ -263,33 +264,31 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626 releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_1F863F:: @ 81F863F +LittlerootTown_BrendansHouse_2F_EventScript_TurnOffPlayerPC:: @ 81F863F setvar VAR_0x8004, 1 playse SE_PC_OFF special DoPCTurnOffEffect releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_1F864C:: @ 81F864C - msgbox gUnknown_08272CD5, MSGBOX_DEFAULT +LittlerootTown_BrendansHouse_2F_EventScript_CheckRivalsPC:: @ 81F864C + msgbox gText_PokemonTrainerSchoolEmail, MSGBOX_DEFAULT releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_1F8656:: @ 81F8656 -LittlerootTown_MaysHouse_2F_EventScript_1F8656:: @ 81F8656 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F877F, MSGBOX_SIGN +PlayersHouse_2F_EventScript_Notebook:: @ 81F8656 + msgbox PlayersHouse_2F_Text_Notebook, MSGBOX_SIGN end -LittlerootTown_BrendansHouse_2F_EventScript_1F865F:: @ 81F865F -LittlerootTown_MaysHouse_2F_EventScript_1F865F:: @ 81F865F - msgbox LittlerootTown_BrendansHouse_2F_Text_1F884F, MSGBOX_SIGN +PlayersHouse_2F_EventScript_GameCube:: @ 81F865F + msgbox PlayersHouse_2F_Text_ItsAGameCube, MSGBOX_SIGN end -LittlerootTown_BrendansHouse_2F_Text_1F8668: @ 81F8668 +PlayersHouse_2F_Text_ClockIsStopped: @ 81F8668 .string "The clock is stopped…\p" .string "Better set it and start it!$" -LittlerootTown_BrendansHouse_2F_Text_1F869A: @ 81F869A +PlayersHouse_2F_Text_HowDoYouLikeYourRoom: @ 81F869A .string "MOM: {PLAYER}, how do you like your\n" .string "new room?\p" .string "Good! Everything's put away neatly!\p" @@ -299,7 +298,7 @@ LittlerootTown_BrendansHouse_2F_Text_1F869A: @ 81F869A .string "Oh, you should make sure that\n" .string "everything's all there on your desk.$" -LittlerootTown_BrendansHouse_2F_Text_1F877F: @ 81F877F +PlayersHouse_2F_Text_Notebook: @ 81F877F .string "{PLAYER} flipped open the notebook.\p" .string "ADVENTURE RULE NO. 1\n" .string "Open the MENU with START.\p" @@ -311,7 +310,7 @@ Common_Text_LookCloserAtMap: @ 81F8820 .string "{PLAYER} took a closer look at the\n" .string "HOENN region map.$" -LittlerootTown_BrendansHouse_2F_Text_1F884F: @ 81F884F +PlayersHouse_2F_Text_ItsAGameCube: @ 81F884F .string "It's a Nintendo GameCube.\p" .string "A Game Boy Advance is connected to\n" .string "serve as the Controller.$" diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json index 0938e6966..118e3e819 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_MaysHouse_1F_EventScript_2929C5", + "script": "PlayersHouse_1F_EventScript_Mom", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_MaysHouse_1F_EventScript_292ABA", + "script": "PlayersHouse_1F_EventScript_Vigoroth1", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_MaysHouse_1F_EventScript_292ACD", + "script": "PlayersHouse_1F_EventScript_Vigoroth2", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_MaysHouse_1F_EventScript_1F89F3", + "script": "RivalsHouse_1F_EventScript_RivalMom", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A3D", + "script": "RivalsHouse_1F_EventScript_RivalSibling", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING" }, { @@ -103,7 +103,7 @@ "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", - "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN" + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY" } ], "warp_events": [ @@ -137,7 +137,7 @@ "elevation": 0, "var": "VAR_LITTLEROOT_INTRO_STATE", "var_value": "4", - "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A4C" + "script": "LittlerootTown_MaysHouse_1F_EventScript_GoSeeRoom" }, { "type": "trigger", @@ -146,7 +146,7 @@ "elevation": 0, "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", - "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A67" + "script": "LittlerootTown_MaysHouse_1F_EventScript_MeetRival0" }, { "type": "trigger", @@ -155,7 +155,7 @@ "elevation": 0, "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", - "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A73" + "script": "LittlerootTown_MaysHouse_1F_EventScript_MeetRival1" }, { "type": "trigger", @@ -164,7 +164,7 @@ "elevation": 0, "var": "VAR_LITTLEROOT_RIVAL_STATE", "var_value": "2", - "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A7F" + "script": "LittlerootTown_MaysHouse_1F_EventScript_MeetRival2" } ], "bg_events": [] diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 510f8c249..55736f652 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -1,110 +1,111 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5 - map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_MaysHouse_1F_MapScript1_1F88B5 - map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_1F_MapScript1_1F88F4 - map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MaysHouse_1F_MapScript2_1F893A + map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_MaysHouse_1F_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_1F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MaysHouse_1F_OnFrame .byte 0 -LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5 +LittlerootTown_MaysHouse_1F_OnLoad: @ 81F88B5 compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if_lt LittlerootTown_MaysHouse_1F_EventScript_1F88CA - call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_1F88DD + call_if_lt LittlerootTown_MaysHouse_1F_EventScript_SetMovingBoxes + call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_CheckShowShoesManual end -LittlerootTown_MaysHouse_1F_EventScript_1F88CA:: @ 81F88CA +LittlerootTown_MaysHouse_1F_EventScript_SetMovingBoxes:: @ 81F88CA setmetatile 5, 4, METATILE_BrendansMaysHouse_MovingBox_Open, 1 setmetatile 5, 2, METATILE_BrendansMaysHouse_MovingBox_Closed, 1 return -LittlerootTown_MaysHouse_1F_EventScript_1F88DD:: @ 81F88DD +LittlerootTown_MaysHouse_1F_EventScript_CheckShowShoesManual:: @ 81F88DD checkplayergender compare VAR_RESULT, FEMALE - goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F88EA + goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_ShowRunningShoesManual return -LittlerootTown_MaysHouse_1F_EventScript_1F88EA:: @ 81F88EA +LittlerootTown_MaysHouse_1F_EventScript_ShowRunningShoesManual:: @ 81F88EA setmetatile 6, 7, METATILE_BrendansMaysHouse_BookOnTable, 1 return -LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4 +LittlerootTown_MaysHouse_1F_OnTransition: @ 81F88F4 compare VAR_LITTLEROOT_INTRO_STATE, 3 - call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F892E + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MoveMomToDoor compare VAR_LITTLEROOT_INTRO_STATE, 5 - call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8916 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MoveMomToStairs compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8922 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MoveMomToTV end -LittlerootTown_MaysHouse_1F_EventScript_1F8916:: @ 81F8916 +LittlerootTown_MaysHouse_1F_EventScript_MoveMomToStairs:: @ 81F8916 setobjectxyperm 1, 2, 4 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return -LittlerootTown_MaysHouse_1F_EventScript_1F8922:: @ 81F8922 +LittlerootTown_MaysHouse_1F_EventScript_MoveMomToTV:: @ 81F8922 setobjectxyperm 1, 6, 5 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return -LittlerootTown_MaysHouse_1F_EventScript_1F892E:: @ 81F892E +LittlerootTown_MaysHouse_1F_EventScript_MoveMomToDoor:: @ 81F892E setobjectxyperm 1, 1, 8 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return -LittlerootTown_MaysHouse_1F_MapScript2_1F893A: @ 81F893A - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_1F898C - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_1F8964 - map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_1F899D - map_script_2 VAR_LITTLEROOT_HOUSES_STATE_2, 1, LittlerootTown_MaysHouse_1F_EventScript_1F89AE - map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_292AF2 +@ Many of the below scripts have no gender check because they assume youre in the correct house +LittlerootTown_MaysHouse_1F_OnFrame: @ 81F893A + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_EnterHouseMovingIn + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_PetalburgGymReport + map_script_2 VAR_LITTLEROOT_HOUSES_STATE_2, 1, LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV .2byte 0 -LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964 +LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F8964 lockall - msgbox LittlerootTown_MaysHouse_1F_Text_1F7B67, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_GoSetTheClock, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1F898A - applymovement 1, LittlerootTown_MaysHouse_1F_Movement_1F898A + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs + applymovement 1, LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs waitmovement 0 warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1 waitstate releaseall end -LittlerootTown_MaysHouse_1F_Movement_1F898A: @ 81F898A +LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs: @ 81F898A walk_up step_end -LittlerootTown_MaysHouse_1F_EventScript_1F898C:: @ 81F898C +LittlerootTown_MaysHouse_1F_EventScript_EnterHouseMovingIn:: @ 81F898C lockall setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - goto LittlerootTown_MaysHouse_1F_EventScript_292704 + setvar VAR_0x8005, FEMALE + goto PlayersHouse_1F_EventScript_EnterHouseMovingIn end -LittlerootTown_MaysHouse_1F_EventScript_1F899D:: @ 81F899D +LittlerootTown_MaysHouse_1F_EventScript_PetalburgGymReport:: @ 81F899D lockall setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 - goto LittlerootTown_MaysHouse_1F_EventScript_2928DC + goto PlayersHouse_1F_EventScript_PetalburgGymReportFemale end -LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE +LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor:: @ 81F89AE lockall playse SE_PIN applymovement 4, Common_Movement_ExclamationMark waitmovement 0 applymovement 4, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight - applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement 4, LittlerootTown_MaysHouse_1F_Movement_RivalMomApproach waitmovement 0 special GetRivalSonDaughterString - msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT + msgbox RivalsHouse_1F_Text_OhYoureTheNewNeighbor, MSGBOX_DEFAULT setflag FLAG_MET_RIVAL_MOM setvar VAR_LITTLEROOT_HOUSES_STATE_2, 2 releaseall end -LittlerootTown_MaysHouse_1F_Movement_1F89EC: @ 81F89EC +LittlerootTown_MaysHouse_1F_Movement_RivalMomApproach: @ 81F89EC walk_down walk_left walk_left @@ -113,71 +114,69 @@ LittlerootTown_MaysHouse_1F_Movement_1F89EC: @ 81F89EC walk_left step_end -LittlerootTown_BrendansHouse_1F_EventScript_1F89F3:: @ 81F89F3 -LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3 +RivalsHouse_1F_EventScript_RivalMom:: @ 81F89F3 lock faceplayer - goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_1F8A33 - goto_if_set FLAG_SYS_POKEMON_GET, LittlerootTown_BrendansHouse_1F_EventScript_1F8A29 + goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, RivalsHouse_1F_EventScript_GoHomeEverySoOften + goto_if_set FLAG_SYS_POKEMON_GET, RivalsHouse_1F_EventScript_RivalIsOnRoute103 compare VAR_LITTLEROOT_RIVAL_STATE, 3 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F + goto_if_eq RivalsHouse_1F_EventScript_RivalTooBusy special GetRivalSonDaughterString - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, MSGBOX_DEFAULT + msgbox RivalsHouse_1F_Text_LikeChildLikeFather, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F:: @ 81F8A1F - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D37, MSGBOX_DEFAULT +RivalsHouse_1F_EventScript_RivalTooBusy:: @ 81F8A1F + msgbox RivalsHouse_1F_Text_TooBusyToNoticeVisit, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_1F8A29:: @ 81F8A29 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D93, MSGBOX_DEFAULT +RivalsHouse_1F_EventScript_RivalIsOnRoute103:: @ 81F8A29 + msgbox RivalsHouse_1F_Text_WentOutToRoute103, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_1F8A33:: @ 81F8A33 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8E01, MSGBOX_DEFAULT +RivalsHouse_1F_EventScript_GoHomeEverySoOften:: @ 81F8A33 + msgbox RivalsHouse_1F_Text_ShouldGoHomeEverySoOften, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D:: @ 81F8A3D -LittlerootTown_MaysHouse_1F_EventScript_1F8A3D:: @ 81F8A3D +RivalsHouse_1F_EventScript_RivalSibling:: @ 81F8A3D lock faceplayer special GetPlayerBigGuyGirlString - msgbox LittlerootTown_BrendansHouse_1F_Text_1F9262, MSGBOX_DEFAULT + msgbox RivalsHouse_1F_Text_DoYouHavePokemon, MSGBOX_DEFAULT release end -LittlerootTown_MaysHouse_1F_EventScript_1F8A4C:: @ 81F8A4C +LittlerootTown_MaysHouse_1F_EventScript_GoSeeRoom:: @ 81F8A4C lockall setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - applymovement VAR_0x8004, Common_Movement_WalkInPlaceRight + setvar VAR_0x8005, FEMALE + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - goto LittlerootTown_MaysHouse_1F_EventScript_292765 + goto PlayersHouse_1F_EventScript_MomGoSeeRoom end -LittlerootTown_MaysHouse_1F_EventScript_1F8A67:: @ 81F8A67 +LittlerootTown_MaysHouse_1F_EventScript_MeetRival0:: @ 81F8A67 lockall setvar VAR_0x8008, 0 - goto LittlerootTown_MaysHouse_1F_EventScript_1F8A8B + goto LittlerootTown_MaysHouse_1F_EventScript_MeetRival end -LittlerootTown_MaysHouse_1F_EventScript_1F8A73:: @ 81F8A73 +LittlerootTown_MaysHouse_1F_EventScript_MeetRival1:: @ 81F8A73 lockall setvar VAR_0x8008, 1 - goto LittlerootTown_MaysHouse_1F_EventScript_1F8A8B + goto LittlerootTown_MaysHouse_1F_EventScript_MeetRival end -LittlerootTown_MaysHouse_1F_EventScript_1F8A7F:: @ 81F8A7F +LittlerootTown_MaysHouse_1F_EventScript_MeetRival2:: @ 81F8A7F lockall setvar VAR_0x8008, 2 - goto LittlerootTown_MaysHouse_1F_EventScript_1F8A8B + goto LittlerootTown_MaysHouse_1F_EventScript_MeetRival end -LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B +LittlerootTown_MaysHouse_1F_EventScript_MeetRival:: @ 81F8A8B playse SE_KAIDAN delay 10 addobject 7 @@ -188,25 +187,25 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B applymovement 7, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 1 - call_if_ne LittlerootTown_MaysHouse_1F_EventScript_1F8B2A + call_if_ne LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay playbgm MUS_GIRL_SUP, 1 compare VAR_0x8008, 0 - call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B35 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer0 compare VAR_0x8008, 1 - call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B40 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B4B - msgbox LittlerootTown_MaysHouse_1F_Text_1F8EC6, MSGBOX_DEFAULT + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer2 + msgbox RivalsHouse_1F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B6A + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs0 compare VAR_0x8008, 1 - call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B7C + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs1 compare VAR_0x8008, 2 - call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B8E + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs2 playse SE_KAIDAN removeobject 7 - setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM delay 30 @@ -217,27 +216,27 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B releaseall end -LittlerootTown_MaysHouse_1F_EventScript_1F8B2A:: @ 81F8B2A - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown +LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay:: @ 81F8B2A + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -LittlerootTown_MaysHouse_1F_EventScript_1F8B35:: @ 81F8B35 - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8B56 +LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer0:: @ 81F8B35 + applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer0 waitmovement 0 return -LittlerootTown_MaysHouse_1F_EventScript_1F8B40:: @ 81F8B40 - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8B5E +LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer1:: @ 81F8B40 + applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer1 waitmovement 0 return -LittlerootTown_MaysHouse_1F_EventScript_1F8B4B:: @ 81F8B4B - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8B62 +LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer2:: @ 81F8B4B + applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2 waitmovement 0 return -LittlerootTown_MaysHouse_1F_Movement_1F8B56: @ 81F8B56 +LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer0: @ 81F8B56 walk_in_place_fastest_left walk_left walk_in_place_fastest_up @@ -247,13 +246,13 @@ LittlerootTown_MaysHouse_1F_Movement_1F8B56: @ 81F8B56 walk_up step_end -LittlerootTown_MaysHouse_1F_Movement_1F8B5E: @ 81F8B5E +LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer1: @ 81F8B5E walk_up walk_up walk_up step_end -LittlerootTown_MaysHouse_1F_Movement_1F8B62: @ 81F8B62 +LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2: @ 81F8B62 walk_in_place_fastest_right walk_right walk_in_place_fastest_up @@ -263,31 +262,31 @@ LittlerootTown_MaysHouse_1F_Movement_1F8B62: @ 81F8B62 walk_up step_end -LittlerootTown_MaysHouse_1F_EventScript_1F8B6A:: @ 81F8B6A - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1F8BA0 - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BAF +LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs0:: @ 81F8B6A + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit0 + applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs0 waitmovement 0 return -LittlerootTown_MaysHouse_1F_EventScript_1F8B7C:: @ 81F8B7C - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1F8BA4 - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BB5 +LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs1:: @ 81F8B7C + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit1 + applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs1 waitmovement 0 return -LittlerootTown_MaysHouse_1F_EventScript_1F8B8E:: @ 81F8B8E - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1F8BAB - applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BBF +LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs2:: @ 81F8B8E + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit2 + applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs2 waitmovement 0 return -LittlerootTown_MaysHouse_1F_Movement_1F8BA0: @ 81F8BA0 +LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit0: @ 81F8BA0 delay_16 delay_8 walk_in_place_fastest_right step_end -LittlerootTown_MaysHouse_1F_Movement_1F8BA4: @ 81F8BA4 +LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit1: @ 81F8BA4 delay_16 delay_8 walk_in_place_fastest_right @@ -296,13 +295,13 @@ LittlerootTown_MaysHouse_1F_Movement_1F8BA4: @ 81F8BA4 walk_in_place_fastest_up step_end -LittlerootTown_MaysHouse_1F_Movement_1F8BAB: @ 81F8BAB +LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit2: @ 81F8BAB delay_16 delay_8 walk_in_place_fastest_left step_end -LittlerootTown_MaysHouse_1F_Movement_1F8BAF: @ 81F8BAF +LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs0: @ 81F8BAF walk_in_place_fastest_right walk_right walk_in_place_fastest_up @@ -310,7 +309,7 @@ LittlerootTown_MaysHouse_1F_Movement_1F8BAF: @ 81F8BAF walk_up step_end -LittlerootTown_MaysHouse_1F_Movement_1F8BB5: @ 81F8BB5 +LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs1: @ 81F8BB5 walk_in_place_fastest_right walk_right walk_in_place_fastest_up @@ -322,7 +321,7 @@ LittlerootTown_MaysHouse_1F_Movement_1F8BB5: @ 81F8BB5 walk_up step_end -LittlerootTown_MaysHouse_1F_Movement_1F8BBF: @ 81F8BBF +LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs2: @ 81F8BBF walk_in_place_fastest_left walk_left walk_in_place_fastest_up @@ -330,8 +329,7 @@ LittlerootTown_MaysHouse_1F_Movement_1F8BBF: @ 81F8BBF walk_up step_end -LittlerootTown_BrendansHouse_1F_Text_1F8BC5: @ 81F8BC5 -LittlerootTown_MaysHouse_1F_Text_1F8BC5: @ 81F8BC5 +RivalsHouse_1F_Text_OhYoureTheNewNeighbor: @ 81F8BC5 .string "Oh, hello. And you are?\p" .string "… … … … … … … … …\n" .string "… … … … … … … … …\p" @@ -343,26 +341,26 @@ LittlerootTown_MaysHouse_1F_Text_1F8BC5: @ 81F8BC5 .string "a new friend.\p" .string "Our {STR_VAR_1} is upstairs, I think.$" -LittlerootTown_BrendansHouse_1F_Text_1F8CA5: @ 81F8CA5 +RivalsHouse_1F_Text_LikeChildLikeFather: @ 81F8CA5 .string "Like child, like father.\p" .string "My husband is as wild about POKéMON\n" .string "as our child.\p" .string "If he's not at his LAB, he's likely\n" .string "scrabbling about in grassy places.$" -LittlerootTown_BrendansHouse_1F_Text_1F8D37: @ 81F8D37 +RivalsHouse_1F_Text_TooBusyToNoticeVisit: @ 81F8D37 .string "That {RIVAL}!\p" .string "I guess our child is too busy with\n" .string "POKéMON to notice that you came\l" .string "to visit, {PLAYER}{KUN}.$" -LittlerootTown_BrendansHouse_1F_Text_1F8D93: @ 81F8D93 +RivalsHouse_1F_Text_WentOutToRoute103: @ 81F8D93 .string "Oh, {RIVAL} went out to ROUTE 103\n" .string "just a little while ago.\p" .string "Like father, like child.\n" .string "{RIVAL} can't stay quietly at home.$" -LittlerootTown_BrendansHouse_1F_Text_1F8E01: @ 81F8E01 +RivalsHouse_1F_Text_ShouldGoHomeEverySoOften: @ 81F8E01 .string "I think it's wonderful for people to\n" .string "travel with POKéMON.\p" .string "But you should go home every so often\n" @@ -370,7 +368,7 @@ LittlerootTown_BrendansHouse_1F_Text_1F8E01: @ 81F8E01 .string "She might not say it, but I'm sure she\n" .string "worries about you, {PLAYER}{KUN}.$" -LittlerootTown_MaysHouse_1F_Text_1F8EC6: @ 81F8EC6 +RivalsHouse_1F_Text_MayWhoAreYou: @ 81F8EC6 .string "Huh?\n" .string "Who… Who are you?\p" .string "… … … … … … … …\n" @@ -394,7 +392,7 @@ LittlerootTown_MaysHouse_1F_Text_1F8EC6: @ 81F8EC6 .string "some wild POKéMON!\p" .string "{PLAYER}{KUN}, I'll catch you later!$" -LittlerootTown_BrendansHouse_1F_Text_1F90B4: @ 81F90B4 +RivalsHouse_1F_Text_BrendanWhoAreYou: @ 81F90B4 .string "Hey!\n" .string "You…\p" .string "Who are you?\p" @@ -414,7 +412,7 @@ LittlerootTown_BrendansHouse_1F_Text_1F90B4: @ 81F90B4 .string "some wild POKéMON.\p" .string "Some other time, okay?$" -LittlerootTown_BrendansHouse_1F_Text_1F9262: @ 81F9262 +RivalsHouse_1F_Text_DoYouHavePokemon: @ 81F9262 .string "Hi, neighbor!\p" .string "Do you already have your\n" .string "own POKéMON?$" diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json index d92b024c6..33cdfb7c1 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_MaysHouse_2F_EventScript_1F94C1", + "script": "RivalsHouse_2F_EventScript_Rival", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM" }, { @@ -219,7 +219,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "LittlerootTown_MaysHouse_2F_EventScript_1F9334", + "script": "LittlerootTown_MaysHouse_2F_EventScript_RivalsPokeBall", "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL" } ], @@ -240,7 +240,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_MaysHouse_2F_EventScript_1F865F" + "script": "PlayersHouse_2F_EventScript_GameCube" }, { "type": "sign", @@ -248,7 +248,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_MaysHouse_2F_EventScript_1F8656" + "script": "PlayersHouse_2F_EventScript_Notebook" }, { "type": "sign", @@ -256,7 +256,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "LittlerootTown_MaysHouse_2F_EventScript_29278D" + "script": "LittlerootTown_MaysHouse_2F_EventScript_WallClock" }, { "type": "sign", @@ -264,7 +264,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "EventScript_PlayerPCFemale" + "script": "LittlerootTown_MaysHouse_2F_EventScript_PC" } ] }
\ No newline at end of file diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 13fefa5a3..5bfbfbbcd 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -1,71 +1,70 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 81F9296 - map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_2F_MapScript1_1F92A1 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MaysHouse_2F_MapScript2_1F931D + map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_2F_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MaysHouse_2F_OnWarp .byte 0 -LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 +LittlerootTown_MaysHouse_2F_OnTransition: @ 81F92A1 compare VAR_LITTLEROOT_RIVAL_STATE, 2 - call_if_lt LittlerootTown_MaysHouse_2F_EventScript_1F930A + call_if_lt LittlerootTown_MaysHouse_2F_EventScript_CheckSetReadyToMeetMay compare VAR_LITTLEROOT_RIVAL_STATE, 3 - call_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F92CD + call_if_ge LittlerootTown_MaysHouse_2F_EventScript_CheckShouldUpdateMayPos compare VAR_LITTLEROOT_INTRO_STATE, 4 - call_if_eq LittlerootTown_MaysHouse_2F_EventScript_2926FE - call LittlerootTown_MaysHouse_2F_EventScript_275CE1 + call_if_eq PlayersHouse_2F_EventScript_BlockStairsUntilClockIsSet + call SecretBase_EventScript_SetDecorationFlags setvar VAR_SECRET_BASE_INITIALIZED, 0 end -LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD - goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_MaysHouse_2F_EventScript_1F92E6 +LittlerootTown_MaysHouse_2F_EventScript_CheckShouldUpdateMayPos:: @ 81F92CD + goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_MaysHouse_2F_EventScript_TryUpdateMayPos compare VAR_BIRCH_LAB_STATE, 2 - goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309 - goto LittlerootTown_MaysHouse_2F_EventScript_1F92E6 + goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_Ret + goto LittlerootTown_MaysHouse_2F_EventScript_TryUpdateMayPos -LittlerootTown_MaysHouse_2F_EventScript_1F92E6:: @ 81F92E6 +LittlerootTown_MaysHouse_2F_EventScript_TryUpdateMayPos:: @ 81F92E6 checkplayergender compare VAR_RESULT, FEMALE - goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9309 + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_Ret compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2 - goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309 + goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_Ret setobjectxyperm 1, 8, 2 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return -LittlerootTown_BrendansHouse_2F_EventScript_1F9309:: @ 81F9309 -LittlerootTown_MaysHouse_2F_EventScript_1F9309:: @ 81F9309 +LittlerootTown_MaysHouse_2F_EventScript_Ret:: @ 81F9309 return -LittlerootTown_MaysHouse_2F_EventScript_1F930A:: @ 81F930A +LittlerootTown_MaysHouse_2F_EventScript_CheckSetReadyToMeetMay:: @ 81F930A checkplayergender compare VAR_RESULT, MALE - goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9317 + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_SetReadyToMeetMay return -LittlerootTown_MaysHouse_2F_EventScript_1F9317:: @ 81F9317 +LittlerootTown_MaysHouse_2F_EventScript_SetReadyToMeetMay:: @ 81F9317 setvar VAR_LITTLEROOT_RIVAL_STATE, 2 return -LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D - map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9327 +LittlerootTown_MaysHouse_2F_OnWarp: @ 81F931D + map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_MaysHouse_2F_EventScript_CheckInitDecor .2byte 0 -LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327 +LittlerootTown_MaysHouse_2F_EventScript_CheckInitDecor:: @ 81F9327 checkplayergender compare VAR_RESULT, FEMALE - goto_if_eq EventScript_275D0C + goto_if_eq SecretBase_EventScript_InitDecorations end -LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334 +LittlerootTown_MaysHouse_2F_EventScript_RivalsPokeBall:: @ 81F9334 lockall compare VAR_LITTLEROOT_RIVAL_STATE, 2 - goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A - msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, MSGBOX_DEFAULT + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMay + msgbox RivalsHouse_2F_Text_ItsRivalsPokeBall, MSGBOX_DEFAULT releaseall end -LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A +LittlerootTown_MaysHouse_2F_EventScript_MeetMay:: @ 81F934A delay 10 addobject 1 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F946F + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayEnters waitmovement 0 playse SE_PIN applymovement 1, Common_Movement_ExclamationMark @@ -74,14 +73,14 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A waitmovement 0 delay 10 playbgm MUS_GIRL_SUP, 1 - compare VAR_FACING, 2 - call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F93BA - compare VAR_FACING, 1 - call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F93E9 - compare VAR_FACING, 3 - call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9418 - compare VAR_FACING, 4 - call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9440 + compare VAR_FACING, DIR_NORTH + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth + compare VAR_FACING, DIR_SOUTH + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth + compare VAR_FACING, DIR_WEST + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMayWest + compare VAR_FACING, DIR_EAST + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMayEast setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM @@ -91,60 +90,60 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A releaseall end -LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9473 +LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth:: @ 81F93BA + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT + msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_1F9483 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9479 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayNorth + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCNorth waitmovement 0 return -LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948B +LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth:: @ 81F93E9 + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT + msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_1F9497 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948F + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMaySouth + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCSouth waitmovement 0 return -LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F949D +LittlerootTown_MaysHouse_2F_EventScript_MeetMayWest:: @ 81F9418 + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT + msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94A4 + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCWest waitmovement 0 return -LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440 - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94AD +LittlerootTown_MaysHouse_2F_EventScript_MeetMayEast:: @ 81F9440 + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerEast waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT + msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_1F94BB - applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94B2 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayEast + applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCEast waitmovement 0 return -LittlerootTown_MaysHouse_2F_Movement_1F946F: @ 81F946F +LittlerootTown_MaysHouse_2F_Movement_MayEnters: @ 81F946F walk_down walk_down walk_in_place_fastest_right step_end -LittlerootTown_MaysHouse_2F_Movement_1F9473: @ 81F9473 +LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth: @ 81F9473 walk_right walk_right walk_down @@ -152,7 +151,7 @@ LittlerootTown_MaysHouse_2F_Movement_1F9473: @ 81F9473 walk_right step_end -LittlerootTown_MaysHouse_2F_Movement_1F9479: @ 81F9479 +LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCNorth: @ 81F9479 walk_up walk_up walk_up @@ -164,7 +163,7 @@ LittlerootTown_MaysHouse_2F_Movement_1F9479: @ 81F9479 walk_in_place_fastest_up step_end -LittlerootTown_MaysHouse_2F_Movement_1F9483: @ 81F9483 +LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayNorth: @ 81F9483 delay_16 walk_in_place_fastest_up delay_16 @@ -174,13 +173,13 @@ LittlerootTown_MaysHouse_2F_Movement_1F9483: @ 81F9483 walk_in_place_fastest_right step_end -LittlerootTown_MaysHouse_2F_Movement_1F948B: @ 81F948B +LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth: @ 81F948B walk_right walk_right walk_right step_end -LittlerootTown_MaysHouse_2F_Movement_1F948F: @ 81F948F +LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCSouth: @ 81F948F walk_up walk_in_place_fastest_right walk_right @@ -190,7 +189,7 @@ LittlerootTown_MaysHouse_2F_Movement_1F948F: @ 81F948F walk_in_place_fastest_up step_end -LittlerootTown_MaysHouse_2F_Movement_1F9497: @ 81F9497 +LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMaySouth: @ 81F9497 delay_16 walk_in_place_fastest_up delay_16 @@ -198,7 +197,7 @@ LittlerootTown_MaysHouse_2F_Movement_1F9497: @ 81F9497 walk_in_place_fastest_right step_end -LittlerootTown_MaysHouse_2F_Movement_1F949D: @ 81F949D +LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest: @ 81F949D walk_right walk_right walk_right @@ -207,27 +206,28 @@ LittlerootTown_MaysHouse_2F_Movement_1F949D: @ 81F949D walk_in_place_fastest_down step_end -LittlerootTown_MaysHouse_2F_Movement_1F94A4: @ 81F94A4 +LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCWest: @ 81F94A4 walk_up walk_right walk_right walk_in_place_fastest_up step_end -LittlerootTown_MaysHouse_2F_Movement_1F94A9: @ 81F94A9 +@ Unused, the player is already facing this direction so its unneeded +LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayWest: @ 81F94A9 delay_16 delay_16 walk_in_place_fastest_right step_end -LittlerootTown_MaysHouse_2F_Movement_1F94AD: @ 81F94AD +LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerEast: @ 81F94AD walk_right walk_right walk_down walk_in_place_fastest_right step_end -LittlerootTown_MaysHouse_2F_Movement_1F94B2: @ 81F94B2 +LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCEast: @ 81F94B2 walk_up walk_up walk_right @@ -238,7 +238,7 @@ LittlerootTown_MaysHouse_2F_Movement_1F94B2: @ 81F94B2 walk_in_place_fastest_up step_end -LittlerootTown_MaysHouse_2F_Movement_1F94BB: @ 81F94BB +LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayEast: @ 81F94BB delay_16 walk_in_place_fastest_up delay_16 @@ -246,72 +246,71 @@ LittlerootTown_MaysHouse_2F_Movement_1F94BB: @ 81F94BB walk_in_place_fastest_right step_end -LittlerootTown_BrendansHouse_2F_EventScript_1F94C1:: @ 81F94C1 -LittlerootTown_MaysHouse_2F_EventScript_1F94C1:: @ 81F94C1 +RivalsHouse_2F_EventScript_Rival:: @ 81F94C1 lockall - goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F94F7 + goto_if_set FLAG_MET_RIVAL_LILYCOVE, RivalsHouse_2F_EventScript_RivalPostLilycove checkplayergender compare VAR_RESULT, MALE - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94E3 + goto_if_eq RivalsHouse_2F_EventScript_May compare VAR_RESULT, FEMALE - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94ED + goto_if_eq RivalsHouse_2F_EventScript_Brendan end -LittlerootTown_BrendansHouse_2F_EventScript_1F94E3:: @ 81F94E3 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F978A, MSGBOX_DEFAULT +RivalsHouse_2F_EventScript_May:: @ 81F94E3 + msgbox RivalsHouse_2F_Text_MayGettingReady, MSGBOX_DEFAULT releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_1F94ED:: @ 81F94ED - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9962, MSGBOX_DEFAULT +RivalsHouse_2F_EventScript_Brendan:: @ 81F94ED + msgbox RivalsHouse_2F_Text_BrendanGettingReady, MSGBOX_DEFAULT releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7 +RivalsHouse_2F_EventScript_RivalPostLilycove:: @ 81F94F7 applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F951D + call_if_eq RivalsHouse_2F_EventScript_MayPostLilycove compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F952F + call_if_eq RivalsHouse_2F_EventScript_BrendanPostLilycove setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_1F951D:: @ 81F951D - goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F9541 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F99C9, MSGBOX_DEFAULT +RivalsHouse_2F_EventScript_MayPostLilycove:: @ 81F951D + goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, RivalsHouse_2F_EventScript_MayWhereShouldIGoNext + msgbox RivalsHouse_2F_Text_MayJustCheckingMyPokedex, MSGBOX_DEFAULT return -LittlerootTown_BrendansHouse_2F_EventScript_1F952F:: @ 81F952F - goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F954A - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9B0D, MSGBOX_DEFAULT +RivalsHouse_2F_EventScript_BrendanPostLilycove:: @ 81F952F + goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, RivalsHouse_2F_EventScript_BrendanWhereShouldIGoNext + msgbox RivalsHouse_2F_Text_BrendanJustCheckingMyPokedex, MSGBOX_DEFAULT return -LittlerootTown_BrendansHouse_2F_EventScript_1F9541:: @ 81F9541 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9A9E, MSGBOX_DEFAULT +RivalsHouse_2F_EventScript_MayWhereShouldIGoNext:: @ 81F9541 + msgbox RivalsHouse_2F_Text_MayWhereShouldIGoNext, MSGBOX_DEFAULT return -LittlerootTown_BrendansHouse_2F_EventScript_1F954A:: @ 81F954A - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9BE7, MSGBOX_DEFAULT +RivalsHouse_2F_EventScript_BrendanWhereShouldIGoNext:: @ 81F954A + msgbox RivalsHouse_2F_Text_BrendanWhereShouldIGoNext, MSGBOX_DEFAULT return -EventScript_PlayerPCFemale:: @ 81F9553 +LittlerootTown_MaysHouse_2F_EventScript_PC:: @ 81F9553 lockall checkplayergender compare VAR_RESULT, MALE - goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F956C + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_CheckRivalsPC compare VAR_RESULT, FEMALE - goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9576 + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_CheckPlayersPC end -LittlerootTown_MaysHouse_2F_EventScript_1F956C:: @ 81F956C - msgbox gUnknown_08272CD5, MSGBOX_DEFAULT +LittlerootTown_MaysHouse_2F_EventScript_CheckRivalsPC:: @ 81F956C + msgbox gText_PokemonTrainerSchoolEmail, MSGBOX_DEFAULT releaseall end -LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576 +LittlerootTown_MaysHouse_2F_EventScript_CheckPlayersPC:: @ 81F9576 setvar VAR_0x8004, 2 special DoPCTurnOnEffect playse SE_PC_ON @@ -321,14 +320,14 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576 releaseall end -LittlerootTown_MaysHouse_2F_EventScript_1F958F:: @ 81F958F +LittlerootTown_MaysHouse_2F_EventScript_TurnOffPlayerPC:: @ 81F958F setvar VAR_0x8004, 2 playse SE_PC_OFF special DoPCTurnOffEffect releaseall end -LittlerootTown_MaysHouse_2F_Text_1F959C: @ 81F959C +RivalsHouse_2F_Text_MayWhoAreYou: @ 81F959C .string "Huh?\n" .string "Who… Who are you?\p" .string "… … … … … … … …\n" @@ -352,11 +351,11 @@ LittlerootTown_MaysHouse_2F_Text_1F959C: @ 81F959C .string "some wild POKéMON!\p" .string "{PLAYER}{KUN}, I'll catch you later!$" -LittlerootTown_BrendansHouse_2F_Text_1F978A: @ 81F978A +RivalsHouse_2F_Text_MayGettingReady: @ 81F978A .string "POKéMON fully restored!\n" .string "Items ready, and…$" -LittlerootTown_BrendansHouse_2F_Text_1F97B4: @ 81F97B4 +RivalsHouse_2F_Text_BrendanWhoAreYou: @ 81F97B4 .string "Hey!\n" .string "You…\p" .string "Who are you?\p" @@ -376,16 +375,15 @@ LittlerootTown_BrendansHouse_2F_Text_1F97B4: @ 81F97B4 .string "some wild POKéMON.\p" .string "Some other time, okay?$" -LittlerootTown_BrendansHouse_2F_Text_1F9962: @ 81F9962 +RivalsHouse_2F_Text_BrendanGettingReady: @ 81F9962 .string "POKéMON fully restored…\n" .string "Items all packed, and…$" -LittlerootTown_BrendansHouse_2F_Text_1F9991: @ 81F9991 -LittlerootTown_MaysHouse_2F_Text_1F9991: @ 81F9991 +RivalsHouse_2F_Text_ItsRivalsPokeBall: @ 81F9991 .string "It's {RIVAL}'s POKé BALL!\p" .string "Better leave it right where it is.$" -LittlerootTown_BrendansHouse_2F_Text_1F99C9: @ 81F99C9 +RivalsHouse_2F_Text_MayJustCheckingMyPokedex: @ 81F99C9 .string "MAY: {PLAYER}{KUN}!\p" .string "I was just checking my POKéDEX.\p" .string "There's still a lot of POKéMON that\n" @@ -395,13 +393,13 @@ LittlerootTown_BrendansHouse_2F_Text_1F99C9: @ 81F99C9 .string "I wonder where I should go catch\n" .string "some POKéMON next?$" -LittlerootTown_BrendansHouse_2F_Text_1F9A9E: @ 81F9A9E +RivalsHouse_2F_Text_MayWhereShouldIGoNext: @ 81F9A9E .string "MAY: I wonder where I should go catch\n" .string "some POKéMON next?\p" .string "Wouldn't it be funny if we ran into each\n" .string "other, {PLAYER}{KUN}?$" -LittlerootTown_BrendansHouse_2F_Text_1F9B0D: @ 81F9B0D +RivalsHouse_2F_Text_BrendanJustCheckingMyPokedex: @ 81F9B0D .string "BRENDAN: Hey, it's {PLAYER}.\p" .string "I was just checking out my POKéDEX.\p" .string "There are still many POKéMON that\n" @@ -410,7 +408,7 @@ LittlerootTown_BrendansHouse_2F_Text_1F9B0D: @ 81F9B0D .string "Checking this POKéDEX out gives me\n" .string "the urge to hit the road again.$" -LittlerootTown_BrendansHouse_2F_Text_1F9BE7: @ 81F9BE7 +RivalsHouse_2F_Text_BrendanWhereShouldIGoNext: @ 81F9BE7 .string "BRENDAN: I'm having a hard time deciding\n" .string "where I should catch POKéMON next.\p" .string "Hey, {PLAYER}, if I see you while I'm out\n" diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 9949df08c..bdf05dd92 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -5,8 +5,8 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91 .byte 0 LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1 - call Common_EventScript_SetupRivalGender - call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD + call Common_EventScript_SetupRivalGfxId + call ProfBirch_EventScript_UpdateLocation compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7 compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4 @@ -99,23 +99,23 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB playfanfare MUS_FANFA4 waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8B1, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17 end LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07 setvar VAR_0x8004, 0 - call Common_EventScript_NameReceivedPokemon + call Common_EventScript_NameReceivedPartyMon goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17 end LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8F6, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48 end @@ -128,9 +128,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48:: @ 81F9E48 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA35, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48 end @@ -167,8 +167,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 delay 10 playse SE_TK_KASYA delay 20 - applymovement 3, Common_Movement_WalkInPlaceRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement 3, Common_Movement_WalkInPlaceFastestRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 checkplayergender compare VAR_RESULT, MALE @@ -180,8 +180,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 delay 20 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F58 waitmovement 0 - applymovement 3, Common_Movement_WalkInPlaceUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement 3, Common_Movement_WalkInPlaceFastestUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, MSGBOX_DEFAULT playfanfare MUS_FANFA4 @@ -286,11 +286,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB release compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, Common_Movement_WalkInPlaceRight + applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - drawmonpic SPECIES_CYNDAQUIL, 10, 3 + showmonpic SPECIES_CYNDAQUIL, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C end @@ -299,11 +299,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF release compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, Common_Movement_WalkInPlaceRight + applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - drawmonpic SPECIES_TOTODILE, 10, 3 + showmonpic SPECIES_TOTODILE, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D end @@ -312,11 +312,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023 release compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 - applymovement 2, Common_Movement_WalkInPlaceRight + applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - drawmonpic SPECIES_CHIKORITA, 10, 3 + showmonpic SPECIES_CHIKORITA, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE end @@ -327,7 +327,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA057:: @ 81FA057 end LittlerootTown_ProfessorBirchsLab_EventScript_1FA061:: @ 81FA061 - erasemonpic + hidemonpic msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB959, MSGBOX_DEFAULT releaseall end @@ -340,18 +340,18 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1 compare VAR_RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC - erasemonpic - goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 + hidemonpic + goto Common_EventScript_NoMoreRoomForPokemon end LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1 call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 4 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD - call LittlerootTown_ProfessorBirchsLab_EventScript_27378B - call Common_EventScript_NameReceivedPokemon + call Common_EventScript_GetGiftMonPartySlot + call Common_EventScript_NameReceivedPartyMon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD end @@ -359,19 +359,19 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 4 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 - call LittlerootTown_ProfessorBirchsLab_EventScript_273797 + call Common_EventScript_NameReceivedBoxMon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 end LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2:: @ 81FA0F2 - call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0 + call Common_EventScript_TransferredToPC goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD end LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD - erasemonpic + hidemonpic msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 releaseall @@ -385,18 +385,18 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142 compare VAR_RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D - erasemonpic - goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 + hidemonpic + goto Common_EventScript_NoMoreRoomForPokemon end LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142 call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 5 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E - call LittlerootTown_ProfessorBirchsLab_EventScript_27378B - call Common_EventScript_NameReceivedPokemon + call Common_EventScript_GetGiftMonPartySlot + call Common_EventScript_NameReceivedPartyMon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E end @@ -404,19 +404,19 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 5 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 - call LittlerootTown_ProfessorBirchsLab_EventScript_273797 + call Common_EventScript_NameReceivedBoxMon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 end LittlerootTown_ProfessorBirchsLab_EventScript_1FA193:: @ 81FA193 - call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0 + call Common_EventScript_TransferredToPC goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E end LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E - erasemonpic + hidemonpic msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 releaseall @@ -430,18 +430,18 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3 compare VAR_RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E - erasemonpic - goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 + hidemonpic + goto Common_EventScript_NoMoreRoomForPokemon end LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3 call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 6 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F - call LittlerootTown_ProfessorBirchsLab_EventScript_27378B - call Common_EventScript_NameReceivedPokemon + call Common_EventScript_GetGiftMonPartySlot + call Common_EventScript_NameReceivedPartyMon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F end @@ -449,19 +449,19 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 6 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 - call LittlerootTown_ProfessorBirchsLab_EventScript_273797 + call Common_EventScript_NameReceivedBoxMon goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 end LittlerootTown_ProfessorBirchsLab_EventScript_1FA234:: @ 81FA234 - call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0 + call Common_EventScript_TransferredToPC goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F end LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F:: @ 81FA23F - erasemonpic + hidemonpic msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 releaseall @@ -482,7 +482,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294 goto_if_unset FLAG_HAS_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E - goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2 + goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, EventScript_RegisterProfBirch goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E end @@ -497,19 +497,18 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294 end LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E - goto_if_unset FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380, LittlerootTown_ProfessorBirchsLab_EventScript_272141 + goto_if_unset FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380, ProfBirch_EventScript_RatePokedexOrRegister compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141 + goto_if_eq ProfBirch_EventScript_RatePokedexOrRegister compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 - goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_272141 + goto_if_ge ProfBirch_EventScript_RatePokedexOrRegister compare VAR_BIRCH_LAB_STATE, 5 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, MSGBOX_DEFAULT release end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2:: @ 81FA2D2 -Route101_EventScript_1FA2D2:: @ 81FA2D2 +EventScript_RegisterProfBirch:: @ 81FA2D2 msgbox Route101_Text_2B5F52, MSGBOX_DEFAULT closemessage delay 30 @@ -530,7 +529,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 closemessage applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 checkplayergender compare VAR_RESULT, MALE diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json index 350c52b4f..37bad78ff 100644 --- a/data/maps/MagmaHideout_1F/map.json +++ b/data/maps/MagmaHideout_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "MagmaHideout_1F_EventScript_23988C", + "script": "MagmaHideout_1F_EventScript_Grunt38", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "MagmaHideout_1F_EventScript_2398A3", + "script": "MagmaHideout_1F_EventScript_Grunt39", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc index 2fe4ad581..6b41021a9 100644 --- a/data/maps/MagmaHideout_1F/scripts.inc +++ b/data/maps/MagmaHideout_1F/scripts.inc @@ -6,33 +6,33 @@ MagmaHideout_1F_OnTransition: @ 8239886 setvar VAR_JAGGED_PASS_ASH_WEATHER, 0 end -MagmaHideout_1F_EventScript_23988C:: @ 823988C - trainerbattle_single TRAINER_GRUNT_38, MagmaHideout_1F_Text_2398BA, MagmaHideout_1F_Text_239964 - msgbox MagmaHideout_1F_Text_2399B1, MSGBOX_AUTOCLOSE +MagmaHideout_1F_EventScript_Grunt38:: @ 823988C + trainerbattle_single TRAINER_GRUNT_38, MagmaHideout_1F_Text_Grunt38Intro, MagmaHideout_1F_Text_Grunt38Defeat + msgbox MagmaHideout_1F_Text_Grunt38PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_1F_EventScript_2398A3:: @ 82398A3 - trainerbattle_single TRAINER_GRUNT_39, MagmaHideout_1F_Text_2399F5, MagmaHideout_1F_Text_239ABA - msgbox MagmaHideout_1F_Text_239ACD, MSGBOX_AUTOCLOSE +MagmaHideout_1F_EventScript_Grunt39:: @ 82398A3 + trainerbattle_single TRAINER_GRUNT_39, MagmaHideout_1F_Text_Grunt39Intro, MagmaHideout_1F_Text_Grunt39Defeat + msgbox MagmaHideout_1F_Text_Grunt39PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_1F_Text_2398BA: @ 82398BA +MagmaHideout_1F_Text_Grunt38Intro: @ 82398BA .string "When TEAM MAGMA has roll call, we get\n" .string "important guarding assignments in\l" .string "the order that we line up.\p" .string "That's why I'm stuck off in this corner.\n" .string "I'm always late to roll call!$" -MagmaHideout_1F_Text_239964: @ 8239964 +MagmaHideout_1F_Text_Grunt38Defeat: @ 8239964 .string "I'm always late for training sessions,\n" .string "too!\p" .string "I hate to say it, but I'm wimpy…$" -MagmaHideout_1F_Text_2399B1: @ 82399B1 +MagmaHideout_1F_Text_Grunt38PostBattle: @ 82399B1 .string "Okay, I'll try to put a little more\n" .string "effort into things from now on…$" -MagmaHideout_1F_Text_2399F5: @ 82399F5 +MagmaHideout_1F_Text_Grunt39Intro: @ 82399F5 .string "Our leader told us to dig into\n" .string "MT. CHIMNEY, so we dug and dug.\p" .string "And in the course of digging, we came\n" @@ -41,11 +41,11 @@ MagmaHideout_1F_Text_2399F5: @ 82399F5 .string "Fuhahaha!\n" .string "I'll tell you if you beat me!$" -MagmaHideout_1F_Text_239ABA: @ 8239ABA +MagmaHideout_1F_Text_Grunt39Defeat: @ 8239ABA .string "Arrgh!\n" .string "Taken down!$" -MagmaHideout_1F_Text_239ACD: @ 8239ACD +MagmaHideout_1F_Text_Grunt39PostBattle: @ 8239ACD .string "I won't tell you after all.\n" .string "You'll find out when you get there!\p" .string "It'd be better if you saved surprises\n" diff --git a/data/maps/MagmaHideout_2F_1R/map.json b/data/maps/MagmaHideout_2F_1R/map.json index d628c1b5a..6b0d9614d 100644 --- a/data/maps/MagmaHideout_2F_1R/map.json +++ b/data/maps/MagmaHideout_2F_1R/map.json @@ -24,7 +24,7 @@ "movement_range_y": 4, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MagmaHideout_2F_1R_EventScript_239B7F", + "script": "MagmaHideout_2F_1R_EventScript_Grunt41", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -37,7 +37,7 @@ "movement_range_y": 6, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MagmaHideout_2F_1R_EventScript_239B96", + "script": "MagmaHideout_2F_1R_EventScript_Grunt42", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "7", - "script": "MagmaHideout_2F_1R_EventScript_239B51", + "script": "MagmaHideout_2F_1R_EventScript_Grunt51", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MagmaHideout_2F_1R_EventScript_239B68", + "script": "MagmaHideout_2F_1R_EventScript_Grunt40", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" } ], diff --git a/data/maps/MagmaHideout_2F_1R/scripts.inc b/data/maps/MagmaHideout_2F_1R/scripts.inc index 9ea2ef6fe..b6c3154b0 100644 --- a/data/maps/MagmaHideout_2F_1R/scripts.inc +++ b/data/maps/MagmaHideout_2F_1R/scripts.inc @@ -1,27 +1,27 @@ MagmaHideout_2F_1R_MapScripts:: @ 8239B50 .byte 0 -MagmaHideout_2F_1R_EventScript_239B51:: @ 8239B51 - trainerbattle_single TRAINER_GRUNT_51, MagmaHideout_2F_1R_Text_239BAD, MagmaHideout_2F_1R_Text_239C4B - msgbox MagmaHideout_2F_1R_Text_239C74, MSGBOX_AUTOCLOSE +MagmaHideout_2F_1R_EventScript_Grunt51:: @ 8239B51 + trainerbattle_single TRAINER_GRUNT_51, MagmaHideout_2F_1R_Text_Grunt51Intro, MagmaHideout_2F_1R_Text_Grunt51Defeat + msgbox MagmaHideout_2F_1R_Text_Grunt51PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_2F_1R_EventScript_239B68:: @ 8239B68 - trainerbattle_single TRAINER_GRUNT_40, MagmaHideout_2F_1R_Text_239CAB, MagmaHideout_2F_1R_Text_239D09 - msgbox MagmaHideout_2F_1R_Text_239D1D, MSGBOX_AUTOCLOSE +MagmaHideout_2F_1R_EventScript_Grunt40:: @ 8239B68 + trainerbattle_single TRAINER_GRUNT_40, MagmaHideout_2F_1R_Text_Grunt40Intro, MagmaHideout_2F_1R_Text_Grunt40Defeat + msgbox MagmaHideout_2F_1R_Text_Grunt40PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_2F_1R_EventScript_239B7F:: @ 8239B7F - trainerbattle_single TRAINER_GRUNT_41, MagmaHideout_2F_1R_Text_239D62, MagmaHideout_2F_1R_Text_239D75 - msgbox MagmaHideout_2F_1R_Text_239D7D, MSGBOX_AUTOCLOSE +MagmaHideout_2F_1R_EventScript_Grunt41:: @ 8239B7F + trainerbattle_single TRAINER_GRUNT_41, MagmaHideout_2F_1R_Text_Grunt41Intro, MagmaHideout_2F_1R_Text_Grunt41Defeat + msgbox MagmaHideout_2F_1R_Text_Grunt41PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_2F_1R_EventScript_239B96:: @ 8239B96 - trainerbattle_single TRAINER_GRUNT_42, MagmaHideout_2F_1R_Text_239DC5, MagmaHideout_2F_1R_Text_239DDA - msgbox MagmaHideout_2F_1R_Text_239DE2, MSGBOX_AUTOCLOSE +MagmaHideout_2F_1R_EventScript_Grunt42:: @ 8239B96 + trainerbattle_single TRAINER_GRUNT_42, MagmaHideout_2F_1R_Text_Grunt42Intro, MagmaHideout_2F_1R_Text_Grunt42Defeat + msgbox MagmaHideout_2F_1R_Text_Grunt42PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_2F_1R_Text_239BAD: @ 8239BAD +MagmaHideout_2F_1R_Text_Grunt51Intro: @ 8239BAD .string "What, what, what?\p" .string "Only TEAM MAGMA members are supposed\n" .string "to be in here!\p" @@ -30,46 +30,46 @@ MagmaHideout_2F_1R_Text_239BAD: @ 8239BAD .string "You rouse my suspicion!\n" .string "Battle with me!$" -MagmaHideout_2F_1R_Text_239C4B: @ 8239C4B +MagmaHideout_2F_1R_Text_Grunt51Defeat: @ 8239C4B .string "Aiyiyi…\n" .string "My pride as a TEAM MAGMA member…$" -MagmaHideout_2F_1R_Text_239C74: @ 8239C74 +MagmaHideout_2F_1R_Text_Grunt51PostBattle: @ 8239C74 .string "If you suffer from chills, you should\n" .string "join TEAM MAGMA.$" -MagmaHideout_2F_1R_Text_239CAB: @ 8239CAB +MagmaHideout_2F_1R_Text_Grunt40Intro: @ 8239CAB .string "Hold it right there!\p" .string "You don't really expect me to keep\n" .string "my trap shut and let you waltz by me?$" -MagmaHideout_2F_1R_Text_239D09: @ 8239D09 +MagmaHideout_2F_1R_Text_Grunt40Defeat: @ 8239D09 .string "Ooh wow!\n" .string "I concede!$" -MagmaHideout_2F_1R_Text_239D1D: @ 8239D1D +MagmaHideout_2F_1R_Text_Grunt40PostBattle: @ 8239D1D .string "Maybe it would've been better if I did\n" .string "just let you go unchallenged…$" -MagmaHideout_2F_1R_Text_239D62: @ 8239D62 +MagmaHideout_2F_1R_Text_Grunt41Intro: @ 8239D62 .string "Ahah!\n" .string "An intruder!$" -MagmaHideout_2F_1R_Text_239D75: @ 8239D75 +MagmaHideout_2F_1R_Text_Grunt41Defeat: @ 8239D75 .string "Graaah!$" -MagmaHideout_2F_1R_Text_239D7D: @ 8239D7D +MagmaHideout_2F_1R_Text_Grunt41PostBattle: @ 8239D7D .string "I've already lost.\p" .string "Do I really need to keep running\n" .string "around in a circle?$" -MagmaHideout_2F_1R_Text_239DC5: @ 8239DC5 +MagmaHideout_2F_1R_Text_Grunt42Intro: @ 8239DC5 .string "Oh, oh!\n" .string "An intruder!$" -MagmaHideout_2F_1R_Text_239DDA: @ 8239DDA +MagmaHideout_2F_1R_Text_Grunt42Defeat: @ 8239DDA .string "Mutter…$" -MagmaHideout_2F_1R_Text_239DE2: @ 8239DE2 +MagmaHideout_2F_1R_Text_Grunt42PostBattle: @ 8239DE2 .string "Actually, I'm no expert at battling…$" diff --git a/data/maps/MagmaHideout_2F_2R/map.json b/data/maps/MagmaHideout_2F_2R/map.json index b52d34212..8befdc42a 100644 --- a/data/maps/MagmaHideout_2F_2R/map.json +++ b/data/maps/MagmaHideout_2F_2R/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "7", - "script": "MagmaHideout_2F_2R_EventScript_239E4D", + "script": "MagmaHideout_2F_2R_EventScript_Grunt45", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "MagmaHideout_2F_2R_EventScript_239E36", + "script": "MagmaHideout_2F_2R_EventScript_Grunt44", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "MagmaHideout_2F_2R_EventScript_239E1F", + "script": "MagmaHideout_2F_2R_EventScript_Grunt43", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MagmaHideout_2F_2R_EventScript_239E08", + "script": "MagmaHideout_2F_2R_EventScript_Grunt52", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { diff --git a/data/maps/MagmaHideout_2F_2R/scripts.inc b/data/maps/MagmaHideout_2F_2R/scripts.inc index 5539d26de..af63aa5de 100644 --- a/data/maps/MagmaHideout_2F_2R/scripts.inc +++ b/data/maps/MagmaHideout_2F_2R/scripts.inc @@ -1,78 +1,78 @@ MagmaHideout_2F_2R_MapScripts:: @ 8239E07 .byte 0 -MagmaHideout_2F_2R_EventScript_239E08:: @ 8239E08 - trainerbattle_single TRAINER_GRUNT_52, MagmaHideout_2F_2R_Text_239E64, MagmaHideout_2F_2R_Text_239EA5 - msgbox MagmaHideout_2F_2R_Text_239EBB, MSGBOX_AUTOCLOSE +MagmaHideout_2F_2R_EventScript_Grunt52:: @ 8239E08 + trainerbattle_single TRAINER_GRUNT_52, MagmaHideout_2F_2R_Text_Grunt52Intro, MagmaHideout_2F_2R_Text_Grunt52Defeat + msgbox MagmaHideout_2F_2R_Text_Grunt52PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_2F_2R_EventScript_239E1F:: @ 8239E1F - trainerbattle_single TRAINER_GRUNT_43, MagmaHideout_2F_2R_Text_239F31, MagmaHideout_2F_2R_Text_239F71 - msgbox MagmaHideout_2F_2R_Text_239FA1, MSGBOX_AUTOCLOSE +MagmaHideout_2F_2R_EventScript_Grunt43:: @ 8239E1F + trainerbattle_single TRAINER_GRUNT_43, MagmaHideout_2F_2R_Text_Grunt43Intro, MagmaHideout_2F_2R_Text_Grunt43Defeat + msgbox MagmaHideout_2F_2R_Text_Grunt43PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_2F_2R_EventScript_239E36:: @ 8239E36 - trainerbattle_single TRAINER_GRUNT_44, MagmaHideout_2F_2R_Text_239FDE, MagmaHideout_2F_2R_Text_23A050 - msgbox MagmaHideout_2F_2R_Text_23A07D, MSGBOX_AUTOCLOSE +MagmaHideout_2F_2R_EventScript_Grunt44:: @ 8239E36 + trainerbattle_single TRAINER_GRUNT_44, MagmaHideout_2F_2R_Text_Grunt44Intro, MagmaHideout_2F_2R_Text_Grunt44Defeat + msgbox MagmaHideout_2F_2R_Text_Grunt44PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_2F_2R_EventScript_239E4D:: @ 8239E4D - trainerbattle_single TRAINER_GRUNT_45, MagmaHideout_2F_2R_Text_23A0E4, MagmaHideout_2F_2R_Text_23A14C - msgbox MagmaHideout_2F_2R_Text_23A16F, MSGBOX_AUTOCLOSE +MagmaHideout_2F_2R_EventScript_Grunt45:: @ 8239E4D + trainerbattle_single TRAINER_GRUNT_45, MagmaHideout_2F_2R_Text_Grunt45Intro, MagmaHideout_2F_2R_Text_Grunt45Defeat + msgbox MagmaHideout_2F_2R_Text_Grunt45PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_2F_2R_Text_239E64: @ 8239E64 +MagmaHideout_2F_2R_Text_Grunt52Intro: @ 8239E64 .string "I don't have a bone to pick with you.\n" .string "I'm just following orders!$" -MagmaHideout_2F_2R_Text_239EA5: @ 8239EA5 +MagmaHideout_2F_2R_Text_Grunt52Defeat: @ 8239EA5 .string "I may have lost, but…$" -MagmaHideout_2F_2R_Text_239EBB: @ 8239EBB +MagmaHideout_2F_2R_Text_Grunt52PostBattle: @ 8239EBB .string "We dug up something beyond belief!\n" .string "And, we got the BLUE ORB!\p" .string "All that's left is for our leader to…\n" .string "Fufufu… Fwahahaha!$" -MagmaHideout_2F_2R_Text_239F31: @ 8239F31 +MagmaHideout_2F_2R_Text_Grunt43Intro: @ 8239F31 .string "I can't stand heat. Maybe I should've\n" .string "joined TEAM AQUA instead…$" -MagmaHideout_2F_2R_Text_239F71: @ 8239F71 +MagmaHideout_2F_2R_Text_Grunt43Defeat: @ 8239F71 .string "Yeah, I really may not be right for\n" .string "TEAM MAGMA…$" -MagmaHideout_2F_2R_Text_239FA1: @ 8239FA1 +MagmaHideout_2F_2R_Text_Grunt43PostBattle: @ 8239FA1 .string "Don't you get lonely for the sea\n" .string "being in a place like this?$" -MagmaHideout_2F_2R_Text_239FDE: @ 8239FDE +MagmaHideout_2F_2R_Text_Grunt44Intro: @ 8239FDE .string "You can hear tremors here sometimes.\p" .string "Could it be the volcano rattling?\n" .string "Or is it GROU…\p" .string "Whoops!\n" .string "No, no, never mind!$" -MagmaHideout_2F_2R_Text_23A050: @ 823A050 +MagmaHideout_2F_2R_Text_Grunt44Defeat: @ 823A050 .string "You're a fiery battler.\n" .string "Just like a volcano!$" -MagmaHideout_2F_2R_Text_23A07D: @ 823A07D +MagmaHideout_2F_2R_Text_Grunt44PostBattle: @ 823A07D .string "You just happened to win this time,\n" .string "but that doesn't matter.\p" .string "TEAM MAGMA's goal is about to be\n" .string "reached!$" -MagmaHideout_2F_2R_Text_23A0E4: @ 823A0E4 +MagmaHideout_2F_2R_Text_Grunt45Intro: @ 823A0E4 .string "One of our guys was freaking out that\n" .string "he lost his MAGMA EMBLEM…\p" .string "Wait a minute!\n" .string "Was it you who found it?$" -MagmaHideout_2F_2R_Text_23A14C: @ 823A14C +MagmaHideout_2F_2R_Text_Grunt45Defeat: @ 823A14C .string "I'm having trouble believing this…$" -MagmaHideout_2F_2R_Text_23A16F: @ 823A16F +MagmaHideout_2F_2R_Text_Grunt45PostBattle: @ 823A16F .string "I'm getting this feeling that our plan\n" .string "is going to end in failure…$" diff --git a/data/maps/MagmaHideout_3F_1R/map.json b/data/maps/MagmaHideout_3F_1R/map.json index e3c1bac70..ef370ee8b 100644 --- a/data/maps/MagmaHideout_3F_1R/map.json +++ b/data/maps/MagmaHideout_3F_1R/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "MagmaHideout_3F_1R_EventScript_23A1B3", + "script": "MagmaHideout_3F_1R_EventScript_Grunt46", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "MagmaHideout_3F_1R_EventScript_23A1CA", + "script": "MagmaHideout_3F_1R_EventScript_Grunt53", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { diff --git a/data/maps/MagmaHideout_3F_1R/scripts.inc b/data/maps/MagmaHideout_3F_1R/scripts.inc index 879cd282d..a54e38c65 100644 --- a/data/maps/MagmaHideout_3F_1R/scripts.inc +++ b/data/maps/MagmaHideout_3F_1R/scripts.inc @@ -1,29 +1,29 @@ MagmaHideout_3F_1R_MapScripts:: @ 823A1B2 .byte 0 -MagmaHideout_3F_1R_EventScript_23A1B3:: @ 823A1B3 - trainerbattle_single TRAINER_GRUNT_46, MagmaHideout_3F_1R_Text_23A1E1, MagmaHideout_3F_1R_Text_23A229 - msgbox MagmaHideout_3F_1R_Text_23A246, MSGBOX_AUTOCLOSE +MagmaHideout_3F_1R_EventScript_Grunt46:: @ 823A1B3 + trainerbattle_single TRAINER_GRUNT_46, MagmaHideout_3F_1R_Text_Grunt46Intro, MagmaHideout_3F_1R_Text_Grunt46Defeat + msgbox MagmaHideout_3F_1R_Text_Grunt46PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_3F_1R_EventScript_23A1CA:: @ 823A1CA - trainerbattle_single TRAINER_GRUNT_53, MagmaHideout_3F_1R_Text_23A293, MagmaHideout_3F_1R_Text_23A353 - msgbox MagmaHideout_3F_1R_Text_23A37C, MSGBOX_AUTOCLOSE +MagmaHideout_3F_1R_EventScript_Grunt53:: @ 823A1CA + trainerbattle_single TRAINER_GRUNT_53, MagmaHideout_3F_1R_Text_Grunt53Intro, MagmaHideout_3F_1R_Text_Grunt53Defeat + msgbox MagmaHideout_3F_1R_Text_Grunt53PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_3F_1R_Text_23A1E1: @ 823A1E1 +MagmaHideout_3F_1R_Text_Grunt46Intro: @ 823A1E1 .string "What did I do to deserve this guard\n" .string "posting?\p" .string "My left ear is burning up!$" -MagmaHideout_3F_1R_Text_23A229: @ 823A229 +MagmaHideout_3F_1R_Text_Grunt46Defeat: @ 823A229 .string "I'm getting heat exhaustion…$" -MagmaHideout_3F_1R_Text_23A246: @ 823A246 +MagmaHideout_3F_1R_Text_Grunt46PostBattle: @ 823A246 .string "Do you think it's odd that we're wearing\n" .string "hoods in this magma-filled volcano?$" -MagmaHideout_3F_1R_Text_23A293: @ 823A293 +MagmaHideout_3F_1R_Text_Grunt53Intro: @ 823A293 .string "We joined so we can help our leader\n" .string "achieve his fantastic vision.\p" .string "I don't care if you're with TEAM AQUA\n" @@ -31,11 +31,11 @@ MagmaHideout_3F_1R_Text_23A293: @ 823A293 .string "No one interferes with us and gets\n" .string "away with it!$" -MagmaHideout_3F_1R_Text_23A353: @ 823A353 +MagmaHideout_3F_1R_Text_Grunt53Defeat: @ 823A353 .string "Oh, no!\n" .string "You're not to be trusted at all!$" -MagmaHideout_3F_1R_Text_23A37C: @ 823A37C +MagmaHideout_3F_1R_Text_Grunt53PostBattle: @ 823A37C .string "Listen to me.\n" .string "TEAM MAGMA is right!\p" .string "Don't listen to TEAM AQUA.\n" diff --git a/data/maps/MagmaHideout_3F_2R/map.json b/data/maps/MagmaHideout_3F_2R/map.json index e4b267858..c6fc9906c 100644 --- a/data/maps/MagmaHideout_3F_2R/map.json +++ b/data/maps/MagmaHideout_3F_2R/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MagmaHideout_3F_2R_EventScript_23A3D5", + "script": "MagmaHideout_3F_2R_EventScript_Grunt47", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { diff --git a/data/maps/MagmaHideout_3F_2R/scripts.inc b/data/maps/MagmaHideout_3F_2R/scripts.inc index 14f7001fa..968754b06 100644 --- a/data/maps/MagmaHideout_3F_2R/scripts.inc +++ b/data/maps/MagmaHideout_3F_2R/scripts.inc @@ -1,12 +1,12 @@ MagmaHideout_3F_2R_MapScripts:: @ 823A3D4 .byte 0 -MagmaHideout_3F_2R_EventScript_23A3D5:: @ 823A3D5 - trainerbattle_single TRAINER_GRUNT_47, MagmaHideout_3F_2R_Text_23A3EC, MagmaHideout_3F_2R_Text_23A4BB - msgbox MagmaHideout_3F_2R_Text_23A4EF, MSGBOX_AUTOCLOSE +MagmaHideout_3F_2R_EventScript_Grunt47:: @ 823A3D5 + trainerbattle_single TRAINER_GRUNT_47, MagmaHideout_3F_2R_Text_Grunt47Intro, MagmaHideout_3F_2R_Text_Grunt47Defeat + msgbox MagmaHideout_3F_2R_Text_Grunt47PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_3F_2R_Text_23A3EC: @ 823A3EC +MagmaHideout_3F_2R_Text_Grunt47Intro: @ 823A3EC .string "I understand everything our leader\n" .string "says. But you know what?\p" .string "Doing stuff like digging up a super-\n" @@ -15,11 +15,11 @@ MagmaHideout_3F_2R_Text_23A3EC: @ 823A3EC .string "I think we're going a little too far.\n" .string "What do you think?$" -MagmaHideout_3F_2R_Text_23A4BB: @ 823A4BB +MagmaHideout_3F_2R_Text_Grunt47Defeat: @ 823A4BB .string "Yeah, I think we are doing something\n" .string "wrong somehow.$" -MagmaHideout_3F_2R_Text_23A4EF: @ 823A4EF +MagmaHideout_3F_2R_Text_Grunt47PostBattle: @ 823A4EF .string "You know, losing to you cleared my mind.\p" .string "The next time I see our leader,\n" .string "I'm going to ask him about what we do.$" diff --git a/data/maps/MagmaHideout_4F/map.json b/data/maps/MagmaHideout_4F/map.json index 5eebc41d8..e7ea5b669 100644 --- a/data/maps/MagmaHideout_4F/map.json +++ b/data/maps/MagmaHideout_4F/map.json @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MagmaHideout_4F_EventScript_23A68C", + "script": "MagmaHideout_4F_EventScript_Grunt48", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MagmaHideout_4F_EventScript_23A6A3", + "script": "MagmaHideout_4F_EventScript_Grunt49", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MagmaHideout_4F_EventScript_23A6BA", + "script": "MagmaHideout_4F_EventScript_Grunt50", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "MagmaHideout_4F_EventScript_23A6D1", + "script": "MagmaHideout_4F_EventScript_Tabitha", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MagmaHideout_4F_EventScript_23A560", + "script": "MagmaHideout_4F_EventScript_Maxie", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index 7bbb4ac18..1c5ea4dbb 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -1,10 +1,10 @@ MagmaHideout_4F_MapScripts:: @ 823A55F .byte 0 -MagmaHideout_4F_EventScript_23A560:: @ 823A560 +MagmaHideout_4F_EventScript_Maxie:: @ 823A560 lockall playbgm MUS_MGM0, 0 - msgbox MagmaHideout_4F_Text_23A9F4, MSGBOX_DEFAULT + msgbox MagmaHideout_4F_Text_MaxieAwakenGroudon, MSGBOX_DEFAULT closemessage delay 20 setvar VAR_RESULT, 1 @@ -17,48 +17,48 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 setvar VAR_RESULT, 1 playfanfare MUS_ME_TAMA playse SE_TAMA - special sub_80B0534 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + special DoOrbEffect + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 150 - removeobject 7 - addobject 1 + removeobject 7 @ sleeping Groudon + addobject 1 @ awakened Groudon waitstate delay 60 - applymovement 1, MagmaHideout_4F_Movement_23A672 + applymovement 1, MagmaHideout_4F_Movement_GroudonApproach waitmovement 0 - special sub_80B058C + special FadeOutOrbEffect waitstate - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 + setvar VAR_0x8004, 1 @ vertical pan + setvar VAR_0x8005, 1 @ horizontal pan + setvar VAR_0x8006, 8 @ num shakes + setvar VAR_0x8007, 5 @ shake delay + special ShakeCamera waitstate - applymovement 1, MagmaHideout_4F_Movement_23A67D + applymovement 1, MagmaHideout_4F_Movement_GroudonExit waitmovement 0 removeobject 1 delay 4 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 + setvar VAR_0x8004, 2 @ vertical pan + setvar VAR_0x8005, 2 @ horizontal pan + setvar VAR_0x8006, 8 @ num shakes + setvar VAR_0x8007, 5 @ shake delay + special ShakeCamera waitstate delay 30 - applymovement 6, MagmaHideout_4F_Movement_23A680 + applymovement 6, MagmaHideout_4F_Movement_MaxieLookAround waitmovement 0 - msgbox MagmaHideout_4F_Text_23AADA, MSGBOX_DEFAULT + msgbox MagmaHideout_4F_Text_MaxieGroudonWhatsWrong, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 applymovement 6, Common_Movement_FacePlayer waitmovement 0 - msgbox MagmaHideout_4F_Text_23AB33, MSGBOX_DEFAULT + msgbox MagmaHideout_4F_Text_MaxieOhItWasYou, MSGBOX_DEFAULT closemessage - trainerbattle_no_intro TRAINER_MAXIE_1, MagmaHideout_4F_Text_23ABB5 - msgbox MagmaHideout_4F_Text_23ABE2, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_MAXIE_1, MagmaHideout_4F_Text_MaxieDefeat + msgbox MagmaHideout_4F_Text_MaxieImGoingAfterGroudon, MSGBOX_DEFAULT closemessage clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN clearflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY @@ -76,7 +76,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 releaseall end -MagmaHideout_4F_Movement_23A672: @ 823A672 +MagmaHideout_4F_Movement_GroudonApproach: @ 823A672 delay_16 delay_16 walk_slow_down @@ -89,12 +89,12 @@ MagmaHideout_4F_Movement_23A672: @ 823A672 delay_16 step_end -MagmaHideout_4F_Movement_23A67D: @ 823A67D +MagmaHideout_4F_Movement_GroudonExit: @ 823A67D slide_up slide_up step_end -MagmaHideout_4F_Movement_23A680: @ 823A680 +MagmaHideout_4F_Movement_MaxieLookAround: @ 823A680 face_left delay_16 face_right @@ -108,64 +108,64 @@ MagmaHideout_4F_Movement_23A680: @ 823A680 delay_16 step_end -MagmaHideout_4F_EventScript_23A68C:: @ 823A68C - trainerbattle_single TRAINER_GRUNT_48, MagmaHideout_4F_Text_23A6E8, MagmaHideout_4F_Text_23A775 - msgbox MagmaHideout_4F_Text_23A7B5, MSGBOX_AUTOCLOSE +MagmaHideout_4F_EventScript_Grunt48:: @ 823A68C + trainerbattle_single TRAINER_GRUNT_48, MagmaHideout_4F_Text_Grunt48Intro, MagmaHideout_4F_Text_Grunt48Defeat + msgbox MagmaHideout_4F_Text_Grunt48PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_4F_EventScript_23A6A3:: @ 823A6A3 - trainerbattle_single TRAINER_GRUNT_49, MagmaHideout_4F_Text_23A7DA, MagmaHideout_4F_Text_23A81B - msgbox MagmaHideout_4F_Text_23A841, MSGBOX_AUTOCLOSE +MagmaHideout_4F_EventScript_Grunt49:: @ 823A6A3 + trainerbattle_single TRAINER_GRUNT_49, MagmaHideout_4F_Text_Grunt49Intro, MagmaHideout_4F_Text_Grunt49Defeat + msgbox MagmaHideout_4F_Text_Grunt49PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_4F_EventScript_23A6BA:: @ 823A6BA - trainerbattle_single TRAINER_GRUNT_50, MagmaHideout_4F_Text_23A86D, MagmaHideout_4F_Text_23A8A7 - msgbox MagmaHideout_4F_Text_23A8C6, MSGBOX_AUTOCLOSE +MagmaHideout_4F_EventScript_Grunt50:: @ 823A6BA + trainerbattle_single TRAINER_GRUNT_50, MagmaHideout_4F_Text_Grunt50Intro, MagmaHideout_4F_Text_Grunt50Defeat + msgbox MagmaHideout_4F_Text_Grunt50PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_4F_EventScript_23A6D1:: @ 823A6D1 - trainerbattle_single TRAINER_TABITHA_3, MagmaHideout_4F_Text_23A8E1, MagmaHideout_4F_Text_23A994 - msgbox MagmaHideout_4F_Text_23A9AC, MSGBOX_AUTOCLOSE +MagmaHideout_4F_EventScript_Tabitha:: @ 823A6D1 + trainerbattle_single TRAINER_TABITHA_3, MagmaHideout_4F_Text_TabithaIntro, MagmaHideout_4F_Text_TabithaDefeat + msgbox MagmaHideout_4F_Text_TabithaPostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_4F_Text_23A6E8: @ 823A6E8 +MagmaHideout_4F_Text_Grunt48Intro: @ 823A6E8 .string "I want to see GROUDON, too, but they\n" .string "won't let me see even its tail…\p" .string "It's got me feeling really frustrated.\p" .string "Oh, no!\n" .string "I blabbed about GROUDON!$" -MagmaHideout_4F_Text_23A775: @ 823A775 +MagmaHideout_4F_Text_Grunt48Defeat: @ 823A775 .string "I guess it's impossible to win if one\n" .string "doesn't have a calm mind…$" -MagmaHideout_4F_Text_23A7B5: @ 823A7B5 +MagmaHideout_4F_Text_Grunt48PostBattle: @ 823A7B5 .string "I wonder if GROUDON even has a tail?$" -MagmaHideout_4F_Text_23A7DA: @ 823A7DA +MagmaHideout_4F_Text_Grunt49Intro: @ 823A7DA .string "Fuhahaha!\n" .string "Soon! Very soon!\l" .string "Our grand objective will be achieved!$" -MagmaHideout_4F_Text_23A81B: @ 823A81B +MagmaHideout_4F_Text_Grunt49Defeat: @ 823A81B .string "Grrr…\n" .string "I've come so far, but now this?$" -MagmaHideout_4F_Text_23A841: @ 823A841 +MagmaHideout_4F_Text_Grunt49PostBattle: @ 823A841 .string "MAXIE, sir!\n" .string "An intruder is headed your way!$" -MagmaHideout_4F_Text_23A86D: @ 823A86D +MagmaHideout_4F_Text_Grunt50Intro: @ 823A86D .string "You're not finished yet!\n" .string "You're not getting by me easily!$" -MagmaHideout_4F_Text_23A8A7: @ 823A8A7 +MagmaHideout_4F_Text_Grunt50Defeat: @ 823A8A7 .string "Was I that easy to knock down?$" -MagmaHideout_4F_Text_23A8C6: @ 823A8C6 +MagmaHideout_4F_Text_Grunt50PostBattle: @ 823A8C6 .string "C-come on, one more match…$" -MagmaHideout_4F_Text_23A8E1: @ 823A8E1 +MagmaHideout_4F_Text_TabithaIntro: @ 823A8E1 .string "Hehehe!\n" .string "You made it this far, so I'll tell you!\p" .string "That's right!\n" @@ -175,15 +175,15 @@ MagmaHideout_4F_Text_23A8E1: @ 823A8E1 .string "It's going to awaken real soon!\n" .string "Hehe! Hehehe!$" -MagmaHideout_4F_Text_23A994: @ 823A994 +MagmaHideout_4F_Text_TabithaDefeat: @ 823A994 .string "Taken down again…\n" .string "Hehe…$" -MagmaHideout_4F_Text_23A9AC: @ 823A9AC +MagmaHideout_4F_Text_TabithaPostBattle: @ 823A9AC .string "…And while you wasted time with me,\n" .string "MAXIE should have awakened GROUDON…$" -MagmaHideout_4F_Text_23A9F4: @ 823A9F4 +MagmaHideout_4F_Text_MaxieAwakenGroudon: @ 823A9F4 .string "MAXIE: GROUDON…\p" .string "Nothing could awaken you from your\n" .string "sleep bathed in magma…\p" @@ -194,25 +194,25 @@ MagmaHideout_4F_Text_23A9F4: @ 823A9F4 .string "And show me…\n" .string "Show me the full extent of your power!$" -MagmaHideout_4F_Text_23AADA: @ 823AADA +MagmaHideout_4F_Text_MaxieGroudonWhatsWrong: @ 823AADA .string "MAXIE: GROUDON!\n" .string "What's wrong?\p" .string "Wasn't the BLUE ORB the key?\p" .string "GROUDON!\n" .string "Where have you gone…$" -MagmaHideout_4F_Text_23AB33: @ 823AB33 +MagmaHideout_4F_Text_MaxieOhItWasYou: @ 823AB33 .string "MAXIE: Oh, so it was you?\p" .string "I've seen you poking around uninvited\n" .string "here and there…\p" .string "I get it now!\n" .string "You must have pulled a cheap stunt!$" -MagmaHideout_4F_Text_23ABB5: @ 823ABB5 +MagmaHideout_4F_Text_MaxieDefeat: @ 823ABB5 .string "What makes you so adept at handling\n" .string "POKéMON?$" -MagmaHideout_4F_Text_23ABE2: @ 823ABE2 +MagmaHideout_4F_Text_MaxieImGoingAfterGroudon: @ 823ABE2 .string "MAXIE: There has to be some reason\n" .string "why GROUDON fled…\p" .string "That's what you're trying to say,\n" diff --git a/data/maps/MarineCave_End/map.json b/data/maps/MarineCave_End/map.json index ec1c3389a..133d89fe0 100644 --- a/data/maps/MarineCave_End/map.json +++ b/data/maps/MarineCave_End/map.json @@ -45,7 +45,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "1", - "script": "MarineCave_End_EventScript_23B01B" + "script": "MarineCave_End_EventScript_Kyogre" } ], "bg_events": [] diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index be3a6a57b..0050af939 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -1,33 +1,33 @@ MarineCave_End_MapScripts:: @ 823AFDF - map_script MAP_SCRIPT_ON_RESUME, MarineCave_End_MapScript1_23AFEA + map_script MAP_SCRIPT_ON_RESUME, MarineCave_End_OnResume map_script MAP_SCRIPT_ON_TRANSITION, MarineCave_End_OnTransition .byte 0 -MarineCave_End_MapScript1_23AFEA: @ 823AFEA - call_if_set FLAG_SYS_CTRL_OBJ_DELETE, MarineCave_End_EventScript_23AFF4 +MarineCave_End_OnResume: @ 823AFEA + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, MarineCave_End_EventScript_TryRemoveKyogre end -MarineCave_End_EventScript_23AFF4:: @ 823AFF4 +MarineCave_End_EventScript_TryRemoveKyogre:: @ 823AFF4 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject 1 return MarineCave_End_OnTransition: @ 823B008 - call_if_unset FLAG_DEFEATED_KYOGRE, MarineCave_End_EventScript_23B012 + call_if_unset FLAG_DEFEATED_KYOGRE, MarineCave_End_EventScript_ShowKyogre end -MarineCave_End_EventScript_23B012:: @ 823B012 +MarineCave_End_EventScript_ShowKyogre:: @ 823B012 clearflag FLAG_HIDE_MARINE_CAVE_KYOGRE setvar VAR_TEMP_1, 1 return -MarineCave_End_EventScript_23B01B:: @ 823B01B +MarineCave_End_EventScript_Kyogre:: @ 823B01B lockall applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 - applymovement 1, MarineCave_End_Movement_23B09D + applymovement 1, MarineCave_End_Movement_KyogreApproach waitmovement 0 waitse playmoncry SPECIES_KYOGRE, 2 @@ -41,29 +41,29 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B clearflag FLAG_SYS_CTRL_OBJ_DELETE setvar VAR_TEMP_1, 0 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 - goto_if_eq MarineCave_End_EventScript_23B084 - compare VAR_RESULT, 4 - goto_if_eq MarineCave_End_EventScript_23B092 - compare VAR_RESULT, 5 - goto_if_eq MarineCave_End_EventScript_23B092 + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq MarineCave_End_EventScript_DefeatedKyogre + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq MarineCave_End_EventScript_RanFromKyogre + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq MarineCave_End_EventScript_RanFromKyogre setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 setflag FLAG_DEFEATED_KYOGRE releaseall end -MarineCave_End_EventScript_23B084:: @ 823B084 +MarineCave_End_EventScript_DefeatedKyogre:: @ 823B084 setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 setflag FLAG_DEFEATED_KYOGRE - goto MarineCave_End_EventScript_27376D + goto Common_EventScript_RemoveStaticPokemon end -MarineCave_End_EventScript_23B092:: @ 823B092 - setvar VAR_0x8004, 404 - goto MarineCave_End_EventScript_273776 +MarineCave_End_EventScript_RanFromKyogre:: @ 823B092 + setvar VAR_0x8004, SPECIES_KYOGRE + goto Common_EventScript_LegendaryFlewAway end -MarineCave_End_Movement_23B09D: @ 823B09D +MarineCave_End_Movement_KyogreApproach: @ 823B09D init_affine_anim walk_down_start_affine delay_16 diff --git a/data/maps/MarineCave_Entrance/scripts.inc b/data/maps/MarineCave_Entrance/scripts.inc index 82ff756e1..1ba4546e3 100644 --- a/data/maps/MarineCave_Entrance/scripts.inc +++ b/data/maps/MarineCave_Entrance/scripts.inc @@ -1,8 +1,8 @@ MarineCave_Entrance_MapScripts:: @ 823AFD0 - map_script MAP_SCRIPT_ON_RESUME, MarineCave_Entrance_MapScript1_23AFD6 + map_script MAP_SCRIPT_ON_RESUME, MarineCave_Entrance_OnResume .byte 0 -MarineCave_Entrance_MapScript1_23AFD6: @ 823AFD6 +MarineCave_Entrance_OnResume: @ 823AFD6 setdivewarp MAP_UNDERWATER_MARINE_CAVE, 255, 9, 6 end diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index 4163f4d9d..d5dc8ae99 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -162,7 +162,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_EventScript_2C7F7E", + "script": "MauvilleCity_EventScript_RolloutTutor", "flag": "0" }, { diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 445930e70..7b853d596 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -86,7 +86,7 @@ MauvilleCity_EventScript_1DF43D:: @ 81DF43D MauvilleCity_EventScript_1DF452:: @ 81DF452 lockall goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF690 - applymovement 6, Common_Movement_WalkInPlaceRight + applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DF8B9, MSGBOX_DEFAULT @@ -103,14 +103,14 @@ MauvilleCity_EventScript_1DF452:: @ 81DF452 end MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD - compare VAR_RESULT, 1 + compare VAR_RESULT, YES call_if_eq MauvilleCity_EventScript_1DF63A - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MauvilleCity_EventScript_1DF683 closemessage switch VAR_FACING - case 2, MauvilleCity_EventScript_1DF4E0 - case 4, MauvilleCity_EventScript_1DF53D + case DIR_NORTH, MauvilleCity_EventScript_1DF4E0 + case DIR_EAST, MauvilleCity_EventScript_1DF53D end MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0 @@ -118,7 +118,7 @@ MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0 applymovement 6, MauvilleCity_Movement_1DF6A8 applymovement 7, MauvilleCity_Movement_1DF6E2 waitmovement 0 - applymovement 6, Common_Movement_WalkInPlaceRight + applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6EE @@ -138,7 +138,7 @@ MauvilleCity_EventScript_1DF53D:: @ 81DF53D applymovement 6, MauvilleCity_Movement_1DF6AE applymovement 7, MauvilleCity_Movement_1DF6E8 waitmovement 0 - applymovement 6, Common_Movement_WalkInPlaceRight + applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 applymovement 7, MauvilleCity_Movement_1DF6F7 @@ -160,18 +160,18 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593 setflag FLAG_DEFEATED_WALLY_MAUVILLE setvar VAR_WALLY_CALL_STEP_COUNTER, 0 setflag FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq MauvilleCity_EventScript_1DF5F3 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq MauvilleCity_EventScript_1DF601 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT closemessage addvar VAR_SCOTT_STATE, 1 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq MauvilleCity_EventScript_1DF616 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq MauvilleCity_EventScript_1DF628 removeobject 11 releaseall @@ -205,13 +205,13 @@ MauvilleCity_EventScript_1DF628:: @ 81DF628 MauvilleCity_EventScript_1DF63A:: @ 81DF63A msgbox MauvilleCity_Text_1DFB6D, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_1DFB96 - applymovement 6, Common_Movement_WalkInPlaceRight + applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox MauvilleCity_Text_1DFBC3, MSGBOX_DEFAULT applymovement 6, Common_Movement_FacePlayer waitmovement 0 msgbox MauvilleCity_Text_1DFBED, MSGBOX_DEFAULT - applymovement 6, Common_Movement_WalkInPlaceRight + applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox MauvilleCity_Text_1DFC8A, MSGBOX_DEFAULT return diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json index 98c1fcee1..488ab5a4e 100644 --- a/data/maps/MauvilleCity_BikeShop/map.json +++ b/data/maps/MauvilleCity_BikeShop/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_BikeShop_EventScript_20EBBC", + "script": "MauvilleCity_BikeShop_EventScript_Rydel", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_BikeShop_EventScript_20ED31", + "script": "MauvilleCity_BikeShop_EventScript_Assistant", "flag": "0" } ], @@ -65,7 +65,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_BikeShop_EventScript_20ED3A" + "script": "MauvilleCity_BikeShop_EventScript_MachBikeHandbook" }, { "type": "sign", @@ -73,7 +73,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_BikeShop_EventScript_20EDAE" + "script": "MauvilleCity_BikeShop_EventScript_AcroBikeHandbook" } ] }
\ No newline at end of file diff --git a/data/maps/MauvilleCity_BikeShop/scripts.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc index a5b20cf60..4b0372eac 100644 --- a/data/maps/MauvilleCity_BikeShop/scripts.inc +++ b/data/maps/MauvilleCity_BikeShop/scripts.inc @@ -1,203 +1,204 @@ MauvilleCity_BikeShop_MapScripts:: @ 820EBBB .byte 0 -MauvilleCity_BikeShop_EventScript_20EBBC:: @ 820EBBC +MauvilleCity_BikeShop_EventScript_Rydel:: @ 820EBBC lock faceplayer - goto_if_set FLAG_RECEIVED_BIKE, MauvilleCity_BikeShop_EventScript_20EC94 - goto_if_set FLAG_DECLINED_BIKE, MauvilleCity_BikeShop_EventScript_20EBF7 - msgbox MauvilleCity_BikeShop_Text_20EE22, MSGBOX_DEFAULT - msgbox MauvilleCity_BikeShop_Text_20EE99, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_BikeShop_EventScript_20EC4A - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_BikeShop_EventScript_20EC3D + goto_if_set FLAG_RECEIVED_BIKE, MauvilleCity_BikeShop_EventScript_AskSwitchBikes + goto_if_set FLAG_DECLINED_BIKE, MauvilleCity_BikeShop_EventScript_SkipGreeting + msgbox MauvilleCity_BikeShop_Text_RydelGreeting, MSGBOX_DEFAULT + msgbox MauvilleCity_BikeShop_Text_DidYouComeFromFarAway, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq MauvilleCity_BikeShop_EventScript_YesFar + compare VAR_RESULT, NO + goto_if_eq MauvilleCity_BikeShop_EventScript_NotFar end -MauvilleCity_BikeShop_EventScript_20EBF7:: @ 820EBF7 - msgbox MauvilleCity_BikeShop_Text_20EE99, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_BikeShop_EventScript_20EC4A - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_BikeShop_EventScript_20EC3D +MauvilleCity_BikeShop_EventScript_SkipGreeting:: @ 820EBF7 + msgbox MauvilleCity_BikeShop_Text_DidYouComeFromFarAway, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq MauvilleCity_BikeShop_EventScript_YesFar + compare VAR_RESULT, NO + goto_if_eq MauvilleCity_BikeShop_EventScript_NotFar end -MauvilleCity_BikeShop_EventScript_20EC16:: @ 820EC16 - message MauvilleCity_BikeShop_Text_20EF32 +MauvilleCity_BikeShop_EventScript_ChooseBike:: @ 820EC16 + message MauvilleCity_BikeShop_Text_ExplainBikesChooseWhichOne waitmessage multichoice 21, 8, MULTI_BIKE, 1 switch VAR_RESULT - case 0, MauvilleCity_BikeShop_EventScript_20EC53 - case 1, MauvilleCity_BikeShop_EventScript_20EC6D + case 0, MauvilleCity_BikeShop_EventScript_GetMachBike + case 1, MauvilleCity_BikeShop_EventScript_GetAcroBike end -MauvilleCity_BikeShop_EventScript_20EC3D:: @ 820EC3D +MauvilleCity_BikeShop_EventScript_NotFar:: @ 820EC3D setflag FLAG_DECLINED_BIKE - msgbox MauvilleCity_BikeShop_Text_20EEE8, MSGBOX_DEFAULT + msgbox MauvilleCity_BikeShop_Text_GuessYouDontNeedBike, MSGBOX_DEFAULT release end -MauvilleCity_BikeShop_EventScript_20EC4A:: @ 820EC4A +MauvilleCity_BikeShop_EventScript_YesFar:: @ 820EC4A setflag FLAG_RECEIVED_BIKE - goto MauvilleCity_BikeShop_EventScript_20EC16 + goto MauvilleCity_BikeShop_EventScript_ChooseBike end -MauvilleCity_BikeShop_EventScript_20EC53:: @ 820EC53 - msgbox MauvilleCity_BikeShop_Text_20F18D, MSGBOX_DEFAULT +MauvilleCity_BikeShop_EventScript_GetMachBike:: @ 820EC53 + msgbox MauvilleCity_BikeShop_Text_ChoseMachBike, MSGBOX_DEFAULT giveitem_std ITEM_MACH_BIKE - goto MauvilleCity_BikeShop_EventScript_20EC87 + goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes end -MauvilleCity_BikeShop_EventScript_20EC6D:: @ 820EC6D - msgbox MauvilleCity_BikeShop_Text_20F1A5, MSGBOX_DEFAULT +MauvilleCity_BikeShop_EventScript_GetAcroBike:: @ 820EC6D + msgbox MauvilleCity_BikeShop_Text_ChoseAcroBike, MSGBOX_DEFAULT giveitem_std ITEM_ACRO_BIKE - goto MauvilleCity_BikeShop_EventScript_20EC87 + goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes end -MauvilleCity_BikeShop_EventScript_20EC87:: @ 820EC87 - msgbox MauvilleCity_BikeShop_Text_20F1BD, MSGBOX_DEFAULT +MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes:: @ 820EC87 + msgbox MauvilleCity_BikeShop_Text_ComeBackToSwitchBikes, MSGBOX_DEFAULT special SwapRegisteredBike release end -MauvilleCity_BikeShop_EventScript_20EC94:: @ 820EC94 - msgbox MauvilleCity_BikeShop_Text_20F1FB, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_BikeShop_EventScript_20ECB3 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_BikeShop_EventScript_20ECE5 +MauvilleCity_BikeShop_EventScript_AskSwitchBikes:: @ 820EC94 + msgbox MauvilleCity_BikeShop_Text_WantToSwitchBikes, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq MauvilleCity_BikeShop_EventScript_SwitchBikes + compare VAR_RESULT, NO + goto_if_eq MauvilleCity_BikeShop_EventScript_KeepBike end -MauvilleCity_BikeShop_EventScript_20ECB3:: @ 820ECB3 - msgbox MauvilleCity_BikeShop_Text_20F22F, MSGBOX_DEFAULT +@ If the player does not have a bike on them Rydel assumes its stored in the PC +MauvilleCity_BikeShop_EventScript_SwitchBikes:: @ 820ECB3 + msgbox MauvilleCity_BikeShop_Text_IllSwitchBikes, MSGBOX_DEFAULT checkitem ITEM_ACRO_BIKE, 1 - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_BikeShop_EventScript_20ECEF + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_BikeShop_EventScript_SwitchAcroForMach checkitem ITEM_MACH_BIKE, 1 - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_BikeShop_EventScript_20ED10 - msgbox MauvilleCity_BikeShop_Text_20F2F3, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_BikeShop_EventScript_SwitchMachForAcro + msgbox MauvilleCity_BikeShop_Text_OhYourBikeIsInPC, MSGBOX_DEFAULT release end -MauvilleCity_BikeShop_EventScript_20ECE5:: @ 820ECE5 - msgbox MauvilleCity_BikeShop_Text_20F2C4, MSGBOX_DEFAULT +MauvilleCity_BikeShop_EventScript_KeepBike:: @ 820ECE5 + msgbox MauvilleCity_BikeShop_Text_HappyYouLikeIt, MSGBOX_DEFAULT release end -MauvilleCity_BikeShop_EventScript_20ECEF:: @ 820ECEF - incrementgamestat 4 - msgbox MauvilleCity_BikeShop_Text_20F294, MSGBOX_DEFAULT +MauvilleCity_BikeShop_EventScript_SwitchAcroForMach:: @ 820ECEF + incrementgamestat GAME_STAT_TRADED_BIKES + msgbox MauvilleCity_BikeShop_Text_ExchangedAcroForMach, MSGBOX_DEFAULT takeitem ITEM_ACRO_BIKE, 1 giveitem_std ITEM_MACH_BIKE - goto MauvilleCity_BikeShop_EventScript_20EC87 + goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes end -MauvilleCity_BikeShop_EventScript_20ED10:: @ 820ED10 - incrementgamestat 4 - msgbox MauvilleCity_BikeShop_Text_20F263, MSGBOX_DEFAULT +MauvilleCity_BikeShop_EventScript_SwitchMachForAcro:: @ 820ED10 + incrementgamestat GAME_STAT_TRADED_BIKES + msgbox MauvilleCity_BikeShop_Text_ExchangedMachForAcro, MSGBOX_DEFAULT takeitem ITEM_MACH_BIKE, 1 giveitem_std ITEM_ACRO_BIKE - goto MauvilleCity_BikeShop_EventScript_20EC87 + goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes end -MauvilleCity_BikeShop_EventScript_20ED31:: @ 820ED31 - msgbox MauvilleCity_BikeShop_Text_20F3C3, MSGBOX_NPC +MauvilleCity_BikeShop_EventScript_Assistant:: @ 820ED31 + msgbox MauvilleCity_BikeShop_Text_HandbooksAreInBack, MSGBOX_NPC end -MauvilleCity_BikeShop_EventScript_20ED3A:: @ 820ED3A - message MauvilleCity_BikeShop_Text_20F445 +MauvilleCity_BikeShop_EventScript_MachBikeHandbook:: @ 820ED3A + message MauvilleCity_BikeShop_Text_MachHandbookWhichPage waitmessage - goto MauvilleCity_BikeShop_EventScript_20ED46 + goto MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage end -MauvilleCity_BikeShop_EventScript_20ED46:: @ 820ED46 +MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage:: @ 820ED46 multichoice 0, 0, MULTI_MACH_BIKE_INFO, 0 switch VAR_RESULT - case 0, MauvilleCity_BikeShop_EventScript_20ED88 - case 1, MauvilleCity_BikeShop_EventScript_20ED94 - case 2, MauvilleCity_BikeShop_EventScript_20EDA0 - case 3, MauvilleCity_BikeShop_EventScript_20EDAC - case MULTI_B_PRESSED, MauvilleCity_BikeShop_EventScript_20EDAC + case 0, MauvilleCity_BikeShop_EventScript_HowToRide + case 1, MauvilleCity_BikeShop_EventScript_HowToTurn + case 2, MauvilleCity_BikeShop_EventScript_SandySlopes + case 3, MauvilleCity_BikeShop_EventScript_ExitMachHandbook + case MULTI_B_PRESSED, MauvilleCity_BikeShop_EventScript_ExitMachHandbook end -MauvilleCity_BikeShop_EventScript_20ED88:: @ 820ED88 - message MauvilleCity_BikeShop_Text_20F487 +MauvilleCity_BikeShop_EventScript_HowToRide:: @ 820ED88 + message MauvilleCity_BikeShop_Text_HowToRideMachBike waitmessage - goto MauvilleCity_BikeShop_EventScript_20ED46 + goto MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage end -MauvilleCity_BikeShop_EventScript_20ED94:: @ 820ED94 - message MauvilleCity_BikeShop_Text_20F550 +MauvilleCity_BikeShop_EventScript_HowToTurn:: @ 820ED94 + message MauvilleCity_BikeShop_Text_HowToTurnMachBike waitmessage - goto MauvilleCity_BikeShop_EventScript_20ED46 + goto MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage end -MauvilleCity_BikeShop_EventScript_20EDA0:: @ 820EDA0 - message MauvilleCity_BikeShop_Text_20F61A +MauvilleCity_BikeShop_EventScript_SandySlopes:: @ 820EDA0 + message MauvilleCity_BikeShop_Text_SandySlopes waitmessage - goto MauvilleCity_BikeShop_EventScript_20ED46 + goto MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage end -MauvilleCity_BikeShop_EventScript_20EDAC:: @ 820EDAC +MauvilleCity_BikeShop_EventScript_ExitMachHandbook:: @ 820EDAC release end -MauvilleCity_BikeShop_EventScript_20EDAE:: @ 820EDAE - message MauvilleCity_BikeShop_Text_20F6ED +MauvilleCity_BikeShop_EventScript_AcroBikeHandbook:: @ 820EDAE + message MauvilleCity_BikeShop_Text_AcroHandbookWhichPage waitmessage - goto MauvilleCity_BikeShop_EventScript_20EDBA + goto MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage end -MauvilleCity_BikeShop_EventScript_20EDBA:: @ 820EDBA +MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage:: @ 820EDBA multichoice 0, 0, MULTI_ACRO_BIKE_INFO, 0 switch VAR_RESULT - case 0, MauvilleCity_BikeShop_EventScript_20EDFC - case 1, MauvilleCity_BikeShop_EventScript_20EE08 - case 2, MauvilleCity_BikeShop_EventScript_20EE14 - case 3, MauvilleCity_BikeShop_EventScript_20EE20 - case MULTI_B_PRESSED, MauvilleCity_BikeShop_EventScript_20EE20 + case 0, MauvilleCity_BikeShop_EventScript_Wheelies + case 1, MauvilleCity_BikeShop_EventScript_BunnyHops + case 2, MauvilleCity_BikeShop_EventScript_Jumps + case 3, MauvilleCity_BikeShop_EventScript_ExitAcroHandbook + case MULTI_B_PRESSED, MauvilleCity_BikeShop_EventScript_ExitAcroHandbook end -MauvilleCity_BikeShop_EventScript_20EDFC:: @ 820EDFC - message MauvilleCity_BikeShop_Text_20F72F +MauvilleCity_BikeShop_EventScript_Wheelies:: @ 820EDFC + message MauvilleCity_BikeShop_Text_Wheelies waitmessage - goto MauvilleCity_BikeShop_EventScript_20EDBA + goto MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage end -MauvilleCity_BikeShop_EventScript_20EE08:: @ 820EE08 - message MauvilleCity_BikeShop_Text_20F7F5 +MauvilleCity_BikeShop_EventScript_BunnyHops:: @ 820EE08 + message MauvilleCity_BikeShop_Text_BunnyHops waitmessage - goto MauvilleCity_BikeShop_EventScript_20EDBA + goto MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage end -MauvilleCity_BikeShop_EventScript_20EE14:: @ 820EE14 - message MauvilleCity_BikeShop_Text_20F898 +MauvilleCity_BikeShop_EventScript_Jumps:: @ 820EE14 + message MauvilleCity_BikeShop_Text_Jumps waitmessage - goto MauvilleCity_BikeShop_EventScript_20EDBA + goto MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage end -MauvilleCity_BikeShop_EventScript_20EE20:: @ 820EE20 +MauvilleCity_BikeShop_EventScript_ExitAcroHandbook:: @ 820EE20 release end -MauvilleCity_BikeShop_Text_20EE22: @ 820EE22 +MauvilleCity_BikeShop_Text_RydelGreeting: @ 820EE22 .string "Well, well, what have we here?\n" .string "A most energetic customer!\p" .string "Me? You may call me RYDEL.\n" .string "I'm the owner of this cycle shop.$" -MauvilleCity_BikeShop_Text_20EE99: @ 820EE99 +MauvilleCity_BikeShop_Text_DidYouComeFromFarAway: @ 820EE99 .string "RYDEL: Your RUNNING SHOES…\n" .string "They're awfully filthy.\p" .string "Did you come from far away?$" -MauvilleCity_BikeShop_Text_20EEE8: @ 820EEE8 +MauvilleCity_BikeShop_Text_GuessYouDontNeedBike: @ 820EEE8 .string "RYDEL: Is that right?\p" .string "Then, I guess you have no need for\n" .string "any of my BIKES.$" -MauvilleCity_BikeShop_Text_20EF32: @ 820EF32 +MauvilleCity_BikeShop_Text_ExplainBikesChooseWhichOne: @ 820EF32 .string "RYDEL: Hm, hm… … … … …\p" .string "You're saying that you came all this\n" .string "way from LITTLEROOT?\p" @@ -221,37 +222,37 @@ MauvilleCity_BikeShop_Text_20EF32: @ 820EF32 .string "have whichever one you like!\p" .string "Which one will you choose?$" -MauvilleCity_BikeShop_Text_20F18D: @ 820F18D +MauvilleCity_BikeShop_Text_ChoseMachBike: @ 820F18D .string "{PLAYER} chose the MACH BIKE.$" -MauvilleCity_BikeShop_Text_20F1A5: @ 820F1A5 +MauvilleCity_BikeShop_Text_ChoseAcroBike: @ 820F1A5 .string "{PLAYER} chose the ACRO BIKE.$" -MauvilleCity_BikeShop_Text_20F1BD: @ 820F1BD +MauvilleCity_BikeShop_Text_ComeBackToSwitchBikes: @ 820F1BD .string "RYDEL: If you get the urge to switch\n" .string "BIKES, just come see me!$" -MauvilleCity_BikeShop_Text_20F1FB: @ 820F1FB +MauvilleCity_BikeShop_Text_WantToSwitchBikes: @ 820F1FB .string "RYDEL: Oh? Were you thinking about\n" .string "switching BIKES?$" -MauvilleCity_BikeShop_Text_20F22F: @ 820F22F +MauvilleCity_BikeShop_Text_IllSwitchBikes: @ 820F22F .string "RYDEL: Okay, no problem!\n" .string "I'll switch BIKES for you!$" -MauvilleCity_BikeShop_Text_20F263: @ 820F263 +MauvilleCity_BikeShop_Text_ExchangedMachForAcro: @ 820F263 .string "{PLAYER} got the MACH BIKE exchanged\n" .string "for an ACRO BIKE.$" -MauvilleCity_BikeShop_Text_20F294: @ 820F294 +MauvilleCity_BikeShop_Text_ExchangedAcroForMach: @ 820F294 .string "{PLAYER} got the ACRO BIKE exchanged\n" .string "for a MACH BIKE.$" -MauvilleCity_BikeShop_Text_20F2C4: @ 820F2C4 +MauvilleCity_BikeShop_Text_HappyYouLikeIt: @ 820F2C4 .string "RYDEL: Good, good!\n" .string "I'm happy that you like it!$" -MauvilleCity_BikeShop_Text_20F2F3: @ 820F2F3 +MauvilleCity_BikeShop_Text_OhYourBikeIsInPC: @ 820F2F3 .string "Oh? What happened to that BIKE\n" .string "I gave you?\p" .string "Oh, I get it, you stored it using your PC.\p" @@ -260,18 +261,18 @@ MauvilleCity_BikeShop_Text_20F2F3: @ 820F2F3 .string "May the wind always be at your back\n" .string "on your adventure!$" -MauvilleCity_BikeShop_Text_20F3C3: @ 820F3C3 +MauvilleCity_BikeShop_Text_HandbooksAreInBack: @ 820F3C3 .string "I'm learning about BIKES while\n" .string "I work here.\p" .string "If you need advice on how to ride your\n" .string "BIKE, there're a couple handbooks in\l" .string "the back.$" -MauvilleCity_BikeShop_Text_20F445: @ 820F445 +MauvilleCity_BikeShop_Text_MachHandbookWhichPage: @ 820F445 .string "It's a handbook on the MACH BIKE.\p" .string "Which page do you want to read?$" -MauvilleCity_BikeShop_Text_20F487: @ 820F487 +MauvilleCity_BikeShop_Text_HowToRideMachBike: @ 820F487 .string "A BIKE moves in the direction that\n" .string "the + Control Pad is pressed.\p" .string "It will speed up once it gets rolling.\p" @@ -279,7 +280,7 @@ MauvilleCity_BikeShop_Text_20F487: @ 820F487 .string "The BIKE will slow to a stop.\p" .string "Want to read a different page?$" -MauvilleCity_BikeShop_Text_20F550: @ 820F550 +MauvilleCity_BikeShop_Text_HowToTurnMachBike: @ 820F550 .string "A MACH BIKE is speedy, but it can't\n" .string "stop very quickly.\p" .string "It gets a little tricky to get around\n" @@ -288,7 +289,7 @@ MauvilleCity_BikeShop_Text_20F550: @ 820F550 .string "before the corner and slow down.\p" .string "Want to read a different page?$" -MauvilleCity_BikeShop_Text_20F61A: @ 820F61A +MauvilleCity_BikeShop_Text_SandySlopes: @ 820F61A .string "There are small sandy slopes\n" .string "throughout the HOENN region.\p" .string "The loose, crumbly sand makes it\n" @@ -297,11 +298,11 @@ MauvilleCity_BikeShop_Text_20F61A: @ 820F61A .string "zip up a sandy slope.\p" .string "Want to read a different page?$" -MauvilleCity_BikeShop_Text_20F6ED: @ 820F6ED +MauvilleCity_BikeShop_Text_AcroHandbookWhichPage: @ 820F6ED .string "It's a handbook on the ACRO BIKE.\p" .string "Which page do you want to read?$" -MauvilleCity_BikeShop_Text_20F72F: @ 820F72F +MauvilleCity_BikeShop_Text_Wheelies: @ 820F72F .string "Press the B Button while riding,\n" .string "and the front wheel lifts up.\p" .string "You can zip around with the front\n" @@ -309,14 +310,14 @@ MauvilleCity_BikeShop_Text_20F72F: @ 820F72F .string "This technique is called a wheelie.\p" .string "Want to read a different page?$" -MauvilleCity_BikeShop_Text_20F7F5: @ 820F7F5 +MauvilleCity_BikeShop_Text_BunnyHops: @ 820F7F5 .string "Keeping the B Button pressed,\n" .string "your BIKE can hop on the spot.\p" .string "This technique is called a bunny hop.\p" .string "You can ride while hopping, too.\p" .string "Want to read a different page?$" -MauvilleCity_BikeShop_Text_20F898: @ 820F898 +MauvilleCity_BikeShop_Text_Jumps: @ 820F898 .string "Press the B Button and the + Control\n" .string "Pad at the same time to jump.\p" .string "Press the + Control Pad to the side\n" diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json index 07bfd3bb2..c811cd7fd 100644 --- a/data/maps/MauvilleCity_GameCorner/map.json +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -291,7 +291,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + "script": "Roulette_EventScript_Table1" }, { "type": "sign", @@ -299,7 +299,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + "script": "Roulette_EventScript_Table1" }, { "type": "sign", @@ -307,7 +307,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + "script": "Roulette_EventScript_Table1" }, { "type": "sign", @@ -315,7 +315,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + "script": "Roulette_EventScript_Table1" }, { "type": "sign", @@ -323,7 +323,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + "script": "Roulette_EventScript_Table1" }, { "type": "sign", @@ -331,7 +331,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + "script": "Roulette_EventScript_Table1" }, { "type": "sign", @@ -339,7 +339,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + "script": "Roulette_EventScript_Table2" }, { "type": "sign", @@ -347,7 +347,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + "script": "Roulette_EventScript_Table2" }, { "type": "sign", @@ -355,7 +355,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + "script": "Roulette_EventScript_Table2" }, { "type": "sign", @@ -363,7 +363,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + "script": "Roulette_EventScript_Table2" }, { "type": "sign", @@ -371,7 +371,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + "script": "Roulette_EventScript_Table2" }, { "type": "sign", @@ -379,7 +379,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + "script": "Roulette_EventScript_Table2" } ] }
\ No newline at end of file diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index a6ee8ec85..98f4a2a77 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -151,7 +151,7 @@ MauvilleCity_GameCorner_EventScript_20FD83:: @ 820FD83 MauvilleCity_GameCorner_EventScript_20FD91:: @ 820FD91 msgbox MauvilleCity_GameCorner_Text_210705, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MauvilleCity_GameCorner_EventScript_20FE92 switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_20FDCB @@ -290,7 +290,7 @@ MauvilleCity_GameCorner_EventScript_20FF77:: @ 820FF77 MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A special BufferTMHMMoveName msgbox MauvilleCity_GameCorner_Text_210629, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MauvilleCity_GameCorner_EventScript_210118 switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_20FFDD @@ -404,7 +404,7 @@ MauvilleCity_GameCorner_EventScript_210137:: @ 8210137 faceplayer goto_if_set FLAG_RECEIVED_STARTER_DOLL, MauvilleCity_GameCorner_EventScript_210213 msgbox MauvilleCity_GameCorner_Text_210750, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MauvilleCity_GameCorner_EventScript_210209 switch VAR_STARTER_MON case 0, MauvilleCity_GameCorner_EventScript_21017C @@ -534,7 +534,7 @@ MauvilleCity_GameCorner_EventScript_2102D6:: @ 82102D6 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 0 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -545,7 +545,7 @@ MauvilleCity_GameCorner_EventScript_2102F6:: @ 82102F6 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 1 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -556,7 +556,7 @@ MauvilleCity_GameCorner_EventScript_210316:: @ 8210316 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 2 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -567,7 +567,7 @@ MauvilleCity_GameCorner_EventScript_210336:: @ 8210336 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 3 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -578,7 +578,7 @@ MauvilleCity_GameCorner_EventScript_210356:: @ 8210356 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 4 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -589,7 +589,7 @@ MauvilleCity_GameCorner_EventScript_210376:: @ 8210376 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 5 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -600,7 +600,7 @@ MauvilleCity_GameCorner_EventScript_210396:: @ 8210396 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 6 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -611,7 +611,7 @@ MauvilleCity_GameCorner_EventScript_2103B6:: @ 82103B6 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 7 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -622,7 +622,7 @@ MauvilleCity_GameCorner_EventScript_2103D6:: @ 82103D6 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 8 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -633,7 +633,7 @@ MauvilleCity_GameCorner_EventScript_2103F6:: @ 82103F6 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 9 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -644,7 +644,7 @@ MauvilleCity_GameCorner_EventScript_210416:: @ 8210416 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 10 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -655,15 +655,15 @@ MauvilleCity_GameCorner_EventScript_210436:: @ 8210436 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 11 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end -MauvilleCity_GameCorner_EventScript_210456:: @ 8210456 - msgbox MauvilleCity_GameCorner_Text_210C2E, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_NoCoinCase:: @ 8210456 + msgbox MauvilleCity_GameCorner_Text_CantPlayWithNoCoinCase, MSGBOX_DEFAULT releaseall end @@ -811,7 +811,7 @@ MauvilleCity_GameCorner_Text_210B04: @ 8210B04 .string "That would total 660 COINS, but it's\n" .string "very difficult to get.$" -MauvilleCity_GameCorner_Text_210C2E: @ 8210C2E +MauvilleCity_GameCorner_Text_CantPlayWithNoCoinCase: @ 8210C2E .string "You can't play if you don't have\n" .string "a COIN CASE.$" diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json index 9de74941c..ecc9f13c2 100644 --- a/data/maps/MauvilleCity_Gym/map.json +++ b/data/maps/MauvilleCity_Gym/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_Gym_EventScript_20DEEB", + "script": "MauvilleCity_Gym_EventScript_Wattson", "flag": "FLAG_HIDE_MAUVILLE_GYM_WATTSON" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MauvilleCity_Gym_EventScript_20E0D0", + "script": "MauvilleCity_Gym_EventScript_Shawn", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "MauvilleCity_Gym_EventScript_20E0FE", + "script": "MauvilleCity_Gym_EventScript_Vivian", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "MauvilleCity_Gym_EventScript_20E0E7", + "script": "MauvilleCity_Gym_EventScript_Ben", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "MauvilleCity_Gym_EventScript_20E0B9", + "script": "MauvilleCity_Gym_EventScript_Kirk", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_Gym_EventScript_20E12C", + "script": "MauvilleCity_Gym_EventScript_GymGuide", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MauvilleCity_Gym_EventScript_20E115", + "script": "MauvilleCity_Gym_EventScript_Angelo", "flag": "0" } ], @@ -130,7 +130,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "MauvilleCity_Gym_EventScript_20E01E" + "script": "MauvilleCity_Gym_EventScript_Switch2" }, { "type": "trigger", @@ -139,7 +139,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "MauvilleCity_Gym_EventScript_20E043" + "script": "MauvilleCity_Gym_EventScript_Switch3" }, { "type": "trigger", @@ -148,7 +148,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "MauvilleCity_Gym_EventScript_20DFF9" + "script": "MauvilleCity_Gym_EventScript_Switch1" }, { "type": "trigger", @@ -157,7 +157,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "MauvilleCity_Gym_EventScript_20E068" + "script": "MauvilleCity_Gym_EventScript_Switch4" } ], "bg_events": [ @@ -167,7 +167,7 @@ "y": 18, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_Gym_EventScript_20E14B" + "script": "MauvilleCity_Gym_EventScript_LeftGymStatue" }, { "type": "sign", @@ -175,7 +175,7 @@ "y": 18, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MauvilleCity_Gym_EventScript_20E15B" + "script": "MauvilleCity_Gym_EventScript_RightGymStatue" } ] }
\ No newline at end of file diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index 811cdc9de..a4489018f 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -1,22 +1,22 @@ MauvilleCity_Gym_MapScripts:: @ 820DD6E - map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_Gym_MapScript1_20DD74 + map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_Gym_OnLoad .byte 0 -MauvilleCity_Gym_MapScript1_20DD74: @ 820DD74 - goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20DEE7 +MauvilleCity_Gym_OnLoad: @ 820DD74 + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_DeactivatePuzzle switch VAR_MAUVILLE_GYM_STATE - case 0, MauvilleCity_Gym_EventScript_20DDBA - case 1, MauvilleCity_Gym_EventScript_20DEAF - case 2, MauvilleCity_Gym_EventScript_20DEBD - case 3, MauvilleCity_Gym_EventScript_20DECB - case 4, MauvilleCity_Gym_EventScript_20DED9 + case 0, MauvilleCity_Gym_EventScript_UpdateBarriers + case 1, MauvilleCity_Gym_EventScript_Switch1Pressed + case 2, MauvilleCity_Gym_EventScript_Switch2Pressed + case 3, MauvilleCity_Gym_EventScript_Switch3Pressed + case 4, MauvilleCity_Gym_EventScript_Switch4Pressed end -MauvilleCity_Gym_EventScript_20DDBA:: @ 820DDBA - goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_20DDC4 +MauvilleCity_Gym_EventScript_UpdateBarriers:: @ 820DDBA + goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_SetAltBarriers end -MauvilleCity_Gym_EventScript_20DDC4:: @ 820DDC4 +MauvilleCity_Gym_EventScript_SetAltBarriers:: @ 820DDC4 setmetatile 3, 11, METATILE_MauvilleGym_RedBeamV1_On, 1 setmetatile 3, 12, METATILE_MauvilleGym_RedBeamV2_On, 1 setmetatile 3, 13, METATILE_MauvilleGym_PoleTop_On, 1 @@ -45,68 +45,68 @@ MauvilleCity_Gym_EventScript_20DDC4:: @ 820DDC4 setmetatile 5, 7, METATILE_MauvilleGym_GreenBeamH4_Off, 0 end -MauvilleCity_Gym_EventScript_20DEAF:: @ 820DEAF +MauvilleCity_Gym_EventScript_Switch1Pressed:: @ 820DEAF setvar VAR_0x8004, 0 - special MauvilleGymSpecial1 - goto MauvilleCity_Gym_EventScript_20DDBA + special MauvilleGymPressSwitch + goto MauvilleCity_Gym_EventScript_UpdateBarriers end -MauvilleCity_Gym_EventScript_20DEBD:: @ 820DEBD +MauvilleCity_Gym_EventScript_Switch2Pressed:: @ 820DEBD setvar VAR_0x8004, 1 - special MauvilleGymSpecial1 - goto MauvilleCity_Gym_EventScript_20DDBA + special MauvilleGymPressSwitch + goto MauvilleCity_Gym_EventScript_UpdateBarriers end -MauvilleCity_Gym_EventScript_20DECB:: @ 820DECB +MauvilleCity_Gym_EventScript_Switch3Pressed:: @ 820DECB setvar VAR_0x8004, 2 - special MauvilleGymSpecial1 - goto MauvilleCity_Gym_EventScript_20DDBA + special MauvilleGymPressSwitch + goto MauvilleCity_Gym_EventScript_UpdateBarriers end -MauvilleCity_Gym_EventScript_20DED9:: @ 820DED9 +MauvilleCity_Gym_EventScript_Switch4Pressed:: @ 820DED9 setvar VAR_0x8004, 3 - special MauvilleGymSpecial1 - goto MauvilleCity_Gym_EventScript_20DDBA + special MauvilleGymPressSwitch + goto MauvilleCity_Gym_EventScript_UpdateBarriers end -MauvilleCity_Gym_EventScript_20DEE7:: @ 820DEE7 - special MauvilleGymSpecial3 +MauvilleCity_Gym_EventScript_DeactivatePuzzle:: @ 820DEE7 + special MauvilleGymDeactivatePuzzle end -MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB - trainerbattle_single TRAINER_WATTSON_1, MauvilleCity_Gym_Text_20E602, MauvilleCity_Gym_Text_20E734, MauvilleCity_Gym_EventScript_20DF2B, NO_MUSIC +MauvilleCity_Gym_EventScript_Wattson:: @ 820DEEB + trainerbattle_single TRAINER_WATTSON_1, MauvilleCity_Gym_Text_WattsonPreBattle, MauvilleCity_Gym_Text_WattsonDefeat, MauvilleCity_Gym_EventScript_WattsonDefeated, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_Gym_EventScript_20DFDE - goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_20DF8D + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_Gym_EventScript_WattsonRematch + goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_GiveShockWave2 compare VAR_NEW_MAUVILLE_STATE, 2 - goto_if_eq MauvilleCity_Gym_EventScript_20DFD4 - msgbox MauvilleCity_Gym_Text_20E8E3, MSGBOX_DEFAULT + goto_if_eq MauvilleCity_Gym_EventScript_CompletedNewMauville + msgbox MauvilleCity_Gym_Text_WattsonPostBattle, MSGBOX_DEFAULT release end -MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B - message MauvilleCity_Gym_Text_20E77F +MauvilleCity_Gym_EventScript_WattsonDefeated:: @ 820DF2B + message MauvilleCity_Gym_Text_ReceivedDynamoBadge waitmessage call Common_EventScript_PlayGymBadgeFanfare - msgbox MauvilleCity_Gym_Text_20E7AA, MSGBOX_DEFAULT + msgbox MauvilleCity_Gym_Text_ExplainDynamoBadgeTakeThis, MSGBOX_DEFAULT setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 3 clearflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT setflag FLAG_DEFEATED_MAUVILLE_GYM setflag FLAG_BADGE03_GET addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 - call_if_eq MauvilleCity_Gym_EventScript_271E84 + call_if_eq Common_EventScript_ReadyPetalburgGymForBattle setvar VAR_0x8008, 3 - call MauvilleCity_Gym_EventScript_271F43 - special MauvilleGymSpecial3 + call Common_EventScript_SetGymTrainers + special MauvilleGymDeactivatePuzzle special DrawWholeMapView playse SE_KI_GASYAN - call MauvilleCity_Gym_EventScript_20DFB1 + call MauvilleCity_Gym_EventScript_GiveShockWave closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox MauvilleCity_Gym_Text_20E8B5, MSGBOX_DEFAULT + msgbox MauvilleCity_Gym_Text_RegisteredWattson, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -114,158 +114,158 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B release end -MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D +MauvilleCity_Gym_EventScript_GiveShockWave2:: @ 820DF8D giveitem_std ITEM_TM34 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT + msgbox MauvilleCity_Gym_Text_ExplainShockWave, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM34 release end -MauvilleCity_Gym_EventScript_20DFB1:: @ 820DFB1 +MauvilleCity_Gym_EventScript_GiveShockWave:: @ 820DFB1 giveitem_std ITEM_TM34 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_BagIsFull - msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT + msgbox MauvilleCity_Gym_Text_ExplainShockWave, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM34 return -MauvilleCity_Gym_EventScript_20DFD4:: @ 820DFD4 - msgbox MauvilleCity_Gym_Text_20E925, MSGBOX_DEFAULT +MauvilleCity_Gym_EventScript_CompletedNewMauville:: @ 820DFD4 + msgbox MauvilleCity_Gym_Text_WattsonGoForthAndEndeavor, MSGBOX_DEFAULT release end -MauvilleCity_Gym_EventScript_20DFDE:: @ 820DFDE - trainerbattle_rematch_double TRAINER_WATTSON_1, MauvilleCity_Gym_Text_20E9A7, MauvilleCity_Gym_Text_20EA42, MauvilleCity_Gym_Text_20EAFD +MauvilleCity_Gym_EventScript_WattsonRematch:: @ 820DFDE + trainerbattle_rematch_double TRAINER_WATTSON_1, MauvilleCity_Gym_Text_WattsonPreRematch, MauvilleCity_Gym_Text_WattsonRematchDefeat, MauvilleCity_Gym_Text_WattsonRematchNeedTwoMons msgbox MauvilleCity_Gym_Text_20EA5E, MSGBOX_AUTOCLOSE end -MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9 +MauvilleCity_Gym_EventScript_Switch1:: @ 820DFF9 lockall - goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_SwitchDoNothing compare VAR_MAUVILLE_GYM_STATE, 1 - goto_if_eq MauvilleCity_Gym_EventScript_20E0AD + goto_if_eq MauvilleCity_Gym_EventScript_SwitchDoNothing setvar VAR_MAUVILLE_GYM_STATE, 1 setvar VAR_0x8004, 0 - goto MauvilleCity_Gym_EventScript_20E08D + goto MauvilleCity_Gym_EventScript_PressFloorSwitch end -MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E +MauvilleCity_Gym_EventScript_Switch2:: @ 820E01E lockall - goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_SwitchDoNothing compare VAR_MAUVILLE_GYM_STATE, 2 - goto_if_eq MauvilleCity_Gym_EventScript_20E0AD + goto_if_eq MauvilleCity_Gym_EventScript_SwitchDoNothing setvar VAR_MAUVILLE_GYM_STATE, 2 setvar VAR_0x8004, 1 - goto MauvilleCity_Gym_EventScript_20E08D + goto MauvilleCity_Gym_EventScript_PressFloorSwitch end -MauvilleCity_Gym_EventScript_20E043:: @ 820E043 +MauvilleCity_Gym_EventScript_Switch3:: @ 820E043 lockall - goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_SwitchDoNothing compare VAR_MAUVILLE_GYM_STATE, 3 - goto_if_eq MauvilleCity_Gym_EventScript_20E0AD + goto_if_eq MauvilleCity_Gym_EventScript_SwitchDoNothing setvar VAR_MAUVILLE_GYM_STATE, 3 setvar VAR_0x8004, 2 - goto MauvilleCity_Gym_EventScript_20E08D + goto MauvilleCity_Gym_EventScript_PressFloorSwitch end -MauvilleCity_Gym_EventScript_20E068:: @ 820E068 +MauvilleCity_Gym_EventScript_Switch4:: @ 820E068 lockall - goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_SwitchDoNothing compare VAR_MAUVILLE_GYM_STATE, 4 - goto_if_eq MauvilleCity_Gym_EventScript_20E0AD + goto_if_eq MauvilleCity_Gym_EventScript_SwitchDoNothing setvar VAR_MAUVILLE_GYM_STATE, 4 setvar VAR_0x8004, 3 - goto MauvilleCity_Gym_EventScript_20E08D + goto MauvilleCity_Gym_EventScript_PressFloorSwitch end -MauvilleCity_Gym_EventScript_20E08D:: @ 820E08D - special MauvilleGymSpecial2 - special MauvilleGymSpecial1 +MauvilleCity_Gym_EventScript_PressFloorSwitch:: @ 820E08D + special MauvilleGymSetDefaultBarriers + special MauvilleGymPressSwitch special DrawWholeMapView playse SE_KI_GASYAN - goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_20E0B4 - goto_if_unset FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_20E0AF + goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_ClearBarriersAltState + goto_if_unset FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_SetBarriersAltState releaseall end -MauvilleCity_Gym_EventScript_20E0AD:: @ 820E0AD +MauvilleCity_Gym_EventScript_SwitchDoNothing:: @ 820E0AD releaseall end -MauvilleCity_Gym_EventScript_20E0AF:: @ 820E0AF +MauvilleCity_Gym_EventScript_SetBarriersAltState:: @ 820E0AF setflag FLAG_MAUVILLE_GYM_BARRIERS_STATE releaseall end -MauvilleCity_Gym_EventScript_20E0B4:: @ 820E0B4 +MauvilleCity_Gym_EventScript_ClearBarriersAltState:: @ 820E0B4 clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE releaseall end -MauvilleCity_Gym_EventScript_20E0B9:: @ 820E0B9 - trainerbattle_single TRAINER_KIRK, MauvilleCity_Gym_Text_20E2BC, MauvilleCity_Gym_Text_20E2FC - msgbox MauvilleCity_Gym_Text_20E336, MSGBOX_AUTOCLOSE +MauvilleCity_Gym_EventScript_Kirk:: @ 820E0B9 + trainerbattle_single TRAINER_KIRK, MauvilleCity_Gym_Text_KirkPreBattle, MauvilleCity_Gym_Text_KirkDefeat + msgbox MauvilleCity_Gym_Text_KirkPostBattle, MSGBOX_AUTOCLOSE end -MauvilleCity_Gym_EventScript_20E0D0:: @ 820E0D0 - trainerbattle_single TRAINER_SHAWN, MauvilleCity_Gym_Text_20E369, MauvilleCity_Gym_Text_20E3A7 - msgbox MauvilleCity_Gym_Text_20E3C1, MSGBOX_AUTOCLOSE +MauvilleCity_Gym_EventScript_Shawn:: @ 820E0D0 + trainerbattle_single TRAINER_SHAWN, MauvilleCity_Gym_Text_ShawnPreBattle, MauvilleCity_Gym_Text_ShawnDefeat + msgbox MauvilleCity_Gym_Text_ShawnPostBattle, MSGBOX_AUTOCLOSE end -MauvilleCity_Gym_EventScript_20E0E7:: @ 820E0E7 - trainerbattle_single TRAINER_BEN, MauvilleCity_Gym_Text_20E443, MauvilleCity_Gym_Text_20E469 - msgbox MauvilleCity_Gym_Text_20E47E, MSGBOX_AUTOCLOSE +MauvilleCity_Gym_EventScript_Ben:: @ 820E0E7 + trainerbattle_single TRAINER_BEN, MauvilleCity_Gym_Text_BenPreBattle, MauvilleCity_Gym_Text_BenDefeat + msgbox MauvilleCity_Gym_Text_BenPostBattle, MSGBOX_AUTOCLOSE end -MauvilleCity_Gym_EventScript_20E0FE:: @ 820E0FE - trainerbattle_single TRAINER_VIVIAN, MauvilleCity_Gym_Text_20E4BB, MauvilleCity_Gym_Text_20E4F4 - msgbox MauvilleCity_Gym_Text_20E50F, MSGBOX_AUTOCLOSE +MauvilleCity_Gym_EventScript_Vivian:: @ 820E0FE + trainerbattle_single TRAINER_VIVIAN, MauvilleCity_Gym_Text_VivianPreBattle, MauvilleCity_Gym_Text_VivianDefeat + msgbox MauvilleCity_Gym_Text_VivianPostBattle, MSGBOX_AUTOCLOSE end -MauvilleCity_Gym_EventScript_20E115:: @ 820E115 - trainerbattle_single TRAINER_ANGELO, MauvilleCity_Gym_Text_20E593, MauvilleCity_Gym_Text_20E5A8 - msgbox MauvilleCity_Gym_Text_20E5C2, MSGBOX_AUTOCLOSE +MauvilleCity_Gym_EventScript_Angelo:: @ 820E115 + trainerbattle_single TRAINER_ANGELO, MauvilleCity_Gym_Text_AngeloPreBattle, MauvilleCity_Gym_Text_AngeloDefeat + msgbox MauvilleCity_Gym_Text_AngeloPostBattle, MSGBOX_AUTOCLOSE end -MauvilleCity_Gym_EventScript_20E12C:: @ 820E12C +MauvilleCity_Gym_EventScript_GymGuide:: @ 820E12C lock faceplayer - goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E141 - msgbox MauvilleCity_Gym_Text_20E17F, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_GymGuidePostVictory + msgbox MauvilleCity_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT release end -MauvilleCity_Gym_EventScript_20E141:: @ 820E141 - msgbox MauvilleCity_Gym_Text_20E283, MSGBOX_DEFAULT +MauvilleCity_Gym_EventScript_GymGuidePostVictory:: @ 820E141 + msgbox MauvilleCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT release end -MauvilleCity_Gym_EventScript_20E14B:: @ 820E14B +MauvilleCity_Gym_EventScript_LeftGymStatue:: @ 820E14B lockall - goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_20E16B - goto MauvilleCity_Gym_EventScript_20E175 + goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_GymStatueCertified + goto MauvilleCity_Gym_EventScript_GymStatue end -MauvilleCity_Gym_EventScript_20E15B:: @ 820E15B +MauvilleCity_Gym_EventScript_RightGymStatue:: @ 820E15B lockall - goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_20E16B - goto MauvilleCity_Gym_EventScript_20E175 + goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_GymStatueCertified + goto MauvilleCity_Gym_EventScript_GymStatue end -MauvilleCity_Gym_EventScript_20E16B:: @ 820E16B - msgbox MauvilleCity_Gym_Text_20E96C, MSGBOX_DEFAULT +MauvilleCity_Gym_EventScript_GymStatueCertified:: @ 820E16B + msgbox MauvilleCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT releaseall end -MauvilleCity_Gym_EventScript_20E175:: @ 820E175 - msgbox MauvilleCity_Gym_Text_20E952, MSGBOX_DEFAULT +MauvilleCity_Gym_EventScript_GymStatue:: @ 820E175 + msgbox MauvilleCity_Gym_Text_GymStatue, MSGBOX_DEFAULT releaseall end -MauvilleCity_Gym_Text_20E17F: @ 820E17F +MauvilleCity_Gym_Text_GymGuideAdvice: @ 820E17F .string "Hey, how's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" .string "WATTSON, the LEADER of MAUVILLE\n" @@ -276,72 +276,72 @@ MauvilleCity_Gym_Text_20E17F: @ 820E17F .string "doors all over his GYM! Eccentric!\p" .string "Hey, go for it!$" -MauvilleCity_Gym_Text_20E283: @ 820E283 +MauvilleCity_Gym_Text_GymGuidePostVictory: @ 820E283 .string "Whoa, you're electrifying!\n" .string "You've powered the door open!$" -MauvilleCity_Gym_Text_20E2BC: @ 820E2BC +MauvilleCity_Gym_Text_KirkPreBattle: @ 820E2BC .string "My electric soul, it'll shatter your\n" .string "dreams whole, whoa-yeahah!$" -MauvilleCity_Gym_Text_20E2FC: @ 820E2FC +MauvilleCity_Gym_Text_KirkDefeat: @ 820E2FC .string "That was plugged in, amped up,\n" .string "over-driven electric, man!$" -MauvilleCity_Gym_Text_20E336: @ 820E336 +MauvilleCity_Gym_Text_KirkPostBattle: @ 820E336 .string "POKéMON and rock, it's all about heart,\n" .string "whoa-yeah!$" -MauvilleCity_Gym_Text_20E369: @ 820E369 +MauvilleCity_Gym_Text_ShawnPreBattle: @ 820E369 .string "I trained under WATTSON!\n" .string "There ain't no way I'll lose easily!$" -MauvilleCity_Gym_Text_20E3A7: @ 820E3A7 +MauvilleCity_Gym_Text_ShawnDefeat: @ 820E3A7 .string "Unplugged and turned off…$" -MauvilleCity_Gym_Text_20E3C1: @ 820E3C1 +MauvilleCity_Gym_Text_ShawnPostBattle: @ 820E3C1 .string "WATTSON, our GYM LEADER, has been\n" .string "around for a long, long time.\p" .string "He was battling even before your\n" .string "daddy was born, that tough coot.$" -MauvilleCity_Gym_Text_20E443: @ 820E443 +MauvilleCity_Gym_Text_BenPreBattle: @ 820E443 .string "This GYM's got puzzles!\n" .string "Isn't it fun?$" -MauvilleCity_Gym_Text_20E469: @ 820E469 +MauvilleCity_Gym_Text_BenDefeat: @ 820E469 .string "It's no fun to lose…$" -MauvilleCity_Gym_Text_20E47E: @ 820E47E +MauvilleCity_Gym_Text_BenPostBattle: @ 820E47E .string "WATTSON says he likes setting up\n" .string "little traps with switches.$" -MauvilleCity_Gym_Text_20E4BB: @ 820E4BB +MauvilleCity_Gym_Text_VivianPreBattle: @ 820E4BB .string "With my charm and my POKéMON's moves,\n" .string "you'll be shocked!$" -MauvilleCity_Gym_Text_20E4F4: @ 820E4F4 +MauvilleCity_Gym_Text_VivianDefeat: @ 820E4F4 .string "I'm shocked by your power!$" -MauvilleCity_Gym_Text_20E50F: @ 820E50F +MauvilleCity_Gym_Text_VivianPostBattle: @ 820E50F .string "I've heard that MAUVILLE was founded\n" .string "by WATTSON.\p" .string "He was a TRAINER long before we\n" .string "became TRAINERS.\l" .string "He must know all sorts of things!$" -MauvilleCity_Gym_Text_20E593: @ 820E593 +MauvilleCity_Gym_Text_AngeloPreBattle: @ 820E593 .string "I love shiny things!$" -MauvilleCity_Gym_Text_20E5A8: @ 820E5A8 +MauvilleCity_Gym_Text_AngeloDefeat: @ 820E5A8 .string "Oh…\n" .string "My eyes are frazzled…$" -MauvilleCity_Gym_Text_20E5C2: @ 820E5C2 +MauvilleCity_Gym_Text_AngeloPostBattle: @ 820E5C2 .string "MAUVILLE GYM's WATTSON has a shiny\n" .string "forehead. It makes me happy!$" -MauvilleCity_Gym_Text_20E602: @ 820E602 +MauvilleCity_Gym_Text_WattsonPreBattle: @ 820E602 .string "I've given up on my plans to convert\n" .string "the city, I have.\p" .string "And so, I put my time into making\n" @@ -354,17 +354,17 @@ MauvilleCity_Gym_Text_20E602: @ 820E602 .string "Then, I, WATTSON, the LEADER of\n" .string "MAUVILLE GYM, shall electrify you!$" -MauvilleCity_Gym_Text_20E734: @ 820E734 +MauvilleCity_Gym_Text_WattsonDefeat: @ 820E734 .string "Wahahahah!\n" .string "Fine, I lost!\p" .string "You ended up giving me a thrill!\n" .string "Take this BADGE!$" -MauvilleCity_Gym_Text_20E77F: @ 820E77F +MauvilleCity_Gym_Text_ReceivedDynamoBadge: @ 820E77F .string "{PLAYER} received the DYNAMO BADGE\n" .string "from WATTSON.$" -MauvilleCity_Gym_Text_20E7AA: @ 820E7AA +MauvilleCity_Gym_Text_ExplainDynamoBadgeTakeThis: @ 820E7AA .string "With the DYNAMO BADGE, POKéMON can\n" .string "use ROCK SMASH out of battle.\p" .string "And, it will make your POKéMON a little\n" @@ -372,33 +372,33 @@ MauvilleCity_Gym_Text_20E7AA: @ 820E7AA .string "Hmm…\n" .string "You should take this, too!$" -MauvilleCity_Gym_Text_20E844: @ 820E844 +MauvilleCity_Gym_Text_ExplainShockWave: @ 820E844 .string "That TM34 there contains SHOCK WAVE.\p" .string "It's a trustworthy move that never\n" .string "misses! You can count on it!\p" .string "… … … … … …$" -MauvilleCity_Gym_Text_20E8B5: @ 820E8B5 +MauvilleCity_Gym_Text_RegisteredWattson: @ 820E8B5 .string "Registered GYM LEADER WATTSON\n" .string "in the POKéNAV.$" -MauvilleCity_Gym_Text_20E8E3: @ 820E8E3 +MauvilleCity_Gym_Text_WattsonPostBattle: @ 820E8E3 .string "I swell with optimism, seeing a promising\n" .string "young TRAINER like you!$" -MauvilleCity_Gym_Text_20E925: @ 820E925 +MauvilleCity_Gym_Text_WattsonGoForthAndEndeavor: @ 820E925 .string "Wahahahah!\n" .string "Go forth and endeavor, youngster!$" -MauvilleCity_Gym_Text_20E952: @ 820E952 +MauvilleCity_Gym_Text_GymStatue: @ 820E952 .string "MAUVILLE CITY POKéMON GYM$" -MauvilleCity_Gym_Text_20E96C: @ 820E96C +MauvilleCity_Gym_Text_GymStatueCertified: @ 820E96C .string "MAUVILLE CITY POKéMON GYM\p" .string "WATTSON'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" -MauvilleCity_Gym_Text_20E9A7: @ 820E9A7 +MauvilleCity_Gym_Text_WattsonPreRematch: @ 820E9A7 .string "WATTSON: Ah-ha! Here at last!\n" .string "I know what you want.\l" .string "You want to battle my POKéMON!\p" @@ -406,7 +406,7 @@ MauvilleCity_Gym_Text_20E9A7: @ 820E9A7 .string "I'll make sparks fly from you!\n" .string "Don't say I didn't warn you!$" -MauvilleCity_Gym_Text_20EA42: @ 820EA42 +MauvilleCity_Gym_Text_WattsonRematchDefeat: @ 820EA42 .string "Oof…\n" .string "Our batteries ran dry…$" @@ -418,7 +418,7 @@ MauvilleCity_Gym_Text_20EA5E: @ 820EA5E .string "So, come back again sometime,\n" .string "won't you?$" -MauvilleCity_Gym_Text_20EAFD: @ 820EAFD +MauvilleCity_Gym_Text_WattsonRematchNeedTwoMons: @ 820EAFD .string "WATTSON: Ah-ha! Here at last!\n" .string "I know what you want.\l" .string "You want to battle my POKéMON!\p" diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc index b683b8c15..e0b6a404f 100644 --- a/data/maps/MauvilleCity_House2/scripts.inc +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -19,9 +19,9 @@ MauvilleCity_House2_EventScript_210C82:: @ 8210C82 applymovement VAR_LAST_TALKED, Common_Movement_Delay48 waitmovement 0 msgbox MauvilleCity_House2_Text_210D76, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq MauvilleCity_House2_EventScript_210CB8 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MauvilleCity_House2_EventScript_210CE4 end diff --git a/data/maps/MauvilleCity_Mart/scripts.inc b/data/maps/MauvilleCity_Mart/scripts.inc index 44e36489a..25d52e015 100644 --- a/data/maps/MauvilleCity_Mart/scripts.inc +++ b/data/maps/MauvilleCity_Mart/scripts.inc @@ -4,10 +4,10 @@ MauvilleCity_Mart_MapScripts:: @ 82110E5 MauvilleCity_Mart_EventScript_2110E6:: @ 82110E6 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart MauvilleCity_Mart_Pokemart_211100 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json index c024c2cba..c5fd1b32f 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_PokemonCenter_1F_EventScript_28E066", + "script": "MauvilleCity_PokemonCenter_1F_EventScript_MauvilleOldMan", "flag": "0" }, { diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index 50250de8e..dd302167b 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -1,11 +1,11 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, MauvilleCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 MauvilleCity_PokemonCenter_1F_OnTransition: @ 8210E66 setrespawn HEAL_LOCATION_MAUVILLE_CITY - call MauvilleCity_PokemonCenter_1F_EventScript_2718DE + call Common_EventScript_UpdateBrineyLocation goto MauvilleCity_PokemonCenter_1F_EventScript_210E74 end @@ -15,7 +15,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_210E74:: @ 8210E74 MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78 setvar VAR_0x800B, 1 - call MauvilleCity_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/map.json b/data/maps/MauvilleCity_PokemonCenter_2F/map.json index 4afcc3882..000f0cf64 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MauvilleCity_PokemonCenter_2F_EventScript_21102F", + "script": "MauvilleCity_PokemonCenter_2F_EventScript_Youngster", "flag": "0" } ], diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc index c0200ea1f..9626e4882 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc @@ -1,27 +1,28 @@ MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8211008 - map_script MAP_SCRIPT_ON_FRAME_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -MauvilleCity_PokemonCenter_2F_EventScript_21101D:: @ 821101D - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +MauvilleCity_PokemonCenter_2F_EventScript_Colosseum:: @ 821101D + call CableClub_EventScript_Colosseum end -MauvilleCity_PokemonCenter_2F_EventScript_211023:: @ 8211023 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +MauvilleCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8211023 + call CableClub_EventScript_TradeCenter end -MauvilleCity_PokemonCenter_2F_EventScript_211029:: @ 8211029 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +MauvilleCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8211029 + call CableClub_EventScript_RecordCorner end -MauvilleCity_PokemonCenter_2F_EventScript_21102F:: @ 821102F - msgbox MauvilleCity_PokemonCenter_2F_Text_211038, MSGBOX_NPC +MauvilleCity_PokemonCenter_2F_EventScript_Youngster:: @ 821102F + msgbox MauvilleCity_PokemonCenter_2F_Text_Youngster, MSGBOX_NPC end -MauvilleCity_PokemonCenter_2F_Text_211038: @ 8211038 +MauvilleCity_PokemonCenter_2F_Text_Youngster: @ 8211038 .string "Did you know that you can link battle\n" .string "at the COLOSSEUM here?\p" .string "They put up your record on the wall\n" diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index 8211034a6..dc81427bc 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -19,12 +19,12 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceDown waitmovement 0 delay 30 - applymovement 5, MeteorFalls_1F_1R_Movement_2725B4 + applymovement 5, Common_Movement_WalkInPlaceDown waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22BF47, MSGBOX_DEFAULT closemessage - applymovement 5, Common_Movement_WalkInPlaceUp - applymovement 6, Common_Movement_WalkInPlaceUp + applymovement 5, Common_Movement_WalkInPlaceFastestUp + applymovement 6, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN applymovement 5, Common_Movement_ExclamationMark @@ -37,9 +37,9 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22BFE4, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft - applymovement 5, Common_Movement_WalkInPlaceLeft - applymovement 6, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement 5, Common_Movement_WalkInPlaceFastestLeft + applymovement 6, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 addobject 7 addobject 8 @@ -49,8 +49,8 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F applymovement 8, MeteorFalls_1F_1R_Movement_22BEE0 applymovement 9, MeteorFalls_1F_1R_Movement_22BEE8 waitmovement 0 - applymovement 5, Common_Movement_WalkInPlaceLeft - applymovement 6, Common_Movement_WalkInPlaceLeft + applymovement 5, Common_Movement_WalkInPlaceFastestLeft + applymovement 6, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C04E, MSGBOX_DEFAULT closemessage @@ -68,10 +68,10 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F applymovement 9, MeteorFalls_1F_1R_Movement_22BF18 waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C268, MSGBOX_DEFAULT - applymovement 7, Common_Movement_WalkInPlaceDown + applymovement 7, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C292, MSGBOX_DEFAULT - applymovement 7, Common_Movement_WalkInPlaceLeft + applymovement 7, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C2FC, MSGBOX_DEFAULT closemessage diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc index fee636e0b..9ed8053c6 100644 --- a/data/maps/MeteorFalls_1F_2R/scripts.inc +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -11,7 +11,7 @@ MeteorFalls_1F_2R_EventScript_22C4DE:: @ 822C4DE end MeteorFalls_1F_2R_EventScript_22C50A:: @ 822C50A - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox MeteorFalls_1F_2R_Text_22C6F6, MSGBOX_DEFAULT register_matchcall TRAINER_NICOLAS_1 diff --git a/data/maps/MirageTower_2F/scripts.inc b/data/maps/MirageTower_2F/scripts.inc index d22a7c6ff..888288633 100644 --- a/data/maps/MirageTower_2F/scripts.inc +++ b/data/maps/MirageTower_2F/scripts.inc @@ -1,11 +1,11 @@ MirageTower_2F_MapScripts:: @ 823AD11 - map_script MAP_SCRIPT_ON_FRAME_TABLE, MirageTower_2F_MapScript2_2A8327 - map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_2F_MapScript1_2A8331 - map_script MAP_SCRIPT_ON_RESUME, MirageTower_2F_MapScript1_23AD21 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole + map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround + map_script MAP_SCRIPT_ON_RESUME, MirageTower_2F_SetHoleWarp .byte 0 -MirageTower_2F_MapScript1_23AD21: @ 823AD21 - setstepcallback 7 +MirageTower_2F_SetHoleWarp: @ 823AD21 + setstepcallback STEP_CB_CRACKED_FLOOR setholewarp MAP_MIRAGE_TOWER_1F, 255, 0, 0 end diff --git a/data/maps/MirageTower_3F/scripts.inc b/data/maps/MirageTower_3F/scripts.inc index f29f542fc..a54b2ccca 100644 --- a/data/maps/MirageTower_3F/scripts.inc +++ b/data/maps/MirageTower_3F/scripts.inc @@ -1,11 +1,11 @@ MirageTower_3F_MapScripts:: @ 823AD2C - map_script MAP_SCRIPT_ON_FRAME_TABLE, MirageTower_3F_MapScript2_2A8327 - map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_3F_MapScript1_2A8331 - map_script MAP_SCRIPT_ON_RESUME, MirageTower_3F_MapScript1_23AD3C + map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole + map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround + map_script MAP_SCRIPT_ON_RESUME, MirageTower_3F_SetHoleWarp .byte 0 -MirageTower_3F_MapScript1_23AD3C: @ 823AD3C - setstepcallback 7 +MirageTower_3F_SetHoleWarp: @ 823AD3C + setstepcallback STEP_CB_CRACKED_FLOOR setholewarp MAP_MIRAGE_TOWER_2F, 255, 0, 0 end diff --git a/data/maps/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc index 5208820df..3c2c59355 100644 --- a/data/maps/MirageTower_4F/scripts.inc +++ b/data/maps/MirageTower_4F/scripts.inc @@ -5,7 +5,7 @@ MirageTower_4F_EventScript_23AD48:: @ 823AD48 lock faceplayer msgbox MirageTower_4F_Text_23ADF9, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MirageTower_4F_EventScript_23AD7F giveitem_std ITEM_ROOT_FOSSIL closemessage @@ -26,7 +26,7 @@ MirageTower_4F_EventScript_23AD89:: @ 823AD89 lock faceplayer msgbox MirageTower_4F_Text_23AE98, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MirageTower_4F_EventScript_23ADC0 giveitem_std ITEM_CLAW_FOSSIL closemessage @@ -44,11 +44,11 @@ MirageTower_4F_EventScript_23ADC0:: @ 823ADC0 end MirageTower_4F_EventScript_23ADCA:: @ 823ADCA - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 32 - setvar VAR_0x8007, 2 - special sub_8139560 + setvar VAR_0x8004, 1 @ vertical pan + setvar VAR_0x8005, 1 @ horizontal pan + setvar VAR_0x8006, 32 @ num shakes + setvar VAR_0x8007, 2 @ shake delay + special ShakeCamera waitstate special DoMirageTowerCeilingCrumble waitstate diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index db24a9b3b..580b4ca62 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -222,7 +222,7 @@ "movement_range_y": 3, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_EventScript_2C81EE", + "script": "MossdeepCity_EventScript_DynamicPunchTutor", "flag": "0" }, { diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index 646b1d908..3247df143 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -226,7 +226,7 @@ MossdeepCity_EventScript_1E4C26:: @ 81E4C26 faceplayer goto_if_set FLAG_RECEIVED_KINGS_ROCK, MossdeepCity_EventScript_1E4C68 msgbox MossdeepCity_Text_1E4CED, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MossdeepCity_EventScript_1E4C72 msgbox MossdeepCity_Text_1E4D5B, MSGBOX_DEFAULT giveitem_std ITEM_KINGS_ROCK @@ -255,9 +255,9 @@ MossdeepCity_EventScript_1E4C85:: @ 81E4C85 faceplayer msgbox MossdeepCity_Text_1E5453, MSGBOX_DEFAULT closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq MossdeepCity_EventScript_1E4CB0 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq MossdeepCity_EventScript_1E4CC2 addvar VAR_SCOTT_STATE, 1 removeobject 16 diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.json b/data/maps/MossdeepCity_GameCorner_1F/map.json index 8ea28a474..3e64c45fd 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_GameCorner_1F_EventScript_224B54", + "script": "MossdeepCity_GameCorner_1F_EventScript_OldMan", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_GameCorner_1F_EventScript_224B4B", + "script": "MossdeepCity_GameCorner_1F_EventScript_InfoMan", "flag": "0" } ], @@ -72,7 +72,7 @@ "y": 0, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_GameCorner_1F_EventScript_224B5D" + "script": "RS_MysteryEventsHouse_EventScript_Door" }, { "type": "sign", @@ -80,7 +80,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_GameCorner_1F_EventScript_277E9D" + "script": "MossdeepCity_GameCorner_1F_EventScript_DodrioBerryPickingRecords" }, { "type": "sign", @@ -88,7 +88,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MossdeepCity_GameCorner_1F_EventScript_277E96" + "script": "MossdeepCity_GameCorner_1F_EventScript_PokemonJumpRecords" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc index db9a1f854..79f1a54e2 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc @@ -1,80 +1,87 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27 map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B41 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_GameCorner_1F_MapScript2_224B37 - map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_GameCorner_1F_MapScript1_276BBE + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad .byte 0 MossdeepCity_GameCorner_1F_MapScript2_224B37: @ 8224B37 - map_script_2 VAR_CABLE_CLUB_STATE, 8, MossdeepCity_GameCorner_1F_EventScript_276BAE + map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_CheckTurnAttendant .2byte 0 MossdeepCity_GameCorner_1F_MapScript2_224B41: @ 8224B41 - map_script_2 VAR_CABLE_CLUB_STATE, 8, MossdeepCity_GameCorner_1F_EventScript_276C9D + map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom .2byte 0 -MossdeepCity_GameCorner_1F_EventScript_224B4B:: @ 8224B4B +@ Script is redundant, the label in the goto also does lock and faceplayer +MossdeepCity_GameCorner_1F_EventScript_InfoMan:: @ 8224B4B lock faceplayer - goto MossdeepCity_GameCorner_1F_EventScript_277C34 + goto MossdeepCity_GameCorner_1F_EventScript_InfoMan2 release end -MossdeepCity_GameCorner_1F_EventScript_224B54:: @ 8224B54 +@ Script is redundant, the label in the goto also does lock and faceplayer +MossdeepCity_GameCorner_1F_EventScript_OldMan:: @ 8224B54 lock faceplayer - goto MossdeepCity_GameCorner_1F_EventScript_277C91 + goto MossdeepCity_GameCorner_1F_EventScript_OldMan2 release end -MossdeepCity_GameCorner_1F_EventScript_224B5D:: @ 8224B5D - msgbox MossdeepCity_GameCorner_1F_Text_224BFD, MSGBOX_SIGN + +@ Everything below is leftover from RS +@ The house that was here in RS was moved to Sootopolis and replaced by the Game Corner +@ The text below is unused and duplicated in its replacement in Sootopolis City +@ And the BG Door event was moved inaccessibly into a wall + +RS_MysteryEventsHouse_EventScript_Door:: @ 8224B5D + msgbox RS_MysteryEventsHouse_Text_DoorIsLocked, MSGBOX_SIGN end -MossdeepCity_GameCorner_1F_Text_224B66: @ 8224B66 +RS_MysteryEventsHouse_Text_OldManGreeting: @ 8224B66 .string "When I was young, I traveled the world\n" .string "as a POKéMON TRAINER.\p" .string "Now that I've become an old buzzard,\n" .string "my only amusement is watching young\l" .string "TRAINERS battle.$" -MossdeepCity_GameCorner_1F_Text_224BFD: @ 8224BFD +RS_MysteryEventsHouse_Text_DoorIsLocked: @ 8224BFD .string "The door appears to be locked.$" -MossdeepCity_GameCorner_1F_Text_224C1C: @ 8224C1C +RS_MysteryEventsHouse_Text_ChallengeVisitingTrainer: @ 8224C1C .string "A TRAINER named {STR_VAR_1} is\n" .string "visiting my home.\p" .string "Would you like to challenge\n" .string "{STR_VAR_1}?$" -MossdeepCity_GameCorner_1F_Text_224C64: @ 8224C64 +RS_MysteryEventsHouse_Text_YouWontBattle: @ 8224C64 .string "You won't battle? I'm disappointed\n" .string "that I can't see you battle…$" -MossdeepCity_GameCorner_1F_Text_224CA4: @ 8224CA4 +RS_MysteryEventsHouse_Text_KeepItToA3On3: @ 8224CA4 .string "Oh, good, good!\p" .string "But my house isn't all that sturdy.\p" .string "Could I ask you to keep it down to\n" .string "a 3-on-3 match?$" -MossdeepCity_GameCorner_1F_Text_224D0B: @ 8224D0B +RS_MysteryEventsHouse_Text_SaveYourProgress: @ 8224D0B .string "Before you two battle, you should\n" .string "save your progress.$" -MossdeepCity_GameCorner_1F_Text_224D41: @ 8224D41 +RS_MysteryEventsHouse_Text_HopeToSeeAGoodMatch: @ 8224D41 .string "I hope to see a good match!$" -MossdeepCity_GameCorner_1F_Text_224D5D: @ 8224D5D +RS_MysteryEventsHouse_Text_BattleTie: @ 8224D5D .string "So, it became a standoff.\p" .string "It was a brilliant match in which\n" .string "neither side conceded a step!$" -MossdeepCity_GameCorner_1F_Text_224DB7: @ 8224DB7 +RS_MysteryEventsHouse_Text_BattleWon: @ 8224DB7 .string "That was superlative!\p" .string "Why, it was like seeing myself in\n" .string "my youth again!$" -MossdeepCity_GameCorner_1F_Text_224DFF: @ 8224DFF +RS_MysteryEventsHouse_Text_BattleLost: @ 8224DFF .string "Ah, too bad for you!\p" .string "But it was a good match.\n" .string "I hope you can win next time.$" - diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json index 2d86ad9a8..33bd1d434 100644 --- a/data/maps/MossdeepCity_Gym/map.json +++ b/data/maps/MossdeepCity_Gym/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_Gym_EventScript_220898", + "script": "MossdeepCity_Gym_EventScript_TateAndLiza", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220AFD", + "script": "MossdeepCity_Gym_EventScript_Preston", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220B2B", + "script": "MossdeepCity_Gym_EventScript_Blake", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220B70", + "script": "MossdeepCity_Gym_EventScript_Maura", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220B59", + "script": "MossdeepCity_Gym_EventScript_Samantha", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220B14", + "script": "MossdeepCity_Gym_EventScript_Virgil", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220B42", + "script": "MossdeepCity_Gym_EventScript_Hannah", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_Gym_EventScript_220C11", + "script": "MossdeepCity_Gym_EventScript_GymGuide", "flag": "0" }, { @@ -128,7 +128,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_Gym_EventScript_220898", + "script": "MossdeepCity_Gym_EventScript_TateAndLiza", "flag": "0" }, { @@ -232,7 +232,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220B9E", + "script": "MossdeepCity_Gym_EventScript_Nate", "flag": "0" }, { @@ -245,7 +245,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220B87", + "script": "MossdeepCity_Gym_EventScript_Sylvia", "flag": "0" }, { @@ -336,7 +336,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220BCC", + "script": "MossdeepCity_Gym_EventScript_Clifford", "flag": "0" }, { @@ -362,7 +362,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220BB5", + "script": "MossdeepCity_Gym_EventScript_Macey", "flag": "0" }, { @@ -375,7 +375,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220BFA", + "script": "MossdeepCity_Gym_EventScript_Kathleen", "flag": "0" }, { @@ -427,7 +427,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MossdeepCity_Gym_EventScript_220BE3", + "script": "MossdeepCity_Gym_EventScript_Nicholas", "flag": "0" }, { @@ -591,7 +591,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_Gym_EventScript_220C67" + "script": "MossdeepCity_Gym_EventScript_YellowFloorSwitch" }, { "type": "trigger", @@ -600,7 +600,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_Gym_EventScript_220C7D" + "script": "MossdeepCity_Gym_EventScript_BlueFloorSwitch" }, { "type": "trigger", @@ -609,7 +609,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_Gym_EventScript_220C7D" + "script": "MossdeepCity_Gym_EventScript_BlueFloorSwitch" }, { "type": "trigger", @@ -618,7 +618,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_Gym_EventScript_220C93" + "script": "MossdeepCity_Gym_EventScript_GreenFloorSwitch" }, { "type": "trigger", @@ -627,7 +627,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_Gym_EventScript_220CA9" + "script": "MossdeepCity_Gym_EventScript_PurpleFloorSwitch" }, { "type": "trigger", @@ -636,7 +636,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_Gym_EventScript_220CA9" + "script": "MossdeepCity_Gym_EventScript_PurpleFloorSwitch" }, { "type": "trigger", @@ -645,7 +645,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_Gym_EventScript_220CBF" + "script": "MossdeepCity_Gym_EventScript_RedFloorSwitch" }, { "type": "trigger", @@ -654,7 +654,7 @@ "elevation": 0, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_Gym_EventScript_220AF1" + "script": "MossdeepCity_Gym_EventScript_WarpToEntrance" }, { "type": "trigger", @@ -663,7 +663,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "MossdeepCity_Gym_EventScript_220C67" + "script": "MossdeepCity_Gym_EventScript_YellowFloorSwitch" } ], "bg_events": [ @@ -673,7 +673,7 @@ "y": 34, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_Gym_EventScript_220C33" + "script": "MossdeepCity_Gym_EventScript_LeftGymStatue" }, { "type": "sign", @@ -681,7 +681,7 @@ "y": 34, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MossdeepCity_Gym_EventScript_220C43" + "script": "MossdeepCity_Gym_EventScript_RightGymStatue" } ] }
\ No newline at end of file diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 3779fa8d2..ec5e2bb70 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -1,71 +1,75 @@ MossdeepCity_Gym_MapScripts:: @ 8220800 - map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_Gym_MapScript1_220806 + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_Gym_OnLoad .byte 0 -MossdeepCity_Gym_MapScript1_220806: @ 8220806 - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_22083D - goto MossdeepCity_Gym_EventScript_220815 +@ NOTE: Mossdeep Gym was redesigned between R/S and E. Leftover (and now functionally unused) scripts are commented below + +@ All the below checks are leftover from RS. FLAG_MOSSDEEP_GYM_SWITCH_X is never set +MossdeepCity_Gym_OnLoad: @ 8220806 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_SetSwitch1Metatiles + goto MossdeepCity_Gym_EventScript_CheckSwitch2 end -MossdeepCity_Gym_EventScript_220815:: @ 8220815 - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_220855 - goto MossdeepCity_Gym_EventScript_220824 +MossdeepCity_Gym_EventScript_CheckSwitch2:: @ 8220815 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_SetSwitch2Metatiles + goto MossdeepCity_Gym_EventScript_CheckSwitch3 end -MossdeepCity_Gym_EventScript_220824:: @ 8220824 - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_22086D - goto MossdeepCity_Gym_EventScript_220833 +MossdeepCity_Gym_EventScript_CheckSwitch3:: @ 8220824 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_SetSwitch3Metatiles + goto MossdeepCity_Gym_EventScript_CheckSwitch4 end -MossdeepCity_Gym_EventScript_220833:: @ 8220833 - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_220885 +MossdeepCity_Gym_EventScript_CheckSwitch4:: @ 8220833 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_SetSwitch4Metatiles end -MossdeepCity_Gym_EventScript_22083D:: @ 822083D - setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Top, 0 - setmetatile 2, 7, METATILE_MossdeepGym_Empty1, 1 - goto MossdeepCity_Gym_EventScript_220815 +@ All the below set metatile scripts are leftover from RS and are functionally unused +MossdeepCity_Gym_EventScript_SetSwitch1Metatiles:: @ 822083D + setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Right, 0 + setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Down, 1 + goto MossdeepCity_Gym_EventScript_CheckSwitch2 end -MossdeepCity_Gym_EventScript_220855:: @ 8220855 - setmetatile 8, 14, METATILE_MossdeepGym_Obelisk_Top, 0 - setmetatile 8, 10, METATILE_MossdeepGym_Empty1, 1 - goto MossdeepCity_Gym_EventScript_220824 +MossdeepCity_Gym_EventScript_SetSwitch2Metatiles:: @ 8220855 + setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Right, 0 + setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Down, 1 + goto MossdeepCity_Gym_EventScript_CheckSwitch3 end -MossdeepCity_Gym_EventScript_22086D:: @ 822086D - setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Base, 0 - setmetatile 17, 15, METATILE_MossdeepGym_Empty1, 1 - goto MossdeepCity_Gym_EventScript_220833 +MossdeepCity_Gym_EventScript_SetSwitch3Metatiles:: @ 822086D + setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Left, 0 + setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Down, 1 + goto MossdeepCity_Gym_EventScript_CheckSwitch4 end -MossdeepCity_Gym_EventScript_220885:: @ 8220885 - setmetatile 1, 23, METATILE_MossdeepGym_Wall_LeftCorner, 0 - setmetatile 5, 24, METATILE_MossdeepGym_Empty1, 1 +MossdeepCity_Gym_EventScript_SetSwitch4Metatiles:: @ 8220885 + setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Up, 0 + setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Down, 1 end -MossdeepCity_Gym_EventScript_220898:: @ 8220898 - trainerbattle_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_221783, MossdeepCity_Gym_Text_2218EC, MossdeepCity_Gym_Text_221BCE, MossdeepCity_Gym_EventScript_2208D1, NO_MUSIC +MossdeepCity_Gym_EventScript_TateAndLiza:: @ 8220898 + trainerbattle_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_TateAndLizaPreBattle, MossdeepCity_Gym_Text_TateAndLizaDefeat, MossdeepCity_Gym_Text_TateAndLizaNeedTwoMons, MossdeepCity_Gym_EventScript_TateAndLizaDefeated, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq MossdeepCity_Gym_EventScript_22097E - goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_220937 - msgbox MossdeepCity_Gym_Text_221B1D, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq MossdeepCity_Gym_EventScript_TateAndLizaRematch + goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_GiveCalmMind2 + msgbox MossdeepCity_Gym_Text_TateAndLizaPostBattle, MSGBOX_DEFAULT release end -MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 - message MossdeepCity_Gym_Text_22196A +MossdeepCity_Gym_EventScript_TateAndLizaDefeated:: @ 82208D1 + message MossdeepCity_Gym_Text_ReceivedMindBadge waitmessage call Common_EventScript_PlayGymBadgeFanfare - msgbox MossdeepCity_Gym_Text_221999, MSGBOX_DEFAULT + msgbox MossdeepCity_Gym_Text_ExplainMindBadgeTakeThis, MSGBOX_DEFAULT setflag FLAG_DEFEATED_MOSSDEEP_GYM setflag FLAG_BADGE07_GET setflag FLAG_HIDE_AQUA_HIDEOUT_GRUNTS clearflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY clearflag FLAG_UNKNOWN_0x393 setvar VAR_0x8008, 7 - call MossdeepCity_Gym_EventScript_271F43 + call Common_EventScript_SetGymTrainers clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS clearflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA @@ -73,12 +77,12 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN setvar VAR_MOSSDEEP_CITY_STATE, 1 setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN - setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 1 - call MossdeepCity_Gym_EventScript_22095B + setvar VAR_MOSSDEEP_SPACE_CENTER_STATE, 1 + call MossdeepCity_Gym_EventScript_GiveCalmMind closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox MossdeepCity_Gym_Text_221AEA, MSGBOX_DEFAULT + msgbox MossdeepCity_Gym_Text_RegisteredTateAndLiza, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -86,282 +90,284 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 release end -MossdeepCity_Gym_EventScript_220937:: @ 8220937 +MossdeepCity_Gym_EventScript_GiveCalmMind2:: @ 8220937 giveitem_std ITEM_TM04 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT + msgbox MossdeepCity_Gym_Text_ExplainCalmMind, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM04 release end -MossdeepCity_Gym_EventScript_22095B:: @ 822095B +MossdeepCity_Gym_EventScript_GiveCalmMind:: @ 822095B giveitem_std ITEM_TM04 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_BagIsFull - msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT + msgbox MossdeepCity_Gym_Text_ExplainCalmMind, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM04 return -MossdeepCity_Gym_EventScript_22097E:: @ 822097E - trainerbattle_rematch_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_221D0B, MossdeepCity_Gym_Text_221E05, MossdeepCity_Gym_Text_221EB8 - msgbox MossdeepCity_Gym_Text_221E45, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_TateAndLizaRematch:: @ 822097E + trainerbattle_rematch_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_TateAndLizaPreRematch, MossdeepCity_Gym_Text_TateAndLizaRematchDefeat, MossdeepCity_Gym_Text_TateAndLizaRematchNeedTwoMons + msgbox MossdeepCity_Gym_Text_TateAndLizaPostRematch, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220999:: @ 8220999 +@ All the below switch scripts are leftover from RS and are functionally unused +MossdeepCity_Gym_EventScript_Switch1:: @ 8220999 lockall - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_2209D0 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_ClearSwitch1 setflag FLAG_MOSSDEEP_GYM_SWITCH_1 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 - setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Top, 0 - setmetatile 2, 7, METATILE_MossdeepGym_Empty1, 1 - goto MossdeepCity_Gym_EventScript_2209C8 + setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Right, 0 + setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Down, 1 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_2209C8:: @ 82209C8 +MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed:: @ 82209C8 special DrawWholeMapView playse SE_TK_KASYA releaseall end -MossdeepCity_Gym_EventScript_2209D0:: @ 82209D0 +MossdeepCity_Gym_EventScript_ClearSwitch1:: @ 82209D0 clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 - setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Base, 0 - setmetatile 2, 7, METATILE_MossdeepGym_Empty0, 1 - goto MossdeepCity_Gym_EventScript_2209C8 + setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Left, 0 + setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Up, 1 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_2209F5:: @ 82209F5 +MossdeepCity_Gym_EventScript_Switch2:: @ 82209F5 lockall - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_220A24 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_ClearSwitch2 setflag FLAG_MOSSDEEP_GYM_SWITCH_2 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 - setmetatile 8, 14, METATILE_MossdeepGym_Obelisk_Top, 0 - setmetatile 8, 10, METATILE_MossdeepGym_Empty1, 1 - goto MossdeepCity_Gym_EventScript_2209C8 + setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Right, 0 + setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Down, 1 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_220A24:: @ 8220A24 +MossdeepCity_Gym_EventScript_ClearSwitch2:: @ 8220A24 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 - setmetatile 8, 14, METATILE_MossdeepGym_OuterWall_RightCorner, 0 - setmetatile 8, 10, METATILE_MossdeepGym_Empty0, 1 - goto MossdeepCity_Gym_EventScript_2209C8 + setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Down, 0 + setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Up, 1 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_220A49:: @ 8220A49 +MossdeepCity_Gym_EventScript_Switch3:: @ 8220A49 lockall - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_220A78 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_ClearSwitch3 setflag FLAG_MOSSDEEP_GYM_SWITCH_3 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 - setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Base, 0 - setmetatile 17, 15, METATILE_MossdeepGym_Empty1, 1 - goto MossdeepCity_Gym_EventScript_2209C8 + setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Left, 0 + setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Down, 1 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_220A78:: @ 8220A78 +MossdeepCity_Gym_EventScript_ClearSwitch3:: @ 8220A78 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 - setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Top, 0 - setmetatile 17, 15, METATILE_MossdeepGym_Empty0, 1 - goto MossdeepCity_Gym_EventScript_2209C8 + setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Right, 0 + setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Up, 1 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_220A9D:: @ 8220A9D +MossdeepCity_Gym_EventScript_Switch4:: @ 8220A9D lockall - goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_220ACC + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_ClearSwitch4 setflag FLAG_MOSSDEEP_GYM_SWITCH_4 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 - setmetatile 1, 23, METATILE_MossdeepGym_Wall_LeftCorner, 0 - setmetatile 5, 24, METATILE_MossdeepGym_Empty1, 1 - goto MossdeepCity_Gym_EventScript_2209C8 + setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Up, 0 + setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Down, 1 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_220ACC:: @ 8220ACC +MossdeepCity_Gym_EventScript_ClearSwitch4:: @ 8220ACC clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse waitmovement 0 - setmetatile 1, 23, METATILE_MossdeepGym_Obelisk_Top, 0 - setmetatile 5, 24, METATILE_MossdeepGym_Empty0, 1 - goto MossdeepCity_Gym_EventScript_2209C8 + setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Right, 0 + setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Up, 1 + goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed end -MossdeepCity_Gym_EventScript_220AF1:: @ 8220AF1 +MossdeepCity_Gym_EventScript_WarpToEntrance:: @ 8220AF1 lockall - warp7 MAP_MOSSDEEP_CITY_GYM, 255, 7, 30 + warpmossdeepgym MAP_MOSSDEEP_CITY_GYM, 255, 7, 30 waitstate releaseall end -MossdeepCity_Gym_EventScript_220AFD:: @ 8220AFD - trainerbattle_single TRAINER_PRESTON, MossdeepCity_Gym_Text_220E5C, MossdeepCity_Gym_Text_220EAC - msgbox MossdeepCity_Gym_Text_220ED3, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Preston:: @ 8220AFD + trainerbattle_single TRAINER_PRESTON, MossdeepCity_Gym_Text_PrestonPreBattle, MossdeepCity_Gym_Text_PrestonDefeat + msgbox MossdeepCity_Gym_Text_PrestonPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220B14:: @ 8220B14 - trainerbattle_single TRAINER_VIRGIL, MossdeepCity_Gym_Text_220F02, MossdeepCity_Gym_Text_220F1A - msgbox MossdeepCity_Gym_Text_220F3A, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Virgil:: @ 8220B14 + trainerbattle_single TRAINER_VIRGIL, MossdeepCity_Gym_Text_VirgilPreBattle, MossdeepCity_Gym_Text_VirgilDefeat + msgbox MossdeepCity_Gym_Text_VirgilPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220B2B:: @ 8220B2B - trainerbattle_single TRAINER_BLAKE, MossdeepCity_Gym_Text_220FB0, MossdeepCity_Gym_Text_221024 - msgbox MossdeepCity_Gym_Text_221055, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Blake:: @ 8220B2B + trainerbattle_single TRAINER_BLAKE, MossdeepCity_Gym_Text_BlakePreBattle, MossdeepCity_Gym_Text_BlakeDefeat + msgbox MossdeepCity_Gym_Text_BlakePostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220B42:: @ 8220B42 - trainerbattle_single TRAINER_HANNAH, MossdeepCity_Gym_Text_2210EE, MossdeepCity_Gym_Text_221152 - msgbox MossdeepCity_Gym_Text_22116A, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Hannah:: @ 8220B42 + trainerbattle_single TRAINER_HANNAH, MossdeepCity_Gym_Text_HannahPreBattle, MossdeepCity_Gym_Text_HannahDefeat + msgbox MossdeepCity_Gym_Text_HannahPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220B59:: @ 8220B59 - trainerbattle_single TRAINER_SAMANTHA, MossdeepCity_Gym_Text_2211E2, MossdeepCity_Gym_Text_221230 - msgbox MossdeepCity_Gym_Text_22123D, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Samantha:: @ 8220B59 + trainerbattle_single TRAINER_SAMANTHA, MossdeepCity_Gym_Text_SamanthaPreBattle, MossdeepCity_Gym_Text_SamanthaDefeat + msgbox MossdeepCity_Gym_Text_SamanthaPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220B70:: @ 8220B70 - trainerbattle_single TRAINER_MAURA, MossdeepCity_Gym_Text_2212A6, MossdeepCity_Gym_Text_221309 - msgbox MossdeepCity_Gym_Text_22132E, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Maura:: @ 8220B70 + trainerbattle_single TRAINER_MAURA, MossdeepCity_Gym_Text_MauraPreBattle, MossdeepCity_Gym_Text_MauraDefeat + msgbox MossdeepCity_Gym_Text_MauraPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220B87:: @ 8220B87 - trainerbattle_single TRAINER_SYLVIA, MossdeepCity_Gym_Text_2213C2, MossdeepCity_Gym_Text_2213F4 - msgbox MossdeepCity_Gym_Text_221412, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Sylvia:: @ 8220B87 + trainerbattle_single TRAINER_SYLVIA, MossdeepCity_Gym_Text_SylviaPreBattle, MossdeepCity_Gym_Text_SylviaDefeat + msgbox MossdeepCity_Gym_Text_SylviaPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220B9E:: @ 8220B9E - trainerbattle_single TRAINER_NATE, MossdeepCity_Gym_Text_221460, MossdeepCity_Gym_Text_2214A7 - msgbox MossdeepCity_Gym_Text_2214D3, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Nate:: @ 8220B9E + trainerbattle_single TRAINER_NATE, MossdeepCity_Gym_Text_NatePreBattle, MossdeepCity_Gym_Text_NateDefeat + msgbox MossdeepCity_Gym_Text_NatePostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220BB5:: @ 8220BB5 - trainerbattle_single TRAINER_MACEY, MossdeepCity_Gym_Text_22161B, MossdeepCity_Gym_Text_221658 - msgbox MossdeepCity_Gym_Text_221680, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Macey:: @ 8220BB5 + trainerbattle_single TRAINER_MACEY, MossdeepCity_Gym_Text_MaceyPreBattle, MossdeepCity_Gym_Text_MaceyDefeat + msgbox MossdeepCity_Gym_Text_MaceyPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220BCC:: @ 8220BCC - trainerbattle_single TRAINER_CLIFFORD, MossdeepCity_Gym_Text_22157C, MossdeepCity_Gym_Text_2215B8 - msgbox MossdeepCity_Gym_Text_2215E2, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Clifford:: @ 8220BCC + trainerbattle_single TRAINER_CLIFFORD, MossdeepCity_Gym_Text_CliffordPreBattle, MossdeepCity_Gym_Text_CliffordDefeat + msgbox MossdeepCity_Gym_Text_CliffordPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220BE3:: @ 8220BE3 - trainerbattle_single TRAINER_NICHOLAS, MossdeepCity_Gym_Text_2216EE, MossdeepCity_Gym_Text_22172D - msgbox MossdeepCity_Gym_Text_22173A, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Nicholas:: @ 8220BE3 + trainerbattle_single TRAINER_NICHOLAS, MossdeepCity_Gym_Text_NicholasPreBattle, MossdeepCity_Gym_Text_NicholasDefeat + msgbox MossdeepCity_Gym_Text_NicholasPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220BFA:: @ 8220BFA - trainerbattle_single TRAINER_KATHLEEN, MossdeepCity_Gym_Text_221507, MossdeepCity_Gym_Text_22153B - msgbox MossdeepCity_Gym_Text_221545, MSGBOX_AUTOCLOSE +MossdeepCity_Gym_EventScript_Kathleen:: @ 8220BFA + trainerbattle_single TRAINER_KATHLEEN, MossdeepCity_Gym_Text_KathleenPreBattle, MossdeepCity_Gym_Text_KathleenDefeat + msgbox MossdeepCity_Gym_Text_KathleenPostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_Gym_EventScript_220C11:: @ 8220C11 +MossdeepCity_Gym_EventScript_GymGuide:: @ 8220C11 lock faceplayer - goto_if_set FLAG_DEFEATED_MOSSDEEP_GYM, MossdeepCity_Gym_EventScript_220C26 - msgbox MossdeepCity_Gym_Text_220CD5, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_MOSSDEEP_GYM, MossdeepCity_Gym_EventScript_GymGuidePostVictory + msgbox MossdeepCity_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT release end -MossdeepCity_Gym_EventScript_220C26:: @ 8220C26 - msgbox MossdeepCity_Gym_Text_220E2A, MSGBOX_DEFAULT +MossdeepCity_Gym_EventScript_GymGuidePostVictory:: @ 8220C26 + msgbox MossdeepCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT release end -MossdeepCity_Gym_Movement_220C30: @ 8220C30 +@ Leftover from RS, functionally unused +MossdeepCity_Gym_Movement_WaitAfterSwitchUse: @ 8220C30 delay_16 delay_16 step_end -MossdeepCity_Gym_EventScript_220C33:: @ 8220C33 +MossdeepCity_Gym_EventScript_LeftGymStatue:: @ 8220C33 lockall - goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_220C53 - goto MossdeepCity_Gym_EventScript_220C5D + goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_GymStatueCertified + goto MossdeepCity_Gym_EventScript_GymStatue end -MossdeepCity_Gym_EventScript_220C43:: @ 8220C43 +MossdeepCity_Gym_EventScript_RightGymStatue:: @ 8220C43 lockall - goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_220C53 - goto MossdeepCity_Gym_EventScript_220C5D + goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_GymStatueCertified + goto MossdeepCity_Gym_EventScript_GymStatue end -MossdeepCity_Gym_EventScript_220C53:: @ 8220C53 - msgbox MossdeepCity_Gym_Text_221CCA, MSGBOX_DEFAULT +MossdeepCity_Gym_EventScript_GymStatueCertified:: @ 8220C53 + msgbox MossdeepCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT releaseall end -MossdeepCity_Gym_EventScript_220C5D:: @ 8220C5D - msgbox MossdeepCity_Gym_Text_221CB0, MSGBOX_DEFAULT +MossdeepCity_Gym_EventScript_GymStatue:: @ 8220C5D + msgbox MossdeepCity_Gym_Text_GymStatue, MSGBOX_DEFAULT releaseall end -MossdeepCity_Gym_EventScript_220C67:: @ 8220C67 +MossdeepCity_Gym_EventScript_YellowFloorSwitch:: @ 8220C67 playse SE_MU_PACHI waitse playse SE_TU_SAA - mossdeepgym3 0 - mossdeepgym1 0 + initrotatingtilepuzzle FALSE + moverotatingtileobjects 0 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end -MossdeepCity_Gym_EventScript_220C7D:: @ 8220C7D +MossdeepCity_Gym_EventScript_BlueFloorSwitch:: @ 8220C7D playse SE_MU_PACHI waitse playse SE_TU_SAA - mossdeepgym3 0 - mossdeepgym1 1 + initrotatingtilepuzzle FALSE + moverotatingtileobjects 1 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end -MossdeepCity_Gym_EventScript_220C93:: @ 8220C93 +MossdeepCity_Gym_EventScript_GreenFloorSwitch:: @ 8220C93 playse SE_MU_PACHI waitse playse SE_TU_SAA - mossdeepgym3 0 - mossdeepgym1 2 + initrotatingtilepuzzle FALSE + moverotatingtileobjects 2 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end -MossdeepCity_Gym_EventScript_220CA9:: @ 8220CA9 +MossdeepCity_Gym_EventScript_PurpleFloorSwitch:: @ 8220CA9 playse SE_MU_PACHI waitse playse SE_TU_SAA - mossdeepgym3 0 - mossdeepgym1 3 + initrotatingtilepuzzle FALSE + moverotatingtileobjects 3 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end -MossdeepCity_Gym_EventScript_220CBF:: @ 8220CBF +MossdeepCity_Gym_EventScript_RedFloorSwitch:: @ 8220CBF playse SE_MU_PACHI waitse playse SE_TU_SAA - mossdeepgym3 0 - mossdeepgym1 4 + initrotatingtilepuzzle FALSE + moverotatingtileobjects 4 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end -MossdeepCity_Gym_Text_220CD5: @ 8220CD5 +MossdeepCity_Gym_Text_GymGuideAdvice: @ 8220CD5 .string "Yo, how's it going, CHAMPION-bound\n" .string "{PLAYER}?\p" .string "The GYM LEADERS here use\n" @@ -375,46 +381,46 @@ MossdeepCity_Gym_Text_220CD5: @ 8220CD5 .string "them how tight you are with your\l" .string "POKéMON. Go for it!$" -MossdeepCity_Gym_Text_220E2A: @ 8220E2A +MossdeepCity_Gym_Text_GymGuidePostVictory: @ 8220E2A .string "Wow, you're astounding!\n" .string "You're one great TRAINER!$" -MossdeepCity_Gym_Text_220E5C: @ 8220E5C +MossdeepCity_Gym_Text_PrestonPreBattle: @ 8220E5C .string "Battles hinge on the strength of your\n" .string "spirit! The weak-spirited will never win!$" -MossdeepCity_Gym_Text_220EAC: @ 8220EAC +MossdeepCity_Gym_Text_PrestonDefeat: @ 8220EAC .string "I lost!\n" .string "I must temper my spirit again!$" -MossdeepCity_Gym_Text_220ED3: @ 8220ED3 +MossdeepCity_Gym_Text_PrestonPostBattle: @ 8220ED3 .string "The indecisive lose.\n" .string "That's my warning to you.$" -MossdeepCity_Gym_Text_220F02: @ 8220F02 +MossdeepCity_Gym_Text_VirgilPreBattle: @ 8220F02 .string "Let me see your talent!$" -MossdeepCity_Gym_Text_220F1A: @ 8220F1A +MossdeepCity_Gym_Text_VirgilDefeat: @ 8220F1A .string "You possess spectacular talent!$" -MossdeepCity_Gym_Text_220F3A: @ 8220F3A +MossdeepCity_Gym_Text_VirgilPostBattle: @ 8220F3A .string "If there are prodigies in the world,\n" .string "then our GYM LEADERS are them!\p" .string "However, you may be even more talented\n" .string "than them…$" -MossdeepCity_Gym_Text_220FB0: @ 8220FB0 +MossdeepCity_Gym_Text_BlakePreBattle: @ 8220FB0 .string "Fufufufu… Watch me levitate a POKé\n" .string "BALL telekinetically!\p" .string "Wrooooooooaaaar!\n" .string "… … … … … … …\p" .string "Sometimes, I'm out of sync…$" -MossdeepCity_Gym_Text_221024: @ 8221024 +MossdeepCity_Gym_Text_BlakeDefeat: @ 8221024 .string "My POKéMON battling skills are out\n" .string "of sync, too!$" -MossdeepCity_Gym_Text_221055: @ 8221055 +MossdeepCity_Gym_Text_BlakePostBattle: @ 8221055 .string "A POKé BALL was too heavy to lift\n" .string "psychically. But this dust bunny…\p" .string "Whoooooooooooooooh!\n" @@ -422,127 +428,127 @@ MossdeepCity_Gym_Text_221055: @ 8221055 .string "No, I'm not cheating!\n" .string "I didn't blow on it! Honestly!$" -MossdeepCity_Gym_Text_2210EE: @ 82210EE +MossdeepCity_Gym_Text_HannahPreBattle: @ 82210EE .string "When you lose to me, don't be too hard\n" .string "on yourself.\p" .string "It's not that you're weak--I'm just\n" .string "too strong!$" -MossdeepCity_Gym_Text_221152: @ 8221152 +MossdeepCity_Gym_Text_HannahDefeat: @ 8221152 .string "You're just too strong!$" -MossdeepCity_Gym_Text_22116A: @ 822116A +MossdeepCity_Gym_Text_HannahPostBattle: @ 822116A .string "I'm not going to get down on myself for\n" .string "losing. I just need to train harder.\p" .string "Positive thinking--that's my strong\n" .string "point!$" -MossdeepCity_Gym_Text_2211E2: @ 82211E2 +MossdeepCity_Gym_Text_SamanthaPreBattle: @ 82211E2 .string "I see it…\n" .string "I see your future…\p" .string "If you can beat me, I will tell you\n" .string "your future!$" -MossdeepCity_Gym_Text_221230: @ 8221230 +MossdeepCity_Gym_Text_SamanthaDefeat: @ 8221230 .string "I surrender!$" -MossdeepCity_Gym_Text_22123D: @ 822123D +MossdeepCity_Gym_Text_SamanthaPostBattle: @ 822123D .string "You will wage a terrifically intense\n" .string "battle with our GYM LEADERS…\p" .string "The result…\n" .string "You won't hear it from me!$" -MossdeepCity_Gym_Text_2212A6: @ 82212A6 +MossdeepCity_Gym_Text_MauraPreBattle: @ 82212A6 .string "The roads you have traveled…\n" .string "What you have experienced…\p" .string "Come at me with everything you've\n" .string "learned!$" -MossdeepCity_Gym_Text_221309: @ 8221309 +MossdeepCity_Gym_Text_MauraDefeat: @ 8221309 .string "You've traveled a path of greatness!$" -MossdeepCity_Gym_Text_22132E: @ 822132E +MossdeepCity_Gym_Text_MauraPostBattle: @ 822132E .string "A bright future awaits those who have\n" .string "worked diligently.\p" .string "For those who lazed idly, there is\n" .string "only despair at the end.\p" .string "What goes around comes around…$" -MossdeepCity_Gym_Text_2213C2: @ 82213C2 +MossdeepCity_Gym_Text_SylviaPreBattle: @ 82213C2 .string "Even at the risk of life, I will win\n" .string "this battle!$" -MossdeepCity_Gym_Text_2213F4: @ 82213F4 +MossdeepCity_Gym_Text_SylviaDefeat: @ 82213F4 .string "What you do…\n" .string "It horrifies me…$" -MossdeepCity_Gym_Text_221412: @ 8221412 +MossdeepCity_Gym_Text_SylviaPostBattle: @ 8221412 .string "How dare you beat me…\p" .string "It won't be my fault if something\n" .string "horrible befalls you…$" -MossdeepCity_Gym_Text_221460: @ 8221460 +MossdeepCity_Gym_Text_NatePreBattle: @ 8221460 .string "Hohoho.\p" .string "You need me to show you how tenacious\n" .string "the PSYCHIC type can be.$" -MossdeepCity_Gym_Text_2214A7: @ 82214A7 +MossdeepCity_Gym_Text_NateDefeat: @ 82214A7 .string "Oh! My, my!\n" .string "Your battle style is fantastic!$" -MossdeepCity_Gym_Text_2214D3: @ 82214D3 +MossdeepCity_Gym_Text_NatePostBattle: @ 82214D3 .string "I… I don't let defeat rattle m-me,\n" .string "however b-badly.$" -MossdeepCity_Gym_Text_221507: @ 8221507 +MossdeepCity_Gym_Text_KathleenPreBattle: @ 8221507 .string "Let me show you a perfectly awful,\n" .string "horrifying time!$" -MossdeepCity_Gym_Text_22153B: @ 822153B +MossdeepCity_Gym_Text_KathleenDefeat: @ 822153B .string "N-nooooo!$" -MossdeepCity_Gym_Text_221545: @ 8221545 +MossdeepCity_Gym_Text_KathleenPostBattle: @ 8221545 .string "Your vitality is contagious!\n" .string "Get away from me quickly!$" -MossdeepCity_Gym_Text_22157C: @ 822157C +MossdeepCity_Gym_Text_CliffordPreBattle: @ 822157C .string "I may be past my prime, but I suggest\n" .string "you not patronize me.$" -MossdeepCity_Gym_Text_2215B8: @ 82215B8 +MossdeepCity_Gym_Text_CliffordDefeat: @ 82215B8 .string "Ah, you overflow with the power\n" .string "of youth!$" -MossdeepCity_Gym_Text_2215E2: @ 82215E2 +MossdeepCity_Gym_Text_CliffordPostBattle: @ 82215E2 .string "It seems that I could not overcome\n" .string "your youthful energy.$" -MossdeepCity_Gym_Text_22161B: @ 822161B +MossdeepCity_Gym_Text_MaceyPreBattle: @ 822161B .string "You're not getting through to the end!\n" .string "Not if I can help it!$" -MossdeepCity_Gym_Text_221658: @ 8221658 +MossdeepCity_Gym_Text_MaceyDefeat: @ 8221658 .string "How could you be so ludicrously\n" .string "strong?$" -MossdeepCity_Gym_Text_221680: @ 8221680 +MossdeepCity_Gym_Text_MaceyPostBattle: @ 8221680 .string "Humph! You may be strong, but you're\n" .string "not suitable for the PSYCHIC type!\p" .string "The way you battle is somehow brutal!$" -MossdeepCity_Gym_Text_2216EE: @ 82216EE +MossdeepCity_Gym_Text_NicholasPreBattle: @ 82216EE .string "Wroooar! Have a taste of my super\n" .string "POKéMON hard-battling power!$" -MossdeepCity_Gym_Text_22172D: @ 822172D +MossdeepCity_Gym_Text_NicholasDefeat: @ 822172D .string "Oh!\n" .string "Done in!$" -MossdeepCity_Gym_Text_22173A: @ 822173A +MossdeepCity_Gym_Text_NicholasPostBattle: @ 822173A .string "All right! I think I'll develop a special\n" .string "invincible POKéMON power next.$" -MossdeepCity_Gym_Text_221783: @ 8221783 +MossdeepCity_Gym_Text_TateAndLizaPreBattle: @ 8221783 .string "TATE: Hehehe… Were you surprised?\p" .string "LIZA: Fufufu… Were you surprised?\p" .string "TATE: That there are two GYM LEADERS?\n" @@ -556,24 +562,24 @@ MossdeepCity_Gym_Text_221783: @ 8221783 .string "TATE: This combination of ours…\n" .string "LIZA: Can you beat it?$" -MossdeepCity_Gym_Text_2218EC: @ 82218EC +MossdeepCity_Gym_Text_TateAndLizaDefeat: @ 82218EC .string "TATE: What?! Our combination…\n" .string "LIZA: Was shattered!\p" .string "TATE: It can't be helped. You've won…\n" .string "LIZA: So, in recognition, take this.$" -MossdeepCity_Gym_Text_22196A: @ 822196A +MossdeepCity_Gym_Text_ReceivedMindBadge: @ 822196A .string "{PLAYER} received the MIND BADGE\n" .string "from TATE and LIZA.$" -MossdeepCity_Gym_Text_221999: @ 8221999 +MossdeepCity_Gym_Text_ExplainMindBadgeTakeThis: @ 8221999 .string "TATE: The MIND BADGE enhances the\n" .string "SP. ATK and SP. DEF of POKéMON.\p" .string "LIZA: It also lets you use the HM move\n" .string "DIVE outside of battle.\p" .string "TATE: You should also take this, too.$" -MossdeepCity_Gym_Text_221A40: @ 8221A40 +MossdeepCity_Gym_Text_ExplainCalmMind: @ 8221A40 .string "TATE: That TM04 contains…\n" .string "LIZA: CALM MIND!\p" .string "TATE: It raises SP. ATK and…\n" @@ -582,18 +588,18 @@ MossdeepCity_Gym_Text_221A40: @ 8221A40 .string "LIZA: For PSYCHIC POKéMON!\p" .string "… … … … … …$" -MossdeepCity_Gym_Text_221AEA: @ 8221AEA +MossdeepCity_Gym_Text_RegisteredTateAndLiza: @ 8221AEA .string "Registered GYM LEADERS TATE & LIZA\n" .string "in the POKéNAV.$" -MossdeepCity_Gym_Text_221B1D: @ 8221B1D +MossdeepCity_Gym_Text_TateAndLizaPostBattle: @ 8221B1D .string "TATE: Looks like the bond between you\n" .string "and your POKéMON is far stronger than\l" .string "the bond that we share as twins.\p" .string "LIZA: You will become even stronger!\n" .string "We've battled you, so we know.$" -MossdeepCity_Gym_Text_221BCE: @ 8221BCE +MossdeepCity_Gym_Text_TateAndLizaNeedTwoMons: @ 8221BCE .string "TATE: Hehehe… Were you surprised?\p" .string "LIZA: That there are two GYM LEADERS?\p" .string "TATE: Oops, you have only one…\n" @@ -602,15 +608,15 @@ MossdeepCity_Gym_Text_221BCE: @ 8221BCE .string "LIZA: If you want to challenge us,\n" .string "bring some more POKéMON.$" -MossdeepCity_Gym_Text_221CB0: @ 8221CB0 +MossdeepCity_Gym_Text_GymStatue: @ 8221CB0 .string "MOSSDEEP CITY POKéMON GYM$" -MossdeepCity_Gym_Text_221CCA: @ 8221CCA +MossdeepCity_Gym_Text_GymStatueCertified: @ 8221CCA .string "MOSSDEEP CITY POKéMON GYM\p" .string "LIZA AND TATE'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" -MossdeepCity_Gym_Text_221D0B: @ 8221D0B +MossdeepCity_Gym_Text_TateAndLizaPreRematch: @ 8221D0B .string "TATE: POKéMON…\n" .string "LIZA: POKéMON…\p" .string "TATE: By changing the party's mix…\n" @@ -622,17 +628,17 @@ MossdeepCity_Gym_Text_221D0B: @ 8221D0B .string "TATE: Our combination…\n" .string "LIZA: We'll show you again and again!$" -MossdeepCity_Gym_Text_221E05: @ 8221E05 +MossdeepCity_Gym_Text_TateAndLizaRematchDefeat: @ 8221E05 .string "TATE: You and your POKéMON…\n" .string "LIZA: It's as if you were siblings!$" -MossdeepCity_Gym_Text_221E45: @ 8221E45 +MossdeepCity_Gym_Text_TateAndLizaPostRematch: @ 8221E45 .string "TATE: You can knock us down,\n" .string "but we'll never stay down!\p" .string "LIZA: Because the two of us,\n" .string "we always support each other!$" -MossdeepCity_Gym_Text_221EB8: @ 8221EB8 +MossdeepCity_Gym_Text_TateAndLizaRematchNeedTwoMons: @ 8221EB8 .string "TATE: You're back again…\n" .string "LIZA: You're back again…\p" .string "TATE: To give us a rematch.\n" diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc index 2151b2626..792ee7fd1 100644 --- a/data/maps/MossdeepCity_House2/scripts.inc +++ b/data/maps/MossdeepCity_House2/scripts.inc @@ -19,9 +19,9 @@ MossdeepCity_House2_EventScript_2220F1:: @ 82220F1 closemessage setflag FLAG_WINGULL_DELIVERED_MAIL clearflag FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq MossdeepCity_House2_EventScript_222124 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if_eq MossdeepCity_House2_EventScript_22212F removeobject 3 release diff --git a/data/maps/MossdeepCity_House3/scripts.inc b/data/maps/MossdeepCity_House3/scripts.inc index 257b7cc82..1aa4e85df 100644 --- a/data/maps/MossdeepCity_House3/scripts.inc +++ b/data/maps/MossdeepCity_House3/scripts.inc @@ -6,7 +6,7 @@ MossdeepCity_House3_EventScript_2225C3:: @ 82225C3 faceplayer goto_if_set FLAG_RECEIVED_SUPER_ROD, MossdeepCity_House3_EventScript_222602 msgbox MossdeepCity_House3_Text_222616, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MossdeepCity_House3_EventScript_22260C msgbox MossdeepCity_House3_Text_2226B6, MSGBOX_DEFAULT giveitem_std ITEM_SUPER_ROD diff --git a/data/maps/MossdeepCity_Mart/scripts.inc b/data/maps/MossdeepCity_Mart/scripts.inc index 11c911c45..1a555af48 100644 --- a/data/maps/MossdeepCity_Mart/scripts.inc +++ b/data/maps/MossdeepCity_Mart/scripts.inc @@ -4,10 +4,10 @@ MossdeepCity_Mart_MapScripts:: @ 82223C7 MossdeepCity_Mart_EventScript_2223C8:: @ 82223C8 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart MossdeepCity_Mart_Pokemart_2223E0 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc index 3806bfc5a..02e8b33b4 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, MossdeepCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 MossdeepCity_PokemonCenter_1F_OnTransition: @ 822224A @@ -9,7 +9,7 @@ MossdeepCity_PokemonCenter_1F_OnTransition: @ 822224A MossdeepCity_PokemonCenter_1F_EventScript_22224E:: @ 822224E setvar VAR_0x800B, 1 - call MossdeepCity_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json index 88bf3caf2..aa8691ac8 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_PokemonCenter_2F_EventScript_22235B", + "script": "MossdeepCity_PokemonCenter_2F_EventScript_Woman5", "flag": "0" } ], diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc index 1c9c89fef..1d88c9ca2 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc @@ -1,27 +1,28 @@ MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334 - map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -MossdeepCity_PokemonCenter_2F_EventScript_222349:: @ 8222349 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +MossdeepCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8222349 + call CableClub_EventScript_Colosseum end -MossdeepCity_PokemonCenter_2F_EventScript_22234F:: @ 822234F - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +MossdeepCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 822234F + call CableClub_EventScript_TradeCenter end -MossdeepCity_PokemonCenter_2F_EventScript_222355:: @ 8222355 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +MossdeepCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8222355 + call CableClub_EventScript_RecordCorner end -MossdeepCity_PokemonCenter_2F_EventScript_22235B:: @ 822235B - msgbox MossdeepCity_PokemonCenter_2F_Text_222364, MSGBOX_NPC +MossdeepCity_PokemonCenter_2F_EventScript_Woman5:: @ 822235B + msgbox MossdeepCity_PokemonCenter_2F_Text_Woman5, MSGBOX_NPC end -MossdeepCity_PokemonCenter_2F_Text_222364: @ 8222364 +MossdeepCity_PokemonCenter_2F_Text_Woman5: @ 8222364 .string "If I win a whole lot of link battles\n" .string "and show everyone how good I am,\l" .string "I might get a fan following!$" diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json index 0d02d368a..b79f758cd 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_222FD8", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounter", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_223063", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_Scientist", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_22308E", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_SunStoneMan", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_223168", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_OldMan", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_22312D", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_Woman", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231DA", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt32", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231F1", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt16", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, { @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_223208", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt33", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, { @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_22321F", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_Grunt23", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, { @@ -141,8 +141,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231CF", - "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY" + "script": "MossdeepCity_SpaceCenter_1F_EventScript_MagmaNote", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_MAGMA_NOTE" }, { "graphics_id": "EVENT_OBJ_GFX_STEVEN", @@ -154,7 +154,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231B9", + "script": "MossdeepCity_SpaceCenter_1F_EventScript_Steven", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN" } ], diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 144113d72..17bf5c896 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -1,14 +1,14 @@ MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41 - map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_SpaceCenter_1F_MapScript1_222FC2 + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_SpaceCenter_1F_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_1F_OnTransition .byte 0 MossdeepCity_SpaceCenter_1F_OnTransition: @ 8222F4C compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222F58 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_MoveObjectsForTeamMagma end -MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58 +MossdeepCity_SpaceCenter_1F_EventScript_MoveObjectsForTeamMagma:: @ 8222F58 setobjectxyperm 3, 1, 9 setobjectmovementtype 3, MOVEMENT_TYPE_FACE_RIGHT setobjectxyperm 5, 0, 8 @@ -18,291 +18,296 @@ MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58 setobjectxyperm 1, 3, 4 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT - compare VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 1 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA - compare VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 2 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FB2 - compare VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 3 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FBA + compare VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 1 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardLeft + compare VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 2 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardDown + compare VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 3 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardRight end -MossdeepCity_SpaceCenter_1F_EventScript_222FAA:: @ 8222FAA +MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardLeft:: @ 8222FAA setobjectxyperm 9, 12, 2 end -MossdeepCity_SpaceCenter_1F_EventScript_222FB2:: @ 8222FB2 +MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardDown:: @ 8222FB2 setobjectxyperm 9, 13, 3 end -MossdeepCity_SpaceCenter_1F_EventScript_222FBA:: @ 8222FBA +@ Functionally unused. See comment on MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast +MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardRight:: @ 8222FBA setobjectxyperm 9, 14, 2 end -MossdeepCity_SpaceCenter_1F_MapScript1_222FC2: @ 8222FC2 +MossdeepCity_SpaceCenter_1F_OnLoad: @ 8222FC2 compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_le MossdeepCity_SpaceCenter_1F_EventScript_222FCE + goto_if_le MossdeepCity_SpaceCenter_1F_EventScript_SetMagmaNote end -MossdeepCity_SpaceCenter_1F_EventScript_222FCE:: @ 8222FCE +MossdeepCity_SpaceCenter_1F_EventScript_SetMagmaNote:: @ 8222FCE setmetatile 2, 5, METATILE_Facility_DataPad, 1 return -MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 +MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounter:: @ 8222FD8 lock faceplayer compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223024 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounterMagma dotimebasedevents specialvar VAR_RESULT, GetWeekCount buffernumberstring 0, VAR_RESULT compare VAR_RESULT, 0 - call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223012 + call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYet compare VAR_RESULT, 1 - call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22301B + call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumber closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -MossdeepCity_SpaceCenter_1F_EventScript_223012:: @ 8223012 - msgbox MossdeepCity_SpaceCenter_1F_Text_2232A7, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYet:: @ 8223012 + msgbox MossdeepCity_SpaceCenter_1F_Text_RocketLaunchImminent, MSGBOX_DEFAULT return -MossdeepCity_SpaceCenter_1F_EventScript_22301B:: @ 822301B - msgbox MossdeepCity_SpaceCenter_1F_Text_2232C8, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumber:: @ 822301B + msgbox MossdeepCity_SpaceCenter_1F_Text_SuccessfulLaunchNumber, MSGBOX_DEFAULT return -MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 +MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounterMagma:: @ 8223024 dotimebasedevents specialvar VAR_RESULT, GetWeekCount buffernumberstring 0, VAR_RESULT compare VAR_RESULT, 0 - call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223051 + call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYetMagma compare VAR_RESULT, 1 - call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22305A + call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumberMagma closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight waitmovement 0 release end -MossdeepCity_SpaceCenter_1F_EventScript_223051:: @ 8223051 - msgbox MossdeepCity_SpaceCenter_1F_Text_223305, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYetMagma:: @ 8223051 + msgbox MossdeepCity_SpaceCenter_1F_Text_HaywireButRocketLaunchImminent, MSGBOX_DEFAULT return -MossdeepCity_SpaceCenter_1F_EventScript_22305A:: @ 822305A - msgbox MossdeepCity_SpaceCenter_1F_Text_22335E, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumberMagma:: @ 822305A + msgbox MossdeepCity_SpaceCenter_1F_Text_HaywireButSuccessfulLaunchNumber, MSGBOX_DEFAULT return -MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063 +MossdeepCity_SpaceCenter_1F_EventScript_Scientist:: @ 8223063 lock faceplayer compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_22307A - msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, MSGBOX_DEFAULT + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_ScientistMagma + msgbox MossdeepCity_SpaceCenter_1F_Text_RocketLaunchDemandsPerfection, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A - msgbox MossdeepCity_SpaceCenter_1F_Text_2234B7, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight +MossdeepCity_SpaceCenter_1F_EventScript_ScientistMagma:: @ 822307A + msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaHaveSightsOnSpaceCenter, MSGBOX_DEFAULT + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight waitmovement 0 release end -MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E +MossdeepCity_SpaceCenter_1F_EventScript_SunStoneMan:: @ 822308E lock faceplayer compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA - goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_2230D0 - msgbox MossdeepCity_SpaceCenter_1F_Text_223540, MSGBOX_DEFAULT + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_SunStoneManMagma + goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStone + msgbox MossdeepCity_SpaceCenter_1F_Text_FoundThisYouCanHaveIt, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP - msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_1F_Text_HoennFamousForMeteorShowers, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_1F_EventScript_2230D0:: @ 82230D0 - msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStone:: @ 82230D0 + msgbox MossdeepCity_SpaceCenter_1F_Text_HoennFamousForMeteorShowers, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA - goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_223119 - msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_SunStoneManMagma:: @ 82230DA + goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStoneMagma + msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaCantStealFuelTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP - msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight + msgbox MossdeepCity_SpaceCenter_1F_Text_CantStrollOnBeachWithMagma, MSGBOX_DEFAULT + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight waitmovement 0 release end -MossdeepCity_SpaceCenter_1F_EventScript_223119:: @ 8223119 - msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight +MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStoneMagma:: @ 8223119 + msgbox MossdeepCity_SpaceCenter_1F_Text_CantStrollOnBeachWithMagma, MSGBOX_DEFAULT + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight waitmovement 0 release end -MossdeepCity_SpaceCenter_1F_EventScript_22312D:: @ 822312D +MossdeepCity_SpaceCenter_1F_EventScript_Woman:: @ 822312D lock faceplayer - goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_223154 + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_WomanNormal compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_22315E + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_WomanMagma compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_223154 - goto MossdeepCity_SpaceCenter_1F_EventScript_22315E + goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_WomanNormal + goto MossdeepCity_SpaceCenter_1F_EventScript_WomanMagma end -MossdeepCity_SpaceCenter_1F_EventScript_223154:: @ 8223154 - msgbox MossdeepCity_SpaceCenter_1F_Text_2236A6, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_WomanNormal:: @ 8223154 + msgbox MossdeepCity_SpaceCenter_1F_Text_DidPokemonComeFromSpace, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_1F_EventScript_22315E:: @ 822315E - msgbox MossdeepCity_SpaceCenter_1F_Text_2236E8, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_WomanMagma:: @ 822315E + msgbox MossdeepCity_SpaceCenter_1F_Text_AquaShouldBeatMagma, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168 +MossdeepCity_SpaceCenter_1F_EventScript_OldMan:: @ 8223168 lock faceplayer - goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_22318F + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_OldManNormal compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2231A4 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_OldManMagma compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_22318F - goto MossdeepCity_SpaceCenter_1F_EventScript_2231A4 + goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_OldManNormal + goto MossdeepCity_SpaceCenter_1F_EventScript_OldManMagma end -MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F - msgbox MossdeepCity_SpaceCenter_1F_Text_22375B, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_OldManNormal:: @ 822318F + msgbox MossdeepCity_SpaceCenter_1F_Text_RocketsBoggleMyMind, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -MossdeepCity_SpaceCenter_1F_EventScript_2231A4:: @ 82231A4 - msgbox MossdeepCity_SpaceCenter_1F_Text_2237B5, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_OldManMagma:: @ 82231A4 + msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaWantsToSpoilMyDream, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -MossdeepCity_SpaceCenter_1F_EventScript_2231B9:: @ 82231B9 +MossdeepCity_SpaceCenter_1F_EventScript_Steven:: @ 82231B9 lock faceplayer - msgbox MossdeepCity_SpaceCenter_1F_Text_223849, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_1F_Text_StevenMagmaCantBeAllowedToTakeFuel, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -MossdeepCity_SpaceCenter_1F_EventScript_2231CF:: @ 82231CF +MossdeepCity_SpaceCenter_1F_EventScript_MagmaNote:: @ 82231CF lockall - msgbox MossdeepCity_SpaceCenter_1F_Text_223C2C, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaIntentToStealNotice, MSGBOX_DEFAULT releaseall end -MossdeepCity_SpaceCenter_1F_EventScript_2231DA:: @ 82231DA - trainerbattle_single TRAINER_GRUNT_32, MossdeepCity_SpaceCenter_1F_Text_22396C, MossdeepCity_SpaceCenter_1F_Text_223999 - msgbox MossdeepCity_SpaceCenter_1F_Text_2239AA, MSGBOX_AUTOCLOSE +MossdeepCity_SpaceCenter_1F_EventScript_Grunt32:: @ 82231DA + trainerbattle_single TRAINER_GRUNT_32, MossdeepCity_SpaceCenter_1F_Text_Grunt32Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt32Defeat + msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt32PostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_SpaceCenter_1F_EventScript_2231F1:: @ 82231F1 - trainerbattle_single TRAINER_GRUNT_16, MossdeepCity_SpaceCenter_1F_Text_2239E6, MossdeepCity_SpaceCenter_1F_Text_223A21 - msgbox MossdeepCity_SpaceCenter_1F_Text_223A4B, MSGBOX_AUTOCLOSE +MossdeepCity_SpaceCenter_1F_EventScript_Grunt16:: @ 82231F1 + trainerbattle_single TRAINER_GRUNT_16, MossdeepCity_SpaceCenter_1F_Text_Grunt16Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt16Defeat + msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt16PostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_SpaceCenter_1F_EventScript_223208:: @ 8223208 - trainerbattle_single TRAINER_GRUNT_33, MossdeepCity_SpaceCenter_1F_Text_223A8A, MossdeepCity_SpaceCenter_1F_Text_223AFA - msgbox MossdeepCity_SpaceCenter_1F_Text_223B37, MSGBOX_AUTOCLOSE +MossdeepCity_SpaceCenter_1F_EventScript_Grunt33:: @ 8223208 + trainerbattle_single TRAINER_GRUNT_33, MossdeepCity_SpaceCenter_1F_Text_Grunt33Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt33Defeat + msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt33PostBattle, MSGBOX_AUTOCLOSE end -MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F +MossdeepCity_SpaceCenter_1F_EventScript_Grunt23:: @ 822321F lock faceplayer - goto_if_set FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F, MossdeepCity_SpaceCenter_1F_EventScript_22326E - msgbox MossdeepCity_SpaceCenter_1F_Text_223B90, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_GRUNT_23, MossdeepCity_SpaceCenter_1F_Text_223BC2 + goto_if_set FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F, MossdeepCity_SpaceCenter_1F_EventScript_Grunt23Defeated + msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt23Intro, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_23, MossdeepCity_SpaceCenter_1F_Text_Grunt23Defeat setflag FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F copyobjectxytoperm 9 switch VAR_FACING - case 3, MossdeepCity_SpaceCenter_1F_EventScript_223278 - case 3, MossdeepCity_SpaceCenter_1F_EventScript_223289 - applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_2232A2 + case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsWest + case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast @ BUG: This was meant to be case DIR_EAST + applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairs waitmovement 0 - setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 2 + setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 2 release end -MossdeepCity_SpaceCenter_1F_EventScript_22326E:: @ 822326E - msgbox MossdeepCity_SpaceCenter_1F_Text_223BD3, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_1F_EventScript_Grunt23Defeated:: @ 822326E + msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt23PostBattle, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_1F_EventScript_223278:: @ 8223278 - applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_22329A +MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsWest:: @ 8223278 + applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsWest waitmovement 0 - setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 1 + setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 1 release end -MossdeepCity_SpaceCenter_1F_EventScript_223289:: @ 8223289 - applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_22329E +@ Functionally unused by mistake. The movement is handled anyway after the switch (see above) +@ This also means VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE can never be 3 +MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast:: @ 8223289 + applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsEast waitmovement 0 - setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 3 + setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 3 release end -MossdeepCity_SpaceCenter_1F_Movement_22329A: @ 822329A +MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsWest: @ 822329A lock_facing_direction walk_left unlock_facing_direction step_end -MossdeepCity_SpaceCenter_1F_Movement_22329E: @ 822329E +@ Functionally unused. See above +MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsEast: @ 822329E lock_facing_direction walk_right unlock_facing_direction step_end -MossdeepCity_SpaceCenter_1F_Movement_2232A2: @ 82232A2 +@ This was meant to only handle the player facing North, but by mistake(?) it also handles the player facing East +MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairs: @ 82232A2 face_left lock_facing_direction walk_right unlock_facing_direction step_end -MossdeepCity_SpaceCenter_1F_Text_2232A7: @ 82232A7 +MossdeepCity_SpaceCenter_1F_Text_RocketLaunchImminent: @ 82232A7 .string "The rocket's launch is imminent!$" -MossdeepCity_SpaceCenter_1F_Text_2232C8: @ 82232C8 +MossdeepCity_SpaceCenter_1F_Text_SuccessfulLaunchNumber: @ 82232C8 .string "The rocket launched safely!\n" .string "That's successful launch no. {STR_VAR_1}!$" -MossdeepCity_SpaceCenter_1F_Text_223305: @ 8223305 +MossdeepCity_SpaceCenter_1F_Text_HaywireButRocketLaunchImminent: @ 8223305 .string "I know that things are a little\n" .string "haywire right now, but…\p" .string "The rocket's launch is imminent!$" -MossdeepCity_SpaceCenter_1F_Text_22335E: @ 822335E +MossdeepCity_SpaceCenter_1F_Text_HaywireButSuccessfulLaunchNumber: @ 822335E .string "I know that things are a little\n" .string "haywire right now, but…\p" .string "The rocket launched safely!\n" .string "That's successful launch no. {STR_VAR_1}!$" -MossdeepCity_SpaceCenter_1F_Text_2233D3: @ 82233D3 +MossdeepCity_SpaceCenter_1F_Text_RocketLaunchDemandsPerfection: @ 82233D3 .string "A rocket launch demands perfection.\n" .string "Not even a 1% margin of error is allowed.\p" .string "Even if it's 99% okay, the whole thing\n" @@ -310,55 +315,55 @@ MossdeepCity_SpaceCenter_1F_Text_2233D3: @ 82233D3 .string "Despite that, we never stop trying.\n" .string "Why? It's a dream that never ends.$" -MossdeepCity_SpaceCenter_1F_Text_2234B7: @ 82234B7 +MossdeepCity_SpaceCenter_1F_Text_MagmaHaveSightsOnSpaceCenter: @ 82234B7 .string "Those MAGMA thugs have their sights\n" .string "set on our SPACE CENTER.\p" .string "But we can't allow anything that minor\n" .string "to interfere with our rocket launch!$" -MossdeepCity_SpaceCenter_1F_Text_223540: @ 8223540 +MossdeepCity_SpaceCenter_1F_Text_FoundThisYouCanHaveIt: @ 8223540 .string "I was taking a stroll down the beach\n" .string "when I found this.\p" .string "It's not anything I need, so you can\n" .string "have it.$" -MossdeepCity_SpaceCenter_1F_Text_2235A6: @ 82235A6 +MossdeepCity_SpaceCenter_1F_Text_HoennFamousForMeteorShowers: @ 82235A6 .string "The HOENN region has been famous for \n" .string "its meteor showers for a long time.$" -MossdeepCity_SpaceCenter_1F_Text_2235F0: @ 82235F0 +MossdeepCity_SpaceCenter_1F_Text_MagmaCantStealFuelTakeThis: @ 82235F0 .string "TEAM MAGMA can't be allowed to steal\n" .string "the rocket fuel.\p" .string "Oh, by the way, you can have this stone\n" .string "I found on the beach.$" -MossdeepCity_SpaceCenter_1F_Text_223664: @ 8223664 +MossdeepCity_SpaceCenter_1F_Text_CantStrollOnBeachWithMagma: @ 8223664 .string "With TEAM MAGMA around, I guess\n" .string "strolls on the beach aren't safe.$" -MossdeepCity_SpaceCenter_1F_Text_2236A6: @ 82236A6 +MossdeepCity_SpaceCenter_1F_Text_DidPokemonComeFromSpace: @ 82236A6 .string "Some people claim that POKéMON came\n" .string "from space. Could it be true?$" -MossdeepCity_SpaceCenter_1F_Text_2236E8: @ 82236E8 +MossdeepCity_SpaceCenter_1F_Text_AquaShouldBeatMagma: @ 82236E8 .string "TEAM AQUA should take care of\n" .string "TEAM MAGMA!\p" .string "But if they did that, TEAM AQUA will\n" .string "become bold and brazen, won't they?$" -MossdeepCity_SpaceCenter_1F_Text_22375B: @ 822375B +MossdeepCity_SpaceCenter_1F_Text_RocketsBoggleMyMind: @ 822375B .string "A giant chunk of metal bursts through\n" .string "the skies and flies into space…\p" .string "It boggles my mind!$" -MossdeepCity_SpaceCenter_1F_Text_2237B5: @ 82237B5 +MossdeepCity_SpaceCenter_1F_Text_MagmaWantsToSpoilMyDream: @ 82237B5 .string "A giant chunk of metal bursts through\n" .string "the skies and flies into space…\p" .string "But TEAM MAGMA wants to spoil\n" .string "that dream of mine!\p" .string "I'm not having any of that!$" -MossdeepCity_SpaceCenter_1F_Text_223849: @ 8223849 +MossdeepCity_SpaceCenter_1F_Text_StevenMagmaCantBeAllowedToTakeFuel: @ 8223849 .string "STEVEN: {PLAYER}{KUN}, have you read that\n" .string "proclamation already?\p" .string "TEAM MAGMA is coming after the rocket\n" @@ -370,57 +375,57 @@ MossdeepCity_SpaceCenter_1F_Text_223849: @ 8223849 .string "In the meantime, why don't you go\n" .string "check out the town?$" -MossdeepCity_SpaceCenter_1F_Text_22396C: @ 822396C +MossdeepCity_SpaceCenter_1F_Text_Grunt32Intro: @ 822396C .string "As promised, we've come for\n" .string "the rocket fuel!$" -MossdeepCity_SpaceCenter_1F_Text_223999: @ 8223999 +MossdeepCity_SpaceCenter_1F_Text_Grunt32Defeat: @ 8223999 .string "Ran out of fuel…$" -MossdeepCity_SpaceCenter_1F_Text_2239AA: @ 82239AA +MossdeepCity_SpaceCenter_1F_Text_Grunt32PostBattle: @ 82239AA .string "Don't think you're on a roll just\n" .string "because you've beaten me!$" -MossdeepCity_SpaceCenter_1F_Text_2239E6: @ 82239E6 +MossdeepCity_SpaceCenter_1F_Text_Grunt16Intro: @ 82239E6 .string "We gave you fair warning!\n" .string "There's nothing sneaky about us!$" -MossdeepCity_SpaceCenter_1F_Text_223A21: @ 8223A21 +MossdeepCity_SpaceCenter_1F_Text_Grunt16Defeat: @ 8223A21 .string "Grrr…\n" .string "We should've used sneaky treachery…$" -MossdeepCity_SpaceCenter_1F_Text_223A4B: @ 8223A4B +MossdeepCity_SpaceCenter_1F_Text_Grunt16PostBattle: @ 8223A4B .string "Okay, I get it already! The next time,\n" .string "we'll come unannounced.$" -MossdeepCity_SpaceCenter_1F_Text_223A8A: @ 8223A8A +MossdeepCity_SpaceCenter_1F_Text_Grunt33Intro: @ 8223A8A .string "The rocket fuel the SPACE CENTER has\n" .string "in storage--that's what we're after.\p" .string "We mean to take every last bit of it!$" -MossdeepCity_SpaceCenter_1F_Text_223AFA: @ 8223AFA +MossdeepCity_SpaceCenter_1F_Text_Grunt33Defeat: @ 8223AFA .string "Please, can you spare some fuel?\n" .string "Even a chintzy cup will do!$" -MossdeepCity_SpaceCenter_1F_Text_223B37: @ 8223B37 +MossdeepCity_SpaceCenter_1F_Text_Grunt33PostBattle: @ 8223B37 .string "What are we going to do with\n" .string "the rocket fuel?\p" .string "How would I know?\n" .string "Ask our leader upstairs!$" -MossdeepCity_SpaceCenter_1F_Text_223B90: @ 8223B90 +MossdeepCity_SpaceCenter_1F_Text_Grunt23Intro: @ 8223B90 .string "Our leader said no one, but no one,\n" .string "gets past me!$" -MossdeepCity_SpaceCenter_1F_Text_223BC2: @ 8223BC2 +MossdeepCity_SpaceCenter_1F_Text_Grunt23Defeat: @ 8223BC2 .string "Ack! Ack! Aaack!$" -MossdeepCity_SpaceCenter_1F_Text_223BD3: @ 8223BD3 +MossdeepCity_SpaceCenter_1F_Text_Grunt23PostBattle: @ 8223BD3 .string "Please, tell our leader that\n" .string "I never abandoned my post.\l" .string "That I stayed to the bitter end…$" -MossdeepCity_SpaceCenter_1F_Text_223C2C: @ 8223C2C +MossdeepCity_SpaceCenter_1F_Text_MagmaIntentToStealNotice: @ 8223C2C .string "This is…\n" .string "An intent-to-steal notice?\p" .string "“To the staff of the SPACE CENTER:\n" diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json index 5c758bf3e..9da580910 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F03", + "script": "MossdeepCity_SpaceCenter_2F_EventScript_RichBoy", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_2F_EventScript_223EC8", + "script": "MossdeepCity_SpaceCenter_2F_EventScript_Gentleman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_2F_EventScript_223E8D", + "script": "MossdeepCity_SpaceCenter_2F_EventScript_Scientist", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F7A", + "script": "MossdeepCity_SpaceCenter_2F_EventScript_Steven", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F3E", + "script": "MossdeepCity_SpaceCenter_2F_EventScript_Grunt35", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F50", + "script": "MossdeepCity_SpaceCenter_2F_EventScript_Grunt34", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F47", + "script": "MossdeepCity_SpaceCenter_2F_EventScript_Grunt36", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, { @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F59", + "script": "MossdeepCity_SpaceCenter_2F_EventScript_Tabitha", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, { @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F6F", + "script": "MossdeepCity_SpaceCenter_2F_EventScript_Maxie", "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" } ], diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 903dc8136..ddce7efc8 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -1,16 +1,16 @@ MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58 map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_2F_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_SpaceCenter_2F_MapScript2_223DB5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_SpaceCenter_2F_OnFrame .byte 0 MossdeepCity_SpaceCenter_2F_OnTransition: @ 8223D63 compare VAR_MOSSDEEP_CITY_STATE, 2 - call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D7A - compare VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 2 - call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D9F + call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_MoveStevenMaxieTabitha + compare VAR_MOSSDEEP_SPACE_CENTER_STATE, 2 + call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_MoveDefeatedGrunts end -MossdeepCity_SpaceCenter_2F_EventScript_223D7A:: @ 8223D7A +MossdeepCity_SpaceCenter_2F_EventScript_MoveStevenMaxieTabitha:: @ 8223D7A clearflag FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER setobjectxyperm 3, 5, 3 setobjectmovementtype 3, MOVEMENT_TYPE_FACE_RIGHT @@ -20,193 +20,194 @@ MossdeepCity_SpaceCenter_2F_EventScript_223D7A:: @ 8223D7A setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT return -MossdeepCity_SpaceCenter_2F_EventScript_223D9F:: @ 8223D9F +MossdeepCity_SpaceCenter_2F_EventScript_MoveDefeatedGrunts:: @ 8223D9F setobjectxyperm 5, 11, 2 setobjectxyperm 7, 15, 2 setobjectxyperm 6, 13, 4 return -MossdeepCity_SpaceCenter_2F_MapScript2_223DB5: @ 8223DB5 - map_script_2 VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 1, MossdeepCity_SpaceCenter_2F_EventScript_223DBF +MossdeepCity_SpaceCenter_2F_OnFrame: @ 8223DB5 + map_script_2 VAR_MOSSDEEP_SPACE_CENTER_STATE, 1, MossdeepCity_SpaceCenter_2F_EventScript_ThreeMagmaGrunts .2byte 0 -MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF +MossdeepCity_SpaceCenter_2F_EventScript_ThreeMagmaGrunts:: @ 8223DBF playse SE_PIN applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48 waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223E09 - msgbox MossdeepCity_SpaceCenter_2F_Text_2243FE, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_2F_Text_YoureOutnumberedTakeUsOn, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts + msgbox MossdeepCity_SpaceCenter_2F_Text_GoodAnswer, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_223E07 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_PlayerExit waitmovement 0 warp MAP_MOSSDEEP_CITY_SPACE_CENTER_1F, 255, 13, 1 waitstate releaseall end -MossdeepCity_SpaceCenter_2F_Movement_223E07: @ 8223E07 +MossdeepCity_SpaceCenter_2F_Movement_PlayerExit: @ 8223E07 walk_up step_end -MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 - msgbox MossdeepCity_SpaceCenter_2F_Text_22442D, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_GRUNT_34, MossdeepCity_SpaceCenter_2F_Text_224461 - applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85 +MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts:: @ 8223E09 + msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt34Intro, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_34, MossdeepCity_SpaceCenter_2F_Text_Grunt34Defeat + applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_Grunt34Defeated waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_GRUNT_35, MossdeepCity_SpaceCenter_2F_Text_224499 - applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81 + msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt35Intro, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_35, MossdeepCity_SpaceCenter_2F_Text_Grunt35Defeat + applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_Grunt35Defeated waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1 - applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_223E89 + msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt36Intro, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_Grunt36Defeat + applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_Grunt36Defeated waitmovement 0 - setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 2 + setvar VAR_MOSSDEEP_SPACE_CENTER_STATE, 2 copyobjectxytoperm 5 copyobjectxytoperm 7 copyobjectxytoperm 6 releaseall end -MossdeepCity_SpaceCenter_2F_Movement_223E81: @ 8223E81 +MossdeepCity_SpaceCenter_2F_Movement_Grunt35Defeated: @ 8223E81 lock_facing_direction walk_left unlock_facing_direction step_end -MossdeepCity_SpaceCenter_2F_Movement_223E85: @ 8223E85 +MossdeepCity_SpaceCenter_2F_Movement_Grunt34Defeated: @ 8223E85 lock_facing_direction walk_down unlock_facing_direction step_end -MossdeepCity_SpaceCenter_2F_Movement_223E89: @ 8223E89 +MossdeepCity_SpaceCenter_2F_Movement_Grunt36Defeated: @ 8223E89 lock_facing_direction walk_right unlock_facing_direction step_end -MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D +MossdeepCity_SpaceCenter_2F_EventScript_Scientist:: @ 8223E8D lock faceplayer - goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223EB4 + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_ScientistNormal compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223EBE + goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_ScientistMagma compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223EB4 - goto MossdeepCity_SpaceCenter_2F_EventScript_223EBE + goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_ScientistNormal + goto MossdeepCity_SpaceCenter_2F_EventScript_ScientistMagma end -MossdeepCity_SpaceCenter_2F_EventScript_223EB4:: @ 8223EB4 - msgbox MossdeepCity_SpaceCenter_2F_Text_2241A1, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_2F_EventScript_ScientistNormal:: @ 8223EB4 + msgbox MossdeepCity_SpaceCenter_2F_Text_MossdeepIdealForRockets, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_2F_EventScript_223EBE:: @ 8223EBE - msgbox MossdeepCity_SpaceCenter_2F_Text_22420C, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_2F_EventScript_ScientistMagma:: @ 8223EBE + msgbox MossdeepCity_SpaceCenter_2F_Text_WhyWouldMagmaStealRocketFuel, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_2F_EventScript_223EC8:: @ 8223EC8 +MossdeepCity_SpaceCenter_2F_EventScript_Gentleman:: @ 8223EC8 lock faceplayer - goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223EEF + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_GentlemanNormal compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223EF9 + goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_GentlemanMagma compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223EEF - goto MossdeepCity_SpaceCenter_2F_EventScript_223EF9 + goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_GentlemanNormal + goto MossdeepCity_SpaceCenter_2F_EventScript_GentlemanMagma end -MossdeepCity_SpaceCenter_2F_EventScript_223EEF:: @ 8223EEF - msgbox MossdeepCity_SpaceCenter_2F_Text_224253, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_2F_EventScript_GentlemanNormal:: @ 8223EEF + msgbox MossdeepCity_SpaceCenter_2F_Text_WouldveLikedToBeAstronaut, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_2F_EventScript_223EF9:: @ 8223EF9 - msgbox MossdeepCity_SpaceCenter_2F_Text_2242C5, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_2F_EventScript_GentlemanMagma:: @ 8223EF9 + msgbox MossdeepCity_SpaceCenter_2F_Text_MagmaCantGetAwayWithThis, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_2F_EventScript_223F03:: @ 8223F03 +MossdeepCity_SpaceCenter_2F_EventScript_RichBoy:: @ 8223F03 lock faceplayer - goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223F2A + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_RichBoyNormal compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223F34 + goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_RichBoyMagma compare VAR_MOSSDEEP_CITY_STATE, 2 - goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223F2A - goto MossdeepCity_SpaceCenter_2F_EventScript_223F34 + goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_RichBoyNormal + goto MossdeepCity_SpaceCenter_2F_EventScript_RichBoyMagma end -MossdeepCity_SpaceCenter_2F_EventScript_223F2A:: @ 8223F2A - msgbox MossdeepCity_SpaceCenter_2F_Text_224342, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_2F_EventScript_RichBoyNormal:: @ 8223F2A + msgbox MossdeepCity_SpaceCenter_2F_Text_WishOrdinaryPeopleCouldGoIntoSpace, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_2F_EventScript_223F34:: @ 8223F34 - msgbox MossdeepCity_SpaceCenter_2F_Text_224376, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_2F_EventScript_RichBoyMagma:: @ 8223F34 + msgbox MossdeepCity_SpaceCenter_2F_Text_DoesMagmaWantToGoToSpace, MSGBOX_DEFAULT release end -MossdeepCity_SpaceCenter_2F_EventScript_223F3E:: @ 8223F3E - msgbox MossdeepCity_SpaceCenter_2F_Text_22452C, MSGBOX_NPC +@ Battle for the below 3 grunts is handled in MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts +MossdeepCity_SpaceCenter_2F_EventScript_Grunt35:: @ 8223F3E + msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt35PostBattle, MSGBOX_NPC end -MossdeepCity_SpaceCenter_2F_EventScript_223F47:: @ 8223F47 - msgbox MossdeepCity_SpaceCenter_2F_Text_224570, MSGBOX_NPC +MossdeepCity_SpaceCenter_2F_EventScript_Grunt36:: @ 8223F47 + msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt36PostBattle, MSGBOX_NPC end -MossdeepCity_SpaceCenter_2F_EventScript_223F50:: @ 8223F50 - msgbox MossdeepCity_SpaceCenter_2F_Text_2245AF, MSGBOX_NPC +MossdeepCity_SpaceCenter_2F_EventScript_Grunt34:: @ 8223F50 + msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt34PostBattle, MSGBOX_NPC end -MossdeepCity_SpaceCenter_2F_EventScript_223F59:: @ 8223F59 +MossdeepCity_SpaceCenter_2F_EventScript_Tabitha:: @ 8223F59 lock faceplayer - msgbox MossdeepCity_SpaceCenter_2F_Text_2245D9, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_2F_Text_WellTakeCareOfYou, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -MossdeepCity_SpaceCenter_2F_EventScript_223F6F:: @ 8223F6F +MossdeepCity_SpaceCenter_2F_EventScript_Maxie:: @ 8223F6F lockall - msgbox MossdeepCity_SpaceCenter_2F_Text_22467B, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_2F_Text_MaxieDontInterfere, MSGBOX_DEFAULT releaseall end -MossdeepCity_SpaceCenter_2F_EventScript_223F7A:: @ 8223F7A +MossdeepCity_SpaceCenter_2F_EventScript_Steven:: @ 8223F7A lockall - goto_if_set FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER, MossdeepCity_SpaceCenter_2F_EventScript_223FDA + goto_if_set FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER, MossdeepCity_SpaceCenter_2F_EventScript_ReadyForBattlePrompt setflag FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER - msgbox MossdeepCity_SpaceCenter_2F_Text_2246B2, MSGBOX_DEFAULT - msgbox MossdeepCity_SpaceCenter_2F_Text_2246F0, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_2F_Text_StevenWhyStealRocketFuel, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_2F_Text_MaxieUseFuelToEruptVolcano, MSGBOX_DEFAULT closemessage delay 30 playse SE_KOUKA_L switch VAR_FACING - case 1, MossdeepCity_SpaceCenter_2F_EventScript_223FBA - applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_223FC6 + case DIR_SOUTH, MossdeepCity_SpaceCenter_2F_EventScript_StevenFightMovementSouth + applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_StevenFight waitmovement 0 releaseall end -MossdeepCity_SpaceCenter_2F_EventScript_223FBA:: @ 8223FBA - applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_223FCF +MossdeepCity_SpaceCenter_2F_EventScript_StevenFightMovementSouth:: @ 8223FBA + applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_StevenFightSouth waitmovement 0 releaseall end -MossdeepCity_SpaceCenter_2F_Movement_223FC6: @ 8223FC6 +MossdeepCity_SpaceCenter_2F_Movement_StevenFight: @ 8223FC6 lock_facing_direction walk_fast_up walk_fast_up @@ -217,7 +218,7 @@ MossdeepCity_SpaceCenter_2F_Movement_223FC6: @ 8223FC6 walk_slow_down step_end -MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF +MossdeepCity_SpaceCenter_2F_Movement_StevenFightSouth: @ 8223FCF face_left lock_facing_direction walk_fast_right @@ -230,32 +231,32 @@ MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF face_down step_end -MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA +MossdeepCity_SpaceCenter_2F_EventScript_ReadyForBattlePrompt:: @ 8223FDA applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C - msgbox MossdeepCity_SpaceCenter_2F_Text_224854, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_2F_Text_StevenAreYouReadyToBattle, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle + msgbox MossdeepCity_SpaceCenter_2F_Text_StevenHurryGetReadyQuickly, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 releaseall end -MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown +MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle:: @ 822400C + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 special SavePlayerParty fadescreen 1 special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 - goto_if_ne MossdeepCity_SpaceCenter_2F_EventScript_224032 + goto_if_ne MossdeepCity_SpaceCenter_2F_EventScript_DoStevenMultiBattle special LoadPlayerParty - goto MossdeepCity_SpaceCenter_2F_EventScript_223FDA + goto MossdeepCity_SpaceCenter_2F_EventScript_ReadyForBattlePrompt -MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032 +MossdeepCity_SpaceCenter_2F_EventScript_DoStevenMultiBattle:: @ 8224032 special ReducePlayerPartyToSelectedMons setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 @@ -268,29 +269,29 @@ MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032 special CallFrontierUtilFunc special LoadPlayerParty switch VAR_RESULT - case 1, MossdeepCity_SpaceCenter_2F_EventScript_224071 + case 1, MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha fadescreen 1 - special sp0C8_whiteout_maybe + special SetCB2WhiteOut waitstate -MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 - msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, MSGBOX_DEFAULT +MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha:: @ 8224071 + msgbox MossdeepCity_SpaceCenter_2F_Text_MaxieWeFailedIsAquaAlsoMisguided, MSGBOX_DEFAULT closemessage delay 20 - applymovement 9, Common_Movement_WalkInPlaceLeft - applymovement 8, Common_Movement_WalkInPlaceDown + applymovement 9, Common_Movement_WalkInPlaceFastestLeft + applymovement 8, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 60 - applymovement 9, Common_Movement_WalkInPlaceUp - applymovement 8, Common_Movement_WalkInPlaceRight + applymovement 9, Common_Movement_WalkInPlaceFastestUp + applymovement 8, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 20 - msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_2F_Text_MaxieWeWillGiveUp, MSGBOX_DEFAULT closemessage setvar VAR_MOSSDEEP_CITY_STATE, 3 fadedefaultbgm fadescreen 1 - setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 3 + setvar VAR_MOSSDEEP_SPACE_CENTER_STATE, 3 setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA @@ -305,15 +306,15 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 turnobject 2, DIR_NORTH setobjectxy 1, 6, 2 turnobject 1, DIR_NORTH - call MossdeepCity_SpaceCenter_2F_EventScript_224131 + call MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayer fadescreen 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_224A4A, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_2F_Text_StevenThankYouComeSeeMeAtHome, MSGBOX_DEFAULT closemessage fadescreen 1 setflag FLAG_DEFEATED_MAGMA_SPACE_CENTER setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN removeobject 4 - setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY + setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_MAGMA_NOTE clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN setvar VAR_STEVENS_HOUSE_STATE, 1 setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT @@ -324,142 +325,142 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 fadescreen 0 end -MossdeepCity_SpaceCenter_2F_EventScript_224131:: @ 8224131 +MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayer:: @ 8224131 switch VAR_FACING - case 1, MossdeepCity_SpaceCenter_2F_EventScript_22414D - case 3, MossdeepCity_SpaceCenter_2F_EventScript_224152 + case DIR_SOUTH, MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayerSouth + case DIR_WEST, MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayerWest return -MossdeepCity_SpaceCenter_2F_EventScript_22414D:: @ 822414D +MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayerSouth:: @ 822414D turnobject 4, DIR_NORTH return -MossdeepCity_SpaceCenter_2F_EventScript_224152:: @ 8224152 +MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayerWest:: @ 8224152 turnobject 4, DIR_EAST return -MossdeepCity_SpaceCenter_2F_EventScript_224157:: @ 8224157 - trainerbattle TRAINER_BATTLE_SET_TRAINER_A, TRAINER_MAXIE_3, 0, MossdeepCity_SpaceCenter_2F_Text_22487C, MossdeepCity_SpaceCenter_2F_Text_22487C +MossdeepCity_SpaceCenter_2F_EventScript_MaxieTrainer:: @ 8224157 + trainerbattle TRAINER_BATTLE_SET_TRAINER_A, TRAINER_MAXIE_3, 0, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand end -MossdeepCity_SpaceCenter_2F_EventScript_224166:: @ 8224166 - trainerbattle TRAINER_BATTLE_SET_TRAINER_B, TRAINER_TABITHA_1, 0, MossdeepCity_SpaceCenter_Text_2248AD, MossdeepCity_SpaceCenter_Text_2248AD +MossdeepCity_SpaceCenter_2F_EventScript_TabithaTrainer:: @ 8224166 + trainerbattle TRAINER_BATTLE_SET_TRAINER_B, TRAINER_TABITHA_1, 0, MossdeepCity_SpaceCenter_Text_TabithaDefeat, MossdeepCity_SpaceCenter_Text_TabithaDefeat end -MossdeepCity_SpaceCenter_2F_EventScript_224175:: @ 8224175 +MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall:: @ 8224175 lockall checkplayergender compare VAR_RESULT, MALE - call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_224193 + call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_MayRayquazaCall compare VAR_RESULT, FEMALE - call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22419A + call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_BrendanRayquazaCall closemessage clearflag FLAG_DEFEATED_MAGMA_SPACE_CENTER releaseall end -MossdeepCity_SpaceCenter_2F_EventScript_224193:: @ 8224193 - pokenavcall MossdeepCity_SpaceCenter_2F_Text_2B38C1 +MossdeepCity_SpaceCenter_2F_EventScript_MayRayquazaCall:: @ 8224193 + pokenavcall MossdeepCity_SpaceCenter_2F_Text_MayRayquazaCall waitmessage return -MossdeepCity_SpaceCenter_2F_EventScript_22419A:: @ 822419A - pokenavcall MossdeepCity_SpaceCenter_2F_Text_2B39C6 +MossdeepCity_SpaceCenter_2F_EventScript_BrendanRayquazaCall:: @ 822419A + pokenavcall MossdeepCity_SpaceCenter_2F_Text_BrendanRayquazaCall waitmessage return -MossdeepCity_SpaceCenter_2F_Text_2241A1: @ 82241A1 +MossdeepCity_SpaceCenter_2F_Text_MossdeepIdealForRockets: @ 82241A1 .string "MOSSDEEP has mainly sunny weather,\n" .string "and its winds are stable.\p" .string "It's an ideal location for launching\n" .string "rockets.$" -MossdeepCity_SpaceCenter_2F_Text_22420C: @ 822420C +MossdeepCity_SpaceCenter_2F_Text_WhyWouldMagmaStealRocketFuel: @ 822420C .string "Why would TEAM MAGMA want to steal\n" .string "our rocket fuel in the first place?$" -MossdeepCity_SpaceCenter_2F_Text_224253: @ 8224253 +MossdeepCity_SpaceCenter_2F_Text_WouldveLikedToBeAstronaut: @ 8224253 .string "If only I was a little younger, I would\n" .string "have liked being an astronaut…\p" .string "No… It's not too late!\n" .string "I can and will try!$" -MossdeepCity_SpaceCenter_2F_Text_2242C5: @ 82242C5 +MossdeepCity_SpaceCenter_2F_Text_MagmaCantGetAwayWithThis: @ 82242C5 .string "If TEAM MAGMA takes the rocket fuel,\n" .string "I won't be able to go to space!\p" .string "They can't be allowed to get away\n" .string "with such an outrage!$" -MossdeepCity_SpaceCenter_2F_Text_224342: @ 8224342 +MossdeepCity_SpaceCenter_2F_Text_WishOrdinaryPeopleCouldGoIntoSpace: @ 8224342 .string "I wish ordinary people could go into\n" .string "space one day…$" -MossdeepCity_SpaceCenter_2F_Text_224376: @ 8224376 +MossdeepCity_SpaceCenter_2F_Text_DoesMagmaWantToGoToSpace: @ 8224376 .string "TEAM MAGMA…\n" .string "Do they want to go to space, too?$" -MossdeepCity_SpaceCenter_2F_Text_2243A4: @ 82243A4 +MossdeepCity_SpaceCenter_2F_Text_YoureOutnumberedTakeUsOn: @ 82243A4 .string "What's wrong with you?\p" .string "You're outnumbered three to one,\n" .string "but you still want to take us on?$" -MossdeepCity_SpaceCenter_2F_Text_2243FE: @ 82243FE +MossdeepCity_SpaceCenter_2F_Text_GoodAnswer: @ 82243FE .string "Good answer!\n" .string "That's what a smart person'll do!$" -MossdeepCity_SpaceCenter_2F_Text_22442D: @ 822442D +MossdeepCity_SpaceCenter_2F_Text_Grunt34Intro: @ 822442D .string "A reckless go-getter, are you?\n" .string "Okay, I'll go first!$" -MossdeepCity_SpaceCenter_2F_Text_224461: @ 8224461 +MossdeepCity_SpaceCenter_2F_Text_Grunt34Defeat: @ 8224461 .string "I lost!\n" .string "But!$" -MossdeepCity_SpaceCenter_2F_Text_22446E: @ 822446E +MossdeepCity_SpaceCenter_2F_Text_Grunt35Intro: @ 822446E .string "It's too soon to be relieved!\n" .string "I'm up next!$" -MossdeepCity_SpaceCenter_2F_Text_224499: @ 8224499 +MossdeepCity_SpaceCenter_2F_Text_Grunt35Defeat: @ 8224499 .string "I lost, too!\n" .string "But!$" -MossdeepCity_SpaceCenter_2F_Text_2244AB: @ 82244AB +MossdeepCity_SpaceCenter_2F_Text_Grunt36Intro: @ 82244AB .string "I bet you want to take a break.\n" .string "But I'm not about to let you do that!$" -MossdeepCity_SpaceCenter_2F_Text_2244F1: @ 82244F1 +MossdeepCity_SpaceCenter_2F_Text_Grunt36Defeat: @ 82244F1 .string "We should've taken a break…\n" .string "That's what we should've done…$" -MossdeepCity_SpaceCenter_2F_Text_22452C: @ 822452C +MossdeepCity_SpaceCenter_2F_Text_Grunt35PostBattle: @ 822452C .string "Three of us here, and look at the sorry\n" .string "mess we got ourselves into.$" -MossdeepCity_SpaceCenter_2F_Text_224570: @ 8224570 +MossdeepCity_SpaceCenter_2F_Text_Grunt36PostBattle: @ 8224570 .string "We three losing like this…\n" .string "We look worse than usual by triple!$" -MossdeepCity_SpaceCenter_2F_Text_2245AF: @ 82245AF +MossdeepCity_SpaceCenter_2F_Text_Grunt34PostBattle: @ 82245AF .string "Are we being useful to our leader\n" .string "at all?$" -MossdeepCity_SpaceCenter_2F_Text_2245D9: @ 82245D9 +MossdeepCity_SpaceCenter_2F_Text_WellTakeCareOfYou: @ 82245D9 .string "Hehehe!\p" .string "We come all the way here to get some\n" .string "fuel, and we're interfered with again!\p" .string "If you're going to mess with us too,\n" .string "we'll take care of you at the same time!$" -MossdeepCity_SpaceCenter_2F_Text_22467B: @ 822467B +MossdeepCity_SpaceCenter_2F_Text_MaxieDontInterfere: @ 822467B .string "MAXIE: Clear out of the way!\n" .string "Don't you dare interfere!$" -MossdeepCity_SpaceCenter_2F_Text_2246B2: @ 82246B2 +MossdeepCity_SpaceCenter_2F_Text_StevenWhyStealRocketFuel: @ 82246B2 .string "STEVEN: TEAM MAGMA…\p" .string "What's the point of stealing rocket\n" .string "fuel?$" -MossdeepCity_SpaceCenter_2F_Text_2246F0: @ 82246F0 +MossdeepCity_SpaceCenter_2F_Text_MaxieUseFuelToEruptVolcano: @ 82246F0 .string "MAXIE: Fufufu… Since you're so\n" .string "curious, you deserve an explanation.\p" .string "We're going to jettison the entire\n" @@ -470,24 +471,24 @@ MossdeepCity_SpaceCenter_2F_Text_2246F0: @ 82246F0 .string "the volcano erupt!\p" .string "It will be savage!$" -MossdeepCity_SpaceCenter_2F_Text_2247FF: @ 82247FF +MossdeepCity_SpaceCenter_2F_Text_StevenAreYouReadyToBattle: @ 82247FF .string "STEVEN: {PLAYER}{KUN}!\n" .string "You're going to help me?\p" .string "Let's go into battle together!\n" .string "Are you ready?$" -MossdeepCity_SpaceCenter_2F_Text_224854: @ 8224854 +MossdeepCity_SpaceCenter_2F_Text_StevenHurryGetReadyQuickly: @ 8224854 .string "STEVEN: Then, hurry!\n" .string "Get ready quickly!$" -MossdeepCity_SpaceCenter_2F_Text_22487C: @ 822487C +MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand: @ 822487C .string "All I want…\n" .string "I just want to expand the land mass…$" -MossdeepCity_SpaceCenter_Text_2248AD: @ 82248AD +MossdeepCity_SpaceCenter_Text_TabithaDefeat: @ 82248AD .string "I'm with our leader…$" -MossdeepCity_SpaceCenter_2F_Text_2248C2: @ 82248C2 +MossdeepCity_SpaceCenter_2F_Text_MaxieWeFailedIsAquaAlsoMisguided: @ 82248C2 .string "MAXIE: We failed to make the volcano\n" .string "erupt…\p" .string "We failed to control GROUDON after\n" @@ -502,13 +503,13 @@ MossdeepCity_SpaceCenter_2F_Text_2248C2: @ 82248C2 .string "Then might TEAM AQUA's goal to expand\n" .string "the sea also be equally misguided?$" -MossdeepCity_SpaceCenter_2F_Text_2249DC: @ 82249DC +MossdeepCity_SpaceCenter_2F_Text_MaxieWeWillGiveUp: @ 82249DC .string "MAXIE: All right…\n" .string "We will give up on the fuel…\p" .string "There appear to be more important\n" .string "matters that I must examine…$" -MossdeepCity_SpaceCenter_2F_Text_224A4A: @ 8224A4A +MossdeepCity_SpaceCenter_2F_Text_StevenThankYouComeSeeMeAtHome: @ 8224A4A .string "STEVEN: Whew, that was too tense.\n" .string "{PLAYER}{KUN}, thank you.\p" .string "I have something to give you as\n" diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 62ddcf9ca..247bdc485 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -28,7 +28,7 @@ MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0 MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA lockall - applymovement 1, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 playse SE_PIN applymovement 1, Common_Movement_ExclamationMark @@ -73,7 +73,7 @@ MossdeepCity_StevensHouse_Movement_22283B: @ 822283B MossdeepCity_StevensHouse_EventScript_222841:: @ 8222841 lockall msgbox MossdeepCity_StevensHouse_Text_222B9E, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MossdeepCity_StevensHouse_EventScript_22285B goto MossdeepCity_StevensHouse_EventScript_222865 end @@ -90,30 +90,30 @@ MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865 goto_if_eq MossdeepCity_StevensHouse_EventScript_222895 compare VAR_RESULT, 1 goto_if_eq MossdeepCity_StevensHouse_EventScript_2228BD - goto MossdeepCity_StevensHouse_EventScript_273811 + goto Common_EventScript_NoMoreRoomForPokemon end MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895 call MossdeepCity_StevensHouse_EventScript_2228EB msgbox gText_NicknameThisPokemon, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MossdeepCity_StevensHouse_EventScript_222901 - call MossdeepCity_StevensHouse_EventScript_27378B - call Common_EventScript_NameReceivedPokemon + call Common_EventScript_GetGiftMonPartySlot + call Common_EventScript_NameReceivedPartyMon goto MossdeepCity_StevensHouse_EventScript_222901 end MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD call MossdeepCity_StevensHouse_EventScript_2228EB msgbox gText_NicknameThisPokemon, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MossdeepCity_StevensHouse_EventScript_2228E0 - call MossdeepCity_StevensHouse_EventScript_273797 + call Common_EventScript_NameReceivedBoxMon goto MossdeepCity_StevensHouse_EventScript_2228E0 end MossdeepCity_StevensHouse_EventScript_2228E0:: @ 82228E0 - call MossdeepCity_StevensHouse_EventScript_2737A0 + call Common_EventScript_TransferredToPC goto MossdeepCity_StevensHouse_EventScript_222901 end diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json index 2b19e7f8d..c0763b1bc 100644 --- a/data/maps/MtChimney/map.json +++ b/data/maps/MtChimney/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22EDD5", + "script": "MtChimney_EventScript_Archie", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22EE0B", + "script": "MtChimney_EventScript_Maxie", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "MtChimney_EventScript_22F06E", + "script": "MtChimney_EventScript_Tabitha", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0C0", + "script": "MtChimney_EventScript_BusyMagmaGrunt5", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0B7", + "script": "MtChimney_EventScript_BusyMagmaGrunt4", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F05C", + "script": "MtChimney_EventScript_BusyAquaGrunt2", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F053", + "script": "MtChimney_EventScript_BusyAquaGrunt1", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F065", + "script": "MtChimney_EventScript_BusyAquaGrunt3", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { @@ -128,7 +128,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22EEF3", + "script": "MtChimney_EventScript_LavaCookieLady", "flag": "FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY" }, { @@ -141,7 +141,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0C9", + "script": "MtChimney_EventScript_BusyMagmaGrunt6", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -154,7 +154,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0DB", + "script": "MtChimney_EventScript_AquaPoochyena", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { @@ -167,7 +167,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0D2", + "script": "MtChimney_EventScript_MagmaPoochyena", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -180,7 +180,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0A5", + "script": "MtChimney_EventScript_BusyMagmaGrunt2", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -193,7 +193,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0D2", + "script": "MtChimney_EventScript_MagmaPoochyena", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -206,7 +206,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0D2", + "script": "MtChimney_EventScript_MagmaPoochyena", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -219,7 +219,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0AE", + "script": "MtChimney_EventScript_BusyMagmaGrunt3", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -232,7 +232,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F09C", + "script": "MtChimney_EventScript_BusyMagmaGrunt1", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -245,7 +245,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0DB", + "script": "MtChimney_EventScript_AquaPoochyena", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { @@ -258,7 +258,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0D2", + "script": "MtChimney_EventScript_MagmaPoochyena", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -271,7 +271,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0DB", + "script": "MtChimney_EventScript_AquaPoochyena", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { @@ -284,7 +284,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0D2", + "script": "MtChimney_EventScript_MagmaPoochyena", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -297,7 +297,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MtChimney_EventScript_22F085", + "script": "MtChimney_EventScript_Grunt31", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -310,7 +310,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0DB", + "script": "MtChimney_EventScript_AquaPoochyena", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { @@ -323,7 +323,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtChimney_EventScript_22F0D2", + "script": "MtChimney_EventScript_MagmaPoochyena", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -336,7 +336,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MtChimney_EventScript_22F14A", + "script": "MtChimney_EventScript_Shelby", "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, { @@ -349,7 +349,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "MtChimney_EventScript_22F1AC", + "script": "MtChimney_EventScript_Melissa", "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, { @@ -362,7 +362,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MtChimney_EventScript_22F1C3", + "script": "MtChimney_EventScript_Sheila", "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, { @@ -375,7 +375,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MtChimney_EventScript_22F1DA", + "script": "MtChimney_EventScript_Shirley", "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, { @@ -388,7 +388,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MtChimney_EventScript_22F1F1", + "script": "MtChimney_EventScript_Grunt24", "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { @@ -401,7 +401,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "MtChimney_EventScript_22F208", + "script": "MtChimney_EventScript_Sawyer", "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" } ], @@ -443,7 +443,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MtChimney_EventScript_22F0E4" + "script": "MtChimney_EventScript_MeteoriteMachine" }, { "type": "sign", @@ -451,7 +451,7 @@ "y": 37, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MtChimney_EventScript_22F141" + "script": "MtChimney_EventScript_RouteSign" } ] }
\ No newline at end of file diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index c646fc1cf..411857e2d 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -1,5 +1,5 @@ MtChimney_MapScripts:: @ 822EDC1 - map_script MAP_SCRIPT_ON_RESUME, MtChimney_MapScript1_22EDD2 + map_script MAP_SCRIPT_ON_RESUME, MtChimney_OnResume map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_OnTransition .byte 0 @@ -7,15 +7,15 @@ MtChimney_OnTransition: @ 822EDCC setvar VAR_JAGGED_PASS_ASH_WEATHER, 1 end -MtChimney_MapScript1_22EDD2: @ 822EDD2 - setstepcallback 1 +MtChimney_OnResume: @ 822EDD2 + setstepcallback STEP_CB_ASH end -MtChimney_EventScript_22EDD5:: @ 822EDD5 +MtChimney_EventScript_Archie:: @ 822EDD5 lock faceplayer - call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EDF9 - call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EE02 + call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_ArchieGoStopTeamMagma + call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_ArchieBusyFighting closemessage applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 @@ -23,18 +23,18 @@ MtChimney_EventScript_22EDD5:: @ 822EDD5 release end -MtChimney_EventScript_22EDF9:: @ 822EDF9 - msgbox MtChimney_Text_22FAD2, MSGBOX_DEFAULT +MtChimney_EventScript_ArchieGoStopTeamMagma:: @ 822EDF9 + msgbox MtChimney_Text_ArchieGoStopTeamMagma, MSGBOX_DEFAULT return -MtChimney_EventScript_22EE02:: @ 822EE02 - msgbox MtChimney_Text_22FBC7, MSGBOX_DEFAULT +MtChimney_EventScript_ArchieBusyFighting:: @ 822EE02 + msgbox MtChimney_Text_ArchieIHaveMyHandsFull, MSGBOX_DEFAULT return -MtChimney_EventScript_22EE0B:: @ 822EE0B +MtChimney_EventScript_Maxie:: @ 822EE0B lockall playbgm MUS_MGM0, 0 - msgbox MtChimney_Text_22F26A, MSGBOX_DEFAULT + msgbox MtChimney_Text_MeteoriteWillActivateVolcano, MSGBOX_DEFAULT applymovement 2, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN @@ -42,9 +42,9 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B waitmovement 0 applymovement 2, Common_Movement_Delay48 waitmovement 0 - msgbox MtChimney_Text_22F32E, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_MAXIE_2, MtChimney_Text_22F5CF - msgbox MtChimney_Text_22F5F7, MSGBOX_DEFAULT + msgbox MtChimney_Text_MaxieIntro, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_MAXIE_2, MtChimney_Text_MaxieDefeat + msgbox MtChimney_Text_MaxieYouHaventSeenLastOfMagma, MSGBOX_DEFAULT closemessage delay 30 fadescreen 1 @@ -56,71 +56,71 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B fadescreen 0 setobjectxyperm 1, 10, 12 addobject 1 - compare VAR_FACING, 4 - call_if_eq MtChimney_EventScript_22EEC7 - compare VAR_FACING, 2 - call_if_eq MtChimney_EventScript_22EED2 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + compare VAR_FACING, DIR_EAST + call_if_eq MtChimney_EventScript_ArchieApproachPlayerEast + compare VAR_FACING, DIR_NORTH + call_if_eq MtChimney_EventScript_ArchieApproachPlayerNorth + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT + msgbox MtChimney_Text_ArchieThankYou, MSGBOX_DEFAULT closemessage - compare VAR_FACING, 4 - call_if_eq MtChimney_EventScript_22EEDD - compare VAR_FACING, 2 - call_if_eq MtChimney_EventScript_22EEE8 + compare VAR_FACING, DIR_EAST + call_if_eq MtChimney_EventScript_ArchieExitEast + compare VAR_FACING, DIR_NORTH + call_if_eq MtChimney_EventScript_ArchieExitNorth removeobject 1 setflag FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA setflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY - clearflag FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO + clearflag FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO setflag FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO clearflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY releaseall end -MtChimney_EventScript_22EEC7:: @ 822EEC7 - applymovement 1, MtChimney_Movement_22EF83 +MtChimney_EventScript_ArchieApproachPlayerEast:: @ 822EEC7 + applymovement 1, MtChimney_Movement_ArchieApproachPlayerEast waitmovement 0 return -MtChimney_EventScript_22EED2:: @ 822EED2 - applymovement 1, MtChimney_Movement_22EF94 +MtChimney_EventScript_ArchieApproachPlayerNorth:: @ 822EED2 + applymovement 1, MtChimney_Movement_ArchieApproachPlayerNorth waitmovement 0 return -MtChimney_EventScript_22EEDD:: @ 822EEDD - applymovement 1, MtChimney_Movement_22EF8B +MtChimney_EventScript_ArchieExitEast:: @ 822EEDD + applymovement 1, MtChimney_Movement_ArchieExitEast waitmovement 0 return -MtChimney_EventScript_22EEE8:: @ 822EEE8 - applymovement 1, MtChimney_Movement_22EF9C +MtChimney_EventScript_ArchieExitNorth:: @ 822EEE8 + applymovement 1, MtChimney_Movement_ArchieExitNorth waitmovement 0 return -MtChimney_EventScript_22EEF3:: @ 822EEF3 +MtChimney_EventScript_LavaCookieLady:: @ 822EEF3 lock faceplayer showmoneybox 0, 0, 0 - msgbox MtChimney_Text_22FE04, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq MtChimney_EventScript_22EF69 + msgbox MtChimney_Text_LavaCookiesJust200, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq MtChimney_EventScript_DeclineLavaCookie checkmoney 200, 0 - compare VAR_RESULT, 0 - goto_if_eq MtChimney_EventScript_22EF76 - msgbox MtChimney_Text_22FE4D, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq MtChimney_EventScript_NotEnoughMoney + msgbox MtChimney_Text_ThankYouDear, MSGBOX_DEFAULT checkitemspace ITEM_LAVA_COOKIE, 1 - compare VAR_RESULT, 1 - call_if_eq MtChimney_EventScript_22EF5E + compare VAR_RESULT, TRUE + call_if_eq MtChimney_EventScript_TakeMoney giveitem_std ITEM_LAVA_COOKIE - compare VAR_RESULT, 0 - goto_if_eq MtChimney_EventScript_22EF51 + compare VAR_RESULT, FALSE + goto_if_eq MtChimney_EventScript_BagIsFull hidemoneybox nop nop release end -MtChimney_EventScript_22EF51:: @ 822EF51 +MtChimney_EventScript_BagIsFull:: @ 822EF51 msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT hidemoneybox nop @@ -128,28 +128,28 @@ MtChimney_EventScript_22EF51:: @ 822EF51 release end -MtChimney_EventScript_22EF5E:: @ 822EF5E +MtChimney_EventScript_TakeMoney:: @ 822EF5E takemoney 200, 0 updatemoneybox 0, 0 return -MtChimney_EventScript_22EF69:: @ 822EF69 - msgbox MtChimney_Text_22FE9B, MSGBOX_DEFAULT +MtChimney_EventScript_DeclineLavaCookie:: @ 822EF69 + msgbox MtChimney_Text_OhFineThen, MSGBOX_DEFAULT hidemoneybox nop nop release end -MtChimney_EventScript_22EF76:: @ 822EF76 - msgbox MtChimney_Text_22FE5E, MSGBOX_DEFAULT +MtChimney_EventScript_NotEnoughMoney:: @ 822EF76 + msgbox MtChimney_Text_YouveNotGotTheMoney, MSGBOX_DEFAULT hidemoneybox nop nop release end -MtChimney_Movement_22EF83: @ 822EF83 +MtChimney_Movement_ArchieApproachPlayerEast: @ 822EF83 walk_up walk_up walk_up @@ -159,7 +159,7 @@ MtChimney_Movement_22EF83: @ 822EF83 walk_right step_end -MtChimney_Movement_22EF8B: @ 822EF8B +MtChimney_Movement_ArchieExitEast: @ 822EF8B walk_left walk_down walk_down @@ -170,7 +170,7 @@ MtChimney_Movement_22EF8B: @ 822EF8B walk_down step_end -MtChimney_Movement_22EF94: @ 822EF94 +MtChimney_Movement_ArchieApproachPlayerNorth: @ 822EF94 walk_up walk_up walk_up @@ -180,7 +180,7 @@ MtChimney_Movement_22EF94: @ 822EF94 walk_right step_end -MtChimney_Movement_22EF9C: @ 822EF9C +MtChimney_Movement_ArchieExitNorth: @ 822EF9C walk_left walk_left walk_down @@ -192,6 +192,7 @@ MtChimney_Movement_22EF9C: @ 822EF9C walk_down step_end +@ Unused MtChimney_Movement_22EFA6: @ 822EFA6 walk_down walk_down @@ -212,6 +213,7 @@ MtChimney_Movement_22EFA6: @ 822EFA6 walk_down step_end +@ Unused MtChimney_Movement_22EFB8: @ 822EFB8 walk_down walk_down @@ -223,6 +225,7 @@ MtChimney_Movement_22EFB8: @ 822EFB8 walk_down step_end +@ Unused MtChimney_Movement_22EFC1: @ 822EFC1 walk_right walk_down @@ -240,6 +243,7 @@ MtChimney_Movement_22EFC1: @ 822EFC1 walk_down step_end +@ Unused MtChimney_Movement_22EFD0: @ 822EFD0 walk_fast_down walk_fast_down @@ -267,6 +271,7 @@ MtChimney_Movement_22EFD0: @ 822EFD0 walk_down step_end +@ Unused MtChimney_Movement_22EFE9: @ 822EFE9 delay_16 delay_16 @@ -280,6 +285,7 @@ MtChimney_Movement_22EFE9: @ 822EFE9 walk_down step_end +@ Unused MtChimney_Movement_22EFF4: @ 822EFF4 delay_16 walk_left @@ -298,6 +304,7 @@ MtChimney_Movement_22EFF4: @ 822EFF4 walk_down step_end +@ Unused MtChimney_Movement_22F004: @ 822F004 delay_16 walk_left @@ -317,6 +324,7 @@ MtChimney_Movement_22F004: @ 822F004 walk_down step_end +@ Unused MtChimney_Movement_22F015: @ 822F015 delay_16 walk_down @@ -327,6 +335,7 @@ MtChimney_Movement_22F015: @ 822F015 walk_in_place_fastest_down step_end +@ Unused MtChimney_Movement_22F01D: @ 822F01D walk_down walk_down @@ -343,10 +352,12 @@ MtChimney_Movement_22F01D: @ 822F01D walk_down step_end +@ Unused MtChimney_Movement_22F02B: @ 822F02B walk_down step_end +@ Unused MtChimney_Movement_22F02D: @ 822F02D walk_down walk_down @@ -357,6 +368,7 @@ MtChimney_Movement_22F02D: @ 822F02D walk_down step_end +@ Unused MtChimney_Movement_22F035: @ 822F035 delay_16 delay_16 @@ -369,6 +381,7 @@ MtChimney_Movement_22F035: @ 822F035 walk_down step_end +@ Unused MtChimney_Movement_22F03F: @ 822F03F delay_16 delay_16 @@ -382,6 +395,7 @@ MtChimney_Movement_22F03F: @ 822F03F walk_down step_end +@ Unused MtChimney_Movement_22F04A: @ 822F04A lock_facing_direction walk_fast_left @@ -389,163 +403,164 @@ MtChimney_Movement_22F04A: @ 822F04A face_right step_end +@ Unused MtChimney_Movement_22F04F: @ 822F04F walk_left walk_in_place_fastest_right delay_16 step_end -MtChimney_EventScript_22F053:: @ 822F053 - msgbox MtChimney_Text_22FD1F, MSGBOX_SIGN +MtChimney_EventScript_BusyAquaGrunt1:: @ 822F053 + msgbox MtChimney_Text_MagmaOutnumbersUs, MSGBOX_SIGN end -MtChimney_EventScript_22F05C:: @ 822F05C - msgbox MtChimney_Text_22FD5B, MSGBOX_SIGN +MtChimney_EventScript_BusyAquaGrunt2:: @ 822F05C + msgbox MtChimney_Text_LessHabitatForWaterPokemon, MSGBOX_SIGN end -MtChimney_EventScript_22F065:: @ 822F065 - msgbox MtChimney_Text_22FDA1, MSGBOX_SIGN +MtChimney_EventScript_BusyAquaGrunt3:: @ 822F065 + msgbox MtChimney_Text_MagmasNameSimilar, MSGBOX_SIGN end -MtChimney_EventScript_22F06E:: @ 822F06E - trainerbattle_single TRAINER_TABITHA_2, MtChimney_Text_22F6AA, MtChimney_Text_22F72C - msgbox MtChimney_Text_22F76D, MSGBOX_AUTOCLOSE +MtChimney_EventScript_Tabitha:: @ 822F06E + trainerbattle_single TRAINER_TABITHA_2, MtChimney_Text_TabithaIntro, MtChimney_Text_TabithaDefeat + msgbox MtChimney_Text_TabithaPostBattle, MSGBOX_AUTOCLOSE end -MtChimney_EventScript_22F085:: @ 822F085 - trainerbattle_single TRAINER_GRUNT_31, MtChimney_Text_22F7A2, MtChimney_Text_22F83A - msgbox MtChimney_Text_22F859, MSGBOX_AUTOCLOSE +MtChimney_EventScript_Grunt31:: @ 822F085 + trainerbattle_single TRAINER_GRUNT_31, MtChimney_Text_Grunt31Intro, MtChimney_Text_Grunt31Defeat + msgbox MtChimney_Text_Grunt31PostBattle, MSGBOX_AUTOCLOSE end -MtChimney_EventScript_22F09C:: @ 822F09C - msgbox MtChimney_Text_22F978, MSGBOX_SIGN +MtChimney_EventScript_BusyMagmaGrunt1:: @ 822F09C + msgbox MtChimney_Text_TeamAquaAlwaysMessingWithPlans, MSGBOX_SIGN end -MtChimney_EventScript_22F0A5:: @ 822F0A5 - msgbox MtChimney_Text_22F9B2, MSGBOX_SIGN +MtChimney_EventScript_BusyMagmaGrunt2:: @ 822F0A5 + msgbox MtChimney_Text_MeteoritesPackAmazingPower, MSGBOX_SIGN end -MtChimney_EventScript_22F0AE:: @ 822F0AE - msgbox MtChimney_Text_22F9D1, MSGBOX_SIGN +MtChimney_EventScript_BusyMagmaGrunt3:: @ 822F0AE + msgbox MtChimney_Text_YouBetterNotMessWithUs, MSGBOX_SIGN end -MtChimney_EventScript_22F0B7:: @ 822F0B7 - msgbox MtChimney_Text_22FA2F, MSGBOX_SIGN +MtChimney_EventScript_BusyMagmaGrunt4:: @ 822F0B7 + msgbox MtChimney_Text_AquasNameSimilar, MSGBOX_SIGN end -MtChimney_EventScript_22F0C0:: @ 822F0C0 - msgbox MtChimney_Text_22FA8B, MSGBOX_SIGN +MtChimney_EventScript_BusyMagmaGrunt5:: @ 822F0C0 + msgbox MtChimney_Text_DouseThemInFire, MSGBOX_SIGN end -MtChimney_EventScript_22F0C9:: @ 822F0C9 - msgbox MtChimney_Text_22FAA5, MSGBOX_SIGN +MtChimney_EventScript_BusyMagmaGrunt6:: @ 822F0C9 + msgbox MtChimney_Text_KeepMakingMoreLand, MSGBOX_SIGN end -MtChimney_EventScript_22F0D2:: @ 822F0D2 - msgbox MtChimney_Text_22FACB, MSGBOX_SIGN +MtChimney_EventScript_MagmaPoochyena:: @ 822F0D2 + msgbox MtChimney_Text_Bufoh, MSGBOX_SIGN end -MtChimney_EventScript_22F0DB:: @ 822F0DB - msgbox MtChimney_Text_22FDFC, MSGBOX_SIGN +MtChimney_EventScript_AquaPoochyena:: @ 822F0DB + msgbox MtChimney_Text_Bushaa, MSGBOX_SIGN end -MtChimney_EventScript_22F0E4:: @ 822F0E4 +MtChimney_EventScript_MeteoriteMachine:: @ 822F0E4 lockall - goto_if_unset FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, MtChimney_EventScript_22F137 - goto_if_set FLAG_RECEIVED_METEORITE, MtChimney_EventScript_22F12D - msgbox MtChimney_Text_22FF12, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq MtChimney_EventScript_22F123 - msgbox MtChimney_Text_22FF66, MSGBOX_DEFAULT + goto_if_unset FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, MtChimney_EventScript_MachineOn + goto_if_set FLAG_RECEIVED_METEORITE, MtChimney_EventScript_MachineOff + msgbox MtChimney_Text_RemoveTheMeteorite, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq MtChimney_EventScript_LeaveMeteoriteAlone + msgbox MtChimney_Text_PlayerRemovedMeteorite, MSGBOX_DEFAULT giveitem_std ITEM_METEORITE setflag FLAG_RECEIVED_METEORITE releaseall end -MtChimney_EventScript_22F123:: @ 822F123 - msgbox MtChimney_Text_22FF9C, MSGBOX_DEFAULT +MtChimney_EventScript_LeaveMeteoriteAlone:: @ 822F123 + msgbox MtChimney_Text_PlayerLeftMeteorite, MSGBOX_DEFAULT releaseall end -MtChimney_EventScript_22F12D:: @ 822F12D - msgbox MtChimney_Text_22FFC0, MSGBOX_DEFAULT +MtChimney_EventScript_MachineOff:: @ 822F12D + msgbox MtChimney_Text_MachineMakesNoResponse, MSGBOX_DEFAULT releaseall end -MtChimney_EventScript_22F137:: @ 822F137 - msgbox MtChimney_Text_22FEAA, MSGBOX_DEFAULT +MtChimney_EventScript_MachineOn:: @ 822F137 + msgbox MtChimney_Text_MetoriteFittedOnMachine, MSGBOX_DEFAULT releaseall end -MtChimney_EventScript_22F141:: @ 822F141 - msgbox MtChimney_Text_22FFFA, MSGBOX_SIGN +MtChimney_EventScript_RouteSign:: @ 822F141 + msgbox MtChimney_Text_RouteSign, MSGBOX_SIGN end -MtChimney_EventScript_22F14A:: @ 822F14A - trainerbattle_single TRAINER_SHELBY_1, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176 +MtChimney_EventScript_Shelby:: @ 822F14A + trainerbattle_single TRAINER_SHELBY_1, MtChimney_Text_ShelbyIntro, MtChimney_Text_ShelbyDefeat, MtChimney_EventScript_DefeatedShelby specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq MtChimney_EventScript_22F195 - msgbox MtChimney_Text_2300A2, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq MtChimney_EventScript_RematchShelby + msgbox MtChimney_Text_ShelbyPostBattle, MSGBOX_DEFAULT release end -MtChimney_EventScript_22F176:: @ 822F176 - special sub_80B4808 +MtChimney_EventScript_DefeatedShelby:: @ 822F176 + special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox MtChimney_Text_2300E3, MSGBOX_DEFAULT + msgbox MtChimney_Text_ShelbyRegister, MSGBOX_DEFAULT register_matchcall TRAINER_SHELBY_1 release end -MtChimney_EventScript_22F195:: @ 822F195 - trainerbattle_rematch TRAINER_SHELBY_1, MtChimney_Text_230153, MtChimney_Text_2301BB - msgbox MtChimney_Text_2301E7, MSGBOX_AUTOCLOSE +MtChimney_EventScript_RematchShelby:: @ 822F195 + trainerbattle_rematch TRAINER_SHELBY_1, MtChimney_Text_ShelbyRematchIntro, MtChimney_Text_ShelbyRematchDefeat + msgbox MtChimney_Text_ShelbyPostRematch, MSGBOX_AUTOCLOSE end -MtChimney_EventScript_22F1AC:: @ 822F1AC - trainerbattle_single TRAINER_MELISSA, MtChimney_Text_23022A, MtChimney_Text_23026D - msgbox MtChimney_Text_230292, MSGBOX_AUTOCLOSE +MtChimney_EventScript_Melissa:: @ 822F1AC + trainerbattle_single TRAINER_MELISSA, MtChimney_Text_MelissaIntro, MtChimney_Text_MelissaDefeat + msgbox MtChimney_Text_MelissaPostBattle, MSGBOX_AUTOCLOSE end -MtChimney_EventScript_22F1C3:: @ 822F1C3 - trainerbattle_single TRAINER_SHEILA, MtChimney_Text_2302BD, MtChimney_Text_230304 - msgbox MtChimney_Text_23033A, MSGBOX_AUTOCLOSE +MtChimney_EventScript_Sheila:: @ 822F1C3 + trainerbattle_single TRAINER_SHEILA, MtChimney_Text_SheilaIntro, MtChimney_Text_SheilaDefeat + msgbox MtChimney_Text_SheilaPostBattle, MSGBOX_AUTOCLOSE end -MtChimney_EventScript_22F1DA:: @ 822F1DA - trainerbattle_single TRAINER_SHIRLEY, MtChimney_Text_2303DF, MtChimney_Text_230436 - msgbox MtChimney_Text_230463, MSGBOX_AUTOCLOSE +MtChimney_EventScript_Shirley:: @ 822F1DA + trainerbattle_single TRAINER_SHIRLEY, MtChimney_Text_ShirleyIntro, MtChimney_Text_ShirleyDefeat + msgbox MtChimney_Text_ShirleyPostBattle, MSGBOX_AUTOCLOSE end -MtChimney_EventScript_22F1F1:: @ 822F1F1 - trainerbattle_single TRAINER_GRUNT_24, MtChimney_Text_22F8B6, MtChimney_Text_22F921 - msgbox MtChimney_Text_22F93A, MSGBOX_AUTOCLOSE +MtChimney_EventScript_Grunt24:: @ 822F1F1 + trainerbattle_single TRAINER_GRUNT_24, MtChimney_Text_Grunt24Intro, MtChimney_Text_Grunt24Defeat + msgbox MtChimney_Text_Grunt24PostBattle, MSGBOX_AUTOCLOSE end -MtChimney_EventScript_22F208:: @ 822F208 - trainerbattle_single TRAINER_SAWYER_1, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234 +MtChimney_EventScript_Sawyer:: @ 822F208 + trainerbattle_single TRAINER_SAWYER_1, MtChimney_Text_SawyerIntro, MtChimney_Text_SawyerDefeat, MtChimney_EventScript_SawyerDefeated specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq MtChimney_EventScript_22F253 - msgbox MtChimney_Text_230519, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq MtChimney_EventScript_SawyerRematch + msgbox MtChimney_Text_SawyerPostBattle, MSGBOX_DEFAULT release end -MtChimney_EventScript_22F234:: @ 822F234 - special sub_80B4808 +MtChimney_EventScript_SawyerDefeated:: @ 822F234 + special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox MtChimney_Text_230557, MSGBOX_DEFAULT + msgbox MtChimney_Text_SawyerRegister, MSGBOX_DEFAULT register_matchcall TRAINER_SAWYER_1 release end -MtChimney_EventScript_22F253:: @ 822F253 - trainerbattle_rematch TRAINER_SAWYER_1, MtChimney_Text_23059C, MtChimney_Text_2305E3 - msgbox MtChimney_Text_230614, MSGBOX_AUTOCLOSE +MtChimney_EventScript_SawyerRematch:: @ 822F253 + trainerbattle_rematch TRAINER_SAWYER_1, MtChimney_Text_SawyerRematchIntro, MtChimney_Text_SawyerRematchDefeat + msgbox MtChimney_Text_SawyerPostRematch, MSGBOX_AUTOCLOSE end -MtChimney_Text_22F26A: @ 822F26A +MtChimney_Text_MeteoriteWillActivateVolcano: @ 822F26A .string "The power contained in the METEORITE…\p" .string "By amplifying its power with this\n" .string "machine, MT. CHIMNEY's volcanic\l" @@ -554,7 +569,7 @@ MtChimney_Text_22F26A: @ 822F26A .string "the crater and…\l" .string "Fufufu…$" -MtChimney_Text_22F32E: @ 822F32E +MtChimney_Text_MaxieIntro: @ 822F32E .string "MAXIE: Hm?\n" .string "Who are you?\p" .string "… … … … … …\n" @@ -582,11 +597,11 @@ MtChimney_Text_22F32E: @ 822F32E .string "I'll teach you the consequences of\l" .string "meddling in our grand design!$" -MtChimney_Text_22F5CF: @ 822F5CF +MtChimney_Text_MaxieDefeat: @ 822F5CF .string "What?!\p" .string "I, MAXIE, was caught off guard?!$" -MtChimney_Text_22F5F7: @ 822F5F7 +MtChimney_Text_MaxieYouHaventSeenLastOfMagma: @ 822F5F7 .string "MAXIE: But, enough.\n" .string "I will back off this time.\p" .string "But don't think that this is the last\n" @@ -595,81 +610,81 @@ MtChimney_Text_22F5F7: @ 822F5F7 .string "Even without the METEORITE, if we\n" .string "obtain that ORB… Fufufu…$" -MtChimney_Text_22F6AA: @ 822F6AA +MtChimney_Text_TabithaIntro: @ 822F6AA .string "Hehehe!\p" .string "So you've come all the way here!\p" .string "But you're too late!\n" .string "I've already delivered the METEORITE\l" .string "from METEOR FALLS to the BOSS!$" -MtChimney_Text_22F72C: @ 822F72C +MtChimney_Text_TabithaDefeat: @ 822F72C .string "Hehehe…\p" .string "Even though I've lost, if our leader\n" .string "awakens that thing…$" -MtChimney_Text_22F76D: @ 822F76D +MtChimney_Text_TabithaPostBattle: @ 822F76D .string "BOSS, hurry!\n" .string "Give it the METEORITE's energy!\p" .string "Hehehe…$" -MtChimney_Text_22F7A2: @ 822F7A2 +MtChimney_Text_Grunt31Intro: @ 822F7A2 .string "We of TEAM MAGMA are working hard for\n" .string "everyone's sake.\p" .string "Like, if that thing's power made more\n" .string "land, there'd be more places to live.\p" .string "Everyone'd be happy!$" -MtChimney_Text_22F83A: @ 822F83A +MtChimney_Text_Grunt31Defeat: @ 822F83A .string "Hunh?\n" .string "What do you mean I lost?$" -MtChimney_Text_22F859: @ 822F859 +MtChimney_Text_Grunt31PostBattle: @ 822F859 .string "Our BOSS says, “It will make everyone\n" .string "happy.”\p" .string "But why does everyone keep getting\n" .string "in our way?$" -MtChimney_Text_22F8B6: @ 822F8B6 +MtChimney_Text_Grunt24Intro: @ 822F8B6 .string "If there were more land, I'd be able\n" .string "to get a big house of my own!\p" .string "I'm going to build it on hardened lava!$" -MtChimney_Text_22F921: @ 822F921 +MtChimney_Text_Grunt24Defeat: @ 822F921 .string "My dream of a big house…$" -MtChimney_Text_22F93A: @ 822F93A +MtChimney_Text_Grunt24PostBattle: @ 822F93A .string "A kid like you, you ought to be\n" .string "splashing about in the waves!$" -MtChimney_Text_22F978: @ 822F978 +MtChimney_Text_TeamAquaAlwaysMessingWithPlans: @ 822F978 .string "That annoying TEAM AQUA…\n" .string "They always mess with our plans!$" -MtChimney_Text_22F9B2: @ 822F9B2 +MtChimney_Text_MeteoritesPackAmazingPower: @ 822F9B2 .string "METEORITES pack amazing power!$" -MtChimney_Text_22F9D1: @ 822F9D1 +MtChimney_Text_YouBetterNotMessWithUs: @ 822F9D1 .string "You'd better not mess with us!\p" .string "We're trying to awaken that thing\n" .string "for the benefit of everyone!$" -MtChimney_Text_22FA2F: @ 822FA2F +MtChimney_Text_AquasNameSimilar: @ 822FA2F .string "We're TEAM MAGMA!\p" .string "They're TEAM AQUA!\p" .string "It totally annoys me that they'd\n" .string "use a name like ours!$" -MtChimney_Text_22FA8B: @ 822FA8B +MtChimney_Text_DouseThemInFire: @ 822FA8B .string "Yeah!\n" .string "Douse them in fire!$" -MtChimney_Text_22FAA5: @ 822FAA5 +MtChimney_Text_KeepMakingMoreLand: @ 822FAA5 .string "We're going to keep making more land!$" -MtChimney_Text_22FACB: @ 822FACB +MtChimney_Text_Bufoh: @ 822FACB .string "Bufoh!$" -MtChimney_Text_22FAD2: @ 822FAD2 +MtChimney_Text_ArchieGoStopTeamMagma: @ 822FAD2 .string "ARCHIE: Grr, {PLAYER}!\n" .string "I should've guessed you'd show up!\p" .string "See for yourself what the fanatics\n" @@ -679,14 +694,14 @@ MtChimney_Text_22FAD2: @ 822FAD2 .string "Doing something like that will cause\n" .string "the volcano's eruption!$" -MtChimney_Text_22FBC7: @ 822FBC7 +MtChimney_Text_ArchieIHaveMyHandsFull: @ 822FBC7 .string "ARCHIE: Grrr…\p" .string "I want to stop that MAXIE,\n" .string "but I can't!\p" .string "Not when I have my hands full battling\n" .string "three opponents at once!$" -MtChimney_Text_22FC3D: @ 822FC3D +MtChimney_Text_ArchieThankYou: @ 822FC3D .string "ARCHIE: {PLAYER}!\n" .string "Thank you!\p" .string "With your help, we thwarted TEAM\n" @@ -698,161 +713,161 @@ MtChimney_Text_22FC3D: @ 822FC3D .string "our pursuit of TEAM MAGMA.\p" .string "{PLAYER}, we shall meet again!$" -MtChimney_Text_22FD1F: @ 822FD1F +MtChimney_Text_MagmaOutnumbersUs: @ 822FD1F .string "Darn… TEAM MAGMA outnumbers us!\n" .string "We can't keep up with them!$" -MtChimney_Text_22FD5B: @ 822FD5B +MtChimney_Text_LessHabitatForWaterPokemon: @ 822FD5B .string "If they expand the land, there'll be\n" .string "less habitats for WATER POKéMON!$" -MtChimney_Text_22FDA1: @ 822FDA1 +MtChimney_Text_MagmasNameSimilar: @ 822FDA1 .string "We're TEAM AQUA!\p" .string "They're TEAM MAGMA!\p" .string "It burns me up that they'd use such\n" .string "a confusing name!$" -MtChimney_Text_22FDFC: @ 822FDFC +MtChimney_Text_Bushaa: @ 822FDFC .string "Bushaa!$" -MtChimney_Text_22FE04: @ 822FE04 +MtChimney_Text_LavaCookiesJust200: @ 822FE04 .string "LAVA COOKIES are MT. CHIMNEY's local\n" .string "specialty.\p" .string "Try one. It's just ¥200.$" -MtChimney_Text_22FE4D: @ 822FE4D +MtChimney_Text_ThankYouDear: @ 822FE4D .string "Thank you, dear!$" -MtChimney_Text_22FE5E: @ 822FE5E +MtChimney_Text_YouveNotGotTheMoney: @ 822FE5E .string "Oh, dear. You can't buy a thing if\n" .string "you've not got the money.$" -MtChimney_Text_22FE9B: @ 822FE9B +MtChimney_Text_OhFineThen: @ 822FE9B .string "Oh, fine then.$" -MtChimney_Text_22FEAA: @ 822FEAA +MtChimney_Text_MetoriteFittedOnMachine: @ 822FEAA .string "A METEORITE is fitted on a mysterious\n" .string "machine…\p" .string "The machine seems to be storing\n" .string "energy in the METEORITE.$" -MtChimney_Text_22FF12: @ 822FF12 +MtChimney_Text_RemoveTheMeteorite: @ 822FF12 .string "A METEORITE is fitted on a mysterious\n" .string "machine…\p" .string "Do you want to remove the METEORITE?$" -MtChimney_Text_22FF66: @ 822FF66 +MtChimney_Text_PlayerRemovedMeteorite: @ 822FF66 .string "{PLAYER} removed the METEORITE from\n" .string "the mysterious machine.$" -MtChimney_Text_22FF9C: @ 822FF9C +MtChimney_Text_PlayerLeftMeteorite: @ 822FF9C .string "{PLAYER} left the METEORITE where\n" .string "it was.$" -MtChimney_Text_22FFC0: @ 822FFC0 +MtChimney_Text_MachineMakesNoResponse: @ 822FFC0 .string "This mysterious machine…\n" .string "It makes no response whatsoever.$" -MtChimney_Text_22FFFA: @ 822FFFA +MtChimney_Text_RouteSign: @ 822FFFA .string "{DOWN_ARROW} JAGGED PATH\n" .string "LAVARIDGE TOWN AHEAD$" -MtChimney_Text_23001D: @ 823001D +MtChimney_Text_ShelbyIntro: @ 823001D .string "I've been to the hot springs and\n" .string "refreshed my tired bones.\l" .string "Right now I'm feeling strong!$" -MtChimney_Text_230076: @ 8230076 +MtChimney_Text_ShelbyDefeat: @ 8230076 .string "Oh, my goodness.\n" .string "Now, aren't you something!$" -MtChimney_Text_2300A2: @ 82300A2 +MtChimney_Text_ShelbyPostBattle: @ 82300A2 .string "Well, well, I've lost. I can't call\n" .string "myself an EXPERT now, can I?$" -MtChimney_Text_2300E3: @ 82300E3 +MtChimney_Text_ShelbyRegister: @ 82300E3 .string "Thank you, child. It was fun, as if\n" .string "I were battling my own grandchild.\p" .string "Please, come see me again for\n" .string "a rematch.$" -MtChimney_Text_230153: @ 8230153 +MtChimney_Text_ShelbyRematchIntro: @ 8230153 .string "If you can mesh your heart with those\n" .string "of your POKéMON, why, you should be\l" .string "able to achieve great things.$" -MtChimney_Text_2301BB: @ 82301BB +MtChimney_Text_ShelbyRematchDefeat: @ 82301BB .string "Oh, my goodness.\n" .string "Now, aren't you something!$" -MtChimney_Text_2301E7: @ 82301E7 +MtChimney_Text_ShelbyPostRematch: @ 82301E7 .string "Perhaps your heart has become one\n" .string "with the hearts of your POKéMON.$" -MtChimney_Text_23022A: @ 823022A +MtChimney_Text_MelissaIntro: @ 823022A .string "I've got the fire in me, baby.\n" .string "I can't stand it! I have to battle!$" -MtChimney_Text_23026D: @ 823026D +MtChimney_Text_MelissaDefeat: @ 823026D .string "Ooh, that was a scorching-hot match!$" -MtChimney_Text_230292: @ 8230292 +MtChimney_Text_MelissaPostBattle: @ 8230292 .string "The heat of MT. CHIMNEY warms\n" .string "me up, baby!$" -MtChimney_Text_2302BD: @ 82302BD +MtChimney_Text_SheilaIntro: @ 82302BD .string "I've finally made it to MT. CHIMNEY.\n" .string "I want to make my POKéMON battle!$" -MtChimney_Text_230304: @ 8230304 +MtChimney_Text_SheilaDefeat: @ 8230304 .string "The way you battle…\n" .string "It's like a MT. CHIMNEY eruption!$" -MtChimney_Text_23033A: @ 823033A +MtChimney_Text_SheilaPostBattle: @ 823033A .string "Like I said, I've finally made it to\n" .string "MT. CHIMNEY. It would be a shame if\l" .string "I only do a little sightseeing…\p" .string "I want to get in some battles and buy\n" .string "COOKIES as souvenirs.$" -MtChimney_Text_2303DF: @ 82303DF +MtChimney_Text_ShirleyIntro: @ 82303DF .string "Since I bathed in the hot springs,\n" .string "I've been feeling great!\l" .string "I'm sure I'm going to win!$" -MtChimney_Text_230436: @ 8230436 +MtChimney_Text_ShirleyDefeat: @ 8230436 .string "Yowch!\n" .string "I'm getting a chill out of the water.$" -MtChimney_Text_230463: @ 8230463 +MtChimney_Text_ShirleyPostBattle: @ 8230463 .string "I'll have to take another dip in the\n" .string "hot springs. Want to join me?\p" .string "Just joking!$" -MtChimney_Text_2304B3: @ 82304B3 +MtChimney_Text_SawyerIntro: @ 82304B3 .string "This is one fine mountain! Plenty of\n" .string "hot people around for company!$" -MtChimney_Text_2304F7: @ 82304F7 +MtChimney_Text_SawyerDefeat: @ 82304F7 .string "Oh, you're a real firebrand, too!$" -MtChimney_Text_230519: @ 8230519 +MtChimney_Text_SawyerPostBattle: @ 8230519 .string "I think I need a dip in LAVARIDGE\n" .string "HOT SPRING with the locals!$" -MtChimney_Text_230557: @ 8230557 +MtChimney_Text_SawyerRegister: @ 8230557 .string "I like little fireballs like you.\n" .string "Let me register you in my POKéNAV.$" -MtChimney_Text_23059C: @ 823059C +MtChimney_Text_SawyerRematchIntro: @ 823059C .string "I'm happily surrounded by hot people\n" .string "around these parts. I won't lose!$" -MtChimney_Text_2305E3: @ 82305E3 +MtChimney_Text_SawyerRematchDefeat: @ 82305E3 .string "Gosh, you're still the same\n" .string "firebrand as before!$" -MtChimney_Text_230614: @ 8230614 +MtChimney_Text_SawyerPostRematch: @ 8230614 .string "Actually, it really is hot here.\n" .string "I'm overdressed for these parts.$" diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 444f62d9f..588a4c3f4 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -32,9 +32,9 @@ MtChimney_CableCarStation_EventScript_22AC4B:: @ 822AC4B lock faceplayer msgbox MtChimney_CableCarStation_Text_22ACB9, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq MtChimney_CableCarStation_EventScript_22AC6C - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq MtChimney_CableCarStation_EventScript_22AC9B end @@ -46,7 +46,7 @@ MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C waitmovement 0 setvar VAR_0x8004, 1 setvar VAR_CABLE_CAR_STATION_STATE, 2 - incrementgamestat 48 + incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp special CableCar waitstate diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index 150c08df4..be98ac8e7 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -1,11 +1,11 @@ MtPyre_2F_MapScripts:: @ 82310FB - map_script MAP_SCRIPT_ON_FRAME_TABLE, MtPyre_2F_MapScript2_2A8327 - map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_2F_MapScript1_2A8331 - map_script MAP_SCRIPT_ON_RESUME, MtPyre_2F_MapScript1_23110B + map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole + map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround + map_script MAP_SCRIPT_ON_RESUME, MtPyre_2F_SetHoleWarp .byte 0 -MtPyre_2F_MapScript1_23110B: @ 823110B - setstepcallback 7 +MtPyre_2F_SetHoleWarp: @ 823110B + setstepcallback STEP_CB_CRACKED_FLOOR setholewarp MAP_MT_PYRE_1F, 255, 0, 0 end diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc index 558ab9999..3b84a581b 100644 --- a/data/maps/MtPyre_3F/scripts.inc +++ b/data/maps/MtPyre_3F/scripts.inc @@ -21,7 +21,7 @@ MtPyre_3F_EventScript_231781:: @ 8231781 end MtPyre_3F_EventScript_2317AD:: @ 82317AD - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox MtPyre_3F_Text_231A49, MSGBOX_DEFAULT register_matchcall TRAINER_GABRIELLE_1 diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index f59edd7b1..bc975e942 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -11,7 +11,7 @@ MtPyre_6F_EventScript_231D3B:: @ 8231D3B end MtPyre_6F_EventScript_231D67:: @ 8231D67 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox MtPyre_6F_Text_231E43, MSGBOX_DEFAULT register_matchcall TRAINER_VALERIE_1 diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index 78780ba19..93bc0b755 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtPyre_Summit_EventScript_23213C", + "script": "MtPyre_Summit_EventScript_OldMan", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MtPyre_Summit_EventScript_2321A2", + "script": "MtPyre_Summit_EventScript_OldLady", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MtPyre_Summit_EventScript_2323FD", + "script": "MtPyre_Summit_EventScript_Grunt17", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MtPyre_Summit_EventScript_232414", + "script": "MtPyre_Summit_EventScript_Grunt18", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MtPyre_Summit_EventScript_23242B", + "script": "MtPyre_Summit_EventScript_Grunt19", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MtPyre_Summit_EventScript_232442", + "script": "MtPyre_Summit_EventScript_Grunt29", "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, { @@ -150,7 +150,7 @@ "elevation": 3, "var": "VAR_MT_PYRE_STATE", "var_value": "0", - "script": "MtPyre_Summit_EventScript_232018" + "script": "MtPyre_Summit_EventScript_TeamAquaTrigger0" }, { "type": "trigger", @@ -159,7 +159,7 @@ "elevation": 3, "var": "VAR_MT_PYRE_STATE", "var_value": "0", - "script": "MtPyre_Summit_EventScript_232024" + "script": "MtPyre_Summit_EventScript_TeamAquaTrigger1" }, { "type": "trigger", @@ -168,7 +168,7 @@ "elevation": 3, "var": "VAR_MT_PYRE_STATE", "var_value": "0", - "script": "MtPyre_Summit_EventScript_232030" + "script": "MtPyre_Summit_EventScript_TeamAquaTrigger2" }, { "type": "trigger", @@ -177,7 +177,7 @@ "elevation": 3, "var": "VAR_MT_PYRE_STATE", "var_value": "2", - "script": "MtPyre_Summit_EventScript_2321EC" + "script": "MtPyre_Summit_EventScript_ArchieMaxieTrigger0" }, { "type": "trigger", @@ -186,7 +186,7 @@ "elevation": 3, "var": "VAR_MT_PYRE_STATE", "var_value": "2", - "script": "MtPyre_Summit_EventScript_2321F8" + "script": "MtPyre_Summit_EventScript_ArchieMaxieTrigger1" }, { "type": "trigger", @@ -195,7 +195,7 @@ "elevation": 3, "var": "VAR_MT_PYRE_STATE", "var_value": "2", - "script": "MtPyre_Summit_EventScript_232204" + "script": "MtPyre_Summit_EventScript_ArchieMaxieTrigger2" } ], "bg_events": [ diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index eb61c4c2d..1a9e5d31c 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -4,46 +4,46 @@ MtPyre_Summit_MapScripts:: @ 8231FF7 MtPyre_Summit_OnTransition: @ 8231FFD compare VAR_MT_PYRE_STATE, 2 - call_if_eq MtPyre_Summit_EventScript_232009 + call_if_eq MtPyre_Summit_EventScript_SetArchieMaxiePositions end -MtPyre_Summit_EventScript_232009:: @ 8232009 +MtPyre_Summit_EventScript_SetArchieMaxiePositions:: @ 8232009 setobjectxyperm 8, 23, 6 setobjectxyperm 2, 22, 6 end -MtPyre_Summit_EventScript_232018:: @ 8232018 +MtPyre_Summit_EventScript_TeamAquaTrigger0:: @ 8232018 lockall setvar VAR_0x8008, 0 - goto MtPyre_Summit_EventScript_23203C + goto MtPyre_Summit_EventScript_TeamAquaExits end -MtPyre_Summit_EventScript_232024:: @ 8232024 +MtPyre_Summit_EventScript_TeamAquaTrigger1:: @ 8232024 lockall setvar VAR_0x8008, 1 - goto MtPyre_Summit_EventScript_23203C + goto MtPyre_Summit_EventScript_TeamAquaExits end -MtPyre_Summit_EventScript_232030:: @ 8232030 +MtPyre_Summit_EventScript_TeamAquaTrigger2:: @ 8232030 lockall setvar VAR_0x8008, 2 - goto MtPyre_Summit_EventScript_23203C + goto MtPyre_Summit_EventScript_TeamAquaExits end -MtPyre_Summit_EventScript_23203C:: @ 823203C +MtPyre_Summit_EventScript_TeamAquaExits:: @ 823203C playbgm MUS_AQA_0, 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 - applymovement 2, Common_Movement_WalkInPlaceDown + applymovement 2, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 50 compare VAR_0x8008, 0 - call_if_eq MtPyre_Summit_EventScript_2320E0 + call_if_eq MtPyre_Summit_EventScript_ArchieFacePlayer0 compare VAR_0x8008, 1 - call_if_eq MtPyre_Summit_EventScript_2320EB + call_if_eq MtPyre_Summit_EventScript_ArchieFacePlayer1 compare VAR_0x8008, 2 - call_if_eq MtPyre_Summit_EventScript_2320EC - msgbox MtPyre_Summit_Text_23281A, MSGBOX_DEFAULT + call_if_eq MtPyre_Summit_EventScript_ArchieFacePlayer2 + msgbox MtPyre_Summit_Text_ArchieWeGotTheOrbLetsGo, MSGBOX_DEFAULT closemessage fadescreen 1 removeobject 2 @@ -58,164 +58,165 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C delay 20 setvar VAR_MT_PYRE_STATE, 1 compare VAR_0x8008, 0 - call_if_eq MtPyre_Summit_EventScript_2320F7 + call_if_eq MtPyre_Summit_EventScript_OldLadyApproachPlayer0 compare VAR_0x8008, 1 - call_if_eq MtPyre_Summit_EventScript_23210C + call_if_eq MtPyre_Summit_EventScript_OldLadyApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq MtPyre_Summit_EventScript_232117 - msgbox MtPyre_Summit_Text_23290E, MSGBOX_DEFAULT + call_if_eq MtPyre_Summit_EventScript_OldLadyApproachPlayer2 + msgbox MtPyre_Summit_Text_BothOrbsTakenMagmaLeftThis, MSGBOX_DEFAULT giveitem_std ITEM_MAGMA_EMBLEM setflag FLAG_RECEIVED_RED_OR_BLUE_ORB setflag FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD releaseall end -MtPyre_Summit_EventScript_2320E0:: @ 82320E0 - applymovement 2, MtPyre_Summit_Movement_232136 +MtPyre_Summit_EventScript_ArchieFacePlayer0:: @ 82320E0 + applymovement 2, MtPyre_Summit_Movement_ArchieFacePlayer0 waitmovement 0 return -MtPyre_Summit_EventScript_2320EB:: @ 82320EB +@ Archie is already facing player +MtPyre_Summit_EventScript_ArchieFacePlayer1:: @ 82320EB return -MtPyre_Summit_EventScript_2320EC:: @ 82320EC - applymovement 2, MtPyre_Summit_Movement_232139 +MtPyre_Summit_EventScript_ArchieFacePlayer2:: @ 82320EC + applymovement 2, MtPyre_Summit_Movement_ArchieFacePlayer2 waitmovement 0 return -MtPyre_Summit_EventScript_2320F7:: @ 82320F7 - applymovement 3, MtPyre_Summit_Movement_23212C +MtPyre_Summit_EventScript_OldLadyApproachPlayer0:: @ 82320F7 + applymovement 3, MtPyre_Summit_Movement_OldLadyApproachPlayer0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -MtPyre_Summit_EventScript_23210C:: @ 823210C - applymovement 3, MtPyre_Summit_Movement_232130 +MtPyre_Summit_EventScript_OldLadyApproachPlayer1:: @ 823210C + applymovement 3, MtPyre_Summit_Movement_OldLadyApproachPlayer1 waitmovement 0 return -MtPyre_Summit_EventScript_232117:: @ 8232117 - applymovement 3, MtPyre_Summit_Movement_232132 +MtPyre_Summit_EventScript_OldLadyApproachPlayer2:: @ 8232117 + applymovement 3, MtPyre_Summit_Movement_OldLadyApproachPlayer2 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -MtPyre_Summit_Movement_23212C: @ 823212C +MtPyre_Summit_Movement_OldLadyApproachPlayer0: @ 823212C walk_down walk_down walk_in_place_fastest_left step_end -MtPyre_Summit_Movement_232130: @ 8232130 +MtPyre_Summit_Movement_OldLadyApproachPlayer1: @ 8232130 walk_down step_end -MtPyre_Summit_Movement_232132: @ 8232132 +MtPyre_Summit_Movement_OldLadyApproachPlayer2: @ 8232132 walk_down walk_down walk_in_place_fastest_right step_end -MtPyre_Summit_Movement_232136: @ 8232136 +MtPyre_Summit_Movement_ArchieFacePlayer0: @ 8232136 walk_left walk_in_place_fastest_down step_end -MtPyre_Summit_Movement_232139: @ 8232139 +MtPyre_Summit_Movement_ArchieFacePlayer2: @ 8232139 walk_right walk_in_place_fastest_down step_end -MtPyre_Summit_EventScript_23213C:: @ 823213C +MtPyre_Summit_EventScript_OldMan:: @ 823213C lock faceplayer - goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, MtPyre_Summit_EventScript_232167 - msgbox MtPyre_Summit_Text_232E0C, MSGBOX_YESNO - compare VAR_RESULT, 1 - call_if_eq MtPyre_Summit_EventScript_232187 - compare VAR_RESULT, 0 - call_if_eq MtPyre_Summit_EventScript_232190 + goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, MtPyre_Summit_EventScript_OldManAfterRayquaza + msgbox MtPyre_Summit_Text_WillYouHearOutMyTale, MSGBOX_YESNO + compare VAR_RESULT, YES + call_if_eq MtPyre_Summit_EventScript_OldManTale + compare VAR_RESULT, NO + call_if_eq MtPyre_Summit_EventScript_DeclineOldManTale release end -MtPyre_Summit_EventScript_232167:: @ 8232167 - msgbox MtPyre_Summit_Text_2331A6, MSGBOX_YESNO - compare VAR_RESULT, 1 - call_if_eq MtPyre_Summit_EventScript_232199 - compare VAR_RESULT, 0 - call_if_eq MtPyre_Summit_EventScript_232190 +MtPyre_Summit_EventScript_OldManAfterRayquaza:: @ 8232167 + msgbox MtPyre_Summit_Text_HearTheNewLegendOfHoenn, MSGBOX_YESNO + compare VAR_RESULT, YES + call_if_eq MtPyre_Summit_EventScript_OldManNewTale + compare VAR_RESULT, NO + call_if_eq MtPyre_Summit_EventScript_DeclineOldManTale release end -MtPyre_Summit_EventScript_232187:: @ 8232187 - msgbox MtPyre_Summit_Text_232F27, MSGBOX_DEFAULT +MtPyre_Summit_EventScript_OldManTale:: @ 8232187 + msgbox MtPyre_Summit_Text_GroudonKyogreTale, MSGBOX_DEFAULT return -MtPyre_Summit_EventScript_232190:: @ 8232190 - msgbox MtPyre_Summit_Text_233162, MSGBOX_DEFAULT +MtPyre_Summit_EventScript_DeclineOldManTale:: @ 8232190 + msgbox MtPyre_Summit_Text_WellThatTooIsFine, MSGBOX_DEFAULT return -MtPyre_Summit_EventScript_232199:: @ 8232199 - msgbox MtPyre_Summit_Text_23325D, MSGBOX_DEFAULT +MtPyre_Summit_EventScript_OldManNewTale:: @ 8232199 + msgbox MtPyre_Summit_Text_HoennTrioTale, MSGBOX_DEFAULT return -MtPyre_Summit_EventScript_2321A2:: @ 82321A2 +MtPyre_Summit_EventScript_OldLady:: @ 82321A2 lock faceplayer - goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_2321E2 + goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_OldLadyAfterOrbsReturned compare VAR_MT_PYRE_STATE, 3 - call_if_ge MtPyre_Summit_EventScript_2321CB - goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_2321D8 - msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT + call_if_ge MtPyre_Summit_EventScript_OldLadyOrbsReturned + goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_OldLadyLegendariesAwake + msgbox MtPyre_Summit_Text_OrbsHaveBeenTaken, MSGBOX_DEFAULT release end -MtPyre_Summit_EventScript_2321CB:: @ 82321CB - msgbox MtPyre_Summit_Text_232CA6, MSGBOX_DEFAULT +MtPyre_Summit_EventScript_OldLadyOrbsReturned:: @ 82321CB + msgbox MtPyre_Summit_Text_ThoseTwoMenReturnedOrbs, MSGBOX_DEFAULT setflag FLAG_RETURNED_RED_OR_BLUE_ORB release end -MtPyre_Summit_EventScript_2321D8:: @ 82321D8 - msgbox MtPyre_Summit_Text_232B4F, MSGBOX_DEFAULT +MtPyre_Summit_EventScript_OldLadyLegendariesAwake:: @ 82321D8 + msgbox MtPyre_Summit_Text_GroudonKyogreAwakened, MSGBOX_DEFAULT release end -MtPyre_Summit_EventScript_2321E2:: @ 82321E2 - msgbox MtPyre_Summit_Text_232D1E, MSGBOX_DEFAULT +MtPyre_Summit_EventScript_OldLadyAfterOrbsReturned:: @ 82321E2 + msgbox MtPyre_Summit_Text_SuperAncientPokemonTaughtUs, MSGBOX_DEFAULT release end -MtPyre_Summit_EventScript_2321EC:: @ 82321EC +MtPyre_Summit_EventScript_ArchieMaxieTrigger0:: @ 82321EC lockall setvar VAR_0x8008, 0 - goto MtPyre_Summit_EventScript_232210 + goto MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs end -MtPyre_Summit_EventScript_2321F8:: @ 82321F8 +MtPyre_Summit_EventScript_ArchieMaxieTrigger1:: @ 82321F8 lockall setvar VAR_0x8008, 1 - goto MtPyre_Summit_EventScript_232210 + goto MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs end -MtPyre_Summit_EventScript_232204:: @ 8232204 +MtPyre_Summit_EventScript_ArchieMaxieTrigger2:: @ 8232204 lockall setvar VAR_0x8008, 2 - goto MtPyre_Summit_EventScript_232210 + goto MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs end -MtPyre_Summit_EventScript_232210:: @ 8232210 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp +MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs:: @ 8232210 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 60 compare VAR_0x8008, 0 - call_if_eq MtPyre_Summit_EventScript_2322C4 + call_if_eq MtPyre_Summit_EventScript_ArchieMaxieBeginExit0 compare VAR_0x8008, 1 - call_if_eq MtPyre_Summit_EventScript_2322DD + call_if_eq MtPyre_Summit_EventScript_ArchieMaxieBeginExit1 compare VAR_0x8008, 2 - call_if_eq MtPyre_Summit_EventScript_2322F6 + call_if_eq MtPyre_Summit_EventScript_ArchieMaxieBeginExit2 playse SE_PIN applymovement 8, Common_Movement_ExclamationMark waitmovement 0 @@ -223,22 +224,22 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 waitmovement 0 delay 30 compare VAR_0x8008, 0 - call_if_eq MtPyre_Summit_EventScript_23230F + call_if_eq MtPyre_Summit_EventScript_MaxieApproachPlayer0 compare VAR_0x8008, 1 - call_if_eq MtPyre_Summit_EventScript_232328 + call_if_eq MtPyre_Summit_EventScript_MaxieApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq MtPyre_Summit_EventScript_232341 - msgbox MtPyre_Summit_Text_233183, MSGBOX_DEFAULT + call_if_eq MtPyre_Summit_EventScript_MaxieApproachPlayer2 + msgbox MtPyre_Summit_Text_MaxieSilence, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if_eq MtPyre_Summit_EventScript_23235A + call_if_eq MtPyre_Summit_EventScript_MaxieApproachArchie0 compare VAR_0x8008, 1 - call_if_eq MtPyre_Summit_EventScript_232376 + call_if_eq MtPyre_Summit_EventScript_MaxieApproachArchie1 compare VAR_0x8008, 2 - call_if_eq MtPyre_Summit_EventScript_232392 + call_if_eq MtPyre_Summit_EventScript_MaxieApproachArchie2 delay 30 - applymovement 2, MtPyre_Summit_Movement_2323B6 - applymovement 8, MtPyre_Summit_Movement_2323BD + applymovement 2, MtPyre_Summit_Movement_MaxieExit + applymovement 8, MtPyre_Summit_Movement_ArchieExit waitmovement 0 removeobject 2 removeobject 8 @@ -246,85 +247,85 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 releaseall end -MtPyre_Summit_EventScript_2322C4:: @ 82322C4 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323C4 - applymovement 2, MtPyre_Summit_Movement_2323B6 - applymovement 8, MtPyre_Summit_Movement_2323BD +MtPyre_Summit_EventScript_ArchieMaxieBeginExit0:: @ 82322C4 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit0 + applymovement 2, MtPyre_Summit_Movement_MaxieExit + applymovement 8, MtPyre_Summit_Movement_ArchieExit waitmovement 0 return -MtPyre_Summit_EventScript_2322DD:: @ 82322DD - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323CB - applymovement 2, MtPyre_Summit_Movement_2323B6 - applymovement 8, MtPyre_Summit_Movement_2323BD +MtPyre_Summit_EventScript_ArchieMaxieBeginExit1:: @ 82322DD + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit1 + applymovement 2, MtPyre_Summit_Movement_MaxieExit + applymovement 8, MtPyre_Summit_Movement_ArchieExit waitmovement 0 return -MtPyre_Summit_EventScript_2322F6:: @ 82322F6 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323D2 - applymovement 2, MtPyre_Summit_Movement_2323B6 - applymovement 8, MtPyre_Summit_Movement_2323BD +MtPyre_Summit_EventScript_ArchieMaxieBeginExit2:: @ 82322F6 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit2 + applymovement 2, MtPyre_Summit_Movement_MaxieExit + applymovement 8, MtPyre_Summit_Movement_ArchieExit waitmovement 0 return -MtPyre_Summit_EventScript_23230F:: @ 823230F - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323AE - applymovement 2, MtPyre_Summit_Movement_2323E7 - applymovement 8, MtPyre_Summit_Movement_2323D8 +MtPyre_Summit_EventScript_MaxieApproachPlayer0:: @ 823230F + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie0 + applymovement 2, MtPyre_Summit_Movement_ArchieWatchMaxie + applymovement 8, MtPyre_Summit_Movement_MaxieApproachPlayer0 waitmovement 0 return -MtPyre_Summit_EventScript_232328:: @ 8232328 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323B2 - applymovement 2, MtPyre_Summit_Movement_2323E7 - applymovement 8, MtPyre_Summit_Movement_2323DD +MtPyre_Summit_EventScript_MaxieApproachPlayer1:: @ 8232328 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie + applymovement 2, MtPyre_Summit_Movement_ArchieWatchMaxie + applymovement 8, MtPyre_Summit_Movement_MaxieApproachPlayer1 waitmovement 0 return -MtPyre_Summit_EventScript_232341:: @ 8232341 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323B2 - applymovement 2, MtPyre_Summit_Movement_2323E7 - applymovement 8, MtPyre_Summit_Movement_2323E2 +MtPyre_Summit_EventScript_MaxieApproachPlayer2:: @ 8232341 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie + applymovement 2, MtPyre_Summit_Movement_ArchieWatchMaxie + applymovement 8, MtPyre_Summit_Movement_MaxieApproachPlayer2 waitmovement 0 return -MtPyre_Summit_EventScript_23235A:: @ 823235A - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA - applymovement 8, MtPyre_Summit_Movement_2323ED +MtPyre_Summit_EventScript_MaxieApproachArchie0:: @ 823235A + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie + applymovement 8, MtPyre_Summit_Movement_MaxieApproachArchie0 waitmovement 0 - applymovement 2, Common_Movement_WalkInPlaceRight + applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -MtPyre_Summit_EventScript_232376:: @ 8232376 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA - applymovement 8, MtPyre_Summit_Movement_2323F3 +MtPyre_Summit_EventScript_MaxieApproachArchie1:: @ 8232376 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie + applymovement 8, MtPyre_Summit_Movement_MaxieApproachArchie1 waitmovement 0 - applymovement 2, Common_Movement_WalkInPlaceRight + applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -MtPyre_Summit_EventScript_232392:: @ 8232392 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA - applymovement 8, MtPyre_Summit_Movement_2323F8 +MtPyre_Summit_EventScript_MaxieApproachArchie2:: @ 8232392 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie + applymovement 8, MtPyre_Summit_Movement_MaxieApproachArchie2 waitmovement 0 - applymovement 2, Common_Movement_WalkInPlaceRight + applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -MtPyre_Summit_Movement_2323AE: @ 82323AE +MtPyre_Summit_Movement_PlayerFaceMaxie0: @ 82323AE delay_16 delay_16 walk_in_place_fastest_right step_end -MtPyre_Summit_Movement_2323B2: @ 82323B2 +MtPyre_Summit_Movement_PlayerFaceMaxie: @ 82323B2 delay_16 delay_16 walk_in_place_fastest_left step_end -MtPyre_Summit_Movement_2323B6: @ 82323B6 +MtPyre_Summit_Movement_MaxieExit: @ 82323B6 walk_down walk_down walk_down @@ -333,7 +334,7 @@ MtPyre_Summit_Movement_2323B6: @ 82323B6 walk_down step_end -MtPyre_Summit_Movement_2323BD: @ 82323BD +MtPyre_Summit_Movement_ArchieExit: @ 82323BD walk_down walk_down walk_down @@ -342,7 +343,7 @@ MtPyre_Summit_Movement_2323BD: @ 82323BD walk_down step_end -MtPyre_Summit_Movement_2323C4: @ 82323C4 +MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit0: @ 82323C4 delay_16 delay_8 walk_left @@ -351,7 +352,7 @@ MtPyre_Summit_Movement_2323C4: @ 82323C4 walk_in_place_fastest_down step_end -MtPyre_Summit_Movement_2323CB: @ 82323CB +MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit1: @ 82323CB delay_16 delay_8 walk_right @@ -360,7 +361,7 @@ MtPyre_Summit_Movement_2323CB: @ 82323CB walk_in_place_fastest_down step_end -MtPyre_Summit_Movement_2323D2: @ 82323D2 +MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit2: @ 82323D2 delay_16 delay_8 walk_in_place_fastest_left @@ -368,38 +369,38 @@ MtPyre_Summit_Movement_2323D2: @ 82323D2 walk_in_place_fastest_down step_end -MtPyre_Summit_Movement_2323D8: @ 82323D8 +MtPyre_Summit_Movement_MaxieApproachPlayer0: @ 82323D8 walk_up walk_up walk_up walk_left step_end -MtPyre_Summit_Movement_2323DD: @ 82323DD +MtPyre_Summit_Movement_MaxieApproachPlayer1: @ 82323DD walk_up walk_up walk_up walk_in_place_fastest_right step_end -MtPyre_Summit_Movement_2323E2: @ 82323E2 +MtPyre_Summit_Movement_MaxieApproachPlayer2: @ 82323E2 walk_up walk_up walk_up walk_in_place_fastest_right step_end -MtPyre_Summit_Movement_2323E7: @ 82323E7 +MtPyre_Summit_Movement_ArchieWatchMaxie: @ 82323E7 delay_16 walk_in_place_fastest_up step_end -MtPyre_Summit_Movement_2323EA: @ 82323EA +MtPyre_Summit_Movement_PlayerWatchMaxie: @ 82323EA delay_16 walk_in_place_fastest_down step_end -MtPyre_Summit_Movement_2323ED: @ 82323ED +MtPyre_Summit_Movement_MaxieApproachArchie0: @ 82323ED walk_down walk_right walk_down @@ -407,54 +408,54 @@ MtPyre_Summit_Movement_2323ED: @ 82323ED walk_in_place_fastest_left step_end -MtPyre_Summit_Movement_2323F3: @ 82323F3 +MtPyre_Summit_Movement_MaxieApproachArchie1: @ 82323F3 walk_down walk_down walk_down walk_in_place_fastest_left step_end -MtPyre_Summit_Movement_2323F8: @ 82323F8 +MtPyre_Summit_Movement_MaxieApproachArchie2: @ 82323F8 walk_down walk_down walk_down walk_in_place_fastest_left step_end -MtPyre_Summit_EventScript_2323FD:: @ 82323FD - trainerbattle_single TRAINER_GRUNT_17, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0 - msgbox MtPyre_Summit_Text_2324E0, MSGBOX_AUTOCLOSE +MtPyre_Summit_EventScript_Grunt17:: @ 82323FD + trainerbattle_single TRAINER_GRUNT_17, MtPyre_Summit_Text_Grunt17Intro, MtPyre_Summit_Text_Grunt17Defeat + msgbox MtPyre_Summit_Text_Grunt17PostBattle, MSGBOX_AUTOCLOSE end -MtPyre_Summit_EventScript_232414:: @ 8232414 - trainerbattle_single TRAINER_GRUNT_18, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0 - msgbox MtPyre_Summit_Text_2325E4, MSGBOX_AUTOCLOSE +MtPyre_Summit_EventScript_Grunt18:: @ 8232414 + trainerbattle_single TRAINER_GRUNT_18, MtPyre_Summit_Text_Grunt18Intro, MtPyre_Summit_Text_Grunt18Defeat + msgbox MtPyre_Summit_Text_Grunt18PostBattle, MSGBOX_AUTOCLOSE end -MtPyre_Summit_EventScript_23242B:: @ 823242B - trainerbattle_single TRAINER_GRUNT_19, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678 - msgbox MtPyre_Summit_Text_2326B3, MSGBOX_AUTOCLOSE +MtPyre_Summit_EventScript_Grunt19:: @ 823242B + trainerbattle_single TRAINER_GRUNT_19, MtPyre_Summit_Text_Grunt19Intro, MtPyre_Summit_Text_Grunt19Defeat + msgbox MtPyre_Summit_Text_Grunt19PostBattle, MSGBOX_AUTOCLOSE end -MtPyre_Summit_EventScript_232442:: @ 8232442 - trainerbattle_single TRAINER_GRUNT_29, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A - msgbox MtPyre_Summit_Text_2327D8, MSGBOX_AUTOCLOSE +MtPyre_Summit_EventScript_Grunt29:: @ 8232442 + trainerbattle_single TRAINER_GRUNT_29, MtPyre_Summit_Text_Grunt29Intro, MtPyre_Summit_Text_Grunt29Defeat + msgbox MtPyre_Summit_Text_Grunt29PostBattle, MSGBOX_AUTOCLOSE end -MtPyre_Summit_Text_232459: @ 8232459 +MtPyre_Summit_Text_Grunt17Intro: @ 8232459 .string "No! Those TEAM MAGMA goons got\n" .string "here ahead of us!\p" .string "We can't fall behind!$" -MtPyre_Summit_Text_2324A0: @ 82324A0 +MtPyre_Summit_Text_Grunt17Defeat: @ 82324A0 .string "I thought you were one of the MAGMAS\n" .string "who happened to come back…$" -MtPyre_Summit_Text_2324E0: @ 82324E0 +MtPyre_Summit_Text_Grunt17PostBattle: @ 82324E0 .string "Yeah, so you are strong…\n" .string "But there're a lot of us!$" -MtPyre_Summit_Text_232513: @ 8232513 +MtPyre_Summit_Text_Grunt18Intro: @ 8232513 .string "Hah!\n" .string "Too bad for you!\p" .string "If you came earlier, you only would've\n" @@ -462,46 +463,46 @@ MtPyre_Summit_Text_232513: @ 8232513 .string "But since you arrived now, you have\n" .string "to take on us toughies!$" -MtPyre_Summit_Text_2325B0: @ 82325B0 +MtPyre_Summit_Text_Grunt18Defeat: @ 82325B0 .string "Urgh… I should've let you take on\n" .string "TEAM MAGMA first…$" -MtPyre_Summit_Text_2325E4: @ 82325E4 +MtPyre_Summit_Text_Grunt18PostBattle: @ 82325E4 .string "You don't know anything!\n" .string "So why are you messing with us?$" -MtPyre_Summit_Text_23261D: @ 823261D +MtPyre_Summit_Text_Grunt19Intro: @ 823261D .string "You…\n" .string "We saw you at MT. CHIMNEY.\p" .string "You don't belong to either TEAM,\n" .string "so why would you be here?$" -MtPyre_Summit_Text_232678: @ 8232678 +MtPyre_Summit_Text_Grunt19Defeat: @ 8232678 .string "If you're going to mess with anyone,\n" .string "let it be TEAM MAGMA…$" -MtPyre_Summit_Text_2326B3: @ 82326B3 +MtPyre_Summit_Text_Grunt19PostBattle: @ 82326B3 .string "Heh, it doesn't matter!\n" .string "We bought ourselves some time!\p" .string "The BOSS should have snatched what\n" .string "he was after!$" -MtPyre_Summit_Text_23271B: @ 823271B +MtPyre_Summit_Text_Grunt29Intro: @ 823271B .string "Oh, I know!\n" .string "You tried to join TEAM MAGMA,\l" .string "but they wouldn't have you!\p" .string "Well, don't think that we'll let you\n" .string "join our TEAM AQUA!$" -MtPyre_Summit_Text_23279A: @ 823279A +MtPyre_Summit_Text_Grunt29Defeat: @ 823279A .string "If you want to join TEAM AQUA that\n" .string "badly, we can consider it…$" -MtPyre_Summit_Text_2327D8: @ 82327D8 +MtPyre_Summit_Text_Grunt29PostBattle: @ 82327D8 .string "We have a great combination going\n" .string "with us members and our leader.$" -MtPyre_Summit_Text_23281A: @ 823281A +MtPyre_Summit_Text_ArchieWeGotTheOrbLetsGo: @ 823281A .string "ARCHIE: TEAM MAGMA's MAXIE got ahead\n" .string "of us, but we also got what we wanted.\p" .string "The RED ORB preserved at MT. PYRE…\n" @@ -511,7 +512,7 @@ MtPyre_Summit_Text_23281A: @ 823281A .string "Okay, TEAM!\n" .string "We're pulling out!$" -MtPyre_Summit_Text_23290E: @ 823290E +MtPyre_Summit_Text_BothOrbsTakenMagmaLeftThis: @ 823290E .string "Oh, no…\n" .string "This cannot happen…\p" .string "Not only the BLUE ORB, but even\n" @@ -531,13 +532,13 @@ MtPyre_Summit_Text_23290E: @ 823290E .string "I would like you to have it.\n" .string "Perhaps it will be useful in some way.$" -MtPyre_Summit_Text_232AD8: @ 8232AD8 +MtPyre_Summit_Text_OrbsHaveBeenTaken: @ 8232AD8 .string "The BLUE ORB and RED ORB taken by\n" .string "those sinister men…\p" .string "They must never be apart…\n" .string "I fear something terrible will happen…$" -MtPyre_Summit_Text_232B4F: @ 8232B4F +MtPyre_Summit_Text_GroudonKyogreAwakened: @ 8232B4F .string "Oh, my goodness…\p" .string "You say that both GROUDON and KYOGRE\n" .string "have been awakened?\p" @@ -551,13 +552,13 @@ MtPyre_Summit_Text_232B4F: @ 8232B4F .string "It could be a human, or perhaps\n" .string "a POKéMON, but no one knows.$" -MtPyre_Summit_Text_232CA6: @ 8232CA6 +MtPyre_Summit_Text_ThoseTwoMenReturnedOrbs: @ 8232CA6 .string "The two men who took the ORBS came\n" .string "back to return them on their own.\p" .string "Those men…\n" .string "Perhaps they are not so evil after all…$" -MtPyre_Summit_Text_232D1E: @ 8232D1E +MtPyre_Summit_Text_SuperAncientPokemonTaughtUs: @ 8232D1E .string "The embodiments of the land, sea,\n" .string "and the sky…\p" .string "That is said to be the identities of\n" @@ -568,7 +569,7 @@ MtPyre_Summit_Text_232D1E: @ 8232D1E .string "The super-ancient POKéMON have\n" .string "taught us that…$" -MtPyre_Summit_Text_232E0C: @ 8232E0C +MtPyre_Summit_Text_WillYouHearOutMyTale: @ 8232E0C .string "MT. PYRE is where we calm the spirits\n" .string "of POKéMON that have passed on…\p" .string "This is a high place where one can\n" @@ -579,7 +580,7 @@ MtPyre_Summit_Text_232E0C: @ 8232E0C .string "Will you hear out my tale? A tale long\n" .string "told in the HOENN region?$" -MtPyre_Summit_Text_232F27: @ 8232F27 +MtPyre_Summit_Text_GroudonKyogreTale: @ 8232F27 .string "It happened long, long ago…\p" .string "The world was wracked by a ferocious\n" .string "clash between the POKéMON of the land\l" @@ -599,16 +600,16 @@ MtPyre_Summit_Text_232F27: @ 8232F27 .string "the sea where eventually they\l" .string "disappeared…$" -MtPyre_Summit_Text_233162: @ 8233162 +MtPyre_Summit_Text_WellThatTooIsFine: @ 8233162 .string "I see…\n" .string "Well, that, too, is fine…$" -MtPyre_Summit_Text_233183: @ 8233183 +MtPyre_Summit_Text_MaxieSilence: @ 8233183 .string "MAXIE: {PLAYER}…\p" .string "… … … … … …\n" .string "… … … … … …$" -MtPyre_Summit_Text_2331A6: @ 82331A6 +MtPyre_Summit_Text_HearTheNewLegendOfHoenn: @ 82331A6 .string "It is my role to pass on the legends\n" .string "of HOENN to future generations.\p" .string "And the crisis that just ended in\n" @@ -616,7 +617,7 @@ MtPyre_Summit_Text_2331A6: @ 82331A6 .string "Have you the time to hear the new\n" .string "legend of HOENN?$" -MtPyre_Summit_Text_23325D: @ 823325D +MtPyre_Summit_Text_HoennTrioTale: @ 823325D .string "It happened long, long ago…\p" .string "The world was wracked by a ferocious\n" .string "clash between the POKéMON of the land\l" diff --git a/data/maps/NavelRock_Bottom/map.json b/data/maps/NavelRock_Bottom/map.json index ee324635b..1ae004107 100644 --- a/data/maps/NavelRock_Bottom/map.json +++ b/data/maps/NavelRock_Bottom/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "NavelRock_Bottom_EventScript_2692A2", + "script": "NavelRock_Bottom_EventScript_Lugia", "flag": "FLAG_HIDE_LUGIA" } ], diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc index f3c244e3d..e43f6d513 100644 --- a/data/maps/NavelRock_Bottom/scripts.inc +++ b/data/maps/NavelRock_Bottom/scripts.inc @@ -1,83 +1,83 @@ NavelRock_Bottom_MapScripts:: @ 8269255 map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Bottom_OnTransition - map_script MAP_SCRIPT_ON_RESUME, NavelRock_Bottom_MapScript1_269284 + map_script MAP_SCRIPT_ON_RESUME, NavelRock_Bottom_OnResume .byte 0 NavelRock_Bottom_OnTransition: @ 8269260 - call_if_set FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_269273 - call_if_unset FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_269277 + call_if_set FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_HideLugia + call_if_unset FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_TryShowLugia end -NavelRock_Bottom_EventScript_269273:: @ 8269273 +NavelRock_Bottom_EventScript_HideLugia:: @ 8269273 setflag FLAG_HIDE_LUGIA return -NavelRock_Bottom_EventScript_269277:: @ 8269277 +NavelRock_Bottom_EventScript_TryShowLugia:: @ 8269277 goto_if_set FLAG_DEFEATED_LUGIA, Common_EventScript_NopReturn clearflag FLAG_HIDE_LUGIA return -NavelRock_Bottom_MapScript1_269284: @ 8269284 - call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NavelRock_Bottom_EventScript_26928E +NavelRock_Bottom_OnResume: @ 8269284 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NavelRock_Bottom_EventScript_TryRemoveLugia end -NavelRock_Bottom_EventScript_26928E:: @ 826928E +NavelRock_Bottom_EventScript_TryRemoveLugia:: @ 826928E specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject 1 return -NavelRock_Bottom_EventScript_2692A2:: @ 82692A2 +NavelRock_Bottom_EventScript_Lugia:: @ 82692A2 lock faceplayer waitse delay 20 playse SE_T_AME_E - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 4 - setvar VAR_0x8007, 2 - special sub_8139560 + setvar VAR_0x8004, 0 @ vertical pan + setvar VAR_0x8005, 3 @ horizontal pan + setvar VAR_0x8006, 4 @ num shakes + setvar VAR_0x8007, 2 @ shake delay + special ShakeCamera delay 30 playse SE_T_AME_E - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 4 - setvar VAR_0x8007, 2 - special sub_8139560 + setvar VAR_0x8004, 0 @ vertical pan + setvar VAR_0x8005, 3 @ horizontal pan + setvar VAR_0x8006, 4 @ num shakes + setvar VAR_0x8007, 2 @ shake delay + special ShakeCamera delay 30 delay 50 waitse playmoncry SPECIES_LUGIA, 2 waitmoncry delay 20 - setvar VAR_0x8004, 249 - setvar VAR_0x8005, 70 - setvar VAR_0x8006, 0 + setvar VAR_0x8004, SPECIES_LUGIA + setvar VAR_0x8005, 70 @ level + setvar VAR_0x8006, ITEM_NONE special CreateObedientEnemyMon setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 - goto_if_eq NavelRock_Bottom_EventScript_269336 - compare VAR_RESULT, 4 - goto_if_eq NavelRock_Bottom_EventScript_269344 - compare VAR_RESULT, 5 - goto_if_eq NavelRock_Bottom_EventScript_269344 + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq NavelRock_Bottom_EventScript_DefeatedLugia + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq NavelRock_Bottom_EventScript_RanFromLugia + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq NavelRock_Bottom_EventScript_RanFromLugia setflag FLAG_CAUGHT_LUGIA release end -NavelRock_Bottom_EventScript_269336:: @ 8269336 +NavelRock_Bottom_EventScript_DefeatedLugia:: @ 8269336 setflag FLAG_DEFEATED_LUGIA - setvar VAR_0x8004, 249 - goto NavelRock_Bottom_EventScript_273776 + setvar VAR_0x8004, SPECIES_LUGIA + goto Common_EventScript_LegendaryFlewAway end -NavelRock_Bottom_EventScript_269344:: @ 8269344 - setvar VAR_0x8004, 249 - goto NavelRock_Bottom_EventScript_273776 +NavelRock_Bottom_EventScript_RanFromLugia:: @ 8269344 + setvar VAR_0x8004, SPECIES_LUGIA + goto Common_EventScript_LegendaryFlewAway end diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index 7ea3ef0e7..e91dfa8d1 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "NavelRock_Harbor_EventScript_2690BD", + "script": "NavelRock_Harbor_EventScript_Sailor", "flag": "0" }, { diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc index 873b4fd3b..b138b7c5a 100644 --- a/data/maps/NavelRock_Harbor/scripts.inc +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -1,26 +1,26 @@ NavelRock_Harbor_MapScripts:: @ 82690BC .byte 0 -NavelRock_Harbor_EventScript_2690BD:: @ 82690BD +NavelRock_Harbor_EventScript_Sailor:: @ 82690BD lock faceplayer msgbox NavelRock_Harbor_Text_SailorReturn, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq NavelRock_Harbor_EventScript_269102 + compare VAR_RESULT, NO + goto_if_eq NavelRock_Harbor_EventScript_AsYouLike msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 hideobjectat 1, MAP_NAVEL_ROCK_HARBOR setvar VAR_0x8004, 2 - call NavelRock_Harbor_EventScript_272250 + call Common_EventScript_FerryDepartIsland warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end -NavelRock_Harbor_EventScript_269102:: @ 8269102 +NavelRock_Harbor_EventScript_AsYouLike:: @ 8269102 msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT release end diff --git a/data/maps/NavelRock_Top/map.json b/data/maps/NavelRock_Top/map.json index 4b025ccae..c906c4ceb 100644 --- a/data/maps/NavelRock_Top/map.json +++ b/data/maps/NavelRock_Top/map.json @@ -45,7 +45,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "NavelRock_Top_EventScript_26916F" + "script": "NavelRock_Top_EventScript_HoOh" } ], "bg_events": [ diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index 816e20206..fcd043d3d 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -1,45 +1,45 @@ NavelRock_Top_MapScripts:: @ 8269113 map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Top_OnTransition - map_script MAP_SCRIPT_ON_RESUME, NavelRock_Top_MapScript1_269151 + map_script MAP_SCRIPT_ON_RESUME, NavelRock_Top_OnResume .byte 0 NavelRock_Top_OnTransition: @ 826911E - call_if_set FLAG_CAUGHT_HO_OH, NavelRock_Top_EventScript_269131 - call_if_unset FLAG_CAUGHT_HO_OH, NavelRock_Top_EventScript_26913A + call_if_set FLAG_CAUGHT_HO_OH, NavelRock_Top_EventScript_HideHoOh + call_if_unset FLAG_CAUGHT_HO_OH, NavelRock_Top_EventScript_TryShowHoOh end -NavelRock_Top_EventScript_269131:: @ 8269131 +NavelRock_Top_EventScript_HideHoOh:: @ 8269131 setvar VAR_TEMP_1, 1 setflag FLAG_HIDE_HO_OH return -NavelRock_Top_EventScript_26913A:: @ 826913A +NavelRock_Top_EventScript_TryShowHoOh:: @ 826913A setvar VAR_TEMP_1, 1 goto_if_set FLAG_DEFEATED_HO_OH, Common_EventScript_NopReturn setvar VAR_TEMP_1, 0 clearflag FLAG_HIDE_HO_OH return -NavelRock_Top_MapScript1_269151: @ 8269151 - call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NavelRock_Top_EventScript_26915B +NavelRock_Top_OnResume: @ 8269151 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NavelRock_Top_EventScript_TryRemoveHoOh end -NavelRock_Top_EventScript_26915B:: @ 826915B +NavelRock_Top_EventScript_TryRemoveHoOh:: @ 826915B specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject 1 return -NavelRock_Top_EventScript_26916F:: @ 826916F +NavelRock_Top_EventScript_HoOh:: @ 826916F lockall setvar VAR_TEMP_1, 1 special SpawnCameraObject - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 35 - special sub_813B80C - applymovement 1, NavelRock_Top_Movement_269243 - applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_269230 + setvar VAR_0x8004, 3 @ num loops + setvar VAR_0x8005, 35 @ delay + special LoopWingFlapSE + applymovement 1, NavelRock_Top_Movement_HoOhAppear + applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_CameraPanUp waitmovement 0 delay 50 setweather WEATHER_NONE @@ -49,16 +49,16 @@ NavelRock_Top_EventScript_26916F:: @ 826916F delay 30 waitmoncry delay 60 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 35 - special sub_813B80C - applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_269234 - applymovement 1, NavelRock_Top_Movement_26923A + setvar VAR_0x8004, 3 @ num loops + setvar VAR_0x8005, 35 @ delay + special LoopWingFlapSE + applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_CameraPanDown + applymovement 1, NavelRock_Top_Movement_HoOhApproach waitmovement 0 special RemoveCameraObject - setvar VAR_0x8004, 250 - setvar VAR_0x8005, 70 - setvar VAR_0x8006, 0 + setvar VAR_0x8004, SPECIES_HO_OH + setvar VAR_0x8005, 70 @ level + setvar VAR_0x8006, ITEM_NONE special CreateObedientEnemyMon setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLegendaryBattle @@ -66,34 +66,34 @@ NavelRock_Top_EventScript_26916F:: @ 826916F clearflag FLAG_SYS_CTRL_OBJ_DELETE setvar VAR_LAST_TALKED, 1 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 - goto_if_eq NavelRock_Top_EventScript_269217 - compare VAR_RESULT, 4 - goto_if_eq NavelRock_Top_EventScript_269225 - compare VAR_RESULT, 5 - goto_if_eq NavelRock_Top_EventScript_269225 + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq NavelRock_Top_EventScript_DefeatedHoOh + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq NavelRock_Top_EventScript_RanFromHoOh + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq NavelRock_Top_EventScript_RanFromHoOh setflag FLAG_CAUGHT_HO_OH releaseall end -NavelRock_Top_EventScript_269217:: @ 8269217 +NavelRock_Top_EventScript_DefeatedHoOh:: @ 8269217 setflag FLAG_DEFEATED_HO_OH - setvar VAR_0x8004, 250 - goto NavelRock_Top_EventScript_273776 + setvar VAR_0x8004, SPECIES_HO_OH + goto Common_EventScript_LegendaryFlewAway end -NavelRock_Top_EventScript_269225:: @ 8269225 - setvar VAR_0x8004, 250 - goto NavelRock_Top_EventScript_273776 +NavelRock_Top_EventScript_RanFromHoOh:: @ 8269225 + setvar VAR_0x8004, SPECIES_HO_OH + goto Common_EventScript_LegendaryFlewAway end -NavelRock_Top_Movement_269230: @ 8269230 +NavelRock_Top_Movement_CameraPanUp: @ 8269230 walk_up walk_up walk_up step_end -NavelRock_Top_Movement_269234: @ 8269234 +NavelRock_Top_Movement_CameraPanDown: @ 8269234 delay_16 delay_16 walk_down @@ -101,7 +101,7 @@ NavelRock_Top_Movement_269234: @ 8269234 walk_down step_end -NavelRock_Top_Movement_26923A: @ 826923A +NavelRock_Top_Movement_HoOhApproach: @ 826923A walk_down walk_down walk_down @@ -112,7 +112,7 @@ NavelRock_Top_Movement_26923A: @ 826923A delay_16 step_end -NavelRock_Top_Movement_269243: @ 8269243 +NavelRock_Top_Movement_HoOhAppear: @ 8269243 delay_16 delay_16 walk_in_place_down diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index 1fadc7b7d..e9dd09c27 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -23,14 +23,14 @@ NewMauville_Entrance_OnTransition: @ 82372FB NewMauville_Entrance_EventScript_2372FF:: @ 82372FF lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox NewMauville_Entrance_Text_237382, MSGBOX_DEFAULT checkitem ITEM_BASEMENT_KEY, 1 compare VAR_RESULT, 0 goto_if_eq NewMauville_Entrance_EventScript_237380 msgbox NewMauville_Entrance_Text_237396, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq NewMauville_Entrance_EventScript_237380 msgbox NewMauville_Entrance_Text_2373AC, MSGBOX_DEFAULT setmetatile 3, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile0, 0 diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index 5d871f170..be4e846eb 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -14,7 +14,7 @@ NewMauville_Inside_MapScript1_2373E7: @ 82373E7 NewMauville_Inside_EventScript_237407:: @ 8237407 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return @@ -190,11 +190,11 @@ NewMauville_Inside_EventScript_2377AF:: @ 82377AF dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq NewMauville_Inside_EventScript_2377F3 - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq NewMauville_Inside_EventScript_2377F3 - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq NewMauville_Inside_EventScript_2377F3 setflag FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE release @@ -202,7 +202,7 @@ NewMauville_Inside_EventScript_2377AF:: @ 82377AF NewMauville_Inside_EventScript_2377F3:: @ 82377F3 setflag FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE - goto NewMauville_Inside_EventScript_27376D + goto Common_EventScript_RemoveStaticPokemon end NewMauville_Inside_EventScript_2377FC:: @ 82377FC @@ -217,11 +217,11 @@ NewMauville_Inside_EventScript_2377FC:: @ 82377FC dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq NewMauville_Inside_EventScript_237840 - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq NewMauville_Inside_EventScript_237840 - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq NewMauville_Inside_EventScript_237840 setflag FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE release @@ -229,7 +229,7 @@ NewMauville_Inside_EventScript_2377FC:: @ 82377FC NewMauville_Inside_EventScript_237840:: @ 8237840 setflag FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE - goto NewMauville_Inside_EventScript_27376D + goto Common_EventScript_RemoveStaticPokemon end NewMauville_Inside_EventScript_237849:: @ 8237849 @@ -244,11 +244,11 @@ NewMauville_Inside_EventScript_237849:: @ 8237849 dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 + compare VAR_RESULT, B_OUTCOME_WON goto_if_eq NewMauville_Inside_EventScript_23788D - compare VAR_RESULT, 4 + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq NewMauville_Inside_EventScript_23788D - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq NewMauville_Inside_EventScript_23788D setflag FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE release @@ -256,7 +256,7 @@ NewMauville_Inside_EventScript_237849:: @ 8237849 NewMauville_Inside_EventScript_23788D:: @ 823788D setflag FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE - goto NewMauville_Inside_EventScript_27376D + goto Common_EventScript_RemoveStaticPokemon end NewMauville_Inside_Text_237896: @ 8237896 diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 5f91e81ed..1644c76d6 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -40,7 +40,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_EventScript_1E8EF3", + "script": "OldaleTown_EventScript_Girl", "flag": "0" }, { @@ -53,7 +53,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_EventScript_1E8EFC", + "script": "OldaleTown_EventScript_MartEmployee", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_EventScript_1E901F", + "script": "OldaleTown_EventScript_FootprintsMan", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_EventScript_1E9070", + "script": "OldaleTown_EventScript_Rival", "flag": "FLAG_HIDE_OLDALE_TOWN_RIVAL" } ], @@ -121,7 +121,7 @@ "elevation": 3, "var": "VAR_OLDALE_TOWN_STATE", "var_value": "0", - "script": "OldaleTown_EventScript_1E903F" + "script": "OldaleTown_EventScript_BlockedPath" }, { "type": "trigger", @@ -130,7 +130,7 @@ "elevation": 3, "var": "VAR_OLDALE_RIVAL_STATE", "var_value": "1", - "script": "OldaleTown_EventScript_1E9086" + "script": "OldaleTown_EventScript_RivalTrigger1" }, { "type": "trigger", @@ -139,7 +139,7 @@ "elevation": 3, "var": "VAR_OLDALE_RIVAL_STATE", "var_value": "1", - "script": "OldaleTown_EventScript_1E90A6" + "script": "OldaleTown_EventScript_RivalTrigger2" }, { "type": "trigger", @@ -148,7 +148,7 @@ "elevation": 3, "var": "VAR_OLDALE_RIVAL_STATE", "var_value": "1", - "script": "OldaleTown_EventScript_1E90C6" + "script": "OldaleTown_EventScript_RivalTrigger3" } ], "bg_events": [ @@ -158,7 +158,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "OldaleTown_EventScript_1E8EEA" + "script": "OldaleTown_EventScript_CitySign" }, { "type": "sign", diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 71b930b83..88f73d39b 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -3,94 +3,95 @@ OldaleTown_MapScripts:: @ 81E8EA2 .byte 0 OldaleTown_OnTransition: @ 81E8EA8 - call Common_EventScript_SetupRivalGender + call Common_EventScript_SetupRivalGfxId setflag FLAG_VISITED_OLDALE_TOWN - call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E8ED2 - call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_1E8EDE - call_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E8ECC + call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_BlockWestEntrance + call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_MoveMartEmployee + call_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_SetOldaleState end -OldaleTown_EventScript_1E8ECC:: @ 81E8ECC +@ This script seems pointless because nothing uses VAR_OLDALE_TOWN_STATE +OldaleTown_EventScript_SetOldaleState:: @ 81E8ECC setvar VAR_OLDALE_TOWN_STATE, 1 return -OldaleTown_EventScript_1E8ED2:: @ 81E8ED2 +OldaleTown_EventScript_BlockWestEntrance:: @ 81E8ED2 setobjectxyperm 3, 1, 11 setobjectmovementtype 3, MOVEMENT_TYPE_FACE_LEFT return -OldaleTown_EventScript_1E8EDE:: @ 81E8EDE +OldaleTown_EventScript_MoveMartEmployee:: @ 81E8EDE setobjectxyperm 2, 13, 14 setobjectmovementtype 2, MOVEMENT_TYPE_FACE_DOWN return -OldaleTown_EventScript_1E8EEA:: @ 81E8EEA - msgbox OldaleTown_Text_1E94DA, MSGBOX_SIGN +OldaleTown_EventScript_CitySign:: @ 81E8EEA + msgbox OldaleTown_Text_CitySign, MSGBOX_SIGN end -OldaleTown_EventScript_1E8EF3:: @ 81E8EF3 - msgbox OldaleTown_Text_1E918E, MSGBOX_NPC +OldaleTown_EventScript_Girl:: @ 81E8EF3 + msgbox OldaleTown_Text_SavingMyProgress, MSGBOX_NPC end -OldaleTown_EventScript_1E8EFC:: @ 81E8EFC +OldaleTown_EventScript_MartEmployee:: @ 81E8EFC lock faceplayer - goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_1E8FB9 - goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_1E8FB9 + goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_ExplainPotion + goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_ExplainPotion setflag FLAG_TEMP_1 playbgm MUS_TSURETEK, 0 - msgbox OldaleTown_Text_1E91C0, MSGBOX_DEFAULT + msgbox OldaleTown_Text_IWorkAtPokemonMart, MSGBOX_DEFAULT closemessage switch VAR_FACING - case 1, OldaleTown_EventScript_1E8F47 - case 2, OldaleTown_EventScript_1E8F5E - case 4, OldaleTown_EventScript_1E8F75 + case DIR_SOUTH, OldaleTown_EventScript_GoToMartSouth + case DIR_NORTH, OldaleTown_EventScript_GoToMartNorth + case DIR_EAST, OldaleTown_EventScript_GoToMartEast end -OldaleTown_EventScript_1E8F47:: @ 81E8F47 - applymovement 2, OldaleTown_Movement_1E8FD7 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E9001 +OldaleTown_EventScript_GoToMartSouth:: @ 81E8F47 + applymovement 2, OldaleTown_Movement_EmployeeSouth + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerSouth waitmovement 0 - goto OldaleTown_EventScript_1E8F8C + goto OldaleTown_EventScript_ExplainPokemonMart end -OldaleTown_EventScript_1E8F5E:: @ 81E8F5E - applymovement 2, OldaleTown_Movement_1E8FE2 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E900B +OldaleTown_EventScript_GoToMartNorth:: @ 81E8F5E + applymovement 2, OldaleTown_Movement_EmployeeNorth + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerNorth waitmovement 0 - goto OldaleTown_EventScript_1E8F8C + goto OldaleTown_EventScript_ExplainPokemonMart end -OldaleTown_EventScript_1E8F75:: @ 81E8F75 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E8FF9 - applymovement 2, OldaleTown_Movement_1E8FCE +OldaleTown_EventScript_GoToMartEast:: @ 81E8F75 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerEast + applymovement 2, OldaleTown_Movement_EmployeeEast waitmovement 0 - goto OldaleTown_EventScript_1E8F8C + goto OldaleTown_EventScript_ExplainPokemonMart end -OldaleTown_EventScript_1E8F8C:: @ 81E8F8C - msgbox OldaleTown_Text_1E91FD, MSGBOX_DEFAULT +OldaleTown_EventScript_ExplainPokemonMart:: @ 81E8F8C + msgbox OldaleTown_Text_ThisIsAPokemonMart, MSGBOX_DEFAULT giveitem_std ITEM_POTION compare VAR_RESULT, 0 - goto_if_eq OldaleTown_EventScript_1E8FC3 - msgbox OldaleTown_Text_1E92AF, MSGBOX_DEFAULT + goto_if_eq OldaleTown_EventScript_BagIsFull + msgbox OldaleTown_Text_PotionExplanation, MSGBOX_DEFAULT setflag FLAG_RECEIVED_POTION_OLDALE fadedefaultbgm release end -OldaleTown_EventScript_1E8FB9:: @ 81E8FB9 - msgbox OldaleTown_Text_1E92AF, MSGBOX_DEFAULT +OldaleTown_EventScript_ExplainPotion:: @ 81E8FB9 + msgbox OldaleTown_Text_PotionExplanation, MSGBOX_DEFAULT release end -OldaleTown_EventScript_1E8FC3:: @ 81E8FC3 +OldaleTown_EventScript_BagIsFull:: @ 81E8FC3 msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT fadedefaultbgm release end -OldaleTown_Movement_1E8FCE: @ 81E8FCE +OldaleTown_Movement_EmployeeEast: @ 81E8FCE walk_up walk_up walk_up @@ -101,7 +102,7 @@ OldaleTown_Movement_1E8FCE: @ 81E8FCE walk_in_place_fastest_down step_end -OldaleTown_Movement_1E8FD7: @ 81E8FD7 +OldaleTown_Movement_EmployeeSouth: @ 81E8FD7 walk_left walk_up walk_up @@ -114,7 +115,7 @@ OldaleTown_Movement_1E8FD7: @ 81E8FD7 walk_in_place_fastest_down step_end -OldaleTown_Movement_1E8FE2: @ 81E8FE2 +OldaleTown_Movement_EmployeeNorth: @ 81E8FE2 walk_up walk_up walk_up @@ -125,7 +126,7 @@ OldaleTown_Movement_1E8FE2: @ 81E8FE2 walk_in_place_fastest_down step_end -OldaleTown_Movement_1E8FEB: @ 81E8FEB +OldaleTown_Movement_Unknown1: @ 81E8FEB walk_up walk_up walk_right @@ -141,7 +142,7 @@ OldaleTown_Movement_1E8FEB: @ 81E8FEB walk_in_place_fastest_down step_end -OldaleTown_Movement_1E8FF9: @ 81E8FF9 +OldaleTown_Movement_PlayerEast: @ 81E8FF9 walk_right walk_up walk_up @@ -151,7 +152,7 @@ OldaleTown_Movement_1E8FF9: @ 81E8FF9 walk_up step_end -OldaleTown_Movement_1E9001: @ 81E9001 +OldaleTown_Movement_PlayerSouth: @ 81E9001 delay_16 delay_16 delay_16 @@ -163,7 +164,7 @@ OldaleTown_Movement_1E9001: @ 81E9001 walk_up step_end -OldaleTown_Movement_1E900B: @ 81E900B +OldaleTown_Movement_PlayerNorth: @ 81E900B walk_up walk_up walk_up @@ -173,7 +174,7 @@ OldaleTown_Movement_1E900B: @ 81E900B walk_up step_end -OldaleTown_Movement_1E9013: @ 81E9013 +OldaleTown_Movement_Unknown2: @ 81E9013 walk_left walk_up walk_up @@ -187,97 +188,97 @@ OldaleTown_Movement_1E9013: @ 81E9013 walk_up step_end -OldaleTown_EventScript_1E901F:: @ 81E901F +OldaleTown_EventScript_FootprintsMan:: @ 81E901F lock faceplayer - goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E9066 - msgbox OldaleTown_Text_1E939A, MSGBOX_DEFAULT + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_NotBlockingPath + msgbox OldaleTown_Text_DiscoveredFootprints, MSGBOX_DEFAULT closemessage applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end -OldaleTown_EventScript_1E903F:: @ 81E903F +OldaleTown_EventScript_BlockedPath:: @ 81E903F lockall - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E9182 - applymovement 3, OldaleTown_Movement_1E9185 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerStepBack + applymovement 3, OldaleTown_Movement_BackUp waitmovement 0 - msgbox OldaleTown_Text_1E9313, MSGBOX_DEFAULT + msgbox OldaleTown_Text_WaitDontComeInHere, MSGBOX_DEFAULT closemessage - applymovement 3, OldaleTown_Movement_1E918B + applymovement 3, OldaleTown_Movement_ReturnToOriginalPosition waitmovement 0 releaseall end -OldaleTown_EventScript_1E9066:: @ 81E9066 - msgbox OldaleTown_Text_1E93F8, MSGBOX_DEFAULT +OldaleTown_EventScript_NotBlockingPath:: @ 81E9066 + msgbox OldaleTown_Text_FinishedSketchingFootprints, MSGBOX_DEFAULT release end -OldaleTown_EventScript_1E9070:: @ 81E9070 +OldaleTown_EventScript_Rival:: @ 81E9070 lockall applymovement 4, Common_Movement_FacePlayer waitmovement 0 setvar VAR_0x8009, 0 - goto OldaleTown_EventScript_1E90E6 + goto OldaleTown_EventScript_ShowRivalMessage end -OldaleTown_EventScript_1E9086:: @ 81E9086 +OldaleTown_EventScript_RivalTrigger1:: @ 81E9086 lockall - applymovement 4, OldaleTown_Movement_1E9170 + applymovement 4, OldaleTown_Movement_RivalApproachPlayer1 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 setvar VAR_0x8009, 1 - goto OldaleTown_EventScript_1E90E6 + goto OldaleTown_EventScript_ShowRivalMessage end -OldaleTown_EventScript_1E90A6:: @ 81E90A6 +OldaleTown_EventScript_RivalTrigger2:: @ 81E90A6 lockall - applymovement 4, OldaleTown_Movement_1E9173 + applymovement 4, OldaleTown_Movement_RivalApproachPlayer2 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 setvar VAR_0x8009, 1 - goto OldaleTown_EventScript_1E90E6 + goto OldaleTown_EventScript_ShowRivalMessage end -OldaleTown_EventScript_1E90C6:: @ 81E90C6 +OldaleTown_EventScript_RivalTrigger3:: @ 81E90C6 lockall - applymovement 4, OldaleTown_Movement_1E9175 + applymovement 4, OldaleTown_Movement_RivalApproachPlayer3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 setvar VAR_0x8009, 1 - goto OldaleTown_EventScript_1E90E6 + goto OldaleTown_EventScript_ShowRivalMessage end -OldaleTown_EventScript_1E90E6:: @ 81E90E6 +OldaleTown_EventScript_ShowRivalMessage:: @ 81E90E6 checkplayergender compare VAR_RESULT, MALE - goto_if_eq OldaleTown_EventScript_1E90FE + goto_if_eq OldaleTown_EventScript_ShowMayMessage compare VAR_RESULT, FEMALE - goto_if_eq OldaleTown_EventScript_1E910C + goto_if_eq OldaleTown_EventScript_ShowBrendanMessage end -OldaleTown_EventScript_1E90FE:: @ 81E90FE - msgbox OldaleTown_Text_1E9462, MSGBOX_DEFAULT - goto OldaleTown_EventScript_1E911A +OldaleTown_EventScript_ShowMayMessage:: @ 81E90FE + msgbox OldaleTown_Text_MayLetsGoBack, MSGBOX_DEFAULT + goto OldaleTown_EventScript_RivalFinish end -OldaleTown_EventScript_1E910C:: @ 81E910C - msgbox OldaleTown_Text_1E948A, MSGBOX_DEFAULT - goto OldaleTown_EventScript_1E911A +OldaleTown_EventScript_ShowBrendanMessage:: @ 81E910C + msgbox OldaleTown_Text_BrendanLetsGoBack, MSGBOX_DEFAULT + goto OldaleTown_EventScript_RivalFinish end -OldaleTown_EventScript_1E911A:: @ 81E911A +OldaleTown_EventScript_RivalFinish:: @ 81E911A closemessage compare VAR_0x8009, 0 - call_if_eq OldaleTown_EventScript_1E9148 + call_if_eq OldaleTown_EventScript_DoExitMovement1 compare VAR_0x8009, 1 - call_if_eq OldaleTown_EventScript_1E915E - applymovement 4, OldaleTown_Movement_1E9177 + call_if_eq OldaleTown_EventScript_DoExitMovement2 + applymovement 4, OldaleTown_Movement_RivalExit waitmovement 0 removeobject 4 setvar VAR_OLDALE_RIVAL_STATE, 2 @@ -285,33 +286,33 @@ OldaleTown_EventScript_1E911A:: @ 81E911A releaseall end -OldaleTown_EventScript_1E9148:: @ 81E9148 - compare VAR_FACING, 1 - goto_if_ne OldaleTown_EventScript_1E915E - applymovement 4, OldaleTown_Movement_1E9177 +OldaleTown_EventScript_DoExitMovement1:: @ 81E9148 + compare VAR_FACING, DIR_SOUTH + goto_if_ne OldaleTown_EventScript_DoExitMovement2 + applymovement 4, OldaleTown_Movement_RivalExit waitmovement 0 return -OldaleTown_EventScript_1E915E:: @ 81E915E - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E917E - applymovement 4, OldaleTown_Movement_1E9177 +OldaleTown_EventScript_DoExitMovement2:: @ 81E915E + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_WatchRivalExit + applymovement 4, OldaleTown_Movement_RivalExit waitmovement 0 return -OldaleTown_Movement_1E9170: @ 81E9170 +OldaleTown_Movement_RivalApproachPlayer1: @ 81E9170 walk_left walk_left step_end -OldaleTown_Movement_1E9173: @ 81E9173 +OldaleTown_Movement_RivalApproachPlayer2: @ 81E9173 walk_left step_end -OldaleTown_Movement_1E9175: @ 81E9175 +OldaleTown_Movement_RivalApproachPlayer3: @ 81E9175 face_left step_end -OldaleTown_Movement_1E9177: @ 81E9177 +OldaleTown_Movement_RivalExit: @ 81E9177 walk_down walk_down walk_down @@ -320,18 +321,18 @@ OldaleTown_Movement_1E9177: @ 81E9177 walk_down step_end -OldaleTown_Movement_1E917E: @ 81E917E +OldaleTown_Movement_WatchRivalExit: @ 81E917E delay_8 delay_4 walk_in_place_fastest_down step_end -OldaleTown_Movement_1E9182: @ 81E9182 +OldaleTown_Movement_PlayerStepBack: @ 81E9182 delay_8 walk_right step_end -OldaleTown_Movement_1E9185: @ 81E9185 +OldaleTown_Movement_BackUp: @ 81E9185 walk_fast_up walk_in_place_fastest_left lock_facing_direction @@ -339,21 +340,21 @@ OldaleTown_Movement_1E9185: @ 81E9185 unlock_facing_direction step_end -OldaleTown_Movement_1E918B: @ 81E918B +OldaleTown_Movement_ReturnToOriginalPosition: @ 81E918B walk_down walk_left step_end -OldaleTown_Text_1E918E: @ 81E918E +OldaleTown_Text_SavingMyProgress: @ 81E918E .string "I want to take a rest, so I'm saving my\n" .string "progress.$" -OldaleTown_Text_1E91C0: @ 81E91C0 +OldaleTown_Text_IWorkAtPokemonMart: @ 81E91C0 .string "Hi!\n" .string "I work at a POKéMON MART.\p" .string "Can I get you to come with me?$" -OldaleTown_Text_1E91FD: @ 81E91FD +OldaleTown_Text_ThisIsAPokemonMart: @ 81E91FD .string "This is a POKéMON MART.\n" .string "Just look for our blue roof.\p" .string "We sell a variety of goods including\n" @@ -361,12 +362,12 @@ OldaleTown_Text_1E91FD: @ 81E91FD .string "Here, I'd like you to have this as\n" .string "a promotional item.$" -OldaleTown_Text_1E92AF: @ 81E92AF +OldaleTown_Text_PotionExplanation: @ 81E92AF .string "A POTION can be used anytime, so it's\n" .string "even more useful than a POKéMON CENTER\l" .string "in certain situations.$" -OldaleTown_Text_1E9313: @ 81E9313 +OldaleTown_Text_WaitDontComeInHere: @ 81E9313 .string "Aaaaah! Wait!\n" .string "Please don't come in here.\p" .string "I just discovered the footprints of\n" @@ -374,29 +375,29 @@ OldaleTown_Text_1E9313: @ 81E9313 .string "Wait until I finish sketching\n" .string "them, okay?$" -OldaleTown_Text_1E939A: @ 81E939A +OldaleTown_Text_DiscoveredFootprints: @ 81E939A .string "I just discovered the footprints of\n" .string "a rare POKéMON!\p" .string "Wait until I finish sketching\n" .string "them, okay?$" -OldaleTown_Text_1E93F8: @ 81E93F8 +OldaleTown_Text_FinishedSketchingFootprints: @ 81E93F8 .string "I finished sketching the footprints of\n" .string "a rare POKéMON.\p" .string "But it turns out they were only my\n" .string "own footprints…$" -OldaleTown_Text_1E9462: @ 81E9462 +OldaleTown_Text_MayLetsGoBack: @ 81E9462 .string "MAY: {PLAYER}{KUN}!\n" .string "Over here!\l" .string "Let's hurry home!$" -OldaleTown_Text_1E948A: @ 81E948A +OldaleTown_Text_BrendanLetsGoBack: @ 81E948A .string "BRENDAN: I'm heading back to my dad's\n" .string "LAB now.\l" .string "{PLAYER}, you should hustle back, too.$" -OldaleTown_Text_1E94DA: @ 81E94DA +OldaleTown_Text_CitySign: @ 81E94DA .string "OLDALE TOWN\n" .string "“Where things start off scarce.”$" diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json index aa837378c..03155a623 100644 --- a/data/maps/OldaleTown_House1/map.json +++ b/data/maps/OldaleTown_House1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_House1_EventScript_1FBE86", + "script": "OldaleTown_House1_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/OldaleTown_House1/scripts.inc b/data/maps/OldaleTown_House1/scripts.inc index 71010116e..1cb5622ef 100644 --- a/data/maps/OldaleTown_House1/scripts.inc +++ b/data/maps/OldaleTown_House1/scripts.inc @@ -1,11 +1,11 @@ OldaleTown_House1_MapScripts:: @ 81FBE85 .byte 0 -OldaleTown_House1_EventScript_1FBE86:: @ 81FBE86 - msgbox OldaleTown_House1_Text_1FBE8F, MSGBOX_NPC +OldaleTown_House1_EventScript_Woman:: @ 81FBE86 + msgbox OldaleTown_House1_Text_LeftPokemonGoesOutFirst, MSGBOX_NPC end -OldaleTown_House1_Text_1FBE8F: @ 81FBE8F +OldaleTown_House1_Text_LeftPokemonGoesOutFirst: @ 81FBE8F .string "When a POKéMON battle starts, the one\n" .string "at the left of the list goes out first.\p" .string "So, when you get more POKéMON in your\n" diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json index fbcf968e7..754f98c49 100644 --- a/data/maps/OldaleTown_House2/map.json +++ b/data/maps/OldaleTown_House2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_House2_EventScript_1FBF5B", + "script": "OldaleTown_House2_EventScript_Woman", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_House2_EventScript_1FBF64", + "script": "OldaleTown_House2_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/OldaleTown_House2/scripts.inc b/data/maps/OldaleTown_House2/scripts.inc index 74a9a06d3..3259e319c 100644 --- a/data/maps/OldaleTown_House2/scripts.inc +++ b/data/maps/OldaleTown_House2/scripts.inc @@ -1,19 +1,19 @@ OldaleTown_House2_MapScripts:: @ 81FBF5A .byte 0 -OldaleTown_House2_EventScript_1FBF5B:: @ 81FBF5B - msgbox OldaleTown_House2_Text_1FBF6D, MSGBOX_NPC +OldaleTown_House2_EventScript_Woman:: @ 81FBF5B + msgbox OldaleTown_House2_Text_PokemonLevelUp, MSGBOX_NPC end -OldaleTown_House2_EventScript_1FBF64:: @ 81FBF64 - msgbox OldaleTown_House2_Text_1FBFB0, MSGBOX_NPC +OldaleTown_House2_EventScript_Man:: @ 81FBF64 + msgbox OldaleTown_House2_Text_YoullGoFurtherWithStrongPokemon, MSGBOX_NPC end -OldaleTown_House2_Text_1FBF6D: @ 81FBF6D +OldaleTown_House2_Text_PokemonLevelUp: @ 81FBF6D .string "When POKéMON battle, they eventually\n" .string "level up and become stronger.$" -OldaleTown_House2_Text_1FBFB0: @ 81FBFB0 +OldaleTown_House2_Text_YoullGoFurtherWithStrongPokemon: @ 81FBFB0 .string "If the POKéMON with you become\n" .string "stronger, you'll be able to go farther\l" .string "away from here.$" diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json index 9f1f894ce..a27fad497 100644 --- a/data/maps/OldaleTown_Mart/map.json +++ b/data/maps/OldaleTown_Mart/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_Mart_EventScript_1FC240", + "script": "OldaleTown_Mart_EventScript_Clerk", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_Mart_EventScript_1FC28A", + "script": "OldaleTown_Mart_EventScript_Woman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_Mart_EventScript_1FC2A9", + "script": "OldaleTown_Mart_EventScript_Boy", "flag": "0" } ], diff --git a/data/maps/OldaleTown_Mart/scripts.inc b/data/maps/OldaleTown_Mart/scripts.inc index 980b0e4d6..33d26cbfb 100644 --- a/data/maps/OldaleTown_Mart/scripts.inc +++ b/data/maps/OldaleTown_Mart/scripts.inc @@ -1,18 +1,18 @@ OldaleTown_Mart_MapScripts:: @ 81FC23F .byte 0 -OldaleTown_Mart_EventScript_1FC240:: @ 81FC240 +OldaleTown_Mart_EventScript_Clerk:: @ 81FC240 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage - goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_1FC26C - pokemart OldaleTown_Mart_Pokemart_1FC260 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_ExpandedItems + pokemart OldaleTown_Mart_Pokemart_Basic + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end -OldaleTown_Mart_Pokemart_1FC260: @ 81FC260 +OldaleTown_Mart_Pokemart_Basic: @ 81FC260 .2byte ITEM_POTION .2byte ITEM_ANTIDOTE .2byte ITEM_PARALYZE_HEAL @@ -21,14 +21,14 @@ OldaleTown_Mart_Pokemart_1FC260: @ 81FC260 release end -OldaleTown_Mart_EventScript_1FC26C:: @ 81FC26C - pokemart OldaleTown_Mart_Pokemart_1FC27C - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT +OldaleTown_Mart_ExpandedItems:: @ 81FC26C + pokemart OldaleTown_Mart_Pokemart_Expanded + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -OldaleTown_Mart_Pokemart_1FC27C: @ 81FC27C +OldaleTown_Mart_Pokemart_Expanded: @ 81FC27C .2byte ITEM_POKE_BALL .2byte ITEM_POTION .2byte ITEM_ANTIDOTE @@ -38,32 +38,32 @@ OldaleTown_Mart_Pokemart_1FC27C: @ 81FC27C release end -OldaleTown_Mart_EventScript_1FC28A:: @ 81FC28A +OldaleTown_Mart_EventScript_Woman:: @ 81FC28A lock faceplayer - goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_1FC29F - msgbox OldaleTown_Mart_Text_1FC2B2, MSGBOX_DEFAULT + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_PokeBallsInStock + msgbox OldaleTown_Mart_Text_PokeBallsAreSoldOut, MSGBOX_DEFAULT release end -OldaleTown_Mart_EventScript_1FC29F:: @ 81FC29F - msgbox OldaleTown_Mart_Text_1FC2F3, MSGBOX_DEFAULT +OldaleTown_Mart_EventScript_PokeBallsInStock:: @ 81FC29F + msgbox OldaleTown_Mart_Text_ImGoingToBuyPokeBalls, MSGBOX_DEFAULT release end -OldaleTown_Mart_EventScript_1FC2A9:: @ 81FC2A9 - msgbox OldaleTown_Mart_Text_1FC338, MSGBOX_NPC +OldaleTown_Mart_EventScript_Boy:: @ 81FC2A9 + msgbox OldaleTown_Mart_Text_RestoreHPWithPotion, MSGBOX_NPC end -OldaleTown_Mart_Text_1FC2B2: @ 81FC2B2 +OldaleTown_Mart_Text_PokeBallsAreSoldOut: @ 81FC2B2 .string "The clerk says they're all sold out.\n" .string "I can't buy any POKé BALLS.$" -OldaleTown_Mart_Text_1FC2F3: @ 81FC2F3 +OldaleTown_Mart_Text_ImGoingToBuyPokeBalls: @ 81FC2F3 .string "I'm going to buy a bunch of POKé BALLS\n" .string "and catch a bunch of POKéMON!$" -OldaleTown_Mart_Text_1FC338: @ 81FC338 +OldaleTown_Mart_Text_RestoreHPWithPotion: @ 81FC338 .string "If a POKéMON gets hurt and loses its HP\n" .string "and faints, it won't be able to battle.\p" .string "To prevent your POKéMON from fainting,\n" diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json index 7c9ed89a0..2f92a004c 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC01A", + "script": "OldaleTown_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC028", + "script": "OldaleTown_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC031", + "script": "OldaleTown_PokemonCenter_1F_EventScript_Boy", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC03A", + "script": "OldaleTown_PokemonCenter_1F_EventScript_Girl", "flag": "0" } ], diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index 2396573dc..4e54cc8e4 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -1,61 +1,61 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006 map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, OldaleTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 OldaleTown_PokemonCenter_1F_OnTransition: @ 81FC011 setrespawn HEAL_LOCATION_OLDALE_TOWN - call OldaleTown_PokemonCenter_1F_EventScript_2718DE + call Common_EventScript_UpdateBrineyLocation end -OldaleTown_PokemonCenter_1F_EventScript_1FC01A:: @ 81FC01A +OldaleTown_PokemonCenter_1F_EventScript_Nurse:: @ 81FC01A setvar VAR_0x800B, 1 - call OldaleTown_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release end -OldaleTown_PokemonCenter_1F_EventScript_1FC028:: @ 81FC028 - msgbox OldaleTown_PokemonCenter_1F_Text_1FC059, MSGBOX_NPC +OldaleTown_PokemonCenter_1F_EventScript_Gentleman:: @ 81FC028 + msgbox OldaleTown_PokemonCenter_1F_Text_TrainersCanUsePC, MSGBOX_NPC end -OldaleTown_PokemonCenter_1F_EventScript_1FC031:: @ 81FC031 - msgbox OldaleTown_PokemonCenter_1F_Text_1FC0CD, MSGBOX_NPC +OldaleTown_PokemonCenter_1F_EventScript_Boy:: @ 81FC031 + msgbox OldaleTown_PokemonCenter_1F_Text_PokemonCentersAreGreat, MSGBOX_NPC end -OldaleTown_PokemonCenter_1F_EventScript_1FC03A:: @ 81FC03A +OldaleTown_PokemonCenter_1F_EventScript_Girl:: @ 81FC03A lock faceplayer - goto_if_set FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_1F_EventScript_1FC04F - msgbox OldaleTown_PokemonCenter_1F_Text_1FC148, MSGBOX_DEFAULT + goto_if_set FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_1F_EventScript_WirelessClubAvailable + msgbox OldaleTown_PokemonCenter_1F_Text_WirelessClubNotAvailable, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_1F_EventScript_1FC04F:: @ 81FC04F - msgbox OldaleTown_PokemonCenter_1F_Text_1FC1B9, MSGBOX_DEFAULT +OldaleTown_PokemonCenter_1F_EventScript_WirelessClubAvailable:: @ 81FC04F + msgbox OldaleTown_PokemonCenter_1F_Text_TradedInWirelessClub, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_1F_Text_1FC059: @ 81FC059 +OldaleTown_PokemonCenter_1F_Text_TrainersCanUsePC: @ 81FC059 .string "That PC in the corner there is\n" .string "for any POKéMON TRAINER to use.\p" .string "Naturally, that means you're welcome\n" .string "to use it, too.$" -OldaleTown_PokemonCenter_1F_Text_1FC0CD: @ 81FC0CD +OldaleTown_PokemonCenter_1F_Text_PokemonCentersAreGreat: @ 81FC0CD .string "POKéMON CENTERS are great!\p" .string "You can use their services as much\n" .string "as you like, and it's all for free.\l" .string "You never have to worry!$" -OldaleTown_PokemonCenter_1F_Text_1FC148: @ 81FC148 +OldaleTown_PokemonCenter_1F_Text_WirelessClubNotAvailable: @ 81FC148 .string "The POKéMON WIRELESS CLUB on\n" .string "the second floor was built recently.\p" .string "But they say they're still making\n" .string "adjustments.$" -OldaleTown_PokemonCenter_1F_Text_1FC1B9: @ 81FC1B9 +OldaleTown_PokemonCenter_1F_Text_TradedInWirelessClub: @ 81FC1B9 .string "The POKéMON WIRELESS CLUB on\n" .string "the second floor was built recently.\p" .string "I traded POKéMON right away.$" diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.json b/data/maps/OldaleTown_PokemonCenter_2F/map.json index cddd0a5a3..c3e41775d 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "OldaleTown_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc index aead0bd65..125805f50 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ OldaleTown_PokemonCenter_2F_MapScripts:: @ 81FC218 - map_script MAP_SCRIPT_ON_FRAME_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, OldaleTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -OldaleTown_PokemonCenter_2F_EventScript_1FC22D:: @ 81FC22D - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +OldaleTown_PokemonCenter_2F_EventScript_Colosseum:: @ 81FC22D + call CableClub_EventScript_Colosseum end -OldaleTown_PokemonCenter_2F_EventScript_1FC233:: @ 81FC233 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +OldaleTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 81FC233 + call CableClub_EventScript_TradeCenter end -OldaleTown_PokemonCenter_2F_EventScript_1FC239:: @ 81FC239 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +OldaleTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 81FC239 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc index 1d1518c0a..26e9924ed 100644 --- a/data/maps/PacifidlogTown/scripts.inc +++ b/data/maps/PacifidlogTown/scripts.inc @@ -8,7 +8,7 @@ PacifidlogTown_OnTransition: @ 81EBABC end PacifidlogTown_MapScript1_1EBAC0: @ 81EBAC0 - setstepcallback 3 + setstepcallback STEP_CB_PACIFIDLOG_BRIDGE end PacifidlogTown_EventScript_1EBAC3:: @ 81EBAC3 diff --git a/data/maps/PacifidlogTown_House3/scripts.inc b/data/maps/PacifidlogTown_House3/scripts.inc index 28f187da9..921f788d6 100644 --- a/data/maps/PacifidlogTown_House3/scripts.inc +++ b/data/maps/PacifidlogTown_House3/scripts.inc @@ -5,14 +5,14 @@ PacifidlogTown_House3_EventScript_203C11:: @ 8203C11 lock faceplayer goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_203CAB - setvar VAR_0x8008, 2 + setvar VAR_0x8008, INGAME_TRADE_HORSEA copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT msgbox PacifidlogTown_House3_Text_203CBE, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq PacifidlogTown_House3_EventScript_203C93 - special sub_81B94B0 + special ChoosePartyMon waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 diff --git a/data/maps/PacifidlogTown_House4/scripts.inc b/data/maps/PacifidlogTown_House4/scripts.inc index e9f5f19e7..1535b534d 100644 --- a/data/maps/PacifidlogTown_House4/scripts.inc +++ b/data/maps/PacifidlogTown_House4/scripts.inc @@ -13,9 +13,9 @@ PacifidlogTown_House4_EventScript_203F5E:: @ 8203F5E lock faceplayer msgbox PacifidlogTown_House4_Text_204035, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq PacifidlogTown_House4_EventScript_203F7F - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq PacifidlogTown_House4_EventScript_203F89 end diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json index 690243277..83fdd1f79 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE", + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_ExplosionTutor", "flag": "0" } ], diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc index f4fe115e5..e51f6e89f 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7 map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 PacifidlogTown_PokemonCenter_1F_OnTransition: @ 82034B2 @@ -9,7 +9,7 @@ PacifidlogTown_PokemonCenter_1F_OnTransition: @ 82034B2 PacifidlogTown_PokemonCenter_1F_EventScript_2034B6:: @ 82034B6 setvar VAR_0x800B, 1 - call PacifidlogTown_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json index c5f7c9907..25d8abd04 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PacifidlogTown_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc index fcb4f1ab4..576c1679c 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8203635 - map_script MAP_SCRIPT_ON_FRAME_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, PacifidlogTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -PacifidlogTown_PokemonCenter_2F_EventScript_20364A:: @ 820364A - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +PacifidlogTown_PokemonCenter_2F_EventScript_Colosseum:: @ 820364A + call CableClub_EventScript_Colosseum end -PacifidlogTown_PokemonCenter_2F_EventScript_203650:: @ 8203650 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +PacifidlogTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 8203650 + call CableClub_EventScript_TradeCenter end -PacifidlogTown_PokemonCenter_2F_EventScript_203656:: @ 8203656 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +PacifidlogTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 8203656 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index 44402aff5..721234bd5 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -35,7 +35,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_EventScript_1DC3FD", + "script": "PetalburgCity_EventScript_WallyAunt", "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_EventScript_1DC3E6", + "script": "PetalburgCity_EventScript_Boy1", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_EventScript_1DC488", + "script": "PetalburgCity_EventScript_Gentleman", "flag": "0" }, { @@ -126,7 +126,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_EventScript_1DC82E", + "script": "PetalburgCity_EventScript_Boy2", "flag": "0" }, { @@ -195,7 +195,7 @@ "elevation": 3, "var": "VAR_PETALBURG_CITY_STATE", "var_value": "0", - "script": "PetalburgCity_EventScript_1DC49A" + "script": "PetalburgCity_EventScript_ShowGymToPlayer0" }, { "type": "trigger", @@ -204,7 +204,7 @@ "elevation": 3, "var": "VAR_PETALBURG_CITY_STATE", "var_value": "0", - "script": "PetalburgCity_EventScript_1DC4A6" + "script": "PetalburgCity_EventScript_ShowGymToPlayer1" }, { "type": "trigger", @@ -213,7 +213,7 @@ "elevation": 3, "var": "VAR_PETALBURG_CITY_STATE", "var_value": "0", - "script": "PetalburgCity_EventScript_1DC4B2" + "script": "PetalburgCity_EventScript_ShowGymToPlayer2" }, { "type": "trigger", @@ -222,7 +222,7 @@ "elevation": 3, "var": "VAR_PETALBURG_CITY_STATE", "var_value": "0", - "script": "PetalburgCity_EventScript_1DC4BE" + "script": "PetalburgCity_EventScript_ShowGymToPlayer3" }, { "type": "trigger", @@ -231,7 +231,7 @@ "elevation": 3, "var": "VAR_SCOTT_PETALBURG_ENCOUNTER", "var_value": "0", - "script": "PetalburgCity_EventScript_1DC691" + "script": "PetalburgCity_EventScript_Scott0" }, { "type": "trigger", @@ -240,7 +240,7 @@ "elevation": 3, "var": "VAR_SCOTT_PETALBURG_ENCOUNTER", "var_value": "0", - "script": "PetalburgCity_EventScript_1DC6A7" + "script": "PetalburgCity_EventScript_Scott1" }, { "type": "trigger", @@ -249,7 +249,7 @@ "elevation": 3, "var": "VAR_SCOTT_PETALBURG_ENCOUNTER", "var_value": "0", - "script": "PetalburgCity_EventScript_1DC6BD" + "script": "PetalburgCity_EventScript_Scott2" }, { "type": "trigger", @@ -258,7 +258,7 @@ "elevation": 3, "var": "VAR_SCOTT_PETALBURG_ENCOUNTER", "var_value": "0", - "script": "PetalburgCity_EventScript_1DC6D3" + "script": "PetalburgCity_EventScript_Scott3" } ], "bg_events": [ @@ -268,7 +268,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_EventScript_1DC476" + "script": "PetalburgCity_EventScript_GymSign" }, { "type": "sign", @@ -292,7 +292,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_EventScript_1DC47F" + "script": "PetalburgCity_EventScript_CitySign" }, { "type": "sign", @@ -316,7 +316,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_EventScript_1DC491" + "script": "PetalburgCity_EventScript_WallyHouseSign" }, { "type": "hidden_item", diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index e95fc9d92..5d3bbf1ef 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -1,57 +1,57 @@ PetalburgCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_MapScript2_1DC31C + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_OnFrame .byte 0 PetalburgCity_OnTransition: @ 81DC2D7 setflag FLAG_VISITED_PETALBURG_CITY compare VAR_PETALBURG_CITY_STATE, 0 - call_if_eq PetalburgCity_EventScript_1DC307 + call_if_eq PetalburgCity_EventScript_MoveBoyToWestEntrance compare VAR_PETALBURG_CITY_STATE, 2 - call_if_eq PetalburgCity_EventScript_1DC30F + call_if_eq PetalburgCity_EventScript_DisableMapNameAndMusic compare VAR_PETALBURG_CITY_STATE, 4 - call_if_eq PetalburgCity_EventScript_1DC30F + call_if_eq PetalburgCity_EventScript_DisableMapNameAndMusic compare VAR_PETALBURG_GYM_STATE, 8 - call_if_eq PetalburgCity_EventScript_1DC316 + call_if_eq PetalburgCity_EventScript_SetGymDoorsUnlocked end -PetalburgCity_EventScript_1DC307:: @ 81DC307 +PetalburgCity_EventScript_MoveBoyToWestEntrance:: @ 81DC307 setobjectxyperm 8, 5, 11 return -PetalburgCity_EventScript_1DC30F:: @ 81DC30F +PetalburgCity_EventScript_DisableMapNameAndMusic:: @ 81DC30F setflag FLAG_HIDE_MAP_NAME_POPUP savebgm MUS_TSURETEK return -PetalburgCity_EventScript_1DC316:: @ 81DC316 +PetalburgCity_EventScript_SetGymDoorsUnlocked:: @ 81DC316 setvar VAR_PETALBURG_GYM_STATE, 7 return -PetalburgCity_MapScript2_1DC31C: @ 81DC31C - map_script_2 VAR_PETALBURG_CITY_STATE, 2, PetalburgCity_EventScript_1DC32E - map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_EventScript_1DC390 +PetalburgCity_OnFrame: @ 81DC31C + map_script_2 VAR_PETALBURG_CITY_STATE, 2, PetalburgCity_EventScript_WallyTutorial + map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_EventScript_WalkToWallyHouse .2byte 0 -PetalburgCity_EventScript_1DC32E:: @ 81DC32E +PetalburgCity_EventScript_WallyTutorial:: @ 81DC32E lockall special SavePlayerParty special PutZigzagoonInPlayerParty - applymovement 2, PetalburgCity_Movement_1DC451 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC430 + applymovement 2, PetalburgCity_Movement_WallyTutorialWally + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_WallyTutorialPlayer waitmovement 0 - msgbox PetalburgCity_Text_1EC1F8, MSGBOX_DEFAULT + msgbox Route102_Text_WatchMeCatchPokemon, MSGBOX_DEFAULT special StartWallyTutorialBattle waitstate - msgbox PetalburgCity_Text_1EC271, MSGBOX_DEFAULT - applymovement 2, Common_Movement_WalkInPlaceLeft, MAP_PETALBURG_CITY + msgbox Route102_Text_WallyIDidIt, MSGBOX_DEFAULT + applymovement 2, Common_Movement_WalkInPlaceFastestLeft, MAP_PETALBURG_CITY waitmovement 2, MAP_PETALBURG_CITY - msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT + msgbox Route102_Text_LetsGoBack, MSGBOX_DEFAULT closemessage clearflag FLAG_HIDE_MAP_NAME_POPUP setvar VAR_PETALBURG_CITY_STATE, 3 fadedefaultbgm - clearflag FLAG_SPECIAL_FLAG_0x4001 + clearflag FLAG_DONT_TRANSITION_MUSIC special LoadPlayerParty setvar VAR_PETALBURG_GYM_STATE, 1 warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 @@ -59,18 +59,18 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E releaseall end -PetalburgCity_EventScript_1DC390:: @ 81DC390 +PetalburgCity_EventScript_WalkToWallyHouse:: @ 81DC390 lockall setflag FLAG_HIDE_MAP_NAME_POPUP - applymovement 5, PetalburgCity_Movement_1DC41B - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC406 + applymovement 5, PetalburgCity_Movement_WalkToWallyHouseUncle + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_WalkToWallyHousePlayer waitmovement 0 setvar VAR_0x8004, 7 setvar VAR_0x8005, 5 opendoor VAR_0x8004, VAR_0x8005 waitdooranim - applymovement 5, PetalburgCity_Movement_1DC42D - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC418 + applymovement 5, PetalburgCity_Movement_WalkInsideHouseUncle + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_WalkInsideHousePlayer waitmovement 0 setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY @@ -78,27 +78,27 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390 waitdooranim clearflag FLAG_HIDE_MAP_NAME_POPUP fadedefaultbgm - clearflag FLAG_SPECIAL_FLAG_0x4001 + clearflag FLAG_DONT_TRANSITION_MUSIC warp MAP_PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4 waitstate releaseall end -PetalburgCity_EventScript_1DC3E6:: @ 81DC3E6 +PetalburgCity_EventScript_Boy1:: @ 81DC3E6 lock faceplayer - msgbox PetalburgCity_Text_1DC985, MSGBOX_DEFAULT + msgbox PetalburgCity_Text_WaterReflection, MSGBOX_DEFAULT closemessage applymovement 3, Common_Movement_FaceOriginalDirection waitmovement 0 release end -PetalburgCity_EventScript_1DC3FD:: @ 81DC3FD - msgbox PetalburgCity_Text_1DC837, MSGBOX_NPC +PetalburgCity_EventScript_WallyAunt:: @ 81DC3FD + msgbox PetalburgCity_Text_WhereIsWally, MSGBOX_NPC end -PetalburgCity_Movement_1DC406: @ 81DC406 +PetalburgCity_Movement_WalkToWallyHousePlayer: @ 81DC406 delay_8 walk_down walk_down @@ -118,12 +118,12 @@ PetalburgCity_Movement_1DC406: @ 81DC406 walk_up step_end -PetalburgCity_Movement_1DC418: @ 81DC418 +PetalburgCity_Movement_WalkInsideHousePlayer: @ 81DC418 walk_up walk_up step_end -PetalburgCity_Movement_1DC41B: @ 81DC41B +PetalburgCity_Movement_WalkToWallyHouseUncle: @ 81DC41B delay_8 walk_down walk_down @@ -143,12 +143,12 @@ PetalburgCity_Movement_1DC41B: @ 81DC41B walk_up step_end -PetalburgCity_Movement_1DC42D: @ 81DC42D +PetalburgCity_Movement_WalkInsideHouseUncle: @ 81DC42D walk_up set_invisible step_end -PetalburgCity_Movement_1DC430: @ 81DC430 +PetalburgCity_Movement_WallyTutorialPlayer: @ 81DC430 delay_8 walk_down walk_down @@ -183,7 +183,7 @@ PetalburgCity_Movement_1DC430: @ 81DC430 walk_in_place_fastest_right step_end -PetalburgCity_Movement_1DC451: @ 81DC451 +PetalburgCity_Movement_WallyTutorialWally: @ 81DC451 delay_8 walk_down walk_down @@ -222,47 +222,47 @@ PetalburgCity_Movement_1DC451: @ 81DC451 walk_in_place_fastest_right step_end -PetalburgCity_EventScript_1DC476:: @ 81DC476 - msgbox PetalburgCity_Text_1DCAAA, MSGBOX_SIGN +PetalburgCity_EventScript_GymSign:: @ 81DC476 + msgbox PetalburgCity_Text_GymSign, MSGBOX_SIGN end -PetalburgCity_EventScript_1DC47F:: @ 81DC47F - msgbox PetalburgCity_Text_1DCAF1, MSGBOX_SIGN +PetalburgCity_EventScript_CitySign:: @ 81DC47F + msgbox PetalburgCity_Text_CitySign, MSGBOX_SIGN end -PetalburgCity_EventScript_1DC488:: @ 81DC488 - msgbox PetalburgCity_Text_1DCA30, MSGBOX_NPC +PetalburgCity_EventScript_Gentleman:: @ 81DC488 + msgbox PetalburgCity_Text_FullPartyExplanation, MSGBOX_NPC end -PetalburgCity_EventScript_1DC491:: @ 81DC491 - msgbox PetalburgCity_Text_1DCB23, MSGBOX_SIGN +PetalburgCity_EventScript_WallyHouseSign:: @ 81DC491 + msgbox PetalburgCity_Text_WallyHouseSign, MSGBOX_SIGN end -PetalburgCity_EventScript_1DC49A:: @ 81DC49A +PetalburgCity_EventScript_ShowGymToPlayer0:: @ 81DC49A lockall setvar VAR_0x8008, 0 - goto PetalburgCity_EventScript_1DC4CA + goto PetalburgCity_EventScript_ShowGymToPlayer end -PetalburgCity_EventScript_1DC4A6:: @ 81DC4A6 +PetalburgCity_EventScript_ShowGymToPlayer1:: @ 81DC4A6 lockall setvar VAR_0x8008, 1 - goto PetalburgCity_EventScript_1DC4CA + goto PetalburgCity_EventScript_ShowGymToPlayer end -PetalburgCity_EventScript_1DC4B2:: @ 81DC4B2 +PetalburgCity_EventScript_ShowGymToPlayer2:: @ 81DC4B2 lockall setvar VAR_0x8008, 2 - goto PetalburgCity_EventScript_1DC4CA + goto PetalburgCity_EventScript_ShowGymToPlayer end -PetalburgCity_EventScript_1DC4BE:: @ 81DC4BE +PetalburgCity_EventScript_ShowGymToPlayer3:: @ 81DC4BE lockall setvar VAR_0x8008, 3 - goto PetalburgCity_EventScript_1DC4CA + goto PetalburgCity_EventScript_ShowGymToPlayer end -PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA +PetalburgCity_EventScript_ShowGymToPlayer:: @ 81DC4CA applymovement 8, Common_Movement_FacePlayer waitmovement 0 playbgm MUS_TSURETEK, 0 @@ -272,82 +272,82 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA applymovement 8, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 0 - call_if_eq PetalburgCity_EventScript_1DC57F + call_if_eq PetalburgCity_EventScript_BoyApproachPlayer0 compare VAR_0x8008, 1 - call_if_eq PetalburgCity_EventScript_1DC594 + call_if_eq PetalburgCity_EventScript_BoyApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq PetalburgCity_EventScript_1DC59F + call_if_eq PetalburgCity_EventScript_BoyApproachPlayer2 compare VAR_0x8008, 3 - call_if_eq PetalburgCity_EventScript_1DC5B4 - msgbox PetalburgCity_Text_1DC881, MSGBOX_DEFAULT + call_if_eq PetalburgCity_EventScript_BoyApproachPlayer3 + msgbox PetalburgCity_Text_AreYouRookieTrainer, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if_eq PetalburgCity_EventScript_1DC5C9 + call_if_eq PetalburgCity_EventScript_LeadPlayerToGym0 compare VAR_0x8008, 1 - call_if_eq PetalburgCity_EventScript_1DC5DB + call_if_eq PetalburgCity_EventScript_LeadPlayerToGym1 compare VAR_0x8008, 2 - call_if_eq PetalburgCity_EventScript_1DC5ED + call_if_eq PetalburgCity_EventScript_LeadPlayerToGym2 compare VAR_0x8008, 3 - call_if_eq PetalburgCity_EventScript_1DC5FF - msgbox PetalburgCity_Text_1DC91B, MSGBOX_DEFAULT - applymovement 8, Common_Movement_WalkInPlaceRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + call_if_eq PetalburgCity_EventScript_LeadPlayerToGym3 + msgbox PetalburgCity_Text_ThisIsPetalburgGym, MSGBOX_DEFAULT + applymovement 8, Common_Movement_WalkInPlaceFastestRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox PetalburgCity_Text_1DC93E, MSGBOX_DEFAULT + msgbox PetalburgCity_Text_ThisIsGymSign, MSGBOX_DEFAULT closemessage - applymovement 8, PetalburgCity_Movement_1DC658 + applymovement 8, PetalburgCity_Movement_BoyWalkAway waitmovement 0 fadedefaultbgm releaseall end -PetalburgCity_EventScript_1DC57F:: @ 81DC57F - applymovement 8, PetalburgCity_Movement_1DC615 +PetalburgCity_EventScript_BoyApproachPlayer0:: @ 81DC57F + applymovement 8, PetalburgCity_Movement_BoyApproachPlayer0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_EventScript_1DC594:: @ 81DC594 - applymovement 8, PetalburgCity_Movement_1DC61A +PetalburgCity_EventScript_BoyApproachPlayer1:: @ 81DC594 + applymovement 8, PetalburgCity_Movement_BoyApproachPlayer1 waitmovement 0 return -PetalburgCity_EventScript_1DC59F:: @ 81DC59F - applymovement 8, PetalburgCity_Movement_1DC61D +PetalburgCity_EventScript_BoyApproachPlayer2:: @ 81DC59F + applymovement 8, PetalburgCity_Movement_BoyApproachPlayer2 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -PetalburgCity_EventScript_1DC5B4:: @ 81DC5B4 - applymovement 8, PetalburgCity_Movement_1DC622 +PetalburgCity_EventScript_BoyApproachPlayer3:: @ 81DC5B4 + applymovement 8, PetalburgCity_Movement_BoyApproachPlayer3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -PetalburgCity_EventScript_1DC5C9:: @ 81DC5C9 - applymovement 8, PetalburgCity_Movement_1DC628 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC665 +PetalburgCity_EventScript_LeadPlayerToGym0:: @ 81DC5C9 + applymovement 8, PetalburgCity_Movement_BoyWalkToGym0 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym0 waitmovement 0 return -PetalburgCity_EventScript_1DC5DB:: @ 81DC5DB - applymovement 8, PetalburgCity_Movement_1DC633 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC66F +PetalburgCity_EventScript_LeadPlayerToGym1:: @ 81DC5DB + applymovement 8, PetalburgCity_Movement_BoyWalkToGym1 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym1 waitmovement 0 return -PetalburgCity_EventScript_1DC5ED:: @ 81DC5ED - applymovement 8, PetalburgCity_Movement_1DC641 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC67C +PetalburgCity_EventScript_LeadPlayerToGym2:: @ 81DC5ED + applymovement 8, PetalburgCity_Movement_BoyWalkToGym2 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym2 waitmovement 0 return -PetalburgCity_EventScript_1DC5FF:: @ 81DC5FF - applymovement 8, PetalburgCity_Movement_1DC64C - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC686 +PetalburgCity_EventScript_LeadPlayerToGym3:: @ 81DC5FF + applymovement 8, PetalburgCity_Movement_BoyWalkToGym3 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym3 waitmovement 0 return @@ -357,26 +357,26 @@ PetalburgCity_Movement_1DC611:: @ 81DC611 delay_16 step_end -PetalburgCity_Movement_1DC615: @ 81DC615 +PetalburgCity_Movement_BoyApproachPlayer0: @ 81DC615 walk_right walk_right walk_right walk_in_place_fastest_up step_end -PetalburgCity_Movement_1DC61A: @ 81DC61A +PetalburgCity_Movement_BoyApproachPlayer1: @ 81DC61A walk_right walk_right step_end -PetalburgCity_Movement_1DC61D: @ 81DC61D +PetalburgCity_Movement_BoyApproachPlayer2: @ 81DC61D walk_right walk_right walk_right walk_in_place_fastest_down step_end -PetalburgCity_Movement_1DC622: @ 81DC622 +PetalburgCity_Movement_BoyApproachPlayer3: @ 81DC622 walk_down walk_right walk_right @@ -384,7 +384,7 @@ PetalburgCity_Movement_1DC622: @ 81DC622 walk_in_place_fastest_down step_end -PetalburgCity_Movement_1DC628: @ 81DC628 +PetalburgCity_Movement_BoyWalkToGym0: @ 81DC628 walk_right walk_right walk_right @@ -397,7 +397,7 @@ PetalburgCity_Movement_1DC628: @ 81DC628 walk_in_place_fastest_up step_end -PetalburgCity_Movement_1DC633: @ 81DC633 +PetalburgCity_Movement_BoyWalkToGym1: @ 81DC633 walk_down walk_right walk_right @@ -413,7 +413,7 @@ PetalburgCity_Movement_1DC633: @ 81DC633 walk_in_place_fastest_up step_end -PetalburgCity_Movement_1DC641: @ 81DC641 +PetalburgCity_Movement_BoyWalkToGym2: @ 81DC641 walk_right walk_right walk_right @@ -426,7 +426,7 @@ PetalburgCity_Movement_1DC641: @ 81DC641 walk_in_place_fastest_up step_end -PetalburgCity_Movement_1DC64C: @ 81DC64C +PetalburgCity_Movement_BoyWalkToGym3: @ 81DC64C walk_right walk_right walk_right @@ -440,7 +440,7 @@ PetalburgCity_Movement_1DC64C: @ 81DC64C walk_in_place_fastest_up step_end -PetalburgCity_Movement_1DC658: @ 81DC658 +PetalburgCity_Movement_BoyWalkAway: @ 81DC658 walk_down walk_left walk_left @@ -455,7 +455,7 @@ PetalburgCity_Movement_1DC658: @ 81DC658 walk_left step_end -PetalburgCity_Movement_1DC665: @ 81DC665 +PetalburgCity_Movement_PlayerWalkToGym0: @ 81DC665 walk_down walk_right walk_right @@ -467,7 +467,7 @@ PetalburgCity_Movement_1DC665: @ 81DC665 walk_up step_end -PetalburgCity_Movement_1DC66F: @ 81DC66F +PetalburgCity_Movement_PlayerWalkToGym1: @ 81DC66F delay_16 delay_16 walk_down @@ -482,7 +482,7 @@ PetalburgCity_Movement_1DC66F: @ 81DC66F walk_up step_end -PetalburgCity_Movement_1DC67C: @ 81DC67C +PetalburgCity_Movement_PlayerWalkToGym2: @ 81DC67C walk_up walk_right walk_right @@ -494,7 +494,7 @@ PetalburgCity_Movement_1DC67C: @ 81DC67C walk_up step_end -PetalburgCity_Movement_1DC686: @ 81DC686 +PetalburgCity_Movement_PlayerWalkToGym3: @ 81DC686 walk_up walk_right walk_right @@ -507,115 +507,115 @@ PetalburgCity_Movement_1DC686: @ 81DC686 walk_up step_end -PetalburgCity_EventScript_1DC691:: @ 81DC691 +PetalburgCity_EventScript_Scott0:: @ 81DC691 lockall addobject 9 setvar VAR_0x8008, 0 setobjectxy 9, 13, 10 - goto PetalburgCity_EventScript_1DC6E9 + goto PetalburgCity_EventScript_Scott end -PetalburgCity_EventScript_1DC6A7:: @ 81DC6A7 +PetalburgCity_EventScript_Scott1:: @ 81DC6A7 lockall addobject 9 setvar VAR_0x8008, 1 setobjectxy 9, 13, 11 - goto PetalburgCity_EventScript_1DC6E9 + goto PetalburgCity_EventScript_Scott end -PetalburgCity_EventScript_1DC6BD:: @ 81DC6BD +PetalburgCity_EventScript_Scott2:: @ 81DC6BD lockall addobject 9 setvar VAR_0x8008, 2 setobjectxy 9, 13, 12 - goto PetalburgCity_EventScript_1DC6E9 + goto PetalburgCity_EventScript_Scott end -PetalburgCity_EventScript_1DC6D3:: @ 81DC6D3 +PetalburgCity_EventScript_Scott3:: @ 81DC6D3 lockall addobject 9 setvar VAR_0x8008, 3 setobjectxy 9, 13, 13 - goto PetalburgCity_EventScript_1DC6E9 + goto PetalburgCity_EventScript_Scott end -PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 - applymovement 9, PetalburgCity_Movement_1DC7D6 +PetalburgCity_EventScript_Scott:: @ 81DC6E9 + applymovement 9, PetalburgCity_Movement_ScottStartWalkLeft waitmovement 0 playse SE_PIN applymovement 9, Common_Movement_ExclamationMark waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement 9, PetalburgCity_Movement_1DC7DB + applymovement 9, PetalburgCity_Movement_ScottApproachPlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 setvar VAR_SCOTT_STATE, 1 - msgbox PetalburgCity_Text_1DCB31, MSGBOX_DEFAULT + msgbox PetalburgCity_Text_AreYouATrainer, MSGBOX_DEFAULT closemessage - applymovement 9, Common_Movement_WalkInPlaceRight + applymovement 9, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 - msgbox PetalburgCity_Text_1DCB82, MSGBOX_DEFAULT + msgbox PetalburgCity_Text_WellMaybeNot, MSGBOX_DEFAULT closemessage - applymovement 9, Common_Movement_WalkInPlaceLeft + applymovement 9, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 30 - msgbox PetalburgCity_Text_1DCC09, MSGBOX_DEFAULT + msgbox PetalburgCity_Text_ImLookingForTalentedTrainers, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if_eq PetalburgCity_EventScript_1DC78E + call_if_eq PetalburgCity_EventScript_ScottExit0 compare VAR_0x8008, 1 - call_if_eq PetalburgCity_EventScript_1DC7A0 + call_if_eq PetalburgCity_EventScript_ScottExit1 compare VAR_0x8008, 2 - call_if_eq PetalburgCity_EventScript_1DC7B2 + call_if_eq PetalburgCity_EventScript_ScottExit2 compare VAR_0x8008, 3 - call_if_eq PetalburgCity_EventScript_1DC7C4 + call_if_eq PetalburgCity_EventScript_ScottExit3 setvar VAR_SCOTT_PETALBURG_ENCOUNTER, 1 removeobject 9 releaseall end -PetalburgCity_EventScript_1DC78E:: @ 81DC78E - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC7EE - applymovement 9, PetalburgCity_Movement_1DC7E0 +PetalburgCity_EventScript_ScottExit0:: @ 81DC78E + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit0 + applymovement 9, PetalburgCity_Movement_ScottExit0 waitmovement 0 return -PetalburgCity_EventScript_1DC7A0:: @ 81DC7A0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC802 - applymovement 9, PetalburgCity_Movement_1DC7F5 +PetalburgCity_EventScript_ScottExit1:: @ 81DC7A0 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit1 + applymovement 9, PetalburgCity_Movement_ScottExit1 waitmovement 0 return -PetalburgCity_EventScript_1DC7B2:: @ 81DC7B2 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC815 - applymovement 9, PetalburgCity_Movement_1DC808 +PetalburgCity_EventScript_ScottExit2:: @ 81DC7B2 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit2 + applymovement 9, PetalburgCity_Movement_ScottExit2 waitmovement 0 return -PetalburgCity_EventScript_1DC7C4:: @ 81DC7C4 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC828 - applymovement 9, PetalburgCity_Movement_1DC81B +PetalburgCity_EventScript_ScottExit3:: @ 81DC7C4 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit3 + applymovement 9, PetalburgCity_Movement_ScottExit3 waitmovement 0 return -PetalburgCity_Movement_1DC7D6: @ 81DC7D6 +PetalburgCity_Movement_ScottStartWalkLeft: @ 81DC7D6 walk_left walk_left walk_left walk_left step_end -PetalburgCity_Movement_1DC7DB: @ 81DC7DB +PetalburgCity_Movement_ScottApproachPlayer: @ 81DC7DB walk_left walk_left walk_left walk_left step_end -PetalburgCity_Movement_1DC7E0: @ 81DC7E0 +PetalburgCity_Movement_ScottExit0: @ 81DC7E0 walk_down walk_down walk_left @@ -631,7 +631,7 @@ PetalburgCity_Movement_1DC7E0: @ 81DC7E0 walk_left step_end -PetalburgCity_Movement_1DC7EE: @ 81DC7EE +PetalburgCity_Movement_PlayerWatchScottExit0: @ 81DC7EE delay_16 walk_in_place_fastest_down delay_16 @@ -640,7 +640,7 @@ PetalburgCity_Movement_1DC7EE: @ 81DC7EE walk_in_place_fastest_left step_end -PetalburgCity_Movement_1DC7F5: @ 81DC7F5 +PetalburgCity_Movement_ScottExit1: @ 81DC7F5 walk_down walk_left walk_left @@ -655,7 +655,7 @@ PetalburgCity_Movement_1DC7F5: @ 81DC7F5 walk_left step_end -PetalburgCity_Movement_1DC802: @ 81DC802 +PetalburgCity_Movement_PlayerWatchScottExit1: @ 81DC802 delay_16 walk_in_place_fastest_down delay_16 @@ -663,7 +663,7 @@ PetalburgCity_Movement_1DC802: @ 81DC802 walk_in_place_fastest_left step_end -PetalburgCity_Movement_1DC808: @ 81DC808 +PetalburgCity_Movement_ScottExit2: @ 81DC808 walk_down walk_left walk_left @@ -678,7 +678,7 @@ PetalburgCity_Movement_1DC808: @ 81DC808 walk_left step_end -PetalburgCity_Movement_1DC815: @ 81DC815 +PetalburgCity_Movement_PlayerWatchScottExit2: @ 81DC815 delay_16 walk_in_place_fastest_down delay_16 @@ -686,7 +686,7 @@ PetalburgCity_Movement_1DC815: @ 81DC815 walk_in_place_fastest_left step_end -PetalburgCity_Movement_1DC81B: @ 81DC81B +PetalburgCity_Movement_ScottExit3: @ 81DC81B walk_up walk_left walk_left @@ -701,7 +701,7 @@ PetalburgCity_Movement_1DC81B: @ 81DC81B walk_left step_end -PetalburgCity_Movement_1DC828: @ 81DC828 +PetalburgCity_Movement_PlayerWatchScottExit3: @ 81DC828 delay_16 walk_in_place_fastest_up delay_16 @@ -709,16 +709,16 @@ PetalburgCity_Movement_1DC828: @ 81DC828 walk_in_place_fastest_left step_end -PetalburgCity_EventScript_1DC82E:: @ 81DC82E - msgbox PetalburgCity_Text_1DC881, MSGBOX_NPC +PetalburgCity_EventScript_Boy2:: @ 81DC82E + msgbox PetalburgCity_Text_AreYouRookieTrainer, MSGBOX_NPC end -PetalburgCity_Text_1DC837: @ 81DC837 +PetalburgCity_Text_WhereIsWally: @ 81DC837 .string "Where has our WALLY gone?\p" .string "We have to leave for VERDANTURF TOWN\n" .string "very soon…$" -PetalburgCity_Text_1DC881: @ 81DC881 +PetalburgCity_Text_AreYouRookieTrainer: @ 81DC881 .string "Hiya! Are you maybe…\n" .string "A rookie TRAINER?\p" .string "Do you know what POKéMON TRAINERS\n" @@ -726,51 +726,51 @@ PetalburgCity_Text_1DC881: @ 81DC881 .string "They first check what kind of GYM\n" .string "is in the town.$" -PetalburgCity_Text_1DC91B: @ 81DC91B +PetalburgCity_Text_ThisIsPetalburgGym: @ 81DC91B .string "See? This is PETALBURG CITY's GYM.$" -PetalburgCity_Text_1DC93E: @ 81DC93E +PetalburgCity_Text_ThisIsGymSign: @ 81DC93E .string "This is the GYM's sign. Look for it\n" .string "whenever you're looking for a GYM.$" -PetalburgCity_Text_1DC985: @ 81DC985 +PetalburgCity_Text_WaterReflection: @ 81DC985 .string "My face is reflected in the water.\p" .string "It's a shining grin full of hope…\p" .string "Or it could be a look of somber silence\n" .string "struggling with fear…\p" .string "What do you see reflected in your face?$" -PetalburgCity_Text_1DCA30: @ 81DCA30 +PetalburgCity_Text_FullPartyExplanation: @ 81DCA30 .string "Let's say you have six POKéMON.\n" .string "If you catch another one…\p" .string "It is automatically sent to a STORAGE\n" .string "BOX over a PC connection.$" -PetalburgCity_Text_1DCAAA: @ 81DCAAA +PetalburgCity_Text_GymSign: @ 81DCAAA .string "PETALBURG CITY POKéMON GYM\n" .string "LEADER: NORMAN\l" .string "“A man in pursuit of power!”$" -PetalburgCity_Text_1DCAF1: @ 81DCAF1 +PetalburgCity_Text_CitySign: @ 81DCAF1 .string "PETALBURG CITY\n" .string "“Where people mingle with nature.”$" -PetalburgCity_Text_1DCB23: @ 81DCB23 +PetalburgCity_Text_WallyHouseSign: @ 81DCB23 .string "WALLY'S HOUSE$" -PetalburgCity_Text_1DCB31: @ 81DCB31 +PetalburgCity_Text_AreYouATrainer: @ 81DCB31 .string "Excuse me!\p" .string "Let me guess, from the way you're\n" .string "dressed, are you a POKéMON TRAINER?$" -PetalburgCity_Text_1DCB82: @ 81DCB82 +PetalburgCity_Text_WellMaybeNot: @ 81DCB82 .string "… … … … … …\p" .string "Well, maybe not.\n" .string "Your clothes aren't all that dirty.\p" .string "You're either a rookie TRAINER,\n" .string "or maybe you're just an ordinary kid.$" -PetalburgCity_Text_1DCC09: @ 81DCC09 +PetalburgCity_Text_ImLookingForTalentedTrainers: @ 81DCC09 .string "I'm roaming the land in search of\n" .string "talented TRAINERS.\p" .string "I'm sorry to have taken your time.$" diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json index ff317c943..30cb6e209 100644 --- a/data/maps/PetalburgCity_Gym/map.json +++ b/data/maps/PetalburgCity_Gym/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_2049F1", + "script": "PetalburgCity_Gym_EventScript_Norman", "flag": "FLAG_HIDE_PETALBURG_GYM_NORMAN" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_2054AA", + "script": "PetalburgCity_Gym_EventScript_Mary", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_2053BA", + "script": "PetalburgCity_Gym_EventScript_Randall", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_2053F6", + "script": "PetalburgCity_Gym_EventScript_Parker", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_2054E6", + "script": "PetalburgCity_Gym_EventScript_Alexia", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_205432", + "script": "PetalburgCity_Gym_EventScript_George", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_205522", + "script": "PetalburgCity_Gym_EventScript_Jody", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_20546E", + "script": "PetalburgCity_Gym_EventScript_Berke", "flag": "0" }, { @@ -128,7 +128,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Gym_EventScript_20574F", + "script": "PetalburgCity_Gym_EventScript_GymGuide", "flag": "FLAG_HIDE_PETALBURG_GYM_GREETER" }, { @@ -434,7 +434,7 @@ "y": 105, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_205137" + "script": "PetalburgCity_Gym_EventScript_SpeedRoomDoor" }, { "type": "sign", @@ -442,7 +442,7 @@ "y": 105, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_205187" + "script": "PetalburgCity_Gym_EventScript_AccuracyRoomDoor" }, { "type": "sign", @@ -450,7 +450,7 @@ "y": 79, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_2051BC" + "script": "PetalburgCity_Gym_EventScript_ConfusionRoomDoor" }, { "type": "sign", @@ -458,7 +458,7 @@ "y": 79, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_2051EF" + "script": "PetalburgCity_Gym_EventScript_LeftDefenseRoomDoor" }, { "type": "sign", @@ -466,7 +466,7 @@ "y": 92, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_205222" + "script": "PetalburgCity_Gym_EventScript_RightDefenseRoomDoor" }, { "type": "sign", @@ -474,7 +474,7 @@ "y": 92, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_205255" + "script": "PetalburgCity_Gym_EventScript_RecoveryRoomDoor" }, { "type": "sign", @@ -482,7 +482,7 @@ "y": 40, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_205288" + "script": "PetalburgCity_Gym_EventScript_LeftStrengthRoomDoor" }, { "type": "sign", @@ -490,7 +490,7 @@ "y": 53, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_2052BB" + "script": "PetalburgCity_Gym_EventScript_RightStrengthRoomDoor" }, { "type": "sign", @@ -498,7 +498,7 @@ "y": 53, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_2052EE" + "script": "PetalburgCity_Gym_EventScript_LeftOHKORoomDoor" }, { "type": "sign", @@ -506,7 +506,7 @@ "y": 66, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_205321" + "script": "PetalburgCity_Gym_EventScript_RightOHKORoomDoor" }, { "type": "sign", @@ -514,7 +514,7 @@ "y": 14, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_205354" + "script": "PetalburgCity_Gym_EventScript_LeftGymLeadersRoomDoor" }, { "type": "sign", @@ -522,7 +522,7 @@ "y": 27, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgCity_Gym_EventScript_205387" + "script": "PetalburgCity_Gym_EventScript_RightGymLeadersRoomDoor" }, { "type": "sign", @@ -530,7 +530,7 @@ "y": 110, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_Gym_EventScript_20576E" + "script": "PetalburgCity_Gym_EventScript_LeftGymStatue" }, { "type": "sign", @@ -538,7 +538,7 @@ "y": 110, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "PetalburgCity_Gym_EventScript_20577E" + "script": "PetalburgCity_Gym_EventScript_RightGymStatue" } ] }
\ No newline at end of file diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 749ed18f2..d9f299db2 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -1,219 +1,220 @@ PetalburgCity_Gym_MapScripts:: @ 8204889 - map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_OnTransition - map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_Gym_MapScript1_20492D - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_Gym_MapScript2_20498B - map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_Gym_MapScript2_20499A + map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_Gym_OnTransition + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_Gym_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_Gym_OnFrame .byte 0 -PetalburgCity_Gym_OnTransition: @ 820489E +PetalburgCity_Gym_OnLoad: @ 820489E compare VAR_PETALBURG_GYM_STATE, 6 - goto_if_eq PetalburgCity_Gym_EventScript_2048B5 + goto_if_eq PetalburgCity_Gym_EventScript_OpenUnlockedDoors compare VAR_PETALBURG_GYM_STATE, 7 - call_if_ge PetalburgCity_Gym_EventScript_2048FF + call_if_ge PetalburgCity_Gym_EventScript_UnlockAllDoors end -PetalburgCity_Gym_EventScript_2048B5:: @ 82048B5 +@ NOTE: Strength and OHKO rooms are misleading. Both are more accurately Critical-Hit +PetalburgCity_Gym_EventScript_OpenUnlockedDoors:: @ 82048B5 setvar VAR_0x8005, 1 - call PetalburgCity_Gym_EventScript_20555E + call PetalburgCity_Gym_EventScript_OpenGymEntranceDoors checktrainerflag TRAINER_RANDALL - call_if_eq PetalburgCity_Gym_EventScript_20557F + call_if_eq PetalburgCity_Gym_EventScript_OpenSpeedRoomDoors checktrainerflag TRAINER_MARY - call_if_eq PetalburgCity_Gym_EventScript_2055A0 + call_if_eq PetalburgCity_Gym_EventScript_OpenAccuracyRoomDoors checktrainerflag TRAINER_PARKER - call_if_eq PetalburgCity_Gym_EventScript_2055C1 + call_if_eq PetalburgCity_Gym_EventScript_OpenConfusionRoomDoors checktrainerflag TRAINER_ALEXIA - call_if_eq PetalburgCity_Gym_EventScript_2055E2 + call_if_eq PetalburgCity_Gym_EventScript_OpenDefenseRoomDoors checktrainerflag TRAINER_GEORGE - call_if_eq PetalburgCity_Gym_EventScript_205603 + call_if_eq PetalburgCity_Gym_EventScript_OpenRecoveryRoomDoors checktrainerflag TRAINER_JODY - call_if_eq PetalburgCity_Gym_EventScript_205624 + call_if_eq PetalburgCity_Gym_EventScript_OpenStrengthRoomDoors checktrainerflag TRAINER_BERKE - call_if_eq PetalburgCity_Gym_EventScript_205645 + call_if_eq PetalburgCity_Gym_EventScript_OpenOHKORoomDoors end -PetalburgCity_Gym_EventScript_2048FF:: @ 82048FF +PetalburgCity_Gym_EventScript_UnlockAllDoors:: @ 82048FF setvar VAR_0x8005, 1 - call PetalburgCity_Gym_EventScript_20555E - call PetalburgCity_Gym_EventScript_20557F - call PetalburgCity_Gym_EventScript_2055A0 - call PetalburgCity_Gym_EventScript_2055C1 - call PetalburgCity_Gym_EventScript_2055E2 - call PetalburgCity_Gym_EventScript_205603 - call PetalburgCity_Gym_EventScript_205624 - call PetalburgCity_Gym_EventScript_205645 + call PetalburgCity_Gym_EventScript_OpenGymEntranceDoors + call PetalburgCity_Gym_EventScript_OpenSpeedRoomDoors + call PetalburgCity_Gym_EventScript_OpenAccuracyRoomDoors + call PetalburgCity_Gym_EventScript_OpenConfusionRoomDoors + call PetalburgCity_Gym_EventScript_OpenDefenseRoomDoors + call PetalburgCity_Gym_EventScript_OpenRecoveryRoomDoors + call PetalburgCity_Gym_EventScript_OpenStrengthRoomDoors + call PetalburgCity_Gym_EventScript_OpenOHKORoomDoors return -PetalburgCity_Gym_MapScript1_20492D: @ 820492D +PetalburgCity_Gym_OnTransition: @ 820492D compare VAR_PETALBURG_GYM_STATE, 1 - call_if_eq PetalburgCity_Gym_EventScript_20494D + call_if_eq PetalburgCity_Gym_EventScript_MoveWallyToEntrance compare VAR_PETALBURG_GYM_STATE, 6 - call_if_lt PetalburgCity_Gym_EventScript_204955 - call_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_20495D + call_if_lt PetalburgCity_Gym_EventScript_MoveNormanToEntrance + call_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_CheckNormanForRematch end -PetalburgCity_Gym_EventScript_20494D:: @ 820494D +PetalburgCity_Gym_EventScript_MoveWallyToEntrance:: @ 820494D setobjectxyperm 10, 5, 108 return -PetalburgCity_Gym_EventScript_204955:: @ 8204955 +PetalburgCity_Gym_EventScript_MoveNormanToEntrance:: @ 8204955 setobjectxyperm 1, 4, 107 return -PetalburgCity_Gym_EventScript_20495D:: @ 820495D - setorcopyvar VAR_TRAINER_BATTLE_OPPONENT_A, 269 +PetalburgCity_Gym_EventScript_CheckNormanForRematch:: @ 820495D + setorcopyvar VAR_TRAINER_BATTLE_OPPONENT_A, TRAINER_NORMAN_1 specialvar VAR_RESULT, IsTrainerReadyForRematch - compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_204985 + compare VAR_RESULT, TRUE + goto_if_eq PetalburgCity_Gym_EventScript_DontMoveNormanToFront compare VAR_PETALBURG_GYM_STATE, 8 - goto_if_eq PetalburgCity_Gym_EventScript_204985 + goto_if_eq PetalburgCity_Gym_EventScript_DontMoveNormanToFront setobjectxyperm 1, 4, 107 return -PetalburgCity_Gym_EventScript_204985:: @ 8204985 +PetalburgCity_Gym_EventScript_DontMoveNormanToFront:: @ 8204985 setvar VAR_PETALBURG_GYM_STATE, 8 end -PetalburgCity_Gym_MapScript2_20498B: @ 820498B - map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_204995 +PetalburgCity_Gym_OnWarp: @ 820498B + map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_TurnPlayerNorth .2byte 0 -PetalburgCity_Gym_EventScript_204995:: @ 8204995 +PetalburgCity_Gym_EventScript_TurnPlayerNorth:: @ 8204995 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -PetalburgCity_Gym_MapScript2_20499A: @ 820499A - map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_2049A4 +PetalburgCity_Gym_OnFrame: @ 820499A + map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_ReturnFromWallyTutorial .2byte 0 -PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 +PetalburgCity_Gym_EventScript_ReturnFromWallyTutorial:: @ 82049A4 lockall - msgbox PetalburgCity_Gym_Text_205B32, MSGBOX_DEFAULT - msgbox PetalburgCity_Gym_Text_205B4C, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_DadSoDidItWorkOut, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_WallyThankYouBye, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown - applymovement 10, PetalburgCity_Gym_Movement_2049EC + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement 10, PetalburgCity_Gym_Movement_WallyExitGym waitmovement 0 playse SE_KAIDAN removeobject 10 setflag FLAG_HIDE_PETALBURG_CITY_WALLY delay 30 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox PetalburgCity_Gym_Text_205C40, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_DadGoCollectBadges, MSGBOX_DEFAULT setvar VAR_PETALBURG_GYM_STATE, 2 releaseall end -PetalburgCity_Gym_Movement_2049EC: @ 82049EC +PetalburgCity_Gym_Movement_WallyExitGym: @ 82049EC walk_down walk_down walk_down delay_16 step_end -PetalburgCity_Gym_EventScript_2049F1:: @ 82049F1 +PetalburgCity_Gym_EventScript_Norman:: @ 82049F1 lock faceplayer switch VAR_PETALBURG_GYM_STATE - case 2, PetalburgCity_Gym_EventScript_204D4A - case 3, PetalburgCity_Gym_EventScript_204D54 - case 4, PetalburgCity_Gym_EventScript_204D5E - case 5, PetalburgCity_Gym_EventScript_204D68 - case 6, PetalburgCity_Gym_EventScript_204E3B - case 7, PetalburgCity_Gym_EventScript_204D80 - case 8, PetalburgCity_Gym_EventScript_204DB3 - msgbox PetalburgCity_Gym_Text_2057A2, MSGBOX_DEFAULT + case 2, PetalburgCity_Gym_EventScript_NormanNoBadges + case 3, PetalburgCity_Gym_EventScript_NormanOneBadge + case 4, PetalburgCity_Gym_EventScript_NormanTwoBadges + case 5, PetalburgCity_Gym_EventScript_NormanThreeBadges + case 6, PetalburgCity_Gym_EventScript_NormanBattle + case 7, PetalburgCity_Gym_EventScript_NormanPostBattle + case 8, PetalburgCity_Gym_EventScript_NormanRematch + msgbox PetalburgCity_Gym_Text_DadYoureHereWithYourPokemon, MSGBOX_DEFAULT closemessage switch VAR_FACING - case 1, PetalburgCity_Gym_EventScript_204A80 - case 2, PetalburgCity_Gym_EventScript_204A8B - case 3, PetalburgCity_Gym_EventScript_204A96 - case 4, PetalburgCity_Gym_EventScript_204AA1 + case DIR_SOUTH, PetalburgCity_Gym_EventScript_BeginWallyTutorialSouth + case DIR_NORTH, PetalburgCity_Gym_EventScript_BeginWallyTutorialNorth + case DIR_WEST, PetalburgCity_Gym_EventScript_BeginWallyTutorialWest + case DIR_EAST, PetalburgCity_Gym_EventScript_BeginWallyTutorialEast end -PetalburgCity_Gym_EventScript_204A80:: @ 8204A80 +PetalburgCity_Gym_EventScript_BeginWallyTutorialSouth:: @ 8204A80 setvar VAR_0x8008, 0 - goto PetalburgCity_Gym_EventScript_204AAC + goto PetalburgCity_Gym_EventScript_BeginWallyTutorial end -PetalburgCity_Gym_EventScript_204A8B:: @ 8204A8B +PetalburgCity_Gym_EventScript_BeginWallyTutorialNorth:: @ 8204A8B setvar VAR_0x8008, 1 - goto PetalburgCity_Gym_EventScript_204AAC + goto PetalburgCity_Gym_EventScript_BeginWallyTutorial end -PetalburgCity_Gym_EventScript_204A96:: @ 8204A96 +PetalburgCity_Gym_EventScript_BeginWallyTutorialWest:: @ 8204A96 setvar VAR_0x8008, 2 - goto PetalburgCity_Gym_EventScript_204AAC + goto PetalburgCity_Gym_EventScript_BeginWallyTutorial end -PetalburgCity_Gym_EventScript_204AA1:: @ 8204AA1 +PetalburgCity_Gym_EventScript_BeginWallyTutorialEast:: @ 8204AA1 setvar VAR_0x8008, 3 - goto PetalburgCity_Gym_EventScript_204AAC + goto PetalburgCity_Gym_EventScript_BeginWallyTutorial end -PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC - addobject 10 +PetalburgCity_Gym_EventScript_BeginWallyTutorial:: @ 8204AAC + addobject 10 @ Wally playse SE_DOOR compare VAR_0x8008, 0 - call_if_eq PetalburgCity_Gym_EventScript_204C31 + call_if_eq PetalburgCity_Gym_EventScript_WallyArriveSouth compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_204C43 + call_if_eq PetalburgCity_Gym_EventScript_WallyArriveNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_204C5F + call_if_eq PetalburgCity_Gym_EventScript_WallyArriveWestEast compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_204C5F - msgbox PetalburgCity_Gym_Text_2058B1, MSGBOX_DEFAULT - msgbox PetalburgCity_Gym_Text_2058DB, MSGBOX_DEFAULT - msgbox PetalburgCity_Gym_Text_205910, MSGBOX_DEFAULT - msgbox PetalburgCity_Gym_Text_2059D8, MSGBOX_DEFAULT + call_if_eq PetalburgCity_Gym_EventScript_WallyArriveWestEast + msgbox PetalburgCity_Gym_Text_WallyIdLikeAPokemon, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_DadOhYoureWallyRight, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_WallyIveNeverCaughtAPokemon, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_DadHmISee, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if_eq PetalburgCity_Gym_EventScript_204CC7 + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressPlayerSouth compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_204CD2 + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressPlayerNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_204CE4 + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressPlayerWest compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_204CF6 - msgbox PetalburgCity_Gym_Text_2059E8, MSGBOX_DEFAULT + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressPlayerEast + msgbox PetalburgCity_Gym_Text_DadPlayerGoWithWally, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if_eq PetalburgCity_Gym_EventScript_204D08 + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressWallySouth compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_204D13 + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressWallyNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_204D1E + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressWallyWest compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_204D29 - msgbox PetalburgCity_Gym_Text_205A46, MSGBOX_DEFAULT - msgbox PetalburgCity_Gym_Text_205A89, MSGBOX_DEFAULT - msgbox PetalburgCity_Gym_Text_205AF4, MSGBOX_DEFAULT + call_if_eq PetalburgCity_Gym_EventScript_NormanAddressWallyEast + msgbox PetalburgCity_Gym_Text_IllLoanYouMyZigzagoon, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_WallyThankYouAndDadGivesPokeBall, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_WallyOhWowThankYou, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if_eq PetalburgCity_Gym_EventScript_204D72 + call_if_eq PetalburgCity_Gym_EventScript_NormanFaceDoorSouth compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_204D73 + call_if_eq PetalburgCity_Gym_EventScript_NormanFaceDoorNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_204D7E + call_if_eq PetalburgCity_Gym_EventScript_NormanFaceDoorWest compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_204D7F + call_if_eq PetalburgCity_Gym_EventScript_NormanFaceDoorEast compare VAR_0x8008, 0 - call_if_eq PetalburgCity_Gym_EventScript_204D34 + call_if_eq PetalburgCity_Gym_EventScript_WallyFacePlayer compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_204D3F + call_if_eq PetalburgCity_Gym_EventScript_WallyFaceDown compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_204D34 + call_if_eq PetalburgCity_Gym_EventScript_WallyFacePlayer compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_204D34 - msgbox PetalburgCity_Gym_Text_205B0F, MSGBOX_DEFAULT + call_if_eq PetalburgCity_Gym_EventScript_WallyFacePlayer + msgbox PetalburgCity_Gym_Text_WouldYouReallyComeWithMe, MSGBOX_DEFAULT closemessage - setflag FLAG_SPECIAL_FLAG_0x4001 + setflag FLAG_DONT_TRANSITION_MUSIC playbgm MUS_TSURETEK, 0 compare VAR_0x8008, 0 - call_if_eq PetalburgCity_Gym_EventScript_204C78 + call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallySouth compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_204C91 + call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallyNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_204CA3 + call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallyWest compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_204CB5 + call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallyEast removeobject 10 setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT setvar VAR_PETALBURG_GYM_STATE, 1 @@ -227,180 +228,181 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC release end -PetalburgCity_Gym_EventScript_204C31:: @ 8204C31 - applymovement 1, Common_Movement_WalkInPlaceDown - applymovement 10, PetalburgCity_Gym_Movement_2050EB +PetalburgCity_Gym_EventScript_WallyArriveSouth:: @ 8204C31 + applymovement 1, Common_Movement_WalkInPlaceFastestDown + applymovement 10, PetalburgCity_Gym_Movement_WallyArrive waitmovement 0 return -PetalburgCity_Gym_EventScript_204C43:: @ 8204C43 - applymovement 10, PetalburgCity_Gym_Movement_2050E1 +PetalburgCity_Gym_EventScript_WallyArriveNorth:: @ 8204C43 + applymovement 10, PetalburgCity_Gym_Movement_WallyArriveNorth waitmovement 0 - applymovement 1, Common_Movement_WalkInPlaceRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -PetalburgCity_Gym_EventScript_204C5F:: @ 8204C5F - applymovement 1, Common_Movement_WalkInPlaceDown - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown - applymovement 10, PetalburgCity_Gym_Movement_2050EB +PetalburgCity_Gym_EventScript_WallyArriveWestEast:: @ 8204C5F + applymovement 1, Common_Movement_WalkInPlaceFastestDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement 10, PetalburgCity_Gym_Movement_WallyArrive waitmovement 0 return -PetalburgCity_Gym_EventScript_204C78:: @ 8204C78 - applymovement 1, Common_Movement_WalkInPlaceDown - applymovement 10, PetalburgCity_Gym_Movement_205102 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_205111 +PetalburgCity_Gym_EventScript_ExitGymWithWallySouth:: @ 8204C78 + applymovement 1, Common_Movement_WalkInPlaceFastestDown + applymovement 10, PetalburgCity_Gym_Movement_WallyExitSouthWest + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallySouth waitmovement 0 return -PetalburgCity_Gym_EventScript_204C91:: @ 8204C91 - applymovement 10, PetalburgCity_Gym_Movement_2050F2 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_205109 +PetalburgCity_Gym_EventScript_ExitGymWithWallyNorth:: @ 8204C91 + applymovement 10, PetalburgCity_Gym_Movement_WallyExitNorth + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyNorth waitmovement 0 return -PetalburgCity_Gym_EventScript_204CA3:: @ 8204CA3 - applymovement 10, PetalburgCity_Gym_Movement_205102 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_20511B +PetalburgCity_Gym_EventScript_ExitGymWithWallyWest:: @ 8204CA3 + applymovement 10, PetalburgCity_Gym_Movement_WallyExitSouthWest + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyWest waitmovement 0 return -PetalburgCity_Gym_EventScript_204CB5:: @ 8204CB5 - applymovement 10, PetalburgCity_Gym_Movement_2050FA - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_205123 +PetalburgCity_Gym_EventScript_ExitGymWithWallyEast:: @ 8204CB5 + applymovement 10, PetalburgCity_Gym_Movement_WallyExitEast + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyEast waitmovement 0 return -PetalburgCity_Gym_EventScript_204CC7:: @ 8204CC7 - applymovement 1, Common_Movement_WalkInPlaceUp +PetalburgCity_Gym_EventScript_NormanAddressPlayerSouth:: @ 8204CC7 + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -PetalburgCity_Gym_EventScript_204CD2:: @ 8204CD2 - applymovement 1, Common_Movement_WalkInPlaceDown - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp +PetalburgCity_Gym_EventScript_NormanAddressPlayerNorth:: @ 8204CD2 + applymovement 1, Common_Movement_WalkInPlaceFastestDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -PetalburgCity_Gym_EventScript_204CE4:: @ 8204CE4 - applymovement 1, Common_Movement_WalkInPlaceRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft +PetalburgCity_Gym_EventScript_NormanAddressPlayerWest:: @ 8204CE4 + applymovement 1, Common_Movement_WalkInPlaceFastestRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -PetalburgCity_Gym_EventScript_204CF6:: @ 8204CF6 - applymovement 1, Common_Movement_WalkInPlaceLeft - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight +PetalburgCity_Gym_EventScript_NormanAddressPlayerEast:: @ 8204CF6 + applymovement 1, Common_Movement_WalkInPlaceFastestLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -PetalburgCity_Gym_EventScript_204D08:: @ 8204D08 - applymovement 1, Common_Movement_WalkInPlaceDown +PetalburgCity_Gym_EventScript_NormanAddressWallySouth:: @ 8204D08 + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_204D13:: @ 8204D13 - applymovement 1, Common_Movement_WalkInPlaceRight +PetalburgCity_Gym_EventScript_NormanAddressWallyNorth:: @ 8204D13 + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -PetalburgCity_Gym_EventScript_204D1E:: @ 8204D1E - applymovement 1, Common_Movement_WalkInPlaceDown +PetalburgCity_Gym_EventScript_NormanAddressWallyWest:: @ 8204D1E + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_204D29:: @ 8204D29 - applymovement 1, Common_Movement_WalkInPlaceDown +PetalburgCity_Gym_EventScript_NormanAddressWallyEast:: @ 8204D29 + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_204D34:: @ 8204D34 +PetalburgCity_Gym_EventScript_WallyFacePlayer:: @ 8204D34 applymovement 10, Common_Movement_FacePlayer waitmovement 0 return -PetalburgCity_Gym_EventScript_204D3F:: @ 8204D3F - applymovement 10, Common_Movement_WalkInPlaceDown +PetalburgCity_Gym_EventScript_WallyFaceDown:: @ 8204D3F + applymovement 10, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_204D4A:: @ 8204D4A - msgbox PetalburgCity_Gym_Text_205DB4, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_NormanNoBadges:: @ 8204D4A + msgbox PetalburgCity_Gym_Text_NormanGoToRustboro, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_204D54:: @ 8204D54 - msgbox PetalburgCity_Gym_Text_205EAE, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_NormanOneBadge:: @ 8204D54 + msgbox PetalburgCity_Gym_Text_NormanGoToDewford, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_204D5E:: @ 8204D5E - msgbox PetalburgCity_Gym_Text_205F87, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_NormanTwoBadges:: @ 8204D5E + msgbox PetalburgCity_Gym_Text_YouHaveGottenStronger, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_204D68:: @ 8204D68 - msgbox PetalburgCity_Gym_Text_205F87, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_NormanThreeBadges:: @ 8204D68 + msgbox PetalburgCity_Gym_Text_YouHaveGottenStronger, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_204D72:: @ 8204D72 +PetalburgCity_Gym_EventScript_NormanFaceDoorSouth:: @ 8204D72 return -PetalburgCity_Gym_EventScript_204D73:: @ 8204D73 - applymovement 1, Common_Movement_WalkInPlaceDown +@ For all other NormanFaceDoorX, Norman is already facing the door from NormanAddressWallyX +PetalburgCity_Gym_EventScript_NormanFaceDoorNorth:: @ 8204D73 + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_204D7E:: @ 8204D7E +PetalburgCity_Gym_EventScript_NormanFaceDoorWest:: @ 8204D7E return -PetalburgCity_Gym_EventScript_204D7F:: @ 8204D7F +PetalburgCity_Gym_EventScript_NormanFaceDoorEast:: @ 8204D7F return -PetalburgCity_Gym_EventScript_204D80:: @ 8204D80 - call PetalburgCity_Gym_EventScript_204DCE - compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_204E1D - goto_if_unset FLAG_RECEIVED_TM42, PetalburgCity_Gym_EventScript_204DAC - goto_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_20512D - msgbox PetalburgCity_Gym_Text_206417, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_NormanPostBattle:: @ 8204D80 + call PetalburgCity_Gym_EventScript_ShouldGiveEnigmaBerry + compare VAR_RESULT, TRUE + goto_if_eq PetalburgCity_Gym_EventScript_GiveEnigmaBerry + goto_if_unset FLAG_RECEIVED_TM42, PetalburgCity_Gym_EventScript_GiveFacade2 + goto_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_NoAmountOfTrainingIsEnough + msgbox PetalburgCity_Gym_Text_DadGoingToKeepTraining, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_204DAC:: @ 8204DAC - call PetalburgCity_Gym_EventScript_204ED2 +PetalburgCity_Gym_EventScript_GiveFacade2:: @ 8204DAC + call PetalburgCity_Gym_EventScript_GiveFacade release end -PetalburgCity_Gym_EventScript_204DB3:: @ 8204DB3 - trainerbattle_rematch_double TRAINER_NORMAN_1, PetalburgCity_Gym_Text_2074A2, PetalburgCity_Gym_Text_2075CE, PetalburgCity_Gym_Text_20764A - msgbox PetalburgCity_Gym_Text_2075F7, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_NormanRematch:: @ 8204DB3 + trainerbattle_rematch_double TRAINER_NORMAN_1, PetalburgCity_Gym_Text_NormanPreRematch, PetalburgCity_Gym_Text_NormanRematchDefeat, PetalburgCity_Gym_Text_NormanRematchNeedTwoMons + msgbox PetalburgCity_Gym_Text_NormanPostRematch, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_204DCE:: @ 8204DCE +PetalburgCity_Gym_EventScript_ShouldGiveEnigmaBerry:: @ 8204DCE specialvar VAR_RESULT, IsEnigmaBerryValid - compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_204E17 + compare VAR_RESULT, FALSE + goto_if_eq PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry checkitem ITEM_ENIGMA_BERRY, 1 - compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_204E17 + compare VAR_RESULT, TRUE + goto_if_eq PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry checkpcitem ITEM_ENIGMA_BERRY, 1 - compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_204E17 + compare VAR_RESULT, TRUE + goto_if_eq PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry compare VAR_ENIGMA_BERRY_AVAILABLE, 0 - goto_if_eq PetalburgCity_Gym_EventScript_204E17 - msgbox PetalburgCity_Gym_Text_2A6D3D, MSGBOX_DEFAULT - setvar VAR_RESULT, 1 + goto_if_eq PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry + msgbox PetalburgCity_Gym_Text_GiveEnigmaBerry, MSGBOX_DEFAULT + setvar VAR_RESULT, TRUE return -PetalburgCity_Gym_EventScript_204E17:: @ 8204E17 - setvar VAR_RESULT, 0 +PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry:: @ 8204E17 + setvar VAR_RESULT, FALSE return -PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D +PetalburgCity_Gym_EventScript_GiveEnigmaBerry:: @ 8204E1D giveitem_std ITEM_ENIGMA_BERRY compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull @@ -408,61 +410,61 @@ PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D release end -PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B - msgbox PetalburgCity_Gym_Text_205FE5, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_NORMAN_1, PetalburgCity_Gym_Text_206107 - message PetalburgCity_Gym_Text_206162 +PetalburgCity_Gym_EventScript_NormanBattle:: @ 8204E3B + msgbox PetalburgCity_Gym_Text_NormanPreBattle, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_NORMAN_1, PetalburgCity_Gym_Text_NormanDefeat + message PetalburgCity_Gym_Text_ReceivedBalanceBadge waitmessage call Common_EventScript_PlayGymBadgeFanfare - msgbox PetalburgCity_Gym_Text_20618A, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_ExplainBalanceBadgeTakeThis, MSGBOX_DEFAULT setflag FLAG_DEFEATED_PETALBURG_GYM setvar VAR_PETALBURG_GYM_STATE, 7 setflag FLAG_BADGE05_GET special ResetHealLocationFromDewford - call PetalburgCity_Gym_EventScript_2721F8 + call EventScript_HideMrBriney setflag FLAG_HIDE_MAUVILLE_GYM_WATTSON clearflag FLAG_HIDE_MAUVILLE_CITY_WATTSON setvar VAR_0x8008, 5 - call PetalburgCity_Gym_EventScript_271F43 + call Common_EventScript_SetGymTrainers clearflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN - call PetalburgCity_Gym_EventScript_2048FF + call PetalburgCity_Gym_EventScript_UnlockAllDoors special DrawWholeMapView - call PetalburgCity_Gym_EventScript_204ED2 + call PetalburgCity_Gym_EventScript_GiveFacade delay 30 - msgbox PetalburgCity_Gym_Text_2062FB, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_DadHappyAndSad, MSGBOX_DEFAULT closemessage delay 40 playse SE_DOOR delay 10 - addobject 11 + addobject 11 @ Wallys Uncle switch VAR_FACING - case 2, PetalburgCity_Gym_EventScript_204EF5 - case 3, PetalburgCity_Gym_EventScript_204F09 - case 4, PetalburgCity_Gym_EventScript_204EFF + case DIR_NORTH, PetalburgCity_Gym_EventScript_WallysUncleArrivesNorth + case DIR_WEST, PetalburgCity_Gym_EventScript_WallysUncleArrivesWest + case DIR_EAST, PetalburgCity_Gym_EventScript_WallysUncleArrivesEast end -PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2 +PetalburgCity_Gym_EventScript_GiveFacade:: @ 8204ED2 giveitem_std ITEM_TM42 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_BagIsFull setflag FLAG_RECEIVED_TM42 - msgbox PetalburgCity_Gym_Text_206254, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_ExplainFacade, MSGBOX_DEFAULT return -PetalburgCity_Gym_EventScript_204EF5:: @ 8204EF5 +PetalburgCity_Gym_EventScript_WallysUncleArrivesNorth:: @ 8204EF5 setvar VAR_0x8008, 1 - goto PetalburgCity_Gym_EventScript_204F13 + goto PetalburgCity_Gym_EventScript_WallysUncleArrives -PetalburgCity_Gym_EventScript_204EFF:: @ 8204EFF +PetalburgCity_Gym_EventScript_WallysUncleArrivesEast:: @ 8204EFF setvar VAR_0x8008, 2 - goto PetalburgCity_Gym_EventScript_204F13 + goto PetalburgCity_Gym_EventScript_WallysUncleArrives -PetalburgCity_Gym_EventScript_204F09:: @ 8204F09 +PetalburgCity_Gym_EventScript_WallysUncleArrivesWest:: @ 8204F09 setvar VAR_0x8008, 3 - goto PetalburgCity_Gym_EventScript_204F13 + goto PetalburgCity_Gym_EventScript_WallysUncleArrives -PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 - applymovement 11, PetalburgCity_Gym_Movement_2050BB +PetalburgCity_Gym_EventScript_WallysUncleArrives:: @ 8204F13 + applymovement 11, PetalburgCity_Gym_Movement_WallysUncleEnterGym waitmovement 0 playse SE_PIN applymovement 11, Common_Movement_ExclamationMark @@ -471,30 +473,30 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 waitmovement 0 delay 10 compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_204FED + call_if_eq PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_205009 + call_if_eq PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerEast compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_205025 - msgbox PetalburgCity_Gym_Text_206377, MSGBOX_DEFAULT + call_if_eq PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerWest + msgbox PetalburgCity_Gym_Text_PleaseComeWithMe, MSGBOX_DEFAULT closemessage delay 20 compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_204FCC + call_if_eq PetalburgCity_Gym_EventScript_WallysUncleFaceNormanNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_204FD7 + call_if_eq PetalburgCity_Gym_EventScript_WallysUncleFaceNormanEast compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_204FE2 - msgbox PetalburgCity_Gym_Text_2063CA, MSGBOX_DEFAULT + call_if_eq PetalburgCity_Gym_EventScript_WallysUncleFaceNormanWest + msgbox PetalburgCity_Gym_Text_LetMeBorrowPlayer, MSGBOX_DEFAULT closemessage - setflag FLAG_SPECIAL_FLAG_0x4001 + setflag FLAG_DONT_TRANSITION_MUSIC playbgm MUS_TSURETEK, 0 compare VAR_0x8008, 1 - call_if_eq PetalburgCity_Gym_EventScript_205041 + call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleNorth compare VAR_0x8008, 2 - call_if_eq PetalburgCity_Gym_EventScript_20505A + call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleEast compare VAR_0x8008, 3 - call_if_eq PetalburgCity_Gym_EventScript_20506C + call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleWest removeobject 11 setvar VAR_PETALBURG_CITY_STATE, 4 clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE @@ -503,65 +505,65 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 release end -PetalburgCity_Gym_EventScript_204FCC:: @ 8204FCC - applymovement 11, Common_Movement_WalkInPlaceUp +PetalburgCity_Gym_EventScript_WallysUncleFaceNormanNorth:: @ 8204FCC + applymovement 11, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -PetalburgCity_Gym_EventScript_204FD7:: @ 8204FD7 - applymovement 11, Common_Movement_WalkInPlaceRight +PetalburgCity_Gym_EventScript_WallysUncleFaceNormanEast:: @ 8204FD7 + applymovement 11, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -PetalburgCity_Gym_EventScript_204FE2:: @ 8204FE2 - applymovement 11, Common_Movement_WalkInPlaceLeft +PetalburgCity_Gym_EventScript_WallysUncleFaceNormanWest:: @ 8204FE2 + applymovement 11, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -PetalburgCity_Gym_EventScript_204FED:: @ 8204FED - applymovement 11, PetalburgCity_Gym_Movement_2050C3 +PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerNorth:: @ 8204FED + applymovement 11, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerNorth waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft - applymovement 1, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -PetalburgCity_Gym_EventScript_205009:: @ 8205009 - applymovement 11, PetalburgCity_Gym_Movement_2050CA +PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerEast:: @ 8205009 + applymovement 11, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerEast waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_205025:: @ 8205025 - applymovement 11, PetalburgCity_Gym_Movement_2050D0 +PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerWest:: @ 8205025 + applymovement 11, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerWest waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_205041:: @ 8205041 - applymovement 11, PetalburgCity_Gym_Movement_20507E - applymovement 1, Common_Movement_WalkInPlaceDown - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2050A1 +PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleNorth:: @ 8205041 + applymovement 11, PetalburgCity_Gym_Movement_WallysUncleExitNorth + applymovement 1, Common_Movement_WalkInPlaceFastestDown + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth waitmovement 0 return -PetalburgCity_Gym_EventScript_20505A:: @ 820505A - applymovement 11, PetalburgCity_Gym_Movement_205089 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2050A9 +PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleEast:: @ 820505A + applymovement 11, PetalburgCity_Gym_Movement_WallysUncleExitEast + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast waitmovement 0 return -PetalburgCity_Gym_EventScript_20506C:: @ 820506C - applymovement 11, PetalburgCity_Gym_Movement_205094 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2050B1 +PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleWest:: @ 820506C + applymovement 11, PetalburgCity_Gym_Movement_WallysUncleExitWest + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest waitmovement 0 return -PetalburgCity_Gym_Movement_20507E: @ 820507E +PetalburgCity_Gym_Movement_WallysUncleExitNorth: @ 820507E walk_down walk_down walk_left @@ -574,7 +576,7 @@ PetalburgCity_Gym_Movement_20507E: @ 820507E set_invisible step_end -PetalburgCity_Gym_Movement_205089: @ 8205089 +PetalburgCity_Gym_Movement_WallysUncleExitEast: @ 8205089 walk_down walk_down walk_left @@ -587,7 +589,7 @@ PetalburgCity_Gym_Movement_205089: @ 8205089 set_invisible step_end -PetalburgCity_Gym_Movement_205094: @ 8205094 +PetalburgCity_Gym_Movement_WallysUncleExitWest: @ 8205094 walk_down walk_down walk_left @@ -602,7 +604,7 @@ PetalburgCity_Gym_Movement_205094: @ 8205094 set_invisible step_end -PetalburgCity_Gym_Movement_2050A1: @ 82050A1 +PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth: @ 82050A1 delay_16 walk_down walk_down @@ -612,7 +614,7 @@ PetalburgCity_Gym_Movement_2050A1: @ 82050A1 walk_down step_end -PetalburgCity_Gym_Movement_2050A9: @ 82050A9 +PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast: @ 82050A9 delay_16 walk_down walk_down @@ -622,7 +624,7 @@ PetalburgCity_Gym_Movement_2050A9: @ 82050A9 walk_down step_end -PetalburgCity_Gym_Movement_2050B1: @ 82050B1 +PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest: @ 82050B1 delay_16 walk_down walk_down @@ -634,7 +636,7 @@ PetalburgCity_Gym_Movement_2050B1: @ 82050B1 walk_down step_end -PetalburgCity_Gym_Movement_2050BB: @ 82050BB +PetalburgCity_Gym_Movement_WallysUncleEnterGym: @ 82050BB walk_up delay_8 walk_in_place_fastest_right @@ -644,7 +646,7 @@ PetalburgCity_Gym_Movement_2050BB: @ 82050BB walk_in_place_fastest_up step_end -PetalburgCity_Gym_Movement_2050C3: @ 82050C3 +PetalburgCity_Gym_Movement_WallysUncleApproachPlayerNorth: @ 82050C3 walk_right walk_right walk_up @@ -653,7 +655,7 @@ PetalburgCity_Gym_Movement_2050C3: @ 82050C3 walk_in_place_fastest_right step_end -PetalburgCity_Gym_Movement_2050CA: @ 82050CA +PetalburgCity_Gym_Movement_WallysUncleApproachPlayerEast: @ 82050CA walk_right walk_right walk_up @@ -661,7 +663,7 @@ PetalburgCity_Gym_Movement_2050CA: @ 82050CA walk_up step_end -PetalburgCity_Gym_Movement_2050D0: @ 82050D0 +PetalburgCity_Gym_Movement_WallysUncleApproachPlayerWest: @ 82050D0 walk_right walk_right walk_up @@ -671,6 +673,7 @@ PetalburgCity_Gym_Movement_2050D0: @ 82050D0 walk_up step_end +@ Unused PetalburgCity_Gym_Movement_2050D8: @ 82050D8 walk_in_place_fastest_up delay_16 @@ -682,7 +685,7 @@ PetalburgCity_Gym_Movement_2050D8: @ 82050D8 walk_in_place_fastest_down step_end -PetalburgCity_Gym_Movement_2050E1: @ 82050E1 +PetalburgCity_Gym_Movement_WallyArriveNorth: @ 82050E1 delay_16 walk_up delay_16 @@ -694,7 +697,7 @@ PetalburgCity_Gym_Movement_2050E1: @ 82050E1 walk_in_place_fastest_left step_end -PetalburgCity_Gym_Movement_2050EB: @ 82050EB +PetalburgCity_Gym_Movement_WallyArrive: @ 82050EB delay_16 walk_up delay_16 @@ -703,7 +706,7 @@ PetalburgCity_Gym_Movement_2050EB: @ 82050EB walk_up step_end -PetalburgCity_Gym_Movement_2050F2: @ 82050F2 +PetalburgCity_Gym_Movement_WallyExitNorth: @ 82050F2 walk_down walk_down walk_down @@ -713,7 +716,7 @@ PetalburgCity_Gym_Movement_2050F2: @ 82050F2 walk_in_place_down step_end -PetalburgCity_Gym_Movement_2050FA: @ 82050FA +PetalburgCity_Gym_Movement_WallyExitEast: @ 82050FA walk_down walk_down walk_right @@ -723,7 +726,7 @@ PetalburgCity_Gym_Movement_2050FA: @ 82050FA walk_in_place_down step_end -PetalburgCity_Gym_Movement_205102: @ 8205102 +PetalburgCity_Gym_Movement_WallyExitSouthWest: @ 8205102 walk_down walk_down walk_down @@ -732,7 +735,7 @@ PetalburgCity_Gym_Movement_205102: @ 8205102 walk_in_place_down step_end -PetalburgCity_Gym_Movement_205109: @ 8205109 +PetalburgCity_Gym_Movement_PlayerExitWithWallyNorth: @ 8205109 delay_16 delay_16 delay_16 @@ -742,7 +745,7 @@ PetalburgCity_Gym_Movement_205109: @ 8205109 delay_8 step_end -PetalburgCity_Gym_Movement_205111: @ 8205111 +PetalburgCity_Gym_Movement_PlayerExitWithWallySouth: @ 8205111 delay_16 delay_16 walk_right @@ -754,7 +757,7 @@ PetalburgCity_Gym_Movement_205111: @ 8205111 delay_8 step_end -PetalburgCity_Gym_Movement_20511B: @ 820511B +PetalburgCity_Gym_Movement_PlayerExitWithWallyWest: @ 820511B delay_16 delay_16 walk_down @@ -764,7 +767,7 @@ PetalburgCity_Gym_Movement_20511B: @ 820511B delay_8 step_end -PetalburgCity_Gym_Movement_205123: @ 8205123 +PetalburgCity_Gym_Movement_PlayerExitWithWallyEast: @ 8205123 walk_in_place_fastest_down delay_16 delay_16 @@ -776,468 +779,471 @@ PetalburgCity_Gym_Movement_205123: @ 8205123 delay_8 step_end -PetalburgCity_Gym_EventScript_20512D:: @ 820512D - msgbox PetalburgCity_Gym_Text_2064C3, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_NoAmountOfTrainingIsEnough:: @ 820512D + msgbox PetalburgCity_Gym_Text_DadNoAmountOfTrainingIsEnough, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_205137:: @ 8205137 +PetalburgCity_Gym_EventScript_SpeedRoomDoor:: @ 8205137 lockall compare VAR_PETALBURG_GYM_STATE, 6 - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 85 - msgbox PetalburgCity_Gym_Text_20721E, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + msgbox PetalburgCity_Gym_Text_EnterSpeedRoom, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom + compare VAR_RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_20516C:: @ 820516C +PetalburgCity_Gym_EventScript_EnterRoom:: @ 820516C closemessage delay 30 - warpdoor MAP_PETALBURG_CITY_GYM, 255, 32776, 32777 + warpdoor MAP_PETALBURG_CITY_GYM, 255, VAR_0x8008, VAR_0x8009 waitstate releaseall end -PetalburgCity_Gym_EventScript_20517B:: @ 820517B +PetalburgCity_Gym_EventScript_DontEnterRoom:: @ 820517B releaseall end -PetalburgCity_Gym_EventScript_20517D:: @ 820517D - msgbox PetalburgCity_Gym_Text_2071F4, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_DoorLocked:: @ 820517D + msgbox PetalburgCity_Gym_Text_DoorAppearsLocked, MSGBOX_DEFAULT releaseall end -PetalburgCity_Gym_EventScript_205187:: @ 8205187 +@ VAR_0x8008 and VAR_0x8009 below are the x and y coordinates of the warp +PetalburgCity_Gym_EventScript_AccuracyRoomDoor:: @ 8205187 lockall compare VAR_PETALBURG_GYM_STATE, 6 - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 98 - msgbox PetalburgCity_Gym_Text_207280, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + msgbox PetalburgCity_Gym_Text_EnterAccuracyRoom, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom + compare VAR_RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_2051BC:: @ 82051BC +PetalburgCity_Gym_EventScript_ConfusionRoomDoor:: @ 82051BC lockall checktrainerflag TRAINER_RANDALL - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 46 - msgbox PetalburgCity_Gym_Text_2072BB, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + msgbox PetalburgCity_Gym_Text_EnterConfusionRoom, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom + compare VAR_RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_2051EF:: @ 82051EF +PetalburgCity_Gym_EventScript_LeftDefenseRoomDoor:: @ 82051EF lockall checktrainerflag TRAINER_RANDALL - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 59 - msgbox PetalburgCity_Gym_Text_2072F7, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + msgbox PetalburgCity_Gym_Text_EnterDefenseRoom, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom + compare VAR_RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_205222:: @ 8205222 +PetalburgCity_Gym_EventScript_RightDefenseRoomDoor:: @ 8205222 lockall checktrainerflag TRAINER_MARY - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 59 - msgbox PetalburgCity_Gym_Text_2072F7, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + msgbox PetalburgCity_Gym_Text_EnterDefenseRoom, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom + compare VAR_RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_205255:: @ 8205255 +PetalburgCity_Gym_EventScript_RecoveryRoomDoor:: @ 8205255 lockall checktrainerflag TRAINER_MARY - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 72 - msgbox PetalburgCity_Gym_Text_207331, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + msgbox PetalburgCity_Gym_Text_EnterRecoveryRoom, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom + compare VAR_RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_205288:: @ 8205288 +PetalburgCity_Gym_EventScript_LeftStrengthRoomDoor:: @ 8205288 lockall checktrainerflag TRAINER_PARKER - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 20 - msgbox PetalburgCity_Gym_Text_20736C, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + msgbox PetalburgCity_Gym_Text_EnterStrengthRoom, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom + compare VAR_RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_2052BB:: @ 82052BB +PetalburgCity_Gym_EventScript_RightStrengthRoomDoor:: @ 82052BB lockall checktrainerflag TRAINER_ALEXIA - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 20 - msgbox PetalburgCity_Gym_Text_20736C, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + msgbox PetalburgCity_Gym_Text_EnterStrengthRoom, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom + compare VAR_RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_2052EE:: @ 82052EE +PetalburgCity_Gym_EventScript_LeftOHKORoomDoor:: @ 82052EE lockall checktrainerflag TRAINER_ALEXIA - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 33 - msgbox PetalburgCity_Gym_Text_2073A7, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + msgbox PetalburgCity_Gym_Text_EnterOHKORoom, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom + compare VAR_RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_205321:: @ 8205321 +PetalburgCity_Gym_EventScript_RightOHKORoomDoor:: @ 8205321 lockall checktrainerflag TRAINER_GEORGE - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 33 - msgbox PetalburgCity_Gym_Text_2073A7, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + msgbox PetalburgCity_Gym_Text_EnterOHKORoom, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom + compare VAR_RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_205354:: @ 8205354 +PetalburgCity_Gym_EventScript_LeftGymLeadersRoomDoor:: @ 8205354 lockall checktrainerflag TRAINER_JODY - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 1 setvar VAR_0x8009, 7 - msgbox PetalburgCity_Gym_Text_2073E4, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + msgbox PetalburgCity_Gym_Text_EnterGymLeadersRoom, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom + compare VAR_RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_205387:: @ 8205387 +PetalburgCity_Gym_EventScript_RightGymLeadersRoomDoor:: @ 8205387 lockall checktrainerflag TRAINER_BERKE - goto_if_lt PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked setvar VAR_0x8008, 7 setvar VAR_0x8009, 7 - msgbox PetalburgCity_Gym_Text_2073E4, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C - compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + msgbox PetalburgCity_Gym_Text_EnterGymLeadersRoom, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom + compare VAR_RESULT, NO + goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom end -PetalburgCity_Gym_EventScript_2053BA:: @ 82053BA - trainerbattle_single TRAINER_RANDALL, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_2053ED - msgbox PetalburgCity_Gym_Text_2067D8, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_Randall:: @ 82053BA + trainerbattle_single TRAINER_RANDALL, PetalburgCity_Gym_Text_RandallPreBattle, PetalburgCity_Gym_Text_RandallDefeat, PetalburgCity_Gym_EventScript_SlideOpenSpeedRoomDoors + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_RandallPostBadge + msgbox PetalburgCity_Gym_Text_RandallPostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_2053DE:: @ 82053DE +PetalburgCity_Gym_EventScript_SlideOpenSpeedRoomDoors:: @ 82053DE setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_20557F + call PetalburgCity_Gym_EventScript_OpenSpeedRoomDoors special DrawWholeMapView release end -PetalburgCity_Gym_EventScript_2053ED:: @ 82053ED - msgbox PetalburgCity_Gym_Text_20685E, MSGBOX_NPC +PetalburgCity_Gym_EventScript_RandallPostBadge:: @ 82053ED + msgbox PetalburgCity_Gym_Text_RandallPostBadge, MSGBOX_NPC end -PetalburgCity_Gym_EventScript_2053F6:: @ 82053F6 - trainerbattle_single TRAINER_PARKER, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_205429 - msgbox PetalburgCity_Gym_Text_206996, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_Parker:: @ 82053F6 + trainerbattle_single TRAINER_PARKER, PetalburgCity_Gym_Text_ParkerPreBattle, PetalburgCity_Gym_Text_ParkerDefeat, PetalburgCity_Gym_EventScript_SlideOpenConfusionRoomDoors + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_ParkerPostBadge + msgbox PetalburgCity_Gym_Text_ParkerPostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_20541A:: @ 820541A +PetalburgCity_Gym_EventScript_SlideOpenConfusionRoomDoors:: @ 820541A setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_2055C1 + call PetalburgCity_Gym_EventScript_OpenConfusionRoomDoors special DrawWholeMapView release end -PetalburgCity_Gym_EventScript_205429:: @ 8205429 - msgbox PetalburgCity_Gym_Text_2069D9, MSGBOX_NPC +PetalburgCity_Gym_EventScript_ParkerPostBadge:: @ 8205429 + msgbox PetalburgCity_Gym_Text_ParkerPostBadge, MSGBOX_NPC end -PetalburgCity_Gym_EventScript_205432:: @ 8205432 - trainerbattle_single TRAINER_GEORGE, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456 - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_205465 - msgbox PetalburgCity_Gym_Text_206AE9, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_George:: @ 8205432 + trainerbattle_single TRAINER_GEORGE, PetalburgCity_Gym_Text_GeorgePreBattle, PetalburgCity_Gym_Text_GeorgeDefeat, PetalburgCity_Gym_EventScript_SlideOpenRecoveryRoomDoors + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_GeorgePostBadge + msgbox PetalburgCity_Gym_Text_GeorgePostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_205456:: @ 8205456 +PetalburgCity_Gym_EventScript_SlideOpenRecoveryRoomDoors:: @ 8205456 setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_205603 + call PetalburgCity_Gym_EventScript_OpenRecoveryRoomDoors special DrawWholeMapView release end -PetalburgCity_Gym_EventScript_205465:: @ 8205465 - msgbox PetalburgCity_Gym_Text_206BB1, MSGBOX_NPC +PetalburgCity_Gym_EventScript_GeorgePostBadge:: @ 8205465 + msgbox PetalburgCity_Gym_Text_GeorgePostBadge, MSGBOX_NPC end -PetalburgCity_Gym_EventScript_20546E:: @ 820546E - trainerbattle_single TRAINER_BERKE, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492 - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_2054A1 - msgbox PetalburgCity_Gym_Text_206C9F, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_Berke:: @ 820546E + trainerbattle_single TRAINER_BERKE, PetalburgCity_Gym_Text_BerkePreBattle, PetalburgCity_Gym_Text_BerkeDefeat, PetalburgCity_Gym_EventScript_SlideOpenOHKORoomDoors + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_BerkePostBadge + msgbox PetalburgCity_Gym_Text_BerkePostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_205492:: @ 8205492 +PetalburgCity_Gym_EventScript_SlideOpenOHKORoomDoors:: @ 8205492 setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_205645 + call PetalburgCity_Gym_EventScript_OpenOHKORoomDoors special DrawWholeMapView release end -PetalburgCity_Gym_EventScript_2054A1:: @ 82054A1 - msgbox PetalburgCity_Gym_Text_206D56, MSGBOX_NPC +PetalburgCity_Gym_EventScript_BerkePostBadge:: @ 82054A1 + msgbox PetalburgCity_Gym_Text_BerkePostBadge, MSGBOX_NPC end -PetalburgCity_Gym_EventScript_2054AA:: @ 82054AA - trainerbattle_single TRAINER_MARY, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_2054DD - msgbox PetalburgCity_Gym_Text_206E26, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_Mary:: @ 82054AA + trainerbattle_single TRAINER_MARY, PetalburgCity_Gym_Text_MaryPreBattle, PetalburgCity_Gym_Text_MaryDefeat, PetalburgCity_Gym_EventScript_SlideOpenAccuracyRoomDoors + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_MaryPostBadge + msgbox PetalburgCity_Gym_Text_MaryPostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_2054CE:: @ 82054CE +PetalburgCity_Gym_EventScript_SlideOpenAccuracyRoomDoors:: @ 82054CE setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_2055A0 + call PetalburgCity_Gym_EventScript_OpenAccuracyRoomDoors special DrawWholeMapView release end -PetalburgCity_Gym_EventScript_2054DD:: @ 82054DD - msgbox PetalburgCity_Gym_Text_206ED8, MSGBOX_NPC +PetalburgCity_Gym_EventScript_MaryPostBadge:: @ 82054DD + msgbox PetalburgCity_Gym_Text_MaryPostBadge, MSGBOX_NPC end -PetalburgCity_Gym_EventScript_2054E6:: @ 82054E6 - trainerbattle_single TRAINER_ALEXIA, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_205519 - msgbox PetalburgCity_Gym_Text_206F9F, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_Alexia:: @ 82054E6 + trainerbattle_single TRAINER_ALEXIA, PetalburgCity_Gym_Text_AlexiaPreBattle, PetalburgCity_Gym_Text_AlexiaDefeat, PetalburgCity_Gym_EventScript_SlideOpenDefenseRoomDoors + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_AlexiaPostBadge + msgbox PetalburgCity_Gym_Text_AlexiaPostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_20550A:: @ 820550A +PetalburgCity_Gym_EventScript_SlideOpenDefenseRoomDoors:: @ 820550A setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_2055E2 + call PetalburgCity_Gym_EventScript_OpenDefenseRoomDoors special DrawWholeMapView release end -PetalburgCity_Gym_EventScript_205519:: @ 8205519 - msgbox PetalburgCity_Gym_Text_207069, MSGBOX_NPC +PetalburgCity_Gym_EventScript_AlexiaPostBadge:: @ 8205519 + msgbox PetalburgCity_Gym_Text_AlexiaPostBadge, MSGBOX_NPC end -PetalburgCity_Gym_EventScript_205522:: @ 8205522 - trainerbattle_single TRAINER_JODY, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546 - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_205555 - msgbox PetalburgCity_Gym_Text_2070FB, MSGBOX_AUTOCLOSE +PetalburgCity_Gym_EventScript_Jody:: @ 8205522 + trainerbattle_single TRAINER_JODY, PetalburgCity_Gym_Text_JodyPreBattle, PetalburgCity_Gym_Text_JodyDefeat, PetalburgCity_Gym_EventScript_SlideOpenStrengthRoomDoors + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_JodyPostBadge + msgbox PetalburgCity_Gym_Text_JodyPostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Gym_EventScript_205546:: @ 8205546 +PetalburgCity_Gym_EventScript_SlideOpenStrengthRoomDoors:: @ 8205546 setvar VAR_0x8005, 0 - call PetalburgCity_Gym_EventScript_205624 + call PetalburgCity_Gym_EventScript_OpenStrengthRoomDoors special DrawWholeMapView release end -PetalburgCity_Gym_EventScript_205555:: @ 8205555 - msgbox PetalburgCity_Gym_Text_207170, MSGBOX_NPC +PetalburgCity_Gym_EventScript_JodyPostBadge:: @ 8205555 + msgbox PetalburgCity_Gym_Text_JodyPostBadge, MSGBOX_NPC end -PetalburgCity_Gym_EventScript_20555E:: @ 820555E +@ VAR_0x8004 below is the room number +@ VAR_0x8005 below is 0 when the door should be slid open and 1 when it should be unlocked immediately +PetalburgCity_Gym_EventScript_OpenGymEntranceDoors:: @ 820555E setvar VAR_0x8004, 1 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_205666 + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetEntranceRoomDoorMetatiles return -PetalburgCity_Gym_EventScript_20557F:: @ 820557F +PetalburgCity_Gym_EventScript_OpenSpeedRoomDoors:: @ 820557F setvar VAR_0x8004, 2 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_20568B + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetSpeedRoomDoorMetatiles return -PetalburgCity_Gym_EventScript_2055A0:: @ 82055A0 +PetalburgCity_Gym_EventScript_OpenAccuracyRoomDoors:: @ 82055A0 setvar VAR_0x8004, 3 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_2056B0 + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetAccuracyRoomDoorMetatiles return -PetalburgCity_Gym_EventScript_2055C1:: @ 82055C1 +PetalburgCity_Gym_EventScript_OpenConfusionRoomDoors:: @ 82055C1 setvar VAR_0x8004, 4 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_2056D5 + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetConfusionRoomDoorMetatiles return -PetalburgCity_Gym_EventScript_2055E2:: @ 82055E2 +PetalburgCity_Gym_EventScript_OpenDefenseRoomDoors:: @ 82055E2 setvar VAR_0x8004, 5 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_2056E8 + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetDefenseRoomDoorMetatiles return -PetalburgCity_Gym_EventScript_205603:: @ 8205603 +PetalburgCity_Gym_EventScript_OpenRecoveryRoomDoors:: @ 8205603 setvar VAR_0x8004, 6 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_20570D + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetRecoveryRoomDoorMetatiles return -PetalburgCity_Gym_EventScript_205624:: @ 8205624 +PetalburgCity_Gym_EventScript_OpenStrengthRoomDoors:: @ 8205624 setvar VAR_0x8004, 7 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_205720 + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetStrengthRoomDoorMetatiles return -PetalburgCity_Gym_EventScript_205645:: @ 8205645 +PetalburgCity_Gym_EventScript_OpenOHKORoomDoors:: @ 8205645 setvar VAR_0x8004, 8 compare VAR_0x8005, 0 - call_if_eq PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors compare VAR_0x8005, 1 - call_if_eq PetalburgCity_Gym_EventScript_20574B - call PetalburgCity_Gym_EventScript_205733 + call_if_eq PetalburgCity_Gym_EventScript_UnlockRoomDoors + call PetalburgCity_Gym_EventScript_SetOHKORoomDoorMetatiles return -PetalburgCity_Gym_EventScript_205666:: @ 8205666 +PetalburgCity_Gym_EventScript_SetEntranceRoomDoorMetatiles:: @ 8205666 setmetatile 6, 85, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 7, 85, METATILE_PetalburgGym_RoomEntrance_Right, 0 setmetatile 1, 98, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 2, 98, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_20568B:: @ 820568B +PetalburgCity_Gym_EventScript_SetSpeedRoomDoorMetatiles:: @ 820568B setmetatile 6, 46, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 7, 46, METATILE_PetalburgGym_RoomEntrance_Right, 0 setmetatile 1, 59, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 2, 59, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_2056B0:: @ 82056B0 +PetalburgCity_Gym_EventScript_SetAccuracyRoomDoorMetatiles:: @ 82056B0 setmetatile 6, 59, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 7, 59, METATILE_PetalburgGym_RoomEntrance_Right, 0 setmetatile 1, 72, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 2, 72, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_2056D5:: @ 82056D5 +PetalburgCity_Gym_EventScript_SetConfusionRoomDoorMetatiles:: @ 82056D5 setmetatile 1, 20, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 2, 20, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_2056E8:: @ 82056E8 +PetalburgCity_Gym_EventScript_SetDefenseRoomDoorMetatiles:: @ 82056E8 setmetatile 6, 20, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 7, 20, METATILE_PetalburgGym_RoomEntrance_Right, 0 setmetatile 1, 33, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 2, 33, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_20570D:: @ 820570D +PetalburgCity_Gym_EventScript_SetRecoveryRoomDoorMetatiles:: @ 820570D setmetatile 6, 33, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 7, 33, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_205720:: @ 8205720 +PetalburgCity_Gym_EventScript_SetStrengthRoomDoorMetatiles:: @ 8205720 setmetatile 1, 7, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 2, 7, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_205733:: @ 8205733 +PetalburgCity_Gym_EventScript_SetOHKORoomDoorMetatiles:: @ 8205733 setmetatile 6, 7, METATILE_PetalburgGym_RoomEntrance_Left, 0 setmetatile 7, 7, METATILE_PetalburgGym_RoomEntrance_Right, 0 return -PetalburgCity_Gym_EventScript_205746:: @ 8205746 - special PetalburgGymSpecial1 +PetalburgCity_Gym_EventScript_SlideOpenRoomDoors:: @ 8205746 + special PetalburgGymSlideOpenRoomDoors waitstate return -PetalburgCity_Gym_EventScript_20574B:: @ 820574B - special PetalburgGymSpecial2 +PetalburgCity_Gym_EventScript_UnlockRoomDoors:: @ 820574B + special PetalburgGymUnlockRoomDoors return -PetalburgCity_Gym_EventScript_20574F:: @ 820574F +PetalburgCity_Gym_EventScript_GymGuide:: @ 820574F lock faceplayer - goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_205764 - msgbox PetalburgCity_Gym_Text_206542, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_GymGuidePostVictory + msgbox PetalburgCity_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_205764:: @ 8205764 - msgbox PetalburgCity_Gym_Text_2066F3, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_GymGuidePostVictory:: @ 8205764 + msgbox PetalburgCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT release end -PetalburgCity_Gym_EventScript_20576E:: @ 820576E +PetalburgCity_Gym_EventScript_LeftGymStatue:: @ 820576E lockall - goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_20578E - goto PetalburgCity_Gym_EventScript_205798 + goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_GymStatueCertified + goto PetalburgCity_Gym_EventScript_GymStatue end -PetalburgCity_Gym_EventScript_20577E:: @ 820577E +PetalburgCity_Gym_EventScript_RightGymStatue:: @ 820577E lockall - goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_20578E - goto PetalburgCity_Gym_EventScript_205798 + goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_GymStatueCertified + goto PetalburgCity_Gym_EventScript_GymStatue end -PetalburgCity_Gym_EventScript_20578E:: @ 820578E - msgbox PetalburgCity_Gym_Text_207467, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_GymStatueCertified:: @ 820578E + msgbox PetalburgCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT releaseall end -PetalburgCity_Gym_EventScript_205798:: @ 8205798 - msgbox PetalburgCity_Gym_Text_20744C, MSGBOX_DEFAULT +PetalburgCity_Gym_EventScript_GymStatue:: @ 8205798 + msgbox PetalburgCity_Gym_Text_GymStatue, MSGBOX_DEFAULT releaseall end -PetalburgCity_Gym_Text_2057A2: @ 82057A2 +PetalburgCity_Gym_Text_DadYoureHereWithYourPokemon: @ 82057A2 .string "DAD: Hm?\p" .string "Well, if it isn't {PLAYER}!\n" .string "So you're all finished moving in?\p" @@ -1250,15 +1256,15 @@ PetalburgCity_Gym_Text_2057A2: @ 82057A2 .string "That's great news!\n" .string "I'll be looking forward to it!$" -PetalburgCity_Gym_Text_2058B1: @ 82058B1 +PetalburgCity_Gym_Text_WallyIdLikeAPokemon: @ 82058B1 .string "Um… I…\n" .string "I'd like to get a POKéMON, please…$" -PetalburgCity_Gym_Text_2058DB: @ 82058DB +PetalburgCity_Gym_Text_DadOhYoureWallyRight: @ 82058DB .string "DAD: Hm? You're… Uh… Oh, right.\n" .string "You're WALLY, right?$" -PetalburgCity_Gym_Text_205910: @ 8205910 +PetalburgCity_Gym_Text_WallyIveNeverCaughtAPokemon: @ 8205910 .string "WALLY: I'm going to go stay with my\n" .string "relatives in VERDANTURF TOWN.\p" .string "I thought I would be lonely by myself,\n" @@ -1266,38 +1272,38 @@ PetalburgCity_Gym_Text_205910: @ 8205910 .string "But I've never caught a POKéMON before.\n" .string "I don't know how…$" -PetalburgCity_Gym_Text_2059D8: @ 82059D8 +PetalburgCity_Gym_Text_DadHmISee: @ 82059D8 .string "DAD: Hm. I see.$" -PetalburgCity_Gym_Text_2059E8: @ 82059E8 +PetalburgCity_Gym_Text_DadPlayerGoWithWally: @ 82059E8 .string "DAD: {PLAYER}, you heard that,\n" .string "right?\p" .string "Go with WALLY and make sure that he\n" .string "safely catches a POKéMON.$" -PetalburgCity_Gym_Text_205A46: @ 8205A46 +PetalburgCity_Gym_Text_IllLoanYouMyZigzagoon: @ 8205A46 .string "WALLY, here, I'll loan you my POKéMON.\p" .string "WALLY received a ZIGZAGOON!$" -PetalburgCity_Gym_Text_205A89: @ 8205A89 +PetalburgCity_Gym_Text_WallyThankYouAndDadGivesPokeBall: @ 8205A89 .string "WALLY: Oh, wow!\n" .string "A POKéMON!\p" .string "DAD: Hm. I'll give you a POKé BALL, too.\n" .string "Go for it!\p" .string "WALLY received a POKé BALL!$" -PetalburgCity_Gym_Text_205AF4: @ 8205AF4 +PetalburgCity_Gym_Text_WallyOhWowThankYou: @ 8205AF4 .string "WALLY: Oh, wow!\n" .string "Thank you!$" -PetalburgCity_Gym_Text_205B0F: @ 8205B0F +PetalburgCity_Gym_Text_WouldYouReallyComeWithMe: @ 8205B0F .string "{PLAYER}… Would you really come\n" .string "with me?$" -PetalburgCity_Gym_Text_205B32: @ 8205B32 +PetalburgCity_Gym_Text_DadSoDidItWorkOut: @ 8205B32 .string "DAD: So, did it work out?$" -PetalburgCity_Gym_Text_205B4C: @ 8205B4C +PetalburgCity_Gym_Text_WallyThankYouBye: @ 8205B4C .string "WALLY: Thank you, yes, it did.\n" .string "Here's your POKéMON back.\p" .string "{PLAYER}, thank you for coming along\n" @@ -1310,7 +1316,7 @@ PetalburgCity_Gym_Text_205B4C: @ 8205B4C .string "so I have to go!\p" .string "Bye, {PLAYER}!$" -PetalburgCity_Gym_Text_205C40: @ 8205C40 +PetalburgCity_Gym_Text_DadGoCollectBadges: @ 8205C40 .string "DAD: Now…\p" .string "{PLAYER}, if you want to become a\n" .string "strong TRAINER, here's my advice.\p" @@ -1327,7 +1333,7 @@ PetalburgCity_Gym_Text_205C40: @ 8205C40 .string "But that's only after you become\n" .string "stronger.$" -PetalburgCity_Gym_Text_205DB4: @ 8205DB4 +PetalburgCity_Gym_Text_NormanGoToRustboro: @ 8205DB4 .string "DAD: Hm? Aren't you going to the\n" .string "POKéMON GYM in RUSTBORO CITY?\p" .string "There's no challenge for me to\n" @@ -1337,7 +1343,7 @@ PetalburgCity_Gym_Text_205DB4: @ 8205DB4 .string "I'll battle you, {PLAYER}, when you\n" .string "can show me four GYM BADGES, okay?$" -PetalburgCity_Gym_Text_205EAE: @ 8205EAE +PetalburgCity_Gym_Text_NormanGoToDewford: @ 8205EAE .string "DAD: I see… So, you've beaten\n" .string "the GYM LEADER in RUSTBORO CITY.\p" .string "But there are many more TRAINERS\n" @@ -1346,13 +1352,13 @@ PetalburgCity_Gym_Text_205EAE: @ 8205EAE .string "GYM LEADER named BRAWLY.\p" .string "You should go challenge him.$" -PetalburgCity_Gym_Text_205F87: @ 8205F87 +PetalburgCity_Gym_Text_YouHaveGottenStronger: @ 8205F87 .string "DAD: Hm… {PLAYER}, you have gotten\n" .string "stronger.\p" .string "I can tell by the number of BADGES\n" .string "that you've earned.$" -PetalburgCity_Gym_Text_205FE5: @ 8205FE5 +PetalburgCity_Gym_Text_NormanPreBattle: @ 8205FE5 .string "DAD: Hm…\n" .string "So, you did get four GYM BADGES.\p" .string "Fine, as I promised, we will have\n" @@ -1366,7 +1372,7 @@ PetalburgCity_Gym_Text_205FE5: @ 8205FE5 .string "{PLAYER}, you'd better give it your\n" .string "best shot, too!$" -PetalburgCity_Gym_Text_206107: @ 8206107 +PetalburgCity_Gym_Text_NormanDefeat: @ 8206107 .string "…\p" .string "I… I can't…\p" .string "I can't believe it. {PLAYER}…\p" @@ -1374,11 +1380,11 @@ PetalburgCity_Gym_Text_206107: @ 8206107 .string "But, rules are rules!\n" .string "Here, take this.$" -PetalburgCity_Gym_Text_206162: @ 8206162 +PetalburgCity_Gym_Text_ReceivedBalanceBadge: @ 8206162 .string "{PLAYER} received the BALANCE BADGE\n" .string "from DAD!$" -PetalburgCity_Gym_Text_20618A: @ 820618A +PetalburgCity_Gym_Text_ExplainBalanceBadgeTakeThis: @ 820618A .string "DAD: With that BADGE, the DEFENSE\n" .string "of all your POKéMON will increase.\p" .string "POKéMON that know the HM move SURF\n" @@ -1386,7 +1392,7 @@ PetalburgCity_Gym_Text_20618A: @ 820618A .string "This is my gift to you. {PLAYER}, I'm\n" .string "sure you can use it correctly.$" -PetalburgCity_Gym_Text_206254: @ 8206254 +PetalburgCity_Gym_Text_ExplainFacade: @ 8206254 .string "DAD: TM42 contains FACADE.\p" .string "It doubles the power of moves if\n" .string "the POKéMON is poisoned, paralyzed,\l" @@ -1394,23 +1400,23 @@ PetalburgCity_Gym_Text_206254: @ 8206254 .string "It might be able to turn a bad\n" .string "situation into an advantage.$" -PetalburgCity_Gym_Text_2062FB: @ 82062FB +PetalburgCity_Gym_Text_DadHappyAndSad: @ 82062FB .string "DAD: As the GYM LEADER, I can't\n" .string "express how upset I am…\p" .string "But as a father, it makes me both\n" .string "happy and a little sad. It's odd…$" -PetalburgCity_Gym_Text_206377: @ 8206377 +PetalburgCity_Gym_Text_PleaseComeWithMe: @ 8206377 .string "Ah, there you are, {PLAYER}{KUN}!\p" .string "Please come with me.\n" .string "I have something I want you to have.$" -PetalburgCity_Gym_Text_2063CA: @ 82063CA +PetalburgCity_Gym_Text_LetMeBorrowPlayer: @ 82063CA .string "NORMAN, you don't mind, do you?\p" .string "Let me borrow your {PLAYER}{KUN} for\n" .string "a minute or two.$" -PetalburgCity_Gym_Text_206417: @ 8206417 +PetalburgCity_Gym_Text_DadGoingToKeepTraining: @ 8206417 .string "DAD: {PLAYER}, you should go visit\n" .string "your mother every so often.\p" .string "I'm going to stay here and redouble\n" @@ -1418,13 +1424,13 @@ PetalburgCity_Gym_Text_206417: @ 8206417 .string "It would bother me as a TRAINER to\n" .string "not avenge my loss to you, {PLAYER}!$" -PetalburgCity_Gym_Text_2064C3: @ 82064C3 +PetalburgCity_Gym_Text_DadNoAmountOfTrainingIsEnough: @ 82064C3 .string "DAD: {PLAYER}, how are things going?\p" .string "The world of POKéMON is deep.\p" .string "I honestly think that no amount of\n" .string "training would ever be enough.$" -PetalburgCity_Gym_Text_206542: @ 8206542 +PetalburgCity_Gym_Text_GymGuideAdvice: @ 8206542 .string "Hey, how's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" .string "The doors in this GYM open when you\n" @@ -1442,53 +1448,53 @@ PetalburgCity_Gym_Text_206542: @ 8206542 .string "Once you've chosen the door…\n" .string "Well, hey, go for it!$" -PetalburgCity_Gym_Text_2066F3: @ 82066F3 +PetalburgCity_Gym_Text_GymGuidePostVictory: @ 82066F3 .string "{PLAYER}! Whoa! You've overcome even\n" .string "your own father!\p" .string "Like, whoa!\n" .string "What a stunning turn of events!$" -PetalburgCity_Gym_Text_20674F: @ 820674F +PetalburgCity_Gym_Text_RandallPreBattle: @ 820674F .string "The ability to attack before the\n" .string "opponent…\p" .string "Just that alone puts me at a great\n" .string "advantage, don't you agree?$" -PetalburgCity_Gym_Text_2067B9: @ 82067B9 +PetalburgCity_Gym_Text_RandallDefeat: @ 82067B9 .string "That was a magnificent battle!$" -PetalburgCity_Gym_Text_2067D8: @ 82067D8 +PetalburgCity_Gym_Text_RandallPostBattle: @ 82067D8 .string "Go on to the next room where a new\n" .string "challenge awaits you.\p" .string "At the left is the CONFUSION ROOM.\p" .string "The right door leads to the DEFENSE\n" .string "ROOM.$" -PetalburgCity_Gym_Text_20685E: @ 820685E +PetalburgCity_Gym_Text_RandallPostBadge: @ 820685E .string "Whomever you beat, and whomever you\n" .string "may lose to, you never shirk from\l" .string "training yourself and your POKéMON.\p" .string "That's what I think being a\n" .string "GYM LEADER is all about.$" -PetalburgCity_Gym_Text_2068FD: @ 82068FD +PetalburgCity_Gym_Text_ParkerPreBattle: @ 82068FD .string "This is the CONFUSION ROOM.\p" .string "Let me see how well bonded you are\n" .string "with your POKéMON!$" -PetalburgCity_Gym_Text_20694F: @ 820694F +PetalburgCity_Gym_Text_ParkerDefeat: @ 820694F .string "I couldn't confuse your team enough…\n" .string "You share a strong bond together.$" -PetalburgCity_Gym_Text_206996: @ 8206996 +PetalburgCity_Gym_Text_ParkerPostBattle: @ 8206996 .string "The next room is the STRENGTH ROOM.\n" .string "Can you withstand brute force?$" -PetalburgCity_Gym_Text_2069D9: @ 82069D9 +PetalburgCity_Gym_Text_ParkerPostBadge: @ 82069D9 .string "After you beat our LEADER, the\n" .string "training has become a lot tougher.$" -PetalburgCity_Gym_Text_206A1B: @ 8206A1B +PetalburgCity_Gym_Text_GeorgePreBattle: @ 8206A1B .string "Just when you think you're going to\n" .string "win, your opponent restores HP…\p" .string "Can you just imagine how awful that\n" @@ -1496,11 +1502,11 @@ PetalburgCity_Gym_Text_206A1B: @ 8206A1B .string "I'll show you exactly how awful it\n" .string "feels!$" -PetalburgCity_Gym_Text_206AB8: @ 8206AB8 +PetalburgCity_Gym_Text_GeorgeDefeat: @ 8206AB8 .string "I couldn't restore HP enough…\n" .string "What ATTACK power…$" -PetalburgCity_Gym_Text_206AE9: @ 8206AE9 +PetalburgCity_Gym_Text_GeorgePostBattle: @ 8206AE9 .string "I should have expected no less from\n" .string "our LEADER's kid.\p" .string "No, wait! A TRAINER's abilities are\n" @@ -1509,21 +1515,21 @@ PetalburgCity_Gym_Text_206AE9: @ 8206AE9 .string "weren't enough.\p" .string "Go on! The ONE-HIT KO ROOM is next.$" -PetalburgCity_Gym_Text_206BB1: @ 8206BB1 +PetalburgCity_Gym_Text_GeorgePostBadge: @ 8206BB1 .string "I'm going to keep training at GYMS.\n" .string "One day, I'll become a LEADER.$" -PetalburgCity_Gym_Text_206BF4: @ 8206BF4 +PetalburgCity_Gym_Text_BerkePreBattle: @ 8206BF4 .string "I'm not going to take it easy just\n" .string "because you're our LEADER's kid.\p" .string "I'll show you how horrid it is for\n" .string "a POKéMON to take a critical hit!$" -PetalburgCity_Gym_Text_206C7D: @ 8206C7D +PetalburgCity_Gym_Text_BerkeDefeat: @ 8206C7D .string "Your power…\n" .string "You're the real deal.$" -PetalburgCity_Gym_Text_206C9F: @ 8206C9F +PetalburgCity_Gym_Text_BerkePostBattle: @ 8206C9F .string "Your father really is strong.\n" .string "He's a TRAINER worth my respect.\p" .string "And, I sense the same glow coming\n" @@ -1531,21 +1537,21 @@ PetalburgCity_Gym_Text_206C9F: @ 8206C9F .string "I hope that you'll stage a terrific\n" .string "battle with your father!$" -PetalburgCity_Gym_Text_206D56: @ 8206D56 +PetalburgCity_Gym_Text_BerkePostBadge: @ 8206D56 .string "Since your dad became the LEADER,\n" .string "the TRAINERS of PETALBURG CITY have\l" .string "become a lot tougher.$" -PetalburgCity_Gym_Text_206DB2: @ 8206DB2 +PetalburgCity_Gym_Text_MaryPreBattle: @ 8206DB2 .string "Giggle…\n" .string "This is the ACCURACY ROOM.\p" .string "It's pretty nasty when every attack\n" .string "lands without fail.$" -PetalburgCity_Gym_Text_206E0D: @ 8206E0D +PetalburgCity_Gym_Text_MaryDefeat: @ 8206E0D .string "You were a cut above me…$" -PetalburgCity_Gym_Text_206E26: @ 8206E26 +PetalburgCity_Gym_Text_MaryPostBattle: @ 8206E26 .string "There are some even stronger\n" .string "TRAINERS waiting for you.\p" .string "The left is the DEFENSE ROOM, and\n" @@ -1553,20 +1559,20 @@ PetalburgCity_Gym_Text_206E26: @ 8206E26 .string "Your POKéMON's ATTACK power will be\n" .string "on trial either way.$" -PetalburgCity_Gym_Text_206ED8: @ 8206ED8 +PetalburgCity_Gym_Text_MaryPostBadge: @ 8206ED8 .string "Do you know what we're trying to\n" .string "achieve as TRAINERS?\p" .string "We're striving to become soul mates\n" .string "with our POKéMON.$" -PetalburgCity_Gym_Text_206F44: @ 8206F44 +PetalburgCity_Gym_Text_AlexiaPreBattle: @ 8206F44 .string "The higher the DEFENSE, the more\n" .string "reckless I can be in attack.$" -PetalburgCity_Gym_Text_206F82: @ 8206F82 +PetalburgCity_Gym_Text_AlexiaDefeat: @ 8206F82 .string "Our defenses weren't enough…$" -PetalburgCity_Gym_Text_206F9F: @ 8206F9F +PetalburgCity_Gym_Text_AlexiaPostBattle: @ 8206F9F .string "I think you've taught me a valuable\n" .string "lesson here.\p" .string "Now, go on! The left door goes to\n" @@ -1576,82 +1582,83 @@ PetalburgCity_Gym_Text_206F9F: @ 8206F9F .string "Both of them have TRAINERS who are\n" .string "skilled at offense.$" -PetalburgCity_Gym_Text_207069: @ 8207069 +PetalburgCity_Gym_Text_AlexiaPostBadge: @ 8207069 .string "Hi! Have you tried using SURF?$" -PetalburgCity_Gym_Text_207088: @ 8207088 +PetalburgCity_Gym_Text_JodyPreBattle: @ 8207088 .string "Our GYM LEADER told us to go all out\n" .string "and beat you.\p" .string "Even if you happen to be the\n" .string "LEADER's kid!$" -PetalburgCity_Gym_Text_2070E6: @ 82070E6 +PetalburgCity_Gym_Text_JodyDefeat: @ 82070E6 .string "But… I went all out!$" -PetalburgCity_Gym_Text_2070FB: @ 82070FB +PetalburgCity_Gym_Text_JodyPostBattle: @ 82070FB .string "The way you use your POKéMON…\n" .string "It's like your father's style.\p" .string "Go on through! The GYM LEADER, your\n" .string "father, is waiting!$" -PetalburgCity_Gym_Text_207170: @ 8207170 +PetalburgCity_Gym_Text_JodyPostBadge: @ 8207170 .string "Sure, it's fine to make your POKéMON\n" .string "stronger.\p" .string "But what decides the winner?\p" .string "Why, it's the feelings TRAINERS have\n" .string "for their POKéMON.$" -PetalburgCity_Gym_Text_2071F4: @ 82071F4 +PetalburgCity_Gym_Text_DoorAppearsLocked: @ 82071F4 .string "This door appears to be locked\n" .string "right now…$" -PetalburgCity_Gym_Text_20721E: @ 820721E +PetalburgCity_Gym_Text_EnterSpeedRoom: @ 820721E .string "“SPEED ROOM,” the sign says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_207256: @ 8207256 +@ Unused +PetalburgCity_Gym_Text_DoorAppearsLocked2: @ 8207256 .string "This door appears to be locked\n" .string "right now…$" -PetalburgCity_Gym_Text_207280: @ 8207280 +PetalburgCity_Gym_Text_EnterAccuracyRoom: @ 8207280 .string "“ACCURACY ROOM,” the sign says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_2072BB: @ 82072BB +PetalburgCity_Gym_Text_EnterConfusionRoom: @ 82072BB .string "“CONFUSION ROOM,” the sign says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_2072F7: @ 82072F7 +PetalburgCity_Gym_Text_EnterDefenseRoom: @ 82072F7 .string "“DEFENSE ROOM,” the sign says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_207331: @ 8207331 +PetalburgCity_Gym_Text_EnterRecoveryRoom: @ 8207331 .string "“RECOVERY ROOM,” the sign says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_20736C: @ 820736C +PetalburgCity_Gym_Text_EnterStrengthRoom: @ 820736C .string "“STRENGTH ROOM,” the sign says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_2073A7: @ 82073A7 +PetalburgCity_Gym_Text_EnterOHKORoom: @ 82073A7 .string "“ONE-HIT KO ROOM,” the sign says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_2073E4: @ 82073E4 +PetalburgCity_Gym_Text_EnterGymLeadersRoom: @ 82073E4 .string "“GYM LEADER'S ROOM\p" .string "“See for yourself what POKéMON await\n" .string "you!” the sign says.\p" .string "Do you want to go through?$" -PetalburgCity_Gym_Text_20744C: @ 820744C +PetalburgCity_Gym_Text_GymStatue: @ 820744C .string "PETALBURG CITY POKéMON GYM$" -PetalburgCity_Gym_Text_207467: @ 8207467 +PetalburgCity_Gym_Text_GymStatueCertified: @ 8207467 .string "PETALBURG CITY POKéMON GYM\p" .string "NORMAN'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" -PetalburgCity_Gym_Text_2074A2: @ 82074A2 +PetalburgCity_Gym_Text_NormanPreRematch: @ 82074A2 .string "DAD: {PLAYER}…\n" .string "I had a feeling that you would come.\p" .string "I would never refuse to accept\n" @@ -1663,18 +1670,18 @@ PetalburgCity_Gym_Text_2074A2: @ 82074A2 .string "we owe it to each other to do the best\l" .string "we can. Isn't that right, {PLAYER}?$" -PetalburgCity_Gym_Text_2075CE: @ 82075CE +PetalburgCity_Gym_Text_NormanRematchDefeat: @ 82075CE .string "Uh… Haha…\n" .string "Maybe that was going too hard…$" -PetalburgCity_Gym_Text_2075F7: @ 82075F7 +PetalburgCity_Gym_Text_NormanPostRematch: @ 82075F7 .string "DAD: {PLAYER}…\n" .string "What is your dream?\p" .string "My dream…\n" .string "Hahaha…\l" .string "It has already come true, actually.$" -PetalburgCity_Gym_Text_20764A: @ 820764A +PetalburgCity_Gym_Text_NormanRematchNeedTwoMons: @ 820764A .string "DAD: {PLAYER}…\n" .string "I had a feeling that you would come.\p" .string "I would never refuse to accept\n" diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json index 68e9a4dce..ce3dc3b16 100644 --- a/data/maps/PetalburgCity_House1/map.json +++ b/data/maps/PetalburgCity_House1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_House1_EventScript_2077A3", + "script": "PetalburgCity_House1_EventScript_Woman", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_House1_EventScript_20779A", + "script": "PetalburgCity_House1_EventScript_Man", "flag": "0" } ], diff --git a/data/maps/PetalburgCity_House1/scripts.inc b/data/maps/PetalburgCity_House1/scripts.inc index cb511bbed..2fe46437e 100644 --- a/data/maps/PetalburgCity_House1/scripts.inc +++ b/data/maps/PetalburgCity_House1/scripts.inc @@ -1,20 +1,20 @@ PetalburgCity_House1_MapScripts:: @ 8207799 .byte 0 -PetalburgCity_House1_EventScript_20779A:: @ 820779A - msgbox PetalburgCity_House1_Text_2077AC, MSGBOX_NPC +PetalburgCity_House1_EventScript_Man:: @ 820779A + msgbox PetalburgCity_House1_Text_TravelingIsWonderful, MSGBOX_NPC end -PetalburgCity_House1_EventScript_2077A3:: @ 82077A3 - msgbox PetalburgCity_House1_Text_2077FB, MSGBOX_NPC +PetalburgCity_House1_EventScript_Woman:: @ 82077A3 + msgbox PetalburgCity_House1_Text_GoOnAdventure, MSGBOX_NPC end -PetalburgCity_House1_Text_2077AC: @ 82077AC +PetalburgCity_House1_Text_TravelingIsWonderful: @ 82077AC .string "Traveling is wonderful!\p" .string "When I was young, I roamed the seas\n" .string "and the mountains!$" -PetalburgCity_House1_Text_2077FB: @ 82077FB +PetalburgCity_House1_Text_GoOnAdventure: @ 82077FB .string "Sigh…\p" .string "I wish I could go on an adventure\n" .string "with some POKéMON…\p" diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json index b6c0107a0..9354b4926 100644 --- a/data/maps/PetalburgCity_House2/map.json +++ b/data/maps/PetalburgCity_House2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_House2_EventScript_2078F3", + "script": "PetalburgCity_House2_EventScript_Woman", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_House2_EventScript_2078FC", + "script": "PetalburgCity_House2_EventScript_SchoolKid", "flag": "0" } ], diff --git a/data/maps/PetalburgCity_House2/scripts.inc b/data/maps/PetalburgCity_House2/scripts.inc index 2650e970c..3be93cbd0 100644 --- a/data/maps/PetalburgCity_House2/scripts.inc +++ b/data/maps/PetalburgCity_House2/scripts.inc @@ -1,21 +1,21 @@ PetalburgCity_House2_MapScripts:: @ 82078F2 .byte 0 -PetalburgCity_House2_EventScript_2078F3:: @ 82078F3 - msgbox PetalburgCity_House2_Text_207905, MSGBOX_NPC +PetalburgCity_House2_EventScript_Woman:: @ 82078F3 + msgbox PetalburgCity_House2_Text_NormanBecameGymLeader, MSGBOX_NPC end -PetalburgCity_House2_EventScript_2078FC:: @ 82078FC - msgbox PetalburgCity_House2_Text_207969, MSGBOX_NPC +PetalburgCity_House2_EventScript_SchoolKid:: @ 82078FC + msgbox PetalburgCity_House2_Text_BattledNormanOnce, MSGBOX_NPC end -PetalburgCity_House2_Text_207905: @ 8207905 +PetalburgCity_House2_Text_NormanBecameGymLeader: @ 8207905 .string "NORMAN became our town's new\n" .string "GYM LEADER.\p" .string "I think he called his family over from\n" .string "somewhere far away.$" -PetalburgCity_House2_Text_207969: @ 8207969 +PetalburgCity_House2_Text_BattledNormanOnce: @ 8207969 .string "I battled NORMAN once, but, whew,\n" .string "he was way too strong.\p" .string "How would I put it?\p" diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json index b08837e80..82519cb5c 100644 --- a/data/maps/PetalburgCity_Mart/map.json +++ b/data/maps/PetalburgCity_Mart/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Mart_EventScript_207D69", + "script": "PetalburgCity_Mart_EventScript_Clerk", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Mart_EventScript_207DE8", + "script": "PetalburgCity_Mart_EventScript_Man", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Mart_EventScript_207DDF", + "script": "PetalburgCity_Mart_EventScript_Boy", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_Mart_EventScript_207DD6", + "script": "PetalburgCity_Mart_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/PetalburgCity_Mart/scripts.inc b/data/maps/PetalburgCity_Mart/scripts.inc index 2bd72b69e..f27f0aeb5 100644 --- a/data/maps/PetalburgCity_Mart/scripts.inc +++ b/data/maps/PetalburgCity_Mart/scripts.inc @@ -1,19 +1,19 @@ PetalburgCity_Mart_MapScripts:: @ 8207D68 .byte 0 -PetalburgCity_Mart_EventScript_207D69:: @ 8207D69 +PetalburgCity_Mart_EventScript_Clerk:: @ 8207D69 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage - goto_if_set FLAG_PETALBURG_MART_EXPANDED_ITEMS, PetalburgCity_Mart_EventScript_207DA6 - pokemart PetalburgCity_Mart_Pokemart_207D8C - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + goto_if_set FLAG_PETALBURG_MART_EXPANDED_ITEMS, PetalburgCity_Mart_EventScript_ExpandedItems + pokemart PetalburgCity_Mart_Pokemart_Basic + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -PetalburgCity_Mart_Pokemart_207D8C: @ 8207D8C +PetalburgCity_Mart_Pokemart_Basic: @ 8207D8C .2byte ITEM_POKE_BALL .2byte ITEM_POTION .2byte ITEM_ANTIDOTE @@ -29,14 +29,14 @@ PetalburgCity_Mart_Pokemart_207D8C: @ 8207D8C release end -PetalburgCity_Mart_EventScript_207DA6:: @ 8207DA6 - pokemart PetalburgCity_Mart_Pokemart_207DB8 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT +PetalburgCity_Mart_EventScript_ExpandedItems:: @ 8207DA6 + pokemart PetalburgCity_Mart_Pokemart_Expanded + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end .align 2 -PetalburgCity_Mart_Pokemart_207DB8: @ 8207DB8 +PetalburgCity_Mart_Pokemart_Expanded: @ 8207DB8 .2byte ITEM_POKE_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_POTION @@ -54,30 +54,30 @@ PetalburgCity_Mart_Pokemart_207DB8: @ 8207DB8 release end -PetalburgCity_Mart_EventScript_207DD6:: @ 8207DD6 - msgbox PetalburgCity_Mart_Text_207DF1, MSGBOX_NPC +PetalburgCity_Mart_EventScript_Woman:: @ 8207DD6 + msgbox PetalburgCity_Mart_Text_WeakWillGrowStronger, MSGBOX_NPC end -PetalburgCity_Mart_EventScript_207DDF:: @ 8207DDF - msgbox PetalburgCity_Mart_Text_207E60, MSGBOX_NPC +PetalburgCity_Mart_EventScript_Boy:: @ 8207DDF + msgbox PetalburgCity_Mart_Text_RepelIsUseful, MSGBOX_NPC end -PetalburgCity_Mart_EventScript_207DE8:: @ 8207DE8 - msgbox PetalburgCity_Mart_Text_207EB0, MSGBOX_NPC +PetalburgCity_Mart_EventScript_Man:: @ 8207DE8 + msgbox PetalburgCity_Mart_Text_TakeSomeAntidotesWithYou, MSGBOX_NPC end -PetalburgCity_Mart_Text_207DF1: @ 8207DF1 +PetalburgCity_Mart_Text_WeakWillGrowStronger: @ 8207DF1 .string "Even if a POKéMON is weak now,\n" .string "it will grow stronger.\p" .string "The most important thing is love!\n" .string "Love for your POKéMON!$" -PetalburgCity_Mart_Text_207E60: @ 8207E60 +PetalburgCity_Mart_Text_RepelIsUseful: @ 8207E60 .string "Do you use REPEL?\n" .string "It keeps POKéMON away, so it's\l" .string "useful when you're in a hurry.$" -PetalburgCity_Mart_Text_207EB0: @ 8207EB0 +PetalburgCity_Mart_Text_TakeSomeAntidotesWithYou: @ 8207EB0 .string "Do you have any ANTIDOTES with\n" .string "you?\p" .string "If you walk around with a poisoned\n" diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json index eeb22dca4..d673ecf4d 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_PokemonCenter_1F_EventScript_2079FC", + "script": "PetalburgCity_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_PokemonCenter_1F_EventScript_291539", + "script": "MysteryEventClub_EventScript_Man", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A0A", + "script": "PetalburgCity_PokemonCenter_1F_EventScript_FatMan", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A13", + "script": "PetalburgCity_PokemonCenter_1F_EventScript_Youngster", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A1C", + "script": "PetalburgCity_PokemonCenter_1F_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index 286b9f7d9..60b56837c 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -1,79 +1,79 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8 map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, PetalburgCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 PetalburgCity_PokemonCenter_1F_OnTransition: @ 82079F3 setrespawn HEAL_LOCATION_PETALBURG_CITY - call PetalburgCity_PokemonCenter_1F_EventScript_2718DE + call Common_EventScript_UpdateBrineyLocation end -PetalburgCity_PokemonCenter_1F_EventScript_2079FC:: @ 82079FC +PetalburgCity_PokemonCenter_1F_EventScript_Nurse:: @ 82079FC setvar VAR_0x800B, 1 - call PetalburgCity_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release end -PetalburgCity_PokemonCenter_1F_EventScript_207A0A:: @ 8207A0A - msgbox PetalburgCity_PokemonCenter_1F_Text_207A76, MSGBOX_NPC +PetalburgCity_PokemonCenter_1F_EventScript_FatMan:: @ 8207A0A + msgbox PetalburgCity_PokemonCenter_1F_Text_PCStorageSystem, MSGBOX_NPC end -PetalburgCity_PokemonCenter_1F_EventScript_207A13:: @ 8207A13 - msgbox PetalburgCity_PokemonCenter_1F_Text_207AD6, MSGBOX_NPC +PetalburgCity_PokemonCenter_1F_EventScript_Youngster:: @ 8207A13 + msgbox PetalburgCity_PokemonCenter_1F_Text_OranBerryRegainedHP, MSGBOX_NPC end -PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C +PetalburgCity_PokemonCenter_1F_EventScript_Woman:: @ 8207A1C lock faceplayer - msgbox PetalburgCity_PokemonCenter_1F_Text_207B09, MSGBOX_DEFAULT + msgbox PetalburgCity_PokemonCenter_1F_Text_ManyTypesOfPokemon, MSGBOX_DEFAULT specialvar VAR_RESULT, IsStarterInParty compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_207A38 + goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_SayStarterTypeInfo release end -PetalburgCity_PokemonCenter_1F_EventScript_207A38:: @ 8207A38 +PetalburgCity_PokemonCenter_1F_EventScript_SayStarterTypeInfo:: @ 8207A38 compare VAR_STARTER_MON, 0 - call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_207A5B + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_SayTreeckoType compare VAR_STARTER_MON, 1 - call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_207A64 + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_SayTorchicType compare VAR_STARTER_MON, 2 - call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_207A6D + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_SayMudkipType release end -PetalburgCity_PokemonCenter_1F_EventScript_207A5B:: @ 8207A5B - msgbox PetalburgCity_PokemonCenter_1F_Text_207BB0, MSGBOX_DEFAULT +PetalburgCity_PokemonCenter_1F_EventScript_SayTreeckoType:: @ 8207A5B + msgbox PetalburgCity_PokemonCenter_1F_Text_TreeckoIsGrassType, MSGBOX_DEFAULT return -PetalburgCity_PokemonCenter_1F_EventScript_207A64:: @ 8207A64 - msgbox PetalburgCity_PokemonCenter_1F_Text_207C35, MSGBOX_DEFAULT +PetalburgCity_PokemonCenter_1F_EventScript_SayTorchicType:: @ 8207A64 + msgbox PetalburgCity_PokemonCenter_1F_Text_TorchicIsFireType, MSGBOX_DEFAULT return -PetalburgCity_PokemonCenter_1F_EventScript_207A6D:: @ 8207A6D - msgbox PetalburgCity_PokemonCenter_1F_Text_207CB7, MSGBOX_DEFAULT +PetalburgCity_PokemonCenter_1F_EventScript_SayMudkipType:: @ 8207A6D + msgbox PetalburgCity_PokemonCenter_1F_Text_MudkipIsWaterType, MSGBOX_DEFAULT return -PetalburgCity_PokemonCenter_1F_Text_207A76: @ 8207A76 +PetalburgCity_PokemonCenter_1F_Text_PCStorageSystem: @ 8207A76 .string "That PC-based POKéMON Storage\n" .string "System…\p" .string "Whoever made it must be some kind\n" .string "of a scientific wizard!$" -PetalburgCity_PokemonCenter_1F_Text_207AD6: @ 8207AD6 +PetalburgCity_PokemonCenter_1F_Text_OranBerryRegainedHP: @ 8207AD6 .string "When my POKéMON ate an\n" .string "ORAN BERRY, it regained HP!$" -PetalburgCity_PokemonCenter_1F_Text_207B09: @ 8207B09 +PetalburgCity_PokemonCenter_1F_Text_ManyTypesOfPokemon: @ 8207B09 .string "There are many types of POKéMON.\p" .string "All types have their strengths and\n" .string "weaknesses against other types.\p" .string "Depending on the types of POKéMON,\n" .string "a battle could be easy or hard.$" -PetalburgCity_PokemonCenter_1F_Text_207BB0: @ 8207BB0 +PetalburgCity_PokemonCenter_1F_Text_TreeckoIsGrassType: @ 8207BB0 .string "For example, your TREECKO\n" .string "is a GRASS type.\p" .string "It's strong against the WATER and\n" @@ -81,7 +81,7 @@ PetalburgCity_PokemonCenter_1F_Text_207BB0: @ 8207BB0 .string "But, it's weak against FIRE-type\n" .string "POKéMON.$" -PetalburgCity_PokemonCenter_1F_Text_207C35: @ 8207C35 +PetalburgCity_PokemonCenter_1F_Text_TorchicIsFireType: @ 8207C35 .string "For example, your TORCHIC\n" .string "is a FIRE type.\p" .string "It's strong against the GRASS and\n" @@ -89,7 +89,7 @@ PetalburgCity_PokemonCenter_1F_Text_207C35: @ 8207C35 .string "But, it's weak against WATER-type\n" .string "POKéMON.$" -PetalburgCity_PokemonCenter_1F_Text_207CB7: @ 8207CB7 +PetalburgCity_PokemonCenter_1F_Text_MudkipIsWaterType: @ 8207CB7 .string "For example, your MUDKIP\n" .string "is a WATER type.\p" .string "It's strong against the FIRE type.\p" diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json index 279c5e44b..067d6f237 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc index d2370c6b1..8485ae2c6 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ PetalburgCity_PokemonCenter_2F_MapScripts:: @ 8207D41 - map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -PetalburgCity_PokemonCenter_2F_EventScript_207D56:: @ 8207D56 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +PetalburgCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8207D56 + call CableClub_EventScript_Colosseum end -PetalburgCity_PokemonCenter_2F_EventScript_207D5C:: @ 8207D5C - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +PetalburgCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8207D5C + call CableClub_EventScript_TradeCenter end -PetalburgCity_PokemonCenter_2F_EventScript_207D62:: @ 8207D62 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +PetalburgCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8207D62 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json index c961d300c..49af9f43d 100644 --- a/data/maps/PetalburgCity_WallysHouse/map.json +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_WallysHouse_EventScript_204278", + "script": "PetalburgCity_WallysHouse_EventScript_WallyUncle", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgCity_WallysHouse_EventScript_2042C0", + "script": "PetalburgCity_WallysHouse_EventScript_WallyAunt", "flag": "0" } ], diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index be2a6280e..1516e33d2 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -1,71 +1,71 @@ PetalburgCity_WallysHouse_MapScripts:: @ 8204229 - map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_MapScript2_204247 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_WallysHouse_MapScript2_204234 + map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_MapScript2_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_WallysHouse_MapScript2_OnWarp .byte 0 -PetalburgCity_WallysHouse_MapScript2_204234: @ 8204234 - map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_20423E +PetalburgCity_WallysHouse_MapScript2_OnWarp: @ 8204234 + map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther .2byte 0 -PetalburgCity_WallysHouse_EventScript_20423E:: @ 820423E +PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther:: @ 820423E turnobject EVENT_OBJ_ID_PLAYER, DIR_EAST turnobject 1, DIR_WEST end -PetalburgCity_WallysHouse_MapScript2_204247: @ 8204247 - map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_204251 +PetalburgCity_WallysHouse_MapScript2_OnFrame: @ 8204247 + map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_GiveHM03Surf .2byte 0 -PetalburgCity_WallysHouse_EventScript_204251:: @ 8204251 +PetalburgCity_WallysHouse_EventScript_GiveHM03Surf:: @ 8204251 lockall - msgbox PetalburgCity_WallysHouse_Text_20446E, MSGBOX_DEFAULT + msgbox PetalburgCity_WallysHouse_Text_PleaseExcuseUs, MSGBOX_DEFAULT giveitem_std ITEM_HM03 setflag FLAG_RECEIVED_HM03 - msgbox PetalburgCity_WallysHouse_Text_20461A, MSGBOX_DEFAULT + msgbox PetalburgCity_WallysHouse_Text_SurfGoAllSortsOfPlaces, MSGBOX_DEFAULT setvar VAR_PETALBURG_CITY_STATE, 5 releaseall end -PetalburgCity_WallysHouse_EventScript_204278:: @ 8204278 +PetalburgCity_WallysHouse_EventScript_WallyUncle:: @ 8204278 lock faceplayer - goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, PetalburgCity_WallysHouse_EventScript_2042AC - goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_2042A2 - goto_if_set FLAG_THANKED_FOR_PLAYING_WITH_WALLY, PetalburgCity_WallysHouse_EventScript_2042B6 - msgbox PetalburgCity_WallysHouse_Text_2042DF, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, PetalburgCity_WallysHouse_EventScript_DefeatedWallyInVictoryRoad + goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_ReceievedHM03Surf + goto_if_set FLAG_THANKED_FOR_PLAYING_WITH_WALLY, PetalburgCity_WallysHouse_EventScript_PlayedWithWally + msgbox PetalburgCity_WallysHouse_Text_ThanksForPlayingWithWally, MSGBOX_DEFAULT setflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY release end -PetalburgCity_WallysHouse_EventScript_2042A2:: @ 82042A2 - msgbox PetalburgCity_WallysHouse_Text_204661, MSGBOX_DEFAULT +PetalburgCity_WallysHouse_EventScript_ReceievedHM03Surf:: @ 82042A2 + msgbox PetalburgCity_WallysHouse_Text_WallyIsComingHomeSoon, MSGBOX_DEFAULT release end -PetalburgCity_WallysHouse_EventScript_2042AC:: @ 82042AC - msgbox PetalburgCity_WallysHouse_Text_204698, MSGBOX_DEFAULT +PetalburgCity_WallysHouse_EventScript_DefeatedWallyInVictoryRoad:: @ 82042AC + msgbox PetalburgCity_WallysHouse_Text_YouMetWallyInEverGrandeCity, MSGBOX_DEFAULT release end -PetalburgCity_WallysHouse_EventScript_2042B6:: @ 82042B6 - msgbox PetalburgCity_WallysHouse_Text_20444D, MSGBOX_DEFAULT +PetalburgCity_WallysHouse_EventScript_PlayedWithWally:: @ 82042B6 + msgbox PetalburgCity_WallysHouse_Text_WonderHowWallyIsDoing, MSGBOX_DEFAULT release end -PetalburgCity_WallysHouse_EventScript_2042C0:: @ 82042C0 +PetalburgCity_WallysHouse_EventScript_WallyAunt:: @ 82042C0 lock faceplayer - goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_2042D5 - msgbox PetalburgCity_WallysHouse_Text_204732, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_ReceivedHM03Surf + msgbox PetalburgCity_WallysHouse_Text_WallyWasReallyHappy, MSGBOX_DEFAULT release end -PetalburgCity_WallysHouse_EventScript_2042D5:: @ 82042D5 - msgbox PetalburgCity_WallysHouse_Text_2047A7, MSGBOX_DEFAULT +PetalburgCity_WallysHouse_EventScript_ReceivedHM03Surf:: @ 82042D5 + msgbox PetalburgCity_WallysHouse_Text_WallyLeftWithoutTelling, MSGBOX_DEFAULT release end -PetalburgCity_WallysHouse_Text_2042DF: @ 82042DF +PetalburgCity_WallysHouse_Text_ThanksForPlayingWithWally: @ 82042DF .string "You're…\n" .string "Ah, you must be {PLAYER}{KUN}, right?\p" .string "Thank you for playing with WALLY a\n" @@ -81,10 +81,10 @@ PetalburgCity_WallysHouse_Text_2042DF: @ 82042DF .string "I wonder where he could have\n" .string "gotten by now?$" -PetalburgCity_WallysHouse_Text_20444D: @ 820444D +PetalburgCity_WallysHouse_Text_WonderHowWallyIsDoing: @ 820444D .string "I wonder how our WALLY is doing?$" -PetalburgCity_WallysHouse_Text_20446E: @ 820446E +PetalburgCity_WallysHouse_Text_PleaseExcuseUs: @ 820446E .string "{PLAYER}{KUN}! Please excuse us for\n" .string "dragging you here this way.\p" .string "But our WALLY's become very healthy\n" @@ -101,15 +101,15 @@ PetalburgCity_WallysHouse_Text_20446E: @ 820446E .string "This isn't a bribe or anything, but\n" .string "I'd really like you to have this.$" -PetalburgCity_WallysHouse_Text_20461A: @ 820461A +PetalburgCity_WallysHouse_Text_SurfGoAllSortsOfPlaces: @ 820461A .string "If your POKéMON can SURF, you'll be\n" .string "able to go to all sorts of places.$" -PetalburgCity_WallysHouse_Text_204661: @ 8204661 +PetalburgCity_WallysHouse_Text_WallyIsComingHomeSoon: @ 8204661 .string "WALLY's coming home soon.\n" .string "I'm looking forward to that.$" -PetalburgCity_WallysHouse_Text_204698: @ 8204698 +PetalburgCity_WallysHouse_Text_YouMetWallyInEverGrandeCity: @ 8204698 .string "Oh? You met WALLY in\n" .string "EVER GRANDE CITY?\p" .string "Oh, {PLAYER}{KUN}, don't be silly.\p" @@ -117,13 +117,13 @@ PetalburgCity_WallysHouse_Text_204698: @ 8204698 .string "can't go somewhere far away like\l" .string "that all by himself.$" -PetalburgCity_WallysHouse_Text_204732: @ 8204732 +PetalburgCity_WallysHouse_Text_WallyWasReallyHappy: @ 8204732 .string "WALLY was really happy when he told\n" .string "us that he caught a POKéMON.\p" .string "It's been ages since I've seen him\n" .string "smile like that.$" -PetalburgCity_WallysHouse_Text_2047A7: @ 82047A7 +PetalburgCity_WallysHouse_Text_WallyLeftWithoutTelling: @ 82047A7 .string "I want you to keep this a secret\n" .string "from my husband…\p" .string "But our WALLY left VERDANTURF TOWN\n" diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index 7e7de784a..d43017f99 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -115,7 +115,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgWoods_EventScript_22E210", + "script": "PetalburgWoods_EventScript_Boy1", "flag": "0" }, { @@ -128,7 +128,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "PetalburgWoods_EventScript_22E26D", + "script": "PetalburgWoods_EventScript_Lyle", "flag": "0" }, { @@ -141,7 +141,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "PetalburgWoods_EventScript_22E284", + "script": "PetalburgWoods_EventScript_James", "flag": "0" }, { @@ -154,7 +154,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgWoods_EventScript_22E219", + "script": "PetalburgWoods_EventScript_Boy2", "flag": "0" }, { @@ -180,7 +180,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgWoods_EventScript_22E222", + "script": "PetalburgWoods_EventScript_Girl", "flag": "0" } ], @@ -236,7 +236,7 @@ "elevation": 3, "var": "VAR_PETALBURG_WOODS_STATE", "var_value": "0", - "script": "PetalburgWoods_EventScript_22DFD7" + "script": "PetalburgWoods_EventScript_DevonResearcherLeft" }, { "type": "trigger", @@ -245,7 +245,7 @@ "elevation": 3, "var": "VAR_PETALBURG_WOODS_STATE", "var_value": "0", - "script": "PetalburgWoods_EventScript_22E079" + "script": "PetalburgWoods_EventScript_DevonResearcherRight" } ], "bg_events": [ @@ -255,7 +255,7 @@ "y": 32, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgWoods_EventScript_22E25B" + "script": "PetalburgWoods_EventScript_Sign1" }, { "type": "hidden_item", @@ -295,7 +295,7 @@ "y": 8, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "PetalburgWoods_EventScript_22E264" + "script": "PetalburgWoods_EventScript_Sign2" } ] }
\ No newline at end of file diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 423d4c432..42f0fb35a 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -1,119 +1,119 @@ PetalburgWoods_MapScripts:: @ 822DFD6 .byte 0 -PetalburgWoods_EventScript_22DFD7:: @ 822DFD7 +PetalburgWoods_EventScript_DevonResearcherLeft:: @ 822DFD7 lockall - call PetalburgWoods_EventScript_22E124 - applymovement 4, PetalburgWoods_Movement_22E1CB + call PetalburgWoods_EventScript_DevonResearcherIntro + applymovement 4, PetalburgWoods_Movement_DevonResearcherApproachPlayerLeft waitmovement 0 - msgbox PetalburgWoods_Text_22E34F, MSGBOX_DEFAULT + msgbox PetalburgWoods_Text_HaveYouSeenShroomish, MSGBOX_DEFAULT closemessage playbgm MUS_AQA_0, 0 - applymovement 3, PetalburgWoods_Movement_22E209 + applymovement 3, PetalburgWoods_Movement_AquaEntrance waitmovement 0 - msgbox PetalburgWoods_Text_22E3AA, MSGBOX_DEFAULT + msgbox PetalburgWoods_Text_IWasGoingToAmbushYou, MSGBOX_DEFAULT closemessage - applymovement 3, PetalburgWoods_Movement_22E1F6 + applymovement 3, PetalburgWoods_Movement_AquaApproachResearcherLeft waitmovement 0 - applymovement 4, Common_Movement_WalkInPlaceUp + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT + msgbox PetalburgWoods_Text_HandOverThosePapers, MSGBOX_DEFAULT closemessage - applymovement 4, PetalburgWoods_Movement_22E1E4 + applymovement 4, PetalburgWoods_Movement_DevonResearcherFleeToPlayerLeft waitmovement 0 - msgbox PetalburgWoods_Text_22E457, MSGBOX_DEFAULT + msgbox PetalburgWoods_Text_YouHaveToHelpMe, MSGBOX_DEFAULT closemessage - applymovement 3, PetalburgWoods_Movement_22E20E + applymovement 3, PetalburgWoods_Movement_AquaApproachPlayer waitmovement 0 - msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_22E542 - applymovement 3, PetalburgWoods_Movement_22E1F9 + msgbox PetalburgWoods_Text_NoOneCrossesTeamAqua, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_YoureKiddingMe + applymovement 3, PetalburgWoods_Movement_AquaBackOff waitmovement 0 - call PetalburgWoods_EventScript_22E138 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_22E1E0 - applymovement 4, PetalburgWoods_Movement_22E1C2 + call PetalburgWoods_EventScript_DevonResearcherPostBattle + applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_WatchResearcherLeave + applymovement 4, PetalburgWoods_Movement_DevonResearcherExitLeft waitmovement 0 - goto PetalburgWoods_EventScript_22E1A7 + goto PetalburgWoods_EventScript_RemoveDevonResearcher end -PetalburgWoods_EventScript_22E079:: @ 822E079 +PetalburgWoods_EventScript_DevonResearcherRight:: @ 822E079 lockall - call PetalburgWoods_EventScript_22E124 - applymovement 4, PetalburgWoods_Movement_22E1D0 + call PetalburgWoods_EventScript_DevonResearcherIntro + applymovement 4, PetalburgWoods_Movement_DevonResearcherApproachPlayerRight waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox PetalburgWoods_Text_22E34F, MSGBOX_DEFAULT + msgbox PetalburgWoods_Text_HaveYouSeenShroomish, MSGBOX_DEFAULT closemessage playbgm MUS_AQA_0, 0 - applymovement 3, PetalburgWoods_Movement_22E209 + applymovement 3, PetalburgWoods_Movement_AquaEntrance waitmovement 0 - msgbox PetalburgWoods_Text_22E3AA, MSGBOX_DEFAULT + msgbox PetalburgWoods_Text_IWasGoingToAmbushYou, MSGBOX_DEFAULT closemessage - applymovement 3, PetalburgWoods_Movement_22E205 + applymovement 3, PetalburgWoods_Movement_AquaApproachResearcherRight waitmovement 0 - applymovement 4, Common_Movement_WalkInPlaceUp + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT + msgbox PetalburgWoods_Text_HandOverThosePapers, MSGBOX_DEFAULT closemessage - applymovement 4, PetalburgWoods_Movement_22E1EA + applymovement 4, PetalburgWoods_Movement_DevonResearcherFleeToPlayerRight waitmovement 0 - msgbox PetalburgWoods_Text_22E457, MSGBOX_DEFAULT - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + msgbox PetalburgWoods_Text_YouHaveToHelpMe, MSGBOX_DEFAULT + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_22E542 - applymovement 3, PetalburgWoods_Movement_22E1F9 + msgbox PetalburgWoods_Text_NoOneCrossesTeamAqua, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_YoureKiddingMe + applymovement 3, PetalburgWoods_Movement_AquaBackOff waitmovement 0 - call PetalburgWoods_EventScript_22E138 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_22E1E0 - applymovement 4, PetalburgWoods_Movement_22E1D7 + call PetalburgWoods_EventScript_DevonResearcherPostBattle + applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_WatchResearcherLeave + applymovement 4, PetalburgWoods_Movement_DevonResearcherExitRight waitmovement 0 - goto PetalburgWoods_EventScript_22E1A7 + goto PetalburgWoods_EventScript_RemoveDevonResearcher end -PetalburgWoods_EventScript_22E124:: @ 822E124 - applymovement 4, PetalburgWoods_Movement_22E1B1 +PetalburgWoods_EventScript_DevonResearcherIntro:: @ 822E124 + applymovement 4, PetalburgWoods_Movement_DevonResearcherLookAround waitmovement 0 - msgbox PetalburgWoods_Text_22E332, MSGBOX_DEFAULT + msgbox PetalburgWoods_Text_NotAOneToBeFound, MSGBOX_DEFAULT closemessage return -PetalburgWoods_EventScript_22E138:: @ 822E138 - msgbox PetalburgWoods_Text_22E563, MSGBOX_DEFAULT +PetalburgWoods_EventScript_DevonResearcherPostBattle:: @ 822E138 + msgbox PetalburgWoods_Text_YouveGotSomeNerve, MSGBOX_DEFAULT closemessage - applymovement 3, PetalburgWoods_Movement_22E1FD + applymovement 3, PetalburgWoods_Movement_AquaRunAway waitmovement 0 removeobject 3 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox PetalburgWoods_Text_22E63D, MSGBOX_DEFAULT + msgbox PetalburgWoods_Text_ThatWasAwfullyClose, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL compare VAR_RESULT, 0 - goto_if_eq PetalburgWoods_EventScript_22E17D - goto PetalburgWoods_EventScript_22E18B + goto_if_eq PetalburgWoods_EventScript_BagFull + goto PetalburgWoods_EventScript_DevonResearcherFinish end -PetalburgWoods_EventScript_22E17D:: @ 822E17D - msgbox PetalburgWoods_Text_22E741, MSGBOX_DEFAULT - goto PetalburgWoods_EventScript_22E18B +PetalburgWoods_EventScript_BagFull:: @ 822E17D + msgbox PetalburgWoods_Text_YoureLoadedWithItems, MSGBOX_DEFAULT + goto PetalburgWoods_EventScript_DevonResearcherFinish end -PetalburgWoods_EventScript_22E18B:: @ 822E18B - msgbox PetalburgWoods_Text_22E6C7, MSGBOX_DEFAULT - applymovement 4, PetalburgWoods_Movement_22E1EE +PetalburgWoods_EventScript_DevonResearcherFinish:: @ 822E18B + msgbox PetalburgWoods_Text_TeamAquaAfterSomethingInRustboro, MSGBOX_DEFAULT + applymovement 4, PetalburgWoods_Movement_DevonResearcherStartExit waitmovement 0 - msgbox PetalburgWoods_Text_22E712, MSGBOX_DEFAULT + msgbox PetalburgWoods_Text_ICantBeWastingTime, MSGBOX_DEFAULT closemessage return -PetalburgWoods_EventScript_22E1A7:: @ 822E1A7 +PetalburgWoods_EventScript_RemoveDevonResearcher:: @ 822E1A7 removeobject 4 setvar VAR_PETALBURG_WOODS_STATE, 1 releaseall end -PetalburgWoods_Movement_22E1B1: @ 822E1B1 +PetalburgWoods_Movement_DevonResearcherLookAround: @ 822E1B1 face_up delay_16 delay_4 @@ -132,7 +132,7 @@ PetalburgWoods_Movement_22E1B1: @ 822E1B1 delay_16 step_end -PetalburgWoods_Movement_22E1C2: @ 822E1C2 +PetalburgWoods_Movement_DevonResearcherExitLeft: @ 822E1C2 walk_fast_right walk_fast_up walk_fast_up @@ -143,14 +143,14 @@ PetalburgWoods_Movement_22E1C2: @ 822E1C2 walk_fast_up step_end -PetalburgWoods_Movement_22E1CB: @ 822E1CB +PetalburgWoods_Movement_DevonResearcherApproachPlayerLeft: @ 822E1CB delay_16 face_player walk_down walk_down step_end -PetalburgWoods_Movement_22E1D0: @ 822E1D0 +PetalburgWoods_Movement_DevonResearcherApproachPlayerRight: @ 822E1D0 delay_16 face_player walk_down @@ -159,7 +159,7 @@ PetalburgWoods_Movement_22E1D0: @ 822E1D0 walk_in_place_fastest_right step_end -PetalburgWoods_Movement_22E1D7: @ 822E1D7 +PetalburgWoods_Movement_DevonResearcherExitRight: @ 822E1D7 walk_fast_left walk_fast_up walk_fast_up @@ -170,13 +170,13 @@ PetalburgWoods_Movement_22E1D7: @ 822E1D7 walk_fast_up step_end -PetalburgWoods_Movement_22E1E0: @ 822E1E0 +PetalburgWoods_Movement_WatchResearcherLeave: @ 822E1E0 delay_16 delay_16 walk_in_place_fastest_up step_end -PetalburgWoods_Movement_22E1E4: @ 822E1E4 +PetalburgWoods_Movement_DevonResearcherFleeToPlayerLeft: @ 822E1E4 walk_fast_right walk_fast_down walk_fast_down @@ -184,13 +184,13 @@ PetalburgWoods_Movement_22E1E4: @ 822E1E4 walk_in_place_fastest_up step_end -PetalburgWoods_Movement_22E1EA: @ 822E1EA +PetalburgWoods_Movement_DevonResearcherFleeToPlayerRight: @ 822E1EA walk_fast_down walk_fast_right walk_in_place_fastest_up step_end -PetalburgWoods_Movement_22E1EE: @ 822E1EE +PetalburgWoods_Movement_DevonResearcherStartExit: @ 822E1EE walk_in_place_fastest_down delay_16 delay_16 @@ -200,18 +200,18 @@ PetalburgWoods_Movement_22E1EE: @ 822E1EE face_up step_end -PetalburgWoods_Movement_22E1F6: @ 822E1F6 +PetalburgWoods_Movement_AquaApproachResearcherLeft: @ 822E1F6 walk_fast_down walk_fast_down step_end -PetalburgWoods_Movement_22E1F9: @ 822E1F9 +PetalburgWoods_Movement_AquaBackOff: @ 822E1F9 lock_facing_direction walk_up unlock_facing_direction step_end -PetalburgWoods_Movement_22E1FD: @ 822E1FD +PetalburgWoods_Movement_AquaRunAway: @ 822E1FD walk_fast_up walk_fast_up walk_fast_up @@ -221,36 +221,36 @@ PetalburgWoods_Movement_22E1FD: @ 822E1FD delay_16 step_end -PetalburgWoods_Movement_22E205: @ 822E205 +PetalburgWoods_Movement_AquaApproachResearcherRight: @ 822E205 walk_fast_down walk_fast_down walk_fast_down step_end -PetalburgWoods_Movement_22E209: @ 822E209 +PetalburgWoods_Movement_AquaEntrance: @ 822E209 walk_down walk_down delay_16 delay_16 step_end -PetalburgWoods_Movement_22E20E: @ 822E20E +PetalburgWoods_Movement_AquaApproachPlayer: @ 822E20E walk_down step_end -PetalburgWoods_EventScript_22E210:: @ 822E210 - msgbox PetalburgWoods_Text_22EA0C, MSGBOX_NPC +PetalburgWoods_EventScript_Boy1:: @ 822E210 + msgbox PetalburgWoods_Text_StayOutOfTallGrass, MSGBOX_NPC end -PetalburgWoods_EventScript_22E219:: @ 822E219 - msgbox PetalburgWoods_Text_22EA8B, MSGBOX_NPC +PetalburgWoods_EventScript_Boy2:: @ 822E219 + msgbox PetalburgWoods_Text_HiddenItemsExplanation, MSGBOX_NPC end -PetalburgWoods_EventScript_22E222:: @ 822E222 +PetalburgWoods_EventScript_Girl:: @ 822E222 lock faceplayer - goto_if_set FLAG_RECEIVED_MIRACLE_SEED, PetalburgWoods_EventScript_22E251 - msgbox PetalburgWoods_Text_22EAFE, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_MIRACLE_SEED, PetalburgWoods_EventScript_ExplainMiracleSeed + msgbox PetalburgWoods_Text_TryUsingThisItem, MSGBOX_DEFAULT giveitem_std ITEM_MIRACLE_SEED compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull @@ -258,102 +258,102 @@ PetalburgWoods_EventScript_22E222:: @ 822E222 release end -PetalburgWoods_EventScript_22E251:: @ 822E251 - msgbox PetalburgWoods_Text_22EB63, MSGBOX_DEFAULT +PetalburgWoods_EventScript_ExplainMiracleSeed:: @ 822E251 + msgbox PetalburgWoods_Text_MiracleSeedExplanation, MSGBOX_DEFAULT release end -PetalburgWoods_EventScript_22E25B:: @ 822E25B - msgbox PetalburgWoods_Text_22EC10, MSGBOX_SIGN +PetalburgWoods_EventScript_Sign1:: @ 822E25B + msgbox PetalburgWoods_Text_TrainerTipsExperience, MSGBOX_SIGN end -PetalburgWoods_EventScript_22E264:: @ 822E264 - msgbox PetalburgWoods_Text_22ED07, MSGBOX_SIGN +PetalburgWoods_EventScript_Sign2:: @ 822E264 + msgbox PetalburgWoods_Text_TrainerTipsPP, MSGBOX_SIGN end -PetalburgWoods_EventScript_22E26D:: @ 822E26D - trainerbattle_single TRAINER_LYLE, PetalburgWoods_Text_22E77D, PetalburgWoods_Text_22E7C1 - msgbox PetalburgWoods_Text_22E7EF, MSGBOX_AUTOCLOSE +PetalburgWoods_EventScript_Lyle:: @ 822E26D + trainerbattle_single TRAINER_LYLE, PetalburgWoods_Text_GoBugPokemonTeam, PetalburgWoods_Text_ICouldntWin + msgbox PetalburgWoods_Text_ImOutOfPokeBalls, MSGBOX_AUTOCLOSE end -PetalburgWoods_EventScript_22E284:: @ 822E284 - trainerbattle_single TRAINER_JAMES_1, PetalburgWoods_Text_22E827, PetalburgWoods_Text_22E86B, PetalburgWoods_EventScript_22E2C5 +PetalburgWoods_EventScript_James:: @ 822E284 + trainerbattle_single TRAINER_JAMES_1, PetalburgWoods_Text_InstantlyPopularWithBugPokemon, PetalburgWoods_Text_CantBePopularIfILose, PetalburgWoods_EventScript_TryRegisterJames specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_if_eq PetalburgWoods_EventScript_22E31B - setvar VAR_0x8004, 621 - specialvar VAR_RESULT, sub_813B4E0 + goto_if_eq PetalburgWoods_EventScript_JamesRematch + setvar VAR_0x8004, TRAINER_JAMES_1 + specialvar VAR_RESULT, IsTrainerRegistered compare VAR_RESULT, 0 - goto_if_eq PetalburgWoods_EventScript_22E2EF - msgbox PetalburgWoods_Text_22E889, MSGBOX_DEFAULT + goto_if_eq PetalburgWoods_EventScript_TryRegisterJames2 + msgbox PetalburgWoods_Text_PeopleRespectYou, MSGBOX_DEFAULT release end -PetalburgWoods_EventScript_22E2C5:: @ 822E2C5 - special sub_80B4808 +PetalburgWoods_EventScript_TryRegisterJames:: @ 822E2C5 + special PlayerFaceTrainerAfterBattle waitmovement 0 - goto_if_set FLAG_HAS_MATCH_CALL, PetalburgWoods_EventScript_22E2D6 + goto_if_set FLAG_HAS_MATCH_CALL, PetalburgWoods_EventScript_RegisterJames release end -PetalburgWoods_EventScript_22E2D6:: @ 822E2D6 - msgbox PetalburgWoods_Text_22E8C3, MSGBOX_DEFAULT +PetalburgWoods_EventScript_RegisterJames:: @ 822E2D6 + msgbox PetalburgWoods_Text_IWantRematch1, MSGBOX_DEFAULT register_matchcall TRAINER_JAMES_1 release end -PetalburgWoods_EventScript_22E2EF:: @ 822E2EF - goto_if_set FLAG_HAS_MATCH_CALL, PetalburgWoods_EventScript_22E302 - msgbox PetalburgWoods_Text_22E889, MSGBOX_DEFAULT +PetalburgWoods_EventScript_TryRegisterJames2:: @ 822E2EF + goto_if_set FLAG_HAS_MATCH_CALL, PetalburgWoods_EventScript_RegisterJames2 + msgbox PetalburgWoods_Text_PeopleRespectYou, MSGBOX_DEFAULT release end -PetalburgWoods_EventScript_22E302:: @ 822E302 - msgbox PetalburgWoods_Text_22E914, MSGBOX_DEFAULT +PetalburgWoods_EventScript_RegisterJames2:: @ 822E302 + msgbox PetalburgWoods_Text_IWantRematch2, MSGBOX_DEFAULT register_matchcall TRAINER_JAMES_1 release end -PetalburgWoods_EventScript_22E31B:: @ 822E31B - trainerbattle_rematch TRAINER_JAMES_1, PetalburgWoods_Text_22E966, PetalburgWoods_Text_22E998 - msgbox PetalburgWoods_Text_22E9B6, MSGBOX_AUTOCLOSE +PetalburgWoods_EventScript_JamesRematch:: @ 822E31B + trainerbattle_rematch TRAINER_JAMES_1, PetalburgWoods_Text_MyPokemonHaveGrown, PetalburgWoods_Text_CantBePopularIfLose + msgbox PetalburgWoods_Text_IveBeenTrainingHard, MSGBOX_AUTOCLOSE end -PetalburgWoods_Text_22E332: @ 822E332 +PetalburgWoods_Text_NotAOneToBeFound: @ 822E332 .string "Hmmm…\n" .string "Not a one to be found…$" -PetalburgWoods_Text_22E34F: @ 822E34F +PetalburgWoods_Text_HaveYouSeenShroomish: @ 822E34F .string "Hello, have you seen any POKéMON\n" .string "called SHROOMISH around here?\p" .string "I really love that POKéMON.$" -PetalburgWoods_Text_22E3AA: @ 822E3AA +PetalburgWoods_Text_IWasGoingToAmbushYou: @ 822E3AA .string "I was going to ambush you, but you\n" .string "had to dawdle in PETALBURG WOODS\l" .string "forever, didn't you?\p" .string "I got sick of waiting, so here I am!$" -PetalburgWoods_Text_22E428: @ 822E428 +PetalburgWoods_Text_HandOverThosePapers: @ 822E428 .string "You! DEVON RESEARCHER!\p" .string "Hand over those papers!$" -PetalburgWoods_Text_22E457: @ 822E457 +PetalburgWoods_Text_YouHaveToHelpMe: @ 822E457 .string "Aiyeeeh!\p" .string "You're a POKéMON TRAINER, aren't you?\n" .string "You've got to help me, please!$" -PetalburgWoods_Text_22E4A5: @ 822E4A5 +PetalburgWoods_Text_NoOneCrossesTeamAqua: @ 822E4A5 .string "Hunh? What do you think you're doing?\n" .string "What, you're going to protect him?\p" .string "No one who crosses TEAM AQUA\n" .string "gets any mercy, not even a kid!\p" .string "Come on and battle me!$" -PetalburgWoods_Text_22E542: @ 822E542 +PetalburgWoods_Text_YoureKiddingMe: @ 822E542 .string "You're kidding me! You're tough!$" -PetalburgWoods_Text_22E563: @ 822E563 +PetalburgWoods_Text_YouveGotSomeNerve: @ 822E563 .string "Grrr… You've got some nerve\n" .string "meddling with TEAM AQUA!\l" .string "Come on and battle me again!\p" @@ -363,7 +363,7 @@ PetalburgWoods_Text_22E563: @ 822E563 .string "after something in RUSTBORO.\p" .string "I'll let you go today!$" -PetalburgWoods_Text_22E63D: @ 822E63D +PetalburgWoods_Text_ThatWasAwfullyClose: @ 822E63D .string "Whew…\n" .string "That was awfully close!\p" .string "Thanks to you, he didn't rob me of\n" @@ -371,85 +371,85 @@ PetalburgWoods_Text_22E63D: @ 822E63D .string "I know, I'll give you a GREAT BALL as\n" .string "my thanks!$" -PetalburgWoods_Text_22E6C7: @ 822E6C7 +PetalburgWoods_Text_TeamAquaAfterSomethingInRustboro: @ 822E6C7 .string "Didn't that TEAM AQUA thug say\n" .string "they were after something in\l" .string "RUSTBORO, too?$" -PetalburgWoods_Text_22E712: @ 822E712 +PetalburgWoods_Text_ICantBeWastingTime: @ 822E712 .string "Uh-oh! It's a crisis!\n" .string "I can't be wasting time!$" -PetalburgWoods_Text_22E741: @ 822E741 +PetalburgWoods_Text_YoureLoadedWithItems: @ 822E741 .string "You're loaded with items.\n" .string "I can't give you this GREAT BALL.$" -PetalburgWoods_Text_22E77D: @ 822E77D +PetalburgWoods_Text_GoBugPokemonTeam: @ 822E77D .string "I caught a whole bunch of POKéMON!\p" .string "Go, go, go!\n" .string "My BUG POKéMON team!$" -PetalburgWoods_Text_22E7C1: @ 822E7C1 +PetalburgWoods_Text_ICouldntWin: @ 822E7C1 .string "I have all these POKéMON,\n" .string "but I couldn't win…$" -PetalburgWoods_Text_22E7EF: @ 822E7EF +PetalburgWoods_Text_ImOutOfPokeBalls: @ 822E7EF .string "I caught a bunch of POKéMON.\n" .string "Now I'm out of POKé BALLS.$" -PetalburgWoods_Text_22E827: @ 822E827 +PetalburgWoods_Text_InstantlyPopularWithBugPokemon: @ 822E827 .string "If you take BUG POKéMON to school,\n" .string "you get to be instantly popular!$" -PetalburgWoods_Text_22E86B: @ 822E86B +PetalburgWoods_Text_CantBePopularIfILose: @ 822E86B .string "I can't be popular if I lose.$" -PetalburgWoods_Text_22E889: @ 822E889 +PetalburgWoods_Text_PeopleRespectYou: @ 822E889 .string "If you have a big BUG POKéMON,\n" .string "people respect you for it.$" -PetalburgWoods_Text_22E8C3: @ 822E8C3 +PetalburgWoods_Text_IWantRematch1: @ 822E8C3 .string "I want a rematch when my BUG\n" .string "POKéMON grow up!\p" .string "I'm registering you in my POKéNAV!$" -PetalburgWoods_Text_22E914: @ 822E914 +PetalburgWoods_Text_IWantRematch2: @ 822E914 .string "I want a rematch when my BUG \n" .string "POKéMON grow up!\p" .string "I'm registering you in my POKéNAV!$" -PetalburgWoods_Text_22E966: @ 822E966 +PetalburgWoods_Text_MyPokemonHaveGrown: @ 822E966 .string "My BUG POKéMON have grown.\n" .string "I'll be popular again.$" -PetalburgWoods_Text_22E998: @ 822E998 +PetalburgWoods_Text_CantBePopularIfLose: @ 822E998 .string "I can't be popular if I lose.$" -PetalburgWoods_Text_22E9B6: @ 822E9B6 +PetalburgWoods_Text_IveBeenTrainingHard: @ 822E9B6 .string "You get to be popular if you have\n" .string "strong POKéMON, right?\l" .string "So, I've been training hard.$" -PetalburgWoods_Text_22EA0C: @ 822EA0C +PetalburgWoods_Text_StayOutOfTallGrass: @ 822EA0C .string "Yo, there!\n" .string "Your POKéMON doing okay?\p" .string "If your POKéMON are weak and you want\n" .string "to avoid battles, you should stay out\l" .string "of tall grass.$" -PetalburgWoods_Text_22EA8B: @ 822EA8B +PetalburgWoods_Text_HiddenItemsExplanation: @ 822EA8B .string "Sometimes, there are things on the\n" .string "ground even if you can't see them.\p" .string "That's why I always check where I'm\n" .string "walking.$" -PetalburgWoods_Text_22EAFE: @ 822EAFE +PetalburgWoods_Text_TryUsingThisItem: @ 822EAFE .string "Oh, neat!\n" .string "That's the BADGE from RUSTBORO GYM!\p" .string "You must be a TRAINER.\n" .string "You should try using this item.$" -PetalburgWoods_Text_22EB63: @ 822EB63 +PetalburgWoods_Text_MiracleSeedExplanation: @ 822EB63 .string "It's a MIRACLE SEED.\n" .string "If a POKéMON holds that item, its\l" .string "GRASS-type moves become stronger.\p" @@ -457,7 +457,7 @@ PetalburgWoods_Text_22EB63: @ 822EB63 .string "other convenient items for POKéMON\l" .string "to hold.$" -PetalburgWoods_Text_22EC10: @ 822EC10 +PetalburgWoods_Text_TrainerTipsExperience: @ 822EC10 .string "TRAINER TIPS\p" .string "Any POKéMON that appears even once\n" .string "in a battle is awarded EXP Points.\p" @@ -467,7 +467,7 @@ PetalburgWoods_Text_22EC10: @ 822EC10 .string "out. It will earn EXP Points without\l" .string "being exposed to any harm.$" -PetalburgWoods_Text_22ED07: @ 822ED07 +PetalburgWoods_Text_TrainerTipsPP: @ 822ED07 .string "TRAINER TIPS\p" .string "In addition to Hit Points (HP), POKéMON\n" .string "have Power Points (PP) that are used to\l" diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index 44d8b2137..71dbf96cc 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route101_EventScript_1EBDFB", + "script": "Route101_EventScript_Youngster", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route101_EventScript_1EBE16", + "script": "Route101_EventScript_BirchsBag", "flag": "FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG" }, { @@ -87,7 +87,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route101_EventScript_272141", + "script": "ProfBirch_EventScript_RatePokedexOrRegister", "flag": "FLAG_HIDE_ROUTE_101_BIRCH" }, { @@ -100,7 +100,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route101_EventScript_1EBE04", + "script": "Route101_EventScript_Boy", "flag": "FLAG_HIDE_ROUTE_101_BOY" } ], @@ -113,7 +113,7 @@ "elevation": 3, "var": "VAR_ROUTE101_STATE", "var_value": "1", - "script": "Route101_EventScript_1EBCDE" + "script": "Route101_EventScript_StartBirchRescue" }, { "type": "trigger", @@ -122,7 +122,7 @@ "elevation": 3, "var": "VAR_ROUTE101_STATE", "var_value": "1", - "script": "Route101_EventScript_1EBCDE" + "script": "Route101_EventScript_StartBirchRescue" }, { "type": "trigger", @@ -131,7 +131,7 @@ "elevation": 3, "var": "VAR_ROUTE101_STATE", "var_value": "2", - "script": "Route101_EventScript_1EBD4E" + "script": "Route101_EventScript_PreventExitSouth" }, { "type": "trigger", @@ -140,7 +140,7 @@ "elevation": 3, "var": "VAR_ROUTE101_STATE", "var_value": "2", - "script": "Route101_EventScript_1EBD4E" + "script": "Route101_EventScript_PreventExitSouth" }, { "type": "trigger", @@ -149,7 +149,7 @@ "elevation": 3, "var": "VAR_ROUTE101_STATE", "var_value": "2", - "script": "Route101_EventScript_1EBD64" + "script": "Route101_EventScript_PreventExitWest" }, { "type": "trigger", @@ -158,7 +158,7 @@ "elevation": 3, "var": "VAR_ROUTE101_STATE", "var_value": "2", - "script": "Route101_EventScript_1EBD64" + "script": "Route101_EventScript_PreventExitWest" }, { "type": "trigger", @@ -167,7 +167,7 @@ "elevation": 3, "var": "VAR_ROUTE101_STATE", "var_value": "2", - "script": "Route101_EventScript_1EBD64" + "script": "Route101_EventScript_PreventExitWest" }, { "type": "trigger", @@ -176,7 +176,7 @@ "elevation": 3, "var": "VAR_ROUTE101_STATE", "var_value": "2", - "script": "Route101_EventScript_1EBD64" + "script": "Route101_EventScript_PreventExitWest" }, { "type": "trigger", @@ -185,7 +185,7 @@ "elevation": 3, "var": "VAR_ROUTE101_STATE", "var_value": "2", - "script": "Route101_EventScript_1EBD7A" + "script": "Route101_EventScript_PreventExitNorth" } ], "bg_events": [ @@ -195,7 +195,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route101_EventScript_1EBE0D" + "script": "Route101_EventScript_RouteSign" } ] }
\ No newline at end of file diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 73bfe570c..de28aa251 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -4,83 +4,83 @@ Route101_MapScripts:: @ 81EBCBA .byte 0 Route101_OnTransition: @ 81EBCC5 - call Route101_EventScript_2720AD + call ProfBirch_EventScript_UpdateLocation end Route101_MapScript2_1EBCCB: @ 81EBCCB - map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_1EBCD5 + map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_HideMapNamePopup .2byte 0 -Route101_EventScript_1EBCD5:: @ 81EBCD5 +Route101_EventScript_HideMapNamePopup:: @ 81EBCD5 setflag FLAG_HIDE_MAP_NAME_POPUP setvar VAR_ROUTE101_STATE, 1 end -Route101_EventScript_1EBCDE:: @ 81EBCDE +Route101_EventScript_StartBirchRescue:: @ 81EBCDE lockall playbgm MUS_EVENT0, 1 - msgbox Route101_Text_1EBE8F, MSGBOX_DEFAULT + msgbox Route101_Text_HelpMe, MSGBOX_DEFAULT closemessage setobjectxy 2, 0, 15 setobjectxy 4, 0, 16 - applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_1EBDC2 - applymovement 2, Route101_Movement_1EBDE7 - applymovement 4, Route101_Movement_1EBDB5 + applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_EnterScene + applymovement 2, Route101_Movement_BirchRunAway1 + applymovement 4, Route101_Movement_PoochyenaChase1 waitmovement 0 - applymovement 4, Route101_Movement_1EBD96 - applymovement 2, Route101_Movement_1EBDC8 + applymovement 4, Route101_Movement_PoochyenaChaseInCircles + applymovement 2, Route101_Movement_BirchRunInCircles waitmovement 0 - applymovement 2, Common_Movement_WalkInPlaceRight + applymovement 2, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement 4, Route101_Movement_1EBDBD - applymovement 2, Route101_Movement_1EBDEF + applymovement 4, Route101_Movement_PoochyenaFaceBirch + applymovement 2, Route101_Movement_BirchFacePoochyena waitmovement 0 - msgbox Route101_Text_1EBE9A, MSGBOX_DEFAULT + msgbox Route101_Text_PleaseHelp, MSGBOX_DEFAULT closemessage setvar VAR_ROUTE101_STATE, 2 releaseall end -Route101_EventScript_1EBD4E:: @ 81EBD4E +Route101_EventScript_PreventExitSouth:: @ 81EBD4E lockall - msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT + msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_1EBD90 + applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_PreventExitSouth waitmovement 0 releaseall end -Route101_EventScript_1EBD64:: @ 81EBD64 +Route101_EventScript_PreventExitWest:: @ 81EBD64 lockall - msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT + msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_1EBD92 + applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_PreventExitWest waitmovement 0 releaseall end -Route101_EventScript_1EBD7A:: @ 81EBD7A +Route101_EventScript_PreventExitNorth:: @ 81EBD7A lockall - msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT + msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_1EBD94 + applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_PreventExitNorth waitmovement 0 releaseall end -Route101_Movement_1EBD90: @ 81EBD90 +Route101_Movement_PreventExitSouth: @ 81EBD90 walk_up step_end -Route101_Movement_1EBD92: @ 81EBD92 +Route101_Movement_PreventExitWest: @ 81EBD92 walk_right step_end -Route101_Movement_1EBD94: @ 81EBD94 +Route101_Movement_PreventExitNorth: @ 81EBD94 walk_down step_end -Route101_Movement_1EBD96: @ 81EBD96 +Route101_Movement_PoochyenaChaseInCircles: @ 81EBD96 walk_fast_up walk_fast_up walk_fast_up @@ -113,7 +113,7 @@ Route101_Movement_1EBD96: @ 81EBD96 walk_fast_left step_end -Route101_Movement_1EBDB5: @ 81EBDB5 +Route101_Movement_PoochyenaChase1: @ 81EBDB5 walk_fast_up walk_fast_right walk_fast_right @@ -122,17 +122,17 @@ Route101_Movement_1EBDB5: @ 81EBDB5 walk_fast_up step_end -Route101_Movement_1EBDBC: @ 81EBDBC +@ Leftover data? This command is unused. step_end -Route101_Movement_1EBDBD: @ 81EBDBD +Route101_Movement_PoochyenaFaceBirch: @ 81EBDBD walk_in_place_fast_left walk_in_place_fast_left walk_in_place_fast_left walk_in_place_fast_left step_end -Route101_Movement_1EBDC2: @ 81EBDC2 +Route101_Movement_EnterScene: @ 81EBDC2 walk_fast_up walk_fast_up walk_fast_up @@ -140,7 +140,7 @@ Route101_Movement_1EBDC2: @ 81EBDC2 walk_in_place_fastest_left step_end -Route101_Movement_1EBDC8: @ 81EBDC8 +Route101_Movement_BirchRunInCircles: @ 81EBDC8 walk_fast_up walk_fast_up walk_fast_right @@ -173,7 +173,7 @@ Route101_Movement_1EBDC8: @ 81EBDC8 walk_fast_left step_end -Route101_Movement_1EBDE7: @ 81EBDE7 +Route101_Movement_BirchRunAway1: @ 81EBDE7 walk_fast_right walk_fast_right walk_fast_right @@ -182,40 +182,40 @@ Route101_Movement_1EBDE7: @ 81EBDE7 walk_fast_up step_end -Route101_Movement_1EBDEE: @ 81EBDEE +@ Leftover data? This command is unused. step_end -Route101_Movement_1EBDEF: @ 81EBDEF +Route101_Movement_BirchFacePoochyena: @ 81EBDEF walk_in_place_fast_right walk_in_place_fast_right walk_in_place_fast_right walk_in_place_fast_right step_end -Route101_Movement_1EBDF4: @ 81EBDF4 +Route101_Movement_Unused1: @ 81EBDF4 walk_up walk_up step_end -Route101_Movement_1EBDF7: @ 81EBDF7 +Route101_Movement_Unused2: @ 81EBDF7 walk_up walk_left walk_up step_end -Route101_EventScript_1EBDFB:: @ 81EBDFB - msgbox Route101_Text_1EBFDD, MSGBOX_NPC +Route101_EventScript_Youngster:: @ 81EBDFB + msgbox Route101_Text_TakeTiredPokemonToPokeCenter, MSGBOX_NPC end -Route101_EventScript_1EBE04:: @ 81EBE04 - msgbox Route101_Text_1EC04A, MSGBOX_NPC +Route101_EventScript_Boy:: @ 81EBE04 + msgbox Route101_Text_WildPokemonInTallGrass, MSGBOX_NPC end -Route101_EventScript_1EBE0D:: @ 81EBE0D - msgbox Route101_Text_1EC0C8, MSGBOX_SIGN +Route101_EventScript_RouteSign:: @ 81EBE0D + msgbox Route101_Text_RouteSign, MSGBOX_SIGN end -Route101_EventScript_1EBE16:: @ 81EBE16 +Route101_EventScript_BirchsBag:: @ 81EBE16 lock faceplayer setflag FLAG_SYS_POKEMON_GET @@ -223,13 +223,13 @@ Route101_EventScript_1EBE16:: @ 81EBE16 fadescreen 1 removeobject 4 setobjectxy EVENT_OBJ_ID_PLAYER, 6, 13 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 special ChooseStarter waitstate - applymovement 2, Route101_Movement_1EBE8D + applymovement 2, Route101_Movement_BirchApproachPlayer waitmovement 0 - msgbox Route101_Text_1EBF12, MSGBOX_DEFAULT + msgbox Route101_Text_YouSavedMe, MSGBOX_DEFAULT special HealPlayerParty setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH @@ -239,40 +239,40 @@ Route101_EventScript_1EBE16:: @ 81EBE16 clearflag FLAG_HIDE_MAP_NAME_POPUP checkplayergender compare VAR_RESULT, MALE - call_if_eq Route101_EventScript_1EBE85 + call_if_eq Route101_EventScript_HideMayInBedroom compare VAR_RESULT, FEMALE - call_if_eq Route101_EventScript_1EBE89 + call_if_eq Route101_EventScript_HideBrendanInBedroom warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate release end -Route101_EventScript_1EBE85:: @ 81EBE85 +Route101_EventScript_HideMayInBedroom:: @ 81EBE85 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM return -Route101_EventScript_1EBE89:: @ 81EBE89 +Route101_EventScript_HideBrendanInBedroom:: @ 81EBE89 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM return -Route101_Movement_1EBE8D: @ 81EBE8D +Route101_Movement_BirchApproachPlayer: @ 81EBE8D walk_right step_end -Route101_Text_1EBE8F: @ 81EBE8F +Route101_Text_HelpMe: @ 81EBE8F .string "H-help me!$" -Route101_Text_1EBE9A: @ 81EBE9A +Route101_Text_PleaseHelp: @ 81EBE9A .string "Hello! You over there!\n" .string "Please! Help!\p" .string "In my BAG!\n" .string "There's a POKé BALL!$" -Route101_Text_1EBEDF: @ 81EBEDF +Route101_Text_DontLeaveMe: @ 81EBEDF .string "Wh-Where are you going?!\n" .string "Don't leave me like this!$" -Route101_Text_1EBF12: @ 81EBF12 +Route101_Text_YouSavedMe: @ 81EBF12 .string "PROF. BIRCH: Whew…\p" .string "I was in the tall grass studying wild\n" .string "POKéMON when I was jumped.\p" @@ -283,19 +283,19 @@ Route101_Text_1EBF12: @ 81EBF12 .string "This is not the place to chat, so come\n" .string "by my POKéMON LAB later, okay?$" -Route101_Text_1EBFDD: @ 81EBFDD +Route101_Text_TakeTiredPokemonToPokeCenter: @ 81EBFDD .string "If POKéMON get tired, take them to\n" .string "a POKéMON CENTER.\p" .string "There's a POKéMON CENTER in OLDALE\n" .string "TOWN right close by.$" -Route101_Text_1EC04A: @ 81EC04A +Route101_Text_WildPokemonInTallGrass: @ 81EC04A .string "Wild POKéMON will jump out at you in\n" .string "tall grass.\p" .string "If you want to catch POKéMON, you have\n" .string "to go into the tall grass and search.$" -Route101_Text_1EC0C8: @ 81EC0C8 +Route101_Text_RouteSign: @ 81EC0C8 .string "ROUTE 101\n" .string "{UP_ARROW} OLDALE TOWN$" diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json index 323c4142b..f8930a21d 100644 --- a/data/maps/Route102/map.json +++ b/data/maps/Route102/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route102_EventScript_1EC0E1", + "script": "Route102_EventScript_LittleBoy", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route102_EventScript_1EC105", + "script": "Route102_EventScript_Calvin", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route102_EventScript_1EC1B3", + "script": "Route102_EventScript_Rick", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route102_EventScript_1EC1CA", + "script": "Route102_EventScript_Tiana", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route102_EventScript_1EC0FC", + "script": "Route102_EventScript_Boy", "flag": "0" }, { @@ -139,7 +139,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route102_EventScript_1EC1E1", + "script": "Route102_EventScript_Allen", "flag": "0" } ], @@ -152,7 +152,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route102_EventScript_1EC0F3" + "script": "Route102_EventScript_RouteSignPetalburg" }, { "type": "sign", @@ -160,7 +160,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route102_EventScript_1EC0EA" + "script": "Route102_EventScript_RouteSignOldale" } ] }
\ No newline at end of file diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index ada20447a..b14f204e5 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -1,81 +1,81 @@ Route102_MapScripts:: @ 81EC0E0 .byte 0 -Route102_EventScript_1EC0E1:: @ 81EC0E1 - msgbox Route102_Text_1EC2C0, MSGBOX_NPC +Route102_EventScript_LittleBoy:: @ 81EC0E1 + msgbox Route102_Text_ImNotVeryTall, MSGBOX_NPC end -Route102_EventScript_1EC0EA:: @ 81EC0EA - msgbox Route102_Text_1EC35B, MSGBOX_SIGN +Route102_EventScript_RouteSignOldale:: @ 81EC0EA + msgbox Route102_Text_RouteSignOldale, MSGBOX_SIGN end -Route102_EventScript_1EC0F3:: @ 81EC0F3 - msgbox Route102_Text_1EC373, MSGBOX_SIGN +Route102_EventScript_RouteSignPetalburg:: @ 81EC0F3 + msgbox Route102_Text_RouteSignPetalburg, MSGBOX_SIGN end -Route102_EventScript_1EC0FC:: @ 81EC0FC - msgbox Route102_Text_1EC32E, MSGBOX_NPC +Route102_EventScript_Boy:: @ 81EC0FC + msgbox Route102_Text_CatchWholeBunchOfPokemon, MSGBOX_NPC end -Route102_EventScript_1EC105:: @ 81EC105 - trainerbattle_single TRAINER_CALVIN_1, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 +Route102_EventScript_Calvin:: @ 81EC105 + trainerbattle_single TRAINER_CALVIN_1, Route102_Text_CalvinIntro, Route102_Text_CalvinDefeated, Route102_EventScript_CalvinRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route102_EventScript_1EC19C - setvar VAR_0x8004, 318 - specialvar VAR_RESULT, sub_813B4E0 - compare VAR_RESULT, 0 - goto_if_eq Route102_EventScript_1EC170 - msgbox Route102_Text_2945AC, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route102_EventScript_CalvinRematch + setvar VAR_0x8004, TRAINER_CALVIN_1 + specialvar VAR_RESULT, IsTrainerRegistered + compare VAR_RESULT, FALSE + goto_if_eq Route102_EventScript_CalvinTryRegister + msgbox Route102_Text_CalvinPostBattle, MSGBOX_DEFAULT release end -Route102_EventScript_1EC146:: @ 81EC146 - special sub_80B4808 +Route102_EventScript_CalvinRegisterMatchCallAfterBattle:: @ 81EC146 + special PlayerFaceTrainerAfterBattle waitmovement 0 - goto_if_set FLAG_HAS_MATCH_CALL, Route102_EventScript_1EC157 + goto_if_set FLAG_HAS_MATCH_CALL, Route102_EventScript_CalvinRegisterMatchCall release end -Route102_EventScript_1EC157:: @ 81EC157 - msgbox Route102_Text_294668, MSGBOX_DEFAULT +Route102_EventScript_CalvinRegisterMatchCall:: @ 81EC157 + msgbox Route102_Text_CalvinRegisterShort, MSGBOX_DEFAULT register_matchcall TRAINER_CALVIN_1 release end -Route102_EventScript_1EC170:: @ 81EC170 - goto_if_set FLAG_HAS_MATCH_CALL, Route102_EventScript_1EC183 - msgbox Route102_Text_2945AC, MSGBOX_DEFAULT +Route102_EventScript_CalvinTryRegister:: @ 81EC170 + goto_if_set FLAG_HAS_MATCH_CALL, Route102_EventScript_CalvinRegister + msgbox Route102_Text_CalvinPostBattle, MSGBOX_DEFAULT release end -Route102_EventScript_1EC183:: @ 81EC183 - msgbox Route102_Text_2945EB, MSGBOX_DEFAULT +Route102_EventScript_CalvinRegister:: @ 81EC183 + msgbox Route102_Text_CalvinRegister, MSGBOX_DEFAULT register_matchcall TRAINER_CALVIN_1 release end -Route102_EventScript_1EC19C:: @ 81EC19C - trainerbattle_rematch TRAINER_CALVIN_1, Route102_Text_2946AE, Route102_Text_29470C - msgbox Route102_Text_29473C, MSGBOX_AUTOCLOSE +Route102_EventScript_CalvinRematch:: @ 81EC19C + trainerbattle_rematch TRAINER_CALVIN_1, Route102_Text_CalvinRematchIntro, Route102_Text_CalvinRematchDefeated + msgbox Route102_Text_CalvinRematchPostBattle, MSGBOX_AUTOCLOSE end -Route102_EventScript_1EC1B3:: @ 81EC1B3 - trainerbattle_single TRAINER_RICK, Route102_Text_29480C, Route102_Text_294847 - msgbox Route102_Text_294859, MSGBOX_AUTOCLOSE +Route102_EventScript_Rick:: @ 81EC1B3 + trainerbattle_single TRAINER_RICK, Route102_Text_RickIntro, Route102_Text_RickDefeated + msgbox Route102_Text_RickPostBattle, MSGBOX_AUTOCLOSE end -Route102_EventScript_1EC1CA:: @ 81EC1CA - trainerbattle_single TRAINER_TIANA, Route102_Text_29489E, Route102_Text_2948F3 - msgbox Route102_Text_294916, MSGBOX_AUTOCLOSE +Route102_EventScript_Tiana:: @ 81EC1CA + trainerbattle_single TRAINER_TIANA, Route102_Text_TianaIntro, Route102_Text_TianaDefeated + msgbox Route102_Text_TianaPostBattle, MSGBOX_AUTOCLOSE end -Route102_EventScript_1EC1E1:: @ 81EC1E1 - trainerbattle_single TRAINER_ALLEN, Route102_Text_294775, Route102_Text_2947AA - msgbox Route102_Text_2947DB, MSGBOX_AUTOCLOSE +Route102_EventScript_Allen:: @ 81EC1E1 + trainerbattle_single TRAINER_ALLEN, Route102_Text_AllenIntro, Route102_Text_AllenDefeated + msgbox Route102_Text_AllenPostBattle, MSGBOX_AUTOCLOSE end -PetalburgCity_Text_1EC1F8: @ 81EC1F8 +Route102_Text_WatchMeCatchPokemon: @ 81EC1F8 .string "WALLY: {PLAYER}…\n" .string "POKéMON hide in tall grass like this,\l" .string "don't they?\p" @@ -83,29 +83,29 @@ PetalburgCity_Text_1EC1F8: @ 81EC1F8 .string "catch one properly.\p" .string "…Whoa!$" -PetalburgCity_Text_1EC271: @ 81EC271 +Route102_Text_WallyIDidIt: @ 81EC271 .string "WALLY: I did it… It's my…\n" .string "My POKéMON!$" -PetalburgCity_Text_1EC297: @ 81EC297 +Route102_Text_LetsGoBack: @ 81EC297 .string "{PLAYER}, thank you!\n" .string "Let's go back to the GYM!$" -Route102_Text_1EC2C0: @ 81EC2C0 +Route102_Text_ImNotVeryTall: @ 81EC2C0 .string "I'm…not very tall, so I sink right\n" .string "into tall grass.\p" .string "The grass goes up my nose and…\n" .string "Fwafwafwafwafwa…\p" .string "Fwatchoo!$" -Route102_Text_1EC32E: @ 81EC32E +Route102_Text_CatchWholeBunchOfPokemon: @ 81EC32E .string "I'm going to catch a whole bunch of\n" .string "POKéMON!$" -Route102_Text_1EC35B: @ 81EC35B +Route102_Text_RouteSignOldale: @ 81EC35B .string "ROUTE 102\n" .string "{RIGHT_ARROW} OLDALE TOWN$" -Route102_Text_1EC373: @ 81EC373 +Route102_Text_RouteSignPetalburg: @ 81EC373 .string "ROUTE 102\n" .string "{LEFT_ARROW} PETALBURG CITY$" diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index bf207ec2f..0a870a06e 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route103_EventScript_1EC5E2", + "script": "Route103_EventScript_Man", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route103_EventScript_1EC3C1", + "script": "Route103_EventScript_Rival", "flag": "FLAG_HIDE_ROUTE_103_RIVAL" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route103_EventScript_1EC5F4", + "script": "Route103_EventScript_Daisy", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route103_EventScript_1EC66E", + "script": "Route103_EventScript_Liv", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route103_EventScript_1EC60B", + "script": "Route103_EventScript_Amy", "flag": "0" }, { @@ -100,7 +100,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route103_EventScript_1EC6D1", + "script": "Route103_EventScript_Andrew", "flag": "0" }, { @@ -152,7 +152,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route103_EventScript_1EC5D9", + "script": "Route103_EventScript_Boy", "flag": "0" }, { @@ -165,7 +165,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route103_EventScript_272141", + "script": "ProfBirch_EventScript_RatePokedexOrRegister", "flag": "FLAG_HIDE_ROUTE_103_BIRCH" }, { @@ -178,7 +178,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route103_EventScript_1EC6E8", + "script": "Route103_EventScript_Miguel", "flag": "0" }, { @@ -230,7 +230,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route103_EventScript_1EC761", + "script": "Route103_EventScript_Rhett", "flag": "0" }, { @@ -243,7 +243,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route103_EventScript_1EC74A", + "script": "Route103_EventScript_Marcos", "flag": "0" }, { @@ -256,7 +256,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route103_EventScript_1EC78F", + "script": "Route103_EventScript_Isabelle", "flag": "0" }, { @@ -269,7 +269,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route103_EventScript_1EC778", + "script": "Route103_EventScript_Pete", "flag": "0" }, { @@ -303,7 +303,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route103_EventScript_1EC5EB" + "script": "Route103_EventScript_RouteSign" } ] }
\ No newline at end of file diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 36b2c6c14..c614dae1c 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -1,33 +1,33 @@ Route103_MapScripts:: @ 81EC38E map_script MAP_SCRIPT_ON_TRANSITION, Route103_OnTransition - map_script MAP_SCRIPT_ON_LOAD, Route103_MapScript1_1EC3A4 + map_script MAP_SCRIPT_ON_LOAD, Route103_OnLoad .byte 0 Route103_OnTransition: @ 81EC399 - call Common_EventScript_SetupRivalGender - call Route103_EventScript_2720AD + call Common_EventScript_SetupRivalGfxId + call ProfBirch_EventScript_UpdateLocation end -Route103_MapScript1_1EC3A4: @ 81EC3A4 - call_if_set FLAG_SYS_GAME_CLEAR, Route103_EventScript_1EC3AE +Route103_OnLoad: @ 81EC3A4 + call_if_set FLAG_SYS_GAME_CLEAR, Route103_EventScript_OpenAlteringCave end -Route103_EventScript_1EC3AE:: @ 81EC3AE +Route103_EventScript_OpenAlteringCave:: @ 81EC3AE setmetatile 45, 5, METATILE_General_CaveEntrance_Top, 1 setmetatile 45, 6, METATILE_General_CaveEntrance_Bottom, 0 return -Route103_EventScript_1EC3C1:: @ 81EC3C1 +Route103_EventScript_Rival:: @ 81EC3C1 lockall checkplayergender compare VAR_RESULT, MALE - goto_if_eq Route103_EventScript_1EC3DA + goto_if_eq Route103_EventScript_RivalMay compare VAR_RESULT, FEMALE - goto_if_eq Route103_EventScript_1EC434 + goto_if_eq Route103_EventScript_RivalBrendan end -Route103_EventScript_1EC3DA:: @ 81EC3DA - msgbox Route103_Text_1EC7A6, MSGBOX_DEFAULT +Route103_EventScript_RivalMay:: @ 81EC3DA + msgbox Route103_Text_MayRoute103Pokemon, MSGBOX_DEFAULT closemessage playbgm MUS_GIRL_SUP, 1 applymovement 2, Common_Movement_FacePlayer @@ -36,15 +36,15 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA waitmovement 0 applymovement 2, Common_Movement_Delay48 waitmovement 0 - msgbox Route103_Text_1EC7DE, MSGBOX_DEFAULT + msgbox Route103_Text_MayLetsBattle, MSGBOX_DEFAULT switch VAR_STARTER_MON - case 0, Route103_EventScript_1EC48E - case 1, Route103_EventScript_1EC49E - case 2, Route103_EventScript_1EC4AE + case 0, Route103_EventScript_StartMayBattleTreecko + case 1, Route103_EventScript_StartMayBattleTorchic + case 2, Route103_EventScript_StartMayBattleMudkip end -Route103_EventScript_1EC434:: @ 81EC434 - msgbox Route103_Text_1EC989, MSGBOX_DEFAULT +Route103_EventScript_RivalBrendan:: @ 81EC434 + msgbox Route103_Text_BrendanRoute103Pokemon, MSGBOX_DEFAULT closemessage playbgm MUS_BOY_SUP, 1 applymovement 2, Common_Movement_FacePlayer @@ -53,92 +53,92 @@ Route103_EventScript_1EC434:: @ 81EC434 waitmovement 0 applymovement 2, Common_Movement_Delay48 waitmovement 0 - msgbox Route103_Text_1EC9CE, MSGBOX_DEFAULT + msgbox Route103_Text_BrendanLetsBattle, MSGBOX_DEFAULT switch VAR_STARTER_MON - case 0, Route103_EventScript_1EC4BE - case 1, Route103_EventScript_1EC4CE - case 2, Route103_EventScript_1EC4DE + case 0, Route103_EventScript_StartBrendanBattleTreecko + case 1, Route103_EventScript_StartBrendanBattleTorchic + case 2, Route103_EventScript_StartBrendanBattleMudkip end -Route103_EventScript_1EC48E:: @ 81EC48E - trainerbattle_no_intro TRAINER_MAY_4, Route103_Text_1EC881 - goto Route103_EventScript_1EC4EE +Route103_EventScript_StartMayBattleTreecko:: @ 81EC48E + trainerbattle_no_intro TRAINER_MAY_4, Route103_Text_MayDefeated + goto Route103_EventScript_AfterMayBattle end -Route103_EventScript_1EC49E:: @ 81EC49E - trainerbattle_no_intro TRAINER_MAY_7, Route103_Text_1EC881 - goto Route103_EventScript_1EC4EE +Route103_EventScript_StartMayBattleTorchic:: @ 81EC49E + trainerbattle_no_intro TRAINER_MAY_7, Route103_Text_MayDefeated + goto Route103_EventScript_AfterMayBattle end -Route103_EventScript_1EC4AE:: @ 81EC4AE - trainerbattle_no_intro TRAINER_MAY_1, Route103_Text_1EC881 - goto Route103_EventScript_1EC4EE +Route103_EventScript_StartMayBattleMudkip:: @ 81EC4AE + trainerbattle_no_intro TRAINER_MAY_1, Route103_Text_MayDefeated + goto Route103_EventScript_AfterMayBattle end -Route103_EventScript_1EC4BE:: @ 81EC4BE - trainerbattle_no_intro TRAINER_BRENDAN_4, Route103_Text_1ECA59 - goto Route103_EventScript_1EC4FC +Route103_EventScript_StartBrendanBattleTreecko:: @ 81EC4BE + trainerbattle_no_intro TRAINER_BRENDAN_4, Route103_Text_BrendanDefeated + goto Route103_EventScript_AfterBrendanBattle end -Route103_EventScript_1EC4CE:: @ 81EC4CE - trainerbattle_no_intro TRAINER_BRENDAN_7, Route103_Text_1ECA59 - goto Route103_EventScript_1EC4FC +Route103_EventScript_StartBrendanBattleTorchic:: @ 81EC4CE + trainerbattle_no_intro TRAINER_BRENDAN_7, Route103_Text_BrendanDefeated + goto Route103_EventScript_AfterBrendanBattle end -Route103_EventScript_1EC4DE:: @ 81EC4DE - trainerbattle_no_intro TRAINER_BRENDAN_1, Route103_Text_1ECA59 - goto Route103_EventScript_1EC4FC +Route103_EventScript_StartBrendanBattleMudkip:: @ 81EC4DE + trainerbattle_no_intro TRAINER_BRENDAN_1, Route103_Text_BrendanDefeated + goto Route103_EventScript_AfterBrendanBattle end -Route103_EventScript_1EC4EE:: @ 81EC4EE - msgbox Route103_Text_1EC8AE, MSGBOX_DEFAULT - goto Route103_EventScript_1EC50A +Route103_EventScript_AfterMayBattle:: @ 81EC4EE + msgbox Route103_Text_MayTimeToHeadBack, MSGBOX_DEFAULT + goto Route103_EventScript_RivalExit end -Route103_EventScript_1EC4FC:: @ 81EC4FC - msgbox Route103_Text_1ECA79, MSGBOX_DEFAULT - goto Route103_EventScript_1EC50A +Route103_EventScript_AfterBrendanBattle:: @ 81EC4FC + msgbox Route103_Text_BrendanTimeToHeadBack, MSGBOX_DEFAULT + goto Route103_EventScript_RivalExit end -Route103_EventScript_1EC50A:: @ 81EC50A +Route103_EventScript_RivalExit:: @ 81EC50A closemessage switch VAR_FACING - case 1, Route103_EventScript_1EC585 - case 2, Route103_EventScript_1EC53D - case 3, Route103_EventScript_1EC561 - case 4, Route103_EventScript_1EC561 + case DIR_SOUTH, Route103_EventScript_RivalExitFacingSouth + case DIR_NORTH, Route103_EventScript_RivalExitFacingNorth + case DIR_WEST, Route103_EventScript_RivalExitFacingEastOrWest + case DIR_EAST, Route103_EventScript_RivalExitFacingEastOrWest end -Route103_EventScript_1EC53D:: @ 81EC53D - applymovement EVENT_OBJ_ID_PLAYER, Route103_Movement_1EC5C8 - applymovement 2, Route103_Movement_1EC5BE +Route103_EventScript_RivalExitFacingNorth:: @ 81EC53D + applymovement EVENT_OBJ_ID_PLAYER, Route103_Movement_WatchRivalExitFacingNorth + applymovement 2, Route103_Movement_RivalExitFacingNorth1 waitmovement 0 playse SE_DANSA - applymovement 2, Route103_Movement_1EC5C1 + applymovement 2, Route103_EventScript_RivalExitFacingNorth2 waitmovement 0 - goto Route103_EventScript_1EC5A2 + goto Route103_EventScript_RivalEnd end -Route103_EventScript_1EC561:: @ 81EC561 - applymovement EVENT_OBJ_ID_PLAYER, Route103_Movement_1EC5D6 - applymovement 2, Route103_Movement_1EC5CE +Route103_EventScript_RivalExitFacingEastOrWest:: @ 81EC561 + applymovement EVENT_OBJ_ID_PLAYER, Route103_Movement_WatchRivalExitFacingEastOrWest + applymovement 2, Route103_Movement_RivalExit1 waitmovement 0 playse SE_DANSA - applymovement 2, Route103_Movement_1EC5D0 + applymovement 2, Route103_Movement_RivalExit2 waitmovement 0 - goto Route103_EventScript_1EC5A2 + goto Route103_EventScript_RivalEnd end -Route103_EventScript_1EC585:: @ 81EC585 - applymovement 2, Route103_Movement_1EC5CE +Route103_EventScript_RivalExitFacingSouth:: @ 81EC585 + applymovement 2, Route103_Movement_RivalExit1 waitmovement 0 playse SE_DANSA - applymovement 2, Route103_Movement_1EC5D0 + applymovement 2, Route103_Movement_RivalExit2 waitmovement 0 - goto Route103_EventScript_1EC5A2 + goto Route103_EventScript_RivalEnd end -Route103_EventScript_1EC5A2:: @ 81EC5A2 +Route103_EventScript_RivalEnd:: @ 81EC5A2 removeobject 2 setvar VAR_BIRCH_LAB_STATE, 4 clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL @@ -150,12 +150,12 @@ Route103_EventScript_1EC5A2:: @ 81EC5A2 releaseall end -Route103_Movement_1EC5BE: @ 81EC5BE +Route103_Movement_RivalExitFacingNorth1: @ 81EC5BE walk_left walk_down step_end -Route103_Movement_1EC5C1: @ 81EC5C1 +Route103_EventScript_RivalExitFacingNorth2: @ 81EC5C1 jump_2_down delay_16 walk_down @@ -164,7 +164,7 @@ Route103_Movement_1EC5C1: @ 81EC5C1 walk_down step_end -Route103_Movement_1EC5C8: @ 81EC5C8 +Route103_Movement_WatchRivalExitFacingNorth: @ 81EC5C8 delay_16 delay_4 walk_in_place_fastest_left @@ -172,11 +172,11 @@ Route103_Movement_1EC5C8: @ 81EC5C8 walk_in_place_fastest_down step_end -Route103_Movement_1EC5CE: @ 81EC5CE +Route103_Movement_RivalExit1: @ 81EC5CE walk_down step_end -Route103_Movement_1EC5D0: @ 81EC5D0 +Route103_Movement_RivalExit2: @ 81EC5D0 jump_2_down delay_16 walk_down @@ -184,118 +184,118 @@ Route103_Movement_1EC5D0: @ 81EC5D0 walk_down step_end -Route103_Movement_1EC5D6: @ 81EC5D6 +Route103_Movement_WatchRivalExitFacingEastOrWest: @ 81EC5D6 delay_16 walk_in_place_fastest_down step_end -Route103_EventScript_1EC5D9:: @ 81EC5D9 - msgbox Route103_Text_1ECB73, MSGBOX_NPC +Route103_EventScript_Boy:: @ 81EC5D9 + msgbox Route103_Text_ShouldHaveBroughtPotion, MSGBOX_NPC end -Route103_EventScript_1EC5E2:: @ 81EC5E2 - msgbox Route103_Text_1ECBB5, MSGBOX_NPC +Route103_EventScript_Man:: @ 81EC5E2 + msgbox Route103_Text_ShortcutToOldale, MSGBOX_NPC end -Route103_EventScript_1EC5EB:: @ 81EC5EB - msgbox Route103_Text_1ECC1A, MSGBOX_SIGN +Route103_EventScript_RouteSign:: @ 81EC5EB + msgbox Route103_Text_RouteSign, MSGBOX_SIGN end -Route103_EventScript_1EC5F4:: @ 81EC5F4 - trainerbattle_single TRAINER_DAISY, Route103_Text_29495A, Route103_Text_29498F - msgbox Route103_Text_2949B4, MSGBOX_AUTOCLOSE +Route103_EventScript_Daisy:: @ 81EC5F4 + trainerbattle_single TRAINER_DAISY, Route103_Text_DaisyIntro, Route103_Text_DaisyDefeated + msgbox Route103_Text_DaisyPostBattle, MSGBOX_AUTOCLOSE end -Route103_EventScript_1EC60B:: @ 81EC60B - trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A +Route103_EventScript_Amy:: @ 81EC60B + trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_AmyIntro, Route103_Text_AmyDefeated, Route103_Text_AmyNotEnoughPokemon, Route102_EventScript_AmyRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route103_EventScript_1EC653 - msgbox Route103_Text_294A52, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route102_EventScript_AmyRematch + msgbox Route103_Text_AmyPostBattle, MSGBOX_AUTOCLOSE end -Route103_EventScript_1EC63A:: @ 81EC63A - msgbox Route103_Text_294B8A, MSGBOX_DEFAULT +Route102_EventScript_AmyRegisterMatchCallAfterBattle:: @ 81EC63A + msgbox Route103_Text_AmyLivRegister, MSGBOX_DEFAULT register_matchcall TRAINER_AMY_AND_LIV_1 release end -Route103_EventScript_1EC653:: @ 81EC653 - trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_294C29, Route103_Text_294C6D, Route103_Text_294CEF - msgbox Route103_Text_294C93, MSGBOX_AUTOCLOSE +Route102_EventScript_AmyRematch:: @ 81EC653 + trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_AmyRematchIntro, Route103_Text_AmyRematchDefeated, Route103_Text_AmyRematchNotEnoughPokemon + msgbox Route103_Text_AmyRematchPostBattle, MSGBOX_AUTOCLOSE end -Route103_EventScript_1EC66E:: @ 81EC66E - trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D +Route103_EventScript_Liv:: @ 81EC66E + trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_LivIntro, Route103_Text_LivDefeated, Route103_Text_LivNotEnoughPokemon, Route102_EventScript_LivRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route103_EventScript_1EC6B6 - msgbox Route103_Text_294B40, MSGBOX_AUTOCLOSE + compare VAR_RESULT, TRUE + goto_if_eq Route102_EventScript_LivRematch + msgbox Route103_Text_LivPostBattle, MSGBOX_AUTOCLOSE end -Route103_EventScript_1EC69D:: @ 81EC69D - msgbox Route103_Text_294B8A, MSGBOX_DEFAULT +Route102_EventScript_LivRegisterMatchCallAfterBattle:: @ 81EC69D + msgbox Route103_Text_AmyLivRegister, MSGBOX_DEFAULT register_matchcall TRAINER_AMY_AND_LIV_1 release end -Route103_EventScript_1EC6B6:: @ 81EC6B6 - trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_294D3E, Route103_Text_294D63, Route103_Text_294DDB - msgbox Route103_Text_294D89, MSGBOX_AUTOCLOSE +Route102_EventScript_LivRematch:: @ 81EC6B6 + trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_LivRematchIntro, Route103_Text_LivRematchDefeated, Route103_Text_LivRematchNotEnoughPokemon + msgbox Route103_Text_LivRematchPostBattle, MSGBOX_AUTOCLOSE end -Route103_EventScript_1EC6D1:: @ 81EC6D1 - trainerbattle_single TRAINER_ANDREW, Route103_Text_294E34, Route103_Text_294E92 - msgbox Route103_Text_294EBB, MSGBOX_AUTOCLOSE +Route103_EventScript_Andrew:: @ 81EC6D1 + trainerbattle_single TRAINER_ANDREW, Route103_Text_AndrewIntro, Route103_Text_AndrewDefeated + msgbox Route103_Text_AndrewPostBattle, MSGBOX_AUTOCLOSE end -Route103_EventScript_1EC6E8:: @ 81EC6E8 - trainerbattle_single TRAINER_MIGUEL_1, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714 +Route103_EventScript_Miguel:: @ 81EC6E8 + trainerbattle_single TRAINER_MIGUEL_1, Route103_Text_MiguelIntro, Route103_Text_MiguelDefeated, Route102_EventScript_MiguelRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route103_EventScript_1EC733 - msgbox Route103_Text_294F42, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route103_EventScript_MiguelRematch + msgbox Route103_Text_MiguelPostBattle, MSGBOX_DEFAULT release end -Route103_EventScript_1EC714:: @ 81EC714 - special sub_80B4808 +Route102_EventScript_MiguelRegisterMatchCallAfterBattle:: @ 81EC714 + special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route103_Text_294F7E, MSGBOX_DEFAULT + msgbox Route103_Text_MiguelRegister, MSGBOX_DEFAULT register_matchcall TRAINER_MIGUEL_1 release end -Route103_EventScript_1EC733:: @ 81EC733 - trainerbattle_rematch TRAINER_MIGUEL_1, Route103_Text_294FC3, Route103_Text_295006 - msgbox Route103_Text_29501E, MSGBOX_AUTOCLOSE +Route103_EventScript_MiguelRematch:: @ 81EC733 + trainerbattle_rematch TRAINER_MIGUEL_1, Route103_Text_MiguelRematchIntro, Route103_Text_MiguelRematchDefeated + msgbox Route103_Text_MiguelRematchPostBattle, MSGBOX_AUTOCLOSE end -Route103_EventScript_1EC74A:: @ 81EC74A - trainerbattle_single TRAINER_MARCOS, Route103_Text_295206, Route103_Text_29522B - msgbox Route103_Text_295246, MSGBOX_AUTOCLOSE +Route103_EventScript_Marcos:: @ 81EC74A + trainerbattle_single TRAINER_MARCOS, Route103_Text_MarcosIntro, Route103_Text_MarcosDefeated + msgbox Route103_Text_MarcosPostBattle, MSGBOX_AUTOCLOSE end -Route103_EventScript_1EC761:: @ 81EC761 - trainerbattle_single TRAINER_RHETT, Route103_Text_295199, Route103_Text_2951C6 - msgbox Route103_Text_2951DE, MSGBOX_AUTOCLOSE +Route103_EventScript_Rhett:: @ 81EC761 + trainerbattle_single TRAINER_RHETT, Route103_Text_RhettIntro, Route103_Text_RhettDefeated + msgbox Route103_Text_RhettPostBattle, MSGBOX_AUTOCLOSE end -Route103_EventScript_1EC778:: @ 81EC778 - trainerbattle_single TRAINER_PETE, Route103_Text_295063, Route103_Text_295093 - msgbox Route103_Text_2950AA, MSGBOX_AUTOCLOSE +Route103_EventScript_Pete:: @ 81EC778 + trainerbattle_single TRAINER_PETE, Route103_Text_PeteIntro, Route103_Text_PeteDefeated + msgbox Route103_Text_PetePostBattle, MSGBOX_AUTOCLOSE end -Route103_EventScript_1EC78F:: @ 81EC78F - trainerbattle_single TRAINER_ISABELLE, Route103_Text_295116, Route103_Text_295146 - msgbox Route103_Text_29514D, MSGBOX_AUTOCLOSE +Route103_EventScript_Isabelle:: @ 81EC78F + trainerbattle_single TRAINER_ISABELLE, Route103_Text_IsabelleIntro, Route103_Text_IsabelleDefeated + msgbox Route103_Text_IsabellePostBattle, MSGBOX_AUTOCLOSE end -Route103_Text_1EC7A6: @ 81EC7A6 +Route103_Text_MayRoute103Pokemon: @ 81EC7A6 .string "MAY: Let's see… The POKéMON found\n" .string "on ROUTE 103 include…$" -Route103_Text_1EC7DE: @ 81EC7DE +Route103_Text_MayLetsBattle: @ 81EC7DE .string "Oh, hi, {PLAYER}{KUN}!\p" .string "…Oh, I see, my dad gave you\n" .string "a POKéMON as a gift.\p" @@ -304,11 +304,11 @@ Route103_Text_1EC7DE: @ 81EC7DE .string "I'll give you a taste of what being\n" .string "a TRAINER is like.$" -Route103_Text_1EC881: @ 81EC881 +Route103_Text_MayDefeated: @ 81EC881 .string "Wow! That's great!\n" .string "{PLAYER}{KUN}, you're pretty good!$" -Route103_Text_1EC8AE: @ 81EC8AE +Route103_Text_MayTimeToHeadBack: @ 81EC8AE .string "MAY: I think I know why my dad has\n" .string "an eye out for you now.\p" .string "I mean, you just got that POKéMON,\n" @@ -318,11 +318,11 @@ Route103_Text_1EC8AE: @ 81EC8AE .string "Well, it's time to head back to\n" .string "the LAB.$" -Route103_Text_1EC989: @ 81EC989 +Route103_Text_BrendanRoute103Pokemon: @ 81EC989 .string "BRENDAN: Okay, so it's this one and\n" .string "that one that live on ROUTE 103…$" -Route103_Text_1EC9CE: @ 81EC9CE +Route103_Text_BrendanLetsBattle: @ 81EC9CE .string "Hey, it's {PLAYER}!\p" .string "…Oh, yeah, Dad gave you a POKéMON.\p" .string "Since we're here, how about a little\n" @@ -330,10 +330,10 @@ Route103_Text_1EC9CE: @ 81EC9CE .string "I'll teach you what being a TRAINER's\n" .string "about!$" -Route103_Text_1ECA59: @ 81ECA59 +Route103_Text_BrendanDefeated: @ 81ECA59 .string "Huh, {PLAYER}, you're not too shabby.$" -Route103_Text_1ECA79: @ 81ECA79 +Route103_Text_BrendanTimeToHeadBack: @ 81ECA79 .string "BRENDAN: I think I get it.\n" .string "I think I know why my dad has his eye\l" .string "out for you now.\p" @@ -343,16 +343,16 @@ Route103_Text_1ECA79: @ 81ECA79 .string "could befriend any POKéMON with ease.\p" .string "We should head back to the LAB.$" -Route103_Text_1ECB73: @ 81ECB73 +Route103_Text_ShouldHaveBroughtPotion: @ 81ECB73 .string "My POKéMON is staggeringly tired…\n" .string "I should have brought a POTION…$" -Route103_Text_1ECBB5: @ 81ECBB5 +Route103_Text_ShortcutToOldale: @ 81ECBB5 .string "If you cross the sea from here,\n" .string "it'll be a shortcut to OLDALE TOWN.\p" .string "Fufufu, that's useful, isn't it?$" -Route103_Text_1ECC1A: @ 81ECC1A +Route103_Text_RouteSign: @ 81ECC1A .string "ROUTE 103\n" .string "{DOWN_ARROW} OLDALE TOWN$" diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index fd195b973..6ca921af9 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -1,19 +1,19 @@ Route104_MapScripts:: @ 81ECC32 - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route104_MapScript2_1ECC3D + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route104_OnFrame map_script MAP_SCRIPT_ON_TRANSITION, Route104_OnTransition .byte 0 -Route104_MapScript2_1ECC3D: @ 81ECC3D - map_script_2 VAR_BOARD_BRINEY_BOAT_STATE, 1, Route104_EventScript_1ECC47 +Route104_OnFrame: @ 81ECC3D + map_script_2 VAR_BOARD_BRINEY_BOAT_STATE, 1, Route104_EventScript_StartSailToDewford .2byte 0 -Route104_EventScript_1ECC47:: @ 81ECC47 +Route104_EventScript_StartSailToDewford:: @ 81ECC47 lockall - goto Route104_EventScript_1ED099 + goto Route104_EventScript_SailToDewford end Route104_OnTransition: @ 81ECC4E - call Common_EventScript_SetupRivalGender + call Common_EventScript_SetupRivalGfxId call Route104_EventScript_1ECC78 call Route104_EventScript_1ECC5E end @@ -51,7 +51,7 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 setflag FLAG_HIDE_RUSBORO_CITY_RIVAL setvar VAR_RUSTBORO_CITY_STATE, 8 setvar VAR_ROUTE104_STATE, 2 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 10 addobject 34 @@ -116,7 +116,7 @@ Route104_EventScript_1ECD4B:: @ 81ECD4B waitmovement 0 copyobjectxytoperm 34 msgbox Route104_Text_1EDCED, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route104_EventScript_1ECDED msgbox Route104_Text_1EDD2A, MSGBOX_DEFAULT call Route104_EventScript_1ECE31 @@ -139,7 +139,7 @@ Route104_Movement_1ECDCD: @ 81ECDCD Route104_EventScript_1ECDD0:: @ 81ECDD0 msgbox Route104_Text_1EDD9F, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route104_EventScript_1ECDED msgbox Route104_Text_1EDD2A, MSGBOX_DEFAULT releaseall @@ -205,7 +205,7 @@ Route104_EventScript_1ECE6F:: @ 81ECE6F waitmovement 0 copyobjectxytoperm 34 msgbox Route104_Text_1EE009, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route104_EventScript_1ECF09 msgbox Route104_Text_1EE04D, MSGBOX_DEFAULT call Route104_EventScript_1ECE31 @@ -214,7 +214,7 @@ Route104_EventScript_1ECE6F:: @ 81ECE6F Route104_EventScript_1ECEEC:: @ 81ECEEC msgbox Route104_Text_1EE094, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route104_EventScript_1ECF09 msgbox Route104_Text_1EE04D, MSGBOX_DEFAULT releaseall @@ -355,16 +355,16 @@ Route104_EventScript_1ED090:: @ 81ED090 msgbox Route104_Text_1ED7A2, MSGBOX_NPC end -Route104_EventScript_1ED099:: @ 81ED099 +Route104_EventScript_SailToDewford:: @ 81ED099 setobjectpriority 8, MAP_ROUTE104, 0 setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104, 0 - applymovement 8, Route104_Movement_1ED359 + applymovement 8, Route104_Movement_BrineyBoardBoat waitmovement 0 removeobject 8 - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED34F + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerBoardBoat waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 - call Route104_EventScript_2720A0 + call Common_EventScript_PlayBrineysBoatMusic goto_if_set FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_1ED0D9 goto_if_unset FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_1ED0EF end @@ -379,11 +379,11 @@ Route104_EventScript_1ED0EF:: @ 81ED0EF applymovement 7, Route104_Movement_1ED1C8 applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED1C8 waitmovement 0 - pokenavcall Route104_Text_1EE336 + pokenavcall Route104_Text_DadPokenavCall waitmessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route104_Text_1EE463, MSGBOX_DEFAULT + msgbox Route104_Text_RegisteredDadInPokenav, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -398,7 +398,7 @@ Route104_EventScript_1ED139:: @ 81ED139 delay 50 applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED353 waitmovement 0 - call Route104_EventScript_2720A8 + call Common_EventScript_StopBrineysBoatMusic showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED355 waitmovement 0 @@ -410,7 +410,7 @@ Route104_EventScript_1ED139:: @ 81ED139 waitmovement 0 addobject 4 clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN - call Route104_EventScript_2720A8 + call Common_EventScript_StopBrineysBoatMusic setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT hideobjectat 7, MAP_ROUTE104 copyvar VAR_BRINEY_LOCATION, VAR_0x8008 @@ -418,17 +418,17 @@ Route104_EventScript_1ED139:: @ 81ED139 resetobjectpriority 2, MAP_DEWFORD_TOWN copyobjectxytoperm 2 setvar VAR_BOARD_BRINEY_BOAT_STATE, 0 - goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1B4 - goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1BE + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_DeliverLetterReminder + goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_LandedInDewford end -Route104_EventScript_1ED1B4:: @ 81ED1B4 - msgbox Route104_Text_1E9AAF, MSGBOX_DEFAULT +Route104_EventScript_DeliverLetterReminder:: @ 81ED1B4 + msgbox Route104_Text_LandedInDewfordDeliverLetter, MSGBOX_DEFAULT releaseall end -Route104_EventScript_1ED1BE:: @ 81ED1BE - msgbox Route104_Text_1E9C1D, MSGBOX_DEFAULT +Route104_EventScript_LandedInDewford:: @ 81ED1BE + msgbox DewfordTown_Text_BrineyLandedInDewford, MSGBOX_DEFAULT releaseall end @@ -829,7 +829,7 @@ Route104_Movement_1ED28C: @ 81ED28C walk_down step_end -Route104_Movement_1ED34F: @ 81ED34F +Route104_Movement_PlayerBoardBoat: @ 81ED34F walk_left walk_down walk_down @@ -845,7 +845,7 @@ Route104_Movement_1ED355: @ 81ED355 walk_in_place_fastest_right step_end -Route104_Movement_1ED359: @ 81ED359 +Route104_Movement_BrineyBoardBoat: @ 81ED359 walk_down walk_down step_end @@ -870,8 +870,8 @@ Route104_EventScript_1ED38D:: @ 81ED38D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route104_EventScript_1ED424 - setvar VAR_0x8004, 604 - specialvar VAR_RESULT, sub_813B4E0 + setvar VAR_0x8004, TRAINER_HALEY_1 + specialvar VAR_RESULT, IsTrainerRegistered compare VAR_RESULT, 0 goto_if_eq Route104_EventScript_1ED3F8 msgbox Route104_Text_295689, MSGBOX_DEFAULT @@ -879,7 +879,7 @@ Route104_EventScript_1ED38D:: @ 81ED38D end Route104_EventScript_1ED3CE:: @ 81ED3CE - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED3DF release @@ -913,8 +913,8 @@ Route104_EventScript_1ED43B:: @ 81ED43B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route104_EventScript_1ED4D2 - setvar VAR_0x8004, 136 - specialvar VAR_RESULT, sub_813B4E0 + setvar VAR_0x8004, TRAINER_WINSTON_1 + specialvar VAR_RESULT, IsTrainerRegistered compare VAR_RESULT, 0 goto_if_eq Route104_EventScript_1ED4A6 msgbox Route104_Text_2958C1, MSGBOX_DEFAULT @@ -922,7 +922,7 @@ Route104_EventScript_1ED43B:: @ 81ED43B end Route104_EventScript_1ED47C:: @ 81ED47C - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED48D release @@ -956,8 +956,8 @@ Route104_EventScript_1ED4E9:: @ 81ED4E9 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route104_EventScript_1ED580 - setvar VAR_0x8004, 114 - specialvar VAR_RESULT, sub_813B4E0 + setvar VAR_0x8004, TRAINER_CINDY_1 + specialvar VAR_RESULT, IsTrainerRegistered compare VAR_RESULT, 0 goto_if_eq Route104_EventScript_1ED554 msgbox Route104_Text_295AC3, MSGBOX_DEFAULT @@ -965,7 +965,7 @@ Route104_EventScript_1ED4E9:: @ 81ED4E9 end Route104_EventScript_1ED52A:: @ 81ED52A - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED53B release diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json index 438d56b30..dc6c0ab4d 100644 --- a/data/maps/Route104_MrBrineysHouse/map.json +++ b/data/maps/Route104_MrBrineysHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 3, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route104_MrBrineysHouse_EventScript_229D67", + "script": "Route104_MrBrineysHouse_EventScript_Briney", "flag": "FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY" }, { @@ -37,7 +37,7 @@ "movement_range_y": 3, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route104_MrBrineysHouse_EventScript_229E5D", + "script": "Route104_MrBrineysHouse_EventScript_Peeko", "flag": "FLAG_HIDE_BRINEYS_HOUSE_PEEKO" } ], diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index b2baff82b..1c61d3be3 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -5,76 +5,76 @@ Route104_MrBrineysHouse_MapScripts:: @ 8229D2E Route104_MrBrineysHouse_OnTransition: @ 8229D34 setflag FLAG_LANDMARK_MR_BRINEY_HOUSE compare VAR_BRINEY_HOUSE_STATE, 1 - call_if_eq Route104_MrBrineysHouse_EventScript_229D50 - call_if_set FLAG_RECEIVED_POKENAV, Route104_MrBrineysHouse_EventScript_229D4C + call_if_eq Route104_MrBrineysHouse_EventScript_SetBrineyPeekoPos + call_if_set FLAG_RECEIVED_POKENAV, Route104_MrBrineysHouse_EventScript_HideRustboroRival end -Route104_MrBrineysHouse_EventScript_229D4C:: @ 8229D4C +Route104_MrBrineysHouse_EventScript_HideRustboroRival:: @ 8229D4C setflag FLAG_HIDE_RUSBORO_CITY_RIVAL return -Route104_MrBrineysHouse_EventScript_229D50:: @ 8229D50 +Route104_MrBrineysHouse_EventScript_SetBrineyPeekoPos:: @ 8229D50 setobjectxyperm 1, 9, 3 setobjectmovementtype 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT setobjectxyperm 2, 9, 6 setobjectmovementtype 2, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN return -Route104_MrBrineysHouse_EventScript_229D67:: @ 8229D67 +Route104_MrBrineysHouse_EventScript_Briney:: @ 8229D67 lock faceplayer - call_if_unset FLAG_MR_BRINEY_SAILING_INTRO, Route104_MrBrineysHouse_EventScript_229D8A - goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_MrBrineysHouse_EventScript_229DE1 - goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route104_MrBrineysHouse_EventScript_229DFA - goto Route104_MrBrineysHouse_EventScript_229DAE + call_if_unset FLAG_MR_BRINEY_SAILING_INTRO, Route104_MrBrineysHouse_EventScript_SailingIntro + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_MrBrineysHouse_EventScript_SailBothDeliveries + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route104_MrBrineysHouse_EventScript_SailDeliverPackage + goto Route104_MrBrineysHouse_EventScript_WhereAreWeBound end -Route104_MrBrineysHouse_EventScript_229D8A:: @ 8229D8A +Route104_MrBrineysHouse_EventScript_SailingIntro:: @ 8229D8A setflag FLAG_MR_BRINEY_SAILING_INTRO - msgbox Route104_MrBrineysHouse_Text_229E70, MSGBOX_DEFAULT - msgbox Route104_MrBrineysHouse_Text_229E9B, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq Route104_MrBrineysHouse_EventScript_229E13 - goto Route104_MrBrineysHouse_EventScript_229E27 + msgbox Route104_MrBrineysHouse_Text_WaitUpPeeko, MSGBOX_DEFAULT + msgbox Route104_MrBrineysHouse_Text_ItsYouLetsSailToDewford, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing + goto Route104_MrBrineysHouse_EventScript_SailToDewford end -Route104_MrBrineysHouse_EventScript_229DAE:: @ 8229DAE - message Route104_MrBrineysHouse_Text_22A268 +Route104_MrBrineysHouse_EventScript_WhereAreWeBound:: @ 8229DAE + message Route104_MrBrineysHouse_Text_WhereAreWeBound waitmessage multichoicedefault 20, 8, MULTI_BRINEY_OFF_DEWFORD, 1, 0 switch VAR_RESULT - case 0, Route104_MrBrineysHouse_EventScript_229E27 - case 1, Route104_MrBrineysHouse_EventScript_229E1D - case MULTI_B_PRESSED, Route104_MrBrineysHouse_EventScript_229E1D + case 0, Route104_MrBrineysHouse_EventScript_SailToDewford + case 1, Route104_MrBrineysHouse_EventScript_DeclineSailing + case MULTI_B_PRESSED, Route104_MrBrineysHouse_EventScript_DeclineSailing end -Route104_MrBrineysHouse_EventScript_229DE1:: @ 8229DE1 - msgbox Route104_MrBrineysHouse_Text_22A0AD, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq Route104_MrBrineysHouse_EventScript_229E13 - goto Route104_MrBrineysHouse_EventScript_229E27 +Route104_MrBrineysHouse_EventScript_SailBothDeliveries:: @ 8229DE1 + msgbox Route104_MrBrineysHouse_Text_NeedToMakeDeliveriesSailToDewford, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing + goto Route104_MrBrineysHouse_EventScript_SailToDewford end -Route104_MrBrineysHouse_EventScript_229DFA:: @ 8229DFA - msgbox Route104_MrBrineysHouse_Text_22A18F, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq Route104_MrBrineysHouse_EventScript_229E13 - goto Route104_MrBrineysHouse_EventScript_229E27 +Route104_MrBrineysHouse_EventScript_SailDeliverPackage:: @ 8229DFA + msgbox Route104_MrBrineysHouse_Text_NeedToDeliverPackageSailToDewford, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing + goto Route104_MrBrineysHouse_EventScript_SailToDewford end -Route104_MrBrineysHouse_EventScript_229E13:: @ 8229E13 - msgbox Route104_MrBrineysHouse_Text_22A041, MSGBOX_DEFAULT +Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing:: @ 8229E13 + msgbox Route104_MrBrineysHouse_Text_DeclineDeliverySail, MSGBOX_DEFAULT release end -Route104_MrBrineysHouse_EventScript_229E1D:: @ 8229E1D - msgbox Route104_MrBrineysHouse_Text_22A2C3, MSGBOX_DEFAULT +Route104_MrBrineysHouse_EventScript_DeclineSailing:: @ 8229E1D + msgbox Route104_MrBrineysHouse_Text_TellMeWheneverYouWantToSail, MSGBOX_DEFAULT release end -Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27 - msgbox Route104_MrBrineysHouse_Text_229FE9, MSGBOX_DEFAULT - call Route104_MrBrineysHouse_EventScript_271E95 +Route104_MrBrineysHouse_EventScript_SailToDewford:: @ 8229E27 + msgbox Route104_MrBrineysHouse_Text_SetSailForDewford, MSGBOX_DEFAULT + call EventScript_BackupMrBrineyLocation setvar VAR_BOARD_BRINEY_BOAT_STATE, 1 clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY @@ -88,21 +88,21 @@ Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27 releaseall end -Route104_MrBrineysHouse_EventScript_229E5D:: @ 8229E5D +Route104_MrBrineysHouse_EventScript_Peeko:: @ 8229E5D lock faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox Route104_MrBrineysHouse_Text_22A337, MSGBOX_DEFAULT + msgbox Route104_MrBrineysHouse_Text_Peeko, MSGBOX_DEFAULT waitmoncry release end -Route104_MrBrineysHouse_Text_229E70: @ 8229E70 +Route104_MrBrineysHouse_Text_WaitUpPeeko: @ 8229E70 .string "MR. BRINEY: Hold on, lass!\n" .string "Wait up, PEEKO!$" -Route104_MrBrineysHouse_Text_229E9B: @ 8229E9B +Route104_MrBrineysHouse_Text_ItsYouLetsSailToDewford: @ 8229E9B .string "Hm? You're {PLAYER}{KUN}!\n" .string "You saved my darling PEEKO!\l" .string "We owe so much to you!\p" @@ -117,18 +117,18 @@ Route104_MrBrineysHouse_Text_229E9B: @ 8229E9B .string "You've come to the right man!\n" .string "We'll set sail for DEWFORD.$" -Route104_MrBrineysHouse_Text_229FE9: @ 8229FE9 +Route104_MrBrineysHouse_Text_SetSailForDewford: @ 8229FE9 .string "MR. BRINEY: DEWFORD it is, then!\p" .string "Anchors aweigh!\n" .string "PEEKO, we're setting sail, my darling!$" -Route104_MrBrineysHouse_Text_22A041: @ 822A041 +Route104_MrBrineysHouse_Text_DeclineDeliverySail: @ 822A041 .string "MR. BRINEY: Is that so?\n" .string "Your deliveries can wait?\p" .string "You just go on and tell me whenever\n" .string "you want to set sail!$" -Route104_MrBrineysHouse_Text_22A0AD: @ 822A0AD +Route104_MrBrineysHouse_Text_NeedToMakeDeliveriesSailToDewford: @ 822A0AD .string "MR. BRINEY: Ahoy!\n" .string "I know exactly what you want to say!\p" .string "You're to deliver a LETTER to DEWFORD\n" @@ -137,7 +137,7 @@ Route104_MrBrineysHouse_Text_22A0AD: @ 822A0AD .string "at all--I'm the man for the job!\p" .string "First, we'll set sail for DEWFORD.$" -Route104_MrBrineysHouse_Text_22A18F: @ 822A18F +Route104_MrBrineysHouse_Text_NeedToDeliverPackageSailToDewford: @ 822A18F .string "MR. BRINEY: Ahoy!\n" .string "I know exactly what you want to say!\p" .string "You're to deliver a package to\n" @@ -146,17 +146,17 @@ Route104_MrBrineysHouse_Text_22A18F: @ 822A18F .string "at all--I'm the man for the job!\p" .string "First, we'll set sail for DEWFORD.$" -Route104_MrBrineysHouse_Text_22A268: @ 822A268 +Route104_MrBrineysHouse_Text_WhereAreWeBound: @ 822A268 .string "MR. BRINEY: Ahoy!\n" .string "For you, I'll go out to sea anytime!\p" .string "Now, my friend, where are we bound?$" -Route104_MrBrineysHouse_Text_22A2C3: @ 822A2C3 +Route104_MrBrineysHouse_Text_TellMeWheneverYouWantToSail: @ 822A2C3 .string "MR. BRINEY: Is that so?\n" .string "Well, PEEKO owes her life to you.\p" .string "You just go on and tell me whenever\n" .string "you want to set sail!$" -Route104_MrBrineysHouse_Text_22A337: @ 822A337 +Route104_MrBrineysHouse_Text_Peeko: @ 822A337 .string "PEEKO: Pii piihyoro!$" diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json index 9d3d30794..dcda9afeb 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route104_PrettyPetalFlowerShop_EventScript_22A373", + "script": "Route104_PrettyPetalFlowerShop_EventScript_ShopOwner", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route104_PrettyPetalFlowerShop_EventScript_22A40C", + "script": "Route104_PrettyPetalFlowerShop_EventScript_WailmerPailGirl", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route104_PrettyPetalFlowerShop_EventScript_22A442", + "script": "Route104_PrettyPetalFlowerShop_EventScript_RandomBerryGirl", "flag": "0" } ], diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index c70318fc9..fe0dbf632 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -4,52 +4,52 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 822A34C Route104_PrettyPetalFlowerShop_OnTransition: @ 822A352 setflag FLAG_LANDMARK_FLOWER_SHOP - goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_22A36B - goto_if_unset FLAG_BADGE03_GET, Route104_PrettyPetalFlowerShop_EventScript_22A36B + goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_MoveShopOwner + goto_if_unset FLAG_BADGE03_GET, Route104_PrettyPetalFlowerShop_EventScript_MoveShopOwner setflag FLAG_TEMP_1 end -Route104_PrettyPetalFlowerShop_EventScript_22A36B:: @ 822A36B +Route104_PrettyPetalFlowerShop_EventScript_MoveShopOwner:: @ 822A36B setobjectxyperm 1, 4, 6 end -Route104_PrettyPetalFlowerShop_EventScript_22A373:: @ 822A373 +Route104_PrettyPetalFlowerShop_EventScript_ShopOwner:: @ 822A373 lock faceplayer - goto_if_set FLAG_TEMP_1, Route104_PrettyPetalFlowerShop_EventScript_22A3E4 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7686, MSGBOX_DEFAULT - goto_if_set FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_22A3B2 + goto_if_set FLAG_TEMP_1, Route104_PrettyPetalFlowerShop_EventScript_SellDecorations + msgbox Route104_PrettyPetalFlowerShop_Text_ThisIsPrettyPetalFlowerShop, MSGBOX_DEFAULT + goto_if_set FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_AlreadyMet setflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER - msgbox Route104_PrettyPetalFlowerShop_Text_2A7706, MSGBOX_YESNO - compare VAR_RESULT, 1 - call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3D2 - compare VAR_RESULT, 0 - call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3DB + msgbox Route104_PrettyPetalFlowerShop_Text_IntroLearnAboutBerries, MSGBOX_YESNO + compare VAR_RESULT, YES + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_ExplainBerries + compare VAR_RESULT, NO + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_DontExplainBerries release end -Route104_PrettyPetalFlowerShop_EventScript_22A3B2:: @ 822A3B2 - msgbox Route104_PrettyPetalFlowerShop_Text_2A76D9, MSGBOX_YESNO - compare VAR_RESULT, 1 - call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3D2 - compare VAR_RESULT, 0 - call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3DB +Route104_PrettyPetalFlowerShop_EventScript_AlreadyMet:: @ 822A3B2 + msgbox Route104_PrettyPetalFlowerShop_Text_LearnAboutBerries, MSGBOX_YESNO + compare VAR_RESULT, YES + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_ExplainBerries + compare VAR_RESULT, NO + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_DontExplainBerries release end -Route104_PrettyPetalFlowerShop_EventScript_22A3D2:: @ 822A3D2 - msgbox Route104_PrettyPetalFlowerShop_Text_2A775B, MSGBOX_DEFAULT +Route104_PrettyPetalFlowerShop_EventScript_ExplainBerries:: @ 822A3D2 + msgbox Route104_PrettyPetalFlowerShop_Text_BerriesExplanation, MSGBOX_DEFAULT return -Route104_PrettyPetalFlowerShop_EventScript_22A3DB:: @ 822A3DB - msgbox Route104_PrettyPetalFlowerShop_Text_2A78DF, MSGBOX_DEFAULT +Route104_PrettyPetalFlowerShop_EventScript_DontExplainBerries:: @ 822A3DB + msgbox Route104_PrettyPetalFlowerShop_Text_FlowersBringHappiness, MSGBOX_DEFAULT return -Route104_PrettyPetalFlowerShop_EventScript_22A3E4:: @ 822A3E4 - message gUnknown_08272A52 +Route104_PrettyPetalFlowerShop_EventScript_SellDecorations:: @ 822A3E4 + message gText_PlayerWhatCanIDoForYou waitmessage pokemartdecoration2 Route104_PrettyPetalFlowerShop_Pokemart_Plants - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -65,39 +65,39 @@ Route104_PrettyPetalFlowerShop_Pokemart_Plants: @ 822A3FC release end -Route104_PrettyPetalFlowerShop_EventScript_22A40C:: @ 822A40C +Route104_PrettyPetalFlowerShop_EventScript_WailmerPailGirl:: @ 822A40C lock faceplayer - goto_if_unset FLAG_RECEIVED_WAILMER_PAIL, Route104_PrettyPetalFlowerShop_EventScript_22A421 - msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, MSGBOX_DEFAULT + goto_if_unset FLAG_RECEIVED_WAILMER_PAIL, Route104_PrettyPetalFlowerShop_EventScript_GiveWailmerPail + msgbox Route104_PrettyPetalFlowerShop_Text_WailmerPailExplanation, MSGBOX_DEFAULT release end -Route104_PrettyPetalFlowerShop_EventScript_22A421:: @ 822A421 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7916, MSGBOX_DEFAULT +Route104_PrettyPetalFlowerShop_EventScript_GiveWailmerPail:: @ 822A421 + msgbox Route104_PrettyPetalFlowerShop_Text_YouCanHaveThis, MSGBOX_DEFAULT giveitem_std ITEM_WAILMER_PAIL - msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, MSGBOX_DEFAULT + msgbox Route104_PrettyPetalFlowerShop_Text_WailmerPailExplanation, MSGBOX_DEFAULT setflag FLAG_RECEIVED_WAILMER_PAIL release end -Route104_PrettyPetalFlowerShop_EventScript_22A442:: @ 822A442 +Route104_PrettyPetalFlowerShop_EventScript_RandomBerryGirl:: @ 822A442 lock faceplayer dotimebasedevents - goto_if_set FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY, Route104_PrettyPetalFlowerShop_EventScript_22A482 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7A98, MSGBOX_DEFAULT + goto_if_set FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY, Route104_PrettyPetalFlowerShop_EventScript_AlreadyReceivedBerry + msgbox Route104_PrettyPetalFlowerShop_Text_ImGrowingFlowers, MSGBOX_DEFAULT random 8 addvar VAR_RESULT, FIRST_BERRY_INDEX giveitem_std VAR_RESULT compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_FLOWER_SHOP_RECEIVED_BERRY - msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT + msgbox Route104_PrettyPetalFlowerShop_Text_MachineMixesBerries, MSGBOX_DEFAULT release end -Route104_PrettyPetalFlowerShop_EventScript_22A482:: @ 822A482 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT +Route104_PrettyPetalFlowerShop_EventScript_AlreadyReceivedBerry:: @ 822A482 + msgbox Route104_PrettyPetalFlowerShop_Text_MachineMixesBerries, MSGBOX_DEFAULT release end diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json index 4d447d4f8..bb6aadd54 100644 --- a/data/maps/Route105/map.json +++ b/data/maps/Route105/map.json @@ -40,7 +40,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route105_EventScript_1EE261", + "script": "Route105_EventScript_Luis", "flag": "0" }, { @@ -53,7 +53,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route105_EventScript_1EE278", + "script": "Route105_EventScript_Dominik", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 7, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route105_EventScript_1EE28F", + "script": "Route105_EventScript_Beverly", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 5, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route105_EventScript_1EE2A6", + "script": "Route105_EventScript_Imani", "flag": "0" }, { @@ -105,7 +105,7 @@ "movement_range_y": 7, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route105_EventScript_1EE24A", + "script": "Route105_EventScript_Foster", "flag": "0" }, { @@ -118,7 +118,7 @@ "movement_range_y": 2, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route105_EventScript_1EE2BD", + "script": "Route105_EventScript_Josue", "flag": "0" }, { @@ -131,7 +131,7 @@ "movement_range_y": 2, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route105_EventScript_1EE2D4", + "script": "Route105_EventScript_Andres", "flag": "0" } ], diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index c95511397..e1292803d 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -1,88 +1,88 @@ Route105_MapScripts:: @ 81EE1DB - map_script MAP_SCRIPT_ON_LOAD, Route105_MapScript1_1EE1EB + map_script MAP_SCRIPT_ON_LOAD, Route105_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, Route105_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route105_MapScript2_1EE240 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route105_OnFrame .byte 0 -Route105_MapScript1_1EE1EB: @ 81EE1EB - call_if_unset FLAG_REGI_DOORS_OPENED, Route105_EventScript_1EE20B +Route105_OnLoad: @ 81EE1EB + call_if_unset FLAG_REGI_DOORS_OPENED, Route105_CloseRegiEntrance compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105North compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105South end -Route105_EventScript_1EE20B:: @ 81EE20B +Route105_CloseRegiEntrance:: @ 81EE20B setmetatile 9, 19, METATILE_General_RockWall_RockBase, 1 setmetatile 9, 20, METATILE_General_RockWall_SandBase, 1 return Route105_OnTransition: @ 81EE21E compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq Route105_EventScript_273D13 + call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH call_if_eq UnusualWeather_StartKyogreWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH call_if_eq UnusualWeather_StartKyogreWeather end -Route105_MapScript2_1EE240: @ 81EE240 +Route105_OnFrame: @ 81EE240 map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 -Route105_EventScript_1EE24A:: @ 81EE24A - trainerbattle_single TRAINER_FOSTER, Route105_Text_295D0F, Route105_Text_295D62 - msgbox Route105_Text_295DAB, MSGBOX_AUTOCLOSE +Route105_EventScript_Foster:: @ 81EE24A + trainerbattle_single TRAINER_FOSTER, Route105_Text_FosterIntro, Route105_Text_FosterDefeated + msgbox Route105_Text_FosterPostBattle, MSGBOX_AUTOCLOSE end -Route105_EventScript_1EE261:: @ 81EE261 - trainerbattle_single TRAINER_LUIS, Route105_Text_295DF5, Route105_Text_295E66 - msgbox Route105_Text_295E72, MSGBOX_AUTOCLOSE +Route105_EventScript_Luis:: @ 81EE261 + trainerbattle_single TRAINER_LUIS, Route105_Text_LuisIntro, Route105_Text_LuisDefeated + msgbox Route105_Text_LuisPostBattle, MSGBOX_AUTOCLOSE end -Route105_EventScript_1EE278:: @ 81EE278 - trainerbattle_single TRAINER_DOMINIK, Route105_Text_295EB7, Route105_Text_295EEA - msgbox Route105_Text_295F08, MSGBOX_AUTOCLOSE +Route105_EventScript_Dominik:: @ 81EE278 + trainerbattle_single TRAINER_DOMINIK, Route105_Text_DominikIntro, Route105_Text_DominikDefeated + msgbox Route105_Text_DominikPostBattle, MSGBOX_AUTOCLOSE end -Route105_EventScript_1EE28F:: @ 81EE28F - trainerbattle_single TRAINER_BEVERLY, Route105_Text_295F5C, Route105_Text_295FA0 - msgbox Route105_Text_295FAE, MSGBOX_AUTOCLOSE +Route105_EventScript_Beverly:: @ 81EE28F + trainerbattle_single TRAINER_BEVERLY, Route105_Text_BeverlyIntro, Route105_Text_BeverlyDefeated + msgbox Route105_Text_PostBattle, MSGBOX_AUTOCLOSE end -Route105_EventScript_1EE2A6:: @ 81EE2A6 - trainerbattle_single TRAINER_IMANI, Route105_Text_296025, Route105_Text_296059 - msgbox Route105_Text_296076, MSGBOX_AUTOCLOSE +Route105_EventScript_Imani:: @ 81EE2A6 + trainerbattle_single TRAINER_IMANI, Route105_Text_ImaniIntro, Route105_Text_ImaniDefeated + msgbox Route105_Text_ImaniPostBattle, MSGBOX_AUTOCLOSE end -Route105_EventScript_1EE2BD:: @ 81EE2BD - trainerbattle_single TRAINER_JOSUE, Route105_Text_29626F, Route105_Text_2962CB - msgbox Route105_Text_2962EC, MSGBOX_AUTOCLOSE +Route105_EventScript_Josue:: @ 81EE2BD + trainerbattle_single TRAINER_JOSUE, Route105_Text_JosueIntro, Route105_Text_JosueDefeated + msgbox Route105_Text_JosuePostBattle, MSGBOX_AUTOCLOSE end -Route105_EventScript_1EE2D4:: @ 81EE2D4 - trainerbattle_single TRAINER_ANDRES_1, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 +Route105_EventScript_Andres:: @ 81EE2D4 + trainerbattle_single TRAINER_ANDRES_1, Route105_Text_AndresIntro, Route105_Text_AndresDefeated, Route105_EventScript_AndresRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route105_EventScript_1EE31F - msgbox Route105_Text_2960FA, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route105_EventScript_AndresRematch + msgbox Route105_Text_AndresPostBattle, MSGBOX_DEFAULT release end -Route105_EventScript_1EE300:: @ 81EE300 - special sub_80B4808 +Route105_EventScript_AndresRegisterMatchCallAfterBattle:: @ 81EE300 + special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route105_Text_296159, MSGBOX_DEFAULT + msgbox Route105_Text_AndresRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ANDRES_1 release end -Route105_EventScript_1EE31F:: @ 81EE31F - trainerbattle_rematch TRAINER_ANDRES_1, Route105_Text_29619E, Route105_Text_2961DD - msgbox Route105_Text_2961FE, MSGBOX_AUTOCLOSE +Route105_EventScript_AndresRematch:: @ 81EE31F + trainerbattle_rematch TRAINER_ANDRES_1, Route105_Text_AndresRematchIntro, Route105_Text_AndresRematchDefeated + msgbox Route105_Text_AndresRematchPostBattle, MSGBOX_AUTOCLOSE end -Route104_Text_1EE336: @ 81EE336 +Route104_Text_DadPokenavCall: @ 81EE336 .string "… … … … … …\n" .string "… … … … … Beep!\p" .string "DAD: Oh, {PLAYER}?\p" @@ -98,6 +98,6 @@ Route104_Text_1EE336: @ 81EE336 .string "… … … … … …\n" .string "… … … … … Click!$" -Route104_Text_1EE463: @ 81EE463 +Route104_Text_RegisteredDadInPokenav: @ 81EE463 .string "Registered DAD NORMAN\n" .string "in the POKéNAV.$" diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json index 70558d26e..273f59aa5 100644 --- a/data/maps/Route106/map.json +++ b/data/maps/Route106/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route106_EventScript_1EE493", + "script": "Route106_EventScript_Douglas", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route106_EventScript_1EE4AA", + "script": "Route106_EventScript_Kyla", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route106_EventScript_1EE4C1", + "script": "Route106_EventScript_Elliot", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route106_EventScript_1EE523", + "script": "Route106_EventScript_Ned", "flag": "0" }, { @@ -132,7 +132,7 @@ "y": 13, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route106_EventScript_1EE48A" + "script": "Route106_EventScript_TrainerTipsSign" } ] }
\ No newline at end of file diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc index f27ce9647..f9d3fb3b9 100644 --- a/data/maps/Route106/scripts.inc +++ b/data/maps/Route106/scripts.inc @@ -1,48 +1,48 @@ Route106_MapScripts:: @ 81EE489 .byte 0 -Route106_EventScript_1EE48A:: @ 81EE48A - msgbox Route106_Text_1EE53A, MSGBOX_SIGN +Route106_EventScript_TrainerTipsSign:: @ 81EE48A + msgbox Route106_Text_TrainerTips, MSGBOX_SIGN end -Route106_EventScript_1EE493:: @ 81EE493 - trainerbattle_single TRAINER_DOUGLAS, Route106_Text_2965BB, Route106_Text_2965FD - msgbox Route106_Text_296608, MSGBOX_AUTOCLOSE +Route106_EventScript_Douglas:: @ 81EE493 + trainerbattle_single TRAINER_DOUGLAS, Route106_Text_DouglasIntro, Route106_Text_DouglasDefeated + msgbox Route106_Text_DouglasPostBattle, MSGBOX_AUTOCLOSE end -Route106_EventScript_1EE4AA:: @ 81EE4AA - trainerbattle_single TRAINER_KYLA, Route106_Text_296628, Route106_Text_296674 - msgbox Route106_Text_29669E, MSGBOX_AUTOCLOSE +Route106_EventScript_Kyla:: @ 81EE4AA + trainerbattle_single TRAINER_KYLA, Route106_Text_KylaIntro, Route106_Text_KylaDefeated + msgbox Route106_Text_KylaPostBattle, MSGBOX_AUTOCLOSE end -Route106_EventScript_1EE4C1:: @ 81EE4C1 - trainerbattle_single TRAINER_ELLIOT_1, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED +Route106_EventScript_Elliot:: @ 81EE4C1 + trainerbattle_single TRAINER_ELLIOT_1, Route106_Text_ElliotIntro, Route106_Text_ElliotDefeated, Route106_EventScript_ElliotRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route106_EventScript_1EE50C - msgbox Route106_Text_29638C, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route106_EventScript_ElliotRematch + msgbox Route106_Text_ElliotPostBattle, MSGBOX_DEFAULT release end -Route106_EventScript_1EE4ED:: @ 81EE4ED - special sub_80B4808 +Route106_EventScript_ElliotRegisterMatchCallAfterBattle:: @ 81EE4ED + special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route106_Text_2963E3, MSGBOX_DEFAULT + msgbox Route106_Text_ElliotRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ELLIOT_1 release end -Route106_EventScript_1EE50C:: @ 81EE50C - trainerbattle_rematch TRAINER_ELLIOT_1, Route106_Text_29642E, Route106_Text_296477 - msgbox Route106_Text_296493, MSGBOX_AUTOCLOSE +Route106_EventScript_ElliotRematch:: @ 81EE50C + trainerbattle_rematch TRAINER_ELLIOT_1, Route106_Text_ElliotRematchIntro, Route106_Text_ElliotRematchDefeated + msgbox Route106_Text_ElliotRematchPostBattle, MSGBOX_AUTOCLOSE end -Route106_EventScript_1EE523:: @ 81EE523 - trainerbattle_single TRAINER_NED, Route106_Text_2964D4, Route106_Text_296553 - msgbox Route106_Text_296588, MSGBOX_AUTOCLOSE +Route106_EventScript_Ned:: @ 81EE523 + trainerbattle_single TRAINER_NED, Route106_Text_NedIntro, Route106_Text_NedDefeated + msgbox Route106_Text_NedPostBattle, MSGBOX_AUTOCLOSE end -Route106_Text_1EE53A: @ 81EE53A +Route106_Text_TrainerTips: @ 81EE53A .string "TRAINER TIPS\p" .string "Advice on catching POKéMON with a ROD:\n" .string "Press the A Button if you get a bite.$" diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json index 3813f4795..b0bb63a14 100644 --- a/data/maps/Route107/map.json +++ b/data/maps/Route107/map.json @@ -35,7 +35,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route107_EventScript_1EE595", + "script": "Route107_EventScript_Darrin", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 2, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route107_EventScript_1EE5AC", + "script": "Route107_EventScript_Tony", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route107_EventScript_1EE60E", + "script": "Route107_EventScript_Denise", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route107_EventScript_1EE625", + "script": "Route107_EventScript_Beth", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route107_EventScript_1EE63C", + "script": "Route107_EventScript_Lisa", "flag": "0" }, { @@ -100,7 +100,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route107_EventScript_1EE657", + "script": "Route107_EventScript_Ray", "flag": "0" }, { @@ -113,7 +113,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route107_EventScript_1EE672", + "script": "Route107_EventScript_Camron", "flag": "0" } ], diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc index 90f67a639..0642c457f 100644 --- a/data/maps/Route107/scripts.inc +++ b/data/maps/Route107/scripts.inc @@ -1,55 +1,55 @@ Route107_MapScripts:: @ 81EE594 .byte 0 -Route107_EventScript_1EE595:: @ 81EE595 - trainerbattle_single TRAINER_DARRIN, Route107_Text_2966E5, Route107_Text_29672F - msgbox Route107_Text_29675B, MSGBOX_AUTOCLOSE +Route107_EventScript_Darrin:: @ 81EE595 + trainerbattle_single TRAINER_DARRIN, Route107_Text_DarrinIntro, Route107_Text_DarrinDefeated + msgbox Route107_Text_DarrinPostBattle, MSGBOX_AUTOCLOSE end -Route107_EventScript_1EE5AC:: @ 81EE5AC - trainerbattle_single TRAINER_TONY_1, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8 +Route107_EventScript_Tony:: @ 81EE5AC + trainerbattle_single TRAINER_TONY_1, Route107_Text_TonyIntro, Route107_Text_TonyDefeated, Route107_EventScript_TonyRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route107_EventScript_1EE5F7 - msgbox Route107_Text_2967FF, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route107_EventScript_TonyRematch + msgbox Route107_Text_TonyPostBattle, MSGBOX_DEFAULT release end -Route107_EventScript_1EE5D8:: @ 81EE5D8 - special sub_80B4808 +Route107_EventScript_TonyRegisterMatchCallAfterBattle:: @ 81EE5D8 + special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route107_Text_29685A, MSGBOX_DEFAULT + msgbox Route107_Text_TonyRegister, MSGBOX_DEFAULT register_matchcall TRAINER_TONY_1 release end -Route107_EventScript_1EE5F7:: @ 81EE5F7 - trainerbattle_rematch TRAINER_TONY_1, Route107_Text_296897, Route107_Text_2968D5 - msgbox Route107_Text_296923, MSGBOX_AUTOCLOSE +Route107_EventScript_TonyRematch:: @ 81EE5F7 + trainerbattle_rematch TRAINER_TONY_1, Route107_Text_TonyRematchIntro, Route107_Text_TonyRematchDefeated + msgbox Route107_Text_TonyRematchPostBattle, MSGBOX_AUTOCLOSE end -Route107_EventScript_1EE60E:: @ 81EE60E - trainerbattle_single TRAINER_DENISE, Route107_Text_296974, Route107_Text_29699E - msgbox Route107_Text_2969AB, MSGBOX_AUTOCLOSE +Route107_EventScript_Denise:: @ 81EE60E + trainerbattle_single TRAINER_DENISE, Route107_Text_DeniseIntro, Route107_Text_DeniseDefeated + msgbox Route107_Text_DenisePostBattle, MSGBOX_AUTOCLOSE end -Route107_EventScript_1EE625:: @ 81EE625 - trainerbattle_single TRAINER_BETH, Route107_Text_2969E4, Route107_Text_296A17 - msgbox Route107_Text_296A35, MSGBOX_AUTOCLOSE +Route107_EventScript_Beth:: @ 81EE625 + trainerbattle_single TRAINER_BETH, Route107_Text_BethIntro, Route107_Text_BethDefeated + msgbox Route107_Text_BethPostBattle, MSGBOX_AUTOCLOSE end -Route107_EventScript_1EE63C:: @ 81EE63C - trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_296A77, Route107_Text_296AA7, Route107_Text_296B1E - msgbox Route107_Text_296ADC, MSGBOX_AUTOCLOSE +Route107_EventScript_Lisa:: @ 81EE63C + trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_LisaIntro, Route107_Text_LisaDefeated, Route107_Text_LisaNotEnoughPokemon + msgbox Route107_Text_LisaPostBattle, MSGBOX_AUTOCLOSE end -Route107_EventScript_1EE657:: @ 81EE657 - trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_296B57, Route107_Text_296BB3, Route107_Text_296C34 - msgbox Route107_Text_296BE1, MSGBOX_AUTOCLOSE +Route107_EventScript_Ray:: @ 81EE657 + trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_RayIntro, Route107_Text_RayDefeated, Route107_Text_RayNotEnoughPokemon + msgbox Route107_Text_RayPostBattle, MSGBOX_AUTOCLOSE end -Route107_EventScript_1EE672:: @ 81EE672 - trainerbattle_single TRAINER_CAMRON, Route107_Text_296C6F, Route107_Text_296CAD - msgbox Route107_Text_296CC0, MSGBOX_AUTOCLOSE +Route107_EventScript_Camron:: @ 81EE672 + trainerbattle_single TRAINER_CAMRON, Route107_Text_CamronIntro, Route107_Text_CamronDefeated + msgbox Route107_Text_CamronPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json index b8b188637..ecdb81f6f 100644 --- a/data/maps/Route108/map.json +++ b/data/maps/Route108/map.json @@ -35,7 +35,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route108_EventScript_1EE68A", + "script": "Route108_EventScript_Jerome", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route108_EventScript_1EE6B8", + "script": "Route108_EventScript_Tara", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route108_EventScript_1EE6A1", + "script": "Route108_EventScript_Matthew", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route108_EventScript_1EE6CF", + "script": "Route108_EventScript_Missy", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route108_EventScript_1EE6E6", + "script": "Route108_EventScript_Carolina", "flag": "0" }, { @@ -100,7 +100,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route108_EventScript_1EE6FD", + "script": "Route108_EventScript_Cory", "flag": "0" }, { diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc index 15a657a20..57f353bd1 100644 --- a/data/maps/Route108/scripts.inc +++ b/data/maps/Route108/scripts.inc @@ -1,50 +1,50 @@ Route108_MapScripts:: @ 81EE689 .byte 0 -Route108_EventScript_1EE68A:: @ 81EE68A - trainerbattle_single TRAINER_JEROME, Route108_Text_296D10, Route108_Text_296D3C - msgbox Route108_Text_296D6E, MSGBOX_AUTOCLOSE +Route108_EventScript_Jerome:: @ 81EE68A + trainerbattle_single TRAINER_JEROME, Route108_Text_JeromeIntro, Route108_Text_JeromeDefeated + msgbox Route108_Text_JeromePostBattle, MSGBOX_AUTOCLOSE end -Route108_EventScript_1EE6A1:: @ 81EE6A1 - trainerbattle_single TRAINER_MATTHEW, Route108_Text_296DAF, Route108_Text_296DEA - msgbox Route108_Text_296E03, MSGBOX_AUTOCLOSE +Route108_EventScript_Matthew:: @ 81EE6A1 + trainerbattle_single TRAINER_MATTHEW, Route108_Text_MatthewIntro, Route108_Text_MatthewDefeated + msgbox Route108_Text_MatthewPostBattle, MSGBOX_AUTOCLOSE end -Route108_EventScript_1EE6B8:: @ 81EE6B8 - trainerbattle_single TRAINER_TARA, Route108_Text_296E33, Route108_Text_296E71 - msgbox Route108_Text_296E7A, MSGBOX_AUTOCLOSE +Route108_EventScript_Tara:: @ 81EE6B8 + trainerbattle_single TRAINER_TARA, Route108_Text_TaraIntro, Route108_Text_TaraDefeated + msgbox Route108_Text_TaraPostBattle, MSGBOX_AUTOCLOSE end -Route108_EventScript_1EE6CF:: @ 81EE6CF - trainerbattle_single TRAINER_MISSY, Route108_Text_296EC7, Route108_Text_296EFC - msgbox Route108_Text_296F2A, MSGBOX_AUTOCLOSE +Route108_EventScript_Missy:: @ 81EE6CF + trainerbattle_single TRAINER_MISSY, Route108_Text_MissyIntro, Route108_Text_MissyDefeated + msgbox Route108_Text_MissyPostBattle, MSGBOX_AUTOCLOSE end -Route108_EventScript_1EE6E6:: @ 81EE6E6 - trainerbattle_single TRAINER_CAROLINA, Route108_Text_297094, Route108_Text_2970D7 - msgbox Route108_Text_2970F0, MSGBOX_AUTOCLOSE +Route108_EventScript_Carolina:: @ 81EE6E6 + trainerbattle_single TRAINER_CAROLINA, Route108_Text_CarolinaIntro, Route108_Text_CarolinaDefeated + msgbox Route108_Text_CarolinaPostBattle, MSGBOX_AUTOCLOSE end -Route108_EventScript_1EE6FD:: @ 81EE6FD - trainerbattle_single TRAINER_CORY_1, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729 +Route108_EventScript_Cory:: @ 81EE6FD + trainerbattle_single TRAINER_CORY_1, Route108_Text_CoryIntro, Route108_Text_CoryDefeated, Route108_EventScript_CoryRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route108_EventScript_1EE748 - msgbox Route108_Text_296FB0, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route108_EventScript_CoryRematch + msgbox Route108_Text_CoryPostBattle, MSGBOX_DEFAULT release end -Route108_EventScript_1EE729:: @ 81EE729 - special sub_80B4808 +Route108_EventScript_CoryRegisterMatchCallAfterBattle:: @ 81EE729 + special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route108_Text_296FD8, MSGBOX_DEFAULT + msgbox Route108_Text_CoryRegister, MSGBOX_DEFAULT register_matchcall TRAINER_CORY_1 release end -Route108_EventScript_1EE748:: @ 81EE748 - trainerbattle_rematch TRAINER_CORY_1, Route108_Text_297011, Route108_Text_297036 - msgbox Route108_Text_297059, MSGBOX_AUTOCLOSE +Route108_EventScript_CoryRematch:: @ 81EE748 + trainerbattle_rematch TRAINER_CORY_1, Route108_Text_CoryRematchIntro, Route108_Text_CoryRematchDefeated + msgbox Route108_Text_CoryRematchPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json index 361467266..4ba9baf9f 100644 --- a/data/maps/Route109/map.json +++ b/data/maps/Route109/map.json @@ -48,8 +48,8 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route109_EventScript_1EE910", - "flag": "FLAG_HIDE_ROUTE_108_MR_BRINEY" + "script": "Route109_EventScript_MrBriney", + "flag": "FLAG_HIDE_ROUTE_109_MR_BRINEY" }, { "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route109_EventScript_1EEA3D", + "script": "Route109_EventScript_David", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route109_EventScript_1EEA54", + "script": "Route109_EventScript_Alice", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route109_EventScript_1EEA6B", + "script": "Route109_EventScript_Huey", "flag": "0" }, { @@ -100,7 +100,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route109_EventScript_1EEA82", + "script": "Route109_EventScript_Edmond", "flag": "0" }, { @@ -113,7 +113,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route109_EventScript_1EEA99", + "script": "Route109_EventScript_Ricky", "flag": "0" }, { @@ -126,7 +126,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route109_EventScript_1EEAFB", + "script": "Route109_EventScript_Lola", "flag": "0" }, { @@ -139,7 +139,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route109_EventScript_1EE995", + "script": "Route109_EventScript_SeashoreHouseGirl", "flag": "0" }, { @@ -165,7 +165,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route109_EventScript_1EEB74", + "script": "Route109_EventScript_Gwen", "flag": "0" }, { @@ -178,7 +178,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route109_EventScript_1EEB5D", + "script": "Route109_EventScript_Austina", "flag": "0" }, { @@ -191,7 +191,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route109_EventScript_1EEB8B", + "script": "Route109_EventScript_Carter", "flag": "0" }, { @@ -204,7 +204,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route109_EventScript_1EE99E", + "script": "Route109_EventScript_SandCastleBoy", "flag": "0" }, { @@ -217,7 +217,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route109_EventScript_1EE9B5", + "script": "Route109_EventScript_SoftSandGirl", "flag": "0" }, { @@ -230,7 +230,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route109_EventScript_1EEA06", + "script": "Route109_EventScript_Woman", "flag": "0" }, { @@ -243,7 +243,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route109_EventScript_1EEBBD", + "script": "Route109_EventScript_Mel", "flag": "0" }, { @@ -256,7 +256,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route109_EventScript_1EEBA2", + "script": "Route109_EventScript_Paul", "flag": "0" }, { @@ -269,7 +269,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route109_EventScript_1EEA0F", + "script": "Route109_EventScript_OldMan", "flag": "0" }, { @@ -282,7 +282,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route109_EventScript_1EEA18", + "script": "Route109_EventScript_Zigzagoon", "flag": "0" }, { @@ -295,7 +295,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route109_EventScript_1EEBEF", + "script": "Route109_EventScript_Hailey", "flag": "0" }, { @@ -308,7 +308,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route109_EventScript_1EEBD8", + "script": "Route109_EventScript_Chandler", "flag": "0" }, { @@ -334,7 +334,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route109_EventScript_1EEC06", + "script": "Route109_EventScript_Elijah", "flag": "0" } ], @@ -355,7 +355,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route109_EventScript_1EEA2B" + "script": "Route109_EventScript_SeashoreHouseSign" }, { "type": "sign", @@ -363,7 +363,7 @@ "y": 10, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route109_EventScript_1EEA34" + "script": "Route109_EventScript_TrainerTipsSign" }, { "type": "hidden_item", diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index e4c04f0d2..e7080ac50 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -1,59 +1,59 @@ Route109_MapScripts:: @ 81EE75F .byte 0 -Route109_EventScript_1EE760:: @ 81EE760 - call Route109_EventScript_271E95 +Route109_EventScript_StartDepartForDewford:: @ 81EE760 + call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_ROUTE109, 0 setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109, 0 - applymovement 2, Route109_Movement_1EE90B + applymovement 2, Route109_Movement_BrineyEnterBoat waitmovement 0 removeobject 2 switch VAR_FACING - case 1, Route109_EventScript_1EE7A5 - case 3, Route109_EventScript_1EE7C5 - case 4, Route109_EventScript_1EE7B5 + case DIR_SOUTH, Route109_EventScript_EnterBoatSouth + case DIR_WEST, Route109_EventScript_EnterBoatWest + case DIR_EAST, Route109_EventScript_EnterBoatEast end -Route109_EventScript_1EE7A5:: @ 81EE7A5 - applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE8FD +Route109_EventScript_EnterBoatSouth:: @ 81EE7A5 + applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerEnterBoatSouth waitmovement 0 - goto Route109_EventScript_1EE7D5 + goto Route109_EventScript_DoSailToDewford end -Route109_EventScript_1EE7B5:: @ 81EE7B5 - applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE905 +Route109_EventScript_EnterBoatEast:: @ 81EE7B5 + applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerEnterBoatEast waitmovement 0 - goto Route109_EventScript_1EE7D5 + goto Route109_EventScript_DoSailToDewford end -Route109_EventScript_1EE7C5:: @ 81EE7C5 - applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE908 +Route109_EventScript_EnterBoatWest:: @ 81EE7C5 + applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerEnterBoatWest waitmovement 0 - goto Route109_EventScript_1EE7D5 + goto Route109_EventScript_DoSailToDewford end -Route109_EventScript_1EE7D5:: @ 81EE7D5 +Route109_EventScript_DoSailToDewford:: @ 81EE7D5 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 - call Route109_EventScript_2720A0 - applymovement 1, Route109_Movement_1EE84F - applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE84F + call Common_EventScript_PlayBrineysBoatMusic + applymovement 1, Route109_Movement_SailToDewford + applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_SailToDewford waitmovement 0 delay 50 - call Route109_EventScript_2720A8 + call Common_EventScript_StopBrineysBoatMusic showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN - applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE900 + applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerExitBoat waitmovement 0 addobject 4 clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN setobjectxyperm 2, 12, 8 addobject 2 setobjectpriority 2, MAP_DEWFORD_TOWN, 0 - applymovement 2, Route109_Movement_1EE90D + applymovement 2, Route109_Movement_BrineyExitBoat waitmovement 0 clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT hideobjectat 1, MAP_ROUTE109 - msgbox Route109_Text_1E9C1D, MSGBOX_DEFAULT + msgbox DewfordTown_Text_BrineyLandedInDewford, MSGBOX_DEFAULT closemessage copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 @@ -62,7 +62,7 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5 release end -Route109_Movement_1EE84F: @ 81EE84F +Route109_Movement_SailToDewford: @ 81EE84F walk_in_place_fastest_down walk_down walk_down @@ -238,98 +238,98 @@ Route109_Movement_1EE84F: @ 81EE84F walk_in_place_fastest_down step_end -Route109_Movement_1EE8FD: @ 81EE8FD +Route109_Movement_PlayerEnterBoatSouth: @ 81EE8FD walk_down walk_down step_end -Route109_Movement_1EE900: @ 81EE900 +Route109_Movement_PlayerExitBoat: @ 81EE900 walk_down walk_down walk_left walk_in_place_fastest_right step_end -Route109_Movement_1EE905: @ 81EE905 +Route109_Movement_PlayerEnterBoatEast: @ 81EE905 walk_right walk_down step_end -Route109_Movement_1EE908: @ 81EE908 +Route109_Movement_PlayerEnterBoatWest: @ 81EE908 walk_left walk_down step_end -Route109_Movement_1EE90B: @ 81EE90B +Route109_Movement_BrineyEnterBoat: @ 81EE90B walk_down step_end -Route109_Movement_1EE90D: @ 81EE90D +Route109_Movement_BrineyExitBoat: @ 81EE90D walk_down walk_in_place_fastest_left step_end -Route109_EventScript_1EE910:: @ 81EE910 +Route109_EventScript_MrBriney:: @ 81EE910 lock faceplayer - goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route109_EventScript_1EE921 - goto Route109_EventScript_1EE93F + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route109_EventScript_HaveNotDeliveredDevonGood + goto Route109_EventScript_DeliveredDevonGoods end -Route109_EventScript_1EE921:: @ 81EE921 - message Route109_Text_1EEC96 - msgbox Route109_Text_1EEC96, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq Route109_EventScript_1EE981 - goto Route109_EventScript_1EE972 +Route109_EventScript_HaveNotDeliveredDevonGood:: @ 81EE921 + message Route109_Text_BrineySailToDewfordQuestion + msgbox Route109_Text_BrineySailToDewfordQuestion, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq Route109_EventScript_StayHere + goto Route109_EventScript_SailToDewford end -Route109_EventScript_1EE93F:: @ 81EE93F - message Route109_Text_1EEE17 +Route109_EventScript_DeliveredDevonGoods:: @ 81EE93F + message Route109_Text_BrineyWhereAreWeBound waitmessage multichoicedefault 21, 8, MULTI_BRINEY_OFF_DEWFORD, 1, 0 switch VAR_RESULT - case 0, Route109_EventScript_1EE972 - case 1, Route109_EventScript_1EE98B - case MULTI_B_PRESSED, Route109_EventScript_1EE98B + case 0, Route109_EventScript_SailToDewford + case 1, Route109_EventScript_ChoseNotToSail + case MULTI_B_PRESSED, Route109_EventScript_ChoseNotToSail end -Route109_EventScript_1EE972:: @ 81EE972 - msgbox Route109_Text_1EED06, MSGBOX_DEFAULT +Route109_EventScript_SailToDewford:: @ 81EE972 + msgbox Route109_Text_BrineyDewfordItIs, MSGBOX_DEFAULT closemessage - goto Route109_EventScript_1EE760 + goto Route109_EventScript_StartDepartForDewford end -Route109_EventScript_1EE981:: @ 81EE981 - msgbox Route109_Text_1EED5E, MSGBOX_DEFAULT +Route109_EventScript_StayHere:: @ 81EE981 + msgbox Route109_Text_BrineyDeliverDevonGoods, MSGBOX_DEFAULT release end -Route109_EventScript_1EE98B:: @ 81EE98B - msgbox Route109_Text_1EEE72, MSGBOX_DEFAULT +Route109_EventScript_ChoseNotToSail:: @ 81EE98B + msgbox Route109_Text_BrineyTellMeWhenYouNeedToSail, MSGBOX_DEFAULT release end -Route109_EventScript_1EE995:: @ 81EE995 - msgbox Route109_Text_1EEEB4, MSGBOX_NPC +Route109_EventScript_SeashoreHouseGirl:: @ 81EE995 + msgbox Route109_Text_ChillAtMyPapasSpot, MSGBOX_NPC end -Route109_EventScript_1EE99E:: @ 81EE99E +Route109_EventScript_SandCastleBoy:: @ 81EE99E lock faceplayer - msgbox Route109_Text_1EEFB0, MSGBOX_DEFAULT + msgbox Route109_Text_SandCastleTakingLongTime, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -Route109_EventScript_1EE9B5:: @ 81EE9B5 +Route109_EventScript_SoftSandGirl:: @ 81EE9B5 lock faceplayer special GetPlayerBigGuyGirlString - goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_1EE9F2 - msgbox Route109_Text_1EEFDE, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_AlreadyReceivedSoftSand + msgbox Route109_Text_YouCanHaveThis, MSGBOX_DEFAULT giveitem_std ITEM_SOFT_SAND compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull @@ -340,207 +340,207 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 release end -Route109_EventScript_1EE9F2:: @ 81EE9F2 - msgbox Route109_Text_1EEFF1, MSGBOX_DEFAULT +Route109_EventScript_AlreadyReceivedSoftSand:: @ 81EE9F2 + msgbox Route109_Text_WereGoingToMakeBigCastle, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -Route109_EventScript_1EEA06:: @ 81EEA06 - msgbox Route109_Text_1EEF08, MSGBOX_NPC +Route109_EventScript_Woman:: @ 81EEA06 + msgbox Route109_Text_LittleKidsDartAround, MSGBOX_NPC end -Route109_EventScript_1EEA0F:: @ 81EEA0F - msgbox Route109_Text_1EF080, MSGBOX_NPC +Route109_EventScript_OldMan:: @ 81EEA0F + msgbox Route109_Text_ZigzagoonPicksUpLitter, MSGBOX_NPC end -Route109_EventScript_1EEA18:: @ 81EEA18 +Route109_EventScript_Zigzagoon:: @ 81EEA18 lock faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox Route109_Text_1EF173, MSGBOX_DEFAULT + msgbox Route109_Text_ZigzagoonCry, MSGBOX_DEFAULT waitmoncry release end -Route109_EventScript_1EEA2B:: @ 81EEA2B - msgbox Route109_Text_1EF185, MSGBOX_SIGN +Route109_EventScript_SeashoreHouseSign:: @ 81EEA2B + msgbox Route109_Text_SeashoreHouseSign, MSGBOX_SIGN end -Route109_EventScript_1EEA34:: @ 81EEA34 - msgbox Route109_Text_1EF1D5, MSGBOX_SIGN +Route109_EventScript_TrainerTipsSign:: @ 81EEA34 + msgbox Route109_Text_TrainerTipsSign, MSGBOX_SIGN end -Route109_EventScript_1EEA3D:: @ 81EEA3D - trainerbattle_single TRAINER_DAVID, Route109_Text_297140, Route109_Text_29717D - msgbox Route109_Text_297191, MSGBOX_AUTOCLOSE +Route109_EventScript_David:: @ 81EEA3D + trainerbattle_single TRAINER_DAVID, Route109_Text_DavidIntro, Route109_Text_DavidDefeated + msgbox Route109_Text_DavidPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEA54:: @ 81EEA54 - trainerbattle_single TRAINER_ALICE, Route109_Text_2971D1, Route109_Text_2971FD - msgbox Route109_Text_29720F, MSGBOX_AUTOCLOSE +Route109_EventScript_Alice:: @ 81EEA54 + trainerbattle_single TRAINER_ALICE, Route109_Text_AliceIntro, Route109_Text_AliceDefeated + msgbox Route109_Text_AlicePostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEA6B:: @ 81EEA6B - trainerbattle_single TRAINER_HUEY, Route109_Text_297235, Route109_Text_29727B - msgbox Route109_Text_29728C, MSGBOX_AUTOCLOSE +Route109_EventScript_Huey:: @ 81EEA6B + trainerbattle_single TRAINER_HUEY, Route109_Text_HueyIntro, Route109_Text_HueyDefeated + msgbox Route109_Text_HueyPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEA82:: @ 81EEA82 - trainerbattle_single TRAINER_EDMOND, Route109_Text_2972B3, Route109_Text_2972CE - msgbox Route109_Text_2972ED, MSGBOX_AUTOCLOSE +Route109_EventScript_Edmond:: @ 81EEA82 + trainerbattle_single TRAINER_EDMOND, Route109_Text_EdmondIntro, Route109_Text_EdmondDefeated + msgbox Route109_Text_EdmondPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEA99:: @ 81EEA99 - trainerbattle_single TRAINER_RICKY_1, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5 +Route109_EventScript_Ricky:: @ 81EEA99 + trainerbattle_single TRAINER_RICKY_1, Route109_Text_RickyIntro, Route109_Text_RickyDefeated, Route109_EventScript_RickyRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route109_EventScript_1EEAE4 - msgbox Route109_Text_297380, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route109_EventScript_RickyRematch + msgbox Route109_Text_RickyPostBattle, MSGBOX_DEFAULT release end -Route109_EventScript_1EEAC5:: @ 81EEAC5 - special sub_80B4808 +Route109_EventScript_RickyRegisterMatchCallAfterBattle:: @ 81EEAC5 + special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route109_Text_2973C1, MSGBOX_DEFAULT + msgbox Route109_Text_RickyRegister, MSGBOX_DEFAULT register_matchcall TRAINER_RICKY_1 release end -Route109_EventScript_1EEAE4:: @ 81EEAE4 - trainerbattle_rematch TRAINER_RICKY_1, Route109_Text_2973FF, Route109_Text_297437 - msgbox Route109_Text_297458, MSGBOX_AUTOCLOSE +Route109_EventScript_RickyRematch:: @ 81EEAE4 + trainerbattle_rematch TRAINER_RICKY_1, Route109_Text_RickyRematchIntro, Route109_Text_RickyRematchDefeated + msgbox Route109_Text_RickyRematchPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEAFB:: @ 81EEAFB - trainerbattle_single TRAINER_LOLA_1, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27 +Route109_EventScript_Lola:: @ 81EEAFB + trainerbattle_single TRAINER_LOLA_1, Route109_Text_LolaIntro, Route109_Text_LolaDefeated, Route109_EventScript_LolaRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route109_EventScript_1EEB46 - msgbox Route109_Text_2974D6, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route109_EventScript_LolaRematch + msgbox Route109_Text_LolaPostBattle, MSGBOX_DEFAULT release end -Route109_EventScript_1EEB27:: @ 81EEB27 - special sub_80B4808 +Route109_EventScript_LolaRegisterMatchCallAfterBattle:: @ 81EEB27 + special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route109_Text_297520, MSGBOX_DEFAULT + msgbox Route109_Text_LolaRegister, MSGBOX_DEFAULT register_matchcall TRAINER_LOLA_1 release end -Route109_EventScript_1EEB46:: @ 81EEB46 - trainerbattle_rematch TRAINER_LOLA_1, Route109_Text_297538, Route109_Text_297576 - msgbox Route109_Text_29757D, MSGBOX_AUTOCLOSE +Route109_EventScript_LolaRematch:: @ 81EEB46 + trainerbattle_rematch TRAINER_LOLA_1, Route109_Text_LolaRematchIntro, Route109_Text_LolaRematchDefeated + msgbox Route109_Text_LolaRematchPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEB5D:: @ 81EEB5D - trainerbattle_single TRAINER_AUSTINA, Route109_Text_2975C0, Route109_Text_297601 - msgbox Route109_Text_29762A, MSGBOX_AUTOCLOSE +Route109_EventScript_Austina:: @ 81EEB5D + trainerbattle_single TRAINER_AUSTINA, Route109_Text_AustinaIntro, Route109_Text_AustinaDefeated + msgbox Route109_Text_AustinaPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEB74:: @ 81EEB74 - trainerbattle_single TRAINER_GWEN, Route109_Text_297667, Route109_Text_297691 - msgbox Route109_Text_2976A4, MSGBOX_AUTOCLOSE +Route109_EventScript_Gwen:: @ 81EEB74 + trainerbattle_single TRAINER_GWEN, Route109_Text_GwenIntro, Route109_Text_GwenDefeated + msgbox Route109_Text_GwenPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEB8B:: @ 81EEB8B - trainerbattle_single TRAINER_CARTER, Route109_Text_2976C5, Route109_Text_2976FC - msgbox Route109_Text_297715, MSGBOX_AUTOCLOSE +Route109_EventScript_Carter:: @ 81EEB8B + trainerbattle_single TRAINER_CARTER, Route109_Text_CarterIntro, Route109_Text_CarterDefeated + msgbox Route109_Text_CarterPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEBA2:: @ 81EEBA2 - trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_297754, Route109_Text_2977B0, Route109_Text_29781D - msgbox Route109_Text_2977C7, MSGBOX_AUTOCLOSE +Route109_EventScript_Paul:: @ 81EEBA2 + trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_PaulIntro, Route109_Text_PaulDefeated, Route109_Text_PaulNotEnoughPokemon + msgbox Route109_Text_PaulPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEBBD:: @ 81EEBBD - trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_297872, Route109_Text_2978BD, Route109_Text_29792E - msgbox Route109_Text_2978F1, MSGBOX_AUTOCLOSE +Route109_EventScript_Mel:: @ 81EEBBD + trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_MelIntro, Route109_Text_MelDefeated, Route109_Text_MelNotEnoughPokemon + msgbox Route109_Text_MelPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEBD8:: @ 81EEBD8 - trainerbattle_single TRAINER_CHANDLER, Route109_Text_29798A, Route109_Text_2979AE - msgbox Route109_Text_2979BF, MSGBOX_AUTOCLOSE +Route109_EventScript_Chandler:: @ 81EEBD8 + trainerbattle_single TRAINER_CHANDLER, Route109_Text_ChandlerIntro, Route109_Text_ChandlerDefeated + msgbox Route109_Text_ChandlerPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEBEF:: @ 81EEBEF - trainerbattle_single TRAINER_HAILEY, Route109_Text_2979EC, Route109_Text_297A15 - msgbox Route109_Text_297A40, MSGBOX_AUTOCLOSE +Route109_EventScript_Hailey:: @ 81EEBEF + trainerbattle_single TRAINER_HAILEY, Route109_Text_HaileyIntro, Route109_Text_HaileyDefeated + msgbox Route109_Text_HaileyPostBattle, MSGBOX_AUTOCLOSE end -Route109_EventScript_1EEC06:: @ 81EEC06 - trainerbattle_single TRAINER_ELIJAH, Route109_Text_297A82, Route109_Text_297AC7 - msgbox Route109_Text_297AE5, MSGBOX_AUTOCLOSE +Route109_EventScript_Elijah:: @ 81EEC06 + trainerbattle_single TRAINER_ELIJAH, Route109_Text_ElijahIntro, Route109_Text_ElijahDefeated + msgbox Route109_Text_ElijahPostBattle, MSGBOX_AUTOCLOSE end -DewfordTown_Text_1EEC1D: @ 81EEC1D +DewfordTown_Text_BrineyLandedInSlateportDeliverGoods: @ 81EEC1D .string "MR. BRINEY: Ahoy!\n" .string "We've made land in SLATEPORT!\p" .string "I suppose you're going to visit CAPT.\n" .string "STERN and deliver the DEVON GOODS?$" -Route109_Text_1EEC96: @ 81EEC96 +Route109_Text_BrineySailToDewfordQuestion: @ 81EEC96 .string "MR. BRINEY: I thought you're supposed\n" .string "to deliver the DEVON GOODS.\p" .string "Would you like to sail back to\n" .string "DEWFORD, then?$" -Route109_Text_1EED06: @ 81EED06 +Route109_Text_BrineyDewfordItIs: @ 81EED06 .string "MR. BRINEY: DEWFORD it is, then!\p" .string "Anchors aweigh!\n" .string "PEEKO, we're setting sail, my darling!$" -Route109_Text_1EED5E: @ 81EED5E +Route109_Text_BrineyDeliverDevonGoods: @ 81EED5E .string "MR. BRINEY: Then you go on and deliver\n" .string "the DEVON GOODS. I'll be waiting.$" -DewfordTown_Text_1EEDA7: @ 81EEDA7 +DewfordTown_Text_BrineyLandedInSlateport: @ 81EEDA7 .string "MR. BRINEY: Ahoy! We've made land in\n" .string "SLATEPORT!\p" .string "You just go on and tell me whenever\n" .string "you want to set sail again!$" -Route109_Text_1EEE17: @ 81EEE17 +Route109_Text_BrineyWhereAreWeBound: @ 81EEE17 .string "MR. BRINEY: Ahoy!\n" .string "For you, I'll go out to sea anytime!\p" .string "Now, my friend, where are we bound?$" -Route109_Text_1EEE72: @ 81EEE72 +Route109_Text_BrineyTellMeWhenYouNeedToSail: @ 81EEE72 .string "MR. BRINEY: You just tell me whenever\n" .string "you need to set sail again!$" -Route109_Text_1EEEB4: @ 81EEEB4 +Route109_Text_ChillAtMyPapasSpot: @ 81EEEB4 .string "Yo, TRAINERS!\n" .string "Whether you're hot to trot,\l" .string "or cool cat not,\l" .string "chill at my papa's spot!$" -Route109_Text_1EEF08: @ 81EEF08 +Route109_Text_LittleKidsDartAround: @ 81EEF08 .string "Little kids can dart around so quickly…\p" .string "You don't dare take your eyes off them\n" .string "for an instant. It's very taxing.\p" .string "Mine are with my POKéMON, so they\n" .string "should be okay, but…$" -Route109_Text_1EEFB0: @ 81EEFB0 +Route109_Text_SandCastleTakingLongTime: @ 81EEFB0 .string "Our sand castle's taking a long time\n" .string "to make.$" -Route109_Text_1EEFDE: @ 81EEFDE +Route109_Text_YouCanHaveThis: @ 81EEFDE .string "You can have this!$" -Route109_Text_1EEFF1: @ 81EEFF1 +Route109_Text_WereGoingToMakeBigCastle: @ 81EEFF1 .string "We're going to get all the sand from\n" .string "the beach and make a big castle!\p" .string "And then we're going to be a king and\n" .string "queen.\p" .string "We'll let you be a servant.$" -Route109_Text_1EF080: @ 81EF080 +Route109_Text_ZigzagoonPicksUpLitter: @ 81EF080 .string "The water around these parts is clean.\p" .string "But, I get my ZIGZAGOON to pick up\n" .string "litter from the shoreline at times.\p" @@ -549,15 +549,15 @@ Route109_Text_1EF080: @ 81EF080 .string "If we pollute the sea, it all comes\n" .string "back to haunt us eventually.$" -Route109_Text_1EF173: @ 81EF173 +Route109_Text_ZigzagoonCry: @ 81EF173 .string "ZIGZAGOON: Guguu?$" -Route109_Text_1EF185: @ 81EF185 +Route109_Text_SeashoreHouseSign: @ 81EF185 .string "SEASHORE HOUSE\p" .string "“May hot battles rage on hot sands!\n" .string "The place for hot TRAINERS!”$" -Route109_Text_1EF1D5: @ 81EF1D5 +Route109_Text_TrainerTipsSign: @ 81EF1D5 .string "TRAINER TIPS\p" .string "POKéMON at the same level may not\n" .string "always have identical stats.\p" diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json index 3f293b291..ebd5583c6 100644 --- a/data/maps/Route109_SeashoreHouse/map.json +++ b/data/maps/Route109_SeashoreHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route109_SeashoreHouse_EventScript_2693FE", + "script": "Route109_SeashoreHouse_EventScript_Owner", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route109_SeashoreHouse_EventScript_2694E2", + "script": "Route109_SeashoreHouse_EventScript_Dwayne", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route109_SeashoreHouse_EventScript_269518", + "script": "Route109_SeashoreHouse_EventScript_Simon", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route109_SeashoreHouse_EventScript_2694FD", + "script": "Route109_SeashoreHouse_EventScript_Johanna", "flag": "0" } ], diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index d74b6b671..bc018c2f0 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -6,56 +6,56 @@ Route109_SeashoreHouse_OnTransition: @ 82693FA setflag FLAG_LANDMARK_SEASHORE_HOUSE end -Route109_SeashoreHouse_EventScript_2693FE:: @ 82693FE +Route109_SeashoreHouse_EventScript_Owner:: @ 82693FE lock faceplayer - goto_if_set FLAG_RECEIVED_6_SODA_POP, Route109_SeashoreHouse_EventScript_269460 - goto_if_set FLAG_DEFEATED_SEASHORE_HOUSE, Route109_SeashoreHouse_EventScript_269432 - goto_if_set FLAG_TEMP_2, Route109_SeashoreHouse_EventScript_269428 - msgbox Route109_SeashoreHouse_Text_269555, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_6_SODA_POP, Route109_SeashoreHouse_EventScript_AlreadyReceivedSodaPop + goto_if_set FLAG_DEFEATED_SEASHORE_HOUSE, Route109_SeashoreHouse_EventScript_DefeatedTrainers + goto_if_set FLAG_TEMP_2, Route109_SeashoreHouse_EventScript_AlreadyGaveIntroduction + msgbox Route109_SeashoreHouse_Text_SeashoreHouseIntro, MSGBOX_DEFAULT setflag FLAG_TEMP_2 release end -Route109_SeashoreHouse_EventScript_269428:: @ 8269428 - msgbox Route109_SeashoreHouse_Text_269635, MSGBOX_DEFAULT +Route109_SeashoreHouse_EventScript_AlreadyGaveIntroduction:: @ 8269428 + msgbox Route109_SeashoreHouse_Text_ShowMeSomeHotMatches, MSGBOX_DEFAULT release end -Route109_SeashoreHouse_EventScript_269432:: @ 8269432 - msgbox Route109_SeashoreHouse_Text_269685, MSGBOX_DEFAULT +Route109_SeashoreHouse_EventScript_DefeatedTrainers:: @ 8269432 + msgbox Route109_SeashoreHouse_Text_TakeTheseSodaPopBottles, MSGBOX_DEFAULT giveitem_std ITEM_SODA_POP, 6 compare VAR_RESULT, 0 - goto_if_eq Route109_SeashoreHouse_EventScript_269456 + goto_if_eq Route109_SeashoreHouse_EventScript_BagFull setflag FLAG_RECEIVED_6_SODA_POP release end -Route109_SeashoreHouse_EventScript_269456:: @ 8269456 - msgbox Route109_SeashoreHouse_Text_26973A, MSGBOX_DEFAULT +Route109_SeashoreHouse_EventScript_BagFull:: @ 8269456 + msgbox Route109_SeashoreHouse_Text_BagFull, MSGBOX_DEFAULT release end -Route109_SeashoreHouse_EventScript_269460:: @ 8269460 +Route109_SeashoreHouse_EventScript_AlreadyReceivedSodaPop:: @ 8269460 showmoneybox 0, 0, 0 - msgbox Route109_SeashoreHouse_Text_26977E, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq Route109_SeashoreHouse_EventScript_269484 - msgbox Route109_SeashoreHouse_Text_2697EF, MSGBOX_DEFAULT + msgbox Route109_SeashoreHouse_Text_WantToBuySodaPop, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq Route109_SeashoreHouse_EventScript_BuySodaPop + msgbox Route109_SeashoreHouse_Text_ThatsTooBad, MSGBOX_DEFAULT hidemoneybox nop nop release end -Route109_SeashoreHouse_EventScript_269484:: @ 8269484 +Route109_SeashoreHouse_EventScript_BuySodaPop:: @ 8269484 checkmoney 300, 0 - compare VAR_RESULT, 0 - goto_if_eq Route109_SeashoreHouse_EventScript_2694C8 + compare VAR_RESULT, FALSE + goto_if_eq Route109_SeashoreHouse_EventScript_NotEnoughMoney checkitemspace ITEM_SODA_POP, 1 - compare VAR_RESULT, 0 - goto_if_eq Route109_SeashoreHouse_EventScript_2694D5 - msgbox Route109_SeashoreHouse_Text_2697C8, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq Route109_SeashoreHouse_EventScript_NotEnoughSpace + msgbox Route109_SeashoreHouse_Text_HereYouGo, MSGBOX_DEFAULT takemoney 300, 0 updatemoneybox 0, 0 giveitem_std ITEM_SODA_POP @@ -65,15 +65,15 @@ Route109_SeashoreHouse_EventScript_269484:: @ 8269484 release end -Route109_SeashoreHouse_EventScript_2694C8:: @ 82694C8 - msgbox Route109_SeashoreHouse_Text_2697D5, MSGBOX_DEFAULT +Route109_SeashoreHouse_EventScript_NotEnoughMoney:: @ 82694C8 + msgbox Route109_SeashoreHouse_Text_NotEnoughMoney, MSGBOX_DEFAULT hidemoneybox nop nop release end -Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5 +Route109_SeashoreHouse_EventScript_NotEnoughSpace:: @ 82694D5 msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT hidemoneybox nop @@ -81,37 +81,37 @@ Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5 release end -Route109_SeashoreHouse_EventScript_2694E2:: @ 82694E2 - trainerbattle_single TRAINER_DWAYNE, Route109_SeashoreHouse_Text_269803, Route109_SeashoreHouse_Text_269867, Route109_SeashoreHouse_EventScript_269533 - msgbox Route109_SeashoreHouse_Text_26989D, MSGBOX_AUTOCLOSE +Route109_SeashoreHouse_EventScript_Dwayne:: @ 82694E2 + trainerbattle_single TRAINER_DWAYNE, Route109_SeashoreHouse_Text_DwayneIntro, Route109_SeashoreHouse_Text_DwayneDefeated, Route109_SeashoreHouse_EventScript_CheckTrainersCompletion + msgbox Route109_SeashoreHouse_Text_DwaynePostBattle, MSGBOX_AUTOCLOSE end -Route109_SeashoreHouse_EventScript_2694FD:: @ 82694FD - trainerbattle_single TRAINER_JOHANNA, Route109_SeashoreHouse_Text_2698E3, Route109_SeashoreHouse_Text_269947, Route109_SeashoreHouse_EventScript_269533 - msgbox Route109_SeashoreHouse_Text_269953, MSGBOX_AUTOCLOSE +Route109_SeashoreHouse_EventScript_Johanna:: @ 82694FD + trainerbattle_single TRAINER_JOHANNA, Route109_SeashoreHouse_Text_JohannaIntro, Route109_SeashoreHouse_Text_JohannaDefeated, Route109_SeashoreHouse_EventScript_CheckTrainersCompletion + msgbox Route109_SeashoreHouse_Text_JohannaPostBattle, MSGBOX_AUTOCLOSE end -Route109_SeashoreHouse_EventScript_269518:: @ 8269518 - trainerbattle_single TRAINER_SIMON, Route109_SeashoreHouse_Text_269986, Route109_SeashoreHouse_Text_2699C5, Route109_SeashoreHouse_EventScript_269533 - msgbox Route109_SeashoreHouse_Text_2699DF, MSGBOX_AUTOCLOSE +Route109_SeashoreHouse_EventScript_Simon:: @ 8269518 + trainerbattle_single TRAINER_SIMON, Route109_SeashoreHouse_Text_SimonIntro, Route109_SeashoreHouse_Text_SimonDefeated, Route109_SeashoreHouse_EventScript_CheckTrainersCompletion + msgbox Route109_SeashoreHouse_Text_SimonPostBattle, MSGBOX_AUTOCLOSE end -Route109_SeashoreHouse_EventScript_269533:: @ 8269533 +Route109_SeashoreHouse_EventScript_CheckTrainersCompletion:: @ 8269533 checktrainerflag TRAINER_DWAYNE - goto_if_lt Route109_SeashoreHouse_EventScript_269553 + goto_if_lt Route109_SeashoreHouse_EventScript_TrainersNotCompleted checktrainerflag TRAINER_JOHANNA - goto_if_lt Route109_SeashoreHouse_EventScript_269553 + goto_if_lt Route109_SeashoreHouse_EventScript_TrainersNotCompleted checktrainerflag TRAINER_SIMON - goto_if_lt Route109_SeashoreHouse_EventScript_269553 + goto_if_lt Route109_SeashoreHouse_EventScript_TrainersNotCompleted setflag FLAG_DEFEATED_SEASHORE_HOUSE release end -Route109_SeashoreHouse_EventScript_269553:: @ 8269553 +Route109_SeashoreHouse_EventScript_TrainersNotCompleted:: @ 8269553 release end -Route109_SeashoreHouse_Text_269555: @ 8269555 +Route109_SeashoreHouse_Text_SeashoreHouseIntro: @ 8269555 .string "I'm the owner of the SEASHORE HOUSE.\n" .string "But you can call me MR. SEA!\p" .string "What I love above all is to see hot\n" @@ -120,12 +120,12 @@ Route109_SeashoreHouse_Text_269555: @ 8269555 .string "If you can defeat all the TRAINERS\n" .string "here, I'll reward your efforts.$" -Route109_SeashoreHouse_Text_269635: @ 8269635 +Route109_SeashoreHouse_Text_ShowMeSomeHotMatches: @ 8269635 .string "Show me some hot matches!\p" .string "I run this SEASHORE HOUSE just for\n" .string "that reason alone!$" -Route109_SeashoreHouse_Text_269685: @ 8269685 +Route109_SeashoreHouse_Text_TakeTheseSodaPopBottles: @ 8269685 .string "You're scorching hot!\n" .string "Those battles blazed!\l" .string "I'm more than just satisfied!\p" @@ -133,59 +133,59 @@ Route109_SeashoreHouse_Text_269685: @ 8269685 .string "streak, I want you to take these.\p" .string "It's half a dozen bottles of SODA POP!$" -Route109_SeashoreHouse_Text_26973A: @ 826973A +Route109_SeashoreHouse_Text_BagFull: @ 826973A .string "Oh, but hey, your BAG's jammed full.\n" .string "I'll hang on to these for you.$" -Route109_SeashoreHouse_Text_26977E: @ 826977E +Route109_SeashoreHouse_Text_WantToBuySodaPop: @ 826977E .string "Want to buy some SODA POP?\n" .string "POKéMON love it!\p" .string "Just ¥300 a bottle!\n" .string "Buy some!$" -Route109_SeashoreHouse_Text_2697C8: @ 82697C8 +Route109_SeashoreHouse_Text_HereYouGo: @ 82697C8 .string "Here you go!$" -Route109_SeashoreHouse_Text_2697D5: @ 82697D5 +Route109_SeashoreHouse_Text_NotEnoughMoney: @ 82697D5 .string "You don't have the money.$" -Route109_SeashoreHouse_Text_2697EF: @ 82697EF +Route109_SeashoreHouse_Text_ThatsTooBad: @ 82697EF .string "No?\n" .string "That's too bad.$" -Route109_SeashoreHouse_Text_269803: @ 8269803 +Route109_SeashoreHouse_Text_DwayneIntro: @ 8269803 .string "If you're looking for a battle in the\n" .string "SEASHORE HOUSE, you'll find no\l" .string "hotter TRAINER than me, matey!$" -Route109_SeashoreHouse_Text_269867: @ 8269867 +Route109_SeashoreHouse_Text_DwayneDefeated: @ 8269867 .string "That was a hot battle!\n" .string "I can accept that loss, matey!$" -Route109_SeashoreHouse_Text_26989D: @ 826989D +Route109_SeashoreHouse_Text_DwaynePostBattle: @ 826989D .string "Whenever I'm in SLATEPORT, I enjoy\n" .string "hot battles and ice-cold SODA POP!$" -Route109_SeashoreHouse_Text_2698E3: @ 82698E3 +Route109_SeashoreHouse_Text_JohannaIntro: @ 82698E3 .string "Boring battles aren't worth the effort.\p" .string "Fiery hot battles are what toughen up\n" .string "TRAINERS and POKéMON!$" -Route109_SeashoreHouse_Text_269947: @ 8269947 +Route109_SeashoreHouse_Text_JohannaDefeated: @ 8269947 .string "That's hot!$" -Route109_SeashoreHouse_Text_269953: @ 8269953 +Route109_SeashoreHouse_Text_JohannaPostBattle: @ 8269953 .string "Whew, I'm all thirsty.\n" .string "Maybe I'll have a SODA POP.$" -Route109_SeashoreHouse_Text_269986: @ 8269986 +Route109_SeashoreHouse_Text_SimonIntro: @ 8269986 .string "I'm going to show you how great\n" .string "my POKéMON are, but don't cry!$" -Route109_SeashoreHouse_Text_2699C5: @ 82699C5 +Route109_SeashoreHouse_Text_SimonDefeated: @ 82699C5 .string "…I lost, but I won't cry…$" -Route109_SeashoreHouse_Text_2699DF: @ 82699DF +Route109_SeashoreHouse_Text_SimonPostBattle: @ 82699DF .string "If one of my POKéMON knew the move\n" .string "for carrying me across water on its\l" .string "back, I could get rid of this inner tube.$" diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json index 570c38dcc..660f24ccc 100644 --- a/data/maps/Route110/map.json +++ b/data/maps/Route110/map.json @@ -40,7 +40,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF338", + "script": "Route110_EventScript_Boy2", "flag": "0" }, { @@ -53,7 +53,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF32F", + "script": "Route110_EventScript_CyclingGuy2", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF326", + "script": "Route110_EventScript_OldWoman", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF314", + "script": "Route110_EventScript_CyclingGuy1", "flag": "0" }, { @@ -92,7 +92,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF31D", + "script": "Route110_EventScript_OldMan", "flag": "0" }, { @@ -105,7 +105,7 @@ "movement_range_y": 3, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF30B", + "script": "Route110_EventScript_CyclingGirl1", "flag": "0" }, { @@ -118,7 +118,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF302", + "script": "Route110_EventScript_Boy1", "flag": "0" }, { @@ -131,7 +131,7 @@ "movement_range_y": 14, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route110_EventScript_1EF529", + "script": "Route110_EventScript_Jasmine", "flag": "0" }, { @@ -144,7 +144,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route110_EventScript_1EF4B0", + "script": "Route110_EventScript_Anthony", "flag": "0" }, { @@ -157,7 +157,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route110_EventScript_1EF540", + "script": "Route110_EventScript_Abigail", "flag": "0" }, { @@ -170,7 +170,7 @@ "movement_range_y": 4, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route110_EventScript_1EF4C7", + "script": "Route110_EventScript_Benjamin", "flag": "0" }, { @@ -183,7 +183,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route110_EventScript_1EF3F2", + "script": "Route110_EventScript_Edward", "flag": "0" }, { @@ -196,7 +196,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_EventScript_1EF409", + "script": "Route110_EventScript_Jaclyn", "flag": "0" }, { @@ -209,7 +209,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route110_EventScript_1EF420", + "script": "Route110_EventScript_Edwin", "flag": "0" }, { @@ -222,7 +222,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route110_EventScript_1EF482", + "script": "Route110_EventScript_Dale", "flag": "0" }, { @@ -300,7 +300,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF3B7", + "script": "Route110_EventScript_ChallengeGuy", "flag": "0" }, { @@ -313,7 +313,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF2AA", + "script": "Route110_EventScript_AquaGrunt1", "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, { @@ -326,7 +326,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF2C0", + "script": "Route110_EventScript_AquaGrunt2", "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, { @@ -339,7 +339,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF2D6", + "script": "Route110_EventScript_AquaGrunt3", "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, { @@ -352,7 +352,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_EventScript_1EF2EC", + "script": "Route110_EventScript_AquaGrunt4", "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, { @@ -378,7 +378,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route110_EventScript_1EF499", + "script": "Route110_EventScript_Jacob", "flag": "0" }, { @@ -417,7 +417,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route110_EventScript_1EF604", + "script": "Route110_EventScript_Timmy", "flag": "0" }, { @@ -430,7 +430,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route110_EventScript_1EF5A2", + "script": "Route110_EventScript_Isabel", "flag": "0" }, { @@ -443,7 +443,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route110_EventScript_1EF61C", + "script": "Route110_EventScript_Kaleb", "flag": "0" }, { @@ -456,7 +456,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route110_EventScript_1EF64A", + "script": "Route110_EventScript_Alyssa", "flag": "0" }, { @@ -469,7 +469,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route110_EventScript_1EF633", + "script": "Route110_EventScript_Joseph", "flag": "0" }, { @@ -551,7 +551,7 @@ "elevation": 3, "var": "VAR_CYCLING_CHALLENGE_STATE", "var_value": "2", - "script": "Route110_EventScript_1EF661" + "script": "Route110_EventScript_CyclingChallengeEnd" }, { "type": "trigger", @@ -560,7 +560,7 @@ "elevation": 3, "var": "VAR_CYCLING_CHALLENGE_STATE", "var_value": "2", - "script": "Route110_EventScript_1EF661" + "script": "Route110_EventScript_CyclingChallengeEnd" }, { "type": "trigger", @@ -569,7 +569,7 @@ "elevation": 3, "var": "VAR_ROUTE110_STATE", "var_value": "0", - "script": "Route110_EventScript_1EF74D" + "script": "Route110_EventScript_RivalTrigger1" }, { "type": "trigger", @@ -578,7 +578,7 @@ "elevation": 3, "var": "VAR_ROUTE110_STATE", "var_value": "0", - "script": "Route110_EventScript_1EF758" + "script": "Route110_EventScript_RivalTrigger2" }, { "type": "trigger", @@ -587,7 +587,7 @@ "elevation": 3, "var": "VAR_ROUTE110_STATE", "var_value": "0", - "script": "Route110_EventScript_1EF763" + "script": "Route110_EventScript_RivalTrigger3" }, { "type": "trigger", @@ -596,7 +596,7 @@ "elevation": 3, "var": "VAR_REGISTER_BIRCH_STATE", "var_value": "1", - "script": "Route110_EventScript_1EF9CB" + "script": "Route110_EventScript_BirchScene1" }, { "type": "trigger", @@ -605,7 +605,7 @@ "elevation": 3, "var": "VAR_REGISTER_BIRCH_STATE", "var_value": "1", - "script": "Route110_EventScript_1EF9D6" + "script": "Route110_EventScript_BirchScene2" }, { "type": "trigger", @@ -614,7 +614,7 @@ "elevation": 3, "var": "VAR_REGISTER_BIRCH_STATE", "var_value": "1", - "script": "Route110_EventScript_1EF9E1" + "script": "Route110_EventScript_BirchScene3" }, { "type": "trigger", @@ -623,7 +623,7 @@ "elevation": 3, "var": "VAR_REGISTER_BIRCH_STATE", "var_value": "1", - "script": "Route110_EventScript_1EF9EC" + "script": "Route110_EventScript_BirchScene4" } ], "bg_events": [ @@ -633,7 +633,7 @@ "y": 25, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_EventScript_1EF353" + "script": "Route110_EventScript_VandalizedSign" }, { "type": "sign", @@ -641,7 +641,7 @@ "y": 51, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_EventScript_1EF365" + "script": "Route110_EventScript_SeasideParkingSign" }, { "type": "sign", @@ -649,7 +649,7 @@ "y": 88, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_EventScript_1EF34A" + "script": "Route110_EventScript_CyclingRoadSign" }, { "type": "sign", @@ -657,7 +657,7 @@ "y": 94, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_EventScript_1EF341" + "script": "Route110_EventScript_SlateportCitySign" }, { "type": "sign", @@ -665,7 +665,7 @@ "y": 79, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_EventScript_1EF35C" + "script": "Route110_EventScript_Route103Sign" }, { "type": "sign", @@ -673,7 +673,7 @@ "y": 17, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_EventScript_1EF36E" + "script": "Route110_EventScript_MauvilleCitySign" }, { "type": "secret_base", @@ -695,7 +695,7 @@ "y": 39, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_EventScript_1EF377" + "script": "Route110_EventScript_TrainerTipsPrlzSleep" }, { "type": "sign", @@ -703,7 +703,7 @@ "y": 70, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_EventScript_1EF380" + "script": "Route110_EventScript_TrainerTipsRegisterItems" }, { "type": "sign", @@ -711,7 +711,7 @@ "y": 67, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_EventScript_1EF389" + "script": "Route110_EventScript_TrickHouseSign" }, { "type": "sign", @@ -719,7 +719,7 @@ "y": 93, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_EventScript_1EF392" + "script": "Route110_EventScript_CyclingRoadResultsSign" }, { "type": "hidden_item", @@ -759,7 +759,7 @@ "y": 16, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route110_EventScript_1EF34A" + "script": "Route110_EventScript_CyclingRoadSign" } ] } diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 67fbbd0a8..0a8b6eafc 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -1,313 +1,313 @@ Route110_MapScripts:: @ 81EF269 - map_script MAP_SCRIPT_ON_RESUME, Route110_MapScript1_1EF279 + map_script MAP_SCRIPT_ON_RESUME, Route110_OnResume map_script MAP_SCRIPT_ON_TRANSITION, Route110_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_MapScript2_1EF297 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_OnFrame .byte 0 -Route110_MapScript1_1EF279: @ 81EF279 +Route110_OnResume: @ 81EF279 special UpdateCyclingRoadState end Route110_OnTransition: @ 81EF27D - call Common_EventScript_SetupRivalGender - call Common_EventScript_SetupRivalOnBikeGender + call Common_EventScript_SetupRivalGfxId + call Common_EventScript_SetupRivalOnBikeGfxId compare VAR_CYCLING_CHALLENGE_STATE, 1 - call_if_eq Route110_EventScript_1EF293 + call_if_eq Route110_EventScript_SaveCyclingMusic end -Route110_EventScript_1EF293:: @ 81EF293 +Route110_EventScript_SaveCyclingMusic:: @ 81EF293 savebgm MUS_CYCLING return -Route110_MapScript2_1EF297: @ 81EF297 - map_script_2 VAR_CYCLING_CHALLENGE_STATE, 1, Route110_EventScript_1EF2A1 +Route110_OnFrame: @ 81EF297 + map_script_2 VAR_CYCLING_CHALLENGE_STATE, 1, Route110_EventScript_BeginCylcingRoadChallenge .2byte 0 -Route110_EventScript_1EF2A1:: @ 81EF2A1 +Route110_EventScript_BeginCylcingRoadChallenge:: @ 81EF2A1 special Special_BeginCyclingRoadChallenge setvar VAR_CYCLING_CHALLENGE_STATE, 2 return -Route110_EventScript_1EF2AA:: @ 81EF2AA +Route110_EventScript_AquaGrunt1:: @ 81EF2AA lock faceplayer - msgbox Route110_Text_1EFB5D, MSGBOX_DEFAULT + msgbox Route110_Text_WeCantTalkAboutAquaActivities, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -Route110_EventScript_1EF2C0:: @ 81EF2C0 +Route110_EventScript_AquaGrunt2:: @ 81EF2C0 lock faceplayer - msgbox Route110_Text_1EFB93, MSGBOX_DEFAULT + msgbox Route110_Text_KickUpARuckus, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -Route110_EventScript_1EF2D6:: @ 81EF2D6 +Route110_EventScript_AquaGrunt3:: @ 81EF2D6 lock faceplayer - msgbox Route110_Text_1EFBCA, MSGBOX_DEFAULT + msgbox Route110_Text_MyFirstJobInAqua, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -Route110_EventScript_1EF2EC:: @ 81EF2EC +Route110_EventScript_AquaGrunt4:: @ 81EF2EC lock faceplayer - msgbox Route110_Text_1EFC0D, MSGBOX_DEFAULT + msgbox Route110_Text_AquaActionsBringSmiles, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -Route110_EventScript_1EF302:: @ 81EF302 - msgbox Route110_Text_1EFFC3, MSGBOX_NPC +Route110_EventScript_Boy1:: @ 81EF302 + msgbox Route110_Text_RideBikeAtFullSpeed, MSGBOX_NPC end -Route110_EventScript_1EF30B:: @ 81EF30B - msgbox Route110_Text_1F0006, MSGBOX_NPC +Route110_EventScript_CyclingGirl1:: @ 81EF30B + msgbox Route110_Text_HairStreamsBehindMe, MSGBOX_NPC end -Route110_EventScript_1EF314:: @ 81EF314 - msgbox Route110_Text_1F006A, MSGBOX_NPC +Route110_EventScript_CyclingGuy1:: @ 81EF314 + msgbox Route110_Text_YouGotBikeFromRydel, MSGBOX_NPC end -Route110_EventScript_1EF31D:: @ 81EF31D - msgbox Route110_Text_1F0261, MSGBOX_NPC +Route110_EventScript_OldMan:: @ 81EF31D + msgbox Route110_Text_TwoRoads, MSGBOX_NPC end -Route110_EventScript_1EF326:: @ 81EF326 - msgbox Route110_Text_1F02CA, MSGBOX_NPC +Route110_EventScript_OldWoman:: @ 81EF326 + msgbox Route110_Text_WalkOnTheLowRoad, MSGBOX_NPC end -Route110_EventScript_1EF32F:: @ 81EF32F - msgbox Route110_Text_1F030E, MSGBOX_NPC +Route110_EventScript_CyclingGuy2:: @ 81EF32F + msgbox Route110_Text_BikeTechniques, MSGBOX_NPC end -Route110_EventScript_1EF338:: @ 81EF338 - msgbox Route110_Text_1F0390, MSGBOX_NPC +Route110_EventScript_Boy2:: @ 81EF338 + msgbox Route110_Text_WhichShouldIChoose, MSGBOX_NPC end -Route110_EventScript_1EF341:: @ 81EF341 - msgbox Route110_Text_1F0812, MSGBOX_SIGN +Route110_EventScript_SlateportCitySign:: @ 81EF341 + msgbox Route110_Text_SlateportCitySign, MSGBOX_SIGN end -Route110_EventScript_1EF34A:: @ 81EF34A - msgbox Route110_Text_1F082D, MSGBOX_SIGN +Route110_EventScript_CyclingRoadSign:: @ 81EF34A + msgbox Route110_Text_CyclingRoadSign, MSGBOX_SIGN end -Route110_EventScript_1EF353:: @ 81EF353 - msgbox Route110_Text_1F0842, MSGBOX_SIGN +Route110_EventScript_VandalizedSign:: @ 81EF353 + msgbox Route110_Text_AquaWasHere, MSGBOX_SIGN end -Route110_EventScript_1EF35C:: @ 81EF35C - msgbox Route110_Text_1F08CD, MSGBOX_SIGN +Route110_EventScript_Route103Sign:: @ 81EF35C + msgbox Route110_Text_Route103Sign, MSGBOX_SIGN end -Route110_EventScript_1EF365:: @ 81EF365 - msgbox Route110_Text_1F08E3, MSGBOX_SIGN +Route110_EventScript_SeasideParkingSign:: @ 81EF365 + msgbox Route110_Text_SeasideParkingSign, MSGBOX_SIGN end -Route110_EventScript_1EF36E:: @ 81EF36E - msgbox Route110_Text_1F08F3, MSGBOX_SIGN +Route110_EventScript_MauvilleCitySign:: @ 81EF36E + msgbox Route110_Text_MauvilleCitySign, MSGBOX_SIGN end -Route110_EventScript_1EF377:: @ 81EF377 - msgbox Route110_Text_1F090D, MSGBOX_SIGN +Route110_EventScript_TrainerTipsPrlzSleep:: @ 81EF377 + msgbox Route110_Text_TrainerTipsPrlzSleep, MSGBOX_SIGN end -Route110_EventScript_1EF380:: @ 81EF380 - msgbox Route110_Text_1F0992, MSGBOX_SIGN +Route110_EventScript_TrainerTipsRegisterItems:: @ 81EF380 + msgbox Route110_Text_TrainerTipsRegisterItems, MSGBOX_SIGN end -Route110_EventScript_1EF389:: @ 81EF389 - msgbox Route110_Text_1F09DB, MSGBOX_SIGN +Route110_EventScript_TrickHouseSign:: @ 81EF389 + msgbox Route110_Text_TrickHouseSign, MSGBOX_SIGN end -Route110_EventScript_1EF392:: @ 81EF392 +Route110_EventScript_CyclingRoadResultsSign:: @ 81EF392 lockall specialvar VAR_RESULT, GetRecordedCyclingRoadResults - compare VAR_RESULT, 0 - goto_if_eq Route110_EventScript_1EF3AD - msgbox Route110_Text_1F0A1E, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq Route110_EventScript_NoRecordSet + msgbox Route110_Text_BestRecord, MSGBOX_DEFAULT releaseall end -Route110_EventScript_1EF3AD:: @ 81EF3AD - msgbox Route110_Text_1F0A5E, MSGBOX_DEFAULT +Route110_EventScript_NoRecordSet:: @ 81EF3AD + msgbox Route110_Text_ThereIsNoRecord, MSGBOX_DEFAULT releaseall end -Route110_EventScript_1EF3B7:: @ 81EF3B7 +Route110_EventScript_ChallengeGuy:: @ 81EF3B7 lock faceplayer specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 1 - goto_if_eq Route110_EventScript_1EF3E8 + goto_if_eq Route110_EventScript_PlayerRidingAcroBike compare VAR_CYCLING_CHALLENGE_STATE, 0 - goto_if_eq Route110_EventScript_1EF3DE - msgbox Route110_Text_1F06FB, MSGBOX_DEFAULT + goto_if_eq Route110_EventScript_PlayerNotRidingBike + msgbox Route110_Text_AlwaysAimHigher, MSGBOX_DEFAULT release end -Route110_EventScript_1EF3DE:: @ 81EF3DE - msgbox Route110_Text_1F0661, MSGBOX_DEFAULT +Route110_EventScript_PlayerNotRidingBike:: @ 81EF3DE + msgbox Route110_Text_RatedForNumberOfCollisions, MSGBOX_DEFAULT release end -Route110_EventScript_1EF3E8:: @ 81EF3E8 - msgbox Route110_Text_1F0755, MSGBOX_DEFAULT +Route110_EventScript_PlayerRidingAcroBike:: @ 81EF3E8 + msgbox Route110_Text_AcroBikesDoNotQualify, MSGBOX_DEFAULT release end -Route110_EventScript_1EF3F2:: @ 81EF3F2 - trainerbattle_single TRAINER_EDWARD, Route110_Text_29802B, Route110_Text_298064 - msgbox Route110_Text_29808A, MSGBOX_AUTOCLOSE +Route110_EventScript_Edward:: @ 81EF3F2 + trainerbattle_single TRAINER_EDWARD, Route110_Text_EdwardIntro, Route110_Text_EdwardDefeated + msgbox Route110_Text_EdwardPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF409:: @ 81EF409 - trainerbattle_single TRAINER_JACLYN, Route110_Text_2980B9, Route110_Text_2980E5 - msgbox Route110_Text_2980F8, MSGBOX_AUTOCLOSE +Route110_EventScript_Jaclyn:: @ 81EF409 + trainerbattle_single TRAINER_JACLYN, Route110_Text_JaclynIntro, Route110_Text_JaclynDefeated + msgbox Route110_Text_JaclynPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF420:: @ 81EF420 - trainerbattle_single TRAINER_EDWIN_1, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C +Route110_EventScript_Edwin:: @ 81EF420 + trainerbattle_single TRAINER_EDWIN_1, Route110_Text_EdwinIntro, Route110_Text_EdwinDefeated, Route110_EventScript_EdwinRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route110_EventScript_1EF46B - msgbox Route110_Text_2981B3, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route110_EventScript_EdwinRematch + msgbox Route110_Text_EdwinPostBattle, MSGBOX_DEFAULT release end -Route110_EventScript_1EF44C:: @ 81EF44C - special sub_80B4808 +Route110_EventScript_EdwinRegisterMatchCallAfterBattle:: @ 81EF44C + special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route110_Text_298201, MSGBOX_DEFAULT + msgbox Route110_Text_EdwinRegister, MSGBOX_DEFAULT register_matchcall TRAINER_EDWIN_1 release end -Route110_EventScript_1EF46B:: @ 81EF46B - trainerbattle_rematch TRAINER_EDWIN_1, Route110_Text_298232, Route110_Text_298288 - msgbox Route110_Text_2982A2, MSGBOX_AUTOCLOSE +Route110_EventScript_EdwinRematch:: @ 81EF46B + trainerbattle_rematch TRAINER_EDWIN_1, Route110_Text_EdwinRematchIntro, Route110_Text_EdwinRematchDefeated + msgbox Route110_Text_EdwinRematchPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF482:: @ 81EF482 - trainerbattle_single TRAINER_DALE, Route110_Text_2982CC, Route110_Text_2982F5 - msgbox Route110_Text_298303, MSGBOX_AUTOCLOSE +Route110_EventScript_Dale:: @ 81EF482 + trainerbattle_single TRAINER_DALE, Route110_Text_DaleIntro, Route110_Text_DaleDefeated + msgbox Route110_Text_DalePostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF499:: @ 81EF499 - trainerbattle_single TRAINER_JACOB, Route110_Text_297B3F, Route110_Text_297B77 - msgbox Route110_Text_297B8F, MSGBOX_AUTOCLOSE +Route110_EventScript_Jacob:: @ 81EF499 + trainerbattle_single TRAINER_JACOB, Route110_Text_JacobIntro, Route110_Text_JacobDefeated + msgbox Route110_Text_JacobPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF4B0:: @ 81EF4B0 - trainerbattle_single TRAINER_ANTHONY, Route110_Text_297BE7, Route110_Text_297C0F - msgbox Route110_Text_297C1F, MSGBOX_AUTOCLOSE +Route110_EventScript_Anthony:: @ 81EF4B0 + trainerbattle_single TRAINER_ANTHONY, Route110_Text_AnthonyIntro, Route110_Text_AnthonyDefeated + msgbox Route110_Text_AnthonyPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF4C7:: @ 81EF4C7 - trainerbattle_single TRAINER_BENJAMIN_1, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3 +Route110_EventScript_Benjamin:: @ 81EF4C7 + trainerbattle_single TRAINER_BENJAMIN_1, Route110_Text_BenjaminIntro, Route110_Text_BenjaminDefeated, Route110_EventScript_BenjaminRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route110_EventScript_1EF512 - msgbox Route110_Text_297CB4, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route110_EventScript_BenjaminRematch + msgbox Route110_Text_BenjaminPostBattle, MSGBOX_DEFAULT release end -Route110_EventScript_1EF4F3:: @ 81EF4F3 - special sub_80B4808 +Route110_EventScript_BenjaminRegisterMatchCallAfterBattle:: @ 81EF4F3 + special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route110_Text_297CFE, MSGBOX_DEFAULT + msgbox Route110_Text_BenjaminRegister, MSGBOX_DEFAULT register_matchcall TRAINER_BENJAMIN_1 release end -Route110_EventScript_1EF512:: @ 81EF512 - trainerbattle_rematch TRAINER_BENJAMIN_1, Route110_Text_297D4B, Route110_Text_297D8E - msgbox Route110_Text_297DB0, MSGBOX_AUTOCLOSE +Route110_EventScript_BenjaminRematch:: @ 81EF512 + trainerbattle_rematch TRAINER_BENJAMIN_1, Route110_Text_BenjaminRematchIntro, Route110_Text_BenjaminRematchDefeated + msgbox Route110_Text_BenjaminRematchPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF529:: @ 81EF529 - trainerbattle_single TRAINER_JASMINE, Route110_Text_297F93, Route110_Text_297FD0 - msgbox Route110_Text_297FF1, MSGBOX_AUTOCLOSE +Route110_EventScript_Jasmine:: @ 81EF529 + trainerbattle_single TRAINER_JASMINE, Route110_Text_JasmineIntro, Route110_Text_JasmineDefeated + msgbox Route110_Text_JasminePostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF540:: @ 81EF540 - trainerbattle_single TRAINER_ABIGAIL_1, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C +Route110_EventScript_Abigail:: @ 81EF540 + trainerbattle_single TRAINER_ABIGAIL_1, Route110_Text_AbigailIntro, Route110_Text_AbigailDefeated, Route110_EventScript_AbigailRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route110_EventScript_1EF58B - msgbox Route110_Text_297E88, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route110_EventScript_AbigailRematch + msgbox Route110_Text_AbigailPostBattle, MSGBOX_DEFAULT release end -Route110_EventScript_1EF56C:: @ 81EF56C - special sub_80B4808 +Route110_EventScript_AbigailRegisterMatchCallAfterBattle:: @ 81EF56C + special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route110_Text_297ECD, MSGBOX_DEFAULT + msgbox Route110_Text_AbigailRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ABIGAIL_1 release end -Route110_EventScript_1EF58B:: @ 81EF58B - trainerbattle_rematch TRAINER_ABIGAIL_1, Route110_Text_297F09, Route110_Text_297F37 - msgbox Route110_Text_297F58, MSGBOX_AUTOCLOSE +Route110_EventScript_AbigailRematch:: @ 81EF58B + trainerbattle_rematch TRAINER_ABIGAIL_1, Route110_Text_AbigailRematchIntro, Route110_Text_AbigailRematchDefeated + msgbox Route110_Text_AbigailRematchPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF5A2:: @ 81EF5A2 - trainerbattle_single TRAINER_ISABEL_1, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE +Route110_EventScript_Isabel:: @ 81EF5A2 + trainerbattle_single TRAINER_ISABEL_1, Route110_Text_IsabelIntro, Route110_Text_IsabelDefeated, Route110_EventScript_IsabelRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route110_EventScript_1EF5ED - msgbox Route110_Text_2983A2, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route110_EventScript_IsabelRematch + msgbox Route110_Text_IsabelPostBattle, MSGBOX_DEFAULT release end -Route110_EventScript_1EF5CE:: @ 81EF5CE - special sub_80B4808 +Route110_EventScript_IsabelRegisterMatchCallAfterBattle:: @ 81EF5CE + special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route110_Text_2983EE, MSGBOX_DEFAULT + msgbox Route110_Text_IsabelRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ISABEL_1 release end -Route110_EventScript_1EF5ED:: @ 81EF5ED - trainerbattle_rematch TRAINER_ISABEL_1, Route110_Text_298466, Route110_Text_2984AF - msgbox Route110_Text_2984C8, MSGBOX_AUTOCLOSE +Route110_EventScript_IsabelRematch:: @ 81EF5ED + trainerbattle_rematch TRAINER_ISABEL_1, Route110_Text_IsabelRematchIntro, Route110_Text_IsabelRematchDefeated + msgbox Route110_Text_IsabelRematchPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF604:: @ 81EF604 - trainerbattle_single TRAINER_TIMMY, Route110_Text_298525, Route110_Text_298559 - msgbox Route110_Text_298579, MSGBOX_AUTOCLOSE +Route110_EventScript_Timmy:: @ 81EF604 + trainerbattle_single TRAINER_TIMMY, Route110_Text_TimmyIntro, Route110_Text_TimmyDefeated + msgbox Route110_Text_TimmyPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF61B:: @ 81EF61B +Route110_EventScript_Unused:: @ 81EF61B end -Route110_EventScript_1EF61C:: @ 81EF61C - trainerbattle_single TRAINER_KALEB, Route110_Text_2986ED, Route110_Text_298735 - msgbox Route110_Text_298755, MSGBOX_AUTOCLOSE +Route110_EventScript_Kaleb:: @ 81EF61C + trainerbattle_single TRAINER_KALEB, Route110_Text_KalebIntro, Route110_Text_KalebDefeated + msgbox Route110_Text_KalebPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF633:: @ 81EF633 - trainerbattle_single TRAINER_JOSEPH, Route110_Text_298642, Route110_Text_298686 - msgbox Route110_Text_2986A9, MSGBOX_AUTOCLOSE +Route110_EventScript_Joseph:: @ 81EF633 + trainerbattle_single TRAINER_JOSEPH, Route110_Text_JosephIntro, Route110_Text_JosephDefeated + msgbox Route110_Text_JosephPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF64A:: @ 81EF64A - trainerbattle_single TRAINER_ALYSSA, Route110_Text_2985AB, Route110_Text_2985F9 - msgbox Route110_Text_298612, MSGBOX_AUTOCLOSE +Route110_EventScript_Alyssa:: @ 81EF64A + trainerbattle_single TRAINER_ALYSSA, Route110_Text_AlyssaIntro, Route110_Text_AlyssaDefeated + msgbox Route110_Text_AlyssaPostBattle, MSGBOX_AUTOCLOSE end -Route110_EventScript_1EF661:: @ 81EF661 +Route110_EventScript_CyclingChallengeEnd:: @ 81EF661 lockall - applymovement 21, Common_Movement_WalkInPlaceRight + applymovement 21, Common_Movement_WalkInPlaceFastestRight waitmovement 0 call Route110_EventScript_1EF673 releaseall @@ -315,75 +315,75 @@ Route110_EventScript_1EF661:: @ 81EF661 Route110_EventScript_1EF673:: @ 81EF673 special FinishCyclingRoadChallenge - msgbox Route110_Text_1F03FF, MSGBOX_DEFAULT + msgbox Route110_Text_CyclingChallengeResultSummary, MSGBOX_DEFAULT switch VAR_RESULT - case 10, Route110_EventScript_1EF6FD - case 9, Route110_EventScript_1EF70B - case 8, Route110_EventScript_1EF70B - case 7, Route110_EventScript_1EF70B - case 6, Route110_EventScript_1EF719 - case 5, Route110_EventScript_1EF719 - case 4, Route110_EventScript_1EF719 - case 3, Route110_EventScript_1EF727 - case 2, Route110_EventScript_1EF727 - case 1, Route110_EventScript_1EF727 - case 0, Route110_EventScript_1EF735 + case 10, Route110_EventScript_ChallengeReactionBest + case 9, Route110_EventScript_ChallengeReactionGood + case 8, Route110_EventScript_ChallengeReactionGood + case 7, Route110_EventScript_ChallengeReactionGood + case 6, Route110_EventScript_ChallengeReactionOk + case 5, Route110_EventScript_ChallengeReactionOk + case 4, Route110_EventScript_ChallengeReactionOk + case 3, Route110_EventScript_ChallengeReactionBad + case 2, Route110_EventScript_ChallengeReactionBad + case 1, Route110_EventScript_ChallengeReactionBad + case 0, Route110_EventScript_ChallengeReactionWorst end -Route110_EventScript_1EF6FD:: @ 81EF6FD - msgbox Route110_Text_1F0431, MSGBOX_DEFAULT - goto Route110_EventScript_1EF743 +Route110_EventScript_ChallengeReactionBest:: @ 81EF6FD + msgbox Route110_Text_ChallengeReactionBest, MSGBOX_DEFAULT + goto Route110_EventScript_EndChallenge end -Route110_EventScript_1EF70B:: @ 81EF70B - msgbox Route110_Text_1F04A4, MSGBOX_DEFAULT - goto Route110_EventScript_1EF743 +Route110_EventScript_ChallengeReactionGood:: @ 81EF70B + msgbox Route110_Text_ChallengeReactionGood, MSGBOX_DEFAULT + goto Route110_EventScript_EndChallenge end -Route110_EventScript_1EF719:: @ 81EF719 - msgbox Route110_Text_1F0500, MSGBOX_DEFAULT - goto Route110_EventScript_1EF743 +Route110_EventScript_ChallengeReactionOk:: @ 81EF719 + msgbox Route110_Text_ChallengeReactionOk, MSGBOX_DEFAULT + goto Route110_EventScript_EndChallenge end -Route110_EventScript_1EF727:: @ 81EF727 - msgbox Route110_Text_1F0567, MSGBOX_DEFAULT - goto Route110_EventScript_1EF743 +Route110_EventScript_ChallengeReactionBad:: @ 81EF727 + msgbox Route110_Text_ChallengeReactionBad, MSGBOX_DEFAULT + goto Route110_EventScript_EndChallenge end -Route110_EventScript_1EF735:: @ 81EF735 - msgbox Route110_Text_1F05CE, MSGBOX_DEFAULT - goto Route110_EventScript_1EF743 +Route110_EventScript_ChallengeReactionWorst:: @ 81EF735 + msgbox Route110_Text_ChallengeReactionWorst, MSGBOX_DEFAULT + goto Route110_EventScript_EndChallenge end -Route110_EventScript_1EF743:: @ 81EF743 +Route110_EventScript_EndChallenge:: @ 81EF743 setvar VAR_CYCLING_CHALLENGE_STATE, 3 savebgm MUS_DUMMY fadedefaultbgm return -Route110_EventScript_1EF74D:: @ 81EF74D +Route110_EventScript_RivalTrigger1:: @ 81EF74D setvar VAR_0x8008, 1 - goto Route110_EventScript_1EF76E + goto Route110_EventScript_RivalScene end -Route110_EventScript_1EF758:: @ 81EF758 +Route110_EventScript_RivalTrigger2:: @ 81EF758 setvar VAR_0x8008, 2 - goto Route110_EventScript_1EF76E + goto Route110_EventScript_RivalScene end -Route110_EventScript_1EF763:: @ 81EF763 +Route110_EventScript_RivalTrigger3:: @ 81EF763 setvar VAR_0x8008, 3 - goto Route110_EventScript_1EF76E + goto Route110_EventScript_RivalScene end -Route110_EventScript_1EF76E:: @ 81EF76E +Route110_EventScript_RivalScene:: @ 81EF76E lockall checkplayergender compare VAR_RESULT, MALE - call_if_eq Route110_EventScript_1EF7E1 + call_if_eq Route110_EventScript_PlayMayMusic compare VAR_RESULT, FEMALE - call_if_eq Route110_EventScript_1EF7E6 - applymovement 28, Common_Movement_WalkInPlaceDown + call_if_eq Route110_EventScript_PlayBrendanMusic + applymovement 28, Common_Movement_WalkInPlaceFastestDown waitmovement 0 applymovement 28, Common_Movement_ExclamationMark waitmovement 0 @@ -391,110 +391,110 @@ Route110_EventScript_1EF76E:: @ 81EF76E waitmovement 0 delay 30 compare VAR_0x8008, 1 - call_if_eq Route110_EventScript_1EF94E + call_if_eq Route110_EventScript_RivalApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq Route110_EventScript_1EF959 + call_if_eq Route110_EventScript_RivalApproachPlayer2 compare VAR_0x8008, 3 - call_if_eq Route110_EventScript_1EF964 + call_if_eq Route110_EventScript_RivalApproachPlayer3 checkplayergender compare VAR_RESULT, MALE - goto_if_eq Route110_EventScript_1EF7EB + goto_if_eq Route110_EventScript_MayBattle compare VAR_RESULT, FEMALE - goto_if_eq Route110_EventScript_1EF865 + goto_if_eq Route110_EventScript_BrendanBattle releaseall end -Route110_EventScript_1EF7E1:: @ 81EF7E1 +Route110_EventScript_PlayMayMusic:: @ 81EF7E1 playbgm MUS_GIRL_SUP, 1 return -Route110_EventScript_1EF7E6:: @ 81EF7E6 +Route110_EventScript_PlayBrendanMusic:: @ 81EF7E6 playbgm MUS_BOY_SUP, 1 return -Route110_EventScript_1EF7EB:: @ 81EF7EB - msgbox Route110_Text_1EFC48, MSGBOX_DEFAULT +Route110_EventScript_MayBattle:: @ 81EF7EB + msgbox Route110_Text_MayLetsBattle, MSGBOX_DEFAULT switch VAR_STARTER_MON - case 0, Route110_EventScript_1EF81A - case 1, Route110_EventScript_1EF82A - case 2, Route110_EventScript_1EF83A + case 0, Route110_EventScript_MayBattleTreecko + case 1, Route110_EventScript_MayBattleTorchic + case 2, Route110_EventScript_MayBattleMudkip end -Route110_EventScript_1EF81A:: @ 81EF81A - trainerbattle_no_intro TRAINER_MAY_5, Route110_Text_1EFCCB - goto Route110_EventScript_1EF84A +Route110_EventScript_MayBattleTreecko:: @ 81EF81A + trainerbattle_no_intro TRAINER_MAY_5, Route110_Text_MayDefeated + goto Route110_EventScript_MayDefeated end -Route110_EventScript_1EF82A:: @ 81EF82A - trainerbattle_no_intro TRAINER_MAY_8, Route110_Text_1EFCCB - goto Route110_EventScript_1EF84A +Route110_EventScript_MayBattleTorchic:: @ 81EF82A + trainerbattle_no_intro TRAINER_MAY_8, Route110_Text_MayDefeated + goto Route110_EventScript_MayDefeated end -Route110_EventScript_1EF83A:: @ 81EF83A - trainerbattle_no_intro TRAINER_MAY_2, Route110_Text_1EFCCB - goto Route110_EventScript_1EF84A +Route110_EventScript_MayBattleMudkip:: @ 81EF83A + trainerbattle_no_intro TRAINER_MAY_2, Route110_Text_MayDefeated + goto Route110_EventScript_MayDefeated end -Route110_EventScript_1EF84A:: @ 81EF84A - msgbox Route110_Text_1EFCF1, MSGBOX_DEFAULT - call Route110_EventScript_1EF8DF - msgbox Route110_Text_1EFD58, MSGBOX_DEFAULT - goto Route110_EventScript_1EF8EC +Route110_EventScript_MayDefeated:: @ 81EF84A + msgbox Route110_Text_MayTakeThis, MSGBOX_DEFAULT + call Route110_EventScript_GiveItemfinder + msgbox Route110_Text_MayExplainItemfinder, MSGBOX_DEFAULT + goto Route110_EventScript_RivalExit end -Route110_EventScript_1EF865:: @ 81EF865 - msgbox Route110_Text_1EFE3F, MSGBOX_DEFAULT +Route110_EventScript_BrendanBattle:: @ 81EF865 + msgbox Route110_Text_BrendayLetsBattle, MSGBOX_DEFAULT switch VAR_STARTER_MON - case 0, Route110_EventScript_1EF894 - case 1, Route110_EventScript_1EF8A4 - case 2, Route110_EventScript_1EF8B4 + case 0, Route110_EventScript_BrendanBattleTreecko + case 1, Route110_EventScript_BrendanBattleTorchic + case 2, Route110_EventScript_BrendanBattleMudkip end -Route110_EventScript_1EF894:: @ 81EF894 - trainerbattle_no_intro TRAINER_BRENDAN_5, Route110_Text_1EFEB4 - goto Route110_EventScript_1EF8C4 +Route110_EventScript_BrendanBattleTreecko:: @ 81EF894 + trainerbattle_no_intro TRAINER_BRENDAN_5, Route110_Text_BrendanDefeated + goto Route110_EventScript_BrendanDefeated end -Route110_EventScript_1EF8A4:: @ 81EF8A4 - trainerbattle_no_intro TRAINER_BRENDAN_8, Route110_Text_1EFEB4 - goto Route110_EventScript_1EF8C4 +Route110_EventScript_BrendanBattleTorchic:: @ 81EF8A4 + trainerbattle_no_intro TRAINER_BRENDAN_8, Route110_Text_BrendanDefeated + goto Route110_EventScript_BrendanDefeated end -Route110_EventScript_1EF8B4:: @ 81EF8B4 - trainerbattle_no_intro TRAINER_BRENDAN_2, Route110_Text_1EFEB4 - goto Route110_EventScript_1EF8C4 +Route110_EventScript_BrendanBattleMudkip:: @ 81EF8B4 + trainerbattle_no_intro TRAINER_BRENDAN_2, Route110_Text_BrendanDefeated + goto Route110_EventScript_BrendanDefeated end -Route110_EventScript_1EF8C4:: @ 81EF8C4 - msgbox Route110_Text_1EFECD, MSGBOX_DEFAULT - call Route110_EventScript_1EF8DF - msgbox Route110_Text_1EFF1C, MSGBOX_DEFAULT - goto Route110_EventScript_1EF8EC +Route110_EventScript_BrendanDefeated:: @ 81EF8C4 + msgbox Route110_Text_BrendanTakeThis, MSGBOX_DEFAULT + call Route110_EventScript_GiveItemfinder + msgbox Route110_Text_BrendanExplainItemfinder, MSGBOX_DEFAULT + goto Route110_EventScript_RivalExit end -Route110_EventScript_1EF8DF:: @ 81EF8DF +Route110_EventScript_GiveItemfinder:: @ 81EF8DF giveitem_std ITEM_ITEMFINDER return -Route110_EventScript_1EF8EC:: @ 81EF8EC +Route110_EventScript_RivalExit:: @ 81EF8EC closemessage compare VAR_0x8008, 1 - call_if_eq Route110_EventScript_1EF990 + call_if_eq Route110_EventScript_MoveRival1 compare VAR_0x8008, 2 - call_if_eq Route110_EventScript_1EF998 + call_if_eq Route110_EventScript_MoveRival2 compare VAR_0x8008, 3 - call_if_eq Route110_EventScript_1EF9A0 + call_if_eq Route110_EventScript_MoveRival3 setobjectmovementtype 28, MOVEMENT_TYPE_FACE_RIGHT setobjectmovementtype 29, MOVEMENT_TYPE_FACE_RIGHT removeobject 28 addobject 29 delay 45 compare VAR_0x8008, 1 - call_if_eq Route110_EventScript_1EF96F + call_if_eq Route110_EventScript_RivalExit1 compare VAR_0x8008, 2 - call_if_eq Route110_EventScript_1EF97A + call_if_eq Route110_EventScript_RivalExit2 compare VAR_0x8008, 3 - call_if_eq Route110_EventScript_1EF985 + call_if_eq Route110_EventScript_RivalExit3 removeobject 29 setvar VAR_ROUTE110_STATE, 1 savebgm MUS_DUMMY @@ -502,65 +502,65 @@ Route110_EventScript_1EF8EC:: @ 81EF8EC releaseall end -Route110_EventScript_1EF94E:: @ 81EF94E - applymovement 28, Route110_Movement_1EF9A8 +Route110_EventScript_RivalApproachPlayer1:: @ 81EF94E + applymovement 28, Route110_Movement_RivalApproachPlayer1 waitmovement 0 return -Route110_EventScript_1EF959:: @ 81EF959 - applymovement 28, Route110_Movement_1EF9AC +Route110_EventScript_RivalApproachPlayer2:: @ 81EF959 + applymovement 28, Route110_Movement_RivalApproachPlayer2 waitmovement 0 return -Route110_EventScript_1EF964:: @ 81EF964 - applymovement 28, Route110_Movement_1EF9AE +Route110_EventScript_RivalApproachPlayer3:: @ 81EF964 + applymovement 28, Route110_Movement_RivalApproachPlayer3 waitmovement 0 return -Route110_EventScript_1EF96F:: @ 81EF96F - applymovement 29, Route110_Movement_1EF9B2 +Route110_EventScript_RivalExit1:: @ 81EF96F + applymovement 29, Route110_Movement_RivalExit1 waitmovement 0 return -Route110_EventScript_1EF97A:: @ 81EF97A - applymovement 29, Route110_Movement_1EF9BA +Route110_EventScript_RivalExit2:: @ 81EF97A + applymovement 29, Route110_Movement_RivalExit2 waitmovement 0 return -Route110_EventScript_1EF985:: @ 81EF985 - applymovement 29, Route110_Movement_1EF9C3 +Route110_EventScript_RivalExit3:: @ 81EF985 + applymovement 29, Route110_Movement_RivalExit3 waitmovement 0 return -Route110_EventScript_1EF990:: @ 81EF990 +Route110_EventScript_MoveRival1:: @ 81EF990 setobjectxyperm 29, 33, 55 return -Route110_EventScript_1EF998:: @ 81EF998 +Route110_EventScript_MoveRival2:: @ 81EF998 setobjectxyperm 29, 34, 55 return -Route110_EventScript_1EF9A0:: @ 81EF9A0 +Route110_EventScript_MoveRival3:: @ 81EF9A0 setobjectxyperm 29, 35, 55 return -Route110_Movement_1EF9A8: @ 81EF9A8 +Route110_Movement_RivalApproachPlayer1: @ 81EF9A8 walk_down walk_left walk_in_place_fastest_down step_end -Route110_Movement_1EF9AC: @ 81EF9AC +Route110_Movement_RivalApproachPlayer2: @ 81EF9AC walk_down step_end -Route110_Movement_1EF9AE: @ 81EF9AE +Route110_Movement_RivalApproachPlayer3: @ 81EF9AE walk_down walk_right walk_in_place_fastest_down step_end -Route110_Movement_1EF9B2: @ 81EF9B2 +Route110_Movement_RivalExit1: @ 81EF9B2 walk_fast_up walk_fast_up walk_fast_up @@ -570,7 +570,7 @@ Route110_Movement_1EF9B2: @ 81EF9B2 walk_fast_up step_end -Route110_Movement_1EF9BA: @ 81EF9BA +Route110_Movement_RivalExit2: @ 81EF9BA walk_fast_up walk_fast_up walk_fast_up @@ -581,7 +581,7 @@ Route110_Movement_1EF9BA: @ 81EF9BA walk_fast_down step_end -Route110_Movement_1EF9C3: @ 81EF9C3 +Route110_Movement_RivalExit3: @ 81EF9C3 walk_fast_up walk_fast_up walk_fast_up @@ -591,29 +591,29 @@ Route110_Movement_1EF9C3: @ 81EF9C3 walk_fast_up step_end -Route110_EventScript_1EF9CB:: @ 81EF9CB +Route110_EventScript_BirchScene1:: @ 81EF9CB lockall setvar VAR_0x8008, 1 - goto Route110_EventScript_1EF9F7 + goto Route110_EventScript_BirchScene -Route110_EventScript_1EF9D6:: @ 81EF9D6 +Route110_EventScript_BirchScene2:: @ 81EF9D6 lockall setvar VAR_0x8008, 2 - goto Route110_EventScript_1EF9F7 + goto Route110_EventScript_BirchScene -Route110_EventScript_1EF9E1:: @ 81EF9E1 +Route110_EventScript_BirchScene3:: @ 81EF9E1 lockall setvar VAR_0x8008, 3 - goto Route110_EventScript_1EF9F7 + goto Route110_EventScript_BirchScene -Route110_EventScript_1EF9EC:: @ 81EF9EC +Route110_EventScript_BirchScene4:: @ 81EF9EC lockall setvar VAR_0x8008, 4 - goto Route110_EventScript_1EF9F7 + goto Route110_EventScript_BirchScene -Route110_EventScript_1EF9F7:: @ 81EF9F7 +Route110_EventScript_BirchScene:: @ 81EF9F7 addobject 36 - applymovement 36, Route110_Movement_1EFB30 + applymovement 36, Route110_Movement_BirchEntrance waitmovement 0 playse SE_PIN applymovement 36, Common_Movement_ExclamationMark @@ -621,120 +621,120 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 applymovement 36, Common_Movement_Delay48 waitmovement 0 compare VAR_0x8008, 1 - call_if_eq Route110_EventScript_1EFAD8 + call_if_eq Route110_EventScript_BirchApproachPlayer1 compare VAR_0x8008, 2 - call_if_eq Route110_EventScript_1EFAE3 + call_if_eq Route110_EventScript_BirchApproachPlayer2 compare VAR_0x8008, 3 - call_if_eq Route110_EventScript_1EFAEE + call_if_eq Route110_EventScript_BirchApproachPlayer3 compare VAR_0x8008, 4 - call_if_eq Route110_EventScript_1EFAF9 - msgbox Route110_Text_1F0AB5, MSGBOX_DEFAULT + call_if_eq Route110_EventScript_BirchApproachPlayer4 + msgbox Route110_Text_ImagineSeeingYouHere, MSGBOX_DEFAULT closemessage delay 20 - applymovement 36, Common_Movement_WalkInPlaceLeft + applymovement 36, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 10 - applymovement 36, Common_Movement_WalkInPlaceRight + applymovement 36, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 20 - applymovement 36, Common_Movement_WalkInPlaceDown + applymovement 36, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 - msgbox Route110_Text_1F0AFF, MSGBOX_DEFAULT + msgbox Route110_Text_HeardYouInstallMatchCall, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route110_Text_1F0C0C, MSGBOX_DEFAULT + msgbox Route110_Text_RegisteredBirchInPokenav, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_ENABLE_PROF_BIRCH_MATCH_CALL - msgbox Route110_Text_1F0C33, MSGBOX_DEFAULT + msgbox Route110_Text_KeepAnEyeOutForRival, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 1 - call_if_eq Route110_EventScript_1EFB04 + call_if_eq Route110_EventScript_BirchExit1 compare VAR_0x8008, 2 - call_if_eq Route110_EventScript_1EFB0F + call_if_eq Route110_EventScript_BirchExit2 compare VAR_0x8008, 3 - call_if_eq Route110_EventScript_1EFB1A + call_if_eq Route110_EventScript_BirchExit3 compare VAR_0x8008, 4 - call_if_eq Route110_EventScript_1EFB25 + call_if_eq Route110_EventScript_BirchExit4 removeobject 36 setvar VAR_REGISTER_BIRCH_STATE, 2 releaseall end -Route110_EventScript_1EFAD8:: @ 81EFAD8 - applymovement 36, Route110_Movement_1EFB34 +Route110_EventScript_BirchApproachPlayer1:: @ 81EFAD8 + applymovement 36, Route110_Movement_BirchApproachPlayer1 waitmovement 0 return -Route110_EventScript_1EFAE3:: @ 81EFAE3 - applymovement 36, Route110_Movement_1EFB39 +Route110_EventScript_BirchApproachPlayer2:: @ 81EFAE3 + applymovement 36, Route110_Movement_BirchApproachPlayer2 waitmovement 0 return -Route110_EventScript_1EFAEE:: @ 81EFAEE - applymovement 36, Route110_Movement_1EFB3D +Route110_EventScript_BirchApproachPlayer3:: @ 81EFAEE + applymovement 36, Route110_Movement_BirchApproachPlayer3 waitmovement 0 return -Route110_EventScript_1EFAF9:: @ 81EFAF9 - applymovement 36, Route110_Movement_1EFB40 +Route110_EventScript_BirchApproachPlayer4:: @ 81EFAF9 + applymovement 36, Route110_Movement_BirchApproachPlayer4 waitmovement 0 return -Route110_EventScript_1EFB04:: @ 81EFB04 - applymovement 36, Route110_Movement_1EFB44 +Route110_EventScript_BirchExit1:: @ 81EFB04 + applymovement 36, Route110_Movement_BirchExit1 waitmovement 0 return -Route110_EventScript_1EFB0F:: @ 81EFB0F - applymovement 36, Route110_Movement_1EFB4B +Route110_EventScript_BirchExit2:: @ 81EFB0F + applymovement 36, Route110_Movement_BirchExit2 waitmovement 0 return -Route110_EventScript_1EFB1A:: @ 81EFB1A - applymovement 36, Route110_Movement_1EFB51 +Route110_EventScript_BirchExit3:: @ 81EFB1A + applymovement 36, Route110_Movement_BirchExit3 waitmovement 0 return -Route110_EventScript_1EFB25:: @ 81EFB25 - applymovement 36, Route110_Movement_1EFB57 +Route110_EventScript_BirchExit4:: @ 81EFB25 + applymovement 36, Route110_Movement_BirchExit4 waitmovement 0 return -Route110_Movement_1EFB30: @ 81EFB30 +Route110_Movement_BirchEntrance: @ 81EFB30 walk_down walk_down walk_down step_end -Route110_Movement_1EFB34: @ 81EFB34 +Route110_Movement_BirchApproachPlayer1: @ 81EFB34 walk_down walk_left walk_left walk_down step_end -Route110_Movement_1EFB39: @ 81EFB39 +Route110_Movement_BirchApproachPlayer2: @ 81EFB39 walk_down walk_left walk_down step_end -Route110_Movement_1EFB3D: @ 81EFB3D +Route110_Movement_BirchApproachPlayer3: @ 81EFB3D walk_down walk_down step_end -Route110_Movement_1EFB40: @ 81EFB40 +Route110_Movement_BirchApproachPlayer4: @ 81EFB40 walk_down walk_right walk_down step_end -Route110_Movement_1EFB44: @ 81EFB44 +Route110_Movement_BirchExit1: @ 81EFB44 walk_up walk_up walk_right @@ -743,7 +743,7 @@ Route110_Movement_1EFB44: @ 81EFB44 walk_up step_end -Route110_Movement_1EFB4B: @ 81EFB4B +Route110_Movement_BirchExit2: @ 81EFB4B walk_up walk_up walk_up @@ -751,7 +751,7 @@ Route110_Movement_1EFB4B: @ 81EFB4B walk_up step_end -Route110_Movement_1EFB51: @ 81EFB51 +Route110_Movement_BirchExit3: @ 81EFB51 walk_up walk_up walk_up @@ -759,7 +759,7 @@ Route110_Movement_1EFB51: @ 81EFB51 walk_up step_end -Route110_Movement_1EFB57: @ 81EFB57 +Route110_Movement_BirchExit4: @ 81EFB57 walk_up walk_up walk_up @@ -767,40 +767,40 @@ Route110_Movement_1EFB57: @ 81EFB57 walk_up step_end -Route110_Text_1EFB5D: @ 81EFB5D +Route110_Text_WeCantTalkAboutAquaActivities: @ 81EFB5D .string "TEAM AQUA's activities…\n" .string "We can't talk about them yet.$" -Route110_Text_1EFB93: @ 81EFB93 +Route110_Text_KickUpARuckus: @ 81EFB93 .string "I want to get going to SLATEPORT and\n" .string "kick up a ruckus!$" -Route110_Text_1EFBCA: @ 81EFBCA +Route110_Text_MyFirstJobInAqua: @ 81EFBCA .string "This is my first job after joining\n" .string "TEAM AQUA. It's a little scary.$" -Route110_Text_1EFC0D: @ 81EFC0D +Route110_Text_AquaActionsBringSmiles: @ 81EFC0D .string "TEAM AQUA's actions should bring\n" .string "smiles to people's faces!$" -Route110_Text_1EFC48: @ 81EFC48 +Route110_Text_MayLetsBattle: @ 81EFC48 .string "MAY: Hi, {PLAYER}{KUN}, long time no see!\p" .string "While I was searching for other\n" .string "POKéMON, my POKéMON grew stronger.\p" .string "So…\n" .string "How about a little battle?$" -Route110_Text_1EFCCB: @ 81EFCCB +Route110_Text_MayDefeated: @ 81EFCCB .string "Yikes!\n" .string "You're better than I expected!$" -Route110_Text_1EFCF1: @ 81EFCF1 +Route110_Text_MayTakeThis: @ 81EFCF1 .string "MAY: {PLAYER}{KUN}, you've been busy\n" .string "training, too, haven't you?\p" .string "I think you deserve a reward!\n" .string "This is from me!$" -Route110_Text_1EFD58: @ 81EFD58 +Route110_Text_MayExplainItemfinder: @ 81EFD58 .string "MAY: That's an ITEMFINDER.\p" .string "Try it out. If there is an item that's\n" .string "not visible, it emits a sound.\p" @@ -809,24 +809,24 @@ Route110_Text_1EFD58: @ 81EFD58 .string "me, but I think you should train a lot\l" .string "harder for the next time.$" -Route110_Text_1EFE3F: @ 81EFE3F +Route110_Text_BrendayLetsBattle: @ 81EFE3F .string "BRENDAN: Hey, {PLAYER}.\n" .string "So this is where you were.\l" .string "How's it going?\p" .string "Have you been raising your POKéMON?\n" .string "I'll check for you.$" -Route110_Text_1EFEB4: @ 81EFEB4 +Route110_Text_BrendanDefeated: @ 81EFEB4 .string "Hmm…\n" .string "You're pretty good.$" -Route110_Text_1EFECD: @ 81EFECD +Route110_Text_BrendanTakeThis: @ 81EFECD .string "BRENDAN: {PLAYER}, you've trained\n" .string "without me noticing…\p" .string "Good enough!\n" .string "Here, take this.$" -Route110_Text_1EFF1C: @ 81EFF1C +Route110_Text_BrendanExplainItemfinder: @ 81EFF1C .string "BRENDAN: That's an ITEMFINDER.\p" .string "Use it to root around for items that\n" .string "aren't visible.\p" @@ -835,16 +835,16 @@ Route110_Text_1EFF1C: @ 81EFF1C .string "Anyway, I'm off to look for new\n" .string "POKéMON.$" -Route110_Text_1EFFC3: @ 81EFFC3 +Route110_Text_RideBikeAtFullSpeed: @ 81EFFC3 .string "Wouldn't it be great to ride a BIKE\n" .string "at full speed on CYCLING ROAD?$" -Route110_Text_1F0006: @ 81F0006 +Route110_Text_HairStreamsBehindMe: @ 81F0006 .string "How do you like the way my raven-\n" .string "colored hair streams behind me?\p" .string "I grew my hair out just for that.$" -Route110_Text_1F006A: @ 81F006A +Route110_Text_YouGotBikeFromRydel: @ 81F006A .string "Oh, hey, you got that BIKE from RYDEL!\p" .string "Oh, it's glaringly obvious.\n" .string "It says right on your bike…\p" @@ -861,139 +861,139 @@ Route110_Text_1F006A: @ 81F006A .string "You should ride it around all over\n" .string "the place--it's good advertising!$" -Route110_Text_1F0261: @ 81F0261 +Route110_Text_TwoRoads: @ 81F0261 .string "The two roads, one above, one below…\p" .string "A road each for people and POKéMON.\n" .string "Perhaps that is right and fair.$" -Route110_Text_1F02CA: @ 81F02CA +Route110_Text_WalkOnTheLowRoad: @ 81F02CA .string "I don't have a BIKE, so I'll take\n" .string "a leisurely walk on the low road.$" -Route110_Text_1F030E: @ 81F030E +Route110_Text_BikeTechniques: @ 81F030E .string "Learning techniques will make BIKE\n" .string "riding even more fun.\p" .string "There are some places that you can\n" .string "reach only by using a BIKE technique.$" -Route110_Text_1F0390: @ 81F0390 +Route110_Text_WhichShouldIChoose: @ 81F0390 .string "Which should I choose?\p" .string "Make a beeline for MAUVILLE on\n" .string "CYCLING ROAD, or take the low road\l" .string "and look for POKéMON?$" -Route110_Text_1F03FF: @ 81F03FF +Route110_Text_CyclingChallengeResultSummary: @ 81F03FF .string "Number of collisions:\n" .string "… … {STR_VAR_1}!\p" .string "Total time:\n" .string "… … {STR_VAR_2}!$" -Route110_Text_1F0431: @ 81F0431 +Route110_Text_ChallengeReactionBest: @ 81F0431 .string "Bravo! Splendid showing!\p" .string "Your love of cycling comes from deep\n" .string "within your heart.\l" .string "You've shaken me to my very soul!$" -Route110_Text_1F04A4: @ 81F04A4 +Route110_Text_ChallengeReactionGood: @ 81F04A4 .string "Your technique is remarkable.\p" .string "I suggest you speed up a bit while\n" .string "still avoiding collisions.$" -Route110_Text_1F0500: @ 81F0500 +Route110_Text_ChallengeReactionOk: @ 81F0500 .string "I would consider you a work in\n" .string "progress.\p" .string "Still, I hope you don't forget the\n" .string "sheer pleasure of cycling.$" -Route110_Text_1F0567: @ 81F0567 +Route110_Text_ChallengeReactionBad: @ 81F0567 .string "My word… Your cycling skills border\n" .string "on terrifying.\p" .string "Most certainly, you need much more\n" .string "practice riding.$" -Route110_Text_1F05CE: @ 81F05CE +Route110_Text_ChallengeReactionWorst: @ 81F05CE .string "…I am aghast…\p" .string "You're perhaps not cut out for this\n" .string "unfortunate cycling business.\p" .string "You ought to give serious thought to\n" .string "returning that BIKE to RYDEL.$" -Route110_Text_1F0661: @ 81F0661 +Route110_Text_RatedForNumberOfCollisions: @ 81F0661 .string "This is CYCLING ROAD.\p" .string "If you were to ride from MAUVILLE to\n" .string "SLATEPORT on a MACH BIKE, you would\l" .string "be rated for the number of collisions\l" .string "and your total time.$" -Route110_Text_1F06FB: @ 81F06FB +Route110_Text_AlwaysAimHigher: @ 81F06FB .string "Regardless of the results, I count on\n" .string "seeing more challenges from you.\l" .string "Always aim higher!$" -Route110_Text_1F0755: @ 81F0755 +Route110_Text_AcroBikesDoNotQualify: @ 81F0755 .string "On this CYCLING ROAD, those riding\n" .string "MACH BIKES are rated for their number\l" .string "of collisions and their total times.\p" .string "ACRO BIKES do not qualify for rating.\n" .string "They are easy to turn, so it's not fair.$" -Route110_Text_1F0812: @ 81F0812 +Route110_Text_SlateportCitySign: @ 81F0812 .string "ROUTE 110\n" .string "{DOWN_ARROW} SLATEPORT CITY$" -Route110_Text_1F082D: @ 81F082D +Route110_Text_CyclingRoadSign: @ 81F082D .string "SEASIDE CYCLING ROAD$" -Route110_Text_1F0842: @ 81F0842 +Route110_Text_AquaWasHere: @ 81F0842 .string "“TEAM AQUA was here!”\p" .string "Someone painted that onto this sign,\n" .string "but then someone else painted over it.\p" .string "“TEAM MAGMA rules!” is what it\n" .string "says now.$" -Route110_Text_1F08CD: @ 81F08CD +Route110_Text_Route103Sign: @ 81F08CD .string "ROUTE 110\n" .string "{LEFT_ARROW} ROUTE 103$" -Route110_Text_1F08E3: @ 81F08E3 +Route110_Text_SeasideParkingSign: @ 81F08E3 .string "SEASIDE PARKING$" -Route110_Text_1F08F3: @ 81F08F3 +Route110_Text_MauvilleCitySign: @ 81F08F3 .string "ROUTE 110\n" .string "{UP_ARROW} MAUVILLE CITY$" -Route110_Text_1F090D: @ 81F090D +Route110_Text_TrainerTipsPrlzSleep: @ 81F090D .string "TRAINER TIPS\p" .string "The foe can be made helpless by\n" .string "paralyzing it or causing it to sleep.\p" .string "It is an important technique for\n" .string "POKéMON battles.$" -Route110_Text_1F0992: @ 81F0992 +Route110_Text_TrainerTipsRegisterItems: @ 81F0992 .string "TRAINER TIPS\p" .string "The items in the BAG can be reorganized\n" .string "by pressing SELECT.$" -Route110_Text_1F09DB: @ 81F09DB +Route110_Text_TrickHouseSign: @ 81F09DB .string "“Three steps {RIGHT_ARROW} and two steps {UP_ARROW}\n" .string "to reach the wondrous TRICK HOUSE.”$" -Route110_Text_1F0A1E: @ 81F0A1E +Route110_Text_BestRecord: @ 81F0A1E .string "THE BEST RECORD TO DATE…\p" .string "No. of collisions: {STR_VAR_1}\p" .string "Elapsed time: {STR_VAR_2}$" -Route110_Text_1F0A5E: @ 81F0A5E +Route110_Text_ThereIsNoRecord: @ 81F0A5E .string "THE BEST RECORD TO DATE…\p" .string "No one seems to have taken the\n" .string "challenge. There is no record…$" -Route110_Text_1F0AB5: @ 81F0AB5 +Route110_Text_ImagineSeeingYouHere: @ 81F0AB5 .string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n" .string "Imagine seeing you here!\p" .string "And where might my {RIVAL} be?$" -Route110_Text_1F0AFF: @ 81F0AFF +Route110_Text_HeardYouInstallMatchCall: @ 81F0AFF .string "Oh, I see!\n" .string "You two are running separately.\l" .string "Well, that's fine.\p" @@ -1005,11 +1005,11 @@ Route110_Text_1F0AFF: @ 81F0AFF .string "I can rate your POKéDEX anytime.\p" .string "… … … … … …$" -Route110_Text_1F0C0C: @ 81F0C0C +Route110_Text_RegisteredBirchInPokenav: @ 81F0C0C .string "Registered PROF. BIRCH\n" .string "in the POKéNAV.$" -Route110_Text_1F0C33: @ 81F0C33 +Route110_Text_KeepAnEyeOutForRival: @ 81F0C33 .string "PROF. BIRCH: {PLAYER}{KUN}…\p" .string "Please keep an eye out for my {RIVAL}.\n" .string "… … … … … …\p" diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 048e64174..46c4c316e 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -150,13 +150,13 @@ Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 msgbox Route110_TrickHouseEnd_Text_26B3AB, MSGBOX_DEFAULT closemessage - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if_eq Route110_TrickHouseEnd_EventScript_26B015 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq Route110_TrickHouseEnd_EventScript_26B020 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if_eq Route110_TrickHouseEnd_EventScript_26B02B - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq Route110_TrickHouseEnd_EventScript_26B036 delay 30 msgbox Route110_TrickHouseEnd_Text_26B3FA, MSGBOX_DEFAULT @@ -212,22 +212,22 @@ Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002 return Route110_TrickHouseEnd_EventScript_26B015:: @ 826B015 - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return Route110_TrickHouseEnd_EventScript_26B020:: @ 826B020 - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return Route110_TrickHouseEnd_EventScript_26B02B:: @ 826B02B - applymovement 1, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return Route110_TrickHouseEnd_EventScript_26B036:: @ 826B036 - applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -241,7 +241,7 @@ Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041 applymovement 1, Route110_TrickHouseEnd_Movement_26B08B waitmovement 0 playse SE_W153 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Route110_TrickHouseEnd_Text_26B8BD, MSGBOX_DEFAULT closemessage diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 0e729d333..ab3ef25aa 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -334,7 +334,7 @@ Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51 applymovement 1, Common_Movement_Delay48 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26A9AF, MSGBOX_DEFAULT - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end @@ -432,7 +432,7 @@ Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end @@ -497,7 +497,7 @@ Route110_TrickHouseEntrance_EventScript_26A106:: @ 826A106 Route110_TrickHouseEntrance_EventScript_26A110:: @ 826A110 msgbox Route110_TrickHouseEntrance_Text_26A887, MSGBOX_YESNO closemessage - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route110_TrickHouseEntrance_EventScript_26A126 releaseall end @@ -506,7 +506,7 @@ Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126 setmetatile 5, 1, METATILE_GenericBuilding_TrickHouse_Stairs_Down, 0 special DrawWholeMapView delay 20 - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_2725C9 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_26A1A7 waitmovement 0 diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index db651d8ce..b5303bc24 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -222,60 +222,60 @@ Route110_TrickHousePuzzle7_EventScript_26E31B:: @ 826E31B playse SE_MU_PACHI waitse playse SE_TU_SAA - mossdeepgym3 1 - mossdeepgym1 0 + initrotatingtilepuzzle TRUE + moverotatingtileobjects 0 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end Route110_TrickHousePuzzle7_EventScript_26E331:: @ 826E331 playse SE_MU_PACHI waitse playse SE_TU_SAA - mossdeepgym3 1 - mossdeepgym1 1 + initrotatingtilepuzzle TRUE + moverotatingtileobjects 1 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end Route110_TrickHousePuzzle7_EventScript_26E347:: @ 826E347 playse SE_MU_PACHI waitse playse SE_TU_SAA - mossdeepgym3 1 - mossdeepgym1 2 + initrotatingtilepuzzle TRUE + moverotatingtileobjects 2 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end Route110_TrickHousePuzzle7_EventScript_26E35D:: @ 826E35D playse SE_MU_PACHI waitse playse SE_TU_SAA - mossdeepgym3 1 - mossdeepgym1 3 + initrotatingtilepuzzle TRUE + moverotatingtileobjects 3 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373 playse SE_MU_PACHI waitse playse SE_TU_SAA - mossdeepgym3 1 - mossdeepgym1 4 + initrotatingtilepuzzle TRUE + moverotatingtileobjects 4 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end Route110_TrickHousePuzzle7_EventScript_26E389:: @ 826E389 diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index ef7e29999..0317366cd 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -196,7 +196,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_28CDF6", + "script": "GabbyAndTy_EventScript_TyBattle1", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1" }, { @@ -209,7 +209,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_28CDD6", + "script": "GabbyAndTy_EventScript_GabbyBattle1", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1" }, { @@ -300,7 +300,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_28CE96", + "script": "GabbyAndTy_EventScript_GabbyBattle4", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3" }, { @@ -313,7 +313,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_28CEB6", + "script": "GabbyAndTy_EventScript_TyBattle4", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3" }, { @@ -326,7 +326,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_28CF16", + "script": "GabbyAndTy_EventScript_GabbyBattle6", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2" }, { @@ -339,7 +339,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_28CF36", + "script": "GabbyAndTy_EventScript_TyBattle6", "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2" }, { diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 6e820d426..037ddb18c 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -46,7 +46,7 @@ Route111_OnTransition: @ 81F0D87 compare VAR_MIRAGE_TOWER_STATE, 2 call_if_eq Route111_EventScript_1F0E40 call Route111_EventScript_1F0DE6 - call Route111_EventScript_28CCC7 + call GabbyAndTy_EventScript_UpdateLocation checktrainerflag TRAINER_VICKY goto_if_lt Route111_EventScript_1F0E26 end @@ -209,7 +209,7 @@ Route111_EventScript_1F0F2E:: @ 81F0F2E end Route111_EventScript_1F0F45:: @ 81F0F45 - msgbox gUnknown_08272C5F, MSGBOX_DEFAULT + msgbox gText_SandstormIsVicious, MSGBOX_DEFAULT closemessage compare VAR_0x8004, 0 call_if_eq Route111_EventScript_1F0F7C @@ -276,7 +276,7 @@ Route111_EventScript_1F0FC5:: @ 81F0FC5 faceplayer setflag FLAG_LANDMARK_WINSTRATE_FAMILY msgbox Route111_Text_1F1475, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route111_EventScript_1F0FE7 msgbox Route111_Text_1F14F5, MSGBOX_DEFAULT release @@ -285,7 +285,7 @@ Route111_EventScript_1F0FC5:: @ 81F0FC5 Route111_EventScript_1F0FE7:: @ 81F0FE7 msgbox Route111_Text_1F1523, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_1F1542 - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 call Route111_EventScript_1F113C msgbox Route111_Text_1F156F, MSGBOX_DEFAULT @@ -303,7 +303,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 call Route111_EventScript_1F1143 msgbox Route111_Text_1F159D, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_1F1616 - applymovement 2, Common_Movement_WalkInPlaceUp + applymovement 2, Common_Movement_WalkInPlaceFastestUp waitmovement 0 call Route111_EventScript_1F113C msgbox Route111_Text_1F1645, MSGBOX_DEFAULT @@ -321,7 +321,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 call Route111_EventScript_1F1143 msgbox Route111_Text_1F167E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VIVI, Route111_Text_1F16C6 - applymovement 3, Common_Movement_WalkInPlaceUp + applymovement 3, Common_Movement_WalkInPlaceFastestUp waitmovement 0 call Route111_EventScript_1F113C msgbox Route111_Text_1F16DC, MSGBOX_DEFAULT @@ -341,7 +341,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 trainerbattle_no_intro TRAINER_VICKY, Route111_Text_1F1756 msgbox Route111_Text_1F1788, MSGBOX_DEFAULT closemessage - applymovement 4, Common_Movement_WalkInPlaceUp + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 call Route111_EventScript_1F113C applymovement 4, Route111_Movement_1F114A @@ -476,7 +476,7 @@ Route111_EventScript_1F1260:: @ 81F1260 end Route111_EventScript_1F128C:: @ 81F128C - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route111_Text_298C00, MSGBOX_DEFAULT register_matchcall TRAINER_DUSTY_1 @@ -513,7 +513,7 @@ Route111_EventScript_1F1307:: @ 81F1307 end Route111_EventScript_1F1333:: @ 81F1333 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route111_Text_29903D, MSGBOX_DEFAULT register_matchcall TRAINER_WILTON_1 @@ -535,7 +535,7 @@ Route111_EventScript_1F1369:: @ 81F1369 end Route111_EventScript_1F1395:: @ 81F1395 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route111_Text_29921D, MSGBOX_DEFAULT register_matchcall TRAINER_BROOKE_1 diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc index 017043eae..63b373fbf 100644 --- a/data/maps/Route111_OldLadysRestStop/scripts.inc +++ b/data/maps/Route111_OldLadysRestStop/scripts.inc @@ -10,9 +10,9 @@ Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920 lock faceplayer msgbox Route111_OldLadysRestStop_Text_22A978, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route111_OldLadysRestStop_EventScript_22A941 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq Route111_OldLadysRestStop_EventScript_22A96E end @@ -21,9 +21,9 @@ Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941 closemessage call Common_EventScript_OutOfCenterPartyHeal msgbox Route111_OldLadysRestStop_Text_22AA16, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route111_OldLadysRestStop_EventScript_22A941 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq Route111_OldLadysRestStop_EventScript_22A96E end diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 58109bd40..beb572f08 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -10,7 +10,7 @@ Route112_OnTransition: @ 81F1DAE Route112_EventScript_1F1DB7:: @ 81F1DB7 lockall delay 40 - applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 20 msgbox Route112_Text_1F1F3F, MSGBOX_DEFAULT @@ -18,7 +18,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 6, Common_Movement_WalkInPlaceLeft + applymovement 6, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 20 msgbox Route112_Text_1F1F7A, MSGBOX_DEFAULT @@ -26,7 +26,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 20 msgbox Route112_Text_1F1FBA, MSGBOX_DEFAULT @@ -34,7 +34,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 delay 40 - applymovement 6, Common_Movement_WalkInPlaceLeft + applymovement 6, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 20 msgbox Route112_Text_1F2003, MSGBOX_DEFAULT @@ -75,7 +75,7 @@ Route112_EventScript_1F1E81:: @ 81F1E81 end Route112_EventScript_1F1EAD:: @ 81F1EAD - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route112_Text_29993C, MSGBOX_DEFAULT register_matchcall TRAINER_TRENT_1 diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index d9eec8efd..f319e0a28 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -33,9 +33,9 @@ Route112_CableCarStation_EventScript_22AB17:: @ 822AB17 lock faceplayer msgbox Route112_CableCarStation_Text_22AB85, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route112_CableCarStation_EventScript_22AB38 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq Route112_CableCarStation_EventScript_22AB67 end @@ -47,7 +47,7 @@ Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 waitmovement 0 setvar VAR_0x8004, 0 setvar VAR_CABLE_CAR_STATION_STATE, 1 - incrementgamestat 48 + incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp special CableCar waitstate diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index e8fb08ee4..89bf97373 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -4,7 +4,7 @@ Route113_MapScripts:: @ 81F2153 .byte 0 Route113_MapScript1_1F215E: @ 81F215E - setstepcallback 1 + setstepcallback STEP_CB_ASH end Route113_OnTransition: @ 81F2161 @@ -68,7 +68,7 @@ Route113_EventScript_1F21EE:: @ 81F21EE end Route113_EventScript_1F221A:: @ 81F221A - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route113_Text_299F49, MSGBOX_DEFAULT register_matchcall TRAINER_MADELINE_1 @@ -90,7 +90,7 @@ Route113_EventScript_1F2250:: @ 81F2250 end Route113_EventScript_1F227C:: @ 81F227C - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route113_Text_29A0A2, MSGBOX_DEFAULT register_matchcall TRAINER_LAO_1 diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index 22acd676d..e1339c75c 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -74,7 +74,7 @@ Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E compare VAR_ASH_GATHER_COUNT, 250 goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_GLASS_WORKSHOP_STATE, 10 subvar VAR_ASH_GATHER_COUNT, 250 @@ -88,7 +88,7 @@ Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A compare VAR_ASH_GATHER_COUNT, 500 goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_GLASS_WORKSHOP_STATE, 11 subvar VAR_ASH_GATHER_COUNT, 500 @@ -102,7 +102,7 @@ Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96 compare VAR_ASH_GATHER_COUNT, 500 goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_GLASS_WORKSHOP_STATE, 12 subvar VAR_ASH_GATHER_COUNT, 500 @@ -116,7 +116,7 @@ Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2 compare VAR_ASH_GATHER_COUNT, 1000 goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_GLASS_WORKSHOP_STATE, 13 subvar VAR_ASH_GATHER_COUNT, 1000 @@ -130,7 +130,7 @@ Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E compare VAR_ASH_GATHER_COUNT, 1000 goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_GLASS_WORKSHOP_STATE, 14 subvar VAR_ASH_GATHER_COUNT, 1000 @@ -145,7 +145,7 @@ Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A compare VAR_ASH_GATHER_COUNT, 6000 goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_GLASS_WORKSHOP_STATE, 15 subvar VAR_ASH_GATHER_COUNT, 6000 @@ -160,7 +160,7 @@ Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B compare VAR_ASH_GATHER_COUNT, 8000 goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_GLASS_WORKSHOP_STATE, 16 subvar VAR_ASH_GATHER_COUNT, 8000 diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index faa79b861..caf6e1496 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -6,7 +6,7 @@ Route114_MapScripts:: @ 81F252F Route114_OnTransition: @ 81F253F compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq Route114_EventScript_273D13 + call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH call_if_eq UnusualWeather_StartGroudonWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH @@ -116,7 +116,7 @@ Route114_EventScript_1F269C:: @ 81F269C end Route114_EventScript_1F26C8:: @ 81F26C8 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route114_Text_29A9F7, MSGBOX_DEFAULT register_matchcall TRAINER_STEVE_1 @@ -138,7 +138,7 @@ Route114_EventScript_1F26FE:: @ 81F26FE end Route114_EventScript_1F272A:: @ 81F272A - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route114_Text_29ABA6, MSGBOX_DEFAULT register_matchcall TRAINER_BERNIE_1 diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 3de7350ac..8c5ec779d 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -23,8 +23,8 @@ Route114_FossilManiacsTunnel_EventScript_22AF53:: @ 822AF53 Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 lockall - applymovement 1, Common_Movement_WalkInPlaceUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT setvar VAR_FOSSIL_MANIAC_STATE, 2 diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc index 85b22724b..59d82ffe1 100644 --- a/data/maps/Route114_LanettesHouse/scripts.inc +++ b/data/maps/Route114_LanettesHouse/scripts.inc @@ -27,7 +27,7 @@ Route114_LanettesHouse_EventScript_22B2FF:: @ 822B2FF Route114_LanettesHouse_EventScript_22B309:: @ 822B309 lockall msgbox Route114_LanettesHouse_Text_22B485, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route114_LanettesHouse_EventScript_22B327 msgbox Route114_LanettesHouse_Text_22B6E4, MSGBOX_DEFAULT releaseall @@ -35,7 +35,7 @@ Route114_LanettesHouse_EventScript_22B309:: @ 822B309 Route114_LanettesHouse_EventScript_22B327:: @ 822B327 msgbox Route114_LanettesHouse_Text_22B53C, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES call_if_eq Route114_LanettesHouse_EventScript_22B33C releaseall end diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 7c5b63bcd..8877f31bd 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -13,7 +13,7 @@ Route115_MapScript1_1F2930: @ 81F2930 Route115_OnTransition: @ 81F2947 compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq Route115_EventScript_273D13 + call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST call_if_eq UnusualWeather_StartGroudonWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST @@ -46,7 +46,7 @@ Route115_EventScript_1F298E:: @ 81F298E end Route115_EventScript_1F29BA:: @ 81F29BA - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route115_Text_29B2B3, MSGBOX_DEFAULT register_matchcall TRAINER_TIMOTHY_1 @@ -73,7 +73,7 @@ Route115_EventScript_1F2A07:: @ 81F2A07 end Route115_EventScript_1F2A33:: @ 81F2A33 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route115_Text_29B50B, MSGBOX_DEFAULT register_matchcall TRAINER_NOB_1 @@ -95,7 +95,7 @@ Route115_EventScript_1F2A69:: @ 81F2A69 end Route115_EventScript_1F2A95:: @ 81F2A95 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route115_Text_29B6AB, MSGBOX_DEFAULT register_matchcall TRAINER_CYNDY_1 diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 161e9be51..f52c8a05f 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -7,7 +7,7 @@ Route116_MapScripts:: @ 81F2C0C Route116_OnTransition: @ 81F2C1C call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C47 compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq Route116_EventScript_273D13 + call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH call_if_eq UnusualWeather_StartGroudonWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH @@ -63,13 +63,13 @@ Route116_EventScript_1F2CBB:: @ 81F2CBB goto_if_eq Route116_EventScript_1F2D39 msgbox Route116_Text_1F3521, MSGBOX_DEFAULT closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq Route116_EventScript_1F2D15 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if_eq Route116_EventScript_1F2D15 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if_eq Route116_EventScript_1F2D15 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq Route116_EventScript_1F2D20 removeobject VAR_LAST_TALKED clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE @@ -151,8 +151,8 @@ Route116_EventScript_1F2D84:: @ 81F2D84 Route116_EventScript_1F2D95:: @ 81F2D95 lockall - applymovement 11, Common_Movement_WalkInPlaceRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement 11, Common_Movement_WalkInPlaceFastestRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox Route116_Text_1F309D, MSGBOX_DEFAULT setvar VAR_ROUTE116_STATE, 2 @@ -196,13 +196,13 @@ Route116_EventScript_1F2E1B:: @ 81F2E1B Route116_EventScript_1F2E2A:: @ 81F2E2A delay 20 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq Route116_EventScript_1F2E5E - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if_eq Route116_EventScript_1F2E5E - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if_eq Route116_EventScript_1F2E5E - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq Route116_EventScript_1F2E69 removeobject VAR_LAST_TALKED release @@ -258,8 +258,8 @@ Route116_EventScript_1F2EB7:: @ 81F2EB7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route116_EventScript_1F2F4E - setvar VAR_0x8004, 273 - specialvar VAR_RESULT, sub_813B4E0 + setvar VAR_0x8004, TRAINER_JERRY_1 + specialvar VAR_RESULT, IsTrainerRegistered compare VAR_RESULT, 0 goto_if_eq Route116_EventScript_1F2F22 msgbox Route116_Text_29BD92, MSGBOX_DEFAULT @@ -272,7 +272,7 @@ Route116_EventScript_1F2EF8:: @ 81F2EF8 end Route116_EventScript_1F2F03:: @ 81F2F03 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route116_Text_29BE71, MSGBOX_DEFAULT register_matchcall TRAINER_JERRY_1 @@ -311,8 +311,8 @@ Route116_EventScript_1F2F93:: @ 81F2F93 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route116_EventScript_1F302A - setvar VAR_0x8004, 280 - specialvar VAR_RESULT, sub_813B4E0 + setvar VAR_0x8004, TRAINER_KAREN_1 + specialvar VAR_RESULT, IsTrainerRegistered compare VAR_RESULT, 0 goto_if_eq Route116_EventScript_1F2FFE msgbox Route116_Text_29C010, MSGBOX_DEFAULT @@ -325,7 +325,7 @@ Route116_EventScript_1F2FD4:: @ 81F2FD4 end Route116_EventScript_1F2FDF:: @ 81F2FDF - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route116_Text_29C096, MSGBOX_DEFAULT register_matchcall TRAINER_KAREN_1 diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 5435595ee..40d121fc7 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -47,7 +47,7 @@ Route117_EventScript_1F39D0:: @ 81F39D0 end Route117_EventScript_1F39FC:: @ 81F39FC - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route117_Text_29C508, MSGBOX_DEFAULT register_matchcall TRAINER_ISAAC_1 @@ -69,7 +69,7 @@ Route117_EventScript_1F3A32:: @ 81F3A32 end Route117_EventScript_1F3A5E:: @ 81F3A5E - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route117_Text_29C6BC, MSGBOX_DEFAULT register_matchcall TRAINER_LYDIA_1 @@ -91,7 +91,7 @@ Route117_EventScript_1F3A94:: @ 81F3A94 end Route117_EventScript_1F3AC0:: @ 81F3AC0 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route117_Text_29C846, MSGBOX_DEFAULT register_matchcall TRAINER_DYLAN_1 @@ -113,7 +113,7 @@ Route117_EventScript_1F3AF6:: @ 81F3AF6 end Route117_EventScript_1F3B22:: @ 81F3B22 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route117_Text_29CA32, MSGBOX_DEFAULT register_matchcall TRAINER_MARIA_1 diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json index e7737bf1e..40a988bad 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -92,7 +92,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_28CE16", + "script": "GabbyAndTy_EventScript_GabbyBattle2", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1" }, { @@ -105,7 +105,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_28CE36", + "script": "GabbyAndTy_EventScript_TyBattle2", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1" }, { @@ -131,7 +131,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_28CED6", + "script": "Route118_EventScript_GabbyBattle5", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2" }, { @@ -144,7 +144,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_28CEF6", + "script": "Route118_EventScript_TyBattle5", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2" }, { @@ -157,7 +157,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_28CF16", + "script": "GabbyAndTy_EventScript_GabbyBattle6", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3" }, { @@ -170,7 +170,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_28CF36", + "script": "GabbyAndTy_EventScript_TyBattle6", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3" }, { diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 858f0d598..fe9c4137d 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -5,9 +5,9 @@ Route118_MapScripts:: @ 81F3DBC .byte 0 Route118_OnTransition: @ 81F3DCC - call Route118_EventScript_28CCC7 + call GabbyAndTy_EventScript_UpdateLocation compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq Route118_EventScript_273D13 + call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST call_if_eq UnusualWeather_StartGroudonWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST @@ -30,9 +30,9 @@ Route118_EventScript_1F3E14:: @ 81F3E14 faceplayer goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_1F3E69 msgbox Route118_Text_1F427B, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route118_EventScript_1F3E3E - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq Route118_EventScript_1F3E5F end @@ -195,7 +195,7 @@ Route118_EventScript_1F3F87:: @ 81F3F87 end Route118_EventScript_1F3FB3:: @ 81F3FB3 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route118_Text_29D343, MSGBOX_DEFAULT register_matchcall TRAINER_ROSE_1 @@ -227,7 +227,7 @@ Route118_EventScript_1F4017:: @ 81F4017 end Route118_EventScript_1F4043:: @ 81F4043 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route118_Text_29D74A, MSGBOX_DEFAULT register_matchcall TRAINER_DALTON_1 diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index c84ff9db1..badd5d14e 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -477,7 +477,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_EventScript_27231C", + "script": "Route119_EventScript_Kecleon1", "flag": "FLAG_HIDE_ROUTE_119_KECLEON_1" }, { @@ -490,7 +490,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_EventScript_272329", + "script": "Route119_EventScript_Kecleon2", "flag": "FLAG_HIDE_ROUTE_119_KECLEON_2" }, { diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 1902333ed..4658c2407 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -9,14 +9,14 @@ Route119_MapScript1_1F442F: @ 81F442F Route119_EventScript_1F4439:: @ 81F4439 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return Route119_OnTransition: @ 81F444D - call Common_EventScript_SetupRivalGender - call Common_EventScript_SetupRivalOnBikeGender + call Common_EventScript_SetupRivalGfxId + call Common_EventScript_SetupRivalOnBikeGfxId compare VAR_WEATHER_INSTITUTE_STATE, 1 call_if_eq Route119_EventScript_1F4466 special SetRoute119Weather @@ -51,7 +51,7 @@ Route119_EventScript_1F4488:: @ 81F4488 call_if_eq Route119_EventScript_1F46C6 compare VAR_TEMP_1, 2 call_if_eq Route119_EventScript_1F46D1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 compare VAR_TEMP_1, 1 @@ -375,7 +375,7 @@ Route119_EventScript_1F4810:: @ 81F4810 end Route119_EventScript_1F483C:: @ 81F483C - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route119_Text_29DD1C, MSGBOX_DEFAULT register_matchcall TRAINER_JACKSON_1 @@ -397,7 +397,7 @@ Route119_EventScript_1F4872:: @ 81F4872 end Route119_EventScript_1F489E:: @ 81F489E - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route119_Text_29DEF7, MSGBOX_DEFAULT register_matchcall TRAINER_CATHERINE_1 diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json index 8200c20df..74629d77e 100644 --- a/data/maps/Route119_WeatherInstitute_1F/map.json +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route119_WeatherInstitute_1F_EventScript_26FB29", + "script": "Route119_WeatherInstitute_1F_EventScript_Grunt11", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route119_WeatherInstitute_1F_EventScript_26FB40", + "script": "Route119_WeatherInstitute_1F_EventScript_Grunt20", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_WeatherInstitute_1F_EventScript_26FB0F", + "script": "Route119_WeatherInstitute_1F_EventScript_InstituteWorker2", "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_WeatherInstitute_1F_EventScript_26FAC8", + "script": "Route119_WeatherInstitute_1F_EventScript_InstituteWorker1", "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_WeatherInstitute_1F_EventScript_26FAA4", + "script": "Route119_WeatherInstitute_1F_EventScript_LittleBoy", "flag": "0" } ], @@ -111,7 +111,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route119_WeatherInstitute_1F_EventScript_26FB18" + "script": "Route119_WeatherInstitute_1F_EventScript_Bed" }, { "type": "sign", @@ -119,7 +119,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route119_WeatherInstitute_1F_EventScript_26FB18" + "script": "Route119_WeatherInstitute_1F_EventScript_Bed" }, { "type": "sign", @@ -127,7 +127,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route119_WeatherInstitute_1F_EventScript_26FB18" + "script": "Route119_WeatherInstitute_1F_EventScript_Bed" }, { "type": "sign", @@ -135,7 +135,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route119_WeatherInstitute_1F_EventScript_26FB18" + "script": "Route119_WeatherInstitute_1F_EventScript_Bed" } ] }
\ No newline at end of file diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index b4b309d80..630f69a29 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -4,111 +4,111 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 826FA86 Route119_WeatherInstitute_1F_OnTransition: @ 826FA8C compare VAR_WEATHER_INSTITUTE_STATE, 0 - call_if_eq Route119_WeatherInstitute_1F_EventScript_26FA98 + call_if_eq Route119_WeatherInstitute_1F_EventScript_SetLittleBoyPos end -Route119_WeatherInstitute_1F_EventScript_26FA98:: @ 826FA98 +Route119_WeatherInstitute_1F_EventScript_SetLittleBoyPos:: @ 826FA98 setobjectxyperm 5, 0, 5 setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT return -Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4 +Route119_WeatherInstitute_1F_EventScript_LittleBoy:: @ 826FAA4 lock faceplayer special GetPlayerBigGuyGirlString compare VAR_WEATHER_INSTITUTE_STATE, 0 - goto_if_eq Route119_WeatherInstitute_1F_EventScript_26FABE - msgbox Route119_WeatherInstitute_1F_Text_26FCE5, MSGBOX_DEFAULT + goto_if_eq Route119_WeatherInstitute_1F_EventScript_LittleBoyTeamAquaHere + msgbox Route119_WeatherInstitute_1F_Text_WowYoureStrong, MSGBOX_DEFAULT release end -Route119_WeatherInstitute_1F_EventScript_26FABE:: @ 826FABE - msgbox Route119_WeatherInstitute_1F_Text_26FCB7, MSGBOX_DEFAULT +Route119_WeatherInstitute_1F_EventScript_LittleBoyTeamAquaHere:: @ 826FABE + msgbox Route119_WeatherInstitute_1F_Text_EveryoneWentUpstairs, MSGBOX_DEFAULT release end -Route119_WeatherInstitute_1F_EventScript_26FAC8:: @ 826FAC8 +Route119_WeatherInstitute_1F_EventScript_InstituteWorker1:: @ 826FAC8 lock faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_1F_EventScript_26FB05 + goto_if_unset FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_1F_EventScript_StudyingRain setvar VAR_0x8004, 0 - call_if_set FLAG_DEFEATED_KYOGRE, Route119_WeatherInstitute_1F_EventScript_26FAFF - call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_1F_EventScript_26FAFF - compare VAR_0x8004, 2 - goto_if_eq Route119_WeatherInstitute_1F_EventScript_26FB05 - msgbox Route119_WeatherInstitute_1F_Text_26FDE8, MSGBOX_DEFAULT + call_if_set FLAG_DEFEATED_KYOGRE, Route119_WeatherInstitute_1F_EventScript_LegendaryDefeated + call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_1F_EventScript_LegendaryDefeated + compare VAR_0x8004, 2 @ Both defeated + goto_if_eq Route119_WeatherInstitute_1F_EventScript_StudyingRain + msgbox Route119_WeatherInstitute_1F_Text_NoticingUnusualWeather, MSGBOX_DEFAULT release end -Route119_WeatherInstitute_1F_EventScript_26FAFF:: @ 826FAFF +Route119_WeatherInstitute_1F_EventScript_LegendaryDefeated:: @ 826FAFF addvar VAR_0x8004, 1 return -Route119_WeatherInstitute_1F_EventScript_26FB05:: @ 826FB05 - msgbox Route119_WeatherInstitute_1F_Text_26FD2E, MSGBOX_DEFAULT +Route119_WeatherInstitute_1F_EventScript_StudyingRain:: @ 826FB05 + msgbox Route119_WeatherInstitute_1F_Text_ProfStudyingRain, MSGBOX_DEFAULT release end -Route119_WeatherInstitute_1F_EventScript_26FB0F:: @ 826FB0F - msgbox Route119_WeatherInstitute_1F_Text_26FE94, MSGBOX_NPC +Route119_WeatherInstitute_1F_EventScript_InstituteWorker2:: @ 826FB0F + msgbox Route119_WeatherInstitute_1F_Text_WhatWereAquasUpTo, MSGBOX_NPC end -Route119_WeatherInstitute_1F_EventScript_26FB18:: @ 826FB18 +Route119_WeatherInstitute_1F_EventScript_Bed:: @ 826FB18 lockall - msgbox Route119_WeatherInstitute_1F_Text_26FEFC, MSGBOX_DEFAULT + msgbox Route119_WeatherInstitute_1F_Text_TakeRestInBed, MSGBOX_DEFAULT closemessage call Common_EventScript_OutOfCenterPartyHeal releaseall end -Route119_WeatherInstitute_1F_EventScript_26FB29:: @ 826FB29 - trainerbattle_single TRAINER_GRUNT_11, Route119_WeatherInstitute_1F_Text_26FB57, Route119_WeatherInstitute_1F_Text_26FBBB - msgbox Route119_WeatherInstitute_1F_Text_26FBD7, MSGBOX_AUTOCLOSE +Route119_WeatherInstitute_1F_EventScript_Grunt11:: @ 826FB29 + trainerbattle_single TRAINER_GRUNT_11, Route119_WeatherInstitute_1F_Text_Grunt11Intro, Route119_WeatherInstitute_1F_Text_Grunt11Defeat + msgbox Route119_WeatherInstitute_1F_Text_Grunt11PostBattle, MSGBOX_AUTOCLOSE end -Route119_WeatherInstitute_1F_EventScript_26FB40:: @ 826FB40 - trainerbattle_single TRAINER_GRUNT_20, Route119_WeatherInstitute_1F_Text_26FC34, Route119_WeatherInstitute_1F_Text_26FC52 - msgbox Route119_WeatherInstitute_1F_Text_26FC60, MSGBOX_AUTOCLOSE +Route119_WeatherInstitute_1F_EventScript_Grunt20:: @ 826FB40 + trainerbattle_single TRAINER_GRUNT_20, Route119_WeatherInstitute_1F_Text_Grunt20Intro, Route119_WeatherInstitute_1F_Text_Grunt20Defeat + msgbox Route119_WeatherInstitute_1F_Text_Grunt20PostBattle, MSGBOX_AUTOCLOSE end -Route119_WeatherInstitute_1F_Text_26FB57: @ 826FB57 +Route119_WeatherInstitute_1F_Text_Grunt11Intro: @ 826FB57 .string "The BOSS got interested in\n" .string "the research they have going here,\l" .string "so he sent us out.\p" .string "You quit meddling!$" -Route119_WeatherInstitute_1F_Text_26FBBB: @ 826FBBB +Route119_WeatherInstitute_1F_Text_Grunt11Defeat: @ 826FBBB .string "Blast it…\n" .string "Blasted by a kid…$" -Route119_WeatherInstitute_1F_Text_26FBD7: @ 826FBD7 +Route119_WeatherInstitute_1F_Text_Grunt11PostBattle: @ 826FBD7 .string "Our BOSS knows everything.\p" .string "But I'm just a GRUNT. What would I know\n" .string "about what he's thinking?$" -Route119_WeatherInstitute_1F_Text_26FC34: @ 826FC34 +Route119_WeatherInstitute_1F_Text_Grunt20Intro: @ 826FC34 .string "Huh?\n" .string "What's a kid doing here?$" -Route119_WeatherInstitute_1F_Text_26FC52: @ 826FC52 +Route119_WeatherInstitute_1F_Text_Grunt20Defeat: @ 826FC52 .string "Huh?\n" .string "I lost?!$" -Route119_WeatherInstitute_1F_Text_26FC60: @ 826FC60 +Route119_WeatherInstitute_1F_Text_Grunt20PostBattle: @ 826FC60 .string "Oh, no…\n" .string "I'll catch an earful for losing to a kid…\p" .string "I should just take a nap in the bed…$" -Route119_WeatherInstitute_1F_Text_26FCB7: @ 826FCB7 +Route119_WeatherInstitute_1F_Text_EveryoneWentUpstairs: @ 826FCB7 .string "While I was sleeping, everyone went\n" .string "upstairs!$" -Route119_WeatherInstitute_1F_Text_26FCE5: @ 826FCE5 +Route119_WeatherInstitute_1F_Text_WowYoureStrong: @ 826FCE5 .string "Wow, you're really strong!\p" .string "I wish I could be a POKéMON TRAINER\n" .string "like you!$" -Route119_WeatherInstitute_1F_Text_26FD2E: @ 826FD2E +Route119_WeatherInstitute_1F_Text_ProfStudyingRain: @ 826FD2E .string "The PROFESSOR loves rain.\n" .string "That's a fact.\p" .string "But if it keeps raining, people will be in\n" @@ -116,7 +116,7 @@ Route119_WeatherInstitute_1F_Text_26FD2E: @ 826FD2E .string "And thus, the PROFESSOR is studying\n" .string "if the rain can be put to good use.$" -Route119_WeatherInstitute_1F_Text_26FDE8: @ 826FDE8 +Route119_WeatherInstitute_1F_Text_NoticingUnusualWeather: @ 826FDE8 .string "On the 2nd floor of the INSTITUTE,\n" .string "we study the weather patterns over\l" .string "the HOENN region.\p" @@ -124,13 +124,13 @@ Route119_WeatherInstitute_1F_Text_26FDE8: @ 826FDE8 .string "isolated cases of droughts and\l" .string "heavy rain lately…$" -Route119_WeatherInstitute_1F_Text_26FE94: @ 826FE94 +Route119_WeatherInstitute_1F_Text_WhatWereAquasUpTo: @ 826FE94 .string "Hello!\n" .string "We've been saved by your actions!\p" .string "What I don't understand is what on\n" .string "earth the AQUAS were up to.$" -Route119_WeatherInstitute_1F_Text_26FEFC: @ 826FEFC +Route119_WeatherInstitute_1F_Text_TakeRestInBed: @ 826FEFC .string "There's a bed…\n" .string "Let's take a rest.$" diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json index 4b4534a8e..5b0301878 100644 --- a/data/maps/Route119_WeatherInstitute_2F/map.json +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route119_WeatherInstitute_2F_EventScript_26FF7F", + "script": "Route119_WeatherInstitute_2F_EventScript_Grunt12", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route119_WeatherInstitute_2F_EventScript_26FF96", + "script": "Route119_WeatherInstitute_2F_EventScript_Grunt13", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_WeatherInstitute_2F_EventScript_26FFAD", + "script": "Route119_WeatherInstitute_2F_EventScript_Shelly", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_WeatherInstitute_2F_EventScript_27018B", + "script": "Route119_WeatherInstitute_2F_EventScript_WeatherScientist", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route119_WeatherInstitute_2F_EventScript_26FF68", + "script": "Route119_WeatherInstitute_2F_EventScript_Grunt37", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" } ], diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index c15673dad..211a98f0f 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -4,62 +4,62 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E Route119_WeatherInstitute_2F_OnTransition: @ 826FF24 compare VAR_WEATHER_INSTITUTE_STATE, 0 - call_if_eq Route119_WeatherInstitute_2F_EventScript_26FF44 + call_if_eq Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaHere compare VAR_WEATHER_INSTITUTE_STATE, 1 - call_if_eq Route119_WeatherInstitute_2F_EventScript_26FF50 - call_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_26FF5C + call_if_eq Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaGone + call_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_SetScientistPosGameClear end -Route119_WeatherInstitute_2F_EventScript_26FF44:: @ 826FF44 +Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaHere:: @ 826FF44 setobjectxyperm 5, 1, 6 setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT return -Route119_WeatherInstitute_2F_EventScript_26FF50:: @ 826FF50 +Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaGone:: @ 826FF50 setobjectxyperm 5, 4, 6 setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT return -Route119_WeatherInstitute_2F_EventScript_26FF5C:: @ 826FF5C +Route119_WeatherInstitute_2F_EventScript_SetScientistPosGameClear:: @ 826FF5C setobjectxyperm 5, 2, 2 setobjectmovementtype 5, MOVEMENT_TYPE_FACE_UP return -Route119_WeatherInstitute_2F_EventScript_26FF68:: @ 826FF68 - trainerbattle_single TRAINER_GRUNT_37, Route119_WeatherInstitute_2F_Text_270335, Route119_WeatherInstitute_2F_Text_27039F - msgbox Route119_WeatherInstitute_2F_Text_2703C0, MSGBOX_AUTOCLOSE +Route119_WeatherInstitute_2F_EventScript_Grunt37:: @ 826FF68 + trainerbattle_single TRAINER_GRUNT_37, Route119_WeatherInstitute_2F_Text_Grunt37Intro, Route119_WeatherInstitute_2F_Text_Grunt37Defeat + msgbox Route119_WeatherInstitute_2F_Text_Grunt37PostBattle, MSGBOX_AUTOCLOSE end -Route119_WeatherInstitute_2F_EventScript_26FF7F:: @ 826FF7F - trainerbattle_single TRAINER_GRUNT_12, Route119_WeatherInstitute_2F_Text_27019C, Route119_WeatherInstitute_2F_Text_270208 - msgbox Route119_WeatherInstitute_2F_Text_27022B, MSGBOX_AUTOCLOSE +Route119_WeatherInstitute_2F_EventScript_Grunt12:: @ 826FF7F + trainerbattle_single TRAINER_GRUNT_12, Route119_WeatherInstitute_2F_Text_Grunt12Intro, Route119_WeatherInstitute_2F_Text_Grunt12Defeat + msgbox Route119_WeatherInstitute_2F_Text_Grunt12PostBattle, MSGBOX_AUTOCLOSE end -Route119_WeatherInstitute_2F_EventScript_26FF96:: @ 826FF96 - trainerbattle_single TRAINER_GRUNT_13, Route119_WeatherInstitute_2F_Text_270292, Route119_WeatherInstitute_2F_Text_2702CE - msgbox Route119_WeatherInstitute_2F_Text_2702DA, MSGBOX_AUTOCLOSE +Route119_WeatherInstitute_2F_EventScript_Grunt13:: @ 826FF96 + trainerbattle_single TRAINER_GRUNT_13, Route119_WeatherInstitute_2F_Text_Grunt13Intro, Route119_WeatherInstitute_2F_Text_Grunt13Defeat + msgbox Route119_WeatherInstitute_2F_Text_Grunt13PostBattle, MSGBOX_AUTOCLOSE end -Route119_WeatherInstitute_2F_EventScript_26FFAD:: @ 826FFAD - trainerbattle_single TRAINER_SHELLY_1, Route119_WeatherInstitute_2F_Text_270409, Route119_WeatherInstitute_2F_Text_2704BD, Route119_WeatherInstitute_2F_EventScript_26FFC8 - msgbox Route119_WeatherInstitute_2F_Text_2704E4, MSGBOX_AUTOCLOSE +Route119_WeatherInstitute_2F_EventScript_Shelly:: @ 826FFAD + trainerbattle_single TRAINER_SHELLY_1, Route119_WeatherInstitute_2F_Text_ShellyIntro, Route119_WeatherInstitute_2F_Text_ShellyDefeat, Route119_WeatherInstitute_2F_EventScript_ShellyDefeated + msgbox Route119_WeatherInstitute_2F_Text_ShellyPostBattle, MSGBOX_AUTOCLOSE end -Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 - msgbox Route119_WeatherInstitute_2F_Text_2704E4, MSGBOX_DEFAULT +Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: @ 826FFC8 + msgbox Route119_WeatherInstitute_2F_Text_ShellyPostBattle, MSGBOX_DEFAULT closemessage - addobject 7 - applymovement 7, Route119_WeatherInstitute_2F_Movement_270170 - applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_27017C + addobject 7 @ Aqua grunt + applymovement 7, Route119_WeatherInstitute_2F_Movement_GruntApproachShelly + applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_ShovePlayerOutOfWay waitmovement 0 - msgbox Route119_WeatherInstitute_2F_Text_270568, MSGBOX_DEFAULT + msgbox Route119_WeatherInstitute_2F_Text_TeamMagmaJustPassedBy, MSGBOX_DEFAULT closemessage playse SE_PIN applymovement 3, Common_Movement_ExclamationMark waitmovement 0 applymovement 3, Common_Movement_Delay48 waitmovement 0 - msgbox Route119_WeatherInstitute_2F_Text_2705DD, MSGBOX_DEFAULT + msgbox Route119_WeatherInstitute_2F_Text_WeHaveToHurryToMtPyre, MSGBOX_DEFAULT closemessage setvar VAR_WEATHER_INSTITUTE_STATE, 1 clearflag FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS @@ -72,106 +72,104 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 removeobject 3 removeobject 8 removeobject 7 - applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_270184 + applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition waitmovement 0 fadescreen 0 - applymovement 5, Route119_WeatherInstitute_2F_Movement_270187 + applymovement 5, Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer waitmovement 0 copyobjectxytoperm 5 - goto Route119_WeatherInstitute_2F_EventScript_27004D + goto Route119_WeatherInstitute_2F_EventScript_ReceiveCastform end -Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D - msgbox Route119_WeatherInstitute_2F_Text_270650, MSGBOX_DEFAULT +Route119_WeatherInstitute_2F_EventScript_ReceiveCastform:: @ 827004D + msgbox Route119_WeatherInstitute_2F_Text_ThanksPleaseTakePokemon, MSGBOX_DEFAULT setvar VAR_TEMP_1, SPECIES_CASTFORM givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER compare VAR_RESULT, 0 - goto_if_eq Route119_WeatherInstitute_2F_EventScript_270085 + goto_if_eq Route119_WeatherInstitute_2F_EventScript_ReceiveCastformParty compare VAR_RESULT, 1 - goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700AD - goto Route119_WeatherInstitute_2F_EventScript_273811 + goto_if_eq Route119_WeatherInstitute_2F_EventScript_ReceiveCastformPC + goto Common_EventScript_NoMoreRoomForPokemon end -Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085 - call Route119_WeatherInstitute_2F_EventScript_2700DB +Route119_WeatherInstitute_2F_EventScript_ReceiveCastformParty:: @ 8270085 + call Route119_WeatherInstitute_2F_EventScript_ReceivedCastformFanfare msgbox gText_NicknameThisPokemon, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700EA - call Route119_WeatherInstitute_2F_EventScript_27378B - call Common_EventScript_NameReceivedPokemon - goto Route119_WeatherInstitute_2F_EventScript_2700EA + compare VAR_RESULT, NO + goto_if_eq Route119_WeatherInstitute_2F_EventScript_ExplainCastform + call Common_EventScript_GetGiftMonPartySlot + call Common_EventScript_NameReceivedPartyMon + goto Route119_WeatherInstitute_2F_EventScript_ExplainCastform end -Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD - call Route119_WeatherInstitute_2F_EventScript_2700DB +Route119_WeatherInstitute_2F_EventScript_ReceiveCastformPC:: @ 82700AD + call Route119_WeatherInstitute_2F_EventScript_ReceivedCastformFanfare msgbox gText_NicknameThisPokemon, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700D0 - call Route119_WeatherInstitute_2F_EventScript_273797 - goto Route119_WeatherInstitute_2F_EventScript_2700D0 + compare VAR_RESULT, NO + goto_if_eq Route119_WeatherInstitute_2F_EventScript_SendCastformToPC + call Common_EventScript_NameReceivedBoxMon + goto Route119_WeatherInstitute_2F_EventScript_SendCastformToPC end -Route119_WeatherInstitute_2F_EventScript_2700D0:: @ 82700D0 - call Route119_WeatherInstitute_2F_EventScript_2737A0 - goto Route119_WeatherInstitute_2F_EventScript_2700EA +Route119_WeatherInstitute_2F_EventScript_SendCastformToPC:: @ 82700D0 + call Common_EventScript_TransferredToPC + goto Route119_WeatherInstitute_2F_EventScript_ExplainCastform end -Route119_WeatherInstitute_2F_EventScript_2700DB:: @ 82700DB +Route119_WeatherInstitute_2F_EventScript_ReceivedCastformFanfare:: @ 82700DB playfanfare MUS_FANFA4 - message Route119_WeatherInstitute_2F_Text_2706E8 + message Route119_WeatherInstitute_2F_Text_PlayerReceivedCastform waitmessage waitfanfare bufferspeciesname 0, SPECIES_CASTFORM return -Route119_WeatherInstitute_2F_EventScript_2700EA:: @ 82700EA - msgbox Route119_WeatherInstitute_2F_Text_2706FE, MSGBOX_DEFAULT +Route119_WeatherInstitute_2F_EventScript_ExplainCastform:: @ 82700EA + msgbox Route119_WeatherInstitute_2F_Text_PokemonChangesWithWeather, MSGBOX_DEFAULT setflag FLAG_RECEIVED_CASTFORM release end -Route119_WeatherInstitute_2F_EventScript_2700F7:: @ 82700F7 +Route119_WeatherInstitute_2F_EventScript_ScientistMentionWeather:: @ 82700F7 goto_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_TryStartUnusualWeather - msgbox Route119_WeatherInstitute_2F_Text_27077E, MSGBOX_DEFAULT + msgbox Route119_WeatherInstitute_2F_Text_ChangingWeatherRidiculous, MSGBOX_DEFAULT release end Route119_WeatherInstitute_2F_EventScript_TryStartUnusualWeather:: @ 827010A - @ This code uses VAR_0x8004 to count the number of legendaries the player has defeated - @ already. setvar VAR_0x8004, 0 - call_if_set FLAG_DEFEATED_KYOGRE, WeatherInstitute_UnusualWeather_EventScript_IncrementLegendCount - call_if_set FLAG_DEFEATED_GROUDON, WeatherInstitute_UnusualWeather_EventScript_IncrementLegendCount - compare VAR_0x8004, 2 - goto_if_eq WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeated - call_if_unset FLAG_TEMP_2, WeatherInstitute_UnusualWeather_EventScript_DoCreateUnusualWeather + call_if_set FLAG_DEFEATED_KYOGRE, Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated + call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated + compare VAR_0x8004, 2 @ Both defeated + goto_if_eq Route119_WeatherInstitute_2F_EventScript_NoAbnormalWeather + call_if_unset FLAG_TEMP_2, Route119_WeatherInstitute_2F_EventScript_CreateUnusualWeather specialvar VAR_RESULT, GetUnusualWeatherMapNameAndType compare VAR_RESULT, 1 - goto_if_eq WeatherInstitute_UnusualWeather_EventScript_ShowKyogreWeatherMessage - msgbox WeatherInstitute_UnusualWeather_GroudonWeatherText, MSGBOX_DEFAULT + goto_if_eq Route119_WeatherInstitute_2F_EventScript_KyogreWeather + msgbox Route119_WeatherInstitute_2F_Text_GroudonWeather, MSGBOX_DEFAULT release end -WeatherInstitute_UnusualWeather_EventScript_ShowKyogreWeatherMessage:: @ 827014F - msgbox WeatherInstitute_UnusualWeather_KyogreWeatherText, MSGBOX_DEFAULT +Route119_WeatherInstitute_2F_EventScript_KyogreWeather:: @ 827014F + msgbox Route119_WeatherInstitute_2F_Text_KyogreWeather, MSGBOX_DEFAULT release end -WeatherInstitute_UnusualWeather_EventScript_DoCreateUnusualWeather:: @ 8270159 +Route119_WeatherInstitute_2F_EventScript_CreateUnusualWeather:: @ 8270159 special CreateUnusualWeatherEvent setflag FLAG_TEMP_2 return -WeatherInstitute_UnusualWeather_EventScript_IncrementLegendCount:: @ 8270160 +Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated:: @ 8270160 addvar VAR_0x8004, 1 return -WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeated:: @ 8270166 - msgbox WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeatedText, MSGBOX_DEFAULT +Route119_WeatherInstitute_2F_EventScript_NoAbnormalWeather:: @ 8270166 + msgbox Route119_WeatherInstitute_2F_Text_NoAbnormalWeather, MSGBOX_DEFAULT release end -Route119_WeatherInstitute_2F_Movement_270170: @ 8270170 +Route119_WeatherInstitute_2F_Movement_GruntApproachShelly: @ 8270170 walk_fast_left walk_fast_left walk_fast_left @@ -185,7 +183,7 @@ Route119_WeatherInstitute_2F_Movement_270170: @ 8270170 walk_fast_left step_end -Route119_WeatherInstitute_2F_Movement_27017C: @ 827017C +Route119_WeatherInstitute_2F_Movement_ShovePlayerOutOfWay: @ 827017C delay_16 delay_16 delay_16 @@ -195,66 +193,66 @@ Route119_WeatherInstitute_2F_Movement_27017C: @ 827017C walk_in_place_fastest_down step_end -Route119_WeatherInstitute_2F_Movement_270184: @ 8270184 +Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition: @ 8270184 slide_down walk_in_place_fastest_left step_end -Route119_WeatherInstitute_2F_Movement_270187: @ 8270187 +Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer: @ 8270187 walk_right walk_right walk_right step_end -Route119_WeatherInstitute_2F_EventScript_27018B:: @ 827018B +Route119_WeatherInstitute_2F_EventScript_WeatherScientist:: @ 827018B lock faceplayer - goto_if_set FLAG_RECEIVED_CASTFORM, Route119_WeatherInstitute_2F_EventScript_2700F7 - goto Route119_WeatherInstitute_2F_EventScript_27004D + goto_if_set FLAG_RECEIVED_CASTFORM, Route119_WeatherInstitute_2F_EventScript_ScientistMentionWeather + goto Route119_WeatherInstitute_2F_EventScript_ReceiveCastform end -Route119_WeatherInstitute_2F_Text_27019C: @ 827019C +Route119_WeatherInstitute_2F_Text_Grunt12Intro: @ 827019C .string "The INSTITUTE created a type of\n" .string "POKéMON that has something to do with\l" .string "the weather. We're here to take them!$" -Route119_WeatherInstitute_2F_Text_270208: @ 8270208 +Route119_WeatherInstitute_2F_Text_Grunt12Defeat: @ 8270208 .string "Our plan's being spoiled by a kid?$" -Route119_WeatherInstitute_2F_Text_27022B: @ 827022B +Route119_WeatherInstitute_2F_Text_Grunt12PostBattle: @ 827022B .string "If the POKéMON they made here can\n" .string "control the weather freely, then we of\l" .string "TEAM AQUA definitely need it!$" -Route119_WeatherInstitute_2F_Text_270292: @ 8270292 +Route119_WeatherInstitute_2F_Text_Grunt13Intro: @ 8270292 .string "We're TEAM AQUA!\n" .string "We appear wherever anything rare is\l" .string "found!$" -Route119_WeatherInstitute_2F_Text_2702CE: @ 82702CE +Route119_WeatherInstitute_2F_Text_Grunt13Defeat: @ 82702CE .string "You got me!$" -Route119_WeatherInstitute_2F_Text_2702DA: @ 82702DA +Route119_WeatherInstitute_2F_Text_Grunt13PostBattle: @ 82702DA .string "You don't have any idea what we of\n" .string "TEAM AQUA are working towards!\l" .string "You stay out of our way!$" -Route119_WeatherInstitute_2F_Text_270335: @ 8270335 +Route119_WeatherInstitute_2F_Text_Grunt37Intro: @ 8270335 .string "Don't tell me you're looking for that\n" .string "weather POKéMON, too?\p" .string "That's a no-no!\n" .string "We were here to get it first!$" -Route119_WeatherInstitute_2F_Text_27039F: @ 827039F +Route119_WeatherInstitute_2F_Text_Grunt37Defeat: @ 827039F .string "Oh, will you look at my POKéMON?$" -Route119_WeatherInstitute_2F_Text_2703C0: @ 82703C0 +Route119_WeatherInstitute_2F_Text_Grunt37PostBattle: @ 82703C0 .string "Humph, so what?\n" .string "What we want…\p" .string "What we really want isn't here…\n" .string "Ihihihihi…$" -Route119_WeatherInstitute_2F_Text_270409: @ 8270409 +Route119_WeatherInstitute_2F_Text_ShellyIntro: @ 8270409 .string "Ahahahaha!\p" .string "You're going to meddle in TEAM AQUA's\n" .string "affairs?\p" @@ -263,55 +261,56 @@ Route119_WeatherInstitute_2F_Text_270409: @ 8270409 .string "You're so cute, you're disgusting!\n" .string "I'll put you down, kiddy!$" -Route119_WeatherInstitute_2F_Text_2704BD: @ 82704BD +Route119_WeatherInstitute_2F_Text_ShellyDefeat: @ 82704BD .string "Ahahahaha!\n" .string "You're disgustingly strong!$" -Route119_WeatherInstitute_2F_Text_2704E4: @ 82704E4 +Route119_WeatherInstitute_2F_Text_ShellyPostBattle: @ 82704E4 .string "It's bad enough to have TEAM MAGMA\n" .string "blunder about, but now there's you!\p" .string "What makes you want to sniff around\n" .string "in our business, anyway?$" -Route119_WeatherInstitute_2F_Text_270568: @ 8270568 +Route119_WeatherInstitute_2F_Text_TeamMagmaJustPassedBy: @ 8270568 .string "We have a situation here!\p" .string "A TEAM MAGMA mob just passed\n" .string "the WEATHER INSTITUTE.\p" .string "They appear to be headed for\n" .string "MT. PYRE!$" -Route119_WeatherInstitute_2F_Text_2705DD: @ 82705DD +Route119_WeatherInstitute_2F_Text_WeHaveToHurryToMtPyre: @ 82705DD .string "What?!\p" .string "We can't waste any more time here!\n" .string "We have to hurry to MT. PYRE, too!\p" .string "Ahahahaha!\n" .string "TEAM MAGMA, just you wait!$" -Route119_WeatherInstitute_2F_Text_270650: @ 8270650 +Route119_WeatherInstitute_2F_Text_ThanksPleaseTakePokemon: @ 8270650 .string "Thanks!\n" .string "Thanks to you, we're safe!\p" .string "It might be an odd way of thanking you,\n" .string "but take this POKéMON.$" -Route119_WeatherInstitute_2F_Text_2706B2: @ 82706B2 +@ Unused +Route119_WeatherInstitute_2F_Text_NoRoomForPokemon: @ 82706B2 .string "Hm? You don't seem to have any room\n" .string "for this POKéMON.$" -Route119_WeatherInstitute_2F_Text_2706E8: @ 82706E8 +Route119_WeatherInstitute_2F_Text_PlayerReceivedCastform: @ 82706E8 .string "{PLAYER} received CASTFORM!$" -Route119_WeatherInstitute_2F_Text_2706FE: @ 82706FE +Route119_WeatherInstitute_2F_Text_PokemonChangesWithWeather: @ 82706FE .string "That POKéMON changes shape according\n" .string "to the weather conditions.\p" .string "There're plenty of them in the\n" .string "INSTITUTE--go ahead and take it.$" -Route119_WeatherInstitute_2F_Text_27077E: @ 827077E +Route119_WeatherInstitute_2F_Text_ChangingWeatherRidiculous: @ 827077E .string "I've been researching rain for many\n" .string "years, but it's ridiculous to think that\l" .string "humans can freely change the weather.$" -WeatherInstitute_UnusualWeather_GroudonWeatherText: @ 82707F1 +Route119_WeatherInstitute_2F_Text_GroudonWeather: @ 82707F1 .string "I track weather patterns over\n" .string "the HOENN region.\p" .string "Presently, a drought has been recorded\n" @@ -319,7 +318,7 @@ WeatherInstitute_UnusualWeather_GroudonWeatherText: @ 82707F1 .string "Could that mean, somewhere near\n" .string "{STR_VAR_1}…$" -WeatherInstitute_UnusualWeather_KyogreWeatherText: @ 8270873 +Route119_WeatherInstitute_2F_Text_KyogreWeather: @ 8270873 .string "I track weather patterns over\n" .string "the HOENN region.\p" .string "Presently, heavy rainfall has been\n" @@ -327,7 +326,7 @@ WeatherInstitute_UnusualWeather_KyogreWeatherText: @ 8270873 .string "Could that mean, somewhere near\n" .string "{STR_VAR_1}…$" -WeatherInstitute_UnusualWeather_EventScript_ShowLegendariesAlreadyDefeatedText: @ 82708FC +Route119_WeatherInstitute_2F_Text_NoAbnormalWeather: @ 82708FC .string "Abnormal weather conditions are\n" .string "no longer being reported.\p" .string "The occasional rainfall is a blessing,\n" diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index fccf5c88e..8bcfafc72 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -243,7 +243,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_28CE76", + "script": "GabbyAndTy_EventScript_TyBattle3", "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1" }, { @@ -256,7 +256,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_28CE56", + "script": "GabbyAndTy_EventScript_GabbyBattle3", "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1" }, { @@ -269,7 +269,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_28CF16", + "script": "GabbyAndTy_EventScript_GabbyBattle6", "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2" }, { @@ -282,7 +282,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_28CF36", + "script": "GabbyAndTy_EventScript_TyBattle6", "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2" }, { @@ -412,8 +412,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_1F57BC", - "flag": "FLAG_HIDE_ROUTE_120_KECLEON_1" + "script": "Route120_EventScript_InvisibleBridgeKecleon", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_INVISIBLE" }, { "graphics_id": "EVENT_OBJ_GFX_STEVEN", @@ -425,7 +425,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_1F5641", + "script": "Route120_EventScript_Steven", "flag": "FLAG_HIDE_ROUTE_120_STEVEN" }, { @@ -491,7 +491,7 @@ "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", "script": "0x0", - "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE" + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_VISIBLE" }, { "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", @@ -503,8 +503,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_2722DB", - "flag": "FLAG_HIDE_ROUTE_120_KECLEON_2" + "script": "Route120_EventScript_Kecleon1", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_1" }, { "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", @@ -516,8 +516,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_2722E8", - "flag": "FLAG_HIDE_ROUTE_120_KECLEON_3" + "script": "Route120_EventScript_Kecleon2", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_2" }, { "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", @@ -529,8 +529,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_2722F5", - "flag": "FLAG_HIDE_ROUTE_120_KECLEON_4" + "script": "Route120_EventScript_Kecleon3", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_3" }, { "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", @@ -542,8 +542,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_27230F", - "flag": "FLAG_HIDE_ROUTE_120_KECLEON_6" + "script": "Route120_EventScript_Kecleon5", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_5" }, { "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", @@ -555,8 +555,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_272302", - "flag": "FLAG_HIDE_ROUTE_120_KECLEON_5" + "script": "Route120_EventScript_Kecleon4", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_4" }, { "graphics_id": "EVENT_OBJ_GFX_GIRL_3", diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 23f9c13e0..9ef80e893 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -1,44 +1,44 @@ Route120_MapScripts:: @ 81F53EC - map_script MAP_SCRIPT_ON_RESUME, Route120_MapScript1_1F53FC + map_script MAP_SCRIPT_ON_RESUME, Route120_OnResume map_script MAP_SCRIPT_ON_TRANSITION, Route120_OnTransition - map_script MAP_SCRIPT_ON_LOAD, Route120_MapScript1_1F5474 + map_script MAP_SCRIPT_ON_LOAD, Route120_OnLoad .byte 0 -Route120_MapScript1_1F53FC: @ 81F53FC - call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route120_EventScript_1F5406 +Route120_OnResume: @ 81F53FC + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route120_EventScript_RemoveKecleonObject end -Route120_EventScript_1F5406:: @ 81F5406 +Route120_EventScript_RemoveKecleonObject:: @ 81F5406 compare VAR_0x8009, 0 - call_if_eq Route120_EventScript_1F5449 + call_if_eq Route120_EventScript_RemoveBridgeKecleon compare VAR_0x8009, 1 - call_if_eq Route120_EventScript_1F5460 + call_if_eq Route120_EventScript_RemoveKecleon compare VAR_0x8009, 2 - call_if_eq Route120_EventScript_1F5460 + call_if_eq Route120_EventScript_RemoveKecleon compare VAR_0x8009, 3 - call_if_eq Route120_EventScript_1F5460 + call_if_eq Route120_EventScript_RemoveKecleon compare VAR_0x8009, 4 - call_if_eq Route120_EventScript_1F5460 + call_if_eq Route120_EventScript_RemoveKecleon compare VAR_0x8009, 5 - call_if_eq Route120_EventScript_1F5460 + call_if_eq Route120_EventScript_RemoveKecleon return -Route120_EventScript_1F5449:: @ 81F5449 +Route120_EventScript_RemoveBridgeKecleon:: @ 81F5449 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn - removeobject 30 - removeobject 36 + removeobject 30 @ Invisible Bridge Kecleon + removeobject 36 @ Visible Bridge Kecleon return -Route120_EventScript_1F5460:: @ 81F5460 +Route120_EventScript_RemoveKecleon:: @ 81F5460 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return -Route120_MapScript1_1F5474: @ 81F5474 +Route120_OnLoad: @ 81F5474 call_if_unset FLAG_REGI_DOORS_OPENED, Route120_EventScript_1F5490 call_if_set FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1F54A3 call_if_unset FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1F54C8 @@ -61,7 +61,7 @@ Route120_EventScript_1F54C8:: @ 81F54C8 return Route120_OnTransition: @ 81F54CD - call Route120_EventScript_28CCC7 + call GabbyAndTy_EventScript_UpdateLocation call Route120_EventScript_1F54D8 end @@ -101,9 +101,9 @@ Route120_EventScript_1F5527:: @ 81F5527 dotimebasedevents goto_if_set FLAG_DAILY_ROUTE_120_RECEIVED_BERRY, Route120_EventScript_1F5625 msgbox Route120_Text_2A70C7, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES call_if_eq Route120_EventScript_1F562F - compare VAR_RESULT, 0 + compare VAR_RESULT, NO call_if_eq Route120_EventScript_1F5638 specialvar VAR_RESULT, GetPlayerTrainerIdOnesDigit switch VAR_RESULT @@ -166,44 +166,44 @@ Route120_EventScript_1F5638:: @ 81F5638 msgbox Route120_Text_2A7183, MSGBOX_DEFAULT return -Route120_EventScript_1F5641:: @ 81F5641 +Route120_EventScript_Steven:: @ 81F5641 lock faceplayer goto_if_set FLAG_NOT_READY_FOR_BATTLE_ROUTE_120, Route120_EventScript_1F5672 - msgbox Route120_Text_1F5998, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq Route120_EventScript_1F5665 - goto Route120_EventScript_1F568B + msgbox Route120_Text_StevenGreeting, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq Route120_EventScript_StevenNotReady + goto Route120_EventScript_StevenBattleKecleon end -Route120_EventScript_1F5665:: @ 81F5665 +Route120_EventScript_StevenNotReady:: @ 81F5665 msgbox Route120_Text_1F5AAC, MSGBOX_DEFAULT setflag FLAG_NOT_READY_FOR_BATTLE_ROUTE_120 release end Route120_EventScript_1F5672:: @ 81F5672 - msgbox Route120_Text_1F5ADE, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq Route120_EventScript_1F5665 - goto Route120_EventScript_1F568B + msgbox Route120_Text_StevenReadyForBattle, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq Route120_EventScript_StevenNotReady + goto Route120_EventScript_StevenBattleKecleon end -Route120_EventScript_1F568B:: @ 81F568B - msgbox Route120_Text_1F5B0F, MSGBOX_DEFAULT +Route120_EventScript_StevenBattleKecleon:: @ 81F568B + msgbox Route120_Text_StevenShowMeYourPower, MSGBOX_DEFAULT closemessage - compare VAR_FACING, 2 - call_if_eq Route120_EventScript_1F57A3 - compare VAR_FACING, 3 - call_if_eq Route120_EventScript_1F57AE - applymovement 31, Common_Movement_WalkInPlaceLeft + compare VAR_FACING, DIR_NORTH + call_if_eq Route120_EventScript_PlayerApproachKecleonNorth + compare VAR_FACING, DIR_WEST + call_if_eq Route120_EventScript_PlayerApproachKecleonWest + applymovement 31, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 20 - msgbox Route120_Text_1F5B43, MSGBOX_DEFAULT + msgbox Route120_Text_StevenUsedDevonScope, MSGBOX_DEFAULT closemessage - applymovement 30, Common_Movement_WalkInPlaceRight + applymovement 30, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement 30, Route120_Movement_2723C7 + applymovement 30, Movement_KecleonAppears waitmovement 0 waitse playmoncry SPECIES_KECLEON, 2 @@ -215,33 +215,33 @@ Route120_EventScript_1F568B:: @ 81F568B dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 - goto_if_eq Route120_EventScript_1F571C - compare VAR_RESULT, 4 - goto_if_eq Route120_EventScript_1F571C - compare VAR_RESULT, 5 - goto_if_eq Route120_EventScript_1F571C - goto Route120_EventScript_1F572C + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq Route120_EventScript_RemoveBridgeKecleonPostBattle + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq Route120_EventScript_RemoveBridgeKecleonPostBattle + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq Route120_EventScript_RemoveBridgeKecleonPostBattle + goto Route120_EventScript_StevenGiveDeconScope end -Route120_EventScript_1F571C:: @ 81F571C +Route120_EventScript_RemoveBridgeKecleonPostBattle:: @ 81F571C fadescreenswapbuffers 1 - removeobject 30 - removeobject 36 + removeobject 30 @ Invisible Bridge Kecleon + removeobject 36 @ Visible Bridge Kecleon fadescreenswapbuffers 0 - goto Route120_EventScript_1F572C + goto Route120_EventScript_StevenGiveDeconScope end -Route120_EventScript_1F572C:: @ 81F572C - applymovement 31, Common_Movement_WalkInPlaceDown - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp +Route120_EventScript_StevenGiveDeconScope:: @ 81F572C + applymovement 31, Common_Movement_WalkInPlaceFastestDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox Route120_Text_1F5BAF, MSGBOX_DEFAULT + msgbox Route120_Text_StevenGiveDevonScope, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_SCOPE setflag FLAG_RECEIVED_DEVON_SCOPE - msgbox Route120_Text_1F5C7B, MSGBOX_DEFAULT + msgbox Route120_Text_StevenGoodbye, MSGBOX_DEFAULT closemessage - applymovement 31, Common_Movement_WalkInPlaceDown + applymovement 31, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 @@ -257,23 +257,23 @@ Route120_EventScript_1F572C:: @ 81F572C release end -Route120_EventScript_1F57A3:: @ 81F57A3 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft +Route120_EventScript_PlayerApproachKecleonNorth:: @ 81F57A3 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -Route120_EventScript_1F57AE:: @ 81F57AE - applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_1F57B9 +Route120_EventScript_PlayerApproachKecleonWest:: @ 81F57AE + applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_ApproachKecleonWest waitmovement 0 return -Route120_Movement_1F57B9: @ 81F57B9 +Route120_Movement_ApproachKecleonWest: @ 81F57B9 walk_down walk_left step_end -Route120_EventScript_1F57BC:: @ 81F57BC - msgbox Route120_Text_1F5D00, MSGBOX_NPC +Route120_EventScript_InvisibleBridgeKecleon:: @ 81F57BC + msgbox Kecleon_Text_SomethingUnseeable, MSGBOX_NPC end Route120_EventScript_1F57C5:: @ 81F57C5 @@ -299,7 +299,7 @@ Route120_EventScript_1F57EE:: @ 81F57EE end Route120_EventScript_1F581A:: @ 81F581A - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route120_Text_29E75D, MSGBOX_DEFAULT register_matchcall TRAINER_ROBERT_1 @@ -331,7 +331,7 @@ Route120_EventScript_1F587E:: @ 81F587E end Route120_EventScript_1F58AA:: @ 81F58AA - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route120_Text_29EA31, MSGBOX_DEFAULT register_matchcall TRAINER_JEFFREY_1 @@ -383,7 +383,7 @@ Route120_EventScript_1F5981:: @ 81F5981 msgbox Route120_Text_29F002, MSGBOX_AUTOCLOSE end -Route120_Text_1F5998: @ 81F5998 +Route120_Text_StevenGreeting: @ 81F5998 .string "STEVEN: Hm? {PLAYER}{KUN}, hi.\n" .string "It's been a while.\p" .string "There's something here that you can't\n" @@ -400,21 +400,21 @@ Route120_Text_1F5AAC: @ 81F5AAC .string "STEVEN: No?\p" .string "I'll wait here, so you can get ready.$" -Route120_Text_1F5ADE: @ 81F5ADE +Route120_Text_StevenReadyForBattle: @ 81F5ADE .string "STEVEN: {PLAYER}{KUN}, are your POKéMON\n" .string "ready for battle?$" -Route120_Text_1F5B0F: @ 81F5B0F +Route120_Text_StevenShowMeYourPower: @ 81F5B0F .string "STEVEN: {PLAYER}{KUN}, show me your true\n" .string "power as a TRAINER!$" -Route120_Text_1F5B43: @ 81F5B43 +Route120_Text_StevenUsedDevonScope: @ 81F5B43 .string "STEVEN used the DEVON SCOPE.\p" .string "An invisible POKéMON became completely\n" .string "visible!\p" .string "The startled POKéMON attacked!$" -Route120_Text_1F5BAF: @ 81F5BAF +Route120_Text_StevenGiveDevonScope: @ 81F5BAF .string "STEVEN: I see…\n" .string "Your battle style is intriguing.\p" .string "Your POKéMON have obviously grown\n" @@ -424,22 +424,21 @@ Route120_Text_1F5BAF: @ 81F5BAF .string "Who knows, there may be other\n" .string "concealed POKéMON.$" -Route120_Text_1F5C7B: @ 81F5C7B +Route120_Text_StevenGoodbye: @ 81F5C7B .string "STEVEN: {PLAYER}{KUN}.\p" .string "I enjoy seeing POKéMON and TRAINERS\n" .string "who strive together.\p" .string "I think you're doing great.\p" .string "Well, let's meet again somewhere.$" -Route119_Text_1F5D00: @ 81F5D00 -Route120_Text_1F5D00: @ 81F5D00 +Kecleon_Text_SomethingUnseeable: @ 81F5D00 .string "Something unseeable is in the way.$" -Route119_Text_1F5D23: @ 81F5D23 +Kecleon_Text_WantToUseDevonScope: @ 81F5D23 .string "Something unseeable is in the way.\p" .string "Want to use the DEVON SCOPE?$" -Route119_Text_1F5D63: @ 81F5D63 +Kecleon_Text_UseDevonScopeMonAttacked: @ 81F5D63 .string "{PLAYER} used the DEVON SCOPE.\p" .string "An invisible POKéMON became completely\n" .string "visible!\p" diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index edca585c9..06862972c 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -16,7 +16,7 @@ Route121_EventScript_1F5E0F:: @ 81F5E0F Route121_EventScript_1F5E18:: @ 81F5E18 lockall playbgm MUS_AQA_0, 0 - applymovement 13, Route121_Movement_2725B8 + applymovement 13, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox Route121_Text_1F605A, MSGBOX_DEFAULT closemessage @@ -80,7 +80,7 @@ Route121_EventScript_1F5E8B:: @ 81F5E8B end Route121_EventScript_1F5EB7:: @ 81F5EB7 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route121_Text_29F25B, MSGBOX_DEFAULT register_matchcall TRAINER_WALTER_1 @@ -117,7 +117,7 @@ Route121_EventScript_1F5F3A:: @ 81F5F3A end Route121_EventScript_1F5F66:: @ 81F5F66 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route121_Text_29F69F, MSGBOX_DEFAULT register_matchcall TRAINER_JESSICA_1 @@ -159,7 +159,7 @@ Route121_EventScript_1F5FF8:: @ 81F5FF8 end Route121_EventScript_1F6024:: @ 81F6024 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route121_Text_29F80D, MSGBOX_DEFAULT register_matchcall TRAINER_CRISTIN_1 diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json index 90eedd773..6cf7b5791 100644 --- a/data/maps/Route121_SafariZoneEntrance/map.json +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route121_SafariZoneEntrance_EventScript_22BBE6", + "script": "Route121_SafariZoneEntrance_EventScript_WelcomeAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route121_SafariZoneEntrance_EventScript_22BBEF", + "script": "Route121_SafariZoneEntrance_EventScript_InfoAttendant", "flag": "0" }, { @@ -92,7 +92,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "Route121_SafariZoneEntrance_EventScript_22BC18" + "script": "Route121_SafariZoneEntrance_EventScript_EntranceCounterTrigger" } ], "bg_events": [ @@ -102,7 +102,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route121_SafariZoneEntrance_EventScript_22BD21" + "script": "Route121_SafariZoneEntrance_EventScript_TrainerTipSign" } ] }
\ No newline at end of file diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index d0c950cf5..5f64957cb 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -1,20 +1,20 @@ Route121_SafariZoneEntrance_MapScripts:: @ 822BBBB - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route121_SafariZoneEntrance_MapScript2_22BBC1 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route121_SafariZoneEntrance_OnFrame .byte 0 -Route121_SafariZoneEntrance_MapScript2_22BBC1: @ 822BBC1 - map_script_2 VAR_SAFARI_ZONE_STATE, 1, Route121_SafariZoneEntrance_EventScript_22BBCB +Route121_SafariZoneEntrance_OnFrame: @ 822BBC1 + map_script_2 VAR_SAFARI_ZONE_STATE, 1, Route121_SafariZoneEntrance_EventScript_ExitSafariZone .2byte 0 -Route121_SafariZoneEntrance_EventScript_22BBCB:: @ 822BBCB +Route121_SafariZoneEntrance_EventScript_ExitSafariZone:: @ 822BBCB lockall - applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BBDD + applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_ExitSafariZone waitmovement 0 setvar VAR_SAFARI_ZONE_STATE, 0 releaseall end -Route121_SafariZoneEntrance_Movement_22BBDD: @ 822BBDD +Route121_SafariZoneEntrance_Movement_ExitSafariZone: @ 822BBDD walk_up walk_right walk_right @@ -25,59 +25,59 @@ Route121_SafariZoneEntrance_Movement_22BBDD: @ 822BBDD walk_right step_end -Route121_SafariZoneEntrance_EventScript_22BBE6:: @ 822BBE6 - msgbox Route121_SafariZoneEntrance_Text_2A4D12, MSGBOX_NPC +Route121_SafariZoneEntrance_EventScript_WelcomeAttendant:: @ 822BBE6 + msgbox Route121_SafariZoneEntrance_Text_WelcomeToSafariZone, MSGBOX_NPC end -Route121_SafariZoneEntrance_EventScript_22BBEF:: @ 822BBEF +Route121_SafariZoneEntrance_EventScript_InfoAttendant:: @ 822BBEF lock faceplayer - msgbox Route121_SafariZoneEntrance_Text_2A4E46, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq Route121_SafariZoneEntrance_EventScript_22BC0E - msgbox Route121_SafariZoneEntrance_Text_2A4E7E, MSGBOX_DEFAULT + msgbox Route121_SafariZoneEntrance_Text_WelcomeFirstTime, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq Route121_SafariZoneEntrance_EventScript_FirstTimeInfo + msgbox Route121_SafariZoneEntrance_Text_ComeInAndEnjoy, MSGBOX_DEFAULT release end -Route121_SafariZoneEntrance_EventScript_22BC0E:: @ 822BC0E - msgbox Route121_SafariZoneEntrance_Text_2A4EA1, MSGBOX_DEFAULT +Route121_SafariZoneEntrance_EventScript_FirstTimeInfo:: @ 822BC0E + msgbox Route121_SafariZoneEntrance_Text_FirstTimeInfo, MSGBOX_DEFAULT release end -Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 +Route121_SafariZoneEntrance_EventScript_EntranceCounterTrigger:: @ 822BC18 lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 showmoneybox 0, 0, 0 - msgbox Route121_SafariZoneEntrance_Text_2A4F74, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq Route121_SafariZoneEntrance_EventScript_22BC48 - msgbox Route121_SafariZoneEntrance_Text_2A4FD7, MSGBOX_DEFAULT - goto Route121_SafariZoneEntrance_EventScript_22BD06 + msgbox Route121_SafariZoneEntrance_Text_WouldYouLikeToPlay, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone + msgbox Route121_SafariZoneEntrance_Text_PlayAnotherTime, MSGBOX_DEFAULT + goto Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter end -Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 +Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone:: @ 822BC48 checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCEA - call Route121_SafariZoneEntrance_EventScript_22BCBF + goto_if_eq Route121_SafariZoneEntrance_EventScript_NoPokeblockCase + call Route121_SafariZoneEntrance_EventScript_CheckHasRoomForPokemon checkmoney 500, 0 compare VAR_RESULT, 0 - goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCF8 + goto_if_eq Route121_SafariZoneEntrance_EventScript_NotEnoughMoney playse SE_REGI - msgbox Route121_SafariZoneEntrance_Text_2A501B, MSGBOX_DEFAULT + msgbox Route121_SafariZoneEntrance_Text_ThatWillBe500Please, MSGBOX_DEFAULT takemoney 500, 0 updatemoneybox 0, 0 - msgbox Route121_SafariZoneEntrance_Text_2A5036, MSGBOX_DEFAULT + msgbox Route121_SafariZoneEntrance_Text_HereAreYourSafariBalls, MSGBOX_DEFAULT playfanfare MUS_FANFA4 - message Route121_SafariZoneEntrance_Text_2A5052 + message Route121_SafariZoneEntrance_Text_Received30SafariBalls waitfanfare - msgbox Route121_SafariZoneEntrance_Text_2A506F, MSGBOX_DEFAULT + msgbox Route121_SafariZoneEntrance_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT closemessage hidemoneybox nop nop - applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BD18 + applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_EnterSafariZone waitmovement 0 special EnterSafariMode setvar VAR_SAFARI_ZONE_STATE, 2 @@ -86,45 +86,45 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 waitstate end -Route121_SafariZoneEntrance_EventScript_22BCBF:: @ 822BCBF +Route121_SafariZoneEntrance_EventScript_CheckHasRoomForPokemon:: @ 822BCBF getpartysize - compare VAR_RESULT, 6 - goto_if_ne Route121_SafariZoneEntrance_EventScript_22BCE9 + compare VAR_RESULT, PARTY_SIZE + goto_if_ne Route121_SafariZoneEntrance_EventScript_HasRoomForPokemon specialvar VAR_RESULT, ScriptCheckFreePokemonStorageSpace compare VAR_RESULT, 1 - goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCE9 - msgbox Route121_SafariZoneEntrance_Text_2A50E5, MSGBOX_DEFAULT - goto Route121_SafariZoneEntrance_EventScript_22BD06 + goto_if_eq Route121_SafariZoneEntrance_EventScript_HasRoomForPokemon + msgbox Route121_SafariZoneEntrance_Text_PCIsFull, MSGBOX_DEFAULT + goto Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter end -Route121_SafariZoneEntrance_EventScript_22BCE9:: @ 822BCE9 +Route121_SafariZoneEntrance_EventScript_HasRoomForPokemon:: @ 822BCE9 return -Route121_SafariZoneEntrance_EventScript_22BCEA:: @ 822BCEA - msgbox Route121_SafariZoneEntrance_Text_2A5105, MSGBOX_DEFAULT - goto Route121_SafariZoneEntrance_EventScript_22BD06 +Route121_SafariZoneEntrance_EventScript_NoPokeblockCase:: @ 822BCEA + msgbox Route121_SafariZoneEntrance_Text_YouNeedPokeblockCase, MSGBOX_DEFAULT + goto Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter end -Route121_SafariZoneEntrance_EventScript_22BCF8:: @ 822BCF8 - msgbox Route121_SafariZoneEntrance_Text_2A4FF7, MSGBOX_DEFAULT - goto Route121_SafariZoneEntrance_EventScript_22BD06 +Route121_SafariZoneEntrance_EventScript_NotEnoughMoney:: @ 822BCF8 + msgbox Route121_SafariZoneEntrance_Text_NotEnoughMoney, MSGBOX_DEFAULT + goto Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter end -Route121_SafariZoneEntrance_EventScript_22BD06:: @ 822BD06 +Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter:: @ 822BD06 closemessage hidemoneybox nop nop - applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BD16 + applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_BackAwayFromCounter waitmovement 0 releaseall end -Route121_SafariZoneEntrance_Movement_22BD16: @ 822BD16 +Route121_SafariZoneEntrance_Movement_BackAwayFromCounter: @ 822BD16 walk_right step_end -Route121_SafariZoneEntrance_Movement_22BD18: @ 822BD18 +Route121_SafariZoneEntrance_Movement_EnterSafariZone: @ 822BD18 walk_left walk_left walk_left @@ -135,7 +135,7 @@ Route121_SafariZoneEntrance_Movement_22BD18: @ 822BD18 delay_16 step_end -Route121_SafariZoneEntrance_EventScript_22BD21:: @ 822BD21 - msgbox Route121_SafariZoneEntrance_Text_2A55BB, MSGBOX_SIGN +Route121_SafariZoneEntrance_EventScript_TrainerTipSign:: @ 822BD21 + msgbox Route121_SafariZoneEntrance_Text_TrainerTip, MSGBOX_SIGN end diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index ce74cbadc..b5b3e6179 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -69,7 +69,7 @@ Route123_EventScript_1F620A:: @ 81F620A end Route123_EventScript_1F6236:: @ 81F6236 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route123_Text_29FE70, MSGBOX_DEFAULT register_matchcall TRAINER_CAMERON_1 @@ -91,7 +91,7 @@ Route123_EventScript_1F626C:: @ 81F626C end Route123_EventScript_1F6298:: @ 81F6298 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route123_Text_2A0027, MSGBOX_DEFAULT register_matchcall TRAINER_JACKI_1 @@ -163,7 +163,7 @@ Route123_EventScript_1F63BC:: @ 81F63BC end Route123_EventScript_1F63E8:: @ 81F63E8 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route123_Text_2A03C1, MSGBOX_DEFAULT register_matchcall TRAINER_FERNANDO_1 diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 9a11cec2c..ed6bc1ff0 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -30,7 +30,7 @@ Route124_EventScript_1F65B3:: @ 81F65B3 end Route124_EventScript_1F65DF:: @ 81F65DF - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route124_Text_2A0C14, MSGBOX_DEFAULT register_matchcall TRAINER_JENNY_1 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json index 2b61cd6fa..c8ec142f2 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/map.json +++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route124_DivingTreasureHuntersHouse_EventScript_270A32", + "script": "Route124_DivingTreasureHuntersHouse_EventScript_TreasureHunter", "flag": "0" } ], @@ -52,7 +52,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route124_DivingTreasureHuntersHouse_EventScript_270F63" + "script": "Route124_DivingTreasureHuntersHouse_EventScript_ShardTradeBoard" } ] }
\ No newline at end of file diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc index 0fa59783d..b2c00c1cc 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc @@ -6,338 +6,338 @@ Route124_DivingTreasureHuntersHouse_OnTransition: @ 8270A2E setflag FLAG_LANDMARK_HUNTERS_HOUSE end -Route124_DivingTreasureHuntersHouse_EventScript_270A32:: @ 8270A32 +Route124_DivingTreasureHuntersHouse_EventScript_TreasureHunter:: @ 8270A32 lock faceplayer - goto_if_set FLAG_MET_DIVING_TREASURE_HUNTER, Route124_DivingTreasureHuntersHouse_EventScript_270A4E - msgbox Route124_DivingTreasureHuntersHouse_Text_270F6C, MSGBOX_DEFAULT + goto_if_set FLAG_MET_DIVING_TREASURE_HUNTER, Route124_DivingTreasureHuntersHouse_EventScript_SkipGreeting + msgbox Route124_DivingTreasureHuntersHouse_Text_Greeting, MSGBOX_DEFAULT setflag FLAG_MET_DIVING_TREASURE_HUNTER - goto Route124_DivingTreasureHuntersHouse_EventScript_270A5C + goto Route124_DivingTreasureHuntersHouse_EventScript_CheckPlayerHasShard end -Route124_DivingTreasureHuntersHouse_EventScript_270A4E:: @ 8270A4E - msgbox Route124_DivingTreasureHuntersHouse_Text_270FE5, MSGBOX_DEFAULT - goto Route124_DivingTreasureHuntersHouse_EventScript_270A5C +Route124_DivingTreasureHuntersHouse_EventScript_SkipGreeting:: @ 8270A4E + msgbox Route124_DivingTreasureHuntersHouse_Text_HaveYouSeenAnyShards, MSGBOX_DEFAULT + goto Route124_DivingTreasureHuntersHouse_EventScript_CheckPlayerHasShard end -Route124_DivingTreasureHuntersHouse_EventScript_270A5C:: @ 8270A5C - call Route124_DivingTreasureHuntersHouse_EventScript_270A72 +Route124_DivingTreasureHuntersHouse_EventScript_CheckPlayerHasShard:: @ 8270A5C + call Route124_DivingTreasureHuntersHouse_EventScript_GetPlayersShards compare VAR_TEMP_1, 0 - goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F57 - goto Route124_DivingTreasureHuntersHouse_EventScript_270AD0 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_NoShards + goto Route124_DivingTreasureHuntersHouse_EventScript_HasShard end -Route124_DivingTreasureHuntersHouse_EventScript_270A72:: @ 8270A72 +Route124_DivingTreasureHuntersHouse_EventScript_GetPlayersShards:: @ 8270A72 setvar VAR_TEMP_1, 0 checkitem ITEM_RED_SHARD, 1 - compare VAR_RESULT, 1 - call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270AB8 + compare VAR_RESULT, TRUE + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_HasRedShard checkitem ITEM_YELLOW_SHARD, 1 - compare VAR_RESULT, 1 - call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270ABE + compare VAR_RESULT, TRUE + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_HasYellowShard checkitem ITEM_BLUE_SHARD, 1 - compare VAR_RESULT, 1 - call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270AC4 + compare VAR_RESULT, TRUE + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_HasBlueShard checkitem ITEM_GREEN_SHARD, 1 - compare VAR_RESULT, 1 - call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270ACA + compare VAR_RESULT, TRUE + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_HasGreenShard return -Route124_DivingTreasureHuntersHouse_EventScript_270AB8:: @ 8270AB8 +Route124_DivingTreasureHuntersHouse_EventScript_HasRedShard:: @ 8270AB8 addvar VAR_TEMP_1, 1 return -Route124_DivingTreasureHuntersHouse_EventScript_270ABE:: @ 8270ABE +Route124_DivingTreasureHuntersHouse_EventScript_HasYellowShard:: @ 8270ABE addvar VAR_TEMP_1, 2 return -Route124_DivingTreasureHuntersHouse_EventScript_270AC4:: @ 8270AC4 +Route124_DivingTreasureHuntersHouse_EventScript_HasBlueShard:: @ 8270AC4 addvar VAR_TEMP_1, 4 return -Route124_DivingTreasureHuntersHouse_EventScript_270ACA:: @ 8270ACA +Route124_DivingTreasureHuntersHouse_EventScript_HasGreenShard:: @ 8270ACA addvar VAR_TEMP_1, 8 return -Route124_DivingTreasureHuntersHouse_EventScript_270AD0:: @ 8270AD0 - msgbox Route124_DivingTreasureHuntersHouse_Text_271098, MSGBOX_DEFAULT - goto Route124_DivingTreasureHuntersHouse_EventScript_270ADE +Route124_DivingTreasureHuntersHouse_EventScript_HasShard:: @ 8270AD0 + msgbox Route124_DivingTreasureHuntersHouse_Text_ThatsAShardIllTradeYou, MSGBOX_DEFAULT + goto Route124_DivingTreasureHuntersHouse_EventScript_ShowTradeOptions end -Route124_DivingTreasureHuntersHouse_EventScript_270ADE:: @ 8270ADE - message Route124_DivingTreasureHuntersHouse_Text_271117 +Route124_DivingTreasureHuntersHouse_EventScript_ShowTradeOptions:: @ 8270ADE + message Route124_DivingTreasureHuntersHouse_Text_WhatDoYouWantToTrade waitmessage switch VAR_TEMP_1 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270B8F - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270BB5 - case 3, Route124_DivingTreasureHuntersHouse_EventScript_270BDB - case 4, Route124_DivingTreasureHuntersHouse_EventScript_270C0C - case 5, Route124_DivingTreasureHuntersHouse_EventScript_270C32 - case 6, Route124_DivingTreasureHuntersHouse_EventScript_270C63 - case 7, Route124_DivingTreasureHuntersHouse_EventScript_270C94 - case 8, Route124_DivingTreasureHuntersHouse_EventScript_270CD0 - case 9, Route124_DivingTreasureHuntersHouse_EventScript_270CF6 - case 10, Route124_DivingTreasureHuntersHouse_EventScript_270D27 - case 11, Route124_DivingTreasureHuntersHouse_EventScript_270D58 - case 12, Route124_DivingTreasureHuntersHouse_EventScript_270D94 - case 13, Route124_DivingTreasureHuntersHouse_EventScript_270DC5 - case 14, Route124_DivingTreasureHuntersHouse_EventScript_270E01 - case 15, Route124_DivingTreasureHuntersHouse_EventScript_270E3D + case 1, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsR + case 2, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsY + case 3, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRY + case 4, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsB + case 5, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRB + case 6, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYB + case 7, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYB + case 8, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsG + case 9, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRG + case 10, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYG + case 11, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYG + case 12, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsBG + case 13, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRBG + case 14, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYBG + case 15, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYBG end -Route124_DivingTreasureHuntersHouse_EventScript_270B8F:: @ 8270B8F +Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsR:: @ 8270B8F multichoice 0, 0, MULTI_SHARDS_R, 0 switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard + case 1, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade + goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade end -Route124_DivingTreasureHuntersHouse_EventScript_270BB5:: @ 8270BB5 +Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsY:: @ 8270BB5 multichoice 0, 0, MULTI_SHARDS_Y, 0 switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard + case 1, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade + goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade end -Route124_DivingTreasureHuntersHouse_EventScript_270BDB:: @ 8270BDB +Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRY:: @ 8270BDB multichoice 0, 0, MULTI_SHARDS_RY, 0 switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93 - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard + case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard + case 2, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade + goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade end -Route124_DivingTreasureHuntersHouse_EventScript_270C0C:: @ 8270C0C +Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsB:: @ 8270C0C multichoice 0, 0, MULTI_SHARDS_B, 0 switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard + case 1, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade + goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade end -Route124_DivingTreasureHuntersHouse_EventScript_270C32:: @ 8270C32 +Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRB:: @ 8270C32 multichoice 0, 0, MULTI_SHARDS_RB, 0 switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard + case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard + case 2, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade + goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade end -Route124_DivingTreasureHuntersHouse_EventScript_270C63:: @ 8270C63 +Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYB:: @ 8270C63 multichoice 0, 0, MULTI_SHARDS_YB, 0 switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard + case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard + case 2, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade + goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade end -Route124_DivingTreasureHuntersHouse_EventScript_270C94:: @ 8270C94 +Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYB:: @ 8270C94 multichoice 0, 0, MULTI_SHARDS_RYB, 0 switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93 - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 - case 3, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard + case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard + case 2, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard + case 3, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade + goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade end -Route124_DivingTreasureHuntersHouse_EventScript_270CD0:: @ 8270CD0 +Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsG:: @ 8270CD0 multichoice 0, 0, MULTI_SHARDS_G, 0 switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard + case 1, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade + goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade end -Route124_DivingTreasureHuntersHouse_EventScript_270CF6:: @ 8270CF6 +Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRG:: @ 8270CF6 multichoice 0, 0, MULTI_SHARDS_RG, 0 switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard + case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard + case 2, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade + goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade end -Route124_DivingTreasureHuntersHouse_EventScript_270D27:: @ 8270D27 +Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYG:: @ 8270D27 multichoice 0, 0, MULTI_SHARDS_YG, 0 switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard + case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard + case 2, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade + goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade end -Route124_DivingTreasureHuntersHouse_EventScript_270D58:: @ 8270D58 +Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYG:: @ 8270D58 multichoice 0, 0, MULTI_SHARDS_RYG, 0 switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93 - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 - case 3, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard + case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard + case 2, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard + case 3, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade + goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade end -Route124_DivingTreasureHuntersHouse_EventScript_270D94:: @ 8270D94 +Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsBG:: @ 8270D94 multichoice 0, 0, MULTI_SHARDS_BG, 0 switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard + case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard + case 2, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade + goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade end -Route124_DivingTreasureHuntersHouse_EventScript_270DC5:: @ 8270DC5 +Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRBG:: @ 8270DC5 multichoice 0, 0, MULTI_SHARDS_RBG, 0 switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 - case 3, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard + case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard + case 2, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard + case 3, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade + goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade end -Route124_DivingTreasureHuntersHouse_EventScript_270E01:: @ 8270E01 +Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYBG:: @ 8270E01 multichoice 0, 0, MULTI_SHARDS_YBG, 0 switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E93 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 - case 3, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard + case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard + case 2, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard + case 3, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade + goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade end -Route124_DivingTreasureHuntersHouse_EventScript_270E3D:: @ 8270E3D +Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYBG:: @ 8270E3D multichoice 0, 0, MULTI_SHARDS_RYBG, 0 switch VAR_RESULT - case 0, Route124_DivingTreasureHuntersHouse_EventScript_270E84 - case 1, Route124_DivingTreasureHuntersHouse_EventScript_270E93 - case 2, Route124_DivingTreasureHuntersHouse_EventScript_270EA2 - case 3, Route124_DivingTreasureHuntersHouse_EventScript_270EB1 - case 4, Route124_DivingTreasureHuntersHouse_EventScript_270F4D - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard + case 1, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard + case 2, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard + case 3, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard + case 4, Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade + goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade end -Route124_DivingTreasureHuntersHouse_EventScript_270E84:: @ 8270E84 +Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard:: @ 8270E84 setvar VAR_0x8008, ITEM_RED_SHARD setvar VAR_0x8009, ITEM_FIRE_STONE - goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0 + goto Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard -Route124_DivingTreasureHuntersHouse_EventScript_270E93:: @ 8270E93 +Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard:: @ 8270E93 setvar VAR_0x8008, ITEM_YELLOW_SHARD setvar VAR_0x8009, ITEM_THUNDER_STONE - goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0 + goto Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard -Route124_DivingTreasureHuntersHouse_EventScript_270EA2:: @ 8270EA2 +Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard:: @ 8270EA2 setvar VAR_0x8008, ITEM_BLUE_SHARD setvar VAR_0x8009, ITEM_WATER_STONE - goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0 + goto Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard -Route124_DivingTreasureHuntersHouse_EventScript_270EB1:: @ 8270EB1 +Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard:: @ 8270EB1 setvar VAR_0x8008, ITEM_GREEN_SHARD setvar VAR_0x8009, ITEM_LEAF_STONE - goto Route124_DivingTreasureHuntersHouse_EventScript_270EC0 + goto Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard -Route124_DivingTreasureHuntersHouse_EventScript_270EC0:: @ 8270EC0 +Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard:: @ 8270EC0 bufferitemname 0, VAR_0x8008 bufferitemname 1, VAR_0x8009 - msgbox Route124_DivingTreasureHuntersHouse_Text_271132, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F4D + msgbox Route124_DivingTreasureHuntersHouse_Text_YoullTradeShardForStone, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade checkitemspace VAR_0x8009, 1 - compare VAR_RESULT, 1 - goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F01 + compare VAR_RESULT, TRUE + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_TradeShard checkitem VAR_0x8008, 2 - compare VAR_RESULT, 0 - goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F01 - goto Route124_DivingTreasureHuntersHouse_EventScript_270F43 + compare VAR_RESULT, FALSE + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_TradeShard + goto Route124_DivingTreasureHuntersHouse_EventScript_BagFull end -Route124_DivingTreasureHuntersHouse_EventScript_270F01:: @ 8270F01 +Route124_DivingTreasureHuntersHouse_EventScript_TradeShard:: @ 8270F01 takeitem VAR_0x8008, 1 giveitem_std VAR_0x8009 - msgbox Route124_DivingTreasureHuntersHouse_Text_271158, MSGBOX_DEFAULT - call Route124_DivingTreasureHuntersHouse_EventScript_270A72 + msgbox Route124_DivingTreasureHuntersHouse_Text_ItsADeal, MSGBOX_DEFAULT + call Route124_DivingTreasureHuntersHouse_EventScript_GetPlayersShards compare VAR_TEMP_1, 0 - goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F61 - msgbox Route124_DivingTreasureHuntersHouse_Text_27117B, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270ADE - goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_EndTrade + msgbox Route124_DivingTreasureHuntersHouse_Text_TradeSomethingElse, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_ShowTradeOptions + goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade end -Route124_DivingTreasureHuntersHouse_EventScript_270F43:: @ 8270F43 - msgbox Route124_DivingTreasureHuntersHouse_Text_2711A0, MSGBOX_DEFAULT +Route124_DivingTreasureHuntersHouse_EventScript_BagFull:: @ 8270F43 + msgbox Route124_DivingTreasureHuntersHouse_Text_BagFull, MSGBOX_DEFAULT release end -Route124_DivingTreasureHuntersHouse_EventScript_270F4D:: @ 8270F4D - msgbox Route124_DivingTreasureHuntersHouse_Text_2711D8, MSGBOX_DEFAULT +Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade:: @ 8270F4D + msgbox Route124_DivingTreasureHuntersHouse_Text_ComeBackIfYouChangeMind, MSGBOX_DEFAULT release end -Route124_DivingTreasureHuntersHouse_EventScript_270F57:: @ 8270F57 - msgbox Route124_DivingTreasureHuntersHouse_Text_271027, MSGBOX_DEFAULT +Route124_DivingTreasureHuntersHouse_EventScript_NoShards:: @ 8270F57 + msgbox Route124_DivingTreasureHuntersHouse_Text_YouHaventGotAnyShards, MSGBOX_DEFAULT release end -Route124_DivingTreasureHuntersHouse_EventScript_270F61:: @ 8270F61 +Route124_DivingTreasureHuntersHouse_EventScript_EndTrade:: @ 8270F61 release end -Route124_DivingTreasureHuntersHouse_EventScript_270F63:: @ 8270F63 - msgbox Route124_DivingTreasureHuntersHouse_Text_271217, MSGBOX_SIGN +Route124_DivingTreasureHuntersHouse_EventScript_ShardTradeBoard:: @ 8270F63 + msgbox Route124_DivingTreasureHuntersHouse_Text_ShardTradeBoard, MSGBOX_SIGN end -Route124_DivingTreasureHuntersHouse_Text_270F6C: @ 8270F6C +Route124_DivingTreasureHuntersHouse_Text_Greeting: @ 8270F6C .string "I'm the DIVING TREASURE HUNTER!\p" .string "I'm the awesome dude who makes\n" .string "deep-sea dives to gather treasures\l" .string "resting at the bottom.$" -Route124_DivingTreasureHuntersHouse_Text_270FE5: @ 8270FE5 +Route124_DivingTreasureHuntersHouse_Text_HaveYouSeenAnyShards: @ 8270FE5 .string "Tell me, have you seen any SHARDS of\n" .string "tools made in ancient times?$" -Route124_DivingTreasureHuntersHouse_Text_271027: @ 8271027 +Route124_DivingTreasureHuntersHouse_Text_YouHaventGotAnyShards: @ 8271027 .string "You haven't got any treasures\n" .string "for me…\p" .string "If you see any SHARDS, like the RED\n" .string "SHARD, you've got to trade it with me!$" -Route124_DivingTreasureHuntersHouse_Text_271098: @ 8271098 +Route124_DivingTreasureHuntersHouse_Text_ThatsAShardIllTradeYou: @ 8271098 .string "Oh, hey! That…\n" .string "That's a SHARD! I'm looking for those!\p" .string "Oh, man, you've got to trade that\n" .string "with me! I'll give you something good!$" -Route124_DivingTreasureHuntersHouse_Text_271117: @ 8271117 +Route124_DivingTreasureHuntersHouse_Text_WhatDoYouWantToTrade: @ 8271117 .string "What do you want to trade?$" -Route124_DivingTreasureHuntersHouse_Text_271132: @ 8271132 +Route124_DivingTreasureHuntersHouse_Text_YoullTradeShardForStone: @ 8271132 .string "You'll trade your {STR_VAR_1} for\n" .string "my {STR_VAR_2}, then?$" -Route124_DivingTreasureHuntersHouse_Text_271158: @ 8271158 +Route124_DivingTreasureHuntersHouse_Text_ItsADeal: @ 8271158 .string "It's a done deal!\n" .string "Use that wisely!$" -Route124_DivingTreasureHuntersHouse_Text_27117B: @ 827117B +Route124_DivingTreasureHuntersHouse_Text_TradeSomethingElse: @ 827117B .string "Do you want to trade something else?$" -Route124_DivingTreasureHuntersHouse_Text_2711A0: @ 82711A0 +Route124_DivingTreasureHuntersHouse_Text_BagFull: @ 82711A0 .string "Whoops, your BAG's full.\n" .string "Get rid of some items, friend!$" -Route124_DivingTreasureHuntersHouse_Text_2711D8: @ 82711D8 +Route124_DivingTreasureHuntersHouse_Text_ComeBackIfYouChangeMind: @ 82711D8 .string "No? That's a downer.\n" .string "Well, if you change your mind, come back.$" -Route124_DivingTreasureHuntersHouse_Text_271217: @ 8271217 +Route124_DivingTreasureHuntersHouse_Text_ShardTradeBoard: @ 8271217 .string "{CLEAR_TO 0x0a}Wanted item{CLEAR_TO 0x7c}Trade item\n" .string "{CLEAR_TO 0x0f}RED SHARD{CLEAR_TO 0x59}{LEFT_ARROW}{RIGHT_ARROW}{CLEAR_TO 0x7b}FIRE STONE{CLEAR_TO 0xc8}\p" .string "{CLEAR_TO 0x0a}Wanted item{CLEAR_TO 0x7c}Trade item\n" diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index 2c15eee3d..13fe6dc8f 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -7,7 +7,7 @@ Route125_MapScripts:: @ 81F6748 Route125_OnTransition: @ 81F6758 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq Route125_EventScript_273D13 + call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST call_if_eq UnusualWeather_StartKyogreWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST @@ -55,7 +55,7 @@ Route125_EventScript_1F6800:: @ 81F6800 end Route125_EventScript_1F682C:: @ 81F682C - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route125_Text_2A17CF, MSGBOX_DEFAULT register_matchcall TRAINER_ERNEST_1 diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 7a606e020..640a5660e 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -51,7 +51,7 @@ Route126_EventScript_1F6977:: @ 81F6977 end Route126_EventScript_1F69A3:: @ 81F69A3 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route126_Text_2A1F5A, MSGBOX_DEFAULT register_matchcall TRAINER_PABLO_1 diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 1829dbcfd..33c833e32 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -7,7 +7,7 @@ Route127_MapScripts:: @ 81F69D9 Route127_OnTransition: @ 81F69E9 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq Route127_EventScript_273D13 + call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH call_if_eq UnusualWeather_StartKyogreWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH @@ -70,7 +70,7 @@ Route127_EventScript_1F6AD6:: @ 81F6AD6 end Route127_EventScript_1F6B02:: @ 81F6B02 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route127_Text_2A26EE, MSGBOX_DEFAULT register_matchcall TRAINER_KOJI_1 diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index bad74f451..6cd398a32 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -24,18 +24,18 @@ Route128_EventScript_1F6B57:: @ 81F6B57 closemessage applymovement 5, Route128_Movement_1F6CAD waitmovement 0 - applymovement 4, Common_Movement_WalkInPlaceUp + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox Route128_Text_1F6E5A, MSGBOX_DEFAULT closemessage applymovement 5, Route128_Movement_1F6CBB waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox Route128_Text_1F6F1E, MSGBOX_DEFAULT closemessage applymovement 4, Route128_Movement_1F6C96 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement 5, Route128_Movement_1F6CA8 waitmovement 0 msgbox Route128_Text_1F704F, MSGBOX_DEFAULT @@ -53,19 +53,19 @@ Route128_EventScript_1F6B57:: @ 81F6B57 addobject 3 applymovement 3, Route128_Movement_1F6C87 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox Route128_Text_1F70C9, MSGBOX_DEFAULT closemessage applymovement 3, Route128_Movement_1F6C85 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox Route128_Text_1F70EA, MSGBOX_DEFAULT - applymovement 3, Common_Movement_WalkInPlaceDown + applymovement 3, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Route128_Text_1F721B, MSGBOX_DEFAULT closemessage - applymovement 3, Common_Movement_WalkInPlaceDown + applymovement 3, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 50 setfieldeffectargument 0, 1 @@ -184,7 +184,7 @@ Route128_EventScript_1F6CBE:: @ 81F6CBE end Route128_EventScript_1F6CEA:: @ 81F6CEA - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route128_Text_2A2916, MSGBOX_DEFAULT register_matchcall TRAINER_ISAIAH_1 @@ -206,7 +206,7 @@ Route128_EventScript_1F6D20:: @ 81F6D20 end Route128_EventScript_1F6D4C:: @ 81F6D4C - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route128_Text_2A2AF9, MSGBOX_DEFAULT register_matchcall TRAINER_KATELYN_1 diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index d57a27cf9..43d828bcd 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -13,7 +13,7 @@ Route129_MapScript1_1F7294: @ 81F7294 Route129_OnTransition: @ 81F72AB compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq Route129_EventScript_273D13 + call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_SOOTOPOLIS_CITY_STATE, 4 call_if_ge Route129_EventScript_1F72D8 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 3caeebfc6..ff9f2e03b 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -5,7 +5,7 @@ RustboroCity_MapScripts:: @ 81E06BD RustboroCity_OnTransition: @ 81E06C8 setflag FLAG_VISITED_RUSTBORO_CITY - call Common_EventScript_SetupRivalGender + call Common_EventScript_SetupRivalGfxId compare VAR_RUSTBORO_CITY_STATE, 6 call_if_eq RustboroCity_EventScript_1E0707 getplayerxy VAR_TEMP_0, VAR_TEMP_1 @@ -46,14 +46,14 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 waitmovement 0 applymovement 15, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 applymovement 15, RustboroCity_Movement_1E084E waitmovement 0 msgbox RustboroCity_Text_1E22A5, MSGBOX_DEFAULT closemessage setflag FLAG_HAS_MATCH_CALL - applymovement 15, Common_Movement_WalkInPlaceLeft + applymovement 15, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 playse SE_TK_KASYA delay 10 @@ -63,7 +63,7 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 delay 10 playse SE_TK_KASYA delay 20 - applymovement 15, Common_Movement_WalkInPlaceDown + applymovement 15, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox RustboroCity_Text_1E2331, MSGBOX_DEFAULT closemessage @@ -344,7 +344,7 @@ RustboroCity_EventScript_1E0A6E:: @ 81E0A6E RustboroCity_EventScript_1E0A79:: @ 81E0A79 applymovement 9, RustboroCity_Movement_1E0AD5 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -500,43 +500,43 @@ RustboroCity_EventScript_1E0B2E:: @ 81E0B2E end RustboroCity_EventScript_1E0B6F:: @ 81E0B6F - applymovement 9, Common_Movement_WalkInPlaceUp + applymovement 9, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN applymovement 9, Common_Movement_ExclamationMark waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return RustboroCity_EventScript_1E0B9B:: @ 81E0B9B - applymovement 9, Common_Movement_WalkInPlaceLeft + applymovement 9, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 playse SE_PIN applymovement 9, Common_Movement_ExclamationMark waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AC + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceRight waitmovement 0 return RustboroCity_EventScript_1E0BC7:: @ 81E0BC7 - applymovement 9, Common_Movement_WalkInPlaceDown + applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 9, Common_Movement_ExclamationMark waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return RustboroCity_EventScript_1E0BF3:: @ 81E0BF3 - applymovement 9, Common_Movement_WalkInPlaceDown + applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 9, Common_Movement_ExclamationMark @@ -545,7 +545,7 @@ RustboroCity_EventScript_1E0BF3:: @ 81E0BF3 waitmovement 0 applymovement 9, RustboroCity_Movement_1E0C29 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -608,43 +608,43 @@ RustboroCity_EventScript_1E0CD3:: @ 81E0CD3 return RustboroCity_EventScript_1E0CDC:: @ 81E0CDC - applymovement 9, Common_Movement_WalkInPlaceUp + applymovement 9, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN applymovement 9, Common_Movement_ExclamationMark waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return RustboroCity_EventScript_1E0D08:: @ 81E0D08 - applymovement 9, Common_Movement_WalkInPlaceRight + applymovement 9, Common_Movement_WalkInPlaceFastestRight waitmovement 0 playse SE_PIN applymovement 9, Common_Movement_ExclamationMark waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AE + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceLeft waitmovement 0 return RustboroCity_EventScript_1E0D34:: @ 81E0D34 - applymovement 9, Common_Movement_WalkInPlaceDown + applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 9, Common_Movement_ExclamationMark waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return RustboroCity_EventScript_1E0D60:: @ 81E0D60 - applymovement 9, Common_Movement_WalkInPlaceDown + applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 9, Common_Movement_ExclamationMark @@ -653,12 +653,12 @@ RustboroCity_EventScript_1E0D60:: @ 81E0D60 waitmovement 0 applymovement 9, RustboroCity_Movement_1E0C29 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return RustboroCity_EventScript_1E0D96:: @ 81E0D96 - applymovement 9, Common_Movement_WalkInPlaceLeft + applymovement 9, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 playse SE_PIN applymovement 9, Common_Movement_ExclamationMark @@ -694,7 +694,7 @@ RustboroCity_EventScript_1E0DEE:: @ 81E0DEE RustboroCity_EventScript_1E0DF3:: @ 81E0DF3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, Common_Movement_WalkInPlaceDown + applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 14, Common_Movement_ExclamationMark @@ -703,14 +703,14 @@ RustboroCity_EventScript_1E0DF3:: @ 81E0DF3 waitmovement 0 applymovement 14, RustboroCity_Movement_1E120E waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0E33:: @ 81E0E33 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, Common_Movement_WalkInPlaceDown + applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 14, Common_Movement_ExclamationMark @@ -719,14 +719,14 @@ RustboroCity_EventScript_1E0E33:: @ 81E0E33 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1215 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0E73:: @ 81E0E73 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, Common_Movement_WalkInPlaceDown + applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 14, Common_Movement_ExclamationMark @@ -735,14 +735,14 @@ RustboroCity_EventScript_1E0E73:: @ 81E0E73 waitmovement 0 applymovement 14, RustboroCity_Movement_1E121B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0EB3:: @ 81E0EB3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, Common_Movement_WalkInPlaceDown + applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 14, Common_Movement_ExclamationMark @@ -751,14 +751,14 @@ RustboroCity_EventScript_1E0EB3:: @ 81E0EB3 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1220 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0EF3:: @ 81E0EF3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, Common_Movement_WalkInPlaceDown + applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 14, Common_Movement_ExclamationMark @@ -767,14 +767,14 @@ RustboroCity_EventScript_1E0EF3:: @ 81E0EF3 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1224 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0F33:: @ 81E0F33 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, Common_Movement_WalkInPlaceDown + applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 14, Common_Movement_ExclamationMark @@ -783,14 +783,14 @@ RustboroCity_EventScript_1E0F33:: @ 81E0F33 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1227 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0F73:: @ 81E0F73 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, Common_Movement_WalkInPlaceDown + applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 14, Common_Movement_ExclamationMark @@ -799,14 +799,14 @@ RustboroCity_EventScript_1E0F73:: @ 81E0F73 waitmovement 0 applymovement 14, RustboroCity_Movement_1E122B waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0FB3:: @ 81E0FB3 lockall call RustboroCity_EventScript_1E0DD1 - applymovement 14, Common_Movement_WalkInPlaceDown + applymovement 14, Common_Movement_WalkInPlaceFastestDown waitmovement 0 playse SE_PIN applymovement 14, Common_Movement_ExclamationMark @@ -815,7 +815,7 @@ RustboroCity_EventScript_1E0FB3:: @ 81E0FB3 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1230 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -844,7 +844,7 @@ RustboroCity_EventScript_1E100B:: @ 81E100B setvar VAR_ROUTE104_STATE, 2 setvar VAR_0x8008, 0 msgbox RustboroCity_Text_1E1AFA, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq RustboroCity_EventScript_1E1092 msgbox RustboroCity_Text_1E1BD3, MSGBOX_DEFAULT call RustboroCity_EventScript_1E10D6 @@ -854,7 +854,7 @@ RustboroCity_EventScript_1E100B:: @ 81E100B RustboroCity_EventScript_1E1070:: @ 81E1070 setvar VAR_0x8008, 1 msgbox RustboroCity_Text_1E1C48, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq RustboroCity_EventScript_1E1092 msgbox RustboroCity_Text_1E1BD3, MSGBOX_DEFAULT releaseall @@ -914,7 +914,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114 setvar VAR_RUSTBORO_CITY_STATE, 8 setvar VAR_ROUTE104_STATE, 2 msgbox RustboroCity_Text_1E1E34, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq RustboroCity_EventScript_1E1191 msgbox RustboroCity_Text_1E1F2F, MSGBOX_DEFAULT call RustboroCity_EventScript_1E10D6 @@ -923,7 +923,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114 RustboroCity_EventScript_1E1174:: @ 81E1174 msgbox RustboroCity_Text_1E1F76, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq RustboroCity_EventScript_1E1191 msgbox RustboroCity_Text_1E1F2F, MSGBOX_DEFAULT releaseall diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index f920bda55..751285a7a 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -84,7 +84,7 @@ RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933 applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119EF checkitem ITEM_CLAW_FOSSIL, 1 compare VAR_RESULT, 1 @@ -109,7 +109,7 @@ RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991 applymovement 5, Common_Movement_Delay48 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119EF checkitem ITEM_ROOT_FOSSIL, 1 compare VAR_RESULT, 1 @@ -162,30 +162,30 @@ RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A6E compare VAR_RESULT, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A96 - goto RustboroCity_DevonCorp_2F_EventScript_273811 + goto Common_EventScript_NoMoreRoomForPokemon end RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E call RustboroCity_DevonCorp_2F_EventScript_211AC4 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AD7 - call RustboroCity_DevonCorp_2F_EventScript_27378B - call Common_EventScript_NameReceivedPokemon + call Common_EventScript_GetGiftMonPartySlot + call Common_EventScript_NameReceivedPartyMon goto RustboroCity_DevonCorp_2F_EventScript_211AD7 end RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96 call RustboroCity_DevonCorp_2F_EventScript_211AC4 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AB9 - call RustboroCity_DevonCorp_2F_EventScript_273797 + call Common_EventScript_NameReceivedBoxMon goto RustboroCity_DevonCorp_2F_EventScript_211AB9 end RustboroCity_DevonCorp_2F_EventScript_211AB9:: @ 8211AB9 - call RustboroCity_DevonCorp_2F_EventScript_2737A0 + call Common_EventScript_TransferredToPC goto RustboroCity_DevonCorp_2F_EventScript_211AD7 end @@ -211,30 +211,30 @@ RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B11 compare VAR_RESULT, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B39 - goto RustboroCity_DevonCorp_2F_EventScript_273811 + goto Common_EventScript_NoMoreRoomForPokemon end RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11 call RustboroCity_DevonCorp_2F_EventScript_211B67 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B7A - call RustboroCity_DevonCorp_2F_EventScript_27378B - call Common_EventScript_NameReceivedPokemon + call Common_EventScript_GetGiftMonPartySlot + call Common_EventScript_NameReceivedPartyMon goto RustboroCity_DevonCorp_2F_EventScript_211B7A end RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39 call RustboroCity_DevonCorp_2F_EventScript_211B67 msgbox gText_NicknameThisPokemon, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B5C - call RustboroCity_DevonCorp_2F_EventScript_273797 + call Common_EventScript_NameReceivedBoxMon goto RustboroCity_DevonCorp_2F_EventScript_211B5C end RustboroCity_DevonCorp_2F_EventScript_211B5C:: @ 8211B5C - call RustboroCity_DevonCorp_2F_EventScript_2737A0 + call Common_EventScript_TransferredToPC goto RustboroCity_DevonCorp_2F_EventScript_211B7A end diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc index e5b6c493a..5a4b50ccc 100644 --- a/data/maps/RustboroCity_Flat1_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc @@ -26,14 +26,14 @@ RustboroCity_Flat1_2F_EventScript_215157:: @ 8215157 RustboroCity_Flat1_2F_EventScript_21518D:: @ 821518D msgbox RustboroCity_Flat1_2F_Text_2152FA, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq RustboroCity_Flat1_2F_EventScript_2151CD msgbox RustboroCity_Flat1_2F_Text_2154AD, MSGBOX_DEFAULT goto RustboroCity_Flat1_2F_EventScript_215157 RustboroCity_Flat1_2F_EventScript_2151AD:: @ 82151AD msgbox RustboroCity_Flat1_2F_Text_215448, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq RustboroCity_Flat1_2F_EventScript_2151CD msgbox RustboroCity_Flat1_2F_Text_2154AD, MSGBOX_DEFAULT goto RustboroCity_Flat1_2F_EventScript_215157 diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json index 3da39df9d..99ae9ebd8 100644 --- a/data/maps/RustboroCity_Gym/map.json +++ b/data/maps/RustboroCity_Gym/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Gym_EventScript_212F31", + "script": "RustboroCity_Gym_EventScript_Roxanne", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "RustboroCity_Gym_EventScript_212FE3", + "script": "RustboroCity_Gym_EventScript_Josh", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "RustboroCity_Gym_EventScript_212FFA", + "script": "RustboroCity_Gym_EventScript_Tommy", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_Gym_EventScript_213028", + "script": "RustboroCity_Gym_EventScript_GymGuide", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "RustboroCity_Gym_EventScript_213011", + "script": "RustboroCity_Gym_EventScript_Marc", "flag": "0" } ], @@ -104,7 +104,7 @@ "y": 18, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_Gym_EventScript_213047" + "script": "RustboroCity_Gym_EventScript_LeftGymStatue" }, { "type": "sign", @@ -112,7 +112,7 @@ "y": 18, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_Gym_EventScript_213057" + "script": "RustboroCity_Gym_EventScript_RightGymStatue" } ] }
\ No newline at end of file diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 04027dfa7..0a95a86e5 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -1,103 +1,103 @@ RustboroCity_Gym_MapScripts:: @ 8212F30 .byte 0 -RustboroCity_Gym_EventScript_212F31:: @ 8212F31 - trainerbattle_single TRAINER_ROXANNE_1, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66, NO_MUSIC +RustboroCity_Gym_EventScript_Roxanne:: @ 8212F31 + trainerbattle_single TRAINER_ROXANNE_1, RustboroCity_Gym_Text_RoxannePreBattle, RustboroCity_Gym_Text_RoxanneDefeat, RustboroCity_Gym_EventScript_RoxanneDefeated, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq RustboroCity_Gym_EventScript_212FC8 - goto_if_unset FLAG_RECEIVED_TM39, RustboroCity_Gym_EventScript_212FA4 - msgbox RustboroCity_Gym_Text_2139A7, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq RustboroCity_Gym_EventScript_RoxanneRematch + goto_if_unset FLAG_RECEIVED_TM39, RustboroCity_Gym_EventScript_GiveRockTomb + msgbox RustboroCity_Gym_Text_RoxannePostBattle, MSGBOX_DEFAULT release end -RustboroCity_Gym_EventScript_212F66:: @ 8212F66 - message RustboroCity_Gym_Text_2137EC +RustboroCity_Gym_EventScript_RoxanneDefeated:: @ 8212F66 + message RustboroCity_Gym_Text_ReceivedStoneBadge waitmessage call Common_EventScript_PlayGymBadgeFanfare - msgbox RustboroCity_Gym_Text_213816, MSGBOX_DEFAULT + msgbox RustboroCity_Gym_Text_StoneBadgeInfoTakeThis, MSGBOX_DEFAULT setflag FLAG_DEFEATED_RUSTBORO_GYM setflag FLAG_BADGE01_GET setvar VAR_RUSTBORO_CITY_STATE, 1 addvar VAR_PETALBURG_GYM_STATE, 1 setvar VAR_0x8008, 1 - call RustboroCity_Gym_EventScript_271F43 + call Common_EventScript_SetGymTrainers compare VAR_PETALBURG_GYM_STATE, 6 - call_if_eq RustboroCity_Gym_EventScript_271E84 - goto RustboroCity_Gym_EventScript_212FA4 + call_if_eq Common_EventScript_ReadyPetalburgGymForBattle + goto RustboroCity_Gym_EventScript_GiveRockTomb end -RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4 +RustboroCity_Gym_EventScript_GiveRockTomb:: @ 8212FA4 giveitem_std ITEM_TM39 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM39 - msgbox RustboroCity_Gym_Text_2138B1, MSGBOX_DEFAULT + msgbox RustboroCity_Gym_Text_ExplainRockTomb, MSGBOX_DEFAULT release end -RustboroCity_Gym_EventScript_212FC8:: @ 8212FC8 - trainerbattle_rematch_double TRAINER_ROXANNE_1, RustboroCity_Gym_Text_213C2F, RustboroCity_Gym_Text_213CF9, RustboroCity_Gym_Text_213D93 - msgbox RustboroCity_Gym_Text_213D12, MSGBOX_AUTOCLOSE +RustboroCity_Gym_EventScript_RoxanneRematch:: @ 8212FC8 + trainerbattle_rematch_double TRAINER_ROXANNE_1, RustboroCity_Gym_Text_RoxannePreRematch, RustboroCity_Gym_Text_RoxanneRematchDefeat, RustboroCity_Gym_Text_RoxanneRematchNeedTwoMons + msgbox RustboroCity_Gym_Text_RoxannePostRematch, MSGBOX_AUTOCLOSE end -RustboroCity_Gym_EventScript_212FE3:: @ 8212FE3 - trainerbattle_single TRAINER_JOSH, RustboroCity_Gym_Text_2133E9, RustboroCity_Gym_Text_21342D - msgbox RustboroCity_Gym_Text_213447, MSGBOX_AUTOCLOSE +RustboroCity_Gym_EventScript_Josh:: @ 8212FE3 + trainerbattle_single TRAINER_JOSH, RustboroCity_Gym_Text_JoshPreBattle, RustboroCity_Gym_Text_JoshDefeat + msgbox RustboroCity_Gym_Text_JoshPostBattle, MSGBOX_AUTOCLOSE end -RustboroCity_Gym_EventScript_212FFA:: @ 8212FFA - trainerbattle_single TRAINER_TOMMY, RustboroCity_Gym_Text_213486, RustboroCity_Gym_Text_2134C6 - msgbox RustboroCity_Gym_Text_2134E6, MSGBOX_AUTOCLOSE +RustboroCity_Gym_EventScript_Tommy:: @ 8212FFA + trainerbattle_single TRAINER_TOMMY, RustboroCity_Gym_Text_TommyPreBattle, RustboroCity_Gym_Text_TommyDefeat + msgbox RustboroCity_Gym_Text_TommyPostBattle, MSGBOX_AUTOCLOSE end -RustboroCity_Gym_EventScript_213011:: @ 8213011 - trainerbattle_single TRAINER_MARC, RustboroCity_Gym_Text_213533, RustboroCity_Gym_Text_213589 - msgbox RustboroCity_Gym_Text_2135C0, MSGBOX_AUTOCLOSE +RustboroCity_Gym_EventScript_Marc:: @ 8213011 + trainerbattle_single TRAINER_MARC, RustboroCity_Gym_Text_MarcPreBattle, RustboroCity_Gym_Text_MarcDefeat + msgbox RustboroCity_Gym_Text_MarcPostBattle, MSGBOX_AUTOCLOSE end -RustboroCity_Gym_EventScript_213028:: @ 8213028 +RustboroCity_Gym_EventScript_GymGuide:: @ 8213028 lock faceplayer - goto_if_set FLAG_DEFEATED_RUSTBORO_GYM, RustboroCity_Gym_EventScript_21303D - msgbox RustboroCity_Gym_Text_21309D, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_RUSTBORO_GYM, RustboroCity_Gym_EventScript_GymGuidePostVictory + msgbox RustboroCity_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT release end -RustboroCity_Gym_EventScript_21303D:: @ 821303D - msgbox RustboroCity_Gym_Text_2132E2, MSGBOX_DEFAULT +RustboroCity_Gym_EventScript_GymGuidePostVictory:: @ 821303D + msgbox RustboroCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT release end -RustboroCity_Gym_EventScript_213047:: @ 8213047 +RustboroCity_Gym_EventScript_LeftGymStatue:: @ 8213047 lockall - goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_213067 - goto RustboroCity_Gym_EventScript_213071 + goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_GymStatueCertified + goto RustboroCity_Gym_EventScript_GymStatue end -RustboroCity_Gym_EventScript_213057:: @ 8213057 +RustboroCity_Gym_EventScript_RightGymStatue:: @ 8213057 lockall - goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_213067 - goto RustboroCity_Gym_EventScript_213071 + goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_GymStatueCertified + goto RustboroCity_Gym_EventScript_GymStatue end -RustboroCity_Gym_EventScript_213067:: @ 8213067 - msgbox RustboroCity_Gym_Text_213A3B, MSGBOX_DEFAULT +RustboroCity_Gym_EventScript_GymStatueCertified:: @ 8213067 + msgbox RustboroCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT releaseall end -RustboroCity_Gym_EventScript_213071:: @ 8213071 - msgbox RustboroCity_Gym_Text_213A21, MSGBOX_DEFAULT +RustboroCity_Gym_EventScript_GymStatue:: @ 8213071 + msgbox RustboroCity_Gym_Text_GymStatue, MSGBOX_DEFAULT releaseall end -RustboroCity_Gym_EventScript_21307B:: @ 821307B +RustboroCity_Gym_EventScript_RegisterRoxanne:: @ 821307B lockall - pokenavcall RustboroCity_Gym_Text_213A76 + pokenavcall RustboroCity_Gym_Text_RoxanneRegisterCall waitmessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox RustboroCity_Gym_Text_213C01, MSGBOX_DEFAULT + msgbox RustboroCity_Gym_Text_RegisteredRoxanne, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -106,7 +106,7 @@ RustboroCity_Gym_EventScript_21307B:: @ 821307B releaseall end -RustboroCity_Gym_Text_21309D: @ 821309D +RustboroCity_Gym_Text_GymGuideAdvice: @ 821309D .string "Yo, how's it going?\p" .string "Listen, my friend!\n" .string "Would you like to become the CHAMPION?\p" @@ -128,7 +128,7 @@ RustboroCity_Gym_Text_21309D: @ 821309D .string "the GYM LEADER.\p" .string "Well, go for it!$" -RustboroCity_Gym_Text_2132E2: @ 82132E2 +RustboroCity_Gym_Text_GymGuidePostVictory: @ 82132E2 .string "Whoa! What a breathtaking victory!\n" .string "My cheering must've worked!\p" .string "Great!\n" @@ -140,45 +140,45 @@ RustboroCity_Gym_Text_2132E2: @ 82132E2 .string "the stairs to the CHAMPIONSHIP!\p" .string "That's got to feel awesome!$" -RustboroCity_Gym_Text_2133E9: @ 82133E9 +RustboroCity_Gym_Text_JoshPreBattle: @ 82133E9 .string "Don't take us GYM TRAINERS lightly!\n" .string "I'll show you why we're better!$" -RustboroCity_Gym_Text_21342D: @ 821342D +RustboroCity_Gym_Text_JoshDefeat: @ 821342D .string "You were too good for me…$" -RustboroCity_Gym_Text_213447: @ 8213447 +RustboroCity_Gym_Text_JoshPostBattle: @ 8213447 .string "You haven't seen anything of the ROCK\n" .string "type's terrifying power!$" -RustboroCity_Gym_Text_213486: @ 8213486 +RustboroCity_Gym_Text_TommyPreBattle: @ 8213486 .string "If you can't beat me, you won't stand\n" .string "a chance against ROXANNE!$" -RustboroCity_Gym_Text_2134C6: @ 82134C6 +RustboroCity_Gym_Text_TommyDefeat: @ 82134C6 .string "Wow! You've got some potential!$" -RustboroCity_Gym_Text_2134E6: @ 82134E6 +RustboroCity_Gym_Text_TommyPostBattle: @ 82134E6 .string "ROXANNE is stronger than me by\n" .string "several times.\p" .string "You'd better be on your guard!$" -RustboroCity_Gym_Text_213533: @ 8213533 +RustboroCity_Gym_Text_MarcPreBattle: @ 8213533 .string "We might be in the middle of town,\n" .string "but so what?\p" .string "My ROCK POKéMON need room to\n" .string "rampage!$" -RustboroCity_Gym_Text_213589: @ 8213589 +RustboroCity_Gym_Text_MarcDefeat: @ 8213589 .string "Oh, man oh man!\n" .string "Our challenger is one feisty customer!$" -RustboroCity_Gym_Text_2135C0: @ 82135C0 +RustboroCity_Gym_Text_MarcPostBattle: @ 82135C0 .string "I have to hand it to our LEADER.\p" .string "It took smarts and sense for her to\n" .string "pick the ROCK type at her young age.$" -RustboroCity_Gym_Text_21362A: @ 821362A +RustboroCity_Gym_Text_RoxannePreBattle: @ 821362A .string "Hello, I am ROXANNE, the RUSTBORO\n" .string "POKéMON GYM LEADER.\p" .string "I became a GYM LEADER so that I might\n" @@ -187,7 +187,7 @@ RustboroCity_Gym_Text_21362A: @ 821362A .string "Would you kindly demonstrate how you\n" .string "battle, and with which POKéMON?$" -RustboroCity_Gym_Text_21370B: @ 821370B +RustboroCity_Gym_Text_RoxanneDefeat: @ 821370B .string "So…\n" .string "I lost…\p" .string "It seems that I still have much more\n" @@ -199,18 +199,18 @@ RustboroCity_Gym_Text_21370B: @ 821370B .string "Please accept the official POKéMON\n" .string "LEAGUE STONE BADGE.$" -RustboroCity_Gym_Text_2137EC: @ 82137EC +RustboroCity_Gym_Text_ReceivedStoneBadge: @ 82137EC .string "{PLAYER} received the STONE BADGE\n" .string "from ROXANNE.$" -RustboroCity_Gym_Text_213816: @ 8213816 +RustboroCity_Gym_Text_StoneBadgeInfoTakeThis: @ 8213816 .string "The STONE BADGE heightens the ATTACK\n" .string "power of your POKéMON.\p" .string "It also enables them to use the HM move\n" .string "CUT outside of battle.\p" .string "Please take this with you, too.$" -RustboroCity_Gym_Text_2138B1: @ 82138B1 +RustboroCity_Gym_Text_ExplainRockTomb: @ 82138B1 .string "That TECHNICAL MACHINE, TM39,\n" .string "contains ROCK TOMB.\p" .string "It not only inflicts damage by dropping\n" @@ -220,22 +220,21 @@ RustboroCity_Gym_Text_2138B1: @ 82138B1 .string "Remember, a TM can be used only once,\n" .string "so think before you use it.$" -RustboroCity_Gym_Text_2139A7: @ 82139A7 +RustboroCity_Gym_Text_RoxannePostBattle: @ 82139A7 .string "Since you are so strong, you should\n" .string "challenge other GYM LEADERS.\p" .string "By battling many TRAINERS, you should\n" .string "learn many things.$" -RustboroCity_Gym_Text_213A21: @ 8213A21 +RustboroCity_Gym_Text_GymStatue: @ 8213A21 .string "RUSTBORO CITY POKéMON GYM$" -RustboroCity_Gym_Text_213A3B: @ 8213A3B +RustboroCity_Gym_Text_GymStatueCertified: @ 8213A3B .string "RUSTBORO CITY POKéMON GYM\p" .string "ROXANNE'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" - -RustboroCity_Gym_Text_213A76: @ 8213A76 +RustboroCity_Gym_Text_RoxanneRegisterCall: @ 8213A76 .string "… … … … … …\n" .string "… … … … … Beep!\p" .string "ROXANNE: Oh, hello, {PLAYER}?\n" @@ -252,11 +251,11 @@ RustboroCity_Gym_Text_213A76: @ 8213A76 .string "… … … … … …\n" .string "… … … … … Click!$" -RustboroCity_Gym_Text_213C01: @ 8213C01 +RustboroCity_Gym_Text_RegisteredRoxanne: @ 8213C01 .string "Registered GYM LEADER ROXANNE\n" .string "in the POKéNAV.$" -RustboroCity_Gym_Text_213C2F: @ 8213C2F +RustboroCity_Gym_Text_RoxannePreRematch: @ 8213C2F .string "ROXANNE: I'm so glad to see you again.\n" .string "I'm ROXANNE, the GYM LEADER here.\p" .string "I'm sure we've both experienced many\n" @@ -264,17 +263,17 @@ RustboroCity_Gym_Text_213C2F: @ 8213C2F .string "I would like to see how much better\n" .string "we've become. Let us battle!$" -RustboroCity_Gym_Text_213CF9: @ 8213CF9 +RustboroCity_Gym_Text_RoxanneRematchDefeat: @ 8213CF9 .string "Grr…\n" .string "Again, I have lost…$" -RustboroCity_Gym_Text_213D12: @ 8213D12 +RustboroCity_Gym_Text_RoxannePostRematch: @ 8213D12 .string "ROXANNE: I still have much to learn\n" .string "when it comes to battling POKéMON.\p" .string "That awareness makes me love battling\n" .string "all that much more!$" -RustboroCity_Gym_Text_213D93: @ 8213D93 +RustboroCity_Gym_Text_RoxanneRematchNeedTwoMons: @ 8213D93 .string "ROXANNE: I'm so glad to see you again.\n" .string "I'm ROXANNE, the GYM LEADER here.\p" .string "I'm sure we've both experienced many\n" diff --git a/data/maps/RustboroCity_House1/scripts.inc b/data/maps/RustboroCity_House1/scripts.inc index eb5655b1a..f578b251b 100644 --- a/data/maps/RustboroCity_House1/scripts.inc +++ b/data/maps/RustboroCity_House1/scripts.inc @@ -5,14 +5,14 @@ RustboroCity_House1_EventScript_21593F:: @ 821593F lock faceplayer goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_2159D5 - setvar VAR_0x8008, 0 + setvar VAR_0x8008, INGAME_TRADE_SEEDOT copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT msgbox RustboroCity_House1_Text_2159E8, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq RustboroCity_House1_EventScript_2159BD - special sub_81B94B0 + special ChoosePartyMon waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 diff --git a/data/maps/RustboroCity_Mart/scripts.inc b/data/maps/RustboroCity_Mart/scripts.inc index a5693847c..88a540356 100644 --- a/data/maps/RustboroCity_Mart/scripts.inc +++ b/data/maps/RustboroCity_Mart/scripts.inc @@ -4,7 +4,7 @@ RustboroCity_Mart_MapScripts:: @ 8214F05 RustboroCity_Mart_EventScript_214F06:: @ 8214F06 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage goto_if_unset FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_214F21 goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_214F48 @@ -12,7 +12,7 @@ RustboroCity_Mart_EventScript_214F06:: @ 8214F06 RustboroCity_Mart_EventScript_214F21:: @ 8214F21 pokemart RustboroCity_Mart_Pokemart_214F30 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -33,7 +33,7 @@ RustboroCity_Mart_Pokemart_214F30: @ 8214F30 RustboroCity_Mart_EventScript_214F48:: @ 8214F48 pokemart RustboroCity_Mart_Pokemart_214F58 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index 4d50ca89c..46555ba28 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -1,16 +1,16 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62 map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, RustboroCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 RustboroCity_PokemonCenter_1F_OnTransition: @ 8214D6D setrespawn HEAL_LOCATION_RUSTBORO_CITY - call RustboroCity_PokemonCenter_1F_EventScript_2718DE + call Common_EventScript_UpdateBrineyLocation end RustboroCity_PokemonCenter_1F_EventScript_214D76:: @ 8214D76 setvar VAR_0x800B, 1 - call RustboroCity_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json index db6388bba..812cb7c02 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RustboroCity_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc index 3c62abc4a..ba7b5b285 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ RustboroCity_PokemonCenter_2F_MapScripts:: @ 8214EDE - map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, RustboroCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -RustboroCity_PokemonCenter_2F_EventScript_214EF3:: @ 8214EF3 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +RustboroCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8214EF3 + call CableClub_EventScript_Colosseum end -RustboroCity_PokemonCenter_2F_EventScript_214EF9:: @ 8214EF9 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +RustboroCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8214EF9 + call CableClub_EventScript_TradeCenter end -RustboroCity_PokemonCenter_2F_EventScript_214EFF:: @ 8214EFF - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +RustboroCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8214EFF + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index 4d0abc9c3..db4bf21f0 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -78,16 +78,16 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 lock faceplayer goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_213FFB - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq RustboroCity_PokemonSchool_EventScript_213FE5 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if_eq RustboroCity_PokemonSchool_EventScript_213FF0 msgbox RustboroCity_PokemonSchool_Text_214433, MSGBOX_DEFAULT giveitem_std ITEM_QUICK_CLAW compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 setflag FLAG_RECEIVED_QUICK_CLAW release @@ -106,7 +106,7 @@ RustboroCity_PokemonSchool_EventScript_213FF0:: @ 8213FF0 RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB msgbox RustboroCity_PokemonSchool_Text_2144C8, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 release end diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 8cb20e372..9bdec7e8e 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -94,7 +94,7 @@ RusturfTunnel_EventScript_22CF6F:: @ 822CF6F applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045 applymovement 1, RusturfTunnel_Movement_22D06C waitmovement 0 - applymovement 10, Common_Movement_WalkInPlaceDown + applymovement 10, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -102,14 +102,14 @@ RusturfTunnel_EventScript_22CF8B:: @ 822CF8B applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045 applymovement 1, RusturfTunnel_Movement_22D06C waitmovement 0 - applymovement 10, Common_Movement_WalkInPlaceDown + applymovement 10, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return RusturfTunnel_EventScript_22CFA7:: @ 822CFA7 - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index ec231ccdd..f91cc6a3b 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -201,7 +201,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219 lockall applymovement 5, SSTidalCorridor_Movement_23C26D waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox SSTidalCorridor_Text_23C28F, MSGBOX_DEFAULT closemessage diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index 0dafeb180..90ecec8c2 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -40,7 +40,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_North_EventScript_23D254", + "script": "SafariZone_North_EventScript_Fisherman", "flag": "0" }, { @@ -53,7 +53,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_North_EventScript_23D25D", + "script": "SafariZone_North_EventScript_Man", "flag": "0" }, { diff --git a/data/maps/SafariZone_North/scripts.inc b/data/maps/SafariZone_North/scripts.inc index d98fdca88..365266b4b 100644 --- a/data/maps/SafariZone_North/scripts.inc +++ b/data/maps/SafariZone_North/scripts.inc @@ -1,11 +1,11 @@ SafariZone_North_MapScripts:: @ 823D253 .byte 0 -SafariZone_North_EventScript_23D254:: @ 823D254 - msgbox SafariZone_North_Text_2A5489, MSGBOX_NPC +SafariZone_North_EventScript_Fisherman:: @ 823D254 + msgbox SafariZone_North_Text_Fisherman, MSGBOX_NPC end -SafariZone_North_EventScript_23D25D:: @ 823D25D - msgbox SafariZone_North_Text_2A54F0, MSGBOX_NPC +SafariZone_North_EventScript_Man:: @ 823D25D + msgbox SafariZone_North_Text_Man, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json index 798563263..d362f8de3 100644 --- a/data/maps/SafariZone_Northeast/map.json +++ b/data/maps/SafariZone_Northeast/map.json @@ -35,7 +35,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Northeast_EventScript_23D3C6", + "script": "SafariZone_Northeast_EventScript_Boy", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Northeast_EventScript_23D3D8", + "script": "SafariZone_Northeast_EventScript_Girl", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Northeast_EventScript_23D3CF", + "script": "SafariZone_Northeast_EventScript_Woman", "flag": "0" }, { diff --git a/data/maps/SafariZone_Northeast/scripts.inc b/data/maps/SafariZone_Northeast/scripts.inc index 207e2a584..a34d6ab95 100644 --- a/data/maps/SafariZone_Northeast/scripts.inc +++ b/data/maps/SafariZone_Northeast/scripts.inc @@ -1,3 +1,4 @@ SafariZone_Northeast_MapScripts:: @ 8242C02 .byte 0 +@ Event scripts for SafariZone_Northeast are in SafariZone_South/scripts.inc diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json index 6ead6d714..7805c872e 100644 --- a/data/maps/SafariZone_Northwest/map.json +++ b/data/maps/SafariZone_Northwest/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Northwest_EventScript_23D24A", + "script": "SafariZone_Northwest_EventScript_Man", "flag": "0" }, { diff --git a/data/maps/SafariZone_Northwest/scripts.inc b/data/maps/SafariZone_Northwest/scripts.inc index a64c142fe..5e6261a2e 100644 --- a/data/maps/SafariZone_Northwest/scripts.inc +++ b/data/maps/SafariZone_Northwest/scripts.inc @@ -1,7 +1,7 @@ SafariZone_Northwest_MapScripts:: @ 823D249 .byte 0 -SafariZone_Northwest_EventScript_23D24A:: @ 823D24A - msgbox SafariZone_Northwest_Text_2A542C, MSGBOX_NPC +SafariZone_Northwest_EventScript_Man:: @ 823D24A + msgbox SafariZone_Northwest_Text_Man, MSGBOX_NPC end diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json index db0ba8048..fd9ae9dcb 100644 --- a/data/maps/SafariZone_RestHouse/map.json +++ b/data/maps/SafariZone_RestHouse/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_RestHouse_EventScript_242BE7", + "script": "SafariZone_RestHouse_EventScript_Youngster", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_RestHouse_EventScript_242BF0", + "script": "SafariZone_RestHouse_EventScript_PsychicM", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_RestHouse_EventScript_242BF9", + "script": "SafariZone_RestHouse_EventScript_FatMan", "flag": "0" } ], diff --git a/data/maps/SafariZone_RestHouse/scripts.inc b/data/maps/SafariZone_RestHouse/scripts.inc index e08cfe3da..bc5688f0f 100644 --- a/data/maps/SafariZone_RestHouse/scripts.inc +++ b/data/maps/SafariZone_RestHouse/scripts.inc @@ -1,15 +1,15 @@ SafariZone_RestHouse_MapScripts:: @ 8242BE6 .byte 0 -SafariZone_RestHouse_EventScript_242BE7:: @ 8242BE7 - msgbox SafariZone_RestHouse_Text_2A5639, MSGBOX_NPC +SafariZone_RestHouse_EventScript_Youngster:: @ 8242BE7 + msgbox SafariZone_RestHouse_Text_Youngster, MSGBOX_NPC end -SafariZone_RestHouse_EventScript_242BF0:: @ 8242BF0 - msgbox SafariZone_RestHouse_Text_2A56E1, MSGBOX_NPC +SafariZone_RestHouse_EventScript_PsychicM:: @ 8242BF0 + msgbox SafariZone_RestHouse_Text_PsychicM, MSGBOX_NPC end -SafariZone_RestHouse_EventScript_242BF9:: @ 8242BF9 - msgbox SafariZone_RestHouse_Text_2A5764, MSGBOX_NPC +SafariZone_RestHouse_EventScript_FatMan:: @ 8242BF9 + msgbox SafariZone_RestHouse_Text_FatMan, MSGBOX_NPC end diff --git a/data/maps/SafariZone_South/map.json b/data/maps/SafariZone_South/map.json index 371be2119..b23420ba4 100644 --- a/data/maps/SafariZone_South/map.json +++ b/data/maps/SafariZone_South/map.json @@ -40,7 +40,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_South_EventScript_23D2E5", + "script": "SafariZone_South_EventScript_ExitAttendant", "flag": "0" }, { @@ -53,7 +53,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_South_EventScript_23D2CA", + "script": "SafariZone_South_EventScript_Boy", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_South_EventScript_23D2D3", + "script": "SafariZone_South_EventScript_Man", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_South_EventScript_23D2DC", + "script": "SafariZone_South_EventScript_Youngster", "flag": "0" }, { @@ -92,7 +92,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_South_EventScript_23D390", + "script": "SafariZone_South_EventScript_ConstructionWorker1", "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS" }, { @@ -105,7 +105,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_South_EventScript_23D3A2", + "script": "SafariZone_South_EventScript_ConstructionWorker2", "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS" } ], diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc index 45273de12..ed3703449 100644 --- a/data/maps/SafariZone_South/scripts.inc +++ b/data/maps/SafariZone_South/scripts.inc @@ -1,17 +1,17 @@ SafariZone_South_MapScripts:: @ 823D279 map_script MAP_SCRIPT_ON_TRANSITION, SafariZone_South_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, SafariZone_South_MapScript2_23D284 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SafariZone_South_OnFrame .byte 0 -SafariZone_South_MapScript2_23D284: @ 823D284 - map_script_2 VAR_SAFARI_ZONE_STATE, 2, SafariZone_South_EventScript_23D28E +SafariZone_South_OnFrame: @ 823D284 + map_script_2 VAR_SAFARI_ZONE_STATE, 2, SafariZone_South_EventScript_EnterSafariZone .2byte 0 -SafariZone_South_EventScript_23D28E:: @ 823D28E +SafariZone_South_EventScript_EnterSafariZone:: @ 823D28E lockall - applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_23D2C5 + applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_PlayerEnter waitmovement 0 - applymovement 1, SafariZone_South_Movement_23D2C7 + applymovement 1, SafariZone_South_Movement_ExitAttendantBlockDoor waitmovement 0 setobjectxyperm 1, 32, 34 setvar VAR_SAFARI_ZONE_STATE, 0 @@ -20,133 +20,133 @@ SafariZone_South_EventScript_23D28E:: @ 823D28E SafariZone_South_OnTransition: @ 823D2B1 compare VAR_SAFARI_ZONE_STATE, 2 - call_if_eq SafariZone_South_EventScript_23D2BD + call_if_eq SafariZone_South_EventScript_SetExitAttendantAside end -SafariZone_South_EventScript_23D2BD:: @ 823D2BD +SafariZone_South_EventScript_SetExitAttendantAside:: @ 823D2BD setobjectxyperm 1, 31, 34 return -SafariZone_South_Movement_23D2C5: @ 823D2C5 +SafariZone_South_Movement_PlayerEnter: @ 823D2C5 walk_down step_end -SafariZone_South_Movement_23D2C7: @ 823D2C7 +SafariZone_South_Movement_ExitAttendantBlockDoor: @ 823D2C7 walk_right walk_in_place_fastest_down step_end -SafariZone_South_EventScript_23D2CA:: @ 823D2CA - msgbox SafariZone_South_Text_2A52EF, MSGBOX_NPC +SafariZone_South_EventScript_Boy:: @ 823D2CA + msgbox SafariZone_South_Text_Boy, MSGBOX_NPC end -SafariZone_South_EventScript_23D2D3:: @ 823D2D3 - msgbox SafariZone_South_Text_2A533B, MSGBOX_NPC +SafariZone_South_EventScript_Man:: @ 823D2D3 + msgbox SafariZone_South_Text_Man, MSGBOX_NPC end -SafariZone_South_EventScript_23D2DC:: @ 823D2DC - msgbox SafariZone_South_Text_2A553E, MSGBOX_NPC +SafariZone_South_EventScript_Youngster:: @ 823D2DC + msgbox SafariZone_South_Text_Youngster, MSGBOX_NPC end -SafariZone_South_EventScript_23D2E5:: @ 823D2E5 +SafariZone_South_EventScript_ExitAttendant:: @ 823D2E5 lock faceplayer - goto_if_unset FLAG_GOOD_LUCK_SAFARI_ZONE, SafariZone_South_EventScript_23D30D - msgbox SafariZone_South_Text_2A51D4, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq SafariZone_South_EventScript_23D31A - msgbox SafariZone_South_Text_2A521A, MSGBOX_DEFAULT + goto_if_unset FLAG_GOOD_LUCK_SAFARI_ZONE, SafariZone_South_EventScript_GoodLuck + msgbox SafariZone_South_Text_StillHaveTimeExit, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq SafariZone_South_EventScript_ExitEarly + msgbox SafariZone_South_Text_EnjoyTheRestOfYourAdventure, MSGBOX_DEFAULT release end -SafariZone_South_EventScript_23D30D:: @ 823D30D +SafariZone_South_EventScript_GoodLuck:: @ 823D30D setflag FLAG_GOOD_LUCK_SAFARI_ZONE - msgbox SafariZone_South_Text_2A52AB, MSGBOX_DEFAULT + msgbox SafariZone_South_Text_GoodLuck, MSGBOX_DEFAULT release end -SafariZone_South_EventScript_23D31A:: @ 823D31A - msgbox SafariZone_South_Text_2A5248, MSGBOX_DEFAULT +SafariZone_South_EventScript_ExitEarly:: @ 823D31A + msgbox SafariZone_South_Text_ExitEarlyThankYouForPlaying, MSGBOX_DEFAULT closemessage switch VAR_FACING - case 2, SafariZone_South_EventScript_23D33F - case 4, SafariZone_South_EventScript_23D359 + case DIR_NORTH, SafariZone_South_EventScript_ExitEarlyNorth + case DIR_EAST, SafariZone_South_EventScript_ExitEarlyEast end -SafariZone_South_EventScript_23D33F:: @ 823D33F - applymovement 1, SafariZone_South_Movement_23D38A +SafariZone_South_EventScript_ExitEarlyNorth:: @ 823D33F + applymovement 1, SafariZone_South_Movement_MoveExitAttendantNorth waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_23D385 + applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_PlayerExitNorth waitmovement 0 - goto SafariZone_South_EventScript_23D373 + goto SafariZone_South_EventScript_Exit end -SafariZone_South_EventScript_23D359:: @ 823D359 - applymovement 1, SafariZone_South_Movement_23D38D +SafariZone_South_EventScript_ExitEarlyEast:: @ 823D359 + applymovement 1, SafariZone_South_Movement_MoveExitAttendantEast waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_23D387 + applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_PlayerExitEast waitmovement 0 - goto SafariZone_South_EventScript_23D373 + goto SafariZone_South_EventScript_Exit end -SafariZone_South_EventScript_23D373:: @ 823D373 +SafariZone_South_EventScript_Exit:: @ 823D373 setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate end -SafariZone_South_Movement_23D385: @ 823D385 +SafariZone_South_Movement_PlayerExitNorth: @ 823D385 walk_up step_end -SafariZone_South_Movement_23D387: @ 823D387 +SafariZone_South_Movement_PlayerExitEast: @ 823D387 walk_right walk_in_place_fastest_up step_end -SafariZone_South_Movement_23D38A: @ 823D38A +SafariZone_South_Movement_MoveExitAttendantNorth: @ 823D38A walk_left walk_in_place_fastest_right step_end -SafariZone_South_Movement_23D38D: @ 823D38D +SafariZone_South_Movement_MoveExitAttendantEast: @ 823D38D walk_down walk_in_place_fastest_up step_end -SafariZone_South_EventScript_23D390:: @ 823D390 - msgbox SafariZone_South_Text_2A57EE, MSGBOX_NPC +SafariZone_South_EventScript_ConstructionWorker1:: @ 823D390 + msgbox SafariZone_South_Text_AreaOffLimits1, MSGBOX_NPC end -SafariZone_Southeast_EventScript_23D399:: @ 823D399 - msgbox SafariZone_Southeast_Text_2A582D, MSGBOX_NPC +SafariZone_Southeast_EventScript_ExpansionZoneAttendant:: @ 823D399 + msgbox SafariZone_Southeast_Text_ExpansionIsFinished, MSGBOX_NPC end -SafariZone_South_EventScript_23D3A2:: @ 823D3A2 - msgbox SafariZone_South_Text_2A5887, MSGBOX_NPC +SafariZone_South_EventScript_ConstructionWorker2:: @ 823D3A2 + msgbox SafariZone_South_Text_AreaOffLimits2, MSGBOX_NPC end -SafariZone_Southeast_EventScript_23D3AB:: @ 823D3AB - msgbox SafariZone_Southeast_Text_2A58C6, MSGBOX_NPC +SafariZone_Southeast_EventScript_LittleGirl:: @ 823D3AB + msgbox SafariZone_Southeast_Text_LittleGirl, MSGBOX_NPC end -SafariZone_Southeast_EventScript_23D3B4:: @ 823D3B4 - msgbox SafariZone_Southeast_Text_2A58FD, MSGBOX_NPC +SafariZone_Southeast_EventScript_FatMan:: @ 823D3B4 + msgbox SafariZone_Southeast_Text_FatMan, MSGBOX_NPC end -SafariZone_Southeast_EventScript_23D3BD:: @ 823D3BD - msgbox SafariZone_Southeast_Text_2A5960, MSGBOX_NPC +SafariZone_Southeast_EventScript_RichBoy:: @ 823D3BD + msgbox SafariZone_Southeast_Text_RichBoy, MSGBOX_NPC end -SafariZone_Northeast_EventScript_23D3C6:: @ 823D3C6 - msgbox SafariZone_Northeast_Text_2A59A4, MSGBOX_NPC +SafariZone_Northeast_EventScript_Boy:: @ 823D3C6 + msgbox SafariZone_Northeast_Text_Boy, MSGBOX_NPC end -SafariZone_Northeast_EventScript_23D3CF:: @ 823D3CF - msgbox SafariZone_Northeast_Text_2A5A09, MSGBOX_NPC +SafariZone_Northeast_EventScript_Woman:: @ 823D3CF + msgbox SafariZone_Northeast_Text_Woman, MSGBOX_NPC end -SafariZone_Northeast_EventScript_23D3D8:: @ 823D3D8 - msgbox SafariZone_Northeast_Text_2A5A44, MSGBOX_NPC +SafariZone_Northeast_EventScript_Girl:: @ 823D3D8 + msgbox SafariZone_Northeast_Text_Girl, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json index cb293b149..f17a9acd3 100644 --- a/data/maps/SafariZone_Southeast/map.json +++ b/data/maps/SafariZone_Southeast/map.json @@ -35,7 +35,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Southeast_EventScript_23D3BD", + "script": "SafariZone_Southeast_EventScript_RichBoy", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Southeast_EventScript_23D3B4", + "script": "SafariZone_Southeast_EventScript_FatMan", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Southeast_EventScript_23D3AB", + "script": "SafariZone_Southeast_EventScript_LittleGirl", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Southeast_EventScript_23D399", + "script": "SafariZone_Southeast_EventScript_ExpansionZoneAttendant", "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION" } ], diff --git a/data/maps/SafariZone_Southeast/scripts.inc b/data/maps/SafariZone_Southeast/scripts.inc index f88cd22fb..658d88e56 100644 --- a/data/maps/SafariZone_Southeast/scripts.inc +++ b/data/maps/SafariZone_Southeast/scripts.inc @@ -1,3 +1,4 @@ SafariZone_Southeast_MapScripts:: @ 8242C03 .byte 0 +@ Event scripts for SafariZone_Southeast are in SafariZone_South/scripts.inc diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json index 3784db801..261f7f49d 100644 --- a/data/maps/SafariZone_Southwest/map.json +++ b/data/maps/SafariZone_Southwest/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Southwest_EventScript_23D267", + "script": "SafariZone_Southwest_EventScript_Woman", "flag": "0" }, { @@ -69,7 +69,7 @@ "y": 7, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SafariZone_Southwest_EventScript_23D270" + "script": "SafariZone_Southwest_EventScript_RestHouseSign" } ] }
\ No newline at end of file diff --git a/data/maps/SafariZone_Southwest/scripts.inc b/data/maps/SafariZone_Southwest/scripts.inc index 069f22b49..c862f7906 100644 --- a/data/maps/SafariZone_Southwest/scripts.inc +++ b/data/maps/SafariZone_Southwest/scripts.inc @@ -1,11 +1,11 @@ SafariZone_Southwest_MapScripts:: @ 823D266 .byte 0 -SafariZone_Southwest_EventScript_23D267:: @ 823D267 - msgbox SafariZone_Southwest_Text_2A53B7, MSGBOX_NPC +SafariZone_Southwest_EventScript_Woman:: @ 823D267 + msgbox SafariZone_Southwest_Text_Woman, MSGBOX_NPC end -SafariZone_Southwest_EventScript_23D270:: @ 823D270 - msgbox SafariZone_Southwest_Text_2A5613, MSGBOX_SIGN +SafariZone_Southwest_EventScript_RestHouseSign:: @ 823D270 + msgbox SafariZone_Southwest_Text_RestHouseSign, MSGBOX_SIGN end diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index bc4f04b7f..e10b52d00 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -18,48 +18,48 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 applymovement 1, Common_Movement_Delay48 waitmovement 0 delay 20 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if_eq SeafloorCavern_Entrance_EventScript_23452E - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq SeafloorCavern_Entrance_EventScript_234523 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq SeafloorCavern_Entrance_EventScript_234539 delay 30 setvar VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1 copyobjectxytoperm 1 msgbox SeafloorCavern_Entrance_Text_234544, MSGBOX_DEFAULT closemessage - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if_eq SeafloorCavern_Entrance_EventScript_23452E - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq SeafloorCavern_Entrance_EventScript_234523 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq SeafloorCavern_Entrance_EventScript_234539 msgbox SeafloorCavern_Entrance_Text_2346C8, MSGBOX_DEFAULT closemessage - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end SeafloorCavern_Entrance_EventScript_234523:: @ 8234523 - applymovement 1, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return SeafloorCavern_Entrance_EventScript_23452E:: @ 823452E - applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return SeafloorCavern_Entrance_EventScript_234539:: @ 8234539 - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json index 88db72b4a..a4849023a 100644 --- a/data/maps/SeafloorCavern_Room1/map.json +++ b/data/maps/SeafloorCavern_Room1/map.json @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "SeafloorCavern_Room1_EventScript_2347EC", + "script": "SeafloorCavern_Room1_EventScript_Grunt5", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "SeafloorCavern_Room1_EventScript_234803", + "script": "SeafloorCavern_Room1_EventScript_Grunt6", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" } ], diff --git a/data/maps/SeafloorCavern_Room1/scripts.inc b/data/maps/SeafloorCavern_Room1/scripts.inc index 92049e8ef..375797d7b 100644 --- a/data/maps/SeafloorCavern_Room1/scripts.inc +++ b/data/maps/SeafloorCavern_Room1/scripts.inc @@ -1,35 +1,35 @@ SeafloorCavern_Room1_MapScripts:: @ 82347EB .byte 0 -SeafloorCavern_Room1_EventScript_2347EC:: @ 82347EC - trainerbattle_single TRAINER_GRUNT_5, SeafloorCavern_Room1_Text_23481A, SeafloorCavern_Room1_Text_23484A - msgbox SeafloorCavern_Room1_Text_23485D, MSGBOX_AUTOCLOSE +SeafloorCavern_Room1_EventScript_Grunt5:: @ 82347EC + trainerbattle_single TRAINER_GRUNT_5, SeafloorCavern_Room1_Text_Grunt5Intro, SeafloorCavern_Room1_Text_Grunt5Defeat + msgbox SeafloorCavern_Room1_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE end -SeafloorCavern_Room1_EventScript_234803:: @ 8234803 - trainerbattle_single TRAINER_GRUNT_6, SeafloorCavern_Room1_Text_234898, SeafloorCavern_Room1_Text_2348CD - msgbox SeafloorCavern_Room1_Text_2348E3, MSGBOX_AUTOCLOSE +SeafloorCavern_Room1_EventScript_Grunt6:: @ 8234803 + trainerbattle_single TRAINER_GRUNT_6, SeafloorCavern_Room1_Text_Grunt6Intro, SeafloorCavern_Room1_Text_Grunt6Defeat + msgbox SeafloorCavern_Room1_Text_Grunt6PostBattle, MSGBOX_AUTOCLOSE end -SeafloorCavern_Room1_Text_23481A: @ 823481A +SeafloorCavern_Room1_Text_Grunt5Intro: @ 823481A .string "We don't need a kid around!\n" .string "Go on home already!$" -SeafloorCavern_Room1_Text_23484A: @ 823484A +SeafloorCavern_Room1_Text_Grunt5Defeat: @ 823484A .string "I want to go home…$" -SeafloorCavern_Room1_Text_23485D: @ 823485D +SeafloorCavern_Room1_Text_Grunt5PostBattle: @ 823485D .string "I want to get a promotion so I can\n" .string "boss around the GRUNTS…$" -SeafloorCavern_Room1_Text_234898: @ 8234898 +SeafloorCavern_Room1_Text_Grunt6Intro: @ 8234898 .string "That submarine… It's tiny inside.\n" .string "I'm sore all over!$" -SeafloorCavern_Room1_Text_2348CD: @ 82348CD +SeafloorCavern_Room1_Text_Grunt6Defeat: @ 82348CD .string "Losing makes me sore!$" -SeafloorCavern_Room1_Text_2348E3: @ 82348E3 +SeafloorCavern_Room1_Text_Grunt6PostBattle: @ 82348E3 .string "That submarine we jacked, man,\n" .string "it's brutal as a ride.\l" .string "It's way too tight in there!$" diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json index 2a33c44cf..3a0d2afb7 100644 --- a/data/maps/SeafloorCavern_Room3/map.json +++ b/data/maps/SeafloorCavern_Room3/map.json @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "SeafloorCavern_Room3_EventScript_234938", + "script": "SeafloorCavern_Room3_EventScript_Shelly", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" }, { @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "SeafloorCavern_Room3_EventScript_23494F", + "script": "SeafloorCavern_Room3_EventScript_Grunt27", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" } ], diff --git a/data/maps/SeafloorCavern_Room3/scripts.inc b/data/maps/SeafloorCavern_Room3/scripts.inc index 40913f407..c3cbff28d 100644 --- a/data/maps/SeafloorCavern_Room3/scripts.inc +++ b/data/maps/SeafloorCavern_Room3/scripts.inc @@ -1,17 +1,17 @@ SeafloorCavern_Room3_MapScripts:: @ 8234937 .byte 0 -SeafloorCavern_Room3_EventScript_234938:: @ 8234938 - trainerbattle_single TRAINER_SHELLY_2, SeafloorCavern_Room3_Text_234966, SeafloorCavern_Room3_Text_234A79 - msgbox SeafloorCavern_Room3_Text_234A8A, MSGBOX_AUTOCLOSE +SeafloorCavern_Room3_EventScript_Shelly:: @ 8234938 + trainerbattle_single TRAINER_SHELLY_2, SeafloorCavern_Room3_Text_ShellyIntro, SeafloorCavern_Room3_Text_ShellyDefeat + msgbox SeafloorCavern_Room3_Text_ShellyPostBattle, MSGBOX_AUTOCLOSE end -SeafloorCavern_Room3_EventScript_23494F:: @ 823494F - trainerbattle_single TRAINER_GRUNT_27, SeafloorCavern_Room3_Text_234B3A, SeafloorCavern_Room3_Text_234BFE - msgbox SeafloorCavern_Room3_Text_234C04, MSGBOX_AUTOCLOSE +SeafloorCavern_Room3_EventScript_Grunt27:: @ 823494F + trainerbattle_single TRAINER_GRUNT_27, SeafloorCavern_Room3_Text_Grunt27Intro, SeafloorCavern_Room3_Text_Grunt27Defeat + msgbox SeafloorCavern_Room3_Text_Grunt27PostBattle, MSGBOX_AUTOCLOSE end -SeafloorCavern_Room3_Text_234966: @ 8234966 +SeafloorCavern_Room3_Text_ShellyIntro: @ 8234966 .string "Ahahahaha!\p" .string "How did you manage to get here without\n" .string "a submarine?\l" @@ -23,11 +23,11 @@ SeafloorCavern_Room3_Text_234966: @ 8234966 .string "I'm going to give you a little taste\n" .string "of pain! Resign yourself to it!$" -SeafloorCavern_Room3_Text_234A79: @ 8234A79 +SeafloorCavern_Room3_Text_ShellyDefeat: @ 8234A79 .string "Ahahahaha!\p" .string "Ouch!$" -SeafloorCavern_Room3_Text_234A8A: @ 8234A8A +SeafloorCavern_Room3_Text_ShellyPostBattle: @ 8234A8A .string "Ahahahaha!\n" .string "You're so darn strong.\p" .string "It's terribly disappointing that you're\n" @@ -36,7 +36,7 @@ SeafloorCavern_Room3_Text_234A8A: @ 8234A8A .string "world our BOSS has promised as\l" .string "one of us…$" -SeafloorCavern_Room3_Text_234B3A: @ 8234B3A +SeafloorCavern_Room3_Text_Grunt27Intro: @ 8234B3A .string "For our dream to become real, we need\n" .string "the power of POKéMON.\p" .string "But meddlers like you use the power of\n" @@ -45,10 +45,10 @@ SeafloorCavern_Room3_Text_234B3A: @ 8234B3A .string "Life just doesn't work the way we\n" .string "need it to!$" -SeafloorCavern_Room3_Text_234BFE: @ 8234BFE +SeafloorCavern_Room3_Text_Grunt27Defeat: @ 8234BFE .string "Gwah!$" -SeafloorCavern_Room3_Text_234C04: @ 8234C04 +SeafloorCavern_Room3_Text_Grunt27PostBattle: @ 8234C04 .string "You know, we don't dare question\n" .string "the motives of our leader.\p" .string "But here you are, just some punk,\n" diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json index 0638ab4ed..7bd919eab 100644 --- a/data/maps/SeafloorCavern_Room4/map.json +++ b/data/maps/SeafloorCavern_Room4/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "SeafloorCavern_Room4_EventScript_234C9C", + "script": "SeafloorCavern_Room4_EventScript_Grunt7", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "SeafloorCavern_Room4_EventScript_234CB3", + "script": "SeafloorCavern_Room4_EventScript_Grunt9", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" } ], diff --git a/data/maps/SeafloorCavern_Room4/scripts.inc b/data/maps/SeafloorCavern_Room4/scripts.inc index 132d24a32..c64748251 100644 --- a/data/maps/SeafloorCavern_Room4/scripts.inc +++ b/data/maps/SeafloorCavern_Room4/scripts.inc @@ -1,35 +1,35 @@ SeafloorCavern_Room4_MapScripts:: @ 8234C9B .byte 0 -SeafloorCavern_Room4_EventScript_234C9C:: @ 8234C9C - trainerbattle_single TRAINER_GRUNT_7, SeafloorCavern_Room4_Text_234CCA, SeafloorCavern_Room4_Text_234CF3 - msgbox SeafloorCavern_Room4_Text_234CFC, MSGBOX_AUTOCLOSE +SeafloorCavern_Room4_EventScript_Grunt7:: @ 8234C9C + trainerbattle_single TRAINER_GRUNT_7, SeafloorCavern_Room4_Text_Grunt7Intro, SeafloorCavern_Room4_Text_Grunt7Defeat + msgbox SeafloorCavern_Room4_Text_Grunt7PostBattle, MSGBOX_AUTOCLOSE end -SeafloorCavern_Room4_EventScript_234CB3:: @ 8234CB3 - trainerbattle_single TRAINER_GRUNT_9, SeafloorCavern_Room4_Text_234D3A, SeafloorCavern_Room4_Text_234D68 - msgbox SeafloorCavern_Room4_Text_234D79, MSGBOX_AUTOCLOSE +SeafloorCavern_Room4_EventScript_Grunt9:: @ 8234CB3 + trainerbattle_single TRAINER_GRUNT_9, SeafloorCavern_Room4_Text_Grunt9Intro, SeafloorCavern_Room4_Text_Grunt9Defeat + msgbox SeafloorCavern_Room4_Text_Grunt9PostBattle, MSGBOX_AUTOCLOSE end -SeafloorCavern_Room4_Text_234CCA: @ 8234CCA +SeafloorCavern_Room4_Text_Grunt7Intro: @ 8234CCA .string "Who are you?\n" .string "Where did you come in from?$" -SeafloorCavern_Room4_Text_234CF3: @ 8234CF3 +SeafloorCavern_Room4_Text_Grunt7Defeat: @ 8234CF3 .string "Lost it…$" -SeafloorCavern_Room4_Text_234CFC: @ 8234CFC +SeafloorCavern_Room4_Text_Grunt7PostBattle: @ 8234CFC .string "I can't find the way out!\p" .string "I'm not afraid. Don't get me wrong!$" -SeafloorCavern_Room4_Text_234D3A: @ 8234D3A +SeafloorCavern_Room4_Text_Grunt9Intro: @ 8234D3A .string "Who are you?\n" .string "Where do you think you're going?$" -SeafloorCavern_Room4_Text_234D68: @ 8234D68 +SeafloorCavern_Room4_Text_Grunt9Defeat: @ 8234D68 .string "I failed to win!$" -SeafloorCavern_Room4_Text_234D79: @ 8234D79 +SeafloorCavern_Room4_Text_Grunt9PostBattle: @ 8234D79 .string "My partner forgot the map in that\n" .string "submarine!\p" .string "How's that for being useless?$" diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index 77dcdc169..9a2ab1d3e 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -123,7 +123,7 @@ "elevation": 3, "var": "VAR_SEAFLOOR_CAVERN_STATE", "var_value": "0", - "script": "SeafloorCavern_Room9_EventScript_234DC9" + "script": "SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre" } ], "bg_events": [] diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 17b1515c0..68db475cd 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -1,38 +1,38 @@ SeafloorCavern_Room9_MapScripts:: @ 8234DC8 .byte 0 -SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 +SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: @ 8234DC9 lockall - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 4 - setvar VAR_0x8007, 5 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + setvar VAR_0x8004, 2 @ Archie + setvar VAR_0x8005, 3 @ Maxie + setvar VAR_0x8006, 4 @ Magma grunt 1 + setvar VAR_0x8007, 5 @ Magma grunt 2 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_23505C + applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_Delay32 waitmovement 0 playbgm MUS_AQA_0, 0 - msgbox SeafloorCavern_Room9_Text_23505F, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_ArchieHoldItRightThere, MSGBOX_DEFAULT closemessage addobject VAR_0x8004 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23502A + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_ArchieApproachPlayer waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23507C, MSGBOX_DEFAULT - applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp + msgbox SeafloorCavern_Room9_Text_ArchieSoItWasYou, MSGBOX_DEFAULT + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2350A6, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_ArchieBeholdKyogre, MSGBOX_DEFAULT applymovement VAR_0x8004, Common_Movement_FacePlayer waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23512C, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_2351BC - msgbox SeafloorCavern_Room9_Text_2351E5, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_ArchieYouMustDisappear, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_ArchieDefeat + msgbox SeafloorCavern_Room9_Text_ArchieWithThisRedOrb, MSGBOX_DEFAULT setweather WEATHER_NONE doweather - special sub_80B05B4 + special Script_FadeOutMapMusic waitstate - msgbox SeafloorCavern_Room9_Text_235279, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_RedOrbShinesByItself, MSGBOX_DEFAULT special WaitWeather waitstate setvar VAR_RESULT, 1 @@ -46,78 +46,78 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_RESULT, 0 playfanfare MUS_ME_TAMA playse SE_TAMA - special sub_80B0534 - applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + special DoOrbEffect + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 150 - removeobject 7 - addobject 1 + removeobject 7 @ sleeping Kyogre + addobject 1 @ awakened Kyogre waitstate delay 60 - applymovement 1, SeafloorCavern_Room9_Movement_235040 + applymovement 1, SeafloorCavern_Room9_Movement_KyogreApproach waitmovement 0 - special sub_80B058C + special FadeOutOrbEffect waitstate - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 + setvar VAR_0x8004, 1 @ vertical pan + setvar VAR_0x8005, 1 @ horizontal pan + setvar VAR_0x8006, 8 @ num shakes + setvar VAR_0x8007, 5 @ shake delay + special ShakeCamera waitstate - applymovement 1, SeafloorCavern_Room9_Movement_23504B + applymovement 1, SeafloorCavern_Room9_Movement_KyogreExit waitmovement 0 removeobject 1 delay 4 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 + setvar VAR_0x8004, 2 @ vertical pan + setvar VAR_0x8005, 2 @ horizontal pan + setvar VAR_0x8006, 8 @ num shakes + setvar VAR_0x8007, 5 @ shake delay + special ShakeCamera waitstate delay 30 setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 setvar VAR_0x8006, 4 setvar VAR_0x8007, 5 - msgbox SeafloorCavern_Room9_Text_2352A7, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_ArchieWhereDidKyogreGo, MSGBOX_DEFAULT playse SE_PC_LOGIN - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2352F6, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_ArchieAMessageFromOutside, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_235035 + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_ArchieListenMessage waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23532B, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_ArchieWhatRainingTooHard, MSGBOX_DEFAULT closemessage playse SE_PC_OFF delay 20 - applymovement VAR_0x8004, Common_Movement_WalkInPlaceDown + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23546F, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_ArchieWhyDidKyogreDisappear, MSGBOX_DEFAULT closemessage addobject VAR_0x8005 addobject VAR_0x8006 addobject VAR_0x8007 - applymovement VAR_0x8007, SeafloorCavern_Room9_Movement_235057 - applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_235057 - applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_23504E + applymovement VAR_0x8007, SeafloorCavern_Room9_Movement_MagmaGruntArrive + applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_MagmaGruntArrive + applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_MaxieArrive waitmovement 0 - applymovement VAR_0x8004, Common_Movement_WalkInPlaceLeft + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2354F0, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_MaxieWhatHaveYouWrought, MSGBOX_DEFAULT playse SE_PIN applymovement VAR_0x8004, Common_Movement_ExclamationMark waitmovement 0 applymovement VAR_0x8004, Common_Movement_Delay48 waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2355C2, MSGBOX_DEFAULT - msgbox SeafloorCavern_Room9_Text_235692, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_ArchieDontGetAllHighAndMighty, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_MaxieWeDontHaveTimeToArgue, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_235054 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23503A + applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_MaxieExit + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_ArchieExit waitmovement 0 - msgbox SeafloorCavern_Room9_Text_235723, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_MaxieComeOnPlayer, MSGBOX_DEFAULT setvar VAR_ROUTE128_STATE, 1 setvar VAR_SOOTOPOLIS_CITY_STATE, 1 clearflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN @@ -146,7 +146,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 releaseall end -SeafloorCavern_Room9_Movement_23502A: @ 823502A +SeafloorCavern_Room9_Movement_ArchieApproachPlayer: @ 823502A walk_right walk_right walk_right @@ -156,21 +156,23 @@ SeafloorCavern_Room9_Movement_23502A: @ 823502A walk_right step_end +@ Unused SeafloorCavern_Room9_Movement_235032: @ 8235032 walk_left walk_left step_end -SeafloorCavern_Room9_Movement_235035: @ 8235035 +SeafloorCavern_Room9_Movement_ArchieListenMessage: @ 8235035 walk_left delay_16 step_end +@ Unused SeafloorCavern_Room9_Movement_235038: @ 8235038 walk_right step_end -SeafloorCavern_Room9_Movement_23503A: @ 823503A +SeafloorCavern_Room9_Movement_ArchieExit: @ 823503A face_up lock_facing_direction walk_down @@ -178,7 +180,7 @@ SeafloorCavern_Room9_Movement_23503A: @ 823503A walk_in_place_fastest_right step_end -SeafloorCavern_Room9_Movement_235040: @ 8235040 +SeafloorCavern_Room9_Movement_KyogreApproach: @ 8235040 delay_16 delay_16 walk_slow_down @@ -191,12 +193,12 @@ SeafloorCavern_Room9_Movement_235040: @ 8235040 delay_16 step_end -SeafloorCavern_Room9_Movement_23504B: @ 823504B +SeafloorCavern_Room9_Movement_KyogreExit: @ 823504B slide_up slide_up step_end -SeafloorCavern_Room9_Movement_23504E: @ 823504E +SeafloorCavern_Room9_Movement_MaxieArrive: @ 823504E walk_fast_right walk_fast_right walk_fast_right @@ -204,49 +206,49 @@ SeafloorCavern_Room9_Movement_23504E: @ 823504E walk_fast_right step_end -SeafloorCavern_Room9_Movement_235054: @ 8235054 +SeafloorCavern_Room9_Movement_MaxieExit: @ 8235054 walk_right walk_right step_end -SeafloorCavern_Room9_Movement_235057: @ 8235057 +SeafloorCavern_Room9_Movement_MagmaGruntArrive: @ 8235057 walk_fast_right walk_fast_right walk_fast_right walk_fast_right step_end -SeafloorCavern_Room9_Movement_23505C: @ 823505C +SeafloorCavern_Room9_Movement_Delay32: @ 823505C delay_16 delay_16 step_end -SeafloorCavern_Room9_Text_23505F: @ 823505F +SeafloorCavern_Room9_Text_ArchieHoldItRightThere: @ 823505F .string "ARCHIE: Hold it right there.$" -SeafloorCavern_Room9_Text_23507C: @ 823507C +SeafloorCavern_Room9_Text_ArchieSoItWasYou: @ 823507C .string "ARCHIE: Fufufu…\n" .string "So it was you, after all.$" -SeafloorCavern_Room9_Text_2350A6: @ 82350A6 +SeafloorCavern_Room9_Text_ArchieBeholdKyogre: @ 82350A6 .string "ARCHIE: Behold!\p" .string "See how beautiful it is, the sleeping\n" .string "form of the ancient POKéMON KYOGRE!\p" .string "I have waited so long for this day to\n" .string "come…$" -SeafloorCavern_Room9_Text_23512C: @ 823512C +SeafloorCavern_Room9_Text_ArchieYouMustDisappear: @ 823512C .string "ARCHIE: It surprises me, how you've\n" .string "managed to chase me here.\p" .string "But that's all over now.\p" .string "For the realization of my dream,\n" .string "you must disappear now!$" -SeafloorCavern_Room9_Text_2351BC: @ 82351BC +SeafloorCavern_Room9_Text_ArchieDefeat: @ 82351BC .string "What?!\n" .string "I lost to a mere child like you?!$" -SeafloorCavern_Room9_Text_2351E5: @ 82351E5 +SeafloorCavern_Room9_Text_ArchieWithThisRedOrb: @ 82351E5 .string "ARCHIE: Fufufu…\p" .string "I commend you. I must recognize that\n" .string "you are truly gifted.\p" @@ -254,21 +256,21 @@ SeafloorCavern_Room9_Text_2351E5: @ 82351E5 .string "I have this in my possession!\p" .string "With this RED ORB, I can make KYOGRE…$" -SeafloorCavern_Room9_Text_235279: @ 8235279 +SeafloorCavern_Room9_Text_RedOrbShinesByItself: @ 8235279 .string "The RED ORB suddenly began shining\n" .string "by itself!$" -SeafloorCavern_Room9_Text_2352A7: @ 82352A7 +SeafloorCavern_Room9_Text_ArchieWhereDidKyogreGo: @ 82352A7 .string "ARCHIE: What?!\p" .string "I didn't do anything.\n" .string "Why did the RED ORB…\p" .string "Where did KYOGRE go?$" -SeafloorCavern_Room9_Text_2352F6: @ 82352F6 +SeafloorCavern_Room9_Text_ArchieAMessageFromOutside: @ 82352F6 .string "ARCHIE: Hm? It's a message from our\n" .string "members outside…$" -SeafloorCavern_Room9_Text_23532B: @ 823532B +SeafloorCavern_Room9_Text_ArchieWhatRainingTooHard: @ 823532B .string "ARCHIE: Yes, what is it?\p" .string "Hm…\n" .string "It's raining heavily?\p" @@ -284,7 +286,7 @@ SeafloorCavern_Room9_Text_23532B: @ 823532B .string "Hold your position and monitor\n" .string "the situation!$" -SeafloorCavern_Room9_Text_23546F: @ 823546F +SeafloorCavern_Room9_Text_ArchieWhyDidKyogreDisappear: @ 823546F .string "ARCHIE: There's something wrong…\p" .string "The RED ORB is supposed to awaken\n" .string "and control KYOGRE…\p" @@ -292,7 +294,7 @@ SeafloorCavern_Room9_Text_23546F: @ 823546F .string "Why did KYOGRE disappear?\p" .string "Why?!$" -SeafloorCavern_Room9_Text_2354F0: @ 82354F0 +SeafloorCavern_Room9_Text_MaxieWhatHaveYouWrought: @ 82354F0 .string "MAXIE: What have you wrought?\p" .string "ARCHIE… You've finally awoken KYOGRE,\n" .string "haven't you?\p" @@ -301,7 +303,7 @@ SeafloorCavern_Room9_Text_2354F0: @ 82354F0 .string "The world's landmass will drown in\n" .string "the deepening sea…$" -SeafloorCavern_Room9_Text_2355C2: @ 82355C2 +SeafloorCavern_Room9_Text_ArchieDontGetAllHighAndMighty: @ 82355C2 .string "ARCHIE: W-what?!\n" .string "Don't get all high and mighty with me!\p" .string "Wasn't it you, TEAM MAGMA, that\n" @@ -310,13 +312,13 @@ SeafloorCavern_Room9_Text_2355C2: @ 82355C2 .string "I should be able to control KYOGRE…\p" .string "I should be able to control it…$" -SeafloorCavern_Room9_Text_235692: @ 8235692 +SeafloorCavern_Room9_Text_MaxieWeDontHaveTimeToArgue: @ 8235692 .string "MAXIE: We don't have the time to\n" .string "argue about it here!\p" .string "Get outside and see for yourself!\p" .string "See if what you've wrought is the\n" .string "world that we desired!$" -SeafloorCavern_Room9_Text_235723: @ 8235723 +SeafloorCavern_Room9_Text_MaxieComeOnPlayer: @ 8235723 .string "MAXIE: {PLAYER}, come on, you have\n" .string "to get out of here, too!$" diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc index 5c4cb2199..6dde1d444 100644 --- a/data/maps/SealedChamber_InnerRoom/scripts.inc +++ b/data/maps/SealedChamber_InnerRoom/scripts.inc @@ -5,7 +5,7 @@ SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8 lockall braillemessage SealedChamber_InnerRoom_Braille_2A6B99 waitbuttonpress - hidebox2 + closebraillemessage goto_if_set FLAG_REGI_DOORS_OPENED, SealedChamber_InnerRoom_EventScript_239253 specialvar VAR_RESULT, CheckRelicanthWailord compare VAR_RESULT, 0 @@ -27,7 +27,7 @@ SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8 waitstate playse SE_DOOR delay 40 - msgbox gUnknown_0827301B, MSGBOX_DEFAULT + msgbox gText_DoorOpenedFarAway, MSGBOX_DEFAULT closemessage fadeinbgm 0 setflag FLAG_REGI_DOORS_OPENED @@ -42,7 +42,7 @@ SealedChamber_InnerRoom_EventScript_239255:: @ 8239255 lockall braillemessage SealedChamber_InnerRoom_Braille_2A6BCA waitbuttonpress - hidebox2 + closebraillemessage releaseall end @@ -50,7 +50,7 @@ SealedChamber_InnerRoom_EventScript_23925F:: @ 823925F lockall braillemessage SealedChamber_InnerRoom_Braille_2A6BEC waitbuttonpress - hidebox2 + closebraillemessage releaseall end @@ -58,7 +58,7 @@ SealedChamber_InnerRoom_EventScript_239269:: @ 8239269 lockall braillemessage SealedChamber_InnerRoom_Braille_2A6C0D waitbuttonpress - hidebox2 + closebraillemessage releaseall end @@ -66,7 +66,7 @@ SealedChamber_InnerRoom_EventScript_239273:: @ 8239273 lockall braillemessage SealedChamber_InnerRoom_Braille_2A6C34 waitbuttonpress - hidebox2 + closebraillemessage releaseall end @@ -74,7 +74,7 @@ SealedChamber_InnerRoom_EventScript_23927D:: @ 823927D lockall braillemessage SealedChamber_InnerRoom_Braille_2A6C48 waitbuttonpress - hidebox2 + closebraillemessage releaseall end @@ -82,7 +82,7 @@ SealedChamber_InnerRoom_EventScript_239287:: @ 8239287 lockall braillemessage SealedChamber_InnerRoom_Braille_2A6C73 waitbuttonpress - hidebox2 + closebraillemessage releaseall end diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc index 865be8963..e3a7086a3 100644 --- a/data/maps/SealedChamber_OuterRoom/scripts.inc +++ b/data/maps/SealedChamber_OuterRoom/scripts.inc @@ -30,7 +30,7 @@ SealedChamber_OuterRoom_EventScript_23916C:: @ 823916C lockall braillemessage SealedChamber_OuterRoom_Braille_2A6B27 waitbuttonpress - hidebox2 + closebraillemessage releaseall end @@ -38,7 +38,7 @@ SealedChamber_OuterRoom_EventScript_239176:: @ 8239176 lockall braillemessage SealedChamber_OuterRoom_Braille_2A6B31 waitbuttonpress - hidebox2 + closebraillemessage releaseall end @@ -46,7 +46,7 @@ SealedChamber_OuterRoom_EventScript_239180:: @ 8239180 lockall braillemessage SealedChamber_OuterRoom_Braille_2A6B3B waitbuttonpress - hidebox2 + closebraillemessage releaseall end @@ -54,7 +54,7 @@ SealedChamber_OuterRoom_EventScript_23918A:: @ 823918A lockall braillemessage SealedChamber_OuterRoom_Braille_2A6B45 waitbuttonpress - hidebox2 + closebraillemessage releaseall end @@ -62,7 +62,7 @@ SealedChamber_OuterRoom_EventScript_239194:: @ 8239194 lockall braillemessage SealedChamber_OuterRoom_Braille_2A6B4F waitbuttonpress - hidebox2 + closebraillemessage releaseall end @@ -70,7 +70,7 @@ SealedChamber_OuterRoom_EventScript_23919E:: @ 823919E lockall braillemessage SealedChamber_OuterRoom_Braille_2A6B59 waitbuttonpress - hidebox2 + closebraillemessage releaseall end @@ -78,7 +78,7 @@ SealedChamber_OuterRoom_EventScript_2391A8:: @ 82391A8 lockall braillemessage SealedChamber_OuterRoom_Braille_2A6B63 waitbuttonpress - hidebox2 + closebraillemessage releaseall end @@ -86,7 +86,7 @@ SealedChamber_OuterRoom_EventScript_2391B2:: @ 82391B2 lockall braillemessage SealedChamber_OuterRoom_Braille_2A6B6E waitbuttonpress - hidebox2 + closebraillemessage releaseall end @@ -94,7 +94,7 @@ SealedChamber_OuterRoom_EventScript_2391BC:: @ 82391BC lockall braillemessage SealedChamber_OuterRoom_Braille_2A6B76 waitbuttonpress - hidebox2 + closebraillemessage releaseall end @@ -102,7 +102,7 @@ SealedChamber_OuterRoom_EventScript_2391C6:: @ 82391C6 lockall braillemessage SealedChamber_OuterRoom_Braille_2A6B81 waitbuttonpress - hidebox2 + closebraillemessage releaseall end @@ -111,12 +111,12 @@ SealedChamber_OuterRoom_EventScript_2391D0:: @ 82391D0 goto_if_set FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_2391E3 braillemessage SealedChamber_OuterRoom_Braille_2A6B89 waitbuttonpress - hidebox2 + closebraillemessage releaseall end SealedChamber_OuterRoom_EventScript_2391E3:: @ 82391E3 - msgbox gUnknown_0827304E, MSGBOX_DEFAULT + msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT releaseall end @@ -124,7 +124,7 @@ SealedChamber_OuterRoom_EventScript_2391ED:: @ 82391ED lockall braillemessage SealedChamber_OuterRoom_Braille_2A6B89 waitbuttonpress - hidebox2 + closebraillemessage releaseall end diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json index 8f255972f..8ac45a147 100644 --- a/data/maps/SecretBase_BlueCave1/map.json +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BLUE_CAVE1", "name": "SecretBase_BlueCave1", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE1", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_BlueCave1_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_BlueCave1/scripts.inc b/data/maps/SecretBase_BlueCave1/scripts.inc deleted file mode 100644 index a7f979bde..000000000 --- a/data/maps/SecretBase_BlueCave1/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BlueCave1_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json index ec5d74d2f..1e8cf98fd 100644 --- a/data/maps/SecretBase_BlueCave2/map.json +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BLUE_CAVE2", "name": "SecretBase_BlueCave2", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE2", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_BlueCave2_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_BlueCave2/scripts.inc b/data/maps/SecretBase_BlueCave2/scripts.inc deleted file mode 100644 index cb4ad3565..000000000 --- a/data/maps/SecretBase_BlueCave2/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BlueCave2_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json index 07be1610a..d057ade30 100644 --- a/data/maps/SecretBase_BlueCave3/map.json +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BLUE_CAVE3", "name": "SecretBase_BlueCave3", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE3", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_BlueCave3_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_BlueCave3/scripts.inc b/data/maps/SecretBase_BlueCave3/scripts.inc deleted file mode 100644 index f49ff6dc1..000000000 --- a/data/maps/SecretBase_BlueCave3/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BlueCave3_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json index 45762d619..4cdb8de60 100644 --- a/data/maps/SecretBase_BlueCave4/map.json +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BLUE_CAVE4", "name": "SecretBase_BlueCave4", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE4", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_BlueCave4_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_BlueCave4/scripts.inc b/data/maps/SecretBase_BlueCave4/scripts.inc deleted file mode 100644 index faa808545..000000000 --- a/data/maps/SecretBase_BlueCave4/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BlueCave4_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json index 679564ba7..39d7d3d92 100644 --- a/data/maps/SecretBase_BrownCave1/map.json +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BROWN_CAVE1", "name": "SecretBase_BrownCave1", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE1", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_BrownCave1_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_BrownCave1/scripts.inc b/data/maps/SecretBase_BrownCave1/scripts.inc deleted file mode 100644 index 9d2925611..000000000 --- a/data/maps/SecretBase_BrownCave1/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BrownCave1_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json index 35d5be558..d268e604a 100644 --- a/data/maps/SecretBase_BrownCave2/map.json +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BROWN_CAVE2", "name": "SecretBase_BrownCave2", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE2", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_BrownCave2_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_BrownCave2/scripts.inc b/data/maps/SecretBase_BrownCave2/scripts.inc deleted file mode 100644 index e9c497fac..000000000 --- a/data/maps/SecretBase_BrownCave2/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BrownCave2_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json index 5424ee85e..f1a4f656c 100644 --- a/data/maps/SecretBase_BrownCave3/map.json +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BROWN_CAVE3", "name": "SecretBase_BrownCave3", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE3", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_BrownCave3_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_BrownCave3/scripts.inc b/data/maps/SecretBase_BrownCave3/scripts.inc deleted file mode 100644 index 284262d91..000000000 --- a/data/maps/SecretBase_BrownCave3/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BrownCave3_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json index de3b4709e..80199de73 100644 --- a/data/maps/SecretBase_BrownCave4/map.json +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_BROWN_CAVE4", "name": "SecretBase_BrownCave4", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE4", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_BrownCave4_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_BrownCave4/scripts.inc b/data/maps/SecretBase_BrownCave4/scripts.inc deleted file mode 100644 index 84f685508..000000000 --- a/data/maps/SecretBase_BrownCave4/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_BrownCave4_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json index eac0366c1..b485575b3 100644 --- a/data/maps/SecretBase_RedCave1/map.json +++ b/data/maps/SecretBase_RedCave1/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_RED_CAVE1", "name": "SecretBase_RedCave1", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE1", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_RedCave1_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_RedCave1/scripts.inc b/data/maps/SecretBase_RedCave1/scripts.inc deleted file mode 100644 index f9c55a2b5..000000000 --- a/data/maps/SecretBase_RedCave1/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_RedCave1_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json index bcbfbd0f2..fb2dd3da3 100644 --- a/data/maps/SecretBase_RedCave2/map.json +++ b/data/maps/SecretBase_RedCave2/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_RED_CAVE2", "name": "SecretBase_RedCave2", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE2", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_RedCave2_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_RedCave2/scripts.inc b/data/maps/SecretBase_RedCave2/scripts.inc deleted file mode 100644 index e7e0c7ba5..000000000 --- a/data/maps/SecretBase_RedCave2/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_RedCave2_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json index 00c14d3f3..ac1b8c103 100644 --- a/data/maps/SecretBase_RedCave3/map.json +++ b/data/maps/SecretBase_RedCave3/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_RED_CAVE3", "name": "SecretBase_RedCave3", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE3", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_RedCave3_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_RedCave3/scripts.inc b/data/maps/SecretBase_RedCave3/scripts.inc deleted file mode 100644 index 512f7f92a..000000000 --- a/data/maps/SecretBase_RedCave3/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_RedCave3_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json index b54974c4c..b3f5998f2 100644 --- a/data/maps/SecretBase_RedCave4/map.json +++ b/data/maps/SecretBase_RedCave4/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_RED_CAVE4", "name": "SecretBase_RedCave4", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_RED_CAVE4", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_RedCave4_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_RedCave4/scripts.inc b/data/maps/SecretBase_RedCave4/scripts.inc deleted file mode 100644 index 98e79f89f..000000000 --- a/data/maps/SecretBase_RedCave4/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_RedCave4_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json index 38cb8997f..b43accd3c 100644 --- a/data/maps/SecretBase_Shrub1/map.json +++ b/data/maps/SecretBase_Shrub1/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_SHRUB1", "name": "SecretBase_Shrub1", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB1", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_Shrub1_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_Shrub1/scripts.inc b/data/maps/SecretBase_Shrub1/scripts.inc deleted file mode 100644 index 24b8685a0..000000000 --- a/data/maps/SecretBase_Shrub1/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Shrub1_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json index 728226fdc..86590e0c3 100644 --- a/data/maps/SecretBase_Shrub2/map.json +++ b/data/maps/SecretBase_Shrub2/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_SHRUB2", "name": "SecretBase_Shrub2", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB2", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_Shrub2_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_Shrub2/scripts.inc b/data/maps/SecretBase_Shrub2/scripts.inc deleted file mode 100644 index dad94f46d..000000000 --- a/data/maps/SecretBase_Shrub2/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Shrub2_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json index a3c5cdf05..ac14a8e45 100644 --- a/data/maps/SecretBase_Shrub3/map.json +++ b/data/maps/SecretBase_Shrub3/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_SHRUB3", "name": "SecretBase_Shrub3", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB3", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_Shrub3_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_Shrub3/scripts.inc b/data/maps/SecretBase_Shrub3/scripts.inc deleted file mode 100644 index 22c67c939..000000000 --- a/data/maps/SecretBase_Shrub3/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Shrub3_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json index 9977f6eeb..c8b86decb 100644 --- a/data/maps/SecretBase_Shrub4/map.json +++ b/data/maps/SecretBase_Shrub4/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_SHRUB4", "name": "SecretBase_Shrub4", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_SHRUB4", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_Shrub4_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_Shrub4/scripts.inc b/data/maps/SecretBase_Shrub4/scripts.inc deleted file mode 100644 index 1a9952232..000000000 --- a/data/maps/SecretBase_Shrub4/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Shrub4_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json index 5d3309cc7..93f119a92 100644 --- a/data/maps/SecretBase_Tree1/map.json +++ b/data/maps/SecretBase_Tree1/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_TREE1", "name": "SecretBase_Tree1", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE1", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_Tree1_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_Tree1/scripts.inc b/data/maps/SecretBase_Tree1/scripts.inc deleted file mode 100644 index 7e7704d6a..000000000 --- a/data/maps/SecretBase_Tree1/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Tree1_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json index 67deb9a10..96a4fc7f7 100644 --- a/data/maps/SecretBase_Tree2/map.json +++ b/data/maps/SecretBase_Tree2/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_TREE2", "name": "SecretBase_Tree2", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE2", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_Tree2_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_Tree2/scripts.inc b/data/maps/SecretBase_Tree2/scripts.inc deleted file mode 100644 index b30a6ec74..000000000 --- a/data/maps/SecretBase_Tree2/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Tree2_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json index 6e4494836..89fd3cf49 100644 --- a/data/maps/SecretBase_Tree3/map.json +++ b/data/maps/SecretBase_Tree3/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_TREE3", "name": "SecretBase_Tree3", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE3", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_Tree3_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_Tree3/scripts.inc b/data/maps/SecretBase_Tree3/scripts.inc deleted file mode 100644 index 9512bbb80..000000000 --- a/data/maps/SecretBase_Tree3/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Tree3_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json index 465b1d50b..da6c9e727 100644 --- a/data/maps/SecretBase_Tree4/map.json +++ b/data/maps/SecretBase_Tree4/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_TREE4", "name": "SecretBase_Tree4", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_TREE4", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_Tree4_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_Tree4/scripts.inc b/data/maps/SecretBase_Tree4/scripts.inc deleted file mode 100644 index 62f41627f..000000000 --- a/data/maps/SecretBase_Tree4/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_Tree4_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json index a14826a3a..e8ebdd91a 100644 --- a/data/maps/SecretBase_YellowCave1/map.json +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_YELLOW_CAVE1", "name": "SecretBase_YellowCave1", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE1", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_YellowCave1_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_YellowCave1/scripts.inc b/data/maps/SecretBase_YellowCave1/scripts.inc deleted file mode 100644 index fa56be0eb..000000000 --- a/data/maps/SecretBase_YellowCave1/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_YellowCave1_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json index 97b6baa22..9eb60caab 100644 --- a/data/maps/SecretBase_YellowCave2/map.json +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_YELLOW_CAVE2", "name": "SecretBase_YellowCave2", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE2", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_YellowCave2_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_YellowCave2/scripts.inc b/data/maps/SecretBase_YellowCave2/scripts.inc deleted file mode 100644 index 86c3c876f..000000000 --- a/data/maps/SecretBase_YellowCave2/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_YellowCave2_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json index 581a3479f..567255385 100644 --- a/data/maps/SecretBase_YellowCave3/map.json +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_YELLOW_CAVE3", "name": "SecretBase_YellowCave3", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE3", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_YellowCave3_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_YellowCave3/scripts.inc b/data/maps/SecretBase_YellowCave3/scripts.inc deleted file mode 100644 index 26311e6c5..000000000 --- a/data/maps/SecretBase_YellowCave3/scripts.inc +++ /dev/null @@ -1 +0,0 @@ -SecretBase_YellowCave3_MapScripts:: @ 823B483 diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json index 3dfa7cc08..26a3873fc 100644 --- a/data/maps/SecretBase_YellowCave4/map.json +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -1,6 +1,7 @@ { "id": "MAP_SECRET_BASE_YELLOW_CAVE4", "name": "SecretBase_YellowCave4", + "shared_scripts_map": "SecretBase", "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE4", "music": "MUS_MACHI_S3", "region_map_section": "MAPSEC_SECRET_BASE", @@ -24,7 +25,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SecretBase_YellowCave4_EventScript_275D64", + "script": "SecretBase_EventScript_RecordMixTrainer", "flag": "FLAG_DECORATION_0" }, { diff --git a/data/maps/SecretBase_YellowCave4/scripts.inc b/data/maps/SecretBase_YellowCave4/scripts.inc deleted file mode 100644 index c05ea13c0..000000000 --- a/data/maps/SecretBase_YellowCave4/scripts.inc +++ /dev/null @@ -1,24 +0,0 @@ -SecretBase_YellowCave4_MapScripts:: @ 823B483 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_RedCave1_MapScript2_23B498 - map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_RedCave1_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_RedCave1_MapScript2_23B4AE - map_script MAP_SCRIPT_ON_RESUME, SecretBase_RedCave1_MapScript1_23B4B8 - .byte 0 - -SecretBase_RedCave1_MapScript2_23B498: @ 823B498 - map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, EventScript_275D0C - .2byte 0 - -SecretBase_RedCave1_OnTransition: @ 823B4A2 - call SecretBase_RedCave1_EventScript_275CE1 - special SetSecretBaseOwnerGfxId - special sub_80EB1AC - end - -SecretBase_RedCave1_MapScript2_23B4AE: @ 823B4AE - map_script_2 VAR_INIT_SECRET_BASE, 0, SecretBase_RedCave1_EventScript_275B81 - .2byte 0 - -SecretBase_RedCave1_MapScript1_23B4B8: @ 823B4B8 - setstepcallback 6 - end diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index 13d8f92d9..f5c487ab3 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -27,7 +27,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B msgbox ShoalCave_LowTideEntranceRoom_Text_2A7F37, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236ECF checkitemspace ITEM_SHELL_BELL, 1 compare VAR_RESULT, 0 diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json index a7ad50f1b..f63464424 100644 --- a/data/maps/SingleBattleColosseum/map.json +++ b/data/maps/SingleBattleColosseum/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SingleBattleColosseum_EventScript_2774A6", + "script": "SingleBattleColosseum_EventScript_Attendant", "flag": "0" } ], diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc index dcbff3642..8a02974ea 100644 --- a/data/maps/SkyPillar_2F/scripts.inc +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -1,21 +1,21 @@ SkyPillar_2F_MapScripts:: @ 823962B - map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_2F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_2F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, SkyPillar_2F_MapScript1_239650 + map_script MAP_SCRIPT_ON_RESUME, SkyPillar_2F_SetHoleWarp .byte 0 SkyPillar_2F_OnTransition: @ 823963B compare VAR_SKY_PILLAR_STATE, 2 call_if_lt SkyPillar_2F_EventScript_CleanFloor - copyvar VAR_ICE_STEP_COUNT, 0x1 + copyvar VAR_ICE_STEP_COUNT, 1 end SkyPillar_2F_EventScript_CleanFloor:: @ 823964C setmaplayoutindex LAYOUT_SKY_PILLAR_2F_CLEAN return -SkyPillar_2F_MapScript1_239650: @ 8239650 - setstepcallback 7 +SkyPillar_2F_SetHoleWarp: @ 8239650 + setstepcallback STEP_CB_CRACKED_FLOOR setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0 end diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc index 413f56521..af54deaff 100644 --- a/data/maps/SkyPillar_4F/scripts.inc +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -1,21 +1,21 @@ SkyPillar_4F_MapScripts:: @ 8239671 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_4F_MapScript2_2A8327 + map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_4F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, SkyPillar_4F_MapScript1_239696 + map_script MAP_SCRIPT_ON_RESUME, SkyPillar_4F_SetHoleWarp .byte 0 SkyPillar_4F_OnTransition: @ 8239681 compare VAR_SKY_PILLAR_STATE, 2 call_if_lt SkyPillar_4F_EventScript_CleanFloor - copyvar VAR_ICE_STEP_COUNT, 0x1 + copyvar VAR_ICE_STEP_COUNT, 1 end SkyPillar_4F_EventScript_CleanFloor:: @ 8239692 setmaplayoutindex LAYOUT_SKY_PILLAR_4F_CLEAN return -SkyPillar_4F_MapScript1_239696: @ 8239696 - setstepcallback 7 +SkyPillar_4F_SetHoleWarp: @ 8239696 + setstepcallback STEP_CB_CRACKED_FLOOR setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0 end diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index 95f50ec02..72748842b 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -36,16 +36,16 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 lockall applymovement 1, SkyPillar_Outside_Movement_2393D3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT closemessage delay 30 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 3 - special sub_8139560 + setvar VAR_0x8004, 1 @ vertical pan + setvar VAR_0x8005, 1 @ horizontal pan + setvar VAR_0x8006, 8 @ num shakes + setvar VAR_0x8007, 3 @ shake delay + special ShakeCamera waitstate delay 40 msgbox SkyPillar_Outside_Text_2394BC, MSGBOX_DEFAULT @@ -53,20 +53,20 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_2393EB applymovement 1, SkyPillar_Outside_Movement_2393DE waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 20 - setvar VAR_0x8007, 5 - special sub_8139560 + setvar VAR_0x8004, 1 @ vertical pan + setvar VAR_0x8005, 3 @ horizontal pan + setvar VAR_0x8006, 20 @ num shakes + setvar VAR_0x8007, 5 @ shake delay + special ShakeCamera waitstate delay 20 - applymovement 1, Common_Movement_WalkInPlaceLeft + applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 10 - applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 20 - applymovement 1, Common_Movement_WalkInPlaceDown + applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json index 2d1a6fa1a..eba1eff39 100644 --- a/data/maps/SkyPillar_Top/map.json +++ b/data/maps/SkyPillar_Top/map.json @@ -37,8 +37,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SkyPillar_Top_EventScript_239722", - "flag": "FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT" + "script": "SkyPillar_Top_EventScript_Rayquaza", + "flag": "FLAG_HIDE_RAYQUAZA_SKY_TOWER_SUMMIT" } ], "warp_events": [ @@ -58,7 +58,7 @@ "elevation": 3, "var": "VAR_SKY_PILLAR_RAQUAZA_CRY_DONE", "var_value": "0", - "script": "SkyPillar_Top_EventScript_23979A" + "script": "SkyPillar_Top_EventScript_AwakenRayquaza" } ], "bg_events": [] diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index 1dae8c867..e12919082 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -1,49 +1,49 @@ SkyPillar_Top_MapScripts:: @ 82396B8 - map_script MAP_SCRIPT_ON_RESUME, SkyPillar_Top_MapScript1_2396C8 + map_script MAP_SCRIPT_ON_RESUME, SkyPillar_Top_OnResume map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Top_OnTransition - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SkyPillar_Top_MapScript2_239713 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SkyPillar_Top_OnWarp .byte 0 -SkyPillar_Top_MapScript1_2396C8: @ 82396C8 - call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SkyPillar_Top_EventScript_2396D2 +SkyPillar_Top_OnResume: @ 82396C8 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SkyPillar_Top_EventScript_TryRemoveRayquaza end -SkyPillar_Top_EventScript_2396D2:: @ 82396D2 +SkyPillar_Top_EventScript_TryRemoveRayquaza:: @ 82396D2 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return SkyPillar_Top_OnTransition: @ 82396E6 compare VAR_SKY_PILLAR_STATE, 2 - call_if_lt SkyPillar_Top_EventScript_2396FD + call_if_lt SkyPillar_Top_EventScript_SetCleanLayout compare VAR_SKY_PILLAR_STATE, 2 - call_if_ge SkyPillar_Top_EventScript_239705 + call_if_ge SkyPillar_Top_EventScript_TryShowRayquaza end -SkyPillar_Top_EventScript_2396FD:: @ 82396FD +SkyPillar_Top_EventScript_SetCleanLayout:: @ 82396FD setmaplayoutindex LAYOUT_SKY_PILLAR_TOP_CLEAN setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN return -SkyPillar_Top_EventScript_239705:: @ 8239705 - call_if_unset FLAG_DEFEATED_RAYQUAZA, SkyPillar_Top_EventScript_23970F +SkyPillar_Top_EventScript_TryShowRayquaza:: @ 8239705 + call_if_unset FLAG_DEFEATED_RAYQUAZA, SkyPillar_Top_EventScript_ShowRayquaza return -SkyPillar_Top_EventScript_23970F:: @ 823970F - clearflag FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT +SkyPillar_Top_EventScript_ShowRayquaza:: @ 823970F + clearflag FLAG_HIDE_RAYQUAZA_SKY_TOWER_SUMMIT return -SkyPillar_Top_MapScript2_239713: @ 8239713 - map_script_2 VAR_SKY_PILLAR_STATE, 0, SkyPillar_Top_EventScript_23971D +SkyPillar_Top_OnWarp: @ 8239713 + map_script_2 VAR_SKY_PILLAR_STATE, 0, SkyPillar_Top_EventScript_RayquazaFaceDown .2byte 0 -SkyPillar_Top_EventScript_23971D:: @ 823971D +SkyPillar_Top_EventScript_RayquazaFaceDown:: @ 823971D turnobject 1, DIR_SOUTH end -SkyPillar_Top_EventScript_239722:: @ 8239722 +SkyPillar_Top_EventScript_Rayquaza:: @ 8239722 lockall waitse playmoncry SPECIES_RAYQUAZA, 2 @@ -55,34 +55,34 @@ SkyPillar_Top_EventScript_239722:: @ 8239722 waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 - goto_if_eq SkyPillar_Top_EventScript_239768 - compare VAR_RESULT, 4 - goto_if_eq SkyPillar_Top_EventScript_239771 - compare VAR_RESULT, 5 - goto_if_eq SkyPillar_Top_EventScript_239771 + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq SkyPillar_Top_EventScript_DefeatedRayquaza + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq SkyPillar_Top_EventScript_RanFromRayquaza + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq SkyPillar_Top_EventScript_RanFromRayquaza setflag FLAG_DEFEATED_RAYQUAZA releaseall end -SkyPillar_Top_EventScript_239768:: @ 8239768 +SkyPillar_Top_EventScript_DefeatedRayquaza:: @ 8239768 setflag FLAG_DEFEATED_RAYQUAZA - goto SkyPillar_Top_EventScript_23977C + goto SkyPillar_Top_EventScript_DefeatedRayquaza2 end -SkyPillar_Top_EventScript_239771:: @ 8239771 +SkyPillar_Top_EventScript_RanFromRayquaza:: @ 8239771 setvar VAR_0x8004, SPECIES_RAYQUAZA - goto SkyPillar_Top_EventScript_239785 + goto SkyPillar_Top_EventScript_RanFromRayquaza2 end -SkyPillar_Top_EventScript_23977C:: @ 823977C +SkyPillar_Top_EventScript_DefeatedRayquaza2:: @ 823977C fadescreenswapbuffers 1 removeobject VAR_LAST_TALKED fadescreenswapbuffers 0 releaseall end -SkyPillar_Top_EventScript_239785:: @ 8239785 +SkyPillar_Top_EventScript_RanFromRayquaza2:: @ 8239785 fadescreenswapbuffers 1 removeobject VAR_LAST_TALKED fadescreenswapbuffers 0 @@ -91,43 +91,43 @@ SkyPillar_Top_EventScript_239785:: @ 8239785 releaseall end -SkyPillar_Top_EventScript_23979A:: @ 823979A +SkyPillar_Top_EventScript_AwakenRayquaza:: @ 823979A lockall fadeoutbgm 1 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_239858 + applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_CameraPanUp waitmovement 0 special RemoveCameraObject - applymovement 1, SkyPillar_Top_Movement_23983A + applymovement 1, SkyPillar_Top_Movement_RayquazaStir waitmovement 0 waitse playmoncry SPECIES_RAYQUAZA, 2 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 3 - special sub_8139560 + setvar VAR_0x8004, 1 @ vertical pan + setvar VAR_0x8005, 1 @ horizontal pan + setvar VAR_0x8006, 8 @ num shakes + setvar VAR_0x8007, 3 @ shake delay + special ShakeCamera waitstate waitse playmoncry SPECIES_RAYQUAZA, 2 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 + setvar VAR_0x8004, 1 @ vertical pan + setvar VAR_0x8005, 2 @ horizontal pan + setvar VAR_0x8006, 8 @ num shakes + setvar VAR_0x8007, 5 @ shake delay + special ShakeCamera waitstate waitmoncry - applymovement 1, SkyPillar_Top_Movement_23984B + applymovement 1, SkyPillar_Top_Movement_RayquazaFlyOff waitmovement 0 removeobject 1 - msgbox SkyPillar_Top_Text_239860, MSGBOX_DEFAULT + msgbox SkyPillar_Top_Text_RayquazaFlewOff, MSGBOX_DEFAULT closemessage delay 20 fadeinbgm 1 special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_23985C + applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_CameraPanDown waitmovement 0 special RemoveCameraObject setvar VAR_SOOTOPOLIS_CITY_STATE, 5 @@ -136,7 +136,7 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A releaseall end -SkyPillar_Top_Movement_23983A: @ 823983A +SkyPillar_Top_Movement_RayquazaStir: @ 823983A delay_16 walk_in_place_fast_left delay_16 @@ -155,7 +155,7 @@ SkyPillar_Top_Movement_23983A: @ 823983A delay_16 step_end -SkyPillar_Top_Movement_23984B: @ 823984B +SkyPillar_Top_Movement_RayquazaFlyOff: @ 823984B delay_16 walk_in_place_down delay_8 @@ -170,18 +170,18 @@ SkyPillar_Top_Movement_23984B: @ 823984B slide_up step_end -SkyPillar_Top_Movement_239858: @ 8239858 +SkyPillar_Top_Movement_CameraPanUp: @ 8239858 walk_slow_up walk_slow_up walk_slow_up step_end -SkyPillar_Top_Movement_23985C: @ 823985C +SkyPillar_Top_Movement_CameraPanDown: @ 823985C walk_slow_down walk_slow_down walk_slow_down step_end -SkyPillar_Top_Text_239860: @ 8239860 +SkyPillar_Top_Text_RayquazaFlewOff: @ 8239860 .string "The awakened RAYQUAZA flew off…$" diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index d245cdff4..ee9c0c176 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -61,11 +61,11 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C waitmovement 0 msgbox SlateportCity_Text_1DF032, MSGBOX_DEFAULT closemessage - applymovement 35, Common_Movement_WalkInPlaceLeft + applymovement 35, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 60 msgbox SlateportCity_Text_1DF0FE, MSGBOX_DEFAULT - applymovement 35, Common_Movement_WalkInPlaceRight + applymovement 35, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox SlateportCity_Text_1DF12B, MSGBOX_DEFAULT closemessage @@ -122,7 +122,7 @@ SlateportCity_EventScript_1DCDBD:: @ 81DCDBD message SlateportCity_Text_1DD64A waitmessage pokemart SlateportCity_Pokemart_1DCDD4 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -489,10 +489,10 @@ SlateportCity_EventScript_1DD153:: @ 81DD153 SlateportCity_EventScript_1DD16A:: @ 81DD16A lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemartdecoration SlateportCity_PokemartDecor_Dolls - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -506,7 +506,7 @@ SlateportCity_PokemartDecor_Dolls: @ 81DD184 end SlateportCity_EventScript_1DD18E:: @ 81DD18E - msgbox gUnknown_08272E30, MSGBOX_DEFAULT + msgbox gText_ComeBackWithSecretPower, MSGBOX_DEFAULT release end @@ -514,10 +514,10 @@ SlateportCity_EventScript_1DD198:: @ 81DD198 lock faceplayer goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_1DD18E - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemartdecoration SlateportCity_PokemartDecor_1DD1B8 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -543,10 +543,10 @@ SlateportCity_PokemartDecor_1DD1B8: @ 81DD1B8 SlateportCity_EventScript_1DD1D8:: @ 81DD1D8 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart SlateportCity_Pokemart_1DD1F0 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -563,10 +563,10 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 msgbox SlateportCity_Text_1DE502, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE54A, MSGBOX_DEFAULT closemessage - applymovement 10, Common_Movement_WalkInPlaceRight + applymovement 10, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 10 - applymovement 9, Common_Movement_WalkInPlaceDown + applymovement 9, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 25 applymovement 11, SlateportCity_Movement_1DD33C @@ -577,18 +577,18 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 removeobject 10 removeobject 9 msgbox SlateportCity_Text_1DE5F7, MSGBOX_DEFAULT - applymovement 11, Common_Movement_WalkInPlaceUp + applymovement 11, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox SlateportCity_Text_1DE64F, MSGBOX_DEFAULT playbgm MUS_AQA_0, 0 msgbox SlateportCity_Text_1DE724, MSGBOX_DEFAULT - applymovement 6, Common_Movement_WalkInPlaceLeft - applymovement 1, Common_Movement_WalkInPlaceLeft + applymovement 6, Common_Movement_WalkInPlaceFastestLeft + applymovement 1, Common_Movement_WalkInPlaceFastestLeft applymovement 7, SlateportCity_Movement_1DD309 - applymovement 3, SlateportCity_Movement_272596 + applymovement 3, Common_Movement_QuestionMark applymovement 2, SlateportCity_Movement_1DD311 waitmovement 0 - applymovement 11, Common_Movement_WalkInPlaceDown + applymovement 11, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox SlateportCity_Text_1DE7F7, MSGBOX_DEFAULT playse SE_PIN @@ -596,7 +596,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 waitmovement 0 applymovement 11, Common_Movement_Delay48 waitmovement 0 - applymovement 11, Common_Movement_WalkInPlaceUp + applymovement 11, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox SlateportCity_Text_1DE860, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE8A0, MSGBOX_DEFAULT @@ -852,7 +852,7 @@ SlateportCity_EventScript_1DD54A:: @ 81DD54A SlateportCity_EventScript_1DD557:: @ 81DD557 msgbox SlateportCity_Text_1DEE90, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SlateportCity_EventScript_1DD3CA copyvar VAR_0x8004, VAR_0x8009 specialvar VAR_RESULT, HasEnoughBerryPowder @@ -865,7 +865,7 @@ SlateportCity_EventScript_1DD557:: @ 81DD557 special TakeBerryPowder special PrintPlayerBerryPowderAmount msgbox SlateportCity_Text_1DEEF7, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq SlateportCity_EventScript_1DD3CA msgbox SlateportCity_Text_1DEF79, MSGBOX_DEFAULT special RemoveBerryPowderVendorMenu @@ -873,7 +873,7 @@ SlateportCity_EventScript_1DD557:: @ 81DD557 end SlateportCity_EventScript_1DD5C1:: @ 81DD5C1 - msgbox gUnknown_08272A89, MSGBOX_DEFAULT + msgbox gText_TheBagIsFull, MSGBOX_DEFAULT special RemoveBerryPowderVendorMenu release end diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index 5ab5b78e9..c5e5616ce 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -44,7 +44,7 @@ SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65 SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 msgbox SlateportCity_BattleTentCorridor_Text_25AB96, MSGBOX_DEFAULT closemessage - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 opendoor 2, 1 waitdooranim @@ -84,9 +84,9 @@ SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D SlateportCity_BattleTentCorridor_EventScript_208F5B:: @ 8208F5B msgbox SlateportCity_BattleTentCorridor_Text_25A350, MSGBOX_YESNO switch VAR_RESULT - case 0, SlateportCity_BattleTentCorridor_EventScript_208F0D - case 1, SlateportCity_BattleTentCorridor_EventScript_209022 - case 127, SlateportCity_BattleTentCorridor_EventScript_208F0D + case NO, SlateportCity_BattleTentCorridor_EventScript_208F0D + case YES, SlateportCity_BattleTentCorridor_EventScript_209022 + case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_208F0D SlateportCity_BattleTentCorridor_EventScript_208F89:: @ 8208F89 message SlateportCity_BattleTentCorridor_Text_25A37A @@ -102,8 +102,8 @@ SlateportCity_BattleTentCorridor_EventScript_208FBB:: @ 8208FBB special sub_81B9D08 msgbox SlateportCity_BattleTentCorridor_Text_25AB2E, MSGBOX_YESNO switch VAR_RESULT - case 0, SlateportCity_BattleTentCorridor_EventScript_208EB4 - case 1, SlateportCity_BattleTentCorridor_EventScript_208FF1 + case NO, SlateportCity_BattleTentCorridor_EventScript_208EB4 + case YES, SlateportCity_BattleTentCorridor_EventScript_208FF1 case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_208EB4 SlateportCity_BattleTentCorridor_EventScript_208FF1:: @ 8208FF1 diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index 80545a7f2..dcd90d16c 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -144,9 +144,9 @@ SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906 special CallFrontierUtilFunc msgbox SlateportCity_BattleTentLobby_Text_2C5B06, MSGBOX_YESNO switch VAR_RESULT - case 0, SlateportCity_BattleTentLobby_EventScript_208A2B - case 1, SlateportCity_BattleTentLobby_EventScript_208950 - case 127, SlateportCity_BattleTentLobby_EventScript_208A2B + case NO, SlateportCity_BattleTentLobby_EventScript_208A2B + case YES, SlateportCity_BattleTentLobby_EventScript_208950 + case MULTI_B_PRESSED, SlateportCity_BattleTentLobby_EventScript_208A2B SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950 setvar VAR_TEMP_0, 0 diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index b6888ddd5..83f4b8011 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -48,10 +48,10 @@ SlateportCity_Harbor_EventScript_20C9DF:: @ 820C9DF end SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 - applymovement 7, Common_Movement_WalkInPlaceDown + applymovement 7, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - applymovement 6, Common_Movement_WalkInPlaceDown - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement 6, Common_Movement_WalkInPlaceFastestDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox SlateportCity_Harbor_Text_20D291, MSGBOX_DEFAULT closemessage @@ -85,21 +85,21 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 SlateportCity_Harbor_EventScript_20CA89:: @ 820CA89 applymovement 4, SlateportCity_Harbor_Movement_20CAE0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return SlateportCity_Harbor_EventScript_20CA9E:: @ 820CA9E applymovement 4, SlateportCity_Harbor_Movement_20CAE6 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3 applymovement 4, SlateportCity_Harbor_Movement_20CAEB waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -198,7 +198,7 @@ SlateportCity_Harbor_EventScript_20CB88:: @ 820CB88 SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 msgbox SlateportCity_Harbor_Text_20CF93, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_20CBDD setvar VAR_PORTHOLE_STATE, 1 call SlateportCity_Harbor_EventScript_20CBE9 @@ -209,7 +209,7 @@ SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 SlateportCity_Harbor_EventScript_20CBBA:: @ 820CBBA msgbox SlateportCity_Harbor_Text_20CFAE, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_20CBDD call SlateportCity_Harbor_EventScript_20CBE9 warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 @@ -226,13 +226,13 @@ SlateportCity_Harbor_EventScript_20CBDD:: @ 820CBDD SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 msgbox SlateportCity_Harbor_Text_20CFCB, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq SlateportCity_Harbor_EventScript_20CC42 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq SlateportCity_Harbor_EventScript_20CC37 delay 30 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY @@ -354,7 +354,7 @@ SlateportCity_Harbor_EventScript_20CD44:: @ 820CD44 SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B msgbox SlateportCity_Harbor_Text_20D8BC, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_TOOTH compare VAR_RESULT, 0 @@ -367,7 +367,7 @@ SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB msgbox SlateportCity_Harbor_Text_20D8F1, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_SCALE compare VAR_RESULT, 0 diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc index b1d07c5bb..3e80144c6 100644 --- a/data/maps/SlateportCity_House1/scripts.inc +++ b/data/maps/SlateportCity_House1/scripts.inc @@ -5,15 +5,15 @@ SlateportCity_House1_EventScript_209AA5:: @ 8209AA5 lock faceplayer msgbox SlateportCity_House1_Text_209B8E, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq SlateportCity_House1_EventScript_209AC6 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SlateportCity_House1_EventScript_209AE9 end SlateportCity_House1_EventScript_209AC6:: @ 8209AC6 msgbox SlateportCity_House1_Text_209BFF, MSGBOX_DEFAULT - special sub_81B94B0 + special ChoosePartyMon waitstate compare VAR_0x8004, 255 goto_if_ne SlateportCity_House1_EventScript_209AF3 @@ -39,9 +39,9 @@ SlateportCity_House1_EventScript_209AF3:: @ 8209AF3 compare VAR_RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_209B50 msgbox SlateportCity_House1_Text_209C2B, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq SlateportCity_House1_EventScript_209B5A - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SlateportCity_House1_EventScript_209AE9 end @@ -57,7 +57,7 @@ SlateportCity_House1_EventScript_209B50:: @ 8209B50 SlateportCity_House1_EventScript_209B5A:: @ 8209B5A msgbox SlateportCity_House1_Text_209CA4, MSGBOX_DEFAULT - call Common_EventScript_NameReceivedPokemon + call Common_EventScript_NameReceivedPartyMon specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicknameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 diff --git a/data/maps/SlateportCity_Mart/scripts.inc b/data/maps/SlateportCity_Mart/scripts.inc index cc1eff7f6..63042338b 100644 --- a/data/maps/SlateportCity_Mart/scripts.inc +++ b/data/maps/SlateportCity_Mart/scripts.inc @@ -4,10 +4,10 @@ SlateportCity_Mart_MapScripts:: @ 820DC48 SlateportCity_Mart_EventScript_20DC49:: @ 820DC49 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart SlateportCity_Mart_Pokemart_20DC60 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index eefb843f4..87fc0f6ee 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD96", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_EntranceAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE5F", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt3", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE68", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt4", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE56", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt2", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE4D", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt1", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE71", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt5", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD96", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_EntranceAttendant", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE7A", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt6", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" }, { @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AED4", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron1", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, { @@ -141,7 +141,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEDD", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron2", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, { @@ -154,7 +154,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEE6", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron3", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, { @@ -167,7 +167,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEEF", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron4", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, { @@ -180,7 +180,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEF8", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGrunt", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT" }, { @@ -193,7 +193,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_28C883", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_Reporter", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" } ], @@ -228,7 +228,7 @@ "elevation": 3, "var": "VAR_SLATEPORT_MUSEUM_1F_STATE", "var_value": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD9F" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeLeft" }, { "type": "trigger", @@ -237,7 +237,7 @@ "elevation": 3, "var": "VAR_SLATEPORT_MUSEUM_1F_STATE", "var_value": "0", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20ADB0" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeRight" } ], "bg_events": [ @@ -247,7 +247,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE83" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_WhirlpoolExperiment" }, { "type": "sign", @@ -255,7 +255,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE8C" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_WaterfallExperiment" }, { "type": "sign", @@ -263,7 +263,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE95" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_OceanSoilDisplay" }, { "type": "sign", @@ -271,7 +271,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE9E" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_BeachSandDisplay" }, { "type": "sign", @@ -279,7 +279,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE95" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_OceanSoilDisplay" }, { "type": "sign", @@ -287,7 +287,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE9E" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_BeachSandDisplay" }, { "type": "sign", @@ -295,7 +295,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEA7" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact1" }, { "type": "sign", @@ -303,7 +303,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEB0" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact2" }, { "type": "sign", @@ -311,7 +311,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEB9" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact3" }, { "type": "sign", @@ -319,7 +319,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEC2" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_FossilDisplay" }, { "type": "sign", @@ -327,7 +327,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEC2" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_FossilDisplay" }, { "type": "sign", @@ -335,7 +335,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AECB" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_DepthMeasuringMachine" }, { "type": "sign", @@ -343,7 +343,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AECB" + "script": "SlateportCity_OceanicMuseum_1F_EventScript_DepthMeasuringMachine" } ] }
\ No newline at end of file diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index 0516db1fc..dcf92fe2d 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -1,46 +1,46 @@ SlateportCity_OceanicMuseum_1F_MapScripts:: @ 820AD95 .byte 0 -SlateportCity_OceanicMuseum_1F_EventScript_20AD96:: @ 820AD96 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_EntranceAttendant:: @ 820AD96 + msgbox SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_20AD9F:: @ 820AD9F +SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeLeft:: @ 820AD9F lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 + goto SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee end -SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0 +SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeRight:: @ 820ADB0 lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 + goto SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee end -SlateportCity_OceanicMuseum_1F_EventScript_20ADC1:: @ 820ADC1 +SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee:: @ 820ADC1 showmoneybox 0, 0, 0 - msgbox SlateportCity_OceanicMuseum_1F_Text_20AFD5, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20ADE8 + msgbox SlateportCity_OceanicMuseum_1F_Text_WouldYouLikeToEnter, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee closemessage hidemoneybox nop nop - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_20AE4B + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall end -SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8 +SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee:: @ 820ADE8 checkmoney 50, 0 compare VAR_RESULT, 0 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AE18 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney playse SE_REGI takemoney 50, 0 updatemoneybox 0, 0 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 hidemoneybox nop @@ -48,20 +48,20 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8 releaseall end -SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18 - goto_if_unset FLAG_DELIVERED_DEVON_GOODS, SlateportCity_OceanicMuseum_1F_EventScript_20AE39 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B03D, MSGBOX_DEFAULT +SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney:: @ 820AE18 + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, SlateportCity_OceanicMuseum_1F_EventScript_AllowEntranceAnyway + msgbox SlateportCity_OceanicMuseum_1F_Text_NotEnoughMoney, MSGBOX_DEFAULT closemessage hidemoneybox nop nop - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_20AE4B + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall end -SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B075, MSGBOX_DEFAULT +SlateportCity_OceanicMuseum_1F_EventScript_AllowEntranceAnyway:: @ 820AE39 + msgbox SlateportCity_OceanicMuseum_1F_Text_CatchUpWithYourGroup, MSGBOX_DEFAULT setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 hidemoneybox nop @@ -69,87 +69,87 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39 releaseall end -SlateportCity_OceanicMuseum_1F_Movement_20AE4B: @ 820AE4B +SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter: @ 820AE4B walk_down step_end -SlateportCity_OceanicMuseum_1F_EventScript_20AE4D:: @ 820AE4D - msgbox SlateportCity_OceanicMuseum_1F_Text_20B0E8, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt1:: @ 820AE4D + msgbox SlateportCity_OceanicMuseum_1F_Text_AquaExistForGoodOfAll, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_20AE56:: @ 820AE56 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B112, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt2:: @ 820AE56 + msgbox SlateportCity_OceanicMuseum_1F_Text_OurBossIsntHere, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_20AE5F:: @ 820AE5F - msgbox SlateportCity_OceanicMuseum_1F_Text_20B165, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt3:: @ 820AE5F + msgbox SlateportCity_OceanicMuseum_1F_Text_WouldStuffHereMakeMeRich, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_20AE68:: @ 820AE68 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B19C, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt4:: @ 820AE68 + msgbox SlateportCity_OceanicMuseum_1F_Text_CanLearnForNefariousDeeds, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_20AE71:: @ 820AE71 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B1D4, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt5:: @ 820AE71 + msgbox SlateportCity_OceanicMuseum_1F_Text_RustboroBungled, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_20AE7A:: @ 820AE7A - msgbox SlateportCity_OceanicMuseum_1F_Text_20B218, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt6:: @ 820AE7A + msgbox SlateportCity_OceanicMuseum_1F_Text_DidntHaveMoney, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_20AE83:: @ 820AE83 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B4CF, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_WhirlpoolExperiment:: @ 820AE83 + msgbox SlateportCity_OceanicMuseum_1F_Text_WhirlpoolExperiment, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_20AE8C:: @ 820AE8C - msgbox SlateportCity_OceanicMuseum_1F_Text_20B547, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_WaterfallExperiment:: @ 820AE8C + msgbox SlateportCity_OceanicMuseum_1F_Text_WaterfallExperiment, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_20AE95:: @ 820AE95 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B5CA, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_OceanSoilDisplay:: @ 820AE95 + msgbox SlateportCity_OceanicMuseum_1F_Text_OceanSoilDisplay, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_20AE9E:: @ 820AE9E - msgbox SlateportCity_OceanicMuseum_1F_Text_20B699, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_BeachSandDisplay:: @ 820AE9E + msgbox SlateportCity_OceanicMuseum_1F_Text_BeachSandDisplay, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_20AEA7:: @ 820AEA7 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B74B, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact1:: @ 820AEA7 + msgbox SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact1, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_20AEB0:: @ 820AEB0 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B81F, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact2:: @ 820AEB0 + msgbox SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact2, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_20AEB9:: @ 820AEB9 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B912, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact3:: @ 820AEB9 + msgbox SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact3, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_20AEC2:: @ 820AEC2 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B9C0, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_FossilDisplay:: @ 820AEC2 + msgbox SlateportCity_OceanicMuseum_1F_Text_FossilDisplay, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_20AECB:: @ 820AECB - msgbox SlateportCity_OceanicMuseum_1F_Text_20BA9C, MSGBOX_SIGN +SlateportCity_OceanicMuseum_1F_EventScript_DepthMeasuringMachine:: @ 820AECB + msgbox SlateportCity_OceanicMuseum_1F_Text_DepthMeasuringMachine, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_1F_EventScript_20AED4:: @ 820AED4 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B25F, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron1:: @ 820AED4 + msgbox SlateportCity_OceanicMuseum_1F_Text_LearnAboutSeaForBattling, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_20AEDD:: @ 820AEDD - msgbox SlateportCity_OceanicMuseum_1F_Text_20B2A2, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron2:: @ 820AEDD + msgbox SlateportCity_OceanicMuseum_1F_Text_SternIsRoleModel, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_20AEE6:: @ 820AEE6 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B302, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron3:: @ 820AEE6 + msgbox SlateportCity_OceanicMuseum_1F_Text_MustBePokemonWeDontKnow, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_20AEEF:: @ 820AEEF - msgbox SlateportCity_OceanicMuseum_1F_Text_20B369, MSGBOX_NPC +SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron4:: @ 820AEEF + msgbox SlateportCity_OceanicMuseum_1F_Text_WantSeaPokemon, MSGBOX_NPC end -SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 +SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGrunt:: @ 820AEF8 lock faceplayer delay 8 @@ -158,68 +158,68 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 waitmovement 0 applymovement 13, Common_Movement_Delay48 waitmovement 0 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_1F_Text_RememberMeTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_TM46 compare VAR_RESULT, 0 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AFB5 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_NoRoomForThief setflag FLAG_RECEIVED_TM46 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B449, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_1F_Text_HopeINeverSeeYouAgain, MSGBOX_DEFAULT closemessage - compare VAR_FACING, 2 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF6C - compare VAR_FACING, 1 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF83 - compare VAR_FACING, 3 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 - compare VAR_FACING, 4 - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 - end - -SlateportCity_OceanicMuseum_1F_EventScript_20AF6C:: @ 820AF6C - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_20AFBF - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFCE + compare VAR_FACING, DIR_NORTH + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitNorth + compare VAR_FACING, DIR_SOUTH + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitSouth + compare VAR_FACING, DIR_WEST + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitWestEast + compare VAR_FACING, DIR_EAST + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitWestEast + end + +SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitNorth:: @ 820AF6C + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitNorth + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExitNorth waitmovement 0 - goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA + goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited end -SlateportCity_OceanicMuseum_1F_EventScript_20AF83:: @ 820AF83 - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFC7 +SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitSouth:: @ 820AF83 + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit waitmovement 0 - goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA + goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited end -SlateportCity_OceanicMuseum_1F_EventScript_20AF93:: @ 820AF93 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_20AFC4 - applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFC7 +SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitWestEast:: @ 820AF93 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitWestEast + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit waitmovement 0 - goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA + goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited end -SlateportCity_OceanicMuseum_1F_EventScript_20AFAA:: @ 820AFAA +SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited:: @ 820AFAA setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT playse SE_KAIDAN removeobject 13 release end -SlateportCity_OceanicMuseum_1F_EventScript_20AFB5:: @ 820AFB5 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B49B, MSGBOX_DEFAULT +SlateportCity_OceanicMuseum_1F_EventScript_NoRoomForThief:: @ 820AFB5 + msgbox SlateportCity_OceanicMuseum_1F_Text_YouHaveToTakeThis, MSGBOX_DEFAULT release end -SlateportCity_OceanicMuseum_1F_Movement_20AFBF: @ 820AFBF +SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitNorth: @ 820AFBF delay_16 delay_8 delay_4 walk_in_place_fastest_down step_end -SlateportCity_OceanicMuseum_1F_Movement_20AFC4: @ 820AFC4 +SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitWestEast: @ 820AFC4 delay_16 walk_in_place_fastest_down step_end -SlateportCity_OceanicMuseum_1F_Movement_20AFC7: @ 820AFC7 +SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit: @ 820AFC7 face_down walk_fast_down walk_fast_down @@ -228,7 +228,7 @@ SlateportCity_OceanicMuseum_1F_Movement_20AFC7: @ 820AFC7 delay_8 step_end -SlateportCity_OceanicMuseum_1F_Movement_20AFCE: @ 820AFCE +SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExitNorth: @ 820AFCE walk_fast_right walk_fast_down walk_fast_down @@ -237,71 +237,71 @@ SlateportCity_OceanicMuseum_1F_Movement_20AFCE: @ 820AFCE delay_8 step_end -SlateportCity_OceanicMuseum_1F_Text_20AFD5: @ 820AFD5 +SlateportCity_OceanicMuseum_1F_Text_WouldYouLikeToEnter: @ 820AFD5 .string "Welcome to the OCEANIC MUSEUM.\p" .string "The entrance fee is ¥50.\n" .string "Would you like to enter?$" -SlateportCity_OceanicMuseum_1F_Text_20B026: @ 820B026 +SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself: @ 820B026 .string "Please enjoy yourself.$" -SlateportCity_OceanicMuseum_1F_Text_20B03D: @ 820B03D +SlateportCity_OceanicMuseum_1F_Text_NotEnoughMoney: @ 820B03D .string "Oh? I'm sorry, but you don't seem to\n" .string "have enough money.$" -SlateportCity_OceanicMuseum_1F_Text_20B075: @ 820B075 +SlateportCity_OceanicMuseum_1F_Text_CatchUpWithYourGroup: @ 820B075 .string "Oh? You're with that group that\n" .string "went in earlier?\p" .string "You're the only one who's late.\n" .string "You'd better go catch up to them!$" -SlateportCity_OceanicMuseum_1F_Text_20B0E8: @ 820B0E8 +SlateportCity_OceanicMuseum_1F_Text_AquaExistForGoodOfAll: @ 820B0E8 .string "We, TEAM AQUA, exist for the good\n" .string "of all!$" -SlateportCity_OceanicMuseum_1F_Text_20B112: @ 820B112 +SlateportCity_OceanicMuseum_1F_Text_OurBossIsntHere: @ 820B112 .string "We were told to assemble here,\n" .string "so we did, but…\p" .string "Our BOSS, the linchpin, isn't here.$" -SlateportCity_OceanicMuseum_1F_Text_20B165: @ 820B165 +SlateportCity_OceanicMuseum_1F_Text_WouldStuffHereMakeMeRich: @ 820B165 .string "If I ripped off the stuff here,\n" .string "would it make me rich?$" -SlateportCity_OceanicMuseum_1F_Text_20B19C: @ 820B19C +SlateportCity_OceanicMuseum_1F_Text_CanLearnForNefariousDeeds: @ 820B19C .string "What I learn here, I can put to use on\n" .string "nefarious deeds…$" -SlateportCity_OceanicMuseum_1F_Text_20B1D4: @ 820B1D4 +SlateportCity_OceanicMuseum_1F_Text_RustboroBungled: @ 820B1D4 .string "If our goons didn't bungle things\n" .string "in RUSTBORO, we wouldn't be here!$" -SlateportCity_OceanicMuseum_1F_Text_20B218: @ 820B218 +SlateportCity_OceanicMuseum_1F_Text_DidntHaveMoney: @ 820B218 .string "I didn't have ¥50, so it took a long\n" .string "time getting by the receptionist.$" -SlateportCity_OceanicMuseum_1F_Text_20B25F: @ 820B25F +SlateportCity_OceanicMuseum_1F_Text_LearnAboutSeaForBattling: @ 820B25F .string "I want to learn about the sea and\n" .string "use that knowledge for battling.$" -SlateportCity_OceanicMuseum_1F_Text_20B2A2: @ 820B2A2 +SlateportCity_OceanicMuseum_1F_Text_SternIsRoleModel: @ 820B2A2 .string "I get all giddy and gooey when\n" .string "I see the sea!\p" .string "For me, CAPT. STERN is the number\n" .string "one role model!$" -SlateportCity_OceanicMuseum_1F_Text_20B302: @ 820B302 +SlateportCity_OceanicMuseum_1F_Text_MustBePokemonWeDontKnow: @ 820B302 .string "The sea is vast without end, and\n" .string "infinitely deep…\p" .string "There must be many POKéMON that\n" .string "we don't know about.$" -SlateportCity_OceanicMuseum_1F_Text_20B369: @ 820B369 +SlateportCity_OceanicMuseum_1F_Text_WantSeaPokemon: @ 820B369 .string "I want a sea POKéMON.\p" .string "I think it would feel cool and nice\n" .string "to hug.$" -SlateportCity_OceanicMuseum_1F_Text_20B3AB: @ 820B3AB +SlateportCity_OceanicMuseum_1F_Text_RememberMeTakeThis: @ 820B3AB .string "Aiyeeeh!\n" .string "What are you doing here?\p" .string "Me? I'm the TEAM AQUA member\n" @@ -310,29 +310,29 @@ SlateportCity_OceanicMuseum_1F_Text_20B3AB: @ 820B3AB .string "Here, take this!\n" .string "You have to forgive me!$" -SlateportCity_OceanicMuseum_1F_Text_20B449: @ 820B449 +SlateportCity_OceanicMuseum_1F_Text_HopeINeverSeeYouAgain: @ 820B449 .string "That TM, it suits you more than it\n" .string "does me.\p" .string "Hope I never see you again!\n" .string "Wahahaha!$" -SlateportCity_OceanicMuseum_1F_Text_20B49B: @ 820B49B +SlateportCity_OceanicMuseum_1F_Text_YouHaveToTakeThis: @ 820B49B .string "Awww, come on!\n" .string "You have to take this and let me go!$" -SlateportCity_OceanicMuseum_1F_Text_20B4CF: @ 820B4CF +SlateportCity_OceanicMuseum_1F_Text_WhirlpoolExperiment: @ 820B4CF .string "A blue fluid is spiraling inside\n" .string "a glass vessel.\p" .string "“This is an experiment to create a\n" .string "WHIRLPOOL artificially using wind.”$" -SlateportCity_OceanicMuseum_1F_Text_20B547: @ 820B547 +SlateportCity_OceanicMuseum_1F_Text_WaterfallExperiment: @ 820B547 .string "A red ball is bobbing up and down\n" .string "inside a glass vessel.\p" .string "“This is an experiment simulating a\n" .string "WATERFALL using the ball's buoyancy.”$" -SlateportCity_OceanicMuseum_1F_Text_20B5CA: @ 820B5CA +SlateportCity_OceanicMuseum_1F_Text_OceanSoilDisplay: @ 820B5CA .string "It's a sample of soil from the ocean\n" .string "floor.\p" .string "“Over many years, the remains of\n" @@ -341,7 +341,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B5CA: @ 820B5CA .string "“By analyzing these layers, the\n" .string "ancient past is revealed.”$" -SlateportCity_OceanicMuseum_1F_Text_20B699: @ 820B699 +SlateportCity_OceanicMuseum_1F_Text_BeachSandDisplay: @ 820B699 .string "It's a sample of beach sand.\p" .string "“Stones from mountains are washed\n" .string "down by rivers where they are\l" @@ -349,7 +349,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B699: @ 820B699 .string "“They are reduced to grains and end\n" .string "up as sand on beaches.”$" -SlateportCity_OceanicMuseum_1F_Text_20B74B: @ 820B74B +SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact1: @ 820B74B .string "“OCEANIC MINIFACT 1\n" .string "Why is seawater blue?\p" .string "“Light is composed of many colors.\p" @@ -358,7 +358,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B74B: @ 820B74B .string "“However, blue light retains its\n" .string "color, making the sea appear blue.”$" -SlateportCity_OceanicMuseum_1F_Text_20B81F: @ 820B81F +SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact2: @ 820B81F .string "“OCEANIC MINIFACT 2\n" .string "Why is the sea salty?\p" .string "“Seawater contains dissolved salt in\n" @@ -368,7 +368,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B81F: @ 820B81F .string "“The concentration of dissolved salt\n" .string "makes the sea salty.”$" -SlateportCity_OceanicMuseum_1F_Text_20B912: @ 820B912 +SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact3: @ 820B912 .string "“OCEANIC MINIFACT 3\n" .string "Which is bigger? The sea or land?\p" .string "“The sea covers about 70% of\n" @@ -376,7 +376,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B912: @ 820B912 .string "“The sea is therefore more than twice\n" .string "the size of land.”$" -SlateportCity_OceanicMuseum_1F_Text_20B9C0: @ 820B9C0 +SlateportCity_OceanicMuseum_1F_Text_FossilDisplay: @ 820B9C0 .string "It's a fossil with wavy ridges on it.\p" .string "“Soil on the ocean floor gets scoured\n" .string "by the tide.\p" @@ -385,7 +385,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B9C0: @ 820B9C0 .string "“If this soil becomes fossilized, it is\n" .string "called a ripple mark.”$" -SlateportCity_OceanicMuseum_1F_Text_20BA9C: @ 820BA9C +SlateportCity_OceanicMuseum_1F_Text_DepthMeasuringMachine: @ 820BA9C .string "A strange machine is rotating under\n" .string "a glass dome.\p" .string "Maybe it's for measuring the depth\n" diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json index 6eaecba97..0c45541e4 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BB00", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_CaptStern", "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD64", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron1", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD6D", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron2", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD76", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron3", "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" } ], @@ -123,7 +123,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD0A" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_WaterQualitySample1" }, { "type": "sign", @@ -131,7 +131,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD13" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_WaterQualitySample2" }, { "type": "sign", @@ -139,7 +139,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD52" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SubmersibleReplica" }, { "type": "sign", @@ -147,7 +147,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD52" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SubmersibleReplica" }, { "type": "sign", @@ -155,7 +155,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD49" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SubmarineReplica" }, { "type": "sign", @@ -163,7 +163,7 @@ "y": 3, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD49" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SubmarineReplica" }, { "type": "sign", @@ -171,7 +171,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD49" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SubmarineReplica" }, { "type": "sign", @@ -179,7 +179,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica" }, { "type": "sign", @@ -187,7 +187,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica" }, { "type": "sign", @@ -195,7 +195,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD5B" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSAnneReplica" }, { "type": "sign", @@ -203,7 +203,7 @@ "y": 7, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD5B" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSAnneReplica" }, { "type": "sign", @@ -211,7 +211,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD37" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SurfaceSeawaterDisplay" }, { "type": "sign", @@ -219,7 +219,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD37" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SurfaceSeawaterDisplay" }, { "type": "sign", @@ -227,7 +227,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD2E" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_DeepSeawaterDisplay" }, { "type": "sign", @@ -235,7 +235,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD2E" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_DeepSeawaterDisplay" }, { "type": "sign", @@ -243,7 +243,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD25" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_HoennModel" }, { "type": "sign", @@ -251,7 +251,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD25" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_HoennModel" }, { "type": "sign", @@ -259,7 +259,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD1C" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_PressureExperiment" }, { "type": "sign", @@ -267,7 +267,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD1C" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_PressureExperiment" }, { "type": "sign", @@ -275,7 +275,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica" }, { "type": "sign", @@ -283,7 +283,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40" + "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica" } ] }
\ No newline at end of file diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index d15a23558..e3d91cd28 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -1,63 +1,63 @@ SlateportCity_OceanicMuseum_2F_MapScripts:: @ 820BAFF .byte 0 -SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 +SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00 lock faceplayer - msgbox SlateportCity_OceanicMuseum_2F_Text_20BD8D, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_ThankYouForTheParts, MSGBOX_DEFAULT closemessage playbgm MUS_AQA_0, 1 addobject 3 - applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE4 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_FirstGruntEnter waitmovement 0 addobject 4 - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF3 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_SecondGruntEnter waitmovement 0 - applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE8 - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF5 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_FirstGruntApproach + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_SecondGruntApproach waitmovement 0 - compare VAR_FACING, 1 - call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC92 - compare VAR_FACING, 4 - call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC92 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BE40, MSGBOX_DEFAULT - compare VAR_FACING, 4 - call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_20BC9D - msgbox SlateportCity_OceanicMuseum_2F_Text_20BE69, MSGBOX_DEFAULT - msgbox SlateportCity_OceanicMuseum_2F_Text_20BE93, MSGBOX_DEFAULT + compare VAR_FACING, DIR_SOUTH + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_PlayerFaceGrunts + compare VAR_FACING, DIR_EAST + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_PlayerFaceGrunts + msgbox SlateportCity_OceanicMuseum_2F_Text_WellTakeThoseParts, MSGBOX_DEFAULT + compare VAR_FACING, DIR_EAST + call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_SternFaceGrunts + msgbox SlateportCity_OceanicMuseum_2F_Text_SternWhoAreYou, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_WereTeamAqua, MSGBOX_DEFAULT closemessage - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCE2 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle waitmovement 0 - compare VAR_FACING, 1 - call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BCA8 - compare VAR_FACING, 3 - call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BCB3 - trainerbattle_no_intro TRAINER_GRUNT_14, SlateportCity_OceanicMuseum_2F_Text_20BEE2 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, MSGBOX_DEFAULT + compare VAR_FACING, DIR_SOUTH + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntSouth + compare VAR_FACING, DIR_WEST + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntWest + trainerbattle_no_intro TRAINER_GRUNT_14, SlateportCity_OceanicMuseum_2F_Text_Grunt14Defeat + msgbox SlateportCity_OceanicMuseum_2F_Text_BossGoingToBeFurious, MSGBOX_DEFAULT closemessage - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCEF + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated waitmovement 0 - applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE2 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BF35, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_GRUNT_15, SlateportCity_OceanicMuseum_2F_Text_20BF66 - applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCEF + msgbox SlateportCity_OceanicMuseum_2F_Text_LetMeTakeCareOfThis, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_15, SlateportCity_OceanicMuseum_2F_Text_Grunt15Defeat + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated waitmovement 0 - applymovement 3, Common_Movement_WalkInPlaceDown - applymovement 4, Common_Movement_WalkInPlaceUp + applymovement 3, Common_Movement_WalkInPlaceFastestDown + applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BF7A, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_MeddlingKid, MSGBOX_DEFAULT closemessage delay 35 addobject 2 - applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_20BCD8 - applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCFE + applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_ArchieEnter + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_GruntMoveForArchie waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BFF2, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_CameToSeeWhatsTakingSoLong, MSGBOX_DEFAULT closemessage - applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_20BCD6 + applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_ArchieApproachPlayer waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C059, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_ArchieWarning, MSGBOX_DEFAULT closemessage savebgm MUS_DUMMY fadedefaultbgm @@ -68,12 +68,12 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 fadescreen 0 delay 30 setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, MSGBOX_DEFAULT - setvar VAR_0x8004, 269 - call SlateportCity_OceanicMuseum_2F_EventScript_2723E4 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C36C, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_SternThankYouForSavingUs, MSGBOX_DEFAULT + setvar VAR_0x8004, ITEM_DEVON_GOODS + call Common_EventScript_PlayerHandedOverTheItem + msgbox SlateportCity_OceanicMuseum_2F_Text_SternIveGotToGo, MSGBOX_DEFAULT closemessage fadescreen 1 playfanfare MUS_ME_ASA @@ -82,7 +82,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 removeobject 1 setflag FLAG_HIDE_ROUTE_110_TEAM_AQUA compare VAR_REGISTER_BIRCH_STATE, 0 - call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC8C + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_ReadyRegisterBirch setflag FLAG_DELIVERED_DEVON_GOODS clearflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE @@ -91,37 +91,37 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 release end -SlateportCity_OceanicMuseum_2F_EventScript_20BC8C:: @ 820BC8C +SlateportCity_OceanicMuseum_2F_EventScript_ReadyRegisterBirch:: @ 820BC8C setvar VAR_REGISTER_BIRCH_STATE, 1 return -SlateportCity_OceanicMuseum_2F_EventScript_20BC92:: @ 820BC92 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft +SlateportCity_OceanicMuseum_2F_EventScript_PlayerFaceGrunts:: @ 820BC92 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -SlateportCity_OceanicMuseum_2F_EventScript_20BC9D:: @ 820BC9D - applymovement 1, Common_Movement_WalkInPlaceLeft +SlateportCity_OceanicMuseum_2F_EventScript_SternFaceGrunts:: @ 820BC9D + applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -SlateportCity_OceanicMuseum_2F_EventScript_20BCA8:: @ 820BCA8 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_20BCBE +SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntSouth:: @ 820BCA8 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntSouth waitmovement 0 return -SlateportCity_OceanicMuseum_2F_EventScript_20BCB3:: @ 820BCB3 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_20BCC2 +SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntWest:: @ 820BCB3 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest waitmovement 0 return -SlateportCity_OceanicMuseum_2F_Movement_20BCBE: @ 820BCBE +SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntSouth: @ 820BCBE walk_left walk_down walk_in_place_fastest_left step_end -SlateportCity_OceanicMuseum_2F_Movement_20BCC2: @ 820BCC2 +SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest: @ 820BCC2 walk_up walk_left walk_left @@ -129,6 +129,7 @@ SlateportCity_OceanicMuseum_2F_Movement_20BCC2: @ 820BCC2 walk_in_place_fastest_left step_end +@ Unused SlateportCity_OceanicMuseum_2F_Movement_20BCC8: @ 820BCC8 walk_up walk_left @@ -145,11 +146,11 @@ SlateportCity_OceanicMuseum_2F_Movement_20BCC8: @ 820BCC8 delay_8 step_end -SlateportCity_OceanicMuseum_2F_Movement_20BCD6: @ 820BCD6 +SlateportCity_OceanicMuseum_2F_Movement_ArchieApproachPlayer: @ 820BCD6 walk_right step_end -SlateportCity_OceanicMuseum_2F_Movement_20BCD8: @ 820BCD8 +SlateportCity_OceanicMuseum_2F_Movement_ArchieEnter: @ 820BCD8 walk_down walk_down walk_down @@ -161,17 +162,17 @@ SlateportCity_OceanicMuseum_2F_Movement_20BCD8: @ 820BCD8 walk_right step_end -SlateportCity_OceanicMuseum_2F_Movement_20BCE2: @ 820BCE2 +SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle: @ 820BCE2 walk_right step_end -SlateportCity_OceanicMuseum_2F_Movement_20BCE4: @ 820BCE4 +SlateportCity_OceanicMuseum_2F_Movement_FirstGruntEnter: @ 820BCE4 walk_down walk_right walk_in_place_fastest_down step_end -SlateportCity_OceanicMuseum_2F_Movement_20BCE8: @ 820BCE8 +SlateportCity_OceanicMuseum_2F_Movement_FirstGruntApproach: @ 820BCE8 walk_down walk_down walk_down @@ -180,17 +181,17 @@ SlateportCity_OceanicMuseum_2F_Movement_20BCE8: @ 820BCE8 walk_right step_end -SlateportCity_OceanicMuseum_2F_Movement_20BCEF: @ 820BCEF +SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated: @ 820BCEF lock_facing_direction walk_left unlock_facing_direction step_end -SlateportCity_OceanicMuseum_2F_Movement_20BCF3: @ 820BCF3 +SlateportCity_OceanicMuseum_2F_Movement_SecondGruntEnter: @ 820BCF3 walk_down step_end -SlateportCity_OceanicMuseum_2F_Movement_20BCF5: @ 820BCF5 +SlateportCity_OceanicMuseum_2F_Movement_SecondGruntApproach: @ 820BCF5 walk_down walk_down walk_down @@ -201,7 +202,7 @@ SlateportCity_OceanicMuseum_2F_Movement_20BCF5: @ 820BCF5 walk_right step_end -SlateportCity_OceanicMuseum_2F_Movement_20BCFE: @ 820BCFE +SlateportCity_OceanicMuseum_2F_Movement_GruntMoveForArchie: @ 820BCFE delay_16 delay_16 delay_16 @@ -215,65 +216,65 @@ SlateportCity_OceanicMuseum_2F_Movement_20BCFE: @ 820BCFE walk_in_place_fastest_up step_end -SlateportCity_OceanicMuseum_2F_EventScript_20BD0A:: @ 820BD0A - msgbox SlateportCity_OceanicMuseum_2F_Text_20C4F9, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_WaterQualitySample1:: @ 820BD0A + msgbox SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample1, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_20BD13:: @ 820BD13 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C566, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_WaterQualitySample2:: @ 820BD13 + msgbox SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample2, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_20BD1C:: @ 820BD1C - msgbox SlateportCity_OceanicMuseum_2F_Text_20C5C6, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_PressureExperiment:: @ 820BD1C + msgbox SlateportCity_OceanicMuseum_2F_Text_PressureExperiment, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_20BD25:: @ 820BD25 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C6C7, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_HoennModel:: @ 820BD25 + msgbox SlateportCity_OceanicMuseum_2F_Text_HoennModel, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_20BD2E:: @ 820BD2E - msgbox SlateportCity_OceanicMuseum_2F_Text_20C72F, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_DeepSeawaterDisplay:: @ 820BD2E + msgbox SlateportCity_OceanicMuseum_2F_Text_DeepSeawaterDisplay, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_20BD37:: @ 820BD37 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C7C1, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_SurfaceSeawaterDisplay:: @ 820BD37 + msgbox SlateportCity_OceanicMuseum_2F_Text_SurfaceSeawaterDisplay, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_20BD40:: @ 820BD40 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C82F, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica:: @ 820BD40 + msgbox SlateportCity_OceanicMuseum_2F_Text_SSTidalReplica, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_20BD49:: @ 820BD49 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C88B, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_SubmarineReplica:: @ 820BD49 + msgbox SlateportCity_OceanicMuseum_2F_Text_SubmarineReplica, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_20BD52:: @ 820BD52 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C8E8, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_SubmersibleReplica:: @ 820BD52 + msgbox SlateportCity_OceanicMuseum_2F_Text_SumbersibleReplica, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_20BD5B:: @ 820BD5B - msgbox SlateportCity_OceanicMuseum_2F_Text_20C93A, MSGBOX_SIGN +SlateportCity_OceanicMuseum_2F_EventScript_SSAnneReplica:: @ 820BD5B + msgbox SlateportCity_OceanicMuseum_2F_Text_SSAnneReplica, MSGBOX_SIGN end -SlateportCity_OceanicMuseum_2F_EventScript_20BD64:: @ 820BD64 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C43F, MSGBOX_NPC +SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron1:: @ 820BD64 + msgbox SlateportCity_OceanicMuseum_2F_Text_RemindsMeOfAbandonedShip, MSGBOX_NPC end -SlateportCity_OceanicMuseum_2F_EventScript_20BD6D:: @ 820BD6D - msgbox SlateportCity_OceanicMuseum_2F_Text_20C495, MSGBOX_NPC +SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron2:: @ 820BD6D + msgbox SlateportCity_OceanicMuseum_2F_Text_DontRunInMuseum, MSGBOX_NPC end -SlateportCity_OceanicMuseum_2F_EventScript_20BD76:: @ 820BD76 +SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron3:: @ 820BD76 lock faceplayer - msgbox SlateportCity_OceanicMuseum_2F_Text_20C4C2, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_WantToRideSubmarine, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -SlateportCity_OceanicMuseum_2F_Text_20BD8D: @ 820BD8D +SlateportCity_OceanicMuseum_2F_Text_ThankYouForTheParts: @ 820BD8D .string "Yes? If you're looking for STERN,\n" .string "that would be me.\p" .string "Ah! Those must be the parts I ordered\n" @@ -281,47 +282,47 @@ SlateportCity_OceanicMuseum_2F_Text_20BD8D: @ 820BD8D .string "Thank you! That's great!\n" .string "We can prepare for our expedition now.$" -SlateportCity_OceanicMuseum_2F_Text_20BE40: @ 820BE40 +SlateportCity_OceanicMuseum_2F_Text_WellTakeThoseParts: @ 820BE40 .string "Hehehe, hold it!\n" .string "We'll take those parts!$" -SlateportCity_OceanicMuseum_2F_Text_20BE69: @ 820BE69 +SlateportCity_OceanicMuseum_2F_Text_SternWhoAreYou: @ 820BE69 .string "CAPT. STERN: Wh-what?\n" .string "Who are you people?$" -SlateportCity_OceanicMuseum_2F_Text_20BE93: @ 820BE93 +SlateportCity_OceanicMuseum_2F_Text_WereTeamAqua: @ 820BE93 .string "We're TEAM AQUA!\p" .string "Our BOSS wants those parts!\n" .string "Shut your yap and fork them over!$" -SlateportCity_OceanicMuseum_2F_Text_20BEE2: @ 820BEE2 +SlateportCity_OceanicMuseum_2F_Text_Grunt14Defeat: @ 820BEE2 .string "Awaaaah!\n" .string "A kid beat me!$" -SlateportCity_OceanicMuseum_2F_Text_20BEFA: @ 820BEFA +SlateportCity_OceanicMuseum_2F_Text_BossGoingToBeFurious: @ 820BEFA .string "Oh, man, what a disaster…\n" .string "The BOSS is going to be furious…$" -SlateportCity_OceanicMuseum_2F_Text_20BF35: @ 820BF35 +SlateportCity_OceanicMuseum_2F_Text_LetMeTakeCareOfThis: @ 820BF35 .string "Humph, sniveling wimp!\n" .string "Let me take care of this!$" -SlateportCity_OceanicMuseum_2F_Text_20BF66: @ 820BF66 +SlateportCity_OceanicMuseum_2F_Text_Grunt15Defeat: @ 820BF66 .string "What?!\n" .string "I lost, too!$" -SlateportCity_OceanicMuseum_2F_Text_20BF7A: @ 820BF7A +SlateportCity_OceanicMuseum_2F_Text_MeddlingKid: @ 820BF7A .string "Now what? If we don't get the parts,\n" .string "we're in for it!\p" .string "Arrgh, I didn't count on being meddled\n" .string "with by some meddling kid!$" -SlateportCity_OceanicMuseum_2F_Text_20BFF2: @ 820BFF2 +SlateportCity_OceanicMuseum_2F_Text_CameToSeeWhatsTakingSoLong: @ 820BFF2 .string "I came to see what was taking so\n" .string "long to snatch some parts, and you\l" .string "simps are held up by a mere child?$" -SlateportCity_OceanicMuseum_2F_Text_20C059: @ 820C059 +SlateportCity_OceanicMuseum_2F_Text_ArchieWarning: @ 820C059 .string "We are TEAM AQUA,\n" .string "and we love the sea!\p" .string "And I am TEAM AQUA's leader,\n" @@ -348,7 +349,7 @@ SlateportCity_OceanicMuseum_2F_Text_20C059: @ 820C059 .string "dearly!\p" .string "And don't you forget it!$" -SlateportCity_OceanicMuseum_2F_Text_20C2BE: @ 820C2BE +SlateportCity_OceanicMuseum_2F_Text_SternThankYouForSavingUs: @ 820C2BE .string "CAPT. STERN: You're…\n" .string "Ah, okay, you're {PLAYER}{KUN}…\p" .string "Anyway, that was a tense situation!\n" @@ -356,7 +357,7 @@ SlateportCity_OceanicMuseum_2F_Text_20C2BE: @ 820C2BE .string "Oh, yes, I almost forgot that you\n" .string "even brought the parts from DEVON!$" -SlateportCity_OceanicMuseum_2F_Text_20C36C: @ 820C36C +SlateportCity_OceanicMuseum_2F_Text_SternIveGotToGo: @ 820C36C .string "CAPT. STERN: Whoops!\n" .string "There's no time to lose!\p" .string "We have to set out on our ocean-floor\n" @@ -366,32 +367,32 @@ SlateportCity_OceanicMuseum_2F_Text_20C36C: @ 820C36C .string "Feel free to wander around and check\n" .string "out our facilities, though.$" -SlateportCity_OceanicMuseum_2F_Text_20C43F: @ 820C43F +SlateportCity_OceanicMuseum_2F_Text_RemindsMeOfAbandonedShip: @ 820C43F .string "I saw a model of a ship here.\p" .string "It reminded me of the ABANDONED SHIP\n" .string "near DEWFORD TOWN…$" -SlateportCity_OceanicMuseum_2F_Text_20C495: @ 820C495 +SlateportCity_OceanicMuseum_2F_Text_DontRunInMuseum: @ 820C495 .string "Don't you dare run around inside\n" .string "the MUSEUM!$" -SlateportCity_OceanicMuseum_2F_Text_20C4C2: @ 820C4C2 +SlateportCity_OceanicMuseum_2F_Text_WantToRideSubmarine: @ 820C4C2 .string "Wow, the submarine's awesome!\n" .string "I want to go for a ride!$" -SlateportCity_OceanicMuseum_2F_Text_20C4F9: @ 820C4F9 +SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample1: @ 820C4F9 .string "“WATER QUALITY SAMPLE 1,” the\n" .string "label says.\p" .string "The sea is all connected, but the\n" .string "water seems to differ by region.$" -SlateportCity_OceanicMuseum_2F_Text_20C566: @ 820C566 +SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample2: @ 820C566 .string "“WATER QUALITY SAMPLE 2,” the\n" .string "label says.\p" .string "Does the saltiness of seawater differ\n" .string "by region, too?$" -SlateportCity_OceanicMuseum_2F_Text_20C5C6: @ 820C5C6 +SlateportCity_OceanicMuseum_2F_Text_PressureExperiment: @ 820C5C6 .string "A rubber ball is expanding and\n" .string "shrinking.\p" .string "“In the sea, the weight of water itself\n" @@ -402,39 +403,39 @@ SlateportCity_OceanicMuseum_2F_Text_20C5C6: @ 820C5C6 .string "the pressure can reach even tens of\l" .string "thousands of tons on a small area.”$" -SlateportCity_OceanicMuseum_2F_Text_20C6C7: @ 820C6C7 +SlateportCity_OceanicMuseum_2F_Text_HoennModel: @ 820C6C7 .string "“MODEL OF HOENN REGION”\p" .string "It's a miniature diorama of the\n" .string "HOENN region.\p" .string "Where is LITTLEROOT TOWN on this?$" -SlateportCity_OceanicMuseum_2F_Text_20C72F: @ 820C72F +SlateportCity_OceanicMuseum_2F_Text_DeepSeawaterDisplay: @ 820C72F .string "It's a display on the flow of seawater.\p" .string "“Near the bottom of the sea, water\n" .string "flows due to differences in such\l" .string "factors as temperature and salinity.”$" -SlateportCity_OceanicMuseum_2F_Text_20C7C1: @ 820C7C1 +SlateportCity_OceanicMuseum_2F_Text_SurfaceSeawaterDisplay: @ 820C7C1 .string "It's a display on the flow of seawater.\p" .string "“Toward the surface, seawater flows\n" .string "as currents driven by the winds.”$" -SlateportCity_OceanicMuseum_2F_Text_20C82F: @ 820C82F +SlateportCity_OceanicMuseum_2F_Text_SSTidalReplica: @ 820C82F .string "“THE FERRY S.S. TIDAL\p" .string "“A scale replica of the ship under\n" .string "construction at STERN'S SHIPYARD.”$" -SlateportCity_OceanicMuseum_2F_Text_20C88B: @ 820C88B +SlateportCity_OceanicMuseum_2F_Text_SubmarineReplica: @ 820C88B .string "“SUBMARINE EXPLORER 1\p" .string "“A replica of the high-performance\n" .string "ocean floor exploration submarine.”$" -SlateportCity_OceanicMuseum_2F_Text_20C8E8: @ 820C8E8 +SlateportCity_OceanicMuseum_2F_Text_SumbersibleReplica: @ 820C8E8 .string "“SUBMERSIBLE POD\p" .string "“A replica of a compact, unmanned\n" .string "pod for seafloor exploration.”$" -SlateportCity_OceanicMuseum_2F_Text_20C93A: @ 820C93A +SlateportCity_OceanicMuseum_2F_Text_SSAnneReplica: @ 820C93A .string "“S.S. ANNE\p" .string "“A replica of the luxury liner that\n" .string "circles the globe.”$" diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc index 4c6b3ec7f..f148e5d3f 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -1,16 +1,16 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, SlateportCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 SlateportCity_PokemonCenter_1F_OnTransition: @ 820DACA setrespawn HEAL_LOCATION_SLATEPORT_CITY - call SlateportCity_PokemonCenter_1F_EventScript_2718DE + call Common_EventScript_UpdateBrineyLocation end SlateportCity_PokemonCenter_1F_EventScript_20DAD3:: @ 820DAD3 setvar VAR_0x800B, 1 - call SlateportCity_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/SlateportCity_PokemonCenter_2F/map.json b/data/maps/SlateportCity_PokemonCenter_2F/map.json index e6ad0518b..74cccebf0 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc index a9d48f43d..6406df27d 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ SlateportCity_PokemonCenter_2F_MapScripts:: @ 820DC21 - map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, SlateportCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -SlateportCity_PokemonCenter_2F_EventScript_20DC36:: @ 820DC36 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +SlateportCity_PokemonCenter_2F_EventScript_Colosseum:: @ 820DC36 + call CableClub_EventScript_Colosseum end -SlateportCity_PokemonCenter_2F_EventScript_20DC3C:: @ 820DC3C - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +SlateportCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 820DC3C + call CableClub_EventScript_TradeCenter end -SlateportCity_PokemonCenter_2F_EventScript_20DC42:: @ 820DC42 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +SlateportCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 820DC42 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json index 045a0c315..faf7e7db2 100644 --- a/data/maps/SlateportCity_PokemonFanClub/map.json +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SlateportCity_PokemonFanClub_EventScript_2C7F16", + "script": "SlateportCity_PokemonFanClub_EventScript_SwaggerTutor", "flag": "0" } ], diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index d481924a2..d74ca48a1 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -219,8 +219,8 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946 setvar VAR_0x8004, 0 special Script_DoRayquazaScene waitstate - applymovement 10, Common_Movement_WalkInPlaceLeft - applymovement 9, Common_Movement_WalkInPlaceRight + applymovement 10, Common_Movement_WalkInPlaceFastestLeft + applymovement 9, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 60 waitse @@ -228,11 +228,11 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946 applymovement 10, SootopolisCity_Movement_1E5BB8 applymovement 9, SootopolisCity_Movement_1E5BE5 waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 + setvar VAR_0x8004, 1 @ vertical pan + setvar VAR_0x8005, 1 @ horizontal pan + setvar VAR_0x8006, 8 @ num shakes + setvar VAR_0x8007, 5 @ shake delay + special ShakeCamera waitstate applymovement 10, SootopolisCity_Movement_1E5BCF applymovement 9, SootopolisCity_Movement_1E5BF0 @@ -242,11 +242,11 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946 applymovement 10, SootopolisCity_Movement_1E5BC2 applymovement 9, SootopolisCity_Movement_1E5BDD waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 + setvar VAR_0x8004, 1 @ vertical pan + setvar VAR_0x8005, 1 @ horizontal pan + setvar VAR_0x8006, 8 @ num shakes + setvar VAR_0x8007, 5 @ shake delay + special ShakeCamera waitstate applymovement 10, SootopolisCity_Movement_1E5BCF applymovement 9, SootopolisCity_Movement_1E5BF0 @@ -256,11 +256,11 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946 applymovement 10, SootopolisCity_Movement_1E5BB8 applymovement 9, SootopolisCity_Movement_1E5BE5 waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 + setvar VAR_0x8004, 1 @ vertical pan + setvar VAR_0x8005, 1 @ horizontal pan + setvar VAR_0x8006, 8 @ num shakes + setvar VAR_0x8007, 5 @ shake delay + special ShakeCamera waitstate applymovement 10, SootopolisCity_Movement_1E5BCF applymovement 9, SootopolisCity_Movement_1E5BF0 @@ -319,8 +319,8 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82 setvar VAR_0x8004, 0 special Script_DoRayquazaScene waitstate - applymovement 10, Common_Movement_WalkInPlaceLeft - applymovement 9, Common_Movement_WalkInPlaceRight + applymovement 10, Common_Movement_WalkInPlaceFastestLeft + applymovement 9, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 60 waitse @@ -328,11 +328,11 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82 applymovement 10, SootopolisCity_Movement_1E5BB8 applymovement 9, SootopolisCity_Movement_1E5BE5 waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 + setvar VAR_0x8004, 1 @ vertical pan + setvar VAR_0x8005, 1 @ horizontal pan + setvar VAR_0x8006, 8 @ num shakes + setvar VAR_0x8007, 5 @ shake delay + special ShakeCamera waitstate applymovement 10, SootopolisCity_Movement_1E5BCF applymovement 9, SootopolisCity_Movement_1E5BF0 @@ -342,11 +342,11 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82 applymovement 10, SootopolisCity_Movement_1E5BC2 applymovement 9, SootopolisCity_Movement_1E5BDD waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 + setvar VAR_0x8004, 1 @ vertical pan + setvar VAR_0x8005, 1 @ horizontal pan + setvar VAR_0x8006, 8 @ num shakes + setvar VAR_0x8007, 5 @ shake delay + special ShakeCamera waitstate applymovement 10, SootopolisCity_Movement_1E5BCF applymovement 9, SootopolisCity_Movement_1E5BF0 @@ -356,11 +356,11 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82 applymovement 10, SootopolisCity_Movement_1E5BB8 applymovement 9, SootopolisCity_Movement_1E5BE5 waitmovement 0 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 + setvar VAR_0x8004, 1 @ vertical pan + setvar VAR_0x8005, 1 @ horizontal pan + setvar VAR_0x8006, 8 @ num shakes + setvar VAR_0x8007, 5 @ shake delay + special ShakeCamera waitstate applymovement 10, SootopolisCity_Movement_1E5BCF applymovement 9, SootopolisCity_Movement_1E5BF0 @@ -517,19 +517,19 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E waitmovement 0 waitse playmoncry SPECIES_RAYQUAZA, 2 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 3 - special sub_8139560 + setvar VAR_0x8004, 1 @ vertical pan + setvar VAR_0x8005, 1 @ horizontal pan + setvar VAR_0x8006, 8 @ num shakes + setvar VAR_0x8007, 3 @ shake delay + special ShakeCamera waitstate waitse playmoncry SPECIES_RAYQUAZA, 2 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 + setvar VAR_0x8004, 1 @ vertical pan + setvar VAR_0x8005, 2 @ horizontal pan + setvar VAR_0x8006, 8 @ num shakes + setvar VAR_0x8007, 5 @ shake delay + special ShakeCamera waitstate waitmoncry setweather WEATHER_NONE @@ -570,19 +570,19 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE waitmovement 0 waitse playmoncry SPECIES_RAYQUAZA, 2 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 3 - special sub_8139560 + setvar VAR_0x8004, 1 @ vertical pan + setvar VAR_0x8005, 1 @ horizontal pan + setvar VAR_0x8006, 8 @ num shakes + setvar VAR_0x8007, 3 @ shake delay + special ShakeCamera waitstate waitse playmoncry SPECIES_RAYQUAZA, 2 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - setvar VAR_0x8006, 8 - setvar VAR_0x8007, 5 - special sub_8139560 + setvar VAR_0x8004, 1 @ vertical pan + setvar VAR_0x8005, 2 @ horizontal pan + setvar VAR_0x8006, 8 @ num shakes + setvar VAR_0x8007, 5 @ shake delay + special ShakeCamera waitstate waitmoncry setweather WEATHER_NONE @@ -779,7 +779,7 @@ SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A SootopolisCity_EventScript_1E5FBB:: @ 81E5FBB msgbox SootopolisCity_Text_2A7CEC, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq SootopolisCity_EventScript_1E5FD8 msgbox SootopolisCity_Text_2A7DD2, MSGBOX_DEFAULT release @@ -959,9 +959,9 @@ SootopolisCity_EventScript_1E61C2:: @ 81E61C2 SootopolisCity_EventScript_1E61CC:: @ 81E61CC msgbox SootopolisCity_Text_1E75CB, MSGBOX_DEFAULT closemessage - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if_eq SootopolisCity_EventScript_1E6243 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq SootopolisCity_EventScript_1E6255 msgbox SootopolisCity_Text_1E7737, MSGBOX_DEFAULT closemessage @@ -1354,11 +1354,11 @@ SootopolisCity_EventScript_1E646F:: @ 81E646F setflag FLAG_RECEIVED_HM07 msgbox SootopolisCity_Text_1E7B86, MSGBOX_DEFAULT closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq SootopolisCity_EventScript_1E64B2 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq SootopolisCity_EventScript_1E64B2 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if_eq SootopolisCity_EventScript_1E64C5 release end diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json index 6b8cab149..9726e98aa 100644 --- a/data/maps/SootopolisCity_Gym_1F/map.json +++ b/data/maps/SootopolisCity_Gym_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_Gym_1F_EventScript_224F44", + "script": "SootopolisCity_Gym_1F_EventScript_Juan", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_Gym_1F_EventScript_225040", + "script": "SootopolisCity_Gym_1F_EventScript_GymGuide", "flag": "0" } ], @@ -72,7 +72,7 @@ "y": 24, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SootopolisCity_Gym_1F_EventScript_22505F" + "script": "SootopolisCity_Gym_1F_EventScript_LeftGymStatue" }, { "type": "sign", @@ -80,7 +80,7 @@ "y": 24, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SootopolisCity_Gym_1F_EventScript_22506F" + "script": "SootopolisCity_Gym_1F_EventScript_RightGymStatue" } ] }
\ No newline at end of file diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 8db708e9c..c45509225 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -1,7 +1,7 @@ SootopolisCity_Gym_1F_MapScripts:: @ 8224E4C - map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_Gym_1F_MapScript2_224ECB - map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_Gym_1F_MapScript1_224E67 - map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_Gym_1F_MapScript1_224E6A + map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_Gym_1F_OnFrame + map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_Gym_1F_OnResume + map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_Gym_1F_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_Gym_1F_OnTransition .byte 0 @@ -9,71 +9,68 @@ SootopolisCity_Gym_1F_OnTransition: @ 8224E61 setvar VAR_ICE_STEP_COUNT, 1 end -SootopolisCity_Gym_1F_MapScript1_224E67: @ 8224E67 - setstepcallback 4 +SootopolisCity_Gym_1F_OnResume: @ 8224E67 + setstepcallback STEP_CB_SOOTOPOLIS_ICE end -SootopolisCity_Gym_1F_MapScript1_224E6A: @ 8224E6A - call SootopolisCity_Gym_1F_EventScript_224E73 +SootopolisCity_Gym_1F_OnLoad: @ 8224E6A + call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles special SetSootopolisGymCrackedIceMetatiles end -SootopolisCity_Gym_1F_EventScript_224E73:: @ 8224E73 +SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles:: @ 8224E73 compare VAR_ICE_STEP_COUNT, 8 - goto_if_lt SootopolisCity_Gym_1F_EventScript_224ECA + goto_if_lt SootopolisCity_Gym_1F_EventScript_StopCheckingStairs @ All stairs ice compare VAR_ICE_STEP_COUNT, 28 - goto_if_lt SootopolisCity_Gym_1F_EventScript_224EB8 + goto_if_lt SootopolisCity_Gym_1F_EventScript_OpenFirstStairs compare VAR_ICE_STEP_COUNT, 67 - goto_if_lt SootopolisCity_Gym_1F_EventScript_224EA6 + goto_if_lt SootopolisCity_Gym_1F_EventScript_OpenFirstAndSecondStairs setmetatile 8, 4, METATILE_SootopolisGym_Stairs, 0 setmetatile 8, 5, METATILE_SootopolisGym_Stairs, 0 - -SootopolisCity_Gym_1F_EventScript_224EA6:: @ 8224EA6 +SootopolisCity_Gym_1F_EventScript_OpenFirstAndSecondStairs:: @ 8224EA6 setmetatile 8, 10, METATILE_SootopolisGym_Stairs, 0 setmetatile 8, 11, METATILE_SootopolisGym_Stairs, 0 - -SootopolisCity_Gym_1F_EventScript_224EB8:: @ 8224EB8 +SootopolisCity_Gym_1F_EventScript_OpenFirstStairs:: @ 8224EB8 setmetatile 8, 15, METATILE_SootopolisGym_Stairs, 0 setmetatile 8, 16, METATILE_SootopolisGym_Stairs, 0 - -SootopolisCity_Gym_1F_EventScript_224ECA:: @ 8224ECA +SootopolisCity_Gym_1F_EventScript_StopCheckingStairs:: @ 8224ECA return -SootopolisCity_Gym_1F_MapScript2_224ECB: @ 8224ECB - map_script_2 VAR_ICE_STEP_COUNT, 8, SootopolisCity_Gym_1F_EventScript_224EED - map_script_2 VAR_ICE_STEP_COUNT, 28, SootopolisCity_Gym_1F_EventScript_224F01 - map_script_2 VAR_ICE_STEP_COUNT, 67, SootopolisCity_Gym_1F_EventScript_224F15 - map_script_2 VAR_ICE_STEP_COUNT, 0, SootopolisCity_Gym_1F_EventScript_224F29 +SootopolisCity_Gym_1F_OnFrame: @ 8224ECB + map_script_2 VAR_ICE_STEP_COUNT, 8, SootopolisCity_Gym_1F_EventScript_UnlockFirstStairs + map_script_2 VAR_ICE_STEP_COUNT, 28, SootopolisCity_Gym_1F_EventScript_UnlockSecondStairs + map_script_2 VAR_ICE_STEP_COUNT, 67, SootopolisCity_Gym_1F_EventScript_UnlockThirdStairs + map_script_2 VAR_ICE_STEP_COUNT, 0, SootopolisCity_Gym_1F_EventScript_FallThroughIce .2byte 0 -SootopolisCity_Gym_1F_EventScript_224EED:: @ 8224EED +SootopolisCity_Gym_1F_EventScript_UnlockFirstStairs:: @ 8224EED addvar VAR_ICE_STEP_COUNT, 1 delay 40 playse SE_RU_GASHIN - call SootopolisCity_Gym_1F_EventScript_224E73 + call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles special DrawWholeMapView end -SootopolisCity_Gym_1F_EventScript_224F01:: @ 8224F01 +SootopolisCity_Gym_1F_EventScript_UnlockSecondStairs:: @ 8224F01 addvar VAR_ICE_STEP_COUNT, 1 delay 40 playse SE_RU_GASHIN - call SootopolisCity_Gym_1F_EventScript_224E73 + call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles special DrawWholeMapView end -SootopolisCity_Gym_1F_EventScript_224F15:: @ 8224F15 +SootopolisCity_Gym_1F_EventScript_UnlockThirdStairs:: @ 8224F15 addvar VAR_ICE_STEP_COUNT, 1 delay 40 playse SE_RU_GASHIN - call SootopolisCity_Gym_1F_EventScript_224E73 + call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles special DrawWholeMapView end -SootopolisCity_Gym_1F_EventScript_224F29:: @ 8224F29 +SootopolisCity_Gym_1F_EventScript_FallThroughIce:: @ 8224F29 lockall delay 20 - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Gym_1F_Movement_224F42 + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Gym_1F_Movement_FallThroughIce waitmovement 0 playse SE_RU_HYUU delay 60 @@ -81,26 +78,26 @@ SootopolisCity_Gym_1F_EventScript_224F29:: @ 8224F29 waitstate end -SootopolisCity_Gym_1F_Movement_224F42: @ 8224F42 +SootopolisCity_Gym_1F_Movement_FallThroughIce: @ 8224F42 set_invisible step_end -SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 - trainerbattle_single TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_225268, SootopolisCity_Gym_1F_Text_225432, SootopolisCity_Gym_1F_EventScript_224F82, NO_MUSIC +SootopolisCity_Gym_1F_EventScript_Juan:: @ 8224F44 + trainerbattle_single TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_JuanPreBattle, SootopolisCity_Gym_1F_Text_JuanDefeat, SootopolisCity_Gym_1F_EventScript_JuanDefeated, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq SootopolisCity_Gym_1F_EventScript_225025 - goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_224FF7 - goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_22501B - msgbox SootopolisCity_Gym_1F_Text_225778, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq SootopolisCity_Gym_1F_EventScript_JuanRematch + goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_GiveWaterPulse2 + goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_GoGetFortreeBadge + msgbox SootopolisCity_Gym_1F_Text_JuanPostBattle, MSGBOX_DEFAULT release end -SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 - message SootopolisCity_Gym_1F_Text_225598 +SootopolisCity_Gym_1F_EventScript_JuanDefeated:: @ 8224F82 + message SootopolisCity_Gym_1F_Text_ReceivedRainBadge waitmessage call Common_EventScript_PlayGymBadgeFanfare - msgbox SootopolisCity_Gym_1F_Text_2255BE, MSGBOX_DEFAULT + msgbox SootopolisCity_Gym_1F_Text_ExplainRainBadgeTakeThis, MSGBOX_DEFAULT setflag FLAG_DEFEATED_SOOTOPOLIS_GYM setflag FLAG_BADGE08_GET setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS @@ -109,12 +106,12 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 setvar VAR_SOOTOPOLIS_CITY_STATE, 6 clearflag FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1 setvar VAR_0x8008, 8 - call SootopolisCity_Gym_1F_EventScript_271F43 - call SootopolisCity_Gym_1F_EventScript_224FD4 + call Common_EventScript_SetGymTrainers + call SootopolisCity_Gym_1F_EventScript_GiveWaterPulse closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox SootopolisCity_Gym_1F_Text_22574D, MSGBOX_DEFAULT + msgbox SootopolisCity_Gym_1F_Text_RegisteredJuan, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -122,69 +119,69 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 release end -SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 +SootopolisCity_Gym_1F_EventScript_GiveWaterPulse:: @ 8224FD4 giveitem_std ITEM_TM03 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_BagIsFull - msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT + msgbox SootopolisCity_Gym_1F_Text_ExplainWaterPulse, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM03 return -SootopolisCity_Gym_1F_EventScript_224FF7:: @ 8224FF7 +SootopolisCity_Gym_1F_EventScript_GiveWaterPulse2:: @ 8224FF7 giveitem_std ITEM_TM03 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT + msgbox SootopolisCity_Gym_1F_Text_ExplainWaterPulse, MSGBOX_DEFAULT setflag FLAG_RECEIVED_TM03 release end -SootopolisCity_Gym_1F_EventScript_22501B:: @ 822501B - msgbox SootopolisCity_Gym_1F_Text_225865, MSGBOX_DEFAULT +SootopolisCity_Gym_1F_EventScript_GoGetFortreeBadge:: @ 822501B + msgbox SootopolisCity_Gym_1F_Text_GoGetFortreeBadge, MSGBOX_DEFAULT release end -SootopolisCity_Gym_1F_EventScript_225025:: @ 8225025 - trainerbattle_rematch_double TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_225950, SootopolisCity_Gym_1F_Text_225A2E, SootopolisCity_Gym_1F_Text_225B48 - msgbox SootopolisCity_Gym_1F_Text_225A67, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_1F_EventScript_JuanRematch:: @ 8225025 + trainerbattle_rematch_double TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_JuanPreRematch, SootopolisCity_Gym_1F_Text_JuanRematchDefeat, SootopolisCity_Gym_1F_Text_JuanRematchNeedTwoMons + msgbox SootopolisCity_Gym_1F_Text_JuanPostRematch, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_1F_EventScript_225040:: @ 8225040 +SootopolisCity_Gym_1F_EventScript_GymGuide:: @ 8225040 lock faceplayer - goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_Gym_1F_EventScript_225055 - msgbox SootopolisCity_Gym_1F_Text_225093, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_Gym_1F_EventScript_GymGuidePostVictory + msgbox SootopolisCity_Gym_1F_Text_GymGuideAdvice, MSGBOX_DEFAULT release end -SootopolisCity_Gym_1F_EventScript_225055:: @ 8225055 - msgbox SootopolisCity_Gym_1F_Text_2251AF, MSGBOX_DEFAULT +SootopolisCity_Gym_1F_EventScript_GymGuidePostVictory:: @ 8225055 + msgbox SootopolisCity_Gym_1F_Text_GymGuidePostVictory, MSGBOX_DEFAULT release end -SootopolisCity_Gym_1F_EventScript_22505F:: @ 822505F +SootopolisCity_Gym_1F_EventScript_LeftGymStatue:: @ 822505F lockall - goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_22507F - goto SootopolisCity_Gym_1F_EventScript_225089 + goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_GymStatueCertified + goto SootopolisCity_Gym_1F_EventScript_GymStatue end -SootopolisCity_Gym_1F_EventScript_22506F:: @ 822506F +SootopolisCity_Gym_1F_EventScript_RightGymStatue:: @ 822506F lockall - goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_22507F - goto SootopolisCity_Gym_1F_EventScript_225089 + goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_GymStatueCertified + goto SootopolisCity_Gym_1F_EventScript_GymStatue end -SootopolisCity_Gym_1F_EventScript_22507F:: @ 822507F - msgbox SootopolisCity_Gym_1F_Text_225916, MSGBOX_DEFAULT +SootopolisCity_Gym_1F_EventScript_GymStatueCertified:: @ 822507F + msgbox SootopolisCity_Gym_1F_Text_GymStatueCertified, MSGBOX_DEFAULT releaseall end -SootopolisCity_Gym_1F_EventScript_225089:: @ 8225089 - msgbox SootopolisCity_Gym_1F_Text_2258FA, MSGBOX_DEFAULT +SootopolisCity_Gym_1F_EventScript_GymStatue:: @ 8225089 + msgbox SootopolisCity_Gym_1F_Text_GymStatue, MSGBOX_DEFAULT releaseall end -SootopolisCity_Gym_1F_Text_225093: @ 8225093 +SootopolisCity_Gym_1F_Text_GymGuideAdvice: @ 8225093 .string "Yo! How's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" .string "SOOTOPOLIS's GYM LEADER JUAN is\n" @@ -196,14 +193,14 @@ SootopolisCity_Gym_1F_Text_225093: @ 8225093 .string "The rest of the way, you have to\n" .string "go for it yourself!$" -SootopolisCity_Gym_1F_Text_2251AF: @ 82251AF +SootopolisCity_Gym_1F_Text_GymGuidePostVictory: @ 82251AF .string "Yow! You've beaten even JUAN, who\n" .string "was supposedly the best in all HOENN!\p" .string "Okay! Check out your TRAINER CARD.\p" .string "If you've gotten all the BADGES, you're\n" .string "set for the POKéMON LEAGUE challenge!$" -SootopolisCity_Gym_1F_Text_225268: @ 8225268 +SootopolisCity_Gym_1F_Text_JuanPreBattle: @ 8225268 .string "Let me ask you.\n" .string "Did you know?\l" .string "Ah, I should not be so coy.\p" @@ -226,7 +223,7 @@ SootopolisCity_Gym_1F_Text_225268: @ 8225268 @ the gDisplayedStringBattle buffer that it's put into, and it stomps all over the gBattleTextBuffs @ after, as well as the otherwise unused array after that. One wonders if that's the reason for @ the existence of that unused array of ints. -SootopolisCity_Gym_1F_Text_225432: @ 8225432 +SootopolisCity_Gym_1F_Text_JuanDefeat: @ 8225432 .string "Ahahaha, excellent!\n" .string "Very well, you are the winner.\p" .string "From you, I sense the brilliant shine\n" @@ -241,11 +238,11 @@ SootopolisCity_Gym_1F_Text_225432: @ 8225432 .string "Rather than my clothes, I shall reward\n" .string "you with this, the RAIN BADGE!$" -SootopolisCity_Gym_1F_Text_225598: @ 8225598 +SootopolisCity_Gym_1F_Text_ReceivedRainBadge: @ 8225598 .string "{PLAYER} received the RAIN BADGE\n" .string "from JUAN.$" -SootopolisCity_Gym_1F_Text_2255BE: @ 82255BE +SootopolisCity_Gym_1F_Text_ExplainRainBadgeTakeThis: @ 82255BE .string "Having the RAIN BADGE shall assure you\n" .string "the full obedience of all your POKéMON\l" .string "to your every command.\p" @@ -255,18 +252,18 @@ SootopolisCity_Gym_1F_Text_2255BE: @ 82255BE .string "And, so that you never forget the\n" .string "battle we shared, take this…$" -SootopolisCity_Gym_1F_Text_2256C1: @ 82256C1 +SootopolisCity_Gym_1F_Text_ExplainWaterPulse: @ 82256C1 .string "The TECHNICAL MACHINE I handed you\n" .string "contains WATER PULSE.\p" .string "In use, it will occasionally confuse\n" .string "the target with ultrasonic waves.\p" .string "… … … … … …$" -SootopolisCity_Gym_1F_Text_22574D: @ 822574D +SootopolisCity_Gym_1F_Text_RegisteredJuan: @ 822574D .string "Registered GYM LEADER JUAN\n" .string "in the POKéNAV.$" -SootopolisCity_Gym_1F_Text_225778: @ 8225778 +SootopolisCity_Gym_1F_Text_JuanPostBattle: @ 8225778 .string "The TRAINERS who have gathered all\n" .string "the GYM BADGES of HOENN should make\l" .string "way to the ultimate destination.\p" @@ -276,22 +273,22 @@ SootopolisCity_Gym_1F_Text_225778: @ 8225778 .string "There, you shall find the POKéMON\n" .string "LEAGUE.$" -SootopolisCity_Gym_1F_Text_225865: @ 8225865 +SootopolisCity_Gym_1F_Text_GoGetFortreeBadge: @ 8225865 .string "There remains but one BADGE to\n" .string "obtain in HOENN.\p" .string "If you wish to challenge the POKéMON\n" .string "LEAGUE, you must obtain the last\l" .string "BADGE from the GYM in FORTREE.$" -SootopolisCity_Gym_1F_Text_2258FA: @ 82258FA +SootopolisCity_Gym_1F_Text_GymStatue: @ 82258FA .string "SOOTOPOLIS CITY POKéMON GYM$" -SootopolisCity_Gym_1F_Text_225916: @ 8225916 +SootopolisCity_Gym_1F_Text_GymStatueCertified: @ 8225916 .string "SOOTOPOLIS CITY POKéMON GYM\p" .string "JUAN'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" -SootopolisCity_Gym_1F_Text_225950: @ 8225950 +SootopolisCity_Gym_1F_Text_JuanPreRematch: @ 8225950 .string "JUAN: Ah, this GYM had returned to its\n" .string "usual state of serenity…\p" .string "But our young typhoon has returned\n" @@ -300,11 +297,11 @@ SootopolisCity_Gym_1F_Text_225950: @ 8225950 .string "I shall be delighted to dance with you\n" .string "as often as you wish!$" -SootopolisCity_Gym_1F_Text_225A2E: @ 8225A2E +SootopolisCity_Gym_1F_Text_JuanRematchDefeat: @ 8225A2E .string "Ahahaha, you are the winner!\n" .string "You have defeated me again!$" -SootopolisCity_Gym_1F_Text_225A67: @ 8225A67 +SootopolisCity_Gym_1F_Text_JuanPostRematch: @ 8225A67 .string "JUAN: If I told you to become my\n" .string "apprentice, you will refuse, I am sure.\p" .string "I would like to make a gift of my coat\n" @@ -314,7 +311,7 @@ SootopolisCity_Gym_1F_Text_225A67: @ 8225A67 .string "And that, my friend, is a certain sign\n" .string "of nobility!$" -SootopolisCity_Gym_1F_Text_225B48: @ 8225B48 +SootopolisCity_Gym_1F_Text_JuanRematchNeedTwoMons: @ 8225B48 .string "JUAN: Ah, this GYM had returned to its\n" .string "usual state of serenity…\p" .string "But our young typhoon has returned\n" diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json index d378f84e2..0af53d062 100644 --- a/data/maps/SootopolisCity_Gym_B1F/map.json +++ b/data/maps/SootopolisCity_Gym_B1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "SootopolisCity_Gym_B1F_EventScript_225C8B", + "script": "SootopolisCity_Gym_B1F_EventScript_Andrea", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "SootopolisCity_Gym_B1F_EventScript_225CD0", + "script": "SootopolisCity_Gym_B1F_EventScript_Connie", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "SootopolisCity_Gym_B1F_EventScript_225CB9", + "script": "SootopolisCity_Gym_B1F_EventScript_Brianna", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "SootopolisCity_Gym_B1F_EventScript_225CE7", + "script": "SootopolisCity_Gym_B1F_EventScript_Bridget", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "SootopolisCity_Gym_B1F_EventScript_225D15", + "script": "SootopolisCity_Gym_B1F_EventScript_Tiffany", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "SootopolisCity_Gym_B1F_EventScript_225D2C", + "script": "SootopolisCity_Gym_B1F_EventScript_Bethany", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "SootopolisCity_Gym_B1F_EventScript_225CA2", + "script": "SootopolisCity_Gym_B1F_EventScript_Crissy", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "SootopolisCity_Gym_B1F_EventScript_225CFE", + "script": "SootopolisCity_Gym_B1F_EventScript_Olivia", "flag": "0" }, { @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "SootopolisCity_Gym_B1F_EventScript_225D5A", + "script": "SootopolisCity_Gym_B1F_EventScript_Daphne", "flag": "0" }, { @@ -141,7 +141,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "SootopolisCity_Gym_B1F_EventScript_225D43", + "script": "SootopolisCity_Gym_B1F_EventScript_Annika", "flag": "0" } ], diff --git a/data/maps/SootopolisCity_Gym_B1F/scripts.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc index 0f402b930..fad5878fb 100644 --- a/data/maps/SootopolisCity_Gym_B1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc @@ -1,183 +1,183 @@ SootopolisCity_Gym_B1F_MapScripts:: @ 8225C8A .byte 0 -SootopolisCity_Gym_B1F_EventScript_225C8B:: @ 8225C8B - trainerbattle_single TRAINER_ANDREA, SootopolisCity_Gym_B1F_Text_225D71, SootopolisCity_Gym_B1F_Text_225DB6 - msgbox SootopolisCity_Gym_B1F_Text_225DCF, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Andrea:: @ 8225C8B + trainerbattle_single TRAINER_ANDREA, SootopolisCity_Gym_B1F_Text_AndreaPreBattle, SootopolisCity_Gym_B1F_Text_AndreaDefeat + msgbox SootopolisCity_Gym_B1F_Text_AndreaPostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_225CA2:: @ 8225CA2 - trainerbattle_single TRAINER_CRISSY, SootopolisCity_Gym_B1F_Text_225E04, SootopolisCity_Gym_B1F_Text_225E60 - msgbox SootopolisCity_Gym_B1F_Text_225E90, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Crissy:: @ 8225CA2 + trainerbattle_single TRAINER_CRISSY, SootopolisCity_Gym_B1F_Text_CrissyPreBattle, SootopolisCity_Gym_B1F_Text_CrissyDefeat + msgbox SootopolisCity_Gym_B1F_Text_CrissyPostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_225CB9:: @ 8225CB9 - trainerbattle_single TRAINER_BRIANNA, SootopolisCity_Gym_B1F_Text_22646E, SootopolisCity_Gym_B1F_Text_226495 - msgbox SootopolisCity_Gym_B1F_Text_2264BC, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Brianna:: @ 8225CB9 + trainerbattle_single TRAINER_BRIANNA, SootopolisCity_Gym_B1F_Text_BriannaPreBattle, SootopolisCity_Gym_B1F_Text_BriannaDefeat + msgbox SootopolisCity_Gym_B1F_Text_BriannaPostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_225CD0:: @ 8225CD0 - trainerbattle_single TRAINER_CONNIE, SootopolisCity_Gym_B1F_Text_225FBE, SootopolisCity_Gym_B1F_Text_225FEB - msgbox SootopolisCity_Gym_B1F_Text_225FFE, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Connie:: @ 8225CD0 + trainerbattle_single TRAINER_CONNIE, SootopolisCity_Gym_B1F_Text_ConniePreBattle, SootopolisCity_Gym_B1F_Text_ConnieDefeat + msgbox SootopolisCity_Gym_B1F_Text_ConniePostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_225CE7:: @ 8225CE7 - trainerbattle_single TRAINER_BRIDGET, SootopolisCity_Gym_B1F_Text_226061, SootopolisCity_Gym_B1F_Text_2260B6 - msgbox SootopolisCity_Gym_B1F_Text_2260D1, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Bridget:: @ 8225CE7 + trainerbattle_single TRAINER_BRIDGET, SootopolisCity_Gym_B1F_Text_BridgetPreBattle, SootopolisCity_Gym_B1F_Text_BridgetDefeat + msgbox SootopolisCity_Gym_B1F_Text_BridgetPostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_225CFE:: @ 8225CFE - trainerbattle_single TRAINER_OLIVIA, SootopolisCity_Gym_B1F_Text_226164, SootopolisCity_Gym_B1F_Text_2261A7 - msgbox SootopolisCity_Gym_B1F_Text_2261B5, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Olivia:: @ 8225CFE + trainerbattle_single TRAINER_OLIVIA, SootopolisCity_Gym_B1F_Text_OliviaPreBattle, SootopolisCity_Gym_B1F_Text_OliviaDefeat + msgbox SootopolisCity_Gym_B1F_Text_OliviaPostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_225D15:: @ 8225D15 - trainerbattle_single TRAINER_TIFFANY, SootopolisCity_Gym_B1F_Text_2261F7, SootopolisCity_Gym_B1F_Text_226274 - msgbox SootopolisCity_Gym_B1F_Text_226286, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Tiffany:: @ 8225D15 + trainerbattle_single TRAINER_TIFFANY, SootopolisCity_Gym_B1F_Text_TiffanyPreBattle, SootopolisCity_Gym_B1F_Text_TiffanyDefeat + msgbox SootopolisCity_Gym_B1F_Text_TiffanyPostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_225D2C:: @ 8225D2C - trainerbattle_single TRAINER_BETHANY, SootopolisCity_Gym_B1F_Text_2262F3, SootopolisCity_Gym_B1F_Text_22633B - msgbox SootopolisCity_Gym_B1F_Text_226341, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Bethany:: @ 8225D2C + trainerbattle_single TRAINER_BETHANY, SootopolisCity_Gym_B1F_Text_BethanyPreBattle, SootopolisCity_Gym_B1F_Text_BethanyDefeat + msgbox SootopolisCity_Gym_B1F_Text_BethanyPostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_225D43:: @ 8225D43 - trainerbattle_single TRAINER_ANNIKA, SootopolisCity_Gym_B1F_Text_226388, SootopolisCity_Gym_B1F_Text_2263BD - msgbox SootopolisCity_Gym_B1F_Text_2263F4, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Annika:: @ 8225D43 + trainerbattle_single TRAINER_ANNIKA, SootopolisCity_Gym_B1F_Text_AnnikaPreBattle, SootopolisCity_Gym_B1F_Text_AnnikaDefeat + msgbox SootopolisCity_Gym_B1F_Text_AnnikaPostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_EventScript_225D5A:: @ 8225D5A - trainerbattle_single TRAINER_DAPHNE, SootopolisCity_Gym_B1F_Text_225ED6, SootopolisCity_Gym_B1F_Text_225F35 - msgbox SootopolisCity_Gym_B1F_Text_225F67, MSGBOX_AUTOCLOSE +SootopolisCity_Gym_B1F_EventScript_Daphne:: @ 8225D5A + trainerbattle_single TRAINER_DAPHNE, SootopolisCity_Gym_B1F_Text_DaphnePreBattle, SootopolisCity_Gym_B1F_Text_DaphneDefeat + msgbox SootopolisCity_Gym_B1F_Text_DaphnePostBattle, MSGBOX_AUTOCLOSE end -SootopolisCity_Gym_B1F_Text_225D71: @ 8225D71 +SootopolisCity_Gym_B1F_Text_AndreaPreBattle: @ 8225D71 .string "I'll show you the sublime techniques\n" .string "I learned from our LEADER JUAN!$" -SootopolisCity_Gym_B1F_Text_225DB6: @ 8225DB6 +SootopolisCity_Gym_B1F_Text_AndreaDefeat: @ 8225DB6 .string "Please forgive me, JUAN…$" -SootopolisCity_Gym_B1F_Text_225DCF: @ 8225DCF +SootopolisCity_Gym_B1F_Text_AndreaPostBattle: @ 8225DCF .string "Watch what happens if you crack all\n" .string "the floor tiles.$" -SootopolisCity_Gym_B1F_Text_225E04: @ 8225E04 +SootopolisCity_Gym_B1F_Text_CrissyPreBattle: @ 8225E04 .string "You came all the way here, but you won't\n" .string "get to see JUAN.\p" .string "Not if you lose to me, you won't!$" -SootopolisCity_Gym_B1F_Text_225E60: @ 8225E60 +SootopolisCity_Gym_B1F_Text_CrissyDefeat: @ 8225E60 .string "You're strong!\n" .string "I was fooled by your cute looks!$" -SootopolisCity_Gym_B1F_Text_225E90: @ 8225E90 +SootopolisCity_Gym_B1F_Text_CrissyPostBattle: @ 8225E90 .string "You might be good enough to avoid\n" .string "being wiped out in one hit by JUAN.$" -SootopolisCity_Gym_B1F_Text_225ED6: @ 8225ED6 +SootopolisCity_Gym_B1F_Text_DaphnePreBattle: @ 8225ED6 .string "The sight of JUAN conducting\n" .string "a battle…\p" .string "The very beauty of it compelled me to\n" .string "become a TRAINER.$" -SootopolisCity_Gym_B1F_Text_225F35: @ 8225F35 +SootopolisCity_Gym_B1F_Text_DaphneDefeat: @ 8225F35 .string "You battled with more beauty than\n" .string "I could muster…$" -SootopolisCity_Gym_B1F_Text_225F67: @ 8225F67 +SootopolisCity_Gym_B1F_Text_DaphnePostBattle: @ 8225F67 .string "The grace you bring to battle is\n" .string "fabulous.\p" .string "Oh… I'm so fortunate to have found\n" .string "POKéMON.$" -SootopolisCity_Gym_B1F_Text_225FBE: @ 8225FBE +SootopolisCity_Gym_B1F_Text_ConniePreBattle: @ 8225FBE .string "I should teach you how harsh battles\n" .string "can be.$" -SootopolisCity_Gym_B1F_Text_225FEB: @ 8225FEB +SootopolisCity_Gym_B1F_Text_ConnieDefeat: @ 8225FEB .string "Oh.\n" .string "You're strong.$" -SootopolisCity_Gym_B1F_Text_225FFE: @ 8225FFE +SootopolisCity_Gym_B1F_Text_ConniePostBattle: @ 8225FFE .string "I'll tell you something good.\p" .string "If you want to reach JUAN, you\n" .string "need to walk on each floor tile once.$" -SootopolisCity_Gym_B1F_Text_226061: @ 8226061 +SootopolisCity_Gym_B1F_Text_BridgetPreBattle: @ 8226061 .string "The POKéMON GYM of the highest level\n" .string "in the HOENN region…\p" .string "That's the SOOTOPOLIS GYM.$" -SootopolisCity_Gym_B1F_Text_2260B6: @ 82260B6 +SootopolisCity_Gym_B1F_Text_BridgetDefeat: @ 82260B6 .string "What a high level you are!$" -SootopolisCity_Gym_B1F_Text_2260D1: @ 82260D1 +SootopolisCity_Gym_B1F_Text_BridgetPostBattle: @ 82260D1 .string "Rather than being satisfied by being\n" .string "in a strong GYM, I imagine training in\l" .string "other places will make you stronger.\l" .string "But above all, it looks more fun.$" -SootopolisCity_Gym_B1F_Text_226164: @ 8226164 +SootopolisCity_Gym_B1F_Text_OliviaPreBattle: @ 8226164 .string "I train my POKéMON together with\n" .string "JUAN.\p" .string "Don't think I'm a pushover.$" -SootopolisCity_Gym_B1F_Text_2261A7: @ 82261A7 +SootopolisCity_Gym_B1F_Text_OliviaDefeat: @ 82261A7 .string "I was beaten…$" -SootopolisCity_Gym_B1F_Text_2261B5: @ 82261B5 +SootopolisCity_Gym_B1F_Text_OliviaPostBattle: @ 82261B5 .string "I think you have potential.\n" .string "Why don't you stay and train with us?$" -SootopolisCity_Gym_B1F_Text_2261F7: @ 82261F7 +SootopolisCity_Gym_B1F_Text_TiffanyPreBattle: @ 82261F7 .string "A graceful glide across the ice while\n" .string "crossing no lines…\p" .string "A TRAINER putting on that performance\n" .string "would be elegantly beautiful!$" -SootopolisCity_Gym_B1F_Text_226274: @ 8226274 +SootopolisCity_Gym_B1F_Text_TiffanyDefeat: @ 8226274 .string "Well, excuse me?!$" -SootopolisCity_Gym_B1F_Text_226286: @ 8226286 +SootopolisCity_Gym_B1F_Text_TiffanyPostBattle: @ 8226286 .string "This is really obvious, but how strong\n" .string "you are as a TRAINER has nothing to do\l" .string "with how young or old you are.$" -SootopolisCity_Gym_B1F_Text_2262F3: @ 82262F3 +SootopolisCity_Gym_B1F_Text_BethanyPreBattle: @ 82262F3 .string "When I'm with my POKéMON, the time\n" .string "flies by before you can say, “Oops!”$" -SootopolisCity_Gym_B1F_Text_22633B: @ 822633B +SootopolisCity_Gym_B1F_Text_BethanyDefeat: @ 822633B .string "Oops!$" -SootopolisCity_Gym_B1F_Text_226341: @ 8226341 +SootopolisCity_Gym_B1F_Text_BethanyPostBattle: @ 8226341 .string "I wish I could forget about lost causes\n" .string "before I can manage an “Oops!”$" -SootopolisCity_Gym_B1F_Text_226388: @ 8226388 +SootopolisCity_Gym_B1F_Text_AnnikaPreBattle: @ 8226388 .string "I can battle with really rare POKéMON\n" .string "if you'd like.$" -SootopolisCity_Gym_B1F_Text_2263BD: @ 82263BD +SootopolisCity_Gym_B1F_Text_AnnikaDefeat: @ 82263BD .string "Oh, there now! Did you have a good look\n" .string "at my POKéMON?$" -SootopolisCity_Gym_B1F_Text_2263F4: @ 82263F4 +SootopolisCity_Gym_B1F_Text_AnnikaPostBattle: @ 82263F4 .string "I came to this GYM because JUAN\n" .string "praised me for my darling POKéMON.\p" .string "Oh, if only I'd met JUAN years ago\n" .string "when I was younger…$" -SootopolisCity_Gym_B1F_Text_22646E: @ 822646E +SootopolisCity_Gym_B1F_Text_BriannaPreBattle: @ 822646E .string "Giggle…\n" .string "Your grim look is so charming.$" -SootopolisCity_Gym_B1F_Text_226495: @ 8226495 +SootopolisCity_Gym_B1F_Text_BriannaDefeat: @ 8226495 .string "Oh, dear.\n" .string "I went much too easy on you.$" -SootopolisCity_Gym_B1F_Text_2264BC: @ 82264BC +SootopolisCity_Gym_B1F_Text_BriannaPostBattle: @ 82264BC .string "You couldn't lay a finger on JUAN,\n" .string "I'm sure. Giggle…$" diff --git a/data/maps/SootopolisCity_House2/scripts.inc b/data/maps/SootopolisCity_House2/scripts.inc index 9e45a09bf..4bdf401cf 100644 --- a/data/maps/SootopolisCity_House2/scripts.inc +++ b/data/maps/SootopolisCity_House2/scripts.inc @@ -5,9 +5,9 @@ SootopolisCity_House2_EventScript_226A77:: @ 8226A77 lock faceplayer msgbox SootopolisCity_House2_Text_226AAB, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES call_if_eq SootopolisCity_House2_EventScript_226A99 - compare VAR_RESULT, 0 + compare VAR_RESULT, NO call_if_eq SootopolisCity_House2_EventScript_226AA2 release end diff --git a/data/maps/SootopolisCity_House3/scripts.inc b/data/maps/SootopolisCity_House3/scripts.inc index d7439f18d..a9aaea09c 100644 --- a/data/maps/SootopolisCity_House3/scripts.inc +++ b/data/maps/SootopolisCity_House3/scripts.inc @@ -5,7 +5,7 @@ SootopolisCity_House3_EventScript_226B72:: @ 8226B72 lock faceplayer msgbox SootopolisCity_House3_Text_226BA4, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq SootopolisCity_House3_EventScript_226B91 msgbox SootopolisCity_House3_Text_226C44, MSGBOX_DEFAULT release diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc index bd9c8fe51..015ac2e36 100644 --- a/data/maps/SootopolisCity_House6/scripts.inc +++ b/data/maps/SootopolisCity_House6/scripts.inc @@ -6,7 +6,7 @@ SootopolisCity_House6_EventScript_226F5C:: @ 8226F5C faceplayer goto_if_set FLAG_RECEIVED_WAILMER_DOLL, SootopolisCity_House6_EventScript_226FA3 msgbox SootopolisCity_House6_Text_226FC3, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO call_if_eq SootopolisCity_House6_EventScript_226F99 msgbox SootopolisCity_House6_Text_227034, MSGBOX_DEFAULT givedecoration_std DECOR_WAILMER_DOLL diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc index 17debe321..496b16d11 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc @@ -6,7 +6,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_22722B:: @ 822722B lock faceplayer msgbox SootopolisCity_LotadAndSeedotHouse_Text_227369, MSGBOX_DEFAULT - special sub_81B94B0 + special ChoosePartyMon waitstate copyvar VAR_RESULT, VAR_0x8004 compare VAR_RESULT, 255 @@ -55,7 +55,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC:: @ 82272BC lock faceplayer msgbox SootopolisCity_LotadAndSeedotHouse_Text_227676, MSGBOX_DEFAULT - special sub_81B94B0 + special ChoosePartyMon waitstate copyvar VAR_RESULT, VAR_0x8004 compare VAR_RESULT, 255 diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc index fe0270d62..0b477ce47 100644 --- a/data/maps/SootopolisCity_Mart/scripts.inc +++ b/data/maps/SootopolisCity_Mart/scripts.inc @@ -4,10 +4,10 @@ SootopolisCity_Mart_MapScripts:: @ 8226794 SootopolisCity_Mart_EventScript_226795:: @ 8226795 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart SootopolisCity_Mart_Pokemart_2267AC - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 78938b7d8..c67533ca6 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -37,7 +37,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_227A21 waitmovement 0 copyobjectxytoperm 1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04 @@ -93,13 +93,13 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 special SavePlayerParty special BufferEReaderTrainerName msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 call SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF compare VAR_RESULT, 0 goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227CEB, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special LoadPlayerParty call Common_EventScript_SaveGame @@ -109,11 +109,11 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 special ReducePlayerPartyToSelectedMons msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, MSGBOX_DEFAULT closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22 warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1 waitstate diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json index 90a8dcdad..a2307dc10 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_PokemonCenter_1F_EventScript_2C8256", + "script": "SootopolisCity_PokemonCenter_1F_EventScript_DoubleEdgeTutor", "flag": "0" } ], diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index d3dfb91b0..d2b546831 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1 map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 SootopolisCity_PokemonCenter_1F_OnTransition: @ 82264FC @@ -9,7 +9,7 @@ SootopolisCity_PokemonCenter_1F_OnTransition: @ 82264FC SootopolisCity_PokemonCenter_1F_EventScript_226500:: @ 8226500 setvar VAR_0x800B, 1 - call SootopolisCity_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/map.json b/data/maps/SootopolisCity_PokemonCenter_2F/map.json index 33308de7b..6c00e8e21 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SootopolisCity_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc index 4c9fce912..57d21cbb5 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ SootopolisCity_PokemonCenter_2F_MapScripts:: @ 822676D - map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -SootopolisCity_PokemonCenter_2F_EventScript_226782:: @ 8226782 - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +SootopolisCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8226782 + call CableClub_EventScript_Colosseum end -SootopolisCity_PokemonCenter_2F_EventScript_226788:: @ 8226788 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +SootopolisCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8226788 + call CableClub_EventScript_TradeCenter end -SootopolisCity_PokemonCenter_2F_EventScript_22678E:: @ 822678E - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +SootopolisCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 822678E + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json index 26447c163..cf8be2227 100644 --- a/data/maps/SouthernIsland_Exterior/map.json +++ b/data/maps/SouthernIsland_Exterior/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SouthernIsland_Exterior_EventScript_2429D2", + "script": "SouthernIsland_Exterior_EventScript_Sailor", "flag": "0" }, { @@ -65,7 +65,7 @@ "y": 7, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SouthernIsland_Exterior_EventScript_242A3C" + "script": "SouthernIsland_Exterior_EventScript_Sign" } ] }
\ No newline at end of file diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index 2ee0ae602..17ff25fdb 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -6,50 +6,50 @@ SouthernIsland_Exterior_OnTransition: @ 82429CE setflag FLAG_LANDMARK_SOUTHERN_ISLAND end -SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 +SouthernIsland_Exterior_EventScript_Sailor:: @ 82429D2 lock faceplayer msgbox EventTicket_Text_SouthernIslandSailBack, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SouthernIsland_Exterior_EventScript_242A17 + compare VAR_RESULT, NO + goto_if_eq SouthernIsland_Exterior_EventScript_AsYouLike msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown + applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR setvar VAR_0x8004, 2 - call SouthernIsland_Exterior_EventScript_272250 + call Common_EventScript_FerryDepartIsland warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end -SouthernIsland_Exterior_EventScript_242A17:: @ 8242A17 +SouthernIsland_Exterior_EventScript_AsYouLike:: @ 8242A17 msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT release end -BattleFrontier_OutsideWest_EventScript_242A21:: @ 8242A21 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_OutsideWest_Movement_242A37 +Ferry_EventScript_DepartIslandSouth:: @ 8242A21 + applymovement EVENT_OBJ_ID_PLAYER, Ferry_EventScript_DepartIslandBoardSouth waitmovement 0 return -BattleFrontier_OutsideWest_EventScript_242A2C:: @ 8242A2C - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_OutsideWest_Movement_242A39 +Ferry_EventScript_DepartIslandWest:: @ 8242A2C + applymovement EVENT_OBJ_ID_PLAYER, Ferry_EventScript_DepartIslandBoardWest waitmovement 0 return -BattleFrontier_OutsideWest_Movement_242A37: @ 8242A37 +Ferry_EventScript_DepartIslandBoardSouth: @ 8242A37 walk_down step_end -BattleFrontier_OutsideWest_Movement_242A39: @ 8242A39 +Ferry_EventScript_DepartIslandBoardWest: @ 8242A39 walk_left walk_in_place_fastest_down step_end -SouthernIsland_Exterior_EventScript_242A3C:: @ 8242A3C +SouthernIsland_Exterior_EventScript_Sign:: @ 8242A3C msgbox SouthernIsland_Exterior_Text_Sign, MSGBOX_SIGN end diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json index 5fd8354f6..a647076ba 100644 --- a/data/maps/SouthernIsland_Interior/map.json +++ b/data/maps/SouthernIsland_Interior/map.json @@ -65,7 +65,7 @@ "y": 11, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SouthernIsland_Interior_EventScript_242AC4" + "script": "SouthernIsland_Interior_EventScript_TryLatiEncounter" } ] }
\ No newline at end of file diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index a9b8c5e0c..7a2a04771 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -1,68 +1,68 @@ SouthernIsland_Interior_MapScripts:: @ 8242A45 - map_script MAP_SCRIPT_ON_RESUME, SouthernIsland_Interior_MapScript1_242A50 + map_script MAP_SCRIPT_ON_RESUME, SouthernIsland_Interior_OnResume map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Interior_OnTransition .byte 0 -SouthernIsland_Interior_MapScript1_242A50: @ 8242A50 - call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SouthernIsland_Interior_EventScript_242A5A +SouthernIsland_Interior_OnResume: @ 8242A50 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SouthernIsland_Interior_EventScript_TryRemoveLati end -SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A +SouthernIsland_Interior_EventScript_TryRemoveLati:: @ 8242A5A specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject 2 return SouthernIsland_Interior_OnTransition: @ 8242A6E compare VAR_ROAMER_POKEMON, 0 - call_if_eq SouthernIsland_Interior_EventScript_242A8A + call_if_eq SouthernIsland_Interior_EventScript_SetUpLatios compare VAR_ROAMER_POKEMON, 0 - call_if_ne SouthernIsland_Interior_EventScript_242A95 - call SouthernIsland_Interior_EventScript_242AA0 + call_if_ne SouthernIsland_Interior_EventScript_SetUpLatias + call SouthernIsland_Interior_EventScript_SetUpPlayerGfx end -SouthernIsland_Interior_EventScript_242A8A:: @ 8242A8A +SouthernIsland_Interior_EventScript_SetUpLatios:: @ 8242A8A setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIOS setvar VAR_TEMP_4, SPECIES_LATIOS return -SouthernIsland_Interior_EventScript_242A95:: @ 8242A95 +SouthernIsland_Interior_EventScript_SetUpLatias:: @ 8242A95 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIAS setvar VAR_TEMP_4, SPECIES_LATIAS return -SouthernIsland_Interior_EventScript_242AA0:: @ 8242AA0 +SouthernIsland_Interior_EventScript_SetUpPlayerGfx:: @ 8242AA0 checkplayergender compare VAR_RESULT, MALE - goto_if_eq SouthernIsland_Interior_EventScript_242AB8 + goto_if_eq SouthernIsland_Interior_EventScript_SetBrendanGfx compare VAR_RESULT, FEMALE - goto_if_eq SouthernIsland_Interior_EventScript_242ABE + goto_if_eq SouthernIsland_Interior_EventScript_SetMayGfx end -SouthernIsland_Interior_EventScript_242AB8:: @ 8242AB8 +SouthernIsland_Interior_EventScript_SetBrendanGfx:: @ 8242AB8 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return -SouthernIsland_Interior_EventScript_242ABE:: @ 8242ABE +SouthernIsland_Interior_EventScript_SetMayGfx:: @ 8242ABE setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return -SouthernIsland_Interior_EventScript_242AC4:: @ 8242AC4 +SouthernIsland_Interior_EventScript_TryLatiEncounter:: @ 8242AC4 lockall setvar VAR_0x8008, 12 - goto SouthernIsland_Interior_EventScript_242AD0 + goto SouthernIsland_Interior_EventScript_Lati end -SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 - goto_if_set FLAG_TEMP_2, SouthernIsland_Interior_EventScript_242B9A - goto_if_set FLAG_DEFEATED_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_242B9A - goto_if_set FLAG_CAUGHT_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_242B9A - goto_if_unset FLAG_SYS_HAS_EON_TICKET, SouthernIsland_Interior_EventScript_242B9A +SouthernIsland_Interior_EventScript_Lati:: @ 8242AD0 + goto_if_set FLAG_TEMP_2, SouthernIsland_Interior_EventScript_Sign + goto_if_set FLAG_DEFEATED_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_Sign + goto_if_set FLAG_CAUGHT_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_Sign + goto_if_unset FLAG_SYS_HAS_EON_TICKET, SouthernIsland_Interior_EventScript_Sign setflag FLAG_ENCOUNTERED_LATIAS_OR_LATIOS setflag FLAG_TEMP_2 special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, SouthernIsland_Interior_Movement_242BCA + applymovement EVENT_OBJ_ID_CAMERA, SouthernIsland_Interior_Movement_CameraPanUp waitmovement 0 delay 50 waitse @@ -71,68 +71,68 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 waitmoncry addobject 2 delay 30 - applymovement EVENT_OBJ_ID_CAMERA, SouthernIsland_Interior_Movement_242BCE - applymovement 2, SouthernIsland_Interior_Movement_242BDA + applymovement EVENT_OBJ_ID_CAMERA, SouthernIsland_Interior_Movement_CameraPanDown + applymovement 2, SouthernIsland_Interior_Movement_LatiApproach waitmovement 0 delay 50 special RemoveCameraObject setvar VAR_LAST_TALKED, 2 compare VAR_ROAMER_POKEMON, 0 - call_if_eq SouthernIsland_Interior_EventScript_242BA4 + call_if_eq SouthernIsland_Interior_EventScript_SetLatiosBattleVars compare VAR_ROAMER_POKEMON, 0 - call_if_ne SouthernIsland_Interior_EventScript_242BB7 + call_if_ne SouthernIsland_Interior_EventScript_SetLatiasBattleVars setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLatiBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 - goto_if_eq SouthernIsland_Interior_EventScript_242B81 - compare VAR_RESULT, 4 - goto_if_eq SouthernIsland_Interior_EventScript_242B8F - compare VAR_RESULT, 5 - goto_if_eq SouthernIsland_Interior_EventScript_242B8F + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq SouthernIsland_Interior_EventScript_LatiDefeated + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq SouthernIsland_Interior_EventScript_RanFromLati + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq SouthernIsland_Interior_EventScript_RanFromLati setflag FLAG_CAUGHT_LATIAS_OR_LATIOS releaseall end -SouthernIsland_Interior_EventScript_242B81:: @ 8242B81 +SouthernIsland_Interior_EventScript_LatiDefeated:: @ 8242B81 setflag FLAG_DEFEATED_LATIAS_OR_LATIOS copyvar VAR_0x8004, VAR_TEMP_4 - goto SouthernIsland_Interior_EventScript_273776 + goto Common_EventScript_LegendaryFlewAway end -SouthernIsland_Interior_EventScript_242B8F:: @ 8242B8F +SouthernIsland_Interior_EventScript_RanFromLati:: @ 8242B8F copyvar VAR_0x8004, VAR_TEMP_4 - goto SouthernIsland_Interior_EventScript_273776 + goto Common_EventScript_LegendaryFlewAway end -SouthernIsland_Interior_EventScript_242B9A:: @ 8242B9A +SouthernIsland_Interior_EventScript_Sign:: @ 8242B9A msgbox SouthernIsland_Interior_Text_Sign, MSGBOX_DEFAULT releaseall end -SouthernIsland_Interior_EventScript_242BA4:: @ 8242BA4 +SouthernIsland_Interior_EventScript_SetLatiosBattleVars:: @ 8242BA4 setvar VAR_0x8004, SPECIES_LATIOS - setvar VAR_0x8005, 50 + setvar VAR_0x8005, 50 @ level setvar VAR_0x8006, ITEM_SOUL_DEW special CreateObedientEnemyMon return -SouthernIsland_Interior_EventScript_242BB7:: @ 8242BB7 +SouthernIsland_Interior_EventScript_SetLatiasBattleVars:: @ 8242BB7 setvar VAR_0x8004, SPECIES_LATIAS - setvar VAR_0x8005, 50 + setvar VAR_0x8005, 50 @ level setvar VAR_0x8006, ITEM_SOUL_DEW special CreateObedientEnemyMon return -SouthernIsland_Interior_Movement_242BCA: @ 8242BCA +SouthernIsland_Interior_Movement_CameraPanUp: @ 8242BCA walk_up walk_up walk_up step_end -SouthernIsland_Interior_Movement_242BCE: @ 8242BCE +SouthernIsland_Interior_Movement_CameraPanDown: @ 8242BCE delay_16 delay_16 delay_16 @@ -146,7 +146,7 @@ SouthernIsland_Interior_Movement_242BCE: @ 8242BCE walk_in_place_fastest_up step_end -SouthernIsland_Interior_Movement_242BDA: @ 8242BDA +SouthernIsland_Interior_Movement_LatiApproach: @ 8242BDA walk_down walk_down walk_down diff --git a/data/maps/TerraCave_End/map.json b/data/maps/TerraCave_End/map.json index 991743d63..2854ec975 100644 --- a/data/maps/TerraCave_End/map.json +++ b/data/maps/TerraCave_End/map.json @@ -45,7 +45,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "1", - "script": "TerraCave_End_EventScript_23B0EC" + "script": "TerraCave_End_EventScript_Groudon" } ], "bg_events": [] diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index 79b209e8a..2a7d912f1 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -1,33 +1,33 @@ TerraCave_End_MapScripts:: @ 823B0B0 - map_script MAP_SCRIPT_ON_RESUME, TerraCave_End_MapScript1_23B0BB + map_script MAP_SCRIPT_ON_RESUME, TerraCave_End_OnResume map_script MAP_SCRIPT_ON_TRANSITION, TerraCave_End_OnTransition .byte 0 -TerraCave_End_MapScript1_23B0BB: @ 823B0BB - call_if_set FLAG_SYS_CTRL_OBJ_DELETE, TerraCave_End_EventScript_23B0C5 +TerraCave_End_OnResume: @ 823B0BB + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, TerraCave_End_EventScript_TryRemoveGroudon end -TerraCave_End_EventScript_23B0C5:: @ 823B0C5 +TerraCave_End_EventScript_TryRemoveGroudon:: @ 823B0C5 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 7 + compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn removeobject 1 return TerraCave_End_OnTransition: @ 823B0D9 - call_if_unset FLAG_DEFEATED_GROUDON, TerraCave_End_EventScript_23B0E3 + call_if_unset FLAG_DEFEATED_GROUDON, TerraCave_End_EventScript_ShowGroudon end -TerraCave_End_EventScript_23B0E3:: @ 823B0E3 +TerraCave_End_EventScript_ShowGroudon:: @ 823B0E3 clearflag FLAG_HIDE_TERRA_CAVE_GROUDON setvar VAR_TEMP_1, 1 return -TerraCave_End_EventScript_23B0EC:: @ 823B0EC +TerraCave_End_EventScript_Groudon:: @ 823B0EC lockall applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 - applymovement 1, TerraCave_End_Movement_23B16E + applymovement 1, TerraCave_End_Movement_GroudonApproach waitmovement 0 waitse playmoncry SPECIES_GROUDON, 2 @@ -41,29 +41,29 @@ TerraCave_End_EventScript_23B0EC:: @ 823B0EC clearflag FLAG_SYS_CTRL_OBJ_DELETE setvar VAR_TEMP_1, 0 specialvar VAR_RESULT, GetBattleOutcome - compare VAR_RESULT, 1 - goto_if_eq TerraCave_End_EventScript_23B155 - compare VAR_RESULT, 4 - goto_if_eq TerraCave_End_EventScript_23B163 - compare VAR_RESULT, 5 - goto_if_eq TerraCave_End_EventScript_23B163 + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq TerraCave_End_EventScript_DefeatedGroudon + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq TerraCave_End_EventScript_RanFromGroudon + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq TerraCave_End_EventScript_RanFromGroudon setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 setflag FLAG_DEFEATED_GROUDON releaseall end -TerraCave_End_EventScript_23B155:: @ 823B155 +TerraCave_End_EventScript_DefeatedGroudon:: @ 823B155 setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 setflag FLAG_DEFEATED_GROUDON - goto TerraCave_End_EventScript_27376D + goto Common_EventScript_RemoveStaticPokemon end -TerraCave_End_EventScript_23B163:: @ 823B163 - setvar VAR_0x8004, 405 - goto TerraCave_End_EventScript_273776 +TerraCave_End_EventScript_RanFromGroudon:: @ 823B163 + setvar VAR_0x8004, SPECIES_GROUDON + goto Common_EventScript_LegendaryFlewAway end -TerraCave_End_Movement_23B16E: @ 823B16E +TerraCave_End_Movement_GroudonApproach: @ 823B16E init_affine_anim walk_down_start_affine delay_16 diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index 1c409132d..98e7d46c1 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "TradeCenter_EventScript_2774B6", + "script": "TradeCenter_EventScript_Attendant", "flag": "0" } ], diff --git a/data/maps/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc index bf3d0f9f7..39fa51db4 100644 --- a/data/maps/TrainerHill_Elevator/scripts.inc +++ b/data/maps/TrainerHill_Elevator/scripts.inc @@ -24,7 +24,7 @@ TrainerHill_Elevator_EventScript_269375:: @ 8269375 waitmovement 0 lockall msgbox TrainerHill_Elevator_Text_268F3E, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq TrainerHill_Elevator_EventScript_269360 releaseall applymovement 1, TrainerHill_Elevator_Movement_2693F0 diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index d09768f2b..3b9fb77a4 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -105,7 +105,7 @@ TrainerHill_Entrance_EventScript_2681EE:: @ 82681EE TrainerHill_Entrance_EventScript_2681EF:: @ 82681EF setvar VAR_0x800B, 2 - call TrainerHill_Entrance_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release @@ -114,7 +114,7 @@ TrainerHill_Entrance_EventScript_2681EF:: @ 82681EF TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD lock faceplayer - setvar VAR_0x8004, TRAINER_HILL_FUNC_10 + setvar VAR_0x8004, TRAINER_HILL_FUNC_IS_IN special CallTrainerHillFunction compare VAR_RESULT, 0 goto_if_eq TrainerHill_Entrance_EventScript_26821F @@ -261,11 +261,11 @@ TrainerHill_Entrance_EventScript_2683BE:: @ 82683BE TrainerHill_Entrance_EventScript_2683C7:: @ 82683C7 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage goto_if_set FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_268402 pokemart TrainerHill_Entrance_Pokemart_2683E8 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -288,7 +288,7 @@ TrainerHill_Entrance_Pokemart_2683E8: @ 82683E8 TrainerHill_Entrance_EventScript_268402:: @ 8268402 pokemart TrainerHill_Entrance_Pokemart_268414 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc index bf467e100..f7ced5d07 100644 --- a/data/maps/TrainerHill_Roof/scripts.inc +++ b/data/maps/TrainerHill_Roof/scripts.inc @@ -29,14 +29,14 @@ TrainerHill_Roof_EventScript_268FF2:: @ 8268FF2 TrainerHill_Roof_EventScript_269020:: @ 8269020 msgbox TrainerHill_Roof_Text_268AC5, MSGBOX_DEFAULT playfanfare MUS_FANFA1 - message gUnknown_08272A78 + message gText_ObtainedTheItem waitfanfare waitmessage goto TrainerHill_Roof_EventScript_269054 TrainerHill_Roof_EventScript_269037:: @ 8269037 msgbox TrainerHill_Roof_Text_268AC5, MSGBOX_DEFAULT - msgbox gUnknown_08272A89, MSGBOX_DEFAULT + msgbox gText_TheBagIsFull, MSGBOX_DEFAULT msgbox TrainerHill_Roof_Text_268B07, MSGBOX_DEFAULT goto TrainerHill_Roof_EventScript_269054 diff --git a/data/maps/Underwater_SealedChamber/scripts.inc b/data/maps/Underwater_SealedChamber/scripts.inc index 9ec884781..168383f5d 100644 --- a/data/maps/Underwater_SealedChamber/scripts.inc +++ b/data/maps/Underwater_SealedChamber/scripts.inc @@ -22,7 +22,7 @@ Underwater_SealedChamber_EventScript_2390FC:: @ 82390FC lockall braillemessage Underwater_SealedChamber_Braille_2A6B15 waitbuttonpress - hidebox2 + closebraillemessage releaseall end diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index fd8c05546..3cd012a33 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -77,8 +77,8 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 applymovement 2, VerdanturfTown_BattleTentBattleRoom_Movement_202581 waitmovement 0 removeobject 2 - applymovement 3, Common_Movement_WalkInPlaceDown - applymovement 1, Common_Movement_WalkInPlaceUp + applymovement 3, Common_Movement_WalkInPlaceFastestDown + applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, MSGBOX_DEFAULT special LoadPlayerParty @@ -107,9 +107,9 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C VerdanturfTown_BattleTentBattleRoom_EventScript_20248A:: @ 820248A msgbox VerdanturfTown_BattleTentBattleRoom_Text_250030, MSGBOX_YESNO switch VAR_RESULT - case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C - case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20251F - case 127, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C + case NO, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C + case YES, VerdanturfTown_BattleTentBattleRoom_EventScript_20251F + case MULTI_B_PRESSED, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8:: @ 82024B8 message VerdanturfTown_BattleTentBattleRoom_Text_25005A @@ -121,8 +121,8 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8:: @ 82024B8 case MULTI_B_PRESSED, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA:: @ 82024EA - applymovement 3, Common_Movement_WalkInPlaceRight - applymovement 1, Common_Movement_WalkInPlaceRight + applymovement 3, Common_Movement_WalkInPlaceFastestRight + applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 closemessage goto VerdanturfTown_BattleTentBattleRoom_EventScript_20236F diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index 5bc309663..d22933443 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -170,9 +170,9 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_201A34 msgbox VerdanturfTown_BattleTentLobby_Text_2C5662, MSGBOX_YESNO switch VAR_RESULT - case 0, VerdanturfTown_BattleTentLobby_EventScript_201A34 - case 1, VerdanturfTown_BattleTentLobby_EventScript_201954 - case 127, VerdanturfTown_BattleTentLobby_EventScript_201A34 + case NO, VerdanturfTown_BattleTentLobby_EventScript_201A34 + case YES, VerdanturfTown_BattleTentLobby_EventScript_201954 + case MULTI_B_PRESSED, VerdanturfTown_BattleTentLobby_EventScript_201A34 VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954 setvar VAR_TEMP_0, 0 diff --git a/data/maps/VerdanturfTown_Mart/scripts.inc b/data/maps/VerdanturfTown_Mart/scripts.inc index 6457aa626..2b3ccfc3a 100644 --- a/data/maps/VerdanturfTown_Mart/scripts.inc +++ b/data/maps/VerdanturfTown_Mart/scripts.inc @@ -4,10 +4,10 @@ VerdanturfTown_Mart_MapScripts:: @ 8202586 VerdanturfTown_Mart_EventScript_202587:: @ 8202587 lock faceplayer - message gUnknown_08272A21 + message gText_HowMayIServeYou waitmessage pokemart VerdanturfTown_Mart_Pokemart_2025A0 - msgbox gUnknown_08272A3F, MSGBOX_DEFAULT + msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json index f9df06d33..c437aeece 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6", + "script": "VerdanturfTown_PokemonCenter_1F_EventScript_FuryCutterTutor", "flag": "0" } ], diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc index 5eb738e73..32cecf152 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -1,16 +1,16 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8202726 map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_1F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, VerdanturfTown_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 VerdanturfTown_PokemonCenter_1F_OnTransition: @ 8202731 setrespawn HEAL_LOCATION_VERDANTURF_TOWN - call VerdanturfTown_PokemonCenter_1F_EventScript_2718DE + call Common_EventScript_UpdateBrineyLocation end VerdanturfTown_PokemonCenter_1F_EventScript_20273A:: @ 820273A setvar VAR_0x800B, 1 - call VerdanturfTown_PokemonCenter_1F_EventScript_27191E + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json index bfa6db09e..26f0d3aaa 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_PokemonCenter_2F_EventScript_27375B", + "script": "Common_EventScript_UnionRoomAttendant", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_PokemonCenter_2F_EventScript_273761", + "script": "Common_EventScript_WirelessClubAttendant", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_PokemonCenter_2F_EventScript_273767", + "script": "Common_EventScript_DirectCornerAttendant", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VerdanturfTown_PokemonCenter_2F_EventScript_276B03", + "script": "CableClub_EventScript_MysteryGiftMan", "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" } ], diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc index 0964fa96f..7802f5b03 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc @@ -1,19 +1,20 @@ VerdanturfTown_PokemonCenter_2F_MapScripts:: @ 8202897 - map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C - map_script MAP_SCRIPT_ON_LOAD, VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp + map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad + map_script MAP_SCRIPT_ON_TRANSITION, CableClub_OnTransition .byte 0 -VerdanturfTown_PokemonCenter_2F_EventScript_2028AC:: @ 82028AC - call OldaleTown_PokemonCenter_2F_EventScript_276EB7 +@ The below 3 are unused and leftover from RS +VerdanturfTown_PokemonCenter_2F_EventScript_Colosseum:: @ 82028AC + call CableClub_EventScript_Colosseum end -VerdanturfTown_PokemonCenter_2F_EventScript_2028B2:: @ 82028B2 - call OldaleTown_PokemonCenter_2F_EventScript_2770B2 +VerdanturfTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 82028B2 + call CableClub_EventScript_TradeCenter end -VerdanturfTown_PokemonCenter_2F_EventScript_2028B8:: @ 82028B8 - call OldaleTown_PokemonCenter_2F_EventScript_2771DB +VerdanturfTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 82028B8 + call CableClub_EventScript_RecordCorner end diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index b6983eac0..9b7c00c62 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -38,7 +38,7 @@ VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8 end VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox VictoryRoad_1F_Text_235EE6, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_235FFC diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 4088ddbb5..7b78a80db 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -132,8 +132,8 @@ "FallarborTown_BattleTentBattleRoom", "FallarborTown_PokemonCenter_1F", "FallarborTown_PokemonCenter_2F", - "FallarborTown_House1", - "FallarborTown_House2" + "FallarborTown_CozmosHouse", + "FallarborTown_MoveRelearnersHouse" ], "gMapGroup6": [ "VerdanturfTown_BattleTentLobby", diff --git a/data/mossdeep_gym.s b/data/rotating_tile_puzzle.s index 01eb792b7..f9cf208db 100644 --- a/data/mossdeep_gym.s +++ b/data/rotating_tile_puzzle.s @@ -2,42 +2,42 @@ .section .rodata -gUnknown_08612698:: @ 8612698 +RotatingTilePuzzle_Movement_ShiftRight:: @ 8612698 store_lock_anim walk_right free_unlock_anim step_end -gUnknown_0861269C:: @ 861269C +RotatingTilePuzzle_Movement_ShiftDown:: @ 861269C store_lock_anim walk_down free_unlock_anim step_end -gUnknown_086126A0:: @ 86126A0 +RotatingTilePuzzle_Movement_ShiftLeft:: @ 86126A0 store_lock_anim walk_left free_unlock_anim step_end -gUnknown_086126A4:: @ 86126A4 +RotatingTilePuzzle_Movement_ShiftUp:: @ 86126A4 store_lock_anim walk_up free_unlock_anim step_end -gUnknown_086126A8:: @ 86126A8 +RotatingTilePuzzle_Movement_FaceRight:: @ 86126A8 face_right step_end -gUnknown_086126AA:: @ 86126AA +RotatingTilePuzzle_Movement_FaceDown:: @ 86126AA face_down step_end -gUnknown_086126AC:: @ 86126AC +RotatingTilePuzzle_Movement_FaceLeft:: @ 86126AC face_left step_end -gUnknown_086126AE:: @ 86126AE +RotatingTilePuzzle_Movement_FaceUp:: @ 86126AE face_up step_end diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 910227a92..006167443 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -211,14 +211,14 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_nop1 .4byte ScrCmd_warpD1 .4byte ScrCmd_setmonmetlocation - .4byte ScrCmd_mossdeepgym1 - .4byte ScrCmd_mossdeepgym2 - .4byte ScrCmd_mossdeepgym3 - .4byte ScrCmd_mossdeepgym4 - .4byte ScrCmd_warpD7 + .4byte ScrCmd_moverotatingtileobjects + .4byte ScrCmd_turnrotatingtileobjects + .4byte ScrCmd_initrotatingtilepuzzle + .4byte ScrCmd_freerotatingtilepuzzle + .4byte ScrCmd_warpmossdeepgym .4byte ScrCmd_cmdD8 .4byte ScrCmd_cmdD9 - .4byte ScrCmd_cmdDA + .4byte ScrCmd_closebraillemessage .4byte ScrCmd_cmdDB .4byte ScrCmd_fadescreenswapbuffers .4byte ScrCmd_buffertrainerclassname diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index b75a3c579..7eae99dcf 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -74,7 +74,7 @@ Script_Apprentice_FirstMeetingNag: release releaseall switch VAR_FACING - case 2, Script_Apprentice_LeaveGoRight + case DIR_NORTH, Script_Apprentice_LeaveGoRight goto Script_Apprentice_Leave end @@ -117,7 +117,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B69D3: release releaseall switch VAR_FACING - case 2, Script_Apprentice_LeaveGoRight + case DIR_NORTH, Script_Apprentice_LeaveGoRight goto Script_Apprentice_Leave end @@ -163,7 +163,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6B09: release releaseall switch VAR_FACING - case 2, Script_Apprentice_LeaveGoRight + case DIR_NORTH, Script_Apprentice_LeaveGoRight goto Script_Apprentice_Leave end @@ -187,7 +187,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6BD4: release releaseall switch VAR_FACING - case 2, Script_Apprentice_LeaveGoRight + case DIR_NORTH, Script_Apprentice_LeaveGoRight goto Script_Apprentice_Leave end @@ -235,7 +235,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6C77: release releaseall switch VAR_FACING - case 2, Script_Apprentice_LeaveGoRight + case DIR_NORTH, Script_Apprentice_LeaveGoRight goto Script_Apprentice_Leave end @@ -261,7 +261,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6D5C: release releaseall switch VAR_FACING - case 2, Script_Apprentice_LeaveGoRight + case DIR_NORTH, Script_Apprentice_LeaveGoRight goto Script_Apprentice_Leave end @@ -283,7 +283,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4: release releaseall switch VAR_FACING - case 2, Script_Apprentice_LeaveGoRight + case DIR_NORTH, Script_Apprentice_LeaveGoRight goto Script_Apprentice_Leave end diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc new file mode 100644 index 000000000..9892ffb7b --- /dev/null +++ b/data/scripts/battle_pike.inc @@ -0,0 +1,312 @@ +BattleFrontier_BattlePikeRandomRoom1_MapScripts_2C3E1B: @ 82C3E1B + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE + +BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25: @ 82C3E25 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_UP_ROOM_OBJECTS + special CallBattlePikeFunction + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE + special CallBattlePikeFunction + switch VAR_RESULT + case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 + case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 + case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EC0 + case 3, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EA2 + case 4, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1 + case 7, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3E93 + case 6, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EA2 + case 8, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3ECF + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3E93:: @ 82C3E93 + setobjectxyperm 1, 2, 5 + setobjectxyperm 2, 6, 5 + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EA2:: @ 82C3EA2 + setobjectxyperm 1, 4, 4 + setobjectxyperm 2, 3, 4 + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EB1:: @ 82C3EB1 + setobjectxyperm 1, 4, 4 + setobjectxyperm 2, 0, 0 + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EC0:: @ 82C3EC0 + setobjectxyperm 1, 5, 5 + setobjectxyperm 2, 0, 0 + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3ECF:: @ 82C3ECF + setobjectxyperm 1, 4, 3 + setobjectxyperm 2, 4, 4 + end + +BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE: @ 82C3EDE + map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8 + .2byte 0 + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8 + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE + special CallBattlePikeFunction + compare VAR_RESULT, 3 + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 + compare VAR_RESULT, 6 + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 + compare VAR_RESULT, 7 + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 + compare VAR_RESULT, 8 + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F + hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 + setvar VAR_TEMP_4, 1 + turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35:: @ 82C3F35 + setvar VAR_TEMP_4, 1 + turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F:: @ 82C3F3F + setvar VAR_TEMP_4, 1 + turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E:: @ 82C3F4E + setvar VAR_0x8007, 0 + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59:: @ 82C3F59 + setvar VAR_0x8007, 1 + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64:: @ 82C3F64 + setvar VAR_0x8007, 2 + goto BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA + setvar VAR_0x8005, 1 + special CallBattlePikeFunction + addvar VAR_RESULT, 1 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA + setvar VAR_0x8005, 1 + copyvar VAR_0x8006, VAR_RESULT + special CallBattlePikeFunction + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special CallFrontierUtilFunc + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + copyvar VAR_0x8006, VAR_RESULT + special CallFrontierUtilFunc + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_ROOM_TYPE + special CallBattlePikeFunction + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE + special CallBattlePikeFunction + switch VAR_RESULT + case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + case 2, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + case 3, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + case 4, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + case 5, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4049 + case 6, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + case 7, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + case 8, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030:: @ 82C4030 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A + waitmovement 0 + call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1, 255, 4, 7 + waitstate + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4049:: @ 82C4049 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A + waitmovement 0 + call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3, 255, 4, 19 + waitstate + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062:: @ 82C4062 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_2, 1 + end + +BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D:: @ 82C406D + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_2, 0 + lockall + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE36, MSGBOX_DEFAULT + closemessage + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082:: @ 82C4082 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_2, 1 + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D:: @ 82C408D + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_2, 0 + lockall + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25CE36, MSGBOX_DEFAULT + closemessage + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_CAN_PARTY_BE_HEALED + special CallBattlePikeFunction + compare VAR_RESULT, 1 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128 + compare VAR_RESULT, 1 + call_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA + setvar VAR_0x8005, 1 + special CallBattlePikeFunction + addvar VAR_RESULT, 1 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA + setvar VAR_0x8005, 1 + copyvar VAR_0x8006, VAR_RESULT + special CallBattlePikeFunction + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special CallFrontierUtilFunc + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + copyvar VAR_0x8006, VAR_RESULT + special CallFrontierUtilFunc + setvar VAR_0x8004, BATTLE_PIKE_FUNC_IN_FINAL_ROOM + special CallBattlePikeFunction + compare VAR_RESULT, 1 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144 + compare VAR_RESULT, 0 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C + waitstate + end + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128:: @ 82C4128 +BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128:: @ 82C4128 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED + setvar VAR_0x8005, 1 + special CallBattlePikeFunction + return + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136:: @ 82C4136 +BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136:: @ 82C4136 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED + setvar VAR_0x8005, 0 + special CallBattlePikeFunction + return + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144:: @ 82C4144 +BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144:: @ 82C4144 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A + waitmovement 0 + call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2, 255, 2, 7 + return + +BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C:: @ 82C415C +BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C:: @ 82C415C + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A + waitmovement 0 + call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 + return + +BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 + setvar VAR_0x8004,BATTLE_PIKE_FUNC_7 + special CallBattlePikeFunction + setvar VAR_0x8004, BATTLE_PIKE_FUNC_CAN_PARTY_BE_HEALED + special CallBattlePikeFunction + compare VAR_RESULT, 1 + call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128 + compare VAR_RESULT, 1 + call_if_ne BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA + setvar VAR_0x8005, 1 + special CallBattlePikeFunction + addvar VAR_RESULT, 1 + setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA + setvar VAR_0x8005, 1 + copyvar VAR_0x8006, VAR_RESULT + special CallBattlePikeFunction + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 2 + special CallFrontierUtilFunc + addvar VAR_RESULT, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 + copyvar VAR_0x8006, VAR_RESULT + special CallFrontierUtilFunc + setvar VAR_0x8004, BATTLE_PIKE_FUNC_IN_FINAL_ROOM + special CallBattlePikeFunction + compare VAR_RESULT, 1 + call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144 + compare VAR_RESULT, 0 + call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C + waitstate + end + +BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202:: @ 82C4202 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_2, 1 + end + +BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D:: @ 82C420D + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_2, 0 + lockall + msgbox BattleFrontier_BattlePikeRandomRoom3_Text_25CE36, MSGBOX_DEFAULT + closemessage + end + +BattleFrontier_BattlePike_EventScript_Retire:: @ 82C4222 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 + setvar VAR_0x8006, 4 + special CallFrontierUtilFunc + warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 + waitstate + end + +BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E: @ 82C423E +BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E: @ 82C423E + setorcopyvar VAR_0x8006, VAR_RESULT + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 0 + special CallFrontierUtilFunc + compare VAR_RESULT, 2 + goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B + compare VAR_RESULT, 1 + goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B + call BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271 + +BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B:: @ 82C426B + setorcopyvar VAR_RESULT, VAR_0x8006 + end + +BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271:: @ 82C4271 +BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271:: @ 82C4271 + setvar VAR_0x8004, 21 + special CallFrontierUtilFunc + return + +BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A: @ 82C427A +BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A: @ 82C427A + set_invisible + step_end diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 2dc016a52..6b2da5ccb 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -1,16 +1,16 @@ BerryTreeScript:: @ 82742F9 special EventObjectInteractionGetBerryTreeData switch VAR_0x8004 - case 255, BerryTree_EventScript_27434F - case 0, BerryTree_EventScript_CheckSoil - case 1, BerryTree_EventScript_CheckBerryStage1 - case 2, BerryTree_EventScript_CheckBerryStage2 - case 3, BerryTree_EventScript_CheckBerryStage3 - case 4, BerryTree_EventScript_CheckBerryStage4 - case 5, BerryTree_EventScript_CheckBerryFullyGrown + case BERRY_STAGE_SPARKLING, BerryTree_EventScript_Sparkling + case BERRY_STAGE_NO_BERRY, BerryTree_EventScript_CheckSoil + case BERRY_STAGE_PLANTED, BerryTree_EventScript_CheckBerryStage1 + case BERRY_STAGE_SPROUTED, BerryTree_EventScript_CheckBerryStage2 + case BERRY_STAGE_TALLER, BerryTree_EventScript_CheckBerryStage3 + case BERRY_STAGE_FLOWERING, BerryTree_EventScript_CheckBerryStage4 + case BERRY_STAGE_BERRIES, BerryTree_EventScript_CheckBerryFullyGrown end -BerryTree_EventScript_27434F:: @ 827434F +BerryTree_EventScript_Sparkling:: @ 827434F lockall message BerryTree_Text_ExclamationPoint waitmessage @@ -22,7 +22,7 @@ BerryTree_EventScript_CheckSoil:: @ 8274359 lock faceplayer specialvar VAR_RESULT, PlayerHasBerries - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE goto_if_eq BerryTree_EventScript_WantToPlant message BerryTree_Text_ItsSoftLoamySoil waitmessage @@ -32,9 +32,9 @@ BerryTree_EventScript_CheckSoil:: @ 8274359 BerryTree_EventScript_WantToPlant:: @ 8274374 msgbox BerryTree_Text_WantToPlant, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq BerryTree_EventScript_ChooseBerryToPlant - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BerryTree_EventScript_CancelPlanting end @@ -85,6 +85,8 @@ BerryTree_EventScript_CheckBerryStage4:: @ 82743E1 waitbuttonpress goto BerryTree_EventScript_WantToWater +@ VAR_0x8005 here is the number of times watered +@ Buffered by EventObjectInteractionGetBerryTreeData BerryTree_EventScript_GetCareAdverb:: @ 82743F6 compare VAR_0x8005, 0 goto_if_eq BerryTree_EventScript_SetAdverbPoor @@ -101,22 +103,23 @@ BerryTree_EventScript_SetAdverbPoor:: @ 827441A bufferstring 1, BerryTree_Text_CareAdverbPoor return +@ VAR_0x8006 here is the number of berries BerryTree_EventScript_CheckBerryFullyGrown:: @ 8274421 buffernumberstring 1, VAR_0x8006 lock faceplayer special EventObjectInteractionGetBerryCountString msgbox BerryTree_Text_WantToPick, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq BerryTree_EventScript_PickBerry - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BerryTree_EventScript_CancelPickingBerry BerryTree_EventScript_PickBerry:: @ 8274448 special EventObjectInteractionPickBerryTree compare VAR_0x8004, 0 goto_if_eq BerryTree_EventScript_BerryPocketFull - special sub_80EED34 + special IncrementDailyPickedBerries special EventObjectInteractionRemoveBerryTree message BerryTree_Text_PickedTheBerry playfanfare MUS_ME_KINOMI @@ -143,7 +146,7 @@ BerryTree_EventScript_CancelPickingBerry:: @ 8274479 release end -BerryTree_EventScript_274482:: @ 8274482 +BerryTree_EventScript_ItemUsePlantBerry:: @ 8274482 lockall special EventObjectInteractionGetBerryTreeData call BerryTree_EventScript_PlantBerry @@ -156,19 +159,18 @@ BerryTree_EventScript_WantToWater:: @ 827448D goto_if_eq BerryTree_EventScript_DontWater special EventObjectInteractionGetBerryName msgbox BerryTree_Text_WantToWater, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq BerryTree_EventScript_WaterBerry - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq BerryTree_EventScript_DontWater BerryTree_EventScript_DontWater:: @ 82744BE releaseall end -BerryTree_EventScript_2744C0:: @ 82744C0 +BerryTree_EventScript_ItemUseWailmerPail:: @ 82744C0 special EventObjectInteractionGetBerryTreeData lockall - BerryTree_EventScript_WaterBerry:: @ 82744C4 special EventObjectInteractionGetBerryName message BerryTree_Text_WateredTheBerry @@ -184,8 +186,8 @@ BerryTree_EventScript_WaterBerry:: @ 82744C4 BerryTree_EventScript_PlantBerry:: @ 82744DD special EventObjectInteractionPlantBerryTree - incrementgamestat 3 - special sub_80EED10 + incrementgamestat GAME_STAT_PLANTED_BERRIES + special IncrementDailyPlantedBerries special EventObjectInteractionGetBerryCountString message BerryTree_Text_PlantedOneBerry waitmessage diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 8e49c982f..ebb2e6ef0 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1,558 +1,492 @@ -PokemonCenter_2F_OnTransition: @ 8276ACF - call OldaleTown_PokemonCenter_2F_EventScript_OnTransitionCheckMysteryGift +CableClub_OnTransition: @ 8276ACF + call CableClub_EventScript_HideOrShowMysteryGiftMan end -OldaleTown_PokemonCenter_2F_EventScript_OnTransitionCheckMysteryGift:: @ 8276AD5 - specialvar VAR_RESULT, sub_813B514 - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276AFB +CableClub_EventScript_HideOrShowMysteryGiftMan:: @ 8276AD5 + specialvar VAR_RESULT, ShouldDistributeEonTicket + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_ShowMysteryGiftMan specialvar VAR_RESULT, ValidateReceivedWonderCard - compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276AFF - goto OldaleTown_PokemonCenter_2F_EventScript_276AFB + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_HideMysteryGiftMan + goto CableClub_EventScript_ShowMysteryGiftMan end -OldaleTown_PokemonCenter_2F_EventScript_276AFB:: @ 8276AFB +CableClub_EventScript_ShowMysteryGiftMan:: @ 8276AFB clearflag FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN return -OldaleTown_PokemonCenter_2F_EventScript_276AFF:: @ 8276AFF +CableClub_EventScript_HideMysteryGiftMan:: @ 8276AFF setflag FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN return -BattleFrontier_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -DewfordTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -EverGrandeCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -EverGrandeCity_PokemonLeague_2F_EventScript_276B03:: @ 8276B03 -FallarborTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -FortreeCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -LavaridgeTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -LilycoveCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -MauvilleCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -MossdeepCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -OldaleTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -PacifidlogTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -PetalburgCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -RustboroCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -SlateportCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -SootopolisCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 -VerdanturfTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 - specialvar VAR_RESULT, sub_813B514 - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276B23 - goto OldaleTown_PokemonCenter_2F_EventScript_276B19 +CableClub_EventScript_MysteryGiftMan:: @ 8276B03 + specialvar VAR_RESULT, ShouldDistributeEonTicket + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_DistributeEonTicket + goto CableClub_EventScript_AlreadyGotEonTicket end -OldaleTown_PokemonCenter_2F_EventScript_276B19:: @ 8276B19 +CableClub_EventScript_AlreadyGotEonTicket:: @ 8276B19 gotoram -OldaleTown_PokemonCenter_2F_EventScript_276B1A:: @ 8276B1A - msgbox gUnknown_08273178, MSGBOX_NPC +@ Unused? +CableClub_EventScript_MysteryGiftThankYou:: @ 8276B1A + msgbox gText_ThankYouForAccessingMysteryGift, MSGBOX_NPC end -OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23 +CableClub_EventScript_DistributeEonTicket:: @ 8276B23 checkitem ITEM_EON_TICKET, 1 - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276B19 - goto_if_set FLAG_SYS_HAS_EON_TICKET, OldaleTown_PokemonCenter_2F_EventScript_276B19 - msgbox gUnknown_08273594, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_AlreadyGotEonTicket + goto_if_set FLAG_SYS_HAS_EON_TICKET, CableClub_EventScript_AlreadyGotEonTicket + msgbox Mevent_Text_TheresATicketForYou, MSGBOX_DEFAULT giveitem_std ITEM_EON_TICKET setflag FLAG_SYS_HAS_EON_TICKET - setvar VAR_ALWAYS_ZERO_0x403F, 0 - msgbox gUnknown_082735F2, MSGBOX_DEFAULT + setvar VAR_DISTRIBUTE_EON_TICKET, 0 + msgbox Mevent_Text_TryUsingItAtLilycovePort, MSGBOX_DEFAULT release end +@ Unused? OldaleTown_PokemonCenter_2F_EventScript_276B62:: @ 8276B62 - msgbox gUnknown_08273178, MSGBOX_DEFAULT + msgbox gText_ThankYouForAccessingMysteryGift, MSGBOX_DEFAULT release end -BattleFrontier_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -DewfordTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C: @ 8276B6C -FallarborTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -FortreeCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -LilycoveCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -MauvilleCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -MossdeepCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -OldaleTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -PacifidlogTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -PetalburgCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -RustboroCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -SlateportCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -SootopolisCity_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C -VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C - map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_CABLE_CLUB_STATE, 3, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_CABLE_CLUB_STATE, 4, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_CABLE_CLUB_STATE, 6, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_CABLE_CLUB_STATE, 7, OldaleTown_PokemonCenter_2F_EventScript_276BAE - map_script_2 VAR_CABLE_CLUB_STATE, 8, OldaleTown_PokemonCenter_2F_EventScript_276BAE +CableClub_OnWarp: @ 8276B6C + map_script_2 VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE, CableClub_EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE, CableClub_EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_MULTI_BATTLE, CableClub_EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_TRADE_CENTER, CableClub_EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_RECORD_CORNER, CableClub_EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_UNION_ROOM, CableClub_EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_BERRY_CRUSH, CableClub_EventScript_CheckTurnAttendant + map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_CheckTurnAttendant .2byte 0 -MossdeepCity_GameCorner_1F_EventScript_276BAE:: @ 8276BAE -OldaleTown_PokemonCenter_2F_EventScript_276BAE:: @ 8276BAE +CableClub_EventScript_CheckTurnAttendant:: @ 8276BAE compare VAR_0x8007, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276BBD + goto_if_eq CableClub_EventScript_DontTurnAttendant turnobject VAR_0x8007, DIR_WEST +CableClub_EventScript_DontTurnAttendant:: @ 8276BBD + end + +CableClub_OnLoad: @ 8276BBE + compare VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE + goto_if_eq CableClub_EventScript_OnLoadFromColosseum + compare VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE + goto_if_eq CableClub_EventScript_OnLoadFromColosseum + compare VAR_CABLE_CLUB_STATE, USING_MULTI_BATTLE + goto_if_eq CableClub_EventScript_OnLoadFromColosseum + compare VAR_CABLE_CLUB_STATE, USING_TRADE_CENTER + goto_if_eq CableClub_EventScript_OnLoadFromTradeCenter + compare VAR_CABLE_CLUB_STATE, USING_RECORD_CORNER + goto_if_eq CableClub_EventScript_OnLoadFromRecordCorner + compare VAR_CABLE_CLUB_STATE, USING_UNION_ROOM + goto_if_eq CableClub_EventScript_OnLoadFromUnionRoom + compare VAR_CABLE_CLUB_STATE, USING_BERRY_CRUSH + goto_if_eq CableClub_EventScript_OnLoadFromBerryCrush + compare VAR_CABLE_CLUB_STATE, USING_MINIGAME + goto_if_eq CableClub_EventScript_OnLoadFromGameCorner + end -OldaleTown_PokemonCenter_2F_EventScript_276BBD:: @ 8276BBD - end - -BattleFrontier_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -DewfordTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE: @ 8276BBE -FallarborTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -FortreeCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -LilycoveCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -MauvilleCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -MossdeepCity_GameCorner_1F_MapScript1_276BBE: @ 8276BBE -MossdeepCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -OldaleTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -PacifidlogTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -PetalburgCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -RustboroCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -SlateportCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -SootopolisCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE -VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE - compare VAR_CABLE_CLUB_STATE, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare VAR_CABLE_CLUB_STATE, 2 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare VAR_CABLE_CLUB_STATE, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare VAR_CABLE_CLUB_STATE, 3 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C1D - compare VAR_CABLE_CLUB_STATE, 4 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C23 - compare VAR_CABLE_CLUB_STATE, 6 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C29 - compare VAR_CABLE_CLUB_STATE, 7 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C2F - compare VAR_CABLE_CLUB_STATE, 8 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C35 - end - -OldaleTown_PokemonCenter_2F_EventScript_276C17:: @ 8276C17 - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 - end - -OldaleTown_PokemonCenter_2F_EventScript_276C1D:: @ 8276C1D - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 - end - -OldaleTown_PokemonCenter_2F_EventScript_276C23:: @ 8276C23 - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 - end - -OldaleTown_PokemonCenter_2F_EventScript_276C29:: @ 8276C29 - call OldaleTown_PokemonCenter_2F_EventScript_277BBE - end - -OldaleTown_PokemonCenter_2F_EventScript_276C2F:: @ 8276C2F - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 - end - -OldaleTown_PokemonCenter_2F_EventScript_276C35:: @ 8276C35 - call OldaleTown_PokemonCenter_2F_EventScript_277C0A - end - -BattleFrontier_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -DewfordTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B: @ 8276C3B -FallarborTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -FortreeCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -LilycoveCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -MauvilleCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -MossdeepCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -OldaleTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -PacifidlogTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -PetalburgCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -RustboroCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -SlateportCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -SootopolisCity_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B -VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B: @ 8276C3B - map_script_2 VAR_CABLE_CLUB_TUTORIAL_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276DE0 - map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_CABLE_CLUB_STATE, 3, OldaleTown_PokemonCenter_2F_EventScript_276CE7 - map_script_2 VAR_CABLE_CLUB_STATE, 4, OldaleTown_PokemonCenter_2F_EventScript_276D2C - map_script_2 VAR_CABLE_CLUB_STATE, 6, OldaleTown_PokemonCenter_2F_EventScript_276D6C - map_script_2 VAR_CABLE_CLUB_STATE, 7, OldaleTown_PokemonCenter_2F_EventScript_276C85 - map_script_2 VAR_CABLE_CLUB_STATE, 8, OldaleTown_PokemonCenter_2F_EventScript_276C9D +CableClub_EventScript_OnLoadFromColosseum:: @ 8276C17 + call CableClub_EventScript_OpenDirectCornerBarrier + end + +CableClub_EventScript_OnLoadFromTradeCenter:: @ 8276C1D + call CableClub_EventScript_OpenDirectCornerBarrier + end + +CableClub_EventScript_OnLoadFromRecordCorner:: @ 8276C23 + call CableClub_EventScript_OpenDirectCornerBarrier + end + +CableClub_EventScript_OnLoadFromUnionRoom:: @ 8276C29 + call CableClub_EventScript_OpenUnionRoomBarrier + end + +CableClub_EventScript_OnLoadFromBerryCrush:: @ 8276C2F + call CableClub_EventScript_OpenDirectCornerBarrier + end + +CableClub_EventScript_OnLoadFromGameCorner:: @ 8276C35 + call EventScript_OpenMossdeepGameCornerBarrier + end + +CableClub_OnFrame: @ 8276C3B + map_script_2 VAR_CABLE_CLUB_TUTORIAL_STATE, 1, CableClub_EventScript_Tutorial + map_script_2 VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE, CableClub_EventScript_ExitLinkRoom + map_script_2 VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE, CableClub_EventScript_ExitLinkRoom + map_script_2 VAR_CABLE_CLUB_STATE, USING_MULTI_BATTLE, CableClub_EventScript_ExitLinkRoom + map_script_2 VAR_CABLE_CLUB_STATE, USING_TRADE_CENTER, CableClub_EventScript_ExitTradeCenter + map_script_2 VAR_CABLE_CLUB_STATE, USING_RECORD_CORNER, CableClub_EventScript_ExitRecordCorner + map_script_2 VAR_CABLE_CLUB_STATE, USING_UNION_ROOM, CableClub_EventScript_ExitUnionRoom + map_script_2 VAR_CABLE_CLUB_STATE, USING_BERRY_CRUSH, CableClub_EventScript_ExitLinkRoom + map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom .2byte 0 -OldaleTown_PokemonCenter_2F_EventScript_276C85:: @ 8276C85 +CableClub_EventScript_ExitLinkRoom:: @ 8276C85 lockall - call OldaleTown_PokemonCenter_2F_EventScript_276CB5 - call OldaleTown_PokemonCenter_2F_EventScript_277BF7 + call CableClub_EventScript_CloseLinkAndExitLinkRoom + call CableClub_EventScript_CloseDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA erasebox 0, 0, 29, 19 releaseall end -MossdeepCity_GameCorner_1F_EventScript_276C9D:: @ 8276C9D -OldaleTown_PokemonCenter_2F_EventScript_276C9D:: @ 8276C9D +CableClub_EventScript_ExitMinigameRoom:: @ 8276C9D lockall - call OldaleTown_PokemonCenter_2F_EventScript_276CB5 - call OldaleTown_PokemonCenter_2F_EventScript_277C1D + call CableClub_EventScript_CloseLinkAndExitLinkRoom + call EventScript_CloseMossdeepGameCornerBarrier special DrawWholeMapView playse SE_TK_KASYA erasebox 0, 0, 29, 19 releaseall end -OldaleTown_PokemonCenter_2F_EventScript_276CB5:: @ 8276CB5 +CableClub_EventScript_CloseLinkAndExitLinkRoom:: @ 8276CB5 special CloseLink setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 - applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D + goto_if_eq CableClub_EventScript_PlayerExitLinkRoom + applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 - applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_277349 + applymovement VAR_0x8007, Movement_AttendantFaceDown waitmovement 0 return -OldaleTown_PokemonCenter_2F_EventScript_276CE7:: @ 8276CE7 +CableClub_EventScript_ExitTradeCenter:: @ 8276CE7 lockall - call OldaleTown_PokemonCenter_2F_EventScript_276CFF - call OldaleTown_PokemonCenter_2F_EventScript_277BF7 + call CableClub_EventScript_PlayerExitTradeCenter + call CableClub_EventScript_CloseDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA erasebox 0, 0, 29, 19 releaseall end -OldaleTown_PokemonCenter_2F_EventScript_276CFF:: @ 8276CFF +CableClub_EventScript_PlayerExitTradeCenter:: @ 8276CFF special CloseLink setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E + goto_if_eq CableClub_EventScript_PlayerExitLinkRoom + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerFaceAttendantRight waitmovement 0 - applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D + applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 - call OldaleTown_PokemonCenter_2F_EventScript_276DAE + call CableClub_EventScript_TrainerCardDataOverwritten return -OldaleTown_PokemonCenter_2F_EventScript_276D2C:: @ 8276D2C +CableClub_EventScript_ExitRecordCorner:: @ 8276D2C lockall - call OldaleTown_PokemonCenter_2F_EventScript_276D44 - call OldaleTown_PokemonCenter_2F_EventScript_277BF7 + call CableClub_EventScript_PlayerExitRecordCorner + call CableClub_EventScript_CloseDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA erasebox 0, 0, 29, 19 releaseall end -OldaleTown_PokemonCenter_2F_EventScript_276D44:: @ 8276D44 +CableClub_EventScript_PlayerExitRecordCorner:: @ 8276D44 special CloseLink setvar VAR_CABLE_CLUB_STATE, 0 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 compare VAR_0x8007, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276D6B - applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_277349 + goto_if_eq CableClub_EventScript_ExitRecordCornerRet + applymovement VAR_0x8007, Movement_AttendantFaceDown waitmovement 0 - -OldaleTown_PokemonCenter_2F_EventScript_276D6B:: @ 8276D6B +CableClub_EventScript_ExitRecordCornerRet:: @ 8276D6B return -OldaleTown_PokemonCenter_2F_EventScript_276D6C:: @ 8276D6C +CableClub_EventScript_ExitUnionRoom:: @ 8276D6C lockall - call OldaleTown_PokemonCenter_2F_EventScript_276D84 - call OldaleTown_PokemonCenter_2F_EventScript_277BD1 + call CableClub_EventScript_PlayerExitUnionRoom + call CableClub_EventScript_CloseUnionRoomBarrier special DrawWholeMapView playse SE_TK_KASYA erasebox 0, 0, 29, 19 releaseall end -OldaleTown_PokemonCenter_2F_EventScript_276D84:: @ 8276D84 +CableClub_EventScript_PlayerExitUnionRoom:: @ 8276D84 setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E + goto_if_eq CableClub_EventScript_PlayerExitLinkRoom + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerFaceAttendantRight waitmovement 0 - applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D + applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 - call OldaleTown_PokemonCenter_2F_EventScript_276DAE + call CableClub_EventScript_TrainerCardDataOverwritten return -OldaleTown_PokemonCenter_2F_EventScript_276DAE:: @ 8276DAE - message OldaleTown_PokemonCenter_2F_Text_278521 +CableClub_EventScript_TrainerCardDataOverwritten:: @ 8276DAE + message CableClub_Text_TrainerCardDataOverwritten waitmessage playse SE_PIN delay 60 - message OldaleTown_PokemonCenter_2F_Text_27854C + message CableClub_Text_HopeToSeeYouAgain waitmessage - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 - applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_277349 + applymovement VAR_0x8007, Movement_AttendantFaceDown waitmovement 0 return -OldaleTown_PokemonCenter_2F_EventScript_276DD5:: @ 8276DD5 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F +CableClub_EventScript_PlayerExitLinkRoom:: @ 8276DD5 + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 return -OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0 +CableClub_EventScript_Tutorial:: @ 8276DE0 lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox OldaleTown_PokemonCenter_2F_Text_27964A, MSGBOX_DEFAULT + msgbox CableClub_Text_FirstTimeRightThisWay, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_276E10 + applymovement EVENT_OBJ_ID_PLAYER, CableClub_Movement_PlayerApproachCounter waitmovement 0 delay 30 - msgbox OldaleTown_PokemonCenter_2F_Text_279718, MSGBOX_DEFAULT + msgbox CableClub_Text_ExplainWirelessClubFirstTime, MSGBOX_DEFAULT setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 2 releaseall end -OldaleTown_PokemonCenter_2F_Movement_276E10: @ 8276E10 +CableClub_Movement_PlayerApproachCounter: @ 8276E10 walk_up walk_up step_end -OldaleTown_PokemonCenter_2F_EventScript_276E13:: @ 8276E13 - message OldaleTown_PokemonCenter_2F_Text_277EA4 +CableClub_EventScript_WelcomeToCableClub:: @ 8276E13 + message CableClub_Text_WelcomeWhichCableClubService waitmessage delay 28 - goto OldaleTown_PokemonCenter_2F_EventScript_276E30 + goto CableClub_EventScript_SelectCableClubRoom end -OldaleTown_PokemonCenter_2F_EventScript_276E22:: @ 8276E22 - msgbox OldaleTown_PokemonCenter_2F_Text_277EF1, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_276E30 +CableClub_EventScript_UnusedWelcomeToCableClub:: @ 8276E22 + msgbox CableClub_Text_WhichService, MSGBOX_DEFAULT + goto CableClub_EventScript_SelectCableClubRoom end -OldaleTown_PokemonCenter_2F_EventScript_276E30:: @ 8276E30 +CableClub_EventScript_SelectCableClubRoom:: @ 8276E30 setvar VAR_0x8004, 0 - goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_276E75 + goto_if_set FLAG_VISITED_MAUVILLE_CITY, CableClub_EventScript_CableClubUnlockedRecordCorner multichoice 0, 0, MULTI_CABLE_CLUB_NO_RECORD_MIX, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_2770B2 - case 1, OldaleTown_PokemonCenter_2F_EventScript_276EB7 - case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_TradeCenter + case 1, CableClub_EventScript_Colosseum + case 2, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_276E75:: @ 8276E75 +CableClub_EventScript_CableClubUnlockedRecordCorner:: @ 8276E75 multichoice 0, 0, MULTI_CABLE_CLUB_WITH_RECORD_MIX, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_2770B2 - case 1, OldaleTown_PokemonCenter_2F_EventScript_276EB7 - case 2, OldaleTown_PokemonCenter_2F_EventScript_2771DB - case 3, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_TradeCenter + case 1, CableClub_EventScript_Colosseum + case 2, CableClub_EventScript_RecordCorner + case 3, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_276EB7:: @ 8276EB7 +CableClub_EventScript_Colosseum:: @ 8276EB7 copyvar VAR_0x8007, VAR_LAST_TALKED - goto OldaleTown_PokemonCenter_2F_EventScript_276EC2 + goto CableClub_EventScript_SelectBattleMode end -OldaleTown_PokemonCenter_2F_EventScript_276EC2:: @ 8276EC2 - message OldaleTown_PokemonCenter_2F_Text_2790BE +CableClub_EventScript_SelectBattleMode:: @ 8276EC2 + message CableClub_Text_WhichBattleMode waitmessage multichoice 0, 0, MULTI_BATTLE_MODE, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_276F23 - case 1, OldaleTown_PokemonCenter_2F_EventScript_276F2E - case 2, OldaleTown_PokemonCenter_2F_EventScript_276F55 - case 3, OldaleTown_PokemonCenter_2F_EventScript_276F15 - case 4, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_SingleBattleMode + case 1, CableClub_EventScript_DoubleBattleMode + case 2, CableClub_EventScript_MultiBattleMode + case 3, CableClub_EventScript_BattleModeInfo + case 4, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_276F15:: @ 8276F15 - msgbox OldaleTown_PokemonCenter_2F_Text_279142, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_276EC2 +CableClub_EventScript_BattleModeInfo:: @ 8276F15 + msgbox CableClub_Text_ExplainBattleModes, MSGBOX_DEFAULT + goto CableClub_EventScript_SelectBattleMode end -OldaleTown_PokemonCenter_2F_EventScript_276F23:: @ 8276F23 - setvar VAR_0x8004, 1 - goto OldaleTown_PokemonCenter_2F_EventScript_276F60 +CableClub_EventScript_SingleBattleMode:: @ 8276F23 + setvar VAR_0x8004, USING_SINGLE_BATTLE + goto CableClub_EventScript_TryEnterColosseum end -OldaleTown_PokemonCenter_2F_EventScript_276F2E:: @ 8276F2E +CableClub_EventScript_DoubleBattleMode:: @ 8276F2E special HasEnoughMonsForDoubleBattle compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS - goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_276F47 - setvar VAR_0x8004, 2 - goto OldaleTown_PokemonCenter_2F_EventScript_276F60 + goto_if_ne CableClub_EventScript_NeedTwoMonsForDoubleBattle + setvar VAR_0x8004, USING_DOUBLE_BATTLE + goto CableClub_EventScript_TryEnterColosseum end -OldaleTown_PokemonCenter_2F_EventScript_276F47:: @ 8276F47 - msgbox OldaleTown_PokemonCenter_2F_Text_277FEE, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_276EC2 +CableClub_EventScript_NeedTwoMonsForDoubleBattle:: @ 8276F47 + msgbox CableClub_Text_NeedTwoMonsForDoubleBattle, MSGBOX_DEFAULT + goto CableClub_EventScript_SelectBattleMode end -OldaleTown_PokemonCenter_2F_EventScript_276F55:: @ 8276F55 - setvar VAR_0x8004, 5 - goto OldaleTown_PokemonCenter_2F_EventScript_276F60 +CableClub_EventScript_MultiBattleMode:: @ 8276F55 + setvar VAR_0x8004, USING_MULTI_BATTLE + goto CableClub_EventScript_TryEnterColosseum end -OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60 +CableClub_EventScript_TryEnterColosseum:: @ 8276F60 call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink message gText_PleaseWaitForLink waitmessage - special sub_80B2DA4 + special TryBattleLinkup waitstate compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276FBD + goto_if_eq CableClub_EventScript_EnterColosseum compare VAR_RESULT, 2 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 + goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady compare VAR_RESULT, 3 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF + goto_if_eq CableClub_EventScript_AbortLinkDifferentSelections compare VAR_RESULT, 4 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277046 + goto_if_eq CableClub_EventScript_AbortLinkIncorrectNumberOfBattlers compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink compare VAR_RESULT, 6 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 + goto_if_eq CableClub_EventScript_AbortLinkConnectionError end -OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD +CableClub_EventScript_EnterColosseum:: @ 8276FBD special HealPlayerParty special SavePlayerParty special LoadPlayerBag copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 - messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197 + messageautoscroll CableClub_Text_PleaseEnter waitmessage - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 + call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release - compare VAR_0x8004, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277036 + compare VAR_0x8004, USING_MULTI_BATTLE + goto_if_eq CableClub_EventScript_WarpToDoubleColosseum special SetCableClubWarp warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8 special sub_80AF948 waitstate end -OldaleTown_PokemonCenter_2F_EventScript_27702B:: @ 827702B - applymovement EVENT_OBJ_ID_PLAYER, Movement_277352 +@ Unused +CableClub_EventScript_PlayerApproachLinkRoomRight:: @ 827702B + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomRight waitmovement 0 return -OldaleTown_PokemonCenter_2F_EventScript_277036:: @ 8277036 +CableClub_EventScript_WarpToDoubleColosseum:: @ 8277036 special SetCableClubWarp warp MAP_DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8 special sub_80AF948 waitstate end -OldaleTown_PokemonCenter_2F_EventScript_277046:: @ 8277046 +CableClub_EventScript_AbortLinkIncorrectNumberOfBattlers:: @ 8277046 switch VAR_0x8004 - case 1, OldaleTown_PokemonCenter_2F_EventScript_277094 - case 2, OldaleTown_PokemonCenter_2F_EventScript_277083 - case 5, OldaleTown_PokemonCenter_2F_EventScript_277072 - goto OldaleTown_PokemonCenter_2F_EventScript_27730E + case USING_SINGLE_BATTLE, CableClub_EventScript_AbortLinkWrongNumberForSingleBattle + case USING_DOUBLE_BATTLE, CableClub_EventScript_AbortLinkWrongNumberForDoubleBattle + case USING_MULTI_BATTLE, CableClub_EventScript_AbortLinkNeedFourPlayers + goto CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants end -OldaleTown_PokemonCenter_2F_EventScript_277072:: @ 8277072 +CableClub_EventScript_AbortLinkNeedFourPlayers:: @ 8277072 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_27833D, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_2770A5 + msgbox CableClub_Text_NeedFourPlayers, MSGBOX_DEFAULT + goto CableClub_EventScript_ConfirmNumberAndRestart end -OldaleTown_PokemonCenter_2F_EventScript_277083:: @ 8277083 +CableClub_EventScript_AbortLinkWrongNumberForDoubleBattle:: @ 8277083 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278307, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_2770A5 + msgbox CableClub_Text_CantDoubleBattleWithXPlayers, MSGBOX_DEFAULT + goto CableClub_EventScript_ConfirmNumberAndRestart end -OldaleTown_PokemonCenter_2F_EventScript_277094:: @ 8277094 +CableClub_EventScript_AbortLinkWrongNumberForSingleBattle:: @ 8277094 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2782D1, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_2770A5 + msgbox CableClub_Text_CantSingleBattleWithXPlayers, MSGBOX_DEFAULT + goto CableClub_EventScript_ConfirmNumberAndRestart end -OldaleTown_PokemonCenter_2F_EventScript_2770A5:: @ 82770A5 - special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278372, MSGBOX_DEFAULT +CableClub_EventScript_ConfirmNumberAndRestart:: @ 82770A5 + special CloseLink @ Redundant + msgbox CableClub_Text_PleaseConfirmNumberAndRestart, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2 +CableClub_EventScript_TradeCenter:: @ 82770B2 copyvar VAR_0x8007, VAR_LAST_TALKED - call OldaleTown_PokemonCenter_2F_EventScript_277199 + call CableClub_EventScript_CheckPartyTradeRequirements compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink message gText_PleaseWaitForLink waitmessage - special sub_80B2E4C + special TryTradeLinkup waitstate compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27713A + goto_if_eq CableClub_EventScript_EnterTradeCenter compare VAR_RESULT, 2 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 + goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady compare VAR_RESULT, 3 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF + goto_if_eq CableClub_EventScript_AbortLinkDifferentSelections compare VAR_RESULT, 4 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27730E + goto_if_eq CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink compare VAR_RESULT, 6 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 + goto_if_eq CableClub_EventScript_AbortLinkConnectionError compare VAR_RESULT, 7 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772AB + goto_if_eq CableClub_EventScript_AbortLinkPlayerNotReady compare VAR_RESULT, 9 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772B8 + goto_if_eq CableClub_EventScript_AbortLinkOtherTrainerNotReady end -OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A - setvar VAR_0x8004, 3 +CableClub_EventScript_EnterTradeCenter:: @ 827713A + setvar VAR_0x8004, USING_TRADE_CENTER copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 - messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197 + messageautoscroll CableClub_Text_PleaseEnter waitmessage - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 + call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 @@ -564,31 +498,31 @@ OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A waitstate end -OldaleTown_PokemonCenter_2F_EventScript_277199:: @ 8277199 +CableClub_EventScript_CheckPartyTradeRequirements:: @ 8277199 specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, 2 - goto_if_lt OldaleTown_PokemonCenter_2F_EventScript_2771BF - specialvar VAR_RESULT, sub_80F9370 - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2771CD + goto_if_lt CableClub_EventScript_NeedTwoMonsToTrade + specialvar VAR_RESULT, DoesPartyHaveEnigmaBerry + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_CantTradeEnigmaBerry setvar VAR_RESULT, 1 return -OldaleTown_PokemonCenter_2F_EventScript_2771BF:: @ 82771BF - msgbox OldaleTown_PokemonCenter_2F_Text_278027, MSGBOX_DEFAULT +CableClub_EventScript_NeedTwoMonsToTrade:: @ 82771BF + msgbox CableClub_Text_NeedTwoMonsToTrade, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return -OldaleTown_PokemonCenter_2F_EventScript_2771CD:: @ 82771CD - msgbox OldaleTown_PokemonCenter_2F_Text_278061, MSGBOX_DEFAULT +CableClub_EventScript_CantTradeEnigmaBerry:: @ 82771CD + msgbox CableClub_Text_CantTradeEnigmaBerry, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return -OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB +CableClub_EventScript_RecordCorner:: @ 82771DB copyvar VAR_0x8007, VAR_LAST_TALKED call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink message gText_PleaseWaitForLink waitmessage special sub_80B2E74 @@ -596,38 +530,38 @@ OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB special sub_80B2EA8 waitstate compare VAR_RESULT, 12 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277328 + goto_if_eq CableClub_EventScript_AbortLinkForeignGame compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27724C + goto_if_eq CableClub_EventScript_EnterRecordCorner compare VAR_RESULT, 2 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 + goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady compare VAR_RESULT, 3 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF + goto_if_eq CableClub_EventScript_AbortLinkDifferentSelections compare VAR_RESULT, 4 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27730E + goto_if_eq CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink compare VAR_RESULT, 6 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 + goto_if_eq CableClub_EventScript_AbortLinkConnectionError end -OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C - setvar VAR_0x8004, 4 +CableClub_EventScript_EnterRecordCorner:: @ 827724C + setvar VAR_0x8004, USING_RECORD_CORNER copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 - messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197 + messageautoscroll CableClub_Text_PleaseEnter waitmessage - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 + call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 @@ -639,127 +573,128 @@ OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C waitstate end -OldaleTown_PokemonCenter_2F_EventScript_2772AB:: @ 82772AB +CableClub_EventScript_AbortLinkPlayerNotReady:: @ 82772AB special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278565, MSGBOX_DEFAULT + msgbox CableClub_Text_NotSetUpForFarAwayRegion, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_2772B8:: @ 82772B8 +CableClub_EventScript_AbortLinkOtherTrainerNotReady:: @ 82772B8 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2785C9, MSGBOX_DEFAULT + msgbox CableClub_Text_OtherTrainerNotReady, MSGBOX_DEFAULT release end -BattleFrontier_BattleTowerLobby_EventScript_2772C5:: @ 82772C5 -OldaleTown_PokemonCenter_2F_EventScript_2772C5:: @ 82772C5 +CableClub_EventScript_AbortLinkConnectionError:: @ 82772C5 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_27821C, MSGBOX_DEFAULT + msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT release end -BattleFrontier_BattleTowerLobby_EventScript_2772D2:: @ 82772D2 -OldaleTown_PokemonCenter_2F_EventScript_2772D2:: @ 82772D2 +CableClub_EventScript_AbortLinkSomeoneNotReady:: @ 82772D2 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2781C7, MSGBOX_DEFAULT + msgbox Text_SomeoneIsNotReadyToLink, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_2772DF:: @ 82772DF +CableClub_EventScript_AbortLinkDifferentSelections:: @ 82772DF special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278255, MSGBOX_DEFAULT + msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_2772EC:: @ 82772EC +CableClub_EventScript_AbortLink:: @ 82772EC special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278291, MSGBOX_DEFAULT + msgbox CableClub_Text_PleaseVisitAgain, MSGBOX_DEFAULT release end -MossdeepCity_GameCorner_1F_EventScript_2772F9:: @ 82772F9 +MossdeepCity_GameCorner_1F_EventScript_AbortMinigame:: @ 82772F9 special CloseLink - msgbox MossdeepCity_GameCorner_1F_Text_278D51, MSGBOX_DEFAULT + msgbox MossdeepCity_GameCorner_1F_Text_ComeAgain, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_277306:: @ 8277306 +@ Unused +CableClub_EventScript_CableClubWarp:: @ 8277306 special SetCableClubWarp special sub_80AF948 waitstate end -OldaleTown_PokemonCenter_2F_EventScript_27730E:: @ 827730E +CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants:: @ 827730E special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2782A8, MSGBOX_DEFAULT + msgbox CableClub_Text_IncorrectNumberOfParticipants, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_27731B:: @ 827731B +CableClub_EventScript_AbortLinkPlayerHasBadEgg:: @ 827731B special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_2785E9, MSGBOX_DEFAULT + msgbox CableClub_Text_YouHaveAMonThatCantBeTaken, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_277328:: @ 8277328 +CableClub_EventScript_AbortLinkForeignGame:: @ 8277328 special CloseLink - msgbox OldaleTown_PokemonCenter_2F_Text_278651, MSGBOX_DEFAULT + msgbox CableClub_Text_CantMixWithJapaneseGame, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_277335:: @ 8277335 - msgbox gUnknown_0827306F, MSGBOX_DEFAULT +CableClub_EventScript_WirelessClubAdjustements:: @ 8277335 + msgbox gText_SorryWirelessClubAdjustments, MSGBOX_DEFAULT release end -OldaleTown_PokemonCenter_2F_EventScript_27733F:: @ 827733F - msgbox gUnknown_082730BC, MSGBOX_DEFAULT +CableClub_EventScript_NotReadyYet:: @ 827733F + msgbox gText_UndergoingAdjustments, MSGBOX_DEFAULT releaseall end -OldaleTown_PokemonCenter_2F_Movement_277349: @ 8277349 +Movement_AttendantFaceDown: @ 8277349 face_down step_end -OldaleTown_PokemonCenter_2F_Movement_27734B: @ 827734B +@ Unused +Movement_AttendantFaceRight: @ 827734B face_right step_end -MossdeepCity_GameCorner_1F_Movement_27734D: @ 827734D -OldaleTown_PokemonCenter_2F_Movement_27734D: @ 827734D +Movement_AttendantFaceLeft: @ 827734D face_left step_end -OldaleTown_PokemonCenter_2F_Movement_27734F: @ 827734F +Movement_PlayerExitLinkRoom: @ 827734F walk_down walk_down step_end -Movement_277352: @ 8277352 +@ Functionally unused +Movement_PlayerApproachLinkRoomRight: @ 8277352 walk_right walk_up walk_up step_end -OldaleTown_PokemonCenter_2F_Movement_277356: @ 8277356 +Movement_PlayerApproachLinkRoomLeft: @ 8277356 walk_left walk_up walk_up step_end -OldaleTown_PokemonCenter_2F_Movement_27735A: @ 827735A +Movement_PlayerEnterLinkRoom: @ 827735A walk_up step_end -OldaleTown_PokemonCenter_2F_Movement_27735C: @ 827735C +@ Unused +Movement_PlayerFaceAttendantLeft: @ 827735C face_left step_end -OldaleTown_PokemonCenter_2F_Movement_27735E: @ 827735E +Movement_PlayerFaceAttendantRight: @ 827735E face_right step_end -MossdeepCity_GameCorner_1F_Movement_277360: @ 8277360 +Movement_PlayerEnterMinigameRoom: @ 8277360 walk_left walk_up walk_up @@ -894,68 +829,68 @@ EventScript_RecordCenter_Spot3:: @ 827745C RecordCorner_EventScript_277471:: @ 8277471 bufferitemname 1, VAR_TEMP_1 - message RecordCorner_Text_27863C + message RecordCorner_Text_PlayerSentOverOneX waitmessage waitbuttonpress releaseall end -gEventScript_TradeRoom_ReadTrainerCard_NoColor:: @ 827747E - msgbox Text_278452, MSGBOX_DEFAULT +CableClub_EventScript_ReadTrainerCard:: @ 827747E + msgbox CableClub_Text_GotToLookAtTrainerCard, MSGBOX_DEFAULT fadescreen 1 - special sp02A_crash_sound + special Script_ShowLinkTrainerCard waitstate end -gEventScript_TradeRoom_ReadTrainerCard_Normal:: @ 827748D - msgbox Text_27847B, MSGBOX_DEFAULT +CableClub_EventScript_ReadTrainerCardColored:: @ 827748D + msgbox CableClub_Text_GotToLookAtColoredTrainerCard, MSGBOX_DEFAULT fadescreen 1 - special sp02A_crash_sound + special Script_ShowLinkTrainerCard waitstate end -gEventScript_TradeRoom_TooBusyToNotice:: @ 827749C - msgbox Text_27842E, MSGBOX_DEFAULT +CableClub_EventScript_TooBusyToNotice:: @ 827749C + msgbox CableClub_Text_TooBusyToNotice, MSGBOX_DEFAULT closemessage end -SingleBattleColosseum_EventScript_2774A6:: @ 82774A6 - special sub_8098574 - msgbox SingleBattleColosseum_Text_2784B4, MSGBOX_DEFAULT - special sub_809859C +SingleBattleColosseum_EventScript_Attendant:: @ 82774A6 + special Script_FacePlayer + msgbox SingleBattleColosseum_Text_TakePlaceStartBattle, MSGBOX_DEFAULT + special Script_ClearHeldMovement closemessage end -TradeCenter_EventScript_2774B6:: @ 82774B6 - special sub_8098574 - msgbox TradeCenter_Text_2784E2, MSGBOX_DEFAULT - special sub_809859C +TradeCenter_EventScript_Attendant:: @ 82774B6 + special Script_FacePlayer + msgbox TradeCenter_Text_TakeSeatStartTrade, MSGBOX_DEFAULT + special Script_ClearHeldMovement closemessage end RecordCorner_EventScript_2774C6:: @ 82774C6 compare VAR_TEMP_0, 0 - goto_if_ne RecordCorner_EventScript_2774E0 - special sub_8098574 - message RecordCorner_Text_27861C + goto_if_ne RecordCorner_EventScript_AlreadyMixed + special Script_FacePlayer + message RecordCorner_Text_TakeSeatAndWait waitmessage waitbuttonpress - special sub_809859C + special Script_ClearHeldMovement closemessage end -RecordCorner_EventScript_2774E0:: @ 82774E0 - special sub_8098574 - message RecordCorner_Text_27850E +RecordCorner_EventScript_AlreadyMixed:: @ 82774E0 + special Script_FacePlayer + message RecordCorner_Text_ThanksForComing waitmessage waitbuttonpress - special sub_809859C + special Script_ClearHeldMovement closemessage end EventScript_ConfirmLeaveTradeRoom:: @ 82774EF msgbox Text_TerminateLinkConfirmation, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_TerminateLink erasebox 0, 0, 29, 19 releaseall @@ -969,70 +904,70 @@ EventScript_TerminateLink:: @ 8277509 EventScript_DoLinkRoomExit:: @ 8277513 special CleanupLinkRoomState - special sub_80AF9F8 + special ReturnFromLinkRoom waitstate end -OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B +CableClub_EventScript_UnionRoomAttendant:: @ 827751B lock faceplayer - setvar VAR_FRONTIER_FACILITY, 8 - goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335 + setvar VAR_FRONTIER_FACILITY, FACILITY_UNION_ROOM + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements specialvar VAR_RESULT, IsBadEggInParty - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_AbortLinkPlayerHasBadEgg copyvar VAR_0x8007, VAR_LAST_TALKED specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277668 - message OldaleTown_PokemonCenter_2F_Text_27940D + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_UnionRoomAdapterNotConnected + message CableClub_Text_WelcomeUnionRoomEnter waitmessage - goto OldaleTown_PokemonCenter_2F_EventScript_27755C + goto CableClub_EventScript_UnionRoomSelect end -OldaleTown_PokemonCenter_2F_EventScript_27755C:: @ 827755C +CableClub_EventScript_UnionRoomSelect:: @ 827755C multichoice 17, 6, MULTI_YESNOINFO, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_27759F - case 1, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case 2, OldaleTown_PokemonCenter_2F_EventScript_277593 - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_EnterUnionRoom + case 1, CableClub_EventScript_AbortLink + case 2, CableClub_EventScript_UnionRoomInfo + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_277593:: @ 8277593 - message OldaleTown_PokemonCenter_2F_Text_2794B8 +CableClub_EventScript_UnionRoomInfo:: @ 8277593 + message CableClub_Text_UnionRoomInfo waitmessage - goto OldaleTown_PokemonCenter_2F_EventScript_27755C + goto CableClub_EventScript_UnionRoomSelect end -OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F - call OldaleTown_PokemonCenter_2F_EventScript_277626 +CableClub_EventScript_EnterUnionRoom:: @ 827759F + call CableClub_EventScript_CheckPartyUnionRoomRequirements compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - msgbox OldaleTown_PokemonCenter_2F_Text_27961C, MSGBOX_DEFAULT + goto_if_eq CableClub_EventScript_AbortLink + msgbox CableClub_Text_EnjoyUnionRoom, MSGBOX_DEFAULT closemessage special HealPlayerParty - setvar VAR_0x8004, 6 + setvar VAR_0x8004, USING_UNION_ROOM copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 - call OldaleTown_PokemonCenter_2F_EventScript_277BBE + call CableClub_EventScript_OpenUnionRoomBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 5, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 5, 1 waitdooranim - special sub_8018090 + special Script_ResetUnionRoomTrade special SetCableClubWarp warpteleport2 MAP_UNION_ROOM, 255, 7, 11 waitstate @@ -1040,329 +975,325 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F waitstate end -OldaleTown_PokemonCenter_2F_EventScript_277626:: @ 8277626 +CableClub_EventScript_CheckPartyUnionRoomRequirements:: @ 8277626 specialvar VAR_RESULT, CountPartyNonEggMons compare VAR_RESULT, 2 - goto_if_lt OldaleTown_PokemonCenter_2F_EventScript_27764C - specialvar VAR_RESULT, sub_80F9370 - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27765A + goto_if_lt CableClub_EventScript_NeedTwoMonsForUnionRoom + specialvar VAR_RESULT, DoesPartyHaveEnigmaBerry + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_NoEnigmaBerryInUnionRoom setvar VAR_RESULT, 1 return -OldaleTown_PokemonCenter_2F_EventScript_27764C:: @ 827764C - msgbox OldaleTown_PokemonCenter_2F_Text_27893E, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_273755 +CableClub_EventScript_NeedTwoMonsForUnionRoom:: @ 827764C + msgbox CableClub_Text_NeedTwoMonsForUnionRoom, MSGBOX_DEFAULT + goto EventScript_CableClub_SetVarResult0 end -OldaleTown_PokemonCenter_2F_EventScript_27765A:: @ 827765A - msgbox OldaleTown_PokemonCenter_2F_Text_27897B, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_273755 +CableClub_EventScript_NoEnigmaBerryInUnionRoom:: @ 827765A + msgbox CableClub_Text_NoEnigmaBerryInUnionRoom, MSGBOX_DEFAULT + goto EventScript_CableClub_SetVarResult0 end -OldaleTown_PokemonCenter_2F_EventScript_277668:: @ 8277668 - msgbox OldaleTown_PokemonCenter_2F_Text_2789B5, MSGBOX_DEFAULT +CableClub_EventScript_UnionRoomAdapterNotConnected:: @ 8277668 + msgbox CableClub_Text_UnionRoomAdapterNotConnected, MSGBOX_DEFAULT release return -OldaleTown_PokemonCenter_2F_EventScript_277672:: @ 8277672 +CableClub_EventScript_WirelessClubAttendant:: @ 8277672 lock faceplayer - goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335 - msgbox OldaleTown_PokemonCenter_2F_Text_279937, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27769A - msgbox OldaleTown_PokemonCenter_2F_Text_2799AA, MSGBOX_DEFAULT + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements + msgbox CableClub_Text_AskAboutLinking, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq CableClub_EventScript_DontAskAboutLinking + msgbox CableClub_Text_ExplainWirelessClub, MSGBOX_DEFAULT release return -OldaleTown_PokemonCenter_2F_EventScript_27769A:: @ 827769A - msgbox OldaleTown_PokemonCenter_2F_Text_279C91, MSGBOX_DEFAULT +CableClub_EventScript_DontAskAboutLinking:: @ 827769A + msgbox CableClub_Text_HopeYouEnjoyWirelessSystem, MSGBOX_DEFAULT release return -OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4 +CableClub_EventScript_DirectCornerAttendant:: @ 82776A4 lock faceplayer - setvar VAR_FRONTIER_FACILITY, 9 - goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335 + setvar VAR_FRONTIER_FACILITY, FACILITY_MULTI_OR_EREADER @ Set preemptively for multi battles, ignored otherwise + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements specialvar VAR_RESULT, IsBadEggInParty - compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B + compare VAR_RESULT, TRUE + goto_if_eq CableClub_EventScript_AbortLinkPlayerHasBadEgg specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276E13 - message OldaleTown_PokemonCenter_2F_Text_279013 + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_WelcomeToCableClub + message CableClub_Text_WelcomeWhichDirectCornerRoom waitmessage delay 28 - goto OldaleTown_PokemonCenter_2F_EventScript_2776E3 + goto CableClub_EventScript_DirectCornerSelectService end -OldaleTown_PokemonCenter_2F_EventScript_2776E3:: @ 82776E3 +CableClub_EventScript_DirectCornerSelectService:: @ 82776E3 checkitem ITEM_POWDER_JAR, 1 - compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27778B - goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_27773E + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_DirectCornerNoBerry + goto_if_set FLAG_VISITED_MAUVILLE_CITY, CableClub_EventScript_DirectCornerSelectAllServices multichoice 0, 0, MULTI_WIRELESS_NO_RECORD, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D - case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B - case 2, OldaleTown_PokemonCenter_2F_EventScript_2778F7 - case 3, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_WirelessTrade + case 1, CableClub_EventScript_WirelessBattleSelect + case 2, CableClub_EventScript_WirelessBerryCrush + case 3, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_27773E:: @ 827773E +CableClub_EventScript_DirectCornerSelectAllServices:: @ 827773E multichoice 0, 0, MULTI_WIRELESS_ALL_SERVICES, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D - case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B - case 2, OldaleTown_PokemonCenter_2F_EventScript_2778D9 - case 3, OldaleTown_PokemonCenter_2F_EventScript_2778F7 - case 4, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_WirelessTrade + case 1, CableClub_EventScript_WirelessBattleSelect + case 2, CableClub_EventScript_WirelessRecordMix + case 3, CableClub_EventScript_WirelessBerryCrush + case 4, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_27778B:: @ 827778B - goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_2777CB +CableClub_EventScript_DirectCornerNoBerry:: @ 827778B + goto_if_set FLAG_VISITED_MAUVILLE_CITY, CableClub_EventScript_DirectCornerHasRecordMix multichoice 0, 0, MULTI_WIRELESS_NO_RECORD_BERRY, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D - case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B - case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_WirelessTrade + case 1, CableClub_EventScript_WirelessBattleSelect + case 2, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_2777CB:: @ 82777CB +CableClub_EventScript_DirectCornerHasRecordMix:: @ 82777CB multichoice 0, 0, MULTI_WIRELESS_NO_BERRY, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D - case 1, OldaleTown_PokemonCenter_2F_EventScript_27783B - case 2, OldaleTown_PokemonCenter_2F_EventScript_2778D9 - case 3, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC - end - -OldaleTown_PokemonCenter_2F_EventScript_27780D:: @ 827780D - msgbox OldaleTown_PokemonCenter_2F_Text_27909D, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - call OldaleTown_PokemonCenter_2F_EventScript_277199 + case 0, CableClub_EventScript_WirelessTrade + case 1, CableClub_EventScript_WirelessBattleSelect + case 2, CableClub_EventScript_WirelessRecordMix + case 3, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink + end + +CableClub_EventScript_WirelessTrade:: @ 827780D + msgbox CableClub_Text_TradePokemon, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq CableClub_EventScript_AbortLink + call CableClub_EventScript_CheckPartyTradeRequirements compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink setvar VAR_0x8004, 3 - goto OldaleTown_PokemonCenter_2F_EventScript_277931 + goto CableClub_EventScript_SaveAndChooseLinkLeader end -OldaleTown_PokemonCenter_2F_EventScript_27783B:: @ 827783B - message OldaleTown_PokemonCenter_2F_Text_2790BE +CableClub_EventScript_WirelessBattleSelect:: @ 827783B + message CableClub_Text_WhichBattleMode waitmessage multichoice 0, 0, MULTI_BATTLE_MODE, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_27788E - case 1, OldaleTown_PokemonCenter_2F_EventScript_277899 - case 2, OldaleTown_PokemonCenter_2F_EventScript_2778C0 - case 3, OldaleTown_PokemonCenter_2F_EventScript_2778CB - case 4, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_WirelessSingleBattle + case 1, CableClub_EventScript_WirelessDoubleBattle + case 2, CableClub_EventScript_WirelessMultiBattle + case 3, CableClub_EventScript_WirelessBattleInfo + case 4, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_27788E:: @ 827788E +CableClub_EventScript_WirelessSingleBattle:: @ 827788E setvar VAR_0x8004, 0 - goto OldaleTown_PokemonCenter_2F_EventScript_277931 + goto CableClub_EventScript_SaveAndChooseLinkLeader end -OldaleTown_PokemonCenter_2F_EventScript_277899:: @ 8277899 +CableClub_EventScript_WirelessDoubleBattle:: @ 8277899 special HasEnoughMonsForDoubleBattle compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS - goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_2778B2 + goto_if_ne CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle setvar VAR_0x8004, 1 - goto OldaleTown_PokemonCenter_2F_EventScript_277931 + goto CableClub_EventScript_SaveAndChooseLinkLeader end -OldaleTown_PokemonCenter_2F_EventScript_2778B2:: @ 82778B2 - msgbox OldaleTown_PokemonCenter_2F_Text_277FEE, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_27783B +CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle:: @ 82778B2 + msgbox CableClub_Text_NeedTwoMonsForDoubleBattle, MSGBOX_DEFAULT + goto CableClub_EventScript_WirelessBattleSelect end -OldaleTown_PokemonCenter_2F_EventScript_2778C0:: @ 82778C0 +CableClub_EventScript_WirelessMultiBattle:: @ 82778C0 setvar VAR_0x8004, 2 - goto OldaleTown_PokemonCenter_2F_EventScript_277931 + goto CableClub_EventScript_SaveAndChooseLinkLeader end -OldaleTown_PokemonCenter_2F_EventScript_2778CB:: @ 82778CB - msgbox OldaleTown_PokemonCenter_2F_Text_279142, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_27783B +CableClub_EventScript_WirelessBattleInfo:: @ 82778CB + msgbox CableClub_Text_ExplainBattleModes, MSGBOX_DEFAULT + goto CableClub_EventScript_WirelessBattleSelect end -OldaleTown_PokemonCenter_2F_EventScript_2778D9:: @ 82778D9 - msgbox OldaleTown_PokemonCenter_2F_Text_2790E8, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC +CableClub_EventScript_WirelessRecordMix:: @ 82778D9 + msgbox CableClub_Text_AccessRecordCorner, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq CableClub_EventScript_AbortLink setvar VAR_0x8004, 12 - goto OldaleTown_PokemonCenter_2F_EventScript_277931 + goto CableClub_EventScript_SaveAndChooseLinkLeader end -OldaleTown_PokemonCenter_2F_EventScript_2778F7:: @ 82778F7 - msgbox OldaleTown_PokemonCenter_2F_Text_279114, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC +CableClub_EventScript_WirelessBerryCrush:: @ 82778F7 + msgbox CableClub_Text_UseBerryCrush, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq CableClub_EventScript_AbortLink special HasAtLeastOneBerry - compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277923 + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_NeedBerryForBerryCrush setvar VAR_0x8004, 5 - goto OldaleTown_PokemonCenter_2F_EventScript_277931 + goto CableClub_EventScript_SaveAndChooseLinkLeader end -OldaleTown_PokemonCenter_2F_EventScript_277923:: @ 8277923 - msgbox OldaleTown_PokemonCenter_2F_Text_2788FC, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_2776E3 +CableClub_EventScript_NeedBerryForBerryCrush:: @ 8277923 + msgbox CableClub_Text_NeedBerryForBerryCrush, MSGBOX_DEFAULT + goto CableClub_EventScript_DirectCornerSelectService end -OldaleTown_PokemonCenter_2F_EventScript_277931:: @ 8277931 +CableClub_EventScript_SaveAndChooseLinkLeader:: @ 8277931 call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq CableClub_EventScript_AbortLink switch VAR_0x8004 - case 3, OldaleTown_PokemonCenter_2F_EventScript_277989 - case 0, OldaleTown_PokemonCenter_2F_EventScript_277989 - case 1, OldaleTown_PokemonCenter_2F_EventScript_277989 - case 2, OldaleTown_PokemonCenter_2F_EventScript_277A16 - case 5, OldaleTown_PokemonCenter_2F_EventScript_277AA3 - case 12, OldaleTown_PokemonCenter_2F_EventScript_277AA3 + case 3, CableClub_EventScript_ChooseLinkLeaderFrom2 + case 0, CableClub_EventScript_ChooseLinkLeaderFrom2 + case 1, CableClub_EventScript_ChooseLinkLeaderFrom2 + case 2, CableClub_EventScript_ChooseLinkLeaderFrom4 + case 5, CableClub_EventScript_ChooseLinkLeader + case 12, CableClub_EventScript_ChooseLinkLeader end -OldaleTown_PokemonCenter_2F_EventScript_277989:: @ 8277989 - message OldaleTown_PokemonCenter_2F_Text_2792CD +CableClub_EventScript_ChooseLinkLeaderFrom2:: @ 8277989 + message CableClub_Text_ChooseGroupLeaderOfTwo waitmessage multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_2779EE - case 1, OldaleTown_PokemonCenter_2F_EventScript_2779C6 - case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_TryJoinGroup2Players + case 1, CableClub_EventScript_TryLeadGroup2Players + case 2, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_2779C6:: @ 82779C6 - call OldaleTown_PokemonCenter_2F_EventScript_277B30 +CableClub_EventScript_TryLeadGroup2Players:: @ 82779C6 + call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277989 + goto_if_eq CableClub_EventScript_ChooseLinkLeaderFrom2 compare VAR_RESULT, 8 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2779C6 + goto_if_eq CableClub_EventScript_TryLeadGroup2Players release return -OldaleTown_PokemonCenter_2F_EventScript_2779EE:: @ 82779EE - call OldaleTown_PokemonCenter_2F_EventScript_277B35 +CableClub_EventScript_TryJoinGroup2Players:: @ 82779EE + call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277989 + goto_if_eq CableClub_EventScript_ChooseLinkLeaderFrom2 compare VAR_RESULT, 8 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2779EE + goto_if_eq CableClub_EventScript_TryJoinGroup2Players release return -OldaleTown_PokemonCenter_2F_EventScript_277A16:: @ 8277A16 - message OldaleTown_PokemonCenter_2F_Text_279334 +CableClub_EventScript_ChooseLinkLeaderFrom4:: @ 8277A16 + message CableClub_Text_ChooseGroupLeaderOfFour waitmessage multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_277A7B - case 1, OldaleTown_PokemonCenter_2F_EventScript_277A53 - case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_TryJoinGroup4Players + case 1, CableClub_EventScript_TryLeadGroup4Players + case 2, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_277A53:: @ 8277A53 - call OldaleTown_PokemonCenter_2F_EventScript_277B30 +CableClub_EventScript_TryLeadGroup4Players:: @ 8277A53 + call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277A16 + goto_if_eq CableClub_EventScript_ChooseLinkLeaderFrom4 compare VAR_RESULT, 8 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277A53 + goto_if_eq CableClub_EventScript_TryLeadGroup4Players release return -OldaleTown_PokemonCenter_2F_EventScript_277A7B:: @ 8277A7B - call OldaleTown_PokemonCenter_2F_EventScript_277B35 +CableClub_EventScript_TryJoinGroup4Players:: @ 8277A7B + call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277A16 + goto_if_eq CableClub_EventScript_ChooseLinkLeaderFrom4 compare VAR_RESULT, 8 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277A7B + goto_if_eq CableClub_EventScript_TryJoinGroup4Players release return -OldaleTown_PokemonCenter_2F_EventScript_277AA3:: @ 8277AA3 - message OldaleTown_PokemonCenter_2F_Text_2793A3 +CableClub_EventScript_ChooseLinkLeader:: @ 8277AA3 + message CableClub_Text_ChooseGroupLeader waitmessage multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT - case 0, OldaleTown_PokemonCenter_2F_EventScript_277B08 - case 1, OldaleTown_PokemonCenter_2F_EventScript_277AE0 - case 2, OldaleTown_PokemonCenter_2F_EventScript_2772EC - case MULTI_B_PRESSED, OldaleTown_PokemonCenter_2F_EventScript_2772EC + case 0, CableClub_EventScript_TryJoinGroupXPlayers + case 1, CableClub_EventScript_TryLeadGroupXPlayers + case 2, CableClub_EventScript_AbortLink + case MULTI_B_PRESSED, CableClub_EventScript_AbortLink end -OldaleTown_PokemonCenter_2F_EventScript_277AE0:: @ 8277AE0 - call OldaleTown_PokemonCenter_2F_EventScript_277B30 +CableClub_EventScript_TryLeadGroupXPlayers:: @ 8277AE0 + call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277AA3 + goto_if_eq CableClub_EventScript_ChooseLinkLeader compare VAR_RESULT, 8 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277AE0 + goto_if_eq CableClub_EventScript_TryLeadGroupXPlayers release return -OldaleTown_PokemonCenter_2F_EventScript_277B08:: @ 8277B08 - call OldaleTown_PokemonCenter_2F_EventScript_277B35 +CableClub_EventScript_TryJoinGroupXPlayers:: @ 8277B08 + call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom compare VAR_RESULT, 5 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277AA3 + goto_if_eq CableClub_EventScript_ChooseLinkLeader compare VAR_RESULT, 8 - goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B08 + goto_if_eq CableClub_EventScript_TryJoinGroupXPlayers release return -BattleFrontier_BattleTowerLobby_EventScript_277B30:: @ 8277B30 -MossdeepCity_GameCorner_1F_EventScript_277B30:: @ 8277B30 -OldaleTown_PokemonCenter_2F_EventScript_277B30:: @ 8277B30 - special BerryBlenderLinkBecomeLeader +CableClub_EventScript_TryBecomeLinkLeader:: @ 8277B30 + special TryBecomeLinkLeader waitstate return -BattleFrontier_BattleTowerLobby_EventScript_277B35:: @ 8277B35 -MossdeepCity_GameCorner_1F_EventScript_277B35:: @ 8277B35 -OldaleTown_PokemonCenter_2F_EventScript_277B35:: @ 8277B35 - special BerryBlenderLinkJoinGroup +CableClub_EventScript_TryJoinLinkGroup:: @ 8277B35 + special TryJoinLinkGroup waitstate return -OldaleTown_PokemonCenter_2F_EventScript_277B3A:: @ 8277B3A - messageautoscroll OldaleTown_PokemonCenter_2F_Text_2781A5 +CableClub_EventScript_EnterWirelessLinkRoom:: @ 8277B3A + messageautoscroll CableClub_Text_DirectYouToYourRoom waitmessage delay 60 closemessage copyvar VAR_0x8007, VAR_LAST_TALKED - call OldaleTown_PokemonCenter_2F_EventScript_277BE4 + call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 @@ -1373,730 +1304,229 @@ OldaleTown_PokemonCenter_2F_EventScript_277B3A:: @ 8277B3A EventScript_WirelessBoxResults:: @ 8277B8A lockall - goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_27733F + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_NotReadyYet specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 - goto_if_eq EventScript_277BB4 + compare VAR_RESULT, FALSE + goto_if_eq CableClub_EventScript_AdapterNotConnected fadescreen 1 special sub_801A42C waitstate - msgbox OldaleTown_PokemonCenter_2F_Text_27874F, MSGBOX_DEFAULT + msgbox CableClub_Text_ParticipantsStepUpToCounter, MSGBOX_DEFAULT releaseall end -EventScript_277BB4:: @ 8277BB4 - msgbox OldaleTown_PokemonCenter_2F_Text_27871F, MSGBOX_DEFAULT +CableClub_EventScript_AdapterNotConnected:: @ 8277BB4 + msgbox CableClub_Text_AdapterNotConnected, MSGBOX_DEFAULT releaseall end -OldaleTown_PokemonCenter_2F_EventScript_277BBE:: @ 8277BBE +CableClub_EventScript_OpenUnionRoomBarrier:: @ 8277BBE setmetatile 5, 2, METATILE_PokemonCenter_Floor_ShadowTop_Alt, 0 setmetatile 5, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0 return -OldaleTown_PokemonCenter_2F_EventScript_277BD1:: @ 8277BD1 +CableClub_EventScript_CloseUnionRoomBarrier:: @ 8277BD1 setmetatile 5, 2, METATILE_PokemonCenter_Floor_ShadowTop, 1 setmetatile 5, 3, METATILE_PokemonCenter_CounterBarrier, 1 return -OldaleTown_PokemonCenter_2F_EventScript_277BE4:: @ 8277BE4 +CableClub_EventScript_OpenDirectCornerBarrier:: @ 8277BE4 setmetatile 9, 2, METATILE_PokemonCenter_Floor_ShadowTop_Alt, 0 setmetatile 9, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0 return -OldaleTown_PokemonCenter_2F_EventScript_277BF7:: @ 8277BF7 +CableClub_EventScript_CloseDirectCornerBarrier:: @ 8277BF7 setmetatile 9, 2, METATILE_PokemonCenter_Floor_ShadowTop, 1 setmetatile 9, 3, METATILE_PokemonCenter_CounterBarrier, 1 return -MossdeepCity_GameCorner_1F_EventScript_277C0A:: @ 8277C0A -OldaleTown_PokemonCenter_2F_EventScript_277C0A:: @ 8277C0A +EventScript_OpenMossdeepGameCornerBarrier:: @ 8277C0A setmetatile 5, 2, METATILE_MossdeepGameCorner_CounterOpen_Top, 0 setmetatile 5, 3, METATILE_MossdeepGameCorner_CounterOpen_Bottom, 0 return -OldaleTown_PokemonCenter_2F_EventScript_277C1D:: @ 8277C1D +EventScript_CloseMossdeepGameCornerBarrier:: @ 8277C1D setmetatile 5, 2, METATILE_MossdeepGameCorner_CounterClosed_Top, 1 setmetatile 5, 3, METATILE_MossdeepGameCorner_CounterClosed_Bottom, 1 return -BattleFrontier_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -DewfordTown_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -EverGrandeCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -EverGrandeCity_PokemonLeague_1F_MapScript1_277C30: @ 8277C30 -FallarborTown_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -FortreeCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -LavaridgeTown_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -LilycoveCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -MauvilleCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -MossdeepCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -OldaleTown_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -PacifidlogTown_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -PetalburgCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -RustboroCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -SlateportCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -SootopolisCity_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 -VerdanturfTown_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 - special sub_8016934 - end - -MossdeepCity_GameCorner_1F_EventScript_277C34:: @ 8277C34 +CableClub_OnResume: @ 8277C30 + special InitUnionRoom + end + +MossdeepCity_GameCorner_1F_EventScript_InfoMan2:: @ 8277C34 lock faceplayer - message MossdeepCity_GameCorner_1F_Text_278A7D + message MossdeepCity_GameCorner_1F_Text_DescribeWhichGame waitmessage multichoice 0, 0, MULTI_WIRELESS_MINIGAME, 0 switch VAR_RESULT - case 0, MossdeepCity_GameCorner_1F_EventScript_277C73 - case 1, MossdeepCity_GameCorner_1F_EventScript_277C7D - case 2, MossdeepCity_GameCorner_1F_EventScript_277C87 - case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_277C87 + case 0, MossdeepCity_GameCorner_1F_EventScript_PokemonJumpInfo + case 1, MossdeepCity_GameCorner_1F_EventScript_DodrioBerryPickingInfo + case 2, MossdeepCity_GameCorner_1F_EventScript_MinigameInfoExit + case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_MinigameInfoExit end -MossdeepCity_GameCorner_1F_EventScript_277C73:: @ 8277C73 - msgbox MossdeepCity_GameCorner_1F_Text_278ACB, MSGBOX_DEFAULT +MossdeepCity_GameCorner_1F_EventScript_PokemonJumpInfo:: @ 8277C73 + msgbox MossdeepCity_GameCorner_1F_Text_PokemonJumpInfo, MSGBOX_DEFAULT release end -MossdeepCity_GameCorner_1F_EventScript_277C7D:: @ 8277C7D - msgbox MossdeepCity_GameCorner_1F_Text_278BF1, MSGBOX_DEFAULT +MossdeepCity_GameCorner_1F_EventScript_DodrioBerryPickingInfo:: @ 8277C7D + msgbox MossdeepCity_GameCorner_1F_Text_DodrioBerryPickingInfo, MSGBOX_DEFAULT release end -MossdeepCity_GameCorner_1F_EventScript_277C87:: @ 8277C87 - msgbox MossdeepCity_GameCorner_1F_Text_278CAC, MSGBOX_DEFAULT +MossdeepCity_GameCorner_1F_EventScript_MinigameInfoExit:: @ 8277C87 + msgbox MossdeepCity_GameCorner_1F_Text_TalkToOldManToPlay, MSGBOX_DEFAULT release end -MossdeepCity_GameCorner_1F_EventScript_277C91:: @ 8277C91 +MossdeepCity_GameCorner_1F_EventScript_OldMan2:: @ 8277C91 lock faceplayer - message MossdeepCity_GameCorner_1F_Text_278CEB + message MossdeepCity_GameCorner_1F_Text_WelcomeCanYouWait waitmessage specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E48 + compare VAR_RESULT, FALSE + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AdapterNotConnected delay 60 - message MossdeepCity_GameCorner_1F_Text_278DAD + message MossdeepCity_GameCorner_1F_Text_PlayWhichGame waitmessage multichoice 0, 0, MULTI_WIRELESS_MINIGAME, 0 switch VAR_RESULT - case 0, MossdeepCity_GameCorner_1F_EventScript_277CE9 - case 1, MossdeepCity_GameCorner_1F_EventScript_277D35 - case 2, MossdeepCity_GameCorner_1F_EventScript_2772F9 - case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_2772F9 + case 0, MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump + case 1, MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking + case 2, MossdeepCity_GameCorner_1F_EventScript_AbortMinigame + case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_AbortMinigame end -MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9 +MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump:: @ 8277CE9 setvar VAR_0x8005, 0 - special sub_802C920 - compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E55 - msgbox MossdeepCity_GameCorner_1F_Text_278DD9, MSGBOX_DEFAULT + special IsPokemonJumpSpeciesInParty + compare VAR_RESULT, FALSE + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon + msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8005, 0 - special sub_81B8958 + special ChooseMonForWirelessMinigame waitstate - compare VAR_0x8004, 6 - goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9 + compare VAR_0x8004, PARTY_SIZE + goto_if_ge MossdeepCity_GameCorner_1F_EventScript_AbortMinigame call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AbortMinigame setvar VAR_0x8004, 4 - goto MossdeepCity_GameCorner_1F_EventScript_277D81 + goto MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader end -MossdeepCity_GameCorner_1F_EventScript_277D35:: @ 8277D35 +MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking:: @ 8277D35 setvar VAR_0x8005, 1 - special sub_8027A5C - compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E55 - msgbox MossdeepCity_GameCorner_1F_Text_278DD9, MSGBOX_DEFAULT + special IsDodrioInParty + compare VAR_RESULT, FALSE + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon + msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8005, 1 - special sub_81B8958 + special ChooseMonForWirelessMinigame waitstate - compare VAR_0x8004, 6 - goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9 + compare VAR_0x8004, PARTY_SIZE + goto_if_ge MossdeepCity_GameCorner_1F_EventScript_AbortMinigame call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AbortMinigame setvar VAR_0x8004, 6 - goto MossdeepCity_GameCorner_1F_EventScript_277D81 + goto MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader end -MossdeepCity_GameCorner_1F_EventScript_277D81:: @ 8277D81 - message MossdeepCity_GameCorner_1F_Text_2793A3 +MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader:: @ 8277D81 + message CableClub_Text_ChooseGroupLeader waitmessage multichoice 16, 6, MULTI_LINK_LEADER, 0 switch VAR_RESULT - case 0, MossdeepCity_GameCorner_1F_EventScript_277DE6 - case 1, MossdeepCity_GameCorner_1F_EventScript_277DBE - case 2, MossdeepCity_GameCorner_1F_EventScript_2772F9 - case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_2772F9 + case 0, MossdeepCity_GameCorner_1F_EventScript_TryJoinLinkGroup + case 1, MossdeepCity_GameCorner_1F_EventScript_TryBecomeLinkLeader + case 2, MossdeepCity_GameCorner_1F_EventScript_AbortMinigame + case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_AbortMinigame end -MossdeepCity_GameCorner_1F_EventScript_277DBE:: @ 8277DBE - call MossdeepCity_GameCorner_1F_EventScript_277B30 +MossdeepCity_GameCorner_1F_EventScript_TryBecomeLinkLeader:: @ 8277DBE + call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E0E + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom compare VAR_RESULT, 5 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277D81 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader compare VAR_RESULT, 8 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277DBE + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_TryBecomeLinkLeader release return -MossdeepCity_GameCorner_1F_EventScript_277DE6:: @ 8277DE6 - call MossdeepCity_GameCorner_1F_EventScript_277B35 +MossdeepCity_GameCorner_1F_EventScript_TryJoinLinkGroup:: @ 8277DE6 + call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E0E + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom compare VAR_RESULT, 5 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277D81 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader compare VAR_RESULT, 8 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277DE6 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_TryJoinLinkGroup release return -MossdeepCity_GameCorner_1F_EventScript_277E0E:: @ 8277E0E - messageautoscroll MossdeepCity_GameCorner_1F_Text_278E00 +MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom:: @ 8277E0E + messageautoscroll MossdeepCity_GameCorner_1F_Text_AllGoodToGo waitmessage delay 60 closemessage copyvar VAR_0x8007, VAR_LAST_TALKED - call MossdeepCity_GameCorner_1F_EventScript_277C0A + call EventScript_OpenMossdeepGameCornerBarrier special DrawWholeMapView playse SE_TK_KASYA delay 60 - applymovement VAR_LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_27734D + applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_GameCorner_1F_Movement_277360 + applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterMinigameRoom waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY release waitstate end -MossdeepCity_GameCorner_1F_EventScript_277E48:: @ 8277E48 +MossdeepCity_GameCorner_1F_EventScript_AdapterNotConnected:: @ 8277E48 delay 60 - msgbox MossdeepCity_GameCorner_1F_Text_278D68, MSGBOX_DEFAULT + msgbox MossdeepCity_GameCorner_1F_Text_AdapterNotConnected, MSGBOX_DEFAULT release end -MossdeepCity_GameCorner_1F_EventScript_277E55:: @ 8277E55 - msgbox MossdeepCity_GameCorner_1F_Text_278E60, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 +MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon:: @ 8277E55 + msgbox MossdeepCity_GameCorner_1F_Text_ExplainRequiredMon, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AbortMinigame compare VAR_0x8005, 0 - call_if_eq MossdeepCity_GameCorner_1F_EventScript_277E84 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_ExplainPokemonJumpRequirements compare VAR_0x8005, 1 - call_if_eq MossdeepCity_GameCorner_1F_EventScript_277E8D - goto MossdeepCity_GameCorner_1F_EventScript_2772F9 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_ExplainDodrioBerryPickingRequirements + goto MossdeepCity_GameCorner_1F_EventScript_AbortMinigame end -MossdeepCity_GameCorner_1F_EventScript_277E84:: @ 8277E84 - msgbox MossdeepCity_GameCorner_1F_Text_278EDC, MSGBOX_DEFAULT +MossdeepCity_GameCorner_1F_EventScript_ExplainPokemonJumpRequirements:: @ 8277E84 + msgbox MossdeepCity_GameCorner_1F_Text_ShortJumpingPokemonAllowed, MSGBOX_DEFAULT return -MossdeepCity_GameCorner_1F_EventScript_277E8D:: @ 8277E8D - msgbox MossdeepCity_GameCorner_1F_Text_278FA4, MSGBOX_DEFAULT +MossdeepCity_GameCorner_1F_EventScript_ExplainDodrioBerryPickingRequirements:: @ 8277E8D + msgbox MossdeepCity_GameCorner_1F_Text_OnlyDodrioAllowed, MSGBOX_DEFAULT return -MossdeepCity_GameCorner_1F_EventScript_277E96:: @ 8277E96 +MossdeepCity_GameCorner_1F_EventScript_PokemonJumpRecords:: @ 8277E96 lockall - special sub_802E3C4 + special ShowPokemonJumpRecords waitstate releaseall end -MossdeepCity_GameCorner_1F_EventScript_277E9D:: @ 8277E9D +MossdeepCity_GameCorner_1F_EventScript_DodrioBerryPickingRecords:: @ 8277E9D lockall - special sub_8027AAC + special ShowDodrioBerryPickingRecords waitstate releaseall end -OldaleTown_PokemonCenter_2F_Text_277EA4: @ 8277EA4 - .string "Welcome to the POKéMON CABLE\n" - .string "CLUB.\p" - .string "Which of our services do you wish\n" - .string "to use?$" - -OldaleTown_PokemonCenter_2F_Text_277EF1: @ 8277EF1 - .string "Which of our services do you wish\n" - .string "to use?$" - -CableClub_Text_TradeUsingLinkCable:: @ 8277F1B - .string "Trade POKéMON with another player\n" - .string "using a GBA Game Link cable.$" - -CableClub_Text_BattleUsingLinkCable:: @ 8277F5A - .string "You may battle another TRAINER\n" - .string "using a GBA Game Link cable.$" - -CableClub_Text_RecordCornerUsingLinkCable:: @ 8277F96 - .string "You can use the RECORD CORNER with\n" - .string "others using a GBA Game Link cable.$" - -OldaleTown_PokemonCenter_2F_Text_277FDD: @ 8277FDD - .string "Close this menu.$" - -OldaleTown_PokemonCenter_2F_Text_277FEE: @ 8277FEE - .string "For a DOUBLE BATTLE, you must\n" - .string "have at least two POKéMON.$" - -OldaleTown_PokemonCenter_2F_Text_278027: @ 8278027 - .string "For trading, you must have at\n" - .string "least two POKéMON with you.$" - -OldaleTown_PokemonCenter_2F_Text_278061: @ 8278061 - .string "A POKéMON holding the {STR_VAR_1}\n" - .string "BERRY can't be traded.$" - -gText_PleaseWaitForLink:: @ 8278091 - .string "Please wait.\n" - .string "… … B Button: Cancel$" - -gText_ConfirmLinkWhenPlayersReady:: @ 82780B3 - .string "When all players are ready…\n" - .string "A Button: Confirm\l" - .string "B Button: Cancel$" - -gText_ConfirmStartLinkWithXPlayers:: @ 82780F2 - .string "Start link with {STR_VAR_1} players.\n" - .string "A Button: Confirm\l" - .string "B Button: Cancel$" - -gText_AwaitingLinkup:: @ 8278131 - .string "Awaiting linkup…\n" - .string "… … B Button: Cancel$" - -OldaleTown_PokemonCenter_2F_Text_278157:: @ 8278157 - .string "Your progress must be saved before\n" - .string "linking. Is it okay to save?$" - -OldaleTown_PokemonCenter_2F_Text_278197: @ 8278197 - .string "Please enter.$" - -OldaleTown_PokemonCenter_2F_Text_2781A5: @ 82781A5 - .string "I'll direct you to your room now.$" - -LilycoveCity_ContestLobby_Text_2781C7: @ 82781C7 -OldaleTown_PokemonCenter_2F_Text_2781C7: @ 82781C7 - .string "Someone is not ready to link.\p" - .string "Please come back after everyone\n" - .string "has made preparations.$" - -LilycoveCity_ContestLobby_Text_27821C: @ 827821C -OldaleTown_PokemonCenter_2F_Text_27821C: @ 827821C - .string "Sorry, we have a link error…\n" - .string "Please reset and try again.$" - -BattleFrontier_BattleTowerLobby_Text_278255: @ 8278255 -LilycoveCity_ContestLobby_Text_278255: @ 8278255 -OldaleTown_PokemonCenter_2F_Text_278255: @ 8278255 - .string "The link partners appear to have\n" - .string "made different selections.$" - -OldaleTown_PokemonCenter_2F_Text_278291: @ 8278291 - .string "Please do visit again.$" - -BattleFrontier_BattleTowerLobby_Text_2782A8: @ 82782A8 -OldaleTown_PokemonCenter_2F_Text_2782A8: @ 82782A8 - .string "The number of participants is\n" - .string "incorrect.$" - -OldaleTown_PokemonCenter_2F_Text_2782D1: @ 82782D1 - .string "The SINGLE BATTLE Mode can't be\n" - .string "played by {STR_VAR_1} players.$" - -OldaleTown_PokemonCenter_2F_Text_278307: @ 8278307 - .string "The DOUBLE BATTLE Mode can't be\n" - .string "played by {STR_VAR_1} players.$" - -OldaleTown_PokemonCenter_2F_Text_27833D: @ 827833D - .string "There must be four players to play\n" - .string "this Battle Mode.$" - -OldaleTown_PokemonCenter_2F_Text_278372: @ 8278372 - .string "Please confirm the number of\n" - .string "players and start again.$" - -Text_TerminateLinkConfirmation: @ 82783A8 - .string "The link will be terminated if you\n" - .string "leave the room. Is that okay?$" - -Text_TerminateLinkPleaseWait: @ 82783E9 - .string "Terminating link…\n" - .string "You will be escorted out of\l" - .string "the room. Please wait.$" - -Text_27842E: @ 827842E - .string "This TRAINER is too busy to\n" - .string "notice…$" - -Text_278452: @ 8278452 - .string "Score! Got to look at {STR_VAR_1}'s\n" - .string "TRAINER CARD!$" - -Text_27847B: @ 827847B - .string "Score! Got to look at {STR_VAR_1}'s\n" - .string "TRAINER CARD!\p" - .string "It's a {STR_VAR_2} card!$" - -SingleBattleColosseum_Text_2784B4: @ 82784B4 - .string "Please take your place and start\n" - .string "your battle.$" - -TradeCenter_Text_2784E2: @ 82784E2 - .string "Please take your seat and start\n" - .string "your trade.$" - -RecordCorner_Text_27850E: @ 827850E - .string "Thanks for coming.$" - -OldaleTown_PokemonCenter_2F_Text_278521: @ 8278521 - .string "The TRAINER CARD data will\n" - .string "be overwritten.$" - -OldaleTown_PokemonCenter_2F_Text_27854C: @ 827854C - .string "I hope to see you again!$" - -OldaleTown_PokemonCenter_2F_Text_278565: @ 8278565 - .string "I'm awfully sorry.\p" - .string "We're not set up to conduct trades\n" - .string "with TRAINERS far away in another\l" - .string "region yet…$" - -OldaleTown_PokemonCenter_2F_Text_2785C9: @ 82785C9 - .string "The other TRAINER is not ready.$" - -OldaleTown_PokemonCenter_2F_Text_2785E9: @ 82785E9 - .string "You have at least one POKéMON\n" - .string "that can't be taken.$" - -RecordCorner_Text_27861C: @ 827861C - .string "Please take your seat and wait.$" - -RecordCorner_Text_27863C: @ 827863C - .string "{STR_VAR_1} sent over one\n" - .string "{STR_VAR_2}.$" - -OldaleTown_PokemonCenter_2F_Text_278651: @ 8278651 - .string "Sorry, there is a transmission error.\p" - .string "You may not mix records with \n" - .string "Japanese Ruby or Sapphire games.\p" - .string "Also, you can't mix records with\n" - .string "Japanese Emerald and overseas Ruby\l" - .string "or Sapphire games at the same time.$" - -OldaleTown_PokemonCenter_2F_Text_27871F: @ 827871F - .string "The Wireless Adapter is not\n" - .string "connected properly.$" - -OldaleTown_PokemonCenter_2F_Text_27874F: @ 827874F - .string "Participants are asked to step up\n" - .string "to the reception counter.$" - -OldaleTown_PokemonCenter_2F_Text_27878B: @ 827878B - .string "Hello!$" - -OldaleTown_PokemonCenter_2F_Text_278792: @ 8278792 - .string "Please wait.$" - -CableClub_Text_YouMayTradeHere:: @ 827879F - .string "You may trade your POKéMON here\n" - .string "with another TRAINER.$" - -CableClub_Text_YouMayBattleHere:: @ 82787D5 - .string "You may battle with your friends\n" - .string "here.$" - -CableClub_Text_CanMakeBerryPowder:: @ 82787FC - .string "Two to five TRAINERS can make\n" - .string "BERRY POWDER together.$" - -CableClub_Text_CanMixRecords:: @ 8278831 - .string "The records of two to four players\n" - .string "can be mixed together.$" - -OldaleTown_PokemonCenter_2F_Text_27886B: @ 827886B - .string "A guide to the WIRELESS CLUB's\n" - .string "various services.$" - -CableClub_Text_CancelSelectedItem:: @ 827889C - .string "Cancels the selected MENU item.$" - -OldaleTown_PokemonCenter_2F_Text_2788BC: @ 82788BC - .string "Which battle mode would you like?$" - -OldaleTown_PokemonCenter_2F_Text_2788DE: @ 82788DE - .string "Returns to the previous step.$" - -OldaleTown_PokemonCenter_2F_Text_2788FC: @ 82788FC - .string "To use the BERRY CRUSH service,\n" - .string "you must have at least one BERRY.$" - -OldaleTown_PokemonCenter_2F_Text_27893E: @ 827893E - .string "To enter the UNION ROOM, you must\n" - .string "have at least two POKéMON.$" - -OldaleTown_PokemonCenter_2F_Text_27897B: @ 827897B - .string "No POKéMON holding the {STR_VAR_1}\n" - .string "BERRY may enter the UNION ROOM.$" - -OldaleTown_PokemonCenter_2F_Text_2789B5: @ 82789B5 - .string "This is the POKéMON WIRELESS CLUB\n" - .string "UNION ROOM.\p" - .string "Unfortunately, your Wireless\n" - .string "Adapter is not connected properly.\p" - .string "Please do come again.$" - -OldaleTown_PokemonCenter_2F_Text_278A39: @ 8278A39 - .string "Oh…\n" - .string "Excuse me!$" - -OldaleTown_PokemonCenter_1F_Text_278A48: @ 8278A48 - .string "It appears as if {STR_VAR_1} is playing\n" - .string "right now.\l" - .string "Go for it!$" - -MossdeepCity_GameCorner_1F_Text_278A7D: @ 8278A7D - .string "I can explain game rules to you,\n" - .string "if you'd like.\p" - .string "Which game should I describe?$" - -MossdeepCity_GameCorner_1F_Text_278ACB: @ 8278ACB - .string "“POKéMON JUMP”\p" - .string "Make your POKéMON skip the VINE WHIP\n" - .string "rope with the A Button.\p" - .string "Only mini POKéMON around 28 inches\n" - .string "or less may participate.\p" - .string "POKéMON that only swim, burrow,\n" - .string "or fly are not good at jumping.\p" - .string "As a result, those POKéMON may not\n" - .string "participate.\p" - .string "Good things happen if everyone\n" - .string "jumps in time.$" - -MossdeepCity_GameCorner_1F_Text_278BF1: @ 8278BF1 - .string "“DODRIO BERRY-PICKING”\p" - .string "Command DODRIO's three heads to\n" - .string "catch falling BERRIES.\p" - .string "Press right, up, or left on the\n" - .string "{PLUS} Control Pad to move the heads.\p" - .string "To play this game, you must have\n" - .string "a DODRIO.$" - -MossdeepCity_GameCorner_1F_Text_278CAC: @ 8278CAC - .string "If you want to play a game,\n" - .string "please tell the old man beside me.$" - -MossdeepCity_GameCorner_1F_Text_278CEB: @ 8278CEB - .string "Hi, welcome!\n" - .string "Are you here to play games using\l" - .string "Wireless Communication?\p" - .string "Can you wait just a little bit?$" - -MossdeepCity_GameCorner_1F_Text_278D51: @ 8278D51 - .string "All right, come again!$" - -MossdeepCity_GameCorner_1F_Text_278D68: @ 8278D68 - .string "The Wireless Adapter isn't connected.\n" - .string "Come back when it's hooked up!$" - -MossdeepCity_GameCorner_1F_Text_278DAD: @ 8278DAD - .string "All right, which game did you want\n" - .string "to play?$" - -MossdeepCity_GameCorner_1F_Text_278DD9: @ 8278DD9 - .string "Which POKéMON would you like to\n" - .string "enter?$" - -MossdeepCity_GameCorner_1F_Text_278E00: @ 8278E00 - .string "Okay, you're all good to go.\n" - .string "Don't let the others beat you!$" - -MossdeepCity_GameCorner_1F_Text_278E3C: @ 8278E3C - .string "Are you leaving now?\n" - .string "Do come again!$" - -MossdeepCity_GameCorner_1F_Text_278E60: @ 8278E60 - .string "It doesn't look like you have any\n" - .string "POKéMON that you can enter…\p" - .string "Would you like me to explain what\n" - .string "kinds of POKéMON can enter?$" - -MossdeepCity_GameCorner_1F_Text_278EDC: @ 8278EDC - .string "“POKéMON JUMP” is open to POKéMON\n" - .string "around 28 inches or less.\p" - .string "What you can't enter are those\n" - .string "POKéMON that can't jump.\p" - .string "You know, like POKéMON that only\n" - .string "swim, burrow, or fly.\p" - .string "That's all you need to know.$" - -MossdeepCity_GameCorner_1F_Text_278FA4: @ 8278FA4 - .string "DODRIO BERRY-PICKING is a game that \n" - .string "only DODRIO may enter.$" - -MossdeepCity_GameCorner_1F_Text_278FE0: @ 8278FE0 - .string "Could you retry this from the start\n" - .string "again, please?$" - -OldaleTown_PokemonCenter_2F_Text_279013: @ 8279013 - .string "Welcome to the POKéMON WIRELESS\n" - .string "CLUB DIRECT CORNER.\p" - .string "You may interact directly with\n" - .string "your friends here.\p" - .string "Which room would you like to\n" - .string "enter?$" - -OldaleTown_PokemonCenter_2F_Text_27909D: @ 827909D - .string "Would you like to trade POKéMON?$" - -OldaleTown_PokemonCenter_2F_Text_2790BE: @ 82790BE - .string "Which Battle Mode would you like\n" - .string "to play?$" - -OldaleTown_PokemonCenter_2F_Text_2790E8: @ 82790E8 - .string "Would you like to access\n" - .string "the RECORD CORNER?$" - -OldaleTown_PokemonCenter_2F_Text_279114: @ 8279114 - .string "Would you like to use the\n" - .string "BERRY CRUSH System?$" - -OldaleTown_PokemonCenter_2F_Text_279142: @ 8279142 - .string "There are three Battle Modes.\p" - .string "SINGLE BATTLE is for two TRAINERS\n" - .string "with one or more POKéMON each.\p" - .string "Each TRAINER can have one POKéMON\n" - .string "in battle at a time.\p" - .string "DOUBLE BATTLE is for two TRAINERS\n" - .string "with two or more POKéMON each.\p" - .string "Each TRAINER will send out two\n" - .string "POKéMON in battle at a time.\p" - .string "MULTI BATTLE is for four TRAINERS\n" - .string "with one or more POKéMON each.\p" - .string "Each TRAINER can have one POKéMON\n" - .string "in battle at a time.$" - -BattleFrontier_BattleTowerLobby_Text_2792CD: @ 82792CD -OldaleTown_PokemonCenter_2F_Text_2792CD: @ 82792CD - .string "Please decide which of you two\n" - .string "will become the LEADER.\p" - .string "The other player must then choose\n" - .string "“JOIN GROUP.”$" - -OldaleTown_PokemonCenter_2F_Text_279334: @ 8279334 - .string "Please decide which of you four\n" - .string "will become the GROUP LEADER.\p" - .string "The other players must then choose\n" - .string "“JOIN GROUP.”$" - -MossdeepCity_GameCorner_1F_Text_2793A3: @ 82793A3 -OldaleTown_PokemonCenter_2F_Text_2793A3: @ 82793A3 - .string "Please decide which of you will\n" - .string "become the GROUP LEADER.\p" - .string "The other players must then choose\n" - .string "“JOIN GROUP.”$" - -OldaleTown_PokemonCenter_2F_Text_27940D: @ 827940D - .string "Welcome to the POKéMON WIRELESS\n" - .string "CLUB UNION ROOM.\p" - .string "You may interact directly with\n" - .string "other TRAINERS here, some of\l" - .string "whom you may not even know.\p" - .string "Would you like to enter the ROOM?$" - -OldaleTown_PokemonCenter_2F_Text_2794B8: @ 82794B8 - .string "The TRAINERS in the UNION ROOM\n" - .string "will be those players around you\l" - .string "who have also entered the ROOM.\p" - .string "You may do all sorts of things\n" - .string "here, such as exchanging greetings.\p" - .string "You may enter two POKéMON up to\n" - .string "Lv. 30 for a one-on-one battle.\p" - .string "You may take part in a chat with\n" - .string "two to five people.\p" - .string "Or, you may register a POKéMON for\n" - .string "trade.\p" - .string "Would you like to enter the ROOM?$" - -OldaleTown_PokemonCenter_2F_Text_27961C: @ 827961C - .string "I hope you enjoy your time in\n" - .string "the UNION ROOM.$" - -OldaleTown_PokemonCenter_2F_Text_27964A: @ 827964A - .string "Hello!\n" - .string "My name is TEALA.\p" - .string "This must be your first time\n" - .string "up here.\p" - .string "I'll show you how the Wireless\n" - .string "Communication System works.\p" - .string "First, I need to show you this\n" - .string "floor of our POKéMON CENTER.\p" - .string "Right this way, please.$" - -OldaleTown_PokemonCenter_2F_Text_279718: @ 8279718 - .string "On the top floor, there are two\n" - .string "rooms.\p" - .string "First, the room on the left.\n" - .string "It's the UNION ROOM.\p" - .string "You may link up with TRAINERS\n" - .string "around you who have also entered\l" - .string "the UNION ROOM.\p" - .string "With them, you may do things like\n" - .string "chat, battle, and trade.\p" - .string "Second, the room on the right is\n" - .string "the DIRECT CORNER.\p" - .string "You may trade or battle POKéMON\n" - .string "with your friends in this room.\p" - .string "If the Wireless Adapter isn't\n" - .string "connected, you may still link up\l" - .string "using a GBA Game Link cable.\p" - .string "If that is the case, you must go\n" - .string "to the DIRECT CORNER.\p" - .string "I hope you enjoy the Wireless \n" - .string "Communication System.$" - -OldaleTown_PokemonCenter_2F_Text_279937: @ 8279937 - .string "Hello, {PLAYER}!\p" - .string "It's me, TEALA, the POKéMON\n" - .string "CENTER 2F attendant.\p" - .string "Is there something you needed to\n" - .string "ask me about linking?$" - -OldaleTown_PokemonCenter_2F_Text_2799AA: @ 82799AA - .string "Let me explain how the POKéMON\n" - .string "WIRELESS CLUB works.\p" - .string "On this, the top floor, there are\n" - .string "two rooms.\p" - .string "First, the room on the left.\n" - .string "It's the UNION ROOM.\p" - .string "You may link up with TRAINERS\n" - .string "around you who have also entered\l" - .string "the UNION ROOM.\p" - .string "With them, you may do things like\n" - .string "chat, battle, and trade.\p" - .string "Second, the room on the right is\n" - .string "the DIRECT CORNER.\p" - .string "You may trade or battle POKéMON\n" - .string "with your friends in this room.\p" - .string "Sometimes, you may not be able to\n" - .string "find your friends in the UNION ROOM\l" - .string "or the DIRECT CORNER.\p" - .string "In that case, please move closer\n" - .string "to your friends.\p" - .string "If the Wireless Adapter isn't\n" - .string "connected, you may still link up\l" - .string "using a GBA Game Link cable.\p" - .string "If that is the case, you must go\n" - .string "to the DIRECT CORNER.\p" - .string "I hope you enjoy the Wireless \n" - .string "Communication System.$" - -OldaleTown_PokemonCenter_2F_Text_279C91: @ 8279C91 - .string "I hope you enjoy the Wireless\n" - .string "Communication System.$" diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc new file mode 100644 index 000000000..7f0dd5534 --- /dev/null +++ b/data/scripts/cave_hole.inc @@ -0,0 +1,33 @@ +CaveHole_CheckFallDownHole: @ 82A8327 + map_script_2 VAR_ICE_STEP_COUNT, 0, EventScript_FallDownHole + .2byte 0 + +CaveHole_FixCrackedGround: @ 82A8331 + copyvar VAR_ICE_STEP_COUNT, 1 + end + +EventScript_FallDownHole:: @ 82A8337 + lockall + delay 20 + applymovement EVENT_OBJ_ID_PLAYER, Movement_SetInvisible + waitmovement 0 + playse SE_RU_HYUU + delay 60 + warphole MAP_UNDEFINED + waitstate + end + +EventScript_FallDownHoleMtPyre:: @ 82A8350 + lockall + delay 20 + applymovement EVENT_OBJ_ID_PLAYER, Movement_SetInvisible + waitmovement 0 + playse SE_RU_HYUU + delay 60 + special DoFallWarp + waitstate + end + +Movement_SetInvisible: @ 82A8369 + set_invisible + step_end diff --git a/data/scripts/cave_of_origin.inc b/data/scripts/cave_of_origin.inc new file mode 100644 index 000000000..52a1da84f --- /dev/null +++ b/data/scripts/cave_of_origin.inc @@ -0,0 +1,45 @@ +@ All unused / leftover scripts from RS +CaveOfOrigin_EventScript_LegendaryCry:: @ 8272274 + lockall + waitse + playmoncry SPECIES_KYOGRE, 2 @ SPECIES_GROUDON in Ruby + waitmoncry + setvar VAR_TEMP_5, 1 + releaseall + end + +CaveOfOrigin_EventScript_Shake1:: @ 8272283 + lockall + setvar VAR_TEMP_1, 1 + goto CaveOfOrigin_EventScript_Shake + end + +CaveOfOrigin_EventScript_Shake2:: @ 827228F + lockall + setvar VAR_TEMP_2, 1 + goto CaveOfOrigin_EventScript_Shake + end + +CaveOfOrigin_EventScript_Shake3:: @ 827229B + lockall + setvar VAR_TEMP_3, 1 + goto CaveOfOrigin_EventScript_Shake + end + +CaveOfOrigin_EventScript_Shake:: @ 82722A7 + setvar VAR_0x8004, 1 @ vertical pan + setvar VAR_0x8005, 1 @ horizontal pan + setvar VAR_0x8006, 8 @ num shakes + setvar VAR_0x8007, 5 @ shake delay + special ShakeCamera + waitstate + releaseall + end + +CaveOfOrigin_EventScript_SetTempVars:: @ 82722C1 + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_2, 1 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_4, 1 + setvar VAR_TEMP_5, 1 + return diff --git a/data/scripts/check_furniture.inc b/data/scripts/check_furniture.inc new file mode 100644 index 000000000..0a952f3c3 --- /dev/null +++ b/data/scripts/check_furniture.inc @@ -0,0 +1,27 @@ +EventScript_PictureBookShelf:: @ 82725CE + msgbox Text_PictureBookShelf, MSGBOX_SIGN + end + +EventScript_BookShelf:: @ 82725D7 + msgbox Text_BookShelf, MSGBOX_SIGN + end + +EventScript_PokemonCenterBookShelf:: @ 82725E0 + msgbox Text_PokemonCenterBookShelf, MSGBOX_SIGN + end + +EventScript_Vase:: @ 82725E9 + msgbox Text_Vase, MSGBOX_SIGN + end + +EventScript_EmptyTrashCan:: @ 82725F2 + msgbox Text_EmptyTrashCan, MSGBOX_SIGN + end + +EventScript_ShopShelf:: @ 82725FB + msgbox Text_ShopShelf, MSGBOX_SIGN + end + +EventScript_Blueprint:: @ 8272604 + msgbox Text_Blueprint, MSGBOX_SIGN + end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 03863eb40..857c1e205 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -154,15 +154,15 @@ LilycoveCity_ContestLobby_EventScript_279F12:: @ 8279F12 LilycoveCity_ContestLobby_EventScript_279F21:: @ 8279F21 msgbox LilycoveCity_ContestLobby_Text_27B5C4, MSGBOX_YESNO switch VAR_RESULT - case 0, LilycoveCity_ContestLobby_EventScript_279E13 - case 1, LilycoveCity_ContestLobby_EventScript_279F87 + case NO, LilycoveCity_ContestLobby_EventScript_279E13 + case YES, LilycoveCity_ContestLobby_EventScript_279F87 end LilycoveCity_ContestLobby_EventScript_279F45:: @ 8279F45 msgbox LilycoveCity_ContestLobby_Text_27B547, MSGBOX_YESNO switch VAR_RESULT - case 0, LilycoveCity_ContestLobby_EventScript_279E13 - case 1, LilycoveCity_ContestLobby_EventScript_279F87 + case NO, LilycoveCity_ContestLobby_EventScript_279E13 + case YES, LilycoveCity_ContestLobby_EventScript_279F87 end LilycoveCity_ContestLobby_EventScript_279F69:: @ 8279F69 @@ -1232,7 +1232,7 @@ LinkContestRoom1_EventScript_27ACBD:: @ 827ACBD LinkContestRoom1_EventScript_27ACDF:: @ 827ACDF special sub_80F7FFC - incrementgamestat 42 + incrementgamestat GAME_STAT_RECEIVED_RIBBONS setflag FLAG_SYS_RIBBON_GET lockall msgbox LinkContestRoom1_Text_27BBD4, MSGBOX_DEFAULT diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 062fd9f5a..b4c23a694 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -15,10 +15,10 @@ Route117_EventScript_DaycareMan:: @ 8291C18 Route117_EventScript_DaycareEggWaiting:: @ 8291C4D msgbox Route117_Text_DoYouWantEgg, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route117_EventScript_DaycareAcceptEgg msgbox Route117_Text_IWillKeepDoYouWantIt, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route117_EventScript_DaycareAcceptEgg msgbox Route117_Text_IllKeepIt, MSGBOX_DEFAULT clearflag FLAG_PENDING_DAYCARE_EGG @@ -88,7 +88,7 @@ Route117_PokemonDayCare_EventScript_DaycareWoman:: @ 8291D11 compare VAR_RESULT, DAYCARE_TWO_MONS goto_if_eq Route117_PokemonDayCare_EventScript_TwoMonsInDaycare msgbox Route117_PokemonDayCare_Text_WouldYouLikeUsToRaiseAMon, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise msgbox Route117_PokemonDayCare_Text_292416, MSGBOX_DEFAULT release @@ -130,7 +130,7 @@ Route117_PokemonDayCare_EventScript_ComeAgain:: @ 8291DCA Route117_PokemonDayCare_EventScript_CanRaiseOneMore:: @ 8291DD4 msgbox Route117_PokemonDayCare_Text_WeCanRaiseOneMore, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise goto Route117_PokemonDayCare_EventScript_ComeAgain end @@ -170,10 +170,10 @@ Route117_PokemonDayCare_EventScript_OneMonInDaycare:: @ 8291E2F setvar VAR_0x8004, 0 call Route117_PokemonDayCare_EventScript_DisplayLevelsGained msgbox Route117_PokemonDayCare_Text_WeCanRaiseOneMore, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise msgbox Route117_PokemonDayCare_Text_TakeYourMonBack, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_TryRetrieveMon goto Route117_PokemonDayCare_EventScript_ComeAgain end @@ -197,7 +197,7 @@ Route117_PokemonDayCare_EventScript_TryRetrieveMon:: @ 8291E6D Route117_PokemonDayCare_EventScript_CostPrompt:: @ 8291EAC special GetDaycareCost msgbox Route117_PokemonDayCare_Text_ItWillCostX, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_CheckEnoughMoney goto Route117_PokemonDayCare_EventScript_ComeAgain end @@ -229,7 +229,7 @@ Route117_PokemonDayCare_EventScript_RetrieveMon:: @ 8291EE2 Route117_PokemonDayCare_EventScript_AskRetrieveOtherMon:: @ 8291F24 msgbox Route117_PokemonDayCare_Text_TakeOtherOneBackToo, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_TryRetrieveMon goto Route117_PokemonDayCare_EventScript_ComeAgain end @@ -272,7 +272,7 @@ Route117_PokemonDayCare_EventScript_TwoMonsInDaycare:: @ 8291F5C setvar VAR_0x8004, 1 call Route117_PokemonDayCare_EventScript_DisplayLevelsGained msgbox Route117_PokemonDayCare_Text_TakeYourMonBack, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_TryRetrieveMon msgbox Route117_PokemonDayCare_Text_ComeAgain, MSGBOX_DEFAULT release diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc new file mode 100644 index 000000000..e7aada698 --- /dev/null +++ b/data/scripts/elite_four.inc @@ -0,0 +1,62 @@ +PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay32 + waitmovement 0 + playse SE_DOOR + setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 + setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0 + setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + special DrawWholeMapView + return + +PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 8272475 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp6 + waitmovement 0 + playse SE_TRACK_DOOR + setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + special DrawWholeMapView + return + +@ Essentially unused, only necessary when re-entering an Elite Four room after defeating the member, which isnt normally possible +PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom:: @ 82724BC + setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 + setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0 + setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1 + setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1 + return + +PokemonLeague_EliteFour_EventScript_CloseDoor:: @ 827255F + setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 + setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1 + return diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index 6eae55294..56e3297b6 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -3,15 +3,15 @@ EventScript_CutTree:: @ 82906BB lockall goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut checkpartymove MOVE_CUT - compare VAR_RESULT, 6 + compare VAR_RESULT, PARTY_SIZE goto_if_eq EventScript_CheckTreeCantCut setfieldeffectargument 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT buffermovename 1, MOVE_CUT msgbox Text_WantToCut, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_CancelCut - msgbox Text_MonUsedHM, MSGBOX_DEFAULT + msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_CUT_ON_TREE waitstate @@ -51,7 +51,7 @@ Text_WantToCut: @ 829072E .string "CUT down!\p" .string "Would you like to CUT it?$" -Text_MonUsedHM: @ 8290771 +Text_MonUsedFieldMove: @ 8290771 .string "{STR_VAR_1} used {STR_VAR_2}!$" Text_CantCut: @ 829077D @@ -62,15 +62,15 @@ EventScript_RockSmash:: @ 82907A6 lockall goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock checkpartymove MOVE_ROCK_SMASH - compare VAR_RESULT, 6 + compare VAR_RESULT, PARTY_SIZE goto_if_eq EventScript_CantSmashRock setfieldeffectargument 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT buffermovename 1, MOVE_ROCK_SMASH msgbox Text_WantToSmash, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_CancelSmash - msgbox Text_MonUsedHM, MSGBOX_DEFAULT + msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_ROCK_SMASH waitstate @@ -129,11 +129,11 @@ EventScript_StrengthBoulder:: @ 82908BA goto_if_unset FLAG_BADGE04_GET, EventScript_CantStrength goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_CheckActivatedBoulder checkpartymove MOVE_STRENGTH - compare VAR_RESULT, 6 + compare VAR_RESULT, PARTY_SIZE goto_if_eq EventScript_CantStrength setfieldeffectargument 0, VAR_RESULT msgbox Text_WantToStrength, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_CancelStrength closemessage dofieldeffect FLDEFF_USE_STRENGTH @@ -190,12 +190,12 @@ Text_StrengthActivated: @ 8290A16 EventScript_UseWaterfall:: @ 8290A49 lockall checkpartymove MOVE_WATERFALL - compare VAR_RESULT, 6 + compare VAR_RESULT, PARTY_SIZE goto_if_eq EventScript_CantWaterfall bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT msgbox Text_WantToWaterfall, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_EndWaterfall msgbox Text_MonUsedWaterfall, MSGBOX_DEFAULT dofieldeffect FLDEFF_USE_WATERFALL @@ -225,13 +225,13 @@ Text_MonUsedWaterfall: @ 8290AFC EventScript_UseDive:: @ 8290B0F lockall checkpartymove MOVE_DIVE - compare VAR_RESULT, 6 + compare VAR_RESULT, PARTY_SIZE goto_if_eq EventScript_CantDive bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 1, 1 msgbox Text_WantToDive, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_EndDive msgbox Text_MonUsedDive, MSGBOX_DEFAULT dofieldeffect FLDEFF_USE_DIVE @@ -250,13 +250,13 @@ EventScript_EndDive:: @ 8290B58 EventScript_UseDiveUnderwater:: @ 8290B5A lockall checkpartymove MOVE_DIVE - compare VAR_RESULT, 6 + compare VAR_RESULT, PARTY_SIZE goto_if_eq EventScript_CantSurface bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 1, 1 msgbox Text_WantToSurface, MSGBOX_YESNO - compare VAR_RESULT, 0 + compare VAR_RESULT, NO goto_if_eq EventScript_EndSurface msgbox Text_MonUsedDive, MSGBOX_DEFAULT dofieldeffect FLDEFF_USE_DIVE diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc new file mode 100644 index 000000000..2ca9c7b06 --- /dev/null +++ b/data/scripts/field_poison.inc @@ -0,0 +1,51 @@ +EventScript_FieldPoison:: @ 82736BC + lockall + special TryFieldPoisonWhiteOut + waitstate + compare VAR_RESULT, FLDPSN_WHITEOUT + goto_if_eq EventScript_FieldWhiteOut + compare VAR_RESULT, FLDPSN_FRONTIER_WHITEOUT + goto_if_eq EventScript_FrontierFieldWhiteOut + releaseall + end + +EventScript_FieldWhiteOut:: @ 82736D9 + message gText_PlayerWhitedOut + waitmessage + waitbuttonpress + special Script_FadeOutMapMusic + waitstate + fadescreen 1 + call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_SetRespawnLavaridgePkmnCenter + special SetCB2WhiteOut + waitstate + end + +EventScript_SetRespawnLavaridgePkmnCenter:: @ 82736F4 + setrespawn HEAL_LOCATION_LAVARIDGE_TOWN + return + +EventScript_FrontierFieldWhiteOut:: @ 82736F8 + message gText_PlayerWhitedOut + waitmessage + waitbuttonpress + setvar VAR_0x8004, BATTLE_PIKE_FUNC_IS_IN + special CallBattlePikeFunction + compare VAR_RESULT, 1 + goto_if_eq BattleFrontier_BattlePike_EventScript_Retire + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN + special CallBattlePyramidFunction + compare VAR_RESULT, 1 + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + compare VAR_RESULT, 2 + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + setvar VAR_0x8004, TRAINER_HILL_FUNC_IS_IN + special CallTrainerHillFunction + compare VAR_RESULT, 1 + goto_if_eq TrainerHill_1F_EventScript_Lost + special Script_FadeOutMapMusic + waitstate + fadescreen 1 + special SetCB2WhiteOut + waitstate + end diff --git a/data/scripts/flash.inc b/data/scripts/flash.inc new file mode 100644 index 000000000..916b50719 --- /dev/null +++ b/data/scripts/flash.inc @@ -0,0 +1,4 @@ +EventScript_FldEffFlash:: @ 82926F8 + animateflash 1 + setflashradius 1 + end diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 31000539c..f61b9d6db 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -1,337 +1,332 @@ +@ Unused EventScript_28CCAA:: @ 828CCAA setvar VAR_0x8005, 8 special InterviewBefore compare VAR_RESULT, 1 - goto_if_eq EventScript_28CCC6 + goto_if_eq EventScript_UnusedRet setvar VAR_0x8005, 8 special InterviewAfter return -EventScript_28CCC6:: @ 828CCC6 +EventScript_UnusedRet:: @ 828CCC6 return -Route111_EventScript_28CCC7:: @ 828CCC7 -Route118_EventScript_28CCC7:: @ 828CCC7 -Route120_EventScript_28CCC7:: @ 828CCC7 +@ Gabby and Ty always move to the same spots for the first 5 battles +@ From the 6th battle onwards, they move randomly between locations 6-8 +GabbyAndTy_EventScript_UpdateLocation:: @ 828CCC7 cleartrainerflag TRAINER_GABBY_AND_TY_6 specialvar VAR_RESULT, GabbyAndTyGetBattleNum switch VAR_RESULT - case 0, Route111_EventScript_28CD38 - case 1, Route111_EventScript_28CD3E - case 2, Route111_EventScript_28CD49 - case 3, Route111_EventScript_28CD54 - case 4, Route111_EventScript_28CD5F - case 5, Route111_EventScript_28CD6A - case 6, Route111_EventScript_28CD75 - case 7, Route111_EventScript_28CD80 - case 8, Route111_EventScript_28CD8B + case 0, GabbyAndTy_EventScript_MoveForBattle1 + case 1, GabbyAndTy_EventScript_MoveForBattle2 + case 2, GabbyAndTy_EventScript_MoveForBattle3 + case 3, GabbyAndTy_EventScript_MoveForBattle4 + case 4, GabbyAndTy_EventScript_MoveForBattle5 + case 5, GabbyAndTy_EventScript_MoveForBattle6 + case 6, GabbyAndTy_EventScript_MoveForBattle7 + case 7, GabbyAndTy_EventScript_MoveForBattle8 + case 8, GabbyAndTy_EventScript_MoveForBattle9 end -Route111_EventScript_28CD38:: @ 828CD38 - call Route111_EventScript_28CD9A +GabbyAndTy_EventScript_MoveForBattle1:: @ 828CD38 + call GabbyAndTy_EventScript_ShowAtRoute111_1 return -Route111_EventScript_28CD3E:: @ 828CD3E - call Route111_EventScript_28CDA2 - call Route111_EventScript_28CD96 +GabbyAndTy_EventScript_MoveForBattle2:: @ 828CD3E + call GabbyAndTy_EventScript_ShowAtRoute118_1 + call GabbyAndTy_EventScript_HideAtRoute111_1 return -Route111_EventScript_28CD49:: @ 828CD49 - call Route111_EventScript_28CDAA - call Route111_EventScript_28CD9E +GabbyAndTy_EventScript_MoveForBattle3:: @ 828CD49 + call GabbyAndTy_EventScript_ShowAtRoute120_1 + call GabbyAndTy_EventScript_HideAtRoute118_1 return -Route111_EventScript_28CD54:: @ 828CD54 - call Route111_EventScript_28CDB2 - call Route111_EventScript_28CDA6 +GabbyAndTy_EventScript_MoveForBattle4:: @ 828CD54 + call GabbyAndTy_EventScript_ShowAtRoute111_3 + call GabbyAndTy_EventScript_HideAtRoute120_1 return -Route111_EventScript_28CD5F:: @ 828CD5F - call Route111_EventScript_28CDBA - call Route111_EventScript_28CDAE +GabbyAndTy_EventScript_MoveForBattle5:: @ 828CD5F + call GabbyAndTy_EventScript_ShowAtRoute118_2 + call GabbyAndTy_EventScript_HideAtRoute111_3 return -Route111_EventScript_28CD6A:: @ 828CD6A - call Route111_EventScript_28CDC2 - call Route111_EventScript_28CDB6 +GabbyAndTy_EventScript_MoveForBattle6:: @ 828CD6A + call GabbyAndTy_EventScript_ShowAtRoute120_2 + call GabbyAndTy_EventScript_HideAtRoute118_2 return -Route111_EventScript_28CD75:: @ 828CD75 - call Route111_EventScript_28CDCA - call Route111_EventScript_28CDBE +GabbyAndTy_EventScript_MoveForBattle7:: @ 828CD75 + call GabbyAndTy_EventScript_ShowAtRoute111_2 + call GabbyAndTy_EventScript_HideAtRoute120_2 return -Route111_EventScript_28CD80:: @ 828CD80 - call Route111_EventScript_28CDD2 - call Route111_EventScript_28CDC6 +GabbyAndTy_EventScript_MoveForBattle8:: @ 828CD80 + call GabbyAndTy_EventScript_ShowAtRoute118_3 + call GabbyAndTy_EventScript_HideAtRoute111_2 return -Route111_EventScript_28CD8B:: @ 828CD8B - call Route111_EventScript_28CDC2 - call Route111_EventScript_28CDCE +GabbyAndTy_EventScript_MoveForBattle9:: @ 828CD8B + call GabbyAndTy_EventScript_ShowAtRoute120_2 + call GabbyAndTy_EventScript_HideAtRoute118_3 return -Route111_EventScript_28CD96:: @ 828CD96 +GabbyAndTy_EventScript_HideAtRoute111_1:: @ 828CD96 setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1 return -Route111_EventScript_28CD9A:: @ 828CD9A +GabbyAndTy_EventScript_ShowAtRoute111_1:: @ 828CD9A clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1 return -Route111_EventScript_28CD9E:: @ 828CD9E +GabbyAndTy_EventScript_HideAtRoute118_1:: @ 828CD9E setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 return -Route111_EventScript_28CDA2:: @ 828CDA2 +GabbyAndTy_EventScript_ShowAtRoute118_1:: @ 828CDA2 clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 return -Route111_EventScript_28CDA6:: @ 828CDA6 +GabbyAndTy_EventScript_HideAtRoute120_1:: @ 828CDA6 setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 return -Route111_EventScript_28CDAA:: @ 828CDAA +GabbyAndTy_EventScript_ShowAtRoute120_1:: @ 828CDAA clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 return -Route111_EventScript_28CDAE:: @ 828CDAE +GabbyAndTy_EventScript_HideAtRoute111_3:: @ 828CDAE setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 return -Route111_EventScript_28CDB2:: @ 828CDB2 +GabbyAndTy_EventScript_ShowAtRoute111_3:: @ 828CDB2 clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 return -Route111_EventScript_28CDB6:: @ 828CDB6 +GabbyAndTy_EventScript_HideAtRoute118_2:: @ 828CDB6 setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 return -Route111_EventScript_28CDBA:: @ 828CDBA +GabbyAndTy_EventScript_ShowAtRoute118_2:: @ 828CDBA clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 return -Route111_EventScript_28CDBE:: @ 828CDBE +GabbyAndTy_EventScript_HideAtRoute120_2:: @ 828CDBE setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 return -Route111_EventScript_28CDC2:: @ 828CDC2 +GabbyAndTy_EventScript_ShowAtRoute120_2:: @ 828CDC2 clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 return -Route111_EventScript_28CDC6:: @ 828CDC6 +GabbyAndTy_EventScript_HideAtRoute111_2:: @ 828CDC6 setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 return -Route111_EventScript_28CDCA:: @ 828CDCA +GabbyAndTy_EventScript_ShowAtRoute111_2:: @ 828CDCA clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 return -Route111_EventScript_28CDCE:: @ 828CDCE +GabbyAndTy_EventScript_HideAtRoute118_3:: @ 828CDCE setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 return -Route111_EventScript_28CDD2:: @ 828CDD2 +GabbyAndTy_EventScript_ShowAtRoute118_3:: @ 828CDD2 clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 return -Route111_EventScript_28CDD6:: @ 828CDD6 - trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_28AF05, Route111_Text_28B000, Route111_Text_28B5EC, Route111_EventScript_28CF56 - msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT +GabbyAndTy_EventScript_GabbyBattle1:: @ 828CDD6 + trainerbattle_double TRAINER_GABBY_AND_TY_1, GabbyAndTy_Text_GabbyPreFirstBattle, GabbyAndTy_Text_GabbyDefeatFirstTime, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_FirstInterview + msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT release end -Route111_EventScript_28CDF6:: @ 828CDF6 - trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_28B75C, Route111_Text_28B8B1, Route111_Text_28B841, Route111_EventScript_28CF56 - msgbox Route111_Text_28B805, MSGBOX_DEFAULT +GabbyAndTy_EventScript_TyBattle1:: @ 828CDF6 + trainerbattle_double TRAINER_GABBY_AND_TY_1, GabbyAndTy_Text_TyPreFirstBattle, GabbyAndTy_Text_TyDefeatFirstTime, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_FirstInterview + msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT release end -Route118_EventScript_28CE16:: @ 828CE16 - trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3 - msgbox Route118_Text_28B5C0, MSGBOX_DEFAULT +GabbyAndTy_EventScript_GabbyBattle2:: @ 828CE16 + trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT release end -Route118_EventScript_28CE36:: @ 828CE36 - trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3 - msgbox Route118_Text_28B805, MSGBOX_DEFAULT +GabbyAndTy_EventScript_TyBattle2:: @ 828CE36 + trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT release end -Route120_EventScript_28CE56:: @ 828CE56 - trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_28AF7D, Route120_Text_28B719, Route120_Text_28B5EC, Route120_EventScript_28CFC3 - msgbox Route120_Text_28B5C0, MSGBOX_DEFAULT +GabbyAndTy_EventScript_GabbyBattle3:: @ 828CE56 + trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT release end -Route120_EventScript_28CE76:: @ 828CE76 - trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_28B7B1, Route120_Text_28B8F6, Route120_Text_28B841, Route120_EventScript_28CFC3 - msgbox Route120_Text_28B805, MSGBOX_DEFAULT +GabbyAndTy_EventScript_TyBattle3:: @ 828CE76 + trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT release end -Route111_EventScript_28CE96:: @ 828CE96 - trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3 - msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT +GabbyAndTy_EventScript_GabbyBattle4:: @ 828CE96 + trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT release end -Route111_EventScript_28CEB6:: @ 828CEB6 - trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3 - msgbox Route111_Text_28B805, MSGBOX_DEFAULT +GabbyAndTy_EventScript_TyBattle4:: @ 828CEB6 + trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT release end -Route118_EventScript_28CED6:: @ 828CED6 - trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3 - msgbox Route118_Text_28B5C0, MSGBOX_DEFAULT +Route118_EventScript_GabbyBattle5:: @ 828CED6 + trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT release end -Route118_EventScript_28CEF6:: @ 828CEF6 - trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3 - msgbox Route118_Text_28B805, MSGBOX_DEFAULT +Route118_EventScript_TyBattle5:: @ 828CEF6 + trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT release end -Route111_EventScript_28CF16:: @ 828CF16 -Route118_EventScript_28CF16:: @ 828CF16 -Route120_EventScript_28CF16:: @ 828CF16 - trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3 - msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT +GabbyAndTy_EventScript_GabbyBattle6:: @ 828CF16 + trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT release end -Route111_EventScript_28CF36:: @ 828CF36 -Route118_EventScript_28CF36:: @ 828CF36 -Route120_EventScript_28CF36:: @ 828CF36 - trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3 - msgbox Route111_Text_28B805, MSGBOX_DEFAULT +GabbyAndTy_EventScript_TyBattle6:: @ 828CF36 + trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview + msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT release end -Route111_EventScript_28CF56:: @ 828CF56 +GabbyAndTy_EventScript_FirstInterview:: @ 828CF56 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToEventObjectLocalIds - compare VAR_FACING, 2 - call_if_eq Route111_EventScript_28CF94 - compare VAR_FACING, 1 - call_if_eq Route111_EventScript_28CF9F - compare VAR_FACING, 4 - call_if_eq Route111_EventScript_28CFB1 - goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE - msgbox Route111_Text_28B042, MSGBOX_YESNO - goto Route111_EventScript_28D0A7 + compare VAR_FACING, DIR_NORTH + call_if_eq GabbyAndTy_EventScript_FacePlayerNorth + compare VAR_FACING, DIR_SOUTH + call_if_eq GabbyAndTy_EventScript_FacePlayerSouth + compare VAR_FACING, DIR_EAST + call_if_eq GabbyAndTy_EventScript_FacePlayerEast + goto_if_set FLAG_TEMP_1, GabbyAndTy_EventScript_KeepingAnEyeOutForYou + msgbox GabbyAndTy_Text_WhoAreYouInterview, MSGBOX_YESNO + goto GabbyAndTy_EventScript_Interview end -Route111_EventScript_28CF94:: @ 828CF94 - applymovement VAR_0x8004, Route111_Movement_28D04D +GabbyAndTy_EventScript_FacePlayerNorth:: @ 828CF94 + applymovement VAR_0x8004, GabbyAndTy_Movement_WalkInPlaceDown waitmovement 0 return -Route111_EventScript_28CF9F:: @ 828CF9F - applymovement VAR_0x8004, Route111_Movement_28D04F - applymovement VAR_0x8005, Common_Movement_WalkInPlaceUp +GabbyAndTy_EventScript_FacePlayerSouth:: @ 828CF9F + applymovement VAR_0x8004, GabbyAndTy_Movement_WalkInPlaceUp + applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -Route111_EventScript_28CFB1:: @ 828CFB1 - applymovement VAR_0x8004, Route111_Movement_28D051 - applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft +GabbyAndTy_EventScript_FacePlayerEast:: @ 828CFB1 + applymovement VAR_0x8004, GabbyAndTy_Movement_WalkInPlaceLeft + applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -Route111_EventScript_28CFC3:: @ 828CFC3 -Route118_EventScript_28CFC3:: @ 828CFC3 -Route120_EventScript_28CFC3:: @ 828CFC3 +GabbyAndTy_EventScript_RequestInterview:: @ 828CFC3 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToEventObjectLocalIds - compare VAR_FACING, 2 - call_if_eq Route111_EventScript_28CF94 - compare VAR_FACING, 1 - call_if_eq Route111_EventScript_28CF9F - compare VAR_FACING, 4 - call_if_eq Route111_EventScript_28CFB1 - goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE + compare VAR_FACING, DIR_NORTH + call_if_eq GabbyAndTy_EventScript_FacePlayerNorth + compare VAR_FACING, DIR_SOUTH + call_if_eq GabbyAndTy_EventScript_FacePlayerSouth + compare VAR_FACING, DIR_EAST + call_if_eq GabbyAndTy_EventScript_FacePlayerEast + goto_if_set FLAG_TEMP_1, GabbyAndTy_EventScript_KeepingAnEyeOutForYou specialvar VAR_RESULT, GabbyAndTyGetLastQuote compare VAR_RESULT, 0 - goto_if_eq Route111_EventScript_28D053 - msgbox Route111_Text_28B137, MSGBOX_DEFAULT + goto_if_eq GabbyAndTy_EventScript_DidntInterviewLastTime + msgbox GabbyAndTy_Text_QuoteFromLastInterview, MSGBOX_DEFAULT specialvar VAR_RESULT, GabbyAndTyGetLastBattleTrivia switch VAR_RESULT - case 0, Route111_EventScript_28D061 - case 1, Route111_EventScript_28D06F - case 2, Route111_EventScript_28D07D - case 3, Route111_EventScript_28D08B - case 4, Route111_EventScript_28D099 + case 0, GabbyAndTy_EventScript_RequestInterviewNoTrivia + case 1, GabbyAndTy_EventScript_RequestInterviewShortBattle + case 2, GabbyAndTy_EventScript_RequestInterviewThrewBall + case 3, GabbyAndTy_EventScript_RequestInterviewUsedItems + case 4, GabbyAndTy_EventScript_RequestInterviewLostAMon end -Route111_Movement_28D04D: @ 828D04D +GabbyAndTy_Movement_WalkInPlaceDown: @ 828D04D walk_in_place_down step_end -Route111_Movement_28D04F: @ 828D04F +GabbyAndTy_Movement_WalkInPlaceUp: @ 828D04F walk_in_place_up step_end -Route111_Movement_28D051: @ 828D051 +GabbyAndTy_Movement_WalkInPlaceLeft: @ 828D051 walk_in_place_left step_end -Route111_EventScript_28D053:: @ 828D053 - msgbox Route111_Text_28B62D, MSGBOX_YESNO - goto Route111_EventScript_28D0A7 +GabbyAndTy_EventScript_DidntInterviewLastTime:: @ 828D053 + msgbox GabbyAndTy_Text_GiveUsAnInterviewThisTime, MSGBOX_YESNO + goto GabbyAndTy_EventScript_Interview end -Route111_EventScript_28D061:: @ 828D061 - msgbox Route111_Text_28B3F3, MSGBOX_YESNO - goto Route111_EventScript_28D0A7 +GabbyAndTy_EventScript_RequestInterviewNoTrivia:: @ 828D061 + msgbox GabbyAndTy_Text_InterviewAgain, MSGBOX_YESNO + goto GabbyAndTy_EventScript_Interview end -Route111_EventScript_28D06F:: @ 828D06F - msgbox Route111_Text_28B1B3, MSGBOX_YESNO - goto Route111_EventScript_28D0A7 +GabbyAndTy_EventScript_RequestInterviewShortBattle:: @ 828D06F + msgbox GabbyAndTy_Text_YouStompedUsInterviewAgain, MSGBOX_YESNO + goto GabbyAndTy_EventScript_Interview end -Route111_EventScript_28D07D:: @ 828D07D - msgbox Route111_Text_28B23D, MSGBOX_YESNO - goto Route111_EventScript_28D0A7 +GabbyAndTy_EventScript_RequestInterviewThrewBall:: @ 828D07D + msgbox GabbyAndTy_Text_YouThrewABallAtUsInterviewAgain, MSGBOX_YESNO + goto GabbyAndTy_EventScript_Interview end -Route111_EventScript_28D08B:: @ 828D08B - msgbox Route111_Text_28B2FA, MSGBOX_YESNO - goto Route111_EventScript_28D0A7 +GabbyAndTy_EventScript_RequestInterviewUsedItems:: @ 828D08B + msgbox GabbyAndTy_Text_CleverItemSkillsInterviewAgain, MSGBOX_YESNO + goto GabbyAndTy_EventScript_Interview end -Route111_EventScript_28D099:: @ 828D099 - msgbox Route111_Text_28B379, MSGBOX_YESNO - goto Route111_EventScript_28D0A7 +GabbyAndTy_EventScript_RequestInterviewLostAMon:: @ 828D099 + msgbox GabbyAndTy_Text_WeLookedRespectableInterviewAgain, MSGBOX_YESNO + goto GabbyAndTy_EventScript_Interview end -Route111_EventScript_28D0A7:: @ 828D0A7 - compare VAR_RESULT, 0 - goto_if_eq Route111_EventScript_28D0E1 - msgbox Route111_Text_28B433, MSGBOX_DEFAULT +GabbyAndTy_EventScript_Interview:: @ 828D0A7 + compare VAR_RESULT, NO + goto_if_eq GabbyAndTy_EventScript_DontGiveUpKeepingEyeOut + msgbox GabbyAndTy_Text_DescribeYourFeelings, MSGBOX_DEFAULT setvar VAR_0x8004, EASY_CHAT_TYPE_GABBY_AND_TY call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 - goto_if_eq Route111_EventScript_28D0E1 - msgbox Route111_Text_28B4AB, MSGBOX_DEFAULT + goto_if_eq GabbyAndTy_EventScript_DontGiveUpKeepingEyeOut + msgbox GabbyAndTy_Text_PerfectWellBeSeeingYou, MSGBOX_DEFAULT special GabbyAndTyAfterInterview setflag FLAG_TEMP_1 release end -Route111_EventScript_28D0E1:: @ 828D0E1 - msgbox Route111_Text_28B577, MSGBOX_DEFAULT +GabbyAndTy_EventScript_DontGiveUpKeepingEyeOut:: @ 828D0E1 + msgbox GabbyAndTy_Text_DontGiveUpKeepingEyeOut, MSGBOX_DEFAULT setflag FLAG_TEMP_1 release end -Route111_EventScript_28D0EE:: @ 828D0EE - msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT +GabbyAndTy_EventScript_KeepingAnEyeOutForYou:: @ 828D0EE + msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT release end diff --git a/data/scripts/interview.inc b/data/scripts/interview.inc new file mode 100644 index 000000000..8b2b72f75 --- /dev/null +++ b/data/scripts/interview.inc @@ -0,0 +1,346 @@ +BattleFrontier_BattleTowerLobby_EventScript_28C7E9:: @ 828C7E9 +LilycoveCity_ContestLobby_EventScript_28C7E9:: @ 828C7E9 +SlateportCity_OceanicMuseum_1F_EventScript_28C7E9:: @ 828C7E9 +SlateportCity_PokemonFanClub_EventScript_28C7E9:: @ 828C7E9 + special InterviewAfter + incrementgamestat GAME_STAT_GOT_INTERVIEWED + release + end + +SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0 + setvar VAR_0x8005, 1 + special InterviewBefore + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C879 + copyvar VAR_0x8009, VAR_0x8006 + msgbox SlateportCity_PokemonFanClub_Text_280674, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C827 + compare VAR_RESULT, NO + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C + end + +SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827 + msgbox SlateportCity_PokemonFanClub_Text_28073B, MSGBOX_DEFAULT + setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW + copyvar VAR_0x8005, VAR_0x8009 + setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_FEMALE + call Common_ShowEasyChatScreen + lock + faceplayer + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C866 + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C + end + +SlateportCity_PokemonFanClub_EventScript_28C85C:: @ 828C85C + msgbox SlateportCity_PokemonFanClub_Text_2805E2, MSGBOX_DEFAULT + release + end + +SlateportCity_PokemonFanClub_EventScript_28C866:: @ 828C866 + msgbox SlateportCity_PokemonFanClub_Text_280789, MSGBOX_DEFAULT + setvar VAR_0x8005, 1 + goto SlateportCity_PokemonFanClub_EventScript_28C7E9 + end + +SlateportCity_PokemonFanClub_EventScript_28C879:: @ 828C879 + msgbox SlateportCity_PokemonFanClub_Text_28062E, MSGBOX_DEFAULT + release + end + +SlateportCity_OceanicMuseum_1F_EventScript_Reporter:: @ 828C883 + lock + faceplayer + setvar VAR_0x8005, 2 + special InterviewBefore + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C939 + copyvar VAR_0x8009, VAR_0x8006 + goto_if_set FLAG_OCEANIC_MUSEUM_MET_REPORTER, SlateportCity_OceanicMuseum_1F_EventScript_28C8C8 + setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER + msgbox SlateportCity_OceanicMuseum_1F_Text_2811A0, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 + compare VAR_RESULT, NO + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C + end + +SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8 + msgbox SlateportCity_OceanicMuseum_1F_Text_28126D, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 + compare VAR_RESULT, NO + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C + end + +SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7 + msgbox SlateportCity_OceanicMuseum_1F_Text_2812F2, MSGBOX_DEFAULT + setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW + copyvar VAR_0x8005, VAR_0x8009 + setvar VAR_0x8006, EASY_CHAT_PERSON_REPORTER_MALE + call Common_ShowEasyChatScreen + lock + faceplayer + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C926 + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C + end + +SlateportCity_OceanicMuseum_1F_EventScript_28C91C:: @ 828C91C + msgbox SlateportCity_OceanicMuseum_1F_Text_281367, MSGBOX_DEFAULT + release + end + +SlateportCity_OceanicMuseum_1F_EventScript_28C926:: @ 828C926 + msgbox SlateportCity_OceanicMuseum_1F_Text_2813B9, MSGBOX_DEFAULT + setvar VAR_0x8005, 2 + goto SlateportCity_OceanicMuseum_1F_EventScript_28C7E9 + end + +SlateportCity_OceanicMuseum_1F_EventScript_28C939:: @ 828C939 + msgbox SlateportCity_OceanicMuseum_1F_Text_28144D, MSGBOX_DEFAULT + release + end + +SlateportCity_PokemonFanClub_EventScript_28C943:: @ 828C943 + lock + faceplayer + specialvar VAR_RESULT, sub_80EF8F8 + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C7F0 + setvar VAR_0x8005, 3 + special InterviewBefore + compare VAR_RESULT, 1 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA4F + copyvar VAR_0x8009, VAR_0x8006 + msgbox SlateportCity_PokemonFanClub_Text_280270, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C98C + compare VAR_RESULT, NO + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 + end + +SlateportCity_PokemonFanClub_EventScript_28C98C:: @ 828C98C + msgbox SlateportCity_PokemonFanClub_Text_28034F, MSGBOX_DEFAULT + random 3 + copyvar VAR_0x800A, VAR_RESULT + switch VAR_RESULT + case 0, SlateportCity_PokemonFanClub_EventScript_28C9C3 + case 1, SlateportCity_PokemonFanClub_EventScript_28C9D1 + case 2, SlateportCity_PokemonFanClub_EventScript_28C9DF + end + +SlateportCity_PokemonFanClub_EventScript_28C9C3:: @ 828C9C3 + msgbox SlateportCity_PokemonFanClub_Text_280393, MSGBOX_DEFAULT + goto SlateportCity_PokemonFanClub_EventScript_28C9ED + end + +SlateportCity_PokemonFanClub_EventScript_28C9D1:: @ 828C9D1 + msgbox SlateportCity_PokemonFanClub_Text_2803EF, MSGBOX_DEFAULT + goto SlateportCity_PokemonFanClub_EventScript_28C9ED + end + +SlateportCity_PokemonFanClub_EventScript_28C9DF:: @ 828C9DF + msgbox SlateportCity_PokemonFanClub_Text_280454, MSGBOX_DEFAULT + goto SlateportCity_PokemonFanClub_EventScript_28C9ED + end + +SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED + setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_CLUB + copyvar VAR_0x8005, VAR_0x8009 + setvar VAR_0x8006, 0 + call Common_ShowEasyChatScreen + lock + faceplayer + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 + msgbox SlateportCity_PokemonFanClub_Text_2804AC, MSGBOX_DEFAULT + setvar VAR_0x8006, 1 + call Common_ShowEasyChatScreen + lock + faceplayer + compare VAR_RESULT, 0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 + msgbox SlateportCity_PokemonFanClub_Text_280523, MSGBOX_DEFAULT + copyvar VAR_0x8007, VAR_0x800A + setvar VAR_0x8005, 3 + goto SlateportCity_PokemonFanClub_EventScript_28C7E9 + end + +SlateportCity_PokemonFanClub_EventScript_28CA45:: @ 828CA45 + msgbox SlateportCity_PokemonFanClub_Text_2805E2, MSGBOX_DEFAULT + release + end + +SlateportCity_PokemonFanClub_EventScript_28CA4F:: @ 828CA4F + msgbox SlateportCity_PokemonFanClub_Text_28062E, MSGBOX_DEFAULT + release + end + +LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59 + lock + faceplayer + goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_28CB21 + setvar VAR_0x8005, 6 + special InterviewBefore + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB21 + copyvar VAR_0x8009, VAR_0x8006 + msgbox LilycoveCity_ContestLobby_Text_27EF15, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CA9B + compare VAR_RESULT, NO + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 + end + +LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B + msgbox LilycoveCity_ContestLobby_Text_27EFE7, MSGBOX_DEFAULT + setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW + copyvar VAR_0x8005, VAR_0x8009 + setvar VAR_0x8006, 0 + call Common_ShowEasyChatScreen + lock + faceplayer + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CADA + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 + end + +LilycoveCity_ContestLobby_EventScript_28CAD0:: @ 828CAD0 + msgbox LilycoveCity_ContestLobby_Text_27F1EF, MSGBOX_DEFAULT + release + end + +LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA + setvar VAR_0x8004, 24 + special SetContestCategoryStringVarForInterview + msgbox LilycoveCity_ContestLobby_Text_27F03E, MSGBOX_DEFAULT + setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW + copyvar VAR_0x8005, VAR_0x8009 + setvar VAR_0x8006, 1 + call Common_ShowEasyChatScreen + lock + faceplayer + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 + msgbox LilycoveCity_ContestLobby_Text_27F0EC, MSGBOX_DEFAULT + setflag FLAG_TEMP_2 + setvar VAR_0x8005, 6 + goto LilycoveCity_ContestLobby_EventScript_28C7E9 + end + +LilycoveCity_ContestLobby_EventScript_28CB21:: @ 828CB21 + msgbox LilycoveCity_ContestLobby_Text_27F23F, MSGBOX_DEFAULT + release + end + +LilycoveCity_ContestLobby_EventScript_28CB2B:: @ 828CB2B + compare VAR_LINK_CONTEST_ROOM_STATE, 2 + goto_if_ne LilycoveCity_ContestLobby_EventScript_28CB95 + setvar VAR_0x8005, 6 + special InterviewBefore + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB95 + switch VAR_CONTEST_LOCATION + case 0, LilycoveCity_ContestLobby_EventScript_28CB95 + case 2, LilycoveCity_ContestLobby_EventScript_28CB91 + case 1, LilycoveCity_ContestLobby_EventScript_28CB91 + case 3, LilycoveCity_ContestLobby_EventScript_28CB91 + case 4, LilycoveCity_ContestLobby_EventScript_28CB91 + case 5, LilycoveCity_ContestLobby_EventScript_28CB95 + end + +LilycoveCity_ContestLobby_EventScript_28CB91:: @ 828CB91 + clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER + return + +LilycoveCity_ContestLobby_EventScript_28CB95:: @ 828CB95 + return + +BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96 + lock + faceplayer + goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerLobby_EventScript_28CC7A + setvar VAR_0x8005, 7 + special InterviewBefore + compare VAR_RESULT, 1 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A + copyvar VAR_0x8009, VAR_0x8006 + msgbox BattleFrontier_BattleTowerLobby_Text_27F704, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CBD8 + compare VAR_RESULT, NO + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC2E + end + +BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 + message BattleFrontier_BattleTowerLobby_Text_27F7BA + waitmessage + multichoice 20, 8, MULTI_SATISFACTION, 1 + copyvar VAR_0x8008, VAR_RESULT + compare VAR_RESULT, 0 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC38 + compare VAR_RESULT, 1 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC41 + msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT + setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW + copyvar VAR_0x8005, VAR_0x8009 + call Common_ShowEasyChatScreen + lock + faceplayer + compare VAR_RESULT, 1 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC4A + compare VAR_RESULT, 0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 + end + +BattleFrontier_BattleTowerLobby_EventScript_28CC2E:: @ 828CC2E + msgbox BattleFrontier_BattleTowerLobby_Text_27F84C, MSGBOX_DEFAULT + release + end + +BattleFrontier_BattleTowerLobby_EventScript_28CC38:: @ 828CC38 + msgbox BattleFrontier_BattleTowerLobby_Text_27F8AE, MSGBOX_DEFAULT + return + +BattleFrontier_BattleTowerLobby_EventScript_28CC41:: @ 828CC41 + msgbox BattleFrontier_BattleTowerLobby_Text_27F921, MSGBOX_DEFAULT + return + +BattleFrontier_BattleTowerLobby_EventScript_28CC4A:: @ 828CC4A + compare VAR_RESULT, 0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 + msgbox BattleFrontier_BattleTowerLobby_Text_27F9FD, MSGBOX_DEFAULT + setflag FLAG_TEMP_2 + copyvar VAR_0x8004, VAR_0x8008 + setvar VAR_0x8005, 7 + goto BattleFrontier_BattleTowerLobby_EventScript_28C7E9 + end + +BattleFrontier_BattleTowerLobby_EventScript_28CC70:: @ 828CC70 + msgbox BattleFrontier_BattleTowerLobby_Text_27FA6F, MSGBOX_DEFAULT + release + end + +BattleFrontier_BattleTowerLobby_EventScript_28CC7A:: @ 828CC7A + msgbox BattleFrontier_BattleTowerLobby_Text_27FAF3, MSGBOX_DEFAULT + release + end + +BattleFrontier_BattleTowerLobby_EventScript_28CC84:: @ 828CC84 + compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 + setvar VAR_0x8005, 7 + special InterviewBefore + compare VAR_RESULT, 1 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 + clearflag FLAG_HIDE_BATTLE_TOWER_REPORTER + return + +BattleFrontier_BattleTowerLobby_EventScript_28CCA6:: @ 828CCA6 + setflag FLAG_HIDE_BATTLE_TOWER_REPORTER + return diff --git a/data/scripts/kecleon.inc b/data/scripts/kecleon.inc new file mode 100644 index 000000000..659cd027b --- /dev/null +++ b/data/scripts/kecleon.inc @@ -0,0 +1,116 @@ +Route120_EventScript_Kecleon1:: @ 82722DB + lock + faceplayer + setvar VAR_0x8009, 1 + goto EventScript_Kecleon + end + +Route120_EventScript_Kecleon2:: @ 82722E8 + lock + faceplayer + setvar VAR_0x8009, 2 + goto EventScript_Kecleon + end + +Route120_EventScript_Kecleon3:: @ 82722F5 + lock + faceplayer + setvar VAR_0x8009, 3 + goto EventScript_Kecleon + end + +Route120_EventScript_Kecleon4:: @ 8272302 + lock + faceplayer + setvar VAR_0x8009, 4 + goto EventScript_Kecleon + end + +Route120_EventScript_Kecleon5:: @ 827230F + lock + faceplayer + setvar VAR_0x8009, 5 + goto EventScript_Kecleon + end + +Route119_EventScript_Kecleon1:: @ 827231C + lock + faceplayer + setvar VAR_0x8009, 6 + goto EventScript_Kecleon + end + +Route119_EventScript_Kecleon2:: @ 8272329 + lock + faceplayer + setvar VAR_0x8009, 7 + goto EventScript_Kecleon + end + +EventScript_Kecleon:: @ 8272336 + checkitem ITEM_DEVON_SCOPE, 1 + compare VAR_RESULT, 1 + goto_if_eq EventScript_AskUseDevonScope + msgbox Kecleon_Text_SomethingUnseeable, MSGBOX_DEFAULT + release + end + +EventScript_AskUseDevonScope:: @ 8272350 + msgbox Kecleon_Text_WantToUseDevonScope, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq EventScript_BattleKecleon + release + end + +EventScript_BattleKecleon:: @ 8272365 + msgbox Kecleon_Text_UseDevonScopeMonAttacked, MSGBOX_DEFAULT + closemessage + applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer + waitmovement 0 + applymovement VAR_LAST_TALKED, Movement_KecleonAppears + waitmovement 0 + waitse + playmoncry SPECIES_KECLEON, 2 + delay 40 + waitmoncry + setwildbattle SPECIES_KECLEON, 30, ITEM_NONE + setflag FLAG_SYS_CTRL_OBJ_DELETE + dowildbattle + clearflag FLAG_SYS_CTRL_OBJ_DELETE + specialvar VAR_RESULT, GetBattleOutcome + compare VAR_RESULT, B_OUTCOME_WON + goto_if_eq EventScript_RemoveKecleon + compare VAR_RESULT, B_OUTCOME_RAN + goto_if_eq EventScript_RemoveKecleon + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if_eq EventScript_RemoveKecleon + release + end + +EventScript_RemoveKecleon:: @ 82723C1 + goto Common_EventScript_RemoveStaticPokemon + end + +Movement_KecleonAppears: @ 82723C7 + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_16 + set_invisible + delay_16 + set_visible + step_end diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc new file mode 100644 index 000000000..b7b9d514a --- /dev/null +++ b/data/scripts/lilycove_lady.inc @@ -0,0 +1,856 @@ +LilycoveCity_PokemonCenter_1F_EventScript_LilycoveLady:: @ 82A836B + special Script_GetLilycoveLadyId + switch VAR_RESULT + case LILYCOVE_LADY_QUIZ, LilycoveCity_PokemonCenter_1F_EventScript_QuizLady + case LILYCOVE_LADY_FAVOR, LilycoveCity_PokemonCenter_1F_EventScript_FavorLady + case LILYCOVE_LADY_CONTEST, LilycoveCity_PokemonCenter_1F_EventScript_ContestLady + end + +LilycoveCity_PokemonCenter_1F_EventScript_FavorLady:: @ 82A8395 + lock + faceplayer + msgbox LilycoveCity_PokemonCenter_1F_Text_ImTheFavorLady, MSGBOX_DEFAULT + specialvar VAR_RESULT, GetFavorLadyState + compare VAR_RESULT, LILYCOVE_LADY_STATE_READY + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyReady + compare VAR_RESULT, LILYCOVE_LADY_STATE_COMPLETED + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyCompleted + compare VAR_RESULT, LILYCOVE_LADY_STATE_PRIZE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyPrize + end + +LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyCompleted:: @ 82A83C6 + msgbox LilycoveCity_PokemonCenter_1F_Text_ThankYouForLastTime, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyReady:: @ 82A83D0 + special BufferFavorLadyRequest + msgbox LilycoveCity_PokemonCenter_1F_Text_ObsessedWithThing, MSGBOX_DEFAULT + specialvar VAR_RESULT, HasAnotherPlayerGivenFavorLadyItem + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_RequestItem + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_TellAboutPlayersItem + end + +LilycoveCity_PokemonCenter_1F_EventScript_TellAboutPlayersItem:: @ 82A83F7 + special BufferFavorLadyItemName + special BufferFavorLadyPlayerName + specialvar VAR_RESULT, DidFavorLadyLikeItem + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_PlayerGaveBadThing + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_PlayerGaveGreatThing + end + +LilycoveCity_PokemonCenter_1F_EventScript_PlayerGaveBadThing:: @ 82A8419 + msgbox LilycoveCity_PokemonCenter_1F_Text_PlayerGaveMeBadThing, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_RequestItem + end + +LilycoveCity_PokemonCenter_1F_EventScript_PlayerGaveGreatThing:: @ 82A8427 + msgbox LilycoveCity_PokemonCenter_1F_Text_PlayerGaveMeGreatThing, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_RequestItem + end + +LilycoveCity_PokemonCenter_1F_EventScript_RequestItem:: @ 82A8435 + msgbox LilycoveCity_PokemonCenter_1F_Text_WillYouShareThing, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor + compare VAR_RESULT, YES + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AcceptFavor + end + +LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor:: @ 82A8454 + msgbox LilycoveCity_PokemonCenter_1F_Text_IsThatSoGoodbye, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_AcceptFavor:: @ 82A845E + msgbox LilycoveCity_PokemonCenter_1F_Text_WhatWillYouGiveMe, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem + end + +LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem:: @ 82A846C + fadescreen 1 + setvar VAR_RESULT, 0 + special Script_FavorLadyOpenBagMenu + waitstate + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChooseFavorItem + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GiveFavorItem + end + +LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChooseFavorItem:: @ 82A848E + msgbox LilycoveCity_PokemonCenter_1F_Text_NotWillingToShare, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor + compare VAR_RESULT, NO + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem + end + +LilycoveCity_PokemonCenter_1F_EventScript_GiveFavorItem:: @ 82A84AD + specialvar VAR_RESULT, Script_DoesFavorLadyLikeItem + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DidntLikeFavorItem + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_CheckLovedItem + end + +LilycoveCity_PokemonCenter_1F_EventScript_DidntLikeFavorItem:: @ 82A84C9 + special BufferFavorLadyRequest + msgbox LilycoveCity_PokemonCenter_1F_Text_IllTryToCherishIt, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_CheckLovedItem:: @ 82A84D6 + specialvar VAR_RESULT, IsFavorLadyThresholdMet + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_LikedFavorItem + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_LovedFavorItem + end + +LilycoveCity_PokemonCenter_1F_EventScript_LikedFavorItem:: @ 82A84F2 + special BufferFavorLadyRequest + msgbox LilycoveCity_PokemonCenter_1F_Text_IWillCherishThis, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_LovedFavorItem:: @ 82A84FF + special BufferFavorLadyRequest + msgbox LilycoveCity_PokemonCenter_1F_Text_IWillTreasureThis, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyPrize + end + +LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyPrize:: @ 82A8510 + setvar VAR_0x8004, 0 + specialvar VAR_0x8004, FavorLadyGetPrize + msgbox LilycoveCity_PokemonCenter_1F_Text_IllGiveYouThisInReturn, MSGBOX_DEFAULT + giveitem_std VAR_0x8004 + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoRoomForFavorPrize + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ReceivedFavorPrize + end + +LilycoveCity_PokemonCenter_1F_EventScript_NoRoomForFavorPrize:: @ 82A8545 + msgbox LilycoveCity_PokemonCenter_1F_Text_YouDontHaveSpaceForIt, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_ReceivedFavorPrize:: @ 82A854F + special SetFavorLadyState_Complete + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_QuizLady:: @ 82A8554 + lock + faceplayer + msgbox LilycoveCity_PokemonCenter_1F_Text_ImTheQuizLady, MSGBOX_DEFAULT + specialvar VAR_RESULT, GetQuizLadyState + compare VAR_RESULT, LILYCOVE_LADY_STATE_READY + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_HasQuiz + compare VAR_RESULT, LILYCOVE_LADY_STATE_COMPLETED + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_CheckMadeQuiz + compare VAR_RESULT, LILYCOVE_LADY_STATE_PRIZE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ReadyGivePrize + end + +LilycoveCity_PokemonCenter_1F_EventScript_HasQuiz:: @ 82A8585 + specialvar VAR_RESULT, GetQuizAuthor + compare VAR_RESULT, QUIZ_AUTHOR_PLAYER + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_WaitingToTakeYourQuiz + compare VAR_RESULT, QUIZ_AUTHOR_OTHER_PLAYER + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_PlayerQuizReady + compare VAR_RESULT, QUIZ_AUTHOR_LADY + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_LadyQuizReady + end + +LilycoveCity_PokemonCenter_1F_EventScript_CheckMadeQuiz:: @ 82A85AC + specialvar VAR_RESULT, IsQuizLadyWaitingForChallenger + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_WaitingToTakeYourQuiz + end + +LilycoveCity_PokemonCenter_1F_EventScript_WaitingToTakeYourQuiz:: @ 82A85C8 + msgbox LilycoveCity_PokemonCenter_1F_Text_WaitingToTakeYourQuiz, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_PlayerQuizReady:: @ 82A85D2 + msgbox LilycoveCity_PokemonCenter_1F_Text_WaitingForChallenger, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_AskTakeQuiz + end + +LilycoveCity_PokemonCenter_1F_EventScript_LadyQuizReady:: @ 82A85E0 + msgbox LilycoveCity_PokemonCenter_1F_Text_WaitingForChallenger, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_AskTakeQuiz + end + +LilycoveCity_PokemonCenter_1F_EventScript_AskTakeQuiz:: @ 82A85EE + setvar VAR_0x8004, 0 + msgbox LilycoveCity_PokemonCenter_1F_Text_TakeQuizChallenge, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_TakeQuiz + compare VAR_RESULT, NO + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineQuiz + end + +LilycoveCity_PokemonCenter_1F_EventScript_DeclineQuiz:: @ 82A8612 + msgbox LilycoveCity_PokemonCenter_1F_Text_HowBoringBye, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_TakeQuiz:: @ 82A861C + special ClearQuizLadyPlayerAnswer + compare VAR_0x8004, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ShowQuestion + compare VAR_0x8004, EASY_CHAT_TYPE_QUIZ_ANSWER + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GetAnswer + +LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState:: @ 82A8635 + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskQuitQuiz + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_SubmitQuizResponse + end + +LilycoveCity_PokemonCenter_1F_EventScript_ShowQuestion:: @ 82A864C + special QuizLadyShowQuizQuestion + waitstate + goto LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState + end + +LilycoveCity_PokemonCenter_1F_EventScript_GetAnswer:: @ 82A8656 + special QuizLadyGetPlayerAnswer + waitstate + goto LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState + end + +LilycoveCity_PokemonCenter_1F_EventScript_AskQuitQuiz:: @ 82A8660 + msgbox LilycoveCity_PokemonCenter_1F_Text_YoureGoingToQuit, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_QuitTakingQuiz + compare VAR_RESULT, NO + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_TakeQuiz + end + +LilycoveCity_PokemonCenter_1F_EventScript_QuitTakingQuiz:: @ 82A867F + msgbox LilycoveCity_PokemonCenter_1F_Text_TakeTheQuizAnotherTime, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_SubmitQuizResponse:: @ 82A8689 + special SetQuizLadyState_Complete + msgbox LilycoveCity_PokemonCenter_1F_Text_WaitForAnswer, MSGBOX_DEFAULT + specialvar VAR_RESULT, IsQuizAnswerCorrect + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_IncorrectResponse + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_CorrectResponse + end + +LilycoveCity_PokemonCenter_1F_EventScript_CorrectResponse:: @ 82A86B0 + playse SE_SEIKAI + delay 10 + playse SE_SEIKAI + msgbox LilycoveCity_PokemonCenter_1F_Text_YouGotItRight, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_ReadyGivePrize + end + +LilycoveCity_PokemonCenter_1F_EventScript_IncorrectResponse:: @ 82A86C7 + special BufferQuizCorrectAnswer + special BufferQuizPrizeName + playse SE_HAZURE + delay 10 + playse SE_HAZURE + msgbox LilycoveCity_PokemonCenter_1F_Text_WrongTheCorrectAnswerIs, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_IGetToKeepPrize, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz + end + +@ VAR_RESULT is essentially ignored, both jumps are identical +LilycoveCity_PokemonCenter_1F_EventScript_ReadyGivePrize:: @ 82A86EC + specialvar VAR_RESULT, BufferQuizAuthorNameAndCheckIfLady + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GivePrize1 + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GivePrize0 + end + +LilycoveCity_PokemonCenter_1F_EventScript_GivePrize1:: @ 82A8708 + msgbox LilycoveCity_PokemonCenter_1F_Text_YouGotItRightYouveWonPersonsPrize, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_GivePrize + end + +LilycoveCity_PokemonCenter_1F_EventScript_GivePrize0:: @ 82A8716 + msgbox LilycoveCity_PokemonCenter_1F_Text_YouGotItRightYouveWonPersonsPrize, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_GivePrize + end + +LilycoveCity_PokemonCenter_1F_EventScript_GivePrize:: @ 82A8724 + setvar VAR_0x8005, 0 + special BufferQuizPrizeItem + special SetQuizLadyState_Complete + giveitem_std VAR_0x8005 + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoSpaceForQuizPrize + goto LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz + end + +LilycoveCity_PokemonCenter_1F_EventScript_NoSpaceForQuizPrize:: @ 82A874C + msgbox LilycoveCity_PokemonCenter_1F_Text_YourBagIsFilledUp, MSGBOX_DEFAULT + special SetQuizLadyState_GivePrize + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz:: @ 82A8759 + msgbox LilycoveCity_PokemonCenter_1F_Text_MakeYourOwnQuiz, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_MakeQuiz + compare VAR_RESULT, NO + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz + end + +LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz:: @ 82A8778 + special QuizLadyPickNewQuestion + msgbox LilycoveCity_PokemonCenter_1F_Text_MaybeNextTime, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_MakeQuiz:: @ 82A8785 + msgbox LilycoveCity_PokemonCenter_1F_Text_PickYourPrize, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_PickPrize:: @ 82A878D + fadescreen 1 + setvar VAR_RESULT, 0 + special Script_QuizLadyOpenBagMenu + waitstate + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChoosingPrize + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_WriteQuiz + end + +LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChoosingPrize:: @ 82A87AF + msgbox LilycoveCity_PokemonCenter_1F_Text_QuitChoosingPrize, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz + compare VAR_RESULT, NO + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_PickPrize + end + +LilycoveCity_PokemonCenter_1F_EventScript_WriteQuiz:: @ 82A87CE + msgbox LilycoveCity_PokemonCenter_1F_Text_WriteYourQuiz, MSGBOX_DEFAULT + special ClearQuizLadyQuestionAndAnswer + special ClearQuizLadyPlayerAnswer + setvar VAR_0x8004, EASY_CHAT_TYPE_QUIZ_QUESTION +LilycoveCity_PokemonCenter_1F_EventScript_WriteQuizQuestion:: @ 82A87E1 + fadescreen 1 + special QuizLadySetCustomQuestion + waitstate + compare VAR_RESULT, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskQuitWritingQuizQuestion + goto LilycoveCity_PokemonCenter_1F_EventScript_FinishMakingQuiz + end + +LilycoveCity_PokemonCenter_1F_EventScript_AskQuitWritingQuizQuestion:: @ 82A87F8 + msgbox LilycoveCity_PokemonCenter_1F_Text_QuitWritingQuizQuestion, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz + compare VAR_RESULT, NO + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_WriteQuizQuestion + end + +LilycoveCity_PokemonCenter_1F_EventScript_FinishMakingQuiz:: @ 82A8817 + special QuizLadyTakePrizeForCustomQuiz + special QuizLadyRecordCustomQuizData + special QuizLadySetWaitingForChallenger + msgbox LilycoveCity_PokemonCenter_1F_Text_IllLookForAChallenger, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_ContestLady:: @ 82A882A + lock + faceplayer + msgbox LilycoveCity_PokemonCenter_1F_Text_ImTheContestLady, MSGBOX_DEFAULT + specialvar VAR_RESULT, HasPlayerGivenContestLadyPokeblock + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NotGivenPokeblock + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GivenPokeblock + end + +@ Redundant with above script, VAR_RESULT will always be FALSE here +LilycoveCity_PokemonCenter_1F_EventScript_NotGivenPokeblock:: @ 82A8850 + specialvar VAR_RESULT, ShouldContestLadyShowGoOnAir + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskForPokeblock + compare VAR_RESULT, TRUE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GivenPokeblock + end + +LilycoveCity_PokemonCenter_1F_EventScript_GivenPokeblock:: @ 82A886C + msgbox LilycoveCity_PokemonCenter_1F_Text_ThankForPokeblock, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_AskForPokeblock:: @ 82A8876 + special Script_BufferContestLadyCategoryAndMonName + msgbox LilycoveCity_PokemonCenter_1F_Text_MyFriendDisplaysQuality, MSGBOX_DEFAULT + checkitem ITEM_POKEBLOCK_CASE, 1 + compare VAR_RESULT, FALSE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoPokeblockCase + msgbox LilycoveCity_PokemonCenter_1F_Text_AskingForOnePokeblock, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock + compare VAR_RESULT, YES + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock + end + +LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock:: @ 82A88B0 + msgbox LilycoveCity_PokemonCenter_1F_Text_WhatACheapskate, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock:: @ 82A88BA + fadescreen 1 + special OpenPokeblockCaseForContestLady + waitstate + compare VAR_RESULT, 0xFFFF + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskQuitGivingPokeblock + compare VAR_RESULT, 0xFFFF + goto_if_ne LilycoveCity_PokemonCenter_1F_EventScript_GivePokeblock + end + +LilycoveCity_PokemonCenter_1F_EventScript_AskQuitGivingPokeblock:: @ 82A88D7 + msgbox LilycoveCity_PokemonCenter_1F_Text_ICantHaveOnePokeblock, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock + compare VAR_RESULT, NO + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock + end + +LilycoveCity_PokemonCenter_1F_EventScript_GivePokeblock:: @ 82A88F6 + msgbox LilycoveCity_PokemonCenter_1F_Text_IllUseYourPokeblock, MSGBOX_DEFAULT + special SetContestLadyGivenPokeblock + special GetContestLadyMonSpecies + goto LilycoveCity_PokemonCenter_1F_EventScript_FeedPokeblock + end + +@ VAR_0x8004 here is the return value from GivePokeblockToContestLady +LilycoveCity_PokemonCenter_1F_EventScript_FeedPokeblock:: @ 82A890A + applymovement 4, LilycoveCity_PokemonCenter_1F_Movement_LadyFaceMon + waitmovement 0 + delay 60 + applymovement 5, LilycoveCity_PokemonCenter_1F_Movement_MonFaceLady + waitmovement 0 + delay 60 + waitse + playmoncry VAR_0x8005, 0 + delay 120 + waitmoncry + compare VAR_0x8004, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_MonEnjoyPokeblock + goto LilycoveCity_PokemonCenter_1F_EventScript_FinishFeedPokeblock + end + +@ VAR_0x8004 here is the return value from GivePokeblockToContestLady +LilycoveCity_PokemonCenter_1F_EventScript_MonEnjoyPokeblock:: @ 82A893F + applymovement 5, LilycoveCity_PokemonCenter_1F_Movement_MonJump + waitmovement 0 + delay 60 +LilycoveCity_PokemonCenter_1F_EventScript_FinishFeedPokeblock:: @ 82A894C + applymovement 4, LilycoveCity_PokemonCenter_1F_Movement_LadyFacePlayer + waitmovement 0 + delay 60 + compare VAR_0x8004, 0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_MonDislikedPokeblock + compare VAR_0x8004, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_MonLikedPokeblock + end + +LilycoveCity_PokemonCenter_1F_EventScript_MonDislikedPokeblock:: @ 82A8970 + msgbox LilycoveCity_PokemonCenter_1F_Text_NoChangeThanks, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_CheckAirContestLadyShow + end + +LilycoveCity_PokemonCenter_1F_EventScript_MonLikedPokeblock:: @ 82A897E + special Script_BufferContestLadyCategoryAndMonName + msgbox LilycoveCity_PokemonCenter_1F_Text_ReallyImprovedThanks, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_CheckAirContestLadyShow + end + +LilycoveCity_PokemonCenter_1F_EventScript_CheckAirContestLadyShow:: @ 82A898F + specialvar VAR_RESULT, ShouldContestLadyShowGoOnAir + compare VAR_RESULT, 1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AirContestLadyShow + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_AirContestLadyShow:: @ 82A89A1 + msgbox LilycoveCity_PokemonCenter_1F_Text_ReadyToEnterContests, MSGBOX_DEFAULT + special PutLilycoveContestLadyShowOnTheAir + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_NoPokeblockCase:: @ 82A89AE + msgbox LilycoveCity_PokemonCenter_1F_Text_DontHaveAPokeblockCase, MSGBOX_DEFAULT + release + end + +LilycoveCity_PokemonCenter_1F_Movement_LadyFaceMon: @ 82A89B8 + face_right + delay_8 + step_end + +LilycoveCity_PokemonCenter_1F_Movement_MonFaceLady: @ 82A89BB + face_left + delay_8 + step_end + +@ Unused +LilycoveCity_PokemonCenter_1F_Movement_MonFaceDown: @ 82A89BE + face_down + step_end + +LilycoveCity_PokemonCenter_1F_Movement_LadyFacePlayer: @ 82A89C0 + face_player + step_end + +LilycoveCity_PokemonCenter_1F_Movement_MonJump: @ 82A89C2 + disable_jump_landing_ground_effect + jump_in_place_left + disable_jump_landing_ground_effect + jump_in_place_left + step_end + +LilycoveCity_PokemonCenter_1F_EventScript_ContestLadyMon:: @ 82A89C7 + specialvar VAR_RESULT, GetContestLadyCategory + special Script_BufferContestLadyCategoryAndMonName + special GetContestLadyMonSpecies + compare VAR_RESULT, CONTEST_CATEGORY_COOL + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_Zigzagoon + compare VAR_RESULT, CONTEST_CATEGORY_BEAUTY + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_Skitty + compare VAR_RESULT, CONTEST_CATEGORY_CUTE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_Poochyena + compare VAR_RESULT, CONTEST_CATEGORY_SMART + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_Kecleon + compare VAR_RESULT, CONTEST_CATEGORY_TOUGH + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_Pikachu + end + +LilycoveCity_PokemonCenter_1F_EventScript_Zigzagoon:: @ 82A8A0A + lock + faceplayer + waitse + playmoncry VAR_0x8005, 0 + msgbox LilycoveCity_PokemonCenter_1F_Text_Zigzagoon, MSGBOX_DEFAULT + waitmoncry + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_Skitty:: @ 82A8A1D + lock + faceplayer + waitse + playmoncry VAR_0x8005, 0 + msgbox LilycoveCity_PokemonCenter_1F_Text_Skitty, MSGBOX_DEFAULT + waitmoncry + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_Poochyena:: @ 82A8A30 + lock + faceplayer + waitse + playmoncry VAR_0x8005, 0 + msgbox LilycoveCity_PokemonCenter_1F_Text_Poochyena, MSGBOX_DEFAULT + waitmoncry + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_Kecleon:: @ 82A8A43 + lock + faceplayer + waitse + playmoncry VAR_0x8005, 0 + msgbox LilycoveCity_PokemonCenter_1F_Text_Kecleon, MSGBOX_DEFAULT + waitmoncry + release + end + +LilycoveCity_PokemonCenter_1F_EventScript_Pikachu:: @ 82A8A56 + lock + faceplayer + waitse + playmoncry VAR_0x8005, 0 + msgbox LilycoveCity_PokemonCenter_1F_Text_Pikachu, MSGBOX_DEFAULT + waitmoncry + release + end + +LilycoveCity_PokemonCenter_1F_Text_ImTheFavorLady: @ 82A8A69 + .string "I'm the FAVOR LADY…$" + +LilycoveCity_PokemonCenter_1F_Text_ObsessedWithThing: @ 82A8A7D + .string "I've recently developed an obsession\n" + .string "for {STR_VAR_1} things…$" + +LilycoveCity_PokemonCenter_1F_Text_ThankYouForLastTime: @ 82A8AB1 + .string "Oh…\n" + .string "Thank you for last time…$" + +LilycoveCity_PokemonCenter_1F_Text_PlayerGaveMeBadThing: @ 82A8ACE + .string "Before, I think it was {STR_VAR_3}…\p" + .string "{STR_VAR_3} gave me one {STR_VAR_2},\n" + .string "saying it was {STR_VAR_1}.\p" + .string "But it wasn't {STR_VAR_1}.\n" + .string "Not in the least bit.$" + +LilycoveCity_PokemonCenter_1F_Text_PlayerGaveMeGreatThing: @ 82A8B36 + .string "Before, {STR_VAR_3} gave me a very\n" + .string "{STR_VAR_1} {STR_VAR_2}.\p" + .string "I cherish it now.$" + +LilycoveCity_PokemonCenter_1F_Text_WillYouShareThing: @ 82A8B69 + .string "Listen, if you have anything that\n" + .string "is {STR_VAR_1}, will you share it\l" + .string "with me?$" + +LilycoveCity_PokemonCenter_1F_Text_WhatWillYouGiveMe: @ 82A8BAD + .string "…Really?\n" + .string "What will you give me?$" + +LilycoveCity_PokemonCenter_1F_Text_IsThatSoGoodbye: @ 82A8BCD + .string "Is that so?\n" + .string "Then, it's good-bye…$" + +LilycoveCity_PokemonCenter_1F_Text_NotWillingToShare: @ 82A8BEE + .string "Oh…\n" + .string "You're not willing to share?$" + +LilycoveCity_PokemonCenter_1F_Text_IllTryToCherishIt: @ 82A8C0F + .string "Oh?\n" + .string "That {STR_VAR_2} is {STR_VAR_1}?\p" + .string "…Oh, is that right?\p" + .string "Well, I owe you a thanks anyway.\n" + .string "I'll try to cherish it…$" + +LilycoveCity_PokemonCenter_1F_Text_IWillCherishThis: @ 82A8C6F + .string "Oh…\p" + .string "That's a quite {STR_VAR_1}\n" + .string "{STR_VAR_2}…\p" + .string "Isn't it nice?\n" + .string "It's so dreamy…\p" + .string "Thank you…\n" + .string "I will cherish this…$" + +LilycoveCity_PokemonCenter_1F_Text_IWillTreasureThis: @ 82A8CC8 + .string "…Oh, oh, oh…\p" + .string "This is amazing!\n" + .string "This really is {STR_VAR_1}!\p" + .string "I never knew that one {STR_VAR_2}\n" + .string "could be this {STR_VAR_1}!\p" + .string "Thank you!\p" + .string "I will treasure this for the rest\n" + .string "of my life!$" + +LilycoveCity_PokemonCenter_1F_Text_IllGiveYouThisInReturn: @ 82A8D5D + .string "I'll give you this wonderful item in\n" + .string "return for your fabulous gift.\p" + .string "I hope you will cherish it…$" + +LilycoveCity_PokemonCenter_1F_Text_YouDontHaveSpaceForIt: @ 82A8DBD + .string "Oh, you can't have it if you don't have\n" + .string "the space for it.\p" + .string "Please come see me when you get\n" + .string "your BAG organized…$" + +LilycoveCity_PokemonCenter_1F_Text_ImTheQuizLady: @ 82A8E2B + .string "I'm the QUIZ LADY!\n" + .string "I love quizzes!$" + +LilycoveCity_PokemonCenter_1F_Text_WaitingToTakeYourQuiz: @ 82A8E4E + .string "Oh?\p" + .string "I'm waiting for a challenger to answer\n" + .string "the quiz you made.\p" + .string "We can chat another time, okay?$" + +LilycoveCity_PokemonCenter_1F_Text_WaitingForChallenger: @ 82A8EAC + .string "I'm waiting for someone to challenge\n" + .string "a quiz this {STR_VAR_1} thought up!$" + +LilycoveCity_PokemonCenter_1F_Text_TakeQuizChallenge: @ 82A8EEC + .string "If you answer correctly, you can win\n" + .string "fabulous prizes!\p" + .string "Would you like to take the quiz\n" + .string "challenge?$" + +LilycoveCity_PokemonCenter_1F_Text_WaitForAnswer: @ 82A8F4D + .string "… … … … … …\n" + .string "… … … … … …$" + +LilycoveCity_PokemonCenter_1F_Text_HowBoringBye: @ 82A8F65 + .string "Oh, how boring!\n" + .string "Bye-bye!$" + +LilycoveCity_PokemonCenter_1F_Text_YoureGoingToQuit: @ 82A8F7E + .string "Awww!\n" + .string "You're going to quit?$" + +LilycoveCity_PokemonCenter_1F_Text_TakeTheQuizAnotherTime: @ 82A8F9A + .string "Please take the quiz challenge\n" + .string "another time!$" + +LilycoveCity_PokemonCenter_1F_Text_YouGotItRight: @ 82A8FC7 + .string "You're amazing! You've got it right!\n" + .string "You're one sharp customer!$" + +LilycoveCity_PokemonCenter_1F_Text_YouGotItRightYouveWonPersonsPrize: @ 82A9007 + .string "Congratulations!\n" + .string "You've got the quiz right!\p" + .string "You've won a prize provided by\n" + .string "{STR_VAR_1}!$" + +@ Unused +LilycoveCity_PokemonCenter_1F_Text_XReceivedOneY: @ 82A9056 + .string "{STR_VAR_1} received\n" + .string "one {STR_VAR_2}!$" + +LilycoveCity_PokemonCenter_1F_Text_YourBagIsFilledUp: @ 82A906A + .string "Oh? Your BAG is filled up!\n" + .string "Come see me when you have room.$" + +LilycoveCity_PokemonCenter_1F_Text_WrongTheCorrectAnswerIs: @ 82A90A5 + .string "Hmm… Wrong!\n" + .string "The correct answer is “{STR_VAR_3}”!$" + +LilycoveCity_PokemonCenter_1F_Text_IGetToKeepPrize: @ 82A90CD + .string "Too bad!\p" + .string "I get to keep the quiz prize\n" + .string "{STR_VAR_1} now!$" + +LilycoveCity_PokemonCenter_1F_Text_MakeYourOwnQuiz: @ 82A90FB + .string "Listen, listen!\n" + .string "Would you like to make your own quiz?$" + +LilycoveCity_PokemonCenter_1F_Text_MaybeNextTime: @ 82A9131 + .string "Oh, I see…\n" + .string "Well, maybe next time!$" + +LilycoveCity_PokemonCenter_1F_Text_PickYourPrize: @ 82A9153 + .string "Okay, the first thing you have to do\n" + .string "is pick the prize for the person that\l" + .string "answers your quiz correctly.\p" + .string "But beware, if the person taking\n" + .string "the quiz can't get it right, I get to\l" + .string "keep the prize!$" + +LilycoveCity_PokemonCenter_1F_Text_QuitChoosingPrize: @ 82A9212 + .string "If you don't choose a prize,\n" + .string "your quiz can't be made.\p" + .string "Are you going to quit making\n" + .string "your quiz?$" + +LilycoveCity_PokemonCenter_1F_Text_WriteYourQuiz: @ 82A9270 + .string "Oh, how nice!\n" + .string "That's a wonderful prize!\p" + .string "Next, you need to write your quiz\n" + .string "question and its answer.$" + +LilycoveCity_PokemonCenter_1F_Text_QuitWritingQuizQuestion: @ 82A92D3 + .string "Are you going to quit writing\n" + .string "your quiz question?$" + +@ Unused +LilycoveCity_PokemonCenter_1F_Text_QuitWritingQuizAnswer: @ 82A9305 + .string "Are you going to quit choosing\n" + .string "your quiz answer?$" + +LilycoveCity_PokemonCenter_1F_Text_IllLookForAChallenger: @ 82A9336 + .string "Thank you!\n" + .string "You've put together a nice quiz.\p" + .string "I'll go look for someone who'll take\n" + .string "your quiz challenge right away.$" + +LilycoveCity_PokemonCenter_1F_Text_ImTheContestLady: @ 82A93A7 + .string "I'm the CONTEST LADY!\n" + .string "I sure do love CONTESTS!$" + +LilycoveCity_PokemonCenter_1F_Text_ThankForPokeblock: @ 82A93D6 + .string "Thanks for your {POKEBLOCK} before!$" + +LilycoveCity_PokemonCenter_1F_Text_MyFriendDisplaysQuality: @ 82A93F4 + .string "This is my friend {STR_VAR_1}!\n" + .string "It's the epitome of {STR_VAR_2}!\p" + .string "But I think that it will display\n" + .string "even more {STR_VAR_2}!$" + +LilycoveCity_PokemonCenter_1F_Text_DontHaveAPokeblockCase: @ 82A9451 + .string "So, I need your help!\p" + .string "Please, may I have one {POKEBLOCK}?\n" + .string "All I'm asking for is one!\p" + .string "…Oh, but…\n" + .string "Don't you have a {POKEBLOCK} CASE?\l" + .string "That's no good. Next time, then!$" + +LilycoveCity_PokemonCenter_1F_Text_AskingForOnePokeblock: @ 82A94E8 + .string "So, I need your help!\p" + .string "Please, may I have one {POKEBLOCK}?\n" + .string "All I'm asking for is one!$" + +LilycoveCity_PokemonCenter_1F_Text_ICantHaveOnePokeblock: @ 82A9537 + .string "Awww!\n" + .string "I can't have one {POKEBLOCK}?!$" + +LilycoveCity_PokemonCenter_1F_Text_WhatACheapskate: @ 82A9556 + .string "Sheesh!\n" + .string "What a cheapskate!$" + +LilycoveCity_PokemonCenter_1F_Text_IllUseYourPokeblock: @ 82A9571 + .string "Yay!\n" + .string "Thank you!\p" + .string "I'll feed my POKéMON your {POKEBLOCK}\n" + .string "right away.$" + +LilycoveCity_PokemonCenter_1F_Text_NoChangeThanks: @ 82A95AD + .string "…It doesn't seem to have changed\n" + .string "in any way at all…\p" + .string "Hmm…\p" + .string "Oh, well!\n" + .string "Thank you very much!$" + +LilycoveCity_PokemonCenter_1F_Text_ReallyImprovedThanks: @ 82A9605 + .string "Oh, yay!\n" + .string "It's really delighted!\p" + .string "I think it really improved {STR_VAR_1}'s\n" + .string "{STR_VAR_2} quality, too.\p" + .string "Thank you so much!$" + +LilycoveCity_PokemonCenter_1F_Text_ReadyToEnterContests: @ 82A9669 + .string "Hmm…\p" + .string "I think we may be ready to enter\n" + .string "some CONTESTS.\p" + .string "If you see us in one somewhere,\n" + .string "I hope you'll cheer for us.$" + +LilycoveCity_PokemonCenter_1F_Text_Zigzagoon: @ 82A96DA + .string "{STR_VAR_1}: Guguuh!$" + +LilycoveCity_PokemonCenter_1F_Text_Kecleon: @ 82A96E6 + .string "{STR_VAR_1}: Igigigiiih!$" + +LilycoveCity_PokemonCenter_1F_Text_Poochyena: @ 82A96F6 + .string "{STR_VAR_1}: Baaarun…$" + +LilycoveCity_PokemonCenter_1F_Text_Pikachu: @ 82A9703 + .string "{STR_VAR_1}: Pikka!$" + +LilycoveCity_PokemonCenter_1F_Text_Skitty: @ 82A970E + .string "{STR_VAR_1}: Umyaaaan!$" diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 0ab47ea80..34622775a 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -1,273 +1,277 @@ -MauvilleCity_PokemonCenter_1F_EventScript_28E066:: @ 828E066 +MauvilleCity_PokemonCenter_1F_EventScript_MauvilleOldMan:: @ 828E066 special ScrSpecial_GetCurrentMauvilleMan switch VAR_RESULT - case 0, MauvilleCity_PokemonCenter_1F_EventScript_28E0A6 - case 1, MauvilleCity_PokemonCenter_1F_EventScript_28E167 - case 2, MauvilleCity_PokemonCenter_1F_EventScript_28E4D4 - case 3, MauvilleCity_PokemonCenter_1F_EventScript_29014A - case 4, MauvilleCity_PokemonCenter_1F_EventScript_2902F6 + case MAUVILLE_MAN_BARD, MauvilleCity_PokemonCenter_1F_EventScript_Bard + case MAUVILLE_MAN_HIPSTER, MauvilleCity_PokemonCenter_1F_EventScript_Hipster + case MAUVILLE_MAN_TRADER, MauvilleCity_PokemonCenter_1F_EventScript_Trader + case MAUVILLE_MAN_STORYTELLER, MauvilleCity_PokemonCenter_1F_EventScript_Storyteller + case MAUVILLE_MAN_GIDDY, MauvilleCity_PokemonCenter_1F_EventScript_Giddy end -MauvilleCity_PokemonCenter_1F_EventScript_28E0A6:: @ 828E0A6 +@ Bard +MauvilleCity_PokemonCenter_1F_EventScript_Bard:: @ 828E0A6 lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_29038E, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0C7 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0EA + msgbox MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToHearMySong, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PlaySong + compare VAR_RESULT, NO + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineSong end -MauvilleCity_PokemonCenter_1F_EventScript_28E0C7:: @ 828E0C7 +MauvilleCity_PokemonCenter_1F_EventScript_PlaySong:: @ 828E0C7 setvar VAR_0x8004, 0 special ScrSpecial_PlayBardSong delay 60 special ScrSpecial_HasBardSongBeenChanged - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0F4 - msgbox MauvilleCity_PokemonCenter_1F_Text_2903E6, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_AskToWriteLyrics + msgbox MauvilleCity_PokemonCenter_1F_Text_WishICouldPlaySongForOthers, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E0EA:: @ 828E0EA - msgbox MauvilleCity_PokemonCenter_1F_Text_2903C0, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_DeclineSong:: @ 828E0EA + msgbox MauvilleCity_PokemonCenter_1F_Text_BardFeelingTheBlues1, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E0F4:: @ 828E0F4 - msgbox MauvilleCity_PokemonCenter_1F_Text_290421, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D +MauvilleCity_PokemonCenter_1F_EventScript_AskToWriteLyrics:: @ 828E0F4 + msgbox MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToWriteSomeLyrics, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics + compare VAR_RESULT, NO + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineWritingLyrics end -MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113 +MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics:: @ 828E113 setvar VAR_0x8004, EASY_CHAT_TYPE_BARD_SONG call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D - msgbox MauvilleCity_PokemonCenter_1F_Text_2904C1, MSGBOX_DEFAULT + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineWritingLyrics + msgbox MauvilleCity_PokemonCenter_1F_Text_LetMeSingItForYou, MSGBOX_DEFAULT setvar VAR_0x8004, 1 special ScrSpecial_PlayBardSong delay 60 - msgbox MauvilleCity_PokemonCenter_1F_Text_2904EB, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 + msgbox MauvilleCity_PokemonCenter_1F_Text_ThatHowYouWantedSongToGo, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics special ScrSpecial_SaveBardSongLyrics - msgbox MauvilleCity_PokemonCenter_1F_Text_290514, MSGBOX_DEFAULT + msgbox MauvilleCity_PokemonCenter_1F_Text_IllSingThisSongForAWhile, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E15D:: @ 828E15D - msgbox MauvilleCity_PokemonCenter_1F_Text_29049B, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_DeclineWritingLyrics:: @ 828E15D + msgbox MauvilleCity_PokemonCenter_1F_Text_BardFeelingTheBlues2, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E167:: @ 828E167 +@ Hipster +MauvilleCity_PokemonCenter_1F_EventScript_Hipster:: @ 828E167 lock faceplayer setflag FLAG_SYS_HIPSTER_MEET - msgbox MauvilleCity_PokemonCenter_1F_Text_29054C, MSGBOX_DEFAULT + msgbox MauvilleCity_PokemonCenter_1F_Text_TeachWhatsHipAndHappening, MSGBOX_DEFAULT special ScrSpecial_GetHipsterSpokenFlag - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E18C - msgbox MauvilleCity_PokemonCenter_1F_Text_290598, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTeachWord + msgbox MauvilleCity_PokemonCenter_1F_Text_IAlreadyTaughtYou, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E18C:: @ 828E18C +MauvilleCity_PokemonCenter_1F_EventScript_TryTeachWord:: @ 828E18C special ScrSpecial_HipsterTeachWord - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E1A4 - msgbox MauvilleCity_PokemonCenter_1F_Text_290602, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TeachWord + msgbox MauvilleCity_PokemonCenter_1F_Text_IveGotNothingNewToTeach, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E1A4:: @ 828E1A4 - msgbox MauvilleCity_PokemonCenter_1F_Text_290666, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_TeachWord:: @ 828E1A4 + msgbox MauvilleCity_PokemonCenter_1F_Text_HaveYouHeardOfPhrase, MSGBOX_DEFAULT special ScrSpecial_SetHipsterSpokenFlag release end -MauvilleCity_PokemonCenter_1F_Text_28E1B1: @ 828E1B1 +@ Trader +MauvilleCity_PokemonCenter_1F_Text_WantToTradeDecor: @ 828E1B1 .string "Hi, I'm the TRADER.\n" .string "Want to trade decorations with me?$" -MauvilleCity_PokemonCenter_1F_Text_28E1E8: @ 828E1E8 +MauvilleCity_PokemonCenter_1F_Text_TraderFeelingTheBlues: @ 828E1E8 .string "Oh…\n" .string "You've left me feeling the blues…$" -MauvilleCity_PokemonCenter_1F_Text_28E20E: @ 828E20E +MauvilleCity_PokemonCenter_1F_Text_WeveAlreadyTraded: @ 828E20E .string "But we've traded decorations already,\n" .string "you and I.$" -MauvilleCity_PokemonCenter_1F_Text_28E23F: @ 828E23F +MauvilleCity_PokemonCenter_1F_Text_PickADecorItem: @ 828E23F .string "If you see any decorative item that\n" .string "you want of mine, speak up.$" -MauvilleCity_PokemonCenter_1F_Text_28E27F: @ 828E27F +MauvilleCity_PokemonCenter_1F_Text_YouDontWantAnything: @ 828E27F .string "You don't want anything?\n" .string "I feel unwanted…$" -MauvilleCity_PokemonCenter_1F_Text_28E2A9: @ 828E2A9 +MauvilleCity_PokemonCenter_1F_Text_OnceBelongedToPlayerDoYouWantIt: @ 828E2A9 .string "That decorative item once belonged\n" .string "to {STR_VAR_1}.\p" .string "Do you want it?$" -MauvilleCity_PokemonCenter_1F_Text_28E2E3: @ 828E2E3 +MauvilleCity_PokemonCenter_1F_Text_YouDontHaveAnyDecor: @ 828E2E3 .string "Uh… Wait a second. You don't have a\n" .string "single piece of decoration!$" -MauvilleCity_PokemonCenter_1F_Text_28E323: @ 828E323 +MauvilleCity_PokemonCenter_1F_Text_PickTheDecorToTrade: @ 828E323 .string "Okay, pick the decoration that you'll\n" .string "trade to me.$" -MauvilleCity_PokemonCenter_1F_Text_28E356: @ 828E356 +MauvilleCity_PokemonCenter_1F_Text_YouDontWantToTrade: @ 828E356 .string "You won't trade with me?\n" .string "I feel unwanted…$" -MauvilleCity_PokemonCenter_1F_Text_28E380: @ 828E380 +MauvilleCity_PokemonCenter_1F_Text_YouveNoRoomForThis: @ 828E380 .string "You've got all the {STR_VAR_2}S that can\n" .string "be stored. You've no room for this.$" -MauvilleCity_PokemonCenter_1F_Text_28E3C4: @ 828E3C4 +MauvilleCity_PokemonCenter_1F_Text_SoWellTradeTheseDecor: @ 828E3C4 .string "Okay, so we'll trade my {STR_VAR_3}\n" .string "for your {STR_VAR_2}?$" -MauvilleCity_PokemonCenter_1F_Text_28E3EC: @ 828E3EC +MauvilleCity_PokemonCenter_1F_Text_ThatDecorIsInUse: @ 828E3EC .string "That piece of decoration is in use.\n" .string "You can't trade it.$" -MauvilleCity_PokemonCenter_1F_Text_28E424: @ 828E424 +MauvilleCity_PokemonCenter_1F_Text_SendDecorToYourPC: @ 828E424 .string "Then we'll trade!\n" .string "I'll send my decoration to your PC.$" -MauvilleCity_PokemonCenter_1F_Text_28E45A: @ 828E45A +MauvilleCity_PokemonCenter_1F_Text_CantTradeThatOne: @ 828E45A .string "Oops! Sorry! That's a really rare\n" .string "piece of decoration.\l" .string "I can't trade that one away!\p" .string "Can I interest you in something else?$" -MauvilleCity_PokemonCenter_1F_EventScript_28E4D4:: @ 828E4D4 +MauvilleCity_PokemonCenter_1F_EventScript_Trader:: @ 828E4D4 lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_28E1B1, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E503 + msgbox MauvilleCity_PokemonCenter_1F_Text_WantToTradeDecor, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineTrade special ScrSpecial_GetTraderTradedFlag - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E50D - message MauvilleCity_PokemonCenter_1F_Text_28E23F + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_AlreadyTraded + message MauvilleCity_PokemonCenter_1F_Text_PickADecorItem waitmessage - goto MauvilleCity_PokemonCenter_1F_EventScript_28E517 + goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive end -MauvilleCity_PokemonCenter_1F_EventScript_28E503:: @ 828E503 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E1E8, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_DeclineTrade:: @ 828E503 + msgbox MauvilleCity_PokemonCenter_1F_Text_TraderFeelingTheBlues, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E50D:: @ 828E50D - msgbox MauvilleCity_PokemonCenter_1F_Text_28E20E, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_AlreadyTraded:: @ 828E50D + msgbox MauvilleCity_PokemonCenter_1F_Text_WeveAlreadyTraded, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E517:: @ 828E517 +MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive:: @ 828E517 special ScrSpecial_TraderMenuGetDecoration waitstate compare VAR_0x8004, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E558 - compare VAR_0x8004, 65535 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E562 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E2A9, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E56E + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_CancelPickDecor + compare VAR_0x8004, 0xFFFF + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_InvalidDecor + msgbox MauvilleCity_PokemonCenter_1F_Text_OnceBelongedToPlayerDoYouWantIt, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PickDifferentDecor special ScrSpecial_DoesPlayerHaveNoDecorations - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E57A - goto MauvilleCity_PokemonCenter_1F_EventScript_28E584 + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DontHaveAnyDecor + goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive end -MauvilleCity_PokemonCenter_1F_EventScript_28E558:: @ 828E558 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E27F, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_CancelPickDecor:: @ 828E558 + msgbox MauvilleCity_PokemonCenter_1F_Text_YouDontWantAnything, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E562:: @ 828E562 - message MauvilleCity_PokemonCenter_1F_Text_28E45A +MauvilleCity_PokemonCenter_1F_EventScript_InvalidDecor:: @ 828E562 + message MauvilleCity_PokemonCenter_1F_Text_CantTradeThatOne waitmessage - goto MauvilleCity_PokemonCenter_1F_EventScript_28E517 + goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive end -MauvilleCity_PokemonCenter_1F_EventScript_28E56E:: @ 828E56E - message MauvilleCity_PokemonCenter_1F_Text_28E23F +MauvilleCity_PokemonCenter_1F_EventScript_PickDifferentDecor:: @ 828E56E + message MauvilleCity_PokemonCenter_1F_Text_PickADecorItem waitmessage - goto MauvilleCity_PokemonCenter_1F_EventScript_28E517 + goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive end -MauvilleCity_PokemonCenter_1F_EventScript_28E57A:: @ 828E57A - msgbox MauvilleCity_PokemonCenter_1F_Text_28E2E3, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_DontHaveAnyDecor:: @ 828E57A + msgbox MauvilleCity_PokemonCenter_1F_Text_YouDontHaveAnyDecor, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E584:: @ 828E584 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E323, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive:: @ 828E584 + msgbox MauvilleCity_PokemonCenter_1F_Text_PickTheDecorToTrade, MSGBOX_DEFAULT special ScrSpecial_TraderMenuGiveDecoration waitstate compare VAR_0x8006, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5D4 - compare VAR_0x8006, 65535 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5DE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_CancelGiveDecor + compare VAR_0x8006, 0xFFFF + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DecorInUse special ScrSpecial_IsDecorationFull - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5EC - msgbox MauvilleCity_PokemonCenter_1F_Text_28E3C4, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E584 + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_NoRoomForDecor + msgbox MauvilleCity_PokemonCenter_1F_Text_SoWellTradeTheseDecor, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive special ScrSpecial_TraderDoDecorationTrade - msgbox MauvilleCity_PokemonCenter_1F_Text_28E424, MSGBOX_DEFAULT + msgbox MauvilleCity_PokemonCenter_1F_Text_SendDecorToYourPC, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E5D4:: @ 828E5D4 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E356, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_CancelGiveDecor:: @ 828E5D4 + msgbox MauvilleCity_PokemonCenter_1F_Text_YouDontWantToTrade, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_28E5DE:: @ 828E5DE - msgbox MauvilleCity_PokemonCenter_1F_Text_28E3EC, MSGBOX_DEFAULT - goto MauvilleCity_PokemonCenter_1F_EventScript_28E584 +MauvilleCity_PokemonCenter_1F_EventScript_DecorInUse:: @ 828E5DE + msgbox MauvilleCity_PokemonCenter_1F_Text_ThatDecorIsInUse, MSGBOX_DEFAULT + goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive end -MauvilleCity_PokemonCenter_1F_EventScript_28E5EC:: @ 828E5EC - msgbox MauvilleCity_PokemonCenter_1F_Text_28E380, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_NoRoomForDecor:: @ 828E5EC + msgbox MauvilleCity_PokemonCenter_1F_Text_YouveNoRoomForThis, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_Text_28E5F6: @ 828E5F6 +@ Storyteller +MauvilleCity_PokemonCenter_1F_Text_WillYouHearMyTale: @ 828E5F6 .string "I'm the STORYTELLER.\n" .string "I'll tell you tales of legendary\l" .string "TRAINERS.\p" .string "Will you hear my tale?$" -MauvilleCity_PokemonCenter_1F_Text_28E64D: @ 828E64D +MauvilleCity_PokemonCenter_1F_Text_StorytellerFeelingTheBlues: @ 828E64D .string "Oh…\n" .string "You've left me feeling the blues…$" -MauvilleCity_PokemonCenter_1F_Text_28E673: @ 828E673 +MauvilleCity_PokemonCenter_1F_Text_WhichTaleToTell: @ 828E673 .string "I know of these legends.\n" .string "Which tale will you have me tell?$" -MauvilleCity_PokemonCenter_1F_Text_28E6AE: @ 828E6AE +MauvilleCity_PokemonCenter_1F_Text_IKnowNoTales: @ 828E6AE .string "But, I know of no legendary TRAINERS.\n" .string "Hence, I know no tales.\p" .string "Where does one find a TRAINER worthy\n" .string "of a legendary tale?$" -MauvilleCity_PokemonCenter_1F_Text_28E726: @ 828E726 +MauvilleCity_PokemonCenter_1F_Text_YouDidStatXTimes: @ 828E726 .string "What's that?!\n" .string "You… You…\p" .string "{STR_VAR_2}\n" @@ -275,12 +279,12 @@ MauvilleCity_PokemonCenter_1F_Text_28E726: @ 828E726 .string "That is indeed magnificent!\n" .string "It's the birth of a new legend!$" -MauvilleCity_PokemonCenter_1F_Text_28E78A: @ 828E78A +MauvilleCity_PokemonCenter_1F_Text_CouldThereBeOtherLegends: @ 828E78A .string "It gets me thinking, could there be\n" .string "other TRAINERS with more impressive\l" .string "legends awaiting discovery?$" -MauvilleCity_PokemonCenter_1F_Text_28E7EE: @ 828E7EE +MauvilleCity_PokemonCenter_1F_Text_HaveYouAnyLegendaryTales: @ 828E7EE .string "Are you a TRAINER?\p" .string "Then tell me, have you any tales that\n" .string "are even remotely legendary?$" @@ -289,24 +293,24 @@ MauvilleCity_PokemonCenter_1F_Text_28E844: @ 828E844 .string "Incidentally… Would you care to hear\n" .string "another legendary tale?$" -MauvilleCity_PokemonCenter_1F_Text_28E881: @ 828E881 +MauvilleCity_PokemonCenter_1F_Text_NotWorthyOfLegend: @ 828E881 .string "Hmm…\n" .string "I'm not satisfied…\p" .string "I wish you would bring me news worthy\n" .string "of being called a legend.$" -MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9 +MauvilleCity_PokemonCenter_1F_Text_IWishMorePeopleWereInterested: @ 828E8D9 .string "I wish more people would be interested\n" .string "in hearing my epic tales of legendary\l" .string "TRAINERS.$" -MauvilleCity_PokemonCenter_1F_Text_28E930:: @ 828E930 +MauvilleCity_PokemonCenter_1F_Text_SavedGameTitle:: @ 828E930 .string "The Save-Happy TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28E947:: @ 828E947 +MauvilleCity_PokemonCenter_1F_Text_SavedGameAction:: @ 828E947 .string "Saved the game$" -MauvilleCity_PokemonCenter_1F_Text_28E956:: @ 828E956 +MauvilleCity_PokemonCenter_1F_Text_SavedGameStory:: @ 828E956 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER saved the game\n" @@ -314,13 +318,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E956:: @ 828E956 .string "A more cautious TRAINER than\n" .string "{STR_VAR_3} one will never find!$" -MauvilleCity_PokemonCenter_1F_Text_28E9D7:: @ 828E9D7 +MauvilleCity_PokemonCenter_1F_Text_TrendsStartedTitle:: @ 828E9D7 .string "The Trendsetter TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28E9EF:: @ 828E9EF +MauvilleCity_PokemonCenter_1F_Text_TrendsStartedAction:: @ 828E9EF .string "Started trends$" -MauvilleCity_PokemonCenter_1F_Text_28E9FE:: @ 828E9FE +MauvilleCity_PokemonCenter_1F_Text_TrendsStartedStory:: @ 828E9FE .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER started new trends\n" @@ -328,13 +332,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E9FE:: @ 828E9FE .string "{STR_VAR_3} is setting trends for all\n" .string "the HOENN region!$" -MauvilleCity_PokemonCenter_1F_Text_28EA7D:: @ 828EA7D +MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedTitle:: @ 828EA7D .string "The BERRY-Planting TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28EA98:: @ 828EA98 +MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedAction:: @ 828EA98 .string "Planted BERRIES$" -MauvilleCity_PokemonCenter_1F_Text_28EAA8:: @ 828EAA8 +MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedStory:: @ 828EAA8 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER planted BERRIES\n" @@ -342,13 +346,13 @@ MauvilleCity_PokemonCenter_1F_Text_28EAA8:: @ 828EAA8 .string "{STR_VAR_3} is a legendary lover of\n" .string "BERRIES!$" -MauvilleCity_PokemonCenter_1F_Text_28EB19:: @ 828EB19 +MauvilleCity_PokemonCenter_1F_Text_BikeTradesTitle:: @ 828EB19 .string "The BIKE-Loving TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28EB31:: @ 828EB31 +MauvilleCity_PokemonCenter_1F_Text_BikeTradesAction:: @ 828EB31 .string "Traded BIKES$" -MauvilleCity_PokemonCenter_1F_Text_28EB3E:: @ 828EB3E +MauvilleCity_PokemonCenter_1F_Text_BikeTradesStory:: @ 828EB3E .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER swapped BIKES\n" @@ -356,13 +360,13 @@ MauvilleCity_PokemonCenter_1F_Text_28EB3E:: @ 828EB3E .string "{STR_VAR_3} must love BIKES deeply\n" .string "and passionately!$" -MauvilleCity_PokemonCenter_1F_Text_28EBB5:: @ 828EBB5 +MauvilleCity_PokemonCenter_1F_Text_InterviewsTitle:: @ 828EBB5 .string "The Interviewed TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28EBCD:: @ 828EBCD +MauvilleCity_PokemonCenter_1F_Text_InterviewsAction:: @ 828EBCD .string "Got interviewed$" -MauvilleCity_PokemonCenter_1F_Text_28EBDD:: @ 828EBDD +MauvilleCity_PokemonCenter_1F_Text_InterviewsStory:: @ 828EBDD .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER got interviewed\n" @@ -370,26 +374,26 @@ MauvilleCity_PokemonCenter_1F_Text_28EBDD:: @ 828EBDD .string "{STR_VAR_3} must be a TRAINER who's\n" .string "attracting much attention!$" -MauvilleCity_PokemonCenter_1F_Text_28EC60:: @ 828EC60 +MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesTitle:: @ 828EC60 .string "The Battle-Happy TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28EC79:: @ 828EC79 +MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesAction:: @ 828EC79 .string "Battled$" -MauvilleCity_PokemonCenter_1F_Text_28EC81:: @ 828EC81 +MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesStory:: @ 828EC81 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER battled {STR_VAR_1} times!\p" .string "{STR_VAR_3} must be a TRAINER who can\n" .string "never refuse a chance to battle!$" -MauvilleCity_PokemonCenter_1F_Text_28ED04:: @ 828ED04 +MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtTitle:: @ 828ED04 .string "The POKéMON-Catching TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28ED21:: @ 828ED21 +MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtAction:: @ 828ED21 .string "Caught POKéMON$" -MauvilleCity_PokemonCenter_1F_Text_28ED30:: @ 828ED30 +MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtStory:: @ 828ED30 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER caught\n" @@ -397,13 +401,13 @@ MauvilleCity_PokemonCenter_1F_Text_28ED30:: @ 828ED30 .string "{STR_VAR_3} is a legendary catcher of\n" .string "wild POKéMON!$" -MauvilleCity_PokemonCenter_1F_Text_28EDA1:: @ 828EDA1 +MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtTitle:: @ 828EDA1 .string "The Fishing TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28EDB5:: @ 828EDB5 +MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtAction:: @ 828EDB5 .string "Caught POKéMON with a ROD$" -MauvilleCity_PokemonCenter_1F_Text_28EDCF:: @ 828EDCF +MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtStory:: @ 828EDCF .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER caught\n" @@ -411,13 +415,13 @@ MauvilleCity_PokemonCenter_1F_Text_28EDCF:: @ 828EDCF .string "{STR_VAR_3} is a legendary fishing\n" .string "expert!$" -MauvilleCity_PokemonCenter_1F_Text_28EE45:: @ 828EE45 +MauvilleCity_PokemonCenter_1F_Text_EggsHatchedTitle:: @ 828EE45 .string "The EGG-Warming TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28EE5D:: @ 828EE5D +MauvilleCity_PokemonCenter_1F_Text_EggsHatchedAction:: @ 828EE5D .string "Hatched EGGS$" -MauvilleCity_PokemonCenter_1F_Text_28EE6A:: @ 828EE6A +MauvilleCity_PokemonCenter_1F_Text_EggsHatchedStory:: @ 828EE6A .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER hatched {STR_VAR_1} POKéMON\n" @@ -425,13 +429,13 @@ MauvilleCity_PokemonCenter_1F_Text_28EE6A:: @ 828EE6A .string "{STR_VAR_3} is a legendary warmer\n" .string "of EGGS!$" -MauvilleCity_PokemonCenter_1F_Text_28EEDD:: @ 828EEDD +MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedTitle:: @ 828EEDD .string "The Evolver TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28EEF1:: @ 828EEF1 +MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedAction:: @ 828EEF1 .string "Evolved POKéMON$" -MauvilleCity_PokemonCenter_1F_Text_28EF01:: @ 828EF01 +MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedStory:: @ 828EF01 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER made {STR_VAR_1} POKéMON\n" @@ -439,13 +443,13 @@ MauvilleCity_PokemonCenter_1F_Text_28EF01:: @ 828EF01 .string "{STR_VAR_3} is the ultimate evolver\n" .string "of POKéMON!$" -MauvilleCity_PokemonCenter_1F_Text_28EF73:: @ 828EF73 +MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterTitle:: @ 828EF73 .string "The POKéMON CENTER-Loving TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28EF95:: @ 828EF95 +MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterAction:: @ 828EF95 .string "Used POKéMON CENTERS$" -MauvilleCity_PokemonCenter_1F_Text_28EFAA:: @ 828EFAA +MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterStory:: @ 828EFAA .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER healed POKéMON\n" @@ -453,13 +457,13 @@ MauvilleCity_PokemonCenter_1F_Text_28EFAA:: @ 828EFAA .string "There could be no greater lover of\n" .string "POKéMON CENTERS than {STR_VAR_3}!$" -MauvilleCity_PokemonCenter_1F_Text_28F045:: @ 828F045 +MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeTitle:: @ 828F045 .string "The Homebody TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28F05A:: @ 828F05A +MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeAction:: @ 828F05A .string "Rested POKéMON at home$" -MauvilleCity_PokemonCenter_1F_Text_28F071:: @ 828F071 +MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeStory:: @ 828F071 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER healed POKéMON\n" @@ -467,13 +471,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F071:: @ 828F071 .string "There could be no more of a homebody\n" .string "than {STR_VAR_3}!$" -MauvilleCity_PokemonCenter_1F_Text_28F0F3:: @ 828F0F3 +MauvilleCity_PokemonCenter_1F_Text_SafariGamesTitle:: @ 828F0F3 .string "The SAFARI-Loving TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28F10D:: @ 828F10D +MauvilleCity_PokemonCenter_1F_Text_SafariGamesAction:: @ 828F10D .string "Entered the SAFARI ZONE$" -MauvilleCity_PokemonCenter_1F_Text_28F125:: @ 828F125 +MauvilleCity_PokemonCenter_1F_Text_SafariGamesStory:: @ 828F125 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER went into the SAFARI ZONE\n" @@ -481,13 +485,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F125:: @ 828F125 .string "{STR_VAR_3} is a TRAINER whose wild side\n" .string "must come out in the SAFARI ZONE!$" -MauvilleCity_PokemonCenter_1F_Text_28F1BE:: @ 828F1BE +MauvilleCity_PokemonCenter_1F_Text_UsedCutTitle:: @ 828F1BE .string "The CUT-Frenzy TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28F1D5:: @ 828F1D5 +MauvilleCity_PokemonCenter_1F_Text_UsedCutAction:: @ 828F1D5 .string "Used CUT$" -MauvilleCity_PokemonCenter_1F_Text_28F1DE:: @ 828F1DE +MauvilleCity_PokemonCenter_1F_Text_UsedCutStory:: @ 828F1DE .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER used CUT\n" @@ -495,13 +499,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F1DE:: @ 828F1DE .string "{STR_VAR_3} is a TRAINER who just must\n" .string "love to CUT!$" -MauvilleCity_PokemonCenter_1F_Text_28F24F:: @ 828F24F +MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashTitle:: @ 828F24F .string "The ROCK-SMASHING TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28F269:: @ 828F269 +MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashAction:: @ 828F269 .string "Smashed rocks$" -MauvilleCity_PokemonCenter_1F_Text_28F277:: @ 828F277 +MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashStory:: @ 828F277 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER used ROCK SMASH\n" @@ -509,13 +513,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F277:: @ 828F277 .string "{STR_VAR_3} must be a TRAINER who\n" .string "can't leave a stone unsmashed!$" -MauvilleCity_PokemonCenter_1F_Text_28F2FC:: @ 828F2FC +MauvilleCity_PokemonCenter_1F_Text_MovedBasesTitle:: @ 828F2FC .string "The Move-Loving TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28F314:: @ 828F314 +MauvilleCity_PokemonCenter_1F_Text_MovedBasesAction:: @ 828F314 .string "Moved the SECRET BASE$" -MauvilleCity_PokemonCenter_1F_Text_28F32A:: @ 828F32A +MauvilleCity_PokemonCenter_1F_Text_MovedBasesStory:: @ 828F32A .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER moved the SECRET BASE\n" @@ -523,13 +527,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F32A:: @ 828F32A .string "{STR_VAR_3} is a TRAINER who loves\n" .string "to move houses often!$" -MauvilleCity_PokemonCenter_1F_Text_28F3AD:: @ 828F3AD +MauvilleCity_PokemonCenter_1F_Text_UsedSplashTitle:: @ 828F3AD .string "The SPLASH-Happy TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28F3C6:: @ 828F3C6 +MauvilleCity_PokemonCenter_1F_Text_UsedSplashAction:: @ 828F3C6 .string "Used SPLASH$" -MauvilleCity_PokemonCenter_1F_Text_28F3D2:: @ 828F3D2 +MauvilleCity_PokemonCenter_1F_Text_UsedSplashStory:: @ 828F3D2 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER used SPLASH\n" @@ -537,13 +541,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F3D2:: @ 828F3D2 .string "{STR_VAR_3} is a TRAINER who must love\n" .string "SPLASHING around!$" -MauvilleCity_PokemonCenter_1F_Text_28F44B:: @ 828F44B +MauvilleCity_PokemonCenter_1F_Text_UsedStruggleTitle:: @ 828F44B .string "The Tenacious TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28F461:: @ 828F461 +MauvilleCity_PokemonCenter_1F_Text_UsedStruggleAction:: @ 828F461 .string "Resorted to using STRUGGLE$" -MauvilleCity_PokemonCenter_1F_Text_28F47C:: @ 828F47C +MauvilleCity_PokemonCenter_1F_Text_UsedStruggleStory:: @ 828F47C .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER had to rely on STRUGGLE\n" @@ -551,13 +555,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F47C:: @ 828F47C .string "{STR_VAR_3} is a tenacious TRAINER\n" .string "who never gives in to adversity!$" -MauvilleCity_PokemonCenter_1F_Text_28F50C:: @ 828F50C +MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsTitle:: @ 828F50C .string "The SLOT Champ$" -MauvilleCity_PokemonCenter_1F_Text_28F51B:: @ 828F51B +MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsAction:: @ 828F51B .string "Won the jackpot on the SLOTS$" -MauvilleCity_PokemonCenter_1F_Text_28F538:: @ 828F538 +MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsStory:: @ 828F538 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER won the jackpot on\n" @@ -565,13 +569,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F538:: @ 828F538 .string "{STR_VAR_3} is a TRAINER who was lucky\n" .string "on the SLOTS!$" -MauvilleCity_PokemonCenter_1F_Text_28F5BE:: @ 828F5BE +MauvilleCity_PokemonCenter_1F_Text_RouletteWinsTitle:: @ 828F5BE .string "The ROULETTE Champ$" -MauvilleCity_PokemonCenter_1F_Text_28F5D1:: @ 828F5D1 +MauvilleCity_PokemonCenter_1F_Text_RouletteWinsAction:: @ 828F5D1 .string "Had consecutive ROULETTE wins of$" -MauvilleCity_PokemonCenter_1F_Text_28F5F2:: @ 828F5F2 +MauvilleCity_PokemonCenter_1F_Text_RouletteWinsStory:: @ 828F5F2 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER won in ROULETTE\n" @@ -579,13 +583,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F5F2:: @ 828F5F2 .string "{STR_VAR_3} was lucky when the ball\n" .string "bounced in ROULETTE!$" -MauvilleCity_PokemonCenter_1F_Text_28F678:: @ 828F678 +MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesTitle:: @ 828F678 .string "The BATTLE TOWER Challenger$" -MauvilleCity_PokemonCenter_1F_Text_28F694:: @ 828F694 +MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesAction:: @ 828F694 .string "Took the BATTLE TOWER challenge$" -MauvilleCity_PokemonCenter_1F_Text_28F6B4:: @ 828F6B4 +MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesStory:: @ 828F6B4 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER took the BATTLE TOWER\n" @@ -593,13 +597,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F6B4:: @ 828F6B4 .string "{STR_VAR_3} is a TRAINER who aspires\n" .string "for excellence in the BATTLE TOWER!$" -MauvilleCity_PokemonCenter_1F_Text_28F751:: @ 828F751 +MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksTitle:: @ 828F751 .string "The Blend-Loving TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28F76A:: @ 828F76A +MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksAction:: @ 828F76A .string "Made {POKEBLOCK}S$" -MauvilleCity_PokemonCenter_1F_Text_28F776:: @ 828F776 +MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksStory:: @ 828F776 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER made {POKEBLOCK}S\n" @@ -607,13 +611,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F776:: @ 828F776 .string "There is none better at using a BERRY\n" .string "BLENDER than {STR_VAR_3}!$" -MauvilleCity_PokemonCenter_1F_Text_28F7F6:: @ 828F7F6 +MauvilleCity_PokemonCenter_1F_Text_EnteredContestsTitle:: @ 828F7F6 .string "The CONTEST-Loving TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28F811:: @ 828F811 +MauvilleCity_PokemonCenter_1F_Text_EnteredContestsAction:: @ 828F811 .string "Entered CONTESTS$" -MauvilleCity_PokemonCenter_1F_Text_28F822:: @ 828F822 +MauvilleCity_PokemonCenter_1F_Text_EnteredContestsStory:: @ 828F822 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER entered CONTESTS\n" @@ -621,13 +625,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F822:: @ 828F822 .string "{STR_VAR_3} must love showing off\n" .string "POKéMON to others!$" -MauvilleCity_PokemonCenter_1F_Text_28F89C:: @ 828F89C +MauvilleCity_PokemonCenter_1F_Text_WonContestsTitle:: @ 828F89C .string "The CONTEST Master$" -MauvilleCity_PokemonCenter_1F_Text_28F8AF:: @ 828F8AF +MauvilleCity_PokemonCenter_1F_Text_WonContestsAction:: @ 828F8AF .string "Won CONTESTS$" -MauvilleCity_PokemonCenter_1F_Text_28F8BC:: @ 828F8BC +MauvilleCity_PokemonCenter_1F_Text_WonContestsStory:: @ 828F8BC .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER won CONTESTS\n" @@ -635,13 +639,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F8BC:: @ 828F8BC .string "{STR_VAR_3} must be an incredible\n" .string "CONTEST master!$" -MauvilleCity_PokemonCenter_1F_Text_28F92F:: @ 828F92F +MauvilleCity_PokemonCenter_1F_Text_TimesShoppedTitle:: @ 828F92F .string "The Happy Shopper$" -MauvilleCity_PokemonCenter_1F_Text_28F941:: @ 828F941 +MauvilleCity_PokemonCenter_1F_Text_TimesShoppedAction:: @ 828F941 .string "Shopped$" -MauvilleCity_PokemonCenter_1F_Text_28F949:: @ 828F949 +MauvilleCity_PokemonCenter_1F_Text_TimesShoppedStory:: @ 828F949 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER bought items in shops\n" @@ -649,13 +653,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F949:: @ 828F949 .string "{STR_VAR_3} must be one of those\n" .string "people who are born to shop.$" -MauvilleCity_PokemonCenter_1F_Text_28F9D1:: @ 828F9D1 +MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderTitle:: @ 828F9D1 .string "The Item-Finding TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28F9EA:: @ 828F9EA +MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderAction:: @ 828F9EA .string "Used an ITEMFINDER$" -MauvilleCity_PokemonCenter_1F_Text_28F9FD:: @ 828F9FD +MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderStory:: @ 828F9FD .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER used an ITEMFINDER\n" @@ -663,13 +667,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F9FD:: @ 828F9FD .string "{STR_VAR_3} must enjoy scouring the\n" .string "ground for hidden items!$" -MauvilleCity_PokemonCenter_1F_Text_28FA81:: @ 828FA81 +MauvilleCity_PokemonCenter_1F_Text_TimesRainedTitle:: @ 828FA81 .string "The Rain-Soaked TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28FA99:: @ 828FA99 +MauvilleCity_PokemonCenter_1F_Text_TimesRainedAction:: @ 828FA99 .string "Got rained on$" -MauvilleCity_PokemonCenter_1F_Text_28FAA7:: @ 828FAA7 +MauvilleCity_PokemonCenter_1F_Text_TimesRainedStory:: @ 828FAA7 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER got soaked by rain\n" @@ -677,13 +681,13 @@ MauvilleCity_PokemonCenter_1F_Text_28FAA7:: @ 828FAA7 .string "{STR_VAR_3}'s charisma must even\n" .string "attract rain!$" -MauvilleCity_PokemonCenter_1F_Text_28FB1D:: @ 828FB1D +MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexTitle:: @ 828FB1D .string "The Avid POKéDEX Reader$" -MauvilleCity_PokemonCenter_1F_Text_28FB35:: @ 828FB35 +MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexAction:: @ 828FB35 .string "Checked a POKéDEX$" -MauvilleCity_PokemonCenter_1F_Text_28FB47:: @ 828FB47 +MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexStory:: @ 828FB47 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER checked a POKéDEX\n" @@ -691,13 +695,13 @@ MauvilleCity_PokemonCenter_1F_Text_28FB47:: @ 828FB47 .string "{STR_VAR_3} must love inspecting\n" .string "POKéMON in a POKéDEX!$" -MauvilleCity_PokemonCenter_1F_Text_28FBC4:: @ 828FBC4 +MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsTitle:: @ 828FBC4 .string "The RIBBON Collector$" -MauvilleCity_PokemonCenter_1F_Text_28FBD9:: @ 828FBD9 +MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsAction:: @ 828FBD9 .string "Received RIBBONS$" -MauvilleCity_PokemonCenter_1F_Text_28FBEA:: @ 828FBEA +MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsStory:: @ 828FBEA .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER received RIBBONS\n" @@ -705,13 +709,13 @@ MauvilleCity_PokemonCenter_1F_Text_28FBEA:: @ 828FBEA .string "{STR_VAR_3} must be a TRAINER who\n" .string "loves to collect RIBBONS!$" -MauvilleCity_PokemonCenter_1F_Text_28FC6B:: @ 828FC6B +MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedTitle:: @ 828FC6B .string "The Ledge-Jumping TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28FC85:: @ 828FC85 +MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedAction:: @ 828FC85 .string "Jumped down ledges$" -MauvilleCity_PokemonCenter_1F_Text_28FC98:: @ 828FC98 +MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedStory:: @ 828FC98 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER jumped down ledges\n" @@ -719,26 +723,26 @@ MauvilleCity_PokemonCenter_1F_Text_28FC98:: @ 828FC98 .string "If there's a ledge to be jumped,\n" .string "{STR_VAR_3} can't ignore it!$" -MauvilleCity_PokemonCenter_1F_Text_28FD1D:: @ 828FD1D +MauvilleCity_PokemonCenter_1F_Text_TVWatchedTitle:: @ 828FD1D .string "The Legendary TV Viewer$" -MauvilleCity_PokemonCenter_1F_Text_28FD35:: @ 828FD35 +MauvilleCity_PokemonCenter_1F_Text_TVWatchedAction:: @ 828FD35 .string "Watched TV$" -MauvilleCity_PokemonCenter_1F_Text_28FD40:: @ 828FD40 +MauvilleCity_PokemonCenter_1F_Text_TVWatchedStory:: @ 828FD40 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER watched TV\n" .string "{STR_VAR_1} times!\p" .string "{STR_VAR_3} must love watching TV!$" -MauvilleCity_PokemonCenter_1F_Text_28FDA2:: @ 828FDA2 +MauvilleCity_PokemonCenter_1F_Text_CheckedClockTitle:: @ 828FDA2 .string "The Time-Conscious TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28FDBD:: @ 828FDBD +MauvilleCity_PokemonCenter_1F_Text_CheckedClockAction:: @ 828FDBD .string "Checked the time$" -MauvilleCity_PokemonCenter_1F_Text_28FDCE:: @ 828FDCE +MauvilleCity_PokemonCenter_1F_Text_CheckedClockStory:: @ 828FDCE .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER checked the time\n" @@ -746,13 +750,13 @@ MauvilleCity_PokemonCenter_1F_Text_28FDCE:: @ 828FDCE .string "{STR_VAR_3} must be a punctual TRAINER\n" .string "who's conscious of the time.$" -MauvilleCity_PokemonCenter_1F_Text_28FE57:: @ 828FE57 +MauvilleCity_PokemonCenter_1F_Text_WonLotteryTitle:: @ 828FE57 .string "The POKéMON LOTTERY Wizard$" -MauvilleCity_PokemonCenter_1F_Text_28FE72:: @ 828FE72 +MauvilleCity_PokemonCenter_1F_Text_WonLotteryAction:: @ 828FE72 .string "Won POKéMON LOTTERIES$" -MauvilleCity_PokemonCenter_1F_Text_28FE88:: @ 828FE88 +MauvilleCity_PokemonCenter_1F_Text_WonLotteryStory:: @ 828FE88 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER won POKéMON LOTTERIES\n" @@ -760,13 +764,13 @@ MauvilleCity_PokemonCenter_1F_Text_28FE88:: @ 828FE88 .string "{STR_VAR_3} must have many friends\n" .string "to trade POKéMON with!$" -MauvilleCity_PokemonCenter_1F_Text_28FF0C:: @ 828FF0C +MauvilleCity_PokemonCenter_1F_Text_UsedDaycareTitle:: @ 828FF0C .string "The DAY CARE-Using Trainer$" -MauvilleCity_PokemonCenter_1F_Text_28FF27:: @ 828FF27 +MauvilleCity_PokemonCenter_1F_Text_UsedDaycareAction:: @ 828FF27 .string "Left POKéMON at the DAY CARE$" -MauvilleCity_PokemonCenter_1F_Text_28FF44:: @ 828FF44 +MauvilleCity_PokemonCenter_1F_Text_UsedDaycareStory:: @ 828FF44 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER left POKéMON with the\n" @@ -774,13 +778,13 @@ MauvilleCity_PokemonCenter_1F_Text_28FF44:: @ 828FF44 .string "{STR_VAR_3} must be a real go-getter\n" .string "who raises POKéMON aggressively!$" -MauvilleCity_PokemonCenter_1F_Text_28FFDD:: @ 828FFDD +MauvilleCity_PokemonCenter_1F_Text_RodeCableCarTitle:: @ 828FFDD .string "The CABLE CAR-Loving TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_28FFFA:: @ 828FFFA +MauvilleCity_PokemonCenter_1F_Text_RodeCableCarAction:: @ 828FFFA .string "Rode the CABLE CAR$" -MauvilleCity_PokemonCenter_1F_Text_29000D:: @ 829000D +MauvilleCity_PokemonCenter_1F_Text_RodeCableCarStory:: @ 829000D .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER rode the CABLE CAR\n" @@ -788,13 +792,13 @@ MauvilleCity_PokemonCenter_1F_Text_29000D:: @ 829000D .string "{STR_VAR_3} must be a busy TRAINER\n" .string "who's up and down all the time!$" -MauvilleCity_PokemonCenter_1F_Text_290097:: @ 8290097 +MauvilleCity_PokemonCenter_1F_Text_HotSpringsTitle:: @ 8290097 .string "The Hot Spring-Loving TRAINER$" -MauvilleCity_PokemonCenter_1F_Text_2900B5:: @ 82900B5 +MauvilleCity_PokemonCenter_1F_Text_HotSpringsAction:: @ 82900B5 .string "Bathed in hot springs$" -MauvilleCity_PokemonCenter_1F_Text_2900CB:: @ 82900CB +MauvilleCity_PokemonCenter_1F_Text_HotSpringsStory:: @ 82900CB .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER bathed in hot springs\n" @@ -803,160 +807,162 @@ MauvilleCity_PokemonCenter_1F_Text_2900CB:: @ 82900CB .string "baby-smooth skin!$" -MauvilleCity_PokemonCenter_1F_EventScript_29014A:: @ 829014A +MauvilleCity_PokemonCenter_1F_EventScript_Storyteller:: @ 829014A lock faceplayer setvar VAR_0x8008, 0 setvar VAR_0x8009, 0 setvar VAR_0x800A, 0 setvar VAR_0x800B, 0 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E5F6, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 + msgbox MauvilleCity_PokemonCenter_1F_Text_WillYouHearMyTale, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller specialvar VAR_RESULT, ScrSpecial_StorytellerGetFreeStorySlot compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_2901DA - message MauvilleCity_PokemonCenter_1F_Text_28E673 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_KnowNoTales + message MauvilleCity_PokemonCenter_1F_Text_WhichTaleToTell waitmessage special ScrSpecial_StorytellerStoryListMenu waitstate compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_2901B7 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_CancelStorySelection setvar VAR_0x8008, 1 special ScrSpecial_StorytellerDisplayStory waitmessage waitbuttonpress specialvar VAR_RESULT, ScrSpecial_StorytellerUpdateStat compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_2901BD - goto MauvilleCity_PokemonCenter_1F_EventScript_29020F + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_AreThereOtherTales + goto MauvilleCity_PokemonCenter_1F_EventScript_TellPlayersTale -MauvilleCity_PokemonCenter_1F_EventScript_2901B7:: @ 82901B7 - goto MauvilleCity_PokemonCenter_1F_EventScript_290219 +MauvilleCity_PokemonCenter_1F_EventScript_CancelStorySelection:: @ 82901B7 + goto MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller end -MauvilleCity_PokemonCenter_1F_EventScript_2901BD:: @ 82901BD - msgbox MauvilleCity_PokemonCenter_1F_Text_28E78A, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_AreThereOtherTales:: @ 82901BD + msgbox MauvilleCity_PokemonCenter_1F_Text_CouldThereBeOtherLegends, MSGBOX_DEFAULT specialvar VAR_RESULT, ScrSpecial_HasStorytellerAlreadyRecorded - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_29022D - goto MauvilleCity_PokemonCenter_1F_EventScript_2901E2 - -MauvilleCity_PokemonCenter_1F_EventScript_2901DA:: @ 82901DA - msgbox MauvilleCity_PokemonCenter_1F_Text_28E6AE, MSGBOX_DEFAULT - -MauvilleCity_PokemonCenter_1F_EventScript_2901E2:: @ 82901E2 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E7EE, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_StorytellerEnd + goto MauvilleCity_PokemonCenter_1F_EventScript_DoYouHaveAnyTales + +MauvilleCity_PokemonCenter_1F_EventScript_KnowNoTales:: @ 82901DA + msgbox MauvilleCity_PokemonCenter_1F_Text_IKnowNoTales, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_DoYouHaveAnyTales:: @ 82901E2 + msgbox MauvilleCity_PokemonCenter_1F_Text_HaveYouAnyLegendaryTales, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller specialvar VAR_RESULT, ScrSpecial_StorytellerInitializeRandomStat compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_29020F - msgbox MauvilleCity_PokemonCenter_1F_Text_28E881, MSGBOX_DEFAULT + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TellPlayersTale + msgbox MauvilleCity_PokemonCenter_1F_Text_NotWorthyOfLegend, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_29020F:: @ 829020F - msgbox MauvilleCity_PokemonCenter_1F_Text_28E726, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_TellPlayersTale:: @ 829020F + msgbox MauvilleCity_PokemonCenter_1F_Text_YouDidStatXTimes, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_290219:: @ 8290219 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E64D, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller:: @ 8290219 + msgbox MauvilleCity_PokemonCenter_1F_Text_StorytellerFeelingTheBlues, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_290223:: @ 8290223 - msgbox MauvilleCity_PokemonCenter_1F_Text_28E8D9, MSGBOX_DEFAULT +@ Unused +MauvilleCity_PokemonCenter_1F_EventScript_WaitingForRecordMix:: @ 8290223 + msgbox MauvilleCity_PokemonCenter_1F_Text_IWishMorePeopleWereInterested, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_29022D:: @ 829022D +MauvilleCity_PokemonCenter_1F_EventScript_StorytellerEnd:: @ 829022D release end -MauvilleCity_PokemonCenter_1F_Text_29022F: @ 829022F +@ Giddy +MauvilleCity_PokemonCenter_1F_Text_HearMyStory: @ 829022F .string "I'm GIDDY!\n" .string "I have a scintillating story for you!\p" .string "Would you like to hear my story?$" -MauvilleCity_PokemonCenter_1F_Text_290281: @ 8290281 +MauvilleCity_PokemonCenter_1F_Text_GiddyFeelingTheBlues: @ 8290281 .string "Oh…\n" .string "You've left me feeling the blues…$" -MauvilleCity_PokemonCenter_1F_Text_2902A7: @ 82902A7 +MauvilleCity_PokemonCenter_1F_Text_AlsoIWasThinking: @ 82902A7 .string "Also, I was thinking…$" -MauvilleCity_PokemonCenter_1F_Text_2902BD: @ 82902BD +MauvilleCity_PokemonCenter_1F_Text_WeShouldChatAgain: @ 82902BD .string "That's about it, I think…\p" .string "We should chat again!\n" .string "Bye-bye!$" -MauvilleCity_PokemonCenter_1F_EventScript_2902F6:: @ 82902F6 +MauvilleCity_PokemonCenter_1F_EventScript_Giddy:: @ 82902F6 lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_29022F, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290317 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_29037A + msgbox MauvilleCity_PokemonCenter_1F_Text_HearMyStory, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTellTale + compare VAR_RESULT, NO + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineGiddy end -MauvilleCity_PokemonCenter_1F_EventScript_290317:: @ 8290317 +MauvilleCity_PokemonCenter_1F_EventScript_TryTellTale:: @ 8290317 special ScrSpecial_GiddyShouldTellAnotherTale - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290359 - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290384 + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_ToldEnoughTales end -MauvilleCity_PokemonCenter_1F_EventScript_290331:: @ 8290331 +MauvilleCity_PokemonCenter_1F_EventScript_TryTellNewTale:: @ 8290331 special ScrSpecial_GiddyShouldTellAnotherTale - compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_29034B - compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290384 + compare VAR_RESULT, TRUE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_GiddyStartNewTale + compare VAR_RESULT, FALSE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_ToldEnoughTales end -MauvilleCity_PokemonCenter_1F_EventScript_29034B:: @ 829034B - msgbox MauvilleCity_PokemonCenter_1F_Text_2902A7, MSGBOX_DEFAULT - goto MauvilleCity_PokemonCenter_1F_EventScript_290359 +MauvilleCity_PokemonCenter_1F_EventScript_GiddyStartNewTale:: @ 829034B + msgbox MauvilleCity_PokemonCenter_1F_Text_AlsoIWasThinking, MSGBOX_DEFAULT + goto MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale end -MauvilleCity_PokemonCenter_1F_EventScript_290359:: @ 8290359 +@ Regardless of whether yes or no is selected below, Giddy will continue to tell stories until he's told 10 +MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale:: @ 8290359 special ScrSpecial_GenerateGiddyLine special ShowFieldMessageStringVar4 waitmessage yesnobox 20, 8 compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290331 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTellNewTale compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290331 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTellNewTale end -MauvilleCity_PokemonCenter_1F_EventScript_29037A:: @ 829037A - msgbox MauvilleCity_PokemonCenter_1F_Text_290281, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_DeclineGiddy:: @ 829037A + msgbox MauvilleCity_PokemonCenter_1F_Text_GiddyFeelingTheBlues, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_EventScript_290384:: @ 8290384 - msgbox MauvilleCity_PokemonCenter_1F_Text_2902BD, MSGBOX_DEFAULT +MauvilleCity_PokemonCenter_1F_EventScript_ToldEnoughTales:: @ 8290384 + msgbox MauvilleCity_PokemonCenter_1F_Text_WeShouldChatAgain, MSGBOX_DEFAULT release end -MauvilleCity_PokemonCenter_1F_Text_29038E: @ 829038E +MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToHearMySong: @ 829038E .string "Hi, I'm the BARD.\n" .string "Would you like to hear my song?$" -MauvilleCity_PokemonCenter_1F_Text_2903C0: @ 82903C0 +MauvilleCity_PokemonCenter_1F_Text_BardFeelingTheBlues1: @ 82903C0 .string "Oh…\n" .string "You've left me feeling the blues…$" -MauvilleCity_PokemonCenter_1F_Text_2903E6: @ 82903E6 +MauvilleCity_PokemonCenter_1F_Text_WishICouldPlaySongForOthers: @ 82903E6 .string "Oh, what a moving song…\n" .string "I wish I could play it for others…$" -MauvilleCity_PokemonCenter_1F_Text_290421: @ 8290421 +MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToWriteSomeLyrics: @ 8290421 .string "So?\n" .string "How do you like my song?\p" .string "But I'm none too happy about\n" @@ -964,38 +970,38 @@ MauvilleCity_PokemonCenter_1F_Text_290421: @ 8290421 .string "How would you like to write some\n" .string "new lyrics for me?$" -MauvilleCity_PokemonCenter_1F_Text_29049B: @ 829049B +MauvilleCity_PokemonCenter_1F_Text_BardFeelingTheBlues2: @ 829049B .string "Oh…\n" .string "You've left me feeling the blues…$" -MauvilleCity_PokemonCenter_1F_Text_2904C1: @ 82904C1 +MauvilleCity_PokemonCenter_1F_Text_LetMeSingItForYou: @ 82904C1 .string "Thank you kindly!\n" .string "Let me sing it for you.$" -MauvilleCity_PokemonCenter_1F_Text_2904EB: @ 82904EB +MauvilleCity_PokemonCenter_1F_Text_ThatHowYouWantedSongToGo: @ 82904EB .string "Was that how you wanted your song\n" .string "to go?$" -MauvilleCity_PokemonCenter_1F_Text_290514: @ 8290514 +MauvilleCity_PokemonCenter_1F_Text_IllSingThisSongForAWhile: @ 8290514 .string "Okay! That's it, then.\n" .string "I'll sing this song for a while.$" -MauvilleCity_PokemonCenter_1F_Text_29054C: @ 829054C +MauvilleCity_PokemonCenter_1F_Text_TeachWhatsHipAndHappening: @ 829054C .string "Hey, yo! They call me the HIPSTER.\n" .string "I'll teach you what's hip and happening.$" -MauvilleCity_PokemonCenter_1F_Text_290598: @ 8290598 +MauvilleCity_PokemonCenter_1F_Text_IAlreadyTaughtYou: @ 8290598 .string "But, hey, I taught you what's hip and\n" .string "happening already.\p" .string "I'd like to spread the good word to\n" .string "other folks.$" -MauvilleCity_PokemonCenter_1F_Text_290602: @ 8290602 +MauvilleCity_PokemonCenter_1F_Text_IveGotNothingNewToTeach: @ 8290602 .string "But, hey, you already know a lot about\n" .string "what's hip and happening.\p" .string "I've got nothing new to teach you!$" -MauvilleCity_PokemonCenter_1F_Text_290666: @ 8290666 +MauvilleCity_PokemonCenter_1F_Text_HaveYouHeardOfPhrase: @ 8290666 .string "Hey, have you heard about\n" .string "“{STR_VAR_1}”?\p" .string "What's it mean? Well…\n" diff --git a/data/scripts/mevent.inc b/data/scripts/mevent.inc new file mode 100644 index 000000000..731154315 --- /dev/null +++ b/data/scripts/mevent.inc @@ -0,0 +1,62 @@ +EventScript_Questionnaire:: @ 827381B + lockall + msgbox Mevent_Text_FillOutQuestionnaire, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq Mevent_EventScript_Release + setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE + call Common_ShowEasyChatScreen + lock + faceplayer + specialvar VAR_0x8008, GetMartEmployeeObjectEventId + compare VAR_0x8004, 1 + goto_if_eq Mevent_EventScript_PlayerInputMysteryEventPhrase + compare VAR_0x8004, 2 + goto_if_eq Mevent_EventScript_PlayerInputMysteryGiftPhrase + compare VAR_RESULT, 0 + goto_if_eq Mevent_EventScript_Release + compare VAR_RESULT, 1 + goto_if_eq Mevent_EventScript_QuestionnaireThankYou + end + +Mevent_EventScript_PlayerInputMysteryEventPhrase:: @ 827386D + goto_if_unset FLAG_SYS_POKEDEX_GET, Mevent_EventScript_QuestionnaireThankYou + goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, Mevent_EventScript_QuestionnaireThankYou + applymovement VAR_0x8008, Common_Movement_FaceDown + waitmovement 0 + playse SE_PIN + applymovement VAR_0x8008, Common_Movement_ExclamationMark + waitmovement 0 + applymovement VAR_0x8008, Common_Movement_Delay48 + waitmovement 0 + msgbox Mevent_Text_YouKnowThoseWordsEvent, MSGBOX_DEFAULT + setflag FLAG_SYS_MYSTERY_EVENT_ENABLE + msgbox Mevent_Text_YouCanAccessMysteryEvent, MSGBOX_DEFAULT + releaseall + end + +Mevent_EventScript_PlayerInputMysteryGiftPhrase:: @ 82738B5 + goto_if_unset FLAG_SYS_POKEDEX_GET, Mevent_EventScript_QuestionnaireThankYou + goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, Mevent_EventScript_QuestionnaireThankYou + applymovement VAR_0x8008, Common_Movement_FaceDown + waitmovement 0 + playse SE_PIN + applymovement VAR_0x8008, Common_Movement_ExclamationMark + waitmovement 0 + applymovement VAR_0x8008, Common_Movement_Delay48 + waitmovement 0 + msgbox Mevent_Text_YouKnowThoseWordsGift, MSGBOX_DEFAULT + setflag FLAG_SYS_MYSTERY_GIFT_ENABLE + msgbox Mevent_Text_YouCanAccessMysteryGift, MSGBOX_DEFAULT + releaseall + end + +Mevent_EventScript_Release:: @ 82738FD + releaseall + end + +Mevent_EventScript_QuestionnaireThankYou:: @ 82738FF + applymovement VAR_0x8008, Common_Movement_FaceDown + waitmovement 0 + msgbox Mevent_Text_QuestionnaireThankYou, MSGBOX_DEFAULT + releaseall + end diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc new file mode 100644 index 000000000..a7807ce51 --- /dev/null +++ b/data/scripts/move_tutors.inc @@ -0,0 +1,300 @@ +SlateportCity_PokemonFanClub_EventScript_SwaggerTutor:: @ 82C7F16 + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SWAGGER, MoveTutor_EventScript_SwaggerTaught + msgbox MoveTutor_Text_SwaggerTeach, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq MoveTutor_EventScript_SwaggerDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq MoveTutor_EventScript_SwaggerDeclined + msgbox MoveTutor_Text_SwaggerWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_SWAGGER + call MoveTutor_EventScript_OpenPartyMenu + compare VAR_RESULT, 0 + goto_if_eq MoveTutor_EventScript_SwaggerDeclined + setflag FLAG_MOVE_TUTOR_TAUGHT_SWAGGER + goto MoveTutor_EventScript_SwaggerTaught + end + +MoveTutor_EventScript_SwaggerDeclined:: @ 82C7F6A + msgbox MoveTutor_Text_SwaggerDeclined, MSGBOX_DEFAULT + release + end + +MoveTutor_EventScript_SwaggerTaught:: @ 82C7F74 + msgbox MoveTutor_Text_SwaggerTaught, MSGBOX_DEFAULT + release + end + +MauvilleCity_EventScript_RolloutTutor:: @ 82C7F7E + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT, MoveTutor_EventScript_RolloutTaught + msgbox MoveTutor_Text_RolloutTeach, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq MoveTutor_EventScript_RolloutDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq MoveTutor_EventScript_RolloutDeclined + msgbox MoveTutor_Text_RolloutWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_ROLLOUT + call MoveTutor_EventScript_OpenPartyMenu + compare VAR_RESULT, 0 + goto_if_eq MoveTutor_EventScript_RolloutDeclined + setflag FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT + goto MoveTutor_EventScript_RolloutTaught + end + +MoveTutor_EventScript_RolloutDeclined:: @ 82C7FD2 + msgbox MoveTutor_Text_RolloutDeclined, MSGBOX_DEFAULT + release + end + +MoveTutor_EventScript_RolloutTaught:: @ 82C7FDC + msgbox MoveTutor_Text_RolloutTaught, MSGBOX_DEFAULT + release + end + +VerdanturfTown_PokemonCenter_1F_EventScript_FuryCutterTutor:: @ 82C7FE6 + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER, MoveTutor_EventScript_FuryCutterTaught + msgbox MoveTutor_Text_FuryCutterTeach, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq MoveTutor_EventScript_FuryCutterDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq MoveTutor_EventScript_FuryCutterDeclined + msgbox MoveTutor_Text_FuryCutterWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_FURY_CUTTER + call MoveTutor_EventScript_OpenPartyMenu + compare VAR_RESULT, 0 + goto_if_eq MoveTutor_EventScript_FuryCutterDeclined + setflag FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER + goto MoveTutor_EventScript_FuryCutterTaught + end + +MoveTutor_EventScript_FuryCutterDeclined:: @ 82C803A + msgbox MoveTutor_Text_FuryCutterDeclined, MSGBOX_DEFAULT + release + end + +MoveTutor_EventScript_FuryCutterTaught:: @ 82C8044 + msgbox MoveTutor_Text_FuryCutterTaught, MSGBOX_DEFAULT + release + end + +LavaridgeTown_House_EventScript_MimicTutor:: @ 82C804E + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_MIMIC, MoveTutor_EventScript_MimicTaught + msgbox MoveTutor_MimicTeach, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq MoveTutor_EventScript_MimicDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq MoveTutor_EventScript_MimicDeclined + msgbox MoveTutor_Text_MimicWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_MIMIC + call MoveTutor_EventScript_OpenPartyMenu + compare VAR_RESULT, 0 + goto_if_eq MoveTutor_EventScript_MimicDeclined + setflag FLAG_MOVE_TUTOR_TAUGHT_MIMIC + goto MoveTutor_EventScript_MimicTaught + end + +MoveTutor_EventScript_MimicDeclined:: @ 82C80A2 + msgbox MoveTutor_MimicDeclined, MSGBOX_DEFAULT + release + end + +MoveTutor_EventScript_MimicTaught:: @ 82C80AC + msgbox MoveTutor_Text_MimicTaught, MSGBOX_DEFAULT + release + end + +FallarborTown_Mart_EventScript_MetronomeTutor:: @ 82C80B6 + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_METRONOME, MoveTutor_EventScript_MetronomeTaught + msgbox MoveTutor_Text_MetronomeTeach, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq MoveTutor_EventScript_MetronomeDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq MoveTutor_EventScript_MetronomeDeclined + msgbox MoveTutor_Text_MetronomeWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_METRONOME + call MoveTutor_EventScript_OpenPartyMenu + compare VAR_RESULT, 0 + goto_if_eq MoveTutor_EventScript_MetronomeDeclined + setflag FLAG_MOVE_TUTOR_TAUGHT_METRONOME + goto MoveTutor_EventScript_MetronomeTaught + end + +MoveTutor_EventScript_MetronomeDeclined:: @ 82C810A + msgbox MoveTutor_Text_MetronomeDeclined, MSGBOX_DEFAULT + release + end + +MoveTutor_EventScript_MetronomeTaught:: @ 82C8114 + msgbox MoveTutor_Text_MetronomeTaught, MSGBOX_DEFAULT + release + end + +FortreeCity_House2_EventScript_SleepTalkTutor:: @ 82C811E + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK, MoveTutor_EventScript_SleepTalkTaught + msgbox MoveTutor_Text_SleepTalkTeach, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq MoveTutor_EventScript_SleepTalkDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq MoveTutor_EventScript_SleepTalkDeclined + msgbox MoveTutor_Text_SleepTalkWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_SLEEP_TALK + call MoveTutor_EventScript_OpenPartyMenu + compare VAR_RESULT, 0 + goto_if_eq MoveTutor_EventScript_SleepTalkDeclined + setflag FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK + goto MoveTutor_EventScript_SleepTalkTaught + end + +MoveTutor_EventScript_SleepTalkDeclined:: @ 82C8172 + msgbox MoveTutor_Text_SleepTalkDeclined, MSGBOX_DEFAULT + release + end + +MoveTutor_EventScript_SleepTalkTaught:: @ 82C817C + msgbox MoveTutor_Text_SleepTalkTaught, MSGBOX_DEFAULT + release + end + +LilycoveCity_DepartmentStoreRooftop_EventScript_SubstituteTutor:: @ 82C8186 + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE, MoveTutor_EventScript_SubstituteTaught + msgbox MoveTutor_Text_SubstituteTeach, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq MoveTutor_EventScript_SubstituteDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq MoveTutor_EventScript_SubstituteDeclined + msgbox MoveTutor_Text_SubstituteWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_SUBSTITUTE + call MoveTutor_EventScript_OpenPartyMenu + compare VAR_RESULT, 0 + goto_if_eq MoveTutor_EventScript_SubstituteDeclined + setflag FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE + goto MoveTutor_EventScript_SubstituteTaught + end + +MoveTutor_EventScript_SubstituteDeclined:: @ 82C81DA + msgbox MoveTutor_Text_SubstituteDeclined, MSGBOX_DEFAULT + release + end + +MoveTutor_EventScript_SubstituteTaught:: @ 82C81E4 + msgbox MoveTutor_Text_SubstituteTaught, MSGBOX_DEFAULT + release + end + +MossdeepCity_EventScript_DynamicPunchTutor:: @ 82C81EE + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH, MoveTutor_EventScript_DynamicPunchTaught + msgbox MoveTutor_Text_DynamicPunchTeach, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined + msgbox MoveTutor_Text_DynamicPunchWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_DYNAMIC_PUNCH + call MoveTutor_EventScript_OpenPartyMenu + compare VAR_RESULT, 0 + goto_if_eq MoveTutor_EventScript_DynamicPunchDeclined + setflag FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH + goto MoveTutor_EventScript_DynamicPunchTaught + end + +MoveTutor_EventScript_DynamicPunchDeclined:: @ 82C8242 + msgbox MoveTutor_Text_DynamicPunchDeclined, MSGBOX_DEFAULT + release + end + +MoveTutor_EventScript_DynamicPunchTaught:: @ 82C824C + msgbox MoveTutor_Text_DynamicPunchTaught, MSGBOX_DEFAULT + release + end + +SootopolisCity_PokemonCenter_1F_EventScript_DoubleEdgeTutor:: @ 82C8256 + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE, MoveTutor_EventScript_DoubleEdgeTaught + msgbox MoveTutor_Text_DoubleEdgeTeach, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined + msgbox MoveTutor_Text_DoubleEdgeWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_DOUBLE_EDGE + call MoveTutor_EventScript_OpenPartyMenu + compare VAR_RESULT, 0 + goto_if_eq MoveTutor_EventScript_DoubleEdgeDeclined + setflag FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE + goto MoveTutor_EventScript_DoubleEdgeTaught + end + +MoveTutor_EventScript_DoubleEdgeDeclined:: @ 82C82AA + msgbox MoveTutor_Text_DoubleEdgeDeclined, MSGBOX_DEFAULT + release + end + +MoveTutor_EventScript_DoubleEdgeTaught:: @ 82C82B4 + msgbox MoveTutor_Text_DoubleEdgeTaught, MSGBOX_DEFAULT + release + end + +PacifidlogTown_PokemonCenter_1F_EventScript_ExplosionTutor:: @ 82C82BE + lock + faceplayer + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION, MoveTutor_EventScript_ExplosionTaught + msgbox MoveTutor_Text_ExplosionTeach, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq MoveTutor_EventScript_ExplosionDeclined + call MoveTutor_EventScript_CanOnlyBeLearnedOnce + compare VAR_RESULT, NO + goto_if_eq MoveTutor_EventScript_ExplosionDeclined + msgbox MoveTutor_Text_ExplosionWhichMon, MSGBOX_DEFAULT + setvar VAR_0x8005, TUTOR_MOVE_EXPLOSION + call MoveTutor_EventScript_OpenPartyMenu + compare VAR_RESULT, 0 + goto_if_eq MoveTutor_EventScript_ExplosionDeclined + setflag FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION + goto MoveTutor_EventScript_ExplosionTaught + end + +MoveTutor_EventScript_ExplosionDeclined:: @ 82C8312 + msgbox MoveTutor_Text_ExplosionDeclined, MSGBOX_DEFAULT + release + end + +MoveTutor_EventScript_ExplosionTaught:: @ 82C831C + msgbox MoveTutor_Text_ExplosionTaught, MSGBOX_DEFAULT + release + end + +MoveTutor_EventScript_OpenPartyMenu:: @ 82C8326 + special ChooseMonForMoveTutor + waitstate + lock + faceplayer + return + +MoveTutor_EventScript_CanOnlyBeLearnedOnce:: @ 82C832D + msgbox MoveTutor_Text_ThisMoveCanOnlyBeLearnedOnce, MSGBOX_YESNO + return diff --git a/data/scripts/movement.inc b/data/scripts/movement.inc new file mode 100644 index 000000000..3dd1a8144 --- /dev/null +++ b/data/scripts/movement.inc @@ -0,0 +1,100 @@ +Common_Movement_QuestionMark: @ 8272596 + emote_question_mark + step_end + +Common_Movement_ExclamationMark: @ 8272598 + emote_exclamation_mark + step_end + +Common_Movement_Delay48: @ 827259A + delay_16 + delay_16 + delay_16 + step_end + +Common_Movement_FacePlayer: @ 827259E + face_player + step_end + +Common_Movement_FaceAwayPlayer: @ 82725A0 + face_away_player + step_end + +Common_Movement_FaceOriginalDirection: @ 82725A2 + face_original_direction + step_end + +Common_Movement_WalkInPlaceFastestLeft: @ 82725A4 + walk_in_place_fastest_left + step_end + +Common_Movement_WalkInPlaceFastestUp: @ 82725A6 + walk_in_place_fastest_up + step_end + +Common_Movement_WalkInPlaceFastestRight: @ 82725A8 + walk_in_place_fastest_right + step_end + +Common_Movement_WalkInPlaceFastestDown: @ 82725AA + walk_in_place_fastest_down + step_end + +Common_Movement_FaceRight: @ 82725AC + face_right + step_end + +Common_Movement_FaceLeft: @ 82725AE + face_left + step_end + +Common_Movement_FaceDown: @ 82725B0 + face_down + step_end + +Common_Movement_FaceUp: @ 82725B2 + face_up + step_end + +Common_Movement_WalkInPlaceDown: @ 82725B4 + walk_in_place_down + step_end + +Common_Movement_WalkInPlaceLeft: @ 82725B6 + walk_in_place_left + step_end + +Common_Movement_WalkInPlaceRight: @ 82725B8 + walk_in_place_right + step_end + +Common_Movement_WalkUp6: @ 82725BA + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + step_end + +Common_Movement_WalkUp4: @ 82725C1 + walk_up + walk_up + walk_up + walk_up + step_end + +Common_Movement_Delay32: @ 82725C6 + delay_16 + delay_16 + step_end + +Common_Movement_WalkUp: @ 82725C9 + walk_up + step_end + +@ Unused +Common_Movement_WalkUp2:: @ 82725CB + walk_up + walk_up + step_end diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index c8cb84107..1df0ed88c 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -1,110 +1,110 @@ -PetalburgCity_PokemonCenter_1F_EventScript_291539:: @ 8291539 +MysteryEventClub_EventScript_Man:: @ 8291539 lock faceplayer - goto_if_set FLAG_SYS_CHAT_USED, PetalburgCity_PokemonCenter_1F_EventScript_2915F5 - msgbox PetalburgCity_PokemonCenter_1F_Text_291687, MSGBOX_DEFAULT - goto PetalburgCity_PokemonCenter_1F_EventScript_291552 + goto_if_set FLAG_SYS_CHAT_USED, MysteryEventClub_EventScript_2915F5 + msgbox MysteryEventClub_Text_CollectTrainerProfiles, MSGBOX_DEFAULT + goto MysteryEventClub_EventScript_291552 end -PetalburgCity_PokemonCenter_1F_EventScript_291552:: @ 8291552 - msgbox PetalburgCity_PokemonCenter_1F_Text_2916FF, MSGBOX_DEFAULT +MysteryEventClub_EventScript_291552:: @ 8291552 + msgbox MysteryEventClub_Text_2916FF, MSGBOX_DEFAULT multichoice 17, 6, MULTI_YESNOINFO_2, 0 switch VAR_RESULT - case 0, PetalburgCity_PokemonCenter_1F_EventScript_29159F - case 1, PetalburgCity_PokemonCenter_1F_EventScript_2915EB - case 2, PetalburgCity_PokemonCenter_1F_EventScript_291591 - case MULTI_B_PRESSED, PetalburgCity_PokemonCenter_1F_EventScript_2915EB + case 0, MysteryEventClub_EventScript_29159F + case 1, MysteryEventClub_EventScript_2915EB + case 2, MysteryEventClub_EventScript_291591 + case MULTI_B_PRESSED, MysteryEventClub_EventScript_2915EB end -PetalburgCity_PokemonCenter_1F_EventScript_291591:: @ 8291591 - msgbox PetalburgCity_PokemonCenter_1F_Text_291729, MSGBOX_DEFAULT - goto PetalburgCity_PokemonCenter_1F_EventScript_291552 +MysteryEventClub_EventScript_291591:: @ 8291591 + msgbox MysteryEventClub_Text_EasyChatExplanation, MSGBOX_DEFAULT + goto MysteryEventClub_EventScript_291552 end -PetalburgCity_PokemonCenter_1F_EventScript_29159F:: @ 829159F - msgbox PetalburgCity_PokemonCenter_1F_Text_291969, MSGBOX_DEFAULT +MysteryEventClub_EventScript_29159F:: @ 829159F + msgbox MysteryEventClub_Text_291969, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_2915CB + goto_if_eq MysteryEventClub_EventScript_2915CB compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_2915D5 + goto_if_eq MysteryEventClub_EventScript_2915D5 end -PetalburgCity_PokemonCenter_1F_EventScript_2915CB:: @ 82915CB - msgbox PetalburgCity_PokemonCenter_1F_Text_2919DC, MSGBOX_DEFAULT +MysteryEventClub_EventScript_2915CB:: @ 82915CB + msgbox MysteryEventClub_Text_2919DC, MSGBOX_DEFAULT release end -PetalburgCity_PokemonCenter_1F_EventScript_2915D5:: @ 82915D5 +MysteryEventClub_EventScript_2915D5:: @ 82915D5 setvar VAR_0x8004, 0 special sub_811EECC waitmessage delay 80 - msgbox PetalburgCity_PokemonCenter_1F_Text_291B22, MSGBOX_DEFAULT + msgbox MysteryEventClub_Text_291B22, MSGBOX_DEFAULT release end -PetalburgCity_PokemonCenter_1F_EventScript_2915EB:: @ 82915EB - msgbox PetalburgCity_PokemonCenter_1F_Text_291991, MSGBOX_DEFAULT +MysteryEventClub_EventScript_2915EB:: @ 82915EB + msgbox MysteryEventClub_Text_291991, MSGBOX_DEFAULT release end -PetalburgCity_PokemonCenter_1F_EventScript_2915F5:: @ 82915F5 - msgbox PetalburgCity_PokemonCenter_1F_Text_291A1B, MSGBOX_DEFAULT - goto PetalburgCity_PokemonCenter_1F_EventScript_291603 +MysteryEventClub_EventScript_2915F5:: @ 82915F5 + msgbox MysteryEventClub_Text_YouHaveWonderfulSmile, MSGBOX_DEFAULT + goto MysteryEventClub_EventScript_291603 end -PetalburgCity_PokemonCenter_1F_EventScript_291603:: @ 8291603 - msgbox PetalburgCity_PokemonCenter_1F_Text_291A4F, MSGBOX_DEFAULT +MysteryEventClub_EventScript_291603:: @ 8291603 + msgbox MysteryEventClub_Text_MayISeeYourNewProfile, MSGBOX_DEFAULT multichoice 17, 6, MULTI_YESNOINFO_2, 0 switch VAR_RESULT - case 0, PetalburgCity_PokemonCenter_1F_EventScript_291650 - case 1, PetalburgCity_PokemonCenter_1F_EventScript_29167C - case 2, PetalburgCity_PokemonCenter_1F_EventScript_291642 - case MULTI_B_PRESSED, PetalburgCity_PokemonCenter_1F_EventScript_29167C + case 0, MysteryEventClub_EventScript_291650 + case 1, MysteryEventClub_EventScript_29167C + case 2, MysteryEventClub_EventScript_291642 + case MULTI_B_PRESSED, MysteryEventClub_EventScript_29167C end -PetalburgCity_PokemonCenter_1F_EventScript_291642:: @ 8291642 - msgbox PetalburgCity_PokemonCenter_1F_Text_291729, MSGBOX_DEFAULT - goto PetalburgCity_PokemonCenter_1F_EventScript_291603 +MysteryEventClub_EventScript_291642:: @ 8291642 + msgbox MysteryEventClub_Text_EasyChatExplanation, MSGBOX_DEFAULT + goto MysteryEventClub_EventScript_291603 end -PetalburgCity_PokemonCenter_1F_EventScript_291650:: @ 8291650 - msgbox PetalburgCity_PokemonCenter_1F_Text_291A6B, MSGBOX_DEFAULT +MysteryEventClub_EventScript_291650:: @ 8291650 + msgbox MysteryEventClub_Text_291A6B, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_2915CB + goto_if_eq MysteryEventClub_EventScript_2915CB compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_2915D5 + goto_if_eq MysteryEventClub_EventScript_2915D5 end -PetalburgCity_PokemonCenter_1F_EventScript_29167C:: @ 829167C - msgbox PetalburgCity_PokemonCenter_1F_Text_291ABA, MSGBOX_DEFAULT +MysteryEventClub_EventScript_29167C:: @ 829167C + msgbox MysteryEventClub_Text_291ABA, MSGBOX_DEFAULT release end -PetalburgCity_PokemonCenter_1F_EventScript_291686:: @ 8291686 +MysteryEventClub_EventScript_291686:: @ 8291686 return -PetalburgCity_PokemonCenter_1F_Text_291687: @ 8291687 +MysteryEventClub_Text_CollectTrainerProfiles: @ 8291687 .string "Hello there, TRAINER!\n" .string "You've got a wonderful smile, there.\p" .string "I have a hobby--collecting the profiles\n" .string "of POKéMON TRAINERS.$" -PetalburgCity_PokemonCenter_1F_Text_2916FF: @ 82916FF +MysteryEventClub_Text_2916FF: @ 82916FF .string "So, how about it?\n" .string "May I see your profile?$" -PetalburgCity_PokemonCenter_1F_Text_291729: @ 8291729 +MysteryEventClub_Text_EasyChatExplanation: @ 8291729 .string "You make your own profile by putting\n" .string "together four words or phrases.\p" .string "Here, I'll show you an example of a\n" @@ -123,37 +123,37 @@ PetalburgCity_PokemonCenter_1F_Text_291729: @ 8291729 .string "Repeat for the remaining text choices,\n" .string "and you'll have your very own profile.$" -PetalburgCity_PokemonCenter_1F_Text_291969: @ 8291969 +MysteryEventClub_Text_291969: @ 8291969 .string "Yes! Thank you!\n" .string "So, let's see it, then.$" -PetalburgCity_PokemonCenter_1F_Text_291991: @ 8291991 +MysteryEventClub_Text_291991: @ 8291991 .string "Oh, no, really?\p" .string "I imagine someone like you would have\n" .string "a wonderful profile…$" -PetalburgCity_PokemonCenter_1F_Text_2919DC: @ 82919DC +MysteryEventClub_Text_2919DC: @ 82919DC .string "Oh? You're not into it right now?\p" .string "Well, anytime is good by me!$" -PetalburgCity_PokemonCenter_1F_Text_291A1B: @ 8291A1B +MysteryEventClub_Text_YouHaveWonderfulSmile: @ 8291A1B .string "Hello there, TRAINER!\n" .string "You've got a wonderful smile.$" -PetalburgCity_PokemonCenter_1F_Text_291A4F: @ 8291A4F +MysteryEventClub_Text_MayISeeYourNewProfile: @ 8291A4F .string "May I see your new profile?$" -PetalburgCity_PokemonCenter_1F_Text_291A6B: @ 8291A6B +MysteryEventClub_Text_291A6B: @ 8291A6B .string "Yes! Thank you!\p" .string "I hope it's even better than the profile\n" .string "you showed me before.$" -PetalburgCity_PokemonCenter_1F_Text_291ABA: @ 8291ABA +MysteryEventClub_Text_291ABA: @ 8291ABA .string "Oh, you like your profile the way it is.\p" .string "I don't blame you--it's a wonderful\n" .string "profile the way it is now.$" -PetalburgCity_PokemonCenter_1F_Text_291B22: @ 8291B22 +MysteryEventClub_Text_291B22: @ 8291B22 .string "F-fantastic!\p" .string "Your profile, it's wonderful!\n" .string "It really says what you're about.\p" @@ -161,7 +161,7 @@ PetalburgCity_PokemonCenter_1F_Text_291B22: @ 8291B22 .string "be captivated by you!\p" .string "Thank you!$" -PetalburgCity_PokemonCenter_1F_Text_291BB7: @ 8291BB7 +MysteryEventClub_Text_291BB7: @ 8291BB7 .string "Oh?\n" .string "You know the secret saying!\p" .string "That means you're now a fellow member\n" diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc new file mode 100644 index 000000000..4357199c4 --- /dev/null +++ b/data/scripts/new_game.inc @@ -0,0 +1,245 @@ +EventScript_ResetAllBerries:: @ 827149D + setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES + setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES + setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES + setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES + setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES + setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES + setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES + setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES + setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES + setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES + setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES + setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES + setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES + setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES + setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES + setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES + setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES + setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES + setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES + setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES + setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES + setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES + setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES + setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES + setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES + setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES + setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES + setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES + setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES + setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES + setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES + setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES + setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES + setberrytree 83, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES + setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES + setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES + setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 40, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 41, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 42, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 46, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES + setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES + setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES + setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES + setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES + setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES + setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES + setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES + setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES + setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES + setberrytree 59, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES + setberrytree 60, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 61, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 79, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES + setberrytree 14, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES + setberrytree 15, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES + setberrytree 30, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES + setberrytree 65, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 72, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES + setberrytree 73, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES + setberrytree 74, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES + setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES + setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES + setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES + setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), BERRY_STAGE_BERRIES + return + +EventScript_ResetAllMapFlags:: @ 82715DE + setflag FLAG_LINK_CONTEST_POKE_BALL + setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE + setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE + setflag FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA + setflag FLAG_HIDE_PETALBURG_CITY_WALLY + setflag FLAG_UNKNOWN_0x363 + setflag FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT + setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 + setflag FLAG_HIDE_RUSBORO_CITY_RIVAL + setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST + setflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN + setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY + setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO + setflag FLAG_HIDE_ROUTE_104_MR_BRINEY + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_ROUTE_109_MR_BRINEY + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN + setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT + setflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST + setflag FLAG_HIDE_ROUTE_110_BIRCH + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1 + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS + setflag FLAG_HIDE_PETALBURG_GYM_GREETER + setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM + setflag FLAG_HIDE_PLAYERS_HOUSE_DAD + setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL + setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL + setflag FLAG_HIDE_FANCLUB_OLD_LADY + setflag FLAG_HIDE_FANCLUB_BOY + setflag FLAG_HIDE_FANCLUB_LITTLE_BOY + setflag FLAG_HIDE_FANCLUB_LADY + setflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER + setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 + setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 + setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 + setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 + setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 + setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 + setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 + setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE + setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN + setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT + setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE + setflag FLAG_HIDE_PETALBURG_GYM_WALLY + setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS + setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1 + setflag FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1 + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL + setflag FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL + setflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY + setflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN + setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW + setflag FLAG_HIDE_ROUTE_119_RIVAL + setflag FLAG_HIDE_ROUTE_119_SCOTT + setflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN + setflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE + setflag FLAG_HIDE_LANETTES_HOUSE_LANETTE + setflag FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN + setflag FLAG_HIDE_MT_CHIMNEY_TRAINERS + setflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY + setflag FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN + setflag FLAG_HIDE_ROUTE_116_MR_BRINEY + setflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO + setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT + setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN + setflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN + setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE + setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1 + setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2 + setflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION + setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT + setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE + setflag FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM + setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH + setflag FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 + setflag FLAG_HIDE_ROUTE_101_BIRCH + setflag FLAG_HIDE_ROUTE_103_BIRCH + setflag FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR + setflag FLAG_HIDE_LILYCOVE_HARBOR_EVENT_TICKET_TAKER + setflag FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE + setflag FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON + setflag FLAG_UNKNOWN_0x393 + setflag FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE + setflag FLAG_HIDE_MAUVILLE_CITY_WATTSON + setflag FLAG_HIDE_MAUVILLE_CITY_SCOTT + setflag FLAG_HIDE_CHAMPIONS_ROOM_RIVAL + setflag FLAG_HIDE_CHAMPIONS_ROOM_BIRCH + setflag FLAG_HIDE_ROUTE_110_RIVAL_2 + setflag FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE + setflag FLAG_HIDE_ROUTE_104_RIVAL + setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS + setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 + setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 + setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL + setflag FLAG_HIDE_METEOR_FALLS_TEAM_AQUA + setflag FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN + setflag FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO + setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M + setflag FLAG_HIDE_ROUTE_128_STEVEN + setflag FLAG_HIDE_ROUTE_128_ARCHIE + setflag FLAG_HIDE_ROUTE_128_MAXIE + setflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE + setflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN + setflag FLAG_HIDE_SLATEPORT_CITY_SCOTT + setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY + setflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY + setflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY + setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN + setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL + setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY + setflag FLAG_HIDE_OLDALE_TOWN_RIVAL + setflag FLAG_HIDE_ROUTE_101_BOY + setflag FLAG_HIDE_PETALBURG_CITY_SCOTT + setflag FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA + setflag FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE + setflag FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON + setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS + setflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE + setflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE + setflag FLAG_HIDE_ROUTE_111_DESERT_FOSSIL + setflag FLAG_HIDE_ROUTE_111_PLAYER_DESCENT + setflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL + setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA + setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA + setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA + setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN + setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS + setflag FLAG_HIDE_DEOXYS + setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION + setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT + setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT + setflag FLAG_HIDE_SKY_PILLAR_WALLACE + setflag FLAG_HIDE_RAYQUAZA_SKY_TOWER_SUMMIT + call EventScript_ResetAllBerries + end diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc new file mode 100644 index 000000000..206277cb7 --- /dev/null +++ b/data/scripts/obtain_item.inc @@ -0,0 +1,208 @@ +Std_ObtainItem:: @ 8271AD3 + giveitem VAR_0x8000, VAR_0x8001 + copyvar VAR_0x8007, VAR_RESULT + call EventScript_ObtainItemMessage + return + +EventScript_ObtainItemMessage:: @ 8271AE3 + bufferitemnameplural 1, VAR_0x8000, VAR_0x8001 + checkitemtype VAR_0x8000 + call EventScript_BufferPocketNameAndTryFanfare + compare VAR_0x8007, 1 + call_if_eq EventScript_ObtainedItem + compare VAR_0x8007, 0 + call_if_eq EventScript_NoRoomForItem + return + +EventScript_BufferPocketNameAndTryFanfare:: @ 8271B08 + switch VAR_RESULT + case POCKET_ITEMS, EventScript_BufferItemsPocket + case POCKET_KEY_ITEMS, EventScript_BufferKeyItemsPocket + case POCKET_POKE_BALLS, EventScript_BufferPokeballsPocket + case POCKET_TM_HM, EventScript_BufferTMHMsPocket + case POCKET_BERRIES, EventScript_BufferBerriesPocket + end + +EventScript_BufferItemsPocket:: @ 8271B45 + bufferstdstring 2, STDSTRING_ITEMS + compare VAR_0x8007, 1 + call_if_eq EventScript_PlayFanfareObtainedItem + return + +EventScript_BufferKeyItemsPocket:: @ 8271B55 + bufferstdstring 2, STDSTRING_KEYITEMS + compare VAR_0x8007, 1 + call_if_eq EventScript_PlayFanfareObtainedItem + return + +EventScript_BufferPokeballsPocket:: @ 8271B65 + bufferstdstring 2, STDSTRING_POKEBALLS + compare VAR_0x8007, 1 + call_if_eq EventScript_PlayFanfareObtainedItem + return + +EventScript_BufferTMHMsPocket:: @ 8271B75 + bufferstdstring 2, STDSTRING_TMHMS + compare VAR_0x8007, 1 + call_if_eq EventScript_PlayFanfareObtainedTMHM + return + +EventScript_BufferBerriesPocket:: @ 8271B85 + bufferstdstring 2, STDSTRING_BERRIES + compare VAR_0x8007, 1 + call_if_eq EventScript_PlayFanfareObtainedItem + return + +EventScript_ObtainedItem:: @ 8271B95 + message gText_ObtainedTheItem + waitfanfare + msgbox gText_PutItemInPocket, MSGBOX_DEFAULT + setvar VAR_RESULT, 1 + return + +EventScript_NoRoomForItem:: @ 8271BA9 + setvar VAR_RESULT, 0 + return + +EventScript_PlayFanfareObtainedItem:: @ 8271BAF + playfanfare MUS_FANFA4 + return + +EventScript_PlayFanfareObtainedTMHM:: @ 8271BB3 + playfanfare MUS_ME_WAZA + return + +Std_ObtainDecoration:: @ 8271BB7 + givedecoration VAR_0x8000 + copyvar VAR_0x8007, VAR_RESULT + call EventScript_ObtainDecorationMessage + return + +EventScript_ObtainDecorationMessage:: @ 8271BC5 + bufferdecorationname 1, VAR_0x8000 + compare VAR_0x8007, 1 + call_if_eq EventScript_ObtainedDecor + compare VAR_0x8007, 0 + call_if_eq EventScript_NoRoomForDecor + return + +EventScript_ObtainedDecor:: @ 8271BE0 + playfanfare MUS_FANFA4 + message gText_ObtainedTheDecor + waitfanfare + msgbox gText_TheDecorWasTransferredToThePC, MSGBOX_DEFAULT + setvar VAR_RESULT, 1 + return + +EventScript_NoRoomForDecor:: @ 8271BF7 + setvar VAR_RESULT, 0 + return + +Std_FindItem:: @ 8271BFD + lock + faceplayer + waitse + copyvar VAR_0x8004, VAR_0x8000 + copyvar VAR_0x8005, VAR_0x8001 + checkitemspace VAR_0x8000, VAR_0x8001 + copyvar VAR_0x8007, VAR_RESULT + bufferitemnameplural 1, VAR_0x8000, VAR_0x8001 + checkitemtype VAR_0x8000 + call EventScript_BufferPocketNameAndTryFanfare + compare VAR_0x8007, 1 + call_if_eq EventScript_PickUpItem + compare VAR_0x8007, 0 + call_if_eq EventScript_NoRoomToPickUpItem + release + return + +EventScript_PickUpItem:: @ 8271C3A + removeobject VAR_LAST_TALKED + giveitem VAR_0x8004, VAR_0x8005 + specialvar VAR_RESULT, BufferTMHMMoveName + copyvar VAR_0x8008, VAR_RESULT + compare VAR_0x8008, 1 + call_if_eq EventScript_FoundTMHM + compare VAR_0x8008, 0 + call_if_eq EventScript_FoundItem + waitfanfare + waitmessage + bufferitemnameplural 1, VAR_0x8004, VAR_0x8005 + setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN + special CallBattlePyramidFunction + compare VAR_RESULT, 1 + goto_if_eq EventScript_PutBattlePyramidItemInBag + msgbox gText_PutItemInPocket, MSGBOX_DEFAULT + return + +EventScript_PutBattlePyramidItemInBag:: @ 8271C86 + msgbox gText_PlayerPutItemInBag, MSGBOX_DEFAULT + return + +EventScript_FoundTMHM:: @ 8271C8F + bufferitemnameplural 0, VAR_0x8004, VAR_0x8005 + message gText_PlayerFoundOneTMHM + return + +EventScript_FoundItem:: @ 8271C9B + message gText_PlayerFoundOneItem + return + +EventScript_NoRoomToPickUpItem:: @ 8271CA1 + msgbox gText_ObtainedTheItem, MSGBOX_DEFAULT + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT + setvar VAR_RESULT, 0 + return + +EventScript_HiddenItemScript:: @ 8271CB7 + lockall + waitse + giveitem VAR_0x8005, 1 + copyvar VAR_0x8007, VAR_RESULT + bufferitemnameplural 1, VAR_0x8005, 1 + checkitemtype VAR_0x8005 + call EventScript_BufferPocketNameAndTryFanfare + compare VAR_0x8007, 1 + goto_if_eq EventScript_PickUpHiddenItem + compare VAR_0x8007, 0 + goto_if_eq EventScript_NoRoomForHiddenItem + end + +EventScript_PickUpHiddenItem:: @ 8271CE8 + copyvar VAR_0x8008, VAR_0x8004 + copyvar VAR_0x8004, VAR_0x8005 + specialvar VAR_RESULT, BufferTMHMMoveName + compare VAR_RESULT, 1 + goto_if_eq EventScript_FoundHiddenTMHM + compare VAR_RESULT, 0 + goto_if_eq EventScript_FoundHiddenItem + end + +EventScript_FoundHiddenTMHM:: @ 8271D0E + bufferitemnameplural 0, VAR_0x8004, 1 + message gText_PlayerFoundOneTMHM + goto EventScript_PutHiddenItemInPocket + end + +EventScript_FoundHiddenItem:: @ 8271D1F + message gText_PlayerFoundOneItem + goto EventScript_PutHiddenItemInPocket + end + +EventScript_PutHiddenItemInPocket:: @ 8271D2A + waitmessage + waitfanfare + bufferitemnameplural 1, VAR_0x8004, 1 + copyvar VAR_0x8004, VAR_0x8008 + msgbox gText_PutItemInPocket, MSGBOX_DEFAULT + special TryPutTreasureInvestigatorsOnAir + special SetHiddenItemFlag + releaseall + end + +EventScript_NoRoomForHiddenItem:: @ 8271D47 + msgbox gText_PlayerFoundOneItem, MSGBOX_DEFAULT + msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT + setvar VAR_RESULT, 0 + releaseall + end diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc new file mode 100644 index 000000000..b3602ee6f --- /dev/null +++ b/data/scripts/pc.inc @@ -0,0 +1,66 @@ +EventScript_PC:: @ 8271D92 + lockall + setvar VAR_0x8004, 0 + special DoPCTurnOnEffect + playse SE_PC_ON + msgbox Text_BootUpPC, MSGBOX_DEFAULT + goto EventScript_PCMainMenu + end + +EventScript_PCMainMenu:: @ 8271DAC + message gText_WhichPCShouldBeAccessed + waitmessage + special ScriptMenu_CreatePCMultichoice + waitstate + goto EventScript_AccessPC + end + +EventScript_AccessPC:: @ 8271DBC + switch VAR_RESULT + case 0, EventScript_AccessPokemonStorage + case 1, EventScript_AccessPlayersPC + case 2, EventScript_AccessHallOfFame + case 3, EventScript_TurnOffPC + case MULTI_B_PRESSED, EventScript_TurnOffPC + end + +EventScript_AccessPlayersPC:: @ 8271DF9 + playse SE_PC_LOGIN + msgbox gText_AccessedPlayersPC, MSGBOX_DEFAULT + special PlayerPC + waitstate + goto EventScript_PCMainMenu + end + +EventScript_AccessPokemonStorage:: @ 8271E0E + playse SE_PC_LOGIN + call_if_unset FLAG_SYS_PC_LANETTE, EventScript_AccessSomeonesPC + call_if_set FLAG_SYS_PC_LANETTE, EventScript_AccessLanettesPC + msgbox gText_StorageSystemOpened, MSGBOX_DEFAULT + special ShowPokemonStorageSystemPC + waitstate + goto EventScript_PCMainMenu + end + +EventScript_AccessSomeonesPC:: @ 8271E35 + msgbox gText_AccessedSomeonesPC, MSGBOX_DEFAULT + return + +EventScript_AccessLanettesPC:: @ 8271E3E + msgbox gText_AccessedLanettesPC, MSGBOX_DEFAULT + return + +EventScript_TurnOffPC:: @ 8271E47 + setvar VAR_0x8004, 0 + playse SE_PC_OFF + special DoPCTurnOffEffect + releaseall + end + +EventScript_AccessHallOfFame:: @ 8271E54 + goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_TurnOffPC + playse SE_PC_LOGIN + special AccessHallOfFamePC + waitstate + goto EventScript_AccessPC + end diff --git a/data/scripts/pc_transfer.inc b/data/scripts/pc_transfer.inc new file mode 100644 index 000000000..594956a31 --- /dev/null +++ b/data/scripts/pc_transfer.inc @@ -0,0 +1,52 @@ +@ VAR_0x8004 here is used by ChangePokemonNickname +Common_EventScript_GetGiftMonPartySlot:: @ 827378B + getpartysize + subvar VAR_RESULT, 1 + copyvar VAR_0x8004, VAR_RESULT + return + +Common_EventScript_NameReceivedBoxMon:: @ 8273797 + fadescreen 1 + special ChangeBoxPokemonNickname + waitstate + lock + faceplayer + return + +Common_EventScript_TransferredToPC:: @ 82737A0 + bufferboxname 0, VAR_PC_BOX_TO_SEND_MON + bufferspeciesname 1, VAR_TEMP_1 + call_if_unset FLAG_SYS_PC_LANETTE, EventScript_TransferredSomeonesPC + call_if_set FLAG_SYS_PC_LANETTE, EventScript_TransferredLanettesPC + return + +EventScript_TransferredSomeonesPC:: @ 82737BB + specialvar VAR_RESULT, ShouldShowBoxWasFullMessage + compare VAR_RESULT, 1 + goto_if_eq EventScript_SomeonesPCBoxFull + msgbox gText_PkmnTransferredSomeonesPC, MSGBOX_DEFAULT + return + +EventScript_SomeonesPCBoxFull:: @ 82737D4 + specialvar VAR_RESULT, GetPCBoxToSendMon + bufferboxname 2, VAR_RESULT + msgbox gText_PkmnTransferredSomeonesPCBoxFull, MSGBOX_DEFAULT + return + +EventScript_TransferredLanettesPC:: @ 82737E6 + specialvar VAR_RESULT, ShouldShowBoxWasFullMessage + compare VAR_RESULT, 1 + goto_if_eq EventScript_LanettesPCBoxFull + msgbox gText_PkmnTransferredLanettesPC, MSGBOX_DEFAULT + return + +EventScript_LanettesPCBoxFull:: @ 82737FF + specialvar VAR_RESULT, GetPCBoxToSendMon + bufferboxname 2, VAR_RESULT + msgbox gText_PkmnTransferredLanettesPCBoxFull, MSGBOX_DEFAULT + return + +Common_EventScript_NoMoreRoomForPokemon:: @ 8273811 + msgbox gText_NoMoreRoomForPokemon, MSGBOX_DEFAULT + release + end diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc new file mode 100644 index 000000000..18b203d61 --- /dev/null +++ b/data/scripts/pkmn_center_nurse.inc @@ -0,0 +1,135 @@ +Common_EventScript_PkmnCenterNurse:: @ 827191E + lock + faceplayer + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, CountPlayerTrainerStars + compare VAR_RESULT, 4 + goto_if_eq EventScript_PkmnCenterNurse_GoldCard + msgbox gText_WouldYouLikeToRestYourPkmn, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq EventScript_PkmnCenterNurse_HealPkmn + compare VAR_RESULT, NO + goto_if_eq EventScript_PkmnCenterNurse_Goodbye + end + +EventScript_PkmnCenterNurse_Goodbye:: @ 8271954 + message gText_WeHopeToSeeYouAgain + return + +@ VAR_0x8004 is 1 when player has Gold Card; jumps are identical +EventScript_PkmnCenterNurse_HealPkmn:: @ 827195A + incrementgamestat GAME_STAT_USED_POKECENTER + compare VAR_0x8004, 0 + call_if_eq EventScript_PkmnCenterNurse_IllTakeYourPkmn + compare VAR_0x8004, 1 + call_if_eq EventScript_PkmnCenterNurse_IllTakeYourPkmn2 + waitmessage + call EventScript_PkmnCenterNurse_TakeAndHealPkmn + goto_if_unset FLAG_POKERUS_EXPLAINED, EventScript_PkmnCenterNurse_CheckPokerus + goto EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom + end + +EventScript_PkmnCenterNurse_IllTakeYourPkmn:: @ 8271987 + message gText_IllTakeYourPkmn + return + +EventScript_PkmnCenterNurse_IllTakeYourPkmn2:: @ 827198D + message gText_IllTakeYourPkmn2 + return + +EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 8271993 + applymovement VAR_0x800B, Common_Movement_WalkInPlaceFastestLeft + waitmovement 0 + dofieldeffect FLDEFF_POKECENTER_HEAL + waitfieldeffect FLDEFF_POKECENTER_HEAL + applymovement VAR_0x800B, Common_Movement_WalkInPlaceFastestDown + waitmovement 0 + special HealPlayerParty + return + +EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom:: @ 82719B1 + specialvar VAR_RESULT, PlayerNotAtTrainerHillEntrance + compare VAR_RESULT, 0 + goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn + specialvar VAR_RESULT, BufferUnionRoomPlayerName + copyvar VAR_0x8008, VAR_RESULT + compare VAR_0x8008, 0 + goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn + compare VAR_0x8008, 1 + goto_if_eq EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom + end + +@ VAR_0x8004 is 1 when player has Gold Card +EventScript_PkmnCenterNurse_ReturnPkmn:: @ 82719E2 + compare VAR_0x8004, 1 + goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn2 + message gText_RestoredPkmnToFullHealth + waitmessage + applymovement VAR_0x800B, EventScript_PkmnCenterNurse_Bow + waitmovement 0 + message gText_WeHopeToSeeYouAgain + return + +EventScript_PkmnCenterNurse_ReturnPkmn2:: @ 8271A03 + message gText_ThankYouForWaiting + waitmessage + applymovement VAR_0x800B, EventScript_PkmnCenterNurse_Bow + waitmovement 0 + message gText_WeHopeToSeeYouAgain2 + return + +EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom:: @ 8271A19 + goto_if_set FLAG_NURSE_UNION_ROOM_REMINDER, EventScript_PkmnCenterNurse_ReturnPkmn + msgbox gText_RestoredPkmnToFullHealth, MSGBOX_DEFAULT + setflag FLAG_NURSE_UNION_ROOM_REMINDER + message CableClub_Text_PlayerIsWaiting + waitmessage + applymovement VAR_0x800B, EventScript_PkmnCenterNurse_Bow + waitmovement 0 + message gText_WeHopeToSeeYouAgain + return + +EventScript_PkmnCenterNurse_CheckPokerus:: @ 8271A43 + specialvar VAR_RESULT, IsPokerusInParty + compare VAR_RESULT, 1 + goto_if_eq EventScript_PkmnCenterNurse_ExplainPokerus + compare VAR_RESULT, 0 + goto_if_eq EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom + end + +EventScript_PkmnCenterNurse_ExplainPokerus:: @ 8271A5F + message gText_PokerusExplanation + setflag FLAG_POKERUS_EXPLAINED + return + +EventScript_PkmnCenterNurse_GoldCard:: @ 8271A68 + goto_if_set FLAG_NURSE_MENTIONS_GOLD_CARD, EventScript_PkmnCenterNurse_AskForUsual + setflag FLAG_NURSE_MENTIONS_GOLD_CARD + msgbox gText_WelcomeCutShort, MSGBOX_DEFAULT + playse SE_PIN + applymovement VAR_0x800B, Common_Movement_ExclamationMark + waitmovement 0 + applymovement VAR_0x800B, Common_Movement_Delay48 + waitmovement 0 + msgbox gText_NoticesGoldCard, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq EventScript_PkmnCenterNurse_GoldCardHealPkmn + message gText_WeHopeToSeeYouAgain2 + return + +EventScript_PkmnCenterNurse_AskForUsual:: @ 8271AAC + msgbox gText_YouWantTheUsual, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq EventScript_PkmnCenterNurse_GoldCardHealPkmn + message gText_WeHopeToSeeYouAgain2 + return + +EventScript_PkmnCenterNurse_GoldCardHealPkmn:: @ 8271AC5 + setvar VAR_0x8004, 1 + goto EventScript_PkmnCenterNurse_HealPkmn + end + +EventScript_PkmnCenterNurse_Bow: @ 8271AD0 + nurse_joy_bow + delay_4 + step_end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 855c5eac2..acb1536e8 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -1,67 +1,63 @@ -LittlerootTown_BrendansHouse_2F_EventScript_2926FE:: @ 82926FE -LittlerootTown_MaysHouse_2F_EventScript_2926FE:: @ 82926FE +PlayersHouse_2F_EventScript_BlockStairsUntilClockIsSet:: @ 82926FE setvar VAR_LITTLEROOT_INTRO_STATE, 5 return -LittlerootTown_BrendansHouse_1F_EventScript_292704:: @ 8292704 -LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_EnterHouseMovingIn:: @ 8292704 + msgbox PlayersHouse_1F_Text_IsntItNiceInHere, MSGBOX_DEFAULT applymovement VAR_0x8004, Common_Movement_FacePlayer waitmovement 0 - compare VAR_0x8005, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_29274D - compare VAR_0x8005, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292758 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, MSGBOX_DEFAULT + compare VAR_0x8005, MALE + call_if_eq PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale + compare VAR_0x8005, FEMALE + call_if_eq PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale + msgbox PlayersHouse_1F_Text_MoversPokemonGoSetClock, MSGBOX_DEFAULT closemessage setvar VAR_LITTLEROOT_INTRO_STATE, 4 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292763 - applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerWalkIn + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end -LittlerootTown_BrendansHouse_1F_EventScript_29274D:: @ 829274D - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight +PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale:: @ 829274D + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft +PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale:: @ 8292758 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -LittlerootTown_BrendansHouse_1F_Movement_292763: @ 8292763 +PlayersHouse_1F_Movement_PlayerWalkIn: @ 8292763 walk_up step_end -LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765 -LittlerootTown_MaysHouse_1F_EventScript_292765:: @ 8292765 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_MomGoSeeRoom:: @ 8292765 + msgbox PlayersHouse_1F_Text_ArentYouInterestedInRoom, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AF0 + applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MovePlayerAwayFromDoor waitmovement 0 releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_292781:: @ 8292781 +LittlerootTown_BrendansHouse_2F_EventScript_WallClock:: @ 8292781 lockall - setvar VAR_0x8004, 0 - goto LittlerootTown_BrendansHouse_2F_EventScript_292799 + setvar VAR_0x8004, MALE + goto PlayersHouse_2F_EventScript_WallClock end -LittlerootTown_MaysHouse_2F_EventScript_29278D:: @ 829278D +LittlerootTown_MaysHouse_2F_EventScript_WallClock:: @ 829278D lockall - setvar VAR_0x8004, 1 - goto LittlerootTown_MaysHouse_2F_EventScript_292799 + setvar VAR_0x8004, FEMALE + goto PlayersHouse_2F_EventScript_WallClock end -LittlerootTown_BrendansHouse_2F_EventScript_292799:: @ 8292799 -LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799 - goto_if_set FLAG_SET_WALL_CLOCK, LittlerootTown_BrendansHouse_2F_EventScript_29283F - msgbox LittlerootTown_BrendansHouse_2F_Text_1F8668, MSGBOX_DEFAULT - call LittlerootTown_BrendansHouse_2F_EventScript_292849 +PlayersHouse_2F_EventScript_WallClock:: @ 8292799 + goto_if_set FLAG_SET_WALL_CLOCK, PlayersHouse_2F_EventScript_CheckWallClock + msgbox PlayersHouse_2F_Text_ClockIsStopped, MSGBOX_DEFAULT + call PlayersHouse_2F_EventScript_SetWallClock delay 30 setvar VAR_LITTLEROOT_INTRO_STATE, 6 setflag FLAG_SET_WALL_CLOCK @@ -69,55 +65,55 @@ LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799 setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2927DF + call_if_eq PlayersHouse_2F_EventScript_MomComesUpstairsMale compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_29280F + call_if_eq PlayersHouse_2F_EventScript_MomComesUpstairsFemale playse SE_KAIDAN removeobject VAR_0x8008 releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_2927DF:: @ 82927DF +PlayersHouse_2F_EventScript_MomComesUpstairsMale:: @ 82927DF setvar VAR_0x8008, 14 addobject VAR_0x8008 - applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292850 + applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersMale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT + msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292857 + applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomExitsMale waitmovement 0 return -LittlerootTown_BrendansHouse_2F_EventScript_29280F:: @ 829280F +PlayersHouse_2F_EventScript_MomComesUpstairsFemale:: @ 829280F setvar VAR_0x8008, 14 addobject VAR_0x8008 - applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_29285B + applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersFemale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT + msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292862 + applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomExitsFemale waitmovement 0 return -LittlerootTown_BrendansHouse_2F_EventScript_29283F:: @ 829283F - incrementgamestat 45 +PlayersHouse_2F_EventScript_CheckWallClock:: @ 829283F + incrementgamestat GAME_STAT_CHECKED_CLOCK fadescreen 1 special Special_ViewWallClock waitstate releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_292849:: @ 8292849 +PlayersHouse_2F_EventScript_SetWallClock:: @ 8292849 fadescreen 1 special StartWallClock waitstate return -LittlerootTown_BrendansHouse_2F_Movement_292850: @ 8292850 +PlayersHouse_2F_Movement_MomEntersMale: @ 8292850 delay_8 walk_down walk_in_place_fastest_left @@ -126,13 +122,13 @@ LittlerootTown_BrendansHouse_2F_Movement_292850: @ 8292850 walk_left step_end -LittlerootTown_BrendansHouse_2F_Movement_292857: @ 8292857 +PlayersHouse_2F_Movement_MomExitsMale: @ 8292857 walk_right walk_up delay_8 step_end -LittlerootTown_BrendansHouse_2F_Movement_29285B: @ 829285B +PlayersHouse_2F_Movement_MomEntersFemale: @ 829285B delay_8 walk_down walk_in_place_fastest_right @@ -141,91 +137,88 @@ LittlerootTown_BrendansHouse_2F_Movement_29285B: @ 829285B walk_right step_end -LittlerootTown_BrendansHouse_2F_Movement_292862: @ 8292862 +PlayersHouse_2F_Movement_MomExitsFemale: @ 8292862 walk_left walk_up delay_8 step_end -LittlerootTown_BrendansHouse_1F_EventScript_292866:: @ 8292866 -LittlerootTown_MaysHouse_1F_EventScript_292866:: @ 8292866 +PlayersHouse_1F_EventScript_SetWatchedBroadcast:: @ 8292866 setvar VAR_LITTLEROOT_INTRO_STATE, 7 releaseall end -LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D - applymovement VAR_0x8005, Common_Movement_WalkInPlaceRight +PlayersHouse_1F_EventScript_PetalburgGymReportMale:: @ 829286D + applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - call LittlerootTown_BrendansHouse_1F_EventScript_29294B - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE0 + call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale waitmovement 0 playbgm MUS_INTER_V, 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BBC, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2929B7 + applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE6 + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVMale waitmovement 0 - call LittlerootTown_BrendansHouse_1F_EventScript_29296C - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + call PlayersHouse_1F_EventScript_WatchGymBroadcast + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_1, 1 - applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2929BD + applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomReturnToSeatMale waitmovement 0 - goto LittlerootTown_BrendansHouse_1F_EventScript_292866 + goto PlayersHouse_1F_EventScript_SetWatchedBroadcast end -LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC - applymovement VAR_0x8005, Common_Movement_WalkInPlaceLeft +PlayersHouse_1F_EventScript_PetalburgGymReportFemale:: @ 82928DC + applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - call LittlerootTown_MaysHouse_1F_EventScript_29294B - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AE8 + call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale waitmovement 0 playbgm MUS_INTER_V, 0 - msgbox LittlerootTown_MaysHouse_1F_Text_1F7BBC, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2929BA + applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AEE + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVFemale waitmovement 0 - call LittlerootTown_MaysHouse_1F_EventScript_29296C - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + call PlayersHouse_1F_EventScript_WatchGymBroadcast + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT - msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_1, 1 - applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2929C1 + applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomReturnToSeatFemale waitmovement 0 - goto LittlerootTown_MaysHouse_1F_EventScript_292866 + goto PlayersHouse_1F_EventScript_SetWatchedBroadcast end -LittlerootTown_BrendansHouse_1F_EventScript_29294B:: @ 829294B -LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B +PlayersHouse_1F_EventScript_MomNoticeGymBroadcast:: @ 829294B playse SE_PIN applymovement VAR_0x8005, Common_Movement_ExclamationMark waitmovement 0 applymovement VAR_0x8005, Common_Movement_Delay48 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B96, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_OhComeQuickly, MSGBOX_DEFAULT closemessage return -LittlerootTown_BrendansHouse_1F_EventScript_29296C:: @ 829296C -LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp +PlayersHouse_1F_EventScript_WatchGymBroadcast:: @ 829296C + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_ReportFromPetalburgGym, MSGBOX_DEFAULT fadedefaultbgm special TurnOffTVScreen setflag FLAG_SYS_TV_HOME delay 35 return -LittlerootTown_BrendansHouse_1F_Movement_292989: @ 8292989 +PlayersHouse_1F_Movement_MomApproachDadMale: @ 8292989 walk_up walk_right walk_right @@ -235,7 +228,7 @@ LittlerootTown_BrendansHouse_1F_Movement_292989: @ 8292989 walk_in_place_fastest_right step_end -LittlerootTown_BrendansHouse_1F_Movement_292991: @ 8292991 +PlayersHouse_1F_Movement_MomApproachDadFemale: @ 8292991 walk_up walk_left walk_left @@ -245,15 +238,15 @@ LittlerootTown_BrendansHouse_1F_Movement_292991: @ 8292991 walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_1F_Movement_292999: @ 8292999 +PlayersHouse_1F_Movement_MomApproachPlayerMale: @ 8292999 walk_right step_end -LittlerootTown_BrendansHouse_1F_Movement_29299B: @ 829299B +PlayersHouse_1F_Movement_MomApproachPlayerFemale: @ 829299B walk_left step_end -LittlerootTown_BrendansHouse_1F_Movement_29299D: @ 829299D +PlayersHouse_1F_Movement_MomNoticesLatiBroadcastMale: @ 829299D walk_in_place_fastest_left delay_16 delay_16 @@ -264,7 +257,7 @@ LittlerootTown_BrendansHouse_1F_Movement_29299D: @ 829299D delay_16 step_end -LittlerootTown_BrendansHouse_1F_Movement_2929A6: @ 82929A6 +PlayersHouse_1F_Movement_MomNoticesLatiBroadcastFemale: @ 82929A6 walk_in_place_fastest_right delay_16 delay_16 @@ -275,70 +268,69 @@ LittlerootTown_BrendansHouse_1F_Movement_2929A6: @ 82929A6 delay_16 step_end -LittlerootTown_BrendansHouse_1F_Movement_2929AF: @ 82929AF +PlayersHouse_1F_Movement_MomApproachPlayerAfterTVMale: @ 82929AF walk_up walk_left walk_left step_end -LittlerootTown_BrendansHouse_1F_Movement_2929B3: @ 82929B3 +PlayersHouse_1F_Movement_MomApproachPlayerAfterTVFemale: @ 82929B3 walk_up walk_right walk_right step_end -LittlerootTown_BrendansHouse_1F_Movement_2929B7: @ 82929B7 +PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale: @ 82929B7 walk_left walk_in_place_fastest_right step_end -LittlerootTown_MaysHouse_1F_Movement_2929BA: @ 82929BA +PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale: @ 82929BA walk_right walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_1F_Movement_2929BD: @ 82929BD +PlayersHouse_1F_Movement_MomReturnToSeatMale: @ 82929BD walk_left walk_down walk_in_place_fastest_right step_end -LittlerootTown_MaysHouse_1F_Movement_2929C1: @ 82929C1 +PlayersHouse_1F_Movement_MomReturnToSeatFemale: @ 82929C1 walk_right walk_down walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_1F_EventScript_2929C5:: @ 82929C5 -LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5 +PlayersHouse_1F_EventScript_Mom:: @ 82929C5 lock faceplayer compare VAR_LITTLEROOT_HOUSES_STATE, 4 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F + goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F - goto_if_set FLAG_HAS_MATCH_CALL, LittlerootTown_BrendansHouse_1F_EventScript_292A19 - goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_BrendansHouse_1F_EventScript_292A86 + goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard + goto_if_set FLAG_HAS_MATCH_CALL, PlayersHouse_1F_EventScript_TryRegisterMom + goto_if_set FLAG_RESCUED_BIRCH, PlayersHouse_1F_EventScript_MomHealsParty compare VAR_TEMP_1, 1 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94 + goto_if_eq PlayersHouse_1F_EventScript_SeeYouHoney compare VAR_LITTLEROOT_INTRO_STATE, 7 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292AB0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT + goto_if_eq PlayersHouse_1F_EventScript_DidYouMeetProfBirch + msgbox PlayersHouse_1F_Text_IsntItNiceInHere, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_292A0F:: @ 8292A0F - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_DontPushYourselfTooHard:: @ 8292A0F + msgbox PlayersHouse_1F_Text_DontPushYourselfTooHard, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_292A19:: @ 8292A19 - goto_if_set FLAG_ENABLE_MOM_MATCH_CALL, LittlerootTown_BrendansHouse_1F_EventScript_292A43 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E0E, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_TryRegisterMom:: @ 8292A19 + goto_if_set FLAG_ENABLE_MOM_MATCH_CALL, PlayersHouse_1F_EventScript_CheckGiveAmuletCoin + msgbox PlayersHouse_1F_Text_IsThatAPokenav, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E89, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_RegisteredMom, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -346,67 +338,65 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A19:: @ 8292A19 release end -LittlerootTown_BrendansHouse_1F_EventScript_292A43:: @ 8292A43 - goto_if_set FLAG_BADGE05_GET, LittlerootTown_BrendansHouse_1F_EventScript_292A51 - goto LittlerootTown_BrendansHouse_1F_EventScript_292A86 +PlayersHouse_1F_EventScript_CheckGiveAmuletCoin:: @ 8292A43 + goto_if_set FLAG_BADGE05_GET, PlayersHouse_1F_EventScript_TryGiveAmuletCoin + goto PlayersHouse_1F_EventScript_MomHealsParty -LittlerootTown_BrendansHouse_1F_EventScript_292A51:: @ 8292A51 - goto_if_set FLAG_MOM_SAYS_GOODBYE, LittlerootTown_BrendansHouse_1F_EventScript_292A86 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_TryGiveAmuletCoin:: @ 8292A51 + goto_if_set FLAG_RECEIVED_AMULET_COIN, PlayersHouse_1F_EventScript_MomHealsParty + msgbox PlayersHouse_1F_Text_GotDadsBadgeHeresSomethingFromMom, MSGBOX_DEFAULT giveitem_std ITEM_AMULET_COIN compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT - setflag FLAG_MOM_SAYS_GOODBYE + msgbox PlayersHouse_1F_Text_DontPushYourselfTooHard, MSGBOX_DEFAULT + setflag FLAG_RECEIVED_AMULET_COIN release end -LittlerootTown_BrendansHouse_1F_EventScript_292A86:: @ 8292A86 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D08, MSGBOX_DEFAULT - goto LittlerootTown_BrendansHouse_1F_EventScript_292A9E +PlayersHouse_1F_EventScript_MomHealsParty:: @ 8292A86 + msgbox PlayersHouse_1F_Text_YouShouldRestABit, MSGBOX_DEFAULT + goto PlayersHouse_1F_EventScript_HealParty end -LittlerootTown_BrendansHouse_1F_EventScript_292A94:: @ 8292A94 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CC3, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_SeeYouHoney:: @ 8292A94 + msgbox PlayersHouse_1F_Text_SeeYouHoney, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_292A9E:: @ 8292A9E +PlayersHouse_1F_EventScript_HealParty:: @ 8292A9E closemessage call Common_EventScript_OutOfCenterPartyHeal - incrementgamestat 16 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D5C, MSGBOX_DEFAULT + incrementgamestat GAME_STAT_RESTED_AT_HOME + msgbox PlayersHouse_1F_Text_TakeCareHoney, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_292AB0:: @ 8292AB0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CD8, MSGBOX_DEFAULT +PlayersHouse_1F_EventScript_DidYouMeetProfBirch:: @ 8292AB0 + msgbox PlayersHouse_1F_Text_DidYouMeetProfBirch, MSGBOX_DEFAULT release end -LittlerootTown_BrendansHouse_1F_EventScript_292ABA:: @ 8292ABA -LittlerootTown_MaysHouse_1F_EventScript_292ABA:: @ 8292ABA +PlayersHouse_1F_EventScript_Vigoroth1:: @ 8292ABA lock faceplayer waitse playmoncry SPECIES_VIGOROTH, 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EA8, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_Vigoroth1, MSGBOX_DEFAULT waitmoncry release end -LittlerootTown_BrendansHouse_1F_EventScript_292ACD:: @ 8292ACD -LittlerootTown_MaysHouse_1F_EventScript_292ACD:: @ 8292ACD +PlayersHouse_1F_EventScript_Vigoroth2:: @ 8292ACD lock faceplayer waitse playmoncry SPECIES_VIGOROTH, 0 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EB3, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_Vigoroth2, MSGBOX_DEFAULT waitmoncry release end -LittlerootTown_BrendansHouse_1F_Movement_292AE0: @ 8292AE0 +PlayersHouse_1F_Movement_PlayerApproachTVForGymMale: @ 8292AE0 walk_down walk_down walk_left @@ -414,11 +404,11 @@ LittlerootTown_BrendansHouse_1F_Movement_292AE0: @ 8292AE0 walk_left step_end -LittlerootTown_BrendansHouse_1F_Movement_292AE6: @ 8292AE6 +PlayersHouse_1F_Movement_PlayerMoveToTVMale: @ 8292AE6 walk_left step_end -LittlerootTown_MaysHouse_1F_Movement_292AE8: @ 8292AE8 +PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale: @ 8292AE8 walk_down walk_down walk_right @@ -426,26 +416,25 @@ LittlerootTown_MaysHouse_1F_Movement_292AE8: @ 8292AE8 walk_right step_end -LittlerootTown_MaysHouse_1F_Movement_292AEE: @ 8292AEE +PlayersHouse_1F_Movement_PlayerMoveToTVFemale: @ 8292AEE walk_right step_end -LittlerootTown_BrendansHouse_1F_Movement_292AF0: @ 8292AF0 +PlayersHouse_1F_Movement_MovePlayerAwayFromDoor: @ 8292AF0 walk_up step_end -LittlerootTown_BrendansHouse_1F_EventScript_292AF2:: @ 8292AF2 -LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 +PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV:: @ 8292AF2 lockall checkplayergender compare VAR_RESULT, MALE - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C76 + call_if_eq PlayersHouse_1F_EventScript_SetUpObjectEventVarsMale compare VAR_RESULT, FEMALE - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C86 - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D08 - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D13 + call_if_eq PlayersHouse_1F_EventScript_SetUpObjectEventVarsFemale + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_PlayerEnterRoomMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_PlayerEnterRoomFemale applymovement VAR_0x8009, Common_Movement_FacePlayer waitmovement 0 playse SE_PIN @@ -454,64 +443,64 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 applymovement VAR_0x8009, Common_Movement_Delay48 waitmovement 0 delay 20 - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C96 - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CA1 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F800E, MSGBOX_DEFAULT + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_DadApproachPlayerMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_DadApproachPlayerFemale + msgbox PlayersHouse_1F_Text_TicketFromBrineyCameForYou, MSGBOX_DEFAULT giveitem_std ITEM_SS_TICKET - msgbox LittlerootTown_BrendansHouse_1F_Text_1F80FE, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_PortsInSlateportLilycove, MSGBOX_DEFAULT closemessage delay 20 - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CAC - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CC1 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F815B, MSGBOX_DEFAULT + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_MomApproachDadMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_MomApproachDadFemale + msgbox PlayersHouse_1F_Text_BetterGetBackToGym, MSGBOX_DEFAULT closemessage - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CD6 - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CEF + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_DadExitsMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_DadExitsFemale playse SE_DOOR removeobject VAR_0x8009 setflag FLAG_RECEIVED_SS_TICKET delay 30 - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D48 - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D5D + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_MomApproachPlayerMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_MomApproachPlayerFemale delay 20 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F81B9, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_DadShouldStayLonger, MSGBOX_DEFAULT closemessage setflag FLAG_SYS_TV_LATIAS_LATIOS special TurnOnTVScreen delay 60 - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D72 - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D7D - msgbox LittlerootTown_BrendansHouse_1F_Text_1F824B, MSGBOX_DEFAULT + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastFemale + msgbox PlayersHouse_1F_Text_IsThatABreakingStory, MSGBOX_DEFAULT closemessage - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D1E - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D33 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_PlayerApproachTVForLatiMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale + msgbox PlayersHouse_1F_Text_LatiEmergencyNewsFlash, MSGBOX_DEFAULT closemessage clearflag FLAG_SYS_TV_LATIAS_LATIOS setflag FLAG_LATIOS_OR_LATIAS_ROAMING special TurnOffTVScreen - compare VAR_0x8008, 0 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D88 - compare VAR_0x8008, 1 - call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D9D - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8351, MSGBOX_DEFAULT + compare VAR_0x8008, MALE + call_if_eq PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVMale + compare VAR_0x8008, FEMALE + call_if_eq PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVFemale + msgbox PlayersHouse_1F_Text_WhatColorDidTheySay, MSGBOX_DEFAULT multichoice 22, 8, MULTI_TV_LATI, 1 copyvar VAR_0x8004, VAR_RESULT special InitRoamer copyvar VAR_ROAMER_POKEMON, VAR_RESULT - msgbox LittlerootTown_BrendansHouse_1F_Text_1F83A1, MSGBOX_DEFAULT + msgbox PlayersHouse_1F_Text_StillUnknownPokemon, MSGBOX_DEFAULT closemessage setvar VAR_LITTLEROOT_HOUSES_STATE, 4 setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4 @@ -519,155 +508,155 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 end @ Never called. -LittlerootTown_BrendansHouse_1F_EventScript_292C72:: @ 8292C72 +PlayersHouse_1F_EventScript_AirLatiBroadcast:: @ 8292C72 setflag FLAG_SYS_TV_LATIAS_LATIOS return -LittlerootTown_BrendansHouse_1F_EventScript_292C76:: @ 8292C76 - setvar VAR_0x8008, 0 - setvar VAR_0x8009, 5 - setvar VAR_0x800A, 1 +PlayersHouse_1F_EventScript_SetUpObjectEventVarsMale:: @ 8292C76 + setvar VAR_0x8008, MALE + setvar VAR_0x8009, 5 @ Dad object event ID + setvar VAR_0x800A, 1 @ Mom object event ID return -LittlerootTown_BrendansHouse_1F_EventScript_292C86:: @ 8292C86 - setvar VAR_0x8008, 1 - setvar VAR_0x8009, 5 - setvar VAR_0x800A, 1 +PlayersHouse_1F_EventScript_SetUpObjectEventVarsFemale:: @ 8292C86 + setvar VAR_0x8008, FEMALE + setvar VAR_0x8009, 5 @ Dad object event ID + setvar VAR_0x800A, 1 @ Mom object event ID return -LittlerootTown_BrendansHouse_1F_EventScript_292C96:: @ 8292C96 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DB2 +PlayersHouse_1F_EventScript_DadApproachPlayerMale:: @ 8292C96 + applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadApproachPlayerMale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292CA1:: @ 8292CA1 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DB5 +PlayersHouse_1F_EventScript_DadApproachPlayerFemale:: @ 8292CA1 + applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadApproachPlayerFemale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292CAC:: @ 8292CAC - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292989 +PlayersHouse_1F_EventScript_MomApproachDadMale:: @ 8292CAC + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachDadMale waitmovement 0 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DB8 + applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadFaceMomMale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292CC1:: @ 8292CC1 - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292991 +PlayersHouse_1F_EventScript_MomApproachDadFemale:: @ 8292CC1 + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachDadFemale waitmovement 0 - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DBA + applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadFaceMomFemale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292CD6:: @ 8292CD6 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DCC - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292DCC - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DBC +PlayersHouse_1F_EventScript_DadExitsMale:: @ 8292CD6 + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit + applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadExitsMale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292CEF:: @ 8292CEF - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DCC - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292DCC - applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DC1 +PlayersHouse_1F_EventScript_DadExitsFemale:: @ 8292CEF + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit + applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadExitsFemale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D08:: @ 8292D08 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DC6 +PlayersHouse_1F_EventScript_PlayerEnterRoomMale:: @ 8292D08 + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomMale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D13:: @ 8292D13 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD1 +PlayersHouse_1F_EventScript_PlayerEnterRoomFemale:: @ 8292D13 + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomFemale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D1E:: @ 8292D1E - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD7 +PlayersHouse_1F_EventScript_PlayerApproachTVForLatiMale:: @ 8292D1E + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale waitmovement 0 - applymovement VAR_0x800A, Common_Movement_WalkInPlaceLeft + applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D33:: @ 8292D33 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DDE +PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale:: @ 8292D33 + applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale waitmovement 0 - applymovement VAR_0x800A, Common_Movement_WalkInPlaceRight + applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D48:: @ 8292D48 - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292999 +PlayersHouse_1F_EventScript_MomApproachPlayerMale:: @ 8292D48 + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerMale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D5D:: @ 8292D5D - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_29299B +PlayersHouse_1F_EventScript_MomApproachPlayerFemale:: @ 8292D5D + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerFemale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D72:: @ 8292D72 - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_29299D +PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastMale:: @ 8292D72 + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomNoticesLatiBroadcastMale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D7D:: @ 8292D7D - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929A6 +PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastFemale:: @ 8292D7D + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomNoticesLatiBroadcastFemale waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D88:: @ 8292D88 - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929AF +PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVMale:: @ 8292D88 + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVMale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D - applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929B3 +PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVFemale:: @ 8292D9D + applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVFemale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -LittlerootTown_BrendansHouse_1F_Movement_292DB2: @ 8292DB2 +PlayersHouse_1F_Movement_DadApproachPlayerMale: @ 8292DB2 walk_right walk_right step_end -LittlerootTown_BrendansHouse_1F_Movement_292DB5: @ 8292DB5 +PlayersHouse_1F_Movement_DadApproachPlayerFemale: @ 8292DB5 walk_left walk_left step_end -LittlerootTown_BrendansHouse_1F_Movement_292DB8: @ 8292DB8 +PlayersHouse_1F_Movement_DadFaceMomMale: @ 8292DB8 face_left step_end -LittlerootTown_BrendansHouse_1F_Movement_292DBA: @ 8292DBA +PlayersHouse_1F_Movement_DadFaceMomFemale: @ 8292DBA face_right step_end -LittlerootTown_BrendansHouse_1F_Movement_292DBC: @ 8292DBC +PlayersHouse_1F_Movement_DadExitsMale: @ 8292DBC walk_down walk_right walk_down delay_8 step_end -LittlerootTown_BrendansHouse_1F_Movement_292DC1: @ 8292DC1 +PlayersHouse_1F_Movement_DadExitsFemale: @ 8292DC1 walk_down walk_left walk_down delay_8 step_end -LittlerootTown_BrendansHouse_1F_Movement_292DC6: @ 8292DC6 +PlayersHouse_1F_Movement_PlayerEnterRoomMale: @ 8292DC6 delay_16 walk_down walk_down @@ -675,14 +664,14 @@ LittlerootTown_BrendansHouse_1F_Movement_292DC6: @ 8292DC6 walk_in_place_fastest_left step_end -LittlerootTown_BrendansHouse_1F_Movement_292DCC: @ 8292DCC +PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit: @ 8292DCC delay_8 delay_16 delay_16 walk_in_place_fastest_down step_end -LittlerootTown_BrendansHouse_1F_Movement_292DD1: @ 8292DD1 +PlayersHouse_1F_Movement_PlayerEnterRoomFemale: @ 8292DD1 delay_16 walk_down walk_down @@ -690,7 +679,7 @@ LittlerootTown_BrendansHouse_1F_Movement_292DD1: @ 8292DD1 walk_in_place_fastest_right step_end -LittlerootTown_BrendansHouse_1F_Movement_292DD7: @ 8292DD7 +PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale: @ 8292DD7 walk_up walk_left walk_left @@ -699,7 +688,7 @@ LittlerootTown_BrendansHouse_1F_Movement_292DD7: @ 8292DD7 walk_in_place_fastest_up step_end -LittlerootTown_BrendansHouse_1F_Movement_292DDE: @ 8292DDE +PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale: @ 8292DDE walk_up walk_right walk_right @@ -707,3 +696,7 @@ LittlerootTown_BrendansHouse_1F_Movement_292DDE: @ 8292DDE walk_right walk_in_place_fastest_up step_end + +EventScript_RunningShoesManual:: @ 8292DE5 + msgbox PlayersHouse_1F_Text_RunningShoesManual, MSGBOX_SIGN + end diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 7b3932341..c223bc1c7 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -252,7 +252,7 @@ EventScript_Pblock1_Ask:: @ 8293C3E applymovement 16, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 msgbox Text_Pblock1_Ask, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_Pblock1_Yes goto EventScript_Pblock1_No end @@ -283,7 +283,7 @@ LilycoveCity_ContestLobby_EventScript_293C9C: @ 8293C9C EventScript_Pblock1_KnowHow: @ 8293CB9 msgbox Text_Pblock1_KnowHow, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq EventScript_Pblock1_Start goto EventScript_Pblock1_Explain end @@ -337,7 +337,7 @@ LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D applymovement 3, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_293201, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_293DC6 goto LilycoveCity_ContestLobby_EventScript_293D7D end @@ -354,7 +354,7 @@ LilycoveCity_ContestLobby_EventScript_293D87: @ 8293D87 LilycoveCity_ContestLobby_EventScript_293D91: @ 8293D91 msgbox LilycoveCity_ContestLobby_Text_29328C, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_293DAA goto LilycoveCity_ContestLobby_EventScript_293DB8 end @@ -403,7 +403,7 @@ LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_293EA3 goto LilycoveCity_ContestLobby_EventScript_293E5A end @@ -420,7 +420,7 @@ LilycoveCity_ContestLobby_EventScript_293E64: @ 8293E64 LilycoveCity_ContestLobby_EventScript_293E6E: @ 8293E6E msgbox LilycoveCity_ContestLobby_Text_29357E, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_293E87 goto LilycoveCity_ContestLobby_EventScript_293E95 end @@ -667,25 +667,25 @@ EventScript_PblocLink_NoPokeblock: @ 829416C EventScript_PblocLink_SomeoneNotReady: @ 8294176 special CloseLink - msgbox LilycoveCity_ContestLobby_Text_2781C7, MSGBOX_DEFAULT + msgbox Text_SomeoneIsNotReadyToLink, MSGBOX_DEFAULT releaseall end EventScript_PblocLink_DifferentSelections: @ 8294183 special CloseLink - msgbox LilycoveCity_ContestLobby_Text_278255, MSGBOX_DEFAULT + msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT releaseall end EventScript_PblocLink_CloseLink: @ 8294190 special CloseLink - msgbox gUnknown_08272D9C, MSGBOX_DEFAULT + msgbox gText_PokeblockLinkCanceled, MSGBOX_DEFAULT releaseall end EventScript_PblocLink_LinkError: @ 829419D special CloseLink - msgbox LilycoveCity_ContestLobby_Text_27821C, MSGBOX_DEFAULT + msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT releaseall end @@ -745,12 +745,12 @@ EventScript_PblocLink_TryJoinGroup: @ 829425D end EventScript_PblocLink_BecomeLeader: @ 8294285 - special BerryBlenderLinkBecomeLeader + special TryBecomeLinkLeader waitstate return EventScript_PblocLink_JoinGroup: @ 829428A - special BerryBlenderLinkJoinGroup + special TryJoinLinkGroup waitstate return diff --git a/data/scripts/prof_birch.inc b/data/scripts/prof_birch.inc new file mode 100644 index 000000000..b89d2fbd0 --- /dev/null +++ b/data/scripts/prof_birch.inc @@ -0,0 +1,89 @@ +ProfBirch_EventScript_UpdateLocation:: @ 82720AD + compare VAR_PETALBURG_GYM_STATE, 0 + goto_if_eq Common_EventScript_NopReturn + goto_if_set FLAG_SYS_GAME_CLEAR, ProfBirch_EventScript_MoveToLab + compare VAR_BIRCH_STATE, 0 + call_if_eq ProfBirch_EventScript_MoveToLab + compare VAR_BIRCH_STATE, 1 + call_if_eq ProfBirch_EventScript_MoveToLab + compare VAR_BIRCH_STATE, 2 + call_if_eq ProfBirch_EventScript_MoveToRoute101 + compare VAR_BIRCH_STATE, 3 + call_if_eq ProfBirch_EventScript_MoveToRoute101 + compare VAR_BIRCH_STATE, 4 + call_if_eq ProfBirch_EventScript_MoveToRoute103 + compare VAR_BIRCH_STATE, 5 + call_if_eq ProfBirch_EventScript_MoveToRoute103 + compare VAR_BIRCH_STATE, 6 + call_if_eq ProfBirch_EventScript_MoveToLab + compare VAR_BIRCH_STATE, 7 + call_if_eq ProfBirch_EventScript_MoveToLab + return + +ProfBirch_EventScript_MoveToLab:: @ 827211A + clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH + clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 + setflag FLAG_HIDE_ROUTE_101_BIRCH + setflag FLAG_HIDE_ROUTE_103_BIRCH + return + +ProfBirch_EventScript_MoveToRoute101:: @ 8272127 + clearflag FLAG_HIDE_ROUTE_101_BIRCH + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 + setflag FLAG_HIDE_ROUTE_103_BIRCH + return + +ProfBirch_EventScript_MoveToRoute103:: @ 8272134 + clearflag FLAG_HIDE_ROUTE_103_BIRCH + setflag FLAG_HIDE_ROUTE_101_BIRCH + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH + setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 + return + +ProfBirch_EventScript_RatePokedexOrRegister:: @ 8272141 + lock + faceplayer + goto_if_unset FLAG_HAS_MATCH_CALL, ProfBirch_EventScript_AskRatePokedex + goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, EventScript_RegisterProfBirch + +ProfBirch_EventScript_AskRatePokedex:: @ 8272155 + msgbox gBirchDexRatingText_AreYouCurious, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq ProfBirch_EventScript_DeclineRating + call ProfBirch_EventScript_RatePokedex + release + end + +ProfBirch_EventScript_DeclineRating:: @ 827216F + msgbox gBirchDexRatingText_Cancel, MSGBOX_DEFAULT + release + end + +ProfBirch_EventScript_ShowRatingMessage:: @ 8272179 + copyvar VAR_0x8004, VAR_0x8009 + special ShowPokedexRatingMessage + waitmessage + waitbuttonpress + return + +ProfBirch_EventScript_RatePokedex:: @ 8272184 + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, ScriptGetPokedexInfo + copyvar VAR_0x8008, VAR_0x8005 + copyvar VAR_0x8009, VAR_0x8006 + copyvar VAR_0x800A, VAR_RESULT + buffernumberstring 0, VAR_0x8008 @ Num Hoenn seen + buffernumberstring 1, VAR_0x8009 @ Num Hoenn caught + msgbox gBirchDexRatingText_SoYouveSeenAndCaught, MSGBOX_DEFAULT + call ProfBirch_EventScript_ShowRatingMessage + compare VAR_0x800A, 0 + goto_if_eq Common_EventScript_NopReturn @ National dex not enabled + setvar VAR_0x8004, 1 + specialvar VAR_RESULT, ScriptGetPokedexInfo + copyvar VAR_0x8008, VAR_0x8005 + copyvar VAR_0x8009, VAR_0x8006 + buffernumberstring 0, VAR_0x8008 @ Num National seen + buffernumberstring 1, VAR_0x8009 @ Num National caught + msgbox gBirchDexRatingText_OnANationwideBasis, MSGBOX_DEFAULT + return diff --git a/data/scripts/record_mix.inc b/data/scripts/record_mix.inc new file mode 100644 index 000000000..23f224ae4 --- /dev/null +++ b/data/scripts/record_mix.inc @@ -0,0 +1,23 @@ +@ Seems this was superseded by the Record Center, and the below scripts are now unused +EventScript_MixRecordsPrompt:: @ 8271D5E + lock + faceplayer + msgbox Text_WouldYouLikeToMixRecords, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq EventScript_MixRecords + compare VAR_RESULT, NO + goto_if_eq EventScript_DeclineMixRecords + goto EventScript_DeclineMixRecords + +EventScript_MixRecords:: @ 8271D83 + special RecordMixingPlayerSpotTriggered + waitstate + lock + faceplayer + +EventScript_DeclineMixRecords:: @ 8271D89 + message Text_WeHopeToSeeYouAgain + waitmessage + waitbuttonpress + release + end diff --git a/data/scripts/repel.inc b/data/scripts/repel.inc new file mode 100644 index 000000000..5deda5762 --- /dev/null +++ b/data/scripts/repel.inc @@ -0,0 +1,6 @@ +EventScript_RepelWoreOff:: @ 82A4B2A + msgbox Text_RepelWoreOff, MSGBOX_SIGN + end + +Text_RepelWoreOff: @ 82A4B33 + .string "REPEL's effect wore off…$" diff --git a/data/scripts/rival_graphics.inc b/data/scripts/rival_graphics.inc new file mode 100644 index 000000000..60bd1a337 --- /dev/null +++ b/data/scripts/rival_graphics.inc @@ -0,0 +1,48 @@ +Common_EventScript_SetupRivalGfxId:: @ 8271ED7 + checkplayergender + compare VAR_RESULT, MALE + goto_if_eq EventScript_SetupRivalGfxIdFemale + compare VAR_RESULT, FEMALE + goto_if_eq EventScript_SetupRivalGfxIdMale + end + +EventScript_SetupRivalGfxIdFemale:: @ 8271EEF + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + return + +EventScript_SetupRivalGfxIdMale:: @ 8271EF5 + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + return + +Common_EventScript_SetupRivalOnBikeGfxId:: @ 8271EFB + checkplayergender + compare VAR_RESULT, MALE + goto_if_eq EventScript_SetupRivalOnBikeGfxIdFemale + compare VAR_RESULT, FEMALE + goto_if_eq EventScript_SetupRivalOnBikeGfxIdMale + end + +EventScript_SetupRivalOnBikeGfxIdFemale:: @ 8271F13 + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE + return + +EventScript_SetupRivalOnBikeGfxIdMale:: @ 8271F19 + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE + return + +@ Unused +Common_EventScript_SetupRivalGfxIdSameGender:: @ 8271F1F + checkplayergender + compare VAR_RESULT, MALE + goto_if_eq EventScript_SetupRivalGfxIdMale2 + compare VAR_RESULT, FEMALE + goto_if_eq EventScript_SetupRivalGfxIdFemale2 + end + +EventScript_SetupRivalGfxIdMale2:: @ 8271F37 + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + return + +EventScript_SetupRivalGfxIdFemale2:: @ 8271F3D + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + return diff --git a/data/scripts/roulette.inc b/data/scripts/roulette.inc new file mode 100644 index 000000000..791069088 --- /dev/null +++ b/data/scripts/roulette.inc @@ -0,0 +1,71 @@ +Roulette_EventScript_Table1:: @ 82A5AB1 + checkitem ITEM_COIN_CASE, 1 + compare VAR_RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase + setvar VAR_0x8004, 0 + getpricereduction POKENEWS_GAME_CORNER + compare VAR_RESULT, 0 + goto_if_eq Roulette_EventScript_Play + addvar VAR_0x8004, 128 + goto Roulette_EventScript_Play + end + +Roulette_EventScript_Table2:: @ 82A5ADF + checkitem ITEM_COIN_CASE, 1 + compare VAR_RESULT, 0 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase + setvar VAR_0x8004, 1 + getpricereduction POKENEWS_GAME_CORNER + compare VAR_RESULT, 0 + goto_if_eq Roulette_EventScript_Play + addvar VAR_0x8004, 128 + goto Roulette_EventScript_Play + end + +Roulette_EventScript_Play:: @ 82A5B0D + special PlayRoulette + waitstate + end + +Roulette_Text_PlayMinimumWagerIsX:: @ 82A5B12 + .string "The minimum wager at this table\n" + .string "is {STR_VAR_1}. Do you want to play?$" + +Roulette_Text_NotEnoughCoins:: @ 82A5B4E + .string "You don't have enough COINS.$" + +Roulette_Text_SpecialRateTable:: @ 82A5B6B + .string "Special rate table right now!$" + +Roulette_Text_ControlsInstruction:: @ 82A5B89 + .string "Place your wager with the + Control\n" + .string "Pad, then press the A Button.$" + +Roulette_Text_ItsAHit:: @ 82A5BCB + .string "It's a hit!$" + +Roulette_Text_Jackpot:: @ 82A5BD7 + .string "Jackpot!$" + +Roulette_Text_NothingDoing:: @ 82A5BE0 + .string "Nothing doing!$" + +Roulette_Text_YouveWonXCoins:: @ 82A5BEF + .string "You've won {STR_VAR_1} COINS!$" + +Roulette_Text_NoCoinsLeft:: @ 82A5C04 + .string "No COINS left…$" + +Roulette_Text_KeepPlaying:: @ 82A5C13 + .string "Keep playing?$" + +Roulette_Text_BoardWillBeCleared:: @ 82A5C21 + .string "The ROULETTE board will be cleared.$" + +@ Unused +Roulette_Text_YouDontHaveACoinCase:: @ 82A5C45 + .string "You don't have a COIN CASE.$" + +Roulette_Text_CoinCaseIsFull:: @ 82A5C61 + .string "Your COIN CASE is full!\n" + .string "Coins can be exchanged for prizes.$" diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 3539e0970..72d1d3c92 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -1,103 +1,103 @@ -EventScript_2A4B4C:: @ 82A4B4C +SafariZone_EventScript_OutOfBallsMidBattle:: @ 82A4B4C setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 end -EventScript_2A4B5D:: @ 82A4B5D +SafariZone_EventScript_Exit:: @ 82A4B5D setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate end -EventScript_2A4B6F:: @ 82A4B6F +SafariZone_EventScript_RetirePrompt:: @ 82A4B6F lockall - msgbox Text_2A4BF4, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq EventScript_2A4B85 + msgbox SafariZone_Text_WouldYouLikeToExit, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq SafariZone_EventScript_Retire releaseall end -EventScript_2A4B85:: @ 82A4B85 - goto EventScript_2A4B5D +SafariZone_EventScript_Retire:: @ 82A4B85 + goto SafariZone_EventScript_Exit -EventScript_2A4B8A:: @ 82A4B8A +SafariZone_EventScript_TimesUp:: @ 82A4B8A lockall playse SE_PINPON - message Text_2A4C26 + message SafariZone_Text_TimesUp waitmessage waitbuttonpress releaseall - goto EventScript_2A4B5D + goto SafariZone_EventScript_Exit -EventScript_2A4B9B:: @ 82A4B9B +SafariZone_EventScript_OutOfBalls:: @ 82A4B9B lockall playse SE_PINPON - message Text_2A4C56 + message SafariZone_Text_OutOfBalls waitmessage waitbuttonpress releaseall - goto EventScript_2A4B5D + goto SafariZone_EventScript_Exit EventScript_PokeBlockFeeder:: @ 82A4BAC lockall special GetPokeblockFeederInFront - compare VAR_RESULT, 65535 - goto_if_ne EventScript_2A4BEB - msgbox Text_2A4C90, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq EventScript_2A4BD0 + compare VAR_RESULT, 0xFFFF + goto_if_ne SafariZone_EventScript_PokeblockPresent + msgbox SafariZone_Text_PlacePokeblockOnFeeder, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq SafariZone_EventScript_ChoosePokeblock releaseall end -EventScript_2A4BD0:: @ 82A4BD0 +SafariZone_EventScript_ChoosePokeblock:: @ 82A4BD0 fadescreen 1 special OpenPokeblockCaseOnFeeder waitstate - compare VAR_RESULT, 65535 - goto_if_ne EventScript_2A4BE2 + compare VAR_RESULT, 0xFFFF + goto_if_ne SafariZone_EventScript_PokeblockPlaced end -EventScript_2A4BE2:: @ 82A4BE2 - message Text_2A4CEB +SafariZone_EventScript_PokeblockPlaced:: @ 82A4BE2 + message SafariZone_Text_PokeblockWasPlaced waitmessage waitbuttonpress releaseall end -EventScript_2A4BEB:: @ 82A4BEB - message Text_2A4CC5 +SafariZone_EventScript_PokeblockPresent:: @ 82A4BEB + message SafariZone_Text_PokeblockStillHere waitmessage waitbuttonpress releaseall end -Text_2A4BF4: @ 82A4BF4 +SafariZone_Text_WouldYouLikeToExit: @ 82A4BF4 .string "Would you like to exit the SAFARI\n" .string "ZONE right now?$" -Text_2A4C26: @ 82A4C26 +SafariZone_Text_TimesUp: @ 82A4C26 .string "Ding-dong! Time's up!\n" .string "Your SAFARI Game is over.$" -Text_2A4C56: @ 82A4C56 +SafariZone_Text_OutOfBalls: @ 82A4C56 .string "You've run out of SAFARI BALLS.\n" .string "Your SAFARI Game is over.$" -Text_2A4C90: @ 82A4C90 +SafariZone_Text_PlacePokeblockOnFeeder: @ 82A4C90 .string "Would you like to place a {POKEBLOCK}\n" .string "on the {POKEBLOCK} FEEDER?$" -Text_2A4CC5: @ 82A4CC5 +SafariZone_Text_PokeblockStillHere: @ 82A4CC5 .string "The {STR_VAR_1} you left\n" .string "before is still here.$" -Text_2A4CEB: @ 82A4CEB +SafariZone_Text_PokeblockWasPlaced: @ 82A4CEB .string "The {STR_VAR_1} was placed\n" .string "on the {POKEBLOCK} FEEDER.$" -Route121_SafariZoneEntrance_Text_2A4D12: @ 82A4D12 +Route121_SafariZoneEntrance_Text_WelcomeToSafariZone: @ 82A4D12 .string "Welcome to the SAFARI ZONE!\p" .string "Here, you may witness many kinds of\n" .string "POKéMON rarely seen in HOENN.\p" @@ -109,14 +109,14 @@ Route121_SafariZoneEntrance_Text_2A4D12: @ 82A4D12 .string "for keeps!\p" .string "Come in and enjoy the SAFARI ZONE!$" -Route121_SafariZoneEntrance_Text_2A4E46: @ 82A4E46 +Route121_SafariZoneEntrance_Text_WelcomeFirstTime: @ 82A4E46 .string "Welcome to the SAFARI ZONE!\n" .string "Is it your first time here?$" -Route121_SafariZoneEntrance_Text_2A4E7E: @ 82A4E7E +Route121_SafariZoneEntrance_Text_ComeInAndEnjoy: @ 82A4E7E .string "Come in and enjoy the SAFARI ZONE!$" -Route121_SafariZoneEntrance_Text_2A4EA1: @ 82A4EA1 +Route121_SafariZoneEntrance_Text_FirstTimeInfo: @ 82A4EA1 .string "When you enter the SAFARI ZONE, you\n" .string "start with 30 SAFARI BALLS for\l" .string "catching POKéMON.\p" @@ -125,39 +125,39 @@ Route121_SafariZoneEntrance_Text_2A4EA1: @ 82A4EA1 .string "walked 500 steps.\p" .string "Come in and enjoy the SAFARI ZONE!$" -Route121_SafariZoneEntrance_Text_2A4F74: @ 82A4F74 +Route121_SafariZoneEntrance_Text_WouldYouLikeToPlay: @ 82A4F74 .string "Welcome to the SAFARI ZONE!\p" .string "All you can catch for just ¥500!\n" .string "Would you like to play a SAFARI Game?$" -Route121_SafariZoneEntrance_Text_2A4FD7: @ 82A4FD7 +Route121_SafariZoneEntrance_Text_PlayAnotherTime: @ 82A4FD7 .string "Okay.\n" .string "Please play another time!$" -Route121_SafariZoneEntrance_Text_2A4FF7: @ 82A4FF7 +Route121_SafariZoneEntrance_Text_NotEnoughMoney: @ 82A4FF7 .string "You don't have enough money.\n" .string "Sorry.$" -Route121_SafariZoneEntrance_Text_2A501B: @ 82A501B +Route121_SafariZoneEntrance_Text_ThatWillBe500Please: @ 82A501B .string "That will be ¥500, please.$" -Route121_SafariZoneEntrance_Text_2A5036: @ 82A5036 +Route121_SafariZoneEntrance_Text_HereAreYourSafariBalls: @ 82A5036 .string "Here are your SAFARI BALLS.$" -Route121_SafariZoneEntrance_Text_2A5052: @ 82A5052 +Route121_SafariZoneEntrance_Text_Received30SafariBalls: @ 82A5052 .string "{PLAYER} received 30 SAFARI BALLS.$" -Route121_SafariZoneEntrance_Text_2A506F: @ 82A506F +Route121_SafariZoneEntrance_Text_PleaseEnjoyYourself: @ 82A506F .string "We'll let you know when your game\n" .string "is over.\p" .string "So, until then, enjoy yourself, please!\n" .string "Off you go on your wild excursion!$" -Route121_SafariZoneEntrance_Text_2A50E5: @ 82A50E5 +Route121_SafariZoneEntrance_Text_PCIsFull: @ 82A50E5 .string "Excuse me!\n" .string "Your PC BOX is full.$" -Route121_SafariZoneEntrance_Text_2A5105: @ 82A5105 +Route121_SafariZoneEntrance_Text_YouNeedPokeblockCase: @ 82A5105 .string "Excuse me!\n" .string "You seem to be without a {POKEBLOCK} CASE.\p" .string "Your SAFARI Game will be much more\n" @@ -166,129 +166,129 @@ Route121_SafariZoneEntrance_Text_2A5105: @ 82A5105 .string "You may obtain a {POKEBLOCK} CASE from\n" .string "the LILYCOVE CONTEST HALL.$" -SafariZone_South_Text_2A51D4: @ 82A51D4 +SafariZone_South_Text_StillHaveTimeExit: @ 82A51D4 .string "You still have time left. Would you like\n" .string "to exit the SAFARI ZONE now?$" -SafariZone_South_Text_2A521A: @ 82A521A +SafariZone_South_Text_EnjoyTheRestOfYourAdventure: @ 82A521A .string "Please enjoy the rest of your wild\n" .string "adventure!$" -SafariZone_South_Text_2A5248: @ 82A5248 +SafariZone_South_Text_ExitEarlyThankYouForPlaying: @ 82A5248 .string "Okay.\p" .string "I'll take back your remaining SAFARI\n" .string "BALLS.\p" .string "Thank you for playing.\n" .string "We hope to see you again.$" -SafariZone_South_Text_2A52AB: @ 82A52AB +SafariZone_South_Text_GoodLuck: @ 82A52AB .string "Good luck!\p" .string "If you need anything, don't hesitate\n" .string "to tell me, please!$" -SafariZone_South_Text_2A52EF: @ 82A52EF +SafariZone_South_Text_Boy: @ 82A52EF .string "Did you know?\p" .string "If you put a {POKEBLOCK} in that square box,\n" .string "POKéMON gather around.$" -SafariZone_South_Text_2A533B: @ 82A533B +SafariZone_South_Text_Man: @ 82A533B .string "I want to keep going deeper, but I\n" .string "forgot to bring a BIKE.\p" .string "Something tells me that rare POKéMON\n" .string "live in the outlying areas.$" -SafariZone_Southwest_Text_2A53B7: @ 82A53B7 +SafariZone_Southwest_Text_Woman: @ 82A53B7 .string "Sometimes, when I toss a {POKEBLOCK} at \n" .string "POKéMON, it gets ignored.\p" .string "Do POKéMON have likes and dislikes\n" .string "about what they eat?$" -SafariZone_Northwest_Text_2A542C: @ 82A542C +SafariZone_Northwest_Text_Man: @ 82A542C .string "Gasp… Gasp…\n" .string "I…made it out here…but…\p" .string "I'm exhausted… I don't have the\n" .string "energy to catch POKéMON…$" -SafariZone_North_Text_2A5489: @ 82A5489 +SafariZone_North_Text_Fisherman: @ 82A5489 .string "I'm on a mission to find WATER POKéMON\n" .string "you don't see in HOENN.\p" .string "Do you have any idea where the lake is?$" -SafariZone_North_Text_2A54F0: @ 82A54F0 +SafariZone_North_Text_Man: @ 82A54F0 .string "I'm going to catch a lot of rare POKéMON\n" .string "here and trade them with my friends!$" -SafariZone_South_Text_2A553E: @ 82A553E +SafariZone_South_Text_Youngster: @ 82A553E .string "I put a {POKEBLOCK} on the {POKEBLOCK} FEEDER.\n" .string "But it seems to have disappeared.\p" .string "I guess POKéMON must have eaten it\n" .string "without me noticing.$" -Route121_SafariZoneEntrance_Text_2A55BB: @ 82A55BB +Route121_SafariZoneEntrance_Text_TrainerTip: @ 82A55BB .string "SAFARI ZONE TRAINER TIP!\p" .string "Throw {POKEBLOCK}S at wild POKéMON to make\n" .string "them less likely to flee.$" -SafariZone_Southwest_Text_2A5613: @ 82A5613 +SafariZone_Southwest_Text_RestHouseSign: @ 82A5613 .string "“Relieve your tired feet.”\n" .string "REST HOUSE$" -SafariZone_RestHouse_Text_2A5639: @ 82A5639 +SafariZone_RestHouse_Text_Youngster: @ 82A5639 .string "I don't have any {POKEBLOCK}S, but I caught\n" .string "a good number of POKéMON.\p" .string "You can improve your chances of making\n" .string "a catch by getting closer to them\l" .string "before throwing a SAFARI BALL.$" -SafariZone_RestHouse_Text_2A56E1: @ 82A56E1 +SafariZone_RestHouse_Text_PsychicM: @ 82A56E1 .string "If you use {POKEBLOCK}S, wild POKéMON won't\n" .string "be so quick to run away.\p" .string "It's not much use to give {POKEBLOCK}S to\n" .string "POKéMON that don't flee easily.$" -SafariZone_RestHouse_Text_2A5764: @ 82A5764 +SafariZone_RestHouse_Text_FatMan: @ 82A5764 .string "If you put a {POKEBLOCK} on the FEEDER,\n" .string "POKéMON are attracted to it.\p" .string "I think POKéMON with the same sort of\n" .string "nature are drawn by a certain {POKEBLOCK}.$" -SafariZone_South_Text_2A57EE: @ 82A57EE +SafariZone_South_Text_AreaOffLimits1: @ 82A57EE .string "This area is still under construction.\n" .string "It's off-limits, sorry!$" -SafariZone_Southeast_Text_2A582D: @ 82A582D +SafariZone_Southeast_Text_ExpansionIsFinished: @ 82A582D .string "The SAFARI ZONE's expansion project\n" .string "is finished now.\p" .string "We hope you will enjoy the new area.$" -SafariZone_South_Text_2A5887: @ 82A5887 +SafariZone_South_Text_AreaOffLimits2: @ 82A5887 .string "This area is still under construction.\n" .string "It's off-limits, sorry!$" -SafariZone_Southeast_Text_2A58C6: @ 82A58C6 +SafariZone_Southeast_Text_LittleGirl: @ 82A58C6 .string "Wow! Whee! I haven't seen any of\n" .string "these POKéMON before!$" -SafariZone_Southeast_Text_2A58FD: @ 82A58FD +SafariZone_Southeast_Text_FatMan: @ 82A58FD .string "The POKéMON in this area are all\n" .string "new to me.\p" .string "And I'm allowed to catch these rare\n" .string "POKéMON! Too cool!$" -SafariZone_Southeast_Text_2A5960: @ 82A5960 +SafariZone_Southeast_Text_RichBoy: @ 82A5960 .string "The POKéMON around here seem to be\n" .string "from somewhere other than HOENN.$" -SafariZone_Northeast_Text_2A59A4: @ 82A59A4 +SafariZone_Northeast_Text_Boy: @ 82A59A4 .string "I only have a couple SAFARI BALLS left.\p" .string "I'm having a hard time trying to\n" .string "decide what I should catch.$" -SafariZone_Northeast_Text_2A5A09: @ 82A5A09 +SafariZone_Northeast_Text_Woman: @ 82A5A09 .string "I heard that you can see PIKACHU here.\n" .string "Where might one be?$" -SafariZone_Northeast_Text_2A5A44: @ 82A5A44 +SafariZone_Northeast_Text_Girl: @ 82A5A44 .string "Oh, boo!\n" .string "I can't seem to catch anything!\p" .string "I'll end up wasting the admission\n" diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 81bd388f8..04fab5598 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -1,433 +1,148 @@ -Text_274746: @ 8274746 +SecretBase_Text_TreeCanBeClimbed: @ 8274746 .string "If some vines drop down, this tree can\n" .string "be climbed.$" -Text_274779: @ 8274779 +SecretBase_Text_TreeUseSecretPower: @ 8274779 .string "If some vines drop down, this tree can\n" .string "be climbed.\p" .string "Use the SECRET POWER?$" -Text_2747C2: @ 82747C2 +SecretBase_Text_VineDroppedDown: @ 82747C2 .string "A thick vine dropped down!$" -Text_2747DD: @ 82747DD +SecretBase_Text_ClumpOfGrass: @ 82747DD .string "If this clump of grass can be moved,\n" .string "it might be possible to go inside.$" -Text_274825: @ 8274825 +SecretBase_Text_ClumpUseSecretPower: @ 8274825 .string "If this clump of grass can be moved,\n" .string "it might be possible to go inside.\p" .string "Use the SECRET POWER?$" -Text_274883: @ 8274883 +SecretBase_Text_DiscoveredSmallEntrance: @ 8274883 .string "Discovered a small entrance!$" -SecretBase_RedCave1_Text_2748A0: @ 82748A0 - .string "Have you made a SECRET BASE already?\p" - .string "I went here, there, everywhere before\n" - .string "choosing this place.\p" - .string "Since you're already here, how would\n" - .string "you like to battle?$" - -SecretBase_RedCave1_Text_274939: @ 8274939 - .string "Okay!\n" - .string "Here we come!$" - -SecretBase_RedCave1_Text_27494D: @ 827494D - .string "Hunh?\n" - .string "Oh, you can't now…$" - -SecretBase_RedCave1_Text_274966:: @ 8274966 - .string "Waaargh! You're too strong!\n" - .string "About me losing… Please keep it secret!$" - -SecretBase_RedCave1_Text_2749AA: @ 82749AA - .string "What do you think of my SECRET BASE?\n" - .string "Come visit me again tomorrow.$" - -SecretBase_RedCave1_Text_2749ED: @ 82749ED - .string "Have you made a SECRET BASE already?\p" - .string "I went here, there, everywhere before\n" - .string "choosing this place.\p" - .string "Feel free to hang out!$" - -SecretBase_RedCave1_Text_274A64: @ 8274A64 - .string "There're a lot of places where\n" - .string "you can make a SECRET BASE.\p" - .string "But I like this spot best.\n" - .string "Don't you think it's nice?\p" - .string "Oh, would you like to have a battle?$" - -SecretBase_RedCave1_Text_274AFA: @ 8274AFA - .string "Okay, here goes!$" - -SecretBase_RedCave1_Text_274B0B: @ 8274B0B - .string "Oh…\n" - .string "You can't now, okay.$" - -SecretBase_RedCave1_Text_274B24:: @ 8274B24 - .string "Hmmm… It's our loss…\n" - .string "But don't tell anyone!\l" - .string "It's a confidential secret!$" - -SecretBase_RedCave1_Text_274B6C: @ 8274B6C - .string "If you're in this area again,\n" - .string "I hope you'll visit me.$" - -SecretBase_RedCave1_Text_274BA2: @ 8274BA2 - .string "There're a lot of places where you can\n" - .string "make a SECRET BASE.\p" - .string "But I like this spot best.\n" - .string "Don't you think it's nice?$" - -SecretBase_RedCave1_Text_274C13: @ 8274C13 - .string "This is a popular spot.\n" - .string "It's always taken.\p" - .string "Oh! Were you thinking about\n" - .string "taking this spot, too?\p" - .string "I'll tell you what, you can have this\n" - .string "spot if you can beat me.$" - -SecretBase_RedCave1_Text_274CB0: @ 8274CB0 - .string "Okay!\n" - .string "I'm going to defend my SECRET BASE!$" - -SecretBase_RedCave1_Text_274CDA: @ 8274CDA - .string "Hunh? Is that right?\n" - .string "You're not interested in this spot?$" - -SecretBase_RedCave1_Text_274D13:: @ 8274D13 - .string "I can't keep going!\n" - .string "I surrender!$" - -SecretBase_RedCave1_Text_274D34: @ 8274D34 - .string "Okay, when I move one day,\n" - .string "this place will be yours!$" - -SecretBase_RedCave1_Text_274D69: @ 8274D69 - .string "This is a popular spot.\n" - .string "It's always taken.\p" - .string "I waited a long time for it to open.\n" - .string "I finally got to use it!$" - -SecretBase_RedCave1_Text_274DD2: @ 8274DD2 - .string "Welcome to my POKéMON LAB.\p" - .string "I carry out research on battling in\n" - .string "secrecy.\p" - .string "Would you like to see how strong I am?$" - -SecretBase_RedCave1_Text_274E41: @ 8274E41 - .string "I'm going to go all out!$" - -SecretBase_RedCave1_Text_274E5A: @ 8274E5A - .string "Oh.\n" - .string "Some other time, then!$" - -SecretBase_RedCave1_Text_274E75:: @ 8274E75 - .string "Hmm… I've still got lots to learn.\n" - .string "I have to study some more.$" - -SecretBase_RedCave1_Text_274EB3: @ 8274EB3 - .string "Thanks for battling with me.\n" - .string "Please come back again tomorrow.$" - -SecretBase_RedCave1_Text_274EF1: @ 8274EF1 - .string "Welcome to my POKéMON LAB.\p" - .string "I carry out research on battling in\n" - .string "secrecy.$" - -SecretBase_RedCave1_Text_274F39: @ 8274F39 - .string "A big mansion is nice, but I like this\n" - .string "sort of place more.\p" - .string "I like it because all kinds of people\n" - .string "come visit me.\p" - .string "So, how would you like a battle?$" - -SecretBase_RedCave1_Text_274FCA: @ 8274FCA - .string "That's the way!$" - -SecretBase_RedCave1_Text_274FDA: @ 8274FDA - .string "When you're ready, give me a shout!$" - -SecretBase_RedCave1_Text_274FFE:: @ 8274FFE - .string "Aww! Done in!\n" - .string "But it's still fun to battle!$" - -SecretBase_RedCave1_Text_27502A: @ 827502A - .string "Well, anyway, I should go buy some\n" - .string "decorations and furniture.\p" - .string "I want my SECRET BASE to be a place\n" - .string "other people can enjoy.$" - -SecretBase_RedCave1_Text_2750A4: @ 82750A4 - .string "A big mansion is nice, but I like this\n" - .string "sort of place more.\p" - .string "I like it because all kinds of people\n" - .string "come visit me.$" - -SecretBase_RedCave1_Text_275114: @ 8275114 - .string "I simply adore shopping for decorations\n" - .string "and furniture.\p" - .string "I also love raising POKéMON just\n" - .string "as much.\p" - .string "If you would be so kind, will you battle\n" - .string "with my POKéMON?$" - -SecretBase_RedCave1_Text_2751AF: @ 82751AF - .string "Thank you.\n" - .string "Shall we begin?$" - -SecretBase_RedCave1_Text_2751CA: @ 82751CA - .string "Oh.\n" - .string "How disappointing…$" - -SecretBase_RedCave1_Text_2751E1:: @ 82751E1 - .string "I concede…$" - -SecretBase_RedCave1_Text_2751EC: @ 82751EC - .string "That was all in good fun!\n" - .string "I should go enjoy shopping now.$" - -SecretBase_RedCave1_Text_275226: @ 8275226 - .string "I simply adore shopping for decorations\n" - .string "and furniture.\p" - .string "I also love raising POKéMON just\n" - .string "as much.$" - -SecretBase_RedCave1_Text_275287: @ 8275287 - .string "Some people make their SECRET BASES in\n" - .string "hard-to-find places.\l" - .string "Do they want to just lie low?\p" - .string "But since you found me, how about we\n" - .string "have a battle?$" - -SecretBase_RedCave1_Text_275315: @ 8275315 - .string "I'm not going down easily!$" - -SecretBase_RedCave1_Text_275330: @ 8275330 - .string "Oh… Are you maybe tired from searching\n" - .string "for this place?$" - -SecretBase_RedCave1_Text_275367:: @ 8275367 - .string "I went down…$" - -SecretBase_RedCave1_Text_275374: @ 8275374 - .string "Where's your SECRET BASE?\n" - .string "I should go visit you there.$" - -SecretBase_RedCave1_Text_2753AB: @ 82753AB - .string "Some people make their SECRET BASES in\n" - .string "hard-to-find places.\l" - .string "Do they want to just lie low?$" - -SecretBase_RedCave1_Text_275405: @ 8275405 - .string "People have told me that you can get\n" - .string "decorations in several ways.\p" - .string "We should have a race to see who can\n" - .string "get nicer decorations and furniture!\p" - .string "In the meantime, want to battle?$" - -SecretBase_RedCave1_Text_2754B2: @ 82754B2 - .string "This is my SECRET BASE.\n" - .string "I can't lose!$" - -SecretBase_RedCave1_Text_2754D8: @ 82754D8 - .string "I'll battle with you anytime.$" - -SecretBase_RedCave1_Text_2754F6:: @ 82754F6 - .string "Huh?\n" - .string "Did I just lose?$" - -SecretBase_RedCave1_Text_27550C: @ 827550C - .string "I won't lose at collecting decorations.\n" - .string "Come visit again!$" - -SecretBase_RedCave1_Text_275546: @ 8275546 - .string "People have told me that you can get\n" - .string "decorations in several ways.\p" - .string "We should have a race to see who can\n" - .string "get nicer decorations and furniture!$" - -SecretBase_RedCave1_Text_2755D2: @ 82755D2 - .string "I found a spot I liked, and I did it up\n" - .string "with my favorite decorations.\p" - .string "I raise my favorite POKéMON and grow\n" - .string "stronger with it.\p" - .string "That's what I do.\n" - .string "Want to battle with me?$" - -SecretBase_RedCave1_Text_275679: @ 8275679 - .string "Show me what you're made of!$" - -SecretBase_RedCave1_Text_275696: @ 8275696 - .string "I guess there are times when you're not\n" - .string "into it.$" - -SecretBase_RedCave1_Text_2756C7:: @ 82756C7 - .string "I know exactly what you're made of now.$" - -SecretBase_RedCave1_Text_2756EF: @ 82756EF - .string "We can both become stronger.\n" - .string "Let's keep at it!$" - -SecretBase_RedCave1_Text_27571E: @ 827571E - .string "I found a spot I liked, and I did it up\n" - .string "with my favorite decorations.\p" - .string "I raise my favorite POKéMON and grow\n" - .string "stronger with it.\p" - .string "Every day is a great day.$" - -SecretBase_RedCave1_Text_2757B5: @ 82757B5 - .string "You can learn a lot about the taste\n" - .string "and sense of people by the kinds of\l" - .string "decorations they have, and how they\l" - .string "display them.\p" - .string "What do you think of my taste?\n" - .string "Are you speechless?\p" - .string "Want to see my taste in battling?$" - -SecretBase_RedCave1_Text_275884: @ 8275884 - .string "There's no holding back!$" - -SecretBase_RedCave1_Text_27589D: @ 827589D - .string "I'll be happy to demonstrate my style\n" - .string "anytime.$" - -SecretBase_RedCave1_Text_2758CC:: @ 82758CC - .string "You're supremely talented!\n" - .string "Your power seems to be limitless…$" - -SecretBase_RedCave1_Text_275909: @ 8275909 - .string "What did you think of my style?\n" - .string "I'll keep on polishing it!$" - -SecretBase_RedCave1_Text_275944: @ 8275944 - .string "You can learn a lot about the taste\n" - .string "and sense of people by the kinds of\l" - .string "decorations they have, and how they\l" - .string "display them.\p" - .string "What do you think of my taste?\n" - .string "Are you speechless?$" - -EventScript_2759F1:: @ 82759F1 + .include "data/text/secret_base_trainers.inc" + +SecretBase_EventScript_CheckEntrance:: @ 82759F1 special GetSecretBaseTypeInFrontOfPlayer special CheckPlayerHasSecretBase compare VAR_RESULT, 1 - goto_if_eq EventScript_275BE8 + goto_if_eq SecretBase_EventScript_AlreadyHasSecretBase checkpartymove MOVE_SECRET_POWER setfieldeffectargument 0, VAR_RESULT buffermovename 1, MOVE_SECRET_POWER - compare VAR_0x8007, 1 - goto_if_eq EventScript_275A50 - compare VAR_0x8007, 2 - goto_if_eq EventScript_275A50 - compare VAR_0x8007, 3 - goto_if_eq EventScript_275A50 - compare VAR_0x8007, 4 - goto_if_eq EventScript_275A50 - compare VAR_0x8007, 5 - goto_if_eq EventScript_275AA9 - compare VAR_0x8007, 6 - goto_if_eq EventScript_275B02 - end - -EventScript_275A50:: @ 8275A50 + compare VAR_0x8007, SECRET_BASE_RED_CAVE + goto_if_eq SecretBase_EventScript_Cave + compare VAR_0x8007, SECRET_BASE_BROWN_CAVE + goto_if_eq SecretBase_EventScript_Cave + compare VAR_0x8007, SECRET_BASE_BLUE_CAVE + goto_if_eq SecretBase_EventScript_Cave + compare VAR_0x8007, SECRET_BASE_YELLOW_CAVE + goto_if_eq SecretBase_EventScript_Cave + compare VAR_0x8007, SECRET_BASE_TREE + goto_if_eq SecretBase_EventScript_Tree + compare VAR_0x8007, SECRET_BASE_SHRUB + goto_if_eq SecretBase_EventScript_Shrub + end + +SecretBase_EventScript_Cave:: @ 8275A50 lockall - compare VAR_RESULT, 6 - goto_if_eq EventScript_275A91 + compare VAR_RESULT, PARTY_SIZE + goto_if_eq SecretBase_EventScript_CaveNoSecretPower bufferpartymonnick 0, VAR_RESULT - msgbox gText_23B704, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_275CDE - msgbox Text_MonUsedHM, MSGBOX_DEFAULT + msgbox SecretBase_Text_IndentUseSecretPower, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq SecretBase_EventScript_CancelOnEntrance + msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE waitstate - goto EventScript_275A9B + goto SecretBase_EventScript_CaveEnter end -EventScript_275A86:: @ 8275A86 +SecretBase_EventScript_CaveUseSecretPower:: @ 8275A86 lockall dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE waitstate - goto EventScript_275A9B + goto SecretBase_EventScript_CaveEnter end -EventScript_275A91:: @ 8275A91 - msgbox gText_23B6E0, MSGBOX_DEFAULT +SecretBase_EventScript_CaveNoSecretPower:: @ 8275A91 + msgbox SecretBase_Text_SmallIndentInWall, MSGBOX_DEFAULT releaseall end -EventScript_275A9B:: @ 8275A9B - msgbox gText_23B73E, MSGBOX_DEFAULT - goto EventScript_275B5B +SecretBase_EventScript_CaveEnter:: @ 8275A9B + msgbox SecretBase_Text_DiscoveredSmallCavern, MSGBOX_DEFAULT + goto SecretBase_EventScript_InitSecretBase end -EventScript_275AA9:: @ 8275AA9 +SecretBase_EventScript_Tree:: @ 8275AA9 lockall - compare VAR_RESULT, 6 - goto_if_eq EventScript_275AEA + compare VAR_RESULT, PARTY_SIZE + goto_if_eq SecretBase_EventScript_TreeNoSecretPower bufferpartymonnick 0, VAR_RESULT - msgbox Text_274779, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_275CDE - msgbox Text_MonUsedHM, MSGBOX_DEFAULT + msgbox SecretBase_Text_TreeUseSecretPower, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq SecretBase_EventScript_CancelOnEntrance + msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_SECRET_POWER_TREE waitstate - goto EventScript_275AF4 + goto SecretBase_EventScript_TreeEnter end -EventScript_275ADF:: @ 8275ADF +SecretBase_EventScript_TreeUseSecretPower:: @ 8275ADF lockall dofieldeffect FLDEFF_USE_SECRET_POWER_TREE waitstate - goto EventScript_275AF4 + goto SecretBase_EventScript_TreeEnter end -EventScript_275AEA:: @ 8275AEA - msgbox Text_274746, MSGBOX_DEFAULT +SecretBase_EventScript_TreeNoSecretPower:: @ 8275AEA + msgbox SecretBase_Text_TreeCanBeClimbed, MSGBOX_DEFAULT releaseall end -EventScript_275AF4:: @ 8275AF4 - msgbox Text_2747C2, MSGBOX_DEFAULT - goto EventScript_275B5B +SecretBase_EventScript_TreeEnter:: @ 8275AF4 + msgbox SecretBase_Text_VineDroppedDown, MSGBOX_DEFAULT + goto SecretBase_EventScript_InitSecretBase end -EventScript_275B02:: @ 8275B02 +SecretBase_EventScript_Shrub:: @ 8275B02 lockall - compare VAR_RESULT, 6 - goto_if_eq EventScript_275B43 + compare VAR_RESULT, PARTY_SIZE + goto_if_eq SecretBase_EventScript_ShrubNoSecretPower bufferpartymonnick 0, VAR_RESULT - msgbox Text_274825, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_275CDE - msgbox Text_MonUsedHM, MSGBOX_DEFAULT + msgbox SecretBase_Text_ClumpUseSecretPower, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq SecretBase_EventScript_CancelOnEntrance + msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB waitstate - goto EventScript_275B4D + goto SecretBase_EventScript_ShrubEnter end -EventScript_275B38:: @ 8275B38 +SecretBase_EventScript_ShrubUseSecretPower:: @ 8275B38 lockall dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB waitstate - goto EventScript_275B4D + goto SecretBase_EventScript_ShrubEnter end -EventScript_275B43:: @ 8275B43 - msgbox Text_2747DD, MSGBOX_DEFAULT +SecretBase_EventScript_ShrubNoSecretPower:: @ 8275B43 + msgbox SecretBase_Text_ClumpOfGrass, MSGBOX_DEFAULT releaseall end -EventScript_275B4D:: @ 8275B4D - msgbox Text_274883, MSGBOX_DEFAULT - goto EventScript_275B5B +SecretBase_EventScript_ShrubEnter:: @ 8275B4D + msgbox SecretBase_Text_DiscoveredSmallEntrance, MSGBOX_DEFAULT + goto SecretBase_EventScript_InitSecretBase end -EventScript_275B5B:: @ 8275B5B +SecretBase_EventScript_InitSecretBase:: @ 8275B5B closemessage playse SE_KAIDAN setvar VAR_INIT_SECRET_BASE, 0 @@ -441,115 +156,113 @@ EventScript_275B5B:: @ 8275B5B waitstate end -SecretBase_RedCave1_EventScript_275B81:: @ 8275B81 - applymovement EVENT_OBJ_ID_PLAYER, SecretBase_RedCave1_Movement_275BB4 +SecretBase_EventScript_FirstEntrance:: @ 8275B81 + applymovement EVENT_OBJ_ID_PLAYER, SecretBase_Movement_275BB4 waitmovement 0 setvar VAR_INIT_SECRET_BASE, 1 - msgbox SecretBase_RedCave1_Text_23B759, MSGBOX_YESNO - compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_275BAB + msgbox SecretBase_Text_WantToMakeYourSecretBaseHere, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq SecretBase_EventScript_SetAsBase closemessage playse SE_KAIDAN special ClearAndLeaveSecretBase end -SecretBase_RedCave1_EventScript_275BAB:: @ 8275BAB +SecretBase_EventScript_SetAsBase:: @ 8275BAB closemessage setflag FLAG_RECEIVED_SECRET_POWER special EnterNewlyCreatedSecretBase waitstate end -SecretBase_RedCave1_Movement_275BB4: @ 8275BB4 +SecretBase_Movement_275BB4: @ 8275BB4 walk_up walk_up step_end -EventScript_275BB7:: @ 8275BB7 +SecretBase_EventScript_Enter:: @ 8275BB7 lockall setvar VAR_INIT_SECRET_BASE, 1 playse SE_KAIDAN special IsCurSecretBaseOwnedByAnotherPlayer compare VAR_RESULT, 0 - goto_if_eq EventScript_275BDB + goto_if_eq SecretBase_EventScript_EnterPlayersBase clearflag FLAG_DECORATION_0 special EnterSecretBase setvar VAR_SECRET_BASE_INITIALIZED, 0 waitstate end -EventScript_275BDB:: @ 8275BDB +SecretBase_EventScript_EnterPlayersBase:: @ 8275BDB setflag FLAG_DECORATION_0 special EnterSecretBase setvar VAR_SECRET_BASE_INITIALIZED, 0 waitstate end -EventScript_275BE8:: @ 8275BE8 +SecretBase_EventScript_AlreadyHasSecretBase:: @ 8275BE8 checkpartymove MOVE_SECRET_POWER - compare VAR_RESULT, 6 - goto_if_eq EventScript_275C9A + compare VAR_RESULT, PARTY_SIZE + goto_if_eq SecretBase_EventScript_NoSecretPower setfieldeffectargument 0, VAR_RESULT setorcopyvar VAR_0x8004, VAR_RESULT lockall special GetSecretBaseNearbyMapName - msgbox Text_276A3D, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_275CDE - msgbox Text_2766AA, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_275CDE + msgbox SecretBase_Text_WouldYouLikeToMoveBases, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq SecretBase_EventScript_CancelOnEntrance + msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq SecretBase_EventScript_CancelOnEntrance fadescreenswapbuffers 1 special MoveOutOfSecretBaseFromOutside closemessage fadescreenswapbuffers 0 - msgbox Text_276A95, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq EventScript_275CDE + msgbox SecretBase_Text_MovingCompletedUseSecretPower, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq SecretBase_EventScript_CancelOnEntrance bufferpartymonnick 0, VAR_0x8004 buffermovename 1, MOVE_SECRET_POWER - msgbox Text_MonUsedHM, MSGBOX_DEFAULT + msgbox Text_MonUsedFieldMove, MSGBOX_DEFAULT closemessage closemessage - compare VAR_0x8007, 1 - goto_if_eq EventScript_275A86 - compare VAR_0x8007, 2 - goto_if_eq EventScript_275A86 - compare VAR_0x8007, 3 - goto_if_eq EventScript_275A86 - compare VAR_0x8007, 4 - goto_if_eq EventScript_275A86 - compare VAR_0x8007, 5 - goto_if_eq EventScript_275ADF - compare VAR_0x8007, 6 - goto_if_eq EventScript_275B38 + compare VAR_0x8007, SECRET_BASE_RED_CAVE + goto_if_eq SecretBase_EventScript_CaveUseSecretPower + compare VAR_0x8007, SECRET_BASE_BROWN_CAVE + goto_if_eq SecretBase_EventScript_CaveUseSecretPower + compare VAR_0x8007, SECRET_BASE_BLUE_CAVE + goto_if_eq SecretBase_EventScript_CaveUseSecretPower + compare VAR_0x8007, SECRET_BASE_YELLOW_CAVE + goto_if_eq SecretBase_EventScript_CaveUseSecretPower + compare VAR_0x8007, SECRET_BASE_TREE + goto_if_eq SecretBase_EventScript_TreeUseSecretPower + compare VAR_0x8007, SECRET_BASE_SHRUB + goto_if_eq SecretBase_EventScript_ShrubUseSecretPower releaseall end -EventScript_275C9A:: @ 8275C9A +SecretBase_EventScript_NoSecretPower:: @ 8275C9A lockall - compare VAR_0x8007, 1 - goto_if_eq EventScript_275A91 - compare VAR_0x8007, 2 - goto_if_eq EventScript_275A91 - compare VAR_0x8007, 3 - goto_if_eq EventScript_275A91 - compare VAR_0x8007, 4 - goto_if_eq EventScript_275A91 - compare VAR_0x8007, 5 - goto_if_eq EventScript_275AEA - compare VAR_0x8007, 6 - goto_if_eq EventScript_275B43 - end - -EventScript_275CDE:: @ 8275CDE + compare VAR_0x8007, SECRET_BASE_RED_CAVE + goto_if_eq SecretBase_EventScript_CaveNoSecretPower + compare VAR_0x8007, SECRET_BASE_BROWN_CAVE + goto_if_eq SecretBase_EventScript_CaveNoSecretPower + compare VAR_0x8007, SECRET_BASE_BLUE_CAVE + goto_if_eq SecretBase_EventScript_CaveNoSecretPower + compare VAR_0x8007, SECRET_BASE_YELLOW_CAVE + goto_if_eq SecretBase_EventScript_CaveNoSecretPower + compare VAR_0x8007, SECRET_BASE_TREE + goto_if_eq SecretBase_EventScript_TreeNoSecretPower + compare VAR_0x8007, SECRET_BASE_SHRUB + goto_if_eq SecretBase_EventScript_ShrubNoSecretPower + end + +SecretBase_EventScript_CancelOnEntrance:: @ 8275CDE closemessage releaseall end -LittlerootTown_BrendansHouse_2F_EventScript_275CE1:: @ 8275CE1 -LittlerootTown_MaysHouse_2F_EventScript_275CE1:: @ 8275CE1 -SecretBase_RedCave1_EventScript_275CE1:: @ 8275CE1 +SecretBase_EventScript_SetDecorationFlags:: @ 8275CE1 setflag FLAG_DECORATION_1 setflag FLAG_DECORATION_2 setflag FLAG_DECORATION_3 @@ -566,474 +279,461 @@ SecretBase_RedCave1_EventScript_275CE1:: @ 8275CE1 setflag FLAG_DECORATION_14 return -EventScript_275D0C:: @ 8275D0C +SecretBase_EventScript_InitDecorations:: @ 8275D0C setvar VAR_0x8004, 0 setvar VAR_0x8005, 0 special InitSecretBaseDecorationSprites setvar VAR_SECRET_BASE_INITIALIZED, 1 end -EventScript_275D1F:: @ 8275D1F +SecretBase_EventScript_SetDecoration:: @ 8275D1F setvar VAR_0x8005, 0 - goto EventScript_275D2A + goto SecretBase_EventScript_SetDecoration2 end -EventScript_275D2A:: @ 8275D2A - special sub_8127E18 +SecretBase_EventScript_SetDecoration2:: @ 8275D2A + special SetDecoration end -EventScript_275D2E:: @ 8275D2E +SecretBase_EventScript_PutAwayDecoration:: @ 8275D2E setvar VAR_0x8004, 0 - goto EventScript_275D39 + goto SecretBase_EventScript_PutAwayDecorationLoop end -EventScript_275D39:: @ 8275D39 +SecretBase_EventScript_PutAwayDecorationLoop:: @ 8275D39 special sub_8129708 compare VAR_RESULT, 1 - goto_if_eq EventScript_275D63 + goto_if_eq SecretBase_EventScript_PutAwayDecorationEnd addvar VAR_0x8004, 1 compare VAR_0x8005, 0 - goto_if_eq EventScript_275D39 + goto_if_eq SecretBase_EventScript_PutAwayDecorationLoop removeobject VAR_0x8006 - setflag 0x8005 - goto EventScript_275D39 - end - -EventScript_275D63:: @ 8275D63 - end - -SecretBase_BlueCave1_EventScript_275D64:: @ 8275D64 -SecretBase_BlueCave2_EventScript_275D64:: @ 8275D64 -SecretBase_BlueCave3_EventScript_275D64:: @ 8275D64 -SecretBase_BlueCave4_EventScript_275D64:: @ 8275D64 -SecretBase_BrownCave1_EventScript_275D64:: @ 8275D64 -SecretBase_BrownCave2_EventScript_275D64:: @ 8275D64 -SecretBase_BrownCave3_EventScript_275D64:: @ 8275D64 -SecretBase_BrownCave4_EventScript_275D64:: @ 8275D64 -SecretBase_RedCave1_EventScript_275D64:: @ 8275D64 -SecretBase_RedCave2_EventScript_275D64:: @ 8275D64 -SecretBase_RedCave3_EventScript_275D64:: @ 8275D64 -SecretBase_RedCave4_EventScript_275D64:: @ 8275D64 -SecretBase_Shrub1_EventScript_275D64:: @ 8275D64 -SecretBase_Shrub2_EventScript_275D64:: @ 8275D64 -SecretBase_Shrub3_EventScript_275D64:: @ 8275D64 -SecretBase_Shrub4_EventScript_275D64:: @ 8275D64 -SecretBase_Tree1_EventScript_275D64:: @ 8275D64 -SecretBase_Tree2_EventScript_275D64:: @ 8275D64 -SecretBase_Tree3_EventScript_275D64:: @ 8275D64 -SecretBase_Tree4_EventScript_275D64:: @ 8275D64 -SecretBase_YellowCave1_EventScript_275D64:: @ 8275D64 -SecretBase_YellowCave2_EventScript_275D64:: @ 8275D64 -SecretBase_YellowCave3_EventScript_275D64:: @ 8275D64 -SecretBase_YellowCave4_EventScript_275D64:: @ 8275D64 - special GetSecretBaseOwnerInteractionState + setflag 0x8005 @ UB: GF likely meant setvar here; setflag 0x8005 is out of bounds + goto SecretBase_EventScript_PutAwayDecorationLoop + end + +SecretBase_EventScript_PutAwayDecorationEnd:: @ 8275D63 + end + +SecretBase_EventScript_RecordMixTrainer:: @ 8275D64 + special GetSecretBaseOwnerAndState compare VAR_0x8004, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275DD6 + goto_if_eq SecretBase_EventScript_Trainer0 compare VAR_0x8004, 1 - goto_if_eq SecretBase_RedCave1_EventScript_275E4E + goto_if_eq SecretBase_EventScript_Trainer1 compare VAR_0x8004, 2 - goto_if_eq SecretBase_RedCave1_EventScript_275EC6 + goto_if_eq SecretBase_EventScript_Trainer2 compare VAR_0x8004, 3 - goto_if_eq SecretBase_RedCave1_EventScript_275F3E + goto_if_eq SecretBase_EventScript_Trainer3 compare VAR_0x8004, 4 - goto_if_eq SecretBase_RedCave1_EventScript_275FB6 + goto_if_eq SecretBase_EventScript_Trainer4 compare VAR_0x8004, 5 - goto_if_eq SecretBase_RedCave1_EventScript_27602E + goto_if_eq SecretBase_EventScript_Trainer5 compare VAR_0x8004, 6 - goto_if_eq SecretBase_RedCave1_EventScript_2760A6 + goto_if_eq SecretBase_EventScript_Trainer6 compare VAR_0x8004, 7 - goto_if_eq SecretBase_RedCave1_EventScript_27611E + goto_if_eq SecretBase_EventScript_Trainer7 compare VAR_0x8004, 8 - goto_if_eq SecretBase_RedCave1_EventScript_276196 + goto_if_eq SecretBase_EventScript_Trainer8 compare VAR_0x8004, 9 - goto_if_eq SecretBase_RedCave1_EventScript_27620E + goto_if_eq SecretBase_EventScript_Trainer9 end -SecretBase_RedCave1_EventScript_275DD6:: @ 8275DD6 +@ VAR_RESULT is initially set by GetSecretBaseOwnerAndState +SecretBase_EventScript_Trainer0:: @ 8275DD6 lock faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275E25 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer0PreChampion compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_275E44 - msgbox SecretBase_RedCave1_Text_2748A0, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275E2F + goto_if_eq SecretBase_EventScript_Trainer0PostBattle + msgbox SecretBase_Text_Trainer0PreBattle, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq SecretBase_EventScript_Trainer0DeclineBattle setvar VAR_RESULT, 1 - special sub_80EA30C + special SetBattledOwnerFromResult call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275E2F - msgbox SecretBase_RedCave1_Text_274939, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 + goto_if_eq SecretBase_EventScript_Trainer0DeclineBattle + msgbox SecretBase_Text_Trainer0AcceptBattle, MSGBOX_DEFAULT + goto SecretBase_EventScript_BattleTrainer end -SecretBase_RedCave1_EventScript_275E25:: @ 8275E25 - msgbox SecretBase_RedCave1_Text_2749ED, MSGBOX_DEFAULT +SecretBase_EventScript_Trainer0PreChampion:: @ 8275E25 + msgbox SecretBase_Text_Trainer0PreChampion, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_275E2F:: @ 8275E2F +SecretBase_EventScript_Trainer0DeclineBattle:: @ 8275E2F special sub_80EB300 setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_27494D, MSGBOX_DEFAULT + special SetBattledOwnerFromResult + msgbox SecretBase_Text_Trainer0DeclineBattle, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_275E44:: @ 8275E44 - msgbox SecretBase_RedCave1_Text_2749AA, MSGBOX_DEFAULT +SecretBase_EventScript_Trainer0PostBattle:: @ 8275E44 + msgbox SecretBase_Text_Trainer0PostBattle, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_275E4E:: @ 8275E4E +@ VAR_RESULT is initially set by GetSecretBaseOwnerAndState +SecretBase_EventScript_Trainer1:: @ 8275E4E lock faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275E9D + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer1PreChampion compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_275EBC - msgbox SecretBase_RedCave1_Text_274C13, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275EA7 + goto_if_eq SecretBase_EventScript_Trainer1PostBattle + msgbox SecretBase_Text_Trainer1PreBattle, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq SecretBase_EventScript_Trainer1DeclineBattle setvar VAR_RESULT, 1 - special sub_80EA30C + special SetBattledOwnerFromResult call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275EA7 - msgbox SecretBase_RedCave1_Text_274CB0, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 + goto_if_eq SecretBase_EventScript_Trainer1DeclineBattle + msgbox SecretBase_Text_Trainer1AcceptBattle, MSGBOX_DEFAULT + goto SecretBase_EventScript_BattleTrainer end -SecretBase_RedCave1_EventScript_275E9D:: @ 8275E9D - msgbox SecretBase_RedCave1_Text_274D69, MSGBOX_DEFAULT +SecretBase_EventScript_Trainer1PreChampion:: @ 8275E9D + msgbox SecretBase_Text_Trainer1PreChampion, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_275EA7:: @ 8275EA7 +SecretBase_EventScript_Trainer1DeclineBattle:: @ 8275EA7 special sub_80EB300 setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274CDA, MSGBOX_DEFAULT + special SetBattledOwnerFromResult + msgbox SecretBase_Text_Trainer1DeclineBattle, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_275EBC:: @ 8275EBC - msgbox SecretBase_RedCave1_Text_274D34, MSGBOX_DEFAULT +SecretBase_EventScript_Trainer1PostBattle:: @ 8275EBC + msgbox SecretBase_Text_Trainer1PostBattle, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_275EC6:: @ 8275EC6 +@ VAR_RESULT is initially set by GetSecretBaseOwnerAndState +SecretBase_EventScript_Trainer2:: @ 8275EC6 lock faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275F15 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer2PreChampion compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_275F34 - msgbox SecretBase_RedCave1_Text_274F39, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275F1F + goto_if_eq SecretBase_EventScript_Trainer2PostBattle + msgbox SecretBase_Text_Trainer2PreBattle, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq SecretBase_EventScript_Trainer2DeclineBattle setvar VAR_RESULT, 1 - special sub_80EA30C + special SetBattledOwnerFromResult call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275F1F - msgbox SecretBase_RedCave1_Text_274FCA, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 + goto_if_eq SecretBase_EventScript_Trainer2DeclineBattle + msgbox SecretBase_Text_Trainer2AcceptBattle, MSGBOX_DEFAULT + goto SecretBase_EventScript_BattleTrainer end -SecretBase_RedCave1_EventScript_275F15:: @ 8275F15 - msgbox SecretBase_RedCave1_Text_2750A4, MSGBOX_DEFAULT +SecretBase_EventScript_Trainer2PreChampion:: @ 8275F15 + msgbox SecretBase_Text_Trainer2PreChampion, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_275F1F:: @ 8275F1F +SecretBase_EventScript_Trainer2DeclineBattle:: @ 8275F1F special sub_80EB300 setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274FDA, MSGBOX_DEFAULT + special SetBattledOwnerFromResult + msgbox SecretBase_Text_Trainer2DeclineBattle, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_275F34:: @ 8275F34 - msgbox SecretBase_RedCave1_Text_27502A, MSGBOX_DEFAULT +SecretBase_EventScript_Trainer2PostBattle:: @ 8275F34 + msgbox SecretBase_Text_Trainer2PostBattle, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_275F3E:: @ 8275F3E +@ VAR_RESULT is initially set by GetSecretBaseOwnerAndState +SecretBase_EventScript_Trainer3:: @ 8275F3E lock faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275F8D + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer3PreChampion compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_275FAC - msgbox SecretBase_RedCave1_Text_275287, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275F97 + goto_if_eq SecretBase_EventScript_Trainer3PostBattle + msgbox SecretBase_Text_Trainer3PreBattle, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq SecretBase_EventScript_Trainer3DeclineBattle setvar VAR_RESULT, 1 - special sub_80EA30C + special SetBattledOwnerFromResult call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_275F97 - msgbox SecretBase_RedCave1_Text_275315, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 + goto_if_eq SecretBase_EventScript_Trainer3DeclineBattle + msgbox SecretBase_Text_Trainer3AcceptBattle, MSGBOX_DEFAULT + goto SecretBase_EventScript_BattleTrainer end -SecretBase_RedCave1_EventScript_275F8D:: @ 8275F8D - msgbox SecretBase_RedCave1_Text_2753AB, MSGBOX_DEFAULT +SecretBase_EventScript_Trainer3PreChampion:: @ 8275F8D + msgbox SecretBase_Text_Trainer3PreChampion, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_275F97:: @ 8275F97 +SecretBase_EventScript_Trainer3DeclineBattle:: @ 8275F97 special sub_80EB300 setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_275330, MSGBOX_DEFAULT + special SetBattledOwnerFromResult + msgbox SecretBase_Text_Trainer3DeclineBattle, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_275FAC:: @ 8275FAC - msgbox SecretBase_RedCave1_Text_275374, MSGBOX_DEFAULT +SecretBase_EventScript_Trainer3PostBattle:: @ 8275FAC + msgbox SecretBase_Text_Trainer3PostBattle, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_275FB6:: @ 8275FB6 +@ VAR_RESULT is initially set by GetSecretBaseOwnerAndState +SecretBase_EventScript_Trainer4:: @ 8275FB6 lock faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_276005 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer4PreChampion compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_276024 - msgbox SecretBase_RedCave1_Text_2755D2, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_27600F + goto_if_eq SecretBase_EventScript_Trainer4PostBattle + msgbox SecretBase_Text_Trainer4PreBattle, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq SecretBase_EventScript_Trainer4DeclineBattle setvar VAR_RESULT, 1 - special sub_80EA30C + special SetBattledOwnerFromResult call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_27600F - msgbox SecretBase_RedCave1_Text_275679, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 + goto_if_eq SecretBase_EventScript_Trainer4DeclineBattle + msgbox SecretBase_Text_Trainer4AcceptBattle, MSGBOX_DEFAULT + goto SecretBase_EventScript_BattleTrainer end -SecretBase_RedCave1_EventScript_276005:: @ 8276005 - msgbox SecretBase_RedCave1_Text_27571E, MSGBOX_DEFAULT +SecretBase_EventScript_Trainer4PreChampion:: @ 8276005 + msgbox SecretBase_Text_Trainer4PreChampion, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_27600F:: @ 827600F +SecretBase_EventScript_Trainer4DeclineBattle:: @ 827600F special sub_80EB300 setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_275696, MSGBOX_DEFAULT + special SetBattledOwnerFromResult + msgbox SecretBase_Text_Trainer4DeclineBattle, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_276024:: @ 8276024 - msgbox SecretBase_RedCave1_Text_2756EF, MSGBOX_DEFAULT +SecretBase_EventScript_Trainer4PostBattle:: @ 8276024 + msgbox SecretBase_Text_Trainer4PostBattle, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_27602E:: @ 827602E +@ VAR_RESULT is initially set by GetSecretBaseOwnerAndState +SecretBase_EventScript_Trainer5:: @ 827602E lock faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_27607D + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer5PreChampion compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_27609C - msgbox SecretBase_RedCave1_Text_274A64, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_276087 + goto_if_eq SecretBase_EventScript_Trainer5PostBattle + msgbox SecretBase_Text_Trainer5PreBattle, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq SecretBase_EventScript_Trainer5DeclineBattle setvar VAR_RESULT, 1 - special sub_80EA30C + special SetBattledOwnerFromResult call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_276087 - msgbox SecretBase_RedCave1_Text_274AFA, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 + goto_if_eq SecretBase_EventScript_Trainer5DeclineBattle + msgbox SecretBase_Text_Trainer5AcceptBattle, MSGBOX_DEFAULT + goto SecretBase_EventScript_BattleTrainer end -SecretBase_RedCave1_EventScript_27607D:: @ 827607D - msgbox SecretBase_RedCave1_Text_274BA2, MSGBOX_DEFAULT +SecretBase_EventScript_Trainer5PreChampion:: @ 827607D + msgbox SecretBase_Text_Trainer5PreChampion, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_276087:: @ 8276087 +SecretBase_EventScript_Trainer5DeclineBattle:: @ 8276087 special sub_80EB300 setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274B0B, MSGBOX_DEFAULT + special SetBattledOwnerFromResult + msgbox SecretBase_Text_Trainer5DeclineBattle, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_27609C:: @ 827609C - msgbox SecretBase_RedCave1_Text_274B6C, MSGBOX_DEFAULT +SecretBase_EventScript_Trainer5PostBattle:: @ 827609C + msgbox SecretBase_Text_Trainer5PostBattle, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_2760A6:: @ 82760A6 +@ VAR_RESULT is initially set by GetSecretBaseOwnerAndState +SecretBase_EventScript_Trainer6:: @ 82760A6 lock faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_2760F5 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer6PreChampion compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_276114 - msgbox SecretBase_RedCave1_Text_274DD2, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_2760FF + goto_if_eq SecretBase_EventScript_Trainer6PostBattle + msgbox SecretBase_Text_Trainer6PreBattle, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq SecretBase_EventScript_Trainer6DeclineBattle setvar VAR_RESULT, 1 - special sub_80EA30C + special SetBattledOwnerFromResult call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_2760FF - msgbox SecretBase_RedCave1_Text_274E41, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 + goto_if_eq SecretBase_EventScript_Trainer6DeclineBattle + msgbox SecretBase_Text_Trainer6AcceptBattle, MSGBOX_DEFAULT + goto SecretBase_EventScript_BattleTrainer end -SecretBase_RedCave1_EventScript_2760F5:: @ 82760F5 - msgbox SecretBase_RedCave1_Text_274EF1, MSGBOX_DEFAULT +SecretBase_EventScript_Trainer6PreChampion:: @ 82760F5 + msgbox SecretBase_Text_Trainer6PreChampion, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_2760FF:: @ 82760FF +SecretBase_EventScript_Trainer6DeclineBattle:: @ 82760FF special sub_80EB300 setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_274E5A, MSGBOX_DEFAULT + special SetBattledOwnerFromResult + msgbox SecretBase_Text_Trainer6DeclineBattle, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_276114:: @ 8276114 - msgbox SecretBase_RedCave1_Text_274EB3, MSGBOX_DEFAULT +SecretBase_EventScript_Trainer6PostBattle:: @ 8276114 + msgbox SecretBase_Text_Trainer6PostBattle, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_27611E:: @ 827611E +@ VAR_RESULT is initially set by GetSecretBaseOwnerAndState +SecretBase_EventScript_Trainer7:: @ 827611E lock faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_27616D + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer7PreChampion compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_27618C - msgbox SecretBase_RedCave1_Text_275114, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_276177 + goto_if_eq SecretBase_EventScript_Trainer7PostBattle + msgbox SecretBase_Text_Trainer7PreBattle, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq SecretBase_EventScript_Trainer7DeclineBattle setvar VAR_RESULT, 1 - special sub_80EA30C + special SetBattledOwnerFromResult call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_276177 - msgbox SecretBase_RedCave1_Text_2751AF, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 + goto_if_eq SecretBase_EventScript_Trainer7DeclineBattle + msgbox SecretBase_Text_Trainer7AcceptBattle, MSGBOX_DEFAULT + goto SecretBase_EventScript_BattleTrainer end -SecretBase_RedCave1_EventScript_27616D:: @ 827616D - msgbox SecretBase_RedCave1_Text_275226, MSGBOX_DEFAULT +SecretBase_EventScript_Trainer7PreChampion:: @ 827616D + msgbox SecretBase_Text_Trainer7PreChampion, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_276177:: @ 8276177 +SecretBase_EventScript_Trainer7DeclineBattle:: @ 8276177 special sub_80EB300 setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_2751CA, MSGBOX_DEFAULT + special SetBattledOwnerFromResult + msgbox SecretBase_Text_Trainer7DeclineBattle, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_27618C:: @ 827618C - msgbox SecretBase_RedCave1_Text_2751EC, MSGBOX_DEFAULT +SecretBase_EventScript_Trainer7PostBattle:: @ 827618C + msgbox SecretBase_Text_Trainer7PostBattle, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_276196:: @ 8276196 +@ VAR_RESULT is initially set by GetSecretBaseOwnerAndState +SecretBase_EventScript_Trainer8:: @ 8276196 lock faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_2761E5 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer8PreChampion compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_276204 - msgbox SecretBase_RedCave1_Text_275405, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_2761EF + goto_if_eq SecretBase_EventScript_Trainer8PostBattle + msgbox SecretBase_Text_Trainer8PreBattle, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq SecretBase_EventScript_Trainer8DeclineBattle setvar VAR_RESULT, 1 - special sub_80EA30C + special SetBattledOwnerFromResult call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_2761EF - msgbox SecretBase_RedCave1_Text_2754B2, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 + goto_if_eq SecretBase_EventScript_Trainer8DeclineBattle + msgbox SecretBase_Text_Trainer8AcceptBattle, MSGBOX_DEFAULT + goto SecretBase_EventScript_BattleTrainer end -SecretBase_RedCave1_EventScript_2761E5:: @ 82761E5 - msgbox SecretBase_RedCave1_Text_275546, MSGBOX_DEFAULT +SecretBase_EventScript_Trainer8PreChampion:: @ 82761E5 + msgbox SecretBase_Text_Trainer8PreChampion, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_2761EF:: @ 82761EF +SecretBase_EventScript_Trainer8DeclineBattle:: @ 82761EF special sub_80EB300 setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_2754D8, MSGBOX_DEFAULT + special SetBattledOwnerFromResult + msgbox SecretBase_Text_Trainer8DeclineBattle, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_276204:: @ 8276204 - msgbox SecretBase_RedCave1_Text_27550C, MSGBOX_DEFAULT +SecretBase_EventScript_Trainer8PostBattle:: @ 8276204 + msgbox SecretBase_Text_Trainer8PostBattle, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_27620E:: @ 827620E +@ VAR_RESULT is initially set by GetSecretBaseOwnerAndState +SecretBase_EventScript_Trainer9:: @ 827620E lock faceplayer - goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_27625D + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer9PreChampion compare VAR_RESULT, 1 - goto_if_eq SecretBase_RedCave1_EventScript_27627C - msgbox SecretBase_RedCave1_Text_2757B5, MSGBOX_YESNO - compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_276267 + goto_if_eq SecretBase_EventScript_Trainer9PostBattle + msgbox SecretBase_Text_Trainer9PreBattle, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq SecretBase_EventScript_Trainer9DeclineBattle setvar VAR_RESULT, 1 - special sub_80EA30C + special SetBattledOwnerFromResult call Common_EventScript_SaveGame compare VAR_RESULT, 0 - goto_if_eq SecretBase_RedCave1_EventScript_276267 - msgbox SecretBase_RedCave1_Text_275884, MSGBOX_DEFAULT - goto SecretBase_RedCave1_EventScript_276286 + goto_if_eq SecretBase_EventScript_Trainer9DeclineBattle + msgbox SecretBase_Text_Trainer9AcceptBattle, MSGBOX_DEFAULT + goto SecretBase_EventScript_BattleTrainer end -SecretBase_RedCave1_EventScript_27625D:: @ 827625D - msgbox SecretBase_RedCave1_Text_275944, MSGBOX_DEFAULT +SecretBase_EventScript_Trainer9PreChampion:: @ 827625D + msgbox SecretBase_Text_Trainer9PreChampion, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_276267:: @ 8276267 +SecretBase_EventScript_Trainer9DeclineBattle:: @ 8276267 special sub_80EB300 setvar VAR_RESULT, 0 - special sub_80EA30C - msgbox SecretBase_RedCave1_Text_27589D, MSGBOX_DEFAULT + special SetBattledOwnerFromResult + msgbox SecretBase_Text_Trainer9DeclineBattle, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_27627C:: @ 827627C - msgbox SecretBase_RedCave1_Text_275909, MSGBOX_DEFAULT +SecretBase_EventScript_Trainer9PostBattle:: @ 827627C + msgbox SecretBase_Text_Trainer9PostBattle, MSGBOX_DEFAULT release end -SecretBase_RedCave1_EventScript_276286:: @ 8276286 +SecretBase_EventScript_BattleTrainer:: @ 8276286 special PrepSecretBaseBattleFlags setvar VAR_0x8004, SPECIAL_BATTLE_SECRET_BASE setvar VAR_0x8005, 0 special DoSpecialTrainerBattle waitstate - compare VAR_RESULT, 3 - call_if_eq SecretBase_RedCave1_EventScript_2762BD - compare VAR_RESULT, 1 - call_if_eq SecretBase_RedCave1_EventScript_2762C1 - compare VAR_RESULT, 2 - call_if_eq SecretBase_RedCave1_EventScript_2762C5 + compare VAR_RESULT, B_OUTCOME_DREW + call_if_eq SecretBase_EventScript_2762BD + compare VAR_RESULT, B_OUTCOME_WON + call_if_eq SecretBase_EventScript_2762C1 + compare VAR_RESULT, B_OUTCOME_LOST + call_if_eq SecretBase_EventScript_2762C5 special HealPlayerParty release end -SecretBase_RedCave1_EventScript_2762BD:: @ 82762BD +SecretBase_EventScript_2762BD:: @ 82762BD special sub_80EB438 return -SecretBase_RedCave1_EventScript_2762C1:: @ 82762C1 +SecretBase_EventScript_2762C1:: @ 82762C1 special sub_80EB368 return -SecretBase_RedCave1_EventScript_2762C5:: @ 82762C5 +SecretBase_EventScript_2762C5:: @ 82762C5 special sub_80EB3D0 return @@ -1047,37 +747,37 @@ SecretBase_EventScript_CushionInteract:: @ 82766A6 special sub_80EB2C8 end -Text_2766AA: @ 82766AA +SecretBase_Text_AllDecorationsWillBeReturned: @ 82766AA .string "All decorations and furniture in your\n" .string "SECRET BASE will be returned to your PC.\p" .string "Is that okay?$" -Text_WantToRegisterSecretBase: @ 8276707 +SecretBase_Text_WantToRegisterSecretBase: @ 8276707 .string "Do you want to register\n" .string "{STR_VAR_1}'s SECRET BASE?$" -Text_276731: @ 8276731 +SecretBase_Text_AlreadyRegisteredDelete: @ 8276731 .string "This data is already registered.\n" .string "Would you like to delete it?$" -Text_TooManyBasesDeleteSome: @ 827676F +SecretBase_Text_TooManyBasesDeleteSome: @ 827676F .string "Up to 10 locations can be registered.\p" .string "Delete a location if you want to\n" .string "register another location.$" -Text_2767D1: @ 82767D1 +SecretBase_Text_RegistrationCompleted: @ 82767D1 .string "Registration completed.$" -Text_2767E9: @ 82767E9 +SecretBase_Text_DataUnregistered: @ 82767E9 .string "Data has been unregistered.$" -Text_SecretBaseBootUpPC: @ 8276805 +SecretBase_Text_BootUpPC: @ 8276805 .string "{PLAYER} booted up the PC.$" -Text_SecretBasePCStartMenu: @ 827681A +SecretBase_Text_WhatWouldYouLikeToDo: @ 827681A .string "What would you like to do?$" -Text_276835: @ 8276835 +SecretBase_Text_RegistryInfo: @ 8276835 .string "Once registered, a SECRET BASE will not\n" .string "disappear unless the other TRAINER\l" .string "moves it to a different location.\p" @@ -1087,27 +787,27 @@ Text_276835: @ 8276835 .string "Up to ten SECRET BASE locations\n" .string "may be registered.$" -Text_27692B: @ 827692B +SecretBase_Text_BattleTowerShield: @ 827692B .string "A shield of {STR_VAR_2} that marks winning\n" .string "{STR_VAR_1} times in a row at the BATTLE TOWER.$" -Text_276974: @ 8276974 +SecretBase_Text_ToyTV: @ 8276974 .string "A realistic toy TV. It could be easily\n" .string "mistaken for the real thing.$" -Text_2769B8: @ 82769B8 +SecretBase_Text_SeedotTV: @ 82769B8 .string "A toy TV shaped like a SEEDOT.\n" .string "It looks ready to roll away on its own…$" -Text_2769FF: @ 82769FF +SecretBase_Text_SkittyTV: @ 82769FF .string "A toy TV shaped like a SKITTY.\n" .string "It looks ready to stroll away…$" -Text_276A3D: @ 8276A3D +SecretBase_Text_WouldYouLikeToMoveBases: @ 8276A3D .string "You may only make one SECRET BASE.\p" .string "Would you like to move from the SECRET\n" .string "BASE near {STR_VAR_1}?$" -Text_276A95: @ 8276A95 +SecretBase_Text_MovingCompletedUseSecretPower: @ 8276A95 .string "Moving completed.\p" .string "Would you like to use the SECRET POWER?$" diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 647064829..c89202ded 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -37,7 +37,7 @@ Route111_EventScript_2765FF:: @ 82765FF lock faceplayer msgbox Route111_Text_2762C9, MSGBOX_YESNO - compare VAR_RESULT, 1 + compare VAR_RESULT, YES goto_if_eq Route111_EventScript_27661E msgbox Route111_Text_27655C, MSGBOX_DEFAULT release @@ -51,11 +51,11 @@ Route111_EventScript_27661E:: @ 827661E closemessage setflag FLAG_RECEIVED_SECRET_POWER clearflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if_eq Route111_EventScript_27666A - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if_eq Route111_EventScript_27666A - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if_eq Route111_EventScript_276675 removeobject VAR_LAST_TALKED release diff --git a/data/scripts/set_gym_trainers.inc b/data/scripts/set_gym_trainers.inc new file mode 100644 index 000000000..1f5535805 --- /dev/null +++ b/data/scripts/set_gym_trainers.inc @@ -0,0 +1,92 @@ +Common_EventScript_SetGymTrainers:: @ 8271F43 + switch VAR_0x8008 + case 1, RusboroCity_Gym_SetGymTrainers + case 2, DewfordTown_Gym_SetGymTrainers + case 3, MauvilleCity_Gym_SetGymTrainers + case 4, LavaridgeTown_Gym_SetGymTrainers + case 5, PetalburgCity_Gym_SetGymTrainers + case 6, FortreeCity_Gym_SetGymTrainers + case 7, MossdeepCity_Gym_SetGymTrainers + case 8, SootopolisCity_Gym_SetGymTrainers + end + +RusboroCity_Gym_SetGymTrainers:: @ 8271FA1 + settrainerflag TRAINER_JOSH + settrainerflag TRAINER_TOMMY + settrainerflag TRAINER_MARC + return + +DewfordTown_Gym_SetGymTrainers:: @ 8271FAB + settrainerflag TRAINER_TAKAO + settrainerflag TRAINER_JOCELYN + settrainerflag TRAINER_LAURA + settrainerflag TRAINER_BRENDEN + settrainerflag TRAINER_CRISTIAN + settrainerflag TRAINER_LILITH + return + +MauvilleCity_Gym_SetGymTrainers:: @ 8271FBE + settrainerflag TRAINER_KIRK + settrainerflag TRAINER_SHAWN + settrainerflag TRAINER_BEN + settrainerflag TRAINER_VIVIAN + settrainerflag TRAINER_ANGELO + return + +LavaridgeTown_Gym_SetGymTrainers:: @ 8271FCE + settrainerflag TRAINER_COLE + settrainerflag TRAINER_AXLE + settrainerflag TRAINER_KEEGAN + settrainerflag TRAINER_GERALD + settrainerflag TRAINER_DANIELLE + settrainerflag TRAINER_JACE + settrainerflag TRAINER_JEFF + settrainerflag TRAINER_ELI + return + +PetalburgCity_Gym_SetGymTrainers:: @ 8271FE7 + settrainerflag TRAINER_RANDALL + settrainerflag TRAINER_PARKER + settrainerflag TRAINER_GEORGE + settrainerflag TRAINER_BERKE + settrainerflag TRAINER_MARY + settrainerflag TRAINER_ALEXIA + settrainerflag TRAINER_JODY + return + +FortreeCity_Gym_SetGymTrainers:: @ 8271FFD + settrainerflag TRAINER_JARED + settrainerflag TRAINER_FLINT + settrainerflag TRAINER_ASHLEY + settrainerflag TRAINER_EDWARDO + settrainerflag TRAINER_HUMBERTO + settrainerflag TRAINER_DARIUS + return + +MossdeepCity_Gym_SetGymTrainers:: @ 8272010 + settrainerflag TRAINER_PRESTON + settrainerflag TRAINER_VIRGIL + settrainerflag TRAINER_BLAKE + settrainerflag TRAINER_HANNAH + settrainerflag TRAINER_SAMANTHA + settrainerflag TRAINER_MAURA + settrainerflag TRAINER_SYLVIA + settrainerflag TRAINER_NATE + settrainerflag TRAINER_KATHLEEN + settrainerflag TRAINER_CLIFFORD + settrainerflag TRAINER_MACEY + settrainerflag TRAINER_NICHOLAS + return + +SootopolisCity_Gym_SetGymTrainers:: @ 8272035 + settrainerflag TRAINER_ANDREA + settrainerflag TRAINER_CRISSY + settrainerflag TRAINER_BRIANNA + settrainerflag TRAINER_CONNIE + settrainerflag TRAINER_BRIDGET + settrainerflag TRAINER_OLIVIA + settrainerflag TRAINER_TIFFANY + settrainerflag TRAINER_BETHANY + settrainerflag TRAINER_ANNIKA + settrainerflag TRAINER_DAPHNE + return diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc new file mode 100644 index 000000000..3a4c044a3 --- /dev/null +++ b/data/scripts/shared_secret_base.inc @@ -0,0 +1,224 @@ +SecretBase_MapScripts:: + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_MapScript2_OnWarp + map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_MapScript1_OnTransition + map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_MapScript2_OnFrame + map_script MAP_SCRIPT_ON_RESUME, SecretBase_MapScript1_OnResume + .byte 0 + +SecretBase_MapScript2_OnWarp: @ 823B498 + map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, SecretBase_EventScript_InitDecorations + .2byte 0 + +SecretBase_MapScript1_OnTransition: @ 823B4A2 + call SecretBase_EventScript_SetDecorationFlags + special SetSecretBaseOwnerGfxId + special InitSecretBaseVars + end + +SecretBase_MapScript2_OnFrame: @ 823B4AE + map_script_2 VAR_INIT_SECRET_BASE, 0, SecretBase_EventScript_FirstEntrance + .2byte 0 + +SecretBase_MapScript1_OnResume: @ 823B4B8 + setstepcallback STEP_CB_SECRET_BASE + end + +SecretBase_EventScript_PC:: @ 823B4BB + lockall + playse SE_PC_LOGIN + message SecretBase_Text_BootUpPC + dofieldeffect FLDEFF_PCTURN_ON + waitstate + waitmessage + waitbuttonpress + playse SE_SELECT + goto SecretBase_EventScript_PCShowMainMenu + end + +SecretBase_EventScript_PCShowMainMenu:: @ 823B4D3 + message SecretBase_Text_WhatWouldYouLikeToDo + waitmessage + goto_if_set FLAG_SECRET_BASE_REGISTRY_ENABLED, SecretBase_EventScript_PCMainMenuWithRegister + goto SecretBase_EventScript_PCMainMenuWithoutRegister + end + +SecretBase_EventScript_PCCancel:: @ 823B4E8 + lockall + goto SecretBase_EventScript_PCShowMainMenu + end + +SecretBase_EventScript_PCMainMenuWithRegister:: @ 823B4EF + multichoice 0, 0, MULTI_BASE_PC_WITH_REGISTRY, 0 + switch VAR_RESULT + case 0, SecretBase_EventScript_PCDecorationMenu + case 1, SecretBase_EventScript_PCPackUp + case 2, SecretBase_EventScript_PCRegistryMenu + case 3, SecretBase_EventScript_PCTurnOff + case MULTI_B_PRESSED, SecretBase_EventScript_PCTurnOff + end + +SecretBase_EventScript_PCMainMenuWithoutRegister:: @ 823B531 + multichoice 0, 0, MULTI_BASE_PC_NO_REGISTRY, 0 + switch VAR_RESULT + case 0, SecretBase_EventScript_PCDecorationMenu + case 1, SecretBase_EventScript_PCPackUp + case 2, SecretBase_EventScript_PCTurnOff + case MULTI_B_PRESSED, SecretBase_EventScript_PCTurnOff + end + +SecretBase_EventScript_PCPackUp:: @ 823B568 + msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq SecretBase_EventScript_PCShowMainMenu + closemessage + special MoveOutOfSecretBase + releaseall + end + +SecretBase_EventScript_PCDecorationMenu:: @ 823B581 + special ShowSecretBaseDecorationMenu + end + +SecretBase_EventScript_PCRegistryMenu:: @ 823B585 + special ShowSecretBaseRegistryMenu + end + +SecretBase_EventScript_RecordMixingPC:: @ 823B589 + lockall + message SecretBase_Text_BootUpPC + playse SE_PC_LOGIN + dofieldeffect FLDEFF_PCTURN_ON + waitstate + waitmessage + waitbuttonpress + playse SE_SELECT + goto SecretBase_EventScript_PCRegisterMenu + end + +SecretBase_EventScript_PCRegisterMenu:: @ 823B5A1 + message SecretBase_Text_WhatWouldYouLikeToDo + waitmessage + multichoice 0, 0, MULTI_REGISTER_MENU, 0 + switch VAR_RESULT + case 0, SecretBase_EventScript_PCRegister + case 1, SecretBase_EventScript_PCRegistryMenu + case 2, SecretBase_EventScript_PCRegistryInfo + case 3, SecretBase_EventScript_PCTurnOff + case MULTI_B_PRESSED, SecretBase_EventScript_PCTurnOff + end + +SecretBase_EventScript_ShowRegisterMenu:: @ 823B5E9 + lockall + goto SecretBase_EventScript_PCRegisterMenu + end + +SecretBase_EventScript_PCRegister:: @ 823B5F0 + special GetCurSecretBaseRegistrationValidity + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_AlreadyRegistered + compare VAR_RESULT, 2 + goto_if_eq SecretBase_EventScript_CantRegisterTooManyBases + special CopyCurSecretBaseOwnerName_StrVar1 + msgbox SecretBase_Text_WantToRegisterSecretBase, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq SecretBase_EventScript_PCRegisterMenu + msgbox SecretBase_Text_RegistrationCompleted, MSGBOX_SIGN + special ToggleCurSecretBaseRegistry + special DoSecretBasePCTurnOffEffect + releaseall + end + +SecretBase_EventScript_AlreadyRegistered:: @ 823B62F + msgbox SecretBase_Text_AlreadyRegisteredDelete, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq SecretBase_EventScript_PCRegisterMenu + msgbox SecretBase_Text_DataUnregistered, MSGBOX_SIGN + special ToggleCurSecretBaseRegistry + special DoSecretBasePCTurnOffEffect + releaseall + end + +SecretBase_EventScript_CantRegisterTooManyBases:: @ 823B652 + msgbox SecretBase_Text_TooManyBasesDeleteSome, MSGBOX_SIGN + special DoSecretBasePCTurnOffEffect + closemessage + releaseall + end + +SecretBase_EventScript_PCRegistryInfo:: @ 823B660 + msgbox SecretBase_Text_RegistryInfo, MSGBOX_DEFAULT + goto SecretBase_EventScript_PCRegisterMenu + end + +SecretBase_EventScript_PCTurnOff:: @ 823B66E + special DoSecretBasePCTurnOffEffect + closemessage + releaseall + end + +@ Unused +SecretBase_EventScript_23B674:: @ 823B674 + special SetSecretBaseSecretsTvFlags_Poster + end + +@ Unused +SecretBase_EventScript_23B678:: @ 823B678 + special SetSecretBaseSecretsTvFlags_MiscFurnature + end + +@ Unused +SecretBase_EventScript_23B67C:: @ 823B67C + special SetSecretBaseSecretsTvFlags_LargeDecorationSpot + end + +@ Unused +SecretBase_EventScript_23B680:: @ 823B680 + special SetSecretBaseSecretsTvFlags_SmallDecorationSpot + end + +SecretBase_EventScript_SandOrnament:: @ 823B684 + special SetSecretBaseSecretsTvFlags_SandOrnament + dofieldeffect FLDEFF_SAND_PILLAR + waitstate + end + +SecretBase_EventScript_ShieldOrToyTV:: @ 823B68C + special GetShieldToyTVDecorationInfo + compare VAR_RESULT, 0 + goto_if_eq SecretBase_EventScript_BattleTowerShield + compare VAR_RESULT, 1 + goto_if_eq SecretBase_EventScript_ToyTV + compare VAR_RESULT, 2 + goto_if_eq SecretBase_EventScript_SeedotTV + compare VAR_RESULT, 3 + goto_if_eq SecretBase_EventScript_SkittyTV + end + +SecretBase_EventScript_BattleTowerShield:: @ 823B6BC + msgbox SecretBase_Text_BattleTowerShield, MSGBOX_SIGN + end + +SecretBase_EventScript_ToyTV:: @ 823B6C5 + msgbox SecretBase_Text_ToyTV, MSGBOX_SIGN + end + +SecretBase_EventScript_SeedotTV:: @ 823B6CE + msgbox SecretBase_Text_SeedotTV, MSGBOX_SIGN + end + +SecretBase_EventScript_SkittyTV:: @ 823B6D7 + msgbox SecretBase_Text_SkittyTV, MSGBOX_SIGN + end + +SecretBase_Text_SmallIndentInWall:: @ 823B6E0 + .string "There's a small indent in the wall.$" + +SecretBase_Text_IndentUseSecretPower:: @ 823B704 + .string "There's a small indent in the wall.\p" + .string "Use the SECRET POWER?$" + +SecretBase_Text_DiscoveredSmallCavern:: @ 823B73E + .string "Discovered a small cavern!$" + +SecretBase_Text_WantToMakeYourSecretBaseHere: @ 823B759 + .string "Want to make your SECRET BASE here?$" diff --git a/data/scripts/surf.inc b/data/scripts/surf.inc new file mode 100644 index 000000000..af6cac1da --- /dev/null +++ b/data/scripts/surf.inc @@ -0,0 +1,16 @@ +EventScript_UseSurf:: @ 8271EA0 + checkpartymove MOVE_SURF + compare VAR_RESULT, PARTY_SIZE + goto_if_eq EventScript_EndUseSurf + bufferpartymonnick 0, VAR_RESULT + setfieldeffectargument 0, VAR_RESULT + lockall + msgbox gText_WantToUseSurf, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq EventScript_ReleaseUseSurf + msgbox gText_PlayerUsedSurf, MSGBOX_DEFAULT + dofieldeffect FLDEFF_USE_SURF +EventScript_ReleaseUseSurf:: @ 8271ED5 + releaseall +EventScript_EndUseSurf:: @ 8271ED6 + end diff --git a/data/scripts/test_signpost.inc b/data/scripts/test_signpost.inc new file mode 100644 index 000000000..482fe18f2 --- /dev/null +++ b/data/scripts/test_signpost.inc @@ -0,0 +1,7 @@ +Text_ThisIsATestSignpostMsg:: @ 82C840A + .string "This is a test message.\n" + .string "This is a signpost.$" + +EventScript_TestSignpostMsg:: @ 82C8436 + msgbox Text_ThisIsATestSignpostMsg, MSGBOX_SIGN + end diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index 21ba0d6d3..0ba8bcda6 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -1,3 +1,7 @@ +EventScript_271354:: @ 8271354 + cmdD8 + cmdD9 + EventScript_ShowSecondTrainerIntro:: @ 8271356 special SetUpTrainerEncounterMusic special EndTrainerApproach diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc new file mode 100644 index 000000000..7d898a93d --- /dev/null +++ b/data/scripts/trainer_hill.inc @@ -0,0 +1,85 @@ +TrainerHill_1F_MapScript1_2C8336: @ 82C8336 +TrainerHill_2F_MapScript1_2C8336: @ 82C8336 +TrainerHill_3F_MapScript1_2C8336: @ 82C8336 +TrainerHill_4F_MapScript1_2C8336: @ 82C8336 +TrainerHill_Roof_MapScript1_2C8336: @ 82C8336 + setvar VAR_TEMP_2, 0 + setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER + special CallTrainerHillFunction + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 5 + special CallFrontierUtilFunc + compare VAR_RESULT, B_OUTCOME_LOST + goto_if_eq TrainerHill_1F_EventScript_Lost + compare VAR_RESULT, B_OUTCOME_DREW + goto_if_eq TrainerHill_1F_EventScript_Lost + compare VAR_RESULT, B_OUTCOME_FORFEITED + goto_if_eq TrainerHill_1F_EventScript_Lost + end + +TrainerHill_1F_MapScript2_2C8372: @ 82C8372 +TrainerHill_2F_MapScript2_2C8372: @ 82C8372 + map_script_2 VAR_TEMP_3, 0, TrainerHill_1F_EventScript_2C837C + .2byte 0 + +TrainerHill_1F_EventScript_2C837C:: @ 82C837C + setvar VAR_TEMP_3, 1 +@ forced stop + +TrainerHill_1F_MapScript2_2C8381: @ 82C8381 +TrainerHill_2F_MapScript2_2C8381: @ 82C8381 +TrainerHill_3F_MapScript2_2C8381: @ 82C8381 +TrainerHill_4F_MapScript2_2C8381: @ 82C8381 +TrainerHill_Roof_MapScript2_2C8381: @ 82C8381 + map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_2C83A6 + map_script_2 VAR_TEMP_1, 1, TrainerHill_1F_EventScript_2C83DF + .2byte 0 + +EventScript_TrainerHillTimer:: @ 82C8393 + lockall + setvar VAR_0x8004, TRAINER_HILL_FUNC_7 + special CallTrainerHillFunction + msgbox TrainerHill_Entrance_Text_268D47, MSGBOX_DEFAULT + releaseall + end + +TrainerHill_1F_EventScript_2C83A6:: @ 82C83A6 + setvar VAR_TEMP_2, 1 + setvar VAR_0x8004, TRAINER_HILL_FUNC_9 + special CallTrainerHillFunction + compare VAR_RESULT, 1 + goto_if_eq TrainerHill_1F_EventScript_2C83BF + end + +TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF + warpsilent MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6 + waitstate + end + +TrainerHill_1F_EventScript_Lost:: @ 82C83C9 + setvar VAR_0x8004, TRAINER_HILL_FUNC_12 + special CallTrainerHillFunction + setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_LOST + special CallTrainerHillFunction + setvar VAR_TEMP_1, 1 + end + +TrainerHill_1F_EventScript_2C83DF:: @ 82C83DF +TrainerHill_Entrance_EventScript_2C83DF:: @ 82C83DF + setvar VAR_TEMP_1, 0 + warp MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6 + waitstate + end + +TrainerHill_1F_Movement_2C83EE:: @ 82C83EE + set_invisible + step_end + +EventScript_2C83F0:: @ 82C83F0 + trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText + setvar VAR_0x8004, TRAINER_HILL_FUNC_11 + special CallTrainerHillFunction + waitmessage + waitbuttonpress + closemessage + end diff --git a/data/scripts/trainer_script.inc b/data/scripts/trainer_script.inc new file mode 100644 index 000000000..59577e8a8 --- /dev/null +++ b/data/scripts/trainer_script.inc @@ -0,0 +1,23 @@ +Std_RegisteredInMatchCall:: @ 82742C9 + buffertrainerclassname 0, VAR_0x8000 + buffertrainername 1, VAR_0x8000 + closemessage + delay 30 + playfanfare MUS_ME_TORE_EYE + msgbox gText_RegisteredTrainerinPokeNav, MSGBOX_DEFAULT + waitfanfare + closemessage + delay 30 + return + +EventScript_TryGetTrainerScript:: @ 82742E6 + special ShouldTryGetTrainerScript + compare VAR_RESULT, 1 + goto_if_eq EventScript_GotoTrainerScript + releaseall + end + +EventScript_GotoTrainerScript:: @ 82742F6 + gotobeatenscript + releaseall + end diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 4a276ffc0..427775a76 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -1,12 +1,12 @@ EventScript_TV:: @ 827EE0B lockall - incrementgamestat 44 + incrementgamestat GAME_STAT_WATCHED_TV special ResetTVShowState specialvar VAR_RESULT, CheckForBigMovieOrEmergencyNewsOnTV compare VAR_RESULT, 2 - goto_if_eq EventScript_27EE9A + goto_if_eq EventScript_PlayersHouseMovie compare VAR_RESULT, 1 - goto_if_eq EventScript_27EEA4 + goto_if_eq EventScript_PlayersHouseLatiNewsFlash goto_if_unset FLAG_SYS_TV_START, EventScript_27EE8A goto_if_set FLAG_SYS_TV_WATCH, EventScript_27EE8A specialvar VAR_RESULT, IsTVShowInSearchOfTrainersAiring @@ -30,18 +30,18 @@ EventScript_27EE54:: @ 827EE54 EventScript_27EE8A:: @ 827EE8A special GetMomOrDadStringForTVMessage - msgbox gUnknown_08272BCF, MSGBOX_DEFAULT + msgbox gText_MomOrDadMightLikeThisProgram, MSGBOX_DEFAULT special TurnOffTVScreen releaseall end -EventScript_27EE9A:: @ 827EE9A - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F0F, MSGBOX_DEFAULT +EventScript_PlayersHouseMovie:: @ 827EE9A + msgbox PlayersHouse_1F_Text_TheresAMovieOnTV, MSGBOX_DEFAULT releaseall end -EventScript_27EEA4:: @ 827EEA4 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT +EventScript_PlayersHouseLatiNewsFlash:: @ 827EEA4 + msgbox PlayersHouse_1F_Text_LatiEmergencyNewsFlash, MSGBOX_DEFAULT @ This is a junk call. Its input var (VAR_0x8004) hasn't been set, and @ It's called again when Mom actually asks for the color, overwriting @ whatever it does here. @@ -69,7 +69,7 @@ EventScript_27EED0:: @ 827EED0 EventScript_27EED8:: @ 827EED8 special GetMomOrDadStringForTVMessage - msgbox gUnknown_08272BCF, MSGBOX_DEFAULT + msgbox gText_MomOrDadMightLikeThisProgram, MSGBOX_DEFAULT goto EventScript_27EED0 end diff --git a/data/scripts/unusual_weather.inc b/data/scripts/unusual_weather.inc new file mode 100644 index 000000000..ad6985ac8 --- /dev/null +++ b/data/scripts/unusual_weather.inc @@ -0,0 +1,426 @@ +UnusualWeather_EventScript_PlaceTilesRoute114North:: @ 8273913 + setmetatile 7, 3, METATILE_Fallarbor_RedCaveEntrance_Top, 1 + setmetatile 7, 4, METATILE_Fallarbor_RedCaveEntrance_Bottom, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute114South:: @ 8273926 + setmetatile 6, 45, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 + setmetatile 6, 46, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute115West:: @ 8273939 + setmetatile 21, 5, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 + setmetatile 21, 6, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute115East:: @ 827394C + setmetatile 36, 9, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 + setmetatile 36, 10, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute116North:: @ 827395F + setmetatile 59, 12, METATILE_General_CaveEntrance_Top, 1 + setmetatile 59, 13, METATILE_General_CaveEntrance_Bottom, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute116South:: @ 8273972 + setmetatile 79, 5, METATILE_General_CaveEntrance_Top, 1 + setmetatile 79, 6, METATILE_General_CaveEntrance_Bottom, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute118East:: @ 8273985 + setmetatile 42, 5, METATILE_General_CaveEntrance_Top, 1 + setmetatile 42, 6, METATILE_General_CaveEntrance_Bottom, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute118West:: @ 8273998 + setmetatile 9, 5, METATILE_General_CaveEntrance_Top, 1 + setmetatile 9, 6, METATILE_General_CaveEntrance_Bottom, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB + setmetatile 10, 28, METATILE_General_RoughWater, 0 + setmetatile 11, 28, METATILE_General_RoughWater, 0 + setmetatile 9, 29, METATILE_General_RoughWater, 0 + setmetatile 10, 29, METATILE_General_RoughDeepWater, 0 + setmetatile 11, 29, METATILE_General_RoughDeepWater, 0 + setmetatile 12, 29, METATILE_General_RoughWater, 0 + setmetatile 9, 30, METATILE_General_RoughWater, 0 + setmetatile 10, 30, METATILE_General_RoughDeepWater, 0 + setmetatile 11, 30, METATILE_General_RoughDeepWater, 0 + setmetatile 12, 30, METATILE_General_RoughWater, 0 + setmetatile 10, 31, METATILE_General_RoughWater, 0 + setmetatile 11, 31, METATILE_General_RoughWater, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18 + setmetatile 20, 53, METATILE_General_RoughWater, 0 + setmetatile 21, 53, METATILE_General_RoughWater, 0 + setmetatile 19, 54, METATILE_General_RoughWater, 0 + setmetatile 20, 54, METATILE_General_RoughDeepWater, 0 + setmetatile 21, 54, METATILE_General_RoughDeepWater, 0 + setmetatile 22, 54, METATILE_General_RoughWater, 0 + setmetatile 19, 55, METATILE_General_RoughWater, 0 + setmetatile 20, 55, METATILE_General_RoughDeepWater, 0 + setmetatile 21, 55, METATILE_General_RoughDeepWater, 0 + setmetatile 22, 55, METATILE_General_RoughWater, 0 + setmetatile 20, 56, METATILE_General_RoughWater, 0 + setmetatile 21, 56, METATILE_General_RoughWater, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85 + setmetatile 8, 16, METATILE_General_RoughWater, 0 + setmetatile 9, 16, METATILE_General_RoughWater, 0 + setmetatile 7, 17, METATILE_General_RoughWater, 0 + setmetatile 8, 17, METATILE_General_RoughDeepWater, 0 + setmetatile 9, 17, METATILE_General_RoughDeepWater, 0 + setmetatile 10, 17, METATILE_General_RoughWater, 0 + setmetatile 7, 18, METATILE_General_RoughWater, 0 + setmetatile 8, 18, METATILE_General_RoughDeepWater, 0 + setmetatile 9, 18, METATILE_General_RoughDeepWater, 0 + setmetatile 10, 18, METATILE_General_RoughWater, 0 + setmetatile 8, 19, METATILE_General_RoughWater, 0 + setmetatile 9, 19, METATILE_General_RoughWater, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2 + setmetatile 53, 18, METATILE_General_RoughWater, 0 + setmetatile 54, 18, METATILE_General_RoughWater, 0 + setmetatile 52, 19, METATILE_General_RoughWater, 0 + setmetatile 53, 19, METATILE_General_RoughDeepWater, 0 + setmetatile 54, 19, METATILE_General_RoughDeepWater, 0 + setmetatile 55, 19, METATILE_General_RoughWater, 0 + setmetatile 52, 20, METATILE_General_RoughWater, 0 + setmetatile 53, 20, METATILE_General_RoughDeepWater, 0 + setmetatile 54, 20, METATILE_General_RoughDeepWater, 0 + setmetatile 55, 20, METATILE_General_RoughWater, 0 + setmetatile 53, 21, METATILE_General_RoughWater, 0 + setmetatile 54, 21, METATILE_General_RoughWater, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F + setmetatile 57, 9, METATILE_General_RoughWater, 0 + setmetatile 58, 9, METATILE_General_RoughWater, 0 + setmetatile 56, 10, METATILE_General_RoughWater, 0 + setmetatile 57, 10, METATILE_General_RoughDeepWater, 0 + setmetatile 58, 10, METATILE_General_RoughDeepWater, 0 + setmetatile 59, 10, METATILE_General_RoughWater, 0 + setmetatile 56, 11, METATILE_General_RoughWater, 0 + setmetatile 57, 11, METATILE_General_RoughDeepWater, 0 + setmetatile 58, 11, METATILE_General_RoughDeepWater, 0 + setmetatile 59, 11, METATILE_General_RoughWater, 0 + setmetatile 57, 12, METATILE_General_RoughWater, 0 + setmetatile 58, 12, METATILE_General_RoughWater, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC + setmetatile 61, 30, METATILE_General_RoughWater, 0 + setmetatile 62, 30, METATILE_General_RoughWater, 0 + setmetatile 60, 31, METATILE_General_RoughWater, 0 + setmetatile 61, 31, METATILE_General_RoughDeepWater, 0 + setmetatile 62, 31, METATILE_General_RoughDeepWater, 0 + setmetatile 63, 31, METATILE_General_RoughWater, 0 + setmetatile 60, 32, METATILE_General_RoughWater, 0 + setmetatile 61, 32, METATILE_General_RoughDeepWater, 0 + setmetatile 62, 32, METATILE_General_RoughDeepWater, 0 + setmetatile 63, 32, METATILE_General_RoughWater, 0 + setmetatile 61, 33, METATILE_General_RoughWater, 0 + setmetatile 62, 33, METATILE_General_RoughWater, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39 + setmetatile 16, 14, METATILE_General_RoughWater, 0 + setmetatile 17, 14, METATILE_General_RoughWater, 0 + setmetatile 15, 15, METATILE_General_RoughWater, 0 + setmetatile 16, 15, METATILE_General_RoughDeepWater, 0 + setmetatile 17, 15, METATILE_General_RoughDeepWater, 0 + setmetatile 18, 15, METATILE_General_RoughWater, 0 + setmetatile 15, 16, METATILE_General_RoughWater, 0 + setmetatile 16, 16, METATILE_General_RoughDeepWater, 0 + setmetatile 17, 16, METATILE_General_RoughDeepWater, 0 + setmetatile 18, 16, METATILE_General_RoughWater, 0 + setmetatile 16, 17, METATILE_General_RoughWater, 0 + setmetatile 17, 17, METATILE_General_RoughWater, 0 + return + +UnusualWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6 + setmetatile 42, 19, METATILE_General_RoughWater, 0 + setmetatile 43, 19, METATILE_General_RoughWater, 0 + setmetatile 41, 20, METATILE_General_RoughWater, 0 + setmetatile 42, 20, METATILE_General_RoughDeepWater, 0 + setmetatile 43, 20, METATILE_General_RoughDeepWater, 0 + setmetatile 44, 20, METATILE_General_RoughWater, 0 + setmetatile 41, 21, METATILE_General_RoughWater, 0 + setmetatile 42, 21, METATILE_General_RoughDeepWater, 0 + setmetatile 43, 21, METATILE_General_RoughDeepWater, 0 + setmetatile 44, 21, METATILE_General_RoughWater, 0 + setmetatile 42, 22, METATILE_General_RoughWater, 0 + setmetatile 43, 22, METATILE_General_RoughWater, 0 + return + +UnusualWeather_EventScript_HideMapNamePopup:: @ 8273D13 + setflag FLAG_HIDE_MAP_NAME_POPUP + return + +UnusualWeather_StartKyogreWeather:: @ 8273D17 + setweather WEATHER_RAIN_HEAVY + return + +UnusualWeather_StartGroudonWeather:: @ 8273D1B + setweather WEATHER_DROUGHT + return + +UnusualWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F + lockall + compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START + goto_if_ge UnusualWeather_EventScript_ShowRainEndedMessage + goto UnusualWeather_EventScript_ShowSunEndedMessage + end + +UnusualWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31 + closemessage + fadescreenswapbuffers 1 + setweather WEATHER_SUNNY + doweather + call UnusualWeather_EventScript_CleanupMapTiles + special DrawWholeMapView + setvar VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE + setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 0 + clearflag FLAG_HIDE_MAP_NAME_POPUP + fadescreenswapbuffers 0 + releaseall + end + +UnusualWeather_EventScript_ShowRainEndedMessage:: @ 8273D51 + msgbox gText_UnusualWeatherEnded_Rain, MSGBOX_DEFAULT + goto UnusualWeather_EventScript_EndEventAndCleanup_2 + end + +UnusualWeather_EventScript_ShowSunEndedMessage:: @ 8273D5F + msgbox gText_UnusualWeatherEnded_Sun, MSGBOX_DEFAULT + goto UnusualWeather_EventScript_EndEventAndCleanup_2 + end + +UnusualWeather_EventScript_CleanupMapTiles:: @ 8273D6D + switch VAR_UNUSUAL_WEATHER_LOCATION + case UNUSUAL_WEATHER_ROUTE_114_NORTH, UnusualWeather_EventScript_CleanupRoute114North + case UNUSUAL_WEATHER_ROUTE_114_SOUTH, UnusualWeather_EventScript_CleanupRoute114South + case UNUSUAL_WEATHER_ROUTE_115_WEST, UnusualWeather_EventScript_CleanupRoute115West + case UNUSUAL_WEATHER_ROUTE_115_EAST, UnusualWeather_EventScript_CleanupRoute115East + case UNUSUAL_WEATHER_ROUTE_116_NORTH, UnusualWeather_EventScript_CleanupRoute116North + case UNUSUAL_WEATHER_ROUTE_116_SOUTH, UnusualWeather_EventScript_CleanupRoute116South + case UNUSUAL_WEATHER_ROUTE_118_EAST, UnusualWeather_EventScript_CleanupRoute118East + case UNUSUAL_WEATHER_ROUTE_118_WEST, UnusualWeather_EventScript_CleanupRoute118West + case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_EventScript_CleanupRoute105North + case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_EventScript_CleanupRoute105South + case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_EventScript_CleanupRoute125West + case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_EventScript_CleanupRoute125East + case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_EventScript_CleanupRoute127North + case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_EventScript_CleanupRoute127South + case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_EventScript_CleanupRoute129West + case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_EventScript_CleanupRoute129East + return + +UnusualWeather_EventScript_CleanupRoute114North:: @ 8273E23 + setmetatile 7, 3, METATILE_Fallarbor_RedRockWall, 1 + setmetatile 7, 4, METATILE_Fallarbor_RedRockWall, 1 + return + +UnusualWeather_EventScript_CleanupRoute114South:: @ 8273E36 + setmetatile 6, 45, METATILE_Fallarbor_BrownRockWall, 1 + setmetatile 6, 46, METATILE_Fallarbor_BrownRockWall, 1 + return + +UnusualWeather_EventScript_CleanupRoute115West:: @ 8273E49 + setmetatile 21, 5, METATILE_Fallarbor_BrownRockWall, 1 + setmetatile 21, 6, METATILE_Fallarbor_BrownRockWall, 1 + return + +UnusualWeather_EventScript_CleanupRoute115East:: @ 8273E5C + setmetatile 36, 9, METATILE_Fallarbor_BrownRockWall, 1 + setmetatile 36, 10, METATILE_Fallarbor_BrownRockWall, 1 + return + +UnusualWeather_EventScript_CleanupRoute116North:: @ 8273E6F + setmetatile 59, 12, METATILE_General_RockWall_RockBase, 1 + setmetatile 59, 13, METATILE_General_RockWall_RockBase, 1 + return + +UnusualWeather_EventScript_CleanupRoute116South:: @ 8273E82 + setmetatile 79, 5, METATILE_General_RockWall_RockBase, 1 + setmetatile 79, 6, METATILE_General_RockWall_RockBase, 1 + return + +UnusualWeather_EventScript_CleanupRoute118East:: @ 8273E95 + setmetatile 42, 5, METATILE_General_RockWall_RockBase, 1 + setmetatile 42, 6, METATILE_General_RockWall_GrassBase, 1 + return + +UnusualWeather_EventScript_CleanupRoute118West:: @ 8273EA8 + setmetatile 9, 5, METATILE_General_RockWall_RockBase, 1 + setmetatile 9, 6, METATILE_General_RockWall_GrassBase, 1 + return + +UnusualWeather_EventScript_CleanupRoute105North:: @ 8273EBB + setmetatile 10, 28, METATILE_General_CalmWater, 0 + setmetatile 11, 28, METATILE_General_CalmWater, 0 + setmetatile 9, 29, METATILE_General_CalmWater, 0 + setmetatile 10, 29, METATILE_General_CalmWater, 0 + setmetatile 11, 29, METATILE_General_CalmWater, 0 + setmetatile 12, 29, METATILE_General_CalmWater, 0 + setmetatile 9, 30, METATILE_General_CalmWater, 0 + setmetatile 10, 30, METATILE_General_CalmWater, 0 + setmetatile 11, 30, METATILE_General_CalmWater, 0 + setmetatile 12, 30, METATILE_General_CalmWater, 0 + setmetatile 10, 31, METATILE_General_CalmWater, 0 + setmetatile 11, 31, METATILE_General_CalmWater, 0 + return + +UnusualWeather_EventScript_CleanupRoute105South:: @ 8273F28 + setmetatile 20, 53, METATILE_General_CalmWater, 0 + setmetatile 21, 53, METATILE_General_CalmWater, 0 + setmetatile 19, 54, METATILE_General_CalmWater, 0 + setmetatile 20, 54, METATILE_General_CalmWater, 0 + setmetatile 21, 54, METATILE_General_CalmWater, 0 + setmetatile 22, 54, METATILE_General_CalmWater, 0 + setmetatile 19, 55, METATILE_General_CalmWater, 0 + setmetatile 20, 55, METATILE_General_CalmWater, 0 + setmetatile 21, 55, METATILE_General_CalmWater, 0 + setmetatile 22, 55, METATILE_General_CalmWater, 0 + setmetatile 20, 56, METATILE_General_CalmWater, 0 + setmetatile 21, 56, METATILE_General_CalmWater, 0 + return + +UnusualWeather_EventScript_CleanupRoute125West:: @ 8273F95 + setmetatile 8, 16, METATILE_General_CalmWater, 0 + setmetatile 9, 16, METATILE_General_CalmWater, 0 + setmetatile 7, 17, METATILE_General_CalmWater, 0 + setmetatile 8, 17, METATILE_General_CalmWater, 0 + setmetatile 9, 17, METATILE_General_CalmWater, 0 + setmetatile 10, 17, METATILE_General_CalmWater, 0 + setmetatile 7, 18, METATILE_General_CalmWater, 0 + setmetatile 8, 18, METATILE_General_CalmWater, 0 + setmetatile 9, 18, METATILE_General_CalmWater, 0 + setmetatile 10, 18, METATILE_General_CalmWater, 0 + setmetatile 8, 19, METATILE_General_CalmWater, 0 + setmetatile 9, 19, METATILE_General_CalmWater, 0 + return + +UnusualWeather_EventScript_CleanupRoute125East:: @ 8274002 + setmetatile 53, 18, METATILE_General_CalmWater, 0 + setmetatile 54, 18, METATILE_General_CalmWater, 0 + setmetatile 52, 19, METATILE_General_CalmWater, 0 + setmetatile 53, 19, METATILE_General_CalmWater, 0 + setmetatile 54, 19, METATILE_General_CalmWater, 0 + setmetatile 55, 19, METATILE_General_CalmWater, 0 + setmetatile 52, 20, METATILE_General_CalmWater, 0 + setmetatile 53, 20, METATILE_General_CalmWater, 0 + setmetatile 54, 20, METATILE_General_CalmWater, 0 + setmetatile 55, 20, METATILE_General_CalmWater, 0 + setmetatile 53, 21, METATILE_General_CalmWater, 0 + setmetatile 54, 21, METATILE_General_CalmWater, 0 + return + +UnusualWeather_EventScript_CleanupRoute127North:: @ 827406F + setmetatile 57, 9, METATILE_General_CalmWater, 0 + setmetatile 58, 9, METATILE_General_CalmWater, 0 + setmetatile 56, 10, METATILE_General_CalmWater, 0 + setmetatile 57, 10, METATILE_General_CalmWater, 0 + setmetatile 58, 10, METATILE_General_CalmWater, 0 + setmetatile 59, 10, METATILE_General_CalmWater, 0 + setmetatile 56, 11, METATILE_General_CalmWater, 0 + setmetatile 57, 11, METATILE_General_CalmWater, 0 + setmetatile 58, 11, METATILE_General_CalmWater, 0 + setmetatile 59, 11, METATILE_General_CalmWater, 0 + setmetatile 57, 12, METATILE_General_CalmWater, 0 + setmetatile 58, 12, METATILE_General_CalmWater, 0 + return + +UnusualWeather_EventScript_CleanupRoute127South:: @ 82740DC + setmetatile 61, 30, METATILE_General_CalmWater, 0 + setmetatile 62, 30, METATILE_General_CalmWater, 0 + setmetatile 60, 31, METATILE_General_CalmWater, 0 + setmetatile 61, 31, METATILE_General_CalmWater, 0 + setmetatile 62, 31, METATILE_General_CalmWater, 0 + setmetatile 63, 31, METATILE_General_CalmWater, 0 + setmetatile 60, 32, METATILE_General_CalmWater, 0 + setmetatile 61, 32, METATILE_General_CalmWater, 0 + setmetatile 62, 32, METATILE_General_CalmWater, 0 + setmetatile 63, 32, METATILE_General_CalmWater, 0 + setmetatile 61, 33, METATILE_General_CalmWater, 0 + setmetatile 62, 33, METATILE_General_CalmWater, 0 + return + +UnusualWeather_EventScript_CleanupRoute129West:: @ 8274149 + setmetatile 16, 14, METATILE_General_CalmWater, 0 + setmetatile 17, 14, METATILE_General_CalmWater, 0 + setmetatile 15, 15, METATILE_General_CalmWater, 0 + setmetatile 16, 15, METATILE_General_CalmWater, 0 + setmetatile 17, 15, METATILE_General_CalmWater, 0 + setmetatile 18, 15, METATILE_General_CalmWater, 0 + setmetatile 15, 16, METATILE_General_CalmWater, 0 + setmetatile 16, 16, METATILE_General_CalmWater, 0 + setmetatile 17, 16, METATILE_General_CalmWater, 0 + setmetatile 18, 16, METATILE_General_CalmWater, 0 + setmetatile 16, 17, METATILE_General_CalmWater, 0 + setmetatile 17, 17, METATILE_General_CalmWater, 0 + return + +UnusualWeather_EventScript_CleanupRoute129East:: @ 82741B6 + setmetatile 42, 19, METATILE_General_CalmWater, 0 + setmetatile 43, 19, METATILE_General_CalmWater, 0 + setmetatile 41, 20, METATILE_General_CalmWater, 0 + setmetatile 42, 20, METATILE_General_CalmWater, 0 + setmetatile 43, 20, METATILE_General_CalmWater, 0 + setmetatile 44, 20, METATILE_General_CalmWater, 0 + setmetatile 41, 21, METATILE_General_CalmWater, 0 + setmetatile 42, 21, METATILE_General_CalmWater, 0 + setmetatile 43, 21, METATILE_General_CalmWater, 0 + setmetatile 44, 21, METATILE_General_CalmWater, 0 + setmetatile 42, 22, METATILE_General_CalmWater, 0 + setmetatile 43, 22, METATILE_General_CalmWater, 0 + return + +UnusualWeather_Underwater_SetupEscapeWarp:: @ 8274223 + switch VAR_UNUSUAL_WEATHER_LOCATION + case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105North + case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105South + case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute125West + case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute125East + case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127North + case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127South + case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute129West + case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute129East + return + +UnusualWeather_Underwater_SetupEscapeWarpRoute105North:: @ 8274281 + setescapewarp MAP_ROUTE105, 255, 11, 29 + return + +UnusualWeather_Underwater_SetupEscapeWarpRoute105South:: @ 827428A + setescapewarp MAP_ROUTE105, 255, 21, 54 + return + +UnusualWeather_Underwater_SetupEscapeWarpRoute125West:: @ 8274293 + setescapewarp MAP_ROUTE125, 255, 9, 17 + return + +UnusualWeather_Underwater_SetupEscapeWarpRoute125East:: @ 827429C + setescapewarp MAP_ROUTE125, 255, 54, 19 + return + +UnusualWeather_Underwater_SetupEscapeWarpRoute127North:: @ 82742A5 + setescapewarp MAP_ROUTE127, 255, 58, 10 + return + +UnusualWeather_Underwater_SetupEscapeWarpRoute127South:: @ 82742AE + setescapewarp MAP_ROUTE127, 255, 62, 31 + return + +UnusualWeather_Underwater_SetupEscapeWarpRoute129West:: @ 82742B7 + setescapewarp MAP_ROUTE129, 255, 17, 15 + return + +UnusualWeather_Underwater_SetupEscapeWarpRoute129East:: @ 82742C0 + setescapewarp MAP_ROUTE129, 255, 43, 20 + return diff --git a/data/specials.inc b/data/specials.inc index 096a3b33d..5017c3dc3 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -11,7 +11,7 @@ gSpecials:: @ 81DBA64 def_special HealPlayerParty def_special SetCableClubWarp def_special sub_80AF948 - def_special sub_80AF9F8 + def_special ReturnFromLinkRoom def_special CleanupLinkRoomState def_special ExitLinkRoom def_special SetPlayerSecretBase @@ -25,19 +25,19 @@ gSpecials:: @ 81DBA64 def_special ShowSecretBaseDecorationMenu def_special ShowSecretBaseRegistryMenu def_special PrepSecretBaseBattleFlags - def_special GetSecretBaseOwnerInteractionState + def_special GetSecretBaseOwnerAndState def_special InitSecretBaseDecorationSprites - def_special sub_8127E18 + def_special SetDecoration def_special sub_81297AC def_special GetSecretBaseTypeInFrontOfPlayer def_special SetSecretBaseOwnerGfxId def_special sub_8129708 def_special EnterNewlyCreatedSecretBase - def_special sub_80EA30C + def_special SetBattledOwnerFromResult def_special DoSecretBasePCTurnOffEffect def_special RecordMixingPlayerSpotTriggered - def_special sub_80B2DA4 - def_special sub_80B2E4C + def_special TryBattleLinkup + def_special TryTradeLinkup def_special sub_80B2E74 def_special sub_80B2EA8 def_special CloseLink @@ -51,7 +51,7 @@ gSpecials:: @ 81DBA64 def_special SavePlayerParty def_special LoadPlayerParty def_special ChooseHalfPartyForBattle - def_special sp02A_crash_sound + def_special Script_ShowLinkTrainerCard def_special EventObjectInteractionGetBerryTreeData def_special EventObjectInteractionGetBerryName def_special EventObjectInteractionGetBerryCountString @@ -150,18 +150,18 @@ gSpecials:: @ 81DBA64 def_special sub_80F8864 def_special CountPlayerContestPaintings def_special ShowContestWinner - def_special MauvilleGymSpecial2 - def_special MauvilleGymSpecial1 + def_special MauvilleGymSetDefaultBarriers + def_special MauvilleGymPressSwitch def_special ShowFieldMessageStringVar4 def_special DrawWholeMapView def_special StorePlayerCoordsInVars - def_special MauvilleGymSpecial3 - def_special PetalburgGymSpecial1 - def_special PetalburgGymSpecial2 + def_special MauvilleGymDeactivatePuzzle + def_special PetalburgGymSlideOpenRoomDoors + def_special PetalburgGymUnlockRoomDoors def_special GetPlayerTrainerIdOnesDigit def_special GetPlayerBigGuyGirlString def_special GetRivalSonDaughterString - def_special SetFlagInVar + def_special SetHiddenItemFlag def_special CableCarWarp def_special CableCar def_special Overworld_PlaySpecialMapMusic @@ -170,7 +170,7 @@ gSpecials:: @ 81DBA64 def_special ChooseStarter def_special StartWallyTutorialBattle def_special ChangePokemonNickname - def_special sub_81B94B0 + def_special ChoosePartyMon def_special GetFirstFreePokeblockSlot def_special DoBerryBlending def_special PlayRoulette @@ -210,8 +210,8 @@ gSpecials:: @ 81DBA64 def_special ShowLinkBattleRecords def_special IsEnoughForCostInVar0x8005 def_special SubtractMoneyFromVar0x8005 - def_special ExecuteWhiteOut - def_special sp0C8_whiteout_maybe + def_special TryFieldPoisonWhiteOut + def_special SetCB2WhiteOut def_special RotatingGate_InitPuzzle def_special RotatingGate_InitPuzzleAndGraphics def_special SetSSTidalFlag @@ -230,11 +230,11 @@ gSpecials:: @ 81DBA64 def_special SetDeptStoreFloor def_special DoLotteryCornerComputerEffect def_special EndLotteryCornerComputerEffect - def_special sub_81B951C - def_special sub_81B968C - def_special sub_81B9770 - def_special sub_81B9718 - def_special sub_81B96D0 + def_special ChooseMonForMoveRelearner + def_special MoveDeleterChooseMoveToForget + def_special MoveDeleterForgetMove + def_special BufferMoveDeleterNicknameAndMove + def_special GetNumMovesSelectedMonHas def_special TeachMoveRelearnerMove def_special GetRecordedCyclingRoadResults def_special Special_BeginCyclingRoadChallenge @@ -292,8 +292,8 @@ gSpecials:: @ 81DBA64 def_special GetSecretBaseNearbyMapName def_special CheckRelicanthWailord def_special ShouldDoBrailleRegirockEffectOld - def_special sub_80B0534 - def_special sub_80B058C + def_special DoOrbEffect + def_special FadeOutOrbEffect def_special WaitWeather def_special BufferEReaderTrainerName def_special GetSlotMachineId @@ -305,8 +305,8 @@ gSpecials:: @ 81DBA64 def_special LeadMonHasEffortRibbon def_special GiveLeadMonEffortRibbon def_special Special_AreLeadMonEVsMaxedOut - def_special sub_8098574 - def_special sub_809859C + def_special Script_FacePlayer + def_special Script_ClearHeldMovement def_special InitRoamer def_special TryUpdateRusturfTunnelState def_special IsGrassTypeInParty @@ -320,7 +320,7 @@ gSpecials:: @ 81DBA64 def_special GetShieldToyTVDecorationInfo def_special IsPokerusInParty def_special SetSootopolisGymCrackedIceMetatiles - def_special sub_8139560 + def_special ShakeCamera def_special StartGroudonKyogreBattle def_special BattleSetup_StartLegendaryBattle def_special StartRegiBattle @@ -338,29 +338,29 @@ gSpecials:: @ 81DBA64 def_special SetRoute123Weather def_special ScriptGetMultiplayerId def_special ScriptGetPartyMonSpecies - def_special sub_81B98DC + def_special IsSelectedMonEgg def_special TryInitBattleTowerAwardManEventObject def_special MoveOutOfSecretBaseFromOutside def_special LoadPlayerBag - def_special sub_80B05B4 + def_special Script_FadeOutMapMusic def_special SetPacifidlogTMReceivedDay def_special GetDaysUntilPacifidlogTMAvailable def_special HasAllHoennMons def_special MonOTNameMatchesPlayer def_special BufferLottoTicketNumber def_special sub_81653CC - def_special sub_80F9370 + def_special DoesPartyHaveEnigmaBerry def_special ScriptRandom def_special sub_81AFDD0 - def_special sub_80EDCE8 + def_special TryPutTreasureInvestigatorsOnAir def_special sub_80EE2CC def_special sub_80EE72C def_special sub_80EE7C0 def_special ShowGlassWorkshopMenu def_special PutFanClubSpecialOnTheAir - def_special sub_80EED10 - def_special sub_80EED34 - def_special sub_80EB1AC + def_special IncrementDailyPlantedBerries + def_special IncrementDailyPickedBerries + def_special InitSecretBaseVars def_special SetSecretBaseSecretsTvFlags_SandOrnament def_special sub_80EB300 def_special sub_80EB438 @@ -414,7 +414,7 @@ gSpecials:: @ 81DBA64 def_special GetContestLadyMonSpecies def_special GetContestLadyCategory def_special PutLilycoveContestLadyShowOnTheAir - def_special sub_813B880 + def_special CloseBattlePikeCurtain def_special CallApprenticeFunction def_special ShouldTryGetTrainerScript def_special ShowMapNamePopup @@ -424,23 +424,23 @@ gSpecials:: @ 81DBA64 def_special StartPlayerDescendMirageTower def_special BufferTMHMMoveName def_special IsWirelessAdapterConnected - def_special BerryBlenderLinkBecomeLeader - def_special BerryBlenderLinkJoinGroup + def_special TryBecomeLinkLeader + def_special TryJoinLinkGroup def_special UnionRoomSpecial def_special sub_801A42C - def_special sub_8016934 - def_special sp182_move_string + def_special InitUnionRoom + def_special BufferUnionRoomPlayerName def_special sub_801DC20 - def_special sub_81B8958 - def_special sub_8018090 + def_special ChooseMonForWirelessMinigame + def_special Script_ResetUnionRoomTrade def_special IsBadEggInParty def_special ValidateReceivedWonderCard def_special HasAtLeastOneBerry - def_special sub_802C920 - def_special sub_802E3C4 - def_special sub_8027A5C - def_special sub_8027AAC - def_special sub_8139980 + def_special IsPokemonJumpSpeciesInParty + def_special ShowPokemonJumpRecords + def_special IsDodrioInParty + def_special ShowDodrioBerryPickingRecords + def_special OffsetCameraForBattle def_special GetDeptStoreDefaultFloorChoice def_special BufferVarsForIVRater def_special sub_80F905C @@ -457,10 +457,10 @@ gSpecials:: @ 81DBA64 def_special ShowScrollableMultichoice def_special sub_813A630 def_special BufferBattleTowerElevatorFloors - def_special sub_81C6A94 + def_special TryStoreHeldItemsInPyramidBag def_special sub_81C4F24 - def_special sub_81B95E0 - def_special sub_81B9620 + def_special DoBattlePyramidMonsHaveHeldItem + def_special BattlePyramidChooseMonHeldItems def_special SetBattleTowerLinkPlayerGfx def_special ShowNatureGirlMessage def_special ShowBattlePointsWindow @@ -485,11 +485,11 @@ gSpecials:: @ 81DBA64 def_special BufferBattleFrontierTutorMoveName def_special CloseBattleFrontierTutorWindow def_special sub_813ADD4 - def_special sub_81B892C + def_special ChooseMonForMoveTutor def_special GetBattleFrontierTutorMoveIndex def_special sub_813AF48 def_special DoDeoxysRockInteraction - def_special sub_813B1D0 + def_special SetDeoxysRockPalette def_special CreateObedientEnemyMon def_special StartMirageTowerDisintegration def_special StartMirageTowerShake @@ -505,31 +505,31 @@ gSpecials:: @ 81DBA64 def_special sub_80A08CC def_special Unused_SetWeatherSunny def_special sub_81AFDA0 - def_special sub_813B4E0 + def_special IsTrainerRegistered def_special ShouldDoBrailleRegicePuzzle def_special EnableNationalPokedex def_special ScriptMenu_CreateLilycoveSSTidalMultichoice def_special GetLilycoveSSTidalSelection def_special TurnOnTVScreen def_special sub_81D4A90 - def_special sub_813B514 + def_special ShouldDistributeEonTicket def_special sub_813B568 def_special sub_813B534 def_special CallTrainerHillFunction def_special Script_DoRayquazaScene @ Listed twice - def_special sub_813B80C + def_special LoopWingFlapSE def_special sub_81D4BEC def_special sub_80224D0 def_special TryBufferWaldaPhrase def_special DoWaldaNamingScreen def_special TryGetWallpaperWithWaldaPhrase - def_special sub_8139ED0 + def_special PlayerNotAtTrainerHillEntrance def_special GetBattlePyramidHint def_special sub_80F8B94 def_special ShowTrainerHillRecords - def_special sub_80B4808 + def_special PlayerFaceTrainerAfterBattle def_special ResetHealLocationFromDewford - def_special sub_81B9918 + def_special IsLastMonThatKnowsSurf def_special CountPartyAliveNonEggMons def_special TryPrepareSecondApproachingTrainer def_special RemoveRecordsWindow diff --git a/data/text/battle_dome.inc b/data/text/battle_dome.inc new file mode 100644 index 000000000..a9b2895e1 --- /dev/null +++ b/data/text/battle_dome.inc @@ -0,0 +1,341 @@ +gBattleDomeOpponentPotentialText1:: + .string "The best candidate to be a champ!$" + +gBattleDomeOpponentPotentialText2:: + .string "A sure-finalist team.$" + +gBattleDomeOpponentPotentialText3:: + .string "A likely top-three finisher.$" + +gBattleDomeOpponentPotentialText4:: + .string "A candidate to finish first.$" + +gBattleDomeOpponentPotentialText5:: + .string "A team with top-class potential.$" + +gBattleDomeOpponentPotentialText6:: + .string "The dark horse team this tournament.$" + +gBattleDomeOpponentPotentialText7:: + .string "A better-than-average team.$" + +gBattleDomeOpponentPotentialText8:: + .string "This tournament's average team.$" + +gBattleDomeOpponentPotentialText9:: + .string "A team with average potential.$" + +gBattleDomeOpponentPotentialText10:: + .string "A weaker-than-average team.$" + +gBattleDomeOpponentPotentialText11:: + .string "A team looking for its first win.$" + +gBattleDomeOpponentPotentialText12:: + .string "One win will make this team proud.$" + +gBattleDomeOpponentPotentialText13:: + .string "Overall, a weak team.$" + +gBattleDomeOpponentPotentialText14:: + .string "A team with very low potential.$" + +gBattleDomeOpponentPotentialText15:: + .string "A team unlikely to win the tournament.$" + +gBattleDomeOpponentPotentialText16:: + .string "The team most unlikely to win.$" + +gBattleDomeOpponentPotentialText17:: + .string "The perfect, invincible superstar!$" + +gBattleDomeOpponentStyleText1:: + .string "Willing to risk total disaster at times.$" + +gBattleDomeOpponentStyleText2:: + .string "Skilled at enduring long battles.$" + +gBattleDomeOpponentStyleText3:: + .string "Varies tactics to suit the opponent.$" + +gBattleDomeOpponentStyleText4:: + .string "Has a tough winning pattern.$" + +gBattleDomeOpponentStyleText5:: + .string "Occasionally uses a very rare move.$" + +gBattleDomeOpponentStyleText6:: + .string "Uses startling and disruptive moves.$" + +gBattleDomeOpponentStyleText7:: + .string "Constantly watches HP in battle.$" + +gBattleDomeOpponentStyleText8:: + .string "Good at storing then loosing power.$" + +gBattleDomeOpponentStyleText9:: + .string "Skilled at enfeebling foes.$" + +gBattleDomeOpponentStyleText10:: + .string "Prefers tactics that rely on luck.$" + +gBattleDomeOpponentStyleText11:: + .string "Attacks with a regal atmosphere.$" + +gBattleDomeOpponentStyleText12:: + .string "Attacks with powerful, low-PP moves.$" + +gBattleDomeOpponentStyleText13:: + .string "Skilled at enfeebling, then attacking.$" + +gBattleDomeOpponentStyleText14:: + .string "Battles while enduring all attacks.$" + +gBattleDomeOpponentStyleText15:: + .string "Skilled at upsetting foes emotionally.$" + +gBattleDomeOpponentStyleText16:: + .string "Uses strong and straightforward moves.$" + +gBattleDomeOpponentStyleText17:: + .string "Aggressively uses strong moves.$" + +gBattleDomeOpponentStyleText18:: + .string "Battles while cleverly dodging attacks.$" + +gBattleDomeOpponentStyleText19:: + .string "Skilled at using upsetting attacks.$" + +gBattleDomeOpponentStyleText20:: + .string "Uses many popular moves.$" + +gBattleDomeOpponentStyleText21:: + .string "Has moves for powerful combinations.$" + +gBattleDomeOpponentStyleText22:: + .string "Uses high-probability attacks.$" + +gBattleDomeOpponentStyleText23:: + .string "Aggressively uses spectacular moves.$" + +gBattleDomeOpponentStyleText24:: + .string "Emphasizes offense over defense.$" + +gBattleDomeOpponentStyleText25:: + .string "Emphasizes defense over offense.$" + +gBattleDomeOpponentStyleText26:: + .string "Attacks quickly with strong moves.$" + +gBattleDomeOpponentStyleText27:: + .string "Often uses moves with added effects.$" + +gBattleDomeOpponentStyleText28:: + .string "Uses a well-balanced mix of moves.$" + +gBattleDomeOpponentStyleTextUnused1:: + .string "This is sample message 1.$" + +gBattleDomeOpponentStyleTextUnused2:: + .string "This is sample message 2.$" + +gBattleDomeOpponentStyleTextUnused3:: + .string "This is sample message 3.$" + +gBattleDomeOpponentStyleTextUnused4:: + .string "This is sample message 4.$" + +gBattleDomeOpponentStatsText1:: + .string "Emphasizes HP and ATTACK.$" + +gBattleDomeOpponentStatsText2:: + .string "Emphasizes HP and DEFENSE.$" + +gBattleDomeOpponentStatsText3:: + .string "Emphasizes HP and SPEED.$" + +gBattleDomeOpponentStatsText4:: + .string "Emphasizes HP and SP. ATTACK.$" + +gBattleDomeOpponentStatsText5:: + .string "Emphasizes HP and SP. DEFENSE.$" + +gBattleDomeOpponentStatsText6:: + .string "Emphasizes ATTACK and DEFENSE.$" + +gBattleDomeOpponentStatsText7:: + .string "Emphasizes ATTACK and SPEED.$" + +gBattleDomeOpponentStatsText8:: + .string "Emphasizes ATTACK and SP. ATTACK.$" + +gBattleDomeOpponentStatsText9:: + .string "Emphasizes ATTACK and SP. DEFENSE.$" + +gBattleDomeOpponentStatsText10:: + .string "Emphasizes DEFENSE and SPEED.$" + +gBattleDomeOpponentStatsText11:: + .string "Emphasizes DEFENSE and SP. ATTACK.$" + +gBattleDomeOpponentStatsText12:: + .string "Emphasizes DEFENSE and SP. DEFENSE.$" + +gBattleDomeOpponentStatsText13:: + .string "Emphasizes SPEED and SP. ATTACK.$" + +gBattleDomeOpponentStatsText14:: + .string "Emphasizes SPEED and SP. DEFENSE.$" + +gBattleDomeOpponentStatsText15:: + .string "Emphasizes SP. ATTACK and SP. DEFENSE.$" + +gBattleDomeOpponentStatsText16:: + .string "Emphasizes HP.$" + +gBattleDomeOpponentStatsText17:: + .string "Emphasizes ATTACK.$" + +gBattleDomeOpponentStatsText18:: + .string "Emphasizes DEFENSE.$" + +gBattleDomeOpponentStatsText19:: + .string "Emphasizes SPEED.$" + +gBattleDomeOpponentStatsText20:: + .string "Emphasizes SP. ATTACK.$" + +gBattleDomeOpponentStatsText21:: + .string "Emphasizes SP. DEFENSE.$" + +gBattleDomeOpponentStatsText22:: + .string "Neglects HP and ATTACK.$" + +gBattleDomeOpponentStatsText23:: + .string "Neglects HP and DEFENSE.$" + +gBattleDomeOpponentStatsText24:: + .string "Neglects HP and SPEED.$" + +gBattleDomeOpponentStatsText25:: + .string "Neglects HP and SP. ATTACK.$" + +gBattleDomeOpponentStatsText26:: + .string "Neglects HP and SP. DEFENSE.$" + +gBattleDomeOpponentStatsText27:: + .string "Neglects ATTACK and DEFENSE.$" + +gBattleDomeOpponentStatsText28:: + .string "Neglects ATTACK and SPEED.$" + +gBattleDomeOpponentStatsText29:: + .string "Neglects ATTACK and SP. ATTACK.$" + +gBattleDomeOpponentStatsText30:: + .string "Neglects ATTACK and SP. DEFENSE.$" + +gBattleDomeOpponentStatsText31:: + .string "Neglects DEFENSE and SPEED.$" + +gBattleDomeOpponentStatsText32:: + .string "Neglects DEFENSE and SP. ATTACK.$" + +gBattleDomeOpponentStatsText33:: + .string "Neglects DEFENSE and SP. DEFENSE.$" + +gBattleDomeOpponentStatsText34:: + .string "Neglects SPEED and SP. ATTACK.$" + +gBattleDomeOpponentStatsText35:: + .string "Neglects SPEED and SP. DEFENSE.$" + +gBattleDomeOpponentStatsText36:: + .string "Neglects SP. ATTACK and SP. DEFENSE.$" + +gBattleDomeOpponentStatsText37:: + .string "Neglects HP.$" + +gBattleDomeOpponentStatsText38:: + .string "Neglects ATTACK.$" + +gBattleDomeOpponentStatsText39:: + .string "Neglects DEFENSE.$" + +gBattleDomeOpponentStatsText40:: + .string "Neglects SPEED.$" + +gBattleDomeOpponentStatsText41:: + .string "Neglects SP. ATTACK.$" + +gBattleDomeOpponentStatsText42:: + .string "Neglects SP. DEFENSE.$" + +gBattleDomeOpponentStatsText43:: + .string "Raises POKéMON in a well-balanced way.$" + +gBattleDomeWinText1:: + .string "Let the battle begin!$" + +gBattleDomeWinText2:: + .string "{STR_VAR_1} won using {STR_VAR_2}!$" + +gBattleDomeWinText3:: + .string "{STR_VAR_1} became the champ!$" + +gBattleDomeWinText4:: + .string "{STR_VAR_1} won by default!$" + +gBattleDomeWinText5:: + .string "{STR_VAR_1} won outright by default!$" + +gBattleDomeWinText6:: + .string "{STR_VAR_1} won without using a move!$" + +gBattleDomeWinText7:: + .string "{STR_VAR_1} won outright with no moves!$" + +gBattleDomeMatchNumberText1:: + .string "Round 1, Match 1$" + +gBattleDomeMatchNumberText2:: + .string "Round 1, Match 2$" + +gBattleDomeMatchNumberText3:: + .string "Round 1, Match 3$" + +gBattleDomeMatchNumberText4:: + .string "Round 1, Match 4$" + +gBattleDomeMatchNumberText5:: + .string "Round 1, Match 5$" + +gBattleDomeMatchNumberText6:: + .string "Round 1, Match 6$" + +gBattleDomeMatchNumberText7:: + .string "Round 1, Match 7$" + +gBattleDomeMatchNumberText8:: + .string "Round 1, Match 8$" + +gBattleDomeMatchNumberText9:: + .string "Round 2, Match 1$" + +gBattleDomeMatchNumberText10:: + .string "Round 2, Match 2$" + +gBattleDomeMatchNumberText11:: + .string "Round 2, Match 3$" + +gBattleDomeMatchNumberText12:: + .string "Round 2, Match 4$" + +gBattleDomeMatchNumberText13:: + .string "Semifinal Match 1$" + +gBattleDomeMatchNumberText14:: + .string "Semifinal Match 2$" + +gBattleDomeMatchNumberText15:: + .string "Final Match$" diff --git a/data/text/battle_tent.inc b/data/text/battle_tent.inc new file mode 100644 index 000000000..48ea8f4d5 --- /dev/null +++ b/data/text/battle_tent.inc @@ -0,0 +1,418 @@ +FallarborTown_BattleTentLobby_Text_2C47EB: @ 82C47EB + .string "I welcome you to the BATTLE TENT\n" + .string "FALLARBOR SITE!\p" + .string "I am your guide to the Set KO Tourney!$" + +FallarborTown_BattleTentLobby_Text_2C4843: @ 82C4843 + .string "Now, do you wish to take the challenge\n" + .string "of a Set KO Tourney?$" + +FallarborTown_BattleTentLobby_Text_2C487F: @ 82C487F + .string "We await your challenge on\n" + .string "another occasion!$" + +FallarborTown_BattleTentLobby_Text_2C48AC: @ 82C48AC + .string "In the FALLARBOR BATTLE TENT,\n" + .string "we undertake the Set KO Tourney.\p" + .string "All participants enter with a team of\n" + .string "three POKéMON.\p" + .string "The three POKéMON must be lined up\n" + .string "in the order that they are to appear in.\p" + .string "During battle, the POKéMON will appear\n" + .string "one at a time in the preset order.\p" + .string "Once a POKéMON enters battle, it must\n" + .string "remain out until the match is decided.\p" + .string "If a match remains undecided in\n" + .string "three turns, it goes to judging.\p" + .string "If you wish to interrupt your challenge,\n" + .string "please save the game.\p" + .string "If you don't save, you will not be able\n" + .string "to continue with your challenge.\p" + .string "If you pull off the feat of beating\n" + .string "three TRAINERS in succession,\l" + .string "we will present you with a fine prize.$" + +FallarborTown_BattleTentLobby_Text_2C4B35: @ 82C4B35 + .string "Before showing you to the BATTLE\n" + .string "TENT, I must save. Is that okay?$" + +FallarborTown_BattleTentLobby_Text_2C4B77: @ 82C4B77 + .string "We offer two levels of challenge,\n" + .string "Level 50 and Open Level.\l" + .string "Which is your choice?$" + +FallarborTown_BattleTentLobby_Text_2C4BC8: @ 82C4BC8 + .string "Very well, now select your\n" + .string "three POKéMON, please.$" + +FallarborTown_BattleTentLobby_Text_2C4BFA: @ 82C4BFA + .string "My dear challenger!\p" + .string "You do not have the three POKéMON\n" + .string "required for entry.\p" + .string "They also must not hold the same\n" + .string "kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "When you have made your preparations,\n" + .string "please do return.$" + +FallarborTown_BattleTentLobby_Text_2C4CC0: @ 82C4CC0 + .string "My dear challenger!\p" + .string "You do not have the three POKéMON\n" + .string "required for entry.\p" + .string "To qualify, you must bring three\n" + .string "different kinds of POKéMON.\p" + .string "They also must not hold the same\n" + .string "kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "When you have made your preparations,\n" + .string "please do return.$" + +FallarborTown_BattleTentLobby_Text_2C4DC3: @ 82C4DC3 + .string "I shall now guide you to\n" + .string "the BATTLE TENT.$" + +FallarborTown_BattleTentLobby_Text_2C4DED: @ 82C4DED + .string "My dear challenger!\p" + .string "You did not save the game before\n" + .string "shutting down, did you?\p" + .string "It is unfortunate, but that has\n" + .string "resulted in your disqualification\l" + .string "from your challenge.\p" + .string "You may, of course, start with a fresh\n" + .string "challenge.$" + +FallarborTown_BattleTentLobby_Text_2C4EC3: @ 82C4EC3 + .string "How splendid! You have beaten\n" + .string "three TRAINERS in succession!$" + +FallarborTown_BattleTentLobby_Text_2C4EFF: @ 82C4EFF + .string "Please wait while I save the game.$" + +FallarborTown_BattleTentLobby_Text_2C4F22: @ 82C4F22 + .string "In commemoration of your 3-win streak,\n" + .string "we present you with this prize.$" + +FallarborTown_BattleTentLobby_Text_2C4F69: @ 82C4F69 + .string "{PLAYER} received the prize\n" + .string "{STR_VAR_1}.$" + +FallarborTown_BattleTentLobby_Text_2C4F83: @ 82C4F83 + .string "Oh?\n" + .string "Your BAG seems to be full.\p" + .string "I urge you to clear space and\n" + .string "return for your prize.$" + +FallarborTown_BattleTentLobby_Text_2C4FD7: @ 82C4FD7 + .string "Thank you so much for participating!\p" + .string "Please wait while I save the game.$" + +FallarborTown_BattleTentLobby_Text_2C501F: @ 82C501F + .string "We await your challenge on\n" + .string "another occasion!$" + +FallarborTown_BattleTentLobby_Text_2C504C: @ 82C504C + .string "We have been looking forward to\n" + .string "your arrival.\p" + .string "Before I show you to the BATTLE TENT,\n" + .string "I must save the game. Please wait.$" + +VerdanturfTown_BattleTentLobby_Text_2C50C3: @ 82C50C3 + .string "I welcome you to the BATTLE TENT\n" + .string "VERDANTURF SITE!\p" + .string "Here, the TRAINER's trust toward\n" + .string "POKéMON is tested.$" + +VerdanturfTown_BattleTentLobby_Text_2C5129: @ 82C5129 + .string "Do you wish to take the VERDANTURF\n" + .string "BATTLE TENT challenge?$" + +VerdanturfTown_BattleTentLobby_Text_2C5163: @ 82C5163 + .string "In the VERDANTURF BATTLE TENT,\n" + .string "there is one crucial rule that must\l" + .string "be obeyed.\p" + .string "TRAINERS are permitted only to switch\n" + .string "their POKéMON in and out.\p" + .string "TRAINERS are otherwise forbidden to\n" + .string "command their POKéMON.\p" + .string "The POKéMON are to behave according\n" + .string "to their nature and battle on their own.\p" + .string "You must put your trust in your\n" + .string "POKéMON and watch over them.\p" + .string "If you achieve the honor of beating\n" + .string "three TRAINERS in succession,\l" + .string "we will present you with a prize.\p" + .string "If you want to interrupt your\n" + .string "challenge, please save the game.\p" + .string "If you don't save before interrupting,\n" + .string "you will be disqualified.$" + +VerdanturfTown_BattleTentLobby_Text_2C539A: @ 82C539A + .string "When you have fortified your heart\n" + .string "and POKéMON, you must return.$" + +VerdanturfTown_BattleTentLobby_Text_2C53DB: @ 82C53DB + .string "There are two levels of difficulty,\n" + .string "Level 50 and Open Level.\l" + .string "Which is your choice of a challenge?$" + +VerdanturfTown_BattleTentLobby_Text_2C543D: @ 82C543D + .string "Sigh…\p" + .string "You do not have the three POKéMON\n" + .string "required for the challenge.\p" + .string "To enter, you must provide three\n" + .string "different kinds of POKéMON.\p" + .string "They also must not be holding\n" + .string "the same kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "Come back when you have made\n" + .string "your preparations.$" + +VerdanturfTown_BattleTentLobby_Text_2C5538: @ 82C5538 + .string "Sigh…\p" + .string "You do not have the three POKéMON\n" + .string "required for the challenge.\p" + .string "To enter, you must provide three\n" + .string "different kinds of POKéMON.\p" + .string "They also must not be holding\n" + .string "the same kinds of items.\p" + .string "EGGS{STR_VAR_1} ineligible.\p" + .string "Come back when you have made\n" + .string "your preparations.$" + +VerdanturfTown_BattleTentLobby_Text_2C5633: @ 82C5633 + .string "Good. Now, you must select your\n" + .string "three POKéMON.$" + +VerdanturfTown_BattleTentLobby_Text_2C5662: @ 82C5662 + .string "I must save before I show you to\n" + .string "the BATTLE TENT. Is that okay?$" + +VerdanturfTown_BattleTentLobby_Text_2C56A2: @ 82C56A2 + .string "Good.\n" + .string "Now, follow me.$" + +VerdanturfTown_BattleTentLobby_Text_2C56B8: @ 82C56B8 + .string "I feel privileged for having seen\n" + .string "your POKéMON's exploits.\p" + .string "The results will be recorded.\n" + .string "I must ask you to briefly wait.$" + +VerdanturfTown_BattleTentLobby_Text_2C5731: @ 82C5731 + .string "To achieve a 3-win streak…\p" + .string "The bonds that bind your heart with\n" + .string "your POKéMON seem firm and true.$" + +VerdanturfTown_BattleTentLobby_Text_2C5791: @ 82C5791 + .string "Your feat will be recorded.\n" + .string "I must ask you to briefly wait.$" + +VerdanturfTown_BattleTentLobby_Text_2C57CD: @ 82C57CD + .string "For the feat of your 3-win streak,\n" + .string "we present you with this prize.$" + +SlateportCity_BattleTentLobby_Text_2C5810: @ 82C5810 + .string "Welcome to the BATTLE TENT\n" + .string "SLATEPORT SITE!\p" + .string "I am your guide to the Battle Swap\n" + .string "Tournament.$" + +SlateportCity_BattleTentLobby_Text_2C586A: @ 82C586A + .string "Would you like to take the Battle\n" + .string "Swap challenge?$" + +SlateportCity_BattleTentLobby_Text_2C589C: @ 82C589C + .string "Here at the SLATEPORT BATTLE TENT,\n" + .string "we hold Battle Swap events\l" + .string "using rental POKéMON.\p" + .string "First, you will be loaned three\n" + .string "POKéMON specifically for this event.\p" + .string "Using the supplied rental POKéMON,\n" + .string "you must conduct a SINGLE BATTLE.\p" + .string "If you win, you are permitted to trade\n" + .string "one of your rental POKéMON.\p" + .string "Repeat this cycle of battling and\n" + .string "trading--if you win three times in\l" + .string "a row, you will earn a fine prize.\p" + .string "If you want to interrupt your\n" + .string "challenge, please save the game.\p" + .string "If you don't save before interrupting,\n" + .string "you will be disqualified.$" + +SlateportCity_BattleTentLobby_Text_2C5AA5: @ 82C5AA5 + .string "We look forward to your next visit.$" + +SlateportCity_BattleTentLobby_Text_2C5AC9: @ 82C5AC9 + .string "Which level do you wish to challenge?\n" + .string "Level 50 or Level 100?$" + +SlateportCity_BattleTentLobby_Text_2C5B06: @ 82C5B06 + .string "Before you begin your challenge,\n" + .string "I need to save data. Is that okay?$" + +SlateportCity_BattleTentLobby_Text_2C5B4A: @ 82C5B4A + .string "Okay, I will hold your POKéMON for\n" + .string "safekeeping while you compete.$" + +SlateportCity_BattleTentLobby_Text_2C5B8C: @ 82C5B8C + .string "Please step this way.$" + +SlateportCity_BattleTentLobby_Text_2C5BA2: @ 82C5BA2 + .string "Thank you for participating!\p" + .string "I will return your POKéMON in exchange\n" + .string "for our rental POKéMON.\p" + .string "I must also save your event results.\n" + .string "Please wait.$" + +SlateportCity_BattleTentLobby_Text_2C5C30: @ 82C5C30 + .string "I will return your POKéMON in exchange\n" + .string "for our rental POKéMON.$" + +SlateportCity_BattleTentLobby_Text_2C5C6F: @ 82C5C6F + .string "Congratulations!\n" + .string "You've won three straight matches!\p" + .string "I will return your POKéMON in exchange\n" + .string "for our rental POKéMON.\p" + .string "I must also save your event results.\n" + .string "Please wait.$" + +SlateportCity_BattleTentLobby_Text_2C5D14: @ 82C5D14 + .string "In recognition of your 3-win streak,\n" + .string "we award you this prize.$" + +SlateportCity_BattleTentLobby_Text_2C5D52: @ 82C5D52 + .string "Oh?\n" + .string "You seem to have no room for this.\p" + .string "Please make room in your BAG and\n" + .string "let me know.$" + +SlateportCity_BattleTentLobby_Text_2C5DA7: @ 82C5DA7 + .string "We've been waiting for you!\p" + .string "Before we resume your challenge,\n" + .string "I must save the game.$" + +SlateportCity_BattleTentLobby_Text_2C5DFA: @ 82C5DFA + .string "I'm sorry to say this, but you didn't\n" + .string "save before you quit playing last time.\p" + .string "As a result, you have been disqualified\n" + .string "from your challenge.$" + +SlateportCity_BattleTentLobby_Text_2C5E85: @ 82C5E85 + .string "We'll return your personal POKéMON.$" + +SlateportCity_BattleTentLobby_Text_2C5EA9: @ 82C5EA9 + .string "{PLAYER} received the prize\n" + .string "{STR_VAR_1}.$" + +SlateportCity_BattleTentLobby_Text_2C5EC3: @ 82C5EC3 + .string "The Battle Swap rules are listed.$" + +SlateportCity_BattleTentLobby_Text_2C5EE5: @ 82C5EE5 + .string "Which heading do you want to read?$" + +SlateportCity_BattleTentLobby_Text_2C5F08: @ 82C5F08 + .string "In a Battle Swap event, you may use\n" + .string "only three POKéMON.\p" + .string "Whether you are renting or swapping,\n" + .string "your team may not have two or more\l" + .string "of the same POKéMON.$" + +SlateportCity_BattleTentLobby_Text_2C5F9D: @ 82C5F9D + .string "You may swap POKéMON only with\n" + .string "the TRAINER you have just defeated.\p" + .string "You may swap for only those POKéMON\n" + .string "used by the beaten TRAINER.$" + +SlateportCity_BattleTentLobby_Text_2C6020: @ 82C6020 + .string "After every battle you win, you may\n" + .string "swap for one of your defeated\l" + .string "opponent's POKéMON.\p" + .string "You will not be able to swap POKéMON\n" + .string "with the third TRAINER in the event.$" + +SlateportCity_BattleTentLobby_Text_2C60C0: @ 82C60C0 + .string "There are two key points to be aware\n" + .string "of when swapping POKéMON.\p" + .string "First, when swapping, you can't check\n" + .string "the stats of the POKéMON you are\l" + .string "about to receive.\p" + .string "Second, the POKéMON on your team\n" + .string "are lined up in sequence, depending on\l" + .string "the order in which you rented them.\p" + .string "This sequence remains unchanged\n" + .string "even when swaps are made.$" + +SlateportCity_BattleTentLobby_Text_2C61FE: @ 82C61FE + .string "The POKéMON of the SLATEPORT\n" + .string "BATTLE TENT are all rentals.\p" + .string "All rental POKéMON are kept at\n" + .string "Level 30.$" + +VerdanturfTown_BattleTentLobby_Text_2C6261: @ 82C6261 + .string "The VERDANTURF BATTLE TENT\n" + .string "rules are listed.$" + +VerdanturfTown_BattleTentLobby_Text_2C628E: @ 82C628E + .string "Which heading do you want to read?$" + +VerdanturfTown_BattleTentLobby_Text_2C62B1: @ 82C62B1 + .string "Here at the VERDANTURF BATTLE TENT,\n" + .string "POKéMON are required to think and\l" + .string "battle by themselves.\p" + .string "Unlike in the wild, POKéMON that live\n" + .string "with people behave differently\l" + .string "depending on their nature.$" + +VerdanturfTown_BattleTentLobby_Text_2C636D: @ 82C636D + .string "Depending on its nature, a POKéMON\n" + .string "may prefer to attack no matter what.\p" + .string "Another POKéMON may prefer to protect\n" + .string "itself from any harm.\p" + .string "Yet another may enjoy vexing or\n" + .string "confounding its foes.\p" + .string "Depending on its nature, a POKéMON\n" + .string "will have favorite moves that it is good\l" + .string "at using.\p" + .string "It may also dislike certain moves that\n" + .string "it has trouble using.$" + +VerdanturfTown_BattleTentLobby_Text_2C64BA: @ 82C64BA + .string "There are offensive moves that inflict\n" + .string "direct damage on the foe.\p" + .string "There are defensive moves that are\n" + .string "used to prepare for enemy attacks or\l" + .string "used to heal HP and so on.\p" + .string "There are also other somewhat-odd\n" + .string "moves that may enfeeble the foes with\l" + .string "stat problems including poison and \l" + .string "paralysis.\p" + .string "POKéMON will consider using moves in\n" + .string "these three categories.$" + +VerdanturfTown_BattleTentLobby_Text_2C6612: @ 82C6612 + .string "When not under command by its TRAINER,\n" + .string "a POKéMON may be unable to effectively\l" + .string "use certain moves.\p" + .string "A POKéMON is not good at using any\n" + .string "move that it dislikes.\p" + .string "If a POKéMON only knows moves that\n" + .string "do not match its nature, it will often\l" + .string "be unable to live up to its potential.$" + +VerdanturfTown_BattleTentLobby_Text_2C671E: @ 82C671E + .string "Depending on its nature, a POKéMON may\n" + .string "start using moves that don't match its\l" + .string "nature when it is in trouble.\p" + .string "If a POKéMON begins behaving oddly\n" + .string "in a pinch, watch it carefully.$" + +FallarborTown_BattleTentLobby_Text_2C67CD: @ 82C67CD +VerdanturfTown_BattleTentLobby_Text_2C67CD: @ 82C67CD + .string "At this BATTLE TENT, the levels of\n" + .string "your opponents will be adjusted to\l" + .string "match the levels of your POKéMON.\p" + .string "However, no TRAINER you face will\n" + .string "have any POKéMON below Level 30.$" + +VerdanturfTown_BattleTentLobby_Text_2C6878: @ 82C6878 + .string "The VERDANTURF BATTLE TENT\n" + .string "rules are listed.$" diff --git a/data/text/berries.inc b/data/text/berries.inc index 489acd4b6..390812e96 100644 --- a/data/text/berries.inc +++ b/data/text/berries.inc @@ -1,4 +1,4 @@ -PetalburgCity_Gym_Text_2A6D3D: @ 82A6D3D +PetalburgCity_Gym_Text_GiveEnigmaBerry: @ 82A6D3D .string "DAD: Hi, {PLAYER}!\p" .string "I just received a very rare BERRY.\n" .string "I'd like you to have it.$" @@ -134,23 +134,23 @@ Route123_BerryMastersHouse_Text_2A761B: @ 82A761B Route123_BerryMastersHouse_Text_2A7682: @ 82A7682 .string "Ah…$" -Route104_PrettyPetalFlowerShop_Text_2A7686: @ 82A7686 +Route104_PrettyPetalFlowerShop_Text_ThisIsPrettyPetalFlowerShop: @ 82A7686 .string "Hello!\p" .string "This is the PRETTY PETAL flower shop.\n" .string "Spreading flowers all over the world!$" -Route104_PrettyPetalFlowerShop_Text_2A76D9: @ 82A76D9 +Route104_PrettyPetalFlowerShop_Text_LearnAboutBerries: @ 82A76D9 .string "{PLAYER}{KUN}, would you like to learn about\n" .string "BERRIES?$" -Route104_PrettyPetalFlowerShop_Text_2A7706: @ 82A7706 +Route104_PrettyPetalFlowerShop_Text_IntroLearnAboutBerries: @ 82A7706 .string "Your name is?\p" .string "{PLAYER}{KUN}.\n" .string "That's a nice name.\p" .string "{PLAYER}{KUN}, would you like to learn about\n" .string "BERRIES?$" -Route104_PrettyPetalFlowerShop_Text_2A775B: @ 82A775B +Route104_PrettyPetalFlowerShop_Text_BerriesExplanation: @ 82A775B .string "BERRIES grow on trees that thrive\n" .string "only in soft, loamy soil.\p" .string "If you take some BERRIES, be sure to\n" @@ -164,18 +164,18 @@ Route104_PrettyPetalFlowerShop_Text_2A775B: @ 82A775B .string "Please help me, {PLAYER}{KUN}. Plant BERRIES\n" .string "and bring more flowers into the world.$" -Route104_PrettyPetalFlowerShop_Text_2A78DF: @ 82A78DF +Route104_PrettyPetalFlowerShop_Text_FlowersBringHappiness: @ 82A78DF .string "Flowers bring so much happiness to\n" .string "people, don't they?$" -Route104_PrettyPetalFlowerShop_Text_2A7916: @ 82A7916 +Route104_PrettyPetalFlowerShop_Text_YouCanHaveThis: @ 82A7916 .string "Hello!\p" .string "The more attention you give to flowers,\n" .string "the more beautifully they bloom.\p" .string "You'll like tending flowers. I'm sure\n" .string "of it. You can have this.$" -Route104_PrettyPetalFlowerShop_Text_2A79A6: @ 82A79A6 +Route104_PrettyPetalFlowerShop_Text_WailmerPailExplanation: @ 82A79A6 .string "While BERRY plants are growing,\n" .string "water them with the WAILMER PAIL.\p" .string "Oh, another thing.\p" @@ -185,13 +185,13 @@ Route104_PrettyPetalFlowerShop_Text_2A79A6: @ 82A79A6 .string "Isn't that awesome?\n" .string "It's like they have the will to live.$" -Route104_PrettyPetalFlowerShop_Text_2A7A98: @ 82A7A98 +Route104_PrettyPetalFlowerShop_Text_ImGrowingFlowers: @ 82A7A98 .string "I'm trying to be like my big sisters.\n" .string "I'm growing flowers, too!\p" .string "Here you go!\n" .string "It's for you!$" -Route104_PrettyPetalFlowerShop_Text_2A7AF3: @ 82A7AF3 +Route104_PrettyPetalFlowerShop_Text_MachineMixesBerries: @ 82A7AF3 .string "You can plant a BERRY and grow it big,\n" .string "or you can make a POKéMON hold it.\p" .string "But now they have a machine that mixes\n" diff --git a/data/text/braille.inc b/data/text/braille.inc index 3d4b8e116..13c66c52f 100644 --- a/data/text/braille.inc +++ b/data/text/braille.inc @@ -186,7 +186,7 @@ SealedChamber_InnerRoom_Braille_2A6C73: @ 82A6C73 .braille "POKEMON\n" .braille "WAITS.$" -DesertRuins_Braille_2A6CA0: @ 82A6CA0 +DesertRuins_Braille_UseRockSmash: @ 82A6CA0 .byte 1 .byte 0 .byte 27 @@ -198,7 +198,7 @@ DesertRuins_Braille_2A6CA0: @ 82A6CA0 .braille "THEN, USE\n" .braille "ROCK SMASH.$" -IslandCave_Braille_2A6CD4: @ 82A6CD4 +IslandCave_Braille_RunLapAroundWall: @ 82A6CD4 .byte 5 .byte 0 .byte 25 @@ -210,7 +210,7 @@ IslandCave_Braille_2A6CD4: @ 82A6CD4 .braille "RUN AROUND\n" .braille "ONE LAP.$" -AncientTomb_Braille_2A6D06: @ 82A6D06 +AncientTomb_Braille_ShineInTheMiddle: @ 82A6D06 .byte 3 .byte 0 .byte 25 diff --git a/data/text/cable_club.inc b/data/text/cable_club.inc index e69de29bb..85e0e4edb 100644 --- a/data/text/cable_club.inc +++ b/data/text/cable_club.inc @@ -0,0 +1,485 @@ +CableClub_Text_WelcomeWhichCableClubService: @ 8277EA4 + .string "Welcome to the POKéMON CABLE\n" + .string "CLUB.\p" + .string "Which of our services do you wish\n" + .string "to use?$" + +CableClub_Text_WhichService: @ 8277EF1 + .string "Which of our services do you wish\n" + .string "to use?$" + +CableClub_Text_TradeUsingLinkCable:: @ 8277F1B + .string "Trade POKéMON with another player\n" + .string "using a GBA Game Link cable.$" + +CableClub_Text_BattleUsingLinkCable:: @ 8277F5A + .string "You may battle another TRAINER\n" + .string "using a GBA Game Link cable.$" + +CableClub_Text_RecordCornerUsingLinkCable:: @ 8277F96 + .string "You can use the RECORD CORNER with\n" + .string "others using a GBA Game Link cable.$" + +@ Unused +CableClub_Text_CloseThisMenu: @ 8277FDD + .string "Close this menu.$" + +CableClub_Text_NeedTwoMonsForDoubleBattle: @ 8277FEE + .string "For a DOUBLE BATTLE, you must\n" + .string "have at least two POKéMON.$" + +CableClub_Text_NeedTwoMonsToTrade: @ 8278027 + .string "For trading, you must have at\n" + .string "least two POKéMON with you.$" + +CableClub_Text_CantTradeEnigmaBerry: @ 8278061 + .string "A POKéMON holding the {STR_VAR_1}\n" + .string "BERRY can't be traded.$" + +gText_PleaseWaitForLink:: @ 8278091 + .string "Please wait.\n" + .string "… … B Button: Cancel$" + +gText_ConfirmLinkWhenPlayersReady:: @ 82780B3 + .string "When all players are ready…\n" + .string "A Button: Confirm\l" + .string "B Button: Cancel$" + +gText_ConfirmStartLinkWithXPlayers:: @ 82780F2 + .string "Start link with {STR_VAR_1} players.\n" + .string "A Button: Confirm\l" + .string "B Button: Cancel$" + +gText_AwaitingLinkup:: @ 8278131 + .string "Awaiting linkup…\n" + .string "… … B Button: Cancel$" + +@ Unused +CableClub_Text_OkayToSaveProgress:: @ 8278157 + .string "Your progress must be saved before\n" + .string "linking. Is it okay to save?$" + +CableClub_Text_PleaseEnter: @ 8278197 + .string "Please enter.$" + +CableClub_Text_DirectYouToYourRoom: @ 82781A5 + .string "I'll direct you to your room now.$" + +Text_SomeoneIsNotReadyToLink: @ 82781C7 + .string "Someone is not ready to link.\p" + .string "Please come back after everyone\n" + .string "has made preparations.$" + +Text_LinkErrorPleaseReset: @ 827821C + .string "Sorry, we have a link error…\n" + .string "Please reset and try again.$" + +Text_PlayersMadeDifferentSelections: @ 8278255 + .string "The link partners appear to have\n" + .string "made different selections.$" + +CableClub_Text_PleaseVisitAgain: @ 8278291 + .string "Please do visit again.$" + +CableClub_Text_IncorrectNumberOfParticipants: @ 82782A8 + .string "The number of participants is\n" + .string "incorrect.$" + +CableClub_Text_CantSingleBattleWithXPlayers: @ 82782D1 + .string "The SINGLE BATTLE Mode can't be\n" + .string "played by {STR_VAR_1} players.$" + +CableClub_Text_CantDoubleBattleWithXPlayers: @ 8278307 + .string "The DOUBLE BATTLE Mode can't be\n" + .string "played by {STR_VAR_1} players.$" + +CableClub_Text_NeedFourPlayers: @ 827833D + .string "There must be four players to play\n" + .string "this Battle Mode.$" + +CableClub_Text_PleaseConfirmNumberAndRestart: @ 8278372 + .string "Please confirm the number of\n" + .string "players and start again.$" + +Text_TerminateLinkConfirmation: @ 82783A8 + .string "The link will be terminated if you\n" + .string "leave the room. Is that okay?$" + +Text_TerminateLinkPleaseWait: @ 82783E9 + .string "Terminating link…\n" + .string "You will be escorted out of\l" + .string "the room. Please wait.$" + +CableClub_Text_TooBusyToNotice: @ 827842E + .string "This TRAINER is too busy to\n" + .string "notice…$" + +CableClub_Text_GotToLookAtTrainerCard: @ 8278452 + .string "Score! Got to look at {STR_VAR_1}'s\n" + .string "TRAINER CARD!$" + +CableClub_Text_GotToLookAtColoredTrainerCard: @ 827847B + .string "Score! Got to look at {STR_VAR_1}'s\n" + .string "TRAINER CARD!\p" + .string "It's a {STR_VAR_2} card!$" + +SingleBattleColosseum_Text_TakePlaceStartBattle: @ 82784B4 + .string "Please take your place and start\n" + .string "your battle.$" + +TradeCenter_Text_TakeSeatStartTrade: @ 82784E2 + .string "Please take your seat and start\n" + .string "your trade.$" + +RecordCorner_Text_ThanksForComing: @ 827850E + .string "Thanks for coming.$" + +CableClub_Text_TrainerCardDataOverwritten: @ 8278521 + .string "The TRAINER CARD data will\n" + .string "be overwritten.$" + +CableClub_Text_HopeToSeeYouAgain: @ 827854C + .string "I hope to see you again!$" + +CableClub_Text_NotSetUpForFarAwayRegion: @ 8278565 + .string "I'm awfully sorry.\p" + .string "We're not set up to conduct trades\n" + .string "with TRAINERS far away in another\l" + .string "region yet…$" + +CableClub_Text_OtherTrainerNotReady: @ 82785C9 + .string "The other TRAINER is not ready.$" + +CableClub_Text_YouHaveAMonThatCantBeTaken: @ 82785E9 + .string "You have at least one POKéMON\n" + .string "that can't be taken.$" + +RecordCorner_Text_TakeSeatAndWait: @ 827861C + .string "Please take your seat and wait.$" + +RecordCorner_Text_PlayerSentOverOneX: @ 827863C + .string "{STR_VAR_1} sent over one\n" + .string "{STR_VAR_2}.$" + +CableClub_Text_CantMixWithJapaneseGame: @ 8278651 + .string "Sorry, there is a transmission error.\p" + .string "You may not mix records with \n" + .string "Japanese Ruby or Sapphire games.\p" + .string "Also, you can't mix records with\n" + .string "Japanese Emerald and overseas Ruby\l" + .string "or Sapphire games at the same time.$" + +CableClub_Text_AdapterNotConnected: @ 827871F + .string "The Wireless Adapter is not\n" + .string "connected properly.$" + +CableClub_Text_ParticipantsStepUpToCounter: @ 827874F + .string "Participants are asked to step up\n" + .string "to the reception counter.$" + +@ Unused +CableClub_Text_Hello: @ 827878B + .string "Hello!$" + +@ Unused +CableClub_Text_PleaseWait: @ 8278792 + .string "Please wait.$" + +CableClub_Text_YouMayTradeHere:: @ 827879F + .string "You may trade your POKéMON here\n" + .string "with another TRAINER.$" + +CableClub_Text_YouMayBattleHere:: @ 82787D5 + .string "You may battle with your friends\n" + .string "here.$" + +CableClub_Text_CanMakeBerryPowder:: @ 82787FC + .string "Two to five TRAINERS can make\n" + .string "BERRY POWDER together.$" + +CableClub_Text_CanMixRecords:: @ 8278831 + .string "The records of two to four players\n" + .string "can be mixed together.$" + +OldaleTown_PokemonCenter_2F_Text_27886B: @ 827886B + .string "A guide to the WIRELESS CLUB's\n" + .string "various services.$" + +CableClub_Text_CancelSelectedItem:: @ 827889C + .string "Cancels the selected MENU item.$" + +OldaleTown_PokemonCenter_2F_Text_2788BC: @ 82788BC + .string "Which battle mode would you like?$" + +@ Unused +CableClub_Text_ReturnsToPreviousStep: @ 82788DE + .string "Returns to the previous step.$" + +CableClub_Text_NeedBerryForBerryCrush: @ 82788FC + .string "To use the BERRY CRUSH service,\n" + .string "you must have at least one BERRY.$" + +CableClub_Text_NeedTwoMonsForUnionRoom: @ 827893E + .string "To enter the UNION ROOM, you must\n" + .string "have at least two POKéMON.$" + +CableClub_Text_NoEnigmaBerryInUnionRoom: @ 827897B + .string "No POKéMON holding the {STR_VAR_1}\n" + .string "BERRY may enter the UNION ROOM.$" + +CableClub_Text_UnionRoomAdapterNotConnected: @ 82789B5 + .string "This is the POKéMON WIRELESS CLUB\n" + .string "UNION ROOM.\p" + .string "Unfortunately, your Wireless\n" + .string "Adapter is not connected properly.\p" + .string "Please do come again.$" + +@ Unused +CableClub_Text_OhExcuseMe: @ 8278A39 + .string "Oh…\n" + .string "Excuse me!$" + +CableClub_Text_PlayerIsWaiting: @ 8278A48 + .string "It appears as if {STR_VAR_1} is playing\n" + .string "right now.\l" + .string "Go for it!$" + +MossdeepCity_GameCorner_1F_Text_DescribeWhichGame: @ 8278A7D + .string "I can explain game rules to you,\n" + .string "if you'd like.\p" + .string "Which game should I describe?$" + +MossdeepCity_GameCorner_1F_Text_PokemonJumpInfo: @ 8278ACB + .string "“POKéMON JUMP”\p" + .string "Make your POKéMON skip the VINE WHIP\n" + .string "rope with the A Button.\p" + .string "Only mini POKéMON around 28 inches\n" + .string "or less may participate.\p" + .string "POKéMON that only swim, burrow,\n" + .string "or fly are not good at jumping.\p" + .string "As a result, those POKéMON may not\n" + .string "participate.\p" + .string "Good things happen if everyone\n" + .string "jumps in time.$" + +MossdeepCity_GameCorner_1F_Text_DodrioBerryPickingInfo: @ 8278BF1 + .string "“DODRIO BERRY-PICKING”\p" + .string "Command DODRIO's three heads to\n" + .string "catch falling BERRIES.\p" + .string "Press right, up, or left on the\n" + .string "{PLUS} Control Pad to move the heads.\p" + .string "To play this game, you must have\n" + .string "a DODRIO.$" + +MossdeepCity_GameCorner_1F_Text_TalkToOldManToPlay: @ 8278CAC + .string "If you want to play a game,\n" + .string "please tell the old man beside me.$" + +MossdeepCity_GameCorner_1F_Text_WelcomeCanYouWait: @ 8278CEB + .string "Hi, welcome!\n" + .string "Are you here to play games using\l" + .string "Wireless Communication?\p" + .string "Can you wait just a little bit?$" + +MossdeepCity_GameCorner_1F_Text_ComeAgain: @ 8278D51 + .string "All right, come again!$" + +MossdeepCity_GameCorner_1F_Text_AdapterNotConnected: @ 8278D68 + .string "The Wireless Adapter isn't connected.\n" + .string "Come back when it's hooked up!$" + +MossdeepCity_GameCorner_1F_Text_PlayWhichGame: @ 8278DAD + .string "All right, which game did you want\n" + .string "to play?$" + +MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon: @ 8278DD9 + .string "Which POKéMON would you like to\n" + .string "enter?$" + +MossdeepCity_GameCorner_1F_Text_AllGoodToGo: @ 8278E00 + .string "Okay, you're all good to go.\n" + .string "Don't let the others beat you!$" + +@ Unused +MossdeepCity_GameCorner_1F_Text_LeavingDoComeAgain: @ 8278E3C + .string "Are you leaving now?\n" + .string "Do come again!$" + +MossdeepCity_GameCorner_1F_Text_ExplainRequiredMon: @ 8278E60 + .string "It doesn't look like you have any\n" + .string "POKéMON that you can enter…\p" + .string "Would you like me to explain what\n" + .string "kinds of POKéMON can enter?$" + +MossdeepCity_GameCorner_1F_Text_ShortJumpingPokemonAllowed: @ 8278EDC + .string "“POKéMON JUMP” is open to POKéMON\n" + .string "around 28 inches or less.\p" + .string "What you can't enter are those\n" + .string "POKéMON that can't jump.\p" + .string "You know, like POKéMON that only\n" + .string "swim, burrow, or fly.\p" + .string "That's all you need to know.$" + +MossdeepCity_GameCorner_1F_Text_OnlyDodrioAllowed: @ 8278FA4 + .string "DODRIO BERRY-PICKING is a game that \n" + .string "only DODRIO may enter.$" + +@ Unused +MossdeepCity_GameCorner_1F_Text_RetryPlease: @ 8278FE0 + .string "Could you retry this from the start\n" + .string "again, please?$" + +CableClub_Text_WelcomeWhichDirectCornerRoom: @ 8279013 + .string "Welcome to the POKéMON WIRELESS\n" + .string "CLUB DIRECT CORNER.\p" + .string "You may interact directly with\n" + .string "your friends here.\p" + .string "Which room would you like to\n" + .string "enter?$" + +CableClub_Text_TradePokemon: @ 827909D + .string "Would you like to trade POKéMON?$" + +CableClub_Text_WhichBattleMode: @ 82790BE + .string "Which Battle Mode would you like\n" + .string "to play?$" + +CableClub_Text_AccessRecordCorner: @ 82790E8 + .string "Would you like to access\n" + .string "the RECORD CORNER?$" + +CableClub_Text_UseBerryCrush: @ 8279114 + .string "Would you like to use the\n" + .string "BERRY CRUSH System?$" + +CableClub_Text_ExplainBattleModes: @ 8279142 + .string "There are three Battle Modes.\p" + .string "SINGLE BATTLE is for two TRAINERS\n" + .string "with one or more POKéMON each.\p" + .string "Each TRAINER can have one POKéMON\n" + .string "in battle at a time.\p" + .string "DOUBLE BATTLE is for two TRAINERS\n" + .string "with two or more POKéMON each.\p" + .string "Each TRAINER will send out two\n" + .string "POKéMON in battle at a time.\p" + .string "MULTI BATTLE is for four TRAINERS\n" + .string "with one or more POKéMON each.\p" + .string "Each TRAINER can have one POKéMON\n" + .string "in battle at a time.$" + +CableClub_Text_ChooseGroupLeaderOfTwo: @ 82792CD + .string "Please decide which of you two\n" + .string "will become the LEADER.\p" + .string "The other player must then choose\n" + .string "“JOIN GROUP.”$" + +CableClub_Text_ChooseGroupLeaderOfFour: @ 8279334 + .string "Please decide which of you four\n" + .string "will become the GROUP LEADER.\p" + .string "The other players must then choose\n" + .string "“JOIN GROUP.”$" + +CableClub_Text_ChooseGroupLeader: @ 82793A3 + .string "Please decide which of you will\n" + .string "become the GROUP LEADER.\p" + .string "The other players must then choose\n" + .string "“JOIN GROUP.”$" + +CableClub_Text_WelcomeUnionRoomEnter: @ 827940D + .string "Welcome to the POKéMON WIRELESS\n" + .string "CLUB UNION ROOM.\p" + .string "You may interact directly with\n" + .string "other TRAINERS here, some of\l" + .string "whom you may not even know.\p" + .string "Would you like to enter the ROOM?$" + +CableClub_Text_UnionRoomInfo: @ 82794B8 + .string "The TRAINERS in the UNION ROOM\n" + .string "will be those players around you\l" + .string "who have also entered the ROOM.\p" + .string "You may do all sorts of things\n" + .string "here, such as exchanging greetings.\p" + .string "You may enter two POKéMON up to\n" + .string "Lv. 30 for a one-on-one battle.\p" + .string "You may take part in a chat with\n" + .string "two to five people.\p" + .string "Or, you may register a POKéMON for\n" + .string "trade.\p" + .string "Would you like to enter the ROOM?$" + +CableClub_Text_EnjoyUnionRoom: @ 827961C + .string "I hope you enjoy your time in\n" + .string "the UNION ROOM.$" + +CableClub_Text_FirstTimeRightThisWay: @ 827964A + .string "Hello!\n" + .string "My name is TEALA.\p" + .string "This must be your first time\n" + .string "up here.\p" + .string "I'll show you how the Wireless\n" + .string "Communication System works.\p" + .string "First, I need to show you this\n" + .string "floor of our POKéMON CENTER.\p" + .string "Right this way, please.$" + +CableClub_Text_ExplainWirelessClubFirstTime: @ 8279718 + .string "On the top floor, there are two\n" + .string "rooms.\p" + .string "First, the room on the left.\n" + .string "It's the UNION ROOM.\p" + .string "You may link up with TRAINERS\n" + .string "around you who have also entered\l" + .string "the UNION ROOM.\p" + .string "With them, you may do things like\n" + .string "chat, battle, and trade.\p" + .string "Second, the room on the right is\n" + .string "the DIRECT CORNER.\p" + .string "You may trade or battle POKéMON\n" + .string "with your friends in this room.\p" + .string "If the Wireless Adapter isn't\n" + .string "connected, you may still link up\l" + .string "using a GBA Game Link cable.\p" + .string "If that is the case, you must go\n" + .string "to the DIRECT CORNER.\p" + .string "I hope you enjoy the Wireless \n" + .string "Communication System.$" + +CableClub_Text_AskAboutLinking: @ 8279937 + .string "Hello, {PLAYER}!\p" + .string "It's me, TEALA, the POKéMON\n" + .string "CENTER 2F attendant.\p" + .string "Is there something you needed to\n" + .string "ask me about linking?$" + +CableClub_Text_ExplainWirelessClub: @ 82799AA + .string "Let me explain how the POKéMON\n" + .string "WIRELESS CLUB works.\p" + .string "On this, the top floor, there are\n" + .string "two rooms.\p" + .string "First, the room on the left.\n" + .string "It's the UNION ROOM.\p" + .string "You may link up with TRAINERS\n" + .string "around you who have also entered\l" + .string "the UNION ROOM.\p" + .string "With them, you may do things like\n" + .string "chat, battle, and trade.\p" + .string "Second, the room on the right is\n" + .string "the DIRECT CORNER.\p" + .string "You may trade or battle POKéMON\n" + .string "with your friends in this room.\p" + .string "Sometimes, you may not be able to\n" + .string "find your friends in the UNION ROOM\l" + .string "or the DIRECT CORNER.\p" + .string "In that case, please move closer\n" + .string "to your friends.\p" + .string "If the Wireless Adapter isn't\n" + .string "connected, you may still link up\l" + .string "using a GBA Game Link cable.\p" + .string "If that is the case, you must go\n" + .string "to the DIRECT CORNER.\p" + .string "I hope you enjoy the Wireless \n" + .string "Communication System.$" + +CableClub_Text_HopeYouEnjoyWirelessSystem: @ 8279C91 + .string "I hope you enjoy the Wireless\n" + .string "Communication System.$" diff --git a/data/text/check_furniture.inc b/data/text/check_furniture.inc new file mode 100644 index 000000000..23f966bbd --- /dev/null +++ b/data/text/check_furniture.inc @@ -0,0 +1,27 @@ +Text_PictureBookShelf: @ 82A81E5 + .string "There's a set of POKéMON picture books.$" + +Text_BookShelf: @ 82A820D + .string "It's filled with all sorts of books.$" + +Text_PokemonCenterBookShelf: @ 82A8232 + .string "POKéMON magazines!\n" + .string "POKéMON PAL…\p" + .string "POKéMON HANDBOOK…\n" + .string "ADORABLE POKéMON…$" + +Text_Vase: @ 82A8276 + .string "This vase looks expensive…\n" + .string "Peered inside…\p" + .string "But, it was empty.$" + +Text_EmptyTrashCan: @ 82A82B3 + .string "It's empty.$" + +Text_ShopShelf: @ 82A82BF + .string "The shelves brim with all sorts of\n" + .string "POKéMON merchandise.$" + +Text_Blueprint: @ 82A82F7 + .string "A blueprint of some sort?\n" + .string "It's too complicated!$" diff --git a/data/text/contest_hall.inc b/data/text/contest_hall.inc new file mode 100644 index 000000000..21753d35c --- /dev/null +++ b/data/text/contest_hall.inc @@ -0,0 +1,85 @@ +LilycoveCity_ContestLobby_Text_2C427C: @ 82C427C + .string "BLEND MASTER: Indeed I am!\n" + .string "The BLEND MASTER am I!\p" + .string "Blend with me, and you shall witness\n" + .string "the mastery I bring to blending!$" + +LilycoveCity_ContestLobby_Text_2C42F4: @ 82C42F4 + .string "BLEND MASTER: Hmmm! So, you wish to\n" + .string "see my mastery in action?$" + +LilycoveCity_ContestLobby_Text_2C4332: @ 82C4332 + .string "Hmmm!\p" + .string "So, you are too busy now, I see!\p" + .string "But fear not!\n" + .string "I shall be here all day!\l" + .string "Hurry back from your errand!$" + +LilycoveCity_ContestLobby_Text_2C439D: @ 82C439D + .string "Hmmm!\p" + .string "You haven't got a single BERRY!\p" + .string "I shall be here all day!\n" + .string "Hurry back with some BERRIES!$" + +LilycoveCity_ContestLobby_Text_2C43FA: @ 82C43FA + .string "Of course!\n" + .string "Of course!\p" + .string "Incidentally…\n" + .string "You do know how to blend {POKEBLOCK}S\l" + .string "from BERRIES?$" + +LilycoveCity_ContestLobby_Text_2C444C: @ 82C444C + .string "Hmmm!\p" + .string "Ah, but it is a simple process!\p" + .string "When the BLENDER's arrow comes to\n" + .string "your marker, just press the A Button.\p" + .string "That's all you have to do.\p" + .string "When you see how precisely I press\n" + .string "the A Button, you will understand.$" + +LilycoveCity_ContestLobby_Text_2C451B: @ 82C451B + .string "Fine!\p" + .string "Let's get started, then!\p" + .string "All together with the BLEND MASTER,\n" + .string "let's BERRY BLENDER!$" + +LilycoveCity_ContestLobby_Text_2C4573: @ 82C4573 + .string "Hmmm!\p" + .string "You don't appear to have gotten\n" + .string "the {POKEBLOCK} CASE!\p" + .string "I shall be here all day!\n" + .string "Obtain the {POKEBLOCK} CASE and hurry back!$" + +LilycoveCity_ContestLobby_Text_2C45E8: @ 82C45E8 + .string "Hmmm!\p" + .string "Your {POKEBLOCK} CASE appears to be full!\p" + .string "I shall be here all day!\n" + .string "Use some {POKEBLOCK}S and hurry back!$" + +LilycoveCity_ContestLobby_Text_2C464B: @ 82C464B + .string "Whoa!\n" + .string "Awesome!$" + +LilycoveCity_ContestLobby_Text_2C465A: @ 82C465A + .string "Wickedly fast!$" + +LilycoveCity_ContestLobby_Text_2C4669: @ 82C4669 + .string "What an expert!$" + +LilycoveCity_ContestLobby_Text_2C4679: @ 82C4679 + .string "When I blended with the MASTER,\n" + .string "we made amazing {POKEBLOCK}S!$" + +LilycoveCity_ContestLobby_Text_2C46B1: @ 82C46B1 + .string "Eyes that track the arrow with\n" + .string "machinelike intensity…\p" + .string "A hand that taps the A Button\n" + .string "with clockwork-like precision…\p" + .string "Possessing these qualities makes\n" + .string "the BLEND MASTER truly great.$" + +LilycoveCity_ContestLobby_Text_2C4763: @ 82C4763 + .string "The BLEND MASTER's supposed to work\n" + .string "on his skills deep in the mountains.\p" + .string "Sometimes, he comes to LILYCOVE\n" + .string "to blend BERRIES all day long.$" diff --git a/data/text/contest_link.inc b/data/text/contest_link.inc new file mode 100644 index 000000000..649f760fa --- /dev/null +++ b/data/text/contest_link.inc @@ -0,0 +1,36 @@ +gUnknown_0827E8CE:: @ 827E8CE + .string "Missed turn$" + +gText_LinkStandby4:: @ 827E8DA + .string "Link standby!$" + +gUnknown_0827E8E8:: @ 827E8E8 + .string "The winner is {STR_VAR_1}'s {STR_VAR_2}!\n" + .string "Congratulations!$" + +gUnknown_0827E910:: @ 827E910 + .string "The winner is {STR_VAR_1}'s {STR_VAR_2}!{PAUSE_UNTIL_PRESS}$" + +gUnknown_0827E929:: @ 827E929 + .string "Primary judging: No. {STR_VAR_1}{PAUSE_UNTIL_PRESS}$" + +gUnknown_0827E943:: @ 827E943 + .string "Secondary judging: No. {STR_VAR_1}{PAUSE_UNTIL_PRESS}$" + +gUnknown_0827E95F:: @ 827E95F + .string "Set event: No. {STR_VAR_1}{PAUSE_UNTIL_PRESS}$" + +gUnknown_0827E973:: @ 827E973 + .string "The move used most often:\n" + .string "{STR_VAR_1}{PAUSE_UNTIL_PRESS}$" + +gUnknown_0827E992:: @ 827E992 + .string "The most impressive POKéMON:\n" + .string "{STR_VAR_1}'s {STR_VAR_2}{PAUSE_UNTIL_PRESS}$" + +gUnknown_0827E9B9:: @ 827E9B9 + .string "Set event: No. {STR_VAR_1}{PAUSE_UNTIL_PRESS}$" + +gUnknown_0827E9CD:: @ 827E9CD + .string "A link TV program will not be made\n" + .string "because the TRAINER lost.{PAUSE_UNTIL_PRESS}$" diff --git a/data/text/contest_painting.inc b/data/text/contest_painting.inc new file mode 100644 index 000000000..2aa8c6a93 --- /dev/null +++ b/data/text/contest_painting.inc @@ -0,0 +1,95 @@ +gUnknown_0827EA0C:: @ 827EA0C + .string "{STR_VAR_1}\n" + .string "{STR_VAR_2}'s {STR_VAR_3}$" + +gUnknown_0827EA17:: @ 827EA17 + .string "CONTEST$" + +gContestRankNormal:: + .string "NORMAL RANK$" + +gContestRankSuper:: + .string "SUPER RANK$" + +gContestRankHyper:: + .string "HYPER RANK$" + +gContestRankMaster:: + .string "MASTER RANK$" + +gContestLink:: + .string "LINK$" + +gContestCoolness:: + .string "COOLNESS$" + +gContestBeauty:: + .string "BEAUTY$" + +gContestCuteness:: + .string "CUTENESS$" + +gContestSmartness:: + .string "SMARTNESS$" + +gContestToughness:: + .string "TOUGHNESS$" + +gContestPaintingCool1:: + .string "Nonstop supercool--\n" + .string "the inestimable {STR_VAR_1}$" + +gContestPaintingCool2:: + .string "Hey, there!\n" + .string "The good-looking POKéMON {STR_VAR_1}$" + +gContestPaintingCool3:: + .string "The marvelous, wonderful, and\n" + .string "very great {STR_VAR_1}$" + +gContestPaintingBeauty1:: + .string "This century's last Venus--\n" + .string "the beautiful {STR_VAR_1}$" + +gContestPaintingBeauty2:: + .string "{STR_VAR_1}'s dazzling,\n" + .string "glittering smile$" + +gContestPaintingBeauty3:: + .string "POKéMON CENTER's super idol--\n" + .string "the incomparable {STR_VAR_1}$" + +gContestPaintingCute1:: + .string "The lovely and sweet {STR_VAR_1}$" + +gContestPaintingCute2:: + .string "The pretty {STR_VAR_1}'s\n" + .string "winning portrait$" + +gContestPaintingCute3:: + .string "Give us a wink!\n" + .string "The cutie POKéMON {STR_VAR_1}$" + +gContestPaintingSmart1:: + .string "The smartness maestro--\n" + .string "the wise POKéMON {STR_VAR_1}$" + +gContestPaintingSmart2:: + .string "{STR_VAR_1}--the one chosen\n" + .string "above all POKéMON$" + +gContestPaintingSmart3:: + .string "The excellent {STR_VAR_1}'s\n" + .string "moment of elegance$" + +gContestPaintingTough1:: + .string "The powerfully muscular\n" + .string "speedster {STR_VAR_1}$" + +gContestPaintingTough2:: + .string "The strong, stronger, and\n" + .string "strongest {STR_VAR_1}$" + +gContestPaintingTough3:: + .string "The mighty tough\n" + .string "hyper POKéMON {STR_VAR_1}$" diff --git a/data/text/frontier_brain.inc b/data/text/frontier_brain.inc new file mode 100644 index 000000000..3a9c897f0 --- /dev/null +++ b/data/text/frontier_brain.inc @@ -0,0 +1,101 @@ +gText_082C843F:: @ 82C843F + .string "It's very disappointing…$" + +gText_082C8458:: @ 82C8458 + .string "Okay, I understand…$" + +gText_082C846C:: @ 82C846C + .string "I'm terribly sorry…$" + +gText_082C8480:: @ 82C8480 + .string "Thank you…$" + +gText_082C848B:: @ 82C848B + .string "Ahahaha! Aren't you embarrassed?\n" + .string "Everyone's watching!$" + +gText_082C84C1:: @ 82C84C1 + .string "Grr…\n" + .string "What the…$" + +gText_082C84D0:: @ 82C84D0 + .string "My DOME ACE title isn't just for show!$" + +gText_082C84F7:: @ 82C84F7 + .string "Ahahaha!\n" + .string "You're inspiring!$" + +gText_082C8512:: @ 82C8512 + .string "Way to work!\n" + .string "That was a good lesson, eh?$" + +gText_082C853B:: @ 82C853B + .string "Good job!\n" + .string "You know what you're doing!$" + +gText_082C8561:: @ 82C8561 + .string "Hey, hey, hey!\n" + .string "You're finished already?$" + +gText_082C8589:: @ 82C8589 + .string "What happened here?$" + +gText_082C859D:: @ 82C859D + .string "Humph…$" + +gText_082C85A4:: @ 82C85A4 + .string "Urk…$" + +gText_082C85A9:: @ 82C85A9 + .string "Hah!$" + +gText_082C85AE:: @ 82C85AE + .string "Darn!$" + +gText_082C85B4:: @ 82C85B4 + .string "Oh, come on!\n" + .string "You have to try harder than that!$" + +gText_082C85E3:: @ 82C85E3 + .string "No way!\n" + .string "Good job!$" + +gText_082C85F5:: @ 82C85F5 + .string "Heheh!\n" + .string "What did you expect?$" + +gText_082C8611:: @ 82C8611 + .string "Huh?\n" + .string "Are you serious?!$" + +gText_082C8628:: @ 82C8628 + .string "Your POKéMON are wimpy because\n" + .string "you're wimpy as a TRAINER!$" + +gText_082C8662:: @ 82C8662 + .string "Ah…\n" + .string "Now this is something else…$" + +gText_082C8682:: @ 82C8682 + .string "Gwahahaha!\n" + .string "My brethren, we have nothing to fear!$" + +gText_082C86B3:: @ 82C86B3 + .string "Gwah!\n" + .string "Hahahaha!$" + +gText_082C86C3:: @ 82C86C3 + .string "Hey! What's wrong with you!\n" + .string "Let's see some effort! Get up!$" + +gText_082C86FE:: @ 82C86FE + .string "That's it! You've done great!\n" + .string "You've worked hard for this!$" + +gText_082C8739:: @ 82C8739 + .string "Hey! Don't you give up now!\n" + .string "Get up! Don't lose faith in yourself!$" + +gText_082C877B:: @ 82C877B + .string "That's it! You've done it!\n" + .string "You kept working for this!$" diff --git a/data/text/mart_clerk.inc b/data/text/mart_clerk.inc new file mode 100644 index 000000000..2357963be --- /dev/null +++ b/data/text/mart_clerk.inc @@ -0,0 +1,10 @@ +gText_HowMayIServeYou:: @ 8272A21 + .string "Welcome!\p" + .string "How may I serve you?$" + +gText_PleaseComeAgain:: @ 8272A3F + .string "Please come again!$" + +gText_PlayerWhatCanIDoForYou:: @ 8272A52 + .string "{PLAYER}{STRING 5}, welcome!\p" + .string "What can I do for you?$" diff --git a/data/text/match_call.inc b/data/text/match_call.inc index 376f36750..a695b1b80 100644 --- a/data/text/match_call.inc +++ b/data/text/match_call.inc @@ -2306,7 +2306,7 @@ gText_Wallace_Pokenav_2B3790:: @ 82B3790 .string "But what is a rare stone exactly?\n" .string "All I can think of is a METEORITE…$" -MossdeepCity_SpaceCenter_2F_Text_2B38C1: @ 82B38C1 +MossdeepCity_SpaceCenter_2F_Text_MayRayquazaCall: @ 82B38C1 .string "… … … … … …\n" .string "… … … … … Beep!\p" .string "MAY: Hi, {PLAYER}{KUN}!\p" @@ -2321,7 +2321,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B38C1: @ 82B38C1 .string "… … … … … …\n" .string "… … … … … Click!$" -MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6 +MossdeepCity_SpaceCenter_2F_Text_BrendanRayquazaCall: @ 82B39C6 .string "… … … … … …\n" .string "… … … … … Beep!\p" .string "BRENDAN: Hey, {PLAYER}!\n" diff --git a/data/text/mauville_man.inc b/data/text/mauville_man.inc new file mode 100644 index 000000000..6326f5d8c --- /dev/null +++ b/data/text/mauville_man.inc @@ -0,0 +1,63 @@ +@ Only contains a portion of the mauville_man text. The rest is in scripts/mauville_man.inc +gText_SoPretty:: @ 8294295 + .string " so pretty!$" + +gText_SoDarling:: @ 82942A1 + .string " so darling!$" + +gText_SoRelaxed:: @ 82942AE + .string " so relaxed!$" + +gText_SoSunny:: @ 82942BB + .string " so sunny!$" + +gText_SoDesirable:: @ 82942C6 + .string " so desirable!$" + +gText_SoExciting:: @ 82942D5 + .string " so exciting!$" + +gText_SoAmusing:: @ 82942E3 + .string " so amusing!$" + +gText_SoMagical:: @ 82942F0 + .string " so magical!$" + +gOtherText_Is:: @ 82942FD + .string " is$" + +gOtherText_DontYouAgree:: @ 8294301 + .string "\n" + .string "Don't you agree?$" + +gMauvilleManText_ISoWantToGoOnAVacation:: @ 8294313 + .string "I so want to go on a vacation.\n" + .string "Would you happen to know a nice place?$" + +gMauvilleManText_IBoughtCrayonsWith120Colors:: @ 8294359 + .string "I bought crayons with 120 colors!\n" + .string "Don't you think that's nice?$" + +gMauvilleManText_WouldntItBeNiceIfWeCouldFloat:: @ 8294398 + .string "Wouldn't it be nice if we could float\n" + .string "away on a cloud of bubbles?$" + +gMauvilleManText_WhenYouWriteOnASandyBeach:: @ 82943DA + .string "When you write on a sandy beach,\n" + .string "they wash away. It makes me sad.$" + +gMauvilleManText_WhatsTheBottomOfTheSeaLike:: @ 829441C + .string "What's the bottom of the sea like?\n" + .string "Just once I would so love to go!$" + +gMauvilleManText_WhenYouSeeTheSettingSunDoesIt:: @ 8294460 + .string "When you see the setting sun, does it\n" + .string "make you want to go home?$" + +gMauvilleManText_LyingBackInTheGreenGrass:: @ 82944A0 + .string "Lying back in the green grass…\n" + .string "Oh, it's so, so nice!$" + +gMauvilleManText_SecretBasesAreSoWonderful:: @ 82944D5 + .string "SECRET BASES are so wonderful!\n" + .string "Can't you feel the excitement?$" diff --git a/data/text/mevent.inc b/data/text/mevent.inc new file mode 100644 index 000000000..ae4032eb4 --- /dev/null +++ b/data/text/mevent.inc @@ -0,0 +1,43 @@ +Mevent_Text_FillOutQuestionnaire:: @ 827339F + .string "There is a questionnaire.\n" + .string "Would you like to fill it out?$" + +Mevent_Text_QuestionnaireThankYou:: @ 82733D8 + .string "Thank you for taking the time to\n" + .string "fill out our questionnaire.\p" + .string "Your feedback will be used for\n" + .string "future reference.$" + +Mevent_Text_YouKnowThoseWordsGift:: @ 8273446 + .string "Oh, hello!\n" + .string "You know those words?\p" + .string "That means you must know about\n" + .string "the MYSTERY GIFT.\p" + .string "From now on, you should be\n" + .string "receiving MYSTERY GIFTS!$" + +Mevent_Text_YouCanAccessMysteryGift:: @ 82734CC + .string "Once you save your game, you can\n" + .string "access the MYSTERY GIFT.$" + +Mevent_Text_YouKnowThoseWordsEvent:: @ 8273506 + .string "Oh, hello!\n" + .string "You know those words?\p" + .string "That means you must know about\n" + .string "the MYSTERY EVENT.$" + +Mevent_Text_YouCanAccessMysteryEvent:: @ 8273559 + .string "Once you save your game, you can\n" + .string "access the MYSTERY EVENT.$" + +Mevent_Text_TheresATicketForYou:: @ 8273594 + .string "Thank you for using the MYSTERY\n" + .string "EVENT System.\p" + .string "You must be {PLAYER}.\n" + .string "There is a ticket here for you.$" + +Mevent_Text_TryUsingItAtLilycovePort:: @ 82735F2 + .string "It appears to be for use at\n" + .string "the LILYCOVE CITY port.\p" + .string "Why not give it a try and see what\n" + .string "it is about?$" diff --git a/data/text/move_tutors.inc b/data/text/move_tutors.inc new file mode 100644 index 000000000..baadad73d --- /dev/null +++ b/data/text/move_tutors.inc @@ -0,0 +1,237 @@ +MoveTutor_Text_ThisMoveCanOnlyBeLearnedOnce: @ 82C6E05 + .string "This move can be learned only\n" + .string "once. Is that okay?$" + +MoveTutor_Text_SwaggerTeach: @ 82C6E37 + .string "Heh! My POKéMON totally rules!\n" + .string "It's cooler than any POKéMON!\p" + .string "I was lipping off with a swagger in\n" + .string "my step like that when the CHAIRMAN\l" + .string "chewed me out.\p" + .string "That took the swagger out of my step.\p" + .string "If you'd like, I'll teach the move\n" + .string "SWAGGER to a POKéMON of yours.$" + +MoveTutor_Text_SwaggerDeclined: @ 82C6F33 + .string "What, no? Can't you get into\n" + .string "the spirit of things?$" + +MoveTutor_Text_SwaggerWhichMon: @ 82C6F66 + .string "All right, which POKéMON wants to\n" + .string "learn how to SWAGGER?$" + +MoveTutor_Text_SwaggerTaught: @ 82C6F9E + .string "I'll just praise my POKéMON from now\n" + .string "on without the swagger.$" + +MoveTutor_Text_RolloutTeach: @ 82C6FDB + .string "Did you know that you can go from\n" + .string "here a long way in that direction\l" + .string "without changing direction?\p" + .string "I might even be able to roll\n" + .string "that way.\p" + .string "Do you think your POKéMON will\n" + .string "want to roll, too?\p" + .string "I can teach one the move ROLLOUT\n" + .string "if you'd like.$" + +MoveTutor_Text_RolloutDeclined: @ 82C70C4 + .string "You don't need to be shy about it.\n" + .string "Let's roll!$" + +MoveTutor_Text_RolloutWhichMon: @ 82C70F3 + .string "Ehehe, sure thing! It'd be great if\n" + .string "the POKéMON looked like me.$" + +MoveTutor_Text_RolloutTaught: @ 82C7133 + .string "Rolling around in the grass makes me\n" + .string "happy. Come on, let's roll!$" + +MoveTutor_Text_FuryCutterTeach: @ 82C7174 + .string "There's a move that gets stronger\n" + .string "when you keep using it in a row.\p" + .string "It's a BUG-type move, and it is\n" + .string "wickedly cool.\p" + .string "It's called FURY CUTTER.\n" + .string "Want me to teach it to a POKéMON?$" + +MoveTutor_Text_FuryCutterDeclined: @ 82C7221 + .string "We're not on the same wavelength.$" + +MoveTutor_Text_FuryCutterWhichMon: @ 82C7243 + .string "Yay!\n" + .string "Show me which POKéMON I should teach.$" + +MoveTutor_Text_FuryCutterTaught: @ 82C726E + .string "I get a thrill watching to see if\n" + .string "the move keeps hitting in succession!$" + +MoveTutor_MimicTeach: @ 82C72B6 + .string "Ah, young one!\p" + .string "I am also a young one, but I mimic\n" + .string "the styles and speech of the elderly\l" + .string "folks of this town.\p" + .string "What do you say, young one?\n" + .string "Would you agree to it if I were to\l" + .string "offer to teach the move MIMIC?$" + +MoveTutor_MimicDeclined: @ 82C737F + .string "Oh, boo! I wanted to teach MIMIC\n" + .string "to your POKéMON!$" + +MoveTutor_Text_MimicWhichMon: @ 82C73B1 + .string "Fwofwo! And so I shall!\n" + .string "Let me see the POKéMON\l" + .string "you wish me to teach.$" + +MoveTutor_Text_MimicTaught: @ 82C73F6 + .string "MIMIC is a move of great depth.\p" + .string "Could you execute it to perfection\n" + .string "as well as me…?$" + +MoveTutor_Text_MetronomeTeach: @ 82C7449 + .string "I want all sorts of things!\n" + .string "But I used up my allowance…\p" + .string "Wouldn't it be nice if there were\n" + .string "a spell that made money appear when\l" + .string "you waggle a finger?\p" + .string "If you want, I can teach your POKéMON\n" + .string "the move METRONOME.\p" + .string "Money won't appear, but your POKéMON\n" + .string "will waggle a finger. Yes?$" + +MoveTutor_Text_MetronomeDeclined: @ 82C7556 + .string "Okay. I'll be here if you change\n" + .string "your mind.$" + +MoveTutor_Text_MetronomeWhichMon: @ 82C7582 + .string "Okay! I'll teach it!\n" + .string "Which POKéMON should I teach?$" + +MoveTutor_Text_MetronomeTaught: @ 82C75B5 + .string "When a POKéMON waggles its finger\n" + .string "like a METRONOME, all sorts of nice\l" + .string "things happen.\p" + .string "Wouldn't it be nice if we could\n" + .string "use it, too?$" + +MoveTutor_Text_SleepTalkTeach: @ 82C7637 + .string "Humph! My wife relies on HIDDEN\n" + .string "POWER to stay awake.\p" + .string "She should just take a nap like I do,\n" + .string "and SLEEP TALK.\p" + .string "I can teach your POKéMON how to\n" + .string "SLEEP TALK instead. Interested?$" + +MoveTutor_Text_SleepTalkDeclined: @ 82C76E2 + .string "Oh, fine, fine. You want to stay awake\n" + .string "with HIDDEN POWER, too…$" + +MoveTutor_Text_SleepTalkWhichMon: @ 82C7721 + .string "Ah, an appreciative child!\n" + .string "Which POKéMON should I teach?$" + +MoveTutor_Text_SleepTalkTaught: @ 82C775A + .string "I've never once gotten my wife's\n" + .string "coin trick right.\p" + .string "I would be happy if I got it right\n" + .string "even as I SLEEP TALK…$" + +MoveTutor_Text_SubstituteTeach: @ 82C77C6 + .string "When I see the wide world from up\n" + .string "here on the roof…\p" + .string "I think about how nice it would be\n" + .string "if there were more than just one me\l" + .string "so I could enjoy all sorts of lives.\p" + .string "Of course it's not possible.\n" + .string "Giggle…\p" + .string "I know! Would you be interested in\n" + .string "having a POKéMON learn SUBSTITUTE?$" + +MoveTutor_Text_SubstituteDeclined: @ 82C78D1 + .string "Oh, no?\p" + .string "A POKéMON can make a copy of\n" + .string "itself using it, you know.$" + +MoveTutor_Text_SubstituteWhichMon: @ 82C7911 + .string "Giggle…\n" + .string "Which POKéMON do you want me to\l" + .string "teach SUBSTITUTE?$" + +MoveTutor_Text_SubstituteTaught: @ 82C794B + .string "We human beings should enjoy our\n" + .string "own lives to the utmost!\p" + .string "I hope you'll get that way, too!$" + +MoveTutor_Text_DynamicPunchTeach: @ 82C79A6 + .string "I can't do this anymore!\p" + .string "It's utterly hopeless!\p" + .string "I'm a FIGHTING-type TRAINER,\n" + .string "so I can't win at the MOSSDEEP GYM\l" + .string "no matter how hard I try!\p" + .string "Argh! Punch! Punch! Punch!\n" + .string "Punch! Punch! Punch!\p" + .string "What, don't look at me that way!\n" + .string "I'm only hitting the ground!\p" + .string "Or do you want me to teach your\n" + .string "POKéMON DYNAMICPUNCH?$" + +MoveTutor_Text_DynamicPunchDeclined: @ 82C7AD4 + .string "Darn! You're even making fun of me?\n" + .string "Punch! Punch! Punch!$" + +MoveTutor_Text_DynamicPunchWhichMon: @ 82C7B0D + .string "What? You do? You're a good person!\n" + .string "Which POKéMON should I teach?$" + +MoveTutor_Text_DynamicPunchTaught: @ 82C7B4F + .string "I want you to win at the MOSSDEEP GYM\n" + .string "using that DYNAMICPUNCH!$" + +MoveTutor_Text_DoubleEdgeTeach: @ 82C7B8E + .string "Sigh…\p" + .string "SOOTOPOLIS's GYM LEADER is really\n" + .string "lovably admirable.\p" + .string "But that also means I have many\n" + .string "rivals for his attention.\p" + .string "He's got appeal with a DOUBLE-EDGE.\n" + .string "I couldn't even catch his eye.\p" + .string "Please, let me teach your POKéMON\n" + .string "the move DOUBLE-EDGE!$" + +MoveTutor_Text_DoubleEdgeDeclined: @ 82C7C7E + .string "Oh…\n" + .string "Even you rejected me…$" + +MoveTutor_Text_DoubleEdgeWhichMon: @ 82C7C98 + .string "Okay, which POKéMON should I teach\n" + .string "DOUBLE-EDGE?$" + +MoveTutor_Text_DoubleEdgeTaught: @ 82C7CC8 + .string "I won't live for love anymore!\n" + .string "I'll become tough!$" + +MoveTutor_Text_ExplosionTeach: @ 82C7CFA + .string "I don't intend to be going nowhere\n" + .string "fast in the sticks like this forever.\p" + .string "You watch me, I'll get out to the city\n" + .string "and become a huge hit.\p" + .string "Seriously, I'm going to cause\n" + .string "a huge EXPLOSION of popularity!\p" + .string "If you overheard that, I'll happily\n" + .string "teach EXPLOSION to your POKéMON!$" + +MoveTutor_Text_ExplosionDeclined: @ 82C7E04 + .string "Gaah! You're turning me down because\n" + .string "I live in the country?$" + +MoveTutor_Text_ExplosionWhichMon: @ 82C7E40 + .string "Fine! An EXPLOSION it is!\n" + .string "Which POKéMON wants to blow up?$" + +MoveTutor_Text_ExplosionTaught: @ 82C7E7A + .string "For a long time, I've taught POKéMON\n" + .string "how to use EXPLOSION, but I've yet\l" + .string "to ignite my own EXPLOSION…\p" + .string "Maybe it's because deep down,\n" + .string "I would rather stay here…$" diff --git a/data/text/obtain_item.inc b/data/text/obtain_item.inc new file mode 100644 index 000000000..d263388f5 --- /dev/null +++ b/data/text/obtain_item.inc @@ -0,0 +1,31 @@ +gText_ObtainedTheItem:: @ 8272A78 + .string "Obtained the {STR_VAR_2}!$" + +gText_TheBagIsFull:: @ 8272A89 + .string "The BAG is full…$" + +gText_PutItemInPocket:: @ 8272A9A + .string "{PLAYER} put away the {STR_VAR_2}\n" + .string "in the {STR_VAR_3} POCKET.$" + +gText_PlayerFoundOneItem:: @ 8272ABF + .string "{PLAYER} found one {STR_VAR_2}!$" + +gText_TooBadBagIsFull:: @ 8272AD0 + .string "Too bad!\n" + .string "The BAG is full…$" + +gText_PlayerPutItemInBag:: @ 8272AEA + .string "{PLAYER} put away the {STR_VAR_2}\n" + .string "in the BAG.$" + +gText_ObtainedTheDecor:: @ 8272B09 + .string "Obtained the {STR_VAR_2}!$" + +gText_NoRoomLeftForAnother:: @ 8272B1A + .string "Too bad! There's no room left for\n" + .string "another {STR_VAR_2}…$" + +gText_TheDecorWasTransferredToThePC:: @ 8272B48 + .string "The {STR_VAR_2} was transferred\n" + .string "to the PC.$" diff --git a/data/text/pc.inc b/data/text/pc.inc new file mode 100644 index 000000000..5367632b5 --- /dev/null +++ b/data/text/pc.inc @@ -0,0 +1,17 @@ +Text_BootUpPC: @ 827265A + .string "{PLAYER} booted up the PC.$" + +gText_WhichPCShouldBeAccessed:: @ 827266F + .string "Which PC should be accessed?$" + +gText_AccessedSomeonesPC:: @ 827268C + .string "Accessed SOMEONE'S PC.$" + +gText_StorageSystemOpened:: @ 82726A3 + .string "POKéMON Storage System opened.$" + +gText_AccessedPlayersPC:: @ 82726C2 + .string "Accessed {PLAYER}'s PC.$" + +gText_AccessedLanettesPC:: @ 82726D4 + .string "Accessed LANETTE's PC.$" diff --git a/data/text/pc_transfer.inc b/data/text/pc_transfer.inc new file mode 100644 index 000000000..216e0b570 --- /dev/null +++ b/data/text/pc_transfer.inc @@ -0,0 +1,31 @@ +gText_PkmnTransferredSomeonesPC:: @ 8273216 + .string "{STR_VAR_2} was transferred to\n" + .string "SOMEONE'S PC.\p" + .string "It was placed in \n" + .string "BOX “{STR_VAR_1}.”$" + +gText_PkmnTransferredLanettesPC:: @ 8273256 + .string "{STR_VAR_2} was transferred to\nLANETTE'S PC.\p" + .string "It was placed in \n" + .string "BOX “{STR_VAR_1}.”$" + +gText_PkmnTransferredSomeonesPCBoxFull:: @ 8273296 + .string "BOX “{STR_VAR_3}” on\n" + .string "SOMEONE'S PC was full.\p" + .string "{STR_VAR_2} was transferred to\n" + .string "BOX “{STR_VAR_1}.”$" + +gText_PkmnTransferredLanettesPCBoxFull:: @ 82732D9 + .string "BOX “{STR_VAR_3}” on\n" + .string "LANETTE'S PC was full.\p" + .string "{STR_VAR_2} was transferred to\n" + .string "BOX “{STR_VAR_1}.”$" + +gText_NoMoreRoomForPokemon:: @ 827331C + .string "There's no more room for POKéMON!\p" + .string "The POKéMON BOXES are full and\n" + .string "can't accept any more!$" + +gText_NicknameThisPokemon:: @ 8273374 + .string "Do you want to give a nickname to\n" + .string "this {STR_VAR_1}?$" diff --git a/data/text/pkmn_center_nurse.inc b/data/text/pkmn_center_nurse.inc new file mode 100644 index 000000000..1c2837203 --- /dev/null +++ b/data/text/pkmn_center_nurse.inc @@ -0,0 +1,51 @@ +gText_WouldYouLikeToRestYourPkmn:: @ 82726EB + .string "Hello, and welcome to\n" + .string "the POKéMON CENTER.\p" + .string "We restore your tired POKéMON\n" + .string "to full health.\p" + .string "Would you like to rest your POKéMON?$" + +gText_IllTakeYourPkmn:: @ 8272768 + .string "Okay, I'll take your POKéMON\n" + .string "for a few seconds.$" + +gText_RestoredPkmnToFullHealth:: @ 8272798 + .string "Thank you for waiting.\p" + .string "We've restored your POKéMON\n" + .string "to full health.$" + +gText_WeHopeToSeeYouAgain:: @ 82727DB + .string "We hope to see you again!$" + +gText_WelcomeCutShort:: @ 82727F5 + .string "Hello, and welcome to\n" + .string "the POKéMON CENTER.\p" + .string "We restore your tired POKéMON\n" + .string "to full health.\p" + .string "Would you like to…$" + +gText_NoticesGoldCard:: @ 8272860 + .string "Th-that card…\n" + .string "Could it be… The GOLD CARD?!\p" + .string "Oh, the gold color is brilliant!\n" + .string "The four stars seem to sparkle!\p" + .string "I've seen several TRAINERS with\n" + .string "a SILVER CARD before, but, {PLAYER},\l" + .string "you're the first TRAINER I've ever\l" + .string "seen with a GOLD CARD!\p" + .string "Okay, {PLAYER}, please allow me\n" + .string "the honor of resting your POKéMON!$" + +gText_YouWantTheUsual:: @ 8272982 + .string "I'm delighted to see you, {PLAYER}!\n" + .string "You want the usual, am I right?$" + +gText_IllTakeYourPkmn2:: @ 82729C0 + .string "Okay, I'll take your POKéMON\n" + .string "for a few seconds.$" + +gText_ThankYouForWaiting:: @ 82729F0 + .string "Thank you for waiting.$" + +gText_WeHopeToSeeYouAgain2:: @ 8272A07 + .string "We hope to see you again!$" diff --git a/data/text/pokedex_rating.inc b/data/text/pokedex_rating.inc index d61f364e9..4c6c3f2b6 100644 --- a/data/text/pokedex_rating.inc +++ b/data/text/pokedex_rating.inc @@ -1,13 +1,13 @@ -gUnknown_082A5C9C:: @ 82A5C9C +gBirchDexRatingText_AreYouCurious:: @ 82A5C9C .string "PROF. BIRCH: Ah, {PLAYER}{KUN}!\p" .string "Are you curious about how your\n" .string "POKéDEX is coming along?$" -Route101_Text_2A5CEB: @ 82A5CEB +gBirchDexRatingText_Cancel: @ 82A5CEB .string "Hm? Oh, you haven't caught enough\n" .string "POKéMON to make it worthwhile.$" -gUnknown_082A5D2C:: @ 82A5D2C +gBirchDexRatingText_SoYouveSeenAndCaught:: @ 82A5D2C .string "Hmhm…\p" .string "So, you've seen {STR_VAR_1} POKéMON,\n" .string "and you've caught {STR_VAR_2} POKéMON…$" @@ -108,7 +108,7 @@ gBirchDexRatingText_DexCompleted:: @ 82A6312 .string "Congratulations!\n" .string "Your POKéDEX is complete!$" -gUnknown_082A633D:: @ 82A633D +gBirchDexRatingText_OnANationwideBasis:: @ 82A633D .string "Hmhm…\n" .string "On a nationwide basis…\p" .string "You've seen {STR_VAR_1} POKéMON,\n" diff --git a/data/text/record_mix.inc b/data/text/record_mix.inc new file mode 100644 index 000000000..1270c0c0a --- /dev/null +++ b/data/text/record_mix.inc @@ -0,0 +1,6 @@ +Text_WouldYouLikeToMixRecords: @ 827260D + .string "Would you like to mix records with\n" + .string "other TRAINERS?$" + +Text_WeHopeToSeeYouAgain: @ 8272640 + .string "We hope to see you again!$" diff --git a/data/text/roulette.inc b/data/text/roulette.inc deleted file mode 100644 index 7f1ab1cec..000000000 --- a/data/text/roulette.inc +++ /dev/null @@ -1,41 +0,0 @@ -gUnknown_082A5B12:: @ 82A5B12 - .string "The minimum wager at this table\n" - .string "is {STR_VAR_1}. Do you want to play?$" - -gUnknown_082A5B4E:: @ 82A5B4E - .string "You don't have enough COINS.$" - -gUnknown_082A5B6B:: @ 82A5B6B - .string "Special rate table right now!$" - -gUnknown_082A5B89:: @ 82A5B89 - .string "Place your wager with the + Control\n" - .string "Pad, then press the A Button.$" - -gUnknown_082A5BCB:: @ 82A5BCB - .string "It's a hit!$" - -gUnknown_082A5BD7:: @ 82A5BD7 - .string "Jackpot!$" - -gUnknown_082A5BE0:: @ 82A5BE0 - .string "Nothing doing!$" - -gUnknown_082A5BEF:: @ 82A5BEF - .string "You've won {STR_VAR_1} COINS!$" - -gUnknown_082A5C04:: @ 82A5C04 - .string "No COINS left…$" - -gUnknown_082A5C13:: @ 82A5C13 - .string "Keep playing?$" - -gUnknown_082A5C21:: @ 82A5C21 - .string "The ROULETTE board will be cleared.$" - -gUnknown_082A5C45:: @ 82A5C45 - .string "You don't have a COIN CASE.$" - -gUnknown_082A5C61:: @ 82A5C61 - .string "Your COIN CASE is full!\n" - .string "Coins can be exchanged for prizes.$" diff --git a/data/text/save.inc b/data/text/save.inc index bef7f3d6b..4719f34d3 100644 --- a/data/text/save.inc +++ b/data/text/save.inc @@ -1,3 +1,4 @@ + .align 2 gText_ConfirmSave:: @ 82C87B4 .string "Would you like to save the game?$" diff --git a/data/text/secret_base_trainers.inc b/data/text/secret_base_trainers.inc new file mode 100644 index 000000000..46ecaaec9 --- /dev/null +++ b/data/text/secret_base_trainers.inc @@ -0,0 +1,286 @@ +SecretBase_Text_Trainer0PreBattle: @ 82748A0 + .string "Have you made a SECRET BASE already?\p" + .string "I went here, there, everywhere before\n" + .string "choosing this place.\p" + .string "Since you're already here, how would\n" + .string "you like to battle?$" + +SecretBase_Text_Trainer0AcceptBattle: @ 8274939 + .string "Okay!\n" + .string "Here we come!$" + +SecretBase_Text_Trainer0DeclineBattle: @ 827494D + .string "Hunh?\n" + .string "Oh, you can't now…$" + +SecretBase_Text_Trainer0Defeated:: @ 8274966 + .string "Waaargh! You're too strong!\n" + .string "About me losing… Please keep it secret!$" + +SecretBase_Text_Trainer0PostBattle: @ 82749AA + .string "What do you think of my SECRET BASE?\n" + .string "Come visit me again tomorrow.$" + +SecretBase_Text_Trainer0PreChampion: @ 82749ED + .string "Have you made a SECRET BASE already?\p" + .string "I went here, there, everywhere before\n" + .string "choosing this place.\p" + .string "Feel free to hang out!$" + +SecretBase_Text_Trainer5PreBattle: @ 8274A64 + .string "There're a lot of places where\n" + .string "you can make a SECRET BASE.\p" + .string "But I like this spot best.\n" + .string "Don't you think it's nice?\p" + .string "Oh, would you like to have a battle?$" + +SecretBase_Text_Trainer5AcceptBattle: @ 8274AFA + .string "Okay, here goes!$" + +SecretBase_Text_Trainer5DeclineBattle: @ 8274B0B + .string "Oh…\n" + .string "You can't now, okay.$" + +SecretBase_Text_Trainer5Defeated:: @ 8274B24 + .string "Hmmm… It's our loss…\n" + .string "But don't tell anyone!\l" + .string "It's a confidential secret!$" + +SecretBase_Text_Trainer5PostBattle: @ 8274B6C + .string "If you're in this area again,\n" + .string "I hope you'll visit me.$" + +SecretBase_Text_Trainer5PreChampion: @ 8274BA2 + .string "There're a lot of places where you can\n" + .string "make a SECRET BASE.\p" + .string "But I like this spot best.\n" + .string "Don't you think it's nice?$" + +SecretBase_Text_Trainer1PreBattle: @ 8274C13 + .string "This is a popular spot.\n" + .string "It's always taken.\p" + .string "Oh! Were you thinking about\n" + .string "taking this spot, too?\p" + .string "I'll tell you what, you can have this\n" + .string "spot if you can beat me.$" + +SecretBase_Text_Trainer1AcceptBattle: @ 8274CB0 + .string "Okay!\n" + .string "I'm going to defend my SECRET BASE!$" + +SecretBase_Text_Trainer1DeclineBattle: @ 8274CDA + .string "Hunh? Is that right?\n" + .string "You're not interested in this spot?$" + +SecretBase_Text_Trainer1Defeated:: @ 8274D13 + .string "I can't keep going!\n" + .string "I surrender!$" + +SecretBase_Text_Trainer1PostBattle: @ 8274D34 + .string "Okay, when I move one day,\n" + .string "this place will be yours!$" + +SecretBase_Text_Trainer1PreChampion: @ 8274D69 + .string "This is a popular spot.\n" + .string "It's always taken.\p" + .string "I waited a long time for it to open.\n" + .string "I finally got to use it!$" + +SecretBase_Text_Trainer6PreBattle: @ 8274DD2 + .string "Welcome to my POKéMON LAB.\p" + .string "I carry out research on battling in\n" + .string "secrecy.\p" + .string "Would you like to see how strong I am?$" + +SecretBase_Text_Trainer6AcceptBattle: @ 8274E41 + .string "I'm going to go all out!$" + +SecretBase_Text_Trainer6DeclineBattle: @ 8274E5A + .string "Oh.\n" + .string "Some other time, then!$" + +SecretBase_Text_Trainer6Defeated:: @ 8274E75 + .string "Hmm… I've still got lots to learn.\n" + .string "I have to study some more.$" + +SecretBase_Text_Trainer6PostBattle: @ 8274EB3 + .string "Thanks for battling with me.\n" + .string "Please come back again tomorrow.$" + +SecretBase_Text_Trainer6PreChampion: @ 8274EF1 + .string "Welcome to my POKéMON LAB.\p" + .string "I carry out research on battling in\n" + .string "secrecy.$" + +SecretBase_Text_Trainer2PreBattle: @ 8274F39 + .string "A big mansion is nice, but I like this\n" + .string "sort of place more.\p" + .string "I like it because all kinds of people\n" + .string "come visit me.\p" + .string "So, how would you like a battle?$" + +SecretBase_Text_Trainer2AcceptBattle: @ 8274FCA + .string "That's the way!$" + +SecretBase_Text_Trainer2DeclineBattle: @ 8274FDA + .string "When you're ready, give me a shout!$" + +SecretBase_Text_Trainer2Defeated:: @ 8274FFE + .string "Aww! Done in!\n" + .string "But it's still fun to battle!$" + +SecretBase_Text_Trainer2PostBattle: @ 827502A + .string "Well, anyway, I should go buy some\n" + .string "decorations and furniture.\p" + .string "I want my SECRET BASE to be a place\n" + .string "other people can enjoy.$" + +SecretBase_Text_Trainer2PreChampion: @ 82750A4 + .string "A big mansion is nice, but I like this\n" + .string "sort of place more.\p" + .string "I like it because all kinds of people\n" + .string "come visit me.$" + +SecretBase_Text_Trainer7PreBattle: @ 8275114 + .string "I simply adore shopping for decorations\n" + .string "and furniture.\p" + .string "I also love raising POKéMON just\n" + .string "as much.\p" + .string "If you would be so kind, will you battle\n" + .string "with my POKéMON?$" + +SecretBase_Text_Trainer7AcceptBattle: @ 82751AF + .string "Thank you.\n" + .string "Shall we begin?$" + +SecretBase_Text_Trainer7DeclineBattle: @ 82751CA + .string "Oh.\n" + .string "How disappointing…$" + +SecretBase_Text_Trainer7Defeated:: @ 82751E1 + .string "I concede…$" + +SecretBase_Text_Trainer7PostBattle: @ 82751EC + .string "That was all in good fun!\n" + .string "I should go enjoy shopping now.$" + +SecretBase_Text_Trainer7PreChampion: @ 8275226 + .string "I simply adore shopping for decorations\n" + .string "and furniture.\p" + .string "I also love raising POKéMON just\n" + .string "as much.$" + +SecretBase_Text_Trainer3PreBattle: @ 8275287 + .string "Some people make their SECRET BASES in\n" + .string "hard-to-find places.\l" + .string "Do they want to just lie low?\p" + .string "But since you found me, how about we\n" + .string "have a battle?$" + +SecretBase_Text_Trainer3AcceptBattle: @ 8275315 + .string "I'm not going down easily!$" + +SecretBase_Text_Trainer3DeclineBattle: @ 8275330 + .string "Oh… Are you maybe tired from searching\n" + .string "for this place?$" + +SecretBase_Text_Trainer3Defeated:: @ 8275367 + .string "I went down…$" + +SecretBase_Text_Trainer3PostBattle: @ 8275374 + .string "Where's your SECRET BASE?\n" + .string "I should go visit you there.$" + +SecretBase_Text_Trainer3PreChampion: @ 82753AB + .string "Some people make their SECRET BASES in\n" + .string "hard-to-find places.\l" + .string "Do they want to just lie low?$" + +SecretBase_Text_Trainer8PreBattle: @ 8275405 + .string "People have told me that you can get\n" + .string "decorations in several ways.\p" + .string "We should have a race to see who can\n" + .string "get nicer decorations and furniture!\p" + .string "In the meantime, want to battle?$" + +SecretBase_Text_Trainer8AcceptBattle: @ 82754B2 + .string "This is my SECRET BASE.\n" + .string "I can't lose!$" + +SecretBase_Text_Trainer8DeclineBattle: @ 82754D8 + .string "I'll battle with you anytime.$" + +SecretBase_Text_Trainer8Defeated:: @ 82754F6 + .string "Huh?\n" + .string "Did I just lose?$" + +SecretBase_Text_Trainer8PostBattle: @ 827550C + .string "I won't lose at collecting decorations.\n" + .string "Come visit again!$" + +SecretBase_Text_Trainer8PreChampion: @ 8275546 + .string "People have told me that you can get\n" + .string "decorations in several ways.\p" + .string "We should have a race to see who can\n" + .string "get nicer decorations and furniture!$" + +SecretBase_Text_Trainer4PreBattle: @ 82755D2 + .string "I found a spot I liked, and I did it up\n" + .string "with my favorite decorations.\p" + .string "I raise my favorite POKéMON and grow\n" + .string "stronger with it.\p" + .string "That's what I do.\n" + .string "Want to battle with me?$" + +SecretBase_Text_Trainer4AcceptBattle: @ 8275679 + .string "Show me what you're made of!$" + +SecretBase_Text_Trainer4DeclineBattle: @ 8275696 + .string "I guess there are times when you're not\n" + .string "into it.$" + +SecretBase_Text_Trainer4Defeated:: @ 82756C7 + .string "I know exactly what you're made of now.$" + +SecretBase_Text_Trainer4PostBattle: @ 82756EF + .string "We can both become stronger.\n" + .string "Let's keep at it!$" + +SecretBase_Text_Trainer4PreChampion: @ 827571E + .string "I found a spot I liked, and I did it up\n" + .string "with my favorite decorations.\p" + .string "I raise my favorite POKéMON and grow\n" + .string "stronger with it.\p" + .string "Every day is a great day.$" + +SecretBase_Text_Trainer9PreBattle: @ 82757B5 + .string "You can learn a lot about the taste\n" + .string "and sense of people by the kinds of\l" + .string "decorations they have, and how they\l" + .string "display them.\p" + .string "What do you think of my taste?\n" + .string "Are you speechless?\p" + .string "Want to see my taste in battling?$" + +SecretBase_Text_Trainer9AcceptBattle: @ 8275884 + .string "There's no holding back!$" + +SecretBase_Text_Trainer9DeclineBattle: @ 827589D + .string "I'll be happy to demonstrate my style\n" + .string "anytime.$" + +SecretBase_Text_Trainer9Defeated:: @ 82758CC + .string "You're supremely talented!\n" + .string "Your power seems to be limitless…$" + +SecretBase_Text_Trainer9PostBattle: @ 8275909 + .string "What did you think of my style?\n" + .string "I'll keep on polishing it!$" + +SecretBase_Text_Trainer9PreChampion: @ 8275944 + .string "You can learn a lot about the taste\n" + .string "and sense of people by the kinds of\l" + .string "decorations they have, and how they\l" + .string "display them.\p" + .string "What do you think of my taste?\n" + .string "Are you speechless?$" diff --git a/data/text/trainers.inc b/data/text/trainers.inc index a6432006c..3e835ccd1 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -1,245 +1,245 @@ -Route102_Text_294513: @ 8294513 +Route102_Text_CalvinIntro: @ 8294513 .string "If you have POKéMON with you, then\n" .string "you're an official POKéMON TRAINER!\l" .string "You can't say no to my challenge!$" -Route102_Text_29457C: @ 829457C +Route102_Text_CalvinDefeated: @ 829457C .string "Arrgh, I lost…\n" .string "I should have trained mine more…$" -Route102_Text_2945AC: @ 82945AC +Route102_Text_CalvinPostBattle: @ 82945AC .string "Listen, you. If you're strong,\n" .string "you should have told me before!$" -Route102_Text_2945EB: @ 82945EB +Route102_Text_CalvinRegister: @ 82945EB .string "I've been working hard at this since\n" .string "I saw you before.\p" .string "I'd like to battle you again, so can\n" .string "you register me in your POKéNAV?$" -Route102_Text_294668: @ 8294668 +Route102_Text_CalvinRegisterShort: @ 8294668 .string "I'd like to battle you again, so can\n" .string "you register me in your POKéNAV?$" -Route102_Text_2946AE: @ 82946AE +Route102_Text_CalvinRematchIntro: @ 82946AE .string "Ever since I lost to you, I desperately\n" .string "trained my POKéMON.\l" .string "You can't say no to my challenge!$" -Route102_Text_29470C: @ 829470C +Route102_Text_CalvinRematchDefeated: @ 829470C .string "Arrgh, I lost…\n" .string "Is my training method not right?$" -Route102_Text_29473C: @ 829473C +Route102_Text_CalvinRematchPostBattle: @ 829473C .string "If you're going to get stronger,\n" .string "I'll get stronger, too.$" -Route102_Text_294775: @ 8294775 +Route102_Text_AllenIntro: @ 8294775 .string "Did you just become a TRAINER?\n" .string "We're both beginners!$" -Route102_Text_2947AA: @ 82947AA +Route102_Text_AllenDefeated: @ 82947AA .string "I called you because I thought\n" .string "I could beat you…$" -Route102_Text_2947DB: @ 82947DB +Route102_Text_AllenPostBattle: @ 82947DB .string "I haven't won once yet…\n" .string "I wish I would win soon…$" -Route102_Text_29480C: @ 829480C +Route102_Text_RickIntro: @ 829480C .string "Hahah! Our eyes met!\n" .string "I'll take you on with my BUG POKéMON!$" -Route102_Text_294847: @ 8294847 +Route102_Text_RickDefeated: @ 8294847 .string "Ow! Down and out!$" -Route102_Text_294859: @ 8294859 +Route102_Text_RickPostBattle: @ 8294859 .string "If you lock eyes with a TRAINER,\n" .string "you have to challenge! It's a rule!$" -Route102_Text_29489E: @ 829489E +Route102_Text_TianaIntro: @ 829489E .string "I'm going to keep winning and aim\n" .string "to be the best TRAINER.\p" .string "Help me further my career!$" -Route102_Text_2948F3: @ 82948F3 +Route102_Text_TianaDefeated: @ 82948F3 .string "I ended up furthering your career…$" -Route102_Text_294916: @ 8294916 +Route102_Text_TianaPostBattle: @ 8294916 .string "To keep winning my way up, I see that\n" .string "I have to catch more POKéMON.$" -Route103_Text_29495A: @ 829495A +Route103_Text_DaisyIntro: @ 829495A .string "Did you feel the tug of our\n" .string "soul-soothing fragrance?$" -Route103_Text_29498F: @ 829498F +Route103_Text_DaisyDefeated: @ 829498F .string "You weren't led astray by our aroma…$" -Route103_Text_2949B4: @ 82949B4 +Route103_Text_DaisyPostBattle: @ 82949B4 .string "Aromatherapy is a form of mental\n" .string "healing that works with fragrances.$" -Route103_Text_2949F9: @ 82949F9 +Route103_Text_AmyIntro: @ 82949F9 .string "AMY: I'm AMY.\n" .string "And this is my little sister LIV.\l" .string "We battle together!$" -Route103_Text_294A3D: @ 8294A3D +Route103_Text_AmyDefeated: @ 8294A3D .string "AMY: Uh-oh, we lost.$" -Route103_Text_294A52: @ 8294A52 +Route103_Text_AmyPostBattle: @ 8294A52 .string "AMY: You have to think about all\n" .string "kinds of things when you're battling\l" .string "against two TRAINERS.$" -Route103_Text_294AAE: @ 8294AAE +Route103_Text_AmyNotEnoughPokemon: @ 8294AAE .string "AMY: Uh-oh, you have only one\n" .string "POKéMON with you.\l" .string "You can't battle us like that.$" -Route103_Text_294AFD: @ 8294AFD +Route103_Text_LivIntro: @ 8294AFD .string "LIV: We battle together as one\n" .string "team.$" -Route103_Text_294B22: @ 8294B22 +Route103_Text_LivDefeated: @ 8294B22 .string "LIV: Oh, we lost, big sister…$" -Route103_Text_294B40: @ 8294B40 +Route103_Text_LivPostBattle: @ 8294B40 .string "LIV: We work perfectly together,\n" .string "me and my big sister…\p" .string "But we still lost…$" -Route103_Text_294B8A: @ 8294B8A +Route103_Text_AmyLivRegister: @ 8294B8A .string "LIV: Really, we're a lot better…\n" .string "It's true! We'll show you next time!$" -Route103_Text_294BD0: @ 8294BD0 +Route103_Text_LivNotEnoughPokemon: @ 8294BD0 .string "LIV: If you want to battle us,\n" .string "you have to have two POKéMON!\l" .string "It's not fair if you don't!$" -Route103_Text_294C29: @ 8294C29 +Route103_Text_AmyRematchIntro: @ 8294C29 .string "AMY: I'm AMY.\n" .string "And this is my little sister LIV.\l" .string "We battle together!$" -Route103_Text_294C6D: @ 8294C6D +Route103_Text_AmyRematchDefeated: @ 8294C6D .string "AMY: Aww, boo!\n" .string "We couldn't win again…$" -Route103_Text_294C93: @ 8294C93 +Route103_Text_AmyRematchPostBattle: @ 8294C93 .string "AMY: You have to think about all\n" .string "kinds of things when you're battling\l" .string "against two TRAINERS.$" -Route103_Text_294CEF: @ 8294CEF +Route103_Text_AmyRematchNotEnoughPokemon: @ 8294CEF .string "AMY: Uh-oh, you have only one\n" .string "POKéMON with you.\l" .string "You can't battle us like that.$" -Route103_Text_294D3E: @ 8294D3E +Route103_Text_LivRematchIntro: @ 8294D3E .string "LIV: We battle together as one\n" .string "team.$" -Route103_Text_294D63: @ 8294D63 +Route103_Text_LivRematchDefeated: @ 8294D63 .string "LIV: Awww, we lost again…\n" .string "Big sister…$" -Route103_Text_294D89: @ 8294D89 +Route103_Text_LivRematchPostBattle: @ 8294D89 .string "LIV: We work perfectly together,\n" .string "me and my big sister…\p" .string "But why did we lose again?$" -Route103_Text_294DDB: @ 8294DDB +Route103_Text_LivRematchNotEnoughPokemon: @ 8294DDB .string "LIV: If you want to battle us, you\n" .string "have to have two POKéMON!\l" .string "It's not fair if you don't!$" -Route103_Text_294E34: @ 8294E34 +Route103_Text_AndrewIntro: @ 8294E34 .string "Gah! My fishing line's all snarled up!\n" .string "I'm getting frustrated and mean!\l" .string "That's it! Battle me!$" -Route103_Text_294E92: @ 8294E92 +Route103_Text_AndrewDefeated: @ 8294E92 .string "Gah! Lost it!\n" .string "I'm even more annoyed now!$" -Route103_Text_294EBB: @ 8294EBB +Route103_Text_AndrewPostBattle: @ 8294EBB .string "Gah, I'm still boiling mad…\n" .string "Grrrrr…$" -Route103_Text_294EDF: @ 8294EDF +Route103_Text_MiguelIntro: @ 8294EDF .string "My POKéMON is delightfully adorable!\n" .string "Don't be shy--I'll show you!$" -Route103_Text_294F21: @ 8294F21 +Route103_Text_MiguelDefeated: @ 8294F21 .string "Oh, my gosh!\n" .string "My darling POKéMON!$" -Route103_Text_294F42: @ 8294F42 +Route103_Text_MiguelPostBattle: @ 8294F42 .string "My delightful POKéMON looks darling\n" .string "even when it's fainted!$" -Route103_Text_294F7E: @ 8294F7E +Route103_Text_MiguelRegister: @ 8294F7E .string "I'll get you to come out and look in\n" .string "on my delightful POKéMON again!$" -Route103_Text_294FC3: @ 8294FC3 +Route103_Text_MiguelRematchIntro: @ 8294FC3 .string "Hi, you! My delightfully adorable\n" .string "POKéMON has become more darling!$" -Route103_Text_295006: @ 8295006 +Route103_Text_MiguelRematchDefeated: @ 8295006 .string "Oh!\n" .string "My darling POKéMON!$" -Route103_Text_29501E: @ 829501E +Route103_Text_MiguelRematchPostBattle: @ 829501E .string "The more I spend time with it,\n" .string "the more adorable my POKéMON becomes.$" -Route103_Text_295063: @ 8295063 +Route103_Text_PeteIntro: @ 8295063 .string "This sort of distance…\n" .string "You should just swim it!$" -Route103_Text_295093: @ 8295093 +Route103_Text_PeteDefeated: @ 8295093 .string "Oh, that's good going!$" -Route103_Text_2950AA: @ 82950AA +Route103_Text_PetePostBattle: @ 82950AA .string "Oh, I understand where you're coming\n" .string "from now.\p" .string "If I had a POKéMON that trusty,\n" .string "I'd want to SURF on it, too!$" -Route103_Text_295116: @ 8295116 +Route103_Text_IsabelleIntro: @ 8295116 .string "Watch where you're going!\n" .string "We're going to crash!$" -Route103_Text_295146: @ 8295146 +Route103_Text_IsabelleDefeated: @ 8295146 .string "Groan…$" -Route103_Text_29514D: @ 829514D +Route103_Text_IsabellePostBattle: @ 829514D .string "I'm a poor swimmer so I was practicing…\n" .string "Sorry for almost crashing into you.$" -Route103_Text_295199: @ 8295199 +Route103_Text_RhettIntro: @ 8295199 .string "Whoa!\n" .string "How'd you get into a space this small?$" -Route103_Text_2951C6: @ 82951C6 +Route103_Text_RhettDefeated: @ 82951C6 .string "Whoa!\n" .string "The kid can rock!$" -Route103_Text_2951DE: @ 82951DE +Route103_Text_RhettPostBattle: @ 82951DE .string "Do you like cramped quarters\n" .string "like this?$" -Route103_Text_295206: @ 8295206 +Route103_Text_MarcosIntro: @ 8295206 .string "Did my guitar's wailing draw you in?$" -Route103_Text_29522B: @ 829522B +Route103_Text_MarcosDefeated: @ 829522B .string "My one-man show is ruined…$" -Route103_Text_295246: @ 8295246 +Route103_Text_MarcosPostBattle: @ 8295246 .string "I was playing my guitar where few\n" .string "people were around, but a lot of fans\l" .string "have gathered.\p" @@ -427,808 +427,808 @@ Route104_Text_295CD3: @ 8295CD3 .string "Hey, MAGIKARP, you sure don't live up\n" .string "to your name, do you?$" -Route105_Text_295D0F: @ 8295D0F +Route105_Text_FosterIntro: @ 8295D0F .string "There's supposed to be a mystical\n" .string "rock around here.\l" .string "Do you know anything about it?$" -Route105_Text_295D62: @ 8295D62 +Route105_Text_FosterDefeated: @ 8295D62 .string "I was thinking too much about that\n" .string "rock, while my POKéMON remained weak…$" -Route105_Text_295DAB: @ 8295DAB +Route105_Text_FosterPostBattle: @ 8295DAB .string "I can spend hours and hours staring\n" .string "at a nice rock without growing bored.$" -Route105_Text_295DF5: @ 8295DF5 +Route105_Text_LuisIntro: @ 8295DF5 .string "Whew! I was worried that a kid was\n" .string "drowning when I saw you.\p" .string "You seem to be okay, so what do you\n" .string "say to a battle?$" -Route105_Text_295E66: @ 8295E66 +Route105_Text_LuisDefeated: @ 8295E66 .string "Glub… Glub…$" -Route105_Text_295E72: @ 8295E72 +Route105_Text_LuisPostBattle: @ 8295E72 .string "If you are drowning, the signal is to\n" .string "wave one arm toward the beach.$" -Route105_Text_295EB7: @ 8295EB7 +Route105_Text_DominikIntro: @ 8295EB7 .string "Swimming the deep blue sea…\n" .string "It feels the greatest!$" -Route105_Text_295EEA: @ 8295EEA +Route105_Text_DominikDefeated: @ 8295EEA .string "I lost…\n" .string "Now I'm feeling blue…$" -Route105_Text_295F08: @ 8295F08 +Route105_Text_DominikPostBattle: @ 8295F08 .string "Why is the sea blue?\p" .string "I learned about that at the MUSEUM in\n" .string "SLATEPORT, but I forgot.$" -Route105_Text_295F5C: @ 8295F5C +Route105_Text_BeverlyIntro: @ 8295F5C .string "My body feels lighter in the water.\n" .string "It's as if I've gotten slimmer!$" -Route105_Text_295FA0: @ 8295FA0 +Route105_Text_BeverlyDefeated: @ 8295FA0 .string "I'm floating…$" -Route105_Text_295FAE: @ 8295FAE +Route105_Text_PostBattle: @ 8295FAE .string "Your body weight is reduced to just\n" .string "one tenth in the water.\p" .string "That would make me…\n" .string "Whoops! I'm not telling you my weight!$" -Route105_Text_296025: @ 8296025 +Route105_Text_ImaniIntro: @ 8296025 .string "The blue, blue sky…\n" .string "The vast sea…\l" .string "It's so peaceful…$" -Route105_Text_296059: @ 8296059 +Route105_Text_ImaniDefeated: @ 8296059 .string "I lost while I was lounging!$" -Route105_Text_296076: @ 8296076 +Route105_Text_ImaniPostBattle: @ 8296076 .string "I want to be told I'm relaxing to be\n" .string "with. Giggle.$" -Route105_Text_2960A9: @ 82960A9 +Route105_Text_AndresIntro: @ 82960A9 .string "I'm convinced that the sea keeps\n" .string "secrets from us.$" -Route105_Text_2960DB: @ 82960DB +Route105_Text_AndresDefeated: @ 82960DB .string "Yes…\n" .string "I am no good at battling…$" -Route105_Text_2960FA: @ 82960FA +Route105_Text_AndresPostBattle: @ 82960FA .string "I'm sure there are many secrets to be\n" .string "discovered in the world's seas.\p" .string "I mean to find them all!$" -Route105_Text_296159: @ 8296159 +Route105_Text_AndresRegister: @ 8296159 .string "Huh? I'm so weak, but you're willing\n" .string "to register me in your POKéNAV?$" -Route105_Text_29619E: @ 829619E +Route105_Text_AndresRematchIntro: @ 829619E .string "I've told you that I'm weak…\n" .string "Are you sure you want to do this?$" -Route105_Text_2961DD: @ 82961DD +Route105_Text_AndresRematchDefeated: @ 82961DD .string "Yes…\n" .string "I didn't think I could win.$" -Route105_Text_2961FE: @ 82961FE +Route105_Text_AndresRematchPostBattle: @ 82961FE .string "I may be weak at battling, but my\n" .string "drive to explore can't be bested.\p" .string "I will travel the seas all around\n" .string "the world!$" -Route105_Text_29626F: @ 829626F +Route105_Text_JosueIntro: @ 829626F .string "I'm exhausted from swimming.\n" .string "I'm just not used to it.\p" .string "I need a battle for a change of pace!$" -Route105_Text_2962CB: @ 82962CB +Route105_Text_JosueDefeated: @ 82962CB .string "I lost because I battled at sea.$" -Route105_Text_2962EC: @ 82962EC +Route105_Text_JosuePostBattle: @ 82962EC .string "Yeah, for me, the sky is a much better\n" .string "match than the sea.$" -Route106_Text_296327: @ 8296327 +Route106_Text_ElliotIntro: @ 8296327 .string "Which do you prefer, fishing in the\n" .string "sea or a stream?$" -Route106_Text_29635C: @ 829635C +Route106_Text_ElliotDefeated: @ 829635C .string "Like in deep-sea fishing, I lost\n" .string "spectacularly!$" -Route106_Text_29638C: @ 829638C +Route106_Text_ElliotPostBattle: @ 829638C .string "Fishing is the greatest whether it's\n" .string "in the sea or a stream.\l" .string "You agree with me, right?$" -Route106_Text_2963E3: @ 82963E3 +Route106_Text_ElliotRegister: @ 82963E3 .string "Fishing's great, but so is battling.\n" .string "If you don't mind, can we meet again?$" -Route106_Text_29642E: @ 829642E +Route106_Text_ElliotRematchIntro: @ 829642E .string "I caught a bunch of POKéMON fishing.\n" .string "I'll show you an impressive battle!$" -Route106_Text_296477: @ 8296477 +Route106_Text_ElliotRematchDefeated: @ 8296477 .string "I lost again spectacularly!$" -Route106_Text_296493: @ 8296493 +Route106_Text_ElliotRematchPostBattle: @ 8296493 .string "Win or lose, POKéMON are the greatest!\n" .string "You agree with me, right?$" -Route106_Text_2964D4: @ 82964D4 +Route106_Text_NedIntro: @ 82964D4 .string "What do people do if they need to go\n" .string "to a washroom?\p" .string "What if my ROD hooks a big one while\n" .string "I'm in the washroom? I just can't go…$" -Route106_Text_296553: @ 8296553 +Route106_Text_NedDefeated: @ 8296553 .string "I lost because I'm trying to not go\n" .string "to the washroom…$" -Route106_Text_296588: @ 8296588 +Route106_Text_NedPostBattle: @ 8296588 .string "Oh, no! I've got this feeling I'll hook\n" .string "a big one!$" -Route106_Text_2965BB: @ 82965BB +Route106_Text_DouglasIntro: @ 82965BB .string "Hahahah! I'm a lousy runner, but in\n" .string "the water you can't catch me!$" -Route106_Text_2965FD: @ 82965FD +Route106_Text_DouglasDefeated: @ 82965FD .string "I give up!$" -Route106_Text_296608: @ 8296608 +Route106_Text_DouglasPostBattle: @ 8296608 .string "I wouldn't lose in a swim race…$" -Route106_Text_296628: @ 8296628 +Route106_Text_KylaIntro: @ 8296628 .string "The sea is my backyard. I'm not going\n" .string "to take it easy because you're a kid!$" -Route106_Text_296674: @ 8296674 +Route106_Text_KylaDefeated: @ 8296674 .string "Did you take it easy on me by any\n" .string "chance?$" -Route106_Text_29669E: @ 829669E +Route106_Text_KylaPostBattle: @ 829669E .string "Drifting along with the waves…\n" .string "I love it! Why don't you give it a try?$" -Route107_Text_2966E5: @ 82966E5 +Route107_Text_DarrinIntro: @ 82966E5 .string "Yawn…\p" .string "I must have drifted off to sleep while\n" .string "I was drifting in the waves.$" -Route107_Text_29672F: @ 829672F +Route107_Text_DarrinDefeated: @ 829672F .string "Ahaha, I lost…\n" .string "I'll take a snooze, I think…$" -Route107_Text_29675B: @ 829675B +Route107_Text_DarrinPostBattle: @ 829675B .string "Floating and being rocked by\n" .string "the waves--it's like sleeping in\l" .string "a plush, comfy bed.$" -Route107_Text_2967AD: @ 82967AD +Route107_Text_TonyIntro: @ 82967AD .string "The sea is like my backyard.\n" .string "Let's battle!$" -Route107_Text_2967D8: @ 82967D8 +Route107_Text_TonyDefeated: @ 82967D8 .string "I lost on my home field…\n" .string "I'm in shock!$" -Route107_Text_2967FF: @ 82967FF +Route107_Text_TonyPostBattle: @ 82967FF .string "I swim the seas with a heart full of\n" .string "dreams…\p" .string "It's a song!\n" .string "Anyways, I'm swimming some more.$" -Route107_Text_29685A: @ 829685A +Route107_Text_TonyRegister: @ 829685A .string "You've shocked me to the bone!\n" .string "Well, so you won't forget me…$" -Route107_Text_296897: @ 8296897 +Route107_Text_TonyRematchIntro: @ 8296897 .string "Swimming in the big, wide sea,\n" .string "my POKéMON has grown stronger!$" -Route107_Text_2968D5: @ 82968D5 +Route107_Text_TonyRematchDefeated: @ 82968D5 .string "What a shock!\p" .string "My POKéMON has gotten stronger, but\n" .string "I stayed weak as a TRAINER!$" -Route107_Text_296923: @ 8296923 +Route107_Text_TonyRematchPostBattle: @ 8296923 .string "What you learn in battle makes you\n" .string "a stronger TRAINER.\l" .string "The waves taught me that.$" -Route107_Text_296974: @ 8296974 +Route107_Text_DeniseIntro: @ 8296974 .string "Do you know a little town called\n" .string "DEWFORD?$" -Route107_Text_29699E: @ 829699E +Route107_Text_DeniseDefeated: @ 829699E .string "I hate this!$" -Route107_Text_2969AB: @ 82969AB +Route107_Text_DenisePostBattle: @ 82969AB .string "A weird saying is getting really\n" .string "trendy at DEWFORD HALL.$" -Route107_Text_2969E4: @ 82969E4 +Route107_Text_BethIntro: @ 82969E4 .string "Did you want to battle me?\n" .string "Sure, I'll go with you!$" -Route107_Text_296A17: @ 8296A17 +Route107_Text_BethDefeated: @ 8296A17 .string "I wasn't good enough for you.$" -Route107_Text_296A35: @ 8296A35 +Route107_Text_BethPostBattle: @ 8296A35 .string "I think you're going to keep getting\n" .string "better. I'll go for it, too!$" -Route107_Text_296A77: @ 8296A77 +Route107_Text_LisaIntro: @ 8296A77 .string "LISA: We challenge you as a sister\n" .string "and brother!$" -Route107_Text_296AA7: @ 8296AA7 +Route107_Text_LisaDefeated: @ 8296AA7 .string "LISA: Awesome.\n" .string "You're in a different class of tough.$" -Route107_Text_296ADC: @ 8296ADC +Route107_Text_LisaPostBattle: @ 8296ADC .string "LISA: Do you have any friends who\n" .string "would go to the beach with you?$" -Route107_Text_296B1E: @ 8296B1E +Route107_Text_LisaNotEnoughPokemon: @ 8296B1E .string "LISA: If you want to battle with us,\n" .string "bring more POKéMON.$" -Route107_Text_296B57: @ 8296B57 +Route107_Text_RayIntro: @ 8296B57 .string "RAY: We always battle POKéMON,\n" .string "me and my sister.\p" .string "I always lose, but we can beat you\n" .string "2-on-2!$" -Route107_Text_296BB3: @ 8296BB3 +Route107_Text_RayDefeated: @ 8296BB3 .string "RAY: Wowee, you're at a higher level\n" .string "than us!$" -Route107_Text_296BE1: @ 8296BE1 +Route107_Text_RayPostBattle: @ 8296BE1 .string "RAY: My sister gave me my POKéMON.\n" .string "I raised it, and now it's my important\l" .string "partner!$" -Route107_Text_296C34: @ 8296C34 +Route107_Text_RayNotEnoughPokemon: @ 8296C34 .string "RAY: If you want to battle us,\n" .string "go bring some more POKéMON!$" -Route107_Text_296C6F: @ 8296C6F +Route107_Text_CamronIntro: @ 8296C6F .string "I'm in the middle of a triathlon,\n" .string "but I'm nowhere near tired!$" -Route107_Text_296CAD: @ 8296CAD +Route107_Text_CamronDefeated: @ 8296CAD .string "That exhausted me…$" -Route107_Text_296CC0: @ 8296CC0 +Route107_Text_CamronPostBattle: @ 8296CC0 .string "I still have swimming and running left\n" .string "to do after this.\p" .string "Am I going to be okay?$" -Route108_Text_296D10: @ 8296D10 +Route108_Text_JeromeIntro: @ 8296D10 .string "My dream is to swim the world's seven\n" .string "seas!$" -Route108_Text_296D3C: @ 8296D3C +Route108_Text_JeromeDefeated: @ 8296D3C .string "I won't be able to swim the seven seas\n" .string "like this…$" -Route108_Text_296D6E: @ 8296D6E +Route108_Text_JeromePostBattle: @ 8296D6E .string "Playing with marine POKéMON is one of\n" .string "the pleasures of swimming!$" -Route108_Text_296DAF: @ 8296DAF +Route108_Text_MatthewIntro: @ 8296DAF .string "Ahoy, there! Are you going out to\n" .string "the ABANDONED SHIP, too?$" -Route108_Text_296DEA: @ 8296DEA +Route108_Text_MatthewDefeated: @ 8296DEA .string "I'm sinking!\n" .string "Glub… Glub…$" -Route108_Text_296E03: @ 8296E03 +Route108_Text_MatthewPostBattle: @ 8296E03 .string "Some people even go inside that\n" .string "ABANDONED SHIP.$" -Route108_Text_296E33: @ 8296E33 +Route108_Text_TaraIntro: @ 8296E33 .string "My liar of a boyfriend told me that\n" .string "I look great in a bikini…$" -Route108_Text_296E71: @ 8296E71 +Route108_Text_TaraDefeated: @ 8296E71 .string "Oh, boo!$" -Route108_Text_296E7A: @ 8296E7A +Route108_Text_TaraPostBattle: @ 8296E7A .string "Even if it's a lie, I love being told\n" .string "I look great…\l" .string "We girls are so complex…$" -Route108_Text_296EC7: @ 8296EC7 +Route108_Text_MissyIntro: @ 8296EC7 .string "I love the sea!\n" .string "I forget all my worries when I swim!$" -Route108_Text_296EFC: @ 8296EFC +Route108_Text_MissyDefeated: @ 8296EFC .string "When I lose a battle, I get all\n" .string "stressed out!$" -Route108_Text_296F2A: @ 8296F2A +Route108_Text_MissyPostBattle: @ 8296F2A .string "Work off your stress by swimming!\n" .string "It's so healthy!$" -Route108_Text_296F5D: @ 8296F5D +Route108_Text_CoryIntro: @ 8296F5D .string "I love WATER-type POKéMON.\n" .string "I love other POKéMON, too!$" -Route108_Text_296F93: @ 8296F93 +Route108_Text_CoryDefeated: @ 8296F93 .string "Waaah! I lost!\n" .string "Waaah! Waaah!$" -Route108_Text_296FB0: @ 8296FB0 +Route108_Text_CoryPostBattle: @ 8296FB0 .string "Shouting is good for me!\n" .string "It uplifts me!$" -Route108_Text_296FD8: @ 8296FD8 +Route108_Text_CoryRegister: @ 8296FD8 .string "I love tough TRAINERS, too!\n" .string "Register me in your POKéNAV!$" -Route108_Text_297011: @ 8297011 +Route108_Text_CoryRematchIntro: @ 8297011 .string "Win or lose, I love battling at sea!$" -Route108_Text_297036: @ 8297036 +Route108_Text_CoryRematchDefeated: @ 8297036 .string "Waaah! I lost again!\n" .string "Waaah! Waaah!$" -Route108_Text_297059: @ 8297059 +Route108_Text_CoryRematchPostBattle: @ 8297059 .string "If you're faced with a challenge,\n" .string "try shouting at the sea!$" -Route108_Text_297094: @ 8297094 +Route108_Text_CarolinaIntro: @ 8297094 .string "I take huge pride in my POKéMON.\n" .string "We'll show you one speedy battle!$" -Route108_Text_2970D7: @ 82970D7 +Route108_Text_CarolinaDefeated: @ 82970D7 .string "That wasn't cute at all.$" -Route108_Text_2970F0: @ 82970F0 +Route108_Text_CarolinaPostBattle: @ 82970F0 .string "Since I'm at sea like this, I wouldn't\n" .string "mind putting on a pink, frilly swimsuit…$" -Route109_Text_297140: @ 8297140 +Route109_Text_DavidIntro: @ 8297140 .string "Hiyah! Look at my chiseled abs!\n" .string "This is what you call “cut”!$" -Route109_Text_29717D: @ 829717D +Route109_Text_DavidDefeated: @ 829717D .string "Aiyah!\n" .string "Flubbed out!$" -Route109_Text_297191: @ 8297191 +Route109_Text_DavidPostBattle: @ 8297191 .string "Hiyah!\p" .string "My sculpted abs have nothing to do\n" .string "with POKéMON battles!$" -Route109_Text_2971D1: @ 82971D1 +Route109_Text_AliceIntro: @ 82971D1 .string "Are you properly protected against\n" .string "the sun?$" -Route109_Text_2971FD: @ 82971FD +Route109_Text_AliceDefeated: @ 82971FD .string "Ouch, ouch, ouch!$" -Route109_Text_29720F: @ 829720F +Route109_Text_AlicePostBattle: @ 829720F .string "Cheeks are the most prone to burning!$" -Route109_Text_297235: @ 8297235 +Route109_Text_HueyIntro: @ 8297235 .string "I've laid anchor in ports around\n" .string "the world, but SLATEPORT's the best.$" -Route109_Text_29727B: @ 829727B +Route109_Text_HueyDefeated: @ 829727B .string "You're the best!$" -Route109_Text_29728C: @ 829728C +Route109_Text_HueyPostBattle: @ 829728C .string "In the best port was the best\n" .string "TRAINER…$" -Route109_Text_2972B3: @ 82972B3 +Route109_Text_EdmondIntro: @ 82972B3 .string "Urrrrppp…\n" .string "Battle? With me?$" -Route109_Text_2972CE: @ 82972CE +Route109_Text_EdmondDefeated: @ 82972CE .string "Urp… Ooooooohhhhhh…\n" .string "Urrrrpppp…$" -Route109_Text_2972ED: @ 82972ED +Route109_Text_EdmondPostBattle: @ 82972ED .string "I'm usually stronger than this!\n" .string "I'm just seasick as a dog!\p" .string "I'm a SAILOR, but…$" -Route109_Text_29733B: @ 829733B +Route109_Text_RickyIntro: @ 829733B .string "I'm thirsty… I could go for a SODA POP\n" .string "at the SEASHORE HOUSE…$" -Route109_Text_297379: @ 8297379 +Route109_Text_RickyDefeated: @ 8297379 .string "Groan…$" -Route109_Text_297380: @ 8297380 +Route109_Text_RickyPostBattle: @ 8297380 .string "I'm getting famished… My inner tube\n" .string "looks like a giant doughnut…$" -Route109_Text_2973C1: @ 82973C1 +Route109_Text_RickyRegister: @ 82973C1 .string "Will you have another match with me\n" .string "when I'm not all thirsty?$" -Route109_Text_2973FF: @ 82973FF +Route109_Text_RickyRematchIntro: @ 82973FF .string "I'm hungry, but I've got enough pep in\n" .string "me for a battle!$" -Route109_Text_297437: @ 8297437 +Route109_Text_RickyRematchDefeated: @ 8297437 .string "I lost…\n" .string "It's because I'm hungry…$" -Route109_Text_297458: @ 8297458 +Route109_Text_RickyRematchPostBattle: @ 8297458 .string "When you eat on a beach, everything\n" .string "seems to taste a little better.$" -Route109_Text_29749C: @ 829749C +Route109_Text_LolaIntro: @ 829749C .string "Doesn't a beach umbrella look like\n" .string "a giant flower?$" -Route109_Text_2974CF: @ 82974CF +Route109_Text_LolaDefeated: @ 82974CF .string "Mommy!$" -Route109_Text_2974D6: @ 82974D6 +Route109_Text_LolaPostBattle: @ 82974D6 .string "If you look at the beach from the sky,\n" .string "it looks like a big flower garden!$" -Route109_Text_297520: @ 8297520 +Route109_Text_LolaRegister: @ 8297520 .string "Me?\n" .string "I'm here every day!$" -Route109_Text_297538: @ 8297538 +Route109_Text_LolaRematchIntro: @ 8297538 .string "I'm not losing to you again!\n" .string "That's why I have my inner tube!$" -Route109_Text_297576: @ 8297576 +Route109_Text_LolaRematchDefeated: @ 8297576 .string "Mommy!$" -Route109_Text_29757D: @ 829757D +Route109_Text_LolaRematchPostBattle: @ 829757D .string "If I have an inner tube, me and my\n" .string "POKéMON's cuteness goes way up!$" -Route109_Text_2975C0: @ 82975C0 +Route109_Text_AustinaIntro: @ 82975C0 .string "I can't swim without my inner tube,\n" .string "but I won't lose at POKéMON!$" -Route109_Text_297601: @ 8297601 +Route109_Text_AustinaDefeated: @ 8297601 .string "Did I lose because I have an inner\n" .string "tube?$" -Route109_Text_29762A: @ 829762A +Route109_Text_AustinaPostBattle: @ 829762A .string "My inner tube is a fashion item.\n" .string "I can't be seen without it.$" -Route109_Text_297667: @ 8297667 +Route109_Text_GwenIntro: @ 8297667 .string "Hi, big TRAINER.\n" .string "Will you battle with me?$" -Route109_Text_297691: @ 8297691 +Route109_Text_GwenDefeated: @ 8297691 .string "Oh, you're strong.$" -Route109_Text_2976A4: @ 82976A4 +Route109_Text_GwenPostBattle: @ 82976A4 .string "How did you get to be so strong?$" -Route109_Text_2976C5: @ 82976C5 +Route109_Text_CarterIntro: @ 82976C5 .string "Wahahah! This dude's going to catch\n" .string "himself a big one!$" -Route109_Text_2976FC: @ 82976FC +Route109_Text_CarterDefeated: @ 82976FC .string "This dude just lost one…$" -Route109_Text_297715: @ 8297715 +Route109_Text_CarterPostBattle: @ 8297715 .string "This dude thinks you're a big one.\n" .string "No, you're a big-one-to-be!$" -Route109_Text_297754: @ 8297754 +Route109_Text_PaulIntro: @ 8297754 .string "PAUL: Well, this is a mood-breaker.\p" .string "I wish you wouldn't disturb our\n" .string "precious time together.$" -Route109_Text_2977B0: @ 82977B0 +Route109_Text_PaulDefeated: @ 82977B0 .string "PAUL: Well, I give up.$" -Route109_Text_2977C7: @ 82977C7 +Route109_Text_PaulPostBattle: @ 82977C7 .string "PAUL: Well, don't tell anyone that\n" .string "we're here.\l" .string "This is just our private world of two!$" -Route109_Text_29781D: @ 829781D +Route109_Text_PaulNotEnoughPokemon: @ 829781D .string "PAUL: We're totally, deeply in love.\n" .string "That's why we make our POKéMON battle\l" .string "together.$" -Route109_Text_297872: @ 8297872 +Route109_Text_MelIntro: @ 8297872 .string "MEL: We're, like, totally in love.\n" .string "Our romance is heating up all of HOENN!$" -Route109_Text_2978BD: @ 82978BD +Route109_Text_MelDefeated: @ 82978BD .string "MEL: We lost, and it's my fault!\n" .string "PAUL will hate me!$" -Route109_Text_2978F1: @ 82978F1 +Route109_Text_MelPostBattle: @ 82978F1 .string "MEL: Um, PAUL, are you angry with me?\n" .string "Please don't be angry.$" -Route109_Text_29792E: @ 829792E +Route109_Text_MelNotEnoughPokemon: @ 829792E .string "MEL: We're, like, deeply and truly in love.\n" .string "That's why we make our POKéMON\l" .string "battle together.$" -Route109_Text_29798A: @ 829798A +Route109_Text_ChandlerIntro: @ 829798A .string "Tadaah! See?\n" .string "My inner tube's round!$" -Route109_Text_2979AE: @ 82979AE +Route109_Text_ChandlerDefeated: @ 82979AE .string "Oh, oh!\n" .string "Too bad!$" -Route109_Text_2979BF: @ 82979BF +Route109_Text_ChandlerPostBattle: @ 82979BF .string "After I showed you my round inner\n" .string "tube, too…$" -Route109_Text_2979EC: @ 82979EC +Route109_Text_HaileyIntro: @ 82979EC .string "I can't swim, so I'm pretending\n" .string "to swim.$" -Route109_Text_297A15: @ 8297A15 +Route109_Text_HaileyDefeated: @ 8297A15 .string "I thought so!\n" .string "I didn't think we could win.$" -Route109_Text_297A40: @ 8297A40 +Route109_Text_HaileyPostBattle: @ 8297A40 .string "When I learn how to swim, I think\n" .string "my POKéMON will become tougher.$" -Route109_Text_297A82: @ 8297A82 +Route109_Text_ElijahIntro: @ 8297A82 .string "For a guy as macho as me, this kind\n" .string "of POKéMON is the perfect match!$" -Route109_Text_297AC7: @ 8297AC7 +Route109_Text_ElijahDefeated: @ 8297AC7 .string "I'm cool even in defeat, hey?$" -Route109_Text_297AE5: @ 8297AE5 +Route109_Text_ElijahPostBattle: @ 8297AE5 .string "For a guy as macho as me, a port\n" .string "is the perfect setting!\p" .string "I guess I'll head for SLATEPORT.$" -Route110_Text_297B3F: @ 8297B3F +Route110_Text_JacobIntro: @ 8297B3F .string "Whoa! Watch it!\n" .string "I guess you're not used to BIKE racing.$" -Route110_Text_297B77: @ 8297B77 +Route110_Text_JacobDefeated: @ 8297B77 .string "Whoa!\n" .string "My brakes failed!$" -Route110_Text_297B8F: @ 8297B8F +Route110_Text_JacobPostBattle: @ 8297B8F .string "Flat tires and brake problems can\n" .string "cause serious injury!\l" .string "Inspect your BIKE for problems!$" -Route110_Text_297BE7: @ 8297BE7 +Route110_Text_AnthonyIntro: @ 8297BE7 .string "Yo, you!\n" .string "Can you keep up with my speed?$" -Route110_Text_297C0F: @ 8297C0F +Route110_Text_AnthonyDefeated: @ 8297C0F .string "Crash and burn!$" -Route110_Text_297C1F: @ 8297C1F +Route110_Text_AnthonyPostBattle: @ 8297C1F .string "Speed alone won't let me win at POKéMON.\n" .string "I need to reconsider this…$" -Route110_Text_297C63: @ 8297C63 +Route110_Text_BenjaminIntro: @ 8297C63 .string "Don't panic if your BIKE's going fast!$" -Route110_Text_297C8A: @ 8297C8A +Route110_Text_BenjaminDefeated: @ 8297C8A .string "I shouldn't panic during POKéMON\n" .string "battles…$" -Route110_Text_297CB4: @ 8297CB4 +Route110_Text_BenjaminPostBattle: @ 8297CB4 .string "There's no need to panic or stress.\n" .string "Take it easy. There's plenty of time.$" -Route110_Text_297CFE: @ 8297CFE +Route110_Text_BenjaminRegister: @ 8297CFE .string "I'll keep chugging on without stressing.\n" .string "Give me a shout if you're up to it.$" -Route110_Text_297D4B: @ 8297D4B +Route110_Text_BenjaminRematchIntro: @ 8297D4B .string "Aren't you going a little too fast?\n" .string "Take it easy and let's battle.$" -Route110_Text_297D8E: @ 8297D8E +Route110_Text_BenjaminRematchDefeated: @ 8297D8E .string "I didn't panic, but I still lost…$" -Route110_Text_297DB0: @ 8297DB0 +Route110_Text_BenjaminRematchPostBattle: @ 8297DB0 .string "There's no need to panic or stress.\n" .string "Take it easy. There's plenty of time.$" -Route110_Text_297DFA: @ 8297DFA +Route110_Text_AbigailIntro: @ 8297DFA .string "The triathlon is hard in the extreme.\p" .string "You have to complete the three events\n" .string "of swimming, cycling, and running.$" -Route110_Text_297E69: @ 8297E69 +Route110_Text_AbigailDefeated: @ 8297E69 .string "POKéMON battles are hard, too!$" -Route110_Text_297E88: @ 8297E88 +Route110_Text_AbigailPostBattle: @ 8297E88 .string "I'm exhausted, so I need a break.\n" .string "It's important to get proper rest.$" -Route110_Text_297ECD: @ 8297ECD +Route110_Text_AbigailRegister: @ 8297ECD .string "You know, I like you!\n" .string "Let's have a rematch on CYCLING ROAD.$" -Route110_Text_297F09: @ 8297F09 +Route110_Text_AbigailRematchIntro: @ 8297F09 .string "Isn't it neat to hold a battle while\n" .string "cycling?$" -Route110_Text_297F37: @ 8297F37 +Route110_Text_AbigailRematchDefeated: @ 8297F37 .string "Wow…\n" .string "How could you be so strong?$" -Route110_Text_297F58: @ 8297F58 +Route110_Text_AbigailRematchPostBattle: @ 8297F58 .string "Were you going after a record?\p" .string "I'm sorry if I held you up!$" -Route110_Text_297F93: @ 8297F93 +Route110_Text_JasmineIntro: @ 8297F93 .string "I've been riding without stopping.\n" .string "My thighs are like rocks!$" -Route110_Text_297FD0: @ 8297FD0 +Route110_Text_JasmineDefeated: @ 8297FD0 .string "I'm worried about muscle cramps…$" -Route110_Text_297FF1: @ 8297FF1 +Route110_Text_JasminePostBattle: @ 8297FF1 .string "Oh, you have some GYM BADGES?\n" .string "No wonder you're so strong!$" -Route110_Text_29802B: @ 829802B +Route110_Text_EdwardIntro: @ 829802B .string "I have foreseen your intentions!\n" .string "I cannot possibly lose!$" -Route110_Text_298064: @ 8298064 +Route110_Text_EdwardDefeated: @ 8298064 .string "I failed to prophesize my own demise!$" -Route110_Text_29808A: @ 829808A +Route110_Text_EdwardPostBattle: @ 829808A .string "I see your future…\p" .string "Hmm…\n" .string "I see a shining light…$" -Route110_Text_2980B9: @ 82980B9 +Route110_Text_JaclynIntro: @ 82980B9 .string "Ahahahaha!\n" .string "I'll dazzle you with my wonders!$" -Route110_Text_2980E5: @ 82980E5 +Route110_Text_JaclynDefeated: @ 82980E5 .string "I wondrously lost!$" -Route110_Text_2980F8: @ 82980F8 +Route110_Text_JaclynPostBattle: @ 82980F8 .string "You managed to win only because it was\n" .string "a wonder! Yes, a wonder!\l" .string "Don't think you can win all the time!$" -Route110_Text_29815E: @ 829815E +Route110_Text_EdwinIntro: @ 829815E .string "Could I see your POKéMON?\n" .string "Just one look, please?$" -Route110_Text_29818F: @ 829818F +Route110_Text_EdwinDefeated: @ 829818F .string "I wanted to complete\n" .string "my collection…$" -Route110_Text_2981B3: @ 82981B3 +Route110_Text_EdwinPostBattle: @ 82981B3 .string "When I see a POKéMON that I don't know,\n" .string "my passion as a collector is ignited!$" -Route110_Text_298201: @ 8298201 +Route110_Text_EdwinRegister: @ 8298201 .string "I like collecting MATCH CALL\n" .string "registrations, too…$" -Route110_Text_298232: @ 8298232 +Route110_Text_EdwinRematchIntro: @ 8298232 .string "Hi, have you caught any new POKéMON?\p" .string "Could I see your POKéMON?\n" .string "Just one look, please?$" -Route110_Text_298288: @ 8298288 +Route110_Text_EdwinRematchDefeated: @ 8298288 .string "Your POKéMON…\n" .string "I envy you.$" -Route110_Text_2982A2: @ 82982A2 +Route110_Text_EdwinRematchPostBattle: @ 82982A2 .string "Oh, I long to make all rare POKéMON\n" .string "mine!$" -Route110_Text_2982CC: @ 82982CC +Route110_Text_DaleIntro: @ 82982CC .string "Hey!\n" .string "Don't sneak up behind me like that!$" -Route110_Text_2982F5: @ 82982F5 +Route110_Text_DaleDefeated: @ 82982F5 .string "I lost!\n" .string "Drat!$" -Route110_Text_298303: @ 8298303 +Route110_Text_DalePostBattle: @ 8298303 .string "Fishing is all about concentration.\n" .string "You have to focus on the floater.$" -Route110_Text_298349: @ 8298349 +Route110_Text_IsabelIntro: @ 8298349 .string "Ahahaha! I would go anywhere to show\n" .string "off my delightful POKéMON.$" -Route110_Text_298389: @ 8298389 +Route110_Text_IsabelDefeated: @ 8298389 .string "Oh, dear, this won't do.$" -Route110_Text_2983A2: @ 82983A2 +Route110_Text_IsabelPostBattle: @ 82983A2 .string "Rather than battling, perhaps I should\n" .string "show off my POKéMON at the FAN CLUB.$" -Route110_Text_2983EE: @ 82983EE +Route110_Text_IsabelRegister: @ 82983EE .string "That wasn't close to what I could\n" .string "do to show off my POKéMON.\p" .string "I'll have you as my captive audience\n" .string "as often as possible!$" -Route110_Text_298466: @ 8298466 +Route110_Text_IsabelRematchIntro: @ 8298466 .string "Ahahahaha! I would be happy to show\n" .string "off my POKéMON as often as you like!$" -Route110_Text_2984AF: @ 82984AF +Route110_Text_IsabelRematchDefeated: @ 82984AF .string "Oh, dear, this won't do.$" -Route110_Text_2984C8: @ 82984C8 +Route110_Text_IsabelRematchPostBattle: @ 82984C8 .string "I don't think that I could ever stop\n" .string "from showing off my POKéMON.\p" .string "But I like to battle, too!$" -Route110_Text_298525: @ 8298525 +Route110_Text_TimmyIntro: @ 8298525 .string "I found some cool POKéMON in the grass\n" .string "around here!$" -Route110_Text_298559: @ 8298559 +Route110_Text_TimmyDefeated: @ 8298559 .string "Being cool isn't enough to win…$" -Route110_Text_298579: @ 8298579 +Route110_Text_TimmyPostBattle: @ 8298579 .string "It's hard to battle with POKéMON you\n" .string "just caught.$" -Route110_Text_2985AB: @ 82985AB +Route110_Text_AlyssaIntro: @ 82985AB .string "I fell off CYCLING ROAD…\p" .string "I'll get over my embarrassment by\n" .string "battling with you!$" -Route110_Text_2985F9: @ 82985F9 +Route110_Text_AlyssaDefeated: @ 82985F9 .string "Oops!\n" .string "I ended up losing!$" -Route110_Text_298612: @ 8298612 +Route110_Text_AlyssaPostBattle: @ 8298612 .string "Falling… Losing…\n" .string "This is so humiliating for me!$" -Route110_Text_298642: @ 8298642 +Route110_Text_JosephIntro: @ 8298642 .string "Okay! Full-throttle time! If you can't\n" .string "groove, you get left behind!$" -Route110_Text_298686: @ 8298686 +Route110_Text_JosephDefeated: @ 8298686 .string "You got into the groove all right…$" -Route110_Text_2986A9: @ 82986A9 +Route110_Text_JosephPostBattle: @ 82986A9 .string "This isn't going to bring me down!\n" .string "Losing has made me a better man!$" -Route110_Text_2986ED: @ 82986ED +Route110_Text_KalebIntro: @ 82986ED .string "When cute POKéMON help each other…\n" .string "You won't see a more adorable sight!$" -Route110_Text_298735: @ 8298735 +Route110_Text_KalebDefeated: @ 8298735 .string "Have you no compassion or pity?$" -Route110_Text_298755: @ 8298755 +Route110_Text_KalebPostBattle: @ 8298755 .string "Okay, okay, you've done the best you\n" .string "could, my pretties.$" diff --git a/data/text/trick_house_mechadolls.inc b/data/text/trick_house_mechadolls.inc new file mode 100644 index 000000000..69d0118bd --- /dev/null +++ b/data/text/trick_house_mechadolls.inc @@ -0,0 +1,134 @@ +gTrickHouse_Mechadoll_Oddish:: @ 27ECBC + .string "ODDISH$" + +gTrickHouse_Mechadoll_Poochyena:: @ 27ECC3 + .string "POOCHYENA$" + +gTrickHouse_Mechadoll_Taillow:: @ 27ECCD + .string "TAILLOW$" + +gTrickHouse_Mechadoll_Azurill:: @ 27ECD5 + .string "AZURILL$" + +gTrickHouse_Mechadoll_Lotad:: @ 27ECDD + .string "LOTAD$" + +gTrickHouse_Mechadoll_Wingull:: @ 27ECE3 + .string "WINGULL$" + +gTrickHouse_Mechadoll_Dustox:: @ 27ECEB + .string "DUSTOX$" + +gTrickHouse_Mechadoll_Zubat:: @ 27ECF2 + .string "ZUBAT$" + +gTrickHouse_Mechadoll_Nincada:: @ 27ECF8 + .string "NINCADA$" + +gTrickHouse_Mechadoll_Ralts:: @ 27ED00 + .string "RALTS$" + +gTrickHouse_Mechadoll_Zigzagoon:: @ 27ED06 + .string "ZIGZAGOON$" + +gTrickHouse_Mechadoll_Slakoth:: @ 27ED10 + .string "SLAKOTH$" + +gTrickHouse_Mechadoll_Poochyena2:: @ 27ED18 + .string "POOCHYENA$" + +gTrickHouse_Mechadoll_Shroomish:: @ 27ED22 + .string "SHROOMISH$" + +gTrickHouse_Mechadoll_Zigzagoon2:: @ 27ED2C + .string "ZIGZAGOON$" + +gTrickHouse_Mechadoll_Poochyena3:: @ 27ED36 + .string "POOCHYENA$" + +gTrickHouse_Mechadoll_Zubat2:: @ 27ED40 + .string "ZUBAT$" + +gTrickHouse_Mechadoll_Carvanha:: @ 27ED46 + .string "CARVANHA$" + +gTrickHouse_Mechadoll_BurnHeal:: @ 27ED4F + .string "BURN HEAL$" + +gTrickHouse_Mechadoll_HarborMail:: @ 27ED59 + .string "HARBOR MAIL$" + +gTrickHouse_Mechadoll_SamePrice:: @ 27ED65 + .string "Same price$" + +gTrickHouse_Mechadoll_60Yen:: @ 27ED70 + .string "¥60$" + +gTrickHouse_Mechadoll_55Yen:: @ 27ED74 + .string "¥55$" + +gTrickHouse_Mechadoll_Nothing:: @ 27ED78 + .string "Nothing$" + +gTrickHouse_Mechadoll_CostMore:: @ 27ED80 + .string "They will cost more.$" + +gTrickHouse_Mechadoll_CostLess:: @ 27ED95 + .string "They will cost less.$" + +gTrickHouse_Mechadoll_SamePrice2:: @ 27EDAA + .string "Same price$" + +gTrickHouse_Mechadoll_Male:: @ 27EDB5 + .string "Male$" + +gTrickHouse_Mechadoll_Female:: @ 27EDBA + .string "Female$" + +gTrickHouse_Mechadoll_Neither:: @ 27EDC1 + .string "Neither$" + +gTrickHouse_Mechadoll_ElderlyMen:: @ 27EDC9 + .string "Elderly men$" + +gTrickHouse_Mechadoll_ElderlyLadies:: @ 27EDD5 + .string "Elderly ladies$" + +gTrickHouse_Mechadoll_SameNumber:: @ 27EDE4 + .string "Same number$" + +gTrickHouse_Mechadoll_None:: @ 27EDF0 + .string "None$" + +gTrickHouse_Mechadoll_One:: @ 27EDF5 + .string "1$" + +gTrickHouse_Mechadoll_Two:: @ 27EDF7 + .string "2$" + +gTrickHouse_Mechadoll_Two2:: @ 27EDF9 + .string "2$" + +gTrickHouse_Mechadoll_Three:: @ 27EDFB + .string "3$" + +gTrickHouse_Mechadoll_Four:: @ 27EDFD + .string "4$" + +gTrickHouse_Mechadoll_Six:: @ 27EDFF + .string "6$" + +gTrickHouse_Mechadoll_Seven:: @ 27EE01 + .string "7$" + +gTrickHouse_Mechadoll_Eight:: @ 27EE03 + .string "8$" + +gTrickHouse_Mechadoll_Six2:: @ 27EE05 + .string "6$" + +gTrickHouse_Mechadoll_Seven2:: @ 27EE07 + .string "7$" + +gTrickHouse_Mechadoll_Eight2:: @ 27EE09 + .string "8$" diff --git a/data/text/tv.inc b/data/text/tv.inc index f084ac055..c71793585 100644 --- a/data/text/tv.inc +++ b/data/text/tv.inc @@ -2694,25 +2694,23 @@ gTVPokemonBattleUpdateText07:: @ 0828AE26 .string "This concludes this episode of\n" .string "“POKéMON BATTLE UPDATE!”$" -Route111_Text_28AF05: @ 0828AF05 +GabbyAndTy_Text_GabbyPreFirstBattle: @ 0828AF05 .string "GABBY: Oh! We've just spotted a tough-\n" .string "looking TRAINER here of all places!\p" .string "Okay, roll camera!\n" .string "Let's get this interview.$" -Route111_Text_28AF7D: @ 0828AF7D -Route118_Text_28AF7D: @ 0828AF7D -Route120_Text_28AF7D: @ 0828AF7D +GabbyAndTy_Text_GabbyPreBattle: @ 0828AF7D .string "GABBY: Oh! You're {PLAYER}! Hi!\n" .string "Do you remember us from last time?\p" .string "Can you show us how much stronger\n" .string "you've become? Okay, cue interview!$" -Route111_Text_28B000: @ 0828B000 +GabbyAndTy_Text_GabbyDefeatFirstTime: @ 0828B000 .string "GABBY: My eyes didn't lie!\n" .string "I did discover an astonishing TRAINER!$" -Route111_Text_28B042: @ 0828B042 +GabbyAndTy_Text_WhoAreYouInterview: @ 0828B042 .string "GABBY: Awesome! Awesome!\n" .string "Who are you?!\p" .string "I knew we were onto something wild\n" @@ -2723,19 +2721,19 @@ Route111_Text_28B042: @ 0828B042 .string "So, would you give us a bit of your time\n" .string "for an interview?$" -Route111_Text_28B137: @ 0828B137 +GabbyAndTy_Text_QuoteFromLastInterview: @ 0828B137 .string "GABBY: “{STR_VAR_1}!”\p" .string "Remember? That's the quote you gave\n" .string "us as the battle clincher last time.\p" .string "I never, ever forget stuff like that!$" -Route111_Text_28B1B3: @ 0828B1B3 +GabbyAndTy_Text_YouStompedUsInterviewAgain: @ 0828B1B3 .string "The last time we battled, you stomped\n" .string "us before we could brace ourselves…\p" .string "Anyway, what do you think?\n" .string "Do you want to be interviewed again?$" -Route111_Text_28B23D: @ 0828B23D +GabbyAndTy_Text_YouThrewABallAtUsInterviewAgain: @ 0828B23D .string "The last time we battled, didn't you\n" .string "throw a POKé BALL at us?\p" .string "We were shocked! So we told everyone,\n" @@ -2743,30 +2741,30 @@ Route111_Text_28B23D: @ 0828B23D .string "Anyway, what do you think?\n" .string "Do you want to be interviewed again?$" -Route111_Text_28B2FA: @ 0828B2FA +GabbyAndTy_Text_CleverItemSkillsInterviewAgain: @ 0828B2FA .string "The last time we battled, your item\n" .string "skills cleverly did us in.\p" .string "Anyway, what do you think?\n" .string "Do you want to be interviewed again?$" -Route111_Text_28B379: @ 0828B379 +GabbyAndTy_Text_WeLookedRespectableInterviewAgain: @ 0828B379 .string "The last time we battled, we managed\n" .string "to look respectable.\p" .string "Anyway, what do you think?\n" .string "Do you want to be interviewed again?$" -Route111_Text_28B3F3: @ 0828B3F3 +GabbyAndTy_Text_InterviewAgain: @ 0828B3F3 .string "Anyway, what do you think?\n" .string "Do you want to be interviewed again?$" -Route111_Text_28B433: @ 0828B433 +GabbyAndTy_Text_DescribeYourFeelings: @ 0828B433 .string "You will?\n" .string "Thank you!\p" .string "Okay, I need you to describe your\n" .string "feelings about our battle, but it\l" .string "has to be short and sweet. Go!$" -Route111_Text_28B4AB: @ 0828B4AB +GabbyAndTy_Text_PerfectWellBeSeeingYou: @ 0828B4AB .string "GABBY: Mmm, yeah!\n" .string "That's the perfect clincher!\p" .string "I get the feeling that this will make\n" @@ -2776,24 +2774,20 @@ Route111_Text_28B4AB: @ 0828B4AB .string "Okay!\n" .string "We'll be seeing you!$" -Route111_Text_28B577: @ 0828B577 +GabbyAndTy_Text_DontGiveUpKeepingEyeOut: @ 0828B577 .string "GABBY: Oh…\p" .string "Okay, but don't give up!\n" .string "We'll be keeping an eye out for you!$" -Route111_Text_28B5C0: @ 0828B5C0 -Route118_Text_28B5C0: @ 0828B5C0 -Route120_Text_28B5C0: @ 0828B5C0 +GabbyAndTy_Text_KeepingAnEyeOutForYou: @ 0828B5C0 .string "GABBY: We'll be keeping an eye out\n" .string "for you!$" -Route111_Text_28B5EC: @ 0828B5EC -Route118_Text_28B5EC: @ 0828B5EC -Route120_Text_28B5EC: @ 0828B5EC +GabbyAndTy_Text_GabbyNotEnoughMons: @ 0828B5EC .string "GABBY: Is there a strong TRAINER\n" .string "anywhere with a lot of POKéMON?$" -Route111_Text_28B62D: @ 0828B62D +GabbyAndTy_Text_GiveUsAnInterviewThisTime: @ 0828B62D .string "GABBY: Wow, you are something!\p" .string "You've gotten a lot stronger--a lot--\n" .string "since we last battled.\p" @@ -2803,46 +2797,36 @@ Route111_Text_28B62D: @ 0828B62D .string "Are you willing to give us an interview\l" .string "this time?$" -Route111_Text_28B719: @ 0828B719 -Route118_Text_28B719: @ 0828B719 -Route120_Text_28B719: @ 0828B719 +GabbyAndTy_Text_GabbyDefeat: @ 0828B719 .string "GABBY: That was an intense battle!\n" .string "Did you get all that on camera?$" -Route111_Text_28B75C: @ 0828B75C +GabbyAndTy_Text_TyPreFirstBattle: @ 0828B75C .string "TY: Hey, lookie here! A tough-looking\n" .string "TRAINER here, of all places!\l" .string "Camera's rolling!$" -Route111_Text_28B7B1: @ 0828B7B1 -Route118_Text_28B7B1: @ 0828B7B1 -Route120_Text_28B7B1: @ 0828B7B1 +GabbyAndTy_Text_TyPreBattle: @ 0828B7B1 .string "TY: Hey, lookie here!\n" .string "I remember you!\p" .string "I'll get this battle all on this\n" .string "here camera!$" -Route111_Text_28B805: @ 0828B805 -Route118_Text_28B805: @ 0828B805 -Route120_Text_28B805: @ 0828B805 +GabbyAndTy_Text_TyPostBattle: @ 0828B805 .string "TY: You're a natural!\n" .string "Got me some prime footage right here!$" -Route111_Text_28B841: @ 0828B841 -Route118_Text_28B841: @ 0828B841 -Route120_Text_28B841: @ 0828B841 +GabbyAndTy_Text_TyNotEnoughMons: @ 0828B841 .string "TY: Do you only have the one POKéMON\n" .string "and that's it?\p" .string "If you had more POKéMON, it'd make for\n" .string "better footage, but…$" -Route111_Text_28B8B1: @ 0828B8B1 +GabbyAndTy_Text_TyDefeatFirstTime: @ 0828B8B1 .string "TY: Yep, we sure spotted a hot TRAINER.\n" .string "This is a huge scoop for us!$" -Route111_Text_28B8F6: @ 0828B8F6 -Route118_Text_28B8F6: @ 0828B8F6 -Route120_Text_28B8F6: @ 0828B8F6 +GabbyAndTy_Text_TyDefeat: @ 0828B8F6 .string "TY: Yep, I got it all.\n" .string "That whole battle's on camera.$" diff --git a/data/text/unusual_weather.inc b/data/text/unusual_weather.inc new file mode 100644 index 000000000..e6dc9b1d0 --- /dev/null +++ b/data/text/unusual_weather.inc @@ -0,0 +1,7 @@ +gText_UnusualWeatherEnded_Rain:: @ 8273656 + .string "The massive downpour appears to\n" + .string "have stopped…$" + +gText_UnusualWeatherEnded_Sun:: @ 8273684 + .string "The intense sunshine appears to\n" + .string "have subsided…$" diff --git a/data/text_input_strings.s b/data/text_input_strings.s index 919b49416..bb4006a1f 100644 --- a/data/text_input_strings.s +++ b/data/text_input_strings.s @@ -5,142 +5,142 @@ .align 2 -gUnknown_862B810:: @ 862B810 +gText_EasyChatKeyboard_ABCDEFothers:: @ 862B810 .string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$" -gUnknown_862B832:: @ 862B832 +gText_EasyChatKeyboard_GHIJKL:: @ 862B832 .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$" -gUnknown_862B84B:: @ 862B84B +gText_EasyChatKeyboard_MNOPQRS:: @ 862B84B .string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $" -gUnknown_862B86C:: @ 862B86C +gText_EasyChatKeyboard_TUVWXYZ:: @ 862B86C .string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $" -gUnknown_0862B88D:: @ 862B88D +gText_NamingScreenKeyboard_abcdef:: @ 862B88D .string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 30}.$" -gUnknown_0862B8AE:: @ 862B8AE +gText_NamingScreenKeyboard_ghijkl:: @ 862B8AE .string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 7}k{CLEAR 7}l{CLEAR 7} {CLEAR 30},$" -gUnknown_0862B8CF:: @ 862B8CF +gText_NamingScreenKeyboard_mnopqrs:: @ 862B8CF .string "{CLEAR 11}m{CLEAR 6}n{CLEAR 6}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $" -gUnknown_0862B8F0:: @ 862B8F0 +gText_NamingScreenKeyboard_tuvwxyz:: @ 862B8F0 .string "{CLEAR 11}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} $" -gUnknown_0862B911:: @ 862B911 +gText_NamingScreenKeyboard_ABCDEF:: @ 862B911 .string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 30}.$" -gUnknown_0862B932:: @ 862B932 +gText_NamingScreenKeyboard_GHIJKL:: @ 862B932 .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 30},$" -gUnknown_0862B953:: @ 862B953 +gText_NamingScreenKeyboard_MNOPQRS:: @ 862B953 .string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $" -gUnknown_0862B974:: @ 862B974 +gText_NamingScreenKeyboard_TUVWXYZ:: @ 862B974 .string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $" -gUnknown_0862B995:: @ 862B995 +gText_NamingScreenKeyboard_01234:: @ 862B995 .string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $" -gUnknown_0862B9AE:: @ 862B9AE +gText_NamingScreenKeyboard_56789:: @ 862B9AE .string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $" -gUnknown_0862B9C7:: @ 862B9C7 +gText_NamingScreenKeyboard_Symbols1:: @ 862B9C7 .string "{CLEAR 12}!{CLEAR 17}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 17}-$" -gUnknown_0862B9E0:: @ 862B9E0 +gText_NamingScreenKeyboard_Symbols2:: @ 862B9E0 .string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 19}'{CLEAR 18} $" -gUnknown_0862B9F9:: @ 862B9F9 +gText_UnionRoomChatKeyboard_ABCDE:: @ 862B9F9 .string "ABCDE$" -gUnknown_0862B9FF:: @ 862B9FF +gText_UnionRoomChatKeyboard_FGHIJ:: @ 862B9FF .string "FGHIJ$" -gUnknown_0862BA05:: @ 862BA05 +gText_UnionRoomChatKeyboard_KLMNO:: @ 862BA05 .string "KLMNO$" -gUnknown_0862BA0B:: @ 862BA0B +gText_UnionRoomChatKeyboard_PQRST:: @ 862BA0B .string "PQRST$" -gUnknown_0862BA11:: @ 862BA11 +gText_UnionRoomChatKeyboard_UVWXY:: @ 862BA11 .string "UVWXY$" -gUnknown_0862BA17:: @ 862BA17 +gText_UnionRoomChatKeyboard_Z:: @ 862BA17 .string "Z $" -gUnknown_0862BA1D:: @ 862BA1D +gText_UnionRoomChatKeyboard_01234Upper:: @ 862BA1D .string "01234$" -gUnknown_0862BA23:: @ 862BA23 +gText_UnionRoomChatKeyboard_56789Upper:: @ 862BA23 .string "56789$" -gUnknown_0862BA29:: @ 862BA29 +gText_UnionRoomChatKeyboard_PunctuationUpper:: @ 862BA29 .string ".,!? $" -gUnknown_0862BA2F:: @ 862BA2F +gText_UnionRoomChatKeyboard_SymbolsUpper:: @ 862BA2F .string "-/&… $" -gUnknown_0862BA35:: @ 862BA35 +gText_UnionRoomChatKeyboard_abcde:: @ 862BA35 .string "abcde$" -gUnknown_0862BA3B:: @ 862BA3B +gText_UnionRoomChatKeyboard_fghij:: @ 862BA3B .string "fghij$" -gUnknown_0862BA41:: @ 862BA41 +gText_UnionRoomChatKeyboard_klmno:: @ 862BA41 .string "klmno$" -gUnknown_0862BA47:: @ 862BA47 +gText_UnionRoomChatKeyboard_pqrst:: @ 862BA47 .string "pqrst$" -gUnknown_0862BA4D:: @ 862BA4D +gText_UnionRoomChatKeyboard_uvwxy:: @ 862BA4D .string "uvwxy$" -gUnknown_0862BA53:: @ 862BA53 +gText_UnionRoomChatKeyboard_z:: @ 862BA53 .string "z $" -gUnknown_0862BA59:: @ 862BA59 +gText_UnionRoomChatKeyboard_01234Lower:: @ 862BA59 .string "01234$" -gUnknown_0862BA5F:: @ 862BA5F +gText_UnionRoomChatKeyboard_56789Lower:: @ 862BA5F .string "56789$" -gUnknown_0862BA65:: @ 862BA65 +gText_UnionRoomChatKeyboard_PunctuationLower:: @ 862BA65 .string ".,!? $" -gUnknown_0862BA6B:: @ 862BA6B +gText_UnionRoomChatKeyboard_SymbolsLower:: @ 862BA6B .string "-/&… $" .string "$$$$$$$$" -gUnknown_0862BA79:: @ 862BA79 +gText_UnionRoomChatKeyboard_Emoji1:: @ 862BA79 .string "{EMOJI_MISCHIEVOUS}{EMOJI_HAPPY}{EMOJI_ANGRY}{EMOJI_SURPRISED}{EMOJI_BIGANGER}$" -gUnknown_0862BA84:: @ 862BA84 +gText_UnionRoomChatKeyboard_Emoji2:: @ 862BA84 .string "{EMOJI_BIGSMILE}{EMOJI_EVIL}{EMOJI_NEUTRAL}{EMOJI_TIRED}{EMOJI_SHOCKED}$" -gUnknown_0862BA8F:: @ 862BA8F +gText_UnionRoomChatKeyboard_Emoji3:: @ 862BA8F .string "{EMOJI_LEAF}{EMOJI_FIRE}{EMOJI_WATER}{EMOJI_BOLT}{EMOJI_BALL}$" -gUnknown_0862BA9A:: @ 862BA9A +gText_UnionRoomChatKeyboard_Emoji4:: @ 862BA9A .string "♂♀{EMOJI_LEFT_PAREN}{EMOJI_RIGHT_PAREN}{EMOJI_TILDE}$" -gUnknown_0862BAA3:: @ 862BAA3 +gText_UnionRoomChatKeyboard_Emoji5:: @ 862BAA3 .string "{EMOJI_LEFT_EYE}{EMOJI_RIGHT_EYE}{EMOJI_SMALLWHEEL}{EMOJI_SPHERE}{EMOJI_IRRITATED}$" -gUnknown_0862BAAE:: @ 862BAAE +gText_UnionRoomChatKeyboard_Emoji6:: @ 862BAAE .string "{EMOJI_AT}{EMOJI_BIGWHEEL}{EMOJI_TONGUE}{EMOJI_ACUTE}{EMOJI_GRAVE}$" -gUnknown_0862BAB9:: @ 862BAB9 +gText_UnionRoomChatKeyboard_Emoji7:: @ 862BAB9 .string "{EMOJI_RIGHT_FIST}{EMOJI_LEFT_FIST}{EMOJI_TRIANGLE_OUTLINE}{EMOJI_UNION}{EMOJI_GREATER_THAN}$" -gUnknown_0862BAC4:: @ 862BAC4 +gText_UnionRoomChatKeyboard_Emoji8:: @ 862BAC4 .string "{EMOJI_CIRCLE}{EMOJI_TRIANGLE}{EMOJI_SQUARE}{EMOJI_HEART}{EMOJI_MOON}$" -gUnknown_0862BACF:: @ 862BACF +gText_UnionRoomChatKeyboard_Emoji9:: @ 862BACF .string "{EMOJI_NOTE}{EMOJI_PLUS}{EMOJI_MINUS}{EMOJI_EQUALS}{EMOJI_PIPE}$" -gUnknown_0862BADA:: @ 862BADA +gText_UnionRoomChatKeyboard_Emoji10:: @ 862BADA .string "{EMOJI_HIGHBAR}{EMOJI_UNDERSCORE};: $" |