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

Merge branch 'master' into pokeball-doc

Browse Source
This commit is contained in:
hondew
2020-08-30 14:14:38 -04:00
parent 328aecc96e a9719c92bf
commit e46b35455d
1455 changed files with 29665 additions and 29517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
data/battle_ai_scripts.s
View File

@@ -249,64 +249,64 @@ AI_CBM_BellyDrum: @ 82DC341
if_hp_less_than AI_USER, 51, Score_Minus10
AI_CBM_AttackUp: @ 82DC348
if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_ATK, MAX_STAT_STAGE, Score_Minus10
end
AI_CBM_DefenseUp: @ 82DC351
if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_DEF, MAX_STAT_STAGE, Score_Minus10
end
AI_CBM_SpeedUp: @ 82DC35A
if_stat_level_equal AI_USER, STAT_SPEED, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_SPEED, MAX_STAT_STAGE, Score_Minus10
end
AI_CBM_SpAtkUp: @ 82DC363
if_stat_level_equal AI_USER, STAT_SPATK, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_SPATK, MAX_STAT_STAGE, Score_Minus10
end
AI_CBM_SpDefUp: @ 82DC36C
if_stat_level_equal AI_USER, STAT_SPDEF, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_SPDEF, MAX_STAT_STAGE, Score_Minus10
end
AI_CBM_AccUp: @ 82DC375
if_stat_level_equal AI_USER, STAT_ACC, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_ACC, MAX_STAT_STAGE, Score_Minus10
end
AI_CBM_EvasionUp: @ 82DC37E
if_stat_level_equal AI_USER, STAT_EVASION, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_EVASION, MAX_STAT_STAGE, Score_Minus10
end
AI_CBM_AttackDown: @ 82DC387
if_stat_level_equal AI_TARGET, STAT_ATK, 0, Score_Minus10
if_stat_level_equal AI_TARGET, STAT_ATK, MIN_STAT_STAGE, Score_Minus10
get_ability AI_TARGET
if_equal ABILITY_HYPER_CUTTER, Score_Minus10
goto CheckIfAbilityBlocksStatChange
AI_CBM_DefenseDown: @ 82DC39C
if_stat_level_equal AI_TARGET, STAT_DEF, 0, Score_Minus10
if_stat_level_equal AI_TARGET, STAT_DEF, MIN_STAT_STAGE, Score_Minus10
goto CheckIfAbilityBlocksStatChange
AI_CBM_SpeedDown: @ 82DC3A9
if_stat_level_equal AI_TARGET, STAT_SPEED, 0, Score_Minus10
if_stat_level_equal AI_TARGET, STAT_SPEED, MIN_STAT_STAGE, Score_Minus10
if_ability AI_TARGET, ABILITY_SPEED_BOOST, Score_Minus10
goto CheckIfAbilityBlocksStatChange
AI_CBM_SpAtkDown: @ 82DC3BF
if_stat_level_equal AI_TARGET, STAT_SPATK, 0, Score_Minus10
if_stat_level_equal AI_TARGET, STAT_SPATK, MIN_STAT_STAGE, Score_Minus10
goto CheckIfAbilityBlocksStatChange
AI_CBM_SpDefDown: @ 82DC3CC
if_stat_level_equal AI_TARGET, STAT_SPDEF, 0, Score_Minus10
if_stat_level_equal AI_TARGET, STAT_SPDEF, MIN_STAT_STAGE, Score_Minus10
goto CheckIfAbilityBlocksStatChange
AI_CBM_AccDown: @ 82DC3D9
if_stat_level_equal AI_TARGET, STAT_ACC, 0, Score_Minus10
if_stat_level_equal AI_TARGET, STAT_ACC, MIN_STAT_STAGE, Score_Minus10
get_ability AI_TARGET
if_equal ABILITY_KEEN_EYE, Score_Minus10
goto CheckIfAbilityBlocksStatChange
AI_CBM_EvasionDown: @ 82DC3EE
if_stat_level_equal AI_TARGET, STAT_EVASION, 0, Score_Minus10
if_stat_level_equal AI_TARGET, STAT_EVASION, MIN_STAT_STAGE, Score_Minus10
CheckIfAbilityBlocksStatChange: @ 82DC3F6
get_ability AI_TARGET
@@ -315,20 +315,20 @@ CheckIfAbilityBlocksStatChange: @ 82DC3F6
end
AI_CBM_Haze: @ 82DC405
if_stat_level_less_than AI_USER, STAT_ATK, 6, AI_CBM_Haze_End
if_stat_level_less_than AI_USER, STAT_DEF, 6, AI_CBM_Haze_End
if_stat_level_less_than AI_USER, STAT_SPEED, 6, AI_CBM_Haze_End
if_stat_level_less_than AI_USER, STAT_SPATK, 6, AI_CBM_Haze_End
if_stat_level_less_than AI_USER, STAT_SPDEF, 6, AI_CBM_Haze_End
if_stat_level_less_than AI_USER, STAT_ACC, 6, AI_CBM_Haze_End
if_stat_level_less_than AI_USER, STAT_EVASION, 6, AI_CBM_Haze_End
if_stat_level_more_than AI_TARGET, STAT_ATK, 6, AI_CBM_Haze_End
if_stat_level_more_than AI_TARGET, STAT_DEF, 6, AI_CBM_Haze_End
if_stat_level_more_than AI_TARGET, STAT_SPEED, 6, AI_CBM_Haze_End
if_stat_level_more_than AI_TARGET, STAT_SPATK, 6, AI_CBM_Haze_End
if_stat_level_more_than AI_TARGET, STAT_SPDEF, 6, AI_CBM_Haze_End
if_stat_level_more_than AI_TARGET, STAT_ACC, 6, AI_CBM_Haze_End
if_stat_level_more_than AI_TARGET, STAT_EVASION, 6, AI_CBM_Haze_End
if_stat_level_less_than AI_USER, STAT_ATK, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
if_stat_level_less_than AI_USER, STAT_DEF, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
if_stat_level_less_than AI_USER, STAT_SPEED, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
if_stat_level_less_than AI_USER, STAT_SPATK, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
if_stat_level_less_than AI_USER, STAT_SPDEF, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
if_stat_level_less_than AI_USER, STAT_ACC, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
if_stat_level_less_than AI_USER, STAT_EVASION, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
if_stat_level_more_than AI_TARGET, STAT_ATK, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
if_stat_level_more_than AI_TARGET, STAT_DEF, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
if_stat_level_more_than AI_TARGET, STAT_SPEED, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
if_stat_level_more_than AI_TARGET, STAT_SPATK, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
if_stat_level_more_than AI_TARGET, STAT_SPDEF, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
if_stat_level_more_than AI_TARGET, STAT_ACC, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
if_stat_level_more_than AI_TARGET, STAT_EVASION, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
goto Score_Minus10
AI_CBM_Haze_End: @ 82DC47A
@@ -436,8 +436,8 @@ AI_CBM_CantEscape: @ 82DC5B0
end
AI_CBM_Curse: @ 82DC5BB
if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus8
if_stat_level_equal AI_USER, STAT_ATK, MAX_STAT_STAGE, Score_Minus10
if_stat_level_equal AI_USER, STAT_DEF, MAX_STAT_STAGE, Score_Minus8
end
AI_CBM_Spikes: @ 82DC5CC
@@ -484,8 +484,8 @@ AI_CBM_Safeguard: @ 82DC635
end
AI_CBM_Memento: @ 82DC640
if_stat_level_equal AI_TARGET, STAT_ATK, 0, Score_Minus10
if_stat_level_equal AI_TARGET, STAT_SPATK, 0, Score_Minus8
if_stat_level_equal AI_TARGET, STAT_ATK, MIN_STAT_STAGE, Score_Minus10
if_stat_level_equal AI_TARGET, STAT_SPATK, MIN_STAT_STAGE, Score_Minus8
AI_CBM_BatonPass: @ 82DC650
count_usable_party_mons AI_USER
@@ -574,18 +574,18 @@ AI_CBM_MudSport: @ 82DC71E
end
AI_CBM_Tickle: @ 82DC729
if_stat_level_equal AI_TARGET, STAT_ATK, 0, Score_Minus10
if_stat_level_equal AI_TARGET, STAT_DEF, 0, Score_Minus8
if_stat_level_equal AI_TARGET, STAT_ATK, MIN_STAT_STAGE, Score_Minus10
if_stat_level_equal AI_TARGET, STAT_DEF, MIN_STAT_STAGE, Score_Minus8
end
AI_CBM_CosmicPower: @ 82DC73A
if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_SPDEF, 12, Score_Minus8
if_stat_level_equal AI_USER, STAT_DEF, MAX_STAT_STAGE, Score_Minus10
if_stat_level_equal AI_USER, STAT_SPDEF, MAX_STAT_STAGE, Score_Minus8
end
AI_CBM_BulkUp: @ 82DC74B
if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus8
if_stat_level_equal AI_USER, STAT_ATK, MAX_STAT_STAGE, Score_Minus10
if_stat_level_equal AI_USER, STAT_DEF, MAX_STAT_STAGE, Score_Minus8
end
AI_CBM_WaterSport: @ 82DC75C
@@ -593,13 +593,13 @@ AI_CBM_WaterSport: @ 82DC75C
end
AI_CBM_CalmMind: @ 82DC767
if_stat_level_equal AI_USER, STAT_SPATK, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_SPDEF, 12, Score_Minus8
if_stat_level_equal AI_USER, STAT_SPATK, MAX_STAT_STAGE, Score_Minus10
if_stat_level_equal AI_USER, STAT_SPDEF, MAX_STAT_STAGE, Score_Minus8
end
AI_CBM_DragonDance: @ 82DC778
if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10
if_stat_level_equal AI_USER, STAT_SPEED, 12, Score_Minus8
if_stat_level_equal AI_USER, STAT_ATK, MAX_STAT_STAGE, Score_Minus10
if_stat_level_equal AI_USER, STAT_SPEED, MAX_STAT_STAGE, Score_Minus8
end
Score_Minus1:
@@ -1101,7 +1101,7 @@ AI_CV_EvasionUp7:
AI_CV_EvasionUp8:
if_hp_more_than AI_USER, 70, AI_CV_EvasionUp_End
if_stat_level_equal AI_USER, STAT_EVASION, 6, AI_CV_EvasionUp_End
if_stat_level_equal AI_USER, STAT_EVASION, DEFAULT_STAT_STAGE, AI_CV_EvasionUp_End
if_hp_less_than AI_USER, 40, AI_CV_EvasionUp_ScoreDown2
if_hp_less_than AI_TARGET, 40, AI_CV_EvasionUp_ScoreDown2
if_random_less_than 70, AI_CV_EvasionUp_End
@@ -1130,7 +1130,7 @@ AI_CV_AlwaysHit_End:
end
AI_CV_AttackDown: @ 82DCDF8
if_stat_level_equal AI_TARGET, STAT_ATK, 6, AI_CV_AttackDown3
if_stat_level_equal AI_TARGET, STAT_ATK, DEFAULT_STAT_STAGE, AI_CV_AttackDown3
score -1
if_hp_more_than AI_USER, 90, AI_CV_AttackDown2
score -1
@@ -1198,7 +1198,7 @@ AI_CV_SpeedDown_End: @ 82DCE96
end
AI_CV_SpAtkDown:
if_stat_level_equal AI_TARGET, STAT_ATK, 6, AI_CV_SpAtkDown3
if_stat_level_equal AI_TARGET, STAT_ATK, DEFAULT_STAT_STAGE, AI_CV_SpAtkDown3
score -1
if_hp_more_than AI_USER, 90, AI_CV_SpAtkDown2
score -1
@@ -1284,7 +1284,7 @@ AI_CV_AccuracyDown7:
AI_CV_AccuracyDown8:
if_hp_more_than AI_USER, 70, AI_CV_AccuracyDown_End
if_stat_level_equal AI_TARGET, STAT_ACC, 6, AI_CV_AccuracyDown_End
if_stat_level_equal AI_TARGET, STAT_ACC, DEFAULT_STAT_STAGE, AI_CV_AccuracyDown_End
if_hp_less_than AI_USER, 40, AI_CV_AccuracyDown_ScoreDown2
if_hp_less_than AI_TARGET, 40, AI_CV_AccuracyDown_ScoreDown2
if_random_less_than 70, AI_CV_AccuracyDown_End
@@ -1997,7 +1997,7 @@ AI_CV_Curse2:
score +1
AI_CV_Curse3:
if_stat_level_more_than AI_USER, STAT_DEF, 6, AI_CV_Curse_End
if_stat_level_more_than AI_USER, STAT_DEF, DEFAULT_STAT_STAGE, AI_CV_Curse_End
if_random_less_than 128, AI_CV_Curse_End
score +1
goto AI_CV_Curse_End
@@ -2518,7 +2518,7 @@ AI_CV_ChangeSelfAbility_AbilitiesToEncourage:
AI_CV_Superpower:
if_type_effectiveness AI_EFFECTIVENESS_x0_25, AI_CV_Superpower_ScoreDown1
if_type_effectiveness AI_EFFECTIVENESS_x0_5, AI_CV_Superpower_ScoreDown1
if_stat_level_less_than AI_USER, STAT_ATK, 6, AI_CV_Superpower_ScoreDown1
if_stat_level_less_than AI_USER, STAT_ATK, DEFAULT_STAT_STAGE, AI_CV_Superpower_ScoreDown1
if_target_faster AI_CV_Superpower2
if_hp_more_than AI_USER, 40, AI_CV_Superpower_ScoreDown1
goto AI_CV_Superpower_End
@@ -2933,12 +2933,12 @@ sMovesTable_ProtectMoves:
AI_PreferBatonPass_EncourageIfHighStats:
get_turn_count
if_equal 0, Score_Minus2
if_stat_level_more_than AI_USER, STAT_ATK, 8, Score_Plus3
if_stat_level_more_than AI_USER, STAT_ATK, 7, Score_Plus2
if_stat_level_more_than AI_USER, STAT_ATK, 6, Score_Plus1
if_stat_level_more_than AI_USER, STAT_SPATK, 8, Score_Plus3
if_stat_level_more_than AI_USER, STAT_SPATK, 7, Score_Plus2
if_stat_level_more_than AI_USER, STAT_SPATK, 6, Score_Plus1
if_stat_level_more_than AI_USER, STAT_ATK, DEFAULT_STAT_STAGE + 2, Score_Plus3
if_stat_level_more_than AI_USER, STAT_ATK, DEFAULT_STAT_STAGE + 1, Score_Plus2
if_stat_level_more_than AI_USER, STAT_ATK, DEFAULT_STAT_STAGE, Score_Plus1
if_stat_level_more_than AI_USER, STAT_SPATK, DEFAULT_STAT_STAGE + 2, Score_Plus3
if_stat_level_more_than AI_USER, STAT_SPATK, DEFAULT_STAT_STAGE + 1, Score_Plus2
if_stat_level_more_than AI_USER, STAT_SPATK, DEFAULT_STAT_STAGE, Score_Plus1
end
AI_PreferBatonPassEnd:

