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

Merge branch 'master' into sync_battle_anim_args

Browse Source
This commit is contained in:
GriffinR
2023-01-18 11:47:33 -05:00
committed by GitHub
parent ff936c15e1 ff3168f6cc
commit 5a906c33ac
1389 changed files with 53271 additions and 56302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1012
data/battle_ai_scripts.s
View File

File diff suppressed because it is too large Load Diff

566
data/battle_anim_scripts.s
View File

File diff suppressed because it is too large Load Diff

98
data/battle_scripts_1.s
View File

@@ -1,6 +1,7 @@
#include "constants/global.h"
#include "constants/battle.h"
#include "constants/pokemon.h"
#include "constants/battle_arena.h"
#include "constants/battle_script_commands.h"
#include "constants/battle_anim.h"
#include "constants/battle_string_ids.h"
@@ -14,7 +15,7 @@
.include "constants/constants.inc"
.section script_data, "aw", %progbits
.align 2
gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectHit @ EFFECT_HIT
@@ -374,7 +375,8 @@ BattleScript_EffectExplosion::
attackcanceler
attackstring
ppreduce
faintifabilitynotdamp
@ Below jumps to BattleScript_DampStopsExplosion if it fails (only way it can)
tryexplosion
setatkhptozero
waitstate
jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_ExplosionDoAnimStartLoop
@@ -489,7 +491,7 @@ BattleScript_EffectStatUp::
BattleScript_EffectStatUpAfterAtkCanceler::
attackstring
ppreduce
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_StatUpEnd
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_StatUpEnd
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_StatUpAttackAnim
pause B_WAIT_TIME_SHORT
goto BattleScript_StatUpPrintString
@@ -535,7 +537,7 @@ BattleScript_EffectStatDown::
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_StatDownEnd
statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_StatDownEnd
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_StatDownDoAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_StatDownEnd
pause B_WAIT_TIME_SHORT
@@ -1491,17 +1493,17 @@ BattleScript_CurseTrySpeed::
attackanimation
waitanimation
setstatchanger STAT_SPEED, 1, TRUE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CurseTryAttack
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CurseTryAttack
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CurseTryAttack::
setstatchanger STAT_ATK, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CurseTryDefense
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CurseTryDefense
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CurseTryDefense::
setstatchanger STAT_DEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CurseEnd
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CurseEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CurseEnd::
@@ -1613,7 +1615,7 @@ BattleScript_EffectSwagger::
attackanimation
waitanimation
setstatchanger STAT_ATK, 2, FALSE
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_SwaggerTryConfuse
statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_SwaggerTryConfuse
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_SwaggerTryConfuse
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -1812,7 +1814,7 @@ BattleScript_EffectSkullBash::
setbyte sTWOTURN_STRINGID, B_MSG_TURN1_SKULL_BASH
call BattleScriptFirstChargingTurn
setstatchanger STAT_DEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_SkullBashEnd
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_SkullBashEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_SkullBashEnd
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -1926,8 +1928,8 @@ BattleScript_EffectTeleport::
ppreduce
jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_ButItFailed
getifcantrunfrombattle BS_ATTACKER
jumpifbyte CMP_EQUAL, gBattleCommunication, 1, BattleScript_ButItFailed
jumpifbyte CMP_EQUAL, gBattleCommunication, 2, BattleScript_PrintAbilityMadeIneffective
jumpifbyte CMP_EQUAL, gBattleCommunication, BATTLE_RUN_FORBIDDEN, BattleScript_ButItFailed
jumpifbyte CMP_EQUAL, gBattleCommunication, BATTLE_RUN_FAILURE, BattleScript_PrintAbilityMadeIneffective
attackanimation
waitanimation
printstring STRINGID_PKMNFLEDFROMBATTLE
@@ -2015,7 +2017,7 @@ BattleScript_EffectDefenseCurl::
ppreduce
setdefensecurlbit
setstatchanger STAT_DEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_DefenseCurlDoStatUpAnim
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_DefenseCurlDoStatUpAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_StatUpPrintString
attackanimation
waitanimation
@@ -2156,7 +2158,7 @@ BattleScript_EffectFlatter::
attackanimation
waitanimation
setstatchanger STAT_SPATK, 1, FALSE
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_FlatterTryConfuse
statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_FlatterTryConfuse
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_FlatterTryConfuse
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -2201,10 +2203,10 @@ BattleScript_AlreadyBurned::
BattleScript_EffectMemento::
attackcanceler
jumpifbyte CMP_EQUAL, cMISS_TYPE, B_MSG_PROTECTED, BattleScript_MementoFailProtect
jumpifbyte CMP_EQUAL, cMISS_TYPE, B_MSG_PROTECTED, BattleScript_MementoTargetProtect
attackstring
ppreduce
jumpifattackandspecialattackcannotfall BattleScript_ButItFailed
trymemento BattleScript_ButItFailed
setatkhptozero
attackanimation
waitanimation
@@ -2213,16 +2215,16 @@ BattleScript_EffectMemento::
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO | STAT_CHANGE_MULTIPLE_STATS
playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO
setstatchanger STAT_ATK, 2, TRUE
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectMementoTrySpAtk
@ Greater than STAT_FELL is checking if the stat cannot decrease
statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectMementoTrySpAtk
@ Greater than B_MSG_DEFENDER_STAT_FELL is checking if the stat cannot decrease
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_FELL, BattleScript_EffectMementoTrySpAtk
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectMementoTrySpAtk:
playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO
setstatchanger STAT_SPATK, 2, TRUE
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectMementoTryFaint
@ Greater than STAT_FELL is checking if the stat cannot decrease
statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectMementoTryFaint
@ Greater than B_MSG_DEFENDER_STAT_FELL is checking if the stat cannot decrease
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_FELL, BattleScript_EffectMementoTryFaint
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
@@ -2233,11 +2235,12 @@ BattleScript_EffectMementoPrintNoEffect:
printstring STRINGID_BUTNOEFFECT
waitmessage B_WAIT_TIME_LONG
goto BattleScript_EffectMementoTryFaint
BattleScript_MementoFailProtect:
@ If the target is protected there's no need to check the target's stats or animate, the user will just faint
BattleScript_MementoTargetProtect:
attackstring
ppreduce
jumpifattackandspecialattackcannotfall BattleScript_MementoFailEnd
BattleScript_MementoFailEnd:
trymemento BattleScript_MementoTargetProtectEnd
BattleScript_MementoTargetProtectEnd:
setatkhptozero
pause B_WAIT_TIME_LONG
effectivenesssound
@@ -2660,14 +2663,14 @@ BattleScript_TickleDoMoveAnim::
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_DEF, STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE
setstatchanger STAT_ATK, 1, TRUE
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_TickleTryLowerDef
statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TickleTryLowerDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_TickleTryLowerDef
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_TickleTryLowerDef::
playstatchangeanimation BS_TARGET, BIT_DEF, STAT_CHANGE_NEGATIVE
setstatchanger STAT_DEF, 1, TRUE
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_TickleEnd
statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TickleEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_TickleEnd
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
@@ -2693,13 +2696,13 @@ BattleScript_CosmicPowerDoMoveAnim::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, 0
setstatchanger STAT_DEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CosmicPowerTrySpDef
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CosmicPowerTrySpDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CosmicPowerTrySpDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CosmicPowerTrySpDef::
setstatchanger STAT_SPDEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CosmicPowerEnd
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CosmicPowerEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CosmicPowerEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -2722,13 +2725,13 @@ BattleScript_BulkUpDoMoveAnim::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF, 0
setstatchanger STAT_ATK, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_BulkUpTryDef
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_BulkUpTryDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_BulkUpTryDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_BulkUpTryDef::
setstatchanger STAT_DEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_BulkUpEnd
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_BulkUpEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_BulkUpEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -2747,13 +2750,13 @@ BattleScript_CalmMindDoMoveAnim::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_SPDEF, 0
setstatchanger STAT_SPATK, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CalmMindTrySpDef
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CalmMindTrySpDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CalmMindTrySpDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CalmMindTrySpDef::
setstatchanger STAT_SPDEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_CalmMindEnd
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CalmMindEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CalmMindEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -2779,13 +2782,13 @@ BattleScript_DragonDanceDoMoveAnim::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_SPEED, 0
setstatchanger STAT_ATK, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_DragonDanceTrySpeed
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_DragonDanceTrySpeed
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_DragonDanceTrySpeed
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_DragonDanceTrySpeed::
setstatchanger STAT_SPEED, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_DragonDanceEnd
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_DragonDanceEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_DragonDanceEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -2823,7 +2826,7 @@ BattleScript_GiveExp::
setbyte sGIVEEXP_STATE, 0
getexp BS_TARGET
end2
BattleScript_HandleFaintedMon::
checkteamslost BattleScript_LinkHandleFaintedMonMultiple
jumpifbyte CMP_NOT_EQUAL, gBattleOutcome, 0, BattleScript_FaintedMonEnd
@@ -3456,27 +3459,27 @@ BattleScript_AllStatsUpAtk::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_SPEED | BIT_SPATK | BIT_SPDEF, 0
setstatchanger STAT_ATK, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpDef
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AllStatsUpDef::
setstatchanger STAT_DEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpSpeed
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpSpeed
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AllStatsUpSpeed::
setstatchanger STAT_SPEED, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpSpAtk
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpSpAtk
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AllStatsUpSpAtk::
setstatchanger STAT_SPATK, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpSpDef
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpSpDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AllStatsUpSpDef::
setstatchanger STAT_SPDEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_AllStatsUpRet
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpRet
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AllStatsUpRet::
@@ -3623,14 +3626,14 @@ BattleScript_AtkDefDown::
playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_ATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
playstatchangeanimation BS_ATTACKER, BIT_ATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
setstatchanger STAT_ATK, 1, TRUE
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_AtkDefDown_TryDef
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_AtkDefDown_TryDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_AtkDefDown_TryDef
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AtkDefDown_TryDef::
playstatchangeanimation BS_ATTACKER, BIT_DEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
setstatchanger STAT_DEF, 1, TRUE
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_AtkDefDown_End
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_AtkDefDown_End
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_AtkDefDown_End
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
@@ -3696,7 +3699,7 @@ BattleScript_SAtkDown2::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_SPATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO
setstatchanger STAT_SPATK, 2, TRUE
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_SAtkDown2End
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_SAtkDown2End
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_SAtkDown2End
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
@@ -4027,7 +4030,7 @@ BattleScript_IntimidateActivatesLoop:
jumpifability BS_TARGET, ABILITY_CLEAR_BODY, BattleScript_IntimidatePrevented
jumpifability BS_TARGET, ABILITY_HYPER_CUTTER, BattleScript_IntimidatePrevented
jumpifability BS_TARGET, ABILITY_WHITE_SMOKE, BattleScript_IntimidatePrevented
statbuffchange STAT_BUFF_NOT_PROTECT_AFFECTED | STAT_BUFF_ALLOW_PTR, BattleScript_IntimidateActivatesLoopIncrement
statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_ALLOW_PTR, BattleScript_IntimidateActivatesLoopIncrement
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 1, BattleScript_IntimidateActivatesLoopIncrement
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -4043,7 +4046,7 @@ BattleScript_IntimidatePrevented:
printstring STRINGID_PREVENTEDFROMWORKING
waitmessage B_WAIT_TIME_LONG
goto BattleScript_IntimidateActivatesLoopIncrement
BattleScript_DroughtActivates::
pause B_WAIT_TIME_SHORT
printstring STRINGID_PKMNSXINTENSIFIEDSUN
@@ -4406,7 +4409,7 @@ BattleScript_BerryConfuseHealEnd2::
BattleScript_BerryStatRaiseEnd2::
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_BerryStatRaiseDoStatUp
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_BerryStatRaiseDoStatUp
BattleScript_BerryStatRaiseDoStatUp::
setbyte cMULTISTRING_CHOOSER, B_MSG_STAT_ROSE_ITEM
call BattleScript_StatUp
@@ -4480,7 +4483,7 @@ BattleScript_ArenaDoJudgment::
arenajudgmentstring B_MSG_REF_THATS_IT
arenawaitmessage B_MSG_REF_THATS_IT
pause B_WAIT_TIME_LONG
setbyte gBattleCommunication, 0
setbyte gBattleCommunication, 0 @ Reset state for arenajudgmentwindow
arenajudgmentwindow
pause B_WAIT_TIME_LONG
arenajudgmentwindow
@@ -4493,8 +4496,9 @@ BattleScript_ArenaDoJudgment::
arenajudgmentstring B_MSG_REF_JUDGE_BODY
arenawaitmessage B_MSG_REF_JUDGE_BODY
arenajudgmentwindow
jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 3, BattleScript_ArenaJudgmentPlayerLoses
jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 4, BattleScript_ArenaJudgmentDraw
jumpifbyte CMP_EQUAL, gBattleCommunication + 1, ARENA_RESULT_PLAYER_LOST, BattleScript_ArenaJudgmentPlayerLoses
jumpifbyte CMP_EQUAL, gBattleCommunication + 1, ARENA_RESULT_TIE, BattleScript_ArenaJudgmentDraw
@ ARENA_RESULT_PLAYER_WON
arenajudgmentstring B_MSG_REF_PLAYER_WON
arenawaitmessage B_MSG_REF_PLAYER_WON
arenajudgmentwindow

