ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 19:54:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2447 from AsparagusEduardo/RHH/pr/version/1.3.0

Browse Source 
Version 1.3.0
This commit is contained in:
ghoulslash 2022-11-17 21:25:13 -05:00 committed by GitHub
commit 23acbb370d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
625 changed files with 36500 additions and 28613 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
asm/macros/battle_script.inc
View File

@ -1290,7 +1290,7 @@
.4byte \ptr
.endm
.macro trygetbaddreamstarget ptr:req
.macro unused ptr:req
.byte 0xfd
.4byte \ptr
.endm
@ -1789,9 +1789,9 @@
various BS_ATTACKER, VARIOUS_SET_Z_EFFECT
.endm
.macro consumeberry battler:req, restoreItem=FALSE
.macro consumeberry battler:req, frombattler:req
various \battler, VARIOUS_CONSUME_BERRY
.byte \restoreItem
.byte \frombattler
.endm
.macro activateitemeffects battler:req
@ -1988,6 +1988,12 @@
various \battler, VARIOUS_GET_BATTLER_SIDE
.endm
.macro checkparentalbondcounter counter:req, ptr:req
various BS_ATTACKER, VARIOUS_CHECK_PARENTAL_BOND_COUNTER
.byte \counter
.4byte \ptr
.endm
@ helpful macros
.macro setstatchanger stat:req, stages:req, down:req
setbyte sSTATCHANGER, \stat | \stages << 3 | \down << 7

2
asm/macros/event.inc
View File

@ -469,7 +469,7 @@
formatwarp \map, \a, \b, \c
.endm
@ Sets the dynamic warp destination. Warps with a destination map of MAP_NONE will target this destination.
@ Sets the dynamic warp destination. Warps with a destination map of MAP_DYNAMIC will target this destination.
@ Warp commands can be given either the id of which warp location to go to on the destination map
@ or a pair of x/y coordinates to go to directly on the destination map.
.macro setdynamicwarp map:req, a, b, c

7
data/battle_anim_scripts.s
View File

@ -2989,7 +2989,10 @@ Move_MUD_BOMB:
Move_PSYCHO_CUT:
loadspritegfx ANIM_TAG_SPIRAL
loadspritegfx ANIM_TAG_PSYCHO_CUT
loadspritegfx ANIM_TAG_CROSS_IMPACT
monbg ANIM_ATK_PARTNER
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CROSS_IMPACT, 0, 9, 9, RGB_PURPLE
createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 2, ANIM_ATTACKER
createsprite gPsychoCutSpiralSpriteTemplate, 2, 4, 0, 0, 0, 0
createvisualtask AnimTask_BlendBattleAnimPal, 1, 1, 2, 0, 4, RGB_BLACK
createvisualtask AnimTask_BlendBattleAnimPal, 1, 2, 2, 0, 10, RGB(20, 12, 23)
@ -3000,8 +3003,10 @@ Move_PSYCHO_CUT:
splitbgprio ANIM_TARGET
setalpha 12, 8
playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER,
createsprite gPsychoCutSpriteTemplate, 130, 5, 20, 0, -8, 0, 20
createsprite gPsychoCutSpriteTemplate, ANIM_TARGET, 2, 20, 0, -8, 0, 20
waitforvisualfinish
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 7, 0, 9, 1
createsprite gCrossImpactSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 20
createvisualtask AnimTask_BlendBattleAnimPal, 1, 1, 2, 4, 0, RGB_BLACK
createvisualtask AnimTask_BlendBattleAnimPal, 1, 2, 2, 10, 0, RGB(20, 12, 23)
clearmonbg ANIM_TARGET

269
data/battle_scripts_1.s
View File