2194
data/battle_anim_scripts.s
View File

File diff suppressed because it is too large Load Diff

88
data/battle_scripts_1.s
View File

@@ -798,7 +798,7 @@ BattleScript_KOFail::
BattleScript_EffectRazorWind::
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
setbyte sTWOTURN_STRINGID, 0x0
setbyte sTWOTURN_STRINGID, 0
call BattleScriptFirstChargingTurn
goto BattleScript_MoveEnd
@@ -1084,7 +1084,7 @@ BattleScript_EffectAccuracyDownHit::
BattleScript_EffectSkyAttack::
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
setbyte sTWOTURN_STRINGID, 0x3
setbyte sTWOTURN_STRINGID, 3
call BattleScriptFirstChargingTurn
goto BattleScript_MoveEnd
@@ -1504,9 +1504,9 @@ BattleScript_EffectCurse::
attackcanceler
attackstring
ppreduce
jumpifstat BS_ATTACKER, CMP_GREATER_THAN, STAT_SPEED, 0x0, BattleScript_CurseTrySpeed
jumpifstat BS_ATTACKER, CMP_NOT_EQUAL, STAT_ATK, 0xC, BattleScript_CurseTrySpeed
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, 0xC, BattleScript_ButItFailed
jumpifstat BS_ATTACKER, CMP_GREATER_THAN, STAT_SPEED, MIN_STAT_STAGE, BattleScript_CurseTrySpeed
jumpifstat BS_ATTACKER, CMP_NOT_EQUAL, STAT_ATK, MAX_STAT_STAGE, BattleScript_CurseTrySpeed
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, MAX_STAT_STAGE, BattleScript_ButItFailed
BattleScript_CurseTrySpeed::
copybyte gBattlerTarget, gBattlerAttacker
setbyte sB_ANIM_TURN, 0x1
@@ -1831,7 +1831,7 @@ BattleScript_EffectMirrorCoat::
BattleScript_EffectSkullBash::
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
setbyte sTWOTURN_STRINGID, 0x2
setbyte sTWOTURN_STRINGID, 2
call BattleScriptFirstChargingTurn
setstatchanger STAT_DEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_SkullBashEnd
@@ -1927,7 +1927,7 @@ BattleScript_EffectSolarbeam::
BattleScript_SolarbeamDecideTurn::
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
setbyte sTWOTURN_STRINGID, 0x1
setbyte sTWOTURN_STRINGID, 1
call BattleScriptFirstChargingTurn
goto BattleScript_MoveEnd
BattleScript_SolarbeamOnFirstTurn::
@@ -1996,19 +1996,19 @@ BattleScript_EffectSemiInvulnerable::
jumpifmove MOVE_FLY, BattleScript_FirstTurnFly
jumpifmove MOVE_DIVE, BattleScript_FirstTurnDive
jumpifmove MOVE_BOUNCE, BattleScript_FirstTurnBounce
setbyte sTWOTURN_STRINGID, 0x5
setbyte sTWOTURN_STRINGID, 5
goto BattleScript_FirstTurnSemiInvulnerable
BattleScript_FirstTurnBounce::
setbyte sTWOTURN_STRINGID, 0x7
setbyte sTWOTURN_STRINGID, 7
goto BattleScript_FirstTurnSemiInvulnerable
BattleScript_FirstTurnDive::
setbyte sTWOTURN_STRINGID, 0x6
setbyte sTWOTURN_STRINGID, 6
goto BattleScript_FirstTurnSemiInvulnerable
BattleScript_FirstTurnFly::
setbyte sTWOTURN_STRINGID, 0x4
setbyte sTWOTURN_STRINGID, 4
BattleScript_FirstTurnSemiInvulnerable::
call BattleScriptFirstChargingTurn
setsemiinvulnerablebit
@@ -2670,8 +2670,8 @@ BattleScript_EffectTickle::
attackcanceler
attackstring
ppreduce
jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_ATK, 0x0, BattleScript_TickleDoMoveAnim
jumpifstat BS_TARGET, CMP_EQUAL, STAT_DEF, 0x0, BattleScript_CantLowerMultipleStats
jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_ATK, MIN_STAT_STAGE, BattleScript_TickleDoMoveAnim
jumpifstat BS_TARGET, CMP_EQUAL, STAT_DEF, MIN_STAT_STAGE, BattleScript_CantLowerMultipleStats
BattleScript_TickleDoMoveAnim::
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
attackanimation
@@ -2705,8 +2705,8 @@ BattleScript_EffectCosmicPower::
attackcanceler
attackstring
ppreduce
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, 0xC, BattleScript_CosmicPowerDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, 0xC, BattleScript_CantRaiseMultipleStats
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, MAX_STAT_STAGE, BattleScript_CosmicPowerDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
BattleScript_CosmicPowerDoMoveAnim::
attackanimation
waitanimation
@@ -2734,8 +2734,8 @@ BattleScript_EffectBulkUp::
attackcanceler
attackstring
ppreduce
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, 0xC, BattleScript_BulkUpDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, 0xC, BattleScript_CantRaiseMultipleStats
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_BulkUpDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
BattleScript_BulkUpDoMoveAnim::
attackanimation
waitanimation
@@ -2759,8 +2759,8 @@ BattleScript_EffectCalmMind::
attackcanceler
attackstring
ppreduce
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, 0xC, BattleScript_CalmMindDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, 0xC, BattleScript_CantRaiseMultipleStats
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_CalmMindDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
BattleScript_CalmMindDoMoveAnim::
attackanimation
waitanimation
@@ -2791,8 +2791,8 @@ BattleScript_EffectDragonDance::
attackcanceler
attackstring
ppreduce
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, 0xC, BattleScript_DragonDanceDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, 0xC, BattleScript_CantRaiseMultipleStats
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_DragonDanceDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
BattleScript_DragonDanceDoMoveAnim::
attackanimation
waitanimation
@@ -3047,13 +3047,13 @@ BattleScript_FrontierTrainerBattleWon_LoseTexts:
trainerslidein BS_ATTACKER
waitstate
printstring STRINGID_TRAINER1LOSETEXT
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_82DAACB
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_TryPickUpItems
trainerslideout B_POSITION_OPPONENT_LEFT
waitstate
trainerslidein BS_FAINTED
waitstate
printstring STRINGID_TRAINER2LOSETEXT
BattleScript_82DAACB:
BattleScript_TryPickUpItems:
jumpifnotbattletype BATTLE_TYPE_PYRAMID, BattleScript_FrontierTrainerBattleWon_End
pickup
BattleScript_FrontierTrainerBattleWon_End:
@@ -3165,7 +3165,7 @@ BattleScript_Pausex20::
return
BattleScript_LevelUp::
fanfare MUS_FANFA1
fanfare MUS_LEVEL_UP
printstring STRINGID_PKMNGREWTOLV
setbyte sLVLBOX_STATE, 0x0
drawlvlupbox
@@ -3193,7 +3193,7 @@ BattleScript_ForgotAndLearnedNewMove::
printstring STRINGID_ANDELLIPSIS
BattleScript_LearnedNewMove::
buffermovetolearn
fanfare MUS_FANFA1
fanfare MUS_LEVEL_UP
printstring STRINGID_PKMNLEARNEDMOVE
waitmessage 0x40
updatechoicemoveonlvlup BS_ATTACKER
@@ -3252,7 +3252,7 @@ BattleScript_SunlightFaded::
end2
BattleScript_OverworldWeatherStarts::
printfromtable gWeatherContinuesStringIds
printfromtable gWeatherStartsStringIds
waitmessage 0x40
playanimation2 BS_ATTACKER, sB_ANIM_ARG1, NULL
end3
@@ -3462,11 +3462,11 @@ BattleScript_PerishSongCountGoesDown::
end2
BattleScript_AllStatsUp::
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, 0xC, BattleScript_AllStatsUpAtk
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, 0xC, BattleScript_AllStatsUpAtk
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPEED, 0xC, BattleScript_AllStatsUpAtk
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, 0xC, BattleScript_AllStatsUpAtk
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, 0xC, BattleScript_AllStatsUpRet
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_AllStatsUpAtk
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, MAX_STAT_STAGE, BattleScript_AllStatsUpAtk
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPEED, MAX_STAT_STAGE, BattleScript_AllStatsUpAtk
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_AllStatsUpAtk
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_AllStatsUpRet
BattleScript_AllStatsUpAtk::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_SPEED | BIT_SPATK | BIT_SPDEF, 0x0
@@ -3638,18 +3638,18 @@ 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_82DB144
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_82DB144
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_AtkDefDown_TryDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_AtkDefDown_TryDef
printfromtable gStatDownStringIds
waitmessage 0x40
BattleScript_82DB144::
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_82DB167
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_82DB167
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_AtkDefDown_End
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_AtkDefDown_End
printfromtable gStatDownStringIds
waitmessage 0x40
BattleScript_82DB167::
BattleScript_AtkDefDown_End::
return
BattleScript_KnockedOff::
@@ -4017,10 +4017,10 @@ BattleScript_WeatherFormChangesLoop::
return
BattleScript_CastformChange::
call BattleScript_82DB4AF
call BattleScript_DoCastformChange
end3
BattleScript_82DB4AF::
BattleScript_DoCastformChange::
docastformchangeanimation
waitstate
printstring STRINGID_PKMNTRANSFORMED
@@ -4459,9 +4459,9 @@ BattleScript_PalaceEndFlavorText::
BattleScript_ArenaTurnBeginning::
waitcry BS_ATTACKER
volumedown
playse SE_HANTEI1
playse SE_ARENA_TIMEUP1
pause 0x8
playse SE_HANTEI1
playse SE_ARENA_TIMEUP1
various14 BS_ATTACKER
arenajudmengtstring 8
arenawaitmessage 8
@@ -4471,7 +4471,7 @@ BattleScript_ArenaTurnBeginning::
end2
BattleScript_82DB8E0:: @ Unused battlescript
playse SE_PINPON
playse SE_DING_DONG
various14 BS_ATTACKER
arenajudmengtstring BS_TARGET
arenawaitmessage BS_TARGET
@@ -4485,9 +4485,9 @@ BattleScript_ArenaDoJudgment::
makevisible BS_OPPONENT1
waitstate
volumedown
playse SE_HANTEI1
playse SE_ARENA_TIMEUP1
pause 0x8
playse SE_HANTEI1
playse SE_ARENA_TIMEUP1
pause 0x40
various14 BS_ATTACKER
arenajudmengtstring 1

