dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Tetrable
2019-01-02 21:25:14 +00:00
parent 1e3da62d24 a0ff38d0be
commit a3ebca4d81
773 changed files with 11252 additions and 23425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

228
data/battle_anim_scripts.s
View File

@@ -1252,12 +1252,12 @@ Move_REVERSAL:
createvisualtask sub_8115A04, 2, 31, 3, 2, 0, 10, RGB_WHITE
delay 10
playsewithpan SE_W179, SOUND_PAN_ATTACKER
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 0
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 42
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 84
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 126
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 168
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 210
createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 0
createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 42
createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 84
createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 126
createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 168
createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 210
waitforvisualfinish
delay 20
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4
@@ -1751,7 +1751,7 @@ Frustration_Strong:
createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28
waitforvisualfinish
delay 5
createvisualtask sub_815C3A8, 5
createvisualtask AnimTask_StrongFrustrationGrowAndShrink, 5
delay 7
playsewithpan SE_W004, SOUND_PAN_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 8, 1, 1
@@ -1785,7 +1785,7 @@ Frustration_Medium:
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1
goto Frustration_Continue
Frustration_Weak:
createsprite gUnknown_085CE4D0, ANIM_ATTACKER, 2, 20, -28
createsprite gWeakFrustrationAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 20, -28
waitforvisualfinish
delay 10
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 10, 2
@@ -1815,26 +1815,26 @@ Move_SAFEGUARD:
Move_PAIN_SPLIT:
loadspritegfx ANIM_TAG_PAIN_SPLIT
createsprite gUnknown_085CE590, ANIM_ATTACKER, 2, -8, -42, 0
createsprite gUnknown_085CE590, ANIM_TARGET, 2, -8, -42, 1
createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -8, -42, ANIM_ATTACKER
createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -8, -42, ANIM_TARGET
delay 10
playsewithpan SE_W207B, 0
createvisualtask sub_815CA20, 2, 0, 0
createvisualtask sub_815CA20, 2, 1, 0
createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 0
createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 0
waitforvisualfinish
createsprite gUnknown_085CE590, ANIM_ATTACKER, 2, -24, -42, 0
createsprite gUnknown_085CE590, ANIM_TARGET, 2, -24, -42, 1
createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -24, -42, ANIM_ATTACKER
createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -24, -42, ANIM_TARGET
delay 10
playsewithpan SE_W207B, 0
createvisualtask sub_815CA20, 2, 0, 1
createvisualtask sub_815CA20, 2, 1, 1
createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 1
createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 1
waitforvisualfinish
createsprite gUnknown_085CE590, ANIM_ATTACKER, 2, 8, -42, 0
createsprite gUnknown_085CE590, ANIM_TARGET, 2, 8, -42, 1
createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, 8, -42, ANIM_ATTACKER
createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, 8, -42, ANIM_TARGET
delay 10
playsewithpan SE_W207B, 0
createvisualtask sub_815CA20, 2, 0, 2
createvisualtask sub_815CA20, 2, 1, 2
createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 2
createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 2
end
Move_VICE_GRIP:
@@ -2888,7 +2888,7 @@ Move_KINESIS:
Move_GLARE:
loadspritegfx ANIM_TAG_SMALL_RED_EYE
loadspritegfx ANIM_TAG_EYE_SPARKLE
createvisualtask sub_815E114, 5, 0
createvisualtask AnimTask_GlareEyeDots, 5, 0
playsewithpan SE_W060B, SOUND_PAN_ATTACKER
waitforvisualfinish
createvisualtask sub_8116620, 5, 1, 0, 0, 16, RGB_BLACK
@@ -2905,7 +2905,7 @@ Move_GLARE:
Move_BARRAGE:
loadspritegfx ANIM_TAG_RED_BALL
createvisualtask sub_815E47C, 3
createvisualtask AnimTask_BarrageBall, 3
playsewithpan SE_W207, SOUND_PAN_ATTACKER
delay 24
createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, 8, 1, 40, 1
@@ -2996,7 +2996,7 @@ Move_SPLASH:
Move_ACID_ARMOR:
monbg ANIM_ATTACKER
setalpha 15, 0
createvisualtask sub_815D240, 2, 0
createvisualtask AnimTask_AcidArmor, 2, ANIM_ATTACKER
playsewithpan SE_W151, SOUND_PAN_ATTACKER
waitforvisualfinish
blendoff
@@ -3096,7 +3096,7 @@ Move_FLAIL:
loadspritegfx ANIM_TAG_IMPACT
monbg ANIM_TARGET
setalpha 12, 8
createvisualtask sub_815C770, 2, 0
createvisualtask AnimTask_FlailMovement, 2, ANIM_ATTACKER
loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 8, 2
waitforvisualfinish
createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 3
@@ -3158,7 +3158,7 @@ Move_FORESIGHT:
monbg ANIM_DEF_PARTNER
monbgprio_28 ANIM_TARGET
setalpha 16, 0
createsprite gUnknown_085CE8C4, ANIM_TARGET, 2, 1
createsprite gForesightMagnifyingGlassSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET
delay 17
loopsewithpan SE_W166, SOUND_PAN_TARGET, 16, 4
delay 48
@@ -3219,7 +3219,7 @@ EndureEffect:
Move_CHARM:
loadspritegfx ANIM_TAG_MAGENTA_HEART
createvisualtask sub_815C478, 5, 0, 2, 0
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
delay 15
@@ -3529,23 +3529,23 @@ Move_MEMENTO:
Move_FACADE:
loadspritegfx ANIM_TAG_SWEAT_DROP
createvisualtask sub_815DCA4, 2, 0, 3
createvisualtask sub_815DF0C, 2, 0, 72
createvisualtask AnimTask_SquishAndSweatDroplets, 2, ANIM_ATTACKER, 3
createvisualtask AnimTask_FacadeColorBlend, 2, ANIM_ATTACKER, 72
loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 24, 3
end
Move_SMELLING_SALT:
loadspritegfx ANIM_TAG_TAG_HAND
loadspritegfx ANIM_TAG_SMELLINGSALT_EFFECT
createsprite gUnknown_085CE864, ANIM_TARGET, 2, 1, 0, 2
createsprite gUnknown_085CE864, ANIM_TARGET, 2, 1, 1, 2
createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 2
createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 2
delay 32
createvisualtask sub_815E840, 3, 1, 2
createvisualtask AnimTask_SmellingSaltsSquish, 3, ANIM_TARGET, 2
loopsewithpan SE_W003, SOUND_PAN_TARGET, 12, 2
waitforvisualfinish
delay 4
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 2
createsprite gUnknown_085CE894, ANIM_TARGET, 2, 1, 8, 3
createsprite gSmellingSaltExclamationSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 8, 3
loopsewithpan SE_W207B, SOUND_PAN_TARGET, 16, 3
end
@@ -3616,9 +3616,9 @@ Move_TAUNT:
Move_HELPING_HAND:
loadspritegfx ANIM_TAG_TAG_HAND
createvisualtask sub_815EC48, 5
createsprite gUnknown_085CE8AC, ANIM_ATTACKER, 40, 0
createsprite gUnknown_085CE8AC, ANIM_ATTACKER, 40, 1
createvisualtask AnimTask_HelpingHandAttackerMovement, 5
createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 0
createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 1
delay 19
playsewithpan SE_W227, 0
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1
@@ -3633,18 +3633,18 @@ Move_HELPING_HAND:
Move_ASSIST:
loadspritegfx ANIM_TAG_PAW_PRINT
createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, 112, -16, 140, 128, 36
createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 112, -16, 140, 128, 36
delay 2
createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, 208, 128, -16, 48, 36
createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 208, 128, -16, 48, 36
playsewithpan SE_W010, 0
delay 2
createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, -16, 112, 256, -16, 36
createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, -16, 112, 256, -16, 36
playsewithpan SE_W010, 0
delay 2
createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, 108, 128, 84, -16, 36
createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 108, 128, 84, -16, 36
playsewithpan SE_W010, 0
delay 2
createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, -16, 56, 256, 56, 36
createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, -16, 56, 256, 56, 36
playsewithpan SE_W010, 0
end
@@ -3687,7 +3687,7 @@ Move_RECYCLE:
monbg ANIM_ATTACKER
setalpha 0, 16
delay 1
createsprite gUnknown_085CE9B0, ANIM_ATTACKER, 2
createsprite gRecycleSpriteTemplate, ANIM_ATTACKER, 2
loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 24, 3
waitforvisualfinish
createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 2, 1
@@ -3764,24 +3764,24 @@ BrickBreakShatteredWall:
Move_YAWN:
loadspritegfx ANIM_TAG_PINK_CLOUD
createvisualtask sub_815D64C, 2, 0
createvisualtask AnimTask_DeepInhale, 2, ANIM_ATTACKER
playsewithpan SE_W281, SOUND_PAN_ATTACKER
waitforvisualfinish
createsprite gUnknown_085CE68C, ANIM_TARGET, 5, 2
createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 2
playsewithpan SE_W255, SOUND_PAN_ATTACKER
delay 4
createsprite gUnknown_085CE68C, ANIM_TARGET, 5, 1
createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 1
delay 4
createsprite gUnknown_085CE68C, ANIM_TARGET, 5, 0
createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 0
waitforvisualfinish
createvisualtask sub_815D64C, 2, 1
createvisualtask AnimTask_DeepInhale, 2, ANIM_TARGET
playsewithpan SE_W281, SOUND_PAN_TARGET
end
Move_ENDEAVOR:
loadspritegfx ANIM_TAG_SWEAT_DROP
loadspritegfx ANIM_TAG_IMPACT
createvisualtask sub_815DCA4, 2, 0, 2
createvisualtask AnimTask_SquishAndSweatDroplets, 2, ANIM_ATTACKER, 2
loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 2
createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 21, 0), 12, 1, 2
delay 6
@@ -3989,7 +3989,7 @@ Move_FEATHER_DANCE:
Move_TEETER_DANCE:
loadspritegfx ANIM_TAG_MUSIC_NOTES
loadspritegfx ANIM_TAG_DUCK
createvisualtask sub_8160164, 5
createvisualtask AnimTask_TeeterDanceMovement, 5
createsprite gUnknown_08593050, ANIM_ATTACKER, 2, 0, 16, -2
playsewithpan SE_W298, SOUND_PAN_ATTACKER
delay 24
@@ -4098,7 +4098,7 @@ Move_NEEDLE_ARM:
Move_SLACK_OFF:
loadspritegfx ANIM_TAG_BLUE_STAR
createvisualtask sub_8160544, 2, 0
createvisualtask AnimTask_SlackOffSquish, 2, ANIM_ATTACKER
playsewithpan SE_W281, SOUND_PAN_ATTACKER
waitforvisualfinish
call HealingEffect
@@ -4171,7 +4171,7 @@ Move_FAKE_TEARS:
loadspritegfx ANIM_TAG_MUSIC_NOTES
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SMALL_BUBBLES, 0, 4, 4, RGB(12, 11, 31)
waitforvisualfinish
createvisualtask sub_815C478, 5, 0, 2, 1
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 1
loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 12, 4
delay 8
createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 0
@@ -4211,7 +4211,7 @@ Move_AIR_CUTTER:
Move_ODOR_SLEUTH:
monbg ANIM_TARGET
createvisualtask sub_815F620, 5
createvisualtask AnimTask_OdorSleuthMovement, 5
delay 24
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 4
playsewithpan SE_W207, SOUND_PAN_ATTACKER
@@ -4275,7 +4275,7 @@ Move_TICKLE:
delay 20
createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, ANIM_ATTACKER
delay 12
createvisualtask sub_815C478, 3, 1, 6, 2
createvisualtask AnimTask_RockMonBackAndForth, 3, ANIM_TARGET, 6, 2
loopsewithpan SE_W039, SOUND_PAN_TARGET, 8, 8
waitforvisualfinish
end
@@ -4365,13 +4365,13 @@ Move_IRON_DEFENSE:
Move_BLOCK:
loadspritegfx ANIM_TAG_X_SIGN
createsprite gUnknown_085CE90C, ANIM_TARGET, 66
createsprite gBlockXSpriteTemplate, ANIM_TARGET, 66
playsewithpan SE_W207, SOUND_PAN_TARGET
end
Move_HOWL:
loadspritegfx ANIM_TAG_NOISE_LINE
createvisualtask sub_815D64C, 2, 0
createvisualtask AnimTask_DeepInhale, 2, 0
delay 12
call RoarEffect
createvisualtask sub_8158D8C, 2, 0, 3
@@ -4392,7 +4392,7 @@ Move_BULK_UP:
Move_COVET:
loadspritegfx ANIM_TAG_MAGENTA_HEART
loadspritegfx ANIM_TAG_ITEM_BAG
createvisualtask sub_815C478, 5, 0, 2, 0
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
delay 15
@@ -4973,13 +4973,13 @@ Move_ROAR:
end
RoarEffect:
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, -8, 0
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 0, 2
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 8, 1
createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, -8, 0
createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 2
createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 8, 1
delay 15
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, -8, 0
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 0, 2
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 8, 1
createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, -8, 0
createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 2
createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 8, 1
return
Move_GROWL:
@@ -8312,38 +8312,38 @@ MorningSun1:
Move_SWEET_SCENT:
loadspritegfx ANIM_TAG_PINK_PETAL
playsewithpan SE_W230, SOUND_PAN_ATTACKER
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 100, 0, 100
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 100
delay 25
setpan 0
call SweetScentEffect
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 55, 0
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 55, 0
setpan SOUND_PAN_TARGET
createvisualtask sub_8115A04, 2, 20, 1, 5, 5, 13, RGB(31, 21, 21)
call SweetScentEffect
waitforvisualfinish
end
SweetScentEffect:
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 70, 1, 64
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 70, 1, 64
delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 60, 0, 64
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 60, 0, 64
delay 5
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 80, 1, 64
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 80, 1, 64
delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 58, 0, 120
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 58, 0, 120
delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 100, 0, 120
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 120
delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 90, 0, 64
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 90, 0, 64
delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 48, 0, 64
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 48, 0, 64
delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 95, 1, 80
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 95, 1, 80
delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 100, 0, 120
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 120
delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 75, 1, 64
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 75, 1, 64
delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 85, 0, 120
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 85, 0, 120
delay 2
return
@@ -8404,32 +8404,32 @@ Move_FLATTER:
createvisualtask sub_815ABEC, 2
createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0
waitforvisualfinish
createsprite gUnknown_085CE5C0, ANIM_TARGET, 2, 0, -8, 80
createsprite gFlatterSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8, 80
delay 0
createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 5, 2, ANIM_TARGET
delay 10
createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 5, 2, ANIM_TARGET
delay 0
createvisualtask sub_8159210, 5, 229, SOUND_PAN_ATTACKER
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
delay 5
createvisualtask sub_8159210, 5, 229, SOUND_PAN_TARGET
waitforvisualfinish
@@ -8437,9 +8437,9 @@ Move_FLATTER:
waitforvisualfinish
createvisualtask sub_815AC8C, 2
end
Flatter1:
createsprite gUnknown_085CE5A8, ANIM_ATTACKER, 40, 0
createsprite gUnknown_085CE5A8, ANIM_ATTACKER, 40, 1
CreateFlatterConfetti:
createsprite gFlatterConfettiSpriteTemplate, ANIM_ATTACKER, 40, ANIM_ATTACKER
createsprite gFlatterConfettiSpriteTemplate, ANIM_ATTACKER, 40, ANIM_TARGET
return
Move_ROLE_PLAY:
@@ -8449,7 +8449,7 @@ Move_ROLE_PLAY:
waitforvisualfinish
playsewithpan SE_W161, SOUND_PAN_ATTACKER
waitplaysewithpan SE_W197, SOUND_PAN_ATTACKER, 30
createvisualtask sub_815CED8, 2
createvisualtask AnimTask_RolePlaySilhouette, 2
waitforvisualfinish
clearmonbg ANIM_ATK_PARTNER
createvisualtask sub_8116620, 10, 4, 2, 16, 0, RGB_WHITE
@@ -8718,12 +8718,12 @@ Move_METEOR_MASH:
fadetobg BG_COSMIC
waitbgfadein
waitforvisualfinish
createsprite gUnknown_085CE8DC, ANIM_TARGET, 3, -48, SOUND_PAN_ATTACKER, 72, 32, 30
createsprite gMeteorMashStarSpriteTemplate, ANIM_TARGET, 3, -48, -64, 72, 32, 30
delay 10
createsprite gUnknown_085CE8DC, ANIM_TARGET, 3, -112, SOUND_PAN_ATTACKER, 8, 32, 30
createsprite gMeteorMashStarSpriteTemplate, ANIM_TARGET, 3, -112, -64, 8, 32, 30
delay 40
createsprite gUnknown_08595F14, ANIM_TARGET, 3, 0, 0, 0, 30
createsprite gUnknown_085CE8DC, ANIM_TARGET, 3, -80, SOUND_PAN_ATTACKER, 40, 32, 30
createsprite gMeteorMashStarSpriteTemplate, ANIM_TARGET, 3, -80, -64, 40, 32, 30
delay 20
playsewithpan SE_W233B, SOUND_PAN_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1
@@ -9551,7 +9551,7 @@ Move_KNOCK_OFF:
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6
delay 4
playsewithpan SE_W233, SOUND_PAN_TARGET
createsprite gUnknown_085CE984, ANIM_TARGET, 2, -16, -16
createsprite gKnockOffStrikeSpriteTemplate, ANIM_TARGET, 2, -16, -16
delay 8
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 2
@@ -10450,31 +10450,31 @@ General_SmokeballEscape:
setalpha 12, 4
delay 0
playsewithpan SE_BOWA2, SOUND_PAN_TARGET
createsprite gUnknown_085CE734, ANIM_TARGET, 0, 0, 32, 28, 30
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_TARGET, 0, 0, 32, 28, 30
delay 4
playsewithpan SE_BOWA2, SOUND_PAN_TARGET
createsprite gUnknown_085CE734, ANIM_ATTACKER, 127, 2, 12, 20, 30
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 127, 2, 12, 20, 30
delay 12
playsewithpan SE_BOWA2, SOUND_PAN_TARGET
createsprite gUnknown_085CE734, ANIM_ATTACKER, 126, 2, -28, 4, 30
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 126, 2, -28, 4, 30
delay 12
playsewithpan SE_BOWA2, SOUND_PAN_TARGET
createsprite gUnknown_085CE734, ANIM_ATTACKER, 124, 2, 14, -20, 30
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 124, 2, 14, -20, 30
delay 4
playsewithpan SE_BOWA2, SOUND_PAN_TARGET
createvisualtask sub_81136E8, 2, 2
createsprite gUnknown_085CE734, ANIM_ATTACKER, 123, 3, 4, 4, 30
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 123, 3, 4, 4, 30
delay 14
playsewithpan SE_BOWA2, SOUND_PAN_TARGET
createsprite gUnknown_085CE734, ANIM_ATTACKER, 122, 3, -14, 18, 46
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 122, 3, -14, 18, 46
delay 0
createsprite gUnknown_085CE734, ANIM_ATTACKER, 121, 3, 14, -14, 46
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 121, 3, 14, -14, 46
delay 0
createsprite gUnknown_085CE734, ANIM_ATTACKER, 120, 3, -12, -10, 46
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 120, 3, -12, -10, 46
delay 0
createsprite gUnknown_085CE734, ANIM_ATTACKER, 119, 3, 14, 14, 46
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 119, 3, 14, 14, 46
delay 0
createsprite gUnknown_085CE734, ANIM_ATTACKER, 118, 3, 0, 0, 46
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 118, 3, 0, 0, 46
waitforvisualfinish
clearmonbg ANIM_ATTACKER
invisible ANIM_ATTACKER
@@ -10556,11 +10556,11 @@ SnatchMoveContinue:
end
SnatchOpposingMonMove:
playsewithpan SE_W104, SOUND_PAN_ATTACKER
createvisualtask sub_815F8F4, 2
createvisualtask AnimTask_SnatchOpposingMonMove, 2
goto SnatchMoveContinue
SnatchPartnerMonMove:
playsewithpan SE_W104, SOUND_PAN_ATTACKER
createvisualtask sub_815FFC4, 2
createvisualtask AnimTask_SnatchPartnerMove, 2
goto SnatchMoveContinue
General_FutureSightHit:

15
data/event_scripts.s
View File

@@ -1,3 +1,4 @@
#include "constants/global.h"
#include "constants/battle_frontier.h"
#include "constants/battle_setup.h"
#include "constants/event_objects.h"
@@ -1792,9 +1793,9 @@ Route110_EventScript_271ED7:: @ 8271ED7
Route119_EventScript_271ED7:: @ 8271ED7
RustboroCity_EventScript_271ED7:: @ 8271ED7
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq RustboroCity_EventScript_271EEF
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq RustboroCity_EventScript_271EF5
end
@@ -1810,9 +1811,9 @@ LavaridgeTown_EventScript_271EFB:: @ 8271EFB
Route110_EventScript_271EFB:: @ 8271EFB
Route119_EventScript_271EFB:: @ 8271EFB
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq LavaridgeTown_EventScript_271F13
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq LavaridgeTown_EventScript_271F19
end
@@ -1826,9 +1827,9 @@ LavaridgeTown_EventScript_271F19:: @ 8271F19
EventScript_271F1F:: @ 8271F1F
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq EventScript_271F37
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq EventScript_271F3D
end
@@ -4768,7 +4769,7 @@ gUnknown_082A8350:: @ 82A8350
waitmovement 0
playse SE_RU_HYUU
delay 60
special sp13F_fall_to_last_warp
special DoFallWarp
waitstate
end