@ -51,7 +51,7 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectBide @ EFFECT_BIDE
.4byte BattleScript_EffectRampage @ EFFECT_RAMPAGE
.4byte BattleScript_EffectRoar @ EFFECT_ROAR
.4byte BattleScript_EffectMultiHit @ EFFECT_MULTI_HIT
.4byte BattleScript_EffectHit @ EFFECT_MULTI_HIT
.4byte BattleScript_EffectConversion @ EFFECT_CONVERSION
.4byte BattleScript_EffectFlinchHit @ EFFECT_FLINCH_HIT
.4byte BattleScript_EffectRestoreHp @ EFFECT_RESTORE_HP
@ -66,11 +66,10 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectDragonRage @ EFFECT_DRAGON_RAGE
.4byte BattleScript_EffectTrap @ EFFECT_TRAP
.4byte BattleScript_EffectHealBlock @ EFFECT_HEAL_BLOCK
.4byte BattleScript_EffectDoubleHit @ EFFECT_DOUBLE_HIT
.4byte BattleScript_EffectRecoilIfMiss @ EFFECT_RECOIL_IF_MISS
.4byte BattleScript_EffectMist @ EFFECT_MIST
.4byte BattleScript_EffectFocusEnergy @ EFFECT_FOCUS_ENERGY
.4byte BattleScript_EffectRecoil25 @ EFFECT_RECOIL_25
.4byte BattleScript_EffectHit @ EFFECT_RECOIL_25
.4byte BattleScript_EffectConfuse @ EFFECT_CONFUSE
.4byte BattleScript_EffectAttackUp2 @ EFFECT_ATTACK_UP_2
.4byte BattleScript_EffectDefenseUp2 @ EFFECT_DEFENSE_UP_2
@ -99,7 +98,6 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectHit @ EFFECT_EVASION_DOWN_HIT
.4byte BattleScript_EffectTwoTurnsAttack @ EFFECT_TWO_TURNS_ATTACK
.4byte BattleScript_EffectConfuseHit @ EFFECT_CONFUSE_HIT
.4byte BattleScript_EffectTwineedle @ EFFECT_TWINEEDLE
.4byte BattleScript_EffectHit @ EFFECT_VITAL_THROW
.4byte BattleScript_EffectSubstitute @ EFFECT_SUBSTITUTE
.4byte BattleScript_EffectRecharge @ EFFECT_RECHARGE
@ -220,7 +218,7 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectSnatch @ EFFECT_SNATCH
.4byte BattleScript_EffectHit @ EFFECT_LOW_KICK
.4byte BattleScript_EffectSecretPower @ EFFECT_SECRET_POWER
.4byte BattleScript_EffectRecoil33 @ EFFECT_RECOIL_33
.4byte BattleScript_EffectHit @ EFFECT_RECOIL_33
.4byte BattleScript_EffectTeeterDance @ EFFECT_TEETER_DANCE
.4byte BattleScript_EffectHitEscape @ EFFECT_HIT_ESCAPE
.4byte BattleScript_EffectMudSport @ EFFECT_MUD_SPORT
@ -309,9 +307,9 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectGrowth @ EFFECT_GROWTH
.4byte BattleScript_EffectCloseCombat @ EFFECT_CLOSE_COMBAT
.4byte BattleScript_EffectLastResort @ EFFECT_LAST_RESORT
.4byte BattleScript_EffectRecoil33Status @ EFFECT_RECOIL_33_STATUS
.4byte BattleScript_EffectHit @ EFFECT_RECOIL_33_STATUS
.4byte BattleScript_EffectFlinchStatus @ EFFECT_FLINCH_STATUS
.4byte BattleScript_EffectRecoil50 @ EFFECT_RECOIL_50
.4byte BattleScript_EffectHit @ EFFECT_RECOIL_50
.4byte BattleScript_EffectShellSmash @ EFFECT_SHELL_SMASH
.4byte BattleScript_EffectShiftGear @ EFFECT_SHIFT_GEAR
.4byte BattleScript_EffectDefenseUp3 @ EFFECT_DEFENSE_UP_3
@ -381,12 +379,10 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectHit @ EFFECT_DYNAMAX_DOUBLE_DMG
.4byte BattleScript_EffectDecorate @ EFFECT_DECORATE
.4byte BattleScript_EffectHit @ EFFECT_SNIPE_SHOT
.4byte BattleScript_EffectTripleHit @ EFFECT_TRIPLE_HIT
.4byte BattleScript_EffectRecoilHP25 @ EFFECT_RECOIL_HP_25
.4byte BattleScript_EffectStuffCheeks @ EFFECT_STUFF_CHEEKS
.4byte BattleScript_EffectDefenseDownHit @ EFFECT_GRAV_APPLE
.4byte BattleScript_EffectEvasionUpHit @ EFFECT_EVASION_UP_HIT
.4byte BattleScript_EffectDoubleIronBash @ EFFECT_DOUBLE_IRON_BASH
.4byte BattleScript_EffectGlitzyGlow @ EFFECT_GLITZY_GLOW
.4byte BattleScript_EffectBaddyBad @ EFFECT_BADDY_BAD
.4byte BattleScript_EffectSappySeed @ EFFECT_SAPPY_SEED
@ -415,6 +411,7 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectSteelBeam @ EFFECT_STEEL_BEAM
.4byte BattleScript_EffectExtremeEvoboost @ EFFECT_EXTREME_EVOBOOST
.4byte BattleScript_EffectTerrainHit @ EFFECT_DAMAGE_SET_TERRAIN
.4byte BattleScript_EffectDarkVoid @ EFFECT_DARK_VOID
BattleScript_AffectionBasedEndurance::
playanimation BS_TARGET, B_ANIM_AFFECTION_HANGED_ON
@ -698,11 +695,11 @@ BattleScript_EffectFling:
BattleScript_EffectFlingConsumeBerry:
savebattleritem BS_TARGET
battleritemtolastuseditem BS_TARGET
setbyte sBERRY_OVERRIDE, TRUE @ override the requirements for eating berries
setbyte sBERRY_OVERRIDE, 1 @ override the requirements for eating berries
orword gHitMarker, HITMARKER_NO_ANIMATIONS
consumeberry BS_TARGET
consumeberry BS_TARGET, TRUE
bicword gHitMarker, HITMARKER_NO_ANIMATIONS
setbyte sBERRY_OVERRIDE, FALSE
setbyte sBERRY_OVERRIDE, 0
restorebattleritem BS_TARGET
BattleScript_FlingEnd:
tryfaintmon BS_TARGET
@ -779,9 +776,7 @@ BattleScript_EffectPhotonGeyser:
BattleScript_EffectAuraWheel: @ Aura Wheel can only be used by Morpeko
jumpifspecies BS_ATTACKER, SPECIES_MORPEKO, BattleScript_EffectSpeedUpHit
jumpifspecies BS_ATTACKER, SPECIES_MORPEKO_HANGRY, BattleScript_EffectSpeedUpHit
printstring STRINGID_BUTPOKEMONCANTUSETHEMOVE
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
goto BattleScript_PokemonCantUseTheMove
BattleScript_EffectClangorousSoul:
attackcanceler
@ -893,9 +888,7 @@ BattleScript_BothCanNoLongerEscape::
BattleScript_EffectHyperspaceFury:
jumpifspecies BS_ATTACKER, SPECIES_HOOPA_UNBOUND, BattleScript_EffectHyperspaceFuryUnbound
jumpifspecies BS_ATTACKER, SPECIES_HOOPA, BattleScript_ButHoopaCantUseIt
printstring STRINGID_BUTPOKEMONCANTUSETHEMOVE
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
goto BattleScript_PokemonCantUseTheMove
BattleScript_EffectHyperspaceFuryUnbound::
attackcanceler
@ -1074,16 +1067,6 @@ BattleScript_EffectGlitzyGlow:
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_EffectDoubleIronBash:
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
setmultihitcounter 2
initmultihitstring
sethword sMULTIHIT_EFFECT, MOVE_EFFECT_FLINCH
goto BattleScript_MultiHitLoop
BattleScript_EffectEvasionUpHit:
setmoveeffect MOVE_EFFECT_EVS_PLUS_1 | MOVE_EFFECT_AFFECTS_USER
goto BattleScript_EffectHit
@ -1096,11 +1079,12 @@ BattleScript_EffectStuffCheeks::
attackanimation
waitanimation
BattleScript_StuffCheeksEatBerry:
setbyte sBERRY_OVERRIDE, TRUE
setbyte sBERRY_OVERRIDE, 1
orword gHitMarker, HITMARKER_NO_ANIMATIONS
consumeberry BS_ATTACKER
consumeberry BS_ATTACKER, TRUE
bicword gHitMarker, HITMARKER_NO_ANIMATIONS
setbyte sBERRY_OVERRIDE, FALSE
setbyte sBERRY_OVERRIDE, 0
removeitem BS_ATTACKER
setstatchanger STAT_DEF, 2, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_StuffCheeksEnd
setgraphicalstatchangevalues
@ -1286,27 +1270,16 @@ BattleScript_EffectBurnUp:
ppreduce
jumpiftype BS_ATTACKER, TYPE_FIRE, BattleScript_BurnUpWorks
goto BattleScript_ButItFailed
BattleScript_BurnUpWorks:
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
critcalc
damagecalc
adjustdamage
attackanimation
waitanimation
effectivenesssound
hitanimation BS_TARGET
waitstate
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
waitmessage B_WAIT_TIME_LONG
resultmessage
waitmessage B_WAIT_TIME_LONG
setmoveeffect MOVE_EFFECT_BURN_UP | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
BattleScript_BurnUpRemoveType::
losetype BS_ATTACKER, TYPE_FIRE
printstring STRINGID_ATTACKERLOSTFIRETYPE
waitmessage B_WAIT_TIME_LONG
tryfaintmon BS_TARGET
goto BattleScript_MoveEnd
return
BattleScript_EffectPurify:
attackcanceler
@ -1389,11 +1362,13 @@ BattleScript_MoveEffectBugBite::
printstring STRINGID_BUGBITE
waitmessage B_WAIT_TIME_LONG
orword gHitMarker, HITMARKER_NO_ANIMATIONS
setbyte sBERRY_OVERRIDE, TRUE @ override the requirements for eating berries
consumeberry BS_ATTACKER, TRUE @ consume the berry, then restore the item from changedItems
setbyte sBERRY_OVERRIDE, 1 @ override the requirements for eating berries
savetarget
consumeberry BS_ATTACKER, FALSE
bicword gHitMarker, HITMARKER_NO_ANIMATIONS
setbyte sBERRY_OVERRIDE, FALSE
setbyte sBERRY_OVERRIDE, 0
trysymbiosis
restoretarget
return
BattleScript_EffectCoreEnforcer:
@ -3026,6 +3001,7 @@ BattleScript_EffectNaturalGift:
waitmessage B_WAIT_TIME_LONG
seteffectwithchance
jumpifmovehadnoeffect BattleScript_EffectNaturalGiftEnd
checkparentalbondcounter 2, BattleScript_EffectNaturalGiftEnd
removeitem BS_ATTACKER
BattleScript_EffectNaturalGiftEnd:
tryfaintmon BS_TARGET
@ -3044,6 +3020,11 @@ BattleScript_MoveMissed::
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_EffectDarkVoid::
.if B_DARK_VOID_FAIL >= GEN_7
jumpifspecies BS_ATTACKER, SPECIES_DARKRAI, BattleScript_EffectSleep
goto BattleScript_PokemonCantUseTheMove
.endif
BattleScript_EffectSleep::
attackcanceler
attackstring
@ -3571,6 +3552,8 @@ BattleScript_MultiHitPrintStrings::
copyarray gBattleTextBuff1, sMULTIHIT_STRING, 6
printstring STRINGID_HITXTIMES
waitmessage B_WAIT_TIME_LONG
return
BattleScript_MultiHitEnd::
seteffectwithchance
tryfaintmon BS_TARGET
@ -3789,26 +3772,6 @@ BattleScript_EffectTrap::
setmoveeffect MOVE_EFFECT_WRAP
goto BattleScript_EffectHit
BattleScript_EffectTripleHit::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
setmultihitcounter 3
initmultihitstring
sethword sMULTIHIT_EFFECT, 0
goto BattleScript_MultiHitLoop
BattleScript_EffectDoubleHit::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
setmultihitcounter 2
initmultihitstring
sethword sMULTIHIT_EFFECT, 0
goto BattleScript_MultiHitLoop
BattleScript_EffectRecoilIfMiss::
attackcanceler
accuracycheck BattleScript_MoveMissedDoDamage, ACC_CURR_MOVE
@ -4165,16 +4128,6 @@ BattleScript_EffectConfuseHit::
setmoveeffect MOVE_EFFECT_CONFUSION
goto BattleScript_EffectHit
BattleScript_EffectTwineedle::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
sethword sMULTIHIT_EFFECT, MOVE_EFFECT_POISON
attackstring
ppreduce
setmultihitcounter 2
initmultihitstring
goto BattleScript_MultiHitLoop
BattleScript_EffectSubstitute::
attackcanceler
ppreduce
@ -4520,64 +4473,16 @@ BattleScript_PartyHealEnd::
BattleScript_EffectTripleKick::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
sethword sTRIPLE_KICK_POWER, 0
initmultihitstring
setmultihit 3
BattleScript_TripleKickLoop::
jumpifhasnohp BS_ATTACKER, BattleScript_TripleKickEnd
jumpifhasnohp BS_TARGET, BattleScript_TripleKickNoMoreHits
jumpifhalfword CMP_EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoTripleKickAttack
jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_TripleKickNoMoreHits
BattleScript_DoTripleKickAttack::
accuracycheck BattleScript_TripleKickNoMoreHits, ACC_CURR_MOVE
movevaluescleanup
jumpifmove MOVE_SURGING_STRIKES, EffectTripleKick_DoDmgCalcs @ no power boost each hit
jumpifmove MOVE_TRIPLE_AXEL, EffectTripleKick_TripleAxelBoost @ triple axel gets +20 power
addbyte sTRIPLE_KICK_POWER, 10 @ triple kick gets +10 power
goto EffectTripleKick_DoDmgCalcs
EffectTripleKick_TripleAxelBoost:
addbyte sTRIPLE_KICK_POWER, 20
EffectTripleKick_DoDmgCalcs:
addbyte sTRIPLE_KICK_POWER, 10
addbyte sMULTIHIT_STRING + 4, 1
critcalc
damagecalc
adjustdamage
jumpifmovehadnoeffect BattleScript_TripleKickNoMoreHits
attackanimation
waitanimation
effectivenesssound
hitanimation BS_TARGET
waitstate
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
waitmessage B_WAIT_TIME_LONG
printstring STRINGID_EMPTYSTRING3
waitmessage 1
moveendto MOVEEND_NEXT_TARGET
jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_TripleKickPrintStrings
decrementmultihit BattleScript_TripleKickLoop
goto BattleScript_TripleKickPrintStrings
BattleScript_TripleKickNoMoreHits::
pause B_WAIT_TIME_SHORT
jumpifbyte CMP_EQUAL, sMULTIHIT_STRING + 4, 0, BattleScript_TripleKickPrintStrings
bichalfword gMoveResultFlags, MOVE_RESULT_MISSED
BattleScript_TripleKickPrintStrings::
resultmessage
waitmessage B_WAIT_TIME_LONG
jumpifbyte CMP_EQUAL, sMULTIHIT_STRING + 4, 0, BattleScript_TripleKickEnd
jumpifhalfword CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_TripleKickEnd
copyarray gBattleTextBuff1, sMULTIHIT_STRING, 6
printstring STRINGID_HITXTIMES
waitmessage B_WAIT_TIME_LONG
BattleScript_TripleKickEnd::
seteffectwithchance
tryfaintmon BS_TARGET
moveendfrom MOVEEND_UPDATE_LAST_MOVES
end
jumpifmove MOVE_TRIPLE_AXEL BS_TripleAxel
addbyte sTRIPLE_KICK_POWER, 10 @ triple kick gets +10 power
goto BattleScript_HitFromAtkString
BS_TripleAxel:
addbyte sTRIPLE_KICK_POWER, 20 @ triple axel gets +20 power
goto BattleScript_HitFromAtkString
BattleScript_EffectThief::
setmoveeffect MOVE_EFFECT_STEAL_ITEM
@ -5217,6 +5122,7 @@ BattleScript_EffectTeleportNew:
BattleScript_EffectTeleportNewEnd:
goto BattleScript_MoveEnd
.if B_BEAT_UP < GEN_5
BattleScript_EffectBeatUp::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
@ -5249,6 +5155,13 @@ BattleScript_BeatUpAttack::
goto BattleScript_BeatUpLoop
BattleScript_BeatUpEnd::
end
.else
BattleScript_EffectBeatUp::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
addbyte gBattleCommunication, 1
goto BattleScript_HitFromAtkString
.endif
BattleScript_EffectSemiInvulnerable::
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_SecondTurnSemiInvulnerable
@ -5411,9 +5324,11 @@ BattleScript_EffectSpitUp::
stockpiletobasedamage BattleScript_SpitUpFail
goto BattleScript_HitFromAtkAnimation
BattleScript_SpitUpFail::
checkparentalbondcounter 2, BattleScript_SpitUpEnd
pause B_WAIT_TIME_SHORT
printstring STRINGID_FAILEDTOSPITUP
waitmessage B_WAIT_TIME_LONG
BattleScript_SpitUpEnd:
goto BattleScript_MoveEnd
BattleScript_SpitUpFailProtect::
@ -5898,24 +5813,6 @@ BattleScript_EffectSecretPower::
getsecretpowereffect
goto BattleScript_EffectHit
BattleScript_EffectRecoil25:
setmoveeffect MOVE_EFFECT_RECOIL_25 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
jumpifnotmove MOVE_STRUGGLE, BattleScript_EffectHit
incrementgamestat GAME_STAT_USED_STRUGGLE
goto BattleScript_EffectHit
BattleScript_EffectRecoil33::
setmoveeffect MOVE_EFFECT_RECOIL_33 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
BattleScript_EffectRecoil33Status:
setmoveeffect MOVE_EFFECT_RECOIL_33_STATUS | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
BattleScript_EffectRecoil50:
setmoveeffect MOVE_EFFECT_RECOIL_50 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
BattleScript_EffectRecoilHP25:
setmoveeffect MOVE_EFFECT_RECOIL_HP_25 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
jumpifnotmove MOVE_STRUGGLE, BattleScript_EffectHit
@ -8045,7 +7942,6 @@ BattleScript_MoveEffectConfusion::
BattleScript_MoveEffectRecoilWithStatus::
argumentstatuseffect
copyword gBattleMoveDamage, sSAVED_DMG
BattleScript_MoveEffectRecoil::
jumpifmove MOVE_STRUGGLE, BattleScript_DoRecoil
jumpifability BS_ATTACKER, ABILITY_ROCK_HEAD, BattleScript_RecoilEnd
@ -8467,24 +8363,33 @@ BattleScript_PsychicSurgeActivates::
call BattleScript_TerrainSeedLoop
end3
BattleScript_BadDreamsActivates::
setbyte gBattlerTarget, 0
call BattleScript_AbilityPopUp
BattleScript_BadDreamsLoop:
trygetbaddreamstarget BattleScript_BadDreamsEnd
dmg_1_8_targethp
BattleScript_HurtTarget_NoString:
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
printstring STRINGID_BADDREAMSDMG
waitmessage B_WAIT_TIME_LONG
jumpifability BS_TARGET, ABILITY_MAGIC_GUARD, BattleScript_BadDreamsIncrement
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
tryfaintmon BS_TARGET
checkteamslost BattleScript_BadDreamsIncrement
return
BattleScript_BadDreamsActivates::
call BattleScript_AbilityPopUp
setbyte sFIXED_ABILITY_POPUP, TRUE
setbyte gBattlerTarget, 0
BattleScript_BadDreamsLoop:
jumpiftargetally BattleScript_BadDreamsIncrement
jumpifability BS_TARGET, ABILITY_MAGIC_GUARD, BattleScript_BadDreamsIncrement
jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_BadDreams_Dmg
jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_BadDreams_Dmg
goto BattleScript_BadDreamsIncrement
BattleScript_BadDreams_Dmg:
printstring STRINGID_BADDREAMSDMG
waitmessage B_WAIT_TIME_LONG
dmg_1_8_targethp
call BattleScript_HurtTarget_NoString
BattleScript_BadDreamsIncrement:
addbyte gBattlerTarget, 1
goto BattleScript_BadDreamsLoop
jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_BadDreamsLoop
BattleScript_BadDreamsEnd:
destroyabilitypopup
end3
BattleScript_TookAttack::
@ -9126,6 +9031,7 @@ BattleScript_BerryCureSlpRet::
BattleScript_GemActivates::
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT
waitanimation
setlastuseditem BS_ATTACKER
printstring STRINGID_GEMACTIVATES
waitmessage B_WAIT_TIME_LONG
removeitem BS_ATTACKER
@ -9134,6 +9040,7 @@ BattleScript_GemActivates::
BattleScript_BerryReduceDmg::
playanimation BS_TARGET, B_ANIM_HELD_ITEM_EFFECT
waitanimation
setlastuseditem BS_TARGET
printstring STRINGID_TARGETATEITEM
waitmessage B_WAIT_TIME_LONG
removeitem BS_TARGET
@ -9382,11 +9289,15 @@ BattleScript_BerryStatRaiseRet_Anim:
BattleScript_BerryStatRaiseRet_End:
return
BattleScript_BerryFocusEnergyEnd2::
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT
BattleScript_BerryFocusEnergyRet::
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT
printstring STRINGID_PKMNUSEDXTOGETPUMPED
waitmessage B_WAIT_TIME_LONG
removeitem BS_ATTACKER
removeitem BS_SCRIPTING
return
BattleScript_BerryFocusEnergyEnd2::
call BattleScript_BerryFocusEnergyRet
end2
BattleScript_ActionSelectionItemsCantBeUsed::
@ -9880,3 +9791,21 @@ BattleScript_SymbiosisActivates::
printstring STRINGID_SYMBIOSISITEMPASS
waitmessage B_WAIT_TIME_LONG
return
BattleScript_TargetAbilityStatRaiseRet::
copybyte gBattlerAbility, gEffectBattler
copybyte gBattlerAttacker, gBattlerTarget
call BattleScript_AbilityPopUp
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN, BattleScript_TargetAbilityStatRaiseRet_End
setgraphicalstatchangevalues
call BattleScript_StatUp
BattleScript_TargetAbilityStatRaiseRet_End:
return
BattleScript_PokemonCantUseTheMove::
attackstring
ppreduce
pause B_WAIT_TIME_SHORT
printstring STRINGID_BUTPOKEMONCANTUSETHEMOVE
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd

1
data/event_scripts.s
View File

@ -30,6 +30,7 @@
#include "constants/frontier_util.h"
#include "constants/game_stat.h"
#include "constants/item.h"
#include "constants/item_config.h"
#include "constants/items.h"
#include "constants/heal_locations.h"
#include "constants/layouts.h"

4
data/maps/AbandonedShip_CaptainsOffice/map.json
View File

@ -47,14 +47,14 @@
"y": 6,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_DECK",
"dest_warp_id": 4
"dest_warp_id": "4"
},
{
"x": 8,
"y": 6,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_DECK",
"dest_warp_id": 4
"dest_warp_id": "4"
}
],
"coord_events": [],

24
data/maps/AbandonedShip_Corridors_1F/map.json
View File

@ -47,84 +47,84 @@
"y": 11,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_DECK",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 8,
"y": 11,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_DECK",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 0,
"y": 11,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_DECK",
"dest_warp_id": 3
"dest_warp_id": "3"
},
{
"x": 1,
"y": 11,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_DECK",
"dest_warp_id": 3
"dest_warp_id": "3"
},
{
"x": 11,
"y": 9,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 14,
"y": 9,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F",
"dest_warp_id": 3
"dest_warp_id": "3"
},
{
"x": 11,
"y": 3,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 14,
"y": 3,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F",
"dest_warp_id": 4
"dest_warp_id": "4"
},
{
"x": 3,
"y": 9,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOMS2_1F",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 16,
"y": 2,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"dest_warp_id": 7
"dest_warp_id": "7"
},
{
"x": 5,
"y": 2,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"dest_warp_id": 6
"dest_warp_id": "6"
},
{
"x": 3,
"y": 3,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOMS2_1F",
"dest_warp_id": 2
"dest_warp_id": "2"
}
],
"coord_events": [],