46
data/battle_scripts_2.s
View File

@@ -13,28 +13,28 @@
.align 2
gBattlescriptsForBallThrow:: @ 82DBD08
.4byte BattleScript_BallThrow
.4byte BattleScript_BallThrow
.4byte BattleScript_BallThrow
.4byte BattleScript_BallThrow
.4byte BattleScript_BallThrow
.4byte BattleScript_SafariBallThrow
.4byte BattleScript_BallThrow
.4byte BattleScript_BallThrow
.4byte BattleScript_BallThrow
.4byte BattleScript_BallThrow
.4byte BattleScript_BallThrow
.4byte BattleScript_BallThrow
.4byte BattleScript_BallThrow
.4byte BattleScript_BallThrow @ ITEM_NONE
.4byte BattleScript_BallThrow @ ITEM_MASTER_BALL
.4byte BattleScript_BallThrow @ ITEM_ULTRA_BALL
.4byte BattleScript_BallThrow @ ITEM_GREAT_BALL
.4byte BattleScript_BallThrow @ ITEM_POKE_BALL
.4byte BattleScript_SafariBallThrow @ ITEM_SAFARI_BALL
.4byte BattleScript_BallThrow @ ITEM_NET_BALL
.4byte BattleScript_BallThrow @ ITEM_DIVE_BALL
.4byte BattleScript_BallThrow @ ITEM_NEST_BALL
.4byte BattleScript_BallThrow @ ITEM_REPEAT_BALL
.4byte BattleScript_BallThrow @ ITEM_TIMER_BALL
.4byte BattleScript_BallThrow @ ITEM_LUXURY_BALL
.4byte BattleScript_BallThrow @ ITEM_PREMIER_BALL
.align 2
gBattlescriptsForUsingItem:: @ 82DBD3C
.4byte BattleScript_PlayerUsesItem
.4byte BattleScript_OpponentUsesHealItem
.4byte BattleScript_OpponentUsesHealItem
.4byte BattleScript_OpponentUsesStatusCureItem
.4byte BattleScript_OpponentUsesXItem
.4byte BattleScript_OpponentUsesGuardSpecs
.4byte BattleScript_OpponentUsesHealItem @ AI_ITEM_FULL_RESTORE
.4byte BattleScript_OpponentUsesHealItem @ AI_ITEM_HEAL_HP
.4byte BattleScript_OpponentUsesStatusCureItem @ AI_ITEM_CURE_CONDITION
.4byte BattleScript_OpponentUsesXItem @ AI_ITEM_X_STAT
.4byte BattleScript_OpponentUsesGuardSpecs @ AI_ITEM_GUARD_SPECS
.align 2
gBattlescriptsForRunningByItem:: @ 82DBD54
@@ -118,7 +118,7 @@ BattleScript_PlayerUsesItem::
BattleScript_OpponentUsesHealItem::
printstring STRINGID_EMPTYSTRING3
pause 0x30
playse SE_KAIFUKU
playse SE_USE_ITEM
printstring STRINGID_TRAINER1USEDITEM
waitmessage 0x40
useitemonopponent
@@ -135,7 +135,7 @@ BattleScript_OpponentUsesHealItem::
BattleScript_OpponentUsesStatusCureItem::
printstring STRINGID_EMPTYSTRING3
pause 0x30
playse SE_KAIFUKU
playse SE_USE_ITEM
printstring STRINGID_TRAINER1USEDITEM
waitmessage 0x40
useitemonopponent
@@ -149,7 +149,7 @@ BattleScript_OpponentUsesStatusCureItem::
BattleScript_OpponentUsesXItem::
printstring STRINGID_EMPTYSTRING3
pause 0x30
playse SE_KAIFUKU
playse SE_USE_ITEM
printstring STRINGID_TRAINER1USEDITEM
waitmessage 0x40
useitemonopponent
@@ -162,7 +162,7 @@ BattleScript_OpponentUsesXItem::
BattleScript_OpponentUsesGuardSpecs::
printstring STRINGID_EMPTYSTRING3
pause 0x30
playse SE_KAIFUKU
playse SE_USE_ITEM
printstring STRINGID_TRAINER1USEDITEM
waitmessage 0x40
useitemonopponent
@@ -173,7 +173,7 @@ BattleScript_OpponentUsesGuardSpecs::
finishaction
BattleScript_RunByUsingItem::
playse SE_NIGERU
playse SE_FLEE
setbyte gBattleOutcome, B_OUTCOME_RAN
finishturn

1106
data/contest_ai_scripts.s
View File

File diff suppressed because it is too large Load Diff

9
data/event_scripts.s
View File

@@ -40,6 +40,7 @@
#include "constants/moves.h"
#include "constants/party_menu.h"
#include "constants/pokemon.h"
#include "constants/roulette.h"
#include "constants/script_menu.h"
#include "constants/secret_bases.h"
#include "constants/songs.h"
@@ -712,13 +713,13 @@ Common_EventScript_SetAbnormalWeather:: @ 827207A
return
Common_EventScript_PlayGymBadgeFanfare:: @ 827207E
playfanfare MUS_ME_BACHI
playfanfare MUS_OBTAIN_BADGE
waitfanfare
return
Common_EventScript_OutOfCenterPartyHeal:: @ 8272083
fadescreen FADE_TO_BLACK
playfanfare MUS_ME_ASA
playfanfare MUS_HEAL
waitfanfare
special HealPlayerParty
fadescreen FADE_FROM_BLACK
@@ -735,7 +736,7 @@ EventScript_RegionMap:: @ 827208F
Common_EventScript_PlayBrineysBoatMusic:: @ 82720A0
setflag FLAG_DONT_TRANSITION_MUSIC
playbgm MUS_M_BOAT, 0
playbgm MUS_SAILING, 0
return
Common_EventScript_StopBrineysBoatMusic:: @ 82720A8
@@ -819,7 +820,7 @@ Common_EventScript_NameReceivedPartyMon:: @ 82723DD
Common_EventScript_PlayerHandedOverTheItem:: @ 82723E4
bufferitemname 0, VAR_0x8004
playfanfare MUS_ME_WAZA
playfanfare MUS_OBTAIN_TMHM
message gText_PlayerHandedOverTheItem
waitmessage
waitfanfare

244
data/field_effect_scripts.s
View File