2
data/field_effect_scripts.s
View File

@@ -341,5 +341,5 @@ gFieldEffectScript_Unknown65:: @ 82DBCF9
field_eff_end
gFieldEffectScript_Unknown66:: @ 82DBCFF
field_eff_callnative sub_80B9E28
field_eff_callnative Fldeff_MoveDeoxysRock
field_eff_end

1
data/layouts/Route111_NoMirageTower/layout.inc
View File

@@ -12,3 +12,4 @@ Route111_NoMirageTower_Layout::
.4byte Route111_NoMirageTower_MapBlockdata
.4byte gTileset_General
.4byte gTileset_Mauville

2
data/maps/AbandonedShip_CaptainsOffice/header.inc
View File

@@ -10,6 +10,6 @@ AbandonedShip_CaptainsOffice: @ 84845A4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_Corridors_1F/header.inc
View File

@@ -10,6 +10,6 @@ AbandonedShip_Corridors_1F: @ 84844C4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_Corridors_B1F/header.inc
View File

@@ -10,6 +10,6 @@ AbandonedShip_Corridors_B1F: @ 84844FC
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_Deck/header.inc
View File

@@ -10,6 +10,6 @@ AbandonedShip_Deck: @ 84844A8
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
View File

@@ -10,6 +10,6 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_HiddenFloorRooms/header.inc
View File

