summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/day_care.inc2
-rw-r--r--data/scripts/gabby_and_ty.inc26
-rw-r--r--data/scripts/magma_chimney.inc4
-rw-r--r--data/scripts/magma_summit.inc12
4 files changed, 22 insertions, 22 deletions
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 56ed0d9ab..34ba18f08 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -47,7 +47,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2
end
Route117_EventScript_1B22CD:: @ 81B22CD
- specialvar RESULT, sub_8042B4C
+ specialvar RESULT, DaycareMonReceivedMail
compare RESULT, 1
call_if_eq Route117_EventScript_1B22DE
return
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 957d56609..b1c47fa62 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -1,7 +1,7 @@
Route111_EventScript_1AE313:: @ 81AE313
Route118_EventScript_1AE313:: @ 81AE313
Route120_EventScript_1AE313:: @ 81AE313
- cleartrainerflag OPPONENT_GABBY_AND_TY_6
+ cleartrainerflag TRAINER_GABBY_AND_TY_6
specialvar RESULT, GabbyAndTyGetBattleNum
switch RESULT
case 0, Route111_EventScript_1AE384
@@ -124,61 +124,61 @@ Route111_EventScript_1AE41E:: @ 81AE41E
return
Route111_EventScript_1AE422:: @ 81AE422
- trainerbattle 6, OPPONENT_GABBY_AND_TY_1, 0, Route111_Text_1ABED8, Route111_Text_1ABFD3, Route111_Text_1AC5CA, Route111_EventScript_1AE5A2
+ trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_1ABED8, Route111_Text_1ABFD3, Route111_Text_1AC5CA, Route111_EventScript_1AE5A2
msgbox Route111_Text_1AC59E, 4
release
end
Route111_EventScript_1AE442:: @ 81AE442
- trainerbattle 6, OPPONENT_GABBY_AND_TY_1, 0, Route111_Text_1AC73B, Route111_Text_1AC892, Route111_Text_1AC820, Route111_EventScript_1AE5A2
+ trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_1AC73B, Route111_Text_1AC892, Route111_Text_1AC820, Route111_EventScript_1AE5A2
msgbox Route111_Text_1AC7E4, 4
release
end
Route118_EventScript_1AE462:: @ 81AE462
- trainerbattle 6, OPPONENT_GABBY_AND_TY_2, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F
+ trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F
msgbox Route118_Text_1AC59E, 4
release
end
Route118_EventScript_1AE482:: @ 81AE482
- trainerbattle 6, OPPONENT_GABBY_AND_TY_2, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F
+ trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F
msgbox Route118_Text_1AC7E4, 4
release
end
Route120_EventScript_1AE4A2:: @ 81AE4A2
- trainerbattle 6, OPPONENT_GABBY_AND_TY_3, 0, Route120_Text_1ABF50, Route120_Text_1AC6F8, Route120_Text_1AC5CA, Route120_EventScript_1AE60F
+ trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_1ABF50, Route120_Text_1AC6F8, Route120_Text_1AC5CA, Route120_EventScript_1AE60F
msgbox Route120_Text_1AC59E, 4
release
end
Route120_EventScript_1AE4C2:: @ 81AE4C2
- trainerbattle 6, OPPONENT_GABBY_AND_TY_3, 0, Route120_Text_1AC790, Route120_Text_1AC8D7, Route120_Text_1AC820, Route120_EventScript_1AE60F
+ trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_1AC790, Route120_Text_1AC8D7, Route120_Text_1AC820, Route120_EventScript_1AE60F
msgbox Route120_Text_1AC7E4, 4
release
end
Route111_EventScript_1AE4E2:: @ 81AE4E2
- trainerbattle 6, OPPONENT_GABBY_AND_TY_4, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F
+ trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F
msgbox Route111_Text_1AC59E, 4
release
end
Route111_EventScript_1AE502:: @ 81AE502
- trainerbattle 6, OPPONENT_GABBY_AND_TY_4, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F
+ trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F
msgbox Route111_Text_1AC7E4, 4
release
end
Route118_EventScript_1AE522:: @ 81AE522
- trainerbattle 6, OPPONENT_GABBY_AND_TY_5, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F
+ trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F
msgbox Route118_Text_1AC59E, 4
release
end
Route118_EventScript_1AE542:: @ 81AE542
- trainerbattle 6, OPPONENT_GABBY_AND_TY_5, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F
+ trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F
msgbox Route118_Text_1AC7E4, 4
release
end
@@ -186,7 +186,7 @@ Route118_EventScript_1AE542:: @ 81AE542
Route111_EventScript_1AE562:: @ 81AE562
Route118_EventScript_1AE562:: @ 81AE562
Route120_EventScript_1AE562:: @ 81AE562
- trainerbattle 6, OPPONENT_GABBY_AND_TY_6, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F
+ trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F
msgbox Route111_Text_1AC59E, 4
release
end
@@ -194,7 +194,7 @@ Route120_EventScript_1AE562:: @ 81AE562
Route111_EventScript_1AE582:: @ 81AE582
Route118_EventScript_1AE582:: @ 81AE582
Route120_EventScript_1AE582:: @ 81AE582
- trainerbattle 6, OPPONENT_GABBY_AND_TY_6, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F
+ trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F
msgbox Route111_Text_1AC7E4, 4
release
end
diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc
index ed81e6628..daa8c96db 100644
--- a/data/scripts/magma_chimney.inc
+++ b/data/scripts/magma_chimney.inc
@@ -46,9 +46,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB
msgbox MtChimney_Text_1B38B3, 4
.endif
.ifdef SAPPHIRE
- trainerbattle 3, OPPONENT_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3099
+ trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3099
.else
- trainerbattle 3, OPPONENT_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3A68
+ trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3A68
.endif
.ifdef SAPPHIRE
msgbox MtChimney_Text_1B30C2, 4
diff --git a/data/scripts/magma_summit.inc b/data/scripts/magma_summit.inc
index ac71b038f..0992a62c0 100644
--- a/data/scripts/magma_summit.inc
+++ b/data/scripts/magma_summit.inc
@@ -1,29 +1,29 @@
MtPyre_Summit_EventScript_1B2DA9:: @ 81B2DA9
.ifdef SAPPHIRE
- trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, 0, UnknownString_81B50C3, UnknownString_81B50F5
+ trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, UnknownString_81B50C3, UnknownString_81B50F5
msgbox UnknownString_81B5131, 6
.else
- trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, 0, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30
+ trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30
msgbox MtPyre_Summit_Text_1B5D6D, 6
.endif
end
MtPyre_Summit_EventScript_1B2DC0:: @ 81B2DC0
.ifdef SAPPHIRE
- trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, 0, UnknownString_81B5166, UnknownString_81B519F
+ trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, UnknownString_81B5166, UnknownString_81B519F
msgbox UnknownString_81B51B5, 6
.else
- trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, 0, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB
+ trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB
msgbox MtPyre_Summit_Text_1B5DF1, 6
.endif
end
MtPyre_Summit_EventScript_1B2DD7:: @ 81B2DD7
.ifdef SAPPHIRE
- trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, 0, UnknownString_81B51EB, UnknownString_81B5224
+ trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, UnknownString_81B51EB, UnknownString_81B5224
msgbox UnknownString_81B5248, 6
.else
- trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, 0, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60
+ trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60
msgbox MtPyre_Summit_Text_1B5E84, 6
.endif
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 10:42:33 +0000