20
data/contest_ai_scripts.s
View File

@@ -435,11 +435,15 @@ AI_CGM_BetterWhenAudienceExcited:
AI_CGM_BetterWhenAudienceExcited_1stUp:
@ BUG: Should be if_appeal_num_eq 0
@ 1st up on 1st appeal excitement will always be 0
if_appeal_num_not_eq 0, AI_CGM_BetterWhenAudienceExcited_Not1stAppeal
.ifdef BUGFIX
if_appeal_num_eq 0, AI_CGM_BetterWhenAudienceExcited_1stAppeal
.else
if_appeal_num_not_eq 0, AI_CGM_BetterWhenAudienceExcited_1stAppeal
.endif
if_excitement_eq 4, AI_CGM_BetterWhenAudienceExcited_1AwayFromMax
if_excitement_eq 3, AI_CGM_BetterWhenAudienceExcited_2AwayFromMax
end
AI_CGM_BetterWhenAudienceExcited_Not1stAppeal:
AI_CGM_BetterWhenAudienceExcited_1stAppeal:
if_random_less_than 125, AI_CGM_End
score -15
end
@@ -542,7 +546,11 @@ AI_CGM_TargetMonWithJudgesAttention:
end
AI_CGM_TargetMonWithJudgesAttention_CheckMon1:
if_cannot_participate MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
.ifdef BUGFIX
if_not_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
.else
if_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
.endif
if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
score +2
if_not_completed_combo MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
@@ -551,7 +559,11 @@ AI_CGM_TargetMonWithJudgesAttention_CheckMon1:
AI_CGM_TargetMonWithJudgesAttention_CheckMon2:
if_user_order_eq MON_2, AI_CGM_End
if_cannot_participate MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
.ifdef BUGFIX
if_not_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
.else
if_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
.endif
if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
score +2
if_not_completed_combo MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
@@ -560,7 +572,11 @@ AI_CGM_TargetMonWithJudgesAttention_CheckMon2:
AI_CGM_TargetMonWithJudgesAttention_CheckMon3:
if_user_order_eq MON_3, AI_CGM_End
if_cannot_participate MON_3, AI_CGM_End
.ifdef BUGFIX
if_not_used_combo_starter MON_3, AI_CGM_End
.else
if_used_combo_starter MON_3, AI_CGM_End
.endif
if_random_less_than 125, AI_CGM_End
score +2
if_not_completed_combo MON_3, AI_CGM_End

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": [],

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

