summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/battle_ai_scripts.s30
-rw-r--r--data/battle_anim_scripts.s64
-rw-r--r--data/battle_scripts_1.s6
-rw-r--r--data/maps/CaveOfOrigin_1F/scripts.inc2
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc2
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc2
-rw-r--r--data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc2
-rw-r--r--data/scripts/cave_of_origin.inc2
-rw-r--r--data/scripts/pkmn_center_nurse.inc8
-rw-r--r--data/scripts/record_mix.inc7
10 files changed, 67 insertions, 58 deletions
diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s
index d1dd1caed..56be92c5e 100644
--- a/data/battle_ai_scripts.s
+++ b/data/battle_ai_scripts.s
@@ -462,18 +462,18 @@ AI_CBM_Attract: @ 82DC5F5
get_ability AI_TARGET
if_equal ABILITY_OBLIVIOUS, Score_Minus10
get_gender AI_USER
- if_equal 0, AI_CBM_Attract_CheckIfTargetIsFemale
- if_equal 254, AI_CBM_Attract_CheckIfTargetIsMale
+ if_equal MON_MALE, AI_CBM_Attract_CheckIfTargetIsFemale
+ if_equal MON_FEMALE, AI_CBM_Attract_CheckIfTargetIsMale
goto Score_Minus10
AI_CBM_Attract_CheckIfTargetIsFemale: @ 82DC61A
get_gender AI_TARGET
- if_equal 254, AI_CBM_Attract_End
+ if_equal MON_FEMALE, AI_CBM_Attract_End
goto Score_Minus10
AI_CBM_Attract_CheckIfTargetIsMale: @ 82DC627
get_gender AI_TARGET
- if_equal 0, AI_CBM_Attract_End
+ if_equal MON_MALE, AI_CBM_Attract_End
goto Score_Minus10
AI_CBM_Attract_End: @ 82DC634
@@ -2057,12 +2057,22 @@ AI_CV_Protect_ScoreDown2:
AI_CV_Protect_End:
end
+@ BUG: Foresight is only encouraged if the user is Ghost type or
+@ has high evasion, but should check target instead
AI_CV_Foresight:
+.ifdef BUGFIX
+ get_target_type1
+ if_equal TYPE_GHOST, AI_CV_Foresight2
+ get_target_type2
+ if_equal TYPE_GHOST, AI_CV_Foresight2
+ if_stat_level_more_than AI_TARGET, STAT_EVASION, 8, AI_CV_Foresight3
+.else
get_user_type1
if_equal TYPE_GHOST, AI_CV_Foresight2
get_user_type2
if_equal TYPE_GHOST, AI_CV_Foresight2
if_stat_level_more_than AI_USER, STAT_EVASION, 8, AI_CV_Foresight3
+.endif
score -2
goto AI_CV_Foresight_End
@@ -2329,13 +2339,13 @@ AI_CV_SemiInvulnerable2:
if_status2 AI_TARGET, STATUS2_CURSED, AI_CV_SemiInvulnerable_TryEncourage
if_status3 AI_TARGET, STATUS3_LEECHSEED, AI_CV_SemiInvulnerable_TryEncourage
get_weather
- .ifdef BUGFIX
+.ifdef BUGFIX
if_equal AI_WEATHER_HAIL, AI_CV_SemiInvulnerable_CheckIceType
if_equal AI_WEATHER_SANDSTORM, AI_CV_SemiInvulnerable_CheckSandstormTypes
- .else
+.else
if_equal AI_WEATHER_HAIL, AI_CV_SemiInvulnerable_CheckSandstormTypes
if_equal AI_WEATHER_SANDSTORM, AI_CV_SemiInvulnerable_CheckIceType
- .endif
+.endif
goto AI_CV_SemiInvulnerable5
AI_CV_SemiInvulnerable_CheckSandstormTypes:
@@ -2404,11 +2414,11 @@ AI_CV_Hail_End:
@ BUG: Facade score is increased if the target is statused, but should be if the user is
AI_CV_Facade:
- .ifdef BUGFIX
+.ifdef BUGFIX
if_not_status AI_USER, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, AI_CV_Facade_End
- .else
+.else
if_not_status AI_TARGET, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, AI_CV_Facade_End
- .endif
+.endif
score +1
AI_CV_Facade_End:
end
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index b4bb33993..2344007a5 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -374,41 +374,41 @@ gBattleAnims_Moves::
.align 2
gBattleAnims_StatusConditions::
- .4byte Status_Poison
- .4byte Status_Confusion
- .4byte Status_Burn
- .4byte Status_Infatuation
- .4byte Status_Sleep
- .4byte Status_Paralysis
- .4byte Status_Freeze
- .4byte Status_Curse
- .4byte Status_Nightmare
+ .4byte Status_Poison @ B_ANIM_STATUS_PSN
+ .4byte Status_Confusion @ B_ANIM_STATUS_CONFUSION
+ .4byte Status_Burn @ B_ANIM_STATUS_BRN
+ .4byte Status_Infatuation @ B_ANIM_STATUS_INFATUATION
+ .4byte Status_Sleep @ B_ANIM_STATUS_SLP
+ .4byte Status_Paralysis @ B_ANIM_STATUS_PRZ
+ .4byte Status_Freeze @ B_ANIM_STATUS_FRZ
+ .4byte Status_Curse @ B_ANIM_STATUS_CURSED
+ .4byte Status_Nightmare @ B_ANIM_STATUS_NIGHTMARE
.align 2
gBattleAnims_General::
- .4byte General_CastformChange
- .4byte General_StatsChange
- .4byte General_SubstituteFade
- .4byte General_SubstituteAppear
- .4byte General_PokeblockThrow
- .4byte General_ItemKnockoff
- .4byte General_TurnTrap
- .4byte General_HeldItemEffect
- .4byte General_SmokeballEscape
- .4byte General_FocusBand
- .4byte General_Rain
- .4byte General_Sun
- .4byte General_Sandstorm
- .4byte General_Hail
- .4byte General_LeechSeedDrain
- .4byte General_MonHit
- .4byte General_ItemSteal
- .4byte General_SnatchMove
- .4byte General_FutureSightHit
- .4byte General_DoomDesireHit
- .4byte General_FocusPunchSetUp
- .4byte General_IngrainHeal
- .4byte General_WishHeal
+ .4byte General_CastformChange @ B_ANIM_CASTFORM_CHANGE
+ .4byte General_StatsChange @ B_ANIM_STATS_CHANGE
+ .4byte General_SubstituteFade @ B_ANIM_SUBSTITUTE_FADE
+ .4byte General_SubstituteAppear @ B_ANIM_SUBSTITUTE_APPEAR
+ .4byte General_PokeblockThrow @ B_ANIM_POKEBLOCK_THROW
+ .4byte General_ItemKnockoff @ B_ANIM_ITEM_KNOCKOFF
+ .4byte General_TurnTrap @ B_ANIM_TURN_TRAP
+ .4byte General_HeldItemEffect @ B_ANIM_HELD_ITEM_EFFECT
+ .4byte General_SmokeballEscape @ B_ANIM_SMOKEBALL_ESCAPE
+ .4byte General_FocusBand @ B_ANIM_FOCUS_BAND
+ .4byte General_Rain @ B_ANIM_RAIN_CONTINUES
+ .4byte General_Sun @ B_ANIM_SUN_CONTINUES
+ .4byte General_Sandstorm @ B_ANIM_SANDSTORM_CONTINUES
+ .4byte General_Hail @ B_ANIM_HAIL_CONTINUES
+ .4byte General_LeechSeedDrain @ B_ANIM_LEECH_SEED_DRAIN
+ .4byte General_MonHit @ B_ANIM_MON_HIT
+ .4byte General_ItemSteal @ B_ANIM_ITEM_STEAL
+ .4byte General_SnatchMove @ B_ANIM_SNATCH_MOVE
+ .4byte General_FutureSightHit @ B_ANIM_FUTURE_SIGHT_HIT
+ .4byte General_DoomDesireHit @ B_ANIM_DOOM_DESIRE_HIT
+ .4byte General_FocusPunchSetUp @ B_ANIM_FOCUS_PUNCH_SETUP
+ .4byte General_IngrainHeal @ B_ANIM_INGRAIN_HEAL
+ .4byte General_WishHeal @ B_ANIM_WISH_HEAL
.align 2
gBattleAnims_Special::
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 873425c63..1c3f3ea5b 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -2860,7 +2860,7 @@ BattleScript_FaintedMonTryChooseAnother::
switchhandleorder BS_FAINTED, 0x2
jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_LINK, BattleScript_FaintedMonChooseAnother
- jumpifbattletype BATTLE_TYPE_x2000000, BattleScript_FaintedMonChooseAnother
+ jumpifbattletype BATTLE_TYPE_RECORDED_LINK, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonChooseAnother
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonChooseAnother
@@ -2978,7 +2978,7 @@ BattleScript_LocalBattleLostPrintTrainersWinText::
trainerslidein BS_ATTACKER
waitstate
printstring STRINGID_TRAINER1WINTEXT
- jumpifbattletype BATTLE_TYPE_x800000, BattleScript_LocalBattleLostDoTrainer2WinText
+ jumpifbattletype BATTLE_TYPE_TOWER_LINK_MULTI, BattleScript_LocalBattleLostDoTrainer2WinText
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_LocalBattleLostEnd_
BattleScript_LocalBattleLostDoTrainer2WinText::
trainerslideout B_POSITION_OPPONENT_LEFT
@@ -3834,7 +3834,7 @@ BattleScript_MoveUsedIsConfusedNoMore::
return
BattleScript_PrintPayDayMoneyString::
- printstring STRINGID_PKMNPICKEDUPITEM
+ printstring STRINGID_PLAYERPICKEDUPMONEY
waitmessage 0x40
return
diff --git a/data/maps/CaveOfOrigin_1F/scripts.inc b/data/maps/CaveOfOrigin_1F/scripts.inc
index de1d979d4..943a9e9ed 100644
--- a/data/maps/CaveOfOrigin_1F/scripts.inc
+++ b/data/maps/CaveOfOrigin_1F/scripts.inc
@@ -3,5 +3,5 @@ CaveOfOrigin_1F_MapScripts:: @ 8235768
.byte 0
CaveOfOrigin_1F_OnTransition: @ 823576E
- call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_SetTempVars
+ call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers
end
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc
index 326ea21e3..9f3fefdeb 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc
@@ -3,5 +3,5 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778
.byte 0
CaveOfOrigin_UnusedRubySapphireMap1_OnTransition: @ 823577E
- call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_SetTempVars
+ call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers
end
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc
index 5e92a7d45..60b1f0cca 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc
@@ -3,6 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788
.byte 0
CaveOfOrigin_UnusedRubySapphireMap2_OnTransition: @ 823578E
- call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_SetTempVars
+ call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers
end
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc
index 2f0e2b66c..e30b50cbe 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc
@@ -3,6 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798
.byte 0
CaveOfOrigin_UnusedRubySapphireMap3_OnTransition: @ 823579E
- call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_SetTempVars
+ call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers
end
diff --git a/data/scripts/cave_of_origin.inc b/data/scripts/cave_of_origin.inc
index 52a1da84f..579efdb89 100644
--- a/data/scripts/cave_of_origin.inc
+++ b/data/scripts/cave_of_origin.inc
@@ -36,7 +36,7 @@ CaveOfOrigin_EventScript_Shake:: @ 82722A7
releaseall
end
-CaveOfOrigin_EventScript_SetTempVars:: @ 82722C1
+CaveOfOrigin_EventScript_DisableTriggers:: @ 82722C1
setvar VAR_TEMP_1, 1
setvar VAR_TEMP_2, 1
setvar VAR_TEMP_3, 1
diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc
index a26e9e22a..6b4bbe2ef 100644
--- a/data/scripts/pkmn_center_nurse.inc
+++ b/data/scripts/pkmn_center_nurse.inc
@@ -65,7 +65,7 @@ EventScript_PkmnCenterNurse_ReturnPkmn:: @ 82719E2
goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn2
message gText_RestoredPkmnToFullHealth
waitmessage
- applymovement VAR_0x800B, EventScript_PkmnCenterNurse_Bow
+ applymovement VAR_0x800B, Movement_PkmnCenterNurse_Bow
waitmovement 0
message gText_WeHopeToSeeYouAgain
return
@@ -73,7 +73,7 @@ EventScript_PkmnCenterNurse_ReturnPkmn:: @ 82719E2
EventScript_PkmnCenterNurse_ReturnPkmn2:: @ 8271A03
message gText_ThankYouForWaiting
waitmessage
- applymovement VAR_0x800B, EventScript_PkmnCenterNurse_Bow
+ applymovement VAR_0x800B, Movement_PkmnCenterNurse_Bow
waitmovement 0
message gText_WeHopeToSeeYouAgain2
return
@@ -84,7 +84,7 @@ EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom:: @ 8271A19
setflag FLAG_NURSE_UNION_ROOM_REMINDER
message CableClub_Text_PlayerIsWaiting
waitmessage
- applymovement VAR_0x800B, EventScript_PkmnCenterNurse_Bow
+ applymovement VAR_0x800B, Movement_PkmnCenterNurse_Bow
waitmovement 0
message gText_WeHopeToSeeYouAgain
return
@@ -129,7 +129,7 @@ EventScript_PkmnCenterNurse_GoldCardHealPkmn:: @ 8271AC5
goto EventScript_PkmnCenterNurse_HealPkmn
end
-EventScript_PkmnCenterNurse_Bow: @ 8271AD0
+Movement_PkmnCenterNurse_Bow: @ 8271AD0
nurse_joy_bow
delay_4
step_end
diff --git a/data/scripts/record_mix.inc b/data/scripts/record_mix.inc
index 23f224ae4..e058816ab 100644
--- a/data/scripts/record_mix.inc
+++ b/data/scripts/record_mix.inc
@@ -6,16 +6,15 @@ EventScript_MixRecordsPrompt:: @ 8271D5E
compare VAR_RESULT, YES
goto_if_eq EventScript_MixRecords
compare VAR_RESULT, NO
- goto_if_eq EventScript_DeclineMixRecords
- goto EventScript_DeclineMixRecords
+ goto_if_eq EventScript_EndMixRecords
+ goto EventScript_EndMixRecords
EventScript_MixRecords:: @ 8271D83
special RecordMixingPlayerSpotTriggered
waitstate
lock
faceplayer
-
-EventScript_DeclineMixRecords:: @ 8271D89
+EventScript_EndMixRecords:: @ 8271D89
message Text_WeHopeToSeeYouAgain
waitmessage
waitbuttonpress
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 01:55:44 +0000