diff options
219 files changed, 7953 insertions, 7657 deletions
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 997af51cc..c605099e1 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1267,7 +1267,7 @@ various \battler, 4 .endm - .macro resetintrimidatetracebits battler:req + .macro resetintimidatetracebits battler:req various \battler, VARIOUS_RESET_INTIMIDATE_TRACE_BITS .endm diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 57bb504bd..39510c207 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1468,31 +1468,34 @@ .byte \location .endm - .macro mossdeepgym1 unknown:req + @ For the rotating tile puzzles in Mossdeep Gym/Trick House Room 7. Moves the objects on the colored puzzle specified by puzzleNumber one rotation + .macro moverotatingtileobjects puzzleNumber:req .byte 0xd3 - .2byte \unknown + .2byte \puzzleNumber .endm - .macro mossdeepgym2 + @ For the rotating tile puzzles in Mossdeep Gym/Trick House Room 7. Updates the facing direction of all objects on the puzzle tiles + .macro turnrotatingtileobjects .byte 0xd4 .endm - @ In FireRed, this command is a nop. - .macro mossdeepgym3 var:req + @ For the rotating tile puzzles in Mossdeep Gym/Trick House Room 7. Allocates memory for the puzzle objects. isTrickHouse is needed to determine which of the two maps the puzzle is on, in order to know where in the tileset the puzzle tiles start. In FireRed, this command is a nop. + .macro initrotatingtilepuzzle isTrickHouse:req .byte 0xd5 - .2byte \var + .2byte \isTrickHouse .endm - .macro mossdeepgym4 + @ For the rotating tile puzzles in Mossdeep Gym/Trick House Room 7. Frees the memory allocated for the puzzle objects. + .macro freerotatingtilepuzzle .byte 0xd6 .endm - .macro warp7 map:req, byte:req, word1:req, word2:req + .macro warpmossdeepgym map:req, warpId:req, x:req, y:req .byte 0xd7 map \map - .byte \byte - .2byte \word1 - .2byte \word2 + .byte \warpId + .2byte \x + .2byte \y .endm .macro cmdD8 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 244a3ac05..027db364c 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/event_scripts.s b/data/event_scripts.s index e6a6397d4..9b40a0851 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -15,6 +15,7 @@ #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" @@ -24,6 +25,7 @@ #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" @@ -583,6 +585,7 @@ gStdScripts_End:: @ 81DC2CC .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 @@ -632,10 +635,6 @@ Common_EventScript_SaveGame:: @ 827134F waitstate return -EventScript_271354:: @ 8271354 - cmdD8 - cmdD9 - .include "data/scripts/trainer_battle.inc" Std_MsgboxAutoclose:: @ 8271494 @@ -647,6 +646,7 @@ Std_MsgboxAutoclose:: @ 8271494 .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 @@ -712,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 @@ -726,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 @@ -736,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 @@ -760,7 +760,7 @@ Common_EventScript_UpdateBrineyLocation:: @ 82718DE goto_if_set FLAG_DEFEATED_PETALBURG_GYM, Common_EventScript_NopReturn 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_108_MR_BRINEY, EventScript_SetBrineyLocation_Route108 + goto_if_unset FLAG_HIDE_ROUTE_109_MR_BRINEY, EventScript_SetBrineyLocation_Route109 return EventScript_SetBrineyLocation_House:: @ 827190C @@ -771,246 +771,16 @@ EventScript_SetBrineyLocation_Dewford:: @ 8271912 setvar VAR_BRINEY_LOCATION, 2 return -EventScript_SetBrineyLocation_Route108:: @ 8271918 +EventScript_SetBrineyLocation_Route109:: @ 8271918 setvar VAR_BRINEY_LOCATION, 3 return .include "data/scripts/pkmn_center_nurse.inc" - -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 gText_ObtainedTheItem - 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 gText_ObtainedTheMon - waitfanfare - msgbox gText_TheMonWasTransferredToThePC, 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, BATTLE_PYRAMID_FUNC_IS_IN - 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 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_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 - + .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 @@ -1037,173 +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_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 - -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 + .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 @@ -1250,17 +861,18 @@ EventScript_RegionMap:: @ 827208F end Common_EventScript_PlayBrineysBoatMusic:: @ 82720A0 - setflag FLAG_SPECIAL_FLAG_0x4001 + setflag FLAG_DONT_TRANSITION_MUSIC playbgm MUS_M_BOAT, 0 return Common_EventScript_StopBrineysBoatMusic:: @ 82720A8 - clearflag FLAG_SPECIAL_FLAG_0x4001 + clearflag FLAG_DONT_TRANSITION_MUSIC fadedefaultbgm 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 @@ -1277,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 @@ -1348,60 +960,13 @@ Common_EventScript_PlayerHandedOverTheItem:: @ 82723E4 .include "data/scripts/elite_four.inc" .include "data/scripts/movement.inc" .include "data/scripts/check_furniture.inc" - -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!$" - + .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" -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?$" - -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_ObtainedTheMon:: @ 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_TheMonWasTransferredToThePC:: @ 8272B48 - .string "The {STR_VAR_2} was transferred\n" - .string "to the PC.$" - +@ The below and surf.inc could be split into some text/notices.inc gText_PokemartSign:: @ 8272B6A .string "“Selected items for your convenience!”\n" .string "POKéMON MART$" @@ -1508,7 +1073,7 @@ gText_ThankYouForAccessingMysteryGift:: @ 8273178 .string "Thank you for accessing the\n" .string "MYSTERY GIFT System.$" -gText_PlayerFoundOneItemTwoLines:: @ 82731A9 +gText_PlayerFoundOneTMHM:: @ 82731A9 .string "{PLAYER} found one {STR_VAR_1}\n" .string "{STR_VAR_2}!$" @@ -1520,38 +1085,7 @@ gText_Sudowoodo_Attacked:: @ 82731BD gText_LegendaryFlewAway:: @ 8273204 .string "The {STR_VAR_1} flew away!$" -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_PkmnBoxSomeonesPCFull:: @ 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_PkmnBoxLanettesPCFull:: @ 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}?$" - + .include "data/text/pc_transfer.inc" .include "data/text/mevent.inc" .include "data/text/unusual_weather.inc" @@ -1601,89 +1135,10 @@ Common_EventScript_LegendaryFlewAway:: @ 8273776 release end -@ 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 - -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 - -Common_EventScript_NoMoreRoomForPokemon:: @ 8273811 - msgbox gText_NoMoreRoomForPokemon, MSGBOX_DEFAULT - release - end - + .include "data/scripts/pc_transfer.inc" .include "data/scripts/mevent.inc" .include "data/scripts/unusual_weather.inc" - -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/trainer_script.inc" .include "data/scripts/berry_tree.inc" .include "data/scripts/secret_base.inc" .include "data/scripts/cable_club.inc" @@ -1703,24 +1158,12 @@ EventScript_GotoTrainerScript:: @ 82742F6 .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" .include "data/scripts/pokeblocks.inc" .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" .include "data/scripts/roulette.inc" .include "data/text/pokedex_rating.inc" @@ -1742,17 +1185,7 @@ Text_RepelWoreOff: @ 82A4B33 .include "data/text/move_tutors.inc" .include "data/scripts/move_tutors.inc" .include "data/scripts/trainer_hill.inc" - -Text_ThisIsATestSignpostMsg:: @ 82C840A - .string "This is a test message.\n" - .string "This is a signpost.$" - -EventScript_TestSignpostMsg:: @ 82C8436 - msgbox Text_ThisIsATestSignpostMsg, MSGBOX_SIGN - end - + .include "data/scripts/test_signpost.inc" .include "data/text/frontier_brain.inc" - - .align 2 .include "data/text/save.inc" .include "data/text/birch_speech.inc" 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 5170716d7..ab968b6dd 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -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, B_OUTCOME_WON - goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 + goto_if_eq BattleFrontier_OutsideEast_EventScript_RemoveSudowoodo compare VAR_RESULT, B_OUTCOME_RAN - goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 + goto_if_eq BattleFrontier_OutsideEast_EventScript_RemoveSudowoodo compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 + 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 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/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index ac0155df9..862d91bf3 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -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 @@ -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 @@ -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 @@ -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/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index a36031664..34853336d 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 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 59ca317a7..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 Common_EventScript_SetGymTrainers - call FortreeCity_Gym_EventScript_21666A + 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/GraniteCave_B1F/scripts.inc b/data/maps/GraniteCave_B1F/scripts.inc index afd77cf10..f465b0694 100644 --- a/data/maps/GraniteCave_B1F/scripts.inc +++ b/data/maps/GraniteCave_B1F/scripts.inc @@ -5,7 +5,7 @@ GraniteCave_B1F_MapScripts:: @ 822DC5E .byte 0 GraniteCave_B1F_SetHoleWarp: @ 822DC6E - setstepcallback 7 + setstepcallback STEP_CB_CRACKED_FLOOR setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0 end 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/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 2a12ab5a2..62ef6e1a9 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -5,7 +5,7 @@ JaggedPass_MapScripts:: @ 8230656 .byte 0 JaggedPass_MapScript1_230666: @ 8230666 - setstepcallback 1 + setstepcallback STEP_CB_ASH compare VAR_JAGGED_PASS_STATE, 0 call_if_eq JaggedPass_EventScript_230674 end 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/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 3d6284600..59c173cf9 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -1,93 +1,94 @@ 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 @@ -95,16 +96,16 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E applymovement 4, Common_Movement_Delay48 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft - applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C + 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 + 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 +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 130781f23..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_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 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 @@ -74,13 +74,13 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 delay 10 playbgm MUS_BOY_SUP, 1 compare VAR_FACING, DIR_NORTH - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8507 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth compare VAR_FACING, DIR_SOUTH - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8536 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanSouth compare VAR_FACING, DIR_WEST - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8565 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanWest compare VAR_FACING, DIR_EAST - call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8594 + 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_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_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_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_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 +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 74654f7ee..55736f652 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -1,93 +1,94 @@ 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 @@ -95,16 +96,16 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE applymovement 4, Common_Movement_Delay48 waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight - applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC + 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 + 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 +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 31a097ead..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_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 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 @@ -75,13 +74,13 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A delay 10 playbgm MUS_GIRL_SUP, 1 compare VAR_FACING, DIR_NORTH - call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F93BA + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth compare VAR_FACING, DIR_SOUTH - call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F93E9 + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth compare VAR_FACING, DIR_WEST - call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9418 + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMayWest compare VAR_FACING, DIR_EAST - call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9440 + 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_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_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_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_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 +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 283be0477..f9c4b46d7 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -366,7 +366,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC end LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2:: @ 81FA0F2 - call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0 + call Common_EventScript_TransferredToPC goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD end @@ -411,7 +411,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D end LittlerootTown_ProfessorBirchsLab_EventScript_1FA193:: @ 81FA193 - call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0 + call Common_EventScript_TransferredToPC goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E end @@ -456,7 +456,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E end LittlerootTown_ProfessorBirchsLab_EventScript_1FA234:: @ 81FA234 - call LittlerootTown_ProfessorBirchsLab_EventScript_2737A0 + call Common_EventScript_TransferredToPC goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F 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/MirageTower_2F/scripts.inc b/data/maps/MirageTower_2F/scripts.inc index 2ccf628c0..888288633 100644 --- a/data/maps/MirageTower_2F/scripts.inc +++ b/data/maps/MirageTower_2F/scripts.inc @@ -5,7 +5,7 @@ MirageTower_2F_MapScripts:: @ 823AD11 .byte 0 MirageTower_2F_SetHoleWarp: @ 823AD21 - setstepcallback 7 + 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 854619f1c..a54b2ccca 100644 --- a/data/maps/MirageTower_3F/scripts.inc +++ b/data/maps/MirageTower_3F/scripts.inc @@ -5,7 +5,7 @@ MirageTower_3F_MapScripts:: @ 823AD2C .byte 0 MirageTower_3F_SetHoleWarp: @ 823AD3C - setstepcallback 7 + setstepcallback STEP_CB_CRACKED_FLOOR setholewarp MAP_MIRAGE_TOWER_2F, 255, 0, 0 end 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 0b0bed197..fc6a45d84 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -1,64 +1,68 @@ 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 @@ -74,11 +78,11 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 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 + 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_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 33b30e1d0..cc50ff37a 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -113,7 +113,7 @@ MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD 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/scripts.inc b/data/maps/MtChimney/scripts.inc index 3316b653b..71ee724b5 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -8,7 +8,7 @@ MtChimney_OnTransition: @ 822EDCC end MtChimney_MapScript1_22EDD2: @ 822EDD2 - setstepcallback 1 + setstepcallback STEP_CB_ASH end MtChimney_EventScript_22EDD5:: @ 822EDD5 diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index f8efe996e..be98ac8e7 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -5,7 +5,7 @@ MtPyre_2F_MapScripts:: @ 82310FB .byte 0 MtPyre_2F_SetHoleWarp: @ 823110B - setstepcallback 7 + setstepcallback STEP_CB_CRACKED_FLOOR setholewarp MAP_MT_PYRE_1F, 255, 0, 0 end 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 8e3950cae..88f73d39b 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -5,92 +5,93 @@ OldaleTown_MapScripts:: @ 81E8EA2 OldaleTown_OnTransition: @ 81E8EA8 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 DIR_SOUTH, OldaleTown_EventScript_1E8F47 - case DIR_NORTH, OldaleTown_EventScript_1E8F5E - case DIR_EAST, 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_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_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_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 +OldaleTown_EventScript_DoExitMovement1:: @ 81E9148 compare VAR_FACING, DIR_SOUTH - goto_if_ne OldaleTown_EventScript_1E915E - applymovement 4, OldaleTown_Movement_1E9177 + 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 38b978d45..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 gText_HowMayIServeYou waitmessage - goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_1FC26C - pokemart OldaleTown_Mart_Pokemart_1FC260 + 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 +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 9df202d09..4e54cc8e4 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -8,7 +8,7 @@ OldaleTown_PokemonCenter_1F_OnTransition: @ 81FC011 call Common_EventScript_UpdateBrineyLocation end -OldaleTown_PokemonCenter_1F_EventScript_1FC01A:: @ 81FC01A +OldaleTown_PokemonCenter_1F_EventScript_Nurse:: @ 81FC01A setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -16,46 +16,46 @@ OldaleTown_PokemonCenter_1F_EventScript_1FC01A:: @ 81FC01A 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/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/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 c20b3fa30..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 + 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 + 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_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_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_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_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_WalkInPlaceFastestRight waitmovement 0 delay 30 - msgbox PetalburgCity_Text_1DCB82, MSGBOX_DEFAULT + msgbox PetalburgCity_Text_WellMaybeNot, MSGBOX_DEFAULT closemessage 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 4da701395..f6a21b0b8 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -1,97 +1,98 @@ 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_WalkInPlaceFastestDown - applymovement 10, PetalburgCity_Gym_Movement_2049EC + applymovement 10, PetalburgCity_Gym_Movement_WallyExitGym waitmovement 0 playse SE_KAIDAN removeobject 10 @@ -99,121 +100,121 @@ PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 delay 30 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 DIR_SOUTH, PetalburgCity_Gym_EventScript_204A80 - case DIR_NORTH, PetalburgCity_Gym_EventScript_204A8B - case DIR_WEST, PetalburgCity_Gym_EventScript_204A96 - case DIR_EAST, 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 +PetalburgCity_Gym_EventScript_WallyArriveSouth:: @ 8204C31 applymovement 1, Common_Movement_WalkInPlaceFastestDown - applymovement 10, PetalburgCity_Gym_Movement_2050EB + 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_WalkInPlaceFastestRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -PetalburgCity_Gym_EventScript_204C5F:: @ 8204C5F +PetalburgCity_Gym_EventScript_WallyArriveWestEast:: @ 8204C5F applymovement 1, Common_Movement_WalkInPlaceFastestDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown - applymovement 10, PetalburgCity_Gym_Movement_2050EB + applymovement 10, PetalburgCity_Gym_Movement_WallyArrive waitmovement 0 return -PetalburgCity_Gym_EventScript_204C78:: @ 8204C78 +PetalburgCity_Gym_EventScript_ExitGymWithWallySouth:: @ 8204C78 applymovement 1, Common_Movement_WalkInPlaceFastestDown - applymovement 10, PetalburgCity_Gym_Movement_205102 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_205111 + 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 +PetalburgCity_Gym_EventScript_NormanAddressPlayerSouth:: @ 8204CC7 applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -PetalburgCity_Gym_EventScript_204CD2:: @ 8204CD2 +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 +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 +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 +PetalburgCity_Gym_EventScript_NormanAddressWallySouth:: @ 8204D08 applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_204D13:: @ 8204D13 +PetalburgCity_Gym_EventScript_NormanAddressWallyNorth:: @ 8204D13 applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -PetalburgCity_Gym_EventScript_204D1E:: @ 8204D1E +PetalburgCity_Gym_EventScript_NormanAddressWallyWest:: @ 8204D1E applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_204D29:: @ 8204D29 +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 +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 +@ 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 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 DIR_NORTH, PetalburgCity_Gym_EventScript_204EF5 - case DIR_WEST, PetalburgCity_Gym_EventScript_204F09 - case DIR_EAST, 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 +PetalburgCity_Gym_EventScript_WallysUncleFaceNormanNorth:: @ 8204FCC applymovement 11, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return -PetalburgCity_Gym_EventScript_204FD7:: @ 8204FD7 +PetalburgCity_Gym_EventScript_WallysUncleFaceNormanEast:: @ 8204FD7 applymovement 11, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -PetalburgCity_Gym_EventScript_204FE2:: @ 8204FE2 +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_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_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_WalkInPlaceFastestDown applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return -PetalburgCity_Gym_EventScript_205041:: @ 8205041 - applymovement 11, PetalburgCity_Gym_Movement_20507E +PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleNorth:: @ 8205041 + applymovement 11, PetalburgCity_Gym_Movement_WallysUncleExitNorth applymovement 1, Common_Movement_WalkInPlaceFastestDown - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2050A1 + 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 + msgbox PetalburgCity_Gym_Text_EnterSpeedRoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + 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 + msgbox PetalburgCity_Gym_Text_EnterAccuracyRoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + 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 + msgbox PetalburgCity_Gym_Text_EnterConfusionRoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + 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 + msgbox PetalburgCity_Gym_Text_EnterDefenseRoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + 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 + msgbox PetalburgCity_Gym_Text_EnterDefenseRoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + 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 + msgbox PetalburgCity_Gym_Text_EnterRecoveryRoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + 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 + msgbox PetalburgCity_Gym_Text_EnterStrengthRoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + 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 + msgbox PetalburgCity_Gym_Text_EnterStrengthRoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + 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 + msgbox PetalburgCity_Gym_Text_EnterOHKORoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + 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 + msgbox PetalburgCity_Gym_Text_EnterOHKORoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + 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 + msgbox PetalburgCity_Gym_Text_EnterGymLeadersRoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + 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 + msgbox PetalburgCity_Gym_Text_EnterGymLeadersRoom, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_EnterRoom compare VAR_RESULT, 0 - goto_if_eq PetalburgCity_Gym_EventScript_20517B + 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 0b4d9808f..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 gText_HowMayIServeYou waitmessage - goto_if_set FLAG_PETALBURG_MART_EXPANDED_ITEMS, PetalburgCity_Mart_EventScript_207DA6 - pokemart PetalburgCity_Mart_Pokemart_207D8C + 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 +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 a5b069d94..60b56837c 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -8,7 +8,7 @@ PetalburgCity_PokemonCenter_1F_OnTransition: @ 82079F3 call Common_EventScript_UpdateBrineyLocation end -PetalburgCity_PokemonCenter_1F_EventScript_2079FC:: @ 82079FC +PetalburgCity_PokemonCenter_1F_EventScript_Nurse:: @ 82079FC setvar VAR_0x800B, 1 call Common_EventScript_PkmnCenterNurse waitmessage @@ -16,64 +16,64 @@ PetalburgCity_PokemonCenter_1F_EventScript_2079FC:: @ 82079FC 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_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 5a194c721..79179ffa6 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_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_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_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 + 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_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 + 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 +PetalburgWoods_EventScript_TryRegisterJames:: @ 822E2C5 special sub_80B4808 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 7e8cfb959..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" }, { @@ -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 3b5b22b37..de28aa251 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -8,79 +8,79 @@ Route101_OnTransition: @ 81EBCC5 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_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 @@ -227,9 +227,9 @@ Route101_EventScript_1EBE16:: @ 81EBE16 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 58adf4456..3c79e8c61 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 + compare VAR_RESULT, TRUE + goto_if_eq Route102_EventScript_CalvinRematch setvar VAR_0x8004, TRAINER_CALVIN_1 specialvar VAR_RESULT, IsTrainerRegistered - compare VAR_RESULT, 0 - goto_if_eq Route102_EventScript_1EC170 - msgbox Route102_Text_2945AC, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq Route102_EventScript_CalvinTryRegister + msgbox Route102_Text_CalvinPostBattle, MSGBOX_DEFAULT release end -Route102_EventScript_1EC146:: @ 81EC146 +Route102_EventScript_CalvinRegisterMatchCallAfterBattle:: @ 81EC146 special sub_80B4808 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 8f5b9f2b3..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" }, { @@ -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 9a185aa14..b54ede043 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -1,6 +1,6 @@ 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 @@ -8,26 +8,26 @@ Route103_OnTransition: @ 81EC399 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 DIR_SOUTH, Route103_EventScript_1EC585 - case DIR_NORTH, Route103_EventScript_1EC53D - case DIR_WEST, Route103_EventScript_1EC561 - case DIR_EAST, 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 +Route102_EventScript_MiguelRegisterMatchCallAfterBattle:: @ 81EC714 special sub_80B4808 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 c943066f9..9c31aadb5 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -1,15 +1,15 @@ 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 @@ -355,13 +355,13 @@ 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 Common_EventScript_PlayBrineysBoatMusic @@ -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 @@ -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 diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index b2baff82b..68fe98ffd 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -74,7 +74,7 @@ Route104_MrBrineysHouse_EventScript_229E1D:: @ 8229E1D Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27 msgbox Route104_MrBrineysHouse_Text_229FE9, MSGBOX_DEFAULT - call Route104_MrBrineysHouse_EventScript_271E95 + call EventScript_BackupMrBrineyLocation setvar VAR_BOARD_BRINEY_BOAT_STATE, 1 clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY 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 0b8d2217f..dc5bd2ce9 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -4,48 +4,48 @@ 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, TRUE + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_ExplainBerries + compare VAR_RESULT, FALSE + 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, TRUE + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_ExplainBerries + compare VAR_RESULT, FALSE + 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 +Route104_PrettyPetalFlowerShop_EventScript_SellDecorations:: @ 822A3E4 message gText_PlayerWhatCanIDoForYou waitmessage pokemartdecoration2 Route104_PrettyPetalFlowerShop_Pokemart_Plants @@ -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 ff4b3dbe1..1b892642e 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -1,18 +1,18 @@ 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 @@ -26,63 +26,63 @@ Route105_OnTransition: @ 81EE21E 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 +Route105_EventScript_AndresRegisterMatchCallAfterBattle:: @ 81EE300 special sub_80B4808 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..eb545cab8 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 +Route106_EventScript_ElliotRegisterMatchCallAfterBattle:: @ 81EE4ED special sub_80B4808 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..936634d8d 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 +Route107_EventScript_TonyRegisterMatchCallAfterBattle:: @ 81EE5D8 special sub_80B4808 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..4f049f71d 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 +Route108_EventScript_CoryRegisterMatchCallAfterBattle:: @ 81EE729 special sub_80B4808 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 a4ac60a9c..adaab110b 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 DIR_SOUTH, Route109_EventScript_1EE7A5 - case DIR_WEST, Route109_EventScript_1EE7C5 - case DIR_EAST, 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 Common_EventScript_PlayBrineysBoatMusic - applymovement 1, Route109_Movement_1EE84F - applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE84F + applymovement 1, Route109_Movement_SailToDewford + applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_SailToDewford waitmovement 0 delay 50 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, FALSE + 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 +Route109_EventScript_RickyRegisterMatchCallAfterBattle:: @ 81EEAC5 special sub_80B4808 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 +Route109_EventScript_LolaRegisterMatchCallAfterBattle:: @ 81EEB27 special sub_80B4808 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 cafd99a9c..68ae1d573 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -1,10 +1,10 @@ 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 @@ -12,300 +12,300 @@ Route110_OnTransition: @ 81EF27D 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 +Route110_EventScript_EdwinRegisterMatchCallAfterBattle:: @ 81EF44C special sub_80B4808 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 +Route110_EventScript_BenjaminRegisterMatchCallAfterBattle:: @ 81EF4F3 special sub_80B4808 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 +Route110_EventScript_AbigailRegisterMatchCallAfterBattle:: @ 81EF56C special sub_80B4808 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 +Route110_EventScript_IsabelRegisterMatchCallAfterBattle:: @ 81EF5CE special sub_80B4808 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_WalkInPlaceFastestRight waitmovement 0 @@ -315,74 +315,74 @@ 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 + call_if_eq Route110_EventScript_PlayBrendanMusic applymovement 28, Common_Movement_WalkInPlaceFastestDown waitmovement 0 applymovement 28, Common_Movement_ExclamationMark @@ -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,14 +621,14 @@ 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_WalkInPlaceFastestLeft @@ -640,101 +640,101 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 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_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 fceacdfcc..8121265bb 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 diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index e8fb08ee4..3e1b1754f 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 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 661bd938c..38b231111 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -5,7 +5,7 @@ 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 UnusualWeather_EventScript_HideMapNamePopup compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index ac47539c7..1e415dd41 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -112,7 +112,7 @@ Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD end Route119_WeatherInstitute_2F_EventScript_2700D0:: @ 82700D0 - call Route119_WeatherInstitute_2F_EventScript_2737A0 + call Common_EventScript_TransferredToPC goto Route119_WeatherInstitute_2F_EventScript_2700EA end diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index 47f472a3d..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" }, { diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 0629d8f0d..562416c1d 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -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 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 88c4ac03d..054f6cee8 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 + msgbox Route121_SafariZoneEntrance_Text_WelcomeFirstTime, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq Route121_SafariZoneEntrance_EventScript_22BC0E - msgbox Route121_SafariZoneEntrance_Text_2A4E7E, MSGBOX_DEFAULT + 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_WalkInPlaceFastestUp waitmovement 0 showmoneybox 0, 0, 0 - msgbox Route121_SafariZoneEntrance_Text_2A4F74, MSGBOX_YESNO + msgbox Route121_SafariZoneEntrance_Text_WouldYouLikeToPlay, 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 + 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/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index 0784f523c..acdcb9528 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -185,7 +185,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96 end RustboroCity_DevonCorp_2F_EventScript_211AB9:: @ 8211AB9 - call RustboroCity_DevonCorp_2F_EventScript_2737A0 + call Common_EventScript_TransferredToPC goto RustboroCity_DevonCorp_2F_EventScript_211AD7 end @@ -234,7 +234,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39 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/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 a6c3629bc..96a9a61ea 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 + goto_if_unset FLAG_GOOD_LUCK_SAFARI_ZONE, SafariZone_South_EventScript_GoodLuck + msgbox SafariZone_South_Text_StillHaveTimeExit, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq SafariZone_South_EventScript_23D31A - msgbox SafariZone_South_Text_2A521A, MSGBOX_DEFAULT + 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 DIR_NORTH, SafariZone_South_EventScript_23D33F - case DIR_EAST, 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/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc index 6dd71f51b..8a02974ea 100644 --- a/data/maps/SkyPillar_2F/scripts.inc +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -15,7 +15,7 @@ SkyPillar_2F_EventScript_CleanFloor:: @ 823964C return SkyPillar_2F_SetHoleWarp: @ 8239650 - setstepcallback 7 + 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 009a1a567..af54deaff 100644 --- a/data/maps/SkyPillar_4F/scripts.inc +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -15,7 +15,7 @@ SkyPillar_4F_EventScript_CleanFloor:: @ 8239692 return SkyPillar_4F_SetHoleWarp: @ 8239696 - setstepcallback 7 + setstepcallback STEP_CB_CRACKED_FLOOR setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0 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 fa69aadc2..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 @@ -110,11 +107,11 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 clearflag FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1 setvar VAR_0x8008, 8 call Common_EventScript_SetGymTrainers - call SootopolisCity_Gym_1F_EventScript_224FD4 + 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/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..5a6a1e613 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -211,11 +211,11 @@ 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 diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 63d1f0bcc..6de5ccf47 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 @@ -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,6 +103,7 @@ 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 @@ -116,7 +119,7 @@ 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 @@ -165,10 +168,9 @@ 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 @@ -185,7 +187,7 @@ BerryTree_EventScript_WaterBerry:: @ 82744C4 BerryTree_EventScript_PlantBerry:: @ 82744DD special EventObjectInteractionPlantBerryTree incrementgamestat GAME_STAT_PLANTED_BERRIES - special sub_80EED10 + special IncrementDailyPlantedBerries special EventObjectInteractionGetBerryCountString message BerryTree_Text_PlantedOneBerry waitmessage 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 0f8d71f6b..7ed366aca 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, DIR_NORTH - call_if_eq Route111_EventScript_28CF94 + call_if_eq GabbyAndTy_EventScript_FacePlayerNorth compare VAR_FACING, DIR_SOUTH - call_if_eq Route111_EventScript_28CF9F + call_if_eq GabbyAndTy_EventScript_FacePlayerSouth compare VAR_FACING, DIR_EAST - 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 + 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 +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 +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, DIR_NORTH - call_if_eq Route111_EventScript_28CF94 + call_if_eq GabbyAndTy_EventScript_FacePlayerNorth compare VAR_FACING, DIR_SOUTH - call_if_eq Route111_EventScript_28CF9F + call_if_eq GabbyAndTy_EventScript_FacePlayerSouth compare VAR_FACING, DIR_EAST - call_if_eq Route111_EventScript_28CFB1 - goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE + 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 +GabbyAndTy_EventScript_Interview:: @ 828D0A7 compare VAR_RESULT, 0 - goto_if_eq Route111_EventScript_28D0E1 - msgbox Route111_Text_28B433, MSGBOX_DEFAULT + 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/lilycove_lady.inc b/data/scripts/lilycove_lady.inc index 77b842d3d..5f6621fa3 100644 --- a/data/scripts/lilycove_lady.inc +++ b/data/scripts/lilycove_lady.inc @@ -1,455 +1,453 @@ -LilycoveCity_PokemonCenter_1F_EventScript_2A836B:: @ 82A836B +LilycoveCity_PokemonCenter_1F_EventScript_LilycoveLady:: @ 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 + 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_2A8395:: @ 82A8395 +LilycoveCity_PokemonCenter_1F_EventScript_FavorLady:: @ 82A8395 lock faceplayer - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A69, MSGBOX_DEFAULT + 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_2A83D0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyReady compare VAR_RESULT, LILYCOVE_LADY_STATE_COMPLETED - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83C6 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyCompleted compare VAR_RESULT, LILYCOVE_LADY_STATE_PRIZE - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8510 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyPrize end -LilycoveCity_PokemonCenter_1F_EventScript_2A83C6:: @ 82A83C6 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8AB1, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyCompleted:: @ 82A83C6 + msgbox LilycoveCity_PokemonCenter_1F_Text_ThankYouForLastTime, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A83D0:: @ 82A83D0 +LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyReady:: @ 82A83D0 special BufferFavorLadyRequest - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A7D, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_ObsessedWithThing, 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 + 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_2A83F7:: @ 82A83F7 +LilycoveCity_PokemonCenter_1F_EventScript_TellAboutPlayersItem:: @ 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 + 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_2A8419:: @ 82A8419 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8ACE, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8435 +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_2A8427:: @ 82A8427 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8B36, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8435 +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_2A8435:: @ 82A8435 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8B69, MSGBOX_YESNO +LilycoveCity_PokemonCenter_1F_EventScript_RequestItem:: @ 82A8435 + msgbox LilycoveCity_PokemonCenter_1F_Text_WillYouShareThing, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A845E + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AcceptFavor end -LilycoveCity_PokemonCenter_1F_EventScript_2A8454:: @ 82A8454 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BCD, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor:: @ 82A8454 + msgbox LilycoveCity_PokemonCenter_1F_Text_IsThatSoGoodbye, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A845E:: @ 82A845E - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BAD, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A846C +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_2A846C:: @ 82A846C +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_2A848E + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChooseFavorItem compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84AD + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GiveFavorItem end -LilycoveCity_PokemonCenter_1F_EventScript_2A848E:: @ 82A848E - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BEE, MSGBOX_YESNO +LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChooseFavorItem:: @ 82A848E + msgbox LilycoveCity_PokemonCenter_1F_Text_NotWillingToShare, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A846C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem end -LilycoveCity_PokemonCenter_1F_EventScript_2A84AD:: @ 82A84AD +LilycoveCity_PokemonCenter_1F_EventScript_GiveFavorItem:: @ 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 + 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_2A84C9:: @ 82A84C9 +LilycoveCity_PokemonCenter_1F_EventScript_DidntLikeFavorItem:: @ 82A84C9 special BufferFavorLadyRequest - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8C0F, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_IllTryToCherishIt, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A84D6:: @ 82A84D6 +LilycoveCity_PokemonCenter_1F_EventScript_CheckLovedItem:: @ 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 + 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_2A84F2:: @ 82A84F2 +LilycoveCity_PokemonCenter_1F_EventScript_LikedFavorItem:: @ 82A84F2 special BufferFavorLadyRequest - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8C6F, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_IWillCherishThis, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A84FF:: @ 82A84FF +LilycoveCity_PokemonCenter_1F_EventScript_LovedFavorItem:: @ 82A84FF special BufferFavorLadyRequest - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8CC8, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8510 + msgbox LilycoveCity_PokemonCenter_1F_Text_IWillTreasureThis, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyPrize end -LilycoveCity_PokemonCenter_1F_EventScript_2A8510:: @ 82A8510 +LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyPrize:: @ 82A8510 setvar VAR_0x8004, 0 specialvar VAR_0x8004, FavorLadyGetPrize - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8D5D, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_IllGiveYouThisInReturn, MSGBOX_DEFAULT giveitem_std VAR_0x8004 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8545 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoRoomForFavorPrize compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A854F + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ReceivedFavorPrize end -LilycoveCity_PokemonCenter_1F_EventScript_2A8545:: @ 82A8545 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8DBD, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_NoRoomForFavorPrize:: @ 82A8545 + msgbox LilycoveCity_PokemonCenter_1F_Text_YouDontHaveSpaceForIt, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A854F:: @ 82A854F +LilycoveCity_PokemonCenter_1F_EventScript_ReceivedFavorPrize:: @ 82A854F special SetFavorLadyState_Complete release end -LilycoveCity_PokemonCenter_1F_EventScript_2A8554:: @ 82A8554 +LilycoveCity_PokemonCenter_1F_EventScript_QuizLady:: @ 82A8554 lock faceplayer - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8E2B, MSGBOX_DEFAULT + 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_2A8585 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_HasQuiz compare VAR_RESULT, LILYCOVE_LADY_STATE_COMPLETED - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85AC + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_CheckMadeQuiz compare VAR_RESULT, LILYCOVE_LADY_STATE_PRIZE - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86EC + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ReadyGivePrize end -LilycoveCity_PokemonCenter_1F_EventScript_2A8585:: @ 82A8585 +LilycoveCity_PokemonCenter_1F_EventScript_HasQuiz:: @ 82A8585 specialvar VAR_RESULT, GetQuizAuthor compare VAR_RESULT, QUIZ_AUTHOR_PLAYER - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85C8 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_WaitingToTakeYourQuiz compare VAR_RESULT, QUIZ_AUTHOR_OTHER_PLAYER - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85D2 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_PlayerQuizReady compare VAR_RESULT, QUIZ_AUTHOR_LADY - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85E0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_LadyQuizReady end -LilycoveCity_PokemonCenter_1F_EventScript_2A85AC:: @ 82A85AC +LilycoveCity_PokemonCenter_1F_EventScript_CheckMadeQuiz:: @ 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 + 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_2A85C8:: @ 82A85C8 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8E4E, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_WaitingToTakeYourQuiz:: @ 82A85C8 + msgbox LilycoveCity_PokemonCenter_1F_Text_WaitingToTakeYourQuiz, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A85D2:: @ 82A85D2 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EAC, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A85EE +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_2A85E0:: @ 82A85E0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EAC, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A85EE +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_2A85EE:: @ 82A85EE +LilycoveCity_PokemonCenter_1F_EventScript_AskTakeQuiz:: @ 82A85EE setvar VAR_0x8004, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EEC, MSGBOX_YESNO + msgbox LilycoveCity_PokemonCenter_1F_Text_TakeQuizChallenge, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_TakeQuiz compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8612 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineQuiz end -LilycoveCity_PokemonCenter_1F_EventScript_2A8612:: @ 82A8612 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F65, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_DeclineQuiz:: @ 82A8612 + msgbox LilycoveCity_PokemonCenter_1F_Text_HowBoringBye, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A861C:: @ 82A861C +LilycoveCity_PokemonCenter_1F_EventScript_TakeQuiz:: @ 82A861C special ClearQuizLadyPlayerAnswer compare VAR_0x8004, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A864C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ShowQuestion compare VAR_0x8004, EASY_CHAT_TYPE_QUIZ_ANSWER - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8656 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GetAnswer -LilycoveCity_PokemonCenter_1F_EventScript_2A8635:: @ 82A8635 +LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState:: @ 82A8635 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8660 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskQuitQuiz compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8689 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_SubmitQuizResponse end -LilycoveCity_PokemonCenter_1F_EventScript_2A864C:: @ 82A864C +LilycoveCity_PokemonCenter_1F_EventScript_ShowQuestion:: @ 82A864C special QuizLadyShowQuizQuestion waitstate - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8635 + goto LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState end -LilycoveCity_PokemonCenter_1F_EventScript_2A8656:: @ 82A8656 +LilycoveCity_PokemonCenter_1F_EventScript_GetAnswer:: @ 82A8656 special QuizLadyGetPlayerAnswer waitstate - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8635 + goto LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState end -LilycoveCity_PokemonCenter_1F_EventScript_2A8660:: @ 82A8660 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F7E, MSGBOX_YESNO +LilycoveCity_PokemonCenter_1F_EventScript_AskQuitQuiz:: @ 82A8660 + msgbox LilycoveCity_PokemonCenter_1F_Text_YoureGoingToQuit, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A867F + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_QuitTakingQuiz compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_TakeQuiz end -LilycoveCity_PokemonCenter_1F_EventScript_2A867F:: @ 82A867F - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F9A, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_QuitTakingQuiz:: @ 82A867F + msgbox LilycoveCity_PokemonCenter_1F_Text_TakeTheQuizAnotherTime, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A8689:: @ 82A8689 +LilycoveCity_PokemonCenter_1F_EventScript_SubmitQuizResponse:: @ 82A8689 special SetQuizLadyState_Complete - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F4D, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_WaitForAnswer, 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 + 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_2A86B0:: @ 82A86B0 +LilycoveCity_PokemonCenter_1F_EventScript_CorrectResponse:: @ 82A86B0 playse SE_SEIKAI delay 10 playse SE_SEIKAI - msgbox LilycoveCity_PokemonCenter_1F_Text_2A8FC7, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A86EC + msgbox LilycoveCity_PokemonCenter_1F_Text_YouGotItRight, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_ReadyGivePrize end -LilycoveCity_PokemonCenter_1F_EventScript_2A86C7:: @ 82A86C7 +LilycoveCity_PokemonCenter_1F_EventScript_IncorrectResponse:: @ 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 + 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_2A86EC:: @ 82A86EC +LilycoveCity_PokemonCenter_1F_EventScript_ReadyGivePrize:: @ 82A86EC specialvar VAR_RESULT, BufferQuizAuthorNameAndCheckIfLady compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8708 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GivePrize1 compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8716 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GivePrize0 end -LilycoveCity_PokemonCenter_1F_EventScript_2A8708:: @ 82A8708 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9007, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8724 +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_2A8716:: @ 82A8716 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9007, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8724 +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_2A8724:: @ 82A8724 +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_2A874C - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8759 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoSpaceForQuizPrize + goto LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz end -LilycoveCity_PokemonCenter_1F_EventScript_2A874C:: @ 82A874C - msgbox LilycoveCity_PokemonCenter_1F_Text_2A906A, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_NoSpaceForQuizPrize:: @ 82A874C + msgbox LilycoveCity_PokemonCenter_1F_Text_YourBagIsFilledUp, MSGBOX_DEFAULT special SetQuizLadyState_GivePrize release end -LilycoveCity_PokemonCenter_1F_EventScript_2A8759:: @ 82A8759 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A90FB, MSGBOX_YESNO +LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz:: @ 82A8759 + msgbox LilycoveCity_PokemonCenter_1F_Text_MakeYourOwnQuiz, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8785 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_MakeQuiz compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz end -LilycoveCity_PokemonCenter_1F_EventScript_2A8778:: @ 82A8778 +LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz:: @ 82A8778 special QuizLadyPickNewQuestion - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9131, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_MaybeNextTime, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A8785:: @ 82A8785 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9153, MSGBOX_DEFAULT - -LilycoveCity_PokemonCenter_1F_EventScript_2A878D:: @ 82A878D +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_2A87AF + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChoosingPrize compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87CE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_WriteQuiz end -LilycoveCity_PokemonCenter_1F_EventScript_2A87AF:: @ 82A87AF - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9212, MSGBOX_YESNO +LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChoosingPrize:: @ 82A87AF + msgbox LilycoveCity_PokemonCenter_1F_Text_QuitChoosingPrize, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A878D + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_PickPrize end -LilycoveCity_PokemonCenter_1F_EventScript_2A87CE:: @ 82A87CE - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9270, MSGBOX_DEFAULT +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_2A87E1:: @ 82A87E1 +LilycoveCity_PokemonCenter_1F_EventScript_WriteQuizQuestion:: @ 82A87E1 fadescreen 1 special QuizLadySetCustomQuestion waitstate compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87F8 - goto LilycoveCity_PokemonCenter_1F_EventScript_2A8817 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskQuitWritingQuizQuestion + goto LilycoveCity_PokemonCenter_1F_EventScript_FinishMakingQuiz end -LilycoveCity_PokemonCenter_1F_EventScript_2A87F8:: @ 82A87F8 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A92D3, MSGBOX_YESNO +LilycoveCity_PokemonCenter_1F_EventScript_AskQuitWritingQuizQuestion:: @ 82A87F8 + msgbox LilycoveCity_PokemonCenter_1F_Text_QuitWritingQuizQuestion, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87E1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_WriteQuizQuestion end -LilycoveCity_PokemonCenter_1F_EventScript_2A8817:: @ 82A8817 +LilycoveCity_PokemonCenter_1F_EventScript_FinishMakingQuiz:: @ 82A8817 special QuizLadyTakePrizeForCustomQuiz special QuizLadyRecordCustomQuizData special QuizLadySetWaitingForChallenger - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9336, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_IllLookForAChallenger, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A882A:: @ 82A882A +LilycoveCity_PokemonCenter_1F_EventScript_ContestLady:: @ 82A882A lock faceplayer - msgbox LilycoveCity_PokemonCenter_1F_Text_2A93A7, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_ImTheContestLady, 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 + 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 0 here -LilycoveCity_PokemonCenter_1F_EventScript_2A8850:: @ 82A8850 +@ Redundant with above script, VAR_RESULT will always be FALSE here +LilycoveCity_PokemonCenter_1F_EventScript_NotGivenPokeblock:: @ 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 + 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_2A886C:: @ 82A886C - msgbox LilycoveCity_PokemonCenter_1F_Text_2A93D6, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_GivenPokeblock:: @ 82A886C + msgbox LilycoveCity_PokemonCenter_1F_Text_ThankForPokeblock, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A8876:: @ 82A8876 +LilycoveCity_PokemonCenter_1F_EventScript_AskForPokeblock:: @ 82A8876 special Script_BufferContestLadyCategoryAndMonName - msgbox LilycoveCity_PokemonCenter_1F_Text_2A93F4, MSGBOX_DEFAULT + 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, 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 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88BA + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock end -LilycoveCity_PokemonCenter_1F_EventScript_2A88B0:: @ 82A88B0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9556, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock:: @ 82A88B0 + msgbox LilycoveCity_PokemonCenter_1F_Text_WhatACheapskate, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_EventScript_2A88BA:: @ 82A88BA +LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock:: @ 82A88BA fadescreen 1 special OpenPokeblockCaseForContestLady waitstate compare VAR_RESULT, 0xFFFF - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88D7 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskQuitGivingPokeblock compare VAR_RESULT, 0xFFFF - goto_if_ne LilycoveCity_PokemonCenter_1F_EventScript_2A88F6 + goto_if_ne LilycoveCity_PokemonCenter_1F_EventScript_GivePokeblock end -LilycoveCity_PokemonCenter_1F_EventScript_2A88D7:: @ 82A88D7 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9537, MSGBOX_YESNO +LilycoveCity_PokemonCenter_1F_EventScript_AskQuitGivingPokeblock:: @ 82A88D7 + msgbox LilycoveCity_PokemonCenter_1F_Text_ICantHaveOnePokeblock, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock compare VAR_RESULT, 0 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88BA + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock end -LilycoveCity_PokemonCenter_1F_EventScript_2A88F6:: @ 82A88F6 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9571, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_GivePokeblock:: @ 82A88F6 + msgbox LilycoveCity_PokemonCenter_1F_Text_IllUseYourPokeblock, MSGBOX_DEFAULT special SetContestLadyGivenPokeblock special GetContestLadyMonSpecies - goto LilycoveCity_PokemonCenter_1F_EventScript_2A890A + goto LilycoveCity_PokemonCenter_1F_EventScript_FeedPokeblock end @ VAR_0x8004 here is the return value from GivePokeblockToContestLady -LilycoveCity_PokemonCenter_1F_EventScript_2A890A:: @ 82A890A - applymovement 4, LilycoveCity_PokemonCenter_1F_Movement_2A89B8 +LilycoveCity_PokemonCenter_1F_EventScript_FeedPokeblock:: @ 82A890A + applymovement 4, LilycoveCity_PokemonCenter_1F_Movement_LadyFaceMon waitmovement 0 delay 60 - applymovement 5, LilycoveCity_PokemonCenter_1F_Movement_2A89BB + applymovement 5, LilycoveCity_PokemonCenter_1F_Movement_MonFaceLady waitmovement 0 delay 60 waitse @@ -457,194 +455,194 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A890A:: @ 82A890A delay 120 waitmoncry compare VAR_0x8004, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A893F - goto LilycoveCity_PokemonCenter_1F_EventScript_2A894C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_MonEnjoyPokeblock + goto LilycoveCity_PokemonCenter_1F_EventScript_FinishFeedPokeblock end -LilycoveCity_PokemonCenter_1F_EventScript_2A893F:: @ 82A893F - applymovement 5, LilycoveCity_PokemonCenter_1F_Movement_2A89C2 +@ 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 - -@ VAR_0x8004 here is the return value from GivePokeblockToContestLady -LilycoveCity_PokemonCenter_1F_EventScript_2A894C:: @ 82A894C - applymovement 4, LilycoveCity_PokemonCenter_1F_Movement_2A89C0 +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_2A8970 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_MonDislikedPokeblock compare VAR_0x8004, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A897E + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_MonLikedPokeblock end -LilycoveCity_PokemonCenter_1F_EventScript_2A8970:: @ 82A8970 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A95AD, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A898F +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_2A897E:: @ 82A897E +LilycoveCity_PokemonCenter_1F_EventScript_MonLikedPokeblock:: @ 82A897E special Script_BufferContestLadyCategoryAndMonName - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9605, MSGBOX_DEFAULT - goto LilycoveCity_PokemonCenter_1F_EventScript_2A898F + msgbox LilycoveCity_PokemonCenter_1F_Text_ReallyImprovedThanks, MSGBOX_DEFAULT + goto LilycoveCity_PokemonCenter_1F_EventScript_CheckAirContestLadyShow end -LilycoveCity_PokemonCenter_1F_EventScript_2A898F:: @ 82A898F +LilycoveCity_PokemonCenter_1F_EventScript_CheckAirContestLadyShow:: @ 82A898F specialvar VAR_RESULT, ShouldContestLadyShowGoOnAir compare VAR_RESULT, 1 - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A89A1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AirContestLadyShow release end -LilycoveCity_PokemonCenter_1F_EventScript_2A89A1:: @ 82A89A1 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9669, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_AirContestLadyShow:: @ 82A89A1 + msgbox LilycoveCity_PokemonCenter_1F_Text_ReadyToEnterContests, MSGBOX_DEFAULT special PutLilycoveContestLadyShowOnTheAir release end -LilycoveCity_PokemonCenter_1F_EventScript_2A89AE:: @ 82A89AE - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9451, MSGBOX_DEFAULT +LilycoveCity_PokemonCenter_1F_EventScript_NoPokeblockCase:: @ 82A89AE + msgbox LilycoveCity_PokemonCenter_1F_Text_DontHaveAPokeblockCase, MSGBOX_DEFAULT release end -LilycoveCity_PokemonCenter_1F_Movement_2A89B8: @ 82A89B8 +LilycoveCity_PokemonCenter_1F_Movement_LadyFaceMon: @ 82A89B8 face_right delay_8 step_end -LilycoveCity_PokemonCenter_1F_Movement_2A89BB: @ 82A89BB +LilycoveCity_PokemonCenter_1F_Movement_MonFaceLady: @ 82A89BB face_left delay_8 step_end -LilycoveCity_PokemonCenter_1F_Movement_2A89BE: @ 82A89BE +@ Unused +LilycoveCity_PokemonCenter_1F_Movement_MonFaceDown: @ 82A89BE face_down step_end -LilycoveCity_PokemonCenter_1F_Movement_2A89C0: @ 82A89C0 +LilycoveCity_PokemonCenter_1F_Movement_LadyFacePlayer: @ 82A89C0 face_player step_end -LilycoveCity_PokemonCenter_1F_Movement_2A89C2: @ 82A89C2 +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_2A89C7:: @ 82A89C7 +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_2A8A0A + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_Zigzagoon compare VAR_RESULT, CONTEST_CATEGORY_BEAUTY - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A1D + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_Skitty compare VAR_RESULT, CONTEST_CATEGORY_CUTE - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A30 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_Poochyena compare VAR_RESULT, CONTEST_CATEGORY_SMART - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A43 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_Kecleon compare VAR_RESULT, CONTEST_CATEGORY_TOUGH - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A56 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_Pikachu end -LilycoveCity_PokemonCenter_1F_EventScript_2A8A0A:: @ 82A8A0A +LilycoveCity_PokemonCenter_1F_EventScript_Zigzagoon:: @ 82A8A0A lock faceplayer waitse playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A96DA, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_Zigzagoon, MSGBOX_DEFAULT waitmoncry release end -LilycoveCity_PokemonCenter_1F_EventScript_2A8A1D:: @ 82A8A1D +LilycoveCity_PokemonCenter_1F_EventScript_Skitty:: @ 82A8A1D lock faceplayer waitse playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A970E, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_Skitty, MSGBOX_DEFAULT waitmoncry release end -LilycoveCity_PokemonCenter_1F_EventScript_2A8A30:: @ 82A8A30 +LilycoveCity_PokemonCenter_1F_EventScript_Poochyena:: @ 82A8A30 lock faceplayer waitse playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A96F6, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_Poochyena, MSGBOX_DEFAULT waitmoncry release end -LilycoveCity_PokemonCenter_1F_EventScript_2A8A43:: @ 82A8A43 +LilycoveCity_PokemonCenter_1F_EventScript_Kecleon:: @ 82A8A43 lock faceplayer waitse playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A96E6, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_Kecleon, MSGBOX_DEFAULT waitmoncry release end -LilycoveCity_PokemonCenter_1F_EventScript_2A8A56:: @ 82A8A56 +LilycoveCity_PokemonCenter_1F_EventScript_Pikachu:: @ 82A8A56 lock faceplayer waitse playmoncry VAR_0x8005, 0 - msgbox LilycoveCity_PokemonCenter_1F_Text_2A9703, MSGBOX_DEFAULT + msgbox LilycoveCity_PokemonCenter_1F_Text_Pikachu, MSGBOX_DEFAULT waitmoncry release end -LilycoveCity_PokemonCenter_1F_Text_2A8A69: @ 82A8A69 +LilycoveCity_PokemonCenter_1F_Text_ImTheFavorLady: @ 82A8A69 .string "I'm the FAVOR LADY…$" -LilycoveCity_PokemonCenter_1F_Text_2A8A7D: @ 82A8A7D +LilycoveCity_PokemonCenter_1F_Text_ObsessedWithThing: @ 82A8A7D .string "I've recently developed an obsession\n" .string "for {STR_VAR_1} things…$" -LilycoveCity_PokemonCenter_1F_Text_2A8AB1: @ 82A8AB1 +LilycoveCity_PokemonCenter_1F_Text_ThankYouForLastTime: @ 82A8AB1 .string "Oh…\n" .string "Thank you for last time…$" -LilycoveCity_PokemonCenter_1F_Text_2A8ACE: @ 82A8ACE +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_2A8B36: @ 82A8B36 +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_2A8B69: @ 82A8B69 +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_2A8BAD: @ 82A8BAD +LilycoveCity_PokemonCenter_1F_Text_WhatWillYouGiveMe: @ 82A8BAD .string "…Really?\n" .string "What will you give me?$" -LilycoveCity_PokemonCenter_1F_Text_2A8BCD: @ 82A8BCD +LilycoveCity_PokemonCenter_1F_Text_IsThatSoGoodbye: @ 82A8BCD .string "Is that so?\n" .string "Then, it's good-bye…$" -LilycoveCity_PokemonCenter_1F_Text_2A8BEE: @ 82A8BEE +LilycoveCity_PokemonCenter_1F_Text_NotWillingToShare: @ 82A8BEE .string "Oh…\n" .string "You're not willing to share?$" -LilycoveCity_PokemonCenter_1F_Text_2A8C0F: @ 82A8C0F +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_2A8C6F: @ 82A8C6F +LilycoveCity_PokemonCenter_1F_Text_IWillCherishThis: @ 82A8C6F .string "Oh…\p" .string "That's a quite {STR_VAR_1}\n" .string "{STR_VAR_2}…\p" @@ -653,7 +651,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A8C6F: @ 82A8C6F .string "Thank you…\n" .string "I will cherish this…$" -LilycoveCity_PokemonCenter_1F_Text_2A8CC8: @ 82A8CC8 +LilycoveCity_PokemonCenter_1F_Text_IWillTreasureThis: @ 82A8CC8 .string "…Oh, oh, oh…\p" .string "This is amazing!\n" .string "This really is {STR_VAR_1}!\p" @@ -663,89 +661,90 @@ LilycoveCity_PokemonCenter_1F_Text_2A8CC8: @ 82A8CC8 .string "I will treasure this for the rest\n" .string "of my life!$" -LilycoveCity_PokemonCenter_1F_Text_2A8D5D: @ 82A8D5D +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_2A8DBD: @ 82A8DBD +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_2A8E2B: @ 82A8E2B +LilycoveCity_PokemonCenter_1F_Text_ImTheQuizLady: @ 82A8E2B .string "I'm the QUIZ LADY!\n" .string "I love quizzes!$" -LilycoveCity_PokemonCenter_1F_Text_2A8E4E: @ 82A8E4E +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_2A8EAC: @ 82A8EAC +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_2A8EEC: @ 82A8EEC +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_2A8F4D: @ 82A8F4D +LilycoveCity_PokemonCenter_1F_Text_WaitForAnswer: @ 82A8F4D .string "… … … … … …\n" .string "… … … … … …$" -LilycoveCity_PokemonCenter_1F_Text_2A8F65: @ 82A8F65 +LilycoveCity_PokemonCenter_1F_Text_HowBoringBye: @ 82A8F65 .string "Oh, how boring!\n" .string "Bye-bye!$" -LilycoveCity_PokemonCenter_1F_Text_2A8F7E: @ 82A8F7E +LilycoveCity_PokemonCenter_1F_Text_YoureGoingToQuit: @ 82A8F7E .string "Awww!\n" .string "You're going to quit?$" -LilycoveCity_PokemonCenter_1F_Text_2A8F9A: @ 82A8F9A +LilycoveCity_PokemonCenter_1F_Text_TakeTheQuizAnotherTime: @ 82A8F9A .string "Please take the quiz challenge\n" .string "another time!$" -LilycoveCity_PokemonCenter_1F_Text_2A8FC7: @ 82A8FC7 +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_2A9007: @ 82A9007 +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}!$" -LilycoveCity_PokemonCenter_1F_Text_2A9056: @ 82A9056 +@ Unused +LilycoveCity_PokemonCenter_1F_Text_XReceivedOneY: @ 82A9056 .string "{STR_VAR_1} received\n" .string "one {STR_VAR_2}!$" -LilycoveCity_PokemonCenter_1F_Text_2A906A: @ 82A906A +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_2A90A5: @ 82A90A5 +LilycoveCity_PokemonCenter_1F_Text_WrongTheCorrectAnswerIs: @ 82A90A5 .string "Hmm… Wrong!\n" .string "The correct answer is “{STR_VAR_3}”!$" -LilycoveCity_PokemonCenter_1F_Text_2A90CD: @ 82A90CD +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_2A90FB: @ 82A90FB +LilycoveCity_PokemonCenter_1F_Text_MakeYourOwnQuiz: @ 82A90FB .string "Listen, listen!\n" .string "Would you like to make your own quiz?$" -LilycoveCity_PokemonCenter_1F_Text_2A9131: @ 82A9131 +LilycoveCity_PokemonCenter_1F_Text_MaybeNextTime: @ 82A9131 .string "Oh, I see…\n" .string "Well, maybe next time!$" -LilycoveCity_PokemonCenter_1F_Text_2A9153: @ 82A9153 +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" @@ -753,46 +752,47 @@ LilycoveCity_PokemonCenter_1F_Text_2A9153: @ 82A9153 .string "the quiz can't get it right, I get to\l" .string "keep the prize!$" -LilycoveCity_PokemonCenter_1F_Text_2A9212: @ 82A9212 +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_2A9270: @ 82A9270 +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_2A92D3: @ 82A92D3 +LilycoveCity_PokemonCenter_1F_Text_QuitWritingQuizQuestion: @ 82A92D3 .string "Are you going to quit writing\n" .string "your quiz question?$" -LilycoveCity_PokemonCenter_1F_Text_2A9305: @ 82A9305 +@ Unused +LilycoveCity_PokemonCenter_1F_Text_QuitWritingQuizAnswer: @ 82A9305 .string "Are you going to quit choosing\n" .string "your quiz answer?$" -LilycoveCity_PokemonCenter_1F_Text_2A9336: @ 82A9336 +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_2A93A7: @ 82A93A7 +LilycoveCity_PokemonCenter_1F_Text_ImTheContestLady: @ 82A93A7 .string "I'm the CONTEST LADY!\n" .string "I sure do love CONTESTS!$" -LilycoveCity_PokemonCenter_1F_Text_2A93D6: @ 82A93D6 +LilycoveCity_PokemonCenter_1F_Text_ThankForPokeblock: @ 82A93D6 .string "Thanks for your {POKEBLOCK} before!$" -LilycoveCity_PokemonCenter_1F_Text_2A93F4: @ 82A93F4 +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_2A9451: @ 82A9451 +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" @@ -800,57 +800,57 @@ LilycoveCity_PokemonCenter_1F_Text_2A9451: @ 82A9451 .string "Don't you have a {POKEBLOCK} CASE?\l" .string "That's no good. Next time, then!$" -LilycoveCity_PokemonCenter_1F_Text_2A94E8: @ 82A94E8 +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_2A9537: @ 82A9537 +LilycoveCity_PokemonCenter_1F_Text_ICantHaveOnePokeblock: @ 82A9537 .string "Awww!\n" .string "I can't have one {POKEBLOCK}?!$" -LilycoveCity_PokemonCenter_1F_Text_2A9556: @ 82A9556 +LilycoveCity_PokemonCenter_1F_Text_WhatACheapskate: @ 82A9556 .string "Sheesh!\n" .string "What a cheapskate!$" -LilycoveCity_PokemonCenter_1F_Text_2A9571: @ 82A9571 +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_2A95AD: @ 82A95AD +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_2A9605: @ 82A9605 +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_2A9669: @ 82A9669 +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_2A96DA: @ 82A96DA +LilycoveCity_PokemonCenter_1F_Text_Zigzagoon: @ 82A96DA .string "{STR_VAR_1}: Guguuh!$" -LilycoveCity_PokemonCenter_1F_Text_2A96E6: @ 82A96E6 +LilycoveCity_PokemonCenter_1F_Text_Kecleon: @ 82A96E6 .string "{STR_VAR_1}: Igigigiiih!$" -LilycoveCity_PokemonCenter_1F_Text_2A96F6: @ 82A96F6 +LilycoveCity_PokemonCenter_1F_Text_Poochyena: @ 82A96F6 .string "{STR_VAR_1}: Baaarun…$" -LilycoveCity_PokemonCenter_1F_Text_2A9703: @ 82A9703 +LilycoveCity_PokemonCenter_1F_Text_Pikachu: @ 82A9703 .string "{STR_VAR_1}: Pikka!$" -LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E +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..deeec7721 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 + msgbox MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToHearMySong, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0C7 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PlaySong compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0EA + 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 +MauvilleCity_PokemonCenter_1F_EventScript_AskToWriteLyrics:: @ 828E0F4 + msgbox MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToWriteSomeLyrics, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D + 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 + msgbox MauvilleCity_PokemonCenter_1F_Text_ThatHowYouWantedSongToGo, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 + 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 + msgbox MauvilleCity_PokemonCenter_1F_Text_WantToTradeDecor, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E503 + 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 + 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, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E56E + 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, TRUE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_NoRoomForDecor + msgbox MauvilleCity_PokemonCenter_1F_Text_SoWellTradeTheseDecor, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E584 + 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 + msgbox MauvilleCity_PokemonCenter_1F_Text_WillYouHearMyTale, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 + 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, 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, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 + 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 + msgbox MauvilleCity_PokemonCenter_1F_Text_HearMyStory, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290317 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTellTale compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_29037A + 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/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 index 5bc4bf780..c88208708 100644 --- a/data/scripts/new_game.inc +++ b/data/scripts/new_game.inc @@ -102,7 +102,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE 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_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 @@ -117,7 +117,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE 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_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 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_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/players_house.inc b/data/scripts/players_house.inc index f88d3af6c..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 EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerWalkIn applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end -LittlerootTown_BrendansHouse_1F_EventScript_29274D:: @ 829274D +PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale:: @ 829274D applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return -LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758 +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_WalkInPlaceFastestUp - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AF0 + 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,41 +65,41 @@ 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_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_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 +PlayersHouse_2F_EventScript_CheckWallClock:: @ 829283F incrementgamestat GAME_STAT_CHECKED_CLOCK fadescreen 1 special Special_ViewWallClock @@ -111,13 +107,13 @@ LittlerootTown_BrendansHouse_2F_EventScript_29283F:: @ 829283F 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 +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 + 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 +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 + 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 +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 GAME_STAT_RESTED_AT_HOME - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D5C, MSGBOX_DEFAULT + 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_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_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_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_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_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_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 @@ -709,5 +698,5 @@ LittlerootTown_BrendansHouse_1F_Movement_292DDE: @ 8292DDE step_end EventScript_RunningShoesManual:: @ 8292DE5 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F66, MSGBOX_SIGN + msgbox PlayersHouse_1F_Text_RunningShoesManual, MSGBOX_SIGN end diff --git a/data/scripts/record_mix.inc b/data/scripts/record_mix.inc new file mode 100644 index 000000000..f70b7f83e --- /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, 1 + goto_if_eq EventScript_MixRecords + compare VAR_RESULT, 0 + 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/safari_zone.inc b/data/scripts/safari_zone.inc index 3539e0970..83cf5d16d 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 + msgbox SafariZone_Text_WouldYouLikeToExit, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq EventScript_2A4B85 + 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, 0xFFFF + goto_if_ne SafariZone_EventScript_PokeblockPresent + msgbox SafariZone_Text_PlacePokeblockOnFeeder, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_if_eq EventScript_2A4BD0 + 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/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 index 933835a73..3f83e38b0 100644 --- a/data/scripts/shared_secret_base.inc +++ b/data/scripts/shared_secret_base.inc @@ -20,7 +20,7 @@ SecretBase_MapScript2_OnFrame: @ 823B4AE .2byte 0 SecretBase_MapScript1_OnResume: @ 823B4B8 - setstepcallback 6 + setstepcallback STEP_CB_SECRET_BASE end SecretBase_EventScript_PC:: @ 823B4BB diff --git a/data/scripts/surf.inc b/data/scripts/surf.inc new file mode 100644 index 000000000..154cc53c2 --- /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, 0 + 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_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 ed279d478..427775a76 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -4,9 +4,9 @@ EventScript_TV:: @ 827EE0B 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 @@ -35,13 +35,13 @@ EventScript_27EE8A:: @ 827EE8A 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. diff --git a/data/specials.inc b/data/specials.inc index 2d4dfc43a..96d1e61cc 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -156,12 +156,12 @@ gSpecials:: @ 81DBA64 def_special DrawWholeMapView def_special StorePlayerCoordsInVars def_special MauvilleGymDeactivatePuzzle - def_special PetalburgGymSpecial1 - def_special PetalburgGymSpecial2 + 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 @@ -352,14 +352,14 @@ gSpecials:: @ 81DBA64 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 IncrementDailyPlantedBerries + def_special IncrementDailyPickedBerries def_special InitSecretBaseVars def_special SetSecretBaseSecretsTvFlags_SandOrnament def_special sub_80EB300 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/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/mauville_man.inc b/data/text/mauville_man.inc index 141808444..6326f5d8c 100644 --- a/data/text/mauville_man.inc +++ b/data/text/mauville_man.inc @@ -1,3 +1,4 @@ +@ Only contains a portion of the mauville_man text. The rest is in scripts/mauville_man.inc gText_SoPretty:: @ 8294295 .string " so pretty!$" 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_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/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/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/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/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/include/battle_anim.h b/include/battle_anim.h index ea9dc356f..503e23df2 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -101,7 +101,7 @@ void SetAnimSpriteInitialXOffset(struct Sprite *sprite, s16 a2); s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 a2); u8 GetBattlerYCoordWithElevation(u8 battlerId); void WaitAnimForDuration(struct Sprite *sprite); -void sub_80A7938(struct Sprite *sprite); +void AnimSnoreZ(struct Sprite *sprite); void InitAnimLinearTranslation(struct Sprite *sprite); void sub_80A6F98(struct Sprite *sprite); u8 GetBattlerSpriteBGPriority(u8 battlerId); @@ -141,13 +141,13 @@ bool8 AnimFastTranslateLinear(struct Sprite *sprite); void InitAndRunAnimFastLinearTranslation(struct Sprite *sprite); void TranslateMonSpriteLinear(struct Sprite *sprite); void TranslateSpriteLinear(struct Sprite *sprite); -void sub_80A77C8(struct Sprite *sprite); +void AnimSpriteOnMonPos(struct Sprite *sprite); void sub_80A7000(struct Sprite *sprite); void TranslateSpriteInCircleOverDuration(struct Sprite *sprite); void SetGreyscaleOrOriginalPalette(u16 a1, bool8 a2); void PrepareAffineAnimInTaskData(struct Task *task, u8 spriteId, const union AffineAnimCmd *affineAnimCmds); bool8 RunAffineAnimFromTaskData(struct Task *task); -void sub_80A78AC(struct Sprite *sprite); +void AnimThrowProjectile(struct Sprite *sprite); void sub_80A6BFC(struct BattleAnimBgData *unk, u8 unused); u8 sub_80A8394(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battlerId, u32 a10); void sub_80A749C(struct Sprite *sprite); @@ -221,11 +221,11 @@ void sub_8116EB4(u8); void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *arg8, const u32 *arg9, const u32 *palette); // battle_anim_effects_1.c -void sub_810310C(u8 battler, struct Sprite* sprite); +void SetSpriteNextToMonHead(u8 battler, struct Sprite* sprite); void AnimMoveTwisterParticle(struct Sprite* sprite); // water.c -void sub_8108C94(struct Sprite *sprite); +void AnimWaterPulseRing(struct Sprite *sprite); // flying.c void sub_810E2C8(struct Sprite *sprite); diff --git a/include/constants/easy_chat.h b/include/constants/easy_chat.h index 50f5994f4..b97c2aaf2 100644 --- a/include/constants/easy_chat.h +++ b/include/constants/easy_chat.h @@ -1095,6 +1095,7 @@ #define EC_WORD_OLD (EC_GROUP_TRENDY_SAYING << 9) | 0x1e #define EC_WORD_YOUNG (EC_GROUP_TRENDY_SAYING << 9) | 0x1f #define EC_WORD_UGLY (EC_GROUP_TRENDY_SAYING << 9) | 0x20 +#define NUM_ADDITIONAL_PHRASES 33 #define EC_POKEMON(mon) ((EC_GROUP_POKEMON << 9) | SPECIES_##mon) #define EC_POKEMON2(mon) ((EC_GROUP_POKEMON_2 << 9) | SPECIES_##mon) diff --git a/include/constants/field_tasks.h b/include/constants/field_tasks.h new file mode 100644 index 000000000..7f773855d --- /dev/null +++ b/include/constants/field_tasks.h @@ -0,0 +1,13 @@ +#ifndef GUARD_CONSTANTS_FIELD_TASKS_H +#define GUARD_CONSTANTS_FIELD_TASKS_H + +#define STEP_CB_DUMMY 0 +#define STEP_CB_ASH 1 +#define STEP_CB_FORTREE_BRIDGE 2 +#define STEP_CB_PACIFIDLOG_BRIDGE 3 +#define STEP_CB_SOOTOPOLIS_ICE 4 +#define STEP_CB_TRUCK 5 +#define STEP_CB_SECRET_BASE 6 +#define STEP_CB_CRACKED_FLOOR 7 + +#endif // GUARD_CONSTANTS_FIELD_TASKS_H diff --git a/include/constants/flags.h b/include/constants/flags.h index 56c06b1c7..4faedfa1f 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -109,10 +109,10 @@ #define FLAG_MET_TEAM_AQUA_HARBOR 0x61 #define FLAG_TV_EXPLAINED 0x62 #define FLAG_MAUVILLE_GYM_BARRIERS_STATE 0x63 -#define FLAG_MOSSDEEP_GYM_SWITCH_1 0x64 -#define FLAG_MOSSDEEP_GYM_SWITCH_2 0x65 -#define FLAG_MOSSDEEP_GYM_SWITCH_3 0x66 -#define FLAG_MOSSDEEP_GYM_SWITCH_4 0x67 +#define FLAG_MOSSDEEP_GYM_SWITCH_1 0x64 // Leftover from the RS version of Mossdeep Gym, functionally unused +#define FLAG_MOSSDEEP_GYM_SWITCH_2 0x65 // +#define FLAG_MOSSDEEP_GYM_SWITCH_3 0x66 // +#define FLAG_MOSSDEEP_GYM_SWITCH_4 0x67 // #define FLAG_UNUSED_0x068 0x68 // Unused Flag @@ -146,7 +146,7 @@ #define FLAG_DEFEATED_RIVAL_ROUTE103 0x82 #define FLAG_RECEIVED_DOLL_LANETTE 0x83 #define FLAG_RECEIVED_POTION_OLDALE 0x84 -#define FLAG_MOM_SAYS_GOODBYE 0x85 +#define FLAG_RECEIVED_AMULET_COIN 0x85 #define FLAG_PENDING_DAYCARE_EGG 0x86 #define FLAG_THANKED_FOR_PLAYING_WITH_WALLY 0x87 #define FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL 0x88 // Set after defeating Wally outside Mauville Gym. Will activate a call later to register Wally. @@ -163,9 +163,7 @@ #define FLAG_MR_BRINEY_SAILING_INTRO 0x93 #define FLAG_DOCK_REJECTED_DEVON_GOODS 0x94 #define FLAG_DELIVERED_DEVON_GOODS 0x95 - -#define FLAG_UNUSED_0x096 0x96 // Unused Flag - +#define FLAG_RECEIVED_CONTEST_PASS 0x96 // Unused, leftover from R/S #define FLAG_RECEIVED_CASTFORM 0x97 #define FLAG_RECEIVED_SUPER_ROD 0x98 #define FLAG_RUSTBORO_NPC_TRADE_COMPLETED 0x99 @@ -332,10 +330,10 @@ #define FLAG_MET_SCOTT_RUSTBORO 0x136 #define FLAG_WALLACE_GOES_TO_SKY_PILLAR 0x137 // Set after speaking to Wallace within the Cave of Origin. #define FLAG_RECEIVED_HM07 0x138 -#define FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS 0x139 // Beat Magma Grunt blocking Magma Hideout entrance. -#define FLAG_RECEIVED_AURORA_TICKET 0x13A // RECEIVED Aurora Ticket in Mystery Gift -#define FLAG_RECEIVED_MYSTIC_TICKET 0x13B // RECEIVED Mystic Ticket in Mystery Gift -#define FLAG_RECEIVED_OLD_SEA_MAP 0x13C // RECEIVED Old Sea Map in Mystery Gift +#define FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS 0x139 +#define FLAG_RECEIVED_AURORA_TICKET 0x13A +#define FLAG_RECEIVED_MYSTIC_TICKET 0x13B +#define FLAG_RECEIVED_OLD_SEA_MAP 0x13C #define FLAG_UNUSED_MYSTERY_GIFT_0x13D 0x13D #define FLAG_UNUSED_MYSTERY_GIFT_0x13E 0x13E #define FLAG_UNUSED_MYSTERY_GIFT_0x13F 0x13F @@ -355,8 +353,8 @@ #define FLAG_UNUSED_MYSTERY_GIFT_0x14D 0x14D #define FLAG_MIRAGE_TOWER_VISIBLE 0x14E -#define FLAG_CHOSE_CLAW_FOSSIL 0x14F // Player chose Claw Fossil -#define FLAG_CHOSE_ROOT_FOSSIL 0x150 // Player chose Root Fossil +#define FLAG_CHOSE_CLAW_FOSSIL 0x14F +#define FLAG_CHOSE_ROOT_FOSSIL 0x150 #define FLAG_RECEIVED_POWDER_JAR 0x151 #define FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER 0x152 @@ -650,6 +648,95 @@ #define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2 (FLAG_HIDDEN_ITEMS_START + 0x5D) #define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3 (FLAG_HIDDEN_ITEMS_START + 0x5E) +#define FLAG_UNUSED_0x264 0x264 // Unused Flag +#define FLAG_UNUSED_0x265 0x265 // Unused Flag +#define FLAG_UNUSED_0x266 0x266 // Unused Flag +#define FLAG_UNUSED_0x267 0x267 // Unused Flag +#define FLAG_UNUSED_0x268 0x268 // Unused Flag +#define FLAG_UNUSED_0x269 0x269 // Unused Flag +#define FLAG_UNUSED_0x26A 0x26A // Unused Flag +#define FLAG_UNUSED_0x26B 0x26B // Unused Flag +#define FLAG_UNUSED_0x26C 0x26C // Unused Flag +#define FLAG_UNUSED_0x26D 0x26D // Unused Flag +#define FLAG_UNUSED_0x26E 0x26E // Unused Flag +#define FLAG_UNUSED_0x26F 0x26F // Unused Flag +#define FLAG_UNUSED_0x270 0x270 // Unused Flag +#define FLAG_UNUSED_0x271 0x271 // Unused Flag +#define FLAG_UNUSED_0x272 0x272 // Unused Flag +#define FLAG_UNUSED_0x273 0x273 // Unused Flag +#define FLAG_UNUSED_0x274 0x274 // Unused Flag +#define FLAG_UNUSED_0x275 0x275 // Unused Flag +#define FLAG_UNUSED_0x276 0x276 // Unused Flag +#define FLAG_UNUSED_0x277 0x277 // Unused Flag +#define FLAG_UNUSED_0x278 0x278 // Unused Flag +#define FLAG_UNUSED_0x279 0x279 // Unused Flag +#define FLAG_UNUSED_0x27A 0x27A // Unused Flag +#define FLAG_UNUSED_0x27B 0x27B // Unused Flag +#define FLAG_UNUSED_0x27C 0x27C // Unused Flag +#define FLAG_UNUSED_0x27D 0x27D // Unused Flag +#define FLAG_UNUSED_0x27E 0x27E // Unused Flag +#define FLAG_UNUSED_0x27F 0x27F // Unused Flag +#define FLAG_UNUSED_0x280 0x280 // Unused Flag +#define FLAG_UNUSED_0x281 0x281 // Unused Flag +#define FLAG_UNUSED_0x282 0x282 // Unused Flag +#define FLAG_UNUSED_0x283 0x283 // Unused Flag +#define FLAG_UNUSED_0x284 0x284 // Unused Flag +#define FLAG_UNUSED_0x285 0x285 // Unused Flag +#define FLAG_UNUSED_0x286 0x286 // Unused Flag +#define FLAG_UNUSED_0x287 0x287 // Unused Flag +#define FLAG_UNUSED_0x288 0x288 // Unused Flag +#define FLAG_UNUSED_0x289 0x289 // Unused Flag +#define FLAG_UNUSED_0x28A 0x28A // Unused Flag +#define FLAG_UNUSED_0x28B 0x28B // Unused Flag +#define FLAG_UNUSED_0x28C 0x28C // Unused Flag +#define FLAG_UNUSED_0x28D 0x28D // Unused Flag +#define FLAG_UNUSED_0x28E 0x28E // Unused Flag +#define FLAG_UNUSED_0x28F 0x28F // Unused Flag +#define FLAG_UNUSED_0x290 0x290 // Unused Flag +#define FLAG_UNUSED_0x291 0x291 // Unused Flag +#define FLAG_UNUSED_0x292 0x292 // Unused Flag +#define FLAG_UNUSED_0x293 0x293 // Unused Flag +#define FLAG_UNUSED_0x294 0x294 // Unused Flag +#define FLAG_UNUSED_0x295 0x295 // Unused Flag +#define FLAG_UNUSED_0x296 0x296 // Unused Flag +#define FLAG_UNUSED_0x297 0x297 // Unused Flag +#define FLAG_UNUSED_0x298 0x298 // Unused Flag +#define FLAG_UNUSED_0x299 0x299 // Unused Flag +#define FLAG_UNUSED_0x29A 0x29A // Unused Flag +#define FLAG_UNUSED_0x29B 0x29B // Unused Flag +#define FLAG_UNUSED_0x29C 0x29C // Unused Flag +#define FLAG_UNUSED_0x29D 0x29D // Unused Flag +#define FLAG_UNUSED_0x29E 0x29E // Unused Flag +#define FLAG_UNUSED_0x29F 0x29F // Unused Flag +#define FLAG_UNUSED_0x2A0 0x2A0 // Unused Flag +#define FLAG_UNUSED_0x2A1 0x2A1 // Unused Flag +#define FLAG_UNUSED_0x2A2 0x2A2 // Unused Flag +#define FLAG_UNUSED_0x2A3 0x2A3 // Unused Flag +#define FLAG_UNUSED_0x2A4 0x2A4 // Unused Flag +#define FLAG_UNUSED_0x2A5 0x2A5 // Unused Flag +#define FLAG_UNUSED_0x2A6 0x2A6 // Unused Flag +#define FLAG_UNUSED_0x2A7 0x2A7 // Unused Flag +#define FLAG_UNUSED_0x2A8 0x2A8 // Unused Flag +#define FLAG_UNUSED_0x2A9 0x2A9 // Unused Flag +#define FLAG_UNUSED_0x2AA 0x2AA // Unused Flag +#define FLAG_UNUSED_0x2AB 0x2AB // Unused Flag +#define FLAG_UNUSED_0x2AC 0x2AC // Unused Flag +#define FLAG_UNUSED_0x2AD 0x2AD // Unused Flag +#define FLAG_UNUSED_0x2AE 0x2AE // Unused Flag +#define FLAG_UNUSED_0x2AF 0x2AF // Unused Flag +#define FLAG_UNUSED_0x2B0 0x2B0 // Unused Flag +#define FLAG_UNUSED_0x2B1 0x2B1 // Unused Flag +#define FLAG_UNUSED_0x2B2 0x2B2 // Unused Flag +#define FLAG_UNUSED_0x2B3 0x2B3 // Unused Flag +#define FLAG_UNUSED_0x2B4 0x2B4 // Unused Flag +#define FLAG_UNUSED_0x2B5 0x2B5 // Unused Flag +#define FLAG_UNUSED_0x2B6 0x2B6 // Unused Flag +#define FLAG_UNUSED_0x2B7 0x2B7 // Unused Flag +#define FLAG_UNUSED_0x2B8 0x2B8 // Unused Flag +#define FLAG_UNUSED_0x2B9 0x2B9 // Unused Flag +#define FLAG_UNUSED_0x2BA 0x2BA // Unused Flag +#define FLAG_UNUSED_0x2BB 0x2BB // Unused Flag + // Event Flags #define FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG 0x2BC #define FLAG_HIDE_APPRENTICE 0x2BD @@ -694,12 +781,12 @@ #define FLAG_HIDE_ROUTE_104_MR_BRINEY 0x2E2 #define FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY 0x2E3 #define FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN 0x2E4 -#define FLAG_HIDE_ROUTE_108_MR_BRINEY 0x2E5 +#define FLAG_HIDE_ROUTE_109_MR_BRINEY 0x2E5 #define FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT 0x2E6 #define FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN 0x2E7 #define FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT 0x2E8 #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN 0x2E9 -#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN 0x2EA +#define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY 0x2EA #define FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION 0x2EB #define FLAG_HIDE_LILYCOVE_HARBOR_EVENT_TICKET_TAKER 0x2EC #define FLAG_HIDE_SLATEPORT_CITY_SCOTT 0x2ED @@ -778,9 +865,7 @@ #define FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE 0x336 #define FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA 0x337 #define FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE 0x338 - -#define FLAG_UNUSED_0x339 0x339 // Unused Flag - +#define FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN 0x339 // Unused, leftover from R/S #define FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE 0x33A #define FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE 0x33B #define FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE 0x33C @@ -1549,7 +1634,7 @@ // Special Flags (Unknown) #define SPECIAL_FLAGS_START 0x4000 #define FLAG_HIDE_MAP_NAME_POPUP 0x4000 -#define FLAG_SPECIAL_FLAG_0x4001 0x4001 +#define FLAG_DONT_TRANSITION_MUSIC 0x4001 #define FLAG_SPECIAL_FLAG_0x4002 0x4002 #define FLAG_SPECIAL_FLAG_0x4003 0x4003 #define FLAG_STORING_ITEMS_IN_PYRAMID_BAG 0x4004 diff --git a/include/constants/global.h b/include/constants/global.h index 091f735f4..ca48c1d2a 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -67,6 +67,10 @@ #define FEMALE 1 #define GENDER_COUNT 2 +#define BARD_SONG_LENGTH 6 +#define NUM_STORYTELLER_TALES 4 +#define NUM_TRADER_ITEMS 4 + #define OPTIONS_BUTTON_MODE_NORMAL 0 #define OPTIONS_BUTTON_MODE_LR 1 #define OPTIONS_BUTTON_MODE_L_EQUALS_A 2 diff --git a/include/constants/mauville_man.h b/include/constants/mauville_man.h deleted file mode 100644 index b00e3a291..000000000 --- a/include/constants/mauville_man.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef GUARD_CONSTANTS_MAUVILLE_MAN_H -#define GUARD_CONSTANTS_MAUVILLE_MAN_H - -#define MAUVILLE_MAN_BARD 0 -#define MAUVILLE_MAN_HIPSTER 1 -#define MAUVILLE_MAN_TRADER 2 -#define MAUVILLE_MAN_STORYTELLER 3 -#define MAUVILLE_MAN_GIDDY 4 - -#endif // GUARD_CONSTANTS_MAUVILLE_MAN_H diff --git a/include/constants/mauville_old_man.h b/include/constants/mauville_old_man.h new file mode 100644 index 000000000..c1fb0bf24 --- /dev/null +++ b/include/constants/mauville_old_man.h @@ -0,0 +1,12 @@ +#ifndef GUARD_CONSTANTS_MAUVILLE_OLD_MAN_H +#define GUARD_CONSTANTS_MAUVILLE_OLD_MAN_H + +#define MAUVILLE_MAN_BARD 0 +#define MAUVILLE_MAN_HIPSTER 1 +#define MAUVILLE_MAN_TRADER 2 +#define MAUVILLE_MAN_STORYTELLER 3 +#define MAUVILLE_MAN_GIDDY 4 +#define MAUVILLE_MAN_UNUSED1 5 +#define MAUVILLE_MAN_UNUSED2 6 + +#endif // GUARD_CONSTANTS_MAUVILLE_OLD_MAN_H diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index 8fe95b464..2f3ce5f71 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -68,13 +68,16 @@ #define METATILE_PetalburgGym_SlidingDoor_Frame3 0x21B #define METATILE_PetalburgGym_SlidingDoor_Frame4 0x21C -// gTileset_MossdeepGym -#define METATILE_MossdeepGym_Obelisk_Top 0x204 -#define METATILE_MossdeepGym_Obelisk_Base 0x20C -#define METATILE_MossdeepGym_Wall_LeftCorner 0x20D -#define METATILE_MossdeepGym_OuterWall_RightCorner 0x205 -#define METATILE_MossdeepGym_Empty0 0x238 -#define METATILE_MossdeepGym_Empty1 0x239 +// gTileset_MossdeepGym from R/S +#define METATILE_RS_MossdeepGym_RedArrow_Right 0x204 +#define METATILE_RS_MossdeepGym_RedArrow_Left 0x20C +#define METATILE_RS_MossdeepGym_RedArrow_Up 0x20D +#define METATILE_RS_MossdeepGym_RedArrow_Down 0x205 +#define METATILE_RS_MossdeepGym_Switch_Up 0x238 +#define METATILE_RS_MossdeepGym_Switch_Down 0x239 + +// gTileset_MossdeepGym from Emerald +#define METATILE_MossdeepGym_YellowArrow_Right 0x250 // gTileset_BrendansMaysHouse #define METATILE_BrendansMaysHouse_BrendanPC_Off 0x25A @@ -376,6 +379,7 @@ #define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down 0x263 #define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left_Alt 0x27B #define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt 0x27C +#define METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right 0x298 // gTileset_BikeShop #define METATILE_BikeShop_Barrier_Hidden_Top 0x269 diff --git a/include/constants/vars.h b/include/constants/vars.h index 3030581c6..cfafccd9b 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -147,7 +147,7 @@ #define VAR_LITTLEROOT_HOUSES_STATE 0x4082 #define VAR_UNUSED_0x4083 0x4083 // Unused Var #define VAR_BIRCH_LAB_STATE 0x4084 -#define VAR_PETALBURG_GYM_STATE 0x4085 +#define VAR_PETALBURG_GYM_STATE 0x4085 // 0-1: Wally tutorial, 2-6: 0-4 badges, 7: Defeated Norman, 8: Rematch Norman #define VAR_LINK_CONTEST_ROOM_STATE 0x4086 #define VAR_CABLE_CLUB_STATE 0x4087 #define VAR_CONTEST_LOCATION 0x4088 @@ -178,7 +178,7 @@ #define VAR_UNUSED_0x40A1 0x40A1 // Unused var #define VAR_SEAFLOOR_CAVERN_STATE 0x40A2 #define VAR_CABLE_CAR_STATION_STATE 0x40A3 -#define VAR_SAFARI_ZONE_STATE 0x40A4 +#define VAR_SAFARI_ZONE_STATE 0x40A4 // 0: In or out of SZ, 1: Player exiting SZ, 2: Player entering SZ #define VAR_TRICK_HOUSE_ENTRANCE_STATE_1 0x40A5 #define VAR_TRICK_HOUSE_ENTRANCE_STATE_2 0x40A6 #define VAR_TRICK_HOUSE_ENTRANCE_STATE_3 0x40A7 diff --git a/include/easy_chat.h b/include/easy_chat.h index 84ac15422..221cbd1da 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -129,11 +129,11 @@ void InitializeEasyChatWordArray(u16 *words, u16 length); u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 columns, u16 rows); bool8 ECWord_CheckIfOutsideOfValidRange(u16 word); u16 sub_811EE38(u16 group); -u16 sub_811F01C(void); +u16 GetNewHipsterPhraseToTeach(void); u16 EasyChat_GetNumWordsInGroup(u8); u16 sub_811EE90(u16); void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback, u8 displayedPersonType); void sub_811F8BC(void); -void sub_811EFC0(u8 additionalPhraseId); +void UnlockAdditionalPhrase(u8 additionalPhraseId); #endif // GUARD_EASYCHAT_H diff --git a/include/event_scripts.h b/include/event_scripts.h index a0190ea9e..bf68d309e 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -376,12 +376,12 @@ extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88[]; //field effects extern const u8 EventScript_FldEffStrength[]; extern const u8 EventScript_FailSweetScent[]; -extern const u8 EventScript_2926F8[]; +extern const u8 EventScript_FldEffFlash[]; extern const u8 EventScript_FldEffRockSmash[]; //player pc -extern const u8 LittlerootTown_BrendansHouse_2F_EventScript_1F863F[]; -extern const u8 LittlerootTown_MaysHouse_2F_EventScript_1F958F[]; +extern const u8 LittlerootTown_BrendansHouse_2F_EventScript_TurnOffPlayerPC[]; +extern const u8 LittlerootTown_MaysHouse_2F_EventScript_TurnOffPlayerPC[]; //contest_strings extern const u8 gText_0827D507[]; @@ -407,118 +407,118 @@ extern const u8 gMauvilleManText_WhenYouSeeTheSettingSunDoesIt[]; extern const u8 gMauvilleManText_LyingBackInTheGreenGrass[]; extern const u8 gMauvilleManText_SecretBasesAreSoWonderful[]; +// mauville old man storyteller +extern const u8 MauvilleCity_PokemonCenter_1F_Text_SavedGameTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_SavedGameAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_SavedGameStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_TrendsStartedTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_TrendsStartedAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_TrendsStartedStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_BikeTradesTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_BikeTradesAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_BikeTradesStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_InterviewsTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_InterviewsAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_InterviewsStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_EggsHatchedTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_EggsHatchedAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_EggsHatchedStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_SafariGamesTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_SafariGamesAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_SafariGamesStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedCutTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedCutAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedCutStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_MovedBasesTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_MovedBasesAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_MovedBasesStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedSplashTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedSplashAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedSplashStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedStruggleTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedStruggleAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedStruggleStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_RouletteWinsTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_RouletteWinsAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_RouletteWinsStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_EnteredContestsTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_EnteredContestsAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_EnteredContestsStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_WonContestsTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_WonContestsAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_WonContestsStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_TimesShoppedTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_TimesShoppedAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_TimesShoppedStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_TimesRainedTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_TimesRainedAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_TimesRainedStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_TVWatchedTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_TVWatchedAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_TVWatchedStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_CheckedClockTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_CheckedClockAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_CheckedClockStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_WonLotteryTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_WonLotteryAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_WonLotteryStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedDaycareTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedDaycareAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_UsedDaycareStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_RodeCableCarTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_RodeCableCarAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_RodeCableCarStory[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_HotSpringsTitle[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_HotSpringsAction[]; +extern const u8 MauvilleCity_PokemonCenter_1F_Text_HotSpringsStory[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28E930[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28E947[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28E956[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28E9D7[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28E9EF[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28E9FE[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EA7D[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EA98[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EAA8[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EB19[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EB31[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EB3E[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EBB5[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EBCD[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EBDD[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EC60[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EC79[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EC81[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28ED04[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28ED21[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28ED30[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EDA1[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EDB5[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EDCF[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EE45[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EE5D[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EE6A[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EEDD[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EEF1[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EF01[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EF73[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EF95[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EFAA[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F045[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F05A[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F071[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F0F3[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F10D[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F125[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F1BE[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F1D5[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F1DE[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F24F[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F269[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F277[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F2FC[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F314[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F32A[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F3AD[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F3C6[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F3D2[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F44B[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F461[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F47C[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F50C[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F51B[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F538[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F5BE[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F5D1[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F5F2[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F678[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F694[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F6B4[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F751[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F76A[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F776[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F7F6[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F811[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F822[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F89C[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F8AF[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F8BC[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F92F[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F941[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F949[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F9D1[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F9EA[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F9FD[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FA81[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FA99[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FAA7[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FB1D[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FB35[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FB47[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FBC4[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FBD9[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FBEA[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FC6B[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FC85[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FC98[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FD1D[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FD35[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FD40[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FDA2[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FDBD[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FDCE[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FE57[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FE72[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FE88[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FF0C[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FF27[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FF44[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FFDD[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FFFA[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_29000D[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_290097[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_2900B5[]; -extern const u8 MauvilleCity_PokemonCenter_1F_Text_2900CB[]; - -extern const u8 EventScript_PlayerPCMale[]; -extern const u8 EventScript_PlayerPCFemale[]; +extern const u8 LittlerootTown_BrendansHouse_2F_EventScript_PC[]; +extern const u8 LittlerootTown_MaysHouse_2F_EventScript_PC[]; extern const u8 EventScript_PC[]; extern const u8 EventScript_TestSignpostMsg[]; extern const u8 EventScript_HiddenItemScript[]; diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h index 0b01c81e9..af594611e 100644 --- a/include/field_screen_effect.h +++ b/include/field_screen_effect.h @@ -28,7 +28,7 @@ void sub_80AF80C(u8 metatileBehavior); void sub_80AF828(void); void sub_80AF838(void); void sub_80AF848(void); -void sub_80AF87C(void); +void DoMossdeepGymWarp(void); void sub_80AF8B8(void); void sub_80AF948(void); void sub_80AF9F8(void); diff --git a/include/global.h b/include/global.h index 82c53c009..5fd49f773 100644 --- a/include/global.h +++ b/include/global.h @@ -594,9 +594,9 @@ struct MauvilleManCommon struct MauvilleManBard { /*0x00*/ u8 id; - /*0x02*/ u16 songLyrics[6]; - /*0x0E*/ u16 temporaryLyrics[6]; - /*0x1A*/ u8 playerName[8]; + /*0x02*/ u16 songLyrics[BARD_SONG_LENGTH]; + /*0x0E*/ u16 temporaryLyrics[BARD_SONG_LENGTH]; + /*0x1A*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; /*0x22*/ u8 filler_2DB6[0x3]; /*0x25*/ u8 playerTrainerId[TRAINER_ID_LENGTH]; /*0x29*/ bool8 hasChangedSong; @@ -608,10 +608,10 @@ struct MauvilleManStoryteller u8 id; bool8 alreadyRecorded; u8 filler2[2]; - u8 gameStatIDs[4]; - u8 trainerNames[4][7]; - u8 statValues[4][4]; - u8 language[4]; + u8 gameStatIDs[NUM_STORYTELLER_TALES]; + u8 trainerNames[NUM_STORYTELLER_TALES][PLAYER_NAME_LENGTH]; + u8 statValues[NUM_STORYTELLER_TALES][4]; + u8 language[NUM_STORYTELLER_TALES]; }; struct MauvilleManGiddy @@ -634,10 +634,10 @@ struct MauvilleManHipster struct MauvilleOldManTrader { u8 id; - u8 decorIds[4]; - u8 playerNames[4][11]; + u8 decorIds[NUM_TRADER_ITEMS]; + u8 playerNames[NUM_TRADER_ITEMS][11]; u8 alreadyTraded; - u8 language[4]; + u8 language[NUM_TRADER_ITEMS]; }; typedef union OldMan diff --git a/include/item_use.h b/include/item_use.h index 37343f6e7..5ce47a9bc 100644 --- a/include/item_use.h +++ b/include/item_use.h @@ -50,6 +50,6 @@ void ItemUseOutOfBattle_EnigmaBerry(u8); void ItemUseInBattle_EnigmaBerry(u8); void ItemUseOutOfBattle_CannotUse(u8); u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId); -void sub_80FDD10(u8); +void ItemUseOutOfBattle_Berry(u8); #endif // GUARD_ITEM_USE_H diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h index 9d71e81aa..3845ac290 100644 --- a/include/mauville_old_man.h +++ b/include/mauville_old_man.h @@ -1,16 +1,6 @@ - #ifndef GUARD_MAUVILLE_OLD_MAN_H #define GUARD_MAUVILLE_OLD_MAN_H -enum MauvilleOldManType -{ - MAUVILLE_MAN_BARD, - MAUVILLE_MAN_HIPSTER, - MAUVILLE_MAN_TRADER, - MAUVILLE_MAN_STORYTELLER, - MAUVILLE_MAN_GIDDY -}; - extern struct BardSong gBardSong; void SetMauvilleOldMan(void); diff --git a/include/mossdeep_gym.h b/include/mossdeep_gym.h deleted file mode 100644 index c16730094..000000000 --- a/include/mossdeep_gym.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef GUARD_MOSSDEEP_GYM_H -#define GUARD_MOSSDEEP_GYM_H - -void InitMossdeepGymTiles(bool8 arg0); -void FinishMossdeepGymTiles(void); -u16 MossdeepGym_MoveEvents(u8 arg0); -void MossdeepGym_TurnEvents(void); - -#endif // GUARD_MOSSDEEP_GYM_H diff --git a/include/rotating_tile_puzzle.h b/include/rotating_tile_puzzle.h new file mode 100644 index 000000000..8c6ab7944 --- /dev/null +++ b/include/rotating_tile_puzzle.h @@ -0,0 +1,9 @@ +#ifndef GUARD_ROTATING_TILE_PUZZLE_H +#define GUARD_ROTATING_TILE_PUZZLE_H + +void InitRotatingTilePuzzle(bool8 isTrickHouse); +void FreeRotatingTilePuzzle(void); +u16 MoveRotatingTileObjects(u8 puzzleNumber); +void TurnRotatingTileObjects(void); + +#endif // GUARD_ROTATING_TILE_PUZZLE_H diff --git a/include/strings.h b/include/strings.h index 2c5a7bb83..f135944bd 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2035,8 +2035,8 @@ extern const u8 gText_Confusion[]; extern const u8 gText_Love[]; // battle message -extern const u8 gText_PkmnBoxSomeonesPCFull[]; -extern const u8 gText_PkmnBoxLanettesPCFull[]; +extern const u8 gText_PkmnTransferredSomeonesPCBoxFull[]; +extern const u8 gText_PkmnTransferredLanettesPCBoxFull[]; extern const u8 gText_PkmnTransferredSomeonesPC[]; extern const u8 gText_PkmnTransferredLanettesPC[]; diff --git a/include/tv.h b/include/tv.h index ec7ac1e89..8f697afe9 100644 --- a/include/tv.h +++ b/include/tv.h @@ -12,12 +12,12 @@ void sub_80EE35C(u16 foeSpecies, u16 species, u8 moveIdx, const u16 *movePtr, u1 void sub_80EE8C8(u16 winStreak, u8 facility); void DoTVShow(void); void DoTVShowInSearchOfTrainers(void); -void sub_80EDCE8(void); +void TryPutTreasureInvestigatorsOnAir(void); void sub_80EE2CC(void); void sub_80EE72C(void); -void sub_80EED10(void); -void sub_80EED34(void); -void sub_80EED60(u16 delta); +void IncrementDailyPlantedBerries(void); +void IncrementDailyPickedBerries(void); +void IncrementDailyBattlePoints(u16 delta); void sub_80F01B8(void); void ReceiveTvShowsData(void *src, u32 size, u8 masterIdx); void sub_80EE4DC(struct Pokemon *pokemon, u8 ribbonMonDataIdx); @@ -36,10 +36,10 @@ void sub_80EDA80(void); void ReceivePokeNewsData(void *src, u32 size, u8 masterIdx); void sub_80F0BB8(void); void sub_80ED950(bool8 flag); -void sub_80EEC80(void); -void sub_80EECA4(void); -void sub_80EECC8(void); -void sub_80EECEC(void); +void IncrementDailySlotsUses(void); +void IncrementDailyRouletteUses(void); +void IncrementDailyWildBattles(void); +void IncrementDailyBerryBlender(void); void sub_80F1208(TVShow *shows); void sub_80EE44C(u8 nMonsCaught, u8 nPkblkUsed); void sub_80F14F8(TVShow *shows); diff --git a/ld_script.txt b/ld_script.txt index d37cd595f..92aafebde 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -287,7 +287,7 @@ SECTIONS { src/battle_arena.o(.text); src/battle_factory.o(.text); src/battle_pike.o(.text); - src/mossdeep_gym.o(.text); + src/rotating_tile_puzzle.o(.text); src/battle_pyramid.o(.text); src/item_menu.o(.text); src/list_menu.o(.text); @@ -644,8 +644,8 @@ SECTIONS { src/battle_arena.o(.rodata); src/battle_factory.o(.rodata); src/battle_pike.o(.rodata); - src/mossdeep_gym.o(.rodata); - data/mossdeep_gym.o(.rodata); + src/rotating_tile_puzzle.o(.rodata); + data/rotating_tile_puzzle.o(.rodata); src/battle_pyramid.o(.rodata); src/item_menu.o(.rodata); src/list_menu.o(.rodata); diff --git a/sound/songs/midi/mus_battle20.mid b/sound/songs/midi/mus_battle20.mid Binary files differindex a7140d984..531b5fba1 100644 --- a/sound/songs/midi/mus_battle20.mid +++ b/sound/songs/midi/mus_battle20.mid diff --git a/sound/songs/midi/mus_battle32.mid b/sound/songs/midi/mus_battle32.mid Binary files differindex a52fc6b37..0b7c49bd7 100644 --- a/sound/songs/midi/mus_battle32.mid +++ b/sound/songs/midi/mus_battle32.mid diff --git a/sound/songs/midi/mus_fanfa5.mid b/sound/songs/midi/mus_fanfa5.mid Binary files differindex 7232c57ab..8c94f1178 100644 --- a/sound/songs/midi/mus_fanfa5.mid +++ b/sound/songs/midi/mus_fanfa5.mid diff --git a/sound/songs/midi/mus_me_b_big.mid b/sound/songs/midi/mus_me_b_big.mid Binary files differindex eda461fd3..150a669b4 100644 --- a/sound/songs/midi/mus_me_b_big.mid +++ b/sound/songs/midi/mus_me_b_big.mid diff --git a/sound/songs/midi/mus_me_b_small.mid b/sound/songs/midi/mus_me_b_small.mid Binary files differindex a51f48ed4..bf7aa33be 100644 --- a/sound/songs/midi/mus_me_b_small.mid +++ b/sound/songs/midi/mus_me_b_small.mid diff --git a/sound/songs/midi/mus_me_bachi.mid b/sound/songs/midi/mus_me_bachi.mid Binary files differindex 27b97f09c..05fe1516a 100644 --- a/sound/songs/midi/mus_me_bachi.mid +++ b/sound/songs/midi/mus_me_bachi.mid diff --git a/sound/songs/midi/mus_me_kinomi.mid b/sound/songs/midi/mus_me_kinomi.mid Binary files differindex 30fbd3607..e7eb4afd1 100644 --- a/sound/songs/midi/mus_me_kinomi.mid +++ b/sound/songs/midi/mus_me_kinomi.mid diff --git a/sound/songs/midi/mus_me_shinka.mid b/sound/songs/midi/mus_me_shinka.mid Binary files differindex 81cd5d041..231f25533 100644 --- a/sound/songs/midi/mus_me_shinka.mid +++ b/sound/songs/midi/mus_me_shinka.mid diff --git a/sound/songs/midi/mus_me_waza.mid b/sound/songs/midi/mus_me_waza.mid Binary files differindex ac132f5ff..40f9c2ed8 100644 --- a/sound/songs/midi/mus_me_waza.mid +++ b/sound/songs/midi/mus_me_waza.mid diff --git a/sound/songs/midi/mus_p_school.mid b/sound/songs/midi/mus_p_school.mid Binary files differindex 55651dea5..4e6fd3340 100644 --- a/sound/songs/midi/mus_p_school.mid +++ b/sound/songs/midi/mus_p_school.mid diff --git a/sound/songs/midi/mus_shinka.mid b/sound/songs/midi/mus_shinka.mid Binary files differindex de8b2ab91..375e6d5db 100644 --- a/sound/songs/midi/mus_shinka.mid +++ b/sound/songs/midi/mus_shinka.mid diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 80f360036..1efa860d3 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -41,43 +41,43 @@ void AnimKnockOffItem(struct Sprite *); void AnimPresentHealParticle(struct Sprite *); void AnimItemSteal(struct Sprite *); void AnimTrickBag(struct Sprite *); -void sub_8100640(struct Sprite *); -void sub_8100898(struct Sprite *); +void AnimFlyingParticle(struct Sprite *); +void AnimNeedleArmSpike(struct Sprite *); void sub_81009F8(struct Sprite *); -void sub_8100A50(struct Sprite *); +void AnimWhipHit(struct Sprite *); void sub_8100A94(struct Sprite *); void AnimCuttingSlice(struct Sprite *); -void sub_8100B88(struct Sprite *); +void AnimAirCutterSlice(struct Sprite *); void sub_8100E1C(struct Sprite *); -void sub_8100EF0(struct Sprite *); -void sub_81010CC(struct Sprite *); -void sub_810130C(struct Sprite *); -void sub_810135C(struct Sprite *); +void AnimProtect(struct Sprite *); +void AnimMilkBottle(struct Sprite *); +void AnimGrantingStars(struct Sprite *); +void AnimSparkingStars(struct Sprite *); void sub_8101440(struct Sprite *); -void sub_81014F4(struct Sprite *); -void sub_81015AC(struct Sprite *); -void sub_8101898(struct Sprite *); -void sub_8101940(struct Sprite *); +void AnimSleepLetterZ(struct Sprite *); +void AnimLockOnTarget(struct Sprite *); +void AnimLockOnMoveTarget(struct Sprite *); +void AnimBowMon(struct Sprite *); void sub_8101B90(struct Sprite *); -void sub_8101F40(struct Sprite *); -void sub_8101FA8(struct Sprite *); -void sub_8101FF0(struct Sprite *); -void sub_81020D8(struct Sprite *); -void sub_810217C(struct Sprite *); -void sub_8102268(struct Sprite *); -void sub_810234C(struct Sprite *); -void sub_81024E0(struct Sprite *); -void sub_8102540(struct Sprite *); -void sub_8102844(struct Sprite *); -void sub_8102BCC(struct Sprite *); -void sub_8102CD4(struct Sprite *); -void sub_8102EB0(struct Sprite *); -void sub_8102FB8(struct Sprite *); -void sub_8103028(struct Sprite *); -void sub_8103164(struct Sprite *); -void sub_8103208(struct Sprite *); -void sub_8103284(struct Sprite *); -void sub_8103390(struct Sprite *); +void AnimSlashSlice(struct Sprite *); +void AnimFalseSwipeSlice(struct Sprite *); +void AnimFalseSwipePositionedSlice(struct Sprite *); +void AnimEndureEnergy(struct Sprite *); +void AnimSharpenSphere(struct Sprite *); +void AnimConversion(struct Sprite *); +void AnimConversion2(struct Sprite *); +void AnimMoon(struct Sprite *); +void AnimMoonlightSparkle(struct Sprite *); +void AnimHornHit(struct Sprite *); +void AnimSuperFang(struct Sprite *); +void AnimWavyMusicNotes(struct Sprite *); +void AnimFlyingMusicNotes(struct Sprite *); +void AnimBellyDrumHand(struct Sprite *); +void AnimSlowFlyingMusicNotes(struct Sprite *); +void AnimThoughtBubble(struct Sprite *); +void AnimMetronomeFinger(struct Sprite *); +void AnimFollowMeFinger(struct Sprite *); +void AnimTauntFinger(struct Sprite *); static void AnimMovePowderParticleStep(struct Sprite *); static void AnimSolarbeamSmallOrbStep(struct Sprite *); static void AnimAbsorptionOrbStep(struct Sprite *); @@ -93,64 +93,64 @@ static void AnimTranslateLinearSingleSineWaveStep(struct Sprite *); static void AnimMoveTwisterParticleStep(struct Sprite *); static void AnimConstrictBindingStep1(struct Sprite *); static void AnimConstrictBindingStep2(struct Sprite *); -static void sub_80FF53C(u8); -static void sub_80FF5CC(u8); -static void AnimItemStealStep(struct Sprite *); +static void AnimTask_DuplicateAndShrinkToPosStep1(u8); +static void AnimTask_DuplicateAndShrinkToPosStep2(u8); +static void AnimItemStealStep3(struct Sprite *); static void AnimRootFlickerOut(struct Sprite *); static void AnimTrickBagStep1(struct Sprite *); static void AnimTrickBagStep2(struct Sprite *); static void AnimTrickBagStep3(struct Sprite *); -static void sub_8100128(u8); -static s16 sub_8100504(struct Sprite *); -static void sub_8100524(struct Task *, u8); -static void sub_80CC408(struct Sprite *); -static void sub_810074C(struct Sprite *); -static void sub_81009A0(struct Sprite *); +static void AnimTask_LeafBladeStep(u8); +static s16 LeafBladeGetPosFactor(struct Sprite *); +static void AnimTask_LeafBladeStep2(struct Task *, u8); +static void AnimTask_LeafBladeStep2_Callback(struct Sprite *); +static void AnimFlyingParticleStep(struct Sprite *); +static void AnimNeedleArmSpikeStep(struct Sprite *); static void AnimSliceStep(struct Sprite *); static void sub_8100E80(struct Sprite *); -static void sub_8100FD4(struct Sprite *); -static void sub_8101138(struct Sprite *); -static void sub_8101298(struct Sprite *, int, int); +static void AnimProtectStep(struct Sprite *); +static void AnimMilkBottleStep1(struct Sprite *); +static void AnimMilkBottleStep2(struct Sprite *, int, int); static void sub_81014A0(struct Sprite *); -static void sub_8101560(struct Sprite *); -static void sub_81015D4(struct Sprite *); -static void sub_8101684(struct Sprite *); -static void sub_81016B8(struct Sprite *); -static void sub_8101774(struct Sprite *); -static void sub_8101820(struct Sprite *); -static void sub_8101848(struct Sprite *); -static void sub_8101998(struct Sprite *); -static void sub_81019E8(struct Sprite *); -static void sub_8101A74(struct Sprite *); -static void sub_8101AC4(struct Sprite *); -static void sub_8101B84(struct Sprite *); -static void sub_8101AE8(struct Sprite *); +static void AnimSleepLetterZStep(struct Sprite *); +static void AnimLockOnTargetStep1(struct Sprite *); +static void AnimLockOnTargetStep2(struct Sprite *); +static void AnimLockOnTargetStep3(struct Sprite *); +static void AnimLockOnTargetStep4(struct Sprite *); +static void AnimLockOnTargetStep5(struct Sprite *); +static void AnimLockOnTargetStep6(struct Sprite *); +static void AnimBowMonStep1(struct Sprite *); +static void AnimBowMonStep1_Callback(struct Sprite *); +static void AnimBowMonStep2(struct Sprite *); +static void AnimBowMonStep3(struct Sprite *); +static void AnimBowMonStep4(struct Sprite *); +static void AnimBowMonStep3_Callback(struct Sprite *); static void sub_8101BA0(struct Sprite *); -static void sub_8101D2C(u8); -static void sub_8101EEC(u8); -static void sub_8102044(struct Sprite *); -static void sub_810207C(struct Sprite *); -static void sub_810208C(struct Sprite *); -static void sub_810213C(struct Sprite *); -static void sub_81021CC(struct Sprite *); -static void sub_810237C(struct Sprite *); -static void sub_8102528(struct Sprite *); -static void sub_8102584(struct Sprite *); -static void sub_810296C(struct Sprite *); -static void sub_8102AE0(u8); -static void sub_8102B3C(struct Sprite *); -static void sub_8102D8C(s16, s16, s16 *, s16 *, s8); -static void sub_8102DE4(struct Sprite *); -static void sub_8102F40(struct Sprite *); -static void sub_81030B0(struct Sprite *); -static void sub_81031D0(struct Sprite *); -static void sub_8103250(struct Sprite *); -static void sub_8103300(struct Sprite *); -static void sub_8103320(struct Sprite *); -static void sub_81033F0(struct Sprite *); -static void sub_810342C(struct Sprite *); - -const union AnimCmd gUnknown_085920F0[] = +static void AnimTask_SkullBashPositionSet(u8); +static void AnimTask_SkullBashPositionReset(u8); +static void AnimFalseSwipeSliceStep1(struct Sprite *); +static void AnimFalseSwipeSliceStep2(struct Sprite *); +static void AnimFalseSwipeSliceStep3(struct Sprite *); +static void AnimEndureEnergyStep(struct Sprite *); +static void AnimSharpenSphereStep(struct Sprite *); +static void AnimConversion2Step(struct Sprite *); +static void AnimMoonStep(struct Sprite *); +static void AnimMoonlightSparkleStep(struct Sprite *); +static void AnimHornHitStep(struct Sprite *); +static void AnimTask_DoubleTeamStep(u8); +static void AnimTask_DoubleTeamCallback(struct Sprite *); +static void AnimWavyMusicNotesGetNextPos(s16, s16, s16 *, s16 *, s8); +static void AnimWavyMusicNotesStep(struct Sprite *); +static void AnimFlyingMusicNotesStep(struct Sprite *); +static void AnimSlowFlyingMusicNotesStep(struct Sprite *); +static void AnimThoughtBubbleStep(struct Sprite *); +static void AnimMetronomeFingerStep(struct Sprite *); +static void AnimFollowMeFingerStep1(struct Sprite *); +static void AnimFollowMeFingerStep2(struct Sprite *); +static void AnimTauntFingerStep1(struct Sprite *); +static void AnimTauntFingerStep2(struct Sprite *); + +const union AnimCmd gPowderParticlesAnimCmds[] = { ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(2, 5), @@ -163,9 +163,9 @@ const union AnimCmd gUnknown_085920F0[] = ANIMCMD_JUMP(0), }; -const union AnimCmd *const gUnknown_08592114[] = +const union AnimCmd *const gPowderParticlesAnimTable[] = { - gUnknown_085920F0, + gPowderParticlesAnimCmds, }; const struct SpriteTemplate gSleepPowderParticleSpriteTemplate = @@ -173,7 +173,7 @@ const struct SpriteTemplate gSleepPowderParticleSpriteTemplate = .tileTag = ANIM_TAG_SLEEP_POWDER, .paletteTag = ANIM_TAG_SLEEP_POWDER, .oam = &gOamData_AffineOff_ObjNormal_8x16, - .anims = gUnknown_08592114, + .anims = gPowderParticlesAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimMovePowderParticle, @@ -184,7 +184,7 @@ const struct SpriteTemplate gStunSporeParticleSpriteTemplate = .tileTag = ANIM_TAG_STUN_SPORE, .paletteTag = ANIM_TAG_STUN_SPORE, .oam = &gOamData_AffineOff_ObjNormal_8x16, - .anims = gUnknown_08592114, + .anims = gPowderParticlesAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimMovePowderParticle, @@ -195,94 +195,94 @@ const struct SpriteTemplate gPoisonPowderParticleSpriteTemplate = .tileTag = ANIM_TAG_POISON_POWDER, .paletteTag = ANIM_TAG_POISON_POWDER, .oam = &gOamData_AffineOff_ObjNormal_8x16, - .anims = gUnknown_08592114, + .anims = gPowderParticlesAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimMovePowderParticle, }; -const union AnimCmd gUnknown_08592160[] = +const union AnimCmd gSolarbeamBigOrbAnimCmds1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_08592168[] = +const union AnimCmd gSolarbeamBigOrbAnimCmds2[] = { ANIMCMD_FRAME(1, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_08592170[] = +const union AnimCmd gSolarbeamBigOrbAnimCmds3[] = { ANIMCMD_FRAME(2, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_08592178[] = +const union AnimCmd gSolarbeamBigOrbAnimCmds4[] = { ANIMCMD_FRAME(3, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_08592180[] = +const union AnimCmd gSolarbeamBigOrbAnimCmds5[] = { ANIMCMD_FRAME(4, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_08592188[] = +const union AnimCmd gSolarbeamBigOrbAnimCmds6[] = { ANIMCMD_FRAME(5, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_08592190[] = +const union AnimCmd gSolarbeamBigOrbAnimCmds7[] = { ANIMCMD_FRAME(6, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_08592198[] = +const union AnimCmd gSolarbeamSmallOrbAnimCms[] = { ANIMCMD_FRAME(7, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_085921A0[] = +const union AnimCmd gPowerAbsorptionOrbAnimCmds[] = { ANIMCMD_FRAME(8, 1), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_085921A8[] = +const union AnimCmd *const gSolarbeamBigOrbAnimTable[] = { - gUnknown_08592160, - gUnknown_08592168, - gUnknown_08592170, - gUnknown_08592178, - gUnknown_08592180, - gUnknown_08592188, - gUnknown_08592190, + gSolarbeamBigOrbAnimCmds1, + gSolarbeamBigOrbAnimCmds2, + gSolarbeamBigOrbAnimCmds3, + gSolarbeamBigOrbAnimCmds4, + gSolarbeamBigOrbAnimCmds5, + gSolarbeamBigOrbAnimCmds6, + gSolarbeamBigOrbAnimCmds7, }; -const union AnimCmd *const gUnknown_085921C4[] = +const union AnimCmd *const gSolarbeamSmallOrbAnimTable[] = { - gUnknown_08592198, + gSolarbeamSmallOrbAnimCms, }; -const union AnimCmd *const gUnknown_085921C8[] = +const union AnimCmd *const gPowerAbsorptionOrbAnimTable[] = { - gUnknown_085921A0, + gPowerAbsorptionOrbAnimCmds, }; -const union AffineAnimCmd gUnknown_085921CC[] = { +const union AffineAnimCmd gPowerAbsorptionOrbAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(-5, -5, 0, 1), AFFINEANIMCMD_JUMP(0), }; -const union AffineAnimCmd *const gUnknown_085921DC[] = { - gUnknown_085921CC, +const union AffineAnimCmd *const gPowerAbsorptionOrbAffineAnimTable[] = { + gPowerAbsorptionOrbAffineAnimCmds, }; const struct SpriteTemplate gPowerAbsorptionOrbSpriteTemplate = @@ -290,9 +290,9 @@ const struct SpriteTemplate gPowerAbsorptionOrbSpriteTemplate = .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_AffineNormal_ObjBlend_16x16, - .anims = gUnknown_085921C8, + .anims = gPowerAbsorptionOrbAnimTable, .images = NULL, - .affineAnims = gUnknown_085921DC, + .affineAnims = gPowerAbsorptionOrbAffineAnimTable, .callback = AnimPowerAbsorptionOrb, }; @@ -301,7 +301,7 @@ const struct SpriteTemplate gSolarbeamBigOrbSpriteTemplate = .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gUnknown_085921A8, + .anims = gSolarbeamBigOrbAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSolarbeamBigOrb, @@ -312,20 +312,20 @@ const struct SpriteTemplate gSolarbeamSmallOrbSpriteTemplate = .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gUnknown_085921C4, + .anims = gSolarbeamSmallOrbAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSolarbeamSmallOrb, }; -const union AffineAnimCmd gUnknown_08592228[] = { +const union AffineAnimCmd gStockpileAbsorptionOrbAffineCmds[] = { AFFINEANIMCMD_FRAME(320, 320, 0, 0), AFFINEANIMCMD_FRAME(-14, -14, 0, 1), AFFINEANIMCMD_JUMP(1), }; -const union AffineAnimCmd *const gUnknown_08592240[] = { - gUnknown_08592228, +const union AffineAnimCmd *const gStockpileAbsorptionOrbAffineAnimTable[] = { + gStockpileAbsorptionOrbAffineCmds, }; const struct SpriteTemplate gStockpileAbsorptionOrbSpriteTemplate = @@ -335,17 +335,17 @@ const struct SpriteTemplate gStockpileAbsorptionOrbSpriteTemplate = .oam = &gOamData_AffineDouble_ObjNormal_8x8, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_08592240, + .affineAnims = gStockpileAbsorptionOrbAffineAnimTable, .callback = AnimPowerAbsorptionOrb, }; -const union AffineAnimCmd gUnknown_0859225C[] = { +const union AffineAnimCmd gAbsorptionOrbAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(-5, -5, 0, 1), AFFINEANIMCMD_JUMP(0), }; -const union AffineAnimCmd *const gUnknown_0859226C[] = { - gUnknown_0859225C, +const union AffineAnimCmd *const gAbsorptionOrbAffineAnimTable[] = { + gAbsorptionOrbAffineAnimCmds, }; const struct SpriteTemplate gAbsorptionOrbSpriteTemplate = @@ -353,9 +353,9 @@ const struct SpriteTemplate gAbsorptionOrbSpriteTemplate = .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_AffineNormal_ObjBlend_16x16, - .anims = gUnknown_085921C8, + .anims = gPowerAbsorptionOrbAnimTable, .images = NULL, - .affineAnims = gUnknown_0859226C, + .affineAnims = gAbsorptionOrbAffineAnimTable, .callback = AnimAbsorptionOrb, }; @@ -364,29 +364,29 @@ const struct SpriteTemplate gHyperBeamOrbSpriteTemplate = .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gUnknown_085921A8, + .anims = gSolarbeamBigOrbAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimHyperBeamOrb, }; -const union AnimCmd gUnknown_085922A0[] = +const union AnimCmd gLeechSeedAnimCmds1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_085922A8[] = +const union AnimCmd gLeechSeedAnimCmds2[] = { ANIMCMD_FRAME(4, 7), ANIMCMD_FRAME(8, 7), ANIMCMD_JUMP(0), }; -const union AnimCmd *const gUnknown_085922B4[] = +const union AnimCmd *const gLeechSeedAnimTable[] = { - gUnknown_085922A0, - gUnknown_085922A8, + gLeechSeedAnimCmds1, + gLeechSeedAnimCmds2, }; const struct SpriteTemplate gLeechSeedSpriteTemplate = @@ -394,28 +394,28 @@ const struct SpriteTemplate gLeechSeedSpriteTemplate = .tileTag = ANIM_TAG_SEED, .paletteTag = ANIM_TAG_SEED, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gUnknown_085922B4, + .anims = gLeechSeedAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimLeechSeed, }; -const union AnimCmd gUnknown_085922D4[] = +const union AnimCmd gSporeParticleAnimCmds1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_085922DC[] = +const union AnimCmd gSporeParticleAnimCmds2[] = { ANIMCMD_FRAME(4, 7), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_085922E4[] = +const union AnimCmd *const gSporeParticleAnimTable[] = { - gUnknown_085922D4, - gUnknown_085922DC, + gSporeParticleAnimCmds1, + gSporeParticleAnimCmds2, }; const struct SpriteTemplate gSporeParticleSpriteTemplate = @@ -423,32 +423,32 @@ const struct SpriteTemplate gSporeParticleSpriteTemplate = .tileTag = ANIM_TAG_SPORE, .paletteTag = ANIM_TAG_SPORE, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gUnknown_085922E4, + .anims = gSporeParticleAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSporeParticle, }; -const union AnimCmd gUnknown_08592304[] = +const union AnimCmd gPetalDanceBigFlowerAnimCmds[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_0859230C[] = +const union AnimCmd gPetalDanceSmallFlowerAnimCmds[] = { ANIMCMD_FRAME(4, 1), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08592314[] = +const union AnimCmd *const gPetalDanceBigFlowerAnimTable[] = { - gUnknown_08592304, + gPetalDanceBigFlowerAnimCmds, }; -const union AnimCmd *const gUnknown_08592318[] = +const union AnimCmd *const gPetalDanceSmallFlowerAnimTable[] = { - gUnknown_0859230C, + gPetalDanceSmallFlowerAnimCmds, }; const struct SpriteTemplate gPetalDanceBigFlowerSpriteTemplate = @@ -456,7 +456,7 @@ const struct SpriteTemplate gPetalDanceBigFlowerSpriteTemplate = .tileTag = ANIM_TAG_FLOWER, .paletteTag = ANIM_TAG_FLOWER, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gUnknown_08592314, + .anims = gPetalDanceBigFlowerAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimPetalDanceBigFlower, @@ -467,13 +467,13 @@ const struct SpriteTemplate gPetalDanceSmallFlowerSpriteTemplate = .tileTag = ANIM_TAG_FLOWER, .paletteTag = ANIM_TAG_FLOWER, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gUnknown_08592318, + .anims = gPetalDanceSmallFlowerAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimPetalDanceSmallFlower, }; -const union AnimCmd gUnknown_0859234C[] = +const union AnimCmd gRazorLeafParticleAnimCmds1[] = { ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(4, 5), @@ -488,7 +488,7 @@ const union AnimCmd gUnknown_0859234C[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gUnknown_08592378[] = +const union AnimCmd gRazorLeafParticleAnimCmds2[] = { ANIMCMD_FRAME(24, 5), ANIMCMD_FRAME(28, 5), @@ -496,10 +496,10 @@ const union AnimCmd gUnknown_08592378[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08592388[] = +const union AnimCmd *const gRazorLeafParticleAnimTable[] = { - gUnknown_0859234C, - gUnknown_08592378, + gRazorLeafParticleAnimCmds1, + gRazorLeafParticleAnimCmds2, }; const struct SpriteTemplate gRazorLeafParticleSpriteTemplate = @@ -507,7 +507,7 @@ const struct SpriteTemplate gRazorLeafParticleSpriteTemplate = .tileTag = ANIM_TAG_LEAF, .paletteTag = ANIM_TAG_LEAF, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gUnknown_08592388, + .anims = gRazorLeafParticleAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimRazorLeafParticle, @@ -518,13 +518,13 @@ const struct SpriteTemplate gTwisterLeafParticleSpriteTemplate = .tileTag = ANIM_TAG_LEAF, .paletteTag = ANIM_TAG_LEAF, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gUnknown_08592388, + .anims = gRazorLeafParticleAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimMoveTwisterParticle, }; -const union AnimCmd gUnknown_085923C0[] = +const union AnimCmd gRazorLeafCutterAnimCmds[] = { ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(0, 3, .hFlip = TRUE), @@ -533,9 +533,9 @@ const union AnimCmd gUnknown_085923C0[] = ANIMCMD_JUMP(0), }; -const union AnimCmd *const gUnknown_085923D4[] = +const union AnimCmd *const gRazorLeafCutterAnimTable[] = { - gUnknown_085923C0, + gRazorLeafCutterAnimCmds, }; const struct SpriteTemplate gRazorLeafCutterSpriteTemplate = @@ -543,19 +543,19 @@ const struct SpriteTemplate gRazorLeafCutterSpriteTemplate = .tileTag = ANIM_TAG_RAZOR_LEAF, .paletteTag = ANIM_TAG_RAZOR_LEAF, .oam = &gOamData_AffineOff_ObjNormal_32x16, - .anims = gUnknown_085923D4, + .anims = gRazorLeafCutterAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimTranslateLinearSingleSineWave, }; -const union AffineAnimCmd gUnknown_085923F0[] = { +const union AffineAnimCmd gSwiftStarAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(0, 0, 0, 1), AFFINEANIMCMD_JUMP(0), }; -const union AffineAnimCmd *const gUnknown_08592400[] = { - gUnknown_085923F0, +const union AffineAnimCmd *const gSwiftStarAffineAnimTable[] = { + gSwiftStarAffineAnimCmds, }; const struct SpriteTemplate gSwiftStarSpriteTemplate = @@ -565,11 +565,11 @@ const struct SpriteTemplate gSwiftStarSpriteTemplate = .oam = &gOamData_AffineNormal_ObjNormal_32x32, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_08592400, + .affineAnims = gSwiftStarAffineAnimTable, .callback = AnimTranslateLinearSingleSineWave, }; -const union AnimCmd gUnknown_0859241C[] = +const union AnimCmd gConstrictBindingAnimCmds1[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(32, 4), @@ -578,7 +578,7 @@ const union AnimCmd gUnknown_0859241C[] = ANIMCMD_END, }; -const union AnimCmd gUnknown_08592430[] = +const union AnimCmd gConstrictBindingAnimCmds2[] = { ANIMCMD_FRAME(0, 4, .hFlip = TRUE), ANIMCMD_FRAME(32, 4, .hFlip = TRUE), @@ -587,29 +587,29 @@ const union AnimCmd gUnknown_08592430[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08592444[] = +const union AnimCmd *const gConstrictBindingAnimTable[] = { - gUnknown_0859241C, - gUnknown_08592430, + gConstrictBindingAnimCmds1, + gConstrictBindingAnimCmds2, }; -const union AffineAnimCmd gUnknown_0859244C[] = { +const union AffineAnimCmd gConstrictBindingAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), AFFINEANIMCMD_FRAME(-11, 0, 0, 6), AFFINEANIMCMD_FRAME(11, 0, 0, 6), AFFINEANIMCMD_END, }; -const union AffineAnimCmd gUnknown_0859246C[] = { +const union AffineAnimCmd gConstrictBindingAffineAnimCmds2[] = { AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0), AFFINEANIMCMD_FRAME(11, 0, 0, 6), AFFINEANIMCMD_FRAME(-11, 0, 0, 6), AFFINEANIMCMD_END, }; -const union AffineAnimCmd *const gUnknown_0859248C[] = { - gUnknown_0859244C, - gUnknown_0859246C, +const union AffineAnimCmd *const gConstrictBindingAffineAnimTable[] = { + gConstrictBindingAffineAnimCmds1, + gConstrictBindingAffineAnimCmds2, }; const struct SpriteTemplate gConstrictBindingSpriteTemplate = @@ -617,26 +617,26 @@ const struct SpriteTemplate gConstrictBindingSpriteTemplate = .tileTag = ANIM_TAG_TENDRILS, .paletteTag = ANIM_TAG_TENDRILS, .oam = &gOamData_AffineNormal_ObjNormal_64x32, - .anims = gUnknown_08592444, + .anims = gConstrictBindingAnimTable, .images = NULL, - .affineAnims = gUnknown_0859248C, + .affineAnims = gConstrictBindingAffineAnimTable, .callback = AnimConstrictBinding, }; -const union AffineAnimCmd gUnknown_085924AC[] = { +const union AffineAnimCmd gMimicOrbAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(0, 0, 0, 0), AFFINEANIMCMD_FRAME(48, 48, 0, 14), AFFINEANIMCMD_END, }; -const union AffineAnimCmd gUnknown_085924C4[] = { +const union AffineAnimCmd gMimicOrbAffineAnimCmds2[] = { AFFINEANIMCMD_FRAME(-16, -16, 0, 1), AFFINEANIMCMD_JUMP(0), }; -const union AffineAnimCmd *const gUnknown_085924D4[] = { - gUnknown_085924AC, - gUnknown_085924C4, +const union AffineAnimCmd *const gMimicOrbAffineAnimTable[] = { + gMimicOrbAffineAnimCmds1, + gMimicOrbAffineAnimCmds2, }; const struct SpriteTemplate gMimicOrbSpriteTemplate = @@ -644,13 +644,13 @@ const struct SpriteTemplate gMimicOrbSpriteTemplate = .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_AffineDouble_ObjNormal_16x16, - .anims = gUnknown_085921C8, + .anims = gPowerAbsorptionOrbAnimTable, .images = NULL, - .affineAnims = gUnknown_085924D4, + .affineAnims = gMimicOrbAffineAnimTable, .callback = AnimMimicOrb, }; -const union AnimCmd gUnknown_085924F4[] = +const union AnimCmd gIngrainRootAnimCmds1[] = { ANIMCMD_FRAME(0, 7), ANIMCMD_FRAME(16, 7), @@ -659,7 +659,7 @@ const union AnimCmd gUnknown_085924F4[] = ANIMCMD_END, }; -const union AnimCmd gUnknown_08592508[] = +const union AnimCmd gIngrainRootAnimCmds2[] = { ANIMCMD_FRAME(0, 7, .hFlip = TRUE), ANIMCMD_FRAME(16, 7, .hFlip = TRUE), @@ -668,7 +668,7 @@ const union AnimCmd gUnknown_08592508[] = ANIMCMD_END, }; -const union AnimCmd gUnknown_0859251C[] = +const union AnimCmd gIngrainRootAnimCmds3[] = { ANIMCMD_FRAME(0, 7), ANIMCMD_FRAME(16, 7), @@ -676,7 +676,7 @@ const union AnimCmd gUnknown_0859251C[] = ANIMCMD_END, }; -const union AnimCmd gUnknown_0859252C[] = +const union AnimCmd gIngrainRootAnimCmds4[] = { ANIMCMD_FRAME(0, 7, .hFlip = TRUE), ANIMCMD_FRAME(16, 7, .hFlip = TRUE), @@ -684,12 +684,12 @@ const union AnimCmd gUnknown_0859252C[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_0859253C[] = +const union AnimCmd *const gIngrainRootAnimTable[] = { - gUnknown_085924F4, - gUnknown_08592508, - gUnknown_0859251C, - gUnknown_0859252C, + gIngrainRootAnimCmds1, + gIngrainRootAnimCmds2, + gIngrainRootAnimCmds3, + gIngrainRootAnimCmds4, }; const struct SpriteTemplate gIngrainRootSpriteTemplate = @@ -697,7 +697,7 @@ const struct SpriteTemplate gIngrainRootSpriteTemplate = .tileTag = ANIM_TAG_ROOTS, .paletteTag = ANIM_TAG_ROOTS, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_0859253C, + .anims = gIngrainRootAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimIngrainRoot, @@ -708,22 +708,22 @@ const struct SpriteTemplate gFrenzyPlantRootSpriteTemplate = .tileTag = ANIM_TAG_ROOTS, .paletteTag = ANIM_TAG_ROOTS, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_0859253C, + .anims = gIngrainRootAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimFrenzyPlantRoot, }; -const union AnimCmd gUnknown_0859257C[] = +const union AnimCmd gIngrainOrbAnimCmds[] = { ANIMCMD_FRAME(3, 3), ANIMCMD_FRAME(0, 5), ANIMCMD_JUMP(0), }; -const union AnimCmd *const gUnknown_08592588[] = +const union AnimCmd *const gIngrainOrbAnimTable[] = { - gUnknown_0859257C, + gIngrainOrbAnimCmds, }; const struct SpriteTemplate gIngrainOrbSpriteTemplate = @@ -731,31 +731,31 @@ const struct SpriteTemplate gIngrainOrbSpriteTemplate = .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gUnknown_08592588, + .anims = gIngrainOrbAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimIngrainOrb, }; -const union AnimCmd gUnknown_085925A4[] = +const union AnimCmd gFallingBagAnimCmds[] = { ANIMCMD_FRAME(0, 30), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_085925AC[] = +const union AnimCmd *const gFallingBagAnimTable[] = { - gUnknown_085925A4, + gFallingBagAnimCmds, }; -const union AffineAnimCmd gUnknown_085925B0[] = { +const union AffineAnimCmd gFallingBagAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(0, 0, -4, 10), AFFINEANIMCMD_FRAME(0, 0, 4, 20), AFFINEANIMCMD_FRAME(0, 0, -4, 10), AFFINEANIMCMD_END, }; -const union AffineAnimCmd gUnknown_085925D0[] = { +const union AffineAnimCmd gFallingBagAffineAnimCmds2[] = { AFFINEANIMCMD_FRAME(0, 0, -1, 2), AFFINEANIMCMD_FRAME(0, 0, 1, 4), AFFINEANIMCMD_FRAME(0, 0, -1, 4), @@ -765,9 +765,9 @@ const union AffineAnimCmd gUnknown_085925D0[] = { AFFINEANIMCMD_END, }; -const union AffineAnimCmd *const gUnknown_08592608[] = { - gUnknown_085925B0, - gUnknown_085925D0, +const union AffineAnimCmd *const gFallingBagAffineAnimTable[] = { + gFallingBagAffineAnimCmds1, + gFallingBagAffineAnimCmds2, }; const struct SpriteTemplate gPresentSpriteTemplate = @@ -775,9 +775,9 @@ const struct SpriteTemplate gPresentSpriteTemplate = .tileTag = ANIM_TAG_ITEM_BAG, .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_AffineNormal_ObjNormal_32x32, - .anims = gUnknown_085925AC, + .anims = gFallingBagAnimTable, .images = NULL, - .affineAnims = gUnknown_08592608, + .affineAnims = gFallingBagAffineAnimTable, .callback = AnimPresent, }; @@ -786,13 +786,13 @@ const struct SpriteTemplate gKnockOffItemSpriteTemplate = .tileTag = ANIM_TAG_ITEM_BAG, .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_AffineNormal_ObjNormal_32x32, - .anims = gUnknown_085925AC, + .anims = gFallingBagAnimTable, .images = NULL, - .affineAnims = gUnknown_08592608, + .affineAnims = gFallingBagAffineAnimTable, .callback = AnimKnockOffItem, }; -const union AnimCmd gUnknown_08592640[] = +const union AnimCmd gPresentHealParticleAnimCmds[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(4, 4), @@ -801,9 +801,9 @@ const union AnimCmd gUnknown_08592640[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08592654[] = +const union AnimCmd *const gPresentHealParticleAnimTable[] = { - gUnknown_08592640, + gPresentHealParticleAnimCmds, }; const struct SpriteTemplate gPresentHealParticleSpriteTemplate = @@ -811,7 +811,7 @@ const struct SpriteTemplate gPresentHealParticleSpriteTemplate = .tileTag = ANIM_TAG_GREEN_SPARKLE, .paletteTag = ANIM_TAG_GREEN_SPARKLE, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gUnknown_08592654, + .anims = gPresentHealParticleAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimPresentHealParticle, @@ -822,18 +822,18 @@ const struct SpriteTemplate gItemStealSpriteTemplate = .tileTag = ANIM_TAG_ITEM_BAG, .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_AffineNormal_ObjNormal_32x32, - .anims = gUnknown_085925AC, + .anims = gFallingBagAnimTable, .images = NULL, - .affineAnims = gUnknown_08592608, + .affineAnims = gFallingBagAffineAnimTable, .callback = AnimItemSteal, }; -const union AffineAnimCmd gUnknown_08592688[] = { +const union AffineAnimCmd gTrickBagAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(0, 0, 0, 3), AFFINEANIMCMD_END, }; -const union AffineAnimCmd gUnknown_08592698[] = { +const union AffineAnimCmd gTrickBagAffineAnimCmds2[] = { AFFINEANIMCMD_FRAME(0, -10, 0, 3), AFFINEANIMCMD_FRAME(0, -6, 0, 3), AFFINEANIMCMD_FRAME(0, -2, 0, 3), @@ -844,11 +844,11 @@ const union AffineAnimCmd gUnknown_08592698[] = { AFFINEANIMCMD_END, }; -const union AffineAnimCmd *const gUnknown_085926D8[] = { - gUnknown_08592688, - gUnknown_08592698, - gUnknown_085925B0, - gUnknown_085925D0, +const union AffineAnimCmd *const gTrickBagAffineAnimTable[] = { + gTrickBagAffineAnimCmds1, + gTrickBagAffineAnimCmds2, + gFallingBagAffineAnimCmds1, + gFallingBagAffineAnimCmds2, }; const struct SpriteTemplate gTrickBagSpriteTemplate = @@ -856,13 +856,13 @@ const struct SpriteTemplate gTrickBagSpriteTemplate = .tileTag = ANIM_TAG_ITEM_BAG, .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_AffineNormal_ObjNormal_32x32, - .anims = gUnknown_085925AC, + .anims = gFallingBagAnimTable, .images = NULL, - .affineAnims = gUnknown_085926D8, + .affineAnims = gTrickBagAffineAnimTable, .callback = AnimTrickBag, }; -const s8 gUnknown_08592700[][3] = +const s8 gTrickBagCoordinates[][3] = { {5, 24, 1}, {0, 4, 0}, @@ -877,163 +877,163 @@ const s8 gUnknown_08592700[][3] = {0, 0, 127}, }; -const union AnimCmd gUnknown_08592724[] = +const union AnimCmd gLeafBladeAnimCmds1[] = { ANIMCMD_FRAME(28, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_0859272C[] = +const union AnimCmd gLeafBladeAnimCmds2[] = { ANIMCMD_FRAME(32, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_08592734[] = +const union AnimCmd gLeafBladeAnimCmds3[] = { ANIMCMD_FRAME(20, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_0859273C[] = +const union AnimCmd gLeafBladeAnimCmds4[] = { ANIMCMD_FRAME(28, 1, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gUnknown_08592744[] = +const union AnimCmd gLeafBladeAnimCmds5[] = { ANIMCMD_FRAME(16, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_0859274C[] = +const union AnimCmd gLeafBladeAnimCmds6[] = { ANIMCMD_FRAME(16, 1, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gUnknown_08592754[] = +const union AnimCmd gLeafBladeAnimCmds7[] = { ANIMCMD_FRAME(28, 1), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_0859275C[] = +const union AnimCmd *const gLeafBladeAnimTable[] = { - gUnknown_08592724, - gUnknown_0859272C, - gUnknown_08592734, - gUnknown_0859273C, - gUnknown_08592744, - gUnknown_0859274C, - gUnknown_08592754, + gLeafBladeAnimCmds1, + gLeafBladeAnimCmds2, + gLeafBladeAnimCmds3, + gLeafBladeAnimCmds4, + gLeafBladeAnimCmds5, + gLeafBladeAnimCmds6, + gLeafBladeAnimCmds7, }; -const struct SpriteTemplate gUnknown_08592778 = +const struct SpriteTemplate gLeafBladeSpriteTemplate = { .tileTag = ANIM_TAG_LEAF, .paletteTag = ANIM_TAG_LEAF, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gUnknown_0859275C, + .anims = gLeafBladeAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -const union AffineAnimCmd gUnknown_08592790[] = { +const union AffineAnimCmd gAromatherapyBigFlowerAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(256, 256, 0, 0), AFFINEANIMCMD_FRAME(0, 0, 4, 1), AFFINEANIMCMD_JUMP(1), }; -const union AffineAnimCmd *const gUnknown_085927A8[] = { - gUnknown_08592790, +const union AffineAnimCmd *const gAromatherapyBigFlowerAffineAnimTable[] = { + gAromatherapyBigFlowerAffineAnimCmds, }; -const struct SpriteTemplate gUnknown_085927AC = +const struct SpriteTemplate gAromatherapySmallFlowerSpriteTemplate = { .tileTag = ANIM_TAG_FLOWER, .paletteTag = ANIM_TAG_FLOWER, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = gUnknown_08592318, + .anims = gPetalDanceSmallFlowerAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8100640, + .callback = AnimFlyingParticle, }; -const struct SpriteTemplate gUnknown_085927C4 = +const struct SpriteTemplate gAromatherapyBigFlowerSpriteTemplate = { .tileTag = ANIM_TAG_FLOWER, .paletteTag = ANIM_TAG_FLOWER, .oam = &gOamData_AffineNormal_ObjNormal_16x16, - .anims = gUnknown_08592314, + .anims = gPetalDanceBigFlowerAnimTable, .images = NULL, - .affineAnims = gUnknown_085927A8, - .callback = sub_8100640, + .affineAnims = gAromatherapyBigFlowerAffineAnimTable, + .callback = AnimFlyingParticle, }; -const union AffineAnimCmd gUnknown_085927DC[] = { +const union AffineAnimCmd gSilverWindBigSparkAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(256, 256, 0, 0), AFFINEANIMCMD_FRAME(0, 0, -10, 1), AFFINEANIMCMD_JUMP(1), }; -const union AffineAnimCmd gUnknown_085927F4[] = { +const union AffineAnimCmd gSilverWindMediumSparkAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(192, 192, 0, 0), AFFINEANIMCMD_FRAME(0, 0, -12, 1), AFFINEANIMCMD_JUMP(1), }; -const union AffineAnimCmd gUnknown_0859280C[] = { +const union AffineAnimCmd gSilverWindSmallSparkAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(143, 143, 0, 0), AFFINEANIMCMD_FRAME(0, 0, -15, 1), AFFINEANIMCMD_JUMP(1), }; -const union AffineAnimCmd *const gUnknown_08592824[] = { - gUnknown_085927DC, +const union AffineAnimCmd *const gSilverWindBigSparkAffineAnimTable[] = { + gSilverWindBigSparkAffineAnimCmds, }; -const union AffineAnimCmd *const gUnknown_08592828[] = { - gUnknown_085927F4, +const union AffineAnimCmd *const gSilverWindMediumSparkAffineAnimTable[] = { + gSilverWindMediumSparkAffineAnimCmds, }; -const union AffineAnimCmd *const gUnknown_0859282C[] = { - gUnknown_0859280C, +const union AffineAnimCmd *const gSilverWindSmallSparkAffineAnimTable[] = { + gSilverWindSmallSparkAffineAnimCmds, }; -const struct SpriteTemplate gUnknown_08592830 = +const struct SpriteTemplate gSilverWindBigSparkSpriteTemplate = { .tileTag = ANIM_TAG_SPARKLE_6, .paletteTag = ANIM_TAG_SPARKLE_6, .oam = &gOamData_AffineNormal_ObjNormal_16x16, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_08592824, - .callback = sub_8100640, + .affineAnims = gSilverWindBigSparkAffineAnimTable, + .callback = AnimFlyingParticle, }; -const struct SpriteTemplate gUnknown_08592848 = +const struct SpriteTemplate gSilverWindMediumSparkSpriteTemplate = { .tileTag = ANIM_TAG_SPARKLE_6, .paletteTag = ANIM_TAG_SPARKLE_6, .oam = &gOamData_AffineNormal_ObjNormal_16x16, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_08592828, - .callback = sub_8100640, + .affineAnims = gSilverWindMediumSparkAffineAnimTable, + .callback = AnimFlyingParticle, }; -const struct SpriteTemplate gUnknown_08592860 = +const struct SpriteTemplate gSilverWindSmallSparkSpriteTemplate = { .tileTag = ANIM_TAG_SPARKLE_6, .paletteTag = ANIM_TAG_SPARKLE_6, .oam = &gOamData_AffineNormal_ObjNormal_16x16, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_0859282C, - .callback = sub_8100640, + .affineAnims = gSilverWindSmallSparkAffineAnimTable, + .callback = AnimFlyingParticle, }; const u16 gMagicalLeafBlendColors[] = @@ -1047,7 +1047,7 @@ const u16 gMagicalLeafBlendColors[] = RGB(22, 21, 31), }; -const struct SpriteTemplate gUnknown_08592888 = +const struct SpriteTemplate gNeedleArmSpikeSpriteTemplate = { .tileTag = ANIM_TAG_GREEN_SPIKE, .paletteTag = ANIM_TAG_GREEN_SPIKE, @@ -1055,10 +1055,10 @@ const struct SpriteTemplate gUnknown_08592888 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8100898, + .callback = AnimNeedleArmSpike, }; -const union AnimCmd gUnknown_085928A0[] = +const union AnimCmd gWhipAnimCmds1[] = { ANIMCMD_FRAME(64, 3), ANIMCMD_FRAME(80, 3), @@ -1067,7 +1067,7 @@ const union AnimCmd gUnknown_085928A0[] = ANIMCMD_END, }; -const union AnimCmd gUnknown_085928B4[] = +const union AnimCmd gWhipAnimCmds2[] = { ANIMCMD_FRAME(64, 3, .hFlip = TRUE), ANIMCMD_FRAME(80, 3, .hFlip = TRUE), @@ -1076,21 +1076,21 @@ const union AnimCmd gUnknown_085928B4[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_085928C8[] = +const union AnimCmd *const gWhipAnimTable[] = { - gUnknown_085928A0, - gUnknown_085928B4, + gWhipAnimCmds1, + gWhipAnimCmds2, }; -const struct SpriteTemplate gUnknown_085928D0 = +const struct SpriteTemplate gSlamHitSpriteTemplate = { .tileTag = ANIM_TAG_SLAM_HIT, .paletteTag = ANIM_TAG_SLAM_HIT, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_085928C8, + .anims = gWhipAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8100A50, + .callback = AnimWhipHit, }; const struct SpriteTemplate gVineWhipSpriteTemplate = @@ -1098,10 +1098,10 @@ const struct SpriteTemplate gVineWhipSpriteTemplate = .tileTag = ANIM_TAG_WHIP_HIT, .paletteTag = ANIM_TAG_WHIP_HIT, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_085928C8, + .anims = gWhipAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8100A50, + .callback = AnimWhipHit, }; const union AnimCmd gUnknown_08592900[] = @@ -1119,6 +1119,7 @@ const union AnimCmd *const gUnknown_08592918[] = gUnknown_08592900, }; +// Unused const struct SpriteTemplate gUnknown_0859291C = { .tileTag = ANIM_TAG_HIT, @@ -1130,6 +1131,7 @@ const struct SpriteTemplate gUnknown_0859291C = .callback = sub_81009F8, }; +// Unused const struct SpriteTemplate gUnknown_08592934 = { .tileTag = ANIM_TAG_HIT_2, @@ -1192,6 +1194,7 @@ const union AffineAnimCmd *const gUnknown_085929CC[] = { gUnknown_085929BC, }; +// Unused const struct SpriteTemplate gUnknown_085929EC = { .tileTag = ANIM_TAG_HANDS_AND_FEET, @@ -1203,7 +1206,7 @@ const struct SpriteTemplate gUnknown_085929EC = .callback = sub_8100A94, }; -const union AnimCmd gUnknown_08592A04[] = +const union AnimCmd gCuttingSliceAnimCmds[] = { ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(16, 5), @@ -1212,9 +1215,9 @@ const union AnimCmd gUnknown_08592A04[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08592A18[] = +const union AnimCmd *const gCuttingSliceAnimTable[] = { - gUnknown_08592A04, + gCuttingSliceAnimCmds, }; const struct SpriteTemplate gCuttingSliceSpriteTemplate = @@ -1222,21 +1225,21 @@ const struct SpriteTemplate gCuttingSliceSpriteTemplate = .tileTag = ANIM_TAG_CUT, .paletteTag = ANIM_TAG_CUT, .oam = &gOamData_AffineOff_ObjBlend_32x32, - .anims = gUnknown_08592A18, + .anims = gCuttingSliceAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimCuttingSlice, }; -const struct SpriteTemplate gUnknown_08592A34 = +const struct SpriteTemplate gAirCutterSliceSpriteTemplate = { .tileTag = ANIM_TAG_CUT, .paletteTag = ANIM_TAG_CUT, .oam = &gOamData_AffineOff_ObjBlend_32x32, - .anims = gUnknown_08592A18, + .anims = gCuttingSliceAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8100B88, + .callback = AnimAirCutterSlice, }; const union AnimCmd gUnknown_08592A4C[] = @@ -1313,6 +1316,7 @@ const union AnimCmd *const gUnknown_08592A9C[] = gUnknown_08592A94, }; +// Unused const struct SpriteTemplate gUnknown_08592AC4 = { .tileTag = ANIM_TAG_MUSIC_NOTES, @@ -1332,16 +1336,16 @@ const struct SpriteTemplate gUnknown_08592ADC = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8100EF0, + .callback = AnimProtect, }; -const union AffineAnimCmd gUnknown_08592AF4[] = +const union AffineAnimCmd gMilkBottleAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), AFFINEANIMCMD_END, }; -const union AffineAnimCmd gUnknown_08592B04[] = +const union AffineAnimCmd gMilkBottleAffineAnimCmds2[] = { AFFINEANIMCMD_FRAME(0x0, 0x0, 2, 12), AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 6), @@ -1351,24 +1355,24 @@ const union AffineAnimCmd gUnknown_08592B04[] = AFFINEANIMCMD_JUMP(0), }; -const union AffineAnimCmd *const gUnknown_08592B34[] = +const union AffineAnimCmd *const gMilkBottleAffineAnimTable[] = { - gUnknown_08592AF4, - gUnknown_08592B04, + gMilkBottleAffineAnimCmds1, + gMilkBottleAffineAnimCmds2, }; -const struct SpriteTemplate gUnknown_08592B3C = +const struct SpriteTemplate gMilkBottleSpriteTemplate = { .tileTag = ANIM_TAG_MILK_BOTTLE, .paletteTag = ANIM_TAG_MILK_BOTTLE, .oam = &gOamData_AffineNormal_ObjBlend_32x32, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_08592B34, - .callback = sub_81010CC, + .affineAnims = gMilkBottleAffineAnimTable, + .callback = AnimMilkBottle, }; -const union AnimCmd gUnknown_08592B54[] = +const union AnimCmd gGrantingStarsAnimCmds[] = { ANIMCMD_FRAME(0, 7), ANIMCMD_FRAME(16, 7), @@ -1381,31 +1385,31 @@ const union AnimCmd gUnknown_08592B54[] = ANIMCMD_JUMP(0), }; -const union AnimCmd *const gUnknown_08592B78[] = +const union AnimCmd *const gGrantingStarsAnimTable[] = { - gUnknown_08592B54, + gGrantingStarsAnimCmds, }; -const struct SpriteTemplate gUnknown_08592B7C = +const struct SpriteTemplate gGrantingStarsSpriteTemplate = { .tileTag = ANIM_TAG_SPARKLE_2, .paletteTag = ANIM_TAG_SPARKLE_2, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_08592B78, + .anims = gGrantingStarsAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_810130C, + .callback = AnimGrantingStars, }; -const struct SpriteTemplate gUnknown_08592B94 = +const struct SpriteTemplate gSparklingStarsSpriteTemplate = { .tileTag = ANIM_TAG_SPARKLE_2, .paletteTag = ANIM_TAG_SPARKLE_2, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_08592B78, + .anims = gGrantingStarsAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_810135C, + .callback = AnimSparkingStars, }; const union AnimCmd gUnknown_08592BAC[] = @@ -1440,6 +1444,7 @@ const union AnimCmd *const gUnknown_08592BF4[] = gUnknown_08592BD0, }; +// Unused const struct SpriteTemplate gUnknown_08592BFC = { .tileTag = ANIM_TAG_BUBBLE_BURST, @@ -1451,63 +1456,63 @@ const struct SpriteTemplate gUnknown_08592BFC = .callback = sub_8101440, }; -const union AnimCmd gUnknown_08592C14[] = +const union AnimCmd gSleepLetterZAnimCmds[] = { ANIMCMD_FRAME(0, 40), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08592C1C[] = +const union AnimCmd *const gSleepLetterZAnimTable[] = { - gUnknown_08592C14, + gSleepLetterZAnimCmds, }; -const union AffineAnimCmd gUnknown_08592C20[] = +const union AffineAnimCmd gSleepLetterZAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(0x14, 0x14, -30, 0), AFFINEANIMCMD_FRAME(0x8, 0x8, 1, 24), AFFINEANIMCMD_END, }; -const union AffineAnimCmd gUnknown_08592C20_2[] = +const union AffineAnimCmd gSleepLetterZAffineAnimCmds1_2[] = { AFFINEANIMCMD_LOOP(0), AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 24), AFFINEANIMCMD_LOOP(10), }; -const union AffineAnimCmd gUnknown_08592C50[] = +const union AffineAnimCmd gSleepLetterZAffineAnimCmds2[] = { AFFINEANIMCMD_FRAME(0x14, 0x14, 30, 0), AFFINEANIMCMD_FRAME(0x8, 0x8, -1, 24), AFFINEANIMCMD_END, }; -const union AffineAnimCmd gUnknown_08592C50_2[] = +const union AffineAnimCmd gSleepLetterZAffineAnimCmds2_2[] = { AFFINEANIMCMD_LOOP(0), AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 24), AFFINEANIMCMD_LOOP(10), }; -const union AffineAnimCmd *const gUnknown_08592C80[] = +const union AffineAnimCmd *const gSleepLetterZAffineAnimTable[] = { - gUnknown_08592C20, - gUnknown_08592C50, + gSleepLetterZAffineAnimCmds1, + gSleepLetterZAffineAnimCmds2, }; -const struct SpriteTemplate gUnknown_08592C88 = +const struct SpriteTemplate gSleepLetterZSpriteTemplate = { .tileTag = ANIM_TAG_LETTER_Z, .paletteTag = ANIM_TAG_LETTER_Z, .oam = &gOamData_AffineNormal_ObjNormal_32x32, - .anims = gUnknown_08592C1C, + .anims = gSleepLetterZAnimTable, .images = NULL, - .affineAnims = gUnknown_08592C80, - .callback = sub_81014F4, + .affineAnims = gSleepLetterZAffineAnimTable, + .callback = AnimSleepLetterZ, }; -const struct SpriteTemplate gUnknown_08592CA0 = +const struct SpriteTemplate gLockOnTargetSpriteTemplate = { .tileTag = ANIM_TAG_LOCK_ON, .paletteTag = ANIM_TAG_LOCK_ON, @@ -1515,10 +1520,10 @@ const struct SpriteTemplate gUnknown_08592CA0 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_81015AC, + .callback = AnimLockOnTarget, }; -const struct SpriteTemplate gUnknown_08592CB8 = +const struct SpriteTemplate gLockOnMoveTargetSpriteTemplate = { .tileTag = ANIM_TAG_LOCK_ON, .paletteTag = ANIM_TAG_LOCK_ON, @@ -1526,10 +1531,10 @@ const struct SpriteTemplate gUnknown_08592CB8 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8101898, + .callback = AnimLockOnMoveTarget, }; -const s8 gUnknown_08592CD0[][2] = +const s8 gInclineMonCoordTable[][2] = { { 64, 64}, { 0, -64}, @@ -1537,7 +1542,7 @@ const s8 gUnknown_08592CD0[][2] = { 32, -32}, }; -const struct SpriteTemplate gUnknown_08592CD8 = +const struct SpriteTemplate gBowMonSpriteTemplate = { .tileTag = 0, .paletteTag = 0, @@ -1545,9 +1550,10 @@ const struct SpriteTemplate gUnknown_08592CD8 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8101940, + .callback = AnimBowMon, }; +// Unused const struct SpriteTemplate gUnknown_08592CF0 = { .tileTag = 0, @@ -1559,7 +1565,7 @@ const struct SpriteTemplate gUnknown_08592CF0 = .callback = sub_8101B90, }; -const union AnimCmd gUnknown_08592D08[] = +const union AnimCmd gSlashSliceAnimCmds1[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(16, 4), @@ -1568,52 +1574,52 @@ const union AnimCmd gUnknown_08592D08[] = ANIMCMD_END, }; -const union AnimCmd gUnknown_08592D1C[] = +const union AnimCmd gSlashSliceAnimCmds2[] = { ANIMCMD_FRAME(48, 4), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08592D24[] = +const union AnimCmd *const gSlashSliceAnimTable[] = { - gUnknown_08592D08, - gUnknown_08592D1C, + gSlashSliceAnimCmds1, + gSlashSliceAnimCmds2, }; -const struct SpriteTemplate gUnknown_08592D2C = +const struct SpriteTemplate gSlashSliceSpriteTemplate = { .tileTag = ANIM_TAG_SLASH, .paletteTag = ANIM_TAG_SLASH, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_08592D24, + .anims = gSlashSliceAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8101F40, + .callback = AnimSlashSlice, }; -const struct SpriteTemplate gUnknown_08592D44 = +const struct SpriteTemplate gFalseSwipeSliceSpriteTemplate = { .tileTag = ANIM_TAG_SLASH_2, .paletteTag = ANIM_TAG_SLASH_2, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_08592D24, + .anims = gSlashSliceAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8101FA8, + .callback = AnimFalseSwipeSlice, }; -const struct SpriteTemplate gUnknown_08592D5C = +const struct SpriteTemplate gFalseSwipePositionedSliceSpriteTemplate = { .tileTag = ANIM_TAG_SLASH_2, .paletteTag = ANIM_TAG_SLASH_2, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_08592D24, + .anims = gSlashSliceAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8101FF0, + .callback = AnimFalseSwipePositionedSlice, }; -const union AnimCmd gUnknown_08592D74[] = +const union AnimCmd gEndureEnergyAnimCmds[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(8, 12), @@ -1622,23 +1628,23 @@ const union AnimCmd gUnknown_08592D74[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08592D88[] = +const union AnimCmd *const gEndureEnergyAnimTable[] = { - gUnknown_08592D74, + gEndureEnergyAnimCmds, }; -const struct SpriteTemplate gUnknown_08592D8C = +const struct SpriteTemplate gEndureEnergySpriteTemplate = { .tileTag = ANIM_TAG_FOCUS_ENERGY, .paletteTag = ANIM_TAG_FOCUS_ENERGY, .oam = &gOamData_AffineOff_ObjNormal_16x32, - .anims = gUnknown_08592D88, + .anims = gEndureEnergyAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_81020D8, + .callback = AnimEndureEnergy, }; -const union AnimCmd gUnknown_08592DA4[] = +const union AnimCmd gSharpenSphereAnimCmds[] = { ANIMCMD_FRAME(0, 18), ANIMCMD_FRAME(0, 6), @@ -1657,23 +1663,23 @@ const union AnimCmd gUnknown_08592DA4[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08592DE0[] = +const union AnimCmd *const gSharpenSphereAnimTable[] = { - gUnknown_08592DA4, + gSharpenSphereAnimCmds, }; -const struct SpriteTemplate gUnknown_08592DE4 = +const struct SpriteTemplate gSharpenSphereSpriteTemplate = { .tileTag = ANIM_TAG_SPHERE_TO_CUBE, .paletteTag = ANIM_TAG_SPHERE_TO_CUBE, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_08592DE0, + .anims = gSharpenSphereAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_810217C, + .callback = AnimSharpenSphere, }; -const struct SpriteTemplate gUnknown_08592DFC = +const struct SpriteTemplate gOctazookaBallSpriteTemplate = { .tileTag = ANIM_TAG_BLACK_BALL, .paletteTag = ANIM_TAG_BLACK_BALL, @@ -1684,7 +1690,7 @@ const struct SpriteTemplate gUnknown_08592DFC = .callback = TranslateAnimSpriteToTargetMonLocation, }; -const union AnimCmd gUnknown_08592E14[] = +const union AnimCmd gOctazookaAnimCmds[] = { ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(16, 3), @@ -1694,23 +1700,23 @@ const union AnimCmd gUnknown_08592E14[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08592E2C[] = +const union AnimCmd *const gOctazookaAnimTable[] = { - gUnknown_08592E14, + gOctazookaAnimCmds, }; -const struct SpriteTemplate gUnknown_08592E30 = +const struct SpriteTemplate gOctazookaSmokeSpriteTemplate = { .tileTag = ANIM_TAG_GRAY_SMOKE, .paletteTag = ANIM_TAG_GRAY_SMOKE, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_08592E2C, + .anims = gOctazookaAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A77C8, + .callback = AnimSpriteOnMonPos, }; -const union AnimCmd gUnknown_08592E48[] = +const union AnimCmd gConversionAnimCmds[] = { ANIMCMD_FRAME(3, 5), ANIMCMD_FRAME(2, 5), @@ -1719,34 +1725,34 @@ const union AnimCmd gUnknown_08592E48[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08592E5C[] = +const union AnimCmd *const gConversionAnimTable[] = { - gUnknown_08592E48, + gConversionAnimCmds, }; -const union AffineAnimCmd gUnknown_08592E60[] = +const union AffineAnimCmd gConversionAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0), AFFINEANIMCMD_END, }; -const union AffineAnimCmd *const gUnknown_08592E70[] = +const union AffineAnimCmd *const gConversionAffineAnimTable[] = { - gUnknown_08592E60, + gConversionAffineAnimCmds, }; -const struct SpriteTemplate gUnknown_08592E74 = +const struct SpriteTemplate gConversionSpriteTemplate = { .tileTag = ANIM_TAG_CONVERSION, .paletteTag = ANIM_TAG_CONVERSION, .oam = &gOamData_AffineDouble_ObjBlend_8x8, - .anims = gUnknown_08592E5C, + .anims = gConversionAnimTable, .images = NULL, - .affineAnims = gUnknown_08592E70, - .callback = sub_8102268, + .affineAnims = gConversionAffineAnimTable, + .callback = AnimConversion, }; -const union AnimCmd gUnknown_08592E8C[] = +const union AnimCmd gConversion2AnimCmds[] = { ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(1, 5), @@ -1755,23 +1761,23 @@ const union AnimCmd gUnknown_08592E8C[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08592EA0[] = +const union AnimCmd *const gConversion2AnimTable[] = { - gUnknown_08592E8C, + gConversion2AnimCmds, }; -const struct SpriteTemplate gUnknown_08592EA4 = +const struct SpriteTemplate gConversion2SpriteTemplate = { .tileTag = ANIM_TAG_CONVERSION, .paletteTag = ANIM_TAG_CONVERSION, .oam = &gOamData_AffineDouble_ObjBlend_8x8, - .anims = gUnknown_08592EA0, + .anims = gConversion2AnimTable, .images = NULL, - .affineAnims = gUnknown_08592E70, - .callback = sub_810234C, + .affineAnims = gConversionAffineAnimTable, + .callback = AnimConversion2, }; -const struct SpriteTemplate gUnknown_08592EBC = +const struct SpriteTemplate gMoonSpriteTemplate = { .tileTag = ANIM_TAG_MOON, .paletteTag = ANIM_TAG_MOON, @@ -1779,10 +1785,10 @@ const struct SpriteTemplate gUnknown_08592EBC = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_81024E0, + .callback = AnimMoon, }; -const union AnimCmd gUnknown_08592ED4[] = +const union AnimCmd gMoonlightSparkleAnimCmds[] = { ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(4, 8), @@ -1791,23 +1797,23 @@ const union AnimCmd gUnknown_08592ED4[] = ANIMCMD_JUMP(0), }; -const union AnimCmd *const gUnknown_08592EE8[] = +const union AnimCmd *const gMoonlightSparkleAnimTable[] = { - gUnknown_08592ED4, + gMoonlightSparkleAnimCmds, }; -const struct SpriteTemplate gBattleAnimSpriteTemplate_8592EEC = +const struct SpriteTemplate gMoonlightSparkleSpriteTemplate = { .tileTag = ANIM_TAG_GREEN_SPARKLE, .paletteTag = ANIM_TAG_GREEN_SPARKLE, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gUnknown_08592EE8, + .anims = gMoonlightSparkleAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8102540, + .callback = AnimMoonlightSparkle, }; -const union AnimCmd gUnknown_08592F04[] = +const union AnimCmd gHealingBlueStarAnimCmds[] = { ANIMCMD_FRAME(0, 2), ANIMCMD_FRAME(16, 2), @@ -1820,23 +1826,23 @@ const union AnimCmd gUnknown_08592F04[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08592F28[] = +const union AnimCmd *const gHealingBlueStarAnimTable[] = { - gUnknown_08592F04, + gHealingBlueStarAnimCmds, }; -const struct SpriteTemplate gUnknown_08592F2C = +const struct SpriteTemplate gHealingBlueStarSpriteTemplate = { .tileTag = ANIM_TAG_BLUE_STAR, .paletteTag = ANIM_TAG_BLUE_STAR, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_08592F28, + .anims = gHealingBlueStarAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A77C8, + .callback = AnimSpriteOnMonPos, }; -const struct SpriteTemplate gUnknown_08592F44 = +const struct SpriteTemplate gHornHitSpriteTemplate = { .tileTag = ANIM_TAG_HORN_HIT, .paletteTag = ANIM_TAG_HORN_HIT, @@ -1844,10 +1850,10 @@ const struct SpriteTemplate gUnknown_08592F44 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8102844, + .callback = AnimHornHit, }; -const union AnimCmd gUnknown_08592F5C[] = +const union AnimCmd gSuperFangAnimCmds[] = { ANIMCMD_FRAME(0, 2), ANIMCMD_FRAME(16, 2), @@ -1856,106 +1862,106 @@ const union AnimCmd gUnknown_08592F5C[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08592F70[] = +const union AnimCmd *const gSuperFangAnimTable[] = { - gUnknown_08592F5C, + gSuperFangAnimCmds, }; -const struct SpriteTemplate gUnknown_08592F74 = +const struct SpriteTemplate gSuperFangSpriteTemplate = { .tileTag = ANIM_TAG_FANG_ATTACK, .paletteTag = ANIM_TAG_FANG_ATTACK, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_08592F70, + .anims = gSuperFangAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8102BCC, + .callback = AnimSuperFang, }; -const union AnimCmd gUnknown_08592F8C[] = +const union AnimCmd gWavyMusicNotesAnimCmds1[] = { ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; -const union AnimCmd gUnknown_08592F94[] = +const union AnimCmd gWavyMusicNotesAnimCmds2[] = { ANIMCMD_FRAME(4, 10), ANIMCMD_END, }; -const union AnimCmd gUnknown_08592F9C[] = +const union AnimCmd gWavyMusicNotesAnimCmds3[] = { ANIMCMD_FRAME(8, 41), ANIMCMD_END, }; -const union AnimCmd gUnknown_08592FA4[] = +const union AnimCmd gWavyMusicNotesAnimCmds4[] = { ANIMCMD_FRAME(12, 10), ANIMCMD_END, }; -const union AnimCmd gUnknown_08592FAC[] = +const union AnimCmd gWavyMusicNotesAnimCmds5[] = { ANIMCMD_FRAME(16, 10), ANIMCMD_END, }; -const union AnimCmd gUnknown_08592FB4[] = +const union AnimCmd gWavyMusicNotesAnimCmds6[] = { ANIMCMD_FRAME(20, 10), ANIMCMD_END, }; -const union AnimCmd gUnknown_08592FBC[] = +const union AnimCmd gWavyMusicNotesAnimCmds7[] = { ANIMCMD_FRAME(0, 10, .vFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gUnknown_08592FC4[] = +const union AnimCmd gWavyMusicNotesAnimCmds8[] = { ANIMCMD_FRAME(4, 10, .vFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08592FCC[] = +const union AnimCmd *const gMusicNotesAnimTable[] = { - gUnknown_08592F8C, - gUnknown_08592F94, - gUnknown_08592F9C, - gUnknown_08592FA4, - gUnknown_08592FAC, - gUnknown_08592FB4, - gUnknown_08592FBC, - gUnknown_08592FC4, + gWavyMusicNotesAnimCmds1, + gWavyMusicNotesAnimCmds2, + gWavyMusicNotesAnimCmds3, + gWavyMusicNotesAnimCmds4, + gWavyMusicNotesAnimCmds5, + gWavyMusicNotesAnimCmds6, + gWavyMusicNotesAnimCmds7, + gWavyMusicNotesAnimCmds8, }; -const union AffineAnimCmd gUnknown_08592FEC[] = +const union AffineAnimCmd gWavyMusicNotesAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(0xC, 0xC, 0, 16), AFFINEANIMCMD_FRAME(0xFFF4, 0xFFF4, 0, 16), AFFINEANIMCMD_JUMP(0), }; -const union AffineAnimCmd *const gUnknown_08593004[] = +const union AffineAnimCmd *const gMusicNotesAffineAnimTable[] = { - gUnknown_08592FEC, + gWavyMusicNotesAffineAnimCmds, }; -const struct SpriteTemplate gUnknown_08593008 = +const struct SpriteTemplate gWavyMusicNotesSpriteTemplate = { .tileTag = ANIM_TAG_MUSIC_NOTES, .paletteTag = ANIM_TAG_MUSIC_NOTES, .oam = &gOamData_AffineDouble_ObjNormal_16x16, - .anims = gUnknown_08592FCC, + .anims = gMusicNotesAnimTable, .images = NULL, - .affineAnims = gUnknown_08593004, - .callback = sub_8102CD4, + .affineAnims = gMusicNotesAffineAnimTable, + .callback = AnimWavyMusicNotes, }; -const u16 gUnknown_08593020[][6] = +const u16 gParticlesColorBlendTable[][6] = { {ANIM_TAG_MUSIC_NOTES, RGB(31, 31, 31), RGB(31, 26, 28), RGB(31, 22, 26), RGB(31, 17, 24), RGB(31, 13, 22)}, {ANIM_TAG_BENT_SPOON, RGB(31, 31, 31), RGB(25, 31, 26), RGB(20, 31, 21), RGB(15, 31, 16), RGB(10, 31, 12)}, @@ -1963,18 +1969,18 @@ const u16 gUnknown_08593020[][6] = {ANIM_TAG_LARGE_FRESH_EGG, RGB(31, 31, 31), RGB(26, 28, 31), RGB(21, 26, 31), RGB(16, 24, 31), RGB(12, 22, 31)}, }; -const struct SpriteTemplate gUnknown_08593050 = +const struct SpriteTemplate gFastFlyingMusicNotesSpriteTemplate = { .tileTag = ANIM_TAG_MUSIC_NOTES, .paletteTag = ANIM_TAG_MUSIC_NOTES, .oam = &gOamData_AffineDouble_ObjNormal_16x16, - .anims = gUnknown_08592FCC, + .anims = gMusicNotesAnimTable, .images = NULL, - .affineAnims = gUnknown_08593004, - .callback = sub_8102EB0, + .affineAnims = gMusicNotesAffineAnimTable, + .callback = AnimFlyingMusicNotes, }; -const struct SpriteTemplate gUnknown_08593068 = +const struct SpriteTemplate gBellyDrumHandSpriteTemplate = { .tileTag = ANIM_TAG_PURPLE_HAND_OUTLINE, .paletteTag = ANIM_TAG_PURPLE_HAND_OUTLINE, @@ -1982,33 +1988,33 @@ const struct SpriteTemplate gUnknown_08593068 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8102FB8, + .callback = AnimBellyDrumHand, }; -const union AffineAnimCmd gUnknown_08593080[] = +const union AffineAnimCmd gSlowFlyingMusicNotesAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(0xA0, 0xA0, 0, 0), AFFINEANIMCMD_FRAME(0x4, 0x4, 0, 1), AFFINEANIMCMD_JUMP(1), }; -const union AffineAnimCmd *const gUnknown_08593098[] = +const union AffineAnimCmd *const gSlowFlyingMusicNotesAffineAnimTable[] = { - gUnknown_08593080, + gSlowFlyingMusicNotesAffineAnimCmds, }; -const struct SpriteTemplate gUnknown_0859309C = +const struct SpriteTemplate gSlowFlyingMusicNotesSpriteTemplate = { .tileTag = ANIM_TAG_MUSIC_NOTES, .paletteTag = ANIM_TAG_MUSIC_NOTES, .oam = &gOamData_AffineDouble_ObjNormal_16x16, - .anims = gUnknown_08592FCC, + .anims = gMusicNotesAnimTable, .images = NULL, - .affineAnims = gUnknown_08593098, - .callback = sub_8103028, + .affineAnims = gSlowFlyingMusicNotesAffineAnimTable, + .callback = AnimSlowFlyingMusicNotes, }; -const union AnimCmd gUnknown_085930B4[] = +const union AnimCmd gMetronomeThroughtBubbleAnimCmds1[] = { ANIMCMD_FRAME(0, 2, .hFlip = TRUE), ANIMCMD_FRAME(16, 2, .hFlip = TRUE), @@ -2017,7 +2023,7 @@ const union AnimCmd gUnknown_085930B4[] = ANIMCMD_END, }; -const union AnimCmd gUnknown_085930C8[] = +const union AnimCmd gMetronomeThroughtBubbleAnimCmds3[] = { ANIMCMD_FRAME(48, 2, .hFlip = TRUE), ANIMCMD_FRAME(32, 2, .hFlip = TRUE), @@ -2026,7 +2032,7 @@ const union AnimCmd gUnknown_085930C8[] = ANIMCMD_END, }; -const union AnimCmd gUnknown_085930DC[] = +const union AnimCmd gMetronomeThroughtBubbleAnimCmds2[] = { ANIMCMD_FRAME(0, 2), ANIMCMD_FRAME(16, 2), @@ -2035,7 +2041,7 @@ const union AnimCmd gUnknown_085930DC[] = ANIMCMD_END, }; -const union AnimCmd gUnknown_085930F0[] = +const union AnimCmd gMetronomeThroughtBubbleAnimCmds4[] = { ANIMCMD_FRAME(48, 2), ANIMCMD_FRAME(32, 2), @@ -2044,33 +2050,33 @@ const union AnimCmd gUnknown_085930F0[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08593104[] = +const union AnimCmd *const gMetronomeThroughtBubbleAnimTable[] = { - gUnknown_085930B4, - gUnknown_085930DC, - gUnknown_085930C8, - gUnknown_085930F0, + gMetronomeThroughtBubbleAnimCmds1, + gMetronomeThroughtBubbleAnimCmds2, + gMetronomeThroughtBubbleAnimCmds3, + gMetronomeThroughtBubbleAnimCmds4, }; -const struct SpriteTemplate gUnknown_08593114 = +const struct SpriteTemplate gThoughtBubbleSpriteTemplate = { .tileTag = ANIM_TAG_THOUGHT_BUBBLE, .paletteTag = ANIM_TAG_THOUGHT_BUBBLE, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_08593104, + .anims = gMetronomeThroughtBubbleAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8103164, + .callback = AnimThoughtBubble, }; -const union AffineAnimCmd gUnknown_0859312C[] = +const union AffineAnimCmd gMetronomeFingerAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0), AFFINEANIMCMD_FRAME(0x1E, 0x1E, 0, 8), AFFINEANIMCMD_END, }; -const union AffineAnimCmd gUnknown_08593144[] = +const union AffineAnimCmd gMetronomeFingerAffineAnimCmds2[] = { AFFINEANIMCMD_FRAME(0x0, 0x0, 4, 11), AFFINEANIMCMD_FRAME(0x0, 0x0, -4, 11), @@ -2079,7 +2085,7 @@ const union AffineAnimCmd gUnknown_08593144[] = AFFINEANIMCMD_END, }; -const union AffineAnimCmd gUnknown_08593144_2[] = +const union AffineAnimCmd gMetronomeFingerAffineAnimCmds2_2[] = { AFFINEANIMCMD_FRAME(16, 16, 0, 0), AFFINEANIMCMD_FRAME(30, 30, 0, 8), @@ -2092,47 +2098,47 @@ const union AffineAnimCmd gUnknown_08593144_2[] = AFFINEANIMCMD_END, }; -const union AffineAnimCmd *const gUnknown_085931B4[] = +const union AffineAnimCmd *const gMetronomeFingerAffineAnimTable[] = { - gUnknown_0859312C, - gUnknown_08593144, + gMetronomeFingerAffineAnimCmds1, + gMetronomeFingerAffineAnimCmds2, }; -const struct SpriteTemplate gUnknown_085931BC = +const struct SpriteTemplate gMetronomeFingerSpriteTemplate = { .tileTag = ANIM_TAG_FINGER, .paletteTag = ANIM_TAG_FINGER, .oam = &gOamData_AffineDouble_ObjNormal_32x32, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_085931B4, - .callback = sub_8103208, + .affineAnims = gMetronomeFingerAffineAnimTable, + .callback = AnimMetronomeFinger, }; -const struct SpriteTemplate gUnknown_085931D4 = +const struct SpriteTemplate gFollowMeFingerSpriteTemplate = { .tileTag = ANIM_TAG_FINGER, .paletteTag = ANIM_TAG_FINGER, .oam = &gOamData_AffineNormal_ObjNormal_32x32, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_085931B4, - .callback = sub_8103284, + .affineAnims = gMetronomeFingerAffineAnimTable, + .callback = AnimFollowMeFinger, }; -const union AnimCmd gUnknown_085931EC[] = +const union AnimCmd gTauntFingerAnimCmds1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_085931F4[] = +const union AnimCmd gTauntFingerAnimCmds2[] = { ANIMCMD_FRAME(0, 1, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gUnknown_085931FC[] = +const union AnimCmd gTauntFingerAnimCmds3[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(16, 4), @@ -2144,7 +2150,7 @@ const union AnimCmd gUnknown_085931FC[] = ANIMCMD_END, }; -const union AnimCmd gUnknown_0859321C[] = +const union AnimCmd gTauntFingerAnimCmds4[] = { ANIMCMD_FRAME(0, 4, .hFlip = TRUE), ANIMCMD_FRAME(16, 4, .hFlip = TRUE), @@ -2156,23 +2162,23 @@ const union AnimCmd gUnknown_0859321C[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_0859323C[] = +const union AnimCmd *const gTauntFingerAnimTable[] = { - gUnknown_085931EC, - gUnknown_085931F4, - gUnknown_085931FC, - gUnknown_0859321C, + gTauntFingerAnimCmds1, + gTauntFingerAnimCmds2, + gTauntFingerAnimCmds3, + gTauntFingerAnimCmds4, }; -const struct SpriteTemplate gUnknown_0859324C = +const struct SpriteTemplate gTauntFingerSpriteTemplate = { .tileTag = ANIM_TAG_FINGER_2, .paletteTag = ANIM_TAG_FINGER_2, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_0859323C, + .anims = gTauntFingerAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8103390, + .callback = AnimTauntFinger, }; // Animates the falling particles that horizontally wave back and forth. @@ -2803,11 +2809,11 @@ void sub_80FF458(u8 taskId) gTasks[taskId].data[0] = gBattleAnimArgs[0]; gTasks[taskId].data[1] = gBattleAnimArgs[1]; gTasks[taskId].data[11] = 0x100; - gTasks[taskId].func = sub_80FF53C; + gTasks[taskId].func = AnimTask_DuplicateAndShrinkToPosStep1; } } -static void sub_80FF53C(u8 taskId) +static void AnimTask_DuplicateAndShrinkToPosStep1(u8 taskId) { u8 spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); gTasks[taskId].data[10] += gTasks[taskId].data[0]; @@ -2821,11 +2827,11 @@ static void sub_80FF53C(u8 taskId) if (--gTasks[taskId].data[1] == 0) { gTasks[taskId].data[0] = 0; - gTasks[taskId].func = sub_80FF5CC; + gTasks[taskId].func = AnimTask_DuplicateAndShrinkToPosStep2; } } -static void sub_80FF5CC(u8 taskId) +static void AnimTask_DuplicateAndShrinkToPosStep2(u8 taskId) { if ((u16)gBattleAnimArgs[7] == 0xFFFF) { @@ -2981,38 +2987,38 @@ static void sub_80FF9B8(struct Sprite* sprite, s16 c) sprite->data[7] = c; } -bool8 sub_80FF9E0(struct Sprite* sprite) +bool8 moveAlongLinearPath(struct Sprite* sprite) { - u16 r10 = (u8)(sprite->data[5] >> 8); - u16 r9 = (u8)sprite->data[5]; - s32 r2 = (u8)(sprite->data[6] >> 8); - s32 r4 = (u8)sprite->data[6]; - s16 r6 = sprite->data[7] >> 8; - s16 r3 = sprite->data[7] & 0xFF; - s16 r4_2; + u16 xStartPos = (u8)(sprite->data[5] >> 8); + u16 yStartPos = (u8)sprite->data[5]; + s32 xEndPos = (u8)(sprite->data[6] >> 8); + s32 yEndPos = (u8)sprite->data[6]; + s16 totalTime = sprite->data[7] >> 8; + s16 currentTime = sprite->data[7] & 0xFF; + s16 yEndPos_2; s16 r0; s32 var1; - s32 var2; - - if (r2 == 0) - r2 = -32; - else if (r2 == 255) - r2 = 272; - - r4_2 = r4 - r9; - r0 = r2 - r10; - var1 = r0 * r3 / r6; - var2 = r4_2 * r3 / r6; - sprite->pos1.x = var1 + r10; - sprite->pos1.y = var2 + r9; - if (++r3 == r6) + s32 vaxEndPos; + + if (xEndPos == 0) + xEndPos = -32; + else if (xEndPos == 255) + xEndPos = 272; + + yEndPos_2 = yEndPos - yStartPos; + r0 = xEndPos - xStartPos; + var1 = r0 * currentTime / totalTime; + vaxEndPos = yEndPos_2 * currentTime / totalTime; + sprite->pos1.x = var1 + xStartPos; + sprite->pos1.y = vaxEndPos + yStartPos; + if (++currentTime == totalTime) return TRUE; - sprite->data[7] = (r6 << 8) | r3; + sprite->data[7] = (totalTime << 8) | currentTime; return FALSE; } -void sub_80FFA84(struct Sprite* sprite) +void AnimItemStealStep2(struct Sprite* sprite) { if (sprite->data[0] == 10) StartSpriteAffineAnim(sprite, 1); @@ -3022,7 +3028,7 @@ void sub_80FFA84(struct Sprite* sprite) DestroyAnimSprite(sprite); } -static void sub_80FFAB4(struct Sprite* sprite) +static void AnimItemStealStep1(struct Sprite* sprite) { sprite->data[0] += sprite->data[3] * 128 / sprite->data[4]; if (sprite->data[0] >= 128) @@ -3032,11 +3038,11 @@ static void sub_80FFAB4(struct Sprite* sprite) } sprite->pos2.y = Sin(sprite->data[0] + 128, 30 - sprite->data[1] * 8); - if (sub_80FF9E0(sprite)) + if (moveAlongLinearPath(sprite)) { sprite->pos2.y = 0; sprite->data[0] = 0; - sprite->callback = sub_80FFA84; + sprite->callback = AnimItemStealStep2; } } @@ -3063,7 +3069,7 @@ void AnimPresent(struct Sprite* sprite) } sprite->data[4] = 60; - sprite->callback = sub_80FFAB4; + sprite->callback = AnimItemStealStep1; } static void sub_80FFB90(struct Sprite* sprite) @@ -3078,7 +3084,7 @@ static void sub_80FFB90(struct Sprite* sprite) } sprite->pos2.y = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8); - if (sub_80FF9E0(sprite)) + if (moveAlongLinearPath(sprite)) { sprite->pos2.y = zero; sprite->data[0] = zero; @@ -3096,7 +3102,7 @@ void AnimKnockOffItem(struct Sprite* sprite) sub_80FF9B8(sprite, 40); sprite->data[3] = 3; sprite->data[4] = 60; - sprite->callback = sub_80FFAB4; + sprite->callback = AnimItemStealStep1; } else { @@ -3154,10 +3160,10 @@ void AnimItemSteal(struct Sprite* sprite) } sprite->data[4] = 60; - sprite->callback = AnimItemStealStep; + sprite->callback = AnimItemStealStep3; } -static void AnimItemStealStep(struct Sprite* sprite) +static void AnimItemStealStep3(struct Sprite* sprite) { int zero; sprite->data[0] += ((sprite->data[3] * 128) / sprite->data[4]); @@ -3172,11 +3178,11 @@ static void AnimItemStealStep(struct Sprite* sprite) if (sprite->pos2.y == 0) PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(63)); - if (sub_80FF9E0(sprite)) + if (moveAlongLinearPath(sprite)) { sprite->pos2.y = 0; sprite->data[0] = 0; - sprite->callback = sub_80FFA84; + sprite->callback = AnimItemStealStep2; PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(-64)); } } @@ -3253,9 +3259,9 @@ static void AnimTrickBagStep1(struct Sprite* sprite) static void AnimTrickBagStep2(struct Sprite* sprite) { - if (sprite->data[2] == gUnknown_08592700[sprite->data[0]][1]) + if (sprite->data[2] == gTrickBagCoordinates[sprite->data[0]][1]) { - if (gUnknown_08592700[sprite->data[0]][2] == 127) + if (gTrickBagCoordinates[sprite->data[0]][2] == 127) { sprite->data[0] = 0; sprite->callback = AnimTrickBagStep3; @@ -3267,7 +3273,7 @@ static void AnimTrickBagStep2(struct Sprite* sprite) else { sprite->data[2]++; - sprite->data[1] = (gUnknown_08592700[sprite->data[0]][0] * gUnknown_08592700[sprite->data[0]][2] + sprite->data[1]) & 0xFF; + sprite->data[1] = (gTrickBagCoordinates[sprite->data[0]][0] * gTrickBagCoordinates[sprite->data[0]][2] + sprite->data[1]) & 0xFF; if (!IsContest()) { if ((u16)(sprite->data[1] - 1) < 191) @@ -3290,7 +3296,7 @@ static void AnimTrickBagStep3(struct Sprite* sprite) sprite->data[0]++; } -void sub_80FFFC0(u8 taskId) +void AnimTask_LeafBlade(u8 taskId) { struct Task *task = &gTasks[taskId]; @@ -3302,7 +3308,7 @@ void sub_80FFFC0(u8 taskId) task->data[5] = (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT) ? 1 : -1; task->data[9] = 56 - (task->data[5] * 64); task->data[8] = task->data[7] - task->data[9] + task->data[6]; - task->data[2] = CreateSprite(&gUnknown_08592778, task->data[8], task->data[9], task->data[4]); + task->data[2] = CreateSprite(&gLeafBladeSpriteTemplate, task->data[8], task->data[9], task->data[4]); if (task->data[2] == MAX_SPRITES) DestroyAnimVisualTask(taskId); @@ -3311,12 +3317,12 @@ void sub_80FFFC0(u8 taskId) gSprites[task->data[2]].data[2] = task->data[6] - (task->data[10] / 2 + 10) * task->data[5]; gSprites[task->data[2]].data[3] = task->data[9]; gSprites[task->data[2]].data[4] = task->data[7] + (task->data[11] / 2 + 10) * task->data[5]; - gSprites[task->data[2]].data[5] = sub_8100504(&gSprites[task->data[2]]); + gSprites[task->data[2]].data[5] = LeafBladeGetPosFactor(&gSprites[task->data[2]]); InitAnimArcTranslation(&gSprites[task->data[2]]); - task->func = sub_8100128; + task->func = AnimTask_LeafBladeStep; } -static void sub_8100128(u8 taskId) +static void AnimTask_LeafBladeStep(u8 taskId) { struct Task* task = &gTasks[taskId]; struct Sprite* sprite = &gSprites[task->data[2]]; @@ -3324,7 +3330,7 @@ static void sub_8100128(u8 taskId) switch (a) { case 4: - sub_8100524(task, taskId); + AnimTask_LeafBladeStep2(task, taskId); if (TranslateAnimHorizontalArc(sprite)) { task->data[15] = 5; @@ -3332,7 +3338,7 @@ static void sub_8100128(u8 taskId) } break; case 8: - sub_8100524(task, taskId); + AnimTask_LeafBladeStep2(task, taskId); if (TranslateAnimHorizontalArc(sprite)) { task->data[15] = 9; @@ -3340,7 +3346,7 @@ static void sub_8100128(u8 taskId) } break; case 0: - sub_8100524(task, taskId); + AnimTask_LeafBladeStep2(task, taskId); if (TranslateAnimHorizontalArc(sprite)) { task->data[15] = 1; @@ -3357,7 +3363,7 @@ static void sub_8100128(u8 taskId) sprite->data[2] = task->data[6]; sprite->data[3] = sprite->pos1.y; sprite->data[4] = task->data[7]; - sprite->data[5] = sub_8100504(sprite); + sprite->data[5] = LeafBladeGetPosFactor(sprite); task->data[4] += 2; task->data[3] = a; sprite->subpriority = task->data[4]; @@ -3366,7 +3372,7 @@ static void sub_8100128(u8 taskId) task->data[0]++; break; case 2: - sub_8100524(task, taskId); + AnimTask_LeafBladeStep2(task, taskId); if (TranslateAnimHorizontalArc(sprite)) { task->data[15] = 3; @@ -3383,7 +3389,7 @@ static void sub_8100128(u8 taskId) sprite->data[2] = task->data[6] - ((task->data[10] / 2) + 10) * task->data[5]; sprite->data[3] = sprite->pos1.y; sprite->data[4] = task->data[7] - ((task->data[11] / 2) + 10) * task->data[5]; - sprite->data[5] = sub_8100504(sprite); + sprite->data[5] = LeafBladeGetPosFactor(sprite); task->data[3] = 2; sprite->subpriority = task->data[4]; StartSpriteAnim(sprite, task->data[3]); @@ -3400,7 +3406,7 @@ static void sub_8100128(u8 taskId) sprite->data[2] = task->data[6] + ((task->data[10] / 2) + 10) * task->data[5]; sprite->data[3] = sprite->pos1.y; sprite->data[4] = task->data[7] + ((task->data[11] / 2) + 10) * task->data[5]; - sprite->data[5] = sub_8100504(sprite); + sprite->data[5] = LeafBladeGetPosFactor(sprite); task->data[4] -= 2; task->data[3] = 3; sprite->subpriority = task->data[4]; @@ -3409,7 +3415,7 @@ static void sub_8100128(u8 taskId) task->data[0]++; break; case 6: - sub_8100524(task, taskId); + AnimTask_LeafBladeStep2(task, taskId); if (TranslateAnimHorizontalArc(sprite)) { task->data[15] = 7; @@ -3426,7 +3432,7 @@ static void sub_8100128(u8 taskId) sprite->data[2] = task->data[6]; sprite->data[3] = sprite->pos1.y; sprite->data[4] = task->data[7]; - sprite->data[5] = sub_8100504(sprite); + sprite->data[5] = LeafBladeGetPosFactor(sprite); task->data[4] += 2; task->data[3] = 4; sprite->subpriority = task->data[4]; @@ -3444,7 +3450,7 @@ static void sub_8100128(u8 taskId) sprite->data[2] = task->data[6] - ((task->data[10] / 2) + 10) * task->data[5]; sprite->data[3] = sprite->pos1.y; sprite->data[4] = task->data[7] + ((task->data[11] / 2) + 10) * task->data[5]; - sprite->data[5] = sub_8100504(sprite); + sprite->data[5] = LeafBladeGetPosFactor(sprite); task->data[3] = 5; sprite->subpriority = task->data[4]; StartSpriteAnim(sprite, task->data[3]); @@ -3452,7 +3458,7 @@ static void sub_8100128(u8 taskId) task->data[0]++; break; case 10: - sub_8100524(task, taskId); + AnimTask_LeafBladeStep2(task, taskId); if (TranslateAnimHorizontalArc(sprite)) { task->data[15] = 11; @@ -3470,7 +3476,7 @@ static void sub_8100128(u8 taskId) sprite->data[2] = task->data[8]; sprite->data[3] = sprite->pos1.y; sprite->data[4] = task->data[9]; - sprite->data[5] = sub_8100504(sprite); + sprite->data[5] = LeafBladeGetPosFactor(sprite); task->data[4] -= 2; task->data[3] = 6; sprite->subpriority = task->data[4]; @@ -3480,7 +3486,7 @@ static void sub_8100128(u8 taskId) break; } case 12: - sub_8100524(task, taskId); + AnimTask_LeafBladeStep2(task, taskId); if (TranslateAnimHorizontalArc(sprite)) { DestroySprite(sprite); @@ -3501,7 +3507,7 @@ static void sub_8100128(u8 taskId) } } -static s16 sub_8100504(struct Sprite* sprite) +static s16 LeafBladeGetPosFactor(struct Sprite* sprite) { s16 var = 8; if (sprite->data[4] < sprite->pos1.y) @@ -3510,7 +3516,7 @@ static s16 sub_8100504(struct Sprite* sprite) return var; } -static void sub_8100524(struct Task* task, u8 taskId) +static void AnimTask_LeafBladeStep2(struct Task* task, u8 taskId) { task->data[14]++; if (task->data[14] > 0) @@ -3521,7 +3527,7 @@ static void sub_8100524(struct Task* task, u8 taskId) task->data[14] = 0; spriteX = gSprites[task->data[2]].pos1.x + gSprites[task->data[2]].pos2.x; spriteY = gSprites[task->data[2]].pos1.y + gSprites[task->data[2]].pos2.y; - spriteId = CreateSprite(&gUnknown_08592778, spriteX, spriteY, task->data[4]); + spriteId = CreateSprite(&gLeafBladeSpriteTemplate, spriteX, spriteY, task->data[4]); if (spriteId != MAX_SPRITES) { gSprites[spriteId].data[6] = taskId; @@ -3531,12 +3537,12 @@ static void sub_8100524(struct Task* task, u8 taskId) gTasks[taskId].data[13]++; StartSpriteAnim(&gSprites[spriteId], task->data[3]); gSprites[spriteId].subpriority = task->data[4]; - gSprites[spriteId].callback = sub_80CC408; + gSprites[spriteId].callback = AnimTask_LeafBladeStep2_Callback; } } } -static void sub_80CC408(struct Sprite* sprite) +static void AnimTask_LeafBladeStep2_Callback(struct Sprite* sprite) { sprite->data[0]++; if (sprite->data[0] > 1) @@ -3552,7 +3558,7 @@ static void sub_80CC408(struct Sprite* sprite) } } -void sub_8100640(struct Sprite* sprite) +void AnimFlyingParticle(struct Sprite* sprite) { u8 battler; if (!gBattleAnimArgs[6]) @@ -3597,10 +3603,10 @@ void sub_8100640(struct Sprite* sprite) break; } - sprite->callback = sub_810074C; + sprite->callback = AnimFlyingParticleStep; } -static void sub_810074C(struct Sprite* sprite) +static void AnimFlyingParticleStep(struct Sprite* sprite) { int a = sprite->data[7]; sprite->data[7]++; @@ -3651,7 +3657,7 @@ void sub_81007C4(u8 taskId) DestroyAnimVisualTask(taskId); } -void sub_8100898(struct Sprite* sprite) +void AnimNeedleArmSpike(struct Sprite* sprite) { u8 a; u8 b; @@ -3703,11 +3709,11 @@ void sub_8100898(struct Sprite* sprite) c -= 0x8000; TrySetSpriteRotScale(sprite, 0, 0x100, 0x100, c); - sprite->callback = sub_81009A0; + sprite->callback = AnimNeedleArmSpikeStep; } } -static void sub_81009A0(struct Sprite* sprite) +static void AnimNeedleArmSpikeStep(struct Sprite* sprite) { if (sprite->data[0]) { @@ -3746,7 +3752,7 @@ void sub_81009F8(struct Sprite* sprite) StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); } -void sub_8100A50(struct Sprite* sprite) +void AnimWhipHit(struct Sprite* sprite) { if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) StartSpriteAnim(sprite, 1); @@ -3800,7 +3806,7 @@ void AnimCuttingSlice(struct Sprite* sprite) sprite->data[1] = -sprite->data[1]; } -void sub_8100B88(struct Sprite* sprite) +void AnimAirCutterSlice(struct Sprite* sprite) { u8 a; u8 b; @@ -3937,7 +3943,7 @@ static void sub_8100E80(struct Sprite* sprite) DestroyAnimSprite(sprite); } -void sub_8100EF0(struct Sprite* sprite) +void AnimProtect(struct Sprite* sprite) { if (IsContest()) gBattleAnimArgs[1] += 8; @@ -3954,10 +3960,10 @@ void sub_8100EF0(struct Sprite* sprite) sprite->data[7] = 16; SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16 - sprite->data[7], sprite->data[7])); - sprite->callback = sub_8100FD4; + sprite->callback = AnimProtectStep; } -static void sub_8100FD4(struct Sprite *sprite) +static void AnimProtectStep(struct Sprite *sprite) { int a; int i; @@ -4000,7 +4006,7 @@ static void sub_8100FD4(struct Sprite *sprite) } } -void sub_81010CC(struct Sprite* sprite) +void AnimMilkBottle(struct Sprite* sprite) { sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2); sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + 0xFFE8; @@ -4013,10 +4019,10 @@ void sub_81010CC(struct Sprite* sprite) sprite->data[7] = 16; SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(sprite->data[6], sprite->data[7])); - sprite->callback = sub_8101138; + sprite->callback = AnimMilkBottleStep1; } -static void sub_8101138(struct Sprite* sprite) +static void AnimMilkBottleStep1(struct Sprite* sprite) { switch (sprite->data[0]) { @@ -4049,7 +4055,7 @@ static void sub_8101138(struct Sprite* sprite) } break; case 2: - sub_8101298(sprite, 16, 4); + AnimMilkBottleStep2(sprite, 16, 4); if (++sprite->data[1] > 2) { sprite->data[1] = 0; @@ -4089,7 +4095,7 @@ static void sub_8101138(struct Sprite* sprite) } } -static void sub_8101298(struct Sprite* sprite, int unk1, int unk2) +static void AnimMilkBottleStep2(struct Sprite* sprite, int unk1, int unk2) { if (sprite->data[3] <= 11) sprite->data[4] += 2; @@ -4110,7 +4116,7 @@ static void sub_8101298(struct Sprite* sprite, int unk1, int unk2) sprite->data[3] = 0; } -void sub_810130C(struct Sprite* sprite) +void AnimGrantingStars(struct Sprite* sprite) { if (!gBattleAnimArgs[2]) SetSpriteCoordsToAnimAttackerCoords(sprite); @@ -4124,7 +4130,7 @@ void sub_810130C(struct Sprite* sprite) sprite->callback = TranslateSpriteLinearFixedPoint; } -void sub_810135C(struct Sprite* sprite) +void AnimSparkingStars(struct Sprite* sprite) { u8 battler; if (!gBattleAnimArgs[2]) @@ -4192,7 +4198,7 @@ static void sub_81014A0(struct Sprite* sprite) DestroyAnimSprite(sprite); } -void sub_81014F4(struct Sprite* sprite) +void AnimSleepLetterZ(struct Sprite* sprite) { SetSpriteCoordsToAnimAttackerCoords(sprite); if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) @@ -4209,10 +4215,10 @@ void sub_81014F4(struct Sprite* sprite) StartSpriteAffineAnim(sprite, 1); } - sprite->callback = sub_8101560; + sprite->callback = AnimSleepLetterZStep; } -static void sub_8101560(struct Sprite* sprite) +static void AnimSleepLetterZStep(struct Sprite* sprite) { sprite->pos2.y = -(sprite->data[0] / 0x28); sprite->pos2.x = sprite->data[4] / 10; @@ -4222,23 +4228,23 @@ static void sub_8101560(struct Sprite* sprite) DestroySpriteAndMatrix(sprite); } -void sub_81015AC(struct Sprite* sprite) +void AnimLockOnTarget(struct Sprite* sprite) { sprite->pos1.x -= 32; sprite->pos1.y -= 32; sprite->data[0] = 20; sprite->callback = WaitAnimForDuration; - StoreSpriteCallbackInData6(sprite, sub_81015D4); + StoreSpriteCallbackInData6(sprite, AnimLockOnTargetStep1); } -static void sub_81015D4(struct Sprite* sprite) +static void AnimLockOnTargetStep1(struct Sprite* sprite) { switch (sprite->data[5] & 1) { case 0: sprite->data[0] = 1; sprite->callback = WaitAnimForDuration; - StoreSpriteCallbackInData6(sprite, sub_81015D4); + StoreSpriteCallbackInData6(sprite, AnimLockOnTargetStep1); break; case 1: sprite->pos1.x += sprite->pos2.x; @@ -4246,10 +4252,10 @@ static void sub_81015D4(struct Sprite* sprite) sprite->pos2.y = 0; sprite->pos2.x = 0; sprite->data[0] = 8; - sprite->data[2] = sprite->pos1.x + gUnknown_08592CD0[sprite->data[5] >> 8][0]; - sprite->data[4] = sprite->pos1.y + gUnknown_08592CD0[sprite->data[5] >> 8][1]; + sprite->data[2] = sprite->pos1.x + gInclineMonCoordTable[sprite->data[5] >> 8][0]; + sprite->data[4] = sprite->pos1.y + gInclineMonCoordTable[sprite->data[5] >> 8][1]; sprite->callback = StartAnimLinearTranslation; - StoreSpriteCallbackInData6(sprite, sub_8101684); + StoreSpriteCallbackInData6(sprite, AnimLockOnTargetStep2); sprite->data[5] += 0x100; PlaySE12WithPanning(SE_W199, BattleAnimAdjustPanning(63)); break; @@ -4258,21 +4264,21 @@ static void sub_81015D4(struct Sprite* sprite) sprite->data[5] ^= 1; } -static void sub_8101684(struct Sprite* sprite) +static void AnimLockOnTargetStep2(struct Sprite* sprite) { if ((sprite->data[5] >> 8) == 4) { sprite->data[0] = 10; sprite->callback = WaitAnimForDuration; - StoreSpriteCallbackInData6(sprite, sub_81016B8); + StoreSpriteCallbackInData6(sprite, AnimLockOnTargetStep3); } else { - sprite->callback = sub_81015D4; + sprite->callback = AnimLockOnTargetStep1; } } -static void sub_81016B8(struct Sprite* sprite) +static void AnimLockOnTargetStep3(struct Sprite* sprite) { s16 a; s16 b; @@ -4282,7 +4288,7 @@ static void sub_81016B8(struct Sprite* sprite) sprite->data[1] = 0; sprite->data[2] = 0; sprite->callback = WaitAnimForDuration; - StoreSpriteCallbackInData6(sprite, sub_8101774); + StoreSpriteCallbackInData6(sprite, AnimLockOnTargetStep4); } else { @@ -4314,11 +4320,11 @@ static void sub_81016B8(struct Sprite* sprite) sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + a; sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + b; sprite->callback = StartAnimLinearTranslation; - StoreSpriteCallbackInData6(sprite, sub_8101820); + StoreSpriteCallbackInData6(sprite, AnimLockOnTargetStep5); } } -static void sub_8101774(struct Sprite* sprite) +static void AnimLockOnTargetStep4(struct Sprite* sprite) { if (sprite->data[2] == 0) { @@ -4341,21 +4347,21 @@ static void sub_8101774(struct Sprite* sprite) } else if (sprite->data[1] == 0) { - sprite->callback = sub_8101820; + sprite->callback = AnimLockOnTargetStep5; } } -static void sub_8101820(struct Sprite* sprite) +static void AnimLockOnTargetStep5(struct Sprite* sprite) { if ((u16)gBattleAnimArgs[7] == 0xFFFF) { sprite->data[1] = 0; sprite->data[0] = 0; - sprite->callback = sub_8101848; + sprite->callback = AnimLockOnTargetStep6; } } -static void sub_8101848(struct Sprite* sprite) +static void AnimLockOnTargetStep6(struct Sprite* sprite) { if (sprite->data[0] % 3 == 0) { @@ -4368,7 +4374,7 @@ static void sub_8101848(struct Sprite* sprite) DestroyAnimSprite(sprite); } -void sub_8101898(struct Sprite* sprite) +void AnimLockOnMoveTarget(struct Sprite* sprite) { sprite->oam.affineParam = gBattleAnimArgs[0]; if ((s16)sprite->oam.affineParam == 1) @@ -4396,42 +4402,42 @@ void sub_8101898(struct Sprite* sprite) } sprite->oam.tileNum = (sprite->oam.tileNum + 16); - sprite->callback = sub_81015AC; + sprite->callback = AnimLockOnTarget; sprite->callback(sprite); } -void sub_8101940(struct Sprite* sprite) +void AnimBowMon(struct Sprite* sprite) { sprite->invisible = 1; sprite->data[0] = 0; switch (gBattleAnimArgs[0]) { case 0: - sprite->callback = sub_8101998; + sprite->callback = AnimBowMonStep1; break; case 1: - sprite->callback = sub_8101A74; + sprite->callback = AnimBowMonStep2; break; case 2: - sprite->callback = sub_8101AC4; + sprite->callback = AnimBowMonStep3; break; default: - sprite->callback = sub_8101B84; + sprite->callback = AnimBowMonStep4; break; } } -static void sub_8101998(struct Sprite* sprite) +static void AnimBowMonStep1(struct Sprite* sprite) { sprite->data[0] = 6; sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker)) ? 2 : -2; sprite->data[2] = 0; sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker]; - StoreSpriteCallbackInData6(sprite, sub_81019E8); + StoreSpriteCallbackInData6(sprite, AnimBowMonStep1_Callback); sprite->callback = TranslateMonSpriteLinear; } -static void sub_81019E8(struct Sprite* sprite) +static void AnimBowMonStep1_Callback(struct Sprite* sprite) { if (sprite->data[0] == 0) { @@ -4447,30 +4453,30 @@ static void sub_81019E8(struct Sprite* sprite) if (++sprite->data[0] > 3) { sprite->data[0] = 0; - sprite->callback = sub_8101B84; + sprite->callback = AnimBowMonStep4; } } -static void sub_8101A74(struct Sprite* sprite) +static void AnimBowMonStep2(struct Sprite* sprite) { sprite->data[0] = 4; sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker)) ? -3 : 3; sprite->data[2] = 0; sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker]; - StoreSpriteCallbackInData6(sprite, sub_8101B84); + StoreSpriteCallbackInData6(sprite, AnimBowMonStep4); sprite->callback = TranslateMonSpriteLinear; } -static void sub_8101AC4(struct Sprite* sprite) +static void AnimBowMonStep3(struct Sprite* sprite) { if (++sprite->data[0] > 8) { sprite->data[0] = 0; - sprite->callback = sub_8101AE8; + sprite->callback = AnimBowMonStep3_Callback; } } -static void sub_8101AE8(struct Sprite* sprite) +static void AnimBowMonStep3_Callback(struct Sprite* sprite) { if (sprite->data[0] == 0) { @@ -4494,11 +4500,11 @@ static void sub_8101AE8(struct Sprite* sprite) if (++sprite->data[0] > 2) { ResetSpriteRotScale(sprite->data[3]); - sprite->callback = sub_8101B84; + sprite->callback = AnimBowMonStep4; } } -static void sub_8101B84(struct Sprite* sprite) +static void AnimBowMonStep4(struct Sprite* sprite) { DestroyAnimSprite(sprite); } @@ -4546,7 +4552,7 @@ static void sub_8101BA0(struct Sprite *sprite) } } -void sub_8101C94(u8 taskId) +void AnimTask_SkullBashPosition(u8 taskId) { u8 a; @@ -4567,7 +4573,7 @@ void sub_8101C94(u8 taskId) if (a == 0) gTasks[taskId].data[5] *= -1; - gTasks[taskId].func = sub_8101D2C; + gTasks[taskId].func = AnimTask_SkullBashPositionSet; break; case 1: gTasks[taskId].data[3] = 8; @@ -4579,12 +4585,12 @@ void sub_8101C94(u8 taskId) gTasks[taskId].data[5] = -gTasks[taskId].data[5]; } - gTasks[taskId].func = sub_8101EEC; + gTasks[taskId].func = AnimTask_SkullBashPositionReset; break; } } -static void sub_8101D2C(u8 taskId) +static void AnimTask_SkullBashPositionSet(u8 taskId) { struct Task *task = &gTasks[taskId]; switch (task->data[2]) @@ -4675,7 +4681,7 @@ static void sub_8101D2C(u8 taskId) } } -static void sub_8101EEC(u8 taskId) +static void AnimTask_SkullBashPositionReset(u8 taskId) { struct Task* task = &gTasks[taskId]; if (task->data[3]) @@ -4692,7 +4698,7 @@ static void sub_8101EEC(u8 taskId) } } -void sub_8101F40(struct Sprite* sprite) +void AnimSlashSlice(struct Sprite* sprite) { if (gBattleAnimArgs[0] == 0) { @@ -4707,48 +4713,48 @@ void sub_8101F40(struct Sprite* sprite) sprite->data[0] = 0; sprite->data[1] = 0; - StoreSpriteCallbackInData6(sprite, sub_810208C); + StoreSpriteCallbackInData6(sprite, AnimFalseSwipeSliceStep3); sprite->callback = RunStoredCallbackWhenAnimEnds; } -void sub_8101FA8(struct Sprite* sprite) +void AnimFalseSwipeSlice(struct Sprite* sprite) { sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + 0xFFD0; sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); - StoreSpriteCallbackInData6(sprite, sub_8102044); + StoreSpriteCallbackInData6(sprite, AnimFalseSwipeSliceStep1); sprite->callback = RunStoredCallbackWhenAnimEnds; } -void sub_8101FF0(struct Sprite* sprite) +void AnimFalseSwipePositionedSlice(struct Sprite* sprite) { sprite->pos1.x = sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + 0xFFD0 + gBattleAnimArgs[0]; sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3); StartSpriteAnim(sprite, 1); sprite->data[0] = 0; sprite->data[1] = 0; - sprite->callback = sub_810208C; + sprite->callback = AnimFalseSwipeSliceStep3; } -static void sub_8102044(struct Sprite* sprite) +static void AnimFalseSwipeSliceStep1(struct Sprite* sprite) { if (++sprite->data[0] > 8) { sprite->data[0] = 12; sprite->data[1] = 8; sprite->data[2] = 0; - StoreSpriteCallbackInData6(sprite, sub_810207C); + StoreSpriteCallbackInData6(sprite, AnimFalseSwipeSliceStep2); sprite->callback = TranslateSpriteLinear; } } -static void sub_810207C(struct Sprite* sprite) +static void AnimFalseSwipeSliceStep2(struct Sprite* sprite) { sprite->data[0] = 0; sprite->data[1] = 0; - sprite->callback = sub_810208C; + sprite->callback = AnimFalseSwipeSliceStep3; } -static void sub_810208C(struct Sprite* sprite) +static void AnimFalseSwipeSliceStep3(struct Sprite* sprite) { if (++sprite->data[0] > 1) { @@ -4759,7 +4765,7 @@ static void sub_810208C(struct Sprite* sprite) } } -void sub_81020D8(struct Sprite* sprite) +void AnimEndureEnergy(struct Sprite* sprite) { if (gBattleAnimArgs[0] == 0) { @@ -4774,10 +4780,10 @@ void sub_81020D8(struct Sprite* sprite) sprite->data[0] = 0; sprite->data[1] = gBattleAnimArgs[3]; - sprite->callback = sub_810213C; + sprite->callback = AnimEndureEnergyStep; } -static void sub_810213C(struct Sprite* sprite) +static void AnimEndureEnergyStep(struct Sprite* sprite) { if (++sprite->data[0] > sprite->data[1]) { @@ -4790,7 +4796,7 @@ static void sub_810213C(struct Sprite* sprite) DestroyAnimSprite(sprite); } -void sub_810217C(struct Sprite* sprite) +void AnimSharpenSphere(struct Sprite* sprite) { sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) - 12; @@ -4800,10 +4806,10 @@ void sub_810217C(struct Sprite* sprite) sprite->data[3] = 0; sprite->data[4] = 0; sprite->data[5] = BattleAnimAdjustPanning(-64); - sprite->callback = sub_81021CC; + sprite->callback = AnimSharpenSphereStep; } -static void sub_81021CC(struct Sprite* sprite) +static void AnimSharpenSphereStep(struct Sprite* sprite) { if (++sprite->data[0] >= sprite->data[1]) { @@ -4827,7 +4833,7 @@ static void sub_81021CC(struct Sprite* sprite) DestroyAnimSprite(sprite); } -void sub_8102268(struct Sprite* sprite) +void AnimConversion(struct Sprite* sprite) { if (sprite->data[0] == 0) { @@ -4843,7 +4849,7 @@ void sub_8102268(struct Sprite* sprite) DestroyAnimSprite(sprite); } -void sub_81022D4(u8 taskId) +void AnimTask_ConversionAlphaBlend(u8 taskId) { if (gTasks[taskId].data[2] == 1) { @@ -4867,15 +4873,15 @@ void sub_81022D4(u8 taskId) } } -void sub_810234C(struct Sprite* sprite) +void AnimConversion2(struct Sprite* sprite) { InitSpritePosToAnimTarget(sprite, FALSE); sprite->animPaused = 1; sprite->data[0] = gBattleAnimArgs[2]; - sprite->callback = sub_810237C; + sprite->callback = AnimConversion2Step; } -static void sub_810237C(struct Sprite* sprite) +static void AnimConversion2Step(struct Sprite* sprite) { if (sprite->data[0]) { @@ -4892,7 +4898,7 @@ static void sub_810237C(struct Sprite* sprite) } } -void sub_81023E0(u8 taskId) +void AnimTask_Conversion2AlphaBlend(u8 taskId) { if (++gTasks[taskId].data[0] == 4) { @@ -4928,7 +4934,7 @@ void unref_sub_81024A8(u8 taskId) DestroyAnimVisualTask(taskId); } -void sub_81024E0(struct Sprite* sprite) +void AnimMoon(struct Sprite* sprite) { if (IsContest()) { @@ -4944,16 +4950,16 @@ void sub_81024E0(struct Sprite* sprite) sprite->oam.shape = 0; sprite->oam.size = 3; sprite->data[0] = 0; - sprite->callback = sub_8102528; + sprite->callback = AnimMoonStep; } -static void sub_8102528(struct Sprite* sprite) +static void AnimMoonStep(struct Sprite* sprite) { if (sprite->data[0]) DestroyAnimSprite(sprite); } -void sub_8102540(struct Sprite* sprite) +void AnimMoonlightSparkle(struct Sprite* sprite) { sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0]; sprite->pos1.y = gBattleAnimArgs[1]; @@ -4962,10 +4968,10 @@ void sub_8102540(struct Sprite* sprite) sprite->data[2] = 0; sprite->data[3] = 0; sprite->data[4] = 1; - sprite->callback = sub_8102584; + sprite->callback = AnimMoonlightSparkleStep; } -static void sub_8102584(struct Sprite* sprite) +static void AnimMoonlightSparkleStep(struct Sprite* sprite) { if (++sprite->data[1] > 1) { @@ -4981,10 +4987,10 @@ static void sub_8102584(struct Sprite* sprite) DestroyAnimSprite(sprite); } -void sub_81026A8(u8); +void AnimTask_FadeScreenBlueStep(u8); -void sub_81025C0(u8 taskId) +void AnimTask_FadeScreenBlue(u8 taskId) { int a = sub_80A75AC(1, 0, 0, 0, 0, 0, 0) & 0xFFFF; int b; @@ -5007,11 +5013,11 @@ void sub_81025C0(u8 taskId) b = b | (0x10000 << IndexOfSpritePaletteTag(ANIM_TAG_MOON)); d = IndexOfSpritePaletteTag(ANIM_TAG_GREEN_SPARKLE); BeginNormalPaletteFade((0x10000 << d) | b, 0, 0, 16, RGB(27, 29, 31)); - gTasks[taskId].func = sub_81026A8; + gTasks[taskId].func = AnimTask_FadeScreenBlueStep; gTasks[taskId].func(taskId); } -void sub_81026A8(u8 taskId) +void AnimTask_FadeScreenBlueStep(u8 taskId) { struct Task* task = &gTasks[taskId]; switch (task->data[0]) @@ -5067,7 +5073,7 @@ void sub_81026A8(u8 taskId) u8 spriteId; for (spriteId = 0; spriteId < MAX_SPRITES; spriteId++) { - if (gSprites[spriteId].template == &gUnknown_08592EBC || gSprites[spriteId].template == &gBattleAnimSpriteTemplate_8592EEC) + if (gSprites[spriteId].template == &gMoonSpriteTemplate || gSprites[spriteId].template == &gMoonlightSparkleSpriteTemplate) gSprites[spriteId].data[0] = 1; } @@ -5089,7 +5095,7 @@ void sub_81026A8(u8 taskId) } } -void sub_8102844(struct Sprite* sprite) +void AnimHornHit(struct Sprite* sprite) { if (gBattleAnimArgs[2] < 2) gBattleAnimArgs[2] = 2; @@ -5133,10 +5139,10 @@ void sub_8102844(struct Sprite* sprite) sprite->oam.matrixNum = (ST_OAM_HFLIP | ST_OAM_VFLIP); } - sprite->callback = sub_810296C; + sprite->callback = AnimHornHitStep; } -static void sub_810296C(struct Sprite* sprite) +static void AnimHornHitStep(struct Sprite* sprite) { sprite->data[2] += sprite->data[3]; sprite->data[4] += sprite->data[5]; @@ -5152,7 +5158,7 @@ static void sub_810296C(struct Sprite* sprite) DestroyAnimSprite(sprite); } -void sub_81029B4(u8 taskId) +void AnimTask_DoubleTeam(u8 taskId) { u16 i; int obj; @@ -5175,19 +5181,19 @@ void sub_81029B4(u8 taskId) gSprites[obj].data[0] = 0; gSprites[obj].data[1] = i << 7; gSprites[obj].data[2] = taskId; - gSprites[obj].callback = sub_8102B3C; + gSprites[obj].callback = AnimTask_DoubleTeamCallback; task->data[3]++; i++; } - task->func = sub_8102AE0; + task->func = AnimTask_DoubleTeamStep; if (GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) == 1) ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG1_ON); else ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON); } -static void sub_8102AE0(u8 taskId) +static void AnimTask_DoubleTeamStep(u8 taskId) { struct Task* task = &gTasks[taskId]; if (!task->data[3]) @@ -5202,7 +5208,7 @@ static void sub_8102AE0(u8 taskId) } } -static void sub_8102B3C(struct Sprite* sprite) +static void AnimTask_DoubleTeamCallback(struct Sprite* sprite) { if (++sprite->data[3] > 1) { @@ -5224,57 +5230,57 @@ static void sub_8102B3C(struct Sprite* sprite) } } -void sub_8102BCC(struct Sprite* sprite) +void AnimSuperFang(struct Sprite* sprite) { StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); sprite->callback = RunStoredCallbackWhenAnimEnds; } -void sub_8102BE8(u8 taskId) +void AnimTask_MusicNotesRainbowBlend(u8 taskId) { u16 i; u16 j; u16 index; - index = IndexOfSpritePaletteTag(gUnknown_08593020[0][0]); + index = IndexOfSpritePaletteTag(gParticlesColorBlendTable[0][0]); if (index != 0xFF) { index = (index << 4) + 0x100; - for (i = 1; i < ARRAY_COUNT(gUnknown_08593020[0]); i++) - gPlttBufferFaded[index + i] = gUnknown_08593020[0][i]; + for (i = 1; i < ARRAY_COUNT(gParticlesColorBlendTable[0]); i++) + gPlttBufferFaded[index + i] = gParticlesColorBlendTable[0][i]; } - for (j = 1; j < ARRAY_COUNT(gUnknown_08593020); j++) + for (j = 1; j < ARRAY_COUNT(gParticlesColorBlendTable); j++) { - index = AllocSpritePalette(gUnknown_08593020[j][0]); + index = AllocSpritePalette(gParticlesColorBlendTable[j][0]); if (index != 0xFF) { index = (index << 4) + 0x100; - for (i = 1; i < ARRAY_COUNT(gUnknown_08593020[0]); i++) - gPlttBufferFaded[index + i] = gUnknown_08593020[j][i]; + for (i = 1; i < ARRAY_COUNT(gParticlesColorBlendTable[0]); i++) + gPlttBufferFaded[index + i] = gParticlesColorBlendTable[j][i]; } } DestroyAnimVisualTask(taskId); } // clears the rainbow effect for musical notes. -void sub_8102CA0(u8 taskId) +void AnimTask_MusicNotesClearRainbowBlend(u8 taskId) { u16 i; - for (i = 1; i < ARRAY_COUNT(gUnknown_08593020); i++) - FreeSpritePaletteByTag(gUnknown_08593020[i][0]); + for (i = 1; i < ARRAY_COUNT(gParticlesColorBlendTable); i++) + FreeSpritePaletteByTag(gParticlesColorBlendTable[i][0]); DestroyAnimVisualTask(taskId); } -void sub_8102CD4(struct Sprite* sprite) +void AnimWavyMusicNotes(struct Sprite* sprite) { u8 index; u8 a; u8 b; SetSpriteCoordsToAnimAttackerCoords(sprite); StartSpriteAnim(sprite, gBattleAnimArgs[0]); - if ((index = IndexOfSpritePaletteTag(gUnknown_08593020[gBattleAnimArgs[1]][0])) != 0xFF) + if ((index = IndexOfSpritePaletteTag(gParticlesColorBlendTable[gBattleAnimArgs[1]][0])) != 0xFF) sprite->oam.paletteNum = index; sprite->data[1] = gBattleAnimArgs[1]; @@ -5293,11 +5299,11 @@ void sub_8102CD4(struct Sprite* sprite) sprite->data[4] = sprite->pos1.x << 4; sprite->data[5] = sprite->pos1.y << 4; - sub_8102D8C(a - sprite->pos1.x, b - sprite->pos1.y, &sprite->data[6], &sprite->data[7], 40); - sprite->callback = sub_8102DE4; + AnimWavyMusicNotesGetNextPos(a - sprite->pos1.x, b - sprite->pos1.y, &sprite->data[6], &sprite->data[7], 40); + sprite->callback = AnimWavyMusicNotesStep; } -static void sub_8102D8C(s16 a, s16 b, s16* c, s16* d, s8 e) +static void AnimWavyMusicNotesGetNextPos(s16 a, s16 b, s16* c, s16* d, s8 e) { int f; int g; @@ -5313,7 +5319,7 @@ static void sub_8102D8C(s16 a, s16 b, s16* c, s16* d, s8 e) *d = (b << 8) / g; } -static void sub_8102DE4(struct Sprite* sprite) +static void AnimWavyMusicNotesStep(struct Sprite* sprite) { s16 y, yDelta; u8 index; @@ -5339,14 +5345,14 @@ static void sub_8102DE4(struct Sprite* sprite) if (++sprite->data[1] > 3) sprite->data[1] = 0; - index = IndexOfSpritePaletteTag(gUnknown_08593020[sprite->data[1]][0]); + index = IndexOfSpritePaletteTag(gParticlesColorBlendTable[sprite->data[1]][0]); if (index != 0xFF) sprite->oam.paletteNum = index; } } } -void sub_8102EB0(struct Sprite* sprite) +void AnimFlyingMusicNotes(struct Sprite* sprite) { if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) gBattleAnimArgs[1] *= -1; @@ -5360,10 +5366,10 @@ void sub_8102EB0(struct Sprite* sprite) sprite->data[5] = sprite->pos1.y << 4; sprite->data[6] = (gBattleAnimArgs[1] << 4) / 5; sprite->data[7] = (gBattleAnimArgs[2] << 7) / 5; - sprite->callback = sub_8102F40; + sprite->callback = AnimFlyingMusicNotesStep; } -static void sub_8102F40(struct Sprite* sprite) +static void AnimFlyingMusicNotesStep(struct Sprite* sprite) { sprite->data[4] += sprite->data[6]; sprite->data[5] += sprite->data[7]; @@ -5382,7 +5388,7 @@ static void sub_8102F40(struct Sprite* sprite) DestroySpriteAndMatrix(sprite); } -void sub_8102FB8(struct Sprite* sprite) +void AnimBellyDrumHand(struct Sprite* sprite) { s16 a; if (gBattleAnimArgs[0] == 1) @@ -5402,14 +5408,14 @@ void sub_8102FB8(struct Sprite* sprite) StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); } -void sub_8103028(struct Sprite* sprite) +void AnimSlowFlyingMusicNotes(struct Sprite* sprite) { s16 xDiff; u8 index; SetSpriteCoordsToAnimAttackerCoords(sprite); sprite->pos1.y += 8; StartSpriteAnim(sprite, gBattleAnimArgs[1]); - index = IndexOfSpritePaletteTag(gUnknown_08593020[gBattleAnimArgs[2]][0]); + index = IndexOfSpritePaletteTag(gParticlesColorBlendTable[gBattleAnimArgs[2]][0]); if (index != 0xFF) sprite->oam.paletteNum = index; @@ -5421,10 +5427,10 @@ void sub_8103028(struct Sprite* sprite) sprite->data[4] = sprite->data[3] - 40; InitAnimLinearTranslation(sprite); sprite->data[5] = gBattleAnimArgs[3]; - sprite->callback = sub_81030B0; + sprite->callback = AnimSlowFlyingMusicNotesStep; } -static void sub_81030B0(struct Sprite* sprite) +static void AnimSlowFlyingMusicNotesStep(struct Sprite* sprite) { if (AnimTranslateLinear(sprite) == 0) { @@ -5443,7 +5449,7 @@ static void sub_81030B0(struct Sprite* sprite) } } -void sub_810310C(u8 battler, struct Sprite* sprite) +void SetSpriteNextToMonHead(u8 battler, struct Sprite* sprite) { if (GetBattlerSide(battler) == B_SIDE_PLAYER) sprite->pos1.x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_RIGHT) + 8; @@ -5453,7 +5459,7 @@ void sub_810310C(u8 battler, struct Sprite* sprite) sprite->pos1.y = GetBattlerSpriteCoord(battler, 3) - (s16)GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_HEIGHT) / 4; } -void sub_8103164(struct Sprite* sprite) +void AnimThoughtBubble(struct Sprite* sprite) { u8 a; u8 battler; @@ -5462,16 +5468,16 @@ void sub_8103164(struct Sprite* sprite) else battler = gBattleAnimTarget; - sub_810310C(battler, sprite); + SetSpriteNextToMonHead(battler, sprite); a = (GetBattlerSide(battler) == B_SIDE_PLAYER) ? 0 : 1; sprite->data[0] = gBattleAnimArgs[1]; sprite->data[1] = a + 2; StartSpriteAnim(sprite, a); - StoreSpriteCallbackInData6(sprite, sub_81031D0); + StoreSpriteCallbackInData6(sprite, AnimThoughtBubbleStep); sprite->callback = RunStoredCallbackWhenAnimEnds; } -static void sub_81031D0(struct Sprite* sprite) +static void AnimThoughtBubbleStep(struct Sprite* sprite) { if (--sprite->data[0] == 0) { @@ -5481,7 +5487,7 @@ static void sub_81031D0(struct Sprite* sprite) } } -void sub_8103208(struct Sprite* sprite) +void AnimMetronomeFinger(struct Sprite* sprite) { u8 battler; if (gBattleAnimArgs[0] == 0) @@ -5489,13 +5495,13 @@ void sub_8103208(struct Sprite* sprite) else battler = gBattleAnimTarget; - sub_810310C(battler, sprite); + SetSpriteNextToMonHead(battler, sprite); sprite->data[0] = 0; - StoreSpriteCallbackInData6(sprite, sub_8103250); + StoreSpriteCallbackInData6(sprite, AnimMetronomeFingerStep); sprite->callback = RunStoredCallbackWhenAffineAnimEnds; } -static void sub_8103250(struct Sprite* sprite) +static void AnimMetronomeFingerStep(struct Sprite* sprite) { if (++sprite->data[0] > 16) { @@ -5505,7 +5511,7 @@ static void sub_8103250(struct Sprite* sprite) } } -void sub_8103284(struct Sprite* sprite) +void AnimFollowMeFinger(struct Sprite* sprite) { u8 battler; if (gBattleAnimArgs[0] == 0) @@ -5523,17 +5529,17 @@ void sub_8103284(struct Sprite* sprite) sprite->data[2] = sprite->subpriority; sprite->data[3] = sprite->subpriority + 4; sprite->data[4] = 0; - StoreSpriteCallbackInData6(sprite, sub_8103300); + StoreSpriteCallbackInData6(sprite, AnimFollowMeFingerStep1); sprite->callback = RunStoredCallbackWhenAffineAnimEnds; } -static void sub_8103300(struct Sprite* sprite) +static void AnimFollowMeFingerStep1(struct Sprite* sprite) { if (++sprite->data[4] > 12) - sprite->callback = sub_8103320; + sprite->callback = AnimFollowMeFingerStep2; } -static void sub_8103320(struct Sprite* sprite) +static void AnimFollowMeFingerStep2(struct Sprite* sprite) { s16 x1, x2; @@ -5543,7 +5549,7 @@ static void sub_8103320(struct Sprite* sprite) if (--sprite->data[0] == 0) { sprite->pos2.x = 0; - sprite->callback = sub_8103250; + sprite->callback = AnimMetronomeFingerStep; return; } else @@ -5563,7 +5569,7 @@ static void sub_8103320(struct Sprite* sprite) sprite->pos2.x = (x1 >> 3) + (x2 >> 1); } -void sub_8103390(struct Sprite* sprite) +void AnimTauntFinger(struct Sprite* sprite) { u8 battler; if (gBattleAnimArgs[0] == 0) @@ -5571,7 +5577,7 @@ void sub_8103390(struct Sprite* sprite) else battler = gBattleAnimTarget; - sub_810310C(battler, sprite); + SetSpriteNextToMonHead(battler, sprite); if (GetBattlerSide(battler) == B_SIDE_PLAYER) { StartSpriteAnim(sprite, 0); @@ -5583,21 +5589,21 @@ void sub_8103390(struct Sprite* sprite) sprite->data[0] = 3; } - sprite->callback = sub_81033F0; + sprite->callback = AnimTauntFingerStep1; } -static void sub_81033F0(struct Sprite* sprite) +static void AnimTauntFingerStep1(struct Sprite* sprite) { if (++sprite->data[1] > 10) { sprite->data[1] = 0; StartSpriteAnim(sprite, sprite->data[0]); - StoreSpriteCallbackInData6(sprite, sub_810342C); + StoreSpriteCallbackInData6(sprite, AnimTauntFingerStep2); sprite->callback = RunStoredCallbackWhenAnimEnds; } } -static void sub_810342C(struct Sprite* sprite) +static void AnimTauntFingerStep2(struct Sprite* sprite) { if (++sprite->data[1] > 5) DestroyAnimSprite(sprite); diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index 8b877bba4..273dedc38 100755 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -23,88 +23,89 @@ void sub_8103620(struct Sprite *); void Anim_KinesisZapEnergy(struct Sprite *); void Anim_SwordsDanceBlade(struct Sprite *); void AnimSonicBoomProjectile(struct Sprite *); -void sub_8103AA4(struct Sprite *); +void AnimAirWaveProjectile(struct Sprite *); void sub_8103FE8(struct Sprite *); -void sub_8104088(struct Sprite *); -void sub_810413C(struct Sprite *); -void sub_81041C4(struct Sprite *); -void Anim_RazorWindTornado(struct Sprite *); -void Anim_ViceGripPincer(struct Sprite *); -void Anim_GuillotinePincer(struct Sprite *); -void Anim_BreathPuff(struct Sprite *); -void Anim_AngerMark(struct Sprite *); -void sub_810501C(struct Sprite *); -void sub_81051C4(struct Sprite *); -void sub_81052A4(struct Sprite *); -void sub_81054E8(struct Sprite *); -void sub_8105538(struct Sprite *); -void sub_8105C48(struct Sprite *); -void sub_8105DE8(struct Sprite *); -void sub_8105E60(struct Sprite *); -void sub_8106140(struct Sprite *); -void sub_81061C4(struct Sprite *); -void sub_810624C(struct Sprite *); +void AnimCoinThrow(struct Sprite *); +void AnimFallingCoin(struct Sprite *); +void AnimBulletSeed(struct Sprite *); +void AnimRazorWindTornado(struct Sprite *); +void AnimViceGripPincer(struct Sprite *); +void AnimGuillotinePincer(struct Sprite *); +void AnimBreathPuff(struct Sprite *); +void AnimAngerMark(struct Sprite *); +void AnimPencil(struct Sprite *); +void AnimBlendThinRing(struct Sprite *); +void AnimHyperVoiceRing(struct Sprite *); +void AnimUproarRing(struct Sprite *); +void AnimSoftBoiledEgg(struct Sprite *); +void AnimSpeedDust(struct Sprite *); +void AnimHealBellMusicNote(struct Sprite *); +void AnimMagentaHeart(struct Sprite *); +void AnimRedHeartProjectile(struct Sprite *); +void AnimParticuleBurst(struct Sprite *); +void AnimRedHeartRising(struct Sprite *); void AnimOrbitFast(struct Sprite *); void AnimOrbitScatter(struct Sprite *); -void sub_8106944(struct Sprite *); -void sub_81069B8(struct Sprite *); -void sub_81069D0(struct Sprite *); -void sub_8106AD0(struct Sprite *); -void sub_8106B54(struct Sprite *); -void sub_8106C80(struct Sprite *); -void sub_8106CD0(struct Sprite *); -void sub_8106E00(struct Sprite *); -void sub_8106F00(struct Sprite *); -void sub_8106F60(struct Sprite *); -void sub_81070AC(struct Sprite *); +void AnimSpitUpOrb(struct Sprite *); +void AnimEyeSparkle(struct Sprite *); +void AnimAngel(struct Sprite *); +void AnimPinkHeart(struct Sprite *); +void AnimDevil(struct Sprite *); +void AnimFurySwipes(struct Sprite *); +void AnimMovmentWaves(struct Sprite *); +void AnimJaggedMusicNote(struct Sprite *); +void AnimPerishSongMusicNote2(struct Sprite *); +void AnimPerishSongMusicNote(struct Sprite *); +void AnimGuardRing(struct Sprite *); static void sub_81034D8(struct Sprite *); static void sub_8103658(struct Sprite *); static void sub_8103680(struct Sprite *); static void AnimTask_WithdrawStep(u8); -static void Anim_SwordsDanceBladeStep(struct Sprite *); +static void AnimSwordsDanceBladeStep(struct Sprite *); static void sub_8104018(struct Sprite *); -static void sub_8104154(struct Sprite *); -static void sub_810421C(struct Sprite *); -static void sub_81042A0(struct Sprite *); -static void Anim_ViceGripPincerStep(struct Sprite *); -static void Anim_GuillotinePincerStep1(struct Sprite *); -static void Anim_GuillotinePincerStep2(struct Sprite *); -static void Anim_GuillotinePincerStep3(struct Sprite *); +static void AnimFallingCoin_Step(struct Sprite *); +static void AnimBulletSeed_Step1(struct Sprite *); +static void AnimBulletSeed_Step2(struct Sprite *); +static void AnimViceGripPincerStep(struct Sprite *); +static void AnimGuillotinePincerStep1(struct Sprite *); +static void AnimGuillotinePincerStep2(struct Sprite *); +static void AnimGuillotinePincerStep3(struct Sprite *); static void AnimTask_GrowAndGreyscaleStep(u8); static void AnimTask_MinimizeStep1(u8); static void CreateMinimizeSprite(struct Task *, u8); static void ClonedMinizeSprite_Step(struct Sprite *); static void AnimTask_SplashStep(u8); static void AnimTask_GrowAndShrinkStep(u8); -static void sub_8104C78(u8); -static void sub_8104D28(u8); -static void sub_8104F54(u8); -static void sub_8105078(struct Sprite *); -static void sub_810557C(struct Sprite *); -static void sub_81055F4(struct Sprite *); -static void sub_810561C(struct Sprite *); -static void sub_8105694(struct Sprite *); -static void sub_81056D4(struct Sprite *); -static void sub_810571C(struct Sprite *); -static void sub_810575C(struct Sprite *); -static void sub_81057B8(u8); -static void sub_8105878(u8); -static void sub_81059E0(u8); -static void sub_8105B08(u8); -static void sub_8105F30(u8); -static void sub_8105F84(u8); -static void sub_810618C(struct Sprite *); -static void sub_810627C(struct Sprite *); -static void sub_81063A8(u8); -static void sub_81065EC(u8); +static void ThrashMoveMonStep(u8); +static void ThrashMoveMon(u8); +static void AnimTask_SketchDrawMon(u8); +static void AnimPencil_Step(struct Sprite *); +static void AnimSoftBoiledEgg_Step1(struct Sprite *); +static void AnimSoftBoiledEgg_Step2(struct Sprite *); +static void AnimSoftBoiledEgg_Step3(struct Sprite *); +static void AnimSoftBoiledEgg_Step3_Callback1(struct Sprite *); +static void AnimSoftBoiledEgg_Step3_Callback2(struct Sprite *); +static void AnimSoftBoiledEgg_Step4(struct Sprite *); +static void AnimSoftBoiledEgg_Step4_Callback(struct Sprite *); +static void StretchAttacker_Step(u8); +static void ExtremeSpeedImpact_Step(u8); +static void ExtremeSpeedMonReappear_Step(u8); +static void SpeedDust_Step1(u8); +static void FakeOutStep1(u8); +static void FakeOutStep2(u8); +static void AnimRedHeartProjectile_Step(struct Sprite *); +static void AnimRedHeartRising_Step(struct Sprite *); +static void HeartsBackground_Step(u8); +static void ScaryFace_Step(u8); static void AnimOrbitFastStep(struct Sprite *); static void AnimOrbitScatterStep(struct Sprite *); -static void sub_8106D5C(struct Sprite *); -static void sub_8106DD4(u8); -static void sub_8106EC8(struct Sprite *); -static void sub_8107018(struct Sprite *); -static void sub_810703C(struct Sprite *); +static void AnimMovmentWaves_Step(struct Sprite *); +static void UproarDistortion_Step(u8); +static void AnimJaggedMusicNote_Step(struct Sprite *); +static void AnimPerishSongMusicNote_Step1(struct Sprite *); +static void AnimPerishSongMusicNote_Step2(struct Sprite *); +// Unused const struct SpriteTemplate gUnknown_08593264 = { .tileTag = ANIM_TAG_FINGER, @@ -127,6 +128,7 @@ const union AnimCmd *const gUnknown_08593284[] = gUnknown_0859327C, }; +// Unused const struct SpriteTemplate gUnknown_08593288 = { .tileTag = ANIM_TAG_MUSIC_NOTES, @@ -138,6 +140,7 @@ const struct SpriteTemplate gUnknown_08593288 = .callback = sub_8103498, }; +// Unused const struct SpriteTemplate gUnknown_085932A0 = { .tileTag = 0, @@ -150,6 +153,7 @@ const struct SpriteTemplate gUnknown_085932A0 = }; extern const union AffineAnimCmd *const gUnknown_08597060[]; +// Unused const struct SpriteTemplate gUnknown_085932B8 = { .tileTag = ANIM_TAG_CLAMP, @@ -187,6 +191,7 @@ const union AffineAnimCmd *const gUnknown_08593300[] = gUnknown_085932E8, }; +// Unused const struct SpriteTemplate gUnknown_08593304 = { .tileTag = ANIM_TAG_EXPLOSION_6, @@ -195,10 +200,10 @@ const struct SpriteTemplate gUnknown_08593304 = .anims = gUnknown_085932E4, .images = NULL, .affineAnims = gUnknown_08593300, - .callback = sub_80A77C8, + .callback = AnimSpriteOnMonPos, }; -const union AnimCmd gUnknown_0859331C[] = +const union AnimCmd gKinesisZapEnergyAnimCmds[] = { ANIMCMD_FRAME(0, 3, .hFlip = TRUE), ANIMCMD_FRAME(8, 3, .hFlip = TRUE), @@ -211,9 +216,9 @@ const union AnimCmd gUnknown_0859331C[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08593340[] = +const union AnimCmd *const gKinesisZapEnergyAnimTable[] = { - gUnknown_0859331C, + gKinesisZapEnergyAnimCmds, }; const struct SpriteTemplate gKinesisZapEnergySpriteTemplate = @@ -221,13 +226,13 @@ const struct SpriteTemplate gKinesisZapEnergySpriteTemplate = .tileTag = ANIM_TAG_ALERT, .paletteTag = ANIM_TAG_ALERT, .oam = &gOamData_AffineOff_ObjNormal_32x16, - .anims = gUnknown_08593340, + .anims = gKinesisZapEnergyAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = Anim_KinesisZapEnergy, }; -const union AffineAnimCmd gUnknown_0859335C[] = +const union AffineAnimCmd gSwordsDanceBladeAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(0x10, 0x100, 0, 0), AFFINEANIMCMD_FRAME(0x14, 0x0, 0, 12), @@ -235,9 +240,9 @@ const union AffineAnimCmd gUnknown_0859335C[] = AFFINEANIMCMD_END, }; -const union AffineAnimCmd *const gUnknown_0859337C[] = +const union AffineAnimCmd *const gSwordsDanceBladeAffineAnimTable[] = { - gUnknown_0859335C, + gSwordsDanceBladeAffineAnimCmds, }; const struct SpriteTemplate gSwordsDanceBladeSpriteTemplate = @@ -247,7 +252,7 @@ const struct SpriteTemplate gSwordsDanceBladeSpriteTemplate = .oam = &gOamData_AffineNormal_ObjBlend_32x64, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_0859337C, + .affineAnims = gSwordsDanceBladeAffineAnimTable, .callback = Anim_SwordsDanceBlade, }; @@ -262,7 +267,7 @@ const struct SpriteTemplate gSonicBoomSpriteTemplate = .callback = AnimSonicBoomProjectile, }; -const struct SpriteTemplate gUnknown_085933B0 = +const struct SpriteTemplate gAirWaveProjectileSpriteTemplate = { .tileTag = ANIM_TAG_AIR_WAVE, .paletteTag = ANIM_TAG_AIR_WAVE, @@ -270,17 +275,17 @@ const struct SpriteTemplate gUnknown_085933B0 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8103AA4, + .callback = AnimAirWaveProjectile, }; -const union AffineAnimCmd gUnknown_085933C8[] = +const union AffineAnimCmd gGrowingRingAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(0x20, 0x20, 0, 0), AFFINEANIMCMD_FRAME(0x7, 0x7, 0, -56), AFFINEANIMCMD_END, }; -const union AffineAnimCmd gUnknown_085933E0[] = +const union AffineAnimCmd gWaterPulseRingAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(0x5, 0x5, 0, 10), AFFINEANIMCMD_FRAME(0xFFF6, 0xFFF6, 0, 10), @@ -292,14 +297,14 @@ const union AffineAnimCmd gUnknown_085933E0[] = AFFINEANIMCMD_END, }; -const union AffineAnimCmd *const gUnknown_08593420[] = +const union AffineAnimCmd *const gGrowingRingAffineAnimTable[] = { - gUnknown_085933C8, + gGrowingRingAffineAnimCmds, }; -const union AffineAnimCmd *const gUnknown_08593424[] = +const union AffineAnimCmd *const gWaterPulseRingAffineAnimTable[] = { - gUnknown_085933E0, + gWaterPulseRingAffineAnimCmds, }; const struct SpriteTemplate gSupersonicWaveSpriteTemplate = @@ -309,7 +314,7 @@ const struct SpriteTemplate gSupersonicWaveSpriteTemplate = .oam = &gOamData_AffineDouble_ObjNormal_16x32, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_08593420, + .affineAnims = gGrowingRingAffineAnimTable, .callback = TranslateAnimSpriteToTargetMonLocation, }; @@ -320,33 +325,33 @@ const struct SpriteTemplate gScreechWaveSpriteTemplate = .oam = &gOamData_AffineDouble_ObjNormal_16x32, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_08593420, + .affineAnims = gGrowingRingAffineAnimTable, .callback = TranslateAnimSpriteToTargetMonLocation, }; -const struct SpriteTemplate gUnknown_08593458 = +const struct SpriteTemplate gMetalSoundSpriteTemplate = { .tileTag = ANIM_TAG_METAL_SOUND_WAVES, .paletteTag = ANIM_TAG_METAL_SOUND_WAVES, .oam = &gOamData_AffineDouble_ObjNormal_32x64, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_08593420, + .affineAnims = gGrowingRingAffineAnimTable, .callback = TranslateAnimSpriteToTargetMonLocation, }; -const struct SpriteTemplate gUnknown_08593470 = +const struct SpriteTemplate gWaterPulseRingSpriteTemplate = { .tileTag = ANIM_TAG_BLUE_RING_2, .paletteTag = ANIM_TAG_BLUE_RING_2, .oam = &gOamData_AffineDouble_ObjNormal_16x32, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_08593424, - .callback = sub_8108C94, + .affineAnims = gWaterPulseRingAffineAnimTable, + .callback = AnimWaterPulseRing, }; -const struct SpriteTemplate gUnknown_08593488 = +const struct SpriteTemplate gEggThrowSpriteTemplate = { .tileTag = ANIM_TAG_LARGE_FRESH_EGG, .paletteTag = ANIM_TAG_LARGE_FRESH_EGG, @@ -354,9 +359,10 @@ const struct SpriteTemplate gUnknown_08593488 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A78AC, + .callback = AnimThrowProjectile, }; +// Unused const struct SpriteTemplate gUnknown_085934A0 = { .tileTag = ANIM_TAG_VOID_LINES, @@ -368,82 +374,82 @@ const struct SpriteTemplate gUnknown_085934A0 = .callback = sub_8103FE8, }; -const union AnimCmd gUnknown_085934B8[] = +const union AnimCmd gCoinAnimCmds[] = { ANIMCMD_FRAME(8, 1), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_085934C0[] = +const union AnimCmd *const gCoinAnimTable[] = { - gUnknown_085934B8, + gCoinAnimCmds, }; -const union AffineAnimCmd gUnknown_085934C4[] = +const union AffineAnimCmd gFallingCoinAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(0x0, 0x0, 10, 1), AFFINEANIMCMD_JUMP(0), }; -const union AffineAnimCmd *const gUnknown_085934D4[] = +const union AffineAnimCmd *const gFallingCoinAffineAnimTable[] = { - gUnknown_085934C4, + gFallingCoinAffineAnimCmds, }; -const struct SpriteTemplate gUnknown_085934D8 = +const struct SpriteTemplate gCoinThrowSpriteTemplate = { .tileTag = ANIM_TAG_COIN, .paletteTag = ANIM_TAG_COIN, .oam = &gOamData_AffineNormal_ObjNormal_16x16, - .anims = gUnknown_085934C0, + .anims = gCoinAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8104088, + .callback = AnimCoinThrow, }; -const struct SpriteTemplate gUnknown_085934F0 = +const struct SpriteTemplate gFallingCoinSpriteTemplate = { .tileTag = ANIM_TAG_COIN, .paletteTag = ANIM_TAG_COIN, .oam = &gOamData_AffineNormal_ObjNormal_16x16, - .anims = gUnknown_085934C0, + .anims = gCoinAnimTable, .images = NULL, - .affineAnims = gUnknown_085934D4, - .callback = sub_810413C, + .affineAnims = gFallingCoinAffineAnimTable, + .callback = AnimFallingCoin, }; -const union AffineAnimCmd gUnknown_08593508[] = +const union AffineAnimCmd gBulletSeedAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(0x0, 0x0, 20, 1), AFFINEANIMCMD_JUMP(0), }; -const union AffineAnimCmd *const gUnknown_08593518[] = +const union AffineAnimCmd *const gBulletSeedAffineAnimTable[] = { - gUnknown_08593508, + gBulletSeedAffineAnimCmds, }; -const struct SpriteTemplate gUnknown_0859351C = +const struct SpriteTemplate gBulletSeedSpriteTemplate = { .tileTag = ANIM_TAG_SEED, .paletteTag = ANIM_TAG_SEED, .oam = &gOamData_AffineNormal_ObjNormal_16x16, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_08593518, - .callback = sub_81041C4, + .affineAnims = gBulletSeedAffineAnimTable, + .callback = AnimBulletSeed, }; -const union AffineAnimCmd gUnknown_08593534[] = +const union AffineAnimCmd gRazorWindTornadoAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(0x10, 0x100, 0, 0), AFFINEANIMCMD_FRAME(0x4, 0x0, 0, 40), AFFINEANIMCMD_END, }; -const union AffineAnimCmd *const gUnknown_0859354C[] = +const union AffineAnimCmd *const gRazorWindTornadoAffineAnimTable[] = { - gUnknown_08593534, + gRazorWindTornadoAffineAnimCmds, }; const struct SpriteTemplate gRazorWindTornadoSpriteTemplate = @@ -453,11 +459,11 @@ const struct SpriteTemplate gRazorWindTornadoSpriteTemplate = .oam = &gOamData_AffineNormal_ObjNormal_32x64, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_0859354C, - .callback = Anim_RazorWindTornado, + .affineAnims = gRazorWindTornadoAffineAnimTable, + .callback = AnimRazorWindTornado, }; -const union AnimCmd gUnknown_08593568[] = +const union AnimCmd gViceGripAnimCmds1[] = { ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(16, 3), @@ -465,7 +471,7 @@ const union AnimCmd gUnknown_08593568[] = ANIMCMD_END, }; -const union AnimCmd gUnknown_08593578[] = +const union AnimCmd gViceGripAnimCmds2[] = { ANIMCMD_FRAME(0, 3, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_FRAME(16, 3, .vFlip = TRUE, .hFlip = TRUE), @@ -473,10 +479,10 @@ const union AnimCmd gUnknown_08593578[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08593588[] = +const union AnimCmd *const gViceGripAnimTable[] = { - gUnknown_08593568, - gUnknown_08593578, + gViceGripAnimCmds1, + gViceGripAnimCmds2, }; const struct SpriteTemplate gViceGripSpriteTemplate = @@ -484,13 +490,13 @@ const struct SpriteTemplate gViceGripSpriteTemplate = .tileTag = ANIM_TAG_CUT, .paletteTag = ANIM_TAG_CUT, .oam = &gOamData_AffineOff_ObjBlend_32x32, - .anims = gUnknown_08593588, + .anims = gViceGripAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = Anim_ViceGripPincer, + .callback = AnimViceGripPincer, }; -const union AnimCmd gUnknown_085935A8[] = +const union AnimCmd gGuillotineAnimCmds1[] = { ANIMCMD_FRAME(0, 2), ANIMCMD_FRAME(16, 2), @@ -498,7 +504,7 @@ const union AnimCmd gUnknown_085935A8[] = ANIMCMD_END, }; -const union AnimCmd gUnknown_085935B8[] = +const union AnimCmd gGuillotineAnimCmds2[] = { ANIMCMD_FRAME(0, 2, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_FRAME(16, 2, .vFlip = TRUE, .hFlip = TRUE), @@ -506,10 +512,10 @@ const union AnimCmd gUnknown_085935B8[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_085935C8[] = +const union AnimCmd *const gGuillotineAnimTable[] = { - gUnknown_085935A8, - gUnknown_085935B8, + gGuillotineAnimCmds1, + gGuillotineAnimCmds2, }; const struct SpriteTemplate gGuillotineSpriteTemplate = @@ -517,10 +523,10 @@ const struct SpriteTemplate gGuillotineSpriteTemplate = .tileTag = ANIM_TAG_CUT, .paletteTag = ANIM_TAG_CUT, .oam = &gOamData_AffineOff_ObjBlend_32x32, - .anims = gUnknown_085935C8, + .anims = gGuillotineAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = Anim_GuillotinePincer, + .callback = AnimGuillotinePincer, }; const union AffineAnimCmd gSplashEffectAffineAnimCmds[] = @@ -539,7 +545,7 @@ const union AffineAnimCmd gGrowAndShrinkAffineAnimCmds[] = AFFINEANIMCMD_END, }; -const union AnimCmd gUnknown_08593628[] = +const union AnimCmd gBreathPuffAnimCmds1[] = { ANIMCMD_FRAME(0, 4, .hFlip = TRUE), ANIMCMD_FRAME(4, 40, .hFlip = TRUE), @@ -548,7 +554,7 @@ const union AnimCmd gUnknown_08593628[] = ANIMCMD_END, }; -const union AnimCmd gUnknown_0859363C[] = +const union AnimCmd gBreathPuffAnimCmds2[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(4, 40), @@ -557,10 +563,10 @@ const union AnimCmd gUnknown_0859363C[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08593650[] = +const union AnimCmd *const gBreathPuffAnimTable[] = { - gUnknown_08593628, - gUnknown_0859363C, + gBreathPuffAnimCmds1, + gBreathPuffAnimCmds2, }; const struct SpriteTemplate gBreathPuffSpriteTemplate = @@ -568,22 +574,22 @@ const struct SpriteTemplate gBreathPuffSpriteTemplate = .tileTag = ANIM_TAG_BREATH, .paletteTag = ANIM_TAG_BREATH, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gUnknown_08593650, + .anims = gBreathPuffAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = Anim_BreathPuff, + .callback = AnimBreathPuff, }; -const union AffineAnimCmd gUnknown_08593670[] = +const union AffineAnimCmd gAngerMarkAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(0xB, 0xB, 0, 8), AFFINEANIMCMD_FRAME(0xFFF5, 0xFFF5, 0, 8), AFFINEANIMCMD_END, }; -const union AffineAnimCmd *const gUnknown_08593688[] = +const union AffineAnimCmd *const gAngerMarkAffineAnimTable[] = { - gUnknown_08593670, + gAngerMarkAffineAnimCmds, }; const struct SpriteTemplate gAngerMarkSpriteTemplate = @@ -593,11 +599,11 @@ const struct SpriteTemplate gAngerMarkSpriteTemplate = .oam = &gOamData_AffineNormal_ObjNormal_16x16, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_08593688, - .callback = Anim_AngerMark, + .affineAnims = gAngerMarkAffineAnimTable, + .callback = AnimAngerMark, }; -const union AffineAnimCmd gUnknown_085936A4[] = +const union AffineAnimCmd gThrashMoveMonAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(-10, 9, 0, 7), AFFINEANIMCMD_FRAME(20, -20, 0, 7), @@ -607,7 +613,7 @@ const union AffineAnimCmd gUnknown_085936A4[] = AFFINEANIMCMD_END, }; -const struct SpriteTemplate gUnknown_085936D4 = +const struct SpriteTemplate gPencilSpriteTemplate = { .tileTag = ANIM_TAG_PENCIL, .paletteTag = ANIM_TAG_PENCIL, @@ -615,10 +621,10 @@ const struct SpriteTemplate gUnknown_085936D4 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_810501C, + .callback = AnimPencil, }; -const struct SpriteTemplate gUnknown_085936EC = +const struct SpriteTemplate gSnoreZSpriteTemplate = { .tileTag = ANIM_TAG_SNORE_Z, .paletteTag = ANIM_TAG_SNORE_Z, @@ -626,10 +632,10 @@ const struct SpriteTemplate gUnknown_085936EC = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A7938, + .callback = AnimSnoreZ, }; -const union AnimCmd gUnknown_08593704[] = +const union AnimCmd gExplosionAnimCmds[] = { ANIMCMD_FRAME(0, 5), ANIMCMD_FRAME(16, 5), @@ -638,23 +644,23 @@ const union AnimCmd gUnknown_08593704[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08593718[] = +const union AnimCmd *const gExplosionAnimTable[] = { - gUnknown_08593704, + gExplosionAnimCmds, }; -//* -const struct SpriteTemplate gBattleAnimSpriteTemplate_859371C = + +const struct SpriteTemplate gExplosionSpriteTemplate = { .tileTag = ANIM_TAG_EXPLOSION, .paletteTag = ANIM_TAG_EXPLOSION, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_08593718, + .anims = gExplosionAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A77C8, + .callback = AnimSpriteOnMonPos, }; -const union AffineAnimCmd gUnknown_08593734[] = +const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(0x0, 0x0, -8, 2), AFFINEANIMCMD_FRAME(0x0, 0x0, 8, 4), @@ -662,13 +668,13 @@ const union AffineAnimCmd gUnknown_08593734[] = AFFINEANIMCMD_JUMP(0), }; -const union AffineAnimCmd gUnknown_08593754[] = +const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds2[] = { AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), AFFINEANIMCMD_END, }; -const union AffineAnimCmd gUnknown_08593764[] = +const union AffineAnimCmd gSoftBoiledEggAffineAnimCmds3[] = { AFFINEANIMCMD_FRAME(0xFFF8, 0x4, 0, 8), AFFINEANIMCMD_LOOP(0), @@ -680,130 +686,130 @@ const union AffineAnimCmd gUnknown_08593764[] = AFFINEANIMCMD_END, }; -const union AffineAnimCmd *const gUnknown_085937A4[] = +const union AffineAnimCmd *const gSoftBoiledEggAffineAnimTable[] = { - gUnknown_08593734, - gUnknown_08593754, - gUnknown_08593764, + gSoftBoiledEggAffineAnimCmds1, + gSoftBoiledEggAffineAnimCmds2, + gSoftBoiledEggAffineAnimCmds3, }; -//* -const struct SpriteTemplate gUnknown_085937B0 = + +const struct SpriteTemplate gSoftBoiledEggSpriteTemplate = { .tileTag = ANIM_TAG_BREAKING_EGG, .paletteTag = ANIM_TAG_BREAKING_EGG, .oam = &gOamData_AffineDouble_ObjBlend_32x32, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_085937A4, - .callback = sub_8105538, + .affineAnims = gSoftBoiledEggAffineAnimTable, + .callback = AnimSoftBoiledEgg, }; -const union AffineAnimCmd gUnknown_085937C8[] = +const union AffineAnimCmd gThinRingExpandingAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0), AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 30), AFFINEANIMCMD_END_ALT(1), }; -const union AffineAnimCmd gUnknown_085937E0[] = +const union AffineAnimCmd gThinRingExpandingAffineAnimCmds2[] = { AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0), AFFINEANIMCMD_FRAME(0x20, 0x20, 0, 15), AFFINEANIMCMD_END_ALT(1), }; -const union AffineAnimCmd gUnknown_085937F8[] = +const union AffineAnimCmd gHyperVoiceRingAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0), AFFINEANIMCMD_FRAME(0xB, 0xB, 0, 45), AFFINEANIMCMD_END_ALT(1), }; -const union AffineAnimCmd *const gUnknown_08593810[] = +const union AffineAnimCmd *const gThinRingExpandingAffineAnimTable[] = { - gUnknown_085937C8, - gUnknown_085937E0, + gThinRingExpandingAffineAnimCmds1, + gThinRingExpandingAffineAnimCmds2, }; -const union AffineAnimCmd *const gUnknown_08593818[] = +const union AffineAnimCmd *const gHyperVoiceRingAffineAnimTable[] = { - gUnknown_085937F8, + gHyperVoiceRingAffineAnimCmds, }; -const struct SpriteTemplate gUnknown_0859381C = +const struct SpriteTemplate gThinRingExpandingSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_THIN_RING, .oam = &gOamData_AffineDouble_ObjNormal_64x64, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_08593810, - .callback = sub_80A77C8, + .affineAnims = gThinRingExpandingAffineAnimTable, + .callback = AnimSpriteOnMonPos, }; -//* -const union AffineAnimCmd gUnknown_08593834[] = + +const union AffineAnimCmd gThinRingShrinkingAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(0x200, 0x200, 0, 0), AFFINEANIMCMD_FRAME(0xFFF0, 0xFFF0, 0, 30), AFFINEANIMCMD_END_ALT(1), }; -const union AffineAnimCmd *const gUnknown_0859384C[] = +const union AffineAnimCmd *const gThinRingShrinkingAffineAnimTable[] = { - gUnknown_08593834, + gThinRingShrinkingAffineAnimCmds, }; -const struct SpriteTemplate gUnknown_08593850 = +const struct SpriteTemplate gThinRingShrinkingSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_THIN_RING, .oam = &gOamData_AffineDouble_ObjBlend_64x64, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_0859384C, - .callback = sub_80A77C8, + .affineAnims = gThinRingShrinkingAffineAnimTable, + .callback = AnimSpriteOnMonPos, }; -const struct SpriteTemplate gUnknown_08593868 = +const struct SpriteTemplate gBlendThinRingExpandingSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_THIN_RING, .oam = &gOamData_AffineDouble_ObjBlend_64x64, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_08593810, - .callback = sub_81051C4, + .affineAnims = gThinRingExpandingAffineAnimTable, + .callback = AnimBlendThinRing, }; -const struct SpriteTemplate gUnknown_08593880 = +const struct SpriteTemplate gHyperVoiceRingSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_THIN_RING, .oam = &gOamData_AffineDouble_ObjBlend_64x64, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_08593818, - .callback = sub_81052A4, + .affineAnims = gHyperVoiceRingAffineAnimTable, + .callback = AnimHyperVoiceRing, }; -const struct SpriteTemplate gBattleAnimSpriteTemplate_8593898 = +const struct SpriteTemplate gUproarRingSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_THIN_RING, .oam = &gOamData_AffineDouble_ObjBlend_64x64, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_08593810, - .callback = sub_81054E8, + .affineAnims = gThinRingExpandingAffineAnimTable, + .callback = AnimUproarRing, }; -const union AffineAnimCmd gUnknown_085938B0[] = +const union AffineAnimCmd gStretchAttackerAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(96, -13, 0, 8), AFFINEANIMCMD_END, }; -const union AnimCmd gUnknown_085938C0[] = +const union AnimCmd gSpeedDustAnimCmds[] = { ANIMCMD_FRAME(0, 3), ANIMCMD_FRAME(4, 3), @@ -813,23 +819,23 @@ const union AnimCmd gUnknown_085938C0[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_085938D8[] = +const union AnimCmd *const gSpeedDustAnimTable[] = { - gUnknown_085938C0, + gSpeedDustAnimCmds, }; -const struct SpriteTemplate gUnknown_085938DC = +const struct SpriteTemplate gSpeedDustSpriteTemplate = { .tileTag = ANIM_TAG_SPEED_DUST, .paletteTag = ANIM_TAG_SPEED_DUST, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gUnknown_085938D8, + .anims = gSpeedDustAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8105C48, + .callback = AnimSpeedDust, }; -const s8 gUnknown_085938F4[][2] = +const s8 gSpeedDustPosTable[][2] = { {30, 28}, {-20, 24}, @@ -837,7 +843,7 @@ const s8 gUnknown_085938F4[][2] = {-10, 28}, }; -const union AnimCmd gUnknown_085938FC[] = +const union AnimCmd gBellAnimCmds[] = { ANIMCMD_FRAME(0, 6), ANIMCMD_FRAME(16, 6), @@ -855,30 +861,30 @@ const union AnimCmd gUnknown_085938FC[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08593934[] = +const union AnimCmd *const gBellAnimTable[] = { - gUnknown_085938FC, + gBellAnimCmds, }; -const struct SpriteTemplate gUnknown_08593938 = +const struct SpriteTemplate gBellSpriteTemplate = { .tileTag = ANIM_TAG_BELL, .paletteTag = ANIM_TAG_BELL, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_08593934, + .anims = gBellAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A77C8, + .callback = AnimSpriteOnMonPos, }; -const u16 gUnknown_08593950[] = +const u16 gMusicNotePaletteTagsTable[] = { ANIM_TAG_MUSIC_NOTES_2, ANIM_SPRITES_START - 1, ANIM_SPRITES_START - 2, }; -const struct SpriteTemplate gUnknown_08593958 = +const struct SpriteTemplate gHealBellMusicNoteSpriteTemplate = { .tileTag = ANIM_TAG_MUSIC_NOTES_2, .paletteTag = ANIM_TAG_MUSIC_NOTES_2, @@ -886,7 +892,7 @@ const struct SpriteTemplate gUnknown_08593958 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8105DE8, + .callback = AnimHealBellMusicNote, }; const struct SpriteTemplate gMagentaHeartSpriteTemplate = @@ -897,7 +903,7 @@ const struct SpriteTemplate gMagentaHeartSpriteTemplate = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8105E60, + .callback = AnimMagentaHeart, }; const union AffineAnimCmd gUnknown_08593988[] = @@ -907,7 +913,7 @@ const union AffineAnimCmd gUnknown_08593988[] = AFFINEANIMCMD_END, }; -const struct SpriteTemplate gUnknown_085939A0 = +const struct SpriteTemplate gRedHeartProjectileSpriteTemplate = { .tileTag = ANIM_TAG_RED_HEART, .paletteTag = ANIM_TAG_RED_HEART, @@ -915,10 +921,10 @@ const struct SpriteTemplate gUnknown_085939A0 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8106140, + .callback = AnimRedHeartProjectile, }; -const struct SpriteTemplate gBattleAnimSpriteTemplate_85939B8 = +const struct SpriteTemplate gRedHeartBurstSpriteTemplate = { .tileTag = ANIM_TAG_RED_HEART, .paletteTag = ANIM_TAG_RED_HEART, @@ -926,10 +932,10 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_85939B8 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_81061C4, + .callback = AnimParticuleBurst, }; -const struct SpriteTemplate gUnknown_085939D0 = +const struct SpriteTemplate gRedHeartRisingSpriteTemplate = { .tileTag = ANIM_TAG_RED_HEART, .paletteTag = ANIM_TAG_RED_HEART, @@ -937,19 +943,19 @@ const struct SpriteTemplate gUnknown_085939D0 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_810624C, + .callback = AnimRedHeartRising, }; -const union AffineAnimCmd gUnknown_085939E8[] = +const union AffineAnimCmd gHiddenPowerOrbAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0), AFFINEANIMCMD_FRAME(0x8, 0x8, 0, 1), AFFINEANIMCMD_JUMP(1), }; -const union AffineAnimCmd *const gUnknown_08593A00[] = +const union AffineAnimCmd *const gHiddenPowerOrbAffineAnimTable[] = { - gUnknown_085939E8, + gHiddenPowerOrbAffineAnimCmds, }; const struct SpriteTemplate gHiddenPowerOrbSpriteTemplate = @@ -959,7 +965,7 @@ const struct SpriteTemplate gHiddenPowerOrbSpriteTemplate = .oam = &gOamData_AffineNormal_ObjNormal_16x16, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_08593A00, + .affineAnims = gHiddenPowerOrbAffineAnimTable, .callback = AnimOrbitFast, }; @@ -970,34 +976,34 @@ const struct SpriteTemplate gHiddenPowerOrbScatterSpriteTemplate = .oam = &gOamData_AffineDouble_ObjNormal_16x16, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_08593A00, + .affineAnims = gHiddenPowerOrbAffineAnimTable, .callback = AnimOrbitScatter, }; -const union AffineAnimCmd gUnknown_08593A34[] = +const union AffineAnimCmd gSpitUpOrbAffineAnimCmds[] = { AFFINEANIMCMD_FRAME(0x80, 0x80, 0, 0), AFFINEANIMCMD_FRAME(0x8, 0x8, 0, 1), AFFINEANIMCMD_JUMP(1), }; -const union AffineAnimCmd *const gUnknown_08593A4C[] = +const union AffineAnimCmd *const gSpitUpOrbAffineAnimTable[] = { - gUnknown_08593A34, + gSpitUpOrbAffineAnimCmds, }; -const struct SpriteTemplate gUnknown_08593A50 = +const struct SpriteTemplate gSpitUpOrbSpriteTemplate = { .tileTag = ANIM_TAG_RED_ORB_2, .paletteTag = ANIM_TAG_RED_ORB_2, .oam = &gOamData_AffineDouble_ObjNormal_8x8, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_08593A4C, - .callback = sub_8106944, + .affineAnims = gSpitUpOrbAffineAnimTable, + .callback = AnimSpitUpOrb, }; -const union AnimCmd gUnknown_08593A68[] = +const union AnimCmd gEyeSparkleAnimCmds[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(4, 4), @@ -1007,45 +1013,45 @@ const union AnimCmd gUnknown_08593A68[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08593A80[] = +const union AnimCmd *const gEyeSparkleAnimTable[] = { - gUnknown_08593A68, + gEyeSparkleAnimCmds, }; -const struct SpriteTemplate gUnknown_08593A84 = +const struct SpriteTemplate gEyeSparkleSpriteTemplate = { .tileTag = ANIM_TAG_EYE_SPARKLE, .paletteTag = ANIM_TAG_EYE_SPARKLE, .oam = &gOamData_AffineOff_ObjNormal_16x16, - .anims = gUnknown_08593A80, + .anims = gEyeSparkleAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_81069B8, + .callback = AnimEyeSparkle, }; -const union AnimCmd gUnknown_08593A9C[] = +const union AnimCmd gAngelSpriteAnimCmds[] = { ANIMCMD_FRAME(0, 24), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08593AA4[] = +const union AnimCmd *const gAngelSpriteAnimTable[] = { - gUnknown_08593A9C, + gAngelSpriteAnimCmds, }; -const struct SpriteTemplate gUnknown_08593AA8 = +const struct SpriteTemplate gAngelSpriteTemplate = { .tileTag = ANIM_TAG_ANGEL, .paletteTag = ANIM_TAG_ANGEL, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_08593AA4, + .anims = gAngelSpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_81069D0, + .callback = AnimAngel, }; -const struct SpriteTemplate gUnknown_08593AC0 = +const struct SpriteTemplate gPinkHeartSpriteTemplate = { .tileTag = ANIM_TAG_PINK_HEART, .paletteTag = ANIM_TAG_PINK_HEART, @@ -1053,36 +1059,36 @@ const struct SpriteTemplate gUnknown_08593AC0 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8106AD0, + .callback = AnimPinkHeart, }; -const union AnimCmd gUnknown_08593AD8[] = +const union AnimCmd gDevilAnimCmds1[] = { ANIMCMD_FRAME(0, 3), ANIMCMD_JUMP(0), }; -const union AnimCmd gUnknown_08593AE0[] = +const union AnimCmd gDevilAnimCmds2[] = { ANIMCMD_FRAME(16, 3), ANIMCMD_JUMP(0), }; -const union AnimCmd *const gUnknown_08593AE8[] = +const union AnimCmd *const gDevilAnimTable[] = { - gUnknown_08593AD8, - gUnknown_08593AE0, + gDevilAnimCmds1, + gDevilAnimCmds2, }; -const struct SpriteTemplate gUnknown_08593AF0 = +const struct SpriteTemplate gDevilSpriteTemplate = { .tileTag = ANIM_TAG_DEVIL, .paletteTag = ANIM_TAG_DEVIL, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_08593AE8, + .anims = gDevilAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8106B54, + .callback = AnimDevil, }; const union AnimCmd gUnknown_08593B08[] = @@ -1103,24 +1109,24 @@ const union AnimCmd gUnknown_08593B1C[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08593B30[] = +const union AnimCmd *const gFurySwipesAnimTable[] = { gUnknown_08593B08, gUnknown_08593B1C, }; -const struct SpriteTemplate gUnknown_08593B38 = +const struct SpriteTemplate gFurySwipesSpriteTemplate = { .tileTag = ANIM_TAG_SWIPE, .paletteTag = ANIM_TAG_SWIPE, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_08593B30, + .anims = gFurySwipesAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8106C80, + .callback = AnimFurySwipes, }; -const union AnimCmd gUnknown_08593B50[] = +const union AnimCmd gMovementWavesAnimCmds1[] = { ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(16, 8), @@ -1129,7 +1135,7 @@ const union AnimCmd gUnknown_08593B50[] = ANIMCMD_END, }; -const union AnimCmd gUnknown_08593B64[] = +const union AnimCmd gMovementWavesAnimCmds2[] = { ANIMCMD_FRAME(16, 8, .hFlip = TRUE), ANIMCMD_FRAME(32, 8, .hFlip = TRUE), @@ -1138,21 +1144,21 @@ const union AnimCmd gUnknown_08593B64[] = ANIMCMD_END, }; -const union AnimCmd *const gUnknown_08593B78[] = +const union AnimCmd *const gMovementWavesAnimTable[] = { - gUnknown_08593B50, - gUnknown_08593B64, + gMovementWavesAnimCmds1, + gMovementWavesAnimCmds2, }; -const struct SpriteTemplate gUnknown_08593B80 = +const struct SpriteTemplate gMovementWavesSpriteTemplate = { .tileTag = ANIM_TAG_MOVEMENT_WAVES, .paletteTag = ANIM_TAG_MOVEMENT_WAVES, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_08593B78, + .anims = gMovementWavesAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8106CD0, + .callback = AnimMovmentWaves, }; const union AffineAnimCmd gUnknown_08593B98[] = @@ -1163,7 +1169,7 @@ const union AffineAnimCmd gUnknown_08593B98[] = AFFINEANIMCMD_END, }; -const struct SpriteTemplate gBattleAnimSpriteTemplate_8593BB8 = +const struct SpriteTemplate gJaggedMusicNoteSpriteTemplate = { .tileTag = ANIM_TAG_JAGGED_MUSIC_NOTE, .paletteTag = ANIM_TAG_JAGGED_MUSIC_NOTE, @@ -1171,84 +1177,84 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8593BB8 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8106E00, + .callback = AnimJaggedMusicNote, }; -const union AffineAnimCmd gUnknown_08593BD0[] = +const union AffineAnimCmd gPerishSongMusicNoteAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 5), AFFINEANIMCMD_END, }; -const union AffineAnimCmd gUnknown_08593BE0[] = +const union AffineAnimCmd gPerishSongMusicNoteAffineAnimCmds2[] = { AFFINEANIMCMD_FRAME(0x0, 0x0, -8, 16), AFFINEANIMCMD_END_ALT(1), }; -const union AffineAnimCmd gUnknown_08593BF0[] = +const union AffineAnimCmd gPerishSongMusicNoteAffineAnimCmds3[] = { AFFINEANIMCMD_FRAME(0x0, 0x0, 8, 16), AFFINEANIMCMD_END_ALT(1), }; -const union AffineAnimCmd *const gUnknown_08593C00[] = +const union AffineAnimCmd *const gPerishSongMusicNoteAffineAnimTable[] = { - gUnknown_08593BD0, - gUnknown_08593BE0, - gUnknown_08593BF0, + gPerishSongMusicNoteAffineAnimCmds1, + gPerishSongMusicNoteAffineAnimCmds2, + gPerishSongMusicNoteAffineAnimCmds3, }; -extern const union AnimCmd *const gUnknown_08592FCC[]; -const struct SpriteTemplate gUnknown_08593C0C = +extern const union AnimCmd *const gMusicNotesAnimTable[]; +const struct SpriteTemplate gPerishSongMusicNoteSpriteTemplate = { .tileTag = ANIM_TAG_MUSIC_NOTES_2, .paletteTag = ANIM_TAG_MUSIC_NOTES_2, .oam = &gOamData_AffineNormal_ObjNormal_16x16, - .anims = gUnknown_08592FCC, + .anims = gMusicNotesAnimTable, .images = NULL, - .affineAnims = gUnknown_08593C00, - .callback = sub_8106F60, + .affineAnims = gPerishSongMusicNoteAffineAnimTable, + .callback = AnimPerishSongMusicNote, }; -const struct SpriteTemplate gUnknown_08593C24 = +const struct SpriteTemplate gPerishSongMusicNote2SpriteTemplate = { .tileTag = ANIM_TAG_MUSIC_NOTES_2, .paletteTag = ANIM_TAG_MUSIC_NOTES_2, .oam = &gOamData_AffineNormal_ObjNormal_16x16, - .anims = gUnknown_08592FCC, + .anims = gMusicNotesAnimTable, .images = NULL, - .affineAnims = gUnknown_08593C00, - .callback = sub_8106F00, + .affineAnims = gPerishSongMusicNoteAffineAnimTable, + .callback = AnimPerishSongMusicNote2, }; -const union AffineAnimCmd gUnknown_08593C3C[] = +const union AffineAnimCmd gGuardRingAffineAnimCmds1[] = { AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), AFFINEANIMCMD_END, }; -const union AffineAnimCmd gUnknown_08593C4C[] = +const union AffineAnimCmd gGuardRingAffineAnimCmds2[] = { AFFINEANIMCMD_FRAME(0x200, 0x100, 0, 0), AFFINEANIMCMD_END, }; -const union AffineAnimCmd *const gUnknown_08593C5C[] = +const union AffineAnimCmd *const gGuardRingAffineAnimTable[] = { - gUnknown_08593C3C, - gUnknown_08593C4C, + gGuardRingAffineAnimCmds1, + gGuardRingAffineAnimCmds2, }; -const struct SpriteTemplate gUnknown_08593C64 = +const struct SpriteTemplate gGuardRingSpriteTemplate = { .tileTag = ANIM_TAG_GUARD_RING, .paletteTag = ANIM_TAG_GUARD_RING, .oam = &gOamData_AffineDouble_ObjBlend_64x32, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_08593C5C, - .callback = sub_81070AC, + .affineAnims = gGuardRingAffineAnimTable, + .callback = AnimGuardRing, }; void sub_8103448(struct Sprite *sprite) @@ -1273,7 +1279,7 @@ void sub_8103498(struct Sprite *sprite) else battler = gBattleAnimTarget; - sub_810310C(battler, sprite); + SetSpriteNextToMonHead(battler, sprite); sprite->data[0] = 0; sprite->data[1] = 0; sprite->callback = sub_81034D8; @@ -1450,10 +1456,10 @@ void Anim_SwordsDanceBlade(struct Sprite *sprite) { InitSpritePosToAnimAttacker(sprite, FALSE); sprite->callback = RunStoredCallbackWhenAffineAnimEnds; - StoreSpriteCallbackInData6(sprite, Anim_SwordsDanceBladeStep); + StoreSpriteCallbackInData6(sprite, AnimSwordsDanceBladeStep); } -static void Anim_SwordsDanceBladeStep(struct Sprite *sprite) +static void AnimSwordsDanceBladeStep(struct Sprite *sprite) { sprite->data[0] = 6; sprite->data[2] = sprite->pos1.x; @@ -1502,7 +1508,7 @@ void AnimSonicBoomProjectile(struct Sprite *sprite) StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); } -static void sub_81039CC(struct Sprite *sprite) +static void AnimAirWaveProjectile_Step2(struct Sprite *sprite) { if (sprite->data[0]-- <= 0) { @@ -1511,7 +1517,7 @@ static void sub_81039CC(struct Sprite *sprite) } } -static void sub_8103A00(struct Sprite *sprite) +static void AnimAirWaveProjectile_Step1(struct Sprite *sprite) { struct Task* task = &gTasks[sprite->data[7]]; if (sprite->data[0] > task->data[5]) @@ -1540,11 +1546,11 @@ static void sub_8103A00(struct Sprite *sprite) if (sprite->data[0]-- <= 0) { sprite->data[0] = 30; - sprite->callback = sub_81039CC; + sprite->callback = AnimAirWaveProjectile_Step2; } } -void sub_8103AA4(struct Sprite *sprite) +void AnimAirWaveProjectile(struct Sprite *sprite) { s16 a; s16 b; @@ -1588,23 +1594,23 @@ void sub_8103AA4(struct Sprite *sprite) sprite->data[5] = 0; sprite->data[3] = sub_8151534(sub_8151534(b, a), sub_8151624(0x1C0)); sprite->data[4] = sub_8151534(sub_8151534(c, a), sub_8151624(0x1C0)); - sprite->callback = sub_8103A00; + sprite->callback = AnimAirWaveProjectile_Step1; } } -static void sub_8103BE4(u8 taskId) +static void AirCutterProjectileStep2(u8 taskId) { if (gTasks[taskId].data[1] == 0) DestroyAnimVisualTask(taskId); } -static void sub_8103C0C(u8 taskId) +static void AirCutterProjectileStep1(u8 taskId) { if (gTasks[taskId].data[0]-- <= 0) { u8 spriteId; struct Sprite *sprite; - spriteId = CreateSprite(&gUnknown_085933B0, gTasks[taskId].data[9], gTasks[taskId].data[10], gTasks[taskId].data[2] - gTasks[taskId].data[1]); + spriteId = CreateSprite(&gAirWaveProjectileSpriteTemplate, gTasks[taskId].data[9], gTasks[taskId].data[10], gTasks[taskId].data[2] - gTasks[taskId].data[1]); sprite = &gSprites[spriteId]; switch (gTasks[taskId].data[4]) { @@ -1623,11 +1629,11 @@ static void sub_8103C0C(u8 taskId) gTasks[taskId].data[1]++; PlaySE12WithPanning(SE_W059B, BattleAnimAdjustPanning(-63)); if (gTasks[taskId].data[1] > 2) - gTasks[taskId].func = sub_8103BE4; + gTasks[taskId].func = AirCutterProjectileStep2; } } -void sub_8103CF0(u8 taskId) +void AnimTask_AirCutterProjectile(u8 taskId) { s16 attackerY = 0; s16 attackerX = 0; @@ -1724,7 +1730,7 @@ void sub_8103CF0(u8 taskId) if (gTasks[taskId].data[2] < 3) gTasks[taskId].data[2] = 3; - gTasks[taskId].func = sub_8103C0C; + gTasks[taskId].func = AirCutterProjectileStep1; } void sub_8103FE8(struct Sprite *sprite) @@ -1754,7 +1760,7 @@ static void sub_8104018(struct Sprite *sprite) } } -void sub_8104088(struct Sprite *sprite) +void AnimCoinThrow(struct Sprite *sprite) { s16 r6; s16 r7; @@ -1777,14 +1783,14 @@ void sub_8104088(struct Sprite *sprite) StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); } -void sub_810413C(struct Sprite *sprite) +void AnimFallingCoin(struct Sprite *sprite) { sprite->data[2] = -16; sprite->pos1.y += 8; - sprite->callback = sub_8104154; + sprite->callback = AnimFallingCoin_Step; } -static void sub_8104154(struct Sprite *sprite) +static void AnimFallingCoin_Step(struct Sprite *sprite) { sprite->data[0] += 0x80; sprite->pos2.x = sprite->data[0] >> 8; @@ -1802,7 +1808,7 @@ static void sub_8104154(struct Sprite *sprite) } } -void sub_81041C4(struct Sprite *sprite) +void AnimBulletSeed(struct Sprite *sprite) { InitSpritePosToAnimAttacker(sprite, TRUE); sprite->data[0] = 20; @@ -1810,10 +1816,10 @@ void sub_81041C4(struct Sprite *sprite) sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET); sprite->callback = StartAnimLinearTranslation; sprite->affineAnimPaused = 1; - StoreSpriteCallbackInData6(sprite, sub_810421C); + StoreSpriteCallbackInData6(sprite, AnimBulletSeed_Step1); } -static void sub_810421C(struct Sprite *sprite) +static void AnimBulletSeed_Step1(struct Sprite *sprite) { int i; u16 rand; @@ -1831,11 +1837,11 @@ static void sub_810421C(struct Sprite *sprite) sprite->data[6] = 0xFFF4 - (rand & 7); rand = Random2(); sprite->data[7] = (rand % 0xA0) + 0xA0; - sprite->callback = sub_81042A0; + sprite->callback = AnimBulletSeed_Step2; sprite->affineAnimPaused = 0; } -static void sub_81042A0(struct Sprite *sprite) +static void AnimBulletSeed_Step2(struct Sprite *sprite) { sprite->data[0] += sprite->data[7]; sprite->pos2.x = sprite->data[0] >> 8; @@ -1861,7 +1867,7 @@ static void sub_81042A0(struct Sprite *sprite) // arg 4: initial wave offset // arg 5: wave period (higher means faster wave) // arg 6: duration -void Anim_RazorWindTornado(struct Sprite *sprite) +void AnimRazorWindTornado(struct Sprite *sprite) { InitSpritePosToAnimAttacker(sprite, FALSE); if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) @@ -1879,7 +1885,7 @@ void Anim_RazorWindTornado(struct Sprite *sprite) // Animates a single pincer line that extends towards the center of the target mon. // arg 0: invert -void Anim_ViceGripPincer(struct Sprite *sprite) +void AnimViceGripPincer(struct Sprite *sprite) { s16 startXOffset = 32; s16 startYOffset = -32; @@ -1900,10 +1906,10 @@ void Anim_ViceGripPincer(struct Sprite *sprite) sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + endXOffset; sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + endYOffset; sprite->callback = StartAnimLinearTranslation; - StoreSpriteCallbackInData6(sprite, Anim_ViceGripPincerStep); + StoreSpriteCallbackInData6(sprite, AnimViceGripPincerStep); } -static void Anim_ViceGripPincerStep(struct Sprite *sprite) +static void AnimViceGripPincerStep(struct Sprite *sprite) { if (sprite->animEnded) DestroyAnimSprite(sprite); @@ -1911,7 +1917,7 @@ static void Anim_ViceGripPincerStep(struct Sprite *sprite) // Animates a single pincer line that extends towards the center of the target mon, and then back out. // arg 0: animation id -void Anim_GuillotinePincer(struct Sprite *sprite) +void AnimGuillotinePincer(struct Sprite *sprite) { s16 startXOffset = 32; s16 startYOffset = -32; @@ -1936,10 +1942,10 @@ void Anim_GuillotinePincer(struct Sprite *sprite) InitAnimLinearTranslation(sprite); sprite->data[5] = gBattleAnimArgs[0]; sprite->data[6] = sprite->data[0]; - sprite->callback = Anim_GuillotinePincerStep1; + sprite->callback = AnimGuillotinePincerStep1; } -static void Anim_GuillotinePincerStep1(struct Sprite *sprite) +static void AnimGuillotinePincerStep1(struct Sprite *sprite) { if (AnimTranslateLinear(sprite) && sprite->animEnded) { @@ -1954,11 +1960,11 @@ static void Anim_GuillotinePincerStep1(struct Sprite *sprite) sprite->data[2] ^= 1; sprite->data[4] = 0; sprite->data[3] = 0; - sprite->callback = Anim_GuillotinePincerStep2; + sprite->callback = AnimGuillotinePincerStep2; } } -static void Anim_GuillotinePincerStep2(struct Sprite *sprite) +static void AnimGuillotinePincerStep2(struct Sprite *sprite) { if (sprite->data[3]) { @@ -1975,11 +1981,11 @@ static void Anim_GuillotinePincerStep2(struct Sprite *sprite) sprite->data[3] = 0; sprite->animPaused = 0; StartSpriteAnim(sprite, sprite->data[5] ^ 1); - sprite->callback = Anim_GuillotinePincerStep3; + sprite->callback = AnimGuillotinePincerStep3; } } -static void Anim_GuillotinePincerStep3(struct Sprite *sprite) +static void AnimGuillotinePincerStep3(struct Sprite *sprite) { if (AnimTranslateLinear(sprite)) DestroyAnimSprite(sprite); @@ -2229,7 +2235,7 @@ static void AnimTask_GrowAndShrinkStep(u8 taskId) // Animates a little puff of the mon's breath. // Used by MOVE_SWAGGER and MOVE_BULK_UP // No args. -void Anim_BreathPuff(struct Sprite *sprite) +void AnimBreathPuff(struct Sprite *sprite) { if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) { @@ -2257,7 +2263,7 @@ void Anim_BreathPuff(struct Sprite *sprite) // arg 0: target mon (0 = attacker, 1 = target) // arg 1: x pixel offset // arg 2: y pixel offset -void Anim_AngerMark(struct Sprite *sprite) +void AnimAngerMark(struct Sprite *sprite) { u8 battler; if (!gBattleAnimArgs[0]) @@ -2278,17 +2284,17 @@ void Anim_AngerMark(struct Sprite *sprite) } // left/right movements -void sub_8104C38(u8 taskId) +void AnimTask_ThrashMoveMonHorizontal(u8 taskId) { struct Task* task = &gTasks[taskId]; u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); task->data[0] = spriteId; task->data[1] = 0; - PrepareAffineAnimInTaskData(task, spriteId, gUnknown_085936A4); - task->func = sub_8104C78; + PrepareAffineAnimInTaskData(task, spriteId, gThrashMoveMonAffineAnimCmds); + task->func = ThrashMoveMonStep; } -static void sub_8104C78(u8 taskId) +static void ThrashMoveMonStep(u8 taskId) { struct Task* task = &gTasks[taskId]; if (!RunAffineAnimFromTaskData(task)) @@ -2296,7 +2302,7 @@ static void sub_8104C78(u8 taskId) } // up/down movements -void sub_8104CA4(u8 taskId) +void AnimTask_ThrashMoveMonVertical(u8 taskId) { struct Task* task = &gTasks[taskId]; task->data[0] = GetAnimBattlerSpriteId(ANIM_ATTACKER); @@ -2312,10 +2318,10 @@ void sub_8104CA4(u8 taskId) if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) task->data[2] *= -1; - task->func = sub_8104D28; + task->func = ThrashMoveMon; } -static void sub_8104D28(u8 taskId) +static void ThrashMoveMon(u8 taskId) { struct Task* task = &gTasks[taskId]; if (++task->data[7] > 2) @@ -2404,10 +2410,10 @@ void sub_8104E74(u8 taskId) params.initState = 1; params.unused9 = 0; ScanlineEffect_SetParams(params); - task->func = sub_8104F54; + task->func = AnimTask_SketchDrawMon; } -static void sub_8104F54(u8 taskId) +static void AnimTask_SketchDrawMon(u8 taskId) { struct Task* task = &gTasks[taskId]; @@ -2454,7 +2460,7 @@ static void sub_8104F54(u8 taskId) } } -void sub_810501C(struct Sprite *sprite) +void AnimPencil(struct Sprite *sprite) { sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) - 16; sprite->pos1.y = GetBattlerYCoordWithElevation(gBattleAnimTarget) + 16; @@ -2465,10 +2471,10 @@ void sub_810501C(struct Sprite *sprite) sprite->data[4] = 0; sprite->data[5] = GetBattlerSpriteCoordAttr(gBattleAnimTarget, BATTLER_COORD_ATTR_HEIGHT) + 2; sprite->data[6] = BattleAnimAdjustPanning(63); - sprite->callback = sub_8105078; + sprite->callback = AnimPencil_Step; } -static void sub_8105078(struct Sprite *sprite) +static void AnimPencil_Step(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -2527,7 +2533,7 @@ static void sub_8105078(struct Sprite *sprite) } } -void sub_81051C4(struct Sprite *sprite) +void AnimBlendThinRing(struct Sprite *sprite) { u8 battler = 0; u16 sp0 = 0; @@ -2554,7 +2560,7 @@ void sub_81051C4(struct Sprite *sprite) gBattleAnimArgs[0] = sp0 - r4; } - sprite->callback = sub_80A77C8; + sprite->callback = AnimSpriteOnMonPos; sprite->callback(sprite); } @@ -2567,7 +2573,7 @@ void sub_8105284(struct Sprite *sprite) } } -void sub_81052A4(struct Sprite *sprite) +void AnimHyperVoiceRing(struct Sprite *sprite) { u16 r9 = 0; u16 r6 = 0; @@ -2652,7 +2658,7 @@ void sub_81052A4(struct Sprite *sprite) sprite->callback(sprite); } -void sub_81054E8(struct Sprite *sprite) +void AnimUproarRing(struct Sprite *sprite) { u8 index = IndexOfSpritePaletteTag(ANIM_TAG_THIN_RING); if (index != 0xFF) @@ -2661,11 +2667,11 @@ void sub_81054E8(struct Sprite *sprite) } StartSpriteAffineAnim(sprite, 1); - sprite->callback = sub_80A77C8; + sprite->callback = AnimSpriteOnMonPos; sprite->callback(sprite); } -void sub_8105538(struct Sprite *sprite) +void AnimSoftBoiledEgg(struct Sprite *sprite) { s16 r1; InitSpritePosToAnimAttacker(sprite, FALSE); @@ -2673,10 +2679,10 @@ void sub_8105538(struct Sprite *sprite) sprite->data[0] = 0x380; sprite->data[1] = r1; sprite->data[7] = gBattleAnimArgs[2]; - sprite->callback = sub_810557C; + sprite->callback = AnimSoftBoiledEgg_Step1; } -static void sub_810557C(struct Sprite *sprite) +static void AnimSoftBoiledEgg_Step1(struct Sprite *sprite) { s16 add; sprite->pos2.y -= (sprite->data[0] >> 8); @@ -2692,20 +2698,20 @@ static void sub_810557C(struct Sprite *sprite) sprite->pos2.x = 0; sprite->data[0] = 0; StartSpriteAffineAnim(sprite, 1); - sprite->callback = sub_81055F4; + sprite->callback = AnimSoftBoiledEgg_Step2; } } -static void sub_81055F4(struct Sprite *sprite) +static void AnimSoftBoiledEgg_Step2(struct Sprite *sprite) { if (sprite->data[0]++ > 19) { StartSpriteAffineAnim(sprite, 2); - sprite->callback = sub_810561C; + sprite->callback = AnimSoftBoiledEgg_Step3; } } -static void sub_810561C(struct Sprite *sprite) +static void AnimSoftBoiledEgg_Step3(struct Sprite *sprite) { if (sprite->affineAnimEnded) { @@ -2714,17 +2720,17 @@ static void sub_810561C(struct Sprite *sprite) if (sprite->data[7] == 0) { sprite->oam.tileNum += 16; - sprite->callback = sub_8105694; + sprite->callback = AnimSoftBoiledEgg_Step3_Callback1; } else { sprite->oam.tileNum += 32; - sprite->callback = sub_810571C; + sprite->callback = AnimSoftBoiledEgg_Step4; } } } -static void sub_8105694(struct Sprite *sprite) +static void AnimSoftBoiledEgg_Step3_Callback1(struct Sprite *sprite) { sprite->pos2.y -= 2; if (++sprite->data[0] == 9) @@ -2733,50 +2739,50 @@ static void sub_8105694(struct Sprite *sprite) sprite->data[1] = 0; SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND((u16)sprite->data[0], 0)); - sprite->callback = sub_81056D4; + sprite->callback = AnimSoftBoiledEgg_Step3_Callback2; } } -static void sub_81056D4(struct Sprite *sprite) +static void AnimSoftBoiledEgg_Step3_Callback2(struct Sprite *sprite) { if (sprite->data[1]++ % 3 == 0) { sprite->data[0]--; SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(sprite->data[0], 16 - sprite->data[0])); if (sprite->data[0] == 0) - sprite->callback = sub_810571C; + sprite->callback = AnimSoftBoiledEgg_Step4; } } -static void sub_810571C(struct Sprite *sprite) +static void AnimSoftBoiledEgg_Step4(struct Sprite *sprite) { if ((u16)gBattleAnimArgs[7] == 0xFFFF) { sprite->invisible = 1; if (sprite->data[7] == 0) - sprite->callback = sub_810575C; + sprite->callback = AnimSoftBoiledEgg_Step4_Callback; else sprite->callback = DestroyAnimSprite; } } -static void sub_810575C(struct Sprite *sprite) +static void AnimSoftBoiledEgg_Step4_Callback(struct Sprite *sprite) { SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDALPHA, 0); DestroyAnimSprite(sprite); } -void sub_810577C(u8 taskId) +void AnimTask_StretchAttacker(u8 taskId) { struct Task* task = &gTasks[taskId]; u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); task->data[0] = spriteId; - PrepareAffineAnimInTaskData(task, spriteId, gUnknown_085938B0); - task->func = sub_81057B8; + PrepareAffineAnimInTaskData(task, spriteId, gStretchAttackerAffineAnimCmds); + task->func = StretchAttacker_Step; } -static void sub_81057B8(u8 taskId) +static void StretchAttacker_Step(u8 taskId) { struct Task* task = &gTasks[taskId]; if (!RunAffineAnimFromTaskData(task)) @@ -2787,7 +2793,7 @@ static void sub_81057B8(u8 taskId) } } -void sub_8105810(u8 taskId) +void AnimTask_ExtremeSpeedImpact(u8 taskId) { struct Task* task = &gTasks[taskId]; task->data[0] = 0; @@ -2807,10 +2813,10 @@ void sub_8105810(u8 taskId) } task->data[15] = GetAnimBattlerSpriteId(ANIM_TARGET); - task->func = sub_8105878; + task->func = ExtremeSpeedImpact_Step; } -static void sub_8105878(u8 taskId) +static void ExtremeSpeedImpact_Step(u8 taskId) { struct Task* task = &gTasks[taskId]; @@ -2856,7 +2862,7 @@ static void sub_8105878(u8 taskId) } } -void sub_810599C(u8 taskId) +void AnimTask_ExtremeSpeedMonReappear(u8 taskId) { struct Task* task = &gTasks[taskId]; task->data[0] = 0; @@ -2867,10 +2873,10 @@ void sub_810599C(u8 taskId) task->data[13] = 14; task->data[14] = 2; task->data[15] = GetAnimBattlerSpriteId(ANIM_ATTACKER); - task->func = sub_81059E0; + task->func = ExtremeSpeedMonReappear_Step; } -static void sub_81059E0(u8 taskId) +static void ExtremeSpeedMonReappear_Step(u8 taskId) { struct Task* task = &gTasks[taskId]; if (task->data[0] == 0 && ++task->data[1] > task->data[4]) @@ -2898,7 +2904,7 @@ static void sub_81059E0(u8 taskId) } } -void sub_8105AAC(u8 taskId) +void AnimTask_SpeedDust(u8 taskId) { struct Task* task = &gTasks[taskId]; task->data[0] = 0; @@ -2913,10 +2919,10 @@ void sub_8105AAC(u8 taskId) task->data[13] = 0; task->data[14] = GetBattlerSpriteCoord(gBattleAnimAttacker, ANIM_ATTACKER); task->data[15] = GetBattlerSpriteCoord(gBattleAnimAttacker, ANIM_TARGET); - task->func = sub_8105B08; + task->func = SpeedDust_Step1; } -static void sub_8105B08(u8 taskId) +static void SpeedDust_Step1(u8 taskId) { struct Task* task = &gTasks[taskId]; switch (task->data[8]) @@ -2958,13 +2964,13 @@ static void sub_8105B08(u8 taskId) { u8 spriteId; task->data[1] = 0; - spriteId = CreateSprite(&gUnknown_085938DC, task->data[14], task->data[15], 0); + spriteId = CreateSprite(&gSpeedDustSpriteTemplate, task->data[14], task->data[15], 0); if (spriteId != MAX_SPRITES) { gSprites[spriteId].data[0] = taskId; gSprites[spriteId].data[1] = 13; - gSprites[spriteId].pos2.x = gUnknown_085938F4[task->data[2]][0]; - gSprites[spriteId].pos2.y = gUnknown_085938F4[task->data[2]][1]; + gSprites[spriteId].pos2.x = gSpeedDustPosTable[task->data[2]][0]; + gSprites[spriteId].pos2.y = gSpeedDustPosTable[task->data[2]][1]; task->data[13]++; if (++task->data[2] > 3) { @@ -2982,7 +2988,7 @@ static void sub_8105B08(u8 taskId) } } -void sub_8105C48(struct Sprite *sprite) +void AnimSpeedDust(struct Sprite *sprite) { sprite->invisible = gTasks[sprite->data[0]].data[5]; if (sprite->animEnded) @@ -3014,21 +3020,21 @@ void sub_8105D60(u8 taskId) { int i; for (i = 0; i < 3; i++) - FreeSpritePaletteByTag(gUnknown_08593950[i]); + FreeSpritePaletteByTag(gMusicNotePaletteTagsTable[i]); DestroyAnimVisualTask(taskId); } -static void sub_8105D88(struct Sprite *sprite, u8 a, u8 b) +static void SetMusicNotePalette(struct Sprite *sprite, u8 a, u8 b) { u8 tile; tile = (b & 1); tile = ((-tile | tile) >> 31) & 32; sprite->oam.tileNum += tile + (a << 2); - sprite->oam.paletteNum = IndexOfSpritePaletteTag(gUnknown_08593950[b >> 1]); + sprite->oam.paletteNum = IndexOfSpritePaletteTag(gMusicNotePaletteTagsTable[b >> 1]); } -void sub_8105DE8(struct Sprite *sprite) +void AnimHealBellMusicNote(struct Sprite *sprite) { InitSpritePosToAnimAttacker(sprite, FALSE); if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) @@ -3039,10 +3045,10 @@ void sub_8105DE8(struct Sprite *sprite) sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[3]; sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); - sub_8105D88(sprite, gBattleAnimArgs[5], gBattleAnimArgs[6]); + SetMusicNotePalette(sprite, gBattleAnimArgs[5], gBattleAnimArgs[6]); } -void sub_8105E60(struct Sprite *sprite) +void AnimMagentaHeart(struct Sprite *sprite) { if (++sprite->data[0] == 1) InitSpritePosToAnimAttacker(sprite, FALSE); @@ -3055,7 +3061,7 @@ void sub_8105E60(struct Sprite *sprite) DestroyAnimSprite(sprite); } -void sub_8105EB0(u8 taskId) +void AnimTask_FakeOut(u8 taskId) { u16 win0h = IsContest() ? 0x98 : 0xF0; u16 win0v = 0; @@ -3070,17 +3076,17 @@ void sub_8105EB0(u8 taskId) SetGpuReg(REG_OFFSET_BLDY, 0x10); gTasks[taskId].data[0] = win0v; gTasks[taskId].data[1] = win0h; - gTasks[taskId].func = sub_8105F30; + gTasks[taskId].func = FakeOutStep1; } -static void sub_8105F30(u8 taskId) +static void FakeOutStep1(u8 taskId) { gTasks[taskId].data[0] += 13; gTasks[taskId].data[1] -= 13; if (gTasks[taskId].data[0] >= gTasks[taskId].data[1]) { gBattle_WIN0H = 0; - gTasks[taskId].func = sub_8105F84; + gTasks[taskId].func = FakeOutStep2; } else { @@ -3088,7 +3094,7 @@ static void sub_8105F30(u8 taskId) } } -static void sub_8105F84(u8 taskId) +static void FakeOutStep2(u8 taskId) { if (++gTasks[taskId].data[10] == 5) { @@ -3148,7 +3154,7 @@ void sub_81060B0(u8 taskId) } } -void sub_8106140(struct Sprite *sprite) +void AnimRedHeartProjectile(struct Sprite *sprite) { InitSpritePosToAnimAttacker(sprite, TRUE); sprite->data[0] = 95; @@ -3157,10 +3163,10 @@ void sub_8106140(struct Sprite *sprite) sprite->data[3] = sprite->pos1.y; sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); InitAnimLinearTranslation(sprite); - sprite->callback = sub_810618C; + sprite->callback = AnimRedHeartProjectile_Step; } -static void sub_810618C(struct Sprite *sprite) +static void AnimRedHeartProjectile_Step(struct Sprite *sprite) { if (!AnimTranslateLinear(sprite)) { @@ -3173,7 +3179,7 @@ static void sub_810618C(struct Sprite *sprite) } } -void sub_81061C4(struct Sprite *sprite) +void AnimParticuleBurst(struct Sprite *sprite) { if (sprite->data[0] == 0) { @@ -3195,17 +3201,17 @@ void sub_81061C4(struct Sprite *sprite) } } -void sub_810624C(struct Sprite *sprite) +void AnimRedHeartRising(struct Sprite *sprite) { sprite->pos1.x = gBattleAnimArgs[0]; sprite->pos1.y = 160; sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = gBattleAnimArgs[1]; sprite->callback = WaitAnimForDuration; - StoreSpriteCallbackInData6(sprite, sub_810627C); + StoreSpriteCallbackInData6(sprite, AnimRedHeartRising_Step); } -static void sub_810627C(struct Sprite *sprite) +static void AnimRedHeartRising_Step(struct Sprite *sprite) { s16 y; sprite->data[2] += sprite->data[1]; @@ -3240,10 +3246,10 @@ void AnimTask_HeartsBackground(u8 taskId) AnimLoadCompressedBgGfx(animBg.bgId, &gUnknown_08C232E0, animBg.tilesOffset); sub_80A6D60(&animBg, &gUnknown_08C23D78, 0); LoadCompressedPalette(&gUnknown_08C23D50, animBg.paletteId * 16, 32); - gTasks[taskId].func = sub_81063A8; + gTasks[taskId].func = HeartsBackground_Step; } -static void sub_81063A8(u8 taskId) +static void HeartsBackground_Step(u8 taskId) { struct BattleAnimBgData animBg; @@ -3299,7 +3305,7 @@ static void sub_81063A8(u8 taskId) } } -void sub_81064F8(u8 taskId) +void AnimTask_ScaryFace(u8 taskId) { struct BattleAnimBgData animBg; @@ -3324,10 +3330,10 @@ void sub_81064F8(u8 taskId) AnimLoadCompressedBgGfx(animBg.bgId, gUnknown_08C249F8, animBg.tilesOffset); LoadCompressedPalette(gUnknown_08C249D0, animBg.paletteId * 16, 32); - gTasks[taskId].func = sub_81065EC; + gTasks[taskId].func = ScaryFace_Step; } -static void sub_81065EC(u8 taskId) +static void ScaryFace_Step(u8 taskId) { struct BattleAnimBgData animBg; @@ -3456,7 +3462,7 @@ static void AnimOrbitScatterStep(struct Sprite *sprite) DestroyAnimSprite(sprite); } -static void sub_8106914(struct Sprite *sprite) +static void AnimSpitUpOrb_Step(struct Sprite *sprite) { sprite->pos2.x += sprite->data[0]; sprite->pos2.y += sprite->data[1]; @@ -3464,14 +3470,14 @@ static void sub_8106914(struct Sprite *sprite) DestroyAnimSprite(sprite); } -void sub_8106944(struct Sprite *sprite) +void AnimSpitUpOrb(struct Sprite *sprite) { sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3); sprite->data[0] = Sin(gBattleAnimArgs[0], 10); sprite->data[1] = Cos(gBattleAnimArgs[0], 7); sprite->data[2] = gBattleAnimArgs[1]; - sprite->callback = sub_8106914; + sprite->callback = AnimSpitUpOrb_Step; } static void sub_810699C(struct Sprite *sprite) @@ -3480,13 +3486,13 @@ static void sub_810699C(struct Sprite *sprite) DestroyAnimSprite(sprite); } -void sub_81069B8(struct Sprite *sprite) +void AnimEyeSparkle(struct Sprite *sprite) { InitSpritePosToAnimAttacker(sprite, TRUE); sprite->callback = sub_810699C; } -void sub_81069D0(struct Sprite *sprite) +void AnimAngel(struct Sprite *sprite) { s16 var0; if (!sprite->data[0]) @@ -3524,7 +3530,7 @@ static void sub_8106A64(struct Sprite *sprite) DestroyAnimSprite(sprite); } -void sub_8106AD0(struct Sprite *sprite) +void AnimPinkHeart(struct Sprite *sprite) { if (sprite->data[0] == 0) { @@ -3550,7 +3556,7 @@ void sub_8106AD0(struct Sprite *sprite) } } -void sub_8106B54(struct Sprite *sprite) +void AnimDevil(struct Sprite *sprite) { if (sprite->data[3] == 0) { @@ -3579,7 +3585,7 @@ void sub_8106B54(struct Sprite *sprite) DestroyAnimSprite(sprite); } -void sub_8106C80(struct Sprite *sprite) +void AnimFurySwipes(struct Sprite *sprite) { if (sprite->data[0] == 0) { @@ -3594,7 +3600,7 @@ void sub_8106C80(struct Sprite *sprite) } } -void sub_8106CD0(struct Sprite *sprite) +void AnimMovmentWaves(struct Sprite *sprite) { if (!gBattleAnimArgs[2]) { @@ -3621,11 +3627,11 @@ void sub_8106CD0(struct Sprite *sprite) sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = gBattleAnimArgs[1]; StartSpriteAnim(sprite, sprite->data[1]); - sprite->callback = sub_8106D5C; + sprite->callback = AnimMovmentWaves_Step; } } -static void sub_8106D5C(struct Sprite *sprite) +static void AnimMovmentWaves_Step(struct Sprite *sprite) { if (sprite->animEnded) { @@ -3636,21 +3642,21 @@ static void sub_8106D5C(struct Sprite *sprite) } } -void sub_8106D90(u8 taskId) +void AnimTask_UproarDistortion(u8 taskId) { u8 spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]); PrepareAffineAnimInTaskData(&gTasks[taskId], spriteId, gUnknown_08593B98); - gTasks[taskId].func = sub_8106DD4; + gTasks[taskId].func = UproarDistortion_Step; } -static void sub_8106DD4(u8 taskId) +static void UproarDistortion_Step(u8 taskId) { if (!RunAffineAnimFromTaskData(&gTasks[taskId])) DestroyAnimVisualTask(taskId); } -void sub_8106E00(struct Sprite *sprite) +void AnimJaggedMusicNote(struct Sprite *sprite) { int var1; u8 battler = !gBattleAnimArgs[0] ? gBattleAnimAttacker : gBattleAnimTarget; @@ -3675,10 +3681,10 @@ void sub_8106E00(struct Sprite *sprite) sprite->data[4] = var1 >> 3; sprite->oam.tileNum += gBattleAnimArgs[3] * 16; - sprite->callback = sub_8106EC8; + sprite->callback = AnimJaggedMusicNote_Step; } -static void sub_8106EC8(struct Sprite *sprite) +static void AnimJaggedMusicNote_Step(struct Sprite *sprite) { sprite->data[1] += sprite->data[3]; sprite->data[2] += sprite->data[4]; @@ -3688,7 +3694,7 @@ static void sub_8106EC8(struct Sprite *sprite) DestroyAnimSprite(sprite); } -void sub_8106F00(struct Sprite *sprite) +void AnimPerishSongMusicNote2(struct Sprite *sprite) { if (!sprite->data[0]) { @@ -3703,7 +3709,7 @@ void sub_8106F00(struct Sprite *sprite) DestroyAnimSprite(sprite); } -void sub_8106F60(struct Sprite *sprite) +void AnimPerishSongMusicNote(struct Sprite *sprite) { int index; int var2; @@ -3733,7 +3739,7 @@ void sub_8106F60(struct Sprite *sprite) if (sprite->data[0] > sprite->data[5]) { - sprite->callback = sub_8107018; + sprite->callback = AnimPerishSongMusicNote_Step1; sprite->data[0] = 0; SetSpritePrimaryCoordsFromSecondaryCoords(sprite); @@ -3745,16 +3751,16 @@ void sub_8106F60(struct Sprite *sprite) } } -static void sub_8107018(struct Sprite *sprite) +static void AnimPerishSongMusicNote_Step1(struct Sprite *sprite) { if (++sprite->data[0] > 10) { sprite->data[0] = 0; - sprite->callback = sub_810703C; + sprite->callback = AnimPerishSongMusicNote_Step2; } } -static void sub_810703C(struct Sprite *sprite) +static void AnimPerishSongMusicNote_Step2(struct Sprite *sprite) { sprite->data[3] += sprite->data[2]; sprite->pos2.y = sprite->data[3]; @@ -3780,7 +3786,7 @@ static void sub_810703C(struct Sprite *sprite) } } -void sub_81070AC(struct Sprite *sprite) +void AnimGuardRing(struct Sprite *sprite) { if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker))) { diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index 4981a3d2c..772ef6182 100755 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -24,7 +24,7 @@ #include "constants/species.h" #include "constants/weather.h" -extern const struct SpriteTemplate gUnknown_08593114; +extern const struct SpriteTemplate gThoughtBubbleSpriteTemplate; void sub_815A0D4(struct Sprite *); void sub_815A1B0(struct Sprite *); @@ -63,7 +63,7 @@ void AnimForesightMagnifyingGlass(struct Sprite *); void AnimMeteorMashStar(struct Sprite *); void AnimBlockX(struct Sprite *); void sub_815FE80(struct Sprite *); -void sub_81061C4(struct Sprite *); +void AnimParticuleBurst(struct Sprite *); void AnimKnockOffStrike(struct Sprite *); void AnimRecycle(struct Sprite *); static void sub_815A114(struct Sprite *); @@ -144,7 +144,7 @@ const struct SpriteTemplate gUnknown_085CE020 = .anims = gUnknown_085CE01C, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A77C8, + .callback = AnimSpriteOnMonPos, }; const struct SpriteTemplate gUnknown_085CE038 = @@ -166,7 +166,7 @@ const struct SpriteTemplate gUnknown_085CE050 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A78AC, + .callback = AnimThrowProjectile, }; const union AnimCmd gUnknown_085CE068[] = @@ -190,7 +190,7 @@ const struct SpriteTemplate gUnknown_085CE07C = .anims = gUnknown_085CE078, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A77C8, + .callback = AnimSpriteOnMonPos, }; const struct SpriteTemplate gUnknown_085CE094 = @@ -502,7 +502,7 @@ const struct SpriteTemplate gUnknown_085CE338 = .anims = gUnknown_085CE334, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A77C8, + .callback = AnimSpriteOnMonPos, }; const union AffineAnimCmd gUnknown_085CE350[] = @@ -1079,7 +1079,7 @@ const struct SpriteTemplate gUnknown_085CE8F4 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_81061C4, + .callback = AnimParticuleBurst, }; const struct SpriteTemplate gBlockXSpriteTemplate = @@ -1929,7 +1929,7 @@ static void sub_815B054(u8 taskId) } y = task->data[3] + task->data[5]; - spriteId = CreateSprite(&gUnknown_08593114, x, y, 6 - task->data[1]); + spriteId = CreateSprite(&gThoughtBubbleSpriteTemplate, x, y, 6 - task->data[1]); PlaySE12WithPanning(SE_W118, BattleAnimAdjustPanning(-64)); if (spriteId != MAX_SPRITES) @@ -1982,7 +1982,7 @@ static void sub_815B054(u8 taskId) case 4: for (i = 0, j = 0; i < MAX_SPRITES; i++) { - if (gSprites[i].template == &gUnknown_08593114) + if (gSprites[i].template == &gThoughtBubbleSpriteTemplate) { gSprites[i].data[0] = taskId; gSprites[i].data[1] = 6; diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c index 1b4434a09..ea5184c53 100644 --- a/src/battle_anim_mons.c +++ b/src/battle_anim_mons.c @@ -30,7 +30,7 @@ extern const struct OamData gOamData_AffineNormal_ObjNormal_64x64; static void sub_80A6FB4(struct Sprite *sprite); static void sub_80A7144(struct Sprite *sprite); -static void sub_80A791C(struct Sprite *sprite); +static void AnimThrowProjectile_Step(struct Sprite *sprite); static void sub_80A8DFC(struct Sprite *sprite); static void sub_80A8E88(struct Sprite *sprite); static u16 GetBattlerYDeltaFromSpriteId(u8 spriteId); @@ -1456,7 +1456,7 @@ static u8 GetBattlerAtPosition_(u8 position) return GetBattlerAtPosition(position); } -void sub_80A77C8(struct Sprite *sprite) +void AnimSpriteOnMonPos(struct Sprite *sprite) { bool8 var; @@ -1513,7 +1513,7 @@ void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite) StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); } -void sub_80A78AC(struct Sprite *sprite) +void AnimThrowProjectile(struct Sprite *sprite) { InitSpritePosToAnimAttacker(sprite, 1); if (GetBattlerSide(gBattleAnimAttacker)) @@ -1523,16 +1523,16 @@ void sub_80A78AC(struct Sprite *sprite) sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[3]; sprite->data[5] = gBattleAnimArgs[5]; InitAnimArcTranslation(sprite); - sprite->callback = sub_80A791C; + sprite->callback = AnimThrowProjectile_Step; } -static void sub_80A791C(struct Sprite *sprite) +static void AnimThrowProjectile_Step(struct Sprite *sprite) { if (TranslateAnimHorizontalArc(sprite)) DestroyAnimSprite(sprite); } -void sub_80A7938(struct Sprite *sprite) +void AnimSnoreZ(struct Sprite *sprite) { bool8 r4; u8 battlerId, coordType; diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index 1a0200271..eff2bc3c7 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -36,7 +36,7 @@ static void sub_8117500(u8); static void sub_81175C4(u32, u16); static void sub_81176D8(u8); static void sub_8117A60(u8); -static void sub_8117FD0(u8); +static void ExtremSpeedMoveTarget_Step(u8); const u16 gUnknown_08597418 = RGB(31, 31, 31); @@ -1036,7 +1036,7 @@ void sub_8117F30(u8 taskId) DestroyAnimVisualTask(taskId); } -void sub_8117F60(u8 taskId) +void AnimTask_ExtremeSpeedMoveTarget(u8 taskId) { if (IsContest()) { @@ -1046,12 +1046,12 @@ void sub_8117F60(u8 taskId) { gTasks[taskId].data[0] = gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].invisible; gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].invisible = 1; - gTasks[taskId].func = sub_8117FD0; + gTasks[taskId].func = ExtremSpeedMoveTarget_Step; gAnimVisualTaskCount--; } } -static void sub_8117FD0(u8 taskId) +static void ExtremSpeedMoveTarget_Step(u8 taskId) { if (gBattleAnimArgs[7] == 0x1000) { diff --git a/src/battle_message.c b/src/battle_message.c index 22cdee0b8..80c6f583b 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -874,8 +874,8 @@ const u8 * const gBattleStringsTable[BATTLESTRINGS_COUNT] = [STRINGID_FORFEITEDMATCH - 12] = sText_ForfeitedMatch, [STRINGID_PKMNTRANSFERREDSOMEONESPC - 12] = gText_PkmnTransferredSomeonesPC, [STRINGID_PKMNTRANSFERREDLANETTESPC - 12] = gText_PkmnTransferredLanettesPC, - [STRINGID_PKMNBOXSOMEONESPCFULL - 12] = gText_PkmnBoxSomeonesPCFull, - [STRINGID_PKMNBOXLANETTESPCFULL - 12] = gText_PkmnBoxLanettesPCFull, + [STRINGID_PKMNBOXSOMEONESPCFULL - 12] = gText_PkmnTransferredSomeonesPCBoxFull, + [STRINGID_PKMNBOXLANETTESPCFULL - 12] = gText_PkmnTransferredLanettesPCBoxFull, [STRINGID_TRAINER1WINTEXT - 12] = sText_Trainer1WinText, [STRINGID_TRAINER2WINTEXT - 12] = sText_Trainer2WinText, }; diff --git a/src/battle_setup.c b/src/battle_setup.c index 3c9de6b79..f166c7375 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -72,8 +72,8 @@ static void CB2_EndWildBattle(void); static void CB2_EndScriptedWildBattle(void); static u8 GetWildBattleTransition(void); static u8 GetTrainerBattleTransition(void); -static void sub_80B1218(void); -static void sub_80B1234(void); +static void TryUpdateGymLeaderRematchFromWild(void); +static void TryUpdateGymLeaderRematchFromTrainer(void); static void CB2_GiveStarter(void); static void CB2_StartFirstBattle(void); static void CB2_EndFirstBattle(void); @@ -395,8 +395,8 @@ static void DoStandardWildBattle(void) CreateBattleStartTask(GetWildBattleTransition(), 0); IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); - sub_80EECC8(); - sub_80B1218(); + IncrementDailyWildBattles(); + TryUpdateGymLeaderRematchFromWild(); } void BattleSetup_StartRoamerBattle(void) @@ -409,8 +409,8 @@ void BattleSetup_StartRoamerBattle(void) CreateBattleStartTask(GetWildBattleTransition(), 0); IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); - sub_80EECC8(); - sub_80B1218(); + IncrementDailyWildBattles(); + TryUpdateGymLeaderRematchFromWild(); } static void DoSafariBattle(void) @@ -433,8 +433,8 @@ static void DoBattlePikeWildBattle(void) CreateBattleStartTask(GetWildBattleTransition(), 0); IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); - sub_80EECC8(); - sub_80B1218(); + IncrementDailyWildBattles(); + TryUpdateGymLeaderRematchFromWild(); } static void DoTrainerBattle(void) @@ -442,7 +442,7 @@ static void DoTrainerBattle(void) CreateBattleStartTask(GetTrainerBattleTransition(), 0); IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_TRAINER_BATTLES); - sub_80B1234(); + TryUpdateGymLeaderRematchFromTrainer(); } static void sub_80B0828(void) @@ -454,7 +454,7 @@ static void sub_80B0828(void) IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_TRAINER_BATTLES); - sub_80B1234(); + TryUpdateGymLeaderRematchFromTrainer(); } // Initiates battle where Wally catches Ralts @@ -475,8 +475,8 @@ void BattleSetup_StartScriptedWildBattle(void) CreateBattleStartTask(GetWildBattleTransition(), 0); IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); - sub_80EECC8(); - sub_80B1218(); + IncrementDailyWildBattles(); + TryUpdateGymLeaderRematchFromWild(); } void BattleSetup_StartLatiBattle(void) @@ -487,8 +487,8 @@ void BattleSetup_StartLatiBattle(void) CreateBattleStartTask(GetWildBattleTransition(), 0); IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); - sub_80EECC8(); - sub_80B1218(); + IncrementDailyWildBattles(); + TryUpdateGymLeaderRematchFromWild(); } void BattleSetup_StartLegendaryBattle(void) @@ -526,8 +526,8 @@ void BattleSetup_StartLegendaryBattle(void) IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); - sub_80EECC8(); - sub_80B1218(); + IncrementDailyWildBattles(); + TryUpdateGymLeaderRematchFromWild(); } void StartGroudonKyogreBattle(void) @@ -543,8 +543,8 @@ void StartGroudonKyogreBattle(void) IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); - sub_80EECC8(); - sub_80B1218(); + IncrementDailyWildBattles(); + TryUpdateGymLeaderRematchFromWild(); } void StartRegiBattle(void) @@ -576,8 +576,8 @@ void StartRegiBattle(void) IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); - sub_80EECC8(); - sub_80B1218(); + IncrementDailyWildBattles(); + TryUpdateGymLeaderRematchFromWild(); } static void CB2_EndWildBattle(void) @@ -919,8 +919,8 @@ static void CB2_StartFirstBattle(void) ClearPoisonStepCounter(); IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); - sub_80EECC8(); - sub_80B1218(); + IncrementDailyWildBattles(); + TryUpdateGymLeaderRematchFromWild(); } } @@ -930,13 +930,13 @@ static void CB2_EndFirstBattle(void) SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } -static void sub_80B1218(void) +static void TryUpdateGymLeaderRematchFromWild(void) { if (GetGameStat(GAME_STAT_WILD_BATTLES) % 60 == 0) UpdateGymLeaderRematch(); } -static void sub_80B1234(void) +static void TryUpdateGymLeaderRematchFromTrainer(void) { if (GetGameStat(GAME_STAT_TRAINER_BATTLES) % 20 == 0) UpdateGymLeaderRematch(); diff --git a/src/berry_blender.c b/src/berry_blender.c index 435e508f6..b4874c3b1 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -3339,7 +3339,7 @@ static bool8 Blender_PrintBlendingResults(void) TryAddContestLinkTvShow(&pokeblock, &sBerryBlenderData->tvBlender); CreateTask(sub_8083F3C, 6); - sub_80EECEC(); + IncrementDailyBerryBlender(); RemoveBagItem(gSpecialVar_ItemId, 1); AddPokeblock(&pokeblock); diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h index 0b8aa79b2..661539d57 100755 --- a/src/data/field_event_obj/event_object_graphics_info_pointers.h +++ b/src/data/field_event_obj/event_object_graphics_info_pointers.h @@ -489,11 +489,11 @@ const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = }; const struct EventObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = { - &gEventObjectGraphicsInfo_Bard, - &gEventObjectGraphicsInfo_Hipster, - &gEventObjectGraphicsInfo_Trader, - &gEventObjectGraphicsInfo_Storyteller, - &gEventObjectGraphicsInfo_Giddy, - &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1, - &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2, + [MAUVILLE_MAN_BARD] = &gEventObjectGraphicsInfo_Bard, + [MAUVILLE_MAN_HIPSTER] = &gEventObjectGraphicsInfo_Hipster, + [MAUVILLE_MAN_TRADER] = &gEventObjectGraphicsInfo_Trader, + [MAUVILLE_MAN_STORYTELLER] = &gEventObjectGraphicsInfo_Storyteller, + [MAUVILLE_MAN_GIDDY] = &gEventObjectGraphicsInfo_Giddy, + [MAUVILLE_MAN_UNUSED1] = &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1, + [MAUVILLE_MAN_UNUSED2] = &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2, }; diff --git a/src/easy_chat.c b/src/easy_chat.c index 827b47085..05f51ed4e 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -31,6 +31,7 @@ #include "constants/event_objects.h" #include "constants/flags.h" #include "constants/lilycove_lady.h" +#include "constants/mauville_old_man.h" #include "constants/songs.h" #include "constants/species.h" #include "constants/rgb.h" @@ -220,7 +221,7 @@ static void sub_811E0EC(s8, s8); static void sub_811E1A4(s8, s8); static void sub_811E2DC(struct Sprite *); static void sub_811E34C(u8, u8); -static bool8 sub_811F0F8(void); +static bool8 EasyChatIsNationalPokedexEnabled(void); static u16 sub_811F108(void); static void sub_811F2D4(void); static void sub_811F46C(void); @@ -1263,7 +1264,7 @@ void ShowEasyChatScreen(void) break; case EASY_CHAT_TYPE_BARD_SONG: bard = &gSaveBlock1Ptr->oldMan.bard; - for (i = 0; i < 6; i ++) + for (i = 0; i < BARD_SONG_LENGTH; i ++) bard->temporaryLyrics[i] = bard->songLyrics[i]; words = bard->temporaryLyrics; @@ -4809,7 +4810,7 @@ static void sub_811E948(void) PutWindowTilemap(windowId); } -static bool8 sub_811EA28(u8 groupId) +static bool8 IsEasyChatGroupUnlocked(u8 groupId) { switch (groupId) { @@ -4820,7 +4821,7 @@ static bool8 sub_811EA28(u8 groupId) case EC_GROUP_MOVE_2: return FlagGet(FLAG_SYS_GAME_CLEAR); case EC_GROUP_POKEMON_2: - return sub_811F0F8(); + return EasyChatIsNationalPokedexEnabled(); default: return TRUE; } @@ -4831,7 +4832,7 @@ u16 EasyChat_GetNumWordsInGroup(u8 groupId) if (groupId == EC_GROUP_POKEMON) return GetNationalPokedexCount(FLAG_GET_SEEN); - if (sub_811EA28(groupId)) + if (IsEasyChatGroupUnlocked(groupId)) return gEasyChatGroups[groupId].numEnabledWords; return 0; @@ -5071,7 +5072,7 @@ u16 sub_811EE38(u16 groupId) u16 sub_811EE90(u16 groupId) { - if (!sub_811EA28(groupId)) + if (!IsEasyChatGroupUnlocked(groupId)) return 0xFFFF; if (groupId == EC_GROUP_POKEMON) @@ -5129,16 +5130,16 @@ void sub_811EF6C(void) CopyEasyChatWord(gStringVar2, easyChatWord); } -static bool8 sub_811EF98(u8 additionalPhraseId) +static bool8 IsAdditionalPhraseUnlocked(u8 additionalPhraseId) { int byteOffset = additionalPhraseId / 8; int shift = additionalPhraseId % 8; return (gSaveBlock1Ptr->additionalPhrases[byteOffset] >> shift) & 1; } -void sub_811EFC0(u8 additionalPhraseId) +void UnlockAdditionalPhrase(u8 additionalPhraseId) { - if (additionalPhraseId < 33) + if (additionalPhraseId < NUM_ADDITIONAL_PHRASES) { int byteOffset = additionalPhraseId / 8; int shift = additionalPhraseId % 8; @@ -5146,32 +5147,32 @@ void sub_811EFC0(u8 additionalPhraseId) } } -u8 sub_811EFF0(void) +static u8 GetNumAdditionalPhrasesUnlocked(void) { u8 i; u8 numAdditionalPhrasesUnlocked; - for (i = 0, numAdditionalPhrasesUnlocked = 0; i < 33; i++) + for (i = 0, numAdditionalPhrasesUnlocked = 0; i < NUM_ADDITIONAL_PHRASES; i++) { - if (sub_811EF98(i)) + if (IsAdditionalPhraseUnlocked(i)) numAdditionalPhrasesUnlocked++; } return numAdditionalPhrasesUnlocked; } -u16 sub_811F01C(void) +u16 GetNewHipsterPhraseToTeach(void) { u16 i; u16 additionalPhraseId; - u8 numAdditionalPhrasesUnlocked = sub_811EFF0(); - if (numAdditionalPhrasesUnlocked == 33) + u8 numAdditionalPhrasesUnlocked = GetNumAdditionalPhrasesUnlocked(); + if (numAdditionalPhrasesUnlocked == NUM_ADDITIONAL_PHRASES) return 0xFFFF; - additionalPhraseId = Random() % (33 - numAdditionalPhrasesUnlocked); - for (i = 0; i < 33; i++) + additionalPhraseId = Random() % (NUM_ADDITIONAL_PHRASES - numAdditionalPhrasesUnlocked); + for (i = 0; i < NUM_ADDITIONAL_PHRASES; i++) { - if (!sub_811EF98(i)) + if (!IsAdditionalPhraseUnlocked(i)) { if (additionalPhraseId) { @@ -5179,7 +5180,7 @@ u16 sub_811F01C(void) } else { - sub_811EFC0(i); + UnlockAdditionalPhrase(i); return EC_WORD(EC_GROUP_TRENDY_SAYING, i); } } @@ -5188,17 +5189,18 @@ u16 sub_811F01C(void) return 0xFFFF; } -u16 sub_811F090(void) +// Unused +u16 GetRandomTaughtHipsterPhrase(void) { u16 i; - u16 additionalPhraseId = sub_811EFF0(); + u16 additionalPhraseId = GetNumAdditionalPhrasesUnlocked(); if (additionalPhraseId == 0) return 0xFFFF; additionalPhraseId = Random() % additionalPhraseId; - for (i = 0; i < 33; i++) + for (i = 0; i < NUM_ADDITIONAL_PHRASES; i++) { - if (sub_811EF98(i)) + if (IsAdditionalPhraseUnlocked(i)) { if (additionalPhraseId) additionalPhraseId--; @@ -5210,7 +5212,7 @@ u16 sub_811F090(void) return 0xFFFF; } -static bool8 sub_811F0F8(void) +static bool8 EasyChatIsNationalPokedexEnabled(void) { return IsNationalPokedexEnabled(); } @@ -5497,7 +5499,7 @@ static bool8 sub_811F764(u16 wordIndex, u8 groupId) case EC_GROUP_MOVE_2: return TRUE; case EC_GROUP_TRENDY_SAYING: - return sub_811EF98(wordIndex); + return IsAdditionalPhraseUnlocked(wordIndex); default: return gEasyChatGroups[groupId].wordData.words[wordIndex].enabled; } @@ -5545,7 +5547,7 @@ bool32 sub_811F8D8(int easyChatWord) int groupId = EC_GROUP(easyChatWord); int mask = 0x7F; int index = EC_INDEX(easyChatWord); - if (!sub_811EA28(groupId & mask)) + if (!IsEasyChatGroupUnlocked(groupId & mask)) return FALSE; else return sub_811F764(index, groupId & mask); diff --git a/src/event_object_movement.c b/src/event_object_movement.c index b3daaad67..c746f08b1 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -26,6 +26,7 @@ #include "constants/event_objects.h" #include "constants/field_effects.h" #include "constants/items.h" +#include "constants/mauville_old_man.h" // this file was known as evobjmv.c in Game Freak's original source diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 9a0388ae0..85c3f13ae 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -223,8 +223,8 @@ static bool8 TryStartInteractionScript(struct MapPosition *position, u16 metatil return FALSE; // Don't play interaction sound for certain scripts. - if (script != EventScript_PlayerPCMale - && script != EventScript_PlayerPCFemale + if (script != LittlerootTown_BrendansHouse_2F_EventScript_PC + && script != LittlerootTown_MaysHouse_2F_EventScript_PC && script != SecretBase_EventScript_PC && script != SecretBase_EventScript_RecordMixingPC && script != SecretBase_EventScript_DollInteract @@ -738,7 +738,7 @@ static bool8 TryStartWarpEventScript(struct MapPosition *position, u16 metatileB } if (MetatileBehavior_IsMossdeepGymWarp(metatileBehavior) == TRUE) { - sub_80AF87C(); + DoMossdeepGymWarp(); return TRUE; } DoWarp(); diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 3fbeec6e3..e05950be0 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -556,7 +556,7 @@ void sub_80AF848(void) gFieldCallback = sub_80AF3E8; } -void sub_80AF87C(void) +void DoMossdeepGymWarp(void) { sub_8085540(1); ScriptContext2_Enable(); diff --git a/src/field_special_scene.c b/src/field_special_scene.c index dbf68e1a2..231f4dd42 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -302,7 +302,7 @@ void Task_HandlePorthole(u8 taskId) } break; case EXIT_PORTHOLE: // exit porthole. - FlagClear(FLAG_SPECIAL_FLAG_0x4001); + FlagClear(FLAG_DONT_TRANSITION_MUSIC); FlagClear(FLAG_HIDE_MAP_NAME_POPUP); SetWarpDestinationToDynamicWarp(0); DoDiveWarp(); @@ -339,7 +339,7 @@ void sub_80FB768(void) void sub_80FB7A4(void) { FlagSet(FLAG_SYS_CRUISE_MODE); - FlagSet(FLAG_SPECIAL_FLAG_0x4001); + FlagSet(FLAG_DONT_TRANSITION_MUSIC); FlagSet(FLAG_HIDE_MAP_NAME_POPUP); SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); sub_80FB59C(); diff --git a/src/field_specials.c b/src/field_specials.c index b3b0fe893..b631d5fdc 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -70,8 +70,8 @@ EWRAM_DATA bool8 gBikeCyclingChallenge = FALSE; EWRAM_DATA u8 gBikeCollisions = 0; static EWRAM_DATA u32 sBikeCyclingTimer = 0; -static EWRAM_DATA u8 sUnknown_0203AB5C = 0; -static EWRAM_DATA u8 sPetalburgGymSlidingDoorFrameCounter = 0; +static EWRAM_DATA u8 sSlidingDoorNextFrameCounter = 0; +static EWRAM_DATA u8 sSlidingDoorFrame = 0; static EWRAM_DATA u8 sTutorMoveAndElevatorWindowId = 0; static EWRAM_DATA u16 sLilycoveDeptStore_NeverRead = 0; static EWRAM_DATA u16 sLilycoveDeptStore_DefaultFloorChoice = 0; @@ -97,8 +97,8 @@ u16 GetNumMovedLilycoveFanClubMembers(void); static void RecordCyclingRoadResults(u32, u8); static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum); -static void Task_PetalburgGym(u8); -static void PetalburgGymFunc(u8, u16); +static void Task_PetalburgGymSlideOpenRoomDoors(u8 taskId); +static void PetalburgGymSetDoorMetatiles(u8 roomNumber, u16 metatileId); static void Task_PCTurnOnEffect(u8); static void PCTurnOnEffect_0(struct Task *); static void PCTurnOnEffect_1(s16, s8, s8); @@ -811,7 +811,7 @@ void MauvilleGymDeactivatePuzzle(void) } } -static const u8 gUnknown_085B2B78[] = {0, 1, 1, 1, 1}; +static const bool8 sSlidingDoorNextFrameDelay[] = {0, 1, 1, 1, 1}; static const u16 sPetalburgGymSlidingDoorMetatiles[] = { METATILE_ID(PetalburgGym, SlidingDoor_Frame0), @@ -821,21 +821,21 @@ static const u16 sPetalburgGymSlidingDoorMetatiles[] = { METATILE_ID(PetalburgGym, SlidingDoor_Frame4), }; -void PetalburgGymSpecial1(void) +void PetalburgGymSlideOpenRoomDoors(void) { - sUnknown_0203AB5C = 0; - sPetalburgGymSlidingDoorFrameCounter = 0; + sSlidingDoorNextFrameCounter = 0; + sSlidingDoorFrame = 0; PlaySE(SE_KI_GASYAN); - CreateTask(Task_PetalburgGym, 8); + CreateTask(Task_PetalburgGymSlideOpenRoomDoors, 8); } -static void Task_PetalburgGym(u8 taskId) +static void Task_PetalburgGymSlideOpenRoomDoors(u8 taskId) { - if (gUnknown_085B2B78[sPetalburgGymSlidingDoorFrameCounter] == sUnknown_0203AB5C) + if (sSlidingDoorNextFrameDelay[sSlidingDoorFrame] == sSlidingDoorNextFrameCounter) { - PetalburgGymFunc(gSpecialVar_0x8004, sPetalburgGymSlidingDoorMetatiles[sPetalburgGymSlidingDoorFrameCounter]); - sUnknown_0203AB5C = 0; - if ((++sPetalburgGymSlidingDoorFrameCounter) == ARRAY_COUNT(sPetalburgGymSlidingDoorMetatiles)) + PetalburgGymSetDoorMetatiles(gSpecialVar_0x8004, sPetalburgGymSlidingDoorMetatiles[sSlidingDoorFrame]); + sSlidingDoorNextFrameCounter = 0; + if ((++sSlidingDoorFrame) == ARRAY_COUNT(sPetalburgGymSlidingDoorMetatiles)) { DestroyTask(taskId); EnableBothScriptContexts(); @@ -843,11 +843,11 @@ static void Task_PetalburgGym(u8 taskId) } else { - sUnknown_0203AB5C++; + sSlidingDoorNextFrameCounter++; } } -static void PetalburgGymFunc(u8 roomNumber, u16 metatileId) +static void PetalburgGymSetDoorMetatiles(u8 roomNumber, u16 metatileId) { u16 doorCoordsX[4]; u16 doorCoordsY[4]; @@ -912,9 +912,9 @@ static void PetalburgGymFunc(u8 roomNumber, u16 metatileId) DrawWholeMapView(); } -void PetalburgGymSpecial2(void) +void PetalburgGymUnlockRoomDoors(void) { - PetalburgGymFunc(gSpecialVar_0x8004, sPetalburgGymSlidingDoorMetatiles[4]); + PetalburgGymSetDoorMetatiles(gSpecialVar_0x8004, sPetalburgGymSlidingDoorMetatiles[4]); } void ShowFieldMessageStringVar4(void) @@ -974,7 +974,7 @@ void CableCarWarp(void) } } -void SetFlagInVar(void) +void SetHiddenItemFlag(void) { FlagSet(gSpecialVar_0x8004); } diff --git a/src/field_tasks.c b/src/field_tasks.c index 63539e475..21b2732c3 100644 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -16,6 +16,7 @@ #include "secret_base.h" #include "sound.h" #include "task.h" +#include "constants/field_tasks.h" #include "constants/items.h" #include "constants/songs.h" #include "constants/vars.h" @@ -38,14 +39,14 @@ static void Task_MuddySlope(u8 taskId); static const TaskFunc sPerStepCallbacks[] = { - DummyPerStepCallback, - AshGrassPerStepCallback, - FortreeBridgePerStepCallback, - PacifidlogBridgePerStepCallback, - SootopolisGymIcePerStepCallback, - EndTruckSequence, - SecretBasePerStepCallback, - CrackedFloorPerStepCallback + [STEP_CB_DUMMY] = DummyPerStepCallback, + [STEP_CB_ASH] = AshGrassPerStepCallback, + [STEP_CB_FORTREE_BRIDGE] = FortreeBridgePerStepCallback, + [STEP_CB_PACIFIDLOG_BRIDGE] = PacifidlogBridgePerStepCallback, + [STEP_CB_SOOTOPOLIS_ICE] = SootopolisGymIcePerStepCallback, + [STEP_CB_TRUCK] = EndTruckSequence, + [STEP_CB_SECRET_BASE] = SecretBasePerStepCallback, + [STEP_CB_CRACKED_FLOOR] = CrackedFloorPerStepCallback }; // they are in pairs but declared as 1D array diff --git a/src/fight.c b/src/fight.c index 8be5bba9a..0c4b5a3fa 100644 --- a/src/fight.c +++ b/src/fight.c @@ -433,7 +433,7 @@ void sub_810CE68(struct Sprite *sprite) StartSpriteAnim(sprite, gBattleAnimArgs[6]); gBattleAnimArgs[6] = 0; - sub_80A7938(sprite); + AnimSnoreZ(sprite); } void sub_810CEB4(struct Sprite *sprite) diff --git a/src/fire.c b/src/fire.c index 60d13bf04..2a12c26cc 100644 --- a/src/fire.c +++ b/src/fire.c @@ -622,7 +622,7 @@ static void AnimEmberFlare(struct Sprite *sprite) || gBattleAnimAttacker == GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT))) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; - sprite->callback = sub_80A7938; + sprite->callback = AnimSnoreZ; sprite->callback(sprite); } @@ -631,7 +631,7 @@ static void sub_8109200(struct Sprite *sprite) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; gBattleAnimArgs[2] = -gBattleAnimArgs[2]; - sprite->callback = sub_80A7938; + sprite->callback = AnimSnoreZ; } // Animates the a fire sprite in the first-half of the MOVE_FIRE_BLAST diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index a2457307b..fedf38cf5 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -26,8 +26,8 @@ struct FlashStruct }; // static functions -static void hm2_flash(void); -static void sub_81371B4(void); +static void FieldCallback_Flash(void); +static void FldEff_UseFlash(void); static bool8 sub_8137304(void); static void sub_81373F0(void); static void sub_8137404(u8 taskId); @@ -86,26 +86,26 @@ bool8 SetUpFieldMove_Flash(void) else if (gMapHeader.cave == TRUE && !FlagGet(FLAG_SYS_USE_FLASH)) { gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; - gPostMenuFieldCallback = hm2_flash; + gPostMenuFieldCallback = FieldCallback_Flash; return TRUE; } return FALSE; } -static void hm2_flash(void) +static void FieldCallback_Flash(void) { u8 taskId = oei_task_add(); gFieldEffectArguments[0] = GetCursorSelectionMonId(); - gTasks[taskId].data[8] = (uintptr_t)sub_81371B4 >> 16; - gTasks[taskId].data[9] = (uintptr_t)sub_81371B4; + gTasks[taskId].data[8] = (uintptr_t)FldEff_UseFlash >> 16; + gTasks[taskId].data[9] = (uintptr_t)FldEff_UseFlash; } -static void sub_81371B4(void) +static void FldEff_UseFlash(void) { PlaySE(SE_W115); FlagSet(FLAG_SYS_USE_FLASH); - ScriptContext1_SetupScript(EventScript_2926F8); + ScriptContext1_SetupScript(EventScript_FldEffFlash); } static void sub_81371D4(void) diff --git a/src/frontier_util.c b/src/frontier_util.c index 94a6186b9..37840f834 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -1889,11 +1889,11 @@ static void sub_81A3B64(void) points = gSaveBlock2Ptr->frontier.field_EBA; points += gUnknown_086118B4[challengeNum][facility][battleMode]; - sub_80EED60(gUnknown_086118B4[challengeNum][facility][battleMode]); + IncrementDailyBattlePoints(gUnknown_086118B4[challengeNum][facility][battleMode]); if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN) { points += 10; - sub_80EED60(10); + IncrementDailyBattlePoints(10); } if (points > 0xFFFF) points = 0xFFFF; diff --git a/src/item_menu.c b/src/item_menu.c index 46f53c352..2814aa5b9 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -1652,7 +1652,7 @@ void ItemMenu_UseOutOfBattle(u8 taskId) if (gBagPositionStruct.pocket != BERRIES_POCKET) ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId); else - sub_80FDD10(taskId); + ItemUseOutOfBattle_Berry(taskId); } } } diff --git a/src/item_use.c b/src/item_use.c index d4be505e1..95eee3634 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -43,9 +43,9 @@ #include "constants/vars.h" #include "event_obj_lock.h" -extern u8 BerryTree_EventScript_274482[]; -extern u8 BerryTree_EventScript_2744C0[]; -extern u8 BattleFrontier_OutsideEast_EventScript_242CFC[]; +extern u8 BerryTree_EventScript_ItemUsePlantBerry[]; +extern u8 BerryTree_EventScript_ItemUseWailmerPail[]; +extern u8 BattleFrontier_OutsideEast_EventScript_WaterSudowoodo[]; void SetUpItemUseCallback(u8 taskId); void MapPostLoadHook_UseItem(void); @@ -61,9 +61,9 @@ void sub_80FDA94(u8 taskId); void sub_80FDADC(u8 taskId); void sub_80FD7C8(u8 taskId); void sub_80FDC00(u8 taskId); -void sub_80FDD74(u8 taskId); -void sub_80FDE08(u8 taskId); -void sub_80FDE7C(u8 taskId); +void ItemUseOnFieldCB_Berry(u8 taskId); +void ItemUseOnFieldCB_WailmerPailBerry(u8 taskId); +void ItemUseOnFieldCB_WailmerPailSudowoodo(u8 taskId); static void BootUpSoundTMHM(u8 taskId); static void Task_ShowTMHMContainedMessage(u8 taskId); static void UseTMHMYesNo(u8 taskId); @@ -81,7 +81,7 @@ u8 sub_80FD9B0(s16 a, s16 b); void sub_80FDA24(u8 a); void sub_80FD8E0(u8 taskId, s16 x, s16 y); void sub_80FDBEC(void); -bool8 sub_80FDE2C(void); +bool8 TryToWaterSudowoodo(void); void ItemUseOutOfBattle_CannotUse(u8 taskId); // EWRAM variables @@ -651,11 +651,11 @@ void ItemUseOutOfBattle_PowderJar(u8 taskId) } } -void sub_80FDD10(u8 taskId) +void ItemUseOutOfBattle_Berry(u8 taskId) { if (IsPlayerFacingEmptyBerryTreePatch() == TRUE) { - gUnknown_0203A0F4 = sub_80FDD74; + gUnknown_0203A0F4 = ItemUseOnFieldCB_Berry; gFieldCallback = MapPostLoadHook_UseItem; gBagMenu->mainCallback2 = CB2_ReturnToField; unknown_ItemMenu_Confirm(taskId); @@ -666,24 +666,24 @@ void sub_80FDD10(u8 taskId) } } -void sub_80FDD74(u8 taskId) +void ItemUseOnFieldCB_Berry(u8 taskId) { RemoveBagItem(gSpecialVar_ItemId, 1); ScriptContext2_Enable(); - ScriptContext1_SetupScript(BerryTree_EventScript_274482); + ScriptContext1_SetupScript(BerryTree_EventScript_ItemUsePlantBerry); DestroyTask(taskId); } void ItemUseOutOfBattle_WailmerPail(u8 taskId) { - if (sub_80FDE2C() == TRUE) + if (TryToWaterSudowoodo() == TRUE) { - gUnknown_0203A0F4 = sub_80FDE7C; + gUnknown_0203A0F4 = ItemUseOnFieldCB_WailmerPailSudowoodo; SetUpItemUseOnFieldCallback(taskId); } else if (TryToWaterBerryTree() == TRUE) { - gUnknown_0203A0F4 = sub_80FDE08; + gUnknown_0203A0F4 = ItemUseOnFieldCB_WailmerPailBerry; SetUpItemUseOnFieldCallback(taskId); } else @@ -692,14 +692,14 @@ void ItemUseOutOfBattle_WailmerPail(u8 taskId) } } -void sub_80FDE08(u8 taskId) +void ItemUseOnFieldCB_WailmerPailBerry(u8 taskId) { ScriptContext2_Enable(); - ScriptContext1_SetupScript(BerryTree_EventScript_2744C0); + ScriptContext1_SetupScript(BerryTree_EventScript_ItemUseWailmerPail); DestroyTask(taskId); } -bool8 sub_80FDE2C(void) +bool8 TryToWaterSudowoodo(void) { u16 x, y; u8 z; @@ -707,16 +707,16 @@ bool8 sub_80FDE2C(void) GetXYCoordsOneStepInFrontOfPlayer(&x, &y); z = PlayerGetZCoord(); objId = GetEventObjectIdByXYZ(x, y, z); - if (objId == 16 || gEventObjects[objId].graphicsId != 0xE4) + if (objId == EVENT_OBJECTS_COUNT || gEventObjects[objId].graphicsId != EVENT_OBJ_GFX_SUDOWOODO) return FALSE; else return TRUE; } -void sub_80FDE7C(u8 taskId) +void ItemUseOnFieldCB_WailmerPailSudowoodo(u8 taskId) { ScriptContext2_Enable(); - ScriptContext1_SetupScript(BattleFrontier_OutsideEast_EventScript_242CFC); + ScriptContext1_SetupScript(BattleFrontier_OutsideEast_EventScript_WaterSudowoodo); DestroyTask(taskId); } diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index f55dd2b8b..add48efd8 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -22,6 +22,7 @@ #include "field_message_box.h" #include "script_menu.h" #include "trader.h" +#include "constants/mauville_old_man.h" #define CHAR_SONG_WORD_SEPARATOR 0x37 @@ -41,7 +42,7 @@ static EWRAM_DATA u16 sUnknownBardRelated = 0; static EWRAM_DATA struct MauvilleManStoryteller * sStorytellerPtr = NULL; static EWRAM_DATA u8 sStorytellerWindowId = 0; -static const u16 sDefaultBardSongLyrics[6] = { +static const u16 sDefaultBardSongLyrics[BARD_SONG_LENGTH] = { EC_WORD_SHAKE, EC_WORD_IT, EC_WORD_DO, @@ -80,7 +81,7 @@ static void SetupBard(void) bard->id = MAUVILLE_MAN_BARD; bard->hasChangedSong = FALSE; bard->language = gGameLanguage; - for (i = 0; i < 6; i++) + for (i = 0; i < BARD_SONG_LENGTH; i++) bard->songLyrics[i] = sDefaultBardSongLyrics[i]; } @@ -166,10 +167,10 @@ void ScrSpecial_SaveBardSongLyrics(void) StringCopy(bard->playerName, gSaveBlock2Ptr->playerName); - for (i = 0; i < 4; i++) + for (i = 0; i < TRAINER_ID_LENGTH; i++) bard->playerTrainerId[i] = gSaveBlock2Ptr->playerTrainerId[i]; - for (i = 0; i < 6; i++) + for (i = 0; i < BARD_SONG_LENGTH; i++) bard->songLyrics[i] = bard->temporaryLyrics[i]; bard->hasChangedSong = TRUE; @@ -248,15 +249,15 @@ void ScrSpecial_SetHipsterSpokenFlag(void) void ScrSpecial_HipsterTeachWord(void) { - u16 var = sub_811F01C(); + u16 phrase = GetNewHipsterPhraseToTeach(); - if (var == 0xFFFF) + if (phrase == 0xFFFF) { gSpecialVar_Result = FALSE; } else { - CopyEasyChatWord(gStringVar1, var); + CopyEasyChatWord(gStringVar1, phrase); gSpecialVar_Result = TRUE; } } @@ -458,7 +459,7 @@ static void BardSing(struct Task *task, struct BardSong *song) lyrics = bard->songLyrics; else lyrics = bard->temporaryLyrics; - for (i = 0; i < 6; i++) + for (i = 0; i < BARD_SONG_LENGTH; i++) song->lyrics[i] = lyrics[i]; song->currWord = 0; } @@ -683,14 +684,14 @@ void ScrSpecial_SetMauvilleOldManEventObjGfx(void) void sub_8120B70(union OldMan * oldMan) { s32 i; - u8 sp00[8]; + u8 playerName[PLAYER_NAME_LENGTH + 1]; switch (oldMan->common.id) { case MAUVILLE_MAN_TRADER: { struct MauvilleOldManTrader * trader = &oldMan->trader; - for (i = 0; i < 4; i++) + for (i = 0; i < NUM_TRADER_ITEMS; i++) { if (trader->language[i] == LANGUAGE_JAPANESE) { @@ -702,17 +703,17 @@ void sub_8120B70(union OldMan * oldMan) case MAUVILLE_MAN_STORYTELLER: { struct MauvilleManStoryteller * storyteller = &oldMan->storyteller; - for (i = 0; i < 4; i++) + for (i = 0; i < NUM_STORYTELLER_TALES; i++) { if (storyteller->gameStatIDs[i] != 0) { - memcpy(sp00, storyteller->trainerNames[i], 7); - sp00[7] = EOS; - if (IsStringJapanese(sp00)) + memcpy(playerName, storyteller->trainerNames[i], PLAYER_NAME_LENGTH); + playerName[PLAYER_NAME_LENGTH] = EOS; + if (IsStringJapanese(playerName)) { - memset(sp00, CHAR_SPACE, 8); - StringCopy(sp00, gText_Friend); - memcpy(storyteller->trainerNames[i], sp00, 7); + memset(playerName, CHAR_SPACE, PLAYER_NAME_LENGTH + 1); + StringCopy(playerName, gText_Friend); + memcpy(storyteller->trainerNames[i], playerName, PLAYER_NAME_LENGTH); storyteller->language[i] = GAME_LANGUAGE; } } @@ -732,7 +733,7 @@ void sub_8120C0C(union OldMan * oldMan, u32 r8, u32 r7, u32 r3) { struct MauvilleOldManTrader * trader = &oldMan->trader; - for (i = 0; i < 4; i++) + for (i = 0; i < NUM_TRADER_ITEMS; i++) { if (IsStringJapanese(trader->playerNames[i])) { @@ -749,7 +750,7 @@ void sub_8120C0C(union OldMan * oldMan, u32 r8, u32 r7, u32 r3) { struct MauvilleManStoryteller * storyteller = &oldMan->storyteller; - for (i = 0; i < 4; i++) + for (i = 0; i < NUM_STORYTELLER_TALES; i++) { if (IsStringJapanese(storyteller->trainerNames[i])) { @@ -797,19 +798,19 @@ void sub_8120C0C(union OldMan * oldMan, u32 r8, u32 r7, u32 r3) void SanitizeReceivedEmeraldOldMan(union OldMan * oldMan, u32 version, u32 language) { - u8 sp00[8]; + u8 playerName[PLAYER_NAME_LENGTH + 1]; s32 i; if (oldMan->common.id == MAUVILLE_MAN_STORYTELLER && language == LANGUAGE_JAPANESE) { struct MauvilleManStoryteller * storyteller = &oldMan->storyteller; - for (i = 0; i < 4; i++) + for (i = 0; i < NUM_STORYTELLER_TALES; i++) { if (storyteller->gameStatIDs[i] != 0) { - memcpy(sp00, storyteller->trainerNames[i], 7); - sp00[7] = EOS; - if (IsStringJapanese(sp00)) + memcpy(playerName, storyteller->trainerNames[i], PLAYER_NAME_LENGTH); + playerName[PLAYER_NAME_LENGTH] = EOS; + if (IsStringJapanese(playerName)) storyteller->language[i] = LANGUAGE_JAPANESE; else storyteller->language[i] = GAME_LANGUAGE; @@ -831,7 +832,7 @@ void SanitizeReceivedRubyOldMan(union OldMan * oldMan, u32 version, u32 language if (isRuby) { - for (i = 0; i < 4; i++) + for (i = 0; i < NUM_TRADER_ITEMS; i++) { u8 * str = trader->playerNames[i]; if (str[0] == EXT_CTRL_CODE_BEGIN && str[1] == EXT_CTRL_CODE_JPN) @@ -845,7 +846,7 @@ void SanitizeReceivedRubyOldMan(union OldMan * oldMan, u32 version, u32 language } else { - for (i = 0; i < 4; i++) + for (i = 0; i < NUM_TRADER_ITEMS; i++) { if (trader->language[i] == LANGUAGE_JAPANESE) { @@ -863,7 +864,7 @@ void SanitizeReceivedRubyOldMan(union OldMan * oldMan, u32 version, u32 language if (isRuby) { - for (i = 0; i < 4; i++) + for (i = 0; i < NUM_STORYTELLER_TALES; i++) { if (storyteller->gameStatIDs[i] != 0) storyteller->language[i] = language; @@ -914,42 +915,223 @@ struct Story }; static const struct Story sStorytellerStories[] = { - {GAME_STAT_NUM_UNION_ROOM_BATTLES, 1, MauvilleCity_PokemonCenter_1F_Text_28E930, MauvilleCity_PokemonCenter_1F_Text_28E947, MauvilleCity_PokemonCenter_1F_Text_28E956}, - {GAME_STAT_STARTED_TRENDS, 1, MauvilleCity_PokemonCenter_1F_Text_28E9D7, MauvilleCity_PokemonCenter_1F_Text_28E9EF, MauvilleCity_PokemonCenter_1F_Text_28E9FE}, - {GAME_STAT_PLANTED_BERRIES, 1, MauvilleCity_PokemonCenter_1F_Text_28EA7D, MauvilleCity_PokemonCenter_1F_Text_28EA98, MauvilleCity_PokemonCenter_1F_Text_28EAA8}, - {GAME_STAT_TRADED_BIKES, 1, MauvilleCity_PokemonCenter_1F_Text_28EB19, MauvilleCity_PokemonCenter_1F_Text_28EB31, MauvilleCity_PokemonCenter_1F_Text_28EB3E}, - {GAME_STAT_GOT_INTERVIEWED, 1, MauvilleCity_PokemonCenter_1F_Text_28EBB5, MauvilleCity_PokemonCenter_1F_Text_28EBCD, MauvilleCity_PokemonCenter_1F_Text_28EBDD}, - {GAME_STAT_TRAINER_BATTLES, 1, MauvilleCity_PokemonCenter_1F_Text_28EC60, MauvilleCity_PokemonCenter_1F_Text_28EC79, MauvilleCity_PokemonCenter_1F_Text_28EC81}, - {GAME_STAT_POKEMON_CAPTURES, 1, MauvilleCity_PokemonCenter_1F_Text_28ED04, MauvilleCity_PokemonCenter_1F_Text_28ED21, MauvilleCity_PokemonCenter_1F_Text_28ED30}, - {GAME_STAT_FISHING_CAPTURES, 1, MauvilleCity_PokemonCenter_1F_Text_28EDA1, MauvilleCity_PokemonCenter_1F_Text_28EDB5, MauvilleCity_PokemonCenter_1F_Text_28EDCF}, - {GAME_STAT_HATCHED_EGGS, 1, MauvilleCity_PokemonCenter_1F_Text_28EE45, MauvilleCity_PokemonCenter_1F_Text_28EE5D, MauvilleCity_PokemonCenter_1F_Text_28EE6A}, - {GAME_STAT_EVOLVED_POKEMON, 1, MauvilleCity_PokemonCenter_1F_Text_28EEDD, MauvilleCity_PokemonCenter_1F_Text_28EEF1, MauvilleCity_PokemonCenter_1F_Text_28EF01}, - {GAME_STAT_USED_POKECENTER, 1, MauvilleCity_PokemonCenter_1F_Text_28EF73, MauvilleCity_PokemonCenter_1F_Text_28EF95, MauvilleCity_PokemonCenter_1F_Text_28EFAA}, - {GAME_STAT_RESTED_AT_HOME, 1, MauvilleCity_PokemonCenter_1F_Text_28F045, MauvilleCity_PokemonCenter_1F_Text_28F05A, MauvilleCity_PokemonCenter_1F_Text_28F071}, - {GAME_STAT_ENTERED_SAFARI_ZONE, 1, MauvilleCity_PokemonCenter_1F_Text_28F0F3, MauvilleCity_PokemonCenter_1F_Text_28F10D, MauvilleCity_PokemonCenter_1F_Text_28F125}, - {GAME_STAT_USED_CUT, 1, MauvilleCity_PokemonCenter_1F_Text_28F1BE, MauvilleCity_PokemonCenter_1F_Text_28F1D5, MauvilleCity_PokemonCenter_1F_Text_28F1DE}, - {GAME_STAT_USED_ROCK_SMASH, 1, MauvilleCity_PokemonCenter_1F_Text_28F24F, MauvilleCity_PokemonCenter_1F_Text_28F269, MauvilleCity_PokemonCenter_1F_Text_28F277}, - {GAME_STAT_MOVED_SECRET_BASE, 1, MauvilleCity_PokemonCenter_1F_Text_28F2FC, MauvilleCity_PokemonCenter_1F_Text_28F314, MauvilleCity_PokemonCenter_1F_Text_28F32A}, - {GAME_STAT_USED_SPLASH, 1, MauvilleCity_PokemonCenter_1F_Text_28F3AD, MauvilleCity_PokemonCenter_1F_Text_28F3C6, MauvilleCity_PokemonCenter_1F_Text_28F3D2}, - {GAME_STAT_USED_STRUGGLE, 1, MauvilleCity_PokemonCenter_1F_Text_28F44B, MauvilleCity_PokemonCenter_1F_Text_28F461, MauvilleCity_PokemonCenter_1F_Text_28F47C}, - {GAME_STAT_SLOT_JACKPOTS, 1, MauvilleCity_PokemonCenter_1F_Text_28F50C, MauvilleCity_PokemonCenter_1F_Text_28F51B, MauvilleCity_PokemonCenter_1F_Text_28F538}, - {GAME_STAT_CONSECUTIVE_ROULETTE_WINS, 2, MauvilleCity_PokemonCenter_1F_Text_28F5BE, MauvilleCity_PokemonCenter_1F_Text_28F5D1, MauvilleCity_PokemonCenter_1F_Text_28F5F2}, - {GAME_STAT_ENTERED_BATTLE_TOWER, 1, MauvilleCity_PokemonCenter_1F_Text_28F678, MauvilleCity_PokemonCenter_1F_Text_28F694, MauvilleCity_PokemonCenter_1F_Text_28F6B4}, - {GAME_STAT_POKEBLOCKS, 1, MauvilleCity_PokemonCenter_1F_Text_28F751, MauvilleCity_PokemonCenter_1F_Text_28F76A, MauvilleCity_PokemonCenter_1F_Text_28F776}, - {GAME_STAT_ENTERED_CONTEST, 1, MauvilleCity_PokemonCenter_1F_Text_28F7F6, MauvilleCity_PokemonCenter_1F_Text_28F811, MauvilleCity_PokemonCenter_1F_Text_28F822}, - {GAME_STAT_WON_CONTEST, 1, MauvilleCity_PokemonCenter_1F_Text_28F89C, MauvilleCity_PokemonCenter_1F_Text_28F8AF, MauvilleCity_PokemonCenter_1F_Text_28F8BC}, - {GAME_STAT_SHOPPED, 1, MauvilleCity_PokemonCenter_1F_Text_28F92F, MauvilleCity_PokemonCenter_1F_Text_28F941, MauvilleCity_PokemonCenter_1F_Text_28F949}, - {GAME_STAT_USED_ITEMFINDER, 1, MauvilleCity_PokemonCenter_1F_Text_28F9D1, MauvilleCity_PokemonCenter_1F_Text_28F9EA, MauvilleCity_PokemonCenter_1F_Text_28F9FD}, - {GAME_STAT_GOT_RAINED_ON, 1, MauvilleCity_PokemonCenter_1F_Text_28FA81, MauvilleCity_PokemonCenter_1F_Text_28FA99, MauvilleCity_PokemonCenter_1F_Text_28FAA7}, - {GAME_STAT_CHECKED_POKEDEX, 1, MauvilleCity_PokemonCenter_1F_Text_28FB1D, MauvilleCity_PokemonCenter_1F_Text_28FB35, MauvilleCity_PokemonCenter_1F_Text_28FB47}, - {GAME_STAT_RECEIVED_RIBBONS, 1, MauvilleCity_PokemonCenter_1F_Text_28FBC4, MauvilleCity_PokemonCenter_1F_Text_28FBD9, MauvilleCity_PokemonCenter_1F_Text_28FBEA}, - {GAME_STAT_JUMPED_DOWN_LEDGES, 1, MauvilleCity_PokemonCenter_1F_Text_28FC6B, MauvilleCity_PokemonCenter_1F_Text_28FC85, MauvilleCity_PokemonCenter_1F_Text_28FC98}, - {GAME_STAT_WATCHED_TV, 1, MauvilleCity_PokemonCenter_1F_Text_28FD1D, MauvilleCity_PokemonCenter_1F_Text_28FD35, MauvilleCity_PokemonCenter_1F_Text_28FD40}, - {GAME_STAT_CHECKED_CLOCK, 1, MauvilleCity_PokemonCenter_1F_Text_28FDA2, MauvilleCity_PokemonCenter_1F_Text_28FDBD, MauvilleCity_PokemonCenter_1F_Text_28FDCE}, - {GAME_STAT_WON_POKEMON_LOTTERY, 1, MauvilleCity_PokemonCenter_1F_Text_28FE57, MauvilleCity_PokemonCenter_1F_Text_28FE72, MauvilleCity_PokemonCenter_1F_Text_28FE88}, - {GAME_STAT_USED_DAYCARE, 1, MauvilleCity_PokemonCenter_1F_Text_28FF0C, MauvilleCity_PokemonCenter_1F_Text_28FF27, MauvilleCity_PokemonCenter_1F_Text_28FF44}, - {GAME_STAT_RODE_CABLE_CAR, 1, MauvilleCity_PokemonCenter_1F_Text_28FFDD, MauvilleCity_PokemonCenter_1F_Text_28FFFA, MauvilleCity_PokemonCenter_1F_Text_29000D}, - {GAME_STAT_ENTERED_HOT_SPRINGS, 1, MauvilleCity_PokemonCenter_1F_Text_290097, MauvilleCity_PokemonCenter_1F_Text_2900B5, MauvilleCity_PokemonCenter_1F_Text_2900CB} + // The 50 below is replaced with GAME_STAT_SAVED_GAME + { + 50, 1, + MauvilleCity_PokemonCenter_1F_Text_SavedGameTitle, + MauvilleCity_PokemonCenter_1F_Text_SavedGameAction, + MauvilleCity_PokemonCenter_1F_Text_SavedGameStory + }, + { + GAME_STAT_STARTED_TRENDS, 1, + MauvilleCity_PokemonCenter_1F_Text_TrendsStartedTitle, + MauvilleCity_PokemonCenter_1F_Text_TrendsStartedAction, + MauvilleCity_PokemonCenter_1F_Text_TrendsStartedStory + }, + { + GAME_STAT_PLANTED_BERRIES, 1, + MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedTitle, + MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedAction, + MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedStory + }, + { + GAME_STAT_TRADED_BIKES, 1, + MauvilleCity_PokemonCenter_1F_Text_BikeTradesTitle, + MauvilleCity_PokemonCenter_1F_Text_BikeTradesAction, + MauvilleCity_PokemonCenter_1F_Text_BikeTradesStory + }, + { + GAME_STAT_GOT_INTERVIEWED, 1, + MauvilleCity_PokemonCenter_1F_Text_InterviewsTitle, + MauvilleCity_PokemonCenter_1F_Text_InterviewsAction, + MauvilleCity_PokemonCenter_1F_Text_InterviewsStory + }, + { + GAME_STAT_TRAINER_BATTLES, 1, + MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesTitle, + MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesAction, + MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesStory + }, + { + GAME_STAT_POKEMON_CAPTURES, 1, + MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtTitle, + MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtAction, + MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtStory + }, + { + GAME_STAT_FISHING_CAPTURES, 1, + MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtTitle, + MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtAction, + MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtStory + }, + { + GAME_STAT_HATCHED_EGGS, 1, + MauvilleCity_PokemonCenter_1F_Text_EggsHatchedTitle, + MauvilleCity_PokemonCenter_1F_Text_EggsHatchedAction, + MauvilleCity_PokemonCenter_1F_Text_EggsHatchedStory + }, + { + GAME_STAT_EVOLVED_POKEMON, 1, + MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedTitle, + MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedAction, + MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedStory + }, + { + GAME_STAT_USED_POKECENTER, 1, + MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterTitle, + MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterAction, + MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterStory + }, + { + GAME_STAT_RESTED_AT_HOME, 1, + MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeTitle, + MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeAction, + MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeStory + }, + { + GAME_STAT_ENTERED_SAFARI_ZONE, 1, + MauvilleCity_PokemonCenter_1F_Text_SafariGamesTitle, + MauvilleCity_PokemonCenter_1F_Text_SafariGamesAction, + MauvilleCity_PokemonCenter_1F_Text_SafariGamesStory + }, + { + GAME_STAT_USED_CUT, 1, + MauvilleCity_PokemonCenter_1F_Text_UsedCutTitle, + MauvilleCity_PokemonCenter_1F_Text_UsedCutAction, + MauvilleCity_PokemonCenter_1F_Text_UsedCutStory + }, + { + GAME_STAT_USED_ROCK_SMASH, 1, + MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashTitle, + MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashAction, + MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashStory + }, + { + GAME_STAT_MOVED_SECRET_BASE, 1, + MauvilleCity_PokemonCenter_1F_Text_MovedBasesTitle, + MauvilleCity_PokemonCenter_1F_Text_MovedBasesAction, + MauvilleCity_PokemonCenter_1F_Text_MovedBasesStory + }, + { + GAME_STAT_USED_SPLASH, 1, + MauvilleCity_PokemonCenter_1F_Text_UsedSplashTitle, + MauvilleCity_PokemonCenter_1F_Text_UsedSplashAction, + MauvilleCity_PokemonCenter_1F_Text_UsedSplashStory + }, + { + GAME_STAT_USED_STRUGGLE, 1, + MauvilleCity_PokemonCenter_1F_Text_UsedStruggleTitle, + MauvilleCity_PokemonCenter_1F_Text_UsedStruggleAction, + MauvilleCity_PokemonCenter_1F_Text_UsedStruggleStory + }, + { + GAME_STAT_SLOT_JACKPOTS, 1, + MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsTitle, + MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsAction, + MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsStory + }, + { + GAME_STAT_CONSECUTIVE_ROULETTE_WINS, 2, + MauvilleCity_PokemonCenter_1F_Text_RouletteWinsTitle, + MauvilleCity_PokemonCenter_1F_Text_RouletteWinsAction, + MauvilleCity_PokemonCenter_1F_Text_RouletteWinsStory + }, + { + GAME_STAT_ENTERED_BATTLE_TOWER, 1, + MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesTitle, + MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesAction, + MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesStory + }, + { + GAME_STAT_POKEBLOCKS, 1, + MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksTitle, + MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksAction, + MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksStory + }, + { + GAME_STAT_ENTERED_CONTEST, 1, + MauvilleCity_PokemonCenter_1F_Text_EnteredContestsTitle, + MauvilleCity_PokemonCenter_1F_Text_EnteredContestsAction, + MauvilleCity_PokemonCenter_1F_Text_EnteredContestsStory + }, + { + GAME_STAT_WON_CONTEST, 1, + MauvilleCity_PokemonCenter_1F_Text_WonContestsTitle, + MauvilleCity_PokemonCenter_1F_Text_WonContestsAction, + MauvilleCity_PokemonCenter_1F_Text_WonContestsStory + }, + { + GAME_STAT_SHOPPED, 1, + MauvilleCity_PokemonCenter_1F_Text_TimesShoppedTitle, + MauvilleCity_PokemonCenter_1F_Text_TimesShoppedAction, + MauvilleCity_PokemonCenter_1F_Text_TimesShoppedStory + }, + { + GAME_STAT_USED_ITEMFINDER, 1, + MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderTitle, + MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderAction, + MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderStory + }, + { + GAME_STAT_GOT_RAINED_ON, 1, + MauvilleCity_PokemonCenter_1F_Text_TimesRainedTitle, + MauvilleCity_PokemonCenter_1F_Text_TimesRainedAction, + MauvilleCity_PokemonCenter_1F_Text_TimesRainedStory + }, + { + GAME_STAT_CHECKED_POKEDEX, 1, + MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexTitle, + MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexAction, + MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexStory + }, + { + GAME_STAT_RECEIVED_RIBBONS, 1, + MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsTitle, + MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsAction, + MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsStory + }, + { + GAME_STAT_JUMPED_DOWN_LEDGES, 1, + MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedTitle, + MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedAction, + MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedStory + }, + { + GAME_STAT_WATCHED_TV, 1, + MauvilleCity_PokemonCenter_1F_Text_TVWatchedTitle, + MauvilleCity_PokemonCenter_1F_Text_TVWatchedAction, + MauvilleCity_PokemonCenter_1F_Text_TVWatchedStory + }, + { + GAME_STAT_CHECKED_CLOCK, 1, + MauvilleCity_PokemonCenter_1F_Text_CheckedClockTitle, + MauvilleCity_PokemonCenter_1F_Text_CheckedClockAction, + MauvilleCity_PokemonCenter_1F_Text_CheckedClockStory + }, + { + GAME_STAT_WON_POKEMON_LOTTERY, 1, + MauvilleCity_PokemonCenter_1F_Text_WonLotteryTitle, + MauvilleCity_PokemonCenter_1F_Text_WonLotteryAction, + MauvilleCity_PokemonCenter_1F_Text_WonLotteryStory + }, + { + GAME_STAT_USED_DAYCARE, 1, + MauvilleCity_PokemonCenter_1F_Text_UsedDaycareTitle, + MauvilleCity_PokemonCenter_1F_Text_UsedDaycareAction, + MauvilleCity_PokemonCenter_1F_Text_UsedDaycareStory + }, + { + GAME_STAT_RODE_CABLE_CAR, 1, + MauvilleCity_PokemonCenter_1F_Text_RodeCableCarTitle, + MauvilleCity_PokemonCenter_1F_Text_RodeCableCarAction, + MauvilleCity_PokemonCenter_1F_Text_RodeCableCarStory + }, + { + GAME_STAT_ENTERED_HOT_SPRINGS, 1, + MauvilleCity_PokemonCenter_1F_Text_HotSpringsTitle, + MauvilleCity_PokemonCenter_1F_Text_HotSpringsAction, + MauvilleCity_PokemonCenter_1F_Text_HotSpringsStory + } }; static void StorytellerSetup(void) @@ -959,7 +1141,7 @@ static void StorytellerSetup(void) sStorytellerPtr->id = MAUVILLE_MAN_STORYTELLER; sStorytellerPtr->alreadyRecorded = FALSE; - for (i = 0; i < 4; i++) + for (i = 0; i < NUM_STORYTELLER_TALES; i++) { sStorytellerPtr->gameStatIDs[i] = 0; sStorytellerPtr->trainerNames[0][i] = EOS; // Maybe they meant storyteller->trainerNames[i][0] instead? @@ -977,7 +1159,7 @@ static void Storyteller_ResetFlag(void) static u32 StorytellerGetGameStat(u8 stat) { if (stat == 50) - stat = 0; + stat = GAME_STAT_SAVED_GAME; return GetGameStat(stat); } @@ -985,12 +1167,12 @@ static const struct Story *GetStoryByStat(u32 stat) { s32 i; - for (i = 0; i < 36; i++) + for (i = 0; i < (int)ARRAY_COUNT(sStorytellerStories); i++) { if (sStorytellerStories[i].stat == stat) return &sStorytellerStories[i]; } - return &sStorytellerStories[35]; + return &sStorytellerStories[ARRAY_COUNT(sStorytellerStories) - 1]; } static const u8 *GetStoryTitleByStat(u32 stat) @@ -1012,7 +1194,7 @@ static u8 GetFreeStorySlot(void) { u8 i; - for (i = 0; i < 4; i++) + for (i = 0; i < NUM_STORYTELLER_TALES; i++) { if (sStorytellerPtr->gameStatIDs[i] == 0) break; @@ -1049,15 +1231,15 @@ static void GetStoryByStattellerPlayerName(u32 player, void *dst) { u8 *name = sStorytellerPtr->trainerNames[player]; - memset(dst, EOS, 8); - memcpy(dst, name, 7); + memset(dst, EOS, PLAYER_NAME_LENGTH + 1); + memcpy(dst, name, PLAYER_NAME_LENGTH); } static void StorytellerSetPlayerName(u32 player, const u8 * src) { u8 * name = sStorytellerPtr->trainerNames[player]; - memset(name, EOS, 7); - memcpy(name, src, 7); + memset(name, EOS, PLAYER_NAME_LENGTH); + memcpy(name, src, PLAYER_NAME_LENGTH); } @@ -1110,15 +1292,15 @@ static bool8 StorytellerInitializeRandomStat(void) u8 stat = sStorytellerStories[arr[i]].stat; u8 minVal = sStorytellerStories[arr[i]].minVal; - for (j = 0; j < 4; j++) + for (j = 0; j < NUM_STORYTELLER_TALES; j++) { if (sStorytellerPtr->gameStatIDs[j] == stat) break; } - if (j == 4 && StorytellerGetGameStat(stat) >= minVal) + if (j == NUM_STORYTELLER_TALES && StorytellerGetGameStat(stat) >= minVal) { sStorytellerPtr->alreadyRecorded = TRUE; - if (GetFreeStorySlot() == 4) + if (GetFreeStorySlot() == NUM_STORYTELLER_TALES) StorytellerRecordNewStat(sSelectedStory, stat); else StorytellerRecordNewStat(GetFreeStorySlot(), stat); @@ -1144,7 +1326,7 @@ static void PrintStoryList(void) s32 i; s32 width = GetStringWidth(1, gText_Exit, 0); u8 tileWidth; - for (i = 0; i < 4; i++) + for (i = 0; i < NUM_STORYTELLER_TALES; i++) { s32 curWidth; u16 gameStatID = sStorytellerPtr->gameStatIDs[i]; @@ -1157,7 +1339,7 @@ static void PrintStoryList(void) } sStorytellerWindowId = CreateWindowFromRect(0, 0, ConvertPixelWidthToTileWidth(width), GetFreeStorySlot() * 2 + 2); SetStandardWindowBorderStyle(sStorytellerWindowId, 0); - for (i = 0; i < 4; i++) + for (i = 0; i < NUM_STORYTELLER_TALES; i++) { u16 gameStatID = sStorytellerPtr->gameStatIDs[i]; if (gameStatID == 0) @@ -1169,7 +1351,7 @@ static void PrintStoryList(void) CopyWindowToVram(sStorytellerWindowId, 3); } -static void Task_StoryListMenu(u8 taskId) // Task_StoryListMenu +static void Task_StoryListMenu(u8 taskId) { struct Task *task = &gTasks[taskId]; s32 selection; diff --git a/src/mossdeep_gym.c b/src/mossdeep_gym.c deleted file mode 100644 index bc279334b..000000000 --- a/src/mossdeep_gym.c +++ /dev/null @@ -1,314 +0,0 @@ -#include "global.h" -#include "event_object_movement.h" -#include "fieldmap.h" -#include "malloc.h" -#include "mossdeep_gym.h" -#include "script_movement.h" -#include "constants/event_object_movement_constants.h" -#include "constants/event_objects.h" - -// Movement scripts. -extern const u8 gUnknown_08612698[]; -extern const u8 gUnknown_0861269C[]; -extern const u8 gUnknown_086126A0[]; -extern const u8 gUnknown_086126A4[]; -extern const u8 gUnknown_086126A8[]; -extern const u8 gUnknown_086126AA[]; -extern const u8 gUnknown_086126AC[]; -extern const u8 gUnknown_086126AE[]; - -struct MossdeepSubStruct -{ - u8 unk0; - u8 eventTemplateId; -}; - -struct MossdeepStruct -{ - struct MossdeepSubStruct objects[EVENT_OBJECTS_COUNT]; - u8 count; - bool8 unk41; -}; - -// This file's functions. -static void AddEventObject(u8 eventTemplateId, u8 arg1); -static void sub_81A8D94(u8 eventTemplateId, u8 arg1); - -// EWRAM vars -EWRAM_DATA static struct MossdeepStruct *gUnknown_0203CE50 = NULL; - -// code -void InitMossdeepGymTiles(bool8 arg0) -{ - if (gUnknown_0203CE50 == NULL) - gUnknown_0203CE50 = AllocZeroed(sizeof(*gUnknown_0203CE50)); - - gUnknown_0203CE50->unk41 = arg0; -} - -void FinishMossdeepGymTiles(void) -{ - u8 id; - - if (gUnknown_0203CE50 != NULL) - FREE_AND_SET_NULL(gUnknown_0203CE50); - - id = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[id]); - ScriptMovement_UnfreezeEventObjects(); -} - -u16 MossdeepGym_MoveEvents(u8 arg0) -{ - u8 i; - struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; - u16 localId = 0; - - for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) - { - s32 var; - u8 r5; - s16 x = events[i].x + 7; - s16 y = events[i].y + 7; - u16 metatile = MapGridGetMetatileIdAt(x, y); - - if (!gUnknown_0203CE50->unk41) - var = 0x250; - else - var = 0x298; - - if (metatile < 0x250) - continue; - - if ((u8)((metatile - var) / 8) >= 5) - continue; - if ((u8)((metatile - var) / 8) != arg0) - continue; - - r5 = (u8)((metatile - var) % 8); - if (r5 < 4) - { - s8 x = 0; - s8 y = 0; - const u8 *movementScript; - - switch (r5) - { - case 0: - movementScript = gUnknown_08612698; - x = 1; - break; - case 1: - movementScript = gUnknown_0861269C; - y = 1; - break; - case 2: - movementScript = gUnknown_086126A0; - x = -1; - break; - case 3: - movementScript = gUnknown_086126A4; - y = -1; - break; - default: - continue; - } - - events[i].x += x; - events[i].y += y; - if (GetEventObjectIdByLocalIdAndMap(events[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup) != EVENT_OBJECTS_COUNT) - { - AddEventObject(i, r5); - localId = events[i].localId; - ScriptMovement_StartObjectMovementScript(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, movementScript); - } - else - { - sub_81A8D94(i, r5); - } - } - } - - return localId; -} - -void MossdeepGym_TurnEvents(void) -{ - u8 i; - s32 var; - struct EventObjectTemplate *events; - - if (gUnknown_0203CE50 == NULL) - return; - - if (!gUnknown_0203CE50->unk41) - var = 0x250; - else - var = 0x298; - - events = gSaveBlock1Ptr->eventObjectTemplates; - for (i = 0; i < gUnknown_0203CE50->count; i++) - { - s32 r6; - s8 r0; - u8 eventObjectId; - s16 x = events[gUnknown_0203CE50->objects[i].eventTemplateId].x + 7; - s16 y = events[gUnknown_0203CE50->objects[i].eventTemplateId].y + 7; - u16 metatile = MapGridGetMetatileIdAt(x, y); - - r0 = (u8)((metatile - var) % 8); - r0 -= (gUnknown_0203CE50->objects[i].unk0); - if (r0 < 0 || r0 == 3) - { - if (r0 == -3) - r6 = 1; - else - r6 = 0; - } - else - { - if (r0 > 0) - r6 = 1; - else - r6 = 2; - } - - eventObjectId = GetEventObjectIdByLocalIdAndMap(events[gUnknown_0203CE50->objects[i].eventTemplateId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); - if (eventObjectId != EVENT_OBJECTS_COUNT) - { - const u8 *movementScript; - u8 direction = gEventObjects[eventObjectId].facingDirection; - if (r6 == 0) - { - switch (direction) - { - case DIR_EAST: - movementScript = gUnknown_086126AE; - events[gUnknown_0203CE50->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; - break; - case DIR_SOUTH: - movementScript = gUnknown_086126A8; - events[gUnknown_0203CE50->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; - break; - case DIR_WEST: - movementScript = gUnknown_086126AA; - events[gUnknown_0203CE50->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; - break; - case DIR_NORTH: - movementScript = gUnknown_086126AC; - events[gUnknown_0203CE50->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; - break; - default: - continue; - } - ScriptMovement_StartObjectMovementScript(events[gUnknown_0203CE50->objects[i].eventTemplateId].localId, - gSaveBlock1Ptr->location.mapNum, - gSaveBlock1Ptr->location.mapGroup, - movementScript); - } - else if (r6 == 1) - { - switch (direction) - { - case DIR_EAST: - movementScript = gUnknown_086126AA; - events[gUnknown_0203CE50->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; - break; - case DIR_SOUTH: - movementScript = gUnknown_086126AC; - events[gUnknown_0203CE50->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; - break; - case DIR_WEST: - movementScript = gUnknown_086126AE; - events[gUnknown_0203CE50->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; - break; - case DIR_NORTH: - movementScript = gUnknown_086126A8; - events[gUnknown_0203CE50->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; - break; - default: - continue; - } - ScriptMovement_StartObjectMovementScript(events[gUnknown_0203CE50->objects[i].eventTemplateId].localId, - gSaveBlock1Ptr->location.mapNum, - gSaveBlock1Ptr->location.mapGroup, - movementScript); - } - } - } -} - -static void AddEventObject(u8 eventTemplateId, u8 arg1) -{ - gUnknown_0203CE50->objects[gUnknown_0203CE50->count].eventTemplateId = eventTemplateId; - gUnknown_0203CE50->objects[gUnknown_0203CE50->count].unk0 = arg1; - gUnknown_0203CE50->count++; -} - -static void sub_81A8D94(u8 eventTemplateId, u8 arg1) -{ - s8 r0; - s32 r6; - s32 var; - u16 movementType; - struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; - s16 x = events[eventTemplateId].x + 7; - s16 y = events[eventTemplateId].y + 7; - u16 metatile = MapGridGetMetatileIdAt(x, y); - - if (!gUnknown_0203CE50->unk41) - var = 0x250; - else - var = 0x298; - - r0 = (u8)((metatile - var) % 8); - r0 -= arg1; - if (r0 < 0 || r0 == 3) - r6 = 0; - else if (r0 > 0 || r0 == -3) - r6 = 1; - else - r6 = 2; - - movementType = events[eventTemplateId].movementType; - if (r6 == 0) - { - switch (movementType) - { - case MOVEMENT_TYPE_FACE_RIGHT: - events[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; - break; - case MOVEMENT_TYPE_FACE_DOWN: - events[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; - break; - case MOVEMENT_TYPE_FACE_LEFT: - events[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; - break; - case MOVEMENT_TYPE_FACE_UP: - events[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; - break; - default: - break; - } - } - else if (r6 == 1) - { - switch (movementType) - { - case MOVEMENT_TYPE_FACE_RIGHT: - events[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; - break; - case MOVEMENT_TYPE_FACE_DOWN: - events[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; - break; - case MOVEMENT_TYPE_FACE_LEFT: - events[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; - break; - case MOVEMENT_TYPE_FACE_UP: - events[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; - break; - default: - break; - } - } -} diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c index dba914b51..76f340c60 100644 --- a/src/mystery_event_script.c +++ b/src/mystery_event_script.c @@ -286,7 +286,7 @@ bool8 MEScrCmd_givenationaldex(struct ScriptContext *ctx) bool8 MEScrCmd_addrareword(struct ScriptContext *ctx) { - sub_811EFC0(ScriptReadByte(ctx)); + UnlockAdditionalPhrase(ScriptReadByte(ctx)); StringExpandPlaceholders(gStringVar4, gText_MysteryGiftRareWord); ctx->data[2] = 2; return FALSE; diff --git a/src/naming_screen.c b/src/naming_screen.c index cc73031aa..73eda32c8 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -34,10 +34,6 @@ extern u16 gKeyRepeatStartDelay; // extern text extern const u8 gExpandedPlaceholder_Empty[]; -extern const u8 gText_PkmnTransferredSomeonesPC[]; -extern const u8 gText_PkmnTransferredLanettesPC[]; -extern const u8 gText_PkmnBoxSomeonesPCFull[]; -extern const u8 gText_PkmnBoxLanettesPCFull[]; extern const u8 gText_MoveOkBack[]; extern const u8 gText_YourName[]; extern const u8 gText_BoxName[]; @@ -51,12 +47,12 @@ static const u8 gSpriteImage_858BCB8[] = INCBIN_U8("graphics/naming_screen/pc_ic static const u16 gUnknown_0858BD78[] = INCBIN_U16("graphics/naming_screen/0.gbapal"); static const u16 gUnknown_0858BD98[] = INCBIN_U16("graphics/naming_screen/1.gbapal"); -static const u8 *const gUnknown_0858BDB8[] = +static const u8 *const sTransferredToPCMessages[] = { gText_PkmnTransferredSomeonesPC, gText_PkmnTransferredLanettesPC, - gText_PkmnBoxSomeonesPCFull, - gText_PkmnBoxLanettesPCFull + gText_PkmnTransferredSomeonesPCBoxFull, + gText_PkmnTransferredLanettesPCBoxFull }; static const u8 gUnknown_0858BDC8[] = _("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!"); @@ -562,7 +558,7 @@ static void DisplaySentToPCMessage(void) if (FlagGet(FLAG_SYS_PC_LANETTE)) stringToDisplay++; - StringExpandPlaceholders(gStringVar4, gUnknown_0858BDB8[stringToDisplay]); + StringExpandPlaceholders(gStringVar4, sTransferredToPCMessages[stringToDisplay]); DrawDialogueFrame(0, 0); gTextFlags.canABSpeedUpPrint = TRUE; AddTextPrinterParameterized2(0, 1, gStringVar4, GetPlayerTextSpeedDelay(), 0, 2, 1, 3); diff --git a/src/overworld.c b/src/overworld.c index d796a670f..55afe2fcf 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1183,7 +1183,7 @@ void Overworld_ClearSavedMusic(void) static void sub_8085810(void) { - if (FlagGet(FLAG_SPECIAL_FLAG_0x4001) != TRUE) + if (FlagGet(FLAG_DONT_TRANSITION_MUSIC) != TRUE) { u16 newMusic = GetWarpDestinationMusic(); u16 currentMusic = GetCurrentMapMusic(); @@ -1231,7 +1231,7 @@ void TryFadeOutOldMapMusic(void) { u16 currentMusic = GetCurrentMapMusic(); u16 warpMusic = GetWarpDestinationMusic(); - if (FlagGet(FLAG_SPECIAL_FLAG_0x4001) != TRUE && warpMusic != GetCurrentMapMusic()) + if (FlagGet(FLAG_DONT_TRANSITION_MUSIC) != TRUE && warpMusic != GetCurrentMapMusic()) { if (currentMusic == MUS_NAMINORI && VarGet(VAR_SKY_PILLAR_STATE) == 2 diff --git a/src/player_pc.c b/src/player_pc.c index 0ce8f81f4..94484ab72 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -419,12 +419,12 @@ static void PlayerPC_Decoration(u8 taskId) static void PlayerPC_TurnOff(u8 taskId) { - if (gPcItemMenuOptionsNum == 4) // if the option count is 4, we are at the bedroom PC and not player PC, so do gender specific handling. + if (gPcItemMenuOptionsNum == 4) // if the option count is 4, we are at the bedroom PC, so do gender specific handling. { if (gSaveBlock2Ptr->playerGender == MALE) - ScriptContext1_SetupScript(LittlerootTown_BrendansHouse_2F_EventScript_1F863F); + ScriptContext1_SetupScript(LittlerootTown_BrendansHouse_2F_EventScript_TurnOffPlayerPC); else - ScriptContext1_SetupScript(LittlerootTown_MaysHouse_2F_EventScript_1F958F); + ScriptContext1_SetupScript(LittlerootTown_MaysHouse_2F_EventScript_TurnOffPlayerPC); } else { diff --git a/src/poison.c b/src/poison.c index 4bde59a32..42e7d6a58 100644 --- a/src/poison.c +++ b/src/poison.c @@ -37,7 +37,7 @@ const struct SpriteTemplate gUnknown_08596134 = .anims = gUnknown_08596130, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A77C8, + .callback = AnimSpriteOnMonPos, }; const union AnimCmd gUnknown_0859614C[] = diff --git a/src/psychic.c b/src/psychic.c index de4426bca..7ad8e14cb 100644 --- a/src/psychic.c +++ b/src/psychic.c @@ -49,7 +49,7 @@ const struct SpriteTemplate gUnknown_08596548 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gUnknown_08596544, - .callback = sub_80A77C8, + .callback = AnimSpriteOnMonPos, }; const struct SpriteTemplate gUnknown_08596560 = @@ -378,7 +378,7 @@ const struct SpriteTemplate gUnknown_08596898 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gUnknown_08596894, - .callback = sub_80A77C8, + .callback = AnimSpriteOnMonPos, }; const union AffineAnimCmd gUnknown_085968B0[] = diff --git a/src/record_mixing.c b/src/record_mixing.c index 8df0a8a8b..8a1e8b1ee 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -631,7 +631,7 @@ static void ReceiveOldManData(OldMan *oldMan, size_t recordSize, u8 which) u8 version; u16 language; OldMan *dest; - u32 mixIndices[4]; + u32 mixIndices[MAX_LINK_PLAYERS]; ShufflePlayerIndices(mixIndices); dest = (void *)oldMan + recordSize * mixIndices[which]; diff --git a/src/rotating_tile_puzzle.c b/src/rotating_tile_puzzle.c new file mode 100644 index 000000000..7238ec751 --- /dev/null +++ b/src/rotating_tile_puzzle.c @@ -0,0 +1,338 @@ +#include "global.h" +#include "event_object_movement.h" +#include "fieldmap.h" +#include "malloc.h" +#include "rotating_tile_puzzle.h" +#include "script_movement.h" +#include "constants/event_object_movement_constants.h" +#include "constants/event_objects.h" +#include "constants/metatile_labels.h" + +extern const u8 RotatingTilePuzzle_Movement_ShiftRight[]; +extern const u8 RotatingTilePuzzle_Movement_ShiftDown[]; +extern const u8 RotatingTilePuzzle_Movement_ShiftLeft[]; +extern const u8 RotatingTilePuzzle_Movement_ShiftUp[]; +extern const u8 RotatingTilePuzzle_Movement_FaceRight[]; +extern const u8 RotatingTilePuzzle_Movement_FaceDown[]; +extern const u8 RotatingTilePuzzle_Movement_FaceLeft[]; +extern const u8 RotatingTilePuzzle_Movement_FaceUp[]; + +#define ROTATE_COUNTERCLOCKWISE 0 +#define ROTATE_CLOCKWISE 1 +#define ROTATE_NONE 2 + +struct RotatingTileObject +{ + u8 prevPuzzleTileNum; + u8 eventTemplateId; +}; + +struct RotatingTilePuzzle +{ + struct RotatingTileObject objects[EVENT_OBJECTS_COUNT]; + u8 numObjects; + bool8 isTrickHouse; +}; + +// This file's functions. +static void SaveRotatingTileObject(u8 eventTemplateId, u8 arg1); +static void TurnUnsavedRotatingTileObject(u8 eventTemplateId, u8 arg1); + +// EWRAM vars +EWRAM_DATA static struct RotatingTilePuzzle *sRotatingTilePuzzle = NULL; + +// code +void InitRotatingTilePuzzle(bool8 isTrickHouse) +{ + if (sRotatingTilePuzzle == NULL) + sRotatingTilePuzzle = AllocZeroed(sizeof(*sRotatingTilePuzzle)); + + sRotatingTilePuzzle->isTrickHouse = isTrickHouse; +} + +void FreeRotatingTilePuzzle(void) +{ + u8 id; + + if (sRotatingTilePuzzle != NULL) + FREE_AND_SET_NULL(sRotatingTilePuzzle); + + id = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); + EventObjectClearHeldMovementIfFinished(&gEventObjects[id]); + ScriptMovement_UnfreezeEventObjects(); +} + +u16 MoveRotatingTileObjects(u8 puzzleNumber) +{ + u8 i; + struct EventObjectTemplate *eventObjects = gSaveBlock1Ptr->eventObjectTemplates; + u16 localId = 0; + + for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) + { + s32 puzzleTileStart; + u8 puzzleTileNum; + s16 x = eventObjects[i].x + 7; + s16 y = eventObjects[i].y + 7; + u16 metatile = MapGridGetMetatileIdAt(x, y); + + if (!sRotatingTilePuzzle->isTrickHouse) + puzzleTileStart = METATILE_MossdeepGym_YellowArrow_Right; + else + puzzleTileStart = METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right; + + // Object is on a metatile before the puzzle tile section + // UB: Because this is not if (metatile < puzzleTileStart), for the trick house (metatile - puzzleTileStart) below can result in casting a negative value to u8 + if (metatile < METATILE_MossdeepGym_YellowArrow_Right) + continue; + + // Object is on a metatile after the puzzle tile section (never occurs, in both cases the puzzle tiles are last) + if ((u8)((metatile - puzzleTileStart) / 8) >= 5) + continue; + + // Object is on a metatile in puzzle tile section, but not one of the currently rotating color + if ((u8)((metatile - puzzleTileStart) / 8) != puzzleNumber) + continue; + + puzzleTileNum = (u8)((metatile - puzzleTileStart) % 8); + + // First 4 puzzle tiles are the colored arrows + if (puzzleTileNum < 4) + { + s8 x = 0; + s8 y = 0; + const u8 *movementScript; + + switch (puzzleTileNum) + { + case 0: // Right Arrow + movementScript = RotatingTilePuzzle_Movement_ShiftRight; + x = 1; + break; + case 1: // Down Arrow + movementScript = RotatingTilePuzzle_Movement_ShiftDown; + y = 1; + break; + case 2: // Left Arrow + movementScript = RotatingTilePuzzle_Movement_ShiftLeft; + x = -1; + break; + case 3: // Up Arrow + movementScript = RotatingTilePuzzle_Movement_ShiftUp; + y = -1; + break; + default: + continue; + } + + eventObjects[i].x += x; + eventObjects[i].y += y; + if (GetEventObjectIdByLocalIdAndMap(eventObjects[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup) != EVENT_OBJECTS_COUNT) + { + SaveRotatingTileObject(i, puzzleTileNum); + localId = eventObjects[i].localId; + ScriptMovement_StartObjectMovementScript(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, movementScript); + } + // Never reached in normal gameplay + else + { + TurnUnsavedRotatingTileObject(i, puzzleTileNum); + } + } + } + + return localId; +} + +void TurnRotatingTileObjects(void) +{ + u8 i; + s32 puzzleTileStart; + struct EventObjectTemplate *eventObjects; + + if (sRotatingTilePuzzle == NULL) + return; + + if (!sRotatingTilePuzzle->isTrickHouse) + puzzleTileStart = METATILE_MossdeepGym_YellowArrow_Right; + else + puzzleTileStart = METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right; + + eventObjects = gSaveBlock1Ptr->eventObjectTemplates; + for (i = 0; i < sRotatingTilePuzzle->numObjects; i++) + { + s32 rotation; + s8 tileDifference; + u8 eventObjectId; + s16 x = eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].x + 7; + s16 y = eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].y + 7; + u16 metatile = MapGridGetMetatileIdAt(x, y); + + // NOTE: The following 2 assignments and if else could all be replaced with rotation = ROTATE_COUNTERCLOCKWISE + // For an object to be saved in sRotatingTilePuzzle->objects, it must have been on a colored arrow tile + // After the first assignment, tileDifference will always be a number [0-3] representing which arrow tile the object is on now (0: right, 1: down, 2: left, 3: up) + // prevPuzzleTileNum will similarly be a number [0-3] representing the arrow tile the object just moved from + // All the puzzles are oriented counter-clockwise and can only move 1 step at a time, so the difference between the current tile and the previous tile will always either be -1 or 3 (0-1, 1-2, 2-3, 3-0) + // Which means tileDifference will always either be -1 or 3 after the below subtraction, and rotation will always be ROTATE_COUNTERCLOCKWISE after the following conditionals + tileDifference = (u8)((metatile - puzzleTileStart) % 8); + tileDifference -= (sRotatingTilePuzzle->objects[i].prevPuzzleTileNum); + + // Always true, see above + if (tileDifference < 0 || tileDifference == 3) + { + // Always false, see above + if (tileDifference == -3) + rotation = ROTATE_CLOCKWISE; + else + rotation = ROTATE_COUNTERCLOCKWISE; + } + else + { + if (tileDifference > 0) + rotation = ROTATE_CLOCKWISE; + else + rotation = ROTATE_NONE; + } + + eventObjectId = GetEventObjectIdByLocalIdAndMap(eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + if (eventObjectId != EVENT_OBJECTS_COUNT) + { + const u8 *movementScript; + u8 direction = gEventObjects[eventObjectId].facingDirection; + if (rotation == ROTATE_COUNTERCLOCKWISE) + { + switch (direction) + { + case DIR_EAST: + movementScript = RotatingTilePuzzle_Movement_FaceUp; + eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; + break; + case DIR_SOUTH: + movementScript = RotatingTilePuzzle_Movement_FaceRight; + eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; + break; + case DIR_WEST: + movementScript = RotatingTilePuzzle_Movement_FaceDown; + eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; + break; + case DIR_NORTH: + movementScript = RotatingTilePuzzle_Movement_FaceLeft; + eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; + break; + default: + continue; + } + ScriptMovement_StartObjectMovementScript(eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, + gSaveBlock1Ptr->location.mapNum, + gSaveBlock1Ptr->location.mapGroup, + movementScript); + } + // Never reached + else if (rotation == ROTATE_CLOCKWISE) + { + switch (direction) + { + case DIR_EAST: + movementScript = RotatingTilePuzzle_Movement_FaceDown; + eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; + break; + case DIR_SOUTH: + movementScript = RotatingTilePuzzle_Movement_FaceLeft; + eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; + break; + case DIR_WEST: + movementScript = RotatingTilePuzzle_Movement_FaceUp; + eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; + break; + case DIR_NORTH: + movementScript = RotatingTilePuzzle_Movement_FaceRight; + eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; + break; + default: + continue; + } + ScriptMovement_StartObjectMovementScript(eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, + gSaveBlock1Ptr->location.mapNum, + gSaveBlock1Ptr->location.mapGroup, + movementScript); + } + } + } +} + +static void SaveRotatingTileObject(u8 eventTemplateId, u8 puzzleTileNum) +{ + sRotatingTilePuzzle->objects[sRotatingTilePuzzle->numObjects].eventTemplateId = eventTemplateId; + sRotatingTilePuzzle->objects[sRotatingTilePuzzle->numObjects].prevPuzzleTileNum = puzzleTileNum; + sRotatingTilePuzzle->numObjects++; +} + +// Functionally unused +static void TurnUnsavedRotatingTileObject(u8 eventTemplateId, u8 puzzleTileNum) +{ + s8 tileDifference; + s32 rotation; + s32 puzzleTileStart; + u16 movementType; + struct EventObjectTemplate *eventObjects = gSaveBlock1Ptr->eventObjectTemplates; + s16 x = eventObjects[eventTemplateId].x + 7; + s16 y = eventObjects[eventTemplateId].y + 7; + u16 metatile = MapGridGetMetatileIdAt(x, y); + + if (!sRotatingTilePuzzle->isTrickHouse) + puzzleTileStart = METATILE_MossdeepGym_YellowArrow_Right; + else + puzzleTileStart = METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right; + + tileDifference = (u8)((metatile - puzzleTileStart) % 8); + tileDifference -= puzzleTileNum; + + if (tileDifference < 0 || tileDifference == 3) + rotation = ROTATE_COUNTERCLOCKWISE; + else if (tileDifference > 0 || tileDifference == -3) + rotation = ROTATE_CLOCKWISE; + else + rotation = ROTATE_NONE; + + movementType = eventObjects[eventTemplateId].movementType; + if (rotation == ROTATE_COUNTERCLOCKWISE) + { + switch (movementType) + { + case MOVEMENT_TYPE_FACE_RIGHT: + eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; + break; + case MOVEMENT_TYPE_FACE_DOWN: + eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; + break; + case MOVEMENT_TYPE_FACE_LEFT: + eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; + break; + case MOVEMENT_TYPE_FACE_UP: + eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; + break; + default: + break; + } + } + else if (rotation == ROTATE_CLOCKWISE) + { + switch (movementType) + { + case MOVEMENT_TYPE_FACE_RIGHT: + eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; + break; + case MOVEMENT_TYPE_FACE_DOWN: + eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; + break; + case MOVEMENT_TYPE_FACE_LEFT: + eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; + break; + case MOVEMENT_TYPE_FACE_UP: + eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; + break; + default: + break; + } + } +} diff --git a/src/roulette.c b/src/roulette.c index cddd7366a..26002e773 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -1213,7 +1213,7 @@ static void sub_8140D6C(u8 r0) static void sub_8140F6C(u8 r0) { - sub_80EECA4(); + IncrementDailyRouletteUses(); gUnknown_0203AB88->var28 = 0xFF; if (gUnknown_0203AB88->var19 == 1) gUnknown_0203AB88->var23 = 1; diff --git a/src/safari_zone.c b/src/safari_zone.c index 703c3d0cd..e8827e124 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -23,10 +23,10 @@ struct PokeblockFeeder #define NUM_POKEBLOCK_FEEDERS 10 -extern const u8 EventScript_2A4B8A[]; -extern const u8 EventScript_2A4B6F[]; -extern const u8 EventScript_2A4B4C[]; -extern const u8 EventScript_2A4B9B[]; +extern const u8 SafariZone_EventScript_TimesUp[]; +extern const u8 SafariZone_EventScript_RetirePrompt[]; +extern const u8 SafariZone_EventScript_OutOfBallsMidBattle[]; +extern const u8 SafariZone_EventScript_OutOfBalls[]; EWRAM_DATA u8 gNumSafariBalls = 0; EWRAM_DATA static u16 sSafariZoneStepCounter = 0; @@ -83,7 +83,7 @@ bool8 SafariZoneTakeStep(void) sSafariZoneStepCounter--; if (sSafariZoneStepCounter == 0) { - ScriptContext1_SetupScript(EventScript_2A4B8A); + ScriptContext1_SetupScript(SafariZone_EventScript_TimesUp); return TRUE; } return FALSE; @@ -91,7 +91,7 @@ bool8 SafariZoneTakeStep(void) void SafariZoneRetirePrompt(void) { - ScriptContext1_SetupScript(EventScript_2A4B6F); + ScriptContext1_SetupScript(SafariZone_EventScript_RetirePrompt); } void CB2_EndSafariBattle(void) @@ -105,14 +105,14 @@ void CB2_EndSafariBattle(void) } else if (gBattleOutcome == B_OUTCOME_NO_SAFARI_BALLS) { - ScriptContext2_RunNewScript(EventScript_2A4B4C); + ScriptContext2_RunNewScript(SafariZone_EventScript_OutOfBallsMidBattle); WarpIntoMap(); gFieldCallback = sub_80AF6F0; SetMainCallback2(CB2_LoadMap); } else if (gBattleOutcome == B_OUTCOME_CAUGHT) { - ScriptContext1_SetupScript(EventScript_2A4B9B); + ScriptContext1_SetupScript(SafariZone_EventScript_OutOfBalls); ScriptContext1_Stop(); SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); } diff --git a/src/scrcmd.c b/src/scrcmd.c index 0bec4d35b..62aee337b 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -27,13 +27,13 @@ #include "event_obj_lock.h" #include "menu.h" #include "money.h" -#include "mossdeep_gym.h" #include "mystery_event_script.h" #include "palette.h" #include "party_menu.h" #include "pokemon_storage_system.h" #include "random.h" #include "overworld.h" +#include "rotating_tile_puzzle.h" #include "rtc.h" #include "script.h" #include "script_menu.h" @@ -814,7 +814,7 @@ bool8 ScrCmd_warpteleport(struct ScriptContext *ctx) return TRUE; } -bool8 ScrCmd_warpD7(struct ScriptContext *ctx) +bool8 ScrCmd_warpmossdeepgym(struct ScriptContext *ctx) { u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); @@ -823,7 +823,7 @@ bool8 ScrCmd_warpD7(struct ScriptContext *ctx) u16 y = VarGet(ScriptReadHalfword(ctx)); SetWarpDestination(mapGroup, mapNum, warpId, x, y); - sub_80AF87C(); + DoMossdeepGymWarp(); ResetInitialPlayerAvatarState(); return TRUE; } @@ -2148,31 +2148,31 @@ bool8 ScrCmd_takecoins(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_mossdeepgym1(struct ScriptContext *ctx) +bool8 ScrCmd_moverotatingtileobjects(struct ScriptContext *ctx) { - u16 v1 = VarGet(ScriptReadHalfword(ctx)); + u16 puzzleNumber = VarGet(ScriptReadHalfword(ctx)); - sMovingNpcId = MossdeepGym_MoveEvents(v1); + sMovingNpcId = MoveRotatingTileObjects(puzzleNumber); return FALSE; } -bool8 ScrCmd_mossdeepgym2(struct ScriptContext *ctx) +bool8 ScrCmd_turnrotatingtileobjects(struct ScriptContext *ctx) { - MossdeepGym_TurnEvents(); + TurnRotatingTileObjects(); return FALSE; } -bool8 ScrCmd_mossdeepgym3(struct ScriptContext *ctx) +bool8 ScrCmd_initrotatingtilepuzzle(struct ScriptContext *ctx) { - u16 v1 = VarGet(ScriptReadHalfword(ctx)); + u16 isTrickHouse = VarGet(ScriptReadHalfword(ctx)); - InitMossdeepGymTiles(v1); + InitRotatingTilePuzzle(isTrickHouse); return FALSE; } -bool8 ScrCmd_mossdeepgym4(struct ScriptContext *ctx) +bool8 ScrCmd_freerotatingtilepuzzle(struct ScriptContext *ctx) { - FinishMossdeepGymTiles(); + FreeRotatingTilePuzzle(); return FALSE; } diff --git a/src/slot_machine.c b/src/slot_machine.c index 37071926e..742ec6120 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -1060,7 +1060,7 @@ static bool8 SlotAction9(struct Task *task) ReelTasks_SetUnkTaskData(1); ReelTasks_SetUnkTaskData(2); - sub_80EEC80(); // something with daily slot variable + IncrementDailySlotsUses(); task->data[0] = 0; if (sSlotMachine->luckyFlags & LUCKY_BIAS_REELTIME) diff --git a/src/trader.c b/src/trader.c index a3794a539..e0b780d25 100644 --- a/src/trader.c +++ b/src/trader.c @@ -1,6 +1,6 @@ #include "global.h" #include "constants/decorations.h" -#include "constants/mauville_man.h" +#include "constants/mauville_old_man.h" #include "decoration.h" #include "decoration_inventory.h" #include "event_data.h" @@ -86,7 +86,7 @@ void CreateAvailableDecorationsMenu(u8 taskId) schedule_bg_copy_tilemap_to_vram(0); } -void sub_8133BE4(u8 taskId, u8 decorationId) +void Task_BufferDecorSelectionAndCloseWindow(u8 taskId, u8 decorationId) { s16 * data = gTasks[taskId].data; if (decorationId > NUM_DECORATIONS) @@ -118,14 +118,14 @@ void Task_HandleGetDecorationMenuInput(u8 taskId) case MENU_B_PRESSED: case 4: PlaySE(SE_SELECT); - sub_8133BE4(taskId, 0); + Task_BufferDecorSelectionAndCloseWindow(taskId, 0); break; default: PlaySE(SE_SELECT); gSpecialVar_0x8005 = input; StringCopy(gStringVar1, trader->playerNames[input]); ConvertInternationalString(gStringVar1, trader->language[input]); - sub_8133BE4(taskId, trader->decorIds[input]); + Task_BufferDecorSelectionAndCloseWindow(taskId, trader->decorIds[input]); break; } } @@ -2003,7 +2003,7 @@ void sub_80EDC60(const u16 *words) } } -void sub_80EDCE8(void) +void TryPutTreasureInvestigatorsOnAir(void) { TVShow *show; @@ -2626,37 +2626,37 @@ static void sub_80EEBF4(u8 actionIdx) } } -void sub_80EEC80(void) +void IncrementDailySlotsUses(void) { VarSet(VAR_DAILY_SLOTS, VarGet(VAR_DAILY_SLOTS) + 1); } -void sub_80EECA4(void) +void IncrementDailyRouletteUses(void) { VarSet(VAR_DAILY_ROULETTE, VarGet(VAR_DAILY_ROULETTE) + 1); } -void sub_80EECC8(void) +void IncrementDailyWildBattles(void) { VarSet(VAR_DAILY_WILDS, VarGet(VAR_DAILY_WILDS) + 1); } -void sub_80EECEC(void) +void IncrementDailyBerryBlender(void) { VarSet(VAR_DAILY_BLENDER, VarGet(VAR_DAILY_BLENDER) + 1); } -void sub_80EED10(void) +void IncrementDailyPlantedBerries(void) { VarSet(VAR_DAILY_PLANTED_BERRIES, VarGet(VAR_DAILY_PLANTED_BERRIES) + 1); } -void sub_80EED34(void) +void IncrementDailyPickedBerries(void) { VarSet(VAR_DAILY_PICKED_BERRIES, VarGet(VAR_DAILY_PICKED_BERRIES) + gSpecialVar_0x8006); } -void sub_80EED60(u16 delta) +void IncrementDailyBattlePoints(u16 delta) { VarSet(VAR_DAILY_BP, VarGet(VAR_DAILY_BP) + delta); } diff --git a/src/water.c b/src/water.c index 615dc5c98..a2fe4c56f 100644 --- a/src/water.c +++ b/src/water.c @@ -39,7 +39,7 @@ void sub_8108B94(struct Sprite *); void sub_8108BE0(struct Sprite *); void sub_8108C08(struct Sprite *); void sub_8108C54(struct Sprite *); -void sub_8108CDC(struct Sprite *); +void AnimWaterPulseRing_Step(struct Sprite *); void sub_810756C(u8); void sub_81076F4(u8); void sub_8107B84(u8); @@ -54,7 +54,7 @@ void sub_810871C(struct Task*, u8); void sub_8108AC0(struct Task*); void sub_8108D54(struct Sprite*, int, int); -extern const union AffineAnimCmd *const gUnknown_08593420[]; +extern const union AffineAnimCmd *const gGrowingRingAffineAnimTable[]; extern const union AffineAnimCmd *const gUnknown_08596208[]; extern const union AnimCmd *const gUnknown_08595AB8[]; @@ -257,7 +257,7 @@ const struct SpriteTemplate gUnknown_08595170 = .oam = &gOamData_AffineDouble_ObjNormal_16x32, .anims = gDummySpriteAnimTable, .images = NULL, - .affineAnims = gUnknown_08593420, + .affineAnims = gGrowingRingAffineAnimTable, .callback = sub_81075EC, }; @@ -337,7 +337,7 @@ const struct SpriteTemplate gUnknown_08595208 = .anims = gUnknown_08595200, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A78AC, + .callback = AnimThrowProjectile, }; const struct SpriteTemplate gUnknown_08595220 = @@ -1975,17 +1975,17 @@ void sub_8108C54(struct Sprite *sprite) } } -void sub_8108C94(struct Sprite *sprite) +void AnimWaterPulseRing(struct Sprite *sprite) { InitSpritePosToAnimAttacker(sprite, TRUE); sprite->data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); sprite->data[3] = gBattleAnimArgs[2]; sprite->data[4] = gBattleAnimArgs[3]; - sprite->callback = sub_8108CDC; + sprite->callback = AnimWaterPulseRing_Step; } -void sub_8108CDC(struct Sprite *sprite) +void AnimWaterPulseRing_Step(struct Sprite *sprite) { int xDiff = sprite->data[1] - sprite->pos1.x; int yDiff = sprite->data[2] - sprite->pos1.y; diff --git a/sym_ewram.txt b/sym_ewram.txt index bdbb85d37..79e89fc9b 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -129,7 +129,7 @@ .include "src/match_call.o" .include "src/menu.o" .include "src/battle_factory_screen.o" - .include "src/mossdeep_gym.o" + .include "src/rotating_tile_puzzle.o" .include "src/item_menu.o" .include "src/list_menu.o" .include "src/dynamic_placeholder_text_util.o" |