@@ -10,6 +10,6 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 7
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_Room_B1F/header.inc
View File

@@ -10,6 +10,6 @@ AbandonedShip_Room_B1F: @ 848456C
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_Rooms2_1F/header.inc
View File

@@ -10,6 +10,6 @@ AbandonedShip_Rooms2_1F: @ 8484588
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_Rooms2_B1F/header.inc
View File

@@ -10,6 +10,6 @@ AbandonedShip_Rooms2_B1F: @ 8484534
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_Rooms_1F/header.inc
View File

@@ -10,6 +10,6 @@ AbandonedShip_Rooms_1F: @ 84844E0
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_Rooms_B1F/header.inc
View File

@@ -10,6 +10,6 @@ AbandonedShip_Rooms_B1F: @ 8484518
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_Underwater1/header.inc
View File

@@ -10,6 +10,6 @@ AbandonedShip_Underwater1: @ 8484550
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.2byte 0
.byte 13
map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AbandonedShip_Underwater2/header.inc
View File

@@ -10,6 +10,6 @@ AbandonedShip_Underwater2: @ 84845C0
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.2byte 0
.byte 13
map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AlteringCave/header.inc
View File

@@ -10,6 +10,6 @@ AlteringCave: @ 8484A58
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AncientTomb/header.inc
View File