@@ -5,73 +5,73 @@
.align 2
gFieldEffectScriptPointers:: @ 82DB9D4
.4byte gFieldEffectScript_ExclamationMarkIcon1
.4byte gFieldEffectScript_UseCutOnTallGrass
.4byte gFieldEffectScript_UseCutOnTree
.4byte gFieldEffectScript_Shadow
.4byte gFieldEffectScript_TallGrass
.4byte gFieldEffectScript_Ripple
.4byte gFieldEffectScript_FieldMoveShowMon
.4byte gFieldEffectScript_Ash
.4byte gFieldEffectScript_SurfBlob
.4byte gFieldEffectScript_UseSurf
.4byte gFieldEffectScript_GroundImpactDust
.4byte gFieldEffectScript_UseSecretPowerCave
.4byte gFieldEffectScript_BikeHopTallGrass
.4byte gFieldEffectScript_SandFootprints
.4byte gFieldEffectScript_BikeHopBigSplash
.4byte gFieldEffectScript_Splash
.4byte gFieldEffectScript_BikeHopSmallSplash
.4byte gFieldEffectScript_LongGrass
.4byte gFieldEffectScript_JumpLongGrass
.4byte gFieldEffectScript_Unknown19
.4byte gFieldEffectScript_Unknown20
.4byte gFieldEffectScript_Unknown21
.4byte gFieldEffectScript_Unknown22
.4byte gFieldEffectScript_BerryTreeGrowthSparkle
.4byte gFieldEffectScript_DeepSandFootprints
.4byte gFieldEffectScript_PokeCenterHeal
.4byte gFieldEffectScript_UseSecretPowerTree
.4byte gFieldEffectScript_UseSecretPowerShrub
.4byte gFieldEffectScript_TreeDisguise
.4byte gFieldEffectScript_MountainDisguise
.4byte gFieldEffectScript_NPCUseFly
.4byte gFieldEffectScript_UseFly
.4byte gFieldEffectScript_FlyIn
.4byte gFieldEffectScript_QuestionMarkIcon
.4byte gFieldEffectScript_FeetInFlowingWater
.4byte gFieldEffectScript_BikeTireTracks
.4byte gFieldEffectScript_SandDisguisePlaceholder
.4byte gFieldEffectScript_UseRockSmash
.4byte gFieldEffectScript_UseDig
.4byte gFieldEffectScript_SandPile
.4byte gFieldEffectScript_UseStrength
.4byte gFieldEffectScript_ShortGrass
.4byte gFieldEffectScript_HotSpringsWater
.4byte gFieldEffectScript_UseWaterfall
.4byte gFieldEffectScript_UseDive
.4byte gFieldEffectScript_Pokeball
.4byte gFieldEffectScript_HeartIcon
.4byte gFieldEffectScript_Unknown47
.4byte gFieldEffectScript_Unknown48
.4byte gFieldEffectScript_JumpOutOfAsh
.4byte gFieldEffectScript_LavaridgeGymWarp
.4byte gFieldEffectScript_SweetScent
.4byte gFieldEffectScript_SandPillar
.4byte gFieldEffectScript_Bubbles
.4byte gFieldEffectScript_Sparkle
.4byte gFieldEffectScript_ShowSecretPowerCave
.4byte gFieldEffectScript_ShowSecretPowerTree
.4byte gFieldEffectScript_ShowSecretPowerShrub
.4byte gFieldEffectScript_ShowCutGrass
.4byte gFieldEffectScript_FieldMoveShowMonInit
.4byte gFieldEffectScript_UsePuzzleEffect
.4byte gFieldEffectScript_SecretBaseBootPC
.4byte gFieldEffectScript_HallOfFameRecord
.4byte gFieldEffectScript_UseTeleport
.4byte gFieldEffectScript_Rayquaza
.4byte gFieldEffectScript_Unknown65
.4byte gFieldEffectScript_MoveDeoxysRock
.4byte gFieldEffectScript_ExclamationMarkIcon1 @ FLDEFF_EXCLAMATION_MARK_ICON
.4byte gFieldEffectScript_UseCutOnTallGrass @ FLDEFF_USE_CUT_ON_GRASS
.4byte gFieldEffectScript_UseCutOnTree @ FLDEFF_USE_CUT_ON_TREE
.4byte gFieldEffectScript_Shadow @ FLDEFF_SHADOW
.4byte gFieldEffectScript_TallGrass @ FLDEFF_TALL_GRASS
.4byte gFieldEffectScript_Ripple @ FLDEFF_RIPPLE
.4byte gFieldEffectScript_FieldMoveShowMon @ FLDEFF_FIELD_MOVE_SHOW_MON
.4byte gFieldEffectScript_Ash @ FLDEFF_ASH
.4byte gFieldEffectScript_SurfBlob @ FLDEFF_SURF_BLOB
.4byte gFieldEffectScript_UseSurf @ FLDEFF_USE_SURF
.4byte gFieldEffectScript_GroundImpactDust @ FLDEFF_DUST
.4byte gFieldEffectScript_UseSecretPowerCave @ FLDEFF_USE_SECRET_POWER_CAVE
.4byte gFieldEffectScript_JumpTallGrass @ FLDEFF_JUMP_TALL_GRASS
.4byte gFieldEffectScript_SandFootprints @ FLDEFF_SAND_FOOTPRINTS
.4byte gFieldEffectScript_JumpBigSplash @ FLDEFF_JUMP_BIG_SPLASH
.4byte gFieldEffectScript_Splash @ FLDEFF_SPLASH
.4byte gFieldEffectScript_JumpSmallSplash @ FLDEFF_JUMP_SMALL_SPLASH
.4byte gFieldEffectScript_LongGrass @ FLDEFF_LONG_GRASS
.4byte gFieldEffectScript_JumpLongGrass @ FLDEFF_JUMP_LONG_GRASS
.4byte gFieldEffectScript_UnusedGrass @ FLDEFF_UNUSED_GRASS
.4byte gFieldEffectScript_UnusedGrass2 @ FLDEFF_UNUSED_GRASS_2
.4byte gFieldEffectScript_UnusedSand @ FLDEFF_UNUSED_SAND
.4byte gFieldEffectScript_WaterSurfacing @ FLDEFF_WATER_SURFACING
.4byte gFieldEffectScript_BerryTreeGrowthSparkle @ FLDEFF_BERRY_TREE_GROWTH_SPARKLE
.4byte gFieldEffectScript_DeepSandFootprints @ FLDEFF_DEEP_SAND_FOOTPRINTS
.4byte gFieldEffectScript_PokeCenterHeal @ FLDEFF_POKECENTER_HEAL
.4byte gFieldEffectScript_UseSecretPowerTree @ FLDEFF_USE_SECRET_POWER_TREE
.4byte gFieldEffectScript_UseSecretPowerShrub @ FLDEFF_USE_SECRET_POWER_SHRUB
.4byte gFieldEffectScript_TreeDisguise @ FLDEFF_TREE_DISGUISE
.4byte gFieldEffectScript_MountainDisguise @ FLDEFF_MOUNTAIN_DISGUISE
.4byte gFieldEffectScript_NPCUseFly @ FLDEFF_NPCFLY_OUT
.4byte gFieldEffectScript_UseFly @ FLDEFF_USE_FLY
.4byte gFieldEffectScript_FlyIn @ FLDEFF_FLY_IN
.4byte gFieldEffectScript_QuestionMarkIcon @ FLDEFF_QUESTION_MARK_ICON
.4byte gFieldEffectScript_FeetInFlowingWater @ FLDEFF_FEET_IN_FLOWING_WATER
.4byte gFieldEffectScript_BikeTireTracks @ FLDEFF_BIKE_TIRE_TRACKS
.4byte gFieldEffectScript_SandDisguisePlaceholder @ FLDEFF_SAND_DISGUISE
.4byte gFieldEffectScript_UseRockSmash @ FLDEFF_USE_ROCK_SMASH
.4byte gFieldEffectScript_UseDig @ FLDEFF_USE_DIG
.4byte gFieldEffectScript_SandPile @ FLDEFF_SAND_PILE
.4byte gFieldEffectScript_UseStrength @ FLDEFF_USE_STRENGTH
.4byte gFieldEffectScript_ShortGrass @ FLDEFF_SHORT_GRASS
.4byte gFieldEffectScript_HotSpringsWater @ FLDEFF_HOT_SPRINGS_WATER
.4byte gFieldEffectScript_UseWaterfall @ FLDEFF_USE_WATERFALL
.4byte gFieldEffectScript_UseDive @ FLDEFF_USE_DIVE
.4byte gFieldEffectScript_Pokeball @ FLDEFF_POKEBALL
.4byte gFieldEffectScript_HeartIcon @ FLDEFF_HEART_ICON
.4byte gFieldEffectScript_Nop47 @ FLDEFF_NOP_47
.4byte gFieldEffectScript_Nop48 @ FLDEFF_NOP_48
.4byte gFieldEffectScript_AshPuff @ FLDEFF_ASH_PUFF
.4byte gFieldEffectScript_AshLaunch @ FLDEFF_ASH_LAUNCH
.4byte gFieldEffectScript_SweetScent @ FLDEFF_SWEET_SCENT
.4byte gFieldEffectScript_SandPillar @ FLDEFF_SAND_PILLAR
.4byte gFieldEffectScript_Bubbles @ FLDEFF_BUBBLES
.4byte gFieldEffectScript_Sparkle @ FLDEFF_SPARKLE
.4byte gFieldEffectScript_ShowSecretPowerCave @ FLDEFF_SECRET_POWER_CAVE
.4byte gFieldEffectScript_ShowSecretPowerTree @ FLDEFF_SECRET_POWER_TREE
.4byte gFieldEffectScript_ShowSecretPowerShrub @ FLDEFF_SECRET_POWER_SHRUB
.4byte gFieldEffectScript_ShowCutGrass @ FLDEFF_CUT_GRASS
.4byte gFieldEffectScript_FieldMoveShowMonInit @ FLDEFF_FIELD_MOVE_SHOW_MON_INIT
.4byte gFieldEffectScript_UsePuzzleEffect @ FLDEFF_USE_TOMB_PUZZLE_EFFECT
.4byte gFieldEffectScript_SecretBaseBootPC @ FLDEFF_PCTURN_ON
.4byte gFieldEffectScript_HallOfFameRecord @ FLDEFF_HALL_OF_FAME_RECORD
.4byte gFieldEffectScript_UseTeleport @ FLDEFF_USE_TELEPORT
.4byte gFieldEffectScript_RayquazaSpotlight @ FLDEFF_RAYQUAZA_SPOTLIGHT
.4byte gFieldEffectScript_DestroyDeoxysRock @ FLDEFF_DESTROY_DEOXYS_ROCK
.4byte gFieldEffectScript_MoveDeoxysRock @ FLDEFF_MOVE_DEOXYS_ROCK
gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0
field_eff_callnative FldEff_ExclamationMarkIcon
@@ -90,11 +90,11 @@ gFieldEffectScript_Shadow:: @ 82DBAF2
field_eff_end
gFieldEffectScript_TallGrass:: @ 82DBAF8
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_TallGrass
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_TallGrass
field_eff_end
gFieldEffectScript_Ripple:: @ 82DBB02
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Ripple
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Ripple
field_eff_end
gFieldEffectScript_FieldMoveShowMon:: @ 82DBB0C
@@ -102,7 +102,7 @@ gFieldEffectScript_FieldMoveShowMon:: @ 82DBB0C
field_eff_end
gFieldEffectScript_Ash:: @ 82DBB12
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Ash
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Ash
field_eff_end
gFieldEffectScript_SurfBlob:: @ 82DBB1C
@@ -114,55 +114,55 @@ gFieldEffectScript_UseSurf:: @ 82DBB22
field_eff_end
gFieldEffectScript_GroundImpactDust:: @ 82DBB28
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Dust
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Dust
field_eff_end
gFieldEffectScript_UseSecretPowerCave:: @ 82DBB32
field_eff_callnative FldEff_UseSecretPowerCave
field_eff_end
gFieldEffectScript_BikeHopTallGrass:: @ 82DBB38
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_JumpTallGrass
gFieldEffectScript_JumpTallGrass:: @ 82DBB38
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpTallGrass
field_eff_end
gFieldEffectScript_SandFootprints:: @ 82DBB42
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_SandFootprints
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandFootprints
field_eff_end
gFieldEffectScript_BikeHopBigSplash:: @ 82DBB4C
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_JumpBigSplash
gFieldEffectScript_JumpBigSplash:: @ 82DBB4C
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpBigSplash
field_eff_end
gFieldEffectScript_Splash:: @ 82DBB56
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Splash
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Splash
field_eff_end
gFieldEffectScript_BikeHopSmallSplash:: @ 82DBB60
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_JumpSmallSplash
gFieldEffectScript_JumpSmallSplash:: @ 82DBB60
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpSmallSplash
field_eff_end
gFieldEffectScript_LongGrass:: @ 82DBB6A
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_LongGrass
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_LongGrass
field_eff_end
gFieldEffectScript_JumpLongGrass:: @ 82DBB74
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_JumpLongGrass
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpLongGrass
field_eff_end
gFieldEffectScript_Unknown19:: @ 82DBB7E
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Unknown19
gFieldEffectScript_UnusedGrass:: @ 82DBB7E
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_UnusedGrass
field_eff_end
gFieldEffectScript_Unknown20:: @ 82DBB88
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Unknown20
gFieldEffectScript_UnusedGrass2:: @ 82DBB88
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_UnusedGrass2
field_eff_end
gFieldEffectScript_Unknown21:: @ 82DBB92
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Unknown21
gFieldEffectScript_UnusedSand:: @ 82DBB92
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_UnusedSand
field_eff_end
gFieldEffectScript_Unknown22:: @ 82DBB9C
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Unknown22
gFieldEffectScript_WaterSurfacing:: @ 82DBB9C
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_WaterSurfacing
field_eff_end
gFieldEffectScript_BerryTreeGrowthSparkle:: @ 82DBBA6
@@ -170,12 +170,12 @@ gFieldEffectScript_BerryTreeGrowthSparkle:: @ 82DBBA6
field_eff_end
gFieldEffectScript_DeepSandFootprints:: @ 82DBBAC
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_DeepSandFootprints
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_DeepSandFootprints
field_eff_end
gFieldEffectScript_PokeCenterHeal:: @ 82DBBB6
field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_PokecenterHeal
field_eff_loadfadedpal gSpritePalette_PokeballGlow
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_PokecenterHeal
field_eff_end
gFieldEffectScript_UseSecretPowerTree:: @ 82DBBC5
@@ -211,11 +211,11 @@ gFieldEffectScript_QuestionMarkIcon:: @ 82DBBEF
field_eff_end
gFieldEffectScript_FeetInFlowingWater:: @ 82DBBF5
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_FeetInFlowingWater
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_FeetInFlowingWater
field_eff_end
gFieldEffectScript_BikeTireTracks:: @ 82DBBFF
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_BikeTireTracks
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_BikeTireTracks
field_eff_end
gFieldEffectScript_SandDisguisePlaceholder:: @ 82DBC09
@@ -227,7 +227,7 @@ gFieldEffectScript_UseRockSmash:: @ 82DBC0F
field_eff_end
gFieldEffectScript_UseStrength:: @ 82DBC15
field_eff_callnative sub_8145E2C
field_eff_callnative FldEff_UseStrength
field_eff_end
gFieldEffectScript_UseDig:: @ 82DBC1B
@@ -235,15 +235,15 @@ gFieldEffectScript_UseDig:: @ 82DBC1B
field_eff_end
gFieldEffectScript_SandPile:: @ 82DBC21
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_SandPile
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandPile
field_eff_end
gFieldEffectScript_ShortGrass:: @ 82DBC2B
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_ShortGrass
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_ShortGrass
field_eff_end
gFieldEffectScript_HotSpringsWater:: @ 82DBC35
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_HotSpringsWater
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_HotSpringsWater
field_eff_end
gFieldEffectScript_UseWaterfall:: @ 82DBC3F
@@ -255,28 +255,28 @@ gFieldEffectScript_UseDive:: @ 82DBC45
field_eff_end
gFieldEffectScript_Pokeball:: @ 82DBC4B
field_eff_loadpal gFieldEffectObjectPaletteInfo10
field_eff_loadpal gSpritePalette_Pokeball
field_eff_callnative FldEff_Pokeball
field_eff_end
gFieldEffectScript_HeartIcon:: @ 82DBC56
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_HeartIcon
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_HeartIcon
field_eff_end
gFieldEffectScript_Unknown47:: @ 82DBC60
field_eff_callnative FldEff_NopA6FC
gFieldEffectScript_Nop47:: @ 82DBC60
field_eff_callnative FldEff_Nop47
field_eff_end
gFieldEffectScript_Unknown48:: @ 82DBC66
field_eff_callnative FldEff_NopA700
gFieldEffectScript_Nop48:: @ 82DBC66
field_eff_callnative FldEff_Nop48
field_eff_end
gFieldEffectScript_JumpOutOfAsh:: @ 82DBC6C
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, FldEff_PopOutOfAsh
gFieldEffectScript_AshPuff:: @ 82DBC6C
field_eff_loadfadedpal_callnative gSpritePalette_Ash, FldEff_AshPuff
field_eff_end
gFieldEffectScript_LavaridgeGymWarp:: @ 82DBC76
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, FldEff_LavaridgeGymWarp
gFieldEffectScript_AshLaunch:: @ 82DBC76
field_eff_loadfadedpal_callnative gSpritePalette_Ash, FldEff_AshLaunch
field_eff_end
gFieldEffectScript_SweetScent:: @ 82DBC80
@@ -284,31 +284,31 @@ gFieldEffectScript_SweetScent:: @ 82DBC80
field_eff_end
gFieldEffectScript_SandPillar:: @ 82DBC86
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo9, FldEff_SandPillar
field_eff_loadfadedpal_callnative gSpritePalette_SandPillar, FldEff_SandPillar
field_eff_end
gFieldEffectScript_Bubbles:: @ 82DBC90
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Bubbles
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Bubbles
field_eff_end
gFieldEffectScript_Sparkle:: @ 82DBC9A
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo3, FldEff_Sparkle
field_eff_loadfadedpal_callnative gSpritePalette_SmallSparkle, FldEff_Sparkle
field_eff_end
gFieldEffectScript_ShowSecretPowerCave:: @ 82DBCA4
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo7, FldEff_SecretPowerCave
field_eff_loadfadedpal_callnative gSpritePalette_SecretPower_Cave, FldEff_SecretPowerCave
field_eff_end
gFieldEffectScript_ShowSecretPowerTree:: @ 82DBCAE
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerTree
field_eff_loadfadedpal_callnative gSpritePalette_SecretPower_Plant, FldEff_SecretPowerTree
field_eff_end
gFieldEffectScript_ShowSecretPowerShrub:: @ 82DBCB8
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerShrub
field_eff_loadfadedpal_callnative gSpritePalette_SecretPower_Plant, FldEff_SecretPowerShrub
field_eff_end
gFieldEffectScript_ShowCutGrass:: @ 82DBCC2
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, FldEff_CutGrass
field_eff_loadfadedpal_callnative gSpritePalette_CutGrass, FldEff_CutGrass
field_eff_end
gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC
@@ -324,22 +324,22 @@ gFieldEffectScript_SecretBaseBootPC:: @ 82DBCD8
field_eff_end
gFieldEffectScript_HallOfFameRecord:: @ 82DBCDE
field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo5, FldEff_HallOfFameRecord
field_eff_loadfadedpal gSpritePalette_PokeballGlow
field_eff_loadfadedpal_callnative gSpritePalette_HofMonitor, FldEff_HallOfFameRecord
field_eff_end
gFieldEffectScript_UseTeleport:: @ 82DBCED
field_eff_callnative FldEff_UseTeleport
field_eff_end
gFieldEffectScript_Rayquaza:: @ 82DBCF3
field_eff_callnative sub_80B8F98
gFieldEffectScript_RayquazaSpotlight:: @ 82DBCF3
field_eff_callnative FldEff_RayquazaSpotlight
field_eff_end
gFieldEffectScript_Unknown65:: @ 82DBCF9
field_eff_callnative sub_80B9ADC
gFieldEffectScript_DestroyDeoxysRock:: @ 82DBCF9
field_eff_callnative FldEff_DestroyDeoxysRock
field_eff_end
gFieldEffectScript_MoveDeoxysRock:: @ 82DBCFF
field_eff_callnative Fldeff_MoveDeoxysRock
field_eff_callnative FldEff_MoveDeoxysRock
field_eff_end