16
data/maps/AbandonedShip_Corridors_B1F/map.json
View File

@ -47,56 +47,56 @@
"y": 4,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOMS2_B1F",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 3,
"y": 4,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOMS2_B1F",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 5,
"y": 7,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOMS_B1F",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 8,
"y": 7,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOMS_B1F",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 11,
"y": 7,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOMS_B1F",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 11,
"y": 4,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOM_B1F",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 0,
"y": 2,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 10
"dest_warp_id": "10"
},
{
"x": 8,
"y": 2,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 9
"dest_warp_id": "9"
}
],
"coord_events": [],

10
data/maps/AbandonedShip_Deck/map.json
View File

@ -20,35 +20,35 @@
"y": 15,
"elevation": 3,
"dest_map": "MAP_ROUTE108",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 14,
"y": 15,
"elevation": 3,
"dest_map": "MAP_ROUTE108",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 13,
"y": 9,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 8,
"y": 9,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 12,
"y": 5,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CAPTAINS_OFFICE",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

12
data/maps/AbandonedShip_HiddenFloorCorridors/map.json
View File

@ -20,42 +20,42 @@
"y": 8,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 6,
"y": 8,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 9,
"y": 8,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
"dest_warp_id": 4
"dest_warp_id": "4"
},
{
"x": 3,
"y": 3,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
"dest_warp_id": 6
"dest_warp_id": "6"
},
{
"x": 6,
"y": 3,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
"dest_warp_id": 7
"dest_warp_id": "7"
},
{
"x": 9,
"y": 3,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
"dest_warp_id": 8
"dest_warp_id": "8"
}
],
"coord_events": [],

18
data/maps/AbandonedShip_HiddenFloorRooms/map.json
View File

@ -73,63 +73,63 @@
"y": 14,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 7,
"y": 14,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 21,
"y": 14,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 22,
"y": 14,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 36,
"y": 14,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 37,
"y": 14,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 6,
"y": 1,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
"dest_warp_id": 3
"dest_warp_id": "3"
},
{
"x": 21,
"y": 1,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
"dest_warp_id": 4
"dest_warp_id": "4"
},
{
"x": 36,
"y": 1,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
"dest_warp_id": 5
"dest_warp_id": "5"
}
],
"coord_events": [],

4
data/maps/AbandonedShip_Room_B1F/map.json
View File

@ -34,14 +34,14 @@
"y": 7,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"dest_warp_id": 5
"dest_warp_id": "5"
},
{
"x": 5,
"y": 7,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"dest_warp_id": 5
"dest_warp_id": "5"
}
],
"coord_events": [],

6
data/maps/AbandonedShip_Rooms2_1F/map.json
View File

@ -86,21 +86,21 @@
"y": 16,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 8
"dest_warp_id": "8"
},
{
"x": 5,
"y": 16,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 8
"dest_warp_id": "8"
},
{
"x": 4,
"y": 1,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 11
"dest_warp_id": "11"
}
],
"coord_events": [],

8
data/maps/AbandonedShip_Rooms2_B1F/map.json
View File

@ -47,28 +47,28 @@
"y": 7,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 5,
"y": 7,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 13,
"y": 7,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 14,
"y": 7,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

12
data/maps/AbandonedShip_Rooms_1F/map.json
View File

@ -73,42 +73,42 @@
"y": 16,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 4
"dest_warp_id": "4"
},
{
"x": 5,
"y": 16,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 4
"dest_warp_id": "4"
},
{
"x": 4,
"y": 1,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 6
"dest_warp_id": "6"
},
{
"x": 13,
"y": 16,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 5
"dest_warp_id": "5"
},
{
"x": 13,
"y": 1,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 7
"dest_warp_id": "7"
},
{
"x": 14,
"y": 16,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 5
"dest_warp_id": "5"
}
],
"coord_events": [],