@@ -10,6 +10,6 @@ AncientTomb: @ 8484630
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/AquaHideout_1F/header.inc
View File

@@ -10,6 +10,6 @@ AquaHideout_1F: @ 8484144
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 8
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
.byte MAP_BATTLE_SCENE_AQUA

2
data/maps/AquaHideout_B1F/header.inc
View File

@@ -10,6 +10,6 @@ AquaHideout_B1F: @ 8484160
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 8
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
.byte MAP_BATTLE_SCENE_AQUA

2
data/maps/AquaHideout_B2F/header.inc
View File

@@ -10,6 +10,6 @@ AquaHideout_B2F: @ 848417C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 8
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
.byte MAP_BATTLE_SCENE_AQUA

2
data/maps/AquaHideout_UnusedRubyMap1/header.inc
View File

@@ -10,6 +10,6 @@ AquaHideout_UnusedRubyMap1: @ 84846D8
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_MAGMA

2
data/maps/AquaHideout_UnusedRubyMap2/header.inc
View File

@@ -10,6 +10,6 @@ AquaHideout_UnusedRubyMap2: @ 84846F4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_MAGMA

2
data/maps/AquaHideout_UnusedRubyMap3/header.inc
View File

@@ -10,6 +10,6 @@ AquaHideout_UnusedRubyMap3: @ 8484710
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_MAGMA