37
data/io_reg.s
View File

@@ -1,37 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnref_82EC784:: @ 82EC784
.4byte 0x00000000
.4byte 0x00000000
.4byte 0x04000008
.4byte 0x0400000A
.4byte 0x0400000C
.4byte 0x0400000E
.4byte 0x04000010
.4byte 0x04000014
.4byte 0x04000018
.4byte 0x0400001C
.4byte 0x04000012
.4byte 0x04000016
.4byte 0x0400001A
.4byte 0x0400001E
.4byte 0x02000100
.4byte 0x08000400
gOverworldBackgroundLayerFlags:: @ 82EC7C4
.2byte BLDCNT_TGT2_BG0
.2byte BLDCNT_TGT2_BG1
.2byte BLDCNT_TGT2_BG2
.2byte BLDCNT_TGT2_BG3
gOrbEffectBackgroundLayerFlags:: @ 82EC7CC
.2byte BLDCNT_TGT1_BG0
.2byte BLDCNT_TGT1_BG1
.2byte BLDCNT_TGT1_BG2
.2byte BLDCNT_TGT1_BG3

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

@@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_CAPTAINS_OFFICE",
"name": "AbandonedShip_CaptainsOffice",
"layout": "LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE",
"music": "MUS_DAN02",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_SHADE",

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

@@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"name": "AbandonedShip_Corridors_1F",
"layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_1F",
"music": "MUS_DAN02",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_SHADE",

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

@@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"name": "AbandonedShip_Corridors_B1F",
"layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F",
"music": "MUS_DAN02",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_SHADE",

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

@@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_DECK",
"name": "AbandonedShip_Deck",
"layout": "LAYOUT_ABANDONED_SHIP_DECK",
"music": "MUS_DAN02",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
"name": "AbandonedShip_HiddenFloorCorridors",
"layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
"music": "MUS_DAN02",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_SHADE",

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

@@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
"name": "AbandonedShip_HiddenFloorRooms",
"layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
"music": "MUS_DAN02",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_SHADE",

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

@@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_ROOM_B1F",
"name": "AbandonedShip_Room_B1F",
"layout": "LAYOUT_ABANDONED_SHIP_ROOM_B1F",
"music": "MUS_DAN02",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_SHADE",

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

@@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_ROOMS2_1F",
"name": "AbandonedShip_Rooms2_1F",
"layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_1F",
"music": "MUS_DAN02",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_SHADE",

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

@@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_ROOMS2_B1F",
"name": "AbandonedShip_Rooms2_B1F",
"layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_B1F",
"music": "MUS_DAN02",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_SHADE",

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

@@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_ROOMS_1F",
"name": "AbandonedShip_Rooms_1F",
"layout": "LAYOUT_ABANDONED_SHIP_ROOMS_1F",
"music": "MUS_DAN02",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_SHADE",

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

@@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_ROOMS_B1F",
"name": "AbandonedShip_Rooms_B1F",
"layout": "LAYOUT_ABANDONED_SHIP_ROOMS_B1F",
"music": "MUS_DAN02",
"music": "MUS_ABANDONED_SHIP",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_SHADE",

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

@@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_UNDERWATER1",
"name": "AbandonedShip_Underwater1",
"layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER1",
"music": "MUS_DEEPDEEP",
"music": "MUS_UNDERWATER",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_UNDERWATER_BUBBLES",

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

@@ -2,7 +2,7 @@
"id": "MAP_ABANDONED_SHIP_UNDERWATER2",
"name": "AbandonedShip_Underwater2",
"layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER2",
"music": "MUS_DEEPDEEP",
"music": "MUS_UNDERWATER",
"region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false,
"weather": "WEATHER_UNDERWATER_BUBBLES",

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

@@ -2,7 +2,7 @@
"id": "MAP_ALTERING_CAVE",
"name": "AlteringCave",
"layout": "LAYOUT_ALTERING_CAVE",
"music": "MUS_RG_NANADUNGEON",
"music": "MUS_RG_SEVII_CAVE",
"region_map_section": "MAPSEC_ALTERING_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_ANCIENT_TOMB",
"name": "AncientTomb",
"layout": "LAYOUT_ANCIENT_TOMB",
"music": "MUS_MABOROSI",
"music": "MUS_SEALED_CHAMBER",
"region_map_section": "MAPSEC_ANCIENT_TOMB",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_AQUA_HIDEOUT_1F",
"name": "AquaHideout_1F",
"layout": "LAYOUT_AQUA_HIDEOUT_1F",
"music": "MUS_AJITO",
"music": "MUS_AQUA_MAGMA_HIDEOUT",
"region_map_section": "MAPSEC_AQUA_HIDEOUT",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_AQUA_HIDEOUT_B1F",
"name": "AquaHideout_B1F",
"layout": "LAYOUT_AQUA_HIDEOUT_B1F",
"music": "MUS_AJITO",
"music": "MUS_AQUA_MAGMA_HIDEOUT",
"region_map_section": "MAPSEC_AQUA_HIDEOUT",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_AQUA_HIDEOUT_B2F",
"name": "AquaHideout_B2F",
"layout": "LAYOUT_AQUA_HIDEOUT_B2F",
"music": "MUS_AJITO",
"music": "MUS_AQUA_MAGMA_HIDEOUT",
"region_map_section": "MAPSEC_AQUA_HIDEOUT",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP1",
"name": "AquaHideout_UnusedRubyMap1",
"layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1",
"music": "MUS_AJITO",
"music": "MUS_AQUA_MAGMA_HIDEOUT",
"region_map_section": "MAPSEC_AQUA_HIDEOUT",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP2",
"name": "AquaHideout_UnusedRubyMap2",
"layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2",
"music": "MUS_AJITO",
"music": "MUS_AQUA_MAGMA_HIDEOUT",
"region_map_section": "MAPSEC_AQUA_HIDEOUT",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP3",
"name": "AquaHideout_UnusedRubyMap3",
"layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3",
"music": "MUS_AJITO",
"music": "MUS_AQUA_MAGMA_HIDEOUT",
"region_map_section": "MAPSEC_AQUA_HIDEOUT",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_ARTISAN_CAVE_1F",
"name": "ArtisanCave_1F",
"layout": "LAYOUT_ARTISAN_CAVE_1F",
"music": "MUS_DAN01",
"music": "MUS_PETALBURG_WOODS",
"region_map_section": "MAPSEC_ARTISAN_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_ARTISAN_CAVE_B1F",
"name": "ArtisanCave_B1F",
"layout": "LAYOUT_ARTISAN_CAVE_B1F",
"music": "MUS_DAN01",
"music": "MUS_PETALBURG_WOODS",
"region_map_section": "MAPSEC_ARTISAN_CAVE",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_COLOSSEUM_2P",
"name": "BattleColosseum_2P",
"layout": "LAYOUT_BATTLE_COLOSSEUM_2P",
"music": "MUS_RAINBOW",
"music": "MUS_EVER_GRANDE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_COLOSSEUM_4P",
"name": "BattleColosseum_4P",
"layout": "LAYOUT_BATTLE_COLOSSEUM_4P",
"music": "MUS_RAINBOW",
"music": "MUS_EVER_GRANDE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -66,7 +66,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E
applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentEnter
waitmovement 0
applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
playse SE_W187
playse SE_M_BELLY_DRUM
waitse
waitmovement 0
msgbox BattleFrontier_BattleArenaBattleRoom_Text_PlayerStepForward, MSGBOX_DEFAULT
@@ -74,7 +74,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E
applymovement LOCALID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForward
waitmovement 0
applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
playse SE_W187
playse SE_M_BELLY_DRUM
waitse
waitmovement 0
arena_gettrainername
@@ -83,7 +83,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E
applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForward
waitmovement 0
applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
playse SE_W187
playse SE_M_BELLY_DRUM
waitse
waitmovement 0
msgbox BattleFrontier_BattleArenaBattleRoom_Text_SetKOTourneyBegin, MSGBOX_DEFAULT
@@ -103,7 +103,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner:: @ 82575
applymovement LOCALID_BLACK_BELT_2, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
applymovement LOCALID_BLACK_BELT_3, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp
applymovement LOCALID_BLACK_BELT_4, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp
playse SE_W173
playse SE_M_SNORE
waitse
waitmovement 0
arena_gettrainername
@@ -131,7 +131,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedOpponent:: @ 8257630
special LoadPlayerParty
special SavePlayerParty
frontier_setpartyorder FRONTIER_PARTY_SIZE
playfanfare MUS_ME_ASA
playfanfare MUS_HEAL
waitfanfare
special HealPlayerParty
BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent:: @ 82576B0
@@ -286,7 +286,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta:: @ 8257961
applymovement LOCALID_ATTENDANT, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight
waitmovement 0
applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
playse SE_W187
playse SE_M_BELLY_DRUM
waitse
waitmovement 0
msgbox BattleFrontier_BattleArenaBattleRoom_Text_PlayerStepForward, MSGBOX_DEFAULT
@@ -294,7 +294,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta:: @ 8257961
applymovement LOCALID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForwardLong
waitmovement 0
applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
playse SE_W187
playse SE_M_BELLY_DRUM
waitse
waitmovement 0
msgbox BattleFrontier_BattleArenaBattleRoom_Text_MakeWayForGreta, MSGBOX_DEFAULT
@@ -336,7 +336,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaSilver:: @ 8257A5C
applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong
waitmovement 0
msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaYoureToughAfterAll, MSGBOX_DEFAULT
playfanfare MUS_ME_SYMBOLGET
playfanfare MUS_OBTAIN_SYMBOL
message BattleFrontier_BattleArenaBattleRoom_Text_ReceivedGutsSymbol
waitmessage
waitfanfare
@@ -373,7 +373,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaGold:: @ 8257B15
applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong
waitmovement 0
msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaBlownAway, MSGBOX_DEFAULT
playfanfare MUS_ME_SYMBOLGET
playfanfare MUS_OBTAIN_SYMBOL
message BattleFrontier_BattleArenaBattleRoom_Text_GutsSymbolTookGoldenShine
waitmessage
waitfanfare
@@ -406,7 +406,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner:: @ 8257BA9
applymovement LOCALID_BLACK_BELT_2, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
applymovement LOCALID_BLACK_BELT_3, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp
applymovement LOCALID_BLACK_BELT_4, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp
playse SE_BAN
playse SE_BANG
waitse
waitmovement 0
msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsPlayer, MSGBOX_DEFAULT

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