6
data/maps/AbandonedShip_Rooms_B1F/map.json
View File

@ -47,21 +47,21 @@
"y": 1,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 13,
"y": 1,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"dest_warp_id": 3
"dest_warp_id": "3"
},
{
"x": 22,
"y": 1,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"dest_warp_id": 4
"dest_warp_id": "4"
}
],
"coord_events": [],

4
data/maps/AbandonedShip_Underwater1/map.json
View File

@ -20,14 +20,14 @@
"y": 7,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_UNDERWATER2",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 4,
"y": 7,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_UNDERWATER2",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

2
data/maps/AbandonedShip_Underwater2/map.json
View File

@ -20,7 +20,7 @@
"y": 1,
"elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_UNDERWATER1",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

2
data/maps/AlteringCave/map.json
View File

@ -20,7 +20,7 @@
"y": 22,
"elevation": 0,
"dest_map": "MAP_ROUTE103",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

6
data/maps/AncientTomb/map.json
View File

@ -34,21 +34,21 @@
"y": 29,
"elevation": 3,
"dest_map": "MAP_ROUTE120",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 8,
"y": 20,
"elevation": 0,
"dest_map": "MAP_ANCIENT_TOMB",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 8,
"y": 11,
"elevation": 3,
"dest_map": "MAP_ANCIENT_TOMB",
"dest_warp_id": 1
"dest_warp_id": "1"
}
],
"coord_events": [],

6
data/maps/AquaHideout_1F/map.json
View File

@ -60,21 +60,21 @@
"y": 27,
"elevation": 1,
"dest_map": "MAP_LILYCOVE_CITY",
"dest_warp_id": 6
"dest_warp_id": "6"
},
{
"x": 14,
"y": 27,
"elevation": 1,
"dest_map": "MAP_LILYCOVE_CITY",
"dest_warp_id": 6
"dest_warp_id": "6"
},
{
"x": 22,
"y": 1,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

50
data/maps/AquaHideout_B1F/map.json
View File

@ -138,175 +138,175 @@
"y": 1,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_1F",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 18,
"y": 1,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B2F",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 12,
"y": 1,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B2F",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 3,
"y": 3,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B2F",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 31,
"y": 4,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 7
"dest_warp_id": "7"
},
{
"x": 27,
"y": 4,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 8
"dest_warp_id": "8"
},
{
"x": 20,
"y": 4,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 10
"dest_warp_id": "10"
},
{
"x": 27,
"y": 12,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 4
"dest_warp_id": "4"
},
{
"x": 3,
"y": 15,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 5
"dest_warp_id": "5"
},
{
"x": 3,
"y": 20,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 12
"dest_warp_id": "12"
},
{
"x": 32,
"y": 19,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 6
"dest_warp_id": "6"
},
{
"x": 23,
"y": 10,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 22
"dest_warp_id": "22"
},
{
"x": 45,
"y": 3,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 9
"dest_warp_id": "9"
},
{
"x": 42,
"y": 5,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 18
"dest_warp_id": "18"
},
{
"x": 45,
"y": 5,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 12
"dest_warp_id": "12"
},
{
"x": 48,
"y": 5,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 16
"dest_warp_id": "16"
},
{
"x": 42,
"y": 9,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 15
"dest_warp_id": "15"
},
{
"x": 45,
"y": 9,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 20
"dest_warp_id": "20"
},
{
"x": 48,
"y": 9,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 13
"dest_warp_id": "13"
},
{
"x": 42,
"y": 13,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 24
"dest_warp_id": "24"
},
{
"x": 45,
"y": 13,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 17
"dest_warp_id": "17"
},
{
"x": 48,
"y": 13,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 12
"dest_warp_id": "12"
},
{
"x": 42,
"y": 17,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 11
"dest_warp_id": "11"
},
{
"x": 45,
"y": 17,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 17
"dest_warp_id": "17"
},
{
"x": 48,
"y": 17,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 19
"dest_warp_id": "19"
}
],
"coord_events": [],

20
data/maps/AquaHideout_B2F/map.json
View File

@ -99,70 +99,70 @@
"y": 1,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 12,
"y": 1,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 3,
"y": 3,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 3
"dest_warp_id": "3"
},
{
"x": 31,
"y": 8,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B2F",
"dest_warp_id": 5
"dest_warp_id": "5"
},
{
"x": 8,
"y": 8,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B2F",
"dest_warp_id": 8
"dest_warp_id": "8"
},
{
"x": 5,
"y": 8,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B2F",
"dest_warp_id": 3
"dest_warp_id": "3"
},
{
"x": 18,
"y": 13,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B2F",
"dest_warp_id": 7
"dest_warp_id": "7"
},
{
"x": 12,
"y": 13,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B2F",
"dest_warp_id": 6
"dest_warp_id": "6"
},
{
"x": 31,
"y": 17,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B2F",
"dest_warp_id": 4
"dest_warp_id": "4"
},
{
"x": 32,
"y": 20,
"elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 4
"dest_warp_id": "4"
}
],
"coord_events": [

4
data/maps/ArtisanCave_1F/map.json
View File

@ -34,14 +34,14 @@
"y": 17,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 13
"dest_warp_id": "13"
},
{
"x": 6,
"y": 5,
"elevation": 0,
"dest_map": "MAP_ARTISAN_CAVE_B1F",
"dest_warp_id": 1
"dest_warp_id": "1"
}
],
"coord_events": [],

4
data/maps/ArtisanCave_B1F/map.json
View File

@ -34,14 +34,14 @@
"y": 48,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 10
"dest_warp_id": "10"
},
{
"x": 38,
"y": 5,
"elevation": 0,
"dest_map": "MAP_ARTISAN_CAVE_1F",
"dest_warp_id": 1
"dest_warp_id": "1"
}
],
"coord_events": [],

8
data/maps/BattleColosseum_2P/map.json
View File

@ -33,15 +33,15 @@
"x": 6,
"y": 8,
"elevation": 3,
"dest_map": "MAP_NONE",
"dest_warp_id": 127
"dest_map": "MAP_DYNAMIC",
"dest_warp_id": "WARP_ID_DYNAMIC"
},
{
"x": 7,
"y": 8,
"elevation": 3,
"dest_map": "MAP_NONE",
"dest_warp_id": 127
"dest_map": "MAP_DYNAMIC",
"dest_warp_id": "WARP_ID_DYNAMIC"
}
],
"coord_events": [

16
data/maps/BattleColosseum_4P/map.json
View File

@ -19,29 +19,29 @@
"x": 5,
"y": 8,
"elevation": 3,
"dest_map": "MAP_NONE",
"dest_warp_id": 127
"dest_map": "MAP_DYNAMIC",
"dest_warp_id": "WARP_ID_DYNAMIC"
},
{
"x": 6,
"y": 8,
"elevation": 3,
"dest_map": "MAP_NONE",
"dest_warp_id": 127
"dest_map": "MAP_DYNAMIC",
"dest_warp_id": "WARP_ID_DYNAMIC"
},
{
"x": 7,
"y": 8,
"elevation": 3,
"dest_map": "MAP_NONE",
"dest_warp_id": 127
"dest_map": "MAP_DYNAMIC",
"dest_warp_id": "WARP_ID_DYNAMIC"
},
{
"x": 8,
"y": 8,
"elevation": 3,
"dest_map": "MAP_NONE",
"dest_warp_id": 127
"dest_map": "MAP_DYNAMIC",
"dest_warp_id": "WARP_ID_DYNAMIC"
}
],
"coord_events": [

2
data/maps/BattleFrontier_BattleArenaLobby/map.json
View File

@ -86,7 +86,7 @@
"y": 12,
"elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 1
"dest_warp_id": "1"
}
],
"coord_events": [],

4
data/maps/BattleFrontier_BattleDomeCorridor/map.json
View File

@ -34,14 +34,14 @@
"y": 8,
"elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 7,
"y": 8,
"elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 1
"dest_warp_id": "1"
}
],
"coord_events": [],

