diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-25 15:03:13 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-25 15:03:13 -0600 |
| commit | d8948a5cda2e385c1d4b5c6190c4fe0fb53359fb (patch) | |
| tree | fa882b0733f88cc17dcbaef8c25c30c7198bdca1 /data | |
| parent | dea41e1a7e6e73789431153d6c28dac3a3a73ac6 (diff) | |
| parent | a54aa03d20dacc88879404b87a5f6a7eb7babc54 (diff) | |
Merge remote-tracking branch 'pret/master' into trade
Diffstat (limited to 'data')
318 files changed, 4582 insertions, 7513 deletions
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 014aa2048..185d18df1 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -3484,7 +3484,7 @@ Move_HAIL: loadspritegfx ANIM_TAG_ICE_CRYSTALS createvisualtask sub_8116620, 10, 1, 3, 0, 6, RGB_BLACK waitforvisualfinish - createvisualtask sub_810C918, 5 + createvisualtask AnimTask_Hail1, 5 loopsewithpan SE_W258, 0, 8, 10 waitforvisualfinish createvisualtask sub_8116620, 10, 1, 3, 6, 0, RGB_BLACK @@ -3956,7 +3956,7 @@ Move_MIST_BALL: createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 1, 1, RGB(23, 16, 31), 16, 0x7FFF, 16 delay 0 playsewithpan SE_W114, 0 - createvisualtask sub_810C324, 5 + createvisualtask AnimTask_LoadMistTiles, 5 createvisualtask sub_8116620, 10, 4, 3, 0, 16, RGB_WHITE delay 8 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 70, 0 @@ -5443,54 +5443,54 @@ SolarBeamSetUp: blendoff goto SolarBeamEnd SolarBeamSetUp1: - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, 40, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, 40, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, -40, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, -40, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 0, 40, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 40, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 0, -40, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, -40, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, -20, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, -20, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, 20, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, 20, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, -20, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, -20, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, 20, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, 20, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -20, 30, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -20, 30, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 20, -30, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 20, -30, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -20, -30, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -20, -30, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 20, 30, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 20, 30, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, 0, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, 0, 16 delay 2 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, 0, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, 0, 16 delay 2 return SolarBeamUnleash: call SetSolarbeamBg panse_1B SE_W076, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 - createvisualtask sub_80FEA58, 5 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 0 + createvisualtask AnimTask_CreateSmallSolarbeamOrbs, 5 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 delay 4 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 1 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1 delay 4 createvisualtask sub_8116620, 10, 4, 1, 0, 10, RGB(25, 31, 0) - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 2 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2 delay 4 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 65, 1 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 3 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3 delay 4 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 4 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4 delay 4 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 5 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5 delay 4 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 6 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6 delay 4 call SolarBeamUnleash1 call SolarBeamUnleash1 @@ -5499,19 +5499,19 @@ SolarBeamUnleash: call UnsetSolarbeamBg goto SolarBeamEnd SolarBeamUnleash1: - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 0 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 delay 4 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 1 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1 delay 4 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 2 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2 delay 4 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 3 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3 delay 4 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 4 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4 delay 4 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 5 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5 delay 4 - createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 6 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6 delay 4 return @@ -5717,28 +5717,28 @@ Move_ABSORB: AbsorbEffect: playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W152, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -20, 35 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -5770,36 +5770,36 @@ Move_MEGA_DRAIN: MegaDrainEffect: playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -20, 35 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W145C, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -20, 35 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -5831,44 +5831,44 @@ Move_GIGA_DRAIN: GigaDrainEffect: playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -40, 35 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -40, 35 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 28, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 40, 39 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 28, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 40, 39 delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -32, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -32, 26 delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -40, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -40, 26 delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 36, 33 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 36, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W202, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -20, 35 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -6749,11 +6749,11 @@ Move_COTTON_SPORE: end CottonSpore1: - createsprite gUnknown_085922EC, ANIM_ATTACKER, 2, 0, -20, 85, 80, 0 + createsprite gSporeParticleSpriteTemplate, ANIM_ATTACKER, 2, 0, -20, 85, 80, 0 delay 12 - createsprite gUnknown_085922EC, ANIM_ATTACKER, 2, 0, -10, 170, 80, 0 + createsprite gSporeParticleSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 170, 80, 0 delay 12 - createsprite gUnknown_085922EC, ANIM_ATTACKER, 2, 0, -15, 0, 80, 0 + createsprite gSporeParticleSpriteTemplate, ANIM_ATTACKER, 2, 0, -15, 0, 80, 0 delay 12 return @@ -6761,7 +6761,7 @@ Move_SPORE: loadspritegfx ANIM_TAG_SPORE monbg ANIM_DEF_PARTNER setalpha 12, 8 - createvisualtask sub_80FEE1C, 2 + createvisualtask AnimTask_SporeDoubleBattle, 2 loopsewithpan SE_W077, SOUND_PAN_TARGET, 16, 11 call Spore1 call Spore1 @@ -6773,11 +6773,11 @@ Move_SPORE: end Spore1: - createsprite gUnknown_085922EC, ANIM_TARGET, 2, 0, -20, 85, 80, 1 + createsprite gSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -20, 85, 80, 1 delay 12 - createsprite gUnknown_085922EC, ANIM_TARGET, 2, 0, -10, 170, 80, 1 + createsprite gSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -10, 170, 80, 1 delay 12 - createsprite gUnknown_085922EC, ANIM_TARGET, 2, 0, -15, 0, 80, 1 + createsprite gSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -15, 0, 80, 1 delay 12 return @@ -6788,23 +6788,23 @@ Move_PETAL_DANCE: setalpha 12, 8 playsewithpan SE_W080, SOUND_PAN_ATTACKER createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 6, 3 - createsprite gUnknown_0859231C, ANIM_ATTACKER, 2, 0, -24, 8, 140 - createsprite gUnknown_08592334, ANIM_ATTACKER, 2, 16, -24, 8, 100 - createsprite gUnknown_08592334, ANIM_ATTACKER, 2, -16, -24, 8, 100 + createsprite gPetalDanceBigFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 8, 140 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 16, -24, 8, 100 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, -16, -24, 8, 100 delay 15 - createsprite gUnknown_0859231C, ANIM_ATTACKER, 2, 0, -24, 8, 140 - createsprite gUnknown_08592334, ANIM_ATTACKER, 2, 32, -24, 8, 100 - createsprite gUnknown_08592334, ANIM_ATTACKER, 2, -32, -24, 8, 100 + createsprite gPetalDanceBigFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 8, 140 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 32, -24, 8, 100 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, -32, -24, 8, 100 delay 15 - createsprite gUnknown_0859231C, ANIM_ATTACKER, 2, 0, -24, 8, 140 - createsprite gUnknown_08592334, ANIM_ATTACKER, 2, 24, -24, 8, 100 - createsprite gUnknown_08592334, ANIM_ATTACKER, 2, -24, -24, 8, 100 + createsprite gPetalDanceBigFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 8, 140 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 24, -24, 8, 100 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, -24, -24, 8, 100 delay 30 - createsprite gUnknown_08592334, ANIM_ATTACKER, 2, 16, -24, 0, 100 - createsprite gUnknown_08592334, ANIM_ATTACKER, 2, -16, -24, 0, 100 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 16, -24, 0, 100 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, -16, -24, 0, 100 delay 30 - createsprite gUnknown_08592334, ANIM_ATTACKER, 2, 20, -16, 14, 80 - createsprite gUnknown_08592334, ANIM_ATTACKER, 2, -20, -14, 16, 80 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 20, -16, 14, 80 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, -20, -14, 16, 80 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 5 delay 3 @@ -6827,29 +6827,29 @@ Move_RAZOR_LEAF: setalpha 12, 8 delay 1 loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -2, 10 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -2, 10 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -1, -1, 15 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -1, -1, 15 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -4, -4, 7 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -4, -4, 7 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 3, -3, 11 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 3, -3, 11 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -1, -6, 8 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -1, -6, 8 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 2, -1, 12 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 2, -1, 12 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -4, 13 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -4, 13 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 4, -5, 7 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 4, -5, 7 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 2, -6, 11 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 2, -6, 11 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -5, 8 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -5, 8 delay 60 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite gUnknown_085923D8, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 - createsprite gUnknown_085923D8, ANIM_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 + createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 + createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 delay 20 playsewithpan SE_W013, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 @@ -6937,7 +6937,7 @@ Mist1: Move_HAZE: waitforvisualfinish playsewithpan SE_W114, 0 - createvisualtask sub_810C0A0, 5 + createvisualtask AnimTask_Haze1, 5 delay 30 createvisualtask sub_8116620, 10, 0x780, 2, 0, 16, RGB_BLACK delay 0x5A @@ -7025,44 +7025,44 @@ Move_DREAM_EATER: end DreamEaterEffect: playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -40, 35 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -40, 35 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 28, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 40, 39 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 28, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 40, 39 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -32, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -32, 26 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -40, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -40, 26 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 36, 33 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 36, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W207, SOUND_PAN_TARGET - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -20, 35 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -7573,19 +7573,19 @@ Move_RECOVER: end Recover1: - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, -10, 13 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, -10, 13 delay 3 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -35, -10, 13 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -35, -10, 13 delay 3 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 15, -40, 13 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 15, -40, 13 delay 3 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -10, -32, 13 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -10, -32, 13 delay 3 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 25, -20, 13 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 25, -20, 13 delay 3 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, -20, 13 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, -20, 13 delay 3 - createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 5, -40, 13 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 5, -40, 13 delay 3 return @@ -7597,7 +7597,7 @@ Move_MIMIC: panse_1B SE_W107, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0 createvisualtask sub_80FF458, 5, 128, 24 delay 15 - createsprite gUnknown_085924DC, ANIM_TARGET, 2, -12, 24 + createsprite gMimicOrbSpriteTemplate, ANIM_TARGET, 2, -12, 24 delay 10 setarg 7, -1 waitforvisualfinish @@ -7611,12 +7611,12 @@ Move_MIMIC: Move_CONSTRICT: loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 4 - createsprite gUnknown_08592494, ANIM_TARGET, 4, 0, 16, 0, 2 + createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 2 delay 7 - createsprite gUnknown_08592494, ANIM_TARGET, 3, 0, 0, 0, 2 - createsprite gUnknown_08592494, ANIM_TARGET, 2, 0, 8, 1, 2 + createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 3, 0, 0, 0, 2 + createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 2, 0, 8, 1, 2 delay 7 - createsprite gUnknown_08592494, ANIM_TARGET, 3, 0, -8, 1, 2 + createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 3, 0, -8, 1, 2 delay 8 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 delay 20 @@ -7824,28 +7824,28 @@ Move_FURY_SWIPES: Move_INGRAIN: loadspritegfx ANIM_TAG_ROOTS loadspritegfx ANIM_TAG_ORBS - createsprite gUnknown_0859254C, ANIM_ATTACKER, 2, 16, 26, -1, 2, 150 + createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 16, 26, -1, 2, 150 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 10 - createsprite gUnknown_0859254C, ANIM_ATTACKER, 2, -32, 20, 1, 1, 140 + createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, -32, 20, 1, 1, 140 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 10 - createsprite gUnknown_0859254C, ANIM_ATTACKER, 2, 32, 22, 1, 0, 130 + createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 32, 22, 1, 0, 130 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 10 - createsprite gUnknown_0859254C, ANIM_ATTACKER, 2, -16, 25, -1, 3, 120 + createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, -16, 25, -1, 3, 120 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 40 - createsprite gUnknown_0859258C, ANIM_ATTACKER, 3, 32, 26, -1, 3, 30 + createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, 32, 26, -1, 3, 30 delay 5 playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 - createsprite gUnknown_0859258C, ANIM_ATTACKER, 3, -48, 20, 1, 2, 30 + createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, -48, 20, 1, 2, 30 playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 5 - createsprite gUnknown_0859258C, ANIM_ATTACKER, 3, 48, 26, -2, 3, 18 + createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, 48, 26, -2, 3, 18 playsewithpan SE_W145C, SOUND_PAN_ATTACKER delay 10 waitforvisualfinish @@ -7854,7 +7854,7 @@ Move_INGRAIN: Move_PRESENT: loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_IsHealingMove, 2 - createsprite gUnknown_08592610, ANIM_TARGET, 2, 0, -5, 10, 2, -1 + createsprite gPresentSpriteTemplate, ANIM_TARGET, 2, 0, -5, 10, 2, -1 playsewithpan SE_W039, SOUND_PAN_ATTACKER delay 14 playsewithpan SE_W145B, SOUND_PAN_ATTACKER @@ -7889,23 +7889,23 @@ PresentHeal: loadspritegfx ANIM_TAG_GREEN_SPARKLE loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_W234, SOUND_PAN_TARGET - createsprite gUnknown_08592658, ANIM_TARGET, 4, -16, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -16, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, ANIM_TARGET, 4, 16, 32, -3, -1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 16, 32, -3, -1 delay 3 - createsprite gUnknown_08592658, ANIM_TARGET, 4, 32, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 32, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, ANIM_TARGET, 4, -32, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -32, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, ANIM_TARGET, 4, 0, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 0, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, ANIM_TARGET, 4, -8, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -8, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, ANIM_TARGET, 4, -8, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -8, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, ANIM_TARGET, 4, 24, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 24, 32, -3, 1 delay 3 - createsprite gUnknown_08592658, ANIM_TARGET, 4, -24, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -24, 32, -3, 1 waitforvisualfinish waitsound call HealingEffect2 @@ -8115,8 +8115,8 @@ Move_ENCORE: Move_TRICK: loadspritegfx ANIM_TAG_ITEM_BAG loadspritegfx ANIM_TAG_SPEED_DUST - createsprite gUnknown_085926E8, ANIM_ATTACKER, 2, -40, 80 - createsprite gUnknown_085926E8, ANIM_ATTACKER, 2, -40, 208 + createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 80 + createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 208 delay 16 playsewithpan SE_W166, 0 createvisualtask sub_8106020, 3 @@ -8167,21 +8167,21 @@ Move_STOCKPILE: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 12, 0, RGB_WHITE end Stockpile1: - createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 55, 55, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 55, 55, 13 delay 1 - createsprite gUnknown_08592244, ANIM_ATTACKER, 2, -55, -55, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -55, -55, 13 delay 1 - createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 0, 55, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 55, 13 delay 1 - createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 0, -55, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, -55, 13 delay 1 - createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 55, -34, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 55, -34, 13 delay 1 - createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 55, 34, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 55, 34, 13 delay 1 - createsprite gUnknown_08592244, ANIM_ATTACKER, 2, -55, -34, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -55, -34, 13 delay 1 - createsprite gUnknown_08592244, ANIM_ATTACKER, 2, -55, 34, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -55, 34, 13 delay 1 return @@ -8392,8 +8392,8 @@ Move_HYPER_BEAM: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 16, 0, RGB_BLACK end HyperBeam1: - createsprite gUnknown_08592288, ANIM_TARGET, 2 - createsprite gUnknown_08592288, ANIM_TARGET, 2 + createsprite gHyperBeamOrbSpriteTemplate, ANIM_TARGET, 2 + createsprite gHyperBeamOrbSpriteTemplate, ANIM_TARGET, 2 delay 1 return @@ -8790,31 +8790,31 @@ Move_FRENZY_PLANT: setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 2, 0, 5, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 10, 8, 2, 0, 0, 100 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 10, 8, 2, 0, 0, 100 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 5 - createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 20, -8, -2, 0, 1, 95 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, -2, 0, 1, 95 playsewithpan SE_W010, -43 delay 5 - createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 30, 8, -4, 0, 0, 90 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 30, 8, -4, 0, 0, 90 playsewithpan SE_W010, -22 delay 5 - createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 40, -8, 4, 0, 1, 85 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 40, -8, 4, 0, 1, 85 playsewithpan SE_W010, 0 delay 5 - createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 50, 8, 0, 0, 0, 85 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 50, 8, 0, 0, 0, 85 playsewithpan SE_W010, +21 delay 5 - createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 60, -8, -2, 0, 1, 85 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 60, -8, -2, 0, 1, 85 playsewithpan SE_W010, +42 delay 5 - createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 75, 8, 0, 0, 0, 85 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 75, 8, 0, 0, 0, 85 playsewithpan SE_W010, SOUND_PAN_TARGET delay 5 - createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 85, 16, 6, 0, 3, 80 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 85, 16, 6, 0, 3, 80 playsewithpan SE_W010, SOUND_PAN_TARGET delay 5 - createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 85, -16, -6, 0, 2, 75 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 85, -16, -6, 0, 2, 75 playsewithpan SE_W010, SOUND_PAN_TARGET delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -10, 1, 3 @@ -9649,26 +9649,26 @@ Move_TWISTER: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET playsewithpan SE_W239, SOUND_PAN_TARGET - createsprite gUnknown_085923A8, ANIM_TARGET, 2, 120, 70, 5, 70, 30 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 120, 70, 5, 70, 30 delay 1 - createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 55, 6, 60, 25 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 55, 6, 60, 25 delay 1 - createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 60, 7, 60, 30 - createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 55, 10, 60, 30 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 60, 7, 60, 30 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 55, 10, 60, 30 delay 3 createsprite gUnknown_08596CC8, ANIM_TARGET, 2, 100, 50, 4, 50, 26 delay 1 - createsprite gUnknown_085923A8, ANIM_TARGET, 2, 105, 25, 8, 60, 20 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 105, 25, 8, 60, 20 delay 1 - createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 40, 10, 48, 30 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 40, 10, 48, 30 delay 3 createsprite gUnknown_08596CC8, ANIM_TARGET, 2, 120, 30, 6, 45, 25 - createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 35, 10, 60, 30 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 35, 10, 60, 30 delay 3 createsprite gUnknown_08596CC8, ANIM_TARGET, 2, 105, 20, 8, 40, 0 delay 3 - createsprite gUnknown_085923A8, ANIM_TARGET, 2, 20, 255, 15, 32, 0 - createsprite gUnknown_085923A8, ANIM_TARGET, 2, 110, 10, 8, 32, 20 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 20, 255, 15, 32, 0 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 110, 10, 8, 32, 20 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -32, -16, 1, 3 playsewithpan SE_W004, SOUND_PAN_TARGET @@ -9697,29 +9697,29 @@ Move_MAGICAL_LEAF: delay 1 loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5 createvisualtask sub_81007C4, 5 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -2, 10 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -2, 10 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -1, -1, 15 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -1, -1, 15 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -4, -4, 7 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -4, -4, 7 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 3, -3, 11 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 3, -3, 11 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -1, -6, 8 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -1, -6, 8 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 2, -1, 12 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 2, -1, 12 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -4, 13 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -4, 13 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 4, -5, 7 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 4, -5, 7 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 2, -6, 11 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 2, -6, 11 delay 2 - createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -5, 8 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -5, 8 delay 60 playsewithpan SE_W013B, SOUND_PAN_ATTACKER - createsprite gUnknown_085923D8, ANIM_TARGET, 3, 20, -10, 20, 0, 32, 20, 0 - createsprite gUnknown_085923D8, ANIM_TARGET, 3, 20, -10, 20, 0, 32, -20, 0 + createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 32, 20, 0 + createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 32, -20, 0 delay 30 playsewithpan SE_W013, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, -4, 1, 2 @@ -10344,7 +10344,7 @@ General_PokeblockThrow: General_ItemKnockoff: loadspritegfx ANIM_TAG_ITEM_BAG - createsprite gBattleAnimSpriteTemplate_8592628, ANIM_TARGET, 2 + createsprite gKnockOffItemSpriteTemplate, ANIM_TARGET, 2 end General_TurnTrap: @@ -10357,9 +10357,9 @@ General_TurnTrap: Status_BindWrap: loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 2 - createsprite gUnknown_08592494, ANIM_TARGET, 4, 0, 16, 0, 1 + createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 1 delay 7 - createsprite gUnknown_08592494, ANIM_TARGET, 2, 0, 8, 1, 1 + createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 2, 0, 8, 1, 1 delay 3 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 delay 20 @@ -10537,7 +10537,7 @@ General_ItemSteal: createvisualtask sub_8117F30, 2 createvisualtask sub_8172ED0, 2 delay 1 - createsprite gUnknown_08592670, ANIM_ATTACKER, 2, 0, -5, 10, 2, -1 + createsprite gItemStealSpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 10, 2, -1 end General_SnatchMove: diff --git a/data/cry_id_table.inc b/data/cry_id_table.inc deleted file mode 100644 index ece08de06..000000000 --- a/data/cry_id_table.inc +++ /dev/null @@ -1,137 +0,0 @@ - .align 1 -gSpeciesIdToCryId:: @ 831F61C - .2byte 273 @ TREECKO - .2byte 274 @ GROVYLE - .2byte 275 @ SCEPTILE - .2byte 270 @ TORCHIC - .2byte 271 @ COMBUSKEN - .2byte 272 @ BLAZIKEN - .2byte 276 @ MUDKIP - .2byte 277 @ MARSHTOMP - .2byte 278 @ SWAMPERT - .2byte 359 @ POOCHYENA - .2byte 360 @ MIGHTYENA - .2byte 378 @ ZIGZAGOON - .2byte 375 @ LINOONE - .2byte 290 @ WURMPLE - .2byte 291 @ SILCOON - .2byte 292 @ BEAUTIFLY - .2byte 293 @ CASCOON - .2byte 294 @ DUSTOX - .2byte 283 @ LOTAD - .2byte 284 @ LOMBRE - .2byte 285 @ LUDICOLO - .2byte 286 @ SEEDOT - .2byte 287 @ NUZLEAF - .2byte 288 @ SHIFTRY - .2byte 301 @ NINCADA - .2byte 302 @ NINJASK - .2byte 303 @ SHEDINJA - .2byte 266 @ TAILLOW - .2byte 267 @ SWELLOW - .2byte 374 @ SHROOMISH - .2byte 373 @ BRELOOM - .2byte 269 @ SPINDA - .2byte 280 @ WINGULL - .2byte 279 @ PELIPPER - .2byte 310 @ SURSKIT - .2byte 311 @ MASQUERAIN - .2byte 377 @ WAILMER - .2byte 381 @ WAILORD - .2byte 312 @ SKITTY - .2byte 313 @ DELCATTY - .2byte 251 @ KECLEON - .2byte 329 @ BALTOY - .2byte 330 @ CLAYDOL - .2byte 306 @ NOSEPASS - .2byte 253 @ TORKOAL - .2byte 362 @ SABLEYE - .2byte 318 @ BARBOACH - .2byte 319 @ WHISCASH - .2byte 368 @ LUVDISC - .2byte 320 @ CORPHISH - .2byte 321 @ CRAWDAUNT - .2byte 333 @ FEEBAS - .2byte 334 @ MILOTIC - .2byte 289 @ CARVANHA - .2byte 260 @ SHARPEDO - .2byte 324 @ TRAPINCH - .2byte 325 @ VIBRAVA - .2byte 326 @ FLYGON - .2byte 304 @ MAKUHITA - .2byte 305 @ HARIYAMA - .2byte 254 @ ELECTRIKE - .2byte 255 @ MANECTRIC - .2byte 316 @ NUMEL - .2byte 317 @ CAMERUPT - .2byte 338 @ SPHEAL - .2byte 339 @ SEALEO - .2byte 340 @ WALREIN - .2byte 327 @ CACNEA - .2byte 328 @ CACTURNE - .2byte 383 @ SNORUNT - .2byte 307 @ GLALIE - .2byte 331 @ LUNATONE - .2byte 332 @ SOLROCK - .2byte 262 @ AZURILL - .2byte 322 @ SPOINK - .2byte 323 @ GRUMPIG - .2byte 308 @ PLUSLE - .2byte 309 @ MINUN - .2byte 363 @ MAWILE - .2byte 336 @ MEDITITE - .2byte 337 @ MEDICHAM - .2byte 263 @ SWABLU - .2byte 264 @ ALTARIA - .2byte 258 @ WYNAUT - .2byte 256 @ DUSKULL - .2byte 361 @ DUSCLOPS - .2byte 252 @ ROSELIA - .2byte 298 @ SLAKOTH - .2byte 299 @ VIGOROTH - .2byte 300 @ SLAKING - .2byte 314 @ GULPIN - .2byte 315 @ SWALOT - .2byte 376 @ TROPIUS - .2byte 382 @ WHISMUR - .2byte 380 @ LOUDRED - .2byte 379 @ EXPLOUD - .2byte 341 @ CLAMPERL - .2byte 342 @ HUNTAIL - .2byte 343 @ GOREBYSS - .2byte 335 @ ABSOL - .2byte 282 @ SHUPPET - .2byte 281 @ BANETTE - .2byte 259 @ SEVIPER - .2byte 261 @ ZANGOOSE - .2byte 367 @ RELICANTH - .2byte 364 @ ARON - .2byte 365 @ LAIRON - .2byte 366 @ AGGRON - .2byte 356 @ CASTFORM - .2byte 357 @ VOLBEAT - .2byte 358 @ ILLUMISE - .2byte 344 @ LILEEP - .2byte 345 @ CRADILY - .2byte 346 @ ANORITH - .2byte 347 @ ARMALDO - .2byte 295 @ RALTS - .2byte 296 @ KIRLIA - .2byte 297 @ GARDEVOIR - .2byte 351 @ BAGON - .2byte 352 @ SHELGON - .2byte 372 @ SALAMENCE - .2byte 348 @ BELDUM - .2byte 349 @ METANG - .2byte 350 @ METAGROSS - .2byte 353 @ REGIROCK - .2byte 354 @ REGICE - .2byte 355 @ REGISTEEL - .2byte 370 @ KYOGRE - .2byte 369 @ GROUDON - .2byte 371 @ RAYQUAZA - .2byte 257 @ LATIAS - .2byte 384 @ LATIOS - .2byte 385 @ JIRACHI - .2byte 386 @ DEOXYS - .2byte 387 @ CHIMECHO diff --git a/data/data2c.s b/data/data2c.s deleted file mode 100644 index 5bfea56ae..000000000 --- a/data/data2c.s +++ /dev/null @@ -1,56 +0,0 @@ -#include "constants/items.h" -#include "constants/moves.h" -#include "constants/species.h" -#include "constants/trainers.h" -#include "constants/pokemon.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gBattleIntroSlideScanlineEffectParams:: @ 831AC70 - .4byte REG_BG3HOFS - .4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1 - .4byte 1 - - .align 2 -gUnknown_0831AC7C:: @ 831AC7C - .4byte REG_BG3HOFS - .4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_32BIT | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1 - .4byte 1 - - .align 2 -gUnknown_0831AC88:: @ 831AC88 - spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8038528 - -gText_ShedinjaJapaneseName:: @ 831ACA0 - .string "ヌケニン$" @ Nukenin - - .align 2 -gUnknown_0831ACA8:: @ 831ACA8 - .2byte 0x0100 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gUnknown_0831ACB0:: @ 831ACB0 - .2byte 0x0100 - .2byte 0xC000 - .2byte 0x2800 - - .align 2 -gUnknown_0831ACB8:: @ 831ACB8 - .2byte 0x0000, 0x0005, 0xfffe, 0x0000 - - .align 2 -gUnknown_0831ACC0:: @ 831ACC0 - .4byte gUnknown_0831ACB8 - - .align 2 -gUnknown_0831ACC4:: @ 831ACC4 - .2byte 0xfff0, 0x0000, 0x0400, 0x0000, 0x0000, 0x0000, 0x3c00, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000 - - .align 2 -gUnknown_0831ACDC:: @ 831ACDC - .4byte gUnknown_0831ACC4 diff --git a/data/event_scripts.s b/data/event_scripts.s index 5bd8825ad..5b15bf090 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,5 +1,6 @@ #include "constants/battle_frontier.h" #include "constants/battle_setup.h" +#include "constants/event_objects.h" #include "constants/field_effects.h" #include "constants/flags.h" #include "constants/items.h" @@ -10,6 +11,7 @@ #include "constants/species.h" #include "constants/trainers.h" #include "constants/vars.h" +#include "constants/weather.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" @@ -449,8 +451,7 @@ EventScript_SecretBasePC:: @ 823B4BB EventScript_23B4D3:: @ 823B4D3 message Text_27681A waitmessage - checkflag FLAG_0x10C - goto_eq EventScript_23B4EF + goto_if_set FLAG_0x10C, EventScript_23B4EF goto EventScript_23B531 end @@ -481,7 +482,7 @@ EventScript_23B531:: @ 823B531 EventScript_23B568:: @ 823B568 msgbox Text_2766AA, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_23B4D3 + goto_if_eq EventScript_23B4D3 closemessage special sub_80E9AC0 releaseall @@ -527,32 +528,32 @@ gUnknown_0823B5E9:: @ 823B5E9 EventScript_23B5F0:: @ 823B5F0 special sub_80E9BDC compare VAR_RESULT, 1 - goto_eq EventScript_23B62F + goto_if_eq EventScript_23B62F compare VAR_RESULT, 2 - goto_eq EventScript_23B652 + goto_if_eq EventScript_23B652 special sub_80E980C msgbox Text_276707, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_23B5A1 + goto_if_eq EventScript_23B5A1 msgbox Text_2767D1, MSGBOX_SIGN special sub_80E9C2C - special sub_80FA57C + special DoSecretBasePCTurnOffEffect releaseall end EventScript_23B62F:: @ 823B62F msgbox Text_276731, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_23B5A1 + goto_if_eq EventScript_23B5A1 msgbox Text_2767E9, MSGBOX_SIGN special sub_80E9C2C - special sub_80FA57C + special DoSecretBasePCTurnOffEffect releaseall end EventScript_23B652:: @ 823B652 msgbox Text_27676F, MSGBOX_SIGN - special sub_80FA57C + special DoSecretBasePCTurnOffEffect closemessage releaseall end @@ -563,7 +564,7 @@ EventScript_23B660:: @ 823B660 end EventScript_23B66E:: @ 823B66E - special sub_80FA57C + special DoSecretBasePCTurnOffEffect closemessage releaseall end @@ -591,15 +592,15 @@ EventScript_SecretBaseSandOrnament:: @ 823B684 end EventScript_SecretBaseShieldOrToyTV:: @ 823B68C - special sub_80FAC78 + special GetShieldToyTVDecorationInfo compare VAR_RESULT, 0 - goto_eq EventScript_23B6BC + goto_if_eq EventScript_23B6BC compare VAR_RESULT, 1 - goto_eq EventScript_23B6C5 + goto_if_eq EventScript_23B6C5 compare VAR_RESULT, 2 - goto_eq EventScript_23B6CE + goto_if_eq EventScript_23B6CE compare VAR_RESULT, 3 - goto_eq EventScript_23B6D7 + goto_if_eq EventScript_23B6D7 end EventScript_23B6BC:: @ 823B6BC @@ -847,9 +848,9 @@ VerdanturfTown_BattleTentLobby_EventScript_27134F:: @ 827134F EventScript_271354:: @ 8271354 cmdD8 cmdD9 - + .include "data/scripts/trainer_battle.inc" - + Std_MsgboxAutoclose:: @ 8271494 message 0x0 waitmessage @@ -1108,7 +1109,7 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 setflag FLAG_0x87F call EverGrandeCity_HallOfFame_EventScript_271829 compare VAR_0x40CC, 0 - call_if 1, EverGrandeCity_HallOfFame_EventScript_271839 + call_if_eq EverGrandeCity_HallOfFame_EventScript_271839 clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS call EverGrandeCity_HallOfFame_EventScript_2718CC setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY @@ -1123,14 +1124,12 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 clearflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION setflag FLAG_HIDE_LILYCOVE_CITY_RIVAL special sub_813BA60 - checkflag FLAG_0x123 - call_if 0, EverGrandeCity_HallOfFame_EventScript_271843 - checkflag FLAG_0x12A - call_if 0, EverGrandeCity_HallOfFame_EventScript_27183F + call_if_unset FLAG_0x123, EverGrandeCity_HallOfFame_EventScript_271843 + call_if_unset FLAG_0x12A, EverGrandeCity_HallOfFame_EventScript_27183F setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM compare VAR_0x40D3, 0 - call_if 1, EverGrandeCity_HallOfFame_EventScript_271851 + call_if_eq EverGrandeCity_HallOfFame_EventScript_271851 return EverGrandeCity_HallOfFame_EventScript_271829:: @ 8271829 @@ -1166,11 +1165,11 @@ EventScript_WhiteOut:: @ 8271857 EventScript_271862:: @ 8271862 compare VAR_0x4096, 1 - goto_eq EverGrandeCity_HallOfFame_EventScript_271884 + goto_if_eq EverGrandeCity_HallOfFame_EventScript_271884 compare VAR_0x4096, 2 - goto_eq EverGrandeCity_HallOfFame_EventScript_27189A + goto_if_eq EverGrandeCity_HallOfFame_EventScript_27189A compare VAR_0x4096, 3 - goto_eq EverGrandeCity_HallOfFame_EventScript_2718B3 + goto_if_eq EverGrandeCity_HallOfFame_EventScript_2718B3 end EverGrandeCity_HallOfFame_EventScript_271884:: @ 8271884 @@ -1222,16 +1221,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE RustboroCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE SlateportCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE VerdanturfTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE - checkflag FLAG_0x0BC - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_27374E - checkflag FLAG_0x4F4 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_27374E - checkflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_27190C - checkflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_271912 - checkflag FLAG_HIDE_ROUTE_108_MR_BRINEY - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_271918 + goto_if_unset FLAG_0x0BC, OldaleTown_PokemonCenter_1F_EventScript_27374E + goto_if_set FLAG_0x4F4, OldaleTown_PokemonCenter_1F_EventScript_27374E + goto_if_unset FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT, OldaleTown_PokemonCenter_1F_EventScript_27190C + goto_if_unset FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, OldaleTown_PokemonCenter_1F_EventScript_271912 + goto_if_unset FLAG_HIDE_ROUTE_108_MR_BRINEY, OldaleTown_PokemonCenter_1F_EventScript_271918 return OldaleTown_PokemonCenter_1F_EventScript_27190C:: @ 827190C @@ -1269,12 +1263,12 @@ VerdanturfTown_PokemonCenter_1F_EventScript_27191E:: @ 827191E setvar VAR_0x8004, 0 specialvar VAR_RESULT, sub_80C2E40 compare VAR_RESULT, 4 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_271A68 + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271A68 msgbox gUnknown_082726EB, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_27195A + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_27195A compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_271954 + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271954 end OldaleTown_PokemonCenter_1F_EventScript_271954:: @ 8271954 @@ -1284,13 +1278,12 @@ OldaleTown_PokemonCenter_1F_EventScript_271954:: @ 8271954 OldaleTown_PokemonCenter_1F_EventScript_27195A:: @ 827195A incrementgamestat 15 compare VAR_0x8004, 0 - call_if 1, OldaleTown_PokemonCenter_1F_EventScript_271987 + call_if_eq OldaleTown_PokemonCenter_1F_EventScript_271987 compare VAR_0x8004, 1 - call_if 1, OldaleTown_PokemonCenter_1F_EventScript_27198D + call_if_eq OldaleTown_PokemonCenter_1F_EventScript_27198D waitmessage call OldaleTown_PokemonCenter_1F_EventScript_271993 - checkflag FLAG_0x111 - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_271A43 + goto_if_unset FLAG_0x111, OldaleTown_PokemonCenter_1F_EventScript_271A43 goto OldaleTown_PokemonCenter_1F_EventScript_2719B1 end @@ -1315,18 +1308,18 @@ OldaleTown_PokemonCenter_1F_EventScript_271993:: @ 8271993 OldaleTown_PokemonCenter_1F_EventScript_2719B1:: @ 82719B1 specialvar VAR_RESULT, sub_8139ED0 compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_2719E2 + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_2719E2 specialvar VAR_RESULT, sp182_move_string copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, 0 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_2719E2 + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_2719E2 compare VAR_0x8008, 1 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_271A19 + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271A19 end OldaleTown_PokemonCenter_1F_EventScript_2719E2:: @ 82719E2 compare VAR_0x8004, 1 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_271A03 + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271A03 message gUnknown_08272798 waitmessage applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_271AD0 @@ -1343,8 +1336,7 @@ OldaleTown_PokemonCenter_1F_EventScript_271A03:: @ 8271A03 return OldaleTown_PokemonCenter_1F_EventScript_271A19:: @ 8271A19 - checkflag FLAG_0x880 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_2719E2 + goto_if_set FLAG_0x880, OldaleTown_PokemonCenter_1F_EventScript_2719E2 msgbox gUnknown_08272798, MSGBOX_DEFAULT setflag FLAG_0x880 message OldaleTown_PokemonCenter_1F_Text_278A48 @@ -1357,9 +1349,9 @@ OldaleTown_PokemonCenter_1F_EventScript_271A19:: @ 8271A19 OldaleTown_PokemonCenter_1F_EventScript_271A43:: @ 8271A43 specialvar VAR_RESULT, IsPokerusInParty compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_271A5F + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271A5F compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_2719B1 + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_2719B1 end OldaleTown_PokemonCenter_1F_EventScript_271A5F:: @ 8271A5F @@ -1368,8 +1360,7 @@ OldaleTown_PokemonCenter_1F_EventScript_271A5F:: @ 8271A5F return OldaleTown_PokemonCenter_1F_EventScript_271A68:: @ 8271A68 - checkflag FLAG_0x159 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_271AAC + goto_if_set FLAG_0x159, OldaleTown_PokemonCenter_1F_EventScript_271AAC setflag FLAG_0x159 msgbox gUnknown_082727F5, MSGBOX_DEFAULT playse SE_PIN @@ -1379,14 +1370,14 @@ OldaleTown_PokemonCenter_1F_EventScript_271A68:: @ 8271A68 waitmovement 0 msgbox gUnknown_08272860, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_271AC5 + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271AC5 message gUnknown_08272A07 return OldaleTown_PokemonCenter_1F_EventScript_271AAC:: @ 8271AAC msgbox gUnknown_08272982, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_1F_EventScript_271AC5 + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271AC5 message gUnknown_08272A07 return @@ -1411,9 +1402,9 @@ EventScript_271AE3:: @ 8271AE3 checkitemtype VAR_0x8000 call EventScript_271B08 compare VAR_0x8007, 1 - call_if 1, EventScript_271B95 + call_if_eq EventScript_271B95 compare VAR_0x8007, 0 - call_if 1, EventScript_271BA9 + call_if_eq EventScript_271BA9 return EventScript_271B08:: @ 8271B08 @@ -1428,31 +1419,31 @@ EventScript_271B08:: @ 8271B08 EventScript_271B45:: @ 8271B45 bufferstdstring 2, 14 compare VAR_0x8007, 1 - call_if 1, EventScript_271BAF + call_if_eq EventScript_271BAF return EventScript_271B55:: @ 8271B55 bufferstdstring 2, 15 compare VAR_0x8007, 1 - call_if 1, EventScript_271BAF + call_if_eq EventScript_271BAF return EventScript_271B65:: @ 8271B65 bufferstdstring 2, 16 compare VAR_0x8007, 1 - call_if 1, EventScript_271BAF + call_if_eq EventScript_271BAF return EventScript_271B75:: @ 8271B75 bufferstdstring 2, 17 compare VAR_0x8007, 1 - call_if 1, EventScript_271BB3 + call_if_eq EventScript_271BB3 return EventScript_271B85:: @ 8271B85 bufferstdstring 2, 18 compare VAR_0x8007, 1 - call_if 1, EventScript_271BAF + call_if_eq EventScript_271BAF return EventScript_271B95:: @ 8271B95 @@ -1483,9 +1474,9 @@ Std_ObtainDecoration:: @ 8271BB7 EventScript_271BC5:: @ 8271BC5 bufferdecorationname 1, VAR_0x8000 compare VAR_0x8007, 1 - call_if 1, EventScript_271BE0 + call_if_eq EventScript_271BE0 compare VAR_0x8007, 0 - call_if 1, EventScript_271BF7 + call_if_eq EventScript_271BF7 return EventScript_271BE0:: @ 8271BE0 @@ -1512,9 +1503,9 @@ Std_FindItem:: @ 8271BFD checkitemtype VAR_0x8000 call EventScript_271B08 compare VAR_0x8007, 1 - call_if 1, EventScript_271C3A + call_if_eq EventScript_271C3A compare VAR_0x8007, 0 - call_if 1, EventScript_271CA1 + call_if_eq EventScript_271CA1 release return @@ -1524,16 +1515,16 @@ EventScript_271C3A:: @ 8271C3A specialvar VAR_RESULT, sub_81398C0 copyvar VAR_0x8008, VAR_RESULT compare VAR_0x8008, 1 - call_if 1, EventScript_271C8F + call_if_eq EventScript_271C8F compare VAR_0x8008, 0 - call_if 1, EventScript_271C9B + call_if_eq EventScript_271C9B waitfanfare waitmessage bufferitemnameplural 1, VAR_0x8004, 32773 setvar VAR_0x8004, 12 special CallBattlePyramidFunction compare VAR_RESULT, 1 - goto_eq EventScript_271C86 + goto_if_eq EventScript_271C86 msgbox gUnknown_08272A9A, MSGBOX_DEFAULT return @@ -1565,9 +1556,9 @@ EventScript_HiddenItemScript:: @ 8271CB7 checkitemtype VAR_0x8005 call EventScript_271B08 compare VAR_0x8007, 1 - goto_eq EventScript_271CE8 + goto_if_eq EventScript_271CE8 compare VAR_0x8007, 0 - goto_eq EventScript_271D47 + goto_if_eq EventScript_271D47 end EventScript_271CE8:: @ 8271CE8 @@ -1575,9 +1566,9 @@ EventScript_271CE8:: @ 8271CE8 copyvar VAR_0x8004, VAR_0x8005 specialvar VAR_RESULT, sub_81398C0 compare VAR_RESULT, 1 - goto_eq EventScript_271D0E + goto_if_eq EventScript_271D0E compare VAR_RESULT, 0 - goto_eq EventScript_271D1F + goto_if_eq EventScript_271D1F end EventScript_271D0E:: @ 8271D0E @@ -1614,9 +1605,9 @@ EventScript_271D5E:: @ 8271D5E faceplayer msgbox Text_27260D, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq EventScript_271D83 + goto_if_eq EventScript_271D83 compare VAR_RESULT, 0 - goto_eq EventScript_271D89 + goto_if_eq EventScript_271D89 goto EventScript_271D89 EventScript_271D83:: @ 8271D83 @@ -1668,12 +1659,10 @@ EventScript_271DF9:: @ 8271DF9 EventScript_271E0E:: @ 8271E0E playse SE_PC_LOGIN - checkflag FLAG_SYS_PC_LANETTE - call_if 0, EventScript_271E35 - checkflag FLAG_SYS_PC_LANETTE - call_if 1, EventScript_271E3E + call_if_unset FLAG_SYS_PC_LANETTE, EventScript_271E35 + call_if_set FLAG_SYS_PC_LANETTE, EventScript_271E3E msgbox gUnknown_082726A3, MSGBOX_DEFAULT - special ShowPokemonStorageSystem + special ShowPokemonStorageSystemPC waitstate goto EventScript_271DAC end @@ -1694,8 +1683,7 @@ EventScript_271E47:: @ 8271E47 end EventScript_271E54:: @ 8271E54 - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, EventScript_271E47 + goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_271E47 playse SE_PC_LOGIN special AccessHallOfFamePC waitstate @@ -1776,13 +1764,13 @@ Route109_EventScript_271E95:: @ 8271E95 EventScript_UseSurf:: @ 8271EA0 checkpartymove MOVE_SURF compare VAR_RESULT, 6 - goto_eq EventScript_271ED6 + goto_if_eq EventScript_271ED6 bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT lockall msgbox gUnknown_08272FD6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_271ED5 + goto_if_eq EventScript_271ED5 msgbox gUnknown_0827300D, MSGBOX_DEFAULT dofieldeffect FLDEFF_USE_SURF @@ -1805,9 +1793,9 @@ Route119_EventScript_271ED7:: @ 8271ED7 RustboroCity_EventScript_271ED7:: @ 8271ED7 checkplayergender compare VAR_RESULT, 0 - goto_eq RustboroCity_EventScript_271EEF + goto_if_eq RustboroCity_EventScript_271EEF compare VAR_RESULT, 1 - goto_eq RustboroCity_EventScript_271EF5 + goto_if_eq RustboroCity_EventScript_271EF5 end RustboroCity_EventScript_271EEF:: @ 8271EEF @@ -1823,9 +1811,9 @@ Route110_EventScript_271EFB:: @ 8271EFB Route119_EventScript_271EFB:: @ 8271EFB checkplayergender compare VAR_RESULT, 0 - goto_eq LavaridgeTown_EventScript_271F13 + goto_if_eq LavaridgeTown_EventScript_271F13 compare VAR_RESULT, 1 - goto_eq LavaridgeTown_EventScript_271F19 + goto_if_eq LavaridgeTown_EventScript_271F19 end LavaridgeTown_EventScript_271F13:: @ 8271F13 @@ -1839,9 +1827,9 @@ LavaridgeTown_EventScript_271F19:: @ 8271F19 EventScript_271F1F:: @ 8271F1F checkplayergender compare VAR_RESULT, 0 - goto_eq EventScript_271F37 + goto_if_eq EventScript_271F37 compare VAR_RESULT, 1 - goto_eq EventScript_271F3D + goto_if_eq EventScript_271F3D end EventScript_271F37:: @ 8271F37 @@ -2099,25 +2087,24 @@ LittlerootTown_ProfessorBirchsLab_EventScript_2720AD:: @ 82720AD Route101_EventScript_2720AD:: @ 82720AD Route103_EventScript_2720AD:: @ 82720AD compare VAR_0x4085, 0 - goto_eq Route101_EventScript_27374E - checkflag FLAG_SYS_GAME_CLEAR - goto_eq Route101_EventScript_27211A + goto_if_eq Route101_EventScript_27374E + goto_if_set FLAG_SYS_GAME_CLEAR, Route101_EventScript_27211A compare VAR_BIRCH_STATE, 0 - call_if 1, Route101_EventScript_27211A + call_if_eq Route101_EventScript_27211A compare VAR_BIRCH_STATE, 1 - call_if 1, Route101_EventScript_27211A + call_if_eq Route101_EventScript_27211A compare VAR_BIRCH_STATE, 2 - call_if 1, Route101_EventScript_272127 + call_if_eq Route101_EventScript_272127 compare VAR_BIRCH_STATE, 3 - call_if 1, Route101_EventScript_272127 + call_if_eq Route101_EventScript_272127 compare VAR_BIRCH_STATE, 4 - call_if 1, Route101_EventScript_272134 + call_if_eq Route101_EventScript_272134 compare VAR_BIRCH_STATE, 5 - call_if 1, Route101_EventScript_272134 + call_if_eq Route101_EventScript_272134 compare VAR_BIRCH_STATE, 6 - call_if 1, Route101_EventScript_27211A + call_if_eq Route101_EventScript_27211A compare VAR_BIRCH_STATE, 7 - call_if 1, Route101_EventScript_27211A + call_if_eq Route101_EventScript_27211A return Route101_EventScript_27211A:: @ 827211A @@ -2146,15 +2133,13 @@ Route101_EventScript_272141:: @ 8272141 Route103_EventScript_272141:: @ 8272141 lock faceplayer - checkflag FLAG_HAS_MATCH_CALL - goto_if 0, Route101_EventScript_272155 - checkflag FLAG_0x119 - goto_if 0, Route101_EventScript_1FA2D2 + goto_if_unset FLAG_HAS_MATCH_CALL, Route101_EventScript_272155 + goto_if_unset FLAG_0x119, Route101_EventScript_1FA2D2 Route101_EventScript_272155:: @ 8272155 msgbox gUnknown_082A5C9C, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route101_EventScript_27216F + goto_if_eq Route101_EventScript_27216F call Route101_EventScript_272184 release end @@ -2183,7 +2168,7 @@ Route101_EventScript_272184:: @ 8272184 msgbox gUnknown_082A5D2C, MSGBOX_DEFAULT call Route101_EventScript_272179 compare VAR_0x800A, 0 - goto_eq Route101_EventScript_27374E + goto_if_eq Route101_EventScript_27374E setvar VAR_0x8004, 1 specialvar VAR_RESULT, ScriptGetPokedexInfo copyvar VAR_0x8008, VAR_0x8005 @@ -2234,11 +2219,11 @@ RusturfTunnel_EventScript_272216:: @ 8272216 EventScript_27222B:: @ 827222B delay 30 - applymovement 255, PetalburgCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A6 waitmovement 0 showobjectat 255, MAP_PETALBURG_CITY delay 30 - applymovement 255, Movement_27224E + applymovement EVENT_OBJ_ID_PLAYER, Movement_27224E waitmovement 0 delay 30 return @@ -2253,9 +2238,9 @@ FarawayIsland_Entrance_EventScript_272250:: @ 8272250 NavelRock_Harbor_EventScript_272250:: @ 8272250 SouthernIsland_Exterior_EventScript_272250:: @ 8272250 compare VAR_FACING, 1 - call_if 1, BattleFrontier_OutsideWest_EventScript_242A21 + call_if_eq BattleFrontier_OutsideWest_EventScript_242A21 compare VAR_FACING, 3 - call_if 1, BattleFrontier_OutsideWest_EventScript_242A2C + call_if_eq BattleFrontier_OutsideWest_EventScript_242A2C delay 30 hideobjectat 255, MAP_PETALBURG_CITY call BattleFrontier_OutsideWest_EventScript_2721E2 @@ -2362,7 +2347,7 @@ Route119_EventScript_272336:: @ 8272336 Route120_EventScript_272336:: @ 8272336 checkitem ITEM_DEVON_SCOPE, 1 compare VAR_RESULT, 1 - goto_eq Route119_EventScript_272350 + goto_if_eq Route119_EventScript_272350 msgbox Route119_Text_1F5D00, MSGBOX_DEFAULT release end @@ -2370,7 +2355,7 @@ Route120_EventScript_272336:: @ 8272336 Route119_EventScript_272350:: @ 8272350 msgbox Route119_Text_1F5D23, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route119_EventScript_272365 + goto_if_eq Route119_EventScript_272365 release end @@ -2391,11 +2376,11 @@ Route119_EventScript_272365:: @ 8272365 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq Route119_EventScript_2723C1 + goto_if_eq Route119_EventScript_2723C1 compare VAR_RESULT, 4 - goto_eq Route119_EventScript_2723C1 + goto_if_eq Route119_EventScript_2723C1 compare VAR_RESULT, 5 - goto_eq Route119_EventScript_2723C1 + goto_if_eq Route119_EventScript_2723C1 release end @@ -2454,7 +2439,7 @@ EverGrandeCity_DrakesRoom_EventScript_2723F8:: @ 82723F8 EverGrandeCity_GlaciasRoom_EventScript_2723F8:: @ 82723F8 EverGrandeCity_PhoebesRoom_EventScript_2723F8:: @ 82723F8 EverGrandeCity_SidneysRoom_EventScript_2723F8:: @ 82723F8 - applymovement 255, EverGrandeCity_SidneysRoom_Movement_2725C6 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725C6 waitmovement 0 playse SE_DOOR setmetatile 6, 1, 836, 0 @@ -2476,7 +2461,7 @@ EverGrandeCity_DrakesRoom_EventScript_272475:: @ 8272475 EverGrandeCity_GlaciasRoom_EventScript_272475:: @ 8272475 EverGrandeCity_PhoebesRoom_EventScript_272475:: @ 8272475 EverGrandeCity_SidneysRoom_EventScript_272475:: @ 8272475 - applymovement 255, EverGrandeCity_SidneysRoom_Movement_2725BA + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_SidneysRoom_Movement_2725BA waitmovement 0 playse SE_TRACK_DOOR setmetatile 5, 12, 518, 1 @@ -3198,9 +3183,9 @@ EventScript_Poison:: @ 82736BC special ExecuteWhiteOut waitstate compare VAR_RESULT, 1 - goto_eq EventScript_2736D9 + goto_if_eq EventScript_2736D9 compare VAR_RESULT, 2 - goto_eq EventScript_2736F8 + goto_if_eq EventScript_2736F8 releaseall end @@ -3211,8 +3196,7 @@ EventScript_2736D9:: @ 82736D9 special sub_80B05B4 waitstate fadescreen 1 - checkflag FLAG_0x06C - call_if 1, EventScript_2736F4 + call_if_set FLAG_0x06C, EventScript_2736F4 special sp0C8_whiteout_maybe waitstate end @@ -3228,17 +3212,17 @@ EventScript_2736F8:: @ 82736F8 setvar VAR_0x8004, 16 special CallBattlePikeFunction compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222 + goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222 setvar VAR_0x8004, 12 special CallBattlePyramidFunction compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 setvar VAR_0x8004, 10 special sp194_trainer_tower compare VAR_RESULT, 1 - goto_eq TrainerHill_1F_EventScript_2C83C9 + goto_if_eq TrainerHill_1F_EventScript_2C83C9 special sub_80B05B4 waitstate fadescreen 1 @@ -3396,16 +3380,14 @@ Route119_WeatherInstitute_2F_EventScript_2737A0:: @ 82737A0 RustboroCity_DevonCorp_2F_EventScript_2737A0:: @ 82737A0 bufferboxname 0, 16438 bufferspeciesname 1, VAR_TEMP_1 - checkflag FLAG_SYS_PC_LANETTE - call_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_2737BB - checkflag FLAG_SYS_PC_LANETTE - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_2737E6 + 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, sub_813B21C compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737D4 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737D4 msgbox gText_PkmnTransferredSomeonesPC, MSGBOX_DEFAULT return @@ -3418,7 +3400,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_2737D4:: @ 82737D4 LittlerootTown_ProfessorBirchsLab_EventScript_2737E6:: @ 82737E6 specialvar VAR_RESULT, sub_813B21C compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737FF + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737FF msgbox gText_PkmnTransferredLanettesPC, MSGBOX_DEFAULT return @@ -3440,27 +3422,25 @@ EventScript_Questionnaire:: @ 827381B lockall msgbox gUnknown_0827339F, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_2738FD + goto_if_eq EventScript_2738FD setvar VAR_0x8004, 20 call MauvilleCity_PokemonCenter_1F_EventScript_271E7C lock faceplayer specialvar VAR_0x8008, sub_813B490 compare VAR_0x8004, 1 - goto_eq EventScript_27386D + goto_if_eq EventScript_27386D compare VAR_0x8004, 2 - goto_eq EventScript_2738B5 + goto_if_eq EventScript_2738B5 compare VAR_RESULT, 0 - goto_eq EventScript_2738FD + goto_if_eq EventScript_2738FD compare VAR_RESULT, 1 - goto_eq EventScript_2738FF + goto_if_eq EventScript_2738FF end EventScript_27386D:: @ 827386D - checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, EventScript_2738FF - checkflag FLAG_SYS_MYSTERY_EVENT_ENABLE - goto_eq EventScript_2738FF + goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF + goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, EventScript_2738FF applymovement VAR_0x8008, BattleFrontier_Mart_Movement_2725B0 waitmovement 0 playse SE_PIN @@ -3475,10 +3455,8 @@ EventScript_27386D:: @ 827386D end EventScript_2738B5:: @ 82738B5 - checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, EventScript_2738FF - checkflag FLAG_SYS_MYSTERY_GIFT_ENABLE - goto_eq EventScript_2738FF + goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_2738FF + goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, EventScript_2738FF applymovement VAR_0x8008, BattleFrontier_Mart_Movement_2725B0 waitmovement 0 playse SE_PIN @@ -3693,7 +3671,7 @@ gUnknown_08273D1F:: @ 8273D1F gUnknown_08273D1F:: @ 8273D1F lockall compare VAR_0x4037, 9 - goto_if 4, Route105_EventScript_273D51 + goto_if_ge Route105_EventScript_273D51 goto Route105_EventScript_273D5F end @@ -3963,7 +3941,7 @@ Std_RegisteredInMatchCall:: @ 82742C9 EventScript_TryGetTrainerScript:: @ 82742E6 special ShouldTryGetTrainerScript compare VAR_RESULT, 1 - goto_eq EventScript_GotoTrainerScript + goto_if_eq EventScript_GotoTrainerScript releaseall end @@ -4245,7 +4223,7 @@ gUnknown_0827EE07:: @ 27EE07 gUnknown_0827EE09:: @ 27EE09 .string "8$" - + .include "data/scripts/tv.inc" .include "data/text/tv.inc" @@ -4262,13 +4240,13 @@ SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0 setvar VAR_0x8005, 1 special InterviewBefore compare VAR_RESULT, 1 - goto_eq SlateportCity_PokemonFanClub_EventScript_28C879 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C879 copyvar VAR_0x8009, VAR_0x8006 msgbox SlateportCity_PokemonFanClub_Text_280674, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SlateportCity_PokemonFanClub_EventScript_28C827 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C827 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_28C85C + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C end SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827 @@ -4280,9 +4258,9 @@ SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827 lock faceplayer compare VAR_RESULT, 1 - goto_eq SlateportCity_PokemonFanClub_EventScript_28C866 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C866 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_28C85C + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C85C end SlateportCity_PokemonFanClub_EventScript_28C85C:: @ 828C85C @@ -4307,24 +4285,23 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C883:: @ 828C883 setvar VAR_0x8005, 2 special InterviewBefore compare VAR_RESULT, 1 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C939 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C939 copyvar VAR_0x8009, VAR_0x8006 - checkflag FLAG_0x069 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8C8 + goto_if_set FLAG_0x069, SlateportCity_OceanicMuseum_1F_EventScript_28C8C8 setflag FLAG_0x069 msgbox SlateportCity_OceanicMuseum_1F_Text_2811A0, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 compare VAR_RESULT, 0 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C end SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8 msgbox SlateportCity_OceanicMuseum_1F_Text_28126D, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 compare VAR_RESULT, 0 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C end SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7 @@ -4336,9 +4313,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7 lock faceplayer compare VAR_RESULT, 1 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C926 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C926 compare VAR_RESULT, 0 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C end SlateportCity_OceanicMuseum_1F_EventScript_28C91C:: @ 828C91C @@ -4362,17 +4339,17 @@ SlateportCity_PokemonFanClub_EventScript_28C943:: @ 828C943 faceplayer specialvar VAR_RESULT, sub_80EF8F8 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_28C7F0 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C7F0 setvar VAR_0x8005, 3 special InterviewBefore compare VAR_RESULT, 1 - goto_eq SlateportCity_PokemonFanClub_EventScript_28CA4F + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA4F copyvar VAR_0x8009, VAR_0x8006 msgbox SlateportCity_PokemonFanClub_Text_280270, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SlateportCity_PokemonFanClub_EventScript_28C98C + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28C98C compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_28CA45 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 end SlateportCity_PokemonFanClub_EventScript_28C98C:: @ 828C98C @@ -4408,14 +4385,14 @@ SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED lock faceplayer compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_28CA45 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 msgbox SlateportCity_PokemonFanClub_Text_2804AC, MSGBOX_DEFAULT setvar VAR_0x8006, 1 call SlateportCity_PokemonFanClub_EventScript_271E7C lock faceplayer compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_28CA45 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_28CA45 msgbox SlateportCity_PokemonFanClub_Text_280523, MSGBOX_DEFAULT copyvar VAR_0x8007, VAR_0x800A setvar VAR_0x8005, 3 @@ -4435,18 +4412,17 @@ SlateportCity_PokemonFanClub_EventScript_28CA4F:: @ 828CA4F LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59 lock faceplayer - checkflag FLAG_TEMP_2 - goto_eq LilycoveCity_ContestLobby_EventScript_28CB21 + goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_28CB21 setvar VAR_0x8005, 6 special InterviewBefore compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_28CB21 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB21 copyvar VAR_0x8009, VAR_0x8006 msgbox LilycoveCity_ContestLobby_Text_27EF15, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_28CA9B + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CA9B compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_28CAD0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 end LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B @@ -4458,9 +4434,9 @@ LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B lock faceplayer compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_28CADA + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CADA compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_28CAD0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 end LilycoveCity_ContestLobby_EventScript_28CAD0:: @ 828CAD0 @@ -4479,7 +4455,7 @@ LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA lock faceplayer compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_28CAD0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CAD0 msgbox LilycoveCity_ContestLobby_Text_27F0EC, MSGBOX_DEFAULT setflag FLAG_TEMP_2 setvar VAR_0x8005, 6 @@ -4493,11 +4469,11 @@ LilycoveCity_ContestLobby_EventScript_28CB21:: @ 828CB21 LilycoveCity_ContestLobby_EventScript_28CB2B:: @ 828CB2B compare VAR_0x4086, 2 - goto_if 5, LilycoveCity_ContestLobby_EventScript_28CB95 + goto_if_ne LilycoveCity_ContestLobby_EventScript_28CB95 setvar VAR_0x8005, 6 special InterviewBefore compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_28CB95 + goto_if_eq LilycoveCity_ContestLobby_EventScript_28CB95 switch VAR_0x4088 case 0, LilycoveCity_ContestLobby_EventScript_28CB95 case 2, LilycoveCity_ContestLobby_EventScript_28CB91 @@ -4517,18 +4493,17 @@ LilycoveCity_ContestLobby_EventScript_28CB95:: @ 828CB95 BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96 lock faceplayer - checkflag FLAG_TEMP_2 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A + goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerLobby_EventScript_28CC7A setvar VAR_0x8005, 7 special InterviewBefore compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A copyvar VAR_0x8009, VAR_0x8006 msgbox BattleFrontier_BattleTowerLobby_Text_27F704, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CBD8 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CBD8 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC2E + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC2E end BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 @@ -4537,9 +4512,9 @@ BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 multichoice 20, 8, 45, 1 copyvar VAR_0x8008, VAR_RESULT compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_28CC38 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC38 compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_28CC41 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC41 msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, MSGBOX_DEFAULT setvar VAR_0x8004, 12 copyvar VAR_0x8005, VAR_0x8009 @@ -4547,9 +4522,9 @@ BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 lock faceplayer compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC4A + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC4A compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 end BattleFrontier_BattleTowerLobby_EventScript_28CC2E:: @ 828CC2E @@ -4567,7 +4542,7 @@ BattleFrontier_BattleTowerLobby_EventScript_28CC41:: @ 828CC41 BattleFrontier_BattleTowerLobby_EventScript_28CC4A:: @ 828CC4A compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 msgbox BattleFrontier_BattleTowerLobby_Text_27F9FD, MSGBOX_DEFAULT setflag FLAG_TEMP_2 copyvar VAR_0x8004, VAR_0x8008 @@ -4587,11 +4562,11 @@ BattleFrontier_BattleTowerLobby_EventScript_28CC7A:: @ 828CC7A BattleFrontier_BattleTowerLobby_EventScript_28CC84:: @ 828CC84 compare VAR_0x40BC, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 setvar VAR_0x8005, 7 special InterviewBefore compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 clearflag FLAG_HIDE_BATTLE_TOWER_REPORTER return @@ -4697,11 +4672,11 @@ Text_RepelWoreOff: @ 82A4B33 MauvilleCity_GameCorner_EventScript_2A5AB1:: @ 82A5AB1 checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 0 getpricereduction 2 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_2A5B0D + goto_if_eq MauvilleCity_GameCorner_EventScript_2A5B0D addvar VAR_0x8004, 128 goto MauvilleCity_GameCorner_EventScript_2A5B0D end @@ -4709,11 +4684,11 @@ MauvilleCity_GameCorner_EventScript_2A5AB1:: @ 82A5AB1 MauvilleCity_GameCorner_EventScript_2A5ADF:: @ 82A5ADF checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 1 getpricereduction 2 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_2A5B0D + goto_if_eq MauvilleCity_GameCorner_EventScript_2A5B0D addvar VAR_0x8004, 128 goto MauvilleCity_GameCorner_EventScript_2A5B0D end @@ -4778,7 +4753,7 @@ MtPyre_2F_MapScript1_2A8331: @ 82A8331 EventScript_FallDownHole:: @ 82A8337 lockall delay 20 - applymovement 255, GraniteCave_B1F_Movement_2A8369 + applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_B1F_Movement_2A8369 waitmovement 0 playse SE_RU_HYUU delay 60 @@ -4789,7 +4764,7 @@ EventScript_FallDownHole:: @ 82A8337 gUnknown_082A8350:: @ 82A8350 lockall delay 20 - applymovement 255, GraniteCave_B1F_Movement_2A8369 + applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_B1F_Movement_2A8369 waitmovement 0 playse SE_RU_HYUU delay 60 @@ -4815,11 +4790,11 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8395:: @ 82A8395 msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A69, MSGBOX_DEFAULT specialvar VAR_RESULT, sub_818DBE8 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83D0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83D0 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83C6 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83C6 compare VAR_RESULT, 2 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8510 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8510 end LilycoveCity_PokemonCenter_1F_EventScript_2A83C6:: @ 82A83C6 @@ -4832,9 +4807,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A83D0:: @ 82A83D0 msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A7D, MSGBOX_DEFAULT specialvar VAR_RESULT, sub_818DC60 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8435 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8435 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83F7 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83F7 end LilycoveCity_PokemonCenter_1F_EventScript_2A83F7:: @ 82A83F7 @@ -4842,9 +4817,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A83F7:: @ 82A83F7 special sub_818DD14 specialvar VAR_RESULT, sub_818DD54 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8419 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8419 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8427 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8427 end LilycoveCity_PokemonCenter_1F_EventScript_2A8419:: @ 82A8419 @@ -4860,9 +4835,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8427:: @ 82A8427 LilycoveCity_PokemonCenter_1F_EventScript_2A8435:: @ 82A8435 msgbox LilycoveCity_PokemonCenter_1F_Text_2A8B69, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A845E + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A845E end LilycoveCity_PokemonCenter_1F_EventScript_2A8454:: @ 82A8454 @@ -4881,25 +4856,25 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A846C:: @ 82A846C special sub_818DD78 waitstate compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A848E + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A848E compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84AD + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84AD end LilycoveCity_PokemonCenter_1F_EventScript_2A848E:: @ 82A848E msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BEE, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A846C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A846C end LilycoveCity_PokemonCenter_1F_EventScript_2A84AD:: @ 82A84AD specialvar VAR_RESULT, sub_818DE44 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84C9 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84C9 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84D6 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84D6 end LilycoveCity_PokemonCenter_1F_EventScript_2A84C9:: @ 82A84C9 @@ -4911,9 +4886,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A84C9:: @ 82A84C9 LilycoveCity_PokemonCenter_1F_EventScript_2A84D6:: @ 82A84D6 specialvar VAR_RESULT, sub_818DE5C compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84F2 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84F2 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84FF + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84FF end LilycoveCity_PokemonCenter_1F_EventScript_2A84F2:: @ 82A84F2 @@ -4934,9 +4909,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8510:: @ 82A8510 msgbox LilycoveCity_PokemonCenter_1F_Text_2A8D5D, MSGBOX_DEFAULT giveitem_std VAR_0x8004 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8545 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8545 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A854F + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A854F end LilycoveCity_PokemonCenter_1F_EventScript_2A8545:: @ 82A8545 @@ -4955,29 +4930,29 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8554:: @ 82A8554 msgbox LilycoveCity_PokemonCenter_1F_Text_2A8E2B, MSGBOX_DEFAULT specialvar VAR_RESULT, sub_818E038 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8585 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8585 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85AC + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85AC compare VAR_RESULT, 2 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86EC + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86EC end LilycoveCity_PokemonCenter_1F_EventScript_2A8585:: @ 82A8585 specialvar VAR_RESULT, sub_818E06C compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85C8 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85C8 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85D2 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85D2 compare VAR_RESULT, 2 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85E0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85E0 end LilycoveCity_PokemonCenter_1F_EventScript_2A85AC:: @ 82A85AC specialvar VAR_RESULT, sub_818E2D8 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8759 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8759 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85C8 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85C8 end LilycoveCity_PokemonCenter_1F_EventScript_2A85C8:: @ 82A85C8 @@ -4999,9 +4974,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A85EE:: @ 82A85EE setvar VAR_0x8004, 0 msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EEC, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8612 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8612 end LilycoveCity_PokemonCenter_1F_EventScript_2A8612:: @ 82A8612 @@ -5012,15 +4987,15 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8612:: @ 82A8612 LilycoveCity_PokemonCenter_1F_EventScript_2A861C:: @ 82A861C special sub_818E3BC compare VAR_0x8004, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A864C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A864C compare VAR_0x8004, 15 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8656 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8656 LilycoveCity_PokemonCenter_1F_EventScript_2A8635:: @ 82A8635 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8660 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8660 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8689 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8689 end LilycoveCity_PokemonCenter_1F_EventScript_2A864C:: @ 82A864C @@ -5038,9 +5013,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8656:: @ 82A8656 LilycoveCity_PokemonCenter_1F_EventScript_2A8660:: @ 82A8660 msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F7E, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A867F + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A867F compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C end LilycoveCity_PokemonCenter_1F_EventScript_2A867F:: @ 82A867F @@ -5053,9 +5028,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8689:: @ 82A8689 msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F4D, MSGBOX_DEFAULT specialvar VAR_RESULT, sub_818E308 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86C7 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86C7 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86B0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86B0 end LilycoveCity_PokemonCenter_1F_EventScript_2A86B0:: @ 82A86B0 @@ -5080,9 +5055,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A86C7:: @ 82A86C7 LilycoveCity_PokemonCenter_1F_EventScript_2A86EC:: @ 82A86EC specialvar VAR_RESULT, sub_818E298 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8708 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8708 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8716 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8716 end LilycoveCity_PokemonCenter_1F_EventScript_2A8708:: @ 82A8708 @@ -5101,7 +5076,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8724:: @ 82A8724 special sub_818E37C giveitem_std VAR_0x8005 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A874C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A874C goto LilycoveCity_PokemonCenter_1F_EventScript_2A8759 end @@ -5114,9 +5089,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A874C:: @ 82A874C LilycoveCity_PokemonCenter_1F_EventScript_2A8759:: @ 82A8759 msgbox LilycoveCity_PokemonCenter_1F_Text_2A90FB, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8785 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8785 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 end LilycoveCity_PokemonCenter_1F_EventScript_2A8778:: @ 82A8778 @@ -5134,17 +5109,17 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A878D:: @ 82A878D special sub_818E3E0 waitstate compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87AF + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87AF compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87CE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87CE end LilycoveCity_PokemonCenter_1F_EventScript_2A87AF:: @ 82A87AF msgbox LilycoveCity_PokemonCenter_1F_Text_2A9212, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A878D + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A878D end LilycoveCity_PokemonCenter_1F_EventScript_2A87CE:: @ 82A87CE @@ -5158,16 +5133,16 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A87E1:: @ 82A87E1 special sub_818E47C waitstate compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87F8 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87F8 goto LilycoveCity_PokemonCenter_1F_EventScript_2A8817 end LilycoveCity_PokemonCenter_1F_EventScript_2A87F8:: @ 82A87F8 msgbox LilycoveCity_PokemonCenter_1F_Text_2A92D3, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87E1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87E1 end LilycoveCity_PokemonCenter_1F_EventScript_2A8817:: @ 82A8817 @@ -5184,17 +5159,17 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A882A:: @ 82A882A msgbox LilycoveCity_PokemonCenter_1F_Text_2A93A7, MSGBOX_DEFAULT specialvar VAR_RESULT, sub_818E8B4 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8850 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8850 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A886C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A886C end LilycoveCity_PokemonCenter_1F_EventScript_2A8850:: @ 82A8850 specialvar VAR_RESULT, sub_818E8E0 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8876 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8876 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A886C + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A886C end LilycoveCity_PokemonCenter_1F_EventScript_2A886C:: @ 82A886C @@ -5207,12 +5182,12 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8876:: @ 82A8876 msgbox LilycoveCity_PokemonCenter_1F_Text_2A93F4, MSGBOX_DEFAULT checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A89AE + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A89AE msgbox LilycoveCity_PokemonCenter_1F_Text_2A94E8, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88BA + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88BA end LilycoveCity_PokemonCenter_1F_EventScript_2A88B0:: @ 82A88B0 @@ -5225,17 +5200,17 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A88BA:: @ 82A88BA special sub_818E92C waitstate compare VAR_RESULT, 65535 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88D7 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88D7 compare VAR_RESULT, 65535 - goto_if 5, LilycoveCity_PokemonCenter_1F_EventScript_2A88F6 + goto_if_ne LilycoveCity_PokemonCenter_1F_EventScript_2A88F6 end LilycoveCity_PokemonCenter_1F_EventScript_2A88D7:: @ 82A88D7 msgbox LilycoveCity_PokemonCenter_1F_Text_2A9537, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88BA + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88BA end LilycoveCity_PokemonCenter_1F_EventScript_2A88F6:: @ 82A88F6 @@ -5257,7 +5232,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A890A:: @ 82A890A delay 120 waitmoncry compare VAR_0x8004, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A893F + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A893F goto LilycoveCity_PokemonCenter_1F_EventScript_2A894C end @@ -5271,9 +5246,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A894C:: @ 82A894C waitmovement 0 delay 60 compare VAR_0x8004, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8970 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8970 compare VAR_0x8004, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A897E + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A897E end LilycoveCity_PokemonCenter_1F_EventScript_2A8970:: @ 82A8970 @@ -5290,7 +5265,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A897E:: @ 82A897E LilycoveCity_PokemonCenter_1F_EventScript_2A898F:: @ 82A898F specialvar VAR_RESULT, sub_818E8E0 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A89A1 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A89A1 release end @@ -5335,15 +5310,15 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A89C7:: @ 82A89C7 special sub_818E914 special sub_818E960 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A0A + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A0A compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A1D + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A1D compare VAR_RESULT, 2 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A30 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A30 compare VAR_RESULT, 3 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A43 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A43 compare VAR_RESULT, 4 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A56 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A56 end LilycoveCity_PokemonCenter_1F_EventScript_2A8A0A:: @ 82A8A0A @@ -9007,13 +8982,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8 setvar VAR_0x8004, 5 special CallBattlePikeFunction compare VAR_RESULT, 3 - goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 compare VAR_RESULT, 6 - goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 compare VAR_RESULT, 7 - goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 compare VAR_RESULT, 8 - goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 setvar VAR_TEMP_4, 1 turnobject 255, 2 @@ -9079,7 +9054,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F6F:: @ 82C3F6F end BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030:: @ 82C4030 - applymovement 255, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A waitmovement 0 call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1, 255, 4, 7 @@ -9087,7 +9062,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4030:: @ 82C4030 end BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4049:: @ 82C4049 - applymovement 255, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A waitmovement 0 call BattleFrontier_BattlePikeThreePathRoom_EventScript_25BB49 warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3, 255, 4, 19 @@ -9124,9 +9099,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2 setvar VAR_0x8004, 25 special CallBattlePikeFunction compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128 compare VAR_RESULT, 1 - call_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136 + call_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special CallBattlePikeFunction @@ -9146,9 +9121,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2 setvar VAR_0x8004, 3 special CallBattlePikeFunction compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144 compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C waitstate end @@ -9168,7 +9143,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136:: @ 82C4136 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144:: @ 82C4144 BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144:: @ 82C4144 - applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A waitmovement 0 call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2, 255, 2, 7 @@ -9176,7 +9151,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144:: @ 82C4144 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C:: @ 82C415C BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C:: @ 82C415C - applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A waitmovement 0 call BattleFrontier_BattlePikeRandomRoom1_EventScript_25BB49 warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 @@ -9188,9 +9163,9 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 setvar VAR_0x8004, 25 special CallBattlePikeFunction compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128 + call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128 compare VAR_RESULT, 1 - call_if 5, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136 + call_if_ne BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special CallBattlePikeFunction @@ -9210,9 +9185,9 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 setvar VAR_0x8004, 3 special CallBattlePikeFunction compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144 + call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144 compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C + call_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C waitstate end @@ -9245,9 +9220,9 @@ BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E: @ 82C423E setvar VAR_0x8005, 0 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B + goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B + goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B call BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271 BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B:: @ 82C426B @@ -10083,19 +10058,18 @@ PacifidlogTown_PokemonCenter_1F_Text_2C7E7A: @ 82C7E7A SlateportCity_PokemonFanClub_EventScript_2C7F16:: @ 82C7F16 lock faceplayer - checkflag FLAG_0x1B1 - goto_eq SlateportCity_PokemonFanClub_EventScript_2C7F74 + goto_if_set FLAG_0x1B1, SlateportCity_PokemonFanClub_EventScript_2C7F74 msgbox SlateportCity_PokemonFanClub_Text_2C6E37, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A + goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A call SlateportCity_PokemonFanClub_EventScript_2C832D compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A + goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A msgbox SlateportCity_PokemonFanClub_Text_2C6F66, MSGBOX_DEFAULT setvar VAR_0x8005, 23 call SlateportCity_PokemonFanClub_EventScript_2C8326 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A + goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A setflag FLAG_0x1B1 goto SlateportCity_PokemonFanClub_EventScript_2C7F74 end @@ -10113,19 +10087,18 @@ SlateportCity_PokemonFanClub_EventScript_2C7F74:: @ 82C7F74 MauvilleCity_EventScript_2C7F7E:: @ 82C7F7E lock faceplayer - checkflag FLAG_0x1B2 - goto_eq MauvilleCity_EventScript_2C7FDC + goto_if_set FLAG_0x1B2, MauvilleCity_EventScript_2C7FDC msgbox MauvilleCity_Text_2C6FDB, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MauvilleCity_EventScript_2C7FD2 + goto_if_eq MauvilleCity_EventScript_2C7FD2 call MauvilleCity_EventScript_2C832D compare VAR_RESULT, 0 - goto_eq MauvilleCity_EventScript_2C7FD2 + goto_if_eq MauvilleCity_EventScript_2C7FD2 msgbox MauvilleCity_Text_2C70F3, MSGBOX_DEFAULT setvar VAR_0x8005, 16 call MauvilleCity_EventScript_2C8326 compare VAR_RESULT, 0 - goto_eq MauvilleCity_EventScript_2C7FD2 + goto_if_eq MauvilleCity_EventScript_2C7FD2 setflag FLAG_0x1B2 goto MauvilleCity_EventScript_2C7FDC end @@ -10143,19 +10116,18 @@ MauvilleCity_EventScript_2C7FDC:: @ 82C7FDC VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6:: @ 82C7FE6 lock faceplayer - checkflag FLAG_0x1B3 - goto_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 + goto_if_set FLAG_0x1B3, VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7174, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A + goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A call VerdanturfTown_PokemonCenter_1F_EventScript_2C832D compare VAR_RESULT, 0 - goto_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A + goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7243, MSGBOX_DEFAULT setvar VAR_0x8005, 29 call VerdanturfTown_PokemonCenter_1F_EventScript_2C8326 compare VAR_RESULT, 0 - goto_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A + goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A setflag FLAG_0x1B3 goto VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 end @@ -10173,19 +10145,18 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2C8044:: @ 82C8044 LavaridgeTown_House_EventScript_2C804E:: @ 82C804E lock faceplayer - checkflag FLAG_0x1B4 - goto_eq LavaridgeTown_House_EventScript_2C80AC + goto_if_set FLAG_0x1B4, LavaridgeTown_House_EventScript_2C80AC msgbox LavaridgeTown_House_Text_2C72B6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LavaridgeTown_House_EventScript_2C80A2 + goto_if_eq LavaridgeTown_House_EventScript_2C80A2 call LavaridgeTown_House_EventScript_2C832D compare VAR_RESULT, 0 - goto_eq LavaridgeTown_House_EventScript_2C80A2 + goto_if_eq LavaridgeTown_House_EventScript_2C80A2 msgbox LavaridgeTown_House_Text_2C73B1, MSGBOX_DEFAULT setvar VAR_0x8005, 7 call LavaridgeTown_House_EventScript_2C8326 compare VAR_RESULT, 0 - goto_eq LavaridgeTown_House_EventScript_2C80A2 + goto_if_eq LavaridgeTown_House_EventScript_2C80A2 setflag FLAG_0x1B4 goto LavaridgeTown_House_EventScript_2C80AC end @@ -10203,19 +10174,18 @@ LavaridgeTown_House_EventScript_2C80AC:: @ 82C80AC FallarborTown_Mart_EventScript_2C80B6:: @ 82C80B6 lock faceplayer - checkflag FLAG_0x1B5 - goto_eq FallarborTown_Mart_EventScript_2C8114 + goto_if_set FLAG_0x1B5, FallarborTown_Mart_EventScript_2C8114 msgbox FallarborTown_Mart_Text_2C7449, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq FallarborTown_Mart_EventScript_2C810A + goto_if_eq FallarborTown_Mart_EventScript_2C810A call FallarborTown_Mart_EventScript_2C832D compare VAR_RESULT, 0 - goto_eq FallarborTown_Mart_EventScript_2C810A + goto_if_eq FallarborTown_Mart_EventScript_2C810A msgbox FallarborTown_Mart_Text_2C7582, MSGBOX_DEFAULT setvar VAR_0x8005, 8 call FallarborTown_Mart_EventScript_2C8326 compare VAR_RESULT, 0 - goto_eq FallarborTown_Mart_EventScript_2C810A + goto_if_eq FallarborTown_Mart_EventScript_2C810A setflag FLAG_0x1B5 goto FallarborTown_Mart_EventScript_2C8114 end @@ -10233,19 +10203,18 @@ FallarborTown_Mart_EventScript_2C8114:: @ 82C8114 FortreeCity_House2_EventScript_2C811E:: @ 82C811E lock faceplayer - checkflag FLAG_0x1B6 - goto_eq FortreeCity_House2_EventScript_2C817C + goto_if_set FLAG_0x1B6, FortreeCity_House2_EventScript_2C817C msgbox FortreeCity_House2_Text_2C7637, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq FortreeCity_House2_EventScript_2C8172 + goto_if_eq FortreeCity_House2_EventScript_2C8172 call FortreeCity_House2_EventScript_2C832D compare VAR_RESULT, 0 - goto_eq FortreeCity_House2_EventScript_2C8172 + goto_if_eq FortreeCity_House2_EventScript_2C8172 msgbox FortreeCity_House2_Text_2C7721, MSGBOX_DEFAULT setvar VAR_0x8005, 24 call FortreeCity_House2_EventScript_2C8326 compare VAR_RESULT, 0 - goto_eq FortreeCity_House2_EventScript_2C8172 + goto_if_eq FortreeCity_House2_EventScript_2C8172 setflag FLAG_0x1B6 goto FortreeCity_House2_EventScript_2C817C end @@ -10263,19 +10232,18 @@ FortreeCity_House2_EventScript_2C817C:: @ 82C817C LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186:: @ 82C8186 lock faceplayer - checkflag FLAG_0x1B7 - goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 + goto_if_set FLAG_0x1B7, LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C77C6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA call LilycoveCity_DepartmentStoreRooftop_EventScript_2C832D compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C7911, MSGBOX_DEFAULT setvar VAR_0x8005, 14 call LilycoveCity_DepartmentStoreRooftop_EventScript_2C8326 compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA setflag FLAG_0x1B7 goto LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 end @@ -10293,19 +10261,18 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4:: @ 82C81E4 MossdeepCity_EventScript_2C81EE:: @ 82C81EE lock faceplayer - checkflag FLAG_0x1B8 - goto_eq MossdeepCity_EventScript_2C824C + goto_if_set FLAG_0x1B8, MossdeepCity_EventScript_2C824C msgbox MossdeepCity_Text_2C79A6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MossdeepCity_EventScript_2C8242 + goto_if_eq MossdeepCity_EventScript_2C8242 call MossdeepCity_EventScript_2C832D compare VAR_RESULT, 0 - goto_eq MossdeepCity_EventScript_2C8242 + goto_if_eq MossdeepCity_EventScript_2C8242 msgbox MossdeepCity_Text_2C7B0D, MSGBOX_DEFAULT setvar VAR_0x8005, 15 call MossdeepCity_EventScript_2C8326 compare VAR_RESULT, 0 - goto_eq MossdeepCity_EventScript_2C8242 + goto_if_eq MossdeepCity_EventScript_2C8242 setflag FLAG_0x1B8 goto MossdeepCity_EventScript_2C824C end @@ -10323,19 +10290,18 @@ MossdeepCity_EventScript_2C824C:: @ 82C824C SootopolisCity_PokemonCenter_1F_EventScript_2C8256:: @ 82C8256 lock faceplayer - checkflag FLAG_0x1B9 - goto_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 + goto_if_set FLAG_0x1B9, SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 msgbox SootopolisCity_PokemonCenter_1F_Text_2C7B8E, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA + goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA call SootopolisCity_PokemonCenter_1F_EventScript_2C832D compare VAR_RESULT, 0 - goto_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA + goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C98, MSGBOX_DEFAULT setvar VAR_0x8005, 4 call SootopolisCity_PokemonCenter_1F_EventScript_2C8326 compare VAR_RESULT, 0 - goto_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA + goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA setflag FLAG_0x1B9 goto SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 end @@ -10353,19 +10319,18 @@ SootopolisCity_PokemonCenter_1F_EventScript_2C82B4:: @ 82C82B4 PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE:: @ 82C82BE lock faceplayer - checkflag FLAG_0x1BA - goto_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C831C + goto_if_set FLAG_0x1BA, PacifidlogTown_PokemonCenter_1F_EventScript_2C831C msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7CFA, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 + goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 call PacifidlogTown_PokemonCenter_1F_EventScript_2C832D compare VAR_RESULT, 0 - goto_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 + goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E40, MSGBOX_DEFAULT setvar VAR_0x8005, 12 call PacifidlogTown_PokemonCenter_1F_EventScript_2C8326 compare VAR_RESULT, 0 - goto_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 + goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 setflag FLAG_0x1BA goto PacifidlogTown_PokemonCenter_1F_EventScript_2C831C end @@ -10421,11 +10386,11 @@ TrainerHill_Roof_MapScript1_2C8336: @ 82C8336 setvar VAR_0x8005, 5 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq TrainerHill_1F_EventScript_2C83C9 + goto_if_eq TrainerHill_1F_EventScript_2C83C9 compare VAR_RESULT, 3 - goto_eq TrainerHill_1F_EventScript_2C83C9 + goto_if_eq TrainerHill_1F_EventScript_2C83C9 compare VAR_RESULT, 9 - goto_eq TrainerHill_1F_EventScript_2C83C9 + goto_if_eq TrainerHill_1F_EventScript_2C83C9 end TrainerHill_1F_MapScript2_2C8372: @ 82C8372 @@ -10459,7 +10424,7 @@ TrainerHill_1F_EventScript_2C83A6:: @ 82C83A6 setvar VAR_0x8004, 9 special sp194_trainer_tower compare VAR_RESULT, 1 - goto_eq TrainerHill_1F_EventScript_2C83BF + goto_if_eq TrainerHill_1F_EventScript_2C83BF end TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF diff --git a/data/field_effect_helpers.s b/data/field_effect_helpers.s deleted file mode 100644 index e49592659..000000000 --- a/data/field_effect_helpers.s +++ /dev/null @@ -1,11 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 1 - -gUnknown_085CDC6E:: @ 85CDC6E - @the following might be unref, not sure - .byte 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0x00, 0x00 - diff --git a/data/field_effect_misc.s b/data/field_effect_misc.s deleted file mode 100644 index f1b28d906..000000000 --- a/data/field_effect_misc.s +++ /dev/null @@ -1,244 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gSpriteImage_858D978:: @ 858D978 - .incbin "graphics/unknown/858E588/0.4bpp" - - .align 2 -gSpriteImage_858D9F8:: @ 858D9F8 - .incbin "graphics/unknown/858E588/1.4bpp" - - .align 2 -gSpriteImage_858DA78:: @ 858DA78 - .incbin "graphics/unknown/858E588/2.4bpp" - - .align 2 -gSpriteImage_858DAF8:: @ 858DAF8 - .incbin "graphics/unknown/858E588/3.4bpp" - - .align 2 -gSpriteImage_858DB78:: @ 858DB78 - .incbin "graphics/unknown/858E588/4.4bpp" - - .space 32 - - .align 2 -gFieldEffectObjectPalette7:: @ 858DC18 - .incbin "graphics/event_objects/palettes/field_effect_object_palette_07.gbapal" - - .align 2 -gSpriteImage_858DC38:: @ 858DC38 - .incbin "graphics/unknown/858E5D8/0.4bpp" - - .align 2 -gSpriteImage_858DCB8:: @ 858DCB8 - .incbin "graphics/unknown/858E5D8/1.4bpp" - - .align 2 -gSpriteImage_858DD38:: @ 858DD38 - .incbin "graphics/unknown/858E5D8/2.4bpp" - - .align 2 -gSpriteImage_858DDB8:: @ 858DDB8 - .incbin "graphics/unknown/858E5D8/3.4bpp" - - .align 2 -gSpriteImage_858DE38:: @ 858DE38 - .incbin "graphics/unknown/858E5D8/4.4bpp" - - .align 2 -gSpriteImage_858DEB8:: @ 858DEB8 - .incbin "graphics/unknown/858E5B0/0.4bpp" - - .align 2 -gSpriteImage_858DF38:: @ 858DF38 - .incbin "graphics/unknown/858E5B0/1.4bpp" - - .align 2 -gSpriteImage_858DFB8:: @ 858DFB8 - .incbin "graphics/unknown/858E5B0/2.4bpp" - - .align 2 -gSpriteImage_858E038:: @ 858E038 - .incbin "graphics/unknown/858E5B0/3.4bpp" - - .align 2 -gSpriteImage_858E0B8:: @ 858E0B8 - .incbin "graphics/unknown/858E5B0/4.4bpp" - - .align 2 -gSpriteImage_858E138:: @ 858E138 - .incbin "graphics/unknown/858E5B0/5.4bpp" - - .align 2 -gFieldEffectObjectPalette8:: @ 858E1B8 - .incbin "graphics/event_objects/palettes/field_effect_object_palette_08.gbapal" - - .align 2 -gSpriteImage_858E1D8:: @ 858E1D8 - .incbin "graphics/unknown/858E674/0.4bpp" - - .align 2 -gSpriteImage_858E2D8:: @ 858E2D8 - .incbin "graphics/unknown/858E674/1.4bpp" - - .align 2 -gSpriteImage_858E3D8:: @ 858E3D8 - .incbin "graphics/unknown/858E674/2.4bpp" - - .align 2 -gOamData_858E4D8:: @ 858E4D8 - .2byte 0x0000, 0x4000, 0x0800, 0x0000 - - .align 2 -gSpriteAnim_858E4E0:: @ 858E4E0 - .2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_858E4F8:: @ 858E4F8 - .2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_858E510:: @ 858E510 - .2byte 0x0004, 0x0008, 0x0003, 0x0008, 0x0002, 0x0008, 0x0001, 0x0008, 0x0000, 0x0008, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_858E528:: @ 858E528 - .2byte 0x0000, 0x0048, 0x0001, 0x0048, 0x0002, 0x0048, 0x0003, 0x0048, 0x0004, 0x0048, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_858E540:: @ 858E540 - .2byte 0x0004, 0x0048, 0x0003, 0x0048, 0x0002, 0x0048, 0x0001, 0x0048, 0x0000, 0x0048, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_858E558:: @ 858E558 - .2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000 - - .align 2 -gSpriteAnimTable_858E570:: @ 858E570 - .4byte gSpriteAnim_858E4E0 - - .align 2 -gSpriteAnimTable_858E574:: @ 858E574 - .4byte gSpriteAnim_858E4F8 - .4byte gSpriteAnim_858E510 - .4byte gSpriteAnim_858E528 - .4byte gSpriteAnim_858E540 - - .align 2 -gSpriteAnimTable_858E584:: @ 858E584 - .4byte gSpriteAnim_858E558 - - .align 2 -gUnknown_858E588:: @ 858E588 - obj_frame_tiles gSpriteImage_858D978, 0x0080 - obj_frame_tiles gSpriteImage_858D9F8, 0x0080 - obj_frame_tiles gSpriteImage_858DA78, 0x0080 - obj_frame_tiles gSpriteImage_858DAF8, 0x0080 - obj_frame_tiles gSpriteImage_858DB78, 0x0080 - - .align 2 -gUnknown_858E5B0:: @ 858E5B0 - obj_frame_tiles gSpriteImage_858DEB8, 0x0080 - obj_frame_tiles gSpriteImage_858DF38, 0x0080 - obj_frame_tiles gSpriteImage_858DFB8, 0x0080 - obj_frame_tiles gSpriteImage_858E038, 0x0080 - obj_frame_tiles gSpriteImage_858E0B8, 0x0080 - - .align 2 -gUnknown_858E5D8:: @ 858E5D8 - obj_frame_tiles gSpriteImage_858DC38, 0x0080 - obj_frame_tiles gSpriteImage_858DCB8, 0x0080 - obj_frame_tiles gSpriteImage_858DD38, 0x0080 - obj_frame_tiles gSpriteImage_858DDB8, 0x0080 - obj_frame_tiles gSpriteImage_858DE38, 0x0080 - - .align 2 -gUnknown_0858E600:: @ 858E600 - spr_template 0xffff, 0x1003, gOamData_858E4D8, gSpriteAnimTable_858E570, gUnknown_858E588, gDummySpriteAffineAnimTable, sub_80FA18C - - .align 2 -gUnknown_0858E618:: @ 858E618 - spr_template 0xffff, 0x1008, gOamData_858E4D8, gSpriteAnimTable_858E574, gUnknown_858E5B0, gDummySpriteAffineAnimTable, sub_80FA2D8 - - .align 2 -gUnknown_0858E630:: @ 858E630 - spr_template 0xffff, 0x1008, gOamData_858E4D8, gSpriteAnimTable_858E584, gUnknown_858E5D8, gDummySpriteAffineAnimTable, sub_80FA3FC - - .align 2 -gFieldEffectObjectPaletteInfo7:: @ 858E648 - obj_pal gFieldEffectObjectPalette7, 0x1003 - - .align 2 -gFieldEffectObjectPaletteInfo8:: @ 858E650 - obj_pal gFieldEffectObjectPalette8, 0x1008 - - .align 2 -gOamData_858E658:: @ 858E658 - .2byte 0x8000, 0x8000, 0x0800, 0x0000 - - .align 2 -gSpriteAnim_858E660:: @ 858E660 - .2byte 0x0000, 0x0006, 0x0001, 0x0006, 0x0002, 0x0006, 0xffff, 0x0000 - - .align 2 -gSpriteAnimTable_858E670:: @ 858E670 - .4byte gSpriteAnim_858E660 - - .align 2 -gUnknown_0858E674:: @ 858E674 - obj_frame_tiles gSpriteImage_858E1D8, 0x0100 - obj_frame_tiles gSpriteImage_858E2D8, 0x0100 - obj_frame_tiles gSpriteImage_858E3D8, 0x0100 - - .align 2 -gUnknown_0858E68C:: @ 858E68C - spr_template 0xffff, 0x100e, gOamData_858E658, gSpriteAnimTable_858E670, gUnknown_0858E674, gDummySpriteAffineAnimTable, door_restore_tilemap - - .align 2 -@ This uses one of the secret base palettes, so there is no -@ "field_effect_object_palette_09.pal" file. -gFieldEffectObjectPaletteInfo9:: @ 858E6A4 - obj_pal gTilesetPalettes_SecretBase + 5 * 0x20, 0x100E - - .align 2 -gSpriteImage_858E6AC:: @ 858E6AC - .incbin "graphics/unknown/858E84C/0.4bpp" - - .align 2 -gSpriteImage_858E72C:: @ 858E72C - .incbin "graphics/unknown/858E84C/1.4bpp" - - .align 2 -gSpriteImage_858E7AC:: @ 858E7AC - .incbin "graphics/unknown/858E84C/2.4bpp" - - .align 2 -gUnknown_0858E82C:: @ 858E82C - .incbin "graphics/unknown/unknown_58E82C.gbapal" - - .align 2 -gUnknown_0858E84C:: @ 858E84C - obj_frame_tiles gSpriteImage_858E6AC, 0x0080 - obj_frame_tiles gSpriteImage_858E72C, 0x0080 - obj_frame_tiles gSpriteImage_858E7AC, 0x0080 - - .align 2 -gUnknown_0858E864:: @ 858E864 - obj_pal gUnknown_0858E82C, 0x1000 - - .align 2 -gSpriteAnim_858E86C:: @ 858E86C - .2byte 0x0000, 0x001e, 0x0001, 0x001e, 0x0002, 0x001e, 0xfffe, 0x0000 - - .align 2 -gSpriteAnimTable_858E87C:: @ 858E87C - .4byte gSpriteAnim_858E86C - - .align 2 -gUnknown_0858E880:: @ 858E880 - spr_template 0xffff, 0x1000, gEventObjectBaseOam_32x8, gSpriteAnimTable_858E87C, gUnknown_0858E84C, gDummySpriteAffineAnimTable, SpriteCallbackDummy - diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index eab655877..81de41aaa 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -118,7 +118,7 @@ gFieldEffectScript_GroundImpactDust:: @ 82DBB28 field_eff_end gFieldEffectScript_Unknown11:: @ 82DBB32 - field_eff_callnative oei_sweet_scent + field_eff_callnative FldEff_UseSecretPowerCave field_eff_end gFieldEffectScript_BikeHopTallGrass:: @ 82DBB38 @@ -179,11 +179,11 @@ gFieldEffectScript_Unknown25:: @ 82DBBB6 field_eff_end gFieldEffectScript_Unknown26:: @ 82DBBC5 - field_eff_callnative sub_80FA208 + field_eff_callnative FldEff_UseSecretPowerTree field_eff_end gFieldEffectScript_Unknown27:: @ 82DBBCB - field_eff_callnative sub_80FA36C + field_eff_callnative FldEff_UseSecretPowerShrub field_eff_end gFieldEffectScript_TreeDisguise:: @ 82DBBD1 @@ -264,11 +264,11 @@ gFieldEffectScript_HeartIcon:: @ 82DBC56 field_eff_end gFieldEffectScript_Unknown47:: @ 82DBC60 - field_eff_callnative sub_80FA6FC + field_eff_callnative FldEff_NopA6FC field_eff_end gFieldEffectScript_Unknown48:: @ 82DBC66 - field_eff_callnative sub_80FA700 + field_eff_callnative FldEff_NopA700 field_eff_end gFieldEffectScript_JumpOutOfAsh:: @ 82DBC6C @@ -284,7 +284,7 @@ gFieldEffectScript_Unknown51:: @ 82DBC80 field_eff_end gFieldEffectScript_Unknown52:: @ 82DBC86 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo9, sub_80FAA7C + field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo9, FldEff_SandPillar field_eff_end gFieldEffectScript_Bubbles:: @ 82DBC90 @@ -296,15 +296,15 @@ gFieldEffectScript_Unknown54:: @ 82DBC9A field_eff_end gFieldEffectScript_Unknown55:: @ 82DBCA4 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo7, sub_80FA13C + field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo7, FldEff_SecretPowerCave field_eff_end gFieldEffectScript_Unknown56:: @ 82DBCAE - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, sub_80FA248 + field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerTree field_eff_end gFieldEffectScript_Unknown57:: @ 82DBCB8 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, sub_80FA3AC + field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerShrub field_eff_end gFieldEffectScript_Unknown58:: @ 82DBCC2 @@ -320,7 +320,7 @@ gFieldEffectScript_Unknown60:: @ 82DBCD2 field_eff_end gFieldEffectScript_Unknown61:: @ 82DBCD8 - field_eff_callnative sub_80FA458 + field_eff_callnative FldEff_SecretBasePCTurnOn field_eff_end gFieldEffectScript_Unknown62:: @ 82DBCDE diff --git a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc index e40ddad1e..796b91c02 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc @@ -4,13 +4,11 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 82387E1 AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2 lock faceplayer - checkflag FLAG_TRADED_SCANNER_TO_STERN - goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A + goto_if_set FLAG_TRADED_SCANNER_TO_STERN, AbandonedShip_CaptainsOffice_EventScript_23881A checkitem ITEM_SCANNER, 1 compare VAR_RESULT, 1 - goto_eq AbandonedShip_CaptainsOffice_EventScript_238810 - checkflag FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER - goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A + goto_if_eq AbandonedShip_CaptainsOffice_EventScript_238810 + goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER, AbandonedShip_CaptainsOffice_EventScript_23881A msgbox AbandonedShip_CaptainsOffice_Text_238824, MSGBOX_DEFAULT release end diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index 4715e5566..cfdf40163 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -8,10 +8,8 @@ AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F end AbandonedShip_Corridors_B1F_MapScript1_237D98: @ 8237D98 - checkflag FLAG_0x0EF - call_if 0, AbandonedShip_Corridors_B1F_EventScript_237DAB - checkflag FLAG_0x0EF - call_if 1, AbandonedShip_Corridors_B1F_EventScript_237DB5 + call_if_unset FLAG_0x0EF, AbandonedShip_Corridors_B1F_EventScript_237DAB + call_if_set FLAG_0x0EF, AbandonedShip_Corridors_B1F_EventScript_237DB5 end AbandonedShip_Corridors_B1F_EventScript_237DAB:: @ 8237DAB @@ -28,11 +26,10 @@ AbandonedShip_Corridors_B1F_EventScript_237DBF:: @ 8237DBF AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8 lockall - checkflag FLAG_0x0EF - goto_eq AbandonedShip_Corridors_B1F_EventScript_237E09 + goto_if_set FLAG_0x0EF, AbandonedShip_Corridors_B1F_EventScript_237E09 checkitem ITEM_STORAGE_KEY, 1 compare VAR_RESULT, 0 - goto_eq AbandonedShip_Corridors_B1F_EventScript_237DFF + goto_if_eq AbandonedShip_Corridors_B1F_EventScript_237DFF msgbox AbandonedShip_Corridors_B1F_Text_237F4B, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_STORAGE_KEY, 1 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc index e3c3ced5c..cb60d7962 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc @@ -8,22 +8,14 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977 end AbandonedShip_HiddenFloorCorridors_MapScript1_238980: @ 8238980 - checkflag FLAG_0x0F0 - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_2389F1 - checkflag FLAG_0x0F1 - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_2389FB - checkflag FLAG_0x0F2 - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A05 - checkflag FLAG_0x0F3 - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A0F - checkflag FLAG_0x0F0 - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389C9 - checkflag FLAG_0x0F1 - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389D3 - checkflag FLAG_0x0F2 - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389DD - checkflag FLAG_0x0F3 - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389E7 + call_if_unset FLAG_0x0F0, AbandonedShip_HiddenFloorCorridors_EventScript_2389F1 + call_if_unset FLAG_0x0F1, AbandonedShip_HiddenFloorCorridors_EventScript_2389FB + call_if_unset FLAG_0x0F2, AbandonedShip_HiddenFloorCorridors_EventScript_238A05 + call_if_unset FLAG_0x0F3, AbandonedShip_HiddenFloorCorridors_EventScript_238A0F + call_if_set FLAG_0x0F0, AbandonedShip_HiddenFloorCorridors_EventScript_2389C9 + call_if_set FLAG_0x0F1, AbandonedShip_HiddenFloorCorridors_EventScript_2389D3 + call_if_set FLAG_0x0F2, AbandonedShip_HiddenFloorCorridors_EventScript_2389DD + call_if_set FLAG_0x0F3, AbandonedShip_HiddenFloorCorridors_EventScript_2389E7 end AbandonedShip_HiddenFloorCorridors_EventScript_2389C9:: @ 82389C9 @@ -60,11 +52,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A0F:: @ 8238A0F AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19 lockall - checkflag FLAG_0x0F0 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D + goto_if_set FLAG_0x0F0, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D checkitem ITEM_ROOM_1_KEY, 1 compare VAR_RESULT, 0 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5 + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5 msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_1_KEY, 1 @@ -76,11 +67,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19 AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50 lockall - checkflag FLAG_0x0F1 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D + goto_if_set FLAG_0x0F1, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D checkitem ITEM_ROOM_2_KEY, 1 compare VAR_RESULT, 0 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_2_KEY, 1 @@ -92,11 +82,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50 AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87 lockall - checkflag FLAG_0x0F2 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D + goto_if_set FLAG_0x0F2, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D checkitem ITEM_ROOM_4_KEY, 1 compare VAR_RESULT, 0 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09 + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09 msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_4_KEY, 1 @@ -108,11 +97,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87 AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE lockall - checkflag FLAG_0x0F3 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D + goto_if_set FLAG_0x0F3, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D checkitem ITEM_ROOM_6_KEY, 1 compare VAR_RESULT, 0 - goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13 + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13 msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_6_KEY, 1 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc index c89163af2..f8ecc9001 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -11,11 +11,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_238C59:: @ 8238C59 getplayerxy VAR_TEMP_2, VAR_TEMP_3 setvar VAR_TEMP_4, 1 compare VAR_TEMP_2, 21 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CD1 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CD1 compare VAR_TEMP_2, 36 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CD7 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CD7 compare VAR_TEMP_3, 2 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CDD + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CDD switch VAR_TEMP_4 case 1, AbandonedShip_HiddenFloorRooms_EventScript_238CE3 case 2, AbandonedShip_HiddenFloorRooms_EventScript_238D0C @@ -45,7 +45,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3 dofieldeffect 54 specialvar VAR_RESULT, FoundAbandonedShipRoom4Key compare VAR_RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DD3 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DD3 waitfieldeffect 54 delay 10 end @@ -56,10 +56,10 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D0C:: @ 8238D0C AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D specialvar VAR_RESULT, FoundAbandonedShipRoom1Key compare VAR_RESULT, 1 - goto_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32 + goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32 delay 20 compare VAR_RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DB3 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DB3 waitfieldeffect 54 delay 10 end @@ -79,7 +79,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33 dofieldeffect 54 specialvar VAR_RESULT, FoundAbandonedShipRoom6Key compare VAR_RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DE3 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DE3 waitfieldeffect 54 delay 10 end @@ -100,7 +100,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B dofieldeffect 54 specialvar VAR_RESULT, FoundAbandonedShipRoom2Key compare VAR_RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DC3 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DC3 waitfieldeffect 54 delay 10 end diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc index 5c934f263..ec382e56c 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc @@ -5,7 +5,7 @@ AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7 trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq AbandonedShip_Rooms2_1F_EventScript_2380F0 + goto_if_eq AbandonedShip_Rooms2_1F_EventScript_2380F0 msgbox AbandonedShip_Rooms2_1F_Text_23820F, MSGBOX_DEFAULT release end @@ -25,7 +25,7 @@ AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq AbandonedShip_Rooms2_1F_EventScript_238154 + goto_if_eq AbandonedShip_Rooms2_1F_EventScript_238154 msgbox AbandonedShip_Rooms2_1F_Text_23830A, MSGBOX_DEFAULT release end diff --git a/data/maps/AbandonedShip_Rooms_1F/scripts.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc index d64c027a3..5797ed5fb 100644 --- a/data/maps/AbandonedShip_Rooms_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc @@ -14,7 +14,7 @@ AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3 trainerbattle_single TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq AbandonedShip_Rooms_1F_EventScript_237AFE + goto_if_eq AbandonedShip_Rooms_1F_EventScript_237AFE msgbox AbandonedShip_Rooms_1F_Text_237BDB, MSGBOX_DEFAULT release end diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index f3c42b690..133db13a5 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -5,21 +5,19 @@ AncientTomb_MapScripts:: @ 8238FB3 .byte 0 AncientTomb_MapScript1_238FC3: @ 8238FC3 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, AncientTomb_EventScript_238FCD + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AncientTomb_EventScript_238FCD end AncientTomb_EventScript_238FCD:: @ 8238FCD specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, AncientTomb_EventScript_27374E + goto_if_ne AncientTomb_EventScript_27374E removeobject VAR_LAST_TALKED return AncientTomb_MapScript1_238FE1: @ 8238FE1 setflag FLAG_LANDMARK_ANCIENT_TOMB - checkflag FLAG_0x1BD - call_if 0, AncientTomb_EventScript_238FEE + call_if_unset FLAG_0x1BD, AncientTomb_EventScript_238FEE end AncientTomb_EventScript_238FEE:: @ 8238FEE @@ -27,8 +25,7 @@ AncientTomb_EventScript_238FEE:: @ 8238FEE return AncientTomb_MapScript1_238FF2: @ 8238FF2 - checkflag FLAG_SYS_BRAILLE_FLY - call_if 0, AncientTomb_EventScript_238FFC + call_if_unset FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_238FFC end AncientTomb_EventScript_238FFC:: @ 8238FFC @@ -42,8 +39,7 @@ AncientTomb_EventScript_238FFC:: @ 8238FFC AncientTomb_EventScript_239033:: @ 8239033 lockall - checkflag FLAG_SYS_BRAILLE_FLY - goto_eq AncientTomb_EventScript_239046 + goto_if_set FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_239046 braillemessage AncientTomb_Braille_2A6D06 waitbuttonpress hidebox2 @@ -77,11 +73,11 @@ AncientTomb_EventScript_23905A:: @ 823905A clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq AncientTomb_EventScript_2390A1 + goto_if_eq AncientTomb_EventScript_2390A1 compare VAR_RESULT, 4 - goto_eq AncientTomb_EventScript_2390AA + goto_if_eq AncientTomb_EventScript_2390AA compare VAR_RESULT, 5 - goto_eq AncientTomb_EventScript_2390AA + goto_if_eq AncientTomb_EventScript_2390AA setflag FLAG_0x1BD release end diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc index 8eb5e60b9..0b44908e0 100644 --- a/data/maps/AquaHideout_1F/scripts.inc +++ b/data/maps/AquaHideout_1F/scripts.inc @@ -4,10 +4,8 @@ AquaHideout_1F_MapScripts:: @ 8233493 AquaHideout_1F_EventScript_233494:: @ 8233494 lock faceplayer - checkflag FLAG_0x06F - goto_eq AquaHideout_1F_EventScript_2334BC - checkflag FLAG_0x0D4 - goto_eq AquaHideout_1F_EventScript_2334B2 + goto_if_set FLAG_0x06F, AquaHideout_1F_EventScript_2334BC + goto_if_set FLAG_0x0D4, AquaHideout_1F_EventScript_2334B2 msgbox AquaHideout_1F_Text_23351D, MSGBOX_DEFAULT release end @@ -25,10 +23,8 @@ AquaHideout_1F_EventScript_2334BC:: @ 82334BC AquaHideout_1F_EventScript_2334C6:: @ 82334C6 lock faceplayer - checkflag FLAG_0x06F - goto_eq AquaHideout_1F_EventScript_2334EE - checkflag FLAG_0x0D4 - goto_eq AquaHideout_1F_EventScript_2334E4 + goto_if_set FLAG_0x06F, AquaHideout_1F_EventScript_2334EE + goto_if_set FLAG_0x0D4, AquaHideout_1F_EventScript_2334E4 msgbox AquaHideout_1F_Text_233739, MSGBOX_DEFAULT release end diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 9c660d8b1..6a388e625 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -4,22 +4,19 @@ AquaHideout_B1F_MapScripts:: @ 82339A7 .byte 0 AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, AquaHideout_B1F_EventScript_2339BC + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AquaHideout_B1F_EventScript_2339BC end AquaHideout_B1F_EventScript_2339BC:: @ 82339BC specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, AquaHideout_B1F_EventScript_27374E + goto_if_ne AquaHideout_B1F_EventScript_27374E removeobject VAR_LAST_TALKED return AquaHideout_B1F_MapScript1_2339D0: @ 82339D0 - checkflag FLAG_0x1C4 - call_if 0, AquaHideout_B1F_EventScript_2339E3 - checkflag FLAG_0x1C5 - call_if 0, AquaHideout_B1F_EventScript_2339E7 + call_if_unset FLAG_0x1C4, AquaHideout_B1F_EventScript_2339E3 + call_if_unset FLAG_0x1C5, AquaHideout_B1F_EventScript_2339E7 end AquaHideout_B1F_EventScript_2339E3:: @ 82339E3 @@ -43,11 +40,11 @@ AquaHideout_B1F_EventScript_2339EB:: @ 82339EB clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq AquaHideout_B1F_EventScript_233A2F + goto_if_eq AquaHideout_B1F_EventScript_233A2F compare VAR_RESULT, 4 - goto_eq AquaHideout_B1F_EventScript_233A2F + goto_if_eq AquaHideout_B1F_EventScript_233A2F compare VAR_RESULT, 5 - goto_eq AquaHideout_B1F_EventScript_233A2F + goto_if_eq AquaHideout_B1F_EventScript_233A2F setflag FLAG_0x1C4 release end @@ -70,11 +67,11 @@ AquaHideout_B1F_EventScript_233A38:: @ 8233A38 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq AquaHideout_B1F_EventScript_233A7C + goto_if_eq AquaHideout_B1F_EventScript_233A7C compare VAR_RESULT, 4 - goto_eq AquaHideout_B1F_EventScript_233A7C + goto_if_eq AquaHideout_B1F_EventScript_233A7C compare VAR_RESULT, 5 - goto_eq AquaHideout_B1F_EventScript_233A7C + goto_if_eq AquaHideout_B1F_EventScript_233A7C setflag FLAG_0x1C5 release end diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index 584a1a3e1..ab120193d 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -3,8 +3,7 @@ AquaHideout_B2F_MapScripts:: @ 8233DCF .byte 0 AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5 - checkflag FLAG_0x070 - call_if 1, AquaHideout_B2F_EventScript_233DDF + call_if_set FLAG_0x070, AquaHideout_B2F_EventScript_233DDF end AquaHideout_B2F_EventScript_233DDF:: @ 8233DDF diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index 75ac9a4ec..4e25289e6 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -18,9 +18,9 @@ BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0 BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE checkplayergender compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6 + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC return BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6:: @ 82574C6 @@ -44,7 +44,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25752E + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25752E applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08 applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB setvar VAR_TEMP_2, 1 @@ -150,25 +150,25 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0 special CallFrontierUtilFunc copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC + goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257870 + call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257870 compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257877 + call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257877 compare VAR_RESULT, 3 - call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25787E + call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25787E compare VAR_RESULT, 4 - call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257885 + call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257885 compare VAR_RESULT, 5 - call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25788C + call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25788C compare VAR_RESULT, 6 - call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257893 + call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257893 call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257768 + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257768 multichoice 19, 4, 103, 1 switch VAR_RESULT case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_25783A @@ -276,7 +276,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC:: @ 82578BC compare VAR_TEMP_2, 1 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 msgbox BattleFrontier_BattleArenaBattleRoom_Text_257F45, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 @@ -285,7 +285,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4:: @ 82578D4 waitmessage call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25792B + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25792B multichoice 19, 4, 103, 1 switch VAR_RESULT case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257961 @@ -334,7 +334,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F + goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 @@ -352,7 +352,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F:: @ 8257A3F msgbox BattleFrontier_BattleArenaBattleRoom_Text_25810D, MSGBOX_DEFAULT call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C goto BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C @@ -360,7 +360,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257852 + goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257852 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_25813F, MSGBOX_DEFAULT @@ -378,7 +378,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 + goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 @@ -396,7 +396,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8:: @ 8257AF8 msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582F9, MSGBOX_DEFAULT call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257B15 + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257B15 goto BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15 @@ -404,7 +404,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15 setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852 + goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_258323, MSGBOX_DEFAULT @@ -536,7 +536,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257C16:: @ 8257C16 hideobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM removeobject 7 call BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC - applymovement 255, BattleFrontier_BattleArenaBattleRoom_Movement_24C773 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_24C773 setvar VAR_TEMP_1, 1 end diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc index 5ffb5de3d..f83f6f339 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc @@ -10,14 +10,14 @@ BattleFrontier_BattleArenaCorridor_EventScript_2573C9:: @ 82573C9 delay 16 setvar VAR_TEMP_0, 1 applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_25742F - applymovement 255, BattleFrontier_BattleArenaCorridor_Movement_257417 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_257417 waitmovement 0 applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257444 waitmovement 0 msgbox BattleFrontier_BattleArenaCorridor_Text_257449, MSGBOX_SIGN applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257446 waitmovement 0 - applymovement 255, BattleFrontier_BattleArenaCorridor_Movement_25742C + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_25742C waitmovement 0 setvar VAR_0x8006, 0 warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 255, 7, 5 diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 36f864c14..2c53b7ed6 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattleArenaLobby_MapScript2_255C41: @ 8255C41 BattleFrontier_BattleArenaLobby_EventScript_255C4B:: @ 8255C4B setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55 @@ -50,7 +50,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255CCF:: @ 8255CCF setvar VAR_0x8004, 10 special CallFrontierUtilFunc compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0 + goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0 msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_255CF8 @@ -98,7 +98,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59 waitse call BattleFrontier_BattleArenaLobby_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleArenaLobby_EventScript_255DBF + goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255DBF message BattleFrontier_BattleArenaLobby_Text_256B19 waitmessage multichoicedefault 20, 8, 94, 1, 0 @@ -157,7 +157,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FAC + goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FAC setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT @@ -170,7 +170,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 special sub_80F9490 waitstate compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FF8 + goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FF8 msgbox BattleFrontier_BattleArenaLobby_Text_2564CE, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleArenaLobby_EventScript_255FF8 @@ -202,7 +202,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 call BattleFrontier_BattleArenaLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1 + goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1 BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 special SavePlayerParty @@ -215,9 +215,9 @@ BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 setvar VAR_0x8005, 1 special CallFrontierUtilFunc compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256005 + call_if_eq BattleFrontier_BattleArenaLobby_EventScript_256005 compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256050 + call_if_eq BattleFrontier_BattleArenaLobby_EventScript_256050 warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13 setvar VAR_TEMP_0, 0 waitstate @@ -259,12 +259,12 @@ BattleFrontier_BattleArenaLobby_EventScript_256003:: @ 8256003 BattleFrontier_BattleArenaLobby_EventScript_256005:: @ 8256005 applymovement 1, BattleFrontier_BattleArenaLobby_Movement_256034 - applymovement 255, BattleFrontier_BattleArenaLobby_Movement_256041 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_256041 waitmovement 0 opendoor 2, 2 waitdooranim applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25603E - applymovement 255, BattleFrontier_BattleArenaLobby_Movement_25604C + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_25604C waitmovement 0 closedoor 2, 2 waitdooranim @@ -308,12 +308,12 @@ BattleFrontier_BattleArenaLobby_Movement_25604C: @ 825604C BattleFrontier_BattleArenaLobby_EventScript_256050:: @ 8256050 applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25607F - applymovement 255, BattleFrontier_BattleArenaLobby_Movement_256088 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_256088 waitmovement 0 opendoor 11, 2 waitdooranim applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25603E - applymovement 255, BattleFrontier_BattleArenaLobby_Movement_25604C + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_25604C waitmovement 0 closedoor 11, 2 waitdooranim diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index 2d147e426..986d45073 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -13,7 +13,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1 special CallFrontierUtilFunc copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C919 + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C919 call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC end @@ -21,9 +21,9 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC:: @ 824BCDC BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC checkplayergender compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4 + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA return BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4:: @ 824BCF4 @@ -42,7 +42,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A lockall call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C938 + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C938 applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 waitmovement 0 call BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5 @@ -50,9 +50,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A closemessage showobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM compare VAR_TEMP_F, 3 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E + goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E compare VAR_TEMP_E, 0 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A + goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E:: @ 824BD4E applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C775 @@ -66,9 +66,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61 call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E waitmovement 0 compare VAR_TEMP_F, 3 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82 + goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82 compare VAR_TEMP_E, 0 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB + goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 setvar VAR_0x8004, 4 @@ -107,7 +107,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7 applymovement 9, BattleFrontier_BattleDomeBattleRoom_Movement_24C96B waitmovement 0 compare VAR_TEMP_2, 2 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F setvar VAR_0x8004, 19 special CallBattleDomeFunction switch VAR_RESULT @@ -119,11 +119,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F setvar VAR_0x8004, 4 special CallBattleDomeFunction compare VAR_TEMP_2, 0 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1 + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1 compare VAR_TEMP_2, 1 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5 + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5 compare VAR_TEMP_2, 2 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9 + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9 playse SE_W227B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E delay 60 @@ -166,9 +166,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0 applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 waitmovement 0 compare VAR_TEMP_2, 0 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3 + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3 compare VAR_TEMP_2, 1 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC playse SE_W227B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E delay 60 @@ -229,17 +229,17 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5:: @ 824BFD5 setvar VAR_0x8005, 6 special CallBattleDomeFunction compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023 + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special CallBattleDomeFunction compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076 + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special CallBattleDomeFunction compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9 return @@ -303,7 +303,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C2:: @ 824C0C2 BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9:: @ 824C0C9 compare VAR_TEMP_F, 3 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C105 + goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C105 switch VAR_TEMP_E case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158 case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161 @@ -430,7 +430,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9 + goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 @@ -450,7 +450,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9 setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 + goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 closemessage applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B waitmovement 0 @@ -469,7 +469,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373 + goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C373 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 @@ -489,7 +489,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373 setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 closemessage applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B waitmovement 0 @@ -551,17 +551,17 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C502 call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC setvar VAR_TEMP_1, 1 - applymovement 255, BattleFrontier_BattleDomeBattleRoom_Movement_24C773 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_24C773 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 3 - goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF + goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF setvar VAR_0x8004, 9 special CallFrontierUtilFunc copyvar VAR_TEMP_E, VAR_RESULT compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF call BattleFrontier_BattleDomeBattleRoom_EventScript_242170 setobjectxyperm 15, 13, 9 removeobject 15 @@ -573,7 +573,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF:: @ 824C4EF BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0: @ 824C4F0 compare VAR_TEMP_9, 1 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC end BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC:: @ 824C4FC @@ -582,13 +582,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC:: @ 824C4FC BattleFrontier_BattleDomeBattleRoom_EventScript_24C502:: @ 824C502 compare VAR_TEMP_F, 0 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F compare VAR_TEMP_F, 1 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C530 + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C530 compare VAR_TEMP_F, 2 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C594 + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C594 compare VAR_TEMP_F, 3 - call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C652 + call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C652 return BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F:: @ 824C52F @@ -952,7 +952,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5:: @ 824C8F5 BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5:: @ 824C8F5 copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F + goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11 waitstate end @@ -966,14 +966,14 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919 random 2 copyvar VAR_TEMP_D, VAR_RESULT compare VAR_TEMP_D, 0 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E setobjectxyperm 6, 2, 0 setobjectmovementtype 6, 10 return BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938 compare VAR_TEMP_D, 0 - goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E + goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_24C95E return diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc index a4c0dafc4..ac43ee9a4 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc @@ -13,14 +13,14 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E setvar VAR_0x8005, 1 special CallFrontierUtilFunc compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161 + goto_if_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161 applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1B2 - applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1A1 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1A1 waitmovement 0 opendoor 13, 3 waitdooranim applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1BE - applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1AE + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1AE waitmovement 0 closedoor 13, 3 waitdooranim @@ -28,12 +28,12 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E BattleFrontier_BattleDomeCorridor_EventScript_24B161:: @ 824B161 applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1D6 - applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1C1 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1C1 waitmovement 0 opendoor 37, 3 waitdooranim applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1E6 - applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1D2 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1D2 waitmovement 0 closedoor 37, 3 waitdooranim diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index a4a719090..35c32c3fa 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -16,7 +16,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_2497FB: @ 82497FB BattleFrontier_BattleDomeLobby_EventScript_249805:: @ 8249805 setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F @@ -62,7 +62,7 @@ BattleFrontier_BattleDomeLobby_EventScript_24989B:: @ 824989B setvar VAR_0x8004, 10 special CallFrontierUtilFunc compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1 + goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1 msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_2498C9 @@ -128,7 +128,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991 waitse call BattleFrontier_BattleDomeLobby_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleDomeLobby_EventScript_2499E9 + goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_2499E9 message BattleFrontier_BattleDomeLobby_Text_24AE17 waitmessage multichoicedefault 20, 8, 94, 1, 0 @@ -183,15 +183,15 @@ BattleFrontier_BattleDomeLobby_EventScript_249A47:: @ 8249A47 BattleFrontier_BattleDomeLobby_EventScript_249A59:: @ 8249A59 special SavePlayerParty compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CFD + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CFD compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D06 + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D06 BattleFrontier_BattleDomeLobby_EventScript_249A72:: @ 8249A72 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D0F + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D0F compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D15 + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D15 waitmessage multichoice 17, 6, 23, 0 switch VAR_RESULT @@ -210,7 +210,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C15 + goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C15 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT @@ -223,7 +223,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF special sub_80F9490 waitstate compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C61 + goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C61 msgbox BattleFrontier_BattleDomeLobby_Text_24A1C6, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleDomeLobby_EventScript_249C61 @@ -251,7 +251,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 call BattleFrontier_BattleDomeLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A + goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A setvar VAR_0x8004, 22 special CallBattleDomeFunction @@ -273,9 +273,9 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 BattleFrontier_BattleDomeLobby_EventScript_249BFA:: @ 8249BFA compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D1B + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D1B compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D24 + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D24 goto BattleFrontier_BattleDomeLobby_EventScript_249A72 BattleFrontier_BattleDomeLobby_EventScript_249C15:: @ 8249C15 @@ -310,26 +310,26 @@ BattleFrontier_BattleDomeLobby_EventScript_249C6C:: @ 8249C6C BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CDD + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CDD compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CE5 - applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D45 + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CE5 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D45 waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D2D + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D2D compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D33 + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D33 waitdooranim compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CED + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CED compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CF5 - applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D4E + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CF5 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D4E waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D39 + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D39 compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D3F + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D3F waitdooranim return @@ -435,13 +435,13 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84 setvar VAR_0x8005, 9 special CallBattleDomeFunction compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DC9 + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DC9 compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DD2 + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DD2 compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DDB + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DDB compare VAR_RESULT, 3 - call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DE4 + call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DE4 fadescreen 1 setvar VAR_0x8004, 8 special CallBattleDomeFunction diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index 28d634162..6cf1c7817 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E:: @ 824B20E setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218 @@ -18,13 +18,13 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222 compare VAR_0x8006, 1 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7 + goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7 setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 special CallFrontierUtilFunc setvar VAR_TEMP_0, 1 - applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652 waitmovement 0 lockall @@ -34,7 +34,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F:: @ 824B24F switch VAR_RESULT call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1 + goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1 multichoice 16, 0, 73, 1 switch VAR_RESULT case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD @@ -159,7 +159,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D setvar VAR_0x8004, 21 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F + goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F setvar VAR_0x8004, 2 setvar VAR_0x8005, 8 special CallBattleDomeFunction @@ -171,11 +171,11 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D closemessage applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F waitmovement 0 - applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B657 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B657 waitmovement 0 opendoor 5, 1 waitdooranim - applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B659 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B659 waitmovement 0 closedoor 5, 1 waitdooranim @@ -219,15 +219,13 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B:: @ 824B58B - checkflag FLAG_TEMP_1 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5 + goto_if_set FLAG_TEMP_1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5 msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E, MSGBOX_DEFAULT setflag FLAG_TEMP_1 return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0:: @ 824B5A0 - checkflag FLAG_TEMP_1 - goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE + goto_if_set FLAG_TEMP_1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC, MSGBOX_DEFAULT setflag FLAG_TEMP_1 return diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index ab3ea4d7c..f8511315b 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -9,14 +9,14 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB special CallFrontierUtilFunc checkplayergender compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25 + call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25 compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B + call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B setvar VAR_0x8004, 9 special CallFrontierUtilFunc copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3 + goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3 end BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3:: @ 825ADF3 @@ -30,9 +30,9 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00: @ 825AE00 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A:: @ 825AE0A setvar VAR_TEMP_1, 1 - hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM compare VAR_TEMP_F, 0 - goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24 + goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24 hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24:: @ 825AE24 @@ -55,7 +55,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B:: @ 825AE3B closemessage applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B - applymovement 255, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B waitmovement 0 call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4 goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7 @@ -63,9 +63,9 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B:: @ 825AE3B BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67 compare VAR_TEMP_F, 0 - goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B + goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B - applymovement 255, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B waitmovement 0 call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4 setvar VAR_0x8004, 11 @@ -78,7 +78,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 compare VAR_TEMP_F, 0 - goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C + goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C setvar VAR_0x8004, 5 special CallBattlePalaceFunction lockall @@ -111,7 +111,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F:: @ 825AF0F setvar VAR_0x8005, 3 special CallBattleFactoryFunction compare VAR_RESULT, 9999 - goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E + goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E addvar VAR_RESULT, 1 setorcopyvar VAR_0x8006, VAR_RESULT setvar VAR_0x8004, 2 @@ -152,7 +152,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF + goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 @@ -162,14 +162,14 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, MSGBOX_DEFAULT call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C + goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 + goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, MSGBOX_DEFAULT closemessage applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182 @@ -188,7 +188,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E + goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 @@ -198,14 +198,14 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, MSGBOX_DEFAULT call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B + goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 + goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, MSGBOX_DEFAULT waitmessage applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182 @@ -237,7 +237,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105 setvar VAR_0x8005, 3 special CallBattleFactoryFunction compare VAR_RESULT, 9999 - goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E + goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E addvar VAR_RESULT, 1 setorcopyvar VAR_0x8006, VAR_RESULT setvar VAR_0x8004, 2 @@ -247,7 +247,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105 setvar VAR_0x8005, 1 special CallBattleFactoryFunction compare VAR_RESULT, 9999 - goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43 + goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43 addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -293,7 +293,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190:: @ 825B190 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190:: @ 825B190 copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA + goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 4, 8 waitstate end diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index b387fc048..39d729846 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattleFactoryLobby_MapScript2_2583F3: @ 82583F3 BattleFrontier_BattleFactoryLobby_EventScript_2583FD:: @ 82583FD setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407 @@ -56,7 +56,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25849B:: @ 825849B setvar VAR_0x8004, 10 special CallFrontierUtilFunc compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryLobby_EventScript_2584BD + goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2584BD msgbox BattleFrontier_BattleFactoryLobby_Text_258D93, MSGBOX_DEFAULT waitmessage goto BattleFrontier_BattleFactoryLobby_EventScript_2584C6 @@ -103,7 +103,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258506:: @ 8258506 BattleFrontier_BattleFactoryLobby_EventScript_25853B:: @ 825853B call BattleFrontier_BattleFactoryLobby_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryLobby_EventScript_258582 + goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258582 message BattleFrontier_BattleFactoryLobby_Text_259388 waitmessage multichoicedefault 20, 8, 94, 1, 0 @@ -156,15 +156,15 @@ BattleFrontier_BattleFactoryLobby_EventScript_2585DD:: @ 82585DD BattleFrontier_BattleFactoryLobby_EventScript_2585ED:: @ 82585ED special SavePlayerParty compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587B1 + call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587B1 compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587BA + call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587BA BattleFrontier_BattleFactoryLobby_EventScript_258606:: @ 8258606 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C3 + call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587C3 compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C9 + call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587C9 waitmessage multichoice 17, 6, 23, 0 switch VAR_RESULT @@ -211,7 +211,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 call BattleFrontier_BattleFactoryLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleFactoryLobby_EventScript_258783 + goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258783 setvar VAR_0x8006, 0 BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A @@ -219,11 +219,11 @@ BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, MSGBOX_DEFAULT closemessage compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_25875C + call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_25875C compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_258762 + call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258762 applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7 - applymovement 255, BattleFrontier_BattleFactoryLobby_Movement_2587AC + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryLobby_Movement_2587AC waitmovement 0 warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 13 setvar VAR_TEMP_0, 0 @@ -240,9 +240,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_258762:: @ 8258762 BattleFrontier_BattleFactoryLobby_EventScript_258768:: @ 8258768 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587CF + call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587CF compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587D8 + call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587D8 goto BattleFrontier_BattleFactoryLobby_EventScript_258606 BattleFrontier_BattleFactoryLobby_EventScript_258783:: @ 8258783 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index a212ce38f..21681b70a 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -10,12 +10,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5: @ 8259AC5 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF:: @ 8259ACF setvar VAR_TEMP_1, 1 compare VAR_0x8006, 1 - goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA + goto_if_ne BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA setobjectxy 1, 8, 7 turnobject 1, 1 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA:: @ 8259AEA - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF: @ 8259AEF @@ -24,13 +24,13 @@ BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF: @ 8259AEF BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9 compare VAR_0x8006, 1 - goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5 + goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5 setvar VAR_TEMP_0, 1 applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC - applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A waitmovement 0 compare VAR_0x8006, 2 - goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69 + goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69 setvar VAR_0x8004, 13 special CallBattleFactoryFunction setvar VAR_0x8004, 12 @@ -56,9 +56,9 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74 closemessage call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23F2B7 compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B waitmovement 0 warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 255, 6, 11 waitstate @@ -76,7 +76,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 setvar VAR_0x8004, 9 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26 + goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26 playse 263 waitse msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC15, MSGBOX_DEFAULT @@ -97,27 +97,27 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13:: @ 8259C13 setvar VAR_0x8004, 9 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 + goto_if_ne BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E24 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E24 compare VAR_RESULT, 3 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E2B + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E2B compare VAR_RESULT, 4 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E32 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E32 compare VAR_RESULT, 5 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E39 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E39 compare VAR_RESULT, 6 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40 call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6 + goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6 multichoice 19, 4, 103, 1 switch VAR_RESULT case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98 @@ -186,7 +186,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2:: @ 8259DF2 special CallBattleFactoryFunction waitstate compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 + goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 setvar VAR_0x8004, 8 special CallBattleFactoryFunction msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB6C, MSGBOX_DEFAULT @@ -250,41 +250,41 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93:: @ 8259E93 msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4, MSGBOX_DEFAULT compare VAR_0x8005, 0 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62 compare VAR_0x8005, 1 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B compare VAR_0x8005, 2 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74 compare VAR_0x8005, 3 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D compare VAR_0x8005, 4 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86 compare VAR_0x8005, 5 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F compare VAR_0x8005, 6 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98 compare VAR_0x8005, 7 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1 compare VAR_0x8005, 8 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA compare VAR_0x8005, 10 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3 compare VAR_0x8005, 11 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC compare VAR_0x8005, 12 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5 compare VAR_0x8005, 13 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE compare VAR_0x8005, 14 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7 compare VAR_0x8005, 15 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0 compare VAR_0x8005, 16 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9 compare VAR_0x8005, 17 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2 compare VAR_0x8005, 18 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62:: @ 8259F62 @@ -361,23 +361,23 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB:: @ 8259FFB BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004:: @ 825A004 compare VAR_0x8006, 0 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068 compare VAR_0x8006, 1 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071 compare VAR_0x8006, 2 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A compare VAR_0x8006, 3 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083 compare VAR_0x8006, 4 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C compare VAR_0x8006, 5 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095 compare VAR_0x8006, 6 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E compare VAR_0x8006, 7 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7 compare VAR_0x8006, 8 - call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0 + call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0 return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068:: @ 825A068 @@ -421,7 +421,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9:: @ 825A0B9 waitmessage call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110 + goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110 multichoice 19, 4, 103, 1 switch VAR_RESULT case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146 @@ -448,12 +448,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146:: @ 825A146 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C:: @ 825A17C applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3 - applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0 return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B:: @ 825A18B applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B9 - applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6 return BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A: @ 825A19A diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index ccada959e..086c55b17 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -13,9 +13,9 @@ BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833 checkplayergender compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B + goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856 + goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856 return BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B:: @ 824F84B @@ -38,7 +38,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5 + goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B waitmovement 0 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC @@ -107,25 +107,25 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A special CallFrontierUtilFunc copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61 + goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66 + call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66 compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE6D + call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE6D compare VAR_RESULT, 3 - call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE74 + call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE74 compare VAR_RESULT, 4 - call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE7B + call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE7B compare VAR_RESULT, 5 - call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE82 + call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE82 compare VAR_RESULT, 6 - call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89 + call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89 call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42 + goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42 multichoice 19, 4, 103, 1 switch VAR_RESULT case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14 @@ -199,7 +199,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61:: @ 824FB61 compare VAR_TEMP_2, 1 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79 + goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2500DD, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 @@ -208,7 +208,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79:: @ 824FB79 waitmessage call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0 + goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0 multichoice 19, 4, 103, 1 switch VAR_RESULT case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06 @@ -248,7 +248,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA + goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 @@ -258,7 +258,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502C4, MSGBOX_DEFAULT call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7 + goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7 goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 @@ -267,7 +267,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 + goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502FF, MSGBOX_DEFAULT applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC @@ -291,7 +291,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67 + goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 @@ -301,7 +301,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250572, MSGBOX_DEFAULT call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84 + goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84 goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 @@ -310,7 +310,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 + goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25057E, MSGBOX_DEFAULT applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC @@ -357,7 +357,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE3E:: @ 824FE3E hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833 setvar VAR_TEMP_1, 1 - applymovement 255, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 removeobject 2 applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 applymovement 5, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 @@ -461,7 +461,7 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB6: @ 824FEB6 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB:: @ 824FEBB copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5 + goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5 warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 5, 7 waitstate end diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc index 199a67fa6..071f61a09 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc @@ -9,34 +9,34 @@ BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9: @ 824F4A9 BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 delay 16 applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8 - applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8 waitmovement 0 lockall setvar VAR_0x8004, 3 special CallBattlePalaceFunction compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F58B + call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F58B compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F594 + call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F594 compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F59D + call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F59D compare VAR_RESULT, 3 - call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6 + call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6 compare VAR_RESULT, 4 - call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF + call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF closemessage setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special CallFrontierUtilFunc compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F553 + goto_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F553 applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5BD - applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5C4 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5C4 waitmovement 0 opendoor 6, 3 waitdooranim applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5DA - applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9 waitmovement 0 closedoor 6, 3 waitdooranim @@ -44,12 +44,12 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 BattleFrontier_BattlePalaceCorridor_EventScript_24F553:: @ 824F553 applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5CB - applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5D2 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D2 waitmovement 0 opendoor 10, 3 waitdooranim applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5DA - applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9 waitmovement 0 closedoor 10, 3 waitdooranim diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index c81331ddc..56edda8ad 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattlePalaceLobby_MapScript2_24D789: @ 824D789 BattleFrontier_BattlePalaceLobby_EventScript_24D793:: @ 824D793 setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D @@ -50,7 +50,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817 setvar VAR_0x8004, 10 special CallFrontierUtilFunc compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838 + goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838 msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24D840 @@ -98,7 +98,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1 waitse call BattleFrontier_BattlePalaceLobby_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D907 + goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24D907 message BattleFrontier_BattlePalaceLobby_Text_24EF16 waitmessage multichoicedefault 20, 8, 94, 1, 0 @@ -151,18 +151,18 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968 setvar VAR_0x8005, 0 special CallBattlePalaceFunction compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePalaceLobby_EventScript_24D817 + goto_if_ne BattleFrontier_BattlePalaceLobby_EventScript_24D817 special SavePlayerParty compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB9E + call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB9E compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBA7 + call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBA7 BattleFrontier_BattlePalaceLobby_EventScript_24D999:: @ 824D999 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB0 + call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBB0 compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB6 + call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBB6 waitmessage multichoice 17, 6, 23, 0 switch VAR_RESULT @@ -181,7 +181,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45 + goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT @@ -194,7 +194,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 special sub_80F9490 waitstate compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB91 + goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB91 msgbox BattleFrontier_BattlePalaceLobby_Text_24E3C8, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DB91 @@ -226,7 +226,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 call BattleFrontier_BattlePalaceLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A + goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 special SavePlayerParty @@ -243,7 +243,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 BattleFrontier_BattlePalaceLobby_EventScript_24DB20:: @ 824DB20 compare VAR_FRONTIER_BATTLE_MODE, 1 - goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB38 + goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB38 msgbox BattleFrontier_BattlePalaceLobby_Text_24DE17, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24D999 @@ -299,24 +299,24 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DBB6:: @ 824DBB6 BattleFrontier_BattlePalaceLobby_EventScript_24DBBC:: @ 824DBBC compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC23 + call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC23 compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC29 + call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC29 applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC47 - applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC47 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC47 waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC2F + call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC2F compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC35 + call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC35 waitdooranim applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC49 - applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC4C + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC4C waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC3B + call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC3B compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC41 + call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC41 waitdooranim return diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc index 0a0df3636..1155cd67b 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc @@ -18,14 +18,14 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786 setvar VAR_0x8004, 24 setvar VAR_0x8005, 1 special CallBattlePikeFunction - applymovement 255, BattleFrontier_BattlePikeCorridor_Movement_25C80B + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80B applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_25C812 waitmovement 0 lockall msgbox BattleFrontier_BattlePikeCorridor_Text_25C817, MSGBOX_DEFAULT closemessage releaseall - applymovement 255, BattleFrontier_BattlePikeCorridor_Movement_25C80E + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80E waitmovement 0 setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 @@ -42,7 +42,7 @@ BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7: @ 825C7F7 BattleFrontier_BattlePikeCorridor_EventScript_25C801:: @ 825C801 setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattlePikeCorridor_Movement_25C80B: @ 825C80B diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index e4f3e1a6e..70d7f3c6c 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -16,7 +16,7 @@ BattleFrontier_BattlePikeLobby_MapScript2_25B6F3: @ 825B6F3 BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707 @@ -52,7 +52,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B762:: @ 825B762 setvar VAR_0x8004, 10 special CallFrontierUtilFunc compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePikeLobby_EventScript_25B784 + goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25B784 msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, MSGBOX_DEFAULT waitmessage goto BattleFrontier_BattlePikeLobby_EventScript_25B78D @@ -150,7 +150,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA27 + goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA27 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT @@ -163,7 +163,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB special sub_80F9490 waitstate compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA73 + goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA73 msgbox BattleFrontier_BattlePikeLobby_Text_25C0D8, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattlePikeLobby_EventScript_25BA73 @@ -200,7 +200,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C setvar VAR_0x8004, 26 special CallBattlePikeFunction compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C + goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C special SavePlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 @@ -263,7 +263,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA80:: @ 825BA80 BattleFrontier_BattlePikeLobby_EventScript_25BA94:: @ 825BA94 applymovement 1, BattleFrontier_BattlePikeLobby_Movement_25BAA7 - applymovement 255, BattleFrontier_BattlePikeLobby_Movement_25BAA6 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeLobby_Movement_25BAA6 waitmovement 0 return diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc index 79a10880a..1c810900c 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc @@ -112,8 +112,8 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E311, MSGBOX_DEFAULT closemessage - special SpawnScriptEventObject - applymovement 127, BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0 + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0 applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2 waitmovement 0 playse 267 @@ -146,7 +146,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD + goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 @@ -156,14 +156,14 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, MSGBOX_DEFAULT call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D + goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, MSGBOX_DEFAULT waitmessage playfanfare MUS_ME_SYMBOLGET @@ -181,7 +181,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443 + goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 @@ -191,14 +191,14 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, MSGBOX_DEFAULT call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460 + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460 goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460 setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D + goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, MSGBOX_DEFAULT waitmessage playfanfare MUS_ME_SYMBOLGET @@ -215,7 +215,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D:: @ 825D49D applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA waitmovement 0 - applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC waitmovement 0 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 @@ -277,7 +277,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C8 applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CA waitmovement 0 - applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB waitmovement 0 setvar VAR_0x8004, 21 setvar VAR_0x8005, 0 @@ -285,7 +285,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E msgbox gStringVar4, MSGBOX_DEFAULT closemessage delay 16 - applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD waitmovement 0 setvar VAR_0x8004, 21 setvar VAR_0x8005, 1 @@ -302,13 +302,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D5DC:: @ 825D5DC - applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD waitmovement 0 applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CC waitmovement 0 applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7D4 waitmovement 0 - applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF waitmovement 0 end @@ -321,9 +321,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605 special CallBattlePikeFunction copyvar VAR_0x8004, VAR_RESULT compare VAR_0x8004, 0 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643 compare VAR_0x8004, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F, MSGBOX_DEFAULT closemessage releaseall @@ -338,13 +338,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 setvar VAR_0x8004, 11 special CallBattlePikeFunction compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751 compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758 compare VAR_RESULT, 3 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F compare VAR_RESULT, 4 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766 setvar VAR_0x8004, 15 special CallBattlePikeFunction waitstate @@ -375,9 +375,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5 setvar VAR_0x8004, 11 special CallBattlePikeFunction compare VAR_RESULT, 0 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774 setvar VAR_0x8004, 15 special CallBattlePikeFunction waitstate @@ -431,7 +431,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774:: @ 825D774 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B:: @ 825D77B closemessage - applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC waitmovement 0 setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE setvar VAR_0x8005, 0 @@ -608,9 +608,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E setvar VAR_0x8004, 13 special CallBattlePikeFunction compare VAR_RESULT, 2 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881 compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875 + call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875 playfanfare MUS_ME_ASA waitfanfare msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DABE, MSGBOX_DEFAULT diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc index 83031af95..f46760e17 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc @@ -34,7 +34,7 @@ BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE: @ 825E3DE BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8:: @ 825E3E8 setvar VAR_TEMP_4, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2: @ 825E3F2 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc index b00b41fd7..4beb26724 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc @@ -30,7 +30,7 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466: @ 825E466 BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470:: @ 825E470 setvar VAR_TEMP_4, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A @@ -39,9 +39,9 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A setvar VAR_0x8005, 5 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 + goto_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 compare VAR_RESULT, 3 - goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 + goto_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 end BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3:: @ 825E4A3 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index ab40b6ff0..cac594516 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -18,7 +18,7 @@ BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D: @ 825C87D BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887 setvar VAR_TEMP_4, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891 @@ -169,7 +169,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78 setvar VAR_0x8004, 17 special CallBattlePikeFunction compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91 + goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91 setvar VAR_TEMP_5, 255 end @@ -192,7 +192,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB setvar VAR_0x8004, 19 special CallBattlePikeFunction compare VAR_RESULT, 4 - goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2 + goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2 lock faceplayer msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE69, MSGBOX_YESNO diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc index 91a42ebde..4fa8d142a 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc @@ -15,29 +15,29 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D:: @ 825F07D BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A:: @ 825F08A specialvar VAR_TEMP_1, sub_813AA04 compare VAR_TEMP_1, VAR_0x8008 - goto_if 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9 + goto_if_ge BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86, MSGBOX_DEFAULT compare VAR_TEMP_2, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 compare VAR_TEMP_2, 1 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E compare VAR_TEMP_2, 2 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9:: @ 825F0C9 compare VAR_TEMP_2, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5 compare VAR_TEMP_2, 1 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5 checkdecorspace VAR_0x8009 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D copyvar VAR_0x8004, VAR_0x8008 special sub_813A9A4 givedecoration VAR_0x8009 @@ -45,7 +45,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5 playse SE_REGI msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45, MSGBOX_DEFAULT compare VAR_TEMP_2, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E end @@ -58,7 +58,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D:: @ 825F11D BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A checkitemspace VAR_0x8009, 1 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166 copyvar VAR_0x8004, VAR_0x8008 special sub_813A9A4 giveitem VAR_0x8009, 1 @@ -66,7 +66,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A playse SE_REGI msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72, MSGBOX_DEFAULT compare VAR_TEMP_2, 2 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 end @@ -108,7 +108,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185:: @ 825F185 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8B6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 16 setvar VAR_0x8009, 75 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -117,7 +117,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8E6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 32 setvar VAR_0x8009, 103 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -126,7 +126,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F917, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 32 setvar VAR_0x8009, 87 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -135,7 +135,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F949, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 setvar VAR_0x8009, 79 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -144,7 +144,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F979, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 setvar VAR_0x8009, 84 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -153,7 +153,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9A9, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 setvar VAR_0x8009, 85 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -162,7 +162,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9DB, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 setvar VAR_0x8009, 86 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -171,7 +171,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA0A, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 setvar VAR_0x8009, 80 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -180,7 +180,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA3D, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 setvar VAR_0x8009, 81 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -189,7 +189,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F359:: @ 825F359 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA70, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 setvar VAR_0x8009, 82 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -222,7 +222,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E:: @ 825F38E BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAA2, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 128 setvar VAR_0x8009, 113 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -231,7 +231,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAD2, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 128 setvar VAR_0x8009, 111 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -240,7 +240,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB03, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 setvar VAR_0x8009, 114 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -249,7 +249,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB35, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 setvar VAR_0x8009, 115 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -258,7 +258,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F47C:: @ 825F47C msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB68, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 setvar VAR_0x8009, 116 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -292,7 +292,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1:: @ 825F4B1 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB9B, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 64 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -301,7 +301,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBC7, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 67 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -310,7 +310,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBF3, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 65 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -319,7 +319,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC1C, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 70 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -328,7 +328,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC45, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 66 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -337,7 +337,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5CD:: @ 825F5CD msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC70, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 63 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -374,7 +374,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602:: @ 825F602 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE17, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 setvar VAR_0x8009, 200 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -383,7 +383,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCCB, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 setvar VAR_0x8009, 180 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -392,7 +392,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCFA, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 setvar VAR_0x8009, 183 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -401,7 +401,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD29, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 setvar VAR_0x8009, 185 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -410,7 +410,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC9A, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, 179 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -419,7 +419,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD59, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, 186 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -428,7 +428,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD89, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, 187 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -437,7 +437,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDB9, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, 196 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A @@ -446,7 +446,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8:: @ 825F7A8 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDE8, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 + goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, 198 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc index d6d53bc2f..558f6e416 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc @@ -22,7 +22,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77 special CallBattlePyramidFunction delay 2 compare VAR_RESULT, 2 - goto_if 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77 + goto_if_ne BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77 setvar VAR_TEMP_D, 0 releaseall end @@ -50,17 +50,17 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 setvar VAR_0x8005, 5 special CallFrontierUtilFunc compare VAR_RESULT, 4 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 compare VAR_RESULT, 5 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 compare VAR_RESULT, 3 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 compare VAR_RESULT, 9 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 setvar VAR_0x8004, 14 setvar VAR_0x8005, 8 special CallFrontierUtilFunc @@ -135,7 +135,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc compare VAR_RESULT, 7 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45 setvar VAR_0x8004, 6 special CallBattlePyramidFunction setvar VAR_0x8004, 2 @@ -167,7 +167,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A:: @ 8252C6A special CallBattlePyramidFunction callstd STD_FIND_ITEM compare VAR_0x8007, 0 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87 setvar VAR_0x8004, 8 special CallBattlePyramidFunction diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index d890b2d06..686a1bfb2 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721 BattleFrontier_BattlePyramidLobby_EventScript_25072B: @ 825072B setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735 @@ -53,7 +53,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507B1:: @ 82507B1 setvar VAR_0x8004, 10 special CallFrontierUtilFunc compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2 + goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2 msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_2507DA @@ -63,7 +63,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507D2:: @ 82507D2 BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA special sub_81B95E0 compare VAR_RESULT, 1 - call_if 1, BattleFrontier_BattlePyramidLobby_EventScript_250DDB + call_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250DDB clearflag FLAG_SPECIAL_FLAG_0x4004 setvar VAR_0x8004, 8 special CallFrontierUtilFunc @@ -154,7 +154,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75 + goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT @@ -167,7 +167,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 special sub_80F9490 waitstate compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AC1 + goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250AC1 msgbox BattleFrontier_BattlePyramidLobby_Text_2514E6, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattlePyramidLobby_EventScript_250AC1 @@ -203,7 +203,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 call BattleFrontier_BattlePyramidLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA + goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 special SavePlayerParty @@ -286,7 +286,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28 setvar VAR_0x8005, 5 special CallBattlePyramidFunction compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B53 + goto_if_ne BattleFrontier_BattlePyramidLobby_EventScript_250B53 setvar VAR_RESULT, 0 goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 return @@ -304,7 +304,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66 setvar VAR_0x8005, 6 special CallBattlePyramidFunction compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B91 + goto_if_ne BattleFrontier_BattlePyramidLobby_EventScript_250B91 setvar VAR_RESULT, 0 goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 return @@ -434,14 +434,14 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42 BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56 applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DC4 - applymovement 255, BattleFrontier_BattlePyramidLobby_Movement_250DCD + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DCD waitmovement 0 msgbox BattleFrontier_BattlePyramidLobby_Text_251569, MSGBOX_DEFAULT setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special CallBattlePyramidFunction compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250D94 + goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250D94 msgbox BattleFrontier_BattlePyramidLobby_Text_2515AD, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250D9C @@ -457,7 +457,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D9C:: @ 8250D9C closemessage applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DD5 waitmovement 0 - applymovement 255, BattleFrontier_BattlePyramidLobby_Movement_250DD8 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DD8 waitmovement 0 return @@ -497,7 +497,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB setflag FLAG_SPECIAL_FLAG_0x4004 special sub_81C6A94 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250E00 + goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250E00 message BattleFrontier_BattlePyramidLobby_Text_2518C6 waitmessage goto BattleFrontier_BattlePyramidLobby_EventScript_250E09 @@ -535,7 +535,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250E50:: @ 8250E50 BattleFrontier_BattlePyramidLobby_EventScript_250E60:: @ 8250E60 special sub_81B95E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250E6F + goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250E6F return BattleFrontier_BattlePyramidLobby_EventScript_250E6F:: @ 8250E6F diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index d7a1a3c3b..d04fe23f2 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -19,9 +19,9 @@ BattleFrontier_BattlePyramidTop_MapScript2_2550CE: @ 82550CE BattleFrontier_BattlePyramidTop_EventScript_2550D8:: @ 82550D8 setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 compare VAR_TEMP_C, 0 - goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2550F3 + goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2550F3 setobjectxyperm 2, 0, 0 BattleFrontier_BattlePyramidTop_EventScript_2550F3:: @ 82550F3 @@ -31,7 +31,7 @@ BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4 setvar VAR_0x8004, 9 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_25510C + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_25510C call BattleFrontier_BattlePyramidTop_EventScript_242170 BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C @@ -46,11 +46,11 @@ BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C setvar VAR_0x8005, 5 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 compare VAR_RESULT, 3 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 compare VAR_RESULT, 9 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 end BattleFrontier_BattlePyramidTop_MapScript2_25516E: @ 825516E @@ -89,14 +89,14 @@ BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0 lock faceplayer compare VAR_TEMP_D, 0 - goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255236 + goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255236 compare VAR_TEMP_C, 0 - goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255240 + goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255240 msgbox BattleFrontier_BattlePyramidTop_Text_255410, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD waitmovement 0 - applymovement 255, BattleFrontier_BattlePyramidTop_Movement_255403 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidTop_Movement_255403 waitmovement 0 applymovement 1, BattleFrontier_BattlePyramidTop_Movement_255400 waitmovement 0 @@ -137,9 +137,9 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2552D0 - special SpawnScriptEventObject - applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C + goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2552D0 + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C waitmovement 0 msgbox BattleFrontier_BattlePyramidTop_Text_255669, MSGBOX_DEFAULT closemessage @@ -161,14 +161,14 @@ BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA call BattleFrontier_BattlePyramidTop_EventScript_2553ED playbgm MUS_PYRAMID_TOP, 0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_2552FB + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_2552FB goto BattleFrontier_BattlePyramidTop_EventScript_252B42 BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_25521A + goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_25521A msgbox BattleFrontier_BattlePyramidTop_Text_255873, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePyramidTop_Text_2558E9 @@ -184,9 +184,9 @@ BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255388 - special SpawnScriptEventObject - applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C + goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255388 + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C waitmovement 0 msgbox BattleFrontier_BattlePyramidTop_Text_255951, MSGBOX_DEFAULT closemessage @@ -208,14 +208,14 @@ BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392 call BattleFrontier_BattlePyramidTop_EventScript_2553ED playbgm MUS_PYRAMID_TOP, 0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_2553B3 + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_2553B3 goto BattleFrontier_BattlePyramidTop_EventScript_252B42 BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3 setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePyramidTop_EventScript_25521A + goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_25521A msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePyramidTop_Text_255B59 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index 83b78d40e..1e953db23 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -18,16 +18,16 @@ BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62: @ 8241B62 BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C setvar VAR_TEMP_0, 1 - applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_242179 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242179 waitmovement 0 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3 + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D waitmovement 0 - applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_24217E + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E waitmovement 0 setvar VAR_TEMP_2, 1 setvar VAR_0x8004, 2 @@ -76,10 +76,10 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F setvar VAR_0x8004, 9 special CallFrontierUtilFunc compare VAR_RESULT, 0 - call_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3 + call_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D waitmovement 0 - applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_24217E + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E waitmovement 0 msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, MSGBOX_DEFAULT playfanfare MUS_ME_ASA @@ -91,14 +91,14 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F special CallFrontierUtilFunc copyvar VAR_TEMP_F, VAR_RESULT compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A + goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special CallFrontierUtilFunc call BattleFrontier_BattleTowerBattleRoom_EventScript_241E44 call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A multichoice 19, 4, 103, 1 switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC @@ -146,7 +146,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA:: @ 8241DAA BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC:: @ 8241DDC closemessage - applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_242180 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242180 waitmovement 0 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192 waitmovement 0 @@ -246,7 +246,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A:: @ 8241F0A compare VAR_TEMP_2, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2424C2, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 @@ -255,7 +255,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241F22:: @ 8241F22 waitmessage call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F79 + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F79 multichoice 19, 4, 103, 1 switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF @@ -275,7 +275,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241F79:: @ 8241F79 BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF call BattleFrontier_BattleTowerBattleRoom_EventScript_242170 closemessage - applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_242180 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242180 waitmovement 0 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192 waitmovement 0 @@ -290,7 +290,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_242029 + goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_242029 msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 @@ -300,7 +300,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029 msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, MSGBOX_DEFAULT call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_242046 + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_242046 goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03 BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046 @@ -308,7 +308,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046 setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 + goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleTowerBattleRoom_Text_24270E @@ -324,7 +324,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085 setvar VAR_0x8005, 7 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 + goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 @@ -334,7 +334,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, MSGBOX_DEFAULT call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03 BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF @@ -342,7 +342,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF setvar VAR_0x8004, 12 special CallFrontierUtilFunc compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleTowerBattleRoom_Text_242932 @@ -368,7 +368,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E waitstate copyvar VAR_0x8004, VAR_FRONTIER_BATTLE_MODE compare VAR_0x8004, 3 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A setvar VAR_0x8004, 18 special CallFrontierUtilFunc special HealPlayerParty @@ -486,11 +486,11 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8:: @ 82421B8 BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8:: @ 82421B8 copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8 + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8 compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2 + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2 compare VAR_RESULT, 3 - goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC + goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate end diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index fa17ef5af..ac3a81cec 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -6,9 +6,9 @@ BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8 BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8 compare VAR_FRONTIER_BATTLE_MODE, 2 - call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F + call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F compare VAR_FRONTIER_BATTLE_MODE, 3 - call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F + call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F end BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F @@ -16,7 +16,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F special sub_8161F74 checkplayergender compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29 + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29 setvar VAR_OBJ_GFX_ID_F, 0 return @@ -33,7 +33,7 @@ BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33 .2byte 0 BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D - hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 end BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43 @@ -49,7 +49,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4 + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4 applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E waitmovement 0 @@ -71,7 +71,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4 applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_24952E waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 3 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026 + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026 setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 special sub_8161F74 @@ -143,7 +143,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 3 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118 + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118 msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121 @@ -158,7 +158,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_FRONTIER_BATTLE_MODE, 3 - call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249514 + call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249514 playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty @@ -169,10 +169,10 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143 special CallFrontierUtilFunc call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD compare VAR_FRONTIER_BATTLE_MODE, 3 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1 + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1 multichoice 19, 4, 103, 1 switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 @@ -257,7 +257,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD compare VAR_FRONTIER_BATTLE_MODE, 3 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E copyvar VAR_TEMP_F, VAR_RESULT switch VAR_TEMP_F case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249354 @@ -349,8 +349,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249412:: @ 8249412 return BattleFrontier_BattleTowerBattleRoom2_EventScript_249417:: @ 8249417 - checkflag FLAG_TEMP_2 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249457 + goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249457 multichoice 19, 6, 105, 1 switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483 @@ -375,7 +374,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249483:: @ 8249483 special sub_813B568 waitstate compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E + goto_if_ne BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249412 end @@ -396,7 +395,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD:: @ 82494DD waitmessage multichoicedefault 20, 8, 94, 1, 0 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA + goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 end diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc index 9ff6bbc59..55e21dedb 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc @@ -5,7 +5,7 @@ BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA BattleFrontier_BattleTowerCorridor_MapScript1_241AB5: @ 8241AB5 compare VAR_0x8006, 1 - goto_eq BattleFrontier_BattleTowerCorridor_EventScript_241AD3 + goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_241AD3 setmetatile 12, 0, 519, 0 setmetatile 12, 1, 527, 0 end @@ -22,15 +22,15 @@ BattleFrontier_BattleTowerCorridor_MapScript2_241AE6: @ 8241AE6 BattleFrontier_BattleTowerCorridor_EventScript_241AF0:: @ 8241AF0 setvar VAR_TEMP_0, 1 compare VAR_0x8006, 1 - goto_eq BattleFrontier_BattleTowerCorridor_EventScript_241B16 + goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_241B16 applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B3A - applymovement 255, BattleFrontier_BattleTowerCorridor_Movement_241B39 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B39 waitmovement 0 goto BattleFrontier_BattleTowerCorridor_EventScript_241B27 BattleFrontier_BattleTowerCorridor_EventScript_241B16:: @ 8241B16 applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B37 - applymovement 255, BattleFrontier_BattleTowerCorridor_Movement_241B36 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B36 waitmovement 0 BattleFrontier_BattleTowerCorridor_EventScript_241B27:: @ 8241B27 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc index d28fa105d..75282775f 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc @@ -6,9 +6,9 @@ BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A compare VAR_FRONTIER_BATTLE_MODE, 2 - call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D71 + call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D71 compare VAR_FRONTIER_BATTLE_MODE, 3 - call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D91 + call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D91 end BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71 @@ -16,7 +16,7 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71 special sub_8161F74 checkplayergender compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B + goto_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B setvar VAR_OBJ_GFX_ID_F, 0 return @@ -33,7 +33,7 @@ BattleFrontier_BattleTowerCorridor2_MapScript2_248D95: @ 8248D95 .2byte 0 BattleFrontier_BattleTowerCorridor2_EventScript_248D9F:: @ 8248D9F - hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 special sub_8139980 @@ -88,13 +88,13 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC BattleFrontier_BattleTowerCorridor2_EventScript_248E71:: @ 8248E71 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E + call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248E9E compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E + call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248E9E compare VAR_FRONTIER_BATTLE_MODE, 2 - call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EA8 + call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248EA8 compare VAR_FRONTIER_BATTLE_MODE, 3 - call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EB2 + call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248EB2 return BattleFrontier_BattleTowerCorridor2_EventScript_248E9E:: @ 8248E9E diff --git a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc index 968d45772..0479641a7 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc @@ -10,7 +10,7 @@ BattleFrontier_BattleTowerElevator_MapScript2_2419E6: @ 82419E6 BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0 setvar VAR_TEMP_0, 1 applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A86 - applymovement 255, BattleFrontier_BattleTowerElevator_Movement_241A8A + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A8A waitmovement 0 special sub_813A080 waitse @@ -18,20 +18,20 @@ BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0 waitstate delay 48 applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E - applymovement 255, BattleFrontier_BattleTowerElevator_Movement_241A92 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A92 waitmovement 0 call BattleFrontier_BattleTowerElevator_EventScript_241A28 end BattleFrontier_BattleTowerElevator_EventScript_241A28:: @ 8241A28 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55 + call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A55 compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55 + call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A55 compare VAR_FRONTIER_BATTLE_MODE, 2 - call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A5F + call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A5F compare VAR_FRONTIER_BATTLE_MODE, 3 - call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A72 + call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A72 return BattleFrontier_BattleTowerElevator_EventScript_241A55:: @ 8241A55 @@ -40,8 +40,7 @@ BattleFrontier_BattleTowerElevator_EventScript_241A55:: @ 8241A55 return BattleFrontier_BattleTowerElevator_EventScript_241A5F:: @ 8241A5F - checkflag FLAG_0x152 - goto_if 0, BattleFrontier_BattleTowerElevator_EventScript_241A7C + goto_if_unset FLAG_0x152, BattleFrontier_BattleTowerElevator_EventScript_241A7C warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2 waitstate return @@ -86,6 +85,6 @@ BattleFrontier_BattleTowerElevator_MapScript2_241A96: @ 8241A96 BattleFrontier_BattleTowerElevator_EventScript_241AA0:: @ 8241AA0 setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 0911ea5f2..29315eff5 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -14,9 +14,8 @@ BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694 setvar VAR_0x8004, 10 special CallApprenticeFunction compare VAR_0x8004, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6B5 - checkflag FLAG_0x934 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6C1 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E6B5 + goto_if_set FLAG_0x934, BattleFrontier_BattleTowerLobby_EventScript_23E6C1 BattleFrontier_BattleTowerLobby_EventScript_23E6B5:: @ 823E6B5 clearflag FLAG_HIDE_APPRENTICE @@ -36,7 +35,7 @@ BattleFrontier_BattleTowerLobby_MapScript2_23E6C9: @ 823E6C9 BattleFrontier_BattleTowerLobby_EventScript_23E6D3:: @ 823E6D3 setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD @@ -79,7 +78,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E758:: @ 823E758 setvar VAR_0x8004, 10 special CallFrontierUtilFunc compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E778 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E778 message BattleFrontier_BattleTowerLobby_Text_23F60D waitmessage goto BattleFrontier_BattleTowerLobby_EventScript_23E780 @@ -91,7 +90,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780 setvar VAR_0x8004, 5 special sub_8161F74 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E7A5 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E7A5 message BattleFrontier_BattleTowerLobby_Text_23F844 waitmessage playfanfare MUS_FANFA4 @@ -108,7 +107,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5 setvar VAR_0x8005, 1 special sub_8161F74 compare VAR_RESULT, 49 - goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E7E2 + goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E7E2 msgbox BattleFrontier_BattleTowerLobby_Text_23F79D, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2 @@ -120,14 +119,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2 BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2 compare VAR_FRONTIER_BATTLE_MODE, 2 - goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E81E - checkflag FLAG_0x152 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E81E + goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E81E + goto_if_set FLAG_0x152, BattleFrontier_BattleTowerLobby_EventScript_23E81E setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_8161F74 compare VAR_RESULT, 0 - goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E830 + goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E830 BattleFrontier_BattleTowerLobby_EventScript_23E81E:: @ 823E81E setvar VAR_0x8004, 2 @@ -161,7 +159,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D waitse call BattleFrontier_BattleTowerLobby_EventScript_23E8E0 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8DF + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E8DF message BattleFrontier_BattleTowerLobby_Text_23FE3C waitmessage multichoicedefault 20, 8, 94, 1, 0 @@ -184,7 +182,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8B4:: @ 823E8B4 setvar VAR_0x8004, 19 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8D7 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E8D7 playse SE_SAVE msgbox BattleFrontier_BattleTowerLobby_Text_2423CD, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23E8DF @@ -215,7 +213,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE lock faceplayer compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23E930 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E930 message BattleFrontier_BattleTowerLobby_Text_23F737 waitmessage message BattleFrontier_BattleTowerLobby_Text_23F754 @@ -264,7 +262,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT @@ -277,7 +275,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 special sub_80F9490 waitstate compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 @@ -305,7 +303,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A call BattleFrontier_BattleTowerLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 setvar VAR_0x40BC, 1 goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 @@ -344,7 +342,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT @@ -357,7 +355,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED special sub_80F9490 waitstate compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 @@ -385,7 +383,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 call BattleFrontier_BattleTowerLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 setvar VAR_0x40BC, 0 goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 @@ -425,7 +423,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT @@ -438,7 +436,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 special sub_80F9490 waitstate compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 @@ -466,7 +464,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF call BattleFrontier_BattleTowerLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 setvar VAR_0x40BC, 0 goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3 @@ -505,7 +503,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT @@ -518,7 +516,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 special sub_80F9490 waitstate compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 @@ -549,11 +547,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 call BattleFrontier_BattleTowerLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3E8 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3E8 goto BattleFrontier_BattleTowerLobby_EventScript_23F2C5 end @@ -606,9 +604,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF80:: @ 823EF80 BattleFrontier_BattleTowerLobby_EventScript_23EF8A:: @ 823EF8A compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23EFA1 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23EFA1 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23EFAB + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23EFAB end BattleFrontier_BattleTowerLobby_EventScript_23EFA1:: @ 823EFA1 @@ -744,7 +742,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108 special sub_8161F74 delay 1 compare VAR_RESULT, 6 - goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23F108 + goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23F108 call BattleFrontier_BattleTowerLobby_EventScript_23F135 clearflag FLAG_0x077 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 @@ -755,7 +753,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108 BattleFrontier_BattleTowerLobby_EventScript_23F135:: @ 823F135 call BattleFrontier_BattleTowerLobby_EventScript_23F1A7 compare VAR_FRONTIER_BATTLE_MODE, 3 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F152 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F152 msgbox BattleFrontier_BattleTowerLobby_Text_23FE11, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F15B @@ -769,12 +767,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23F15B:: @ 823F15B call BattleFrontier_BattleTowerLobby_EventScript_23F1E8 call BattleFrontier_BattleTowerLobby_EventScript_23F22D applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_23F195 - applymovement 255, BattleFrontier_BattleTowerLobby_Movement_23F195 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_23F195 waitmovement 0 opendoor VAR_0x8004, 1 waitdooranim applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_23F199 - applymovement 255, BattleFrontier_BattleTowerLobby_Movement_23F19C + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_23F19C waitmovement 0 closedoor VAR_0x8004, 1 waitdooranim @@ -808,13 +806,13 @@ BattleFrontier_BattleTowerLobby_Movement_23F1A0: @ 823F1A0 BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D4 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1D4 compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D9 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1D9 compare VAR_FRONTIER_BATTLE_MODE, 2 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1DE + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1DE compare VAR_FRONTIER_BATTLE_MODE, 3 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1E3 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1E3 return BattleFrontier_BattleTowerLobby_EventScript_23F1D4:: @ 823F1D4 @@ -835,13 +833,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F1E3:: @ 823F1E3 BattleFrontier_BattleTowerLobby_EventScript_23F1E8:: @ 823F1E8 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F215 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F215 compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F21B + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F21B compare VAR_FRONTIER_BATTLE_MODE, 2 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F221 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F221 compare VAR_FRONTIER_BATTLE_MODE, 3 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F227 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F227 return BattleFrontier_BattleTowerLobby_EventScript_23F215:: @ 823F215 @@ -862,13 +860,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F227:: @ 823F227 BattleFrontier_BattleTowerLobby_EventScript_23F22D:: @ 823F22D compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F25A + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F25A compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F260 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F260 compare VAR_FRONTIER_BATTLE_MODE, 2 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F266 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F266 compare VAR_FRONTIER_BATTLE_MODE, 3 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F26C + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F26C return BattleFrontier_BattleTowerLobby_EventScript_23F25A:: @ 823F25A @@ -889,13 +887,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F26C:: @ 823F26C BattleFrontier_BattleTowerLobby_EventScript_23F272:: @ 823F272 compare VAR_FRONTIER_BATTLE_MODE, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F29F + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F29F compare VAR_FRONTIER_BATTLE_MODE, 1 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2A5 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F2A5 compare VAR_FRONTIER_BATTLE_MODE, 2 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2AB + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F2AB compare VAR_FRONTIER_BATTLE_MODE, 3 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2B1 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F2B1 return BattleFrontier_BattleTowerLobby_EventScript_23F29F:: @ 823F29F @@ -935,25 +933,25 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5 special sub_80B2DA4 waitstate compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3AF + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3AF compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2772D2 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2772D2 compare VAR_RESULT, 3 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F327 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F327 compare VAR_RESULT, 4 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F351 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F351 compare VAR_RESULT, 5 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E6 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E6 compare VAR_RESULT, 6 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2772C5 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2772C5 compare VAR_RESULT, 11 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 end BattleFrontier_BattleTowerLobby_EventScript_23F327:: @ 823F327 special CloseLink compare VAR_0x8005, 3 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F msgbox BattleFrontier_BattleTowerLobby_Text_278255, MSGBOX_DEFAULT release end @@ -974,11 +972,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351 BattleFrontier_BattleTowerLobby_EventScript_23F366:: @ 823F366 special CloseLink compare VAR_0x8005, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F394 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F394 compare VAR_0x8005, 1 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F39D + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F39D compare VAR_0x8005, 2 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F3A6 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3A6 msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, MSGBOX_DEFAULT release end @@ -1035,26 +1033,26 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3 BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430 call BattleFrontier_BattleTowerLobby_EventScript_277B30 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 compare VAR_RESULT, 5 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3 compare VAR_RESULT, 8 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F430 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F430 compare VAR_RESULT, 11 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 release return BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463 call BattleFrontier_BattleTowerLobby_EventScript_277B35 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 compare VAR_RESULT, 5 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3 compare VAR_RESULT, 8 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F463 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F463 compare VAR_RESULT, 11 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 release return diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index b0c35a7fc..99cbbb662 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -11,8 +11,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7 end BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0 - checkflag FLAG_0x152 - goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA + goto_if_set FLAG_0x152, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1 clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2 clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3 @@ -44,7 +43,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14: @ 8243E14 .2byte 0 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E:: @ 8243E1E - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23: @ 8243E23 @@ -60,12 +59,12 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E35:: @ 8243E35 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 lockall - applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75 waitmovement 0 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77 waitmovement 0 moveobjectoffscreen 1 - applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 waitmovement 0 msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT special HealPlayerParty @@ -89,7 +88,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A waitmessage multichoicedefault 20, 8, 94, 1, 0 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D + goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C, MSGBOX_DEFAULT release end @@ -119,19 +118,19 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EE4:: @ 8243EE4 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26 - applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A waitmovement 0 return BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EF6: @ 8243EF6 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26 - applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E waitmovement 0 return BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F08: @ 8243F08 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26 - applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22 waitmovement 0 return @@ -166,8 +165,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29:: @ 8243F29 end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36 - checkflag FLAG_0x152 - goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3 + goto_if_set FLAG_0x152, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3 setvar VAR_0x8004, 11 setvar VAR_0x8005, 0 special sub_8161F74 @@ -193,9 +191,9 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36 waitbuttonpress closemessage compare VAR_FACING, 1 - call_if 5, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4 + call_if_ne BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4 compare VAR_FACING, 1 - call_if 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF + call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF removeobject VAR_LAST_TALKED setflag FLAG_0x152 warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 3 diff --git a/data/maps/BattleFrontier_Lounge1/scripts.inc b/data/maps/BattleFrontier_Lounge1/scripts.inc index ea1ae17a0..a12c54334 100644 --- a/data/maps/BattleFrontier_Lounge1/scripts.inc +++ b/data/maps/BattleFrontier_Lounge1/scripts.inc @@ -4,10 +4,8 @@ BattleFrontier_Lounge1_MapScripts:: @ 825E774 BattleFrontier_Lounge1_EventScript_25E775:: @ 825E775 lock faceplayer - checkflag FLAG_0x153 - call_if 0, BattleFrontier_Lounge1_EventScript_25E7AD - checkflag FLAG_0x153 - call_if 1, BattleFrontier_Lounge1_EventScript_25E7B6 + call_if_unset FLAG_0x153, BattleFrontier_Lounge1_EventScript_25E7AD + call_if_set FLAG_0x153, BattleFrontier_Lounge1_EventScript_25E7B6 setflag FLAG_0x153 goto BattleFrontier_Lounge1_EventScript_25E792 end @@ -16,9 +14,9 @@ BattleFrontier_Lounge1_EventScript_25E792:: @ 825E792 special sub_81B94B0 waitstate compare VAR_0x8004, 255 - goto_if 5, BattleFrontier_Lounge1_EventScript_25E7BF + goto_if_ne BattleFrontier_Lounge1_EventScript_25E7BF compare VAR_0x8004, 255 - goto_eq BattleFrontier_Lounge1_EventScript_25E943 + goto_if_eq BattleFrontier_Lounge1_EventScript_25E943 end BattleFrontier_Lounge1_EventScript_25E7AD:: @ 825E7AD @@ -32,16 +30,16 @@ BattleFrontier_Lounge1_EventScript_25E7B6:: @ 825E7B6 BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF specialvar VAR_RESULT, ScriptGetPartyMonSpecies compare VAR_RESULT, 412 - goto_eq BattleFrontier_Lounge1_EventScript_25E7FF + goto_if_eq BattleFrontier_Lounge1_EventScript_25E7FF special sub_8139D98 compare VAR_0x8005, 90 - goto_if 3, BattleFrontier_Lounge1_EventScript_25E87F + goto_if_le BattleFrontier_Lounge1_EventScript_25E87F compare VAR_0x8005, 120 - goto_if 3, BattleFrontier_Lounge1_EventScript_25E88D + goto_if_le BattleFrontier_Lounge1_EventScript_25E88D compare VAR_0x8005, 150 - goto_if 3, BattleFrontier_Lounge1_EventScript_25E89B + goto_if_le BattleFrontier_Lounge1_EventScript_25E89B compare VAR_0x8005, 151 - goto_if 4, BattleFrontier_Lounge1_EventScript_25E8A9 + goto_if_ge BattleFrontier_Lounge1_EventScript_25E8A9 end BattleFrontier_Lounge1_EventScript_25E7FF:: @ 825E7FF @@ -51,28 +49,28 @@ BattleFrontier_Lounge1_EventScript_25E7FF:: @ 825E7FF BattleFrontier_Lounge1_EventScript_25E80D:: @ 825E80D compare VAR_0x8006, 0 - goto_eq BattleFrontier_Lounge1_EventScript_25E8B7 + goto_if_eq BattleFrontier_Lounge1_EventScript_25E8B7 compare VAR_0x8006, 1 - goto_eq BattleFrontier_Lounge1_EventScript_25E8C5 + goto_if_eq BattleFrontier_Lounge1_EventScript_25E8C5 compare VAR_0x8006, 2 - goto_eq BattleFrontier_Lounge1_EventScript_25E8D3 + goto_if_eq BattleFrontier_Lounge1_EventScript_25E8D3 compare VAR_0x8006, 3 - goto_eq BattleFrontier_Lounge1_EventScript_25E8E1 + goto_if_eq BattleFrontier_Lounge1_EventScript_25E8E1 compare VAR_0x8006, 4 - goto_eq BattleFrontier_Lounge1_EventScript_25E8EF + goto_if_eq BattleFrontier_Lounge1_EventScript_25E8EF compare VAR_0x8006, 5 - goto_eq BattleFrontier_Lounge1_EventScript_25E8FD + goto_if_eq BattleFrontier_Lounge1_EventScript_25E8FD end BattleFrontier_Lounge1_EventScript_25E850:: @ 825E850 compare VAR_0x8007, 15 - goto_if 3, BattleFrontier_Lounge1_EventScript_25E90B + goto_if_le BattleFrontier_Lounge1_EventScript_25E90B compare VAR_0x8007, 25 - goto_if 3, BattleFrontier_Lounge1_EventScript_25E919 + goto_if_le BattleFrontier_Lounge1_EventScript_25E919 compare VAR_0x8007, 30 - goto_if 3, BattleFrontier_Lounge1_EventScript_25E927 + goto_if_le BattleFrontier_Lounge1_EventScript_25E927 compare VAR_0x8007, 31 - goto_if 4, BattleFrontier_Lounge1_EventScript_25E935 + goto_if_ge BattleFrontier_Lounge1_EventScript_25E935 end BattleFrontier_Lounge1_EventScript_25E87D:: @ 825E87D diff --git a/data/maps/BattleFrontier_Lounge2/scripts.inc b/data/maps/BattleFrontier_Lounge2/scripts.inc index a044e3439..e8c5db1f7 100644 --- a/data/maps/BattleFrontier_Lounge2/scripts.inc +++ b/data/maps/BattleFrontier_Lounge2/scripts.inc @@ -4,8 +4,7 @@ BattleFrontier_Lounge2_MapScripts:: @ 8260642 BattleFrontier_Lounge2_EventScript_260643:: @ 8260643 lock faceplayer - checkflag FLAG_0x154 - goto_eq BattleFrontier_Lounge2_EventScript_26065F + goto_if_set FLAG_0x154, BattleFrontier_Lounge2_EventScript_26065F setflag FLAG_0x154 msgbox BattleFrontier_Lounge2_Text_260766, MSGBOX_DEFAULT goto BattleFrontier_Lounge2_EventScript_26066D @@ -18,29 +17,29 @@ BattleFrontier_Lounge2_EventScript_26065F:: @ 826065F BattleFrontier_Lounge2_EventScript_26066D:: @ 826066D compare VAR_FRONTIER_MANIAC_FACILITY, 0 - call_if 1, BattleFrontier_Lounge2_EventScript_26070A + call_if_eq BattleFrontier_Lounge2_EventScript_26070A compare VAR_FRONTIER_MANIAC_FACILITY, 1 - call_if 1, BattleFrontier_Lounge2_EventScript_26070F + call_if_eq BattleFrontier_Lounge2_EventScript_26070F compare VAR_FRONTIER_MANIAC_FACILITY, 2 - call_if 1, BattleFrontier_Lounge2_EventScript_260714 + call_if_eq BattleFrontier_Lounge2_EventScript_260714 compare VAR_FRONTIER_MANIAC_FACILITY, 3 - call_if 1, BattleFrontier_Lounge2_EventScript_260719 + call_if_eq BattleFrontier_Lounge2_EventScript_260719 compare VAR_FRONTIER_MANIAC_FACILITY, 4 - call_if 1, BattleFrontier_Lounge2_EventScript_26071E + call_if_eq BattleFrontier_Lounge2_EventScript_26071E compare VAR_FRONTIER_MANIAC_FACILITY, 5 - call_if 1, BattleFrontier_Lounge2_EventScript_260723 + call_if_eq BattleFrontier_Lounge2_EventScript_260723 compare VAR_FRONTIER_MANIAC_FACILITY, 6 - call_if 1, BattleFrontier_Lounge2_EventScript_260728 + call_if_eq BattleFrontier_Lounge2_EventScript_260728 compare VAR_FRONTIER_MANIAC_FACILITY, 7 - call_if 1, BattleFrontier_Lounge2_EventScript_26072D + call_if_eq BattleFrontier_Lounge2_EventScript_26072D compare VAR_FRONTIER_MANIAC_FACILITY, 8 - call_if 1, BattleFrontier_Lounge2_EventScript_260732 + call_if_eq BattleFrontier_Lounge2_EventScript_260732 compare VAR_FRONTIER_MANIAC_FACILITY, 9 - call_if 1, BattleFrontier_Lounge2_EventScript_260737 + call_if_eq BattleFrontier_Lounge2_EventScript_260737 compare VAR_FRONTIER_MANIAC_FACILITY, 3 - call_if 3, BattleFrontier_Lounge2_EventScript_2606F8 + call_if_le BattleFrontier_Lounge2_EventScript_2606F8 compare VAR_FRONTIER_MANIAC_FACILITY, 4 - call_if 4, BattleFrontier_Lounge2_EventScript_260701 + call_if_ge BattleFrontier_Lounge2_EventScript_260701 special sub_8139F20 waitmessage waitbuttonpress diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc index 26cbeebcf..4b0b23bc8 100644 --- a/data/maps/BattleFrontier_Lounge3/scripts.inc +++ b/data/maps/BattleFrontier_Lounge3/scripts.inc @@ -4,11 +4,10 @@ BattleFrontier_Lounge3_MapScripts:: @ 8261D82 BattleFrontier_Lounge3_EventScript_261D83:: @ 8261D83 lock faceplayer - checkflag FLAG_0x157 - goto_eq BattleFrontier_Lounge3_EventScript_261EF9 + goto_if_set FLAG_0x157, BattleFrontier_Lounge3_EventScript_261EF9 call BattleFrontier_Lounge3_EventScript_261EA0 compare VAR_0x8004, 2 - goto_if 3, BattleFrontier_Lounge3_EventScript_261EEB + goto_if_le BattleFrontier_Lounge3_EventScript_261EEB setflag FLAG_0x157 msgbox BattleFrontier_Lounge3_Text_262061, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_261DAF @@ -20,10 +19,10 @@ BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF waitbuttonpress msgbox BattleFrontier_Lounge3_Text_262A60, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_Lounge3_EventScript_261FA5 + goto_if_eq BattleFrontier_Lounge3_EventScript_261FA5 msgbox BattleFrontier_Lounge3_Text_262ABD, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_Lounge3_EventScript_261FA5 + goto_if_eq BattleFrontier_Lounge3_EventScript_261FA5 message BattleFrontier_Lounge3_Text_262B42 waitmessage special sub_813A958 @@ -59,7 +58,7 @@ BattleFrontier_Lounge3_EventScript_261E46:: @ 8261E46 BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51 specialvar VAR_TEMP_1, sub_813AA04 compare VAR_TEMP_1, VAR_0x8008 - goto_if 4, BattleFrontier_Lounge3_EventScript_261E75 + goto_if_ge BattleFrontier_Lounge3_EventScript_261E75 msgbox BattleFrontier_Lounge3_Text_262B6E, MSGBOX_DEFAULT message BattleFrontier_Lounge3_Text_262B42 waitmessage @@ -86,20 +85,13 @@ BattleFrontier_Lounge3_EventScript_261E96:: @ 8261E96 BattleFrontier_Lounge3_EventScript_261EA0:: @ 8261EA0 setvar VAR_0x8004, 0 - checkflag FLAG_SYS_TOWER_SILVER - call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 - checkflag FLAG_SYS_DOME_SILVER - call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 - checkflag FLAG_SYS_PALACE_SILVER - call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 - checkflag FLAG_SYS_ARENA_SILVER - call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 - checkflag FLAG_SYS_FACTORY_SILVER - call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 - checkflag FLAG_SYS_PIKE_SILVER - call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 - checkflag FLAG_SYS_PYRAMID_SILVER - call_if 1, BattleFrontier_Lounge3_EventScript_261EE5 + call_if_set FLAG_SYS_TOWER_SILVER, BattleFrontier_Lounge3_EventScript_261EE5 + call_if_set FLAG_SYS_DOME_SILVER, BattleFrontier_Lounge3_EventScript_261EE5 + call_if_set FLAG_SYS_PALACE_SILVER, BattleFrontier_Lounge3_EventScript_261EE5 + call_if_set FLAG_SYS_ARENA_SILVER, BattleFrontier_Lounge3_EventScript_261EE5 + call_if_set FLAG_SYS_FACTORY_SILVER, BattleFrontier_Lounge3_EventScript_261EE5 + call_if_set FLAG_SYS_PIKE_SILVER, BattleFrontier_Lounge3_EventScript_261EE5 + call_if_set FLAG_SYS_PYRAMID_SILVER, BattleFrontier_Lounge3_EventScript_261EE5 return BattleFrontier_Lounge3_EventScript_261EE5:: @ 8261EE5 @@ -114,26 +106,26 @@ BattleFrontier_Lounge3_EventScript_261EEB:: @ 8261EEB BattleFrontier_Lounge3_EventScript_261EF9:: @ 8261EF9 msgbox BattleFrontier_Lounge3_Text_26346B, MSGBOX_DEFAULT compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 - goto_if 4, BattleFrontier_Lounge3_EventScript_261F12 + goto_if_ge BattleFrontier_Lounge3_EventScript_261F12 goto BattleFrontier_Lounge3_EventScript_261DAF end BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12 compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 - goto_eq BattleFrontier_Lounge3_EventScript_261F9E + goto_if_eq BattleFrontier_Lounge3_EventScript_261F9E compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 2 - goto_eq BattleFrontier_Lounge3_EventScript_261F2E + goto_if_eq BattleFrontier_Lounge3_EventScript_261F2E goto BattleFrontier_Lounge3_EventScript_261F71 end BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E msgbox BattleFrontier_Lounge3_Text_263334, MSGBOX_DEFAULT compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 0 - call_if 1, BattleFrontier_Lounge3_EventScript_261F80 + call_if_eq BattleFrontier_Lounge3_EventScript_261F80 compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 1 - call_if 1, BattleFrontier_Lounge3_EventScript_261F8A + call_if_eq BattleFrontier_Lounge3_EventScript_261F8A compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 2 - call_if 1, BattleFrontier_Lounge3_EventScript_261F94 + call_if_eq BattleFrontier_Lounge3_EventScript_261F94 msgbox BattleFrontier_Lounge3_Text_2633D4, 9 special sub_813A9D0 msgbox BattleFrontier_Lounge3_Text_2633F2, MSGBOX_DEFAULT diff --git a/data/maps/BattleFrontier_Lounge5/scripts.inc b/data/maps/BattleFrontier_Lounge5/scripts.inc index 65a5d2556..7a8bd1929 100644 --- a/data/maps/BattleFrontier_Lounge5/scripts.inc +++ b/data/maps/BattleFrontier_Lounge5/scripts.inc @@ -6,16 +6,16 @@ BattleFrontier_Lounge5_EventScript_2645C6:: @ 82645C6 faceplayer msgbox BattleFrontier_Lounge5_Text_264632, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_Lounge5_EventScript_26460D + goto_if_eq BattleFrontier_Lounge5_EventScript_26460D special sub_81B94B0 waitstate lock faceplayer compare VAR_0x8004, 255 - goto_eq BattleFrontier_Lounge5_EventScript_26460D + goto_if_eq BattleFrontier_Lounge5_EventScript_26460D specialvar VAR_RESULT, ScriptGetPartyMonSpecies compare VAR_RESULT, 412 - goto_eq BattleFrontier_Lounge5_EventScript_264603 + goto_if_eq BattleFrontier_Lounge5_EventScript_264603 special sub_813A7B8 waitmessage waitbuttonpress diff --git a/data/maps/BattleFrontier_Lounge6/scripts.inc b/data/maps/BattleFrontier_Lounge6/scripts.inc index 495a604d4..3c1852283 100644 --- a/data/maps/BattleFrontier_Lounge6/scripts.inc +++ b/data/maps/BattleFrontier_Lounge6/scripts.inc @@ -4,25 +4,24 @@ BattleFrontier_Lounge6_MapScripts:: @ 8264FEC BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED lock faceplayer - checkflag FLAG_0x09C - goto_eq BattleFrontier_Lounge6_EventScript_265083 + goto_if_set FLAG_0x09C, BattleFrontier_Lounge6_EventScript_265083 setvar VAR_0x8008, 3 copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT msgbox BattleFrontier_Lounge6_Text_26508D, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_Lounge6_EventScript_26506B + goto_if_eq BattleFrontier_Lounge6_EventScript_26506B special sub_81B94B0 waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 - goto_eq BattleFrontier_Lounge6_EventScript_26506B + goto_if_eq BattleFrontier_Lounge6_EventScript_26506B copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, sub_807E9D4 copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if 5, BattleFrontier_Lounge6_EventScript_265075 + goto_if_ne BattleFrontier_Lounge6_EventScript_265075 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special sub_807EA10 diff --git a/data/maps/BattleFrontier_Lounge7/scripts.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc index f395a27bc..0f9376125 100644 --- a/data/maps/BattleFrontier_Lounge7/scripts.inc +++ b/data/maps/BattleFrontier_Lounge7/scripts.inc @@ -5,8 +5,7 @@ BattleFrontier_Lounge7_EventScript_265255:: @ 8265255 lock faceplayer setvar VAR_TEMP_C, 9 - checkflag FLAG_0x15A - goto_eq BattleFrontier_Lounge7_EventScript_265276 + goto_if_set FLAG_0x15A, BattleFrontier_Lounge7_EventScript_265276 msgbox BattleFrontier_Lounge7_Text_2656ED, MSGBOX_DEFAULT setflag FLAG_0x15A goto BattleFrontier_Lounge7_EventScript_265284 @@ -120,8 +119,7 @@ BattleFrontier_Lounge7_EventScript_265445:: @ 8265445 lock faceplayer setvar VAR_TEMP_C, 10 - checkflag FLAG_0x15B - goto_eq BattleFrontier_Lounge7_EventScript_265466 + goto_if_set FLAG_0x15B, BattleFrontier_Lounge7_EventScript_265466 msgbox BattleFrontier_Lounge7_Text_265A6C, MSGBOX_DEFAULT setflag FLAG_0x15B goto BattleFrontier_Lounge7_EventScript_265474 @@ -251,10 +249,10 @@ BattleFrontier_Lounge7_EventScript_26564F:: @ 826564F copyvar VAR_0x8004, VAR_TEMP_C msgbox BattleFrontier_Lounge7_Text_265921, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_Lounge7_EventScript_2656CA + goto_if_eq BattleFrontier_Lounge7_EventScript_2656CA specialvar VAR_TEMP_1, sub_813AA04 compare VAR_TEMP_1, VAR_0x8008 - goto_if 4, BattleFrontier_Lounge7_EventScript_265696 + goto_if_ge BattleFrontier_Lounge7_EventScript_265696 msgbox BattleFrontier_Lounge7_Text_265997, MSGBOX_DEFAULT goto BattleFrontier_Lounge7_EventScript_2656CA end @@ -268,7 +266,7 @@ BattleFrontier_Lounge7_EventScript_265696:: @ 8265696 special sub_81B892C waitstate compare VAR_RESULT, 0 - goto_eq BattleFrontier_Lounge7_EventScript_265645 + goto_if_eq BattleFrontier_Lounge7_EventScript_265645 msgbox BattleFrontier_Lounge7_Text_2659C7, MSGBOX_DEFAULT copyvar VAR_0x8004, VAR_0x8008 special sub_813A9A4 @@ -277,7 +275,7 @@ BattleFrontier_Lounge7_EventScript_265696:: @ 8265696 BattleFrontier_Lounge7_EventScript_2656CA:: @ 82656CA compare VAR_TEMP_E, 0 - goto_eq BattleFrontier_Lounge7_EventScript_26532F + goto_if_eq BattleFrontier_Lounge7_EventScript_26532F goto BattleFrontier_Lounge7_EventScript_26551F end diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index fe034442e..401f5565d 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -4,22 +4,20 @@ BattleFrontier_OutsideEast_MapScripts:: @ 8242C04 .byte 0 BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, BattleFrontier_OutsideEast_EventScript_242C19 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, BattleFrontier_OutsideEast_EventScript_242C19 end BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, BattleFrontier_OutsideEast_EventScript_27374E + goto_if_ne BattleFrontier_OutsideEast_EventScript_27374E removeobject VAR_LAST_TALKED return BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D setvar VAR_0x40BC, 0 setflag FLAG_HIDE_BATTLE_TOWER_REPORTER - checkflag FLAG_0x1C6 - call_if 0, BattleFrontier_OutsideEast_EventScript_242C3F + call_if_unset FLAG_0x1C6, BattleFrontier_OutsideEast_EventScript_242C3F end BattleFrontier_OutsideEast_EventScript_242C3F:: @ 8242C3F @@ -117,7 +115,7 @@ BattleFrontier_OutsideEast_EventScript_242CEA:: @ 8242CEA BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC lock faceplayer - special sub_80FAFF8 + special DoWateringBerryTreeAnim waitstate waitse playse 269 @@ -136,11 +134,11 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq BattleFrontier_OutsideEast_EventScript_242D60 + goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 compare VAR_RESULT, 4 - goto_eq BattleFrontier_OutsideEast_EventScript_242D60 + goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 compare VAR_RESULT, 5 - goto_eq BattleFrontier_OutsideEast_EventScript_242D60 + goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 setflag FLAG_0x1C6 release end @@ -223,8 +221,7 @@ BattleFrontier_OutsideEast_EventScript_242DE0:: @ 8242DE0 BattleFrontier_OutsideEast_EventScript_242DE9:: @ 8242DE9 lock faceplayer - checkflag FLAG_0x1C6 - goto_eq BattleFrontier_OutsideEast_EventScript_242DFE + goto_if_set FLAG_0x1C6, BattleFrontier_OutsideEast_EventScript_242DFE msgbox BattleFrontier_OutsideEast_Text_243C2C, MSGBOX_DEFAULT release end diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc index b01b0eb2d..da5724259 100644 --- a/data/maps/BattleFrontier_OutsideWest/scripts.inc +++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc @@ -13,7 +13,7 @@ BattleFrontier_OutsideWest_EventScript_23D3F0:: @ 823D3F0 msgbox BattleFrontier_OutsideWest_Text_23D808, MSGBOX_DEFAULT checkitem ITEM_SS_TICKET, 1 compare VAR_RESULT, 0 - goto_eq BattleFrontier_OutsideWest_EventScript_23D44E + goto_if_eq BattleFrontier_OutsideWest_EventScript_23D44E message BattleFrontier_OutsideWest_Text_23D89D waitmessage goto BattleFrontier_OutsideWest_EventScript_23D416 @@ -36,7 +36,7 @@ BattleFrontier_OutsideWest_EventScript_23D44E:: @ 823D44E BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458 msgbox BattleFrontier_OutsideWest_Text_23D8F2, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE + goto_if_eq BattleFrontier_OutsideWest_EventScript_23D4AE msgbox BattleFrontier_OutsideWest_Text_23D94B, MSGBOX_DEFAULT call BattleFrontier_OutsideWest_EventScript_23D4BA warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 @@ -47,7 +47,7 @@ BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458 BattleFrontier_OutsideWest_EventScript_23D483:: @ 823D483 msgbox BattleFrontier_OutsideWest_Text_23D90E, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE + goto_if_eq BattleFrontier_OutsideWest_EventScript_23D4AE msgbox BattleFrontier_OutsideWest_Text_23D94B, MSGBOX_DEFAULT call BattleFrontier_OutsideWest_EventScript_23D4BA warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 @@ -145,13 +145,13 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F faceplayer delay 20 compare VAR_FACING, 2 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA + call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA compare VAR_FACING, 1 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D5C5 + call_if_eq BattleFrontier_OutsideWest_EventScript_23D5C5 compare VAR_FACING, 3 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA + call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA compare VAR_FACING, 4 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA + call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA msgbox BattleFrontier_OutsideWest_Text_23DC36, MSGBOX_DEFAULT release end @@ -170,13 +170,13 @@ BattleFrontier_OutsideWest_EventScript_23D5C6:: @ 823D5C6 message BattleFrontier_OutsideWest_Text_23DCB0 waitmessage compare VAR_FACING, 2 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D5FD + call_if_eq BattleFrontier_OutsideWest_EventScript_23D5FD compare VAR_FACING, 1 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D608 + call_if_eq BattleFrontier_OutsideWest_EventScript_23D608 compare VAR_FACING, 3 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D613 + call_if_eq BattleFrontier_OutsideWest_EventScript_23D613 compare VAR_FACING, 4 - call_if 1, BattleFrontier_OutsideWest_EventScript_23D61E + call_if_eq BattleFrontier_OutsideWest_EventScript_23D61E waitbuttonpress release end @@ -227,7 +227,7 @@ BattleFrontier_OutsideWest_EventScript_23D635:: @ 823D635 msgbox BattleFrontier_OutsideWest_Text_23DD3B, MSGBOX_DEFAULT random 2 compare VAR_RESULT, 1 - goto_eq BattleFrontier_OutsideWest_EventScript_23D653 + goto_if_eq BattleFrontier_OutsideWest_EventScript_23D653 goto BattleFrontier_OutsideWest_EventScript_23D65D end diff --git a/data/maps/BattleFrontier_RankingHall/scripts.inc b/data/maps/BattleFrontier_RankingHall/scripts.inc index f6a7715d1..5f8a6c44e 100644 --- a/data/maps/BattleFrontier_RankingHall/scripts.inc +++ b/data/maps/BattleFrontier_RankingHall/scripts.inc @@ -87,7 +87,7 @@ BattleFrontier_RankingHall_EventScript_25E54A:: @ 825E54A faceplayer msgbox BattleFrontier_RankingHall_Text_25E666, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq BattleFrontier_RankingHall_EventScript_25E569 + goto_if_eq BattleFrontier_RankingHall_EventScript_25E569 msgbox BattleFrontier_RankingHall_Text_25E6B6, MSGBOX_DEFAULT release end diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index 30f3a10d5..5ed97bd60 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -21,7 +21,7 @@ BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3 waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_266580, MSGBOX_DEFAULT closemessage - applymovement 255, BattleFrontier_ReceptionGate_Movement_2662D2 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_2662D2 waitmovement 0 goto BattleFrontier_ReceptionGate_EventScript_266229 end @@ -40,18 +40,18 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 closemessage applymovement 1, BattleFrontier_ReceptionGate_Movement_2725A6 applymovement 2, BattleFrontier_ReceptionGate_Movement_2725A6 - applymovement 255, BattleFrontier_ReceptionGate_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_2725A6 waitmovement 0 playse SE_PIN applymovement 1, BattleFrontier_ReceptionGate_Movement_272598 applymovement 2, BattleFrontier_ReceptionGate_Movement_272598 - applymovement 255, BattleFrontier_ReceptionGate_Movement_272598 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_272598 waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_266733, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_ReceptionGate_Movement_2662F0 applymovement 2, BattleFrontier_ReceptionGate_Movement_2662F6 - applymovement 255, BattleFrontier_ReceptionGate_Movement_2662D7 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_2662D7 applymovement 4, BattleFrontier_ReceptionGate_Movement_2662E0 waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_266764, MSGBOX_DEFAULT diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index 6824df384..9f42bc89e 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -4,76 +4,54 @@ BattleFrontier_ScottsHouse_MapScripts:: @ 82636A7 BattleFrontier_ScottsHouse_EventScript_2636A8:: @ 82636A8 lock faceplayer - checkflag FLAG_TEMP_4 - goto_eq BattleFrontier_ScottsHouse_EventScript_2637DA - checkflag FLAG_TEMP_3 - goto_eq BattleFrontier_ScottsHouse_EventScript_2638AA - checkflag FLAG_TEMP_2 - goto_eq BattleFrontier_ScottsHouse_EventScript_263939 + goto_if_set FLAG_TEMP_4, BattleFrontier_ScottsHouse_EventScript_2637DA + goto_if_set FLAG_TEMP_3, BattleFrontier_ScottsHouse_EventScript_2638AA + goto_if_set FLAG_TEMP_2, BattleFrontier_ScottsHouse_EventScript_263939 goto BattleFrontier_ScottsHouse_EventScript_2636CB end BattleFrontier_ScottsHouse_EventScript_2636CB:: @ 82636CB - checkflag FLAG_0x1D1 - goto_if 0, BattleFrontier_ScottsHouse_EventScript_263943 - checkflag FLAG_0x05C - goto_if 0, BattleFrontier_ScottsHouse_EventScript_263704 - checkflag FLAG_0x1D2 - goto_if 0, BattleFrontier_ScottsHouse_EventScript_26376A + goto_if_unset FLAG_0x1D1, BattleFrontier_ScottsHouse_EventScript_263943 + goto_if_unset FLAG_0x05C, BattleFrontier_ScottsHouse_EventScript_263704 + goto_if_unset FLAG_0x1D2, BattleFrontier_ScottsHouse_EventScript_26376A goto BattleFrontier_ScottsHouse_EventScript_2636EC end BattleFrontier_ScottsHouse_EventScript_2636EC:: @ 82636EC - checkflag FLAG_0x0ED - goto_if 0, BattleFrontier_ScottsHouse_EventScript_26381B - checkflag FLAG_0x0EE - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2638B4 + goto_if_unset FLAG_0x0ED, BattleFrontier_ScottsHouse_EventScript_26381B + goto_if_unset FLAG_0x0EE, BattleFrontier_ScottsHouse_EventScript_2638B4 goto BattleFrontier_ScottsHouse_EventScript_2637E4 end BattleFrontier_ScottsHouse_EventScript_263704:: @ 8263704 - checkflag FLAG_SYS_TOWER_SILVER - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_DOME_SILVER - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_PALACE_SILVER - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_ARENA_SILVER - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_FACTORY_SILVER - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_PIKE_SILVER - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_PYRAMID_SILVER - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_TOWER_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_DOME_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_PALACE_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_ARENA_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_FACTORY_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_PIKE_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_PYRAMID_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC msgbox BattleFrontier_ScottsHouse_Text_2640BC, MSGBOX_DEFAULT giveitem_std ITEM_LANSAT_BERRY compare VAR_RESULT, 0 - goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0 + goto_if_eq BattleFrontier_ScottsHouse_EventScript_2637D0 setflag FLAG_0x05C setflag FLAG_TEMP_4 release end BattleFrontier_ScottsHouse_EventScript_26376A:: @ 826376A - checkflag FLAG_SYS_TOWER_GOLD - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_DOME_GOLD - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_PALACE_GOLD - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_ARENA_GOLD - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_FACTORY_GOLD - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_PIKE_GOLD - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - checkflag FLAG_SYS_PYRAMID_GOLD - goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_TOWER_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_DOME_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_PALACE_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_ARENA_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_FACTORY_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_PIKE_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC + goto_if_unset FLAG_SYS_PYRAMID_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC msgbox BattleFrontier_ScottsHouse_Text_264216, MSGBOX_DEFAULT giveitem_std ITEM_STARF_BERRY compare VAR_RESULT, 0 - goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0 + goto_if_eq BattleFrontier_ScottsHouse_EventScript_2637D0 setflag FLAG_0x1D2 setflag FLAG_TEMP_4 release @@ -92,9 +70,9 @@ BattleFrontier_ScottsHouse_EventScript_2637DA:: @ 82637DA BattleFrontier_ScottsHouse_EventScript_2637E4:: @ 82637E4 random 3 compare VAR_RESULT, 1 - goto_eq BattleFrontier_ScottsHouse_EventScript_263807 + goto_if_eq BattleFrontier_ScottsHouse_EventScript_263807 compare VAR_RESULT, 2 - goto_eq BattleFrontier_ScottsHouse_EventScript_263811 + goto_if_eq BattleFrontier_ScottsHouse_EventScript_263811 msgbox BattleFrontier_ScottsHouse_Text_263DDD, MSGBOX_DEFAULT release end @@ -119,7 +97,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B setvar VAR_0x8005, 1 special sub_8161F74 compare VAR_RESULT, 50 - goto_if 4, BattleFrontier_ScottsHouse_EventScript_26387A + goto_if_ge BattleFrontier_ScottsHouse_EventScript_26387A setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 1 @@ -128,7 +106,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B setvar VAR_0x8005, 1 special sub_8161F74 compare VAR_RESULT, 50 - goto_if 4, BattleFrontier_ScottsHouse_EventScript_26387A + goto_if_ge BattleFrontier_ScottsHouse_EventScript_26387A goto BattleFrontier_ScottsHouse_EventScript_2637E4 end @@ -136,7 +114,7 @@ BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A msgbox BattleFrontier_ScottsHouse_Text_264412, MSGBOX_DEFAULT givedecoration_std 42 compare VAR_RESULT, 0 - goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0 + goto_if_eq BattleFrontier_ScottsHouse_EventScript_2638A0 setflag FLAG_0x0ED setflag FLAG_TEMP_3 goto BattleFrontier_ScottsHouse_EventScript_2638AA @@ -162,7 +140,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4 setvar VAR_0x8005, 1 special sub_8161F74 compare VAR_RESULT, 100 - goto_if 4, BattleFrontier_ScottsHouse_EventScript_263913 + goto_if_ge BattleFrontier_ScottsHouse_EventScript_263913 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 1 @@ -171,7 +149,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4 setvar VAR_0x8005, 1 special sub_8161F74 compare VAR_RESULT, 100 - goto_if 4, BattleFrontier_ScottsHouse_EventScript_263913 + goto_if_ge BattleFrontier_ScottsHouse_EventScript_263913 goto BattleFrontier_ScottsHouse_EventScript_2637E4 end @@ -179,7 +157,7 @@ BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913 msgbox BattleFrontier_ScottsHouse_Text_26449F, MSGBOX_DEFAULT givedecoration_std 43 compare VAR_RESULT, 0 - goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0 + goto_if_eq BattleFrontier_ScottsHouse_EventScript_2638A0 setflag FLAG_0x0EE setflag FLAG_TEMP_3 goto BattleFrontier_ScottsHouse_EventScript_2638AA @@ -195,23 +173,23 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943 closemessage delay 30 compare VAR_FACING, 2 - call_if 1, BattleFrontier_ScottsHouse_EventScript_263A13 + call_if_eq BattleFrontier_ScottsHouse_EventScript_263A13 compare VAR_FACING, 1 - call_if 1, BattleFrontier_ScottsHouse_EventScript_263A1E + call_if_eq BattleFrontier_ScottsHouse_EventScript_263A1E compare VAR_FACING, 4 - call_if 1, BattleFrontier_ScottsHouse_EventScript_263A29 + call_if_eq BattleFrontier_ScottsHouse_EventScript_263A29 compare VAR_FACING, 3 - call_if 1, BattleFrontier_ScottsHouse_EventScript_263A34 + call_if_eq BattleFrontier_ScottsHouse_EventScript_263A34 msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT applymovement 1, BattleFrontier_ScottsHouse_Movement_27259E waitmovement 0 msgbox BattleFrontier_ScottsHouse_Text_263BD4, MSGBOX_DEFAULT compare VAR_0x40D1, 13 - goto_eq BattleFrontier_ScottsHouse_EventScript_2639BC + goto_if_eq BattleFrontier_ScottsHouse_EventScript_2639BC compare VAR_0x40D1, 9 - goto_if 4, BattleFrontier_ScottsHouse_EventScript_2639CB + goto_if_ge BattleFrontier_ScottsHouse_EventScript_2639CB compare VAR_0x40D1, 6 - goto_if 4, BattleFrontier_ScottsHouse_EventScript_2639DA + goto_if_ge BattleFrontier_ScottsHouse_EventScript_2639DA goto BattleFrontier_ScottsHouse_EventScript_2639E9 end diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 7bd9c1e60..bdc548162 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -13,10 +13,8 @@ BirthIsland_Exterior_MapScript1_267F29: @ 8267F29 setvar VAR_OBJ_GFX_ID_0, 100 setvar VAR_0x4034, 0 setvar VAR_0x4035, 0 - checkflag FLAG_0x1AD - call_if 1, BirthIsland_Exterior_EventScript_267F4E - checkflag FLAG_0x1AD - call_if 0, BirthIsland_Exterior_EventScript_267F55 + call_if_set FLAG_0x1AD, BirthIsland_Exterior_EventScript_267F4E + call_if_unset FLAG_0x1AD, BirthIsland_Exterior_EventScript_267F55 end BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E @@ -25,21 +23,19 @@ BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E return BirthIsland_Exterior_EventScript_267F55:: @ 8267F55 - checkflag FLAG_0x1AC - goto_eq BirthIsland_Exterior_EventScript_27374E + goto_if_set FLAG_0x1AC, BirthIsland_Exterior_EventScript_27374E clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE clearflag FLAG_0x8D4 return BirthIsland_Exterior_MapScript1_267F65: @ 8267F65 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, BirthIsland_Exterior_EventScript_267F6F + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, BirthIsland_Exterior_EventScript_267F6F end BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, BirthIsland_Exterior_EventScript_27374E + goto_if_ne BirthIsland_Exterior_EventScript_27374E removeobject 2 return @@ -93,11 +89,11 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq BirthIsland_Exterior_EventScript_26803B + goto_if_eq BirthIsland_Exterior_EventScript_26803B compare VAR_RESULT, 4 - goto_eq BirthIsland_Exterior_EventScript_268049 + goto_if_eq BirthIsland_Exterior_EventScript_268049 compare VAR_RESULT, 5 - goto_eq BirthIsland_Exterior_EventScript_268049 + goto_if_eq BirthIsland_Exterior_EventScript_268049 setflag FLAG_0x1AD release end diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index dc3407e33..1a5ef87ec 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -6,7 +6,7 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D faceplayer msgbox BirthIsland_Harbor_Text_2C6B90, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq BirthIsland_Harbor_EventScript_2680A2 + goto_if_eq BirthIsland_Harbor_EventScript_2680A2 msgbox BirthIsland_Harbor_Text_2A6A5D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, BirthIsland_Harbor_Movement_2725AA diff --git a/data/maps/CaveOfOrigin_1F/scripts.inc b/data/maps/CaveOfOrigin_1F/scripts.inc index 42c78d4b7..f42cb92f6 100644 --- a/data/maps/CaveOfOrigin_1F/scripts.inc +++ b/data/maps/CaveOfOrigin_1F/scripts.inc @@ -3,7 +3,6 @@ CaveOfOrigin_1F_MapScripts:: @ 8235768 .byte 0 CaveOfOrigin_1F_MapScript1_23576E: @ 823576E - checkflag FLAG_0x071 - call_if 1, CaveOfOrigin_1F_EventScript_2722C1 + call_if_set FLAG_0x071, CaveOfOrigin_1F_EventScript_2722C1 end diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc index 4b4240833..9ac7e4741 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc @@ -3,7 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778 .byte 0 CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E: @ 823577E - checkflag FLAG_0x071 - call_if 1, CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1 + call_if_set FLAG_0x071, CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1 end diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc index d73ff8231..5743c7c8c 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc @@ -3,7 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788 .byte 0 CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E: @ 823578E - checkflag FLAG_0x071 - call_if 1, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1 + call_if_set FLAG_0x071, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1 end diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc index 7f4fb2ff1..c831218a4 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc @@ -3,7 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798 .byte 0 CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E: @ 823579E - checkflag FLAG_0x071 - call_if 1, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1 + call_if_set FLAG_0x071, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1 end diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 760336d91..685d8f5cf 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -5,20 +5,18 @@ DesertRuins_MapScripts:: @ 822D95B .byte 0 DesertRuins_MapScript1_22D96B: @ 822D96B - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, DesertRuins_EventScript_22D975 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, DesertRuins_EventScript_22D975 end DesertRuins_EventScript_22D975:: @ 822D975 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, DesertRuins_EventScript_27374E + goto_if_ne DesertRuins_EventScript_27374E removeobject VAR_LAST_TALKED return DesertRuins_MapScript1_22D989: @ 822D989 - checkflag FLAG_SYS_BRAILLE_STRENGTH - call_if 0, DesertRuins_EventScript_22D993 + call_if_unset FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_22D993 end DesertRuins_EventScript_22D993:: @ 822D993 @@ -32,8 +30,7 @@ DesertRuins_EventScript_22D993:: @ 822D993 DesertRuins_MapScript1_22D9CA: @ 822D9CA setflag FLAG_LANDMARK_DESERT_RUINS - checkflag FLAG_0x1BB - call_if 0, DesertRuins_EventScript_22D9D7 + call_if_unset FLAG_0x1BB, DesertRuins_EventScript_22D9D7 end DesertRuins_EventScript_22D9D7:: @ 822D9D7 @@ -42,8 +39,7 @@ DesertRuins_EventScript_22D9D7:: @ 822D9D7 DesertRuins_EventScript_22D9DB:: @ 822D9DB lockall - checkflag FLAG_SYS_BRAILLE_STRENGTH - goto_eq DesertRuins_EventScript_22D9EE + goto_if_set FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_22D9EE braillemessage DesertRuins_Braille_2A6CA0 waitbuttonpress hidebox2 @@ -77,11 +73,11 @@ DesertRuins_EventScript_22DA02:: @ 822DA02 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq DesertRuins_EventScript_22DA49 + goto_if_eq DesertRuins_EventScript_22DA49 compare VAR_RESULT, 4 - goto_eq DesertRuins_EventScript_22DA52 + goto_if_eq DesertRuins_EventScript_22DA52 compare VAR_RESULT, 5 - goto_eq DesertRuins_EventScript_22DA52 + goto_if_eq DesertRuins_EventScript_22DA52 setflag FLAG_0x1BB release end diff --git a/data/maps/DesertUnderpass/scripts.inc b/data/maps/DesertUnderpass/scripts.inc index 486bd2577..d9913cb76 100644 --- a/data/maps/DesertUnderpass/scripts.inc +++ b/data/maps/DesertUnderpass/scripts.inc @@ -9,10 +9,8 @@ DesertUnderpass_MapScript1_23AF3D: @ 823AF3D DesertUnderpass_EventScript_23AF41:: @ 823AF41 lock faceplayer - checkflag FLAG_0x14F - goto_eq DesertUnderpass_EventScript_23AF57 - checkflag FLAG_0x150 - goto_eq DesertUnderpass_EventScript_23AF68 + goto_if_set FLAG_0x14F, DesertUnderpass_EventScript_23AF57 + goto_if_set FLAG_0x150, DesertUnderpass_EventScript_23AF68 release end diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 41abdcede..b08a0e8a3 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -9,8 +9,7 @@ DewfordTown_MapScript1_1E950D: @ 81E950D DewfordTown_EventScript_1E9511:: @ 81E9511 lock faceplayer - checkflag FLAG_0x0BD - goto_if 0, DewfordTown_EventScript_1E9585 + goto_if_unset FLAG_0x0BD, DewfordTown_EventScript_1E9585 message DewfordTown_Text_1E9C8A waitmessage multichoicedefault 21, 6, 0, 2, 0 @@ -44,7 +43,7 @@ DewfordTown_EventScript_1E957A:: @ 81E957A DewfordTown_EventScript_1E9585:: @ 81E9585 msgbox DewfordTown_Text_1E9B24, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq DewfordTown_EventScript_1E95A2 + goto_if_eq DewfordTown_EventScript_1E95A2 msgbox DewfordTown_Text_1E9BD9, MSGBOX_DEFAULT release end @@ -74,13 +73,12 @@ DewfordTown_EventScript_1E95CC:: @ 81E95CC DewfordTown_EventScript_1E95D5:: @ 81E95D5 lock faceplayer - checkflag FLAG_0x101 - goto_eq DewfordTown_EventScript_1E962A + goto_if_set FLAG_0x101, DewfordTown_EventScript_1E962A msgbox DewfordTown_Text_1E9DD1, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq DewfordTown_EventScript_1E95FF + goto_if_eq DewfordTown_EventScript_1E95FF compare VAR_RESULT, 0 - goto_eq DewfordTown_EventScript_1E9620 + goto_if_eq DewfordTown_EventScript_1E9620 end DewfordTown_EventScript_1E95FF:: @ 81E95FF @@ -101,9 +99,9 @@ DewfordTown_EventScript_1E962A:: @ 81E962A waitmessage multichoice 20, 8, 50, 1 compare VAR_RESULT, 0 - goto_eq DewfordTown_EventScript_1E964C + goto_if_eq DewfordTown_EventScript_1E964C compare VAR_RESULT, 1 - goto_eq DewfordTown_EventScript_1E9656 + goto_if_eq DewfordTown_EventScript_1E9656 end DewfordTown_EventScript_1E964C:: @ 81E964C @@ -119,29 +117,29 @@ DewfordTown_EventScript_1E9656:: @ 81E9656 DewfordTown_EventScript_1E9660:: @ 81E9660 call DewfordTown_EventScript_271E95 setobjectpriority 2, MAP_DEWFORD_TOWN, 0 - setobjectpriority 255, MAP_DEWFORD_TOWN, 0 + setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 0 applymovement 2, DewfordTown_Movement_1E991D waitmovement 0 removeobject 2 - applymovement 255, DewfordTown_Movement_1E9911 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911 waitmovement 0 - hideobjectat 255, MAP_DEWFORD_TOWN + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN call DewfordTown_EventScript_2720A0 applymovement 4, DewfordTown_Movement_1E97A2 - applymovement 255, DewfordTown_Movement_1E97A2 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E97A2 waitmovement 0 - showobjectat 255, MAP_ROUTE104 + showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 call DewfordTown_EventScript_2720A8 - applymovement 255, DewfordTown_Movement_1E9914 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9914 waitmovement 0 - showobjectat 255, MAP_ROUTE104 + showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN hideobjectat 4, MAP_DEWFORD_TOWN setvar VAR_0x408E, 2 - resetobjectpriority 255, MAP_DEWFORD_TOWN + resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 copyvar VAR_0x4096, VAR_0x8008 waitstate @@ -151,20 +149,20 @@ DewfordTown_EventScript_1E9660:: @ 81E9660 DewfordTown_EventScript_1E96E7:: @ 81E96E7 call DewfordTown_EventScript_271E95 setobjectpriority 2, MAP_DEWFORD_TOWN, 0 - setobjectpriority 255, MAP_DEWFORD_TOWN, 1 + setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 1 applymovement 2, DewfordTown_Movement_1E991D waitmovement 0 removeobject 2 - applymovement 255, DewfordTown_Movement_1E9911 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911 waitmovement 0 - hideobjectat 255, MAP_DEWFORD_TOWN + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN call DewfordTown_EventScript_2720A0 applymovement 4, DewfordTown_Movement_1E9865 - applymovement 255, DewfordTown_Movement_1E9865 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9865 waitmovement 0 call DewfordTown_EventScript_2720A8 - showobjectat 255, MAP_ROUTE109 - applymovement 255, DewfordTown_Movement_1E9918 + showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9918 waitmovement 0 setobjectxyperm 2, 21, 26 addobject 2 @@ -176,13 +174,11 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7 clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN hideobjectat 4, MAP_DEWFORD_TOWN - checkflag FLAG_0x095 - call_if 0, DewfordTown_EventScript_1E9790 - checkflag FLAG_0x095 - call_if 1, DewfordTown_EventScript_1E9799 + call_if_unset FLAG_0x095, DewfordTown_EventScript_1E9790 + call_if_set FLAG_0x095, DewfordTown_EventScript_1E9799 closemessage copyvar VAR_0x4096, VAR_0x8008 - resetobjectpriority 255, MAP_DEWFORD_TOWN + resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN resetobjectpriority 2, MAP_ROUTE109 moveobjectoffscreen 2 release @@ -600,9 +596,9 @@ DewfordTown_EventScript_1E9922:: @ 81E9922 call DewfordTown_EventScript_271E8B msgbox DewfordTown_Text_1EA136, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq DewfordTown_EventScript_1E9948 + goto_if_eq DewfordTown_EventScript_1E9948 compare VAR_RESULT, 0 - goto_eq DewfordTown_EventScript_1E9952 + goto_if_eq DewfordTown_EventScript_1E9952 end DewfordTown_EventScript_1E9948:: @ 81E9948 @@ -617,15 +613,15 @@ DewfordTown_EventScript_1E9952:: @ 81E9952 lock faceplayer compare VAR_RESULT, 1 - goto_eq DewfordTown_EventScript_1E997D + goto_if_eq DewfordTown_EventScript_1E997D compare VAR_RESULT, 0 - goto_eq DewfordTown_EventScript_1E9994 + goto_if_eq DewfordTown_EventScript_1E9994 end DewfordTown_EventScript_1E997D:: @ 81E997D incrementgamestat 2 compare VAR_0x8004, 0 - goto_eq DewfordTown_EventScript_1E999E + goto_if_eq DewfordTown_EventScript_1E999E msgbox DewfordTown_Text_1EA2AA, MSGBOX_DEFAULT release end diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 703888e98..1251c714e 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -8,21 +8,21 @@ DewfordTown_Gym_MapScript1_1FC642: @ 81FC642 DewfordTown_Gym_EventScript_1FC648:: @ 81FC648 checktrainerflag TRAINER_BRAWLY_1 - goto_eq DewfordTown_Gym_EventScript_1FC6A2 + goto_if_eq DewfordTown_Gym_EventScript_1FC6A2 call DewfordTown_Gym_EventScript_1FC768 copyvar VAR_0x8001, VAR_0x8000 compare VAR_0x8000, 0 - goto_eq DewfordTown_Gym_EventScript_1FC6BE + goto_if_eq DewfordTown_Gym_EventScript_1FC6BE compare VAR_0x8000, 1 - goto_eq DewfordTown_Gym_EventScript_1FC6BA + goto_if_eq DewfordTown_Gym_EventScript_1FC6BA compare VAR_0x8000, 2 - goto_eq DewfordTown_Gym_EventScript_1FC6B6 + goto_if_eq DewfordTown_Gym_EventScript_1FC6B6 compare VAR_0x8000, 3 - goto_eq DewfordTown_Gym_EventScript_1FC6B2 + goto_if_eq DewfordTown_Gym_EventScript_1FC6B2 compare VAR_0x8000, 4 - goto_eq DewfordTown_Gym_EventScript_1FC6AE + goto_if_eq DewfordTown_Gym_EventScript_1FC6AE compare VAR_0x8000, 5 - goto_eq DewfordTown_Gym_EventScript_1FC6AA + goto_if_eq DewfordTown_Gym_EventScript_1FC6AA goto DewfordTown_Gym_EventScript_1FC6A6 DewfordTown_Gym_EventScript_1FC6A2:: @ 81FC6A2 @@ -61,20 +61,20 @@ DewfordTown_Gym_EventScript_1FC6C2:: @ 81FC6C2 call DewfordTown_Gym_EventScript_1FC768 nop1 compare VAR_0x8000, VAR_0x8001 - goto_eq DewfordTown_Gym_EventScript_1FC71A + goto_if_eq DewfordTown_Gym_EventScript_1FC71A copyvar VAR_0x8001, VAR_0x8000 compare VAR_0x8000, 1 - goto_eq DewfordTown_Gym_EventScript_1FC71B + goto_if_eq DewfordTown_Gym_EventScript_1FC71B compare VAR_0x8000, 2 - goto_eq DewfordTown_Gym_EventScript_1FC726 + goto_if_eq DewfordTown_Gym_EventScript_1FC726 compare VAR_0x8000, 3 - goto_eq DewfordTown_Gym_EventScript_1FC731 + goto_if_eq DewfordTown_Gym_EventScript_1FC731 compare VAR_0x8000, 4 - goto_eq DewfordTown_Gym_EventScript_1FC73C + goto_if_eq DewfordTown_Gym_EventScript_1FC73C compare VAR_0x8000, 5 - goto_eq DewfordTown_Gym_EventScript_1FC747 + goto_if_eq DewfordTown_Gym_EventScript_1FC747 compare VAR_0x8000, 6 - goto_eq DewfordTown_Gym_EventScript_1FC752 + goto_if_eq DewfordTown_Gym_EventScript_1FC752 DewfordTown_Gym_EventScript_1FC71A:: @ 81FC71A return @@ -124,32 +124,32 @@ DewfordTown_Gym_EventScript_1FC75D:: @ 81FC75D DewfordTown_Gym_EventScript_1FC768:: @ 81FC768 setvar VAR_0x8000, 0 checktrainerflag TRAINER_TAKAO - goto_if 0, DewfordTown_Gym_EventScript_1FC77B + goto_if_lt DewfordTown_Gym_EventScript_1FC77B addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_1FC77B:: @ 81FC77B checktrainerflag TRAINER_JOCELYN - goto_if 0, DewfordTown_Gym_EventScript_1FC789 + goto_if_lt DewfordTown_Gym_EventScript_1FC789 addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_1FC789:: @ 81FC789 checktrainerflag TRAINER_LAURA - goto_if 0, DewfordTown_Gym_EventScript_1FC797 + goto_if_lt DewfordTown_Gym_EventScript_1FC797 addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_1FC797:: @ 81FC797 checktrainerflag TRAINER_BRENDEN - goto_if 0, DewfordTown_Gym_EventScript_1FC7A5 + goto_if_lt DewfordTown_Gym_EventScript_1FC7A5 addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_1FC7A5:: @ 81FC7A5 checktrainerflag TRAINER_CRISTIAN - goto_if 0, DewfordTown_Gym_EventScript_1FC7B3 + goto_if_lt DewfordTown_Gym_EventScript_1FC7B3 addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_1FC7B3:: @ 81FC7B3 checktrainerflag TRAINER_LILITH - goto_if 0, DewfordTown_Gym_EventScript_1FC7C1 + goto_if_lt DewfordTown_Gym_EventScript_1FC7C1 addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_1FC7C1:: @ 81FC7C1 @@ -159,9 +159,8 @@ DewfordTown_Gym_EventScript_1FC7C2:: @ 81FC7C2 trainerbattle_single TRAINER_BRAWLY_1, DewfordTown_Gym_Text_1FCF44, DewfordTown_Gym_Text_1FD008, DewfordTown_Gym_EventScript_1FC7F7, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq DewfordTown_Gym_EventScript_1FC89C - checkflag FLAG_0x0A6 - goto_if 0, DewfordTown_Gym_EventScript_1FC878 + goto_if_eq DewfordTown_Gym_EventScript_1FC89C + goto_if_unset FLAG_0x0A6, DewfordTown_Gym_EventScript_1FC878 msgbox DewfordTown_Gym_Text_1FD20D, MSGBOX_DEFAULT release end @@ -176,7 +175,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 setflag FLAG_BADGE02_GET addvar VAR_0x4085, 1 compare VAR_0x4085, 6 - call_if 1, DewfordTown_Gym_EventScript_271E84 + call_if_eq DewfordTown_Gym_EventScript_271E84 setvar VAR_0x8008, 2 call DewfordTown_Gym_EventScript_271F43 call DewfordTown_Gym_EventScript_1FC855 @@ -196,7 +195,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 giveitem_std ITEM_TM08 compare VAR_RESULT, 0 - goto_eq DewfordTown_Gym_EventScript_27205E + goto_if_eq DewfordTown_Gym_EventScript_27205E msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT setflag FLAG_0x0A6 return @@ -204,7 +203,7 @@ DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 DewfordTown_Gym_EventScript_1FC878:: @ 81FC878 giveitem_std ITEM_TM08 compare VAR_RESULT, 0 - goto_eq DewfordTown_Gym_EventScript_272054 + goto_if_eq DewfordTown_Gym_EventScript_272054 msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT setflag FLAG_0x0A6 release @@ -278,8 +277,7 @@ DewfordTown_Gym_EventScript_1FC97C:: @ 81FC97C DewfordTown_Gym_EventScript_1FC983:: @ 81FC983 lock faceplayer - checkflag FLAG_0x4F1 - goto_eq DewfordTown_Gym_EventScript_1FC998 + goto_if_set FLAG_0x4F1, DewfordTown_Gym_EventScript_1FC998 msgbox DewfordTown_Gym_Text_1FC9D6, MSGBOX_DEFAULT release end @@ -291,15 +289,13 @@ DewfordTown_Gym_EventScript_1FC998:: @ 81FC998 DewfordTown_Gym_EventScript_1FC9A2:: @ 81FC9A2 lockall - checkflag FLAG_BADGE02_GET - goto_eq DewfordTown_Gym_EventScript_1FC9C2 + goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_1FC9C2 goto DewfordTown_Gym_EventScript_1FC9CC end DewfordTown_Gym_EventScript_1FC9B2:: @ 81FC9B2 lockall - checkflag FLAG_BADGE02_GET - goto_eq DewfordTown_Gym_EventScript_1FC9C2 + goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_1FC9C2 goto DewfordTown_Gym_EventScript_1FC9CC end diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index bec9826f3..450ccb4ec 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -7,7 +7,7 @@ DewfordTown_Hall_EventScript_1FD4D0:: @ 81FD4D0 call DewfordTown_Hall_EventScript_271E8B special TrendyPhraseIsOld compare VAR_RESULT, 1 - goto_eq DewfordTown_Hall_EventScript_1FD4EF + goto_if_eq DewfordTown_Hall_EventScript_1FD4EF msgbox DewfordTown_Hall_Text_1FD818, MSGBOX_DEFAULT release end @@ -32,9 +32,9 @@ DewfordTown_Hall_EventScript_1FD50A:: @ 81FD50A special sub_811EF6C msgbox DewfordTown_Hall_Text_1FD948, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq DewfordTown_Hall_EventScript_1FD533 + goto_if_eq DewfordTown_Hall_EventScript_1FD533 compare VAR_RESULT, 0 - goto_eq DewfordTown_Hall_EventScript_1FD53D + goto_if_eq DewfordTown_Hall_EventScript_1FD53D end DewfordTown_Hall_EventScript_1FD533:: @ 81FD533 @@ -192,15 +192,15 @@ DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A applymovement 8, DewfordTown_Hall_Movement_1FD7D6 waitmovement 0 compare VAR_0x8008, 0 - goto_eq DewfordTown_Hall_EventScript_1FD75B + goto_if_eq DewfordTown_Hall_EventScript_1FD75B compare VAR_0x8008, 1 - goto_eq DewfordTown_Hall_EventScript_1FD771 + goto_if_eq DewfordTown_Hall_EventScript_1FD771 end DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B compare VAR_FACING, 4 - goto_eq DewfordTown_Hall_EventScript_1FD739 - applymovement 255, DewfordTown_Hall_Movement_2725A8 + goto_if_eq DewfordTown_Hall_EventScript_1FD739 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A8 waitmovement 0 return @@ -211,32 +211,32 @@ DewfordTown_Hall_EventScript_1FD772:: @ 81FD772 applymovement 7, DewfordTown_Hall_Movement_1FD7D8 waitmovement 0 compare VAR_0x8008, 0 - goto_eq DewfordTown_Hall_EventScript_1FD793 + goto_if_eq DewfordTown_Hall_EventScript_1FD793 compare VAR_0x8008, 1 - goto_eq DewfordTown_Hall_EventScript_1FD7C0 + goto_if_eq DewfordTown_Hall_EventScript_1FD7C0 end DewfordTown_Hall_EventScript_1FD793:: @ 81FD793 compare VAR_FACING, 2 - call_if 1, DewfordTown_Hall_EventScript_1FD7AA + call_if_eq DewfordTown_Hall_EventScript_1FD7AA compare VAR_FACING, 1 - call_if 1, DewfordTown_Hall_EventScript_1FD7B5 + call_if_eq DewfordTown_Hall_EventScript_1FD7B5 return DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA - applymovement 255, DewfordTown_Hall_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A6 waitmovement 0 return DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5 - applymovement 255, DewfordTown_Hall_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725AA waitmovement 0 return DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 compare VAR_FACING, 3 - goto_eq DewfordTown_Hall_EventScript_1FD739 - applymovement 255, DewfordTown_Hall_Movement_2725A4 + goto_if_eq DewfordTown_Hall_EventScript_1FD739 + applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A4 waitmovement 0 return @@ -252,12 +252,11 @@ DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA lock faceplayer call DewfordTown_Hall_EventScript_271E8B - checkflag FLAG_RECEIVED_TM_36 - goto_eq DewfordTown_Hall_EventScript_1FD80E + goto_if_set FLAG_RECEIVED_TM_36, DewfordTown_Hall_EventScript_1FD80E msgbox DewfordTown_Hall_Text_1FE142, MSGBOX_DEFAULT giveitem_std ITEM_TM36 compare VAR_RESULT, 0 - goto_eq DewfordTown_Hall_EventScript_272054 + goto_if_eq DewfordTown_Hall_EventScript_272054 setflag FLAG_RECEIVED_TM_36 release end diff --git a/data/maps/DewfordTown_House2/scripts.inc b/data/maps/DewfordTown_House2/scripts.inc index c0de82dac..cff58306e 100644 --- a/data/maps/DewfordTown_House2/scripts.inc +++ b/data/maps/DewfordTown_House2/scripts.inc @@ -4,12 +4,11 @@ DewfordTown_House2_MapScripts:: @ 81FE22D DewfordTown_House2_EventScript_1FE22E:: @ 81FE22E lock faceplayer - checkflag FLAG_0x121 - goto_eq DewfordTown_House2_EventScript_1FE267 + goto_if_set FLAG_0x121, DewfordTown_House2_EventScript_1FE267 msgbox DewfordTown_House2_Text_1FE27A, MSGBOX_DEFAULT giveitem_std ITEM_SILK_SCARF compare VAR_RESULT, 0 - goto_eq DewfordTown_House2_EventScript_1FE25D + goto_if_eq DewfordTown_House2_EventScript_1FE25D setflag FLAG_0x121 release end diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc index 5bb85a3c1..75327b839 100644 --- a/data/maps/EverGrandeCity/scripts.inc +++ b/data/maps/EverGrandeCity/scripts.inc @@ -3,8 +3,7 @@ EverGrandeCity_MapScripts:: @ 81E7D1B .byte 0 EverGrandeCity_MapScript1_1E7D21: @ 81E7D21 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, EverGrandeCity_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, EverGrandeCity_EventScript_27207A end EverGrandeCity_EventScript_1E7D2B:: @ 81E7D2B diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 250a3012b..8da9ae712 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -13,7 +13,7 @@ EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05 .2byte 0 EverGrandeCity_ChampionsRoom_EventScript_228A0F:: @ 8228A0F - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end EverGrandeCity_ChampionsRoom_MapScript2_228A14: @ 8228A14 @@ -22,10 +22,10 @@ EverGrandeCity_ChampionsRoom_MapScript2_228A14: @ 8228A14 EverGrandeCity_ChampionsRoom_EventScript_228A1E:: @ 8228A1E lockall - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725C1 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725C1 waitmovement 0 delay 40 - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228A42 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228A42 waitmovement 0 setvar VAR_TEMP_1, 1 goto EverGrandeCity_ChampionsRoom_EventScript_228A45 @@ -54,16 +54,16 @@ EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61 playse SE_DOOR checkplayergender compare VAR_RESULT, 0 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228ABC + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228ABC compare VAR_RESULT, 1 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228AC1 + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AC1 addobject 2 call EverGrandeCity_ChampionsRoom_EventScript_228BFD checkplayergender compare VAR_RESULT, 0 - goto_eq EverGrandeCity_ChampionsRoom_EventScript_228AC6 + goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AC6 compare VAR_RESULT, 1 - goto_eq EverGrandeCity_ChampionsRoom_EventScript_228AFB + goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AFB end EverGrandeCity_ChampionsRoom_EventScript_228ABC:: @ 8228ABC @@ -105,7 +105,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 addobject 3 applymovement 3, EverGrandeCity_ChampionsRoom_Movement_228C43 waitmovement 0 - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725A8 waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT call EverGrandeCity_ChampionsRoom_EventScript_272184 @@ -119,22 +119,22 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 closemessage delay 30 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3B - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228C1D + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C1D applymovement 3, EverGrandeCity_ChampionsRoom_Movement_2725A6 applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C38 waitmovement 0 delay 20 - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725AA waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT checkplayergender compare VAR_RESULT, 0 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BEB + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228BEB compare VAR_RESULT, 1 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BF4 + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228BF4 closemessage applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3F - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228C20 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C20 waitmovement 0 setflag FLAG_HIDE_PETALBURG_GYM_GREETER warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 @@ -153,7 +153,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228BF4:: @ 8228BF4 EverGrandeCity_ChampionsRoom_EventScript_228BFD:: @ 8228BFD applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C26 waitmovement 0 - applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725A4 waitmovement 0 return diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index b50e715aa..06dd58d26 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -9,7 +9,7 @@ EverGrandeCity_DrakesRoom_MapScript2_2286AC: @ 82286AC .2byte 0 EverGrandeCity_DrakesRoom_EventScript_2286B6:: @ 82286B6 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end EverGrandeCity_DrakesRoom_MapScript2_2286BB: @ 82286BB @@ -24,10 +24,9 @@ EverGrandeCity_DrakesRoom_EventScript_2286C5:: @ 82286C5 end EverGrandeCity_DrakesRoom_MapScript1_2286D2: @ 82286D2 - checkflag FLAG_0x4FE - call_if 1, EverGrandeCity_DrakesRoom_EventScript_2286E7 + call_if_set FLAG_0x4FE, EverGrandeCity_DrakesRoom_EventScript_2286E7 compare VAR_0x409C, 4 - call_if 1, EverGrandeCity_DrakesRoom_EventScript_2286ED + call_if_eq EverGrandeCity_DrakesRoom_EventScript_2286ED end EverGrandeCity_DrakesRoom_EventScript_2286E7:: @ 82286E7 @@ -41,8 +40,7 @@ EverGrandeCity_DrakesRoom_EventScript_2286ED:: @ 82286ED EverGrandeCity_DrakesRoom_EventScript_2286F3:: @ 82286F3 lock faceplayer - checkflag FLAG_0x4FE - goto_eq EverGrandeCity_DrakesRoom_EventScript_22871A + goto_if_set FLAG_0x4FE, EverGrandeCity_DrakesRoom_EventScript_22871A playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_DrakesRoom_Text_22873E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_228895 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 141881cf9..641c994a5 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -9,7 +9,7 @@ EverGrandeCity_GlaciasRoom_MapScript2_228422: @ 8228422 .2byte 0 EverGrandeCity_GlaciasRoom_EventScript_22842C:: @ 822842C - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end EverGrandeCity_GlaciasRoom_MapScript2_228431: @ 8228431 @@ -24,10 +24,9 @@ EverGrandeCity_GlaciasRoom_EventScript_22843B:: @ 822843B end EverGrandeCity_GlaciasRoom_MapScript1_228448: @ 8228448 - checkflag FLAG_0x4FD - call_if 1, EverGrandeCity_GlaciasRoom_EventScript_22845D + call_if_set FLAG_0x4FD, EverGrandeCity_GlaciasRoom_EventScript_22845D compare VAR_0x409C, 3 - call_if 1, EverGrandeCity_GlaciasRoom_EventScript_228463 + call_if_eq EverGrandeCity_GlaciasRoom_EventScript_228463 end EverGrandeCity_GlaciasRoom_EventScript_22845D:: @ 822845D @@ -41,8 +40,7 @@ EverGrandeCity_GlaciasRoom_EventScript_228463:: @ 8228463 EverGrandeCity_GlaciasRoom_EventScript_228469:: @ 8228469 lock faceplayer - checkflag FLAG_0x4FD - goto_eq EverGrandeCity_GlaciasRoom_EventScript_228490 + goto_if_set FLAG_0x4FD, EverGrandeCity_GlaciasRoom_EventScript_228490 playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_GlaciasRoom_Text_2284AC, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_2285B4 diff --git a/data/maps/EverGrandeCity_Hall1/scripts.inc b/data/maps/EverGrandeCity_Hall1/scripts.inc index 960918662..a5b7764d7 100644 --- a/data/maps/EverGrandeCity_Hall1/scripts.inc +++ b/data/maps/EverGrandeCity_Hall1/scripts.inc @@ -7,6 +7,6 @@ EverGrandeCity_Hall1_MapScript2_22956F: @ 822956F .2byte 0 EverGrandeCity_Hall1_EventScript_229579:: @ 8229579 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end diff --git a/data/maps/EverGrandeCity_Hall2/scripts.inc b/data/maps/EverGrandeCity_Hall2/scripts.inc index 1d76e3695..565d68168 100644 --- a/data/maps/EverGrandeCity_Hall2/scripts.inc +++ b/data/maps/EverGrandeCity_Hall2/scripts.inc @@ -7,6 +7,6 @@ EverGrandeCity_Hall2_MapScript2_229584: @ 8229584 .2byte 0 EverGrandeCity_Hall2_EventScript_22958E:: @ 822958E - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end diff --git a/data/maps/EverGrandeCity_Hall3/scripts.inc b/data/maps/EverGrandeCity_Hall3/scripts.inc index a100487f5..85d0bb2f6 100644 --- a/data/maps/EverGrandeCity_Hall3/scripts.inc +++ b/data/maps/EverGrandeCity_Hall3/scripts.inc @@ -7,6 +7,6 @@ EverGrandeCity_Hall3_MapScript2_229599: @ 8229599 .2byte 0 EverGrandeCity_Hall3_EventScript_2295A3:: @ 82295A3 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end diff --git a/data/maps/EverGrandeCity_Hall4/scripts.inc b/data/maps/EverGrandeCity_Hall4/scripts.inc index a7c730594..29f56829a 100644 --- a/data/maps/EverGrandeCity_Hall4/scripts.inc +++ b/data/maps/EverGrandeCity_Hall4/scripts.inc @@ -7,6 +7,6 @@ EverGrandeCity_Hall4_MapScript2_2295AE: @ 82295AE .2byte 0 EverGrandeCity_Hall4_EventScript_2295B8:: @ 82295B8 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end diff --git a/data/maps/EverGrandeCity_Hall5/scripts.inc b/data/maps/EverGrandeCity_Hall5/scripts.inc index 9ca9991e4..d492c28d2 100644 --- a/data/maps/EverGrandeCity_Hall5/scripts.inc +++ b/data/maps/EverGrandeCity_Hall5/scripts.inc @@ -7,6 +7,6 @@ EverGrandeCity_Hall5_MapScript2_2295C3: @ 82295C3 .2byte 0 EverGrandeCity_Hall5_EventScript_2295CD:: @ 82295CD - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 2a871e18f..9b9bdb5d6 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -8,7 +8,7 @@ EverGrandeCity_HallOfFame_MapScript2_229837: @ 8229837 .2byte 0 EverGrandeCity_HallOfFame_EventScript_229841:: @ 8229841 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end EverGrandeCity_HallOfFame_MapScript2_229846: @ 8229846 @@ -18,24 +18,24 @@ EverGrandeCity_HallOfFame_MapScript2_229846: @ 8229846 EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 lockall applymovement 1, EverGrandeCity_HallOfFame_Movement_229901 - applymovement 255, EverGrandeCity_HallOfFame_Movement_229901 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229901 waitmovement 0 applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8 - applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A4 waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_22990E, MSGBOX_DEFAULT closemessage applymovement 1, EverGrandeCity_HallOfFame_Movement_229908 - applymovement 255, EverGrandeCity_HallOfFame_Movement_229908 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229908 waitmovement 0 delay 20 applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8 - applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A4 waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT closemessage applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A6 - applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A6 waitmovement 0 delay 20 dofieldeffect 62 @@ -45,9 +45,9 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 call EverGrandeCity_HallOfFame_EventScript_2717C1 checkplayergender compare VAR_RESULT, 0 - goto_eq EverGrandeCity_HallOfFame_EventScript_2298E9 + goto_if_eq EverGrandeCity_HallOfFame_EventScript_2298E9 compare VAR_RESULT, 1 - goto_eq EverGrandeCity_HallOfFame_EventScript_2298F5 + goto_if_eq EverGrandeCity_HallOfFame_EventScript_2298F5 end EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 165c985ac..84ead3766 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -9,7 +9,7 @@ EverGrandeCity_PhoebesRoom_MapScript2_228184: @ 8228184 .2byte 0 EverGrandeCity_PhoebesRoom_EventScript_22818E:: @ 822818E - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end EverGrandeCity_PhoebesRoom_MapScript2_228193: @ 8228193 @@ -24,10 +24,9 @@ EverGrandeCity_PhoebesRoom_EventScript_22819D:: @ 822819D end EverGrandeCity_PhoebesRoom_MapScript1_2281AA: @ 82281AA - checkflag FLAG_0x4FC - call_if 1, EverGrandeCity_PhoebesRoom_EventScript_2281BF + call_if_set FLAG_0x4FC, EverGrandeCity_PhoebesRoom_EventScript_2281BF compare VAR_0x409C, 2 - call_if 1, EverGrandeCity_PhoebesRoom_EventScript_2281C5 + call_if_eq EverGrandeCity_PhoebesRoom_EventScript_2281C5 end EverGrandeCity_PhoebesRoom_EventScript_2281BF:: @ 82281BF @@ -41,8 +40,7 @@ EverGrandeCity_PhoebesRoom_EventScript_2281C5:: @ 82281C5 EverGrandeCity_PhoebesRoom_EventScript_2281CB:: @ 82281CB lock faceplayer - checkflag FLAG_0x4FC - goto_eq EverGrandeCity_PhoebesRoom_EventScript_2281F2 + goto_if_set FLAG_0x4FC, EverGrandeCity_PhoebesRoom_EventScript_2281F2 playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_PhoebesRoom_Text_22820E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_228325 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 3fb16a5ab..c029571d0 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -5,13 +5,11 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34 EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1 - checkflag FLAG_0x1CF - call_if 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C + call_if_unset FLAG_0x1CF, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C end EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C - checkflag FLAG_BADGE06_GET - goto_if 0, EverGrandeCity_PokemonCenter_1F_EventScript_27374E + goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonCenter_1F_EventScript_27374E clearflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT return @@ -37,11 +35,11 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79 msgbox EverGrandeCity_PokemonCenter_1F_Text_229BF1, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 - call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AB6 + call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AB6 compare VAR_FACING, 4 - call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 + call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 compare VAR_FACING, 3 - call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 + call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 addvar VAR_0x40D1, 1 setflag FLAG_0x1CF playse SE_KAIDAN diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index 0f3f6c33e..9b9c561eb 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -6,8 +6,7 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2 EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2 setflag FLAG_LANDMARK_POKEMON_LEAGUE - checkflag FLAG_0x107 - call_if 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED + call_if_unset FLAG_0x107, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED end EverGrandeCity_PokemonLeague_1F_EventScript_2295ED:: @ 82295ED @@ -48,18 +47,16 @@ EverGrandeCity_PokemonLeague_1F_Pokemart_229624: @ 8229624 EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636 lockall - checkflag FLAG_0x107 - goto_eq EverGrandeCity_PokemonLeague_1F_EventScript_2296BB + goto_if_set FLAG_0x107, EverGrandeCity_PokemonLeague_1F_EventScript_2296BB getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_0, 11 - call_if 4, EverGrandeCity_PokemonLeague_1F_EventScript_229698 + call_if_ge EverGrandeCity_PokemonLeague_1F_EventScript_229698 compare VAR_TEMP_0, 8 - call_if 3, EverGrandeCity_PokemonLeague_1F_EventScript_2296A3 + call_if_le EverGrandeCity_PokemonLeague_1F_EventScript_2296A3 message EverGrandeCity_PokemonLeague_1F_Text_2296E8 waitmessage delay 120 - checkflag FLAG_BADGE06_GET - goto_if 0, EverGrandeCity_PokemonLeague_1F_EventScript_2296AE + goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonLeague_1F_EventScript_2296AE closemessage applymovement 3, EverGrandeCity_PokemonLeague_1F_Movement_2296E2 applymovement 4, EverGrandeCity_PokemonLeague_1F_Movement_2296E5 @@ -77,12 +74,12 @@ EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636 end EverGrandeCity_PokemonLeague_1F_EventScript_229698:: @ 8229698 - applymovement 255, EverGrandeCity_PokemonLeague_1F_Movement_2296DA + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_2296DA waitmovement 0 return EverGrandeCity_PokemonLeague_1F_EventScript_2296A3:: @ 82296A3 - applymovement 255, EverGrandeCity_PokemonLeague_1F_Movement_2296DE + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_2296DE waitmovement 0 return diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index b283f166e..8324e19cf 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -11,10 +11,9 @@ EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16 end EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D - checkflag FLAG_0x4FB - call_if 1, EverGrandeCity_SidneysRoom_EventScript_227F32 + call_if_set FLAG_0x4FB, EverGrandeCity_SidneysRoom_EventScript_227F32 compare VAR_0x409C, 1 - call_if 1, EverGrandeCity_SidneysRoom_EventScript_227F38 + call_if_eq EverGrandeCity_SidneysRoom_EventScript_227F38 end EverGrandeCity_SidneysRoom_EventScript_227F32:: @ 8227F32 @@ -31,7 +30,7 @@ EverGrandeCity_SidneysRoom_MapScript2_227F3E: @ 8227F3E .2byte 0 EverGrandeCity_SidneysRoom_EventScript_227F48:: @ 8227F48 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end EverGrandeCity_SidneysRoom_MapScript2_227F4D: @ 8227F4D @@ -48,8 +47,7 @@ EverGrandeCity_SidneysRoom_EventScript_227F57:: @ 8227F57 EverGrandeCity_SidneysRoom_EventScript_227F64:: @ 8227F64 lock faceplayer - checkflag FLAG_0x4FB - goto_eq EverGrandeCity_SidneysRoom_EventScript_227F8B + goto_if_set FLAG_0x4FB, EverGrandeCity_SidneysRoom_EventScript_227F8B playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_SidneysRoom_Text_227FA7, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_2280A2 diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index 7a9d0b444..7b157c5f3 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -11,8 +11,7 @@ FallarborTown_MapScript1_1EB200: @ 81EB200 FallarborTown_EventScript_1EB20C:: @ 81EB20C lock faceplayer - checkflag FLAG_0x08B - goto_eq FallarborTown_EventScript_1EB221 + goto_if_set FLAG_0x08B, FallarborTown_EventScript_1EB221 msgbox FallarborTown_Text_1EB26B, MSGBOX_DEFAULT release end diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index f3e1edbbf..a81bf991c 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -11,9 +11,9 @@ FallarborTown_BattleTentBattleRoom_MapScript1_2008A9: @ 82008A9 FallarborTown_BattleTentBattleRoom_EventScript_2008AF:: @ 82008AF checkplayergender compare VAR_RESULT, 0 - goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2008C7 + goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_2008C7 compare VAR_RESULT, 1 - goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2008D2 + goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_2008D2 return FallarborTown_BattleTentBattleRoom_EventScript_2008C7:: @ 82008C7 @@ -39,7 +39,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, FallarborTown_BattleTentBattleRoom_EventScript_200B73 + goto_if_ne FallarborTown_BattleTentBattleRoom_EventScript_200B73 FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F setvar VAR_0x8004, 3 @@ -117,9 +117,9 @@ FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 1 - call_if 1, FallarborTown_BattleTentBattleRoom_EventScript_200B43 + call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_200B43 compare VAR_RESULT, 2 - call_if 1, FallarborTown_BattleTentBattleRoom_EventScript_200B4A + call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_200B4A multichoice 20, 6, 104, 1 switch VAR_RESULT case 0, FallarborTown_BattleTentBattleRoom_EventScript_200AD8 @@ -164,7 +164,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3 setvar VAR_0x8005, 1 special CallBattleArenaFunction compare VAR_RESULT, 9999 - goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2009B3 + goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_2009B3 addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -260,7 +260,7 @@ FallarborTown_BattleTentBattleRoom_MapScript2_200BB0: @ 8200BB0 .2byte 0 FallarborTown_BattleTentBattleRoom_EventScript_200BBA:: @ 8200BBA - hideobjectat 255, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM hideobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM removeobject 3 setvar VAR_TEMP_1, 1 diff --git a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc index d21216208..f3d0a924e 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc @@ -10,12 +10,12 @@ FallarborTown_BattleTentCorridor_EventScript_2006B7:: @ 82006B7 lockall setvar VAR_TEMP_0, 1 applymovement 1, FallarborTown_BattleTentCorridor_Movement_2006FB - applymovement 255, FallarborTown_BattleTentCorridor_Movement_2006FB + applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_2006FB waitmovement 0 opendoor 2, 1 waitdooranim applymovement 1, FallarborTown_BattleTentCorridor_Movement_200701 - applymovement 255, FallarborTown_BattleTentCorridor_Movement_200700 + applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_200700 waitmovement 0 closedoor 2, 1 waitdooranim diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index aed9aa93f..cfc468994 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -9,7 +9,7 @@ FallarborTown_BattleTentLobby_MapScript2_1FFE71: @ 81FFE71 FallarborTown_BattleTentLobby_EventScript_1FFE7B:: @ 81FFE7B setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85 @@ -133,7 +133,7 @@ FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001 setvar VAR_0x8004, 1 special sub_81B9B80 compare VAR_RESULT, 0 - goto_if 5, FallarborTown_BattleTentLobby_EventScript_1FFF84 + goto_if_ne FallarborTown_BattleTentLobby_EventScript_1FFF84 special SavePlayerParty msgbox FallarborTown_BattleTentLobby_Text_2C47EB, MSGBOX_DEFAULT @@ -154,7 +154,7 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 - goto_eq FallarborTown_BattleTentLobby_EventScript_200176 + goto_if_eq FallarborTown_BattleTentLobby_EventScript_200176 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 2 @@ -166,7 +166,7 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D special sub_80F9490 waitstate compare VAR_RESULT, 0 - goto_eq FallarborTown_BattleTentLobby_EventScript_2001C2 + goto_if_eq FallarborTown_BattleTentLobby_EventScript_2001C2 msgbox FallarborTown_BattleTentLobby_Text_2C4B35, MSGBOX_YESNO switch VAR_RESULT case 0, FallarborTown_BattleTentLobby_EventScript_2001C2 @@ -194,7 +194,7 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2 call FallarborTown_BattleTentLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq FallarborTown_BattleTentLobby_EventScript_2001AB + goto_if_eq FallarborTown_BattleTentLobby_EventScript_2001AB FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C special SavePlayerParty @@ -245,12 +245,12 @@ FallarborTown_BattleTentLobby_EventScript_2001CD:: @ 82001CD FallarborTown_BattleTentLobby_EventScript_2001CF:: @ 82001CF applymovement 1, FallarborTown_BattleTentLobby_Movement_2001FE - applymovement 255, FallarborTown_BattleTentLobby_Movement_200205 + applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_200205 waitmovement 0 opendoor 6, 1 waitdooranim applymovement 1, FallarborTown_BattleTentLobby_Movement_200202 - applymovement 255, FallarborTown_BattleTentLobby_Movement_200209 + applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_200209 waitmovement 0 closedoor 6, 1 waitdooranim @@ -294,8 +294,7 @@ FallarborTown_BattleTentLobby_EventScript_20021F:: @ 820021F FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228 lock faceplayer - checkflag FLAG_0x1CD - goto_eq FallarborTown_BattleTentLobby_EventScript_200245 + goto_if_set FLAG_0x1CD, FallarborTown_BattleTentLobby_EventScript_200245 msgbox FallarborTown_BattleTentLobby_Text_200501, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 setflag FLAG_0x1CD diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc index 470d80267..699f5e4ed 100644 --- a/data/maps/FallarborTown_House1/scripts.inc +++ b/data/maps/FallarborTown_House1/scripts.inc @@ -4,26 +4,23 @@ FallarborTown_House1_MapScripts:: @ 8200F12 FallarborTown_House1_EventScript_200F13:: @ 8200F13 lock faceplayer - checkflag FLAG_0x0E5 - goto_eq FallarborTown_House1_EventScript_200FB2 + goto_if_set FLAG_0x0E5, FallarborTown_House1_EventScript_200FB2 checkitem ITEM_METEORITE, 1 compare VAR_RESULT, 1 - goto_eq FallarborTown_House1_EventScript_200F38 + goto_if_eq FallarborTown_House1_EventScript_200F38 msgbox FallarborTown_House1_Text_200FEE, MSGBOX_DEFAULT release end FallarborTown_House1_EventScript_200F38:: @ 8200F38 - checkflag FLAG_TEMP_2 - call_if 0, FallarborTown_House1_EventScript_200F8B - checkflag FLAG_TEMP_2 - call_if 1, FallarborTown_House1_EventScript_200F9C + call_if_unset FLAG_TEMP_2, FallarborTown_House1_EventScript_200F8B + call_if_set FLAG_TEMP_2, FallarborTown_House1_EventScript_200F9C compare VAR_RESULT, 0 - goto_eq FallarborTown_House1_EventScript_200FA5 + goto_if_eq FallarborTown_House1_EventScript_200FA5 msgbox FallarborTown_House1_Text_201159, MSGBOX_DEFAULT giveitem_std ITEM_TM27 compare VAR_RESULT, 0 - goto_eq FallarborTown_House1_EventScript_272054 + goto_if_eq FallarborTown_House1_EventScript_272054 setvar VAR_0x8004, 280 call FallarborTown_House1_EventScript_2723E4 setflag FLAG_0x0E5 @@ -54,10 +51,8 @@ FallarborTown_House1_EventScript_200FB2:: @ 8200FB2 FallarborTown_House1_EventScript_200FBC:: @ 8200FBC lock faceplayer - checkflag FLAG_0x0E5 - goto_eq FallarborTown_House1_EventScript_200FE4 - checkflag FLAG_0x08B - goto_eq FallarborTown_House1_EventScript_200FDA + goto_if_set FLAG_0x0E5, FallarborTown_House1_EventScript_200FE4 + goto_if_set FLAG_0x08B, FallarborTown_House1_EventScript_200FDA msgbox FallarborTown_House1_Text_2012BC, MSGBOX_DEFAULT release end diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc index 2fddd2fd4..962c4f64e 100644 --- a/data/maps/FallarborTown_House2/scripts.inc +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -5,8 +5,7 @@ FallarborTown_House2_EventScript_201383:: @ 8201383 lockall applymovement 1, FallarborTown_House2_Movement_27259E waitmovement 0 - checkflag FLAG_TEMP_1 - goto_eq FallarborTown_House2_EventScript_2013A8 + goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_2013A8 msgbox FallarborTown_House2_Text_20145C, MSGBOX_DEFAULT setflag FLAG_TEMP_1 goto FallarborTown_House2_EventScript_2013A8 @@ -15,7 +14,7 @@ FallarborTown_House2_EventScript_201383:: @ 8201383 FallarborTown_House2_EventScript_2013A8:: @ 82013A8 checkitem ITEM_HEART_SCALE, 1 compare VAR_RESULT, 0 - goto_eq FallarborTown_House2_EventScript_201452 + goto_if_eq FallarborTown_House2_EventScript_201452 msgbox FallarborTown_House2_Text_201541, MSGBOX_YESNO switch VAR_RESULT case 0, FallarborTown_House2_EventScript_201452 @@ -27,12 +26,12 @@ FallarborTown_House2_EventScript_2013D6:: @ 82013D6 special sub_81B951C waitstate compare VAR_0x8004, 255 - goto_eq FallarborTown_House2_EventScript_201452 + goto_if_eq FallarborTown_House2_EventScript_201452 special sub_81B98DC compare VAR_RESULT, 1 - goto_eq FallarborTown_House2_EventScript_201444 + goto_if_eq FallarborTown_House2_EventScript_201444 compare VAR_0x8005, 0 - goto_eq FallarborTown_House2_EventScript_201436 + goto_if_eq FallarborTown_House2_EventScript_201436 goto FallarborTown_House2_EventScript_20140C end @@ -41,7 +40,7 @@ FallarborTown_House2_EventScript_20140C:: @ 820140C special TeachMoveTutorMove waitstate compare VAR_0x8004, 0 - goto_eq FallarborTown_House2_EventScript_2013D6 + goto_if_eq FallarborTown_House2_EventScript_2013D6 msgbox FallarborTown_House2_Text_201627, MSGBOX_DEFAULT takeitem ITEM_HEART_SCALE, 1 goto FallarborTown_House2_EventScript_201452 diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc index 1fd5fdd35..8661c4c52 100644 --- a/data/maps/FarawayIsland_Entrance/scripts.inc +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -7,12 +7,12 @@ FarawayIsland_Entrance_MapScript1_267C94: @ 8267C94 end FarawayIsland_Entrance_EventScript_267C98:: @ 8267C98 - setweather 1 + setweather WEATHER_CLOUDS doweather end FarawayIsland_Entrance_EventScript_267C9D:: @ 8267C9D - setweather 0 + setweather WEATHER_NONE doweather end @@ -21,7 +21,7 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 faceplayer msgbox FarawayIsland_Entrance_Text_2C6B42, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq FarawayIsland_Entrance_EventScript_267CE7 + goto_if_eq FarawayIsland_Entrance_EventScript_267CE7 msgbox FarawayIsland_Entrance_Text_2A6A5D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, FarawayIsland_Entrance_Movement_2725AA diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index 7b62ab578..55fd591e2 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -6,20 +6,19 @@ FarawayIsland_Interior_MapScripts:: @ 8267CFA .byte 0 FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, FarawayIsland_Interior_EventScript_267D19 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, FarawayIsland_Interior_EventScript_267D19 end FarawayIsland_Interior_EventScript_267D19:: @ 8267D19 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq FarawayIsland_Interior_EventScript_267D4B + goto_if_eq FarawayIsland_Interior_EventScript_267D4B compare VAR_RESULT, 4 - goto_eq FarawayIsland_Interior_EventScript_267D4B + goto_if_eq FarawayIsland_Interior_EventScript_267D4B compare VAR_RESULT, 5 - goto_eq FarawayIsland_Interior_EventScript_267D4B + goto_if_eq FarawayIsland_Interior_EventScript_267D4B compare VAR_RESULT, 10 - goto_eq FarawayIsland_Interior_EventScript_267D4B + goto_if_eq FarawayIsland_Interior_EventScript_267D4B return FarawayIsland_Interior_EventScript_267D4B:: @ 8267D4B @@ -28,27 +27,24 @@ FarawayIsland_Interior_EventScript_267D4B:: @ 8267D4B return FarawayIsland_Interior_MapScript1_267D54: @ 8267D54 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, FarawayIsland_Interior_EventScript_267D5E + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, FarawayIsland_Interior_EventScript_267D5E end FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, FarawayIsland_Interior_EventScript_27374E + goto_if_ne FarawayIsland_Interior_EventScript_27374E removeobject VAR_LAST_TALKED return FarawayIsland_Interior_MapScript1_267D72: @ 8267D72 setvar VAR_0x403A, 0 setvar VAR_TEMP_1, 1 - checkflag FLAG_0x1CA - call_if 0, FarawayIsland_Interior_EventScript_267D86 + call_if_unset FLAG_0x1CA, FarawayIsland_Interior_EventScript_267D86 end FarawayIsland_Interior_EventScript_267D86:: @ 8267D86 - checkflag FLAG_0x1C7 - goto_eq FarawayIsland_Interior_EventScript_27374E + goto_if_set FLAG_0x1C7, FarawayIsland_Interior_EventScript_27374E clearflag FLAG_HIDE_MEW setvar VAR_TEMP_1, 0 return @@ -130,13 +126,13 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 waitse playmoncry SPECIES_MEW, 2 compare VAR_FACING, 2 - call_if 1, FarawayIsland_Interior_EventScript_267EAF + call_if_eq FarawayIsland_Interior_EventScript_267EAF compare VAR_FACING, 1 - call_if 1, FarawayIsland_Interior_EventScript_267EBA + call_if_eq FarawayIsland_Interior_EventScript_267EBA compare VAR_FACING, 3 - call_if 1, FarawayIsland_Interior_EventScript_267EC5 + call_if_eq FarawayIsland_Interior_EventScript_267EC5 compare VAR_FACING, 4 - call_if 1, FarawayIsland_Interior_EventScript_267ED0 + call_if_eq FarawayIsland_Interior_EventScript_267ED0 special sub_81D4BEC delay 40 waitmoncry @@ -150,13 +146,13 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq FarawayIsland_Interior_EventScript_267E96 + goto_if_eq FarawayIsland_Interior_EventScript_267E96 compare VAR_RESULT, 4 - goto_eq FarawayIsland_Interior_EventScript_267EA4 + goto_if_eq FarawayIsland_Interior_EventScript_267EA4 compare VAR_RESULT, 5 - goto_eq FarawayIsland_Interior_EventScript_267EA4 + goto_if_eq FarawayIsland_Interior_EventScript_267EA4 compare VAR_RESULT, 10 - goto_eq FarawayIsland_Interior_EventScript_267EA4 + goto_if_eq FarawayIsland_Interior_EventScript_267EA4 setflag FLAG_0x1CA release end diff --git a/data/maps/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc index f0a28345c..3888c61ef 100644 --- a/data/maps/FieryPath/scripts.inc +++ b/data/maps/FieryPath/scripts.inc @@ -3,8 +3,7 @@ FieryPath_MapScripts:: @ 8230F24 .byte 0 FieryPath_MapScript1_230F2A: @ 8230F2A - checkflag FLAG_LANDMARK_FIERY_PATH - call_if 0, FieryPath_EventScript_230F37 + call_if_unset FLAG_LANDMARK_FIERY_PATH, FieryPath_EventScript_230F37 setflag FLAG_LANDMARK_FIERY_PATH end diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index 948f443d2..d1c80c9f9 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -18,8 +18,7 @@ FortreeCity_EventScript_1E25B6:: @ 81E25B6 FortreeCity_EventScript_1E25BF:: @ 81E25BF lock faceplayer - checkflag FLAG_0x127 - goto_eq FortreeCity_EventScript_1E25D4 + goto_if_set FLAG_0x127, FortreeCity_EventScript_1E25D4 msgbox FortreeCity_Text_1E2738, MSGBOX_DEFAULT release end @@ -58,7 +57,7 @@ FortreeCity_EventScript_1E2614:: @ 81E2614 faceplayer checkitem ITEM_DEVON_SCOPE, 1 compare VAR_RESULT, 1 - goto_eq FortreeCity_EventScript_1E2630 + goto_if_eq FortreeCity_EventScript_1E2630 msgbox FortreeCity_Text_1E29E5, MSGBOX_DEFAULT release end @@ -66,7 +65,7 @@ FortreeCity_EventScript_1E2614:: @ 81E2614 FortreeCity_EventScript_1E2630:: @ 81E2630 msgbox FortreeCity_Text_1E2A08, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq FortreeCity_EventScript_1E2645 + goto_if_eq FortreeCity_EventScript_1E2645 release end diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index c56f0cbdb..f45d87c58 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -19,9 +19,8 @@ FortreeCity_Gym_EventScript_2165C8:: @ 82165C8 trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq FortreeCity_Gym_EventScript_21668D - checkflag FLAG_0x0AA - goto_if 0, FortreeCity_Gym_EventScript_216646 + goto_if_eq FortreeCity_Gym_EventScript_21668D + goto_if_unset FLAG_0x0AA, FortreeCity_Gym_EventScript_216646 msgbox FortreeCity_Gym_Text_217071, MSGBOX_DEFAULT release end @@ -52,7 +51,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD FortreeCity_Gym_EventScript_216646:: @ 8216646 giveitem_std ITEM_TM40 compare VAR_RESULT, 0 - goto_eq FortreeCity_Gym_EventScript_272054 + goto_if_eq FortreeCity_Gym_EventScript_272054 msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT setflag FLAG_0x0AA release @@ -61,7 +60,7 @@ FortreeCity_Gym_EventScript_216646:: @ 8216646 FortreeCity_Gym_EventScript_21666A:: @ 821666A giveitem_std ITEM_TM40 compare VAR_RESULT, 0 - goto_eq FortreeCity_Gym_EventScript_27205E + goto_if_eq FortreeCity_Gym_EventScript_27205E msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT setflag FLAG_0x0AA return @@ -104,8 +103,7 @@ FortreeCity_Gym_EventScript_21671B:: @ 821671B FortreeCity_Gym_EventScript_216732:: @ 8216732 lock faceplayer - checkflag FLAG_0x4F5 - goto_eq FortreeCity_Gym_EventScript_216747 + goto_if_set FLAG_0x4F5, FortreeCity_Gym_EventScript_216747 msgbox FortreeCity_Gym_Text_216785, MSGBOX_DEFAULT release end @@ -117,15 +115,13 @@ FortreeCity_Gym_EventScript_216747:: @ 8216747 FortreeCity_Gym_EventScript_216751:: @ 8216751 lockall - checkflag FLAG_BADGE06_GET - goto_eq FortreeCity_Gym_EventScript_216771 + goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_216771 goto FortreeCity_Gym_EventScript_21677B end FortreeCity_Gym_EventScript_216761:: @ 8216761 lockall - checkflag FLAG_BADGE06_GET - goto_eq FortreeCity_Gym_EventScript_216771 + goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_216771 goto FortreeCity_Gym_EventScript_21677B end diff --git a/data/maps/FortreeCity_House1/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc index 52a9793c3..44651ae0d 100644 --- a/data/maps/FortreeCity_House1/scripts.inc +++ b/data/maps/FortreeCity_House1/scripts.inc @@ -4,25 +4,24 @@ FortreeCity_House1_MapScripts:: @ 82162BA FortreeCity_House1_EventScript_2162BB:: @ 82162BB lock faceplayer - checkflag FLAG_0x09B - goto_eq FortreeCity_House1_EventScript_216355 + goto_if_set FLAG_0x09B, FortreeCity_House1_EventScript_216355 setvar VAR_0x8008, 1 copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT msgbox FortreeCity_House1_Text_21637B, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq FortreeCity_House1_EventScript_21633D + goto_if_eq FortreeCity_House1_EventScript_21633D special sub_81B94B0 waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 - goto_eq FortreeCity_House1_EventScript_21633D + goto_if_eq FortreeCity_House1_EventScript_21633D copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, sub_807E9D4 copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if 5, FortreeCity_House1_EventScript_216347 + goto_if_ne FortreeCity_House1_EventScript_216347 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special sub_807EA10 diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc index 0a5042c09..db8b14029 100644 --- a/data/maps/FortreeCity_House2/scripts.inc +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -4,10 +4,8 @@ FortreeCity_House2_MapScripts:: @ 82177CA FortreeCity_House2_EventScript_2177CB:: @ 82177CB lock faceplayer - checkflag FLAG_0x108 - goto_eq FortreeCity_House2_EventScript_21786E - checkflag FLAG_0x076 - call_if 0, FortreeCity_House2_EventScript_217862 + goto_if_set FLAG_0x108, FortreeCity_House2_EventScript_21786E + call_if_unset FLAG_0x076, FortreeCity_House2_EventScript_217862 msgbox FortreeCity_House2_Text_2178D6, MSGBOX_DEFAULT multichoice 21, 8, 54, 1 switch VAR_RESULT @@ -23,7 +21,7 @@ FortreeCity_House2_EventScript_2177CB:: @ 82177CB msgbox FortreeCity_House2_Text_217A28, MSGBOX_DEFAULT giveitem_std ITEM_TM10 compare VAR_RESULT, 0 - goto_eq FortreeCity_House2_EventScript_272054 + goto_if_eq FortreeCity_House2_EventScript_272054 setflag FLAG_0x108 msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT release diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index eb6043ab3..742fce6e9 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -7,12 +7,9 @@ FortreeCity_House4_EventScript_217C81:: @ 8217C81 FortreeCity_House4_EventScript_217C8A:: @ 8217C8A lockall - checkflag FLAG_0x0DF - goto_eq FortreeCity_House4_EventScript_217D06 - checkflag FLAG_0x0E0 - goto_eq FortreeCity_House4_EventScript_217CD8 - checkflag FLAG_0x0DE - goto_eq FortreeCity_House4_EventScript_217CC4 + goto_if_set FLAG_0x0DF, FortreeCity_House4_EventScript_217D06 + goto_if_set FLAG_0x0E0, FortreeCity_House4_EventScript_217CD8 + goto_if_set FLAG_0x0DE, FortreeCity_House4_EventScript_217CC4 msgbox FortreeCity_House4_Text_217DB9, MSGBOX_DEFAULT closemessage setflag FLAG_0x0DE @@ -36,7 +33,7 @@ FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 msgbox FortreeCity_House4_Text_217E05, MSGBOX_DEFAULT giveitem_std ITEM_MENTAL_HERB compare VAR_RESULT, 0 - goto_eq FortreeCity_House4_EventScript_272054 + goto_if_eq FortreeCity_House4_EventScript_272054 setflag FLAG_0x0DF releaseall end diff --git a/data/maps/GraniteCave_1F/scripts.inc b/data/maps/GraniteCave_1F/scripts.inc index 28b95d578..1ace4071b 100644 --- a/data/maps/GraniteCave_1F/scripts.inc +++ b/data/maps/GraniteCave_1F/scripts.inc @@ -4,8 +4,7 @@ GraniteCave_1F_MapScripts:: @ 822DA5D GraniteCave_1F_EventScript_22DA5E:: @ 822DA5E lock faceplayer - checkflag FLAG_0x06D - goto_eq GraniteCave_1F_EventScript_22DA8A + goto_if_set FLAG_0x06D, GraniteCave_1F_EventScript_22DA8A msgbox GraniteCave_1F_Text_22DA94, MSGBOX_DEFAULT giveitem_std ITEM_HM05 setflag FLAG_0x06D diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index da0668bac..e08dfffd7 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -11,7 +11,7 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B msgbox GraniteCave_StevensRoom_Text_22DDBD, MSGBOX_DEFAULT giveitem_std ITEM_TM47 compare VAR_RESULT, 0 - call_if 1, GraniteCave_StevensRoom_EventScript_22DD3C + call_if_eq GraniteCave_StevensRoom_EventScript_22DD3C msgbox GraniteCave_StevensRoom_Text_22DE6B, MSGBOX_DEFAULT closemessage delay 30 @@ -24,13 +24,13 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B msgbox GraniteCave_StevensRoom_Text_22DF8C, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 - call_if 1, GraniteCave_StevensRoom_EventScript_22DD0D + call_if_eq GraniteCave_StevensRoom_EventScript_22DD0D compare VAR_FACING, 1 - call_if 1, GraniteCave_StevensRoom_EventScript_22DD2A + call_if_eq GraniteCave_StevensRoom_EventScript_22DD2A compare VAR_FACING, 3 - call_if 1, GraniteCave_StevensRoom_EventScript_22DD18 + call_if_eq GraniteCave_StevensRoom_EventScript_22DD18 compare VAR_FACING, 4 - call_if 1, GraniteCave_StevensRoom_EventScript_22DD18 + call_if_eq GraniteCave_StevensRoom_EventScript_22DD18 playse SE_KAIDAN removeobject 1 release @@ -42,13 +42,13 @@ GraniteCave_StevensRoom_EventScript_22DD0D:: @ 822DD0D return GraniteCave_StevensRoom_EventScript_22DD18:: @ 822DD18 - applymovement 255, GraniteCave_StevensRoom_Movement_22DD4C + applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_22DD4C applymovement 1, GraniteCave_StevensRoom_Movement_22DD45 waitmovement 0 return GraniteCave_StevensRoom_EventScript_22DD2A:: @ 822DD2A - applymovement 255, GraniteCave_StevensRoom_Movement_22DD4C + applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_22DD4C applymovement 1, GraniteCave_StevensRoom_Movement_22DD51 waitmovement 0 return diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index 100e4314d..53bdc073a 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -18,9 +18,9 @@ InsideOfTruck_EventScript_23BF04:: @ 823BF04 setflag FLAG_SPECIAL_FLAG_0x4000 checkplayergender compare VAR_RESULT, 0 - goto_eq InsideOfTruck_EventScript_23BF20 + goto_if_eq InsideOfTruck_EventScript_23BF20 compare VAR_RESULT, 1 - goto_eq InsideOfTruck_EventScript_23BF46 + goto_if_eq InsideOfTruck_EventScript_23BF46 end InsideOfTruck_EventScript_23BF20:: @ 823BF20 diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index e18b73a7a..218a92205 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -5,20 +5,18 @@ IslandCave_MapScripts:: @ 8238E2A .byte 0 IslandCave_MapScript1_238E3A: @ 8238E3A - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, IslandCave_EventScript_238E44 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, IslandCave_EventScript_238E44 end IslandCave_EventScript_238E44:: @ 8238E44 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, IslandCave_EventScript_27374E + goto_if_ne IslandCave_EventScript_27374E removeobject VAR_LAST_TALKED return IslandCave_MapScript1_238E58: @ 8238E58 - checkflag FLAG_SYS_BRAILLE_WAIT - call_if 0, IslandCave_EventScript_238E62 + call_if_unset FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238E62 end IslandCave_EventScript_238E62:: @ 8238E62 @@ -33,8 +31,7 @@ IslandCave_EventScript_238E62:: @ 8238E62 IslandCave_MapScript1_238E99: @ 8238E99 setflag FLAG_LANDMARK_ISLAND_CAVE call IslandCave_EventScript_238F45 - checkflag FLAG_0x1BC - call_if 0, IslandCave_EventScript_238EAB + call_if_unset FLAG_0x1BC, IslandCave_EventScript_238EAB end IslandCave_EventScript_238EAB:: @ 8238EAB @@ -55,10 +52,8 @@ IslandCave_EventScript_238EAF:: @ 8238EAF IslandCave_EventScript_238EEF:: @ 8238EEF lockall - checkflag FLAG_TEMP_3 - call_if 1, IslandCave_EventScript_238F45 - checkflag FLAG_SYS_BRAILLE_WAIT - goto_eq IslandCave_EventScript_238F13 + call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45 + goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238F13 braillemessage IslandCave_Braille_2A6CD4 setflag FLAG_TEMP_2 special ShouldDoBrailleRegicePuzzle @@ -72,11 +67,9 @@ IslandCave_EventScript_238F13:: @ 8238F13 IslandCave_EventScript_238F1D:: @ 8238F1D lockall - checkflag FLAG_TEMP_3 - call_if 1, IslandCave_EventScript_238F45 + call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45 braillemessage IslandCave_Braille_2A6CD4 - checkflag FLAG_SYS_BRAILLE_WAIT - goto_eq IslandCave_EventScript_238F41 + goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238F41 setflag FLAG_TEMP_2 special ShouldDoBrailleRegicePuzzle goto IslandCave_EventScript_238F41 @@ -109,11 +102,11 @@ IslandCave_EventScript_238F58:: @ 8238F58 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq IslandCave_EventScript_238F9F + goto_if_eq IslandCave_EventScript_238F9F compare VAR_RESULT, 4 - goto_eq IslandCave_EventScript_238FA8 + goto_if_eq IslandCave_EventScript_238FA8 compare VAR_RESULT, 5 - goto_eq IslandCave_EventScript_238FA8 + goto_if_eq IslandCave_EventScript_238FA8 setflag FLAG_0x1BC release end diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index d9a5f0849..a140093ca 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -7,13 +7,13 @@ JaggedPass_MapScripts:: @ 8230656 JaggedPass_MapScript1_230666: @ 8230666 setstepcallback 1 compare VAR_0x40C8, 0 - call_if 1, JaggedPass_EventScript_230674 + call_if_eq JaggedPass_EventScript_230674 end JaggedPass_EventScript_230674:: @ 8230674 checkitem ITEM_MAGMA_EMBLEM, 1 compare VAR_RESULT, 1 - goto_eq JaggedPass_EventScript_230685 + goto_if_eq JaggedPass_EventScript_230685 return JaggedPass_EventScript_230685:: @ 8230685 @@ -22,17 +22,17 @@ JaggedPass_EventScript_230685:: @ 8230685 JaggedPass_MapScript1_23068B: @ 823068B compare VAR_0x40BD, 1 - call_if 1, JaggedPass_EventScript_230697 + call_if_eq JaggedPass_EventScript_230697 end JaggedPass_EventScript_230697:: @ 8230697 - setweather 7 + setweather WEATHER_ASH doweather return JaggedPass_MapScript1_23069C: @ 823069C compare VAR_0x40C8, 1 - goto_if 3, JaggedPass_EventScript_2306A8 + goto_if_le JaggedPass_EventScript_2306A8 end JaggedPass_EventScript_2306A8:: @ 82306A8 @@ -68,8 +68,7 @@ JaggedPass_EventScript_2306BB:: @ 82306BB JaggedPass_EventScript_230718:: @ 8230718 lockall - checkflag FLAG_0x139 - goto_eq JaggedPass_EventScript_230766 + goto_if_set FLAG_0x139, JaggedPass_EventScript_230766 waitse playse SE_PIN applymovement 5, JaggedPass_Movement_272598 @@ -106,7 +105,7 @@ JaggedPass_EventScript_23079C:: @ 823079C trainerbattle_single TRAINER_DIANA_1, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq JaggedPass_EventScript_2307E4 + goto_if_eq JaggedPass_EventScript_2307E4 msgbox JaggedPass_Text_2309D8, MSGBOX_DEFAULT release end @@ -127,7 +126,7 @@ JaggedPass_EventScript_2307FB:: @ 82307FB trainerbattle_single TRAINER_ETHAN_1, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq JaggedPass_EventScript_230843 + goto_if_eq JaggedPass_EventScript_230843 msgbox JaggedPass_Text_230B93, MSGBOX_DEFAULT release end diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index a42703900..f210a9d11 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -5,16 +5,14 @@ LavaridgeTown_MapScripts:: @ 81EA4D3 LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE setflag FLAG_VISITED_LAVARIDGE_TOWN - checkflag FLAG_0x06C - call_if 1, LavaridgeTown_EventScript_1EA514 - checkflag FLAG_0x08B - call_if 1, LavaridgeTown_EventScript_1EA53F + call_if_set FLAG_0x06C, LavaridgeTown_EventScript_1EA514 + call_if_set FLAG_0x08B, LavaridgeTown_EventScript_1EA53F call LavaridgeTown_EventScript_271ED7 call LavaridgeTown_EventScript_271EFB compare VAR_0x4053, 1 - call_if 1, LavaridgeTown_EventScript_1EA518 + call_if_eq LavaridgeTown_EventScript_1EA518 compare VAR_0x4053, 1 - call_if 1, LavaridgeTown_EventScript_1EA543 + call_if_eq LavaridgeTown_EventScript_1EA543 end LavaridgeTown_EventScript_1EA514:: @ 81EA514 @@ -24,7 +22,7 @@ LavaridgeTown_EventScript_1EA514:: @ 81EA514 LavaridgeTown_EventScript_1EA518:: @ 81EA518 getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 9 - goto_eq LavaridgeTown_EventScript_1EA529 + goto_if_eq LavaridgeTown_EventScript_1EA529 return LavaridgeTown_EventScript_1EA529:: @ 81EA529 @@ -50,24 +48,24 @@ LavaridgeTown_EventScript_1EA551:: @ 81EA551 lockall getplayerxy VAR_0x8008, VAR_0x8009 compare VAR_0x8008, 9 - call_if 1, LavaridgeTown_EventScript_1EA63A + call_if_eq LavaridgeTown_EventScript_1EA63A compare VAR_0x8008, 9 - call_if 5, LavaridgeTown_EventScript_1EA65C + call_if_ne LavaridgeTown_EventScript_1EA65C delay 20 checkplayergender compare VAR_RESULT, 0 - call_if 1, LavaridgeTown_EventScript_1EA630 + call_if_eq LavaridgeTown_EventScript_1EA630 compare VAR_RESULT, 1 - call_if 1, LavaridgeTown_EventScript_1EA635 + call_if_eq LavaridgeTown_EventScript_1EA635 compare VAR_0x8008, 9 - call_if 1, LavaridgeTown_EventScript_1EA6A1 + call_if_eq LavaridgeTown_EventScript_1EA6A1 compare VAR_0x8008, 9 - call_if 5, LavaridgeTown_EventScript_1EA6AC + call_if_ne LavaridgeTown_EventScript_1EA6AC checkplayergender compare VAR_RESULT, 0 - goto_eq LavaridgeTown_EventScript_1EA5B5 + goto_if_eq LavaridgeTown_EventScript_1EA5B5 compare VAR_RESULT, 1 - goto_eq LavaridgeTown_EventScript_1EA5DA + goto_if_eq LavaridgeTown_EventScript_1EA5DA end LavaridgeTown_EventScript_1EA5B5:: @ 81EA5B5 @@ -92,9 +90,9 @@ LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF addobject 7 delay 30 compare VAR_0x8008, 9 - call_if 1, LavaridgeTown_EventScript_1EA6B7 + call_if_eq LavaridgeTown_EventScript_1EA6B7 compare VAR_0x8008, 9 - call_if 5, LavaridgeTown_EventScript_1EA6C9 + call_if_ne LavaridgeTown_EventScript_1EA6C9 removeobject 7 setvar VAR_0x4053, 2 clearflag FLAG_SPECIAL_FLAG_0x4000 @@ -136,7 +134,7 @@ LavaridgeTown_EventScript_1EA65C:: @ 81EA65C waitmovement 0 applymovement 8, LavaridgeTown_Movement_27259A waitmovement 0 - applymovement 255, LavaridgeTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LavaridgeTown_Movement_2725A8 waitmovement 0 return @@ -151,7 +149,7 @@ LavaridgeTown_EventScript_1EA6AC:: @ 81EA6AC return LavaridgeTown_EventScript_1EA6B7:: @ 81EA6B7 - applymovement 255, LavaridgeTown_Movement_1EA6DF + applymovement EVENT_OBJ_ID_PLAYER, LavaridgeTown_Movement_1EA6DF applymovement 7, LavaridgeTown_Movement_1EA6E3 waitmovement 0 return @@ -214,7 +212,7 @@ LavaridgeTown_Movement_1EA6F8: @ 81EA6F8 LavaridgeTown_EventScript_1EA6FA:: @ 81EA6FA specialvar VAR_RESULT, GetPlayerFacingDirection compare VAR_RESULT, 1 - goto_eq LavaridgeTown_EventScript_1EA70B + goto_if_eq LavaridgeTown_EventScript_1EA70B end LavaridgeTown_EventScript_1EA70B:: @ 81EA70B @@ -248,14 +246,13 @@ LavaridgeTown_EventScript_1EA73B:: @ 81EA73B LavaridgeTown_EventScript_1EA744:: @ 81EA744 lock faceplayer - checkflag FLAG_0x10A - goto_eq LavaridgeTown_EventScript_1EA787 + goto_if_set FLAG_0x10A, LavaridgeTown_EventScript_1EA787 msgbox LavaridgeTown_Text_1EAB80, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LavaridgeTown_EventScript_1EA79B + goto_if_eq LavaridgeTown_EventScript_1EA79B getpartysize compare VAR_RESULT, 6 - goto_eq LavaridgeTown_EventScript_1EA791 + goto_if_eq LavaridgeTown_EventScript_1EA791 msgbox LavaridgeTown_Text_1EACC0, MSGBOX_DEFAULT setflag FLAG_0x10A playfanfare MUS_FANFA4 diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 6a795a74c..c0c8f1093 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -14,22 +14,22 @@ LavaridgeTown_Gym_1F_EventScript_1FE705:: @ 81FE705 setvar VAR_TEMP_E, 0 setvar VAR_TEMP_F, 0 checktrainerflag TRAINER_COLE - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE72C + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE72C setvar VAR_TEMP_B, 1 LavaridgeTown_Gym_1F_EventScript_1FE72C:: @ 81FE72C checktrainerflag TRAINER_GERALD - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE73A + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE73A setvar VAR_TEMP_C, 1 LavaridgeTown_Gym_1F_EventScript_1FE73A:: @ 81FE73A checktrainerflag TRAINER_AXLE - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE748 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE748 setvar VAR_TEMP_D, 1 LavaridgeTown_Gym_1F_EventScript_1FE748:: @ 81FE748 checktrainerflag TRAINER_DANIELLE - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE756 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE756 setvar VAR_TEMP_E, 1 LavaridgeTown_Gym_1F_EventScript_1FE756:: @ 81FE756 @@ -37,22 +37,22 @@ LavaridgeTown_Gym_1F_EventScript_1FE756:: @ 81FE756 LavaridgeTown_Gym_1F_EventScript_1FE757:: @ 81FE757 checktrainerflag TRAINER_COLE - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE764 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE764 setobjectmovementtype 2, 63 LavaridgeTown_Gym_1F_EventScript_1FE764:: @ 81FE764 checktrainerflag TRAINER_GERALD - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE771 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE771 setobjectmovementtype 3, 63 LavaridgeTown_Gym_1F_EventScript_1FE771:: @ 81FE771 checktrainerflag TRAINER_AXLE - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE77E + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE77E setobjectmovementtype 4, 63 LavaridgeTown_Gym_1F_EventScript_1FE77E:: @ 81FE77E checktrainerflag TRAINER_DANIELLE - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE78B + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE78B setobjectmovementtype 5, 63 LavaridgeTown_Gym_1F_EventScript_1FE78B:: @ 81FE78B @@ -62,9 +62,8 @@ LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C trainerbattle_single TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_1FF0DC, LavaridgeTown_Gym_1F_Text_1FF233, LavaridgeTown_Gym_1F_EventScript_1FE7C1, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE864 - checkflag FLAG_0x0A8 - goto_if 0, LavaridgeTown_Gym_1F_EventScript_1FE81D + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE864 + goto_if_unset FLAG_0x0A8, LavaridgeTown_Gym_1F_EventScript_1FE81D msgbox LavaridgeTown_Gym_1F_Text_1FF546, MSGBOX_DEFAULT release end @@ -79,7 +78,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 setflag FLAG_BADGE04_GET addvar VAR_0x4085, 1 compare VAR_0x4085, 6 - call_if 1, LavaridgeTown_Gym_1F_EventScript_271E84 + call_if_eq LavaridgeTown_Gym_1F_EventScript_271E84 setvar VAR_0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_271F43 setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY @@ -99,7 +98,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D giveitem_std ITEM_TM50 compare VAR_RESULT, 0 - goto_eq LavaridgeTown_Gym_1F_EventScript_272054 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_272054 msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT setflag FLAG_0x0A8 release @@ -108,7 +107,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841 giveitem_std ITEM_TM50 compare VAR_RESULT, 0 - goto_eq LavaridgeTown_Gym_1F_EventScript_27205E + goto_if_eq LavaridgeTown_Gym_1F_EventScript_27205E msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT setflag FLAG_0x0A8 return @@ -129,7 +128,7 @@ LavaridgeTown_Gym_B1F_EventScript_1FE89A:: @ 81FE89A release special ShouldTryGetTrainerScript compare VAR_RESULT, 1 - goto_eq EventScript_GotoTrainerScript + goto_if_eq EventScript_GotoTrainerScript end LavaridgeTown_Gym_1F_EventScript_1FE8AF:: @ 81FE8AF @@ -170,8 +169,7 @@ LavaridgeTown_Gym_B1F_EventScript_1FE951:: @ 81FE951 LavaridgeTown_Gym_1F_EventScript_1FE96C:: @ 81FE96C lock faceplayer - checkflag FLAG_0x4F3 - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE981 + goto_if_set FLAG_0x4F3, LavaridgeTown_Gym_1F_EventScript_1FE981 msgbox LavaridgeTown_Gym_1F_Text_1FE9BF, MSGBOX_DEFAULT release end @@ -183,15 +181,13 @@ LavaridgeTown_Gym_1F_EventScript_1FE981:: @ 81FE981 LavaridgeTown_Gym_1F_EventScript_1FE98B:: @ 81FE98B lockall - checkflag FLAG_BADGE04_GET - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE9AB + goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_1FE9AB goto LavaridgeTown_Gym_1F_EventScript_1FE9B5 end LavaridgeTown_Gym_1F_EventScript_1FE99B:: @ 81FE99B lockall - checkflag FLAG_BADGE04_GET - goto_eq LavaridgeTown_Gym_1F_EventScript_1FE9AB + goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_1FE9AB goto LavaridgeTown_Gym_1F_EventScript_1FE9B5 end diff --git a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc index ad2be83ea..222f36810 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc @@ -13,22 +13,22 @@ LavaridgeTown_Gym_B1F_EventScript_1FF88F:: @ 81FF88F setvar VAR_TEMP_9, 0 setvar VAR_TEMP_A, 0 checktrainerflag TRAINER_KEEGAN - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8B1 + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8B1 setvar VAR_TEMP_7, 1 LavaridgeTown_Gym_B1F_EventScript_1FF8B1:: @ 81FF8B1 checktrainerflag TRAINER_JACE - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8BF + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8BF setvar VAR_TEMP_8, 1 LavaridgeTown_Gym_B1F_EventScript_1FF8BF:: @ 81FF8BF checktrainerflag TRAINER_JEFF - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8CD + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8CD setvar VAR_TEMP_9, 1 LavaridgeTown_Gym_B1F_EventScript_1FF8CD:: @ 81FF8CD checktrainerflag TRAINER_ELI - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8DB + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8DB setvar VAR_TEMP_A, 1 LavaridgeTown_Gym_B1F_EventScript_1FF8DB:: @ 81FF8DB @@ -36,22 +36,22 @@ LavaridgeTown_Gym_B1F_EventScript_1FF8DB:: @ 81FF8DB LavaridgeTown_Gym_B1F_EventScript_1FF8DC:: @ 81FF8DC checktrainerflag TRAINER_KEEGAN - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8E9 + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8E9 setobjectmovementtype 2, 63 LavaridgeTown_Gym_B1F_EventScript_1FF8E9:: @ 81FF8E9 checktrainerflag TRAINER_JACE - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF8F6 + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8F6 setobjectmovementtype 1, 63 LavaridgeTown_Gym_B1F_EventScript_1FF8F6:: @ 81FF8F6 checktrainerflag TRAINER_JEFF - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF903 + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF903 setobjectmovementtype 3, 63 LavaridgeTown_Gym_B1F_EventScript_1FF903:: @ 81FF903 checktrainerflag TRAINER_ELI - goto_eq LavaridgeTown_Gym_B1F_EventScript_1FF910 + goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF910 setobjectmovementtype 4, 63 LavaridgeTown_Gym_B1F_EventScript_1FF910:: @ 81FF910 diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc index b1d776fbd..d627d4fa7 100644 --- a/data/maps/LavaridgeTown_HerbShop/scripts.inc +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -28,12 +28,11 @@ LavaridgeTown_HerbShop_EventScript_1FE4FC:: @ 81FE4FC LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 lock faceplayer - checkflag FLAG_0x0FE - goto_eq LavaridgeTown_HerbShop_EventScript_1FE534 + goto_if_set FLAG_0x0FE, LavaridgeTown_HerbShop_EventScript_1FE534 msgbox LavaridgeTown_HerbShop_Text_1FE584, MSGBOX_DEFAULT giveitem_std ITEM_CHARCOAL compare VAR_RESULT, 0 - goto_eq LavaridgeTown_HerbShop_EventScript_272054 + goto_if_eq LavaridgeTown_HerbShop_EventScript_272054 setflag FLAG_0x0FE release end diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 83b258c7e..515754f8c 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -7,14 +7,12 @@ LilycoveCity_MapScript1_1E2B47: @ 81E2B47 setflag FLAG_VISITED_LILYCOVE_CITY setvar VAR_0x4086, 0 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, LilycoveCity_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_27207A call LilycoveCity_EventScript_271ED7 end LilycoveCity_MapScript1_1E2B61: @ 81E2B61 - checkflag FLAG_0x070 - call_if 0, LilycoveCity_EventScript_1E2B6B + call_if_unset FLAG_0x070, LilycoveCity_EventScript_1E2B6B end LilycoveCity_EventScript_1E2B6B:: @ 81E2B6B @@ -36,14 +34,13 @@ LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8 lock faceplayer dodailyevents - checkflag FLAG_0x92F - goto_eq LilycoveCity_EventScript_1E2C18 + goto_if_set FLAG_0x92F, LilycoveCity_EventScript_1E2C18 msgbox LilycoveCity_Text_2A7244, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_eq LilycoveCity_EventScript_272054 + goto_if_eq LilycoveCity_EventScript_272054 setflag FLAG_0x92F msgbox LilycoveCity_Text_2A72E3, MSGBOX_DEFAULT release @@ -61,8 +58,7 @@ LilycoveCity_EventScript_1E2C22:: @ 81E2C22 LilycoveCity_EventScript_1E2C2B:: @ 81E2C2B lock faceplayer - checkflag FLAG_BADGE07_GET - goto_eq LilycoveCity_EventScript_1E2C40 + goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_1E2C40 msgbox LilycoveCity_Text_1E3E3C, MSGBOX_DEFAULT release end @@ -79,8 +75,7 @@ LilycoveCity_EventScript_1E2C4A:: @ 81E2C4A LilycoveCity_EventScript_1E2C53:: @ 81E2C53 lock faceplayer - checkflag FLAG_0x070 - goto_eq LilycoveCity_EventScript_1E2C68 + goto_if_set FLAG_0x070, LilycoveCity_EventScript_1E2C68 msgbox LilycoveCity_Text_1E3FAB, MSGBOX_DEFAULT release end @@ -93,8 +88,7 @@ LilycoveCity_EventScript_1E2C68:: @ 81E2C68 LilycoveCity_EventScript_1E2C72:: @ 81E2C72 lock faceplayer - checkflag FLAG_0x070 - goto_eq LilycoveCity_EventScript_1E2C87 + goto_if_set FLAG_0x070, LilycoveCity_EventScript_1E2C87 msgbox LilycoveCity_Text_1E40AD, MSGBOX_DEFAULT release end @@ -119,8 +113,7 @@ LilycoveCity_EventScript_1E2CA3:: @ 81E2CA3 LilycoveCity_EventScript_1E2CAC:: @ 81E2CAC lock faceplayer - checkflag FLAG_BADGE07_GET - goto_eq LilycoveCity_EventScript_1E2CC1 + goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_1E2CC1 msgbox LilycoveCity_Text_1E42FC, MSGBOX_DEFAULT release end @@ -178,8 +171,7 @@ LilycoveCity_EventScript_1E2D3A:: @ 81E2D3A LilycoveCity_EventScript_1E2D44:: @ 81E2D44 lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_eq LilycoveCity_EventScript_1E2D58 + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_1E2D58 msgbox LilycoveCity_Text_1E45A7, MSGBOX_DEFAULT releaseall end @@ -203,8 +195,7 @@ LilycoveCity_EventScript_1E2D74:: @ 81E2D74 LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D lockall - checkflag FLAG_0x0DA - goto_eq LilycoveCity_EventScript_1E2DB0 + goto_if_set FLAG_0x0DA, LilycoveCity_EventScript_1E2DB0 msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, LilycoveCity_Movement_27259E waitmovement 0 @@ -241,19 +232,17 @@ LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE faceplayer checkplayergender compare VAR_RESULT, 0 - goto_eq LilycoveCity_EventScript_1E2DF8 + goto_if_eq LilycoveCity_EventScript_1E2DF8 compare VAR_RESULT, 1 - goto_eq LilycoveCity_EventScript_1E2E6B + goto_if_eq LilycoveCity_EventScript_1E2E6B end LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8 playbgm MUS_GIRL_SUP, 1 - checkflag FLAG_0x11E - call_if 1, LilycoveCity_EventScript_1E2E48 - checkflag FLAG_0x11E - call_if 0, LilycoveCity_EventScript_1E2E51 + call_if_set FLAG_0x11E, LilycoveCity_EventScript_1E2E48 + call_if_unset FLAG_0x11E, LilycoveCity_EventScript_1E2E51 compare VAR_RESULT, 0 - goto_eq LilycoveCity_EventScript_1E2E5A + goto_if_eq LilycoveCity_EventScript_1E2E5A msgbox LilycoveCity_Text_1E3234, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, LilycoveCity_EventScript_1E2EDE @@ -279,12 +268,10 @@ LilycoveCity_EventScript_1E2E5A:: @ 81E2E5A LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B playbgm MUS_BOY_SUP, 1 - checkflag FLAG_0x11E - call_if 1, LilycoveCity_EventScript_1E2EBB - checkflag FLAG_0x11E - call_if 0, LilycoveCity_EventScript_1E2EC4 + call_if_set FLAG_0x11E, LilycoveCity_EventScript_1E2EBB + call_if_unset FLAG_0x11E, LilycoveCity_EventScript_1E2EC4 compare VAR_RESULT, 0 - goto_eq LilycoveCity_EventScript_1E2ECD + goto_if_eq LilycoveCity_EventScript_1E2ECD msgbox LilycoveCity_Text_1E373C, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, LilycoveCity_EventScript_1E2F0E @@ -341,20 +328,18 @@ LilycoveCity_EventScript_1E2F2E:: @ 81E2F2E LilycoveCity_EventScript_1E2F3E:: @ 81E2F3E msgbox LilycoveCity_Text_1E32FB, MSGBOX_DEFAULT setvar VAR_RESULT, 0 - checkflag FLAG_BADGE06_GET - call_if 1, LilycoveCity_EventScript_1E2F76 + call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_1E2F76 compare VAR_RESULT, 0 - call_if 1, LilycoveCity_EventScript_1E2F86 + call_if_eq LilycoveCity_EventScript_1E2F86 compare VAR_RESULT, 1 - call_if 1, LilycoveCity_EventScript_1E2F8F + call_if_eq LilycoveCity_EventScript_1E2F8F clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL goto LilycoveCity_EventScript_1E3006 end LilycoveCity_EventScript_1E2F76:: @ 81E2F76 - checkflag FLAG_BADGE08_GET - goto_eq LilycoveCity_EventScript_1E2F80 + goto_if_set FLAG_BADGE08_GET, LilycoveCity_EventScript_1E2F80 return LilycoveCity_EventScript_1E2F80:: @ 81E2F80 @@ -366,8 +351,7 @@ LilycoveCity_EventScript_1E2F86:: @ 81E2F86 return LilycoveCity_EventScript_1E2F8F:: @ 81E2F8F - checkflag FLAG_SYS_GAME_CLEAR - goto_eq LilycoveCity_EventScript_1E2FA1 + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_1E2FA1 msgbox LilycoveCity_Text_1E346D, MSGBOX_DEFAULT return @@ -378,12 +362,11 @@ LilycoveCity_EventScript_1E2FA1:: @ 81E2FA1 LilycoveCity_EventScript_1E2FAA:: @ 81E2FAA msgbox LilycoveCity_Text_1E37D7, MSGBOX_DEFAULT setvar VAR_RESULT, 0 - checkflag FLAG_BADGE06_GET - call_if 1, LilycoveCity_EventScript_1E2F76 + call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_1E2F76 compare VAR_RESULT, 0 - call_if 1, LilycoveCity_EventScript_1E2FE2 + call_if_eq LilycoveCity_EventScript_1E2FE2 compare VAR_RESULT, 1 - call_if 1, LilycoveCity_EventScript_1E2FEB + call_if_eq LilycoveCity_EventScript_1E2FEB clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL goto LilycoveCity_EventScript_1E3006 @@ -394,8 +377,7 @@ LilycoveCity_EventScript_1E2FE2:: @ 81E2FE2 return LilycoveCity_EventScript_1E2FEB:: @ 81E2FEB - checkflag FLAG_SYS_GAME_CLEAR - goto_eq LilycoveCity_EventScript_1E2FFD + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_1E2FFD msgbox LilycoveCity_Text_1E390C, MSGBOX_DEFAULT return @@ -424,9 +406,9 @@ LilycoveCity_EventScript_1E302D:: @ 81E302D faceplayer msgbox LilycoveCity_Text_1E4774, MSGBOX_YESNO compare VAR_RESULT, 1 - call_if 1, LilycoveCity_EventScript_1E304F + call_if_eq LilycoveCity_EventScript_1E304F compare VAR_RESULT, 0 - call_if 1, LilycoveCity_EventScript_1E3058 + call_if_eq LilycoveCity_EventScript_1E3058 release end diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index a849925bd..c60e8fdfc 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -11,7 +11,7 @@ LilycoveCity_ContestLobby_MapScript1_21A21C: @ 821A21C LilycoveCity_ContestLobby_EventScript_21A227:: @ 821A227 getpricereduction 4 compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21A23C + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A23C clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS return @@ -27,8 +27,7 @@ LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243 .2byte 0 LilycoveCity_ContestLobby_EventScript_21A255:: @ 821A255 - checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - goto_eq LilycoveCity_ContestLobby_EventScript_21A264 + goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_21A264 setvar VAR_0x4099, 0 end @@ -37,7 +36,7 @@ LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264 addobject 4 applymovement 4, LilycoveCity_ContestLobby_Movement_21A407 waitmovement 4 - applymovement 255, LilycoveCity_ContestLobby_Movement_21A418 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21A418 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_21ADB9, MSGBOX_DEFAULT lockall @@ -46,9 +45,9 @@ LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264 lockall msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21A2AA + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A2AA compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_21A2E4 + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A2E4 releaseall end @@ -59,7 +58,7 @@ LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA setvar VAR_0x4099, 0 specialvar VAR_RESULT, GiveMonArtistRibbon compare VAR_RESULT, 1 - call_if 1, LilycoveCity_ContestLobby_EventScript_21A314 + call_if_eq LilycoveCity_ContestLobby_EventScript_21A314 applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F waitmovement 0 removeobject 4 @@ -71,7 +70,7 @@ LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA LilycoveCity_ContestLobby_EventScript_21A2E4:: @ 821A2E4 msgbox LilycoveCity_ContestLobby_Text_21B0BC, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21A2AA + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A2AA msgbox LilycoveCity_ContestLobby_Text_21B132, MSGBOX_DEFAULT closemessage applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F @@ -202,8 +201,7 @@ LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E step_end LilycoveCity_ContestLobby_EventScript_21A427:: @ 821A427 - checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - goto_eq LilycoveCity_ContestLobby_EventScript_21A436 + goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_21A436 setvar VAR_0x4099, 0 end @@ -212,7 +210,7 @@ LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436 addobject 11 applymovement 11, LilycoveCity_ContestLobby_Movement_21A533 waitmovement 11 - applymovement 255, LilycoveCity_ContestLobby_Movement_21A545 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21A545 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_21ADB9, MSGBOX_DEFAULT lockall @@ -220,9 +218,9 @@ LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436 drawcontestwinner 0 msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21A47A + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A47A compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_21A4B4 + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A4B4 end LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A @@ -232,7 +230,7 @@ LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A setvar VAR_0x4099, 0 specialvar VAR_RESULT, GiveMonArtistRibbon compare VAR_RESULT, 1 - call_if 1, LilycoveCity_ContestLobby_EventScript_21A4E4 + call_if_eq LilycoveCity_ContestLobby_EventScript_21A4E4 applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C waitmovement 0 removeobject 11 @@ -244,7 +242,7 @@ LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A LilycoveCity_ContestLobby_EventScript_21A4B4:: @ 821A4B4 msgbox LilycoveCity_ContestLobby_Text_21B0BC, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21A47A + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A47A msgbox LilycoveCity_ContestLobby_Text_21B132, MSGBOX_DEFAULT closemessage applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C @@ -321,7 +319,7 @@ LilycoveCity_ContestLobby_EventScript_21A554:: @ 821A554 special sub_80F9154 specialvar VAR_RESULT, sub_80F8D24 compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21A5CF + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A5CF call LilycoveCity_ContestLobby_EventScript_279CC5 call LilycoveCity_ContestLobby_EventScript_21A670 special SetContestTrainerGfxIds @@ -422,12 +420,12 @@ LilycoveCity_ContestLobby_EventScript_21A670:: @ 821A670 delay 20 applymovement 1, LilycoveCity_ContestLobby_Movement_21A706 waitmovement 0 - applymovement 255, LilycoveCity_ContestLobby_Movement_21A6F2 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21A6F2 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_27B653, MSGBOX_DEFAULT closemessage applymovement 1, LilycoveCity_ContestLobby_Movement_21A6FD - applymovement 255, LilycoveCity_ContestLobby_Movement_21A6E8 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21A6E8 waitmovement 0 releaseall return @@ -643,10 +641,10 @@ LilycoveCity_ContestLobby_EventScript_21A819:: @ 821A819 LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856 msgbox LilycoveCity_ContestLobby_Text_27BD17, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_21A97F + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F call LilycoveCity_ContestLobby_EventScript_27134F compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_21A97F + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F message LilycoveCity_ContestLobby_Text_27C8FD waitmessage specialvar VAR_TEMP_D, IsWirelessAdapterConnected @@ -666,7 +664,7 @@ LilycoveCity_ContestLobby_EventScript_21A8BB:: @ 821A8BB LilycoveCity_ContestLobby_EventScript_21A8C6:: @ 821A8C6 setvar VAR_TEMP_C, 1 compare VAR_TEMP_D, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21AAFC + goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAFC goto LilycoveCity_ContestLobby_EventScript_21A8DC end @@ -719,18 +717,18 @@ LilycoveCity_ContestLobby_EventScript_21A98C:: @ 821A98C setvar VAR_CONTEST_RANK, 0 choosecontestmon compare VAR_0x8004, 255 - goto_eq LilycoveCity_ContestLobby_EventScript_21A97F + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F special sub_80F7F30 compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_21A9E0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A9E0 compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21AA0A + goto_if_eq LilycoveCity_ContestLobby_EventScript_21AA0A compare VAR_RESULT, 2 - goto_eq LilycoveCity_ContestLobby_EventScript_21AA0A + goto_if_eq LilycoveCity_ContestLobby_EventScript_21AA0A compare VAR_RESULT, 3 - goto_eq LilycoveCity_ContestLobby_EventScript_21A9EE + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A9EE compare VAR_RESULT, 4 - goto_eq LilycoveCity_ContestLobby_EventScript_21A9FC + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A9FC end LilycoveCity_ContestLobby_EventScript_21A9E0:: @ 821A9E0 @@ -755,28 +753,28 @@ LilycoveCity_ContestLobby_EventScript_21AA0A:: @ 821AA0A LilycoveCity_ContestLobby_EventScript_21AA15:: @ 821AA15 compare VAR_TEMP_D, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21AB4B + goto_if_eq LilycoveCity_ContestLobby_EventScript_21AB4B compare VAR_TEMP_D, 2 - goto_if 4, LilycoveCity_ContestLobby_EventScript_21A97F + goto_if_ge LilycoveCity_ContestLobby_EventScript_21A97F message LilycoveCity_ContestLobby_Text_27BF85 waitmessage copyvar VAR_0x8004, VAR_RESULT compare VAR_TEMP_C, 0 - call_if 1, LilycoveCity_ContestLobby_EventScript_21AABB + call_if_eq LilycoveCity_ContestLobby_EventScript_21AABB compare VAR_TEMP_C, 1 - call_if 1, LilycoveCity_ContestLobby_EventScript_21AAC0 + call_if_eq LilycoveCity_ContestLobby_EventScript_21AAC0 compare VAR_TEMP_C, 2 - goto_if 4, LilycoveCity_ContestLobby_EventScript_21A97F + goto_if_ge LilycoveCity_ContestLobby_EventScript_21A97F compare VAR_RESULT, 4 - goto_eq LilycoveCity_ContestLobby_EventScript_21AAD3 + goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAD3 compare VAR_RESULT, 3 - goto_eq LilycoveCity_ContestLobby_EventScript_21AAD3 + goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAD3 compare VAR_RESULT, 5 - goto_eq LilycoveCity_ContestLobby_EventScript_21A97F + goto_if_eq LilycoveCity_ContestLobby_EventScript_21A97F compare VAR_RESULT, 6 - goto_eq LilycoveCity_ContestLobby_EventScript_21AAEF + goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAEF compare VAR_RESULT, 10 - goto_eq LilycoveCity_ContestLobby_EventScript_21AAE1 + goto_if_eq LilycoveCity_ContestLobby_EventScript_21AAE1 message3 LilycoveCity_ContestLobby_Text_27BEEC contestlinktransfer switch VAR_0x8004 @@ -844,15 +842,15 @@ LilycoveCity_ContestLobby_EventScript_21AB17:: @ 821AB17 LilycoveCity_ContestLobby_EventScript_21AB4B:: @ 821AB4B compare VAR_CONTEST_CATEGORY, 0 - call_if 1, LilycoveCity_ContestLobby_EventScript_21AB88 + call_if_eq LilycoveCity_ContestLobby_EventScript_21AB88 compare VAR_CONTEST_CATEGORY, 1 - call_if 1, LilycoveCity_ContestLobby_EventScript_21AB8E + call_if_eq LilycoveCity_ContestLobby_EventScript_21AB8E compare VAR_CONTEST_CATEGORY, 2 - call_if 1, LilycoveCity_ContestLobby_EventScript_21AB94 + call_if_eq LilycoveCity_ContestLobby_EventScript_21AB94 compare VAR_CONTEST_CATEGORY, 3 - call_if 1, LilycoveCity_ContestLobby_EventScript_21AB9A + call_if_eq LilycoveCity_ContestLobby_EventScript_21AB9A compare VAR_CONTEST_CATEGORY, 4 - call_if 1, LilycoveCity_ContestLobby_EventScript_21ABA0 + call_if_eq LilycoveCity_ContestLobby_EventScript_21ABA0 goto LilycoveCity_ContestLobby_EventScript_21ABA6 end @@ -890,22 +888,22 @@ LilycoveCity_ContestLobby_EventScript_21ABA6:: @ 821ABA6 LilycoveCity_ContestLobby_EventScript_21ABE3:: @ 821ABE3 call LilycoveCity_ContestLobby_EventScript_21AC33 compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21AC3D + goto_if_eq LilycoveCity_ContestLobby_EventScript_21AC3D compare VAR_RESULT, 5 - goto_eq LilycoveCity_ContestLobby_EventScript_21ABA6 + goto_if_eq LilycoveCity_ContestLobby_EventScript_21ABA6 compare VAR_RESULT, 8 - goto_eq LilycoveCity_ContestLobby_EventScript_21ABE3 + goto_if_eq LilycoveCity_ContestLobby_EventScript_21ABE3 release end LilycoveCity_ContestLobby_EventScript_21AC0B:: @ 821AC0B call LilycoveCity_ContestLobby_EventScript_21AC38 compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_21AC3D + goto_if_eq LilycoveCity_ContestLobby_EventScript_21AC3D compare VAR_RESULT, 5 - goto_eq LilycoveCity_ContestLobby_EventScript_21ABA6 + goto_if_eq LilycoveCity_ContestLobby_EventScript_21ABA6 compare VAR_RESULT, 8 - goto_eq LilycoveCity_ContestLobby_EventScript_21AC0B + goto_if_eq LilycoveCity_ContestLobby_EventScript_21AC0B release end @@ -945,7 +943,7 @@ LilycoveCity_ContestLobby_EventScript_21AC49:: @ 821AC49 delay 20 applymovement 2, LilycoveCity_ContestLobby_Movement_21ACEF waitmovement 0 - applymovement 255, LilycoveCity_ContestLobby_Movement_21ACDB + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21ACDB waitmovement 0 messageautoscroll LilycoveCity_ContestLobby_Text_27B653 waitmessage @@ -953,7 +951,7 @@ LilycoveCity_ContestLobby_EventScript_21AC49:: @ 821AC49 closemessage call LilycoveCity_ContestLobby_EventScript_27AD92 applymovement 2, LilycoveCity_ContestLobby_Movement_21ACE5 - applymovement 255, LilycoveCity_ContestLobby_Movement_21ACD0 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_21ACD0 waitmovement 0 release return @@ -1006,8 +1004,7 @@ LilycoveCity_ContestLobby_Movement_21ACEF: @ 821ACEF LilycoveCity_ContestLobby_EventScript_21ACF1:: @ 821ACF1 lock faceplayer - checkflag FLAG_0x05F - goto_eq LilycoveCity_ContestLobby_EventScript_21AD06 + goto_if_set FLAG_0x05F, LilycoveCity_ContestLobby_EventScript_21AD06 msgbox LilycoveCity_ContestLobby_Text_21AD10, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index 18ef70cfd..7ccc8b82f 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -3,10 +3,8 @@ LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 8218188 LilycoveCity_CoveLilyMotel_1F_EventScript_218189:: @ 8218189 lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_eq LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA - checkflag FLAG_BADGE07_GET - goto_eq LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3 + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA + goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3 msgbox LilycoveCity_CoveLilyMotel_1F_Text_218264, MSGBOX_DEFAULT applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E waitmovement 0 @@ -46,11 +44,11 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211 waitmovement 0 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259A waitmovement 0 - applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_2725AA waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, MSGBOX_DEFAULT closemessage - applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_218259 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_218259 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_21825E waitmovement 0 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_218260 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index 33f67ff9a..2290b7df5 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -4,13 +4,11 @@ LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 82186D2 LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3:: @ 82186D3 lock faceplayer - checkflag FLAG_TEMP_2 - call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9 - checkflag FLAG_TEMP_2 - call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_21870F + call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9 + call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_21870F specialvar VAR_RESULT, sub_80C08E4 compare VAR_RESULT, 1 - goto_eq LilycoveCity_CoveLilyMotel_2F_EventScript_218702 + goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_218702 release end @@ -57,8 +55,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_218744:: @ 8218744 LilycoveCity_CoveLilyMotel_2F_EventScript_21874D:: @ 821874D lock faceplayer - checkflag FLAG_0x1CE - goto_eq LilycoveCity_CoveLilyMotel_2F_EventScript_21876A + goto_if_set FLAG_0x1CE, LilycoveCity_CoveLilyMotel_2F_EventScript_21876A msgbox LilycoveCity_CoveLilyMotel_2F_Text_218ACF, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 setflag FLAG_0x1CE diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc index bcc3649e2..80a93df47 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc @@ -5,8 +5,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220624:: @ 8220624 lock faceplayer setvar VAR_0x8004, 0 - checkflag FLAG_TEMP_2 - call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC + call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_2207FC copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR special sub_8139B60 message gUnknown_08272C1D @@ -61,7 +60,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718 setvar VAR_0x8006, 4 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 4 - goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 setvar VAR_DEPT_STORE_FLOOR, 4 goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 @@ -71,7 +70,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740 setvar VAR_0x8006, 5 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 5 - goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 setvar VAR_DEPT_STORE_FLOOR, 5 goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 @@ -81,7 +80,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768 setvar VAR_0x8006, 6 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 6 - goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 setvar VAR_DEPT_STORE_FLOOR, 6 goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 @@ -91,7 +90,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790 setvar VAR_0x8006, 7 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 7 - goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 setvar VAR_DEPT_STORE_FLOOR, 7 goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 @@ -101,7 +100,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207B8:: @ 82207B8 setvar VAR_0x8006, 8 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1 compare VAR_DEPT_STORE_FLOOR, 8 - goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 setvar VAR_DEPT_STORE_FLOOR, 8 goto LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index dbb552409..d5379f96a 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -5,9 +5,9 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207 LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D: @ 822020D getpricereduction 3 compare VAR_RESULT, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220227 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220227 compare VAR_RESULT, 0 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22022B + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_22022B end LilycoveCity_DepartmentStoreRooftop_EventScript_220227:: @ 8220227 @@ -53,7 +53,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220268:: @ 8220268 faceplayer getpricereduction 3 compare VAR_RESULT, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220282 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220282 msgbox LilycoveCity_DepartmentStoreRooftop_Text_220463, MSGBOX_DEFAULT release end @@ -127,22 +127,22 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220328:: @ 8220328 LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F compare VAR_TEMP_1, 0 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220305 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220305 compare VAR_TEMP_1, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22030C + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_22030C compare VAR_TEMP_1, 2 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220313 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220313 compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220442 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220442 checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 compare VAR_TEMP_1, 0 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22031A + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_22031A compare VAR_TEMP_1, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220321 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220321 compare VAR_TEMP_1, 2 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220328 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220328 updatemoneybox 0, 0 nop bufferitemname 0, VAR_TEMP_0 @@ -154,10 +154,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F msgbox gUnknown_08272A9A, MSGBOX_DEFAULT random 64 compare VAR_RESULT, 0 - goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_220436 + goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_220436 checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, MSGBOX_DEFAULT giveitem VAR_TEMP_0, 1 @@ -166,10 +166,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F msgbox gUnknown_08272A9A, MSGBOX_DEFAULT random 64 compare VAR_RESULT, 0 - goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_220436 + goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_220436 checkitemspace VAR_TEMP_0, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, MSGBOX_DEFAULT giveitem VAR_TEMP_0, 1 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index fece7f16e..d2d5f60d6 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -10,12 +10,11 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C faceplayer dodailyevents compare VAR_POKELOT_PRIZE, 0 - goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_21F7F7 - checkflag FLAG_0x92A - goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F78D + goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_21F7F7 + goto_if_set FLAG_0x92A, LilycoveCity_DepartmentStore_1F_EventScript_21F78D msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F797 + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F797 setflag FLAG_0x92A message LilycoveCity_DepartmentStore_1F_Text_2A64C8 waitmessage @@ -34,24 +33,24 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_27259E waitmovement 0 compare VAR_0x8004, 0 - goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1 + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1 incrementgamestat 46 compare VAR_0x8006, 0 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F77B + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F77B compare VAR_0x8006, 1 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F784 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F784 bufferitemname 0, VAR_0x8005 compare VAR_0x8004, 1 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7B9 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7B9 compare VAR_0x8004, 2 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7C2 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7C2 compare VAR_0x8004, 3 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7CB + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7CB compare VAR_0x8004, 4 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7D4 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7D4 giveitem_std VAR_0x8005 compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7DD + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7DD special sub_80EE2CC goto LilycoveCity_DepartmentStore_1F_EventScript_21F7AF end @@ -115,7 +114,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F7F7:: @ 821F7F7 msgbox LilycoveCity_DepartmentStore_1F_Text_2A67E1, MSGBOX_DEFAULT giveitem_std VAR_POKELOT_PRIZE compare VAR_RESULT, 0 - goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7ED + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7ED copyvar VAR_0x8004, VAR_0x404D copyvar VAR_0x8005, VAR_POKELOT_PRIZE special sub_80EE2CC diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index 9f55dbc04..b278d3e14 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -126,9 +126,9 @@ LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075 applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_27259E waitmovement 0 compare VAR_0x405E, 0 - goto_eq LilycoveCity_DepartmentStore_5F_EventScript_22009C + goto_if_eq LilycoveCity_DepartmentStore_5F_EventScript_22009C compare VAR_0x405E, 4 - goto_if 4, LilycoveCity_DepartmentStore_5F_EventScript_22009C + goto_if_ge LilycoveCity_DepartmentStore_5F_EventScript_22009C goto LilycoveCity_DepartmentStore_5F_EventScript_2200A7 end diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 67ef01e09..62bcc15dd 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -9,8 +9,7 @@ LilycoveCity_Harbor_MapScript1_21E006: @ 821E006 LilycoveCity_Harbor_EventScript_21E00F:: @ 821E00F lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, LilycoveCity_Harbor_EventScript_21E54D + goto_if_unset FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_21E54D call LilycoveCity_Harbor_EventScript_21E194 call LilycoveCity_Harbor_EventScript_21E1C6 call LilycoveCity_Harbor_EventScript_21E1F8 @@ -18,23 +17,23 @@ LilycoveCity_Harbor_EventScript_21E00F:: @ 821E00F call LilycoveCity_Harbor_EventScript_21E25C call LilycoveCity_Harbor_EventScript_21E2A6 compare VAR_TEMP_C, 2 - goto_eq LilycoveCity_Harbor_EventScript_21E350 + goto_if_eq LilycoveCity_Harbor_EventScript_21E350 compare VAR_TEMP_B, 1 - goto_eq LilycoveCity_Harbor_EventScript_21E2F0 + goto_if_eq LilycoveCity_Harbor_EventScript_21E2F0 compare VAR_TEMP_B, 2 - goto_eq LilycoveCity_Harbor_EventScript_21E320 + goto_if_eq LilycoveCity_Harbor_EventScript_21E320 compare VAR_TEMP_B, 4 - goto_eq LilycoveCity_Harbor_EventScript_21E350 + goto_if_eq LilycoveCity_Harbor_EventScript_21E350 compare VAR_TEMP_B, 8 - goto_eq LilycoveCity_Harbor_EventScript_21E41D + goto_if_eq LilycoveCity_Harbor_EventScript_21E41D compare VAR_TEMP_B, 0 - goto_if 5, LilycoveCity_Harbor_EventScript_21E44D + goto_if_ne LilycoveCity_Harbor_EventScript_21E44D goto LilycoveCity_Harbor_EventScript_21E080 end LilycoveCity_Harbor_EventScript_21E080:: @ 821E080 compare VAR_TEMP_A, 0 - goto_eq LilycoveCity_Harbor_EventScript_21E557 + goto_if_eq LilycoveCity_Harbor_EventScript_21E557 msgbox LilycoveCity_Harbor_Text_21E758, MSGBOX_DEFAULT message LilycoveCity_Harbor_Text_21E7ED waitmessage @@ -88,7 +87,7 @@ LilycoveCity_Harbor_EventScript_21E139:: @ 821E139 LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 msgbox LilycoveCity_Harbor_Text_21E864, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_21E5C0 + goto_if_eq LilycoveCity_Harbor_EventScript_21E5C0 setvar VAR_PORTHOLE_STATE, 5 call LilycoveCity_Harbor_EventScript_21E5CC warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 @@ -99,7 +98,7 @@ LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 LilycoveCity_Harbor_EventScript_21E171:: @ 821E171 msgbox LilycoveCity_Harbor_Text_21E880, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_21E5C0 + goto_if_eq LilycoveCity_Harbor_EventScript_21E5C0 call LilycoveCity_Harbor_EventScript_21E5CC warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 waitstate @@ -108,66 +107,58 @@ LilycoveCity_Harbor_EventScript_21E171:: @ 821E171 LilycoveCity_Harbor_EventScript_21E194:: @ 821E194 setvar VAR_TEMP_E, 0 - checkflag FLAG_SYS_HAS_EON_TICKET - goto_if 0, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_EON_TICKET, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_E, 1 - checkflag FLAG_0x1AE - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_0x1AE, LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_E, 2 return LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6 setvar VAR_TEMP_D, 0 - checkflag FLAG_0x8D5 - goto_if 0, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_0x8D5, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_AURORA_TICKET, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_D, 1 - checkflag FLAG_0x1AF - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_0x1AF, LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_D, 2 return LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8 setvar VAR_TEMP_C, 0 - checkflag FLAG_0x8D6 - goto_if 0, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_0x8D6, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_OLD_SEA_MAP, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_C, 1 - checkflag FLAG_0x1B0 - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_0x1B0, LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_C, 2 return LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A setvar VAR_TEMP_9, 0 - checkflag FLAG_0x8E0 - goto_if 0, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_0x8E0, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_MYSTIC_TICKET, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_9, 1 - checkflag FLAG_0x1DB - goto_eq LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_0x1DB, LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_9, 2 return LilycoveCity_Harbor_EventScript_21E25C:: @ 821E25C setvar VAR_TEMP_B, 0 compare VAR_TEMP_E, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E28E + call_if_eq LilycoveCity_Harbor_EventScript_21E28E compare VAR_TEMP_D, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E294 + call_if_eq LilycoveCity_Harbor_EventScript_21E294 compare VAR_TEMP_C, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E29A + call_if_eq LilycoveCity_Harbor_EventScript_21E29A compare VAR_TEMP_9, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E2A0 + call_if_eq LilycoveCity_Harbor_EventScript_21E2A0 return LilycoveCity_Harbor_EventScript_21E28E:: @ 821E28E @@ -189,13 +180,13 @@ LilycoveCity_Harbor_EventScript_21E2A0:: @ 821E2A0 LilycoveCity_Harbor_EventScript_21E2A6:: @ 821E2A6 setvar VAR_TEMP_A, 0 compare VAR_TEMP_E, 1 - call_if 1, LilycoveCity_Harbor_EventScript_21E2D8 + call_if_eq LilycoveCity_Harbor_EventScript_21E2D8 compare VAR_TEMP_D, 1 - call_if 1, LilycoveCity_Harbor_EventScript_21E2DE + call_if_eq LilycoveCity_Harbor_EventScript_21E2DE compare VAR_TEMP_C, 1 - call_if 1, LilycoveCity_Harbor_EventScript_21E2E4 + call_if_eq LilycoveCity_Harbor_EventScript_21E2E4 compare VAR_TEMP_9, 1 - call_if 1, LilycoveCity_Harbor_EventScript_21E2EA + call_if_eq LilycoveCity_Harbor_EventScript_21E2EA return LilycoveCity_Harbor_EventScript_21E2D8:: @ 821E2D8 @@ -263,25 +254,25 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 applymovement 4, LilycoveCity_Harbor_Movement_27259A waitmovement 0 compare VAR_FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E656 + call_if_eq LilycoveCity_Harbor_EventScript_21E656 compare VAR_FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_21E661 + call_if_eq LilycoveCity_Harbor_EventScript_21E661 addobject 5 compare VAR_FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E675 + call_if_eq LilycoveCity_Harbor_EventScript_21E675 compare VAR_FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_21E680 + call_if_eq LilycoveCity_Harbor_EventScript_21E680 msgbox LilycoveCity_Harbor_Text_2C6951, MSGBOX_DEFAULT compare VAR_FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E68B + call_if_eq LilycoveCity_Harbor_EventScript_21E68B compare VAR_FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_21E696 + call_if_eq LilycoveCity_Harbor_EventScript_21E696 msgbox LilycoveCity_Harbor_Text_2C69AA, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E6A1 + call_if_eq LilycoveCity_Harbor_EventScript_21E6A1 compare VAR_FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_21E6BA + call_if_eq LilycoveCity_Harbor_EventScript_21E6BA setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_2721E2 warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38 @@ -368,11 +359,11 @@ LilycoveCity_Harbor_EventScript_21E514:: @ 821E514 delay 30 removeobject 4 compare VAR_FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E61B + call_if_eq LilycoveCity_Harbor_EventScript_21E61B compare VAR_FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_21E610 + call_if_eq LilycoveCity_Harbor_EventScript_21E610 delay 30 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_2721E2 return @@ -397,7 +388,7 @@ LilycoveCity_Harbor_EventScript_21E56B:: @ 821E56B LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 msgbox LilycoveCity_Harbor_Text_21E864, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_21E5C0 + goto_if_eq LilycoveCity_Harbor_EventScript_21E5C0 setvar VAR_PORTHOLE_STATE, 5 call LilycoveCity_Harbor_EventScript_21E5CC warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 @@ -408,7 +399,7 @@ LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 LilycoveCity_Harbor_EventScript_21E59D:: @ 821E59D msgbox LilycoveCity_Harbor_Text_21E880, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_Harbor_EventScript_21E5C0 + goto_if_eq LilycoveCity_Harbor_EventScript_21E5C0 call LilycoveCity_Harbor_EventScript_21E5CC warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 waitstate @@ -429,22 +420,22 @@ LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR compare VAR_FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_21E61B + call_if_eq LilycoveCity_Harbor_EventScript_21E61B compare VAR_FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_21E610 + call_if_eq LilycoveCity_Harbor_EventScript_21E610 delay 30 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_2721E2 return LilycoveCity_Harbor_EventScript_21E610:: @ 821E610 - applymovement 255, LilycoveCity_Harbor_Movement_21E630 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_21E630 waitmovement 0 return LilycoveCity_Harbor_EventScript_21E61B:: @ 821E61B - applymovement 255, LilycoveCity_Harbor_Movement_21E633 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_21E633 waitmovement 0 return @@ -469,8 +460,7 @@ LilycoveCity_Harbor_Movement_21E635: @ 821E635 LilycoveCity_Harbor_EventScript_21E637:: @ 821E637 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq LilycoveCity_Harbor_EventScript_21E64C + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_21E64C msgbox LilycoveCity_Harbor_Text_21E8EE, MSGBOX_DEFAULT release end @@ -525,14 +515,14 @@ LilycoveCity_Harbor_EventScript_21E696:: @ 821E696 LilycoveCity_Harbor_EventScript_21E6A1:: @ 821E6A1 applymovement 5, LilycoveCity_Harbor_Movement_21E6D3 - applymovement 255, LilycoveCity_Harbor_Movement_21E6D7 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_21E6D7 applymovement 4, LilycoveCity_Harbor_Movement_21E6DC waitmovement 0 return LilycoveCity_Harbor_EventScript_21E6BA:: @ 821E6BA applymovement 5, LilycoveCity_Harbor_Movement_21E6D3 - applymovement 255, LilycoveCity_Harbor_Movement_21E6E4 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_21E6E4 applymovement 4, LilycoveCity_Harbor_Movement_21E6EA waitmovement 0 return diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc index 6069f0fa7..dc526f00b 100644 --- a/data/maps/LilycoveCity_House2/scripts.inc +++ b/data/maps/LilycoveCity_House2/scripts.inc @@ -4,12 +4,11 @@ LilycoveCity_House2_MapScripts:: @ 821ED74 LilycoveCity_House2_EventScript_21ED75:: @ 821ED75 lock faceplayer - checkflag FLAG_0x0EA - goto_eq LilycoveCity_House2_EventScript_21EDAC + goto_if_set FLAG_0x0EA, LilycoveCity_House2_EventScript_21EDAC msgbox LilycoveCity_House2_Text_21EDB6, MSGBOX_DEFAULT giveitem_std ITEM_TM44 compare VAR_RESULT, 0 - goto_eq LilycoveCity_House2_EventScript_272054 + goto_if_eq LilycoveCity_House2_EventScript_272054 setflag FLAG_0x0EA msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT release diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index 8c3f4f7ab..644c50113 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -12,7 +12,7 @@ LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B faceplayer msgbox LilycoveCity_House3_Text_21EF99, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_House3_EventScript_21EE75 + goto_if_eq LilycoveCity_House3_EventScript_21EE75 msgbox LilycoveCity_House3_Text_21F0F8, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index f56102a99..89ac90dc6 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -12,9 +12,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2 waitmessage multichoice 20, 8, 16, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5 + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5 compare VAR_RESULT, 1 - goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC end LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC:: @ 8218CEC @@ -24,9 +24,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC:: @ 8218CEC LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5:: @ 8218CF5 msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F98, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D14 + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D14 compare VAR_RESULT, 1 - goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E end LilycoveCity_LilycoveMuseum_1F_EventScript_218D14:: @ 8218D14 @@ -47,7 +47,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E:: @ 8218D1E LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A:: @ 8218D5A lockall - applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218DA1 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_218DA1 waitmovement 0 warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate @@ -55,7 +55,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A:: @ 8218D5A LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F:: @ 8218D6F lockall - applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218D9B + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_218D9B waitmovement 0 warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate @@ -63,7 +63,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F:: @ 8218D6F LilycoveCity_LilycoveMuseum_1F_EventScript_218D84:: @ 8218D84 lockall - applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_218D9E + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_218D9E waitmovement 0 warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 5f2b64aec..325ad0340 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -4,32 +4,27 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 821973A .byte 0 LilycoveCity_LilycoveMuseum_2F_MapScript1_219745: @ 8219745 - checkflag FLAG_0x0A0 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_21978B + goto_if_set FLAG_0x0A0, LilycoveCity_LilycoveMuseum_2F_EventScript_21978B goto LilycoveCity_LilycoveMuseum_2F_EventScript_219754 end LilycoveCity_LilycoveMuseum_2F_EventScript_219754:: @ 8219754 - checkflag FLAG_0x0A1 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3 + goto_if_set FLAG_0x0A1, LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3 goto LilycoveCity_LilycoveMuseum_2F_EventScript_219763 end LilycoveCity_LilycoveMuseum_2F_EventScript_219763:: @ 8219763 - checkflag FLAG_0x0A2 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB + goto_if_set FLAG_0x0A2, LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB goto LilycoveCity_LilycoveMuseum_2F_EventScript_219772 end LilycoveCity_LilycoveMuseum_2F_EventScript_219772:: @ 8219772 - checkflag FLAG_0x0A3 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3 + goto_if_set FLAG_0x0A3, LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3 goto LilycoveCity_LilycoveMuseum_2F_EventScript_219781 end LilycoveCity_LilycoveMuseum_2F_EventScript_219781:: @ 8219781 - checkflag FLAG_0x0A4 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB + goto_if_set FLAG_0x0A4, LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB end LilycoveCity_LilycoveMuseum_2F_EventScript_21978B:: @ 821978B @@ -68,17 +63,17 @@ LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE: @ 82197FE LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 lockall applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E - applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219861 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_2199EB, MSGBOX_SIGN applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863 waitmovement 0 - applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219863 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219863 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_219A0D, MSGBOX_SIGN applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E waitmovement 0 - applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219861 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_219861 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_219BC4, MSGBOX_SIGN copyvar VAR_0x4094, 0x1 @@ -96,8 +91,7 @@ LilycoveCity_LilycoveMuseum_2F_Movement_219863: @ 8219863 LilycoveCity_LilycoveMuseum_2F_EventScript_219866:: @ 8219866 lockall - checkflag FLAG_0x0EC - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219921 + goto_if_set FLAG_0x0EC, LilycoveCity_LilycoveMuseum_2F_EventScript_219921 specialvar VAR_0x8004, sub_80F8940 switch VAR_0x8004 case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA @@ -126,7 +120,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, MSGBOX_DEFAULT givedecoration_std 44 compare VAR_RESULT, 0 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219911 + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219911 setflag FLAG_0x0EC closemessage releaseall @@ -146,36 +140,31 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219921:: @ 8219921 LilycoveCity_LilycoveMuseum_2F_EventScript_21992B:: @ 821992B lockall - checkflag FLAG_0x0A2 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1 + goto_if_set FLAG_0x0A2, LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1 msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FA0, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_21993E:: @ 821993E lockall - checkflag FLAG_0x0A4 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD + goto_if_set FLAG_0x0A4, LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FD3, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_219951:: @ 8219951 lockall - checkflag FLAG_0x0A0 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5 + goto_if_set FLAG_0x0A0, LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5 msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A03B, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_219964:: @ 8219964 lockall - checkflag FLAG_0x0A1 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3 + goto_if_set FLAG_0x0A1, LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3 msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A008, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_219977:: @ 8219977 lockall - checkflag FLAG_0x0A3 - goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF + goto_if_set FLAG_0x0A3, LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A06D, MSGBOX_SIGN end diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index 160dab557..c5c2188e5 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -17,19 +17,19 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EA3B:: @ 821EA3B special sub_81B94B0 waitstate compare VAR_0x8004, 255 - goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 special sub_81B98DC compare VAR_RESULT, 1 - goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EADC + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EADC special sub_81B96D0 compare VAR_RESULT, 1 - goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EACF + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EACF msgbox LilycoveCity_MoveDeletersHouse_Text_21EB89, MSGBOX_DEFAULT fadescreen 1 special sub_81B968C fadescreen 0 compare VAR_0x8005, 4 - goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EA3B + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EA3B special sub_81B9718 msgbox LilycoveCity_MoveDeletersHouse_Text_21EBDA, MSGBOX_YESNO switch VAR_RESULT @@ -41,7 +41,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EA3B:: @ 821EA3B LilycoveCity_MoveDeletersHouse_EventScript_21EAB0:: @ 821EAB0 special sub_81B9918 compare VAR_RESULT, 1 - goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAF0 + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAF0 special sub_81B9770 playfanfare MUS_ME_WASURE waitfanfare diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index 5e51f7daa..dd0dff376 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -11,9 +11,9 @@ LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD: @ 821C5BD LilycoveCity_PokemonCenter_1F_EventScript_21C5C6:: @ 821C5C6 special sub_818D9C0 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E0 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E0 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E4 + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E4 end LilycoveCity_PokemonCenter_1F_EventScript_21C5E0:: @ 821C5E0 @@ -39,8 +39,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_21C5F6:: @ 821C5F6 LilycoveCity_PokemonCenter_1F_EventScript_21C5FF:: @ 821C5FF lock faceplayer - checkflag FLAG_BADGE07_GET - goto_eq LilycoveCity_PokemonCenter_1F_EventScript_21C614 + goto_if_set FLAG_BADGE07_GET, LilycoveCity_PokemonCenter_1F_EventScript_21C614 msgbox LilycoveCity_PokemonCenter_1F_Text_21C69D, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index d4c0f4cea..cf4be3065 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -15,12 +15,12 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5 waitmovement 0 - applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_PokemonTrainerFanClub_Movement_2725A8 waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804 waitmovement 0 - applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_PokemonTrainerFanClub_Movement_2725A4 waitmovement 0 applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807 waitmovement 0 @@ -63,9 +63,9 @@ LilycoveCity_PokemonTrainerFanClub_Movement_21C807: @ 821C807 LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D: @ 821C80D call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA compare VAR_LILYCOVE_FAN_CLUB_STATE, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8 compare VAR_LILYCOVE_FAN_CLUB_STATE, 2 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C829 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C829 end LilycoveCity_PokemonTrainerFanClub_EventScript_21C829:: @ 821C829 @@ -74,41 +74,41 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C829:: @ 821C829 setvar VAR_0x8004, 8 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8 setvar VAR_0x8004, 9 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0 setvar VAR_0x8004, 10 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8 setvar VAR_0x8004, 11 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0 setvar VAR_0x8004, 12 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8 setvar VAR_0x8004, 13 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0 setvar VAR_0x8004, 14 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8 setvar VAR_0x8004, 15 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0 end LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA:: @ 821C8DA specialvar VAR_RESULT, sub_80EE7C0 compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1 clearflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER clearflag FLAG_0x0D2 return @@ -122,37 +122,37 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5 setvar VAR_0x8004, 8 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 9 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 10 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 11 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 12 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 13 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 14 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 15 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE compare VAR_0x8005, 5 - goto_if 4, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B4 + goto_if_ge LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B4 return LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE:: @ 821C9AE @@ -210,13 +210,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17 setvar VAR_0x8004, 13 special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D12A, MSGBOX_DEFAULT release end @@ -224,7 +224,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17 LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56:: @ 821CA56 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D094, MSGBOX_DEFAULT release end @@ -250,13 +250,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E setvar VAR_0x8004, 8 special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D347, MSGBOX_DEFAULT release end @@ -264,7 +264,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD:: @ 821CACD specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2A6, MSGBOX_DEFAULT release end @@ -290,13 +290,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05 setvar VAR_0x8004, 9 special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D52E, MSGBOX_DEFAULT release end @@ -304,7 +304,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05 LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44:: @ 821CB44 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D438, MSGBOX_DEFAULT release end @@ -330,13 +330,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C setvar VAR_0x8004, 10 special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D822, MSGBOX_DEFAULT release end @@ -344,7 +344,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB:: @ 821CBBB specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D751, MSGBOX_DEFAULT release end @@ -371,10 +371,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D9D1, MSGBOX_DEFAULT release end @@ -382,7 +382,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3 LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27:: @ 821CC27 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D921, MSGBOX_DEFAULT release end @@ -404,10 +404,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DB69, MSGBOX_DEFAULT release end @@ -415,7 +415,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55 LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89:: @ 821CC89 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA73, MSGBOX_DEFAULT release end @@ -437,10 +437,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DD36, MSGBOX_DEFAULT release end @@ -448,7 +448,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7 LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB:: @ 821CCEB specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DC68, MSGBOX_DEFAULT release end @@ -470,10 +470,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19 special BufferStreakTrainerText specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DEFF, MSGBOX_DEFAULT release end @@ -481,7 +481,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19 LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, MSGBOX_DEFAULT release end @@ -499,17 +499,15 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71:: @ 821CD71 LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B:: @ 821CD7B lock faceplayer - checkflag FLAG_0x0D2 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED - checkflag FLAG_0x0D2 - goto_if 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90 + goto_if_set FLAG_0x0D2, LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED + goto_if_unset FLAG_0x0D2, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90 end LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90 setvar VAR_0x8005, 11 special InterviewBefore compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF copyvar VAR_0x800A, VAR_0x8006 setvar VAR_0x8004, 8 special BufferStreakTrainerText @@ -520,9 +518,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90 lock faceplayer compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE end LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0:: @ 821CDE0 @@ -535,9 +533,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE special BufferStreakTrainerText msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15 end LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15 @@ -550,9 +548,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15 lock faceplayer compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE end LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D @@ -580,9 +578,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F special BufferStreakTrainerText msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 compare VAR_RESULT, 0 - goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D end LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6:: @ 821CEC6 diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 660a3984d..9f589d2e4 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -8,23 +8,22 @@ LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB setflag FLAG_VISITED_LITTLEROOT_TOWN call LittlerootTown_EventScript_271ED7 compare VAR_0x4092, 2 - call_if 1, LittlerootTown_EventScript_1E7E67 - checkflag FLAG_0x052 - call_if 0, LittlerootTown_EventScript_1E7E6F + call_if_eq LittlerootTown_EventScript_1E7E67 + call_if_unset FLAG_0x052, LittlerootTown_EventScript_1E7E6F compare VAR_0x4050, 3 - call_if 1, LittlerootTown_EventScript_1E7E92 + call_if_eq LittlerootTown_EventScript_1E7E92 compare VAR_0x4082, 4 - call_if 1, LittlerootTown_EventScript_1E7E5C + call_if_eq LittlerootTown_EventScript_1E7E5C compare VAR_0x408C, 4 - call_if 1, LittlerootTown_EventScript_1E7E5C + call_if_eq LittlerootTown_EventScript_1E7E5C compare VAR_0x40C7, 1 - call_if 1, LittlerootTown_EventScript_1E7E53 + call_if_eq LittlerootTown_EventScript_1E7E53 compare VAR_0x408D, 3 - call_if 1, LittlerootTown_EventScript_1E7E4F + call_if_eq LittlerootTown_EventScript_1E7E4F compare VAR_0x40D3, 1 - call_if 1, LittlerootTown_EventScript_1E7E4B + call_if_eq LittlerootTown_EventScript_1E7E4B compare VAR_0x40D3, 2 - call_if 1, LittlerootTown_EventScript_1E7E45 + call_if_eq LittlerootTown_EventScript_1E7E45 end LittlerootTown_EventScript_1E7E45:: @ 81E7E45 @@ -55,7 +54,7 @@ LittlerootTown_EventScript_1E7E67:: @ 81E7E67 LittlerootTown_EventScript_1E7E6F:: @ 81E7E6F compare VAR_0x4050, 0 - goto_eq LittlerootTown_EventScript_1E7E86 + goto_if_eq LittlerootTown_EventScript_1E7E86 setobjectxyperm 1, 10, 1 setobjectmovementtype 1, 7 return @@ -70,9 +69,9 @@ LittlerootTown_EventScript_1E7E92:: @ 81E7E92 setobjectmovementtype 4, 8 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E7EB1 + call_if_eq LittlerootTown_EventScript_1E7EB1 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E7EB9 + call_if_eq LittlerootTown_EventScript_1E7EB9 return LittlerootTown_EventScript_1E7EB1:: @ 81E7EB1 @@ -114,7 +113,7 @@ LittlerootTown_EventScript_1E7EF9:: @ 81E7EF9 LittlerootTown_EventScript_1E7F17:: @ 81E7F17 delay 15 playse SE_DANSA - applymovement 255, LittlerootTown_Movement_1E7FAC + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FAC waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 waitdooranim @@ -129,16 +128,16 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17 msgbox LittlerootTown_Text_1E86BC, MSGBOX_DEFAULT closemessage applymovement 4, LittlerootTown_Movement_1E7F9D - applymovement 255, LittlerootTown_Movement_1E7FA4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FA4 waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 waitdooranim applymovement 4, LittlerootTown_Movement_1E7FA1 - applymovement 255, LittlerootTown_Movement_1E7FA9 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E7FA9 waitmovement 0 setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE setvar VAR_0x4092, 3 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim clearflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN @@ -210,7 +209,7 @@ LittlerootTown_EventScript_1E7FEC:: @ 81E7FEC addobject 7 checkplayergender compare VAR_RESULT, 0 - goto_eq LittlerootTown_EventScript_1E8004 + goto_if_eq LittlerootTown_EventScript_1E8004 goto LittlerootTown_EventScript_1E8013 end @@ -235,12 +234,10 @@ LittlerootTown_EventScript_1E802B:: @ 81E802B LittlerootTown_EventScript_1E8034:: @ 81E8034 lock faceplayer - checkflag FLAG_0x074 - goto_eq LittlerootTown_EventScript_1E8087 - checkflag FLAG_0x052 - goto_eq LittlerootTown_EventScript_1E807A + goto_if_set FLAG_0x074, LittlerootTown_EventScript_1E8087 + goto_if_set FLAG_0x052, LittlerootTown_EventScript_1E807A compare VAR_0x4050, 0 - goto_if 5, LittlerootTown_EventScript_1E805D + goto_if_ne LittlerootTown_EventScript_1E805D msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT release end @@ -280,7 +277,7 @@ LittlerootTown_EventScript_1E80AD:: @ 81E80AD msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT closemessage applymovement 1, LittlerootTown_Movement_1E80DF - applymovement 255, LittlerootTown_Movement_1E80EB + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_1E80EB waitmovement 0 msgbox LittlerootTown_Text_1E8C07, MSGBOX_DEFAULT closemessage @@ -362,7 +359,7 @@ LittlerootTown_EventScript_1E811F:: @ 81E811F lockall applymovement 1, LittlerootTown_Movement_2725A8 waitmovement 0 - applymovement 255, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 waitmovement 0 special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT @@ -385,9 +382,9 @@ LittlerootTown_EventScript_1E8163:: @ 81E8163 lockall checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E817D + call_if_eq LittlerootTown_EventScript_1E817D compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E8186 + call_if_eq LittlerootTown_EventScript_1E8186 releaseall end @@ -403,9 +400,9 @@ LittlerootTown_EventScript_1E818F:: @ 81E818F lockall checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E81A9 + call_if_eq LittlerootTown_EventScript_1E81A9 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E81B2 + call_if_eq LittlerootTown_EventScript_1E81B2 releaseall end @@ -458,27 +455,27 @@ LittlerootTown_EventScript_1E8205:: @ 81E8205 LittlerootTown_EventScript_1E8211:: @ 81E8211 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E8297 + call_if_eq LittlerootTown_EventScript_1E8297 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E82A2 + call_if_eq LittlerootTown_EventScript_1E82A2 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E8281 + call_if_eq LittlerootTown_EventScript_1E8281 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E828C + call_if_eq LittlerootTown_EventScript_1E828C msgbox LittlerootTown_Text_1E87E1, MSGBOX_DEFAULT closemessage checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E82AD + call_if_eq LittlerootTown_EventScript_1E82AD compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E82F0 + call_if_eq LittlerootTown_EventScript_1E82F0 call LittlerootTown_EventScript_1E8693 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E8405 + call_if_eq LittlerootTown_EventScript_1E8405 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E8448 + call_if_eq LittlerootTown_EventScript_1E8448 goto LittlerootTown_EventScript_1E8686 end @@ -504,99 +501,99 @@ LittlerootTown_EventScript_1E82A2:: @ 81E82A2 LittlerootTown_EventScript_1E82AD:: @ 81E82AD compare VAR_0x8008, 0 - call_if 1, LittlerootTown_EventScript_1E8333 + call_if_eq LittlerootTown_EventScript_1E8333 compare VAR_0x8008, 1 - call_if 1, LittlerootTown_EventScript_1E8348 + call_if_eq LittlerootTown_EventScript_1E8348 compare VAR_0x8008, 2 - call_if 1, LittlerootTown_EventScript_1E835D + call_if_eq LittlerootTown_EventScript_1E835D compare VAR_0x8008, 3 - call_if 1, LittlerootTown_EventScript_1E8372 + call_if_eq LittlerootTown_EventScript_1E8372 compare VAR_0x8008, 4 - call_if 1, LittlerootTown_EventScript_1E8387 + call_if_eq LittlerootTown_EventScript_1E8387 compare VAR_0x8008, 5 - call_if 1, LittlerootTown_EventScript_1E839C + call_if_eq LittlerootTown_EventScript_1E839C return LittlerootTown_EventScript_1E82F0:: @ 81E82F0 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_EventScript_1E8333 + call_if_eq LittlerootTown_EventScript_1E8333 compare VAR_0x8008, 1 - call_if 1, LittlerootTown_EventScript_1E8348 + call_if_eq LittlerootTown_EventScript_1E8348 compare VAR_0x8008, 2 - call_if 1, LittlerootTown_EventScript_1E83B1 + call_if_eq LittlerootTown_EventScript_1E83B1 compare VAR_0x8008, 3 - call_if 1, LittlerootTown_EventScript_1E83C6 + call_if_eq LittlerootTown_EventScript_1E83C6 compare VAR_0x8008, 4 - call_if 1, LittlerootTown_EventScript_1E83DB + call_if_eq LittlerootTown_EventScript_1E83DB compare VAR_0x8008, 5 - call_if 1, LittlerootTown_EventScript_1E83F0 + call_if_eq LittlerootTown_EventScript_1E83F0 return LittlerootTown_EventScript_1E8333:: @ 81E8333 - applymovement 255, LittlerootTown_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725AA waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85D1 waitmovement 0 return LittlerootTown_EventScript_1E8348:: @ 81E8348 - applymovement 255, LittlerootTown_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725AA waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85D8 waitmovement 0 return LittlerootTown_EventScript_1E835D:: @ 81E835D - applymovement 255, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85DF waitmovement 0 return LittlerootTown_EventScript_1E8372:: @ 81E8372 - applymovement 255, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85E4 waitmovement 0 return LittlerootTown_EventScript_1E8387:: @ 81E8387 - applymovement 255, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85EA waitmovement 0 return LittlerootTown_EventScript_1E839C:: @ 81E839C - applymovement 255, LittlerootTown_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A4 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85ED waitmovement 0 return LittlerootTown_EventScript_1E83B1:: @ 81E83B1 - applymovement 255, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F1 waitmovement 0 return LittlerootTown_EventScript_1E83C6:: @ 81E83C6 - applymovement 255, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F5 waitmovement 0 return LittlerootTown_EventScript_1E83DB:: @ 81E83DB - applymovement 255, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85F8 waitmovement 0 return LittlerootTown_EventScript_1E83F0:: @ 81E83F0 - applymovement 255, LittlerootTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_2725A8 waitmovement 0 applymovement 4, LittlerootTown_Movement_1E85FE waitmovement 0 @@ -604,32 +601,32 @@ LittlerootTown_EventScript_1E83F0:: @ 81E83F0 LittlerootTown_EventScript_1E8405:: @ 81E8405 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_EventScript_1E848B + call_if_eq LittlerootTown_EventScript_1E848B compare VAR_0x8008, 1 - call_if 1, LittlerootTown_EventScript_1E8496 + call_if_eq LittlerootTown_EventScript_1E8496 compare VAR_0x8008, 2 - call_if 1, LittlerootTown_EventScript_1E84A1 + call_if_eq LittlerootTown_EventScript_1E84A1 compare VAR_0x8008, 3 - call_if 1, LittlerootTown_EventScript_1E84C7 + call_if_eq LittlerootTown_EventScript_1E84C7 compare VAR_0x8008, 4 - call_if 1, LittlerootTown_EventScript_1E84ED + call_if_eq LittlerootTown_EventScript_1E84ED compare VAR_0x8008, 5 - call_if 1, LittlerootTown_EventScript_1E8513 + call_if_eq LittlerootTown_EventScript_1E8513 return LittlerootTown_EventScript_1E8448:: @ 81E8448 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_EventScript_1E848B + call_if_eq LittlerootTown_EventScript_1E848B compare VAR_0x8008, 1 - call_if 1, LittlerootTown_EventScript_1E8496 + call_if_eq LittlerootTown_EventScript_1E8496 compare VAR_0x8008, 2 - call_if 1, LittlerootTown_EventScript_1E8539 + call_if_eq LittlerootTown_EventScript_1E8539 compare VAR_0x8008, 3 - call_if 1, LittlerootTown_EventScript_1E855F + call_if_eq LittlerootTown_EventScript_1E855F compare VAR_0x8008, 4 - call_if 1, LittlerootTown_EventScript_1E8585 + call_if_eq LittlerootTown_EventScript_1E8585 compare VAR_0x8008, 5 - call_if 1, LittlerootTown_EventScript_1E85AB + call_if_eq LittlerootTown_EventScript_1E85AB return LittlerootTown_EventScript_1E848B:: @ 81E848B @@ -893,9 +890,9 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D faceplayer checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_EventScript_1E8281 + call_if_eq LittlerootTown_EventScript_1E8281 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_EventScript_1E828C + call_if_eq LittlerootTown_EventScript_1E828C call LittlerootTown_EventScript_1E8693 applymovement 4, LittlerootTown_Movement_2725A6 waitmovement 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 4413a80d5..9eab32885 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -6,9 +6,8 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755 LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765 compare VAR_0x4092, 6 - call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_1F777A - checkflag FLAG_0x112 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F778D + call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_1F777A + call_if_set FLAG_0x112, LittlerootTown_BrendansHouse_1F_EventScript_1F778D end LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A @@ -19,7 +18,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A LittlerootTown_BrendansHouse_1F_EventScript_1F778D:: @ 81F778D checkplayergender compare VAR_RESULT, 0 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F779A + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F779A return LittlerootTown_BrendansHouse_1F_EventScript_1F779A:: @ 81F779A @@ -28,11 +27,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F779A:: @ 81F779A LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4 compare VAR_0x4092, 3 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77DE + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77DE compare VAR_0x4092, 5 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77C6 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77C6 compare VAR_0x4092, 6 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77D2 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F77D2 end LittlerootTown_BrendansHouse_1F_EventScript_1F77C6:: @ 81F77C6 @@ -62,7 +61,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814 lockall msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B67, MSGBOX_DEFAULT closemessage - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F783A + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1F783A applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_1F783A waitmovement 0 warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1 @@ -95,7 +94,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E waitmovement 0 applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_27259A waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C waitmovement 0 special GetRivalSonDaughterString @@ -152,22 +151,22 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_27259A waitmovement 0 compare VAR_0x8008, 1 - call_if 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7981 + call_if_ne LittlerootTown_BrendansHouse_1F_EventScript_1F7981 playbgm MUS_BOY_SUP, 1 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F798C + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F798C compare VAR_0x8008, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F7997 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F7997 compare VAR_0x8008, 2 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79A2 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79A2 msgbox LittlerootTown_BrendansHouse_1F_Text_1F90B4, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79C1 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79C1 compare VAR_0x8008, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79D3 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79D3 compare VAR_0x8008, 2 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79E5 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F79E5 playse SE_KAIDAN removeobject 7 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN @@ -182,7 +181,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 end LittlerootTown_BrendansHouse_1F_EventScript_1F7981:: @ 81F7981 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725AA waitmovement 0 return @@ -228,19 +227,19 @@ LittlerootTown_BrendansHouse_1F_Movement_1F79B9: @ 81F79B9 step_end LittlerootTown_BrendansHouse_1F_EventScript_1F79C1:: @ 81F79C1 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F79F7 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1F79F7 applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A06 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1F79D3:: @ 81F79D3 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F79FB + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1F79FB applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A0C waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1F79E5:: @ 81F79E5 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F7A02 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1F7A02 applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_1F7A16 waitmovement 0 return diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 2ebc9b900..096f35c1e 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -5,28 +5,27 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81F83E3 LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE compare VAR_0x408D, 2 - call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8457 + call_if_lt LittlerootTown_BrendansHouse_2F_EventScript_1F8457 compare VAR_0x408D, 3 - call_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F841A + call_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F841A compare VAR_0x4092, 4 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_2926FE + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2926FE call LittlerootTown_BrendansHouse_2F_EventScript_275CE1 setvar VAR_0x4089, 0 end LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A - checkflag FLAG_0x124 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8433 + goto_if_set FLAG_0x124, LittlerootTown_BrendansHouse_2F_EventScript_1F8433 compare VAR_0x4084, 2 - goto_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F8456 + goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F8456 goto LittlerootTown_BrendansHouse_2F_EventScript_1F8433 LittlerootTown_BrendansHouse_2F_EventScript_1F8433:: @ 81F8433 checkplayergender compare VAR_RESULT, 0 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8456 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8456 compare VAR_0x40D3, 2 - goto_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F9309 + goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F9309 setobjectxyperm 1, 0, 2 setobjectmovementtype 1, 7 return @@ -37,7 +36,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8456:: @ 81F8456 LittlerootTown_BrendansHouse_2F_EventScript_1F8457:: @ 81F8457 checkplayergender compare VAR_RESULT, 1 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8464 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8464 return LittlerootTown_BrendansHouse_2F_EventScript_1F8464:: @ 81F8464 @@ -51,13 +50,13 @@ LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474 checkplayergender compare VAR_RESULT, 0 - goto_eq EventScript_275D0C + goto_if_eq EventScript_275D0C end LittlerootTown_BrendansHouse_2F_EventScript_1F8481:: @ 81F8481 lockall compare VAR_0x408D, 2 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8497 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8497 msgbox LittlerootTown_BrendansHouse_2F_Text_1F9991, MSGBOX_DEFAULT releaseall end @@ -75,13 +74,13 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 delay 10 playbgm MUS_BOY_SUP, 1 compare VAR_FACING, 2 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8507 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8507 compare VAR_FACING, 1 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8536 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8536 compare VAR_FACING, 3 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8565 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8565 compare VAR_FACING, 4 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8594 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8594 setvar VAR_0x408D, 3 setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM @@ -94,11 +93,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C0 waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85CF + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_1F85CF applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C6 waitmovement 0 return @@ -106,11 +105,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507 LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85D7 waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85E2 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_1F85E2 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85DB waitmovement 0 return @@ -118,11 +117,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536 LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85E8 waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85F6 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_1F85F6 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85ED waitmovement 0 return @@ -130,7 +129,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565 LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85FD waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A6 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage @@ -249,9 +248,9 @@ EventScript_PlayerPCMale:: @ 81F860D lockall checkplayergender compare VAR_RESULT, 0 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8626 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8626 compare VAR_RESULT, 1 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F864C + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F864C end LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 824c4d930..0f71be46a 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -6,9 +6,8 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5 LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5 compare VAR_0x4092, 6 - call_if 0, LittlerootTown_MaysHouse_1F_EventScript_1F88CA - checkflag FLAG_0x112 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F88DD + call_if_lt LittlerootTown_MaysHouse_1F_EventScript_1F88CA + call_if_set FLAG_0x112, LittlerootTown_MaysHouse_1F_EventScript_1F88DD end LittlerootTown_MaysHouse_1F_EventScript_1F88CA:: @ 81F88CA @@ -19,7 +18,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F88CA:: @ 81F88CA LittlerootTown_MaysHouse_1F_EventScript_1F88DD:: @ 81F88DD checkplayergender compare VAR_RESULT, 1 - goto_eq LittlerootTown_MaysHouse_1F_EventScript_1F88EA + goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F88EA return LittlerootTown_MaysHouse_1F_EventScript_1F88EA:: @ 81F88EA @@ -28,11 +27,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1F88EA:: @ 81F88EA LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4 compare VAR_0x4092, 3 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F892E + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F892E compare VAR_0x4092, 5 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8916 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8916 compare VAR_0x4092, 6 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8922 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8922 end LittlerootTown_MaysHouse_1F_EventScript_1F8916:: @ 81F8916 @@ -62,7 +61,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964 lockall msgbox LittlerootTown_MaysHouse_1F_Text_1F7B67, MSGBOX_DEFAULT closemessage - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F898A + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1F898A applymovement 1, LittlerootTown_MaysHouse_1F_Movement_1F898A waitmovement 0 warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1 @@ -95,7 +94,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE waitmovement 0 applymovement 4, LittlerootTown_MaysHouse_1F_Movement_27259A waitmovement 0 - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725A8 applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC waitmovement 0 special GetRivalSonDaughterString @@ -118,12 +117,10 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F89F3:: @ 81F89F3 LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3 lock faceplayer - checkflag FLAG_0x082 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A33 - checkflag FLAG_SYS_POKEMON_GET - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A29 + goto_if_set FLAG_0x082, LittlerootTown_BrendansHouse_1F_EventScript_1F8A33 + goto_if_set FLAG_SYS_POKEMON_GET, LittlerootTown_BrendansHouse_1F_EventScript_1F8A29 compare VAR_0x408D, 3 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, MSGBOX_DEFAULT release @@ -191,22 +188,22 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B applymovement 7, LittlerootTown_MaysHouse_1F_Movement_27259A waitmovement 0 compare VAR_0x8008, 1 - call_if 5, LittlerootTown_MaysHouse_1F_EventScript_1F8B2A + call_if_ne LittlerootTown_MaysHouse_1F_EventScript_1F8B2A playbgm MUS_GIRL_SUP, 1 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B35 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B35 compare VAR_0x8008, 1 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B40 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B40 compare VAR_0x8008, 2 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B4B + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B4B msgbox LittlerootTown_MaysHouse_1F_Text_1F8EC6, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B6A + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B6A compare VAR_0x8008, 1 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B7C + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B7C compare VAR_0x8008, 2 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B8E + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1F8B8E playse SE_KAIDAN removeobject 7 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN @@ -221,7 +218,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B end LittlerootTown_MaysHouse_1F_EventScript_1F8B2A:: @ 81F8B2A - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725AA waitmovement 0 return @@ -267,19 +264,19 @@ LittlerootTown_MaysHouse_1F_Movement_1F8B62: @ 81F8B62 step_end LittlerootTown_MaysHouse_1F_EventScript_1F8B6A:: @ 81F8B6A - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F8BA0 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1F8BA0 applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BAF waitmovement 0 return LittlerootTown_MaysHouse_1F_EventScript_1F8B7C:: @ 81F8B7C - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F8BA4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1F8BA4 applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BB5 waitmovement 0 return LittlerootTown_MaysHouse_1F_EventScript_1F8B8E:: @ 81F8B8E - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F8BAB + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1F8BAB applymovement 7, LittlerootTown_MaysHouse_1F_Movement_1F8BBF waitmovement 0 return diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 8a2ec10ac..e0cb7dfe7 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -5,28 +5,27 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 81F9296 LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 compare VAR_0x408D, 2 - call_if 0, LittlerootTown_MaysHouse_2F_EventScript_1F930A + call_if_lt LittlerootTown_MaysHouse_2F_EventScript_1F930A compare VAR_0x408D, 3 - call_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F92CD + call_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F92CD compare VAR_0x4092, 4 - call_if 1, LittlerootTown_MaysHouse_2F_EventScript_2926FE + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_2926FE call LittlerootTown_MaysHouse_2F_EventScript_275CE1 setvar VAR_0x4089, 0 end LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD - checkflag FLAG_0x124 - goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F92E6 + goto_if_set FLAG_0x124, LittlerootTown_MaysHouse_2F_EventScript_1F92E6 compare VAR_0x4084, 2 - goto_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F9309 + goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309 goto LittlerootTown_MaysHouse_2F_EventScript_1F92E6 LittlerootTown_MaysHouse_2F_EventScript_1F92E6:: @ 81F92E6 checkplayergender compare VAR_RESULT, 1 - goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9309 + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9309 compare VAR_0x40D3, 2 - goto_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F9309 + goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309 setobjectxyperm 1, 8, 2 setobjectmovementtype 1, 7 return @@ -38,7 +37,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9309:: @ 81F9309 LittlerootTown_MaysHouse_2F_EventScript_1F930A:: @ 81F930A checkplayergender compare VAR_RESULT, 0 - goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9317 + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9317 return LittlerootTown_MaysHouse_2F_EventScript_1F9317:: @ 81F9317 @@ -52,13 +51,13 @@ LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327 checkplayergender compare VAR_RESULT, 1 - goto_eq EventScript_275D0C + goto_if_eq EventScript_275D0C end LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334 lockall compare VAR_0x408D, 2 - goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, MSGBOX_DEFAULT releaseall end @@ -76,13 +75,13 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A delay 10 playbgm MUS_GIRL_SUP, 1 compare VAR_FACING, 2 - call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F93BA + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F93BA compare VAR_FACING, 1 - call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F93E9 + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F93E9 compare VAR_FACING, 3 - call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F9418 + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9418 compare VAR_FACING, 4 - call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F9440 + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9440 setvar VAR_0x408D, 3 setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM @@ -95,11 +94,11 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9473 waitmovement 0 - applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4 waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage - applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F9483 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_1F9483 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9479 waitmovement 0 return @@ -107,11 +106,11 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948B waitmovement 0 - applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4 waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage - applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F9497 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_1F9497 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948F waitmovement 0 return @@ -119,7 +118,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9 LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F949D waitmovement 0 - applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A6 waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage @@ -130,11 +129,11 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418 LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94AD waitmovement 0 - applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_2725A4 waitmovement 0 msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage - applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F94BB + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_1F94BB applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94B2 waitmovement 0 return @@ -250,13 +249,12 @@ LittlerootTown_MaysHouse_2F_Movement_1F94BB: @ 81F94BB LittlerootTown_BrendansHouse_2F_EventScript_1F94C1:: @ 81F94C1 LittlerootTown_MaysHouse_2F_EventScript_1F94C1:: @ 81F94C1 lockall - checkflag FLAG_0x124 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94F7 + goto_if_set FLAG_0x124, LittlerootTown_BrendansHouse_2F_EventScript_1F94F7 checkplayergender compare VAR_RESULT, 0 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94E3 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94E3 compare VAR_RESULT, 1 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94ED + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94ED end LittlerootTown_BrendansHouse_2F_EventScript_1F94E3:: @ 81F94E3 @@ -274,22 +272,20 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7 waitmovement 0 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F951D + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F951D compare VAR_RESULT, 1 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F952F + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F952F setflag FLAG_0x125 releaseall end LittlerootTown_BrendansHouse_2F_EventScript_1F951D:: @ 81F951D - checkflag FLAG_0x125 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F9541 + goto_if_set FLAG_0x125, LittlerootTown_BrendansHouse_2F_EventScript_1F9541 msgbox LittlerootTown_BrendansHouse_2F_Text_1F99C9, MSGBOX_DEFAULT return LittlerootTown_BrendansHouse_2F_EventScript_1F952F:: @ 81F952F - checkflag FLAG_0x125 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F954A + goto_if_set FLAG_0x125, LittlerootTown_BrendansHouse_2F_EventScript_1F954A msgbox LittlerootTown_BrendansHouse_2F_Text_1F9B0D, MSGBOX_DEFAULT return @@ -305,9 +301,9 @@ EventScript_PlayerPCFemale:: @ 81F9553 lockall checkplayergender compare VAR_RESULT, 0 - goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F956C + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F956C compare VAR_RESULT, 1 - goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9576 + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9576 end LittlerootTown_MaysHouse_2F_EventScript_1F956C:: @ 81F956C diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index ec6cd9738..3534047ae 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -8,17 +8,17 @@ LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1 call LittlerootTown_ProfessorBirchsLab_EventScript_271ED7 call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD compare VAR_0x40D3, 6 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7 compare VAR_0x40D3, 4 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3 compare VAR_0x40D3, 3 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD end LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD:: @ 81F9CCD specialvar VAR_RESULT, sub_80C08E4 compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9 setobjectmovementtype 3, 3 setobjectxyperm 3, 5, 10 end @@ -48,11 +48,11 @@ LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06: @ 81F9D06 .2byte 0 LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40:: @ 81F9D40 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45:: @ 81F9D45 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 addobject 2 addobject 3 turnobject 3, 2 @@ -100,9 +100,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8B1, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07 compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17 end LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07 @@ -114,9 +114,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8F6, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48 end LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36 @@ -129,14 +129,14 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48:: @ 81F9E48 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA35, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48 end LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67:: @ 81F9E67 lockall - applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1F9E78 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_1F9E78 waitmovement 0 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8 end @@ -168,20 +168,20 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 playse SE_TK_KASYA delay 20 applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 - applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A4 waitmovement 0 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C playse SE_PC_ON waitse delay 20 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F58 waitmovement 0 applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 - applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 waitmovement 0 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, MSGBOX_DEFAULT playfanfare MUS_FANFA4 @@ -244,7 +244,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9F58: @ 81F9F58 LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62:: @ 81F9F62 lockall - applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C waitmovement 0 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB5F9, MSGBOX_DEFAULT setvar VAR_0x40D3, 5 @@ -265,9 +265,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84 lock faceplayer compare VAR_0x4084, 3 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1 - checkflag FLAG_0x058 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1 + goto_if_set FLAG_0x058, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, MSGBOX_DEFAULT setflag FLAG_0x058 release @@ -286,39 +285,39 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1:: @ 81F9FB1 LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB release compare VAR_0x40D3, 6 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 drawmonpic SPECIES_CYNDAQUIL, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C end LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF release compare VAR_0x40D3, 6 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 drawmonpic SPECIES_TOTODILE, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D end LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023 release compare VAR_0x40D3, 6 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 drawmonpic SPECIES_CHIKORITA, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE end @@ -338,9 +337,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C setvar VAR_TEMP_1, 155 givemon SPECIES_CYNDAQUIL, 5, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1 compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC erasemonpic goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 end @@ -350,7 +349,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1 removeobject 4 msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD call LittlerootTown_ProfessorBirchsLab_EventScript_27378B call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD @@ -361,7 +360,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC removeobject 4 msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 call LittlerootTown_ProfessorBirchsLab_EventScript_273797 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 end @@ -383,9 +382,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D setvar VAR_TEMP_1, 158 givemon SPECIES_TOTODILE, 5, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142 compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D erasemonpic goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 end @@ -395,7 +394,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142 removeobject 5 msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E call LittlerootTown_ProfessorBirchsLab_EventScript_27378B call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E @@ -406,7 +405,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D removeobject 5 msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 call LittlerootTown_ProfessorBirchsLab_EventScript_273797 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 end @@ -428,9 +427,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE setvar VAR_TEMP_1, 152 givemon SPECIES_CHIKORITA, 5, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3 compare VAR_RESULT, 1 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E erasemonpic goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 end @@ -440,7 +439,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3 removeobject 6 msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F call LittlerootTown_ProfessorBirchsLab_EventScript_27378B call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F @@ -451,7 +450,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E removeobject 6 msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 call LittlerootTown_ProfessorBirchsLab_EventScript_273797 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 end @@ -479,13 +478,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A lock faceplayer compare VAR_0x40D3, 5 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A compare VAR_0x40D3, 2 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294 - checkflag FLAG_HAS_MATCH_CALL - goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E - checkflag FLAG_0x119 - goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294 + goto_if_unset FLAG_HAS_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E + goto_if_unset FLAG_0x119, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E end @@ -500,14 +497,13 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294 end LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E - checkflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380 - goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_272141 + goto_if_unset FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380, LittlerootTown_ProfessorBirchsLab_EventScript_272141 compare VAR_0x40D3, 3 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141 compare VAR_0x40D3, 6 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_272141 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_272141 compare VAR_0x4084, 5 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, MSGBOX_DEFAULT release end @@ -534,13 +530,13 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 closemessage applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0 waitmovement 0 - applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA352 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA352 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F setvar VAR_0x4084, 5 setflag FLAG_0x074 setvar VAR_0x4051, 1 @@ -553,7 +549,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA352:: @ 81FA352 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FADD7, MSGBOX_DEFAULT giveitem_std ITEM_POKE_BALL, 5 compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAE40, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return @@ -562,7 +558,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F:: @ 81FA37F msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF3F, MSGBOX_DEFAULT giveitem_std ITEM_POKE_BALL, 5 compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF8E, MSGBOX_DEFAULT setvar VAR_RESULT, 1 return @@ -603,16 +599,16 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC lock faceplayer compare VAR_0x40D3, 5 - goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A compare VAR_0x40D3, 6 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA465 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA465 compare VAR_0x40D3, 2 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA490 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA490 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA428 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA428 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA431 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA431 release end @@ -627,9 +623,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA431:: @ 81FA431 LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A:: @ 81FA43A checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA453 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA453 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C release end @@ -644,9 +640,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C:: @ 81FA45C LittlerootTown_ProfessorBirchsLab_EventScript_1FA465:: @ 81FA465 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E compare VAR_RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA487 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA487 release end @@ -661,9 +657,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA487:: @ 81FA487 LittlerootTown_ProfessorBirchsLab_EventScript_1FA490:: @ 81FA490 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2 release end diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index 714983999..818b11da7 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -18,7 +18,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 playfanfare MUS_ME_TAMA playse SE_TAMA special sub_80B0534 - applymovement 255, MagmaHideout_4F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, MagmaHideout_4F_Movement_2725A6 waitmovement 0 delay 150 removeobject 7 @@ -50,7 +50,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 waitmovement 0 msgbox MagmaHideout_4F_Text_23AADA, MSGBOX_DEFAULT closemessage - applymovement 255, MagmaHideout_4F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, MagmaHideout_4F_Movement_2725A8 waitmovement 0 delay 30 applymovement 6, MagmaHideout_4F_Movement_27259E diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index f61620c29..d42e0e1d6 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -4,20 +4,18 @@ MarineCave_End_MapScripts:: @ 823AFDF .byte 0 MarineCave_End_MapScript1_23AFEA: @ 823AFEA - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, MarineCave_End_EventScript_23AFF4 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, MarineCave_End_EventScript_23AFF4 end MarineCave_End_EventScript_23AFF4:: @ 823AFF4 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, MarineCave_End_EventScript_27374E + goto_if_ne MarineCave_End_EventScript_27374E removeobject 1 return MarineCave_End_MapScript1_23B008: @ 823B008 - checkflag FLAG_0x1BE - call_if 0, MarineCave_End_EventScript_23B012 + call_if_unset FLAG_0x1BE, MarineCave_End_EventScript_23B012 end MarineCave_End_EventScript_23B012:: @ 823B012 @@ -27,7 +25,7 @@ MarineCave_End_EventScript_23B012:: @ 823B012 MarineCave_End_EventScript_23B01B:: @ 823B01B lockall - applymovement 255, MarineCave_End_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, MarineCave_End_Movement_2725B2 waitmovement 0 applymovement 1, MarineCave_End_Movement_23B09D waitmovement 0 @@ -44,11 +42,11 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B setvar VAR_TEMP_1, 0 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq MarineCave_End_EventScript_23B084 + goto_if_eq MarineCave_End_EventScript_23B084 compare VAR_RESULT, 4 - goto_eq MarineCave_End_EventScript_23B092 + goto_if_eq MarineCave_End_EventScript_23B092 compare VAR_RESULT, 5 - goto_eq MarineCave_End_EventScript_23B092 + goto_if_eq MarineCave_End_EventScript_23B092 setvar VAR_0x4039, 1 setflag FLAG_0x1BE releaseall diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 17ace6e10..751723f7b 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -9,8 +9,7 @@ MauvilleCity_MapScript1_1DF38B: @ 81DF38B setflag FLAG_SYS_TV_START clearflag FLAG_0x063 setvar VAR_0x4093, 0 - checkflag FLAG_GOT_TM24_FROM_WATTSON - call_if 1, MauvilleCity_EventScript_1DF3A9 + call_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF3A9 end MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9 @@ -54,8 +53,7 @@ MauvilleCity_EventScript_1DF3F2:: @ 81DF3F2 MauvilleCity_EventScript_1DF3FB:: @ 81DF3FB lock faceplayer - checkflag FLAG_0x062 - goto_eq MauvilleCity_EventScript_1DF413 + goto_if_set FLAG_0x062, MauvilleCity_EventScript_1DF413 msgbox MauvilleCity_Text_1E056A, MSGBOX_DEFAULT setflag FLAG_0x062 release @@ -69,8 +67,7 @@ MauvilleCity_EventScript_1DF413:: @ 81DF413 MauvilleCity_EventScript_1DF41D:: @ 81DF41D lock faceplayer - checkflag FLAG_0x11C - goto_eq MauvilleCity_EventScript_1DF43D + goto_if_set FLAG_0x11C, MauvilleCity_EventScript_1DF43D msgbox MauvilleCity_Text_1DF7DC, MSGBOX_DEFAULT closemessage applymovement 7, MauvilleCity_Movement_2725A2 @@ -88,8 +85,7 @@ MauvilleCity_EventScript_1DF43D:: @ 81DF43D MauvilleCity_EventScript_1DF452:: @ 81DF452 lockall - checkflag FLAG_0x11C - goto_eq MauvilleCity_EventScript_1DF690 + goto_if_set FLAG_0x11C, MauvilleCity_EventScript_1DF690 applymovement 6, MauvilleCity_Movement_2725A8 waitmovement 0 msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT @@ -108,9 +104,9 @@ MauvilleCity_EventScript_1DF452:: @ 81DF452 MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD compare VAR_RESULT, 1 - call_if 1, MauvilleCity_EventScript_1DF63A + call_if_eq MauvilleCity_EventScript_1DF63A compare VAR_RESULT, 0 - goto_eq MauvilleCity_EventScript_1DF683 + goto_if_eq MauvilleCity_EventScript_1DF683 closemessage switch VAR_FACING case 2, MauvilleCity_EventScript_1DF4E0 @@ -118,19 +114,19 @@ MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD end MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0 - applymovement 255, MauvilleCity_Movement_1DF6DF + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6DF applymovement 6, MauvilleCity_Movement_1DF6A8 applymovement 7, MauvilleCity_Movement_1DF6E2 waitmovement 0 applymovement 6, MauvilleCity_Movement_2725A8 waitmovement 0 delay 30 - applymovement 255, MauvilleCity_Movement_1DF6EE + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6EE applymovement 7, MauvilleCity_Movement_1DF6F3 waitmovement 0 msgbox MauvilleCity_Text_1DFD34, MSGBOX_DEFAULT closemessage - applymovement 255, MauvilleCity_Movement_1DF6CC + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6CC applymovement 7, MauvilleCity_Movement_1DF6FA applymovement 6, MauvilleCity_Movement_1DF6B4 waitmovement 0 @@ -138,7 +134,7 @@ MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0 end MauvilleCity_EventScript_1DF53D:: @ 81DF53D - applymovement 255, MauvilleCity_Movement_1DF6DC + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6DC applymovement 6, MauvilleCity_Movement_1DF6AE applymovement 7, MauvilleCity_Movement_1DF6E8 waitmovement 0 @@ -149,7 +145,7 @@ MauvilleCity_EventScript_1DF53D:: @ 81DF53D waitmovement 0 msgbox MauvilleCity_Text_1DFD34, MSGBOX_DEFAULT closemessage - applymovement 255, MauvilleCity_Movement_1DF6D0 + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6D0 applymovement 7, MauvilleCity_Movement_1DF703 applymovement 6, MauvilleCity_Movement_1DF6C0 waitmovement 0 @@ -165,18 +161,18 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593 setvar VAR_0x40F2, 0 setflag FLAG_0x088 compare VAR_FACING, 2 - call_if 1, MauvilleCity_EventScript_1DF5F3 + call_if_eq MauvilleCity_EventScript_1DF5F3 compare VAR_FACING, 4 - call_if 1, MauvilleCity_EventScript_1DF601 - applymovement 255, MauvilleCity_Movement_2725AA + call_if_eq MauvilleCity_EventScript_1DF601 + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_2725AA waitmovement 0 msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT closemessage addvar VAR_0x40D1, 1 compare VAR_FACING, 2 - call_if 1, MauvilleCity_EventScript_1DF616 + call_if_eq MauvilleCity_EventScript_1DF616 compare VAR_FACING, 4 - call_if 1, MauvilleCity_EventScript_1DF628 + call_if_eq MauvilleCity_EventScript_1DF628 removeobject 11 releaseall end @@ -195,13 +191,13 @@ MauvilleCity_EventScript_1DF601:: @ 81DF601 return MauvilleCity_EventScript_1DF616:: @ 81DF616 - applymovement 255, MauvilleCity_Movement_1DF6D5 + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6D5 applymovement 11, MauvilleCity_Movement_1DF725 waitmovement 0 return MauvilleCity_EventScript_1DF628:: @ 81DF628 - applymovement 255, MauvilleCity_Movement_1DF6D8 + applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6D8 applymovement 11, MauvilleCity_Movement_1DF72F waitmovement 0 return @@ -424,12 +420,10 @@ MauvilleCity_Movement_1DF72F: @ 81DF72F MauvilleCity_EventScript_1DF73A:: @ 81DF73A lock faceplayer - checkflag FLAG_GOT_TM24_FROM_WATTSON - goto_eq MauvilleCity_EventScript_1DF7B0 + goto_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF7B0 compare VAR_0x40BA, 2 - goto_eq MauvilleCity_EventScript_1DF784 - checkflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON - goto_eq MauvilleCity_EventScript_1DF77A + goto_if_eq MauvilleCity_EventScript_1DF784 + goto_if_set FLAG_GOT_BASEMENT_KEY_FROM_WATTSON, MauvilleCity_EventScript_1DF77A msgbox MauvilleCity_Text_1DFFE4, MSGBOX_DEFAULT giveitem_std ITEM_BASEMENT_KEY setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON @@ -446,7 +440,7 @@ MauvilleCity_EventScript_1DF784:: @ 81DF784 msgbox MauvilleCity_Text_1E020E, MSGBOX_DEFAULT giveitem_std ITEM_TM24 compare VAR_RESULT, 0 - goto_eq MauvilleCity_EventScript_272054 + goto_if_eq MauvilleCity_EventScript_272054 setflag FLAG_GOT_TM24_FROM_WATTSON msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT release diff --git a/data/maps/MauvilleCity_BikeShop/scripts.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc index 1634ee33c..fd390a92c 100644 --- a/data/maps/MauvilleCity_BikeShop/scripts.inc +++ b/data/maps/MauvilleCity_BikeShop/scripts.inc @@ -4,24 +4,22 @@ MauvilleCity_BikeShop_MapScripts:: @ 820EBBB MauvilleCity_BikeShop_EventScript_20EBBC:: @ 820EBBC lock faceplayer - checkflag FLAG_0x05A - goto_eq MauvilleCity_BikeShop_EventScript_20EC94 - checkflag FLAG_0x059 - goto_eq MauvilleCity_BikeShop_EventScript_20EBF7 + goto_if_set FLAG_0x05A, MauvilleCity_BikeShop_EventScript_20EC94 + goto_if_set FLAG_0x059, MauvilleCity_BikeShop_EventScript_20EBF7 msgbox MauvilleCity_BikeShop_Text_20EE22, MSGBOX_DEFAULT msgbox MauvilleCity_BikeShop_Text_20EE99, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq MauvilleCity_BikeShop_EventScript_20EC4A + goto_if_eq MauvilleCity_BikeShop_EventScript_20EC4A compare VAR_RESULT, 0 - goto_eq MauvilleCity_BikeShop_EventScript_20EC3D + goto_if_eq MauvilleCity_BikeShop_EventScript_20EC3D end MauvilleCity_BikeShop_EventScript_20EBF7:: @ 820EBF7 msgbox MauvilleCity_BikeShop_Text_20EE99, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq MauvilleCity_BikeShop_EventScript_20EC4A + goto_if_eq MauvilleCity_BikeShop_EventScript_20EC4A compare VAR_RESULT, 0 - goto_eq MauvilleCity_BikeShop_EventScript_20EC3D + goto_if_eq MauvilleCity_BikeShop_EventScript_20EC3D end MauvilleCity_BikeShop_EventScript_20EC16:: @ 820EC16 @@ -65,19 +63,19 @@ MauvilleCity_BikeShop_EventScript_20EC87:: @ 820EC87 MauvilleCity_BikeShop_EventScript_20EC94:: @ 820EC94 msgbox MauvilleCity_BikeShop_Text_20F1FB, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq MauvilleCity_BikeShop_EventScript_20ECB3 + goto_if_eq MauvilleCity_BikeShop_EventScript_20ECB3 compare VAR_RESULT, 0 - goto_eq MauvilleCity_BikeShop_EventScript_20ECE5 + goto_if_eq MauvilleCity_BikeShop_EventScript_20ECE5 end MauvilleCity_BikeShop_EventScript_20ECB3:: @ 820ECB3 msgbox MauvilleCity_BikeShop_Text_20F22F, MSGBOX_DEFAULT checkitem ITEM_ACRO_BIKE, 1 compare VAR_RESULT, 1 - goto_eq MauvilleCity_BikeShop_EventScript_20ECEF + goto_if_eq MauvilleCity_BikeShop_EventScript_20ECEF checkitem ITEM_MACH_BIKE, 1 compare VAR_RESULT, 1 - goto_eq MauvilleCity_BikeShop_EventScript_20ED10 + goto_if_eq MauvilleCity_BikeShop_EventScript_20ED10 msgbox MauvilleCity_BikeShop_Text_20F2F3, MSGBOX_DEFAULT release end diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 135f48f23..45f00c9ee 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -7,7 +7,7 @@ MauvilleCity_GameCorner_EventScript_20FBB9:: @ 820FBB9 msgbox MauvilleCity_GameCorner_Text_210460, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_20FCB7 + goto_if_eq MauvilleCity_GameCorner_EventScript_20FCB7 message MauvilleCity_GameCorner_Text_2104DF waitmessage showmoneybox 0, 0, 0 @@ -33,10 +33,10 @@ MauvilleCity_GameCorner_EventScript_20FC0C:: @ 820FC0C MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33 checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9950 - goto_if 4, MauvilleCity_GameCorner_EventScript_20FCE1 + goto_if_ge MauvilleCity_GameCorner_EventScript_20FCE1 checkmoney 0x3e8, 0 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_20FCC1 + goto_if_eq MauvilleCity_GameCorner_EventScript_20FCC1 givecoins 50 takemoney 0x3e8, 0 updatemoneybox 0, 0 @@ -54,10 +54,10 @@ MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33 MauvilleCity_GameCorner_EventScript_20FC75:: @ 820FC75 checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9500 - goto_if 4, MauvilleCity_GameCorner_EventScript_20FCE1 + goto_if_ge MauvilleCity_GameCorner_EventScript_20FCE1 checkmoney 0x2710, 0 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_20FCC1 + goto_if_eq MauvilleCity_GameCorner_EventScript_20FCC1 givecoins 500 takemoney 0x2710, 0 updatemoneybox 0, 0 @@ -110,7 +110,7 @@ MauvilleCity_GameCorner_EventScript_20FCF1:: @ 820FCF1 msgbox MauvilleCity_GameCorner_Text_2105D7, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 1 - goto_eq MauvilleCity_GameCorner_EventScript_20FD0D + goto_if_eq MauvilleCity_GameCorner_EventScript_20FD0D release end @@ -154,7 +154,7 @@ MauvilleCity_GameCorner_EventScript_20FD83:: @ 820FD83 MauvilleCity_GameCorner_EventScript_20FD91:: @ 820FD91 msgbox MauvilleCity_GameCorner_Text_210705, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_20FE92 + goto_if_eq MauvilleCity_GameCorner_EventScript_20FE92 switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_20FDCB case 2, MauvilleCity_GameCorner_EventScript_20FE05 @@ -164,11 +164,11 @@ MauvilleCity_GameCorner_EventScript_20FD91:: @ 820FD91 MauvilleCity_GameCorner_EventScript_20FDCB:: @ 820FDCB checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 - goto_if 0, MauvilleCity_GameCorner_EventScript_20FE79 + goto_if_lt MauvilleCity_GameCorner_EventScript_20FE79 bufferdecorationname 1, 88 checkdecorspace 88 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_20FE87 + goto_if_eq MauvilleCity_GameCorner_EventScript_20FE87 takecoins 1000 givedecoration 88 updatecoinsbox 1, 1 @@ -180,11 +180,11 @@ MauvilleCity_GameCorner_EventScript_20FDCB:: @ 820FDCB MauvilleCity_GameCorner_EventScript_20FE05:: @ 820FE05 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 - goto_if 0, MauvilleCity_GameCorner_EventScript_20FE79 + goto_if_lt MauvilleCity_GameCorner_EventScript_20FE79 bufferdecorationname 1, 89 checkdecorspace 89 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_20FE87 + goto_if_eq MauvilleCity_GameCorner_EventScript_20FE87 takecoins 1000 givedecoration 89 updatecoinsbox 1, 1 @@ -196,11 +196,11 @@ MauvilleCity_GameCorner_EventScript_20FE05:: @ 820FE05 MauvilleCity_GameCorner_EventScript_20FE3F:: @ 820FE3F checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 - goto_if 0, MauvilleCity_GameCorner_EventScript_20FE79 + goto_if_lt MauvilleCity_GameCorner_EventScript_20FE79 bufferdecorationname 1, 90 checkdecorspace 90 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_20FE87 + goto_if_eq MauvilleCity_GameCorner_EventScript_20FE87 takecoins 1000 givedecoration 90 updatecoinsbox 1, 1 @@ -231,7 +231,7 @@ MauvilleCity_GameCorner_EventScript_20FE9F:: @ 820FE9F msgbox MauvilleCity_GameCorner_Text_2105D7, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 1 - goto_eq MauvilleCity_GameCorner_EventScript_20FEBB + goto_if_eq MauvilleCity_GameCorner_EventScript_20FEBB release end @@ -293,7 +293,7 @@ MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A special sub_81398C0 msgbox MauvilleCity_GameCorner_Text_210629, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210118 + goto_if_eq MauvilleCity_GameCorner_EventScript_210118 switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_20FFDD case 2, MauvilleCity_GameCorner_EventScript_210017 @@ -305,10 +305,10 @@ MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A MauvilleCity_GameCorner_EventScript_20FFDD:: @ 820FFDD checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1500 - goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF + goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM32, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_21010D + goto_if_eq MauvilleCity_GameCorner_EventScript_21010D takecoins 1500 giveitem ITEM_TM32, 1 updatecoinsbox 1, 1 @@ -320,10 +320,10 @@ MauvilleCity_GameCorner_EventScript_20FFDD:: @ 820FFDD MauvilleCity_GameCorner_EventScript_210017:: @ 8210017 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 3500 - goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF + goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM29, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_21010D + goto_if_eq MauvilleCity_GameCorner_EventScript_21010D takecoins 3500 giveitem ITEM_TM29, 1 updatecoinsbox 1, 1 @@ -335,10 +335,10 @@ MauvilleCity_GameCorner_EventScript_210017:: @ 8210017 MauvilleCity_GameCorner_EventScript_210051:: @ 8210051 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 - goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF + goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM35, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_21010D + goto_if_eq MauvilleCity_GameCorner_EventScript_21010D takecoins 4000 giveitem ITEM_TM35, 1 updatecoinsbox 1, 1 @@ -350,10 +350,10 @@ MauvilleCity_GameCorner_EventScript_210051:: @ 8210051 MauvilleCity_GameCorner_EventScript_21008B:: @ 821008B checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 - goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF + goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM24, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_21010D + goto_if_eq MauvilleCity_GameCorner_EventScript_21010D takecoins 4000 giveitem ITEM_TM24, 1 updatecoinsbox 1, 1 @@ -365,10 +365,10 @@ MauvilleCity_GameCorner_EventScript_21008B:: @ 821008B MauvilleCity_GameCorner_EventScript_2100C5:: @ 82100C5 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 - goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF + goto_if_lt MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM13, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_21010D + goto_if_eq MauvilleCity_GameCorner_EventScript_21010D takecoins 4000 giveitem ITEM_TM13, 1 updatecoinsbox 1, 1 @@ -404,11 +404,10 @@ MauvilleCity_GameCorner_EventScript_21012E:: @ 821012E MauvilleCity_GameCorner_EventScript_210137:: @ 8210137 lock faceplayer - checkflag FLAG_0x0E2 - goto_eq MauvilleCity_GameCorner_EventScript_210213 + goto_if_set FLAG_0x0E2, MauvilleCity_GameCorner_EventScript_210213 msgbox MauvilleCity_GameCorner_Text_210750, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210209 + goto_if_eq MauvilleCity_GameCorner_EventScript_210209 switch VAR_STARTER_MON case 0, MauvilleCity_GameCorner_EventScript_21017C case 1, MauvilleCity_GameCorner_EventScript_2101A6 @@ -419,7 +418,7 @@ MauvilleCity_GameCorner_EventScript_21017C:: @ 821017C bufferdecorationname 1, 88 checkdecorspace 88 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_2101FA + goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT givedecoration_std 88 setflag FLAG_0x0E2 @@ -430,7 +429,7 @@ MauvilleCity_GameCorner_EventScript_2101A6:: @ 82101A6 bufferdecorationname 1, 89 checkdecorspace 89 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_2101FA + goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT givedecoration_std 89 setflag FLAG_0x0E2 @@ -441,7 +440,7 @@ MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0 bufferdecorationname 1, 90 checkdecorspace 90 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_2101FA + goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT givedecoration_std 90 setflag FLAG_0x0E2 @@ -469,17 +468,16 @@ MauvilleCity_GameCorner_EventScript_21021D:: @ 821021D faceplayer checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 1 - goto_eq MauvilleCity_GameCorner_EventScript_21023D + goto_if_eq MauvilleCity_GameCorner_EventScript_21023D msgbox MauvilleCity_GameCorner_Text_210830, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end MauvilleCity_GameCorner_EventScript_21023D:: @ 821023D - checkflag FLAG_0x0E1 - goto_eq MauvilleCity_GameCorner_EventScript_21026B + goto_if_set FLAG_0x0E1, MauvilleCity_GameCorner_EventScript_21026B checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 1 - goto_if 4, MauvilleCity_GameCorner_EventScript_21026B + goto_if_ge MauvilleCity_GameCorner_EventScript_21026B setflag FLAG_0x0E1 givecoins 20 msgbox MauvilleCity_GameCorner_Text_2108A0, MSGBOX_DEFAULT @@ -538,7 +536,7 @@ MauvilleCity_GameCorner_EventScript_2102D6:: @ 82102D6 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 0 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -549,7 +547,7 @@ MauvilleCity_GameCorner_EventScript_2102F6:: @ 82102F6 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 1 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -560,7 +558,7 @@ MauvilleCity_GameCorner_EventScript_210316:: @ 8210316 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 2 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -571,7 +569,7 @@ MauvilleCity_GameCorner_EventScript_210336:: @ 8210336 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 3 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -582,7 +580,7 @@ MauvilleCity_GameCorner_EventScript_210356:: @ 8210356 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 4 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -593,7 +591,7 @@ MauvilleCity_GameCorner_EventScript_210376:: @ 8210376 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 5 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -604,7 +602,7 @@ MauvilleCity_GameCorner_EventScript_210396:: @ 8210396 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 6 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -615,7 +613,7 @@ MauvilleCity_GameCorner_EventScript_2103B6:: @ 82103B6 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 7 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -626,7 +624,7 @@ MauvilleCity_GameCorner_EventScript_2103D6:: @ 82103D6 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 8 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -637,7 +635,7 @@ MauvilleCity_GameCorner_EventScript_2103F6:: @ 82103F6 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 9 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -648,7 +646,7 @@ MauvilleCity_GameCorner_EventScript_210416:: @ 8210416 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 10 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -659,7 +657,7 @@ MauvilleCity_GameCorner_EventScript_210436:: @ 8210436 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 11 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index fbc1d8b0b..335a27f56 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -3,8 +3,7 @@ MauvilleCity_Gym_MapScripts:: @ 820DD6E .byte 0 MauvilleCity_Gym_MapScript1_20DD74: @ 820DD74 - checkflag FLAG_0x4F2 - goto_eq MauvilleCity_Gym_EventScript_20DEE7 + goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20DEE7 switch VAR_0x4093 case 0, MauvilleCity_Gym_EventScript_20DDBA case 1, MauvilleCity_Gym_EventScript_20DEAF @@ -14,8 +13,7 @@ MauvilleCity_Gym_MapScript1_20DD74: @ 820DD74 end MauvilleCity_Gym_EventScript_20DDBA:: @ 820DDBA - checkflag FLAG_0x063 - goto_eq MauvilleCity_Gym_EventScript_20DDC4 + goto_if_set FLAG_0x063, MauvilleCity_Gym_EventScript_20DDC4 end MauvilleCity_Gym_EventScript_20DDC4:: @ 820DDC4 @@ -79,11 +77,10 @@ MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB trainerbattle_single TRAINER_WATTSON_1, MauvilleCity_Gym_Text_20E602, MauvilleCity_Gym_Text_20E734, MauvilleCity_Gym_EventScript_20DF2B, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq MauvilleCity_Gym_EventScript_20DFDE - checkflag FLAG_0x0A7 - goto_if 0, MauvilleCity_Gym_EventScript_20DF8D + goto_if_eq MauvilleCity_Gym_EventScript_20DFDE + goto_if_unset FLAG_0x0A7, MauvilleCity_Gym_EventScript_20DF8D compare VAR_0x40BA, 2 - goto_eq MauvilleCity_Gym_EventScript_20DFD4 + goto_if_eq MauvilleCity_Gym_EventScript_20DFD4 msgbox MauvilleCity_Gym_Text_20E8E3, MSGBOX_DEFAULT release end @@ -99,7 +96,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B setflag FLAG_BADGE03_GET addvar VAR_0x4085, 1 compare VAR_0x4085, 6 - call_if 1, MauvilleCity_Gym_EventScript_271E84 + call_if_eq MauvilleCity_Gym_EventScript_271E84 setvar VAR_0x8008, 3 call MauvilleCity_Gym_EventScript_271F43 special MauvilleGymSpecial3 @@ -120,7 +117,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D giveitem_std ITEM_TM34 compare VAR_RESULT, 0 - goto_eq MauvilleCity_Gym_EventScript_272054 + goto_if_eq MauvilleCity_Gym_EventScript_272054 msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT setflag FLAG_0x0A7 release @@ -129,7 +126,7 @@ MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D MauvilleCity_Gym_EventScript_20DFB1:: @ 820DFB1 giveitem_std ITEM_TM34 compare VAR_RESULT, 0 - goto_eq MauvilleCity_Gym_EventScript_27205E + goto_if_eq MauvilleCity_Gym_EventScript_27205E msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT setflag FLAG_0x0A7 return @@ -146,10 +143,9 @@ MauvilleCity_Gym_EventScript_20DFDE:: @ 820DFDE MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9 lockall - checkflag FLAG_0x4F2 - goto_eq MauvilleCity_Gym_EventScript_20E0AD + goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20E0AD compare VAR_0x4093, 1 - goto_eq MauvilleCity_Gym_EventScript_20E0AD + goto_if_eq MauvilleCity_Gym_EventScript_20E0AD setvar VAR_0x4093, 1 setvar VAR_0x8004, 0 goto MauvilleCity_Gym_EventScript_20E08D @@ -157,10 +153,9 @@ MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9 MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E lockall - checkflag FLAG_0x4F2 - goto_eq MauvilleCity_Gym_EventScript_20E0AD + goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20E0AD compare VAR_0x4093, 2 - goto_eq MauvilleCity_Gym_EventScript_20E0AD + goto_if_eq MauvilleCity_Gym_EventScript_20E0AD setvar VAR_0x4093, 2 setvar VAR_0x8004, 1 goto MauvilleCity_Gym_EventScript_20E08D @@ -168,10 +163,9 @@ MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E MauvilleCity_Gym_EventScript_20E043:: @ 820E043 lockall - checkflag FLAG_0x4F2 - goto_eq MauvilleCity_Gym_EventScript_20E0AD + goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20E0AD compare VAR_0x4093, 3 - goto_eq MauvilleCity_Gym_EventScript_20E0AD + goto_if_eq MauvilleCity_Gym_EventScript_20E0AD setvar VAR_0x4093, 3 setvar VAR_0x8004, 2 goto MauvilleCity_Gym_EventScript_20E08D @@ -179,10 +173,9 @@ MauvilleCity_Gym_EventScript_20E043:: @ 820E043 MauvilleCity_Gym_EventScript_20E068:: @ 820E068 lockall - checkflag FLAG_0x4F2 - goto_eq MauvilleCity_Gym_EventScript_20E0AD + goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20E0AD compare VAR_0x4093, 4 - goto_eq MauvilleCity_Gym_EventScript_20E0AD + goto_if_eq MauvilleCity_Gym_EventScript_20E0AD setvar VAR_0x4093, 4 setvar VAR_0x8004, 3 goto MauvilleCity_Gym_EventScript_20E08D @@ -193,10 +186,8 @@ MauvilleCity_Gym_EventScript_20E08D:: @ 820E08D special MauvilleGymSpecial1 special DrawWholeMapView playse SE_KI_GASYAN - checkflag FLAG_0x063 - goto_eq MauvilleCity_Gym_EventScript_20E0B4 - checkflag FLAG_0x063 - goto_if 0, MauvilleCity_Gym_EventScript_20E0AF + goto_if_set FLAG_0x063, MauvilleCity_Gym_EventScript_20E0B4 + goto_if_unset FLAG_0x063, MauvilleCity_Gym_EventScript_20E0AF releaseall end @@ -242,8 +233,7 @@ MauvilleCity_Gym_EventScript_20E115:: @ 820E115 MauvilleCity_Gym_EventScript_20E12C:: @ 820E12C lock faceplayer - checkflag FLAG_0x4F2 - goto_eq MauvilleCity_Gym_EventScript_20E141 + goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20E141 msgbox MauvilleCity_Gym_Text_20E17F, MSGBOX_DEFAULT release end @@ -255,15 +245,13 @@ MauvilleCity_Gym_EventScript_20E141:: @ 820E141 MauvilleCity_Gym_EventScript_20E14B:: @ 820E14B lockall - checkflag FLAG_BADGE03_GET - goto_eq MauvilleCity_Gym_EventScript_20E16B + goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_20E16B goto MauvilleCity_Gym_EventScript_20E175 end MauvilleCity_Gym_EventScript_20E15B:: @ 820E15B lockall - checkflag FLAG_BADGE03_GET - goto_eq MauvilleCity_Gym_EventScript_20E16B + goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_20E16B goto MauvilleCity_Gym_EventScript_20E175 end diff --git a/data/maps/MauvilleCity_House1/scripts.inc b/data/maps/MauvilleCity_House1/scripts.inc index d5605e5d7..0168f2e9b 100644 --- a/data/maps/MauvilleCity_House1/scripts.inc +++ b/data/maps/MauvilleCity_House1/scripts.inc @@ -4,8 +4,7 @@ MauvilleCity_House1_MapScripts:: @ 820F975 MauvilleCity_House1_EventScript_20F976:: @ 820F976 lock faceplayer - checkflag FLAG_0x06B - goto_eq MauvilleCity_House1_EventScript_20F9A5 + goto_if_set FLAG_0x06B, MauvilleCity_House1_EventScript_20F9A5 msgbox MauvilleCity_House1_Text_20F9AF, MSGBOX_DEFAULT giveitem_std ITEM_HM06 setflag FLAG_0x06B diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc index 2256fd1fe..288e50725 100644 --- a/data/maps/MauvilleCity_House2/scripts.inc +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -4,12 +4,11 @@ MauvilleCity_House2_MapScripts:: @ 8210C5C MauvilleCity_House2_EventScript_210C5D:: @ 8210C5D lock faceplayer - checkflag FLAG_0x102 - goto_eq MauvilleCity_House2_EventScript_210CDA + goto_if_set FLAG_0x102, MauvilleCity_House2_EventScript_210CDA msgbox MauvilleCity_House2_Text_210CEE, MSGBOX_DEFAULT checkitem ITEM_HARBOR_MAIL, 1 compare VAR_RESULT, 1 - goto_eq MauvilleCity_House2_EventScript_210C82 + goto_if_eq MauvilleCity_House2_EventScript_210C82 release end @@ -21,9 +20,9 @@ MauvilleCity_House2_EventScript_210C82:: @ 8210C82 waitmovement 0 msgbox MauvilleCity_House2_Text_210D76, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq MauvilleCity_House2_EventScript_210CB8 + goto_if_eq MauvilleCity_House2_EventScript_210CB8 compare VAR_RESULT, 0 - goto_eq MauvilleCity_House2_EventScript_210CE4 + goto_if_eq MauvilleCity_House2_EventScript_210CE4 end MauvilleCity_House2_EventScript_210CB8:: @ 8210CB8 diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index 23afa4845..7732e8e7d 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -3,8 +3,7 @@ MeteorFalls_1F_1R_MapScripts:: @ 822BD2A .byte 0 MeteorFalls_1F_1R_MapScript1_22BD30: @ 822BD30 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, MeteorFalls_1F_1R_EventScript_22BD3A + call_if_set FLAG_SYS_GAME_CLEAR, MeteorFalls_1F_1R_EventScript_22BD3A end MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A @@ -17,7 +16,7 @@ MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F lockall playbgm MUS_MGM0, 0 - applymovement 255, MeteorFalls_1F_1R_Movement_2725B0 + applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_2725B0 waitmovement 0 delay 30 applymovement 5, MeteorFalls_1F_1R_Movement_2725B4 @@ -38,7 +37,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22BFE4, MSGBOX_DEFAULT closemessage - applymovement 255, MeteorFalls_1F_1R_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_2725A4 applymovement 5, MeteorFalls_1F_1R_Movement_2725A4 applymovement 6, MeteorFalls_1F_1R_Movement_2725A4 waitmovement 0 @@ -55,7 +54,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F waitmovement 0 msgbox MeteorFalls_1F_1R_Text_22C04E, MSGBOX_DEFAULT closemessage - applymovement 255, MeteorFalls_1F_1R_Movement_22BF1D + applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_22BF1D applymovement 5, MeteorFalls_1F_1R_Movement_22BEC4 applymovement 6, MeteorFalls_1F_1R_Movement_22BECE waitmovement 0 @@ -221,8 +220,7 @@ MeteorFalls_1F_1R_Movement_22BF1D: @ 822BF1D MeteorFalls_1F_1R_EventScript_22BF25:: @ 822BF25 lock faceplayer - checkflag FLAG_0x0F4 - goto_eq MeteorFalls_1F_1R_EventScript_22BF3D + goto_if_set FLAG_0x0F4, MeteorFalls_1F_1R_EventScript_22BF3D setflag FLAG_0x0F4 msgbox MeteorFalls_1F_1R_Text_22C342, MSGBOX_DEFAULT release diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc index c1427d1f2..fee636e0b 100644 --- a/data/maps/MeteorFalls_1F_2R/scripts.inc +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -5,7 +5,7 @@ MeteorFalls_1F_2R_EventScript_22C4DE:: @ 822C4DE trainerbattle_single TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_22C608, MeteorFalls_1F_2R_Text_22C678, MeteorFalls_1F_2R_EventScript_22C50A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq MeteorFalls_1F_2R_EventScript_22C529 + goto_if_eq MeteorFalls_1F_2R_EventScript_22C529 msgbox MeteorFalls_1F_2R_Text_22C6A3, MSGBOX_DEFAULT release end @@ -27,7 +27,7 @@ MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540 trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22C843, MeteorFalls_1F_2R_Text_22C89C, MeteorFalls_1F_2R_Text_22C92B, MeteorFalls_1F_2R_EventScript_22C570 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq MeteorFalls_1F_2R_EventScript_22C589 + goto_if_eq MeteorFalls_1F_2R_EventScript_22C589 msgbox MeteorFalls_1F_2R_Text_22C8C1, MSGBOX_DEFAULT release end @@ -47,7 +47,7 @@ MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4 trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22C9E6, MeteorFalls_1F_2R_Text_22CA44, MeteorFalls_1F_2R_Text_22CACD, MeteorFalls_1F_2R_EventScript_22C5D4 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq MeteorFalls_1F_2R_EventScript_22C5ED + goto_if_eq MeteorFalls_1F_2R_EventScript_22C5ED msgbox MeteorFalls_1F_2R_Text_22CA70, MSGBOX_DEFAULT release end diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc index 738a7b6cd..854105932 100644 --- a/data/maps/MeteorFalls_StevensCave/scripts.inc +++ b/data/maps/MeteorFalls_StevensCave/scripts.inc @@ -3,8 +3,7 @@ MeteorFalls_StevensCave_MapScripts:: @ 823B181 MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 lock - checkflag FLAG_0x4F8 - goto_eq MeteorFalls_StevensCave_EventScript_23B1CD + goto_if_set FLAG_0x4F8, MeteorFalls_StevensCave_EventScript_23B1CD waitse playse SE_PIN applymovement 1, MeteorFalls_StevensCave_Movement_272598 diff --git a/data/maps/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc index e60180559..b64fb23a3 100644 --- a/data/maps/MirageTower_4F/scripts.inc +++ b/data/maps/MirageTower_4F/scripts.inc @@ -6,7 +6,7 @@ MirageTower_4F_EventScript_23AD48:: @ 823AD48 faceplayer msgbox MirageTower_4F_Text_23ADF9, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MirageTower_4F_EventScript_23AD7F + goto_if_eq MirageTower_4F_EventScript_23AD7F giveitem_std ITEM_ROOT_FOSSIL closemessage setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL @@ -27,7 +27,7 @@ MirageTower_4F_EventScript_23AD89:: @ 823AD89 faceplayer msgbox MirageTower_4F_Text_23AE98, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MirageTower_4F_EventScript_23ADC0 + goto_if_eq MirageTower_4F_EventScript_23ADC0 giveitem_std ITEM_CLAW_FOSSIL closemessage setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index fe037074f..54210e809 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -7,15 +7,13 @@ MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C clearflag FLAG_0x065 clearflag FLAG_0x066 clearflag FLAG_0x067 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, MossdeepCity_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, MossdeepCity_EventScript_27207A end MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2 lock faceplayer - checkflag FLAG_0x07B - goto_eq MossdeepCity_EventScript_1E4AC7 + goto_if_set FLAG_0x07B, MossdeepCity_EventScript_1E4AC7 msgbox MossdeepCity_Text_1E4E90, MSGBOX_DEFAULT release end @@ -28,8 +26,7 @@ MossdeepCity_EventScript_1E4AC7:: @ 81E4AC7 MossdeepCity_EventScript_1E4AD1:: @ 81E4AD1 lock faceplayer - checkflag FLAG_0x07B - goto_eq MossdeepCity_EventScript_1E4AE6 + goto_if_set FLAG_0x07B, MossdeepCity_EventScript_1E4AE6 msgbox MossdeepCity_Text_1E4F50, MSGBOX_DEFAULT release end @@ -227,15 +224,14 @@ MossdeepCity_EventScript_1E4C10:: @ 81E4C10 MossdeepCity_EventScript_1E4C26:: @ 81E4C26 lock faceplayer - checkflag FLAG_0x114 - goto_eq MossdeepCity_EventScript_1E4C68 + goto_if_set FLAG_0x114, MossdeepCity_EventScript_1E4C68 msgbox MossdeepCity_Text_1E4CED, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MossdeepCity_EventScript_1E4C72 + goto_if_eq MossdeepCity_EventScript_1E4C72 msgbox MossdeepCity_Text_1E4D5B, MSGBOX_DEFAULT giveitem_std ITEM_KINGS_ROCK compare VAR_RESULT, 0 - goto_eq MossdeepCity_EventScript_272054 + goto_if_eq MossdeepCity_EventScript_272054 setflag FLAG_0x114 release end @@ -260,22 +256,22 @@ MossdeepCity_EventScript_1E4C85:: @ 81E4C85 msgbox MossdeepCity_Text_1E5453, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 - call_if 1, MossdeepCity_EventScript_1E4CB0 + call_if_eq MossdeepCity_EventScript_1E4CB0 compare VAR_FACING, 4 - call_if 1, MossdeepCity_EventScript_1E4CC2 + call_if_eq MossdeepCity_EventScript_1E4CC2 addvar VAR_0x40D1, 1 removeobject 16 release end MossdeepCity_EventScript_1E4CB0:: @ 81E4CB0 - applymovement 255, MossdeepCity_Movement_1E4CD4 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_1E4CD4 applymovement 16, MossdeepCity_Movement_1E4CD8 waitmovement 0 return MossdeepCity_EventScript_1E4CC2:: @ 81E4CC2 - applymovement 255, MossdeepCity_Movement_1E4CD4 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_1E4CD4 applymovement 16, MossdeepCity_Movement_1E4CE2 waitmovement 0 return diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index f42b3f4e4..84157a362 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -3,26 +3,22 @@ MossdeepCity_Gym_MapScripts:: @ 8220800 .byte 0 MossdeepCity_Gym_MapScript1_220806: @ 8220806 - checkflag FLAG_0x064 - goto_eq MossdeepCity_Gym_EventScript_22083D + goto_if_set FLAG_0x064, MossdeepCity_Gym_EventScript_22083D goto MossdeepCity_Gym_EventScript_220815 end MossdeepCity_Gym_EventScript_220815:: @ 8220815 - checkflag FLAG_0x065 - goto_eq MossdeepCity_Gym_EventScript_220855 + goto_if_set FLAG_0x065, MossdeepCity_Gym_EventScript_220855 goto MossdeepCity_Gym_EventScript_220824 end MossdeepCity_Gym_EventScript_220824:: @ 8220824 - checkflag FLAG_0x066 - goto_eq MossdeepCity_Gym_EventScript_22086D + goto_if_set FLAG_0x066, MossdeepCity_Gym_EventScript_22086D goto MossdeepCity_Gym_EventScript_220833 end MossdeepCity_Gym_EventScript_220833:: @ 8220833 - checkflag FLAG_0x067 - goto_eq MossdeepCity_Gym_EventScript_220885 + goto_if_set FLAG_0x067, MossdeepCity_Gym_EventScript_220885 end MossdeepCity_Gym_EventScript_22083D:: @ 822083D @@ -52,9 +48,8 @@ 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 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq MossdeepCity_Gym_EventScript_22097E - checkflag FLAG_0x0AB - goto_if 0, MossdeepCity_Gym_EventScript_220937 + goto_if_eq MossdeepCity_Gym_EventScript_22097E + goto_if_unset FLAG_0x0AB, MossdeepCity_Gym_EventScript_220937 msgbox MossdeepCity_Gym_Text_221B1D, MSGBOX_DEFAULT release end @@ -94,7 +89,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 MossdeepCity_Gym_EventScript_220937:: @ 8220937 giveitem_std ITEM_TM04 compare VAR_RESULT, 0 - goto_eq MossdeepCity_Gym_EventScript_272054 + goto_if_eq MossdeepCity_Gym_EventScript_272054 msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT setflag FLAG_0x0AB release @@ -103,7 +98,7 @@ MossdeepCity_Gym_EventScript_220937:: @ 8220937 MossdeepCity_Gym_EventScript_22095B:: @ 822095B giveitem_std ITEM_TM04 compare VAR_RESULT, 0 - goto_eq MossdeepCity_Gym_EventScript_27205E + goto_if_eq MossdeepCity_Gym_EventScript_27205E msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT setflag FLAG_0x0AB return @@ -115,10 +110,9 @@ MossdeepCity_Gym_EventScript_22097E:: @ 822097E MossdeepCity_Gym_EventScript_220999:: @ 8220999 lockall - checkflag FLAG_0x064 - goto_eq MossdeepCity_Gym_EventScript_2209D0 + goto_if_set FLAG_0x064, MossdeepCity_Gym_EventScript_2209D0 setflag FLAG_0x064 - applymovement 255, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 5, 5, 516, 0 setmetatile 2, 7, 569, 1 @@ -133,7 +127,7 @@ MossdeepCity_Gym_EventScript_2209C8:: @ 82209C8 MossdeepCity_Gym_EventScript_2209D0:: @ 82209D0 clearflag FLAG_0x064 - applymovement 255, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 5, 5, 524, 0 setmetatile 2, 7, 568, 1 @@ -142,10 +136,9 @@ MossdeepCity_Gym_EventScript_2209D0:: @ 82209D0 MossdeepCity_Gym_EventScript_2209F5:: @ 82209F5 lockall - checkflag FLAG_0x065 - goto_eq MossdeepCity_Gym_EventScript_220A24 + goto_if_set FLAG_0x065, MossdeepCity_Gym_EventScript_220A24 setflag FLAG_0x065 - applymovement 255, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 8, 14, 516, 0 setmetatile 8, 10, 569, 1 @@ -154,7 +147,7 @@ MossdeepCity_Gym_EventScript_2209F5:: @ 82209F5 MossdeepCity_Gym_EventScript_220A24:: @ 8220A24 clearflag FLAG_0x065 - applymovement 255, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 8, 14, 517, 0 setmetatile 8, 10, 568, 1 @@ -163,10 +156,9 @@ MossdeepCity_Gym_EventScript_220A24:: @ 8220A24 MossdeepCity_Gym_EventScript_220A49:: @ 8220A49 lockall - checkflag FLAG_0x066 - goto_eq MossdeepCity_Gym_EventScript_220A78 + goto_if_set FLAG_0x066, MossdeepCity_Gym_EventScript_220A78 setflag FLAG_0x066 - applymovement 255, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 15, 17, 524, 0 setmetatile 17, 15, 569, 1 @@ -175,7 +167,7 @@ MossdeepCity_Gym_EventScript_220A49:: @ 8220A49 MossdeepCity_Gym_EventScript_220A78:: @ 8220A78 clearflag FLAG_0x066 - applymovement 255, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 15, 17, 516, 0 setmetatile 17, 15, 568, 1 @@ -184,10 +176,9 @@ MossdeepCity_Gym_EventScript_220A78:: @ 8220A78 MossdeepCity_Gym_EventScript_220A9D:: @ 8220A9D lockall - checkflag FLAG_0x067 - goto_eq MossdeepCity_Gym_EventScript_220ACC + goto_if_set FLAG_0x067, MossdeepCity_Gym_EventScript_220ACC setflag FLAG_0x067 - applymovement 255, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 1, 23, 525, 0 setmetatile 5, 24, 569, 1 @@ -196,7 +187,7 @@ MossdeepCity_Gym_EventScript_220A9D:: @ 8220A9D MossdeepCity_Gym_EventScript_220ACC:: @ 8220ACC clearflag FLAG_0x067 - applymovement 255, MossdeepCity_Gym_Movement_220C30 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 1, 23, 516, 0 setmetatile 5, 24, 568, 1 @@ -273,8 +264,7 @@ MossdeepCity_Gym_EventScript_220BFA:: @ 8220BFA MossdeepCity_Gym_EventScript_220C11:: @ 8220C11 lock faceplayer - checkflag FLAG_0x4F6 - goto_eq MossdeepCity_Gym_EventScript_220C26 + goto_if_set FLAG_0x4F6, MossdeepCity_Gym_EventScript_220C26 msgbox MossdeepCity_Gym_Text_220CD5, MSGBOX_DEFAULT release end @@ -291,15 +281,13 @@ MossdeepCity_Gym_Movement_220C30: @ 8220C30 MossdeepCity_Gym_EventScript_220C33:: @ 8220C33 lockall - checkflag FLAG_BADGE07_GET - goto_eq MossdeepCity_Gym_EventScript_220C53 + goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_220C53 goto MossdeepCity_Gym_EventScript_220C5D end MossdeepCity_Gym_EventScript_220C43:: @ 8220C43 lockall - checkflag FLAG_BADGE07_GET - goto_eq MossdeepCity_Gym_EventScript_220C53 + goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_220C53 goto MossdeepCity_Gym_EventScript_220C5D end diff --git a/data/maps/MossdeepCity_House1/scripts.inc b/data/maps/MossdeepCity_House1/scripts.inc index 4a5da3b16..60d612fb2 100644 --- a/data/maps/MossdeepCity_House1/scripts.inc +++ b/data/maps/MossdeepCity_House1/scripts.inc @@ -8,7 +8,7 @@ MossdeepCity_House1_EventScript_221FD6:: @ 8221FD6 msgbox MossdeepCity_House1_Text_22200F, MSGBOX_DEFAULT specialvar VAR_RESULT, GetPokeblockNameByMonNature compare VAR_RESULT, 0 - goto_eq MossdeepCity_House1_EventScript_221FFC + goto_if_eq MossdeepCity_House1_EventScript_221FFC msgbox MossdeepCity_House1_Text_22201D, MSGBOX_DEFAULT release end diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc index 863bb4eda..c2c5ff620 100644 --- a/data/maps/MossdeepCity_House2/scripts.inc +++ b/data/maps/MossdeepCity_House2/scripts.inc @@ -20,9 +20,9 @@ MossdeepCity_House2_EventScript_2220F1:: @ 82220F1 setflag FLAG_0x0E0 clearflag FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL compare VAR_FACING, 2 - call_if 1, MossdeepCity_House2_EventScript_222124 + call_if_eq MossdeepCity_House2_EventScript_222124 compare VAR_FACING, 3 - call_if 1, MossdeepCity_House2_EventScript_22212F + call_if_eq MossdeepCity_House2_EventScript_22212F removeobject 3 release end diff --git a/data/maps/MossdeepCity_House3/scripts.inc b/data/maps/MossdeepCity_House3/scripts.inc index 2d4fd04ad..c61a0751c 100644 --- a/data/maps/MossdeepCity_House3/scripts.inc +++ b/data/maps/MossdeepCity_House3/scripts.inc @@ -4,11 +4,10 @@ MossdeepCity_House3_MapScripts:: @ 82225C2 MossdeepCity_House3_EventScript_2225C3:: @ 82225C3 lock faceplayer - checkflag FLAG_0x098 - goto_eq MossdeepCity_House3_EventScript_222602 + goto_if_set FLAG_0x098, MossdeepCity_House3_EventScript_222602 msgbox MossdeepCity_House3_Text_222616, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MossdeepCity_House3_EventScript_22260C + goto_if_eq MossdeepCity_House3_EventScript_22260C msgbox MossdeepCity_House3_Text_2226B6, MSGBOX_DEFAULT giveitem_std ITEM_SUPER_ROD setflag FLAG_0x098 diff --git a/data/maps/MossdeepCity_House4/scripts.inc b/data/maps/MossdeepCity_House4/scripts.inc index 627340b5c..1763a9c46 100644 --- a/data/maps/MossdeepCity_House4/scripts.inc +++ b/data/maps/MossdeepCity_House4/scripts.inc @@ -4,8 +4,7 @@ MossdeepCity_House4_MapScripts:: @ 8222DD7 MossdeepCity_House4_EventScript_222DD8:: @ 8222DD8 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq MossdeepCity_House4_EventScript_222DED + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_House4_EventScript_222DED msgbox MossdeepCity_House4_Text_222E31, MSGBOX_DEFAULT release end @@ -20,7 +19,7 @@ MossdeepCity_House4_EventScript_222DF7:: @ 8222DF7 faceplayer special sub_80E8BC8 compare VAR_RESULT, 0 - goto_eq MossdeepCity_House4_EventScript_222E14 + goto_if_eq MossdeepCity_House4_EventScript_222E14 special GetSecretBaseNearbyMapName msgbox MossdeepCity_House4_Text_222ECC, MSGBOX_DEFAULT release diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 32eac1540..6d8b7bd47 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -5,7 +5,7 @@ MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41 MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222F58 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222F58 end MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58 @@ -19,11 +19,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58 setobjectmovementtype 1, 10 setobjectmovementtype 2, 10 compare VAR_0x409E, 1 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA compare VAR_0x409E, 2 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FB2 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FB2 compare VAR_0x409E, 3 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FBA + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FBA end MossdeepCity_SpaceCenter_1F_EventScript_222FAA:: @ 8222FAA @@ -40,7 +40,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FBA:: @ 8222FBA MossdeepCity_SpaceCenter_1F_MapScript1_222FC2: @ 8222FC2 compare VAR_0x405D, 2 - goto_if 3, MossdeepCity_SpaceCenter_1F_EventScript_222FCE + goto_if_le MossdeepCity_SpaceCenter_1F_EventScript_222FCE end MossdeepCity_SpaceCenter_1F_EventScript_222FCE:: @ 8222FCE @@ -51,14 +51,14 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 lock faceplayer compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223024 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223024 dodailyevents specialvar VAR_RESULT, GetWeekCount buffernumberstring 0, VAR_RESULT compare VAR_RESULT, 0 - call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223012 + call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223012 compare VAR_RESULT, 1 - call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_22301B + call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22301B closemessage applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 waitmovement 0 @@ -78,9 +78,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 specialvar VAR_RESULT, GetWeekCount buffernumberstring 0, VAR_RESULT compare VAR_RESULT, 0 - call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223051 + call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_223051 compare VAR_RESULT, 1 - call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_22305A + call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22305A closemessage applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 waitmovement 0 @@ -99,7 +99,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063 lock faceplayer compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22307A + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_22307A msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, MSGBOX_DEFAULT release end @@ -115,13 +115,12 @@ MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E lock faceplayer compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA - checkflag FLAG_0x0C0 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2230D0 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA + goto_if_set FLAG_0x0C0, MossdeepCity_SpaceCenter_1F_EventScript_2230D0 msgbox MossdeepCity_SpaceCenter_1F_Text_223540, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 setflag FLAG_0x0C0 msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, MSGBOX_DEFAULT release @@ -133,12 +132,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_2230D0:: @ 82230D0 end MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA - checkflag FLAG_0x0C0 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223119 + goto_if_set FLAG_0x0C0, MossdeepCity_SpaceCenter_1F_EventScript_223119 msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 setflag FLAG_0x0C0 msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 @@ -156,12 +154,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_223119:: @ 8223119 MossdeepCity_SpaceCenter_1F_EventScript_22312D:: @ 822312D lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223154 + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_223154 compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22315E + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_22315E compare VAR_0x405D, 2 - goto_if 0, MossdeepCity_SpaceCenter_1F_EventScript_223154 + goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_223154 goto MossdeepCity_SpaceCenter_1F_EventScript_22315E end @@ -178,12 +175,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_22315E:: @ 822315E MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22318F + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_22318F compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2231A4 + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2231A4 compare VAR_0x405D, 2 - goto_if 0, MossdeepCity_SpaceCenter_1F_EventScript_22318F + goto_if_lt MossdeepCity_SpaceCenter_1F_EventScript_22318F goto MossdeepCity_SpaceCenter_1F_EventScript_2231A4 end @@ -236,8 +232,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223208:: @ 8223208 MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F lock faceplayer - checkflag FLAG_0x0BF - goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22326E + goto_if_set FLAG_0x0BF, MossdeepCity_SpaceCenter_1F_EventScript_22326E msgbox MossdeepCity_SpaceCenter_1F_Text_223B90, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_23, MossdeepCity_SpaceCenter_1F_Text_223BC2 setflag FLAG_0x0BF diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 3c31ec06c..c4b106589 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -5,9 +5,9 @@ MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58 MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63 compare VAR_0x405D, 2 - call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_223D7A + call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D7A compare VAR_0x409F, 2 - call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_223D9F + call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D9F end MossdeepCity_SpaceCenter_2F_EventScript_223D7A:: @ 8223D7A @@ -32,16 +32,16 @@ MossdeepCity_SpaceCenter_2F_MapScript2_223DB5: @ 8223DB5 MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF playse SE_PIN - applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_272598 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_272598 waitmovement 0 - applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_27259A + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_27259A waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223E09 + goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223E09 msgbox MossdeepCity_SpaceCenter_2F_Text_2243FE, MSGBOX_DEFAULT closemessage - applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_223E07 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_223E07 waitmovement 0 warp MAP_MOSSDEEP_CITY_SPACE_CENTER_1F, 255, 13, 1 waitstate @@ -57,13 +57,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 trainerbattle_no_intro TRAINER_GRUNT_34, MossdeepCity_SpaceCenter_2F_Text_224461 applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85 waitmovement 0 - applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_2725A4 waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_35, MossdeepCity_SpaceCenter_2F_Text_224499 applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81 waitmovement 0 - applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_2725A8 waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1 @@ -97,12 +97,11 @@ MossdeepCity_SpaceCenter_2F_Movement_223E89: @ 8223E89 MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EB4 + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223EB4 compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EBE + goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223EBE compare VAR_0x405D, 2 - goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223EB4 + goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223EB4 goto MossdeepCity_SpaceCenter_2F_EventScript_223EBE end @@ -119,12 +118,11 @@ MossdeepCity_SpaceCenter_2F_EventScript_223EBE:: @ 8223EBE MossdeepCity_SpaceCenter_2F_EventScript_223EC8:: @ 8223EC8 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EEF + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223EEF compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EF9 + goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223EF9 compare VAR_0x405D, 2 - goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223EEF + goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223EEF goto MossdeepCity_SpaceCenter_2F_EventScript_223EF9 end @@ -141,12 +139,11 @@ MossdeepCity_SpaceCenter_2F_EventScript_223EF9:: @ 8223EF9 MossdeepCity_SpaceCenter_2F_EventScript_223F03:: @ 8223F03 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223F2A + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_223F2A compare VAR_0x405D, 2 - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223F34 + goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223F34 compare VAR_0x405D, 2 - goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223F2A + goto_if_lt MossdeepCity_SpaceCenter_2F_EventScript_223F2A goto MossdeepCity_SpaceCenter_2F_EventScript_223F34 end @@ -189,8 +186,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F6F:: @ 8223F6F MossdeepCity_SpaceCenter_2F_EventScript_223F7A:: @ 8223F7A lockall - checkflag FLAG_0x0CD - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223FDA + goto_if_set FLAG_0x0CD, MossdeepCity_SpaceCenter_2F_EventScript_223FDA setflag FLAG_0x0CD msgbox MossdeepCity_SpaceCenter_2F_Text_2246B2, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_2F_Text_2246F0, MSGBOX_DEFAULT @@ -239,7 +235,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C + goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C msgbox MossdeepCity_SpaceCenter_2F_Text_224854, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA @@ -255,7 +251,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C special sub_80F9438 waitstate compare VAR_RESULT, 0 - goto_if 5, MossdeepCity_SpaceCenter_2F_EventScript_224032 + goto_if_ne MossdeepCity_SpaceCenter_2F_EventScript_224032 special LoadPlayerParty goto MossdeepCity_SpaceCenter_2F_EventScript_223FDA @@ -354,9 +350,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_224175:: @ 8224175 lockall checkplayergender compare VAR_RESULT, 0 - call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_224193 + call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_224193 compare VAR_RESULT, 1 - call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_22419A + call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22419A closemessage clearflag FLAG_0x075 releaseall diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 297af90d3..8db53c1c6 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -5,8 +5,7 @@ MossdeepCity_StevensHouse_MapScripts:: @ 8222784 .byte 0 MossdeepCity_StevensHouse_MapScript1_222794: @ 8222794 - checkflag FLAG_SYS_GAME_CLEAR - call_if 0, MossdeepCity_StevensHouse_EventScript_22279E + call_if_unset FLAG_SYS_GAME_CLEAR, MossdeepCity_StevensHouse_EventScript_22279E end MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E @@ -15,7 +14,7 @@ MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8 compare VAR_0x40C6, 2 - call_if 1, MossdeepCity_StevensHouse_EventScript_2227B4 + call_if_eq MossdeepCity_StevensHouse_EventScript_2227B4 end MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4 @@ -75,7 +74,7 @@ MossdeepCity_StevensHouse_EventScript_222841:: @ 8222841 lockall msgbox MossdeepCity_StevensHouse_Text_222B9E, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MossdeepCity_StevensHouse_EventScript_22285B + goto_if_eq MossdeepCity_StevensHouse_EventScript_22285B goto MossdeepCity_StevensHouse_EventScript_222865 end @@ -88,9 +87,9 @@ MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865 setvar VAR_TEMP_1, 398 givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 - goto_eq MossdeepCity_StevensHouse_EventScript_222895 + goto_if_eq MossdeepCity_StevensHouse_EventScript_222895 compare VAR_RESULT, 1 - goto_eq MossdeepCity_StevensHouse_EventScript_2228BD + goto_if_eq MossdeepCity_StevensHouse_EventScript_2228BD goto MossdeepCity_StevensHouse_EventScript_273811 end @@ -98,7 +97,7 @@ MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895 call MossdeepCity_StevensHouse_EventScript_2228EB msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MossdeepCity_StevensHouse_EventScript_222901 + goto_if_eq MossdeepCity_StevensHouse_EventScript_222901 call MossdeepCity_StevensHouse_EventScript_27378B call MossdeepCity_StevensHouse_EventScript_2723DD goto MossdeepCity_StevensHouse_EventScript_222901 @@ -108,7 +107,7 @@ MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD call MossdeepCity_StevensHouse_EventScript_2228EB msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MossdeepCity_StevensHouse_EventScript_2228E0 + goto_if_eq MossdeepCity_StevensHouse_EventScript_2228E0 call MossdeepCity_StevensHouse_EventScript_273797 goto MossdeepCity_StevensHouse_EventScript_2228E0 end diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 88df5692e..6e7331660 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -14,10 +14,8 @@ MtChimney_MapScript1_22EDD2: @ 822EDD2 MtChimney_EventScript_22EDD5:: @ 822EDD5 lock faceplayer - checkflag FLAG_0x0DB - call_if 0, MtChimney_EventScript_22EDF9 - checkflag FLAG_0x0DB - call_if 1, MtChimney_EventScript_22EE02 + call_if_unset FLAG_0x0DB, MtChimney_EventScript_22EDF9 + call_if_set FLAG_0x0DB, MtChimney_EventScript_22EE02 closemessage applymovement 1, MtChimney_Movement_2725A2 waitmovement 0 @@ -59,17 +57,17 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B setobjectxyperm 1, 10, 12 addobject 1 compare VAR_FACING, 4 - call_if 1, MtChimney_EventScript_22EEC7 + call_if_eq MtChimney_EventScript_22EEC7 compare VAR_FACING, 2 - call_if 1, MtChimney_EventScript_22EED2 - applymovement 255, MtChimney_Movement_2725A4 + call_if_eq MtChimney_EventScript_22EED2 + applymovement EVENT_OBJ_ID_PLAYER, MtChimney_Movement_2725A4 waitmovement 0 msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT closemessage compare VAR_FACING, 4 - call_if 1, MtChimney_EventScript_22EEDD + call_if_eq MtChimney_EventScript_22EEDD compare VAR_FACING, 2 - call_if 1, MtChimney_EventScript_22EEE8 + call_if_eq MtChimney_EventScript_22EEE8 removeobject 1 setflag FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA setflag FLAG_0x08B @@ -105,17 +103,17 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3 showmoneybox 0, 0, 0 msgbox MtChimney_Text_22FE04, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MtChimney_EventScript_22EF69 + goto_if_eq MtChimney_EventScript_22EF69 checkmoney 0xc8, 0 compare VAR_RESULT, 0 - goto_eq MtChimney_EventScript_22EF76 + goto_if_eq MtChimney_EventScript_22EF76 msgbox MtChimney_Text_22FE4D, MSGBOX_DEFAULT checkitemspace ITEM_LAVA_COOKIE, 1 compare VAR_RESULT, 1 - call_if 1, MtChimney_EventScript_22EF5E + call_if_eq MtChimney_EventScript_22EF5E giveitem_std ITEM_LAVA_COOKIE compare VAR_RESULT, 0 - goto_eq MtChimney_EventScript_22EF51 + goto_if_eq MtChimney_EventScript_22EF51 hidemoneybox nop nop @@ -454,13 +452,11 @@ MtChimney_EventScript_22F0DB:: @ 822F0DB MtChimney_EventScript_22F0E4:: @ 822F0E4 lockall - checkflag FLAG_0x08B - goto_if 0, MtChimney_EventScript_22F137 - checkflag FLAG_0x073 - goto_eq MtChimney_EventScript_22F12D + goto_if_unset FLAG_0x08B, MtChimney_EventScript_22F137 + goto_if_set FLAG_0x073, MtChimney_EventScript_22F12D msgbox MtChimney_Text_22FF12, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MtChimney_EventScript_22F123 + goto_if_eq MtChimney_EventScript_22F123 msgbox MtChimney_Text_22FF66, MSGBOX_DEFAULT giveitem_std ITEM_METEORITE setflag FLAG_0x073 @@ -490,7 +486,7 @@ MtChimney_EventScript_22F14A:: @ 822F14A trainerbattle_single TRAINER_SHELBY_1, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq MtChimney_EventScript_22F195 + goto_if_eq MtChimney_EventScript_22F195 msgbox MtChimney_Text_2300A2, MSGBOX_DEFAULT release end @@ -532,7 +528,7 @@ MtChimney_EventScript_22F208:: @ 822F208 trainerbattle_single TRAINER_SAWYER_1, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq MtChimney_EventScript_22F253 + goto_if_eq MtChimney_EventScript_22F253 msgbox MtChimney_Text_230519, MSGBOX_DEFAULT release end diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 89fc9fd38..8e52438c9 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -5,7 +5,7 @@ MtChimney_CableCarStation_MapScripts:: @ 822ABFA MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05 compare VAR_0x40A3, 1 - call_if 1, MtChimney_CableCarStation_EventScript_22AC11 + call_if_eq MtChimney_CableCarStation_EventScript_22AC11 end MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11 @@ -19,7 +19,7 @@ MtChimney_CableCarStation_MapScript2_22AC1D: @ 822AC1D MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27 lockall - applymovement 255, MtChimney_CableCarStation_Movement_22ACB4 + applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_22ACB4 applymovement 1, MtChimney_CableCarStation_Movement_22ACAA waitmovement 0 setvar VAR_0x40A3, 0 @@ -33,16 +33,16 @@ MtChimney_CableCarStation_EventScript_22AC4B:: @ 822AC4B faceplayer msgbox MtChimney_CableCarStation_Text_22ACB9, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq MtChimney_CableCarStation_EventScript_22AC6C + goto_if_eq MtChimney_CableCarStation_EventScript_22AC6C compare VAR_RESULT, 0 - goto_eq MtChimney_CableCarStation_EventScript_22AC9B + goto_if_eq MtChimney_CableCarStation_EventScript_22AC9B end MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C msgbox MtChimney_CableCarStation_Text_22ACF8, MSGBOX_DEFAULT closemessage applymovement 1, MtChimney_CableCarStation_Movement_22ACA5 - applymovement 255, MtChimney_CableCarStation_Movement_22ACAF + applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_22ACAF waitmovement 0 setvar VAR_0x8004, 1 setvar VAR_0x40A3, 2 diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc index c5f24ccc0..b3f38c296 100644 --- a/data/maps/MtPyre_1F/scripts.inc +++ b/data/maps/MtPyre_1F/scripts.inc @@ -4,12 +4,11 @@ MtPyre_1F_MapScripts:: @ 8230F3E MtPyre_1F_EventScript_230F3F:: @ 8230F3F lock faceplayer - checkflag FLAG_0x11A - goto_eq MtPyre_1F_EventScript_230F6E + goto_if_set FLAG_0x11A, MtPyre_1F_EventScript_230F6E msgbox MtPyre_1F_Text_230F8A, MSGBOX_DEFAULT giveitem_std ITEM_CLEANSE_TAG compare VAR_RESULT, 0 - goto_eq MtPyre_1F_EventScript_272054 + goto_if_eq MtPyre_1F_EventScript_272054 setflag FLAG_0x11A release end diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc index 42c39705c..558ab9999 100644 --- a/data/maps/MtPyre_3F/scripts.inc +++ b/data/maps/MtPyre_3F/scripts.inc @@ -15,7 +15,7 @@ MtPyre_3F_EventScript_231781:: @ 8231781 trainerbattle_single TRAINER_GABRIELLE_1, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq MtPyre_3F_EventScript_2317CC + goto_if_eq MtPyre_3F_EventScript_2317CC msgbox MtPyre_3F_Text_23199B, MSGBOX_DEFAULT release end diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index 92178b21b..f59edd7b1 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -5,7 +5,7 @@ MtPyre_6F_EventScript_231D3B:: @ 8231D3B trainerbattle_single TRAINER_VALERIE_1, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq MtPyre_6F_EventScript_231D86 + goto_if_eq MtPyre_6F_EventScript_231D86 msgbox MtPyre_6F_Text_231DFC, MSGBOX_DEFAULT release end diff --git a/data/maps/MtPyre_Exterior/scripts.inc b/data/maps/MtPyre_Exterior/scripts.inc index 8f757ebb4..fe51946dc 100644 --- a/data/maps/MtPyre_Exterior/scripts.inc +++ b/data/maps/MtPyre_Exterior/scripts.inc @@ -9,20 +9,20 @@ MtPyre_Exterior_MapScript1_231FD2: @ 8231FD2 MtPyre_Exterior_EventScript_231FD8:: @ 8231FD8 getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_1, 12 - goto_if 0, MtPyre_Exterior_EventScript_231FE9 + goto_if_lt MtPyre_Exterior_EventScript_231FE9 return MtPyre_Exterior_EventScript_231FE9:: @ 8231FE9 - setweather 6 + setweather WEATHER_FOG_1 return MtPyre_Exterior_EventScript_231FED:: @ 8231FED - setweather 6 + setweather WEATHER_FOG_1 doweather end MtPyre_Exterior_EventScript_231FF2:: @ 8231FF2 - setweather 2 + setweather WEATHER_SUNNY doweather end diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 13caaab1e..31ae3348a 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -4,7 +4,7 @@ MtPyre_Summit_MapScripts:: @ 8231FF7 MtPyre_Summit_MapScript1_231FFD: @ 8231FFD compare VAR_0x40B9, 2 - call_if 1, MtPyre_Summit_EventScript_232009 + call_if_eq MtPyre_Summit_EventScript_232009 end MtPyre_Summit_EventScript_232009:: @ 8232009 @@ -32,17 +32,17 @@ MtPyre_Summit_EventScript_232030:: @ 8232030 MtPyre_Summit_EventScript_23203C:: @ 823203C playbgm MUS_AQA_0, 0 - applymovement 255, MtPyre_Summit_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725B2 waitmovement 0 applymovement 2, MtPyre_Summit_Movement_2725AA waitmovement 0 delay 50 compare VAR_0x8008, 0 - call_if 1, MtPyre_Summit_EventScript_2320E0 + call_if_eq MtPyre_Summit_EventScript_2320E0 compare VAR_0x8008, 1 - call_if 1, MtPyre_Summit_EventScript_2320EB + call_if_eq MtPyre_Summit_EventScript_2320EB compare VAR_0x8008, 2 - call_if 1, MtPyre_Summit_EventScript_2320EC + call_if_eq MtPyre_Summit_EventScript_2320EC msgbox MtPyre_Summit_Text_23281A, MSGBOX_DEFAULT closemessage fadescreen 1 @@ -58,11 +58,11 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C delay 20 setvar VAR_0x40B9, 1 compare VAR_0x8008, 0 - call_if 1, MtPyre_Summit_EventScript_2320F7 + call_if_eq MtPyre_Summit_EventScript_2320F7 compare VAR_0x8008, 1 - call_if 1, MtPyre_Summit_EventScript_23210C + call_if_eq MtPyre_Summit_EventScript_23210C compare VAR_0x8008, 2 - call_if 1, MtPyre_Summit_EventScript_232117 + call_if_eq MtPyre_Summit_EventScript_232117 msgbox MtPyre_Summit_Text_23290E, MSGBOX_DEFAULT giveitem_std ITEM_MAGMA_EMBLEM setflag FLAG_0x0D4 @@ -86,7 +86,7 @@ MtPyre_Summit_EventScript_2320EC:: @ 82320EC MtPyre_Summit_EventScript_2320F7:: @ 82320F7 applymovement 3, MtPyre_Summit_Movement_23212C waitmovement 0 - applymovement 255, MtPyre_Summit_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A8 waitmovement 0 return @@ -98,7 +98,7 @@ MtPyre_Summit_EventScript_23210C:: @ 823210C MtPyre_Summit_EventScript_232117:: @ 8232117 applymovement 3, MtPyre_Summit_Movement_232132 waitmovement 0 - applymovement 255, MtPyre_Summit_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A4 waitmovement 0 return @@ -131,22 +131,21 @@ MtPyre_Summit_Movement_232139: @ 8232139 MtPyre_Summit_EventScript_23213C:: @ 823213C lock faceplayer - checkflag FLAG_0x09E - goto_eq MtPyre_Summit_EventScript_232167 + goto_if_set FLAG_0x09E, MtPyre_Summit_EventScript_232167 msgbox MtPyre_Summit_Text_232E0C, MSGBOX_YESNO compare VAR_RESULT, 1 - call_if 1, MtPyre_Summit_EventScript_232187 + call_if_eq MtPyre_Summit_EventScript_232187 compare VAR_RESULT, 0 - call_if 1, MtPyre_Summit_EventScript_232190 + call_if_eq MtPyre_Summit_EventScript_232190 release end MtPyre_Summit_EventScript_232167:: @ 8232167 msgbox MtPyre_Summit_Text_2331A6, MSGBOX_YESNO compare VAR_RESULT, 1 - call_if 1, MtPyre_Summit_EventScript_232199 + call_if_eq MtPyre_Summit_EventScript_232199 compare VAR_RESULT, 0 - call_if 1, MtPyre_Summit_EventScript_232190 + call_if_eq MtPyre_Summit_EventScript_232190 release end @@ -165,12 +164,10 @@ MtPyre_Summit_EventScript_232199:: @ 8232199 MtPyre_Summit_EventScript_2321A2:: @ 82321A2 lock faceplayer - checkflag FLAG_0x103 - goto_eq MtPyre_Summit_EventScript_2321E2 + goto_if_set FLAG_0x103, MtPyre_Summit_EventScript_2321E2 compare VAR_0x40B9, 3 - call_if 4, MtPyre_Summit_EventScript_2321CB - checkflag FLAG_0x081 - goto_eq MtPyre_Summit_EventScript_2321D8 + call_if_ge MtPyre_Summit_EventScript_2321CB + goto_if_set FLAG_0x081, MtPyre_Summit_EventScript_2321D8 msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT release end @@ -210,15 +207,15 @@ MtPyre_Summit_EventScript_232204:: @ 8232204 end MtPyre_Summit_EventScript_232210:: @ 8232210 - applymovement 255, MtPyre_Summit_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2725A6 waitmovement 0 delay 60 compare VAR_0x8008, 0 - call_if 1, MtPyre_Summit_EventScript_2322C4 + call_if_eq MtPyre_Summit_EventScript_2322C4 compare VAR_0x8008, 1 - call_if 1, MtPyre_Summit_EventScript_2322DD + call_if_eq MtPyre_Summit_EventScript_2322DD compare VAR_0x8008, 2 - call_if 1, MtPyre_Summit_EventScript_2322F6 + call_if_eq MtPyre_Summit_EventScript_2322F6 playse SE_PIN applymovement 8, MtPyre_Summit_Movement_272598 waitmovement 0 @@ -226,19 +223,19 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 waitmovement 0 delay 30 compare VAR_0x8008, 0 - call_if 1, MtPyre_Summit_EventScript_23230F + call_if_eq MtPyre_Summit_EventScript_23230F compare VAR_0x8008, 1 - call_if 1, MtPyre_Summit_EventScript_232328 + call_if_eq MtPyre_Summit_EventScript_232328 compare VAR_0x8008, 2 - call_if 1, MtPyre_Summit_EventScript_232341 + call_if_eq MtPyre_Summit_EventScript_232341 msgbox MtPyre_Summit_Text_233183, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if 1, MtPyre_Summit_EventScript_23235A + call_if_eq MtPyre_Summit_EventScript_23235A compare VAR_0x8008, 1 - call_if 1, MtPyre_Summit_EventScript_232376 + call_if_eq MtPyre_Summit_EventScript_232376 compare VAR_0x8008, 2 - call_if 1, MtPyre_Summit_EventScript_232392 + call_if_eq MtPyre_Summit_EventScript_232392 delay 30 applymovement 2, MtPyre_Summit_Movement_2323B6 applymovement 8, MtPyre_Summit_Movement_2323BD @@ -250,49 +247,49 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 end MtPyre_Summit_EventScript_2322C4:: @ 82322C4 - applymovement 255, MtPyre_Summit_Movement_2323C4 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323C4 applymovement 2, MtPyre_Summit_Movement_2323B6 applymovement 8, MtPyre_Summit_Movement_2323BD waitmovement 0 return MtPyre_Summit_EventScript_2322DD:: @ 82322DD - applymovement 255, MtPyre_Summit_Movement_2323CB + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323CB applymovement 2, MtPyre_Summit_Movement_2323B6 applymovement 8, MtPyre_Summit_Movement_2323BD waitmovement 0 return MtPyre_Summit_EventScript_2322F6:: @ 82322F6 - applymovement 255, MtPyre_Summit_Movement_2323D2 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323D2 applymovement 2, MtPyre_Summit_Movement_2323B6 applymovement 8, MtPyre_Summit_Movement_2323BD waitmovement 0 return MtPyre_Summit_EventScript_23230F:: @ 823230F - applymovement 255, MtPyre_Summit_Movement_2323AE + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323AE applymovement 2, MtPyre_Summit_Movement_2323E7 applymovement 8, MtPyre_Summit_Movement_2323D8 waitmovement 0 return MtPyre_Summit_EventScript_232328:: @ 8232328 - applymovement 255, MtPyre_Summit_Movement_2323B2 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323B2 applymovement 2, MtPyre_Summit_Movement_2323E7 applymovement 8, MtPyre_Summit_Movement_2323DD waitmovement 0 return MtPyre_Summit_EventScript_232341:: @ 8232341 - applymovement 255, MtPyre_Summit_Movement_2323B2 + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323B2 applymovement 2, MtPyre_Summit_Movement_2323E7 applymovement 8, MtPyre_Summit_Movement_2323E2 waitmovement 0 return MtPyre_Summit_EventScript_23235A:: @ 823235A - applymovement 255, MtPyre_Summit_Movement_2323EA + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323ED waitmovement 0 applymovement 2, MtPyre_Summit_Movement_2725A8 @@ -300,7 +297,7 @@ MtPyre_Summit_EventScript_23235A:: @ 823235A return MtPyre_Summit_EventScript_232376:: @ 8232376 - applymovement 255, MtPyre_Summit_Movement_2323EA + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323F3 waitmovement 0 applymovement 2, MtPyre_Summit_Movement_2725A8 @@ -308,7 +305,7 @@ MtPyre_Summit_EventScript_232376:: @ 8232376 return MtPyre_Summit_EventScript_232392:: @ 8232392 - applymovement 255, MtPyre_Summit_Movement_2323EA + applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement 8, MtPyre_Summit_Movement_2323F8 waitmovement 0 applymovement 2, MtPyre_Summit_Movement_2725A8 diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc index 3abd0c84a..bbe02aadf 100644 --- a/data/maps/NavelRock_Bottom/scripts.inc +++ b/data/maps/NavelRock_Bottom/scripts.inc @@ -4,10 +4,8 @@ NavelRock_Bottom_MapScripts:: @ 8269255 .byte 0 NavelRock_Bottom_MapScript1_269260: @ 8269260 - checkflag FLAG_0x091 - call_if 1, NavelRock_Bottom_EventScript_269273 - checkflag FLAG_0x091 - call_if 0, NavelRock_Bottom_EventScript_269277 + call_if_set FLAG_0x091, NavelRock_Bottom_EventScript_269273 + call_if_unset FLAG_0x091, NavelRock_Bottom_EventScript_269277 end NavelRock_Bottom_EventScript_269273:: @ 8269273 @@ -15,20 +13,18 @@ NavelRock_Bottom_EventScript_269273:: @ 8269273 return NavelRock_Bottom_EventScript_269277:: @ 8269277 - checkflag FLAG_0x1DD - goto_eq NavelRock_Bottom_EventScript_27374E + goto_if_set FLAG_0x1DD, NavelRock_Bottom_EventScript_27374E clearflag FLAG_HIDE_LUGIA return NavelRock_Bottom_MapScript1_269284: @ 8269284 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, NavelRock_Bottom_EventScript_26928E + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NavelRock_Bottom_EventScript_26928E end NavelRock_Bottom_EventScript_26928E:: @ 826928E specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, NavelRock_Bottom_EventScript_27374E + goto_if_ne NavelRock_Bottom_EventScript_27374E removeobject 1 return @@ -66,11 +62,11 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq NavelRock_Bottom_EventScript_269336 + goto_if_eq NavelRock_Bottom_EventScript_269336 compare VAR_RESULT, 4 - goto_eq NavelRock_Bottom_EventScript_269344 + goto_if_eq NavelRock_Bottom_EventScript_269344 compare VAR_RESULT, 5 - goto_eq NavelRock_Bottom_EventScript_269344 + goto_if_eq NavelRock_Bottom_EventScript_269344 setflag FLAG_0x091 release end diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc index 910dc8eed..4df8343fb 100644 --- a/data/maps/NavelRock_Harbor/scripts.inc +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -6,7 +6,7 @@ NavelRock_Harbor_EventScript_2690BD:: @ 82690BD faceplayer msgbox NavelRock_Harbor_Text_2C6CE6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq NavelRock_Harbor_EventScript_269102 + goto_if_eq NavelRock_Harbor_EventScript_269102 msgbox NavelRock_Harbor_Text_2A6A5D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, NavelRock_Harbor_Movement_2725AA diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index 8ae17cb37..28d55d68f 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -4,10 +4,8 @@ NavelRock_Top_MapScripts:: @ 8269113 .byte 0 NavelRock_Top_MapScript1_26911E: @ 826911E - checkflag FLAG_0x092 - call_if 1, NavelRock_Top_EventScript_269131 - checkflag FLAG_0x092 - call_if 0, NavelRock_Top_EventScript_26913A + call_if_set FLAG_0x092, NavelRock_Top_EventScript_269131 + call_if_unset FLAG_0x092, NavelRock_Top_EventScript_26913A end NavelRock_Top_EventScript_269131:: @ 8269131 @@ -17,36 +15,34 @@ NavelRock_Top_EventScript_269131:: @ 8269131 NavelRock_Top_EventScript_26913A:: @ 826913A setvar VAR_TEMP_1, 1 - checkflag FLAG_0x1DC - goto_eq NavelRock_Top_EventScript_27374E + goto_if_set FLAG_0x1DC, NavelRock_Top_EventScript_27374E setvar VAR_TEMP_1, 0 clearflag FLAG_HIDE_HOOH return NavelRock_Top_MapScript1_269151: @ 8269151 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, NavelRock_Top_EventScript_26915B + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NavelRock_Top_EventScript_26915B end NavelRock_Top_EventScript_26915B:: @ 826915B specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, NavelRock_Top_EventScript_27374E + goto_if_ne NavelRock_Top_EventScript_27374E removeobject 1 return NavelRock_Top_EventScript_26916F:: @ 826916F lockall setvar VAR_TEMP_1, 1 - special SpawnScriptEventObject + special SpawnCameraObject setvar VAR_0x8004, 3 setvar VAR_0x8005, 35 special sub_813B80C applymovement 1, NavelRock_Top_Movement_269243 - applymovement 127, NavelRock_Top_Movement_269230 + applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_269230 waitmovement 0 delay 50 - setweather 0 + setweather WEATHER_NONE doweather waitse playmoncry SPECIES_HO_OH, 2 @@ -56,10 +52,10 @@ NavelRock_Top_EventScript_26916F:: @ 826916F setvar VAR_0x8004, 3 setvar VAR_0x8005, 35 special sub_813B80C - applymovement 127, NavelRock_Top_Movement_269234 + applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_269234 applymovement 1, NavelRock_Top_Movement_26923A waitmovement 0 - special RemoveScriptEventObject + special RemoveCameraObject setvar VAR_0x8004, 250 setvar VAR_0x8005, 70 setvar VAR_0x8006, 0 @@ -71,11 +67,11 @@ NavelRock_Top_EventScript_26916F:: @ 826916F setvar VAR_LAST_TALKED, 1 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq NavelRock_Top_EventScript_269217 + goto_if_eq NavelRock_Top_EventScript_269217 compare VAR_RESULT, 4 - goto_eq NavelRock_Top_EventScript_269225 + goto_if_eq NavelRock_Top_EventScript_269225 compare VAR_RESULT, 5 - goto_eq NavelRock_Top_EventScript_269225 + goto_if_eq NavelRock_Top_EventScript_269225 setflag FLAG_0x092 releaseall end diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index 714a20b6b..d841f0374 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -5,7 +5,7 @@ NewMauville_Entrance_MapScripts:: @ 82372AD NewMauville_Entrance_MapScript1_2372B8: @ 82372B8 compare VAR_0x40BA, 0 - call_if 1, NewMauville_Entrance_EventScript_2372C4 + call_if_eq NewMauville_Entrance_EventScript_2372C4 end NewMauville_Entrance_EventScript_2372C4:: @ 82372C4 @@ -23,15 +23,15 @@ NewMauville_Entrance_MapScript1_2372FB: @ 82372FB NewMauville_Entrance_EventScript_2372FF:: @ 82372FF lockall - applymovement 255, NewMauville_Entrance_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, NewMauville_Entrance_Movement_2725A6 waitmovement 0 msgbox NewMauville_Entrance_Text_237382, MSGBOX_DEFAULT checkitem ITEM_BASEMENT_KEY, 1 compare VAR_RESULT, 0 - goto_eq NewMauville_Entrance_EventScript_237380 + goto_if_eq NewMauville_Entrance_EventScript_237380 msgbox NewMauville_Entrance_Text_237396, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq NewMauville_Entrance_EventScript_237380 + goto_if_eq NewMauville_Entrance_EventScript_237380 msgbox NewMauville_Entrance_Text_2373AC, MSGBOX_DEFAULT setmetatile 3, 0, 707, 0 setmetatile 4, 0, 708, 0 diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index b0f0a18c7..aff38c577 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -6,29 +6,25 @@ NewMauville_Inside_MapScripts:: @ 82373D7 NewMauville_Inside_MapScript1_2373E7: @ 82373E7 compare VAR_TEMP_1, 1 - call_if 1, NewMauville_Inside_EventScript_237489 + call_if_eq NewMauville_Inside_EventScript_237489 compare VAR_TEMP_2, 1 - call_if 1, NewMauville_Inside_EventScript_2375D7 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, NewMauville_Inside_EventScript_237407 + call_if_eq NewMauville_Inside_EventScript_2375D7 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NewMauville_Inside_EventScript_237407 end NewMauville_Inside_EventScript_237407:: @ 8237407 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, NewMauville_Inside_EventScript_27374E + goto_if_ne NewMauville_Inside_EventScript_27374E removeobject VAR_LAST_TALKED return NewMauville_Inside_MapScript1_23741B: @ 823741B setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 - checkflag FLAG_0x1C1 - call_if 0, NewMauville_Inside_EventScript_237441 - checkflag FLAG_0x1C2 - call_if 0, NewMauville_Inside_EventScript_237445 - checkflag FLAG_0x1C3 - call_if 0, NewMauville_Inside_EventScript_237449 + call_if_unset FLAG_0x1C1, NewMauville_Inside_EventScript_237441 + call_if_unset FLAG_0x1C2, NewMauville_Inside_EventScript_237445 + call_if_unset FLAG_0x1C3, NewMauville_Inside_EventScript_237449 end NewMauville_Inside_EventScript_237441:: @ 8237441 @@ -45,7 +41,7 @@ NewMauville_Inside_EventScript_237449:: @ 8237449 NewMauville_Inside_MapScript1_23744D: @ 823744D compare VAR_0x40BA, 2 - call_if 1, NewMauville_Inside_EventScript_23773A + call_if_eq NewMauville_Inside_EventScript_23773A end NewMauville_Inside_EventScript_237459:: @ 8237459 @@ -172,7 +168,7 @@ NewMauville_Inside_EventScript_23773A:: @ 823773A NewMauville_Inside_EventScript_23778F:: @ 823778F lockall compare VAR_0x40BA, 2 - goto_eq NewMauville_Inside_EventScript_2377A5 + goto_if_eq NewMauville_Inside_EventScript_2377A5 msgbox NewMauville_Inside_Text_237896, MSGBOX_DEFAULT releaseall end @@ -195,11 +191,11 @@ NewMauville_Inside_EventScript_2377AF:: @ 82377AF clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq NewMauville_Inside_EventScript_2377F3 + goto_if_eq NewMauville_Inside_EventScript_2377F3 compare VAR_RESULT, 4 - goto_eq NewMauville_Inside_EventScript_2377F3 + goto_if_eq NewMauville_Inside_EventScript_2377F3 compare VAR_RESULT, 5 - goto_eq NewMauville_Inside_EventScript_2377F3 + goto_if_eq NewMauville_Inside_EventScript_2377F3 setflag FLAG_0x1C1 release end @@ -222,11 +218,11 @@ NewMauville_Inside_EventScript_2377FC:: @ 82377FC clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq NewMauville_Inside_EventScript_237840 + goto_if_eq NewMauville_Inside_EventScript_237840 compare VAR_RESULT, 4 - goto_eq NewMauville_Inside_EventScript_237840 + goto_if_eq NewMauville_Inside_EventScript_237840 compare VAR_RESULT, 5 - goto_eq NewMauville_Inside_EventScript_237840 + goto_if_eq NewMauville_Inside_EventScript_237840 setflag FLAG_0x1C2 release end @@ -249,11 +245,11 @@ NewMauville_Inside_EventScript_237849:: @ 8237849 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq NewMauville_Inside_EventScript_23788D + goto_if_eq NewMauville_Inside_EventScript_23788D compare VAR_RESULT, 4 - goto_eq NewMauville_Inside_EventScript_23788D + goto_if_eq NewMauville_Inside_EventScript_23788D compare VAR_RESULT, 5 - goto_eq NewMauville_Inside_EventScript_23788D + goto_if_eq NewMauville_Inside_EventScript_23788D setflag FLAG_0x1C3 release end diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index d2e808116..96863ceed 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -5,12 +5,9 @@ OldaleTown_MapScripts:: @ 81E8EA2 OldaleTown_MapScript1_1E8EA8: @ 81E8EA8 call OldaleTown_EventScript_271ED7 setflag FLAG_VISITED_OLDALE_TOWN - checkflag FLAG_0x074 - call_if 0, OldaleTown_EventScript_1E8ED2 - checkflag FLAG_0x084 - call_if 0, OldaleTown_EventScript_1E8EDE - checkflag FLAG_0x074 - call_if 1, OldaleTown_EventScript_1E8ECC + call_if_unset FLAG_0x074, OldaleTown_EventScript_1E8ED2 + call_if_unset FLAG_0x084, OldaleTown_EventScript_1E8EDE + call_if_set FLAG_0x074, OldaleTown_EventScript_1E8ECC end OldaleTown_EventScript_1E8ECC:: @ 81E8ECC @@ -38,10 +35,8 @@ OldaleTown_EventScript_1E8EF3:: @ 81E8EF3 OldaleTown_EventScript_1E8EFC:: @ 81E8EFC lock faceplayer - checkflag FLAG_0x084 - goto_eq OldaleTown_EventScript_1E8FB9 - checkflag FLAG_TEMP_1 - goto_eq OldaleTown_EventScript_1E8FB9 + goto_if_set FLAG_0x084, OldaleTown_EventScript_1E8FB9 + goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_1E8FB9 setflag FLAG_TEMP_1 playbgm MUS_TSURETEK, 0 msgbox OldaleTown_Text_1E91C0, MSGBOX_DEFAULT @@ -54,20 +49,20 @@ OldaleTown_EventScript_1E8EFC:: @ 81E8EFC OldaleTown_EventScript_1E8F47:: @ 81E8F47 applymovement 2, OldaleTown_Movement_1E8FD7 - applymovement 255, OldaleTown_Movement_1E9001 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E9001 waitmovement 0 goto OldaleTown_EventScript_1E8F8C end OldaleTown_EventScript_1E8F5E:: @ 81E8F5E applymovement 2, OldaleTown_Movement_1E8FE2 - applymovement 255, OldaleTown_Movement_1E900B + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E900B waitmovement 0 goto OldaleTown_EventScript_1E8F8C end OldaleTown_EventScript_1E8F75:: @ 81E8F75 - applymovement 255, OldaleTown_Movement_1E8FF9 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E8FF9 applymovement 2, OldaleTown_Movement_1E8FCE waitmovement 0 goto OldaleTown_EventScript_1E8F8C @@ -77,7 +72,7 @@ OldaleTown_EventScript_1E8F8C:: @ 81E8F8C msgbox OldaleTown_Text_1E91FD, MSGBOX_DEFAULT giveitem_std ITEM_POTION compare VAR_RESULT, 0 - goto_eq OldaleTown_EventScript_1E8FC3 + goto_if_eq OldaleTown_EventScript_1E8FC3 msgbox OldaleTown_Text_1E92AF, MSGBOX_DEFAULT setflag FLAG_0x084 fadedefaultbgm @@ -195,8 +190,7 @@ OldaleTown_Movement_1E9013: @ 81E9013 OldaleTown_EventScript_1E901F:: @ 81E901F lock faceplayer - checkflag FLAG_0x074 - goto_eq OldaleTown_EventScript_1E9066 + goto_if_set FLAG_0x074, OldaleTown_EventScript_1E9066 msgbox OldaleTown_Text_1E939A, MSGBOX_DEFAULT closemessage applymovement 3, OldaleTown_Movement_2725A2 @@ -206,7 +200,7 @@ OldaleTown_EventScript_1E901F:: @ 81E901F OldaleTown_EventScript_1E903F:: @ 81E903F lockall - applymovement 255, OldaleTown_Movement_1E9182 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E9182 applymovement 3, OldaleTown_Movement_1E9185 waitmovement 0 msgbox OldaleTown_Text_1E9313, MSGBOX_DEFAULT @@ -233,7 +227,7 @@ OldaleTown_EventScript_1E9086:: @ 81E9086 lockall applymovement 4, OldaleTown_Movement_1E9170 waitmovement 0 - applymovement 255, OldaleTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8 waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_1E90E6 @@ -243,7 +237,7 @@ OldaleTown_EventScript_1E90A6:: @ 81E90A6 lockall applymovement 4, OldaleTown_Movement_1E9173 waitmovement 0 - applymovement 255, OldaleTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8 waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_1E90E6 @@ -253,7 +247,7 @@ OldaleTown_EventScript_1E90C6:: @ 81E90C6 lockall applymovement 4, OldaleTown_Movement_1E9175 waitmovement 0 - applymovement 255, OldaleTown_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_2725A8 waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_1E90E6 @@ -262,9 +256,9 @@ OldaleTown_EventScript_1E90C6:: @ 81E90C6 OldaleTown_EventScript_1E90E6:: @ 81E90E6 checkplayergender compare VAR_RESULT, 0 - goto_eq OldaleTown_EventScript_1E90FE + goto_if_eq OldaleTown_EventScript_1E90FE compare VAR_RESULT, 1 - goto_eq OldaleTown_EventScript_1E910C + goto_if_eq OldaleTown_EventScript_1E910C end OldaleTown_EventScript_1E90FE:: @ 81E90FE @@ -280,9 +274,9 @@ OldaleTown_EventScript_1E910C:: @ 81E910C OldaleTown_EventScript_1E911A:: @ 81E911A closemessage compare VAR_0x8009, 0 - call_if 1, OldaleTown_EventScript_1E9148 + call_if_eq OldaleTown_EventScript_1E9148 compare VAR_0x8009, 1 - call_if 1, OldaleTown_EventScript_1E915E + call_if_eq OldaleTown_EventScript_1E915E applymovement 4, OldaleTown_Movement_1E9177 waitmovement 0 removeobject 4 @@ -293,13 +287,13 @@ OldaleTown_EventScript_1E911A:: @ 81E911A OldaleTown_EventScript_1E9148:: @ 81E9148 compare VAR_FACING, 1 - goto_if 5, OldaleTown_EventScript_1E915E + goto_if_ne OldaleTown_EventScript_1E915E applymovement 4, OldaleTown_Movement_1E9177 waitmovement 0 return OldaleTown_EventScript_1E915E:: @ 81E915E - applymovement 255, OldaleTown_Movement_1E917E + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_1E917E applymovement 4, OldaleTown_Movement_1E9177 waitmovement 0 return diff --git a/data/maps/OldaleTown_Mart/scripts.inc b/data/maps/OldaleTown_Mart/scripts.inc index 4503a27a8..2eaa483f5 100644 --- a/data/maps/OldaleTown_Mart/scripts.inc +++ b/data/maps/OldaleTown_Mart/scripts.inc @@ -6,8 +6,7 @@ OldaleTown_Mart_EventScript_1FC240:: @ 81FC240 faceplayer message gUnknown_08272A21 waitmessage - checkflag FLAG_0x074 - goto_eq OldaleTown_Mart_EventScript_1FC26C + goto_if_set FLAG_0x074, OldaleTown_Mart_EventScript_1FC26C pokemart OldaleTown_Mart_Pokemart_1FC260 msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release @@ -42,8 +41,7 @@ OldaleTown_Mart_Pokemart_1FC27C: @ 81FC27C OldaleTown_Mart_EventScript_1FC28A:: @ 81FC28A lock faceplayer - checkflag FLAG_0x074 - goto_eq OldaleTown_Mart_EventScript_1FC29F + goto_if_set FLAG_0x074, OldaleTown_Mart_EventScript_1FC29F msgbox OldaleTown_Mart_Text_1FC2B2, MSGBOX_DEFAULT release end diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index af104c674..19f7d8f67 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -27,8 +27,7 @@ OldaleTown_PokemonCenter_1F_EventScript_1FC031:: @ 81FC031 OldaleTown_PokemonCenter_1F_EventScript_1FC03A:: @ 81FC03A lock faceplayer - checkflag FLAG_SYS_POKEDEX_GET - goto_eq OldaleTown_PokemonCenter_1F_EventScript_1FC04F + goto_if_set FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_1F_EventScript_1FC04F msgbox OldaleTown_PokemonCenter_1F_Text_1FC148, MSGBOX_DEFAULT release end diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index 41242ab44..d0eb88cf2 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -6,28 +6,24 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792 faceplayer dodailyevents call PacifidlogTown_House2_EventScript_2037DE - checkflag FLAG_0x12B - goto_eq PacifidlogTown_House2_EventScript_20387E - checkflag FLAG_0x12C - call_if 1, PacifidlogTown_House2_EventScript_2037F8 - checkflag FLAG_0x12C - call_if 0, PacifidlogTown_House2_EventScript_203801 + goto_if_set FLAG_0x12B, PacifidlogTown_House2_EventScript_20387E + call_if_set FLAG_0x12C, PacifidlogTown_House2_EventScript_2037F8 + call_if_unset FLAG_0x12C, PacifidlogTown_House2_EventScript_203801 setflag FLAG_0x12C specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 - goto_if 4, PacifidlogTown_House2_EventScript_203816 + goto_if_ge PacifidlogTown_House2_EventScript_203816 specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 2 - goto_if 4, PacifidlogTown_House2_EventScript_203845 + goto_if_ge PacifidlogTown_House2_EventScript_203845 goto PacifidlogTown_House2_EventScript_20384F end PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE - checkflag FLAG_0x12B - goto_if 0, PacifidlogTown_House2_EventScript_27374E + goto_if_unset FLAG_0x12B, PacifidlogTown_House2_EventScript_27374E specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable compare VAR_RESULT, 0 - call_if 1, PacifidlogTown_House2_EventScript_203812 + call_if_eq PacifidlogTown_House2_EventScript_203812 return PacifidlogTown_House2_EventScript_2037F8:: @ 82037F8 @@ -47,7 +43,7 @@ PacifidlogTown_House2_EventScript_203816:: @ 8203816 msgbox PacifidlogTown_House2_Text_20396D, MSGBOX_DEFAULT giveitem_std ITEM_TM27 compare VAR_RESULT, 0 - goto_eq PacifidlogTown_House2_EventScript_272054 + goto_if_eq PacifidlogTown_House2_EventScript_272054 setflag FLAG_0x12B special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT @@ -63,7 +59,7 @@ PacifidlogTown_House2_EventScript_20384F:: @ 820384F msgbox PacifidlogTown_House2_Text_203A2F, MSGBOX_DEFAULT giveitem_std ITEM_TM21 compare VAR_RESULT, 0 - goto_eq PacifidlogTown_House2_EventScript_272054 + goto_if_eq PacifidlogTown_House2_EventScript_272054 setflag FLAG_0x12B special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT diff --git a/data/maps/PacifidlogTown_House3/scripts.inc b/data/maps/PacifidlogTown_House3/scripts.inc index d7b83f70a..fb5bf8cb1 100644 --- a/data/maps/PacifidlogTown_House3/scripts.inc +++ b/data/maps/PacifidlogTown_House3/scripts.inc @@ -4,25 +4,24 @@ PacifidlogTown_House3_MapScripts:: @ 8203C10 PacifidlogTown_House3_EventScript_203C11:: @ 8203C11 lock faceplayer - checkflag FLAG_0x09A - goto_eq PacifidlogTown_House3_EventScript_203CAB + goto_if_set FLAG_0x09A, PacifidlogTown_House3_EventScript_203CAB setvar VAR_0x8008, 2 copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT msgbox PacifidlogTown_House3_Text_203CBE, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq PacifidlogTown_House3_EventScript_203C93 + goto_if_eq PacifidlogTown_House3_EventScript_203C93 special sub_81B94B0 waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 - goto_eq PacifidlogTown_House3_EventScript_203C93 + goto_if_eq PacifidlogTown_House3_EventScript_203C93 copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, sub_807E9D4 copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if 5, PacifidlogTown_House3_EventScript_203C9D + goto_if_ne PacifidlogTown_House3_EventScript_203C9D copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special sub_807EA10 diff --git a/data/maps/PacifidlogTown_House4/scripts.inc b/data/maps/PacifidlogTown_House4/scripts.inc index 2e9a06e0b..e9f5f19e7 100644 --- a/data/maps/PacifidlogTown_House4/scripts.inc +++ b/data/maps/PacifidlogTown_House4/scripts.inc @@ -14,9 +14,9 @@ PacifidlogTown_House4_EventScript_203F5E:: @ 8203F5E faceplayer msgbox PacifidlogTown_House4_Text_204035, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PacifidlogTown_House4_EventScript_203F7F + goto_if_eq PacifidlogTown_House4_EventScript_203F7F compare VAR_RESULT, 0 - goto_eq PacifidlogTown_House4_EventScript_203F89 + goto_if_eq PacifidlogTown_House4_EventScript_203F89 end PacifidlogTown_House4_EventScript_203F7F:: @ 8203F7F diff --git a/data/maps/PacifidlogTown_House5/scripts.inc b/data/maps/PacifidlogTown_House5/scripts.inc index d9d9f0c56..cdc54fefe 100644 --- a/data/maps/PacifidlogTown_House5/scripts.inc +++ b/data/maps/PacifidlogTown_House5/scripts.inc @@ -6,7 +6,7 @@ PacifidlogTown_House5_EventScript_204111:: @ 8204111 faceplayer specialvar VAR_RESULT, IsMirageIslandPresent compare VAR_RESULT, 1 - goto_eq PacifidlogTown_House5_EventScript_20412D + goto_if_eq PacifidlogTown_House5_EventScript_20412D msgbox PacifidlogTown_House5_Text_204140, MSGBOX_DEFAULT release end diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index bdffb6814..137731ae2 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -1,13 +1,13 @@ PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7 setflag FLAG_VISITED_PETALBURG_CITY compare VAR_0x4057, 0 - call_if 1, PetalburgCity_EventScript_1DC307 + call_if_eq PetalburgCity_EventScript_1DC307 compare VAR_0x4057, 2 - call_if 1, PetalburgCity_EventScript_1DC30F + call_if_eq PetalburgCity_EventScript_1DC30F compare VAR_0x4057, 4 - call_if 1, PetalburgCity_EventScript_1DC30F + call_if_eq PetalburgCity_EventScript_1DC30F compare VAR_0x4085, 8 - call_if 1, PetalburgCity_EventScript_1DC316 + call_if_eq PetalburgCity_EventScript_1DC316 end PetalburgCity_EventScript_1DC307:: @ 81DC307 @@ -33,7 +33,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E special SavePlayerParty special PutZigzagoonInPlayerParty applymovement 2, PetalburgCity_Movement_1DC451 - applymovement 255, PetalburgCity_Movement_1DC430 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC430 waitmovement 0 msgbox PetalburgCity_Text_1EC1F8, MSGBOX_DEFAULT special StartWallyTutorialBattle @@ -58,17 +58,17 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390 lockall setflag FLAG_SPECIAL_FLAG_0x4000 applymovement 5, PetalburgCity_Movement_1DC41B - applymovement 255, PetalburgCity_Movement_1DC406 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC406 waitmovement 0 setvar VAR_0x8004, 7 setvar VAR_0x8005, 5 opendoor VAR_0x8004, VAR_0x8005 waitdooranim applymovement 5, PetalburgCity_Movement_1DC42D - applymovement 255, PetalburgCity_Movement_1DC418 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC418 waitmovement 0 setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim clearflag FLAG_SPECIAL_FLAG_0x4000 @@ -267,26 +267,26 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA applymovement 8, PetalburgCity_Movement_27259A waitmovement 0 compare VAR_0x8008, 0 - call_if 1, PetalburgCity_EventScript_1DC57F + call_if_eq PetalburgCity_EventScript_1DC57F compare VAR_0x8008, 1 - call_if 1, PetalburgCity_EventScript_1DC594 + call_if_eq PetalburgCity_EventScript_1DC594 compare VAR_0x8008, 2 - call_if 1, PetalburgCity_EventScript_1DC59F + call_if_eq PetalburgCity_EventScript_1DC59F compare VAR_0x8008, 3 - call_if 1, PetalburgCity_EventScript_1DC5B4 + call_if_eq PetalburgCity_EventScript_1DC5B4 msgbox PetalburgCity_Text_1DC881, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if 1, PetalburgCity_EventScript_1DC5C9 + call_if_eq PetalburgCity_EventScript_1DC5C9 compare VAR_0x8008, 1 - call_if 1, PetalburgCity_EventScript_1DC5DB + call_if_eq PetalburgCity_EventScript_1DC5DB compare VAR_0x8008, 2 - call_if 1, PetalburgCity_EventScript_1DC5ED + call_if_eq PetalburgCity_EventScript_1DC5ED compare VAR_0x8008, 3 - call_if 1, PetalburgCity_EventScript_1DC5FF + call_if_eq PetalburgCity_EventScript_1DC5FF msgbox PetalburgCity_Text_1DC91B, MSGBOX_DEFAULT applymovement 8, PetalburgCity_Movement_2725A8 - applymovement 255, PetalburgCity_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A8 waitmovement 0 msgbox PetalburgCity_Text_1DC93E, MSGBOX_DEFAULT closemessage @@ -299,7 +299,7 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA PetalburgCity_EventScript_1DC57F:: @ 81DC57F applymovement 8, PetalburgCity_Movement_1DC615 waitmovement 0 - applymovement 255, PetalburgCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725AA waitmovement 0 return @@ -311,38 +311,38 @@ PetalburgCity_EventScript_1DC594:: @ 81DC594 PetalburgCity_EventScript_1DC59F:: @ 81DC59F applymovement 8, PetalburgCity_Movement_1DC61D waitmovement 0 - applymovement 255, PetalburgCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A6 waitmovement 0 return PetalburgCity_EventScript_1DC5B4:: @ 81DC5B4 applymovement 8, PetalburgCity_Movement_1DC622 waitmovement 0 - applymovement 255, PetalburgCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A6 waitmovement 0 return PetalburgCity_EventScript_1DC5C9:: @ 81DC5C9 applymovement 8, PetalburgCity_Movement_1DC628 - applymovement 255, PetalburgCity_Movement_1DC665 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC665 waitmovement 0 return PetalburgCity_EventScript_1DC5DB:: @ 81DC5DB applymovement 8, PetalburgCity_Movement_1DC633 - applymovement 255, PetalburgCity_Movement_1DC66F + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC66F waitmovement 0 return PetalburgCity_EventScript_1DC5ED:: @ 81DC5ED applymovement 8, PetalburgCity_Movement_1DC641 - applymovement 255, PetalburgCity_Movement_1DC67C + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC67C waitmovement 0 return PetalburgCity_EventScript_1DC5FF:: @ 81DC5FF applymovement 8, PetalburgCity_Movement_1DC64C - applymovement 255, PetalburgCity_Movement_1DC686 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC686 waitmovement 0 return @@ -544,7 +544,7 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 waitmovement 0 applymovement 9, PetalburgCity_Movement_1DC7DB waitmovement 0 - applymovement 255, PetalburgCity_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_2725A8 waitmovement 0 setvar VAR_0x40D1, 1 msgbox PetalburgCity_Text_1DCB31, MSGBOX_DEFAULT @@ -560,38 +560,38 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 msgbox PetalburgCity_Text_1DCC09, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if 1, PetalburgCity_EventScript_1DC78E + call_if_eq PetalburgCity_EventScript_1DC78E compare VAR_0x8008, 1 - call_if 1, PetalburgCity_EventScript_1DC7A0 + call_if_eq PetalburgCity_EventScript_1DC7A0 compare VAR_0x8008, 2 - call_if 1, PetalburgCity_EventScript_1DC7B2 + call_if_eq PetalburgCity_EventScript_1DC7B2 compare VAR_0x8008, 3 - call_if 1, PetalburgCity_EventScript_1DC7C4 + call_if_eq PetalburgCity_EventScript_1DC7C4 setvar VAR_0x40C9, 1 removeobject 9 releaseall end PetalburgCity_EventScript_1DC78E:: @ 81DC78E - applymovement 255, PetalburgCity_Movement_1DC7EE + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC7EE applymovement 9, PetalburgCity_Movement_1DC7E0 waitmovement 0 return PetalburgCity_EventScript_1DC7A0:: @ 81DC7A0 - applymovement 255, PetalburgCity_Movement_1DC802 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC802 applymovement 9, PetalburgCity_Movement_1DC7F5 waitmovement 0 return PetalburgCity_EventScript_1DC7B2:: @ 81DC7B2 - applymovement 255, PetalburgCity_Movement_1DC815 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC815 applymovement 9, PetalburgCity_Movement_1DC808 waitmovement 0 return PetalburgCity_EventScript_1DC7C4:: @ 81DC7C4 - applymovement 255, PetalburgCity_Movement_1DC828 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC828 applymovement 9, PetalburgCity_Movement_1DC81B waitmovement 0 return diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 6a58c20f7..f97825624 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -7,28 +7,28 @@ PetalburgCity_Gym_MapScripts:: @ 8204889 PetalburgCity_Gym_MapScript1_20489E: @ 820489E compare VAR_0x4085, 6 - goto_eq PetalburgCity_Gym_EventScript_2048B5 + goto_if_eq PetalburgCity_Gym_EventScript_2048B5 compare VAR_0x4085, 7 - call_if 4, PetalburgCity_Gym_EventScript_2048FF + call_if_ge PetalburgCity_Gym_EventScript_2048FF end PetalburgCity_Gym_EventScript_2048B5:: @ 82048B5 setvar VAR_0x8005, 1 call PetalburgCity_Gym_EventScript_20555E checktrainerflag TRAINER_RANDALL - call_if 1, PetalburgCity_Gym_EventScript_20557F + call_if_eq PetalburgCity_Gym_EventScript_20557F checktrainerflag TRAINER_MARY - call_if 1, PetalburgCity_Gym_EventScript_2055A0 + call_if_eq PetalburgCity_Gym_EventScript_2055A0 checktrainerflag TRAINER_PARKER - call_if 1, PetalburgCity_Gym_EventScript_2055C1 + call_if_eq PetalburgCity_Gym_EventScript_2055C1 checktrainerflag TRAINER_ALEXIA - call_if 1, PetalburgCity_Gym_EventScript_2055E2 + call_if_eq PetalburgCity_Gym_EventScript_2055E2 checktrainerflag TRAINER_GEORGE - call_if 1, PetalburgCity_Gym_EventScript_205603 + call_if_eq PetalburgCity_Gym_EventScript_205603 checktrainerflag TRAINER_JODY - call_if 1, PetalburgCity_Gym_EventScript_205624 + call_if_eq PetalburgCity_Gym_EventScript_205624 checktrainerflag TRAINER_BERKE - call_if 1, PetalburgCity_Gym_EventScript_205645 + call_if_eq PetalburgCity_Gym_EventScript_205645 end PetalburgCity_Gym_EventScript_2048FF:: @ 82048FF @@ -45,11 +45,10 @@ PetalburgCity_Gym_EventScript_2048FF:: @ 82048FF PetalburgCity_Gym_MapScript1_20492D: @ 820492D compare VAR_0x4085, 1 - call_if 1, PetalburgCity_Gym_EventScript_20494D + call_if_eq PetalburgCity_Gym_EventScript_20494D compare VAR_0x4085, 6 - call_if 0, PetalburgCity_Gym_EventScript_204955 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, PetalburgCity_Gym_EventScript_20495D + call_if_lt PetalburgCity_Gym_EventScript_204955 + call_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_20495D end PetalburgCity_Gym_EventScript_20494D:: @ 820494D @@ -64,9 +63,9 @@ PetalburgCity_Gym_EventScript_20495D:: @ 820495D setorcopyvar 0x8015, 269 specialvar VAR_RESULT, IsTrainerReadyForRematch compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_204985 + goto_if_eq PetalburgCity_Gym_EventScript_204985 compare VAR_0x4085, 8 - goto_eq PetalburgCity_Gym_EventScript_204985 + goto_if_eq PetalburgCity_Gym_EventScript_204985 setobjectxyperm 1, 4, 107 return @@ -79,7 +78,7 @@ PetalburgCity_Gym_MapScript2_20498B: @ 820498B .2byte 0 PetalburgCity_Gym_EventScript_204995:: @ 8204995 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end PetalburgCity_Gym_MapScript2_20499A: @ 820499A @@ -91,14 +90,14 @@ PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 msgbox PetalburgCity_Gym_Text_205B32, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_205B4C, MSGBOX_DEFAULT closemessage - applymovement 255, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA applymovement 10, PetalburgCity_Gym_Movement_2049EC waitmovement 0 playse SE_KAIDAN removeobject 10 setflag FLAG_HIDE_PETALBURG_CITY_WALLY delay 30 - applymovement 255, PetalburgCity_Gym_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A6 waitmovement 0 msgbox PetalburgCity_Gym_Text_205C40, MSGBOX_DEFAULT setvar VAR_0x4085, 2 @@ -156,65 +155,65 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC addobject 10 playse SE_DOOR compare VAR_0x8008, 0 - call_if 1, PetalburgCity_Gym_EventScript_204C31 + call_if_eq PetalburgCity_Gym_EventScript_204C31 compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204C43 + call_if_eq PetalburgCity_Gym_EventScript_204C43 compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_204C5F + call_if_eq PetalburgCity_Gym_EventScript_204C5F compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_204C5F + 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 compare VAR_0x8008, 0 - call_if 1, PetalburgCity_Gym_EventScript_204CC7 + call_if_eq PetalburgCity_Gym_EventScript_204CC7 compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204CD2 + call_if_eq PetalburgCity_Gym_EventScript_204CD2 compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_204CE4 + call_if_eq PetalburgCity_Gym_EventScript_204CE4 compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_204CF6 + call_if_eq PetalburgCity_Gym_EventScript_204CF6 msgbox PetalburgCity_Gym_Text_2059E8, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if 1, PetalburgCity_Gym_EventScript_204D08 + call_if_eq PetalburgCity_Gym_EventScript_204D08 compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204D13 + call_if_eq PetalburgCity_Gym_EventScript_204D13 compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_204D1E + call_if_eq PetalburgCity_Gym_EventScript_204D1E compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_204D29 + 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 compare VAR_0x8008, 0 - call_if 1, PetalburgCity_Gym_EventScript_204D72 + call_if_eq PetalburgCity_Gym_EventScript_204D72 compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204D73 + call_if_eq PetalburgCity_Gym_EventScript_204D73 compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_204D7E + call_if_eq PetalburgCity_Gym_EventScript_204D7E compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_204D7F + call_if_eq PetalburgCity_Gym_EventScript_204D7F compare VAR_0x8008, 0 - call_if 1, PetalburgCity_Gym_EventScript_204D34 + call_if_eq PetalburgCity_Gym_EventScript_204D34 compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204D3F + call_if_eq PetalburgCity_Gym_EventScript_204D3F compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_204D34 + call_if_eq PetalburgCity_Gym_EventScript_204D34 compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_204D34 + call_if_eq PetalburgCity_Gym_EventScript_204D34 msgbox PetalburgCity_Gym_Text_205B0F, MSGBOX_DEFAULT closemessage setflag FLAG_SPECIAL_FLAG_0x4001 playbgm MUS_TSURETEK, 0 compare VAR_0x8008, 0 - call_if 1, PetalburgCity_Gym_EventScript_204C78 + call_if_eq PetalburgCity_Gym_EventScript_204C78 compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204C91 + call_if_eq PetalburgCity_Gym_EventScript_204C91 compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_204CA3 + call_if_eq PetalburgCity_Gym_EventScript_204CA3 compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_204CB5 + call_if_eq PetalburgCity_Gym_EventScript_204CB5 removeobject 10 setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT setvar VAR_0x4085, 1 @@ -238,13 +237,13 @@ PetalburgCity_Gym_EventScript_204C43:: @ 8204C43 applymovement 10, PetalburgCity_Gym_Movement_2050E1 waitmovement 0 applymovement 1, PetalburgCity_Gym_Movement_2725A8 - applymovement 255, PetalburgCity_Gym_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A8 waitmovement 0 return PetalburgCity_Gym_EventScript_204C5F:: @ 8204C5F applymovement 1, PetalburgCity_Gym_Movement_2725AA - applymovement 255, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA applymovement 10, PetalburgCity_Gym_Movement_2050EB waitmovement 0 return @@ -252,25 +251,25 @@ PetalburgCity_Gym_EventScript_204C5F:: @ 8204C5F PetalburgCity_Gym_EventScript_204C78:: @ 8204C78 applymovement 1, PetalburgCity_Gym_Movement_2725AA applymovement 10, PetalburgCity_Gym_Movement_205102 - applymovement 255, PetalburgCity_Gym_Movement_205111 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_205111 waitmovement 0 return PetalburgCity_Gym_EventScript_204C91:: @ 8204C91 applymovement 10, PetalburgCity_Gym_Movement_2050F2 - applymovement 255, PetalburgCity_Gym_Movement_205109 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_205109 waitmovement 0 return PetalburgCity_Gym_EventScript_204CA3:: @ 8204CA3 applymovement 10, PetalburgCity_Gym_Movement_205102 - applymovement 255, PetalburgCity_Gym_Movement_20511B + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_20511B waitmovement 0 return PetalburgCity_Gym_EventScript_204CB5:: @ 8204CB5 applymovement 10, PetalburgCity_Gym_Movement_2050FA - applymovement 255, PetalburgCity_Gym_Movement_205123 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_205123 waitmovement 0 return @@ -281,19 +280,19 @@ PetalburgCity_Gym_EventScript_204CC7:: @ 8204CC7 PetalburgCity_Gym_EventScript_204CD2:: @ 8204CD2 applymovement 1, PetalburgCity_Gym_Movement_2725AA - applymovement 255, PetalburgCity_Gym_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A6 waitmovement 0 return PetalburgCity_Gym_EventScript_204CE4:: @ 8204CE4 applymovement 1, PetalburgCity_Gym_Movement_2725A8 - applymovement 255, PetalburgCity_Gym_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A4 waitmovement 0 return PetalburgCity_Gym_EventScript_204CF6:: @ 8204CF6 applymovement 1, PetalburgCity_Gym_Movement_2725A4 - applymovement 255, PetalburgCity_Gym_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A8 waitmovement 0 return @@ -364,11 +363,9 @@ PetalburgCity_Gym_EventScript_204D7F:: @ 8204D7F PetalburgCity_Gym_EventScript_204D80:: @ 8204D80 call PetalburgCity_Gym_EventScript_204DCE compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_204E1D - checkflag FLAG_0x0A9 - goto_if 0, PetalburgCity_Gym_EventScript_204DAC - checkflag FLAG_SYS_GAME_CLEAR - goto_eq PetalburgCity_Gym_EventScript_20512D + goto_if_eq PetalburgCity_Gym_EventScript_204E1D + goto_if_unset FLAG_0x0A9, PetalburgCity_Gym_EventScript_204DAC + goto_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_20512D msgbox PetalburgCity_Gym_Text_206417, MSGBOX_DEFAULT release end @@ -386,15 +383,15 @@ PetalburgCity_Gym_EventScript_204DB3:: @ 8204DB3 PetalburgCity_Gym_EventScript_204DCE:: @ 8204DCE specialvar VAR_RESULT, IsEnigmaBerryValid compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_204E17 + goto_if_eq PetalburgCity_Gym_EventScript_204E17 checkitem ITEM_ENIGMA_BERRY, 1 compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_204E17 + goto_if_eq PetalburgCity_Gym_EventScript_204E17 checkpcitem ITEM_ENIGMA_BERRY, 1 compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_204E17 + goto_if_eq PetalburgCity_Gym_EventScript_204E17 compare VAR_ENIGMA_BERRY_AVAILABLE, 0 - goto_eq PetalburgCity_Gym_EventScript_204E17 + goto_if_eq PetalburgCity_Gym_EventScript_204E17 msgbox PetalburgCity_Gym_Text_2A6D3D, MSGBOX_DEFAULT setvar VAR_RESULT, 1 return @@ -406,7 +403,7 @@ PetalburgCity_Gym_EventScript_204E17:: @ 8204E17 PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D giveitem_std ITEM_ENIGMA_BERRY compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_272054 + goto_if_eq PetalburgCity_Gym_EventScript_272054 setvar VAR_ENIGMA_BERRY_AVAILABLE, 0 release end @@ -447,7 +444,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2 giveitem_std ITEM_TM42 compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_27205E + goto_if_eq PetalburgCity_Gym_EventScript_27205E setflag FLAG_0x0A9 msgbox PetalburgCity_Gym_Text_206254, MSGBOX_DEFAULT return @@ -474,30 +471,30 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 waitmovement 0 delay 10 compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204FED + call_if_eq PetalburgCity_Gym_EventScript_204FED compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_205009 + call_if_eq PetalburgCity_Gym_EventScript_205009 compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_205025 + call_if_eq PetalburgCity_Gym_EventScript_205025 msgbox PetalburgCity_Gym_Text_206377, MSGBOX_DEFAULT closemessage delay 20 compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_204FCC + call_if_eq PetalburgCity_Gym_EventScript_204FCC compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_204FD7 + call_if_eq PetalburgCity_Gym_EventScript_204FD7 compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_204FE2 + call_if_eq PetalburgCity_Gym_EventScript_204FE2 msgbox PetalburgCity_Gym_Text_2063CA, MSGBOX_DEFAULT closemessage setflag FLAG_SPECIAL_FLAG_0x4001 playbgm MUS_TSURETEK, 0 compare VAR_0x8008, 1 - call_if 1, PetalburgCity_Gym_EventScript_205041 + call_if_eq PetalburgCity_Gym_EventScript_205041 compare VAR_0x8008, 2 - call_if 1, PetalburgCity_Gym_EventScript_20505A + call_if_eq PetalburgCity_Gym_EventScript_20505A compare VAR_0x8008, 3 - call_if 1, PetalburgCity_Gym_EventScript_20506C + call_if_eq PetalburgCity_Gym_EventScript_20506C removeobject 11 setvar VAR_0x4057, 4 clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE @@ -524,7 +521,7 @@ PetalburgCity_Gym_EventScript_204FE2:: @ 8204FE2 PetalburgCity_Gym_EventScript_204FED:: @ 8204FED applymovement 11, PetalburgCity_Gym_Movement_2050C3 waitmovement 0 - applymovement 255, PetalburgCity_Gym_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725A4 applymovement 1, PetalburgCity_Gym_Movement_2725A4 waitmovement 0 return @@ -532,7 +529,7 @@ PetalburgCity_Gym_EventScript_204FED:: @ 8204FED PetalburgCity_Gym_EventScript_205009:: @ 8205009 applymovement 11, PetalburgCity_Gym_Movement_2050CA waitmovement 0 - applymovement 255, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA applymovement 1, PetalburgCity_Gym_Movement_2725AA waitmovement 0 return @@ -540,7 +537,7 @@ PetalburgCity_Gym_EventScript_205009:: @ 8205009 PetalburgCity_Gym_EventScript_205025:: @ 8205025 applymovement 11, PetalburgCity_Gym_Movement_2050D0 waitmovement 0 - applymovement 255, PetalburgCity_Gym_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2725AA applymovement 1, PetalburgCity_Gym_Movement_2725AA waitmovement 0 return @@ -548,19 +545,19 @@ PetalburgCity_Gym_EventScript_205025:: @ 8205025 PetalburgCity_Gym_EventScript_205041:: @ 8205041 applymovement 11, PetalburgCity_Gym_Movement_20507E applymovement 1, PetalburgCity_Gym_Movement_2725AA - applymovement 255, PetalburgCity_Gym_Movement_2050A1 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2050A1 waitmovement 0 return PetalburgCity_Gym_EventScript_20505A:: @ 820505A applymovement 11, PetalburgCity_Gym_Movement_205089 - applymovement 255, PetalburgCity_Gym_Movement_2050A9 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2050A9 waitmovement 0 return PetalburgCity_Gym_EventScript_20506C:: @ 820506C applymovement 11, PetalburgCity_Gym_Movement_205094 - applymovement 255, PetalburgCity_Gym_Movement_2050B1 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2050B1 waitmovement 0 return @@ -787,14 +784,14 @@ PetalburgCity_Gym_EventScript_20512D:: @ 820512D PetalburgCity_Gym_EventScript_205137:: @ 8205137 lockall compare VAR_0x4085, 6 - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 85 msgbox PetalburgCity_Gym_Text_20721E, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_20516C:: @ 820516C @@ -817,150 +814,149 @@ PetalburgCity_Gym_EventScript_20517D:: @ 820517D PetalburgCity_Gym_EventScript_205187:: @ 8205187 lockall compare VAR_0x4085, 6 - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 98 msgbox PetalburgCity_Gym_Text_207280, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_2051BC:: @ 82051BC lockall checktrainerflag TRAINER_RANDALL - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 46 msgbox PetalburgCity_Gym_Text_2072BB, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_2051EF:: @ 82051EF lockall checktrainerflag TRAINER_RANDALL - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 59 msgbox PetalburgCity_Gym_Text_2072F7, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_205222:: @ 8205222 lockall checktrainerflag TRAINER_MARY - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 59 msgbox PetalburgCity_Gym_Text_2072F7, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_205255:: @ 8205255 lockall checktrainerflag TRAINER_MARY - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 72 msgbox PetalburgCity_Gym_Text_207331, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_205288:: @ 8205288 lockall checktrainerflag TRAINER_PARKER - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 20 msgbox PetalburgCity_Gym_Text_20736C, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_2052BB:: @ 82052BB lockall checktrainerflag TRAINER_ALEXIA - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 20 msgbox PetalburgCity_Gym_Text_20736C, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_2052EE:: @ 82052EE lockall checktrainerflag TRAINER_ALEXIA - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 33 msgbox PetalburgCity_Gym_Text_2073A7, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_205321:: @ 8205321 lockall checktrainerflag TRAINER_GEORGE - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 33 msgbox PetalburgCity_Gym_Text_2073A7, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_205354:: @ 8205354 lockall checktrainerflag TRAINER_JODY - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 7 msgbox PetalburgCity_Gym_Text_2073E4, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_205387:: @ 8205387 lockall checktrainerflag TRAINER_BERKE - goto_if 0, PetalburgCity_Gym_EventScript_20517D + goto_if_lt PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 7 msgbox PetalburgCity_Gym_Text_2073E4, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq PetalburgCity_Gym_EventScript_20516C + goto_if_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 - goto_eq PetalburgCity_Gym_EventScript_20517B + goto_if_eq PetalburgCity_Gym_EventScript_20517B end PetalburgCity_Gym_EventScript_2053BA:: @ 82053BA trainerbattle_single TRAINER_RANDALL, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_2053ED + goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_2053ED msgbox PetalburgCity_Gym_Text_2067D8, MSGBOX_AUTOCLOSE end @@ -977,8 +973,7 @@ PetalburgCity_Gym_EventScript_2053ED:: @ 82053ED PetalburgCity_Gym_EventScript_2053F6:: @ 82053F6 trainerbattle_single TRAINER_PARKER, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_205429 + goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_205429 msgbox PetalburgCity_Gym_Text_206996, MSGBOX_AUTOCLOSE end @@ -995,8 +990,7 @@ PetalburgCity_Gym_EventScript_205429:: @ 8205429 PetalburgCity_Gym_EventScript_205432:: @ 8205432 trainerbattle_single TRAINER_GEORGE, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456 - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_205465 + goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_205465 msgbox PetalburgCity_Gym_Text_206AE9, MSGBOX_AUTOCLOSE end @@ -1013,8 +1007,7 @@ PetalburgCity_Gym_EventScript_205465:: @ 8205465 PetalburgCity_Gym_EventScript_20546E:: @ 820546E trainerbattle_single TRAINER_BERKE, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492 - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_2054A1 + goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_2054A1 msgbox PetalburgCity_Gym_Text_206C9F, MSGBOX_AUTOCLOSE end @@ -1031,8 +1024,7 @@ PetalburgCity_Gym_EventScript_2054A1:: @ 82054A1 PetalburgCity_Gym_EventScript_2054AA:: @ 82054AA trainerbattle_single TRAINER_MARY, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_2054DD + goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_2054DD msgbox PetalburgCity_Gym_Text_206E26, MSGBOX_AUTOCLOSE end @@ -1049,8 +1041,7 @@ PetalburgCity_Gym_EventScript_2054DD:: @ 82054DD PetalburgCity_Gym_EventScript_2054E6:: @ 82054E6 trainerbattle_single TRAINER_ALEXIA, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_205519 + goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_205519 msgbox PetalburgCity_Gym_Text_206F9F, MSGBOX_AUTOCLOSE end @@ -1067,8 +1058,7 @@ PetalburgCity_Gym_EventScript_205519:: @ 8205519 PetalburgCity_Gym_EventScript_205522:: @ 8205522 trainerbattle_single TRAINER_JODY, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546 - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_205555 + goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_205555 msgbox PetalburgCity_Gym_Text_2070FB, MSGBOX_AUTOCLOSE end @@ -1086,72 +1076,72 @@ PetalburgCity_Gym_EventScript_205555:: @ 8205555 PetalburgCity_Gym_EventScript_20555E:: @ 820555E setvar VAR_0x8004, 1 compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_205746 compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B + call_if_eq PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_205666 return PetalburgCity_Gym_EventScript_20557F:: @ 820557F setvar VAR_0x8004, 2 compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_205746 compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B + call_if_eq PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_20568B return PetalburgCity_Gym_EventScript_2055A0:: @ 82055A0 setvar VAR_0x8004, 3 compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_205746 compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B + call_if_eq PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_2056B0 return PetalburgCity_Gym_EventScript_2055C1:: @ 82055C1 setvar VAR_0x8004, 4 compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_205746 compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B + call_if_eq PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_2056D5 return PetalburgCity_Gym_EventScript_2055E2:: @ 82055E2 setvar VAR_0x8004, 5 compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_205746 compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B + call_if_eq PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_2056E8 return PetalburgCity_Gym_EventScript_205603:: @ 8205603 setvar VAR_0x8004, 6 compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_205746 compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B + call_if_eq PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_20570D return PetalburgCity_Gym_EventScript_205624:: @ 8205624 setvar VAR_0x8004, 7 compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_205746 compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B + call_if_eq PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_205720 return PetalburgCity_Gym_EventScript_205645:: @ 8205645 setvar VAR_0x8004, 8 compare VAR_0x8005, 0 - call_if 1, PetalburgCity_Gym_EventScript_205746 + call_if_eq PetalburgCity_Gym_EventScript_205746 compare VAR_0x8005, 1 - call_if 1, PetalburgCity_Gym_EventScript_20574B + call_if_eq PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_205733 return @@ -1215,8 +1205,7 @@ PetalburgCity_Gym_EventScript_20574B:: @ 820574B PetalburgCity_Gym_EventScript_20574F:: @ 820574F lock faceplayer - checkflag FLAG_0x4F4 - goto_eq PetalburgCity_Gym_EventScript_205764 + goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_205764 msgbox PetalburgCity_Gym_Text_206542, MSGBOX_DEFAULT release end @@ -1228,15 +1217,13 @@ PetalburgCity_Gym_EventScript_205764:: @ 8205764 PetalburgCity_Gym_EventScript_20576E:: @ 820576E lockall - checkflag FLAG_BADGE05_GET - goto_eq PetalburgCity_Gym_EventScript_20578E + goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_20578E goto PetalburgCity_Gym_EventScript_205798 end PetalburgCity_Gym_EventScript_20577E:: @ 820577E lockall - checkflag FLAG_BADGE05_GET - goto_eq PetalburgCity_Gym_EventScript_20578E + goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_20578E goto PetalburgCity_Gym_EventScript_205798 end diff --git a/data/maps/PetalburgCity_Mart/scripts.inc b/data/maps/PetalburgCity_Mart/scripts.inc index f6d975615..4303f1504 100644 --- a/data/maps/PetalburgCity_Mart/scripts.inc +++ b/data/maps/PetalburgCity_Mart/scripts.inc @@ -6,8 +6,7 @@ PetalburgCity_Mart_EventScript_207D69:: @ 8207D69 faceplayer message gUnknown_08272A21 waitmessage - checkflag FLAG_0x128 - goto_eq PetalburgCity_Mart_EventScript_207DA6 + goto_if_set FLAG_0x128, PetalburgCity_Mart_EventScript_207DA6 pokemart PetalburgCity_Mart_Pokemart_207D8C msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index eb0150c08..1bbeb8fad 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -30,17 +30,17 @@ PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C msgbox PetalburgCity_PokemonCenter_1F_Text_207B09, MSGBOX_DEFAULT specialvar VAR_RESULT, IsStarterInParty compare VAR_RESULT, 1 - goto_eq PetalburgCity_PokemonCenter_1F_EventScript_207A38 + goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_207A38 release end PetalburgCity_PokemonCenter_1F_EventScript_207A38:: @ 8207A38 compare VAR_STARTER_MON, 0 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A5B + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_207A5B compare VAR_STARTER_MON, 1 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A64 + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_207A64 compare VAR_STARTER_MON, 2 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A6D + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_207A6D release end diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index 8ef530784..7645828ef 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -8,7 +8,7 @@ PetalburgCity_WallysHouse_MapScript2_204234: @ 8204234 .2byte 0 PetalburgCity_WallysHouse_EventScript_20423E:: @ 820423E - turnobject 255, 4 + turnobject EVENT_OBJ_ID_PLAYER, 4 turnobject 1, 3 end @@ -29,12 +29,9 @@ PetalburgCity_WallysHouse_EventScript_204251:: @ 8204251 PetalburgCity_WallysHouse_EventScript_204278:: @ 8204278 lock faceplayer - checkflag FLAG_0x07E - goto_eq PetalburgCity_WallysHouse_EventScript_2042AC - checkflag FLAG_0x07A - goto_eq PetalburgCity_WallysHouse_EventScript_2042A2 - checkflag FLAG_0x087 - goto_eq PetalburgCity_WallysHouse_EventScript_2042B6 + goto_if_set FLAG_0x07E, PetalburgCity_WallysHouse_EventScript_2042AC + goto_if_set FLAG_0x07A, PetalburgCity_WallysHouse_EventScript_2042A2 + goto_if_set FLAG_0x087, PetalburgCity_WallysHouse_EventScript_2042B6 msgbox PetalburgCity_WallysHouse_Text_2042DF, MSGBOX_DEFAULT setflag FLAG_0x087 release @@ -58,8 +55,7 @@ PetalburgCity_WallysHouse_EventScript_2042B6:: @ 82042B6 PetalburgCity_WallysHouse_EventScript_2042C0:: @ 82042C0 lock faceplayer - checkflag FLAG_0x07A - goto_eq PetalburgCity_WallysHouse_EventScript_2042D5 + goto_if_set FLAG_0x07A, PetalburgCity_WallysHouse_EventScript_2042D5 msgbox PetalburgCity_WallysHouse_Text_204732, MSGBOX_DEFAULT release end diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 387955f73..57797588f 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -30,7 +30,7 @@ PetalburgWoods_EventScript_22DFD7:: @ 822DFD7 applymovement 3, PetalburgWoods_Movement_22E1F9 waitmovement 0 call PetalburgWoods_EventScript_22E138 - applymovement 255, PetalburgWoods_Movement_22E1E0 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_22E1E0 applymovement 4, PetalburgWoods_Movement_22E1C2 waitmovement 0 goto PetalburgWoods_EventScript_22E1A7 @@ -41,7 +41,7 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 call PetalburgWoods_EventScript_22E124 applymovement 4, PetalburgWoods_Movement_22E1D0 waitmovement 0 - applymovement 255, PetalburgWoods_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_2725A4 waitmovement 0 msgbox PetalburgWoods_Text_22E34F, MSGBOX_DEFAULT closemessage @@ -59,14 +59,14 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 applymovement 4, PetalburgWoods_Movement_22E1EA waitmovement 0 msgbox PetalburgWoods_Text_22E457, MSGBOX_DEFAULT - applymovement 255, PetalburgWoods_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_2725A6 waitmovement 0 msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_22E542 applymovement 3, PetalburgWoods_Movement_22E1F9 waitmovement 0 call PetalburgWoods_EventScript_22E138 - applymovement 255, PetalburgWoods_Movement_22E1E0 + applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_22E1E0 applymovement 4, PetalburgWoods_Movement_22E1D7 waitmovement 0 goto PetalburgWoods_EventScript_22E1A7 @@ -85,12 +85,12 @@ PetalburgWoods_EventScript_22E138:: @ 822E138 applymovement 3, PetalburgWoods_Movement_22E1FD waitmovement 0 removeobject 3 - applymovement 255, PetalburgWoods_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_2725AA waitmovement 0 msgbox PetalburgWoods_Text_22E63D, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL compare VAR_RESULT, 0 - goto_eq PetalburgWoods_EventScript_22E17D + goto_if_eq PetalburgWoods_EventScript_22E17D goto PetalburgWoods_EventScript_22E18B end @@ -249,12 +249,11 @@ PetalburgWoods_EventScript_22E219:: @ 822E219 PetalburgWoods_EventScript_22E222:: @ 822E222 lock faceplayer - checkflag FLAG_0x129 - goto_eq PetalburgWoods_EventScript_22E251 + goto_if_set FLAG_0x129, PetalburgWoods_EventScript_22E251 msgbox PetalburgWoods_Text_22EAFE, MSGBOX_DEFAULT giveitem_std ITEM_MIRACLE_SEED compare VAR_RESULT, 0 - goto_eq PetalburgWoods_EventScript_272054 + goto_if_eq PetalburgWoods_EventScript_272054 setflag FLAG_0x129 release end @@ -281,11 +280,11 @@ PetalburgWoods_EventScript_22E284:: @ 822E284 trainerbattle_single TRAINER_JAMES_1, PetalburgWoods_Text_22E827, PetalburgWoods_Text_22E86B, PetalburgWoods_EventScript_22E2C5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq PetalburgWoods_EventScript_22E31B + goto_if_eq PetalburgWoods_EventScript_22E31B setvar VAR_0x8004, 621 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 - goto_eq PetalburgWoods_EventScript_22E2EF + goto_if_eq PetalburgWoods_EventScript_22E2EF msgbox PetalburgWoods_Text_22E889, MSGBOX_DEFAULT release end @@ -293,8 +292,7 @@ PetalburgWoods_EventScript_22E284:: @ 822E284 PetalburgWoods_EventScript_22E2C5:: @ 822E2C5 special sub_80B4808 waitmovement 0 - checkflag FLAG_HAS_MATCH_CALL - goto_eq PetalburgWoods_EventScript_22E2D6 + goto_if_set FLAG_HAS_MATCH_CALL, PetalburgWoods_EventScript_22E2D6 release end @@ -305,8 +303,7 @@ PetalburgWoods_EventScript_22E2D6:: @ 822E2D6 end PetalburgWoods_EventScript_22E2EF:: @ 822E2EF - checkflag FLAG_HAS_MATCH_CALL - goto_eq PetalburgWoods_EventScript_22E302 + goto_if_set FLAG_HAS_MATCH_CALL, PetalburgWoods_EventScript_22E302 msgbox PetalburgWoods_Text_22E889, MSGBOX_DEFAULT release end diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index f724914ba..deea27e74 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -23,7 +23,7 @@ Route101_EventScript_1EBCDE:: @ 81EBCDE closemessage setobjectxy 2, 0, 15 setobjectxy 4, 0, 16 - applymovement 255, Route101_Movement_1EBDC2 + applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_1EBDC2 applymovement 2, Route101_Movement_1EBDE7 applymovement 4, Route101_Movement_1EBDB5 waitmovement 0 @@ -45,7 +45,7 @@ Route101_EventScript_1EBD4E:: @ 81EBD4E lockall msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT closemessage - applymovement 255, Route101_Movement_1EBD90 + applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_1EBD90 waitmovement 0 releaseall end @@ -54,7 +54,7 @@ Route101_EventScript_1EBD64:: @ 81EBD64 lockall msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT closemessage - applymovement 255, Route101_Movement_1EBD92 + applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_1EBD92 waitmovement 0 releaseall end @@ -63,7 +63,7 @@ Route101_EventScript_1EBD7A:: @ 81EBD7A lockall msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT closemessage - applymovement 255, Route101_Movement_1EBD94 + applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_1EBD94 waitmovement 0 releaseall end @@ -222,8 +222,8 @@ Route101_EventScript_1EBE16:: @ 81EBE16 setflag FLAG_0x052 fadescreen 1 removeobject 4 - setobjectxy 255, 6, 13 - applymovement 255, Route101_Movement_2725A4 + setobjectxy EVENT_OBJ_ID_PLAYER, 6, 13 + applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_2725A4 waitmovement 0 special ChooseStarter waitstate @@ -239,9 +239,9 @@ Route101_EventScript_1EBE16:: @ 81EBE16 clearflag FLAG_SPECIAL_FLAG_0x4000 checkplayergender compare VAR_RESULT, 0 - call_if 1, Route101_EventScript_1EBE85 + call_if_eq Route101_EventScript_1EBE85 compare VAR_RESULT, 1 - call_if 1, Route101_EventScript_1EBE89 + call_if_eq Route101_EventScript_1EBE89 warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate release diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index 0a2ba36ba..ada20447a 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -21,11 +21,11 @@ Route102_EventScript_1EC105:: @ 81EC105 trainerbattle_single TRAINER_CALVIN_1, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route102_EventScript_1EC19C + goto_if_eq Route102_EventScript_1EC19C setvar VAR_0x8004, 318 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 - goto_eq Route102_EventScript_1EC170 + goto_if_eq Route102_EventScript_1EC170 msgbox Route102_Text_2945AC, MSGBOX_DEFAULT release end @@ -33,8 +33,7 @@ Route102_EventScript_1EC105:: @ 81EC105 Route102_EventScript_1EC146:: @ 81EC146 special sub_80B4808 waitmovement 0 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route102_EventScript_1EC157 + goto_if_set FLAG_HAS_MATCH_CALL, Route102_EventScript_1EC157 release end @@ -45,8 +44,7 @@ Route102_EventScript_1EC157:: @ 81EC157 end Route102_EventScript_1EC170:: @ 81EC170 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route102_EventScript_1EC183 + goto_if_set FLAG_HAS_MATCH_CALL, Route102_EventScript_1EC183 msgbox Route102_Text_2945AC, MSGBOX_DEFAULT release end diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index e79ddd041..6b793286e 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -9,8 +9,7 @@ Route103_MapScript1_1EC399: @ 81EC399 end Route103_MapScript1_1EC3A4: @ 81EC3A4 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, Route103_EventScript_1EC3AE + call_if_set FLAG_SYS_GAME_CLEAR, Route103_EventScript_1EC3AE end Route103_EventScript_1EC3AE:: @ 81EC3AE @@ -22,9 +21,9 @@ Route103_EventScript_1EC3C1:: @ 81EC3C1 lockall checkplayergender compare VAR_RESULT, 0 - goto_eq Route103_EventScript_1EC3DA + goto_if_eq Route103_EventScript_1EC3DA compare VAR_RESULT, 1 - goto_eq Route103_EventScript_1EC434 + goto_if_eq Route103_EventScript_1EC434 end Route103_EventScript_1EC3DA:: @ 81EC3DA @@ -111,7 +110,7 @@ Route103_EventScript_1EC50A:: @ 81EC50A end Route103_EventScript_1EC53D:: @ 81EC53D - applymovement 255, Route103_Movement_1EC5C8 + applymovement EVENT_OBJ_ID_PLAYER, Route103_Movement_1EC5C8 applymovement 2, Route103_Movement_1EC5BE waitmovement 0 playse SE_DANSA @@ -121,7 +120,7 @@ Route103_EventScript_1EC53D:: @ 81EC53D end Route103_EventScript_1EC561:: @ 81EC561 - applymovement 255, Route103_Movement_1EC5D6 + applymovement EVENT_OBJ_ID_PLAYER, Route103_Movement_1EC5D6 applymovement 2, Route103_Movement_1EC5CE waitmovement 0 playse SE_DANSA @@ -211,7 +210,7 @@ Route103_EventScript_1EC60B:: @ 81EC60B trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route103_EventScript_1EC653 + goto_if_eq Route103_EventScript_1EC653 msgbox Route103_Text_294A52, MSGBOX_AUTOCLOSE end @@ -230,7 +229,7 @@ Route103_EventScript_1EC66E:: @ 81EC66E trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route103_EventScript_1EC6B6 + goto_if_eq Route103_EventScript_1EC6B6 msgbox Route103_Text_294B40, MSGBOX_AUTOCLOSE end @@ -254,7 +253,7 @@ Route103_EventScript_1EC6E8:: @ 81EC6E8 trainerbattle_single TRAINER_MIGUEL_1, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route103_EventScript_1EC733 + goto_if_eq Route103_EventScript_1EC733 msgbox Route103_Text_294F42, MSGBOX_DEFAULT release end diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 1d591793d..2dfb42d74 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -19,10 +19,8 @@ Route104_MapScript1_1ECC4E: @ 81ECC4E end Route104_EventScript_1ECC5E:: @ 81ECC5E - checkflag FLAG_0x07F - goto_if 0, Route104_EventScript_1ECC74 - checkflag FLAG_BADGE03_GET - goto_if 0, Route104_EventScript_1ECC74 + goto_if_unset FLAG_0x07F, Route104_EventScript_1ECC74 + goto_if_unset FLAG_BADGE03_GET, Route104_EventScript_1ECC74 clearflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST return @@ -32,11 +30,9 @@ Route104_EventScript_1ECC74:: @ 81ECC74 Route104_EventScript_1ECC78:: @ 81ECC78 compare VAR_0x408E, 1 - goto_if 4, Route104_EventScript_1ECC9D - checkflag FLAG_0x120 - goto_eq Route104_EventScript_1ECC9D - checkflag FLAG_0x07C - goto_if 0, Route104_EventScript_1ECC9D + goto_if_ge Route104_EventScript_1ECC9D + goto_if_set FLAG_0x120, Route104_EventScript_1ECC9D + goto_if_unset FLAG_0x07C, Route104_EventScript_1ECC9D setobjectxyperm 34, 17, 52 return @@ -55,12 +51,12 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 setflag FLAG_HIDE_RUSBORO_CITY_RIVAL setvar VAR_0x405A, 8 setvar VAR_0x4063, 2 - applymovement 255, Route104_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_2725A6 waitmovement 0 delay 10 addobject 34 clearflag FLAG_HIDE_ROUTE_104_RIVAL - applymovement 255, Route104_Movement_1ECF86 + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ECF86 waitmovement 0 applymovement 34, Route104_Movement_1ECF8A waitmovement 0 @@ -77,9 +73,9 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 Route104_EventScript_1ECD11:: @ 81ECD11 checkplayergender compare VAR_RESULT, 0 - goto_eq Route104_EventScript_1ECD29 + goto_if_eq Route104_EventScript_1ECD29 compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ECD2E + goto_if_eq Route104_EventScript_1ECD2E return Route104_EventScript_1ECD29:: @ 81ECD29 @@ -93,16 +89,14 @@ Route104_EventScript_1ECD2E:: @ 81ECD2E Route104_EventScript_1ECD33:: @ 81ECD33 checkplayergender compare VAR_RESULT, 0 - goto_eq Route104_EventScript_1ECD4B + goto_if_eq Route104_EventScript_1ECD4B compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ECE6F + goto_if_eq Route104_EventScript_1ECE6F end Route104_EventScript_1ECD4B:: @ 81ECD4B - checkflag FLAG_0x07D - goto_eq Route104_EventScript_1ECE1C - checkflag FLAG_0x07C - goto_eq Route104_EventScript_1ECDD0 + goto_if_set FLAG_0x07D, Route104_EventScript_1ECE1C + goto_if_set FLAG_0x07C, Route104_EventScript_1ECDD0 setflag FLAG_0x07C msgbox Route104_Text_1EDBFF, MSGBOX_DEFAULT closemessage @@ -113,7 +107,7 @@ Route104_EventScript_1ECD4B:: @ 81ECD4B closemessage delay 30 setflag FLAG_0x0FD - applymovement 255, Route104_Movement_1ECDCD + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ECDCD applymovement 34, Route104_Movement_1ECDC8 msgbox Route104_Text_1EDCB1, MSGBOX_DEFAULT closemessage @@ -123,7 +117,7 @@ Route104_EventScript_1ECD4B:: @ 81ECD4B moveobjectoffscreen 34 msgbox Route104_Text_1EDCED, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ECDED + goto_if_eq Route104_EventScript_1ECDED msgbox Route104_Text_1EDD2A, MSGBOX_DEFAULT call Route104_EventScript_1ECE31 releaseall @@ -146,7 +140,7 @@ Route104_Movement_1ECDCD: @ 81ECDCD Route104_EventScript_1ECDD0:: @ 81ECDD0 msgbox Route104_Text_1EDD9F, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ECDED + goto_if_eq Route104_EventScript_1ECDED msgbox Route104_Text_1EDD2A, MSGBOX_DEFAULT releaseall end @@ -162,7 +156,7 @@ Route104_EventScript_1ECDED:: @ 81ECDED Route104_EventScript_1ECE1C:: @ 81ECE1C msgbox Route104_Text_1EDE3E, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if 1, Route104_EventScript_1ECE31 + call_if_eq Route104_EventScript_1ECE31 releaseall end @@ -190,10 +184,8 @@ Route104_EventScript_1ECE5C:: @ 81ECE5C end Route104_EventScript_1ECE6F:: @ 81ECE6F - checkflag FLAG_0x07D - goto_eq Route104_EventScript_1ECF38 - checkflag FLAG_0x07C - goto_eq Route104_EventScript_1ECEEC + goto_if_set FLAG_0x07D, Route104_EventScript_1ECF38 + goto_if_set FLAG_0x07C, Route104_EventScript_1ECEEC setflag FLAG_0x07C msgbox Route104_Text_1EDF04, MSGBOX_DEFAULT closemessage @@ -204,7 +196,7 @@ Route104_EventScript_1ECE6F:: @ 81ECE6F closemessage delay 30 setflag FLAG_0x0FD - applymovement 255, Route104_Movement_1ECDCD + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ECDCD applymovement 34, Route104_Movement_1ECDC8 msgbox Route104_Text_1EDFC6, MSGBOX_DEFAULT closemessage @@ -214,7 +206,7 @@ Route104_EventScript_1ECE6F:: @ 81ECE6F moveobjectoffscreen 34 msgbox Route104_Text_1EE009, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ECF09 + goto_if_eq Route104_EventScript_1ECF09 msgbox Route104_Text_1EE04D, MSGBOX_DEFAULT call Route104_EventScript_1ECE31 releaseall @@ -223,7 +215,7 @@ Route104_EventScript_1ECE6F:: @ 81ECE6F Route104_EventScript_1ECEEC:: @ 81ECEEC msgbox Route104_Text_1EE094, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ECF09 + goto_if_eq Route104_EventScript_1ECF09 msgbox Route104_Text_1EE04D, MSGBOX_DEFAULT releaseall end @@ -239,7 +231,7 @@ Route104_EventScript_1ECF09:: @ 81ECF09 Route104_EventScript_1ECF38:: @ 81ECF38 msgbox Route104_Text_1EE120, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if 1, Route104_EventScript_1ECE31 + call_if_eq Route104_EventScript_1ECE31 releaseall end @@ -274,12 +266,11 @@ Route104_Movement_1ECF8A: @ 81ECF8A Route104_EventScript_1ECF8C:: @ 81ECF8C lock faceplayer - checkflag FLAG_0x0F6 - goto_eq Route104_EventScript_1ECFC3 + goto_if_set FLAG_0x0F6, Route104_EventScript_1ECFC3 msgbox Route104_Text_2A6D86, MSGBOX_DEFAULT giveitem_std ITEM_CHESTO_BERRY compare VAR_RESULT, 0 - goto_eq Route104_EventScript_272054 + goto_if_eq Route104_EventScript_272054 setflag FLAG_0x0F6 msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT release @@ -293,12 +284,11 @@ Route104_EventScript_1ECFC3:: @ 81ECFC3 Route104_EventScript_1ECFCD:: @ 81ECFCD lock faceplayer - checkflag FLAG_0x117 - goto_eq Route104_EventScript_1ECFFC + goto_if_set FLAG_0x117, Route104_EventScript_1ECFFC msgbox Route104_Text_1ED96A, MSGBOX_DEFAULT giveitem_std ITEM_WHITE_HERB compare VAR_RESULT, 0 - goto_eq Route104_EventScript_272054 + goto_if_eq Route104_EventScript_272054 setflag FLAG_0x117 release end @@ -347,12 +337,11 @@ Route104_EventScript_1ED04E:: @ 81ED04E Route104_EventScript_1ED057:: @ 81ED057 lock faceplayer - checkflag FLAG_0x106 - goto_eq Route104_EventScript_1ED086 + goto_if_set FLAG_0x106, Route104_EventScript_1ED086 msgbox Route104_Text_1ED838, MSGBOX_DEFAULT giveitem_std ITEM_TM09 compare VAR_RESULT, 0 - goto_eq Route104_EventScript_272054 + goto_if_eq Route104_EventScript_272054 setflag FLAG_0x106 release end @@ -368,29 +357,27 @@ Route104_EventScript_1ED090:: @ 81ED090 Route104_EventScript_1ED099:: @ 81ED099 setobjectpriority 8, MAP_ROUTE104, 0 - setobjectpriority 255, MAP_ROUTE104, 0 + setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104, 0 applymovement 8, Route104_Movement_1ED359 waitmovement 0 removeobject 8 - applymovement 255, Route104_Movement_1ED34F + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED34F waitmovement 0 - hideobjectat 255, MAP_ROUTE104 + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 call Route104_EventScript_2720A0 - checkflag FLAG_0x132 - goto_eq Route104_EventScript_1ED0D9 - checkflag FLAG_0x132 - goto_if 0, Route104_EventScript_1ED0EF + goto_if_set FLAG_0x132, Route104_EventScript_1ED0D9 + goto_if_unset FLAG_0x132, Route104_EventScript_1ED0EF end Route104_EventScript_1ED0D9:: @ 81ED0D9 applymovement 7, Route104_Movement_1ED28C - applymovement 255, Route104_Movement_1ED28C + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED28C waitmovement 0 goto Route104_EventScript_1ED139 Route104_EventScript_1ED0EF:: @ 81ED0EF applymovement 7, Route104_Movement_1ED1C8 - applymovement 255, Route104_Movement_1ED1C8 + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED1C8 waitmovement 0 pokenavcall Route104_Text_1EE336 waitmessage @@ -401,7 +388,7 @@ Route104_EventScript_1ED0EF:: @ 81ED0EF closemessage delay 30 setflag FLAG_0x132 - applymovement 255, Route104_Movement_1ED22A + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED22A applymovement 7, Route104_Movement_1ED22A, MAP_ROUTE104 waitmovement 7, MAP_ROUTE104 waitmovement 0 @@ -409,11 +396,11 @@ Route104_EventScript_1ED0EF:: @ 81ED0EF Route104_EventScript_1ED139:: @ 81ED139 delay 50 - applymovement 255, Route104_Movement_1ED353 + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED353 waitmovement 0 call Route104_EventScript_2720A8 - showobjectat 255, MAP_DEWFORD_TOWN - applymovement 255, Route104_Movement_1ED355 + showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED355 waitmovement 0 setobjectxyperm 2, 12, 8 addobject 2 @@ -427,14 +414,12 @@ Route104_EventScript_1ED139:: @ 81ED139 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT hideobjectat 7, MAP_ROUTE104 copyvar VAR_0x4096, VAR_0x8008 - resetobjectpriority 255, MAP_ROUTE104 + resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 setvar VAR_0x408E, 0 - checkflag FLAG_0x0BD - goto_if 0, Route104_EventScript_1ED1B4 - checkflag FLAG_0x0BD - goto_eq Route104_EventScript_1ED1BE + goto_if_unset FLAG_0x0BD, Route104_EventScript_1ED1B4 + goto_if_set FLAG_0x0BD, Route104_EventScript_1ED1BE end Route104_EventScript_1ED1B4:: @ 81ED1B4 @@ -884,11 +869,11 @@ Route104_EventScript_1ED38D:: @ 81ED38D trainerbattle_single TRAINER_HALEY_1, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ED424 + goto_if_eq Route104_EventScript_1ED424 setvar VAR_0x8004, 604 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 - goto_eq Route104_EventScript_1ED3F8 + goto_if_eq Route104_EventScript_1ED3F8 msgbox Route104_Text_295689, MSGBOX_DEFAULT release end @@ -896,8 +881,7 @@ Route104_EventScript_1ED38D:: @ 81ED38D Route104_EventScript_1ED3CE:: @ 81ED3CE special sub_80B4808 waitmovement 0 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route104_EventScript_1ED3DF + goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED3DF release end @@ -908,8 +892,7 @@ Route104_EventScript_1ED3DF:: @ 81ED3DF end Route104_EventScript_1ED3F8:: @ 81ED3F8 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route104_EventScript_1ED40B + goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED40B msgbox Route104_Text_295689, MSGBOX_DEFAULT release end @@ -929,11 +912,11 @@ Route104_EventScript_1ED43B:: @ 81ED43B trainerbattle_single TRAINER_WINSTON_1, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ED4D2 + goto_if_eq Route104_EventScript_1ED4D2 setvar VAR_0x8004, 136 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 - goto_eq Route104_EventScript_1ED4A6 + goto_if_eq Route104_EventScript_1ED4A6 msgbox Route104_Text_2958C1, MSGBOX_DEFAULT release end @@ -941,8 +924,7 @@ Route104_EventScript_1ED43B:: @ 81ED43B Route104_EventScript_1ED47C:: @ 81ED47C special sub_80B4808 waitmovement 0 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route104_EventScript_1ED48D + goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED48D release end @@ -953,8 +935,7 @@ Route104_EventScript_1ED48D:: @ 81ED48D end Route104_EventScript_1ED4A6:: @ 81ED4A6 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route104_EventScript_1ED4B9 + goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED4B9 msgbox Route104_Text_2958C1, MSGBOX_DEFAULT release end @@ -974,11 +955,11 @@ Route104_EventScript_1ED4E9:: @ 81ED4E9 trainerbattle_single TRAINER_CINDY_1, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route104_EventScript_1ED580 + goto_if_eq Route104_EventScript_1ED580 setvar VAR_0x8004, 114 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 - goto_eq Route104_EventScript_1ED554 + goto_if_eq Route104_EventScript_1ED554 msgbox Route104_Text_295AC3, MSGBOX_DEFAULT release end @@ -986,8 +967,7 @@ Route104_EventScript_1ED4E9:: @ 81ED4E9 Route104_EventScript_1ED52A:: @ 81ED52A special sub_80B4808 waitmovement 0 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route104_EventScript_1ED53B + goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED53B release end @@ -998,8 +978,7 @@ Route104_EventScript_1ED53B:: @ 81ED53B end Route104_EventScript_1ED554:: @ 81ED554 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route104_EventScript_1ED567 + goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED567 msgbox Route104_Text_295AC3, MSGBOX_DEFAULT release end diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index e8fc402c5..90298a924 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -5,9 +5,8 @@ Route104_MrBrineysHouse_MapScripts:: @ 8229D2E Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34 setflag FLAG_LANDMARK_MR_BRINEY_HOUSE compare VAR_0x4090, 1 - call_if 1, Route104_MrBrineysHouse_EventScript_229D50 - checkflag FLAG_0x0BC - call_if 1, Route104_MrBrineysHouse_EventScript_229D4C + call_if_eq Route104_MrBrineysHouse_EventScript_229D50 + call_if_set FLAG_0x0BC, Route104_MrBrineysHouse_EventScript_229D4C end Route104_MrBrineysHouse_EventScript_229D4C:: @ 8229D4C @@ -24,12 +23,9 @@ Route104_MrBrineysHouse_EventScript_229D50:: @ 8229D50 Route104_MrBrineysHouse_EventScript_229D67:: @ 8229D67 lock faceplayer - checkflag FLAG_0x093 - call_if 0, Route104_MrBrineysHouse_EventScript_229D8A - checkflag FLAG_0x0BD - goto_if 0, Route104_MrBrineysHouse_EventScript_229DE1 - checkflag FLAG_0x095 - goto_if 0, Route104_MrBrineysHouse_EventScript_229DFA + call_if_unset FLAG_0x093, Route104_MrBrineysHouse_EventScript_229D8A + goto_if_unset FLAG_0x0BD, Route104_MrBrineysHouse_EventScript_229DE1 + goto_if_unset FLAG_0x095, Route104_MrBrineysHouse_EventScript_229DFA goto Route104_MrBrineysHouse_EventScript_229DAE end @@ -38,7 +34,7 @@ Route104_MrBrineysHouse_EventScript_229D8A:: @ 8229D8A msgbox Route104_MrBrineysHouse_Text_229E70, MSGBOX_DEFAULT msgbox Route104_MrBrineysHouse_Text_229E9B, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route104_MrBrineysHouse_EventScript_229E13 + goto_if_eq Route104_MrBrineysHouse_EventScript_229E13 goto Route104_MrBrineysHouse_EventScript_229E27 end @@ -55,14 +51,14 @@ Route104_MrBrineysHouse_EventScript_229DAE:: @ 8229DAE Route104_MrBrineysHouse_EventScript_229DE1:: @ 8229DE1 msgbox Route104_MrBrineysHouse_Text_22A0AD, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route104_MrBrineysHouse_EventScript_229E13 + goto_if_eq Route104_MrBrineysHouse_EventScript_229E13 goto Route104_MrBrineysHouse_EventScript_229E27 end Route104_MrBrineysHouse_EventScript_229DFA:: @ 8229DFA msgbox Route104_MrBrineysHouse_Text_22A18F, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route104_MrBrineysHouse_EventScript_229E13 + goto_if_eq Route104_MrBrineysHouse_EventScript_229E13 goto Route104_MrBrineysHouse_EventScript_229E27 end diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index 08b5b7389..fc0acf329 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -4,10 +4,8 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 822A34C Route104_PrettyPetalFlowerShop_MapScript1_22A352: @ 822A352 setflag FLAG_LANDMARK_FLOWER_SHOP - checkflag FLAG_0x07F - goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_22A36B - checkflag FLAG_BADGE03_GET - goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_22A36B + goto_if_unset FLAG_0x07F, Route104_PrettyPetalFlowerShop_EventScript_22A36B + goto_if_unset FLAG_BADGE03_GET, Route104_PrettyPetalFlowerShop_EventScript_22A36B setflag FLAG_TEMP_1 end @@ -18,26 +16,24 @@ Route104_PrettyPetalFlowerShop_EventScript_22A36B:: @ 822A36B Route104_PrettyPetalFlowerShop_EventScript_22A373:: @ 822A373 lock faceplayer - checkflag FLAG_TEMP_1 - goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A3E4 + goto_if_set FLAG_TEMP_1, Route104_PrettyPetalFlowerShop_EventScript_22A3E4 msgbox Route104_PrettyPetalFlowerShop_Text_2A7686, MSGBOX_DEFAULT - checkflag FLAG_0x07F - goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A3B2 + goto_if_set FLAG_0x07F, Route104_PrettyPetalFlowerShop_EventScript_22A3B2 setflag FLAG_0x07F msgbox Route104_PrettyPetalFlowerShop_Text_2A7706, MSGBOX_YESNO compare VAR_RESULT, 1 - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3D2 + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3D2 compare VAR_RESULT, 0 - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3DB + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3DB release end Route104_PrettyPetalFlowerShop_EventScript_22A3B2:: @ 822A3B2 msgbox Route104_PrettyPetalFlowerShop_Text_2A76D9, MSGBOX_YESNO compare VAR_RESULT, 1 - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3D2 + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3D2 compare VAR_RESULT, 0 - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3DB + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3DB release end @@ -72,8 +68,7 @@ Route104_PrettyPetalFlowerShop_Pokemart_22A3FC: @ 822A3FC Route104_PrettyPetalFlowerShop_EventScript_22A40C:: @ 822A40C lock faceplayer - checkflag FLAG_0x05E - goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_22A421 + goto_if_unset FLAG_0x05E, Route104_PrettyPetalFlowerShop_EventScript_22A421 msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, MSGBOX_DEFAULT release end @@ -90,14 +85,13 @@ Route104_PrettyPetalFlowerShop_EventScript_22A442:: @ 822A442 lock faceplayer dodailyevents - checkflag FLAG_0x930 - goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A482 + goto_if_set FLAG_0x930, Route104_PrettyPetalFlowerShop_EventScript_22A482 msgbox Route104_PrettyPetalFlowerShop_Text_2A7A98, MSGBOX_DEFAULT random 8 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_eq Route104_PrettyPetalFlowerShop_EventScript_272054 + goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_272054 setflag FLAG_0x930 msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT release diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 617e84350..adb8c4f8e 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -5,12 +5,11 @@ Route105_MapScripts:: @ 81EE1DB .byte 0 Route105_MapScript1_1EE1EB: @ 81EE1EB - checkflag FLAG_0x0E4 - call_if 0, Route105_EventScript_1EE20B + call_if_unset FLAG_0x0E4, Route105_EventScript_1EE20B compare VAR_0x4037, 9 - call_if 1, Route105_EventScript_2739AB + call_if_eq Route105_EventScript_2739AB compare VAR_0x4037, 10 - call_if 1, Route105_EventScript_273A18 + call_if_eq Route105_EventScript_273A18 end Route105_EventScript_1EE20B:: @ 81EE20B @@ -20,11 +19,11 @@ Route105_EventScript_1EE20B:: @ 81EE20B Route105_MapScript1_1EE21E: @ 81EE21E compare VAR_0x4039, 1 - call_if 1, Route105_EventScript_273D13 + call_if_eq Route105_EventScript_273D13 compare VAR_0x4037, 9 - call_if 1, Route105_EventScript_273D17 + call_if_eq Route105_EventScript_273D17 compare VAR_0x4037, 10 - call_if 1, Route105_EventScript_273D17 + call_if_eq Route105_EventScript_273D17 end Route105_MapScript2_1EE240: @ 81EE240 @@ -65,7 +64,7 @@ Route105_EventScript_1EE2D4:: @ 81EE2D4 trainerbattle_single TRAINER_ANDRES_1, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route105_EventScript_1EE31F + goto_if_eq Route105_EventScript_1EE31F msgbox Route105_Text_2960FA, MSGBOX_DEFAULT release end diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc index 533f65254..f27ce9647 100644 --- a/data/maps/Route106/scripts.inc +++ b/data/maps/Route106/scripts.inc @@ -19,7 +19,7 @@ Route106_EventScript_1EE4C1:: @ 81EE4C1 trainerbattle_single TRAINER_ELLIOT_1, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route106_EventScript_1EE50C + goto_if_eq Route106_EventScript_1EE50C msgbox Route106_Text_29638C, MSGBOX_DEFAULT release end diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc index 5f840b3fb..90f67a639 100644 --- a/data/maps/Route107/scripts.inc +++ b/data/maps/Route107/scripts.inc @@ -10,7 +10,7 @@ Route107_EventScript_1EE5AC:: @ 81EE5AC trainerbattle_single TRAINER_TONY_1, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route107_EventScript_1EE5F7 + goto_if_eq Route107_EventScript_1EE5F7 msgbox Route107_Text_2967FF, MSGBOX_DEFAULT release end diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc index 73ddb031d..15a657a20 100644 --- a/data/maps/Route108/scripts.inc +++ b/data/maps/Route108/scripts.inc @@ -30,7 +30,7 @@ Route108_EventScript_1EE6FD:: @ 81EE6FD trainerbattle_single TRAINER_CORY_1, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route108_EventScript_1EE748 + goto_if_eq Route108_EventScript_1EE748 msgbox Route108_Text_296FB0, MSGBOX_DEFAULT release end diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 52f6437ae..2e588f813 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -4,7 +4,7 @@ Route109_MapScripts:: @ 81EE75F Route109_EventScript_1EE760:: @ 81EE760 call Route109_EventScript_271E95 setobjectpriority 2, MAP_ROUTE109, 0 - setobjectpriority 255, MAP_ROUTE109, 0 + setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109, 0 applymovement 2, Route109_Movement_1EE90B waitmovement 0 removeobject 2 @@ -15,33 +15,33 @@ Route109_EventScript_1EE760:: @ 81EE760 end Route109_EventScript_1EE7A5:: @ 81EE7A5 - applymovement 255, Route109_Movement_1EE8FD + applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE8FD waitmovement 0 goto Route109_EventScript_1EE7D5 end Route109_EventScript_1EE7B5:: @ 81EE7B5 - applymovement 255, Route109_Movement_1EE905 + applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE905 waitmovement 0 goto Route109_EventScript_1EE7D5 end Route109_EventScript_1EE7C5:: @ 81EE7C5 - applymovement 255, Route109_Movement_1EE908 + applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE908 waitmovement 0 goto Route109_EventScript_1EE7D5 end Route109_EventScript_1EE7D5:: @ 81EE7D5 - hideobjectat 255, MAP_ROUTE109 + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 call Route109_EventScript_2720A0 applymovement 1, Route109_Movement_1EE84F - applymovement 255, Route109_Movement_1EE84F + applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE84F waitmovement 0 delay 50 call Route109_EventScript_2720A8 - showobjectat 255, MAP_DEWFORD_TOWN - applymovement 255, Route109_Movement_1EE900 + showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN + applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_1EE900 waitmovement 0 addobject 4 clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN @@ -56,7 +56,7 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5 msgbox Route109_Text_1E9C1D, MSGBOX_DEFAULT closemessage copyvar VAR_0x4096, VAR_0x8008 - resetobjectpriority 255, MAP_ROUTE109 + resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 release @@ -272,8 +272,7 @@ Route109_Movement_1EE90D: @ 81EE90D Route109_EventScript_1EE910:: @ 81EE910 lock faceplayer - checkflag FLAG_0x095 - goto_if 0, Route109_EventScript_1EE921 + goto_if_unset FLAG_0x095, Route109_EventScript_1EE921 goto Route109_EventScript_1EE93F end @@ -281,7 +280,7 @@ Route109_EventScript_1EE921:: @ 81EE921 message Route109_Text_1EEC96 msgbox Route109_Text_1EEC96, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route109_EventScript_1EE981 + goto_if_eq Route109_EventScript_1EE981 goto Route109_EventScript_1EE972 end @@ -329,12 +328,11 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 lock faceplayer special GetPlayerBigGuyGirlString - checkflag FLAG_0x118 - goto_eq Route109_EventScript_1EE9F2 + goto_if_set FLAG_0x118, Route109_EventScript_1EE9F2 msgbox Route109_Text_1EEFDE, MSGBOX_DEFAULT giveitem_std ITEM_SOFT_SAND compare VAR_RESULT, 0 - goto_eq Route109_EventScript_272054 + goto_if_eq Route109_EventScript_272054 closemessage applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 waitmovement 0 @@ -399,7 +397,7 @@ Route109_EventScript_1EEA99:: @ 81EEA99 trainerbattle_single TRAINER_RICKY_1, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route109_EventScript_1EEAE4 + goto_if_eq Route109_EventScript_1EEAE4 msgbox Route109_Text_297380, MSGBOX_DEFAULT release end @@ -421,7 +419,7 @@ Route109_EventScript_1EEAFB:: @ 81EEAFB trainerbattle_single TRAINER_LOLA_1, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route109_EventScript_1EEB46 + goto_if_eq Route109_EventScript_1EEB46 msgbox Route109_Text_2974D6, MSGBOX_DEFAULT release end diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index fd0b224bc..3056159cd 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -9,12 +9,9 @@ Route109_SeashoreHouse_MapScript1_2693FA: @ 82693FA Route109_SeashoreHouse_EventScript_2693FE:: @ 82693FE lock faceplayer - checkflag FLAG_0x08C - goto_eq Route109_SeashoreHouse_EventScript_269460 - checkflag FLAG_0x08D - goto_eq Route109_SeashoreHouse_EventScript_269432 - checkflag FLAG_TEMP_2 - goto_eq Route109_SeashoreHouse_EventScript_269428 + goto_if_set FLAG_0x08C, Route109_SeashoreHouse_EventScript_269460 + goto_if_set FLAG_0x08D, Route109_SeashoreHouse_EventScript_269432 + goto_if_set FLAG_TEMP_2, Route109_SeashoreHouse_EventScript_269428 msgbox Route109_SeashoreHouse_Text_269555, MSGBOX_DEFAULT setflag FLAG_TEMP_2 release @@ -29,7 +26,7 @@ Route109_SeashoreHouse_EventScript_269432:: @ 8269432 msgbox Route109_SeashoreHouse_Text_269685, MSGBOX_DEFAULT giveitem_std ITEM_SODA_POP, 6 compare VAR_RESULT, 0 - goto_eq Route109_SeashoreHouse_EventScript_269456 + goto_if_eq Route109_SeashoreHouse_EventScript_269456 setflag FLAG_0x08C release end @@ -43,7 +40,7 @@ Route109_SeashoreHouse_EventScript_269460:: @ 8269460 showmoneybox 0, 0, 0 msgbox Route109_SeashoreHouse_Text_26977E, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route109_SeashoreHouse_EventScript_269484 + goto_if_eq Route109_SeashoreHouse_EventScript_269484 msgbox Route109_SeashoreHouse_Text_2697EF, MSGBOX_DEFAULT hidemoneybox nop @@ -54,10 +51,10 @@ Route109_SeashoreHouse_EventScript_269460:: @ 8269460 Route109_SeashoreHouse_EventScript_269484:: @ 8269484 checkmoney 0x12c, 0 compare VAR_RESULT, 0 - goto_eq Route109_SeashoreHouse_EventScript_2694C8 + goto_if_eq Route109_SeashoreHouse_EventScript_2694C8 checkitemspace ITEM_SODA_POP, 1 compare VAR_RESULT, 0 - goto_eq Route109_SeashoreHouse_EventScript_2694D5 + goto_if_eq Route109_SeashoreHouse_EventScript_2694D5 msgbox Route109_SeashoreHouse_Text_2697C8, MSGBOX_DEFAULT takemoney 0x12c, 0 updatemoneybox 0, 0 @@ -102,11 +99,11 @@ Route109_SeashoreHouse_EventScript_269518:: @ 8269518 Route109_SeashoreHouse_EventScript_269533:: @ 8269533 checktrainerflag TRAINER_DWAYNE - goto_if 0, Route109_SeashoreHouse_EventScript_269553 + goto_if_lt Route109_SeashoreHouse_EventScript_269553 checktrainerflag TRAINER_JOHANNA - goto_if 0, Route109_SeashoreHouse_EventScript_269553 + goto_if_lt Route109_SeashoreHouse_EventScript_269553 checktrainerflag TRAINER_SIMON - goto_if 0, Route109_SeashoreHouse_EventScript_269553 + goto_if_lt Route109_SeashoreHouse_EventScript_269553 setflag FLAG_0x08D release end diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index c5d53b5b4..ba7bced21 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -12,7 +12,7 @@ Route110_MapScript1_1EF27D: @ 81EF27D call Route110_EventScript_271ED7 call Route110_EventScript_271EFB compare VAR_CYCLING_CHALLENGE_STATE, 1 - call_if 1, Route110_EventScript_1EF293 + call_if_eq Route110_EventScript_1EF293 end Route110_EventScript_1EF293:: @ 81EF293 @@ -132,7 +132,7 @@ Route110_EventScript_1EF392:: @ 81EF392 lockall specialvar VAR_RESULT, GetRecordedCyclingRoadResults compare VAR_RESULT, 0 - goto_eq Route110_EventScript_1EF3AD + goto_if_eq Route110_EventScript_1EF3AD msgbox Route110_Text_1F0A1E, MSGBOX_DEFAULT releaseall end @@ -147,9 +147,9 @@ Route110_EventScript_1EF3B7:: @ 81EF3B7 faceplayer specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 1 - goto_eq Route110_EventScript_1EF3E8 + goto_if_eq Route110_EventScript_1EF3E8 compare VAR_CYCLING_CHALLENGE_STATE, 0 - goto_eq Route110_EventScript_1EF3DE + goto_if_eq Route110_EventScript_1EF3DE msgbox Route110_Text_1F06FB, MSGBOX_DEFAULT release end @@ -178,7 +178,7 @@ Route110_EventScript_1EF420:: @ 81EF420 trainerbattle_single TRAINER_EDWIN_1, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route110_EventScript_1EF46B + goto_if_eq Route110_EventScript_1EF46B msgbox Route110_Text_2981B3, MSGBOX_DEFAULT release end @@ -215,7 +215,7 @@ Route110_EventScript_1EF4C7:: @ 81EF4C7 trainerbattle_single TRAINER_BENJAMIN_1, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route110_EventScript_1EF512 + goto_if_eq Route110_EventScript_1EF512 msgbox Route110_Text_297CB4, MSGBOX_DEFAULT release end @@ -242,7 +242,7 @@ Route110_EventScript_1EF540:: @ 81EF540 trainerbattle_single TRAINER_ABIGAIL_1, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route110_EventScript_1EF58B + goto_if_eq Route110_EventScript_1EF58B msgbox Route110_Text_297E88, MSGBOX_DEFAULT release end @@ -264,7 +264,7 @@ Route110_EventScript_1EF5A2:: @ 81EF5A2 trainerbattle_single TRAINER_ISABEL_1, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route110_EventScript_1EF5ED + goto_if_eq Route110_EventScript_1EF5ED msgbox Route110_Text_2983A2, MSGBOX_DEFAULT release end @@ -380,9 +380,9 @@ Route110_EventScript_1EF76E:: @ 81EF76E lockall checkplayergender compare VAR_RESULT, 0 - call_if 1, Route110_EventScript_1EF7E1 + call_if_eq Route110_EventScript_1EF7E1 compare VAR_RESULT, 1 - call_if 1, Route110_EventScript_1EF7E6 + call_if_eq Route110_EventScript_1EF7E6 applymovement 28, Route110_Movement_2725AA waitmovement 0 applymovement 28, Route110_Movement_272598 @@ -391,16 +391,16 @@ Route110_EventScript_1EF76E:: @ 81EF76E waitmovement 0 delay 30 compare VAR_0x8008, 1 - call_if 1, Route110_EventScript_1EF94E + call_if_eq Route110_EventScript_1EF94E compare VAR_0x8008, 2 - call_if 1, Route110_EventScript_1EF959 + call_if_eq Route110_EventScript_1EF959 compare VAR_0x8008, 3 - call_if 1, Route110_EventScript_1EF964 + call_if_eq Route110_EventScript_1EF964 checkplayergender compare VAR_RESULT, 0 - goto_eq Route110_EventScript_1EF7EB + goto_if_eq Route110_EventScript_1EF7EB compare VAR_RESULT, 1 - goto_eq Route110_EventScript_1EF865 + goto_if_eq Route110_EventScript_1EF865 releaseall end @@ -479,22 +479,22 @@ Route110_EventScript_1EF8DF:: @ 81EF8DF Route110_EventScript_1EF8EC:: @ 81EF8EC closemessage compare VAR_0x8008, 1 - call_if 1, Route110_EventScript_1EF990 + call_if_eq Route110_EventScript_1EF990 compare VAR_0x8008, 2 - call_if 1, Route110_EventScript_1EF998 + call_if_eq Route110_EventScript_1EF998 compare VAR_0x8008, 3 - call_if 1, Route110_EventScript_1EF9A0 + call_if_eq Route110_EventScript_1EF9A0 setobjectmovementtype 28, 10 setobjectmovementtype 29, 10 removeobject 28 addobject 29 delay 45 compare VAR_0x8008, 1 - call_if 1, Route110_EventScript_1EF96F + call_if_eq Route110_EventScript_1EF96F compare VAR_0x8008, 2 - call_if 1, Route110_EventScript_1EF97A + call_if_eq Route110_EventScript_1EF97A compare VAR_0x8008, 3 - call_if 1, Route110_EventScript_1EF985 + call_if_eq Route110_EventScript_1EF985 removeobject 29 setvar VAR_0x4069, 1 savebgm MUS_DUMMY @@ -621,13 +621,13 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 applymovement 36, Route110_Movement_27259A waitmovement 0 compare VAR_0x8008, 1 - call_if 1, Route110_EventScript_1EFAD8 + call_if_eq Route110_EventScript_1EFAD8 compare VAR_0x8008, 2 - call_if 1, Route110_EventScript_1EFAE3 + call_if_eq Route110_EventScript_1EFAE3 compare VAR_0x8008, 3 - call_if 1, Route110_EventScript_1EFAEE + call_if_eq Route110_EventScript_1EFAEE compare VAR_0x8008, 4 - call_if 1, Route110_EventScript_1EFAF9 + call_if_eq Route110_EventScript_1EFAF9 msgbox Route110_Text_1F0AB5, MSGBOX_DEFAULT closemessage delay 20 @@ -652,13 +652,13 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 msgbox Route110_Text_1F0C33, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 1 - call_if 1, Route110_EventScript_1EFB04 + call_if_eq Route110_EventScript_1EFB04 compare VAR_0x8008, 2 - call_if 1, Route110_EventScript_1EFB0F + call_if_eq Route110_EventScript_1EFB0F compare VAR_0x8008, 3 - call_if 1, Route110_EventScript_1EFB1A + call_if_eq Route110_EventScript_1EFB1A compare VAR_0x8008, 4 - call_if 1, Route110_EventScript_1EFB25 + call_if_eq Route110_EventScript_1EFB25 removeobject 36 setvar VAR_0x40DA, 2 releaseall diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc index ee859748f..687fff9a7 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc @@ -12,7 +12,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84:: @ 826EA84 lockall specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 0 - goto_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F + goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F setflag FLAG_SYS_CYCLING_ROAD setvar VAR_TEMP_1, 1 releaseall @@ -21,7 +21,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84:: @ 826EA84 Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F:: @ 826EA9F msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48, MSGBOX_DEFAULT closemessage - applymovement 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_26EAB4 + applymovement EVENT_OBJ_ID_PLAYER, Route110_SeasideCyclingRoadNorthEntrance_Movement_26EAB4 waitmovement 0 releaseall end diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index 9bd6c845e..a993364e6 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -4,9 +4,9 @@ Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 826EBA1 Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7: @ 826EBA7 compare VAR_CYCLING_CHALLENGE_STATE, 3 - call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE + call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE compare VAR_CYCLING_CHALLENGE_STATE, 2 - call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE + call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE end Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE:: @ 826EBBE @@ -24,9 +24,9 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0:: @ 826EBD0 lockall specialvar VAR_RESULT, GetPlayerAvatarBike compare VAR_RESULT, 2 - call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6 + call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6 compare VAR_RESULT, 0 - goto_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC + goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC setflag FLAG_SYS_CYCLING_ROAD setvar VAR_TEMP_1, 1 releaseall @@ -39,7 +39,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6:: @ 826EBF6 Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC:: @ 826EBFC msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA, MSGBOX_DEFAULT closemessage - applymovement 255, Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11 + applymovement EVENT_OBJ_ID_PLAYER, Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11 waitmovement 0 releaseall end diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 892d9e65f..8326a7c02 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -7,7 +7,7 @@ Route110_TrickHouseEnd_MapScripts:: @ 826ACAF Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4 compare VAR_TEMP_1, 1 - call_if 1, Route110_TrickHouseEnd_EventScript_26AD0D + call_if_eq Route110_TrickHouseEnd_EventScript_26AD0D end Route110_TrickHouseEnd_MapScript1_26ACD0: @ 826ACD0 @@ -62,7 +62,7 @@ Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84 setvar VAR_0x40C1, 0 giveitem_std ITEM_RARE_CANDY compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF + call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF @@ -75,7 +75,7 @@ Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0 setvar VAR_0x40C1, 0 giveitem_std ITEM_TIMER_BALL compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF + call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF @@ -88,7 +88,7 @@ Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC setvar VAR_0x40C1, 0 giveitem_std ITEM_HARD_STONE compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF + call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF @@ -101,7 +101,7 @@ Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38 setvar VAR_0x40C1, 0 giveitem_std ITEM_SMOKE_BALL compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF + call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF @@ -114,7 +114,7 @@ Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74 setvar VAR_0x40C1, 0 giveitem_std ITEM_TM12 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF + call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF @@ -127,7 +127,7 @@ Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0 setvar VAR_0x40C1, 0 giveitem_std ITEM_MAGNET compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF + call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF @@ -140,7 +140,7 @@ Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC setvar VAR_0x40C1, 0 giveitem_std ITEM_PP_MAX compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF + call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF @@ -151,13 +151,13 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 msgbox Route110_TrickHouseEnd_Text_26B3AB, MSGBOX_DEFAULT closemessage compare VAR_FACING, 1 - call_if 1, Route110_TrickHouseEnd_EventScript_26B015 + call_if_eq Route110_TrickHouseEnd_EventScript_26B015 compare VAR_FACING, 2 - call_if 1, Route110_TrickHouseEnd_EventScript_26B020 + call_if_eq Route110_TrickHouseEnd_EventScript_26B020 compare VAR_FACING, 3 - call_if 1, Route110_TrickHouseEnd_EventScript_26B02B + call_if_eq Route110_TrickHouseEnd_EventScript_26B02B compare VAR_FACING, 4 - call_if 1, Route110_TrickHouseEnd_EventScript_26B036 + call_if_eq Route110_TrickHouseEnd_EventScript_26B036 delay 30 msgbox Route110_TrickHouseEnd_Text_26B3FA, MSGBOX_DEFAULT closemessage @@ -168,7 +168,7 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 setvar VAR_0x40C1, 0 call Route110_TrickHouseEnd_EventScript_26AFA5 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_26B002 + call_if_eq Route110_TrickHouseEnd_EventScript_26B002 msgbox Route110_TrickHouseEnd_Text_26B69A, MSGBOX_DEFAULT call Route110_TrickHouseEnd_EventScript_26AFCF special ResetTrickHouseEndRoomFlag @@ -241,11 +241,11 @@ Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041 applymovement 1, Route110_TrickHouseEnd_Movement_26B08B waitmovement 0 playse SE_W153 - applymovement 255, Route110_TrickHouseEnd_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEnd_Movement_2725AA waitmovement 0 msgbox Route110_TrickHouseEnd_Text_26B8BD, MSGBOX_DEFAULT closemessage - applymovement 255, Route110_TrickHouseEnd_Movement_26B089 + applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEnd_Movement_26B089 waitmovement 0 delay 4 turnobject 1, 4 diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 22750f536..b2aa22f6c 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -7,17 +7,17 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8269A50 Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 setflag FLAG_LANDMARK_TRICK_HOUSE compare VAR_0x40B5, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_269AF3 + goto_if_eq Route110_TrickHouseEntrance_EventScript_269AF3 compare VAR_0x40C1, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_269AD7 + goto_if_eq Route110_TrickHouseEntrance_EventScript_269AD7 compare VAR_0x40A6, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_269BB3 + goto_if_eq Route110_TrickHouseEntrance_EventScript_269BB3 compare VAR_0x40A7, 5 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B03 + call_if_eq Route110_TrickHouseEntrance_EventScript_269B03 compare VAR_0x40A7, 3 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B03 + call_if_eq Route110_TrickHouseEntrance_EventScript_269B03 compare VAR_0x40A7, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B03 + call_if_eq Route110_TrickHouseEntrance_EventScript_269B03 switch VAR_0x40A7 case 0, Route110_TrickHouseEntrance_EventScript_269BBB case 1, Route110_TrickHouseEntrance_EventScript_269BC1 @@ -28,7 +28,7 @@ Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 Route110_TrickHouseEntrance_EventScript_269AD7:: @ 8269AD7 setvar VAR_0x40A5, 1 compare VAR_0x4044, 8 - goto_eq Route110_TrickHouseEntrance_EventScript_269AED + goto_if_eq Route110_TrickHouseEntrance_EventScript_269AED setvar VAR_0x40A7, 2 end @@ -45,56 +45,49 @@ Route110_TrickHouseEntrance_EventScript_269AF3:: @ 8269AF3 Route110_TrickHouseEntrance_EventScript_269B03:: @ 8269B03 setvar VAR_0x40A7, 0 compare VAR_0x4044, 1 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B61 + call_if_eq Route110_TrickHouseEntrance_EventScript_269B61 compare VAR_0x4044, 2 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B6B + call_if_eq Route110_TrickHouseEntrance_EventScript_269B6B compare VAR_0x4044, 3 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B75 + call_if_eq Route110_TrickHouseEntrance_EventScript_269B75 compare VAR_0x4044, 4 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B7F + call_if_eq Route110_TrickHouseEntrance_EventScript_269B7F compare VAR_0x4044, 5 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B89 + call_if_eq Route110_TrickHouseEntrance_EventScript_269B89 compare VAR_0x4044, 6 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B93 + call_if_eq Route110_TrickHouseEntrance_EventScript_269B93 compare VAR_0x4044, 7 - call_if 1, Route110_TrickHouseEntrance_EventScript_269B9D + call_if_eq Route110_TrickHouseEntrance_EventScript_269B9D compare VAR_0x4044, 8 - call_if 1, Route110_TrickHouseEntrance_EventScript_269BA7 + call_if_eq Route110_TrickHouseEntrance_EventScript_269BA7 return Route110_TrickHouseEntrance_EventScript_269B61:: @ 8269B61 - checkflag FLAG_BADGE03_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + call_if_unset FLAG_BADGE03_GET, Route110_TrickHouseEntrance_EventScript_269BAD return Route110_TrickHouseEntrance_EventScript_269B6B:: @ 8269B6B - checkflag FLAG_BADGE04_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + call_if_unset FLAG_BADGE04_GET, Route110_TrickHouseEntrance_EventScript_269BAD return Route110_TrickHouseEntrance_EventScript_269B75:: @ 8269B75 - checkflag FLAG_BADGE05_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + call_if_unset FLAG_BADGE05_GET, Route110_TrickHouseEntrance_EventScript_269BAD return Route110_TrickHouseEntrance_EventScript_269B7F:: @ 8269B7F - checkflag FLAG_BADGE06_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + call_if_unset FLAG_BADGE06_GET, Route110_TrickHouseEntrance_EventScript_269BAD return Route110_TrickHouseEntrance_EventScript_269B89:: @ 8269B89 - checkflag FLAG_BADGE07_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + call_if_unset FLAG_BADGE07_GET, Route110_TrickHouseEntrance_EventScript_269BAD return Route110_TrickHouseEntrance_EventScript_269B93:: @ 8269B93 - checkflag FLAG_BADGE08_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + call_if_unset FLAG_BADGE08_GET, Route110_TrickHouseEntrance_EventScript_269BAD return Route110_TrickHouseEntrance_EventScript_269B9D:: @ 8269B9D - checkflag FLAG_SYS_GAME_CLEAR - call_if 0, Route110_TrickHouseEntrance_EventScript_269BAD + call_if_unset FLAG_SYS_GAME_CLEAR, Route110_TrickHouseEntrance_EventScript_269BAD return Route110_TrickHouseEntrance_EventScript_269BA7:: @ 8269BA7 @@ -140,7 +133,7 @@ Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15 addobject 1 showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE turnobject 1, 4 - turnobject 255, 3 + turnobject EVENT_OBJ_ID_PLAYER, 3 end Route110_TrickHouseEntrance_EventScript_269C26:: @ 8269C26 @@ -213,7 +206,7 @@ Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8 lockall delay 20 compare VAR_0x4044, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E48 + call_if_eq Route110_TrickHouseEntrance_EventScript_269E48 msgbox Route110_TrickHouseEntrance_Text_26A78C, MSGBOX_DEFAULT closemessage delay 20 @@ -243,26 +236,26 @@ Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E playse SE_PIN - applymovement 255, Route110_TrickHouseEntrance_Movement_272598 + applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_272598 waitmovement 0 - applymovement 255, Route110_TrickHouseEntrance_Movement_27259A + applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_27259A waitmovement 0 compare VAR_0x4044, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_269DEE + call_if_eq Route110_TrickHouseEntrance_EventScript_269DEE compare VAR_0x4044, 1 - call_if 1, Route110_TrickHouseEntrance_EventScript_269DF7 + call_if_eq Route110_TrickHouseEntrance_EventScript_269DF7 compare VAR_0x4044, 2 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E00 + call_if_eq Route110_TrickHouseEntrance_EventScript_269E00 compare VAR_0x4044, 3 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E09 + call_if_eq Route110_TrickHouseEntrance_EventScript_269E09 compare VAR_0x4044, 4 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E12 + call_if_eq Route110_TrickHouseEntrance_EventScript_269E12 compare VAR_0x4044, 5 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E1B + call_if_eq Route110_TrickHouseEntrance_EventScript_269E1B compare VAR_0x4044, 6 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E24 + call_if_eq Route110_TrickHouseEntrance_EventScript_269E24 compare VAR_0x4044, 7 - call_if 1, Route110_TrickHouseEntrance_EventScript_269E2D + call_if_eq Route110_TrickHouseEntrance_EventScript_269E2D closemessage setvar VAR_0x40A6, 1 warpsilent MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 @@ -351,27 +344,27 @@ Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26AA82, MSGBOX_DEFAULT compare VAR_0x4044, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_269EEF + goto_if_eq Route110_TrickHouseEntrance_EventScript_269EEF compare VAR_0x4044, 2 - goto_eq Route110_TrickHouseEntrance_EventScript_269F1B + goto_if_eq Route110_TrickHouseEntrance_EventScript_269F1B compare VAR_0x4044, 3 - goto_eq Route110_TrickHouseEntrance_EventScript_269F47 + goto_if_eq Route110_TrickHouseEntrance_EventScript_269F47 compare VAR_0x4044, 4 - goto_eq Route110_TrickHouseEntrance_EventScript_269F73 + goto_if_eq Route110_TrickHouseEntrance_EventScript_269F73 compare VAR_0x4044, 5 - goto_eq Route110_TrickHouseEntrance_EventScript_269F9F + goto_if_eq Route110_TrickHouseEntrance_EventScript_269F9F compare VAR_0x4044, 6 - goto_eq Route110_TrickHouseEntrance_EventScript_269FCB + goto_if_eq Route110_TrickHouseEntrance_EventScript_269FCB compare VAR_0x4044, 7 - goto_eq Route110_TrickHouseEntrance_EventScript_269FF7 + goto_if_eq Route110_TrickHouseEntrance_EventScript_269FF7 end Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF giveitem_std ITEM_RARE_CANDY compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -379,9 +372,9 @@ Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B giveitem_std ITEM_TIMER_BALL compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -389,9 +382,9 @@ Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47 giveitem_std ITEM_HARD_STONE compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -399,9 +392,9 @@ Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47 Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73 giveitem_std ITEM_SMOKE_BALL compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -409,9 +402,9 @@ Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73 Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F giveitem_std ITEM_TM12 compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -419,9 +412,9 @@ Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB giveitem_std ITEM_MAGNET compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -429,9 +422,9 @@ Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 giveitem_std ITEM_PP_MAX compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A023 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_27205E + call_if_eq Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -450,9 +443,9 @@ Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039 msgbox Route110_TrickHouseEntrance_Text_26AB2C, MSGBOX_DEFAULT call Route110_TrickHouseEntrance_EventScript_26A070 compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A09A + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A09A compare VAR_RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_272071 + call_if_eq Route110_TrickHouseEntrance_EventScript_272071 msgbox Route110_TrickHouseEntrance_Text_26ABBD, MSGBOX_DEFAULT releaseall end @@ -505,7 +498,7 @@ Route110_TrickHouseEntrance_EventScript_26A110:: @ 826A110 msgbox Route110_TrickHouseEntrance_Text_26A887, MSGBOX_YESNO closemessage compare VAR_RESULT, 1 - goto_eq Route110_TrickHouseEntrance_EventScript_26A126 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A126 releaseall end @@ -513,9 +506,9 @@ Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126 setmetatile 5, 1, 537, 0 special DrawWholeMapView delay 20 - applymovement 255, Route110_TrickHouseEntrance_Movement_2725C9 + applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_2725C9 waitmovement 0 - applymovement 255, Route110_TrickHouseEntrance_Movement_26A1A7 + applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_26A1A7 waitmovement 0 switch VAR_0x4044 case 0, Route110_TrickHouseEntrance_EventScript_26A1A9 @@ -587,7 +580,7 @@ Route110_TrickHouseEntrance_EventScript_26A201:: @ 826A201 Route110_TrickHouseEntrance_EventScript_26A20B:: @ 826A20B compare VAR_0x4044, 8 - goto_eq Route110_TrickHouseEntrance_EventScript_26A220 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A220 msgbox Route110_TrickHouseEntrance_Text_26A878, MSGBOX_DEFAULT releaseall end @@ -612,7 +605,7 @@ Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 compare VAR_0x40AB, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle1_Text_26B98D, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AB, 2 @@ -623,7 +616,7 @@ Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 compare VAR_0x40AC, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle2_Text_26BCBA, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AC, 2 @@ -634,7 +627,7 @@ Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB compare VAR_0x40AD, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle3_Text_26C609, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AD, 2 @@ -645,7 +638,7 @@ Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 compare VAR_0x40AE, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle4_Text_26C8C3, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AE, 2 @@ -656,7 +649,7 @@ Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D compare VAR_0x40AF, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle5_Text_26D660, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AF, 2 @@ -667,7 +660,7 @@ Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 compare VAR_0x40B0, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle6_Text_26DE26, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40B0, 2 @@ -678,7 +671,7 @@ Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F compare VAR_0x40B1, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle7_EventScript_26E413, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40B1, 2 @@ -689,7 +682,7 @@ Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8 compare VAR_0x40B2, 0 - goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 + goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle8_EventScript_26E864, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40B2, 2 @@ -735,11 +728,11 @@ Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8 msgbox Route110_TrickHouseEntrance_Text_26A474, MSGBOX_DEFAULT releaseall compare VAR_0x4044, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_26A429 + call_if_eq Route110_TrickHouseEntrance_EventScript_26A429 compare VAR_0x4044, 1 - call_if 1, Route110_TrickHouseEntrance_EventScript_26A439 + call_if_eq Route110_TrickHouseEntrance_EventScript_26A439 compare VAR_0x4044, 2 - call_if 1, Route110_TrickHouseEntrance_EventScript_26A449 + call_if_eq Route110_TrickHouseEntrance_EventScript_26A449 setvar VAR_0x40A5, 1 end diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index 036521ee4..b34a9d555 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -4,7 +4,7 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 826B90F Route110_TrickHousePuzzle1_MapScript1_26B915: @ 826B915 compare VAR_0x40AB, 2 - goto_eq Route110_TrickHousePuzzle1_EventScript_26B921 + goto_if_eq Route110_TrickHousePuzzle1_EventScript_26B921 end Route110_TrickHousePuzzle1_EventScript_26B921:: @ 826B921 @@ -14,7 +14,7 @@ Route110_TrickHousePuzzle1_EventScript_26B921:: @ 826B921 Route110_TrickHousePuzzle1_EventScript_26B92B:: @ 826B92B lockall compare VAR_0x40AB, 0 - goto_eq Route110_TrickHousePuzzle1_EventScript_26B93D + goto_if_eq Route110_TrickHousePuzzle1_EventScript_26B93D goto Route110_TrickHousePuzzle1_EventScript_26A3DB end diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index 60c7cdbce..560d10060 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -5,13 +5,13 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 826BB73 Route110_TrickHousePuzzle2_MapScript1_26BB7E: @ 826BB7E compare VAR_TEMP_1, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC29 + call_if_eq Route110_TrickHousePuzzle2_EventScript_26BC29 compare VAR_TEMP_2, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC3C + call_if_eq Route110_TrickHousePuzzle2_EventScript_26BC3C compare VAR_TEMP_3, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC4F + call_if_eq Route110_TrickHousePuzzle2_EventScript_26BC4F compare VAR_TEMP_4, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC62 + call_if_eq Route110_TrickHousePuzzle2_EventScript_26BC62 end Route110_TrickHousePuzzle2_MapScript1_26BBAB: @ 826BBAB @@ -24,7 +24,7 @@ Route110_TrickHousePuzzle2_MapScript1_26BBAB: @ 826BBAB Route110_TrickHousePuzzle2_EventScript_26BBC0:: @ 826BBC0 lockall compare VAR_0x40AC, 0 - goto_eq Route110_TrickHousePuzzle2_EventScript_26BBD2 + goto_if_eq Route110_TrickHousePuzzle2_EventScript_26BBD2 goto Route110_TrickHousePuzzle2_EventScript_26A3DB end diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index cadb6315a..b26c5473d 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -6,9 +6,9 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 826BED8 Route110_TrickHousePuzzle3_MapScript1_26BEE3: @ 826BEE3 call Route110_TrickHousePuzzle3_EventScript_26BF1E compare VAR_TEMP_9, 0 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF97 + call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF97 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26C232 + call_if_eq Route110_TrickHousePuzzle3_EventScript_26C232 end Route110_TrickHousePuzzle3_MapScript1_26BEFF: @ 826BEFF @@ -26,13 +26,13 @@ Route110_TrickHousePuzzle3_EventScript_26BF1E:: @ 826BF1E setmetatile 12, 5, 600, 0 setmetatile 8, 2, 600, 0 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF6F + call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF6F compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF79 + call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF79 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF83 + call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF83 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF8D + call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF8D return Route110_TrickHousePuzzle3_EventScript_26BF6F:: @ 826BF6F @@ -242,13 +242,13 @@ Route110_TrickHousePuzzle3_EventScript_26C510:: @ 826C510 setvar VAR_TEMP_3, 0 setvar VAR_TEMP_4, 0 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26C551 + call_if_eq Route110_TrickHousePuzzle3_EventScript_26C551 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26C557 + call_if_eq Route110_TrickHousePuzzle3_EventScript_26C557 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26C55D + call_if_eq Route110_TrickHousePuzzle3_EventScript_26C55D compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26C563 + call_if_eq Route110_TrickHousePuzzle3_EventScript_26C563 return Route110_TrickHousePuzzle3_EventScript_26C551:: @ 826C551 @@ -269,14 +269,14 @@ Route110_TrickHousePuzzle3_EventScript_26C563:: @ 826C563 Route110_TrickHousePuzzle3_EventScript_26C569:: @ 826C569 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF97 + call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF97 compare VAR_TEMP_9, 0 - call_if 1, Route110_TrickHousePuzzle3_EventScript_26C232 + call_if_eq Route110_TrickHousePuzzle3_EventScript_26C232 special DrawWholeMapView compare VAR_TEMP_9, 1 - goto_eq Route110_TrickHousePuzzle3_EventScript_26C599 + goto_if_eq Route110_TrickHousePuzzle3_EventScript_26C599 compare VAR_TEMP_9, 0 - goto_eq Route110_TrickHousePuzzle3_EventScript_26C5A0 + goto_if_eq Route110_TrickHousePuzzle3_EventScript_26C5A0 end Route110_TrickHousePuzzle3_EventScript_26C599:: @ 826C599 @@ -292,7 +292,7 @@ Route110_TrickHousePuzzle3_EventScript_26C5A0:: @ 826C5A0 Route110_TrickHousePuzzle3_EventScript_26C5A7:: @ 826C5A7 lockall compare VAR_0x40AD, 0 - goto_eq Route110_TrickHousePuzzle3_EventScript_26C5B9 + goto_if_eq Route110_TrickHousePuzzle3_EventScript_26C5B9 goto Route110_TrickHousePuzzle3_EventScript_26A3DB end diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc index 3d1004b1c..71bb32db8 100644 --- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc @@ -4,7 +4,7 @@ Route110_TrickHousePuzzle4_MapScripts:: @ 826C860 Route110_TrickHousePuzzle4_EventScript_26C861:: @ 826C861 lockall compare VAR_0x40AE, 0 - goto_eq Route110_TrickHousePuzzle4_EventScript_26C873 + goto_if_eq Route110_TrickHousePuzzle4_EventScript_26C873 goto Route110_TrickHousePuzzle4_EventScript_26A3DB end diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 330b4fcd7..4c199a993 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -14,7 +14,7 @@ Route110_TrickHousePuzzle5_MapScript1_26CAF6: @ 826CAF6 Route110_TrickHousePuzzle5_EventScript_26CB15:: @ 826CB15 lockall compare VAR_0x40AF, 0 - goto_eq Route110_TrickHousePuzzle5_EventScript_26CB27 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_26CB27 goto Route110_TrickHousePuzzle5_EventScript_26A3DB end @@ -28,7 +28,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32 applymovement 1, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 compare VAR_TEMP_1, 1 - goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA + goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_26CCEB end @@ -38,7 +38,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53 applymovement 2, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 compare VAR_TEMP_2, 1 - goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA + goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_26CD6A end @@ -48,7 +48,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74 applymovement 3, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 compare VAR_TEMP_3, 1 - goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA + goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_26CDF4 end @@ -58,7 +58,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95 applymovement 4, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 compare VAR_TEMP_4, 1 - goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA + goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_26CE73 end @@ -68,7 +68,7 @@ Route110_TrickHousePuzzle5_EventScript_26CBB6:: @ 826CBB6 applymovement 5, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 compare VAR_TEMP_5, 1 - goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA + goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_26CEF2 end @@ -220,13 +220,13 @@ Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB applymovement 1, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1EC compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D224 compare VAR_TEMP_9, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D25C msgbox Route110_TrickHousePuzzle5_Text_26D6CE, MSGBOX_DEFAULT random 3 switch VAR_RESULT @@ -244,15 +244,15 @@ Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A applymovement 2, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D2CC + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D2CC compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D304 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D304 compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D33C + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D33C compare VAR_TEMP_9, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D374 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D374 compare VAR_TEMP_9, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3AC + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D3AC msgbox Route110_TrickHousePuzzle5_Text_26D8EA, MSGBOX_DEFAULT random 3 switch VAR_RESULT @@ -270,13 +270,13 @@ Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4 applymovement 3, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1EC compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D224 compare VAR_TEMP_9, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D25C msgbox Route110_TrickHousePuzzle5_Text_26DA1E, MSGBOX_DEFAULT random 3 switch VAR_RESULT @@ -294,13 +294,13 @@ Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73 applymovement 4, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4 compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1EC compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D224 compare VAR_TEMP_9, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D25C msgbox Route110_TrickHousePuzzle5_Text_26DB4C, MSGBOX_DEFAULT random 3 switch VAR_RESULT @@ -476,132 +476,132 @@ Route110_TrickHousePuzzle5_EventScript_26D1AA:: @ 826D1AA Route110_TrickHousePuzzle5_EventScript_26D1B4:: @ 826D1B4 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3E4 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D3E4 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3EF + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D3EF compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3FA + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D3FA compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D405 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D405 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D410 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D410 return Route110_TrickHousePuzzle5_EventScript_26D1EC:: @ 826D1EC compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D41B + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D41B compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D426 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D426 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D431 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D431 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D43C + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D43C compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D447 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D447 return Route110_TrickHousePuzzle5_EventScript_26D224:: @ 826D224 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D452 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D452 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D45D + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D45D compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D468 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D468 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D473 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D473 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D47E + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D47E return Route110_TrickHousePuzzle5_EventScript_26D25C:: @ 826D25C compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D489 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D489 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D494 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D494 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D49F + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D49F compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4AA + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4AA compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4B5 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4B5 return Route110_TrickHousePuzzle5_EventScript_26D294:: @ 826D294 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4C0 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4C0 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4CB + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4CB compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4D6 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4D6 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4E1 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4E1 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4EC + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4EC return Route110_TrickHousePuzzle5_EventScript_26D2CC:: @ 826D2CC compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4F7 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4F7 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D502 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D502 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D50D + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D50D compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D518 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D518 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D523 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D523 return Route110_TrickHousePuzzle5_EventScript_26D304:: @ 826D304 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D52E + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D52E compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D539 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D539 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D544 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D544 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D54F + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D54F compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D55A + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D55A return Route110_TrickHousePuzzle5_EventScript_26D33C:: @ 826D33C compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D565 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D565 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D570 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D570 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D57B + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D57B compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D586 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D586 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D591 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D591 return Route110_TrickHousePuzzle5_EventScript_26D374:: @ 826D374 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D59C + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D59C compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5A7 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5A7 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5B2 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5B2 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5BD + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5BD compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5C8 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5C8 return Route110_TrickHousePuzzle5_EventScript_26D3AC:: @ 826D3AC compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5D3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5D3 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5DE + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5DE compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5E9 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5E9 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5F4 + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5F4 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5FF + call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5FF return Route110_TrickHousePuzzle5_EventScript_26D3E4:: @ 826D3E4 diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index 53c548c20..2cb784b50 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -18,7 +18,7 @@ Route110_TrickHousePuzzle6_EventScript_26DDC0:: @ 826DDC0 Route110_TrickHousePuzzle6_EventScript_26DDC4:: @ 826DDC4 lockall compare VAR_0x40B0, 0 - goto_eq Route110_TrickHousePuzzle6_EventScript_26DDD6 + goto_if_eq Route110_TrickHousePuzzle6_EventScript_26DDD6 goto Route110_TrickHousePuzzle6_EventScript_26A3DB end diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 4004c2e2c..76e8ac769 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -10,16 +10,11 @@ Route110_TrickHousePuzzle7_MapScript1_26E0A6: @ 826E0A6 end Route110_TrickHousePuzzle7_EventScript_26E0AC:: @ 826E0AC - checkflag FLAG_0x0C2 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E0DA - checkflag FLAG_0x0C3 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E0ED - checkflag FLAG_0x0C4 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E100 - checkflag FLAG_0x0C5 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E113 - checkflag FLAG_0x0C6 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E126 + call_if_set FLAG_0x0C2, Route110_TrickHousePuzzle7_EventScript_26E0DA + call_if_set FLAG_0x0C3, Route110_TrickHousePuzzle7_EventScript_26E0ED + call_if_set FLAG_0x0C4, Route110_TrickHousePuzzle7_EventScript_26E100 + call_if_set FLAG_0x0C5, Route110_TrickHousePuzzle7_EventScript_26E113 + call_if_set FLAG_0x0C6, Route110_TrickHousePuzzle7_EventScript_26E126 return Route110_TrickHousePuzzle7_EventScript_26E0DA:: @ 826E0DA @@ -74,7 +69,7 @@ Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185 Route110_TrickHousePuzzle7_MapScript1_26E198: @ 826E198 compare VAR_0x40B6, 1 - goto_eq Route110_TrickHousePuzzle7_EventScript_26E1B3 + goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1B3 clearflag FLAG_0x0C2 clearflag FLAG_0x0C3 clearflag FLAG_0x0C4 @@ -87,7 +82,7 @@ Route110_TrickHousePuzzle7_EventScript_26E1B3:: @ 826E1B3 Route110_TrickHousePuzzle7_MapScript1_26E1B4: @ 826E1B4 compare VAR_0x40B6, 1 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E0AC + call_if_eq Route110_TrickHousePuzzle7_EventScript_26E0AC end Route110_TrickHousePuzzle7_MapScript2_26E1C0: @ 826E1C0 @@ -101,7 +96,7 @@ Route110_TrickHousePuzzle7_EventScript_26E1CA:: @ 826E1CA Route110_TrickHousePuzzle7_EventScript_26E1D0:: @ 826E1D0 lockall compare VAR_0x40B1, 0 - goto_eq Route110_TrickHousePuzzle7_EventScript_26E1E2 + goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1E2 goto Route110_TrickHousePuzzle7_EventScript_26A3DB end @@ -121,76 +116,56 @@ Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED Route110_TrickHousePuzzle7_EventScript_26E1FE:: @ 826E1FE lockall delay 32 - checkflag FLAG_0x0C2 - call_if 0, Route110_TrickHousePuzzle7_EventScript_26E0DA - checkflag FLAG_0x0C2 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E139 + call_if_unset FLAG_0x0C2, Route110_TrickHousePuzzle7_EventScript_26E0DA + call_if_set FLAG_0x0C2, Route110_TrickHousePuzzle7_EventScript_26E139 special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_0x0C2 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2E9 - checkflag FLAG_0x0C2 - goto_eq Route110_TrickHousePuzzle7_EventScript_26E2EE + goto_if_unset FLAG_0x0C2, Route110_TrickHousePuzzle7_EventScript_26E2E9 + goto_if_set FLAG_0x0C2, Route110_TrickHousePuzzle7_EventScript_26E2EE end Route110_TrickHousePuzzle7_EventScript_26E22D:: @ 826E22D lockall delay 32 - checkflag FLAG_0x0C3 - call_if 0, Route110_TrickHousePuzzle7_EventScript_26E0ED - checkflag FLAG_0x0C3 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E14C + call_if_unset FLAG_0x0C3, Route110_TrickHousePuzzle7_EventScript_26E0ED + call_if_set FLAG_0x0C3, Route110_TrickHousePuzzle7_EventScript_26E14C special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_0x0C3 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2F3 - checkflag FLAG_0x0C3 - goto_eq Route110_TrickHousePuzzle7_EventScript_26E2F8 + goto_if_unset FLAG_0x0C3, Route110_TrickHousePuzzle7_EventScript_26E2F3 + goto_if_set FLAG_0x0C3, Route110_TrickHousePuzzle7_EventScript_26E2F8 end Route110_TrickHousePuzzle7_EventScript_26E25C:: @ 826E25C lockall delay 32 - checkflag FLAG_0x0C4 - call_if 0, Route110_TrickHousePuzzle7_EventScript_26E100 - checkflag FLAG_0x0C4 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E15F + call_if_unset FLAG_0x0C4, Route110_TrickHousePuzzle7_EventScript_26E100 + call_if_set FLAG_0x0C4, Route110_TrickHousePuzzle7_EventScript_26E15F special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_0x0C4 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E2FD - checkflag FLAG_0x0C4 - goto_eq Route110_TrickHousePuzzle7_EventScript_26E302 + goto_if_unset FLAG_0x0C4, Route110_TrickHousePuzzle7_EventScript_26E2FD + goto_if_set FLAG_0x0C4, Route110_TrickHousePuzzle7_EventScript_26E302 end Route110_TrickHousePuzzle7_EventScript_26E28B:: @ 826E28B lockall delay 32 - checkflag FLAG_0x0C5 - call_if 0, Route110_TrickHousePuzzle7_EventScript_26E113 - checkflag FLAG_0x0C5 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E172 + call_if_unset FLAG_0x0C5, Route110_TrickHousePuzzle7_EventScript_26E113 + call_if_set FLAG_0x0C5, Route110_TrickHousePuzzle7_EventScript_26E172 special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_0x0C5 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E307 - checkflag FLAG_0x0C5 - goto_eq Route110_TrickHousePuzzle7_EventScript_26E30C + goto_if_unset FLAG_0x0C5, Route110_TrickHousePuzzle7_EventScript_26E307 + goto_if_set FLAG_0x0C5, Route110_TrickHousePuzzle7_EventScript_26E30C end Route110_TrickHousePuzzle7_EventScript_26E2BA:: @ 826E2BA lockall delay 32 - checkflag FLAG_0x0C6 - call_if 0, Route110_TrickHousePuzzle7_EventScript_26E126 - checkflag FLAG_0x0C6 - call_if 1, Route110_TrickHousePuzzle7_EventScript_26E185 + call_if_unset FLAG_0x0C6, Route110_TrickHousePuzzle7_EventScript_26E126 + call_if_set FLAG_0x0C6, Route110_TrickHousePuzzle7_EventScript_26E185 special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_0x0C6 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_26E311 - checkflag FLAG_0x0C6 - goto_eq Route110_TrickHousePuzzle7_EventScript_26E316 + goto_if_unset FLAG_0x0C6, Route110_TrickHousePuzzle7_EventScript_26E311 + goto_if_set FLAG_0x0C6, Route110_TrickHousePuzzle7_EventScript_26E316 end Route110_TrickHousePuzzle7_EventScript_26E2E9:: @ 826E2E9 diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc index 31aeb9e3a..7efb9f67b 100644 --- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc @@ -4,7 +4,7 @@ Route110_TrickHousePuzzle8_MapScripts:: @ 826E801 Route110_TrickHousePuzzle8_EventScript_26E802:: @ 826E802 lockall compare VAR_0x40B2, 0 - goto_eq Route110_TrickHousePuzzle8_EventScript_26E814 + goto_if_eq Route110_TrickHousePuzzle8_EventScript_26E814 goto Route110_TrickHousePuzzle8_EventScript_26A3DB end diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 2be579ab6..98132b37f 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -6,10 +6,9 @@ Route111_MapScripts:: @ 81F0CA7 .byte 0 Route111_MapScript1_1F0CBC: @ 81F0CBC - checkflag FLAG_0x0E4 - call_if 0, Route111_EventScript_1F0CD1 + call_if_unset FLAG_0x0E4, Route111_EventScript_1F0CD1 compare VAR_0x40CB, 1 - call_if 1, Route111_EventScript_1F0CE4 + call_if_eq Route111_EventScript_1F0CE4 end Route111_EventScript_1F0CD1:: @ 81F0CD1 @@ -41,24 +40,23 @@ Route111_EventScript_1F0CE4:: @ 81F0CE4 Route111_MapScript1_1F0D87: @ 81F0D87 setvar VAR_0x40D6, 0 special sub_81BE79C - checkflag FLAG_0x14E - call_if 0, Route111_EventScript_1F0E3C + call_if_unset FLAG_0x14E, Route111_EventScript_1F0E3C compare VAR_0x40CB, 1 - call_if 1, Route111_EventScript_1F0DC2 + call_if_eq Route111_EventScript_1F0DC2 compare VAR_0x40CB, 2 - call_if 1, Route111_EventScript_1F0E40 + call_if_eq Route111_EventScript_1F0E40 call Route111_EventScript_1F0DE6 call Route111_EventScript_28CCC7 checktrainerflag TRAINER_VICKY - goto_if 0, Route111_EventScript_1F0E26 + goto_if_lt Route111_EventScript_1F0E26 end Route111_EventScript_1F0DC2:: @ 81F0DC2 checkplayergender compare VAR_RESULT, 0 - goto_eq Route111_EventScript_1F0DDA + goto_if_eq Route111_EventScript_1F0DDA compare VAR_RESULT, 1 - goto_eq Route111_EventScript_1F0DE0 + goto_if_eq Route111_EventScript_1F0DE0 return Route111_EventScript_1F0DDA:: @ 81F0DDA @@ -72,18 +70,18 @@ Route111_EventScript_1F0DE0:: @ 81F0DE0 Route111_EventScript_1F0DE6:: @ 81F0DE6 getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_1, 34 - goto_if 0, Route111_EventScript_1F0E25 + goto_if_lt Route111_EventScript_1F0E25 compare VAR_TEMP_1, 107 - goto_if 2, Route111_EventScript_1F0E25 + goto_if_gt Route111_EventScript_1F0E25 compare VAR_TEMP_1, 72 - goto_if 2, Route111_EventScript_1F0E22 + goto_if_gt Route111_EventScript_1F0E22 compare VAR_TEMP_0, 2000 - goto_if 2, Route111_EventScript_1F0E25 + goto_if_gt Route111_EventScript_1F0E25 compare VAR_TEMP_0, 8 - goto_if 0, Route111_EventScript_1F0E25 + goto_if_lt Route111_EventScript_1F0E25 Route111_EventScript_1F0E22:: @ 81F0E22 - setweather 8 + setweather WEATHER_SANDSTORM Route111_EventScript_1F0E25:: @ 81F0E25 return @@ -111,7 +109,7 @@ Route111_MapScript2_1F0E46: @ 81F0E46 .2byte 0 Route111_EventScript_1F0E50:: @ 81F0E50 - hideobjectat 255, MAP_LITTLEROOT_TOWN + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN end Route111_MapScript2_1F0E56: @ 81F0E56 @@ -127,10 +125,10 @@ Route111_EventScript_1F0E60:: @ 81F0E60 addobject 45 special sub_81BE7F4 waitstate - showobjectat 255, MAP_LITTLEROOT_TOWN + showobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN removeobject 45 delay 16 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 delay 16 special sub_81BEB54 waitstate @@ -138,8 +136,7 @@ Route111_EventScript_1F0E60:: @ 81F0E60 waitstate setvar VAR_0x40CB, 2 clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL - checkflag FLAG_0x150 - goto_eq Route111_EventScript_1F0EA7 + goto_if_set FLAG_0x150, Route111_EventScript_1F0EA7 msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT releaseall end @@ -163,12 +160,11 @@ Route111_EventScript_1F0EB9:: @ 81F0EB9 lock faceplayer dodailyevents - checkflag FLAG_0x92C - goto_eq Route111_EventScript_1F0EF4 + goto_if_set FLAG_0x92C, Route111_EventScript_1F0EF4 msgbox Route111_Text_2A6EBD, MSGBOX_DEFAULT giveitem_std ITEM_RAZZ_BERRY compare VAR_RESULT, 0 - goto_eq Route111_EventScript_272054 + goto_if_eq Route111_EventScript_272054 setflag FLAG_0x92C special GetPlayerBigGuyGirlString msgbox Route111_Text_2A6F3D, MSGBOX_DEFAULT @@ -207,7 +203,7 @@ Route111_EventScript_1F0F22:: @ 81F0F22 Route111_EventScript_1F0F2E:: @ 81F0F2E checkitem ITEM_GO_GOGGLES, 1 compare VAR_RESULT, 0 - goto_eq Route111_EventScript_1F0F45 + goto_if_eq Route111_EventScript_1F0F45 setvar VAR_TEMP_3, 1 releaseall end @@ -216,33 +212,33 @@ Route111_EventScript_1F0F45:: @ 81F0F45 msgbox gUnknown_08272C5F, MSGBOX_DEFAULT closemessage compare VAR_0x8004, 0 - call_if 1, Route111_EventScript_1F0F7C + call_if_eq Route111_EventScript_1F0F7C compare VAR_0x8004, 1 - call_if 1, Route111_EventScript_1F0F87 + call_if_eq Route111_EventScript_1F0F87 compare VAR_0x8004, 2 - call_if 1, Route111_EventScript_1F0F92 + call_if_eq Route111_EventScript_1F0F92 compare VAR_0x8004, 3 - call_if 1, Route111_EventScript_1F0F9D + call_if_eq Route111_EventScript_1F0F9D releaseall end Route111_EventScript_1F0F7C:: @ 81F0F7C - applymovement 255, Route111_Movement_1F0FA8 + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FA8 waitmovement 0 return Route111_EventScript_1F0F87:: @ 81F0F87 - applymovement 255, Route111_Movement_1F0FAA + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FAA waitmovement 0 return Route111_EventScript_1F0F92:: @ 81F0F92 - applymovement 255, Route111_Movement_1F0FAC + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FAC waitmovement 0 return Route111_EventScript_1F0F9D:: @ 81F0F9D - applymovement 255, Route111_Movement_1F0FAE + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FAE waitmovement 0 return @@ -263,14 +259,14 @@ Route111_Movement_1F0FAE: @ 81F0FAE step_end Route111_EventScript_1F0FB0:: @ 81F0FB0 - setweather 2 + setweather WEATHER_SUNNY fadenewbgm MUS_DOORO_X1 doweather setvar VAR_TEMP_3, 0 end Route111_EventScript_1F0FBD:: @ 81F0FBD - setweather 8 + setweather WEATHER_SANDSTORM fadenewbgm MUS_ASHROAD doweather end @@ -281,7 +277,7 @@ Route111_EventScript_1F0FC5:: @ 81F0FC5 setflag FLAG_LANDMARK_WINSTRATE_FAMILY msgbox Route111_Text_1F1475, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route111_EventScript_1F0FE7 + goto_if_eq Route111_EventScript_1F0FE7 msgbox Route111_Text_1F14F5, MSGBOX_DEFAULT release end @@ -298,7 +294,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 waitmovement 0 removeobject 1 call Route111_EventScript_1F1143 - applymovement 255, Route111_Movement_1F114F + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F114F waitmovement 0 call Route111_EventScript_1F113C addobject 2 @@ -316,7 +312,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 waitmovement 0 removeobject 2 call Route111_EventScript_1F1143 - applymovement 255, Route111_Movement_1F114F + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F114F waitmovement 0 call Route111_EventScript_1F113C addobject 3 @@ -334,7 +330,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 waitmovement 0 removeobject 3 call Route111_EventScript_1F1143 - applymovement 255, Route111_Movement_1F114F + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F114F waitmovement 0 call Route111_EventScript_1F113C addobject 4 @@ -416,11 +412,10 @@ Route111_EventScript_1F119B:: @ 81F119B lock faceplayer compare VAR_0x40CB, 3 - goto_eq Route111_EventScript_1F11C6 + goto_if_eq Route111_EventScript_1F11C6 compare VAR_0x40CB, 2 - goto_eq Route111_EventScript_1F11D0 - checkflag FLAG_0x14E - goto_eq Route111_EventScript_1F11DA + goto_if_eq Route111_EventScript_1F11D0 + goto_if_set FLAG_0x14E, Route111_EventScript_1F11DA msgbox Route111_Text_1F1A22, MSGBOX_DEFAULT release end @@ -475,7 +470,7 @@ Route111_EventScript_1F1260:: @ 81F1260 trainerbattle_single TRAINER_DUSTY_1, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route111_EventScript_1F12AB + goto_if_eq Route111_EventScript_1F12AB msgbox Route111_Text_298B9A, MSGBOX_DEFAULT release end @@ -512,7 +507,7 @@ Route111_EventScript_1F1307:: @ 81F1307 trainerbattle_single TRAINER_WILTON_1, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route111_EventScript_1F1352 + goto_if_eq Route111_EventScript_1F1352 msgbox Route111_Text_298FD4, MSGBOX_DEFAULT release end @@ -534,7 +529,7 @@ Route111_EventScript_1F1369:: @ 81F1369 trainerbattle_single TRAINER_BROOKE_1, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route111_EventScript_1F13B4 + goto_if_eq Route111_EventScript_1F13B4 msgbox Route111_Text_2991C2, MSGBOX_DEFAULT release end diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc index f98e994b3..5a89f40ed 100644 --- a/data/maps/Route111_OldLadysRestStop/scripts.inc +++ b/data/maps/Route111_OldLadysRestStop/scripts.inc @@ -11,9 +11,9 @@ Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920 faceplayer msgbox Route111_OldLadysRestStop_Text_22A978, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route111_OldLadysRestStop_EventScript_22A941 + goto_if_eq Route111_OldLadysRestStop_EventScript_22A941 compare VAR_RESULT, 0 - goto_eq Route111_OldLadysRestStop_EventScript_22A96E + goto_if_eq Route111_OldLadysRestStop_EventScript_22A96E end Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941 @@ -22,9 +22,9 @@ Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941 call Route111_OldLadysRestStop_EventScript_272083 msgbox Route111_OldLadysRestStop_Text_22AA16, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route111_OldLadysRestStop_EventScript_22A941 + goto_if_eq Route111_OldLadysRestStop_EventScript_22A941 compare VAR_RESULT, 0 - goto_eq Route111_OldLadysRestStop_EventScript_22A96E + goto_if_eq Route111_OldLadysRestStop_EventScript_22A96E end Route111_OldLadysRestStop_EventScript_22A96E:: @ 822A96E diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index 8160d7623..cd862b7e3 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -13,12 +13,11 @@ Route111_WinstrateFamilysHouse_EventScript_22A4A2:: @ 822A4A2 lock faceplayer setvar VAR_0x8008, 3 - checkflag FLAG_0x115 - goto_eq Route111_WinstrateFamilysHouse_EventScript_22A4DA + goto_if_set FLAG_0x115, Route111_WinstrateFamilysHouse_EventScript_22A4DA msgbox Route111_WinstrateFamilysHouse_Text_22A5F4, MSGBOX_DEFAULT giveitem_std ITEM_MACHO_BRACE compare VAR_RESULT, 0 - goto_eq Route111_WinstrateFamilysHouse_EventScript_272054 + goto_if_eq Route111_WinstrateFamilysHouse_EventScript_272054 setflag FLAG_0x115 goto Route111_WinstrateFamilysHouse_EventScript_22A52C end @@ -40,8 +39,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A4FD:: @ 822A4FD lock faceplayer setvar VAR_0x8008, 4 - checkflag FLAG_TEMP_4 - goto_eq Route111_WinstrateFamilysHouse_EventScript_22A51E + goto_if_set FLAG_TEMP_4, Route111_WinstrateFamilysHouse_EventScript_22A51E msgbox Route111_WinstrateFamilysHouse_Text_22A780, MSGBOX_DEFAULT setflag FLAG_TEMP_4 goto Route111_WinstrateFamilysHouse_EventScript_22A52C diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 1abcdb6b4..816e0aab0 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -69,7 +69,7 @@ Route112_EventScript_1F1E81:: @ 81F1E81 trainerbattle_single TRAINER_TRENT_1, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route112_EventScript_1F1ECC + goto_if_eq Route112_EventScript_1F1ECC msgbox Route112_Text_299896, MSGBOX_DEFAULT release end diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index a7d3e8c7a..037d7ca05 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -6,7 +6,7 @@ Route112_CableCarStation_MapScripts:: @ 822AABE Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9 setescapewarp MAP_ROUTE112, 255, 28, 28 compare VAR_0x40A3, 2 - call_if 1, Route112_CableCarStation_EventScript_22AADD + call_if_eq Route112_CableCarStation_EventScript_22AADD end Route112_CableCarStation_EventScript_22AADD:: @ 822AADD @@ -20,7 +20,7 @@ Route112_CableCarStation_MapScript2_22AAE9: @ 822AAE9 Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3 lockall - applymovement 255, Route112_CableCarStation_Movement_22AB80 + applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_22AB80 applymovement 1, Route112_CableCarStation_Movement_22AB76 waitmovement 0 setvar VAR_0x40A3, 0 @@ -34,16 +34,16 @@ Route112_CableCarStation_EventScript_22AB17:: @ 822AB17 faceplayer msgbox Route112_CableCarStation_Text_22AB85, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route112_CableCarStation_EventScript_22AB38 + goto_if_eq Route112_CableCarStation_EventScript_22AB38 compare VAR_RESULT, 0 - goto_eq Route112_CableCarStation_EventScript_22AB67 + goto_if_eq Route112_CableCarStation_EventScript_22AB67 end Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 msgbox Route112_CableCarStation_Text_22ABC2, MSGBOX_DEFAULT closemessage applymovement 1, Route112_CableCarStation_Movement_22AB71 - applymovement 255, Route112_CableCarStation_Movement_22AB7B + applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_22AB7B waitmovement 0 setvar VAR_0x8004, 0 setvar VAR_0x40A3, 1 diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index b9ece3b21..7668432ab 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -15,10 +15,10 @@ Route113_MapScript1_1F2161: @ 81F2161 Route113_EventScript_1F216A:: @ 81F216A getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_0, 19 - goto_if 0, Route113_EventScript_1F2189 + goto_if_lt Route113_EventScript_1F2189 compare VAR_TEMP_0, 84 - goto_if 2, Route113_EventScript_1F2189 - setweather 7 + goto_if_gt Route113_EventScript_1F2189 + setweather WEATHER_ASH return Route113_EventScript_1F2189:: @ 81F2189 @@ -62,7 +62,7 @@ Route113_EventScript_1F21EE:: @ 81F21EE trainerbattle_single TRAINER_MADELINE_1, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route113_EventScript_1F2239 + goto_if_eq Route113_EventScript_1F2239 msgbox Route113_Text_299F15, MSGBOX_DEFAULT release end @@ -84,7 +84,7 @@ Route113_EventScript_1F2250:: @ 81F2250 trainerbattle_single TRAINER_LAO_1, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route113_EventScript_1F229B + goto_if_eq Route113_EventScript_1F229B msgbox Route113_Text_29A067, MSGBOX_DEFAULT release end diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index c211b6a1c..959c27799 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -5,7 +5,7 @@ Route113_GlassWorkshop_MapScripts:: @ 826ED03 Route113_GlassWorkshop_MapScript1_26ED09: @ 826ED09 setflag FLAG_LANDMARK_GLASS_WORKSHOP compare VAR_0x40BE, 1 - call_if 1, Route113_GlassWorkshop_EventScript_26ED18 + call_if_eq Route113_GlassWorkshop_EventScript_26ED18 end Route113_GlassWorkshop_EventScript_26ED18:: @ 826ED18 @@ -16,11 +16,11 @@ Route113_GlassWorkshop_EventScript_26ED1E:: @ 826ED1E lock faceplayer compare VAR_0x40BE, 10 - goto_if 4, Route113_GlassWorkshop_EventScript_26F090 + goto_if_ge Route113_GlassWorkshop_EventScript_26F090 compare VAR_0x40BE, 2 - goto_eq Route113_GlassWorkshop_EventScript_26ED6E + goto_if_eq Route113_GlassWorkshop_EventScript_26ED6E compare VAR_0x40BE, 1 - goto_eq Route113_GlassWorkshop_EventScript_26ED64 + goto_if_eq Route113_GlassWorkshop_EventScript_26ED64 msgbox Route113_GlassWorkshop_Text_26F19D, MSGBOX_DEFAULT giveitem_std ITEM_SOOT_SACK setvar VAR_0x40BE, 1 @@ -36,10 +36,10 @@ Route113_GlassWorkshop_EventScript_26ED64:: @ 826ED64 Route113_GlassWorkshop_EventScript_26ED6E:: @ 826ED6E checkitem ITEM_SOOT_SACK, 1 compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26ED9D + goto_if_eq Route113_GlassWorkshop_EventScript_26ED9D msgbox Route113_GlassWorkshop_Text_26F312, MSGBOX_DEFAULT compare VAR_ASH_GATHER_COUNT, 250 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFD6 + goto_if_lt Route113_GlassWorkshop_EventScript_26EFD6 message Route113_GlassWorkshop_Text_26F40A waitmessage goto Route113_GlassWorkshop_EventScript_26EDA7 @@ -72,10 +72,10 @@ Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E bufferitemname 0, VAR_0x8008 setvar VAR_0x800A, 250 compare VAR_ASH_GATHER_COUNT, 250 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE + goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 10 subvar VAR_ASH_GATHER_COUNT, 250 goto Route113_GlassWorkshop_EventScript_26F00F @@ -86,10 +86,10 @@ Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A bufferitemname 0, VAR_0x8008 setvar VAR_0x800A, 500 compare VAR_ASH_GATHER_COUNT, 500 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE + goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 11 subvar VAR_ASH_GATHER_COUNT, 500 goto Route113_GlassWorkshop_EventScript_26F00F @@ -100,10 +100,10 @@ Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96 bufferitemname 0, VAR_0x8008 setvar VAR_0x800A, 500 compare VAR_ASH_GATHER_COUNT, 500 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE + goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 12 subvar VAR_ASH_GATHER_COUNT, 500 goto Route113_GlassWorkshop_EventScript_26F00F @@ -114,10 +114,10 @@ Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2 bufferitemname 0, VAR_0x8008 setvar VAR_0x800A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE + goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 13 subvar VAR_ASH_GATHER_COUNT, 1000 goto Route113_GlassWorkshop_EventScript_26F00F @@ -128,10 +128,10 @@ Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E bufferitemname 0, VAR_0x8008 setvar VAR_0x800A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE + goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 14 subvar VAR_ASH_GATHER_COUNT, 1000 goto Route113_GlassWorkshop_EventScript_26F00F @@ -143,10 +143,10 @@ Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A bufferdecorationname 0, VAR_0x8008 setvar VAR_0x800A, 6000 compare VAR_ASH_GATHER_COUNT, 6000 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE + goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 15 subvar VAR_ASH_GATHER_COUNT, 6000 goto Route113_GlassWorkshop_EventScript_26F00F @@ -158,10 +158,10 @@ Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B bufferdecorationname 0, VAR_0x8008 setvar VAR_0x800A, 8000 compare VAR_ASH_GATHER_COUNT, 8000 - goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE + goto_if_lt Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F003 + goto_if_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 16 subvar VAR_ASH_GATHER_COUNT, 8000 goto Route113_GlassWorkshop_EventScript_26F00F @@ -203,9 +203,9 @@ Route113_GlassWorkshop_EventScript_26F00F:: @ 826F00F fadescreen 0 msgbox Route113_GlassWorkshop_Text_26F688, MSGBOX_DEFAULT compare VAR_0x8009, 0 - call_if 1, Route113_GlassWorkshop_EventScript_26F047 + call_if_eq Route113_GlassWorkshop_EventScript_26F047 compare VAR_0x8009, 1 - call_if 1, Route113_GlassWorkshop_EventScript_26F05F + call_if_eq Route113_GlassWorkshop_EventScript_26F05F setvar VAR_0x40BE, 2 release end @@ -213,13 +213,13 @@ Route113_GlassWorkshop_EventScript_26F00F:: @ 826F00F Route113_GlassWorkshop_EventScript_26F047:: @ 826F047 giveitem_std VAR_0x8008 compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F072 + goto_if_eq Route113_GlassWorkshop_EventScript_26F072 return Route113_GlassWorkshop_EventScript_26F05F:: @ 826F05F givedecoration_std VAR_0x8008 compare VAR_RESULT, 0 - goto_eq Route113_GlassWorkshop_EventScript_26F081 + goto_if_eq Route113_GlassWorkshop_EventScript_26F081 return Route113_GlassWorkshop_EventScript_26F072:: @ 826F072 @@ -297,9 +297,9 @@ Route113_GlassWorkshop_EventScript_26F15B:: @ 826F15B Route113_GlassWorkshop_EventScript_26F16F:: @ 826F16F msgbox Route113_GlassWorkshop_Text_26F688, MSGBOX_DEFAULT compare VAR_0x8009, 0 - call_if 1, Route113_GlassWorkshop_EventScript_26F047 + call_if_eq Route113_GlassWorkshop_EventScript_26F047 compare VAR_0x8009, 1 - call_if 1, Route113_GlassWorkshop_EventScript_26F05F + call_if_eq Route113_GlassWorkshop_EventScript_26F05F setvar VAR_0x40BE, 2 release end diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 6adf20870..b66b54910 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -6,18 +6,18 @@ Route114_MapScripts:: @ 81F252F Route114_MapScript1_1F253F: @ 81F253F compare VAR_0x4039, 1 - call_if 1, Route114_EventScript_273D13 + call_if_eq Route114_EventScript_273D13 compare VAR_0x4037, 1 - call_if 1, Route114_EventScript_273D1B + call_if_eq Route114_EventScript_273D1B compare VAR_0x4037, 2 - call_if 1, Route114_EventScript_273D1B + call_if_eq Route114_EventScript_273D1B end Route114_MapScript1_1F2561: @ 81F2561 compare VAR_0x4037, 1 - call_if 1, Route114_EventScript_273913 + call_if_eq Route114_EventScript_273913 compare VAR_0x4037, 2 - call_if 1, Route114_EventScript_273926 + call_if_eq Route114_EventScript_273926 end Route114_MapScript2_1F2578: @ 81F2578 @@ -28,15 +28,14 @@ Route114_EventScript_1F2582:: @ 81F2582 lock faceplayer dodailyevents - checkflag FLAG_0x92B - goto_eq Route114_EventScript_1F25C7 + goto_if_set FLAG_0x92B, Route114_EventScript_1F25C7 msgbox Route114_Text_2A6FCB, MSGBOX_DEFAULT random 5 addvar VAR_RESULT, 15 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_eq Route114_EventScript_272054 + goto_if_eq Route114_EventScript_272054 setflag FLAG_0x92B msgbox Route114_Text_2A7034, MSGBOX_DEFAULT release @@ -50,12 +49,11 @@ Route114_EventScript_1F25C7:: @ 81F25C7 Route114_EventScript_1F25D1:: @ 81F25D1 lock faceplayer - checkflag FLAG_0x0E7 - goto_eq Route114_EventScript_1F2608 + goto_if_set FLAG_0x0E7, Route114_EventScript_1F2608 msgbox Route114_Text_1F2809, MSGBOX_DEFAULT giveitem_std ITEM_TM05 compare VAR_RESULT, 0 - goto_eq Route114_EventScript_272054 + goto_if_eq Route114_EventScript_272054 setflag FLAG_0x0E7 msgbox Route114_Text_1F2872, MSGBOX_DEFAULT release @@ -112,7 +110,7 @@ Route114_EventScript_1F269C:: @ 81F269C trainerbattle_single TRAINER_STEVE_1, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route114_EventScript_1F26E7 + goto_if_eq Route114_EventScript_1F26E7 msgbox Route114_Text_29A981, MSGBOX_DEFAULT release end @@ -134,7 +132,7 @@ Route114_EventScript_1F26FE:: @ 81F26FE trainerbattle_single TRAINER_BERNIE_1, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route114_EventScript_1F2749 + goto_if_eq Route114_EventScript_1F2749 msgbox Route114_Text_29AB36, MSGBOX_DEFAULT release end diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc index f2e62b451..4985089c2 100644 --- a/data/maps/Route114_FossilManiacsHouse/scripts.inc +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -9,12 +9,11 @@ Route114_FossilManiacsHouse_MapScript1_22AD36: @ 822AD36 Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A lock faceplayer - checkflag FLAG_0x105 - goto_eq Route114_FossilManiacsHouse_EventScript_22AD69 + goto_if_set FLAG_0x105, Route114_FossilManiacsHouse_EventScript_22AD69 msgbox Route114_FossilManiacsHouse_Text_22AD85, MSGBOX_DEFAULT giveitem_std ITEM_TM28 compare VAR_RESULT, 0 - goto_eq Route114_FossilManiacsHouse_EventScript_272054 + goto_if_eq Route114_FossilManiacsHouse_EventScript_272054 setflag FLAG_0x105 release end diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 7b2a91810..850e970e3 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -4,8 +4,7 @@ Route114_FossilManiacsTunnel_MapScripts:: @ 822AF28 .byte 0 Route114_FossilManiacsTunnel_MapScript1_22AF33: @ 822AF33 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, Route114_FossilManiacsTunnel_EventScript_22AF3D + call_if_set FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_22AF3D end Route114_FossilManiacsTunnel_EventScript_22AF3D:: @ 822AF3D @@ -14,8 +13,7 @@ Route114_FossilManiacsTunnel_EventScript_22AF3D:: @ 822AF3D return Route114_FossilManiacsTunnel_MapScript1_22AF49: @ 822AF49 - checkflag FLAG_SYS_GAME_CLEAR - call_if 0, Route114_FossilManiacsTunnel_EventScript_22AF53 + call_if_unset FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_22AF53 end Route114_FossilManiacsTunnel_EventScript_22AF53:: @ 822AF53 @@ -26,7 +24,7 @@ Route114_FossilManiacsTunnel_EventScript_22AF53:: @ 822AF53 Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 lockall applymovement 1, Route114_FossilManiacsTunnel_Movement_2725A6 - applymovement 255, Route114_FossilManiacsTunnel_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, Route114_FossilManiacsTunnel_Movement_2725AA waitmovement 0 msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT setvar VAR_0x40CC, 2 @@ -36,14 +34,13 @@ Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 Route114_FossilManiacsTunnel_EventScript_22AF87:: @ 822AF87 lock faceplayer - checkflag FLAG_0x10B - goto_eq Route114_FossilManiacsTunnel_EventScript_22AFC6 + goto_if_set FLAG_0x10B, Route114_FossilManiacsTunnel_EventScript_22AFC6 checkitem ITEM_ROOT_FOSSIL, 1 compare VAR_RESULT, 1 - goto_eq Route114_FossilManiacsTunnel_EventScript_22AFBC + goto_if_eq Route114_FossilManiacsTunnel_EventScript_22AFBC checkitem ITEM_CLAW_FOSSIL, 1 compare VAR_RESULT, 1 - goto_eq Route114_FossilManiacsTunnel_EventScript_22AFBC + goto_if_eq Route114_FossilManiacsTunnel_EventScript_22AFBC msgbox Route114_FossilManiacsTunnel_Text_22AFD0, MSGBOX_DEFAULT release end diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc index 0145ee945..984bca574 100644 --- a/data/maps/Route114_LanettesHouse/scripts.inc +++ b/data/maps/Route114_LanettesHouse/scripts.inc @@ -9,13 +9,12 @@ Route114_LanettesHouse_MapScript1_22B2CE: @ 822B2CE Route114_LanettesHouse_EventScript_22B2D2:: @ 822B2D2 lock faceplayer - checkflag FLAG_0x083 - goto_eq Route114_LanettesHouse_EventScript_22B2FF + goto_if_set FLAG_0x083, Route114_LanettesHouse_EventScript_22B2FF setflag FLAG_SYS_PC_LANETTE msgbox Route114_LanettesHouse_Text_22B34E, MSGBOX_DEFAULT givedecoration_std 99 compare VAR_RESULT, 0 - goto_eq Route114_LanettesHouse_EventScript_272067 + goto_if_eq Route114_LanettesHouse_EventScript_272067 setflag FLAG_0x083 release end @@ -29,7 +28,7 @@ Route114_LanettesHouse_EventScript_22B309:: @ 822B309 lockall msgbox Route114_LanettesHouse_Text_22B485, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route114_LanettesHouse_EventScript_22B327 + goto_if_eq Route114_LanettesHouse_EventScript_22B327 msgbox Route114_LanettesHouse_Text_22B6E4, MSGBOX_DEFAULT releaseall end @@ -37,7 +36,7 @@ Route114_LanettesHouse_EventScript_22B309:: @ 822B309 Route114_LanettesHouse_EventScript_22B327:: @ 822B327 msgbox Route114_LanettesHouse_Text_22B53C, MSGBOX_YESNO compare VAR_RESULT, 1 - call_if 1, Route114_LanettesHouse_EventScript_22B33C + call_if_eq Route114_LanettesHouse_EventScript_22B33C releaseall end diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 6c74a0d5a..560c360af 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -6,18 +6,18 @@ Route115_MapScripts:: @ 81F2920 Route115_MapScript1_1F2930: @ 81F2930 compare VAR_0x4037, 3 - call_if 1, Route115_EventScript_273939 + call_if_eq Route115_EventScript_273939 compare VAR_0x4037, 4 - call_if 1, Route115_EventScript_27394C + call_if_eq Route115_EventScript_27394C end Route115_MapScript1_1F2947: @ 81F2947 compare VAR_0x4039, 1 - call_if 1, Route115_EventScript_273D13 + call_if_eq Route115_EventScript_273D13 compare VAR_0x4037, 3 - call_if 1, Route115_EventScript_273D1B + call_if_eq Route115_EventScript_273D1B compare VAR_0x4037, 4 - call_if 1, Route115_EventScript_273D1B + call_if_eq Route115_EventScript_273D1B end Route115_MapScript2_1F2969: @ 81F2969 @@ -40,7 +40,7 @@ Route115_EventScript_1F298E:: @ 81F298E trainerbattle_single TRAINER_TIMOTHY_1, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route115_EventScript_1F29D9 + goto_if_eq Route115_EventScript_1F29D9 msgbox Route115_Text_29B258, MSGBOX_DEFAULT release end @@ -67,7 +67,7 @@ Route115_EventScript_1F2A07:: @ 81F2A07 trainerbattle_single TRAINER_NOB_1, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route115_EventScript_1F2A52 + goto_if_eq Route115_EventScript_1F2A52 msgbox Route115_Text_29B49D, MSGBOX_DEFAULT release end @@ -89,7 +89,7 @@ Route115_EventScript_1F2A69:: @ 81F2A69 trainerbattle_single TRAINER_CYNDY_1, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route115_EventScript_1F2AB4 + goto_if_eq Route115_EventScript_1F2AB4 msgbox Route115_Text_29B647, MSGBOX_DEFAULT release end diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 2ad7ea58b..519bc0447 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -5,14 +5,13 @@ Route116_MapScripts:: @ 81F2C0C .byte 0 Route116_MapScript1_1F2C1C: @ 81F2C1C - checkflag FLAG_0x08F - call_if 1, Route116_EventScript_1F2C47 + call_if_set FLAG_0x08F, Route116_EventScript_1F2C47 compare VAR_0x4039, 1 - call_if 1, Route116_EventScript_273D13 + call_if_eq Route116_EventScript_273D13 compare VAR_0x4037, 5 - call_if 1, Route116_EventScript_273D1B + call_if_eq Route116_EventScript_273D1B compare VAR_0x4037, 6 - call_if 1, Route116_EventScript_273D1B + call_if_eq Route116_EventScript_273D1B end Route116_EventScript_1F2C47:: @ 81F2C47 @@ -21,9 +20,9 @@ Route116_EventScript_1F2C47:: @ 81F2C47 Route116_MapScript1_1F2C4F: @ 81F2C4F compare VAR_0x4037, 5 - call_if 1, Route116_EventScript_27395F + call_if_eq Route116_EventScript_27395F compare VAR_0x4037, 6 - call_if 1, Route116_EventScript_273972 + call_if_eq Route116_EventScript_273972 end Route116_MapScript2_1F2C66: @ 81F2C66 @@ -33,10 +32,8 @@ Route116_MapScript2_1F2C66: @ 81F2C66 Route116_EventScript_1F2C70:: @ 81F2C70 lock faceplayer - checkflag FLAG_0x08F - goto_eq Route116_EventScript_1F2C8E - checkflag FLAG_0x08E - goto_eq Route116_EventScript_1F2C98 + goto_if_set FLAG_0x08F, Route116_EventScript_1F2C8E + goto_if_set FLAG_0x08E, Route116_EventScript_1F2C98 msgbox Route116_Text_1F3140, MSGBOX_DEFAULT release end @@ -54,8 +51,7 @@ Route116_EventScript_1F2C98:: @ 81F2C98 Route116_EventScript_1F2CA2:: @ 81F2CA2 lock faceplayer - checkflag FLAG_0x11F - goto_eq Route116_EventScript_1F2D2B + goto_if_set FLAG_0x11F, Route116_EventScript_1F2D2B msgbox Route116_Text_1F3317, MSGBOX_DEFAULT goto Route116_EventScript_1F2CBB end @@ -64,17 +60,17 @@ Route116_EventScript_1F2CBB:: @ 81F2CBB setflag FLAG_0x11F giveitem_std ITEM_REPEAT_BALL compare VAR_RESULT, 0 - goto_eq Route116_EventScript_1F2D39 + goto_if_eq Route116_EventScript_1F2D39 msgbox Route116_Text_1F3521, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 - call_if 1, Route116_EventScript_1F2D15 + call_if_eq Route116_EventScript_1F2D15 compare VAR_FACING, 1 - call_if 1, Route116_EventScript_1F2D15 + call_if_eq Route116_EventScript_1F2D15 compare VAR_FACING, 3 - call_if 1, Route116_EventScript_1F2D15 + call_if_eq Route116_EventScript_1F2D15 compare VAR_FACING, 4 - call_if 1, Route116_EventScript_1F2D20 + call_if_eq Route116_EventScript_1F2D20 removeobject VAR_LAST_TALKED clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE setflag FLAG_0x100 @@ -156,7 +152,7 @@ Route116_EventScript_1F2D84:: @ 81F2D84 Route116_EventScript_1F2D95:: @ 81F2D95 lockall applymovement 11, Route116_Movement_2725A8 - applymovement 255, Route116_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Route116_Movement_2725A4 waitmovement 0 msgbox Route116_Text_1F309D, MSGBOX_DEFAULT setvar VAR_0x406F, 2 @@ -168,10 +164,10 @@ Route116_EventScript_1F2DB6:: @ 81F2DB6 faceplayer checkitem ITEM_BLACK_GLASSES, 1 compare VAR_RESULT, 1 - goto_eq Route116_EventScript_1F2DF1 + goto_if_eq Route116_EventScript_1F2DF1 specialvar VAR_RESULT, FoundBlackGlasses compare VAR_RESULT, 1 - goto_eq Route116_EventScript_1F2DE2 + goto_if_eq Route116_EventScript_1F2DE2 msgbox Route116_Text_1F3657, MSGBOX_DEFAULT release end @@ -187,7 +183,7 @@ Route116_EventScript_1F2DF1:: @ 81F2DF1 msgbox Route116_Text_1F3688, MSGBOX_DEFAULT specialvar VAR_RESULT, FoundBlackGlasses compare VAR_RESULT, 1 - goto_eq Route116_EventScript_1F2E1B + goto_if_eq Route116_EventScript_1F2E1B msgbox Route116_Text_1F375E, MSGBOX_DEFAULT release end @@ -201,13 +197,13 @@ Route116_EventScript_1F2E1B:: @ 81F2E1B Route116_EventScript_1F2E2A:: @ 81F2E2A delay 20 compare VAR_FACING, 2 - call_if 1, Route116_EventScript_1F2E5E + call_if_eq Route116_EventScript_1F2E5E compare VAR_FACING, 1 - call_if 1, Route116_EventScript_1F2E5E + call_if_eq Route116_EventScript_1F2E5E compare VAR_FACING, 3 - call_if 1, Route116_EventScript_1F2E5E + call_if_eq Route116_EventScript_1F2E5E compare VAR_FACING, 4 - call_if 1, Route116_EventScript_1F2E69 + call_if_eq Route116_EventScript_1F2E69 removeobject VAR_LAST_TALKED release end @@ -261,18 +257,17 @@ Route116_EventScript_1F2EB7:: @ 81F2EB7 trainerbattle_single TRAINER_JERRY_1, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route116_EventScript_1F2F4E + goto_if_eq Route116_EventScript_1F2F4E setvar VAR_0x8004, 273 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 - goto_eq Route116_EventScript_1F2F22 + goto_if_eq Route116_EventScript_1F2F22 msgbox Route116_Text_29BD92, MSGBOX_DEFAULT release end Route116_EventScript_1F2EF8:: @ 81F2EF8 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route116_EventScript_1F2F03 + goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2F03 release end @@ -285,8 +280,7 @@ Route116_EventScript_1F2F03:: @ 81F2F03 end Route116_EventScript_1F2F22:: @ 81F2F22 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route116_EventScript_1F2F35 + goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2F35 msgbox Route116_Text_29BD92, MSGBOX_DEFAULT release end @@ -316,18 +310,17 @@ Route116_EventScript_1F2F93:: @ 81F2F93 trainerbattle_single TRAINER_KAREN_1, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route116_EventScript_1F302A + goto_if_eq Route116_EventScript_1F302A setvar VAR_0x8004, 280 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 - goto_eq Route116_EventScript_1F2FFE + goto_if_eq Route116_EventScript_1F2FFE msgbox Route116_Text_29C010, MSGBOX_DEFAULT release end Route116_EventScript_1F2FD4:: @ 81F2FD4 - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route116_EventScript_1F2FDF + goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2FDF release end @@ -340,8 +333,7 @@ Route116_EventScript_1F2FDF:: @ 81F2FDF end Route116_EventScript_1F2FFE:: @ 81F2FFE - checkflag FLAG_HAS_MATCH_CALL - goto_eq Route116_EventScript_1F3011 + goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F3011 msgbox Route116_Text_29C010, MSGBOX_DEFAULT release end diff --git a/data/maps/Route116_TunnelersRestHouse/scripts.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc index af5a96675..89ccdce8d 100644 --- a/data/maps/Route116_TunnelersRestHouse/scripts.inc +++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc @@ -17,8 +17,7 @@ Route116_TunnelersRestHouse_EventScript_22B863:: @ 822B863 Route116_TunnelersRestHouse_EventScript_22B86C:: @ 822B86C lock faceplayer - checkflag FLAG_RUSTURF_TUNNEL_OPENED - goto_eq Route116_TunnelersRestHouse_EventScript_22B881 + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, Route116_TunnelersRestHouse_EventScript_22B881 msgbox Route116_TunnelersRestHouse_Text_22BAAF, MSGBOX_DEFAULT release end diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 1dbc7167e..4a51c17d8 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -7,8 +7,7 @@ Route117_MapScript1_1F3983: @ 81F3983 end Route117_EventScript_1F3989:: @ 81F3989 - checkflag FLAG_PENDING_DAYCARE_EGG - goto_if 0, Route117_EventScript_1F3999 + goto_if_unset FLAG_PENDING_DAYCARE_EGG, Route117_EventScript_1F3999 setobjectxyperm 3, 47, 6 Route117_EventScript_1F3999:: @ 81F3999 @@ -42,7 +41,7 @@ Route117_EventScript_1F39D0:: @ 81F39D0 trainerbattle_single TRAINER_ISAAC_1, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route117_EventScript_1F3A1B + goto_if_eq Route117_EventScript_1F3A1B msgbox Route117_Text_29C498, MSGBOX_DEFAULT release end @@ -64,7 +63,7 @@ Route117_EventScript_1F3A32:: @ 81F3A32 trainerbattle_single TRAINER_LYDIA_1, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route117_EventScript_1F3A7D + goto_if_eq Route117_EventScript_1F3A7D msgbox Route117_Text_29C679, MSGBOX_DEFAULT release end @@ -86,7 +85,7 @@ Route117_EventScript_1F3A94:: @ 81F3A94 trainerbattle_single TRAINER_DYLAN_1, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route117_EventScript_1F3ADF + goto_if_eq Route117_EventScript_1F3ADF msgbox Route117_Text_29C800, MSGBOX_DEFAULT release end @@ -108,7 +107,7 @@ Route117_EventScript_1F3AF6:: @ 81F3AF6 trainerbattle_single TRAINER_MARIA_1, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route117_EventScript_1F3B41 + goto_if_eq Route117_EventScript_1F3B41 msgbox Route117_Text_29C9D0, MSGBOX_DEFAULT release end @@ -135,7 +134,7 @@ Route117_EventScript_1F3B6F:: @ 81F3B6F trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CC4A, Route117_Text_29CC8E, Route117_Text_29CD61, Route117_EventScript_1F3B9F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route117_EventScript_1F3BB8 + goto_if_eq Route117_EventScript_1F3BB8 msgbox Route117_Text_29CCCB, MSGBOX_DEFAULT release end @@ -155,7 +154,7 @@ Route117_EventScript_1F3BD3:: @ 81F3BD3 trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CD9D, Route117_Text_29CDE9, Route117_Text_29CE52, Route117_EventScript_1F3C03 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route117_EventScript_1F3C1C + goto_if_eq Route117_EventScript_1F3C1C msgbox Route117_Text_29CE17, MSGBOX_DEFAULT release end diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 8d1cf48e4..91067e786 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -7,18 +7,18 @@ Route118_MapScripts:: @ 81F3DBC Route118_MapScript1_1F3DCC: @ 81F3DCC call Route118_EventScript_28CCC7 compare VAR_0x4039, 1 - call_if 1, Route118_EventScript_273D13 + call_if_eq Route118_EventScript_273D13 compare VAR_0x4037, 7 - call_if 1, Route118_EventScript_273D1B + call_if_eq Route118_EventScript_273D1B compare VAR_0x4037, 8 - call_if 1, Route118_EventScript_273D1B + call_if_eq Route118_EventScript_273D1B end Route118_MapScript1_1F3DF3: @ 81F3DF3 compare VAR_0x4037, 7 - call_if 1, Route118_EventScript_273985 + call_if_eq Route118_EventScript_273985 compare VAR_0x4037, 8 - call_if 1, Route118_EventScript_273998 + call_if_eq Route118_EventScript_273998 end Route118_MapScript2_1F3E0A: @ 81F3E0A @@ -28,13 +28,12 @@ Route118_MapScript2_1F3E0A: @ 81F3E0A Route118_EventScript_1F3E14:: @ 81F3E14 lock faceplayer - checkflag FLAG_0x0E3 - goto_eq Route118_EventScript_1F3E69 + goto_if_set FLAG_0x0E3, Route118_EventScript_1F3E69 msgbox Route118_Text_1F427B, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route118_EventScript_1F3E3E + goto_if_eq Route118_EventScript_1F3E3E compare VAR_RESULT, 0 - goto_eq Route118_EventScript_1F3E5F + goto_if_eq Route118_EventScript_1F3E5F end Route118_EventScript_1F3E3E:: @ 81F3E3E @@ -70,7 +69,7 @@ Route118_EventScript_1F3E85:: @ 81F3E85 Route118_EventScript_1F3E8E:: @ 81F3E8E lockall setvar VAR_0x8008, 0 - applymovement 255, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 waitmovement 0 applymovement 19, Route118_Movement_1F3F61 waitmovement 0 @@ -80,7 +79,7 @@ Route118_EventScript_1F3E8E:: @ 81F3E8E Route118_EventScript_1F3EAE:: @ 81F3EAE lockall setvar VAR_0x8008, 1 - applymovement 255, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 waitmovement 0 goto Route118_EventScript_1F3EE4 end @@ -88,7 +87,7 @@ Route118_EventScript_1F3EAE:: @ 81F3EAE Route118_EventScript_1F3EC4:: @ 81F3EC4 lockall setvar VAR_0x8008, 2 - applymovement 255, Route118_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_2725B2 waitmovement 0 applymovement 19, Route118_Movement_1F3F63 waitmovement 0 @@ -103,30 +102,30 @@ Route118_EventScript_1F3EE4:: @ 81F3EE4 msgbox Route118_Text_1F40BE, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if 1, Route118_EventScript_1F3F28 + call_if_eq Route118_EventScript_1F3F28 compare VAR_0x8008, 1 - call_if 1, Route118_EventScript_1F3F3A + call_if_eq Route118_EventScript_1F3F3A compare VAR_0x8008, 2 - call_if 1, Route118_EventScript_1F3F4C + call_if_eq Route118_EventScript_1F3F4C setvar VAR_0x4071, 1 removeobject 19 releaseall end Route118_EventScript_1F3F28:: @ 81F3F28 - applymovement 255, Route118_Movement_1F3F5E + applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E applymovement 19, Route118_Movement_1F3F69 waitmovement 0 return Route118_EventScript_1F3F3A:: @ 81F3F3A - applymovement 255, Route118_Movement_1F3F5E + applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E applymovement 19, Route118_Movement_1F3F74 waitmovement 0 return Route118_EventScript_1F3F4C:: @ 81F3F4C - applymovement 255, Route118_Movement_1F3F5E + applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E applymovement 19, Route118_Movement_1F3F7E waitmovement 0 return @@ -190,7 +189,7 @@ Route118_EventScript_1F3F87:: @ 81F3F87 trainerbattle_single TRAINER_ROSE_1, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route118_EventScript_1F3FD2 + goto_if_eq Route118_EventScript_1F3FD2 msgbox Route118_Text_29D2FA, MSGBOX_DEFAULT release end @@ -222,7 +221,7 @@ Route118_EventScript_1F4017:: @ 81F4017 trainerbattle_single TRAINER_DALTON_1, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route118_EventScript_1F4062 + goto_if_eq Route118_EventScript_1F4062 msgbox Route118_Text_29D6D8, MSGBOX_DEFAULT release end diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index fd1d127d1..229db6da5 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -4,14 +4,13 @@ Route119_MapScripts:: @ 81F4424 .byte 0 Route119_MapScript1_1F442F: @ 81F442F - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, Route119_EventScript_1F4439 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route119_EventScript_1F4439 end Route119_EventScript_1F4439:: @ 81F4439 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, Route119_EventScript_27374E + goto_if_ne Route119_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -19,7 +18,7 @@ Route119_MapScript1_1F444D: @ 81F444D call Route119_EventScript_271ED7 call Route119_EventScript_271EFB compare VAR_WEATHER_INSTITUTE_STATE, 1 - call_if 1, Route119_EventScript_1F4466 + call_if_eq Route119_EventScript_1F4466 special SetRoute119Weather end @@ -44,29 +43,29 @@ Route119_EventScript_1F4488:: @ 81F4488 addobject 25 checkplayergender compare VAR_RESULT, 0 - call_if 1, Route119_EventScript_1F4501 + call_if_eq Route119_EventScript_1F4501 compare VAR_RESULT, 1 - call_if 1, Route119_EventScript_1F4506 + call_if_eq Route119_EventScript_1F4506 delay 65 compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1F46C6 + call_if_eq Route119_EventScript_1F46C6 compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1F46D1 - applymovement 255, Route119_Movement_2725AA + call_if_eq Route119_EventScript_1F46D1 + applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_2725AA waitmovement 0 delay 30 compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1F4700 + call_if_eq Route119_EventScript_1F4700 compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1F470F + call_if_eq Route119_EventScript_1F470F removeobject 25 addobject 16 delay 30 checkplayergender compare VAR_RESULT, 0 - goto_eq Route119_EventScript_1F450B + goto_if_eq Route119_EventScript_1F450B compare VAR_RESULT, 1 - goto_eq Route119_EventScript_1F4585 + goto_if_eq Route119_EventScript_1F4585 releaseall end @@ -146,25 +145,25 @@ Route119_EventScript_1F45FF:: @ 81F45FF Route119_EventScript_1F460F:: @ 81F460F closemessage compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1F4700 + call_if_eq Route119_EventScript_1F4700 compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1F470F + call_if_eq Route119_EventScript_1F470F removeobject 16 addobject 25 delay 30 compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1F46DC + call_if_eq Route119_EventScript_1F46DC compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1F46EE + call_if_eq Route119_EventScript_1F46EE removeobject 25 setvar VAR_0x4072, 1 savebgm MUS_DUMMY fadedefaultbgm delay 60 compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1F46A0 + call_if_eq Route119_EventScript_1F46A0 compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1F46A8 + call_if_eq Route119_EventScript_1F46A8 addobject 43 applymovement 43, Route119_Movement_1F4752 waitmovement 0 @@ -172,9 +171,9 @@ Route119_EventScript_1F460F:: @ 81F460F msgbox Route119_Text_1F4E60, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1F46B0 + call_if_eq Route119_EventScript_1F46B0 compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1F46BB + call_if_eq Route119_EventScript_1F46BB removeobject 43 releaseall end @@ -208,13 +207,13 @@ Route119_EventScript_1F46D1:: @ 81F46D1 return Route119_EventScript_1F46DC:: @ 81F46DC - applymovement 255, Route119_Movement_1F471E + applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_1F471E applymovement 25, Route119_Movement_1F473D waitmovement 0 return Route119_EventScript_1F46EE:: @ 81F46EE - applymovement 255, Route119_Movement_1F4723 + applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_1F4723 applymovement 25, Route119_Movement_1F4747 waitmovement 0 return @@ -370,7 +369,7 @@ Route119_EventScript_1F4810:: @ 81F4810 trainerbattle_single TRAINER_JACKSON_1, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route119_EventScript_1F485B + goto_if_eq Route119_EventScript_1F485B msgbox Route119_Text_29DCC6, MSGBOX_DEFAULT release end @@ -392,7 +391,7 @@ Route119_EventScript_1F4872:: @ 81F4872 trainerbattle_single TRAINER_CATHERINE_1, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route119_EventScript_1F48BD + goto_if_eq Route119_EventScript_1F48BD msgbox Route119_Text_29DE88, MSGBOX_DEFAULT release end diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index 3b36baf91..b0426ea2e 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -4,7 +4,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 826FA86 Route119_WeatherInstitute_1F_MapScript1_26FA8C: @ 826FA8C compare VAR_WEATHER_INSTITUTE_STATE, 0 - call_if 1, Route119_WeatherInstitute_1F_EventScript_26FA98 + call_if_eq Route119_WeatherInstitute_1F_EventScript_26FA98 end Route119_WeatherInstitute_1F_EventScript_26FA98:: @ 826FA98 @@ -17,7 +17,7 @@ Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4 faceplayer special GetPlayerBigGuyGirlString compare VAR_WEATHER_INSTITUTE_STATE, 0 - goto_eq Route119_WeatherInstitute_1F_EventScript_26FABE + goto_if_eq Route119_WeatherInstitute_1F_EventScript_26FABE msgbox Route119_WeatherInstitute_1F_Text_26FCE5, MSGBOX_DEFAULT release end @@ -30,15 +30,12 @@ Route119_WeatherInstitute_1F_EventScript_26FABE:: @ 826FABE Route119_WeatherInstitute_1F_EventScript_26FAC8:: @ 826FAC8 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, Route119_WeatherInstitute_1F_EventScript_26FB05 + goto_if_unset FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_1F_EventScript_26FB05 setvar VAR_0x8004, 0 - checkflag FLAG_0x1BE - call_if 1, Route119_WeatherInstitute_1F_EventScript_26FAFF - checkflag FLAG_0x1BF - call_if 1, Route119_WeatherInstitute_1F_EventScript_26FAFF + call_if_set FLAG_0x1BE, Route119_WeatherInstitute_1F_EventScript_26FAFF + call_if_set FLAG_0x1BF, Route119_WeatherInstitute_1F_EventScript_26FAFF compare VAR_0x8004, 2 - goto_eq Route119_WeatherInstitute_1F_EventScript_26FB05 + goto_if_eq Route119_WeatherInstitute_1F_EventScript_26FB05 msgbox Route119_WeatherInstitute_1F_Text_26FDE8, MSGBOX_DEFAULT release end diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 35dd538df..6d54e62ad 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -4,11 +4,10 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24 compare VAR_WEATHER_INSTITUTE_STATE, 0 - call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF44 + call_if_eq Route119_WeatherInstitute_2F_EventScript_26FF44 compare VAR_WEATHER_INSTITUTE_STATE, 1 - call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF50 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF5C + call_if_eq Route119_WeatherInstitute_2F_EventScript_26FF50 + call_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_26FF5C end Route119_WeatherInstitute_2F_EventScript_26FF44:: @ 826FF44 @@ -51,7 +50,7 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 closemessage addobject 7 applymovement 7, Route119_WeatherInstitute_2F_Movement_270170 - applymovement 255, Route119_WeatherInstitute_2F_Movement_27017C + applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_27017C waitmovement 0 msgbox Route119_WeatherInstitute_2F_Text_270568, MSGBOX_DEFAULT closemessage @@ -73,7 +72,7 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 removeobject 3 removeobject 8 removeobject 7 - applymovement 255, Route119_WeatherInstitute_2F_Movement_270184 + applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_270184 waitmovement 0 fadescreen 0 applymovement 5, Route119_WeatherInstitute_2F_Movement_270187 @@ -87,9 +86,9 @@ Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D setvar VAR_TEMP_1, 385 givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 compare VAR_RESULT, 0 - goto_eq Route119_WeatherInstitute_2F_EventScript_270085 + goto_if_eq Route119_WeatherInstitute_2F_EventScript_270085 compare VAR_RESULT, 1 - goto_eq Route119_WeatherInstitute_2F_EventScript_2700AD + goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700AD goto Route119_WeatherInstitute_2F_EventScript_273811 end @@ -97,7 +96,7 @@ Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085 call Route119_WeatherInstitute_2F_EventScript_2700DB msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route119_WeatherInstitute_2F_EventScript_2700EA + goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700EA call Route119_WeatherInstitute_2F_EventScript_27378B call Route119_WeatherInstitute_2F_EventScript_2723DD goto Route119_WeatherInstitute_2F_EventScript_2700EA @@ -107,7 +106,7 @@ Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD call Route119_WeatherInstitute_2F_EventScript_2700DB msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route119_WeatherInstitute_2F_EventScript_2700D0 + goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700D0 call Route119_WeatherInstitute_2F_EventScript_273797 goto Route119_WeatherInstitute_2F_EventScript_2700D0 end @@ -132,25 +131,21 @@ Route119_WeatherInstitute_2F_EventScript_2700EA:: @ 82700EA end Route119_WeatherInstitute_2F_EventScript_2700F7:: @ 82700F7 - checkflag FLAG_SYS_GAME_CLEAR - goto_eq Route119_WeatherInstitute_2F_EventScript_27010A + goto_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_27010A msgbox Route119_WeatherInstitute_2F_Text_27077E, MSGBOX_DEFAULT release end Route119_WeatherInstitute_2F_EventScript_27010A:: @ 827010A setvar VAR_0x8004, 0 - checkflag FLAG_0x1BE - call_if 1, Route119_WeatherInstitute_2F_EventScript_270160 - checkflag FLAG_0x1BF - call_if 1, Route119_WeatherInstitute_2F_EventScript_270160 + call_if_set FLAG_0x1BE, Route119_WeatherInstitute_2F_EventScript_270160 + call_if_set FLAG_0x1BF, Route119_WeatherInstitute_2F_EventScript_270160 compare VAR_0x8004, 2 - goto_eq Route119_WeatherInstitute_2F_EventScript_270166 - checkflag FLAG_TEMP_2 - call_if 0, Route119_WeatherInstitute_2F_EventScript_270159 + goto_if_eq Route119_WeatherInstitute_2F_EventScript_270166 + call_if_unset FLAG_TEMP_2, Route119_WeatherInstitute_2F_EventScript_270159 specialvar VAR_RESULT, sub_813B374 compare VAR_RESULT, 1 - goto_eq Route119_WeatherInstitute_2F_EventScript_27014F + goto_if_eq Route119_WeatherInstitute_2F_EventScript_27014F msgbox Route119_WeatherInstitute_2F_Text_2707F1, MSGBOX_DEFAULT release end @@ -212,8 +207,7 @@ Route119_WeatherInstitute_2F_Movement_270187: @ 8270187 Route119_WeatherInstitute_2F_EventScript_27018B:: @ 827018B lock faceplayer - checkflag FLAG_0x097 - goto_eq Route119_WeatherInstitute_2F_EventScript_2700F7 + goto_if_set FLAG_0x097, Route119_WeatherInstitute_2F_EventScript_2700F7 goto Route119_WeatherInstitute_2F_EventScript_27004D end diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index ba16b1a2f..cde0fbbd3 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -5,29 +5,28 @@ Route120_MapScripts:: @ 81F53EC .byte 0 Route120_MapScript1_1F53FC: @ 81F53FC - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, Route120_EventScript_1F5406 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route120_EventScript_1F5406 end Route120_EventScript_1F5406:: @ 81F5406 compare VAR_0x8009, 0 - call_if 1, Route120_EventScript_1F5449 + call_if_eq Route120_EventScript_1F5449 compare VAR_0x8009, 1 - call_if 1, Route120_EventScript_1F5460 + call_if_eq Route120_EventScript_1F5460 compare VAR_0x8009, 2 - call_if 1, Route120_EventScript_1F5460 + call_if_eq Route120_EventScript_1F5460 compare VAR_0x8009, 3 - call_if 1, Route120_EventScript_1F5460 + call_if_eq Route120_EventScript_1F5460 compare VAR_0x8009, 4 - call_if 1, Route120_EventScript_1F5460 + call_if_eq Route120_EventScript_1F5460 compare VAR_0x8009, 5 - call_if 1, Route120_EventScript_1F5460 + call_if_eq Route120_EventScript_1F5460 return Route120_EventScript_1F5449:: @ 81F5449 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, Route120_EventScript_27374E + goto_if_ne Route120_EventScript_27374E removeobject 30 removeobject 36 return @@ -35,17 +34,14 @@ Route120_EventScript_1F5449:: @ 81F5449 Route120_EventScript_1F5460:: @ 81F5460 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, Route120_EventScript_27374E + goto_if_ne Route120_EventScript_27374E removeobject VAR_LAST_TALKED return Route120_MapScript1_1F5474: @ 81F5474 - checkflag FLAG_0x0E4 - call_if 0, Route120_EventScript_1F5490 - checkflag FLAG_0x11D - call_if 1, Route120_EventScript_1F54A3 - checkflag FLAG_0x11D - call_if 0, Route120_EventScript_1F54C8 + call_if_unset FLAG_0x0E4, Route120_EventScript_1F5490 + call_if_set FLAG_0x11D, Route120_EventScript_1F54A3 + call_if_unset FLAG_0x11D, Route120_EventScript_1F54C8 end Route120_EventScript_1F5490:: @ 81F5490 @@ -72,44 +68,43 @@ Route120_MapScript1_1F54CD: @ 81F54CD Route120_EventScript_1F54D8:: @ 81F54D8 getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_1, 14 - goto_if 3, Route120_EventScript_1F5503 + goto_if_le Route120_EventScript_1F5503 compare VAR_TEMP_1, 60 - goto_if 3, Route120_EventScript_1F5507 + goto_if_le Route120_EventScript_1F5507 compare VAR_TEMP_1, 61 - goto_if 4, Route120_EventScript_1F54FF + goto_if_ge Route120_EventScript_1F54FF return Route120_EventScript_1F54FF:: @ 81F54FF - setweather 1 + setweather WEATHER_CLOUDS return Route120_EventScript_1F5503:: @ 81F5503 - setweather 2 + setweather WEATHER_SUNNY return Route120_EventScript_1F5507:: @ 81F5507 compare VAR_TEMP_0, 7 - goto_if 3, Route120_EventScript_1F5523 + goto_if_le Route120_EventScript_1F5523 compare VAR_TEMP_0, 19 - goto_if 3, Route120_EventScript_1F5503 + goto_if_le Route120_EventScript_1F5503 goto Route120_EventScript_1F5523 end Route120_EventScript_1F5523:: @ 81F5523 - setweather 3 + setweather WEATHER_RAIN_LIGHT return Route120_EventScript_1F5527:: @ 81F5527 lock faceplayer dodailyevents - checkflag FLAG_0x92E - goto_eq Route120_EventScript_1F5625 + goto_if_set FLAG_0x92E, Route120_EventScript_1F5625 msgbox Route120_Text_2A70C7, MSGBOX_YESNO compare VAR_RESULT, 1 - call_if 1, Route120_EventScript_1F562F + call_if_eq Route120_EventScript_1F562F compare VAR_RESULT, 0 - call_if 1, Route120_EventScript_1F5638 + call_if_eq Route120_EventScript_1F5638 specialvar VAR_RESULT, GetPlayerTrainerIdOnesDigit switch VAR_RESULT case 0, Route120_EventScript_1F55CA @@ -152,7 +147,7 @@ Route120_EventScript_1F55F6:: @ 81F55F6 Route120_EventScript_1F5601:: @ 81F5601 giveitem_std VAR_0x8004 compare VAR_RESULT, 0 - goto_eq Route120_EventScript_272054 + goto_if_eq Route120_EventScript_272054 setflag FLAG_0x92E msgbox Route120_Text_2A71D5, MSGBOX_DEFAULT release @@ -174,11 +169,10 @@ Route120_EventScript_1F5638:: @ 81F5638 Route120_EventScript_1F5641:: @ 81F5641 lock faceplayer - checkflag FLAG_0x122 - goto_eq Route120_EventScript_1F5672 + goto_if_set FLAG_0x122, Route120_EventScript_1F5672 msgbox Route120_Text_1F5998, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route120_EventScript_1F5665 + goto_if_eq Route120_EventScript_1F5665 goto Route120_EventScript_1F568B end @@ -191,7 +185,7 @@ Route120_EventScript_1F5665:: @ 81F5665 Route120_EventScript_1F5672:: @ 81F5672 msgbox Route120_Text_1F5ADE, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route120_EventScript_1F5665 + goto_if_eq Route120_EventScript_1F5665 goto Route120_EventScript_1F568B end @@ -199,9 +193,9 @@ Route120_EventScript_1F568B:: @ 81F568B msgbox Route120_Text_1F5B0F, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 - call_if 1, Route120_EventScript_1F57A3 + call_if_eq Route120_EventScript_1F57A3 compare VAR_FACING, 3 - call_if 1, Route120_EventScript_1F57AE + call_if_eq Route120_EventScript_1F57AE applymovement 31, Route120_Movement_2725A4 waitmovement 0 delay 20 @@ -222,11 +216,11 @@ Route120_EventScript_1F568B:: @ 81F568B clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq Route120_EventScript_1F571C + goto_if_eq Route120_EventScript_1F571C compare VAR_RESULT, 4 - goto_eq Route120_EventScript_1F571C + goto_if_eq Route120_EventScript_1F571C compare VAR_RESULT, 5 - goto_eq Route120_EventScript_1F571C + goto_if_eq Route120_EventScript_1F571C goto Route120_EventScript_1F572C end @@ -240,7 +234,7 @@ Route120_EventScript_1F571C:: @ 81F571C Route120_EventScript_1F572C:: @ 81F572C applymovement 31, Route120_Movement_2725AA - applymovement 255, Route120_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_2725A6 waitmovement 0 msgbox Route120_Text_1F5BAF, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_SCOPE @@ -264,12 +258,12 @@ Route120_EventScript_1F572C:: @ 81F572C end Route120_EventScript_1F57A3:: @ 81F57A3 - applymovement 255, Route120_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_2725A4 waitmovement 0 return Route120_EventScript_1F57AE:: @ 81F57AE - applymovement 255, Route120_Movement_1F57B9 + applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_1F57B9 waitmovement 0 return @@ -299,7 +293,7 @@ Route120_EventScript_1F57EE:: @ 81F57EE trainerbattle_single TRAINER_ROBERT_1, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route120_EventScript_1F5839 + goto_if_eq Route120_EventScript_1F5839 msgbox Route120_Text_29E726, MSGBOX_DEFAULT release end @@ -331,7 +325,7 @@ Route120_EventScript_1F587E:: @ 81F587E trainerbattle_single TRAINER_JEFFREY_1, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route120_EventScript_1F58C9 + goto_if_eq Route120_EventScript_1F58C9 msgbox Route120_Text_29EA08, MSGBOX_DEFAULT release end diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index 2d65779e7..ee361d30c 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -74,7 +74,7 @@ Route121_EventScript_1F5E8B:: @ 81F5E8B trainerbattle_single TRAINER_WALTER_1, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route121_EventScript_1F5ED6 + goto_if_eq Route121_EventScript_1F5ED6 msgbox Route121_Text_29F21E, MSGBOX_DEFAULT release end @@ -111,7 +111,7 @@ Route121_EventScript_1F5F3A:: @ 81F5F3A trainerbattle_single TRAINER_JESSICA_1, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route121_EventScript_1F5F85 + goto_if_eq Route121_EventScript_1F5F85 msgbox Route121_Text_29F66F, MSGBOX_DEFAULT release end @@ -153,7 +153,7 @@ Route121_EventScript_1F5FF8:: @ 81F5FF8 trainerbattle_single TRAINER_CRISTIN_1, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route121_EventScript_1F6043 + goto_if_eq Route121_EventScript_1F6043 msgbox Route121_Text_29F7D4, MSGBOX_DEFAULT release end diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index 12fa8112e..4a26d8075 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -8,7 +8,7 @@ Route121_SafariZoneEntrance_MapScript2_22BBC1: @ 822BBC1 Route121_SafariZoneEntrance_EventScript_22BBCB:: @ 822BBCB lockall - applymovement 255, Route121_SafariZoneEntrance_Movement_22BBDD + applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BBDD waitmovement 0 setvar VAR_0x40A4, 0 releaseall @@ -34,7 +34,7 @@ Route121_SafariZoneEntrance_EventScript_22BBEF:: @ 822BBEF faceplayer msgbox Route121_SafariZoneEntrance_Text_2A4E46, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route121_SafariZoneEntrance_EventScript_22BC0E + goto_if_eq Route121_SafariZoneEntrance_EventScript_22BC0E msgbox Route121_SafariZoneEntrance_Text_2A4E7E, MSGBOX_DEFAULT release end @@ -46,12 +46,12 @@ Route121_SafariZoneEntrance_EventScript_22BC0E:: @ 822BC0E Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 lockall - applymovement 255, Route121_SafariZoneEntrance_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_2725A6 waitmovement 0 showmoneybox 0, 0, 0 msgbox Route121_SafariZoneEntrance_Text_2A4F74, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route121_SafariZoneEntrance_EventScript_22BC48 + goto_if_eq Route121_SafariZoneEntrance_EventScript_22BC48 msgbox Route121_SafariZoneEntrance_Text_2A4FD7, MSGBOX_DEFAULT goto Route121_SafariZoneEntrance_EventScript_22BD06 end @@ -59,11 +59,11 @@ Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 - goto_eq Route121_SafariZoneEntrance_EventScript_22BCEA + goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCEA call Route121_SafariZoneEntrance_EventScript_22BCBF checkmoney 0x1f4, 0 compare VAR_RESULT, 0 - goto_eq Route121_SafariZoneEntrance_EventScript_22BCF8 + goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCF8 playse SE_REGI msgbox Route121_SafariZoneEntrance_Text_2A501B, MSGBOX_DEFAULT takemoney 0x1f4, 0 @@ -78,7 +78,7 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 hidemoneybox nop nop - applymovement 255, Route121_SafariZoneEntrance_Movement_22BD18 + applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BD18 waitmovement 0 special EnterSafariMode setvar VAR_0x40A4, 2 @@ -90,10 +90,10 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 Route121_SafariZoneEntrance_EventScript_22BCBF:: @ 822BCBF getpartysize compare VAR_RESULT, 6 - goto_if 5, Route121_SafariZoneEntrance_EventScript_22BCE9 + goto_if_ne Route121_SafariZoneEntrance_EventScript_22BCE9 specialvar VAR_RESULT, ScriptCheckFreePokemonStorageSpace compare VAR_RESULT, 1 - goto_eq Route121_SafariZoneEntrance_EventScript_22BCE9 + goto_if_eq Route121_SafariZoneEntrance_EventScript_22BCE9 msgbox Route121_SafariZoneEntrance_Text_2A50E5, MSGBOX_DEFAULT goto Route121_SafariZoneEntrance_EventScript_22BD06 end @@ -116,7 +116,7 @@ Route121_SafariZoneEntrance_EventScript_22BD06:: @ 822BD06 hidemoneybox nop nop - applymovement 255, Route121_SafariZoneEntrance_Movement_22BD16 + applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BD16 waitmovement 0 releaseall end diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index f2484af83..d56a543da 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -9,16 +9,15 @@ Route123_MapScript1_1F614D: @ 81F614D Route123_EventScript_1F6151:: @ 81F6151 lock faceplayer - checkflag FLAG_0x0E8 - goto_eq Route123_EventScript_1F61A0 + goto_if_set FLAG_0x0E8, Route123_EventScript_1F61A0 msgbox Route123_Text_1F641E, MSGBOX_DEFAULT special IsGrassTypeInParty compare VAR_RESULT, 0 - goto_eq Route123_EventScript_1F619E + goto_if_eq Route123_EventScript_1F619E msgbox Route123_Text_1F645D, MSGBOX_DEFAULT giveitem_std ITEM_TM19 compare VAR_RESULT, 0 - goto_eq Route123_EventScript_272054 + goto_if_eq Route123_EventScript_272054 setflag FLAG_0x0E8 msgbox Route123_Text_1F64CF, MSGBOX_DEFAULT release @@ -64,7 +63,7 @@ Route123_EventScript_1F620A:: @ 81F620A trainerbattle_single TRAINER_CAMERON_1, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route123_EventScript_1F6255 + goto_if_eq Route123_EventScript_1F6255 msgbox Route123_Text_29FE2A, MSGBOX_DEFAULT release end @@ -86,7 +85,7 @@ Route123_EventScript_1F626C:: @ 81F626C trainerbattle_single TRAINER_JACKI_1, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route123_EventScript_1F62B7 + goto_if_eq Route123_EventScript_1F62B7 msgbox Route123_Text_29FFE5, MSGBOX_DEFAULT release end @@ -158,7 +157,7 @@ Route123_EventScript_1F63BC:: @ 81F63BC trainerbattle_single TRAINER_FERNANDO_1, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route123_EventScript_1F6407 + goto_if_eq Route123_EventScript_1F6407 msgbox Route123_Text_2A0389, MSGBOX_DEFAULT release end diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index 3ab35b195..a10bf7664 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -10,15 +10,14 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 lock faceplayer dodailyevents - checkflag FLAG_0x92D - goto_eq Route123_BerryMastersHouse_EventScript_26F8B6 + goto_if_set FLAG_0x92D, Route123_BerryMastersHouse_EventScript_26F8B6 msgbox Route123_BerryMastersHouse_Text_2A7386, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x92D msgbox Route123_BerryMastersHouse_Text_2A7428, MSGBOX_DEFAULT random 10 @@ -26,7 +25,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Route123_BerryMastersHouse_EventScript_272054 msgbox Route123_BerryMastersHouse_Text_2A7445, MSGBOX_DEFAULT release end @@ -40,17 +39,16 @@ Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0 lock faceplayer dodailyevents - checkflag FLAG_0x931 - goto_eq Route123_BerryMastersHouse_EventScript_26FA6F + goto_if_set FLAG_0x931, Route123_BerryMastersHouse_EventScript_26FA6F msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT setvar VAR_0x8004, 13 call Route123_BerryMastersHouse_EventScript_271E7C lock faceplayer compare VAR_RESULT, 1 - goto_eq Route123_BerryMastersHouse_EventScript_26F909 + goto_if_eq Route123_BerryMastersHouse_EventScript_26F909 compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_26F8F7 + goto_if_eq Route123_BerryMastersHouse_EventScript_26F8F7 end Route123_BerryMastersHouse_EventScript_26F8F7:: @ 826F8F7 @@ -61,17 +59,17 @@ Route123_BerryMastersHouse_EventScript_26F8F7:: @ 826F8F7 Route123_BerryMastersHouse_EventScript_26F909:: @ 826F909 compare VAR_0x8004, 0 - goto_eq Route123_BerryMastersHouse_EventScript_26F94C + goto_if_eq Route123_BerryMastersHouse_EventScript_26F94C compare VAR_0x8004, 1 - goto_eq Route123_BerryMastersHouse_EventScript_26F97A + goto_if_eq Route123_BerryMastersHouse_EventScript_26F97A compare VAR_0x8004, 2 - goto_eq Route123_BerryMastersHouse_EventScript_26F9AB + goto_if_eq Route123_BerryMastersHouse_EventScript_26F9AB compare VAR_0x8004, 3 - goto_eq Route123_BerryMastersHouse_EventScript_26F9DC + goto_if_eq Route123_BerryMastersHouse_EventScript_26F9DC compare VAR_0x8004, 4 - goto_eq Route123_BerryMastersHouse_EventScript_26FA0D + goto_if_eq Route123_BerryMastersHouse_EventScript_26FA0D compare VAR_0x8004, 5 - goto_eq Route123_BerryMastersHouse_EventScript_26FA3E + goto_if_eq Route123_BerryMastersHouse_EventScript_26FA3E end Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C @@ -80,62 +78,57 @@ Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Route123_BerryMastersHouse_EventScript_272054 goto Route123_BerryMastersHouse_EventScript_26FA79 release end Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A - checkflag FLAG_0x0F8 - goto_eq Route123_BerryMastersHouse_EventScript_26F94C + goto_if_set FLAG_0x0F8, Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_SPELON_BERRY compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x0F8 goto Route123_BerryMastersHouse_EventScript_26FA79 end Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB - checkflag FLAG_0x0F9 - goto_eq Route123_BerryMastersHouse_EventScript_26F94C + goto_if_set FLAG_0x0F9, Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_PAMTRE_BERRY compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x0F9 goto Route123_BerryMastersHouse_EventScript_26FA79 end Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC - checkflag FLAG_0x0FA - goto_eq Route123_BerryMastersHouse_EventScript_26F94C + goto_if_set FLAG_0x0FA, Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_WATMEL_BERRY compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x0FA goto Route123_BerryMastersHouse_EventScript_26FA79 end Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D - checkflag FLAG_0x0FB - goto_eq Route123_BerryMastersHouse_EventScript_26F94C + goto_if_set FLAG_0x0FB, Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_DURIN_BERRY compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x0FB goto Route123_BerryMastersHouse_EventScript_26FA79 end Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E - checkflag FLAG_0x0FC - goto_eq Route123_BerryMastersHouse_EventScript_26F94C + goto_if_set FLAG_0x0FC, Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_BELUE_BERRY compare VAR_RESULT, 0 - goto_eq Route123_BerryMastersHouse_EventScript_272054 + goto_if_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x0FC goto Route123_BerryMastersHouse_EventScript_26FA79 end diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index b7c40b034..97aa6f4be 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -3,8 +3,7 @@ Route124_MapScripts:: @ 81F656C .byte 0 Route124_MapScript1_1F6572: @ 81F6572 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route124_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Route124_EventScript_27207A end Route124_EventScript_1F657C:: @ 81F657C @@ -25,7 +24,7 @@ Route124_EventScript_1F65B3:: @ 81F65B3 trainerbattle_single TRAINER_JENNY_1, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route124_EventScript_1F65FE + goto_if_eq Route124_EventScript_1F65FE msgbox Route124_Text_2A0B9A, MSGBOX_DEFAULT release end @@ -57,7 +56,7 @@ Route124_EventScript_1F6643:: @ 81F6643 trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route124_EventScript_1F668C + goto_if_eq Route124_EventScript_1F668C msgbox Route124_Text_2A0F3A, MSGBOX_DEFAULT release end @@ -77,7 +76,7 @@ Route124_EventScript_1F66A7:: @ 81F66A7 trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route124_EventScript_1F66F0 + goto_if_eq Route124_EventScript_1F66F0 msgbox Route124_Text_2A103E, MSGBOX_DEFAULT release end diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc index 8ac5ccf43..4fa64e6b9 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc @@ -9,8 +9,7 @@ Route124_DivingTreasureHuntersHouse_MapScript1_270A2E: @ 8270A2E Route124_DivingTreasureHuntersHouse_EventScript_270A32:: @ 8270A32 lock faceplayer - checkflag FLAG_0x0D9 - goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270A4E + goto_if_set FLAG_0x0D9, Route124_DivingTreasureHuntersHouse_EventScript_270A4E msgbox Route124_DivingTreasureHuntersHouse_Text_270F6C, MSGBOX_DEFAULT setflag FLAG_0x0D9 goto Route124_DivingTreasureHuntersHouse_EventScript_270A5C @@ -24,7 +23,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270A4E:: @ 8270A4E Route124_DivingTreasureHuntersHouse_EventScript_270A5C:: @ 8270A5C call Route124_DivingTreasureHuntersHouse_EventScript_270A72 compare VAR_TEMP_1, 0 - goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F57 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F57 goto Route124_DivingTreasureHuntersHouse_EventScript_270AD0 end @@ -32,16 +31,16 @@ Route124_DivingTreasureHuntersHouse_EventScript_270A72:: @ 8270A72 setvar VAR_TEMP_1, 0 checkitem ITEM_RED_SHARD, 1 compare VAR_RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270AB8 + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270AB8 checkitem ITEM_YELLOW_SHARD, 1 compare VAR_RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270ABE + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270ABE checkitem ITEM_BLUE_SHARD, 1 compare VAR_RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270AC4 + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270AC4 checkitem ITEM_GREEN_SHARD, 1 compare VAR_RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270ACA + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270ACA return Route124_DivingTreasureHuntersHouse_EventScript_270AB8:: @ 8270AB8 @@ -248,13 +247,13 @@ Route124_DivingTreasureHuntersHouse_EventScript_270EC0:: @ 8270EC0 bufferitemname 1, VAR_0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_271132, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F4D + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F4D checkitemspace VAR_0x8009, 1 compare VAR_RESULT, 1 - goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F01 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F01 checkitem VAR_0x8008, 2 compare VAR_RESULT, 0 - goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F01 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F01 goto Route124_DivingTreasureHuntersHouse_EventScript_270F43 end @@ -264,10 +263,10 @@ Route124_DivingTreasureHuntersHouse_EventScript_270F01:: @ 8270F01 msgbox Route124_DivingTreasureHuntersHouse_Text_271158, MSGBOX_DEFAULT call Route124_DivingTreasureHuntersHouse_EventScript_270A72 compare VAR_TEMP_1, 0 - goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F61 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270F61 msgbox Route124_DivingTreasureHuntersHouse_Text_27117B, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270ADE + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_270ADE goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D end diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index 528eda704..e5ad32697 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -5,21 +5,20 @@ Route125_MapScripts:: @ 81F6748 .byte 0 Route125_MapScript1_1F6758: @ 81F6758 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route125_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Route125_EventScript_27207A compare VAR_0x4039, 1 - call_if 1, Route125_EventScript_273D13 + call_if_eq Route125_EventScript_273D13 compare VAR_0x4037, 11 - call_if 1, Route125_EventScript_273D17 + call_if_eq Route125_EventScript_273D17 compare VAR_0x4037, 12 - call_if 1, Route125_EventScript_273D17 + call_if_eq Route125_EventScript_273D17 end Route125_MapScript1_1F6783: @ 81F6783 compare VAR_0x4037, 11 - call_if 1, Route125_EventScript_273A85 + call_if_eq Route125_EventScript_273A85 compare VAR_0x4037, 12 - call_if 1, Route125_EventScript_273AF2 + call_if_eq Route125_EventScript_273AF2 end Route125_MapScript2_1F679A: @ 81F679A @@ -50,7 +49,7 @@ Route125_EventScript_1F6800:: @ 81F6800 trainerbattle_single TRAINER_ERNEST_1, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route125_EventScript_1F684B + goto_if_eq Route125_EventScript_1F684B msgbox Route125_Text_2A1755, MSGBOX_DEFAULT release end diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 0be11144a..4fa47e0bb 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -3,8 +3,7 @@ Route126_MapScripts:: @ 81F68C6 .byte 0 Route126_MapScript1_1F68CC: @ 81F68CC - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route126_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Route126_EventScript_27207A end Route126_EventScript_1F68D6:: @ 81F68D6 @@ -46,7 +45,7 @@ Route126_EventScript_1F6977:: @ 81F6977 trainerbattle_single TRAINER_PABLO_1, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route126_EventScript_1F69C2 + goto_if_eq Route126_EventScript_1F69C2 msgbox Route126_Text_2A1F10, MSGBOX_DEFAULT release end diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index f9c3290b9..28f20bfb3 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -5,21 +5,20 @@ Route127_MapScripts:: @ 81F69D9 .byte 0 Route127_MapScript1_1F69E9: @ 81F69E9 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route127_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Route127_EventScript_27207A compare VAR_0x4039, 1 - call_if 1, Route127_EventScript_273D13 + call_if_eq Route127_EventScript_273D13 compare VAR_0x4037, 13 - call_if 1, Route127_EventScript_273D17 + call_if_eq Route127_EventScript_273D17 compare VAR_0x4037, 14 - call_if 1, Route127_EventScript_273D17 + call_if_eq Route127_EventScript_273D17 end Route127_MapScript1_1F6A14: @ 81F6A14 compare VAR_0x4037, 13 - call_if 1, Route127_EventScript_273B5F + call_if_eq Route127_EventScript_273B5F compare VAR_0x4037, 14 - call_if 1, Route127_EventScript_273BCC + call_if_eq Route127_EventScript_273BCC end Route127_MapScript2_1F6A2B: @ 81F6A2B @@ -65,7 +64,7 @@ Route127_EventScript_1F6AD6:: @ 81F6AD6 trainerbattle_single TRAINER_KOJI_1, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route127_EventScript_1F6B21 + goto_if_eq Route127_EventScript_1F6B21 msgbox Route127_Text_2A26AC, MSGBOX_DEFAULT release end diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 2443051f5..bb4f8d150 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -4,8 +4,7 @@ Route128_MapScripts:: @ 81F6B38 .byte 0 Route128_MapScript1_1F6B43: @ 81F6B43 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route128_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Route128_EventScript_27207A end Route128_MapScript2_1F6B4D: @ 81F6B4D @@ -31,12 +30,12 @@ Route128_EventScript_1F6B57:: @ 81F6B57 closemessage applymovement 5, Route128_Movement_1F6CBB waitmovement 0 - applymovement 255, Route128_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A6 waitmovement 0 msgbox Route128_Text_1F6F1E, MSGBOX_DEFAULT closemessage applymovement 4, Route128_Movement_1F6C96 - applymovement 255, Route128_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A4 applymovement 5, Route128_Movement_1F6CA8 waitmovement 0 msgbox Route128_Text_1F704F, MSGBOX_DEFAULT @@ -54,12 +53,12 @@ Route128_EventScript_1F6B57:: @ 81F6B57 addobject 3 applymovement 3, Route128_Movement_1F6C87 waitmovement 0 - applymovement 255, Route128_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A8 waitmovement 0 msgbox Route128_Text_1F70C9, MSGBOX_DEFAULT closemessage applymovement 3, Route128_Movement_1F6C85 - applymovement 255, Route128_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A6 waitmovement 0 msgbox Route128_Text_1F70EA, MSGBOX_DEFAULT applymovement 3, Route128_Movement_2725AA @@ -179,7 +178,7 @@ Route128_EventScript_1F6CBE:: @ 81F6CBE trainerbattle_single TRAINER_ISAIAH_1, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route128_EventScript_1F6D09 + goto_if_eq Route128_EventScript_1F6D09 msgbox Route128_Text_2A28D7, MSGBOX_DEFAULT release end @@ -201,7 +200,7 @@ Route128_EventScript_1F6D20:: @ 81F6D20 trainerbattle_single TRAINER_KATELYN_1, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq Route128_EventScript_1F6D6B + goto_if_eq Route128_EventScript_1F6D6B msgbox Route128_Text_2A2AB7, MSGBOX_DEFAULT release end diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index b58e9ddd4..177dc626a 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -6,25 +6,24 @@ Route129_MapScripts:: @ 81F7284 Route129_MapScript1_1F7294: @ 81F7294 compare VAR_0x4037, 15 - call_if 1, Route129_EventScript_273C39 + call_if_eq Route129_EventScript_273C39 compare VAR_0x4037, 16 - call_if 1, Route129_EventScript_273CA6 + call_if_eq Route129_EventScript_273CA6 end Route129_MapScript1_1F72AB: @ 81F72AB compare VAR_0x4039, 1 - call_if 1, Route129_EventScript_273D13 + call_if_eq Route129_EventScript_273D13 compare VAR_0x405E, 4 - call_if 4, Route129_EventScript_1F72D8 + call_if_ge Route129_EventScript_1F72D8 compare VAR_0x4037, 15 - call_if 1, Route129_EventScript_273D17 + call_if_eq Route129_EventScript_273D17 compare VAR_0x4037, 16 - call_if 1, Route129_EventScript_273D17 + call_if_eq Route129_EventScript_273D17 end Route129_EventScript_1F72D8:: @ 81F72D8 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route129_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Route129_EventScript_27207A return Route129_MapScript2_1F72E2: @ 81F72E2 diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 6698837d2..5c7696eb7 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -4,10 +4,10 @@ Route130_MapScripts:: @ 81F735F Route130_MapScript1_1F7365: @ 81F7365 compare VAR_0x405E, 4 - call_if 4, Route130_EventScript_1F73B5 + call_if_ge Route130_EventScript_1F73B5 specialvar VAR_RESULT, IsMirageIslandPresent compare VAR_RESULT, 1 - goto_eq Route130_EventScript_1F73B1 + goto_if_eq Route130_EventScript_1F73B1 setflag FLAG_TEMP_11 setflag FLAG_TEMP_12 setflag FLAG_TEMP_13 @@ -31,8 +31,7 @@ Route130_EventScript_1F73B1:: @ 81F73B1 end Route130_EventScript_1F73B5:: @ 81F73B5 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route130_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Route130_EventScript_27207A return Route130_EventScript_1F73BF:: @ 81F73BF diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index 618d17fdb..da36f4001 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -4,7 +4,7 @@ Route131_MapScripts:: @ 81F7404 Route131_MapScript1_1F740A: @ 81F740A compare VAR_0x405E, 4 - call_if 4, Route131_EventScript_1F741F + call_if_ge Route131_EventScript_1F741F call Route131_EventScript_1F741B end @@ -13,8 +13,7 @@ Route131_EventScript_1F741B:: @ 81F741B return Route131_EventScript_1F741F:: @ 81F741F - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route131_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Route131_EventScript_27207A return Route131_EventScript_1F7429:: @ 81F7429 diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 147c51177..941f73161 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -7,15 +7,15 @@ RustboroCity_MapScript1_1E06C8: @ 81E06C8 setflag FLAG_VISITED_RUSTBORO_CITY call RustboroCity_EventScript_271ED7 compare VAR_0x405A, 6 - call_if 1, RustboroCity_EventScript_1E0707 + call_if_eq RustboroCity_EventScript_1E0707 getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_0x405A, 6 - goto_eq RustboroCity_EventScript_1E06EC + goto_if_eq RustboroCity_EventScript_1E06EC end RustboroCity_EventScript_1E06EC:: @ 81E06EC compare VAR_TEMP_0, 11 - goto_eq RustboroCity_EventScript_1E06FF + goto_if_eq RustboroCity_EventScript_1E06FF setobjectxyperm 15, 12, 15 end @@ -34,7 +34,7 @@ RustboroCity_MapScript2_1E070B: @ 81E070B RustboroCity_EventScript_1E0715:: @ 81E0715 lockall setvar VAR_0x4063, 1 - applymovement 255, RustboroCity_Movement_1E0850 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_1E0850 waitmovement 0 playse SE_KAIDAN delay 10 @@ -46,7 +46,7 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 waitmovement 0 applymovement 15, RustboroCity_Movement_27259A waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 applymovement 15, RustboroCity_Movement_1E084E waitmovement 0 @@ -134,8 +134,7 @@ RustboroCity_Movement_1E085D: @ 81E085D RustboroCity_EventScript_1E085F:: @ 81E085F lock faceplayer - checkflag FLAG_0x08E - goto_eq RustboroCity_EventScript_1E0874 + goto_if_set FLAG_0x08E, RustboroCity_EventScript_1E0874 msgbox RustboroCity_Text_1E123F, MSGBOX_DEFAULT release end @@ -159,8 +158,7 @@ RustboroCity_EventScript_1E088A:: @ 81E088A RustboroCity_EventScript_1E0893:: @ 81E0893 lock faceplayer - checkflag FLAG_BADGE01_GET - goto_eq RustboroCity_EventScript_1E08A8 + goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_1E08A8 msgbox RustboroCity_Text_1E130D, MSGBOX_DEFAULT release end @@ -173,8 +171,7 @@ RustboroCity_EventScript_1E08A8:: @ 81E08A8 RustboroCity_EventScript_1E08B2:: @ 81E08B2 lock faceplayer - checkflag FLAG_0x0BC - goto_eq RustboroCity_EventScript_1E08C7 + goto_if_set FLAG_0x0BC, RustboroCity_EventScript_1E08C7 msgbox RustboroCity_Text_1E1520, MSGBOX_DEFAULT release end @@ -347,7 +344,7 @@ RustboroCity_EventScript_1E0A6E:: @ 81E0A6E RustboroCity_EventScript_1E0A79:: @ 81E0A79 applymovement 9, RustboroCity_Movement_1E0AD5 waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 return @@ -451,8 +448,7 @@ RustboroCity_Movement_1E0AD5: @ 81E0AD5 RustboroCity_EventScript_1E0ADD:: @ 81E0ADD lock faceplayer - checkflag FLAG_0x08F - goto_eq RustboroCity_EventScript_1E0AF2 + goto_if_set FLAG_0x08F, RustboroCity_EventScript_1E0AF2 msgbox RustboroCity_Text_1E1904, MSGBOX_DEFAULT release end @@ -489,13 +485,13 @@ RustboroCity_EventScript_1E0B22:: @ 81E0B22 RustboroCity_EventScript_1E0B2E:: @ 81E0B2E compare VAR_TEMP_1, 0 - call_if 1, RustboroCity_EventScript_1E0B6F + call_if_eq RustboroCity_EventScript_1E0B6F compare VAR_TEMP_1, 1 - call_if 1, RustboroCity_EventScript_1E0B9B + call_if_eq RustboroCity_EventScript_1E0B9B compare VAR_TEMP_1, 2 - call_if 1, RustboroCity_EventScript_1E0BC7 + call_if_eq RustboroCity_EventScript_1E0BC7 compare VAR_TEMP_1, 3 - call_if 1, RustboroCity_EventScript_1E0BF3 + call_if_eq RustboroCity_EventScript_1E0BF3 setflag FLAG_0x09F setvar VAR_0x405A, 3 moveobjectoffscreen 9 @@ -511,7 +507,7 @@ RustboroCity_EventScript_1E0B6F:: @ 81E0B6F waitmovement 0 applymovement 9, RustboroCity_Movement_27259A waitmovement 0 - applymovement 255, RustboroCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AA waitmovement 0 return @@ -523,7 +519,7 @@ RustboroCity_EventScript_1E0B9B:: @ 81E0B9B waitmovement 0 applymovement 9, RustboroCity_Movement_27259A waitmovement 0 - applymovement 255, RustboroCity_Movement_2725AC + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AC waitmovement 0 return @@ -535,7 +531,7 @@ RustboroCity_EventScript_1E0BC7:: @ 81E0BC7 waitmovement 0 applymovement 9, RustboroCity_Movement_27259A waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 return @@ -549,7 +545,7 @@ RustboroCity_EventScript_1E0BF3:: @ 81E0BF3 waitmovement 0 applymovement 9, RustboroCity_Movement_1E0C29 waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 return @@ -583,19 +579,19 @@ RustboroCity_EventScript_1E0C4F:: @ 81E0C4F RustboroCity_EventScript_1E0C5B:: @ 81E0C5B compare VAR_TEMP_1, 0 - call_if 1, RustboroCity_EventScript_1E0CDC + call_if_eq RustboroCity_EventScript_1E0CDC compare VAR_TEMP_1, 1 - call_if 1, RustboroCity_EventScript_1E0D08 + call_if_eq RustboroCity_EventScript_1E0D08 compare VAR_TEMP_1, 2 - call_if 1, RustboroCity_EventScript_1E0D34 + call_if_eq RustboroCity_EventScript_1E0D34 compare VAR_TEMP_1, 3 - call_if 1, RustboroCity_EventScript_1E0D60 + call_if_eq RustboroCity_EventScript_1E0D60 compare VAR_TEMP_1, 4 - call_if 1, RustboroCity_EventScript_1E0D96 + call_if_eq RustboroCity_EventScript_1E0D96 msgbox RustboroCity_Text_1E194D, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL compare VAR_RESULT, 0 - call_if 1, RustboroCity_EventScript_1E0CD3 + call_if_eq RustboroCity_EventScript_1E0CD3 msgbox RustboroCity_Text_1E1A21, MSGBOX_DEFAULT closemessage setflag FLAG_0x090 @@ -619,7 +615,7 @@ RustboroCity_EventScript_1E0CDC:: @ 81E0CDC waitmovement 0 applymovement 9, RustboroCity_Movement_27259A waitmovement 0 - applymovement 255, RustboroCity_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AA waitmovement 0 return @@ -631,7 +627,7 @@ RustboroCity_EventScript_1E0D08:: @ 81E0D08 waitmovement 0 applymovement 9, RustboroCity_Movement_27259A waitmovement 0 - applymovement 255, RustboroCity_Movement_2725AE + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AE waitmovement 0 return @@ -643,7 +639,7 @@ RustboroCity_EventScript_1E0D34:: @ 81E0D34 waitmovement 0 applymovement 9, RustboroCity_Movement_27259A waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 return @@ -657,7 +653,7 @@ RustboroCity_EventScript_1E0D60:: @ 81E0D60 waitmovement 0 applymovement 9, RustboroCity_Movement_1E0C29 waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 return @@ -673,8 +669,7 @@ RustboroCity_EventScript_1E0D96:: @ 81E0D96 RustboroCity_EventScript_1E0DB8:: @ 81E0DB8 lockall - checkflag FLAG_0x120 - call_if 0, RustboroCity_EventScript_1E0DD1 + call_if_unset FLAG_0x120, RustboroCity_EventScript_1E0DD1 applymovement 14, RustboroCity_Movement_27259E waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -683,9 +678,9 @@ Route104_EventScript_1E0DD1:: @ 81E0DD1 RustboroCity_EventScript_1E0DD1:: @ 81E0DD1 checkplayergender compare VAR_RESULT, 0 - goto_eq RustboroCity_EventScript_1E0DE9 + goto_if_eq RustboroCity_EventScript_1E0DE9 compare VAR_RESULT, 1 - goto_eq RustboroCity_EventScript_1E0DEE + goto_if_eq RustboroCity_EventScript_1E0DEE return RustboroCity_EventScript_1E0DE9:: @ 81E0DE9 @@ -708,7 +703,7 @@ RustboroCity_EventScript_1E0DF3:: @ 81E0DF3 waitmovement 0 applymovement 14, RustboroCity_Movement_1E120E waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -724,7 +719,7 @@ RustboroCity_EventScript_1E0E33:: @ 81E0E33 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1215 waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -740,7 +735,7 @@ RustboroCity_EventScript_1E0E73:: @ 81E0E73 waitmovement 0 applymovement 14, RustboroCity_Movement_1E121B waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -756,7 +751,7 @@ RustboroCity_EventScript_1E0EB3:: @ 81E0EB3 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1220 waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -772,7 +767,7 @@ RustboroCity_EventScript_1E0EF3:: @ 81E0EF3 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1224 waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -788,7 +783,7 @@ RustboroCity_EventScript_1E0F33:: @ 81E0F33 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1227 waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -804,7 +799,7 @@ RustboroCity_EventScript_1E0F73:: @ 81E0F73 waitmovement 0 applymovement 14, RustboroCity_Movement_1E122B waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -820,23 +815,21 @@ RustboroCity_EventScript_1E0FB3:: @ 81E0FB3 waitmovement 0 applymovement 14, RustboroCity_Movement_1E1230 waitmovement 0 - applymovement 255, RustboroCity_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725A6 waitmovement 0 goto RustboroCity_EventScript_1E0FF3 RustboroCity_EventScript_1E0FF3:: @ 81E0FF3 checkplayergender compare VAR_RESULT, 0 - goto_eq RustboroCity_EventScript_1E100B + goto_if_eq RustboroCity_EventScript_1E100B compare VAR_RESULT, 1 - goto_eq RustboroCity_EventScript_1E1114 + goto_if_eq RustboroCity_EventScript_1E1114 end RustboroCity_EventScript_1E100B:: @ 81E100B - checkflag FLAG_0x0D3 - goto_eq RustboroCity_EventScript_1E10C1 - checkflag FLAG_0x120 - goto_eq RustboroCity_EventScript_1E1070 + goto_if_set FLAG_0x0D3, RustboroCity_EventScript_1E10C1 + goto_if_set FLAG_0x120, RustboroCity_EventScript_1E1070 setflag FLAG_0x120 msgbox RustboroCity_Text_1E1A49, MSGBOX_DEFAULT closemessage @@ -852,7 +845,7 @@ RustboroCity_EventScript_1E100B:: @ 81E100B setvar VAR_0x8008, 0 msgbox RustboroCity_Text_1E1AFA, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq RustboroCity_EventScript_1E1092 + goto_if_eq RustboroCity_EventScript_1E1092 msgbox RustboroCity_Text_1E1BD3, MSGBOX_DEFAULT call RustboroCity_EventScript_1E10D6 releaseall @@ -862,7 +855,7 @@ RustboroCity_EventScript_1E1070:: @ 81E1070 setvar VAR_0x8008, 1 msgbox RustboroCity_Text_1E1C48, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq RustboroCity_EventScript_1E1092 + goto_if_eq RustboroCity_EventScript_1E1092 msgbox RustboroCity_Text_1E1BD3, MSGBOX_DEFAULT releaseall end @@ -878,7 +871,7 @@ RustboroCity_EventScript_1E1092:: @ 81E1092 RustboroCity_EventScript_1E10C1:: @ 81E10C1 msgbox RustboroCity_Text_1E1CE7, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if 1, RustboroCity_EventScript_1E10D6 + call_if_eq RustboroCity_EventScript_1E10D6 releaseall end @@ -906,10 +899,8 @@ RustboroCity_EventScript_1E1101:: @ 81E1101 end RustboroCity_EventScript_1E1114:: @ 81E1114 - checkflag FLAG_0x0D3 - goto_eq RustboroCity_EventScript_1E11C0 - checkflag FLAG_0x120 - goto_eq RustboroCity_EventScript_1E1174 + goto_if_set FLAG_0x0D3, RustboroCity_EventScript_1E11C0 + goto_if_set FLAG_0x120, RustboroCity_EventScript_1E1174 setflag FLAG_0x120 msgbox RustboroCity_Text_1E1D7D, MSGBOX_DEFAULT closemessage @@ -924,7 +915,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114 setvar VAR_0x4063, 2 msgbox RustboroCity_Text_1E1E34, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq RustboroCity_EventScript_1E1191 + goto_if_eq RustboroCity_EventScript_1E1191 msgbox RustboroCity_Text_1E1F2F, MSGBOX_DEFAULT call RustboroCity_EventScript_1E10D6 releaseall @@ -933,7 +924,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114 RustboroCity_EventScript_1E1174:: @ 81E1174 msgbox RustboroCity_Text_1E1F76, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq RustboroCity_EventScript_1E1191 + goto_if_eq RustboroCity_EventScript_1E1191 msgbox RustboroCity_Text_1E1F2F, MSGBOX_DEFAULT releaseall end @@ -949,7 +940,7 @@ RustboroCity_EventScript_1E1191:: @ 81E1191 RustboroCity_EventScript_1E11C0:: @ 81E11C0 msgbox RustboroCity_Text_1E2002, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if 1, RustboroCity_EventScript_1E10D6 + call_if_eq RustboroCity_EventScript_1E10D6 releaseall end diff --git a/data/maps/RustboroCity_CuttersHouse/scripts.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc index 1ed908952..b73744094 100644 --- a/data/maps/RustboroCity_CuttersHouse/scripts.inc +++ b/data/maps/RustboroCity_CuttersHouse/scripts.inc @@ -4,8 +4,7 @@ RustboroCity_CuttersHouse_MapScripts:: @ 8215BD3 RustboroCity_CuttersHouse_EventScript_215BD4:: @ 8215BD4 lock faceplayer - checkflag FLAG_0x089 - goto_eq RustboroCity_CuttersHouse_EventScript_215C00 + goto_if_set FLAG_0x089, RustboroCity_CuttersHouse_EventScript_215C00 msgbox RustboroCity_CuttersHouse_Text_215C13, MSGBOX_DEFAULT giveitem_std ITEM_HM01 setflag FLAG_0x089 diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc index e8314ba04..bbfd1bd53 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc @@ -3,8 +3,7 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8211245 .byte 0 RustboroCity_DevonCorp_1F_MapScript1_21124B: @ 821124B - checkflag FLAG_0x090 - call_if 0, RustboroCity_DevonCorp_1F_EventScript_211255 + call_if_unset FLAG_0x090, RustboroCity_DevonCorp_1F_EventScript_211255 end RustboroCity_DevonCorp_1F_EventScript_211255:: @ 8211255 @@ -15,10 +14,8 @@ RustboroCity_DevonCorp_1F_EventScript_211255:: @ 8211255 RustboroCity_DevonCorp_1F_EventScript_211261:: @ 8211261 lock faceplayer - checkflag FLAG_0x090 - goto_eq RustboroCity_DevonCorp_1F_EventScript_211289 - checkflag FLAG_0x08E - goto_eq RustboroCity_DevonCorp_1F_EventScript_21127F + goto_if_set FLAG_0x090, RustboroCity_DevonCorp_1F_EventScript_211289 + goto_if_set FLAG_0x08E, RustboroCity_DevonCorp_1F_EventScript_21127F msgbox RustboroCity_DevonCorp_1F_Text_2113D1, MSGBOX_DEFAULT release end @@ -36,12 +33,9 @@ RustboroCity_DevonCorp_1F_EventScript_211289:: @ 8211289 RustboroCity_DevonCorp_1F_EventScript_211293:: @ 8211293 lock faceplayer - checkflag FLAG_0x090 - goto_eq RustboroCity_DevonCorp_1F_EventScript_2112BA - checkflag FLAG_0x08F - goto_eq RustboroCity_DevonCorp_1F_EventScript_2112C4 - checkflag FLAG_0x08E - goto_eq RustboroCity_DevonCorp_1F_EventScript_2112C4 + goto_if_set FLAG_0x090, RustboroCity_DevonCorp_1F_EventScript_2112BA + goto_if_set FLAG_0x08F, RustboroCity_DevonCorp_1F_EventScript_2112C4 + goto_if_set FLAG_0x08E, RustboroCity_DevonCorp_1F_EventScript_2112C4 msgbox RustboroCity_DevonCorp_1F_Text_21151B, MSGBOX_DEFAULT release end @@ -59,12 +53,9 @@ RustboroCity_DevonCorp_1F_EventScript_2112C4:: @ 82112C4 RustboroCity_DevonCorp_1F_EventScript_2112CE:: @ 82112CE lock faceplayer - checkflag FLAG_0x090 - goto_eq RustboroCity_DevonCorp_1F_EventScript_2112F5 - checkflag FLAG_0x08F - goto_eq RustboroCity_DevonCorp_1F_EventScript_2112FF - checkflag FLAG_0x08E - goto_eq RustboroCity_DevonCorp_1F_EventScript_2112FF + goto_if_set FLAG_0x090, RustboroCity_DevonCorp_1F_EventScript_2112F5 + goto_if_set FLAG_0x08F, RustboroCity_DevonCorp_1F_EventScript_2112FF + goto_if_set FLAG_0x08E, RustboroCity_DevonCorp_1F_EventScript_2112FF msgbox RustboroCity_DevonCorp_1F_Text_21131B, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index fc8dd5f79..8ce86352d 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -4,7 +4,7 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 8211857 RustboroCity_DevonCorp_2F_MapScript1_21185D: @ 821185D compare VAR_0x40C4, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 end RustboroCity_DevonCorp_2F_EventScript_211869:: @ 8211869 @@ -15,7 +15,7 @@ RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F lock faceplayer compare VAR_0x40C4, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 msgbox RustboroCity_DevonCorp_2F_Text_211BFB, MSGBOX_DEFAULT release end @@ -24,9 +24,8 @@ RustboroCity_DevonCorp_2F_EventScript_211886:: @ 8211886 lock faceplayer compare VAR_0x40C4, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 - checkflag FLAG_0x11F - goto_eq RustboroCity_DevonCorp_2F_EventScript_2118A6 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 + goto_if_set FLAG_0x11F, RustboroCity_DevonCorp_2F_EventScript_2118A6 msgbox RustboroCity_DevonCorp_2F_Text_211C50, MSGBOX_DEFAULT release end @@ -40,9 +39,8 @@ RustboroCity_DevonCorp_2F_EventScript_2118B0:: @ 82118B0 lock faceplayer compare VAR_0x40C4, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 - checkflag FLAG_0x0BC - goto_eq RustboroCity_DevonCorp_2F_EventScript_2118D0 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 + goto_if_set FLAG_0x0BC, RustboroCity_DevonCorp_2F_EventScript_2118D0 msgbox RustboroCity_DevonCorp_2F_Text_211D9F, MSGBOX_DEFAULT release end @@ -56,7 +54,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA lock faceplayer compare VAR_0x40C4, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 msgbox RustboroCity_DevonCorp_2F_Text_211EE0, MSGBOX_DEFAULT release end @@ -65,16 +63,16 @@ RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1 lock faceplayer compare VAR_0x40C4, 2 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211A03 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A03 compare VAR_0x40C4, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_2119F9 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119F9 msgbox RustboroCity_DevonCorp_2F_Text_211F48, MSGBOX_DEFAULT checkitem ITEM_ROOT_FOSSIL, 1 compare VAR_RESULT, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211933 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211933 checkitem ITEM_CLAW_FOSSIL, 1 compare VAR_RESULT, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211991 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211991 release end @@ -87,10 +85,10 @@ RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_2119EF + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119EF checkitem ITEM_CLAW_FOSSIL, 1 compare VAR_RESULT, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211B84 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B84 goto RustboroCity_DevonCorp_2F_EventScript_211974 end @@ -112,10 +110,10 @@ RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_2119EF + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119EF checkitem ITEM_ROOT_FOSSIL, 1 compare VAR_RESULT, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211B84 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B84 goto RustboroCity_DevonCorp_2F_EventScript_2119D2 end @@ -140,9 +138,9 @@ RustboroCity_DevonCorp_2F_EventScript_2119F9:: @ 82119F9 RustboroCity_DevonCorp_2F_EventScript_211A03:: @ 8211A03 compare VAR_0x40C5, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211A1A + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A1A compare VAR_0x40C5, 2 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211A2C + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A2C end RustboroCity_DevonCorp_2F_EventScript_211A1A:: @ 8211A1A @@ -161,9 +159,9 @@ RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E setvar VAR_TEMP_1, 388 givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211A6E + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A6E compare VAR_RESULT, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211A96 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A96 goto RustboroCity_DevonCorp_2F_EventScript_273811 end @@ -171,7 +169,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E call RustboroCity_DevonCorp_2F_EventScript_211AC4 msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211AD7 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AD7 call RustboroCity_DevonCorp_2F_EventScript_27378B call RustboroCity_DevonCorp_2F_EventScript_2723DD goto RustboroCity_DevonCorp_2F_EventScript_211AD7 @@ -181,7 +179,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96 call RustboroCity_DevonCorp_2F_EventScript_211AC4 msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211AB9 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AB9 call RustboroCity_DevonCorp_2F_EventScript_273797 goto RustboroCity_DevonCorp_2F_EventScript_211AB9 end @@ -210,9 +208,9 @@ RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1 setvar VAR_TEMP_1, 390 givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211B11 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B11 compare VAR_RESULT, 1 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211B39 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B39 goto RustboroCity_DevonCorp_2F_EventScript_273811 end @@ -220,7 +218,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11 call RustboroCity_DevonCorp_2F_EventScript_211B67 msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211B7A + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B7A call RustboroCity_DevonCorp_2F_EventScript_27378B call RustboroCity_DevonCorp_2F_EventScript_2723DD goto RustboroCity_DevonCorp_2F_EventScript_211B7A @@ -230,7 +228,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39 call RustboroCity_DevonCorp_2F_EventScript_211B67 msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_2F_EventScript_211B5C + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B5C call RustboroCity_DevonCorp_2F_EventScript_273797 goto RustboroCity_DevonCorp_2F_EventScript_211B5C end @@ -282,9 +280,9 @@ RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF lock faceplayer compare VAR_0x40C4, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 compare VAR_0x405A, 6 - goto_if 4, RustboroCity_DevonCorp_2F_EventScript_211BF1 + goto_if_ge RustboroCity_DevonCorp_2F_EventScript_211BF1 msgbox RustboroCity_DevonCorp_2F_Text_212338, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index dc170677a..0e21b4c38 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -6,7 +6,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 821242D RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D compare VAR_0x408F, 0 - call_if 1, RustboroCity_DevonCorp_3F_EventScript_212449 + call_if_eq RustboroCity_DevonCorp_3F_EventScript_212449 end RustboroCity_DevonCorp_3F_EventScript_212449:: @ 8212449 @@ -19,7 +19,7 @@ RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455 .2byte 0 RustboroCity_DevonCorp_3F_EventScript_21245F:: @ 821245F - turnobject 255, 4 + turnobject EVENT_OBJ_ID_PLAYER, 4 end RustboroCity_DevonCorp_3F_MapScript2_212464: @ 8212464 @@ -39,13 +39,13 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E closemessage playbgm MUS_TSURETEK, 0 applymovement 2, RustboroCity_DevonCorp_3F_Movement_212534 - applymovement 255, RustboroCity_DevonCorp_3F_Movement_212558 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_212558 waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_212E2F, MSGBOX_DEFAULT closemessage fadedefaultbgm applymovement 2, RustboroCity_DevonCorp_3F_Movement_212543 - applymovement 255, RustboroCity_DevonCorp_3F_Movement_212566 + applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_212566 waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_212609, MSGBOX_DEFAULT giveitem_std ITEM_LETTER @@ -150,10 +150,8 @@ RustboroCity_DevonCorp_3F_Movement_212566: @ 8212566 RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C lock faceplayer - checkflag FLAG_0x110 - goto_eq RustboroCity_DevonCorp_3F_EventScript_2125CC - checkflag FLAG_0x0BD - goto_eq RustboroCity_DevonCorp_3F_EventScript_212595 + goto_if_set FLAG_0x110, RustboroCity_DevonCorp_3F_EventScript_2125CC + goto_if_set FLAG_0x0BD, RustboroCity_DevonCorp_3F_EventScript_212595 msgbox RustboroCity_DevonCorp_3F_Text_212A09, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 @@ -165,7 +163,7 @@ RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 msgbox RustboroCity_DevonCorp_3F_Text_212A29, MSGBOX_DEFAULT giveitem_std ITEM_EXP_SHARE compare VAR_RESULT, 0 - goto_eq RustboroCity_DevonCorp_3F_EventScript_272054 + goto_if_eq RustboroCity_DevonCorp_3F_EventScript_272054 setflag FLAG_0x110 msgbox RustboroCity_DevonCorp_3F_Text_212A9E, MSGBOX_DEFAULT closemessage @@ -185,8 +183,7 @@ RustboroCity_DevonCorp_3F_EventScript_2125CC:: @ 82125CC RustboroCity_DevonCorp_3F_EventScript_2125E1:: @ 82125E1 lock faceplayer - checkflag FLAG_0x100 - goto_eq RustboroCity_DevonCorp_3F_EventScript_2125F6 + goto_if_set FLAG_0x100, RustboroCity_DevonCorp_3F_EventScript_2125F6 msgbox RustboroCity_DevonCorp_3F_Text_212E41, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc index ae0bfcd8e..7798e72e6 100644 --- a/data/maps/RustboroCity_Flat1_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc @@ -6,35 +6,35 @@ RustboroCity_Flat1_2F_EventScript_21513A:: @ 821513A faceplayer specialvar VAR_RESULT, TryBufferWaldaPhrase compare VAR_RESULT, 0 - goto_eq RustboroCity_Flat1_2F_EventScript_21518D + goto_if_eq RustboroCity_Flat1_2F_EventScript_21518D compare VAR_RESULT, 1 - goto_eq RustboroCity_Flat1_2F_EventScript_2151AD + goto_if_eq RustboroCity_Flat1_2F_EventScript_2151AD RustboroCity_Flat1_2F_EventScript_215157:: @ 8215157 special DoWaldaNamingScreen waitstate compare VAR_0x8004, 1 - goto_eq RustboroCity_Flat1_2F_EventScript_2151D7 + goto_if_eq RustboroCity_Flat1_2F_EventScript_2151D7 compare VAR_0x8004, 2 - goto_eq RustboroCity_Flat1_2F_EventScript_2151E1 + goto_if_eq RustboroCity_Flat1_2F_EventScript_2151E1 specialvar VAR_RESULT, TryGetWallpaperWithWaldaPhrase compare VAR_RESULT, 1 - goto_eq RustboroCity_Flat1_2F_EventScript_2151F8 + goto_if_eq RustboroCity_Flat1_2F_EventScript_2151F8 compare VAR_RESULT, 0 - goto_eq RustboroCity_Flat1_2F_EventScript_215221 + goto_if_eq RustboroCity_Flat1_2F_EventScript_215221 end RustboroCity_Flat1_2F_EventScript_21518D:: @ 821518D msgbox RustboroCity_Flat1_2F_Text_2152FA, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq RustboroCity_Flat1_2F_EventScript_2151CD + goto_if_eq RustboroCity_Flat1_2F_EventScript_2151CD msgbox RustboroCity_Flat1_2F_Text_2154AD, MSGBOX_DEFAULT goto RustboroCity_Flat1_2F_EventScript_215157 RustboroCity_Flat1_2F_EventScript_2151AD:: @ 82151AD msgbox RustboroCity_Flat1_2F_Text_215448, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq RustboroCity_Flat1_2F_EventScript_2151CD + goto_if_eq RustboroCity_Flat1_2F_EventScript_2151CD msgbox RustboroCity_Flat1_2F_Text_2154AD, MSGBOX_DEFAULT goto RustboroCity_Flat1_2F_EventScript_215157 diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc index d07babf0c..e08d599ac 100644 --- a/data/maps/RustboroCity_Flat2_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc @@ -8,12 +8,11 @@ RustboroCity_Flat2_2F_EventScript_215FD8:: @ 8215FD8 RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 lock faceplayer - checkflag FLAG_0x0D5 - goto_eq RustboroCity_Flat2_2F_EventScript_216010 + goto_if_set FLAG_0x0D5, RustboroCity_Flat2_2F_EventScript_216010 msgbox RustboroCity_Flat2_2F_Text_21605A, MSGBOX_DEFAULT giveitem_std ITEM_PREMIER_BALL compare VAR_RESULT, 0 - goto_eq RustboroCity_Flat2_2F_EventScript_272054 + goto_if_eq RustboroCity_Flat2_2F_EventScript_272054 setflag FLAG_0x0D5 release end diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 6f161d048..170ae4324 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -5,9 +5,8 @@ RustboroCity_Gym_EventScript_212F31:: @ 8212F31 trainerbattle_single TRAINER_ROXANNE_1, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq RustboroCity_Gym_EventScript_212FC8 - checkflag FLAG_0x0A5 - goto_if 0, RustboroCity_Gym_EventScript_212FA4 + goto_if_eq RustboroCity_Gym_EventScript_212FC8 + goto_if_unset FLAG_0x0A5, RustboroCity_Gym_EventScript_212FA4 msgbox RustboroCity_Gym_Text_2139A7, MSGBOX_DEFAULT release end @@ -24,14 +23,14 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66 setvar VAR_0x8008, 1 call RustboroCity_Gym_EventScript_271F43 compare VAR_0x4085, 6 - call_if 1, RustboroCity_Gym_EventScript_271E84 + call_if_eq RustboroCity_Gym_EventScript_271E84 goto RustboroCity_Gym_EventScript_212FA4 end RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4 giveitem_std ITEM_TM39 compare VAR_RESULT, 0 - goto_eq RustboroCity_Gym_EventScript_272054 + goto_if_eq RustboroCity_Gym_EventScript_272054 setflag FLAG_0x0A5 msgbox RustboroCity_Gym_Text_2138B1, MSGBOX_DEFAULT release @@ -60,8 +59,7 @@ RustboroCity_Gym_EventScript_213011:: @ 8213011 RustboroCity_Gym_EventScript_213028:: @ 8213028 lock faceplayer - checkflag FLAG_0x4F0 - goto_eq RustboroCity_Gym_EventScript_21303D + goto_if_set FLAG_0x4F0, RustboroCity_Gym_EventScript_21303D msgbox RustboroCity_Gym_Text_21309D, MSGBOX_DEFAULT release end @@ -73,15 +71,13 @@ RustboroCity_Gym_EventScript_21303D:: @ 821303D RustboroCity_Gym_EventScript_213047:: @ 8213047 lockall - checkflag FLAG_BADGE01_GET - goto_eq RustboroCity_Gym_EventScript_213067 + goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_213067 goto RustboroCity_Gym_EventScript_213071 end RustboroCity_Gym_EventScript_213057:: @ 8213057 lockall - checkflag FLAG_BADGE01_GET - goto_eq RustboroCity_Gym_EventScript_213067 + goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_213067 goto RustboroCity_Gym_EventScript_213071 end diff --git a/data/maps/RustboroCity_House1/scripts.inc b/data/maps/RustboroCity_House1/scripts.inc index 8bc43c0c2..26a406675 100644 --- a/data/maps/RustboroCity_House1/scripts.inc +++ b/data/maps/RustboroCity_House1/scripts.inc @@ -4,25 +4,24 @@ RustboroCity_House1_MapScripts:: @ 821593E RustboroCity_House1_EventScript_21593F:: @ 821593F lock faceplayer - checkflag FLAG_0x099 - goto_eq RustboroCity_House1_EventScript_2159D5 + goto_if_set FLAG_0x099, RustboroCity_House1_EventScript_2159D5 setvar VAR_0x8008, 0 copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT msgbox RustboroCity_House1_Text_2159E8, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq RustboroCity_House1_EventScript_2159BD + goto_if_eq RustboroCity_House1_EventScript_2159BD special sub_81B94B0 waitstate copyvar VAR_0x800A, VAR_0x8004 compare VAR_0x8004, 255 - goto_eq RustboroCity_House1_EventScript_2159BD + goto_if_eq RustboroCity_House1_EventScript_2159BD copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, sub_807E9D4 copyvar VAR_0x800B, VAR_RESULT compare VAR_RESULT, VAR_0x8009 - goto_if 5, RustboroCity_House1_EventScript_2159C7 + goto_if_ne RustboroCity_House1_EventScript_2159C7 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special sub_807EA10 diff --git a/data/maps/RustboroCity_Mart/scripts.inc b/data/maps/RustboroCity_Mart/scripts.inc index 17406b0ac..78492e962 100644 --- a/data/maps/RustboroCity_Mart/scripts.inc +++ b/data/maps/RustboroCity_Mart/scripts.inc @@ -6,10 +6,8 @@ RustboroCity_Mart_EventScript_214F06:: @ 8214F06 faceplayer message gUnknown_08272A21 waitmessage - checkflag FLAG_0x11F - goto_if 0, RustboroCity_Mart_EventScript_214F21 - checkflag FLAG_0x11F - goto_eq RustboroCity_Mart_EventScript_214F48 + goto_if_unset FLAG_0x11F, RustboroCity_Mart_EventScript_214F21 + goto_if_set FLAG_0x11F, RustboroCity_Mart_EventScript_214F48 end RustboroCity_Mart_EventScript_214F21:: @ 8214F21 diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index 330afd30c..2bba066b2 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -77,16 +77,15 @@ RustboroCity_PokemonSchool_EventScript_213F8C:: @ 8213F8C RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 lock faceplayer - checkflag FLAG_0x113 - goto_eq RustboroCity_PokemonSchool_EventScript_213FFB + goto_if_set FLAG_0x113, RustboroCity_PokemonSchool_EventScript_213FFB compare VAR_FACING, 4 - call_if 1, RustboroCity_PokemonSchool_EventScript_213FE5 + call_if_eq RustboroCity_PokemonSchool_EventScript_213FE5 compare VAR_FACING, 3 - call_if 1, RustboroCity_PokemonSchool_EventScript_213FF0 + call_if_eq RustboroCity_PokemonSchool_EventScript_213FF0 msgbox RustboroCity_PokemonSchool_Text_214433, MSGBOX_DEFAULT giveitem_std ITEM_QUICK_CLAW compare VAR_RESULT, 0 - goto_eq RustboroCity_PokemonSchool_EventScript_272054 + goto_if_eq RustboroCity_PokemonSchool_EventScript_272054 closemessage applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA waitmovement 0 @@ -167,12 +166,9 @@ RustboroCity_PokemonSchool_Movement_214027: @ 8214027 RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040 lock faceplayer - checkflag FLAG_0x1CB - goto_eq RustboroCity_PokemonSchool_EventScript_2140A8 - checkflag FLAG_0x136 - goto_eq RustboroCity_PokemonSchool_EventScript_21406F - checkflag FLAG_BADGE01_GET - goto_eq RustboroCity_PokemonSchool_EventScript_214082 + goto_if_set FLAG_0x1CB, RustboroCity_PokemonSchool_EventScript_2140A8 + goto_if_set FLAG_0x136, RustboroCity_PokemonSchool_EventScript_21406F + goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_214082 msgbox RustboroCity_PokemonSchool_Text_2148C0, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 setflag FLAG_0x136 @@ -180,8 +176,7 @@ RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040 end RustboroCity_PokemonSchool_EventScript_21406F:: @ 821406F - checkflag FLAG_BADGE01_GET - goto_eq RustboroCity_PokemonSchool_EventScript_214090 + goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_214090 msgbox RustboroCity_PokemonSchool_Text_214A5F, MSGBOX_DEFAULT release end diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 1eaaba66c..8985f5b43 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -10,7 +10,7 @@ RusturfTunnel_MapScript2_22CE32: @ 822CE32 RusturfTunnel_MapScript1_22CE44: @ 822CE44 compare VAR_RUSTURF_TUNNEL_STATE, 2 - call_if 1, RusturfTunnel_EventScript_22CE50 + call_if_eq RusturfTunnel_EventScript_22CE50 end RusturfTunnel_EventScript_22CE50:: @ 822CE50 @@ -31,8 +31,7 @@ RusturfTunnel_EventScript_22CE5F:: @ 822CE5F RusturfTunnel_EventScript_22CE76:: @ 822CE76 lock faceplayer - checkflag FLAG_TEMP_1 - goto_eq RusturfTunnel_EventScript_22CE99 + goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_22CE99 setflag FLAG_TEMP_1 msgbox RusturfTunnel_Text_22D510, MSGBOX_DEFAULT closemessage @@ -52,47 +51,47 @@ RusturfTunnel_EventScript_22CE99:: @ 822CE99 RusturfTunnel_EventScript_22CEAE:: @ 822CEAE lockall compare VAR_TEMP_1, 1 - call_if 1, RusturfTunnel_EventScript_22CFA7 + call_if_eq RusturfTunnel_EventScript_22CFA7 compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_22CFBC + call_if_eq RusturfTunnel_EventScript_22CFBC compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_22CFC7 + call_if_eq RusturfTunnel_EventScript_22CFC7 call RusturfTunnel_EventScript_22CFFF msgbox RusturfTunnel_Text_22D65C, MSGBOX_DEFAULT compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_22CFC8 + call_if_eq RusturfTunnel_EventScript_22CFC8 compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_22CFC8 + call_if_eq RusturfTunnel_EventScript_22CFC8 giveitem_std ITEM_HM04 setflag FLAG_0x06A msgbox RusturfTunnel_Text_22D6D2, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 - call_if 1, RusturfTunnel_EventScript_22CF5D + call_if_eq RusturfTunnel_EventScript_22CF5D compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_22CF6F + call_if_eq RusturfTunnel_EventScript_22CF6F compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_22CF8B + call_if_eq RusturfTunnel_EventScript_22CF8B msgbox RusturfTunnel_Text_22D745, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 - call_if 1, RusturfTunnel_EventScript_22CFD4 + call_if_eq RusturfTunnel_EventScript_22CFD4 compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_22CFE6 + call_if_eq RusturfTunnel_EventScript_22CFE6 compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_22CFE6 + call_if_eq RusturfTunnel_EventScript_22CFE6 call RusturfTunnel_EventScript_272216 releaseall end RusturfTunnel_EventScript_22CF5D:: @ 822CF5D - applymovement 255, RusturfTunnel_Movement_22D042 + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D042 applymovement 1, RusturfTunnel_Movement_22D067 waitmovement 0 return RusturfTunnel_EventScript_22CF6F:: @ 822CF6F - applymovement 255, RusturfTunnel_Movement_22D045 + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045 applymovement 1, RusturfTunnel_Movement_22D06C waitmovement 0 applymovement 10, RusturfTunnel_Movement_2725AA @@ -100,7 +99,7 @@ RusturfTunnel_EventScript_22CF6F:: @ 822CF6F return RusturfTunnel_EventScript_22CF8B:: @ 822CF8B - applymovement 255, RusturfTunnel_Movement_22D045 + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045 applymovement 1, RusturfTunnel_Movement_22D06C waitmovement 0 applymovement 10, RusturfTunnel_Movement_2725AA @@ -110,7 +109,7 @@ RusturfTunnel_EventScript_22CF8B:: @ 822CF8B RusturfTunnel_EventScript_22CFA7:: @ 822CFA7 applymovement 1, RusturfTunnel_Movement_2725A6 waitmovement 0 - applymovement 255, RusturfTunnel_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_2725AA waitmovement 0 return @@ -135,7 +134,7 @@ RusturfTunnel_EventScript_22CFD4:: @ 822CFD4 return RusturfTunnel_EventScript_22CFE6:: @ 822CFE6 - applymovement 255, RusturfTunnel_Movement_22D02F + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D02F applymovement 10, RusturfTunnel_Movement_22D023 applymovement 1, RusturfTunnel_Movement_22D058 waitmovement 0 @@ -317,7 +316,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 msgbox RusturfTunnel_Text_22D2E1, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_GOODS closemessage - applymovement 255, RusturfTunnel_Movement_22D178 + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D178 applymovement 6, RusturfTunnel_Movement_22D181 waitmovement 0 removeobject 6 @@ -325,7 +324,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 addobject 5 applymovement 5, RusturfTunnel_Movement_22D18B waitmovement 0 - applymovement 255, RusturfTunnel_Movement_22D17E + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D17E applymovement 5, RusturfTunnel_Movement_22D1A4 waitmovement 0 msgbox RusturfTunnel_Text_22D395, MSGBOX_DEFAULT @@ -338,7 +337,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 waitbuttonpress waitmoncry closemessage - applymovement 255, RusturfTunnel_Movement_22D19F + applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D19F applymovement 5, RusturfTunnel_Movement_22D193 applymovement 7, RusturfTunnel_Movement_22D1A7 waitmovement 0 diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 15b0ba8e1..86d85fccc 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -43,9 +43,9 @@ SSTidalRooms_EventScript_23C03C:: @ 823C03C SSTidalCorridor_EventScript_23C050:: @ 823C050 compare VAR_PORTHOLE_STATE, 2 - goto_eq SSTidalCorridor_EventScript_23C067 + goto_if_eq SSTidalCorridor_EventScript_23C067 compare VAR_PORTHOLE_STATE, 7 - goto_eq SSTidalCorridor_EventScript_23C07D + goto_if_eq SSTidalCorridor_EventScript_23C07D end SSTidalCorridor_EventScript_23C067:: @ 823C067 @@ -115,9 +115,9 @@ SSTidalCorridor_EventScript_23C119:: @ 823C119 lock faceplayer compare VAR_PORTHOLE_STATE, 4 - goto_eq SSTidalCorridor_EventScript_23C13B + goto_if_eq SSTidalCorridor_EventScript_23C13B compare VAR_PORTHOLE_STATE, 8 - goto_eq SSTidalCorridor_EventScript_23C15A + goto_if_eq SSTidalCorridor_EventScript_23C15A msgbox SSTidalCorridor_Text_23C596, MSGBOX_DEFAULT release end @@ -125,8 +125,7 @@ SSTidalCorridor_EventScript_23C119:: @ 823C119 SSTidalCorridor_EventScript_23C13B:: @ 823C13B setrespawn HEAL_LOCATION_LILYCOVE_CITY msgbox SSTidalCorridor_Text_23C64F, MSGBOX_DEFAULT - checkflag FLAG_0x104 - call_if 1, SSTidalCorridor_EventScript_23C179 + call_if_set FLAG_0x104, SSTidalCorridor_EventScript_23C179 warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release @@ -135,8 +134,7 @@ SSTidalCorridor_EventScript_23C13B:: @ 823C13B SSTidalCorridor_EventScript_23C15A:: @ 823C15A setrespawn HEAL_LOCATION_SLATEPORT_CITY msgbox SSTidalCorridor_Text_23C64F, MSGBOX_DEFAULT - checkflag FLAG_0x104 - call_if 1, SSTidalCorridor_EventScript_23C179 + call_if_set FLAG_0x104, SSTidalCorridor_EventScript_23C179 warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate release @@ -149,9 +147,9 @@ SSTidalCorridor_EventScript_23C179:: @ 823C179 SSTidalCorridor_EventScript_23C17D:: @ 823C17D lockall compare VAR_PORTHOLE_STATE, 2 - goto_eq SSTidalCorridor_EventScript_23C19E + goto_if_eq SSTidalCorridor_EventScript_23C19E compare VAR_PORTHOLE_STATE, 7 - goto_eq SSTidalCorridor_EventScript_23C19E + goto_if_eq SSTidalCorridor_EventScript_23C19E msgbox SSTidalCorridor_Text_23C6C3, MSGBOX_DEFAULT releaseall end @@ -164,8 +162,7 @@ SSTidalCorridor_EventScript_23C19E:: @ 823C19E SSTidalCorridor_EventScript_23C1A3:: @ 823C1A3 lock faceplayer - checkflag FLAG_0x0F7 - goto_eq SSTidalCorridor_EventScript_23C1BD + goto_if_set FLAG_0x0F7, SSTidalCorridor_EventScript_23C1BD call SSTidalCorridor_EventScript_23C1C7 msgbox SSTidalCorridor_Text_23C65E, MSGBOX_DEFAULT release @@ -178,21 +175,21 @@ SSTidalCorridor_EventScript_23C1BD:: @ 823C1BD SSTidalCorridor_EventScript_23C1C7:: @ 823C1C7 checktrainerflag TRAINER_PHILLIP - goto_if 0, SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_23C218 checktrainerflag TRAINER_LEONARD - goto_if 0, SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_23C218 checktrainerflag TRAINER_COLTON - goto_if 0, SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_23C218 checktrainerflag TRAINER_MICAH - goto_if 0, SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_23C218 checktrainerflag TRAINER_THOMAS - goto_if 0, SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_23C218 checktrainerflag TRAINER_LEA_AND_JED - goto_if 0, SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_23C218 checktrainerflag TRAINER_GARRET - goto_if 0, SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_23C218 checktrainerflag TRAINER_NAOMI - goto_if 0, SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_23C218 setflag FLAG_0x0F7 goto SSTidalCorridor_EventScript_23C1BD return @@ -204,11 +201,11 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219 lockall applymovement 5, SSTidalCorridor_Movement_23C26D waitmovement 0 - applymovement 255, SSTidalCorridor_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_2725A8 waitmovement 0 msgbox SSTidalCorridor_Text_23C28F, MSGBOX_DEFAULT closemessage - applymovement 255, SSTidalCorridor_Movement_23C27D + applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_23C27D applymovement 1, SSTidalCorridor_Movement_23C284 applymovement 5, SSTidalCorridor_Movement_23C275 waitmovement 0 diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index 7d774e491..d4c088536 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -4,12 +4,11 @@ SSTidalRooms_MapScripts:: @ 823C9F1 SSTidalRooms_EventScript_23C9F2:: @ 823C9F2 lock faceplayer - checkflag FLAG_0x104 - goto_eq SSTidalRooms_EventScript_23CA29 + goto_if_set FLAG_0x104, SSTidalRooms_EventScript_23CA29 msgbox SSTidalRooms_Text_23D098, MSGBOX_DEFAULT giveitem_std ITEM_TM49 compare VAR_RESULT, 0 - goto_eq SSTidalRooms_EventScript_272054 + goto_if_eq SSTidalRooms_EventScript_272054 setflag FLAG_0x104 msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT release diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc index 6579b6571..06b050f67 100644 --- a/data/maps/SafariZone_South/scripts.inc +++ b/data/maps/SafariZone_South/scripts.inc @@ -9,7 +9,7 @@ SafariZone_South_MapScript2_23D284: @ 823D284 SafariZone_South_EventScript_23D28E:: @ 823D28E lockall - applymovement 255, SafariZone_South_Movement_23D2C5 + applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_23D2C5 waitmovement 0 applymovement 1, SafariZone_South_Movement_23D2C7 waitmovement 0 @@ -20,7 +20,7 @@ SafariZone_South_EventScript_23D28E:: @ 823D28E SafariZone_South_MapScript1_23D2B1: @ 823D2B1 compare VAR_0x40A4, 2 - call_if 1, SafariZone_South_EventScript_23D2BD + call_if_eq SafariZone_South_EventScript_23D2BD end SafariZone_South_EventScript_23D2BD:: @ 823D2BD @@ -51,11 +51,10 @@ SafariZone_South_EventScript_23D2DC:: @ 823D2DC SafariZone_South_EventScript_23D2E5:: @ 823D2E5 lock faceplayer - checkflag FLAG_0x05D - goto_if 0, SafariZone_South_EventScript_23D30D + goto_if_unset FLAG_0x05D, SafariZone_South_EventScript_23D30D msgbox SafariZone_South_Text_2A51D4, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SafariZone_South_EventScript_23D31A + goto_if_eq SafariZone_South_EventScript_23D31A msgbox SafariZone_South_Text_2A521A, MSGBOX_DEFAULT release end @@ -77,7 +76,7 @@ SafariZone_South_EventScript_23D31A:: @ 823D31A SafariZone_South_EventScript_23D33F:: @ 823D33F applymovement 1, SafariZone_South_Movement_23D38A waitmovement 0 - applymovement 255, SafariZone_South_Movement_23D385 + applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_23D385 waitmovement 0 goto SafariZone_South_EventScript_23D373 end @@ -85,7 +84,7 @@ SafariZone_South_EventScript_23D33F:: @ 823D33F SafariZone_South_EventScript_23D359:: @ 823D359 applymovement 1, SafariZone_South_Movement_23D38D waitmovement 0 - applymovement 255, SafariZone_South_Movement_23D387 + applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_23D387 waitmovement 0 goto SafariZone_South_EventScript_23D373 end diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index cb41b7ca6..9bbb9cbdc 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -10,7 +10,7 @@ SeafloorCavern_Entrance_MapScript1_234474: @ 8234474 SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 lockall compare VAR_0x40D9, 1 - goto_eq SeafloorCavern_Entrance_EventScript_2344ED + goto_if_eq SeafloorCavern_Entrance_EventScript_2344ED waitse playse SE_PIN applymovement 1, SeafloorCavern_Entrance_Movement_272598 @@ -19,11 +19,11 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 waitmovement 0 delay 20 compare VAR_FACING, 3 - call_if 1, SeafloorCavern_Entrance_EventScript_23452E + call_if_eq SeafloorCavern_Entrance_EventScript_23452E compare VAR_FACING, 4 - call_if 1, SeafloorCavern_Entrance_EventScript_234523 + call_if_eq SeafloorCavern_Entrance_EventScript_234523 compare VAR_FACING, 2 - call_if 1, SeafloorCavern_Entrance_EventScript_234539 + call_if_eq SeafloorCavern_Entrance_EventScript_234539 delay 30 setvar VAR_0x40D9, 1 moveobjectoffscreen 1 @@ -36,11 +36,11 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED compare VAR_FACING, 3 - call_if 1, SeafloorCavern_Entrance_EventScript_23452E + call_if_eq SeafloorCavern_Entrance_EventScript_23452E compare VAR_FACING, 4 - call_if 1, SeafloorCavern_Entrance_EventScript_234523 + call_if_eq SeafloorCavern_Entrance_EventScript_234523 compare VAR_FACING, 2 - call_if 1, SeafloorCavern_Entrance_EventScript_234539 + call_if_eq SeafloorCavern_Entrance_EventScript_234539 msgbox SeafloorCavern_Entrance_Text_2346C8, MSGBOX_DEFAULT closemessage applymovement 1, SeafloorCavern_Entrance_Movement_2725A6 diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 9406fcb6c..212496eef 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -7,15 +7,15 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_0x8005, 3 setvar VAR_0x8006, 4 setvar VAR_0x8007, 5 - applymovement 255, SeafloorCavern_Room9_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A6 waitmovement 0 - applymovement 255, SeafloorCavern_Room9_Movement_23505C + applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_23505C waitmovement 0 playbgm MUS_AQA_0, 0 msgbox SeafloorCavern_Room9_Text_23505F, MSGBOX_DEFAULT closemessage addobject VAR_0x8004 - applymovement 255, SeafloorCavern_Room9_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A4 waitmovement 0 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23502A waitmovement 0 @@ -28,7 +28,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 msgbox SeafloorCavern_Room9_Text_23512C, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_2351BC msgbox SeafloorCavern_Room9_Text_2351E5, MSGBOX_DEFAULT - setweather 0 + setweather WEATHER_NONE doweather special sub_80B05B4 waitstate @@ -48,7 +48,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 playse SE_TAMA special sub_80B0534 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6 - applymovement 255, SeafloorCavern_Room9_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A6 waitmovement 0 delay 150 removeobject 7 @@ -82,7 +82,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_0x8007, 5 msgbox SeafloorCavern_Room9_Text_2352A7, MSGBOX_DEFAULT playse SE_PC_LOGIN - applymovement 255, SeafloorCavern_Room9_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_2725A4 waitmovement 0 msgbox SeafloorCavern_Room9_Text_2352F6, MSGBOX_DEFAULT closemessage diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc index a906d338e..36836fb49 100644 --- a/data/maps/SealedChamber_InnerRoom/scripts.inc +++ b/data/maps/SealedChamber_InnerRoom/scripts.inc @@ -6,11 +6,10 @@ SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8 braillemessage SealedChamber_InnerRoom_Braille_2A6B99 waitbuttonpress hidebox2 - checkflag FLAG_0x0E4 - goto_eq SealedChamber_InnerRoom_EventScript_239253 + goto_if_set FLAG_0x0E4, SealedChamber_InnerRoom_EventScript_239253 specialvar VAR_RESULT, CheckRelicanthWailord compare VAR_RESULT, 0 - goto_eq SealedChamber_InnerRoom_EventScript_239253 + goto_if_eq SealedChamber_InnerRoom_EventScript_239253 fadeoutbgm 0 playse SE_TRACK_MOVE special DoSealedChamberShakingEffect1 diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc index 7d3e32479..4b461a684 100644 --- a/data/maps/SealedChamber_OuterRoom/scripts.inc +++ b/data/maps/SealedChamber_OuterRoom/scripts.inc @@ -14,8 +14,7 @@ SealedChamber_OuterRoom_MapScript1_239127: @ 8239127 end SealedChamber_OuterRoom_MapScript1_23912B: @ 823912B - checkflag FLAG_SYS_BRAILLE_DIG - call_if 0, SealedChamber_OuterRoom_EventScript_239135 + call_if_unset FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_239135 end SealedChamber_OuterRoom_EventScript_239135:: @ 8239135 @@ -109,8 +108,7 @@ SealedChamber_OuterRoom_EventScript_2391C6:: @ 82391C6 SealedChamber_OuterRoom_EventScript_2391D0:: @ 82391D0 lockall - checkflag FLAG_SYS_BRAILLE_DIG - goto_eq SealedChamber_OuterRoom_EventScript_2391E3 + goto_if_set FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_2391E3 braillemessage SealedChamber_OuterRoom_Braille_2A6B89 waitbuttonpress hidebox2 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index 7d63928ab..5f95bf8ed 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -4,8 +4,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 8236DBA ShoalCave_LowTideEntranceRoom_MapScript1_236DC0: @ 8236DC0 special UpdateShoalTideFlag - checkflag FLAG_SYS_SHOAL_TIDE - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236DD1 + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideEntranceRoom_EventScript_236DD1 goto ShoalCave_LowTideEntranceRoom_EventScript_236DD5 ShoalCave_LowTideEntranceRoom_EventScript_236DD1:: @ 8236DD1 @@ -20,28 +19,27 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 lock faceplayer dodailyevents - checkflag FLAG_SYS_SHOAL_ITEM - call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_236ED9 + call_if_set FLAG_SYS_SHOAL_ITEM, ShoalCave_LowTideEntranceRoom_EventScript_236ED9 checkitem ITEM_SHOAL_SALT, 4 compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B checkitem ITEM_SHOAL_SHELL, 4 compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B msgbox ShoalCave_LowTideEntranceRoom_Text_2A7F37, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236ECF + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236ECF checkitemspace ITEM_SHELL_BELL, 1 compare VAR_RESULT, 0 - call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_236E69 + call_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E69 compare VAR_RESULT, 2 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E91 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E91 msgbox ShoalCave_LowTideEntranceRoom_Text_2A7FAC, MSGBOX_DEFAULT takeitem ITEM_SHOAL_SALT, 4 takeitem ITEM_SHOAL_SHELL, 4 giveitem_std ITEM_SHELL_BELL compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_272054 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_272054 msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, MSGBOX_DEFAULT setflag FLAG_TEMP_2 release @@ -50,13 +48,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 ShoalCave_LowTideEntranceRoom_EventScript_236E69:: @ 8236E69 checkitem ITEM_SHOAL_SALT, 5 compare VAR_RESULT, 1 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E7A + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E7A return ShoalCave_LowTideEntranceRoom_EventScript_236E7A:: @ 8236E7A checkitem ITEM_SHOAL_SHELL, 5 compare VAR_RESULT, 1 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E8B + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E8B return ShoalCave_LowTideEntranceRoom_EventScript_236E8B:: @ 8236E8B @@ -71,10 +69,10 @@ ShoalCave_LowTideEntranceRoom_EventScript_236E91:: @ 8236E91 ShoalCave_LowTideEntranceRoom_EventScript_236E9B:: @ 8236E9B checkitem ITEM_SHOAL_SALT, 1 compare VAR_RESULT, 1 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 checkitem ITEM_SHOAL_SHELL, 1 compare VAR_RESULT, 1 - goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 msgbox ShoalCave_LowTideEntranceRoom_Text_2A7E0E, MSGBOX_DEFAULT release end diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index a92e84e3a..226f89708 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -4,8 +4,7 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 8236EF5 .byte 0 ShoalCave_LowTideInnerRoom_MapScript1_236F00: @ 8236F00 - checkflag FLAG_SYS_SHOAL_TIDE - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F0E + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F0E goto ShoalCave_LowTideInnerRoom_EventScript_236F12 ShoalCave_LowTideInnerRoom_EventScript_236F0E:: @ 8236F0E @@ -21,47 +20,39 @@ ShoalCave_LowTideInnerRoom_MapScript1_236F16: @ 8236F16 end ShoalCave_LowTideInnerRoom_EventScript_236F1C:: @ 8236F1C - checkflag FLAG_0x3B8 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F3D - checkflag FLAG_SYS_SHOAL_TIDE - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F3D + goto_if_set FLAG_0x3B8, ShoalCave_LowTideInnerRoom_EventScript_236F3D + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F3D setmetatile 31, 8, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_236F3D end ShoalCave_LowTideInnerRoom_EventScript_236F3D:: @ 8236F3D - checkflag FLAG_0x3B9 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F5E - checkflag FLAG_SYS_SHOAL_TIDE - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F5E + goto_if_set FLAG_0x3B9, ShoalCave_LowTideInnerRoom_EventScript_236F5E + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F5E setmetatile 14, 26, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_236F5E end ShoalCave_LowTideInnerRoom_EventScript_236F5E:: @ 8236F5E - checkflag FLAG_0x3BC - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F76 + goto_if_set FLAG_0x3BC, ShoalCave_LowTideInnerRoom_EventScript_236F76 setmetatile 41, 20, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_236F76 end ShoalCave_LowTideInnerRoom_EventScript_236F76:: @ 8236F76 - checkflag FLAG_0x3BD - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236F8E + goto_if_set FLAG_0x3BD, ShoalCave_LowTideInnerRoom_EventScript_236F8E setmetatile 41, 10, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_236F8E end ShoalCave_LowTideInnerRoom_EventScript_236F8E:: @ 8236F8E - checkflag FLAG_0x3BE - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FA6 + goto_if_set FLAG_0x3BE, ShoalCave_LowTideInnerRoom_EventScript_236FA6 setmetatile 6, 9, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_236FA6 end ShoalCave_LowTideInnerRoom_EventScript_236FA6:: @ 8236FA6 - checkflag FLAG_0x3BF - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FB9 + goto_if_set FLAG_0x3BF, ShoalCave_LowTideInnerRoom_EventScript_236FB9 setmetatile 16, 13, 857, 1 return @@ -70,11 +61,10 @@ ShoalCave_LowTideInnerRoom_EventScript_236FB9:: @ 8236FB9 ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA lockall - checkflag FLAG_0x3BC - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC + goto_if_set FLAG_0x3BC, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 41, 20, 859, 0 special DrawWholeMapView setflag FLAG_0x3BC @@ -88,11 +78,10 @@ ShoalCave_LowTideInnerRoom_EventScript_236FEC:: @ 8236FEC ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6 lockall - checkflag FLAG_0x3BD - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC + goto_if_set FLAG_0x3BD, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 41, 10, 859, 0 special DrawWholeMapView setflag FLAG_0x3BD @@ -101,11 +90,10 @@ ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6 ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028 lockall - checkflag FLAG_0x3BE - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC + goto_if_set FLAG_0x3BE, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 6, 9, 859, 0 special DrawWholeMapView setflag FLAG_0x3BE @@ -114,11 +102,10 @@ ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028 ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A lockall - checkflag FLAG_0x3BF - goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC + goto_if_set FLAG_0x3BF, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 16, 13, 859, 0 special DrawWholeMapView setflag FLAG_0x3BF @@ -127,11 +114,10 @@ ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C lockall - checkflag FLAG_0x3B8 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_2370BE + goto_if_set FLAG_0x3B8, ShoalCave_LowTideInnerRoom_EventScript_2370BE giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 31, 8, 858, 0 special DrawWholeMapView setflag FLAG_0x3B8 @@ -145,11 +131,10 @@ ShoalCave_LowTideInnerRoom_EventScript_2370BE:: @ 82370BE ShoalCave_LowTideInnerRoom_EventScript_2370C8:: @ 82370C8 lockall - checkflag FLAG_0x3B9 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_2370BE + goto_if_set FLAG_0x3B9, ShoalCave_LowTideInnerRoom_EventScript_2370BE giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 14, 26, 858, 0 special DrawWholeMapView setflag FLAG_0x3B9 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc index fc0fb32a7..1e2e756d7 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -7,8 +7,7 @@ ShoalCave_LowTideLowerRoom_MapScript1_23715C: @ 823715C end ShoalCave_LowTideLowerRoom_EventScript_237162:: @ 8237162 - checkflag FLAG_0x3BB - goto_eq ShoalCave_LowTideLowerRoom_EventScript_237175 + goto_if_set FLAG_0x3BB, ShoalCave_LowTideLowerRoom_EventScript_237175 setmetatile 18, 2, 856, 1 return @@ -17,11 +16,10 @@ ShoalCave_LowTideLowerRoom_EventScript_237175:: @ 8237175 ShoalCave_LowTideLowerRoom_EventScript_237176:: @ 8237176 lockall - checkflag FLAG_0x3BB - goto_eq ShoalCave_LowTideLowerRoom_EventScript_2371A8 + goto_if_set FLAG_0x3BB, ShoalCave_LowTideLowerRoom_EventScript_2371A8 giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideLowerRoom_EventScript_272054 + goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_272054 setmetatile 18, 2, 858, 0 special DrawWholeMapView setflag FLAG_0x3BB @@ -36,12 +34,11 @@ ShoalCave_LowTideLowerRoom_EventScript_2371A8:: @ 82371A8 ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2 lock faceplayer - checkflag FLAG_0x11B - goto_eq ShoalCave_LowTideLowerRoom_EventScript_2371E1 + goto_if_set FLAG_0x11B, ShoalCave_LowTideLowerRoom_EventScript_2371E1 msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, MSGBOX_DEFAULT giveitem_std ITEM_FOCUS_BAND compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideLowerRoom_EventScript_272054 + goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_272054 setflag FLAG_0x11B release end diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc index de2faf65b..4486c7c61 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -7,8 +7,7 @@ ShoalCave_LowTideStairsRoom_MapScript1_237100: @ 8237100 end ShoalCave_LowTideStairsRoom_EventScript_237106:: @ 8237106 - checkflag FLAG_0x3BA - goto_eq ShoalCave_LowTideStairsRoom_EventScript_237119 + goto_if_set FLAG_0x3BA, ShoalCave_LowTideStairsRoom_EventScript_237119 setmetatile 11, 11, 856, 1 return @@ -17,11 +16,10 @@ ShoalCave_LowTideStairsRoom_EventScript_237119:: @ 8237119 ShoalCave_LowTideStairsRoom_EventScript_23711A:: @ 823711A lockall - checkflag FLAG_0x3BA - goto_eq ShoalCave_LowTideStairsRoom_EventScript_23714C + goto_if_set FLAG_0x3BA, ShoalCave_LowTideStairsRoom_EventScript_23714C giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 - goto_eq ShoalCave_LowTideStairsRoom_EventScript_272054 + goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_272054 setmetatile 11, 11, 858, 0 special DrawWholeMapView setflag FLAG_0x3BA diff --git a/data/maps/SkyPillar_1F/scripts.inc b/data/maps/SkyPillar_1F/scripts.inc index 6afc5aa64..3d76a9fe2 100644 --- a/data/maps/SkyPillar_1F/scripts.inc +++ b/data/maps/SkyPillar_1F/scripts.inc @@ -4,7 +4,7 @@ SkyPillar_1F_MapScripts:: @ 8239615 SkyPillar_1F_MapScript1_23961B: @ 823961B compare VAR_0x40CA, 2 - call_if 0, SkyPillar_1F_EventScript_239627 + call_if_lt SkyPillar_1F_EventScript_239627 end SkyPillar_1F_EventScript_239627:: @ 8239627 diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc index c15f1f8c4..0474a829c 100644 --- a/data/maps/SkyPillar_2F/scripts.inc +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -6,7 +6,7 @@ SkyPillar_2F_MapScripts:: @ 823962B SkyPillar_2F_MapScript1_23963B: @ 823963B compare VAR_0x40CA, 2 - call_if 0, SkyPillar_2F_EventScript_23964C + call_if_lt SkyPillar_2F_EventScript_23964C copyvar VAR_ICE_STEP_COUNT, 0x1 end diff --git a/data/maps/SkyPillar_3F/scripts.inc b/data/maps/SkyPillar_3F/scripts.inc index 0ddae05b2..777d53b62 100644 --- a/data/maps/SkyPillar_3F/scripts.inc +++ b/data/maps/SkyPillar_3F/scripts.inc @@ -4,7 +4,7 @@ SkyPillar_3F_MapScripts:: @ 823965B SkyPillar_3F_MapScript1_239661: @ 8239661 compare VAR_0x40CA, 2 - call_if 0, SkyPillar_3F_EventScript_23966D + call_if_lt SkyPillar_3F_EventScript_23966D end SkyPillar_3F_EventScript_23966D:: @ 823966D diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc index 3884864d7..262492169 100644 --- a/data/maps/SkyPillar_4F/scripts.inc +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -6,7 +6,7 @@ SkyPillar_4F_MapScripts:: @ 8239671 SkyPillar_4F_MapScript1_239681: @ 8239681 compare VAR_0x40CA, 2 - call_if 0, SkyPillar_4F_EventScript_239692 + call_if_lt SkyPillar_4F_EventScript_239692 copyvar VAR_ICE_STEP_COUNT, 0x1 end diff --git a/data/maps/SkyPillar_5F/scripts.inc b/data/maps/SkyPillar_5F/scripts.inc index 8e08fb2bd..41546899f 100644 --- a/data/maps/SkyPillar_5F/scripts.inc +++ b/data/maps/SkyPillar_5F/scripts.inc @@ -4,7 +4,7 @@ SkyPillar_5F_MapScripts:: @ 82396A2 SkyPillar_5F_MapScript1_2396A8: @ 82396A8 compare VAR_0x40CA, 2 - call_if 0, SkyPillar_5F_EventScript_2396B4 + call_if_lt SkyPillar_5F_EventScript_2396B4 return SkyPillar_5F_EventScript_2396B4:: @ 82396B4 diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index 1b2a1e4c9..4e7701de6 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -6,9 +6,9 @@ SkyPillar_Outside_MapScripts:: @ 82392A8 SkyPillar_Outside_MapScript1_2392B8: @ 82392B8 compare VAR_0x405E, 3 - call_if 1, SkyPillar_Outside_EventScript_2392CF + call_if_eq SkyPillar_Outside_EventScript_2392CF compare VAR_0x405E, 4 - call_if 4, SkyPillar_Outside_EventScript_2392D3 + call_if_ge SkyPillar_Outside_EventScript_2392D3 end SkyPillar_Outside_EventScript_2392CF:: @ 82392CF @@ -16,13 +16,11 @@ SkyPillar_Outside_EventScript_2392CF:: @ 82392CF return SkyPillar_Outside_EventScript_2392D3:: @ 82392D3 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, SkyPillar_Outside_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, SkyPillar_Outside_EventScript_27207A return SkyPillar_Outside_MapScript1_2392DD: @ 82392DD - checkflag FLAG_0x137 - call_if 1, SkyPillar_Outside_EventScript_2392E7 + call_if_set FLAG_0x137, SkyPillar_Outside_EventScript_2392E7 end SkyPillar_Outside_EventScript_2392E7:: @ 82392E7 @@ -38,7 +36,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 lockall applymovement 1, SkyPillar_Outside_Movement_2393D3 waitmovement 0 - applymovement 255, SkyPillar_Outside_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_2725A4 waitmovement 0 msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT closemessage @@ -52,7 +50,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 delay 40 msgbox SkyPillar_Outside_Text_2394BC, MSGBOX_DEFAULT closemessage - applymovement 255, SkyPillar_Outside_Movement_2393EB + applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_2393EB applymovement 1, SkyPillar_Outside_Movement_2393DE waitmovement 0 setvar VAR_0x8004, 1 @@ -74,7 +72,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT closemessage setflag FLAG_SYS_WEATHER_CTRL - setweather 15 + setweather WEATHER_15 doweather special WaitWeather waitstate diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index ef0419cdb..1ac3cf486 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -5,22 +5,21 @@ SkyPillar_Top_MapScripts:: @ 82396B8 .byte 0 SkyPillar_Top_MapScript1_2396C8: @ 82396C8 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, SkyPillar_Top_EventScript_2396D2 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SkyPillar_Top_EventScript_2396D2 end SkyPillar_Top_EventScript_2396D2:: @ 82396D2 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, SkyPillar_Top_EventScript_27374E + goto_if_ne SkyPillar_Top_EventScript_27374E removeobject VAR_LAST_TALKED return SkyPillar_Top_MapScript1_2396E6: @ 82396E6 compare VAR_0x40CA, 2 - call_if 0, SkyPillar_Top_EventScript_2396FD + call_if_lt SkyPillar_Top_EventScript_2396FD compare VAR_0x40CA, 2 - call_if 4, SkyPillar_Top_EventScript_239705 + call_if_ge SkyPillar_Top_EventScript_239705 end SkyPillar_Top_EventScript_2396FD:: @ 82396FD @@ -29,8 +28,7 @@ SkyPillar_Top_EventScript_2396FD:: @ 82396FD return SkyPillar_Top_EventScript_239705:: @ 8239705 - checkflag FLAG_0x1C0 - call_if 0, SkyPillar_Top_EventScript_23970F + call_if_unset FLAG_0x1C0, SkyPillar_Top_EventScript_23970F return SkyPillar_Top_EventScript_23970F:: @ 823970F @@ -58,11 +56,11 @@ SkyPillar_Top_EventScript_239722:: @ 8239722 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq SkyPillar_Top_EventScript_239768 + goto_if_eq SkyPillar_Top_EventScript_239768 compare VAR_RESULT, 4 - goto_eq SkyPillar_Top_EventScript_239771 + goto_if_eq SkyPillar_Top_EventScript_239771 compare VAR_RESULT, 5 - goto_eq SkyPillar_Top_EventScript_239771 + goto_if_eq SkyPillar_Top_EventScript_239771 setflag FLAG_0x1C0 releaseall end @@ -96,12 +94,12 @@ SkyPillar_Top_EventScript_239785:: @ 8239785 SkyPillar_Top_EventScript_23979A:: @ 823979A lockall fadeoutbgm 1 - applymovement 255, SkyPillar_Top_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Top_Movement_2725B2 waitmovement 0 - special SpawnScriptEventObject - applymovement 127, SkyPillar_Top_Movement_239858 + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_239858 waitmovement 0 - special RemoveScriptEventObject + special RemoveCameraObject applymovement 1, SkyPillar_Top_Movement_23983A waitmovement 0 waitse @@ -128,10 +126,10 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A closemessage delay 20 fadeinbgm 1 - special SpawnScriptEventObject - applymovement 127, SkyPillar_Top_Movement_23985C + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_23985C waitmovement 0 - special RemoveScriptEventObject + special RemoveCameraObject setvar VAR_0x405E, 5 setvar VAR_0x40CA, 1 setvar VAR_0x40D7, 1 diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index dc3a81650..a28d74fa2 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -7,9 +7,9 @@ SlateportCity_MapScript1_1DCC6C: @ 81DCC6C setvar VAR_0x40AA, 0 call SlateportCity_EventScript_1DCC8D compare VAR_0x4058, 1 - call_if 1, SlateportCity_EventScript_1DCC99 + call_if_eq SlateportCity_EventScript_1DCC99 compare VAR_0x40D2, 1 - call_if 1, SlateportCity_EventScript_1DCCE7 + call_if_eq SlateportCity_EventScript_1DCCE7 end SlateportCity_EventScript_1DCC8D:: @ 81DCC8D @@ -39,7 +39,7 @@ SlateportCity_EventScript_1DCCE7:: @ 81DCCE7 setflag FLAG_SPECIAL_FLAG_0x4000 getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 30 - goto_eq SlateportCity_EventScript_1DCD06 + goto_if_eq SlateportCity_EventScript_1DCD06 setobjectxyperm 35, 23, 27 setobjectmovementtype 35, 10 return @@ -56,7 +56,7 @@ SlateportCity_MapScript2_1DCD12: @ 81DCD12 SlateportCity_EventScript_1DCD1C:: @ 81DCD1C lockall addobject 35 - applymovement 255, SlateportCity_Movement_1DCDA8 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DCDA8 applymovement 35, SlateportCity_Movement_1DCDAC waitmovement 0 msgbox SlateportCity_Text_1DF032, MSGBOX_DEFAULT @@ -144,10 +144,10 @@ SlateportCity_EventScript_1DCDE4:: @ 81DCDE4 msgbox SlateportCity_Text_1DD68A, MSGBOX_DEFAULT specialvar VAR_RESULT, LeadMonHasEffortRibbon compare VAR_RESULT, 1 - call_if 1, SlateportCity_EventScript_1DCE38 + call_if_eq SlateportCity_EventScript_1DCE38 specialvar VAR_RESULT, Special_AreLeadMonEVsMaxedOut compare VAR_RESULT, 0 - call_if 1, SlateportCity_EventScript_1DCE2E + call_if_eq SlateportCity_EventScript_1DCE2E msgbox SlateportCity_Text_1DD697, MSGBOX_DEFAULT playfanfare MUS_FANFA4 message SlateportCity_Text_1DD6E3 @@ -171,7 +171,7 @@ SlateportCity_EventScript_1DCE42:: @ 81DCE42 lock faceplayer compare VAR_0x4058, 1 - call_if 1, SlateportCity_EventScript_1DCE59 + call_if_eq SlateportCity_EventScript_1DCE59 msgbox SlateportCity_Text_1DD81A, MSGBOX_DEFAULT release end @@ -185,7 +185,7 @@ SlateportCity_EventScript_1DCE63:: @ 81DCE63 lock faceplayer compare VAR_0x4058, 1 - call_if 1, SlateportCity_EventScript_1DCE7A + call_if_eq SlateportCity_EventScript_1DCE7A msgbox SlateportCity_Text_1DD8A6, MSGBOX_DEFAULT release end @@ -199,9 +199,8 @@ SlateportCity_EventScript_1DCE84:: @ 81DCE84 lock faceplayer compare VAR_0x4058, 1 - call_if 1, SlateportCity_EventScript_1DCEA4 - checkflag FLAG_0x060 - goto_eq SlateportCity_EventScript_1DCEAE + call_if_eq SlateportCity_EventScript_1DCEA4 + goto_if_set FLAG_0x060, SlateportCity_EventScript_1DCEAE msgbox SlateportCity_Text_1DD93D, MSGBOX_DEFAULT release end @@ -220,7 +219,7 @@ SlateportCity_EventScript_1DCEB8:: @ 81DCEB8 lock faceplayer compare VAR_0x4058, 1 - call_if 1, SlateportCity_EventScript_1DCECF + call_if_eq SlateportCity_EventScript_1DCECF msgbox SlateportCity_Text_1DDA34, MSGBOX_DEFAULT release end @@ -232,7 +231,7 @@ SlateportCity_EventScript_1DCECF:: @ 81DCECF SlateportCity_EventScript_1DCED9:: @ 81DCED9 compare VAR_0x4058, 1 - goto_eq SlateportCity_EventScript_1DCEED + goto_if_eq SlateportCity_EventScript_1DCEED msgbox SlateportCity_Text_1DDA9A, MSGBOX_NPC end @@ -244,7 +243,7 @@ SlateportCity_EventScript_1DCEF6:: @ 81DCEF6 lock faceplayer compare VAR_0x4058, 1 - call_if 1, SlateportCity_EventScript_1DCF0D + call_if_eq SlateportCity_EventScript_1DCF0D msgbox SlateportCity_Text_1DDB21, MSGBOX_DEFAULT release end @@ -257,8 +256,7 @@ SlateportCity_EventScript_1DCF0D:: @ 81DCF0D SlateportCity_EventScript_1DCF17:: @ 81DCF17 lock faceplayer - checkflag FLAG_0x094 - goto_eq SlateportCity_EventScript_1DCF2C + goto_if_set FLAG_0x094, SlateportCity_EventScript_1DCF2C msgbox SlateportCity_Text_1DDBAC, MSGBOX_DEFAULT release end @@ -274,10 +272,8 @@ SlateportCity_EventScript_1DCF36:: @ 81DCF36 SlateportCity_EventScript_1DCF3F:: @ 81DCF3F lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_eq SlateportCity_EventScript_1DCF66 - checkflag FLAG_BADGE07_GET - goto_eq SlateportCity_EventScript_1DCF5C + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_1DCF66 + goto_if_set FLAG_BADGE07_GET, SlateportCity_EventScript_1DCF5C msgbox SlateportCity_Text_1DE8F8, MSGBOX_DEFAULT releaseall end @@ -310,8 +306,7 @@ SlateportCity_EventScript_1DCF8B:: @ 81DCF8B SlateportCity_EventScript_1DCF94:: @ 81DCF94 lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_eq SlateportCity_EventScript_1DCFA8 + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_1DCFA8 msgbox SlateportCity_Text_1DEAE3, MSGBOX_DEFAULT releaseall end @@ -329,7 +324,7 @@ SlateportCity_EventScript_1DCFBB:: @ 81DCFBB lock faceplayer compare VAR_0x4058, 1 - call_if 1, SlateportCity_EventScript_1DCFD2 + call_if_eq SlateportCity_EventScript_1DCFD2 msgbox SlateportCity_Text_1DE10E, MSGBOX_DEFAULT release end @@ -518,8 +513,7 @@ SlateportCity_EventScript_1DD18E:: @ 81DD18E SlateportCity_EventScript_1DD198:: @ 81DD198 lock faceplayer - checkflag FLAG_0x060 - goto_if 0, SlateportCity_EventScript_1DD18E + goto_if_unset FLAG_0x060, SlateportCity_EventScript_1DD18E message gUnknown_08272A21 waitmessage pokemartdecoration SlateportCity_PokemartDecor_1DD1B8 @@ -576,7 +570,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 waitmovement 0 delay 25 applymovement 11, SlateportCity_Movement_1DD33C - applymovement 255, SlateportCity_Movement_1DD34A + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DD34A applymovement 10, SlateportCity_Movement_1DD319 applymovement 9, SlateportCity_Movement_1DD326 waitmovement 0 @@ -608,7 +602,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 msgbox SlateportCity_Text_1DE8A0, MSGBOX_DEFAULT closemessage applymovement 11, SlateportCity_Movement_1DD337 - applymovement 255, SlateportCity_Movement_1DD344 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DD344 waitmovement 0 removeobject 11 clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN @@ -728,8 +722,7 @@ SlateportCity_EventScript_1DD365:: @ 81DD365 SlateportCity_EventScript_1DD36E:: @ 81DD36E lock faceplayer - checkflag FLAG_0x151 - goto_eq SlateportCity_EventScript_1DD39A + goto_if_set FLAG_0x151, SlateportCity_EventScript_1DD39A msgbox SlateportCity_Text_1DEBCE, MSGBOX_DEFAULT giveitem_std ITEM_POWDER_JAR setflag FLAG_0x151 @@ -741,7 +734,7 @@ SlateportCity_EventScript_1DD39A:: @ 81DD39A setvar VAR_0x8004, 1 specialvar VAR_RESULT, sub_80246D4 compare VAR_RESULT, 0 - goto_eq SlateportCity_EventScript_1DD3C0 + goto_if_eq SlateportCity_EventScript_1DD3C0 msgbox SlateportCity_Text_1DEE40, MSGBOX_DEFAULT special sub_80248B0 goto SlateportCity_EventScript_1DD3CA @@ -860,20 +853,20 @@ SlateportCity_EventScript_1DD54A:: @ 81DD54A SlateportCity_EventScript_1DD557:: @ 81DD557 msgbox SlateportCity_Text_1DEE90, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SlateportCity_EventScript_1DD3CA + goto_if_eq SlateportCity_EventScript_1DD3CA copyvar VAR_0x8004, VAR_0x8009 specialvar VAR_RESULT, sub_80246D4 compare VAR_RESULT, 0 - goto_eq SlateportCity_EventScript_1DD5CE + goto_if_eq SlateportCity_EventScript_1DD5CE giveitem_std VAR_0x8008 compare VAR_RESULT, 0 - goto_eq SlateportCity_EventScript_1DD5C1 + goto_if_eq SlateportCity_EventScript_1DD5C1 copyvar VAR_0x8004, VAR_0x8009 special sub_802477C special sub_802488C msgbox SlateportCity_Text_1DEEF7, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SlateportCity_EventScript_1DD3CA + goto_if_eq SlateportCity_EventScript_1DD3CA msgbox SlateportCity_Text_1DEF79, MSGBOX_DEFAULT special sub_8024918 release @@ -892,19 +885,19 @@ SlateportCity_EventScript_1DD5CE:: @ 81DD5CE SlateportCity_EventScript_1DD5DC:: @ 81DD5DC lockall - applymovement 255, SlateportCity_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_2725B2 waitmovement 0 opendoor 10, 12 waitdooranim addobject 35 - applymovement 255, SlateportCity_Movement_1DD630 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DD630 applymovement 35, SlateportCity_Movement_1DD637 waitmovement 0 closedoor 10, 12 waitdooranim msgbox SlateportCity_Text_1DF28C, MSGBOX_DEFAULT closemessage - applymovement 255, SlateportCity_Movement_1DD634 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DD634 applymovement 35, SlateportCity_Movement_1DD63A waitmovement 0 removeobject 35 diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index 3cff83bd8..10eb60cb7 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -11,9 +11,9 @@ SlateportCity_BattleTentBattleRoom_MapScript1_209970: @ 8209970 SlateportCity_BattleTentBattleRoom_EventScript_209976:: @ 8209976 checkplayergender compare VAR_RESULT, 0 - goto_eq SlateportCity_BattleTentBattleRoom_EventScript_20998E + goto_if_eq SlateportCity_BattleTentBattleRoom_EventScript_20998E compare VAR_RESULT, 1 - goto_eq SlateportCity_BattleTentBattleRoom_EventScript_209994 + goto_if_eq SlateportCity_BattleTentBattleRoom_EventScript_209994 return SlateportCity_BattleTentBattleRoom_EventScript_20998E:: @ 820998E @@ -30,7 +30,7 @@ SlateportCity_BattleTentBattleRoom_MapScript2_20999A: @ 820999A SlateportCity_BattleTentBattleRoom_EventScript_2099A4:: @ 82099A4 setvar VAR_TEMP_1, 1 - hideobjectat 255, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM hideobjectat 2, MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM end diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index 7eb935bf1..4bd28996b 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -10,12 +10,12 @@ SlateportCity_BattleTentCorridor_MapScript2_208E31: @ 8208E31 SlateportCity_BattleTentCorridor_EventScript_208E3B:: @ 8208E3B setvar VAR_TEMP_1, 1 compare VAR_0x8006, 1 - goto_if 5, SlateportCity_BattleTentCorridor_EventScript_208E56 + goto_if_ne SlateportCity_BattleTentCorridor_EventScript_208E56 setobjectxy 1, 2, 2 turnobject 1, 1 SlateportCity_BattleTentCorridor_EventScript_208E56:: @ 8208E56 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end SlateportCity_BattleTentCorridor_MapScript2_208E5B: @ 8208E5B @@ -24,13 +24,13 @@ SlateportCity_BattleTentCorridor_MapScript2_208E5B: @ 8208E5B SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65 compare VAR_0x8006, 1 - goto_eq SlateportCity_BattleTentCorridor_EventScript_208EEE + goto_if_eq SlateportCity_BattleTentCorridor_EventScript_208EEE setvar VAR_TEMP_0, 1 applymovement 1, SlateportCity_BattleTentCorridor_Movement_209062 - applymovement 255, SlateportCity_BattleTentCorridor_Movement_209059 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_209059 waitmovement 0 compare VAR_0x8006, 2 - goto_eq SlateportCity_BattleTentCorridor_EventScript_209044 + goto_if_eq SlateportCity_BattleTentCorridor_EventScript_209044 setvar VAR_0x8004, 9 special sub_81B9D08 setvar VAR_0x8004, 8 @@ -49,7 +49,7 @@ SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 opendoor 2, 1 waitdooranim applymovement 1, SlateportCity_BattleTentCorridor_Movement_209068 - applymovement 255, SlateportCity_BattleTentCorridor_Movement_20905E + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_20905E waitmovement 0 closedoor 2, 1 waitdooranim @@ -72,9 +72,9 @@ SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 1 - call_if 1, SlateportCity_BattleTentCorridor_EventScript_209014 + call_if_eq SlateportCity_BattleTentCorridor_EventScript_209014 compare VAR_RESULT, 2 - call_if 1, SlateportCity_BattleTentCorridor_EventScript_20901B + call_if_eq SlateportCity_BattleTentCorridor_EventScript_20901B multichoice 20, 6, 104, 1 switch VAR_RESULT case 0, SlateportCity_BattleTentCorridor_EventScript_208FBB @@ -112,7 +112,7 @@ SlateportCity_BattleTentCorridor_EventScript_208FF1:: @ 8208FF1 special sub_81B9D08 waitstate compare VAR_RESULT, 1 - goto_eq SlateportCity_BattleTentCorridor_EventScript_208EB4 + goto_if_eq SlateportCity_BattleTentCorridor_EventScript_208EB4 msgbox SlateportCity_BattleTentCorridor_Text_25AB6C, MSGBOX_DEFAULT goto SlateportCity_BattleTentCorridor_EventScript_208EB4 diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index 8e5c81e12..2d00095ba 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -9,7 +9,7 @@ SlateportCity_BattleTentLobby_MapScript2_20873B: @ 820873B SlateportCity_BattleTentLobby_EventScript_208745:: @ 8208745 setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end SlateportCity_BattleTentLobby_MapScript2_20874F: @ 820874F @@ -121,7 +121,7 @@ SlateportCity_BattleTentLobby_EventScript_2088AA:: @ 82088AA setvar VAR_0x8004, 1 special sub_81B9D08 compare VAR_RESULT, 0 - goto_if 5, SlateportCity_BattleTentLobby_EventScript_2087E9 + goto_if_ne SlateportCity_BattleTentLobby_EventScript_2087E9 special SavePlayerParty msgbox SlateportCity_BattleTentLobby_Text_2C5810, MSGBOX_DEFAULT @@ -168,7 +168,7 @@ SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950 call SlateportCity_BattleTentLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq SlateportCity_BattleTentLobby_EventScript_208A14 + goto_if_eq SlateportCity_BattleTentLobby_EventScript_208A14 setvar VAR_0x8006, 0 SlateportCity_BattleTentLobby_EventScript_2089AC:: @ 82089AC @@ -182,12 +182,12 @@ SlateportCity_BattleTentLobby_EventScript_2089AC:: @ 82089AC SlateportCity_BattleTentLobby_EventScript_2089C9:: @ 82089C9 applymovement 1, SlateportCity_BattleTentLobby_Movement_2089F8 - applymovement 255, SlateportCity_BattleTentLobby_Movement_2089FF + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentLobby_Movement_2089FF waitmovement 0 opendoor 6, 1 waitdooranim applymovement 1, SlateportCity_BattleTentLobby_Movement_2089FC - applymovement 255, SlateportCity_BattleTentLobby_Movement_208A03 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentLobby_Movement_208A03 waitmovement 0 closedoor 6, 1 waitdooranim @@ -245,12 +245,11 @@ SlateportCity_BattleTentLobby_Movement_208A38:: @ 8208A38 SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D lock faceplayer - checkflag FLAG_0x109 - goto_eq SlateportCity_BattleTentLobby_EventScript_208A74 + goto_if_set FLAG_0x109, SlateportCity_BattleTentLobby_EventScript_208A74 msgbox SlateportCity_BattleTentLobby_Text_208B4E, MSGBOX_DEFAULT giveitem_std ITEM_TM41 compare VAR_RESULT, 0 - goto_eq SlateportCity_BattleTentLobby_EventScript_272054 + goto_if_eq SlateportCity_BattleTentLobby_EventScript_272054 setflag FLAG_0x109 msgbox SlateportCity_BattleTentLobby_Text_208C5C, MSGBOX_DEFAULT release diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index efc0ff565..df573aa7a 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -6,9 +6,8 @@ SlateportCity_Harbor_MapScript1_20C983: @ 820C983 setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 setvar VAR_TEMP_1, 0 compare VAR_0x40A0, 1 - call_if 1, SlateportCity_Harbor_EventScript_20C9A9 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, SlateportCity_Harbor_EventScript_20C9A5 + call_if_eq SlateportCity_Harbor_EventScript_20C9A9 + call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20C9A5 end SlateportCity_Harbor_EventScript_20C9A5:: @ 820C9A5 @@ -43,7 +42,7 @@ SlateportCity_Harbor_EventScript_20C9D3:: @ 820C9D3 SlateportCity_Harbor_EventScript_20C9DF:: @ 820C9DF lockall setvar VAR_0x8008, 3 - applymovement 255, SlateportCity_Harbor_Movement_20CAEF + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_20CAEF waitmovement 0 goto SlateportCity_Harbor_EventScript_20C9F5 end @@ -52,7 +51,7 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 applymovement 7, SlateportCity_Harbor_Movement_2725AA waitmovement 0 applymovement 6, SlateportCity_Harbor_Movement_2725AA - applymovement 255, SlateportCity_Harbor_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A6 waitmovement 0 msgbox SlateportCity_Harbor_Text_20D291, MSGBOX_DEFAULT closemessage @@ -67,13 +66,13 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 setflag FLAG_0x061 setflag FLAG_HIDE_LILCOVE_MOTEL_SCOTT compare VAR_0x8008, 0 - call_if 1, SlateportCity_Harbor_EventScript_20CA89 + call_if_eq SlateportCity_Harbor_EventScript_20CA89 compare VAR_0x8008, 1 - call_if 1, SlateportCity_Harbor_EventScript_20CA9E + call_if_eq SlateportCity_Harbor_EventScript_20CA9E compare VAR_0x8008, 2 - call_if 1, SlateportCity_Harbor_EventScript_20CAB3 + call_if_eq SlateportCity_Harbor_EventScript_20CAB3 compare VAR_0x8008, 3 - call_if 1, SlateportCity_Harbor_EventScript_20CAB3 + call_if_eq SlateportCity_Harbor_EventScript_20CAB3 msgbox SlateportCity_Harbor_Text_20D35A, MSGBOX_DEFAULT closemessage setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE @@ -86,21 +85,21 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 SlateportCity_Harbor_EventScript_20CA89:: @ 820CA89 applymovement 4, SlateportCity_Harbor_Movement_20CAE0 waitmovement 0 - applymovement 255, SlateportCity_Harbor_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725AA waitmovement 0 return SlateportCity_Harbor_EventScript_20CA9E:: @ 820CA9E applymovement 4, SlateportCity_Harbor_Movement_20CAE6 waitmovement 0 - applymovement 255, SlateportCity_Harbor_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A8 waitmovement 0 return SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3 applymovement 4, SlateportCity_Harbor_Movement_20CAEB waitmovement 0 - applymovement 255, SlateportCity_Harbor_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_2725A8 waitmovement 0 return @@ -162,8 +161,7 @@ SlateportCity_Harbor_Movement_20CAEF: @ 820CAEF SlateportCity_Harbor_EventScript_20CAF1:: @ 820CAF1 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_eq SlateportCity_Harbor_EventScript_20CB06 + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20CB06 msgbox SlateportCity_Harbor_Text_20CE20, MSGBOX_DEFAULT release end @@ -176,8 +174,7 @@ SlateportCity_Harbor_EventScript_20CB06:: @ 820CB06 end SlateportCity_Harbor_EventScript_20CB1A:: @ 820CB1A - checkflag FLAG_0x1D0 - goto_eq SlateportCity_Harbor_EventScript_20CB50 + goto_if_set FLAG_0x1D0, SlateportCity_Harbor_EventScript_20CB50 multichoicedefault 18, 8, 56, 2, 0 switch VAR_RESULT case 0, SlateportCity_Harbor_EventScript_20CB92 @@ -202,7 +199,7 @@ SlateportCity_Harbor_EventScript_20CB88:: @ 820CB88 SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 msgbox SlateportCity_Harbor_Text_20CF93, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SlateportCity_Harbor_EventScript_20CBDD + goto_if_eq SlateportCity_Harbor_EventScript_20CBDD setvar VAR_PORTHOLE_STATE, 1 call SlateportCity_Harbor_EventScript_20CBE9 warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 @@ -213,7 +210,7 @@ SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 SlateportCity_Harbor_EventScript_20CBBA:: @ 820CBBA msgbox SlateportCity_Harbor_Text_20CFAE, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SlateportCity_Harbor_EventScript_20CBDD + goto_if_eq SlateportCity_Harbor_EventScript_20CBDD call SlateportCity_Harbor_EventScript_20CBE9 warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 waitstate @@ -234,11 +231,11 @@ SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 delay 30 hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR compare VAR_FACING, 2 - call_if 1, SlateportCity_Harbor_EventScript_20CC42 + call_if_eq SlateportCity_Harbor_EventScript_20CC42 compare VAR_FACING, 4 - call_if 1, SlateportCity_Harbor_EventScript_20CC37 + call_if_eq SlateportCity_Harbor_EventScript_20CC37 delay 30 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 5 call SlateportCity_Harbor_EventScript_2721E2 return @@ -249,12 +246,12 @@ SlateportCity_Harbor_EventScript_20CC2D:: @ 820CC2D end SlateportCity_Harbor_EventScript_20CC37:: @ 820CC37 - applymovement 255, SlateportCity_Harbor_Movement_20CC4D + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_20CC4D waitmovement 0 return SlateportCity_Harbor_EventScript_20CC42:: @ 820CC42 - applymovement 255, SlateportCity_Harbor_Movement_20CC50 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_20CC50 waitmovement 0 return @@ -270,15 +267,12 @@ SlateportCity_Harbor_Movement_20CC50: @ 820CC50 SlateportCity_Harbor_EventScript_20CC52:: @ 820CC52 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SlateportCity_Harbor_EventScript_20CC89 + goto_if_unset FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20CC89 setvar VAR_0x8004, 0 - checkflag FLAG_0x1BE - call_if 1, SlateportCity_Harbor_EventScript_20CC93 - checkflag FLAG_0x1BF - call_if 1, SlateportCity_Harbor_EventScript_20CC93 + call_if_set FLAG_0x1BE, SlateportCity_Harbor_EventScript_20CC93 + call_if_set FLAG_0x1BF, SlateportCity_Harbor_EventScript_20CC93 compare VAR_0x8004, 2 - goto_eq SlateportCity_Harbor_EventScript_20CC89 + goto_if_eq SlateportCity_Harbor_EventScript_20CC89 msgbox SlateportCity_Harbor_Text_20D08E, MSGBOX_DEFAULT release end @@ -299,14 +293,11 @@ SlateportCity_Harbor_EventScript_20CC99:: @ 820CC99 SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 lock faceplayer - checkflag FLAG_BADGE07_GET - goto_eq SlateportCity_Harbor_EventScript_20CD00 - checkflag FLAG_0x10F - goto_eq SlateportCity_Harbor_EventScript_20CCF6 - checkflag FLAG_0x070 - goto_eq SlateportCity_Harbor_EventScript_20CCE9 + goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_20CD00 + goto_if_set FLAG_0x10F, SlateportCity_Harbor_EventScript_20CCF6 + goto_if_set FLAG_0x070, SlateportCity_Harbor_EventScript_20CCE9 compare VAR_0x40A0, 2 - goto_eq SlateportCity_Harbor_EventScript_20CCDF + goto_if_eq SlateportCity_Harbor_EventScript_20CCDF msgbox SlateportCity_Harbor_Text_20D232, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A2 @@ -332,12 +323,11 @@ SlateportCity_Harbor_EventScript_20CCF6:: @ 820CCF6 SlateportCity_Harbor_EventScript_20CD00:: @ 820CD00 compare VAR_TEMP_1, 1 - goto_eq SlateportCity_Harbor_EventScript_20CE11 + goto_if_eq SlateportCity_Harbor_EventScript_20CE11 checkitem ITEM_SCANNER, 1 compare VAR_RESULT, 1 - goto_eq SlateportCity_Harbor_EventScript_20CD38 - checkflag FLAG_SYS_GAME_CLEAR - goto_eq SlateportCity_Harbor_EventScript_20CD2E + goto_if_eq SlateportCity_Harbor_EventScript_20CD38 + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20CD2E msgbox SlateportCity_Harbor_Text_20D65C, MSGBOX_DEFAULT release end @@ -365,10 +355,10 @@ SlateportCity_Harbor_EventScript_20CD44:: @ 820CD44 SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B msgbox SlateportCity_Harbor_Text_20D8BC, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SlateportCity_Harbor_EventScript_20CE05 + goto_if_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_TOOTH compare VAR_RESULT, 0 - goto_eq SlateportCity_Harbor_EventScript_272054 + goto_if_eq SlateportCity_Harbor_EventScript_272054 takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT setflag FLAG_TRADED_SCANNER_TO_STERN @@ -378,10 +368,10 @@ SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB msgbox SlateportCity_Harbor_Text_20D8F1, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SlateportCity_Harbor_EventScript_20CE05 + goto_if_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_SCALE compare VAR_RESULT, 0 - goto_eq SlateportCity_Harbor_EventScript_272054 + goto_if_eq SlateportCity_Harbor_EventScript_272054 takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT setflag FLAG_TRADED_SCANNER_TO_STERN diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc index aaec06a21..2e973663b 100644 --- a/data/maps/SlateportCity_House1/scripts.inc +++ b/data/maps/SlateportCity_House1/scripts.inc @@ -6,9 +6,9 @@ SlateportCity_House1_EventScript_209AA5:: @ 8209AA5 faceplayer msgbox SlateportCity_House1_Text_209B8E, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SlateportCity_House1_EventScript_209AC6 + goto_if_eq SlateportCity_House1_EventScript_209AC6 compare VAR_RESULT, 0 - goto_eq SlateportCity_House1_EventScript_209AE9 + goto_if_eq SlateportCity_House1_EventScript_209AE9 end SlateportCity_House1_EventScript_209AC6:: @ 8209AC6 @@ -16,9 +16,9 @@ SlateportCity_House1_EventScript_209AC6:: @ 8209AC6 special sub_81B94B0 waitstate compare VAR_0x8004, 255 - goto_if 5, SlateportCity_House1_EventScript_209AF3 + goto_if_ne SlateportCity_House1_EventScript_209AF3 compare VAR_0x8004, 255 - goto_eq SlateportCity_House1_EventScript_209AE9 + goto_if_eq SlateportCity_House1_EventScript_209AE9 end SlateportCity_House1_EventScript_209AE9:: @ 8209AE9 @@ -29,20 +29,20 @@ SlateportCity_House1_EventScript_209AE9:: @ 8209AE9 SlateportCity_House1_EventScript_209AF3:: @ 8209AF3 specialvar VAR_RESULT, ScriptGetPartyMonSpecies compare VAR_RESULT, 412 - goto_eq SlateportCity_House1_EventScript_209B46 + goto_if_eq SlateportCity_House1_EventScript_209B46 special TV_CopyNicknameToStringVar1AndEnsureTerminated special TV_CheckMonOTIDEqualsPlayerID compare VAR_RESULT, 1 - goto_eq SlateportCity_House1_EventScript_209B50 + goto_if_eq SlateportCity_House1_EventScript_209B50 specialvar VAR_RESULT, MonOTNameMatchesPlayer special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 - goto_eq SlateportCity_House1_EventScript_209B50 + goto_if_eq SlateportCity_House1_EventScript_209B50 msgbox SlateportCity_House1_Text_209C2B, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SlateportCity_House1_EventScript_209B5A + goto_if_eq SlateportCity_House1_EventScript_209B5A compare VAR_RESULT, 0 - goto_eq SlateportCity_House1_EventScript_209AE9 + goto_if_eq SlateportCity_House1_EventScript_209AE9 end SlateportCity_House1_EventScript_209B46:: @ 8209B46 @@ -61,7 +61,7 @@ SlateportCity_House1_EventScript_209B5A:: @ 8209B5A specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 - goto_eq SlateportCity_House1_EventScript_209B84 + goto_if_eq SlateportCity_House1_EventScript_209B84 msgbox SlateportCity_House1_Text_209D5E, MSGBOX_DEFAULT release end diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index 3c777b184..76bc18873 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -7,14 +7,14 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AD96:: @ 820AD96 SlateportCity_OceanicMuseum_1F_EventScript_20AD9F:: @ 820AD9F lockall - applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_2725A4 waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 end SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0 lockall - applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_2725A8 waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 end @@ -23,12 +23,12 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADC1:: @ 820ADC1 showmoneybox 0, 0, 0 msgbox SlateportCity_OceanicMuseum_1F_Text_20AFD5, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20ADE8 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20ADE8 closemessage hidemoneybox nop nop - applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AE4B + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_20AE4B waitmovement 0 releaseall end @@ -36,7 +36,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADC1:: @ 820ADC1 SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8 checkmoney 0x32, 0 compare VAR_RESULT, 0 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AE18 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AE18 playse SE_REGI takemoney 0x32, 0 updatemoneybox 0, 0 @@ -50,14 +50,13 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8 end SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18 - checkflag FLAG_0x095 - goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE39 + goto_if_unset FLAG_0x095, SlateportCity_OceanicMuseum_1F_EventScript_20AE39 msgbox SlateportCity_OceanicMuseum_1F_Text_20B03D, MSGBOX_DEFAULT closemessage hidemoneybox nop nop - applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AE4B + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_20AE4B waitmovement 0 releaseall end @@ -163,22 +162,22 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, MSGBOX_DEFAULT giveitem_std ITEM_TM46 compare VAR_RESULT, 0 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AFB5 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AFB5 setflag FLAG_0x10D msgbox SlateportCity_OceanicMuseum_1F_Text_20B449, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF6C + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF6C compare VAR_FACING, 1 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF83 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF83 compare VAR_FACING, 3 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 compare VAR_FACING, 4 - goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 end SlateportCity_OceanicMuseum_1F_EventScript_20AF6C:: @ 820AF6C - applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AFBF + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_20AFBF applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFCE waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA @@ -191,7 +190,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AF83:: @ 820AF83 end SlateportCity_OceanicMuseum_1F_EventScript_20AF93:: @ 820AF93 - applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_20AFC4 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_20AFC4 applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_20AFC7 waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_20AFAA diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 040a76396..387ffdabf 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -17,21 +17,21 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF5 waitmovement 0 compare VAR_FACING, 1 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC92 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC92 compare VAR_FACING, 4 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC92 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC92 msgbox SlateportCity_OceanicMuseum_2F_Text_20BE40, MSGBOX_DEFAULT compare VAR_FACING, 4 - call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_20BC9D + call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_20BC9D msgbox SlateportCity_OceanicMuseum_2F_Text_20BE69, MSGBOX_DEFAULT msgbox SlateportCity_OceanicMuseum_2F_Text_20BE93, MSGBOX_DEFAULT closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCE2 waitmovement 0 compare VAR_FACING, 1 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCA8 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BCA8 compare VAR_FACING, 3 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCB3 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BCB3 trainerbattle_no_intro TRAINER_GRUNT_14, SlateportCity_OceanicMuseum_2F_Text_20BEE2 msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, MSGBOX_DEFAULT closemessage @@ -68,7 +68,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 fadescreen 0 delay 30 setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_2725A8 waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, MSGBOX_DEFAULT setvar VAR_0x8004, 269 @@ -82,7 +82,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 removeobject 1 setflag FLAG_HIDE_ROUTE_110_TEAM_AQUA compare VAR_0x40DA, 0 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC8C + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC8C setflag FLAG_0x095 clearflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE @@ -96,7 +96,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BC8C:: @ 820BC8C return SlateportCity_OceanicMuseum_2F_EventScript_20BC92:: @ 820BC92 - applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_2725A4 waitmovement 0 return @@ -106,12 +106,12 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BC9D:: @ 820BC9D return SlateportCity_OceanicMuseum_2F_EventScript_20BCA8:: @ 820BCA8 - applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_20BCBE + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_20BCBE waitmovement 0 return SlateportCity_OceanicMuseum_2F_EventScript_20BCB3:: @ 820BCB3 - applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_20BCC2 + applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_20BCC2 waitmovement 0 return diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index 154438ae2..35fcde577 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -4,10 +4,8 @@ SlateportCity_PokemonFanClub_MapScripts:: @ 8209E95 SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96 lock faceplayer - checkflag FLAG_0x155 - goto_if 0, SlateportCity_PokemonFanClub_EventScript_20A152 - checkflag FLAG_0x156 - call_if 0, SlateportCity_PokemonFanClub_EventScript_20A172 + goto_if_unset FLAG_0x155, SlateportCity_PokemonFanClub_EventScript_20A152 + call_if_unset FLAG_0x156, SlateportCity_PokemonFanClub_EventScript_20A172 switch VAR_0x40B7 case 0, SlateportCity_PokemonFanClub_EventScript_209ED2 case 1, SlateportCity_PokemonFanClub_EventScript_209EE5 @@ -23,20 +21,15 @@ SlateportCity_PokemonFanClub_EventScript_209ED2:: @ 8209ED2 SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5 setvar VAR_TEMP_2, 0 - checkflag FLAG_0x0CC - call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 - checkflag FLAG_0x0CB - call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 - checkflag FLAG_0x0CA - call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 - checkflag FLAG_0x0C9 - call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 - checkflag FLAG_0x0C8 - call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 + call_if_set FLAG_0x0CC, SlateportCity_PokemonFanClub_EventScript_209FD0 + call_if_set FLAG_0x0CB, SlateportCity_PokemonFanClub_EventScript_209FD0 + call_if_set FLAG_0x0CA, SlateportCity_PokemonFanClub_EventScript_209FD0 + call_if_set FLAG_0x0C9, SlateportCity_PokemonFanClub_EventScript_209FD0 + call_if_set FLAG_0x0C8, SlateportCity_PokemonFanClub_EventScript_209FD0 compare VAR_TEMP_2, 5 - call_if 1, SlateportCity_PokemonFanClub_EventScript_209FCA + call_if_eq SlateportCity_PokemonFanClub_EventScript_209FCA compare VAR_0x40B7, 2 - goto_eq SlateportCity_PokemonFanClub_EventScript_209F3B + goto_if_eq SlateportCity_PokemonFanClub_EventScript_209F3B msgbox SlateportCity_PokemonFanClub_Text_20A62A, MSGBOX_DEFAULT goto SlateportCity_PokemonFanClub_EventScript_209F45 end @@ -49,16 +42,11 @@ SlateportCity_PokemonFanClub_EventScript_209F3B:: @ 8209F3B SlateportCity_PokemonFanClub_EventScript_209F45:: @ 8209F45 msgbox SlateportCity_PokemonFanClub_Text_20A65F, MSGBOX_DEFAULT setvar VAR_TEMP_1, 0 - checkflag FLAG_0x0CC - call_if 0, SlateportCity_PokemonFanClub_EventScript_20A13B - checkflag FLAG_0x0CB - call_if 0, SlateportCity_PokemonFanClub_EventScript_20A124 - checkflag FLAG_0x0CA - call_if 0, SlateportCity_PokemonFanClub_EventScript_20A10D - checkflag FLAG_0x0C9 - call_if 0, SlateportCity_PokemonFanClub_EventScript_20A0F6 - checkflag FLAG_0x0C8 - call_if 0, SlateportCity_PokemonFanClub_EventScript_20A0DF + call_if_unset FLAG_0x0CC, SlateportCity_PokemonFanClub_EventScript_20A13B + call_if_unset FLAG_0x0CB, SlateportCity_PokemonFanClub_EventScript_20A124 + call_if_unset FLAG_0x0CA, SlateportCity_PokemonFanClub_EventScript_20A10D + call_if_unset FLAG_0x0C9, SlateportCity_PokemonFanClub_EventScript_20A0F6 + call_if_unset FLAG_0x0C8, SlateportCity_PokemonFanClub_EventScript_20A0DF bufferleadmonspeciesname 0 switch VAR_TEMP_1 case 0, SlateportCity_PokemonFanClub_EventScript_209FD6 @@ -86,7 +74,7 @@ SlateportCity_PokemonFanClub_EventScript_209FD6:: @ 8209FD6 SlateportCity_PokemonFanClub_EventScript_209FE0:: @ 8209FE0 checkitemspace ITEM_RED_SCARF, 1 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0C8 giveitem_std ITEM_RED_SCARF @@ -97,7 +85,7 @@ SlateportCity_PokemonFanClub_EventScript_209FE0:: @ 8209FE0 SlateportCity_PokemonFanClub_EventScript_20A011:: @ 820A011 checkitemspace ITEM_BLUE_SCARF, 1 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0C9 giveitem_std ITEM_BLUE_SCARF @@ -108,7 +96,7 @@ SlateportCity_PokemonFanClub_EventScript_20A011:: @ 820A011 SlateportCity_PokemonFanClub_EventScript_20A042:: @ 820A042 checkitemspace ITEM_PINK_SCARF, 1 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0CA giveitem_std ITEM_PINK_SCARF @@ -119,7 +107,7 @@ SlateportCity_PokemonFanClub_EventScript_20A042:: @ 820A042 SlateportCity_PokemonFanClub_EventScript_20A073:: @ 820A073 checkitemspace ITEM_GREEN_SCARF, 1 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0CB giveitem_std ITEM_GREEN_SCARF @@ -130,7 +118,7 @@ SlateportCity_PokemonFanClub_EventScript_20A073:: @ 820A073 SlateportCity_PokemonFanClub_EventScript_20A0A4:: @ 820A0A4 checkitemspace ITEM_YELLOW_SCARF, 1 compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0CC giveitem_std ITEM_YELLOW_SCARF @@ -146,7 +134,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0D5:: @ 820A0D5 SlateportCity_PokemonFanClub_EventScript_20A0DF:: @ 820A0DF specialvar VAR_RESULT, CheckLeadMonCool compare VAR_RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_20A0F0 + call_if_eq SlateportCity_PokemonFanClub_EventScript_20A0F0 return SlateportCity_PokemonFanClub_EventScript_20A0F0:: @ 820A0F0 @@ -156,7 +144,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0F0:: @ 820A0F0 SlateportCity_PokemonFanClub_EventScript_20A0F6:: @ 820A0F6 specialvar VAR_RESULT, CheckLeadMonBeauty compare VAR_RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_20A107 + call_if_eq SlateportCity_PokemonFanClub_EventScript_20A107 return SlateportCity_PokemonFanClub_EventScript_20A107:: @ 820A107 @@ -166,7 +154,7 @@ SlateportCity_PokemonFanClub_EventScript_20A107:: @ 820A107 SlateportCity_PokemonFanClub_EventScript_20A10D:: @ 820A10D specialvar VAR_RESULT, CheckLeadMonCute compare VAR_RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_20A11E + call_if_eq SlateportCity_PokemonFanClub_EventScript_20A11E return SlateportCity_PokemonFanClub_EventScript_20A11E:: @ 820A11E @@ -176,7 +164,7 @@ SlateportCity_PokemonFanClub_EventScript_20A11E:: @ 820A11E SlateportCity_PokemonFanClub_EventScript_20A124:: @ 820A124 specialvar VAR_RESULT, CheckLeadMonSmart compare VAR_RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_20A135 + call_if_eq SlateportCity_PokemonFanClub_EventScript_20A135 return SlateportCity_PokemonFanClub_EventScript_20A135:: @ 820A135 @@ -186,7 +174,7 @@ SlateportCity_PokemonFanClub_EventScript_20A135:: @ 820A135 SlateportCity_PokemonFanClub_EventScript_20A13B:: @ 820A13B specialvar VAR_RESULT, CheckLeadMonTough compare VAR_RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_20A14C + call_if_eq SlateportCity_PokemonFanClub_EventScript_20A14C return SlateportCity_PokemonFanClub_EventScript_20A14C:: @ 820A14C @@ -194,8 +182,7 @@ SlateportCity_PokemonFanClub_EventScript_20A14C:: @ 820A14C return SlateportCity_PokemonFanClub_EventScript_20A152:: @ 820A152 - checkflag FLAG_0x156 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A168 + goto_if_set FLAG_0x156, SlateportCity_PokemonFanClub_EventScript_20A168 msgbox SlateportCity_PokemonFanClub_Text_20A233, MSGBOX_DEFAULT setflag FLAG_0x156 release @@ -214,12 +201,11 @@ SlateportCity_PokemonFanClub_EventScript_20A172:: @ 820A172 SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E lock faceplayer - checkflag FLAG_0x116 - goto_eq SlateportCity_PokemonFanClub_EventScript_20A1DE + goto_if_set FLAG_0x116, SlateportCity_PokemonFanClub_EventScript_20A1DE msgbox SlateportCity_PokemonFanClub_Text_20AA77, MSGBOX_DEFAULT specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 - goto_if 4, SlateportCity_PokemonFanClub_EventScript_20A1A3 + goto_if_ge SlateportCity_PokemonFanClub_EventScript_20A1A3 release end @@ -232,7 +218,7 @@ SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3 msgbox SlateportCity_PokemonFanClub_Text_20AB63, MSGBOX_DEFAULT giveitem_std ITEM_SOOTHE_BELL compare VAR_RESULT, 0 - goto_eq SlateportCity_PokemonFanClub_EventScript_272054 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_272054 setflag FLAG_0x116 release end diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc index 82138168c..da264c2ee 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc @@ -3,14 +3,10 @@ SlateportCity_SternsShipyard_1F_MapScripts:: @ 8207F3F SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40 lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_eq SlateportCity_SternsShipyard_1F_EventScript_207F92 - checkflag FLAG_BADGE07_GET - goto_eq SlateportCity_SternsShipyard_1F_EventScript_207FA6 - checkflag FLAG_0x095 - goto_eq SlateportCity_SternsShipyard_1F_EventScript_207FD9 - checkflag FLAG_0x094 - goto_eq SlateportCity_SternsShipyard_1F_EventScript_207FBA + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_SternsShipyard_1F_EventScript_207F92 + goto_if_set FLAG_BADGE07_GET, SlateportCity_SternsShipyard_1F_EventScript_207FA6 + goto_if_set FLAG_0x095, SlateportCity_SternsShipyard_1F_EventScript_207FD9 + goto_if_set FLAG_0x094, SlateportCity_SternsShipyard_1F_EventScript_207FBA msgbox SlateportCity_SternsShipyard_1F_Text_208008, MSGBOX_DEFAULT applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E waitmovement 0 diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index de6ca59db..ceff8f4e4 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -7,12 +7,9 @@ SootopolisCity_MapScripts:: @ 81E565C .byte 0 SootopolisCity_MapScript1_1E5676: @ 81E5676 - checkflag FLAG_0x09E - call_if 0, SootopolisCity_EventScript_1E56E5 - checkflag FLAG_0x081 - goto_if 0, SootopolisCity_EventScript_1E5692 - checkflag FLAG_0x09E - call_if 0, SootopolisCity_EventScript_1E5693 + call_if_unset FLAG_0x09E, SootopolisCity_EventScript_1E56E5 + goto_if_unset FLAG_0x081, SootopolisCity_EventScript_1E5692 + call_if_unset FLAG_0x09E, SootopolisCity_EventScript_1E5693 end SootopolisCity_EventScript_1E5692:: @ 81E5692 @@ -37,31 +34,31 @@ SootopolisCity_EventScript_1E56E5:: @ 81E56E5 SootopolisCity_MapScript1_1E56EF: @ 81E56EF setflag FLAG_VISITED_SOOTOPOLIS_CITY compare VAR_0x405E, 1 - call_if 1, SootopolisCity_EventScript_1E5781 + call_if_eq SootopolisCity_EventScript_1E5781 compare VAR_0x40CA, 1 - call_if 1, SootopolisCity_EventScript_1E5781 + call_if_eq SootopolisCity_EventScript_1E5781 call SootopolisCity_EventScript_1E5805 call SootopolisCity_EventScript_1E57B2 compare VAR_0x405E, 1 - call_if 1, SootopolisCity_EventScript_1E5785 + call_if_eq SootopolisCity_EventScript_1E5785 compare VAR_0x405E, 2 - call_if 1, SootopolisCity_EventScript_1E5785 + call_if_eq SootopolisCity_EventScript_1E5785 compare VAR_0x405E, 3 - call_if 1, SootopolisCity_EventScript_1E5785 + call_if_eq SootopolisCity_EventScript_1E5785 compare VAR_0x405E, 4 - call_if 1, SootopolisCity_EventScript_1E5785 + call_if_eq SootopolisCity_EventScript_1E5785 compare VAR_0x405E, 5 - call_if 1, SootopolisCity_EventScript_1E5785 + call_if_eq SootopolisCity_EventScript_1E5785 compare VAR_0x405E, 2 - call_if 1, SootopolisCity_EventScript_1E5842 + call_if_eq SootopolisCity_EventScript_1E5842 compare VAR_0x405E, 3 - call_if 1, SootopolisCity_EventScript_1E5842 + call_if_eq SootopolisCity_EventScript_1E5842 compare VAR_0x405E, 4 - call_if 1, SootopolisCity_EventScript_1E585B + call_if_eq SootopolisCity_EventScript_1E585B compare VAR_0x405E, 5 - call_if 1, SootopolisCity_EventScript_1E5871 + call_if_eq SootopolisCity_EventScript_1E5871 compare VAR_0x405E, 6 - call_if 1, SootopolisCity_EventScript_1E58D3 + call_if_eq SootopolisCity_EventScript_1E58D3 end SootopolisCity_EventScript_1E5781:: @ 81E5781 @@ -81,19 +78,19 @@ SootopolisCity_EventScript_1E5785:: @ 81E5785 SootopolisCity_EventScript_1E57B2:: @ 81E57B2 compare VAR_0x405E, 0 - goto_eq SootopolisCity_EventScript_1E5800 + goto_if_eq SootopolisCity_EventScript_1E5800 compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E5800 + goto_if_ge SootopolisCity_EventScript_1E5800 compare VAR_0x405E, 1 - goto_eq SootopolisCity_EventScript_1E5801 + goto_if_eq SootopolisCity_EventScript_1E5801 compare VAR_0x405E, 2 - goto_eq SootopolisCity_EventScript_1E5801 + goto_if_eq SootopolisCity_EventScript_1E5801 compare VAR_0x405E, 3 - goto_eq SootopolisCity_EventScript_1E5801 + goto_if_eq SootopolisCity_EventScript_1E5801 compare VAR_0x405E, 4 - goto_eq SootopolisCity_EventScript_1E5801 + goto_if_eq SootopolisCity_EventScript_1E5801 compare VAR_0x40CA, 1 - goto_if 3, SootopolisCity_EventScript_1E5801 + goto_if_le SootopolisCity_EventScript_1E5801 return SootopolisCity_EventScript_1E5800:: @ 81E5800 @@ -105,27 +102,26 @@ SootopolisCity_EventScript_1E5801:: @ 81E5801 SootopolisCity_EventScript_1E5805:: @ 81E5805 compare VAR_0x405E, 0 - goto_eq SootopolisCity_EventScript_1E583D + goto_if_eq SootopolisCity_EventScript_1E583D compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E583D + goto_if_ge SootopolisCity_EventScript_1E583D compare VAR_0x405E, 1 - goto_eq SootopolisCity_EventScript_1E583E + goto_if_eq SootopolisCity_EventScript_1E583E compare VAR_0x40CA, 1 - goto_eq SootopolisCity_EventScript_1E583E + goto_if_eq SootopolisCity_EventScript_1E583E compare VAR_0x40CA, 1 - goto_if 3, SootopolisCity_EventScript_27207A + goto_if_le SootopolisCity_EventScript_27207A return SootopolisCity_EventScript_1E583D:: @ 81E583D return SootopolisCity_EventScript_1E583E:: @ 81E583E - setweather 13 + setweather WEATHER_RAIN_HEAVY return SootopolisCity_EventScript_1E5842:: @ 81E5842 - checkflag FLAG_0x133 - goto_eq SootopolisCity_EventScript_1E584C + goto_if_set FLAG_0x133, SootopolisCity_EventScript_1E584C return SootopolisCity_EventScript_1E584C:: @ 81E584C @@ -145,11 +141,11 @@ SootopolisCity_EventScript_1E5871:: @ 81E5871 setobjectxyperm 16, 33, 35 setobjectxyperm 17, 34, 35 compare VAR_0x40D8, 0 - call_if 1, SootopolisCity_EventScript_1E58AF + call_if_eq SootopolisCity_EventScript_1E58AF compare VAR_0x40D8, 1 - call_if 1, SootopolisCity_EventScript_1E58BB + call_if_eq SootopolisCity_EventScript_1E58BB compare VAR_0x40D8, 2 - call_if 1, SootopolisCity_EventScript_1E58C7 + call_if_eq SootopolisCity_EventScript_1E58C7 return SootopolisCity_EventScript_1E58AF:: @ 81E58AF @@ -177,17 +173,17 @@ SootopolisCity_MapScript2_1E58DB: @ 81E58DB SootopolisCity_EventScript_1E58E5:: @ 81E58E5 compare VAR_0x40CA, 1 - call_if 1, SootopolisCity_EventScript_1E58FC + call_if_eq SootopolisCity_EventScript_1E58FC compare VAR_0x40CA, 2 - call_if 1, SootopolisCity_EventScript_1E5901 + call_if_eq SootopolisCity_EventScript_1E5901 end SootopolisCity_EventScript_1E58FC:: @ 81E58FC - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 return SootopolisCity_EventScript_1E5901:: @ 81E5901 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 setvar VAR_0x40CA, 3 return @@ -204,21 +200,21 @@ SootopolisCity_EventScript_1E5926:: @ 81E5926 lockall special StorePlayerCoordsInVars compare VAR_0x8004, 43 - goto_if 5, SootopolisCity_EventScript_1E5A82 + goto_if_ne SootopolisCity_EventScript_1E5A82 compare VAR_0x8005, 32 - goto_if 5, SootopolisCity_EventScript_1E5A82 + goto_if_ne SootopolisCity_EventScript_1E5A82 goto SootopolisCity_EventScript_1E5946 end SootopolisCity_EventScript_1E5946:: @ 81E5946 delay 60 - special SpawnScriptEventObject - applymovement 127, SootopolisCity_Movement_1E5A68 + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5A68 waitmovement 0 - special RemoveScriptEventObject + special RemoveCameraObject delay 60 fadescreenspeed 1, 8 - setweather 15 + setweather WEATHER_15 doweather setvar VAR_0x8004, 0 special sub_813B7D8 @@ -269,12 +265,12 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946 applymovement 10, SootopolisCity_Movement_1E5BCF applymovement 9, SootopolisCity_Movement_1E5BF0 waitmovement 0 - special SpawnScriptEventObject + special SpawnCameraObject applymovement 10, SootopolisCity_Movement_1E5BD6 applymovement 9, SootopolisCity_Movement_1E5BF7 - applymovement 127, SootopolisCity_Movement_1E5A75 + applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5A75 waitmovement 0 - special RemoveScriptEventObject + special RemoveCameraObject setvar VAR_0x405E, 2 clearflag FLAG_SPECIAL_FLAG_0x4000 releaseall @@ -312,13 +308,13 @@ SootopolisCity_Movement_1E5A75: @ 81E5A75 SootopolisCity_EventScript_1E5A82:: @ 81E5A82 delay 60 - special SpawnScriptEventObject - applymovement 127, SootopolisCity_Movement_1E5BA4 + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5BA4 waitmovement 0 - special RemoveScriptEventObject + special RemoveCameraObject delay 60 fadescreenspeed 1, 8 - setweather 15 + setweather WEATHER_15 doweather setvar VAR_0x8004, 0 special sub_813B7D8 @@ -369,12 +365,12 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82 applymovement 10, SootopolisCity_Movement_1E5BCF applymovement 9, SootopolisCity_Movement_1E5BF0 waitmovement 0 - special SpawnScriptEventObject + special SpawnCameraObject applymovement 10, SootopolisCity_Movement_1E5BD6 applymovement 9, SootopolisCity_Movement_1E5BF7 - applymovement 127, SootopolisCity_Movement_1E5BAE + applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5BAE waitmovement 0 - special RemoveScriptEventObject + special RemoveCameraObject setvar VAR_0x405E, 2 clearflag FLAG_SPECIAL_FLAG_0x4000 releaseall @@ -494,18 +490,18 @@ SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE lockall special StorePlayerCoordsInVars compare VAR_0x8004, 43 - goto_if 5, SootopolisCity_EventScript_1E5CCE + goto_if_ne SootopolisCity_EventScript_1E5CCE compare VAR_0x8005, 32 - goto_if 5, SootopolisCity_EventScript_1E5CCE + goto_if_ne SootopolisCity_EventScript_1E5CCE goto SootopolisCity_EventScript_1E5C1E end SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E delay 60 - special SpawnScriptEventObject - applymovement 127, SootopolisCity_Movement_1E5A68 + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5A68 waitmovement 0 - special RemoveScriptEventObject + special RemoveCameraObject delay 60 fadescreenspeed 1, 8 call SootopolisCity_EventScript_1E5D82 @@ -516,8 +512,8 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E special sub_813B7D8 waitstate playse SE_T_KAMI - special SpawnScriptEventObject - applymovement 127, SootopolisCity_Movement_1E5E63 + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5E63 waitmovement 0 waitse playmoncry SPECIES_RAYQUAZA, 2 @@ -536,7 +532,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E special sub_8139560 waitstate waitmoncry - setweather 0 + setweather WEATHER_NONE doweather applymovement 11, SootopolisCity_Movement_1E5E5B waitmovement 0 @@ -555,10 +551,10 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE delay 60 - special SpawnScriptEventObject - applymovement 127, SootopolisCity_Movement_1E5BA4 + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5BA4 waitmovement 0 - special RemoveScriptEventObject + special RemoveCameraObject delay 60 fadescreenspeed 1, 8 call SootopolisCity_EventScript_1E5D82 @@ -568,9 +564,9 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE setvar VAR_0x8004, 1 special sub_813B7D8 waitstate - special SpawnScriptEventObject - applymovement 127, SootopolisCity_Movement_1E5E63 - applymovement 255, SootopolisCity_Movement_1E5E68 + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5E63 + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E5E68 waitmovement 0 waitse playmoncry SPECIES_RAYQUAZA, 2 @@ -589,7 +585,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE special sub_8139560 waitstate waitmoncry - setweather 0 + setweather WEATHER_NONE doweather applymovement 11, SootopolisCity_Movement_1E5E5B waitmovement 0 @@ -699,11 +695,11 @@ SootopolisCity_EventScript_1E5E8D:: @ 81E5E8D lock faceplayer compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E5EC4 + goto_if_ge SootopolisCity_EventScript_1E5EC4 compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E5ECE + goto_if_eq SootopolisCity_EventScript_1E5ECE compare VAR_0x405E, 2 - goto_if 4, SootopolisCity_EventScript_1E5EBA + goto_if_ge SootopolisCity_EventScript_1E5EBA msgbox SootopolisCity_Text_1E6D77, MSGBOX_DEFAULT release end @@ -727,11 +723,11 @@ SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8 lock faceplayer compare VAR_0x405E, 1 - goto_if 3, SootopolisCity_EventScript_1E5F1B + goto_if_le SootopolisCity_EventScript_1E5F1B compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E5F1B + goto_if_ge SootopolisCity_EventScript_1E5F1B compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E5F10 + goto_if_eq SootopolisCity_EventScript_1E5F10 msgbox SootopolisCity_Text_1E6BFF, MSGBOX_DEFAULT closemessage applymovement 3, SootopolisCity_Movement_2725A2 @@ -748,28 +744,27 @@ SootopolisCity_EventScript_1E5F10:: @ 81E5F10 SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B dodailyevents special GetPlayerBigGuyGirlString - checkflag FLAG_0x932 - goto_eq SootopolisCity_EventScript_1E5FBB + goto_if_set FLAG_0x932, SootopolisCity_EventScript_1E5FBB msgbox SootopolisCity_Text_2A7BB0, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 - goto_eq SootopolisCity_EventScript_272054 + goto_if_eq SootopolisCity_EventScript_272054 setflag FLAG_0x932 msgbox SootopolisCity_Text_2A7C7C, MSGBOX_DEFAULT random 2 compare VAR_RESULT, 0 - goto_eq SootopolisCity_EventScript_1E5F79 + goto_if_eq SootopolisCity_EventScript_1E5F79 compare VAR_RESULT, 1 - goto_eq SootopolisCity_EventScript_1E5F9A + goto_if_eq SootopolisCity_EventScript_1E5F9A end SootopolisCity_EventScript_1E5F79:: @ 81E5F79 giveitem_std ITEM_FIGY_BERRY compare VAR_RESULT, 0 - goto_eq SootopolisCity_EventScript_272054 + goto_if_eq SootopolisCity_EventScript_272054 msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT release end @@ -777,7 +772,7 @@ SootopolisCity_EventScript_1E5F79:: @ 81E5F79 SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A giveitem_std ITEM_IAPAPA_BERRY compare VAR_RESULT, 0 - goto_eq SootopolisCity_EventScript_272054 + goto_if_eq SootopolisCity_EventScript_272054 msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT release end @@ -785,7 +780,7 @@ SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A SootopolisCity_EventScript_1E5FBB:: @ 81E5FBB msgbox SootopolisCity_Text_2A7CEC, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SootopolisCity_EventScript_1E5FD8 + goto_if_eq SootopolisCity_EventScript_1E5FD8 msgbox SootopolisCity_Text_2A7DD2, MSGBOX_DEFAULT release end @@ -800,7 +795,7 @@ SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2 applymovement 2, SootopolisCity_Movement_27259E waitmovement 0 compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E600D + goto_if_eq SootopolisCity_EventScript_1E600D msgbox SootopolisCity_Text_1E71A1, MSGBOX_DEFAULT closemessage applymovement 2, SootopolisCity_Movement_2725A2 @@ -817,7 +812,7 @@ SootopolisCity_EventScript_1E6017:: @ 81E6017 lock faceplayer compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E602E + goto_if_ge SootopolisCity_EventScript_1E602E msgbox SootopolisCity_Text_1E6CCA, MSGBOX_DEFAULT release end @@ -831,11 +826,11 @@ SootopolisCity_EventScript_1E6038:: @ 81E6038 lock faceplayer compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E607A + goto_if_ge SootopolisCity_EventScript_1E607A compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E6084 + goto_if_eq SootopolisCity_EventScript_1E6084 compare VAR_0x405E, 2 - goto_if 4, SootopolisCity_EventScript_1E6065 + goto_if_ge SootopolisCity_EventScript_1E6065 msgbox SootopolisCity_Text_1E6F90, MSGBOX_DEFAULT release end @@ -863,11 +858,11 @@ SootopolisCity_EventScript_1E608E:: @ 81E608E applymovement 4, SootopolisCity_Movement_27259E waitmovement 0 compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E60D9 + goto_if_eq SootopolisCity_EventScript_1E60D9 compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E60CF + goto_if_ge SootopolisCity_EventScript_1E60CF compare VAR_0x405E, 1 - goto_if 3, SootopolisCity_EventScript_1E60CF + goto_if_le SootopolisCity_EventScript_1E60CF msgbox SootopolisCity_Text_1E690B, MSGBOX_DEFAULT closemessage applymovement 4, SootopolisCity_Movement_2725A2 @@ -890,13 +885,12 @@ SootopolisCity_EventScript_1E60E3:: @ 81E60E3 applymovement 5, SootopolisCity_Movement_27259E waitmovement 0 compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E612D - checkflag FLAG_SYS_GAME_CLEAR - goto_eq SootopolisCity_EventScript_1E6137 + goto_if_eq SootopolisCity_EventScript_1E612D + goto_if_set FLAG_SYS_GAME_CLEAR, SootopolisCity_EventScript_1E6137 compare VAR_0x405E, 6 - goto_if 4, SootopolisCity_EventScript_1E6141 + goto_if_ge SootopolisCity_EventScript_1E6141 compare VAR_0x405E, 1 - goto_if 3, SootopolisCity_EventScript_1E6141 + goto_if_le SootopolisCity_EventScript_1E6141 msgbox SootopolisCity_Text_1E6692, MSGBOX_DEFAULT closemessage applymovement 5, SootopolisCity_Movement_2725A2 @@ -935,16 +929,14 @@ SootopolisCity_EventScript_1E6166:: @ 81E6166 lockall applymovement 7, SootopolisCity_Movement_27259E waitmovement 0 - checkflag FLAG_0x133 - call_if 0, SootopolisCity_EventScript_1E61CC + call_if_unset FLAG_0x133, SootopolisCity_EventScript_1E61CC compare VAR_0x405E, 2 - goto_eq SootopolisCity_EventScript_1E61AE + goto_if_eq SootopolisCity_EventScript_1E61AE compare VAR_0x405E, 3 - goto_eq SootopolisCity_EventScript_1E61C2 + goto_if_eq SootopolisCity_EventScript_1E61C2 compare VAR_0x405E, 4 - goto_eq SootopolisCity_EventScript_1E61C2 - checkflag FLAG_0x09E - goto_eq SootopolisCity_EventScript_1E61B8 + goto_if_eq SootopolisCity_EventScript_1E61C2 + goto_if_set FLAG_0x09E, SootopolisCity_EventScript_1E61B8 msgbox SootopolisCity_Text_1E78E5, MSGBOX_DEFAULT releaseall end @@ -968,24 +960,24 @@ SootopolisCity_EventScript_1E61CC:: @ 81E61CC msgbox SootopolisCity_Text_1E75CB, MSGBOX_DEFAULT closemessage compare VAR_FACING, 3 - call_if 1, SootopolisCity_EventScript_1E6243 + call_if_eq SootopolisCity_EventScript_1E6243 compare VAR_FACING, 2 - call_if 1, SootopolisCity_EventScript_1E6255 + call_if_eq SootopolisCity_EventScript_1E6255 msgbox SootopolisCity_Text_1E7737, MSGBOX_DEFAULT closemessage applymovement 7, SootopolisCity_Movement_1E62D4 - applymovement 255, SootopolisCity_Movement_1E630E + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E630E waitmovement 0 delay 120 applymovement 1, SootopolisCity_Movement_1E6341 waitmovement 0 applymovement 7, SootopolisCity_Movement_1E6344 - applymovement 255, SootopolisCity_Movement_1E634F + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E634F waitmovement 0 msgbox SootopolisCity_Text_1E77F0, MSGBOX_DEFAULT closemessage setflag FLAG_0x133 - applymovement 255, SootopolisCity_Movement_1E635A + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E635A waitmovement 0 warp MAP_CAVE_OF_ORIGIN_ENTRANCE, 255, 9, 20 waitstate @@ -993,13 +985,13 @@ SootopolisCity_EventScript_1E61CC:: @ 81E61CC SootopolisCity_EventScript_1E6243:: @ 81E6243 applymovement 7, SootopolisCity_Movement_1E6267 - applymovement 255, SootopolisCity_Movement_1E628C + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E628C waitmovement 0 return SootopolisCity_EventScript_1E6255:: @ 81E6255 applymovement 7, SootopolisCity_Movement_1E6267 - applymovement 255, SootopolisCity_Movement_1E62B0 + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E62B0 waitmovement 0 return @@ -1272,7 +1264,7 @@ SootopolisCity_EventScript_1E635D:: @ 81E635D applymovement 15, SootopolisCity_Movement_27259E waitmovement 0 compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E6388 + goto_if_eq SootopolisCity_EventScript_1E6388 msgbox SootopolisCity_Text_1E67DC, MSGBOX_DEFAULT closemessage applymovement 15, SootopolisCity_Movement_2725A2 @@ -1289,7 +1281,7 @@ SootopolisCity_EventScript_1E6388:: @ 81E6388 SootopolisCity_EventScript_1E6393:: @ 81E6393 lockall compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E63C7 + goto_if_eq SootopolisCity_EventScript_1E63C7 msgbox SootopolisCity_Text_1E6936, MSGBOX_DEFAULT closemessage applymovement 14, SootopolisCity_Movement_27259E @@ -1313,7 +1305,7 @@ SootopolisCity_EventScript_1E63DB:: @ 81E63DB applymovement 13, SootopolisCity_Movement_27259E waitmovement 0 compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E6406 + goto_if_eq SootopolisCity_EventScript_1E6406 msgbox SootopolisCity_Text_1E6C7C, MSGBOX_DEFAULT closemessage applymovement 13, SootopolisCity_Movement_2725A2 @@ -1332,7 +1324,7 @@ SootopolisCity_EventScript_1E6411:: @ 81E6411 applymovement 12, SootopolisCity_Movement_27259E waitmovement 0 compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E643C + goto_if_eq SootopolisCity_EventScript_1E643C msgbox SootopolisCity_Text_1E6A50, MSGBOX_DEFAULT closemessage applymovement 12, SootopolisCity_Movement_2725A2 @@ -1349,11 +1341,9 @@ SootopolisCity_EventScript_1E6446:: @ 81E6446 lock faceplayer compare VAR_0x405E, 4 - goto_eq SootopolisCity_EventScript_1E64D8 - checkflag FLAG_0x138 - goto_eq SootopolisCity_EventScript_1E64E2 - checkflag FLAG_0x09E - goto_eq SootopolisCity_EventScript_1E646F + goto_if_eq SootopolisCity_EventScript_1E64D8 + goto_if_set FLAG_0x138, SootopolisCity_EventScript_1E64E2 + goto_if_set FLAG_0x09E, SootopolisCity_EventScript_1E646F msgbox SootopolisCity_Text_1E7A3E, MSGBOX_DEFAULT release end @@ -1365,11 +1355,11 @@ SootopolisCity_EventScript_1E646F:: @ 81E646F msgbox SootopolisCity_Text_1E7B86, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 - call_if 1, SootopolisCity_EventScript_1E64B2 + call_if_eq SootopolisCity_EventScript_1E64B2 compare VAR_FACING, 4 - call_if 1, SootopolisCity_EventScript_1E64B2 + call_if_eq SootopolisCity_EventScript_1E64B2 compare VAR_FACING, 3 - call_if 1, SootopolisCity_EventScript_1E64C5 + call_if_eq SootopolisCity_EventScript_1E64C5 release end @@ -1410,7 +1400,7 @@ SootopolisCity_Movement_1E64EF: @ 81E64EF SootopolisCity_EventScript_1E64F2:: @ 81E64F2 lockall compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E6509 + goto_if_eq SootopolisCity_EventScript_1E6509 msgbox SootopolisCity_Text_1E72DB, MSGBOX_DEFAULT closemessage releaseall @@ -1419,15 +1409,14 @@ SootopolisCity_EventScript_1E64F2:: @ 81E64F2 SootopolisCity_EventScript_1E6509:: @ 81E6509 msgbox SootopolisCity_Text_1E737E, MSGBOX_DEFAULT setflag FLAG_0x135 - checkflag FLAG_0x134 - goto_eq SootopolisCity_EventScript_1E654C + goto_if_set FLAG_0x134, SootopolisCity_EventScript_1E654C releaseall end SootopolisCity_EventScript_1E651F:: @ 81E651F lockall compare VAR_0x405E, 5 - goto_eq SootopolisCity_EventScript_1E6536 + goto_if_eq SootopolisCity_EventScript_1E6536 msgbox SootopolisCity_Text_1E7460, MSGBOX_DEFAULT closemessage releaseall @@ -1436,8 +1425,7 @@ SootopolisCity_EventScript_1E651F:: @ 81E651F SootopolisCity_EventScript_1E6536:: @ 81E6536 msgbox SootopolisCity_Text_1E74F6, MSGBOX_DEFAULT setflag FLAG_0x134 - checkflag FLAG_0x135 - goto_eq SootopolisCity_EventScript_1E654C + goto_if_set FLAG_0x135, SootopolisCity_EventScript_1E654C releaseall end diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 570f936b5..e4f062fe3 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -20,11 +20,11 @@ SootopolisCity_Gym_1F_MapScript1_224E6A: @ 8224E6A SootopolisCity_Gym_1F_EventScript_224E73:: @ 8224E73 compare VAR_ICE_STEP_COUNT, 8 - goto_if 0, SootopolisCity_Gym_1F_EventScript_224ECA + goto_if_lt SootopolisCity_Gym_1F_EventScript_224ECA compare VAR_ICE_STEP_COUNT, 28 - goto_if 0, SootopolisCity_Gym_1F_EventScript_224EB8 + goto_if_lt SootopolisCity_Gym_1F_EventScript_224EB8 compare VAR_ICE_STEP_COUNT, 67 - goto_if 0, SootopolisCity_Gym_1F_EventScript_224EA6 + goto_if_lt SootopolisCity_Gym_1F_EventScript_224EA6 setmetatile 8, 4, 519, 0 setmetatile 8, 5, 519, 0 @@ -73,7 +73,7 @@ SootopolisCity_Gym_1F_EventScript_224F15:: @ 8224F15 SootopolisCity_Gym_1F_EventScript_224F29:: @ 8224F29 lockall delay 20 - applymovement 255, SootopolisCity_Gym_1F_Movement_224F42 + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Gym_1F_Movement_224F42 waitmovement 0 playse SE_RU_HYUU delay 60 @@ -89,11 +89,9 @@ 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 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq SootopolisCity_Gym_1F_EventScript_225025 - checkflag FLAG_0x0AC - goto_if 0, SootopolisCity_Gym_1F_EventScript_224FF7 - checkflag FLAG_BADGE06_GET - goto_if 0, SootopolisCity_Gym_1F_EventScript_22501B + goto_if_eq SootopolisCity_Gym_1F_EventScript_225025 + goto_if_unset FLAG_0x0AC, SootopolisCity_Gym_1F_EventScript_224FF7 + goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_22501B msgbox SootopolisCity_Gym_1F_Text_225778, MSGBOX_DEFAULT release end @@ -127,7 +125,7 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 giveitem_std ITEM_TM03 compare VAR_RESULT, 0 - goto_eq SootopolisCity_Gym_1F_EventScript_27205E + goto_if_eq SootopolisCity_Gym_1F_EventScript_27205E msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT setflag FLAG_0x0AC return @@ -135,7 +133,7 @@ SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 SootopolisCity_Gym_1F_EventScript_224FF7:: @ 8224FF7 giveitem_std ITEM_TM03 compare VAR_RESULT, 0 - goto_eq SootopolisCity_Gym_1F_EventScript_272054 + goto_if_eq SootopolisCity_Gym_1F_EventScript_272054 msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT setflag FLAG_0x0AC release @@ -154,8 +152,7 @@ SootopolisCity_Gym_1F_EventScript_225025:: @ 8225025 SootopolisCity_Gym_1F_EventScript_225040:: @ 8225040 lock faceplayer - checkflag FLAG_0x4F7 - goto_eq SootopolisCity_Gym_1F_EventScript_225055 + goto_if_set FLAG_0x4F7, SootopolisCity_Gym_1F_EventScript_225055 msgbox SootopolisCity_Gym_1F_Text_225093, MSGBOX_DEFAULT release end @@ -167,15 +164,13 @@ SootopolisCity_Gym_1F_EventScript_225055:: @ 8225055 SootopolisCity_Gym_1F_EventScript_22505F:: @ 822505F lockall - checkflag FLAG_BADGE08_GET - goto_eq SootopolisCity_Gym_1F_EventScript_22507F + goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_22507F goto SootopolisCity_Gym_1F_EventScript_225089 end SootopolisCity_Gym_1F_EventScript_22506F:: @ 822506F lockall - checkflag FLAG_BADGE08_GET - goto_eq SootopolisCity_Gym_1F_EventScript_22507F + goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_22507F goto SootopolisCity_Gym_1F_EventScript_225089 end diff --git a/data/maps/SootopolisCity_House1/scripts.inc b/data/maps/SootopolisCity_House1/scripts.inc index 3a41c70eb..5b59c3033 100644 --- a/data/maps/SootopolisCity_House1/scripts.inc +++ b/data/maps/SootopolisCity_House1/scripts.inc @@ -4,12 +4,11 @@ SootopolisCity_House1_MapScripts:: @ 822694C SootopolisCity_House1_EventScript_22694D:: @ 822694D lock faceplayer - checkflag FLAG_0x079 - goto_eq SootopolisCity_House1_EventScript_226984 + goto_if_set FLAG_0x079, SootopolisCity_House1_EventScript_226984 msgbox SootopolisCity_House1_Text_2269A1, MSGBOX_DEFAULT giveitem_std ITEM_TM31 compare VAR_RESULT, 0 - goto_eq SootopolisCity_House1_EventScript_272054 + goto_if_eq SootopolisCity_House1_EventScript_272054 setflag FLAG_0x079 msgbox SootopolisCity_House1_Text_226A13, MSGBOX_DEFAULT release diff --git a/data/maps/SootopolisCity_House2/scripts.inc b/data/maps/SootopolisCity_House2/scripts.inc index 676ec4ed2..9e45a09bf 100644 --- a/data/maps/SootopolisCity_House2/scripts.inc +++ b/data/maps/SootopolisCity_House2/scripts.inc @@ -6,9 +6,9 @@ SootopolisCity_House2_EventScript_226A77:: @ 8226A77 faceplayer msgbox SootopolisCity_House2_Text_226AAB, MSGBOX_YESNO compare VAR_RESULT, 1 - call_if 1, SootopolisCity_House2_EventScript_226A99 + call_if_eq SootopolisCity_House2_EventScript_226A99 compare VAR_RESULT, 0 - call_if 1, SootopolisCity_House2_EventScript_226AA2 + call_if_eq SootopolisCity_House2_EventScript_226AA2 release end diff --git a/data/maps/SootopolisCity_House3/scripts.inc b/data/maps/SootopolisCity_House3/scripts.inc index ec8ad87ed..d7439f18d 100644 --- a/data/maps/SootopolisCity_House3/scripts.inc +++ b/data/maps/SootopolisCity_House3/scripts.inc @@ -6,7 +6,7 @@ SootopolisCity_House3_EventScript_226B72:: @ 8226B72 faceplayer msgbox SootopolisCity_House3_Text_226BA4, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SootopolisCity_House3_EventScript_226B91 + goto_if_eq SootopolisCity_House3_EventScript_226B91 msgbox SootopolisCity_House3_Text_226C44, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc index dbdb1cbae..499c01893 100644 --- a/data/maps/SootopolisCity_House6/scripts.inc +++ b/data/maps/SootopolisCity_House6/scripts.inc @@ -4,15 +4,14 @@ SootopolisCity_House6_MapScripts:: @ 8226F5B SootopolisCity_House6_EventScript_226F5C:: @ 8226F5C lock faceplayer - checkflag FLAG_0x0F5 - goto_eq SootopolisCity_House6_EventScript_226FA3 + goto_if_set FLAG_0x0F5, SootopolisCity_House6_EventScript_226FA3 msgbox SootopolisCity_House6_Text_226FC3, MSGBOX_YESNO compare VAR_RESULT, 0 - call_if 1, SootopolisCity_House6_EventScript_226F99 + call_if_eq SootopolisCity_House6_EventScript_226F99 msgbox SootopolisCity_House6_Text_227034, MSGBOX_DEFAULT givedecoration_std 117 compare VAR_RESULT, 0 - goto_eq SootopolisCity_House6_EventScript_226FAD + goto_if_eq SootopolisCity_House6_EventScript_226FAD setflag FLAG_0x0F5 release end diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc index b8e037ce3..17debe321 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc @@ -10,14 +10,14 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_22722B:: @ 822722B waitstate copyvar VAR_RESULT, VAR_0x8004 compare VAR_RESULT, 255 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227272 + goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227272 special CompareSeedotSize compare VAR_RESULT, 1 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_22727C + goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_22727C compare VAR_RESULT, 2 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227286 + goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227286 compare VAR_RESULT, 3 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227290 + goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227290 release end @@ -40,7 +40,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_227290:: @ 8227290 msgbox SootopolisCity_LotadAndSeedotHouse_Text_227480, MSGBOX_DEFAULT giveitem_std ITEM_ELIXIR compare VAR_RESULT, 0 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_2272B2 + goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_2272B2 closemessage release end @@ -59,14 +59,14 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC:: @ 82272BC waitstate copyvar VAR_RESULT, VAR_0x8004 compare VAR_RESULT, 255 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227303 + goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227303 special CompareLotadSize compare VAR_RESULT, 1 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_22730D + goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_22730D compare VAR_RESULT, 2 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227317 + goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227317 compare VAR_RESULT, 3 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227321 + goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227321 release end @@ -89,7 +89,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_227321:: @ 8227321 msgbox SootopolisCity_LotadAndSeedotHouse_Text_22776C, MSGBOX_DEFAULT giveitem_std ITEM_ELIXIR compare VAR_RESULT, 0 - goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227343 + goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227343 closemessage release end diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc index 6e71ce5e8..94f0a8e9f 100644 --- a/data/maps/SootopolisCity_Mart/scripts.inc +++ b/data/maps/SootopolisCity_Mart/scripts.inc @@ -29,9 +29,8 @@ SootopolisCity_Mart_EventScript_2267C2:: @ 82267C2 lock faceplayer compare VAR_0x40CA, 2 - goto_if 4, SootopolisCity_Mart_EventScript_2267E2 - checkflag FLAG_0x081 - goto_if 0, SootopolisCity_Mart_EventScript_2267E2 + goto_if_ge SootopolisCity_Mart_EventScript_2267E2 + goto_if_unset FLAG_0x081, SootopolisCity_Mart_EventScript_2267E2 msgbox SootopolisCity_Mart_Text_22685D, MSGBOX_DEFAULT release end @@ -45,9 +44,8 @@ SootopolisCity_Mart_EventScript_2267EC:: @ 82267EC lock faceplayer compare VAR_0x40CA, 2 - goto_if 4, SootopolisCity_Mart_EventScript_22680C - checkflag FLAG_0x081 - goto_if 0, SootopolisCity_Mart_EventScript_22680C + goto_if_ge SootopolisCity_Mart_EventScript_22680C + goto_if_unset FLAG_0x081, SootopolisCity_Mart_EventScript_22680C msgbox SootopolisCity_Mart_Text_226928, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index a2073d3f7..18b573fbd 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -7,9 +7,9 @@ SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E setvar VAR_0x8004, 16 special CallFrontierUtilFunc compare VAR_RESULT, 0 - call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D + call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D compare VAR_0x40C0, 0 - call_if 5, SootopolisCity_MysteryEventsHouse_1F_EventScript_227991 + call_if_ne SootopolisCity_MysteryEventsHouse_1F_EventScript_227991 end SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D @@ -32,19 +32,19 @@ SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D: @ 822799D SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 lockall - applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F waitmovement 0 applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_227A21 waitmovement 0 moveobjectoffscreen 1 - applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6 waitmovement 0 compare VAR_0x40C0, 1 - call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04 + call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04 compare VAR_0x40C0, 2 - call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D + call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D compare VAR_0x40C0, 3 - call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16 + call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16 special LoadPlayerParty setvar VAR_0x40C0, 0 releaseall @@ -77,9 +77,9 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24:: @ 8227A24 setvar VAR_0x8004, 16 special CallFrontierUtilFunc compare VAR_RESULT, 1 - goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E + goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E compare VAR_TEMP_1, 1 - goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58 + goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58 msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, MSGBOX_DEFAULT release end @@ -94,27 +94,27 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 special BufferEReaderTrainerName msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 + goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 call SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF compare VAR_RESULT, 0 - goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 + goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227CEB, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 + goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special LoadPlayerParty call SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F compare VAR_RESULT, 0 - goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 + goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special SavePlayerParty special ReducePlayerPartyToSelectedMons msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 - call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE + call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE compare VAR_FACING, 4 - call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10 + call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10 compare VAR_FACING, 3 - call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22 + call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22 warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1 waitstate release @@ -135,19 +135,19 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF:: @ 8227AEF SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE:: @ 8227AFE applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B40 - applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227B34 + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_227B34 waitmovement 0 return SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10:: @ 8227B10 applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B43 - applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227B38 + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_227B38 waitmovement 0 return SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22:: @ 8227B22 applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B40 - applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_227B3C + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_227B3C waitmovement 0 return diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc index 9a6b4b1b3..0de8651d7 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc @@ -13,7 +13,7 @@ SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E: @ 8227E5E SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 lockall - applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3 + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3 waitmovement 0 special CopyEReaderTrainerGreeting msgbox gStringVar4, MSGBOX_DEFAULT @@ -23,14 +23,14 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 special DoSpecialTrainerBattle waitstate compare VAR_RESULT, 3 - call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF + call_if_eq SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF compare VAR_RESULT, 1 - call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD + call_if_eq SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD compare VAR_RESULT, 2 - call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8 + call_if_eq SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8 closemessage special HealPlayerParty - applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9 + applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9 waitmovement 0 special LoadPlayerParty setvar VAR_TEMP_1, 1 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index a4850b9f8..448d66981 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -19,9 +19,8 @@ SootopolisCity_PokemonCenter_1F_EventScript_22650E:: @ 822650E lock faceplayer compare VAR_0x40CA, 2 - goto_if 4, SootopolisCity_PokemonCenter_1F_EventScript_22652E - checkflag FLAG_0x081 - goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_22652E + goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_22652E + goto_if_unset FLAG_0x081, SootopolisCity_PokemonCenter_1F_EventScript_22652E msgbox SootopolisCity_PokemonCenter_1F_Text_22664B, MSGBOX_DEFAULT release end @@ -35,9 +34,8 @@ SootopolisCity_PokemonCenter_1F_EventScript_226538:: @ 8226538 lock faceplayer compare VAR_0x40CA, 2 - goto_if 4, SootopolisCity_PokemonCenter_1F_EventScript_226558 - checkflag FLAG_0x081 - goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_226558 + goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_226558 + goto_if_unset FLAG_0x081, SootopolisCity_PokemonCenter_1F_EventScript_226558 msgbox SootopolisCity_PokemonCenter_1F_Text_22672F, MSGBOX_DEFAULT release end diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index 12d27a61f..388410821 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -11,7 +11,7 @@ SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 faceplayer msgbox SouthernIsland_Exterior_Text_2A69F1, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SouthernIsland_Exterior_EventScript_242A17 + goto_if_eq SouthernIsland_Exterior_EventScript_242A17 msgbox SouthernIsland_Exterior_Text_2A6A5D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, SouthernIsland_Exterior_Movement_2725AA @@ -31,12 +31,12 @@ SouthernIsland_Exterior_EventScript_242A17:: @ 8242A17 end BattleFrontier_OutsideWest_EventScript_242A21:: @ 8242A21 - applymovement 255, BattleFrontier_OutsideWest_Movement_242A37 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_OutsideWest_Movement_242A37 waitmovement 0 return BattleFrontier_OutsideWest_EventScript_242A2C:: @ 8242A2C - applymovement 255, BattleFrontier_OutsideWest_Movement_242A39 + applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_OutsideWest_Movement_242A39 waitmovement 0 return diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index b21fdecab..49c893fa8 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -4,22 +4,21 @@ SouthernIsland_Interior_MapScripts:: @ 8242A45 .byte 0 SouthernIsland_Interior_MapScript1_242A50: @ 8242A50 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, SouthernIsland_Interior_EventScript_242A5A + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SouthernIsland_Interior_EventScript_242A5A end SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, SouthernIsland_Interior_EventScript_27374E + goto_if_ne SouthernIsland_Interior_EventScript_27374E removeobject 2 return SouthernIsland_Interior_MapScript1_242A6E: @ 8242A6E compare VAR_0x40D5, 0 - call_if 1, SouthernIsland_Interior_EventScript_242A8A + call_if_eq SouthernIsland_Interior_EventScript_242A8A compare VAR_0x40D5, 0 - call_if 5, SouthernIsland_Interior_EventScript_242A95 + call_if_ne SouthernIsland_Interior_EventScript_242A95 call SouthernIsland_Interior_EventScript_242AA0 end @@ -36,9 +35,9 @@ SouthernIsland_Interior_EventScript_242A95:: @ 8242A95 SouthernIsland_Interior_EventScript_242AA0:: @ 8242AA0 checkplayergender compare VAR_RESULT, 0 - goto_eq SouthernIsland_Interior_EventScript_242AB8 + goto_if_eq SouthernIsland_Interior_EventScript_242AB8 compare VAR_RESULT, 1 - goto_eq SouthernIsland_Interior_EventScript_242ABE + goto_if_eq SouthernIsland_Interior_EventScript_242ABE end SouthernIsland_Interior_EventScript_242AB8:: @ 8242AB8 @@ -56,18 +55,14 @@ SouthernIsland_Interior_EventScript_242AC4:: @ 8242AC4 end SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 - checkflag FLAG_TEMP_2 - goto_eq SouthernIsland_Interior_EventScript_242B9A - checkflag FLAG_0x1C8 - goto_eq SouthernIsland_Interior_EventScript_242B9A - checkflag FLAG_0x1C9 - goto_eq SouthernIsland_Interior_EventScript_242B9A - checkflag FLAG_SYS_HAS_EON_TICKET - goto_if 0, SouthernIsland_Interior_EventScript_242B9A + goto_if_set FLAG_TEMP_2, SouthernIsland_Interior_EventScript_242B9A + goto_if_set FLAG_0x1C8, SouthernIsland_Interior_EventScript_242B9A + goto_if_set FLAG_0x1C9, SouthernIsland_Interior_EventScript_242B9A + goto_if_unset FLAG_SYS_HAS_EON_TICKET, SouthernIsland_Interior_EventScript_242B9A setflag FLAG_0x0CE setflag FLAG_TEMP_2 - special SpawnScriptEventObject - applymovement 127, SouthernIsland_Interior_Movement_242BCA + special SpawnCameraObject + applymovement EVENT_OBJ_ID_CAMERA, SouthernIsland_Interior_Movement_242BCA waitmovement 0 delay 50 waitse @@ -76,27 +71,27 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 waitmoncry addobject 2 delay 30 - applymovement 127, SouthernIsland_Interior_Movement_242BCE + applymovement EVENT_OBJ_ID_CAMERA, SouthernIsland_Interior_Movement_242BCE applymovement 2, SouthernIsland_Interior_Movement_242BDA waitmovement 0 delay 50 - special RemoveScriptEventObject + special RemoveCameraObject setvar VAR_LAST_TALKED, 2 compare VAR_0x40D5, 0 - call_if 1, SouthernIsland_Interior_EventScript_242BA4 + call_if_eq SouthernIsland_Interior_EventScript_242BA4 compare VAR_0x40D5, 0 - call_if 5, SouthernIsland_Interior_EventScript_242BB7 + call_if_ne SouthernIsland_Interior_EventScript_242BB7 setflag FLAG_SYS_CTRL_OBJ_DELETE special BattleSetup_StartLatiBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq SouthernIsland_Interior_EventScript_242B81 + goto_if_eq SouthernIsland_Interior_EventScript_242B81 compare VAR_RESULT, 4 - goto_eq SouthernIsland_Interior_EventScript_242B8F + goto_if_eq SouthernIsland_Interior_EventScript_242B8F compare VAR_RESULT, 5 - goto_eq SouthernIsland_Interior_EventScript_242B8F + goto_if_eq SouthernIsland_Interior_EventScript_242B8F setflag FLAG_0x1C9 releaseall end diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index b23cc23f1..bd057eac6 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -4,20 +4,18 @@ TerraCave_End_MapScripts:: @ 823B0B0 .byte 0 TerraCave_End_MapScript1_23B0BB: @ 823B0BB - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, TerraCave_End_EventScript_23B0C5 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, TerraCave_End_EventScript_23B0C5 end TerraCave_End_EventScript_23B0C5:: @ 823B0C5 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if 5, TerraCave_End_EventScript_27374E + goto_if_ne TerraCave_End_EventScript_27374E removeobject 1 return TerraCave_End_MapScript1_23B0D9: @ 823B0D9 - checkflag FLAG_0x1BF - call_if 0, TerraCave_End_EventScript_23B0E3 + call_if_unset FLAG_0x1BF, TerraCave_End_EventScript_23B0E3 end TerraCave_End_EventScript_23B0E3:: @ 823B0E3 @@ -27,7 +25,7 @@ TerraCave_End_EventScript_23B0E3:: @ 823B0E3 TerraCave_End_EventScript_23B0EC:: @ 823B0EC lockall - applymovement 255, TerraCave_End_Movement_2725B2 + applymovement EVENT_OBJ_ID_PLAYER, TerraCave_End_Movement_2725B2 waitmovement 0 applymovement 1, TerraCave_End_Movement_23B16E waitmovement 0 @@ -44,11 +42,11 @@ TerraCave_End_EventScript_23B0EC:: @ 823B0EC setvar VAR_TEMP_1, 0 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 1 - goto_eq TerraCave_End_EventScript_23B155 + goto_if_eq TerraCave_End_EventScript_23B155 compare VAR_RESULT, 4 - goto_eq TerraCave_End_EventScript_23B163 + goto_if_eq TerraCave_End_EventScript_23B163 compare VAR_RESULT, 5 - goto_eq TerraCave_End_EventScript_23B163 + goto_if_eq TerraCave_End_EventScript_23B163 setvar VAR_0x4039, 1 setflag FLAG_0x1BF releaseall diff --git a/data/maps/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc index e9117efe2..c3a71d492 100644 --- a/data/maps/TrainerHill_Elevator/scripts.inc +++ b/data/maps/TrainerHill_Elevator/scripts.inc @@ -10,7 +10,7 @@ TrainerHill_Elevator_EventScript_26935F:: @ 826935F end TrainerHill_Elevator_EventScript_269360:: @ 8269360 - applymovement 255, TrainerHill_Elevator_Movement_2693EB + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_2693EB waitmovement 0 releaseall warp MAP_TRAINER_HILL_ROOF, 255, 15, 5 @@ -18,22 +18,22 @@ TrainerHill_Elevator_EventScript_269360:: @ 8269360 end TrainerHill_Elevator_EventScript_269375:: @ 8269375 - applymovement 255, TrainerHill_Elevator_Movement_2693E4 + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_2693E4 waitmovement 0 applymovement 1, TrainerHill_Elevator_Movement_2693EE waitmovement 0 lockall msgbox TrainerHill_Elevator_Text_268F3E, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq TrainerHill_Elevator_EventScript_269360 + goto_if_eq TrainerHill_Elevator_EventScript_269360 releaseall applymovement 1, TrainerHill_Elevator_Movement_2693F0 waitmovement 0 - applymovement 255, TrainerHill_Elevator_Movement_2693DF + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_2693DF waitmovement 0 call TrainerHill_Elevator_EventScript_2693D9 delay 25 - applymovement 255, TrainerHill_Elevator_Movement_2693E7 + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_2693E7 waitmovement 0 warp MAP_TRAINER_HILL_ENTRANCE, 255, 17, 8 waitstate diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index c75c22be2..4d315a158 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -21,17 +21,17 @@ TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0 setvar VAR_0x8004, 9 special sp194_trainer_tower compare VAR_RESULT, 0 - goto_eq TrainerHill_Entrance_EventScript_2680FF - setobjectxy 255, 9, 6 - applymovement 255, TrainerHill_Entrance_Movement_26837F + goto_if_eq TrainerHill_Entrance_EventScript_2680FF + setobjectxy EVENT_OBJ_ID_PLAYER, 9, 6 + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F end TrainerHill_Entrance_EventScript_2680FF:: @ 82680FF setvar VAR_0x8004, 16 special sp194_trainer_tower compare VAR_RESULT, 1 - goto_eq TrainerHill_Entrance_EventScript_26811A - applymovement 255, TrainerHill_Entrance_Movement_26837F + goto_if_eq TrainerHill_Entrance_EventScript_26811A + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F end TrainerHill_Entrance_EventScript_26811A:: @ 826811A @@ -46,7 +46,7 @@ TrainerHill_Entrance_MapScript1_26811B: @ 826811B TrainerHill_Entrance_MapScript1_268128: @ 8268128 compare VAR_TEMP_D, 17 - call_if 1, TrainerHill_Entrance_EventScript_268134 + call_if_eq TrainerHill_Entrance_EventScript_268134 end TrainerHill_Entrance_EventScript_268134:: @ 8268134 @@ -62,7 +62,7 @@ TrainerHill_Entrance_MapScript2_26813E: @ 826813E TrainerHill_Entrance_EventScript_268160:: @ 8268160 lockall - applymovement 255, TrainerHill_Entrance_Movement_268385 + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268385 waitmovement 0 setmetatile 17, 10, 820, 1 special DrawWholeMapView @@ -83,18 +83,18 @@ TrainerHill_Entrance_EventScript_268182:: @ 8268182 TrainerHill_Entrance_EventScript_2681B5:: @ 82681B5 lockall - applymovement 255, TrainerHill_Entrance_Movement_26837F + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F msgbox TrainerHill_Entrance_Text_268689, MSGBOX_DEFAULT goto TrainerHill_Entrance_EventScript_2681DA TrainerHill_Entrance_EventScript_2681CA:: @ 82681CA lockall - applymovement 255, TrainerHill_Entrance_Movement_26837F + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F msgbox TrainerHill_Entrance_Text_268712, MSGBOX_DEFAULT TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA closemessage - applymovement 255, TrainerHill_Entrance_Movement_268381 + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268381 waitmovement 0 setvar VAR_0x40D6, 0 special HealPlayerParty @@ -117,7 +117,7 @@ TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD setvar VAR_0x8004, 10 special sp194_trainer_tower compare VAR_RESULT, 0 - goto_eq TrainerHill_Entrance_EventScript_26821F + goto_if_eq TrainerHill_Entrance_EventScript_26821F msgbox TrainerHill_Entrance_Text_2686F4, MSGBOX_DEFAULT goto TrainerHill_Entrance_EventScript_268227 @@ -130,18 +130,17 @@ TrainerHill_Entrance_EventScript_268227:: @ 8268227 TrainerHill_Entrance_EventScript_268229:: @ 8268229 lockall - applymovement 255, TrainerHill_Entrance_Movement_26837F - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, TrainerHill_Entrance_EventScript_26836A + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F + goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_26836A msgbox TrainerHill_Entrance_Text_2684C6, MSGBOX_DEFAULT setvar VAR_0x8004, 13 special sp194_trainer_tower compare VAR_RESULT, 0 - call_if 1, TrainerHill_Entrance_EventScript_26832E + call_if_eq TrainerHill_Entrance_EventScript_26832E setvar VAR_0x8004, 8 special sp194_trainer_tower compare VAR_RESULT, 1 - goto_eq TrainerHill_Entrance_EventScript_268275 + goto_if_eq TrainerHill_Entrance_EventScript_268275 msgbox TrainerHill_Entrance_Text_268564, MSGBOX_DEFAULT goto TrainerHill_Entrance_EventScript_26827D @@ -185,7 +184,7 @@ TrainerHill_Entrance_EventScript_268314:: @ 8268314 setvar VAR_TEMP_5, 0 msgbox TrainerHill_Entrance_Text_26866F, MSGBOX_DEFAULT closemessage - applymovement 255, TrainerHill_Entrance_Movement_268381 + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268381 waitmovement 0 releaseall end @@ -197,7 +196,7 @@ TrainerHill_Entrance_EventScript_26832E:: @ 826832E setvar VAR_TEMP_5, 1 call TrainerHill_Entrance_EventScript_27134F compare VAR_RESULT, 0 - goto_eq TrainerHill_Entrance_EventScript_26835C + goto_if_eq TrainerHill_Entrance_EventScript_26835C setvar VAR_0x8004, 14 special sp194_trainer_tower return @@ -211,7 +210,7 @@ TrainerHill_Entrance_EventScript_26835C:: @ 826835C TrainerHill_Entrance_EventScript_26836A:: @ 826836A msgbox TrainerHill_Entrance_Text_268430, MSGBOX_DEFAULT closemessage - applymovement 255, TrainerHill_Entrance_Movement_268381 + applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268381 waitmovement 0 releaseall end @@ -242,8 +241,7 @@ TrainerHill_Entrance_EventScript_268388:: @ 8268388 end TrainerHill_Entrance_EventScript_268391:: @ 8268391 - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, TrainerHill_Entrance_EventScript_2683A3 + goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_2683A3 msgbox TrainerHill_Entrance_Text_268D5A, MSGBOX_NPC end @@ -252,8 +250,7 @@ TrainerHill_Entrance_EventScript_2683A3:: @ 82683A3 end TrainerHill_Entrance_EventScript_2683AC:: @ 82683AC - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, TrainerHill_Entrance_EventScript_2683BE + goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_2683BE msgbox TrainerHill_Entrance_Text_268E6A, MSGBOX_NPC end @@ -266,8 +263,7 @@ TrainerHill_Entrance_EventScript_2683C7:: @ 82683C7 faceplayer message gUnknown_08272A21 waitmessage - checkflag FLAG_SYS_GAME_CLEAR - goto_eq TrainerHill_Entrance_EventScript_268402 + goto_if_set FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_268402 pokemart TrainerHill_Entrance_Pokemart_2683E8 msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc index 7cdd3402d..4d5865511 100644 --- a/data/maps/Underwater_SeafloorCavern/scripts.inc +++ b/data/maps/Underwater_SeafloorCavern/scripts.inc @@ -6,8 +6,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 823433B Underwater_SeafloorCavern_MapScript1_23434B: @ 823434B setflag FLAG_LANDMARK_SEAFLOOR_CAVERN - checkflag FLAG_0x081 - goto_eq Underwater_SeafloorCavern_EventScript_234358 + goto_if_set FLAG_0x081, Underwater_SeafloorCavern_EventScript_234358 end Underwater_SeafloorCavern_EventScript_234358:: @ 8234358 @@ -15,8 +14,7 @@ Underwater_SeafloorCavern_EventScript_234358:: @ 8234358 end Underwater_SeafloorCavern_MapScript1_23435C: @ 823435C - checkflag FLAG_0x081 - call_if 1, Underwater_SeafloorCavern_EventScript_234366 + call_if_set FLAG_0x081, Underwater_SeafloorCavern_EventScript_234366 end Underwater_SeafloorCavern_EventScript_234366:: @ 8234366 diff --git a/data/maps/Underwater_SealedChamber/scripts.inc b/data/maps/Underwater_SealedChamber/scripts.inc index 7ac032c5f..de6ed50d1 100644 --- a/data/maps/Underwater_SealedChamber/scripts.inc +++ b/data/maps/Underwater_SealedChamber/scripts.inc @@ -5,9 +5,9 @@ Underwater_SealedChamber_MapScripts:: @ 82390C4 Underwater_SealedChamber_MapScript1_2390CA: @ 82390CA getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 12 - goto_if 5, Underwater_SealedChamber_EventScript_2390EA + goto_if_ne Underwater_SealedChamber_EventScript_2390EA compare VAR_0x8005, 44 - goto_if 5, Underwater_SealedChamber_EventScript_2390EA + goto_if_ne Underwater_SealedChamber_EventScript_2390EA goto Underwater_SealedChamber_EventScript_2390F3 Underwater_SealedChamber_EventScript_2390EA:: @ 82390EA diff --git a/data/maps/UnknownMap_25_34/scripts.inc b/data/maps/UnknownMap_25_34/scripts.inc index 2e13983fa..9bfdec2ac 100644 --- a/data/maps/UnknownMap_25_34/scripts.inc +++ b/data/maps/UnknownMap_25_34/scripts.inc @@ -20,15 +20,15 @@ LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF call LinkContestRoom1_EventScript_27A133 special ScriptGetMultiplayerId compare VAR_RESULT, 0 - call_if 1, LinkContestRoom1_EventScript_23B7EF + call_if_eq LinkContestRoom1_EventScript_23B7EF compare VAR_RESULT, 1 - call_if 1, LinkContestRoom1_EventScript_23B7F3 + call_if_eq LinkContestRoom1_EventScript_23B7F3 compare VAR_RESULT, 2 - call_if 1, LinkContestRoom1_EventScript_23B7F7 + call_if_eq LinkContestRoom1_EventScript_23B7F7 compare VAR_RESULT, 3 - call_if 1, LinkContestRoom1_EventScript_23B7FB + call_if_eq LinkContestRoom1_EventScript_23B7FB compare VAR_RESULT, 4 - call_if 1, LinkContestRoom1_EventScript_23B7FF + call_if_eq LinkContestRoom1_EventScript_23B7FF return LinkContestRoom1_EventScript_23B7EF:: @ 823B7EF @@ -53,7 +53,7 @@ LinkContestRoom1_EventScript_23B7FF:: @ 823B7FF LinkContestRoom1_MapScript1_23B803: @ 823B803 compare VAR_TEMP_9, 1 - call_if 1, LinkContestRoom1_EventScript_23B80F + call_if_eq LinkContestRoom1_EventScript_23B80F end LinkContestRoom1_EventScript_23B80F:: @ 823B80F @@ -75,7 +75,7 @@ LinkContestRoom1_EventScript_23B829:: @ 823B829 LinkContestRoom1_EventScript_23B834:: @ 823B834 special sub_80F8B94 - hideobjectat 255, MAP_LITTLEROOT_TOWN + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN call LinkContestRoom1_EventScript_23BB2B end @@ -83,7 +83,7 @@ LinkContestRoom1_EventScript_23B842:: @ 823B842 call LinkContestRoom1_EventScript_23B8F8 call LinkContestRoom1_EventScript_23B858 compare VAR_TEMP_0, 8 - goto_if 0, LinkContestRoom1_EventScript_23B842 + goto_if_lt LinkContestRoom1_EventScript_23B842 return LinkContestRoom1_EventScript_23B858:: @ 823B858 @@ -302,7 +302,7 @@ LinkContestRoom1_EventScript_23BB25:: @ 823BB25 LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B specialvar VAR_RESULT, sub_80F9160 compare VAR_RESULT, 1 - goto_eq LinkContestRoom1_EventScript_23BD86 + goto_if_eq LinkContestRoom1_EventScript_23BD86 switch VAR_0x4088 case 1, LinkContestRoom1_EventScript_23BB78 case 2, LinkContestRoom1_EventScript_23BB8B @@ -443,9 +443,9 @@ LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6 checkplayergender compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_23BECE + goto_if_eq LilycoveCity_ContestLobby_EventScript_23BECE compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_23BED4 + goto_if_eq LilycoveCity_ContestLobby_EventScript_23BED4 return LilycoveCity_ContestLobby_EventScript_23BECE:: @ 823BECE diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index 578881daa..c929633dd 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -10,8 +10,7 @@ VerdanturfTown_MapScript1_1EB56C: @ 81EB56C VerdanturfTown_EventScript_1EB575:: @ 81EB575 lock faceplayer - checkflag FLAG_RUSTURF_TUNNEL_OPENED - goto_eq VerdanturfTown_EventScript_1EB594 + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_1EB594 msgbox VerdanturfTown_Text_1EB5FD, MSGBOX_DEFAULT applymovement 2, VerdanturfTown_Movement_2725A2 waitmovement 0 @@ -36,8 +35,7 @@ VerdanturfTown_EventScript_1EB5B1:: @ 81EB5B1 VerdanturfTown_EventScript_1EB5BA:: @ 81EB5BA lock faceplayer - checkflag FLAG_RUSTURF_TUNNEL_OPENED - goto_eq VerdanturfTown_EventScript_1EB5CF + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_1EB5CF msgbox VerdanturfTown_Text_1EB854, MSGBOX_DEFAULT release end diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index 93b7802be..21494c8a6 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -11,9 +11,9 @@ VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A: @ 820230A VerdanturfTown_BattleTentBattleRoom_EventScript_202310:: @ 8202310 checkplayergender compare VAR_RESULT, 0 - goto_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202328 + goto_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202328 compare VAR_RESULT, 1 - goto_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202333 + goto_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202333 return VerdanturfTown_BattleTentBattleRoom_EventScript_202328:: @ 8202328 @@ -38,7 +38,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348 setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 0 - goto_if 5, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C + goto_if_ne VerdanturfTown_BattleTentBattleRoom_EventScript_20243C VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F setvar VAR_0x8004, 3 @@ -95,9 +95,9 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C setvar VAR_0x8005, 2 special CallFrontierUtilFunc compare VAR_RESULT, 1 - call_if 1, VerdanturfTown_BattleTentBattleRoom_EventScript_202565 + call_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202565 compare VAR_RESULT, 2 - call_if 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20256C + call_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_20256C multichoice 20, 6, 104, 1 switch VAR_RESULT case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_2024EA @@ -157,7 +157,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20254B:: @ 820254B hideobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM call VerdanturfTown_BattleTentBattleRoom_EventScript_202310 setvar VAR_TEMP_1, 1 - applymovement 255, VerdanturfTown_BattleTentBattleRoom_Movement_202573 + applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentBattleRoom_Movement_202573 removeobject 2 end diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc index ef577c7f1..e5d7e45e9 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc @@ -10,12 +10,12 @@ VerdanturfTown_BattleTentCorridor_EventScript_20209A:: @ 820209A lockall setvar VAR_TEMP_0, 1 applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_2020DE - applymovement 255, VerdanturfTown_BattleTentCorridor_Movement_2020DE + applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentCorridor_Movement_2020DE waitmovement 0 opendoor 2, 1 waitdooranim applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_2020E4 - applymovement 255, VerdanturfTown_BattleTentCorridor_Movement_2020E3 + applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentCorridor_Movement_2020E3 waitmovement 0 closedoor 2, 1 waitdooranim diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index ec7ecfb1a..d526c769a 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -9,7 +9,7 @@ VerdanturfTown_BattleTentLobby_MapScript2_2016DB: @ 82016DB VerdanturfTown_BattleTentLobby_EventScript_2016E5:: @ 82016E5 setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject EVENT_OBJ_ID_PLAYER, 2 end VerdanturfTown_BattleTentLobby_MapScript2_2016EF: @ 82016EF @@ -134,7 +134,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201873:: @ 8201873 setvar VAR_0x8004, 1 special sub_81B99B4 compare VAR_RESULT, 0 - goto_if 5, VerdanturfTown_BattleTentLobby_EventScript_2017EE + goto_if_ne VerdanturfTown_BattleTentLobby_EventScript_2017EE special SavePlayerParty msgbox VerdanturfTown_BattleTentLobby_Text_2C50C3, MSGBOX_DEFAULT @@ -155,7 +155,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF setvar VAR_0x8004, 15 special CallFrontierUtilFunc compare VAR_0x8004, 1 - goto_eq VerdanturfTown_BattleTentLobby_EventScript_2019E8 + goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_2019E8 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 setvar VAR_0x8006, 2 @@ -167,7 +167,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF special sub_80F9490 waitstate compare VAR_RESULT, 0 - goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A34 + goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_201A34 msgbox VerdanturfTown_BattleTentLobby_Text_2C5662, MSGBOX_YESNO switch VAR_RESULT case 0, VerdanturfTown_BattleTentLobby_EventScript_201A34 @@ -195,7 +195,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954 call VerdanturfTown_BattleTentLobby_EventScript_27134F setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 - goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A1D + goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_201A1D VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE special SavePlayerParty @@ -246,12 +246,12 @@ VerdanturfTown_BattleTentLobby_EventScript_201A3F:: @ 8201A3F VerdanturfTown_BattleTentLobby_EventScript_201A41:: @ 8201A41 applymovement 1, VerdanturfTown_BattleTentLobby_Movement_201A70 - applymovement 255, VerdanturfTown_BattleTentLobby_Movement_201A70 + applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentLobby_Movement_201A70 waitmovement 0 opendoor 6, 1 waitdooranim applymovement 1, VerdanturfTown_BattleTentLobby_Movement_201A74 - applymovement 255, VerdanturfTown_BattleTentLobby_Movement_201A77 + applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentLobby_Movement_201A77 waitmovement 0 closedoor 6, 1 waitdooranim @@ -277,12 +277,11 @@ VerdanturfTown_BattleTentLobby_Movement_201A77: @ 8201A77 VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B lock faceplayer - checkflag FLAG_0x0EB - goto_eq VerdanturfTown_BattleTentLobby_EventScript_201AB2 + goto_if_set FLAG_0x0EB, VerdanturfTown_BattleTentLobby_EventScript_201AB2 msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, MSGBOX_DEFAULT giveitem_std ITEM_TM45 compare VAR_RESULT, 0 - goto_eq VerdanturfTown_BattleTentLobby_EventScript_272054 + goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_272054 setflag FLAG_0x0EB msgbox VerdanturfTown_BattleTentLobby_Text_201E43, MSGBOX_DEFAULT release @@ -306,8 +305,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201AC5:: @ 8201AC5 VerdanturfTown_BattleTentLobby_EventScript_201AD0:: @ 8201AD0 lock faceplayer - checkflag FLAG_0x1CC - goto_eq VerdanturfTown_BattleTentLobby_EventScript_201AED + goto_if_set FLAG_0x1CC, VerdanturfTown_BattleTentLobby_EventScript_201AED msgbox VerdanturfTown_BattleTentLobby_Text_201F3F, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 setflag FLAG_0x1CC diff --git a/data/maps/VerdanturfTown_WandasHouse/scripts.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc index fea5d3de0..e185cff51 100644 --- a/data/maps/VerdanturfTown_WandasHouse/scripts.inc +++ b/data/maps/VerdanturfTown_WandasHouse/scripts.inc @@ -4,8 +4,7 @@ VerdanturfTown_WandasHouse_MapScripts:: @ 82028BE VerdanturfTown_WandasHouse_EventScript_2028BF:: @ 82028BF lock faceplayer - checkflag FLAG_0x0C1 - goto_eq VerdanturfTown_WandasHouse_EventScript_2028D7 + goto_if_set FLAG_0x0C1, VerdanturfTown_WandasHouse_EventScript_2028D7 msgbox VerdanturfTown_WandasHouse_Text_202993, MSGBOX_DEFAULT setflag FLAG_0x0C1 release @@ -19,10 +18,8 @@ VerdanturfTown_WandasHouse_EventScript_2028D7:: @ 82028D7 VerdanturfTown_WandasHouse_EventScript_2028E1:: @ 82028E1 lock faceplayer - checkflag FLAG_0x07E - goto_eq VerdanturfTown_WandasHouse_EventScript_202909 - checkflag FLAG_0x4F3 - goto_eq VerdanturfTown_WandasHouse_EventScript_2028FF + goto_if_set FLAG_0x07E, VerdanturfTown_WandasHouse_EventScript_202909 + goto_if_set FLAG_0x4F3, VerdanturfTown_WandasHouse_EventScript_2028FF msgbox VerdanturfTown_WandasHouse_Text_202B37, MSGBOX_DEFAULT release end @@ -44,10 +41,8 @@ VerdanturfTown_WandasHouse_EventScript_202913:: @ 8202913 VerdanturfTown_WandasHouse_EventScript_20291C:: @ 820291C lock faceplayer - checkflag FLAG_0x4F3 - goto_eq VerdanturfTown_WandasHouse_EventScript_202944 - checkflag FLAG_0x0BE - goto_eq VerdanturfTown_WandasHouse_EventScript_20293A + goto_if_set FLAG_0x4F3, VerdanturfTown_WandasHouse_EventScript_202944 + goto_if_set FLAG_0x0BE, VerdanturfTown_WandasHouse_EventScript_20293A msgbox VerdanturfTown_WandasHouse_Text_202D91, MSGBOX_DEFAULT release end @@ -65,12 +60,9 @@ VerdanturfTown_WandasHouse_EventScript_202944:: @ 8202944 VerdanturfTown_WandasHouse_EventScript_20294E:: @ 820294E lock faceplayer - checkflag FLAG_0x07E - goto_eq VerdanturfTown_WandasHouse_EventScript_202989 - checkflag FLAG_0x4F3 - goto_eq VerdanturfTown_WandasHouse_EventScript_20297F - checkflag FLAG_RUSTURF_TUNNEL_OPENED - goto_eq VerdanturfTown_WandasHouse_EventScript_202975 + goto_if_set FLAG_0x07E, VerdanturfTown_WandasHouse_EventScript_202989 + goto_if_set FLAG_0x4F3, VerdanturfTown_WandasHouse_EventScript_20297F + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_WandasHouse_EventScript_202975 msgbox VerdanturfTown_WandasHouse_Text_202E47, MSGBOX_DEFAULT release end diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 5b3dabbc9..edf45de9c 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -4,9 +4,9 @@ VictoryRoad_1F_MapScripts:: @ 8235D7A VictoryRoad_1F_MapScript1_235D80: @ 8235D80 compare VAR_0x40C3, 1 - call_if 1, VictoryRoad_1F_EventScript_235D97 + call_if_eq VictoryRoad_1F_EventScript_235D97 compare VAR_0x40C3, 2 - call_if 1, VictoryRoad_1F_EventScript_235DA3 + call_if_eq VictoryRoad_1F_EventScript_235DA3 end VictoryRoad_1F_EventScript_235D97:: @ 8235D97 @@ -38,7 +38,7 @@ VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8 end VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 - applymovement 255, VictoryRoad_1F_Movement_2725AA + applymovement EVENT_OBJ_ID_PLAYER, VictoryRoad_1F_Movement_2725AA waitmovement 0 msgbox VictoryRoad_1F_Text_235EE6, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_235FFC @@ -85,7 +85,7 @@ VictoryRoad_1F_EventScript_235E35:: @ 8235E35 trainerbattle_single TRAINER_WALLY_3, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 - goto_eq VictoryRoad_1F_EventScript_235E5C + goto_if_eq VictoryRoad_1F_EventScript_235E5C msgbox VictoryRoad_1F_Text_2360FE, MSGBOX_AUTOCLOSE end diff --git a/data/party_menu.s b/data/party_menu.s deleted file mode 100644 index eedcd4377..000000000 --- a/data/party_menu.s +++ /dev/null @@ -1,649 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 1 -gUnknown_0861500C:: @ 861500C - .2byte 0x0005, 0x000e, 0x0019, 0x0022, 0x0026, 0x0044, 0x0045, 0x0066, 0x0076, 0x0087, 0x008a, 0x0056, 0x0099, 0x009d, 0x00a4, 0x00df - .2byte 0x00cd, 0x00f4, 0x00ad, 0x00c4, 0x00cb, 0x00bd, 0x0008, 0x00cf, 0x00d6, 0x0081, 0x006f, 0x0009, 0x0007, 0x00d2 - - .align 2 -gUnknown_08615048:: @ 8615048 - .4byte 0x00000000, 0x25b4409a, 0x25b4409a, 0x25b4409a, 0x37b4e0ff, 0x37b4e0ff, 0x37b4e0ff, 0x05fdc0fd - .4byte 0x05fdc0fd, 0x05fdc0fd, 0x00000000, 0x00000000, 0x03944490, 0x00000000, 0x00000000, 0x23944092 - .4byte 0x03b44090, 0x03b44090, 0x03b44090, 0x07bc48b8, 0x07bc48b8, 0x03b44090, 0x03b44090, 0x01946098 - .4byte 0x01946098, 0x0fb5c8fd, 0x0fb5c8fd, 0x27b5e0fa, 0x27b5e0fa, 0x05b440b8, 0x05b440b8, 0x3dfce0fd - .4byte 0x05b440b8, 0x05b440b8, 0x3dfce0fd, 0x1df7cffd, 0x1df7cffd, 0x03944098, 0x03944098, 0x1df7ccfd - .4byte 0x1df7ccfd, 0x03944090, 0x03944090, 0x01944092, 0x01944092, 0x0194409a, 0x219440ba, 0x219440ba - .4byte 0x03944090, 0x03944090, 0x01b46098, 0x01b46098, 0x07be4498, 0x07be4498, 0x03fec0fd, 0x23fec0fd - .4byte 0x1ff6e1fd, 0x1ff6e1fd, 0x03944098, 0x03944098, 0x059c4098, 0x05fc41fd, 0x05fcc1fd, 0x19d6cdfd - .4byte 0x19d6cdfd, 0x19d6cdfd, 0x19f4e1fd, 0x19f4e1fd, 0x19f4e1fd, 0x01944092, 0x01944092, 0x0194409a - .4byte 0x019c4092, 0x019c4092, 0x15b5f1f9, 0x15b5f1f9, 0x35b5f1fd, 0x03944098, 0x03944098, 0x03be4c98 - .4byte 0x23feccfd, 0x03954890, 0x03954890, 0x03b6409a, 0x03b44098, 0x03b44098, 0x019c4098, 0x019c4098 - .4byte 0x19f4d088, 0x19f4d088, 0x039c5090, 0x039c5090, 0x01965480, 0x01965480, 0x19d6d5fd, 0x01b67098 - .4byte 0x19d6cdfd, 0x19d6cdfd, 0x21bc409a, 0x21bc409a, 0x03955880, 0x03955880, 0x01975490, 0x01975490 - .4byte 0x19bce0ff, 0x19bce0ff, 0x03b4e1fd, 0x1bf4e1fd, 0x1dffe4ff, 0x01955080, 0x01955080, 0x01bd60ba - .4byte 0x39bde0ff, 0x05bfcffd, 0x0196409a, 0x39fce0fd, 0x039c4090, 0x039c4090, 0x039c4090, 0x039c4090 - .4byte 0x039e4890, 0x039e4c90, 0x19f64dfd, 0x239440b2, 0x01fec5fd, 0x1bf4c8fd, 0x19b4c0fd, 0x219460da - .4byte 0x019c4098, 0x00000000, 0x019c4898, 0x019c4498, 0x00000000, 0x03b44098, 0x03bc4098, 0x03b44898 - .4byte 0x03b44098, 0x039e4c90, 0x019d6098, 0x019d60d8, 0x019d6098, 0x219d60de, 0x03946090, 0x1dffe1fd - .4byte 0x03bc4090, 0x03b44890, 0x03b44090, 0x039c4898, 0x039c4898, 0x3bfcc898, 0x1bfecdfd, 0x3fffffff - .4byte 0x01b440ba, 0x21b440ba, 0x21b440ba, 0x07b54098, 0x27b54098, 0x3fb5e0fd, 0x01fce0ff, 0x21fce0ff - .4byte 0x21fce0ff, 0x3ff5c098, 0x3ff5c098, 0x03b44490, 0x03b44490, 0x0bd5c093, 0x0bd5c093, 0x01944098 - .4byte 0x01944098, 0x03944090, 0x01944890, 0x01944890, 0x07b548fd, 0x05bf4ffd, 0x05bf4cfd, 0x07b74ffd - .4byte 0x07b74ffd, 0x03964c90, 0x03964c90, 0x07944898, 0x1f94c8fd, 0x1f94c8fd, 0x01944092, 0x07fdc0dd - .4byte 0x07fdc0dd, 0x1df7f0fd, 0x05bcc1fd, 0x05944092, 0x05944092, 0x05944092, 0x3ff4cdfd, 0x01944092 - .4byte 0x01944092, 0x03944490, 0x05f5c098, 0x05f5c0fd, 0x03b64498, 0x03b64498, 0x03be4c90, 0x23feccfd - .4byte 0x07964c90, 0x00000000, 0x00000000, 0x03b64c98, 0x059570b8, 0x059570b8, 0x05b76cb8, 0x239464b2 - .4byte 0x05b57098, 0x1df4c9fd, 0x1df4e9fd, 0x079d4892, 0x239440b2, 0x05b56098, 0x219460fa, 0x27fec4b2 - .4byte 0x3ff5c1ff, 0x3ff5e1ff, 0x05b56098, 0x05b56098, 0x05bc6098, 0x05bc6098, 0x05b57098, 0x07b44890 - .4byte 0x07b448d0, 0x03bc40fd, 0x03bc4098, 0x03b460b0, 0x03b444b8, 0x03b444b8, 0x039c4098, 0x05b540b8 - .4byte 0x05b560b8, 0x079e4c90, 0x03b64c98, 0x00000000, 0x03b460fc, 0x03b460fc, 0x01fec5fd, 0x1bf4c8fd - .4byte 0x19b4c0fd, 0x1dffe9fd, 0x05bdcffd, 0x03b64898, 0x03b64098, 0x03be4098, 0x01b46098, 0x01b46098 - .4byte 0x31b4e8fd, 0x03be4c98, 0x03b64c90, 0x07b64592, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x2bb4c0ff, 0x2bb4c0ff, 0x2bb4c0ff - .4byte 0x03b460ff, 0x3bb4e0ff, 0x3bb4e0ff, 0x05bd4098, 0x05fde0fd, 0x05fde0fd, 0x01b640b8, 0x01b640b8 - .4byte 0x27bd4898, 0x27bd4898, 0x00000000, 0x00000000, 0x03944090, 0x00000000, 0x03944090, 0x019c409a - .4byte 0x19fcc09a, 0x19fcc1ff, 0x0595509a, 0x27b7509e, 0x27b7509e, 0x21b44090, 0x23b44092, 0x21b44490 - .4byte 0x03b440b0, 0x03b440b0, 0x0194409a, 0x29b4c0ff, 0x1fffe5fd, 0x03bc4090, 0x03bc4090, 0x039e4090 - .4byte 0x039e4090, 0x059d4098, 0x059d4098, 0x07bf4c98, 0x07bf4c98, 0x3fffe9fd, 0x01b67490, 0x01b67490 - .4byte 0x1df5f898, 0x01b47098, 0x39f6c5fd, 0x01bc4090, 0x01bc6090, 0x039e4090, 0x21bc40ba, 0x23bc40ba - .4byte 0x039c4090, 0x03be4098, 0x23bc4090, 0x23bc4090, 0x01b46098, 0x03b46098, 0x33b46098, 0x19f4e1fd - .4byte 0x19f4e1fd, 0x03b44898, 0x03b44898, 0x05b56098, 0x05b57098, 0x05bd6098, 0x05bd6098, 0x05bd6098 - .4byte 0x29b4c0fb, 0x29b4c0ff, 0x019c4098, 0x059d5098, 0x07977498, 0x07977498, 0x07bd4098, 0x039e4498 - .4byte 0x1bfec4fd, 0x0fb5c9fd, 0x0fb5c9fd, 0x09fee0ff, 0x1bf6c5fd, 0x1bf6e5fd, 0x03b64498, 0x03b64498 - .4byte 0x00000000, 0x019e4498, 0x19fee5fd, 0x23b6409a, 0x39fce0fd, 0x39fce0fd, 0x39fce0fd, 0x1df5d4b8 - .4byte 0x1df5d4b8, 0x21b4409a, 0x1dffc0fd, 0x1dffe0fd, 0x1dffe0fd, 0x019c4098, 0x03bc4098, 0x03bc4098 - .4byte 0x23be6cba, 0x019e4c98, 0x01be4d98, 0x23b44098, 0x3ffde8ff, 0x01be6098, 0x25b56098, 0x25b56098 - .4byte 0x3dfde8fd, 0x079e4898, 0x0bf6c9fd, 0x0bf6c9fd, 0x01b66098, 0x01b66098, 0x21b4609a, 0x21b460da - .4byte 0x1dfe4c98, 0x1dfe4c98, 0x1dfe4c98, 0x21b46098, 0x25b56098, 0x27b56098, 0x00000000, 0x2ffff098 - .4byte 0x2ffff098, 0x1df7f8fd, 0x0dfff8fd, 0x0df7f8fd, 0x07be6898, 0x3fb7e8ff, 0x23be6898, 0x23be4c98 - .4byte 0x23be4c98, 0x1ffecd98, 0x1bfeecfd, 0x059f4490 - - .align 2 -gUnknown_086156B8:: @ 86156B8 - .4byte 0x000011f0, 0x000021e1, 0x000003c2 - - .align 2 -gUnknown_086156C4:: @ 86156C4 - .4byte sub_81B2658, 0x0d280b18, 0x08201420, 0x08081440, 0x08182526, 0x08182535, 0x03302318, 0x1040220c - - .align 2 -gUnknown_086156E4:: @ 86156E4 - .4byte sub_81B26BC, 0x0d280316, 0x08200c1e, 0x08080c3e, 0x08180c66, 0x08180c75, 0x03300a58, 0x1040044d - - .align 2 -gUnknown_08615704:: @ 8615704 - .4byte 0x32142810, 0x22103432, 0x1c6c1268, 0x19661b88, 0x346c2a68, 0x31663388, 0x4c6c4268, 0x49664b88 - .4byte 0x646c5a68, 0x61666388, 0x7c6c7268, 0x79667b88, 0x22141810, 0x12102432, 0x5a145010, 0x4a105c32 - .4byte 0x1c6c1268, 0x19661b88, 0x3c6c3268, 0x39663b88, 0x5c6c5268, 0x59665b88, 0x7c6c7268, 0x79667b88 - .4byte 0x22141810, 0x12102432, 0x5a145010, 0x4a105c32, 0x246a1a68, 0x21662388, 0x3c6a3268, 0x39663b88 - .4byte 0x5c6a5268, 0x59665b88, 0x746a6a68, 0x71667388, 0x2a142010, 0x1a102c32, 0x2c6a2268, 0x29662b88 - .4byte 0x446a3a68, 0x41664388, 0x72146810, 0x62107432, 0x746a6a68, 0x71667388, 0x8c6a8268, 0x89668b88 - - .align 1 -gUnknown_086157C4:: @ 86157C4 - .incbin "graphics/interface/unknown_6157C4.bin" - - .align 1 -gUnknown_086157E0:: @ 86157E0 - .incbin "graphics/interface/unknown_6157E0.bin" - -gUnknown_086157FC:: @ 86157FC - .byte 0x00, 0x03, 0x02, 0x00 - -gUnknown_08615800:: @ 8615800 - .byte 0x01, 0x06, 0x00, 0x0b, 0x0c, 0x01, 0x02, 0x03, 0x01, 0x08, 0x09, 0x00, 0x01, 0x02, 0x00, 0x00 - - .align 2 -gUnknown_08615810:: @ 8615810 - window_template 0x00, 0x01, 0x03, 0x0a, 0x07, 0x03, 0x0063 - window_template 0x00, 0x0c, 0x01, 0x12, 0x03, 0x04, 0x00a9 - window_template 0x00, 0x0c, 0x04, 0x12, 0x03, 0x05, 0x00df - window_template 0x00, 0x0c, 0x07, 0x12, 0x03, 0x06, 0x0115 - window_template 0x00, 0x0c, 0x0a, 0x12, 0x03, 0x07, 0x014b - window_template 0x00, 0x0c, 0x0d, 0x12, 0x03, 0x08, 0x0181 - window_template 0x02, 0x01, 0x0f, 0x1c, 0x04, 0x0e, 0x01df - null_window_template - - .align 2 -gUnknown_08615850:: @ 8615850 - window_template 0x00, 0x01, 0x01, 0x0a, 0x07, 0x03, 0x0063 - window_template 0x00, 0x01, 0x08, 0x0a, 0x07, 0x04, 0x00a9 - window_template 0x00, 0x0c, 0x01, 0x12, 0x03, 0x05, 0x00ef - window_template 0x00, 0x0c, 0x05, 0x12, 0x03, 0x06, 0x0125 - window_template 0x00, 0x0c, 0x09, 0x12, 0x03, 0x07, 0x015b - window_template 0x00, 0x0c, 0x0d, 0x12, 0x03, 0x08, 0x0191 - window_template 0x02, 0x01, 0x0f, 0x1c, 0x04, 0x0e, 0x01df - null_window_template - - .align 2 -gUnknown_08615890:: @ 8615890 - window_template 0x00, 0x01, 0x01, 0x0a, 0x07, 0x03, 0x0063 - window_template 0x00, 0x01, 0x08, 0x0a, 0x07, 0x04, 0x00a9 - window_template 0x00, 0x0c, 0x02, 0x12, 0x03, 0x05, 0x00ef - window_template 0x00, 0x0c, 0x05, 0x12, 0x03, 0x06, 0x0125 - window_template 0x00, 0x0c, 0x09, 0x12, 0x03, 0x07, 0x015b - window_template 0x00, 0x0c, 0x0c, 0x12, 0x03, 0x08, 0x0191 - window_template 0x02, 0x01, 0x0f, 0x1c, 0x04, 0x0e, 0x01df - null_window_template - - .align 2 -gUnknown_086158D0:: @ 86158D0 - window_template 0x00, 0x01, 0x02, 0x0a, 0x07, 0x03, 0x0063 - window_template 0x00, 0x0c, 0x03, 0x12, 0x03, 0x05, 0x00a9 - window_template 0x00, 0x0c, 0x06, 0x12, 0x03, 0x06, 0x00df - window_template 0x02, 0x01, 0x0b, 0x0a, 0x07, 0x04, 0x0115 - window_template 0x02, 0x0c, 0x0c, 0x12, 0x03, 0x07, 0x016b - window_template 0x02, 0x0c, 0x0f, 0x12, 0x03, 0x08, 0x01a1 - null_window_template - - .align 2 -gUnknown_08615908:: @ 8615908 - window_template 0x00, 0x18, 0x11, 0x06, 0x02, 0x03, 0x01c7 - - .align 2 -gUnknown_08615910:: @ 8615910 - window_template 0x00, 0x18, 0x12, 0x06, 0x02, 0x03, 0x01c7 - - .align 2 -gUnknown_08615918:: @ 8615918 - window_template 0x00, 0x18, 0x10, 0x06, 0x02, 0x03, 0x01d3 - - .align 2 -gUnknown_08615920:: @ 8615920 - window_template 0x02, 0x01, 0x11, 0x15, 0x02, 0x0f, 0x024f - - .align 2 -gUnknown_08615928:: @ 8615928 - window_template 0x02, 0x01, 0x11, 0x10, 0x02, 0x0f, 0x0279 - - .align 2 -gUnknown_08615930:: @ 8615930 - window_template 0x02, 0x01, 0x11, 0x14, 0x02, 0x0f, 0x0299 - - .align 2 -gUnknown_08615938:: @ 8615938 - window_template 0x02, 0x01, 0x11, 0x12, 0x02, 0x0f, 0x0299 - - .align 2 -gUnknown_08615940:: @ 8615940 - window_template 0x02, 0x01, 0x11, 0x10, 0x02, 0x0f, 0x0299 - - .align 2 -gUnknown_08615948:: @ 8615948 - window_template 0x02, 0x01, 0x0f, 0x14, 0x04, 0x0f, 0x0299 - - .align 2 -gUnknown_08615950:: @ 8615950 - window_template 0x02, 0x17, 0x0d, 0x06, 0x06, 0x0e, 0x039d - - .align 2 -gUnknown_08615958:: @ 8615958 - window_template 0x02, 0x15, 0x0d, 0x08, 0x06, 0x0e, 0x039d - - .align 2 -gUnknown_08615960:: @ 8615960 - window_template 0x02, 0x13, 0x0b, 0x0a, 0x08, 0x0e, 0x02e9 - - .align 2 -gUnknown_08615968:: @ 8615968 - window_template 0x02, 0x15, 0x09, 0x05, 0x04, 0x0e, 0x02e9 - - .align 2 -gUnknown_08615970:: @ 8615970 - window_template 0x02, 0x13, 0x01, 0x0a, 0x0b, 0x0e, 0x02e9 - window_template 0x02, 0x02, 0x0f, 0x1b, 0x04, 0x0e, 0x01df - window_template 0x02, 0x00, 0x0d, 0x12, 0x03, 0x0c, 0x039d - -gUnknown_08615988:: @ 8615988 - .byte 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1a, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21 - .byte 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x28, 0x3b, 0x3c, 0x3a, 0x3a, 0x3a, 0x3a, 0x3a, 0x3a, 0x3d, 0x0f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x2e, 0x2f, 0x2f, 0x2f - .byte 0x2f, 0x2f, 0x2f, 0x2f, 0x2f, 0x30 - -gUnknown_086159CE:: @ 86159CE - .byte 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1a, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21 - .byte 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x28, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x2a, 0x0f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x2e, 0x2f, 0x2f, 0x2f - .byte 0x2f, 0x2f, 0x2f, 0x2f, 0x2f, 0x30 - -gUnknown_08615A14:: @ 8615A14 - .byte 0x2b, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2d, 0x31, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x34, 0x35, 0x33, 0x33, 0x33 - .byte 0x33, 0x33, 0x33, 0x36, 0x37, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x39 - -gUnknown_08615A4A:: @ 8615A4A - .byte 0x2b, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2d, 0x31, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21 - .byte 0x21, 0x21, 0x21, 0x32, 0x37, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x39 - -gUnknown_08615A80:: @ 8615A80 - .byte 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x1f, 0x25, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x27 - -gUnknown_08615AB6:: @ 8615AB6 - .byte 0x0b, 0x0c - -gUnknown_08615AB8:: @ 8615AB8 - .byte 0x09, 0x0a - -gUnknown_08615ABA:: @ 8615ABA - .byte 0x04, 0x05, 0x06 - -gUnknown_08615ABD:: @ 8615ABD - .byte 0x01, 0x07, 0x08 - -gUnknown_08615AC0:: @ 8615AC0 - .byte 0x01, 0x0b, 0x0c - -gUnknown_08615AC3:: @ 8615AC3 - .byte 0x3b, 0x3c - -gUnknown_08615AC5:: @ 8615AC5 - .byte 0x4b, 0x4c - -gUnknown_08615AC7:: @ 8615AC7 - .byte 0x39, 0x3a - -gUnknown_08615AC9:: @ 8615AC9 - .byte 0x49, 0x4a - -gUnknown_08615ACB:: @ 8615ACB - .byte 0x59, 0x5a - -gUnknown_08615ACD:: @ 8615ACD - .byte 0x34, 0x35, 0x36 - -gUnknown_08615AD0:: @ 8615AD0 - .byte 0x44, 0x45, 0x46 - -gUnknown_08615AD3:: @ 8615AD3 - .byte 0x54, 0x55, 0x56 - -gUnknown_08615AD6:: @ 8615AD6 - .byte 0x74, 0x75, 0x76 - -gUnknown_08615AD9:: @ 8615AD9 - .byte 0x84, 0x85, 0x86 - -gUnknown_08615ADC:: @ 8615ADC - .byte 0x94, 0x95, 0x96 - -gUnknown_08615ADF:: @ 8615ADF - .byte 0x64, 0x65, 0x66 - -gUnknown_08615AE2:: @ 8615AE2 - .byte 0x31, 0x37, 0x38 - -gUnknown_08615AE5:: @ 8615AE5 - .byte 0x41, 0x47, 0x48 - -gUnknown_08615AE8:: @ 8615AE8 - .byte 0x51, 0x57, 0x58 - -gUnknown_08615AEB:: @ 8615AEB - .byte 0x61, 0x67, 0x68 - -gUnknown_08615AEE:: @ 8615AEE - .byte 0xa1, 0xa7, 0xa8 - -gUnknown_08615AF1:: @ 8615AF1 - .byte 0x11, 0x1b, 0x1c - - .align 2 -gUnknown_08615AF4:: @ 8615AF4 - .4byte gUnknown_085E9E43 - .4byte gUnknown_085EA010 - .4byte gUnknown_085EA02A - .4byte gUnknown_085E9E55 - .4byte gUnknown_085E9E64 - .4byte gUnknown_085E9E79 - .4byte gUnknown_085E9E8F - .4byte gUnknown_085E9EBC - .4byte gUnknown_085E9ED4 - .4byte gUnknown_085E9EE9 - .4byte gUnknown_085E9FDB - .4byte gUnknown_085EA046 - .4byte gUnknown_085EA05B - .4byte gUnknown_085E9F01 - .4byte gUnknown_085E9F58 - .4byte gUnknown_085E9F6F - .4byte gUnknown_085E9F81 - .4byte gUnknown_085E9F90 - .4byte gUnknown_085E9FA7 - .4byte gUnknown_085E9FC2 - .4byte gText_EmptyString2 - .4byte gUnknown_085E9EA6 - .4byte gUnknown_085E9F16 - .4byte gUnknown_085E9F2A - .4byte gUnknown_085E9F42 - .4byte gUnknown_085E9FF9 - .4byte gUnknown_085EA073 - -gUnknown_08615B60:: @ 8615B60 - .4byte gUnknown_085EA091 - .4byte gUnknown_085EA099 - .4byte gUnknown_085EA09E - .4byte gUnknown_085EA0A4 - .4byte gUnknown_085EA0AB - .4byte gUnknown_085EA0E7 - .4byte gUnknown_085EA0B1 - .4byte gUnknown_085EA0B6 - .4byte gUnknown_085EA0BF - .4byte gUnknown_085EA0C5 - .4byte gUnknown_085EA0CF - .4byte gUnknown_085EA0D7 - .4byte gUnknown_085EA0DC - - .align 1 -gUnknown_08615B94:: @ 8615B94 - .2byte 0x0108, 0x0151, 0x0160, 0x015b, 0x002e, 0x005c, 0x0102, 0x0153, 0x014b, 0x00ed, 0x00f1, 0x010d, 0x003a, 0x003b, 0x003f, 0x0071 - .2byte 0x00b6, 0x00f0, 0x00ca, 0x00db, 0x00da, 0x004c, 0x00e7, 0x0055, 0x0057, 0x0059, 0x00d8, 0x005b, 0x005e, 0x00f7, 0x0118, 0x0068 - .2byte 0x0073, 0x015f, 0x0035, 0x00bc, 0x00c9, 0x007e, 0x013d, 0x014c, 0x0103, 0x0107, 0x0122, 0x009c, 0x00d5, 0x00a8, 0x00d3, 0x011d - .2byte 0x0121, 0x013b, 0x000f, 0x0013, 0x0039, 0x0046, 0x0094, 0x00f9, 0x007f, 0x0123 - - .align 2 -gUnknown_08615C08:: @ 8615C08 - .4byte gText_Summary5, sub_81B37FC - .4byte gText_Switch2, brm_switch - .4byte gText_Cancel2, brm_cancel_1 - .4byte gText_Item, sub_81B4134 - .4byte gMenuText_Give, sub_81B4198 - .4byte gText_Take, sub_81B4724 - .4byte gText_Mail, sub_81B4A08 - .4byte gText_Take2, brm_take_2 - .4byte gText_Read2, sub_81B4A6C - .4byte gText_Cancel2, sub_81B4D78 - .4byte gText_Shift, brm_shift_sendout - .4byte gText_SendOut, brm_shift_sendout - .4byte gText_Enter, sub_81B4E8C - .4byte gText_NoEntry, sub_81B4FA8 - .4byte gText_Store, sub_81B50AC - .4byte gText_Register, sub_81B50C8 - .4byte gText_Trade4, brm_trade_1 - .4byte gText_Trade4, sub_81B52E4 - .4byte gMenuText_Toss, sub_81B47E0 - .4byte gMoveNames+195, sub_81B5470 - .4byte gMoveNames+1924, sub_81B5470 - .4byte gMoveNames+3237, sub_81B5470 - .4byte gMoveNames+910, sub_81B5470 - .4byte gMoveNames+741, sub_81B5470 - .4byte gMoveNames+247, sub_81B5470 - .4byte gMoveNames+3783, sub_81B5470 - .4byte gMoveNames+1651, sub_81B5470 - .4byte gMoveNames+1300, sub_81B5470 - .4byte gMoveNames+1183, sub_81B5470 - .4byte gMoveNames+3770, sub_81B5470 - .4byte gMoveNames+2704, sub_81B5470 - .4byte gMoveNames+1755, sub_81B5470 - .4byte gMoveNames+2990, sub_81B5470 - -gUnknown_08615D10:: @ 8615D10 - .byte 0x00, 0x01, 0x02 - -gUnknown_08615D13:: @ 8615D13 - .byte 0x0a, 0x00, 0x02 - -gUnknown_08615D16:: @ 8615D16 - .byte 0x0b, 0x00, 0x02 - -gUnknown_08615D19:: @ 8615D19 - .byte 0x00, 0x02 - -gUnknown_08615D1B:: @ 8615D1B - .byte 0x0c, 0x00, 0x02 - -gUnknown_08615D1E:: @ 8615D1E - .byte 0x0d, 0x00, 0x02 - -gUnknown_08615D21:: @ 8615D21 - .byte 0x0e, 0x00, 0x02 - -gUnknown_08615D24:: @ 8615D24 - .byte 0x04, 0x05, 0x09 - -gUnknown_08615D27:: @ 8615D27 - .byte 0x08, 0x07, 0x09 - -gUnknown_08615D2A:: @ 8615D2A - .byte 0x0f, 0x00, 0x02 - -gUnknown_08615D2D:: @ 8615D2D - .byte 0x10, 0x00, 0x02 - -gUnknown_08615D30:: @ 8615D30 - .byte 0x11, 0x00, 0x02 - -gUnknown_08615D33:: @ 8615D33 - .byte 0x05, 0x12, 0x02 - - .align 2 -gUnknown_08615D38:: @ 8615D38 - .4byte NULL, gUnknown_08615D10, gUnknown_08615D13, gUnknown_08615D16, gUnknown_08615D1B, gUnknown_08615D1E, gUnknown_08615D21, gUnknown_08615D19 - .4byte gUnknown_08615D24, gUnknown_08615D27, gUnknown_08615D2A, gUnknown_08615D2D, gUnknown_08615D30, gUnknown_08615D33 - -gUnknown_08615D70:: @ 8615D70 - .byte 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03 - - .align 1 -gUnknown_08615D7E:: @ 8615D7E - .2byte 0x000f, 0x0094, 0x00f9, 0x0046, 0x0039, 0x0013, 0x0123, 0x007f, 0x0064, 0x005b, 0x0122, 0x00d0, 0x0087, 0x00e6, 0x000e - - .align 2 -gUnknown_08615D9C:: @ 8615D9C - .4byte SetUpFieldMove_Cut, 0x00000007 - .4byte SetUpFieldMove_Flash, 0x0000000d - .4byte SetUpFieldMove_RockSmash, 0x0000000d - .4byte SetUpFieldMove_Strength, 0x0000000d - .4byte sub_81B5820, 0x00000008 - .4byte sub_81B5884, 0x0000000d - .4byte sub_81B5974, 0x0000000d - .4byte hm_prepare_waterfall, 0x0000000d - .4byte SetUpFieldMove_Teleport, 0x0000000d - .4byte SetUpFieldMove_Dig, 0x0000000d - .4byte sub_80FA004, 0x0000000d - .4byte SetUpFieldMove_SoftBoiled, 0x00000010 - .4byte SetUpFieldMove_SoftBoiled, 0x00000010 - .4byte SetUpFieldMove_SweetScent, 0x0000000d - - .align 2 -gUnknown_08615E0C:: @ 8615E0C - .4byte gText_NotPkmnOtherTrainerWants - .4byte gText_ThatIsntAnEgg - .4byte gText_PkmnCantBeTradedNow - .4byte gText_PkmnCantBeTradedNow - .4byte gText_OtherTrainersPkmnCantBeTraded - .4byte gText_EggCantBeTradedNow - .4byte gText_OtherTrainerCantAcceptPkmn - .4byte gText_CantTradeWithTrainer - .4byte gText_CantTradeWithTrainer - - .align 2 -gUnknown_08615E30:: @ 8615E30 - .incbin "graphics/interface/hold_icons.4bpp" - - .align 2 -gUnknown_08615E70:: @ 8615E70 - .incbin "graphics/interface/hold_icons.gbapal" - - .align 2 -gOamData_8615E90:: @ 8615E90 - .2byte 0x0000, 0x0000, 0x0400, 0x0000 - - .align 2 -gSpriteAnim_8615E98:: @ 8615E98 - .2byte 0x0000, 0x0001, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_8615EA0:: @ 8615EA0 - .2byte 0x0001, 0x0001, 0xffff, 0x0000 - - .align 2 -gSpriteAnimTable_8615EA8:: @ 8615EA8 - .4byte gSpriteAnim_8615E98 - .4byte gSpriteAnim_8615EA0 - - .align 2 -gUnknown_08615EB0:: @ 8615EB0 - obj_tiles gUnknown_08615E30, 0x40, 55120 - - .align 2 -gUnknown_08615EB8:: @ 8615EB8 - obj_pal gUnknown_08615E70, 55120 - - .align 2 -gSpriteTemplate_8615EC0:: @ 8615EC0 - spr_template 0xd750, 0xd750, gOamData_8615E90, gSpriteAnimTable_8615EA8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gOamData_8615ED8:: @ 8615ED8 - .2byte 0x0000, 0x8000, 0x0400, 0x0000 - - .align 2 -gSpriteAnim_8615EE0:: @ 8615EE0 - .2byte 0x0000, 0x0000, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_8615EE8:: @ 8615EE8 - .2byte 0x0010, 0x0000, 0xffff, 0x0000 - - .align 2 -gSpriteAnimTable_8615EF0:: @ 8615EF0 - .4byte gSpriteAnim_8615EE0 - .4byte gSpriteAnim_8615EE8 - - .align 2 -gUnknown_08615EF8:: @ 8615EF8 - obj_tiles gPartyMenuPokeball_Gfx, 0x400, 1200 - - .align 2 -gUnknown_08615F00:: @ 8615F00 - obj_pal gPartyMenuPokeball_Pal, 1200 - - .align 2 -gSpriteTemplate_8615F08:: @ 8615F08 - spr_template 0x04b0, 0x04b0, gOamData_8615ED8, gSpriteAnimTable_8615EF0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gOamData_8615F20:: @ 8615F20 - .2byte 0x0000, 0x4000, 0x0800, 0x0000 - - .align 2 -gSpriteAnim_8615F28:: @ 8615F28 - .2byte 0x0000, 0x0000, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_8615F30:: @ 8615F30 - .2byte 0x0004, 0x0000, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_8615F38:: @ 8615F38 - .2byte 0x0008, 0x0000, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_8615F40:: @ 8615F40 - .2byte 0x000c, 0x0000, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_8615F48:: @ 8615F48 - .2byte 0x0010, 0x0000, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_8615F50:: @ 8615F50 - .2byte 0x0014, 0x0000, 0xffff, 0x0000 - - .align 2 -gSpriteAnimTable_8615F58:: @ 8615F58 - .4byte gSpriteAnim_8615F28 - .4byte gSpriteAnim_8615F30 - .4byte gSpriteAnim_8615F38 - .4byte gSpriteAnim_8615F40 - .4byte gSpriteAnim_8615F48 - .4byte gSpriteAnim_8615F50 - - .align 2 -gUnknown_08615F70:: @ 8615F70 - obj_tiles gPartyMenuPokeballSmall_Gfx, 0x0300, 0x04b1 - - .align 2 -gSpriteTemplate_8615F78:: @ 8615F78 - spr_template 0x04b1, 0x04b0, gOamData_8615F20, gSpriteAnimTable_8615F58, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gOamData_8615F90:: @ 8615F90 - .2byte 0x4000, 0x4000, 0x0400, 0x0000 - - .align 2 -gSpriteAnim_8615F98:: @ 8615F98 - .2byte 0x0000, 0x0000, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_8615FA0:: @ 8615FA0 - .2byte 0x0004, 0x0000, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_8615FA8:: @ 8615FA8 - .2byte 0x0008, 0x0000, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_8615FB0:: @ 8615FB0 - .2byte 0x000c, 0x0000, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_8615FB8:: @ 8615FB8 - .2byte 0x0010, 0x0000, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_8615FC0:: @ 8615FC0 - .2byte 0x0014, 0x0000, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_8615FC8:: @ 8615FC8 - .2byte 0x0018, 0x0000, 0xffff, 0x0000 - - .align 2 -gSpriteAnim_8615FD0:: @ 8615FD0 - .2byte 0x001c, 0x0000, 0xffff, 0x0000 - - .align 2 -gSpriteAnimTable_8615FD8:: @ 8615FD8 - .4byte gSpriteAnim_8615F98 - .4byte gSpriteAnim_8615FA0 - .4byte gSpriteAnim_8615FA8 - .4byte gSpriteAnim_8615FB0 - .4byte gSpriteAnim_8615FB8 - .4byte gSpriteAnim_8615FC0 - .4byte gSpriteAnim_8615FC8 - .4byte gSpriteAnim_8615FD0 - - .align 2 -gUnknown_08615FF8:: @ 8615FF8 - obj_tiles gStatusGfx_Icons, 0x400, 1202 - - .align 2 -gUnknown_08616000:: @ 8616000 - obj_pal gStatusPal_Icons, 1202 - - .align 2 -gSpriteTemplate_8616008:: @ 8616008 - spr_template 0x04b2, 0x04b2, gOamData_8615F90, gSpriteAnimTable_8615FD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_08616020:: @ 8616020 - .byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00 - - .align 2 -gUnknown_08616028:: @ 8616028 - .4byte gText_HP4 - .4byte gText_Attack3 - .4byte gText_Defense3 - .4byte gText_SpAtk4 - .4byte gText_SpDef4 - .4byte gText_Speed2 - - .align 1 -gUnknown_08616040:: @ 8616040 - .2byte 0x0108, 0x0151, 0x0160, 0x015b, 0x002e, 0x005c, 0x0102, 0x0153, 0x014b, 0x00ed, 0x00f1, 0x010d, 0x003a, 0x003b, 0x003f, 0x0071 - .2byte 0x00b6, 0x00f0, 0x00ca, 0x00db, 0x00da, 0x004c, 0x00e7, 0x0055, 0x0057, 0x0059, 0x00d8, 0x005b, 0x005e, 0x00f7, 0x0118, 0x0068 - .2byte 0x0073, 0x015f, 0x0035, 0x00bc, 0x00c9, 0x007e, 0x013d, 0x014c, 0x0103, 0x0107, 0x0122, 0x009c, 0x00d5, 0x00a8, 0x00d3, 0x011d - .2byte 0x0121, 0x013b, 0x000f, 0x0013, 0x0039, 0x0046, 0x0094, 0x00f9, 0x007f, 0x0123 - diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s deleted file mode 100644 index b859133a6..000000000 --- a/data/pokemon_storage_system.s +++ /dev/null @@ -1,1118 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_085720DC:: @ 85720DC - .incbin "graphics/pokemon_storage/scrolling_bg.4bpp.lz" - - .align 2 -gUnknown_08572174:: @ 8572174 - .incbin "graphics/pokemon_storage/scrolling_bg.bin.lz" - - .align 2 -gUnknown_08572280:: @ 8572280 - .incbin "graphics/unknown/unknown_572280.gbapal" - - .align 2 -gUnknown_085722A0:: @ 85722A0 - .incbin "graphics/unknown/unknown_5722A0.bin.lz" - - .align 1 -gUnknown_0857239C:: @ 857239C - .2byte 0x0101, 0x0102, 0x0103, 0x0104, 0x0105, 0x0106, 0x0107, 0x0108, 0x0111, 0x0112, 0x0113, 0x0114, 0x0115, 0x0116, 0x0117, 0x0118 - .2byte 0x2101, 0x2102, 0x2103, 0x2104, 0x2105, 0x2106, 0x2107, 0x2108, 0x2111, 0x2112, 0x2113, 0x2114, 0x2115, 0x2116, 0x2117, 0x2118 - - .align 2 -gUnknown_085723DC:: @ 85723DC - .incbin "graphics/unknown/unknown_5723DC.gbapal" - - .align 2 -gUnknown_085723FC:: @ 85723FC - .incbin "graphics/unknown/unknown_5723FC.gbapal" - - .align 2 -gUnknown_0857241C:: @ 857241C - .incbin "graphics/unknown/unknown_57241C.gbapal" - - .align 2 -gUnknown_0857243C:: @ 857243C - .incbin "graphics/unknown/unknown_57243C.gbapal" - - .align 1 -gUnknown_0857245C:: @ 857245C - .2byte 0x014c, 0x014d, 0x014e, 0x014f, 0x0170, 0x0171, 0x0172, 0x0173, 0x0174, 0x015c, 0x015d, 0x015e, 0x015f, 0x0180, 0x0181, 0x0182 - .2byte 0x0183, 0x0184, 0x0175, 0x0176, 0x0177, 0x0178, 0x0179, 0x017a, 0x017b, 0x017c, 0x017d, 0x0185, 0x0186, 0x0187, 0x0188, 0x0189 - .2byte 0x018a, 0x018b, 0x018c, 0x018d - - .align 1 -gUnknown_085724A4:: @ 85724A4 - .2byte 0x1140, 0x1141, 0x1141, 0x1142, 0x1150, 0x1151, 0x1151, 0x1152, 0x1160, 0x1161, 0x1161, 0x1162 - - .align 1 -gUnknown_085724BC:: @ 85724BC - .2byte 0x1143, 0x1144, 0x1144, 0x1145, 0x1153, 0x1154, 0x1154, 0x1155, 0x1163, 0x1164, 0x1164, 0x1165 - - .align 2 -WaveformPalette:: @ 85724D4 - .incbin "graphics/pokemon_storage/waveform.gbapal" - - .align 2 -WaveformTiles:: @ 85724F4 - .incbin "graphics/pokemon_storage/waveform.4bpp" - - .align 2 -gUnknown_085726B4:: @ 85726B4 - .incbin "graphics/unused/unknown_5726B4.gbapal" - - .align 2 -gUnknown_085726F4:: @ 85726F4 - .incbin "graphics/unknown/unknown_5726F4.gbapal" - - .align 2 -gUnknown_08572714:: @ 8572714 - window_template 0x01, 0x00, 0x0b, 0x09, 0x07, 0x03, 0x00c0 - window_template 0x00, 0x0b, 0x11, 0x12, 0x02, 0x0f, 0x0014 - window_template 0x00, 0x00, 0x0d, 0x15, 0x07, 0x0f, 0x0014 - null_window_template - - .align 2 -gUnknown_08572734:: @ 8572734 - .4byte 0x000001d0, 0x004011e5, 0x000023ba, 0x000031ff - - .align 2 -gWaveformSpritePalette:: @ 8572744 - obj_pal WaveformPalette, 0xDACA - - .align 2 -gWaveformSpriteSheet:: @ 857274C - obj_tiles WaveformTiles, 0x1C0, 5 - -gUnknown_08572754:: @ 8572754 - spr_template 2, 0xDAC6, gOamData_857286C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_0857276C:: @ 857276C - .4byte gText_ExitFromBox, 0 - .4byte gText_WhatDoYouWantToDo, 0 - .4byte gText_PleasePickATheme, 0 - .4byte gText_PickTheWallpaper, 0 - .4byte gText_PkmnIsSelected, 1 - .4byte gText_JumpToWhichBox, 0 - .4byte gText_DepositInWhichBox, 0 - .4byte gText_PkmnWasDeposited, 1 - .4byte gText_BoxIsFull2, 0 - .4byte gText_ReleaseThisPokemon, 0 - .4byte gText_PkmnWasReleased, 4 - .4byte gText_ByeByePkmn, 6 - .4byte gText_MarkYourPkmn, 0 - .4byte gText_ThatsYourLastPkmn, 0 - .4byte gText_YourPartysFull, 0 - .4byte gText_YoureHoldingAPkmn, 0 - .4byte gText_WhichOneWillYouTake, 0 - .4byte gText_YouCantReleaseAnEgg, 0 - .4byte gText_ContinueBoxOperations, 0 - .4byte gText_PkmnCameBack, 1 - .4byte gText_WasItWorriedAboutYou, 0 - .4byte gText_FourEllipsesExclamation, 0 - .4byte gText_PleaseRemoveTheMail, 0 - .4byte gText_PkmnIsSelected, 7 - .4byte gText_GiveToAPkmn, 0 - .4byte gText_PlacedItemInBag, 7 - .4byte gText_BagIsFull2, 0 - .4byte gText_PutItemInBag, 0 - .4byte gText_ItemIsNowHeld, 7 - .4byte gText_ChangedToNewItem, 7 - .4byte gText_MailCantBeStored, 0 - - .align 2 -gUnknown_08572864:: @ 8572864 - window_template 0, 0x18, 0xB, 5, 4, 0xF, 0x5C - - .align 2 -gOamData_857286C:: @ 857286C - .2byte 0x0000 - .2byte 0xC000 - .2byte 0x0000 - - .align 2 -gOamData_8572874:: @ 8572874 - .2byte 0x4000 - .2byte 0x0000 - .2byte 0x0000 - - .align 2 -gSpriteAnim_857287C:: @ 857287C - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_8572884:: @ 8572884 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 6, 8 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_8572894:: @ 8572894 - obj_image_anim_frame 8, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_857289C:: @ 857289C - obj_image_anim_frame 10, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 12, 8 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_85728AC:: @ 85728AC - .4byte gSpriteAnim_857287C - .4byte gSpriteAnim_8572884 - .4byte gSpriteAnim_8572894 - .4byte gSpriteAnim_857289C - -gUnknown_085728BC:: @ 85728BC - spr_template 5, 0xDACA, gOamData_8572874, gSpriteAnimTable_85728AC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_085728D4:: @ 85728D4 - spr_template 0x12, 0xDAC0, gOamData_85728EC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gOamData_85728EC:: @ 85728EC - .2byte 0x0000 - .2byte 0x8000 - .2byte 0x0000 - - .align 2 -gSpriteAffineAnim_85728F4:: @ 85728F4 - obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 120 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_8572904:: @ 8572904 - obj_rot_scal_anim_frame 0x10, 0x10, 0, 0 - obj_rot_scal_anim_frame 0x10, 0x10, 0, 15 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_857291C:: @ 857291C - .4byte gSpriteAffineAnim_85728F4 - .4byte gSpriteAffineAnim_8572904 - - .align 2 -gWallpaperPalettes_Forest:: @ 8572924 - .incbin "graphics/pokemon_storage/forest_frame.gbapal" - .incbin "graphics/pokemon_storage/forest_bg.gbapal" - - .align 2 -gWallpaperTiles_Forest: @ 8572964 - .incbin "graphics/pokemon_storage/forest.4bpp.lz" - - .align 2 -gWallpaperTilemap_Forest:: @ 8572DE8 - .incbin "graphics/pokemon_storage/forest.bin.lz" - - .align 2 -gWallpaperPalettes_City: @ 8572EC8 - .incbin "graphics/pokemon_storage/city_frame.gbapal" - .incbin "graphics/pokemon_storage/city_bg.gbapal" - - .align 2 -gWallpaperTiles_City: @ 8572F08 - .incbin "graphics/pokemon_storage/city.4bpp.lz" - - .align 2 -gWallpaperTilemap_City: @ 8573220 - .incbin "graphics/pokemon_storage/city.bin.lz" - - .align 2 -gWallpaperPalettes_Desert: @ 85732FC - .incbin "graphics/pokemon_storage/desert_frame.gbapal" - .incbin "graphics/pokemon_storage/desert_bg.gbapal" - - .align 2 -gWallpaperTiles_Desert: @ 857333C - .incbin "graphics/pokemon_storage/desert.4bpp.lz" - - .align 2 -gWallpaperTilemap_Desert: @ 85736F0 - .incbin "graphics/pokemon_storage/desert.bin.lz" - - .align 2 -gWallpaperPalettes_Savanna: @ 85737EC - .incbin "graphics/pokemon_storage/savanna_frame.gbapal" - .incbin "graphics/pokemon_storage/savanna_bg.gbapal" - - .align 2 -gWallpaperTiles_Savanna: @ 857382C - .incbin "graphics/pokemon_storage/savanna.4bpp.lz" - - .align 2 -gWallpaperTilemap_Savanna: @ 8573C40 - .incbin "graphics/pokemon_storage/savanna.bin.lz" - - .align 2 -gWallpaperPalettes_Crag: @ 8573D44 - .incbin "graphics/pokemon_storage/crag_frame.gbapal" - .incbin "graphics/pokemon_storage/crag_bg.gbapal" - - .align 2 -gWallpaperTiles_Crag: @ 8573D84 - .incbin "graphics/pokemon_storage/crag.4bpp.lz" - - .align 2 -gWallpaperTilemap_Crag: @ 8574180 - .incbin "graphics/pokemon_storage/crag.bin.lz" - - .align 2 -gWallpaperPalettes_Volcano: @ 8573D44 - .incbin "graphics/pokemon_storage/volcano_frame.gbapal" - .incbin "graphics/pokemon_storage/volcano_bg.gbapal" - - .align 2 -gWallpaperTiles_Volcano: @ 8573D84 - .incbin "graphics/pokemon_storage/volcano.4bpp.lz" - - .align 2 -gWallpaperTilemap_Volcano: @ 85747A0 - .incbin "graphics/pokemon_storage/volcano.bin.lz" - - .align 2 -gWallpaperPalettes_Snow: @ 85748DC - .incbin "graphics/pokemon_storage/snow_frame.gbapal" - .incbin "graphics/pokemon_storage/snow_bg.gbapal" - - .align 2 -gWallpaperTiles_Snow: @ 857491C - .incbin "graphics/pokemon_storage/snow.4bpp.lz" - - .align 2 -gWallpaperTilemap_Snow: @ 8574D7C - .incbin "graphics/pokemon_storage/snow.bin.lz" - - .align 2 -gWallpaperPalettes_Cave: @ 8574E88 - .incbin "graphics/pokemon_storage/cave_frame.gbapal" - .incbin "graphics/pokemon_storage/cave_bg.gbapal" - - .align 2 -gWallpaperTiles_Cave: @ 8574EC8 - .incbin "graphics/pokemon_storage/cave.4bpp.lz" - - .align 2 -gWallpaperTilemap_Cave: @ 85752A0 - .incbin "graphics/pokemon_storage/cave.bin.lz" - - .align 2 -gWallpaperPalettes_Beach: @ 8575378 - .incbin "graphics/pokemon_storage/beach_frame.gbapal" - .incbin "graphics/pokemon_storage/beach_bg.gbapal" - - .align 2 -gWallpaperTiles_Beach: @ 85753B8 - .incbin "graphics/pokemon_storage/beach.4bpp.lz" - - .align 2 -gWallpaperTilemap_Beach: @ 8575788 - .incbin "graphics/pokemon_storage/beach.bin.lz" - - .align 2 -gWallpaperPalettes_Seafloor: @ 8575888 - .incbin "graphics/pokemon_storage/seafloor_frame.gbapal" - .incbin "graphics/pokemon_storage/seafloor_bg.gbapal" - - .align 2 -gWallpaperTiles_Seafloor: @ 85758C8 - .incbin "graphics/pokemon_storage/seafloor.4bpp.lz" - - .align 2 -gWallpaperTilemap_Seafloor: @ 8575BC4 - .incbin "graphics/pokemon_storage/seafloor.bin.lz" - - .align 2 -gWallpaperPalettes_River: @ 8575CD8 - .incbin "graphics/pokemon_storage/river_frame.gbapal" - .incbin "graphics/pokemon_storage/river_bg.gbapal" - - .align 2 -gWallpaperTiles_River: @ 8575D18 - .incbin "graphics/pokemon_storage/river.4bpp.lz" - - .align 2 -gWallpaperTilemap_River: @ 8576100 - .incbin "graphics/pokemon_storage/river.bin.lz" - - .align 2 -gWallpaperPalettes_Sky: @ 85761F8 - .incbin "graphics/pokemon_storage/sky_frame.gbapal" - .incbin "graphics/pokemon_storage/sky_bg.gbapal" - - .align 2 -gWallpaperTiles_Sky: @ 8576238 - .incbin "graphics/pokemon_storage/sky.4bpp.lz" - - .align 2 -gWallpaperTilemap_Sky: @ 85765C0 - .incbin "graphics/pokemon_storage/sky.bin.lz" - - .align 2 -gWallpaperPalettes_PolkaDot: @ 85766B0 - .incbin "graphics/pokemon_storage/polkadot_frame.gbapal" - .incbin "graphics/pokemon_storage/polkadot_bg.gbapal" - - .align 2 -gWallpaperTiles_PolkaDot: @ 85766F0 - .incbin "graphics/pokemon_storage/polkadot.4bpp.lz" - - .align 2 -gWallpaperTilemap_PolkaDot: @ 85769B8 - .incbin "graphics/pokemon_storage/polkadot.bin.lz" - - .align 2 -gWallpaperPalettes_Pokecenter: @ 8576AB8 - .incbin "graphics/pokemon_storage/pokecenter_frame.gbapal" - .incbin "graphics/pokemon_storage/pokecenter_bg.gbapal" - - .align 2 -gWallpaperTiles_Pokecenter: @ 8576AF8 - .incbin "graphics/pokemon_storage/pokecenter.4bpp.lz" - - .align 2 -gWallpaperTilemap_Pokecenter: @ 8576D74 - .incbin "graphics/pokemon_storage/pokecenter.bin.lz" - - .align 2 -gWallpaperPalettes_Machine: @ 8576E74 - .incbin "graphics/pokemon_storage/machine_frame.gbapal" - .incbin "graphics/pokemon_storage/machine_bg.gbapal" - - .align 2 -gWallpaperTiles_Machine: @ 8576EB4 - .incbin "graphics/pokemon_storage/machine.4bpp.lz" - - .align 2 -gWallpaperTilemap_Machine: @ 8577108 - .incbin "graphics/pokemon_storage/machine.bin.lz" - - .align 2 -gWallpaperPalettes_Plain: @ 85771CC - .incbin "graphics/pokemon_storage/plain_frame.gbapal" - .incbin "graphics/pokemon_storage/plain_bg.gbapal" - - .align 2 -gWallpaperTiles_Plain: @ 857720C - .incbin "graphics/pokemon_storage/plain.4bpp.lz" - - .align 2 -gWallpaperTilemap_Plain: @ 857732C - .incbin "graphics/pokemon_storage/plain.bin.lz" - -@ 12×18 tilemap - .incbin "graphics/unused/tilemap_5773C4.bin" - - .align 1 -gUnknown_08577574:: @ 8577574 - .2byte 0x1CE7, 0x7FFF - .2byte 0x1CE7, 0x7FFF - .2byte 0x1CE7, 0x7FFF - .2byte 0x1CE7, 0x7FFF - .2byte 0x1CE7, 0x7FFF - .2byte 0x1CE7, 0x7FFF - .2byte 0x1CE7, 0x7FFF - .2byte 0x1CE7, 0x7FFF - .2byte 0x1CE7, 0x7FFF - .2byte 0x1CE7, 0x7FFF - .2byte 0x1CE7, 0x7FFF - .2byte 0x1CE7, 0x7FFF - .2byte 0x1CE7, 0x7FFF - .2byte 0x1CE7, 0x7FFF - .2byte 0x1CE7, 0x7FFF - .2byte 0x1CE7, 0x7FFF - .2byte 0x1CE7, 0x7FFF - - .align 2 -gWallpaperTable:: @ 85775B8 - @ Forest - .4byte gWallpaperTiles_Forest - .4byte gWallpaperTilemap_Forest - .4byte gWallpaperPalettes_Forest - - @ City - .4byte gWallpaperTiles_City - .4byte gWallpaperTilemap_City - .4byte gWallpaperPalettes_City - - @ Desert - .4byte gWallpaperTiles_Desert - .4byte gWallpaperTilemap_Desert - .4byte gWallpaperPalettes_Desert - - @ Savanna - .4byte gWallpaperTiles_Savanna - .4byte gWallpaperTilemap_Savanna - .4byte gWallpaperPalettes_Savanna - - @ Crag - .4byte gWallpaperTiles_Crag - .4byte gWallpaperTilemap_Crag - .4byte gWallpaperPalettes_Crag - - @ Volcano - .4byte gWallpaperTiles_Volcano - .4byte gWallpaperTilemap_Volcano - .4byte gWallpaperPalettes_Volcano - - @ Snow - .4byte gWallpaperTiles_Snow - .4byte gWallpaperTilemap_Snow - .4byte gWallpaperPalettes_Snow - - @ Cave - .4byte gWallpaperTiles_Cave - .4byte gWallpaperTilemap_Cave - .4byte gWallpaperPalettes_Cave - - @ Beach - .4byte gWallpaperTiles_Beach - .4byte gWallpaperTilemap_Beach - .4byte gWallpaperPalettes_Beach - - @ Seafloor - .4byte gWallpaperTiles_Seafloor - .4byte gWallpaperTilemap_Seafloor - .4byte gWallpaperPalettes_Seafloor - - @ River - .4byte gWallpaperTiles_River - .4byte gWallpaperTilemap_River - .4byte gWallpaperPalettes_River - - @ Sky - .4byte gWallpaperTiles_Sky - .4byte gWallpaperTilemap_Sky - .4byte gWallpaperPalettes_Sky - - @ PolkaDot - .4byte gWallpaperTiles_PolkaDot - .4byte gWallpaperTilemap_PolkaDot - .4byte gWallpaperPalettes_PolkaDot - - @ Pokecenter - .4byte gWallpaperTiles_Pokecenter - .4byte gWallpaperTilemap_Pokecenter - .4byte gWallpaperPalettes_Pokecenter - - @ Machine - .4byte gWallpaperTiles_Machine - .4byte gWallpaperTilemap_Machine - .4byte gWallpaperPalettes_Machine - - @ Plain - .4byte gWallpaperTiles_Plain - .4byte gWallpaperTilemap_Plain - .4byte gWallpaperPalettes_Plain - - .align 2 -PCGfx_Arrow: @ 8577678 - .incbin "graphics/pokemon_storage/arrow.4bpp" - - .align 2 -gWallpaperPalettes_Zigzagoon:: @ 85776F8 - .incbin "graphics/pokemon_storage/friends_frame1.gbapal" - .incbin "graphics/pokemon_storage/zigzagoon_bg.gbapal" - - .align 2 -gWallpaperTiles_Zigzagoon: @ 8577738 - .incbin "graphics/pokemon_storage/zigzagoon.4bpp.lz" - - .align 2 -gWallpaperTilemap_Zigzagoon: @ 857792C - .incbin "graphics/pokemon_storage/zigzagoon.bin.lz" - - .align 2 -gWallpaperPalettes_Screen:: @ 8577A44 - .incbin "graphics/pokemon_storage/friends_frame1.gbapal" - .incbin "graphics/pokemon_storage/screen_bg.gbapal" - - .align 2 -gWallpaperTiles_Screen: @ 8577A84 - .incbin "graphics/pokemon_storage/screen.4bpp.lz" - - .align 2 -gWallpaperTilemap_Screen: @ 8577D00 - .incbin "graphics/pokemon_storage/screen.bin.lz" - - .align 2 -gWallpaperPalettes_Diagonal:: @ 8577E2C - .incbin "graphics/pokemon_storage/friends_frame1.gbapal" - .incbin "graphics/pokemon_storage/diagonal_bg.gbapal" - - .align 2 -gWallpaperTiles_Diagonal: @ 8577E6C - .incbin "graphics/pokemon_storage/diagonal.4bpp.lz" - - .align 2 -gWallpaperTilemap_Diagonal: @ 8578058 - .incbin "graphics/pokemon_storage/diagonal.bin.lz" - - .align 2 -gWallpaperPalettes_Block:: @ 8578148 - .incbin "graphics/pokemon_storage/block_bg.gbapal" - .incbin "graphics/pokemon_storage/block_bg.gbapal" - - .align 2 -gWallpaperTiles_Block: @ 8578188 - .incbin "graphics/pokemon_storage/block.4bpp.lz" - - .align 2 -gWallpaperTilemap_Block: @ 8578358 - .incbin "graphics/pokemon_storage/block.bin.lz" - - .align 2 -gWallpaperPalettes_Pokecenter2:: @ 8578450 - .incbin "graphics/pokemon_storage/pokecenter2_bg.gbapal" - .incbin "graphics/pokemon_storage/pokecenter2_bg.gbapal" - - .align 2 -gWallpaperTiles_Pokecenter2: @ 8578490 - .incbin "graphics/pokemon_storage/pokecenter2.4bpp.lz" - - .align 2 -gWallpaperTilemap_Pokecenter2: @ 85786D0 - .incbin "graphics/pokemon_storage/pokecenter2.bin.lz" - - .align 2 -gWallpaperPalettes_Frame:: @ 85787E4 - .incbin "graphics/pokemon_storage/frame_bg.gbapal" - .incbin "graphics/pokemon_storage/frame_bg.gbapal" - - .align 2 -gWallpaperTiles_Frame: @ 8578824 - .incbin "graphics/pokemon_storage/frame.4bpp.lz" - - .align 2 -gWallpaperTilemap_Frame: @ 8578A34 - .incbin "graphics/pokemon_storage/frame.bin.lz" - - .align 2 -gWallpaperPalettes_Blank:: @ 8578B48 - .incbin "graphics/pokemon_storage/friends_frame1.gbapal" - .incbin "graphics/pokemon_storage/zigzagoon_bg.gbapal" - - .align 2 -gWallpaperTiles_Blank: @ 8578B88 - .incbin "graphics/pokemon_storage/blank.4bpp.lz" - - .align 2 -gWallpaperTilemap_Blank: @ 8578D34 - .incbin "graphics/pokemon_storage/blank.bin.lz" - - .align 2 -gWallpaperPalettes_Circles:: @ 8578E10 - .incbin "graphics/pokemon_storage/friends_frame2.gbapal" - .incbin "graphics/pokemon_storage/circles_bg.gbapal" - - .align 2 -gWallpaperTiles_Circles: @ 8578E50 - .incbin "graphics/pokemon_storage/circles.4bpp.lz" - - .align 2 -gWallpaperTilemap_Circles: @ 85790A4 - .incbin "graphics/pokemon_storage/circles.bin.lz" - - .align 2 -gWallpaperPalettes_Azumarill:: @ 85791A0 - .incbin "graphics/pokemon_storage/friends_frame2.gbapal" - .incbin "graphics/pokemon_storage/azumarill_bg.gbapal" - - .align 2 -gWallpaperTiles_Azumarill: @ 85791E0 - .incbin "graphics/pokemon_storage/azumarill.4bpp.lz" - - .align 2 -gWallpaperTilemap_Azumarill: @ 85793CC - .incbin "graphics/pokemon_storage/azumarill.bin.lz" - - .align 2 -gWallpaperPalettes_Pikachu:: @ 85794C4 - .incbin "graphics/pokemon_storage/friends_frame2.gbapal" - .incbin "graphics/pokemon_storage/pikachu_bg.gbapal" - - .align 2 -gWallpaperTiles_Pikachu: @ 8579504 - .incbin "graphics/pokemon_storage/pikachu.4bpp.lz" - - .align 2 -gWallpaperTilemap_Pikachu: @ 8579738 - .incbin "graphics/pokemon_storage/pikachu.bin.lz" - - .align 2 -gWallpaperPalettes_Legendary:: @ 8579860 - .incbin "graphics/pokemon_storage/friends_frame2.gbapal" - .incbin "graphics/pokemon_storage/legendary_bg.gbapal" - - .align 2 -gWallpaperTiles_Legendary: @ 85798A0 - .incbin "graphics/pokemon_storage/legendary.4bpp.lz" - - .align 2 -gWallpaperTilemap_Legendary: @ 8579B80 - .incbin "graphics/pokemon_storage/legendary.bin.lz" - - .align 2 -gWallpaperPalettes_Dusclops:: @ 8579CC4 - .incbin "graphics/pokemon_storage/friends_frame2.gbapal" - .incbin "graphics/pokemon_storage/dusclops_bg.gbapal" - - .align 2 -gWallpaperTiles_Dusclops: @ 8579D04 - .incbin "graphics/pokemon_storage/dusclops.4bpp.lz" - - .align 2 -gWallpaperTilemap_Dusclops: @ 8579F50 - .incbin "graphics/pokemon_storage/dusclops.bin.lz" - - .align 2 -gWallpaperPalettes_Ludicolo:: @ 857A048 - .incbin "graphics/pokemon_storage/friends_frame2.gbapal" - .incbin "graphics/pokemon_storage/ludicolo_bg.gbapal" - - .align 2 -gWallpaperTiles_Ludicolo: @ 857A088 - .incbin "graphics/pokemon_storage/ludicolo.4bpp.lz" - - .align 2 -gWallpaperTilemap_Ludicolo: @ 857A348 - .incbin "graphics/pokemon_storage/ludicolo.bin.lz" - - .align 2 -gWallpaperPalettes_Whiscash:: @ 857A468 - .incbin "graphics/pokemon_storage/friends_frame2.gbapal" - .incbin "graphics/pokemon_storage/whiscash_bg.gbapal" - - .align 2 -gWallpaperTiles_Whiscash: @ 857A4A8 - .incbin "graphics/pokemon_storage/whiscash.4bpp.lz" - - .align 2 -gWallpaperTilemap_Whiscash: @ 857A6F0 - .incbin "graphics/pokemon_storage/whiscash.bin.lz" - - .align 2 -gWallpaperIcon_Aqua: @ 857A81C - .incbin "graphics/pokemon_storage/aqua_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_Heart: @ 857A860 - .incbin "graphics/pokemon_storage/heart_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_FiveStar: @ 857A89C - .incbin "graphics/pokemon_storage/five_star_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_Brick: @ 857A8DC - .incbin "graphics/pokemon_storage/brick_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_FourStar: @ 857A904 - .incbin "graphics/pokemon_storage/four_star_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_Asterisk: @ 857A940 - .incbin "graphics/pokemon_storage/asterisk_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_Dot: @ 857A990 - .incbin "graphics/pokemon_storage/dot_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_LineCircle: @ 857A9C0 - .incbin "graphics/pokemon_storage/line_circle_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_PokeBall: @ 857A9EC - .incbin "graphics/pokemon_storage/pokeball_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_Maze: @ 857AA38 - .incbin "graphics/pokemon_storage/maze_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_Footprint: @ 857AA7C - .incbin "graphics/pokemon_storage/footprint_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_BigAsterisk: @ 857AAC4 - .incbin "graphics/pokemon_storage/big_asterisk_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_Circle: @ 857AB08 - .incbin "graphics/pokemon_storage/circle_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_Koffing: @ 857AB48 - .incbin "graphics/pokemon_storage/koffing_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_Ribbon: @ 857AB98 - .incbin "graphics/pokemon_storage/ribbon_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_FourCircles: @ 857AC00 - .incbin "graphics/pokemon_storage/four_circles_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_Lotad: @ 857AC30 - .incbin "graphics/pokemon_storage/lotad_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_Crystal: @ 857AC74 - .incbin "graphics/pokemon_storage/crystal_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_Pichu: @ 857ACBC - .incbin "graphics/pokemon_storage/pichu_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_Diglett: @ 857ACF4 - .incbin "graphics/pokemon_storage/diglett_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_Luvdisc: @ 857AD44 - .incbin "graphics/pokemon_storage/luvdisc_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_StarInCircle: @ 857AD88 - .incbin "graphics/pokemon_storage/star_in_circle_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_Spinda: @ 857ADCC - .incbin "graphics/pokemon_storage/spinda_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_Latis: @ 857AE20 - .incbin "graphics/pokemon_storage/latis_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_Minun: @ 857AE64 - .incbin "graphics/pokemon_storage/minun_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_Togepi: @ 857AEAC - .incbin "graphics/pokemon_storage/togepi_icon.4bpp.lz" - - .align 2 -gWallpaperIcon_Magma: @ 857AF08 - .incbin "graphics/pokemon_storage/magma_icon.4bpp.lz" - - .align 2 -gUnknown_0857AF44:: @ 857AF44 - .4byte gWallpaperTiles_Zigzagoon, gWallpaperTilemap_Zigzagoon, gWallpaperPalettes_Zigzagoon - .4byte gWallpaperTiles_Screen, gWallpaperTilemap_Screen, gWallpaperPalettes_Screen - .4byte gWallpaperTiles_Horizontal, gWallpaperTilemap_Horizontal, gWallpaperPalettes_Horizontal - .4byte gWallpaperTiles_Diagonal, gWallpaperTilemap_Diagonal, gWallpaperPalettes_Diagonal - .4byte gWallpaperTiles_Block, gWallpaperTilemap_Block, gWallpaperPalettes_Block - .4byte gWallpaperTiles_Ribbon, gWallpaperTilemap_Ribbon, gWallpaperPalettes_Ribbon - .4byte gWallpaperTiles_Pokecenter2, gWallpaperTilemap_Pokecenter2, gWallpaperPalettes_Pokecenter2 - .4byte gWallpaperTiles_Frame, gWallpaperTilemap_Frame, gWallpaperPalettes_Frame - .4byte gWallpaperTiles_Blank, gWallpaperTilemap_Blank, gWallpaperPalettes_Blank - .4byte gWallpaperTiles_Circles, gWallpaperTilemap_Circles, gWallpaperPalettes_Circles - .4byte gWallpaperTiles_Azumarill, gWallpaperTilemap_Azumarill, gWallpaperPalettes_Azumarill - .4byte gWallpaperTiles_Pikachu, gWallpaperTilemap_Pikachu, gWallpaperPalettes_Pikachu - .4byte gWallpaperTiles_Legendary, gWallpaperTilemap_Legendary, gWallpaperPalettes_Legendary - .4byte gWallpaperTiles_Dusclops, gWallpaperTilemap_Dusclops, gWallpaperPalettes_Dusclops - .4byte gWallpaperTiles_Ludicolo, gWallpaperTilemap_Ludicolo, gWallpaperPalettes_Ludicolo - .4byte gWallpaperTiles_Whiscash, gWallpaperTilemap_Whiscash, gWallpaperPalettes_Whiscash - - .align 2 -gUnknown_0857B004:: @ 857B004 - .4byte gWallpaperIcon_Aqua - .4byte gWallpaperIcon_Heart - .4byte gWallpaperIcon_FiveStar - .4byte gWallpaperIcon_Brick - .4byte gWallpaperIcon_FourStar - .4byte gWallpaperIcon_Asterisk - .4byte gWallpaperIcon_Dot - .4byte gWallpaperIcon_Cross - .4byte gWallpaperIcon_LineCircle - .4byte gWallpaperIcon_PokeBall - .4byte gWallpaperIcon_Maze - .4byte gWallpaperIcon_Footprint - .4byte gWallpaperIcon_BigAsterisk - .4byte gWallpaperIcon_Circle - .4byte gWallpaperIcon_Koffing - .4byte gWallpaperIcon_Ribbon - .4byte gWallpaperIcon_Bolt - .4byte gWallpaperIcon_FourCircles - .4byte gWallpaperIcon_Lotad - .4byte gWallpaperIcon_Crystal - .4byte gWallpaperIcon_Pichu - .4byte gWallpaperIcon_Diglett - .4byte gWallpaperIcon_Luvdisc - .4byte gWallpaperIcon_StarInCircle - .4byte gWallpaperIcon_Spinda - .4byte gWallpaperIcon_Latis - .4byte gWallpaperIcon_Plusle - .4byte gWallpaperIcon_Minun - .4byte gWallpaperIcon_Togepi - .4byte gWallpaperIcon_Magma - - .align 2 -gUnknown_0857B07C:: @ 857B07C - .4byte 0x23BA - - .align 2 -gUnknown_0857B080:: @ 857B080 - obj_tiles PCGfx_Arrow, 128, 0x0006 - - .align 2 -gOamData_857B088:: @ 857B088 - .2byte 0x4000 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gSpriteAnim_857B090:: @ 857B090 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_857B098:: @ 857B098 - obj_image_anim_frame 8, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_857B0A0:: @ 857B0A0 - .4byte gSpriteAnim_857B090 - .4byte gSpriteAnim_857B098 - - .align 2 -gSpriteTemplate_857B0A8:: @ 857B0A8 - spr_template 0x0003, 0xDAC9, gOamData_857B088, gSpriteAnimTable_857B0A0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gOamData_857B0C0:: @ 857B0C0 - .2byte 0x8000 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gSpriteAnim_857B0C8:: @ 857B0C8 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_857B0D0:: @ 857B0D0 - obj_image_anim_frame 2, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_857B0D8:: @ 857B0D8 - .4byte gSpriteAnim_857B0C8 - .4byte gSpriteAnim_857B0D0 - -gUnknown_0857B0E0:: @ 857B0E0 - spr_template 0x0006, 0xDACA, gOamData_857B0C0, gSpriteAnimTable_857B0D8, NULL, gDummySpriteAffineAnimTable, sub_80CD210 - - .align 2 -HandCursorPalette: @ 857B0F8 - .incbin "graphics/pokemon_storage/hand_cursor.gbapal" - - .align 2 -HandCursorTiles: @ 857B118 - .incbin "graphics/pokemon_storage/hand_cursor.4bpp" - - .align 2 -HandCursorShadowTiles: @ 857B918 - .incbin "graphics/pokemon_storage/hand_cursor_shadow.4bpp" - - .align 2 -gUnknown_0857B998:: @ 857B998 - .4byte sub_80CDCCC - .4byte sub_80CDD5C - .4byte sub_80CDDD8 - - .align 2 -gUnknown_0857B9A4:: @ 857B9A4 - .byte 0x22, 0x00 - .2byte 0x0039 - .byte 0x22, 0x00 - .2byte 0x0123 - .byte 0x10, 0x0a - .2byte 0x0046 - .byte 0x10, 0x0a - .2byte 0x00f9 - .byte 0x10, 0x0e - .2byte 0x0046 - .byte 0x10, 0x0e - .2byte 0x00f9 - - .align 2 -gUnknown_0857B9BC:: @ 857B9BC - .4byte sub_80CF0CC, 0 - .4byte sub_80CF5C4, 1 - .4byte sub_80CF7E4, 2 - .4byte sub_80CF8D8, 3 - .4byte NULL, 0 - - .align 2 -gHandCursorSpriteSheets:: @ 857B9E4 - obj_tiles HandCursorTiles, 0x0800, 0x0000 - obj_tiles HandCursorShadowTiles, 0x0080, 0x0001 - null_obj_tiles - - .align 2 -gHandCursorSpritePalettes:: @ 857B9FC - obj_pal HandCursorPalette, 0xDAC7 - null_obj_pal - - .align 2 -gOamData_857BA0C:: @ 857BA0C - .2byte 0x0000 - .2byte 0x8000 - .2byte 0x0400 - - .align 2 -gOamData_857BA14:: @ 857BA14 - .2byte 0x0000 - .2byte 0x4000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_857BA1C:: @ 857BA1C - obj_image_anim_frame 0, 30 - obj_image_anim_frame 16, 30 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_857BA28:: @ 857BA28 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_857BA30:: @ 857BA30 - obj_image_anim_frame 32, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_857BA38:: @ 857BA38 - obj_image_anim_frame 48, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_857BA40:: @ 857BA40 - .4byte gSpriteAnim_857BA1C - .4byte gSpriteAnim_857BA28 - .4byte gSpriteAnim_857BA30 - .4byte gSpriteAnim_857BA38 - - .align 2 -gSpriteTemplate_857BA50:: @ 857BA50 - spr_template 0, 0xDACA, gOamData_857BA0C, gSpriteAnimTable_857BA40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_857BA68:: @ 857BA68 - spr_template 1, 0xDACA, gOamData_857BA14, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CFBF4 - - .align 2 -gUnknown_0857BA80:: @ 857BA80 - .4byte gPCText_Cancel - .4byte gPCText_Store - .4byte gPCText_Withdraw - .4byte gPCText_Move - .4byte gPCText_Shift - .4byte gPCText_Place - .4byte gPCText_Summary - .4byte gPCText_Release - .4byte gPCText_Mark - .4byte gPCText_Jump - .4byte gPCText_Wallpaper - .4byte gPCText_Name - .4byte gPCText_Take - .4byte gPCText_Give - .4byte gPCText_Give - .4byte gPCText_Switch - .4byte gPCText_Bag - .4byte gPCText_Info - .4byte gPCText_Scenery1 - .4byte gPCText_Scenery2 - .4byte gPCText_Scenery3 - .4byte gPCText_Etcetera - .4byte gPCText_Friends - .4byte gPCText_Forest - .4byte gPCText_City - .4byte gPCText_Desert - .4byte gPCText_Savanna - .4byte gPCText_Crag - .4byte gPCText_Volcano - .4byte gPCText_Snow - .4byte gPCText_Cave - .4byte gPCText_Beach - .4byte gPCText_Seafloor - .4byte gPCText_River - .4byte gPCText_Sky - .4byte gPCText_PolkaDot - .4byte gPCText_Pokecenter - .4byte gPCText_Machine - .4byte gPCText_Simple - - .align 2 -gUnknown_0857BB1C:: @ 857BB1C - window_template 0x00, 0x0a, 0x03, 0x14, 0x12, 0x09, 0x000a - - .align 2 -gUnknown_0857BB24:: @ 857BB24 - .incbin "graphics/pokemon_storage/unknown_frame.4bpp" - - .align 2 -gOamData_857BBA4:: @ 857BBA4 - .2byte 0x0100, 0x8000, 0x0400, 0x0000 - - .align 2 -gSpriteAffineAnim_857BBAC:: @ 857BBAC - .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_857BBBC:: @ 857BBBC - .2byte 0x0058, 0x0058, 0x0000, 0x0000, 0x0005, 0x0005, 0x0800, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_857BBD4:: @ 857BBD4 - .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0xfffb, 0xfffb, 0x0800, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_857BBEC:: @ 857BBEC - .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x000a, 0x000a, 0x0c00, 0x0000, 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_857BC0C:: @ 857BC0C - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0xfff6, 0xfff6, 0x0c00, 0x0000, 0x0080, 0x0080, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_857BC2C:: @ 857BC2C - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0xfffb, 0xfffb, 0x1000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnim_857BC44:: @ 857BC44 - .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 - - .align 2 -gSpriteAffineAnimTable_857BC54:: @ 857BC54 - .4byte gSpriteAffineAnim_857BBAC - .4byte gSpriteAffineAnim_857BBBC - .4byte gSpriteAffineAnim_857BBD4 - .4byte gSpriteAffineAnim_857BBEC - .4byte gSpriteAffineAnim_857BC0C - .4byte gSpriteAffineAnim_857BC2C - .4byte gSpriteAffineAnim_857BC44 - - .align 2 -gSpriteTemplate_857BC70:: @ 857BC70 - spr_template 0x0007, 0xdacb, gOamData_857BBA4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_857BC54, SpriteCallbackDummy - -gSpriteTemplate_857BC88:: @ 857BC88 - .2byte 0x0100, 0x0100, 0x0200, 0x0100, 0x0100, 0x0200, 0x0200, 0x0200, 0x0080, 0x0080, 0x0100, 0x0100, 0x0200, 0x0200, 0x0400, 0x0400 - diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index 4ce7489c2..034732db2 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -28,27 +28,26 @@ EventScript_Apprentice:: @ 82B688D setvar VAR_0x8004, 0 special CallApprenticeFunction compare VAR_RESULT, 0 - goto_eq Script_Apprentice_FirstMeeting + goto_if_eq Script_Apprentice_FirstMeeting setvar VAR_0x8004, 10 special CallApprenticeFunction compare VAR_0x8004, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B68BE - checkflag FLAG_0x934 - goto_eq Script_Apprentice_ReleaseAndEnd + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B68BE + goto_if_set FLAG_0x934, Script_Apprentice_ReleaseAndEnd BattleFrontier_BattleTowerLobby_EventScript_2B68BE: setvar VAR_0x8004, 11 special CallApprenticeFunction compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B69D3 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B69D3 compare VAR_RESULT, 4 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6ACF + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6ACF compare VAR_RESULT, 3 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6C77 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6C77 compare VAR_RESULT, 1 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6D5C + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6D5C compare VAR_RESULT, 5 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6DD4 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6DD4 release releaseall end @@ -60,7 +59,7 @@ Script_Apprentice_FirstMeeting: Script_Apprentice_FirstMeetingNag: apprentice_menu APPRENTICE_ASK_YES_NO compare VAR_RESULT, 1 - goto_eq Script_Apprentice_FirstMeetingAskAgain + goto_if_eq Script_Apprentice_FirstMeetingAskAgain apprentice_msg FALSE, 2 apprentice_menu APPRENTICE_ASK_WHICH_LEVEL setvar VAR_0x8004, 1 @@ -93,9 +92,9 @@ BattleFrontier_BattleTowerLobby_EventScript_2B69D3: apprentice_menu APPRENTICE_ASK_2SPECIES copyvar VAR_0x8005, VAR_RESULT compare VAR_0x8005, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6ABA + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6ABA compare VAR_0x8005, 1 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6AC0 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6AC0 setvar VAR_0x8004, 12 special CallApprenticeFunction copyvar VAR_0x8006, VAR_RESULT @@ -106,7 +105,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B69D3: setvar VAR_0x8004, 12 special CallApprenticeFunction compare VAR_RESULT, 3 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6AC6 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6AC6 setvar VAR_0x8004, 16 setvar VAR_0x8005, 0 copyvar VAR_0x8006, VAR_0x8007 @@ -151,11 +150,11 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6B09: special CallApprenticeFunction waitstate compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B81 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B81 setvar VAR_0x8004, 20 special CallApprenticeFunction compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6C0C + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6C0C apprentice_buff 0, APPRENTICE_BUFF_ITEM apprentice_msg TRUE, 12 setvar VAR_0x8004, 5 @@ -178,7 +177,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6B81: setvar VAR_0x8004, 15 special CallApprenticeFunction compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B09 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B09 BattleFrontier_BattleTowerLobby_EventScript_2B6BD4: apprentice_msg TRUE, 14 @@ -203,7 +202,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6C0C: setvar VAR_0x8004, 15 special CallApprenticeFunction compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B09 + goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B09 goto BattleFrontier_BattleTowerLobby_EventScript_2B6BD4 end @@ -218,9 +217,9 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6C77: apprentice_menu APPRENTICE_ASK_MOVES copyvar VAR_0x8005, VAR_RESULT compare VAR_0x8005, 0 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6D50 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6D50 compare VAR_0x8005, 1 - call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6D56 + call_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B6D56 setvar VAR_0x8004, 17 special CallApprenticeFunction setvar VAR_0x8004, 5 @@ -297,7 +296,7 @@ Script_Apprentice_LeaveGoRight: setvar VAR_0x8004, 24 special CallApprenticeFunction compare VAR_0x8004, 0 - goto_eq Script_Apprentice_End + goto_if_eq Script_Apprentice_End applymovement 6, BattleFrontier_BattleTowerLobby_Movement_2B6E94 waitmovement 0 end @@ -306,7 +305,7 @@ Script_Apprentice_Leave: setvar VAR_0x8004, 24 special CallApprenticeFunction compare VAR_0x8004, 0 - goto_eq Script_Apprentice_End + goto_if_eq Script_Apprentice_End applymovement 6, BattleFrontier_BattleTowerLobby_Movement_2B6E95 waitmovement 0 end diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index f4208afd0..685949006 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -23,7 +23,7 @@ Route102_EventScript_274359:: @ 8274359 faceplayer specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 1 - goto_eq Route102_EventScript_274374 + goto_if_eq Route102_EventScript_274374 message Route102_Text_2744F0 waitmessage waitbuttonpress @@ -33,9 +33,9 @@ Route102_EventScript_274359:: @ 8274359 Route102_EventScript_274374:: @ 8274374 msgbox Route102_Text_274507, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route102_EventScript_274393 + goto_if_eq Route102_EventScript_274393 compare VAR_RESULT, 0 - goto_eq Route102_EventScript_2743AF + goto_if_eq Route102_EventScript_2743AF end Route102_EventScript_274393:: @ 8274393 @@ -44,7 +44,7 @@ Route102_EventScript_274393:: @ 8274393 special Bag_ChooseBerry waitstate compare VAR_ITEM_ID, 0 - goto_eq Route102_EventScript_2743AF + goto_if_eq Route102_EventScript_2743AF takeitem VAR_ITEM_ID, 1 call Route102_EventScript_2744DD @@ -87,9 +87,9 @@ Route102_EventScript_2743E1:: @ 82743E1 Route102_EventScript_2743F6:: @ 82743F6 compare VAR_0x8005, 0 - goto_eq Route102_EventScript_27441A + goto_if_eq Route102_EventScript_27441A compare VAR_0x8005, 4 - goto_eq Route102_EventScript_274413 + goto_if_eq Route102_EventScript_274413 bufferstring 1, Route102_Text_2745E5 return @@ -108,14 +108,14 @@ Route102_EventScript_274421:: @ 8274421 special EventObjectInteractionGetBerryCountString msgbox Route102_Text_2745EE, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route102_EventScript_274448 + goto_if_eq Route102_EventScript_274448 compare VAR_RESULT, 0 - goto_eq Route102_EventScript_274479 + goto_if_eq Route102_EventScript_274479 Route102_EventScript_274448:: @ 8274448 special EventObjectInteractionPickBerryTree compare VAR_0x8004, 0 - goto_eq Route102_EventScript_274470 + goto_if_eq Route102_EventScript_274470 special sub_80EED34 special EventObjectInteractionRemoveBerryTree message Route102_Text_27461B @@ -153,13 +153,13 @@ Route102_EventScript_274482:: @ 8274482 Route102_EventScript_27448D:: @ 827448D checkitem ITEM_WAILMER_PAIL, 1 compare VAR_RESULT, 0 - goto_eq Route102_EventScript_2744BE + goto_if_eq Route102_EventScript_2744BE special EventObjectInteractionGetBerryName msgbox Route102_Text_2746E4, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route102_EventScript_2744C4 + goto_if_eq Route102_EventScript_2744C4 compare VAR_RESULT, 0 - goto_eq Route102_EventScript_2744BE + goto_if_eq Route102_EventScript_2744BE Route102_EventScript_2744BE:: @ 82744BE releaseall @@ -174,7 +174,7 @@ Route102_EventScript_2744C4:: @ 82744C4 message Route102_Text_274710 waitmessage special EventObjectInteractionWaterBerryTree - special sub_80FAFF8 + special DoWateringBerryTreeAnim waitstate message Route102_Text_274723 waitmessage diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index f77017830..b73d7e1fa 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -21,10 +21,10 @@ VerdanturfTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF OldaleTown_PokemonCenter_2F_EventScript_276AD5:: @ 8276AD5 specialvar VAR_RESULT, sub_813B514 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276AFB + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276AFB specialvar VAR_RESULT, sub_801B27C compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276AFF + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276AFF goto OldaleTown_PokemonCenter_2F_EventScript_276AFB end @@ -55,7 +55,7 @@ SootopolisCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 VerdanturfTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 specialvar VAR_RESULT, sub_813B514 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276B23 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276B23 goto OldaleTown_PokemonCenter_2F_EventScript_276B19 end @@ -69,9 +69,8 @@ OldaleTown_PokemonCenter_2F_EventScript_276B1A:: @ 8276B1A OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23 checkitem ITEM_EON_TICKET, 1 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276B19 - checkflag FLAG_SYS_HAS_EON_TICKET - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276B19 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276B19 + goto_if_set FLAG_SYS_HAS_EON_TICKET, OldaleTown_PokemonCenter_2F_EventScript_276B19 msgbox gUnknown_08273594, MSGBOX_DEFAULT giveitem_std ITEM_EON_TICKET setflag FLAG_SYS_HAS_EON_TICKET @@ -115,7 +114,7 @@ VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C MossdeepCity_GameCorner_1F_EventScript_276BAE:: @ 8276BAE OldaleTown_PokemonCenter_2F_EventScript_276BAE:: @ 8276BAE compare VAR_0x8007, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276BBD + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276BBD turnobject VAR_0x8007, 3 OldaleTown_PokemonCenter_2F_EventScript_276BBD:: @ 8276BBD @@ -140,21 +139,21 @@ SlateportCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE SootopolisCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE compare VAR_0x4087, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 compare VAR_0x4087, 2 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 compare VAR_0x4087, 5 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 compare VAR_0x4087, 3 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C1D + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C1D compare VAR_0x4087, 4 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C23 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C23 compare VAR_0x4087, 6 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C29 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C29 compare VAR_0x4087, 7 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C2F + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C2F compare VAR_0x4087, 8 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C35 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276C35 end OldaleTown_PokemonCenter_2F_EventScript_276C17:: @ 8276C17 @@ -234,10 +233,10 @@ OldaleTown_PokemonCenter_2F_EventScript_276CB5:: @ 8276CB5 special CloseLink setvar VAR_0x4087, 0 compare VAR_0x8007, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D waitmovement 0 - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27734F + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F waitmovement 0 applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_277349 waitmovement 0 @@ -257,8 +256,8 @@ OldaleTown_PokemonCenter_2F_EventScript_276CFF:: @ 8276CFF special CloseLink setvar VAR_0x4087, 0 compare VAR_0x8007, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735E + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E waitmovement 0 applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D waitmovement 0 @@ -278,10 +277,10 @@ OldaleTown_PokemonCenter_2F_EventScript_276D2C:: @ 8276D2C OldaleTown_PokemonCenter_2F_EventScript_276D44:: @ 8276D44 special CloseLink setvar VAR_0x4087, 0 - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27734F + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F waitmovement 0 compare VAR_0x8007, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276D6B + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276D6B applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_277349 waitmovement 0 @@ -301,8 +300,8 @@ OldaleTown_PokemonCenter_2F_EventScript_276D6C:: @ 8276D6C OldaleTown_PokemonCenter_2F_EventScript_276D84:: @ 8276D84 setvar VAR_0x4087, 0 compare VAR_0x8007, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735E + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735E waitmovement 0 applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D waitmovement 0 @@ -316,24 +315,24 @@ OldaleTown_PokemonCenter_2F_EventScript_276DAE:: @ 8276DAE delay 60 message OldaleTown_PokemonCenter_2F_Text_27854C waitmessage - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27734F + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F waitmovement 0 applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_277349 waitmovement 0 return OldaleTown_PokemonCenter_2F_EventScript_276DD5:: @ 8276DD5 - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27734F + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27734F waitmovement 0 return OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0 lockall - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_2725A6 waitmovement 0 msgbox OldaleTown_PokemonCenter_2F_Text_27964A, MSGBOX_DEFAULT closemessage - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_276E10 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_276E10 waitmovement 0 delay 30 msgbox OldaleTown_PokemonCenter_2F_Text_279718, MSGBOX_DEFAULT @@ -360,8 +359,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276E22:: @ 8276E22 OldaleTown_PokemonCenter_2F_EventScript_276E30:: @ 8276E30 setvar VAR_0x8004, 0 - checkflag FLAG_VISITED_MAUVILLE_CITY - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276E75 + goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_276E75 multichoice 0, 0, 74, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_2770B2 @@ -411,7 +409,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F23:: @ 8276F23 OldaleTown_PokemonCenter_2F_EventScript_276F2E:: @ 8276F2E special HasEnoughMonsForDoubleBattle compare VAR_RESULT, 0 - goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_276F47 + goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_276F47 setvar VAR_0x8004, 2 goto OldaleTown_PokemonCenter_2F_EventScript_276F60 end @@ -429,23 +427,23 @@ OldaleTown_PokemonCenter_2F_EventScript_276F55:: @ 8276F55 OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60 call OldaleTown_PokemonCenter_2F_EventScript_27134F compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC message gText_PleaseWaitForLink waitmessage special sub_80B2DA4 waitstate compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276FBD + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276FBD compare VAR_RESULT, 2 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 compare VAR_RESULT, 3 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF compare VAR_RESULT, 4 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277046 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277046 compare VAR_RESULT, 5 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC compare VAR_RESULT, 6 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 end OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD @@ -462,18 +460,18 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D waitmovement 0 closemessage - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 waitmovement 0 opendoor 9, 1 waitdooranim - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release compare VAR_0x8004, 5 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277036 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277036 special SetCableClubWarp warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8 special sub_80AF948 @@ -481,7 +479,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD end OldaleTown_PokemonCenter_2F_EventScript_27702B:: @ 827702B - applymovement 255, Movement_277352 + applymovement EVENT_OBJ_ID_PLAYER, Movement_277352 waitmovement 0 return @@ -528,30 +526,30 @@ OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2 copyvar VAR_0x8007, VAR_LAST_TALKED call OldaleTown_PokemonCenter_2F_EventScript_277199 compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC call OldaleTown_PokemonCenter_2F_EventScript_27134F compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC message gText_PleaseWaitForLink waitmessage special sub_80B2E4C waitstate compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_27713A + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27713A compare VAR_RESULT, 2 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 compare VAR_RESULT, 3 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF compare VAR_RESULT, 4 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_27730E + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27730E compare VAR_RESULT, 5 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC compare VAR_RESULT, 6 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 compare VAR_RESULT, 7 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772AB + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772AB compare VAR_RESULT, 9 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772B8 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772B8 end OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A @@ -566,13 +564,13 @@ OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D waitmovement 0 closemessage - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 waitmovement 0 opendoor 9, 1 waitdooranim - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release @@ -585,10 +583,10 @@ OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A OldaleTown_PokemonCenter_2F_EventScript_277199:: @ 8277199 specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, 2 - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_2771BF + goto_if_lt OldaleTown_PokemonCenter_2F_EventScript_2771BF specialvar VAR_RESULT, sub_80F9370 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2771CD + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2771CD setvar VAR_RESULT, 1 return @@ -606,7 +604,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB copyvar VAR_0x8007, VAR_LAST_TALKED call OldaleTown_PokemonCenter_2F_EventScript_27134F compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC message gText_PleaseWaitForLink waitmessage special sub_80B2E74 @@ -614,19 +612,19 @@ OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB special sub_80B2EA8 waitstate compare VAR_RESULT, 12 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277328 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277328 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_27724C + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27724C compare VAR_RESULT, 2 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 compare VAR_RESULT, 3 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF compare VAR_RESULT, 4 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_27730E + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27730E compare VAR_RESULT, 5 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC compare VAR_RESULT, 6 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 end OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C @@ -641,13 +639,13 @@ OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D waitmovement 0 closemessage - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 waitmovement 0 opendoor 9, 1 waitdooranim - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release @@ -810,7 +808,7 @@ gUnknown_08277388:: @ 8277388 special sub_80F9438 waitstate compare VAR_RESULT, 0 - goto_eq DoubleBattleColosseum_EventScript_2773F4 + goto_if_eq DoubleBattleColosseum_EventScript_2773F4 setvar VAR_0x8005, 0 special sub_80B3968 waitstate @@ -821,7 +819,7 @@ gUnknown_082773A3:: @ 82773A3 special sub_80F9438 waitstate compare VAR_RESULT, 0 - goto_eq DoubleBattleColosseum_EventScript_2773F4 + goto_if_eq DoubleBattleColosseum_EventScript_2773F4 setvar VAR_0x8005, 1 special sub_80B3968 waitstate @@ -832,7 +830,7 @@ gUnknown_082773BE:: @ 82773BE special sub_80F9438 waitstate compare VAR_RESULT, 0 - goto_eq DoubleBattleColosseum_EventScript_2773F4 + goto_if_eq DoubleBattleColosseum_EventScript_2773F4 setvar VAR_0x8005, 2 special sub_80B3968 waitstate @@ -843,7 +841,7 @@ gUnknown_082773D9:: @ 82773D9 special sub_80F9438 waitstate compare VAR_RESULT, 0 - goto_eq DoubleBattleColosseum_EventScript_2773F4 + goto_if_eq DoubleBattleColosseum_EventScript_2773F4 setvar VAR_0x8005, 3 special sub_80B3968 waitstate @@ -881,7 +879,7 @@ gUnknown_0827741D:: @ 827741D special sub_80E6BE8 waitstate compare VAR_TEMP_1, 0 - goto_if 5, RecordCorner_EventScript_277471 + goto_if_ne RecordCorner_EventScript_277471 end gUnknown_08277432:: @ 8277432 @@ -889,7 +887,7 @@ gUnknown_08277432:: @ 8277432 special sub_80E6BE8 waitstate compare VAR_TEMP_1, 0 - goto_if 5, RecordCorner_EventScript_277471 + goto_if_ne RecordCorner_EventScript_277471 end gUnknown_08277447:: @ 8277447 @@ -897,7 +895,7 @@ gUnknown_08277447:: @ 8277447 special sub_80E6BE8 waitstate compare VAR_TEMP_1, 0 - goto_if 5, RecordCorner_EventScript_277471 + goto_if_ne RecordCorner_EventScript_277471 end gUnknown_0827745C:: @ 827745C @@ -905,7 +903,7 @@ gUnknown_0827745C:: @ 827745C special sub_80E6BE8 waitstate compare VAR_TEMP_1, 0 - goto_if 5, RecordCorner_EventScript_277471 + goto_if_ne RecordCorner_EventScript_277471 end RecordCorner_EventScript_277471:: @ 8277471 @@ -951,7 +949,7 @@ TradeCenter_EventScript_2774B6:: @ 82774B6 RecordCorner_EventScript_2774C6:: @ 82774C6 compare VAR_TEMP_0, 0 - goto_if 5, RecordCorner_EventScript_2774E0 + goto_if_ne RecordCorner_EventScript_2774E0 special sub_8098574 message RecordCorner_Text_27861C waitmessage @@ -972,7 +970,7 @@ RecordCorner_EventScript_2774E0:: @ 82774E0 gUnknown_082774EF:: @ 82774EF msgbox Text_2783A8, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq gUnknown_08277509 + goto_if_eq gUnknown_08277509 erasebox 0, 0, 29, 19 releaseall end @@ -993,15 +991,14 @@ OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B lock faceplayer setvar VAR_FRONTIER_FACILITY, 8 - checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_277335 + goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335 specialvar VAR_RESULT, sub_813990C compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_27731B + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B copyvar VAR_0x8007, VAR_LAST_TALKED specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277668 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277668 message OldaleTown_PokemonCenter_2F_Text_27940D waitmessage goto OldaleTown_PokemonCenter_2F_EventScript_27755C @@ -1025,10 +1022,10 @@ OldaleTown_PokemonCenter_2F_EventScript_277593:: @ 8277593 OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F call OldaleTown_PokemonCenter_2F_EventScript_277626 compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC call OldaleTown_PokemonCenter_2F_EventScript_27134F compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC msgbox OldaleTown_PokemonCenter_2F_Text_27961C, MSGBOX_DEFAULT closemessage special HealPlayerParty @@ -1040,13 +1037,13 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F delay 60 applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D waitmovement 0 - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 waitmovement 0 opendoor 5, 1 waitdooranim - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 5, 1 waitdooranim special sub_8018090 @@ -1060,10 +1057,10 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F OldaleTown_PokemonCenter_2F_EventScript_277626:: @ 8277626 specialvar VAR_RESULT, CountPartyNonEggMons compare VAR_RESULT, 2 - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_27764C + goto_if_lt OldaleTown_PokemonCenter_2F_EventScript_27764C specialvar VAR_RESULT, sub_80F9370 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_27765A + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27765A setvar VAR_RESULT, 1 return @@ -1085,11 +1082,10 @@ OldaleTown_PokemonCenter_2F_EventScript_277668:: @ 8277668 OldaleTown_PokemonCenter_2F_EventScript_277672:: @ 8277672 lock faceplayer - checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_277335 + goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335 msgbox OldaleTown_PokemonCenter_2F_Text_279937, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_27769A + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27769A msgbox OldaleTown_PokemonCenter_2F_Text_2799AA, MSGBOX_DEFAULT release return @@ -1103,14 +1099,13 @@ OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4 lock faceplayer setvar VAR_FRONTIER_FACILITY, 9 - checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_277335 + goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335 specialvar VAR_RESULT, sub_813990C compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_27731B + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_276E13 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276E13 message OldaleTown_PokemonCenter_2F_Text_279013 waitmessage delay 28 @@ -1120,9 +1115,8 @@ OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4 OldaleTown_PokemonCenter_2F_EventScript_2776E3:: @ 82776E3 checkitem ITEM_POWDER_JAR, 1 compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_27778B - checkflag FLAG_VISITED_MAUVILLE_CITY - goto_eq OldaleTown_PokemonCenter_2F_EventScript_27773E + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27778B + goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_27773E multichoice 0, 0, 78, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D @@ -1144,8 +1138,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27773E:: @ 827773E end OldaleTown_PokemonCenter_2F_EventScript_27778B:: @ 827778B - checkflag FLAG_VISITED_MAUVILLE_CITY - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2777CB + goto_if_set FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_2777CB multichoice 0, 0, 75, 0 switch VAR_RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_27780D @@ -1167,10 +1160,10 @@ OldaleTown_PokemonCenter_2F_EventScript_2777CB:: @ 82777CB OldaleTown_PokemonCenter_2F_EventScript_27780D:: @ 827780D msgbox OldaleTown_PokemonCenter_2F_Text_27909D, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC call OldaleTown_PokemonCenter_2F_EventScript_277199 compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC setvar VAR_0x8004, 3 goto OldaleTown_PokemonCenter_2F_EventScript_277931 end @@ -1196,7 +1189,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27788E:: @ 827788E OldaleTown_PokemonCenter_2F_EventScript_277899:: @ 8277899 special HasEnoughMonsForDoubleBattle compare VAR_RESULT, 0 - goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_2778B2 + goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_2778B2 setvar VAR_0x8004, 1 goto OldaleTown_PokemonCenter_2F_EventScript_277931 end @@ -1219,7 +1212,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2778CB:: @ 82778CB OldaleTown_PokemonCenter_2F_EventScript_2778D9:: @ 82778D9 msgbox OldaleTown_PokemonCenter_2F_Text_2790E8, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC setvar VAR_0x8004, 12 goto OldaleTown_PokemonCenter_2F_EventScript_277931 end @@ -1227,10 +1220,10 @@ OldaleTown_PokemonCenter_2F_EventScript_2778D9:: @ 82778D9 OldaleTown_PokemonCenter_2F_EventScript_2778F7:: @ 82778F7 msgbox OldaleTown_PokemonCenter_2F_Text_279114, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC special HasAtLeastOneBerry compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277923 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277923 setvar VAR_0x8004, 5 goto OldaleTown_PokemonCenter_2F_EventScript_277931 end @@ -1243,7 +1236,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277923:: @ 8277923 OldaleTown_PokemonCenter_2F_EventScript_277931:: @ 8277931 call OldaleTown_PokemonCenter_2F_EventScript_27134F compare VAR_RESULT, 0 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC switch VAR_0x8004 case 3, OldaleTown_PokemonCenter_2F_EventScript_277989 case 0, OldaleTown_PokemonCenter_2F_EventScript_277989 @@ -1267,22 +1260,22 @@ OldaleTown_PokemonCenter_2F_EventScript_277989:: @ 8277989 OldaleTown_PokemonCenter_2F_EventScript_2779C6:: @ 82779C6 call OldaleTown_PokemonCenter_2F_EventScript_277B30 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A compare VAR_RESULT, 5 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277989 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277989 compare VAR_RESULT, 8 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2779C6 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2779C6 release return OldaleTown_PokemonCenter_2F_EventScript_2779EE:: @ 82779EE call OldaleTown_PokemonCenter_2F_EventScript_277B35 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A compare VAR_RESULT, 5 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277989 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277989 compare VAR_RESULT, 8 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_2779EE + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2779EE release return @@ -1300,22 +1293,22 @@ OldaleTown_PokemonCenter_2F_EventScript_277A16:: @ 8277A16 OldaleTown_PokemonCenter_2F_EventScript_277A53:: @ 8277A53 call OldaleTown_PokemonCenter_2F_EventScript_277B30 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A compare VAR_RESULT, 5 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277A16 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277A16 compare VAR_RESULT, 8 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277A53 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277A53 release return OldaleTown_PokemonCenter_2F_EventScript_277A7B:: @ 8277A7B call OldaleTown_PokemonCenter_2F_EventScript_277B35 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A compare VAR_RESULT, 5 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277A16 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277A16 compare VAR_RESULT, 8 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277A7B + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277A7B release return @@ -1333,22 +1326,22 @@ OldaleTown_PokemonCenter_2F_EventScript_277AA3:: @ 8277AA3 OldaleTown_PokemonCenter_2F_EventScript_277AE0:: @ 8277AE0 call OldaleTown_PokemonCenter_2F_EventScript_277B30 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A compare VAR_RESULT, 5 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277AA3 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277AA3 compare VAR_RESULT, 8 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277AE0 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277AE0 release return OldaleTown_PokemonCenter_2F_EventScript_277B08:: @ 8277B08 call OldaleTown_PokemonCenter_2F_EventScript_277B35 compare VAR_RESULT, 1 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A compare VAR_RESULT, 5 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277AA3 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277AA3 compare VAR_RESULT, 8 - goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B08 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_277B08 release return @@ -1379,13 +1372,13 @@ OldaleTown_PokemonCenter_2F_EventScript_277B3A:: @ 8277B3A applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_27734D waitmovement 0 closemessage - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_277356 + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_277356 waitmovement 0 opendoor 9, 1 waitdooranim - applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735A + applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_27735A waitmovement 0 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release @@ -1394,11 +1387,10 @@ OldaleTown_PokemonCenter_2F_EventScript_277B3A:: @ 8277B3A EventScript_WirelessBoxResults:: @ 8277B8A lockall - checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_27733F + goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_27733F specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 - goto_eq EventScript_277BB4 + goto_if_eq EventScript_277BB4 fadescreen 1 special sub_801A42C waitstate @@ -1497,7 +1489,7 @@ MossdeepCity_GameCorner_1F_EventScript_277C91:: @ 8277C91 waitmessage specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 0 - goto_eq MossdeepCity_GameCorner_1F_EventScript_277E48 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E48 delay 60 message MossdeepCity_GameCorner_1F_Text_278DAD waitmessage @@ -1513,17 +1505,17 @@ MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9 setvar VAR_0x8005, 0 special sub_802C920 compare VAR_RESULT, 0 - goto_eq MossdeepCity_GameCorner_1F_EventScript_277E55 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E55 msgbox MossdeepCity_GameCorner_1F_Text_278DD9, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8005, 0 special sub_81B8958 waitstate compare VAR_0x8004, 6 - goto_if 4, MossdeepCity_GameCorner_1F_EventScript_2772F9 + goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9 call MossdeepCity_GameCorner_1F_EventScript_27134F compare VAR_RESULT, 0 - goto_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 setvar VAR_0x8004, 4 goto MossdeepCity_GameCorner_1F_EventScript_277D81 end @@ -1532,17 +1524,17 @@ MossdeepCity_GameCorner_1F_EventScript_277D35:: @ 8277D35 setvar VAR_0x8005, 1 special sub_8027A5C compare VAR_RESULT, 0 - goto_eq MossdeepCity_GameCorner_1F_EventScript_277E55 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E55 msgbox MossdeepCity_GameCorner_1F_Text_278DD9, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8005, 1 special sub_81B8958 waitstate compare VAR_0x8004, 6 - goto_if 4, MossdeepCity_GameCorner_1F_EventScript_2772F9 + goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9 call MossdeepCity_GameCorner_1F_EventScript_27134F compare VAR_RESULT, 0 - goto_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 setvar VAR_0x8004, 6 goto MossdeepCity_GameCorner_1F_EventScript_277D81 end @@ -1561,22 +1553,22 @@ MossdeepCity_GameCorner_1F_EventScript_277D81:: @ 8277D81 MossdeepCity_GameCorner_1F_EventScript_277DBE:: @ 8277DBE call MossdeepCity_GameCorner_1F_EventScript_277B30 compare VAR_RESULT, 1 - goto_eq MossdeepCity_GameCorner_1F_EventScript_277E0E + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E0E compare VAR_RESULT, 5 - goto_eq MossdeepCity_GameCorner_1F_EventScript_277D81 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277D81 compare VAR_RESULT, 8 - goto_eq MossdeepCity_GameCorner_1F_EventScript_277DBE + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277DBE release return MossdeepCity_GameCorner_1F_EventScript_277DE6:: @ 8277DE6 call MossdeepCity_GameCorner_1F_EventScript_277B35 compare VAR_RESULT, 1 - goto_eq MossdeepCity_GameCorner_1F_EventScript_277E0E + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277E0E compare VAR_RESULT, 5 - goto_eq MossdeepCity_GameCorner_1F_EventScript_277D81 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277D81 compare VAR_RESULT, 8 - goto_eq MossdeepCity_GameCorner_1F_EventScript_277DE6 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_277DE6 release return @@ -1593,9 +1585,9 @@ MossdeepCity_GameCorner_1F_EventScript_277E0E:: @ 8277E0E applymovement VAR_LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_27734D waitmovement 0 closemessage - applymovement 255, MossdeepCity_GameCorner_1F_Movement_277360 + applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_GameCorner_1F_Movement_277360 waitmovement 0 - hideobjectat 255, MAP_PETALBURG_CITY + hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY release waitstate end @@ -1609,11 +1601,11 @@ MossdeepCity_GameCorner_1F_EventScript_277E48:: @ 8277E48 MossdeepCity_GameCorner_1F_EventScript_277E55:: @ 8277E55 msgbox MossdeepCity_GameCorner_1F_Text_278E60, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 compare VAR_0x8005, 0 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_277E84 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_277E84 compare VAR_0x8005, 1 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_277E8D + call_if_eq MossdeepCity_GameCorner_1F_EventScript_277E8D goto MossdeepCity_GameCorner_1F_EventScript_2772F9 end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 2b0bfd8aa..927d61439 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -2,11 +2,9 @@ LilycoveCity_ContestLobby_EventScript_279CC5:: @ 8279CC5 lock faceplayer compare VAR_0x408A, 0 - goto_if 5, LilycoveCity_ContestLobby_EventScript_279D13 - checkflag FLAG_0x05F - call_if 1, LilycoveCity_ContestLobby_EventScript_279CEA - checkflag FLAG_0x05F - call_if 0, LilycoveCity_ContestLobby_EventScript_279CF3 + goto_if_ne LilycoveCity_ContestLobby_EventScript_279D13 + call_if_set FLAG_0x05F, LilycoveCity_ContestLobby_EventScript_279CEA + call_if_unset FLAG_0x05F, LilycoveCity_ContestLobby_EventScript_279CF3 goto LilycoveCity_ContestLobby_EventScript_279D5A end @@ -30,7 +28,7 @@ LilycoveCity_ContestLobby_EventScript_279D13:: @ 8279D13 LilycoveCity_ContestLobby_EventScript_279D2C:: @ 8279D2C giveitem_std ITEM_LUXURY_BALL compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_279D4B + goto_if_eq LilycoveCity_ContestLobby_EventScript_279D4B setvar VAR_0x408A, 0 closemessage release @@ -89,18 +87,18 @@ LilycoveCity_ContestLobby_EventScript_279E13:: @ 8279E13 msgbox LilycoveCity_ContestLobby_Text_27B44A, MSGBOX_DEFAULT choosecontestmon compare VAR_0x8004, 255 - goto_eq LilycoveCity_ContestLobby_EventScript_279E09 + goto_if_eq LilycoveCity_ContestLobby_EventScript_279E09 special sub_80F7F30 compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_279F12 + goto_if_eq LilycoveCity_ContestLobby_EventScript_279F12 compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_279F87 + goto_if_eq LilycoveCity_ContestLobby_EventScript_279F87 compare VAR_RESULT, 2 - goto_eq LilycoveCity_ContestLobby_EventScript_279F45 + goto_if_eq LilycoveCity_ContestLobby_EventScript_279F45 compare VAR_RESULT, 3 - goto_eq LilycoveCity_ContestLobby_EventScript_279F69 + goto_if_eq LilycoveCity_ContestLobby_EventScript_279F69 compare VAR_RESULT, 4 - goto_eq LilycoveCity_ContestLobby_EventScript_279F78 + goto_if_eq LilycoveCity_ContestLobby_EventScript_279F78 end LilycoveCity_ContestLobby_EventScript_279E62:: @ 8279E62 @@ -274,7 +272,7 @@ LinkContestRoom1_EventScript_27A097:: @ 827A097 LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1 compare VAR_0x4088, 5 - goto_eq LinkContestRoom1_EventScript_27A0C7 + goto_if_eq LinkContestRoom1_EventScript_27A0C7 lockall msgbox LinkContestRoom1_Text_27B711, MSGBOX_DEFAULT releaseall @@ -283,7 +281,7 @@ LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1 LinkContestRoom1_EventScript_27A0C7:: @ 827A0C7 specialvar VAR_RESULT, sub_80F9160 compare VAR_RESULT, 1 - goto_eq LinkContestRoom1_EventScript_27A0DE + goto_if_eq LinkContestRoom1_EventScript_27A0DE messageautoscroll LinkContestRoom1_Text_27B78F waitmessage return @@ -307,7 +305,7 @@ LinkContestRoom1_EventScript_27A0F5:: @ 827A0F5 call LinkContestRoom1_EventScript_27A133 addvar VAR_0x8006, 1 compare VAR_0x8006, 4 - goto_if 5, LinkContestRoom1_EventScript_27A0F5 + goto_if_ne LinkContestRoom1_EventScript_27A0F5 call LinkContestRoom1_EventScript_27A230 setvar VAR_TEMP_1, 6 return @@ -315,7 +313,7 @@ LinkContestRoom1_EventScript_27A0F5:: @ 827A0F5 LinkContestRoom1_EventScript_27A133:: @ 827A133 specialvar VAR_RESULT, sub_80F9160 compare VAR_RESULT, 1 - goto_eq LinkContestRoom1_EventScript_27A144 + goto_if_eq LinkContestRoom1_EventScript_27A144 return LinkContestRoom1_EventScript_27A144:: @ 827A144 @@ -325,13 +323,13 @@ LinkContestRoom1_EventScript_27A144:: @ 827A144 LinkContestRoom1_EventScript_27A149:: @ 827A149 compare VAR_0x8006, 0 - goto_eq LinkContestRoom1_EventScript_27A176 + goto_if_eq LinkContestRoom1_EventScript_27A176 compare VAR_0x8006, 1 - goto_eq LinkContestRoom1_EventScript_27A18D + goto_if_eq LinkContestRoom1_EventScript_27A18D compare VAR_0x8006, 2 - goto_eq LinkContestRoom1_EventScript_27A1A4 + goto_if_eq LinkContestRoom1_EventScript_27A1A4 compare VAR_0x8006, 3 - goto_eq LinkContestRoom1_EventScript_27A1BB + goto_if_eq LinkContestRoom1_EventScript_27A1BB return LinkContestRoom1_EventScript_27A176:: @ 827A176 @@ -394,7 +392,7 @@ LinkContestRoom1_EventScript_27A1D2:: @ 827A1D2 LinkContestRoom1_EventScript_27A217:: @ 827A217 compare VAR_0x4088, 5 - goto_eq LinkContestRoom1_EventScript_27A229 + goto_if_eq LinkContestRoom1_EventScript_27A229 message LinkContestRoom1_Text_27B815 waitmessage return @@ -422,14 +420,14 @@ LinkContestRoom1_EventScript_27A230:: @ 827A230 LinkContestRoom1_EventScript_27A26C:: @ 827A26C compare VAR_0x4088, 5 - goto_eq LinkContestRoom1_EventScript_27A280 + goto_if_eq LinkContestRoom1_EventScript_27A280 msgbox LinkContestRoom1_Text_27B830, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_27A280:: @ 827A280 specialvar VAR_RESULT, sub_80F9160 compare VAR_RESULT, 1 - goto_eq LinkContestRoom1_EventScript_27A297 + goto_if_eq LinkContestRoom1_EventScript_27A297 messageautoscroll LinkContestRoom1_Text_27B830 waitmessage return @@ -448,7 +446,7 @@ LinkContestRoom1_EventScript_27A297:: @ 827A297 LinkContestRoom1_EventScript_27A2B9:: @ 827A2B9 compare VAR_0x4088, 5 - goto_eq LinkContestRoom1_EventScript_27A2CA + goto_if_eq LinkContestRoom1_EventScript_27A2CA message LinkContestRoom1_Text_27B8F2 return @@ -486,15 +484,15 @@ LinkContestRoom1_EventScript_27A2D5:: @ 827A2D5 LinkContestRoom1_EventScript_27A34F:: @ 827A34F special sub_80F82FC compare VAR_0x4088, 1 - call_if 1, LinkContestRoom1_EventScript_27A454 + call_if_eq LinkContestRoom1_EventScript_27A454 compare VAR_0x4088, 2 - call_if 1, LinkContestRoom1_EventScript_27A4B2 + call_if_eq LinkContestRoom1_EventScript_27A4B2 compare VAR_0x4088, 3 - call_if 1, LinkContestRoom1_EventScript_27A510 + call_if_eq LinkContestRoom1_EventScript_27A510 compare VAR_0x4088, 4 - call_if 1, LinkContestRoom1_EventScript_27A56E + call_if_eq LinkContestRoom1_EventScript_27A56E compare VAR_0x4088, 5 - call_if 1, LinkContestRoom1_EventScript_27A5CC + call_if_eq LinkContestRoom1_EventScript_27A5CC setvar VAR_TEMP_1, 9 setvar VAR_TEMP_2, 9 setvar VAR_TEMP_3, 9 @@ -504,7 +502,7 @@ LinkContestRoom1_EventScript_27A34F:: @ 827A34F setvar VAR_TEMP_7, 9 setvar VAR_TEMP_8, 9 compare VAR_TEMP_0, 0 - call_if 2, LinkContestRoom1_EventScript_27A3E5 + call_if_gt LinkContestRoom1_EventScript_27A3E5 setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 setvar VAR_TEMP_3, 0 @@ -519,123 +517,123 @@ LinkContestRoom1_EventScript_27A3E5:: @ 827A3E5 setvar VAR_RESULT, 8 special ScriptRandom compare VAR_RESULT, 0 - call_if 1, LinkContestRoom1_EventScript_27A65A + call_if_eq LinkContestRoom1_EventScript_27A65A compare VAR_RESULT, 1 - call_if 1, LinkContestRoom1_EventScript_27A67E + call_if_eq LinkContestRoom1_EventScript_27A67E compare VAR_RESULT, 2 - call_if 1, LinkContestRoom1_EventScript_27A6A2 + call_if_eq LinkContestRoom1_EventScript_27A6A2 compare VAR_RESULT, 3 - call_if 1, LinkContestRoom1_EventScript_27A6C6 + call_if_eq LinkContestRoom1_EventScript_27A6C6 compare VAR_RESULT, 4 - call_if 1, LinkContestRoom1_EventScript_27A6EA + call_if_eq LinkContestRoom1_EventScript_27A6EA compare VAR_RESULT, 5 - call_if 1, LinkContestRoom1_EventScript_27A70E + call_if_eq LinkContestRoom1_EventScript_27A70E compare VAR_RESULT, 6 - call_if 1, LinkContestRoom1_EventScript_27A732 + call_if_eq LinkContestRoom1_EventScript_27A732 compare VAR_RESULT, 7 - call_if 1, LinkContestRoom1_EventScript_27A756 + call_if_eq LinkContestRoom1_EventScript_27A756 compare VAR_TEMP_0, 0 - goto_if 2, LinkContestRoom1_EventScript_27A3E5 + goto_if_gt LinkContestRoom1_EventScript_27A3E5 waitmovement 0 return LinkContestRoom1_EventScript_27A454:: @ 827A454 compare VAR_0x8004, 80 - goto_if 2, LinkContestRoom1_EventScript_27A654 + goto_if_gt LinkContestRoom1_EventScript_27A654 compare VAR_0x8004, 70 - goto_if 2, LinkContestRoom1_EventScript_27A64E + goto_if_gt LinkContestRoom1_EventScript_27A64E compare VAR_0x8004, 60 - goto_if 2, LinkContestRoom1_EventScript_27A648 + goto_if_gt LinkContestRoom1_EventScript_27A648 compare VAR_0x8004, 50 - goto_if 2, LinkContestRoom1_EventScript_27A642 + goto_if_gt LinkContestRoom1_EventScript_27A642 compare VAR_0x8004, 40 - goto_if 2, LinkContestRoom1_EventScript_27A63C + goto_if_gt LinkContestRoom1_EventScript_27A63C compare VAR_0x8004, 30 - goto_if 2, LinkContestRoom1_EventScript_27A636 + goto_if_gt LinkContestRoom1_EventScript_27A636 compare VAR_0x8004, 20 - goto_if 2, LinkContestRoom1_EventScript_27A630 + goto_if_gt LinkContestRoom1_EventScript_27A630 compare VAR_0x8004, 10 - goto_if 2, LinkContestRoom1_EventScript_27A62A + goto_if_gt LinkContestRoom1_EventScript_27A62A setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_27A4B2:: @ 827A4B2 compare VAR_0x8004, 230 - goto_if 2, LinkContestRoom1_EventScript_27A654 + goto_if_gt LinkContestRoom1_EventScript_27A654 compare VAR_0x8004, 210 - goto_if 2, LinkContestRoom1_EventScript_27A64E + goto_if_gt LinkContestRoom1_EventScript_27A64E compare VAR_0x8004, 190 - goto_if 2, LinkContestRoom1_EventScript_27A648 + goto_if_gt LinkContestRoom1_EventScript_27A648 compare VAR_0x8004, 170 - goto_if 2, LinkContestRoom1_EventScript_27A642 + goto_if_gt LinkContestRoom1_EventScript_27A642 compare VAR_0x8004, 150 - goto_if 2, LinkContestRoom1_EventScript_27A63C + goto_if_gt LinkContestRoom1_EventScript_27A63C compare VAR_0x8004, 130 - goto_if 2, LinkContestRoom1_EventScript_27A636 + goto_if_gt LinkContestRoom1_EventScript_27A636 compare VAR_0x8004, 110 - goto_if 2, LinkContestRoom1_EventScript_27A630 + goto_if_gt LinkContestRoom1_EventScript_27A630 compare VAR_0x8004, 90 - goto_if 2, LinkContestRoom1_EventScript_27A62A + goto_if_gt LinkContestRoom1_EventScript_27A62A setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_27A510:: @ 827A510 compare VAR_0x8004, 380 - goto_if 2, LinkContestRoom1_EventScript_27A654 + goto_if_gt LinkContestRoom1_EventScript_27A654 compare VAR_0x8004, 350 - goto_if 2, LinkContestRoom1_EventScript_27A64E + goto_if_gt LinkContestRoom1_EventScript_27A64E compare VAR_0x8004, 320 - goto_if 2, LinkContestRoom1_EventScript_27A648 + goto_if_gt LinkContestRoom1_EventScript_27A648 compare VAR_0x8004, 290 - goto_if 2, LinkContestRoom1_EventScript_27A642 + goto_if_gt LinkContestRoom1_EventScript_27A642 compare VAR_0x8004, 260 - goto_if 2, LinkContestRoom1_EventScript_27A63C + goto_if_gt LinkContestRoom1_EventScript_27A63C compare VAR_0x8004, 230 - goto_if 2, LinkContestRoom1_EventScript_27A636 + goto_if_gt LinkContestRoom1_EventScript_27A636 compare VAR_0x8004, 200 - goto_if 2, LinkContestRoom1_EventScript_27A630 + goto_if_gt LinkContestRoom1_EventScript_27A630 compare VAR_0x8004, 170 - goto_if 2, LinkContestRoom1_EventScript_27A62A + goto_if_gt LinkContestRoom1_EventScript_27A62A setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_27A56E:: @ 827A56E compare VAR_0x8004, 600 - goto_if 2, LinkContestRoom1_EventScript_27A654 + goto_if_gt LinkContestRoom1_EventScript_27A654 compare VAR_0x8004, 560 - goto_if 2, LinkContestRoom1_EventScript_27A64E + goto_if_gt LinkContestRoom1_EventScript_27A64E compare VAR_0x8004, 520 - goto_if 2, LinkContestRoom1_EventScript_27A648 + goto_if_gt LinkContestRoom1_EventScript_27A648 compare VAR_0x8004, 480 - goto_if 2, LinkContestRoom1_EventScript_27A642 + goto_if_gt LinkContestRoom1_EventScript_27A642 compare VAR_0x8004, 440 - goto_if 2, LinkContestRoom1_EventScript_27A63C + goto_if_gt LinkContestRoom1_EventScript_27A63C compare VAR_0x8004, 400 - goto_if 2, LinkContestRoom1_EventScript_27A636 + goto_if_gt LinkContestRoom1_EventScript_27A636 compare VAR_0x8004, 360 - goto_if 2, LinkContestRoom1_EventScript_27A630 + goto_if_gt LinkContestRoom1_EventScript_27A630 compare VAR_0x8004, 320 - goto_if 2, LinkContestRoom1_EventScript_27A62A + goto_if_gt LinkContestRoom1_EventScript_27A62A setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_27A5CC:: @ 827A5CC compare VAR_0x8004, 600 - goto_if 2, LinkContestRoom1_EventScript_27A654 + goto_if_gt LinkContestRoom1_EventScript_27A654 compare VAR_0x8004, 550 - goto_if 2, LinkContestRoom1_EventScript_27A64E + goto_if_gt LinkContestRoom1_EventScript_27A64E compare VAR_0x8004, 500 - goto_if 2, LinkContestRoom1_EventScript_27A648 + goto_if_gt LinkContestRoom1_EventScript_27A648 compare VAR_0x8004, 450 - goto_if 2, LinkContestRoom1_EventScript_27A642 + goto_if_gt LinkContestRoom1_EventScript_27A642 compare VAR_0x8004, 400 - goto_if 2, LinkContestRoom1_EventScript_27A63C + goto_if_gt LinkContestRoom1_EventScript_27A63C compare VAR_0x8004, 300 - goto_if 2, LinkContestRoom1_EventScript_27A636 + goto_if_gt LinkContestRoom1_EventScript_27A636 compare VAR_0x8004, 200 - goto_if 2, LinkContestRoom1_EventScript_27A630 + goto_if_gt LinkContestRoom1_EventScript_27A630 compare VAR_0x8004, 100 - goto_if 2, LinkContestRoom1_EventScript_27A62A + goto_if_gt LinkContestRoom1_EventScript_27A62A setvar VAR_TEMP_0, 0 return @@ -673,7 +671,7 @@ LinkContestRoom1_EventScript_27A654:: @ 827A654 LinkContestRoom1_EventScript_27A65A:: @ 827A65A compare VAR_TEMP_1, 1 - goto_eq LinkContestRoom1_EventScript_27A67D + goto_if_eq LinkContestRoom1_EventScript_27A67D applymovement 6, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 @@ -686,7 +684,7 @@ LinkContestRoom1_EventScript_27A67D:: @ 827A67D LinkContestRoom1_EventScript_27A67E:: @ 827A67E compare VAR_TEMP_2, 1 - goto_eq LinkContestRoom1_EventScript_27A6A1 + goto_if_eq LinkContestRoom1_EventScript_27A6A1 applymovement 12, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 @@ -699,7 +697,7 @@ LinkContestRoom1_EventScript_27A6A1:: @ 827A6A1 LinkContestRoom1_EventScript_27A6A2:: @ 827A6A2 compare VAR_TEMP_3, 1 - goto_eq LinkContestRoom1_EventScript_27A6C5 + goto_if_eq LinkContestRoom1_EventScript_27A6C5 applymovement 7, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 @@ -712,7 +710,7 @@ LinkContestRoom1_EventScript_27A6C5:: @ 827A6C5 LinkContestRoom1_EventScript_27A6C6:: @ 827A6C6 compare VAR_TEMP_4, 1 - goto_eq LinkContestRoom1_EventScript_27A6E9 + goto_if_eq LinkContestRoom1_EventScript_27A6E9 applymovement 8, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 @@ -725,7 +723,7 @@ LinkContestRoom1_EventScript_27A6E9:: @ 827A6E9 LinkContestRoom1_EventScript_27A6EA:: @ 827A6EA compare VAR_TEMP_5, 1 - goto_eq LinkContestRoom1_EventScript_27A70D + goto_if_eq LinkContestRoom1_EventScript_27A70D applymovement 9, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 @@ -738,7 +736,7 @@ LinkContestRoom1_EventScript_27A70D:: @ 827A70D LinkContestRoom1_EventScript_27A70E:: @ 827A70E compare VAR_TEMP_6, 1 - goto_eq LinkContestRoom1_EventScript_27A731 + goto_if_eq LinkContestRoom1_EventScript_27A731 applymovement 10, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 @@ -751,7 +749,7 @@ LinkContestRoom1_EventScript_27A731:: @ 827A731 LinkContestRoom1_EventScript_27A732:: @ 827A732 compare VAR_TEMP_7, 1 - goto_eq LinkContestRoom1_EventScript_27A755 + goto_if_eq LinkContestRoom1_EventScript_27A755 applymovement 11, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 @@ -764,7 +762,7 @@ LinkContestRoom1_EventScript_27A755:: @ 827A755 LinkContestRoom1_EventScript_27A756:: @ 827A756 compare VAR_TEMP_8, 1 - goto_eq LinkContestRoom1_EventScript_27A779 + goto_if_eq LinkContestRoom1_EventScript_27A779 applymovement 15, LinkContestRoom1_Movement_27AD11 playse SE_PIN delay 14 @@ -846,14 +844,14 @@ LinkContestRoom1_EventScript_27A801:: @ 827A801 LinkContestRoom1_EventScript_27A853:: @ 827A853 compare VAR_0x4088, 5 - goto_eq LinkContestRoom1_EventScript_27A867 + goto_if_eq LinkContestRoom1_EventScript_27A867 msgbox LinkContestRoom1_Text_27B904, MSGBOX_DEFAULT return LinkContestRoom1_EventScript_27A867:: @ 827A867 specialvar VAR_RESULT, sub_80F9160 compare VAR_RESULT, 1 - goto_eq LinkContestRoom1_EventScript_27A87E + goto_if_eq LinkContestRoom1_EventScript_27A87E messageautoscroll LinkContestRoom1_Text_27B904 waitmessage return @@ -896,7 +894,7 @@ LinkContestRoom1_EventScript_27A8A5:: @ 827A8A5 LinkContestRoom1_EventScript_27A8FB:: @ 827A8FB compare VAR_0x4088, 5 - goto_eq LinkContestRoom1_EventScript_27A90F + goto_if_eq LinkContestRoom1_EventScript_27A90F msgbox LinkContestRoom1_Text_27BA15, MSGBOX_DEFAULT return @@ -909,7 +907,7 @@ LinkContestRoom1_EventScript_27A90F:: @ 827A90F LinkContestRoom1_EventScript_27A91E:: @ 827A91E compare VAR_0x4088, 5 - goto_eq LinkContestRoom1_EventScript_27A932 + goto_if_eq LinkContestRoom1_EventScript_27A932 msgbox LinkContestRoom1_Text_27BA30, MSGBOX_DEFAULT return @@ -922,7 +920,7 @@ LinkContestRoom1_EventScript_27A932:: @ 827A932 LinkContestRoom1_EventScript_27A941:: @ 827A941 compare VAR_0x4088, 5 - goto_eq LinkContestRoom1_EventScript_27A955 + goto_if_eq LinkContestRoom1_EventScript_27A955 msgbox LinkContestRoom1_Text_27BAAC, MSGBOX_DEFAULT return @@ -935,7 +933,7 @@ LinkContestRoom1_EventScript_27A955:: @ 827A955 LinkContestRoom1_EventScript_27A964:: @ 827A964 compare VAR_0x4088, 5 - goto_eq LinkContestRoom1_EventScript_27A978 + goto_if_eq LinkContestRoom1_EventScript_27A978 msgbox LinkContestRoom1_Text_27BB25, MSGBOX_DEFAULT return @@ -986,7 +984,7 @@ LinkContestRoom1_EventScript_27A9D4:: @ 827A9D4 LinkContestRoom1_EventScript_27AA00:: @ 827AA00 compare VAR_0x4088, 5 - goto_eq LinkContestRoom1_EventScript_27AA14 + goto_if_eq LinkContestRoom1_EventScript_27AA14 msgbox LinkContestRoom1_Text_27BB4C, MSGBOX_DEFAULT return @@ -999,7 +997,7 @@ LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B addvar VAR_TEMP_1, 1 lockall compare VAR_0x4088, 1 - call_if 2, LinkContestRoom1_EventScript_27AA6F + call_if_gt LinkContestRoom1_EventScript_27AA6F applymovement 9, LinkContestRoom1_Movement_27AD3B applymovement 12, LinkContestRoom1_Movement_27AD3F applymovement 7, LinkContestRoom1_Movement_27AD3B @@ -1009,7 +1007,7 @@ LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B applymovement 6, LinkContestRoom1_Movement_27AD37 applymovement 8, LinkContestRoom1_Movement_27AD33 compare VAR_TEMP_1, 4 - goto_if 5, LinkContestRoom1_EventScript_27AA1B + goto_if_ne LinkContestRoom1_EventScript_27AA1B delay 30 return @@ -1084,10 +1082,9 @@ LinkContestRoom1_EventScript_27AA6F:: @ 827AA6F LinkContestRoom1_EventScript_27AB36:: @ 827AB36 compare VAR_0x4088, 5 - goto_eq LinkContestRoom1_EventScript_27ABD8 + goto_if_eq LinkContestRoom1_EventScript_27ABD8 call LinkContestRoom1_EventScript_27AB9E - checkflag FLAG_TEMP_2 - goto_eq LinkContestRoom1_EventScript_27AB82 + goto_if_set FLAG_TEMP_2, LinkContestRoom1_EventScript_27AB82 lockall msgbox LinkContestRoom1_Text_27BBA8, MSGBOX_DEFAULT releaseall @@ -1099,7 +1096,7 @@ LinkContestRoom1_EventScript_27AB36:: @ 827AB36 delay 30 special sub_80F88E8 compare VAR_0x8004, 1 - goto_eq LinkContestRoom1_EventScript_27ABD2 + goto_if_eq LinkContestRoom1_EventScript_27ABD2 return LinkContestRoom1_EventScript_27AB82:: @ 827AB82 @@ -1109,24 +1106,24 @@ LinkContestRoom1_EventScript_27AB82:: @ 827AB82 delay 90 special sub_80F88E8 compare VAR_0x8004, 1 - goto_eq LinkContestRoom1_EventScript_27ABD2 + goto_if_eq LinkContestRoom1_EventScript_27ABD2 return LinkContestRoom1_EventScript_27AB9E:: @ 827AB9E specialvar VAR_RESULT, sub_80F7F7C compare VAR_RESULT, 1 - goto_eq LinkContestRoom1_EventScript_27ABAF + goto_if_eq LinkContestRoom1_EventScript_27ABAF return LinkContestRoom1_EventScript_27ABAF:: @ 827ABAF special sub_80F831C compare VAR_0x8005, 3 - goto_eq LinkContestRoom1_EventScript_27ABBE + goto_if_eq LinkContestRoom1_EventScript_27ABBE return LinkContestRoom1_EventScript_27ABBE:: @ 827ABBE compare VAR_CONTEST_RANK, 3 - goto_eq LinkContestRoom1_EventScript_27ABCD + goto_if_eq LinkContestRoom1_EventScript_27ABCD setflag FLAG_TEMP_2 return @@ -1147,7 +1144,7 @@ LinkContestRoom1_EventScript_27ABD8:: @ 827ABD8 special sub_80F831C special sub_80F88E8 compare VAR_0x8004, 1 - goto_eq LinkContestRoom1_EventScript_27ABF1 + goto_if_eq LinkContestRoom1_EventScript_27ABF1 closemessage return @@ -1197,7 +1194,7 @@ LinkContestRoom1_EventScript_27AC51:: @ 827AC51 LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E special sub_80F831C compare VAR_0x8005, 3 - goto_eq LinkContestRoom1_EventScript_27AC77 + goto_if_eq LinkContestRoom1_EventScript_27AC77 lockall msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT releaseall @@ -1205,12 +1202,12 @@ LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E LinkContestRoom1_EventScript_27AC77:: @ 827AC77 compare VAR_0x4088, 2 - call_if 1, LinkContestRoom1_EventScript_27ABCE + call_if_eq LinkContestRoom1_EventScript_27ABCE specialvar VAR_RESULT, sub_80F7F7C compare VAR_RESULT, 0 - goto_eq LinkContestRoom1_EventScript_27ACDF + goto_if_eq LinkContestRoom1_EventScript_27ACDF compare VAR_CONTEST_RANK, 3 - goto_eq LinkContestRoom1_EventScript_27ACBD + goto_if_eq LinkContestRoom1_EventScript_27ACBD lockall msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT releaseall @@ -1227,7 +1224,7 @@ LinkContestRoom1_EventScript_27ACA8:: @ 827ACA8 LinkContestRoom1_EventScript_27ACBD:: @ 827ACBD giveitem_std ITEM_LUXURY_BALL compare VAR_RESULT, 0 - goto_eq LinkContestRoom1_EventScript_27ACA8 + goto_if_eq LinkContestRoom1_EventScript_27ACA8 lockall msgbox LinkContestRoom1_Text_27BB7A, MSGBOX_DEFAULT releaseall @@ -1433,7 +1430,7 @@ LinkContestRoom1_Movement_27AD7E: @ 827AD7E LinkContestRoom1_EventScript_27AD80:: @ 827AD80 specialvar VAR_RESULT, sub_80F9134 compare VAR_RESULT, 1 - goto_eq LinkContestRoom1_EventScript_27AD91 + goto_if_eq LinkContestRoom1_EventScript_27AD91 return LinkContestRoom1_EventScript_27AD91:: @ 827AD91 @@ -1442,7 +1439,7 @@ LinkContestRoom1_EventScript_27AD91:: @ 827AD91 LilycoveCity_ContestLobby_EventScript_27AD92:: @ 827AD92 specialvar VAR_RESULT, sub_80F9134 compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_27ADA3 + goto_if_eq LilycoveCity_ContestLobby_EventScript_27ADA3 return LilycoveCity_ContestLobby_EventScript_27ADA3:: @ 827ADA3 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 13b68617a..057a2fa07 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -4,11 +4,11 @@ Route117_EventScript_291C18:: @ 8291C18 special GetDaycareMonNicknames specialvar VAR_RESULT, GetDaycareState compare VAR_RESULT, 1 - goto_eq Route117_EventScript_291C4D + goto_if_eq Route117_EventScript_291C4D compare VAR_RESULT, 2 - goto_eq Route117_EventScript_291CD1 + goto_if_eq Route117_EventScript_291CD1 compare VAR_RESULT, 3 - goto_eq Route117_EventScript_291CE8 + goto_if_eq Route117_EventScript_291CE8 msgbox Route117_Text_291FCF, MSGBOX_DEFAULT release end @@ -16,10 +16,10 @@ Route117_EventScript_291C18:: @ 8291C18 Route117_EventScript_291C4D:: @ 8291C4D msgbox Route117_Text_29205D, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route117_EventScript_291C83 + goto_if_eq Route117_EventScript_291C83 msgbox Route117_Text_2922C6, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route117_EventScript_291C83 + goto_if_eq Route117_EventScript_291C83 msgbox Route117_Text_292149, MSGBOX_DEFAULT clearflag FLAG_PENDING_DAYCARE_EGG special RejectEggFromDayCare @@ -29,7 +29,7 @@ Route117_EventScript_291C4D:: @ 8291C4D Route117_EventScript_291C83:: @ 8291C83 specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, 6 - goto_if 5, Route117_EventScript_291C9D + goto_if_ne Route117_EventScript_291C9D msgbox Route117_Text_29216A, MSGBOX_DEFAULT release end @@ -48,7 +48,7 @@ Route117_EventScript_291C9D:: @ 8291C9D Route117_EventScript_291CB7:: @ 8291CB7 specialvar VAR_RESULT, sub_8071614 compare VAR_RESULT, 1 - call_if 1, Route117_EventScript_291CC8 + call_if_eq Route117_EventScript_291CC8 return Route117_EventScript_291CC8:: @ 8291CC8 @@ -82,14 +82,14 @@ Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11 faceplayer specialvar VAR_RESULT, GetDaycareState compare VAR_RESULT, 1 - goto_eq Route117_PokemonDayCare_EventScript_291E0B + goto_if_eq Route117_PokemonDayCare_EventScript_291E0B compare VAR_RESULT, 2 - goto_eq Route117_PokemonDayCare_EventScript_291E2F + goto_if_eq Route117_PokemonDayCare_EventScript_291E2F compare VAR_RESULT, 3 - goto_eq Route117_PokemonDayCare_EventScript_291F5C + goto_if_eq Route117_PokemonDayCare_EventScript_291F5C msgbox Route117_PokemonDayCare_Text_2922F4, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route117_PokemonDayCare_EventScript_291D56 + goto_if_eq Route117_PokemonDayCare_EventScript_291D56 msgbox Route117_PokemonDayCare_Text_292416, MSGBOX_DEFAULT release end @@ -97,19 +97,19 @@ Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11 Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56 specialvar VAR_RESULT, CountPartyNonEggMons compare VAR_RESULT, 1 - goto_eq Route117_PokemonDayCare_EventScript_291DED + goto_if_eq Route117_PokemonDayCare_EventScript_291DED specialvar VAR_RESULT, sub_80722E0 compare VAR_RESULT, 2 - goto_eq Route117_PokemonDayCare_EventScript_291E01 + goto_if_eq Route117_PokemonDayCare_EventScript_291E01 msgbox Route117_PokemonDayCare_Text_292349, MSGBOX_DEFAULT fadescreen 1 special ChooseSendDaycareMon waitstate compare VAR_0x8004, 255 - goto_eq Route117_PokemonDayCare_EventScript_291DCA + goto_if_eq Route117_PokemonDayCare_EventScript_291DCA specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot compare VAR_RESULT, 0 - goto_eq Route117_PokemonDayCare_EventScript_291DF7 + goto_if_eq Route117_PokemonDayCare_EventScript_291DF7 specialvar VAR_0x8005, GetSelectedMonNickAndSpecies waitse playmoncry VAR_0x8005, 0 @@ -119,7 +119,7 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56 incrementgamestat 47 specialvar VAR_RESULT, GetDaycareState compare VAR_RESULT, 2 - goto_eq Route117_PokemonDayCare_EventScript_291DD4 + goto_if_eq Route117_PokemonDayCare_EventScript_291DD4 release end @@ -131,7 +131,7 @@ Route117_PokemonDayCare_EventScript_291DCA:: @ 8291DCA Route117_PokemonDayCare_EventScript_291DD4:: @ 8291DD4 msgbox Route117_PokemonDayCare_Text_2923AF, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route117_PokemonDayCare_EventScript_291D56 + goto_if_eq Route117_PokemonDayCare_EventScript_291D56 goto Route117_PokemonDayCare_EventScript_291DCA end @@ -162,7 +162,7 @@ Route117_PokemonDayCare_EventScript_291E15:: @ 8291E15 Route117_PokemonDayCare_EventScript_291E1E:: @ 8291E1E specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare compare VAR_RESULT, 0 - call_if 5, Route117_PokemonDayCare_EventScript_291E15 + call_if_ne Route117_PokemonDayCare_EventScript_291E15 return Route117_PokemonDayCare_EventScript_291E2F:: @ 8291E2F @@ -171,26 +171,26 @@ Route117_PokemonDayCare_EventScript_291E2F:: @ 8291E2F call Route117_PokemonDayCare_EventScript_291E1E msgbox Route117_PokemonDayCare_Text_2923AF, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route117_PokemonDayCare_EventScript_291D56 + goto_if_eq Route117_PokemonDayCare_EventScript_291D56 msgbox Route117_PokemonDayCare_Text_2925F6, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route117_PokemonDayCare_EventScript_291E6D + goto_if_eq Route117_PokemonDayCare_EventScript_291E6D goto Route117_PokemonDayCare_EventScript_291DCA end Route117_PokemonDayCare_EventScript_291E6D:: @ 8291E6D specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, 6 - goto_eq Route117_PokemonDayCare_EventScript_291F3D + goto_if_eq Route117_PokemonDayCare_EventScript_291F3D specialvar VAR_RESULT, GetDaycareState setvar VAR_0x8004, 0 compare VAR_RESULT, 2 - goto_eq Route117_PokemonDayCare_EventScript_291EAC + goto_if_eq Route117_PokemonDayCare_EventScript_291EAC special ShowDaycareLevelMenu waitstate copyvar VAR_0x8004, VAR_RESULT compare VAR_RESULT, 2 - goto_eq Route117_PokemonDayCare_EventScript_291DCA + goto_if_eq Route117_PokemonDayCare_EventScript_291DCA goto Route117_PokemonDayCare_EventScript_291EAC end @@ -198,14 +198,14 @@ Route117_PokemonDayCare_EventScript_291EAC:: @ 8291EAC special GetDaycareCost msgbox Route117_PokemonDayCare_Text_292549, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route117_PokemonDayCare_EventScript_291EC8 + goto_if_eq Route117_PokemonDayCare_EventScript_291EC8 goto Route117_PokemonDayCare_EventScript_291DCA end Route117_PokemonDayCare_EventScript_291EC8:: @ 8291EC8 specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 compare VAR_RESULT, 1 - goto_eq Route117_PokemonDayCare_EventScript_291EE2 + goto_if_eq Route117_PokemonDayCare_EventScript_291EE2 msgbox Route117_PokemonDayCare_Text_292432, MSGBOX_DEFAULT release end @@ -223,14 +223,14 @@ Route117_PokemonDayCare_EventScript_291EE2:: @ 8291EE2 waitmoncry specialvar VAR_RESULT, GetDaycareState compare VAR_RESULT, 2 - goto_eq Route117_PokemonDayCare_EventScript_291F24 + goto_if_eq Route117_PokemonDayCare_EventScript_291F24 goto Route117_PokemonDayCare_EventScript_291DCA end Route117_PokemonDayCare_EventScript_291F24:: @ 8291F24 msgbox Route117_PokemonDayCare_Text_29244F, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route117_PokemonDayCare_EventScript_291E6D + goto_if_eq Route117_PokemonDayCare_EventScript_291E6D goto Route117_PokemonDayCare_EventScript_291DCA end @@ -272,7 +272,7 @@ Route117_PokemonDayCare_EventScript_291F5C:: @ 8291F5C call Route117_PokemonDayCare_EventScript_291E1E msgbox Route117_PokemonDayCare_Text_2925F6, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route117_PokemonDayCare_EventScript_291E6D + goto_if_eq Route117_PokemonDayCare_EventScript_291E6D msgbox Route117_PokemonDayCare_Text_292476, MSGBOX_DEFAULT release end @@ -281,7 +281,7 @@ Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95 special ShowDaycareLevelMenu waitstate compare VAR_RESULT, 2 - goto_eq Route117_PokemonDayCare_EventScript_291DCA + goto_if_eq Route117_PokemonDayCare_EventScript_291DCA copyvar VAR_0x8004, VAR_RESULT specialvar VAR_RESULT, TakePokemonFromDaycare msgbox Route117_PokemonDayCare_Text_292575, MSGBOX_DEFAULT diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index 1d3c8dfe5..024ffbf85 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -10,17 +10,16 @@ Route120_EventScript_2906BB:: @ 82906BB Route121_EventScript_2906BB:: @ 82906BB Route123_EventScript_2906BB:: @ 82906BB lockall - checkflag FLAG_BADGE01_GET - goto_if 0, Route103_EventScript_290721 + goto_if_unset FLAG_BADGE01_GET, Route103_EventScript_290721 checkpartymove MOVE_CUT compare VAR_RESULT, 6 - goto_eq Route103_EventScript_290721 + goto_if_eq Route103_EventScript_290721 setfieldeffectargument 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT buffermovename 1, MOVE_CUT msgbox Route103_Text_29072E, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route103_EventScript_29072B + goto_if_eq Route103_EventScript_29072B msgbox Route103_Text_290771, MSGBOX_DEFAULT closemessage dofieldeffect 2 @@ -84,17 +83,16 @@ SeafloorCavern_Room2_EventScript_2907A6:: @ 82907A6 SeafloorCavern_Room5_EventScript_2907A6:: @ 82907A6 VictoryRoad_B1F_EventScript_2907A6:: @ 82907A6 lockall - checkflag FLAG_BADGE03_GET - goto_if 0, Route111_EventScript_29082D + goto_if_unset FLAG_BADGE03_GET, Route111_EventScript_29082D checkpartymove MOVE_ROCK_SMASH compare VAR_RESULT, 6 - goto_eq Route111_EventScript_29082D + goto_if_eq Route111_EventScript_29082D setfieldeffectargument 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT buffermovename 1, MOVE_ROCK_SMASH msgbox Route111_Text_29083A, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq Route111_EventScript_290837 + goto_if_eq Route111_EventScript_290837 msgbox Route111_Text_290771, MSGBOX_DEFAULT closemessage dofieldeffect 37 @@ -115,10 +113,10 @@ Route111_EventScript_2907FB:: @ 82907FB removeobject VAR_LAST_TALKED specialvar VAR_RESULT, TryUpdateRusturfTunnelState compare VAR_RESULT, 1 - goto_eq Route111_EventScript_290829 + goto_if_eq Route111_EventScript_290829 special RockSmashWildEncounter compare VAR_RESULT, 0 - goto_eq Route111_EventScript_290829 + goto_if_eq Route111_EventScript_290829 waitstate releaseall end @@ -160,17 +158,15 @@ SeafloorCavern_Room8_EventScript_2908BA:: @ 82908BA ShoalCave_LowTideLowerRoom_EventScript_2908BA:: @ 82908BA VictoryRoad_B1F_EventScript_2908BA:: @ 82908BA lockall - checkflag FLAG_BADGE04_GET - goto_if 0, FieryPath_EventScript_290915 - checkflag FLAG_SYS_USE_STRENGTH - goto_eq FieryPath_EventScript_29091F + goto_if_unset FLAG_BADGE04_GET, FieryPath_EventScript_290915 + goto_if_set FLAG_SYS_USE_STRENGTH, FieryPath_EventScript_29091F checkpartymove MOVE_STRENGTH compare VAR_RESULT, 6 - goto_eq FieryPath_EventScript_290915 + goto_if_eq FieryPath_EventScript_290915 setfieldeffectargument 0, VAR_RESULT msgbox FieryPath_Text_29092C, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq FieryPath_EventScript_290929 + goto_if_eq FieryPath_EventScript_290929 closemessage dofieldeffect 40 waitstate @@ -227,12 +223,12 @@ EventScript_UseWaterfall:: @ 8290A49 lockall checkpartymove MOVE_WATERFALL compare VAR_RESULT, 6 - goto_eq EventScript_290A84 + goto_if_eq EventScript_290A84 bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT msgbox Text_290AC3, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_290A8C + goto_if_eq EventScript_290A8C msgbox Text_290AFC, MSGBOX_DEFAULT dofieldeffect 43 goto EventScript_290A8C @@ -262,13 +258,13 @@ EventScript_UseDive:: @ 8290B0F lockall checkpartymove MOVE_DIVE compare VAR_RESULT, 6 - goto_eq EventScript_290B4E + goto_if_eq EventScript_290B4E bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 1, 1 msgbox Text_290BE8, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_290B58 + goto_if_eq EventScript_290B58 msgbox Text_290C1A, MSGBOX_DEFAULT dofieldeffect 44 goto EventScript_290B58 @@ -287,13 +283,13 @@ EventScript_UseDiveUnderwater:: @ 8290B5A lockall checkpartymove MOVE_DIVE compare VAR_RESULT, 6 - goto_eq EventScript_290B99 + goto_if_eq EventScript_290B99 bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 1, 1 msgbox Text_290C6E, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_290BA8 + goto_if_eq EventScript_290BA8 msgbox Text_290C1A, MSGBOX_DEFAULT dofieldeffect 44 goto EventScript_290BA8 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index f95cfa0ab..39de44ba6 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -2,7 +2,7 @@ EventScript_28CCAA:: @ 828CCAA setvar VAR_0x8005, 8 special InterviewBefore compare VAR_RESULT, 1 - goto_eq EventScript_28CCC6 + goto_if_eq EventScript_28CCC6 setvar VAR_0x8005, 8 special InterviewAfter return @@ -215,13 +215,12 @@ Route111_EventScript_28CF56:: @ 828CF56 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToEventObjectLocalIds compare VAR_FACING, 2 - call_if 1, Route111_EventScript_28CF94 + call_if_eq Route111_EventScript_28CF94 compare VAR_FACING, 1 - call_if 1, Route111_EventScript_28CF9F + call_if_eq Route111_EventScript_28CF9F compare VAR_FACING, 4 - call_if 1, Route111_EventScript_28CFB1 - checkflag FLAG_TEMP_1 - goto_eq Route111_EventScript_28D0EE + 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 end @@ -249,16 +248,15 @@ Route120_EventScript_28CFC3:: @ 828CFC3 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToEventObjectLocalIds compare VAR_FACING, 2 - call_if 1, Route111_EventScript_28CF94 + call_if_eq Route111_EventScript_28CF94 compare VAR_FACING, 1 - call_if 1, Route111_EventScript_28CF9F + call_if_eq Route111_EventScript_28CF9F compare VAR_FACING, 4 - call_if 1, Route111_EventScript_28CFB1 - checkflag FLAG_TEMP_1 - goto_eq Route111_EventScript_28D0EE + call_if_eq Route111_EventScript_28CFB1 + goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE specialvar VAR_RESULT, GabbyAndTyGetLastQuote compare VAR_RESULT, 0 - goto_eq Route111_EventScript_28D053 + goto_if_eq Route111_EventScript_28D053 msgbox Route111_Text_28B137, MSGBOX_DEFAULT specialvar VAR_RESULT, GabbyAndTyGetLastBattleTrivia switch VAR_RESULT @@ -313,14 +311,14 @@ Route111_EventScript_28D099:: @ 828D099 Route111_EventScript_28D0A7:: @ 828D0A7 compare VAR_RESULT, 0 - goto_eq Route111_EventScript_28D0E1 + goto_if_eq Route111_EventScript_28D0E1 msgbox Route111_Text_28B433, MSGBOX_DEFAULT setvar VAR_0x8004, 10 call Route111_EventScript_271E7C lock faceplayer compare VAR_RESULT, 0 - goto_eq Route111_EventScript_28D0E1 + goto_if_eq Route111_EventScript_28D0E1 msgbox Route111_Text_28B4AB, MSGBOX_DEFAULT special GabbyAndTyAfterInterview setflag FLAG_TEMP_1 diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index e19453b66..2791e5d9f 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -13,9 +13,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0A6:: @ 828E0A6 faceplayer msgbox MauvilleCity_PokemonCenter_1F_Text_29038E, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0C7 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0C7 compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0EA + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0EA end MauvilleCity_PokemonCenter_1F_EventScript_28E0C7:: @ 828E0C7 @@ -24,7 +24,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0C7:: @ 828E0C7 delay 60 special ScrSpecial_HasBardSongBeenChanged compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0F4 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0F4 msgbox MauvilleCity_PokemonCenter_1F_Text_2903E6, MSGBOX_DEFAULT release end @@ -37,9 +37,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0EA:: @ 828E0EA MauvilleCity_PokemonCenter_1F_EventScript_28E0F4:: @ 828E0F4 msgbox MauvilleCity_PokemonCenter_1F_Text_290421, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D end MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113 @@ -48,14 +48,14 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113 lock faceplayer compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D msgbox MauvilleCity_PokemonCenter_1F_Text_2904C1, MSGBOX_DEFAULT setvar VAR_0x8004, 1 special ScrSpecial_PlayBardSong delay 60 msgbox MauvilleCity_PokemonCenter_1F_Text_2904EB, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 special ScrSpecial_SaveBardSongLyrics msgbox MauvilleCity_PokemonCenter_1F_Text_290514, MSGBOX_DEFAULT release @@ -73,7 +73,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E167:: @ 828E167 msgbox MauvilleCity_PokemonCenter_1F_Text_29054C, MSGBOX_DEFAULT special ScrSpecial_GetHipsterSpokenFlag compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E18C + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E18C msgbox MauvilleCity_PokemonCenter_1F_Text_290598, MSGBOX_DEFAULT release end @@ -81,7 +81,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E167:: @ 828E167 MauvilleCity_PokemonCenter_1F_EventScript_28E18C:: @ 828E18C special ScrSpecial_HipsterTeachWord compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E1A4 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E1A4 msgbox MauvilleCity_PokemonCenter_1F_Text_290602, MSGBOX_DEFAULT release end @@ -156,10 +156,10 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E4D4:: @ 828E4D4 faceplayer msgbox MauvilleCity_PokemonCenter_1F_Text_28E1B1, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E503 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E503 special ScrSpecial_GetTraderTradedFlag compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E50D + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E50D message MauvilleCity_PokemonCenter_1F_Text_28E23F waitmessage goto MauvilleCity_PokemonCenter_1F_EventScript_28E517 @@ -179,15 +179,15 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E517:: @ 828E517 special ScrSpecial_TraderMenuGetDecoration waitstate compare VAR_0x8004, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E558 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E558 compare VAR_0x8004, 65535 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E562 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E562 msgbox MauvilleCity_PokemonCenter_1F_Text_28E2A9, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E56E + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E56E special ScrSpecial_DoesPlayerHaveNoDecorations compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E57A + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E57A goto MauvilleCity_PokemonCenter_1F_EventScript_28E584 end @@ -218,15 +218,15 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E584:: @ 828E584 special ScrSpecial_TraderMenuGiveDecoration waitstate compare VAR_0x8006, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5D4 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5D4 compare VAR_0x8006, 65535 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5DE + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5DE special ScrSpecial_IsDecorationFull compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5EC + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5EC msgbox MauvilleCity_PokemonCenter_1F_Text_28E3C4, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E584 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E584 special ScrSpecial_TraderDoDecorationTrade msgbox MauvilleCity_PokemonCenter_1F_Text_28E424, MSGBOX_DEFAULT release @@ -812,23 +812,23 @@ MauvilleCity_PokemonCenter_1F_EventScript_29014A:: @ 829014A setvar VAR_0x800B, 0 msgbox MauvilleCity_PokemonCenter_1F_Text_28E5F6, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 specialvar VAR_RESULT, ScrSpecial_StorytellerGetFreeStorySlot compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901DA + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_2901DA message MauvilleCity_PokemonCenter_1F_Text_28E673 waitmessage special ScrSpecial_StorytellerStoryListMenu waitstate compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901B7 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_2901B7 setvar VAR_0x8008, 1 special ScrSpecial_StorytellerDisplayStory waitmessage waitbuttonpress specialvar VAR_RESULT, ScrSpecial_StorytellerUpdateStat compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901BD + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_2901BD goto MauvilleCity_PokemonCenter_1F_EventScript_29020F MauvilleCity_PokemonCenter_1F_EventScript_2901B7:: @ 82901B7 @@ -839,7 +839,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_2901BD:: @ 82901BD msgbox MauvilleCity_PokemonCenter_1F_Text_28E78A, MSGBOX_DEFAULT specialvar VAR_RESULT, ScrSpecial_HasStorytellerAlreadyRecorded compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29022D + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_29022D goto MauvilleCity_PokemonCenter_1F_EventScript_2901E2 MauvilleCity_PokemonCenter_1F_EventScript_2901DA:: @ 82901DA @@ -848,10 +848,10 @@ MauvilleCity_PokemonCenter_1F_EventScript_2901DA:: @ 82901DA MauvilleCity_PokemonCenter_1F_EventScript_2901E2:: @ 82901E2 msgbox MauvilleCity_PokemonCenter_1F_Text_28E7EE, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 specialvar VAR_RESULT, ScrSpecial_StorytellerInitializeRandomStat compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29020F + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_29020F msgbox MauvilleCity_PokemonCenter_1F_Text_28E881, MSGBOX_DEFAULT release end @@ -897,25 +897,25 @@ MauvilleCity_PokemonCenter_1F_EventScript_2902F6:: @ 82902F6 faceplayer msgbox MauvilleCity_PokemonCenter_1F_Text_29022F, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290317 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290317 compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29037A + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_29037A end MauvilleCity_PokemonCenter_1F_EventScript_290317:: @ 8290317 special ScrSpecial_GiddyShouldTellAnotherTale compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290359 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290359 compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290384 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290384 end MauvilleCity_PokemonCenter_1F_EventScript_290331:: @ 8290331 special ScrSpecial_GiddyShouldTellAnotherTale compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29034B + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_29034B compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290384 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290384 end MauvilleCity_PokemonCenter_1F_EventScript_29034B:: @ 829034B @@ -929,9 +929,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_290359:: @ 8290359 waitmessage yesnobox 20, 8 compare VAR_RESULT, 1 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290331 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290331 compare VAR_RESULT, 0 - goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290331 + goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290331 end MauvilleCity_PokemonCenter_1F_EventScript_29037A:: @ 829037A diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index dde799a4b..ea805edc4 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -1,8 +1,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_291539:: @ 8291539 lock faceplayer - checkflag FLAG_SYS_CHAT_USED - goto_eq PetalburgCity_PokemonCenter_1F_EventScript_2915F5 + 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 end @@ -30,9 +29,9 @@ PetalburgCity_PokemonCenter_1F_EventScript_29159F:: @ 829159F lock faceplayer compare VAR_RESULT, 0 - goto_eq PetalburgCity_PokemonCenter_1F_EventScript_2915CB + goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_2915CB compare VAR_RESULT, 1 - goto_eq PetalburgCity_PokemonCenter_1F_EventScript_2915D5 + goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_2915D5 end PetalburgCity_PokemonCenter_1F_EventScript_2915CB:: @ 82915CB @@ -82,9 +81,9 @@ PetalburgCity_PokemonCenter_1F_EventScript_291650:: @ 8291650 lock faceplayer compare VAR_RESULT, 0 - goto_eq PetalburgCity_PokemonCenter_1F_EventScript_2915CB + goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_2915CB compare VAR_RESULT, 1 - goto_eq PetalburgCity_PokemonCenter_1F_EventScript_2915D5 + goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_2915D5 end PetalburgCity_PokemonCenter_1F_EventScript_29167C:: @ 829167C diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 81ea87871..f9c6cf24e 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -9,25 +9,25 @@ LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704 applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_27259E waitmovement 0 compare VAR_0x8005, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_29274D + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_29274D compare VAR_0x8005, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292758 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292758 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, MSGBOX_DEFAULT closemessage setvar VAR_0x4092, 4 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292763 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292763 applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6 waitmovement 0 releaseall end LittlerootTown_BrendansHouse_1F_EventScript_29274D:: @ 829274D - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 waitmovement 0 return @@ -40,7 +40,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292765:: @ 8292765 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, MSGBOX_DEFAULT closemessage applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_2725A6 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292AF0 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AF0 waitmovement 0 releaseall end @@ -59,8 +59,7 @@ LittlerootTown_MaysHouse_2F_EventScript_29278D:: @ 829278D LittlerootTown_BrendansHouse_2F_EventScript_292799:: @ 8292799 LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799 - checkflag FLAG_0x051 - goto_eq LittlerootTown_BrendansHouse_2F_EventScript_29283F + goto_if_set FLAG_0x051, LittlerootTown_BrendansHouse_2F_EventScript_29283F msgbox LittlerootTown_BrendansHouse_2F_Text_1F8668, MSGBOX_DEFAULT call LittlerootTown_BrendansHouse_2F_EventScript_292849 delay 30 @@ -70,9 +69,9 @@ LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799 setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_2927DF + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2927DF compare VAR_RESULT, 1 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_29280F + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_29280F playse SE_KAIDAN removeobject VAR_0x8008 releaseall @@ -83,7 +82,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_2927DF:: @ 82927DF addobject VAR_0x8008 applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292850 waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A8 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT closemessage @@ -96,7 +95,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29280F:: @ 829280F addobject VAR_0x8008 applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_29285B waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_2725A4 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT closemessage @@ -158,17 +157,17 @@ LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2725A8 waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_29294B - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292AE0 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE0 waitmovement 0 playbgm MUS_INTER_V, 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BBC, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2929B7 waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292AE6 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE6 waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_29296C - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, MSGBOX_DEFAULT @@ -183,17 +182,17 @@ LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2725A4 waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_29294B - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_292AE8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AE8 waitmovement 0 playbgm MUS_INTER_V, 0 msgbox LittlerootTown_MaysHouse_1F_Text_1F7BBC, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2929BA waitmovement 0 - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_292AEE + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AEE waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_29296C - applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_2725A8 waitmovement 0 msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, MSGBOX_DEFAULT @@ -217,7 +216,7 @@ LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B LittlerootTown_BrendansHouse_1F_EventScript_29296C:: @ 829296C LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A6 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A6 waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, MSGBOX_DEFAULT fadedefaultbgm @@ -315,17 +314,15 @@ LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5 lock faceplayer compare VAR_0x4082, 4 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F compare VAR_0x408C, 4 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F - checkflag FLAG_HAS_MATCH_CALL - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A19 - checkflag FLAG_0x052 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A86 + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F + goto_if_set FLAG_HAS_MATCH_CALL, LittlerootTown_BrendansHouse_1F_EventScript_292A19 + goto_if_set FLAG_0x052, LittlerootTown_BrendansHouse_1F_EventScript_292A86 compare VAR_TEMP_1, 1 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94 + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94 compare VAR_0x4092, 7 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292AB0 + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292AB0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT release end @@ -336,8 +333,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A0F:: @ 8292A0F end LittlerootTown_BrendansHouse_1F_EventScript_292A19:: @ 8292A19 - checkflag FLAG_0x0D8 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A43 + goto_if_set FLAG_0x0D8, LittlerootTown_BrendansHouse_1F_EventScript_292A43 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E0E, MSGBOX_DEFAULT closemessage delay 30 @@ -351,17 +347,15 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A19:: @ 8292A19 end LittlerootTown_BrendansHouse_1F_EventScript_292A43:: @ 8292A43 - checkflag FLAG_BADGE05_GET - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A51 + goto_if_set FLAG_BADGE05_GET, LittlerootTown_BrendansHouse_1F_EventScript_292A51 goto LittlerootTown_BrendansHouse_1F_EventScript_292A86 LittlerootTown_BrendansHouse_1F_EventScript_292A51:: @ 8292A51 - checkflag FLAG_0x085 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A86 + goto_if_set FLAG_0x085, LittlerootTown_BrendansHouse_1F_EventScript_292A86 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, MSGBOX_DEFAULT giveitem_std ITEM_AMULET_COIN compare VAR_RESULT, 0 - goto_eq LittlerootTown_BrendansHouse_1F_EventScript_272054 + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_272054 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT setflag FLAG_0x085 release @@ -445,13 +439,13 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 lockall checkplayergender compare VAR_RESULT, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292C76 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C76 compare VAR_RESULT, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292C86 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C86 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D08 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D08 compare VAR_0x8008, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D13 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D13 applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_27259E waitmovement 0 playse SE_PIN @@ -461,32 +455,32 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 waitmovement 0 delay 20 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292C96 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C96 compare VAR_0x8008, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CA1 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CA1 msgbox LittlerootTown_BrendansHouse_1F_Text_1F800E, MSGBOX_DEFAULT giveitem_std ITEM_SS_TICKET msgbox LittlerootTown_BrendansHouse_1F_Text_1F80FE, MSGBOX_DEFAULT closemessage delay 20 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CAC + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CAC compare VAR_0x8008, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CC1 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CC1 msgbox LittlerootTown_BrendansHouse_1F_Text_1F815B, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CD6 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CD6 compare VAR_0x8008, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CEF + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CEF playse SE_DOOR removeobject VAR_0x8009 setflag FLAG_0x123 delay 30 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D48 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D48 compare VAR_0x8008, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D5D + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D5D delay 20 msgbox LittlerootTown_BrendansHouse_1F_Text_1F81B9, MSGBOX_DEFAULT closemessage @@ -494,24 +488,24 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 special TurnOnTVScreen delay 60 compare VAR_0x8008, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D72 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D72 compare VAR_0x8008, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D7D + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D7D msgbox LittlerootTown_BrendansHouse_1F_Text_1F824B, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D1E + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D1E compare VAR_0x8008, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D33 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D33 msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT closemessage clearflag FLAG_SYS_TV_LATI setflag FLAG_0x0FF special TurnOffTVScreen compare VAR_0x8008, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D88 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D88 compare VAR_0x8008, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D9D + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D9D msgbox LittlerootTown_BrendansHouse_1F_Text_1F8351, MSGBOX_DEFAULT multichoice 22, 8, 108, 1 copyvar VAR_0x8004, VAR_RESULT @@ -565,38 +559,38 @@ LittlerootTown_BrendansHouse_1F_EventScript_292CC1:: @ 8292CC1 return LittlerootTown_BrendansHouse_1F_EventScript_292CD6:: @ 8292CD6 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292DCC + 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 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292CEF:: @ 8292CEF - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292DCC + 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 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D08:: @ 8292D08 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292DC6 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DC6 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D13:: @ 8292D13 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292DD1 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD1 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D1E:: @ 8292D1E - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292DD7 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD7 waitmovement 0 applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2725A4 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D33:: @ 8292D33 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_292DDE + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DDE waitmovement 0 applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2725A8 waitmovement 0 @@ -605,14 +599,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D33:: @ 8292D33 LittlerootTown_BrendansHouse_1F_EventScript_292D48:: @ 8292D48 applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292999 waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D5D:: @ 8292D5D applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_29299B waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8 waitmovement 0 return @@ -629,14 +623,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D7D:: @ 8292D7D LittlerootTown_BrendansHouse_1F_EventScript_292D88:: @ 8292D88 applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929AF waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A8 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929B3 waitmovement 0 - applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_2725A4 waitmovement 0 return diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index c1f53aa5d..834fc38a2 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -247,14 +247,13 @@ LilycoveCity_ContestLobby_Text_293BB4: @ 8293BB4 EventScript_Pblock1_Ask:: @ 8293C3E lockall - checkflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - goto_if 0, LilycoveCity_ContestLobby_EventScript_293EFB + goto_if_unset FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS, LilycoveCity_ContestLobby_EventScript_293EFB setvar VAR_0x8009, 1 applymovement 16, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 msgbox Text_Pblock1_Ask, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq EventScript_Pblock1_Yes + goto_if_eq EventScript_Pblock1_Yes goto EventScript_Pblock1_No end @@ -266,8 +265,7 @@ EventScript_Pblock1_No: @ 8293C70 EventScript_Pblock1_NoBerries: @ 8293C7A msgbox Text_Pblock1_NoBerries, MSGBOX_DEFAULT dodailyevents - checkflag FLAG_0x921 - goto_eq LilycoveCity_ContestLobby_EventScript_293C92 + goto_if_set FLAG_0x921, LilycoveCity_ContestLobby_EventScript_293C92 goto LilycoveCity_ContestLobby_EventScript_293C9C end @@ -286,7 +284,7 @@ LilycoveCity_ContestLobby_EventScript_293C9C: @ 8293C9C EventScript_Pblock1_KnowHow: @ 8293CB9 msgbox Text_Pblock1_KnowHow, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq EventScript_Pblock1_Start + goto_if_eq EventScript_Pblock1_Start goto EventScript_Pblock1_Explain end @@ -303,13 +301,13 @@ EventScript_Pblock1_Explain: @ 8293CE0 EventScript_Pblock1_Yes: @ 8293CEE checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 - goto_eq EventScript_Pblock1_NoPokeblock + goto_if_eq EventScript_Pblock1_NoPokeblock specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 - goto_eq EventScript_Pblock1_FullPokeblock + goto_if_eq EventScript_Pblock1_FullPokeblock specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 0 - goto_eq EventScript_Pblock1_NoBerries + goto_if_eq EventScript_Pblock1_NoBerries msgbox Text_Pblock1_Yes, MSGBOX_DEFAULT goto EventScript_Pblock1_KnowHow end @@ -340,7 +338,7 @@ LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_293201, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_293DC6 + goto_if_eq LilycoveCity_ContestLobby_EventScript_293DC6 goto LilycoveCity_ContestLobby_EventScript_293D7D end @@ -357,7 +355,7 @@ LilycoveCity_ContestLobby_EventScript_293D87: @ 8293D87 LilycoveCity_ContestLobby_EventScript_293D91: @ 8293D91 msgbox LilycoveCity_ContestLobby_Text_29328C, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_293DAA + goto_if_eq LilycoveCity_ContestLobby_EventScript_293DAA goto LilycoveCity_ContestLobby_EventScript_293DB8 end @@ -374,16 +372,16 @@ LilycoveCity_ContestLobby_EventScript_293DB8: @ 8293DB8 LilycoveCity_ContestLobby_EventScript_293DC6: @ 8293DC6 specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_293D87 + goto_if_eq LilycoveCity_ContestLobby_EventScript_293D87 checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_293E14 + goto_if_eq LilycoveCity_ContestLobby_EventScript_293E14 msgbox LilycoveCity_ContestLobby_Text_293237, MSGBOX_DEFAULT specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 - goto_if 5, LilycoveCity_ContestLobby_EventScript_293D91 + goto_if_ne LilycoveCity_ContestLobby_EventScript_293D91 compare VAR_RESULT, 65535 - goto_eq LilycoveCity_ContestLobby_EventScript_293E0A + goto_if_eq LilycoveCity_ContestLobby_EventScript_293E0A end LilycoveCity_ContestLobby_EventScript_293E0A: @ 8293E0A @@ -406,7 +404,7 @@ LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_293842, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_293EA3 + goto_if_eq LilycoveCity_ContestLobby_EventScript_293EA3 goto LilycoveCity_ContestLobby_EventScript_293E5A end @@ -423,7 +421,7 @@ LilycoveCity_ContestLobby_EventScript_293E64: @ 8293E64 LilycoveCity_ContestLobby_EventScript_293E6E: @ 8293E6E msgbox LilycoveCity_ContestLobby_Text_29357E, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_293E87 + goto_if_eq LilycoveCity_ContestLobby_EventScript_293E87 goto LilycoveCity_ContestLobby_EventScript_293E95 end @@ -440,16 +438,16 @@ LilycoveCity_ContestLobby_EventScript_293E95: @ 8293E95 LilycoveCity_ContestLobby_EventScript_293EA3: @ 8293EA3 specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_293E64 + goto_if_eq LilycoveCity_ContestLobby_EventScript_293E64 checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_293EF1 + goto_if_eq LilycoveCity_ContestLobby_EventScript_293EF1 msgbox LilycoveCity_ContestLobby_Text_29354E, MSGBOX_DEFAULT specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 - goto_if 5, LilycoveCity_ContestLobby_EventScript_293E6E + goto_if_ne LilycoveCity_ContestLobby_EventScript_293E6E compare VAR_RESULT, 65535 - goto_eq LilycoveCity_ContestLobby_EventScript_293EE7 + goto_if_eq LilycoveCity_ContestLobby_EventScript_293EE7 end LilycoveCity_ContestLobby_EventScript_293EE7: @ 8293EE7 @@ -467,7 +465,7 @@ LilycoveCity_ContestLobby_EventScript_293EFB: @ 8293EFB setvar VAR_0x8009, 1 msgbox LilycoveCity_ContestLobby_Text_2C42F4, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_293F28 + goto_if_eq LilycoveCity_ContestLobby_EventScript_293F28 msgbox LilycoveCity_ContestLobby_Text_2C4332, MSGBOX_DEFAULT releaseall end @@ -480,21 +478,21 @@ LilycoveCity_ContestLobby_EventScript_293F1E: @ 8293F1E LilycoveCity_ContestLobby_EventScript_293F28: @ 8293F28 checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_293F8E + goto_if_eq LilycoveCity_ContestLobby_EventScript_293F8E specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_293F1E + goto_if_eq LilycoveCity_ContestLobby_EventScript_293F1E specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 - goto_if 5, LilycoveCity_ContestLobby_EventScript_293F64 + goto_if_ne LilycoveCity_ContestLobby_EventScript_293F64 compare VAR_RESULT, 65535 - goto_eq LilycoveCity_ContestLobby_EventScript_293F98 + goto_if_eq LilycoveCity_ContestLobby_EventScript_293F98 end LilycoveCity_ContestLobby_EventScript_293F64: @ 8293F64 msgbox LilycoveCity_ContestLobby_Text_2C43FA, MSGBOX_YESNO compare VAR_RESULT, 0 - call_if 1, LilycoveCity_ContestLobby_EventScript_293F85 + call_if_eq LilycoveCity_ContestLobby_EventScript_293F85 msgbox LilycoveCity_ContestLobby_Text_2C451B, MSGBOX_DEFAULT goto EventScript_StartBlending end @@ -536,9 +534,9 @@ LilycoveCity_ContestLobby_EventScript_293FC8: @ 8293FC8 msgbox Text_Pblock1_Talk_0, MSGBOX_DEFAULT specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_293FEE + goto_if_eq LilycoveCity_ContestLobby_EventScript_293FEE compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_293FF8 + goto_if_eq LilycoveCity_ContestLobby_EventScript_293FF8 end LilycoveCity_ContestLobby_EventScript_293FEE: @ 8293FEE @@ -549,13 +547,12 @@ LilycoveCity_ContestLobby_EventScript_293FEE: @ 8293FEE LilycoveCity_ContestLobby_EventScript_293FF8: @ 8293FF8 checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 - goto_eq LilycoveCity_ContestLobby_EventScript_294028 + goto_if_eq LilycoveCity_ContestLobby_EventScript_294028 specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 - goto_eq LilycoveCity_ContestLobby_EventScript_294028 + goto_if_eq LilycoveCity_ContestLobby_EventScript_294028 dodailyevents - checkflag FLAG_0x921 - goto_eq LilycoveCity_ContestLobby_EventScript_294028 + goto_if_set FLAG_0x921, LilycoveCity_ContestLobby_EventScript_294028 goto LilycoveCity_ContestLobby_EventScript_294032 end @@ -580,23 +577,23 @@ EventScript_PblockLink:: @ 8294055 lockall specialvar VAR_RESULT, PlayerHasBerries compare VAR_RESULT, 0 - goto_eq EventScript_PblocLink_NoBerries + goto_if_eq EventScript_PblocLink_NoBerries checkitem ITEM_POKEBLOCK_CASE, 1 compare VAR_RESULT, 0 - goto_eq EventScript_PblocLink_NoPokeblock + goto_if_eq EventScript_PblocLink_NoPokeblock specialvar VAR_RESULT, GetFirstFreePokeblockSlot compare VAR_RESULT, 65535 - goto_if 5, EventScript_PblocLink_Ask + goto_if_ne EventScript_PblocLink_Ask compare VAR_RESULT, 65535 - goto_eq EventScript_PblocLink_FullPokeblock + goto_if_eq EventScript_PblocLink_FullPokeblock end EventScript_PblocLink_Ask: @ 8294092 msgbox Text_PblockLink_Ask, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq EventScript_PblocLink_TryConnect + goto_if_eq EventScript_PblocLink_TryConnect compare VAR_RESULT, 0 - goto_eq EventScript_PblocLink_End + goto_if_eq EventScript_PblocLink_End end EventScript_PblocLink_NoBerries: @ 82940B1 @@ -607,24 +604,24 @@ EventScript_PblocLink_NoBerries: @ 82940B1 EventScript_PblocLink_TryConnect: @ 82940BB call LilycoveCity_ContestLobby_EventScript_27134F compare VAR_RESULT, 0 - goto_eq EventScript_PblocLink_End + goto_if_eq EventScript_PblocLink_End specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, 1 - goto_eq LilycoveCity_ContestLobby_EventScript_2941ED + goto_if_eq LilycoveCity_ContestLobby_EventScript_2941ED message Text_PblockLink_Searching waitmessage special sub_80B2FD8 waitstate compare VAR_RESULT, 1 - goto_eq EventScript_PblocLink_SpawnPartners + goto_if_eq EventScript_PblocLink_SpawnPartners compare VAR_RESULT, 2 - goto_eq EventScript_PblocLink_SomeoneNotReady + goto_if_eq EventScript_PblocLink_SomeoneNotReady compare VAR_RESULT, 3 - goto_eq EventScript_PblocLink_DifferentSelections + goto_if_eq EventScript_PblocLink_DifferentSelections compare VAR_RESULT, 5 - goto_eq EventScript_PblocLink_CloseLink + goto_if_eq EventScript_PblocLink_CloseLink compare VAR_RESULT, 6 - goto_eq EventScript_PblocLink_LinkError + goto_if_eq EventScript_PblocLink_LinkError end EventScript_PblocLink_1Arrived: @ 829411D @@ -728,22 +725,22 @@ EventScript_PblocLink_DecideLeader: @ 82941F8 EventScript_PblocLink_TryBecomeLeader: @ 8294235 call EventScript_PblocLink_BecomeLeader compare VAR_RESULT, 1 - goto_eq EventScript_PblocLink_SpawnPartners_ + goto_if_eq EventScript_PblocLink_SpawnPartners_ compare VAR_RESULT, 5 - goto_eq EventScript_PblocLink_DecideLeader + goto_if_eq EventScript_PblocLink_DecideLeader compare VAR_RESULT, 8 - goto_eq EventScript_PblocLink_TryBecomeLeader + goto_if_eq EventScript_PblocLink_TryBecomeLeader release end EventScript_PblocLink_TryJoinGroup: @ 829425D call EventScript_PblocLink_JoinGroup compare VAR_RESULT, 1 - goto_eq EventScript_PblocLink_SpawnPartners_ + goto_if_eq EventScript_PblocLink_SpawnPartners_ compare VAR_RESULT, 5 - goto_eq EventScript_PblocLink_DecideLeader + goto_if_eq EventScript_PblocLink_DecideLeader compare VAR_RESULT, 8 - goto_eq EventScript_PblocLink_TryJoinGroup + goto_if_eq EventScript_PblocLink_TryJoinGroup release end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 5a5244f1b..2932401e1 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -15,7 +15,7 @@ EventScript_2A4B6F:: @ 82A4B6F lockall msgbox Text_2A4BF4, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq EventScript_2A4B85 + goto_if_eq EventScript_2A4B85 releaseall end @@ -44,10 +44,10 @@ EventScript_2A4BAC:: @ 82A4BAC lockall special GetPokeblockFeederInFront compare VAR_RESULT, 65535 - goto_if 5, EventScript_2A4BEB + goto_if_ne EventScript_2A4BEB msgbox Text_2A4C90, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq EventScript_2A4BD0 + goto_if_eq EventScript_2A4BD0 releaseall end @@ -56,7 +56,7 @@ EventScript_2A4BD0:: @ 82A4BD0 special OpenPokeblockCaseOnFeeder waitstate compare VAR_RESULT, 65535 - goto_if 5, EventScript_2A4BE2 + goto_if_ne EventScript_2A4BE2 end EventScript_2A4BE2:: @ 82A4BE2 diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 35a2731a7..ff5e53a06 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -313,32 +313,32 @@ EventScript_2759F1:: @ 82759F1 special sub_80E8C98 special sub_80E8BC8 compare VAR_RESULT, 1 - goto_eq EventScript_275BE8 + goto_if_eq EventScript_275BE8 checkpartymove MOVE_SECRET_POWER setfieldeffectargument 0, VAR_RESULT buffermovename 1, MOVE_SECRET_POWER compare VAR_0x8007, 1 - goto_eq EventScript_275A50 + goto_if_eq EventScript_275A50 compare VAR_0x8007, 2 - goto_eq EventScript_275A50 + goto_if_eq EventScript_275A50 compare VAR_0x8007, 3 - goto_eq EventScript_275A50 + goto_if_eq EventScript_275A50 compare VAR_0x8007, 4 - goto_eq EventScript_275A50 + goto_if_eq EventScript_275A50 compare VAR_0x8007, 5 - goto_eq EventScript_275AA9 + goto_if_eq EventScript_275AA9 compare VAR_0x8007, 6 - goto_eq EventScript_275B02 + goto_if_eq EventScript_275B02 end EventScript_275A50:: @ 8275A50 lockall compare VAR_RESULT, 6 - goto_eq EventScript_275A91 + goto_if_eq EventScript_275A91 bufferpartymonnick 0, VAR_RESULT msgbox gText_23B704, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_275CDE + goto_if_eq EventScript_275CDE msgbox Route103_Text_290771, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE @@ -366,11 +366,11 @@ EventScript_275A9B:: @ 8275A9B EventScript_275AA9:: @ 8275AA9 lockall compare VAR_RESULT, 6 - goto_eq EventScript_275AEA + goto_if_eq EventScript_275AEA bufferpartymonnick 0, VAR_RESULT msgbox Text_274779, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_275CDE + goto_if_eq EventScript_275CDE msgbox Route103_Text_290771, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_SECRET_POWER_TREE @@ -398,11 +398,11 @@ EventScript_275AF4:: @ 8275AF4 EventScript_275B02:: @ 8275B02 lockall compare VAR_RESULT, 6 - goto_eq EventScript_275B43 + goto_if_eq EventScript_275B43 bufferpartymonnick 0, VAR_RESULT msgbox Text_274825, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_275CDE + goto_if_eq EventScript_275CDE msgbox Route103_Text_290771, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB @@ -442,12 +442,12 @@ EventScript_275B5B:: @ 8275B5B end SecretBase_RedCave1_EventScript_275B81:: @ 8275B81 - applymovement 255, SecretBase_RedCave1_Movement_275BB4 + applymovement EVENT_OBJ_ID_PLAYER, SecretBase_RedCave1_Movement_275BB4 waitmovement 0 setvar VAR_0x4097, 1 msgbox SecretBase_RedCave1_Text_23B759, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_275BAB + goto_if_eq SecretBase_RedCave1_EventScript_275BAB closemessage playse SE_KAIDAN special sub_80E9A90 @@ -471,7 +471,7 @@ EventScript_275BB7:: @ 8275BB7 playse SE_KAIDAN special sub_80E9744 compare VAR_RESULT, 0 - goto_eq EventScript_275BDB + goto_if_eq EventScript_275BDB clearflag FLAG_DECORATION_0 special sub_80E9068 setvar VAR_0x4089, 0 @@ -488,58 +488,58 @@ EventScript_275BDB:: @ 8275BDB EventScript_275BE8:: @ 8275BE8 checkpartymove MOVE_SECRET_POWER compare VAR_RESULT, 6 - goto_eq EventScript_275C9A + goto_if_eq EventScript_275C9A setfieldeffectargument 0, VAR_RESULT setorcopyvar VAR_0x8004, VAR_RESULT lockall special GetSecretBaseNearbyMapName msgbox Text_276A3D, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_275CDE + goto_if_eq EventScript_275CDE msgbox Text_2766AA, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_275CDE + goto_if_eq EventScript_275CDE fadescreenswapbuffers 1 special sub_80E9B70 closemessage fadescreenswapbuffers 0 msgbox Text_276A95, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq EventScript_275CDE + goto_if_eq EventScript_275CDE bufferpartymonnick 0, VAR_0x8004 buffermovename 1, MOVE_SECRET_POWER msgbox Route103_Text_290771, MSGBOX_DEFAULT closemessage closemessage compare VAR_0x8007, 1 - goto_eq EventScript_275A86 + goto_if_eq EventScript_275A86 compare VAR_0x8007, 2 - goto_eq EventScript_275A86 + goto_if_eq EventScript_275A86 compare VAR_0x8007, 3 - goto_eq EventScript_275A86 + goto_if_eq EventScript_275A86 compare VAR_0x8007, 4 - goto_eq EventScript_275A86 + goto_if_eq EventScript_275A86 compare VAR_0x8007, 5 - goto_eq EventScript_275ADF + goto_if_eq EventScript_275ADF compare VAR_0x8007, 6 - goto_eq EventScript_275B38 + goto_if_eq EventScript_275B38 releaseall end EventScript_275C9A:: @ 8275C9A lockall compare VAR_0x8007, 1 - goto_eq EventScript_275A91 + goto_if_eq EventScript_275A91 compare VAR_0x8007, 2 - goto_eq EventScript_275A91 + goto_if_eq EventScript_275A91 compare VAR_0x8007, 3 - goto_eq EventScript_275A91 + goto_if_eq EventScript_275A91 compare VAR_0x8007, 4 - goto_eq EventScript_275A91 + goto_if_eq EventScript_275A91 compare VAR_0x8007, 5 - goto_eq EventScript_275AEA + goto_if_eq EventScript_275AEA compare VAR_0x8007, 6 - goto_eq EventScript_275B43 + goto_if_eq EventScript_275B43 end EventScript_275CDE:: @ 8275CDE @@ -590,10 +590,10 @@ EventScript_275D2E:: @ 8275D2E EventScript_275D39:: @ 8275D39 special sub_8129708 compare VAR_RESULT, 1 - goto_eq EventScript_275D63 + goto_if_eq EventScript_275D63 addvar VAR_0x8004, 1 compare VAR_0x8005, 0 - goto_eq EventScript_275D39 + goto_if_eq EventScript_275D39 removeobject VAR_0x8006 setflag 0x8005 goto EventScript_275D39 @@ -628,42 +628,41 @@ SecretBase_YellowCave3_EventScript_275D64:: @ 8275D64 SecretBase_YellowCave4_EventScript_275D64:: @ 8275D64 special sub_80EA354 compare VAR_0x8004, 0 - goto_eq SecretBase_RedCave1_EventScript_275DD6 + goto_if_eq SecretBase_RedCave1_EventScript_275DD6 compare VAR_0x8004, 1 - goto_eq SecretBase_RedCave1_EventScript_275E4E + goto_if_eq SecretBase_RedCave1_EventScript_275E4E compare VAR_0x8004, 2 - goto_eq SecretBase_RedCave1_EventScript_275EC6 + goto_if_eq SecretBase_RedCave1_EventScript_275EC6 compare VAR_0x8004, 3 - goto_eq SecretBase_RedCave1_EventScript_275F3E + goto_if_eq SecretBase_RedCave1_EventScript_275F3E compare VAR_0x8004, 4 - goto_eq SecretBase_RedCave1_EventScript_275FB6 + goto_if_eq SecretBase_RedCave1_EventScript_275FB6 compare VAR_0x8004, 5 - goto_eq SecretBase_RedCave1_EventScript_27602E + goto_if_eq SecretBase_RedCave1_EventScript_27602E compare VAR_0x8004, 6 - goto_eq SecretBase_RedCave1_EventScript_2760A6 + goto_if_eq SecretBase_RedCave1_EventScript_2760A6 compare VAR_0x8004, 7 - goto_eq SecretBase_RedCave1_EventScript_27611E + goto_if_eq SecretBase_RedCave1_EventScript_27611E compare VAR_0x8004, 8 - goto_eq SecretBase_RedCave1_EventScript_276196 + goto_if_eq SecretBase_RedCave1_EventScript_276196 compare VAR_0x8004, 9 - goto_eq SecretBase_RedCave1_EventScript_27620E + goto_if_eq SecretBase_RedCave1_EventScript_27620E end SecretBase_RedCave1_EventScript_275DD6:: @ 8275DD6 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_275E25 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275E25 compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_275E44 + goto_if_eq SecretBase_RedCave1_EventScript_275E44 msgbox SecretBase_RedCave1_Text_2748A0, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275E2F + goto_if_eq SecretBase_RedCave1_EventScript_275E2F setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275E2F + goto_if_eq SecretBase_RedCave1_EventScript_275E2F msgbox SecretBase_RedCave1_Text_274939, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end @@ -689,18 +688,17 @@ SecretBase_RedCave1_EventScript_275E44:: @ 8275E44 SecretBase_RedCave1_EventScript_275E4E:: @ 8275E4E lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_275E9D + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275E9D compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_275EBC + goto_if_eq SecretBase_RedCave1_EventScript_275EBC msgbox SecretBase_RedCave1_Text_274C13, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275EA7 + goto_if_eq SecretBase_RedCave1_EventScript_275EA7 setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275EA7 + goto_if_eq SecretBase_RedCave1_EventScript_275EA7 msgbox SecretBase_RedCave1_Text_274CB0, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end @@ -726,18 +724,17 @@ SecretBase_RedCave1_EventScript_275EBC:: @ 8275EBC SecretBase_RedCave1_EventScript_275EC6:: @ 8275EC6 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_275F15 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275F15 compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_275F34 + goto_if_eq SecretBase_RedCave1_EventScript_275F34 msgbox SecretBase_RedCave1_Text_274F39, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275F1F + goto_if_eq SecretBase_RedCave1_EventScript_275F1F setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275F1F + goto_if_eq SecretBase_RedCave1_EventScript_275F1F msgbox SecretBase_RedCave1_Text_274FCA, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end @@ -763,18 +760,17 @@ SecretBase_RedCave1_EventScript_275F34:: @ 8275F34 SecretBase_RedCave1_EventScript_275F3E:: @ 8275F3E lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_275F8D + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_275F8D compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_275FAC + goto_if_eq SecretBase_RedCave1_EventScript_275FAC msgbox SecretBase_RedCave1_Text_275287, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275F97 + goto_if_eq SecretBase_RedCave1_EventScript_275F97 setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_275F97 + goto_if_eq SecretBase_RedCave1_EventScript_275F97 msgbox SecretBase_RedCave1_Text_275315, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end @@ -800,18 +796,17 @@ SecretBase_RedCave1_EventScript_275FAC:: @ 8275FAC SecretBase_RedCave1_EventScript_275FB6:: @ 8275FB6 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_276005 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_276005 compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_276024 + goto_if_eq SecretBase_RedCave1_EventScript_276024 msgbox SecretBase_RedCave1_Text_2755D2, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_27600F + goto_if_eq SecretBase_RedCave1_EventScript_27600F setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_27600F + goto_if_eq SecretBase_RedCave1_EventScript_27600F msgbox SecretBase_RedCave1_Text_275679, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end @@ -837,18 +832,17 @@ SecretBase_RedCave1_EventScript_276024:: @ 8276024 SecretBase_RedCave1_EventScript_27602E:: @ 827602E lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_27607D + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_27607D compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_27609C + goto_if_eq SecretBase_RedCave1_EventScript_27609C msgbox SecretBase_RedCave1_Text_274A64, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_276087 + goto_if_eq SecretBase_RedCave1_EventScript_276087 setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_276087 + goto_if_eq SecretBase_RedCave1_EventScript_276087 msgbox SecretBase_RedCave1_Text_274AFA, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end @@ -874,18 +868,17 @@ SecretBase_RedCave1_EventScript_27609C:: @ 827609C SecretBase_RedCave1_EventScript_2760A6:: @ 82760A6 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_2760F5 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_2760F5 compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_276114 + goto_if_eq SecretBase_RedCave1_EventScript_276114 msgbox SecretBase_RedCave1_Text_274DD2, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_2760FF + goto_if_eq SecretBase_RedCave1_EventScript_2760FF setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_2760FF + goto_if_eq SecretBase_RedCave1_EventScript_2760FF msgbox SecretBase_RedCave1_Text_274E41, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end @@ -911,18 +904,17 @@ SecretBase_RedCave1_EventScript_276114:: @ 8276114 SecretBase_RedCave1_EventScript_27611E:: @ 827611E lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_27616D + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_27616D compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_27618C + goto_if_eq SecretBase_RedCave1_EventScript_27618C msgbox SecretBase_RedCave1_Text_275114, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_276177 + goto_if_eq SecretBase_RedCave1_EventScript_276177 setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_276177 + goto_if_eq SecretBase_RedCave1_EventScript_276177 msgbox SecretBase_RedCave1_Text_2751AF, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end @@ -948,18 +940,17 @@ SecretBase_RedCave1_EventScript_27618C:: @ 827618C SecretBase_RedCave1_EventScript_276196:: @ 8276196 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_2761E5 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_2761E5 compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_276204 + goto_if_eq SecretBase_RedCave1_EventScript_276204 msgbox SecretBase_RedCave1_Text_275405, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_2761EF + goto_if_eq SecretBase_RedCave1_EventScript_2761EF setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_2761EF + goto_if_eq SecretBase_RedCave1_EventScript_2761EF msgbox SecretBase_RedCave1_Text_2754B2, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end @@ -985,18 +976,17 @@ SecretBase_RedCave1_EventScript_276204:: @ 8276204 SecretBase_RedCave1_EventScript_27620E:: @ 827620E lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_27625D + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_27625D compare VAR_RESULT, 1 - goto_eq SecretBase_RedCave1_EventScript_27627C + goto_if_eq SecretBase_RedCave1_EventScript_27627C msgbox SecretBase_RedCave1_Text_2757B5, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_276267 + goto_if_eq SecretBase_RedCave1_EventScript_276267 setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F compare VAR_RESULT, 0 - goto_eq SecretBase_RedCave1_EventScript_276267 + goto_if_eq SecretBase_RedCave1_EventScript_276267 msgbox SecretBase_RedCave1_Text_275884, MSGBOX_DEFAULT goto SecretBase_RedCave1_EventScript_276286 end @@ -1026,11 +1016,11 @@ SecretBase_RedCave1_EventScript_276286:: @ 8276286 special DoSpecialTrainerBattle waitstate compare VAR_RESULT, 3 - call_if 1, SecretBase_RedCave1_EventScript_2762BD + call_if_eq SecretBase_RedCave1_EventScript_2762BD compare VAR_RESULT, 1 - call_if 1, SecretBase_RedCave1_EventScript_2762C1 + call_if_eq SecretBase_RedCave1_EventScript_2762C1 compare VAR_RESULT, 2 - call_if 1, SecretBase_RedCave1_EventScript_2762C5 + call_if_eq SecretBase_RedCave1_EventScript_2762C5 special HealPlayerParty release end diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 031835c14..072d154f0 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -38,7 +38,7 @@ Route111_EventScript_2765FF:: @ 82765FF faceplayer msgbox Route111_Text_2762C9, MSGBOX_YESNO compare VAR_RESULT, 1 - goto_eq Route111_EventScript_27661E + goto_if_eq Route111_EventScript_27661E msgbox Route111_Text_27655C, MSGBOX_DEFAULT release end @@ -46,17 +46,17 @@ Route111_EventScript_2765FF:: @ 82765FF Route111_EventScript_27661E:: @ 827661E giveitem_std ITEM_TM43 compare VAR_RESULT, 0 - goto_eq Route111_EventScript_276680 + goto_if_eq Route111_EventScript_276680 msgbox Route111_Text_27636E, MSGBOX_DEFAULT closemessage setflag FLAG_0x060 clearflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN compare VAR_FACING, 3 - call_if 1, Route111_EventScript_27666A + call_if_eq Route111_EventScript_27666A compare VAR_FACING, 4 - call_if 1, Route111_EventScript_27666A + call_if_eq Route111_EventScript_27666A compare VAR_FACING, 2 - call_if 1, Route111_EventScript_276675 + call_if_eq Route111_EventScript_276675 removeobject VAR_LAST_TALKED release end diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index 61a1afa25..c205a9d22 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -11,7 +11,7 @@ EventScript_TryDoNormalTrainerBattle:: @ 8271362 waitmovement 0 specialvar VAR_RESULT, GetTrainerFlag compare VAR_RESULT, 0 - goto_if 5, EventScript_NoNormalTrainerBattle + goto_if_ne EventScript_NoNormalTrainerBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement goto EventScript_ShowTrainerIntroMsg @@ -24,10 +24,10 @@ EventScript_TryDoDoubleTrainerBattle:: @ 827138A call EventScript_RevealTrainer specialvar VAR_RESULT, GetTrainerFlag compare VAR_RESULT, 0 - goto_if 5, EventScript_NoDoubleTrainerBattle + goto_if_ne EventScript_NoDoubleTrainerBattle special HasEnoughMonsForDoubleBattle compare VAR_RESULT, 0 - goto_if 5, EventScript_NotEnoughMonsForDoubleBattle + goto_if_ne EventScript_NotEnoughMonsForDoubleBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement goto EventScript_ShowTrainerIntroMsg @@ -51,7 +51,7 @@ EventScript_TryDoRematchBattle:: @ 82713D1 call EventScript_RevealTrainer specialvar VAR_RESULT, IsTrainerReadyForRematch compare VAR_RESULT, 0 - goto_eq EventScript_NoRematchTrainerBattle + goto_if_eq EventScript_NoRematchTrainerBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement special ShowTrainerIntroSpeech @@ -67,10 +67,10 @@ EventScript_NoRematchTrainerBattle:: @ 82713F7 EventScript_TryDoDoubleRematchBattle:: @ 82713F8 specialvar VAR_RESULT, IsTrainerReadyForRematch compare VAR_RESULT, 0 - goto_eq EventScript_NoDoubleRematchTrainerBattle + goto_if_eq EventScript_NoDoubleRematchTrainerBattle special HasEnoughMonsForDoubleBattle compare VAR_RESULT, 0 - goto_if 5, EventScript_NotEnoughMonsForDoubleRematchBattle + goto_if_ne EventScript_NotEnoughMonsForDoubleRematchBattle special SetUpTrainerEncounterMusic special SetUpTrainerMovement special ShowTrainerIntroSpeech @@ -104,7 +104,7 @@ EventScript_ShowTrainerIntroMsg:: @ 827143C waitbuttonpress special TryPrepareSecondApproachingTrainer compare VAR_RESULT, TRUE - goto_eq EventScript_ShowSecondTrainerIntro + goto_if_eq EventScript_ShowSecondTrainerIntro goto EventScript_DoTrainerBattle EventScript_DoTrainerBattle:: @ 8271454 @@ -112,15 +112,15 @@ EventScript_DoTrainerBattle:: @ 8271454 @ Pointless check, possibly used for debugging? specialvar VAR_RESULT, GetTrainerBattleMode compare VAR_RESULT, TRAINER_BATTLE_SINGLE - goto_eq EventScript_EndTrainerBattle + goto_if_eq EventScript_EndTrainerBattle compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT - goto_eq EventScript_EndTrainerBattle + goto_if_eq EventScript_EndTrainerBattle compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC - goto_eq EventScript_EndTrainerBattle + goto_if_eq EventScript_EndTrainerBattle compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE - goto_eq EventScript_EndTrainerBattle + goto_if_eq EventScript_EndTrainerBattle compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC - goto_eq EventScript_EndTrainerBattle + goto_if_eq EventScript_EndTrainerBattle EventScript_EndTrainerBattle:: @ 8271491 gotobeatenscript diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 9033e741f..0b1224503 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -4,30 +4,28 @@ EventScript_TV:: @ 827EE0B special ResetTVShowState specialvar VAR_RESULT, CheckForBigMovieOrEmergencyNewsOnTV compare VAR_RESULT, 2 - goto_eq EventScript_27EE9A + goto_if_eq EventScript_27EE9A compare VAR_RESULT, 1 - goto_eq EventScript_27EEA4 - checkflag FLAG_SYS_TV_START - goto_if 0, EventScript_27EE8A - checkflag FLAG_SYS_TV_WATCH - goto_eq EventScript_27EE8A + goto_if_eq EventScript_27EEA4 + goto_if_unset FLAG_SYS_TV_START, EventScript_27EE8A + goto_if_set FLAG_SYS_TV_WATCH, EventScript_27EE8A specialvar VAR_RESULT, IsTVShowInSearchOfTrainersAiring compare VAR_RESULT, 1 - goto_eq EventScript_27EEFF + goto_if_eq EventScript_27EEFF goto EventScript_27EEE9 end EventScript_27EE54:: @ 827EE54 specialvar VAR_0x8004, special_0x44 compare VAR_0x8004, 255 - goto_eq EventScript_27EED8 + goto_if_eq EventScript_27EED8 specialvar VAR_RESULT, special_0x4a compare VAR_RESULT, 255 - goto_eq EventScript_27EED8 + goto_if_eq EventScript_27EED8 copyvar VAR_0x8004, VAR_RESULT specialvar VAR_RESULT, special_0x45 compare VAR_RESULT, 0 - goto_if 5, EventScript_27EEBA + goto_if_ne EventScript_27EEBA end EventScript_27EE8A:: @ 827EE8A @@ -56,7 +54,7 @@ EventScript_27EEBA:: @ 827EEBA waitmessage waitbuttonpress compare VAR_RESULT, 1 - goto_if 5, EventScript_27EEBA + goto_if_ne EventScript_27EEBA goto EventScript_27EED0 end @@ -75,7 +73,7 @@ EventScript_27EED8:: @ 827EED8 EventScript_27EEE9:: @ 827EEE9 special DoPokeNews compare VAR_RESULT, 0 - goto_eq EventScript_27EE54 + goto_if_eq EventScript_27EE54 waitmessage waitbuttonpress goto EventScript_27EED0 @@ -86,6 +84,6 @@ EventScript_27EEFF:: @ 827EEFF waitmessage waitbuttonpress compare VAR_RESULT, 0 - goto_eq EventScript_27EEFF + goto_if_eq EventScript_27EEFF goto EventScript_27EED0 end diff --git a/data/specials.inc b/data/specials.inc index 8ee70c306..318d272d5 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -34,7 +34,7 @@ gSpecials:: @ 81DBA64 def_special sub_8129708 def_special sub_80E91F8 def_special sub_80EA30C - def_special sub_80FA57C + def_special DoSecretBasePCTurnOffEffect def_special sub_80E6BE8 def_special sub_80B2DA4 def_special sub_80B2E4C @@ -71,7 +71,7 @@ gSpecials:: @ 81DBA64 def_special ShouldTryRematchBattle def_special IsTrainerReadyForRematch def_special BattleSetup_StartRematchBattle - def_special ShowPokemonStorageSystem + def_special ShowPokemonStorageSystemPC def_special HasEnoughMonsForDoubleBattle def_special TurnOffTVScreen def_special DoTVShow @@ -105,7 +105,7 @@ gSpecials:: @ 81DBA64 def_special GiveMonArtistRibbon def_special sub_80B3000 def_special SaveGame - def_special sub_80FAFF8 + def_special DoWateringBerryTreeAnim def_special easy_chat_input_maybe def_special sub_811EECC def_special ScrSpecial_GetCurrentMauvilleMan @@ -286,8 +286,8 @@ gSpecials:: @ 81DBA64 def_special GameClear def_special ShakeScreenInElevator def_special nullsub_55 - def_special SpawnScriptEventObject - def_special RemoveScriptEventObject + def_special SpawnCameraObject + def_special RemoveCameraObject def_special GetPokeblockNameByMonNature def_special GetSecretBaseNearbyMapName def_special CheckRelicanthWailord @@ -317,7 +317,7 @@ gSpecials:: @ 81DBA64 def_special ScriptCheckFreePokemonStorageSpace def_special DoSealedChamberShakingEffect1 def_special sub_8139B60 - def_special sub_80FAC78 + def_special GetShieldToyTVDecorationInfo def_special IsPokerusInParty def_special SetSootopolisGymCrackedIceMetatiles def_special sub_8139560 diff --git a/data/unk_transition.s b/data/unk_transition.s deleted file mode 100644 index db5744d08..000000000 --- a/data/unk_transition.s +++ /dev/null @@ -1,18 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2, 0 -gUnknown_0862AD54:: @ 862AD54 - .incbin "graphics/battle_transitions/frontier_transition.4bpp.lz" - -gUnknown_0862AF30:: @ 862AF30 - .incbin "graphics/battle_transitions/frontier_transition.bin" - -gUnknown_0862B0DC:: @ 862B0DC - .incbin "graphics/battle_transitions/frontier_transition_circles.4bpp.lz" - -gUnknown_0862B53C:: @ 862B53C - .incbin "graphics/battle_transitions/frontier_transition.gbapal" - .space 0x1c0 |