@@ -51,7 +51,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18"
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM18"
},
{
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
@@ -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": [],

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

@@ -25,7 +25,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Room_B1F_EventScript_ItemTM13",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13"
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM13"
}
],
"warp_events": [
@@ -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": [],

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

@@ -5,6 +5,10 @@
.set LOCALID_PLAYER, 13
.set LOCALID_OPPONENT, 15
.set NO_DRAW, 0
.set DRAW_TRAINER, 1
.set DRAW_TUCKER, 2
BattleFrontier_BattleDomeBattleRoom_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleDomeBattleRoom_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeBattleRoom_OnFrame
@@ -12,10 +16,6 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeBattleRoom_OnResume
.byte 0
.set NO_DRAW, 0
.set DRAW_TRAINER, 1
.set DRAW_TUCKER, 2
BattleFrontier_BattleDomeBattleRoom_OnTransition:
dome_setopponentgfx
frontier_get FRONTIER_DATA_BATTLE_NUM

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": [],

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

@@ -472,8 +472,8 @@ BattleFrontier_BattlePalaceLobby_Text_FeatWillBeRecorded:
@ Unused
BattleFrontier_BattlePalaceLobby_Text_BattlePointsFor7WinStreak:
.string "For the feat of your 7-win streak,\n"
.string "we present you with Battle Point(s).$"
.string "For the feat of your 7-win streak,\n"
.string "we present you with Battle Point(s).$"
BattleFrontier_BattlePalaceLobby_Text_NoSpaceForPrize:
.string "You seem to have no space for\n"

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": [],

3
data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
View File

@@ -364,7 +364,8 @@ BattleFrontier_BattlePikeLobby_Text_AwardYouTheseBattlePoints2:
@ Unused
BattleFrontier_BattlePikeLobby_Text_ReachedBattlePointLimit:
.string "You appear to have reached the limit\n"
.string "for Battle Points…\pPlease exchange some Battle Points\n"
.string "for Battle Points…\p"
.string "Please exchange some Battle Points\n"
.string "for prizes, then return…$"
BattleFrontier_BattlePikeLobby_Text_FailedToSaveBeforeQuitting:

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": [],

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

@@ -411,7 +411,13 @@ BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeLinkMultisChallenge::
special LoadPlayerParty
closemessage
delay 2
@ The command tower_save ultimately calls TrySavingData(SAVE_LINK), which writes data in SaveBlock1 and SaveBlock2
@ to the flash, but not data in PokemonStorage. The SaveGame script that follows asks the player to do a full save,
@ which they can opt out of. As a result the player can save their party and quit without having saved the PC.
@ This allows players to clone pokemon and their held items by withdrawing them (or erase them by despositing).
.ifndef BUGFIX
tower_save 0
.endif
call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255
goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed
@@ -911,7 +917,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": [],

26
data/maps/BattleFrontier_Lounge2/scripts.inc
View File

@@ -22,18 +22,20 @@ BattleFrontier_Lounge2_EventScript_AlreadyMetManiac::
end
BattleFrontier_Lounge2_EventScript_GiveAdvice::
call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 0, BattleFrontier_Lounge2_EventScript_BufferSingle
call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 1, BattleFrontier_Lounge2_EventScript_BufferDouble
call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 2, BattleFrontier_Lounge2_EventScript_BufferMulti
call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 3, BattleFrontier_Lounge2_EventScript_BufferMultiLink
call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 4, BattleFrontier_Lounge2_EventScript_BufferBattleDome
call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 5, BattleFrontier_Lounge2_EventScript_BufferBattleFactory
call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 6, BattleFrontier_Lounge2_EventScript_BufferBattlePalace
call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 7, BattleFrontier_Lounge2_EventScript_BufferBattleArena
call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 8, BattleFrontier_Lounge2_EventScript_BufferBattlePike
call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 9, BattleFrontier_Lounge2_EventScript_BufferBattlePyramid
call_if_le VAR_FRONTIER_MANIAC_FACILITY, 3, BattleFrontier_Lounge2_EventScript_BattleTowerNews
call_if_ge VAR_FRONTIER_MANIAC_FACILITY, 4, BattleFrontier_Lounge2_EventScript_FacilityNews
call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_TOWER_SINGLES, BattleFrontier_Lounge2_EventScript_BufferSingle
call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_TOWER_DOUBLES, BattleFrontier_Lounge2_EventScript_BufferDouble
call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_TOWER_MULTIS, BattleFrontier_Lounge2_EventScript_BufferMulti
call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_TOWER_LINK, BattleFrontier_Lounge2_EventScript_BufferMultiLink
call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_DOME, BattleFrontier_Lounge2_EventScript_BufferBattleDome
call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_FACTORY, BattleFrontier_Lounge2_EventScript_BufferBattleFactory
call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_PALACE, BattleFrontier_Lounge2_EventScript_BufferBattlePalace
call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_ARENA, BattleFrontier_Lounge2_EventScript_BufferBattleArena
call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_PIKE, BattleFrontier_Lounge2_EventScript_BufferBattlePike
call_if_eq VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_PYRAMID, BattleFrontier_Lounge2_EventScript_BufferBattlePyramid
@ <= FRONTIER_MANIAC_TOWER_LINK is any Battle Tower mode
call_if_le VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_TOWER_LINK, BattleFrontier_Lounge2_EventScript_BattleTowerNews
@ >= FRONTIER_MANIAC_DOME is any facility other than Battle Tower
call_if_ge VAR_FRONTIER_MANIAC_FACILITY, FRONTIER_MANIAC_DOME, BattleFrontier_Lounge2_EventScript_FacilityNews
special ShowFrontierManiacMessage
waitmessage
waitbuttonpress

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_ChampionsRoom/scripts.inc
View File

@@ -33,8 +33,8 @@ EverGrandeCity_ChampionsRoom_EventScript_EnterRoom::
waitmovement 0
setvar VAR_TEMP_1, 1
goto EverGrandeCity_ChampionsRoom_EventScript_Wallace
releaseall
end
releaseall
end
EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace:
walk_up

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": [],

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