4
data/maps/BattleFrontier_BattleDomeLobby/map.json
View File

@ -99,14 +99,14 @@
"y": 16,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 12,
"y": 16,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 1
"dest_warp_id": "1"
}
],
"coord_events": [],

4
data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json
View File

@ -34,14 +34,14 @@
"y": 8,
"elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 7,
"y": 8,
"elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 1
"dest_warp_id": "1"
}
],
"coord_events": [],

4
data/maps/BattleFrontier_BattleFactoryLobby/map.json
View File

@ -99,14 +99,14 @@
"y": 11,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 10,
"y": 11,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 2
"dest_warp_id": "2"
}
],
"coord_events": [],

4
data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json
View File

@ -86,14 +86,14 @@
"y": 9,
"elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 1,
"y": 9,
"elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR",
"dest_warp_id": 2
"dest_warp_id": "2"
}
],
"coord_events": [],

8
data/maps/BattleFrontier_BattlePalaceCorridor/map.json
View File

@ -112,28 +112,28 @@
"y": 13,
"elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 9,
"y": 13,
"elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 6,
"y": 3,
"elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 10,
"y": 3,
"elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

6
data/maps/BattleFrontier_BattlePalaceLobby/map.json
View File

@ -99,21 +99,21 @@
"y": 11,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 13,
"y": 11,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 5,
"y": 4,
"elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

6
data/maps/BattleFrontier_BattlePikeLobby/map.json
View File

@ -73,21 +73,21 @@
"y": 12,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 4,
"y": 12,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 6,
"y": 12,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

2
data/maps/BattleFrontier_BattlePyramidLobby/map.json
View File

@ -73,7 +73,7 @@
"y": 17,
"elevation": 4,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 3
"dest_warp_id": "3"
}
],
"coord_events": [],

4
data/maps/BattleFrontier_BattleTowerBattleRoom/map.json
View File

@ -60,14 +60,14 @@
"y": 8,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 6,
"y": 8,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY",
"dest_warp_id": 2
"dest_warp_id": "2"
}
],
"coord_events": [],

6
data/maps/BattleFrontier_BattleTowerLobby/map.json
View File

@ -138,21 +138,21 @@
"y": 9,
"elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 13,
"y": 9,
"elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 6,
"y": 1,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

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

@ -911,7 +911,7 @@ BattleFrontier_BattleTowerLobby_EventScript_ExitRules::
end
@ Unused
BattleFrontier_BattleTowerLobby_EventScript_DirectYouToBattleRoom:
BattleFrontier_BattleTowerLobby_Text_DirectYouToBattleRoom:
.string "I'll direct you to your BATTLE ROOM now.$"
BattleFrontier_BattleTowerLobby_Text_DidntSaveBeforeQuitting:

6
data/maps/BattleFrontier_ExchangeServiceCorner/map.json
View File

@ -138,21 +138,21 @@
"y": 10,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 6
"dest_warp_id": "6"
},
{
"x": 6,
"y": 10,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 6
"dest_warp_id": "6"
},
{
"x": 8,
"y": 10,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 6
"dest_warp_id": "6"
}
],
"coord_events": [],

2
data/maps/BattleFrontier_Lounge1/map.json
View File

@ -60,7 +60,7 @@
"y": 9,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 5
"dest_warp_id": "5"
}
],
"coord_events": [],

4
data/maps/BattleFrontier_Lounge2/map.json
View File

@ -86,14 +86,14 @@
"y": 7,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 3
"dest_warp_id": "3"
},
{
"x": 2,
"y": 7,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 3
"dest_warp_id": "3"
}
],
"coord_events": [],

2
data/maps/BattleFrontier_Lounge3/map.json
View File

@ -86,7 +86,7 @@
"y": 9,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 9
"dest_warp_id": "9"
}
],
"coord_events": [],

2
data/maps/BattleFrontier_Lounge4/map.json
View File

@ -60,7 +60,7 @@
"y": 9,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 6
"dest_warp_id": "6"
}
],
"coord_events": [],

4
data/maps/BattleFrontier_Lounge5/map.json
View File

@ -73,14 +73,14 @@
"y": 7,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 7
"dest_warp_id": "7"
},
{
"x": 2,
"y": 7,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 7
"dest_warp_id": "7"
}
],
"coord_events": [],

2
data/maps/BattleFrontier_Lounge6/map.json
View File

@ -34,7 +34,7 @@
"y": 9,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 8
"dest_warp_id": "8"
}
],
"coord_events": [],

2
data/maps/BattleFrontier_Lounge7/map.json
View File

@ -73,7 +73,7 @@
"y": 9,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 7
"dest_warp_id": "7"
}
],
"coord_events": [],

2
data/maps/BattleFrontier_Lounge8/map.json
View File

@ -60,7 +60,7 @@
"y": 9,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 10
"dest_warp_id": "10"
}
],
"coord_events": [],

4
data/maps/BattleFrontier_Lounge9/map.json
View File

@ -34,14 +34,14 @@
"y": 9,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 11
"dest_warp_id": "11"
},
{
"x": 2,
"y": 9,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 11
"dest_warp_id": "11"
}
],
"coord_events": [],

4
data/maps/BattleFrontier_Mart/map.json
View File

@ -73,14 +73,14 @@
"y": 7,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 4
"dest_warp_id": "4"
},
{
"x": 4,
"y": 7,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 4
"dest_warp_id": "4"
}
],
"coord_events": [],

32
data/maps/BattleFrontier_OutsideEast/map.json
View File

@ -14,9 +14,9 @@
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": [
{
"direction": "left",
"map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"offset": 0,
"map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST"
"direction": "left"
}
],
"object_events": [
@ -365,98 +365,98 @@
"y": 14,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 39,
"y": 29,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 45,
"y": 56,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 58,
"y": 14,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 35,
"y": 12,
"elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_RANKING_HALL",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 4,
"y": 44,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_LOUNGE1",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 10,
"y": 28,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 22,
"y": 51,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_LOUNGE5",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 5,
"y": 8,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_LOUNGE6",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 65,
"y": 31,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_LOUNGE3",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 14,
"y": 51,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_LOUNGE8",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 21,
"y": 45,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_LOUNGE9",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 3,
"y": 51,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 28,
"y": 7,
"elevation": 0,
"dest_map": "MAP_ARTISAN_CAVE_1F",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

26
data/maps/BattleFrontier_OutsideWest/map.json
View File

@ -14,9 +14,9 @@
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": [
{
"direction": "right",
"map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"offset": 0,
"map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST"
"direction": "right"
}
],
"object_events": [
@ -339,77 +339,77 @@
"y": 27,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 19,
"y": 17,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 11,
"y": 38,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 45,
"y": 44,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_LOUNGE2",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 51,
"y": 51,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_MART",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 44,
"y": 5,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_SCOTTS_HOUSE",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 53,
"y": 44,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_LOUNGE4",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 5,
"y": 20,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_LOUNGE7",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 26,
"y": 65,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_RECEPTION_GATE",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 26,
"y": 61,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_RECEPTION_GATE",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 39,
"y": 55,
"elevation": 0,
"dest_map": "MAP_ARTISAN_CAVE_B1F",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

6
data/maps/BattleFrontier_PokemonCenter_1F/map.json
View File

@ -86,21 +86,21 @@
"y": 8,
"elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 12
"dest_warp_id": "12"
},
{
"x": 6,
"y": 8,
"elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 12
"dest_warp_id": "12"
},
{
"x": 1,
"y": 6,
"elevation": 4,
"dest_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

6
data/maps/BattleFrontier_PokemonCenter_2F/map.json
View File

@ -73,21 +73,21 @@
"y": 6,
"elevation": 4,
"dest_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 5,
"y": 1,
"elevation": 3,
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 9,
"y": 1,
"elevation": 3,
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

4
data/maps/BattleFrontier_RankingHall/map.json
View File

@ -60,14 +60,14 @@
"y": 14,
"elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 4
"dest_warp_id": "4"
},
{
"x": 27,
"y": 14,
"elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 4
"dest_warp_id": "4"
}
],
"coord_events": [],