2
data/maps/ArtisanCave_1F/header.inc
View File

@@ -10,6 +10,6 @@ ArtisanCave_1F: @ 84849B0
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/ArtisanCave_B1F/header.inc
View File

@@ -10,6 +10,6 @@ ArtisanCave_B1F: @ 8484994
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

4
data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc
View File

@@ -5,8 +5,8 @@ BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC
object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_VAR_0, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4

2
data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

4
data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
View File

@@ -17,9 +17,9 @@ BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0
BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC
return

2
data/maps/BattleFrontier_BattleArenaCorridor/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattleArenaCorridor: @ 8485468
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattleArenaLobby/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattleArenaLobby: @ 848544C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

4
data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc
View File

@@ -11,9 +11,9 @@ BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4
object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 13, EVENT_OBJ_GFX_TRADER, 0, 4, 9, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 4, 9, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 14, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 15, EVENT_OBJ_GFX_HIPSTER, 0, 11, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
object_event 15, EVENT_OBJ_GFX_VAR_0, 0, 11, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C
map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0

2
data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

4
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
View File

@@ -20,9 +20,9 @@ BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC:: @ 824BCDC
BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA
return

2
data/maps/BattleFrontier_BattleDomeCorridor/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattleDomeCorridor: @ 8485350
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattleDomeLobby/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattleDomeLobby: @ 8485334
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

