ref: 7b2515d1e47198322407081dfe57c7ca49f22c5f
parent: 2354c41a96bdf80861338add2f0b3a67b18f160e
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Tue Jun 16 10:11:49 EDT 2020
[in progress] Harmonize more constant and data files with pokegold
--- a/constants/credits_constants.asm
+++ b/constants/credits_constants.asm
@@ -1,4 +1,4 @@
-; CreditsStrings indexes (see data/credits_strings.asm)
+; CreditsStringsPointers indexes (see data/credits_strings.asm)
const_def
const SATOSHI_TAJIRI
const JUNICHI_MASUDA
--- a/constants/engine_flags.asm
+++ b/constants/engine_flags.asm
@@ -122,30 +122,30 @@
; wCelebiEvent
const ENGINE_FOREST_IS_RESTLESS
; wDailyRematchFlags
- const ENGINE_JACK
- const ENGINE_HUEY
- const ENGINE_GAVEN
- const ENGINE_BETH
- const ENGINE_JOSE
- const ENGINE_REENA
- const ENGINE_JOEY
- const ENGINE_WADE
- const ENGINE_RALPH
- const ENGINE_LIZ
- const ENGINE_ANTHONY
- const ENGINE_TODD
- const ENGINE_GINA
- const ENGINE_ARNIE
- const ENGINE_ALAN
- const ENGINE_DANA
- const ENGINE_CHAD
- const ENGINE_TULLY
- const ENGINE_BRENT
- const ENGINE_TIFFANY
- const ENGINE_VANCE
- const ENGINE_WILTON
- const ENGINE_PARRY
- const ENGINE_ERIN
+ const ENGINE_JACK_READY_FOR_REMATCH
+ const ENGINE_HUEY_READY_FOR_REMATCH
+ const ENGINE_GAVEN_READY_FOR_REMATCH
+ const ENGINE_BETH_READY_FOR_REMATCH
+ const ENGINE_JOSE_READY_FOR_REMATCH
+ const ENGINE_REENA_READY_FOR_REMATCH
+ const ENGINE_JOEY_READY_FOR_REMATCH
+ const ENGINE_WADE_READY_FOR_REMATCH
+ const ENGINE_RALPH_READY_FOR_REMATCH
+ const ENGINE_LIZ_READY_FOR_REMATCH
+ const ENGINE_ANTHONY_READY_FOR_REMATCH
+ const ENGINE_TODD_READY_FOR_REMATCH
+ const ENGINE_GINA_READY_FOR_REMATCH
+ const ENGINE_ARNIE_READY_FOR_REMATCH
+ const ENGINE_ALAN_READY_FOR_REMATCH
+ const ENGINE_DANA_READY_FOR_REMATCH
+ const ENGINE_CHAD_READY_FOR_REMATCH
+ const ENGINE_TULLY_READY_FOR_REMATCH
+ const ENGINE_BRENT_READY_FOR_REMATCH
+ const ENGINE_TIFFANY_READY_FOR_REMATCH
+ const ENGINE_VANCE_READY_FOR_REMATCH
+ const ENGINE_WILTON_READY_FOR_REMATCH
+ const ENGINE_PARRY_READY_FOR_REMATCH
+ const ENGINE_ERIN_READY_FOR_REMATCH
; wDailyPhoneItemFlags
const ENGINE_BEVERLY_HAS_NUGGET
const ENGINE_JOSE_HAS_STAR_PIECE
--- a/constants/event_flags.asm
+++ b/constants/event_flags.asm
@@ -621,11 +621,11 @@
const EVENT_GAVE_KURT_PNK_APRICORN
; Phone events
const EVENT_JACK_ASKED_FOR_PHONE_NUMBER
- const EVENT_260
+ const EVENT_260 ; unused
const EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER
- const EVENT_262
+ const EVENT_262 ; unused
const EVENT_HUEY_ASKED_FOR_PHONE_NUMBER
- const EVENT_264
+ const EVENT_264 ; unused
const EVENT_GOT_PROTEIN_FROM_HUEY
const EVENT_GOT_HP_UP_FROM_JOEY
const EVENT_GOT_CARBOS_FROM_VANCE
--- a/constants/sprite_anim_constants.asm
+++ b/constants/sprite_anim_constants.asm
@@ -47,7 +47,7 @@
const SPRITE_ANIM_INDEX_CUT_TREE ; 17
const SPRITE_ANIM_INDEX_FLY_LEAF ; 18
const SPRITE_ANIM_INDEX_EGG_CRACK ; 19
- const SPRITE_ANIM_INDEX_GS_INTRO_HO_OH ; 1a
+ const SPRITE_ANIM_INDEX_GS_INTRO_HO_OH_LUGIA ; 1a
const SPRITE_ANIM_INDEX_HEADBUTT ; 1b
const SPRITE_ANIM_INDEX_EGG_HATCH ; 1c
const SPRITE_ANIM_INDEX_EZCHAT_CURSOR ; 1d
@@ -94,7 +94,7 @@
const SPRITE_ANIM_SEQ_FLY_FROM ; 16
const SPRITE_ANIM_SEQ_FLY_LEAF ; 17
const SPRITE_ANIM_SEQ_FLY_TO ; 18
- const SPRITE_ANIM_SEQ_GS_INTRO_HO_OH ; 19
+ const SPRITE_ANIM_SEQ_GS_INTRO_HO_OH_LUGIA ; 19
const SPRITE_ANIM_SEQ_EZCHAT_CURSOR ; 1a
const SPRITE_ANIM_SEQ_MOBILE_TRADE_SENT_PULSE ; 1b
const SPRITE_ANIM_SEQ_MOBILE_TRADE_OT_PULSE ; 1c
@@ -143,7 +143,7 @@
const SPRITE_ANIM_FRAMESET_EGG_HATCH_2 ; 21
const SPRITE_ANIM_FRAMESET_EGG_HATCH_3 ; 22
const SPRITE_ANIM_FRAMESET_EGG_HATCH_4 ; 23
- const SPRITE_ANIM_FRAMESET_GS_INTRO_HO_OH ; 24
+ const SPRITE_ANIM_FRAMESET_GS_INTRO_HO_OH_LUGIA ; 24
const SPRITE_ANIM_FRAMESET_HEADBUTT ; 25
const SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_1 ; 26
const SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 27
@@ -184,10 +184,10 @@
const SPRITE_ANIM_OAMSET_GS_INTRO_SHELLDER_2 ; 05
const SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_1 ; 06
const SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_2 ; 07
- const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1 ; 08
- const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_2 ; 09
- const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3 ; 0a
- const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_4 ; 0b
+ const SPRITE_ANIM_OAMSET_GS_INTRO_UNUSED_LAPRAS ; 08
+ const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1 ; 09
+ const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_2 ; 0a
+ const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3 ; 0b
const SPRITE_ANIM_OAMSET_GS_INTRO_NOTE ; 0c
const SPRITE_ANIM_OAMSET_GS_INTRO_INVISIBLE_NOTE ; 0d
const SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1 ; 0e
@@ -262,11 +262,11 @@
const SPRITE_ANIM_OAMSET_CUT_TREE_4 ; 53
const SPRITE_ANIM_OAMSET_EGG_CRACK ; 54
const SPRITE_ANIM_OAMSET_EGG_HATCH ; 55
- const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_1 ; 56
- const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_2 ; 57
- const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_3 ; 58
- const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_4 ; 59
- const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_5 ; 5a
+ const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_1 ; 56
+ const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_2 ; 57
+ const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_3 ; 58
+ const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_4 ; 59
+ const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_5 ; 5a
const SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2 ; 5b
const SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_1 ; 5c
const SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_2 ; 5d
--- a/data/credits_strings.asm
+++ b/data/credits_strings.asm
@@ -1,4 +1,4 @@
-CreditsStrings:
+CreditsStringsPointers:
; entries correspond to constants/credits_constants.asm
dw .SatoshiTajiri
dw .JunichiMasuda
--- a/data/sprite_anims/framesets.asm
+++ b/data/sprite_anims/framesets.asm
@@ -36,7 +36,7 @@
dw .Frameset_EggHatch2
dw .Frameset_EggHatch3
dw .Frameset_EggHatch4
- dw .Frameset_GSIntroHoOh
+ dw .Frameset_GSIntroHoOhLugia
dw .Frameset_HeadbuttTree
dw .Frameset_EZChatCursor1
dw .Frameset_EZChatCursor2
@@ -325,13 +325,13 @@
frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32, OAM_X_FLIP, OAM_Y_FLIP
endanim
-.Frameset_GSIntroHoOh:
- frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_1, 10
- frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_2, 9
- frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_3, 10
- frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_4, 10
- frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_3, 9
- frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_5, 10
+.Frameset_GSIntroHoOhLugia:
+ frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_1, 10
+ frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_2, 9
+ frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_3, 10
+ frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_4, 10
+ frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_3, 9
+ frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_5, 10
dorestart
.Frameset_HeadbuttTree:
--- a/data/sprite_anims/oam.asm
+++ b/data/sprite_anims/oam.asm
@@ -9,10 +9,10 @@
dbw $6e, .OAMData_GSIntroShellder ; SPRITE_ANIM_OAMSET_GS_INTRO_SHELLDER_2
dbw $2d, .OAMData_GSIntroMagikarp ; SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_1
dbw $4d, .OAMData_GSIntroMagikarp ; SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_2
- dbw $60, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1
+ dbw $60, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_UNUSED_LAPRAS
+ dbw $00, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1
dbw $00, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_2
- dbw $00, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3
- dbw $06, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_4
+ dbw $06, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3
dbw $0c, .OAMData_GSIntroNote ; SPRITE_ANIM_OAMSET_GS_INTRO_NOTE
dbw $0d, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_INVISIBLE_NOTE
dbw $00, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1
@@ -87,11 +87,11 @@
dbw $00, .OAMData_CutTree4 ; SPRITE_ANIM_OAMSET_CUT_TREE_4
dbw $00, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_EGG_CRACK
dbw $01, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_EGG_HATCH
- dbw $00, .OAMData_GSIntroHoOh1 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_1
- dbw $00, .OAMData_GSIntroHoOh2 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_2
- dbw $00, .OAMData_GSIntroHoOh3 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_3
- dbw $00, .OAMData_GSIntroHoOh4 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_4
- dbw $00, .OAMData_GSIntroHoOh5 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_5
+ dbw $00, .OAMData_GSIntroHoOhLugia1 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_1
+ dbw $00, .OAMData_GSIntroHoOhLugia2 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_2
+ dbw $00, .OAMData_GSIntroHoOhLugia3 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_3
+ dbw $00, .OAMData_GSIntroHoOhLugia4 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_4
+ dbw $00, .OAMData_GSIntroHoOhLugia5 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_5
dbw $04, .OAMData_Tree ; SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2
dbw $00, .OAMData_EZChatCursor1 ; SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_1
dbw $00, .OAMData_EZChatCursor2 ; SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_2
@@ -586,7 +586,7 @@
dbsprite -2, 0, 0, 0, $02, PAL_OW_TREE
dbsprite 1, 0, 0, 0, $03, PAL_OW_TREE
-.OAMData_GSIntroHoOh1:
+.OAMData_GSIntroHoOhLugia1:
db 19
dbsprite -4, -1, 0, 0, $00, 0
dbsprite -3, -2, 0, 0, $02, 0
@@ -608,7 +608,7 @@
dbsprite 3, -2, 0, 0, $22, 0
dbsprite 3, 0, 0, 0, $24, 0
-.OAMData_GSIntroHoOh2:
+.OAMData_GSIntroHoOhLugia2:
db 16
dbsprite -4, -1, 0, 0, $00, 0
dbsprite -3, -2, 0, 0, $02, 0
@@ -627,7 +627,7 @@
dbsprite 3, -2, 0, 0, $22, 0
dbsprite 3, 0, 0, 0, $24, 0
-.OAMData_GSIntroHoOh3:
+.OAMData_GSIntroHoOhLugia3:
db 15
dbsprite -4, -1, 0, 0, $00, 0
dbsprite -3, -2, 0, 0, $02, 0
@@ -645,7 +645,7 @@
dbsprite 3, -2, 0, 0, $22, 0
dbsprite 3, 0, 0, 0, $24, 0
-.OAMData_GSIntroHoOh4:
+.OAMData_GSIntroHoOhLugia4:
db 17
dbsprite -4, -1, 0, 0, $00, 0
dbsprite -3, -2, 0, 0, $02, 0
@@ -665,7 +665,7 @@
dbsprite 3, -2, 0, 0, $22, 0
dbsprite 3, 0, 0, 0, $24, 0
-.OAMData_GSIntroHoOh5:
+.OAMData_GSIntroHoOhLugia5:
db 17
dbsprite -4, -1, 0, 0, $00, 0
dbsprite -3, -2, 0, 0, $02, 0
--- a/data/sprite_anims/sequences.asm
+++ b/data/sprite_anims/sequences.asm
@@ -1,6 +1,6 @@
SpriteAnimSeqData:
; entries correspond to SPRITE_ANIM_INDEX_* constants
- ; frameset sequence, tile
+ ; frameset, sequence, tile
db SPRITE_ANIM_FRAMESET_PARTY_MON, SPRITE_ANIM_SEQ_PARTY_MON, $00 ; SPRITE_ANIM_INDEX_PARTY_MON
db SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL, SPRITE_ANIM_SEQ_GS_TITLE_TRAIL, $00 ; SPRITE_ANIM_INDEX_GS_TITLE_TRAIL
db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR, SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR, $05 ; SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR
@@ -27,7 +27,7 @@
db SPRITE_ANIM_FRAMESET_CUT_TREE, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_CUT_TREE
db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_SEQ_FLY_LEAF, $00 ; SPRITE_ANIM_INDEX_FLY_LEAF
db SPRITE_ANIM_FRAMESET_EGG_CRACK, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_EGG_CRACK
- db SPRITE_ANIM_FRAMESET_GS_INTRO_HO_OH, SPRITE_ANIM_SEQ_GS_INTRO_HO_OH, $00 ; SPRITE_ANIM_INDEX_GS_INTRO_HO_OH
+ db SPRITE_ANIM_FRAMESET_GS_INTRO_HO_OH_LUGIA, SPRITE_ANIM_SEQ_GS_INTRO_HO_OH_LUGIA, $00 ; SPRITE_ANIM_INDEX_GS_INTRO_HO_OH_LUGIA
db SPRITE_ANIM_FRAMESET_HEADBUTT, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_HEADBUTT
db SPRITE_ANIM_FRAMESET_EGG_HATCH_1, SPRITE_ANIM_SEQ_REVEAL_NEW_MON, $00 ; SPRITE_ANIM_INDEX_EGG_HATCH
db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_1, SPRITE_ANIM_SEQ_EZCHAT_CURSOR, $00 ; SPRITE_ANIM_INDEX_EZCHAT_CURSOR
--- a/engine/gfx/sprite_anims.asm
+++ b/engine/gfx/sprite_anims.asm
@@ -38,7 +38,7 @@
dw .FlyFrom
dw .FlyLeaf
dw .FlyTo
- dw .GSIntroHoOh
+ dw .GSIntroHoOhLugia
dw .EZChatCursor
dw .MobileTradeSentPulse
dw .MobileTradeOTPulse
@@ -198,7 +198,7 @@
call DeinitializeSprite
ret
-.GSIntroHoOh
+.GSIntroHoOhLugia
ld hl, SPRITEANIMSTRUCT_0C
add hl, bc
ld a, [hl]
--- a/engine/movie/credits.asm
+++ b/engine/movie/credits.asm
@@ -275,7 +275,7 @@
push af
ld e, a
ld d, 0
- ld hl, CreditsStrings
+ ld hl, CreditsStringsPointers
add hl, de
add hl, de
ld a, [hli]
--- a/engine/phone/scripts/alan.asm
+++ b/engine/phone/scripts/alan.asm
@@ -1,6 +1,6 @@
AlanPhoneCalleeScript:
gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1
- checkflag ENGINE_ALAN
+ checkflag ENGINE_ALAN_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_ALAN_WEDNESDAY_AFTERNOON
@@ -26,7 +26,7 @@
AlanPhoneCallerScript:
gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1
farscall PhoneScript_GreetPhone_Male
- checkflag ENGINE_ALAN
+ checkflag ENGINE_ALAN_READY_FOR_REMATCH
iftrue .Generic
checkflag ENGINE_ALAN_WEDNESDAY_AFTERNOON
iftrue .Generic
@@ -51,7 +51,7 @@
AlanWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_36
- setflag ENGINE_ALAN
+ setflag ENGINE_ALAN_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
AlanHasFireStone:
--- a/engine/phone/scripts/anthony.asm
+++ b/engine/phone/scripts/anthony.asm
@@ -1,6 +1,6 @@
AnthonyPhoneCalleeScript:
gettrainername STRING_BUFFER_3, HIKER, ANTHONY2
- checkflag ENGINE_ANTHONY
+ checkflag ENGINE_ANTHONY_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_ANTHONY_FRIDAY_NIGHT
@@ -28,7 +28,7 @@
farscall PhoneScript_GreetPhone_Male
checkflag ENGINE_FLYPOINT_GOLDENROD
iffalse .TriesSwarm
- checkflag ENGINE_ANTHONY
+ checkflag ENGINE_ANTHONY_READY_FOR_REMATCH
iftrue .TriesSwarm
checkflag ENGINE_ANTHONY_FRIDAY_NIGHT
iftrue .TriesSwarm
@@ -45,7 +45,7 @@
AnthonyWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_33
- setflag ENGINE_ANTHONY
+ setflag ENGINE_ANTHONY_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
AnthonyTriesDunsparceSwarm:
--- a/engine/phone/scripts/arnie.asm
+++ b/engine/phone/scripts/arnie.asm
@@ -1,6 +1,6 @@
ArniePhoneCalleeScript:
gettrainername STRING_BUFFER_3, BUG_CATCHER, ARNIE1
- checkflag ENGINE_ARNIE
+ checkflag ENGINE_ARNIE_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_ARNIE_TUESDAY_MORNING
@@ -26,7 +26,7 @@
ArniePhoneCallerScript:
gettrainername STRING_BUFFER_3, BUG_CATCHER, ARNIE1
farscall PhoneScript_GreetPhone_Male
- checkflag ENGINE_ARNIE
+ checkflag ENGINE_ARNIE_READY_FOR_REMATCH
iftrue .Swarm
checkflag ENGINE_ARNIE_TUESDAY_MORNING
iftrue .Swarm
@@ -45,7 +45,7 @@
ArnieWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_35
- setflag ENGINE_ARNIE
+ setflag ENGINE_ARNIE_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
ArnieYanmaSwarm: ; start swarm
--- a/engine/phone/scripts/beth.asm
+++ b/engine/phone/scripts/beth.asm
@@ -1,6 +1,6 @@
BethPhoneCalleeScript:
gettrainername STRING_BUFFER_3, COOLTRAINERF, BETH1
- checkflag ENGINE_BETH
+ checkflag ENGINE_BETH_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Female
checkflag ENGINE_BETH_FRIDAY_AFTERNOON
@@ -20,7 +20,7 @@
BethPhoneCallerScript:
gettrainername STRING_BUFFER_3, COOLTRAINERF, BETH1
farscall PhoneScript_GreetPhone_Female
- checkflag ENGINE_BETH
+ checkflag ENGINE_BETH_READY_FOR_REMATCH
iftrue .Generic
checkflag ENGINE_BETH_FRIDAY_AFTERNOON
iftrue .Generic
@@ -35,5 +35,5 @@
BethWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_26
- setflag ENGINE_BETH
+ setflag ENGINE_BETH_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Female
--- a/engine/phone/scripts/brent.asm
+++ b/engine/phone/scripts/brent.asm
@@ -1,6 +1,6 @@
BrentPhoneCalleeScript:
gettrainername STRING_BUFFER_3, POKEMANIAC, BRENT1
- checkflag ENGINE_BRENT
+ checkflag ENGINE_BRENT_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_BRENT_MONDAY_MORNING
@@ -22,7 +22,7 @@
farscall PhoneScript_GreetPhone_Male
farscall PhoneScript_Random2
ifequal 0, BrentBillTrivia
- checkflag ENGINE_BRENT
+ checkflag ENGINE_BRENT_READY_FOR_REMATCH
iftrue .Generic
checkflag ENGINE_BRENT_MONDAY_MORNING
iftrue .Generic
@@ -37,7 +37,7 @@
BrentWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_43
- setflag ENGINE_BRENT
+ setflag ENGINE_BRENT_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
BrentBillTrivia:
--- a/engine/phone/scripts/chad.asm
+++ b/engine/phone/scripts/chad.asm
@@ -1,6 +1,6 @@
ChadPhoneCalleeScript:
gettrainername STRING_BUFFER_3, SCHOOLBOY, CHAD1
- checkflag ENGINE_CHAD
+ checkflag ENGINE_CHAD_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_CHAD_FRIDAY_MORNING
@@ -22,7 +22,7 @@
farscall PhoneScript_GreetPhone_Male
farscall PhoneScript_Random2
ifequal 0, ChadOakGossip
- checkflag ENGINE_CHAD
+ checkflag ENGINE_CHAD_READY_FOR_REMATCH
iftrue .Generic
checkflag ENGINE_CHAD_FRIDAY_MORNING
iftrue .Generic
@@ -39,7 +39,7 @@
ChadWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_38
- setflag ENGINE_CHAD
+ setflag ENGINE_CHAD_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
ChadFoundRare:
--- a/engine/phone/scripts/dana.asm
+++ b/engine/phone/scripts/dana.asm
@@ -1,6 +1,6 @@
DanaPhoneCalleeScript:
gettrainername STRING_BUFFER_3, LASS, DANA1
- checkflag ENGINE_DANA
+ checkflag ENGINE_DANA_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Female
checkflag ENGINE_DANA_THURSDAY_NIGHT
@@ -26,7 +26,7 @@
DanaPhoneCallerScript:
gettrainername STRING_BUFFER_3, LASS, DANA1
farscall PhoneScript_GreetPhone_Female
- checkflag ENGINE_DANA
+ checkflag ENGINE_DANA_READY_FOR_REMATCH
iftrue .Generic
checkflag ENGINE_DANA_THURSDAY_NIGHT
iftrue .Generic
@@ -53,7 +53,7 @@
DanaWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_38
- setflag ENGINE_DANA
+ setflag ENGINE_DANA_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Female
DanaFoundRare:
--- a/engine/phone/scripts/erin.asm
+++ b/engine/phone/scripts/erin.asm
@@ -1,6 +1,6 @@
ErinPhoneCalleeScript:
gettrainername STRING_BUFFER_3, PICNICKER, ERIN1
- checkflag ENGINE_ERIN
+ checkflag ENGINE_ERIN_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Female
checkflag ENGINE_ERIN_SATURDAY_NIGHT
@@ -20,7 +20,7 @@
ErinPhoneCallerScript:
gettrainername STRING_BUFFER_3, PICNICKER, ERIN1
farscall PhoneScript_GreetPhone_Female
- checkflag ENGINE_ERIN
+ checkflag ENGINE_ERIN_READY_FOR_REMATCH
iftrue .GenericCall
checkflag ENGINE_ERIN_SATURDAY_NIGHT
iftrue .GenericCall
@@ -36,5 +36,5 @@
ErinWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_46
- setflag ENGINE_ERIN
+ setflag ENGINE_ERIN_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Female
--- a/engine/phone/scripts/gaven.asm
+++ b/engine/phone/scripts/gaven.asm
@@ -1,6 +1,6 @@
GavenPhoneCalleeScript:
gettrainername STRING_BUFFER_3, COOLTRAINERM, GAVEN3
- checkflag ENGINE_GAVEN
+ checkflag ENGINE_GAVEN_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_GAVEN_THURSDAY_MORNING
@@ -20,7 +20,7 @@
GavenPhoneCallerScript:
gettrainername STRING_BUFFER_3, COOLTRAINERM, GAVEN3
farscall PhoneScript_GreetPhone_Male
- checkflag ENGINE_GAVEN
+ checkflag ENGINE_GAVEN_READY_FOR_REMATCH
iftrue .WaitingForBattle
checkflag ENGINE_GAVEN_THURSDAY_MORNING
iftrue .WaitingForBattle
@@ -37,7 +37,7 @@
GavenWantsRematch:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_26
- setflag ENGINE_GAVEN
+ setflag ENGINE_GAVEN_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
GavenFoundRare:
--- a/engine/phone/scripts/gina.asm
+++ b/engine/phone/scripts/gina.asm
@@ -1,6 +1,6 @@
GinaPhoneCalleeScript:
gettrainername STRING_BUFFER_3, PICNICKER, GINA1
- checkflag ENGINE_GINA
+ checkflag ENGINE_GINA_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Female
checkflag ENGINE_GINA_SUNDAY_AFTERNOON
@@ -33,7 +33,7 @@
farscall PhoneScript_GreetPhone_Female
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue GinaRockets
- checkflag ENGINE_GINA
+ checkflag ENGINE_GINA_READY_FOR_REMATCH
iftrue .Generic
checkflag ENGINE_GINA_SUNDAY_AFTERNOON
iftrue .Generic
@@ -60,7 +60,7 @@
GinaWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_34
- setflag ENGINE_GINA
+ setflag ENGINE_GINA_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Female
GinaRockets:
--- a/engine/phone/scripts/huey.asm
+++ b/engine/phone/scripts/huey.asm
@@ -1,6 +1,6 @@
HueyPhoneCalleeScript:
gettrainername STRING_BUFFER_3, SAILOR, HUEY1
- checkflag ENGINE_HUEY
+ checkflag ENGINE_HUEY_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_HUEY_WEDNESDAY_NIGHT
@@ -21,7 +21,7 @@
HueyPhoneCallerScript:
gettrainername STRING_BUFFER_3, SAILOR, HUEY1
farscall PhoneScript_GreetPhone_Male
- checkflag ENGINE_HUEY
+ checkflag ENGINE_HUEY_READY_FOR_REMATCH
iftrue .Flavor
checkflag ENGINE_HUEY_WEDNESDAY_NIGHT
iftrue .Flavor
@@ -37,5 +37,5 @@
HueyWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_LIGHTHOUSE
- setflag ENGINE_HUEY
+ setflag ENGINE_HUEY_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
--- a/engine/phone/scripts/jack.asm
+++ b/engine/phone/scripts/jack.asm
@@ -1,6 +1,6 @@
JackPhoneCalleeScript:
gettrainername STRING_BUFFER_3, SCHOOLBOY, JACK1
- checkflag ENGINE_JACK
+ checkflag ENGINE_JACK_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_JACK_MONDAY_MORNING
@@ -22,7 +22,7 @@
farscall PhoneScript_GreetPhone_Male
farscall PhoneScript_Random2
ifequal 0, JackBattleTrivia
- checkflag ENGINE_JACK
+ checkflag ENGINE_JACK_READY_FOR_REMATCH
iftrue .WaitingForBattle
checkflag ENGINE_JACK_MONDAY_MORNING
iftrue .WaitingForBattle
@@ -39,7 +39,7 @@
JackWantsToBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_NATIONAL_PARK
- setflag ENGINE_JACK
+ setflag ENGINE_JACK_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
JackFindsRare:
--- a/engine/phone/scripts/joey.asm
+++ b/engine/phone/scripts/joey.asm
@@ -1,6 +1,6 @@
JoeyPhoneCalleeScript:
gettrainername STRING_BUFFER_3, YOUNGSTER, JOEY1
- checkflag ENGINE_JOEY
+ checkflag ENGINE_JOEY_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_JOEY_MONDAY_AFTERNOON
@@ -21,7 +21,7 @@
JoeyPhoneCallerScript:
gettrainername STRING_BUFFER_3, YOUNGSTER, JOEY1
farscall PhoneScript_GreetPhone_Male
- checkflag ENGINE_JOEY
+ checkflag ENGINE_JOEY_READY_FOR_REMATCH
iftrue .Generic
checkflag ENGINE_JOEY_MONDAY_AFTERNOON
iftrue .Generic
@@ -37,5 +37,5 @@
JoeyWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_30
- setflag ENGINE_JOEY
+ setflag ENGINE_JOEY_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
--- a/engine/phone/scripts/jose.asm
+++ b/engine/phone/scripts/jose.asm
@@ -1,6 +1,6 @@
JosePhoneCalleeScript:
gettrainername STRING_BUFFER_3, BIRD_KEEPER, JOSE2
- checkflag ENGINE_JOSE
+ checkflag ENGINE_JOSE_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_JOSE_SATURDAY_NIGHT
@@ -26,7 +26,7 @@
JosePhoneCallerScript:
gettrainername STRING_BUFFER_3, BIRD_KEEPER, JOSE2
farscall PhoneScript_GreetPhone_Male
- checkflag ENGINE_JOSE
+ checkflag ENGINE_JOSE_READY_FOR_REMATCH
iftrue .Generic
checkflag ENGINE_JOSE_SATURDAY_NIGHT
iftrue .Generic
@@ -47,7 +47,7 @@
JoseWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_27
- setflag ENGINE_JOSE
+ setflag ENGINE_JOSE_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
JoseFoundRare:
--- a/engine/phone/scripts/liz.asm
+++ b/engine/phone/scripts/liz.asm
@@ -1,6 +1,6 @@
LizPhoneCalleeScript:
gettrainername STRING_BUFFER_3, PICNICKER, LIZ1
- checkflag ENGINE_LIZ
+ checkflag ENGINE_LIZ_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Female
checkflag ENGINE_LIZ_THURSDAY_AFTERNOON
@@ -23,7 +23,7 @@
farscall PhoneScript_Random4
ifequal 0, LizWrongNumber
farscall PhoneScript_GreetPhone_Female
- checkflag ENGINE_LIZ
+ checkflag ENGINE_LIZ_READY_FOR_REMATCH
iftrue .next
checkflag ENGINE_LIZ_THURSDAY_AFTERNOON
iftrue .next
@@ -44,7 +44,7 @@
LizWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_32
- setflag ENGINE_LIZ
+ setflag ENGINE_LIZ_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Female
LizWrongNumber:
--- a/engine/phone/scripts/parry.asm
+++ b/engine/phone/scripts/parry.asm
@@ -1,6 +1,6 @@
ParryPhoneCalleeScript:
gettrainername STRING_BUFFER_3, HIKER, PARRY1
- checkflag ENGINE_PARRY
+ checkflag ENGINE_PARRY_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_PARRY_FRIDAY_AFTERNOON
@@ -20,7 +20,7 @@
ParryPhoneCallerScript:
gettrainername STRING_BUFFER_3, HIKER, PARRY1
farscall PhoneScript_GreetPhone_Male
- checkflag ENGINE_PARRY
+ checkflag ENGINE_PARRY_READY_FOR_REMATCH
iftrue .GenericCall
checkflag ENGINE_PARRY_FRIDAY_AFTERNOON
iftrue .GenericCall
@@ -36,5 +36,5 @@
ParryWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_45
- setflag ENGINE_PARRY
+ setflag ENGINE_PARRY_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
--- a/engine/phone/scripts/ralph.asm
+++ b/engine/phone/scripts/ralph.asm
@@ -1,6 +1,6 @@
RalphPhoneCalleeScript:
gettrainername STRING_BUFFER_3, FISHER, RALPH1
- checkflag ENGINE_RALPH
+ checkflag ENGINE_RALPH_READY_FOR_REMATCH
iftrue .Rematch
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_RALPH_WEDNESDAY_MORNING
@@ -27,7 +27,7 @@
farscall PhoneScript_GreetPhone_Male
checkflag ENGINE_FLYPOINT_GOLDENROD
iffalse .CheckSwarm
- checkflag ENGINE_RALPH
+ checkflag ENGINE_RALPH_READY_FOR_REMATCH
iftrue .CheckSwarm
checkflag ENGINE_RALPH_WEDNESDAY_MORNING
iftrue .CheckSwarm
@@ -42,7 +42,7 @@
setflag ENGINE_RALPH_WEDNESDAY_MORNING
Ralph_FightMe:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_32
- setflag ENGINE_RALPH
+ setflag ENGINE_RALPH_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
Ralph_SetUpSwarm:
--- a/engine/phone/scripts/reena.asm
+++ b/engine/phone/scripts/reena.asm
@@ -1,6 +1,6 @@
ReenaPhoneCalleeScript:
gettrainername STRING_BUFFER_3, COOLTRAINERF, REENA1
- checkflag ENGINE_REENA
+ checkflag ENGINE_REENA_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Female
checkflag ENGINE_REENA_SUNDAY_MORNING
@@ -20,7 +20,7 @@
ReenaPhoneCallerScript:
gettrainername STRING_BUFFER_3, COOLTRAINERF, REENA1
farscall PhoneScript_GreetPhone_Female
- checkflag ENGINE_REENA
+ checkflag ENGINE_REENA_READY_FOR_REMATCH
iftrue .Generic
checkflag ENGINE_REENA_SUNDAY_MORNING
iftrue .Generic
@@ -35,5 +35,5 @@
ReenaWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_27
- setflag ENGINE_REENA
+ setflag ENGINE_REENA_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Female
--- a/engine/phone/scripts/tiffany.asm
+++ b/engine/phone/scripts/tiffany.asm
@@ -1,6 +1,6 @@
TiffanyPhoneCalleeScript:
gettrainername STRING_BUFFER_3, PICNICKER, TIFFANY3
- checkflag ENGINE_TIFFANY
+ checkflag ENGINE_TIFFANY_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Female
checkflag ENGINE_TIFFANY_TUESDAY_AFTERNOON
@@ -28,7 +28,7 @@
farscall PhoneScript_Random4
ifequal 0, TiffanysFamilyMembers
farscall PhoneScript_GreetPhone_Female
- checkflag ENGINE_TIFFANY
+ checkflag ENGINE_TIFFANY_READY_FOR_REMATCH
iftrue .Generic
checkflag ENGINE_TIFFANY_TUESDAY_AFTERNOON
iftrue .Generic
@@ -53,7 +53,7 @@
TiffanyWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_43
- setflag ENGINE_TIFFANY
+ setflag ENGINE_TIFFANY_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Female
TiffanysFamilyMembers:
--- a/engine/phone/scripts/todd.asm
+++ b/engine/phone/scripts/todd.asm
@@ -1,6 +1,6 @@
ToddPhoneCalleeScript:
gettrainername STRING_BUFFER_3, CAMPER, TODD1
- checkflag ENGINE_TODD
+ checkflag ENGINE_TODD_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_TODD_SATURDAY_MORNING
@@ -25,7 +25,7 @@
ToddPhoneCallerScript:
gettrainername STRING_BUFFER_3, CAMPER, TODD1
farscall PhoneScript_GreetPhone_Male
- checkflag ENGINE_TODD
+ checkflag ENGINE_TODD_READY_FOR_REMATCH
iftrue .TryForSale
checkflag ENGINE_TODD_SATURDAY_MORNING
iftrue .TryForSale
@@ -48,7 +48,7 @@
ToddWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_34
- setflag ENGINE_TODD
+ setflag ENGINE_TODD_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
ToddFoundRare:
--- a/engine/phone/scripts/tully.asm
+++ b/engine/phone/scripts/tully.asm
@@ -1,6 +1,6 @@
TullyPhoneCalleeScript:
gettrainername STRING_BUFFER_3, FISHER, TULLY1
- checkflag ENGINE_TULLY
+ checkflag ENGINE_TULLY_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_TULLY_SUNDAY_NIGHT
@@ -26,7 +26,7 @@
TullyPhoneCallerScript:
gettrainername STRING_BUFFER_3, FISHER, TULLY1
farscall PhoneScript_GreetPhone_Male
- checkflag ENGINE_TULLY
+ checkflag ENGINE_TULLY_READY_FOR_REMATCH
iftrue .Generic
checkflag ENGINE_TULLY_SUNDAY_NIGHT
iftrue .Generic
@@ -51,7 +51,7 @@
TullyWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_42
- setflag ENGINE_TULLY
+ setflag ENGINE_TULLY_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
TullyFoundWaterStone:
--- a/engine/phone/scripts/vance.asm
+++ b/engine/phone/scripts/vance.asm
@@ -1,6 +1,6 @@
VancePhoneCalleeScript:
gettrainername STRING_BUFFER_3, BIRD_KEEPER, VANCE1
- checkflag ENGINE_VANCE
+ checkflag ENGINE_VANCE_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_VANCE_WEDNESDAY_NIGHT
@@ -20,7 +20,7 @@
VancePhoneCallerScript:
gettrainername STRING_BUFFER_3, BIRD_KEEPER, VANCE1
farscall PhoneScript_GreetPhone_Male
- checkflag ENGINE_VANCE
+ checkflag ENGINE_VANCE_READY_FOR_REMATCH
iftrue .WantsBattle
checkflag ENGINE_VANCE_WEDNESDAY_NIGHT
iftrue .WantsBattle
@@ -36,5 +36,5 @@
VanceWantsRematch:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_44
- setflag ENGINE_VANCE
+ setflag ENGINE_VANCE_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
--- a/engine/phone/scripts/wade.asm
+++ b/engine/phone/scripts/wade.asm
@@ -1,6 +1,6 @@
WadePhoneCalleeScript:
gettrainername STRING_BUFFER_3, BUG_CATCHER, WADE1
- checkflag ENGINE_WADE
+ checkflag ENGINE_WADE_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_WADE_TUESDAY_NIGHT
@@ -49,7 +49,7 @@
ifequal SATURDAY, .ContestToday
.NoContest:
- checkflag ENGINE_WADE
+ checkflag ENGINE_WADE_READY_FOR_REMATCH
iftrue .next
checkflag ENGINE_WADE_TUESDAY_NIGHT
iftrue .next
@@ -75,7 +75,7 @@
WadeWantsBattle2:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_31
- setflag ENGINE_WADE
+ setflag ENGINE_WADE_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
WadeFoundRare:
--- a/engine/phone/scripts/wilton.asm
+++ b/engine/phone/scripts/wilton.asm
@@ -1,6 +1,6 @@
WiltonPhoneCalleeScript:
gettrainername STRING_BUFFER_3, FISHER, WILTON1
- checkflag ENGINE_WILTON
+ checkflag ENGINE_WILTON_READY_FOR_REMATCH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_WILTON_THURSDAY_MORNING
@@ -26,7 +26,7 @@
WiltonPhoneCallerScript:
gettrainername STRING_BUFFER_3, FISHER, WILTON1
farscall PhoneScript_GreetPhone_Male
- checkflag ENGINE_WILTON
+ checkflag ENGINE_WILTON_READY_FOR_REMATCH
iftrue .GenericCall
checkflag ENGINE_WILTON_THURSDAY_MORNING
iftrue .GenericCall
@@ -45,7 +45,7 @@
WiltonWantsBattle:
getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_44
- setflag ENGINE_WILTON
+ setflag ENGINE_WILTON_READY_FOR_REMATCH
farsjump PhoneScript_WantsToBattle_Male
WiltonHasItem:
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -76,7 +76,7 @@
loadvar VAR_CALLERID, PHONE_SCHOOLBOY_JACK
endifjustbattled
opentext
- checkflag ENGINE_JACK
+ checkflag ENGINE_JACK_READY_FOR_REMATCH
iftrue .Rematch
checkcellnum PHONE_SCHOOLBOY_JACK
iftrue .NumberAccepted
@@ -124,7 +124,7 @@
startbattle
reloadmapafterbattle
loadmem wJackFightCount, 1
- clearflag ENGINE_JACK
+ clearflag ENGINE_JACK_READY_FOR_REMATCH
end
.LoadFight1:
@@ -132,7 +132,7 @@
startbattle
reloadmapafterbattle
loadmem wJackFightCount, 2
- clearflag ENGINE_JACK
+ clearflag ENGINE_JACK_READY_FOR_REMATCH
end
.LoadFight2:
@@ -140,7 +140,7 @@
startbattle
reloadmapafterbattle
loadmem wJackFightCount, 3
- clearflag ENGINE_JACK
+ clearflag ENGINE_JACK_READY_FOR_REMATCH
end
.LoadFight3:
@@ -148,7 +148,7 @@
startbattle
reloadmapafterbattle
loadmem wJackFightCount, 4
- clearflag ENGINE_JACK
+ clearflag ENGINE_JACK_READY_FOR_REMATCH
end
.LoadFight4:
@@ -155,7 +155,7 @@
loadtrainer SCHOOLBOY, JACK5
startbattle
reloadmapafterbattle
- clearflag ENGINE_JACK
+ clearflag ENGINE_JACK_READY_FOR_REMATCH
end
.AskNumber1:
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -25,7 +25,7 @@
loadvar VAR_CALLERID, PHONE_SAILOR_HUEY
endifjustbattled
opentext
- checkflag ENGINE_HUEY
+ checkflag ENGINE_HUEY_READY_FOR_REMATCH
iftrue .WantsBattle
checkcellnum PHONE_SAILOR_HUEY
iftrue .NumberAccepted
@@ -67,7 +67,7 @@
startbattle
reloadmapafterbattle
loadmem wHueyFightCount, 1
- clearflag ENGINE_HUEY
+ clearflag ENGINE_HUEY_READY_FOR_REMATCH
end
.LoadFight1:
@@ -75,7 +75,7 @@
startbattle
reloadmapafterbattle
loadmem wHueyFightCount, 2
- clearflag ENGINE_HUEY
+ clearflag ENGINE_HUEY_READY_FOR_REMATCH
end
.LoadFight2:
@@ -83,7 +83,7 @@
startbattle
reloadmapafterbattle
loadmem wHueyFightCount, 3
- clearflag ENGINE_HUEY
+ clearflag ENGINE_HUEY_READY_FOR_REMATCH
end
.LoadFight3:
@@ -90,7 +90,7 @@
loadtrainer SAILOR, HUEY4
startbattle
reloadmapafterbattle
- clearflag ENGINE_HUEY
+ clearflag ENGINE_HUEY_READY_FOR_REMATCH
checkevent EVENT_HUEY_PROTEIN
iftrue .HasProtein
checkevent EVENT_GOT_PROTEIN_FROM_HUEY
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -31,7 +31,7 @@
loadvar VAR_CALLERID, PHONE_COOLTRAINERM_GAVEN
endifjustbattled
opentext
- checkflag ENGINE_GAVEN
+ checkflag ENGINE_GAVEN_READY_FOR_REMATCH
iftrue .WantsBattle
checkcellnum PHONE_COOLTRAINERM_GAVEN
iftrue .NumberAccepted
@@ -71,7 +71,7 @@
startbattle
reloadmapafterbattle
loadmem wGavenFightCount, 1
- clearflag ENGINE_GAVEN
+ clearflag ENGINE_GAVEN_READY_FOR_REMATCH
end
.LoadFight1:
@@ -79,7 +79,7 @@
startbattle
reloadmapafterbattle
loadmem wGavenFightCount, 2
- clearflag ENGINE_GAVEN
+ clearflag ENGINE_GAVEN_READY_FOR_REMATCH
end
.LoadFight2:
@@ -86,7 +86,7 @@
loadtrainer COOLTRAINERM, GAVEN2
startbattle
reloadmapafterbattle
- clearflag ENGINE_GAVEN
+ clearflag ENGINE_GAVEN_READY_FOR_REMATCH
end
.AskNumber1:
@@ -135,7 +135,7 @@
loadvar VAR_CALLERID, PHONE_COOLTRAINERF_BETH
endifjustbattled
opentext
- checkflag ENGINE_BETH
+ checkflag ENGINE_BETH_READY_FOR_REMATCH
iftrue .WantsBattle
checkcellnum PHONE_COOLTRAINERF_BETH
iftrue .NumberAccepted
@@ -175,7 +175,7 @@
startbattle
reloadmapafterbattle
loadmem wBethFightCount, 1
- clearflag ENGINE_BETH
+ clearflag ENGINE_BETH_READY_FOR_REMATCH
end
.LoadFight1:
@@ -183,7 +183,7 @@
startbattle
reloadmapafterbattle
loadmem wBethFightCount, 2
- clearflag ENGINE_BETH
+ clearflag ENGINE_BETH_READY_FOR_REMATCH
end
.LoadFight2:
@@ -190,7 +190,7 @@
loadtrainer COOLTRAINERF, BETH3
startbattle
reloadmapafterbattle
- clearflag ENGINE_BETH
+ clearflag ENGINE_BETH_READY_FOR_REMATCH
end
.AskNumber1:
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -64,7 +64,7 @@
loadvar VAR_CALLERID, PHONE_BIRDKEEPER_JOSE
endifjustbattled
opentext
- checkflag ENGINE_JOSE
+ checkflag ENGINE_JOSE_READY_FOR_REMATCH
iftrue .WantsBattle
checkflag ENGINE_JOSE_HAS_STAR_PIECE
iftrue .HasStarPiece
@@ -106,7 +106,7 @@
startbattle
reloadmapafterbattle
loadmem wJoseFightCount, 1
- clearflag ENGINE_JOSE
+ clearflag ENGINE_JOSE_READY_FOR_REMATCH
end
.LoadFight1:
@@ -114,7 +114,7 @@
startbattle
reloadmapafterbattle
loadmem wJoseFightCount, 2
- clearflag ENGINE_JOSE
+ clearflag ENGINE_JOSE_READY_FOR_REMATCH
end
.LoadFight2:
@@ -121,7 +121,7 @@
loadtrainer BIRD_KEEPER, JOSE3
startbattle
reloadmapafterbattle
- clearflag ENGINE_JOSE
+ clearflag ENGINE_JOSE_READY_FOR_REMATCH
end
.HasStarPiece:
@@ -199,7 +199,7 @@
loadvar VAR_CALLERID, PHONE_COOLTRAINERF_REENA
endifjustbattled
opentext
- checkflag ENGINE_REENA
+ checkflag ENGINE_REENA_READY_FOR_REMATCH
iftrue .WantsBattle
checkcellnum PHONE_COOLTRAINERF_REENA
iftrue .NumberAccepted
@@ -239,7 +239,7 @@
startbattle
reloadmapafterbattle
loadmem wReenaFightCount, 1
- clearflag ENGINE_REENA
+ clearflag ENGINE_REENA_READY_FOR_REMATCH
end
.LoadFight1:
@@ -247,7 +247,7 @@
startbattle
reloadmapafterbattle
loadmem wReenaFightCount, 2
- clearflag ENGINE_REENA
+ clearflag ENGINE_REENA_READY_FOR_REMATCH
end
.LoadFight2:
@@ -254,7 +254,7 @@
loadtrainer COOLTRAINERF, REENA3
startbattle
reloadmapafterbattle
- clearflag ENGINE_REENA
+ clearflag ENGINE_REENA_READY_FOR_REMATCH
end
.AskNumber1:
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -43,7 +43,7 @@
loadvar VAR_CALLERID, PHONE_YOUNGSTER_JOEY
endifjustbattled
opentext
- checkflag ENGINE_JOEY
+ checkflag ENGINE_JOEY_READY_FOR_REMATCH
iftrue .Rematch
checkcellnum PHONE_YOUNGSTER_JOEY
iftrue .NumberAccepted
@@ -91,7 +91,7 @@
startbattle
reloadmapafterbattle
loadmem wJoeyFightCount, 1
- clearflag ENGINE_JOEY
+ clearflag ENGINE_JOEY_READY_FOR_REMATCH
end
.LoadFight1:
@@ -99,7 +99,7 @@
startbattle
reloadmapafterbattle
loadmem wJoeyFightCount, 2
- clearflag ENGINE_JOEY
+ clearflag ENGINE_JOEY_READY_FOR_REMATCH
end
.LoadFight2:
@@ -107,7 +107,7 @@
startbattle
reloadmapafterbattle
loadmem wJoeyFightCount, 3
- clearflag ENGINE_JOEY
+ clearflag ENGINE_JOEY_READY_FOR_REMATCH
end
.LoadFight3:
@@ -115,7 +115,7 @@
startbattle
reloadmapafterbattle
loadmem wJoeyFightCount, 4
- clearflag ENGINE_JOEY
+ clearflag ENGINE_JOEY_READY_FOR_REMATCH
end
.LoadFight4:
@@ -122,7 +122,7 @@
loadtrainer YOUNGSTER, JOEY5
startbattle
reloadmapafterbattle
- clearflag ENGINE_JOEY
+ clearflag ENGINE_JOEY_READY_FOR_REMATCH
checkevent EVENT_JOEY_HP_UP
iftrue .GiveHPUp
checkevent EVENT_GOT_HP_UP_FROM_JOEY
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -29,7 +29,7 @@
loadvar VAR_CALLERID, PHONE_BUG_CATCHER_WADE
endifjustbattled
opentext
- checkflag ENGINE_WADE
+ checkflag ENGINE_WADE_READY_FOR_REMATCH
iftrue .WadeRematch
checkflag ENGINE_WADE_HAS_ITEM
iftrue .WadeItem
@@ -79,7 +79,7 @@
startbattle
reloadmapafterbattle
loadmem wWadeFightCount, 1
- clearflag ENGINE_WADE
+ clearflag ENGINE_WADE_READY_FOR_REMATCH
end
.LoadFight1:
@@ -87,7 +87,7 @@
startbattle
reloadmapafterbattle
loadmem wWadeFightCount, 2
- clearflag ENGINE_WADE
+ clearflag ENGINE_WADE_READY_FOR_REMATCH
end
.LoadFight2:
@@ -95,7 +95,7 @@
startbattle
reloadmapafterbattle
loadmem wWadeFightCount, 3
- clearflag ENGINE_WADE
+ clearflag ENGINE_WADE_READY_FOR_REMATCH
end
.LoadFight3:
@@ -103,7 +103,7 @@
startbattle
reloadmapafterbattle
loadmem wWadeFightCount, 4
- clearflag ENGINE_WADE
+ clearflag ENGINE_WADE_READY_FOR_REMATCH
end
.LoadFight4:
@@ -110,7 +110,7 @@
loadtrainer BUG_CATCHER, WADE5
startbattle
reloadmapafterbattle
- clearflag ENGINE_WADE
+ clearflag ENGINE_WADE_READY_FOR_REMATCH
end
.WadeItem:
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -170,7 +170,7 @@
loadvar VAR_CALLERID, PHONE_FISHER_RALPH
endifjustbattled
opentext
- checkflag ENGINE_RALPH
+ checkflag ENGINE_RALPH_READY_FOR_REMATCH
iftrue .Rematch
checkflag ENGINE_FISH_SWARM
iftrue .Swarm
@@ -220,7 +220,7 @@
startbattle
reloadmapafterbattle
loadmem wRalphFightCount, 1
- clearflag ENGINE_RALPH
+ clearflag ENGINE_RALPH_READY_FOR_REMATCH
end
.LoadFight1:
@@ -228,7 +228,7 @@
startbattle
reloadmapafterbattle
loadmem wRalphFightCount, 2
- clearflag ENGINE_RALPH
+ clearflag ENGINE_RALPH_READY_FOR_REMATCH
end
.LoadFight2:
@@ -236,7 +236,7 @@
startbattle
reloadmapafterbattle
loadmem wRalphFightCount, 3
- clearflag ENGINE_RALPH
+ clearflag ENGINE_RALPH_READY_FOR_REMATCH
end
.LoadFight3:
@@ -244,7 +244,7 @@
startbattle
reloadmapafterbattle
loadmem wRalphFightCount, 4
- clearflag ENGINE_RALPH
+ clearflag ENGINE_RALPH_READY_FOR_REMATCH
end
.LoadFight4:
@@ -251,7 +251,7 @@
loadtrainer FISHER, RALPH5
startbattle
reloadmapafterbattle
- clearflag ENGINE_RALPH
+ clearflag ENGINE_RALPH_READY_FOR_REMATCH
end
.Swarm:
@@ -306,7 +306,7 @@
loadvar VAR_CALLERID, PHONE_PICNICKER_LIZ
endifjustbattled
opentext
- checkflag ENGINE_LIZ
+ checkflag ENGINE_LIZ_READY_FOR_REMATCH
iftrue .Rematch
checkcellnum PHONE_PICNICKER_LIZ
iftrue .NumberAccepted
@@ -354,7 +354,7 @@
startbattle
reloadmapafterbattle
loadmem wLizFightCount, 1
- clearflag ENGINE_LIZ
+ clearflag ENGINE_LIZ_READY_FOR_REMATCH
end
.LoadFight1:
@@ -362,7 +362,7 @@
startbattle
reloadmapafterbattle
loadmem wLizFightCount, 2
- clearflag ENGINE_LIZ
+ clearflag ENGINE_LIZ_READY_FOR_REMATCH
end
.LoadFight2:
@@ -370,7 +370,7 @@
startbattle
reloadmapafterbattle
loadmem wLizFightCount, 3
- clearflag ENGINE_LIZ
+ clearflag ENGINE_LIZ_READY_FOR_REMATCH
end
.LoadFight3:
@@ -378,7 +378,7 @@
startbattle
reloadmapafterbattle
loadmem wLizFightCount, 4
- clearflag ENGINE_LIZ
+ clearflag ENGINE_LIZ_READY_FOR_REMATCH
end
.LoadFight4:
@@ -385,7 +385,7 @@
loadtrainer PICNICKER, LIZ5
startbattle
reloadmapafterbattle
- clearflag ENGINE_LIZ
+ clearflag ENGINE_LIZ_READY_FOR_REMATCH
end
.AskNumber1:
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -18,7 +18,7 @@
loadvar VAR_CALLERID, PHONE_HIKER_ANTHONY
endifjustbattled
opentext
- checkflag ENGINE_ANTHONY
+ checkflag ENGINE_ANTHONY_READY_FOR_REMATCH
iftrue .Rematch
checkflag ENGINE_DUNSPARCE_SWARM
iftrue .Swarm
@@ -68,7 +68,7 @@
startbattle
reloadmapafterbattle
loadmem wAnthonyFightCount, 1
- clearflag ENGINE_ANTHONY
+ clearflag ENGINE_ANTHONY_READY_FOR_REMATCH
end
.LoadFight1:
@@ -76,7 +76,7 @@
startbattle
reloadmapafterbattle
loadmem wAnthonyFightCount, 2
- clearflag ENGINE_ANTHONY
+ clearflag ENGINE_ANTHONY_READY_FOR_REMATCH
end
.LoadFight2:
@@ -84,7 +84,7 @@
startbattle
reloadmapafterbattle
loadmem wAnthonyFightCount, 3
- clearflag ENGINE_ANTHONY
+ clearflag ENGINE_ANTHONY_READY_FOR_REMATCH
end
.LoadFight3:
@@ -92,7 +92,7 @@
startbattle
reloadmapafterbattle
loadmem wAnthonyFightCount, 4
- clearflag ENGINE_ANTHONY
+ clearflag ENGINE_ANTHONY_READY_FOR_REMATCH
end
.LoadFight4:
@@ -99,7 +99,7 @@
loadtrainer HIKER, ANTHONY5
startbattle
reloadmapafterbattle
- clearflag ENGINE_ANTHONY
+ clearflag ENGINE_ANTHONY_READY_FOR_REMATCH
end
.Swarm:
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -92,7 +92,7 @@
loadvar VAR_CALLERID, PHONE_CAMPER_TODD
endifjustbattled
opentext
- checkflag ENGINE_TODD
+ checkflag ENGINE_TODD_READY_FOR_REMATCH
iftrue .Rematch
checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
iftrue .SaleIsOn
@@ -142,7 +142,7 @@
startbattle
reloadmapafterbattle
loadmem wToddFightCount, 1
- clearflag ENGINE_TODD
+ clearflag ENGINE_TODD_READY_FOR_REMATCH
end
.LoadFight1:
@@ -150,7 +150,7 @@
startbattle
reloadmapafterbattle
loadmem wToddFightCount, 2
- clearflag ENGINE_TODD
+ clearflag ENGINE_TODD_READY_FOR_REMATCH
end
.LoadFight2:
@@ -158,7 +158,7 @@
startbattle
reloadmapafterbattle
loadmem wToddFightCount, 3
- clearflag ENGINE_TODD
+ clearflag ENGINE_TODD_READY_FOR_REMATCH
end
.LoadFight3:
@@ -166,7 +166,7 @@
startbattle
reloadmapafterbattle
loadmem wToddFightCount, 4
- clearflag ENGINE_TODD
+ clearflag ENGINE_TODD_READY_FOR_REMATCH
end
.LoadFight4:
@@ -173,7 +173,7 @@
loadtrainer CAMPER, TODD5
startbattle
reloadmapafterbattle
- clearflag ENGINE_TODD
+ clearflag ENGINE_TODD_READY_FOR_REMATCH
end
.SaleIsOn:
@@ -217,7 +217,7 @@
loadvar VAR_CALLERID, PHONE_PICNICKER_GINA
endifjustbattled
opentext
- checkflag ENGINE_GINA
+ checkflag ENGINE_GINA_READY_FOR_REMATCH
iftrue .Rematch
checkflag ENGINE_GINA_HAS_LEAF_STONE
iftrue .LeafStone
@@ -267,7 +267,7 @@
startbattle
reloadmapafterbattle
loadmem wGinaFightCount, 1
- clearflag ENGINE_GINA
+ clearflag ENGINE_GINA_READY_FOR_REMATCH
end
.LoadFight1:
@@ -275,7 +275,7 @@
startbattle
reloadmapafterbattle
loadmem wGinaFightCount, 2
- clearflag ENGINE_GINA
+ clearflag ENGINE_GINA_READY_FOR_REMATCH
end
.LoadFight2:
@@ -283,7 +283,7 @@
startbattle
reloadmapafterbattle
loadmem wGinaFightCount, 3
- clearflag ENGINE_GINA
+ clearflag ENGINE_GINA_READY_FOR_REMATCH
end
.LoadFight3:
@@ -291,7 +291,7 @@
startbattle
reloadmapafterbattle
loadmem wGinaFightCount, 4
- clearflag ENGINE_GINA
+ clearflag ENGINE_GINA_READY_FOR_REMATCH
end
.LoadFight4:
@@ -298,7 +298,7 @@
loadtrainer PICNICKER, GINA5
startbattle
reloadmapafterbattle
- clearflag ENGINE_GINA
+ clearflag ENGINE_GINA_READY_FOR_REMATCH
end
.LeafStone:
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -133,7 +133,7 @@
loadvar VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE
endifjustbattled
opentext
- checkflag ENGINE_ARNIE
+ checkflag ENGINE_ARNIE_READY_FOR_REMATCH
iftrue .WantsBattle
checkflag ENGINE_YANMA_SWARM
iftrue .YanmaSwarming
@@ -183,7 +183,7 @@
startbattle
reloadmapafterbattle
loadmem wArnieFightCount, 1
- clearflag ENGINE_ARNIE
+ clearflag ENGINE_ARNIE_READY_FOR_REMATCH
end
.LoadFight1:
@@ -191,7 +191,7 @@
startbattle
reloadmapafterbattle
loadmem wArnieFightCount, 2
- clearflag ENGINE_ARNIE
+ clearflag ENGINE_ARNIE_READY_FOR_REMATCH
end
.LoadFight2:
@@ -199,7 +199,7 @@
startbattle
reloadmapafterbattle
loadmem wArnieFightCount, 3
- clearflag ENGINE_ARNIE
+ clearflag ENGINE_ARNIE_READY_FOR_REMATCH
end
.LoadFight3:
@@ -207,7 +207,7 @@
startbattle
reloadmapafterbattle
loadmem wArnieFightCount, 4
- clearflag ENGINE_ARNIE
+ clearflag ENGINE_ARNIE_READY_FOR_REMATCH
end
.LoadFight4:
@@ -214,7 +214,7 @@
loadtrainer BUG_CATCHER, ARNIE5
startbattle
reloadmapafterbattle
- clearflag ENGINE_ARNIE
+ clearflag ENGINE_ARNIE_READY_FOR_REMATCH
end
.YanmaSwarming:
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -171,7 +171,7 @@
loadvar VAR_CALLERID, PHONE_SCHOOLBOY_ALAN
endifjustbattled
opentext
- checkflag ENGINE_ALAN
+ checkflag ENGINE_ALAN_READY_FOR_REMATCH
iftrue .ChooseRematch
checkflag ENGINE_ALAN_HAS_FIRE_STONE
iftrue .GiveFireStone
@@ -221,7 +221,7 @@
startbattle
reloadmapafterbattle
loadmem wAlanFightCount, 1
- clearflag ENGINE_ALAN
+ clearflag ENGINE_ALAN_READY_FOR_REMATCH
end
.LoadFight1:
@@ -229,7 +229,7 @@
startbattle
reloadmapafterbattle
loadmem wAlanFightCount, 2
- clearflag ENGINE_ALAN
+ clearflag ENGINE_ALAN_READY_FOR_REMATCH
end
.LoadFight2:
@@ -237,7 +237,7 @@
startbattle
reloadmapafterbattle
loadmem wAlanFightCount, 3
- clearflag ENGINE_ALAN
+ clearflag ENGINE_ALAN_READY_FOR_REMATCH
end
.LoadFight3:
@@ -245,7 +245,7 @@
startbattle
reloadmapafterbattle
loadmem wAlanFightCount, 4
- clearflag ENGINE_ALAN
+ clearflag ENGINE_ALAN_READY_FOR_REMATCH
end
.LoadFight4:
@@ -252,7 +252,7 @@
loadtrainer SCHOOLBOY, ALAN5
startbattle
reloadmapafterbattle
- clearflag ENGINE_ALAN
+ clearflag ENGINE_ALAN_READY_FOR_REMATCH
end
.GiveFireStone:
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -41,7 +41,7 @@
loadvar VAR_CALLERID, PHONE_LASS_DANA
endifjustbattled
opentext
- checkflag ENGINE_DANA
+ checkflag ENGINE_DANA_READY_FOR_REMATCH
iftrue .DanaRematch
checkflag ENGINE_DANA_HAS_THUNDERSTONE
iftrue .TryGiveThunderstone
@@ -91,7 +91,7 @@
startbattle
reloadmapafterbattle
loadmem wDanaFightCount, 1
- clearflag ENGINE_DANA
+ clearflag ENGINE_DANA_READY_FOR_REMATCH
end
.LoadFight1:
@@ -99,7 +99,7 @@
startbattle
reloadmapafterbattle
loadmem wDanaFightCount, 2
- clearflag ENGINE_DANA
+ clearflag ENGINE_DANA_READY_FOR_REMATCH
end
.LoadFight2:
@@ -107,7 +107,7 @@
startbattle
reloadmapafterbattle
loadmem wDanaFightCount, 3
- clearflag ENGINE_DANA
+ clearflag ENGINE_DANA_READY_FOR_REMATCH
end
.LoadFight3:
@@ -115,7 +115,7 @@
startbattle
reloadmapafterbattle
loadmem wDanaFightCount, 4
- clearflag ENGINE_DANA
+ clearflag ENGINE_DANA_READY_FOR_REMATCH
end
.LoadFight4:
@@ -122,7 +122,7 @@
loadtrainer LASS, DANA5
startbattle
reloadmapafterbattle
- clearflag ENGINE_DANA
+ clearflag ENGINE_DANA_READY_FOR_REMATCH
end
.TryGiveThunderstone:
@@ -179,7 +179,7 @@
loadvar VAR_CALLERID, PHONE_SCHOOLBOY_CHAD
endifjustbattled
opentext
- checkflag ENGINE_CHAD
+ checkflag ENGINE_CHAD_READY_FOR_REMATCH
iftrue .ChadRematch
checkcellnum PHONE_SCHOOLBOY_CHAD
iftrue .HaveChadsNumber
@@ -227,7 +227,7 @@
startbattle
reloadmapafterbattle
loadmem wChadFightCount, 1
- clearflag ENGINE_CHAD
+ clearflag ENGINE_CHAD_READY_FOR_REMATCH
end
.LoadFight1:
@@ -235,7 +235,7 @@
startbattle
reloadmapafterbattle
loadmem wChadFightCount, 2
- clearflag ENGINE_CHAD
+ clearflag ENGINE_CHAD_READY_FOR_REMATCH
end
.LoadFight2:
@@ -243,7 +243,7 @@
startbattle
reloadmapafterbattle
loadmem wChadFightCount, 3
- clearflag ENGINE_CHAD
+ clearflag ENGINE_CHAD_READY_FOR_REMATCH
end
.LoadFight3:
@@ -251,7 +251,7 @@
startbattle
reloadmapafterbattle
loadmem wChadFightCount, 4
- clearflag ENGINE_CHAD
+ clearflag ENGINE_CHAD_READY_FOR_REMATCH
end
.LoadFight4:
@@ -258,7 +258,7 @@
loadtrainer SCHOOLBOY, CHAD5
startbattle
reloadmapafterbattle
- clearflag ENGINE_CHAD
+ clearflag ENGINE_CHAD_READY_FOR_REMATCH
end
.AskPhoneNumber1:
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -41,7 +41,7 @@
loadvar VAR_CALLERID, PHONE_FISHER_TULLY
endifjustbattled
opentext
- checkflag ENGINE_TULLY
+ checkflag ENGINE_TULLY_READY_FOR_REMATCH
iftrue .WantsBattle
checkflag ENGINE_TULLY_HAS_WATER_STONE
iftrue .HasWaterStone
@@ -87,7 +87,7 @@
startbattle
reloadmapafterbattle
loadmem wTullyFightCount, 1
- clearflag ENGINE_TULLY
+ clearflag ENGINE_TULLY_READY_FOR_REMATCH
end
.LoadFight1:
@@ -95,7 +95,7 @@
startbattle
reloadmapafterbattle
loadmem wTullyFightCount, 2
- clearflag ENGINE_TULLY
+ clearflag ENGINE_TULLY_READY_FOR_REMATCH
end
.LoadFight2:
@@ -103,7 +103,7 @@
startbattle
reloadmapafterbattle
loadmem wTullyFightCount, 3
- clearflag ENGINE_TULLY
+ clearflag ENGINE_TULLY_READY_FOR_REMATCH
end
.LoadFight3:
@@ -110,7 +110,7 @@
loadtrainer FISHER, TULLY4
startbattle
reloadmapafterbattle
- clearflag ENGINE_TULLY
+ clearflag ENGINE_TULLY_READY_FOR_REMATCH
end
.HasWaterStone:
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -53,7 +53,7 @@
loadvar VAR_CALLERID, PHONE_POKEMANIAC_BRENT
endifjustbattled
opentext
- checkflag ENGINE_BRENT
+ checkflag ENGINE_BRENT_READY_FOR_REMATCH
iftrue .WantsBattle
checkcellnum PHONE_POKEMANIAC_BRENT
iftrue .NumberAccepted
@@ -97,7 +97,7 @@
startbattle
reloadmapafterbattle
loadmem wBrentFightCount, 1
- clearflag ENGINE_BRENT
+ clearflag ENGINE_BRENT_READY_FOR_REMATCH
end
.LoadFight1:
@@ -105,7 +105,7 @@
startbattle
reloadmapafterbattle
loadmem wBrentFightCount, 2
- clearflag ENGINE_BRENT
+ clearflag ENGINE_BRENT_READY_FOR_REMATCH
end
.LoadFight2:
@@ -113,7 +113,7 @@
startbattle
reloadmapafterbattle
loadmem wBrentFightCount, 3
- clearflag ENGINE_BRENT
+ clearflag ENGINE_BRENT_READY_FOR_REMATCH
end
.LoadFight3:
@@ -120,7 +120,7 @@
loadtrainer POKEMANIAC, BRENT4
startbattle
reloadmapafterbattle
- clearflag ENGINE_BRENT
+ clearflag ENGINE_BRENT_READY_FOR_REMATCH
end
.AskNumber1:
@@ -180,7 +180,7 @@
loadvar VAR_CALLERID, PHONE_PICNICKER_TIFFANY
endifjustbattled
opentext
- checkflag ENGINE_TIFFANY
+ checkflag ENGINE_TIFFANY_READY_FOR_REMATCH
iftrue .WantsBattle
checkflag ENGINE_TIFFANY_HAS_PINK_BOW
iftrue .HasPinkBow
@@ -228,7 +228,7 @@
startbattle
reloadmapafterbattle
loadmem wTiffanyFightCount, 1
- clearflag ENGINE_TIFFANY
+ clearflag ENGINE_TIFFANY_READY_FOR_REMATCH
end
.LoadFight1:
@@ -236,7 +236,7 @@
startbattle
reloadmapafterbattle
loadmem wTiffanyFightCount, 2
- clearflag ENGINE_TIFFANY
+ clearflag ENGINE_TIFFANY_READY_FOR_REMATCH
end
.LoadFight2:
@@ -244,7 +244,7 @@
startbattle
reloadmapafterbattle
loadmem wTiffanyFightCount, 3
- clearflag ENGINE_TIFFANY
+ clearflag ENGINE_TIFFANY_READY_FOR_REMATCH
end
.LoadFight3:
@@ -251,7 +251,7 @@
loadtrainer PICNICKER, TIFFANY4
startbattle
reloadmapafterbattle
- clearflag ENGINE_TIFFANY
+ clearflag ENGINE_TIFFANY_READY_FOR_REMATCH
end
.HasPinkBow:
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -23,7 +23,7 @@
loadvar VAR_CALLERID, PHONE_BIRDKEEPER_VANCE
endifjustbattled
opentext
- checkflag ENGINE_VANCE
+ checkflag ENGINE_VANCE_READY_FOR_REMATCH
iftrue .WantsBattle
checkcellnum PHONE_BIRDKEEPER_VANCE
iftrue Route44NumberAcceptedM
@@ -63,7 +63,7 @@
startbattle
reloadmapafterbattle
loadmem wVanceFightCount, 1
- clearflag ENGINE_VANCE
+ clearflag ENGINE_VANCE_READY_FOR_REMATCH
end
.LoadFight1:
@@ -71,7 +71,7 @@
startbattle
reloadmapafterbattle
loadmem wVanceFightCount, 2
- clearflag ENGINE_VANCE
+ clearflag ENGINE_VANCE_READY_FOR_REMATCH
end
.LoadFight2:
@@ -78,7 +78,7 @@
loadtrainer BIRD_KEEPER, VANCE3
startbattle
reloadmapafterbattle
- clearflag ENGINE_VANCE
+ clearflag ENGINE_VANCE_READY_FOR_REMATCH
checkevent EVENT_VANCE_CARBOS
iftrue .Carbos
checkevent EVENT_GOT_CARBOS_FROM_VANCE
@@ -165,7 +165,7 @@
loadvar VAR_CALLERID, PHONE_FISHER_WILTON
endifjustbattled
opentext
- checkflag ENGINE_WILTON
+ checkflag ENGINE_WILTON_READY_FOR_REMATCH
iftrue .WantsBattle
checkflag ENGINE_WILTON_HAS_ITEM
iftrue .HasItem
@@ -207,7 +207,7 @@
startbattle
reloadmapafterbattle
loadmem wWiltonFightCount, 1
- clearflag ENGINE_WILTON
+ clearflag ENGINE_WILTON_READY_FOR_REMATCH
end
.LoadFight1:
@@ -215,7 +215,7 @@
startbattle
reloadmapafterbattle
loadmem wWiltonFightCount, 2
- clearflag ENGINE_WILTON
+ clearflag ENGINE_WILTON_READY_FOR_REMATCH
end
.LoadFight2:
@@ -222,7 +222,7 @@
loadtrainer FISHER, WILTON3
startbattle
reloadmapafterbattle
- clearflag ENGINE_WILTON
+ clearflag ENGINE_WILTON_READY_FOR_REMATCH
end
.HasItem:
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -151,7 +151,7 @@
loadvar VAR_CALLERID, PHONE_HIKER_PARRY
endifjustbattled
opentext
- checkflag ENGINE_PARRY
+ checkflag ENGINE_PARRY_READY_FOR_REMATCH
iftrue .WantsBattle
checkcellnum PHONE_HIKER_PARRY
iftrue Route45NumberAcceptedM
@@ -191,7 +191,7 @@
startbattle
reloadmapafterbattle
loadmem wParryFightCount, 1
- clearflag ENGINE_PARRY
+ clearflag ENGINE_PARRY_READY_FOR_REMATCH
end
.LoadFight1:
@@ -199,7 +199,7 @@
startbattle
reloadmapafterbattle
loadmem wParryFightCount, 2
- clearflag ENGINE_PARRY
+ clearflag ENGINE_PARRY_READY_FOR_REMATCH
end
.LoadFight2:
@@ -206,7 +206,7 @@
loadtrainer HIKER, PARRY2
startbattle
reloadmapafterbattle
- clearflag ENGINE_PARRY
+ clearflag ENGINE_PARRY_READY_FOR_REMATCH
checkevent EVENT_PARRY_IRON
iftrue .HasIron
checkevent EVENT_GOT_IRON_FROM_PARRY
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -29,7 +29,7 @@
loadvar VAR_CALLERID, PHONE_PICNICKER_ERIN
endifjustbattled
opentext
- checkflag ENGINE_ERIN
+ checkflag ENGINE_ERIN_READY_FOR_REMATCH
iftrue .WantsBattle
checkcellnum PHONE_PICNICKER_ERIN
iftrue Route46NumberAcceptedF
@@ -69,7 +69,7 @@
startbattle
reloadmapafterbattle
loadmem wErinFightCount, 1
- clearflag ENGINE_ERIN
+ clearflag ENGINE_ERIN_READY_FOR_REMATCH
end
.LoadFight1:
@@ -77,7 +77,7 @@
startbattle
reloadmapafterbattle
loadmem wErinFightCount, 2
- clearflag ENGINE_ERIN
+ clearflag ENGINE_ERIN_READY_FOR_REMATCH
end
.LoadFight2:
@@ -84,7 +84,7 @@
loadtrainer PICNICKER, ERIN3
startbattle
reloadmapafterbattle
- clearflag ENGINE_ERIN
+ clearflag ENGINE_ERIN_READY_FOR_REMATCH
checkevent EVENT_ERIN_CALCIUM
iftrue .HasCalcium
checkevent EVENT_GOT_CALCIUM_FROM_ERIN