4
data/maps/BattleFrontier_ReceptionGate/map.json
View File

@ -86,14 +86,14 @@
"y": 13,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 8
"dest_warp_id": "8"
},
{
"x": 4,
"y": 1,
"elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 9
"dest_warp_id": "9"
}
],
"coord_events": [],

4
data/maps/BattleFrontier_ScottsHouse/map.json
View File

@ -34,14 +34,14 @@
"y": 7,
"elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 5
"dest_warp_id": "5"
},
{
"x": 3,
"y": 7,
"elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 5
"dest_warp_id": "5"
}
],
"coord_events": [],

2
data/maps/BirthIsland_Exterior/map.json
View File

@ -47,7 +47,7 @@
"y": 24,
"elevation": 0,
"dest_map": "MAP_BIRTH_ISLAND_HARBOR",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

2
data/maps/BirthIsland_Harbor/map.json
View File

@ -47,7 +47,7 @@
"y": 2,
"elevation": 0,
"dest_map": "MAP_BIRTH_ISLAND_EXTERIOR",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

4
data/maps/CaveOfOrigin_1F/map.json
View File

@ -20,14 +20,14 @@
"y": 17,
"elevation": 3,
"dest_map": "MAP_CAVE_OF_ORIGIN_ENTRANCE",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 14,
"y": 5,
"elevation": 3,
"dest_map": "MAP_CAVE_OF_ORIGIN_B1F",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

2
data/maps/CaveOfOrigin_B1F/map.json
View File

@ -34,7 +34,7 @@
"y": 3,
"elevation": 3,
"dest_map": "MAP_CAVE_OF_ORIGIN_1F",
"dest_warp_id": 1
"dest_warp_id": "1"
}
],
"coord_events": [],

4
data/maps/CaveOfOrigin_Entrance/map.json
View File

@ -20,14 +20,14 @@
"y": 20,
"elevation": 3,
"dest_map": "MAP_SOOTOPOLIS_CITY",
"dest_warp_id": 3
"dest_warp_id": "3"
},
{
"x": 9,
"y": 5,
"elevation": 3,
"dest_map": "MAP_CAVE_OF_ORIGIN_1F",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

4
data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json
View File

@ -20,14 +20,14 @@
"y": 5,
"elevation": 3,
"dest_map": "MAP_CAVE_OF_ORIGIN_1F",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 5,
"y": 11,
"elevation": 3,
"dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

4
data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json
View File

@ -20,14 +20,14 @@
"y": 10,
"elevation": 3,
"dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 8,
"y": 14,
"elevation": 3,
"dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

4
data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json
View File

@ -20,14 +20,14 @@
"y": 14,
"elevation": 3,
"dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 12,
"y": 6,
"elevation": 3,
"dest_map": "MAP_CAVE_OF_ORIGIN_B1F",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

6
data/maps/DesertRuins/map.json
View File

@ -34,21 +34,21 @@
"y": 29,
"elevation": 3,
"dest_map": "MAP_ROUTE111",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 8,
"y": 20,
"elevation": 0,
"dest_map": "MAP_DESERT_RUINS",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 8,
"y": 11,
"elevation": 3,
"dest_map": "MAP_DESERT_RUINS",
"dest_warp_id": 1
"dest_warp_id": "1"
}
],
"coord_events": [],

2
data/maps/DesertUnderpass/map.json
View File

@ -34,7 +34,7 @@
"y": 12,
"elevation": 0,
"dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL",
"dest_warp_id": 2
"dest_warp_id": "2"
}
],
"coord_events": [],

18
data/maps/DewfordTown/map.json
View File

@ -14,14 +14,14 @@
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": [
{
"direction": "up",
"map": "MAP_ROUTE106",
"offset": -60,
"map": "MAP_ROUTE106"
"direction": "up"
},
{
"direction": "right",
"map": "MAP_ROUTE107",
"offset": 0,
"map": "MAP_ROUTE107"
"direction": "right"
}
],
"object_events": [
@ -97,35 +97,35 @@
"y": 3,
"elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN_HALL",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 2,
"y": 10,
"elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 8,
"y": 17,
"elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN_GYM",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 17,
"y": 14,
"elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN_HOUSE1",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 8,
"y": 8,
"elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN_HOUSE2",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

4
data/maps/DewfordTown_Gym/map.json
View File

@ -125,14 +125,14 @@
"y": 27,
"elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 6,
"y": 27,
"elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN",
"dest_warp_id": 2
"dest_warp_id": "2"
}
],
"coord_events": [],

4
data/maps/DewfordTown_Hall/map.json
View File

@ -138,14 +138,14 @@
"y": 8,
"elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 6,
"y": 8,
"elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

4
data/maps/DewfordTown_House1/map.json
View File

@ -60,14 +60,14 @@
"y": 7,
"elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN",
"dest_warp_id": 3
"dest_warp_id": "3"
},
{
"x": 4,
"y": 7,
"elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN",
"dest_warp_id": 3
"dest_warp_id": "3"
}
],
"coord_events": [],

4
data/maps/DewfordTown_House2/map.json
View File

@ -47,14 +47,14 @@
"y": 8,
"elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN",
"dest_warp_id": 4
"dest_warp_id": "4"
},
{
"x": 4,
"y": 8,
"elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN",
"dest_warp_id": 4
"dest_warp_id": "4"
}
],
"coord_events": [],

6
data/maps/DewfordTown_PokemonCenter_1F/map.json
View File

@ -60,21 +60,21 @@
"y": 8,
"elevation": 3,
"dest_map": "MAP_DEWFORD_TOWN",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 6,
"y": 8,
"elevation": 3,
"dest_map": "MAP_DEWFORD_TOWN",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 1,
"y": 6,
"elevation": 4,
"dest_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

6
data/maps/DewfordTown_PokemonCenter_2F/map.json
View File

@ -73,21 +73,21 @@
"y": 6,
"elevation": 4,
"dest_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 5,
"y": 1,
"elevation": 3,
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 9,
"y": 1,
"elevation": 3,
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

12
data/maps/EverGrandeCity/map.json
View File

@ -14,9 +14,9 @@
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": [
{
"direction": "left",
"map": "MAP_ROUTE128",
"offset": 40,
"map": "MAP_ROUTE128"
"direction": "left"
}
],
"object_events": [],
@ -26,28 +26,28 @@
"y": 5,
"elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 27,
"y": 48,
"elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 18,
"y": 41,
"elevation": 0,
"dest_map": "MAP_VICTORY_ROAD_1F",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 18,
"y": 27,
"elevation": 0,
"dest_map": "MAP_VICTORY_ROAD_1F",
"dest_warp_id": 1
"dest_warp_id": "1"
}
],
"coord_events": [

4
data/maps/EverGrandeCity_ChampionsRoom/map.json
View File

@ -60,14 +60,14 @@
"y": 12,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_HALL4",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 6,
"y": 2,
"elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_HALL_OF_FAME",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

4
data/maps/EverGrandeCity_DrakesRoom/map.json
View File

@ -34,14 +34,14 @@
"y": 13,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_HALL3",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 6,
"y": 2,
"elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_HALL4",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

4
data/maps/EverGrandeCity_GlaciasRoom/map.json
View File

@ -34,14 +34,14 @@
"y": 13,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_HALL2",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 6,
"y": 2,
"elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_HALL3",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

8
data/maps/EverGrandeCity_Hall1/map.json
View File

@ -20,28 +20,28 @@
"y": 12,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 5,
"y": 2,
"elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 4,
"y": 12,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 6,
"y": 12,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM",
"dest_warp_id": 1
"dest_warp_id": "1"
}
],
"coord_events": [],

8
data/maps/EverGrandeCity_Hall2/map.json
View File

@ -20,28 +20,28 @@
"y": 12,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 5,
"y": 2,
"elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 4,
"y": 12,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 6,
"y": 12,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM",
"dest_warp_id": 1
"dest_warp_id": "1"
}
],
"coord_events": [],