4
data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc
View File

@@ -1,12 +1,12 @@
BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 8, 255, 0, 5, 11, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 8, EVENT_OBJ_GFX_VAR_F, 0, 5, 11, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C
map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0

2
data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

4
data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
View File

@@ -8,9 +8,9 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB
setvar VAR_0x8004, 5
special CallFrontierUtilFunc
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B
setvar VAR_0x8004, 9
special CallFrontierUtilFunc

2
data/maps/BattleFrontier_BattleFactoryLobby/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

4
data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc
View File

@@ -1,6 +1,6 @@
BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC
object_event 1, EVENT_OBJ_GFX_TRADER, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0

2
data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

4
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
View File

@@ -12,9 +12,9 @@ BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856
return

2
data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattlePalaceLobby/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattlePikeCorridor/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeCorridor: @ 8485510
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattlePikeLobby/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeLobby: @ 84854F4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

4
data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc
View File

@@ -1,6 +1,6 @@
BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54
object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0
object_event 2, EVENT_OBJ_GFX_TRADER, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0
object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0
object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0
BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84
coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2

2
data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattlePyramidEmptySquare: @ 8485414
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattlePyramidLobby/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattlePyramidTop/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattlePyramidTop: @ 8485430
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc
View File

@@ -1,5 +1,5 @@
BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0
object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0

2
data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_FRONTIER

8
data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc
View File

@@ -1,10 +1,10 @@
BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4
object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_TRADER, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
object_event 5, 255, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
object_event 6, 254, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
object_event 5, EVENT_OBJ_GFX_VAR_F, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_VAR_E, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
BattleFrontier_BattleTowerBattleRoom2_MapEvents:: @ 853C054
map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0

2
data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_FRONTIER

2
data/maps/BattleFrontier_BattleTowerCorridor/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerCorridor: @ 8485200
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

4
data/maps/BattleFrontier_BattleTowerCorridor2/events.inc
View File

@@ -1,8 +1,8 @@
BattleFrontier_BattleTowerCorridor2_EventObjects: @ 853BF50
object_event 1, 255, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 14, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 4, 254, 0, 14, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_VAR_E, 0, 14, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleTowerCorridor2_MapEvents:: @ 853BFB0
map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0

2
data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattleTowerElevator/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerElevator: @ 84851E4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_BattleTowerLobby/events.inc
View File

@@ -4,7 +4,7 @@ BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638
object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 17, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0
object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0
object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, FLAG_HIDE_BATTLE_TOWER_REPORTER
object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EventScript_Apprentice, FLAG_HIDE_APPRENTICE
object_event 6, EVENT_OBJ_GFX_VAR_0, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EventScript_Apprentice, FLAG_HIDE_APPRENTICE
object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0
object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0
object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0

2
data/maps/BattleFrontier_BattleTowerLobby/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerLobby: @ 84851C8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