@@ -67,7 +67,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnter:: @ 824BD4E
BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnterForTucker:: @ 824BD5A
applymovement LOCALID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnterForTucker
BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceReactToPlayer:: @ 824BD61
playse SE_W227B
playse SE_M_ENCORE2
call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
waitmovement 0
compare VAR_TEMP_F, DOME_FINAL
@@ -95,7 +95,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleOpponent:: @ 824BD82
BattleFrontier_BattleDomeBattleRoom_EventScript_Draw:: @ 824BDF7
msgbox BattleFrontier_BattleDomeBattleRoom_Text_RefereeDecisionPleaseWait, MSGBOX_DEFAULT
closemessage
playse SE_W227B
playse SE_M_ENCORE2
call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
delay 60
applymovement LOCALID_REFEREE, BattleFrontier_BattleDomeBattleRoom_Movement_RefereeEnter
@@ -120,7 +120,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent:: @ 824BE4F
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWonDraw
compare VAR_TEMP_2, DRAW_TUCKER
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerWonDraw
playse SE_W227B
playse SE_M_ENCORE2
call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
delay 60
BattleFrontier_BattleDomeBattleRoom_EventScript_LostTourney:: @ 824BE8D
@@ -153,7 +153,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent:: @ 824BEE0
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWon
compare VAR_TEMP_2, DRAW_TRAINER
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWonDraw
playse SE_W227B
playse SE_M_ENCORE2
call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
delay 60
dome_getroundtext
@@ -180,7 +180,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_WonLvOpenTourney:: @ 824BF96
msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLvOpenChamp, MSGBOX_DEFAULT
BattleFrontier_BattleDomeBattleRoom_EventScript_CelebrateWin:: @ 824BF9E
special DoDomeConfetti
playse SE_W227B
playse SE_M_ENCORE2
call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
delay 60
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
@@ -361,25 +361,25 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerEnter:: @ 824C211
applymovement LOCALID_AUDIENCE_TWIN, BattleFrontier_BattleDomeBattleRoom_Movement_AudienceTwinJump
applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleDomeBattleRoom_Movement_AnnouncerMoveForTuckerEntrance
applymovement LOCALID_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerEnterAndDance
playse SE_W227B
playse SE_M_ENCORE2
call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
waitse
playse SE_W227B
playse SE_M_ENCORE2
call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
waitse
playse SE_W227B
playse SE_M_ENCORE2
call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
waitse
playse SE_W227B
playse SE_M_ENCORE2
call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
waitse
playse SE_W227B
playse SE_M_ENCORE2
call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
waitse
waitmovement 0
message BattleFrontier_BattleDomeBattleRoom_Text_SpectatorTuckerChant
waitmessage
playse SE_W227B
playse SE_M_ENCORE2
call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
waitse
switch VAR_TEMP_E
@@ -407,7 +407,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver:: @ 824C2B9
applymovement LOCALID_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer
waitmovement 0
msgbox BattleFrontier_BattleDomeBattleRoom_Text_SeeYourFrontierPass, MSGBOX_DEFAULT
playfanfare MUS_ME_SYMBOLGET
playfanfare MUS_OBTAIN_SYMBOL
message BattleFrontier_BattleDomeBattleRoom_Text_ReceivedTacticsSymbol
waitmessage
waitfanfare
@@ -437,7 +437,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold:: @ 824C373
applymovement LOCALID_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer
waitmovement 0
msgbox BattleFrontier_BattleDomeBattleRoom_Text_NeverLostWhenPowerUnleashed, MSGBOX_DEFAULT
playfanfare MUS_ME_SYMBOLGET
playfanfare MUS_OBTAIN_SYMBOL
message BattleFrontier_BattleDomeBattleRoom_Text_TacticsSymbolTookGoldenShine
waitmessage
waitfanfare
@@ -456,7 +456,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_DoTuckerBattle:: @ 824C400
BattleFrontier_BattleDomeBattleRoom_EventScript_LostToTucker:: @ 824C420
msgbox BattleFrontier_BattleDomeBattleRoom_Text_WinnerIsTucker, MSGBOX_DEFAULT
playse SE_W227B
playse SE_M_ENCORE2
call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
waitse
goto BattleFrontier_BattleDomeBattleRoom_EventScript_LostTourney

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR",
"name": "BattleFrontier_BattleDomeCorridor",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR",
"music": "MUS_B_DOME1",
"music": "MUS_B_DOME_LOBBY",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY",
"name": "BattleFrontier_BattleDomeLobby",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY",
"music": "MUS_B_DOME1",
"music": "MUS_B_DOME_LOBBY",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -224,7 +224,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle:: @ 824B5C7
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT
special LoadPlayerParty
frontier_setpartyorder FRONTIER_PARTY_SIZE
playfanfare MUS_ME_ASA
playfanfare MUS_HEAL
waitfanfare
special HealPlayerParty
call BattleFrontier_BattleDomePreBattleRoom_EventScript_RoundCompleteMessage

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

@@ -150,7 +150,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandSilver:: @ 825B
closemessage
applymovement LOCALID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland
waitmovement 0
playfanfare MUS_ME_SYMBOLGET
playfanfare MUS_OBTAIN_SYMBOL
message BattleFrontier_BattleFactoryBattleRoom_Text_ReceivedKnowledgeSymbol
waitmessage
waitfanfare
@@ -179,7 +179,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandGold:: @ 825B09
waitmessage
applymovement LOCALID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland
waitmovement 0
playfanfare MUS_ME_SYMBOLGET
playfanfare MUS_OBTAIN_SYMBOL
message BattleFrontier_BattleFactoryBattleRoom_Text_KnowledgeSymbolTookGoldenShine
waitmessage
waitfanfare

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

@@ -62,13 +62,13 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle:: @
factory_setopponentmons
factory_resethelditems
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LetUsRestoreMons, MSGBOX_DEFAULT
playfanfare MUS_ME_ASA
playfanfare MUS_HEAL
waitfanfare
special HealPlayerParty
frontier_getbrainstatus
compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent
playse SE_TOREEYE
playse SE_POKENAV_CALL
waitse
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_WaitFewMoments, MSGBOX_DEFAULT
closemessage

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

@@ -89,7 +89,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedOpponent:: @ 824F911
special LoadPlayerParty
special SavePlayerParty
frontier_setpartyorder FRONTIER_PARTY_SIZE
playfanfare MUS_ME_ASA
playfanfare MUS_HEAL
waitfanfare
special HealPlayerParty
BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent:: @ 824F98A
@@ -245,7 +245,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserSilver:: @ 824F
applymovement LOCALID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceUp
applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_LetsSeeFrontierPass, MSGBOX_DEFAULT
playfanfare MUS_ME_SYMBOLGET
playfanfare MUS_OBTAIN_SYMBOL
message BattleFrontier_BattlePalaceBattleRoom_Text_ReceivedSpiritsSymbol
waitmessage
waitfanfare
@@ -280,7 +280,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserGold:: @ 824FD8
applymovement LOCALID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceUp
applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_HurryWithFrontierPass, MSGBOX_DEFAULT
playfanfare MUS_ME_SYMBOLGET
playfanfare MUS_OBTAIN_SYMBOL
message BattleFrontier_BattlePalaceBattleRoom_Text_SpiritsSymbolTookGoldenShine
waitmessage
waitfanfare

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR",
"name": "BattleFrontier_BattlePikeCorridor",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR",
"music": "MUS_B_TUBE",
"music": "MUS_B_PIKE",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY",
"name": "BattleFrontier_BattlePikeLobby",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY",
"music": "MUS_B_TUBE",
"music": "MUS_B_PIKE",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -265,7 +265,7 @@ BattleFrontier_BattlePikeLobby_EventScript_ExitRules:: @ 825BB47
end
BattleFrontier_BattlePike_EventScript_CloseCurtain:: @ 825BB49
playse SE_CURTAIN
playse SE_PIKE_CURTAIN_CLOSE
special CloseBattlePikeCurtain
waitstate
waitse

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL",
"name": "BattleFrontier_BattlePikeRoomFinal",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL",
"music": "MUS_B_TUBE",
"music": "MUS_B_PIKE",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL",
"name": "BattleFrontier_BattlePikeRoomNormal",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL",
"music": "MUS_B_TUBE",
"music": "MUS_B_PIKE",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

18
data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
View File

