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

Merge branch 'master' into contest-ai-cleanup

Browse Source
This commit is contained in:
Phlosioneer
2019-04-07 20:20:22 -04:00
parent 1360b3a477 a4ea0ac816
commit 50350cc2e1
732 changed files with 38218 additions and 41300 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/battle_anim_scripts.s
+59 -59
View File
@@ -1515,7 +1515,7 @@ Move_VINE_WHIP:
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6
delay 6
playsewithpan SE_W010, SOUND_PAN_TARGET
createsprite gUnknown_085928E8, ANIM_TARGET, 2, 0, 0
createsprite gVineWhipSpriteTemplate, ANIM_TARGET, 2, 0, 0
delay 6
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 1
end
@@ -1656,12 +1656,12 @@ Explosion1:
Move_DEFENSE_CURL:
loadspritegfx ANIM_TAG_ECLIPSING_ORB
loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 18, 3
createvisualtask sub_811489C, 5, 0, 0
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 0
createvisualtask sub_815B338, 5
waitforvisualfinish
createsprite gUnknown_085CE338, ANIM_ATTACKER, 2, 0, 6, 0, 1
waitforvisualfinish
createvisualtask sub_811489C, 5, 0, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
waitforvisualfinish
end
@@ -2003,7 +2003,7 @@ Move_ATTRACT:
createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -384, -31
waitforvisualfinish
waitplaysewithpan SE_W213B, 0, 15
createvisualtask sub_81062E8, 5
createvisualtask AnimTask_HeartsBackground, 5
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 16, 256, 0
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 224, 240, 15
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 126, 272, 30
@@ -2012,7 +2012,7 @@ Move_ATTRACT:
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 40, 256, 75
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 112, 256, 90
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 200, 272, 90
delay 0x4B
delay 75
createvisualtask sub_8115A04, 2, 4, 4, 4, 0, 10, RGB(31, 25, 27)
end
@@ -2960,7 +2960,7 @@ SkyAttackSetUpAgainstPartner:
SkyAttackUnleash:
loadspritegfx ANIM_TAG_IMPACT
loadspritegfx ANIM_TAG_BIRD
call SetFlyingBg
call SetSkyBg
monbg ANIM_ATTACKER
createvisualtask sub_8116620, 10, 2, 0, 0, 16, RGB_WHITE
delay 4
@@ -2977,7 +2977,7 @@ SkyAttackUnleash:
createvisualtask sub_8116620, 10, 2, 0, 15, 0, RGB_WHITE
waitforvisualfinish
clearmonbg ANIM_ATTACKER
call UnsetFlyingBg
call UnsetSkyBg
goto SkyAttackEnd
Move_FLASH:
@@ -3220,13 +3220,13 @@ EndureEffect:
Move_CHARM:
loadspritegfx ANIM_TAG_MAGENTA_HEART
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
delay 15
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, -20, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
delay 15
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 20, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
waitforvisualfinish
end
@@ -4358,7 +4358,7 @@ Move_AERIAL_ACE:
Move_IRON_DEFENSE:
loopsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER, 28, 2
createvisualtask sub_81144F8, 5, 0, 0, 0
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 2, RGB_WHITEALPHA, 14, -1, 0
waitforvisualfinish
end
@@ -4393,13 +4393,13 @@ Move_COVET:
loadspritegfx ANIM_TAG_MAGENTA_HEART
loadspritegfx ANIM_TAG_ITEM_BAG
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
delay 15
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, -20, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
delay 15
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 20, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
waitforvisualfinish
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
@@ -4570,7 +4570,7 @@ Move_SHOCK_WAVE:
Move_HARDEN:
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
createvisualtask sub_81144F8, 5, 0, 0, 0
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
waitforvisualfinish
end
@@ -5347,7 +5347,7 @@ Move_ICE_BEAM:
loadspritegfx ANIM_TAG_ICE_CRYSTALS
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK
waitforvisualfinish
createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10
createsoundtask sub_8158C58, SE_W062B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10
createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, 20, 12, 0, 12, 20
createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, 20, -12, 0, -12, 20
delay 1
@@ -5392,7 +5392,7 @@ Move_WITHDRAW:
Move_AURORA_BEAM:
loadspritegfx ANIM_TAG_RAINBOW_RINGS
fadetobg BG_AURORABEAM
fadetobg BG_AURORA
waitbgfadein
playsewithpan SE_W062, SOUND_PAN_ATTACKER
setarg 7, 0
@@ -5403,7 +5403,7 @@ Move_AURORA_BEAM:
call AuroraBeam1
call AuroraBeam1
setarg 7, -1
createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 6, 0, 10
createsoundtask sub_8158C58, SE_W062B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 6, 0, 10
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 40, 1
call AuroraBeam1
call AuroraBeam1
@@ -6195,7 +6195,7 @@ Move_AEROBLAST:
loadspritegfx ANIM_TAG_AIR_WAVE_2
loadspritegfx ANIM_TAG_IMPACT
monbg ANIM_DEF_PARTNER
call SetFlyingBg
call SetSkyBg
monbgprio_28 ANIM_TARGET
setalpha 12, 8
call Aeroblast1
@@ -6211,7 +6211,7 @@ Move_AEROBLAST:
clearmonbg ANIM_DEF_PARTNER
blendoff
delay 0
call UnsetFlyingBg
call UnsetSkyBg
end
Aeroblast1:
playsewithpan SE_W026, SOUND_PAN_ATTACKER
@@ -6568,7 +6568,7 @@ Move_DYNAMIC_PUNCH:
loadspritegfx ANIM_TAG_HANDS_AND_FEET
loadspritegfx ANIM_TAG_IMPACT
loadspritegfx ANIM_TAG_EXPLOSION
loadspritegfx ANIM_TAG_UNUSED_EXPLOSION
loadspritegfx ANIM_TAG_EXPLOSION_6
delay 1
monbg ANIM_DEF_PARTNER
setalpha 12, 8
@@ -7123,7 +7123,7 @@ Move_PSYBEAM:
loadspritegfx ANIM_TAG_GOLD_RING
playsewithpan SE_W060, SOUND_PAN_ATTACKER
call SetPsychicBackground
createsoundtask sub_8158C58, 200, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15
createsoundtask sub_8158C58, SE_W060B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15
call Psybeam1
call Psybeam1
createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 4, ANIM_TARGET
@@ -7169,7 +7169,7 @@ Move_PSYWAVE:
playsewithpan SE_W060, SOUND_PAN_ATTACKER
call SetPsychicBackground
createvisualtask sub_81076C8, 5, 100
createsoundtask sub_8158C58, 203, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 9, 0, 10
createsoundtask sub_8158C58, SE_W100, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 9, 0, 10
call Psywave1
call Psywave1
createvisualtask sub_8115A04, 2, 4, 1, 4, 0, 12, RGB(31, 18, 31)
@@ -7213,7 +7213,7 @@ Move_STEEL_WING:
loadspritegfx ANIM_TAG_GUST
loadspritegfx ANIM_TAG_IMPACT
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
createvisualtask sub_81144F8, 5, 0, 0, 0
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
waitforvisualfinish
monbg ANIM_DEF_PARTNER
monbgprio_28 ANIM_TARGET
@@ -7239,7 +7239,7 @@ Move_STEEL_WING:
Move_IRON_TAIL:
loadspritegfx ANIM_TAG_IMPACT
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
createvisualtask sub_81144F8, 5, 1, 0, 0
createvisualtask AnimTask_MetallicShine, 5, 1, 0, 0
waitforvisualfinish
monbg ANIM_TARGET
setalpha 12, 8
@@ -7249,7 +7249,7 @@ Move_IRON_TAIL:
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
playsewithpan SE_W233B, SOUND_PAN_TARGET
waitforvisualfinish
createvisualtask sub_811489C, 5, 0, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
clearmonbg ANIM_TARGET
blendoff
waitforvisualfinish
@@ -7259,7 +7259,7 @@ Move_POISON_TAIL:
loadspritegfx ANIM_TAG_IMPACT
loadspritegfx ANIM_TAG_POISON_BUBBLE
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
createvisualtask sub_81144F8, 5, 1, 1, RGB(24, 6, 23)
createvisualtask AnimTask_MetallicShine, 5, 1, 1, RGB(24, 6, 23)
waitforvisualfinish
monbg ANIM_TARGET
setalpha 12, 8
@@ -7269,7 +7269,7 @@ Move_POISON_TAIL:
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
playsewithpan SE_W233B, SOUND_PAN_TARGET
waitforvisualfinish
createvisualtask sub_811489C, 5, 0, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
clearmonbg ANIM_TARGET
blendoff
call PoisonBubblesEffect
@@ -7279,7 +7279,7 @@ Move_POISON_TAIL:
Move_METAL_CLAW:
loadspritegfx ANIM_TAG_CLAW_SLASH
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
createvisualtask sub_81144F8, 5, 0, 0, 0
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
waitforvisualfinish
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4
delay 2
@@ -7346,8 +7346,8 @@ Move_SHADOW_BALL:
fadetobg BG_GHOST
waitbgfadein
delay 15
createsoundtask sub_8158C58, 168, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 5, 0, 5
createsprite gUnknown_08596D58, ANIM_TARGET, 2, 16, 16, 8
createsoundtask sub_8158C58, SE_W054, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 5, 0, 5
createsprite gShadowBallSpriteTemplate, ANIM_TARGET, 2, 16, 16, 8
waitforvisualfinish
playsewithpan SE_W028, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 8, 1
@@ -7459,7 +7459,7 @@ Move_STRING_SHOT:
end
StringShot1:
createsprite gUnknown_085969E0, ANIM_TARGET, 2, 20, 0, 512, 20, 1
createsprite gWebThreadSpriteTemplate, ANIM_TARGET, 2, 20, 0, 512, 20, 1
delay 1
return
@@ -7488,7 +7488,7 @@ Move_SPIDER_WEB:
call SpiderWeb1
waitforvisualfinish
playsewithpan SE_W081B, SOUND_PAN_TARGET
createsprite gUnknown_08596A2C, ANIM_ATTACKER, 2
createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
delay 1
@@ -7496,7 +7496,7 @@ Move_SPIDER_WEB:
end
SpiderWeb1:
createsprite gUnknown_085969E0, ANIM_TARGET, 2, 20, 0, 512, 20, 0
createsprite gWebThreadSpriteTemplate, ANIM_TARGET, 2, 20, 0, 512, 20, 0
delay 1
return
@@ -7941,16 +7941,16 @@ Move_PERISH_SONG:
panse_1B SE_W195, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
delay 80
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_BLACK
createvisualtask sub_811489C, 5, 4, 0
createvisualtask sub_811489C, 5, 5, 0
createvisualtask sub_811489C, 5, 6, 0
createvisualtask sub_811489C, 5, 7, 0
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 4, 0
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 5, 0
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 6, 0
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 7, 0
delay 100
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_BLACK
createvisualtask sub_811489C, 5, 4, 1
createvisualtask sub_811489C, 5, 5, 1
createvisualtask sub_811489C, 5, 6, 1
createvisualtask sub_811489C, 5, 7, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 4, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 5, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 6, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 7, 1
waitforvisualfinish
end
@@ -8019,7 +8019,7 @@ Move_TRI_ATTACK:
delay 20
playsewithpan SE_W161, SOUND_PAN_ATTACKER
delay 20
createsoundtask sub_8158C58, 220, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 6, 0, 7
createsoundtask sub_8158C58, SE_W161, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 6, 0, 7
waitforvisualfinish
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK
delay 16
@@ -8356,7 +8356,7 @@ Move_HYPER_BEAM:
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 4, 1
waitforvisualfinish
delay 30
createsoundtask sub_8158C58, 247, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5
createsoundtask sub_8158C58, SE_W063B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5
createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1
createvisualtask sub_8115D94, 2, ANIM_TAG_ORBS, 1, 12, 31, 16, 0, 0
call HyperBeam1
@@ -9419,7 +9419,7 @@ Move_SEISMIC_TOSS:
waitforvisualfinish
createvisualtask AnimTask_GetSeismicTossDamageLevel, 3
delay 1
fadetobg BG_SEISMICTOSS_SKUUPPERCUT
fadetobg BG_IN_AIR
waitbgfadeout
createvisualtask sub_811152C, 3
playsewithpan SE_W327, 0
@@ -9570,7 +9570,7 @@ Move_DOOM_DESIRE:
createvisualtask sub_8114960, 2
delay 1
monbg ANIM_ATK_PARTNER
createvisualtask sub_811489C, 5, 1, 0
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_TARGET, 0
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, RGB_BLACK
waitforvisualfinish
setalpha 8, 8
@@ -9578,7 +9578,7 @@ Move_DOOM_DESIRE:
createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1
waitforvisualfinish
delay 20
createvisualtask sub_811489C, 5, 1, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_TARGET, 1
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 4, 0, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_ATK_PARTNER
@@ -9589,7 +9589,7 @@ Move_SKY_UPPERCUT:
loadspritegfx ANIM_TAG_IMPACT
monbg ANIM_DEF_PARTNER
monbgprio_28 ANIM_TARGET
fadetobg BG_SEISMICTOSS_SKUUPPERCUT
fadetobg BG_IN_AIR
waitbgfadeout
playsewithpan SE_W327, SOUND_PAN_ATTACKER
createvisualtask sub_810DABC, 5, 55
@@ -10165,21 +10165,21 @@ UnsetPsychicBackground:
waitbgfadein
return
SetFlyingBg:
jumpifcontest SetBgFlyingContest
fadetobg BG_FLYING
SetSkyBg:
jumpifcontest SetSkyBgContest
fadetobg BG_SKY
waitbgfadeout
createvisualtask sub_8117660, 5, -2304, 768, 1, -1
SetBgFlyingContinue:
SetSkyBgContinue:
waitbgfadein
return
SetBgFlyingContest:
fadetobg BG_FLYING_CONTESTS
SetSkyBgContest:
fadetobg BG_SKY_CONTESTS
waitbgfadeout
createvisualtask sub_8117660, 5, 2304, 768, 0, -1
goto SetBgFlyingContinue
goto SetSkyBgContinue
UnsetFlyingBg:
UnsetSkyBg:
restorebg
waitbgfadeout
setarg 7, -1
@@ -10237,13 +10237,13 @@ Burn1:
Status_Infatuation:
loadspritegfx ANIM_TAG_MAGENTA_HEART
playsewithpan SE_W204, SOUND_PAN_ATTACKER
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20
delay 15
playsewithpan SE_W204, SOUND_PAN_ATTACKER
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, -20, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20
delay 15
playsewithpan SE_W204, SOUND_PAN_ATTACKER
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 20, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20
end
Status_Sleep:
data/battle_scripts_1.s
+1 -1
View File
@@ -2384,7 +2384,7 @@ BattleScript_EffectWish::
BattleScript_EffectAssist::
attackcanceler
attackstring
asistattackselect BattleScript_ButItFailedPpReduce
assistattackselect BattleScript_ButItFailedPpReduce
attackanimation
waitanimation
setbyte sB_ANIM_TURN, 0x0
data/ereader_helpers.s
+46 -41
View File
@@ -5,44 +5,49 @@
gUnknown_08625B6C:: @ 8625B6C
@ apparently e-reader trainer data? idk
.byte 0x6f, 0x57, 0x54, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x14, 0x0c, 0x0e, 0x23, 0x10, 0x47, 0x0a, 0x1f, 0x06, 0x24, 0x0e, 0x48, 0x0a, 0x0f, 0x06
.byte 0x22, 0x27, 0x2c, 0x16, 0x07, 0x06, 0x01, 0x0c, 0x47, 0x0a, 0x06, 0x06, 0x24, 0x0e, 0x00, 0x1e, 0x19, 0x12, 0x05, 0x0c, 0x25, 0x16, 0x25, 0x10, 0x0d, 0x1c, 0x2a, 0x1c, 0x06, 0x0a, 0x06, 0x0c
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
.byte 0xff, 0xff, 0xff, 0x00, 0x70, 0x01, 0xdb, 0x00, 0xbc, 0x00, 0xf7, 0x00, 0xdc, 0x00, 0x19, 0x01, 0x00, 0x00, 0x37, 0xff, 0x64, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a
.byte 0x80, 0x00, 0x00, 0x00, 0x6f, 0x79, 0x69, 0xae, 0x71, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x26, 0x01, 0xb3, 0x00, 0x3e, 0x01, 0xbc, 0x00, 0xf7, 0x00, 0xca, 0x00, 0x00, 0x00, 0x00, 0xff
.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x95, 0x58, 0x59, 0x52, 0x79, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7d, 0x01, 0xb7, 0x00
.byte 0xf6, 0x00, 0x39, 0x00, 0x59, 0x00, 0x85, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x9b, 0xff, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x2f, 0x00, 0x00, 0x00, 0x8d, 0xae, 0x77, 0x7e
.byte 0x5d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x6a, 0x79, 0x6b, 0x64, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x1b, 0x01, 0x00, 0x00, 0x00, 0x54, 0x27, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a
.byte 0x20, 0x06, 0x00, 0x0c, 0x13, 0x24, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x05, 0x12, 0x00, 0x0c, 0x6b, 0x26, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x0e, 0x12, 0x00, 0x0c, 0x2c, 0x24, 0x2b, 0x0e
.byte 0xff, 0xff, 0x3b, 0x0a, 0x17, 0x12, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x59, 0x01, 0xb7, 0x00, 0xca, 0x00, 0xb9, 0x00, 0x09, 0x00, 0x4a, 0x00, 0x00, 0x00, 0x37, 0x00, 0x64, 0x00, 0xff, 0x64
.byte 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x8c, 0x00, 0x00, 0x00, 0x69, 0x58, 0x60, 0x5d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x31, 0x01, 0xb3, 0x00, 0x07, 0x01, 0x4c, 0x01
.byte 0x62, 0x00, 0x68, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x80, 0x00, 0x00, 0x00, 0x55, 0x55, 0x5d, 0x96, 0x72, 0xff, 0xff, 0xff
.byte 0xff, 0xff, 0xff, 0xff, 0x44, 0x01, 0x86, 0x00, 0x39, 0x00, 0x59, 0x00, 0x85, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a
.byte 0x00, 0x00, 0x00, 0x00, 0x65, 0x6f, 0x8e, 0x7e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x72, 0x52, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x27, 0x01, 0x00, 0x00, 0x00
.byte 0x4a, 0x04, 0x0e, 0x02, 0x35, 0x16, 0x10, 0x10, 0xda, 0x26, 0x3e, 0x10, 0x4a, 0x04, 0x0e, 0x02, 0x47, 0x0a, 0xd9, 0x26, 0x21, 0x16, 0x3e, 0x10, 0x14, 0x1e, 0x07, 0x1e, 0x30, 0x06, 0x23, 0x16
.byte 0x24, 0x0e, 0x06, 0x0c, 0x18, 0x14, 0x2f, 0x14, 0x1a, 0x08, 0x27, 0x1c, 0x00, 0x0c, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x3c, 0x01, 0x8d, 0x00, 0x2f, 0x00, 0x22, 0x00, 0xf7, 0x00, 0xe7, 0x00
.byte 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x03, 0x00, 0x00, 0x00, 0x54, 0x68, 0x5a, 0x7b, 0x7b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
.byte 0x6b, 0x01, 0xc8, 0x00, 0xca, 0x00, 0x40, 0x01, 0x5c, 0x00, 0x49, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a, 0x06, 0x00, 0x00, 0x00
.byte 0x7b, 0x8f, 0x78, 0x51, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x24, 0x01, 0xb3, 0x00, 0x3e, 0x01, 0x4c, 0x01, 0xd5, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x64, 0xc8, 0x00, 0x00, 0xc8, 0x00
.byte 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x51, 0x8a, 0x6a, 0x7e, 0x64, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9c, 0x54, 0xae, 0x79, 0xff, 0xff, 0xff, 0xff
.byte 0x00, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x46, 0x0a, 0x02, 0x06, 0x20, 0x06, 0x0a, 0x0a, 0x23, 0x10, 0x00, 0x0c, 0x28, 0x0c, 0x14, 0x18, 0x32, 0x14, 0x02, 0x16, 0x05, 0x10, 0xff, 0xff
.byte 0x0c, 0x1e, 0x0a, 0x0a, 0x34, 0x12, 0x11, 0x1e, 0x1a, 0x08, 0x05, 0x0c, 0x1e, 0x0a, 0x02, 0x06, 0x20, 0x06, 0x22, 0x0a, 0x15, 0x10, 0x01, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
.byte 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x63, 0x01, 0xb3, 0x00
.byte 0xf2, 0x00, 0x35, 0x00, 0x09, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0xff, 0x9b, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a, 0x00, 0x00, 0x00, 0x00, 0x58, 0x61, 0xae, 0x64
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x4b, 0x01, 0xc6, 0x00, 0x39, 0x00, 0xf2, 0x00, 0x26, 0x00, 0x59, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10
.byte 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x5b, 0x72, 0x6a, 0x91, 0xae, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7a, 0x01, 0x8d, 0x00, 0x5e, 0x00, 0xf7, 0x00, 0x55, 0x00, 0x05, 0x01
.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x8d, 0x85, 0x9e, 0xa0, 0x60, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
.byte 0x6f, 0x57, 0x54, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x14, 0x0c, 0x0e, 0x23, 0x10, 0x47, 0x0a, 0x1f, 0x06, 0x24, 0x0e, 0x48, 0x0a, 0x0f, 0x06
.byte 0x22, 0x27, 0x2c, 0x16, 0x07, 0x06, 0x01, 0x0c, 0x47, 0x0a, 0x06, 0x06, 0x24, 0x0e, 0x00, 0x1e, 0x19, 0x12, 0x05, 0x0c, 0x25, 0x16, 0x25, 0x10, 0x0d, 0x1c, 0x2a, 0x1c, 0x06, 0x0a, 0x06, 0x0c
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
.byte 0xff, 0xff, 0xff, 0x00, 0x70, 0x01, 0xdb, 0x00, 0xbc, 0x00, 0xf7, 0x00, 0xdc, 0x00, 0x19, 0x01, 0x00, 0x00, 0x37, 0xff, 0x64, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a
.byte 0x80, 0x00, 0x00, 0x00, 0x6f, 0x79, 0x69, 0xae, 0x71, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x26, 0x01, 0xb3, 0x00, 0x3e, 0x01, 0xbc, 0x00, 0xf7, 0x00, 0xca, 0x00, 0x00, 0x00, 0x00, 0xff
.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x95, 0x58, 0x59, 0x52, 0x79, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7d, 0x01, 0xb7, 0x00
.byte 0xf6, 0x00, 0x39, 0x00, 0x59, 0x00, 0x85, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x9b, 0xff, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x2f, 0x00, 0x00, 0x00, 0x8d, 0xae, 0x77, 0x7e
.byte 0x5d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
.byte 0x6a, 0x79, 0x6b, 0x64, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x1b, 0x01, 0x00, 0x00, 0x00, 0x54, 0x27, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x20, 0x06, 0x00, 0x0c, 0x13, 0x24, 0x2b, 0x0e
.byte 0xff, 0xff, 0x3b, 0x0a, 0x05, 0x12, 0x00, 0x0c, 0x6b, 0x26, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x0e, 0x12, 0x00, 0x0c, 0x2c, 0x24, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x17, 0x12, 0x00, 0x0c
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
.byte 0xff, 0xff, 0xff, 0x00, 0x59, 0x01, 0xb7, 0x00, 0xca, 0x00, 0xb9, 0x00, 0x09, 0x00, 0x4a, 0x00, 0x00, 0x00, 0x37, 0x00, 0x64, 0x00, 0xff, 0x64, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a
.byte 0x8c, 0x00, 0x00, 0x00, 0x69, 0x58, 0x60, 0x5d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x31, 0x01, 0xb3, 0x00, 0x07, 0x01, 0x4c, 0x01, 0x62, 0x00, 0x68, 0x00, 0x00, 0x00, 0xff, 0xff
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x80, 0x00, 0x00, 0x00, 0x55, 0x55, 0x5d, 0x96, 0x72, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x44, 0x01, 0x86, 0x00
.byte 0x39, 0x00, 0x59, 0x00, 0x85, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x65, 0x6f, 0x8e, 0x7e
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
.byte 0x72, 0x52, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x27, 0x01, 0x00, 0x00, 0x00, 0x4a, 0x04, 0x0e, 0x02, 0x35, 0x16, 0x10, 0x10, 0xda, 0x26, 0x3e, 0x10, 0x4a, 0x04, 0x0e, 0x02
.byte 0x47, 0x0a, 0xd9, 0x26, 0x21, 0x16, 0x3e, 0x10, 0x14, 0x1e, 0x07, 0x1e, 0x30, 0x06, 0x23, 0x16, 0x24, 0x0e, 0x06, 0x0c, 0x18, 0x14, 0x2f, 0x14, 0x1a, 0x08, 0x27, 0x1c, 0x00, 0x0c, 0xff, 0xff
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
.byte 0xff, 0xff, 0xff, 0x00, 0x3c, 0x01, 0x8d, 0x00, 0x2f, 0x00, 0x22, 0x00, 0xf7, 0x00, 0xe7, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a
.byte 0x03, 0x00, 0x00, 0x00, 0x54, 0x68, 0x5a, 0x7b, 0x7b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x6b, 0x01, 0xc8, 0x00, 0xca, 0x00, 0x40, 0x01, 0x5c, 0x00, 0x49, 0x00, 0x00, 0x00, 0xff, 0x00
.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a, 0x06, 0x00, 0x00, 0x00, 0x7b, 0x8f, 0x78, 0x51, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x24, 0x01, 0xb3, 0x00
.byte 0x3e, 0x01, 0x4c, 0x01, 0xd5, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x64, 0xc8, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x51, 0x8a, 0x6a, 0x7e
.byte 0x64, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
.byte 0x9c, 0x54, 0xae, 0x79, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x46, 0x0a, 0x02, 0x06, 0x20, 0x06, 0x0a, 0x0a, 0x23, 0x10, 0x00, 0x0c, 0x28, 0x0c, 0x14, 0x18
.byte 0x32, 0x14, 0x02, 0x16, 0x05, 0x10, 0xff, 0xff, 0x0c, 0x1e, 0x0a, 0x0a, 0x34, 0x12, 0x11, 0x1e, 0x1a, 0x08, 0x05, 0x0c, 0x1e, 0x0a, 0x02, 0x06, 0x20, 0x06, 0x22, 0x0a, 0x15, 0x10, 0x01, 0x0c
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
.byte 0xff, 0xff, 0xff, 0x00, 0x63, 0x01, 0xb3, 0x00, 0xf2, 0x00, 0x35, 0x00, 0x09, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0xff, 0x9b, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a
.byte 0x00, 0x00, 0x00, 0x00, 0x58, 0x61, 0xae, 0x64, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x4b, 0x01, 0xc6, 0x00, 0x39, 0x00, 0xf2, 0x00, 0x26, 0x00, 0x59, 0x00, 0x00, 0x00, 0xff, 0x00
.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x5b, 0x72, 0x6a, 0x91, 0xae, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7a, 0x01, 0x8d, 0x00
.byte 0x5e, 0x00, 0xf7, 0x00, 0x55, 0x00, 0x05, 0x01, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x8d, 0x85, 0x9e, 0xa0
.byte 0x60, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
data/event_scripts.s
+14 -14
View File
@@ -454,7 +454,7 @@ EventScript_SecretBasePC:: @ 823B4BB
EventScript_SecretBasePCShowMainMenu:: @ 823B4D3
message Text_SecretBasePCStartMenu
waitmessage
goto_if_set FLAG_DECORATION_16, EventScript_SecretBasePCMainMenuChoice
goto_if_set FLAG_SECRET_BASE_REGISTRY_ENABLED, EventScript_SecretBasePCMainMenuChoice
goto EventScript_23B531
end
@@ -487,16 +487,16 @@ EventScript_23B568:: @ 823B568
compare VAR_RESULT, 0
goto_if_eq EventScript_SecretBasePCShowMainMenu
closemessage
special sub_80E9AC0
special MoveOutOfSecretBase
releaseall
end
EventScript_23B581:: @ 823B581
special sub_80E9C74
special ShowSecretBaseDecorationMenu
end
EventScript_23B585:: @ 823B585
special sub_80E9C88
special ShowSecretBaseRegistryMenu
end
EventScript_RecordMixingSecretBasePC:: @ 823B589
@@ -529,17 +529,17 @@ gUnknown_0823B5E9:: @ 823B5E9
end
EventScript_23B5F0:: @ 823B5F0
special sub_80E9BDC
special GetCurSecretBaseRegistrationValidity
compare VAR_RESULT, 1
goto_if_eq EventScript_23B62F
compare VAR_RESULT, 2
goto_if_eq EventScript_CantRegisterTooManyBases
special sub_80E980C
msgbox Text_276707, MSGBOX_YESNO
special CopyCurSecretBaseOwnerName_StrVar1
msgbox Text_WantToRegisterSecretBase, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq EventScript_23B5A1
msgbox Text_2767D1, MSGBOX_SIGN
special sub_80E9C2C
special ToggleCurSecretBaseRegistry
special DoSecretBasePCTurnOffEffect
releaseall
end
@@ -549,7 +549,7 @@ EventScript_23B62F:: @ 823B62F
compare VAR_RESULT, 0
goto_if_eq EventScript_23B5A1
msgbox Text_2767E9, MSGBOX_SIGN
special sub_80E9C2C
special ToggleCurSecretBaseRegistry
special DoSecretBasePCTurnOffEffect
releaseall
end
@@ -573,23 +573,23 @@ EventScript_23B66E:: @ 823B66E
end
EventScript_23B674:: @ 823B674
special sub_80EB498
special SetSecretBaseSecretsTvFlags_Poster
end
EventScript_23B678:: @ 823B678
special sub_80EB56C
special SetSecretBaseSecretsTvFlags_MiscFurnature
end
EventScript_23B67C:: @ 823B67C
special sub_80EB9E0
special SetSecretBaseSecretsTvFlags_LargeDecorationSpot
end
EventScript_23B680:: @ 823B680
special sub_80EBB28
special SetSecretBaseSecretsTvFlags_SmallDecorationSpot
end
EventScript_SecretBaseSandOrnament:: @ 823B684
special sub_80EBE7C
special SetSecretBaseSecretsTvFlags_SandOrnament
dofieldeffect FLDEFF_SAND_PILLAR
waitstate
end
data/maps/AbandonedShip_CaptainsOffice/map.json
+1 -1
View File
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_CaptainsOffice_EventScript_29126E",
"script": "AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey",
"flag": "FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY"
}
],
data/maps/AbandonedShip_Deck/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
AbandonedShip_Deck_MapScripts:: @ 823799A
map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_MapScript1_2379A0
map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_OnTransition
.byte 0
AbandonedShip_Deck_MapScript1_2379A0: @ 82379A0
AbandonedShip_Deck_OnTransition: @ 82379A0
setflag FLAG_LANDMARK_ABANDONED_SHIP
end
data/maps/AbandonedShip_HiddenFloorRooms/map.json
+4 -4
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_29127B",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_291288",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_2912A2",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_291295",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE"
}
],
data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
+14 -14
View File
@@ -42,11 +42,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3
setfieldeffectargument 0, 10
setfieldeffectargument 1, 10
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
specialvar VAR_RESULT, FoundAbandonedShipRoom4Key
compare VAR_RESULT, 0
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DD3
waitfieldeffect 54
waitfieldeffect FLDEFF_SPARKLE
delay 10
end
@@ -60,7 +60,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D
delay 20
compare VAR_RESULT, 0
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DB3
waitfieldeffect 54
waitfieldeffect FLDEFF_SPARKLE
delay 10
end
@@ -72,15 +72,15 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33
setfieldeffectargument 0, 8
setfieldeffectargument 1, 5
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
setfieldeffectargument 0, 11
setfieldeffectargument 1, 3
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
specialvar VAR_RESULT, FoundAbandonedShipRoom6Key
compare VAR_RESULT, 0
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DE3
waitfieldeffect 54
waitfieldeffect FLDEFF_SPARKLE
delay 10
end
@@ -89,19 +89,19 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B
setfieldeffectargument 0, 16
setfieldeffectargument 1, 3
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
setfieldeffectargument 0, 25
setfieldeffectargument 1, 2
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
setfieldeffectargument 0, 24
setfieldeffectargument 1, 6
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
specialvar VAR_RESULT, FoundAbandonedShipRoom2Key
compare VAR_RESULT, 0
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DC3
waitfieldeffect 54
waitfieldeffect FLDEFF_SPARKLE
delay 10
end
@@ -112,28 +112,28 @@ AbandonedShip_HiddenFloorRooms_EventScript_238DB3:: @ 8238DB3
setfieldeffectargument 0, 42
setfieldeffectargument 1, 10
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
return
AbandonedShip_HiddenFloorRooms_EventScript_238DC3:: @ 8238DC3
setfieldeffectargument 0, 20
setfieldeffectargument 1, 5
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
return
AbandonedShip_HiddenFloorRooms_EventScript_238DD3:: @ 8238DD3
setfieldeffectargument 0, 1
setfieldeffectargument 1, 12
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
return
AbandonedShip_HiddenFloorRooms_EventScript_238DE3:: @ 8238DE3
setfieldeffectargument 0, 1
setfieldeffectargument 1, 2
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
return
AbandonedShip_HiddenFloorRooms_EventScript_238DF3:: @ 8238DF3
data/maps/AbandonedShip_Room_B1F/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Room_B1F_EventScript_291254",
"script": "AbandonedShip_Room_B1F_EventScript_ItemTM13",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13"
}
],
data/maps/AbandonedShip_Rooms2_1F/map.json
+1 -1
View File
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms2_1F_EventScript_291261",
"script": "AbandonedShip_Rooms2_1F_EventScript_ItemRevive",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE"
},
{
data/maps/AbandonedShip_Rooms2_B1F/map.json
+1 -1
View File
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms2_B1F_EventScript_291247",
"script": "AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL"
}
],
data/maps/AbandonedShip_Rooms_1F/map.json
+1 -1
View File
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms_1F_EventScript_29122D",
"script": "AbandonedShip_Rooms_1F_EventScript_ItemHarborMail",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL"
},
{
data/maps/AbandonedShip_Rooms_B1F/map.json
+1 -1
View File
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms_B1F_EventScript_29123A",
"script": "AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE"
}
],
data/maps/AlteringCave/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
AlteringCave_MapScripts:: @ 823B177
map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_MapScript1_23B17D
map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_OnTransition
.byte 0
AlteringCave_MapScript1_23B17D: @ 823B17D
AlteringCave_OnTransition: @ 823B17D
setflag FLAG_LANDMARK_ALTERING_CAVE
end
data/maps/AncientTomb/scripts.inc
+2 -2
View File
@@ -1,7 +1,7 @@
AncientTomb_MapScripts:: @ 8238FB3
map_script MAP_SCRIPT_ON_RESUME, AncientTomb_MapScript1_238FC3
map_script MAP_SCRIPT_ON_LOAD, AncientTomb_MapScript1_238FF2
map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_MapScript1_238FE1
map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_OnTransition
.byte 0
AncientTomb_MapScript1_238FC3: @ 8238FC3
@@ -15,7 +15,7 @@ AncientTomb_EventScript_238FCD:: @ 8238FCD
removeobject VAR_LAST_TALKED
return
AncientTomb_MapScript1_238FE1: @ 8238FE1
AncientTomb_OnTransition: @ 8238FE1
setflag FLAG_LANDMARK_ANCIENT_TOMB
call_if_unset FLAG_DEFEATED_REGISTEEL, AncientTomb_EventScript_238FEE
end
data/maps/AquaHideout_B1F/map.json
+3 -3
View File
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AquaHideout_B1F_EventScript_291372",
"script": "AquaHideout_B1F_EventScript_ItemMaxElixir",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AquaHideout_B1F_EventScript_291358",
"script": "AquaHideout_B1F_EventScript_ItemMasterBall",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AquaHideout_B1F_EventScript_291365",
"script": "AquaHideout_B1F_EventScript_ItemNugget",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET"
},
{
data/maps/AquaHideout_B2F/map.json
+1 -1
View File
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AquaHideout_B2F_EventScript_29137F",
"script": "AquaHideout_B2F_EventScript_ItemNestBall",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL"
},
{
data/maps/ArtisanCave_1F/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "ArtisanCave_1F_EventScript_2914D1",
"script": "ArtisanCave_1F_EventScript_ItemCarbos",
"flag": "FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS"
}
],
data/maps/ArtisanCave_B1F/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "ArtisanCave_B1F_EventScript_2914C4",
"script": "ArtisanCave_B1F_EventScript_ItemHPUp",
"flag": "FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP"
}
],
data/maps/ArtisanCave_B1F/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
ArtisanCave_B1F_MapScripts:: @ 823AFAD
map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_MapScript1_23AFB3
map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_OnTransition
.byte 0
ArtisanCave_B1F_MapScript1_23AFB3: @ 823AFB3
ArtisanCave_B1F_OnTransition: @ 823AFB3
setflag FLAG_LANDMARK_ARTISAN_CAVE
end
data/maps/BattleFrontier_ReceptionGate/scripts.inc
+2 -2
View File
@@ -1,9 +1,9 @@
BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_ReceptionGate_MapScript2_2661E9
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_MapScript1_2661E5
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_OnTransition
.byte 0
BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5
BattleFrontier_ReceptionGate_OnTransition: @ 82661E5
setflag FLAG_LANDMARK_BATTLE_FRONTIER
end
data/maps/BirthIsland_Exterior/scripts.inc
+2 -2
View File
@@ -68,9 +68,9 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
setfieldeffectargument 0, 1
setfieldeffectargument 1, 58
setfieldeffectargument 2, 26
dofieldeffect 65
dofieldeffect FLDEFF_65
playbgm MUS_RG_DEOEYE, 0
waitfieldeffect 65
waitfieldeffect FLDEFF_65
addobject 2
applymovement 2, BirthIsland_Exterior_Movement_268054
waitmovement 0
data/maps/DesertRuins/scripts.inc
+2 -2
View File
@@ -1,7 +1,7 @@
DesertRuins_MapScripts:: @ 822D95B
map_script MAP_SCRIPT_ON_RESUME, DesertRuins_MapScript1_22D96B
map_script MAP_SCRIPT_ON_LOAD, DesertRuins_MapScript1_22D989
map_script MAP_SCRIPT_ON_TRANSITION, DesertRuins_MapScript1_22D9CA
map_script MAP_SCRIPT_ON_TRANSITION, DesertRuins_OnTransition
.byte 0
DesertRuins_MapScript1_22D96B: @ 822D96B
@@ -28,7 +28,7 @@ DesertRuins_EventScript_22D993:: @ 822D993
setmetatile 9, 20, 565, 1
return
DesertRuins_MapScript1_22D9CA: @ 822D9CA
DesertRuins_OnTransition: @ 822D9CA
setflag FLAG_LANDMARK_DESERT_RUINS
call_if_unset FLAG_DEFEATED_REGIROCK, DesertRuins_EventScript_22D9D7
end
data/maps/DesertUnderpass/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
DesertUnderpass_MapScripts:: @ 823AF37
map_script MAP_SCRIPT_ON_TRANSITION, DesertUnderpass_MapScript1_23AF3D
map_script MAP_SCRIPT_ON_TRANSITION, DesertUnderpass_OnTransition
.byte 0
DesertUnderpass_MapScript1_23AF3D: @ 823AF3D
DesertUnderpass_OnTransition: @ 823AF3D
setflag FLAG_LANDMARK_DESERT_UNDERPASS
end
data/maps/EverGrandeCity_HallOfFame/scripts.inc
+2 -2
View File
@@ -38,8 +38,8 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
delay 20
dofieldeffect 62
waitfieldeffect 62
dofieldeffect FLDEFF_HALL_OF_FAME_RECORD
waitfieldeffect FLDEFF_HALL_OF_FAME_RECORD
delay 40
setvar VAR_TEMP_1, 1
call EverGrandeCity_HallOfFame_EventScript_2717C1
data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
+2 -2
View File
@@ -1,9 +1,9 @@
EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30
.byte 0
EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD
EverGrandeCity_PokemonLeague_1F_OnTransition: @ 82295DD
setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2
setflag FLAG_LANDMARK_POKEMON_LEAGUE
call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED
data/maps/FieryPath/map.json
+8 -8
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_29119E",
"script": "FieryPath_EventScript_ItemTM06",
"flag": "FLAG_ITEM_FIERY_PATH_TM06"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_11"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_12"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_13"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_14"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_15"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_16"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_291191",
"script": "FieryPath_EventScript_ItemFireStone",
"flag": "FLAG_ITEM_FIERY_PATH_FIRE_STONE"
}
],
data/maps/FieryPath/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
FieryPath_MapScripts:: @ 8230F24
map_script MAP_SCRIPT_ON_TRANSITION, FieryPath_MapScript1_230F2A
map_script MAP_SCRIPT_ON_TRANSITION, FieryPath_OnTransition
.byte 0
FieryPath_MapScript1_230F2A: @ 8230F2A
FieryPath_OnTransition: @ 8230F2A
call_if_unset FLAG_LANDMARK_FIERY_PATH, FieryPath_EventScript_230F37
setflag FLAG_LANDMARK_FIERY_PATH
end
data/maps/GraniteCave_1F/map.json
+1 -1
View File
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_1F_EventScript_291150",
"script": "GraniteCave_1F_EventScript_ItemEscapeRope",
"flag": "FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE"
}
],
data/maps/GraniteCave_B1F/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B1F_EventScript_29115D",
"script": "GraniteCave_B1F_EventScript_ItemPokeBall",
"flag": "FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL"
}
],
data/maps/GraniteCave_B2F/map.json
+9 -9
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_29116A",
"script": "GraniteCave_B2F_EventScript_ItemRepel",
"flag": "FLAG_ITEM_GRANITE_CAVE_B2F_REPEL"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_291177",
"script": "GraniteCave_B2F_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_11"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_12"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_13"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_14"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_15"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_16"
},
{
@@ -128,7 +128,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_17"
}
],
data/maps/IslandCave/scripts.inc
+2 -2
View File
@@ -1,7 +1,7 @@
IslandCave_MapScripts:: @ 8238E2A
map_script MAP_SCRIPT_ON_RESUME, IslandCave_MapScript1_238E3A
map_script MAP_SCRIPT_ON_LOAD, IslandCave_MapScript1_238E58
map_script MAP_SCRIPT_ON_TRANSITION, IslandCave_MapScript1_238E99
map_script MAP_SCRIPT_ON_TRANSITION, IslandCave_OnTransition
.byte 0
IslandCave_MapScript1_238E3A: @ 8238E3A
@@ -28,7 +28,7 @@ IslandCave_EventScript_238E62:: @ 8238E62
setmetatile 9, 20, 565, 1
return
IslandCave_MapScript1_238E99: @ 8238E99
IslandCave_OnTransition: @ 8238E99
setflag FLAG_LANDMARK_ISLAND_CAVE
call IslandCave_EventScript_238F45
call_if_unset FLAG_DEFEATED_REGICE, IslandCave_EventScript_238EAB
data/maps/JaggedPass/map.json
+1 -1
View File
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "JaggedPass_EventScript_291184",
"script": "JaggedPass_EventScript_ItemBurnHeal",
"flag": "FLAG_ITEM_JAGGED_PASS_BURN_HEAL"
},
{
data/maps/LilycoveCity/map.json
+1 -1
View File
@@ -165,7 +165,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_EventScript_2910E8",
"script": "LilycoveCity_EventScript_ItemMaxRepel",
"flag": "FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL"
},
{
data/maps/LilycoveCity/scripts.inc
+2 -2
View File
@@ -391,10 +391,10 @@ LilycoveCity_EventScript_1E3006:: @ 81E3006
waitmovement 0
delay 50
setfieldeffectargument 0, 1
dofieldeffect 30
dofieldeffect FLDEFF_NPCFLY_OUT
delay 15
removeobject VAR_LAST_TALKED
waitfieldeffect 30
waitfieldeffect FLDEFF_NPCFLY_OUT
savebgm MUS_DUMMY
fadedefaultbgm
setflag FLAG_MET_RIVAL_LILYCOVE
data/maps/MagmaHideout_1F/map.json
+4 -4
View File
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_1F_EventScript_2914DE",
"script": "MagmaHideout_1F_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_1F_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_11"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_1F_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_12"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_1F_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_13"
}
],
data/maps/MagmaHideout_2F_2R/map.json
+2 -2
View File
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_2F_2R_EventScript_2914EB",
"script": "MagmaHideout_2F_2R_EventScript_MaxElixir",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_2F_2R_EventScript_2914F8",
"script": "MagmaHideout_2F_2R_EventScript_ItemFullRestore",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE"
}
],
data/maps/MagmaHideout_3F_1R/map.json
+1 -1
View File
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_3F_1R_EventScript_291505",
"script": "MagmaHideout_3F_1R_EventScript_ItemNugget",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET"
}
],
data/maps/MagmaHideout_3F_2R/map.json
+1 -1
View File
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_3F_2R_EventScript_291512",
"script": "MagmaHideout_3F_2R_EventScript_ItemPPMax",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX"
}
],
data/maps/MagmaHideout_3F_3R/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_3F_3R_EventScript_29152C",
"script": "MagmaHideout_3F_3R_EventScript_ItemEscapeRope",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE"
}
],
data/maps/MagmaHideout_4F/map.json
+1 -1
View File
@@ -115,7 +115,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_4F_EventScript_29151F",
"script": "MagmaHideout_4F_EventScript_MaxRevive",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE"
}
],
data/maps/MagmaHideout_4F/scripts.inc
+2 -2
View File
@@ -12,8 +12,8 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
setfieldeffectargument 0, 18
setfieldeffectargument 1, 42
setfieldeffectargument 2, 0
dofieldeffect 54
waitfieldeffect 54
dofieldeffect FLDEFF_SPARKLE
waitfieldeffect FLDEFF_SPARKLE
setvar VAR_RESULT, 1
playfanfare MUS_ME_TAMA
playse SE_TAMA
data/maps/MauvilleCity/map.json
+1 -1
View File
@@ -149,7 +149,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_EventScript_2910CE",
"script": "MauvilleCity_EventScript_ItemXSpeed",
"flag": "FLAG_ITEM_MAUVILLE_CITY_X_SPEED"
},
{
data/maps/MeteorFalls_1F_1R/map.json
+4 -4
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_1F_1R_EventScript_2911AB",
"script": "MeteorFalls_1F_1R_EventScript_ItemTM23",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_1F_1R_EventScript_2911C5",
"script": "MeteorFalls_1F_1R_EventScript_ItemMoonStone",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_1F_1R_EventScript_2911B8",
"script": "MeteorFalls_1F_1R_EventScript_ItemFullHeal",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_1F_1R_EventScript_2911D2",
"script": "MeteorFalls_1F_1R_EventScript_ItemPPUP",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP"
},
{
data/maps/MeteorFalls_B1F_2R/map.json
+1 -1
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_B1F_2R_EventScript_2911DF",
"script": "MeteorFalls_B1F_2R_EventScript_ItemTM02",
"flag": "FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02"
}
],
data/maps/MirageTower_1F/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
MirageTower_1F_MapScripts:: @ 823AD01
map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_1F_MapScript1_23AD07
map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_1F_OnTransition
.byte 0
MirageTower_1F_MapScript1_23AD07: @ 823AD07
MirageTower_1F_OnTransition: @ 823AD07
setflag FLAG_ENTERED_MIRAGE_TOWER
setflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
setflag FLAG_LANDMARK_MIRAGE_TOWER
data/maps/MirageTower_3F/map.json
+2 -2
View File
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MirageTower_3F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_11"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MirageTower_3F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_12"
}
],
data/maps/MirageTower_4F/map.json
+1 -1
View File
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MirageTower_4F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_11"
}
],
data/maps/MossdeepCity/map.json
+1 -1
View File
@@ -105,7 +105,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_EventScript_2910F5",
"script": "MossdeepCity_EventScript_ItemNetBall",
"flag": "FLAG_ITEM_MOSSDEEP_CITY_NET_BALL"
},
{
data/maps/MossdeepCity_House4/scripts.inc
+1 -1
View File
@@ -17,7 +17,7 @@ MossdeepCity_House4_EventScript_222DED:: @ 8222DED
MossdeepCity_House4_EventScript_222DF7:: @ 8222DF7
lock
faceplayer
special sub_80E8BC8
special CheckPlayerHasSecretBase
compare VAR_RESULT, 0
goto_if_eq MossdeepCity_House4_EventScript_222E14
special GetSecretBaseNearbyMapName
data/maps/MtPyre_2F/map.json
+1 -1
View File
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_2F_EventScript_2912FD",
"script": "MtPyre_2F_EventScript_ItemUltraBall",
"flag": "FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL"
},
{
data/maps/MtPyre_3F/map.json
+1 -1
View File
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_3F_EventScript_29130A",
"script": "MtPyre_3F_EventScript_ItemSuperRepel",
"flag": "FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL"
},
{
data/maps/MtPyre_4F/map.json
+1 -1
View File
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_4F_EventScript_291317",
"script": "MtPyre_4F_EventScript_ItemSeaIncense",
"flag": "FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE"
}
],
data/maps/MtPyre_5F/map.json
+1 -1
View File
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_5F_EventScript_291324",
"script": "MtPyre_5F_EventScript_ItemLaxIncense",
"flag": "FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE"
}
],
data/maps/MtPyre_6F/map.json
+1 -1
View File
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_6F_EventScript_291331",
"script": "MtPyre_6F_EventScript_ItemTM30",
"flag": "FLAG_ITEM_MT_PYRE_6F_TM_30"
},
{
data/maps/MtPyre_Exterior/map.json
+2 -2
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_Exterior_EventScript_29133E",
"script": "MtPyre_Exterior_EventScript_ItemMaxPotion",
"flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_Exterior_EventScript_29134B",
"script": "MtPyre_Exterior_EventScript_ItemTM48",
"flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48"
}
],
data/maps/NewMauville_Entrance/scripts.inc
+2 -2
View File
@@ -1,6 +1,6 @@
NewMauville_Entrance_MapScripts:: @ 82372AD
map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_MapScript1_2372B8
map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Entrance_MapScript1_2372FB
map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Entrance_OnTransition
.byte 0
NewMauville_Entrance_MapScript1_2372B8: @ 82372B8
@@ -17,7 +17,7 @@ NewMauville_Entrance_EventScript_2372C4:: @ 82372C4
setmetatile 5, 1, 798, 1
return
NewMauville_Entrance_MapScript1_2372FB: @ 82372FB
NewMauville_Entrance_OnTransition: @ 82372FB
setflag FLAG_LANDMARK_NEW_MAUVILLE
end
data/maps/NewMauville_Inside/map.json
+5 -5
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_2911EC",
"script": "NewMauville_Inside_EventScript_ItemUltraRope",
"flag": "FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_2911F9",
"script": "NewMauville_Inside_EventScript_ItemEscapeRope",
"flag": "FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_291206",
"script": "NewMauville_Inside_EventScript_ItemThunderStone",
"flag": "FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_291213",
"script": "NewMauville_Inside_EventScript_ItemFullHeal",
"flag": "FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_291220",
"script": "NewMauville_Inside_EventScript_ItemParalyzeHeal",
"flag": "FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL"
},
{
data/maps/PetalburgCity/map.json
+2 -2
View File
@@ -100,7 +100,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_EventScript_2910B4",
"script": "PetalburgCity_EventScript_ItemMaxRevive",
"flag": "FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE"
},
{
@@ -113,7 +113,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_EventScript_2910C1",
"script": "PetalburgCity_EventScript_ItemEther",
"flag": "FLAG_ITEM_PETALBURG_CITY_ETHER"
},
{
data/maps/PetalburgWoods/map.json
+6 -6
View File
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgWoods_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_11"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgWoods_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_12"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgWoods_EventScript_29110F",
"script": "PetalburgWoods_EventScript_ItemGreatBall",
"flag": "FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgWoods_EventScript_291102",
"script": "PetalburgWoods_EventScript_ItemXAttack",
"flag": "FLAG_ITEM_PETALBURG_WOODS_X_ATTACK"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgWoods_EventScript_29111C",
"script": "PetalburgWoods_EventScript_ItemEther",
"flag": "FLAG_ITEM_PETALBURG_WOODS_ETHER"
},
{
@@ -167,7 +167,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgWoods_EventScript_291129",
"script": "PetalburgWoods_EventScript_ItemParalyzeHeal",
"flag": "FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL"
},
{
data/maps/Route102/map.json
+1 -1
View File
@@ -100,7 +100,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route102_EventScript_290CD8",
"script": "Route102_EventScript_ItemPotion",
"flag": "FLAG_ITEM_ROUTE_102_POTION"
},
{
data/maps/Route103/map.json
+4 -4
View File
@@ -191,7 +191,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route103_EventScript_290CE5",
"script": "Route103_EventScript_ItemGuardSpec",
"flag": "FLAG_ITEM_ROUTE_103_GUARD_SPEC"
},
{
@@ -204,7 +204,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route103_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_12"
},
{
@@ -217,7 +217,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route103_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_13"
},
{
@@ -282,7 +282,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route103_EventScript_290CF2",
"script": "Route103_EventScript_ItemPPUp",
"flag": "FLAG_ITEM_ROUTE_103_PP_UP"
}
],
data/maps/Route104/map.json
+5 -5
View File
@@ -300,7 +300,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route104_EventScript_290CFF",
"script": "Route104_EventScript_ItemPPUp",
"flag": "FLAG_ITEM_ROUTE_104_PP_UP"
},
{
@@ -378,7 +378,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route104_EventScript_290D0C",
"script": "Route104_EventScript_ItemPokeBall",
"flag": "FLAG_ITEM_ROUTE_104_POKE_BALL"
},
{
@@ -404,7 +404,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route104_EventScript_290D19",
"script": "Route104_EventScript_ItemXAccuracy",
"flag": "FLAG_ITEM_ROUTE_104_X_ACCURACY"
},
{
@@ -417,7 +417,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route104_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_11"
},
{
@@ -430,7 +430,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route104_EventScript_290D26",
"script": "Route104_EventScript_ItemPotion",
"flag": "FLAG_ITEM_ROUTE_104_POTION"
},
{
data/maps/Route104_MrBrineysHouse/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Route104_MrBrineysHouse_MapScripts:: @ 8229D2E
map_script MAP_SCRIPT_ON_TRANSITION, Route104_MrBrineysHouse_MapScript1_229D34
map_script MAP_SCRIPT_ON_TRANSITION, Route104_MrBrineysHouse_OnTransition
.byte 0
Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34
Route104_MrBrineysHouse_OnTransition: @ 8229D34
setflag FLAG_LANDMARK_MR_BRINEY_HOUSE
compare VAR_BRINEY_HOUSE_STATE, 1
call_if_eq Route104_MrBrineysHouse_EventScript_229D50
data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Route104_PrettyPetalFlowerShop_MapScripts:: @ 822A34C
map_script MAP_SCRIPT_ON_TRANSITION, Route104_PrettyPetalFlowerShop_MapScript1_22A352
map_script MAP_SCRIPT_ON_TRANSITION, Route104_PrettyPetalFlowerShop_OnTransition
.byte 0
Route104_PrettyPetalFlowerShop_MapScript1_22A352: @ 822A352
Route104_PrettyPetalFlowerShop_OnTransition: @ 822A352
setflag FLAG_LANDMARK_FLOWER_SHOP
goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_22A36B
goto_if_unset FLAG_BADGE03_GET, Route104_PrettyPetalFlowerShop_EventScript_22A36B
data/maps/Route105/map.json
+1 -1
View File
@@ -92,7 +92,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route105_EventScript_290D33",
"script": "Route105_EventScript_ItemIron",
"flag": "FLAG_ITEM_ROUTE_105_IRON"
},
{
data/maps/Route106/map.json
+1 -1
View File
@@ -87,7 +87,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route106_EventScript_290D40",
"script": "Route106_EventScript_ItemProtein",
"flag": "FLAG_ITEM_ROUTE_106_PROTEIN"
}
],
data/maps/Route108/map.json
+1 -1
View File
@@ -113,7 +113,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route108_EventScript_290D4D",
"script": "Route108_EventScript_ItemStarPiece",
"flag": "FLAG_ITEM_ROUTE_108_STAR_PIECE"
}
],
data/maps/Route109/map.json
+2 -2
View File
@@ -152,7 +152,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route109_EventScript_290D5A",
"script": "Route109_EventScript_ItemPPUp",
"flag": "FLAG_ITEM_ROUTE_109_PP_UP"
},
{
@@ -321,7 +321,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route109_EventScript_290D67",
"script": "Route109_EventScript_ItemPotion",
"flag": "FLAG_ITEM_ROUTE_109_POTION"
},
{
data/maps/Route109_SeashoreHouse/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Route109_SeashoreHouse_MapScripts:: @ 82693F4
map_script MAP_SCRIPT_ON_TRANSITION, Route109_SeashoreHouse_MapScript1_2693FA
map_script MAP_SCRIPT_ON_TRANSITION, Route109_SeashoreHouse_OnTransition
.byte 0
Route109_SeashoreHouse_MapScript1_2693FA: @ 82693FA
Route109_SeashoreHouse_OnTransition: @ 82693FA
setflag FLAG_LANDMARK_SEASHORE_HOUSE
end
data/maps/Route110/map.json
+3 -3
View File
@@ -274,7 +274,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_EventScript_290D81",
"script": "Route110_EventScript_ItemDireHit",
"flag": "FLAG_ITEM_ROUTE_110_DIRE_HIT"
},
{
@@ -287,7 +287,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_EventScript_290D74",
"script": "Route110_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_ROUTE_109_RARE_CANDY"
},
{
@@ -482,7 +482,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_EventScript_290D8E",
"script": "Route110_EventScript_ItemElixir",
"flag": "FLAG_ITEM_ROUTE_110_ELIXIR"
},
{
data/maps/Route110_TrickHouseEntrance/scripts.inc
+4 -4
View File
@@ -1,10 +1,10 @@
Route110_TrickHouseEntrance_MapScripts:: @ 8269A50
map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEntrance_MapScript1_269A60
map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEntrance_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEntrance_MapScript2_269CEE
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEntrance_MapScript2_269BD3
.byte 0
Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60
Route110_TrickHouseEntrance_OnTransition: @ 8269A60
setflag FLAG_LANDMARK_TRICK_HOUSE
compare VAR_TRICK_HOUSE_STATE, 1
goto_if_eq Route110_TrickHouseEntrance_EventScript_269AF3
@@ -759,8 +759,8 @@ Route110_TrickHouseEntrance_EventScript_26A459:: @ 826A459
setfieldeffectargument 0, VAR_0x8004
setfieldeffectargument 1, VAR_0x8005
setfieldeffectargument 2, VAR_0x8006
dofieldeffect 54
waitfieldeffect 54
dofieldeffect FLDEFF_SPARKLE
waitfieldeffect FLDEFF_SPARKLE
delay 10
return
data/maps/Route110_TrickHousePuzzle1/map.json
+12 -12
View File
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_13"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_12"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_14"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_17"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_16"
},
{
@@ -128,7 +128,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_15"
},
{
@@ -141,7 +141,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_19"
},
{
@@ -154,7 +154,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_18"
},
{
@@ -167,7 +167,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_1B"
},
{
@@ -180,7 +180,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_29140E",
"script": "Route110_TrickHousePuzzle1_EventScript_ItemOrangeMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL"
},
{
@@ -193,7 +193,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_1C"
},
{
@@ -206,7 +206,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_1E"
}
],
data/maps/Route110_TrickHousePuzzle2/map.json
+2 -2
View File
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle2_EventScript_291428",
"script": "Route110_TrickHousePuzzle2_EventScript_ItemWaveMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle2_EventScript_29141B",
"script": "Route110_TrickHousePuzzle2_EventScript_ItemHarborMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL"
}
],
data/maps/Route110_TrickHousePuzzle3/map.json
+4 -4
View File
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle3_EventScript_291442",
"script": "Route110_TrickHousePuzzle3_EventScript_ItemWoodMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle3_EventScript_291435",
"script": "Route110_TrickHousePuzzle3_EventScript_ItemShadowMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle3_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_15"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle3_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_16"
}
],
data/maps/Route110_TrickHousePuzzle4/map.json
+11 -11
View File
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_29144F",
"script": "Route110_TrickHousePuzzle4_EventScript_ItemMechMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_11"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_12"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_13"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_14"
},
{
@@ -128,7 +128,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_15"
},
{
@@ -141,7 +141,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_16"
},
{
@@ -154,7 +154,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_17"
},
{
@@ -167,7 +167,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_18"
},
{
@@ -180,7 +180,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_19"
},
{
@@ -193,7 +193,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_1A"
}
],
data/maps/Route110_TrickHousePuzzle6/map.json
+1 -1
View File
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle6_EventScript_29145C",
"script": "Route110_TrickHousePuzzle6_EventScript_ItemGlitterMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL"
}
],
data/maps/Route110_TrickHousePuzzle7/map.json
+1 -1
View File
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle7_EventScript_291469",
"script": "Route110_TrickHousePuzzle7_EventScript_ItemTropicMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL"
},
{
data/maps/Route110_TrickHousePuzzle8/map.json
+1 -1
View File
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle8_EventScript_291476",
"script": "Route110_TrickHousePuzzle8_EventScript_ItemBeadMail",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL"
}
],
data/maps/Route111/map.json
+7 -7
View File
@@ -222,7 +222,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_11"
},
{
@@ -235,7 +235,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_12"
},
{
@@ -261,7 +261,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_290D9B",
"script": "Route111_EventScript_ItemTM37",
"flag": "FLAG_ITEM_ROUTE_111_TM_37"
},
{
@@ -352,7 +352,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_290DA8",
"script": "Route111_EventScript_ItemStardust",
"flag": "FLAG_ITEM_ROUTE_111_STARDUST"
},
{
@@ -365,7 +365,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_290DB5",
"script": "Route111_EventScript_ItemHPUp",
"flag": "FLAG_ITEM_ROUTE_111_HP_UP"
},
{
@@ -378,7 +378,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_13"
},
{
@@ -573,7 +573,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_290DC2",
"script": "Route111_EventScript_ItemElixir",
"flag": "FLAG_ITEM_ROUTE_111_ELIXIR"
},
{
data/maps/Route111_OldLadysRestStop/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Route111_OldLadysRestStop_MapScripts:: @ 822A916
map_script MAP_SCRIPT_ON_TRANSITION, Route111_OldLadysRestStop_MapScript1_22A91C
map_script MAP_SCRIPT_ON_TRANSITION, Route111_OldLadysRestStop_OnTransition
.byte 0
Route111_OldLadysRestStop_MapScript1_22A91C: @ 822A91C
Route111_OldLadysRestStop_OnTransition: @ 822A91C
setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP
end
data/maps/Route112/map.json
+1 -1
View File
@@ -183,7 +183,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route112_EventScript_290DCF",
"script": "Route112_EventScript_ItemNugget",
"flag": "FLAG_ITEM_ROUTE_112_NUGGET"
},
{
data/maps/Route113/map.json
+3 -3
View File
@@ -105,7 +105,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route113_EventScript_290DDC",
"script": "Route113_EventScript_ItemMaxEther",
"flag": "FLAG_ITEM_ROUTE_113_MAX_ETHER"
},
{
@@ -118,7 +118,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route113_EventScript_290DE9",
"script": "Route113_EventScript_ItemSuperRepel",
"flag": "FLAG_ITEM_ROUTE_113_SUPER_REPEL"
},
{
@@ -183,7 +183,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route113_EventScript_290DF6",
"script": "Route113_EventScript_ItemHyperPotion",
"flag": "FLAG_ITEM_ROUTE_113_HYPER_POTION"
},
{
data/maps/Route113_GlassWorkshop/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Route113_GlassWorkshop_MapScripts:: @ 826ED03
map_script MAP_SCRIPT_ON_TRANSITION, Route113_GlassWorkshop_MapScript1_26ED09
map_script MAP_SCRIPT_ON_TRANSITION, Route113_GlassWorkshop_OnTransition
.byte 0
Route113_GlassWorkshop_MapScript1_26ED09: @ 826ED09
Route113_GlassWorkshop_OnTransition: @ 826ED09
setflag FLAG_LANDMARK_GLASS_WORKSHOP
compare VAR_GLASS_WORKSHOP_STATE, 1
call_if_eq Route113_GlassWorkshop_EventScript_26ED18
data/maps/Route114/map.json
+8 -8
View File
@@ -139,7 +139,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route114_EventScript_290E03",
"script": "Route114_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_ROUTE_114_RARE_CANDY"
},
{
@@ -152,7 +152,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route114_EventScript_290E10",
"script": "Route114_EventScript_ItemProtein",
"flag": "FLAG_ITEM_ROUTE_114_PROTEIN"
},
{
@@ -165,7 +165,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route114_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_11"
},
{
@@ -256,7 +256,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route114_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_12"
},
{
@@ -269,7 +269,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route114_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_13"
},
{
@@ -282,7 +282,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route114_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_14"
},
{
@@ -295,7 +295,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route114_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_15"
},
{
@@ -360,7 +360,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route114_EventScript_290E1D",
"script": "Route114_EventScript_ItemEnergyPowder",
"flag": "FLAG_ITEM_ROUTE_114_ENERGY_POWDER"
},
{
data/maps/Route114_FossilManiacsHouse/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Route114_FossilManiacsHouse_MapScripts:: @ 822AD30
map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsHouse_MapScript1_22AD36
map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsHouse_OnTransition
.byte 0
Route114_FossilManiacsHouse_MapScript1_22AD36: @ 822AD36
Route114_FossilManiacsHouse_OnTransition: @ 822AD36
setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE
end
data/maps/Route114_LanettesHouse/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Route114_LanettesHouse_MapScripts:: @ 822B2C8
map_script MAP_SCRIPT_ON_TRANSITION, Route114_LanettesHouse_MapScript1_22B2CE
map_script MAP_SCRIPT_ON_TRANSITION, Route114_LanettesHouse_OnTransition
.byte 0
Route114_LanettesHouse_MapScript1_22B2CE: @ 822B2CE
Route114_LanettesHouse_OnTransition: @ 822B2CE
setflag FLAG_LANDMARK_LANETTES_HOUSE
end
data/maps/Route115/map.json
+7 -7
View File
@@ -152,7 +152,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_290E2A",
"script": "Route115_EventScript_ItemSuperPotion",
"flag": "FLAG_ITEM_ROUTE_115_SUPER_POTION"
},
{
@@ -165,7 +165,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_290E37",
"script": "Route115_EventScript_ItemTM01",
"flag": "FLAG_ITEM_ROUTE_115_TM_01"
},
{
@@ -178,7 +178,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_290E44",
"script": "Route115_EventScript_ItemIron",
"flag": "FLAG_ITEM_ROUTE_115_IRON"
},
{
@@ -217,7 +217,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_11"
},
{
@@ -230,7 +230,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_290E51",
"script": "Route115_EventScript_ItemGreatBall",
"flag": "FLAG_ITEM_ROUTE_115_GREAT_BALL"
},
{
@@ -308,7 +308,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_290E6B",
"script": "Route115_EventScript_ItemPPUp",
"flag": "FLAG_ITEM_ROUTE_115_PP_UP"
},
{
@@ -321,7 +321,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_290E5E",
"script": "Route115_EventScript_ItemHealPowder",
"flag": "FLAG_ITEM_ROUTE_115_HEAL_POWDER"
}
],
data/maps/Route116/map.json
+10 -10
View File
@@ -74,7 +74,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_11"
},
{
@@ -87,7 +87,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_12"
},
{
@@ -113,7 +113,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_290E85",
"script": "Route116_EventScript_ItemEther",
"flag": "FLAG_ITEM_ROUTE_116_ETHER"
},
{
@@ -126,7 +126,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_290E92",
"script": "Route116_EventScript_ItemRepel",
"flag": "FLAG_ITEM_ROUTE_116_REPEL"
},
{
@@ -178,7 +178,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_13"
},
{
@@ -204,7 +204,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_14"
},
{
@@ -217,7 +217,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_290E9F",
"script": "Route116_EventScript_ItemHPUp",
"flag": "FLAG_ITEM_ROUTE_116_HP_UP"
},
{
@@ -282,7 +282,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_290E78",
"script": "Route116_EventScript_ItemXSpecial",
"flag": "FLAG_ITEM_ROUTE_116_X_SPECIAL"
},
{
@@ -347,7 +347,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_290EAC",
"script": "Route116_EventScript_ItemPotion",
"flag": "FLAG_ITEM_ROUTE_116_POTION"
},
{
@@ -360,7 +360,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_15"
},
{
data/maps/Route116_TunnelersRestHouse/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Route116_TunnelersRestHouse_MapScripts:: @ 822B850
map_script MAP_SCRIPT_ON_TRANSITION, Route116_TunnelersRestHouse_MapScript1_22B856
map_script MAP_SCRIPT_ON_TRANSITION, Route116_TunnelersRestHouse_OnTransition
.byte 0
Route116_TunnelersRestHouse_MapScript1_22B856: @ 822B856
Route116_TunnelersRestHouse_OnTransition: @ 822B856
setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE
end
data/maps/Route117/map.json
+3 -3
View File
@@ -204,7 +204,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route117_EventScript_290EB9",
"script": "Route117_EventScript_ItemGreatBall",
"flag": "FLAG_ITEM_ROUTE_117_GREAT_BALL"
},
{
@@ -217,7 +217,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route117_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_11"
},
{
@@ -230,7 +230,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route117_EventScript_290EC6",
"script": "Route117_EventScript_ItemRevive",
"flag": "FLAG_ITEM_ROUTE_117_REVIVE"
},
{
data/maps/Route117_PokemonDayCare/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Route117_PokemonDayCare_MapScripts:: @ 822BBB1
map_script MAP_SCRIPT_ON_TRANSITION, Route117_PokemonDayCare_MapScript1_22BBB7
map_script MAP_SCRIPT_ON_TRANSITION, Route117_PokemonDayCare_OnTransition
.byte 0
Route117_PokemonDayCare_MapScript1_22BBB7: @ 822BBB7
Route117_PokemonDayCare_OnTransition: @ 822BBB7
setflag FLAG_LANDMARK_POKEMON_DAYCARE
end
data/maps/Route118/map.json
+2 -2
View File
@@ -183,7 +183,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route118_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_11"
},
{
@@ -287,7 +287,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route118_EventScript_290ED3",
"script": "Route118_EventScript_ItemHyperPotion",
"flag": "FLAG_ITEM_ROUTE_118_HYPER_POTION"
},
{
data/maps/Route119/map.json
+9 -9
View File
@@ -243,7 +243,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290EE0",
"script": "Route119_EventScript_ItemSuperRepel",
"flag": "FLAG_ITEM_ROUTE_119_SUPER_REPEL"
},
{
@@ -256,7 +256,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290EED",
"script": "Route119_EventScript_ItemZinc",
"flag": "FLAG_ITEM_ROUTE_119_ZINC"
},
{
@@ -269,7 +269,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290EFA",
"script": "Route119_EventScript_ItemElixir",
"flag": "FLAG_ITEM_ROUTE_119_ELIXIR_1"
},
{
@@ -282,7 +282,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290F07",
"script": "Route119_EventScript_ItemLeafStone",
"flag": "FLAG_ITEM_ROUTE_119_LEAF_STONE"
},
{
@@ -295,7 +295,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290F14",
"script": "Route119_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_ROUTE_119_RARE_CANDY"
},
{
@@ -308,7 +308,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290F21",
"script": "Route119_EventScript_ItemHyperPotion",
"flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_1"
},
{
@@ -438,7 +438,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290F2E",
"script": "Route119_EventScript_ItemHyperPotion2",
"flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_2"
},
{
@@ -555,7 +555,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_291399",
"script": "Route119_EventScript_ItemNugget",
"flag": "FLAG_ITEM_ROUTE_119_NUGGET"
},
{
@@ -568,7 +568,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_290F3B",
"script": "Route119_EventScript_ItemElixir2",
"flag": "FLAG_ITEM_ROUTE_119_ELIXIR_2"
},
{
data/maps/Route120/map.json
+8 -8
View File
@@ -230,7 +230,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_290F48",
"script": "Route120_EventScript_ItemNugget",
"flag": "FLAG_ITEM_ROUTE_120_NUGGET"
},
{
@@ -295,7 +295,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_11"
},
{
@@ -308,7 +308,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_290F55",
"script": "Route120_EventScript_ItemFullHeal",
"flag": "FLAG_ITEM_ROUTE_120_FULL_HEAL"
},
{
@@ -386,7 +386,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_290F6F",
"script": "Route120_EventScript_ItemNestBall",
"flag": "FLAG_ITEM_ROUTE_120_NEST_BALL"
},
{
@@ -399,7 +399,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_290F62",
"script": "Route120_EventScript_ItemHyperPotion",
"flag": "FLAG_ITEM_ROUTE_120_HYPER_POTION"
},
{
@@ -438,7 +438,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_14"
},
{
@@ -451,7 +451,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_12"
},
{
@@ -594,7 +594,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_290F7C",
"script": "Route120_EventScript_ItemRevive",
"flag": "FLAG_ITEM_ROUTE_120_REVIVE"
}
],
data/maps/Route120/scripts.inc
+2 -2
View File
@@ -245,10 +245,10 @@ Route120_EventScript_1F572C:: @ 81F572C
waitmovement 0
delay 50
setfieldeffectargument 0, 1
dofieldeffect 30
dofieldeffect FLDEFF_NPCFLY_OUT
delay 15
removeobject 31
waitfieldeffect 30
waitfieldeffect FLDEFF_NPCFLY_OUT
setmetatile 13, 15, 663, 0
setmetatile 12, 16, 671, 0
setmetatile 12, 17, 161, 0
data/maps/Route121/map.json
+6 -6
View File
@@ -222,7 +222,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route121_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_11"
},
{
@@ -235,7 +235,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route121_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_12"
},
{
@@ -300,7 +300,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route121_EventScript_290F89",
"script": "Route121_EventScript_ItemCarbos",
"flag": "FLAG_ITEM_ROUTE_121_CARBOS"
},
{
@@ -313,7 +313,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route121_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_13"
},
{
@@ -391,7 +391,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route121_EventScript_290F96",
"script": "Route121_EventScript_ItemRevive",
"flag": "FLAG_ITEM_ROUTE_121_REVIVE"
},
{
@@ -404,7 +404,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route121_EventScript_290FA3",
"script": "Route121_EventScript_ItemZinc",
"flag": "FLAG_ITEM_ROUTE_121_ZINC"
}
],
data/maps/Route123/map.json
+8 -8
View File
@@ -256,7 +256,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_11"
},
{
@@ -269,7 +269,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_12"
},
{
@@ -282,7 +282,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_2906BB",
"script": "EventScript_CutTree",
"flag": "FLAG_TEMP_13"
},
{
@@ -295,7 +295,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_290FB0",
"script": "Route123_EventScript_ItemCalcium",
"flag": "FLAG_ITEM_ROUTE_123_CALCIUM"
},
{
@@ -438,7 +438,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_290FBD",
"script": "Route123_EventScript_ItemUltraBall",
"flag": "FLAG_ITEM_ROUTE_123_ULTRA_BALL"
},
{
@@ -451,7 +451,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_290FCA",
"script": "Route123_EventScript_ItemElixir",
"flag": "FLAG_ITEM_ROUTE_123_ELIXIR"
},
{
@@ -542,7 +542,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_290FD7",
"script": "Route123_EventScript_ItemPPUp",
"flag": "FLAG_ITEM_ROUTE_123_PP_UP"
},
{
@@ -581,7 +581,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_290FE4",
"script": "Route123_EventScript_ItemRevivalHerb",
"flag": "FLAG_ITEM_ROUTE_123_REVIVAL_HERB"
}
],
data/maps/Route123_BerryMastersHouse/scripts.inc
+2 -2
View File
@@ -1,8 +1,8 @@
Route123_BerryMastersHouse_MapScripts:: @ 826F83B
map_script MAP_SCRIPT_ON_TRANSITION, Route123_BerryMastersHouse_MapScript1_26F841
map_script MAP_SCRIPT_ON_TRANSITION, Route123_BerryMastersHouse_OnTransition
.byte 0
Route123_BerryMastersHouse_MapScript1_26F841: @ 826F841
Route123_BerryMastersHouse_OnTransition: @ 826F841
setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE
end
data/maps/Route124/map.json
+3 -3
View File
@@ -115,7 +115,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route124_EventScript_290FF1",
"script": "Route124_EventScript_ItemRedShard",
"flag": "FLAG_ITEM_ROUTE_124_RED_SHARD"
},
{
@@ -128,7 +128,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route124_EventScript_290FFE",
"script": "Route124_EventScript_ItemBlueShard",
"flag": "FLAG_ITEM_ROUTE_124_BLUE_SHARD"
},
{
@@ -141,7 +141,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route124_EventScript_29100B",
"script": "Route124_EventScript_ItemYellowShard",
"flag": "FLAG_ITEM_ROUTE_124_YELLOW_SHARD"
},
{

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