16
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc
View File

@@ -1,13 +1,13 @@
BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0
object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1
object_event 3, EVENT_OBJ_GFX_TRADER, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2
object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3
object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4
object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5
object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6
object_event 8, 246, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1
object_event 9, 247, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2
object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1
object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2
object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3
object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4
object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5
object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6
object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1
object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2
BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C
map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0

2
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_Lounge1/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_Lounge1: @ 84855B8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_Lounge2/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_Lounge2: @ 84855F0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_Lounge3/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_Lounge3: @ 848560C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_Lounge4/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_Lounge4: @ 8485628
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_Lounge5/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_Lounge5: @ 8485660
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_Lounge6/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_Lounge6: @ 848567C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

8
data/maps/BattleFrontier_Lounge6/scripts.inc
View File

@@ -7,7 +7,7 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
goto_if_set FLAG_BATTLE_FRONTIER_TRADE_DONE, BattleFrontier_Lounge6_EventScript_265083
setvar VAR_0x8008, 3
copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, sub_807E73C
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT
msgbox BattleFrontier_Lounge6_Text_26508D, MSGBOX_YESNO
compare VAR_RESULT, 0
@@ -18,14 +18,14 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
compare VAR_0x8004, 255
goto_if_eq BattleFrontier_Lounge6_EventScript_26506B
copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, sub_807E9D4
specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT
compare VAR_RESULT, VAR_0x8009
goto_if_ne BattleFrontier_Lounge6_EventScript_265075
copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A
special sub_807EA10
special sub_807F0E4
special CreateInGameTradePokemon
special DoInGameTradeScene
waitstate
msgbox BattleFrontier_Lounge6_Text_265128, MSGBOX_DEFAULT
setflag FLAG_BATTLE_FRONTIER_TRADE_DONE

2
data/maps/BattleFrontier_Lounge7/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_Lounge7: @ 8485698
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_Lounge8/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_Lounge8: @ 84856D0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_Lounge9/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_Lounge9: @ 84856EC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_Mart/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_Mart: @ 8485740
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_OutsideEast/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_OutsideEast: @ 84852C4
.byte WEATHER_NONE
.byte MAP_TYPE_ROUTE
.2byte 0
.byte 13
map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_OutsideWest/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_OutsideWest: @ 84851AC
.byte WEATHER_NONE
.byte MAP_TYPE_ROUTE
.2byte 0
.byte 13
map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_PokemonCenter_1F/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_PokemonCenter_1F: @ 8485708
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_PokemonCenter_2F/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_PokemonCenter_2F: @ 8485724
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_RankingHall/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_RankingHall: @ 848559C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_ReceptionGate/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_ReceptionGate: @ 84856B4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattleFrontier_ScottsHouse/header.inc
View File

@@ -10,6 +10,6 @@ BattleFrontier_ScottsHouse: @ 8485644
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

2
data/maps/BattlePyramidSquare01/header.inc
View File

@@ -10,6 +10,6 @@ BattlePyramidSquare01: @ 8484F60
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare02/header.inc
View File

@@ -10,6 +10,6 @@ BattlePyramidSquare02: @ 8484F7C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare03/header.inc
View File

@@ -10,6 +10,6 @@ BattlePyramidSquare03: @ 8484F98
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare04/header.inc
View File

@@ -10,6 +10,6 @@ BattlePyramidSquare04: @ 8484FB4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare05/header.inc
View File

@@ -10,6 +10,6 @@ BattlePyramidSquare05: @ 8484FD0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare06/header.inc
View File

@@ -10,6 +10,6 @@ BattlePyramidSquare06: @ 8484FEC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare07/header.inc
View File

@@ -10,6 +10,6 @@ BattlePyramidSquare07: @ 8485008
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare08/header.inc
View File

@@ -10,6 +10,6 @@ BattlePyramidSquare08: @ 8485024
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare09/header.inc
View File

@@ -10,6 +10,6 @@ BattlePyramidSquare09: @ 8485040
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare10/header.inc
View File

@@ -10,6 +10,6 @@ BattlePyramidSquare10: @ 848505C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

2
data/maps/BattlePyramidSquare11/header.inc
View File

@@ -10,6 +10,6 @@ BattlePyramidSquare11: @ 8485078
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_GYM

Some files were not shown because too many files have changed in this diff Show More