@@ -83,7 +83,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_WonHardBattle:: @ 825D285
lock
faceplayer
msgbox BattleFrontier_BattlePikeRoomNormal_Text_RestoreToFullHealth, MSGBOX_DEFAULT
playfanfare MUS_ME_ASA
playfanfare MUS_HEAL
waitfanfare
special HealPlayerParty
msgbox BattleFrontier_BattlePikeRoomNormal_Text_EnjoyRestOfChallenge2, MSGBOX_DEFAULT
@@ -111,7 +111,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter:: @ 825D2FB
applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanUp
applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExitForLucy
waitmovement 0
playse SE_CURTAIN
playse SE_PIKE_CURTAIN_CLOSE
call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesLittleClosed
delay 4
call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed
@@ -120,7 +120,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter:: @ 825D2FB
delay 4
waitse
delay 60
playse SE_CURTAIN1
playse SE_PIKE_CURTAIN_OPEN
delay 65
call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed
showobjectat LOCALID_OBJ_0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL
@@ -154,7 +154,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver:: @ 825D3DA
goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
msgbox BattleFrontier_BattlePikeRoomNormal_Text_LucyShowMeFrontierPass, MSGBOX_DEFAULT
waitmessage
playfanfare MUS_ME_SYMBOLGET
playfanfare MUS_OBTAIN_SYMBOL
message BattleFrontier_BattlePikeRoomNormal_Text_ReceivedLuckSymbol
waitmessage
waitfanfare
@@ -182,7 +182,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold:: @ 825D460
goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
msgbox BattleFrontier_BattlePikeRoomNormal_Text_LucyFrontierPass, MSGBOX_DEFAULT
waitmessage
playfanfare MUS_ME_SYMBOLGET
playfanfare MUS_OBTAIN_SYMBOL
message BattleFrontier_BattlePikeRoomNormal_Text_LuckSymbolTookGoldenShine
waitmessage
waitfanfare
@@ -211,14 +211,14 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenNoHeal:: @ 825D4DC
BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealOneMon:: @ 825D4EA
msgbox BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealOne, MSGBOX_DEFAULT
playfanfare MUS_ME_ASA
playfanfare MUS_HEAL
waitfanfare
goto BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter
end
BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealTwoMons:: @ 825D4FC
msgbox BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealTwo, MSGBOX_DEFAULT
playfanfare MUS_ME_ASA
playfanfare MUS_HEAL
waitfanfare
goto BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter
end
@@ -230,7 +230,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterFullHealRoom:: @ 825D50E
waitmovement 0
message BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreToFullHealth
waitmessage
playfanfare MUS_ME_ASA
playfanfare MUS_HEAL
waitfanfare
special HealPlayerParty
msgbox BattleFrontier_BattlePikeRoomNormal_Text_EnjoyRestOfChallenge, MSGBOX_DEFAULT
@@ -573,7 +573,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_HealNPC:: @ 825D83E
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreTwoMons
compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreOneMon
playfanfare MUS_ME_ASA
playfanfare MUS_HEAL
waitfanfare
msgbox BattleFrontier_BattlePikeRoomNormal_Text_BestOfLuckFarewell, MSGBOX_DEFAULT
closemessage

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS",
"name": "BattleFrontier_BattlePikeRoomWildMons",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS",
"music": "MUS_B_TUBE",
"music": "MUS_B_PIKE",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM",
"name": "BattleFrontier_BattlePikeThreePathRoom",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM",
"music": "MUS_B_TUBE",
"music": "MUS_B_PIKE",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -33,7 +33,7 @@ BattleFrontier_BattlePyramidFloor_EventScript_ShowMapName:: @ 8252A8F
end
BattleFrontier_BattlePyramidFloor_EventScript_PlayPyramidMusic:: @ 8252A98
playbgm MUS_PYRAMID, 0
playbgm MUS_B_PYRAMID, 0
setvar VAR_TEMP_E, 1
end

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY",
"name": "BattleFrontier_BattlePyramidLobby",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY",
"music": "MUS_PYRAMID",
"music": "MUS_B_PYRAMID",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -32,7 +32,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_QuitWithoutSaving:: @ 8250768
lockall
message BattleFrontier_BattlePyramidLobby_Text_DidntSaveBeforeQuittingTakeBag
waitmessage
playse SE_EXPMAX
playse SE_EXP_MAX
waitse
closemessage
pyramid_set PYRAMID_DATA_WIN_STREAK, 0
@@ -63,7 +63,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_GiveBattlePoints:: @ 82507DA
special HealPlayerParty
message BattleFrontier_BattlePyramidLobby_Text_UsedBattleBagWillBeKept
waitmessage
playse SE_EXPMAX
playse SE_EXP_MAX
waitse
msgbox BattleFrontier_BattlePyramidLobby_Text_GiveYouTheseBattlePoints, MSGBOX_DEFAULT
frontier_givepoints
@@ -88,7 +88,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_LostChallenge:: @ 8250852
lockall
message BattleFrontier_BattlePyramidLobby_Text_DisappointingHereIsBag
waitmessage
playse SE_EXPMAX
playse SE_EXP_MAX
waitse
message BattleFrontier_BattlePyramidLobby_Text_RecordResultsWait
waitmessage
@@ -388,7 +388,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_ReceiveNewBattleBag:: @ 8250D94
BattleFrontier_BattlePyramidLobby_EventScript_ReceiveBattleBag:: @ 8250D9C
message BattleFrontier_BattlePyramidLobby_Text_ExchangedBagForBattleBag
waitmessage
playse SE_EXPMAX
playse SE_EXP_MAX
waitse
msgbox BattleFrontier_BattlePyramidLobby_Text_StepOnFloorPanel, MSGBOX_DEFAULT
closemessage

12
data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
View File

@@ -53,7 +53,7 @@ BattleFrontier_BattlePyramidTop_OnFrame: @ 825516E
.2byte 0
BattleFrontier_BattlePyramidTop_EventScript_PlayPyramidMusic:: @ 8255180
playbgm MUS_PYRAMID_TOP, 0
playbgm MUS_B_PYRAMID_TOP, 0
setvar VAR_TEMP_E, 1
end
@@ -88,7 +88,7 @@ BattleFrontier_BattlePyramidTop_EventScript_Attendant:: @ 82551D0
waitmovement 0
message BattleFrontier_BattlePyramidTop_Text_PlayerConqueredPyramid
waitmessage
playfanfare MUS_ME_POINTGET
playfanfare MUS_OBTAIN_B_POINTS
waitfanfare
closemessage
BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon:: @ 825521A
@@ -136,7 +136,7 @@ BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech:: @ 82552D0
BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonSilver:: @ 82552DA
msgbox BattleFrontier_BattlePyramidTop_Text_BringCourageToOurBattle, MSGBOX_DEFAULT
call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle
playbgm MUS_PYRAMID_TOP, 0
playbgm MUS_B_PYRAMID_TOP, 0
compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver
goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
@@ -146,7 +146,7 @@ BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver:: @ 82552FB
compare VAR_RESULT, 0
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
msgbox BattleFrontier_BattlePyramidTop_Text_BrandonFrontierPassPlease, MSGBOX_DEFAULT
playfanfare MUS_ME_SYMBOLGET
playfanfare MUS_OBTAIN_SYMBOL
message BattleFrontier_BattlePyramidTop_Text_ReceivedBraveSymbol
waitmessage
waitfanfare
@@ -176,7 +176,7 @@ BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech:: @ 8255388
BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonGold:: @ 8255392
msgbox BattleFrontier_BattlePyramidTop_Text_EverythingYouHave, MSGBOX_DEFAULT
call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle
playbgm MUS_PYRAMID_TOP, 0
playbgm MUS_B_PYRAMID_TOP, 0
compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold
goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
@@ -186,7 +186,7 @@ BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold:: @ 82553B3
compare VAR_RESULT, 2
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
msgbox BattleFrontier_BattlePyramidTop_Text_BrandonRemarkableHaveThis, MSGBOX_DEFAULT
playfanfare MUS_ME_SYMBOLGET
playfanfare MUS_OBTAIN_SYMBOL
message BattleFrontier_BattlePyramidTop_Text_BraveSymbolTookGoldenShine
waitmessage
waitfanfare

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM",
"name": "BattleFrontier_BattleTowerBattleRoom",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM",
"music": "MUS_SATTOWER",
"music": "MUS_B_TOWER",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

6
data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
View File