8
data/maps/EverGrandeCity_Hall3/map.json
View File

@ -20,28 +20,28 @@
"y": 12,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 5,
"y": 2,
"elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 4,
"y": 12,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 6,
"y": 12,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM",
"dest_warp_id": 1
"dest_warp_id": "1"
}
],
"coord_events": [],

4
data/maps/EverGrandeCity_Hall4/map.json
View File

@ -20,14 +20,14 @@
"y": 33,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 5,
"y": 2,
"elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

8
data/maps/EverGrandeCity_Hall5/map.json
View File

@ -20,28 +20,28 @@
"y": 12,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 5,
"y": 2,
"elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 4,
"y": 12,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 6,
"y": 12,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F",
"dest_warp_id": 2
"dest_warp_id": "2"
}
],
"coord_events": [],

2
data/maps/EverGrandeCity_HallOfFame/map.json
View File

@ -34,7 +34,7 @@
"y": 11,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM",
"dest_warp_id": 1
"dest_warp_id": "1"
}
],
"coord_events": [],

4
data/maps/EverGrandeCity_PhoebesRoom/map.json
View File

@ -34,14 +34,14 @@
"y": 13,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_HALL1",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 6,
"y": 2,
"elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_HALL2",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

6
data/maps/EverGrandeCity_PokemonCenter_1F/map.json
View File

@ -73,21 +73,21 @@
"y": 8,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 6,
"y": 8,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 1,
"y": 6,
"elevation": 4,
"dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

6
data/maps/EverGrandeCity_PokemonCenter_2F/map.json
View File

@ -73,21 +73,21 @@
"y": 6,
"elevation": 4,
"dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 5,
"y": 1,
"elevation": 3,
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 9,
"y": 1,
"elevation": 3,
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

10
data/maps/EverGrandeCity_PokemonLeague_1F/map.json
View File

@ -73,35 +73,35 @@
"y": 11,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 10,
"y": 11,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 9,
"y": 1,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_HALL5",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 10,
"y": 1,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_HALL5",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 1,
"y": 7,
"elevation": 4,
"dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

6
data/maps/EverGrandeCity_PokemonLeague_2F/map.json
View File

@ -73,21 +73,21 @@
"y": 6,
"elevation": 4,
"dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F",
"dest_warp_id": 4
"dest_warp_id": "4"
},
{
"x": 5,
"y": 1,
"elevation": 3,
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 9,
"y": 1,
"elevation": 3,
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

4
data/maps/EverGrandeCity_SidneysRoom/map.json
View File

@ -34,14 +34,14 @@
"y": 13,
"elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_HALL5",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 6,
"y": 2,
"elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_HALL1",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

18
data/maps/FallarborTown/map.json
View File

@ -14,14 +14,14 @@
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": [
{
"direction": "left",
"map": "MAP_ROUTE114",
"offset": 0,
"map": "MAP_ROUTE114"
"direction": "left"
},
{
"direction": "right",
"map": "MAP_ROUTE113",
"offset": 0,
"map": "MAP_ROUTE113"
"direction": "right"
}
],
"object_events": [
@ -84,35 +84,35 @@
"y": 15,
"elevation": 0,
"dest_map": "MAP_FALLARBOR_TOWN_MART",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 8,
"y": 7,
"elevation": 0,
"dest_map": "MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 14,
"y": 7,
"elevation": 0,
"dest_map": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 6,
"y": 17,
"elevation": 0,
"dest_map": "MAP_FALLARBOR_TOWN_COZMOS_HOUSE",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 1,
"y": 6,
"elevation": 0,
"dest_map": "MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

4
data/maps/FallarborTown_BattleTentLobby/map.json
View File

@ -86,14 +86,14 @@
"y": 9,
"elevation": 0,
"dest_map": "MAP_FALLARBOR_TOWN",
"dest_warp_id": 1
"dest_warp_id": "1"
},
{
"x": 7,
"y": 9,
"elevation": 0,
"dest_map": "MAP_FALLARBOR_TOWN",
"dest_warp_id": 1
"dest_warp_id": "1"
}
],
"coord_events": [],

4
data/maps/FallarborTown_CozmosHouse/map.json
View File

@ -47,14 +47,14 @@
"y": 8,
"elevation": 0,
"dest_map": "MAP_FALLARBOR_TOWN",
"dest_warp_id": 3
"dest_warp_id": "3"
},
{
"x": 4,
"y": 8,
"elevation": 0,
"dest_map": "MAP_FALLARBOR_TOWN",
"dest_warp_id": 3
"dest_warp_id": "3"
}
],
"coord_events": [],

4
data/maps/FallarborTown_Mart/map.json
View File

@ -86,14 +86,14 @@
"y": 7,
"elevation": 0,
"dest_map": "MAP_FALLARBOR_TOWN",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 4,
"y": 7,
"elevation": 0,
"dest_map": "MAP_FALLARBOR_TOWN",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

4
data/maps/FallarborTown_MoveRelearnersHouse/map.json
View File

@ -34,14 +34,14 @@
"y": 7,
"elevation": 0,
"dest_map": "MAP_FALLARBOR_TOWN",
"dest_warp_id": 4
"dest_warp_id": "4"
},
{
"x": 4,
"y": 7,
"elevation": 0,
"dest_map": "MAP_FALLARBOR_TOWN",
"dest_warp_id": 4
"dest_warp_id": "4"
}
],
"coord_events": [],

6
data/maps/FallarborTown_PokemonCenter_1F/map.json
View File

@ -73,21 +73,21 @@
"y": 8,
"elevation": 3,
"dest_map": "MAP_FALLARBOR_TOWN",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 6,
"y": 8,
"elevation": 3,
"dest_map": "MAP_FALLARBOR_TOWN",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 1,
"y": 6,
"elevation": 4,
"dest_map": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

6
data/maps/FallarborTown_PokemonCenter_2F/map.json
View File

@ -73,21 +73,21 @@
"y": 6,
"elevation": 4,
"dest_map": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F",
"dest_warp_id": 2
"dest_warp_id": "2"
},
{
"x": 5,
"y": 1,
"elevation": 3,
"dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 9,
"y": 1,
"elevation": 3,
"dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0
"dest_warp_id": "0"
}
],
"coord_events": [],

10
data/maps/FarawayIsland_Entrance/map.json
View File

@ -47,14 +47,14 @@
"y": 7,
"elevation": 3,
"dest_map": "MAP_FARAWAY_ISLAND_INTERIOR",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 23,
"y": 7,
"elevation": 3,
"dest_map": "MAP_FARAWAY_ISLAND_INTERIOR",
"dest_warp_id": 1
"dest_warp_id": "1"
}
],
"coord_events": [
@ -63,7 +63,7 @@
"x": 9,
"y": 18,
"elevation": 3,
"var": "0",
"var": "TRIGGER_RUN_IMMEDIATELY",
"var_value": "0",
"script": "FarawayIsland_Entrance_EventScript_SetCloudsWeather"
},
@ -72,7 +72,7 @@
"x": 10,
"y": 20,
"elevation": 3,
"var": "0",
"var": "TRIGGER_RUN_IMMEDIATELY",
"var_value": "0",
"script": "FarawayIsland_Entrance_EventScript_ClearWeather"
},
@ -81,7 +81,7 @@
"x": 22,
"y": 9,
"elevation": 3,
"var": "0",
"var": "TRIGGER_RUN_IMMEDIATELY",
"var_value": "0",
"script": "FarawayIsland_Entrance_EventScript_SetCloudsWeather"
}

4
data/maps/FarawayIsland_Interior/map.json
View File

@ -34,14 +34,14 @@
"y": 19,
"elevation": 0,
"dest_map": "MAP_FARAWAY_ISLAND_ENTRANCE",
"dest_warp_id": 0
"dest_warp_id": "0"
},
{
"x": 13,
"y": 19,
"elevation": 0,
"dest_map": "MAP_FARAWAY_ISLAND_ENTRANCE",
"dest_warp_id": 1
"dest_warp_id": "1"
}
],
"coord_events": [],

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