@@ -69,7 +69,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent:: @ 8241C2F
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant
waitmovement 0
msgbox BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT
playfanfare MUS_ME_ASA
playfanfare MUS_HEAL
waitfanfare
special HealPlayerParty
BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent:: @ 8241C8F
@@ -272,7 +272,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver:: @ 824204
compare VAR_RESULT, 0
goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon
msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelTalentShallBeRecognized, MSGBOX_DEFAULT
playfanfare MUS_ME_SYMBOLGET
playfanfare MUS_OBTAIN_SYMBOL
message BattleFrontier_BattleTowerBattleRoom_Text_ReceivedAbilitySymbol
waitmessage
waitfanfare
@@ -299,7 +299,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelGold:: @ 82420CF
compare VAR_RESULT, 2
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon
msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelCongratsYourPassPlease, MSGBOX_DEFAULT
playfanfare MUS_ME_SYMBOLGET
playfanfare MUS_OBTAIN_SYMBOL
message BattleFrontier_BattleTowerBattleRoom_Text_AbilitySymbolTookGoldenShine
waitmessage
waitfanfare

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR",
"name": "BattleFrontier_BattleTowerCorridor",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR",
"music": "MUS_SATTOWER",
"music": "MUS_B_TOWER",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR",
"name": "BattleFrontier_BattleTowerElevator",
"layout": "LAYOUT_BATTLE_ELEVATOR",
"music": "MUS_SATTOWER",
"music": "MUS_B_TOWER",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY",
"name": "BattleFrontier_BattleTowerLobby",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY",
"music": "MUS_SATTOWER",
"music": "MUS_B_TOWER",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -81,7 +81,7 @@ BattleFrontier_BattleTowerLobby_EventScript_GiveRibbons:: @ 823E780
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_GiveBattlePoints
message BattleFrontier_BattleTowerLobby_Text_HereAreSomeRibbons
waitmessage
playfanfare MUS_FANFA4
playfanfare MUS_OBTAIN_ITEM
waitfanfare
msgbox BattleFrontier_BattleTowerLobby_Text_PutRibbonOnMons, MSGBOX_DEFAULT
BattleFrontier_BattleTowerLobby_EventScript_GiveBattlePoints:: @ 823E7A5

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM",
"name": "BattleFrontier_BattleTowerMultiBattleRoom",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM",
"music": "MUS_SATTOWER",
"music": "MUS_B_TOWER",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -144,7 +144,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RestoreParty:: @ 8249121
frontier_setpartyorder FRONTIER_MULTI_PARTY_SIZE
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_249514
playfanfare MUS_ME_ASA
playfanfare MUS_HEAL
waitfanfare
special HealPlayerParty
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents:: @ 8249143

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR",
"name": "BattleFrontier_BattleTowerMultiCorridor",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR",
"music": "MUS_SATTOWER",
"music": "MUS_B_TOWER",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM",
"name": "BattleFrontier_BattleTowerMultiPartnerRoom",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM",
"music": "MUS_SATTOWER",
"music": "MUS_B_TOWER",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER",
"name": "BattleFrontier_ExchangeServiceCorner",
"layout": "LAYOUT_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER",
"music": "MUS_B_TOWER",
"music": "MUS_B_TOWER_RS",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -42,7 +42,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor:: @ 825F0E5
special TakeFrontierBattlePoints
adddecoration VAR_0x8009
special UpdateBattlePointsWindow
playse SE_REGI
playse SE_SHOP
msgbox BattleFrontier_ExchangeServiceCorner_Text_WellSendItToPC, MSGBOX_DEFAULT
compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR1_CLERK
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
@@ -63,7 +63,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveItem:: @ 825F12A
special TakeFrontierBattlePoints
additem VAR_0x8009
special UpdateBattlePointsWindow
playse SE_REGI
playse SE_SHOP
msgbox BattleFrontier_ExchangeServiceCorner_Text_HereIsYourPrize, MSGBOX_DEFAULT
compare VAR_TEMP_2, EXCHANGE_CORNER_VITAMIN_CLERK
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_LOUNGE1",
"name": "BattleFrontier_Lounge1",
"layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2",
"music": "MUS_B_TOWER",
"music": "MUS_B_TOWER_RS",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_LOUNGE2",
"name": "BattleFrontier_Lounge2",
"layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE1",
"music": "MUS_B_TOWER",
"music": "MUS_B_TOWER_RS",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_LOUNGE3",
"name": "BattleFrontier_Lounge3",
"layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2",
"music": "MUS_B_TOWER",
"music": "MUS_B_TOWER_RS",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -74,7 +74,7 @@ BattleFrontier_Lounge3_EventScript_PlaceBet:: @ 8261E75
special TakeFrontierBattlePoints
setvar VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET
special UpdateBattlePointsWindow
playse SE_REGI
playse SE_SHOP
msgbox BattleFrontier_Lounge3_Text_ThanksOffYouGo, MSGBOX_DEFAULT
goto BattleFrontier_Lounge3_EventScript_FinishBet
end

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_LOUNGE4",
"name": "BattleFrontier_Lounge4",
"layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2",
"music": "MUS_B_TOWER",
"music": "MUS_B_TOWER_RS",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_LOUNGE5",
"name": "BattleFrontier_Lounge5",
"layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE1",
"music": "MUS_B_TOWER",
"music": "MUS_B_TOWER_RS",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_LOUNGE6",
"name": "BattleFrontier_Lounge6",
"layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2",
"music": "MUS_B_TOWER",
"music": "MUS_B_TOWER_RS",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_LOUNGE7",
"name": "BattleFrontier_Lounge7",
"layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2",
"music": "MUS_B_TOWER",
"music": "MUS_B_TOWER_RS",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_LOUNGE8",
"name": "BattleFrontier_Lounge8",
"layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2",
"music": "MUS_B_TOWER",
"music": "MUS_B_TOWER_RS",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_LOUNGE9",
"name": "BattleFrontier_Lounge9",
"layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2",
"music": "MUS_B_TOWER",
"music": "MUS_B_TOWER_RS",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_MART",
"name": "BattleFrontier_Mart",
"layout": "LAYOUT_MART",
"music": "MUS_FRIENDLY",
"music": "MUS_POKE_MART",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -108,7 +108,7 @@ BattleFrontier_OutsideEast_EventScript_Sudowoodo:: @ 8242CEA
lock
faceplayer
waitse
playse SE_USSOKI
playse SE_SUDOWOODO_SHAKE
applymovement LOCALID_SUDOWOODO, BattleFrontier_OutsideEast_Movement_SudowoodoShake
waitmovement 0
release
@@ -120,7 +120,7 @@ BattleFrontier_OutsideEast_EventScript_WaterSudowoodo:: @ 8242CFC
special DoWateringBerryTreeAnim
waitstate
waitse
playse SE_USSOKI
playse SE_SUDOWOODO_SHAKE
applymovement LOCALID_SUDOWOODO, BattleFrontier_OutsideEast_Movement_SudowoodoShake
waitmovement 0
msgbox gText_Sudowoodo_Attacked, MSGBOX_DEFAULT

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F",
"name": "BattleFrontier_PokemonCenter_1F",
"layout": "LAYOUT_POKEMON_CENTER_1F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F",
"name": "BattleFrontier_PokemonCenter_2F",
"layout": "LAYOUT_POKEMON_CENTER_2F",
"music": "MUS_POKECEN",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_RANKING_HALL",
"name": "BattleFrontier_RankingHall",
"layout": "LAYOUT_BATTLE_FRONTIER_RANKING_HALL",
"music": "MUS_BIJYUTU",
"music": "MUS_LILYCOVE_MUSEUM",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_RECEPTION_GATE",
"name": "BattleFrontier_ReceptionGate",
"layout": "LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE",
"music": "MUS_B_TOWER",
"music": "MUS_B_TOWER_RS",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -33,7 +33,7 @@ BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering:: @ 82661F3
BattleFrontier_ReceptionGate_EventScript_ScottScene:: @ 8266229
msgbox BattleFrontier_ReceptionGate_Text_WelcomeToBattleFrontier, MSGBOX_DEFAULT
msgbox BattleFrontier_ReceptionGate_Text_IssueFrontierPass, MSGBOX_DEFAULT
playfanfare MUS_FANFA4
playfanfare MUS_OBTAIN_ITEM
message BattleFrontier_ReceptionGate_Text_ObtainedFrontierPass
waitfanfare
waitmessage

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

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_SCOTTS_HOUSE",
"name": "BattleFrontier_ScottsHouse",
"layout": "LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE",
"music": "MUS_B_TOWER",
"music": "MUS_B_TOWER_RS",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

6
data/maps/BirthIsland_Exterior/scripts.inc
View File

@@ -71,9 +71,9 @@ BirthIsland_Exterior_EventScript_Deoxys:: @ 8267FC1
setfieldeffectargument 0, LOCALID_DEOXYS_ROCK
setfieldeffectargument 1, 58
setfieldeffectargument 2, 26
dofieldeffect FLDEFF_65
playbgm MUS_RG_DEOEYE, 0
waitfieldeffect FLDEFF_65
dofieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
playbgm MUS_RG_ENCOUNTER_DEOXYS, 0
waitfieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
addobject LOCALID_DEOXYS
applymovement LOCALID_DEOXYS, BirthIsland_Exterior_Movement_DeoxysApproach
waitmovement 0

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

@@ -2,7 +2,7 @@
"id": "MAP_CAVE_OF_ORIGIN_1F",
"name": "CaveOfOrigin_1F",
"layout": "LAYOUT_CAVE_OF_ORIGIN_1F",
"music": "MUS_DAN03",
"music": "MUS_CAVE_OF_ORIGIN",
"region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -51,7 +51,7 @@ CaveOfOrigin_B1F_EventScript_DontRemember:: @ 8235842
CaveOfOrigin_B1F_EventScript_AtSkyPillar:: @ 823584D
msgbox CaveOfOrigin_B1F_Text_WellHeadToSkyPillar, MSGBOX_DEFAULT
closemessage
playse SE_KAIDAN
playse SE_EXIT
fadescreenspeed FADE_TO_BLACK, 4
setflag FLAG_WALLACE_GOES_TO_SKY_PILLAR
setvar VAR_SOOTOPOLIS_CITY_STATE, 3

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

@@ -2,7 +2,7 @@
"id": "MAP_CAVE_OF_ORIGIN_ENTRANCE",
"name": "CaveOfOrigin_Entrance",
"layout": "LAYOUT_CAVE_OF_ORIGIN_ENTRANCE",
"music": "MUS_DAN03",
"music": "MUS_CAVE_OF_ORIGIN",
"region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1",
"name": "CaveOfOrigin_UnusedRubySapphireMap1",
"layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1",
"music": "MUS_DAN03",
"music": "MUS_CAVE_OF_ORIGIN",
"region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
"requires_flash": true,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2",
"name": "CaveOfOrigin_UnusedRubySapphireMap2",
"layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2",
"music": "MUS_DAN03",
"music": "MUS_CAVE_OF_ORIGIN",
"region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
"requires_flash": true,
"weather": "WEATHER_FOG_HORIZONTAL",

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

@@ -2,7 +2,7 @@
"id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3",
"name": "CaveOfOrigin_UnusedRubySapphireMap3",
"layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3",
"music": "MUS_DAN03",
"music": "MUS_CAVE_OF_ORIGIN",
"region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
"requires_flash": true,
"weather": "WEATHER_FOG_HORIZONTAL",

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

@@ -2,7 +2,7 @@
"id": "MAP_CONTEST_HALL",
"name": "ContestHall",
"layout": "LAYOUT_CONTEST_HALL",
"music": "MUS_CONTEST0",
"music": "MUS_CONTEST",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

14
data/maps/ContestHall/scripts.inc
View File

@@ -18,7 +18,7 @@ ContestHall_OnTransition: @ 823B79F
ContestHall_EventScript_ReadyContestMusic:: @ 823B7AF
call ContestHall_EventScript_TryWaitForLink
special ScriptGetMultiplayerId
special GetContestMultiplayerId
compare VAR_RESULT, 0
call_if_eq ContestHall_EventScript_SaveContestMusicPlayer1
compare VAR_RESULT, 1
@@ -32,23 +32,23 @@ ContestHall_EventScript_ReadyContestMusic:: @ 823B7AF
return
ContestHall_EventScript_SaveContestMusicPlayer1:: @ 823B7EF
savebgm MUS_TEST1
savebgm MUS_LINK_CONTEST_P1
return
ContestHall_EventScript_SaveContestMusicPlayer2:: @ 823B7F3
savebgm MUS_TEST2
savebgm MUS_LINK_CONTEST_P2
return
ContestHall_EventScript_SaveContestMusicPlayer3:: @ 823B7F7
savebgm MUS_TEST3
savebgm MUS_LINK_CONTEST_P3
return
ContestHall_EventScript_SaveContestMusicPlayer4:: @ 823B7FB
savebgm MUS_TEST4
savebgm MUS_LINK_CONTEST_P4
return
ContestHall_EventScript_SaveContestMusic:: @ 823B7FF
savebgm MUS_CONTEST0
savebgm MUS_CONTEST
return
ContestHall_OnResume: @ 823B803
@@ -136,7 +136,7 @@ ContestHall_EventScript_SetRandomAudience7:: @ 823B8ED
ContestHall_EventScript_GetRandomAudienceGfxId:: @ 823B8F8
setvar VAR_RESULT, 32
special ScriptRandom
special GenerateContestRand
addvar VAR_RESULT, 1
switch VAR_RESULT
case 1, ContestHall_EventScript_RandomAudienceNinjaBoy

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

@@ -2,7 +2,7 @@
"id": "MAP_CONTEST_HALL_BEAUTY",
"name": "ContestHallBeauty",
"layout": "LAYOUT_CONTEST_HALL_BEAUTY",
"music": "MUS_CONTEST0",
"music": "MUS_CONTEST",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_CONTEST_HALL_COOL",
"name": "ContestHallCool",
"layout": "LAYOUT_CONTEST_HALL_COOL",
"music": "MUS_CONTEST0",
"music": "MUS_CONTEST",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_CONTEST_HALL_CUTE",
"name": "ContestHallCute",
"layout": "LAYOUT_CONTEST_HALL_CUTE",
"music": "MUS_CONTEST0",
"music": "MUS_CONTEST",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_CONTEST_HALL_SMART",
"name": "ContestHallSmart",
"layout": "LAYOUT_CONTEST_HALL_SMART",
"music": "MUS_CONTEST0",
"music": "MUS_CONTEST",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_CONTEST_HALL_TOUGH",
"name": "ContestHallTough",
"layout": "LAYOUT_CONTEST_HALL_TOUGH",
"music": "MUS_CONTEST0",
"music": "MUS_CONTEST",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_DESERT_RUINS",
"name": "DesertRuins",
"layout": "LAYOUT_DESERT_RUINS",
"music": "MUS_MABOROSI",
"music": "MUS_SEALED_CHAMBER",
"region_map_section": "MAPSEC_DESERT_RUINS",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_DESERT_UNDERPASS",
"name": "DesertUnderpass",
"layout": "LAYOUT_DESERT_UNDERPASS",
"music": "MUS_TOZAN",
"music": "MUS_MT_CHIMNEY",
"region_map_section": "MAPSEC_DESERT_UNDERPASS",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -2,7 +2,7 @@
"id": "MAP_DEWFORD_TOWN",
"name": "DewfordTown",
"layout": "LAYOUT_DEWFORD_TOWN",
"music": "MUS_HIGHTOWN",
"music": "MUS_DEWFORD",
"region_map_section": "MAPSEC_DEWFORD_TOWN",
"requires_flash": false,
"weather": "WEATHER_SUNNY",

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